diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index eb636e0..07908e5 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -72,6 +72,7 @@
     <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
     <uses-permission android:name="android.permission.MANAGE_DEVICE_ADMINS" />
     <uses-permission android:name="android.permission.READ_SEARCH_INDEXABLES" />
+    <uses-permission android:name="android.permission.BIND_SETTINGS_SUGGESTIONS_SERVICE" />
     <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" />
@@ -82,6 +83,7 @@
     <uses-permission android:name="android.permission.PEERS_MAC_ADDRESS"/>
     <uses-permission android:name="android.permission.MANAGE_NOTIFICATIONS"/>
     <uses-permission android:name="android.permission.DELETE_PACKAGES"/>
+    <uses-permission android:name="android.permission.REQUEST_DELETE_PACKAGES" />
     <uses-permission android:name="android.permission.MANAGE_APP_OPS_RESTRICTIONS"/>
     <uses-permission android:name="android.permission.HIDE_NON_SYSTEM_OVERLAY_WINDOWS"/>
     <uses-permission android:name="android.permission.READ_PRINT_SERVICES" />
@@ -99,6 +101,7 @@
             android:defaultToDeviceProtectedStorage="true"
             android:directBootAware="true">
 
+        <uses-library android:name="org.apache.http.legacy" />
         <!-- Settings -->
 
         <activity android:name="Settings"
@@ -175,6 +178,7 @@
         </activity>
 
         <activity android:name=".Settings$ConnectedDeviceDashboardActivity"
+            android:enabled="false"
             android:taskAffinity="com.android.settings"
             android:label="@string/connected_devices_dashboard_title"
             android:icon="@drawable/ic_devices_other"
@@ -199,6 +203,31 @@
                 android:value="true" />
         </activity>
 
+        <activity android:name=".Settings$ConnectedDeviceDashboardActivityOld"
+                  android:taskAffinity="com.android.settings"
+                  android:label="@string/connected_devices_dashboard_title"
+                  android:icon="@drawable/ic_devices_other"
+                  android:parentActivityName="Settings">
+            <intent-filter android:priority="1">
+                <action android:name="android.settings.NFC_SETTINGS" />
+                <category android:name="android.intent.category.DEFAULT" />
+            </intent-filter>
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+                <category android:name="android.intent.category.DEFAULT" />
+                <category android:name="android.intent.category.VOICE_LAUNCH" />
+            </intent-filter>
+            <intent-filter android:priority="10">
+                <action android:name="com.android.settings.action.SETTINGS"/>
+            </intent-filter>
+            <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
+                       android:value="com.android.settings.connecteddevice.ConnectedDeviceDashboardFragmentOld"/>
+            <meta-data android:name="com.android.settings.category"
+                       android:value="com.android.settings.category.ia.homepage"/>
+            <meta-data android:name="com.android.settings.PRIMARY_PROFILE_CONTROLLED"
+                       android:value="true" />
+        </activity>
+
         <activity android:name="AirplaneModeVoiceActivity"
                 android:label="@string/wireless_networks_settings_title"
                 android:theme="@*android:style/Theme.DeviceDefault.Light.Voice"
@@ -217,6 +246,16 @@
                   android:theme="@style/Theme.Settings.NoActionBar">
         </activity>
 
+        <activity android:name=".search.SearchResultTrampoline"
+                  android:theme="@android:style/Theme.NoDisplay"
+                  android:excludeFromRecents="true"
+                  android:exported="true">
+            <intent-filter>
+                <action android:name="com.android.settings.SEARCH_RESULT_TRAMPOLINE" />
+                <category android:name="android.intent.category.DEFAULT" />
+            </intent-filter>
+        </activity>
+
         <!-- Top-level settings -->
 
         <activity android:name="Settings$WifiSettingsActivity"
@@ -238,6 +277,8 @@
                 android:value="com.android.settings.wifi.WifiSettings" />
             <meta-data android:name="com.android.settings.PRIMARY_PROFILE_CONTROLLED"
                 android:value="true" />
+            <meta-data android:name="android.metadata.SLICE_URI"
+                       android:value="content://com.android.settings.slices/wifi" />
         </activity>
 
         <!-- Keep compatibility with old shortcuts. -->
@@ -727,6 +768,32 @@
                 <category android:name="android.intent.category.DEFAULT" />
                 <category android:name="com.android.settings.SHORTCUT" />
             </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.PRIMARY_PROFILE_CONTROLLED"
+                android:value="true" />
+        </activity>
+
+        <activity android:name="Settings$ZenModeBehaviorSettingsActivity"
+                android:label="@string/zen_mode_behavior_settings_title"
+                android:icon="@drawable/ic_settings_notifications"
+                android:exported="true"
+                android:taskAffinity="">
+            <intent-filter android:priority="1">
+                <action android:name="android.settings.ZEN_MODE_PRIORITY_SETTINGS" />
+                <category android:name="android.intent.category.DEFAULT" />
+            </intent-filter>
+            <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
+                android:value="com.android.settings.notification.ZenModeBehaviorSettings" />
+            <meta-data android:name="com.android.settings.PRIMARY_PROFILE_CONTROLLED"
+                android:value="true" />
+        </activity>
+
+        <activity android:name="Settings$ZenModeAutomationSettingsActivity"
+                  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.settings.ZEN_MODE_AUTOMATION_SETTINGS" />
                 <category android:name="android.intent.category.DEFAULT" />
@@ -736,37 +803,11 @@
                 <category android:name="android.intent.category.DEFAULT" />
             </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.PRIMARY_PROFILE_CONTROLLED"
-                android:value="true" />
-        </activity>
-
-        <activity android:name="Settings$ZenModeVisualInterruptionSettingsActivity"
-                  android:label="@string/zen_mode_visual_interruptions_settings_title"
-                  android:icon="@drawable/ic_settings_notifications"
-                  android:exported="true"
-                  android:taskAffinity="">
-            <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
-                       android:value="com.android.settings.notification.ZenModeVisualInterruptionSettings" />
+                       android:value="com.android.settings.notification.ZenModeAutomationSettings" />
             <meta-data android:name="com.android.settings.PRIMARY_PROFILE_CONTROLLED"
                        android:value="true" />
         </activity>
 
-        <activity android:name="Settings$ZenModePrioritySettingsActivity"
-                android:label="@string/zen_mode_priority_settings_title"
-                android:icon="@drawable/ic_settings_notifications"
-                android:exported="true"
-                android:taskAffinity="">
-            <intent-filter android:priority="1">
-                <action android:name="android.settings.ZEN_MODE_PRIORITY_SETTINGS" />
-                <category android:name="android.intent.category.DEFAULT" />
-            </intent-filter>
-            <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
-                android:value="com.android.settings.notification.ZenModePrioritySettings" />
-            <meta-data android:name="com.android.settings.PRIMARY_PROFILE_CONTROLLED"
-                android:value="true" />
-        </activity>
-
         <activity android:name="Settings$WallpaperSettingsActivity"
                   android:label="@string/wallpaper_settings_fragment_title"
                   android:icon="@drawable/ic_wallpaper"
@@ -985,6 +1026,7 @@
             <intent-filter android:priority="1">
                 <action android:name="android.settings.APPLICATION_SETTINGS" />
                 <action android:name="android.settings.MANAGE_APPLICATIONS_SETTINGS" />
+                <action android:name="android.settings.MANAGE_ALL_APPLICATIONS_SETTINGS" />
                 <category android:name="android.intent.category.DEFAULT" />
             </intent-filter>
             <intent-filter>
@@ -994,7 +1036,7 @@
                 <category android:name="com.android.settings.SHORTCUT" />
             </intent-filter>
             <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
-                android:value="com.android.settings.applications.ManageApplications" />
+                android:value="com.android.settings.applications.manageapplications.ManageApplications" />
             <meta-data android:name="com.android.settings.PRIMARY_PROFILE_CONTROLLED"
                 android:value="true" />
         </activity>
@@ -1022,10 +1064,6 @@
             <intent-filter android:priority="3">
                 <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.development" />
-            <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.applications.ProcessStatsSummary" />
         </activity>
@@ -1041,19 +1079,6 @@
                        android:value="com.android.settings.applications.ProcessStatsUi" />
         </activity>
 
-        <activity android:name="Settings$AllApplicationsActivity"
-                android:label="@string/applications_settings"
-                android:taskAffinity="">
-            <intent-filter>
-                <action android:name="android.settings.MANAGE_ALL_APPLICATIONS_SETTINGS" />
-                <category android:name="android.intent.category.DEFAULT" />
-            </intent-filter>
-            <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
-                android:value="com.android.settings.applications.ManageApplications" />
-            <meta-data android:name="com.android.settings.PRIMARY_PROFILE_CONTROLLED"
-                android:value="true" />
-        </activity>
-
         <activity android:name="Settings$HighPowerApplicationsActivity"
                 android:label="@string/high_power_apps"
                 android:taskAffinity="">
@@ -1062,7 +1087,7 @@
                 <category android:name="android.intent.category.DEFAULT" />
             </intent-filter>
             <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
-                android:value="com.android.settings.applications.ManageApplications" />
+                android:value="com.android.settings.applications.manageapplications.ManageApplications" />
             <meta-data android:name="com.android.settings.PRIMARY_PROFILE_CONTROLLED"
                 android:value="true" />
         </activity>
@@ -1094,14 +1119,7 @@
                 android:exported="true"
                 android:targetActivity="Settings$ManageApplicationsActivity">
             <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
-                android:value="com.android.settings.applications.ManageApplications" />
-        </activity-alias>
-
-        <!-- Keep compatibility with old shortcuts. Pre-gingerbread. -->
-        <activity-alias android:name=".ManageApplications"
-                  android:label="@string/manageapplications_settings_title"
-                  android:exported="true"
-                  android:targetActivity="Settings$ManageApplicationsActivity">
+                android:value="com.android.settings.applications.manageapplications.ManageApplications" />
         </activity-alias>
 
         <!-- Provide direct entry into manage apps showing running services.
@@ -1111,7 +1129,7 @@
                 android:exported="true"
                 android:targetActivity="Settings$ManageApplicationsActivity">
             <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
-                android:value="com.android.settings.applications.ManageApplications" />
+                android:value="com.android.settings.applications.manageapplications.ManageApplications" />
         </activity-alias>
 
         <!-- Provide direct entry into manage apps showing storage usage for apps.
@@ -1121,7 +1139,7 @@
                 android:exported="true"
                 android:targetActivity="Settings$ManageApplicationsActivity">
             <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
-                android:value="com.android.settings.applications.ManageApplications" />
+                android:value="com.android.settings.applications.manageapplications.ManageApplications" />
         </activity-alias>
 
         <!-- Still need a top-level activity for showing app details.  Aliasing
@@ -1158,7 +1176,7 @@
                 <category android:name="android.intent.category.VOICE_LAUNCH" />
             </intent-filter>
             <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
-                android:value="com.android.settings.applications.ManageApplications" />
+                android:value="com.android.settings.applications.manageapplications.ManageApplications" />
             <meta-data android:name="com.android.settings.PRIMARY_PROFILE_CONTROLLED"
                 android:value="true" />
         </activity>
@@ -1179,7 +1197,7 @@
                 <category android:name="android.intent.category.VOICE_LAUNCH" />
             </intent-filter>
             <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
-                android:value="com.android.settings.applications.ManageApplications" />
+                android:value="com.android.settings.applications.manageapplications.ManageApplications" />
             <meta-data android:name="com.android.settings.PRIMARY_PROFILE_CONTROLLED"
                 android:value="true" />
         </activity>
@@ -1207,23 +1225,6 @@
             </intent-filter>
         </activity>
 
-        <!--
-        <activity android:name="Settings$AppOpsSummaryActivity"
-                android:label="@string/app_ops_settings"
-                android:taskAffinity=""
-                android:enabled="false">
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <action android:name="android.settings.APP_OPS_SETTINGS" />
-                <category android:name="android.intent.category.DEFAULT" />
-                <category android:name="android.intent.category.VOICE_LAUNCH" />
-                <category android:name="com.android.settings.SHORTCUT" />
-            </intent-filter>
-            <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
-                android:value="com.android.settings.applications.AppOpsSummary" />
-        </activity>
-        -->
-
         <activity android:name="Settings$BackgroundCheckSummaryActivity"
                 android:label="@string/background_check_title"
                 android:taskAffinity=""
@@ -1279,7 +1280,7 @@
             <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.SecuritySettings" />
+                android:value="com.android.settings.security.SecuritySettings" />
             <meta-data android:name="com.android.settings.PRIMARY_PROFILE_CONTROLLED"
                 android:value="true" />
         </activity>
@@ -1321,7 +1322,7 @@
                 android:exported="true"
                 android:targetActivity="Settings$SecuritySettingsActivity">
             <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
-                android:value="com.android.settings.SecuritySettings" />
+                android:value="com.android.settings.security.SecuritySettings" />
         </activity-alias>
 
         <activity android:name="Settings$PrivacySettingsActivity"
@@ -1342,6 +1343,7 @@
         </activity>
 
         <activity android:name="SetFullBackupPassword"
+                  android:label="@string/local_backup_password_title"
                 android:exported="false">
         </activity>
 
@@ -1401,7 +1403,7 @@
                 <category android:name="android.intent.category.DEFAULT" />
             </intent-filter>
             <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
-                android:value="com.android.settings.applications.ManageApplications" />
+                android:value="com.android.settings.applications.manageapplications.ManageApplications" />
         </activity>
 
         <activity-alias android:name="SetProfileOwner"
@@ -1609,7 +1611,14 @@
         <activity android:name=".fingerprint.FingerprintEnrollFindSensor" android:exported="false"/>
         <activity android:name=".fingerprint.FingerprintEnrollEnrolling" android:exported="false"/>
         <activity android:name=".fingerprint.FingerprintEnrollFinish" android:exported="false"/>
-        <activity android:name=".fingerprint.FingerprintEnrollIntroduction" android:exported="false" />
+        <activity android:name=".fingerprint.FingerprintEnrollIntroduction"
+            android:exported="true"
+            android:theme="@style/GlifTheme.Light">
+            <intent-filter>
+                <action android:name="android.settings.FINGERPRINT_ENROLL" />
+                <category android:name="android.intent.category.DEFAULT" />
+            </intent-filter>
+        </activity>
 
         <activity android:name=".fingerprint.SetupFingerprintEnrollFindSensor" android:exported="false"/>
         <activity android:name=".fingerprint.SetupFingerprintEnrollEnrolling" android:exported="false"/>
@@ -1686,14 +1695,12 @@
                 android:value="true" />
         </activity>
 
-        <activity android:name=".Settings$ScreenLockSuggestionActivity"
+        <activity android:name=".password.ScreenLockSuggestionActivity"
             android:icon="@drawable/ic_settings_security">
             <intent-filter android:priority="1">
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="com.android.settings.suggested.category.LOCK_SCREEN" />
             </intent-filter>
-            <meta-data android:name="com.android.settings.dismiss"
-                       android:value="0,30" />
             <meta-data android:name="com.android.settings.title"
                        android:resource="@string/suggested_lock_settings_title" />
             <meta-data android:name="com.android.settings.summary"
@@ -1701,7 +1708,7 @@
             <meta-data android:name="com.android.settings.icon_tintable" android:value="true" />
         </activity>
 
-        <activity android:name=".Settings$FingerprintEnrollSuggestionActivity"
+        <activity android:name=".fingerprint.FingerprintEnrollSuggestionActivity"
             android:icon="@drawable/ic_suggestion_fingerprint">
             <intent-filter android:priority="2">
                 <action android:name="android.intent.action.MAIN" />
@@ -1910,11 +1917,12 @@
                        android:value="com.android.settings.ApnEditor" />
         </activity>
 
-        <activity android:name="Settings$DevelopmentSettingsActivity"
-                android:label="@string/development_settings_title"
-                android:icon="@drawable/ic_settings_development"
-                android:taskAffinity="com.android.settings"
-                android:parentActivityName="Settings">
+        <activity android:name="Settings$DevelopmentSettingsDashboardActivity"
+                  android:label="@string/development_settings_title"
+                  android:icon="@drawable/ic_settings_development"
+                  android:taskAffinity="com.android.settings"
+                  android:parentActivityName="Settings"
+                  android:enabled="false">
             <intent-filter android:priority="1">
                 <action android:name="android.settings.APPLICATION_DEVELOPMENT_SETTINGS" />
                 <action android:name="com.android.settings.APPLICATION_DEVELOPMENT_SETTINGS" />
@@ -1924,13 +1932,13 @@
                 <action android:name="com.android.settings.action.SETTINGS" />
             </intent-filter>
             <meta-data android:name="com.android.settings.category"
-                android:value="com.android.settings.category.ia.system" />
+                       android:value="com.android.settings.category.ia.system" />
             <meta-data android:name="com.android.settings.summary"
-                android:resource="@string/summary_empty"/>
+                       android:resource="@string/summary_empty"/>
             <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
-                android:value="com.android.settings.development.DevelopmentSettings" />
+                       android:value="com.android.settings.development.DevelopmentSettingsDashboardFragment" />
             <meta-data android:name="com.android.settings.PRIMARY_PROFILE_CONTROLLED"
-                android:value="true" />
+                       android:value="true" />
         </activity>
 
         <!-- The opposite of DevelopmentSettingsActivity, it's no-op and only enabled when the real
@@ -1983,15 +1991,6 @@
                 android:value="com.android.settings.print.PrintJobSettingsFragment" />
         </activity>
 
-        <!-- Keep compatibility with old shortcuts. -->
-        <activity-alias android:name="DevelopmentSettings"
-                  android:exported="true"
-                  android:label="@string/development_settings_title"
-                  android:targetActivity="Settings$DevelopmentSettingsActivity">
-            <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
-                android:value="com.android.settings.development.DevelopmentSettings" />
-        </activity-alias>
-
         <activity android:name=".development.AppPicker"
                   android:label="@string/select_application"
                   android:theme="@android:style/Theme.DeviceDefault.Light.Dialog" />
@@ -2000,15 +1999,6 @@
                   android:label="@string/select_webview_provider_dialog_title">
         </activity>
 
-        <!-- Keep compatibility with old shortcuts. -->
-        <activity-alias android:name="UsbSettings"
-                  android:exported="true"
-                  android:label="@string/storage_title_usb"
-                  android:targetActivity="Settings$DevelopmentSettingsActivity">
-            <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
-                android:value="com.android.settings.deviceinfo.UsbSettings" />
-        </activity-alias>
-
         <!-- Bluetooth stuff -->
 
         <activity android:name=".bluetooth.BluetoothPairingDialog"
@@ -2385,7 +2375,7 @@
                 <category android:name="android.intent.category.DEFAULT" />
             </intent-filter>
             <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
-                android:value="com.android.settings.CryptKeeperSettings" />
+                android:value="com.android.settings.security.CryptKeeperSettings" />
         </activity>
 
         <activity android:name="Settings$DataPlanUsageSummaryActivity"
@@ -2523,16 +2513,6 @@
             </intent-filter>
         </activity>
 
-        <activity android:name="Settings$SpecialAccessSettingsActivity"
-                  android:taskAffinity="">
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.DEFAULT" />
-            </intent-filter>
-            <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
-                       android:value="com.android.settings.applications.SpecialAccessSettings" />
-        </activity>
-
         <activity android:name="Settings$NotificationAccessSettingsActivity"
                   android:label="@string/manage_notification_access_title"
                   android:taskAffinity="">
@@ -2699,6 +2679,22 @@
                 android:value="com.android.settings.notification.AppNotificationSettings" />
         </activity>
 
+        <!-- Show channel group-level notification settings (group passed in as extras) -->
+        <activity android:name="Settings$ChannelGroupNotificationSettingsActivity"
+                  android:exported="true">
+            <intent-filter android:priority="1">
+                <action android:name="android.settings.CHANNEL_GROUP_NOTIFICATION_SETTINGS" />
+                <category android:name="android.intent.category.DEFAULT" />
+            </intent-filter>
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+                <category android:name="android.intent.category.DEFAULT" />
+            </intent-filter>
+            <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
+                       android:value="com.android.settings.notification.ChannelGroupNotificationSettings" />
+        </activity>
+
+
         <!-- Show channel-level notification settings (channel passed in as extras) -->
         <activity android:name="Settings$ChannelNotificationSettingsActivity"
                   android:exported="true">
@@ -2866,7 +2862,7 @@
                        android:value="true" />
         </activity>
 
-        <activity android:name="Settings$WifiCallingSuggestionActivity"
+        <activity android:name=".wifi.WifiCallingSuggestionActivity"
                   android:label="@string/wifi_calling_settings_title"
                   android:icon="@drawable/ic_settings_wireless"
                   android:taskAffinity="">
@@ -2896,6 +2892,15 @@
             </intent-filter>
         </provider>
 
+        <provider
+            android:name=".dashboard.suggestions.SuggestionStateProvider"
+            android:authorities="com.android.settings.suggestions.status"
+            android:exported="true">
+            <intent-filter>
+                <action android:name="com.android.settings.action.SUGGESTION_STATE_PROVIDER" />
+            </intent-filter>
+        </provider>
+
         <activity android:name="Settings$OverlaySettingsActivity"
                 android:label="@string/draw_overlay"
                 android:taskAffinity="">
@@ -2904,7 +2909,7 @@
                 <category android:name="android.intent.category.DEFAULT" />
             </intent-filter>
             <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
-                android:value="com.android.settings.applications.ManageApplications" />
+                android:value="com.android.settings.applications.manageapplications.ManageApplications" />
         </activity>
 
         <activity android:name="Settings$AppDrawOverlaySettingsActivity"
@@ -2927,7 +2932,7 @@
                 <category android:name="android.intent.category.DEFAULT" />
             </intent-filter>
             <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
-                android:value="com.android.settings.applications.ManageApplications" />
+                android:value="com.android.settings.applications.manageapplications.ManageApplications" />
         </activity>
 
 
@@ -2951,7 +2956,7 @@
                 <category android:name="android.intent.category.DEFAULT" />
             </intent-filter>
             <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
-                android:value="com.android.settings.applications.ManageApplications" />
+                android:value="com.android.settings.applications.manageapplications.ManageApplications" />
         </activity>
 
         <activity android:name="Settings$ManageAppExternalSourcesActivity"
@@ -3132,7 +3137,7 @@
 
         <!-- Quick Settings tiles for Developer Options -->
         <service
-            android:name=".qstile.DevelopmentTiles$ShowLayout"
+            android:name=".development.qstile.DevelopmentTiles$ShowLayout"
             android:label="@string/debug_layout"
             android:icon="@drawable/tile_icon_show_layout"
             android:permission="android.permission.BIND_QUICK_SETTINGS_TILE"
@@ -3142,7 +3147,7 @@
             </intent-filter>
         </service>
         <service
-            android:name=".qstile.DevelopmentTiles$GPUProfiling"
+            android:name=".development.qstile.DevelopmentTiles$GPUProfiling"
             android:label="@string/track_frame_time"
             android:icon="@drawable/tile_icon_graphics"
             android:permission="android.permission.BIND_QUICK_SETTINGS_TILE"
@@ -3152,7 +3157,7 @@
             </intent-filter>
         </service>
         <service
-            android:name=".qstile.DevelopmentTiles$ForceRTL"
+            android:name=".development.qstile.DevelopmentTiles$ForceRTL"
             android:label="@string/force_rtl_layout_all_locales"
             android:icon="@drawable/tile_icon_force_rtl"
             android:permission="android.permission.BIND_QUICK_SETTINGS_TILE"
@@ -3162,7 +3167,7 @@
             </intent-filter>
         </service>
         <service
-            android:name=".qstile.DevelopmentTiles$AnimationSpeed"
+            android:name=".development.qstile.DevelopmentTiles$AnimationSpeed"
             android:label="@string/window_animation_scale_title"
             android:icon="@drawable/tile_icon_animation_speed"
             android:permission="android.permission.BIND_QUICK_SETTINGS_TILE"
@@ -3171,11 +3176,6 @@
                 <action android:name="android.service.quicksettings.action.QS_TILE" />
             </intent-filter>
         </service>
-        <activity
-            android:name=".qstile.DevelopmentTileConfigActivity"
-            android:excludeFromRecents="true"
-            android:launchMode="singleInstance"
-            android:label="@string/quick_settings_developer_tiles" />
 
         <activity android:name=".HelpTrampoline"
             android:exported="true"
@@ -3294,6 +3294,18 @@
             </intent-filter>
         </activity>
 
+        <provider android:name=".SettingsSliceProvider"
+                  android:authorities="com.android.settings.slices"
+                  android:exported="true">
+        </provider>
+
+        <receiver
+            android:name=".SliceBroadcastReceiver" >
+            <intent-filter>
+                <action android:name="com.android.settings.slice.action.WIFI_CHANGED"/>
+            </intent-filter>
+        </receiver>
+
         <!-- This is the longest AndroidManifest.xml ever. -->
     </application>
 </manifest>
diff --git a/OWNERS b/OWNERS
index 244516e..d2bc1ff 100644
--- a/OWNERS
+++ b/OWNERS
@@ -1,3 +1,7 @@
+# Use this reviewer by default.
+pixel-sw-exp-reviews+gerrit@google.com
+
+# People who can approve changes for submission
 asapperstein@google.com
 asargent@google.com
 dehboxturtle@google.com
@@ -9,3 +13,6 @@
 
 # Emergency approvers in case the above are not available
 miket@google.com
+
+# Exempt resource files (because they are in a flat directory and too hard to manage via OWNERS)
+per-file *.xml=*
\ No newline at end of file
diff --git a/PREUPLOAD.cfg b/PREUPLOAD.cfg
index bbc1f68..62a2e43 100644
--- a/PREUPLOAD.cfg
+++ b/PREUPLOAD.cfg
@@ -1,4 +1,5 @@
 [Hook Scripts]
 checkstyle_hook = ${REPO_ROOT}/prebuilts/checkstyle/checkstyle.py --sha ${PREUPLOAD_COMMIT}
                   -fw src/com/android/settings/print/
+checkcolor_hook = ${REPO_ROOT}/prebuilts/checkcolor/checkcolor.py -p .
 
diff --git a/color-check-baseline.xml b/color-check-baseline.xml
new file mode 100644
index 0000000..cbcdf48
--- /dev/null
+++ b/color-check-baseline.xml
@@ -0,0 +1,2484 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<issues format="4">
+
+    <issue
+        id="HardCodedColor"
+        severity="Error"
+        message="Avoid using hardcoded color"
+        category="Correctness"
+        priority="4"
+        summary="Using hardcoded color"
+        explanation="Hardcoded color values are bad because theme changes cannot be uniformly applied.Instead use the theme specific colors such as `?android:attr/textColorPrimary` in attributes.&#xA;This ensures that a theme change from a light to a dark theme can be uniformlyapplied across the app."
+        errorLine1="        android:startColor=&quot;#4D000000&quot;"
+        errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/drawable/action_bar_dropshadow.xml"
+            line="22"
+            column="9"/>
+    </issue>
+
+    <issue
+        id="HardCodedColor"
+        severity="Error"
+        message="Avoid using hardcoded color"
+        category="Correctness"
+        priority="4"
+        summary="Using hardcoded color"
+        explanation="Hardcoded color values are bad because theme changes cannot be uniformly applied.Instead use the theme specific colors such as `?android:attr/textColorPrimary` in attributes.&#xA;This ensures that a theme change from a light to a dark theme can be uniformlyapplied across the app."
+        errorLine1="        app:barPredictionColor=&quot;@color/material_empty_color_light&quot;"
+        errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/layout/battery_history_chart.xml"
+            line="38"
+            column="9"/>
+    </issue>
+
+    <issue
+        id="HardCodedColor"
+        severity="Error"
+        message="Avoid using hardcoded color"
+        category="Correctness"
+        priority="4"
+        summary="Using hardcoded color"
+        explanation="Hardcoded color values are bad because theme changes cannot be uniformly applied.Instead use the theme specific colors such as `?android:attr/textColorPrimary` in attributes.&#xA;This ensures that a theme change from a light to a dark theme can be uniformlyapplied across the app."
+        errorLine1="            android:textColor=&quot;@color/bluetooth_dialog_text_color&quot;  />"
+        errorLine2="            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/layout/bluetooth_pin_confirm.xml"
+            line="44"
+            column="13"/>
+    </issue>
+
+    <issue
+        id="HardCodedColor"
+        severity="Error"
+        message="Avoid using hardcoded color"
+        category="Correctness"
+        priority="4"
+        summary="Using hardcoded color"
+        explanation="Hardcoded color values are bad because theme changes cannot be uniformly applied.Instead use the theme specific colors such as `?android:attr/textColorPrimary` in attributes.&#xA;This ensures that a theme change from a light to a dark theme can be uniformlyapplied across the app."
+        errorLine1="            android:textColor=&quot;@color/bluetooth_dialog_text_color&quot;"
+        errorLine2="            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/layout/bluetooth_pin_confirm.xml"
+            line="67"
+            column="13"/>
+    </issue>
+
+    <issue
+        id="HardCodedColor"
+        severity="Error"
+        message="Avoid using hardcoded color"
+        category="Correctness"
+        priority="4"
+        summary="Using hardcoded color"
+        explanation="Hardcoded color values are bad because theme changes cannot be uniformly applied.Instead use the theme specific colors such as `?android:attr/textColorPrimary` in attributes.&#xA;This ensures that a theme change from a light to a dark theme can be uniformlyapplied across the app."
+        errorLine1="            android:textColor=&quot;@color/bluetooth_dialog_text_color&quot;  />"
+        errorLine2="            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/layout/bluetooth_pin_confirm.xml"
+            line="77"
+            column="13"/>
+    </issue>
+
+    <issue
+        id="HardCodedColor"
+        severity="Error"
+        message="Avoid using hardcoded color"
+        category="Correctness"
+        priority="4"
+        summary="Using hardcoded color"
+        explanation="Hardcoded color values are bad because theme changes cannot be uniformly applied.Instead use the theme specific colors such as `?android:attr/textColorPrimary` in attributes.&#xA;This ensures that a theme change from a light to a dark theme can be uniformlyapplied across the app."
+        errorLine1="                android:background=&quot;@color/lock_pattern_background&quot; />"
+        errorLine2="                ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/layout-land/choose_lock_pattern.xml"
+            line="152"
+            column="17"/>
+    </issue>
+
+    <issue
+        id="HardCodedColor"
+        severity="Error"
+        message="Avoid using hardcoded color"
+        category="Correctness"
+        priority="4"
+        summary="Using hardcoded color"
+        explanation="Hardcoded color values are bad because theme changes cannot be uniformly applied.Instead use the theme specific colors such as `?android:attr/textColorPrimary` in attributes.&#xA;This ensures that a theme change from a light to a dark theme can be uniformlyapplied across the app."
+        errorLine1="    &lt;color name=&quot;black&quot;>#000&lt;/color>"
+        errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/values/colors.xml"
+            line="18"
+            column="5"/>
+    </issue>
+
+    <issue
+        id="HardCodedColor"
+        severity="Error"
+        message="Avoid using hardcoded color"
+        category="Correctness"
+        priority="4"
+        summary="Using hardcoded color"
+        explanation="Hardcoded color values are bad because theme changes cannot be uniformly applied.Instead use the theme specific colors such as `?android:attr/textColorPrimary` in attributes.&#xA;This ensures that a theme change from a light to a dark theme can be uniformlyapplied across the app."
+        errorLine1="    &lt;color name=&quot;red&quot;>#F00&lt;/color>"
+        errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/values/colors.xml"
+            line="19"
+            column="5"/>
+    </issue>
+
+    <issue
+        id="HardCodedColor"
+        severity="Error"
+        message="Avoid using hardcoded color"
+        category="Correctness"
+        priority="4"
+        summary="Using hardcoded color"
+        explanation="Hardcoded color values are bad because theme changes cannot be uniformly applied.Instead use the theme specific colors such as `?android:attr/textColorPrimary` in attributes.&#xA;This ensures that a theme change from a light to a dark theme can be uniformlyapplied across the app."
+        errorLine1="    &lt;color name=&quot;blue&quot;>#00F&lt;/color>"
+        errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/values/colors.xml"
+            line="20"
+            column="5"/>
+    </issue>
+
+    <issue
+        id="HardCodedColor"
+        severity="Error"
+        message="Avoid using hardcoded color"
+        category="Correctness"
+        priority="4"
+        summary="Using hardcoded color"
+        explanation="Hardcoded color values are bad because theme changes cannot be uniformly applied.Instead use the theme specific colors such as `?android:attr/textColorPrimary` in attributes.&#xA;This ensures that a theme change from a light to a dark theme can be uniformlyapplied across the app."
+        errorLine1="    &lt;color name=&quot;material_empty_color_light&quot;>#FFCED7DB&lt;/color>"
+        errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/values/colors.xml"
+            line="22"
+            column="5"/>
+    </issue>
+
+    <issue
+        id="HardCodedColor"
+        severity="Error"
+        message="Avoid using hardcoded color"
+        category="Correctness"
+        priority="4"
+        summary="Using hardcoded color"
+        explanation="Hardcoded color values are bad because theme changes cannot be uniformly applied.Instead use the theme specific colors such as `?android:attr/textColorPrimary` in attributes.&#xA;This ensures that a theme change from a light to a dark theme can be uniformlyapplied across the app."
+        errorLine1="    &lt;color name=&quot;bluetooth_dialog_text_color&quot;>#8a000000&lt;/color>"
+        errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/values/colors.xml"
+            line="24"
+            column="5"/>
+    </issue>
+
+    <issue
+        id="HardCodedColor"
+        severity="Error"
+        message="Avoid using hardcoded color"
+        category="Correctness"
+        priority="4"
+        summary="Using hardcoded color"
+        explanation="Hardcoded color values are bad because theme changes cannot be uniformly applied.Instead use the theme specific colors such as `?android:attr/textColorPrimary` in attributes.&#xA;This ensures that a theme change from a light to a dark theme can be uniformlyapplied across the app."
+        errorLine1="    &lt;color name=&quot;crypt_keeper_clock_background&quot;>#ff9a9a9a&lt;/color>"
+        errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/values/colors.xml"
+            line="26"
+            column="5"/>
+    </issue>
+
+    <issue
+        id="HardCodedColor"
+        severity="Error"
+        message="Avoid using hardcoded color"
+        category="Correctness"
+        priority="4"
+        summary="Using hardcoded color"
+        explanation="Hardcoded color values are bad because theme changes cannot be uniformly applied.Instead use the theme specific colors such as `?android:attr/textColorPrimary` in attributes.&#xA;This ensures that a theme change from a light to a dark theme can be uniformlyapplied across the app."
+        errorLine1="    &lt;color name=&quot;crypt_keeper_clock_foreground&quot;>#ff666666&lt;/color>"
+        errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/values/colors.xml"
+            line="27"
+            column="5"/>
+    </issue>
+
+    <issue
+        id="HardCodedColor"
+        severity="Error"
+        message="Avoid using hardcoded color"
+        category="Correctness"
+        priority="4"
+        summary="Using hardcoded color"
+        explanation="Hardcoded color values are bad because theme changes cannot be uniformly applied.Instead use the theme specific colors such as `?android:attr/textColorPrimary` in attributes.&#xA;This ensures that a theme change from a light to a dark theme can be uniformlyapplied across the app."
+        errorLine1="    &lt;color name=&quot;crypt_keeper_clock_am_pm&quot;>#ff9a9a9a&lt;/color>"
+        errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/values/colors.xml"
+            line="28"
+            column="5"/>
+    </issue>
+
+    <issue
+        id="HardCodedColor"
+        severity="Error"
+        message="Avoid using hardcoded color"
+        category="Correctness"
+        priority="4"
+        summary="Using hardcoded color"
+        explanation="Hardcoded color values are bad because theme changes cannot be uniformly applied.Instead use the theme specific colors such as `?android:attr/textColorPrimary` in attributes.&#xA;This ensures that a theme change from a light to a dark theme can be uniformlyapplied across the app."
+        errorLine1="    &lt;color name=&quot;crypt_keeper_password_background&quot;>#70606060&lt;/color>"
+        errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/values/colors.xml"
+            line="29"
+            column="5"/>
+    </issue>
+
+    <issue
+        id="HardCodedColor"
+        severity="Error"
+        message="Avoid using hardcoded color"
+        category="Correctness"
+        priority="4"
+        summary="Using hardcoded color"
+        explanation="Hardcoded color values are bad because theme changes cannot be uniformly applied.Instead use the theme specific colors such as `?android:attr/textColorPrimary` in attributes.&#xA;This ensures that a theme change from a light to a dark theme can be uniformlyapplied across the app."
+        errorLine1="    &lt;color name=&quot;divider_color&quot;>#20ffffff&lt;/color>"
+        errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/values/colors.xml"
+            line="31"
+            column="5"/>
+    </issue>
+
+    <issue
+        id="HardCodedColor"
+        severity="Error"
+        message="Avoid using hardcoded color"
+        category="Correctness"
+        priority="4"
+        summary="Using hardcoded color"
+        explanation="Hardcoded color values are bad because theme changes cannot be uniformly applied.Instead use the theme specific colors such as `?android:attr/textColorPrimary` in attributes.&#xA;This ensures that a theme change from a light to a dark theme can be uniformlyapplied across the app."
+        errorLine1="    &lt;color name=&quot;setup_divider_color_dark&quot;>#33ffffff&lt;/color>"
+        errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/values/colors.xml"
+            line="33"
+            column="5"/>
+    </issue>
+
+    <issue
+        id="HardCodedColor"
+        severity="Error"
+        message="Avoid using hardcoded color"
+        category="Correctness"
+        priority="4"
+        summary="Using hardcoded color"
+        explanation="Hardcoded color values are bad because theme changes cannot be uniformly applied.Instead use the theme specific colors such as `?android:attr/textColorPrimary` in attributes.&#xA;This ensures that a theme change from a light to a dark theme can be uniformlyapplied across the app."
+        errorLine1="    &lt;color name=&quot;setup_divider_color_light&quot;>#33000000&lt;/color>"
+        errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/values/colors.xml"
+            line="34"
+            column="5"/>
+    </issue>
+
+    <issue
+        id="HardCodedColor"
+        severity="Error"
+        message="Avoid using hardcoded color"
+        category="Correctness"
+        priority="4"
+        summary="Using hardcoded color"
+        explanation="Hardcoded color values are bad because theme changes cannot be uniformly applied.Instead use the theme specific colors such as `?android:attr/textColorPrimary` in attributes.&#xA;This ensures that a theme change from a light to a dark theme can be uniformlyapplied across the app."
+        errorLine1="    &lt;color name=&quot;setup_lock_pattern_view_regular_color_dark&quot;>#ffbdbdbd&lt;/color>"
+        errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/values/colors.xml"
+            line="35"
+            column="5"/>
+    </issue>
+
+    <issue
+        id="HardCodedColor"
+        severity="Error"
+        message="Avoid using hardcoded color"
+        category="Correctness"
+        priority="4"
+        summary="Using hardcoded color"
+        explanation="Hardcoded color values are bad because theme changes cannot be uniformly applied.Instead use the theme specific colors such as `?android:attr/textColorPrimary` in attributes.&#xA;This ensures that a theme change from a light to a dark theme can be uniformlyapplied across the app."
+        errorLine1="    &lt;color name=&quot;setup_lock_pattern_view_success_color_dark&quot;>#ff84ffff&lt;/color>"
+        errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/values/colors.xml"
+            line="37"
+            column="5"/>
+    </issue>
+
+    <issue
+        id="HardCodedColor"
+        severity="Error"
+        message="Avoid using hardcoded color"
+        category="Correctness"
+        priority="4"
+        summary="Using hardcoded color"
+        explanation="Hardcoded color values are bad because theme changes cannot be uniformly applied.Instead use the theme specific colors such as `?android:attr/textColorPrimary` in attributes.&#xA;This ensures that a theme change from a light to a dark theme can be uniformlyapplied across the app."
+        errorLine1="    &lt;color name=&quot;setup_lock_pattern_view_error_color_dark&quot;>#fff44336&lt;/color>"
+        errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/values/colors.xml"
+            line="39"
+            column="5"/>
+    </issue>
+
+    <issue
+        id="HardCodedColor"
+        severity="Error"
+        message="Avoid using hardcoded color"
+        category="Correctness"
+        priority="4"
+        summary="Using hardcoded color"
+        explanation="Hardcoded color values are bad because theme changes cannot be uniformly applied.Instead use the theme specific colors such as `?android:attr/textColorPrimary` in attributes.&#xA;This ensures that a theme change from a light to a dark theme can be uniformlyapplied across the app."
+        errorLine1="    &lt;color name=&quot;setup_wizard_wifi_color_dark&quot;>#89ffffff&lt;/color>"
+        errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/values/colors.xml"
+            line="40"
+            column="5"/>
+    </issue>
+
+    <issue
+        id="HardCodedColor"
+        severity="Error"
+        message="Avoid using hardcoded color"
+        category="Correctness"
+        priority="4"
+        summary="Using hardcoded color"
+        explanation="Hardcoded color values are bad because theme changes cannot be uniformly applied.Instead use the theme specific colors such as `?android:attr/textColorPrimary` in attributes.&#xA;This ensures that a theme change from a light to a dark theme can be uniformlyapplied across the app."
+        errorLine1="    &lt;color name=&quot;setup_wizard_wifi_color_light&quot;>#89000000&lt;/color>"
+        errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/values/colors.xml"
+            line="41"
+            column="5"/>
+    </issue>
+
+    <issue
+        id="HardCodedColor"
+        severity="Error"
+        message="Avoid using hardcoded color"
+        category="Correctness"
+        priority="4"
+        summary="Using hardcoded color"
+        explanation="Hardcoded color values are bad because theme changes cannot be uniformly applied.Instead use the theme specific colors such as `?android:attr/textColorPrimary` in attributes.&#xA;This ensures that a theme change from a light to a dark theme can be uniformlyapplied across the app."
+        errorLine1="    &lt;color name=&quot;lock_pattern_background&quot;>#00000000&lt;/color>"
+        errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/values/colors.xml"
+            line="43"
+            column="5"/>
+    </issue>
+
+    <issue
+        id="HardCodedColor"
+        severity="Error"
+        message="Avoid using hardcoded color"
+        category="Correctness"
+        priority="4"
+        summary="Using hardcoded color"
+        explanation="Hardcoded color values are bad because theme changes cannot be uniformly applied.Instead use the theme specific colors such as `?android:attr/textColorPrimary` in attributes.&#xA;This ensures that a theme change from a light to a dark theme can be uniformlyapplied across the app."
+        errorLine1="    &lt;color name=&quot;lock_pattern_view_regular_color&quot;>#ff37474f&lt;/color>"
+        errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/values/colors.xml"
+            line="44"
+            column="5"/>
+    </issue>
+
+    <issue
+        id="HardCodedColor"
+        severity="Error"
+        message="Avoid using hardcoded color"
+        category="Correctness"
+        priority="4"
+        summary="Using hardcoded color"
+        explanation="Hardcoded color values are bad because theme changes cannot be uniformly applied.Instead use the theme specific colors such as `?android:attr/textColorPrimary` in attributes.&#xA;This ensures that a theme change from a light to a dark theme can be uniformlyapplied across the app."
+        errorLine1="    &lt;color name=&quot;lock_pattern_view_regular_color_dark&quot;>#ffffff&lt;/color>"
+        errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/values/colors.xml"
+            line="46"
+            column="5"/>
+    </issue>
+
+    <issue
+        id="HardCodedColor"
+        severity="Error"
+        message="Avoid using hardcoded color"
+        category="Correctness"
+        priority="4"
+        summary="Using hardcoded color"
+        explanation="Hardcoded color values are bad because theme changes cannot be uniformly applied.Instead use the theme specific colors such as `?android:attr/textColorPrimary` in attributes.&#xA;This ensures that a theme change from a light to a dark theme can be uniformlyapplied across the app."
+        errorLine1="    &lt;color name=&quot;fingerprint_title_color&quot;>#ffffffff&lt;/color>"
+        errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/values/colors.xml"
+            line="51"
+            column="5"/>
+    </issue>
+
+    <issue
+        id="HardCodedColor"
+        severity="Error"
+        message="Avoid using hardcoded color"
+        category="Correctness"
+        priority="4"
+        summary="Using hardcoded color"
+        explanation="Hardcoded color values are bad because theme changes cannot be uniformly applied.Instead use the theme specific colors such as `?android:attr/textColorPrimary` in attributes.&#xA;This ensures that a theme change from a light to a dark theme can be uniformlyapplied across the app."
+        errorLine1="    &lt;color name=&quot;fingerprint_message_color&quot;>#de000000&lt;/color>"
+        errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/values/colors.xml"
+            line="52"
+            column="5"/>
+    </issue>
+
+    <issue
+        id="HardCodedColor"
+        severity="Error"
+        message="Avoid using hardcoded color"
+        category="Correctness"
+        priority="4"
+        summary="Using hardcoded color"
+        explanation="Hardcoded color values are bad because theme changes cannot be uniformly applied.Instead use the theme specific colors such as `?android:attr/textColorPrimary` in attributes.&#xA;This ensures that a theme change from a light to a dark theme can be uniformlyapplied across the app."
+        errorLine1="    &lt;color name=&quot;fingerprint_indicator_background_resting&quot;>#12000000&lt;/color>"
+        errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/values/colors.xml"
+            line="53"
+            column="5"/>
+    </issue>
+
+    <issue
+        id="HardCodedColor"
+        severity="Error"
+        message="Avoid using hardcoded color"
+        category="Correctness"
+        priority="4"
+        summary="Using hardcoded color"
+        explanation="Hardcoded color values are bad because theme changes cannot be uniformly applied.Instead use the theme specific colors such as `?android:attr/textColorPrimary` in attributes.&#xA;This ensures that a theme change from a light to a dark theme can be uniformlyapplied across the app."
+        errorLine1="    &lt;color name=&quot;running_processes_system_ram&quot;>#ff384248&lt;/color>"
+        errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/values/colors.xml"
+            line="55"
+            column="5"/>
+    </issue>
+
+    <issue
+        id="HardCodedColor"
+        severity="Error"
+        message="Avoid using hardcoded color"
+        category="Correctness"
+        priority="4"
+        summary="Using hardcoded color"
+        explanation="Hardcoded color values are bad because theme changes cannot be uniformly applied.Instead use the theme specific colors such as `?android:attr/textColorPrimary` in attributes.&#xA;This ensures that a theme change from a light to a dark theme can be uniformlyapplied across the app."
+        errorLine1="    &lt;color name=&quot;running_processes_free_ram&quot;>#ffced7db&lt;/color>"
+        errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/values/colors.xml"
+            line="56"
+            column="5"/>
+    </issue>
+
+    <issue
+        id="HardCodedColor"
+        severity="Error"
+        message="Avoid using hardcoded color"
+        category="Correctness"
+        priority="4"
+        summary="Using hardcoded color"
+        explanation="Hardcoded color values are bad because theme changes cannot be uniformly applied.Instead use the theme specific colors such as `?android:attr/textColorPrimary` in attributes.&#xA;This ensures that a theme change from a light to a dark theme can be uniformlyapplied across the app."
+        errorLine1="    &lt;color name=&quot;wifi_divider&quot;>#ffe0e0e0&lt;/color>"
+        errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/values/colors.xml"
+            line="58"
+            column="5"/>
+    </issue>
+
+    <issue
+        id="HardCodedColor"
+        severity="Error"
+        message="Avoid using hardcoded color"
+        category="Correctness"
+        priority="4"
+        summary="Using hardcoded color"
+        explanation="Hardcoded color values are bad because theme changes cannot be uniformly applied.Instead use the theme specific colors such as `?android:attr/textColorPrimary` in attributes.&#xA;This ensures that a theme change from a light to a dark theme can be uniformlyapplied across the app."
+        errorLine1="    &lt;color name=&quot;confirm_device_credential_transparent_black&quot;>#60000000&lt;/color>"
+        errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/values/colors.xml"
+            line="61"
+            column="5"/>
+    </issue>
+
+    <issue
+        id="HardCodedColor"
+        severity="Error"
+        message="Avoid using hardcoded color"
+        category="Correctness"
+        priority="4"
+        summary="Using hardcoded color"
+        explanation="Hardcoded color values are bad because theme changes cannot be uniformly applied.Instead use the theme specific colors such as `?android:attr/textColorPrimary` in attributes.&#xA;This ensures that a theme change from a light to a dark theme can be uniformlyapplied across the app."
+        errorLine1="    &lt;color name=&quot;voice_interaction_highlight&quot;>#33b5e5&lt;/color>"
+        errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/values/colors.xml"
+            line="62"
+            column="5"/>
+    </issue>
+
+    <issue
+        id="HardCodedColor"
+        severity="Error"
+        message="Avoid using hardcoded color"
+        category="Correctness"
+        priority="4"
+        summary="Using hardcoded color"
+        explanation="Hardcoded color values are bad because theme changes cannot be uniformly applied.Instead use the theme specific colors such as `?android:attr/textColorPrimary` in attributes.&#xA;This ensures that a theme change from a light to a dark theme can be uniformlyapplied across the app."
+        errorLine1="    &lt;color name=&quot;memory_normal&quot;>#ff009587&lt;/color>"
+        errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/values/colors.xml"
+            line="66"
+            column="5"/>
+    </issue>
+
+    <issue
+        id="HardCodedColor"
+        severity="Error"
+        message="Avoid using hardcoded color"
+        category="Correctness"
+        priority="4"
+        summary="Using hardcoded color"
+        explanation="Hardcoded color values are bad because theme changes cannot be uniformly applied.Instead use the theme specific colors such as `?android:attr/textColorPrimary` in attributes.&#xA;This ensures that a theme change from a light to a dark theme can be uniformlyapplied across the app."
+        errorLine1="    &lt;color name=&quot;memory_moderate&quot;>#ffF3B300&lt;/color>"
+        errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/values/colors.xml"
+            line="67"
+            column="5"/>
+    </issue>
+
+    <issue
+        id="HardCodedColor"
+        severity="Error"
+        message="Avoid using hardcoded color"
+        category="Correctness"
+        priority="4"
+        summary="Using hardcoded color"
+        explanation="Hardcoded color values are bad because theme changes cannot be uniformly applied.Instead use the theme specific colors such as `?android:attr/textColorPrimary` in attributes.&#xA;This ensures that a theme change from a light to a dark theme can be uniformlyapplied across the app."
+        errorLine1="    &lt;color name=&quot;memory_low&quot;>#ffff9700&lt;/color>"
+        errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/values/colors.xml"
+            line="68"
+            column="5"/>
+    </issue>
+
+    <issue
+        id="HardCodedColor"
+        severity="Error"
+        message="Avoid using hardcoded color"
+        category="Correctness"
+        priority="4"
+        summary="Using hardcoded color"
+        explanation="Hardcoded color values are bad because theme changes cannot be uniformly applied.Instead use the theme specific colors such as `?android:attr/textColorPrimary` in attributes.&#xA;This ensures that a theme change from a light to a dark theme can be uniformlyapplied across the app."
+        errorLine1="    &lt;color name=&quot;memory_critical&quot;>#ffff5621&lt;/color>"
+        errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/values/colors.xml"
+            line="69"
+            column="5"/>
+    </issue>
+
+    <issue
+        id="HardCodedColor"
+        severity="Error"
+        message="Avoid using hardcoded color"
+        category="Correctness"
+        priority="4"
+        summary="Using hardcoded color"
+        explanation="Hardcoded color values are bad because theme changes cannot be uniformly applied.Instead use the theme specific colors such as `?android:attr/textColorPrimary` in attributes.&#xA;This ensures that a theme change from a light to a dark theme can be uniformlyapplied across the app."
+        errorLine1="    &lt;color name=&quot;memory_avg_use&quot;>#ff384248&lt;/color>"
+        errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/values/colors.xml"
+            line="71"
+            column="5"/>
+    </issue>
+
+    <issue
+        id="HardCodedColor"
+        severity="Error"
+        message="Avoid using hardcoded color"
+        category="Correctness"
+        priority="4"
+        summary="Using hardcoded color"
+        explanation="Hardcoded color values are bad because theme changes cannot be uniformly applied.Instead use the theme specific colors such as `?android:attr/textColorPrimary` in attributes.&#xA;This ensures that a theme change from a light to a dark theme can be uniformlyapplied across the app."
+        errorLine1="    &lt;color name=&quot;icon_accent&quot;>#ffabffec&lt;/color>"
+        errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/values/colors.xml"
+            line="74"
+            column="5"/>
+    </issue>
+
+    <issue
+        id="HardCodedColor"
+        severity="Error"
+        message="Avoid using hardcoded color"
+        category="Correctness"
+        priority="4"
+        summary="Using hardcoded color"
+        explanation="Hardcoded color values are bad because theme changes cannot be uniformly applied.Instead use the theme specific colors such as `?android:attr/textColorPrimary` in attributes.&#xA;This ensures that a theme change from a light to a dark theme can be uniformlyapplied across the app."
+        errorLine1="    &lt;color name=&quot;importance_icon_tint&quot;>#8a000000&lt;/color>"
+        errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/values/colors.xml"
+            line="76"
+            column="5"/>
+    </issue>
+
+    <issue
+        id="HardCodedColor"
+        severity="Error"
+        message="Avoid using hardcoded color"
+        category="Correctness"
+        priority="4"
+        summary="Using hardcoded color"
+        explanation="Hardcoded color values are bad because theme changes cannot be uniformly applied.Instead use the theme specific colors such as `?android:attr/textColorPrimary` in attributes.&#xA;This ensures that a theme change from a light to a dark theme can be uniformlyapplied across the app."
+        errorLine1="    &lt;color name=&quot;importance_disabled_tint&quot;>#4d000000&lt;/color>"
+        errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/values/colors.xml"
+            line="77"
+            column="5"/>
+    </issue>
+
+    <issue
+        id="HardCodedColor"
+        severity="Error"
+        message="Avoid using hardcoded color"
+        category="Correctness"
+        priority="4"
+        summary="Using hardcoded color"
+        explanation="Hardcoded color values are bad because theme changes cannot be uniformly applied.Instead use the theme specific colors such as `?android:attr/textColorPrimary` in attributes.&#xA;This ensures that a theme change from a light to a dark theme can be uniformlyapplied across the app."
+        errorLine1="    &lt;color name=&quot;material_blue_500&quot;>#4285F4&lt;/color>"
+        errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/values/colors.xml"
+            line="80"
+            column="5"/>
+    </issue>
+
+    <issue
+        id="HardCodedColor"
+        severity="Error"
+        message="Avoid using hardcoded color"
+        category="Correctness"
+        priority="4"
+        summary="Using hardcoded color"
+        explanation="Hardcoded color values are bad because theme changes cannot be uniformly applied.Instead use the theme specific colors such as `?android:attr/textColorPrimary` in attributes.&#xA;This ensures that a theme change from a light to a dark theme can be uniformlyapplied across the app."
+        errorLine1="    &lt;color name=&quot;material_blue_700&quot;>#3367D6&lt;/color>"
+        errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/values/colors.xml"
+            line="81"
+            column="5"/>
+    </issue>
+
+    <issue
+        id="HardCodedColor"
+        severity="Error"
+        message="Avoid using hardcoded color"
+        category="Correctness"
+        priority="4"
+        summary="Using hardcoded color"
+        explanation="Hardcoded color values are bad because theme changes cannot be uniformly applied.Instead use the theme specific colors such as `?android:attr/textColorPrimary` in attributes.&#xA;This ensures that a theme change from a light to a dark theme can be uniformlyapplied across the app."
+        errorLine1="    &lt;color name=&quot;material_grey_100&quot;>#f5f5f5&lt;/color>"
+        errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/values/colors.xml"
+            line="82"
+            column="5"/>
+    </issue>
+
+    <issue
+        id="HardCodedColor"
+        severity="Error"
+        message="Avoid using hardcoded color"
+        category="Correctness"
+        priority="4"
+        summary="Using hardcoded color"
+        explanation="Hardcoded color values are bad because theme changes cannot be uniformly applied.Instead use the theme specific colors such as `?android:attr/textColorPrimary` in attributes.&#xA;This ensures that a theme change from a light to a dark theme can be uniformlyapplied across the app."
+        errorLine1="    &lt;color name=&quot;material_grey_200&quot;>#ffffff&lt;/color>"
+        errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/values/colors.xml"
+            line="83"
+            column="5"/>
+    </issue>
+
+    <issue
+        id="HardCodedColor"
+        severity="Error"
+        message="Avoid using hardcoded color"
+        category="Correctness"
+        priority="4"
+        summary="Using hardcoded color"
+        explanation="Hardcoded color values are bad because theme changes cannot be uniformly applied.Instead use the theme specific colors such as `?android:attr/textColorPrimary` in attributes.&#xA;This ensures that a theme change from a light to a dark theme can be uniformlyapplied across the app."
+        errorLine1="    &lt;color name=&quot;message_text_incoming&quot;>#ffffffff&lt;/color>"
+        errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/values/colors.xml"
+            line="85"
+            column="5"/>
+    </issue>
+
+    <issue
+        id="HardCodedColor"
+        severity="Error"
+        message="Avoid using hardcoded color"
+        category="Correctness"
+        priority="4"
+        summary="Using hardcoded color"
+        explanation="Hardcoded color values are bad because theme changes cannot be uniformly applied.Instead use the theme specific colors such as `?android:attr/textColorPrimary` in attributes.&#xA;This ensures that a theme change from a light to a dark theme can be uniformlyapplied across the app."
+        errorLine1="    &lt;color name=&quot;message_text_outgoing&quot;>#ff323232&lt;/color>"
+        errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/values/colors.xml"
+            line="86"
+            column="5"/>
+    </issue>
+
+    <issue
+        id="HardCodedColor"
+        severity="Error"
+        message="Avoid using hardcoded color"
+        category="Correctness"
+        priority="4"
+        summary="Using hardcoded color"
+        explanation="Hardcoded color values are bad because theme changes cannot be uniformly applied.Instead use the theme specific colors such as `?android:attr/textColorPrimary` in attributes.&#xA;This ensures that a theme change from a light to a dark theme can be uniformlyapplied across the app."
+        errorLine1="    &lt;color name=&quot;timestamp_text_outgoing&quot;>#99323232&lt;/color>"
+        errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/values/colors.xml"
+            line="87"
+            column="5"/>
+    </issue>
+
+    <issue
+        id="HardCodedColor"
+        severity="Error"
+        message="Avoid using hardcoded color"
+        category="Correctness"
+        priority="4"
+        summary="Using hardcoded color"
+        explanation="Hardcoded color values are bad because theme changes cannot be uniformly applied.Instead use the theme specific colors such as `?android:attr/textColorPrimary` in attributes.&#xA;This ensures that a theme change from a light to a dark theme can be uniformlyapplied across the app."
+        errorLine1="    &lt;color name=&quot;timestamp_text_incoming&quot;>#99ffffff&lt;/color>"
+        errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/values/colors.xml"
+            line="88"
+            column="5"/>
+    </issue>
+
+    <issue
+        id="HardCodedColor"
+        severity="Error"
+        message="Avoid using hardcoded color"
+        category="Correctness"
+        priority="4"
+        summary="Using hardcoded color"
+        explanation="Hardcoded color values are bad because theme changes cannot be uniformly applied.Instead use the theme specific colors such as `?android:attr/textColorPrimary` in attributes.&#xA;This ensures that a theme change from a light to a dark theme can be uniformlyapplied across the app."
+        errorLine1="    &lt;color name=&quot;message_bubble_incoming&quot;>#689f38&lt;/color>"
+        errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/values/colors.xml"
+            line="89"
+            column="5"/>
+    </issue>
+
+    <issue
+        id="HardCodedColor"
+        severity="Error"
+        message="Avoid using hardcoded color"
+        category="Correctness"
+        priority="4"
+        summary="Using hardcoded color"
+        explanation="Hardcoded color values are bad because theme changes cannot be uniformly applied.Instead use the theme specific colors such as `?android:attr/textColorPrimary` in attributes.&#xA;This ensures that a theme change from a light to a dark theme can be uniformlyapplied across the app."
+        errorLine1="    &lt;color name=&quot;message_bubble_outgoing&quot;>#ffffffff&lt;/color>"
+        errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/values/colors.xml"
+            line="90"
+            column="5"/>
+    </issue>
+
+    <issue
+        id="HardCodedColor"
+        severity="Error"
+        message="Avoid using hardcoded color"
+        category="Correctness"
+        priority="4"
+        summary="Using hardcoded color"
+        explanation="Hardcoded color values are bad because theme changes cannot be uniformly applied.Instead use the theme specific colors such as `?android:attr/textColorPrimary` in attributes.&#xA;This ensures that a theme change from a light to a dark theme can be uniformlyapplied across the app."
+        errorLine1="    &lt;color name=&quot;conversation_background&quot;>#eeeeee&lt;/color>"
+        errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/values/colors.xml"
+            line="91"
+            column="5"/>
+    </issue>
+
+    <issue
+        id="HardCodedColor"
+        severity="Error"
+        message="Avoid using hardcoded color"
+        category="Correctness"
+        priority="4"
+        summary="Using hardcoded color"
+        explanation="Hardcoded color values are bad because theme changes cannot be uniformly applied.Instead use the theme specific colors such as `?android:attr/textColorPrimary` in attributes.&#xA;This ensures that a theme change from a light to a dark theme can be uniformlyapplied across the app."
+        errorLine1="    &lt;color name=&quot;message_icon_background_incoming&quot;>#689f38&lt;/color>"
+        errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/values/colors.xml"
+            line="92"
+            column="5"/>
+    </issue>
+
+    <issue
+        id="HardCodedColor"
+        severity="Error"
+        message="Avoid using hardcoded color"
+        category="Correctness"
+        priority="4"
+        summary="Using hardcoded color"
+        explanation="Hardcoded color values are bad because theme changes cannot be uniformly applied.Instead use the theme specific colors such as `?android:attr/textColorPrimary` in attributes.&#xA;This ensures that a theme change from a light to a dark theme can be uniformlyapplied across the app."
+        errorLine1="    &lt;color name=&quot;message_icon_text_incoming&quot;>#ffffffff&lt;/color>"
+        errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/values/colors.xml"
+            line="93"
+            column="5"/>
+    </issue>
+
+    <issue
+        id="HardCodedColor"
+        severity="Error"
+        message="Avoid using hardcoded color"
+        category="Correctness"
+        priority="4"
+        summary="Using hardcoded color"
+        explanation="Hardcoded color values are bad because theme changes cannot be uniformly applied.Instead use the theme specific colors such as `?android:attr/textColorPrimary` in attributes.&#xA;This ensures that a theme change from a light to a dark theme can be uniformlyapplied across the app."
+        errorLine1="    &lt;color name=&quot;message_icon_background_outgoing&quot;>#4285f4&lt;/color>"
+        errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/values/colors.xml"
+            line="94"
+            column="5"/>
+    </issue>
+
+    <issue
+        id="HardCodedColor"
+        severity="Error"
+        message="Avoid using hardcoded color"
+        category="Correctness"
+        priority="4"
+        summary="Using hardcoded color"
+        explanation="Hardcoded color values are bad because theme changes cannot be uniformly applied.Instead use the theme specific colors such as `?android:attr/textColorPrimary` in attributes.&#xA;This ensures that a theme change from a light to a dark theme can be uniformlyapplied across the app."
+        errorLine1="    &lt;color name=&quot;message_icon_text_outgoing&quot;>#ffffffff&lt;/color>"
+        errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/values/colors.xml"
+            line="95"
+            column="5"/>
+    </issue>
+
+    <issue
+        id="HardCodedColor"
+        severity="Error"
+        message="Avoid using hardcoded color"
+        category="Correctness"
+        priority="4"
+        summary="Using hardcoded color"
+        explanation="Hardcoded color values are bad because theme changes cannot be uniformly applied.Instead use the theme specific colors such as `?android:attr/textColorPrimary` in attributes.&#xA;This ensures that a theme change from a light to a dark theme can be uniformlyapplied across the app."
+        errorLine1="    &lt;color name=&quot;importance_secondary_slider_color&quot;>#858383&lt;/color>"
+        errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/values/colors.xml"
+            line="98"
+            column="5"/>
+    </issue>
+
+    <issue
+        id="HardCodedColor"
+        severity="Error"
+        message="Avoid using hardcoded color"
+        category="Correctness"
+        priority="4"
+        summary="Using hardcoded color"
+        explanation="Hardcoded color values are bad because theme changes cannot be uniformly applied.Instead use the theme specific colors such as `?android:attr/textColorPrimary` in attributes.&#xA;This ensures that a theme change from a light to a dark theme can be uniformlyapplied across the app."
+        errorLine1="    &lt;color name=&quot;usage_graph_dots&quot;>#B0BEC5&lt;/color>"
+        errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/values/colors.xml"
+            line="100"
+            column="5"/>
+    </issue>
+
+    <issue
+        id="HardCodedColor"
+        severity="Error"
+        message="Avoid using hardcoded color"
+        category="Correctness"
+        priority="4"
+        summary="Using hardcoded color"
+        explanation="Hardcoded color values are bad because theme changes cannot be uniformly applied.Instead use the theme specific colors such as `?android:attr/textColorPrimary` in attributes.&#xA;This ensures that a theme change from a light to a dark theme can be uniformlyapplied across the app."
+        errorLine1="    &lt;color name=&quot;gestures_setting_background_color&quot;>#f4f4f4&lt;/color>"
+        errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/values/colors.xml"
+            line="103"
+            column="5"/>
+    </issue>
+
+    <issue
+        id="HardCodedColor"
+        severity="Error"
+        message="Avoid using hardcoded color"
+        category="Correctness"
+        priority="4"
+        summary="Using hardcoded color"
+        explanation="Hardcoded color values are bad because theme changes cannot be uniformly applied.Instead use the theme specific colors such as `?android:attr/textColorPrimary` in attributes.&#xA;This ensures that a theme change from a light to a dark theme can be uniformlyapplied across the app."
+        errorLine1="    &lt;color name=&quot;status_bar_color&quot;>#3c3c3c&lt;/color>"
+        errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/values/colors.xml"
+            line="105"
+            column="5"/>
+    </issue>
+
+    <issue
+        id="HardCodedColor"
+        severity="Error"
+        message="Avoid using hardcoded color"
+        category="Correctness"
+        priority="4"
+        summary="Using hardcoded color"
+        explanation="Hardcoded color values are bad because theme changes cannot be uniformly applied.Instead use the theme specific colors such as `?android:attr/textColorPrimary` in attributes.&#xA;This ensures that a theme change from a light to a dark theme can be uniformlyapplied across the app."
+        errorLine1="    &lt;color name=&quot;shortcut_background&quot;>#fff5f5f5&lt;/color>"
+        errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/values/colors.xml"
+            line="108"
+            column="5"/>
+    </issue>
+
+    <issue
+        id="HardCodedColor"
+        severity="Error"
+        message="Avoid using hardcoded color"
+        category="Correctness"
+        priority="4"
+        summary="Using hardcoded color"
+        explanation="Hardcoded color values are bad because theme changes cannot be uniformly applied.Instead use the theme specific colors such as `?android:attr/textColorPrimary` in attributes.&#xA;This ensures that a theme change from a light to a dark theme can be uniformlyapplied across the app."
+        errorLine1="    &lt;color name=&quot;wifi_details_icon_color&quot;>#8A000000&lt;/color>"
+        errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/values/colors.xml"
+            line="111"
+            column="5"/>
+    </issue>
+
+    <issue
+        id="HardCodedColor"
+        severity="Error"
+        message="Avoid using hardcoded color"
+        category="Correctness"
+        priority="4"
+        summary="Using hardcoded color"
+        explanation="Hardcoded color values are bad because theme changes cannot be uniformly applied.Instead use the theme specific colors such as `?android:attr/textColorPrimary` in attributes.&#xA;This ensures that a theme change from a light to a dark theme can be uniformlyapplied across the app."
+        errorLine1="    &lt;color name=&quot;fallback_tintColor&quot;>#89000000&lt;/color>"
+        errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/values/colors.xml"
+            line="114"
+            column="5"/>
+    </issue>
+
+    <issue
+        id="HardCodedColor"
+        severity="Error"
+        message="Avoid using hardcoded color"
+        category="Correctness"
+        priority="4"
+        summary="Using hardcoded color"
+        explanation="Hardcoded color values are bad because theme changes cannot be uniformly applied.Instead use the theme specific colors such as `?android:attr/textColorPrimary` in attributes.&#xA;This ensures that a theme change from a light to a dark theme can be uniformlyapplied across the app."
+        errorLine1="    &lt;color name=&quot;suggestion_condition_background&quot;>#f2f2f2&lt;/color>"
+        errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/values/colors.xml"
+            line="117"
+            column="5"/>
+    </issue>
+
+    <issue
+        id="HardCodedColor"
+        severity="Error"
+        message="Avoid using hardcoded color"
+        category="Correctness"
+        priority="4"
+        summary="Using hardcoded color"
+        explanation="Hardcoded color values are bad because theme changes cannot be uniformly applied.Instead use the theme specific colors such as `?android:attr/textColorPrimary` in attributes.&#xA;This ensures that a theme change from a light to a dark theme can be uniformlyapplied across the app."
+        errorLine1="    &lt;color name=&quot;condition_card_background&quot;>#f8f8f8&lt;/color>"
+        errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/values/colors.xml"
+            line="118"
+            column="5"/>
+    </issue>
+
+    <issue
+        id="HardCodedColor"
+        severity="Error"
+        message="Avoid using hardcoded color"
+        category="Correctness"
+        priority="4"
+        summary="Using hardcoded color"
+        explanation="Hardcoded color values are bad because theme changes cannot be uniformly applied.Instead use the theme specific colors such as `?android:attr/textColorPrimary` in attributes.&#xA;This ensures that a theme change from a light to a dark theme can be uniformlyapplied across the app."
+        errorLine1="    android:background=&quot;@color/condition_card_background&quot;"
+        errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/layout/condition_tile.xml"
+            line="22"
+            column="5"/>
+    </issue>
+
+    <issue
+        id="HardCodedColor"
+        severity="Error"
+        message="Avoid using hardcoded color"
+        category="Correctness"
+        priority="4"
+        summary="Using hardcoded color"
+        explanation="Hardcoded color values are bad because theme changes cannot be uniformly applied.Instead use the theme specific colors such as `?android:attr/textColorPrimary` in attributes.&#xA;This ensures that a theme change from a light to a dark theme can be uniformlyapplied across the app."
+        errorLine1="                android:background=&quot;@color/lock_pattern_background&quot; />"
+        errorLine2="                ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/layout-land/confirm_lock_pattern_internal.xml"
+            line="110"
+            column="17"/>
+    </issue>
+
+    <issue
+        id="HardCodedColor"
+        severity="Error"
+        message="Avoid using hardcoded color"
+        category="Correctness"
+        priority="4"
+        summary="Using hardcoded color"
+        explanation="Hardcoded color values are bad because theme changes cannot be uniformly applied.Instead use the theme specific colors such as `?android:attr/textColorPrimary` in attributes.&#xA;This ensures that a theme change from a light to a dark theme can be uniformlyapplied across the app."
+        errorLine1="       android:color=&quot;#FF0000&quot;/>"
+        errorLine2="       ~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/drawable/conversation_message_icon.xml"
+            line="21"
+            column="8"/>
+    </issue>
+
+    <issue
+        id="HardCodedColor"
+        severity="Error"
+        message="Avoid using hardcoded color"
+        category="Correctness"
+        priority="4"
+        summary="Using hardcoded color"
+        explanation="Hardcoded color values are bad because theme changes cannot be uniformly applied.Instead use the theme specific colors such as `?android:attr/textColorPrimary` in attributes.&#xA;This ensures that a theme change from a light to a dark theme can be uniformlyapplied across the app."
+        errorLine1="                android:textColor=&quot;@color/red&quot;"
+        errorLine2="                ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/layout/credentials_dialog.xml"
+            line="36"
+            column="17"/>
+    </issue>
+
+    <issue
+        id="HardCodedColor"
+        severity="Error"
+        message="Avoid using hardcoded color"
+        category="Correctness"
+        priority="4"
+        summary="Using hardcoded color"
+        explanation="Hardcoded color values are bad because theme changes cannot be uniformly applied.Instead use the theme specific colors such as `?android:attr/textColorPrimary` in attributes.&#xA;This ensures that a theme change from a light to a dark theme can be uniformlyapplied across the app."
+        errorLine1="        android:textColor=&quot;#FFFFFF&quot;"
+        errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/layout/crypt_keeper_emergency_button.xml"
+            line="36"
+            column="9"/>
+    </issue>
+
+    <issue
+        id="HardCodedColor"
+        severity="Error"
+        message="Avoid using hardcoded color"
+        category="Correctness"
+        priority="4"
+        summary="Using hardcoded color"
+        explanation="Hardcoded color values are bad because theme changes cannot be uniformly applied.Instead use the theme specific colors such as `?android:attr/textColorPrimary` in attributes.&#xA;This ensures that a theme change from a light to a dark theme can be uniformlyapplied across the app."
+        errorLine1="        android:background=&quot;@color/crypt_keeper_password_background&quot;>"
+        errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/layout/crypt_keeper_password_entry.xml"
+            line="34"
+            column="9"/>
+    </issue>
+
+    <issue
+        id="HardCodedColor"
+        severity="Error"
+        message="Avoid using hardcoded color"
+        category="Correctness"
+        priority="4"
+        summary="Using hardcoded color"
+        explanation="Hardcoded color values are bad because theme changes cannot be uniformly applied.Instead use the theme specific colors such as `?android:attr/textColorPrimary` in attributes.&#xA;This ensures that a theme change from a light to a dark theme can be uniformlyapplied across the app."
+        errorLine1="       android:background=&quot;@color/lock_pattern_background&quot; />"
+        errorLine2="       ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/layout/crypt_keeper_pattern_field.xml"
+            line="27"
+            column="8"/>
+    </issue>
+
+    <issue
+        id="HardCodedColor"
+        severity="Error"
+        message="Avoid using hardcoded color"
+        category="Correctness"
+        priority="4"
+        summary="Using hardcoded color"
+        explanation="Hardcoded color values are bad because theme changes cannot be uniformly applied.Instead use the theme specific colors such as `?android:attr/textColorPrimary` in attributes.&#xA;This ensures that a theme change from a light to a dark theme can be uniformlyapplied across the app."
+        errorLine1="        android:background=&quot;@color/crypt_keeper_password_background&quot;>"
+        errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/layout/crypt_keeper_pin_entry.xml"
+            line="34"
+            column="9"/>
+    </issue>
+
+    <issue
+        id="HardCodedColor"
+        severity="Error"
+        message="Avoid using hardcoded color"
+        category="Correctness"
+        priority="4"
+        summary="Using hardcoded color"
+        explanation="Hardcoded color values are bad because theme changes cannot be uniformly applied.Instead use the theme specific colors such as `?android:attr/textColorPrimary` in attributes.&#xA;This ensures that a theme change from a light to a dark theme can be uniformlyapplied across the app."
+        errorLine1="        android:textColor=&quot;#B3FFFFFF&quot;"
+        errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/layout/crypt_keeper_status.xml"
+            line="55"
+            column="9"/>
+    </issue>
+
+    <issue
+        id="HardCodedColor"
+        severity="Error"
+        message="Avoid using hardcoded color"
+        category="Correctness"
+        priority="4"
+        summary="Using hardcoded color"
+        explanation="Hardcoded color values are bad because theme changes cannot be uniformly applied.Instead use the theme specific colors such as `?android:attr/textColorPrimary` in attributes.&#xA;This ensures that a theme change from a light to a dark theme can be uniformlyapplied across the app."
+        errorLine1="        settings:fillColorSecondary=&quot;#ff80cbc4&quot;"
+        errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/layout/data_usage_chart.xml"
+            line="47"
+            column="9"/>
+    </issue>
+
+    <issue
+        id="HardCodedColor"
+        severity="Error"
+        message="Avoid using hardcoded color"
+        category="Correctness"
+        priority="4"
+        summary="Using hardcoded color"
+        explanation="Hardcoded color values are bad because theme changes cannot be uniformly applied.Instead use the theme specific colors such as `?android:attr/textColorPrimary` in attributes.&#xA;This ensures that a theme change from a light to a dark theme can be uniformlyapplied across the app."
+        errorLine1="    android:background=&quot;#80000000&quot;"
+        errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/layout/fallback_home_finishing_boot.xml"
+            line="22"
+            column="5"/>
+    </issue>
+
+    <issue
+        id="HardCodedColor"
+        severity="Error"
+        message="Avoid using hardcoded color"
+        category="Correctness"
+        priority="4"
+        summary="Using hardcoded color"
+        explanation="Hardcoded color values are bad because theme changes cannot be uniformly applied.Instead use the theme specific colors such as `?android:attr/textColorPrimary` in attributes.&#xA;This ensures that a theme change from a light to a dark theme can be uniformlyapplied across the app."
+        errorLine1="    android:color=&quot;#000000&quot; />"
+        errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/drawable/fallback_home_unprovisioned_background.xml"
+            line="19"
+            column="5"/>
+    </issue>
+
+    <issue
+        id="HardCodedColor"
+        severity="Error"
+        message="Avoid using hardcoded color"
+        category="Correctness"
+        priority="4"
+        summary="Using hardcoded color"
+        explanation="Hardcoded color values are bad because theme changes cannot be uniformly applied.Instead use the theme specific colors such as `?android:attr/textColorPrimary` in attributes.&#xA;This ensures that a theme change from a light to a dark theme can be uniformlyapplied across the app."
+        errorLine1="        android:background=&quot;@color/gestures_setting_background_color&quot;"
+        errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/layout/gesture_preference.xml"
+            line="57"
+            column="9"/>
+    </issue>
+
+    <issue
+        id="HardCodedColor"
+        severity="Error"
+        message="Avoid using hardcoded color"
+        category="Correctness"
+        priority="4"
+        summary="Using hardcoded color"
+        explanation="Hardcoded color values are bad because theme changes cannot be uniformly applied.Instead use the theme specific colors such as `?android:attr/textColorPrimary` in attributes.&#xA;This ensures that a theme change from a light to a dark theme can be uniformlyapplied across the app."
+        errorLine1="                android:background=&quot;@color/gestures_setting_background_color&quot;/>"
+        errorLine2="                ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/layout/gesture_preference.xml"
+            line="78"
+            column="17"/>
+    </issue>
+
+    <issue
+        id="HardCodedColor"
+        severity="Error"
+        message="Avoid using hardcoded color"
+        category="Correctness"
+        priority="4"
+        summary="Using hardcoded color"
+        explanation="Hardcoded color values are bad because theme changes cannot be uniformly applied.Instead use the theme specific colors such as `?android:attr/textColorPrimary` in attributes.&#xA;This ensures that a theme change from a light to a dark theme can be uniformlyapplied across the app."
+        errorLine1="        android:tint=&quot;@color/wifi_details_icon_color&quot;>"
+        errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/drawable/ic_frequency_antenna.xml"
+            line="22"
+            column="9"/>
+    </issue>
+
+    <issue
+        id="HardCodedColor"
+        severity="Error"
+        message="Avoid using hardcoded color"
+        category="Correctness"
+        priority="4"
+        summary="Using hardcoded color"
+        explanation="Hardcoded color values are bad because theme changes cannot be uniformly applied.Instead use the theme specific colors such as `?android:attr/textColorPrimary` in attributes.&#xA;This ensures that a theme change from a light to a dark theme can be uniformlyapplied across the app."
+        errorLine1="    android:tint=&quot;#db4437&quot;"
+        errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/drawable/ic_remove_circle.xml"
+            line="19"
+            column="5"/>
+    </issue>
+
+    <issue
+        id="HardCodedColor"
+        severity="Error"
+        message="Avoid using hardcoded color"
+        category="Correctness"
+        priority="4"
+        summary="Using hardcoded color"
+        explanation="Hardcoded color values are bad because theme changes cannot be uniformly applied.Instead use the theme specific colors such as `?android:attr/textColorPrimary` in attributes.&#xA;This ensures that a theme change from a light to a dark theme can be uniformlyapplied across the app."
+        errorLine1="        android:tint=&quot;@color/wifi_details_icon_color&quot;>"
+        errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/drawable/ic_security_lock_24dp.xml"
+            line="22"
+            column="9"/>
+    </issue>
+
+    <issue
+        id="HardCodedColor"
+        severity="Error"
+        message="Avoid using hardcoded color"
+        category="Correctness"
+        priority="4"
+        summary="Using hardcoded color"
+        explanation="Hardcoded color values are bad because theme changes cannot be uniformly applied.Instead use the theme specific colors such as `?android:attr/textColorPrimary` in attributes.&#xA;This ensures that a theme change from a light to a dark theme can be uniformlyapplied across the app."
+        errorLine1="    &lt;background android:drawable=&quot;@color/shortcut_background&quot;/>"
+        errorLine2="                ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/drawable/ic_shortcut_battery.xml"
+            line="18"
+            column="17"/>
+    </issue>
+
+    <issue
+        id="HardCodedColor"
+        severity="Error"
+        message="Avoid using hardcoded color"
+        category="Correctness"
+        priority="4"
+        summary="Using hardcoded color"
+        explanation="Hardcoded color values are bad because theme changes cannot be uniformly applied.Instead use the theme specific colors such as `?android:attr/textColorPrimary` in attributes.&#xA;This ensures that a theme change from a light to a dark theme can be uniformlyapplied across the app."
+        errorLine1="    &lt;background android:drawable=&quot;@color/shortcut_background&quot;/>"
+        errorLine2="                ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/drawable/ic_shortcut_data_usage.xml"
+            line="18"
+            column="17"/>
+    </issue>
+
+    <issue
+        id="HardCodedColor"
+        severity="Error"
+        message="Avoid using hardcoded color"
+        category="Correctness"
+        priority="4"
+        summary="Using hardcoded color"
+        explanation="Hardcoded color values are bad because theme changes cannot be uniformly applied.Instead use the theme specific colors such as `?android:attr/textColorPrimary` in attributes.&#xA;This ensures that a theme change from a light to a dark theme can be uniformlyapplied across the app."
+        errorLine1="    &lt;background android:drawable=&quot;@color/shortcut_background&quot;/>"
+        errorLine2="                ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/drawable/ic_shortcut_wireless.xml"
+            line="18"
+            column="17"/>
+    </issue>
+
+    <issue
+        id="HardCodedColor"
+        severity="Error"
+        message="Avoid using hardcoded color"
+        category="Correctness"
+        priority="4"
+        summary="Using hardcoded color"
+        explanation="Hardcoded color values are bad because theme changes cannot be uniformly applied.Instead use the theme specific colors such as `?android:attr/textColorPrimary` in attributes.&#xA;This ensures that a theme change from a light to a dark theme can be uniformlyapplied across the app."
+        errorLine1="    android:background=&quot;#FF80CBC4&quot; >"
+        errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/layout-sw600dp/nfc_payment_how_it_works.xml"
+            line="6"
+            column="5"/>
+    </issue>
+
+    <issue
+        id="HardCodedColor"
+        severity="Error"
+        message="Avoid using hardcoded color"
+        category="Correctness"
+        priority="4"
+        summary="Using hardcoded color"
+        explanation="Hardcoded color values are bad because theme changes cannot be uniformly applied.Instead use the theme specific colors such as `?android:attr/textColorPrimary` in attributes.&#xA;This ensures that a theme change from a light to a dark theme can be uniformlyapplied across the app."
+        errorLine1="    android:background=&quot;#FF80CBC4&quot; >"
+        errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/layout/nfc_payment_how_it_works.xml"
+            line="6"
+            column="5"/>
+    </issue>
+
+    <issue
+        id="HardCodedColor"
+        severity="Error"
+        message="Avoid using hardcoded color"
+        category="Correctness"
+        priority="4"
+        summary="Using hardcoded color"
+        explanation="Hardcoded color values are bad because theme changes cannot be uniformly applied.Instead use the theme specific colors such as `?android:attr/textColorPrimary` in attributes.&#xA;This ensures that a theme change from a light to a dark theme can be uniformlyapplied across the app."
+        errorLine1="            android:background=&quot;#FFB2DFDB&quot; >"
+        errorLine2="            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/layout-sw600dp/nfc_payment_how_it_works.xml"
+            line="15"
+            column="13"/>
+    </issue>
+
+    <issue
+        id="HardCodedColor"
+        severity="Error"
+        message="Avoid using hardcoded color"
+        category="Correctness"
+        priority="4"
+        summary="Using hardcoded color"
+        explanation="Hardcoded color values are bad because theme changes cannot be uniformly applied.Instead use the theme specific colors such as `?android:attr/textColorPrimary` in attributes.&#xA;This ensures that a theme change from a light to a dark theme can be uniformlyapplied across the app."
+        errorLine1="            android:background=&quot;#FFB2DFDB&quot; >"
+        errorLine2="            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/layout/nfc_payment_how_it_works.xml"
+            line="15"
+            column="13"/>
+    </issue>
+
+    <issue
+        id="HardCodedColor"
+        severity="Error"
+        message="Avoid using hardcoded color"
+        category="Correctness"
+        priority="4"
+        summary="Using hardcoded color"
+        explanation="Hardcoded color values are bad because theme changes cannot be uniformly applied.Instead use the theme specific colors such as `?android:attr/textColorPrimary` in attributes.&#xA;This ensures that a theme change from a light to a dark theme can be uniformlyapplied across the app."
+        errorLine1="              android:textColor=&quot;#FF263238&quot;"
+        errorLine2="              ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/layout-sw600dp/nfc_payment_how_it_works.xml"
+            line="40"
+            column="15"/>
+    </issue>
+
+    <issue
+        id="HardCodedColor"
+        severity="Error"
+        message="Avoid using hardcoded color"
+        category="Correctness"
+        priority="4"
+        summary="Using hardcoded color"
+        explanation="Hardcoded color values are bad because theme changes cannot be uniformly applied.Instead use the theme specific colors such as `?android:attr/textColorPrimary` in attributes.&#xA;This ensures that a theme change from a light to a dark theme can be uniformlyapplied across the app."
+        errorLine1="                    android:textColor=&quot;#FF263238&quot;"
+        errorLine2="                    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/layout/nfc_payment_how_it_works.xml"
+            line="47"
+            column="21"/>
+    </issue>
+
+    <issue
+        id="HardCodedColor"
+        severity="Error"
+        message="Avoid using hardcoded color"
+        category="Correctness"
+        priority="4"
+        summary="Using hardcoded color"
+        explanation="Hardcoded color values are bad because theme changes cannot be uniformly applied.Instead use the theme specific colors such as `?android:attr/textColorPrimary` in attributes.&#xA;This ensures that a theme change from a light to a dark theme can be uniformlyapplied across the app."
+        errorLine1="              android:textColor=&quot;#FF263238&quot;"
+        errorLine2="              ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/layout-sw600dp/nfc_payment_how_it_works.xml"
+            line="50"
+            column="15"/>
+    </issue>
+
+    <issue
+        id="HardCodedColor"
+        severity="Error"
+        message="Avoid using hardcoded color"
+        category="Correctness"
+        priority="4"
+        summary="Using hardcoded color"
+        explanation="Hardcoded color values are bad because theme changes cannot be uniformly applied.Instead use the theme specific colors such as `?android:attr/textColorPrimary` in attributes.&#xA;This ensures that a theme change from a light to a dark theme can be uniformlyapplied across the app."
+        errorLine1="            android:background=&quot;#FFB2DFDB&quot; >"
+        errorLine2="            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/layout-sw600dp/nfc_payment_how_it_works.xml"
+            line="57"
+            column="13"/>
+    </issue>
+
+    <issue
+        id="HardCodedColor"
+        severity="Error"
+        message="Avoid using hardcoded color"
+        category="Correctness"
+        priority="4"
+        summary="Using hardcoded color"
+        explanation="Hardcoded color values are bad because theme changes cannot be uniformly applied.Instead use the theme specific colors such as `?android:attr/textColorPrimary` in attributes.&#xA;This ensures that a theme change from a light to a dark theme can be uniformlyapplied across the app."
+        errorLine1="                    android:textColor=&quot;#FF263238&quot;"
+        errorLine2="                    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/layout/nfc_payment_how_it_works.xml"
+            line="59"
+            column="21"/>
+    </issue>
+
+    <issue
+        id="HardCodedColor"
+        severity="Error"
+        message="Avoid using hardcoded color"
+        category="Correctness"
+        priority="4"
+        summary="Using hardcoded color"
+        explanation="Hardcoded color values are bad because theme changes cannot be uniformly applied.Instead use the theme specific colors such as `?android:attr/textColorPrimary` in attributes.&#xA;This ensures that a theme change from a light to a dark theme can be uniformlyapplied across the app."
+        errorLine1="              android:textColor=&quot;#263238&quot;"
+        errorLine2="              ~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/layout-sw600dp/nfc_payment_how_it_works.xml"
+            line="67"
+            column="15"/>
+    </issue>
+
+    <issue
+        id="HardCodedColor"
+        severity="Error"
+        message="Avoid using hardcoded color"
+        category="Correctness"
+        priority="4"
+        summary="Using hardcoded color"
+        explanation="Hardcoded color values are bad because theme changes cannot be uniformly applied.Instead use the theme specific colors such as `?android:attr/textColorPrimary` in attributes.&#xA;This ensures that a theme change from a light to a dark theme can be uniformlyapplied across the app."
+        errorLine1="            android:background=&quot;#FFB2DFDB&quot; >"
+        errorLine2="            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/layout/nfc_payment_how_it_works.xml"
+            line="68"
+            column="13"/>
+    </issue>
+
+    <issue
+        id="HardCodedColor"
+        severity="Error"
+        message="Avoid using hardcoded color"
+        category="Correctness"
+        priority="4"
+        summary="Using hardcoded color"
+        explanation="Hardcoded color values are bad because theme changes cannot be uniformly applied.Instead use the theme specific colors such as `?android:attr/textColorPrimary` in attributes.&#xA;This ensures that a theme change from a light to a dark theme can be uniformlyapplied across the app."
+        errorLine1="              android:textColor=&quot;#263238&quot;"
+        errorLine2="              ~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/layout/nfc_payment_how_it_works.xml"
+            line="78"
+            column="15"/>
+    </issue>
+
+    <issue
+        id="HardCodedColor"
+        severity="Error"
+        message="Avoid using hardcoded color"
+        category="Correctness"
+        priority="4"
+        summary="Using hardcoded color"
+        explanation="Hardcoded color values are bad because theme changes cannot be uniformly applied.Instead use the theme specific colors such as `?android:attr/textColorPrimary` in attributes.&#xA;This ensures that a theme change from a light to a dark theme can be uniformlyapplied across the app."
+        errorLine1="                android:textColor=&quot;#ffffb060&quot;"
+        errorLine2="                ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/layout/permission_settings.xml"
+            line="46"
+            column="17"/>
+    </issue>
+
+    <issue
+        id="HardCodedColor"
+        severity="Error"
+        message="Avoid using hardcoded color"
+        category="Correctness"
+        priority="4"
+        summary="Using hardcoded color"
+        explanation="Hardcoded color values are bad because theme changes cannot be uniformly applied.Instead use the theme specific colors such as `?android:attr/textColorPrimary` in attributes.&#xA;This ensures that a theme change from a light to a dark theme can be uniformlyapplied across the app."
+        errorLine1="                android:background=&quot;#00ffffff&quot;"
+        errorLine2="                ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/layout/preference_importance_slider.xml"
+            line="59"
+            column="17"/>
+    </issue>
+
+    <issue
+        id="HardCodedColor"
+        severity="Error"
+        message="Avoid using hardcoded color"
+        category="Correctness"
+        priority="4"
+        summary="Using hardcoded color"
+        explanation="Hardcoded color values are bad because theme changes cannot be uniformly applied.Instead use the theme specific colors such as `?android:attr/textColorPrimary` in attributes.&#xA;This ensures that a theme change from a light to a dark theme can be uniformlyapplied across the app."
+        errorLine1="                android:progressBackgroundTint=&quot;@color/importance_secondary_slider_color&quot;"
+        errorLine2="                ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/layout/preference_importance_slider.xml"
+            line="60"
+            column="17"/>
+    </issue>
+
+    <issue
+        id="HardCodedColor"
+        severity="Error"
+        message="Avoid using hardcoded color"
+        category="Correctness"
+        priority="4"
+        summary="Using hardcoded color"
+        explanation="Hardcoded color values are bad because theme changes cannot be uniformly applied.Instead use the theme specific colors such as `?android:attr/textColorPrimary` in attributes.&#xA;This ensures that a theme change from a light to a dark theme can be uniformlyapplied across the app."
+        errorLine1="            android:background=&quot;#000000&quot; />"
+        errorLine2="            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/layout/radio_info.xml"
+            line="111"
+            column="13"/>
+    </issue>
+
+    <issue
+        id="HardCodedColor"
+        severity="Error"
+        message="Avoid using hardcoded color"
+        category="Correctness"
+        priority="4"
+        summary="Using hardcoded color"
+        explanation="Hardcoded color values are bad because theme changes cannot be uniformly applied.Instead use the theme specific colors such as `?android:attr/textColorPrimary` in attributes.&#xA;This ensures that a theme change from a light to a dark theme can be uniformlyapplied across the app."
+        errorLine1="            android:background=&quot;#000000&quot; />"
+        errorLine2="            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/layout/radio_info.xml"
+            line="141"
+            column="13"/>
+    </issue>
+
+    <issue
+        id="HardCodedColor"
+        severity="Error"
+        message="Avoid using hardcoded color"
+        category="Correctness"
+        priority="4"
+        summary="Using hardcoded color"
+        explanation="Hardcoded color values are bad because theme changes cannot be uniformly applied.Instead use the theme specific colors such as `?android:attr/textColorPrimary` in attributes.&#xA;This ensures that a theme change from a light to a dark theme can be uniformlyapplied across the app."
+        errorLine1="            android:background=&quot;#000000&quot; />"
+        errorLine2="            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/layout/radio_info.xml"
+            line="279"
+            column="13"/>
+    </issue>
+
+    <issue
+        id="HardCodedColor"
+        severity="Error"
+        message="Avoid using hardcoded color"
+        category="Correctness"
+        priority="4"
+        summary="Using hardcoded color"
+        explanation="Hardcoded color values are bad because theme changes cannot be uniformly applied.Instead use the theme specific colors such as `?android:attr/textColorPrimary` in attributes.&#xA;This ensures that a theme change from a light to a dark theme can be uniformlyapplied across the app."
+        errorLine1="            android:src=&quot;@color/running_processes_system_ram&quot;"
+        errorLine2="            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/layout/running_processes_header.xml"
+            line="55"
+            column="13"/>
+    </issue>
+
+    <issue
+        id="HardCodedColor"
+        severity="Error"
+        message="Avoid using hardcoded color"
+        category="Correctness"
+        priority="4"
+        summary="Using hardcoded color"
+        explanation="Hardcoded color values are bad because theme changes cannot be uniformly applied.Instead use the theme specific colors such as `?android:attr/textColorPrimary` in attributes.&#xA;This ensures that a theme change from a light to a dark theme can be uniformlyapplied across the app."
+        errorLine1="            android:src=&quot;@color/running_processes_free_ram&quot;"
+        errorLine2="            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/layout/running_processes_header.xml"
+            line="145"
+            column="13"/>
+    </issue>
+
+    <issue
+        id="HardCodedColor"
+        severity="Error"
+        message="Avoid using hardcoded color"
+        category="Correctness"
+        priority="4"
+        summary="Using hardcoded color"
+        explanation="Hardcoded color values are bad because theme changes cannot be uniformly applied.Instead use the theme specific colors such as `?android:attr/textColorPrimary` in attributes.&#xA;This ensures that a theme change from a light to a dark theme can be uniformlyapplied across the app."
+        errorLine1="            android:background=&quot;@color/conversation_background&quot;"
+        errorLine2="            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/layout/screen_zoom_preview_1.xml"
+            line="31"
+            column="13"/>
+    </issue>
+
+    <issue
+        id="HardCodedColor"
+        severity="Error"
+        message="Avoid using hardcoded color"
+        category="Correctness"
+        priority="4"
+        summary="Using hardcoded color"
+        explanation="Hardcoded color values are bad because theme changes cannot be uniformly applied.Instead use the theme specific colors such as `?android:attr/textColorPrimary` in attributes.&#xA;This ensures that a theme change from a light to a dark theme can be uniformlyapplied across the app."
+        errorLine1="                app:iconTextColor=&quot;@color/message_icon_text_outgoing&quot;"
+        errorLine2="                ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/layout/screen_zoom_preview_1.xml"
+            line="44"
+            column="17"/>
+    </issue>
+
+    <issue
+        id="HardCodedColor"
+        severity="Error"
+        message="Avoid using hardcoded color"
+        category="Correctness"
+        priority="4"
+        summary="Using hardcoded color"
+        explanation="Hardcoded color values are bad because theme changes cannot be uniformly applied.Instead use the theme specific colors such as `?android:attr/textColorPrimary` in attributes.&#xA;This ensures that a theme change from a light to a dark theme can be uniformlyapplied across the app."
+        errorLine1="                app:iconBackgroundColor=&quot;@color/message_icon_background_outgoing&quot; />"
+        errorLine2="                ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/layout/screen_zoom_preview_1.xml"
+            line="45"
+            column="17"/>
+    </issue>
+
+    <issue
+        id="HardCodedColor"
+        severity="Error"
+        message="Avoid using hardcoded color"
+        category="Correctness"
+        priority="4"
+        summary="Using hardcoded color"
+        explanation="Hardcoded color values are bad because theme changes cannot be uniformly applied.Instead use the theme specific colors such as `?android:attr/textColorPrimary` in attributes.&#xA;This ensures that a theme change from a light to a dark theme can be uniformlyapplied across the app."
+        errorLine1="                app:iconTextColor=&quot;@color/message_icon_text_incoming&quot;"
+        errorLine2="                ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/layout/screen_zoom_preview_1.xml"
+            line="54"
+            column="17"/>
+    </issue>
+
+    <issue
+        id="HardCodedColor"
+        severity="Error"
+        message="Avoid using hardcoded color"
+        category="Correctness"
+        priority="4"
+        summary="Using hardcoded color"
+        explanation="Hardcoded color values are bad because theme changes cannot be uniformly applied.Instead use the theme specific colors such as `?android:attr/textColorPrimary` in attributes.&#xA;This ensures that a theme change from a light to a dark theme can be uniformlyapplied across the app."
+        errorLine1="                app:iconBackgroundColor=&quot;@color/message_icon_background_incoming&quot; />"
+        errorLine2="                ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/layout/screen_zoom_preview_1.xml"
+            line="55"
+            column="17"/>
+    </issue>
+
+    <issue
+        id="HardCodedColor"
+        severity="Error"
+        message="Avoid using hardcoded color"
+        category="Correctness"
+        priority="4"
+        summary="Using hardcoded color"
+        explanation="Hardcoded color values are bad because theme changes cannot be uniformly applied.Instead use the theme specific colors such as `?android:attr/textColorPrimary` in attributes.&#xA;This ensures that a theme change from a light to a dark theme can be uniformlyapplied across the app."
+        errorLine1="                app:iconTextColor=&quot;@color/message_icon_text_outgoing&quot;"
+        errorLine2="                ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/layout/screen_zoom_preview_1.xml"
+            line="64"
+            column="17"/>
+    </issue>
+
+    <issue
+        id="HardCodedColor"
+        severity="Error"
+        message="Avoid using hardcoded color"
+        category="Correctness"
+        priority="4"
+        summary="Using hardcoded color"
+        explanation="Hardcoded color values are bad because theme changes cannot be uniformly applied.Instead use the theme specific colors such as `?android:attr/textColorPrimary` in attributes.&#xA;This ensures that a theme change from a light to a dark theme can be uniformlyapplied across the app."
+        errorLine1="                app:iconBackgroundColor=&quot;@color/message_icon_background_outgoing&quot; />"
+        errorLine2="                ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/layout/screen_zoom_preview_1.xml"
+            line="65"
+            column="17"/>
+    </issue>
+
+    <issue
+        id="HardCodedColor"
+        severity="Error"
+        message="Avoid using hardcoded color"
+        category="Correctness"
+        priority="4"
+        summary="Using hardcoded color"
+        explanation="Hardcoded color values are bad because theme changes cannot be uniformly applied.Instead use the theme specific colors such as `?android:attr/textColorPrimary` in attributes.&#xA;This ensures that a theme change from a light to a dark theme can be uniformlyapplied across the app."
+        errorLine1="                app:iconTextColor=&quot;@color/message_icon_text_incoming&quot;"
+        errorLine2="                ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/layout/screen_zoom_preview_1.xml"
+            line="74"
+            column="17"/>
+    </issue>
+
+    <issue
+        id="HardCodedColor"
+        severity="Error"
+        message="Avoid using hardcoded color"
+        category="Correctness"
+        priority="4"
+        summary="Using hardcoded color"
+        explanation="Hardcoded color values are bad because theme changes cannot be uniformly applied.Instead use the theme specific colors such as `?android:attr/textColorPrimary` in attributes.&#xA;This ensures that a theme change from a light to a dark theme can be uniformlyapplied across the app."
+        errorLine1="                app:iconBackgroundColor=&quot;@color/message_icon_background_incoming&quot; />"
+        errorLine2="                ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/layout/screen_zoom_preview_1.xml"
+            line="75"
+            column="17"/>
+    </issue>
+
+    <issue
+        id="HardCodedColor"
+        severity="Error"
+        message="Avoid using hardcoded color"
+        category="Correctness"
+        priority="4"
+        summary="Using hardcoded color"
+        explanation="Hardcoded color values are bad because theme changes cannot be uniformly applied.Instead use the theme specific colors such as `?android:attr/textColorPrimary` in attributes.&#xA;This ensures that a theme change from a light to a dark theme can be uniformlyapplied across the app."
+        errorLine1="        android:background=&quot;@color/suggestion_condition_background&quot;>"
+        errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/layout/search_panel.xml"
+            line="28"
+            column="9"/>
+    </issue>
+
+    <issue
+        id="HardCodedColor"
+        severity="Error"
+        message="Avoid using hardcoded color"
+        category="Correctness"
+        priority="4"
+        summary="Using hardcoded color"
+        explanation="Hardcoded color values are bad because theme changes cannot be uniformly applied.Instead use the theme specific colors such as `?android:attr/textColorPrimary` in attributes.&#xA;This ensures that a theme change from a light to a dark theme can be uniformlyapplied across the app."
+        errorLine1="        android:background=&quot;@color/suggestion_condition_background&quot;>"
+        errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/layout/settings_main_dashboard.xml"
+            line="29"
+            column="9"/>
+    </issue>
+
+    <issue
+        id="HardCodedColor"
+        severity="Error"
+        message="Avoid using hardcoded color"
+        category="Correctness"
+        priority="4"
+        summary="Using hardcoded color"
+        explanation="Hardcoded color values are bad because theme changes cannot be uniformly applied.Instead use the theme specific colors such as `?android:attr/textColorPrimary` in attributes.&#xA;This ensures that a theme change from a light to a dark theme can be uniformlyapplied across the app."
+        errorLine1="        android:tint=&quot;@color/icon_accent&quot;"
+        errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/layout/shortcut_badge.xml"
+            line="31"
+            column="9"/>
+    </issue>
+
+    <issue
+        id="HardCodedColor"
+        severity="Error"
+        message="Avoid using hardcoded color"
+        category="Correctness"
+        priority="4"
+        summary="Using hardcoded color"
+        explanation="Hardcoded color values are bad because theme changes cannot be uniformly applied.Instead use the theme specific colors such as `?android:attr/textColorPrimary` in attributes.&#xA;This ensures that a theme change from a light to a dark theme can be uniformlyapplied across the app."
+        errorLine1="    android:background=&quot;@color/shortcut_background&quot;>"
+        errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/layout/shortcut_badge_maskable.xml"
+            line="20"
+            column="5"/>
+    </issue>
+
+    <issue
+        id="HardCodedColor"
+        severity="Error"
+        message="Avoid using hardcoded color"
+        category="Correctness"
+        priority="4"
+        summary="Using hardcoded color"
+        explanation="Hardcoded color values are bad because theme changes cannot be uniformly applied.Instead use the theme specific colors such as `?android:attr/textColorPrimary` in attributes.&#xA;This ensures that a theme change from a light to a dark theme can be uniformlyapplied across the app."
+        errorLine1="        android:tint=&quot;@color/icon_accent&quot;"
+        errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/layout/shortcut_badge_maskable.xml"
+            line="29"
+            column="9"/>
+    </issue>
+
+    <issue
+        id="HardCodedColor"
+        severity="Error"
+        message="Avoid using hardcoded color"
+        category="Correctness"
+        priority="4"
+        summary="Using hardcoded color"
+        explanation="Hardcoded color values are bad because theme changes cannot be uniformly applied.Instead use the theme specific colors such as `?android:attr/textColorPrimary` in attributes.&#xA;This ensures that a theme change from a light to a dark theme can be uniformlyapplied across the app."
+        errorLine1="    &lt;string name=&quot;sync_plug&quot; msgid=&quot;3905078969081888738&quot;>&quot;‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‎‏‏‎‎‎‏‏‎‎‎‏‏‎‏‎‎‎‎‎‏‎‏‎‎‎‎‏‏‏‏‎‎‎‏‏‏‏‏‏‏‎‎‏‎‏‏‏‏‏‏‏‏‏‏‎‎‎‏‎‎‎‏‎‎‏‏‎&quot;&lt;font fgcolor=&quot;#ffffffff&quot;>&quot;‎‏‎‎‏‏‏‎Welcome to Google sync!‎‏‎‎‏‏‎&quot;&lt;/font>&quot;‎‏‎‎‏‏‏‎ ‎‏‎‎‏‏‎\n‎‏‎‎‏‏‏‎A Google approach to syncing data to allow access to your contacts, appointments, and more from wherever you are.‎‏‎‎‏‎&quot;&lt;/string>"
+        errorLine2="                                                                                                                                                                       ~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/values-en-rXC/strings.xml"
+            line="2335"
+            column="168"/>
+    </issue>
+
+    <issue
+        id="HardCodedColor"
+        severity="Error"
+        message="Avoid using hardcoded color"
+        category="Correctness"
+        priority="4"
+        summary="Using hardcoded color"
+        explanation="Hardcoded color values are bad because theme changes cannot be uniformly applied.Instead use the theme specific colors such as `?android:attr/textColorPrimary` in attributes.&#xA;This ensures that a theme change from a light to a dark theme can be uniformlyapplied across the app."
+        errorLine1="    &lt;string name=&quot;sync_plug&quot; msgid=&quot;3905078969081888738&quot;>&lt;font fgcolor=&quot;#ffffffff&quot;>&quot;Welcome to Google sync!&quot;&lt;/font>&quot; \nA Google approach to syncing data to allow access to your contacts, appointments and more from wherever you are.&quot;&lt;/string>"
+        errorLine2="                                                               ~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/values-en-rAU/strings.xml"
+            line="2341"
+            column="64"/>
+    </issue>
+
+    <issue
+        id="HardCodedColor"
+        severity="Error"
+        message="Avoid using hardcoded color"
+        category="Correctness"
+        priority="4"
+        summary="Using hardcoded color"
+        explanation="Hardcoded color values are bad because theme changes cannot be uniformly applied.Instead use the theme specific colors such as `?android:attr/textColorPrimary` in attributes.&#xA;This ensures that a theme change from a light to a dark theme can be uniformlyapplied across the app."
+        errorLine1="    &lt;string name=&quot;sync_plug&quot; msgid=&quot;3905078969081888738&quot;>&lt;font fgcolor=&quot;#ffffffff&quot;>&quot;Welcome to Google sync!&quot;&lt;/font>&quot; \nA Google approach to syncing data to allow access to your contacts, appointments and more from wherever you are.&quot;&lt;/string>"
+        errorLine2="                                                               ~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/values-en-rCA/strings.xml"
+            line="2341"
+            column="64"/>
+    </issue>
+
+    <issue
+        id="HardCodedColor"
+        severity="Error"
+        message="Avoid using hardcoded color"
+        category="Correctness"
+        priority="4"
+        summary="Using hardcoded color"
+        explanation="Hardcoded color values are bad because theme changes cannot be uniformly applied.Instead use the theme specific colors such as `?android:attr/textColorPrimary` in attributes.&#xA;This ensures that a theme change from a light to a dark theme can be uniformlyapplied across the app."
+        errorLine1="    &lt;string name=&quot;sync_plug&quot; msgid=&quot;3905078969081888738&quot;>&lt;font fgcolor=&quot;#ffffffff&quot;>&quot;Welcome to Google sync!&quot;&lt;/font>&quot; \nA Google approach to syncing data to allow access to your contacts, appointments and more from wherever you are.&quot;&lt;/string>"
+        errorLine2="                                                               ~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/values-en-rGB/strings.xml"
+            line="2341"
+            column="64"/>
+    </issue>
+
+    <issue
+        id="HardCodedColor"
+        severity="Error"
+        message="Avoid using hardcoded color"
+        category="Correctness"
+        priority="4"
+        summary="Using hardcoded color"
+        explanation="Hardcoded color values are bad because theme changes cannot be uniformly applied.Instead use the theme specific colors such as `?android:attr/textColorPrimary` in attributes.&#xA;This ensures that a theme change from a light to a dark theme can be uniformlyapplied across the app."
+        errorLine1="    &lt;string name=&quot;sync_plug&quot; msgid=&quot;3905078969081888738&quot;>&lt;font fgcolor=&quot;#ffffffff&quot;>&quot;Welcome to Google sync!&quot;&lt;/font>&quot; \nA Google approach to syncing data to allow access to your contacts, appointments and more from wherever you are.&quot;&lt;/string>"
+        errorLine2="                                                               ~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/values-en-rIN/strings.xml"
+            line="2341"
+            column="64"/>
+    </issue>
+
+    <issue
+        id="HardCodedColor"
+        severity="Error"
+        message="Avoid using hardcoded color"
+        category="Correctness"
+        priority="4"
+        summary="Using hardcoded color"
+        explanation="Hardcoded color values are bad because theme changes cannot be uniformly applied.Instead use the theme specific colors such as `?android:attr/textColorPrimary` in attributes.&#xA;This ensures that a theme change from a light to a dark theme can be uniformlyapplied across the app."
+        errorLine1="    &lt;string name=&quot;sync_plug&quot;>&lt;font fgcolor=&quot;#ffffffff&quot;>Welcome to Google sync!&lt;/font>"
+        errorLine2="                                   ~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/values/strings.xml"
+            line="5501"
+            column="36"/>
+    </issue>
+
+    <issue
+        id="HardCodedColor"
+        severity="Error"
+        message="Avoid using hardcoded color"
+        category="Correctness"
+        priority="4"
+        summary="Using hardcoded color"
+        explanation="Hardcoded color values are bad because theme changes cannot be uniformly applied.Instead use the theme specific colors such as `?android:attr/textColorPrimary` in attributes.&#xA;This ensures that a theme change from a light to a dark theme can be uniformlyapplied across the app."
+        errorLine1="        &lt;item name=&quot;android:background&quot;>#ff000000&lt;/item>"
+        errorLine2="                                        ^">
+        <location
+            file="res/values/styles.xml"
+            line="245"
+            column="41"/>
+    </issue>
+
+    <issue
+        id="HardCodedColor"
+        severity="Error"
+        message="Avoid using hardcoded color"
+        category="Correctness"
+        priority="4"
+        summary="Using hardcoded color"
+        explanation="Hardcoded color values are bad because theme changes cannot be uniformly applied.Instead use the theme specific colors such as `?android:attr/textColorPrimary` in attributes.&#xA;This ensures that a theme change from a light to a dark theme can be uniformlyapplied across the app."
+        errorLine1="        &lt;item name=&quot;android:colorAccent&quot;>#ff009688&lt;/item>"
+        errorLine2="                                         ^">
+        <location
+            file="res/values/styles.xml"
+            line="364"
+            column="42"/>
+    </issue>
+
+    <issue
+        id="HardCodedColor"
+        severity="Error"
+        message="Avoid using hardcoded color"
+        category="Correctness"
+        priority="4"
+        summary="Using hardcoded color"
+        explanation="Hardcoded color values are bad because theme changes cannot be uniformly applied.Instead use the theme specific colors such as `?android:attr/textColorPrimary` in attributes.&#xA;This ensures that a theme change from a light to a dark theme can be uniformlyapplied across the app."
+        errorLine1="        &lt;item name=&quot;*android:regularColor&quot;>@color/lock_pattern_view_regular_color&lt;/item>"
+        errorLine2="                                           ^">
+        <location
+            file="res/values/styles.xml"
+            line="441"
+            column="44"/>
+    </issue>
+
+    <issue
+        id="HardCodedColor"
+        severity="Error"
+        message="Avoid using hardcoded color"
+        category="Correctness"
+        priority="4"
+        summary="Using hardcoded color"
+        explanation="Hardcoded color values are bad because theme changes cannot be uniformly applied.Instead use the theme specific colors such as `?android:attr/textColorPrimary` in attributes.&#xA;This ensures that a theme change from a light to a dark theme can be uniformlyapplied across the app."
+        errorLine1="        &lt;item name=&quot;*android:regularColor&quot;>@color/lock_pattern_view_regular_color_dark&lt;/item>"
+        errorLine2="                                           ^">
+        <location
+            file="res/values/styles.xml"
+            line="447"
+            column="44"/>
+    </issue>
+
+    <issue
+        id="HardCodedColor"
+        severity="Error"
+        message="Avoid using hardcoded color"
+        category="Correctness"
+        priority="4"
+        summary="Using hardcoded color"
+        explanation="Hardcoded color values are bad because theme changes cannot be uniformly applied.Instead use the theme specific colors such as `?android:attr/textColorPrimary` in attributes.&#xA;This ensures that a theme change from a light to a dark theme can be uniformlyapplied across the app."
+        errorLine1="        &lt;item name=&quot;*android:successColor&quot;>@color/lock_pattern_view_regular_color_dark&lt;/item>"
+        errorLine2="                                           ^">
+        <location
+            file="res/values/styles.xml"
+            line="448"
+            column="44"/>
+    </issue>
+
+    <issue
+        id="HardCodedColor"
+        severity="Error"
+        message="Avoid using hardcoded color"
+        category="Correctness"
+        priority="4"
+        summary="Using hardcoded color"
+        explanation="Hardcoded color values are bad because theme changes cannot be uniformly applied.Instead use the theme specific colors such as `?android:attr/textColorPrimary` in attributes.&#xA;This ensures that a theme change from a light to a dark theme can be uniformlyapplied across the app."
+        errorLine1="        &lt;item name=&quot;android:background&quot;>@color/suggestion_condition_background&lt;/item>"
+        errorLine2="                                        ^">
+        <location
+            file="res/values/styles.xml"
+            line="471"
+            column="41"/>
+    </issue>
+
+    <issue
+        id="HardCodedColor"
+        severity="Error"
+        message="Avoid using hardcoded color"
+        category="Correctness"
+        priority="4"
+        summary="Using hardcoded color"
+        explanation="Hardcoded color values are bad because theme changes cannot be uniformly applied.Instead use the theme specific colors such as `?android:attr/textColorPrimary` in attributes.&#xA;This ensures that a theme change from a light to a dark theme can be uniformlyapplied across the app."
+        errorLine1="        &lt;item name=&quot;setup_divider_color&quot;>@color/setup_divider_color_dark&lt;/item>"
+        errorLine2="                                         ^">
+        <location
+            file="res/values/themes.xml"
+            line="33"
+            column="42"/>
+    </issue>
+
+    <issue
+        id="HardCodedColor"
+        severity="Error"
+        message="Avoid using hardcoded color"
+        category="Correctness"
+        priority="4"
+        summary="Using hardcoded color"
+        explanation="Hardcoded color values are bad because theme changes cannot be uniformly applied.Instead use the theme specific colors such as `?android:attr/textColorPrimary` in attributes.&#xA;This ensures that a theme change from a light to a dark theme can be uniformlyapplied across the app."
+        errorLine1="        &lt;item name=&quot;wifi_signal_color&quot;>@color/setup_wizard_wifi_color_dark&lt;/item>"
+        errorLine2="                                       ^">
+        <location
+            file="res/values/themes.xml"
+            line="35"
+            column="40"/>
+    </issue>
+
+    <issue
+        id="HardCodedColor"
+        severity="Error"
+        message="Avoid using hardcoded color"
+        category="Correctness"
+        priority="4"
+        summary="Using hardcoded color"
+        explanation="Hardcoded color values are bad because theme changes cannot be uniformly applied.Instead use the theme specific colors such as `?android:attr/textColorPrimary` in attributes.&#xA;This ensures that a theme change from a light to a dark theme can be uniformlyapplied across the app."
+        errorLine1="        &lt;item name=&quot;setup_divider_color&quot;>@color/setup_divider_color_light&lt;/item>"
+        errorLine2="                                         ^">
+        <location
+            file="res/values/themes.xml"
+            line="53"
+            column="42"/>
+    </issue>
+
+    <issue
+        id="HardCodedColor"
+        severity="Error"
+        message="Avoid using hardcoded color"
+        category="Correctness"
+        priority="4"
+        summary="Using hardcoded color"
+        explanation="Hardcoded color values are bad because theme changes cannot be uniformly applied.Instead use the theme specific colors such as `?android:attr/textColorPrimary` in attributes.&#xA;This ensures that a theme change from a light to a dark theme can be uniformlyapplied across the app."
+        errorLine1="        &lt;item name=&quot;wifi_signal_color&quot;>@color/setup_wizard_wifi_color_light&lt;/item>"
+        errorLine2="                                       ^">
+        <location
+            file="res/values/themes.xml"
+            line="55"
+            column="40"/>
+    </issue>
+
+    <issue
+        id="HardCodedColor"
+        severity="Error"
+        message="Avoid using hardcoded color"
+        category="Correctness"
+        priority="4"
+        summary="Using hardcoded color"
+        explanation="Hardcoded color values are bad because theme changes cannot be uniformly applied.Instead use the theme specific colors such as `?android:attr/textColorPrimary` in attributes.&#xA;This ensures that a theme change from a light to a dark theme can be uniformlyapplied across the app."
+        errorLine1="        &lt;item name=&quot;setup_divider_color&quot;>@color/setup_divider_color_dark&lt;/item>"
+        errorLine2="                                         ^">
+        <location
+            file="res/values/themes.xml"
+            line="72"
+            column="42"/>
+    </issue>
+
+    <issue
+        id="HardCodedColor"
+        severity="Error"
+        message="Avoid using hardcoded color"
+        category="Correctness"
+        priority="4"
+        summary="Using hardcoded color"
+        explanation="Hardcoded color values are bad because theme changes cannot be uniformly applied.Instead use the theme specific colors such as `?android:attr/textColorPrimary` in attributes.&#xA;This ensures that a theme change from a light to a dark theme can be uniformlyapplied across the app."
+        errorLine1="        &lt;item name=&quot;wifi_signal_color&quot;>@color/setup_wizard_wifi_color_dark&lt;/item>"
+        errorLine2="                                       ^">
+        <location
+            file="res/values/themes.xml"
+            line="74"
+            column="40"/>
+    </issue>
+
+    <issue
+        id="HardCodedColor"
+        severity="Error"
+        message="Avoid using hardcoded color"
+        category="Correctness"
+        priority="4"
+        summary="Using hardcoded color"
+        explanation="Hardcoded color values are bad because theme changes cannot be uniformly applied.Instead use the theme specific colors such as `?android:attr/textColorPrimary` in attributes.&#xA;This ensures that a theme change from a light to a dark theme can be uniformlyapplied across the app."
+        errorLine1="        &lt;item name=&quot;setup_divider_color&quot;>@color/setup_divider_color_light&lt;/item>"
+        errorLine2="                                         ^">
+        <location
+            file="res/values/themes.xml"
+            line="92"
+            column="42"/>
+    </issue>
+
+    <issue
+        id="HardCodedColor"
+        severity="Error"
+        message="Avoid using hardcoded color"
+        category="Correctness"
+        priority="4"
+        summary="Using hardcoded color"
+        explanation="Hardcoded color values are bad because theme changes cannot be uniformly applied.Instead use the theme specific colors such as `?android:attr/textColorPrimary` in attributes.&#xA;This ensures that a theme change from a light to a dark theme can be uniformlyapplied across the app."
+        errorLine1="        &lt;item name=&quot;wifi_signal_color&quot;>@color/setup_wizard_wifi_color_light&lt;/item>"
+        errorLine2="                                       ^">
+        <location
+            file="res/values/themes.xml"
+            line="94"
+            column="40"/>
+    </issue>
+
+    <issue
+        id="HardCodedColor"
+        severity="Error"
+        message="Avoid using hardcoded color"
+        category="Correctness"
+        priority="4"
+        summary="Using hardcoded color"
+        explanation="Hardcoded color values are bad because theme changes cannot be uniformly applied.Instead use the theme specific colors such as `?android:attr/textColorPrimary` in attributes.&#xA;This ensures that a theme change from a light to a dark theme can be uniformlyapplied across the app."
+        errorLine1="        &lt;item name=&quot;android:colorPrimary&quot;>@color/material_grey_100&lt;/item>"
+        errorLine2="                                          ^">
+        <location
+            file="res/values/themes.xml"
+            line="139"
+            column="43"/>
+    </issue>
+
+    <issue
+        id="HardCodedColor"
+        severity="Error"
+        message="Avoid using hardcoded color"
+        category="Correctness"
+        priority="4"
+        summary="Using hardcoded color"
+        explanation="Hardcoded color values are bad because theme changes cannot be uniformly applied.Instead use the theme specific colors such as `?android:attr/textColorPrimary` in attributes.&#xA;This ensures that a theme change from a light to a dark theme can be uniformlyapplied across the app."
+        errorLine1="        &lt;item name=&quot;android:colorAccent&quot;>@color/material_blue_700&lt;/item>"
+        errorLine2="                                         ^">
+        <location
+            file="res/values/themes.xml"
+            line="140"
+            column="42"/>
+    </issue>
+
+    <issue
+        id="HardCodedColor"
+        severity="Error"
+        message="Avoid using hardcoded color"
+        category="Correctness"
+        priority="4"
+        summary="Using hardcoded color"
+        explanation="Hardcoded color values are bad because theme changes cannot be uniformly applied.Instead use the theme specific colors such as `?android:attr/textColorPrimary` in attributes.&#xA;This ensures that a theme change from a light to a dark theme can be uniformlyapplied across the app."
+        errorLine1="        &lt;item name=&quot;android:titleTextColor&quot;>@color/material_blue_700&lt;/item>"
+        errorLine2="                                            ^">
+        <location
+            file="res/values/themes.xml"
+            line="141"
+            column="45"/>
+    </issue>
+
+    <issue
+        id="HardCodedColor"
+        severity="Error"
+        message="Avoid using hardcoded color"
+        category="Correctness"
+        priority="4"
+        summary="Using hardcoded color"
+        explanation="Hardcoded color values are bad because theme changes cannot be uniformly applied.Instead use the theme specific colors such as `?android:attr/textColorPrimary` in attributes.&#xA;This ensures that a theme change from a light to a dark theme can be uniformlyapplied across the app."
+        errorLine1="        &lt;item name=&quot;switchBarBackgroundColor&quot;>@color/material_grey_200&lt;/item>"
+        errorLine2="                                              ^">
+        <location
+            file="res/values/themes.xml"
+            line="147"
+            column="47"/>
+    </issue>
+
+    <issue
+        id="HardCodedColor"
+        severity="Error"
+        message="Avoid using hardcoded color"
+        category="Correctness"
+        priority="4"
+        summary="Using hardcoded color"
+        explanation="Hardcoded color values are bad because theme changes cannot be uniformly applied.Instead use the theme specific colors such as `?android:attr/textColorPrimary` in attributes.&#xA;This ensures that a theme change from a light to a dark theme can be uniformlyapplied across the app."
+        errorLine1="        &lt;item name=&quot;android:colorControlActivated&quot;>@color/material_blue_500&lt;/item>"
+        errorLine2="                                                   ^">
+        <location
+            file="res/values/themes.xml"
+            line="148"
+            column="52"/>
+    </issue>
+
+    <issue
+        id="HardCodedColor"
+        severity="Error"
+        message="Avoid using hardcoded color"
+        category="Correctness"
+        priority="4"
+        summary="Using hardcoded color"
+        explanation="Hardcoded color values are bad because theme changes cannot be uniformly applied.Instead use the theme specific colors such as `?android:attr/textColorPrimary` in attributes.&#xA;This ensures that a theme change from a light to a dark theme can be uniformlyapplied across the app."
+        errorLine1="        &lt;item name=&quot;android:statusBarColor&quot;>#00000000&lt;/item>"
+        errorLine2="                                            ^">
+        <location
+            file="res/values/themes.xml"
+            line="298"
+            column="45"/>
+    </issue>
+
+    <issue
+        id="HardCodedColor"
+        severity="Error"
+        message="Avoid using hardcoded color"
+        category="Correctness"
+        priority="4"
+        summary="Using hardcoded color"
+        explanation="Hardcoded color values are bad because theme changes cannot be uniformly applied.Instead use the theme specific colors such as `?android:attr/textColorPrimary` in attributes.&#xA;This ensures that a theme change from a light to a dark theme can be uniformlyapplied across the app."
+        errorLine1="        &lt;item name=&quot;android:navigationBarColor&quot;>#00000000&lt;/item>"
+        errorLine2="                                                ^">
+        <location
+            file="res/values/themes.xml"
+            line="299"
+            column="49"/>
+    </issue>
+
+    <issue
+        id="HardCodedColor"
+        severity="Error"
+        message="Avoid using hardcoded color"
+        category="Correctness"
+        priority="4"
+        summary="Using hardcoded color"
+        explanation="Hardcoded color values are bad because theme changes cannot be uniformly applied.Instead use the theme specific colors such as `?android:attr/textColorPrimary` in attributes.&#xA;This ensures that a theme change from a light to a dark theme can be uniformlyapplied across the app."
+        errorLine1="        &lt;item name=&quot;android:statusBarColor&quot;>#00000000&lt;/item>"
+        errorLine2="                                            ^">
+        <location
+            file="res/values/themes.xml"
+            line="307"
+            column="45"/>
+    </issue>
+
+    <issue
+        id="HardCodedColor"
+        severity="Error"
+        message="Avoid using hardcoded color"
+        category="Correctness"
+        priority="4"
+        summary="Using hardcoded color"
+        explanation="Hardcoded color values are bad because theme changes cannot be uniformly applied.Instead use the theme specific colors such as `?android:attr/textColorPrimary` in attributes.&#xA;This ensures that a theme change from a light to a dark theme can be uniformlyapplied across the app."
+        errorLine1="        &lt;item name=&quot;android:navigationBarColor&quot;>#00000000&lt;/item>"
+        errorLine2="                                                ^">
+        <location
+            file="res/values/themes.xml"
+            line="308"
+            column="49"/>
+    </issue>
+
+    <issue
+        id="HardCodedColor"
+        severity="Error"
+        message="Avoid using hardcoded color"
+        category="Correctness"
+        priority="4"
+        summary="Using hardcoded color"
+        explanation="Hardcoded color values are bad because theme changes cannot be uniformly applied.Instead use the theme specific colors such as `?android:attr/textColorPrimary` in attributes.&#xA;This ensures that a theme change from a light to a dark theme can be uniformlyapplied across the app."
+        errorLine1="          android:background=&quot;@color/divider_color&quot; />"
+        errorLine2="          ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/layout/user_info_header.xml"
+            line="95"
+            column="11"/>
+    </issue>
+
+    <issue
+        id="HardCodedColor"
+        severity="Error"
+        message="Avoid using hardcoded color"
+        category="Correctness"
+        priority="4"
+        summary="Using hardcoded color"
+        explanation="Hardcoded color values are bad because theme changes cannot be uniformly applied.Instead use the theme specific colors such as `?android:attr/textColorPrimary` in attributes.&#xA;This ensures that a theme change from a light to a dark theme can be uniformlyapplied across the app."
+        errorLine1="    android:background=&quot;@color/gestures_setting_background_color&quot;"
+        errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/layout/video_preference.xml"
+            line="22"
+            column="5"/>
+    </issue>
+
+    <issue
+        id="HardCodedColor"
+        severity="Error"
+        message="Avoid using hardcoded color"
+        category="Correctness"
+        priority="4"
+        summary="Using hardcoded color"
+        explanation="Hardcoded color values are bad because theme changes cannot be uniformly applied.Instead use the theme specific colors such as `?android:attr/textColorPrimary` in attributes.&#xA;This ensures that a theme change from a light to a dark theme can be uniformlyapplied across the app."
+        errorLine1="            android:background=&quot;@color/divider_color&quot;"
+        errorLine2="            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/layout-sw600dp-land/wifi_settings_for_setup_wizard_xl.xml"
+            line="71"
+            column="13"/>
+    </issue>
+
+    <issue
+        id="HardCodedColor"
+        severity="Error"
+        message="Avoid using hardcoded color"
+        category="Correctness"
+        priority="4"
+        summary="Using hardcoded color"
+        explanation="Hardcoded color values are bad because theme changes cannot be uniformly applied.Instead use the theme specific colors such as `?android:attr/textColorPrimary` in attributes.&#xA;This ensures that a theme change from a light to a dark theme can be uniformlyapplied across the app."
+        errorLine1="            android:background=&quot;@color/divider_color&quot;"
+        errorLine2="            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/layout-sw600dp/wifi_settings_for_setup_wizard_xl.xml"
+            line="71"
+            column="13"/>
+    </issue>
+
+    <issue
+        id="HardCodedColor"
+        severity="Error"
+        message="Avoid using hardcoded color"
+        category="Correctness"
+        priority="4"
+        summary="Using hardcoded color"
+        explanation="Hardcoded color values are bad because theme changes cannot be uniformly applied.Instead use the theme specific colors such as `?android:attr/textColorPrimary` in attributes.&#xA;This ensures that a theme change from a light to a dark theme can be uniformlyapplied across the app."
+        errorLine1="        android:background=&quot;@color/divider_color&quot; />  &lt;!-- TODO: fix this -->"
+        errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/layout-sw600dp-land/wifi_settings_for_setup_wizard_xl.xml"
+            line="178"
+            column="9"/>
+    </issue>
+
+    <issue
+        id="HardCodedColor"
+        severity="Error"
+        message="Avoid using hardcoded color"
+        category="Correctness"
+        priority="4"
+        summary="Using hardcoded color"
+        explanation="Hardcoded color values are bad because theme changes cannot be uniformly applied.Instead use the theme specific colors such as `?android:attr/textColorPrimary` in attributes.&#xA;This ensures that a theme change from a light to a dark theme can be uniformlyapplied across the app."
+        errorLine1="        android:background=&quot;@color/divider_color&quot; />  &lt;!-- TODO: fix this -->"
+        errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/layout-sw600dp/wifi_settings_for_setup_wizard_xl.xml"
+            line="178"
+            column="9"/>
+    </issue>
+
+</issues>
diff --git a/res/drawable-hdpi/empty_search_results.png b/res/drawable-hdpi/empty_search_results.png
deleted file mode 100644
index 6202a33..0000000
--- a/res/drawable-hdpi/empty_search_results.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/empty_search_results.png b/res/drawable-mdpi/empty_search_results.png
deleted file mode 100644
index e418d7c..0000000
--- a/res/drawable-mdpi/empty_search_results.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/empty_search_results.png b/res/drawable-xhdpi/empty_search_results.png
deleted file mode 100644
index a92f000..0000000
--- a/res/drawable-xhdpi/empty_search_results.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xxhdpi/empty_search_results.png b/res/drawable-xxhdpi/empty_search_results.png
deleted file mode 100644
index 4c549bc..0000000
--- a/res/drawable-xxhdpi/empty_search_results.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xxxhdpi/empty_search_results.png b/res/drawable-xxxhdpi/empty_search_results.png
deleted file mode 100644
index 1aed6ad..0000000
--- a/res/drawable-xxxhdpi/empty_search_results.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable/empty_search_results.xml b/res/drawable/empty_search_results.xml
new file mode 100644
index 0000000..9162107
--- /dev/null
+++ b/res/drawable/empty_search_results.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.
+  -->
+
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="96dp"
+    android:height="96dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24"
+    android:tint="?android:attr/colorControlNormal">
+
+    <path
+        android:fillColor="#000000"
+        android:pathData="M15.5,14h-0.79l-0.28-0.27c1.2-1.4,1.82-3.31,1.48-5.34c-0.47-2.78-2.79-5-5.59-5.34c-4.23-0.52-7.79,3.04-7.27,7.27
+c0.34,2.8,2.56,5.12,5.34,5.59c2.03,0.34,3.94-0.28,5.34-1.48L14,14.71v0.79l5.2,5.19c0.41,0.41,1.07,0.41,1.48,0l0.01-0.01
+c0.41-0.41,0.41-1.07,0-1.48L15.5,14z M9.5,14C7.01,14,5,11.99,5,9.5S7.01,5,9.5,5S14,7.01,14,9.5S11.99,14,9.5,14z" />
+</vector>
\ No newline at end of file
diff --git a/res/drawable/ic_bt_laptop.xml b/res/drawable/ic_bt_laptop.xml
deleted file mode 100644
index 029e4d9..0000000
--- a/res/drawable/ic_bt_laptop.xml
+++ /dev/null
@@ -1,26 +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/colorControlNormal">
-    <path
-        android:fillColor="#FF000000"
-        android:pathData="M20,18c1.1,0 2,-0.9 2,-2V6c0,-1.1 -0.9,-2 -2,-2H4c-1.1,0
-            -2,0.9 -2,2v10c0,1.1 0.9,2 2,2H0v2h24v-2h-4zM4,6h16v10H4V6z"/>
-</vector>
\ No newline at end of file
diff --git a/res/drawable/ic_menu_add.xml b/res/drawable/ic_menu_add.xml
index 9e2175b..0313d62 100644
--- a/res/drawable/ic_menu_add.xml
+++ b/res/drawable/ic_menu_add.xml
@@ -20,7 +20,7 @@
     android:height="24dp"
     android:viewportWidth="24.0"
     android:viewportHeight="24.0"
-    android:tint="?android:attr/colorAccent">
+    android:tint="?android:attr/colorControlNormal">
     <path
         android:fillColor="#FF000000"
         android:pathData="M18,13h-5v5c0,0.55-0.45,1-1,1h0c-0.55,0-1-0.45-1-1v-5H6c-0.55,0-1-0.45-1-1v0c0-0.55,0.45-1,1-1h5V6c0-0.55,0.45-1,1-1h0
diff --git a/res/drawable/ic_menu_delete.xml b/res/drawable/ic_menu_delete.xml
index 74f63c3..f1ff04a 100644
--- a/res/drawable/ic_menu_delete.xml
+++ b/res/drawable/ic_menu_delete.xml
@@ -18,7 +18,7 @@
         android:height="24.0dp"
         android:viewportWidth="48.0"
         android:viewportHeight="48.0"
-        android:tint="?android:attr/colorAccent">
+        android:tint="?android:attr/colorControlNormal">
     <path
         android:fillColor="@android:color/white"
         android:pathData="M12.0,38.0c0.0,2.21 1.79,4.0 4.0,4.0l16.0,0.0c2.21,0.0 4.0,-1.79 4.0,-4.0L36.0,14.0L12.0,14.0l0.0,24.0zM38.0,8.0l-7.0,0.0l-2.0,-2.0L19.0,6.0l-2.0,2.0l-7.0,0.0l0.0,4.0l28.0,0.0L38.0,8.0z"/>
diff --git a/res/drawable/ic_package_verifier_disabled.xml b/res/drawable/ic_package_verifier_disabled.xml
index 59e713a..fa148d1 100644
--- a/res/drawable/ic_package_verifier_disabled.xml
+++ b/res/drawable/ic_package_verifier_disabled.xml
@@ -14,14 +14,20 @@
     limitations under the License.
 -->
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
+    android:width="22dp"
+    android:height="22dp"
+    android:viewportWidth="22"
+    android:viewportHeight="22">
 
     <path
-        android:pathData="M 0 0 H 24 V 24 H 0 V 0 Z" />
-    <path
-        android:fillColor="#F09300"
-        android:pathData="M13.45,11l2.12-2.12L14.16,7.5,12,9.62,9.91,7.5,8.5,8.91,10.62,11,8.5,13.16l1.41,1.41L12,12.45l2.12,2.12,1.41-1.41Zm8.1-7.11A16.54,16.54,0,0,1,22,7.77a16.65,16.65,0,0,1-.47,4,16.56,16.56,0,0,1-3.79,7.14A16.66,16.66,0,0,1,12,23,16.61,16.61,0,0,1,2.45,3.93,33.57,33.57,0,0,1,12,1a33.57,33.57,0,0,1,9.55,2.93Z" />
+        android:fillColor="#F5A623"
+        android:fillType="evenOdd"
+        android:pathData="M20.5515334,2.919 C15.9049774,0.613 11,0 11,0 C11,0 6.09502262,0.613
+1.44846657,2.919 C1.15485168,4.149 1,5.432 1,6.752 C1,8.109 1.16490699,9.429
+1.47561589,10.693 C2.13624937,13.382 3.45852187,15.813 5.26143791,17.807
+C6.84313725,19.559 8.79788839,20.973 11,21.926 C13.2021116,20.973
+15.1568627,19.559 16.7395676,17.807 C18.5414781,15.813 19.8637506,13.382
+20.5253896,10.693 C20.835093,9.429 21,8.109 21,6.752 C21,5.432 20.8461538,4.149
+20.5515334,2.919 M12,15.5 L10,15.5 L10,13.5 L12,13.5 L12,15.5 L12,15.5 Z M12,12
+L10,12 L10,6 L12,6 L12,12 L12,12 Z" />
 </vector>
diff --git a/res/drawable/ic_package_verifier_enabled.xml b/res/drawable/ic_package_verifier_enabled.xml
index 9a2dee5..b954258 100644
--- a/res/drawable/ic_package_verifier_enabled.xml
+++ b/res/drawable/ic_package_verifier_enabled.xml
@@ -14,14 +14,22 @@
     limitations under the License.
 -->
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
+    android:width="22dp"
+    android:height="22dp"
+    android:viewportWidth="22"
+    android:viewportHeight="22">
 
     <path
-        android:pathData="M 0 0 H 24 V 24 H 0 V 0 Z" />
-    <path
         android:fillColor="#4285F4"
-        android:pathData="M21.55,3.93A16.54,16.54,0,0,1,22,7.77a16.65,16.65,0,0,1-.47,4,16.56,16.56,0,0,1-3.79,7.14A16.66,16.66,0,0,1,12,23,16.61,16.61,0,0,1,2.45,3.93,33.57,33.57,0,0,1,12,1,33.57,33.57,0,0,1,21.55,3.93ZM15.27,8.41,9.61,14.07,11,15.49l5.66-5.66ZM9.61,11.24,8.2,12.66l1.41,1.41L11,12.66Z" />
+        android:fillType="evenOdd"
+        android:pathData="M20.5515334,2.92885159 C20.8461538,4.16300283 21,5.45033294 21,6.77478792
+C21,8.13636778 20.835093,9.46082277 20.5253896,10.7290888 C19.8637506,13.4271641
+18.5414781,15.8663687 16.7395676,17.8670984 C15.1568627,19.6250114
+13.2021116,21.0437836 11,22 C8.79788839,21.0437836 6.84313725,19.6250114
+5.26143791,17.8670984 C3.45852187,15.8663687 2.13624937,13.4271641
+1.47561589,10.7290888 C1.16490699,9.46082277 1,8.13636778 1,6.77478792
+C1,5.45033294 1.15485168,4.16300283 1.44846657,2.92885159
+C6.09502262,0.615068868 11,0 11,0 C11,0 15.9049774,0.615068868
+20.5515334,2.92885159 Z M15.6984615,6 L9.61538462,12.2961783 L7,10
+L5.69846154,11.3471338 L9.61538462,15 L17,7.3566879 L15.6984615,6 Z" />
 </vector>
diff --git a/res/drawable/ic_package_verifier_removed.xml b/res/drawable/ic_package_verifier_removed.xml
new file mode 100644
index 0000000..e225ee5
--- /dev/null
+++ b/res/drawable/ic_package_verifier_removed.xml
@@ -0,0 +1,43 @@
+<!--
+    Copyright (C) 2017 The Android Open Source Project
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+         http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="22dp"
+    android:height="22dp"
+    android:viewportWidth="22"
+    android:viewportHeight="22">
+
+    <group
+            android:translateX="-1"
+            android:translateY="-1">
+        <path
+            android:fillType="evenOdd"
+            android:pathData="M 0 0 H 24 V 24 H 0 V 0 Z" />
+        <path
+            android:fillColor="#D84336"
+            android:fillType="evenOdd"
+            android:pathData="M21.5515334,3.92885159 C21.8461538,5.16300283 22,6.45033294 22,7.77478792
+C22,9.13636778 21.835093,10.4608228 21.5253896,11.7290888 C20.8637506,14.4271641
+19.5414781,16.8663687 17.7395676,18.8670984 C16.1568627,20.6250114
+14.2021116,22.0437836 12,23 C9.79788839,22.0437836 7.84313725,20.6250114
+6.26143791,18.8670984 C4.45852187,16.8663687 3.13624937,14.4271641
+2.47561589,11.7290888 C2.16490699,10.4608228 2,9.13636778 2,7.77478792
+C2,6.45033294 2.15485168,5.16300283 2.44846657,3.92885159 C7.09502262,1.61506887
+12,1 12,1 C12,1 16.9049774,1.61506887 21.5515334,3.92885159 Z M14.6469246,7
+L11.9600359,9.71972847 L9.272253,7 L8.00878156,8.28072408 L10.6956703,11.0004526
+L8,13.720181 L9.26347144,15 L11.9600359,12.2802715 L14.7347402,15 L16,13.720181
+L13.2252957,11.0004526 L15.9121844,8.28072408 L14.6469246,7 Z" />
+    </group>
+</vector>
diff --git a/res/drawable/ic_print.xml b/res/drawable/ic_print.xml
deleted file mode 100644
index 647838d..0000000
--- a/res/drawable/ic_print.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- 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.
--->
-
-<bitmap xmlns:android="http://schemas.android.com/apk/res/android"
-    android:src="@*android:drawable/ic_print"
-    android:tint="@*android:color/material_deep_teal_500" />
diff --git a/res/drawable/ic_print_error.xml b/res/drawable/ic_print_error.xml
deleted file mode 100644
index 560aaab..0000000
--- a/res/drawable/ic_print_error.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- 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.
--->
-
-<bitmap xmlns:android="http://schemas.android.com/apk/res/android"
-    android:src="@*android:drawable/ic_print_error"
-    android:tint="@*android:color/material_deep_teal_500" />
diff --git a/res/drawable/ic_settings_bluetooth.xml b/res/drawable/ic_settings_bluetooth.xml
deleted file mode 100644
index 6e32e1a..0000000
--- a/res/drawable/ic_settings_bluetooth.xml
+++ /dev/null
@@ -1,25 +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="24.0dp"
-        android:height="24.0dp"
-        android:viewportWidth="24.0"
-        android:viewportHeight="24.0"
-        android:tint="?android:attr/colorControlNormal">
-    <path
-        android:fillColor="#FFFFFFFF"
-        android:pathData="M13.5,12l3.8,-3.7c0.4,-0.4 0.4,-1.1 0,-1.5l-4.5,-4.5c-0.4,-0.4 -1.1,-0.4 -1.5,0.1C11.1,2.5 11,2.8 11,3v6.4L6.9,5.4C6.5,5 5.9,5 5.5,5.4s-0.4,1.1 0,1.5l5.1,5.1l-5.1,5.1c-0.4,0.4 -0.4,1.1 0,1.5s1.1,0.4 1.5,0l4.1,-4V21c0,0.6 0.5,1 1,1c0.3,0 0.5,-0.1 0.7,-0.3l0.1,0l4.5,-4.5c0.4,-0.4 0.4,-1.1 0,-1.5L13.5,12zM13,9.7V5.4l2.1,2.2L13,9.7zM13,18.6v-4.3l2.1,2.2L13,18.6z"/>
-</vector>
diff --git a/res/drawable/ic_settings_print.xml b/res/drawable/ic_settings_print.xml
deleted file mode 100644
index 0eab402..0000000
--- a/res/drawable/ic_settings_print.xml
+++ /dev/null
@@ -1,28 +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="24.0dp"
-        android:height="24.0dp"
-        android:viewportWidth="24.0"
-        android:viewportHeight="24.0"
-        android:tint="?android:attr/colorControlNormal">
-    <path
-        android:fillColor="#FFFFFFFF"
-        android:pathData="M19,8H5c-1.66,0-3,1.34-3,3v5c0,0.55,0.45,1,1,1h3v3c0,0.55,0.45,1,1,1h10c0.55,0,1-0.45,1-1v-3h3c0.55,0,1-0.45,1-1v-5
-C22,9.34,20.66,8,19,8z M16,19H8v-5h8V19z
-M19,12c-0.55,0-1-0.45-1-1s0.45-1,1-1s1,0.45,1,1S19.55,12,19,12z M17,3H7
-C6.45,3,6,3.45,6,4v3h12V4C18,3.45,17.55,3,17,3z"/>
-</vector>
diff --git a/res/drawable/line.xml b/res/drawable/line.xml
new file mode 100644
index 0000000..786ed1c
--- /dev/null
+++ b/res/drawable/line.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  Copyright (C) 2017 The Android Open Source Project
+
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+  -->
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+       android:shape="rectangle">
+
+    <solid android:color="@android:color/transparent" />
+
+    <padding
+        android:top="10dp"
+        android:left="10dp"
+        android:right="10dp"
+        android:bottom="10dp"/>
+</shape>
\ No newline at end of file
diff --git a/res/drawable/line_drawable.xml b/res/drawable/line_drawable.xml
new file mode 100644
index 0000000..a524c61
--- /dev/null
+++ b/res/drawable/line_drawable.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  Copyright (C) 2017 The Android Open Source Project
+
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+  -->
+
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item
+        android:state_pressed="true"
+        android:drawable="@drawable/line" />
+
+    <item
+        android:drawable="@drawable/line" />
+</selector>
\ No newline at end of file
diff --git a/res/drawable/thumb.xml b/res/drawable/thumb.xml
new file mode 100644
index 0000000..42fbd8c
--- /dev/null
+++ b/res/drawable/thumb.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  Copyright (C) 2017 The Android Open Source Project
+
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+  -->
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+       android:shape="rectangle">
+
+    <corners
+        android:topLeftRadius="8dp"
+        android:topRightRadius="8dp"
+        android:bottomLeftRadius="8dp"
+        android:bottomRightRadius="8dp"/>
+
+    <padding
+        android:paddingLeft="8dp"
+        android:paddingRight="8dp" />
+
+    <solid android:color="?android:attr/colorControlNormal" />
+
+</shape>
\ No newline at end of file
diff --git a/res/drawable/thumb_drawable.xml b/res/drawable/thumb_drawable.xml
new file mode 100644
index 0000000..b99536d
--- /dev/null
+++ b/res/drawable/thumb_drawable.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  Copyright (C) 2017 The Android Open Source Project
+
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+  -->
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item
+        android:state_pressed="true"
+        android:drawable="@drawable/thumb"/>
+
+    <item
+        android:drawable="@drawable/thumb"/>
+</selector>
\ No newline at end of file
diff --git a/res/layout-land/choose_lock_pattern.xml b/res/layout-land/choose_lock_pattern.xml
index 8e78b05..b54a245 100644
--- a/res/layout-land/choose_lock_pattern.xml
+++ b/res/layout-land/choose_lock_pattern.xml
@@ -48,6 +48,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_lock"/>
@@ -71,13 +72,20 @@
                         android:layout_marginStart="0dp"
                         android:layout_marginEnd="0dp"/>
 
+                    <TextView
+                        android:id="@+id/message"
+                        style="@style/SuwDescription.Glif"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:minLines="2" />
+
                     <!-- header message -->
                     <TextView
                         android:id="@+id/headerText"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
                         android:layout_marginTop="16dp"
-                        android:gravity="start|bottom"
+                        android:gravity="?attr/suwGlifHeaderGravity"
                         android:textSize="18sp"/>
 
                 </LinearLayout>
diff --git a/res/layout-land/confirm_lock_pattern_internal.xml b/res/layout-land/confirm_lock_pattern_internal.xml
index 952ab49..9c90d6f 100644
--- a/res/layout-land/confirm_lock_pattern_internal.xml
+++ b/res/layout-land/confirm_lock_pattern_internal.xml
@@ -44,6 +44,7 @@
                     style="@style/SuwGlifIcon"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
+                    android:layout_gravity="?attr/suwGlifHeaderGravity"
                     android:src="@drawable/ic_lock" />
 
                 <TextView
diff --git a/res/layout-land/fingerprint_enroll_enrolling.xml b/res/layout-land/fingerprint_enroll_enrolling.xml
index 9890e68..8b902f1 100644
--- a/res/layout-land/fingerprint_enroll_enrolling.xml
+++ b/res/layout-land/fingerprint_enroll_enrolling.xml
@@ -109,11 +109,12 @@
                 android:orientation="vertical">
 
                 <com.android.setupwizardlib.view.FillContentLayout
-                    android:layout_width="@dimen/fingerprint_progress_bar_max_size"
-                    android:layout_height="@dimen/fingerprint_progress_bar_max_size"
+                    android:layout_width="wrap_content"
+                    android:layout_height="0dp"
+                    android:layout_marginVertical="24dp"
+                    android:layout_weight="1"
                     android:paddingTop="0dp"
-                    android:paddingBottom="0dp"
-                    android:layout_marginVertical="24dp">
+                    android:paddingBottom="0dp">
 
                     <include layout="@layout/fingerprint_enroll_enrolling_content"
                          android:layout_width="match_parent"
diff --git a/res/layout-land/fingerprint_enroll_finish.xml b/res/layout-land/fingerprint_enroll_finish.xml
index 0b673b8..981fe65 100644
--- a/res/layout-land/fingerprint_enroll_finish.xml
+++ b/res/layout-land/fingerprint_enroll_finish.xml
@@ -75,13 +75,13 @@
                     android:layout_height="0dp"
                     android:layout_weight="1" />
 
-                <LinearLayout
+                <com.android.setupwizardlib.view.ButtonBarLayout
+                    style="@style/SuwGlifButtonBar.Stackable"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:layout_marginTop="8dp"
                     android:clipChildren="false"
-                    android:clipToPadding="false"
-                    android:orientation="horizontal">
+                    android:clipToPadding="false">
 
                     <Button
                         style="@style/SetupWizardButton.Negative"
@@ -103,7 +103,7 @@
                         android:layout_height="wrap_content"
                         android:text="@string/security_settings_fingerprint_enroll_done" />
 
-                </LinearLayout>
+                </com.android.setupwizardlib.view.ButtonBarLayout>
 
             </LinearLayout>
 
diff --git a/res/layout/android_beam.xml b/res/layout/android_beam.xml
index 5683840..7780b31 100644
--- a/res/layout/android_beam.xml
+++ b/res/layout/android_beam.xml
@@ -31,14 +31,15 @@
             android:layout_height="wrap_content"
             android:orientation="vertical">
 
-            <TextView android:id="@+id/android_beam_explained"
+            <TextView
+                android:id="@+id/android_beam_explained"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="20dip"
                 android:gravity="top"
+                android:paddingStart="@dimen/preference_no_icon_padding_start"
                 android:text="@string/android_beam_explained"
-                android:textAppearance="?android:attr/textAppearanceMedium"
-            />
+                android:textAppearance="?android:attr/textAppearanceMedium" />
             <ImageView android:id="@+id/android_beam_image"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
diff --git a/res/layout/app_action_buttons.xml b/res/layout/app_action_buttons.xml
deleted file mode 100644
index e12fa23..0000000
--- a/res/layout/app_action_buttons.xml
+++ /dev/null
@@ -1,44 +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:gravity="center"
-    android:paddingTop="8dp"
-    android:paddingStart="8dp"
-    android:paddingEnd="8dp"
-    android:orientation="horizontal">
-
-    <Button
-        android:id="@+id/left_button"
-        style="@style/AppActionPrimaryButton"
-        android:layout_width="0dp"
-        android:layout_weight="1"
-        android:layout_height="wrap_content"
-        android:layout_marginBottom="4dp" />
-
-    <Button
-        android:id="@+id/right_button"
-        style="@style/AppActionPrimaryButton"
-        android:layout_width="0dp"
-        android:layout_weight="1"
-        android:layout_height="wrap_content"
-        android:layout_marginBottom="4dp" />
-
-</LinearLayout>
\ No newline at end of file
diff --git a/res/layout/app_header.xml b/res/layout/app_header.xml
deleted file mode 100644
index 2d8a099..0000000
--- a/res/layout/app_header.xml
+++ /dev/null
@@ -1,58 +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.
--->
-
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="?android:attr/actionBarSize"
-    android:background="@drawable/switchbar_background"
-    android:gravity="center_vertical"
-    android:theme="?attr/switchBarTheme" >
-
-    <ImageView android:id="@+id/app_icon"
-        android:layout_width="@dimen/switchbar_subsettings_margin_start"
-        android:layout_height="40dp"
-        android:gravity="end"
-        android:layout_centerVertical="true" />
-
-    <TextView
-        android:id="@+id/app_name"
-        android:layout_height="wrap_content"
-        android:layout_width="match_parent"
-        android:layout_toStartOf="@+id/app_settings"
-        android:layout_marginStart="@dimen/switchbar_subsettings_margin_start"
-        android:layout_alignWithParentIfMissing="true"
-        android:layout_centerVertical="true"
-        android:textAppearance="@style/TextAppearance.Switch"
-        android:textColor="@android:color/white"
-        android:textAlignment="viewStart" />
-
-    <ImageView
-        android:id="@id/app_settings"
-        android:layout_width="56dp"
-        android:layout_height="56dp"
-        android:layout_alignParentEnd="true"
-        android:layout_marginEnd="@dimen/switchbar_subsettings_margin_end"
-        android:layout_centerVertical="true"
-        android:minHeight="0dp"
-        android:minWidth="0dp"
-        android:contentDescription="@string/notification_app_settings_button"
-        android:scaleType="center"
-        android:src="@drawable/ic_settings_24dp"
-        android:visibility="gone"
-        style="?android:attr/borderlessButtonStyle" />
-
-</RelativeLayout>
-
diff --git a/res/layout/app_item.xml b/res/layout/app_item.xml
deleted file mode 100644
index d53afc9..0000000
--- a/res/layout/app_item.xml
+++ /dev/null
@@ -1,81 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2011 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:minHeight="72dp"
-    android:paddingTop="12dp"
-    android:paddingBottom="12dp"
-    android:gravity="top"
-    android:columnCount="3"
-    android:duplicateParentState="true">
-
-    <ImageView
-        android:id="@android:id/icon"
-        android:layout_width="48dp"
-        android:layout_height="48dp"
-        android:layout_gravity="center"
-        android:scaleType="fitXY"
-        android:layout_marginEnd="16dip"
-        android:contentDescription="@null"
-        android:duplicateParentState="true" />
-
-    <TextView
-        android:id="@android:id/title"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_toEndOf="@android:id/icon"
-        android:singleLine="true"
-        android:ellipsize="marquee"
-        android:textAppearance="@android:style/TextAppearance.Material.Subhead"
-        android:textColor="?android:attr/textColorPrimary"
-        android:textAlignment="viewStart"
-        android:duplicateParentState="true" />
-
-    <TextView
-        android:id="@android:id/summary"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_toEndOf="@android:id/title"
-        android:layout_alignParentEnd="true"
-        android:layout_marginStart="6dip"
-        android:gravity="end"
-        android:singleLine="true"
-        android:ellipsize="marquee"
-        android:textAppearance="@android:style/TextAppearance.Material.Subhead"
-        android:textColor="?android:attr/textColorSecondary"
-        android:duplicateParentState="true" />
-
-    <Switch
-            android:id="@android:id/switch_widget"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_alignParentRight="true"
-            android:background="@null"
-            android:visibility="gone"/>
-
-    <FrameLayout
-        android:id="@android:id/widget_frame"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_toEndOf="@android:id/icon"
-        android:layout_below="@android:id/title"
-        android:layout_alignParentEnd="true"
-        android:layout_gravity="fill_horizontal|top"
-        android:duplicateParentState="true" />
-
-</RelativeLayout>
diff --git a/res/layout/app_ops_details.xml b/res/layout/app_ops_details.xml
deleted file mode 100644
index fc3c1de..0000000
--- a/res/layout/app_ops_details.xml
+++ /dev/null
@@ -1,57 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-** Copyright 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.
-*/
--->
-<ScrollView
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:clipToPadding="false"
-    android:scrollbarStyle="@integer/preference_scrollbar_style">
-
-    <LinearLayout
-        android:id="@+id/all_details"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:paddingBottom="5dip"
-        android:orientation="vertical">
-
-        <!-- App snippet -->
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_gravity="center_vertical"
-            android:paddingStart="?android:attr/listPreferredItemPaddingStart"
-            android:paddingEnd="?android:attr/listPreferredItemPaddingEnd"
-            android:orientation="vertical">
-
-            <!-- Application snippet label, version and icon -->
-            <include
-                layout="@layout/app_item"
-                android:id="@+id/app_snippet" />
-
-        </LinearLayout>
-
-        <!-- Operations list -->
-        <LinearLayout
-            android:id="@+id/operations_section"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:orientation="vertical">
-        </LinearLayout>
-    </LinearLayout>
-</ScrollView>
diff --git a/res/layout/app_ops_summary.xml b/res/layout/app_ops_summary.xml
deleted file mode 100644
index 2073a00..0000000
--- a/res/layout/app_ops_summary.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 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.
-*/
--->
-
-<LinearLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:orientation="vertical">
-
-    <android.support.v4.view.ViewPager
-            android:id="@+id/pager"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:layout_weight="1">
-        <android.support.v4.view.PagerTabStrip
-                android:id="@+id/tabs"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_gravity="top"
-                android:textAppearance="@style/TextAppearance.PagerTabs"
-                android:paddingLeft="@dimen/pager_tabs_padding"
-                android:paddingRight="@dimen/pager_tabs_padding">
-        </android.support.v4.view.PagerTabStrip>
-    </android.support.v4.view.ViewPager>
-
-</LinearLayout>
diff --git a/res/layout/app_preference_item.xml b/res/layout/app_preference_item.xml
index f13ced7..5653920 100755
--- a/res/layout/app_preference_item.xml
+++ b/res/layout/app_preference_item.xml
@@ -27,11 +27,10 @@
     android:paddingEnd="?android:attr/listPreferredItemPaddingEnd">
     <FrameLayout
         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:paddingEnd="12dp"
+        android:minWidth="56dp"
         android:paddingTop="4dp"
         android:paddingBottom="4dp">
         <android.support.v7.internal.widget.PreferenceImageView
diff --git a/res/layout/choose_lock_pattern_common.xml b/res/layout/choose_lock_pattern_common.xml
index 7dca27d..949d130 100644
--- a/res/layout/choose_lock_pattern_common.xml
+++ b/res/layout/choose_lock_pattern_common.xml
@@ -24,7 +24,7 @@
     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">
+    settings:suwHeaderText="@string/lockpassword_choose_your_screen_lock_header">
 
     <com.android.internal.widget.LinearLayoutWithDefaultTouchRecepient
         android:id="@+id/topLayout"
@@ -68,6 +68,13 @@
             android:paddingLeft="0dp"
             android:paddingRight="0dp">
 
+            <TextView
+                android:id="@+id/message"
+                style="@style/SuwDescription.Glif"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:minLines="2" />
+
             <TextView android:id="@+id/headerText"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
diff --git a/res/layout/crypt_keeper_settings.xml b/res/layout/crypt_keeper_settings.xml
index b54e0a5..6b33e00 100644
--- a/res/layout/crypt_keeper_settings.xml
+++ b/res/layout/crypt_keeper_settings.xml
@@ -14,33 +14,29 @@
      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="match_parent"
     android:layout_height="match_parent"
-    android:orientation="vertical"
->
-
+    android:paddingStart="@dimen/preference_no_icon_padding_start"
+    android:paddingEnd="?android:attr/listPreferredItemPaddingEnd"
+    android:orientation="vertical">
     <ScrollView
         android:layout_width="match_parent"
         android:layout_height="0dip"
-        android:layout_marginStart="16dp"
-        android:layout_marginEnd="16dp"
         android:layout_marginTop="16dp"
-        android:layout_weight="1"
-    >
+        android:layout_weight="1">
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:orientation="vertical"
-        >
+            android:orientation="vertical">
             <TextView
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="8dip"
                 android:layout_marginBottom="16dip"
                 android:textAppearance="?android:attr/textAppearanceMedium"
-                android:text="@string/crypt_keeper_desc"
-            />
+                android:text="@string/crypt_keeper_desc" />
             <TextView
                 android:id="@+id/warning_low_charge"
                 android:layout_width="match_parent"
@@ -49,8 +45,7 @@
                 android:textAppearance="?android:attr/textAppearanceMedium"
                 android:textStyle="bold"
                 android:text="@string/crypt_keeper_low_charge_text"
-                android:visibility="gone"
-            />
+                android:visibility="gone" />
             <TextView
                 android:id="@+id/warning_unplugged"
                 android:layout_width="match_parent"
@@ -59,20 +54,14 @@
                 android:textAppearance="?android:attr/textAppearanceMedium"
                 android:textStyle="bold"
                 android:text="@string/crypt_keeper_unplugged_text"
-                android:visibility="gone"
-            />
+                android:visibility="gone" />
         </LinearLayout>
-
     </ScrollView>
     <Button
         android:id="@+id/initiate_encrypt"
-        android:layout_gravity="center_horizontal"
-        android:layout_marginTop="16dip"
-        android:layout_marginBottom="16dip"
+        style="@style/ActionPrimaryButton"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:text="@string/crypt_keeper_button_text"
-        android:gravity="center" 
-    />
-
+        android:layout_gravity="end"
+        android:text="@string/crypt_keeper_button_text" />
 </LinearLayout>
diff --git a/res/layout/data_usage_item.xml b/res/layout/data_usage_item.xml
deleted file mode 100644
index 5e931f9..0000000
--- a/res/layout/data_usage_item.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2011 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT 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:paddingStart="?android:attr/listPreferredItemPaddingStart"
-    android:paddingEnd="?android:attr/listPreferredItemPaddingEnd">
-
-    <include layout="@layout/app_item" />
-
-</FrameLayout>
diff --git a/res/layout/device_admin_item.xml b/res/layout/device_admin_item.xml
index 0420bb5..875c734 100644
--- a/res/layout/device_admin_item.xml
+++ b/res/layout/device_admin_item.xml
@@ -29,13 +29,17 @@
     <LinearLayout
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:gravity="center"
-        android:orientation="horizontal">
+        android:gravity="start|center_vertical"
+        android:minWidth="60dp"
+        android:orientation="horizontal"
+        android:paddingEnd="12dp"
+        android:paddingTop="4dp"
+        android:paddingBottom="4dp">
 
         <ImageView
             android:id="@+id/icon"
-            android:layout_width="@android:dimen/app_icon_size"
-            android:layout_height="@android:dimen/app_icon_size"
+            android:layout_width="@dimen/secondary_app_icon_size"
+            android:layout_height="@dimen/secondary_app_icon_size"
             android:layout_gravity="center_vertical"
             android:layout_marginEnd="8dip"
             android:contentDescription="@null" />
@@ -70,7 +74,7 @@
 
     </RelativeLayout>
 
-    <CheckBox
+    <Switch
         android:id="@+id/checkbox"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
diff --git a/res/layout/dialog_firmware_version.xml b/res/layout/dialog_firmware_version.xml
new file mode 100644
index 0000000..e49255f
--- /dev/null
+++ b/res/layout/dialog_firmware_version.xml
@@ -0,0 +1,89 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  Copyright (C) 2017 The Android Open Source Project
+
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+  -->
+
+<ScrollView
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content">
+    <LinearLayout
+        android:orientation="vertical"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:padding="@dimen/sim_content_padding">
+
+        <TextView
+            style="@style/device_info_dialog_label"
+            android:id="@+id/firmware_version_label"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:text="@string/firmware_version"/>
+        <TextView
+            style="@style/device_info_dialog_value"
+            android:id="@+id/firmware_version_value"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"/>
+
+        <TextView
+            style="@style/device_info_dialog_label"
+            android:id="@+id/security_patch_level_label"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:text="@string/security_patch"/>
+        <TextView
+            style="@style/device_info_dialog_value"
+            android:id="@+id/security_patch_level_value"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"/>
+
+        <TextView
+            style="@style/device_info_dialog_label"
+            android:id="@+id/baseband_version_label"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:text="@string/baseband_version"/>
+        <TextView
+            style="@style/device_info_dialog_value"
+            android:id="@+id/baseband_version_value"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"/>
+
+        <TextView
+            style="@style/device_info_dialog_label"
+            android:id="@+id/kernel_version_label"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:text="@string/kernel_version"/>
+        <TextView
+            style="@style/device_info_dialog_value"
+            android:id="@+id/kernel_version_value"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"/>
+
+        <TextView
+            style="@style/device_info_dialog_label"
+            android:id="@+id/build_number_label"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:text="@string/build_number"/>
+        <TextView
+            style="@style/device_info_dialog_value"
+            android:id="@+id/build_number_value"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"/>
+
+    </LinearLayout>
+</ScrollView>
diff --git a/res/layout/dialog_hardware_info.xml b/res/layout/dialog_hardware_info.xml
index f9d52b8..7ea4783 100644
--- a/res/layout/dialog_hardware_info.xml
+++ b/res/layout/dialog_hardware_info.xml
@@ -26,32 +26,40 @@
         android:padding="24dp">
 
         <TextView
+            style="@style/device_info_dialog_label"
             android:id="@+id/model_label"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:textAppearance="@android:style/TextAppearance.Material.Body1"
-            android:textColor="?android:attr/textColorSecondary"
             android:text="@string/model_info" />
         <TextView
+            style="@style/device_info_dialog_value"
             android:id="@+id/model_value"
             android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:paddingBottom="24dp"
-            android:textAppearance="@android:style/TextAppearance.Material.Body2" />
+            android:layout_height="wrap_content" />
 
         <TextView
+            style="@style/device_info_dialog_label"
+            android:id="@+id/serial_number_label"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:text="@string/status_serial_number" />
+        <TextView
+            style="@style/device_info_dialog_value"
+            android:id="@+id/serial_number_value"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content" />
+
+        <TextView
+            style="@style/device_info_dialog_label"
             android:id="@+id/hardware_rev_label"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:textAppearance="@android:style/TextAppearance.Material.Body1"
-            android:textColor="?android:attr/textColorSecondary"
             android:text="@string/hardware_revision" />
         <TextView
+            style="@style/device_info_dialog_value"
             android:id="@+id/hardware_rev_value"
             android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:paddingBottom="24dp"
-            android:textAppearance="@android:style/TextAppearance.Material.Body2" />
+            android:layout_height="wrap_content" />
 
     </LinearLayout>
 </ScrollView>
\ No newline at end of file
diff --git a/res/layout/dialog_imei_info.xml b/res/layout/dialog_imei_info.xml
new file mode 100644
index 0000000..d989f42
--- /dev/null
+++ b/res/layout/dialog_imei_info.xml
@@ -0,0 +1,104 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  Copyright (C) 2017 The Android Open Source Project
+
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+  -->
+
+<ScrollView
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content">
+    <LinearLayout
+        android:orientation="vertical"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:padding="@dimen/sim_content_padding">
+
+        <!-- These items are only for CDMA phones -->
+        <LinearLayout
+            android:id="@+id/cdma_settings"
+            android:orientation="vertical"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content">
+            <TextView
+                style="@style/device_info_dialog_label"
+                android:id="@+id/min_number_label"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:text="@string/status_min_number"/>
+            <TextView
+                style="@style/device_info_dialog_value"
+                android:id="@+id/min_number_value"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"/>
+
+            <TextView
+                style="@style/device_info_dialog_label"
+                android:id="@+id/prl_version_label"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:text="@string/status_prl_version"/>
+            <TextView
+                style="@style/device_info_dialog_value"
+                android:id="@+id/prl_version_value"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"/>
+
+            <TextView
+                style="@style/device_info_dialog_label"
+                android:id="@+id/meid_number_label"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:text="@string/status_meid_number"/>
+            <TextView
+                style="@style/device_info_dialog_value"
+                android:id="@+id/meid_number_value"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"/>
+
+        </LinearLayout>
+
+        <!-- These items are for GSM and LTE enabled CDMA phones -->
+        <LinearLayout
+            android:id="@+id/gsm_settings"
+            android:orientation="vertical"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content">
+            <TextView
+                style="@style/device_info_dialog_label"
+                android:id="@+id/imei_label"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:text="@string/status_imei"/>
+            <TextView
+                style="@style/device_info_dialog_value"
+                android:id="@+id/imei_value"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"/>
+
+            <TextView
+                style="@style/device_info_dialog_label"
+                android:id="@+id/imei_sv_label"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:text="@string/status_imei_sv"/>
+            <TextView
+                style="@style/device_info_dialog_value"
+                android:id="@+id/imei_sv_value"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"/>
+        </LinearLayout>
+
+    </LinearLayout>
+</ScrollView>
\ No newline at end of file
diff --git a/res/layout/dialog_sim_status.xml b/res/layout/dialog_sim_status.xml
new file mode 100644
index 0000000..9377664
--- /dev/null
+++ b/res/layout/dialog_sim_status.xml
@@ -0,0 +1,144 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  Copyright (C) 2017 The Android Open Source Project
+
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+  -->
+
+<ScrollView
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content">
+    <LinearLayout
+        android:orientation="vertical"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:padding="@dimen/sim_content_padding">
+
+        <TextView
+            style="@style/device_info_dialog_label"
+            android:id="@+id/operator_name_label"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:text="@string/status_operator"/>
+        <TextView
+            style="@style/device_info_dialog_value"
+            android:id="@+id/operator_name_value"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:text="@string/device_info_not_available"/>
+
+        <TextView
+            style="@style/device_info_dialog_label"
+            android:id="@+id/number_label"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:text="@string/status_number_sim_status"/>
+        <TextView
+            style="@style/device_info_dialog_value"
+            android:id="@+id/number_value"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:text="@string/device_info_not_available"/>
+
+        <TextView
+            style="@style/device_info_dialog_label"
+            android:id="@+id/data_state_label"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:text="@string/status_data_state"/>
+        <TextView
+            style="@style/device_info_dialog_value"
+            android:id="@+id/data_state_value"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:text="@string/device_info_not_available"/>
+
+        <TextView
+            style="@style/device_info_dialog_label"
+            android:id="@+id/latest_area_info_label"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:text="@string/status_latest_area_info"/>
+        <TextView
+            style="@style/device_info_dialog_value"
+            android:id="@+id/latest_area_info_value"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:text="@string/device_info_not_available"/>
+
+        <TextView
+            style="@style/device_info_dialog_label"
+            android:id="@+id/service_state_label"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:text="@string/status_service_state"/>
+        <TextView
+            style="@style/device_info_dialog_value"
+            android:id="@+id/service_state_value"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:text="@string/device_info_not_available"/>
+
+        <TextView
+            style="@style/device_info_dialog_label"
+            android:id="@+id/signal_strength_label"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:text="@string/status_signal_strength"/>
+        <TextView
+            style="@style/device_info_dialog_value"
+            android:id="@+id/signal_strength_value"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:text="@string/device_info_not_available"/>
+
+        <TextView
+            style="@style/device_info_dialog_label"
+            android:id="@+id/network_type_label"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:text="@string/status_network_type"/>
+        <TextView
+            style="@style/device_info_dialog_value"
+            android:id="@+id/network_type_value"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:text="@string/device_info_not_available"/>
+
+        <TextView
+            style="@style/device_info_dialog_label"
+            android:id="@+id/roaming_state_label"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:text="@string/status_roaming"/>
+        <TextView
+            style="@style/device_info_dialog_value"
+            android:id="@+id/roaming_state_value"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:text="@string/device_info_not_available"/>
+
+        <TextView
+            style="@style/device_info_dialog_label"
+            android:id="@+id/icc_id_label"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:text="@string/status_icc_id"/>
+        <TextView
+            style="@style/device_info_dialog_value"
+            android:id="@+id/icc_id_value"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"/>
+    </LinearLayout>
+</ScrollView>
diff --git a/res/layout/expand_preference.xml b/res/layout/expand_preference.xml
deleted file mode 100644
index 729dfd9..0000000
--- a/res/layout/expand_preference.xml
+++ /dev/null
@@ -1,75 +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.
-  -->
-
-<!-- Based off frameworks/base/core/res/res/layout/preference_material.xml -->
-<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:gravity="center_vertical"
-    android:paddingStart="?android:attr/listPreferredItemPaddingStart"
-    android:paddingEnd="?android:attr/listPreferredItemPaddingEnd"
-    android:background="?android:attr/selectableItemBackground"
-    android:clipToPadding="false">
-
-    <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">
-        <com.android.internal.widget.PreferenceImageView
-            android:id="@android:id/icon"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:maxWidth="48dp"
-            android:maxHeight="48dp"/>
-    </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: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:ellipsize="marquee"
-            android:maxLines="1"/>
-
-    </RelativeLayout>
-
-</LinearLayout>
diff --git a/res/layout/instant_app_buttons.xml b/res/layout/instant_app_buttons.xml
index b267361..9c2e915 100644
--- a/res/layout/instant_app_buttons.xml
+++ b/res/layout/instant_app_buttons.xml
@@ -26,7 +26,7 @@
     android:visibility="gone">
     <Button
         android:id="@+id/install"
-        style="@style/AppActionPrimaryButton"
+        style="@style/ActionPrimaryButton"
         android:enabled="false"
         android:layout_width="0dp"
         android:layout_weight="1"
diff --git a/res/layout/location_list_no_item.xml b/res/layout/location_list_no_item.xml
deleted file mode 100644
index c0465cf..0000000
--- a/res/layout/location_list_no_item.xml
+++ /dev/null
@@ -1,45 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- 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.
--->
-
-<!-- text that appears when the recent app list is empty -->
-<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:gravity="center_vertical"
-    android:paddingEnd="?android:attr/scrollbarSize"
-    android:background="?android:attr/selectableItemBackground" >
-
-    <RelativeLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginStart="15dip"
-        android:layout_marginEnd="6dip"
-        android:layout_marginTop="6dip"
-        android:layout_marginBottom="6dip"
-        android:layout_weight="1">
-
-        <TextView android:id="@android:id/title"
-            android:gravity="center"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:textAppearance="?android:attr/textAppearanceSmall"
-            android:textColor="?android:attr/textColorSecondary" />
-
-    </RelativeLayout>
-
-</LinearLayout>
-
diff --git a/res/layout/manage_applications_apps.xml b/res/layout/manage_applications_apps.xml
index e4ec871..d362528 100644
--- a/res/layout/manage_applications_apps.xml
+++ b/res/layout/manage_applications_apps.xml
@@ -14,44 +14,53 @@
      limitations under the License.
 -->
 
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:orientation="vertical">
+<LinearLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:settings="http://schemas.android.com/apk/res-auto"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical">
 
     <FrameLayout
-              android:layout_width="match_parent"
-              android:layout_height="0dp"
-              android:layout_weight="1">
+        android:layout_width="match_parent"
+        android:layout_height="0dp"
+        android:layout_weight="1">
 
-        <LinearLayout android:id="@+id/list_container"
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:orientation="vertical"
-                android:visibility="gone">
+        <LinearLayout
+            android:id="@+id/list_container"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:orientation="vertical"
+            android:visibility="gone">
 
             <FrameLayout
                 android:id="@+id/pinned_header"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content" />
 
-            <FrameLayout android:layout_width="match_parent"
-                    android:layout_height="0px"
-                    android:layout_weight="1">
+            <FrameLayout
+                android:layout_width="match_parent"
+                android:layout_height="0px"
+                android:layout_weight="1">
 
-                <ListView android:id="@android:id/list"
-                    android:drawSelectorOnTop="false"
+                <android.support.v7.widget.RecyclerView
+                    android:id="@+id/apps_list"
                     android:layout_width="match_parent"
                     android:layout_height="match_parent"
-                    android:clipToPadding="false"
-                    android:scrollbarStyle="@integer/preference_scrollbar_style" />
+                    settings:fastScrollEnabled="true"
+                    settings:fastScrollHorizontalThumbDrawable="@drawable/thumb_drawable"
+                    settings:fastScrollHorizontalTrackDrawable="@drawable/line_drawable"
+                    settings:fastScrollVerticalThumbDrawable="@drawable/thumb_drawable"
+                    settings:fastScrollVerticalTrackDrawable="@drawable/line_drawable"/>
 
-                <TextView android:id="@android:id/empty"
-                        android:layout_width="match_parent"
-                        android:layout_height="match_parent"
-                        android:gravity="center"
-                        android:text="@string/no_applications"
-                        android:textAppearance="?android:attr/textAppearanceLarge" />
+                <TextView
+                    android:id="@android:id/empty"
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent"
+                    android:gravity="center"
+                    android:text="@string/no_applications"
+                    android:textAppearance="?android:attr/textAppearanceLarge"
+                    android:visibility="invisible" />
 
             </FrameLayout>
 
diff --git a/res/layout/manage_data_plans_preference.xml b/res/layout/manage_data_plans_preference.xml
index 1686d3f..0db5698 100644
--- a/res/layout/manage_data_plans_preference.xml
+++ b/res/layout/manage_data_plans_preference.xml
@@ -28,5 +28,5 @@
             android:layout_height="wrap_content"
             android:text="@string/data_plan_usage_manage_plans_button_text"
             android:textAllCaps="true"
-            style="@style/AppActionPrimaryButton" />
+            style="@style/ActionPrimaryButton" />
 </FrameLayout>
diff --git a/res/layout/master_clear.xml b/res/layout/master_clear.xml
index ec2aaea..779e504 100644
--- a/res/layout/master_clear.xml
+++ b/res/layout/master_clear.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,24 +14,24 @@
      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="match_parent"
     android:layout_height="match_parent"
-    android:orientation="vertical"
-    >
+    android:orientation="vertical">
 
     <ScrollView
             android:id="@+id/master_clear_scrollview"
             android:layout_width="match_parent"
             android:layout_height="0dip"
-            android:layout_marginStart="12dp"
+            android:layout_marginStart="@dimen/preference_no_icon_padding_start"
             android:layout_marginEnd="12dp"
             android:layout_marginTop="12dp"
             android:layout_weight="1">
-        <LinearLayout android:id="@+id/master_clear_container"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:orientation="vertical">
+        <LinearLayout
+            android:id="@+id/master_clear_container"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="vertical">
             <TextView
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
diff --git a/res/layout/preference_app.xml b/res/layout/preference_app.xml
index 526d5af..8cbb6f2 100644
--- a/res/layout/preference_app.xml
+++ b/res/layout/preference_app.xml
@@ -13,13 +13,87 @@
      See the License for the specific language governing permissions and
      limitations under the License.
 -->
-
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<LinearLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:settings="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
+    android:background="?android:attr/selectableItemBackground"
+    android:gravity="center_vertical"
+    android:minHeight="?android:attr/listPreferredItemHeightSmall"
     android:paddingStart="?android:attr/listPreferredItemPaddingStart"
     android:paddingEnd="?android:attr/listPreferredItemPaddingEnd">
 
-    <include layout="@layout/app_item" />
+    <LinearLayout
+        android:id="@+id/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"
+        android:paddingBottom="4dp">
+        <android.support.v7.internal.widget.PreferenceImageView
+            android:id="@android:id/icon"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            settings:maxWidth="@dimen/secondary_app_icon_size"
+            settings:maxHeight="@dimen/secondary_app_icon_size" />
+    </LinearLayout>
+
+    <LinearLayout
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_weight="1"
+        android:orientation="vertical"
+        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="@style/TextAppearance.TileTitle"
+                  android:ellipsize="marquee"
+                  android:fadingEdge="horizontal" />
+
+        <LinearLayout
+            android:id="@+id/summary_container"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:visibility="gone">
+            <TextView android:id="@android:id/summary"
+                      android:layout_width="0dp"
+                      android:layout_height="wrap_content"
+                      android:layout_weight="1"
+                      android:textAppearance="@style/TextAppearance.Small"
+                      android:textColor="?android:attr/textColorSecondary" />
+
+            <TextView android:id="@+id/appendix"
+                      android:layout_width="wrap_content"
+                      android:layout_height="wrap_content"
+                      android:textAppearance="@style/TextAppearance.Small"
+                      android:textColor="?android:attr/textColorSecondary"
+                      android:maxLines="1"
+                      android:ellipsize="end" />
+        </LinearLayout>
+        <ProgressBar
+            android:id="@android:id/progress"
+            style="?android:attr/progressBarStyleHorizontal"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="4dp"
+            android:max="100"
+            android:visibility="gone" />
+    </LinearLayout>
+
+    <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>
diff --git a/res/layout/preference_dropdown_material_settings.xml b/res/layout/preference_dropdown_material_settings.xml
deleted file mode 100644
index a3f5ab9..0000000
--- a/res/layout/preference_dropdown_material_settings.xml
+++ /dev/null
@@ -1,35 +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.
-  -->
-
-
-<!-- Based off frameworks/base/core/res/res/layout/preference_dropdown_material.xml
-     except that icon space in this layout is always reserved -->
-<FrameLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content">
-
-    <Spinner
-        android:id="@+id/spinner"
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:layout_marginStart="@dimen/preference_no_icon_padding_start"
-        android:visibility="invisible" />
-
-    <include layout="@layout/preference_material"/>
-
-</FrameLayout>
\ No newline at end of file
diff --git a/res/layout/preference_small_icon.xml b/res/layout/preference_small_icon.xml
deleted file mode 100644
index e734b4b..0000000
--- a/res/layout/preference_small_icon.xml
+++ /dev/null
@@ -1,82 +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.
-  -->
-
-<!-- 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/private_dns_mode_dialog.xml b/res/layout/private_dns_mode_dialog.xml
index 4347055..16152a4 100644
--- a/res/layout/private_dns_mode_dialog.xml
+++ b/res/layout/private_dns_mode_dialog.xml
@@ -16,6 +16,7 @@
 
 <RadioGroup
     xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/private_dns_radio_group"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:padding="8dip">
@@ -25,24 +26,21 @@
         android:text="@string/private_dns_mode_off"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_margin="8dip"
-        />
+        android:layout_margin="8dip"/>
 
     <RadioButton
         android:id="@+id/private_dns_mode_opportunistic"
         android:text="@string/private_dns_mode_opportunistic"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_margin="8dip"
-        />
+        android:layout_margin="8dip"/>
 
     <RadioButton
         android:id="@+id/private_dns_mode_provider"
         android:text="@string/private_dns_mode_provider"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_margin="8dip"
-        />
+        android:layout_margin="8dip"/>
 
     <EditText
         android:id="@+id/private_dns_mode_provider_hostname"
@@ -52,8 +50,7 @@
         android:inputType="textFilter|textUri"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_marginStart="8dip"
-        android:layout_marginEnd="8dip"
-        />
+        android:layout_marginStart="40dip"
+        android:layout_marginEnd="8dip"/>
 
 </RadioGroup>
diff --git a/res/layout/process_stats_mem_details.xml b/res/layout/process_stats_mem_details.xml
deleted file mode 100644
index 32d6f8e..0000000
--- a/res/layout/process_stats_mem_details.xml
+++ /dev/null
@@ -1,63 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- 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.
--->
-
-<ScrollView
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:clipToPadding="false"
-    android:scrollbarStyle="@integer/preference_scrollbar_style">
-
-    <LinearLayout
-        android:id="@+id/all_details"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:paddingTop="5dip"
-        android:paddingBottom="5dip"
-        android:orientation="vertical">
-
-        <TextView
-            style="?android:attr/listSeparatorTextViewStyle"
-            android:text="@string/mem_state_subtitle" />
-
-        <LinearLayout
-            android:id="@+id/mem_state"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:paddingStart="6dip"
-            android:orientation="vertical">
-
-            <!-- Insert detail items here -->
-
-        </LinearLayout>
-
-        <TextView
-            style="?android:attr/listSeparatorTextViewStyle"
-            android:text="@string/mem_use_subtitle" />
-
-        <LinearLayout
-            android:id="@+id/mem_use"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:paddingStart="6dip"
-            android:orientation="vertical">
-
-            <!-- Insert detail items here -->
-
-        </LinearLayout>
-
-    </LinearLayout>
-</ScrollView>
diff --git a/res/layout/reset_network.xml b/res/layout/reset_network.xml
index 82769db..be966dd 100644
--- a/res/layout/reset_network.xml
+++ b/res/layout/reset_network.xml
@@ -22,7 +22,7 @@
     <ScrollView
         android:layout_width="match_parent"
         android:layout_height="0dip"
-        android:layout_marginStart="12dp"
+        android:layout_marginStart="@dimen/preference_no_icon_padding_start"
         android:layout_marginEnd="12dp"
         android:layout_marginTop="12dp"
         android:layout_weight="1">
diff --git a/res/layout/search_panel.xml b/res/layout/search_panel.xml
index 48a1d4c..10c2a00 100644
--- a/res/layout/search_panel.xml
+++ b/res/layout/search_panel.xml
@@ -76,7 +76,7 @@
             android:id="@+id/no_results_layout"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
-            android:paddingTop="96dp"
+            android:paddingTop="35dp"
             android:orientation="vertical"
             android:visibility="gone">
 
@@ -85,8 +85,8 @@
                 android:layout_height="?android:attr/actionBarSize"/>
 
             <ImageView
-                android:layout_height="160dp"
-                android:layout_width="160dp"
+                android:layout_height="wrap_content"
+                android:layout_width="wrap_content"
                 android:layout_gravity="center_horizontal"
                 android:src="@drawable/empty_search_results"/>
 
diff --git a/res/layout/search_slice_item.xml b/res/layout/search_slice_item.xml
new file mode 100644
index 0000000..1607209
--- /dev/null
+++ b/res/layout/search_slice_item.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"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:minHeight="?android:attr/listPreferredItemHeight"
+    android:paddingTop="16dp"
+    android:paddingBottom="16dp"
+    android:paddingEnd="?android:attr/listPreferredItemPaddingEnd"
+    android:background="?android:attr/selectableItemBackground"
+    android:clipToPadding="false">
+
+    <include layout="@layout/search_icon_view"/>
+
+    <android.app.slice.widget.SliceView
+        android:id="@android:id/content"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"/>
+</LinearLayout>
\ No newline at end of file
diff --git a/res/layout/settings_main_dashboard.xml b/res/layout/settings_main_dashboard.xml
index 8e83cff..4f8c308 100644
--- a/res/layout/settings_main_dashboard.xml
+++ b/res/layout/settings_main_dashboard.xml
@@ -17,7 +17,8 @@
 */
 -->
 
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<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"
@@ -32,7 +33,7 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_margin="@dimen/search_bar_margin"
-            app:cardCornerRadius="2dp"
+            app:cardCornerRadius="@dimen/search_bar_corner_radius"
             app:cardBackgroundColor="?android:attr/colorBackground"
             app:cardElevation="2dp">
             <Toolbar
@@ -43,13 +44,18 @@
                 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:theme="?android:attr/actionBarTheme">
+                <TextView
+                    android:id="@+id/search_action_bar_title"
+                    style="@style/TextAppearance.SearchBar"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="@string/search_menu" />
+            </Toolbar>
         </android.support.v7.widget.CardView>
     </FrameLayout>
     <FrameLayout
         android:id="@+id/main_content"
         android:layout_height="match_parent"
-        android:layout_width="match_parent"/>
+        android:layout_width="match_parent" />
 </LinearLayout>
diff --git a/res/layout/storage_item.xml b/res/layout/storage_item.xml
index 4b14bb3..ba1c697 100644
--- a/res/layout/storage_item.xml
+++ b/res/layout/storage_item.xml
@@ -36,12 +36,11 @@
 
         <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:minWidth="56dp"
             android:orientation="horizontal"
-            android:paddingEnd="12dp"
             android:paddingTop="4dp"
             android:paddingBottom="4dp">
             <com.android.internal.widget.PreferenceImageView
diff --git a/res/layout/storage_summary_donut.xml b/res/layout/storage_summary_donut.xml
index 8e11d71..ce7e272 100644
--- a/res/layout/storage_summary_donut.xml
+++ b/res/layout/storage_summary_donut.xml
@@ -63,7 +63,7 @@
             android:layout_height="wrap_content"
             android:layout_below="@android:id/summary"
             android:text="@string/storage_menu_free"
-            style="@android:style/@Widget.Material.Button.Colored" />
+            style="@style/ActionPrimaryButton" />
     </LinearLayout>
 
     <com.android.settings.widget.DonutView
diff --git a/res/layout/storage_volume.xml b/res/layout/storage_volume.xml
index 39a6f85..ca368b9 100644
--- a/res/layout/storage_volume.xml
+++ b/res/layout/storage_volume.xml
@@ -26,12 +26,11 @@
 
     <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:minWidth="56dp"
         android:orientation="horizontal"
-        android:paddingEnd="12dp"
         android:paddingTop="4dp"
         android:paddingBottom="4dp">
         <com.android.internal.widget.PreferenceImageView
diff --git a/res/layout/suggestion_condition_footer.xml b/res/layout/suggestion_condition_footer.xml
index 3eea6a5..5de9d55 100644
--- a/res/layout/suggestion_condition_footer.xml
+++ b/res/layout/suggestion_condition_footer.xml
@@ -20,15 +20,16 @@
     style="@style/SuggestionConditionStyle"
     android:layout_width="match_parent"
     android:layout_height="44dp"
-    android:paddingTop="10dp"
-    android:paddingEnd="10dp"
+    android:contentDescription="@string/dashboard_suggestion_condition_footer_content_description"
+    android:gravity="end"
     android:orientation="horizontal"
-    android:gravity="end">
+    android:paddingTop="10dp"
+    android:paddingEnd="10dp">
 
     <ImageView
         android:id="@+id/collapse_button"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:src="@drawable/ic_expand_less"/>
+        android:src="@drawable/ic_expand_less" />
 
 </LinearLayout>
diff --git a/res/layout/suggestion_tile.xml b/res/layout/suggestion_tile.xml
index e2dd13a..2adfab3 100644
--- a/res/layout/suggestion_tile.xml
+++ b/res/layout/suggestion_tile.xml
@@ -33,26 +33,27 @@
             android:layout_width="@dimen/dashboard_tile_image_size"
             android:layout_height="@dimen/dashboard_tile_image_size"
             android:layout_marginStart="14dp"
-            android:layout_marginEnd="24dp"/>
+            android:layout_marginEnd="24dp" />
 
         <LinearLayout
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:orientation="vertical">
 
-            <TextView android:id="@android:id/title"
+            <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"/>
+                android:fadingEdge="horizontal" />
 
-            <TextView android:id="@android:id/summary"
+            <TextView
+                android:id="@android:id/summary"
+                android:textAppearance="@style/TextAppearance.SuggestionSummary"
                 android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:textAppearance="@style/TextAppearance.Small"
-                android:textColor="?android:attr/textColorSecondary"/>
+                android:layout_height="wrap_content" />
 
         </LinearLayout>
 
diff --git a/res/layout/suggestion_tile_with_button.xml b/res/layout/suggestion_tile_with_button.xml
new file mode 100644
index 0000000..081df5b
--- /dev/null
+++ b/res/layout/suggestion_tile_with_button.xml
@@ -0,0 +1,71 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2017 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT 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:background="@android:color/white"
+    android:clipChildren="false"
+    android:clipToPadding="false"
+    android:paddingStart="16dp"
+    android:paddingEnd="12dp"
+    android:paddingBottom="20dp"
+    android:paddingTop="16dp"
+    android:orientation="horizontal"
+    android:minHeight="@dimen/dashboard_tile_minimum_height">
+
+    <ImageView
+        android:id="@android:id/icon"
+        android:layout_width="@dimen/dashboard_tile_image_size"
+        android:layout_height="@dimen/dashboard_tile_image_size" />
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_gravity="start"
+        android:layout_marginStart="18dp"
+        android:layout_marginTop="2dp"
+        android:clipChildren="false"
+        android:clipToPadding="false"
+        android:orientation="vertical">
+
+        <TextView
+            android:id="@android:id/title"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="6dp"
+            android:textAppearance="@style/TextAppearance.TileTitle" />
+
+        <TextView
+            android:id="@android:id/summary"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="12dp"
+            android:layout_marginStart="6dp"
+            android:layout_marginEnd="50dp"
+            android:textAppearance="@style/TextAppearance.SuggestionSummary" />
+
+        <Button
+            android:id="@android:id/primary"
+            style="@style/ActionPrimaryButton"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="12dp"
+            android:text="@string/suggestion_button_text" />
+    </LinearLayout>
+
+</LinearLayout>
\ No newline at end of file
diff --git a/res/layout/support_escalation_options.xml b/res/layout/support_escalation_options.xml
index 17e03ff..ae208f1 100644
--- a/res/layout/support_escalation_options.xml
+++ b/res/layout/support_escalation_options.xml
@@ -65,7 +65,7 @@
             android:orientation="vertical">
             <Button
                 android:id="@android:id/text1"
-                style="@style/SupportPrimaryButton"
+                style="@style/ActionPrimaryButton"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_margin="8dp"/>
@@ -86,7 +86,7 @@
             android:orientation="vertical">
             <Button
                 android:id="@android:id/text2"
-                style="@style/SupportPrimaryButton"
+                style="@style/ActionPrimaryButton"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_margin="8dp"/>
diff --git a/res/layout/support_offline_escalation_options.xml b/res/layout/support_offline_escalation_options.xml
index 18d8f98..09863d3 100644
--- a/res/layout/support_offline_escalation_options.xml
+++ b/res/layout/support_offline_escalation_options.xml
@@ -56,7 +56,7 @@
     </LinearLayout>
     <Button
         android:id="@android:id/text1"
-        style="@style/SupportPrimaryButton"
+        style="@style/ActionPrimaryButton"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_margin="8dp"
diff --git a/res/layout/support_sign_in_button.xml b/res/layout/support_sign_in_button.xml
index 45de571..5bea068 100644
--- a/res/layout/support_sign_in_button.xml
+++ b/res/layout/support_sign_in_button.xml
@@ -38,7 +38,7 @@
         android:textColor="?android:attr/textColorSecondary"/>
     <Button
         android:id="@android:id/text1"
-        style="@style/SupportPrimaryButton"
+        style="@style/ActionPrimaryButton"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_margin="8dp"/>
diff --git a/res/layout/tts_action_buttons.xml b/res/layout/tts_action_buttons.xml
deleted file mode 100644
index 090df42..0000000
--- a/res/layout/tts_action_buttons.xml
+++ /dev/null
@@ -1,48 +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:gravity="bottom"
-    android:paddingTop="4dp"
-    android:paddingStart="68dp"
-    android:paddingEnd="8dp"
-    android:orientation="horizontal">
-
-    <Button
-        android:id="@+id/tts_play_button"
-        style="@style/android:Widget.Material.Button.Colored"
-        android:layout_width="0dp"
-        android:layout_weight="1"
-        android:layout_height="wrap_content"
-        android:layout_gravity="center"
-        android:paddingEnd="8dp"
-        android:text="@string/tts_play"/>
-
-    <Button
-        android:id="@+id/tts_reset_button"
-        style="@style/android:Widget.Material.Button"
-        android:layout_width="0dp"
-        android:layout_weight="1"
-        android:layout_height="wrap_content"
-        android:layout_gravity="center"
-        android:paddingStart="8dp"
-        android:text="@string/tts_reset"/>
-
-</LinearLayout>
diff --git a/res/layout/two_action_buttons.xml b/res/layout/two_action_buttons.xml
new file mode 100644
index 0000000..41bcfc3
--- /dev/null
+++ b/res/layout/two_action_buttons.xml
@@ -0,0 +1,62 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  Copyright (C) 2017 The Android Open Source Project
+
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT 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:gravity="center"
+    android:paddingTop="8dp"
+    android:paddingStart="68dp"
+    android:paddingEnd="8dp"
+    android:orientation="horizontal">
+
+    <FrameLayout
+        android:layout_width="0dp"
+        android:layout_weight="1"
+        android:layout_height="wrap_content">
+        <Button
+            android:id="@+id/button1_positive"
+            style="@style/ActionPrimaryButton"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginBottom="4dp" />
+        <Button
+            android:id="@+id/button1_negative"
+            style="@style/ActionSecondaryButton"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginBottom="4dp" />
+    </FrameLayout>
+    <FrameLayout
+        android:layout_width="0dp"
+        android:layout_weight="1"
+        android:layout_height="wrap_content">
+        <Button
+            android:id="@+id/button2_positive"
+            style="@style/ActionPrimaryButton"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginBottom="4dp" />
+        <Button
+            android:id="@+id/button2_negative"
+            style="@style/ActionSecondaryButton"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginBottom="4dp" />
+    </FrameLayout>
+</LinearLayout>
\ No newline at end of file
diff --git a/res/layout/video_preference.xml b/res/layout/video_preference.xml
index 8b0e619..9ab52ae 100644
--- a/res/layout/video_preference.xml
+++ b/res/layout/video_preference.xml
@@ -28,7 +28,7 @@
 
     <com.android.settings.widget.AspectRatioFrameLayout
         android:layout_width="240dp"
-        android:layout_height="wrap_content"
+        android:layout_height="240dp"
         android:padding="@dimen/gesture_animation_padding">
 
         <TextureView
diff --git a/res/layout/widget_progress_bar.xml b/res/layout/widget_progress_bar.xml
deleted file mode 100644
index a2a5154..0000000
--- a/res/layout/widget_progress_bar.xml
+++ /dev/null
@@ -1,23 +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.
--->
-
-<ProgressBar xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@android:id/progress"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:layout_marginTop="4dp"
-    android:max="100"
-    style="?android:attr/progressBarStyleHorizontal" />
diff --git a/res/layout/wifi_ap_dialog.xml b/res/layout/wifi_ap_dialog.xml
deleted file mode 100644
index fd7b178..0000000
--- a/res/layout/wifi_ap_dialog.xml
+++ /dev/null
@@ -1,154 +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.
--->
-
-<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
-         android:layout_width="300sp"
-         android:layout_height="wrap_content"
-         android:fadeScrollbars="false">
-
-    <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:descendantFocusability="beforeDescendants"
-            android:focusableInTouchMode="true"
-            android:orientation="vertical">
-
-        <LinearLayout android:id="@+id/info"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                style="@style/wifi_section" />
-
-        <LinearLayout android:id="@+id/type"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                style="@style/wifi_section"
-                android:visibility="gone">
-
-            <LinearLayout
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    style="@style/wifi_item">
-                <TextView
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        style="@style/wifi_item_label"
-                        android:layout_marginTop="8dip"
-                        android:text="@string/wifi_ssid" />
-
-                <EditText android:id="@+id/ssid"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        style="@style/wifi_item_edit_content"
-                        android:singleLine="true"
-                        android:hint="@string/wifi_ssid_hint"
-                        android:inputType="textNoSuggestions"
-                        android:maxLength="32" />
-            </LinearLayout>
-
-            <LinearLayout
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    style="@style/wifi_item">
-                <TextView
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        style="@style/wifi_item_label"
-                        android:layout_marginTop="8dip"
-                        android:text="@string/wifi_security" />
-
-                <Spinner android:id="@+id/security"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        style="@style/wifi_item_content"
-                        android:prompt="@string/wifi_security"
-                        android:entries="@array/wifi_ap_security" />
-            </LinearLayout>
-
-        </LinearLayout>
-
-        <LinearLayout android:id="@+id/fields"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                style="@style/wifi_section"
-                android:visibility="gone">
-
-            <LinearLayout
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    style="@style/wifi_item">
-                <TextView
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        style="@style/wifi_item_label"
-                        android:layout_marginTop="8dip"
-                        android:text="@string/wifi_password" />
-
-                <EditText android:id="@+id/password"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        style="@style/wifi_item_edit_content"
-                        android:singleLine="true"
-                        android:password="true"
-                        android:maxLength="63"
-                        android:imeOptions="flagForceAscii" />
-            </LinearLayout>
-
-            <LinearLayout
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    style="@style/wifi_item">
-                <TextView android:id="@+id/hint"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        style="@style/wifi_item_label"
-                        android:text="@string/credentials_password_too_short"
-                        android:layout_marginTop="8dip"
-                        android:layout_marginBottom="10sp"/>
-
-                <CheckBox android:id="@+id/show_password"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        style="@style/wifi_item_content"
-                        android:text="@string/wifi_show_password" />
-            </LinearLayout>
-        </LinearLayout>
-
-        <LinearLayout android:id="@+id/fields"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                style="@style/wifi_section" >
-
-            <LinearLayout
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    style="@style/wifi_item">
-                <TextView
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    style="@style/wifi_item_label"
-                    android:layout_marginTop="8dip"
-                    android:text="@string/wifi_ap_band_config" />
-
-                <Spinner android:id="@+id/choose_channel"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    style="@style/wifi_item_content"
-                    android:prompt="@string/wifi_ap_band_config" />
-            </LinearLayout>
-        </LinearLayout>
-
-    </LinearLayout>
-</ScrollView>
diff --git a/res/layout/wifi_calling_settings_preferences.xml b/res/layout/wifi_calling_settings_preferences.xml
new file mode 100644
index 0000000..4e64f40
--- /dev/null
+++ b/res/layout/wifi_calling_settings_preferences.xml
@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- 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.
+-->
+
+
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/tabs_container"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical">
+
+    <com.android.settings.widget.SwitchBar
+        android:id="@+id/switch_bar"
+        android:layout_height="?android:attr/actionBarSize"
+        android:layout_width="match_parent"
+        android:background="@drawable/switchbar_background"
+        android:theme="?attr/switchBarTheme" />
+
+    <FrameLayout
+        android:id="@android:id/tabcontent"
+        android:layout_width="0dip"
+        android:layout_height="0dip" />
+
+    <FrameLayout
+        android:id="@+id/prefs_container"
+        android:layout_width="match_parent"
+        android:layout_height="0dip"
+        android:layout_weight="1"
+        android:clipChildren="false"
+        android:clipToPadding="false"
+        android:smoothScrollbar="false" />
+
+</LinearLayout>
diff --git a/res/layout/wifi_calling_settings_tabs.xml b/res/layout/wifi_calling_settings_tabs.xml
new file mode 100644
index 0000000..1e27b47
--- /dev/null
+++ b/res/layout/wifi_calling_settings_tabs.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2017 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT 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/tabs_container"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:orientation="vertical">
+
+        <com.android.settings.widget.SlidingTabLayout
+            xmlns:android="http://schemas.android.com/apk/res/android"
+            android:id="@+id/sliding_tabs"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:scrollbars="none"
+            android:fillViewport="true"/>
+
+        <com.android.settings.widget.RtlCompatibleViewPager
+            android:id="@+id/view_pager"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"/>
+
+</LinearLayout>
diff --git a/res/layout/zen_mode_button.xml b/res/layout/zen_mode_button.xml
new file mode 100644
index 0000000..af24fce
--- /dev/null
+++ b/res/layout/zen_mode_button.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  Copyright (C) 2017 The Android Open Source Project
+
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT 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/zen_mode_button"
+        android:layout_width="0dp"
+        android:layout_weight="1"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center"
+        android:paddingEnd="8dp" />
+
+</LinearLayout>
\ No newline at end of file
diff --git a/res/layout/zen_mode_settings_button.xml b/res/layout/zen_mode_settings_button.xml
new file mode 100644
index 0000000..4d4b7d6
--- /dev/null
+++ b/res/layout/zen_mode_settings_button.xml
@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  Copyright (C) 2017 The Android Open Source Project
+
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT 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/zen_mode_settings_turn_on_button"
+        style="@style/ActionPrimaryButton"
+        android:layout_width="0dp"
+        android:layout_weight="1"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center"
+        android:text="@string/zen_mode_button_turn_on"
+        android:paddingEnd="8dp" />
+
+    <Button
+        android:id="@+id/zen_mode_settings_turn_off_button"
+        style="@style/ActionSecondaryButton"
+        android:layout_width="0dp"
+        android:layout_weight="1"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center"
+        android:text="@string/zen_mode_button_turn_off"
+        android:paddingEnd="8dp" />
+
+</LinearLayout>
\ No newline at end of file
diff --git a/res/layout/zen_rule_name.xml b/res/layout/zen_rule_name.xml
index bdf1f9f..90b4fbe 100755
--- a/res/layout/zen_rule_name.xml
+++ b/res/layout/zen_rule_name.xml
@@ -19,7 +19,7 @@
     android:layout_height="wrap_content" >
 
     <EditText
-        android:id="@+id/rule_name"
+        android:id="@+id/zen_mode_rule_name"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:singleLine="true"
@@ -33,7 +33,7 @@
     </EditText>
 
     <TextView
-        android:id="@+id/rule_name_warning"
+        android:id="@+id/zen_mode_rule_name_warning"
         android:visibility="invisible"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
diff --git a/res/mipmap-hdpi/ic_accessibility_generic.png b/res/mipmap-hdpi/ic_accessibility_generic.png
old mode 100755
new mode 100644
index e54166b..2229409
--- a/res/mipmap-hdpi/ic_accessibility_generic.png
+++ b/res/mipmap-hdpi/ic_accessibility_generic.png
Binary files differ
diff --git a/res/mipmap-mdpi/ic_accessibility_generic.png b/res/mipmap-mdpi/ic_accessibility_generic.png
old mode 100755
new mode 100644
index 77dc47b..d59cda6
--- a/res/mipmap-mdpi/ic_accessibility_generic.png
+++ b/res/mipmap-mdpi/ic_accessibility_generic.png
Binary files differ
diff --git a/res/mipmap-xhdpi/ic_accessibility_generic.png b/res/mipmap-xhdpi/ic_accessibility_generic.png
old mode 100755
new mode 100644
index 1152c42..a4d4036
--- a/res/mipmap-xhdpi/ic_accessibility_generic.png
+++ b/res/mipmap-xhdpi/ic_accessibility_generic.png
Binary files differ
diff --git a/res/mipmap-xxhdpi/ic_accessibility_generic.png b/res/mipmap-xxhdpi/ic_accessibility_generic.png
old mode 100755
new mode 100644
index 48f39c2..361f5d5
--- a/res/mipmap-xxhdpi/ic_accessibility_generic.png
+++ b/res/mipmap-xxhdpi/ic_accessibility_generic.png
Binary files differ
diff --git a/res/mipmap-xxxhdpi/ic_accessibility_generic.png b/res/mipmap-xxxhdpi/ic_accessibility_generic.png
old mode 100755
new mode 100644
index e9ca879..a960e79
--- a/res/mipmap-xxxhdpi/ic_accessibility_generic.png
+++ b/res/mipmap-xxxhdpi/ic_accessibility_generic.png
Binary files differ
diff --git a/res/values-af/arrays.xml b/res/values-af/arrays.xml
index d959cef..b031e5e 100644
--- a/res/values-af/arrays.xml
+++ b/res/values-af/arrays.xml
@@ -100,8 +100,6 @@
     <!-- no translation found for wifi_security_no_eap:0 (2084555984818107151) -->
     <!-- no translation found for wifi_security_no_eap:1 (397579322683471524) -->
     <!-- no translation found for wifi_security_no_eap:2 (1968820975358150484) -->
-    <!-- no translation found for wifi_ap_security:0 (5251664683198623324) -->
-    <!-- no translation found for wifi_ap_security:1 (7989073072260294673) -->
   <string-array name="wifi_eap_method">
     <item msgid="1160193392455075561">"PEAP"</item>
     <item msgid="7981731051382306293">"TLS"</item>
diff --git a/res/values-af/strings.xml b/res/values-af/strings.xml
index b270ccd..3d760d2 100644
--- a/res/values-af/strings.xml
+++ b/res/values-af/strings.xml
@@ -166,7 +166,7 @@
     <string name="bluetooth_map_acceptance_dialog_text" msgid="8712508202081143737">"%1$s wil toegang tot jou boodskappe verkry. Gee toegang aan %2$s?"</string>
     <string name="bluetooth_sap_request" msgid="2669762224045354417">"SIM-toegangversoek"</string>
     <string name="bluetooth_sap_acceptance_dialog_text" msgid="4414253873553608690">"<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g> wil toegang hê tot jou SIM-kaart. As jy toegang tot jou SIM-kaart verleen, sal die dataverbinding op jou toestel vir die duur van die verbinding gedeaktiveer wees. Verleen toegang aan <xliff:g id="DEVICE_NAME_1">%2$s?</xliff:g>"</string>
-    <string name="bluetooth_device_name_summary" msgid="4757990010751789977">"Vir ander toestelle sigbaar as \'<xliff:g id="DEVICE_NAME">^1</xliff:g>\'"</string>
+    <string name="bluetooth_device_name_summary" msgid="522235742194965734">"Vir ander toestelle sigbaar as \"<xliff:g id="DEVICE_NAME">^1</xliff:g>\""</string>
     <string name="bluetooth_paired_device_title" msgid="8638994696317952019">"Jou toestelle"</string>
     <string name="bluetooth_pairing_page_title" msgid="7712127387361962608">"Bind nuwe toestel saam"</string>
     <string name="date_and_time" msgid="9062980487860757694">"Datum en tyd"</string>
@@ -312,6 +312,8 @@
     <string name="zone_auto" msgid="334783869352026648">"Outomatiese tydsone"</string>
     <string name="zone_auto_summaryOn" msgid="6142830927278458314">"Gebruik netwerkvoorsiende tydsone"</string>
     <string name="zone_auto_summaryOff" msgid="2597745783162041390">"Gebruik netwerkvoorsiende tydsone"</string>
+    <string name="date_time_24hour_auto" msgid="2117383168985653422">"Outomatiese 24-uur-formaat"</string>
+    <string name="date_time_24hour_auto_summary" msgid="6351812925651480277">"Gebruik localeverstek"</string>
     <string name="date_time_24hour_title" msgid="3203537578602803850">"24-uur-formaat"</string>
     <string name="date_time_24hour" msgid="1193032284921000063">"Gebruik 24-uur-formaat"</string>
     <string name="date_time_set_time_title" msgid="6296795651349047016">"Tyd"</string>
@@ -372,6 +374,9 @@
     <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="1961957425135180242">"Volgende"</string>
+    <string name="setup_fingerprint_enroll_skip_title" msgid="362050541117362034">"Slaan vingerafdruk oor?"</string>
+    <string name="setup_fingerprint_enroll_skip_after_adding_lock_text" msgid="958990414356204763">"Vingerafdrukopstelling neem net \'n minuut of twee. As jy dit oorslaan, kan jy jou vingerafdruk later in instellings byvoeg."</string>
+    <string name="lock_screen_intro_skip_title" msgid="4988210105913705679">"Slaan skermslot oor?"</string>
     <string name="lock_screen_intro_skip_dialog_text_frp" product="tablet" msgid="1581834104051243425">"Toestelbeskermingkenmerke sal nie aangeskakel word nie. Jy sal nie ander mense kan keer om hierdie tablet te gebruik as dit verloor, gesteel of teruggestel word nie."</string>
     <string name="lock_screen_intro_skip_dialog_text_frp" product="device" msgid="4629503416877189572">"Toestelbeskermingkenmerke sal nie aangeskakel word nie. Jy sal nie ander mense kan keer om hierdie toestel te gebruik as dit verloor, gesteel of teruggestel word nie."</string>
     <string name="lock_screen_intro_skip_dialog_text_frp" product="default" msgid="2423428240245737909">"Toestelbeskermingkenmerke sal nie aangeskakel word nie. Jy sal nie ander mense kan keer om hierdie te foon gebruik as dit verloor, gesteel of teruggestel word nie."</string>
@@ -457,7 +462,7 @@
     <string name="setup_lock_settings_picker_title" product="tablet" msgid="90329443364067215">"Beskerm jou tablet"</string>
     <string name="setup_lock_settings_picker_title" product="device" msgid="2399952075134938929">"Beskerm jou toestel"</string>
     <string name="setup_lock_settings_picker_title" product="default" msgid="1572244299605153324">"Beskerm jou foon"</string>
-    <string name="setup_lock_settings_picker_fingerprint_message" msgid="5585650064305600578">"Stel \'n rugsteunskermslot op vir bykomende sekuriteit."</string>
+    <string name="lock_settings_picker_fingerprint_added_security_message" msgid="5768002109707648463">"Stel \'n rugsteunskermslot vir bykomende sekuriteit."</string>
     <string name="setup_lock_settings_picker_message" product="tablet" msgid="8919671129189936210">"Keer ander mense om hierdie tablet 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="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>
@@ -588,6 +593,7 @@
     <string name="lockpassword_pin_no_sequential_digits" msgid="680765285206990584">"Stygende, dalende of herhalende volgorde van syfers word nie toegelaat nie"</string>
     <string name="lockpassword_ok_label" msgid="313822574062553672">"OK"</string>
     <string name="lockpassword_cancel_label" msgid="8818529276331121899">"Kanselleer"</string>
+    <string name="lockpassword_clear_label" msgid="5724429464960458155">"Vee uit"</string>
     <string name="lockpattern_tutorial_cancel_label" msgid="6431583477570493261">"Kanselleer"</string>
     <string name="lockpattern_tutorial_continue_label" msgid="3559793618653400434">"Volgende"</string>
     <string name="lock_setup" msgid="3355847066343753943">"Opstelling is klaar."</string>
@@ -781,6 +787,7 @@
     <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>
@@ -817,6 +824,8 @@
     <string name="wifi_wps_available_first_item" msgid="4422547079984583502">"WPS beskikbaar"</string>
     <string name="wifi_wps_available_second_item" msgid="8427520131718215301">" (WPS beskikbaar)"</string>
     <string name="wifi_wps_nfc_enter_password" msgid="2288214226916117159">"Voer jou netwerkwagwoord in"</string>
+    <string name="wifi_carrier_connect" msgid="8174696557882299911">"Diensverskaffer-Wi‑Fi-netwerk"</string>
+    <string name="wifi_carrier_content" msgid="4634077285415851933">"Gekoppel via <xliff:g id="NAME">%1%s</xliff:g>"</string>
     <string name="wifi_scan_always_turnon_message" msgid="203123538572122989">"Om liggingsakkuraatheid te verbeter en vir ander doele, wil <xliff:g id="APP_NAME">%1$s</xliff:g> netwerkskandering aanskakel, selfs wanneer Wi-Fi af is.\n\n Laat dit toe vir alle programme wat wil skandeer?"</string>
     <string name="wifi_scan_always_turnoff_message" msgid="5538901671131941043">"Gaan in die oorloopkieslys na Gevorderd om dit af te skakel."</string>
     <string name="wifi_scan_always_confirm_allow" msgid="5355973075896817232">"Laat toe"</string>
@@ -834,6 +843,7 @@
     <string name="wifi_connect" msgid="1076622875777072845">"Koppel"</string>
     <string name="wifi_failed_connect_message" msgid="8491902558970292871">"Netwerkverbinding het misluk"</string>
     <string name="wifi_forget" msgid="8168174695608386644">"Vergeet"</string>
+    <string name="wifi_modify" msgid="6100248070440710782">"Wysig"</string>
     <string name="wifi_failed_forget_message" msgid="1348172929201654986">"Kon netwerk nie vergeet nie"</string>
     <string name="wifi_save" msgid="3331121567988522826">"Stoor"</string>
     <string name="wifi_failed_save_message" msgid="6650004874143815692">"Netwerkstoring het misluk"</string>
@@ -846,6 +856,7 @@
     <string name="wifi_advanced_titlebar" msgid="4485841401774142908">"Gevorderde Wi-Fi"</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_title" msgid="3471132676909349382">"Netwerkinligting"</string>
     <string name="wifi_details_subnet_mask" msgid="6720279144174924410">"Subnetmasker"</string>
     <string name="wifi_details_dns" msgid="8648826607751830768">"DNS"</string>
     <string name="wifi_details_ipv6_address_header" msgid="6734119149106422148">"IPv6-adresse"</string>
@@ -878,16 +889,15 @@
     <string name="wifi_p2p_cancel_connect_title" msgid="255267538099324413">"Kanselleer uitnodiging?"</string>
     <string name="wifi_p2p_cancel_connect_message" msgid="7477756213423749402">"Wil jy die uitnodiging kanselleer om met <xliff:g id="PEER_NAME">%1$s</xliff:g> te koppel?"</string>
     <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_off_subtext" msgid="5466126533609394170">"Deel nie tans internet of inhoud met ander toestelle nie"</string>
     <string name="wifi_hotspot_tethering_on_subtext" product="tablet" msgid="5752490509369962007">"Deel tans hierdie tablet se internetverbinding via warmkol"</string>
     <string name="wifi_hotspot_tethering_on_subtext" product="default" msgid="6461075246164300670">"Deel tans hierdie foon se internetverbinding via warmkol"</string>
     <string name="wifi_hotspot_on_local_only_subtext" msgid="2068110388011294735">"Program deel tans inhoud. Skakel warmkol af en dan aan om internetverbinding te deel"</string>
-    <string name="wifi_hotspot_name_title" msgid="1341735529132128887">"Wi‑Fi-naam"</string>
+    <string name="wifi_hotspot_name_title" msgid="8237000746618636778">"Warmkol se naam"</string>
     <string name="wifi_hotspot_name_summary_connecting" msgid="3378299995508671967">"Skakel tans aan <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g> …"</string>
     <string name="wifi_hotspot_name_summary_connected" msgid="3888672084861445362">"Ander toestelle kan aan <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g> koppel"</string>
-    <string name="wifi_hotspot_password_title" msgid="1955592302902091281">"Wi-Fi-wagwoord"</string>
+    <string name="wifi_hotspot_password_title" msgid="8676859981917573801">"Warmkol se wagwoord"</string>
     <string name="wifi_hotspot_ap_band_title" msgid="1165801173359290681">"AP-band"</string>
     <string name="wifi_hotspot_footer_info_regular" msgid="1203489406068036455">"Gebruik warmkol om \'n Wi-Fi-netwerk vir jou ander toestelle te skep. Warmkol verskaf internet deur jou mobiele dataverbinding te gebruik. Bykomende dataheffings kan dalk geld."</string>
     <string name="wifi_hotspot_footer_info_local_only" msgid="857988412470694109">"Programme kan \'n warmkol skep om inhoud met nabygeleë toestelle te deel."</string>
@@ -898,7 +908,6 @@
     <string name="wifi_tether_configure_ap_text" msgid="7974681394041609308">"Stel Wi-Fi-warmkol op"</string>
     <string name="wifi_hotspot_configure_ap_text" msgid="5478614731464220432">"Wi‑Fi-warmkolopstelling"</string>
     <string name="wifi_hotspot_configure_ap_text_summary" msgid="5560680057727007011">"AndroidAP WPA2 PSK-warmkol"</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>-warmkol"</string>
     <string name="wifi_tether_configure_ssid_default" msgid="8467525402622138547">"AndroidHotspot"</string>
     <string name="wifi_calling_settings_title" msgid="4102921303993404577">"Wi-Fi-oproepe"</string>
     <string name="wifi_calling_suggestion_title" msgid="9008010480466359578">"Skakel Wi-Fi-oproepe aan"</string>
@@ -939,7 +948,7 @@
     <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="emergency_address_summary" msgid="3266760199681945746">"Adres wat nooddienste as jou ligging gebruik as jy \'n noodoproep met Wi‑Fi maak"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"Skerm"</string>
     <string name="sound_settings" msgid="5534671337768745343">"Klank"</string>
     <string name="all_volume_title" msgid="4296957391257836961">"Volumes"</string>
@@ -993,6 +1002,7 @@
     <string name="search_settings" msgid="1910951467596035063">"Soek"</string>
     <string name="search_settings_summary" msgid="9205656546570654169">"Bestuur soekinstellings en geskiedenis"</string>
     <string name="search_settings_no_results" msgid="8799027492641230999">"Geen resultate nie"</string>
+    <string name="search_clear_history" msgid="4196658962573162457">"Maak geskiedenis skoon"</string>
     <string name="display_settings" msgid="7965901687241669598">"Skerm"</string>
     <string name="accelerometer_title" msgid="7854608399547349157">"Outodraai skerm"</string>
     <string name="color_mode_title" msgid="3159275920408338215">"Helder kleure"</string>
@@ -1122,7 +1132,6 @@
     <string name="baseband_version" msgid="1848990160763524801">"Basisbandweergawe"</string>
     <string name="kernel_version" msgid="9192574954196167602">"Kernweergawe"</string>
     <string name="build_number" msgid="3075795840572241758">"Bounommer"</string>
-    <string name="selinux_status" msgid="6212165375172061672">"SELinux-status"</string>
     <string name="device_info_not_available" msgid="8062521887156825182">"Nie beskikbaar nie"</string>
     <string name="device_status_activity_title" msgid="1411201799384697904">"Status"</string>
     <string name="device_status" msgid="607405385799807324">"Status"</string>
@@ -1150,7 +1159,6 @@
     <string name="status_wifi_mac_address" msgid="2202206684020765378">"Wi-Fi-MAC-adres"</string>
     <string name="status_bt_address" msgid="4195174192087439720">"Bluetooth-adres"</string>
     <string name="status_serial_number" msgid="2257111183374628137">"Reeksnommer"</string>
-    <string name="status_unavailable" msgid="7862009036663793314">"Onbeskikbaar"</string>
     <string name="status_up_time" msgid="7294859476816760399">"Tyd aanlyn"</string>
     <string name="status_awake_time" msgid="2393949909051183652">"Wakkertyd"</string>
     <string name="internal_memory" msgid="9129595691484260784">"Interne berging"</string>
@@ -1326,6 +1334,7 @@
     <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>
     <string name="reset_dashboard_title" msgid="6254873816990678620">"Stel opsies terug"</string>
+    <string name="reset_dashboard_summary" msgid="4851012632493522755">"Netwerk, programme of toestel kan teruggestel word"</string>
     <string name="reset_network_title" msgid="6166025966016873843">"Stel Wi-Fi, mobiel en Bluetooth terug"</string>
     <string name="reset_network_desc" msgid="5547979398298881406">"Dit sal alle netwerkinstellings terugstel, insluitend:\n\n"<li>"Wi‑Fi"</li>\n<li>"Mobiele data"</li>\n<li>"Bluetooth"</li></string>
     <string name="reset_network_button_text" msgid="2035676527471089853">"Stel instellings terug"</string>
@@ -1334,17 +1343,14 @@
     <string name="reset_network_confirm_title" msgid="1759888886976962773">"Stel terug?"</string>
     <string name="network_reset_not_available" msgid="7188610385577164676">"Netwerkterugstelling is nie vir hierdie gebruiker beskikbaar nie"</string>
     <string name="reset_network_complete_toast" msgid="787829973559541880">"Netwerkinstellings is teruggestel"</string>
-    <string name="master_clear_title" msgid="6617679904229218425">"Vee alle data uit (Fabriekterugstelling)"</string>
-    <plurals name="master_clear_with_account_summary" formatted="false" msgid="5911377203778818712">
-      <item quantity="other"><xliff:g id="ACCOUNT_COUNT">%1$d</xliff:g> rekeninge sal teruggestel word</item>
-      <item quantity="one">1 rekening sal teruggestel word</item>
-    </plurals>
-    <string name="master_clear_summary" msgid="6902443944660426951">"Interne berging en alle data sal teruggestel word"</string>
+    <string name="master_clear_title" msgid="3531267871084279512">"Vee alle data uit (fabriekterugstelling)"</string>
     <string name="master_clear_desc" product="tablet" msgid="9146059417023157222">"Dit sal al die data uit jou tablet se "<b>"interne geheue"</b>" uitvee, insluitend: \n\n"<li>"jou Google-rekening"</li>\n" "<li>"stelsel- en programdata-instellings"</li>\n<li>"afgelaaide programme"</li></string>
     <string name="master_clear_desc" product="default" msgid="4800386183314202571">"Dit sal al die data uit jou tablet se "<b>"interne geheue"</b>" uitvee, insluitend: \n\n"<li>"jou Google-rekening"</li>\n" "<li>"stelsel- en programdata-instellings"</li>\n<li>"afgelaaide programme"</li></string>
     <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"Jy is tans aangemeld by die volgende rekeninge:\n"</string>
     <string name="master_clear_other_users_present" product="default" msgid="5161423070702470742">\n\n"Daar is ander gebruikers op hierdie toestel teenwoordig.\n"</string>
     <string name="master_clear_desc_also_erases_external" msgid="1903185203791274237"><li>"Musiek"</li>\n<li>"Foto\'s"</li>\n<li>"Ander gebruikerdata"</li></string>
+    <string name="master_clear_desc_also_erases_esim" msgid="312352697653096008"><li>"Diensverskaffers op e-SIM"</li></string>
+    <string name="master_clear_desc_no_cancel_mobile_plan" msgid="5460926449093211144">\n\n"Dit sal nie jou mobiele diensplan kanselleer nie."</string>
     <string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="7744115866662613411">\n\n"Om musiek, prente en ander gebruikersdata uit te vee, moet die "<b>"USB-berging"</b>" uitgevee word."</string>
     <string name="master_clear_desc_erase_external_storage" product="default" msgid="4801026652617377093">\n\n"Om musiek, prente en ander gebruikersdata uit te vee, moet die "<b>"SD-kaart"</b>" uitgevee word."</string>
     <string name="erase_external_storage" product="nosdcard" msgid="969364037450286809">"Vee USB-berging uit"</string>
@@ -1461,15 +1467,16 @@
     <string name="settings_safetylegal_activity_title" msgid="6901214628496951727">"Veiligheidsinligting"</string>
     <string name="settings_safetylegal_activity_unreachable" msgid="250674109915859456">"Jy het nie \'n dataverbinding nie. Om die inligting nou te sien, gaan na %s op enige rekenaar wat aan die internet gekoppel is."</string>
     <string name="settings_safetylegal_activity_loading" msgid="8059022597639516348">"Laai tans…"</string>
-    <string name="lockpassword_choose_your_password_header" msgid="8624900666929394990">"Kies jou wagwoord"</string>
-    <string name="lockpassword_choose_your_password_header_for_fingerprint" msgid="6624409510609085450">"Stel wagwoord vir vingerafdruk"</string>
-    <string name="lockpassword_choose_your_pattern_header" msgid="6949761069941694050">"Kies jou patroon"</string>
-    <string name="lockpassword_choose_your_pattern_header_for_fingerprint" msgid="5901096361617543819">"Stel patroon vir vingerafdruk"</string>
-    <string name="lockpassword_choose_your_pin_header" msgid="7598849519816138302">"Kies jou PIN"</string>
-    <string name="lockpassword_choose_your_pin_header_for_fingerprint" msgid="765344692615917183">"Stel PIN vir vingerafdruk"</string>
-    <string name="lockpassword_confirm_your_password_header" msgid="6308478184889846633">"Bevestig jou wagwoord"</string>
+    <string name="lockpassword_choose_your_screen_lock_header" msgid="3872462096767152394">"Stel \'n skermslot"</string>
+    <string name="lockpassword_choose_your_password_message" msgid="1197569283524841412">"Stel \'n wagwoord vir sekuriteit"</string>
+    <string name="lockpassword_choose_your_password_header_for_fingerprint" msgid="2541818487015343503">"Stel wagwoord om vingerafdruk te gebruik"</string>
+    <string name="lockpassword_choose_your_pattern_header_for_fingerprint" msgid="7709785406243556723">"Stel patroon om vingerafdruk te gebruik"</string>
+    <string name="lockpassword_choose_your_pin_message" msgid="1875420718677275646">"Stel \'n PIN vir sekuriteit"</string>
+    <string name="lockpassword_choose_your_pin_header_for_fingerprint" msgid="1549639053195796674">"Stel \'n PIN om vingerafdruk te gebruik"</string>
+    <string name="lockpassword_choose_your_pattern_message" msgid="5986983400689720015">"Stel \'n patroon vir sekuriteit"</string>
+    <string name="lockpassword_confirm_your_password_header" msgid="1266027268220850931">"Voer jou wagwoord weer in"</string>
     <string name="lockpassword_confirm_your_pattern_header" msgid="7543433733032330821">"Bevestig jou patroon"</string>
-    <string name="lockpassword_confirm_your_pin_header" msgid="49038294648213197">"Bevestig jou PIN"</string>
+    <string name="lockpassword_confirm_your_pin_header" msgid="7744513791910572550">"Voer jou PIN weer in"</string>
     <string name="lockpassword_confirm_passwords_dont_match" msgid="5140892109439191415">"Wagwoorde stem nie ooreen nie"</string>
     <string name="lockpassword_confirm_pins_dont_match" msgid="7226244811505606217">"PIN\'e stem nie ooreen nie"</string>
     <string name="lockpassword_choose_lock_generic_header" msgid="3811438094903786145">"Ontsluitmetode"</string>
@@ -1488,6 +1495,12 @@
     <string name="lockpassword_strong_auth_required_work_pattern" msgid="3003781907040522053">"Gebruik jou werkpatroon vir bykomende sekuriteit"</string>
     <string name="lockpassword_strong_auth_required_work_pin" msgid="3367491332598821552">"Voer jou werk-PIN in vir bykomende sekuriteit"</string>
     <string name="lockpassword_strong_auth_required_work_password" msgid="8159775129968582940">"Voer jou werkwagwoord in vir bykomende sekuriteit"</string>
+    <string name="lockpassword_confirm_your_pattern_details_frp" msgid="6757336656791723193">"Jou foon is na fabriekinstellings teruggestel. Voer jou vorige patroon in om die foon te gebruik."</string>
+    <string name="lockpassword_confirm_your_pin_details_frp" msgid="826520613445990470">"Jou foon is na fabriekinstellings toe teruggestel. Voer jou vorige PIN in om die foon te gebruik."</string>
+    <string name="lockpassword_confirm_your_password_details_frp" msgid="8944081074615739040">"Jou foon is na fabriekinstellings teruggestel. Voer jou vorige wagwoord in om die foon te gebruik."</string>
+    <string name="lockpassword_confirm_your_pattern_header_frp" msgid="2898036091609128286">"Verifieer patroon"</string>
+    <string name="lockpassword_confirm_your_pin_header_frp" msgid="4141601774778898803">"Verifieer PIN"</string>
+    <string name="lockpassword_confirm_your_password_header_frp" msgid="3762615419295360480">"Verifieer wagwoord"</string>
     <string name="lockpassword_invalid_pin" msgid="15588049067548470">"Verkeerde PIN"</string>
     <string name="lockpassword_invalid_password" msgid="4038507398784975200">"Verkeerde wagwoord"</string>
     <string name="lockpattern_need_to_unlock_wrong" msgid="1745247595356012176">"Verkeerde patroon"</string>
@@ -1537,7 +1550,6 @@
     <string name="install_applications_title" msgid="4987712352256508946">"Laat alle programbronne toe"</string>
     <string name="recent_app_category_title" msgid="6673071268966003928">"Programme wat onlangs oopgemaak is"</string>
     <string name="see_all_apps_title" msgid="1317153498074308438">"Sien al <xliff:g id="COUNT">%1$d</xliff:g> programme"</string>
-    <string name="recent_app_summary" msgid="3366446669844932300">"<xliff:g id="TIME">^1</xliff:g> gelede"</string>
     <string name="install_all_warning" product="tablet" msgid="8310489909586138165">"Jou tablet en persoonlike data is meer kwesbaar vir aanvalle deur onbekende programme. Deur programme van hierdie bron af te installeer, stem jy in dat jy verantwoordelik is vir enige skade aan jou tablet of verlies van data wat uit hul gebruik kan spruit."</string>
     <string name="install_all_warning" product="default" msgid="1952257127370115988">"Jou foon en persoonlike data is meer kwesbaar vir aanvalle deur onbekende programme. Deur programme van hierdie bron af te installeer, stem jy in dat jy verantwoordelik is vir enige skade aan jou foon of verlies van data wat uit hul gebruik kan spruit."</string>
     <string name="advanced_settings" msgid="1777249286757067969">"Gevorderde instellings"</string>
@@ -1801,7 +1813,7 @@
     <string name="accessibility_settings_summary" msgid="981260486011624939">"Skermlesers, skerm, interaksiekontroles"</string>
     <string name="vision_settings_title" msgid="4204111425716868288">"Visie-instellings"</string>
     <string name="vision_settings_description" msgid="5679491180156408260">"Jy kan hierdie toestel pasmaak om by jou behoeftes te pas. Hierdie toeganklikheidkenmerke kan later in Instellings verander word."</string>
-    <string name="vision_settings_suggestion_title" msgid="917294957154878441">"Vergroot lettergrootte"</string>
+    <string name="vision_settings_suggestion_title" msgid="8058794060304707004">"Verander lettergrootte"</string>
     <string name="screen_reader_category_title" msgid="7739154903913400641">"Skermlesers"</string>
     <string name="audio_and_captions_category_title" msgid="3420727114421447524">"Oudio en teks op skerm"</string>
     <string name="display_category_title" msgid="685461049938269166">"Vertoon"</string>
@@ -1838,7 +1850,6 @@
     <string name="accessibility_display_inversion_preference_subtitle" msgid="7052959202195368109">"Kan prestasie beïnvloed"</string>
     <string name="accessibility_autoclick_preference_title" msgid="7014499339068449623">"Klik ná wyser ophou beweeg"</string>
     <string name="accessibility_autoclick_delay_preference_title" msgid="3962261178385106006">"Vertraging voor klik"</string>
-    <string name="preference_summary_default_combination" msgid="8532964268242666060">"<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">"AAN"</string>
     <string name="accessibility_summary_state_disabled" msgid="2241315620132005595">"AF"</string>
     <string name="enable_quick_setting" msgid="2366999897816894536">"Wys in Vinnige instellings"</string>
@@ -1957,12 +1968,14 @@
     <string name="background_activity_summary_on" msgid="649282072540085599">"Program kan in die agtergrond loop wanneer dit nie gebruik word nie"</string>
     <string name="background_activity_summary_off" msgid="7666330699090632040">"Program se agtergrondaktiwiteit word beperk wanneer dit nie gebruik word nie"</string>
     <string name="background_activity_summary_disabled" msgid="3710669050484599847">"Program word nie toegelaat om in die agtergrond te loop nie"</string>
+    <string name="background_activity_summary_whitelisted" msgid="7375400051141016808">"Program kan nie vir batterygebruik geoptimeer word nie"</string>
+    <string name="background_activity_warning_dialog_title" msgid="2216249969149568871">"Beperk agtergrondaktiwiteit?"</string>
+    <string name="background_activity_warning_dialog_text" msgid="7049624449246121981">"As jy agtergrondaktiwiteit vir \'n program beperk, kan dit verkeerd werk"</string>
     <string name="device_screen_usage" msgid="3386088035570409683">"Skermgebruik sedert battery volgelaai is"</string>
     <string name="device_screen_consumption" msgid="4607589286438986687">"Skermverbruik"</string>
     <string name="device_cellular_network" msgid="4724773411762382950">"Skandering van mobiele netwerk"</string>
-    <string name="power_last_full_charge_summary" msgid="532845389094620657">"<xliff:g id="TIME">^1</xliff:g> gelede"</string>
-    <string name="power_usage_list_summary" msgid="6775339745194635000">"Programgebruik sedert battery volgelaai is (<xliff:g id="TIME">^1</xliff:g> gelede)"</string>
-    <string name="power_usage_list_summary_device" msgid="7036566616386864302">"Toestelgebruik sedert battery vol gelaai is (<xliff:g id="TIME">^1</xliff:g> gelede)"</string>
+    <string name="power_usage_list_summary" msgid="6393929085382334341">"Programgebruik sedert battery vol gelaai is (<xliff:g id="RELATIVE_TIME">^1</xliff:g>)"</string>
+    <string name="power_usage_list_summary_device" msgid="4461926045610455423">"Toestelgebruik sedert battery vol gelaai is (<xliff:g id="RELATIVE_TIME">^1</xliff:g>)"</string>
     <string name="screen_usage_summary" msgid="6687403051423153550">"Hoe lank skerm aan was sedert battery volgelaai is"</string>
     <string name="device_usage_list_summary" msgid="5623036661468763251">"Toestelgebruik sedert battery volgelaai is"</string>
     <string name="battery_since_unplugged" msgid="338073389740738437">"Batterygebruik sedert uitgeprop"</string>
@@ -2208,14 +2221,14 @@
     <string name="credentials_unlock_hint" msgid="2301301378040499348">"Voer die wagwoord in vir eiebewysberging."</string>
     <string name="credentials_old_password" msgid="7553393815538684028">"Huidige wagwoord:"</string>
     <string name="credentials_reset_hint" msgid="6297256880896133631">"Verwyder al die inhoud?"</string>
-    <string name="credentials_password_too_short" msgid="7502749986405522663">"Die wagwoord moet ten minste 8 karakters bevat."</string>
     <string name="credentials_wrong_password" msgid="2541932597104054807">"Verkeerde wagwoord."</string>
     <string name="credentials_reset_warning" msgid="5320653011511797600">"Verkeerde wagwoord. Jy het nog een kans voordat eiebewysberging uitgevee word."</string>
     <string name="credentials_reset_warning_plural" msgid="6514085665301095279">"Verkeerde wagwoord. Jy het nog <xliff:g id="NUMBER">%1$d</xliff:g> kanse voordat eiebewysberging uitgevee word."</string>
     <string name="credentials_erased" msgid="2907836028586342969">"Eiebewysberging is uitgevee."</string>
     <string name="credentials_not_erased" msgid="7685932772284216097">"Eiebewysberging kon nie uitgevee word nie."</string>
     <string name="credentials_enabled" msgid="7588607413349978930">"Eiebewysberging is geaktiveer."</string>
-    <string name="credentials_configure_lock_screen_hint" msgid="6757119179588664966">"Jy moet \'n sluitskerm-PIN of -wagwoord stel voordat jy eiebewysberging kan gebruik."</string>
+    <string name="credentials_configure_lock_screen_hint" msgid="8058230497337529036">"Jou toestel moet \'n veilige sluitskerm hê voordat jy eiebewysberging kan gebruik"</string>
+    <string name="credentials_configure_lock_screen_button" msgid="253239765216055321">"STEL SLOT OP"</string>
     <string name="usage_access_title" msgid="332333405495457839">"Programme met gebruiktoegang"</string>
     <string name="emergency_tone_title" msgid="1055954530111587114">"Noodtoon"</string>
     <string name="emergency_tone_summary" msgid="722259232924572153">"Stel gedrag wanneer \'n noodoproep gemaak word"</string>
@@ -2335,8 +2348,6 @@
     <skip />
     <string name="cant_sync_dialog_title" msgid="2777238588398046285">"Kan nie handmatig sinkroniseer nie"</string>
     <string name="cant_sync_dialog_message" msgid="1938380442159016449">"Sinkronisering vir hierdie item is tans gedeaktiveer. Om hierdie instelling te verander, skakel agtergronddata en outomatiese sinkronisering tydelik aan."</string>
-    <string name="wimax_settings" msgid="2655139497028469039">"4G"</string>
-    <string name="status_wimax_mac_address" msgid="8390791848661413416">"4G-Mac-adres"</string>
     <string name="enter_password" msgid="8035706727471334122">"Voer jou wagwoord in om Android te begin"</string>
     <string name="enter_pin" msgid="5305333588093263790">"Voer jou PIN in om Android te begin"</string>
     <string name="enter_pattern" msgid="4187435713036808566">"Teken jou patroon om Android te begin"</string>
@@ -2350,6 +2361,7 @@
     <string name="misc_files_selected_count" msgid="4647048020823912088">"het <xliff:g id="NUMBER">%1$d</xliff:g> gekies uit <xliff:g id="TOTAL">%2$d</xliff:g>"</string>
     <string name="misc_files_selected_count_bytes" msgid="2876232009069114352">"<xliff:g id="NUMBER">%1$s</xliff:g> van <xliff:g id="TOTAL">%2$s</xliff:g>"</string>
     <string name="select_all" msgid="1562774643280376715">"Kies almal"</string>
+    <string name="data_plan_usage_manage_plans_button_text" msgid="8997761990902708162">"Bestuur planne"</string>
     <string name="data_usage_summary_title" msgid="3804110657238092929">"Datagebruik"</string>
     <string name="data_usage_app_summary_title" msgid="4147258989837459172">"Programdatagebruik"</string>
     <string name="data_usage_accounting" msgid="7170028915873577387">"Diensverskaffer se datarekeninge kan van jou toestel verskil."</string>
@@ -2422,7 +2434,7 @@
     <string name="data_usage_restrict_background" msgid="434093644726734586">"As jy mobiele agtergronddata beperk, sal sommige programme en dienste nie werk nie tensy jy aan Wi-Fi gekoppel is."</string>
     <string name="data_usage_restrict_background_multiuser" product="tablet" msgid="7096707497743363380">"As jy mobiele agtergronddata beperk, sal sommige programme en dienste nie werk nie tensy jy aan Wi-Fi gekoppel is.\n\nHierdie instelling raak alle gebruikers van hierdie tablet."</string>
     <string name="data_usage_restrict_background_multiuser" product="default" msgid="7910798414964288424">"As jy mobiele agtergronddata beperk, sal sommige programme en dienste nie werk nie tensy jy aan Wi-Fi gekoppel is.\n\nHierdie instelling raak alle gebruikers van hierdie foon."</string>
-    <string name="data_usage_sweep_warning" msgid="6387081852568846982"><font size="18">"<xliff:g id="NUMBER">^1</xliff:g>"</font>" "<font size="9">"<xliff:g id="UNIT">^2</xliff:g>"</font>\n<font size="12">"waarsku"</font></string>
+    <string name="data_usage_sweep_warning" msgid="6387081852568846982"><font size="18">"<xliff:g id="NUMBER">^1</xliff:g>"</font>" "<font size="9">"<xliff:g id="UNIT">^2</xliff:g>"</font>\n<font size="12">"waarskuwing"</font></string>
     <string name="data_usage_sweep_limit" msgid="860566507375933039"><font size="18">"<xliff:g id="NUMBER">^1</xliff:g>"</font>" "<font size="9">"<xliff:g id="UNIT">^2</xliff:g>"</font>\n<font size="12">"limiet"</font></string>
     <string name="data_usage_uninstalled_apps" msgid="614263770923231598">"Verwyderde programme"</string>
     <string name="data_usage_uninstalled_apps_users" msgid="7986294489899813194">"Verwyderde programme en gebruikers"</string>
@@ -2431,10 +2443,13 @@
     <string name="data_usage_total_during_range_mobile" product="tablet" msgid="1925687342154538972">"<xliff:g id="RANGE">%2$s</xliff:g>: ongeveer <xliff:g id="TOTAL">%1$s</xliff:g> is gebruik, soos gemeet deur jou tablet. Jou diensverskaffer kan datagebruik dalk anders bereken."</string>
     <string name="data_usage_total_during_range_mobile" product="default" msgid="5063981061103812900">"<xliff:g id="RANGE">%2$s</xliff:g>: ongeveer <xliff:g id="TOTAL">%1$s</xliff:g> is gebruik, soos gemeet deur jou foon. Jou diensverskaffer kan datagebruik dalk anders bereken."</string>
     <string name="data_usage_metered_title" msgid="7383175371006596441">"Netwerkbeperkinge"</string>
-    <string name="data_usage_metered_body" msgid="7655851702771342507">"Beperkte netwerke word soos mobiele netwerke gehanteer as agtergronddata beperk word. Programme sal dalk waarsku voordat hulle hierdie netwerke vir groot aflaaie gebruik."</string>
+    <string name="data_usage_metered_body" msgid="7655851702771342507">"Beperkte netwerke word soos mobiele netwerke hanteer as agtergronddata beperk word. Programme sal dalk waarsku voordat hulle hierdie netwerke vir groot aflaaie gebruik."</string>
     <string name="data_usage_metered_mobile" msgid="5423305619126978393">"Selnetwerke"</string>
     <string name="data_usage_metered_wifi" msgid="1761738002328299714">"Beperkte Wi-Fi-netwerke"</string>
     <string name="data_usage_metered_wifi_disabled" msgid="727808462375941567">"Skakel Wi-Fi aan om beperkte netwerke te kies."</string>
+    <string name="data_usage_metered_auto" msgid="1262028400911918865">"Outomaties"</string>
+    <string name="data_usage_metered_yes" msgid="9217539611385225894">"Beperk"</string>
+    <string name="data_usage_metered_no" msgid="4025232961929071789">"Nie beperk nie"</string>
     <string name="data_usage_disclaimer" msgid="6887858149980673444">"Diensverskaffer se datarekeninge kan van jou toestel verskil."</string>
     <string name="cryptkeeper_emergency_call" msgid="198578731586097145">"Noodoproep"</string>
     <string name="cryptkeeper_return_to_call" msgid="5613717339452772491">"Keer terug na oproep"</string>
@@ -2526,9 +2541,6 @@
     <string name="backup_pw_set_button_text" msgid="2387480910044648795">"Stel rugsteunwagwoord op"</string>
     <string name="backup_pw_cancel_button_text" msgid="8845630125391744615">"Kanselleer"</string>
     <string name="additional_system_update_settings_list_item_title" msgid="214987609894661992">"Bykomende stelselopdaterings"</string>
-    <string name="selinux_status_disabled" msgid="924551035552323327">"Gedeaktiveer"</string>
-    <string name="selinux_status_permissive" msgid="6004965534713398778">"Toestemmend"</string>
-    <string name="selinux_status_enforcing" msgid="2252703756208463329">"Pas toe"</string>
     <string name="ssl_ca_cert_warning" msgid="2045866713601984673">"Netwerk kan dalk gemonitor word"</string>
     <string name="done_button" msgid="1991471253042622230">"Klaar"</string>
     <plurals name="ssl_ca_cert_dialog_title" formatted="false" msgid="7145092748045794650">
@@ -2804,7 +2816,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">"Verstekkennisgewing-klank"</string>
+    <string name="notification_ringtone_title" msgid="4468722874617061231">"Verstekkennisgewingklank"</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>
@@ -2820,7 +2832,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">"Alarmsein"</string>
+    <string name="emergency_tone_alert" msgid="8941852695428130667">"Klank"</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>
@@ -2829,7 +2841,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>
@@ -2871,13 +2883,15 @@
     <string name="notifications_title" msgid="8086372779371204971">"Kennisgewings"</string>
     <string name="app_notifications_title" msgid="5810577805218003760">"Programkennisgewings"</string>
     <string name="notification_channel_title" msgid="2260666541030178452">"Kennisgewingkategorie"</string>
+    <string name="notification_group_title" msgid="7180506440133859601">"Kennisgewingkategoriegroep"</string>
     <string name="notification_importance_title" msgid="848692592679312666">"Belangrikheid"</string>
-    <string name="notification_importance_unspecified" msgid="2196023702875112081">"Laat die program besluit"</string>
+    <string name="notification_importance_unspecified" msgid="6622173510486113958">"Laat klank toe"</string>
     <string name="notification_importance_blocked" msgid="7938180808339386300">"Moet nooit kennisgewings wys nie"</string>
     <string name="notification_importance_min" msgid="5455049524984686275">"Geen klank of visuele onderbreking nie"</string>
     <string name="notification_importance_low" msgid="8881468429453766553">"Geen klank nie"</string>
     <string name="notification_importance_default" msgid="5958338024601957516">"Maak geluid"</string>
     <string name="notification_importance_high" msgid="2082429479238228527">"Maak geluid en spring op op skerm"</string>
+    <string name="notification_importance_high_silent" msgid="2667033773703765252">"Pop op skerm"</string>
     <string name="notification_importance_min_title" msgid="6974673091137544803">"Laag"</string>
     <string name="notification_importance_low_title" msgid="8131254047772814309">"Middelmatig"</string>
     <string name="notification_importance_default_title" msgid="9120383978536089489">"Hoog"</string>
@@ -2920,8 +2934,13 @@
     <string name="loading_notification_apps" msgid="5031818677010335895">"Laai tans programme …"</string>
     <string name="app_notifications_off_desc" msgid="4882445501376722969">"Android blokkeer tans hierdie program se kennisgewings om op hierdie toestel te verskyn"</string>
     <string name="channel_notifications_off_desc" msgid="5899225298718840635">"Android blokkeer tans hierdie kategorie kennisgewings om op hierdie toestel te verskyn"</string>
+    <string name="channel_group_notifications_off_desc" msgid="1620950416247316370">"Android keer tans dat hierdie groep kennisgewings op hierdie toestel verskyn"</string>
     <string name="notification_channels" msgid="5346841743182627500">"Kategorieë"</string>
     <string name="notification_channels_other" msgid="5645317113885788226">"Ander"</string>
+    <plurals name="notification_group_summary" formatted="false" msgid="3420621520561455358">
+      <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> kategorieë</item>
+      <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> kategorie</item>
+    </plurals>
     <string name="no_channels" msgid="3077375508177744586">"Hierdie program het nie enige kennisgewings geplaas nie"</string>
     <string name="app_settings_link" msgid="8894946007543660906">"Bykomende instellings in die program"</string>
     <string name="app_notification_listing_summary_zero" msgid="6482582965081108108">"Aangeskakel vir alle programme"</string>
@@ -2942,7 +2961,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>
@@ -2998,6 +3017,7 @@
     <string name="zen_mode_from_starred" msgid="2678345811950997027">"Net van gesterde kontakte af"</string>
     <string name="zen_mode_from_none" msgid="8219706639954614136">"Geen"</string>
     <string name="zen_mode_alarms" msgid="2165302777886552926">"Wekkers"</string>
+    <string name="zen_mode_alarms_summary" msgid="3774926045611788635">"Wekkers is altyd \'n prioriteit en maak \'n geluid"</string>
     <string name="zen_mode_reminders" msgid="5458502056440485730">"Onthounotas"</string>
     <string name="zen_mode_events" msgid="7914446030988618264">"Geleenthede"</string>
     <string name="zen_mode_all_callers" msgid="584186167367236922">"Alle bellers"</string>
@@ -3032,6 +3052,7 @@
     <string name="zen_mode_screen_off_visual_interruptions" msgid="4850792880144382633">"Wanneer skerm af is"</string>
     <string name="zen_mode_no_visual_interruptions" msgid="8742776003822778472">"Wanneer skerm aan of af is"</string>
     <string name="notification_app_settings_button" msgid="6685640230371477485">"Kennisgewingsinstellings"</string>
+    <string name="suggestion_button_text" msgid="3275010948381252006">"OK"</string>
     <string name="device_feedback" msgid="3238056036766293294">"Stuur terugvoer oor hierdie toestel"</string>
     <string name="restr_pin_enter_admin_pin" msgid="1085834515677448072">"Voer admin-PIN in"</string>
     <string name="switch_on_text" msgid="1124106706920572386">"Aan"</string>
@@ -3166,7 +3187,7 @@
     <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">"Batteryoptimalisering"</string>
+    <string name="high_power_apps" msgid="3459065925679828230">"Batteryoptimering"</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>
@@ -3179,11 +3200,11 @@
       <item quantity="other">Programme wat battery laat afloop</item>
       <item quantity="one"><xliff:g id="APP">%1$s</xliff:g> wat battery laat afloop</item>
     </plurals>
-    <string name="high_power_filter_on" msgid="3222265297576680099">"Nie geoptimaliseer nie"</string>
+    <string name="high_power_filter_on" msgid="3222265297576680099">"Nie geoptimeer nie"</string>
     <string name="high_power_on" msgid="6216293998227583810">"Nie geoptimeer nie"</string>
     <string name="high_power_off" msgid="3393904131961263278">"Optimaliseer batterygebruik"</string>
-    <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_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_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>
@@ -3216,6 +3237,7 @@
     <string name="usb_summary_file_transfers" msgid="6435943692610175111">"Dra tans lêers oor"</string>
     <string name="usb_summary_photo_transfers" msgid="8440204169576585250">"Dra tans foto\'s oor (PTP)"</string>
     <string name="usb_summary_MIDI" msgid="5687906612187885908">"Gebruik toestel as MIDI"</string>
+    <string name="sms_mirroring_pref" msgid="6475043279147376031">"SMS-weerspieëling"</string>
     <string name="background_check_pref" msgid="7550258400138010979">"Agtergrondkontrolering"</string>
     <string name="background_check_title" msgid="4534254315824525593">"Volle agtergrondtoegang"</string>
     <string name="assist_access_context_title" msgid="2269032346698890257">"Gebruik teks van die skerm af"</string>
@@ -3282,7 +3304,8 @@
     <string name="write_settings_title" msgid="4232152481902542284">"Kan stelselinstellings verander"</string>
     <string name="write_system_settings" msgid="3482913590601096763">"Verander stelselinstellings"</string>
     <string name="write_settings_preference" msgid="3407383041273067448">"Programtoestemming om stelselinstellings te verander"</string>
-    <string name="permit_write_settings" msgid="6393779336656870080">"Mag stelselinstellings verander"</string>
+    <!-- no translation found for permit_write_settings (658555006453212691) -->
+    <skip />
     <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>
@@ -3309,7 +3332,7 @@
     <string name="screen_zoom_conversation_timestamp_3" msgid="3785674344762707688">"Dinsdag 18:02"</string>
     <string name="screen_zoom_conversation_timestamp_4" msgid="2511469395448561259">"Dinsdag 18:03"</string>
     <string name="disconnected" msgid="4836600637485526329">"Nie gekoppel nie"</string>
-    <string name="data_usage_summary_format" msgid="7507047900192160585">"<xliff:g id="AMOUNT">%1$s</xliff:g> van die data is gebruik"</string>
+    <string name="data_usage_summary_format" msgid="7507047900192160585">"<xliff:g id="AMOUNT">%1$s</xliff:g> se data is gebruik"</string>
     <plurals name="notification_summary" formatted="false" msgid="3941492005316143599">
       <item quantity="other">Af vir <xliff:g id="COUNT">%d</xliff:g> programme</item>
       <item quantity="one">Af vir 1 program</item>
@@ -3377,9 +3400,12 @@
     <string name="color_temperature" msgid="2070126836910615605">"Koel kleurtemperatuur"</string>
     <string name="color_temperature_desc" msgid="4793729830226404052">"Gebruik koeler skermkleure"</string>
     <string name="color_temperature_toast" msgid="4974218172133854827">"Skakel skerm af om kleur toe te pas"</string>
-    <string name="telephony_monitor_toast" msgid="7003764250271195384">"Herselflaai toestel om telefonie-monitorverandering toe te pas"</string>
+    <string name="connectivity_monitor_switch" msgid="9059759348648583421">"Konnektiwiteitmonitor"</string>
+    <string name="connectivity_monitor_switch_summary" msgid="2828658652378866401">"Konnektiwiteitmonitor sal loglêers insamel wanneer dit \'n konnektiwiteitprobleem bespeur en \'n aanporkennisgewing na die gebruiker stuur om \'n fout aan te meld"</string>
+    <string name="connectivity_monitor_toast" msgid="5551859612881173028">"Laat die toestel herselflaai om konnektiwiteitmonitorverandering toe te pas"</string>
     <string name="camera_hal_hdrplus_switch" msgid="8377365197105267466">"Kamera-HAL-HDR+"</string>
     <string name="camera_hal_hdrplus_toast" msgid="2063703797270055299">"Herselflaai toestel om Kamera-HAL-HDR+-verandering toe te pas"</string>
+    <string name="camera_laser_sensor_switch" msgid="8913588990743234440">"Kameralasersensor"</string>
     <string name="ota_disable_automatic_update" msgid="2319639631655915050">"Outomatiese stelselopdaterings"</string>
     <string name="usage" msgid="2977875522080448986">"Gebruik"</string>
     <string name="cellular_data_usage" msgid="2155683719898158203">"Mobieledatagebruik"</string>
@@ -3405,7 +3431,7 @@
     <string name="data_warning" msgid="209133958008062117">"Datawaarskuwing"</string>
     <string name="set_data_limit" msgid="2901526323210516923">"Stel datalimiet"</string>
     <string name="data_limit" msgid="1885406964934590552">"Datalimiet"</string>
-    <string name="data_usage_template" msgid="392191945602400904">"<xliff:g id="ID_1">%1$s</xliff:g> gebruik tussen <xliff:g id="ID_2">%2$s</xliff:g>"</string>
+    <string name="data_usage_template" msgid="2923744765873163859">"<xliff:g id="ID_1">%1$s</xliff:g> in <xliff:g id="ID_2">%2$s</xliff:g> gebruik"</string>
     <string name="configure" msgid="1029654422228677273">"Stel op"</string>
     <string name="data_usage_other_apps" msgid="3272872663517382050">"Ander programme wat by gebruik ingesluit is"</string>
     <plurals name="data_saver_unrestricted_summary" formatted="false" msgid="2635267833484232703">
@@ -3474,7 +3500,7 @@
     <string name="button_confirm_convert_fbe" msgid="7101855374850373091">"Maak skoon en skakel om"</string>
     <string name="reset_shortcut_manager_throttling" msgid="6495066467198668994">"Stel ShortcutManager se koersbeperking terug"</string>
     <string name="reset_shortcut_manager_throttling_complete" msgid="1826770872063707900">"ShortcutManager se koersbeperking is teruggestel"</string>
-    <string name="notification_suggestion_title" msgid="4506524937307816475">"Beheer sluitskermkennisgewings"</string>
+    <string name="notification_suggestion_title" msgid="387052719462473500">"Beheer inligting op sluitskerm"</string>
     <string name="notification_suggestion_summary" msgid="8521159741445416875">"Wys of versteek kennisgewinginhoud"</string>
     <string name="page_tab_title_summary" msgid="4070309266374993258">"Alles"</string>
     <string name="page_tab_title_support" msgid="8483187649355540109">"Steundiens en wenke"</string>
@@ -3482,7 +3508,7 @@
     <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>
     <string name="premium_sms_access" msgid="4660047004791638305">"Toegang tot betaalde SMS\'e"</string>
-    <string name="bluetooth_disabled" msgid="2456198532288640046">"Nie vir ander toestelle sigbaar nie"</string>
+    <string name="bluetooth_disabled" msgid="6244000672828617410">"Af"</string>
     <string name="bluetooth_connected_summary" msgid="7672528674593152862">"Gekoppel aan <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="bluetooth_connected_multiple_devices_summary" msgid="9173661896296663932">"Gekoppel aan veelvuldige toestelle"</string>
     <string name="demo_mode" msgid="2798762752209330277">"Stelsel-UI-demonstrasiemodus"</string>
@@ -3564,7 +3590,7 @@
     <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="4567020486787561873">"Tel jou foon op om tyd, kennisgewingikone en ander inligting na te gaan."</string>
+    <string name="ambient_display_pickup_summary" product="default" msgid="4567020486787561873">"Tel jou foon op om na tyd, kennisgewingikone en ander inligting te kyk."</string>
     <string name="ambient_display_pickup_summary" product="tablet" msgid="5435283849947236648">"Tel jou tablet op om tyd, kennisgewingikone en ander inligting na te gaan."</string>
     <string name="ambient_display_pickup_summary" product="device" msgid="8256669101643381568">"Tel jou toestel op om tyd, kennisgewingikone en ander inligting na te gaan."</string>
     <string name="ambient_display_pickup_suggestion_summary" msgid="7014700589991761035">"Gaan kennisgewings na wanneer skerm af is"</string>
@@ -3584,7 +3610,7 @@
     <string name="web_action_enable_title" msgid="4051513950976670853">"Kitsprogramme"</string>
     <string name="web_action_enable_summary" msgid="3108127559723396382">"Maak skakels in programme oop, selfs as hulle nie geïnstalleer is nie"</string>
     <string name="web_action_section_title" msgid="7364647086538399136">"Kitsprogramme"</string>
-    <string name="instant_apps_account" msgid="1433620209791992528">"Kitsprogramrekening"</string>
+    <string name="instant_apps_settings" msgid="8827777916518348213">"Kitsprogramvoorkeure"</string>
     <string name="domain_url_section_title" msgid="7046835219056428883">"Geïnstalleerde programme"</string>
     <string name="automatic_storage_manager_activation_warning" msgid="6353100011690933254">"Jou berging word nou deur die bergingbestuurder bestuur"</string>
     <string name="account_for_section_header" msgid="5356566418548737121">"Rekeninge vir <xliff:g id="USER_NAME">%1$s</xliff:g>"</string>
@@ -3631,7 +3657,9 @@
     <string name="enterprise_privacy_always_on_vpn_personal" msgid="9217774730260037434">"Altyd-aan-VPN is in jou persoonlike profiel aangeskakel"</string>
     <string name="enterprise_privacy_always_on_vpn_work" msgid="7244472958208315814">"Altyd-aan-VPN is in jou werkprofiel aangeskakel"</string>
     <string name="enterprise_privacy_global_http_proxy" msgid="7936664553416257333">"Globale HTTP-instaanbediener is gestel"</string>
-    <string name="enterprise_privacy_ca_certs" msgid="5885892204903688909">"Vertroude eiebewyse"</string>
+    <string name="enterprise_privacy_ca_certs_device" msgid="2019652712782510262">"Vertroude eiebewyse"</string>
+    <string name="enterprise_privacy_ca_certs_personal" msgid="2279084820904076599">"Vertroude eiebewyse in jou persoonlike profiel"</string>
+    <string name="enterprise_privacy_ca_certs_work" msgid="6187377647815301809">"Vertroude eiebewyse in jou werkprofiel"</string>
     <plurals name="enterprise_privacy_number_ca_certs" formatted="false" msgid="526375234629534165">
       <item quantity="other">Minstens <xliff:g id="COUNT_1">%d</xliff:g> CA-sertifikate</item>
       <item quantity="one">Minstens <xliff:g id="COUNT_0">%d</xliff:g> CA-sertifikaat</item>
@@ -3694,6 +3722,8 @@
     <string name="carrier_provisioning" msgid="4398683675591893169">"Diensverskaffervoorsiening-inligting"</string>
     <string name="trigger_carrier_provisioning" msgid="3434865918009286187">"Trigger-diensverskaffervoorsiening"</string>
     <string name="new_device_suggestion_title" msgid="698847081680980774">"Wat is nuut en opwindend?"</string>
-    <string name="new_device_suggestion_summary" msgid="7172709269203435870">"Kyk na die top-5-kenmerke"</string>
+    <string name="new_device_suggestion_summary" product="default" msgid="206396571522515855">"Kry \'n kykie van jou nuwe foon"</string>
+    <string name="new_device_suggestion_summary" product="tablet" msgid="393751455688210956">"Kry \'n kykie van jou nuwe tablet"</string>
+    <string name="new_device_suggestion_summary" product="device" msgid="2939870049868336652">"Kry \'n kykie van jou nuwe toestel"</string>
     <string name="disabled_low_ram_device" msgid="3751578499721173344">"Hierdie kenmerk is nie op hierdie toestel beskikbaar nie"</string>
 </resources>
diff --git a/res/values-am/arrays.xml b/res/values-am/arrays.xml
index b20d791..e69abc4 100644
--- a/res/values-am/arrays.xml
+++ b/res/values-am/arrays.xml
@@ -100,8 +100,6 @@
     <!-- no translation found for wifi_security_no_eap:0 (2084555984818107151) -->
     <!-- no translation found for wifi_security_no_eap:1 (397579322683471524) -->
     <!-- no translation found for wifi_security_no_eap:2 (1968820975358150484) -->
-    <!-- no translation found for wifi_ap_security:0 (5251664683198623324) -->
-    <!-- no translation found for wifi_ap_security:1 (7989073072260294673) -->
   <string-array name="wifi_eap_method">
     <item msgid="1160193392455075561">"PEAP"</item>
     <item msgid="7981731051382306293">"TLS"</item>
diff --git a/res/values-am/strings.xml b/res/values-am/strings.xml
index e7a50ca..4743a53 100644
--- a/res/values-am/strings.xml
+++ b/res/values-am/strings.xml
@@ -166,7 +166,7 @@
     <string name="bluetooth_map_acceptance_dialog_text" msgid="8712508202081143737">"%1$s የእርስዎን መልዕክቶች ሊደርስበት ይፈልጋል። መዳረሻ ለ%2$s ይሰጥ?"</string>
     <string name="bluetooth_sap_request" msgid="2669762224045354417">"የሲም መዳረሻ ጥያቄ"</string>
     <string name="bluetooth_sap_acceptance_dialog_text" msgid="4414253873553608690">"<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g> የእርስዎ ሲም ካርድ ላይ መድረስ ይፈልጋል። ወደ ሲም ካርዱ መዳረሻ መስጠት በእርስዎ መሣሪያ ላይ ግንኙነቱ ላይ በሚቆይበት ጊዜ  ያክል የውሂብ ተገኚነትን ያሰናክላል። ለ<xliff:g id="DEVICE_NAME_1">%2$s?</xliff:g> መዳረሻ ስጥ"</string>
-    <string name="bluetooth_device_name_summary" msgid="4757990010751789977">"ለሌሎች መሣሪያዎች እንደ <xliff:g id="DEVICE_NAME">^1</xliff:g> ሆኖ ይታያል"</string>
+    <string name="bluetooth_device_name_summary" msgid="522235742194965734">"ለሌሎች መሣሪያዎች እንደ «<xliff:g id="DEVICE_NAME">^1</xliff:g>» ሆኖ ይታያል"</string>
     <string name="bluetooth_paired_device_title" msgid="8638994696317952019">"የእርስዎ መሣሪያዎች"</string>
     <string name="bluetooth_pairing_page_title" msgid="7712127387361962608">"አዲስ መሣሪያ ያጣምሩ"</string>
     <string name="date_and_time" msgid="9062980487860757694">"ቀን እና ሰዓት"</string>
@@ -312,6 +312,8 @@
     <string name="zone_auto" msgid="334783869352026648">"ራስ ሰር ሰዓት ሰቅ"</string>
     <string name="zone_auto_summaryOn" msgid="6142830927278458314">"በአውታረ መረብ የቀረበ የሰዓት ሰቅ ተጠቀም"</string>
     <string name="zone_auto_summaryOff" msgid="2597745783162041390">"በአውታረ መረብ የቀረበ የሰዓት ሰቅ ተጠቀም"</string>
+    <string name="date_time_24hour_auto" msgid="2117383168985653422">"ራስ-ሰር የ24-ሰዓት ቅርጸት"</string>
+    <string name="date_time_24hour_auto_summary" msgid="6351812925651480277">"የቋንቋ ነባሪ ይጠቀሙ"</string>
     <string name="date_time_24hour_title" msgid="3203537578602803850">"የ24‑ሰዓት ቅርጸት"</string>
     <string name="date_time_24hour" msgid="1193032284921000063">"24 ሰዓት ቅርፀት ተጠቀም"</string>
     <string name="date_time_set_time_title" msgid="6296795651349047016">"ሰዓት"</string>
@@ -341,7 +343,7 @@
     <string name="Accounts_settings_title" msgid="1643879107901699406">"መለያዎች"</string>
     <string name="location_settings_title" msgid="1369675479310751735">"አካባቢ"</string>
     <string name="account_settings_title" msgid="626177544686329806">"መለያዎች"</string>
-    <string name="security_settings_title" msgid="4918904614964215087">"ደህንነት &amp; ሥፍራ"</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>
@@ -372,6 +374,9 @@
     <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="1961957425135180242">"ቀጣይ"</string>
+    <string name="setup_fingerprint_enroll_skip_title" msgid="362050541117362034">"ጣት አሻራ ይዘለል?"</string>
+    <string name="setup_fingerprint_enroll_skip_after_adding_lock_text" msgid="958990414356204763">"ጣት አሻራን ማዋቀር አንድ ወይም ሁለት ደቂቃ ብቻ ነው የሚወስደው። ይህን ከዘለሉት ጣት አሻራዎን በኋላ ላይ በቅንብሮች ውስጥ ማከል ይችላሉ።"</string>
+    <string name="lock_screen_intro_skip_title" msgid="4988210105913705679">"የማያ ገጽ መቆለፊያ ይዘለል?"</string>
     <string name="lock_screen_intro_skip_dialog_text_frp" product="tablet" msgid="1581834104051243425">"የመሣሪያ ጥበቃ ባህሪያት አይበሩም። ይህ ጡባዊ ቢጠፋ፣ ቢሰረቅ ወይም ዳግም እንዲቀናበር ቢደረግ ሌሎች እንዳይጠቀሙበት መከላከል አይችሉም።"</string>
     <string name="lock_screen_intro_skip_dialog_text_frp" product="device" msgid="4629503416877189572">"የመሣሪያ ጥበቃ ባህሪያት አይበሩም። ይህ መሣሪያ ቢጠፋ፣ ቢሰረቅ ወይም ዳግም እንዲቀናበር ቢደረግ ሌሎች እንዳይጠቀሙበት መከላከል አይችሉም።"</string>
     <string name="lock_screen_intro_skip_dialog_text_frp" product="default" msgid="2423428240245737909">"የመሣሪያ ጥበቃ ባህሪያት አይበሩም። ይህ ስልክ ቢጠፋ፣ ቢሰረቅ ወይም ዳግም እንዲቀናበር ቢደረግ ሌሎች እንዳይጠቀሙበት መከላከል አይችሉም።"</string>
@@ -457,7 +462,7 @@
     <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="lock_settings_picker_fingerprint_added_security_message" msgid="5768002109707648463">"ለተጨማሪ ደህንነት የምትኬ ማያ ገጽ ቁልፍን ያቀናብሩ።"</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>
@@ -588,6 +593,7 @@
     <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="lockpassword_clear_label" msgid="5724429464960458155">"አጽዳ"</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>
@@ -781,6 +787,7 @@
     <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,6 +824,8 @@
     <string name="wifi_wps_available_first_item" msgid="4422547079984583502">"WPS አለ"</string>
     <string name="wifi_wps_available_second_item" msgid="8427520131718215301">" WPS አለ"</string>
     <string name="wifi_wps_nfc_enter_password" msgid="2288214226916117159">"የአውታረ መረብ ይለፍ ቃልዎን ያስገቡ"</string>
+    <string name="wifi_carrier_connect" msgid="8174696557882299911">"የአገልግሎት አቅራቢ የWi‑Fi አውታረ መረብ"</string>
+    <string name="wifi_carrier_content" msgid="4634077285415851933">"በ<xliff:g id="NAME">%1%s</xliff:g> በኩል አገናኝ"</string>
     <string name="wifi_scan_always_turnon_message" msgid="203123538572122989">"<xliff:g id="APP_NAME">%1$s</xliff:g> የአካባቢ ትክክለኛነትን ለማሻሻል እና ለሌሎች ዓላማዎች የአውታረ መረብ መቃኘትን ማብራት ይፈልጋል፣ Wi-Fi ጠፍቶ ቢሆንም እንኳ።\n\nይሄ ለሁሉም መቃኘት ለሚፈልጉ መተግበሪያዎች ይፈቀድ?"</string>
     <string name="wifi_scan_always_turnoff_message" msgid="5538901671131941043">"ይህንን ለማጥፋት በትርፍ ፍሰት ምናሌው ውስጥ ወደ የላቁ ይሂዱ።"</string>
     <string name="wifi_scan_always_confirm_allow" msgid="5355973075896817232">"ፍቀድ"</string>
@@ -834,6 +843,7 @@
     <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_modify" msgid="6100248070440710782">"ቀይር"</string>
     <string name="wifi_failed_forget_message" msgid="1348172929201654986">"አውታረ መረብ መርሳት አልተሳካም"</string>
     <string name="wifi_save" msgid="3331121567988522826">"አስቀምጥ"</string>
     <string name="wifi_failed_save_message" msgid="6650004874143815692">"አውታረ መረብ ማስቀመጥ አልተሳካም"</string>
@@ -846,6 +856,7 @@
     <string name="wifi_advanced_titlebar" msgid="4485841401774142908">"የላቀ 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_title" msgid="3471132676909349382">"የአውታረ መረብ መረጃ"</string>
     <string name="wifi_details_subnet_mask" msgid="6720279144174924410">"የንዑስ አውታር ጭንብል"</string>
     <string name="wifi_details_dns" msgid="8648826607751830768">"ዲኤንኤስ"</string>
     <string name="wifi_details_ipv6_address_header" msgid="6734119149106422148">"የIPv6 አድራሻዎች"</string>
@@ -878,16 +889,15 @@
     <string name="wifi_p2p_cancel_connect_title" msgid="255267538099324413">"ግብዣ ይቅር?"</string>
     <string name="wifi_p2p_cancel_connect_message" msgid="7477756213423749402">"ከ<xliff:g id="PEER_NAME">%1$s</xliff:g> ጋር የመገናኘት ግብዣውን ይቅር ማለት ይፈልጋሉ?"</string>
     <string name="wifi_p2p_delete_group_message" msgid="834559380069647086">"ይህ ቡድን ይረሳ?"</string>
-    <string name="wifi_tether_checkbox_text" msgid="1847167643625779136">"ተንቀሳቃሽ የWi-Fi መገናኛ ነጥብ"</string>
     <string name="wifi_hotspot_checkbox_text" msgid="7763495093333664887">"የWi‑Fi መገናኛ ነጥብ"</string>
     <string name="wifi_hotspot_off_subtext" msgid="5466126533609394170">"በይነመረብን ወይም ይዘትን ከሌሎች መሣሪያዎች ጋር አይጋራም ያለው"</string>
     <string name="wifi_hotspot_tethering_on_subtext" product="tablet" msgid="5752490509369962007">"የዚህ ጡባዊ በይነመረብ ግንኙነት በመገናኛ ነጥብ በኩል በማጋራት ላይ"</string>
     <string name="wifi_hotspot_tethering_on_subtext" product="default" msgid="6461075246164300670">"የዚህ ስልክ በይነመረብ ግንኙነት በመገናኛ ነጥብ በኩል በማጋራት ላይ"</string>
     <string name="wifi_hotspot_on_local_only_subtext" msgid="2068110388011294735">"መተግበሪያ ይዘትን እየተጋራ ነው። በይነመረብ ግንኙነትን ለመጋራት፣ መገናኛ ነጥብን ያጥፉ እና በመቀጠል ያብሩት"</string>
-    <string name="wifi_hotspot_name_title" msgid="1341735529132128887">"የWi‑Fi ስም"</string>
+    <string name="wifi_hotspot_name_title" msgid="8237000746618636778">"የመገናኛ ነጥብ ስም"</string>
     <string name="wifi_hotspot_name_summary_connecting" msgid="3378299995508671967">"<xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>ን በማብራት ላይ..."</string>
     <string name="wifi_hotspot_name_summary_connected" msgid="3888672084861445362">"ሌሎች መሣሪያዎች ወደ <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g> ሊገናኙ ይችላሉ"</string>
-    <string name="wifi_hotspot_password_title" msgid="1955592302902091281">"የWi-Fi ይለፍ ቃል"</string>
+    <string name="wifi_hotspot_password_title" msgid="8676859981917573801">"የመገናኛ ነጥብ የይለፍ ቃል"</string>
     <string name="wifi_hotspot_ap_band_title" msgid="1165801173359290681">"የኤፒ ባንድ"</string>
     <string name="wifi_hotspot_footer_info_regular" msgid="1203489406068036455">"ለእርስዎ ሌሎች መሣሪያዎች የWi‑Fi አውታረ መረብ ለመፍጠር መገናኛ ነጥብ ይጠቀሙ። መገናኛ ነጥብ የእርስዎን የሞባይል ውሂብ ግንኙነት በመጠቀም በይነመረብን ያቀርባል። ተጨማሪ የሞባይል ውሂብ ክፍያዎች ተፈጻሚ ሊሆኑ ይችሉ ይሆናል።"</string>
     <string name="wifi_hotspot_footer_info_local_only" msgid="857988412470694109">"መተግበሪያዎች በአቅራቢያ ካሉ መሣሪያዎች ጋር ይዘትን ለመጋራት መገናኛ ነጥብ ሊፈጥሩ ይችላሉ።"</string>
@@ -898,7 +908,6 @@
     <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">"Android ድረስ ነጥብ"</string>
     <string name="wifi_calling_settings_title" msgid="4102921303993404577">"የWi-Fi ጥሪ ማድረጊያ"</string>
     <string name="wifi_calling_suggestion_title" msgid="9008010480466359578">"Wi-Fi Callingን ያብሩ"</string>
@@ -939,7 +948,7 @@
     <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="emergency_address_summary" msgid="3266760199681945746">"Wi‑Fi በመጠቀም የአደጋ ጥሪ በማድረግ ላይ ያሉ ከሆኑ አድራሻ በድንገተኛ አደጋ አገልግሎቶች እንደ የእርስዎ መገኛ አካባቢ ይሆናል"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"አሳይ"</string>
     <string name="sound_settings" msgid="5534671337768745343">"ድምፅ"</string>
     <string name="all_volume_title" msgid="4296957391257836961">"ድምፆች"</string>
@@ -993,6 +1002,7 @@
     <string name="search_settings" msgid="1910951467596035063">"ፍለጋ"</string>
     <string name="search_settings_summary" msgid="9205656546570654169">"የፍለጋ ታሪክ እና ቅንብሮችን ያደራጁ"</string>
     <string name="search_settings_no_results" msgid="8799027492641230999">"ምንም ውጤቶች የሉም"</string>
+    <string name="search_clear_history" msgid="4196658962573162457">"ታሪክን አጽዳ"</string>
     <string name="display_settings" msgid="7965901687241669598">"አሳይ"</string>
     <string name="accelerometer_title" msgid="7854608399547349157">"ማያ በራስ ሰር አሽከርክር"</string>
     <string name="color_mode_title" msgid="3159275920408338215">"ፈካ ያሉ ቀለማት"</string>
@@ -1122,7 +1132,6 @@
     <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>
     <string name="device_status_activity_title" msgid="1411201799384697904">"ኹናቴ"</string>
     <string name="device_status" msgid="607405385799807324">"ሁኔታ"</string>
@@ -1150,7 +1159,6 @@
     <string name="status_wifi_mac_address" msgid="2202206684020765378">"የWi-Fi ማክ አድራሻ"</string>
     <string name="status_bt_address" msgid="4195174192087439720">"የብሉቱዝ አድራሻ"</string>
     <string name="status_serial_number" msgid="2257111183374628137">"መለያ ቁጥር"</string>
-    <string name="status_unavailable" msgid="7862009036663793314">"አይገኝም"</string>
     <string name="status_up_time" msgid="7294859476816760399">"የቆየበት ሰዓት"</string>
     <string name="status_awake_time" msgid="2393949909051183652">"ነቅቶ የቆየበት ሰዓት"</string>
     <string name="internal_memory" msgid="9129595691484260784">"የውስጥ ማከማቻ"</string>
@@ -1326,6 +1334,7 @@
     <string name="menu_restore" msgid="8260067415075573273">"ወደ ነባሪ ዳግም አስጀምር"</string>
     <string name="restore_default_apn_completed" msgid="2824775307377604897">"የዳግም አስጀምር ነባሪ APN ቅንብሮች ተጠናቀዋል"</string>
     <string name="reset_dashboard_title" msgid="6254873816990678620">"የዳግም ማስጀመሪያ አማራጮች"</string>
+    <string name="reset_dashboard_summary" msgid="4851012632493522755">"አውታረ መረብ፣ መተግበሪያዎች ወይም መሣሪያ ዳግም ሊዋቀሩ ይችላሉ"</string>
     <string name="reset_network_title" msgid="6166025966016873843">"Wi-Fi፣ ተንቀሳቃሽ ስልክ እና ብሉቱዝን ዳግም አስጀምር"</string>
     <string name="reset_network_desc" msgid="5547979398298881406">"የሚከተሉትን ጨምሮ ይህ ሁሉንም የአውታረ መረብ ቅንብሮችን ዳግም ያቀናብራል፦\n\n"<li>"Wi‑Fi"</li>\n<li>"የተንቀሳቃሽ ስልክ ውሂብ"</li>\n<li>"ብሉቱዝ"</li></string>
     <string name="reset_network_button_text" msgid="2035676527471089853">"ቅንብሮችን ዳግም ያቀናብሩ"</string>
@@ -1334,17 +1343,14 @@
     <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="6617679904229218425">"ሁሉንም ውሂብ ደምስስ (የፋብሪካ ዳግም ማስጀመር)"</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>
-    </plurals>
-    <string name="master_clear_summary" msgid="6902443944660426951">"ውስጣዊ ማከማቻ እና ሁሉም ውሂብ ዳግም ይጀመራሉ"</string>
+    <string name="master_clear_title" msgid="3531267871084279512">"ሁሉንም ውሂብ ደምስስ (የፋብሪካ ዳግም ማስጀመር)"</string>
     <string name="master_clear_desc" product="tablet" msgid="9146059417023157222">"ይህ ከእርስዎ ጡባዊ "<b>"ውስጣዊ ማከማቻ"</b>" የሚከተሉትን ጨምሮ:\n\n"<li>"የእርስዎ  Google መለያ"</li>\n<li>"ሥርዓት እና መተግበሪያ ውሂብ እና ቅንብሮች"</li>\n<li>"የወረዱ መተግበሪያዎች"</li>" ላይ ያሉ ሁሉንም ውሂብ ይሰርዛል።"</string>
     <string name="master_clear_desc" product="default" msgid="4800386183314202571">"ይህ ከእርስዎ ጡባዊ "<b>"ውስጣዊ ማከማቻ"</b>" የሚከተሉትን ጨምሮ:\n\n"<li>"የእርስዎ  Google መለያ"</li>\n<li>"ሥርዓት እና መተግበሪያ ውሂብ እና ቅንብሮች"</li>\n<li>"የወረዱ መተግበሪያዎች"</li>" ላይ ያሉ ሁሉንም ውሂብ ይሰርዛል።"</string>
     <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n" እርስዎ በአሁን ጊዜ የሚከተለው መለያዎች ውስጥ ገብተዋል፡\n"</string>
     <string name="master_clear_other_users_present" product="default" msgid="5161423070702470742">\n\n"በዚህ መሣሪያ ላይ ያሉ ሌሎች ተጠቃሚዎች አሉ።\n"</string>
     <string name="master_clear_desc_also_erases_external" msgid="1903185203791274237"><li>"ሙዚቃ"</li>\n<li>"ፎቶዎች"</li>\n<li>"ሌላ የተጠቃሚ ውሂብ"</li></string>
+    <string name="master_clear_desc_also_erases_esim" msgid="312352697653096008"><li>"በeSIM ላይ ያሉ የአገልግሎት አቅራቢዎች"</li></string>
+    <string name="master_clear_desc_no_cancel_mobile_plan" msgid="5460926449093211144">\n\n"ይሄ የተንቀሳቃሽ ስልክ አገልግሎት እቅድዎን አይሰርዘውም።"</string>
     <string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="7744115866662613411">"ሙዚቃ፣ ምስሎች፣ እና ሌላ ተጠቃሚ ውሂብ \n\nለማጥራት፣"<b>"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>
@@ -1461,15 +1467,16 @@
     <string name="settings_safetylegal_activity_title" msgid="6901214628496951727">"የደህንነት መረጃ"</string>
     <string name="settings_safetylegal_activity_unreachable" msgid="250674109915859456">"የውሂብ ግንኙነት የለህም። ይህን መረጃ አሁን ለማየት፣ ከማንኛውም ኮምፒዩተር ጋር ወደ %s የተገናኘ በይነ መረብ ሂድ።"</string>
     <string name="settings_safetylegal_activity_loading" msgid="8059022597639516348">"በማስገባት ላይ..."</string>
-    <string name="lockpassword_choose_your_password_header" msgid="8624900666929394990">"የይለፍ ቃለዎን ይምረጡ"</string>
-    <string name="lockpassword_choose_your_password_header_for_fingerprint" msgid="6624409510609085450">"የጣት አሻራን ለመጠቀም የይለፍ ቃል ያቀናብሩ"</string>
-    <string name="lockpassword_choose_your_pattern_header" msgid="6949761069941694050">"የእርስዎን ስርዓተ ጥለት ይምረጡ"</string>
-    <string name="lockpassword_choose_your_pattern_header_for_fingerprint" msgid="5901096361617543819">"የጣት አሻራን ለመጠቀም፣ ሥርዓተ ጥለትን ያቀናብሩ"</string>
-    <string name="lockpassword_choose_your_pin_header" msgid="7598849519816138302">"የእርስዎን ፒን ይምረጡ"</string>
-    <string name="lockpassword_choose_your_pin_header_for_fingerprint" msgid="765344692615917183">"የጣት አሻራን ለመጠቀም ፒን ያቀናብሩ"</string>
-    <string name="lockpassword_confirm_your_password_header" msgid="6308478184889846633">"የይለፍ ቃልዎን ያረጋግጡ"</string>
+    <string name="lockpassword_choose_your_screen_lock_header" msgid="3872462096767152394">"የማያ ገጽ ቁልፍ ያቀናብሩ"</string>
+    <string name="lockpassword_choose_your_password_message" msgid="1197569283524841412">"ለደህንነት የይለፍ ቃል ያቀናብሩ"</string>
+    <string name="lockpassword_choose_your_password_header_for_fingerprint" msgid="2541818487015343503">"ጣት አሻራን ለመጠቀም አንድ የይለፍ ቃል ያቀናብሩ"</string>
+    <string name="lockpassword_choose_your_pattern_header_for_fingerprint" msgid="7709785406243556723">"ጣት አሻራን ለመጠቀም አንድ ሥርዓተ ነጥብን ያቀናብሩ"</string>
+    <string name="lockpassword_choose_your_pin_message" msgid="1875420718677275646">"ለደህንነት አንድ ፒን ያቀናብሩ"</string>
+    <string name="lockpassword_choose_your_pin_header_for_fingerprint" msgid="1549639053195796674">"ጣት አሻራን ለመጠቀም አንድ ፒን ያቀናብሩ"</string>
+    <string name="lockpassword_choose_your_pattern_message" msgid="5986983400689720015">"ለደህንነት ሲባል፣ ሥርዓተ ጥለትን ያቀናብሩ"</string>
+    <string name="lockpassword_confirm_your_password_header" msgid="1266027268220850931">"የእርስዎን ይለፍ ቃል ደግመው ያስገቡ"</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="7744513791910572550">"የእርስዎን ፒን ደግመው ያስገቡ"</string>
     <string name="lockpassword_confirm_passwords_dont_match" msgid="5140892109439191415">"የይለፍ ቃላት አይዛመዱም"</string>
     <string name="lockpassword_confirm_pins_dont_match" msgid="7226244811505606217">"ያስገቡት ፒን አይዛመዱም"</string>
     <string name="lockpassword_choose_lock_generic_header" msgid="3811438094903786145">"ምርጫዎችን ክፈት"</string>
@@ -1488,6 +1495,12 @@
     <string name="lockpassword_strong_auth_required_work_pattern" msgid="3003781907040522053">"ለተጨማሪ ደህንነት፣ የእርስዎን ሥራ ሥርዓተ ጥለት ይጠቀሙ"</string>
     <string name="lockpassword_strong_auth_required_work_pin" msgid="3367491332598821552">"ለተጨማሪ ደህንነት፣ የእርስዎን ሥራ ፒን ያስገቡ"</string>
     <string name="lockpassword_strong_auth_required_work_password" msgid="8159775129968582940">"ለተጨማሪ ደህንነት፣ የእርስዎን ሥራ ይለፍ ቃል ያስገቡ"</string>
+    <string name="lockpassword_confirm_your_pattern_details_frp" msgid="6757336656791723193">"የእርስዎ ስክ ወደ የፋብሪካ ቅንብሮች ዳግም ተጀምሯል። ይህን ስልክ ለመጠቀም ቀዳሚውን ስርዓተ-ጥለትዎን ያስገቡ።"</string>
+    <string name="lockpassword_confirm_your_pin_details_frp" msgid="826520613445990470">"የእርስዎ ስክ ወደ የፋብሪካ ቅንብሮች ዳግም ተጀምሯል። ይህን ስልክ ለመጠቀም ቀዳሚውን ፒንዎ ያስገቡ።"</string>
+    <string name="lockpassword_confirm_your_password_details_frp" msgid="8944081074615739040">"የእርስዎ ስክ ወደ የፋብሪካ ቅንብሮች ዳግም ተጀምሯል። ይህን ስልክ ለመጠቀም ቀዳሚውን ይለፍ ቃልዎ ያስገቡ።"</string>
+    <string name="lockpassword_confirm_your_pattern_header_frp" msgid="2898036091609128286">"ስርዓተ-ጥለትን ያረጋግጡ"</string>
+    <string name="lockpassword_confirm_your_pin_header_frp" msgid="4141601774778898803">"ፒን ያረጋግጡ"</string>
+    <string name="lockpassword_confirm_your_password_header_frp" msgid="3762615419295360480">"የይለፍ ቃል ያረጋግጡ"</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>
@@ -1537,7 +1550,6 @@
     <string name="install_applications_title" msgid="4987712352256508946">"የሁሉም መተግበሪያ ምንጮችን ፍቀድ"</string>
     <string name="recent_app_category_title" msgid="6673071268966003928">"በቅርቡ የተከፈቱ መተግበሪያዎች"</string>
     <string name="see_all_apps_title" msgid="1317153498074308438">"ሁሉንም <xliff:g id="COUNT">%1$d</xliff:g> መተግበሪያዎች ይመልከቱ"</string>
-    <string name="recent_app_summary" msgid="3366446669844932300">"ከ<xliff:g id="TIME">^1</xliff:g> በፊት"</string>
     <string name="install_all_warning" product="tablet" msgid="8310489909586138165">"የእርስዎ ጡባዊ እና የግል ውሂብ ባልታወቁ መተግበሪያዎች ለሚፈጸም ጥቃት ይበልጥ ተጋላጭ ናቸው። ከዚህ ምንጭ የመጡ መተግበሪያዎችን በመጫን እነሱን በመጠቀምዎ በጡባዊዎ ላይ ለሚከሰት ማንኛውም ጉዳት ወይም ለውሂብ መጥፋት ኃላፊነቱን የሚወስዱት እርስዎ መሆኑን ተስማምተዋል።"</string>
     <string name="install_all_warning" product="default" msgid="1952257127370115988">"የእርስዎ ስልክ እና የግል ውሂብ ባልታወቁ መተግበሪያዎች ለሚፈጸም ጥቃት ይበልጥ ተጋላጭ ናቸው። ከዚህ ምንጭ የመጡ መተግበሪያዎችን በመጫን እነሱን በመጠቀምዎ በስልክዎ ላይ ለሚከሰት ማንኛውም ጉዳት ወይም ለውሂብ መጥፋት ኃላፊነቱን የሚወስዱት እርስዎ መሆኑን ተስማምተዋል።"</string>
     <string name="advanced_settings" msgid="1777249286757067969">"የላቁ ቅንብሮች"</string>
@@ -1801,7 +1813,7 @@
     <string name="accessibility_settings_summary" msgid="981260486011624939">"የማያ ገጽ አንባቢዎች፣ ማሳያ፣ የመስተጋብር መቆጣጠሪያዎች"</string>
     <string name="vision_settings_title" msgid="4204111425716868288">"የእይታ ቅንብሮች"</string>
     <string name="vision_settings_description" msgid="5679491180156408260">"ይህን መሣሪያ ከእርስዎ ፍላጎቶች ጋር እንዲጣጣም ማበጀት ይችላሉ። እነዚህ የተደራሽነት ባህሪያት በኋላ ላይ በቅንብሮች ውስጥ ሊቀየሩ ይችላሉ።"</string>
-    <string name="vision_settings_suggestion_title" msgid="917294957154878441">"የቁምፊ መጠን ጨምር"</string>
+    <string name="vision_settings_suggestion_title" msgid="8058794060304707004">"የቅርጸ-ቁምፊ መጠን ይቀይሩ"</string>
     <string name="screen_reader_category_title" msgid="7739154903913400641">"የማያ ገጽ አንባቢዎች"</string>
     <string name="audio_and_captions_category_title" msgid="3420727114421447524">"ኦዲዮ እና የማያ ገጽ ላይ ጽሑፍ"</string>
     <string name="display_category_title" msgid="685461049938269166">"አሳይ"</string>
@@ -1838,7 +1850,6 @@
     <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="preference_summary_default_combination" msgid="8532964268242666060">"<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>
@@ -1957,12 +1968,14 @@
     <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_whitelisted" msgid="7375400051141016808">"መተግበሪያው ለባትሪ አጠቃቀም ሊተባ አይችልም"</string>
+    <string name="background_activity_warning_dialog_title" msgid="2216249969149568871">"የጀርባ እንቅስቃሴ ይገደብ?"</string>
+    <string name="background_activity_warning_dialog_text" msgid="7049624449246121981">"የአንድ መተግበሪያ የጀርባ እንቅስቃሴን ከገደቡ ያልተገባ ባህሪ ሊያሳይ ይችላል"</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" msgid="6393929085382334341">"ሙሉ ኃይል ከተሞላ ወዲህ ያለው የመተግበሪያ ጠቃቀም (<xliff:g id="RELATIVE_TIME">^1</xliff:g>)"</string>
+    <string name="power_usage_list_summary_device" msgid="4461926045610455423">"ሙሉ ኃይል ከተሞላ ወዲህ ያለው የመሣሪያ አጠቃቀም (<xliff:g id="RELATIVE_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>
@@ -2208,14 +2221,14 @@
     <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_configure_lock_screen_hint" msgid="8058230497337529036">"የምስክርነት ማከማቻን መጠቀም ከመቻልዎ በፊት የእርስዎ መሣሪያ ደህንነቱ የተጠበቀ የመቆለፊያ ማያ ገጽ ሊኖረው ይገባል"</string>
+    <string name="credentials_configure_lock_screen_button" msgid="253239765216055321">"ቁልፍ አዘጋጅ"</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>
@@ -2335,8 +2348,6 @@
     <skip />
     <string name="cant_sync_dialog_title" msgid="2777238588398046285">"በእጅ ማመሳሰል አልተቻለም"</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>
@@ -2350,6 +2361,7 @@
     <string name="misc_files_selected_count" msgid="4647048020823912088">"ከ<xliff:g id="NUMBER">%1$d</xliff:g><xliff:g id="TOTAL">%2$d</xliff:g> ምረጥ"</string>
     <string name="misc_files_selected_count_bytes" msgid="2876232009069114352">"ከ<xliff:g id="NUMBER">%1$s</xliff:g><xliff:g id="TOTAL">%2$s</xliff:g>"</string>
     <string name="select_all" msgid="1562774643280376715">"ሁሉንም ምረጥ"</string>
+    <string name="data_plan_usage_manage_plans_button_text" msgid="8997761990902708162">"ዕቅዶችን አቀናብር"</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>
@@ -2435,6 +2447,9 @@
     <string name="data_usage_metered_mobile" msgid="5423305619126978393">"የተንቀሳቃሽ ስልክ አውታረ መረብ"</string>
     <string name="data_usage_metered_wifi" msgid="1761738002328299714">"የሚለኩ የWi‑Fi አውታረ መረቦች"</string>
     <string name="data_usage_metered_wifi_disabled" msgid="727808462375941567">"የሚለኩ አውታረ መረቦችን ለመምረጥ Wi‑Fi ያብሩ።"</string>
+    <string name="data_usage_metered_auto" msgid="1262028400911918865">"ራስ-ሰር"</string>
+    <string name="data_usage_metered_yes" msgid="9217539611385225894">"የሚለካ"</string>
+    <string name="data_usage_metered_no" msgid="4025232961929071789">"የማይለካ"</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>
@@ -2526,9 +2541,6 @@
     <string name="backup_pw_set_button_text" msgid="2387480910044648795">"የመጠባበቂያ ይለፍቃል አዘጋጅ"</string>
     <string name="backup_pw_cancel_button_text" msgid="8845630125391744615">"ይቅር"</string>
     <string name="additional_system_update_settings_list_item_title" msgid="214987609894661992">"ተጨማሪ የስርዓት አዘምኖች"</string>
-    <string name="selinux_status_disabled" msgid="924551035552323327">"ተሰናክሏል"</string>
-    <string name="selinux_status_permissive" msgid="6004965534713398778">"ፈቃጅ"</string>
-    <string name="selinux_status_enforcing" msgid="2252703756208463329">"በማስፈጸም ላይ"</string>
     <string name="ssl_ca_cert_warning" msgid="2045866713601984673">"አውታረ መረብ በክትትል ውስጥ ሊሆን ይችላል"</string>
     <string name="done_button" msgid="1991471253042622230">"ተከናውኗል"</string>
     <plurals name="ssl_ca_cert_dialog_title" formatted="false" msgid="7145092748045794650">
@@ -2871,13 +2883,15 @@
     <string name="notifications_title" msgid="8086372779371204971">"ማሳወቂያዎች"</string>
     <string name="app_notifications_title" msgid="5810577805218003760">"የመተግበሪያ ማሳወቂያዎች"</string>
     <string name="notification_channel_title" msgid="2260666541030178452">"የማሳወቂያ ምድብ"</string>
+    <string name="notification_group_title" msgid="7180506440133859601">"የማሳወቂያ ምድብ ቡድን"</string>
     <string name="notification_importance_title" msgid="848692592679312666">"አስፈላጊነት"</string>
-    <string name="notification_importance_unspecified" msgid="2196023702875112081">"መተግበሪያው ይወስን"</string>
+    <string name="notification_importance_unspecified" msgid="6622173510486113958">"ድምፅ ይፍቀዱ"</string>
     <string name="notification_importance_blocked" msgid="7938180808339386300">"ማሳወቂያዎችን በጭራሽ አታሳይ"</string>
     <string name="notification_importance_min" msgid="5455049524984686275">"ምንም ድምፅ ወይም የሚታይ ትርጉም የለም"</string>
     <string name="notification_importance_low" msgid="8881468429453766553">"ምንም ድምፅ የለም"</string>
     <string name="notification_importance_default" msgid="5958338024601957516">"ድምፅ ፍጠር"</string>
     <string name="notification_importance_high" msgid="2082429479238228527">"ድምፅ ፍጠር እና በማያ ገጽ ላይ ብቅ በል"</string>
+    <string name="notification_importance_high_silent" msgid="2667033773703765252">"ብቅ-ባይ ማያ ገጽ"</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>
@@ -2920,8 +2934,13 @@
     <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="channel_group_notifications_off_desc" msgid="1620950416247316370">"Android ይህን የማሳወቂያዎች ቡድን በዚህ መሣሪያ ላይ እንዳይታይ እያገደ ነው"</string>
     <string name="notification_channels" msgid="5346841743182627500">"ምድቦች"</string>
     <string name="notification_channels_other" msgid="5645317113885788226">"ሌላ"</string>
+    <plurals name="notification_group_summary" formatted="false" msgid="3420621520561455358">
+      <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="no_channels" msgid="3077375508177744586">"ይህ መተግበሪያ ምንም ማሳወቂያዎችን አልለጠፈም"</string>
     <string name="app_settings_link" msgid="8894946007543660906">"በመተግበሪያው ውስጥ ያሉ ተጨማሪ ቅንብሮች"</string>
     <string name="app_notification_listing_summary_zero" msgid="6482582965081108108">"ለሁሉም መተግበሪያዎች በርቷል"</string>
@@ -2998,6 +3017,7 @@
     <string name="zen_mode_from_starred" msgid="2678345811950997027">"ኮከብ ከተደረገባቸው እውቂያዎች ብቻ"</string>
     <string name="zen_mode_from_none" msgid="8219706639954614136">"ምንም"</string>
     <string name="zen_mode_alarms" msgid="2165302777886552926">"ማንቂያዎች"</string>
+    <string name="zen_mode_alarms_summary" msgid="3774926045611788635">"ማንቂያዎች ሁልጊዜ ቅድሚያ የሚሰጣቸው ሲሆን ድምጽ ይፈጥራሉ"</string>
     <string name="zen_mode_reminders" msgid="5458502056440485730">"አስታወሾች"</string>
     <string name="zen_mode_events" msgid="7914446030988618264">"ክስተቶች"</string>
     <string name="zen_mode_all_callers" msgid="584186167367236922">"ሁሉም ደዋዮች"</string>
@@ -3032,6 +3052,7 @@
     <string name="zen_mode_screen_off_visual_interruptions" msgid="4850792880144382633">"ማያ ገጹ ሲጠፋ"</string>
     <string name="zen_mode_no_visual_interruptions" msgid="8742776003822778472">"ማያ ገጹ ሲበራ ወይም ሲጠፋ"</string>
     <string name="notification_app_settings_button" msgid="6685640230371477485">"የማሳወቂያ ቅንብሮች"</string>
+    <string name="suggestion_button_text" msgid="3275010948381252006">"እሺ"</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>
@@ -3216,6 +3237,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="sms_mirroring_pref" msgid="6475043279147376031">"የኤስኤምኤስ ግልባጭ"</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>
@@ -3282,7 +3304,8 @@
     <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>
+    <!-- no translation found for permit_write_settings (658555006453212691) -->
+    <skip />
     <string name="write_settings_description" msgid="6868293938839954623">"ይህ ፈቃድ መተግበሪያው የስርዓት ቅንብሮችን ለመቀየር ያስችለዋል።"</string>
     <string name="write_settings_on" msgid="8230580416068832239">"አዎ"</string>
     <string name="write_settings_off" msgid="5156104383386336233">"አይ"</string>
@@ -3377,9 +3400,12 @@
     <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="connectivity_monitor_switch" msgid="9059759348648583421">"የተገናኝነት መከታተያ"</string>
+    <string name="connectivity_monitor_switch_summary" msgid="2828658652378866401">"ConnectivityMonitor የተገናኝነት ችግር ሲያገኝ የምዝግብ ማስታወሻዎችን የሚሰበስብ ሲሆን ተጠቃሚው ሳንካ እንዲያስመዘግብ በማሳወቂያ ይጠይቀዋል"</string>
+    <string name="connectivity_monitor_toast" msgid="5551859612881173028">"የተገናኝነት መከታተያ ለውጥን ለመተግበር መሣሪያውን ዳግም ያስነሱት"</string>
     <string name="camera_hal_hdrplus_switch" msgid="8377365197105267466">"ካሜራ HAL ኤችዲአር+"</string>
     <string name="camera_hal_hdrplus_toast" msgid="2063703797270055299">"የካሜራ HAL ኤችዲአር+ ለውጥን ለመተግባር መሣሪያውን ዳግም ያስነሱት"</string>
+    <string name="camera_laser_sensor_switch" msgid="8913588990743234440">"የካሜራ ሌዘር ዳሳሽ"</string>
     <string name="ota_disable_automatic_update" msgid="2319639631655915050">"ራስ-ሰር የስርዓት ዝማኔዎች"</string>
     <string name="usage" msgid="2977875522080448986">"አጠቃቀም"</string>
     <string name="cellular_data_usage" msgid="2155683719898158203">"የተንቀሳቃሽ ውሂብ አጠቃቀም"</string>
@@ -3399,13 +3425,13 @@
       <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>
     <string name="set_data_limit" msgid="2901526323210516923">"የውሂብ ገደብ ያዘጋጁ"</string>
     <string name="data_limit" msgid="1885406964934590552">"የውሂብ ገደብ"</string>
-    <string name="data_usage_template" msgid="392191945602400904">"<xliff:g id="ID_1">%1$s</xliff:g> ከ<xliff:g id="ID_2">%2$s</xliff:g> መሃል ጥቅም ላይ ውሏል"</string>
+    <string name="data_usage_template" msgid="2923744765873163859">"<xliff:g id="ID_1">%1$s</xliff:g> ጥቅም ላይ ውሏል <xliff:g id="ID_2">%2$s</xliff:g>"</string>
     <string name="configure" msgid="1029654422228677273">"አዋቅር"</string>
     <string name="data_usage_other_apps" msgid="3272872663517382050">"በአጠቃቀም ውስጥ ሌሎች መተግበሪያዎች ተካትተዋል"</string>
     <plurals name="data_saver_unrestricted_summary" formatted="false" msgid="2635267833484232703">
@@ -3474,7 +3500,7 @@
     <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="387052719462473500">"በማያ ገጽ መቆለፊያ ላይ የቁጥጥር መረጃ"</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="8483187649355540109">"ድጋፍ እና ጠቃሚ ምክሮች"</string>
@@ -3482,7 +3508,7 @@
     <string name="premium_sms_none" msgid="8268105565738040566">"ምንም የተጫኑ መተግበሪያዎች የፕሪሚየም ኤስኤምኤስ መዳረሻ አልጠየቁም"</string>
     <string name="premium_sms_warning" msgid="9086859595338944882">"ፕሪሚየም ኤስኤምኤስ ውድ ገንዘብ ሊያስወጣዎት ይችላል፣ እና በአገልግሎት አቅራቢ ክፍያዎ ላይ ሒሳብ ያስጨምርብዎታል። ለመተግበሪያ ፈቃድን ካነቁ ያንን መተግበሪያ በመጠቀም ፕሪሚየም ኤስኤምኤስ መላክ ይችላሉ።"</string>
     <string name="premium_sms_access" msgid="4660047004791638305">"የፕሪሚየም ኤስኤምኤስ መዳረሻ"</string>
-    <string name="bluetooth_disabled" msgid="2456198532288640046">"ለሌሎች መሣሪያዎች አይታይም"</string>
+    <string name="bluetooth_disabled" msgid="6244000672828617410">"ጠፍቷል"</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>
@@ -3584,7 +3610,7 @@
     <string name="web_action_enable_title" msgid="4051513950976670853">"ቅጽበታዊ መተግበሪያዎች"</string>
     <string name="web_action_enable_summary" msgid="3108127559723396382">"አገናኞችን በመተግበሪያዎች ውስጥ ይክፈቱ፣ ባይጫኑም እንኳ"</string>
     <string name="web_action_section_title" msgid="7364647086538399136">"ቅጽበታዊ መተግበሪያዎች"</string>
-    <string name="instant_apps_account" msgid="1433620209791992528">"የቅጽበታዊ መተግበሪያዎች መለያ"</string>
+    <string name="instant_apps_settings" msgid="8827777916518348213">"የቅጽበት መተግበሪያዎች አማራጮች"</string>
     <string name="domain_url_section_title" msgid="7046835219056428883">"የተጫኑ መተግበሪያዎች"</string>
     <string name="automatic_storage_manager_activation_warning" msgid="6353100011690933254">"የእርስዎ ማከማቻ አሁን በማከማቻ አስተዳዳሪ እየተዳደረ ነው"</string>
     <string name="account_for_section_header" msgid="5356566418548737121">"የ<xliff:g id="USER_NAME">%1$s</xliff:g> መለያዎች"</string>
@@ -3631,7 +3657,9 @@
     <string name="enterprise_privacy_always_on_vpn_personal" msgid="9217774730260037434">"ሁልጊዜ የበራ VPN በእርስዎ የግል መገለጫ ውስጥ በርቷል"</string>
     <string name="enterprise_privacy_always_on_vpn_work" msgid="7244472958208315814">"ሁልጊዜ የበራ VPN በእርስዎ የሥራ መገለጫ በርቷል"</string>
     <string name="enterprise_privacy_global_http_proxy" msgid="7936664553416257333">"ሁለንተናዊ የHTTP ወኪል ተዘጋጅቷል"</string>
-    <string name="enterprise_privacy_ca_certs" msgid="5885892204903688909">"የሚታመን ማስረጃ"</string>
+    <string name="enterprise_privacy_ca_certs_device" msgid="2019652712782510262">"የሚታመን ማስረጃ"</string>
+    <string name="enterprise_privacy_ca_certs_personal" msgid="2279084820904076599">"በእርስዎ የግል መገለጫ ውስጥ ያሉ የታመኑ ምስክርነቶች"</string>
+    <string name="enterprise_privacy_ca_certs_work" msgid="6187377647815301809">"በእርስዎ የሥራ መገለጫ ውስጥ ያሉ የታመኑ ምስክርነቶች"</string>
     <plurals name="enterprise_privacy_number_ca_certs" formatted="false" msgid="526375234629534165">
       <item quantity="one">ቢያንስ <xliff:g id="COUNT_1">%d</xliff:g> የCA እውቅና ማረጋገጫዎች</item>
       <item quantity="other">ቢያንስ <xliff:g id="COUNT_1">%d</xliff:g> የCA እውቅና ማረጋገጫዎች</item>
@@ -3694,6 +3722,8 @@
     <string name="carrier_provisioning" msgid="4398683675591893169">"የአገልግሎት አቅራቢ አቅርቦት መረጃ"</string>
     <string name="trigger_carrier_provisioning" msgid="3434865918009286187">"የቀስቃሴ አገልግሎት አቅራቢ አቅርቦት"</string>
     <string name="new_device_suggestion_title" msgid="698847081680980774">"ምን አዲስ እና አስደሳች ነገር አለ?"</string>
-    <string name="new_device_suggestion_summary" msgid="7172709269203435870">"ከፍተኛዎቹን 5 ባህሪያት ይሞክሩዋቸው"</string>
+    <string name="new_device_suggestion_summary" product="default" msgid="206396571522515855">"በአዲሱ ስልክዎ ላይ ጉብኝት ያድርጉ"</string>
+    <string name="new_device_suggestion_summary" product="tablet" msgid="393751455688210956">"በአዲሱ ጡባዊዎ ላይ ጉብኝት ያድርጉ"</string>
+    <string name="new_device_suggestion_summary" product="device" msgid="2939870049868336652">"በአዲሱ መሣሪያዎ ላይ ጉብኝት ያድርጉ"</string>
     <string name="disabled_low_ram_device" msgid="3751578499721173344">"ይህ ባህሪ በዚህ መሣሪያ ላይ አይገኝም"</string>
 </resources>
diff --git a/res/values-ar/arrays.xml b/res/values-ar/arrays.xml
index 67094a0..311e5d4 100644
--- a/res/values-ar/arrays.xml
+++ b/res/values-ar/arrays.xml
@@ -33,7 +33,7 @@
     <item msgid="3342301044271143016">"١٥ ثانية"</item>
     <item msgid="8881760709354815449">"۳۰ ثانية"</item>
     <item msgid="7589406073232279088">"دقيقة واحدة"</item>
-    <item msgid="7001195990902244174">"۲ دقائق"</item>
+    <item msgid="7001195990902244174">"دقيقتان"</item>
     <item msgid="7489864775127957179">"٥ دقائق"</item>
     <item msgid="2314124409517439288">"۱۰ دقائق"</item>
     <item msgid="6864027152847611413">"۳۰ دقيقة"</item>
@@ -61,7 +61,7 @@
   </string-array>
   <string-array name="entries_font_size">
     <item msgid="8166647333858618801">"صغير"</item>
-    <item msgid="6986443533756848935">"الإعداد الافتراضي"</item>
+    <item msgid="6986443533756848935">"الإعداد التلقائي"</item>
     <item msgid="38373998008112077">"كبير"</item>
     <item msgid="7635254317531872272">"الأكبر"</item>
   </string-array>
@@ -100,8 +100,6 @@
     <!-- no translation found for wifi_security_no_eap:0 (2084555984818107151) -->
     <!-- no translation found for wifi_security_no_eap:1 (397579322683471524) -->
     <!-- no translation found for wifi_security_no_eap:2 (1968820975358150484) -->
-    <!-- no translation found for wifi_ap_security:0 (5251664683198623324) -->
-    <!-- no translation found for wifi_ap_security:1 (7989073072260294673) -->
   <string-array name="wifi_eap_method">
     <item msgid="1160193392455075561">"PEAP"</item>
     <item msgid="7981731051382306293">"طبقة النقل الآمنة"</item>
@@ -376,7 +374,7 @@
     <item msgid="2372711992605524591">"طويلة"</item>
   </string-array>
   <string-array name="captioning_typeface_selector_titles">
-    <item msgid="1319652728542138112">"افتراضي"</item>
+    <item msgid="1319652728542138112">"تلقائي"</item>
     <item msgid="1016452621833735880">"Sans-serif"</item>
     <item msgid="2496277987934654454">"‏Sans-serif مكثف"</item>
     <item msgid="7247838127505318669">"Sans-serif monospace"</item>
diff --git a/res/values-ar/strings.xml b/res/values-ar/strings.xml
index 69d21dc..f610f60 100644
--- a/res/values-ar/strings.xml
+++ b/res/values-ar/strings.xml
@@ -170,7 +170,7 @@
     <string name="bluetooth_map_acceptance_dialog_text" msgid="8712508202081143737">"‏يريد %1$s الدخول إلى رسائلك. هل تريد منح %2$s حق الدخول؟"</string>
     <string name="bluetooth_sap_request" msgid="2669762224045354417">"‏طلب حق الوصول إلى شريحة SIM"</string>
     <string name="bluetooth_sap_acceptance_dialog_text" msgid="4414253873553608690">"‏يريد <xliff:g id="DEVICE_NAME_0">%1$s</xliff:g> الوصول إلى شريحة SIM. ويؤدي منح حق الوصول إلى شريحة SIM إلى تعطيل اتصال البيانات على جهازك طوال مدة الاتصال. منح حق الوصول إلى <xliff:g id="DEVICE_NAME_1">%2$s?</xliff:g>"</string>
-    <string name="bluetooth_device_name_summary" msgid="4757990010751789977">"مرئي باسم \"<xliff:g id="DEVICE_NAME">^1</xliff:g>\" للأجهزة الأخرى"</string>
+    <string name="bluetooth_device_name_summary" msgid="522235742194965734">"مرئي باسم \"<xliff:g id="DEVICE_NAME">^1</xliff:g>\" للأجهزة الأخرى"</string>
     <string name="bluetooth_paired_device_title" msgid="8638994696317952019">"أجهزتك"</string>
     <string name="bluetooth_pairing_page_title" msgid="7712127387361962608">"إقران جهاز جديد"</string>
     <string name="date_and_time" msgid="9062980487860757694">"التاريخ والوقت"</string>
@@ -301,7 +301,7 @@
     <string name="cellular_data_summary" msgid="4660351864416939504">"السماح باستخدام البيانات عبر شبكة الجوال"</string>
     <string name="allow_data_usage_title" msgid="2238205944729213062">"السماح باستخدام بيانات التجوال"</string>
     <string name="roaming" msgid="3596055926335478572">"تجوال البيانات"</string>
-    <string name="roaming_enable" msgid="3737380951525303961">"اتصال بخدمات البيانات عند التجوال"</string>
+    <string name="roaming_enable" msgid="3737380951525303961">"الاتصال بخدمات البيانات عند التجوال"</string>
     <string name="roaming_disable" msgid="1295279574370898378">"اتصال بخدمات البيانات عند التجوال"</string>
     <string name="roaming_reenable_message" msgid="9141007271031717369">"لقد فقدت اتصال البيانات نظرًا لأنك أوقفت تشغيل تجوال البيانات بشبكتك الرئيسية."</string>
     <string name="roaming_turn_it_on_button" msgid="4387601818162120589">"تشغيل"</string>
@@ -320,6 +320,8 @@
     <string name="zone_auto" msgid="334783869352026648">"المنطقة الزمنية التلقائية"</string>
     <string name="zone_auto_summaryOn" msgid="6142830927278458314">"استخدام المنطقة الزمنية للشبكة"</string>
     <string name="zone_auto_summaryOff" msgid="2597745783162041390">"استخدام المنطقة الزمنية للشبكة"</string>
+    <string name="date_time_24hour_auto" msgid="2117383168985653422">"تنسيق 24 ساعة تلقائي"</string>
+    <string name="date_time_24hour_auto_summary" msgid="6351812925651480277">"استخدام الخيار التلقائي في اللغة"</string>
     <string name="date_time_24hour_title" msgid="3203537578602803850">"تنسيق ٢٤ ساعة"</string>
     <string name="date_time_24hour" msgid="1193032284921000063">"استخدام تنسيق ٢٤ ساعة"</string>
     <string name="date_time_set_time_title" msgid="6296795651349047016">"المدة"</string>
@@ -384,13 +386,16 @@
     <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="1961957425135180242">"التالي"</string>
+    <string name="setup_fingerprint_enroll_skip_title" msgid="362050541117362034">"هل تريد تخطّي بصمة الإصبع؟"</string>
+    <string name="setup_fingerprint_enroll_skip_after_adding_lock_text" msgid="958990414356204763">"لا يستغرق إعداد بصمة الإصبع أكثر من دقيقة أو دقيقتين. وعند تخطّي ذلك، يمكنك إضافة بصمة إصبع لاحقًا من الإعدادات."</string>
+    <string name="lock_screen_intro_skip_title" msgid="4988210105913705679">"هل تريد تخطّي قفل الشاشة؟"</string>
     <string name="lock_screen_intro_skip_dialog_text_frp" product="tablet" msgid="1581834104051243425">"لن يتم تشغيل ميزات حماية الجهاز. ولن تتمكن من منع الآخرين من استخدام هذا الجهاز اللوحي في حالة فقدانه أو سرقته أو إعادة ضبطه."</string>
     <string name="lock_screen_intro_skip_dialog_text_frp" product="device" msgid="4629503416877189572">"لن يتم تشغيل ميزات حماية الجهاز. ولن تتمكن من منع الآخرين من استخدام هذا الجهاز في حالة فقدانه أو سرقته أو إعادة ضبطه."</string>
     <string name="lock_screen_intro_skip_dialog_text_frp" product="default" msgid="2423428240245737909">"لن يتم تشغيل ميزات حماية الجهاز. ولن تتمكن من منع الآخرين من استخدام هذا الهاتف في حالة فقدانه أو سرقته أو إعادة ضبطه."</string>
     <string name="lock_screen_intro_skip_dialog_text" product="tablet" msgid="5219287483885558525">"لن يتم تشغيل ميزات حماية الجهاز. ولن تتمكن من منع الآخرين من استخدام هذا الجهاز اللوحي في حالة فقدانه أو سرقته."</string>
     <string name="lock_screen_intro_skip_dialog_text" product="device" msgid="1466238255429527112">"لن يتم تشغيل ميزات حماية الجهاز. ولن تتمكن من منع الآخرين من استخدام هذا الجهاز في حالة فقدانه أو سرقته."</string>
     <string name="lock_screen_intro_skip_dialog_text" product="default" msgid="3008526710555416125">"لن يتم تشغيل ميزات حماية الجهاز. ولن تتمكن من منع الآخرين من استخدام هذا الهاتف في حالة فقدانه أو سرقته."</string>
-    <string name="skip_anyway_button_label" msgid="2323522873558834513">"التخطي على أي حال"</string>
+    <string name="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="3051496861358227199">"لمس المستشعر"</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_message" msgid="8793966374365960368">"المستشعر موجود على الجزء الخلفي لهاتفك. استخدم إصبع السبابة."</string>
@@ -401,7 +406,7 @@
     <string name="security_settings_fingerprint_enroll_start_title" msgid="2068961812439460133">"المس المستشعر"</string>
     <string name="security_settings_fingerprint_enroll_start_message" msgid="3909929328942564524">"ضع إصبعك على المستشعر وارفعه بعد الشعور بالاهتزاز"</string>
     <string name="security_settings_fingerprint_enroll_repeat_title" msgid="2819679722403209778">"ارفع، ثم المس مرة أخرى"</string>
-    <string name="security_settings_fingerprint_enroll_repeat_message" msgid="6158989350522518586">"استمر في رفع إصبعك لإضافة الأجزاء المختلفة لبصمة الإصبع"</string>
+    <string name="security_settings_fingerprint_enroll_repeat_message" msgid="6158989350522518586">"استمر في وضع إصبعك ورفعه لإضافة الأجزاء المختلفة لبصمة الإصبع"</string>
     <string name="security_settings_fingerprint_enroll_finish_title" msgid="7567276170287972230">"تمت إضافة بصمة الإصبع"</string>
     <string name="security_settings_fingerprint_enroll_finish_message" msgid="4796715961273420536">"عندما ترى هذا الرمز، استخدم بصمة الإصبع لتحديد الهوية أو للموافقة على عمليات الشراء."</string>
     <string name="security_settings_fingerprint_enroll_enrolling_skip" msgid="3710211704052369752">"تنفيذ ذلك لاحقًا"</string>
@@ -469,7 +474,7 @@
     <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="lock_settings_picker_fingerprint_added_security_message" msgid="5768002109707648463">"يجب تعيين قفل شاشة احتياطي لزيادة الأمان."</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>
@@ -562,7 +567,7 @@
     <string name="lock_failed_attempts_now_wiping_profile" msgid="1745475043685915442">"لقد استنفدت عدد المحاولات غير الصحيحة وسيتم حذف الملف الشخصي للعمل وبياناته."</string>
     <string name="lock_failed_attempts_now_wiping_dialog_dismiss" msgid="8246716090548717312">"تجاهل"</string>
     <string name="lockpassword_password_too_short" msgid="2726090378672764986">"يجب أن تحتوي كلمة المرور على <xliff:g id="COUNT">%d</xliff:g> من الأحرف على الأقل"</string>
-    <string name="lockpassword_pin_too_short" msgid="3638188874397727648">"يجب أن يحتوي رقم التعريف الشخصي على <xliff:g id="COUNT">%d</xliff:g> من الأرقام على الأقل"</string>
+    <string name="lockpassword_pin_too_short" msgid="3638188874397727648">"يجب أن يحتوي رقم التعريف الشخصي على <xliff:g id="COUNT">%d</xliff:g> أرقام على الأقل"</string>
     <string name="lockpassword_continue_label" msgid="4602203784934526940">"متابعة"</string>
     <string name="lockpassword_password_too_long" msgid="4591720174765403476">"يجب ألا تزيد كلمة المرور عن <xliff:g id="NUMBER">%d</xliff:g> من الأحرف"</string>
     <string name="lockpassword_pin_too_long" msgid="2079396149560490458">"يجب ألا يزيد رقم التعريف الشخصي عن <xliff:g id="NUMBER">%d</xliff:g> من الأرقام"</string>
@@ -622,8 +627,9 @@
     </plurals>
     <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_confirm_label" msgid="8176726201389902380">"تأكيد"</string>
     <string name="lockpassword_cancel_label" msgid="8818529276331121899">"إلغاء"</string>
+    <string name="lockpassword_clear_label" msgid="5724429464960458155">"محو"</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>
@@ -706,16 +712,16 @@
     <string name="bluetooth_disconnect_headset_profile" msgid="8635908811168780720">"سيتم إلغاء توصيل <xliff:g id="DEVICE_NAME">%1$s</xliff:g> من صوت السماعة بدون استخدام اليدين."</string>
     <string name="bluetooth_disconnect_hid_profile" msgid="3282295189719352075">"سيتم إلغاء توصيل <xliff:g id="DEVICE_NAME">%1$s</xliff:g> من جهاز الإرسال."</string>
     <string name="bluetooth_disconnect_pan_user_profile" msgid="8037627994382458698">"سيتم قطع الدخول إلى الإنترنت عبر <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
-    <string name="bluetooth_disconnect_pan_nap_profile" product="tablet" msgid="1262792320446274407">"سيتم قطع اتصال <xliff:g id="DEVICE_NAME">%1$s</xliff:g> من مشاركة الاتصال بالإنترنت لهذا الجهاز اللوحي."</string>
-    <string name="bluetooth_disconnect_pan_nap_profile" product="default" msgid="5700332050175684571">"سيتم قطع اتصال <xliff:g id="DEVICE_NAME">%1$s</xliff:g> من مشاركة الاتصال بالإنترنت لهذا الجهاز."</string>
+    <string name="bluetooth_disconnect_pan_nap_profile" product="tablet" msgid="8355910926439312604">"سيتم قطع اتصال <xliff:g id="DEVICE_NAME">%1$s</xliff:g> من مشاركة اتصال الإنترنت على هذا الجهاز اللوحي."</string>
+    <string name="bluetooth_disconnect_pan_nap_profile" product="default" msgid="6251611115860359886">"سيتم قطع اتصال <xliff:g id="DEVICE_NAME">%1$s</xliff:g> من مشاركة اتصال الإنترنت على هذا الهاتف."</string>
     <string name="bluetooth_device_advanced_title" msgid="6066342531927499308">"جهاز بلوتوث المقترن"</string>
     <string name="bluetooth_device_advanced_online_mode_title" msgid="3689050071425683114">"اتصال"</string>
     <string name="bluetooth_device_advanced_online_mode_summary" msgid="1204424107263248336">"اتصال بجهاز البلوتوث"</string>
     <string name="bluetooth_device_advanced_profile_header_title" msgid="102745381968579605">"استخدام مع"</string>
     <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="6436258151814414028">"متصل بالجهاز للدخول إلى الإنترنت"</string>
+    <string name="bluetooth_pan_nap_profile_summary_connected" msgid="1322694224800769308">"تتم مشاركة اتصال الإنترنت المحلي مع الجهاز"</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>
@@ -761,16 +767,16 @@
     <string name="wifi_error" msgid="3207971103917128179">"خطأ"</string>
     <string name="wifi_sap_no_channel_error" msgid="3108445199311817111">"لا يتوفر التردد ٥ غيغاهرتز في هذا البلد"</string>
     <string name="wifi_in_airplane_mode" msgid="8652520421778203796">"في وضع الطائرة"</string>
-    <string name="wifi_notify_open_networks" msgid="76298880708051981">"إشعار الشبكات المفتوحة"</string>
+    <string name="wifi_notify_open_networks" msgid="76298880708051981">"الإشعار بوجود شبكات مفتوحة"</string>
     <string name="wifi_notify_open_networks_summary" msgid="2761326999921366960">"الإشعار عند توفر شبكة عامة عالية الجودة"</string>
     <string name="wifi_wakeup" msgid="8815640989361538036">"‏تشغيل شبكة Wi‑Fi تلقائيًا"</string>
     <string name="wifi_wakeup_summary" msgid="2530814331062997163">"‏ستتم إعادة تشغيل شبكة Wi‑Fi بالقرب من الشبكات المحفوظة العالية الجودة، مثل الشبكة المنزلية"</string>
     <string name="wifi_wakeup_summary_scanning_disabled" msgid="7247227922074840445">"‏غير متاح لأنه تم إيقاف فحص شبكات Wi‑Fi"</string>
     <string name="wifi_wakeup_summary_scoring_disabled" msgid="108339002136866897">"لاستخدام الميزة، اختر مقدِّم خدمة تقييم شبكة"</string>
     <string name="wifi_poor_network_detection" msgid="4925789238170207169">"تجنب الاتصالات الضعيفة"</string>
-    <string name="wifi_poor_network_detection_summary" msgid="2784135142239546291">"‏عدم استخدام شبكات Wi-Fi ما لم يكن لها اتصال إنترنت جيد"</string>
-    <string name="wifi_avoid_poor_network_detection_summary" msgid="4674423884870027498">"استخدام الشبكات ذات اتصال الإنترنت الجيد فقط"</string>
-    <string name="use_open_wifi_automatically_title" msgid="6851951242903078588">"التوصيل بالشبكات المفتوحة"</string>
+    <string name="wifi_poor_network_detection_summary" msgid="7016103106105907127">"‏عدم استخدام شبكة Wi-Fi إلا إذا كانت توفِّر اتصالاً جيدًا بالإنترنت"</string>
+    <string name="wifi_avoid_poor_network_detection_summary" msgid="1644292503152790501">"استخدام الشبكات التي توفِّر اتصالاً جيدًا بالإنترنت فقط"</string>
+    <string name="use_open_wifi_automatically_title" msgid="6851951242903078588">"الاتّصال بالشبكات المفتوحة"</string>
     <string name="use_open_wifi_automatically_summary" msgid="2982091714252931713">"الاتصال تلقائيًا بالشبكات العامة العالية الجودة"</string>
     <string name="use_open_wifi_automatically_summary_scoring_disabled" msgid="593964217679325831">"لاستخدام الميزة، اختر مقدِّم خدمة تقييم شبكة"</string>
     <string name="use_open_wifi_automatically_summary_scorer_unsupported_disabled" msgid="8472122600853650258">"لاستخدام الميزة، اختر مقدِّم خدمة تقييم شبكة متوافق"</string>
@@ -785,9 +791,9 @@
     <string name="wifi_suspend_optimizations" msgid="1220174276403689487">"‏تحسين Wi-Fi"</string>
     <string name="wifi_suspend_optimizations_summary" msgid="4151428966089116856">"‏تقليل استخدام البطارية إلى الحد الأدنى عند تشغيل Wi-Fi"</string>
     <string name="wifi_limit_optimizations_summary" msgid="9000801068363468950">"‏تقييد طاقة البطارية لاتصال Wi‑Fi"</string>
-    <string name="wifi_switch_away_when_unvalidated" msgid="1707247692180853058">"‏التبديل إلى بيانات الجوّال في حالة انقطاع اتصال شبكة Wi‑Fi بالإنترنت."</string>
+    <string name="wifi_switch_away_when_unvalidated" msgid="8593144541347373394">"‏التبديل إلى بيانات الجوّال في حالة انقطاع اتصال شبكة Wi‑Fi بالإنترنت."</string>
     <string name="wifi_cellular_data_fallback_title" msgid="8753386877755616476">"التبديل إلى بيانات الجوال تلقائيًا"</string>
-    <string name="wifi_cellular_data_fallback_summary" msgid="6375399280719867214">"‏يمكنك استخدام بيانات شبكة الجوّال عند عدم اتصال شبكة Wi‑Fi بالإنترنت؛ وقد يتم تطبيق رسوم مقابل استخدام بيانات شبكة الجوال."</string>
+    <string name="wifi_cellular_data_fallback_summary" msgid="1403505355490119307">"‏يمكنك استخدام بيانات شبكة الجوّال إذا تعذّر الدخول إلى الإنترنت عبر شبكة 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>
@@ -798,14 +804,14 @@
     <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>
     <string name="wifi_menu_forget" msgid="8736964302477327114">"حذف الشبكة"</string>
     <string name="wifi_menu_modify" msgid="2068554918652440105">"تعديل الشبكة"</string>
     <string name="wifi_menu_write_to_nfc" msgid="7692881642188240324">"‏الكتابة في علامة NFC"</string>
-    <string name="wifi_empty_list_wifi_off" msgid="8056223875951079463">"‏لمشاهدة الشبكات المتاحة، شغّل Wi-Fi."</string>
+    <string name="wifi_empty_list_wifi_off" msgid="8056223875951079463">"‏لمعرفة الشبكات المتاحة، يُرجى تشغيل Wi-Fi."</string>
     <string name="wifi_empty_list_wifi_on" msgid="8746108031587976356">"‏جارٍ البحث عن شبكات Wi-Fi..."</string>
     <string name="wifi_empty_list_user_restricted" msgid="7322372065475939129">"‏ليس لديك إذن لتغيير شبكة Wi‑Fi."</string>
     <string name="wifi_more" msgid="3195296805089107950">"المزيد"</string>
@@ -820,11 +826,12 @@
     <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_generic" msgid="5668775022238832527">"‏تعذّر إتمام عملية WPS. يرجى إعادة المحاولة خلال بضع دقائق."</string>
     <string name="wifi_wps_failed_wep" msgid="2702820087105284461">"‏إعداد أمان جهاز التوجيه اللاسلكي (WEP) ليس متوافقًا"</string>
     <string name="wifi_wps_failed_tkip" msgid="4282401586860713349">"‏إعداد أمان جهاز التوجيه اللاسلكي (TKIP) ليس متوافقًا"</string>
-    <string name="wifi_wps_failed_auth" msgid="1174614355181181958">"أخفقت المصادقة. يُرجى إعادة المحاولة."</string>
+    <string name="wifi_wps_failed_auth" msgid="1174614355181181958">"تعذّرت المصادقة. يُرجى إعادة المحاولة."</string>
     <string name="wifi_wps_failed_overlap" msgid="5159533685596844778">"‏تم اكتشاف جلسة WPS أخرى، يُرجى إعادة المحاولة خلال بضع دقائق."</string>
+    <string name="wifi_wps_failed_wifi_disconnected" msgid="3829472117754104164">"‏تم قطع الاتصال بشبكة 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>
@@ -850,7 +857,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>
@@ -861,6 +868,8 @@
     <string name="wifi_wps_available_first_item" msgid="4422547079984583502">"‏WPS متاح"</string>
     <string name="wifi_wps_available_second_item" msgid="8427520131718215301">" ‏ (WPS متاح)"</string>
     <string name="wifi_wps_nfc_enter_password" msgid="2288214226916117159">"أدخل كلمة مرور الشبكة"</string>
+    <string name="wifi_carrier_connect" msgid="8174696557882299911">"‏شبكة Wi‑Fi لمشغِّل شبكة الجوّال"</string>
+    <string name="wifi_carrier_content" msgid="4634077285415851933">"الاتصال عبر <xliff:g id="NAME">%1%s</xliff:g>"</string>
     <string name="wifi_scan_always_turnon_message" msgid="203123538572122989">"‏لتحسين مستوى دقة تحديد الموقع ولأغراض أخرى، يحتاج <xliff:g id="APP_NAME">%1$s</xliff:g> إلى تشغيل البحث عن الشبكات، حتى مع إيقاف Wi-Fi.\n\nهل تريد السماح بذلك لجميع التطبيقات التي تحتاج إلى فحص؟"</string>
     <string name="wifi_scan_always_turnoff_message" msgid="5538901671131941043">"لتعطيل هذا، يمكنك الانتقال إلى \"متقدم\" في القائمة الكاملة."</string>
     <string name="wifi_scan_always_confirm_allow" msgid="5355973075896817232">"سماح"</string>
@@ -868,9 +877,9 @@
     <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="5926979351959279577">"لا توفِّر هذه الشبكة اتصالاً بالإنترنت. هل تريد متابعة الاتصال؟"</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_title" msgid="5779478650636392426">"‏شبكة Wi‑Fi غير متصلة بالإنترنت"</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>
@@ -878,6 +887,7 @@
     <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_modify" msgid="6100248070440710782">"تعديل"</string>
     <string name="wifi_failed_forget_message" msgid="1348172929201654986">"تعذّر حذف الشبكة"</string>
     <string name="wifi_save" msgid="3331121567988522826">"حفظ"</string>
     <string name="wifi_failed_save_message" msgid="6650004874143815692">"تعذّر حفظ الشبكة"</string>
@@ -894,6 +904,7 @@
     <string name="wifi_advanced_titlebar" msgid="4485841401774142908">"‏إعدادات 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_title" msgid="8954667664081737098">"تفاصيل الشبكة"</string>
     <string name="wifi_details_subnet_mask" msgid="6720279144174924410">"قناع الشبكة الفرعية"</string>
     <string name="wifi_details_dns" msgid="8648826607751830768">"نظام أسماء النطاقات"</string>
     <string name="wifi_details_ipv6_address_header" msgid="6734119149106422148">"‏عناوين IPv6"</string>
@@ -926,18 +937,17 @@
     <string name="wifi_p2p_cancel_connect_title" msgid="255267538099324413">"هل تريد إلغاء الدعوة؟"</string>
     <string name="wifi_p2p_cancel_connect_message" msgid="7477756213423749402">"هل تريد إلغاء الدعوة للاتصال بـ <xliff:g id="PEER_NAME">%1$s</xliff:g>؟"</string>
     <string name="wifi_p2p_delete_group_message" msgid="834559380069647086">"حذف هذه المجموعة؟"</string>
-    <string name="wifi_tether_checkbox_text" msgid="1847167643625779136">"‏نقطة اتصال Wi-Fi المحمولة"</string>
     <string name="wifi_hotspot_checkbox_text" msgid="7763495093333664887">"‏نقطة اتصال Wi‑Fi"</string>
-    <string name="wifi_hotspot_off_subtext" msgid="5466126533609394170">"لا تتم مشاركة اتصال الإنترنت أو المحتوى مع الأجهزة الأخرى"</string>
-    <string name="wifi_hotspot_tethering_on_subtext" product="tablet" msgid="5752490509369962007">"تتم مشاركة اتصال الإنترنت لهذا الجهاز اللوحي عبر نقطة الاتصال"</string>
-    <string name="wifi_hotspot_tethering_on_subtext" product="default" msgid="6461075246164300670">"تتم مشاركة اتصال الإنترنت لهذا الهاتف عبر نقطة الاتصال"</string>
-    <string name="wifi_hotspot_on_local_only_subtext" msgid="2068110388011294735">"يشارك التطبيق المحتوى. لمشاركة اتصال الإنترنت، يجب إيقاف نقطة الاتصال، ثم تشغيلها."</string>
-    <string name="wifi_hotspot_name_title" msgid="1341735529132128887">"‏اسم شبكة Wi‑Fi"</string>
+    <string name="wifi_hotspot_off_subtext" msgid="2199911382555864644">"لا تتم مشاركة اتصال الإنترنت أو المحتوى مع الأجهزة الأخرى"</string>
+    <string name="wifi_hotspot_tethering_on_subtext" product="tablet" msgid="5936710887156133458">"تتم مشاركة اتصال الإنترنت على هذا الجهاز اللوحي عبر نقطة الاتصال"</string>
+    <string name="wifi_hotspot_tethering_on_subtext" product="default" msgid="5556202634866621632">"تتم مشاركة اتصال الإنترنت على هذا الهاتف عبر نقطة الاتصال"</string>
+    <string name="wifi_hotspot_on_local_only_subtext" msgid="5017191966153008">"يشارك التطبيق المحتوى. لمشاركة اتصال الإنترنت، يجب إيقاف نقطة الاتصال، ثم تشغيلها."</string>
+    <string name="wifi_hotspot_name_title" msgid="8237000746618636778">"اسم نقطة الاتصال"</string>
     <string name="wifi_hotspot_name_summary_connecting" msgid="3378299995508671967">"جارٍ تشغيل <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>..."</string>
     <string name="wifi_hotspot_name_summary_connected" msgid="3888672084861445362">"يمكن توصيل الأجهزة الأخرى بشبكة <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>"</string>
-    <string name="wifi_hotspot_password_title" msgid="1955592302902091281">"‏كلمة مرور شبكة Wi-Fi"</string>
+    <string name="wifi_hotspot_password_title" msgid="8676859981917573801">"كلمة مرور نقطة الاتصال"</string>
     <string name="wifi_hotspot_ap_band_title" msgid="1165801173359290681">"‏نطاق AP"</string>
-    <string name="wifi_hotspot_footer_info_regular" msgid="1203489406068036455">"‏يمكنك استخدام نقطة اتصال لإنشاء شبكة Wi‑Fi لأجهزتك الأخرى. وتوفر نقطة الاتصال اتصال الإنترنت باستخدام اتصال بيانات الجوّال. وقد يتم تطبيق رسوم بيانات الجوّال الإضافية."</string>
+    <string name="wifi_hotspot_footer_info_regular" msgid="4789553667374849566">"‏يمكنك استخدام نقطة اتصال لإنشاء شبكة Wi‑Fi لأجهزتك الأخرى. حيث توفِّر نقطة الاتصال إمكانية الاتصال بالإنترنت باستخدام اتصال بيانات الجوّال. وقد يتم فرض رسوم إضافية على بيانات الجوّال."</string>
     <string name="wifi_hotspot_footer_info_local_only" msgid="857988412470694109">"يمكن للتطبيقات إنشاء نقطة اتصال لمشاركة المحتوى مع الأجهزة المجاورة."</string>
     <string name="wifi_tether_starting" msgid="1322237938998639724">"جارٍ تشغيل نقطة الاتصال…"</string>
     <string name="wifi_tether_stopping" msgid="4835852171686388107">"جارٍ إيقاف نقطة الاتصال…"</string>
@@ -946,7 +956,6 @@
     <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">"‏الاتصال عبر Wi-Fi"</string>
     <string name="wifi_calling_suggestion_title" msgid="9008010480466359578">"‏تشغيل الاتصال عبر Wi-Fi"</string>
@@ -986,20 +995,20 @@
   </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="emergency_address_title" msgid="932729250447887545">"عنوان الطوارئ"</string>
+    <string name="emergency_address_summary" msgid="7751971156196115129">"‏يتم اعتباره موقعك الجغرافي عند إجراء مكالمة طوارئ عبر Wi‑Fi"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"عرض"</string>
     <string name="sound_settings" msgid="5534671337768745343">"الصوت"</string>
     <string name="all_volume_title" msgid="4296957391257836961">"مستويات الصوت"</string>
     <string name="musicfx_title" msgid="3415566786340790345">"تأثيرات موسيقية"</string>
     <string name="ring_volume_title" msgid="5592466070832128777">"مستوى صوت الرنين"</string>
     <string name="vibrate_in_silent_title" msgid="3897968069156767036">"اهتزاز عند تشغيل الوضع صامت"</string>
-    <string name="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>
@@ -1041,9 +1050,13 @@
     <string name="search_settings" msgid="1910951467596035063">"بحث"</string>
     <string name="search_settings_summary" msgid="9205656546570654169">"إدارة إعدادات البحث والسجل"</string>
     <string name="search_settings_no_results" msgid="8799027492641230999">"ليست هناك نتائج"</string>
+    <string name="search_clear_history" msgid="4196658962573162457">"محو السجلّ"</string>
     <string name="display_settings" msgid="7965901687241669598">"الشاشة"</string>
     <string name="accelerometer_title" msgid="7854608399547349157">"التدوير التلقائي للشاشة"</string>
-    <string name="color_mode_title" msgid="3159275920408338215">"ألوان ساطعة"</string>
+    <string name="color_mode_title" msgid="9186249332902370471">"الألوان"</string>
+    <string name="color_mode_option_natural" msgid="5013837483986772758">"طبيعي"</string>
+    <string name="color_mode_option_boosted" msgid="8588223970257287524">"مُحسن"</string>
+    <string name="color_mode_option_saturated" msgid="4569683960058798843">"مُشبع"</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>
@@ -1051,8 +1064,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>
@@ -1062,13 +1075,13 @@
     <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_auto_mode_title" msgid="6574111412154833409">"تحديد جدول زمني"</string>
@@ -1110,7 +1123,7 @@
     <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="ambient_display_screen_title" msgid="4252755516328775766">"العرض غير النشط"</string>
+    <string name="ambient_display_screen_title" msgid="4252755516328775766">"العرض على الشاشة"</string>
     <string name="ambient_display_screen_summary_always_on" msgid="7337555569694794132">"قيد التشغيل دائمًا / زيادة استخدام البطارية"</string>
     <string name="ambient_display_screen_summary_notifications" msgid="1449570742600868654">"إشعارات جديدة"</string>
     <string name="ambient_display_category_triggers" msgid="4359289754456268573">"وقت العرض"</string>
@@ -1160,21 +1173,22 @@
       <item quantity="other">‏رمز رقم التعريف الشخصي لبطاقة SIM غير صحيح، ويتبقى لديك <xliff:g id="NUMBER_1">%d</xliff:g> من المحاولات.</item>
       <item quantity="one">‏رمزPIN لبطاقة SIM غير صحيح، ولديك محاولة واحدة (<xliff:g id="NUMBER_0">%d</xliff:g>) يجب أن تتصل بعدها بمشغّل شبكة الجوّال لإلغاء قفل الجهاز.</item>
     </plurals>
-    <string name="pin_failed" msgid="1848423634948587645">"‏أخفقت عملية \"رقم التعريف الشخصي\" لبطاقة SIM!"</string>
+    <string name="pin_failed" msgid="1848423634948587645">"‏تعذّر إتمام عملية \"رقم التعريف الشخصي\" لبطاقة SIM!"</string>
     <string name="device_info_settings" product="tablet" msgid="1119755927536987178">"حالة الجهاز اللوحي"</string>
     <string name="device_info_settings" product="default" msgid="475872867864762157">"حالة الهاتف"</string>
     <string name="system_update_settings_list_item_title" msgid="3342887311059985961">"تحديثات النظام"</string>
     <string name="system_update_settings_list_item_summary" msgid="3853057315907710747"></string>
     <string name="firmware_version" msgid="4801135784886859972">"‏إصدار Android"</string>
+    <string name="firmware_title" msgid="5203122368389157877">"Android"</string>
     <string name="security_patch" msgid="8438384045870296634">"‏مستوى رمز تصحيح أمان Android"</string>
     <string name="model_info" msgid="1952009518045740889">"الطراز"</string>
+    <string name="model_summary" msgid="8306235877567782987">"‏الطراز: %1$s"</string>
     <string name="hardware_info" msgid="2605080746512527805">"الطراز والأجهزة"</string>
     <string name="hardware_revision" msgid="8893547686367095527">"إصدار الأجهزة"</string>
     <string name="fcc_equipment_id" msgid="149114368246356737">"معرّف الجهاز"</string>
     <string name="baseband_version" msgid="1848990160763524801">"إصدار النطاق الأساسي"</string>
     <string name="kernel_version" msgid="9192574954196167602">"إصدار النواة"</string>
     <string name="build_number" msgid="3075795840572241758">"رقم الإصدار"</string>
-    <string name="selinux_status" msgid="6212165375172061672">"‏حالة SELinux"</string>
     <string name="device_info_not_available" msgid="8062521887156825182">"غير متاح"</string>
     <string name="device_status_activity_title" msgid="1411201799384697904">"الحالة"</string>
     <string name="device_status" msgid="607405385799807324">"الحالة"</string>
@@ -1185,11 +1199,21 @@
     <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>
+    <!-- no translation found for imei_multi_sim (6387012961838800539) -->
+    <skip />
     <string name="status_number" product="tablet" msgid="1138837891091222272">"‏MDN (رقم دليل الجوال)"</string>
-    <string name="status_number" product="default" msgid="5123197324870153205">"رقم هاتفي"</string>
+    <string name="status_number" product="default" msgid="5948892105546651296">"رقم الهاتف"</string>
+    <!-- no translation found for status_number_sim_slot (2755592991367858860) -->
+    <skip />
+    <!-- no translation found for status_number_sim_slot (1898212200138025729) -->
+    <skip />
+    <string name="status_number_sim_status" product="tablet" msgid="1367110147304523864">"‏رقم دليل الجوّال على SIM"</string>
+    <string name="status_number_sim_status" product="default" msgid="9123351360569466330">"‏رقم الهاتف على شريحة SIM"</string>
     <string name="status_min_number" msgid="3519504522179420597">"دقيقة"</string>
     <string name="status_msid_number" msgid="909010114445780530">"MSID"</string>
     <string name="status_prl_version" msgid="1007470446618081441">"‏إصدار PRL"</string>
+    <!-- no translation found for meid_multi_sim (748999971744491771) -->
+    <skip />
     <string name="status_meid_number" msgid="1751442889111731088">"MEID"</string>
     <string name="status_icc_id" msgid="943368755577172747">"ICCID"</string>
     <string name="status_network_type" msgid="3279383550222116235">"نوع شبكة الجوال"</string>
@@ -1197,12 +1221,11 @@
     <string name="status_data_state" msgid="5503181397066522950">"حالة شبكة الجوال"</string>
     <string name="status_service_state" msgid="2323931627519429503">"حالة الخدمة"</string>
     <string name="status_signal_strength" msgid="3732655254188304547">"قوة الإشارة"</string>
-    <string name="status_roaming" msgid="2638800467430913403">"تجوال"</string>
+    <string name="status_roaming" msgid="2638800467430913403">"التجوال"</string>
     <string name="status_operator" msgid="2274875196954742087">"الشبكة"</string>
     <string name="status_wifi_mac_address" msgid="2202206684020765378">"‏عنوان Mac لشبكة Wi-Fi"</string>
     <string name="status_bt_address" msgid="4195174192087439720">"عنوان البلوتوث"</string>
     <string name="status_serial_number" msgid="2257111183374628137">"الرقم المسلسل"</string>
-    <string name="status_unavailable" msgid="7862009036663793314">"غير متاح"</string>
     <string name="status_up_time" msgid="7294859476816760399">"وقت التشغيل"</string>
     <string name="status_awake_time" msgid="2393949909051183652">"وقت الوضع النشط"</string>
     <string name="internal_memory" msgid="9129595691484260784">"وحدة التخزين الداخلية"</string>
@@ -1300,7 +1323,7 @@
     <string name="storage_detail_other" msgid="8404938385075638238">"غير ذلك"</string>
     <string name="storage_detail_system" msgid="4629506366064709687">"النظام"</string>
     <string name="storage_detail_explore" msgid="7911344011431568294">"استكشاف <xliff:g id="NAME">^1</xliff:g>"</string>
-    <string name="storage_detail_dialog_other" msgid="8907101974576694793">"‏تشمل الملفات الأخرى الملفات المشتركة التي تم حفظها بواسطة التطبيقات والملفات التي تم تنزيلها عبر الإنترنت أو البلوتوث وملفات Android وغيرها. \n\nللاطلاع على المحتويات المرئية لبطاقة <xliff:g id="NAME">^1</xliff:g> هذه، انقر على \"استكشاف\"."</string>
+    <string name="storage_detail_dialog_other" msgid="8845766044697204852">"‏تشمل الملفات الأخرى الملفات المشتركة التي تم حفظها بواسطة التطبيقات والملفات التي تم تنزيلها من مواقع الإنترنت أو عبر البلوتوث وملفات Android وما إلى ذلك. \n\nللاطلاع على المحتويات المرئية على بطاقة <xliff:g id="NAME">^1</xliff:g> هذه، انقر على \"استكشاف\"."</string>
     <string name="storage_detail_dialog_system" msgid="862835644848361569">"‏يتضمّن النظام الملفات المستخدمة لتشغيل إصدار Android <xliff:g id="VERSION">%s</xliff:g>"</string>
     <string name="storage_detail_dialog_user" msgid="3267254783294197804">"ربما يكون لدى <xliff:g id="USER_0">^1</xliff:g> صور أو موسيقى أو تطبيقات أو بيانات أخرى محفوظة، ويتم استخدام <xliff:g id="SIZE">^2</xliff:g> من السعة التخزينية. \n\nللاطلاع على التفاصيل، يمكنك التبديل إلى <xliff:g id="USER_1">^1</xliff:g>."</string>
     <string name="storage_wizard_init_title" msgid="5085400514028585772">"إعداد <xliff:g id="NAME">^1</xliff:g>"</string>
@@ -1378,6 +1401,7 @@
     <string name="menu_restore" msgid="8260067415075573273">"إعادة تعيين إلى الإعداد الافتراضي"</string>
     <string name="restore_default_apn_completed" msgid="2824775307377604897">"‏اكتملت إعادة تعيين إعدادات APN الافتراضية."</string>
     <string name="reset_dashboard_title" msgid="6254873816990678620">"إعادة تعيين الخيارات"</string>
+    <string name="reset_dashboard_summary" msgid="4851012632493522755">"يمكن إعادة تعيين الشبكة أو التطبيقات أو الجهاز"</string>
     <string name="reset_network_title" msgid="6166025966016873843">"‏إعادة تعيين شبكة Wi-Fi والجوّال وبلوتوث"</string>
     <string name="reset_network_desc" msgid="5547979398298881406">"‏سيؤدي هذا إلى إعادة تعيين إعدادات الشبكة، بما فيها:\n\n"<li>"Wi‑Fi"</li>\n<li>"بيانات الجوال"</li>\n<li>"بلوتوث"</li></string>
     <string name="reset_network_button_text" msgid="2035676527471089853">"إعادة تعيين الإعدادات"</string>
@@ -1386,21 +1410,14 @@
     <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="6617679904229218425">"محو جميع البيانات (إعادة التعيين على إعدادات المصنع)"</string>
-    <plurals name="master_clear_with_account_summary" formatted="false" msgid="5911377203778818712">
-      <item quantity="zero">ستتم إعادة تعيين <xliff:g id="ACCOUNT_COUNT">%1$d</xliff:g> حساب</item>
-      <item quantity="two">ستتم إعادة تعيين حسابين (<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>
-      <item quantity="one">ستتم إعادة تعيين حساب واحد</item>
-    </plurals>
-    <string name="master_clear_summary" msgid="6902443944660426951">"ستتم إعادة تعيين وحدة التخزين الداخلية وكل البيانات"</string>
+    <string name="master_clear_title" msgid="3531267871084279512">"محو جميع البيانات (إعادة التعيين على إعدادات المصنع)"</string>
     <string name="master_clear_desc" product="tablet" msgid="9146059417023157222">"‏يؤدي ذلك إلى مسح جميع البيانات من "<b>"وحدة التخزين الداخلية"</b>" لجهازك اللوحي، بما في ذلك:\n\n"<li>"حسابك في Google"</li>\n<li>"النظام وبيانات التطبيقات والإعدادات"</li>\n<li>"التطبيقات التي تم تنزيلها"</li></string>
     <string name="master_clear_desc" product="default" msgid="4800386183314202571">"‏يؤدي ذلك إلى مسح جميع البيانات من "<b>"وحدة التخزين الداخلية"</b>" لهاتفك، بما في ذلك:\n\n"<li>"حسابك في Google"</li>\n<li>"النظام وبيانات التطبيقات والإعدادات"</li>\n<li>"التطبيقات التي تم تنزيلها"</li></string>
     <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"تم تسجيل دخولك حاليًا في الحسابات التالية:\n"</string>
     <string name="master_clear_other_users_present" product="default" msgid="5161423070702470742">\n\n"هناك مستخدمون آخرون موجودون على هذا الجهاز.\n"</string>
     <string name="master_clear_desc_also_erases_external" msgid="1903185203791274237"><li>"الموسيقى"</li>\n<li>"الصور"</li>\n<li>"بيانات المستخدم الأخرى"</li></string>
+    <string name="master_clear_desc_also_erases_esim" msgid="312352697653096008">"‏"<li>"شركات تشغيل شبكة الجوّال على eSIM"</li></string>
+    <string name="master_clear_desc_no_cancel_mobile_plan" msgid="5460926449093211144">\n\n"لن يؤدي هذا إلى إلغاء خطة خدمة الجوّال."</string>
     <string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="7744115866662613411">"‏\n\nلمحو الموسيقى والصور وبيانات المستخدم الأخرى أيضًا، يجب محو "<b>"وحدة تخزين 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>
@@ -1432,15 +1449,15 @@
     <string name="tether_settings_disabled_on_data_saver" msgid="1576908608463904152">"يتعذر توصيل نقاط الاتصال المحمولة أو استخدامها أثناء تشغيل توفير البيانات"</string>
     <string name="usb_title" msgid="7483344855356312510">"USB"</string>
     <string name="usb_tethering_button_text" msgid="585829947108007917">"‏تقييد USB"</string>
-    <string name="usb_tethering_subtext" product="default" msgid="5991482890033484794">"‏مشاركة اتصال الإنترنت للجهاز عبر USB"</string>
-    <string name="usb_tethering_subtext" product="tablet" msgid="5988796139573211318">"‏مشاركة اتصال الإنترنت للجهاز اللوحي عبر USB"</string>
+    <string name="usb_tethering_subtext" product="default" msgid="3711893746716442706">"‏مشاركة اتصال الإنترنت على الهاتف عبر USB"</string>
+    <string name="usb_tethering_subtext" product="tablet" msgid="2292916486612255069">"‏مشاركة اتصال الإنترنت على الجهاز اللوحي عبر USB"</string>
     <string name="bluetooth_tether_checkbox_text" msgid="2379175828878753652">"ربط البلوتوث"</string>
-    <string name="bluetooth_tethering_subtext" product="tablet" msgid="4558227863463153412">"مشاركة اتصال الإنترنت للجهاز اللوحي عبر البلوتوث"</string>
-    <string name="bluetooth_tethering_subtext" product="default" msgid="1055197887836203595">"مشاركة اتصال الإنترنت للهاتف عبر البلوتوث"</string>
-    <string name="bluetooth_tethering_off_subtext_config" msgid="6326877798974938021">"عدم مشاركة اتصال الإنترنت في <xliff:g id="DEVICE_NAME">%1$d</xliff:g> هذا عبر بلوتوث"</string>
+    <string name="bluetooth_tethering_subtext" product="tablet" msgid="8828883800511737077">"مشاركة اتصال الإنترنت على الجهاز اللوحي عبر البلوتوث"</string>
+    <string name="bluetooth_tethering_subtext" product="default" msgid="1904667146601254812">"مشاركة اتصال الإنترنت على الهاتف عبر البلوتوث"</string>
+    <string name="bluetooth_tethering_off_subtext_config" msgid="376389105752995580">"مشاركة اتصال الإنترنت على جهاز <xliff:g id="DEVICE_NAME">%1$d</xliff:g> هذا عبر البلوتوث"</string>
     <string name="bluetooth_tethering_overflow_error" msgid="2135590598511178690">"لا يمكن ربط أكثر من <xliff:g id="MAXCONNECTION">%1$d</xliff:g> من الأجهزة."</string>
     <string name="bluetooth_untether_blank" msgid="2871192409329334813">"سيتم إلغاء ربط <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
-    <string name="tethering_footer_info" msgid="1308462275952345985">"يمكنك استخدام نقطة الاتصال والتوصيل لتوفير اتصال بالإنترنت للأجهزة الأخرى من خلال اتصال بيانات الجوّال. كما يمكن للتطبيقات إنشاء نقطة اتصال لمشاركة المحتوى مع الأجهزة المجاورة."</string>
+    <string name="tethering_footer_info" msgid="7112228674056306147">"يمكنك استخدام نقطة الاتصال والتوصيل لتوفير اتصال بالإنترنت للأجهزة الأخرى من خلال اتصال بيانات الجوّال، كما يمكن للتطبيقات إنشاء نقطة اتصال لمشاركة المحتوى مع الأجهزة المجاورة."</string>
     <string name="tethering_help_button_text" msgid="656117495547173630">"مساعدة"</string>
     <string name="network_settings_title" msgid="2876509814832830757">"شبكة الجوّال"</string>
     <string name="manage_mobile_plan_title" msgid="7630170375010107744">"خطة الجوّال"</string>
@@ -1455,8 +1472,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>
@@ -1494,7 +1511,7 @@
     <string name="location_access_summary" msgid="69031404093194341">"السماح للتطبيقات التي طلبت إذنك باستخدام معلومات موقعك"</string>
     <string name="location_sources_heading" msgid="1278732419851088319">"مصادر الموقع"</string>
     <string name="about_settings" product="tablet" msgid="593457295516533765">"حول الجهاز اللوحي"</string>
-    <string name="about_settings" product="default" msgid="1743378368185371685">"حول الهاتف"</string>
+    <string name="about_settings" product="default" msgid="1743378368185371685">"لمحة عن الهاتف"</string>
     <string name="about_settings" product="emulator" msgid="221313099578564438">"حول الجهاز في وضع المحاكاة"</string>
     <string name="about_settings_summary" msgid="3371517697156165959">"عرض المعلومات القانونية والحالة وإصدار البرنامج"</string>
     <string name="legal_information" msgid="5769301644270604095">"المعلومات القانونية"</string>
@@ -1515,17 +1532,18 @@
     <string name="settings_license_activity_loading" msgid="3337535809093591740">"جارٍ التحميل…"</string>
     <string name="settings_safetylegal_title" msgid="1289483965535937431">"معلومات الأمان"</string>
     <string name="settings_safetylegal_activity_title" msgid="6901214628496951727">"معلومات الأمان"</string>
-    <string name="settings_safetylegal_activity_unreachable" msgid="250674109915859456">"‏ليس لديك اتصال بيانات. لعرض هذه المعلومات الآن، انتقل إلى %s من أي كمبيوتر متصل بالإنترنت."</string>
+    <string name="settings_safetylegal_activity_unreachable" msgid="142307697309858185">"‏ليس لديك اتصال بيانات. لعرض هذه المعلومات الآن، انتقل إلى %s من أي كمبيوتر متصل بالإنترنت."</string>
     <string name="settings_safetylegal_activity_loading" msgid="8059022597639516348">"جارٍ التحميل…"</string>
-    <string name="lockpassword_choose_your_password_header" msgid="8624900666929394990">"اختيار كلمة المرور"</string>
-    <string name="lockpassword_choose_your_password_header_for_fingerprint" msgid="6624409510609085450">"لاستخدام بصمة الإصبع، عيّن كلمة مرور"</string>
-    <string name="lockpassword_choose_your_pattern_header" msgid="6949761069941694050">"اختيار نقشك"</string>
-    <string name="lockpassword_choose_your_pattern_header_for_fingerprint" msgid="5901096361617543819">"لاستخدام بصمة الإصبع، عيّن نقشًا"</string>
-    <string name="lockpassword_choose_your_pin_header" msgid="7598849519816138302">"‏اختيار رمز PIN"</string>
-    <string name="lockpassword_choose_your_pin_header_for_fingerprint" msgid="765344692615917183">"لاستخدام بصمة الإصبع، عيّن رقم التعريف الشخصي"</string>
-    <string name="lockpassword_confirm_your_password_header" msgid="6308478184889846633">"تأكيد كلمة مرورك"</string>
+    <string name="lockpassword_choose_your_screen_lock_header" msgid="3872462096767152394">"تعيين قفل شاشة"</string>
+    <string name="lockpassword_choose_your_password_message" msgid="1197569283524841412">"يجب تعيين كلمة مرور لأغراض أمنية"</string>
+    <string name="lockpassword_choose_your_password_header_for_fingerprint" msgid="2541818487015343503">"لاستخدام بصمة الإصبع، عيّن كلمة مرور"</string>
+    <string name="lockpassword_choose_your_pattern_header_for_fingerprint" msgid="7709785406243556723">"لاستخدام بصمة الإصبع، عيّن نقشًا"</string>
+    <string name="lockpassword_choose_your_pin_message" msgid="1875420718677275646">"يجب تعيين رقم تعريف شخصي لأغراض أمنية"</string>
+    <string name="lockpassword_choose_your_pin_header_for_fingerprint" msgid="1549639053195796674">"يُرجى تعيين رقم التعريف الشخصي لاستخدام بصمة الإصبع"</string>
+    <string name="lockpassword_choose_your_pattern_message" msgid="5986983400689720015">"لضمان مستوى الأمان، يُرجى تعيين نقش"</string>
+    <string name="lockpassword_confirm_your_password_header" msgid="1266027268220850931">"أعد إدخال كلمة المرور"</string>
     <string name="lockpassword_confirm_your_pattern_header" msgid="7543433733032330821">"تأكيد نقشك"</string>
-    <string name="lockpassword_confirm_your_pin_header" msgid="49038294648213197">"‏تأكيد رمز PIN"</string>
+    <string name="lockpassword_confirm_your_pin_header" msgid="7744513791910572550">"أعد إدخال رقم التعريف الشخصي"</string>
     <string name="lockpassword_confirm_passwords_dont_match" msgid="5140892109439191415">"كلمات المرور غير متطابقة"</string>
     <string name="lockpassword_confirm_pins_dont_match" msgid="7226244811505606217">"أرقام التعريف الشخصي غير متطابقة"</string>
     <string name="lockpassword_choose_lock_generic_header" msgid="3811438094903786145">"تحديد طريقة إلغاء القفل"</string>
@@ -1544,6 +1562,12 @@
     <string name="lockpassword_strong_auth_required_work_pattern" msgid="3003781907040522053">"استخدام نقش للملف الشخصي للعمل لزيادة الأمان"</string>
     <string name="lockpassword_strong_auth_required_work_pin" msgid="3367491332598821552">"إدخال رقم تعريف شخصي للملف الشخصي للعمل لزيادة الأمان"</string>
     <string name="lockpassword_strong_auth_required_work_password" msgid="8159775129968582940">"إدخال كلمة مرور للملف الشخصي للعمل لزيادة الأمان"</string>
+    <string name="lockpassword_confirm_your_pattern_details_frp" msgid="6757336656791723193">"تم إعادة تعيين هاتفك على إعدادات المصنع. لاستخدام هذا الهاتف، أدخل النقش السابق."</string>
+    <string name="lockpassword_confirm_your_pin_details_frp" msgid="826520613445990470">"تم إعادة تعيين هاتفك على إعدادات المصنع. لاستخدام هذا الهاتف، أدخل رقم التعريف الشخصي السابق."</string>
+    <string name="lockpassword_confirm_your_password_details_frp" msgid="8944081074615739040">"تم إعادة تعيين هاتفك على إعدادات المصنع. لاستخدام هذا الهاتف، أدخل كلمة المرور السابقة."</string>
+    <string name="lockpassword_confirm_your_pattern_header_frp" msgid="2898036091609128286">"التحقق من النقش"</string>
+    <string name="lockpassword_confirm_your_pin_header_frp" msgid="4141601774778898803">"التحقق من رقم التعريف الشخصي"</string>
+    <string name="lockpassword_confirm_your_password_header_frp" msgid="3762615419295360480">"التحقق من كلمة المرور"</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>
@@ -1552,7 +1576,7 @@
     <string name="lockpattern_change_lock_pin_label" msgid="266707138486731661">"‏تغيير رمز PIN لإلغاء التأمين"</string>
     <string name="lockpattern_recording_intro_header" msgid="308287052221942814">"ارسم نقش إلغاء التأمين"</string>
     <string name="lockpattern_recording_intro_footer" msgid="1118579101409152113">"اضغط على \"القائمة\" للمساعدة."</string>
-    <string name="lockpattern_recording_inprogress" msgid="6667844062721656773">"حرر الإصبع عند الانتهاء"</string>
+    <string name="lockpattern_recording_inprogress" msgid="6667844062721656773">"ارفع الإصبع عن الشاشة عند الانتهاء"</string>
     <string name="lockpattern_recording_incorrect_too_short" msgid="1348234155120957561">"صل <xliff:g id="NUMBER">%d</xliff:g> من النقاط على الأقل. أعد المحاولة."</string>
     <string name="lockpattern_pattern_entered_header" msgid="4316818983675591604">"تم تسجيل النقش"</string>
     <string name="lockpattern_need_to_confirm" msgid="8054853451639221265">"ارسم النقش مرة أخرى للتأكيد"</string>
@@ -1593,14 +1617,13 @@
     <string name="install_applications_title" msgid="4987712352256508946">"السماح بكل مصادر التطبيقات"</string>
     <string name="recent_app_category_title" msgid="6673071268966003928">"التطبيقات المفتوحة مؤخرًا"</string>
     <string name="see_all_apps_title" msgid="1317153498074308438">"عرض كل التطبيقات البالغ عددها <xliff:g id="COUNT">%1$d</xliff:g>"</string>
-    <string name="recent_app_summary" msgid="3366446669844932300">"قبل <xliff:g id="TIME">^1</xliff:g>"</string>
     <string name="install_all_warning" product="tablet" msgid="8310489909586138165">"جهازك اللوحي والبيانات الشخصية عُرضة لهجمات أكثر من قِبل تطبيقات غير معروفة. يعني تثبيت التطبيقات من هذا المصدر أنك توافق على تحملك المسؤولية عن أي ضرر يحدث لجهازك اللوحي أو أي فقد للبيانات ينتج عن استخدامها."</string>
     <string name="install_all_warning" product="default" msgid="1952257127370115988">"هاتفك والبيانات الشخصية عُرضة للهجمات من قِبل تطبيقات غير معروفة. يعني تثبيت التطبيقات من هذا المصدر أنك توافق على تحملك المسؤولية عن أي ضرر يحدث لهاتفك أو أي فقد للبيانات ينتج عن استخدامها."</string>
     <string name="advanced_settings" msgid="1777249286757067969">"الإعدادات المتقدمة"</string>
     <string name="advanced_settings_summary" msgid="4016682978071086747">"تمكين المزيد من خيارات الإعدادات."</string>
     <string name="application_info_label" msgid="5736524913065714880">"عن التطبيق"</string>
     <string name="storage_label" msgid="8700867073480107253">"التخزين"</string>
-    <string name="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>
@@ -1646,7 +1669,7 @@
     <string name="default_emergency_app" msgid="1951760659640369980">"تطبيق الطوارئ"</string>
     <string name="reset_app_preferences" msgid="1321050641018356925">"إعادة تعيين تفضيلات التطبيقات"</string>
     <string name="reset_app_preferences_title" msgid="6093179367325336662">"هل تريد إعادة تعيين تفضيلات التطبيقات؟"</string>
-    <string name="reset_app_preferences_desc" msgid="4822447731869201512">"سيؤدي هذا إلى إعادة تعيين كل التفضيلات لما يلي:\n\n "<li>"التطبيقات المعطلة"</li>\n" "<li>"إشعارات التطبيقات المعطلة"</li>\n" "<li>"التطبيقات الافتراضية للإجراءات"</li>\n" "<li>"قيود البيانات الخلفية للتطبيقات"</li>\n" "<li>"أي قيود أذونات"</li>\n\n" لن تفقد أي بيانات للتطبيقات."</string>
+    <string name="reset_app_preferences_desc" msgid="4822447731869201512">"سيؤدي هذا إلى إعادة تعيين كل التفضيلات لما يلي:\n\n "<li>"التطبيقات المعطلة"</li>\n" "<li>"إشعارات التطبيقات المعطلة"</li>\n" "<li>"التطبيقات التلقائية للإجراءات"</li>\n" "<li>"القيود على البيانات الخلفية للتطبيقات"</li>\n" "<li>"القيود على الأذونات"</li>\n\n" لن تفقد أي بيانات للتطبيقات."</string>
     <string name="reset_app_preferences_button" msgid="2559089511841281242">"إعادة تعيين التطبيقات"</string>
     <string name="manage_space_text" msgid="8852711522447794676">"إدارة المساحة"</string>
     <string name="filter" msgid="2018011724373033887">"تصفية"</string>
@@ -1719,7 +1742,6 @@
     <string name="app_install_details_title" msgid="6905279702654975207">"تفاصيل التطبيق"</string>
     <string name="app_install_details_summary" msgid="6464796332049327547">"التطبيق المثبَّت من <xliff:g id="APP_STORE">%1$s</xliff:g>"</string>
     <string name="instant_app_details_summary" msgid="4529934403276907045">"المزيد من المعلومات على <xliff:g id="APP_STORE">%1$s</xliff:g>"</string>
-    <string name="app_ops_settings" msgid="5108481883575527511">"عمليات التطبيق"</string>
     <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>
@@ -1771,6 +1793,7 @@
     <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_empty_list_user_restricted" msgid="5984015900102140696">"ليس لديك إذن بتغيير لغة الجهاز."</string>
     <string name="language_keyboard_settings_title" msgid="3709159207482544398">"اللغات والإدخال"</string>
     <string name="input_assistance" msgid="7577795275222555487">"المساعدة في الإدخال"</string>
     <string name="keyboard_settings_category" msgid="8275523930352487827">"لوحة المفاتيح وأساليب الإدخال"</string>
@@ -1798,7 +1821,7 @@
     <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>
@@ -1806,7 +1829,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>
@@ -1861,7 +1884,7 @@
     <string name="accessibility_settings_summary" msgid="981260486011624939">"أجهزة قارئ الشاشة، والعرض، وعناصر التحكم التفاعلية"</string>
     <string name="vision_settings_title" msgid="4204111425716868288">"إعدادات الرؤية"</string>
     <string name="vision_settings_description" msgid="5679491180156408260">"يمكنك تخصيص هذا الجهاز للتوافق مع احتياجاتك. ويمكن تغيير ميزات إمكانية الوصول هذه لاحقًا من خلال الإعدادات."</string>
-    <string name="vision_settings_suggestion_title" msgid="917294957154878441">"زيادة حجم الخط"</string>
+    <string name="vision_settings_suggestion_title" msgid="8058794060304707004">"تغيير حجم الخط"</string>
     <string name="screen_reader_category_title" msgid="7739154903913400641">"أجهزة قارئ الشاشة"</string>
     <string name="audio_and_captions_category_title" msgid="3420727114421447524">"الصوت والنص على الشاشة"</string>
     <string name="display_category_title" msgid="685461049938269166">"العرض"</string>
@@ -1898,7 +1921,6 @@
     <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="preference_summary_default_combination" msgid="8532964268242666060">"<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>
@@ -1963,7 +1985,7 @@
     <string name="captioning_typeface" msgid="1826169240566563259">"مجموعة الخطوط"</string>
     <string name="captioning_preview_text" msgid="4067935959797375065">"ستبدو الترجمة والشرح بالشكل التالي"</string>
     <string name="captioning_preview_characters" msgid="7105909138497851769">"Aa"</string>
-    <string name="locale_default" msgid="2593883646136326969">"افتراضي"</string>
+    <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>
@@ -2045,12 +2067,14 @@
     <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_whitelisted" msgid="7375400051141016808">"يتعذَّر تحسين التطبيق من حيث نسبة استهلاكه للبطارية"</string>
+    <string name="background_activity_warning_dialog_title" msgid="2216249969149568871">"هل تريد وضع حد لنشاط التطبيق في الخلفية؟"</string>
+    <string name="background_activity_warning_dialog_text" msgid="7049624449246121981">"قد يتأثر أداء أحد التطبيقات سلبًا في حالة وضع حد لنشاطه في الخلفية"</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" msgid="6393929085382334341">"استخدام التطبيق منذ الشحن الكامل (<xliff:g id="RELATIVE_TIME">^1</xliff:g>)"</string>
+    <string name="power_usage_list_summary_device" msgid="4461926045610455423">"استخدام الجهاز منذ الشحن الكامل (<xliff:g id="RELATIVE_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>
@@ -2214,19 +2238,11 @@
     <string name="services_subtitle" msgid="4296402367067266425">"الخدمات"</string>
     <string name="menu_proc_stats_duration" msgid="2323483592994720196">"المدة"</string>
     <string name="mem_details_title" msgid="6548392825497290498">"تفاصيل الذاكرة"</string>
-    <string name="mem_state_subtitle" msgid="2407238869781011933">"إحصاءات الذاكرة"</string>
-    <string name="mem_use_subtitle" msgid="7319468770222422412">"استخدام الذاكرة"</string>
-    <string name="mem_use_kernel_type" msgid="8698327165935012484">"Kernel"</string>
-    <string name="mem_use_native_type" msgid="5976704902328347400">"أصلية"</string>
-    <string name="mem_use_kernel_cache_type" msgid="6411475064463957513">"‏وحدات ذاكرة تخزين Kernel مؤقتة"</string>
-    <string name="mem_use_zram_type" msgid="9087217476795358232">"‏تبديل ZRam"</string>
-    <string name="mem_use_free_type" msgid="717708548454880840">"مجانًا"</string>
-    <string name="mem_use_total" msgid="6308786055749777934">"الإجمالي"</string>
     <string name="menu_duration_3h" msgid="4714866438374738385">"٣ ساعات"</string>
     <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>
@@ -2296,14 +2312,14 @@
     <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">"يجب أن تتألف كلمة المرور من ٨ أحرف على الأقل."</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_configure_lock_screen_hint" msgid="8058230497337529036">"قبل أن تتمكن من استخدام وحدة تخزين بيانات الاعتماد، يلزم تعيين شاشة تأمين آمنة لجهازك"</string>
+    <string name="credentials_configure_lock_screen_button" msgid="253239765216055321">"تعيين القفل"</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>
@@ -2378,7 +2394,7 @@
     <string name="accessibility_sync_disabled" msgid="1741194106479011384">"تم تعطيل المزامنة"</string>
     <string name="accessibility_sync_in_progress" msgid="4501160520879902723">"جارٍ المزامنة"</string>
     <string name="accessibility_sync_error" msgid="8703299118794272041">"خطأ في المزامنة"</string>
-    <string name="sync_failed" msgid="1696499856374109647">"أخفقت المزامنة"</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="sync_is_failing" msgid="1591561768344128377">"تواجه المزامنة حاليًا بعض المشاكل. وسوف تكون متاحة خلال وقت قصير."</string>
@@ -2423,8 +2439,6 @@
     <skip />
     <string name="cant_sync_dialog_title" msgid="2777238588398046285">"لا يمكن المزامنة يدويًا"</string>
     <string name="cant_sync_dialog_message" msgid="1938380442159016449">"مزامنة هذا العنصر معطّلة في الوقت الحالي. لتغيير هذا الإعداد، شغّل بشكل مؤقت بيانات الخلفية والمزامنة التلقائية."</string>
-    <string name="wimax_settings" msgid="2655139497028469039">"الجيل الرابع"</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>
@@ -2438,13 +2452,14 @@
     <string name="misc_files_selected_count" msgid="4647048020823912088">"تم تحديد <xliff:g id="NUMBER">%1$d</xliff:g> من إجمالي <xliff:g id="TOTAL">%2$d</xliff:g>"</string>
     <string name="misc_files_selected_count_bytes" msgid="2876232009069114352">"<xliff:g id="NUMBER">%1$s</xliff:g> من إجمالي <xliff:g id="TOTAL">%2$s</xliff:g>"</string>
     <string name="select_all" msgid="1562774643280376715">"تحديد الكل"</string>
+    <string name="data_plan_usage_manage_plans_button_text" msgid="8997761990902708162">"إدارة الخطط"</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_data_limit" msgid="1193930999713192703">"ضبط حد البيانات"</string>
     <string name="data_usage_cycle" msgid="5652529796195787949">"دورة استخدام البيانات"</string>
     <string name="data_usage_app_items_header_text" msgid="5017850810459372828">"استخدام التطبيق"</string>
     <string name="data_usage_menu_roaming" msgid="8042359966835203296">"تجوال البيانات"</string>
@@ -2481,7 +2496,7 @@
     <string name="data_usage_tab_3g" msgid="6092169523081538718">"الجيل الثاني والثالث"</string>
     <string name="data_usage_list_mobile" msgid="5588685410495019866">"الجوال"</string>
     <string name="data_usage_list_none" msgid="3933892774251050735">"لا شيء"</string>
-    <string name="data_usage_enable_mobile" msgid="986782622560157977">"بيانات الجوال"</string>
+    <string name="data_usage_enable_mobile" msgid="986782622560157977">"بيانات الجوّال"</string>
     <string name="data_usage_enable_3g" msgid="6304006671869578254">"بيانات الجيل الثاني والثالث"</string>
     <string name="data_usage_enable_4g" msgid="3635854097335036738">"بيانات شبكة الجيل الرابع"</string>
     <string name="data_usage_forground_label" msgid="7654319010655983591">"البيانات الأمامية:"</string>
@@ -2495,14 +2510,14 @@
     <string name="data_usage_restrict_denied_dialog" msgid="55012417305745608">"تقييد بيانات الخلفية ممكن فقط إذا عيّنت حدًا أقصى لبيانات الجوال."</string>
     <string name="data_usage_auto_sync_on_dialog_title" msgid="2438617846762244389">"تشغيل مزامنة البيانات تلقائيًا؟"</string>
     <string name="data_usage_auto_sync_on_dialog" product="tablet" msgid="8581983093524041669">"‏سيتم نسخ أية تغييرات تجريها على حساباتك على الويب إلى جهازك اللوحي تلقائيًا.\n\nويمكن أن تنسخ بعض الحسابات أيضًا أية تغييرات تجريها على الجهاز اللوحي إلى الويب تلقائيًا. يعمل حساب Google بهذه الطريقة."</string>
-    <string name="data_usage_auto_sync_on_dialog" product="default" msgid="8651376294887142858">"‏سيتم نسخ أية تغييرات تجريها على حساباتك على الويب إلى هاتفك تلقائيًا.\n\nويمكن أن تنسخ بعض الحسابات أيضًا أية تغييرات تجريها على الهاتف إلى الويب تلقائيًا. يعمل حساب Google بهذه الطريقة."</string>
+    <string name="data_usage_auto_sync_on_dialog" product="default" msgid="8651376294887142858">"‏سيتم نسخ أي تغييرات تجريها على حساباتك على الويب إلى هاتفك تلقائيًا.\n\nوقد تعمل بعض الحسابات أيضًا على نسخ التغييرات التي تجريها على الهاتف إلى الويب تلقائيًا، فهذه هي طريقة عمل حساب Google."</string>
     <string name="data_usage_auto_sync_off_dialog_title" msgid="9013139130490125793">"إيقاف مزامنة البيانات تلقائيًا؟"</string>
     <string name="data_usage_auto_sync_off_dialog" msgid="4025938250775413864">"سيؤدي هذا إلى الحفاظ على استخدام البيانات والبطارية، ولكنك ستحتاج إلى مزامنة كل حساب يدويًا لجمع المعلومات الحديثة. ولن تتلقى إشعارات عند حدوث التحديثات."</string>
-    <string name="data_usage_cycle_editor_title" msgid="1373797281540188533">"تاريخ إعادة تعيين دورة الاستخدام"</string>
+    <string name="data_usage_cycle_editor_title" msgid="1373797281540188533">"تاريخ إعادة ضبط دورة الاستخدام"</string>
     <string name="data_usage_cycle_editor_subtitle" msgid="5512903797979928416">"تاريخ كل شهر:"</string>
     <string name="data_usage_cycle_editor_positive" msgid="8821760330497941117">"تعيين"</string>
-    <string name="data_usage_warning_editor_title" msgid="3704136912240060339">"تعيين تحذير استخدام البيانات"</string>
-    <string name="data_usage_limit_editor_title" msgid="9153595142385030015">"تعيين حد استخدام البيانات"</string>
+    <string name="data_usage_warning_editor_title" msgid="3704136912240060339">"ضبط تحذيرات استخدام البيانات"</string>
+    <string name="data_usage_limit_editor_title" msgid="9153595142385030015">"ضبط حد استخدام البيانات"</string>
     <string name="data_usage_limit_dialog_title" msgid="3023111643632996097">"وضع حد لاستخدام البيانات"</string>
     <string name="data_usage_limit_dialog_mobile" product="tablet" msgid="4983487893343645667">"سيُوقف جهازك اللوحي بيانات الجوال بعد الوصول إلى الحد الذي عيّنته.\n\nونظرًا لقياس جهازك اللوحي لاستخدام البيانات في حين قد يحاسبك مشغل شبكة الجوال على الاستخدام بطريقة مختلفة، فإننا ننصحك بتعيين حد معتدل."</string>
     <string name="data_usage_limit_dialog_mobile" product="default" msgid="3926320594049434225">"سيُوقف هاتفك بيانات الجوال بعد الوصول إلى الحد الذي عيّنته.\n\nونظرًا لقياس هاتفك لاستخدام البيانات في حين قد يحاسبك مشغل شبكة الجوال على الاستخدام بطريقة مختلفة، فإننا ننصحك بتعيين حد معتدل."</string>
@@ -2519,10 +2534,13 @@
     <string name="data_usage_total_during_range_mobile" product="tablet" msgid="1925687342154538972">"<xliff:g id="RANGE">%2$s</xliff:g>: تم استخدام <xliff:g id="TOTAL">%1$s</xliff:g> تقريبًا، وفقًا لحساب الجهاز اللوحي. قد يختلف حساب استخدام البيانات لدى مشغل شبكة الجوال."</string>
     <string name="data_usage_total_during_range_mobile" product="default" msgid="5063981061103812900">"<xliff:g id="RANGE">%2$s</xliff:g>: تم استخدام <xliff:g id="TOTAL">%1$s</xliff:g> تقريبًا، وفقًا لحساب الهاتف. قد يختلف حساب استخدام البيانات لدى مشغل شبكة الجوال."</string>
     <string name="data_usage_metered_title" msgid="7383175371006596441">"قيود الشبكات"</string>
-    <string name="data_usage_metered_body" msgid="7655851702771342507">"يتم التعامل مع الشبكات الخاضعة للقياس مثل شبكات الجوال عند تقييد بيانات الخلفية. وقد يردك تحذير من التطبيقات قبل استخدام هذه الشبكات مع التنزيلات الكبيرة."</string>
+    <string name="data_usage_metered_body" msgid="7655851702771342507">"يتم التعامل مع الشبكات الخاضعة للقياس مثل التعامل مع شبكات الجوّال عند تقييد بيانات الخلفية. وقد يردك تحذير من التطبيقات قبل استخدام هذه الشبكات مع التنزيلات الكبيرة."</string>
     <string name="data_usage_metered_mobile" msgid="5423305619126978393">"شبكات الجوال"</string>
     <string name="data_usage_metered_wifi" msgid="1761738002328299714">"‏شبكات Wi-Fi الخاضعة للقياس"</string>
-    <string name="data_usage_metered_wifi_disabled" msgid="727808462375941567">"‏لتحديد شبكات خاضعة للقياس، مكِّن Wi-Fi."</string>
+    <string name="data_usage_metered_wifi_disabled" msgid="727808462375941567">"‏لاختيار شبكات خاضعة للقياس، يُرجى تشغيل Wi-Fi."</string>
+    <string name="data_usage_metered_auto" msgid="1262028400911918865">"تلقائي"</string>
+    <string name="data_usage_metered_yes" msgid="9217539611385225894">"بقياس"</string>
+    <string name="data_usage_metered_no" msgid="4025232961929071789">"بدون قياس"</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>
@@ -2565,8 +2583,8 @@
     <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_first_always_on_vpn_message" msgid="7144543717673197102">"‏عند تشغيل هذا الإعداد، لن تتمكن من الاتصال بالإنترنت إلا بعد أن ينجح اتصال الشبكة الافتراضية الخاصة (VPN)"</string>
+    <string name="vpn_replace_always_on_vpn_enable_message" msgid="798121133114824006">"‏سيتم استبدال شبكتك الافتراضية الخاصة (VPN) الحالية ولن تتمكن من الاتصال بالإنترنت إلا بعد أن ينجح اتصال الشبكة الافتراضية الخاصة (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>
@@ -2577,7 +2595,7 @@
     <string name="vpn_menu_edit" msgid="408275284159243490">"تعديل الملف الشخصي"</string>
     <string name="vpn_menu_delete" msgid="8098021690546891414">"حذف الملف الشخصي"</string>
     <string name="vpn_menu_lockdown" msgid="7863024538064268139">"‏شبكة افتراضية خاصة (VPN) دائمة التشغيل"</string>
-    <string name="vpn_no_vpns_added" msgid="5002741367858707244">"‏لم تتم إضافة أية شبكات افتراضية خاصة (VPN)"</string>
+    <string name="vpn_no_vpns_added" msgid="5002741367858707244">"‏لم تتم إضافة أي شبكات افتراضية خاصة (VPN)"</string>
     <string name="vpn_always_on_summary" msgid="2821344524094363617">"‏متابعة الاتصال بشبكة VPN في جميع الأوقات"</string>
     <string name="vpn_always_on_summary_not_supported" msgid="592304911378771510">"عدم التوافق مع هذا التطبيق"</string>
     <string name="vpn_always_on_summary_active" msgid="8800736191241875669">"تنشيط التشغيل دائمًا"</string>
@@ -2614,9 +2632,6 @@
     <string name="backup_pw_set_button_text" msgid="2387480910044648795">"تعيين كلمة مرور النسخة الاحتياطية"</string>
     <string name="backup_pw_cancel_button_text" msgid="8845630125391744615">"إلغاء"</string>
     <string name="additional_system_update_settings_list_item_title" msgid="214987609894661992">"تحديثات إضافية للنظام"</string>
-    <string name="selinux_status_disabled" msgid="924551035552323327">"معطّل"</string>
-    <string name="selinux_status_permissive" msgid="6004965534713398778">"متساهل"</string>
-    <string name="selinux_status_enforcing" msgid="2252703756208463329">"فرض"</string>
     <string name="ssl_ca_cert_warning" msgid="2045866713601984673">"قد تكون الشبكة خاضعة للمراقبة"</string>
     <string name="done_button" msgid="1991471253042622230">"تم"</string>
     <plurals name="ssl_ca_cert_dialog_title" formatted="false" msgid="7145092748045794650">
@@ -2645,12 +2660,12 @@
     </plurals>
     <string name="ssl_ca_cert_warning_message" msgid="8216218659139190498">"يُمكن لأي جهة خارجية مراقبة نشاط الشبكة، بما في ذلك الرسائل الإلكترونية والتطبيقات ومواقع الويب الآمنة.\n\nويُمكن لبيانات اعتماد موثوقة ومثبتة على جهاز الكمبيوتر إتاحة إجراء ذلك."</string>
     <plurals name="ssl_ca_cert_settings_button" formatted="false" msgid="2426799352517325228">
-      <item quantity="zero">الاطلاع على الشهادات</item>
-      <item quantity="two">الاطلاع على الشهادتين</item>
-      <item quantity="few">الاطلاع على الشهادات</item>
-      <item quantity="many">الاطلاع على الشهادات</item>
-      <item quantity="other">الاطلاع على الشهادات</item>
-      <item quantity="one">الاطلاع على الشهادة</item>
+      <item quantity="zero">الاطّلاع على الشهادات</item>
+      <item quantity="two">الاطّلاع على الشهادتين</item>
+      <item quantity="few">الاطّلاع على الشهادات</item>
+      <item quantity="many">الاطّلاع على الشهادات</item>
+      <item quantity="other">الاطّلاع على الشهادات</item>
+      <item quantity="one">الاطّلاع على الشهادة</item>
     </plurals>
     <string name="user_settings_title" msgid="6151874007858148344">"المستخدمون"</string>
     <string name="user_list_title" msgid="7937158411137563543">"المستخدمون والملفات الشخصية"</string>
@@ -2675,7 +2690,7 @@
     <string name="user_add_user_message_long" msgid="8562152293752222985">"‏يمكنك مشاركة هذا الجهاز مع الآخرين من خلال إنشاء حسابات لمستخدمين إضافيين. وسيحصل كل مستخدم على مساحته الخاصة التي يمكنه تخصيصها بتطبيقاته وخلفياته التي يريدها وغيرها. كما يمكن للمستخدمين أيضًا ضبط إعدادات الجهاز مثل Wi-Fi والتي تؤثر في جميع المستخدمين.\n\nعند إضافة مستخدم جديد، يجب عليه إعداد مساحته.\n\nيمكن لأي مستخدم تحديث التطبيقات لجميع المستخدمين الآخرين."</string>
     <string name="user_add_user_message_short" msgid="1511354412249044381">"عند إضافة مستخدم جديد، فإنه يلزمه إعداد مساحته.\n\nويمكن لأي مستخدم تحديث التطبيقات لجميع المستخدمين الآخرين."</string>
     <string name="user_setup_dialog_title" msgid="1765794166801864563">"هل تريد إعداد المستخدم الآن؟"</string>
-    <string name="user_setup_dialog_message" msgid="1004068621380867148">"تأكد أن الشخص متاح لأخذ جهازه وإعداد مساحته."</string>
+    <string name="user_setup_dialog_message" msgid="1004068621380867148">"يُرجى التأكّد من أن الشخص يمكنه استخدام الجهاز الآن وإعداد مساحته."</string>
     <string name="user_setup_profile_dialog_message" msgid="3896568553327558731">"هل ترغب في إعداد ملف شخصي الآن؟"</string>
     <string name="user_setup_button_setup_now" msgid="3391388430158437629">"الإعداد الآن"</string>
     <string name="user_setup_button_setup_later" msgid="3068729597269172401">"ليس الآن"</string>
@@ -2699,7 +2714,7 @@
     <string name="user_adding_new_user" msgid="1521674650874241407">"جارٍ إضافة مستخدم جديد..."</string>
     <string name="user_delete_user_description" msgid="3158592592118767056">"حذف مستخدم"</string>
     <string name="user_delete_button" msgid="5131259553799403201">"حذف"</string>
-    <string name="user_guest" msgid="8475274842845401871">"مدعو"</string>
+    <string name="user_guest" msgid="8475274842845401871">"ضيف"</string>
     <string name="user_exit_guest_title" msgid="5613997155527410675">"إزالة جلسة الضيف"</string>
     <string name="user_exit_guest_confirm_title" msgid="3405527634738147409">"هل تريد إزالة جلسة الضيف؟"</string>
     <string name="user_exit_guest_confirm_message" msgid="2194459201944413257">"سيتم حذف كل التطبيقات والبيانات في هذه الجلسة."</string>
@@ -2792,7 +2807,7 @@
     <string name="sim_settings_summary" msgid="4050372057097516088">"<xliff:g id="SIM_NAME">%1$s</xliff:g> - <xliff:g id="SIM_NUMBER">%2$s</xliff:g>"</string>
     <string name="sim_cards_changed_message" msgid="7900721153345139783">"‏تم تغيير بطاقات SIM"</string>
     <string name="sim_cards_changed_message_summary" msgid="8258058274989383204">"انقر لتعيين الأنشطة."</string>
-    <string name="sim_cellular_data_unavailable" msgid="9109302537004566098">"بيانات الجوال غير متاحة"</string>
+    <string name="sim_cellular_data_unavailable" msgid="9109302537004566098">"بيانات الجوّال غير متاحة"</string>
     <string name="sim_cellular_data_unavailable_summary" msgid="5416535001368135327">"‏انقر لتحديد شريحة SIM للبيانات."</string>
     <string name="sim_calls_always_use" msgid="7936774751250119715">"استخدام هذا للمكالمات دائمًا"</string>
     <string name="select_sim_for_data" msgid="2366081042162853044">"‏تحديد شريحة SIM للبيانات"</string>
@@ -2812,6 +2827,8 @@
     <string name="color_purple" msgid="3888532466427762504">"أرجواني"</string>
     <string name="sim_no_inserted_msg" msgid="210316755353227087">"‏لم يتم إدراج بطاقات SIM"</string>
     <string name="sim_status_title" msgid="6744870675182447160">"‏وضع شريحة SIM"</string>
+    <!-- no translation found for sim_status_title_sim_slot (5725659316463979194) -->
+    <skip />
     <string name="sim_call_back_title" msgid="5181549885999280334">"‏رد الاتصال عبر شريحة SIM الافتراضية"</string>
     <string name="sim_outgoing_call_title" msgid="1019763076116874255">"‏شريحة SIM للمكالمات الصادرة"</string>
     <string name="sim_other_call_settings" msgid="8247802316114482477">"إعدادات المكالمات الأخرى"</string>
@@ -2825,6 +2842,8 @@
     <string name="sim_pref_divider" msgid="6778907671867621874">"‏شريحة SIM المفضلة لـ"</string>
     <string name="sim_calls_ask_first_prefs_title" msgid="7941299533514115976">"طرح السؤال كل مرة"</string>
     <string name="sim_selection_required_pref" msgid="3446721423206414652">"يلزم التحديد"</string>
+    <!-- no translation found for sim_selection_channel_title (2760909074892782589) -->
+    <skip />
     <string name="dashboard_title" msgid="5453710313046681820">"الإعدادات"</string>
     <plurals name="settings_suggestion_header_summary_hidden_items" formatted="false" msgid="5597356221942118048">
       <item quantity="zero">‏عرض %d عنصر مخفي</item>
@@ -2834,7 +2853,8 @@
       <item quantity="other">‏عرض %d عنصر مخفي</item>
       <item quantity="one">‏عرض %d عنصر مخفي</item>
     </plurals>
-    <string name="network_dashboard_title" msgid="4771589228992391573">"الشبكة والإنترنت"</string>
+    <string name="dashboard_suggestion_condition_footer_content_description" msgid="2898588191174845961">"تصغير"</string>
+    <string name="network_dashboard_title" msgid="3135144174846753758">"الشبكة والإنترنت"</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>
@@ -2844,7 +2864,7 @@
     <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>
@@ -2894,13 +2914,21 @@
     <string name="keywords_payment_settings" msgid="5220104934130446416">"دفع، نقر، دفعات"</string>
     <string name="keywords_backup" msgid="470070289135403022">"نسخ احتياطية، نسخة احتياطية"</string>
     <string name="keywords_assist_gesture_launch" msgid="813968759791342591">"إيماءة"</string>
+    <!-- no translation found for keywords_imei_info (7230982940217544527) -->
+    <skip />
+    <!-- no translation found for keywords_sim_status (1474422416860990564) -->
+    <skip />
+    <!-- no translation found for keywords_model_and_hardware (1459248377212829642) -->
+    <skip />
+    <!-- no translation found for keywords_android_version (5591055570309015111) -->
+    <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>
@@ -2912,10 +2940,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>
@@ -2931,18 +2959,24 @@
     <string name="emergency_tone_alert" msgid="8941852695428130667">"تنبيه"</string>
     <string name="emergency_tone_vibrate" msgid="8281126443204950847">"اهتزاز"</string>
     <string name="boot_sounds_title" msgid="567029107382343709">"أصوات تشغيل الجهاز"</string>
-    <string name="zen_mode_settings_summary_off" msgid="1857165567766351925">"لم يتم تشغيل أي قواعد تلقائية"</string>
-    <plurals name="zen_mode_settings_summary_on" formatted="false" msgid="1216562765753405784">
-      <item quantity="zero">تم تشغيل <xliff:g id="ON_COUNT">%d</xliff:g> قاعدة تلقائية</item>
-      <item quantity="two">تم تشغيل قاعدتين تلقائيتين (<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>
-      <item quantity="one">تم تشغيل قاعدة تلقائية واحدة</item>
+    <string name="zen_mode_settings_summary_off" msgid="6119891445378113334">"مطلقًا"</string>
+    <plurals name="zen_mode_settings_summary_on" formatted="false" msgid="7346979080337117366">
+      <item quantity="zero"><xliff:g id="ON_COUNT">%d</xliff:g> قاعدة</item>
+      <item quantity="two">قاعدتان (<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>
+      <item quantity="one">قاعدة واحدة</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_settings_title" msgid="1066226840983908121">"الرجاء عدم الإزعاج"</string>
+    <string name="zen_mode_behavior_settings_title" msgid="1463303933529313969">"السُلوك"</string>
+    <string name="zen_mode_behavior_allow_title" msgid="3845615648136218141">"السماح بالأصوات والاهتزازات من"</string>
+    <string name="zen_mode_behavior_no_sound" msgid="1219626004723208056">"بلا صوت"</string>
+    <string name="zen_mode_behavior_total_silence" msgid="6716603819806610626">"بلا صوت (كتم الصوت تمامًا)"</string>
+    <string name="zen_mode_behavior_no_sound_except" msgid="4968477585788243114">"بلا صوت غير <xliff:g id="CATEGORIES">%1$s</xliff:g>"</string>
+    <string name="zen_mode_behavior_alarms_only" msgid="2423480992071472963">"كتم الصوت باستثناء صوت المنبهات والوسائط وتعليقات النظام (المنبهات فقط)"</string>
+    <string name="zen_mode_automation_settings_title" msgid="2517800938791944915">"التشغيل تلقائيًا"</string>
+    <string name="zen_mode_automation_settings_page_title" msgid="7069221762714457987">"القواعد التلقائية"</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>
@@ -2950,12 +2984,28 @@
     <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_signals_settings_subtitle" msgid="6308824824208120508">"السماح بالإشارات المرئية"</string>
+    <string name="zen_mode_add" msgid="90014394953272517">"إضافة"</string>
+    <!-- no translation found for zen_mode_button_turn_on (5074744714613374902) -->
+    <skip />
+    <!-- no translation found for zen_mode_button_turn_off (1995551537320422792) -->
+    <skip />
+    <!-- no translation found for zen_mode_settings_dnd_manual_end_time_next_day (3090599225533484203) -->
+    <skip />
+    <!-- no translation found for zen_mode_settings_dnd_manual_indefinite (2746903915016850399) -->
+    <skip />
+    <!-- no translation found for zen_mode_settings_dnd_automatic_rule (3856133183910726786) -->
+    <skip />
+    <!-- no translation found for zen_mode_settings_dnd_automatic_rule_app (7112871101701453067) -->
+    <skip />
+    <!-- no translation found for zen_mode_settings_dnd_automatic_rule_multiple (5792308957602984360) -->
+    <skip />
     <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>
-    <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>
@@ -2965,7 +3015,7 @@
     <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>
@@ -2983,13 +3033,15 @@
     <string name="notifications_title" msgid="8086372779371204971">"الإشعارات"</string>
     <string name="app_notifications_title" msgid="5810577805218003760">"إشعارات التطبيقات"</string>
     <string name="notification_channel_title" msgid="2260666541030178452">"فئة الإشعارات"</string>
+    <string name="notification_group_title" msgid="7180506440133859601">"مجموعة فئات الإشعارات"</string>
     <string name="notification_importance_title" msgid="848692592679312666">"الأهمية"</string>
-    <string name="notification_importance_unspecified" msgid="2196023702875112081">"ترك القرار للتطبيق"</string>
+    <string name="notification_importance_unspecified" msgid="6622173510486113958">"السماح بالصوت"</string>
     <string name="notification_importance_blocked" msgid="7938180808339386300">"عدم عرض الإشعارات"</string>
     <string name="notification_importance_min" msgid="5455049524984686275">"من دون تنبيه صوتي أو مرئي"</string>
     <string name="notification_importance_low" msgid="8881468429453766553">"بدون تنبيه صوتي"</string>
     <string name="notification_importance_default" msgid="5958338024601957516">"إصدار تنبيه صوتي"</string>
     <string name="notification_importance_high" msgid="2082429479238228527">"إصدار تنبيه صوتي والظهور بسرعة على الشاشة"</string>
+    <string name="notification_importance_high_silent" msgid="2667033773703765252">"تمييز على الشاشة"</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>
@@ -3036,8 +3088,17 @@
     <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="channel_group_notifications_off_desc" msgid="1620950416247316370">"‏يمنع Android ظهور مجموعة الإشعارات هذه على هذا الجهاز"</string>
     <string name="notification_channels" msgid="5346841743182627500">"الفئات"</string>
     <string name="notification_channels_other" msgid="5645317113885788226">"غير ذلك"</string>
+    <plurals name="notification_group_summary" formatted="false" msgid="3420621520561455358">
+      <item quantity="zero"><xliff:g id="COUNT_1">%d</xliff:g> فئة</item>
+      <item quantity="two">فئتان (<xliff:g id="COUNT_1">%d</xliff:g>)</item>
+      <item quantity="few"><xliff:g id="COUNT_1">%d</xliff:g> فئات</item>
+      <item quantity="many"><xliff:g id="COUNT_1">%d</xliff:g> فئة</item>
+      <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> فئة</item>
+      <item quantity="one">فئة واحدة (<xliff:g id="COUNT_0">%d</xliff:g>)</item>
+    </plurals>
     <string name="no_channels" msgid="3077375508177744586">"لم ينشر هذا التطبيق أي إشعارات"</string>
     <string name="app_settings_link" msgid="8894946007543660906">"الإعدادات الإضافية في التطبيق"</string>
     <string name="app_notification_listing_summary_zero" msgid="6482582965081108108">"تم الإيقاف لجميع التطبيقات"</string>
@@ -3066,7 +3127,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>
@@ -3081,7 +3142,9 @@
     <string name="zen_mode_rule_name" msgid="5149068059383837549">"اسم القاعدة"</string>
     <string name="zen_mode_rule_name_hint" msgid="3781174510556433384">"إدخال اسم القاعدة"</string>
     <string name="zen_mode_rule_name_warning" msgid="4517805381294494314">"اسم القاعدة قيد الاستخدام فعلاً"</string>
-    <string name="zen_mode_add_rule" msgid="7459154136384467057">"إضافة المزيد"</string>
+    <string name="zen_mode_add_rule" msgid="9100929184624317193">"إضافة قاعدة"</string>
+    <string name="zen_mode_add_event_rule" msgid="3997335103633946552">"إضافة قاعدة حدث"</string>
+    <string name="zen_mode_add_time_rule" msgid="5002080000597838703">"إضافة قاعدة زمنية"</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>
@@ -3089,9 +3152,9 @@
     <string name="zen_mode_rule_type" msgid="2289413469580142888">"نوع القاعدة"</string>
     <string name="zen_mode_rule_type_unknown" msgid="3049377282766700600">"غير معروف"</string>
     <string name="zen_mode_configure_rule" msgid="8865785428056490305">"تهيئة القاعدة"</string>
-    <string name="zen_schedule_rule_type_name" msgid="142936744435271449">"قاعدة خاصة بزمن"</string>
+    <string name="zen_schedule_rule_type_name" msgid="6163149826036287324">"الوقت"</string>
     <string name="zen_schedule_rule_enabled_toast" msgid="3379499360390382259">"تم ضبط القاعدة التلقائية على تشغيل وضع \"عدم الإزعاج\" أثناء أوقات محددة"</string>
-    <string name="zen_event_rule_type_name" msgid="2645981990973086797">"قاعدة خاصة بحدث"</string>
+    <string name="zen_event_rule_type_name" msgid="6503468472212606158">"الحدث"</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>
@@ -3120,14 +3183,15 @@
     <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_media_system_other" msgid="8900209390529859777">"الوسائط وتعليقات النظام"</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="239685342222975733">"في حال اتصال الشخص نفسه للمرة الثانية في غضون <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>
@@ -3154,16 +3218,13 @@
     </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_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="zen_mode_screen_on" msgid="8774571998575673502">"عندما تكون الشاشة قيد التشغيل"</string>
+    <string name="zen_mode_screen_on_summary" msgid="5385338884695802115">"السماح للإشعارات التي يتجاهلها وضع \"الرجاء عدم الإزعاج\" بالظهور بسرعة على الشاشة"</string>
+    <string name="zen_mode_screen_off" msgid="3144446765110327937">"عندما تكون الشاشة متوقفة"</string>
+    <string name="zen_mode_screen_off_summary" msgid="7430034620565812258">"السماح للإشعارات التي يتجاهلها وضع \"الرجاء عدم الإزعاج\" بتشغيل الشاشة وإحداث وميض ضوئي"</string>
+    <string name="zen_mode_screen_off_summary_no_led" msgid="2826121465026642017">"السماح للإشعارات التي يتجاهلها وضع \"الرجاء عدم الإزعاج\" بتشغيل الشاشة"</string>
     <string name="notification_app_settings_button" msgid="6685640230371477485">"إعدادات الإشعارات"</string>
+    <string name="suggestion_button_text" msgid="3275010948381252006">"موافق"</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>
@@ -3197,7 +3258,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>
@@ -3259,7 +3320,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>
@@ -3372,6 +3433,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="sms_mirroring_pref" msgid="6475043279147376031">"‏النسخ المطابق لرسائل SMS"</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>
@@ -3419,17 +3481,17 @@
     <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="app_permission_summary_allowed" msgid="1505409933012886711">"مسموح به"</string>
     <string name="app_permission_summary_not_allowed" msgid="2592617058101882802">"غير مسموح به"</string>
@@ -3442,7 +3504,7 @@
     <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="permit_write_settings" msgid="658555006453212691">"السماح بتعديل إعدادات النظام"</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>
@@ -3512,7 +3574,7 @@
     <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 وبلوتوث وشبكة الجوال، ولا يمكنك إجراء مكالمات هاتفية أو الاتصال بالإنترنت."</string>
+    <string name="condition_airplane_summary" msgid="3738805058182535606">"‏تم إيقاف شبكة Wi-Fi والبلوتوث وشبكة الجوّال، ولا يمكنك إجراء مكالمات هاتفية أو الاتصال بالإنترنت."</string>
     <string name="condition_zen_title" msgid="2679168532600816392">"تم تشغيل \"عدم الإزعاج\" (<xliff:g id="ID_1">%1$s</xliff:g>)"</string>
     <string name="condition_battery_title" msgid="3272131008388575349">"تم تشغيل وضع توفير شحن البطارية"</string>
     <string name="condition_battery_summary" msgid="4418839236027977450">"تم خفض مستوى الأداء. تم تعطيل خدمات المواقع وبيانات الخلفية."</string>
@@ -3549,21 +3611,22 @@
     <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="camera_hal_hdrplus_switch" msgid="8377365197105267466">"Camera HAL HDR+‎"</string>
-    <string name="camera_hal_hdrplus_toast" msgid="2063703797270055299">"‏لتطبيق تغيير Camera HAL HDR+‎، يمكنك إعادة تشغيل الجهاز"</string>
+    <string name="connectivity_monitor_switch" msgid="9059759348648583421">"أداة مراقبة إمكانية الاتصال"</string>
+    <string name="connectivity_monitor_switch_summary" msgid="2828658652378866401">"ستجمع أداة مراقبة إمكانية الاتصال سجلات عند اكتشاف مشكلة متعلقة بإمكانية الاتصال وترسل إشعارًا إلى المستخدم لإرسال تقرير بالخطأ"</string>
+    <string name="connectivity_monitor_toast" msgid="5551859612881173028">"يُرجى إعادة تشغيل الجهاز لتطبيق التغيير الذي تم إجراؤه على أداة مراقبة إمكانية الاتصال"</string>
+    <string name="camera_laser_sensor_switch" msgid="8913588990743234440">"مُستشعِر الليزر في الكاميرا"</string>
     <string name="ota_disable_automatic_update" msgid="2319639631655915050">"تحديثات النظام التلقائية"</string>
     <string name="usage" msgid="2977875522080448986">"الاستخدام"</string>
-    <string name="cellular_data_usage" msgid="2155683719898158203">"استخدام بيانات الجوال"</string>
+    <string name="cellular_data_usage" msgid="2155683719898158203">"استخدام بيانات الجوّال"</string>
     <string name="wifi_data_usage" msgid="686754111095324306">"‏استخدام بيانات Wi-Fi"</string>
     <string name="ethernet_data_usage" msgid="5108764537574354616">"استخدام بيانات إيثرنت"</string>
     <string name="wifi" msgid="1081550856200013637">"Wi-Fi"</string>
     <string name="ethernet" msgid="6600095783781389720">"إيثرنت"</string>
-    <string name="cell_data_template" msgid="405684854174361041">"<xliff:g id="AMOUNT">^1</xliff:g> من بيانات الجوال"</string>
+    <string name="cell_data_template" msgid="405684854174361041">"<xliff:g id="AMOUNT">^1</xliff:g> من بيانات الجوّال"</string>
     <string name="wifi_data_template" msgid="6265570748799357386">"‏<xliff:g id="AMOUNT">^1</xliff:g> من بيانات Wi-Fi"</string>
     <string name="ethernet_data_template" msgid="5782476509881033590">"<xliff:g id="AMOUNT">^1</xliff:g> من بيانات إيثرنت"</string>
-    <string name="cell_warning_only" msgid="763147658209027140">"<xliff:g id="ID_1">%1$s</xliff:g> تحذير البيانات"</string>
-    <string name="cell_warning_and_limit" msgid="2273413629267437470">"<xliff:g id="ID_1">%1$s</xliff:g> تحذير البيانات / <xliff:g id="ID_2">%2$s</xliff:g> حد البيانات"</string>
+    <string name="cell_warning_only" msgid="763147658209027140">"<xliff:g id="ID_1">%1$s</xliff:g> تحذيرات البيانات"</string>
+    <string name="cell_warning_and_limit" msgid="2273413629267437470">"<xliff:g id="ID_1">%1$s</xliff:g> تحذيرات البيانات / <xliff:g id="ID_2">%2$s</xliff:g> حد البيانات"</string>
     <string name="billing_cycle" msgid="5169909190811133499">"دورة الفوترة"</string>
     <string name="billing_cycle_fragment_summary" msgid="8231066353654583106">"شهريًا في يوم <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="network_restrictions" msgid="8234695294536675380">"قيود الشبكات"</string>
@@ -3577,11 +3640,11 @@
     </plurals>
     <string name="operator_warning" msgid="1862988028996859195">"قد تختلف طريقة حساب بيانات مشغِّل شبكة الجوّال عن طريقة الحساب على الجهاز"</string>
     <string name="data_used_template" msgid="3245919669966296505">"<xliff:g id="ID_1">%1$s</xliff:g> مستخدم"</string>
-    <string name="set_data_warning" msgid="6115364758236594593">"تعيين تحذير استخدام البيانات"</string>
-    <string name="data_warning" msgid="209133958008062117">"تحذير البيانات"</string>
+    <string name="set_data_warning" msgid="6115364758236594593">"ضبط تحذيرات استخدام البيانات"</string>
+    <string name="data_warning" msgid="209133958008062117">"تحذيرات البيانات"</string>
     <string name="set_data_limit" msgid="2901526323210516923">"تعيين حد البيانات"</string>
     <string name="data_limit" msgid="1885406964934590552">"حد البيانات"</string>
-    <string name="data_usage_template" msgid="392191945602400904">"<xliff:g id="ID_1">%1$s</xliff:g> مستخدم خلال الفترة <xliff:g id="ID_2">%2$s</xliff:g>"</string>
+    <string name="data_usage_template" msgid="2923744765873163859">"<xliff:g id="ID_1">%1$s</xliff:g> مستخدمة خلال <xliff:g id="ID_2">%2$s</xliff:g>"</string>
     <string name="configure" msgid="1029654422228677273">"تهيئة"</string>
     <string name="data_usage_other_apps" msgid="3272872663517382050">"التطبيقات الأخرى المضمّنة في الاستخدام"</string>
     <plurals name="data_saver_unrestricted_summary" formatted="false" msgid="2635267833484232703">
@@ -3599,7 +3662,7 @@
     <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>
@@ -3658,15 +3721,15 @@
     <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="387052719462473500">"التحكم في المعلومات على شاشة التأمين"</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="8483187649355540109">"الدعم والنصائح"</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>
+    <string name="premium_sms_access" msgid="4660047004791638305">"‏إمكانية إرسال رسائل قصيرة SMS مميزة"</string>
+    <string name="bluetooth_disabled" msgid="6244000672828617410">"قيد الإيقاف"</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>
@@ -3724,13 +3787,6 @@
       <item quantity="one">ثانية واحدة</item>
     </plurals>
     <string name="support_estimated_wait_time" msgid="6523081420029378051">"الانتظار <xliff:g id="ESTIMATE">%1$s</xliff:g> تقريبًا"</string>
-    <string name="bluetooth_talkback_computer" msgid="4875089335641234463">"كمبيوتر"</string>
-    <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>
-    <string name="bluetooth_talkback_input_peripheral" msgid="5165842622743212268">"جهاز إدخال طرفي"</string>
-    <string name="bluetooth_talkback_bluetooth" msgid="5615463912185280812">"بلوتوث"</string>
     <string name="automatic_storage_manager_settings" msgid="7819434542155181607">"إدارة سعة التخزين"</string>
     <string name="automatic_storage_manager_text" msgid="4562950476680600604">"للمساعدة في تفريغ مساحة التخزين، يزيل مدير سعة التخزين من جهاز الصور ومقاطع الفيديو التي تم الاحتفاظ بنسخة احتياطية منها."</string>
     <string name="automatic_storage_manager_days_title" msgid="2017913896160914647">"إزالة الصور ومقاطع الفيديو"</string>
@@ -3746,7 +3802,7 @@
     <string name="double_tap_power_for_camera_summary" msgid="242037150983277829">"لفتح الكاميرا سريعًا، يمكنك الضغط على زر التشغيل مرتين. ويعمل ذلك في أي شاشة."</string>
     <string name="double_tap_power_for_camera_suggestion_title" msgid="6500405261202883589">"فتح الكاميرا بسرعة"</string>
     <string name="double_tap_power_for_camera_suggestion_summary" msgid="7010153544554016996">"الضغط على زر التشغيل مرتين لفتح الكاميرا"</string>
-    <string name="double_twist_for_camera_mode_title" msgid="4877834147983530479">"تقليب الكاميرا"</string>
+    <string name="double_twist_for_camera_mode_title" msgid="4877834147983530479">"قلب عدسة الكاميرا"</string>
     <string name="double_twist_for_camera_mode_summary" msgid="122977081337563340"></string>
     <string name="double_twist_for_camera_suggestion_title" msgid="4689410222517954869">"التقاط الصور الذاتية بشكل أسرع"</string>
     <string name="double_twist_for_camera_suggestion_summary" product="default" msgid="447403641027147153">"لف الهاتف مرتين لتشغيل وضع الصورة الذاتية"</string>
@@ -3757,30 +3813,32 @@
     <string name="ambient_display_title" product="device" msgid="3423781975742145894">"انقر نقرًا مزدوجًا للاطلاع على الجهاز"</string>
     <string name="ambient_display_summary" msgid="525662960806416373">"للاطلاع على الوقت ورموز الإشعارات والمعلومات الأخرى، انقر نقرًا مزدوجًا على الشاشة."</string>
     <string name="ambient_display_suggestion_summary" msgid="5987443721392571847">"التحقق من الإشعارات عند إيقاف الشاشة"</string>
-    <string name="ambient_display_pickup_title" product="default" msgid="818688002837687268">"يمكنك حمل الهاتف للاطلاع عليه"</string>
+    <string name="ambient_display_pickup_title" product="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="4567020486787561873">"للاطلاع على الوقت ورموز الإشعارات والمعلومات الأخرى، اختر هاتفك."</string>
+    <string name="ambient_display_pickup_summary" product="default" msgid="4567020486787561873">"ما عليك سوى حمل هاتفك للاطّلاع على الوقت ورموز الإشعارات والمعلومات الأخرى."</string>
     <string name="ambient_display_pickup_summary" product="tablet" msgid="5435283849947236648">"للاطلاع على الوقت ورموز الإشعارات والمعلومات الأخرى، اختر جهازك اللوحي."</string>
-    <string name="ambient_display_pickup_summary" product="device" msgid="8256669101643381568">"للاطلاع على الوقت ورموز الإشعارات والمعلومات الأخرى، اختر جهازك."</string>
+    <string name="ambient_display_pickup_summary" product="device" msgid="8256669101643381568">"للاطلاع على الوقت ورموز الإشعارات والمعلومات الأخرى، يمكنك إلقاء نظرة على جهازك."</string>
     <string name="ambient_display_pickup_suggestion_summary" msgid="7014700589991761035">"التحقق من الإشعارات عند إيقاف الشاشة"</string>
     <string name="fingerprint_swipe_for_notifications_title" msgid="5816346492253270243">"تمرير البصمة للحصول على الإشعارات"</string>
-    <string name="fingerprint_swipe_for_notifications_summary" product="default" msgid="1770661868393713922">"للاطلاع على الإشعارات، مرر سريعًا للأسفل على مستشعر بصمات الإصبع على الجزء الخلفي لهاتفك."</string>
-    <string name="fingerprint_swipe_for_notifications_summary" product="tablet" msgid="902719947767712895">"للاطلاع على الإشعارات، مرر سريعًا للأسفل على مستشعر بصمات الإصبع على الجزء الخلفي من جهازك اللوحي."</string>
-    <string name="fingerprint_swipe_for_notifications_summary" product="device" msgid="5372926094116306647">"للاطلاع على الإشعارات، مرر سريعًا للأسفل على مستشعر بصمات الإصبع على الجزء الخلفي من جهازك."</string>
-    <string name="fingerprint_swipe_for_notifications_suggestion_title" msgid="1677291167470357802">"الاطلاع على الإشعارات بسرعة"</string>
+    <string name="fingerprint_gesture_screen_title" msgid="8562169633234041196">"تمرير سريع لبصمة الإصبع"</string>
+    <string name="fingerprint_swipe_for_notifications_summary" product="default" msgid="1770661868393713922">"للاطّلاع على الإشعارات، مرّر سريعًا للأسفل على مستشعر بصمات الإصبع على الجزء الخلفي لهاتفك."</string>
+    <string name="fingerprint_swipe_for_notifications_summary" product="tablet" msgid="902719947767712895">"للاطّلاع على الإشعارات، مرّر سريعًا للأسفل على مستشعر بصمات الإصبع على الجزء الخلفي من جهازك اللوحي."</string>
+    <string name="fingerprint_swipe_for_notifications_summary" product="device" msgid="5372926094116306647">"للاطّلاع على الإشعارات، مرّر سريعًا للأسفل على مستشعر بصمات الإصبع على الجزء الخلفي من جهازك."</string>
+    <string name="fingerprint_swipe_for_notifications_suggestion_title" msgid="1677291167470357802">"الاطّلاع على الإشعارات بسرعة"</string>
     <string name="fingerprint_swipe_for_notifications_suggestion_summary" msgid="127592803294414082">"تمرير سريع لأسفل على مستشعر بصمات الإصبع"</string>
     <string name="gesture_setting_on" msgid="3455094265233870280">"تشغيل"</string>
     <string name="gesture_setting_off" msgid="5230169535435881894">"إيقاف"</string>
     <string name="oem_unlock_enable_disabled_summary_bootloader_unlocked" msgid="4265541229765635629">"تم إلغاء قفل برنامج التحميل مسبقاً"</string>
-    <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" msgid="3361344735430813695">"الاتصال بالإنترنت أولاً"</string>
+    <string name="oem_unlock_enable_disabled_summary_connectivity_or_locked" msgid="2479038689567925511">"الاتصال بالإنترنت أو الاتصال بمشغِّل شبكة الجوّال"</string>
     <string name="oem_unlock_enable_disabled_summary_sim_locked_device" msgid="4149387448213399630">"عدم التوفر على الأجهزة التي يقفلها مشغل شبكة الجوال"</string>
+    <string name="oem_lock_info_message" msgid="9218313722236417510">"يُرجى إعادة تشغيل الجهاز لتمكين ميزة حماية الجهاز."</string>
     <string name="automatic_storage_manager_freed_bytes" msgid="7517560170441007788">"تمت إتاحة <xliff:g id="SIZE">%1$s</xliff:g> كإجمالي\n\nتم تنفيذ العملية آخر مرة في <xliff:g id="DATE">%2$s</xliff:g>"</string>
     <string name="web_action_enable_title" msgid="4051513950976670853">"التطبيقات الفورية"</string>
     <string name="web_action_enable_summary" msgid="3108127559723396382">"فتح الروابط في التطبيقات، حتى إذا لم تكن التطبيقات مثبّتة"</string>
     <string name="web_action_section_title" msgid="7364647086538399136">"التطبيقات الفورية"</string>
-    <string name="instant_apps_account" msgid="1433620209791992528">"حساب التطبيقات الفورية"</string>
+    <string name="instant_apps_settings" msgid="8827777916518348213">"تفضيلات التطبيقات الفورية"</string>
     <string name="domain_url_section_title" msgid="7046835219056428883">"التطبيقات المثبَّتة"</string>
     <string name="automatic_storage_manager_activation_warning" msgid="6353100011690933254">"تتم إدارة السعة التخزينية لجهازك الآن عن طريق مدير السعة التخزينية"</string>
     <string name="account_for_section_header" msgid="5356566418548737121">"حسابات <xliff:g id="USER_NAME">%1$s</xliff:g>"</string>
@@ -3797,7 +3855,7 @@
     <string name="enterprise_privacy_settings_summary_generic" msgid="5853292305730761128">"تتولى مؤسستك إدارة التغييرات والإعدادات."</string>
     <string name="enterprise_privacy_settings_summary_with_name" msgid="4266234968317996188">"تتولى <xliff:g id="ORGANIZATION_NAME">%s</xliff:g> إدارة التغييرات والإعدادات."</string>
     <string name="enterprise_privacy_header" msgid="7402406406883832509">"لتوفير إمكانية الوصول إلى بيانات العمل، يمكن لمؤسستك تغيير الإعدادات وتثبيت برنامج على جهازك.\n\nلمعرفة مزيد من التفاصيل، يمكنك الاتصال بمشرف المؤسسة."</string>
-    <string name="enterprise_privacy_exposure_category" msgid="7313392680107938517">"أنواع المعلومات التي يمكن لمؤسستك الاطلاع عليها"</string>
+    <string name="enterprise_privacy_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>
@@ -3820,7 +3878,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>
@@ -3835,7 +3893,9 @@
     <string name="enterprise_privacy_always_on_vpn_personal" msgid="9217774730260037434">"‏تم تشغيل إعداد \"شبكة افتراضية خاصة (VPN) دائمة التشغيل\" في الملف الشخصي"</string>
     <string name="enterprise_privacy_always_on_vpn_work" msgid="7244472958208315814">"‏تم تشغيل \"شبكة افتراضية خاصة (VPN) دائمة التشغيل\" في الملف الشخصي للعمل"</string>
     <string name="enterprise_privacy_global_http_proxy" msgid="7936664553416257333">"‏تم تعيين الخادم الوكيل HTTP العام"</string>
-    <string name="enterprise_privacy_ca_certs" msgid="5885892204903688909">"بيانات اعتماد موثوقة"</string>
+    <string name="enterprise_privacy_ca_certs_device" msgid="2019652712782510262">"بيانات اعتماد موثوقة"</string>
+    <string name="enterprise_privacy_ca_certs_personal" msgid="2279084820904076599">"بيانات اعتماد موثوقة في ملفك الشخصي"</string>
+    <string name="enterprise_privacy_ca_certs_work" msgid="6187377647815301809">"بيانات اعتماد موثوقة في ملفك الشخصي للعمل"</string>
     <plurals name="enterprise_privacy_number_ca_certs" formatted="false" msgid="526375234629534165">
       <item quantity="zero">‏<xliff:g id="COUNT_1">%d</xliff:g> شهادة CA كحد أدنى</item>
       <item quantity="two">‏شهادتا CA (<xliff:g id="COUNT_1">%d</xliff:g>) كحد أدنى</item>
@@ -3895,7 +3955,7 @@
     <string name="storage_other_apps" msgid="5524321740031718083">"تطبيقات أخرى"</string>
     <string name="storage_files" msgid="8581083146777364063">"الملفات"</string>
     <string name="storage_size_large_alternate" msgid="3550744227788333060">"<xliff:g id="NUMBER">^1</xliff:g>"<small>" <xliff:g id="UNIT">^2</xliff:g>"</small>""</string>
-    <string name="storage_volume_total" msgid="3499221850532701342">"سعة تخزين مستخدمة من <xliff:g id="TOTAL">%1$s</xliff:g>"</string>
+    <string name="storage_volume_total" msgid="3499221850532701342">"سعة التخزين المستخدمة من أصل <xliff:g id="TOTAL">%1$s</xliff:g>"</string>
     <string name="storage_percent_full" msgid="6095012055875077036">"مستخدمة"</string>
     <string name="clear_instant_app_data" msgid="2004222610585890909">"مسح التطبيق"</string>
     <string name="clear_instant_app_confirmation" msgid="7451671214898856857">"هل تريد إزالة هذا التطبيق الفوري؟"</string>
@@ -3908,7 +3968,9 @@
     <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="show_operator_name_title" msgid="805135053530442951">"اسم الشبكة"</string>
+    <string name="show_operator_name_summary" msgid="5962567590205757550">"عرض اسم الشبكة في شريط الحالة"</string>
     <string name="storage_manager_indicator" msgid="1516810749625915020">"إدارة سعة التخزين: <xliff:g id="STATUS">^1</xliff:g>"</string>
     <string name="storage_manager_indicator_off" msgid="7488057587180724388">"إيقاف"</string>
     <string name="storage_manager_indicator_on" msgid="8625551710194584733">"تشغيل"</string>
@@ -3918,6 +3980,8 @@
     <string name="carrier_provisioning" msgid="4398683675591893169">"معلومات توفير خدمة مشغل شبكة الجوال"</string>
     <string name="trigger_carrier_provisioning" msgid="3434865918009286187">"بدء توفير خدمة مشغل شبكة الجوال"</string>
     <string name="new_device_suggestion_title" msgid="698847081680980774">"ما الميزات الجديدة والمثيرة للاهتمام؟"</string>
-    <string name="new_device_suggestion_summary" msgid="7172709269203435870">"الاطلاع على أفضل 5 ميزات"</string>
+    <string name="new_device_suggestion_summary" product="default" msgid="206396571522515855">"الحصول على جولة في هاتفك الجديد"</string>
+    <string name="new_device_suggestion_summary" product="tablet" msgid="393751455688210956">"الحصول على جولة في جهازك اللوحي الجديد"</string>
+    <string name="new_device_suggestion_summary" product="device" msgid="2939870049868336652">"الحصول على جولة في جهازك الجديد"</string>
     <string name="disabled_low_ram_device" msgid="3751578499721173344">"لا تتوفر هذه الميزة على هذا الجهاز"</string>
 </resources>
diff --git a/res/values-az/arrays.xml b/res/values-az/arrays.xml
index 5a1f909..e75af41 100644
--- a/res/values-az/arrays.xml
+++ b/res/values-az/arrays.xml
@@ -100,8 +100,6 @@
     <!-- no translation found for wifi_security_no_eap:0 (2084555984818107151) -->
     <!-- no translation found for wifi_security_no_eap:1 (397579322683471524) -->
     <!-- no translation found for wifi_security_no_eap:2 (1968820975358150484) -->
-    <!-- no translation found for wifi_ap_security:0 (5251664683198623324) -->
-    <!-- no translation found for wifi_ap_security:1 (7989073072260294673) -->
   <string-array name="wifi_eap_method">
     <item msgid="1160193392455075561">"PEAP"</item>
     <item msgid="7981731051382306293">"TLS"</item>
diff --git a/res/values-az/strings.xml b/res/values-az/strings.xml
index a344a90..2eed345 100644
--- a/res/values-az/strings.xml
+++ b/res/values-az/strings.xml
@@ -166,7 +166,7 @@
     <string name="bluetooth_map_acceptance_dialog_text" msgid="8712508202081143737">"%1$s sizin mesajlarınıza giriş istəyir. %2$s adlı istifadəçi üçün girişə icazə verilsin?"</string>
     <string name="bluetooth_sap_request" msgid="2669762224045354417">"SIM girişi sorğusu"</string>
     <string name="bluetooth_sap_acceptance_dialog_text" msgid="4414253873553608690">"<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g> SIM kartınıza giriş hüququ istəyir. SIM karta giriş hüququnun verilməsi bağlantı müddətində cihazınızda data bağlantını deaktiv edəcək. <xliff:g id="DEVICE_NAME_1">%2$s?</xliff:g> cihazına giriş hüququ verin"</string>
-    <string name="bluetooth_device_name_summary" msgid="4757990010751789977">"Digər cihazlara \"<xliff:g id="DEVICE_NAME">^1</xliff:g>\" kimi görünür"</string>
+    <string name="bluetooth_device_name_summary" msgid="522235742194965734">"Digər cihazlara \"<xliff:g id="DEVICE_NAME">^1</xliff:g>\" kimi görünür"</string>
     <string name="bluetooth_paired_device_title" msgid="8638994696317952019">"Cihazlarınız"</string>
     <string name="bluetooth_pairing_page_title" msgid="7712127387361962608">"Yeni cihazı qoşalaşdırın"</string>
     <string name="date_and_time" msgid="9062980487860757694">"Vaxt və tarix"</string>
@@ -312,6 +312,8 @@
     <string name="zone_auto" msgid="334783869352026648">"Avtomatik vaxt zonası"</string>
     <string name="zone_auto_summaryOn" msgid="6142830927278458314">"Şəbəkə ilə təmin olunmuş vaxt zonasını istifadə edin"</string>
     <string name="zone_auto_summaryOff" msgid="2597745783162041390">"Şəbəkə ilə təmin olunmuş vaxt zonasını istifadə edin"</string>
+    <string name="date_time_24hour_auto" msgid="2117383168985653422">"24 saatlıq avtomatik format"</string>
+    <string name="date_time_24hour_auto_summary" msgid="6351812925651480277">"Defolt parametrdən istifadə edin"</string>
     <string name="date_time_24hour_title" msgid="3203537578602803850">"24‑saat formatı"</string>
     <string name="date_time_24hour" msgid="1193032284921000063">"24 saat formatından istifadə et"</string>
     <string name="date_time_set_time_title" msgid="6296795651349047016">"Vaxt"</string>
@@ -372,6 +374,9 @@
     <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="1961957425135180242">"Növbəti"</string>
+    <string name="setup_fingerprint_enroll_skip_title" msgid="362050541117362034">"Barmaq izi ötürülsün?"</string>
+    <string name="setup_fingerprint_enroll_skip_after_adding_lock_text" msgid="958990414356204763">"Barmaq izinin ayarlanması bir-iki dəqiqə çəkəcək. Bu mərhələni ötürsəniz, barmaq izini sonradan ayarlarda əlavə edə bilərsiniz."</string>
+    <string name="lock_screen_intro_skip_title" msgid="4988210105913705679">"Ekran kilidi ötürülsün?"</string>
     <string name="lock_screen_intro_skip_dialog_text_frp" product="tablet" msgid="1581834104051243425">"Cihaz qoruma funksiyası aktiv edilməyəcək. Planşet itərsə, oğurlanarsa və ya sıfırlanarsa, başqalarının bu planşetdən istifadəsinin qarşısını ala bilməyəcəksiniz."</string>
     <string name="lock_screen_intro_skip_dialog_text_frp" product="device" msgid="4629503416877189572">"Cihaz qoruma funksiyası aktiv edilməyəcək. Cihaz itərsə, oğurlanarsa və ya sıfırlanarsa, başqalarının bu cihazdan istifadəsinin qarşısını ala bilməyəcəksiniz."</string>
     <string name="lock_screen_intro_skip_dialog_text_frp" product="default" msgid="2423428240245737909">"Cihaz qoruma funksiyası aktiv edilməyəcək. Telefon itərsə, oğurlanarsa və ya sıfırlanarsa, başqalarının bu telefondan istifadəsinin qarşısını ala bilməyəcəksiniz."</string>
@@ -457,7 +462,7 @@
     <string name="setup_lock_settings_picker_title" product="tablet" msgid="90329443364067215">"Planşetinizi qoruyun"</string>
     <string name="setup_lock_settings_picker_title" product="device" msgid="2399952075134938929">"Cihazınızı qoruyun"</string>
     <string name="setup_lock_settings_picker_title" product="default" msgid="1572244299605153324">"Telefonunuzu qoruyun"</string>
-    <string name="setup_lock_settings_picker_fingerprint_message" msgid="5585650064305600578">"Əlavə edilmiş təhlükəsizlik üçün, arxa fon ekran kilidini quraşdırın."</string>
+    <string name="lock_settings_picker_fingerprint_added_security_message" msgid="5768002109707648463">"Əlavə təhlükəsizlik üçün arxa fon ekran kilidi ayarlayın."</string>
     <string name="setup_lock_settings_picker_message" product="tablet" msgid="8919671129189936210">"Cihazın qorunması xüsusiyyətlərini aktivləşdirməklə, icazəniz olmadan başqalarının bu planşetdən istifadəsinə mane olun. İsifadə etmək istədiyiniz ekran kilidini seçin."</string>
     <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>
@@ -588,6 +593,7 @@
     <string name="lockpassword_pin_no_sequential_digits" msgid="680765285206990584">"Artan, azalan və ya təkrarlanan rəqəm ardıcıllığı qadağandır"</string>
     <string name="lockpassword_ok_label" msgid="313822574062553672">"OK"</string>
     <string name="lockpassword_cancel_label" msgid="8818529276331121899">"Ləğv et"</string>
+    <string name="lockpassword_clear_label" msgid="5724429464960458155">"Təmizləyin"</string>
     <string name="lockpattern_tutorial_cancel_label" msgid="6431583477570493261">"Ləğv et"</string>
     <string name="lockpattern_tutorial_continue_label" msgid="3559793618653400434">"Növbəti"</string>
     <string name="lock_setup" msgid="3355847066343753943">"Quraşdırma tamamlandı."</string>
@@ -781,6 +787,7 @@
     <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>
@@ -817,6 +824,8 @@
     <string name="wifi_wps_available_first_item" msgid="4422547079984583502">"Əlçatımlı WPS"</string>
     <string name="wifi_wps_available_second_item" msgid="8427520131718215301">" (WPS mövcuddur)"</string>
     <string name="wifi_wps_nfc_enter_password" msgid="2288214226916117159">"Şəbəkə parolunuzu daxil edin"</string>
+    <string name="wifi_carrier_connect" msgid="8174696557882299911">"Operator Wi‑Fi şəbəkəsi"</string>
+    <string name="wifi_carrier_content" msgid="4634077285415851933">"<xliff:g id="NAME">%1%s</xliff:g> vasitəsilə qoşulun"</string>
     <string name="wifi_scan_always_turnon_message" msgid="203123538572122989">"Yerləşmə dəqiqliyini təkmilləşdirmək və digər məqsədlər üçün Wi-Fi qapalı olsa da belə <xliff:g id="APP_NAME">%1$s</xliff:g> tətbiqi şəbəkə skanını yandırmaq istəyir. \n \n Skan etmək istəyən bütün tətbiqlərə icazə verilsin?"</string>
     <string name="wifi_scan_always_turnoff_message" msgid="5538901671131941043">"Bunu söndürmək üçün daşma menyuda Qabaqcıl bölməsinə daxil olun."</string>
     <string name="wifi_scan_always_confirm_allow" msgid="5355973075896817232">"İcazə verin"</string>
@@ -834,6 +843,7 @@
     <string name="wifi_connect" msgid="1076622875777072845">"Qoşul"</string>
     <string name="wifi_failed_connect_message" msgid="8491902558970292871">"Şəbəkəyə qoşulmaq alınmadı"</string>
     <string name="wifi_forget" msgid="8168174695608386644">"Unut"</string>
+    <string name="wifi_modify" msgid="6100248070440710782">"Dəyişdirin"</string>
     <string name="wifi_failed_forget_message" msgid="1348172929201654986">"Şəbəkəni unutmaq alınmadı"</string>
     <string name="wifi_save" msgid="3331121567988522826">"Yadda saxla"</string>
     <string name="wifi_failed_save_message" msgid="6650004874143815692">"Şəbəkəni yadda saxlamaq alınmadı"</string>
@@ -846,6 +856,7 @@
     <string name="wifi_advanced_titlebar" msgid="4485841401774142908">"Qabaqcıl Wi-Fi"</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_title" msgid="3471132676909349382">"Şəbəkə haqqında məlumat"</string>
     <string name="wifi_details_subnet_mask" msgid="6720279144174924410">"Alt şəbəkə maskası"</string>
     <string name="wifi_details_dns" msgid="8648826607751830768">"DNS"</string>
     <string name="wifi_details_ipv6_address_header" msgid="6734119149106422148">"IPv6 ünvanları"</string>
@@ -878,16 +889,15 @@
     <string name="wifi_p2p_cancel_connect_title" msgid="255267538099324413">"Dəvət ləğv olunsun?"</string>
     <string name="wifi_p2p_cancel_connect_message" msgid="7477756213423749402">"<xliff:g id="PEER_NAME">%1$s</xliff:g> ilə bağlantı dəvətini ləğv etmək istədiyinizə əminsiniz?"</string>
     <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_off_subtext" msgid="5466126533609394170">"İnternet və ya kontent digər cihazlarla paylaşılmır"</string>
     <string name="wifi_hotspot_tethering_on_subtext" product="tablet" msgid="5752490509369962007">"Bu planşetin internet bağlantısı hotspot vasitəsilə paylaşılır"</string>
     <string name="wifi_hotspot_tethering_on_subtext" product="default" msgid="6461075246164300670">"Bu telefonun internet bağlantısı hotspot vasitəsilə paylaşılır"</string>
     <string name="wifi_hotspot_on_local_only_subtext" msgid="2068110388011294735">"Tətbiq kontenti paylaşır. İnternet bağlantısını paylaşmaq üçün hotspotu deaktiv, sonra aktiv edin"</string>
-    <string name="wifi_hotspot_name_title" msgid="1341735529132128887">"Wi‑Fi adı"</string>
+    <string name="wifi_hotspot_name_title" msgid="8237000746618636778">"Hotspot adı"</string>
     <string name="wifi_hotspot_name_summary_connecting" msgid="3378299995508671967">"<xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g> aktiv edilir..."</string>
     <string name="wifi_hotspot_name_summary_connected" msgid="3888672084861445362">"Digər cihazlar <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g> şəbəkəsinə qoşula bilər"</string>
-    <string name="wifi_hotspot_password_title" msgid="1955592302902091281">"Wi-Fi parolu"</string>
+    <string name="wifi_hotspot_password_title" msgid="8676859981917573801">"Hotspot parolu"</string>
     <string name="wifi_hotspot_ap_band_title" msgid="1165801173359290681">"AP Band"</string>
     <string name="wifi_hotspot_footer_info_regular" msgid="1203489406068036455">"Digər cihazlara Wi‑Fi şəbəkəsi yaratmaq üçün hotspot istifadə edin. Hotspot mobil data bağlantısından istifadə edərərk İnternet təmin edir. Əlavə mobil data xərcləri tətbiq edilə bilər."</string>
     <string name="wifi_hotspot_footer_info_local_only" msgid="857988412470694109">"Tətbiq yaxınlıqdakı cihazlarla kontenti paylaşmaq üçün hotspot yarada bilər."</string>
@@ -898,7 +908,6 @@
     <string name="wifi_tether_configure_ap_text" msgid="7974681394041609308">"Wi-Fi hotspot ayarlayın"</string>
     <string name="wifi_hotspot_configure_ap_text" msgid="5478614731464220432">"Wi‑Fi hotspot quraşdırma"</string>
     <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">"Wi-Fi zəngi"</string>
     <string name="wifi_calling_suggestion_title" msgid="9008010480466359578">"Wi-Fi Zəngini aktiv edin"</string>
@@ -939,7 +948,7 @@
     <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="emergency_address_summary" msgid="3266760199681945746">"Wi‑Fi istifadə edərək zəng etsəniz, ünvan fövqəladə xidmətlər tərəfindən Sizin məkanınız kimi istifadə ediləcək"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"Göstər"</string>
     <string name="sound_settings" msgid="5534671337768745343">"Səs"</string>
     <string name="all_volume_title" msgid="4296957391257836961">"Həcmlər"</string>
@@ -993,6 +1002,7 @@
     <string name="search_settings" msgid="1910951467596035063">"Axtarış"</string>
     <string name="search_settings_summary" msgid="9205656546570654169">"Axtarış parametrləri və tarixçəni idarə edin"</string>
     <string name="search_settings_no_results" msgid="8799027492641230999">"Nəticə yoxdur"</string>
+    <string name="search_clear_history" msgid="4196658962573162457">"Tarixçəni təmizləyin"</string>
     <string name="display_settings" msgid="7965901687241669598">"Göstər"</string>
     <string name="accelerometer_title" msgid="7854608399547349157">"Avtodönüşlü ekran"</string>
     <string name="color_mode_title" msgid="3159275920408338215">"Canlı rənglər"</string>
@@ -1122,7 +1132,6 @@
     <string name="baseband_version" msgid="1848990160763524801">"Baseband versiyası"</string>
     <string name="kernel_version" msgid="9192574954196167602">"Kernel versiyası"</string>
     <string name="build_number" msgid="3075795840572241758">"Quraşdırma nömrəsi"</string>
-    <string name="selinux_status" msgid="6212165375172061672">"SELinux statusu"</string>
     <string name="device_info_not_available" msgid="8062521887156825182">"Əlçatımlı deyil"</string>
     <string name="device_status_activity_title" msgid="1411201799384697904">"Status"</string>
     <string name="device_status" msgid="607405385799807324">"Status"</string>
@@ -1150,7 +1159,6 @@
     <string name="status_wifi_mac_address" msgid="2202206684020765378">"Wi-Fi MAC ünvanı"</string>
     <string name="status_bt_address" msgid="4195174192087439720">"Bluetooth ünvanı"</string>
     <string name="status_serial_number" msgid="2257111183374628137">"Seriya nömrəsi"</string>
-    <string name="status_unavailable" msgid="7862009036663793314">"Əlçatmazdır"</string>
     <string name="status_up_time" msgid="7294859476816760399">"Müddəti"</string>
     <string name="status_awake_time" msgid="2393949909051183652">"Oyaq vaxtı"</string>
     <string name="internal_memory" msgid="9129595691484260784">"Daxili yaddaş"</string>
@@ -1326,6 +1334,7 @@
     <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>
     <string name="reset_dashboard_title" msgid="6254873816990678620">"Seçimləri sıfırlayın"</string>
+    <string name="reset_dashboard_summary" msgid="4851012632493522755">"Şəbəkə, tətbiqlər və ya cihazı sıfırlamaq mümkündür"</string>
     <string name="reset_network_title" msgid="6166025966016873843">"Wi-Fi, mobil və Bluetooth\'u sıfırlayın"</string>
     <string name="reset_network_desc" msgid="5547979398298881406">"Bununla bütün şəbəkə ayarları sıfırlanacaq, bura daxildir:\n\n"<li>"Wi‑Fi"</li>\n<li>"Mobil data"</li>\n<li>"Bluetooth"</li></string>
     <string name="reset_network_button_text" msgid="2035676527471089853">"Ayarları sıfırlayın"</string>
@@ -1334,17 +1343,14 @@
     <string name="reset_network_confirm_title" msgid="1759888886976962773">"Sıfırlansın?"</string>
     <string name="network_reset_not_available" msgid="7188610385577164676">"Şəbəkə sıfırlaması bu istifadəçi üçün əlçatan deyil"</string>
     <string name="reset_network_complete_toast" msgid="787829973559541880">"Şəbəkə ayarları sıfırlandı"</string>
-    <string name="master_clear_title" msgid="6617679904229218425">"Bütün datanı silin (Fabrika sıfırlaması)"</string>
-    <plurals name="master_clear_with_account_summary" formatted="false" msgid="5911377203778818712">
-      <item quantity="other"><xliff:g id="ACCOUNT_COUNT">%1$d</xliff:g> hesab sıfırlanacaq</item>
-      <item quantity="one">1 hesab sıfırlanacaq</item>
-    </plurals>
-    <string name="master_clear_summary" msgid="6902443944660426951">"Daxili yaddaş və bütün data sıfırlanacaq"</string>
+    <string name="master_clear_title" msgid="3531267871084279512">"Bütün datanı silin (fabrika sıfırlaması)"</string>
     <string name="master_clear_desc" product="tablet" msgid="9146059417023157222">"Bu, planşetinizdən bunları siləcək: "<b>"daxili yaddaş"</b>", həmçinin:\n\n"<li>"Google hesabınızı"</li>\n<li>"Sistem və tətbiq data və ayarlarını"</li>\n<li>"Endirilmiş tətbiqləri"</li></string>
     <string name="master_clear_desc" product="default" msgid="4800386183314202571">"Bu telefonunuzun "<b>"daxili yaddaşından"</b>" bütün datanı siləcək, bura daxildir: \n\n"<li>"Google hesabınız"</li>\n<li>"Sistem və tətbiq məlumatları və parametrləri"</li>\n<li>"Endirilmiş tətbiqlər"</li></string>
     <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"Hazırda bu hesablara daxil olmusunuz:\n"</string>
     <string name="master_clear_other_users_present" product="default" msgid="5161423070702470742">\n\n"Bu cihazda başqa istifadəçilər iştirak edir.\n"</string>
     <string name="master_clear_desc_also_erases_external" msgid="1903185203791274237"><li>"Musiqi"</li>\n<li>"Fotolar"</li>\n<li>"Digər istifadəçi datası"</li></string>
+    <string name="master_clear_desc_also_erases_esim" msgid="312352697653096008"><li>"eSIM operatorları"</li></string>
+    <string name="master_clear_desc_no_cancel_mobile_plan" msgid="5460926449093211144">\n\n"Bununla mobil xidmət planı ləğv edilməyəcək."</string>
     <string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="7744115866662613411">\n\n"Həmçinin musiqi, şəkil və digər istifadəçi datası təmizləmək üçün "<b>"USB yaddaşı"</b>" silinməlidir."</string>
     <string name="master_clear_desc_erase_external_storage" product="default" msgid="4801026652617377093">\n\n"Musiqi, şəkil, və digər istifadəçi datasını silmək üçün "<b>"SD kartı"</b>" təmizləmək lazımdır."</string>
     <string name="erase_external_storage" product="nosdcard" msgid="969364037450286809">"USB yaddaşı sil"</string>
@@ -1461,15 +1467,16 @@
     <string name="settings_safetylegal_activity_title" msgid="6901214628496951727">"Təhlükəsizlik məlumatı"</string>
     <string name="settings_safetylegal_activity_unreachable" msgid="250674109915859456">"Sizin data bağlantınız yoxdur. Bu informasiyanı indi görüntüləmək üçün, internetə qoşulu olan istənilən kompüterdən %s daxil olun."</string>
     <string name="settings_safetylegal_activity_loading" msgid="8059022597639516348">"Yüklənir…"</string>
-    <string name="lockpassword_choose_your_password_header" msgid="8624900666929394990">"Parolunuzu seçin"</string>
-    <string name="lockpassword_choose_your_password_header_for_fingerprint" msgid="6624409510609085450">"Barmaq izi üçün parol seçin"</string>
-    <string name="lockpassword_choose_your_pattern_header" msgid="6949761069941694050">"Modelinizi seçin"</string>
-    <string name="lockpassword_choose_your_pattern_header_for_fingerprint" msgid="5901096361617543819">"Barmaq izi üçün nümunə seçin"</string>
-    <string name="lockpassword_choose_your_pin_header" msgid="7598849519816138302">"PİN seçin"</string>
-    <string name="lockpassword_choose_your_pin_header_for_fingerprint" msgid="765344692615917183">"Barmaq izi üçün PIN ayarlayın"</string>
-    <string name="lockpassword_confirm_your_password_header" msgid="6308478184889846633">"Parolu təsdiq edin"</string>
+    <string name="lockpassword_choose_your_screen_lock_header" msgid="3872462096767152394">"Ekran kilidi ayarlayın"</string>
+    <string name="lockpassword_choose_your_password_message" msgid="1197569283524841412">"Təhlükəsizlik üçün parol ayarlayın"</string>
+    <string name="lockpassword_choose_your_password_header_for_fingerprint" msgid="2541818487015343503">"Barmaq izi üçün parol ayarlayın"</string>
+    <string name="lockpassword_choose_your_pattern_header_for_fingerprint" msgid="7709785406243556723">"Barmaq izi üçün nümunə ayarlayın"</string>
+    <string name="lockpassword_choose_your_pin_message" msgid="1875420718677275646">"Təhlükəsizlik üçün PIN ayarlayın"</string>
+    <string name="lockpassword_choose_your_pin_header_for_fingerprint" msgid="1549639053195796674">"Barmaq izi istifadəsi üçün PIN ayarlayın"</string>
+    <string name="lockpassword_choose_your_pattern_message" msgid="5986983400689720015">"Təhlükəsizlik üçün nümunə ayarlayın"</string>
+    <string name="lockpassword_confirm_your_password_header" msgid="1266027268220850931">"Parolu yenidən daxil edin."</string>
     <string name="lockpassword_confirm_your_pattern_header" msgid="7543433733032330821">"Modeli təsdiq edin"</string>
-    <string name="lockpassword_confirm_your_pin_header" msgid="49038294648213197">"PİN kodunuzu təsdiq edin"</string>
+    <string name="lockpassword_confirm_your_pin_header" msgid="7744513791910572550">"PIN\'i yenidən daxil edin"</string>
     <string name="lockpassword_confirm_passwords_dont_match" msgid="5140892109439191415">"Parollar uyğun gəlmir"</string>
     <string name="lockpassword_confirm_pins_dont_match" msgid="7226244811505606217">"PIN-lər üst-üstə düşmür"</string>
     <string name="lockpassword_choose_lock_generic_header" msgid="3811438094903786145">"Kilid açma seçimi"</string>
@@ -1488,6 +1495,12 @@
     <string name="lockpassword_strong_auth_required_work_pattern" msgid="3003781907040522053">"Əlavə edilmiş təhlükəsizlik üçün iş modelini istifadə edin"</string>
     <string name="lockpassword_strong_auth_required_work_pin" msgid="3367491332598821552">"Əlavə edilmiş təhlükəsizlik üçün iş PIN kodunu daxil edin"</string>
     <string name="lockpassword_strong_auth_required_work_password" msgid="8159775129968582940">"Əlavə edilmiş təhlükəsizlik üçün iş parolunu daxil edin"</string>
+    <string name="lockpassword_confirm_your_pattern_details_frp" msgid="6757336656791723193">"Telefonunuz zavod ayarlarına sıfırlanıb. Telefondan istifadə etmək üçün əvvəlki nümunəni daxil edin."</string>
+    <string name="lockpassword_confirm_your_pin_details_frp" msgid="826520613445990470">"Telefonunuz zavod ayarlarına sıfırlanıb. Telefondan istifadə etmək üçün əvvəlki PIN kodu daxil edin."</string>
+    <string name="lockpassword_confirm_your_password_details_frp" msgid="8944081074615739040">"Telefonunuz zavod ayarlarına sıfırlanıb. Telefondan istifadə etmək üçün əvvəlki parolu daxil edin."</string>
+    <string name="lockpassword_confirm_your_pattern_header_frp" msgid="2898036091609128286">"Nümunəni doğrulayın"</string>
+    <string name="lockpassword_confirm_your_pin_header_frp" msgid="4141601774778898803">"PIN kodu doğrulayın"</string>
+    <string name="lockpassword_confirm_your_password_header_frp" msgid="3762615419295360480">"Parolu doğrulayın"</string>
     <string name="lockpassword_invalid_pin" msgid="15588049067548470">"PIN səhvdir"</string>
     <string name="lockpassword_invalid_password" msgid="4038507398784975200">"Yanlış parol"</string>
     <string name="lockpattern_need_to_unlock_wrong" msgid="1745247595356012176">"Yanlış model"</string>
@@ -1537,7 +1550,6 @@
     <string name="install_applications_title" msgid="4987712352256508946">"Tətbiq mənbələrinə icazə verin"</string>
     <string name="recent_app_category_title" msgid="6673071268966003928">"Ən son istifadə edilən tətbiqlər"</string>
     <string name="see_all_apps_title" msgid="1317153498074308438">"Bütün <xliff:g id="COUNT">%1$d</xliff:g> tətbiqə baxın"</string>
-    <string name="recent_app_summary" msgid="3366446669844932300">"<xliff:g id="TIME">^1</xliff:g> əvvəl"</string>
     <string name="install_all_warning" product="tablet" msgid="8310489909586138165">"Planşet və şəxsi datanız naməlum tətbiqlərin hücumuna qarşı daha həssasdır. Bu mənbədən tətbiq quraşdırmaqla planşetinə dəyə biləcək zərər və ya həmin tətbiqlərin istifadəsi nəticəsində baş verən data itkisinə görə məsuliyyət daşıdığınızı qəbul edirsiniz."</string>
     <string name="install_all_warning" product="default" msgid="1952257127370115988">"Telefon və şəxsi datanız naməlum tətbiqlərin hücumuna qarşı daha həssasdır. Bu mənbədən tətbiq quraşdırmaqla telefona dəyə biləcək zərər və ya həmin tətbiqlərin istifadəsi nəticəsində baş verən data itkisinə görə məsuliyyət daşıdığınızı qəbul edirsiniz."</string>
     <string name="advanced_settings" msgid="1777249286757067969">"Qabaqcıl ayarlar"</string>
@@ -1801,7 +1813,7 @@
     <string name="accessibility_settings_summary" msgid="981260486011624939">"Ekran oxuyucuları, görüntü, bağlantı nəzarəti"</string>
     <string name="vision_settings_title" msgid="4204111425716868288">"Görünüş Ayarları"</string>
     <string name="vision_settings_description" msgid="5679491180156408260">"Bu cihazı ehtiyacınıza uyğun fərdiləşdirə bilərsiniz. Bu əlçatımlıq xüsusiyyətləri daha sonra Ayarlardan dəyişdirilə bilər."</string>
-    <string name="vision_settings_suggestion_title" msgid="917294957154878441">"Şrift ölçüsünü böyüdün"</string>
+    <string name="vision_settings_suggestion_title" msgid="8058794060304707004">"Şriftin ölçüsünü dəyişin"</string>
     <string name="screen_reader_category_title" msgid="7739154903913400641">"Ekran oxuyucuları"</string>
     <string name="audio_and_captions_category_title" msgid="3420727114421447524">"Audio və ekran mətni"</string>
     <string name="display_category_title" msgid="685461049938269166">"Görüntü"</string>
@@ -1838,7 +1850,6 @@
     <string name="accessibility_display_inversion_preference_subtitle" msgid="7052959202195368109">"Performansa təsir edə bilər"</string>
     <string name="accessibility_autoclick_preference_title" msgid="7014499339068449623">"Göstərici hərəkəti dayandırdıqdan sonra klikləyin"</string>
     <string name="accessibility_autoclick_delay_preference_title" msgid="3962261178385106006">"Klikləmədən əvvəl gözləyin"</string>
-    <string name="preference_summary_default_combination" msgid="8532964268242666060">"<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">"AKTİV"</string>
     <string name="accessibility_summary_state_disabled" msgid="2241315620132005595">"DEAKTİV"</string>
     <string name="enable_quick_setting" msgid="2366999897816894536">"Sürətli Ayarlarda Göstər"</string>
@@ -1957,12 +1968,14 @@
     <string name="background_activity_summary_on" msgid="649282072540085599">"İstifadə edilmədiyi zaman tətbiq arxa fonda işləyə bilər"</string>
     <string name="background_activity_summary_off" msgid="7666330699090632040">"İstifadə edilmədiyi zaman tətbiqin arxa fon fəaliyyəti məhduddur"</string>
     <string name="background_activity_summary_disabled" msgid="3710669050484599847">"Tətbiqin arxa fonda işləmək üçün icazəsi yoxdur"</string>
+    <string name="background_activity_summary_whitelisted" msgid="7375400051141016808">"Tətbiq batareya istifadəsi üçün optimallaşdırıla bilməz"</string>
+    <string name="background_activity_warning_dialog_title" msgid="2216249969149568871">"Arxa fon fəaliyyəti məhdudlaşdırılsın?"</string>
+    <string name="background_activity_warning_dialog_text" msgid="7049624449246121981">"Tətbiqin arxa fon fəaliyyətini məhdudlaşdırsanız, o səhv işləyə bilər"</string>
     <string name="device_screen_usage" msgid="3386088035570409683">"Tam doldurmadan sonrakı ekran istifadəsi"</string>
     <string name="device_screen_consumption" msgid="4607589286438986687">"Ekranın enerji sərfiyyatı"</string>
     <string name="device_cellular_network" msgid="4724773411762382950">"Mobil şəbəkənin skan edilməsi"</string>
-    <string name="power_last_full_charge_summary" msgid="532845389094620657">"<xliff:g id="TIME">^1</xliff:g> əvvəl"</string>
-    <string name="power_usage_list_summary" msgid="6775339745194635000">"Tam doldurmadan sonrakı tətbiq istifadəsi (<xliff:g id="TIME">^1</xliff:g> əvvəl)"</string>
-    <string name="power_usage_list_summary_device" msgid="7036566616386864302">"Tam doldurmadan sonra tətbiq istifadəsi (<xliff:g id="TIME">^1</xliff:g> əvvəl)"</string>
+    <string name="power_usage_list_summary" msgid="6393929085382334341">"Tam doldurmadan sonra tətbiq istifadəsi (<xliff:g id="RELATIVE_TIME">^1</xliff:g>)"</string>
+    <string name="power_usage_list_summary_device" msgid="4461926045610455423">"Tam doldurmadan sonra cihaz istifadəsi (<xliff:g id="RELATIVE_TIME">^1</xliff:g>)"</string>
     <string name="screen_usage_summary" msgid="6687403051423153550">"Dam doldurmadan sonra ekranın vaxtı miqdarı aktiv edilib"</string>
     <string name="device_usage_list_summary" msgid="5623036661468763251">"Tam doldurmadan sonrakı cihaz istifadəsi"</string>
     <string name="battery_since_unplugged" msgid="338073389740738437">"Elektrik şəbəkəsindən çıxarılandan sonra batareya istifadəsi"</string>
@@ -2208,14 +2221,14 @@
     <string name="credentials_unlock_hint" msgid="2301301378040499348">"Etimad yaddaşı üçün parol yazın."</string>
     <string name="credentials_old_password" msgid="7553393815538684028">"İndiki parol:"</string>
     <string name="credentials_reset_hint" msgid="6297256880896133631">"Bütün məzmun silinsin?"</string>
-    <string name="credentials_password_too_short" msgid="7502749986405522663">"Parolda ən azı 8 simvol olmalıdır."</string>
     <string name="credentials_wrong_password" msgid="2541932597104054807">"Yanlış parol."</string>
     <string name="credentials_reset_warning" msgid="5320653011511797600">"Yanlış parol. Etimadnamə yaddaşı silinməzdən əvvəl daha bir şansınız var."</string>
     <string name="credentials_reset_warning_plural" msgid="6514085665301095279">"Yanlış parol. Etimad yaddaşı silinmədən öncə <xliff:g id="NUMBER">%1$d</xliff:g> şansınız var."</string>
     <string name="credentials_erased" msgid="2907836028586342969">"Etimadnamə yaddaşı silindi."</string>
     <string name="credentials_not_erased" msgid="7685932772284216097">"Etimad yaddaşı silinə bilmədi."</string>
     <string name="credentials_enabled" msgid="7588607413349978930">"Etimadnamə yaddaşı aktiv edildi."</string>
-    <string name="credentials_configure_lock_screen_hint" msgid="6757119179588664966">"Etimad yaddaşını istifadə etmədən öncə Sizin ekran kilidləmə PIN\'i və ya parol quraşdırmağa ehtiyacınız var."</string>
+    <string name="credentials_configure_lock_screen_hint" msgid="8058230497337529036">"Kredensial yaddaşdan istifadə etmədən öncə cihazınızda təhlükəsiz kilid ekranı olmalıdır"</string>
+    <string name="credentials_configure_lock_screen_button" msgid="253239765216055321">"KİLİD AYARLAYIN"</string>
     <string name="usage_access_title" msgid="332333405495457839">"İstifadə girişi olan tətbiqlər"</string>
     <string name="emergency_tone_title" msgid="1055954530111587114">"Həyəcan tonu"</string>
     <string name="emergency_tone_summary" msgid="722259232924572153">"Təcili zəng olduqda davranış təyin et"</string>
@@ -2335,8 +2348,6 @@
     <skip />
     <string name="cant_sync_dialog_title" msgid="2777238588398046285">"Əl vasitəsi ilə sinxronizasiya alınmır"</string>
     <string name="cant_sync_dialog_message" msgid="1938380442159016449">"Bu element üçün sinxronlaşma hazırda deaktiv edilibş Bu ayarı dəyişmək üçün müvəqqəti olaraq fon datasını və avtomatik sinxronlaşmanı aktivləşdirin."</string>
-    <string name="wimax_settings" msgid="2655139497028469039">"4G"</string>
-    <string name="status_wimax_mac_address" msgid="8390791848661413416">"4G MAC ünvanı"</string>
     <string name="enter_password" msgid="8035706727471334122">"Androidə başlamaq üçün parolu daxil edin"</string>
     <string name="enter_pin" msgid="5305333588093263790">"Androidə başlamaq üçün PIN-i daxil edin"</string>
     <string name="enter_pattern" msgid="4187435713036808566">"Androidə başlamaq üçün modeli çəkin"</string>
@@ -2350,6 +2361,7 @@
     <string name="misc_files_selected_count" msgid="4647048020823912088">"<xliff:g id="NUMBER">%1$d</xliff:g> ədəddın <xliff:g id="TOTAL">%2$d</xliff:g> seçildi"</string>
     <string name="misc_files_selected_count_bytes" msgid="2876232009069114352">"<xliff:g id="TOTAL">%2$s</xliff:g> ədəddən <xliff:g id="NUMBER">%1$s</xliff:g> qədər"</string>
     <string name="select_all" msgid="1562774643280376715">"Hamısını seç"</string>
+    <string name="data_plan_usage_manage_plans_button_text" msgid="8997761990902708162">"Planları idarə edin"</string>
     <string name="data_usage_summary_title" msgid="3804110657238092929">"Data istifadəsi"</string>
     <string name="data_usage_app_summary_title" msgid="4147258989837459172">"Tətbiq data istifadəsi"</string>
     <string name="data_usage_accounting" msgid="7170028915873577387">"Operator data hesablanması cihazınızdakından fərqli ola bilər."</string>
@@ -2435,6 +2447,9 @@
     <string name="data_usage_metered_mobile" msgid="5423305619126978393">"Mobil şəbəkələr"</string>
     <string name="data_usage_metered_wifi" msgid="1761738002328299714">"Ölçülmüş Wi‑Fi şəbəkələri"</string>
     <string name="data_usage_metered_wifi_disabled" msgid="727808462375941567">"Ölçülmüş şəbəkələri seçmək üçün Wi‑Fi aktiv olmalıdır."</string>
+    <string name="data_usage_metered_auto" msgid="1262028400911918865">"Avtomatik"</string>
+    <string name="data_usage_metered_yes" msgid="9217539611385225894">"Ödənişli"</string>
+    <string name="data_usage_metered_no" msgid="4025232961929071789">"Ödənişsiz"</string>
     <string name="data_usage_disclaimer" msgid="6887858149980673444">"Operator data hesablanması cihazınızdakından fərqli ola bilər."</string>
     <string name="cryptkeeper_emergency_call" msgid="198578731586097145">"Təcili zəng"</string>
     <string name="cryptkeeper_return_to_call" msgid="5613717339452772491">"Zəngə geri qayıt"</string>
@@ -2526,9 +2541,6 @@
     <string name="backup_pw_set_button_text" msgid="2387480910044648795">"Rezerv kopyası parolu seçin"</string>
     <string name="backup_pw_cancel_button_text" msgid="8845630125391744615">"Ləğv et"</string>
     <string name="additional_system_update_settings_list_item_title" msgid="214987609894661992">"Əlavə sistem güncəlləmələri"</string>
-    <string name="selinux_status_disabled" msgid="924551035552323327">"Deaktiv"</string>
-    <string name="selinux_status_permissive" msgid="6004965534713398778">"Icazəli"</string>
-    <string name="selinux_status_enforcing" msgid="2252703756208463329">"Tətbiq edilir"</string>
     <string name="ssl_ca_cert_warning" msgid="2045866713601984673">"Şəbəkə nəzərdən keçirilə bilər"</string>
     <string name="done_button" msgid="1991471253042622230">"Hazırdır"</string>
     <plurals name="ssl_ca_cert_dialog_title" formatted="false" msgid="7145092748045794650">
@@ -2871,13 +2883,15 @@
     <string name="notifications_title" msgid="8086372779371204971">"Bildirişlər"</string>
     <string name="app_notifications_title" msgid="5810577805218003760">"Tətbiq bildirişləri"</string>
     <string name="notification_channel_title" msgid="2260666541030178452">"Bildiriş kateqoriyası"</string>
+    <string name="notification_group_title" msgid="7180506440133859601">"Bildiriş kateqoriyasının qrupu"</string>
     <string name="notification_importance_title" msgid="848692592679312666">"Əhəmiyyət"</string>
-    <string name="notification_importance_unspecified" msgid="2196023702875112081">"Tətbiqin öhdəsinə buraxın"</string>
+    <string name="notification_importance_unspecified" msgid="6622173510486113958">"Səsə icazə verin"</string>
     <string name="notification_importance_blocked" msgid="7938180808339386300">"Bildirişləri heç vaxt göstərməyin"</string>
     <string name="notification_importance_min" msgid="5455049524984686275">"Səs və ya vizual kəsintisiz"</string>
     <string name="notification_importance_low" msgid="8881468429453766553">"Səs yoxdur"</string>
     <string name="notification_importance_default" msgid="5958338024601957516">"Səsli"</string>
     <string name="notification_importance_high" msgid="2082429479238228527">"Səsli və ekranda pəncərə ilə"</string>
+    <string name="notification_importance_high_silent" msgid="2667033773703765252">"Ekrana toxunun"</string>
     <string name="notification_importance_min_title" msgid="6974673091137544803">"Aşağı"</string>
     <string name="notification_importance_low_title" msgid="8131254047772814309">"Orta"</string>
     <string name="notification_importance_default_title" msgid="9120383978536089489">"Yüksək"</string>
@@ -2920,8 +2934,13 @@
     <string name="loading_notification_apps" msgid="5031818677010335895">"Tətbiqlər endirilir..."</string>
     <string name="app_notifications_off_desc" msgid="4882445501376722969">"Android bu tətbiq bildirişinin bu cihazda görünməsini blok edir"</string>
     <string name="channel_notifications_off_desc" msgid="5899225298718840635">"Android bu kateqoriyalı bildirişin bu cihazda görünməsini blok edir"</string>
+    <string name="channel_group_notifications_off_desc" msgid="1620950416247316370">"Android bu kateqoriyalı bildirişin cihazda görünməsini blok edir"</string>
     <string name="notification_channels" msgid="5346841743182627500">"Kateqoriyalar"</string>
     <string name="notification_channels_other" msgid="5645317113885788226">"Digər"</string>
+    <plurals name="notification_group_summary" formatted="false" msgid="3420621520561455358">
+      <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> kateqoriya</item>
+      <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> kateqoriya</item>
+    </plurals>
     <string name="no_channels" msgid="3077375508177744586">"Bu tətbiq heç bir bildiriş paylaşmayıb"</string>
     <string name="app_settings_link" msgid="8894946007543660906">"Tətbiqdə əlavə ayarlar"</string>
     <string name="app_notification_listing_summary_zero" msgid="6482582965081108108">"Bütün tətbiqlər üçün deaktiv edildi"</string>
@@ -2998,6 +3017,7 @@
     <string name="zen_mode_from_starred" msgid="2678345811950997027">"Yalnız ulduzlanmış kontaktlardan"</string>
     <string name="zen_mode_from_none" msgid="8219706639954614136">"Heç biri"</string>
     <string name="zen_mode_alarms" msgid="2165302777886552926">"Siqnallar"</string>
+    <string name="zen_mode_alarms_summary" msgid="3774926045611788635">"Siqnallar həmişə önəmlidir və səs çıxarır"</string>
     <string name="zen_mode_reminders" msgid="5458502056440485730">"Xatırlamalar"</string>
     <string name="zen_mode_events" msgid="7914446030988618264">"Tədbirlər"</string>
     <string name="zen_mode_all_callers" msgid="584186167367236922">"Bütün zəng edənlər"</string>
@@ -3032,6 +3052,7 @@
     <string name="zen_mode_screen_off_visual_interruptions" msgid="4850792880144382633">"Ekran qapalı olduğu zaman"</string>
     <string name="zen_mode_no_visual_interruptions" msgid="8742776003822778472">"Ekran açıq və ya qapalı olduğu zaman"</string>
     <string name="notification_app_settings_button" msgid="6685640230371477485">"Bildiriş ayarları"</string>
+    <string name="suggestion_button_text" msgid="3275010948381252006">"Ok"</string>
     <string name="device_feedback" msgid="3238056036766293294">"Bu cihaz haqqında fikrinizi bildirin"</string>
     <string name="restr_pin_enter_admin_pin" msgid="1085834515677448072">"Admin PIN kodunu daxil edin"</string>
     <string name="switch_on_text" msgid="1124106706920572386">"Aktiv"</string>
@@ -3216,6 +3237,7 @@
     <string name="usb_summary_file_transfers" msgid="6435943692610175111">"Faylların köçürülməsi"</string>
     <string name="usb_summary_photo_transfers" msgid="8440204169576585250">"Fotoların köçürülməsi (PTP)"</string>
     <string name="usb_summary_MIDI" msgid="5687906612187885908">"Cihazın MIDI kimi istifadəsi"</string>
+    <string name="sms_mirroring_pref" msgid="6475043279147376031">"SMS Aynalama"</string>
     <string name="background_check_pref" msgid="7550258400138010979">"Arxa fon yoxlaması"</string>
     <string name="background_check_title" msgid="4534254315824525593">"Tam arxa fon girişi"</string>
     <string name="assist_access_context_title" msgid="2269032346698890257">"Ekrandan mətn istifadə edin"</string>
@@ -3282,7 +3304,7 @@
     <string name="write_settings_title" msgid="4232152481902542284">"Sistem ayarlarını dəyişdirə bilər"</string>
     <string name="write_system_settings" msgid="3482913590601096763">"Sistem ayarlarında dəyişiklik edin"</string>
     <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="permit_write_settings" msgid="658555006453212691">"Sistem ayarlarının redaktəsinə icazə 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>
@@ -3377,9 +3399,12 @@
     <string name="color_temperature" msgid="2070126836910615605">"Sərin rəng temperaturu"</string>
     <string name="color_temperature_desc" msgid="4793729830226404052">"Serinləşdirici ekran rənglərini istifadə edin"</string>
     <string name="color_temperature_toast" msgid="4974218172133854827">"Rəng dəyişikliyini tətbiq etmək üçün ekranı söndürün"</string>
-    <string name="telephony_monitor_toast" msgid="7003764250271195384">"Telefoniya monitoruna dəyişikliyi tətbiq etmək üçün cihazı yenidən yükləyin"</string>
+    <string name="connectivity_monitor_switch" msgid="9059759348648583421">"Bağlantı Monitoru"</string>
+    <string name="connectivity_monitor_switch_summary" msgid="2828658652378866401">"Bağlantı Monitoru bağlantı problemi aşkarladıqda qeydləri əldə edərək istifadəçiyə baq bildirməsi üçün bildiriş göndərəcək"</string>
+    <string name="connectivity_monitor_toast" msgid="5551859612881173028">"Bağlantı monitoruna dəyişiklik etmək üçün cihazı yenidən başladın"</string>
     <string name="camera_hal_hdrplus_switch" msgid="8377365197105267466">"Kamera HAL HDR+"</string>
     <string name="camera_hal_hdrplus_toast" msgid="2063703797270055299">"Kamera HAL HDR+ dəyişikliyi əlavə etmək üçün cihazı yenidən işə salın"</string>
+    <string name="camera_laser_sensor_switch" msgid="8913588990743234440">"Kamera Lazer Sensoru"</string>
     <string name="ota_disable_automatic_update" msgid="2319639631655915050">"Avtomatik sistem güncəlləmələri"</string>
     <string name="usage" msgid="2977875522080448986">"İstifadə"</string>
     <string name="cellular_data_usage" msgid="2155683719898158203">"Mobil data istifadəsi"</string>
@@ -3405,7 +3430,7 @@
     <string name="data_warning" msgid="209133958008062117">"Data xəbərdarlığı"</string>
     <string name="set_data_limit" msgid="2901526323210516923">"Data limiti ayarlayın"</string>
     <string name="data_limit" msgid="1885406964934590552">"Data limiti"</string>
-    <string name="data_usage_template" msgid="392191945602400904">"<xliff:g id="ID_2">%2$s</xliff:g> arasında <xliff:g id="ID_1">%1$s</xliff:g> istifadə edildi"</string>
+    <string name="data_usage_template" msgid="2923744765873163859">"<xliff:g id="ID_2">%2$s</xliff:g> aralığında <xliff:g id="ID_1">%1$s</xliff:g> data istifadə edildi"</string>
     <string name="configure" msgid="1029654422228677273">"Konfiqurasiya edin"</string>
     <string name="data_usage_other_apps" msgid="3272872663517382050">"Digər tətbiqlər istifadəyə əlavə edildi"</string>
     <plurals name="data_saver_unrestricted_summary" formatted="false" msgid="2635267833484232703">
@@ -3474,7 +3499,7 @@
     <string name="button_confirm_convert_fbe" msgid="7101855374850373091">"Silin və çevirin"</string>
     <string name="reset_shortcut_manager_throttling" msgid="6495066467198668994">"ShortcutManager reytinq limitini sıfırlayın"</string>
     <string name="reset_shortcut_manager_throttling_complete" msgid="1826770872063707900">"ShortcutManager reytinq limit sıfırlandı"</string>
-    <string name="notification_suggestion_title" msgid="4506524937307816475">"Ekran kilidi bildirişlərinə nəzarət edin"</string>
+    <string name="notification_suggestion_title" msgid="387052719462473500">"Kilid ekranında nəzarət məlumatı"</string>
     <string name="notification_suggestion_summary" msgid="8521159741445416875">"Bildiriş məzmununu göstərin və ya gizlədin"</string>
     <string name="page_tab_title_summary" msgid="4070309266374993258">"Bütün"</string>
     <string name="page_tab_title_support" msgid="8483187649355540109">"Dəstək və məsləhət"</string>
@@ -3482,7 +3507,7 @@
     <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>
     <string name="premium_sms_access" msgid="4660047004791638305">"Premium SMS girişi"</string>
-    <string name="bluetooth_disabled" msgid="2456198532288640046">"Digər cihazlara görünmür"</string>
+    <string name="bluetooth_disabled" msgid="6244000672828617410">"Deaktiv"</string>
     <string name="bluetooth_connected_summary" msgid="7672528674593152862">"<xliff:g id="ID_1">%1$s</xliff:g> cihazına qoşuldu"</string>
     <string name="bluetooth_connected_multiple_devices_summary" msgid="9173661896296663932">"Bir çox cihaza qoşuldu"</string>
     <string name="demo_mode" msgid="2798762752209330277">"Sistem İİ demo rejimi"</string>
@@ -3568,7 +3593,7 @@
     <string name="ambient_display_pickup_summary" product="tablet" msgid="5435283849947236648">"Vaxt, bildiriş ikonası və digər məlumatı yoxlamaq üçün planşeti götürün."</string>
     <string name="ambient_display_pickup_summary" product="device" msgid="8256669101643381568">"Vaxt, bildiriş ikonası və digər məlumatı yoxlamaq üçün cihazı götürün."</string>
     <string name="ambient_display_pickup_suggestion_summary" msgid="7014700589991761035">"Ekran deaktiv olduğu zaman bildirişləri yoxlayın"</string>
-    <string name="fingerprint_swipe_for_notifications_title" msgid="5816346492253270243">"Bildirişlər üçün barmaq izini sürüşdürün"</string>
+    <string name="fingerprint_swipe_for_notifications_title" msgid="5816346492253270243">"Bildirişlər üçün barmağınızı sürüşdürün"</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="default" msgid="1770661868393713922">"Bildirişləri yoxlamaq üçün, barmaq sensorunda aşağı sürüşdürün."</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="tablet" msgid="902719947767712895">"Bildirişləri yoxlamaq üçün, planşetin arxasındakı barmaq sensorunda aşağı sürüşdürün."</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="device" msgid="5372926094116306647">"Bildirişləri yoxlamaq üçün, cihazın arxasındakı barmaq sensorunda aşağı sürüşdürün."</string>
@@ -3584,7 +3609,7 @@
     <string name="web_action_enable_title" msgid="4051513950976670853">"Ani tətbiqlər"</string>
     <string name="web_action_enable_summary" msgid="3108127559723396382">"Hətta quraşdırılmasa belə, linki tətbiqlərdə açın"</string>
     <string name="web_action_section_title" msgid="7364647086538399136">"Ani tətbiqlər"</string>
-    <string name="instant_apps_account" msgid="1433620209791992528">"Ani tətbiq hesabı"</string>
+    <string name="instant_apps_settings" msgid="8827777916518348213">"Ani Tətbiq seçimləri"</string>
     <string name="domain_url_section_title" msgid="7046835219056428883">"Quraşdırılmış tətbiqlər"</string>
     <string name="automatic_storage_manager_activation_warning" msgid="6353100011690933254">"Yaddaşınız indi yaddaş meneceri tərəfindən idarə olunur"</string>
     <string name="account_for_section_header" msgid="5356566418548737121">"<xliff:g id="USER_NAME">%1$s</xliff:g> üçün hesablar"</string>
@@ -3631,7 +3656,9 @@
     <string name="enterprise_privacy_always_on_vpn_personal" msgid="9217774730260037434">"Həmişə aktiv VPN şəxsi profilinizdə yandırıldı"</string>
     <string name="enterprise_privacy_always_on_vpn_work" msgid="7244472958208315814">"Həmişə aktiv VPN iş profilinizdə yandırıldı"</string>
     <string name="enterprise_privacy_global_http_proxy" msgid="7936664553416257333">"Qlobal HTTP proksi ayarlandı"</string>
-    <string name="enterprise_privacy_ca_certs" msgid="5885892204903688909">"Etibarlı kredensiallar"</string>
+    <string name="enterprise_privacy_ca_certs_device" msgid="2019652712782510262">"Etibarlı kredensiallar"</string>
+    <string name="enterprise_privacy_ca_certs_personal" msgid="2279084820904076599">"Şəxsi profilinizdəki etibarlı kredensiallar"</string>
+    <string name="enterprise_privacy_ca_certs_work" msgid="6187377647815301809">"İş profilinizdəki etibarlı kredensiallar"</string>
     <plurals name="enterprise_privacy_number_ca_certs" formatted="false" msgid="526375234629534165">
       <item quantity="other">Minimum <xliff:g id="COUNT_1">%d</xliff:g> Kanada sertifikatı</item>
       <item quantity="one">Minimum <xliff:g id="COUNT_0">%d</xliff:g> Kanada sertifikatı</item>
@@ -3694,6 +3721,8 @@
     <string name="carrier_provisioning" msgid="4398683675591893169">"Operator Təchizat Məlumatı"</string>
     <string name="trigger_carrier_provisioning" msgid="3434865918009286187">"Operator Təchizatlanmasını Tətikləyin"</string>
     <string name="new_device_suggestion_title" msgid="698847081680980774">"Yeni və maraqlı olan nədir?"</string>
-    <string name="new_device_suggestion_summary" msgid="7172709269203435870">"Ən çox istifadə olunan 5 funksiyanı yoxlayın"</string>
+    <string name="new_device_suggestion_summary" product="default" msgid="206396571522515855">"Yeni telefonunuz ilə tanış olun"</string>
+    <string name="new_device_suggestion_summary" product="tablet" msgid="393751455688210956">"Yeni planşetiniz ilə tanış olun"</string>
+    <string name="new_device_suggestion_summary" product="device" msgid="2939870049868336652">"Yeni cihazınız ilə tanış olun"</string>
     <string name="disabled_low_ram_device" msgid="3751578499721173344">"Bu funksiya artıq bu cihazda əlçatan deyil"</string>
 </resources>
diff --git a/res/values-b+sr+Latn/arrays.xml b/res/values-b+sr+Latn/arrays.xml
index f5a74d0..3834c02 100644
--- a/res/values-b+sr+Latn/arrays.xml
+++ b/res/values-b+sr+Latn/arrays.xml
@@ -100,8 +100,6 @@
     <!-- no translation found for wifi_security_no_eap:0 (2084555984818107151) -->
     <!-- no translation found for wifi_security_no_eap:1 (397579322683471524) -->
     <!-- no translation found for wifi_security_no_eap:2 (1968820975358150484) -->
-    <!-- no translation found for wifi_ap_security:0 (5251664683198623324) -->
-    <!-- no translation found for wifi_ap_security:1 (7989073072260294673) -->
   <string-array name="wifi_eap_method">
     <item msgid="1160193392455075561">"PEAP"</item>
     <item msgid="7981731051382306293">"TLS"</item>
diff --git a/res/values-b+sr+Latn/strings.xml b/res/values-b+sr+Latn/strings.xml
index 43c5f31..2ce4c2a 100644
--- a/res/values-b+sr+Latn/strings.xml
+++ b/res/values-b+sr+Latn/strings.xml
@@ -167,7 +167,7 @@
     <string name="bluetooth_map_acceptance_dialog_text" msgid="8712508202081143737">"%1$s želi da pristupi porukama. Želite li da odobrite pristup za %2$s?"</string>
     <string name="bluetooth_sap_request" msgid="2669762224045354417">"Zahtev za pristup SIM kartici"</string>
     <string name="bluetooth_sap_acceptance_dialog_text" msgid="4414253873553608690">"<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g> želi da pristupa SIM kartici. Odobravanje pristupa SIM kartici će onemogućiti vezu za prenos podataka na uređaju dok traje povezivanje. Dajte pristup uređaju <xliff:g id="DEVICE_NAME_1">%2$s?</xliff:g>"</string>
-    <string name="bluetooth_device_name_summary" msgid="4757990010751789977">"Drugim uređajima vidljiv kao „<xliff:g id="DEVICE_NAME">^1</xliff:g>“"</string>
+    <string name="bluetooth_device_name_summary" msgid="522235742194965734">"Drugim uređajima vidljiv kao „<xliff:g id="DEVICE_NAME">^1</xliff:g>“"</string>
     <string name="bluetooth_paired_device_title" msgid="8638994696317952019">"Uređaji"</string>
     <string name="bluetooth_pairing_page_title" msgid="7712127387361962608">"Uparite novi uređaj"</string>
     <string name="date_and_time" msgid="9062980487860757694">"Datum i vreme"</string>
@@ -314,6 +314,8 @@
     <string name="zone_auto" msgid="334783869352026648">"Automatska vremenska zona"</string>
     <string name="zone_auto_summaryOn" msgid="6142830927278458314">"Koristi vremensku zonu mreže"</string>
     <string name="zone_auto_summaryOff" msgid="2597745783162041390">"Koristi vremensku zonu mreže"</string>
+    <string name="date_time_24hour_auto" msgid="2117383168985653422">"Automatski 24-časovni format"</string>
+    <string name="date_time_24hour_auto_summary" msgid="6351812925651480277">"Koristi podrazumevanu vrednost za lokalitet"</string>
     <string name="date_time_24hour_title" msgid="3203537578602803850">"24-časovni format"</string>
     <string name="date_time_24hour" msgid="1193032284921000063">"Koristi 24-časovni format"</string>
     <string name="date_time_set_time_title" msgid="6296795651349047016">"Vreme"</string>
@@ -361,7 +363,7 @@
     <string name="fingerprint_add_title" msgid="1926752654454033904">"Dodaj otisak prsta"</string>
     <string name="fingerprint_enable_keyguard_toggle_title" msgid="5078060939636911795">"zaključavanje ekrana"</string>
     <plurals name="security_settings_fingerprint_preference_summary" formatted="false" msgid="624961700033979880">
-      <item quantity="one">Podešen je <xliff:g id="COUNT_1">%1$d</xliff:g> otisak prstiju </item>
+      <item quantity="one">Podešen je <xliff:g id="COUNT_1">%1$d</xliff:g> otisak prsta </item>
       <item quantity="few">Podešena su <xliff:g id="COUNT_1">%1$d</xliff:g> otiska prstiju</item>
       <item quantity="other">Podešeno je <xliff:g id="COUNT_1">%1$d</xliff:g> otisaka prstiju</item>
     </plurals>
@@ -375,6 +377,9 @@
     <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="1961957425135180242">"Dalje"</string>
+    <string name="setup_fingerprint_enroll_skip_title" msgid="362050541117362034">"Preskačete otiske prstiju?"</string>
+    <string name="setup_fingerprint_enroll_skip_after_adding_lock_text" msgid="958990414356204763">"Podešavanje otisaka prstiju traje svega minut-dva. Ako preskočite ovo, možete da dodate otisak prsta kasnije u podešavanjima."</string>
+    <string name="lock_screen_intro_skip_title" msgid="4988210105913705679">"Preskačete zaključavanje ekrana?"</string>
     <string name="lock_screen_intro_skip_dialog_text_frp" product="tablet" msgid="1581834104051243425">"Funkcije zaštite uređaja neće biti uključene. Nećete moći da sprečite druge ljude da koriste ovaj tablet ako bude izgubljen, ukraden ili resetovan."</string>
     <string name="lock_screen_intro_skip_dialog_text_frp" product="device" msgid="4629503416877189572">"Funkcije zaštite uređaja neće biti uključene. Nećete moći da sprečite druge ljude da koriste ovaj uređaj ako bude izgubljen, ukraden ili resetovan."</string>
     <string name="lock_screen_intro_skip_dialog_text_frp" product="default" msgid="2423428240245737909">"Funkcije zaštite uređaja neće biti uključene. Nećete moći da sprečite druge ljude da koriste ovaj telefon ako bude izgubljen, ukraden ili resetovan."</string>
@@ -460,7 +465,7 @@
     <string name="setup_lock_settings_picker_title" product="tablet" msgid="90329443364067215">"Zaštitite tablet"</string>
     <string name="setup_lock_settings_picker_title" product="device" msgid="2399952075134938929">"Zaštitite uređaj"</string>
     <string name="setup_lock_settings_picker_title" product="default" msgid="1572244299605153324">"Zaštitite telefon"</string>
-    <string name="setup_lock_settings_picker_fingerprint_message" msgid="5585650064305600578">"Radi veće bezbednosti podesite rezervni metod za zaključavanje ekrana."</string>
+    <string name="lock_settings_picker_fingerprint_added_security_message" msgid="5768002109707648463">"Radi dodatne bezbednosti podesite rezervni metod za zaključavanje ekrana."</string>
     <string name="setup_lock_settings_picker_message" product="tablet" msgid="8919671129189936210">"Sprečite druge da koriste ovaj tablet 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="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>
@@ -597,6 +602,7 @@
     <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="lockpassword_clear_label" msgid="5724429464960458155">"Obriš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>
@@ -792,6 +798,7 @@
     <string name="wifi_wps_failed_tkip" msgid="4282401586860713349">"Bezbednosno podešavanje bežičnog rutera (TKIP) nije podržano"</string>
     <string name="wifi_wps_failed_auth" msgid="1174614355181181958">"Potvrda autentičnosti nije uspela. Probajte ponovo."</string>
     <string name="wifi_wps_failed_overlap" msgid="5159533685596844778">"Otkrivena je druga WPS sesija. Probajte ponovo za nekoliko minuta."</string>
+    <string name="wifi_wps_failed_wifi_disconnected" msgid="3829472117754104164">"Prekinuta je veza sa Wi‑Fi-jem. Podešavanje WPS-a je otkazano."</string>
     <string name="wifi_ssid" msgid="5519636102673067319">"Ime mreže"</string>
     <string name="wifi_ssid_hint" msgid="897593601067321355">"Unesite SSID"</string>
     <string name="wifi_security" msgid="6603611185592956936">"Bezbednost"</string>
@@ -828,6 +835,8 @@
     <string name="wifi_wps_available_first_item" msgid="4422547079984583502">"WPS je dostupan"</string>
     <string name="wifi_wps_available_second_item" msgid="8427520131718215301">" (WPS je dostupan)"</string>
     <string name="wifi_wps_nfc_enter_password" msgid="2288214226916117159">"Unesite lozinku za mrežu"</string>
+    <string name="wifi_carrier_connect" msgid="8174696557882299911">"Wi‑Fi mreža mobilnog operatera"</string>
+    <string name="wifi_carrier_content" msgid="4634077285415851933">"Povežite se preko <xliff:g id="NAME">%1%s</xliff:g>"</string>
     <string name="wifi_scan_always_turnon_message" msgid="203123538572122989">"Zbog poboljšanja preciznosti lokacije i u druge svrhe, <xliff:g id="APP_NAME">%1$s</xliff:g> želi da uključi skeniranje mreže čak i kada je Wi-Fi isključen.\n\nŽelite li da dozvolite ovo za sve aplikacije koje žele da skeniraju?"</string>
     <string name="wifi_scan_always_turnoff_message" msgid="5538901671131941043">"Da biste ovo isključili, idite na Napredno u preklopnom meniju."</string>
     <string name="wifi_scan_always_confirm_allow" msgid="5355973075896817232">"Dozvoli"</string>
@@ -845,6 +854,7 @@
     <string name="wifi_connect" msgid="1076622875777072845">"Poveži"</string>
     <string name="wifi_failed_connect_message" msgid="8491902558970292871">"Povezivanje sa mrežom nije uspelo"</string>
     <string name="wifi_forget" msgid="8168174695608386644">"Zaboravi"</string>
+    <string name="wifi_modify" msgid="6100248070440710782">"Izmeni"</string>
     <string name="wifi_failed_forget_message" msgid="1348172929201654986">"Brisanje mreže nije uspelo"</string>
     <string name="wifi_save" msgid="3331121567988522826">"Sačuvaj"</string>
     <string name="wifi_failed_save_message" msgid="6650004874143815692">"Čuvanje mreže nije uspelo"</string>
@@ -858,6 +868,7 @@
     <string name="wifi_advanced_titlebar" msgid="4485841401774142908">"Napredna Wi-Fi podešavanja"</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_title" msgid="3471132676909349382">"Informacije o mreži"</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="6734119149106422148">"IPv6 adrese"</string>
@@ -890,16 +901,15 @@
     <string name="wifi_p2p_cancel_connect_title" msgid="255267538099324413">"Želite li da otkažete pozivnicu?"</string>
     <string name="wifi_p2p_cancel_connect_message" msgid="7477756213423749402">"Želite li da otkažete pozivnicu za povezivanje sa uređajem <xliff:g id="PEER_NAME">%1$s</xliff:g>?"</string>
     <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_off_subtext" msgid="5466126533609394170">"Ni internet ni sadržaj se ne dele sa drugim uređajima"</string>
     <string name="wifi_hotspot_tethering_on_subtext" product="tablet" msgid="5752490509369962007">"Internet veza ovog tableta se deli preko hotspota"</string>
     <string name="wifi_hotspot_tethering_on_subtext" product="default" msgid="6461075246164300670">"Internet veza ovog telefona se deli preko hotspota"</string>
     <string name="wifi_hotspot_on_local_only_subtext" msgid="2068110388011294735">"Aplikacija deli sadržaj. Da biste delili internet vezu, isključite, pa uključite hotspot"</string>
-    <string name="wifi_hotspot_name_title" msgid="1341735529132128887">"Naziv Wi‑Fi hotspota"</string>
+    <string name="wifi_hotspot_name_title" msgid="8237000746618636778">"Naziv hotspota"</string>
     <string name="wifi_hotspot_name_summary_connecting" msgid="3378299995508671967">"<xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g> se uključuje..."</string>
     <string name="wifi_hotspot_name_summary_connected" msgid="3888672084861445362">"Drugi uređaji mogu da se povežu sa hotspotom <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>"</string>
-    <string name="wifi_hotspot_password_title" msgid="1955592302902091281">"Lozinka za Wi-Fi"</string>
+    <string name="wifi_hotspot_password_title" msgid="8676859981917573801">"Lozinka hotspota"</string>
     <string name="wifi_hotspot_ap_band_title" msgid="1165801173359290681">"Opseg pristupne tačke"</string>
     <string name="wifi_hotspot_footer_info_regular" msgid="1203489406068036455">"Koristite hotspot da biste napravili Wi‑Fi mrežu za druge uređaje. Hotspot pruža internet pomoću mreže za mobilne podatke. Možda će važiti dodatne tarife za mobilne podatke."</string>
     <string name="wifi_hotspot_footer_info_local_only" msgid="857988412470694109">"Aplikacije mogu da prave hotspotove za deljenje sadržaja sa obližnjim uređajima."</string>
@@ -910,7 +920,6 @@
     <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>
     <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>
@@ -951,7 +960,7 @@
     <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="emergency_address_summary" msgid="3266760199681945746">"Adresa koju koriste hitne službe kao vašu lokaciju ako uputite hitni poziv pomoću Wi-Fi-ja"</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>
@@ -1005,6 +1014,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="search_clear_history" msgid="4196658962573162457">"Obriši istoriju"</string>
     <string name="display_settings" msgid="7965901687241669598">"Ekran"</string>
     <string name="accelerometer_title" msgid="7854608399547349157">"Automatsko rotiranje ekrana"</string>
     <string name="color_mode_title" msgid="3159275920408338215">"Živopisne boje"</string>
@@ -1016,7 +1026,7 @@
     <string name="brightness_title" msgid="5746272622112982836">"Osvetljenost"</string>
     <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" msgid="1799041158760605375">"Optimizuj 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>
@@ -1061,14 +1071,14 @@
     <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="7302740999250873332">"Dok se puni ili je na baznoj stanici"</string>
+    <string name="screensaver_settings_summary_either_long" msgid="7302740999250873332">"Tokom punjenja ili 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="7262410541382890146">"Kada početi"</string>
+    <string name="screensaver_settings_when_to_dream" msgid="7262410541382890146">"Kada da počne"</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>
@@ -1079,7 +1089,7 @@
     <string name="ambient_display_screen_summary_notifications" msgid="1449570742600868654">"Nova obaveštenja"</string>
     <string name="ambient_display_category_triggers" msgid="4359289754456268573">"Kada da se prikazuje"</string>
     <string name="doze_title" msgid="2375510714460456687">"Nova obaveštenja"</string>
-    <string name="doze_summary" msgid="3846219936142814032">"Probudite ekran kada primite obaveštenja"</string>
+    <string name="doze_summary" msgid="3846219936142814032">"Probudi ekran kada primim obaveštenja"</string>
     <string name="doze_always_on_title" msgid="1046222370442629646">"Uvek uključeno"</string>
     <string name="doze_always_on_summary" msgid="6978257596231155345">"Prikazuje vreme, ikone obaveštenja i druge informacije. Veća potrošnja baterije."</string>
     <string name="title_font_size" msgid="4405544325522105222">"Veličina fonta"</string>
@@ -1135,7 +1145,6 @@
     <string name="baseband_version" msgid="1848990160763524801">"Verzija osnovnog propusnog opsega"</string>
     <string name="kernel_version" msgid="9192574954196167602">"Verzija jezgra"</string>
     <string name="build_number" msgid="3075795840572241758">"Broj verzije"</string>
-    <string name="selinux_status" msgid="6212165375172061672">"SELinux status"</string>
     <string name="device_info_not_available" msgid="8062521887156825182">"Nije dostupno"</string>
     <string name="device_status_activity_title" msgid="1411201799384697904">"Status"</string>
     <string name="device_status" msgid="607405385799807324">"Status"</string>
@@ -1163,7 +1172,6 @@
     <string name="status_wifi_mac_address" msgid="2202206684020765378">"Wi-Fi MAC adresa"</string>
     <string name="status_bt_address" msgid="4195174192087439720">"Bluetooth adresa"</string>
     <string name="status_serial_number" msgid="2257111183374628137">"Serijski broj"</string>
-    <string name="status_unavailable" msgid="7862009036663793314">"Nedostupno"</string>
     <string name="status_up_time" msgid="7294859476816760399">"Vreme rada"</string>
     <string name="status_awake_time" msgid="2393949909051183652">"Vreme buđenja"</string>
     <string name="internal_memory" msgid="9129595691484260784">"Interno skladište"</string>
@@ -1339,6 +1347,7 @@
     <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="6254873816990678620">"Opcije za resetovanje"</string>
+    <string name="reset_dashboard_summary" msgid="4851012632493522755">"Mreža, aplikacije ili uređaj mogu da se resetuju"</string>
     <string name="reset_network_title" msgid="6166025966016873843">"Resetuj Wi-Fi, mobilnu mrežu i Bluetooth"</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>
@@ -1347,18 +1356,14 @@
     <string name="reset_network_confirm_title" msgid="1759888886976962773">"Želite da resetujete?"</string>
     <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="6617679904229218425">"Izbriši sve podatke (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_title" msgid="3531267871084279512">"Izbriši sve podatke (resetovanje na fabrička podešavanja)"</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>
     <string name="master_clear_other_users_present" product="default" msgid="5161423070702470742">\n\n"Na ovom uređaju su prisutni i drugi korisnici.\n"</string>
     <string name="master_clear_desc_also_erases_external" msgid="1903185203791274237"><li>"Muzika"</li>\n<li>"Fotografije"</li>\n<li>"Drugi korisnički podaci"</li></string>
+    <string name="master_clear_desc_also_erases_esim" msgid="312352697653096008"><li>"Mobilni operateri na eSIM-u"</li></string>
+    <string name="master_clear_desc_no_cancel_mobile_plan" msgid="5460926449093211144">\n\n"Na taj način nećete otkazati mobilni tarifni paket."</string>
     <string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="7744115866662613411">\n\n"Da biste obrisali muziku, slike i druge korisničke podatke, treba da izbrišete "<b>"USB memoriju"</b>"."</string>
     <string name="master_clear_desc_erase_external_storage" product="default" msgid="4801026652617377093">\n\n"Da biste obrisali muziku, slike i druge korisničke podatke, treba da izbrišete sadržaj "<b>"SD kartice"</b>"."</string>
     <string name="erase_external_storage" product="nosdcard" msgid="969364037450286809">"Izbriši USB memoriju"</string>
@@ -1475,15 +1480,16 @@
     <string name="settings_safetylegal_activity_title" msgid="6901214628496951727">"Bezbednosne informacije"</string>
     <string name="settings_safetylegal_activity_unreachable" msgid="250674109915859456">"Nemate vezu za prenos podataka. Da biste odmah pogledali ove informacije, idite na %s sa bilo kog računara koji je povezan sa internetom."</string>
     <string name="settings_safetylegal_activity_loading" msgid="8059022597639516348">"Učitava se…"</string>
-    <string name="lockpassword_choose_your_password_header" msgid="8624900666929394990">"Odaberite lozinku"</string>
-    <string name="lockpassword_choose_your_password_header_for_fingerprint" msgid="6624409510609085450">"Podesite lozinku da biste koristili otisak"</string>
-    <string name="lockpassword_choose_your_pattern_header" msgid="6949761069941694050">"Izaberite šablon"</string>
-    <string name="lockpassword_choose_your_pattern_header_for_fingerprint" msgid="5901096361617543819">"Podesite šablon da biste koristili otisak"</string>
-    <string name="lockpassword_choose_your_pin_header" msgid="7598849519816138302">"Odaberite PIN"</string>
-    <string name="lockpassword_choose_your_pin_header_for_fingerprint" msgid="765344692615917183">"Podesite PIN da biste koristili otisak"</string>
-    <string name="lockpassword_confirm_your_password_header" msgid="6308478184889846633">"Potvrdite lozinku"</string>
+    <string name="lockpassword_choose_your_screen_lock_header" msgid="3872462096767152394">"Podesite zaključavanje ekrana"</string>
+    <string name="lockpassword_choose_your_password_message" msgid="1197569283524841412">"Podesite lozinku iz bezbednosnih razloga"</string>
+    <string name="lockpassword_choose_your_password_header_for_fingerprint" msgid="2541818487015343503">"Podesite lozinku radi korišćenja otiska"</string>
+    <string name="lockpassword_choose_your_pattern_header_for_fingerprint" msgid="7709785406243556723">"Podesite šablon radi korišćenja otiska"</string>
+    <string name="lockpassword_choose_your_pin_message" msgid="1875420718677275646">"Podesite PIN iz bezbednosnih razloga"</string>
+    <string name="lockpassword_choose_your_pin_header_for_fingerprint" msgid="1549639053195796674">"Podesite PIN da biste koristili otisak"</string>
+    <string name="lockpassword_choose_your_pattern_message" msgid="5986983400689720015">"Podesite šablon iz bezbednosnih razloga"</string>
+    <string name="lockpassword_confirm_your_password_header" msgid="1266027268220850931">"Ponovo unesite lozinku"</string>
     <string name="lockpassword_confirm_your_pattern_header" msgid="7543433733032330821">"Potvrdite šablon"</string>
-    <string name="lockpassword_confirm_your_pin_header" msgid="49038294648213197">"Potvrdite PIN"</string>
+    <string name="lockpassword_confirm_your_pin_header" msgid="7744513791910572550">"Ponovo unesite PIN"</string>
     <string name="lockpassword_confirm_passwords_dont_match" msgid="5140892109439191415">"Lozinke se ne podudaraju"</string>
     <string name="lockpassword_confirm_pins_dont_match" msgid="7226244811505606217">"PIN-ovi se ne podudaraju"</string>
     <string name="lockpassword_choose_lock_generic_header" msgid="3811438094903786145">"Izbor načina otključavanja"</string>
@@ -1502,6 +1508,12 @@
     <string name="lockpassword_strong_auth_required_work_pattern" msgid="3003781907040522053">"Radi veće bezbednosti koristite šablon za Work"</string>
     <string name="lockpassword_strong_auth_required_work_pin" msgid="3367491332598821552">"Radi veće bezbednosti unesite PIN za Work"</string>
     <string name="lockpassword_strong_auth_required_work_password" msgid="8159775129968582940">"Radi veće bezbednosti unesite lozinku za Work"</string>
+    <string name="lockpassword_confirm_your_pattern_details_frp" msgid="6757336656791723193">"Telefon je resetovan na fabrička podešavanja. Da biste ga koristili, unesite prethodni šablon."</string>
+    <string name="lockpassword_confirm_your_pin_details_frp" msgid="826520613445990470">"Telefon je resetovan na fabrička podešavanja. Da biste ga koristili, unesite prethodni PIN."</string>
+    <string name="lockpassword_confirm_your_password_details_frp" msgid="8944081074615739040">"Telefon je resetovan na fabrička podešavanja. Da biste ga koristili, unesite prethodnu lozinku."</string>
+    <string name="lockpassword_confirm_your_pattern_header_frp" msgid="2898036091609128286">"Verifikujte šablon"</string>
+    <string name="lockpassword_confirm_your_pin_header_frp" msgid="4141601774778898803">"Verifikujte PIN"</string>
+    <string name="lockpassword_confirm_your_password_header_frp" msgid="3762615419295360480">"Verifikujte lozinku"</string>
     <string name="lockpassword_invalid_pin" msgid="15588049067548470">"Pogrešan PIN"</string>
     <string name="lockpassword_invalid_password" msgid="4038507398784975200">"Pogrešna lozinka"</string>
     <string name="lockpattern_need_to_unlock_wrong" msgid="1745247595356012176">"Pogrešan šablon"</string>
@@ -1551,7 +1563,6 @@
     <string name="install_applications_title" msgid="4987712352256508946">"Dozvoli sve izvore aplikacija"</string>
     <string name="recent_app_category_title" msgid="6673071268966003928">"Nedavno otvarane aplikacije"</string>
     <string name="see_all_apps_title" msgid="1317153498074308438">"Prikaži sve aplikacije: <xliff:g id="COUNT">%1$d</xliff:g>"</string>
-    <string name="recent_app_summary" msgid="3366446669844932300">"pre <xliff:g id="TIME">^1</xliff:g>"</string>
     <string name="install_all_warning" product="tablet" msgid="8310489909586138165">"Tablet i lični podaci su podložniji napadu nepoznatih aplikacija. Instaliranjem aplikacija iz ovog izvora prihvatate da ste odgovorni za oštećenja telefona ili gubitak podataka do kojih može da dođe zbog njihovog korišćenja."</string>
     <string name="install_all_warning" product="default" msgid="1952257127370115988">"Telefon i lični podaci su podložniji napadu nepoznatih aplikacija. Instaliranjem aplikacija iz ovog izvora prihvatate da ste odgovorni za oštećenja telefona ili gubitak podataka do kojih može da dođe zbog njihovog korišćenja."</string>
     <string name="advanced_settings" msgid="1777249286757067969">"Napredna podešavanja"</string>
@@ -1816,7 +1827,7 @@
     <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="vision_settings_suggestion_title" msgid="917294957154878441">"Povećaj veličinu fonta"</string>
+    <string name="vision_settings_suggestion_title" msgid="8058794060304707004">"Promenite veličinu fonta"</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>
@@ -1853,7 +1864,6 @@
     <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="preference_summary_default_combination" msgid="8532964268242666060">"<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>
@@ -1958,7 +1968,7 @@
     <string name="print_service_disabled" msgid="7739452396114245222">"Usluga je onemogućena"</string>
     <string name="print_print_jobs" msgid="3582094777756968793">"Zadaci za štampanje"</string>
     <string name="print_print_job" msgid="7563741676053287211">"Zadatak za štampanje"</string>
-    <string name="print_restart" msgid="8373999687329384202">"Ponovo pokreni"</string>
+    <string name="print_restart" msgid="8373999687329384202">"Restartuj"</string>
     <string name="print_cancel" msgid="3621199386568672235">"Otkaži"</string>
     <string name="print_job_summary" msgid="8472427347192930694">"<xliff:g id="PRINTER">%1$s</xliff:g>\n<xliff:g id="TIME">%2$s</xliff:g>"</string>
     <string name="print_printing_state_title_template" msgid="5736107667714582025">"Štampa se <xliff:g id="PRINT_JOB_NAME">%1$s</xliff:g>"</string>
@@ -1979,12 +1989,14 @@
     <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="background_activity_summary_whitelisted" msgid="7375400051141016808">"Aplikacija ne može da se optimizuje za korišćenje baterije"</string>
+    <string name="background_activity_warning_dialog_title" msgid="2216249969149568871">"Želite li da ograničite aktivnosti u pozadini?"</string>
+    <string name="background_activity_warning_dialog_text" msgid="7049624449246121981">"Ako ograničite aktivnosti aplikacije u pozadini, možda će se ponašati neočekivano."</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_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="power_usage_list_summary" msgid="6393929085382334341">"Korišćenje aplikacije od potpunog punjenja (<xliff:g id="RELATIVE_TIME">^1</xliff:g>)"</string>
+    <string name="power_usage_list_summary_device" msgid="4461926045610455423">"Korišćenje uređaja od potpunog punjenja (<xliff:g id="RELATIVE_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>
@@ -2002,8 +2014,8 @@
     <!-- no translation found for battery_stats_last_duration (1535831453827905957) -->
     <skip />
     <string name="awake" msgid="387122265874485088">"Vreme buđenja uređaja"</string>
-    <string name="wifi_on_time" msgid="3208518458663637035">"Wi-Fi na vreme"</string>
-    <string name="bluetooth_on_time" msgid="3056108148042308690">"Wi-Fi na vreme"</string>
+    <string name="wifi_on_time" msgid="3208518458663637035">"Vreme od uključivanja Wi-Fi mreže"</string>
+    <string name="bluetooth_on_time" msgid="3056108148042308690">"Vreme od uključivanja Wi-Fi mreže"</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="battery_details_title" msgid="6101394441569858580">"Potrošnja baterije"</string>
@@ -2127,7 +2139,7 @@
     <string name="battery_saver_turn_on_automatically_never" msgid="6610846456314373">"Nikada"</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">"Procenat napunjenosti baterije"</string>
-    <string name="battery_percentage_description" msgid="8511658577507384014">"Prikazuje procenat napunjenosti baterije na statusnoj traci"</string>
+    <string name="battery_percentage_description" msgid="8511658577507384014">"Prikaži procenat napunjenosti baterije na statusnoj traci"</string>
     <string name="process_stats_summary_title" msgid="1144688045609771677">"Statistika procesa"</string>
     <string name="process_stats_summary" msgid="109387941605607762">"Štreberska statistika o aktivnim procesima"</string>
     <string name="app_memory_use" msgid="7849258480392171939">"Iskorišćenost memorije"</string>
@@ -2230,14 +2242,14 @@
     <string name="credentials_unlock_hint" msgid="2301301378040499348">"Unesite lozinku za skladište akreditiva."</string>
     <string name="credentials_old_password" msgid="7553393815538684028">"Trenutna lozinka:"</string>
     <string name="credentials_reset_hint" msgid="6297256880896133631">"Želite li da uklonite sav sadržaj?"</string>
-    <string name="credentials_password_too_short" msgid="7502749986405522663">"Lozinka mora da ima najmanje 8 znakova."</string>
     <string name="credentials_wrong_password" msgid="2541932597104054807">"Netačna lozinka."</string>
     <string name="credentials_reset_warning" msgid="5320653011511797600">"Netačna lozinka. Imate još jedan unos pre brisanja skladišta akreditiva."</string>
     <string name="credentials_reset_warning_plural" msgid="6514085665301095279">"Netačna lozinka. Imate još <xliff:g id="NUMBER">%1$d</xliff:g> unosa pre brisanja skladišta akreditiva."</string>
     <string name="credentials_erased" msgid="2907836028586342969">"Skladište akreditiva je izbrisano."</string>
     <string name="credentials_not_erased" msgid="7685932772284216097">"Nije moguće obrisati skladište akreditiva."</string>
     <string name="credentials_enabled" msgid="7588607413349978930">"Skladište akreditiva je omogućeno."</string>
-    <string name="credentials_configure_lock_screen_hint" msgid="6757119179588664966">"Treba da podesite PIN ili lozinku za zaključavanje ekrana da biste mogli da koristite skladište akreditiva."</string>
+    <string name="credentials_configure_lock_screen_hint" msgid="8058230497337529036">"Da biste mogli da koristite skladište akreditiva, uređaj mora da ima bezbednu opciju za zaključavanje ekrana"</string>
+    <string name="credentials_configure_lock_screen_button" msgid="253239765216055321">"PODESITE ZAKLJUČAVANJE"</string>
     <string name="usage_access_title" msgid="332333405495457839">"Apl. sa pristupom podacima o korišćenju"</string>
     <string name="emergency_tone_title" msgid="1055954530111587114">"Ton za hitne pozive"</string>
     <string name="emergency_tone_summary" msgid="722259232924572153">"Podešavanje ponašanja kada se uspostavlja hitan poziv"</string>
@@ -2357,8 +2369,6 @@
     <skip />
     <string name="cant_sync_dialog_title" msgid="2777238588398046285">"Ručno sinhronizovanje nije moguće"</string>
     <string name="cant_sync_dialog_message" msgid="1938380442159016449">"Sinhronizacija za ovu stavku je trenutno onemogućena. Da biste promenili ovo podešavanje, privremeno uključite pozadinske podatke i automatsku sinhronizaciju."</string>
-    <string name="wimax_settings" msgid="2655139497028469039">"4G"</string>
-    <string name="status_wimax_mac_address" msgid="8390791848661413416">"4G MAC adresa"</string>
     <string name="enter_password" msgid="8035706727471334122">"Da biste pokrenuli Android, unesite lozinku"</string>
     <string name="enter_pin" msgid="5305333588093263790">"Da biste pokrenuli Android, unesite PIN"</string>
     <string name="enter_pattern" msgid="4187435713036808566">"Da biste pokrenuli Android, nacrtajte šablon"</string>
@@ -2372,6 +2382,7 @@
     <string name="misc_files_selected_count" msgid="4647048020823912088">"izabrano je <xliff:g id="NUMBER">%1$d</xliff:g> od <xliff:g id="TOTAL">%2$d</xliff:g>"</string>
     <string name="misc_files_selected_count_bytes" msgid="2876232009069114352">"<xliff:g id="NUMBER">%1$s</xliff:g> od <xliff:g id="TOTAL">%2$s</xliff:g>"</string>
     <string name="select_all" msgid="1562774643280376715">"Izaberi sve"</string>
+    <string name="data_plan_usage_manage_plans_button_text" msgid="8997761990902708162">"Upravljaj paketima"</string>
     <string name="data_usage_summary_title" msgid="3804110657238092929">"Korišćenje podataka"</string>
     <string name="data_usage_app_summary_title" msgid="4147258989837459172">"Korišćenje podataka aplik."</string>
     <string name="data_usage_accounting" msgid="7170028915873577387">"Obračun podataka kod mobilnog operatera se možda razlikuje od vašeg uređaja."</string>
@@ -2427,9 +2438,9 @@
     <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>
     <string name="data_usage_restrict_denied_dialog" msgid="55012417305745608">"Ograničavanje pozadinskih podataka je moguće samo kada budete podesili ograničenje za mobilne podatke."</string>
-    <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_on_dialog_title" msgid="2438617846762244389">"Uključujete auto. sinhronizaciju?"</string>
+    <string name="data_usage_auto_sync_on_dialog" product="tablet" msgid="8581983093524041669">"Sve promene koje unesete na 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 na 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č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>
@@ -2457,6 +2468,9 @@
     <string name="data_usage_metered_mobile" msgid="5423305619126978393">"Mobilne mreže"</string>
     <string name="data_usage_metered_wifi" msgid="1761738002328299714">"Wi‑Fi mreže sa ograničenjem"</string>
     <string name="data_usage_metered_wifi_disabled" msgid="727808462375941567">"Da biste izabrali mreže sa ograničenjem, uključite Wi-Fi."</string>
+    <string name="data_usage_metered_auto" msgid="1262028400911918865">"Automatski"</string>
+    <string name="data_usage_metered_yes" msgid="9217539611385225894">"Sa ograničenjem"</string>
+    <string name="data_usage_metered_no" msgid="4025232961929071789">"Bez ograničenja"</string>
     <string name="data_usage_disclaimer" msgid="6887858149980673444">"Obračun podataka kod mobilnog operatera se možda razlikuje od vašeg uređaja."</string>
     <string name="cryptkeeper_emergency_call" msgid="198578731586097145">"Hitan poziv"</string>
     <string name="cryptkeeper_return_to_call" msgid="5613717339452772491">"Nazad na poziv"</string>
@@ -2548,9 +2562,6 @@
     <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>
-    <string name="selinux_status_disabled" msgid="924551035552323327">"Onemogućeno"</string>
-    <string name="selinux_status_permissive" msgid="6004965534713398778">"Omogućeno"</string>
-    <string name="selinux_status_enforcing" msgid="2252703756208463329">"Sprovođenje"</string>
     <string name="ssl_ca_cert_warning" msgid="2045866713601984673">"Mreža se možda nadgleda"</string>
     <string name="done_button" msgid="1991471253042622230">"Gotovo"</string>
     <plurals name="ssl_ca_cert_dialog_title" formatted="false" msgid="7145092748045794650">
@@ -2596,10 +2607,10 @@
     <string name="user_add_user_title" msgid="2108112641783146007">"Dodajete novog korisnika?"</string>
     <string name="user_add_user_message_long" msgid="8562152293752222985">"Ovaj uređaj sa možete da delite drugim ljudima ako napravite još korisnika. Svaki korisnik ima sopstveni prostor, koji može da prilagođava pomoću aplikacija, pozadine i tako dalje. Korisnici mogu da prilagođavaju i podešavanja uređaja koja utiču na svakoga, poput Wi‑Fi-ja.\n\nKada dodate novog korisnika, ta osoba treba da podesi sopstveni prostor.\n\nSvaki korisnik može da ažurira aplikacije za sve ostale korisnike."</string>
     <string name="user_add_user_message_short" msgid="1511354412249044381">"Kada dodate novog korisnika, ta osoba treba da podesi sopstveni prostor.\n\nSvaki korisnik može da ažurira aplikacije za sve ostale korisnike."</string>
-    <string name="user_setup_dialog_title" msgid="1765794166801864563">"Podešavate korisnika odmah?"</string>
-    <string name="user_setup_dialog_message" msgid="1004068621380867148">"Proverite da li je osoba dostupna da uzme uređaj i podesi svoj prostor"</string>
+    <string name="user_setup_dialog_title" msgid="1765794166801864563">"Podešavate korisnika?"</string>
+    <string name="user_setup_dialog_message" msgid="1004068621380867148">"Ta osoba treba da uzme uređaj i podesi svoj prostor"</string>
     <string name="user_setup_profile_dialog_message" msgid="3896568553327558731">"Želite li da odmah podesite profil?"</string>
-    <string name="user_setup_button_setup_now" msgid="3391388430158437629">"Podesi odmah"</string>
+    <string name="user_setup_button_setup_now" msgid="3391388430158437629">"Podesi"</string>
     <string name="user_setup_button_setup_later" msgid="3068729597269172401">"Ne sada"</string>
     <string name="user_cannot_manage_message" product="tablet" msgid="7153048188252553320">"Samo vlasnik tableta može da upravlja korisnicima."</string>
     <string name="user_cannot_manage_message" product="default" msgid="959315813089950649">"Samo vlasnik telefona može da upravlja korisnicima."</string>
@@ -2753,6 +2764,7 @@
       <item quantity="few">Prikaži %d skrivene stavke</item>
       <item quantity="other">Prikaži %d skrivenih stavki</item>
     </plurals>
+    <string name="dashboard_suggestion_condition_footer_content_description" msgid="2898588191174845961">"Skupi"</string>
     <string name="network_dashboard_title" msgid="4771589228992391573">"Mreža i internet"</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>
@@ -2835,7 +2847,7 @@
     <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="vibrate_when_ringing_title" msgid="3806079144545849032">"Vibriraj i za pozive"</string>
     <string name="other_sound_settings" msgid="3151004537006844718">"Drugi zvukovi"</string>
     <string name="dial_pad_tones_title" msgid="1999293510400911558">"Tonovi numeričke tastature"</string>
     <string name="screen_locking_sounds_title" msgid="1340569241625989837">"Zvukovi zaključavanja ekrana"</string>
@@ -2856,8 +2868,14 @@
       <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_settings_title" msgid="1066226840983908121">"Ne uznemiravaj"</string>
+    <string name="zen_mode_behavior_settings_title" msgid="1463303933529313969">"Ponašanje"</string>
+    <string name="zen_mode_behavior_allow_title" msgid="3845615648136218141">"Dozvoli zvuke i vibracije od:"</string>
+    <string name="zen_mode_behavior_no_sound" msgid="1219626004723208056">"Bez zvuka"</string>
+    <string name="zen_mode_behavior_total_silence" msgid="6716603819806610626">"Bez zvuka (potpuna tišina)"</string>
+    <string name="zen_mode_behavior_no_sound_except" msgid="4968477585788243114">"Bez zvuka osim za: <xliff:g id="CATEGORIES">%1$s</xliff:g>"</string>
+    <!-- no translation found for zen_mode_behavior_alarms_only (2423480992071472963) -->
+    <skip />
     <string name="zen_mode_automation_settings_title" msgid="4228995740594063774">"Automatska pravila"</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>
@@ -2899,13 +2917,15 @@
     <string name="notifications_title" msgid="8086372779371204971">"Obaveštenja"</string>
     <string name="app_notifications_title" msgid="5810577805218003760">"Obaveštenja aplikacija"</string>
     <string name="notification_channel_title" msgid="2260666541030178452">"Kategorija obaveštenja"</string>
+    <string name="notification_group_title" msgid="7180506440133859601">"Grupa kategorija obaveštenja"</string>
     <string name="notification_importance_title" msgid="848692592679312666">"Važnost"</string>
-    <string name="notification_importance_unspecified" msgid="2196023702875112081">"Neka aplikacija odluči"</string>
+    <string name="notification_importance_unspecified" msgid="6622173510486113958">"Dozvoli zvuk"</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="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="notification_importance_high_silent" msgid="2667033773703765252">"Iskačuće obaveštenje na ekranu"</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>
@@ -2949,8 +2969,14 @@
     <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="channel_group_notifications_off_desc" msgid="1620950416247316370">"Android blokira prikazivanje ove grupe obaveštenja na ovom uređaju"</string>
     <string name="notification_channels" msgid="5346841743182627500">"Kategorije"</string>
     <string name="notification_channels_other" msgid="5645317113885788226">"Drugo"</string>
+    <plurals name="notification_group_summary" formatted="false" msgid="3420621520561455358">
+      <item quantity="one"><xliff:g id="COUNT_1">%d</xliff:g> kategorija</item>
+      <item quantity="few"><xliff:g id="COUNT_1">%d</xliff:g> kategorije</item>
+      <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> kategorija</item>
+    </plurals>
     <string name="no_channels" msgid="3077375508177744586">"Ova aplikacija nije postavila nijedno obaveštenje"</string>
     <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>
@@ -3027,14 +3053,16 @@
     <string name="zen_mode_from_anyone" msgid="2638322015361252161">"Od bilo koga"</string>
     <string name="zen_mode_from_contacts" msgid="2232335406106711637">"Samo od kontakata"</string>
     <string name="zen_mode_from_starred" msgid="2678345811950997027">"Samo od kontakata sa zvezdicom"</string>
-    <string name="zen_mode_from_none" msgid="8219706639954614136">"Niko"</string>
+    <string name="zen_mode_from_none" msgid="8219706639954614136">"Ni od koga"</string>
     <string name="zen_mode_alarms" msgid="2165302777886552926">"Alarmi"</string>
+    <!-- no translation found for zen_mode_media_system_other (8900209390529859777) -->
+    <skip />
     <string name="zen_mode_reminders" msgid="5458502056440485730">"Podsetnici"</string>
     <string name="zen_mode_events" msgid="7914446030988618264">"Događaji"</string>
     <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 roku od <xliff:g id="MINUTES">%d</xliff:g> min, dozvoli poziv"</string>
+    <string name="zen_mode_repeat_callers_summary" msgid="239685342222975733">"Ako ista osoba pozove po drugi put u periodu od <xliff:g id="MINUTES">%d</xliff:g> min"</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>
@@ -3065,6 +3093,7 @@
     <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 uključen ili isključen"</string>
     <string name="notification_app_settings_button" msgid="6685640230371477485">"Podešavanja obaveštenja"</string>
+    <string name="suggestion_button_text" msgid="3275010948381252006">"Potvrdi"</string>
     <string name="device_feedback" msgid="3238056036766293294">"Šalji povratne informacije o uređaju"</string>
     <string name="restr_pin_enter_admin_pin" msgid="1085834515677448072">"Unesite PIN administratora"</string>
     <string name="switch_on_text" msgid="1124106706920572386">"Uključeno"</string>
@@ -3084,7 +3113,7 @@
     <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_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. Želite li zahtev šablona 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>
@@ -3205,7 +3234,7 @@
     <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="1512506948197818534">"Prikaži kompletno korišćenje uređaja"</string>
+    <string name="show_all_apps" msgid="1512506948197818534">"Prikaži korišćenje baterije"</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">
@@ -3255,6 +3284,7 @@
     <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="sms_mirroring_pref" msgid="6475043279147376031">"Preslikavanje SMS-ova"</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>
@@ -3322,7 +3352,7 @@
     <string name="write_settings_title" msgid="4232152481902542284">"Mogu da menjaju podešavanja sistema"</string>
     <string name="write_system_settings" msgid="3482913590601096763">"Menjanje podešavanja sistema"</string>
     <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="permit_write_settings" msgid="658555006453212691">"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>
@@ -3420,9 +3450,12 @@
     <string name="color_temperature" msgid="2070126836910615605">"Hladna temperatura boje"</string>
     <string name="color_temperature_desc" msgid="4793729830226404052">"Koristi hladnije boje ekrana"</string>
     <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="connectivity_monitor_switch" msgid="9059759348648583421">"ConnectivityMonitor"</string>
+    <string name="connectivity_monitor_switch_summary" msgid="2828658652378866401">"ConnectivityMonitor će prikupljati evidenciju kada otkrije problem sa povezivanjem i zatražiće od korisnika da prijavi grešku"</string>
+    <string name="connectivity_monitor_toast" msgid="5551859612881173028">"Restartujte uređaj da biste primenili promenu ConnectivityMonitor-a"</string>
     <string name="camera_hal_hdrplus_switch" msgid="8377365197105267466">"Kamera HAL HDR+"</string>
     <string name="camera_hal_hdrplus_toast" msgid="2063703797270055299">"Da biste primenili promenu na kameru HAL HDR+, restartujte uređaj"</string>
+    <string name="camera_laser_sensor_switch" msgid="8913588990743234440">"Senzor lasera Kamere"</string>
     <string name="ota_disable_automatic_update" msgid="2319639631655915050">"Automatska ažuriranja sistema"</string>
     <string name="usage" msgid="2977875522080448986">"Potrošnja"</string>
     <string name="cellular_data_usage" msgid="2155683719898158203">"Potrošnja mobil. podataka"</string>
@@ -3449,7 +3482,7 @@
     <string name="data_warning" msgid="209133958008062117">"Upozorenje za potrošnju podataka"</string>
     <string name="set_data_limit" msgid="2901526323210516923">"Podesi ograničenje za podatke"</string>
     <string name="data_limit" msgid="1885406964934590552">"Ograničenje za potrošnju podataka"</string>
-    <string name="data_usage_template" msgid="392191945602400904">"Potrošili ste <xliff:g id="ID_1">%1$s</xliff:g> u periodu <xliff:g id="ID_2">%2$s</xliff:g>"</string>
+    <string name="data_usage_template" msgid="2923744765873163859">"Iskoristili ste <xliff:g id="ID_1">%1$s</xliff:g> u periodu <xliff:g id="ID_2">%2$s</xliff:g>"</string>
     <string name="configure" msgid="1029654422228677273">"Konfigurišite"</string>
     <string name="data_usage_other_apps" msgid="3272872663517382050">"Druge aplikacije uključene u upotrebu"</string>
     <plurals name="data_saver_unrestricted_summary" formatted="false" msgid="2635267833484232703">
@@ -3520,7 +3553,7 @@
     <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>
     <string name="reset_shortcut_manager_throttling_complete" msgid="1826770872063707900">"Ograničavanje broja u ShortcutManager-u je resetovano"</string>
-    <string name="notification_suggestion_title" msgid="4506524937307816475">"Kontrolišite obaveštenja na zaklj. ekranu"</string>
+    <string name="notification_suggestion_title" msgid="387052719462473500">"Kontrolišite informacije na zaključanom ekranu"</string>
     <string name="notification_suggestion_summary" msgid="8521159741445416875">"Pregledajte ili sakrijte sadržaj obaveštenja"</string>
     <string name="page_tab_title_summary" msgid="4070309266374993258">"Sve"</string>
     <string name="page_tab_title_support" msgid="8483187649355540109">"Podrška i saveti"</string>
@@ -3528,7 +3561,7 @@
     <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>
-    <string name="bluetooth_disabled" msgid="2456198532288640046">"Nije vidljivo drugim uređajima"</string>
+    <string name="bluetooth_disabled" msgid="6244000672828617410">"Isključeno"</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>
@@ -3633,7 +3666,7 @@
     <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="instant_apps_settings" msgid="8827777916518348213">"Podešavanja instant aplikacija"</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>
@@ -3682,7 +3715,9 @@
     <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>
-    <string name="enterprise_privacy_ca_certs" msgid="5885892204903688909">"Pouzdani akreditivi"</string>
+    <string name="enterprise_privacy_ca_certs_device" msgid="2019652712782510262">"Pouzdani akreditivi"</string>
+    <string name="enterprise_privacy_ca_certs_personal" msgid="2279084820904076599">"Pouzdani akreditivi na ličnom profilu"</string>
+    <string name="enterprise_privacy_ca_certs_work" msgid="6187377647815301809">"Pouzdani akreditivi na profilu za Work"</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>
@@ -3750,6 +3785,8 @@
     <string name="carrier_provisioning" msgid="4398683675591893169">"Informacije o dodeli mobilnog operatera"</string>
     <string name="trigger_carrier_provisioning" msgid="3434865918009286187">"Pokretanje dodele mobilnog operatera"</string>
     <string name="new_device_suggestion_title" msgid="698847081680980774">"Šta je novo i uzbudljivo?"</string>
-    <string name="new_device_suggestion_summary" msgid="7172709269203435870">"Pogledajte 5 najpopularnijih funkcija"</string>
+    <string name="new_device_suggestion_summary" product="default" msgid="206396571522515855">"Upoznajte novi telefon"</string>
+    <string name="new_device_suggestion_summary" product="tablet" msgid="393751455688210956">"Upoznajte novi tablet"</string>
+    <string name="new_device_suggestion_summary" product="device" msgid="2939870049868336652">"Upoznajte novi uređaj"</string>
     <string name="disabled_low_ram_device" msgid="3751578499721173344">"Ova funkcija nije dostupna na ovom uređaju."</string>
 </resources>
diff --git a/res/values-be/arrays.xml b/res/values-be/arrays.xml
index 5b1d2d2..d1568f9 100644
--- a/res/values-be/arrays.xml
+++ b/res/values-be/arrays.xml
@@ -100,8 +100,6 @@
     <!-- no translation found for wifi_security_no_eap:0 (2084555984818107151) -->
     <!-- no translation found for wifi_security_no_eap:1 (397579322683471524) -->
     <!-- no translation found for wifi_security_no_eap:2 (1968820975358150484) -->
-    <!-- no translation found for wifi_ap_security:0 (5251664683198623324) -->
-    <!-- no translation found for wifi_ap_security:1 (7989073072260294673) -->
   <string-array name="wifi_eap_method">
     <item msgid="1160193392455075561">"PEAP"</item>
     <item msgid="7981731051382306293">"TLS"</item>
diff --git a/res/values-be/strings.xml b/res/values-be/strings.xml
index f44e779..7becc9f 100644
--- a/res/values-be/strings.xml
+++ b/res/values-be/strings.xml
@@ -168,7 +168,7 @@
     <string name="bluetooth_map_acceptance_dialog_text" msgid="8712508202081143737">"%1$s спрабуе атрымаць доступ да вашых паведамленняў. Дазволіць доступ да %2$s?"</string>
     <string name="bluetooth_sap_request" msgid="2669762224045354417">"Запыт доступу да SIM"</string>
     <string name="bluetooth_sap_acceptance_dialog_text" msgid="4414253873553608690">"<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g> спрабуе атрымаць доступ да вашай SIM-карты. Прадастаўленне доступу да SIM-карты адключыць перадачу даных на прыладзе на час падлучэння. Даць доступ <xliff:g id="DEVICE_NAME_1">%2$s?</xliff:g>"</string>
-    <string name="bluetooth_device_name_summary" msgid="4757990010751789977">"Бачная для іншых прылад як прылада \"<xliff:g id="DEVICE_NAME">^1</xliff:g>\""</string>
+    <string name="bluetooth_device_name_summary" msgid="522235742194965734">"Бачная для іншых прылад як прылада \"<xliff:g id="DEVICE_NAME">^1</xliff:g>\""</string>
     <string name="bluetooth_paired_device_title" msgid="8638994696317952019">"Вашы прылады"</string>
     <string name="bluetooth_pairing_page_title" msgid="7712127387361962608">"Спалучыце новую прыладу"</string>
     <string name="date_and_time" msgid="9062980487860757694">"Дата і час"</string>
@@ -316,6 +316,8 @@
     <string name="zone_auto" msgid="334783869352026648">"Аўтавызначэнне часавага пояса"</string>
     <string name="zone_auto_summaryOn" msgid="6142830927278458314">"Выкарыстоўваць часавы пояс, атрыманы з сеткі"</string>
     <string name="zone_auto_summaryOff" msgid="2597745783162041390">"Выкарыстоўваць часавы пояс, атрыманы з сеткі"</string>
+    <string name="date_time_24hour_auto" msgid="2117383168985653422">"Аутаматычны 24-гадзінны фармат"</string>
+    <string name="date_time_24hour_auto_summary" msgid="6351812925651480277">"Выкарыстоўваць стандартныя рэгіянальныя налады"</string>
     <string name="date_time_24hour_title" msgid="3203537578602803850">"24‑гадзінны фармат"</string>
     <string name="date_time_24hour" msgid="1193032284921000063">"Выкарыстоўваць 24-гадзінны фармат"</string>
     <string name="date_time_set_time_title" msgid="6296795651349047016">"Час"</string>
@@ -378,6 +380,9 @@
     <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="1961957425135180242">"Далей"</string>
+    <string name="setup_fingerprint_enroll_skip_title" msgid="362050541117362034">"Прапусціць усталёўку адбітка пальца?"</string>
+    <string name="setup_fingerprint_enroll_skip_after_adding_lock_text" msgid="958990414356204763">"Для ўсталёўкі адбітка пальца спатрэбіцца пара хвілін. Вы можаце прапусціць гэты крок і дадаць адбітак пальца пазней у наладах."</string>
+    <string name="lock_screen_intro_skip_title" msgid="4988210105913705679">"Прапусціць наладжванне блакіроўкі экрана?"</string>
     <string name="lock_screen_intro_skip_dialog_text_frp" product="tablet" msgid="1581834104051243425">"Функцыі абароны прылады не будуць уключаны. Вы не зможаце забараніць іншым карыстацца гэтым планшэтам у выпадку згубы, крадзяжу ці скіду налад."</string>
     <string name="lock_screen_intro_skip_dialog_text_frp" product="device" msgid="4629503416877189572">"Функцыі абароны прылады не будуць уключаны. Вы не зможаце забараніць іншым карыстацца гэтай прыладай у выпадку згубы, крадзяжу ці скіду налад."</string>
     <string name="lock_screen_intro_skip_dialog_text_frp" product="default" msgid="2423428240245737909">"Функцыі абароны прылады не будуць уключаны. Вы не зможаце забараніць іншым карыстацца гэтым тэлефонам у выпадку згубы, крадзяжу ці скіду налад."</string>
@@ -463,7 +468,7 @@
     <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="lock_settings_picker_fingerprint_added_security_message" msgid="5768002109707648463">"Для большай бяспекі наладзьце дадатковы спосаб блакіроўкі экрана."</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>
@@ -505,29 +510,37 @@
     <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>
-    <!-- no translation found for unlock_disable_frp_warning_content_pattern_fingerprint (2986105377420905314) -->
-    <skip />
+    <string name="unlock_disable_frp_warning_content_pattern_fingerprint" msgid="2986105377420905314">"Функцыі абароны прылады не будуць працаваць без вашага ўзору разблакіроўкі.<xliff:g id="EMPTY_LINE">
+
+</xliff:g>Вашы захаваныя адбіткі пальцаў таксама будуць выдалены з гэтай прылады, і вы не зможаце выкарыстоўваць іх для разблакіроўкі свайго тэлефона, аўтарызацыі купляў або ўваходу ў праграмы."</string>
     <string name="unlock_disable_frp_warning_content_pin" msgid="586996206210265131">"Функцыі абароны прылады не будуць працаваць без PIN-кода."</string>
-    <!-- no translation found for unlock_disable_frp_warning_content_pin_fingerprint (3370462835533123695) -->
-    <skip />
+    <string name="unlock_disable_frp_warning_content_pin_fingerprint" msgid="3370462835533123695">"Функцыі абароны прылады не будуць працаваць без вашага PIN-кода.<xliff:g id="EMPTY_LINE">
+
+</xliff:g>Вашы захаваныя адбіткі пальцаў таксама будуць выдалены з гэтай прылады, і вы не зможаце выкарыстоўваць іх для разблакіроўкі свайго тэлефона, аўтарызацыі купляў або ўваходу ў праграмы."</string>
     <string name="unlock_disable_frp_warning_content_password" msgid="5420612686852555537">"Функцыі абароны прылады не будуць працаваць без пароля."</string>
-    <!-- no translation found for unlock_disable_frp_warning_content_password_fingerprint (3595476296430536798) -->
-    <skip />
+    <string name="unlock_disable_frp_warning_content_password_fingerprint" msgid="3595476296430536798">"Функцыі абароны прылады не будуць працаваць без вашага пароля.<xliff:g id="EMPTY_LINE">
+
+</xliff:g>Вашы захаваныя адбіткі пальцаў таксама будуць выдалены з гэтай прылады, і вы не зможаце выкарыстоўваць іх для разблакіроўкі свайго тэлефона, аўтарызацыі купляў або ўваходу ў праграмы."</string>
     <string name="unlock_disable_frp_warning_content_unknown" msgid="1550718040483548220">"Функцыі абароны прылады не будуць працаваць без блакіроўкі экрана."</string>
-    <!-- no translation found for unlock_disable_frp_warning_content_unknown_fingerprint (3679351662094349506) -->
-    <skip />
+    <string name="unlock_disable_frp_warning_content_unknown_fingerprint" msgid="3679351662094349506">"Функцыі абароны прылады не будуць працаваць без вашай блакіроўкі экрана.<xliff:g id="EMPTY_LINE">
+
+</xliff:g>Вашы захаваныя адбіткі пальцаў таксама будуць выдалены з гэтай прылады, і вы не зможаце выкарыстоўваць іх для разблакіроўкі свайго тэлефона, аўтарызацыі купляў або ўваходу ў праграмы."</string>
     <string name="unlock_disable_frp_warning_content_pattern_profile" msgid="8682200103576359918">"Абарона профілю не функцыянуе без вашага графічнага ключа."</string>
-    <!-- no translation found for unlock_disable_frp_warning_content_pattern_fingerprint_profile (6718155854303231675) -->
-    <skip />
+    <string name="unlock_disable_frp_warning_content_pattern_fingerprint_profile" msgid="6718155854303231675">"Функцыі абароны профілю не будуць працаваць без вашага ўзору разблакіроўкі.<xliff:g id="EMPTY_LINE">
+
+</xliff:g>Вашы захаваныя адбіткі пальцаў таксама будуць выдалены з гэтага профілю, і вы не зможаце выкарыстоўваць іх для разблакіроўкі свайго профілю, аўтарызацыі купляў або ўваходу ў праграмы."</string>
     <string name="unlock_disable_frp_warning_content_pin_profile" msgid="7790688070593867767">"Абарона профілю не функцыянуе без вашага PIN-кода."</string>
-    <!-- no translation found for unlock_disable_frp_warning_content_pin_fingerprint_profile (4209564603132870532) -->
-    <skip />
+    <string name="unlock_disable_frp_warning_content_pin_fingerprint_profile" msgid="4209564603132870532">"Функцыі абароны профілю не будуць працаваць без вашага PIN-кода.<xliff:g id="EMPTY_LINE">
+
+</xliff:g>Вашы захаваныя адбіткі пальцаў таксама будуць выдалены з гэтага профілю, і вы не зможаце выкарыстоўваць іх для разблакіроўкі свайго профілю, аўтарызацыі купляў або ўваходу ў праграмы."</string>
     <string name="unlock_disable_frp_warning_content_password_profile" msgid="7569285520567674461">"Абарона профілю не функцыянуе без вашага пароля."</string>
-    <!-- no translation found for unlock_disable_frp_warning_content_password_fingerprint_profile (2994300676764706047) -->
-    <skip />
+    <string name="unlock_disable_frp_warning_content_password_fingerprint_profile" msgid="2994300676764706047">"Функцыі абароны профілю не будуць працаваць без вашага пароля.<xliff:g id="EMPTY_LINE">
+
+</xliff:g>Вашы захаваныя адбіткі пальцаў таксама будуць выдалены з гэтага профілю, і вы не зможаце выкарыстоўваць іх для разблакіроўкі свайго профілю, аўтарызацыі купляў або ўваходу ў праграмы."</string>
     <string name="unlock_disable_frp_warning_content_unknown_profile" msgid="6984215718701688202">"Абарона профілю не функцыянуе без вашага спосабу разблакіроўкі экрана."</string>
-    <!-- no translation found for unlock_disable_frp_warning_content_unknown_fingerprint_profile (4994062501123299418) -->
-    <skip />
+    <string name="unlock_disable_frp_warning_content_unknown_fingerprint_profile" msgid="4994062501123299418">"Функцыі абароны профілю не будуць працаваць без вашай блакіроўкі экрана.<xliff:g id="EMPTY_LINE">
+
+</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">"Змяніць PIN-код разблакавання"</string>
@@ -598,6 +611,7 @@
     <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="lockpassword_clear_label" msgid="5724429464960458155">"Ачысціць"</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>
@@ -745,7 +759,7 @@
     <string name="use_open_wifi_automatically_summary_scoring_disabled" msgid="593964217679325831">"Для выкарыстання функцыі выберыце пастаўшчыка паслугі ацэнкі сеткі"</string>
     <string name="use_open_wifi_automatically_summary_scorer_unsupported_disabled" msgid="8472122600853650258">"Для выкарыстання функцыі выберыце сумяшчальнага пастаўшчыка паслугі ацэнкі сеткі"</string>
     <string name="wifi_install_credentials" msgid="3551143317298272860">"Усталёўка сертыфікатаў"</string>
-    <string name="wifi_scan_notify_text" msgid="5593805423071186757">"Для павышэння дакладнасці вызначэння месцазнаходжання сістэмныя дадаткі і службы могуць шукаць сеткі Wi-Fi. Вы можаце змяніць гэта ў <xliff:g id="LINK_BEGIN_0">LINK_BEGIN</xliff:g>наладах сканіравання<xliff:g id="LINK_END_1">LINK_END</xliff:g>."</string>
+    <string name="wifi_scan_notify_text" msgid="5593805423071186757">"Каб больш дакладна вызначаць месцазнаходжанне, сістэмныя праграмы і службы могуць шукаць сеткі Wi-Fi. Вы можаце змяніць гэта ў <xliff:g id="LINK_BEGIN_0">LINK_BEGIN</xliff:g>наладах сканіравання<xliff:g id="LINK_END_1">LINK_END</xliff:g>."</string>
     <string name="wifi_scan_notify_text_scanning_off" msgid="3426075479272242098">"Для павышэння дакладнасці вызначэння месцазнаходжання ўключыце сканіраванне Wi-Fi у <xliff:g id="LINK_BEGIN_0">LINK_BEGIN</xliff:g>наладах сканіравання<xliff:g id="LINK_END_1">LINK_END</xliff:g>."</string>
     <string name="wifi_scan_notify_remember_choice" msgid="7104867814641144485">"Больш не паказваць"</string>
     <string name="wifi_setting_sleep_policy_title" msgid="5149574280392680092">"Захоўваць Wi-Fi уключанай у рэжыме сну"</string>
@@ -795,6 +809,7 @@
     <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">"Iншыя сеансы 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>
@@ -831,6 +846,8 @@
     <string name="wifi_wps_available_first_item" msgid="4422547079984583502">"WPS даступная"</string>
     <string name="wifi_wps_available_second_item" msgid="8427520131718215301">" (WPS даступная)"</string>
     <string name="wifi_wps_nfc_enter_password" msgid="2288214226916117159">"Калі ласка, увядзіце пароль сеткі"</string>
+    <string name="wifi_carrier_connect" msgid="8174696557882299911">"Сетка Wi‑Fi аператара"</string>
+    <string name="wifi_carrier_content" msgid="4634077285415851933">"Падлучыцца праз <xliff:g id="NAME">%1%s</xliff:g>"</string>
     <string name="wifi_scan_always_turnon_message" msgid="203123538572122989">"Каб павысіць дакладнасць размяшчэння і для іншых мэтаў, <xliff:g id="APP_NAME">%1$s</xliff:g> хоча ўключыць сеткавае сканаванне, нават калі Wi-Fi выключаны.\n\nДазволіць для ўсіх прыкладанняў, якія патрабуецца адсканаваць?"</string>
     <string name="wifi_scan_always_turnoff_message" msgid="5538901671131941043">"Каб адключыць гэту наладу, перайдзіце да пункту «Пашыраныя» меню перапаўнення."</string>
     <string name="wifi_scan_always_confirm_allow" msgid="5355973075896817232">"Дазволіць"</string>
@@ -848,6 +865,7 @@
     <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_modify" msgid="6100248070440710782">"Змяніць"</string>
     <string name="wifi_failed_forget_message" msgid="1348172929201654986">"Не атрымалася iгнараваць сетку"</string>
     <string name="wifi_save" msgid="3331121567988522826">"Захаваць"</string>
     <string name="wifi_failed_save_message" msgid="6650004874143815692">"Не атрымалася захаваць сетку"</string>
@@ -862,6 +880,7 @@
     <string name="wifi_advanced_titlebar" msgid="4485841401774142908">"Пашыраны 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_title" msgid="3471132676909349382">"Інфармацыя аб сетцы"</string>
     <string name="wifi_details_subnet_mask" msgid="6720279144174924410">"Маска падсеткі"</string>
     <string name="wifi_details_dns" msgid="8648826607751830768">"DNS"</string>
     <string name="wifi_details_ipv6_address_header" msgid="6734119149106422148">"IPv6-адрасы"</string>
@@ -894,16 +913,15 @@
     <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_hotspot_checkbox_text" msgid="7763495093333664887">"Пункт доступу Wi-Fi"</string>
     <string name="wifi_hotspot_off_subtext" msgid="5466126533609394170">"Не ідзе абагульванне змесціва ці падключэння да інтэрнэту з іншымі прыладамі"</string>
     <string name="wifi_hotspot_tethering_on_subtext" product="tablet" msgid="5752490509369962007">"Абагульванне падключэння да інтэрнэту гэтага планшэта праз хот-спот"</string>
     <string name="wifi_hotspot_tethering_on_subtext" product="default" msgid="6461075246164300670">"Абагульванне падключэння да інтэрнэту гэтага тэлефона праз хот-спот"</string>
     <string name="wifi_hotspot_on_local_only_subtext" msgid="2068110388011294735">"Праграма абагульвае змесціва. Каб абагульваць падключэнне да інтэрнэту, адключыце, а потым зноў уключыце хот-спот"</string>
-    <string name="wifi_hotspot_name_title" msgid="1341735529132128887">"Назва Wi‑Fi"</string>
+    <string name="wifi_hotspot_name_title" msgid="8237000746618636778">"Імя хот-спота"</string>
     <string name="wifi_hotspot_name_summary_connecting" msgid="3378299995508671967">"Ідзе ўключэнне <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>…"</string>
     <string name="wifi_hotspot_name_summary_connected" msgid="3888672084861445362">"Іншыя прылады могуць падключацца да <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>"</string>
-    <string name="wifi_hotspot_password_title" msgid="1955592302902091281">"Пароль Wi-Fi"</string>
+    <string name="wifi_hotspot_password_title" msgid="8676859981917573801">"Пароль хот-спота"</string>
     <string name="wifi_hotspot_ap_band_title" msgid="1165801173359290681">"Дыяпазон для пунктаў доступу"</string>
     <string name="wifi_hotspot_footer_info_regular" msgid="1203489406068036455">"Выкарыстоўвайце хот-спот для стварэння сеткі Wi‑Fi для іншых прылад. Хот-спот дае доступ да інтэрнэту праз падключэнне да мабільнай перадачы даных. Мабільны аператар можа спаганяць дадатковую плату."</string>
     <string name="wifi_hotspot_footer_info_local_only" msgid="857988412470694109">"Праграмы могуць ствараць хот-спот для абагульвання змесціва з прыладамі паблізу."</string>
@@ -914,7 +932,6 @@
     <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>
     <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>
@@ -955,7 +972,7 @@
     <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="emergency_address_summary" msgid="3266760199681945746">"Адрас, які аварыйна-выратавальныя службы прымаюць за ваша месцазнаходжанне пры экстранным выкліку праз Wi-Fi"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"Экран"</string>
     <string name="sound_settings" msgid="5534671337768745343">"Гук"</string>
     <string name="all_volume_title" msgid="4296957391257836961">"Гучнасць"</string>
@@ -1010,6 +1027,7 @@
     <string name="search_settings" msgid="1910951467596035063">"Пошук"</string>
     <string name="search_settings_summary" msgid="9205656546570654169">"Кіраваць наладамі і гісторыяй пошуку"</string>
     <string name="search_settings_no_results" msgid="8799027492641230999">"Вынікаў няма"</string>
+    <string name="search_clear_history" msgid="4196658962573162457">"Ачысціць гісторыю"</string>
     <string name="display_settings" msgid="7965901687241669598">"Дысплэй"</string>
     <string name="accelerometer_title" msgid="7854608399547349157">"Аўтаматычны паварот экрана"</string>
     <string name="color_mode_title" msgid="3159275920408338215">"Насычаныя колеры"</string>
@@ -1080,15 +1098,13 @@
     <string name="automatic_brightness" msgid="5014143533884135461">"Аўтаматычная яркасць"</string>
     <string name="lift_to_wake_title" msgid="4555378006856277635">"Абуджэнне пры падняцці"</string>
     <string name="ambient_display_screen_title" msgid="4252755516328775766">"Неактыўны рэжым экрана"</string>
-    <!-- no translation found for ambient_display_screen_summary_always_on (7337555569694794132) -->
-    <skip />
+    <string name="ambient_display_screen_summary_always_on" msgid="7337555569694794132">"Заўсёды ўключаны / павышае спажыванне зараду"</string>
     <string name="ambient_display_screen_summary_notifications" msgid="1449570742600868654">"Новыя апавяшчэнні"</string>
     <string name="ambient_display_category_triggers" msgid="4359289754456268573">"Калі паказваць"</string>
     <string name="doze_title" msgid="2375510714460456687">"Новыя апавяшчэнні"</string>
     <string name="doze_summary" msgid="3846219936142814032">"Абуджаць экран, калі вы атрымліваеце апавяшчэнні"</string>
     <string name="doze_always_on_title" msgid="1046222370442629646">"Заўсёды ўключана"</string>
-    <!-- no translation found for doze_always_on_summary (6978257596231155345) -->
-    <skip />
+    <string name="doze_always_on_summary" msgid="6978257596231155345">"Паказваць час, значкі паведамленняў і іншую інфармацыю. Павышае спажыванне зараду."</string>
     <string name="title_font_size" msgid="4405544325522105222">"Памер шрыфта"</string>
     <string name="short_summary_font_size" msgid="6819778801232989076">"Павялічыць або паменшыць тэкст"</string>
     <string name="sim_lock_settings" msgid="3392331196873564292">"Налады блакіроўкі SIM-карты"</string>
@@ -1143,7 +1159,6 @@
     <string name="baseband_version" msgid="1848990160763524801">"Версія baseband"</string>
     <string name="kernel_version" msgid="9192574954196167602">"Вэрсія ядра"</string>
     <string name="build_number" msgid="3075795840572241758">"Нумар зборкі"</string>
-    <string name="selinux_status" msgid="6212165375172061672">"Стан SELinux"</string>
     <string name="device_info_not_available" msgid="8062521887156825182">"Недаступны"</string>
     <string name="device_status_activity_title" msgid="1411201799384697904">"Стан"</string>
     <string name="device_status" msgid="607405385799807324">"Стан"</string>
@@ -1171,7 +1186,6 @@
     <string name="status_wifi_mac_address" msgid="2202206684020765378">"MAC-адрас Wi-Fi"</string>
     <string name="status_bt_address" msgid="4195174192087439720">"Адрас Bluetooth"</string>
     <string name="status_serial_number" msgid="2257111183374628137">"Парадкавы нумар"</string>
-    <string name="status_unavailable" msgid="7862009036663793314">"Адсутнічае"</string>
     <string name="status_up_time" msgid="7294859476816760399">"Час працы пасля апошняй загрузкі"</string>
     <string name="status_awake_time" msgid="2393949909051183652">"Час пераходу ў актыўны рэжым"</string>
     <string name="internal_memory" msgid="9129595691484260784">"Унутраная памяць"</string>
@@ -1347,6 +1361,7 @@
     <string name="menu_restore" msgid="8260067415075573273">"Аднавіць налады па змаўчанні"</string>
     <string name="restore_default_apn_completed" msgid="2824775307377604897">"Скід налад кропкі доступу па змаўчанні завершаны."</string>
     <string name="reset_dashboard_title" msgid="6254873816990678620">"Параметры скіду"</string>
+    <string name="reset_dashboard_summary" msgid="4851012632493522755">"Налады сеткі, праграмы або прылады могуць быць скінуты"</string>
     <string name="reset_network_title" msgid="6166025966016873843">"Скінуць налады Wi-Fi, мабільнай перадачы даных і Bluetooth"</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>
@@ -1355,19 +1370,14 @@
     <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="6617679904229218425">"Сцерці ўсе даныя (cкід да заводскіх налад)"</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_title" msgid="3531267871084279512">"Сцерці ўсе даныя (cкід да заводскіх налад)"</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>
     <string name="master_clear_other_users_present" product="default" msgid="5161423070702470742">\n\n"На гэтай прыладзе ёсць іншыя карыстальнікі.\n"</string>
     <string name="master_clear_desc_also_erases_external" msgid="1903185203791274237"><li>"Музыка"</li>\n<li>"Фатаграфіі"</li>\n<li>"Іншыя дадзеныя карыстальніка"</li></string>
+    <string name="master_clear_desc_also_erases_esim" msgid="312352697653096008"><li>"Аператары на eSIM-карце"</li></string>
+    <string name="master_clear_desc_no_cancel_mobile_plan" msgid="5460926449093211144">\n\n"Гэта не прывядзе да скасавання вашага тарыфнага плана."</string>
     <string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="7744115866662613411">\n\n"Каб выдаліць музыку, фатаграфіі і іншыя дадзеныя карыстальніка, трэба ачысціць "<b>"USB-назапашвальнік"</b>"."</string>
     <string name="master_clear_desc_erase_external_storage" product="default" msgid="4801026652617377093">\n\n"Каб выдаліць музыку, фатаграфіі і іншыя дадзеныя карыстальніка, трэба выдаліць інфармацыю з "<b>"SD-карты"</b>"."</string>
     <string name="erase_external_storage" product="nosdcard" msgid="969364037450286809">"Ачысціць USB-назапашвальнiк"</string>
@@ -1484,15 +1494,16 @@
     <string name="settings_safetylegal_activity_title" msgid="6901214628496951727">"Інфармацыя аб бяспецы"</string>
     <string name="settings_safetylegal_activity_unreachable" msgid="250674109915859456">"Падлучэнне да Iнтэрнэту адсутнiчае. Каб прагледзець гэтую інфармацыю зараз, наведайце %s з любога камп\'ютара, падлучанага да Iнтэрнэту."</string>
     <string name="settings_safetylegal_activity_loading" msgid="8059022597639516348">"Загрузка..."</string>
-    <string name="lockpassword_choose_your_password_header" msgid="8624900666929394990">"Выберыце пароль"</string>
-    <string name="lockpassword_choose_your_password_header_for_fingerprint" msgid="6624409510609085450">"Перш чым карыстацца адбіткам пальца, задайце пароль"</string>
-    <string name="lockpassword_choose_your_pattern_header" msgid="6949761069941694050">"Выберыце ўзор разблакіроўкі"</string>
-    <string name="lockpassword_choose_your_pattern_header_for_fingerprint" msgid="5901096361617543819">"Перш чым карыстацца адбіткам пальца, задайце ўзор разблакіроўкі"</string>
-    <string name="lockpassword_choose_your_pin_header" msgid="7598849519816138302">"Выберыце PIN-код"</string>
-    <string name="lockpassword_choose_your_pin_header_for_fingerprint" msgid="765344692615917183">"Каб карыст. адбіт. пальца, задайце PIN-код"</string>
-    <string name="lockpassword_confirm_your_password_header" msgid="6308478184889846633">"Пацвердзіце пароль"</string>
+    <string name="lockpassword_choose_your_screen_lock_header" msgid="3872462096767152394">"Задайце блакіроўку экрана"</string>
+    <string name="lockpassword_choose_your_password_message" msgid="1197569283524841412">"Для большай бяспекі задайце пароль"</string>
+    <string name="lockpassword_choose_your_password_header_for_fingerprint" msgid="2541818487015343503">"Каб карыст. адбіткам пальца, задайце пароль"</string>
+    <string name="lockpassword_choose_your_pattern_header_for_fingerprint" msgid="7709785406243556723">"Каб карыст. адбіткам пальца, задайце ўзор"</string>
+    <string name="lockpassword_choose_your_pin_message" msgid="1875420718677275646">"Для большай бяспекі задайце PIN-код"</string>
+    <string name="lockpassword_choose_your_pin_header_for_fingerprint" msgid="1549639053195796674">"Каб карыст. адбіт. пал., задайце PIN-код"</string>
+    <string name="lockpassword_choose_your_pattern_message" msgid="5986983400689720015">"Для большай бяспекі задайце ўзор"</string>
+    <string name="lockpassword_confirm_your_password_header" msgid="1266027268220850931">"Увядзіце пароль яшчэ раз"</string>
     <string name="lockpassword_confirm_your_pattern_header" msgid="7543433733032330821">"Пацвердзіце ўзор"</string>
-    <string name="lockpassword_confirm_your_pin_header" msgid="49038294648213197">"Пацвердзіце PIN-код"</string>
+    <string name="lockpassword_confirm_your_pin_header" msgid="7744513791910572550">"Увядзіце PIN-код яшчэ раз"</string>
     <string name="lockpassword_confirm_passwords_dont_match" msgid="5140892109439191415">"Паролі не супадаюць"</string>
     <string name="lockpassword_confirm_pins_dont_match" msgid="7226244811505606217">"PIN-коды не супадаюць"</string>
     <string name="lockpassword_choose_lock_generic_header" msgid="3811438094903786145">"Выбар спосабу разблакіроўкі"</string>
@@ -1505,18 +1516,18 @@
     <string name="lockpassword_confirm_your_pattern_generic_profile" msgid="4435638308193361861">"Каб працягнуць, выкарыстайце ўзор свайго працоўнага профілю"</string>
     <string name="lockpassword_confirm_your_pin_generic_profile" msgid="3730141667547002246">"Каб працягнуць, увядзіце PIN-код свайго працоўнага профілю."</string>
     <string name="lockpassword_confirm_your_password_generic_profile" msgid="4250642723467019894">"Каб працягнуць, увядзіце пароль свайго працоўнага профілю"</string>
-    <!-- no translation found for lockpassword_strong_auth_required_device_pattern (530802132223800623) -->
-    <skip />
-    <!-- no translation found for lockpassword_strong_auth_required_device_pin (7829294830078036417) -->
-    <skip />
-    <!-- no translation found for lockpassword_strong_auth_required_device_password (3552644641574796973) -->
-    <skip />
-    <!-- no translation found for lockpassword_strong_auth_required_work_pattern (3003781907040522053) -->
-    <skip />
-    <!-- no translation found for lockpassword_strong_auth_required_work_pin (3367491332598821552) -->
-    <skip />
-    <!-- no translation found for lockpassword_strong_auth_required_work_password (8159775129968582940) -->
-    <skip />
+    <string name="lockpassword_strong_auth_required_device_pattern" msgid="530802132223800623">"Для большай бяспекі выкарыстоўвайце ўзор разблакіроўкі прылады"</string>
+    <string name="lockpassword_strong_auth_required_device_pin" msgid="7829294830078036417">"Для большай бяспекі ўвядзіце PIN-код прылады"</string>
+    <string name="lockpassword_strong_auth_required_device_password" msgid="3552644641574796973">"Для большай бяспекі ўвядзіце пароль прылады"</string>
+    <string name="lockpassword_strong_auth_required_work_pattern" msgid="3003781907040522053">"Для большай бяспекі выкарыстоўвайце ўзор разблакіроўкі свайго працоўнага профілю"</string>
+    <string name="lockpassword_strong_auth_required_work_pin" msgid="3367491332598821552">"Для большай бяспекі ўвядзіце PIN-код свайго працоўнага профілю"</string>
+    <string name="lockpassword_strong_auth_required_work_password" msgid="8159775129968582940">"Для большай бяспекі ўвядзіце пароль свайго працоўнага профілю"</string>
+    <string name="lockpassword_confirm_your_pattern_details_frp" msgid="6757336656791723193">"Тэлефон скінуты да заводскіх налад. Каб выкарыстаць яго, увядзіце папярэдні ўзор разблакіроўкі."</string>
+    <string name="lockpassword_confirm_your_pin_details_frp" msgid="826520613445990470">"Тэлефон скінуты да заводскіх налад. Каб выкарыстаць яго, увядзіце папярэдні PIN-код."</string>
+    <string name="lockpassword_confirm_your_password_details_frp" msgid="8944081074615739040">"Тэлефон скінуты да заводскіх налад. Каб выкарыстаць яго, увядзіце папярэдні пароль."</string>
+    <string name="lockpassword_confirm_your_pattern_header_frp" msgid="2898036091609128286">"Пацвердзіць узор разблакіроўкі"</string>
+    <string name="lockpassword_confirm_your_pin_header_frp" msgid="4141601774778898803">"Пацвердзіць PIN-код"</string>
+    <string name="lockpassword_confirm_your_password_header_frp" msgid="3762615419295360480">"Пацвердзіць пароль"</string>
     <string name="lockpassword_invalid_pin" msgid="15588049067548470">"Няправільны PIN-код"</string>
     <string name="lockpassword_invalid_password" msgid="4038507398784975200">"Няправiльны пароль"</string>
     <string name="lockpattern_need_to_unlock_wrong" msgid="1745247595356012176">"Няправільны ўзор"</string>
@@ -1566,14 +1577,13 @@
     <string name="install_applications_title" msgid="4987712352256508946">"Дазволіць усе крыніцы дадаткаў"</string>
     <string name="recent_app_category_title" msgid="6673071268966003928">"Нядаўна адкрытыя праграмы"</string>
     <string name="see_all_apps_title" msgid="1317153498074308438">"Паказаць усе праграмы (<xliff:g id="COUNT">%1$d</xliff:g> шт.)"</string>
-    <string name="recent_app_summary" msgid="3366446669844932300">"<xliff:g id="TIME">^1</xliff:g> таму"</string>
     <string name="install_all_warning" product="tablet" msgid="8310489909586138165">"Ваш планшэт і асабістыя даныя больш уразлівыя для нападаў невядомых праграм. Пры ўсталёўцы праграм з гэтай крыніцы вы згаджаецеся, што несяце адказнасць за любыя пашкоджанні планшэта ці страту даных, якія могуць адбыцца ў выніку выкарыстання гэтых праграм."</string>
     <string name="install_all_warning" product="default" msgid="1952257127370115988">"Ваш тэлефон і асабістыя даныя больш уразлівыя для нападаў невядомых праграм. Пры ўсталёўцы праграм з гэтай крыніцы вы згаджаецеся, што несяце адказнасць за любыя пашкоджанні тэлефона ці страту даных, якія могуць адбыцца ў выніку выкарыстання гэтых праграм."</string>
     <string name="advanced_settings" msgid="1777249286757067969">"Пашыраныя налады"</string>
     <string name="advanced_settings_summary" msgid="4016682978071086747">"Уключыць дадатковыя параметры налад"</string>
     <string name="application_info_label" msgid="5736524913065714880">"Звесткі пра праграмы"</string>
     <string name="storage_label" msgid="8700867073480107253">"Захоўванне"</string>
-    <string name="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>
@@ -1832,7 +1842,7 @@
     <string name="accessibility_settings_summary" msgid="981260486011624939">"Праграмы чытання з экрана, элементы кіравання дысплэем і ўзаемадзеяннем"</string>
     <string name="vision_settings_title" msgid="4204111425716868288">"Налады для слабых зрокам"</string>
     <string name="vision_settings_description" msgid="5679491180156408260">"Вы можаце наладзіць гэту прыладу так, каб яна адпавядала вашым патрэбам. Гэтыя спецыяльныя функцыі можна змяніць у Наладах."</string>
-    <string name="vision_settings_suggestion_title" msgid="917294957154878441">"Павялiчыць памер шрыфта"</string>
+    <string name="vision_settings_suggestion_title" msgid="8058794060304707004">"Змяніць памер шрыфту"</string>
     <string name="screen_reader_category_title" msgid="7739154903913400641">"Праграмы чытання з экрана"</string>
     <string name="audio_and_captions_category_title" msgid="3420727114421447524">"Аўдыя і тэкст на экране"</string>
     <string name="display_category_title" msgid="685461049938269166">"Дысплэй"</string>
@@ -1869,7 +1879,6 @@
     <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="preference_summary_default_combination" msgid="8532964268242666060">"<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>
@@ -1981,7 +1990,7 @@
     <string name="print_service_disabled" msgid="7739452396114245222">"Служба адключана"</string>
     <string name="print_print_jobs" msgid="3582094777756968793">"Заданні друку"</string>
     <string name="print_print_job" msgid="7563741676053287211">"Заданне друку"</string>
-    <string name="print_restart" msgid="8373999687329384202">"Перазапусціць"</string>
+    <string name="print_restart" msgid="8373999687329384202">"Перазапуск"</string>
     <string name="print_cancel" msgid="3621199386568672235">"Скасаваць"</string>
     <string name="print_job_summary" msgid="8472427347192930694">"<xliff:g id="PRINTER">%1$s</xliff:g>\n<xliff:g id="TIME">%2$s</xliff:g>"</string>
     <string name="print_printing_state_title_template" msgid="5736107667714582025">"Друк <xliff:g id="PRINT_JOB_NAME">%1$s</xliff:g>"</string>
@@ -1993,7 +2002,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>
@@ -2002,12 +2011,14 @@
     <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_whitelisted" msgid="7375400051141016808">"Немагчыма аптымізаваць праграму для лепшага выкарыстання акумулятара"</string>
+    <string name="background_activity_warning_dialog_title" msgid="2216249969149568871">"Абмежаваць фонавую дзейнасць?"</string>
+    <string name="background_activity_warning_dialog_text" msgid="7049624449246121981">"Абмежаванне фонавай дзейнасці праграмы можа прывесці да збояў"</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" msgid="6393929085382334341">"Спажыванне праграмамі з моманту поўнай зарадкі (<xliff:g id="RELATIVE_TIME">^1</xliff:g>)"</string>
+    <string name="power_usage_list_summary_device" msgid="4461926045610455423">"Спажыванне прыладай з моманту поўнай зарадкі (<xliff:g id="RELATIVE_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>
@@ -2253,14 +2264,14 @@
     <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">"Няправільны пароль. У вас ёсць яшчэ некалькi спроб (<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="credentials_configure_lock_screen_hint" msgid="8058230497337529036">"Перш чым вы зможаце карыстацца сховішчам уліковых даных, трэба наладзіць надзейную блакіроўку экрана прылады"</string>
+    <string name="credentials_configure_lock_screen_button" msgid="253239765216055321">"БЛАКІРОЎКА ЭКРАНА"</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>
@@ -2380,8 +2391,6 @@
     <skip />
     <string name="cant_sync_dialog_title" msgid="2777238588398046285">"Немагчыма сінхранізаваць уручную"</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, увядзіце PIN-код"</string>
     <string name="enter_pattern" msgid="4187435713036808566">"Каб запусціць Android, увядзіце графічны ключ"</string>
@@ -2395,6 +2404,7 @@
     <string name="misc_files_selected_count" msgid="4647048020823912088">"выбрана <xliff:g id="NUMBER">%1$d</xliff:g> з <xliff:g id="TOTAL">%2$d</xliff:g>"</string>
     <string name="misc_files_selected_count_bytes" msgid="2876232009069114352">"<xliff:g id="NUMBER">%1$s</xliff:g> з <xliff:g id="TOTAL">%2$s</xliff:g>"</string>
     <string name="select_all" msgid="1562774643280376715">"Выбраць усё"</string>
+    <string name="data_plan_usage_manage_plans_button_text" msgid="8997761990902708162">"Кіраваць планамі"</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>
@@ -2450,7 +2460,7 @@
     <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>
     <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_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>
@@ -2458,7 +2468,7 @@
     <string name="data_usage_cycle_editor_title" msgid="1373797281540188533">"Дата скіду цыкла выкарыстання"</string>
     <string name="data_usage_cycle_editor_subtitle" msgid="5512903797979928416">"Дата кожнага месяца:"</string>
     <string name="data_usage_cycle_editor_positive" msgid="8821760330497941117">"Задаць"</string>
-    <string name="data_usage_warning_editor_title" msgid="3704136912240060339">"Усталяваць папярэджанне аб выкарыстанні дадзеных"</string>
+    <string name="data_usage_warning_editor_title" msgid="3704136912240060339">"Усталяваць папярэджанне аб выкарыстанні даных"</string>
     <string name="data_usage_limit_editor_title" msgid="9153595142385030015">"Усталяваць ліміт выкарыстання даных"</string>
     <string name="data_usage_limit_dialog_title" msgid="3023111643632996097">"Абмежаванне выкарыстання даных"</string>
     <string name="data_usage_limit_dialog_mobile" product="tablet" msgid="4983487893343645667">"Калі ліміт, які вы ўсталявалі, будзе дасягнуты, планшэт выключыць мабільную перадачу даных.\n\nПаколькі выкарыстанне даных можа ўлічвацца вашым тэлефонам і вашым аператарам па-рознаму, мы рэкамендуем усталяваць больш ці менш нізкі ліміт."</string>
@@ -2480,6 +2490,9 @@
     <string name="data_usage_metered_mobile" msgid="5423305619126978393">"Мабільныя сеткі"</string>
     <string name="data_usage_metered_wifi" msgid="1761738002328299714">"Сеткі Wi‑Fi з абмеж. па трафіку"</string>
     <string name="data_usage_metered_wifi_disabled" msgid="727808462375941567">"Каб выбраць сеткі з абежаваннем па трафіку, уключыце Wi‑Fi."</string>
+    <string name="data_usage_metered_auto" msgid="1262028400911918865">"Аўтаматычна"</string>
+    <string name="data_usage_metered_yes" msgid="9217539611385225894">"З улікам трафіка"</string>
+    <string name="data_usage_metered_no" msgid="4025232961929071789">"Без уліку трафіка"</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>
@@ -2571,9 +2584,6 @@
     <string name="backup_pw_set_button_text" msgid="2387480910044648795">"Пазначце пароль рэзервовага капіравання"</string>
     <string name="backup_pw_cancel_button_text" msgid="8845630125391744615">"Скасаваць"</string>
     <string name="additional_system_update_settings_list_item_title" msgid="214987609894661992">"Дадатк. абнаўл. сістэмы"</string>
-    <string name="selinux_status_disabled" msgid="924551035552323327">"Выключана"</string>
-    <string name="selinux_status_permissive" msgid="6004965534713398778">"Дазвол"</string>
-    <string name="selinux_status_enforcing" msgid="2252703756208463329">"Забеспячэнне"</string>
     <string name="ssl_ca_cert_warning" msgid="2045866713601984673">"За сеткай можа назіраць"</string>
     <string name="done_button" msgid="1991471253042622230">"Гатова"</string>
     <plurals name="ssl_ca_cert_dialog_title" formatted="false" msgid="7145092748045794650">
@@ -2781,6 +2791,7 @@
       <item quantity="many">Паказаць %d схаваных элементаў</item>
       <item quantity="other">Паказаць %d схаванага элемента</item>
     </plurals>
+    <string name="dashboard_suggestion_condition_footer_content_description" msgid="2898588191174845961">"Згарнуць"</string>
     <string name="network_dashboard_title" msgid="4771589228992391573">"Сетка і інтэрнэт"</string>
     <string name="network_dashboard_summary_mobile" msgid="3851083934739500429">"мабільная сетка"</string>
     <string name="network_dashboard_summary_data_usage" msgid="3843261364705042212">"выкарыстанне трафіка"</string>
@@ -2840,8 +2851,7 @@
     <string name="keywords_gesture" msgid="3526905012224714078">"жэсты"</string>
     <string name="keywords_payment_settings" msgid="5220104934130446416">"плаціць, дакранацца, плацяжы"</string>
     <string name="keywords_backup" msgid="470070289135403022">"рэзервовае капіраванне, стварыць рэзервовую копію"</string>
-    <!-- no translation found for keywords_assist_gesture_launch (813968759791342591) -->
-    <skip />
+    <string name="keywords_assist_gesture_launch" msgid="813968759791342591">"жэст"</string>
     <string name="setup_wifi_nfc_tag" msgid="9028353016222911016">"Усталяваць Wi-Fi NFC-метку"</string>
     <string name="write_tag" msgid="8571858602896222537">"Запісаць"</string>
     <string name="status_awaiting_tap" msgid="2130145523773160617">"Для завяршэння дакраніцеся да меткі..."</string>
@@ -2886,8 +2896,14 @@
       <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_settings_title" msgid="1066226840983908121">"Не турбаваць"</string>
+    <string name="zen_mode_behavior_settings_title" msgid="1463303933529313969">"Паводзіны"</string>
+    <string name="zen_mode_behavior_allow_title" msgid="3845615648136218141">"Дазволіць гукі і вібрацыю ад:"</string>
+    <string name="zen_mode_behavior_no_sound" msgid="1219626004723208056">"Без гуку"</string>
+    <string name="zen_mode_behavior_total_silence" msgid="6716603819806610626">"Без гуку (поўная цішыня)"</string>
+    <string name="zen_mode_behavior_no_sound_except" msgid="4968477585788243114">"Без гуку. Выключэнні: <xliff:g id="CATEGORIES">%1$s</xliff:g>"</string>
+    <!-- no translation found for zen_mode_behavior_alarms_only (2423480992071472963) -->
+    <skip />
     <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>
@@ -2927,15 +2943,17 @@
     <string name="lock_screen_notifications_interstitial_message_profile" msgid="8307705621027472346">"Як павінны паказвацца апавяшчэнні профілю, калі прылада заблакіравана?"</string>
     <string name="lock_screen_notifications_interstitial_title_profile" msgid="3169806586032521333">"Апавяшчэнні профілю"</string>
     <string name="notifications_title" msgid="8086372779371204971">"Апавяшчэнні"</string>
-    <string name="app_notifications_title" msgid="5810577805218003760">"Апавяшчэнні дадаткаў"</string>
+    <string name="app_notifications_title" msgid="5810577805218003760">"Апавяшчэнні праграм"</string>
     <string name="notification_channel_title" msgid="2260666541030178452">"Катэгорыя апавяшчэнняў"</string>
+    <string name="notification_group_title" msgid="7180506440133859601">"Група катэгорыі апавяшчэнняў"</string>
     <string name="notification_importance_title" msgid="848692592679312666">"Важнасць"</string>
-    <string name="notification_importance_unspecified" msgid="2196023702875112081">"Дазволіць праграме прымаць рашэнне"</string>
+    <string name="notification_importance_unspecified" msgid="6622173510486113958">"Дазволіць прайграванне гуку"</string>
     <string name="notification_importance_blocked" msgid="7938180808339386300">"Ніколі не паказваць апавяшчэнні"</string>
     <string name="notification_importance_min" msgid="5455049524984686275">"Без гуку ці візуальнага перапынення"</string>
     <string name="notification_importance_low" msgid="8881468429453766553">"Без гуку"</string>
     <string name="notification_importance_default" msgid="5958338024601957516">"Прайграваць гук"</string>
     <string name="notification_importance_high" msgid="2082429479238228527">"Прайграваць гук і паказваць на экране"</string>
+    <string name="notification_importance_high_silent" msgid="2667033773703765252">"Паказваць на экране"</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>
@@ -2974,15 +2992,21 @@
     <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>
-    <!-- no translation found for picture_in_picture_app_detail_summary (1264019085827708920) -->
-    <skip />
+    <string name="picture_in_picture_app_detail_summary" msgid="1264019085827708920">"Дазволіць гэтай праграме ствараць акно відарыса ў відарысе, калі праграма адкрыта або пасля таго, як вы выйдзеце з яе (напрыклад, каб працягнуць прагляд відэа). Гэта акно паказваецца паверх іншых праграм, якія вы выкарыстоўваеце."</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="channel_group_notifications_off_desc" msgid="1620950416247316370">"Android блакіруе дадзеную групу апавяшчэнняў на гэтай прыладзе"</string>
     <string name="notification_channels" msgid="5346841743182627500">"Катэгорыі"</string>
     <string name="notification_channels_other" msgid="5645317113885788226">"Іншае"</string>
+    <plurals name="notification_group_summary" formatted="false" msgid="3420621520561455358">
+      <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="no_channels" msgid="3077375508177744586">"Гэта праграма не размяшчала ніякіх апавяшчэнняў"</string>
     <string name="app_settings_link" msgid="8894946007543660906">"Дадатковыя налады ў праграме"</string>
     <string name="app_notification_listing_summary_zero" msgid="6482582965081108108">"Уключаны для ўсіх праграм"</string>
@@ -3046,11 +3070,11 @@
     <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_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>
@@ -3063,12 +3087,14 @@
     <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>
+    <!-- no translation found for zen_mode_media_system_other (8900209390529859777) -->
+    <skip />
     <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="239685342222975733">"Калі адзін і той жа чалавек тэлефануе другі раз за наступную колькасць хвілін: <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>
@@ -3101,6 +3127,7 @@
     <string name="zen_mode_screen_off_visual_interruptions" msgid="4850792880144382633">"Калі экран выключаны"</string>
     <string name="zen_mode_no_visual_interruptions" msgid="8742776003822778472">"Калі экран уключаны або выключаны"</string>
     <string name="notification_app_settings_button" msgid="6685640230371477485">"Налады апавяшчэнняў"</string>
+    <string name="suggestion_button_text" msgid="3275010948381252006">"ОК"</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>
@@ -3246,7 +3273,7 @@
     <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">
@@ -3287,7 +3314,7 @@
     <string name="usb_use_power_only_desc" msgid="3461232831015575152">"Зарадзіце падключаную прыладу. Гэта працуе толькі з прыладамі, якія падтрымліваюць USB-зарадку."</string>
     <string name="usb_use_file_transfers" msgid="7409600791007250137">"Перадаваць файлы"</string>
     <string name="usb_use_file_transfers_desc" msgid="4235764784331804488">"Перадача файлаў на іншую прыладу"</string>
-    <string name="usb_use_photo_transfers" msgid="7794775645350330454">"Перадача фатаграфій (PTP)"</string>
+    <string name="usb_use_photo_transfers" msgid="7794775645350330454">"Перадаваць фатаграфіі (PTP)"</string>
     <string name="usb_use_photo_transfers_desc" msgid="2963034811151325996">"Перадача фатаграфій або файлаў, калі МТР не падтрымліваецца (PTP)"</string>
     <string name="usb_use_MIDI" msgid="870922185938298263">"Выкарыстоўваць прыладу ў якасці MIDI"</string>
     <string name="usb_use_MIDI_desc" msgid="8473936990076693175">"Выкарыстоўваць гэту прыладу ў якасці MIDI"</string>
@@ -3298,6 +3325,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="sms_mirroring_pref" msgid="6475043279147376031">"Люстраное адбіццё SMS"</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>
@@ -3366,7 +3394,7 @@
     <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="permit_write_settings" msgid="658555006453212691">"Дазволіць змяняць налады сістэмы"</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>
@@ -3467,9 +3495,12 @@
     <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="connectivity_monitor_switch" msgid="9059759348648583421">"Сродак адсочвання падключэнняў"</string>
+    <string name="connectivity_monitor_switch_summary" msgid="2828658652378866401">"Сродак адсочвання падключэнняў будзе заносіць у журналы выпадкі выяўлення праблем з падключэннямі, а таксама паказваць карыстальніку адпаведнае апавяшчэнне з прапановай адпраўкі паведамлення пра памылку"</string>
+    <string name="connectivity_monitor_toast" msgid="5551859612881173028">"Каб змены ў сродку адсочвання падключэнняў былі прыменены, перазагрузіце прыладу"</string>
     <string name="camera_hal_hdrplus_switch" msgid="8377365197105267466">"HDR+ для камеры HAL"</string>
     <string name="camera_hal_hdrplus_toast" msgid="2063703797270055299">"Каб уключыць HDR+ для камеры HAL, перазагрузіце прыладу"</string>
+    <string name="camera_laser_sensor_switch" msgid="8913588990743234440">"Лазерны датчык камеры"</string>
     <string name="ota_disable_automatic_update" msgid="2319639631655915050">"Аўтаматычныя абнаўленні сістэмы"</string>
     <string name="usage" msgid="2977875522080448986">"Выкарыстанне"</string>
     <string name="cellular_data_usage" msgid="2155683719898158203">"Выкарыстанне мабільнага трафіку"</string>
@@ -3497,7 +3528,7 @@
     <string name="data_warning" msgid="209133958008062117">"Папярэджанне пра трафік"</string>
     <string name="set_data_limit" msgid="2901526323210516923">"Задаць ліміт трафіку"</string>
     <string name="data_limit" msgid="1885406964934590552">"Ліміт трафіку"</string>
-    <string name="data_usage_template" msgid="392191945602400904">"<xliff:g id="ID_1">%1$s</xliff:g> выкарыстана ў перыяд <xliff:g id="ID_2">%2$s</xliff:g>"</string>
+    <string name="data_usage_template" msgid="2923744765873163859">"<xliff:g id="ID_1">%1$s</xliff:g> выкарыстоўвалася <xliff:g id="ID_2">%2$s</xliff:g>"</string>
     <string name="configure" msgid="1029654422228677273">"Наладзіць"</string>
     <string name="data_usage_other_apps" msgid="3272872663517382050">"Іншыя праграмы, уключаныя ў выкарыстанне даных"</string>
     <plurals name="data_saver_unrestricted_summary" formatted="false" msgid="2635267833484232703">
@@ -3528,7 +3559,7 @@
     <string name="not_battery_optimizing" msgid="5362861851864837617">"Не выкарыстоўвае аптымізацыю акумулятара"</string>
     <string name="lockscreen_remote_input" msgid="969871538778211843">"Калі прылада заблакіравана, не дазваляць набіраць адказы або іншы тэкст у апавяшчэннях"</string>
     <string name="default_spell_checker" msgid="8506899870026026660">"Стандартная праверка правапісу"</string>
-    <string name="choose_spell_checker" msgid="6596539862291699367">"Выбр.сродак праверкі правапісу"</string>
+    <string name="choose_spell_checker" msgid="6596539862291699367">"Праверка правапісу"</string>
     <string name="spell_checker_not_selected" msgid="8871083796179200696">"Не выбрана"</string>
     <string name="notification_log_no_title" msgid="5678029849672024215">"(няма)"</string>
     <string name="notification_log_details_delimiter" msgid="3116559361552416747">": "</string>
@@ -3570,7 +3601,7 @@
     <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="387052719462473500">"Паказваць кантрольную інфармацыю на экране блакiроўцы"</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="8483187649355540109">"Падтрымка і парады"</string>
@@ -3578,7 +3609,7 @@
     <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>
+    <string name="bluetooth_disabled" msgid="6244000672828617410">"Выключана"</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>
@@ -3686,7 +3717,7 @@
     <string name="web_action_enable_title" msgid="4051513950976670853">"Імгненныя праграмы"</string>
     <string name="web_action_enable_summary" msgid="3108127559723396382">"Адкрывайце спасылкі ў праграмах, нават калі яны не ўсталяваны"</string>
     <string name="web_action_section_title" msgid="7364647086538399136">"Імгненныя праграмы"</string>
-    <string name="instant_apps_account" msgid="1433620209791992528">"Уліковы запіс імгненных праграм"</string>
+    <string name="instant_apps_settings" msgid="8827777916518348213">"Параметры імгненных праграм"</string>
     <string name="domain_url_section_title" msgid="7046835219056428883">"Усталяваныя праграмы"</string>
     <string name="automatic_storage_manager_activation_warning" msgid="6353100011690933254">"Ваша сховішча зараз знаходзіцца пад кіраваннем менеджара сховішча"</string>
     <string name="account_for_section_header" msgid="5356566418548737121">"Уліковыя запісы для <xliff:g id="USER_NAME">%1$s</xliff:g>"</string>
@@ -3737,7 +3768,9 @@
     <string name="enterprise_privacy_always_on_vpn_personal" msgid="9217774730260037434">"Заўсёды ўключаны VPN уключаны ў вашым асабістым профілі"</string>
     <string name="enterprise_privacy_always_on_vpn_work" msgid="7244472958208315814">"Заўсёды ўключаны VPN уключаны ў вашым працоўным профілі"</string>
     <string name="enterprise_privacy_global_http_proxy" msgid="7936664553416257333">"Глабальны HTTP-проксі зададзены"</string>
-    <string name="enterprise_privacy_ca_certs" msgid="5885892204903688909">"Давераныя ўліковыя даныя"</string>
+    <string name="enterprise_privacy_ca_certs_device" msgid="2019652712782510262">"Давераныя ўліковыя даныя"</string>
+    <string name="enterprise_privacy_ca_certs_personal" msgid="2279084820904076599">"Давераныя ўліковыя даныя ў вашым асабістым профілі"</string>
+    <string name="enterprise_privacy_ca_certs_work" msgid="6187377647815301809">"Давераныя ўліковыя даныя ў вашым працоўным профілі"</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>
@@ -3810,6 +3843,8 @@
     <string name="carrier_provisioning" msgid="4398683675591893169">"Інфармацыя аператара"</string>
     <string name="trigger_carrier_provisioning" msgid="3434865918009286187">"Уключыць/выключыць забеспячэнне аператарам"</string>
     <string name="new_device_suggestion_title" msgid="698847081680980774">"Што новага і цікавага?"</string>
-    <string name="new_device_suggestion_summary" msgid="7172709269203435870">"Азнаёмцеся з 5 лепшымі функцыямі"</string>
+    <string name="new_device_suggestion_summary" product="default" msgid="206396571522515855">"Аглядны тур па новаму тэлефону"</string>
+    <string name="new_device_suggestion_summary" product="tablet" msgid="393751455688210956">"Аглядны тур па новаму планшэту"</string>
+    <string name="new_device_suggestion_summary" product="device" msgid="2939870049868336652">"Аглядны тур па новай прыладзе"</string>
     <string name="disabled_low_ram_device" msgid="3751578499721173344">"Гэта функцыя недаступная на гэтай прыладзе"</string>
 </resources>
diff --git a/res/values-bg/arrays.xml b/res/values-bg/arrays.xml
index 40d14ba..3590902 100644
--- a/res/values-bg/arrays.xml
+++ b/res/values-bg/arrays.xml
@@ -100,8 +100,6 @@
     <!-- no translation found for wifi_security_no_eap:0 (2084555984818107151) -->
     <!-- no translation found for wifi_security_no_eap:1 (397579322683471524) -->
     <!-- no translation found for wifi_security_no_eap:2 (1968820975358150484) -->
-    <!-- no translation found for wifi_ap_security:0 (5251664683198623324) -->
-    <!-- no translation found for wifi_ap_security:1 (7989073072260294673) -->
   <string-array name="wifi_eap_method">
     <item msgid="1160193392455075561">"PEAP"</item>
     <item msgid="7981731051382306293">"TLS"</item>
@@ -476,6 +474,6 @@
   <string-array name="automatic_storage_management_days">
     <item msgid="687318592238852312">"На повече от 30 дни"</item>
     <item msgid="2900554746706302178">"На повече от 60 дни"</item>
-    <item msgid="5692284879054004388">"На повече от 90 дни"</item>
+    <item msgid="5692284879054004388">"По-стари от 90 дни"</item>
   </string-array>
 </resources>
diff --git a/res/values-bg/strings.xml b/res/values-bg/strings.xml
index 1b92e4c..37181e2 100644
--- a/res/values-bg/strings.xml
+++ b/res/values-bg/strings.xml
@@ -101,7 +101,7 @@
     <string name="bluetooth_lock_voice_dialing" msgid="3139322992062086225">"Заключване на гласовото набиране"</string>
     <string name="bluetooth_lock_voice_dialing_summary" msgid="4741338867496787042">"Предотвратява употребата на набирането за Bluetooth при заключен екран"</string>
     <string name="bluetooth_devices" msgid="1886018064039454227">"Bluetooth устройства"</string>
-    <string name="bluetooth_device_name" msgid="8415828355207423800">"Име на устройство"</string>
+    <string name="bluetooth_device_name" msgid="8415828355207423800">"Име на устройството"</string>
     <string name="bluetooth_device_details" msgid="4594773497930028085">"Настройки на устройството"</string>
     <string name="bluetooth_profile_details" msgid="6823621790324933337">"Настройки на потребителския профил"</string>
     <string name="bluetooth_name_not_set" msgid="2653752006416027426">"Няма зададено име, използва се името на профила"</string>
@@ -166,7 +166,7 @@
     <string name="bluetooth_map_acceptance_dialog_text" msgid="8712508202081143737">"%1$s иска достъп до съобщенията ви. Ще предоставите ли достъп до %2$s?"</string>
     <string name="bluetooth_sap_request" msgid="2669762224045354417">"Заявка за достъп до SIM картата"</string>
     <string name="bluetooth_sap_acceptance_dialog_text" msgid="4414253873553608690">"<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g> иска да получи достъп до SIM картата ви. Предоставянето му ще деактивира мобилните данни на устройството ви за продължителността на връзката. Разрешаване на достъпа до <xliff:g id="DEVICE_NAME_1">%2$s?</xliff:g>"</string>
-    <string name="bluetooth_device_name_summary" msgid="4757990010751789977">"Видимо като „<xliff:g id="DEVICE_NAME">^1</xliff:g>“ за другите устройства"</string>
+    <string name="bluetooth_device_name_summary" msgid="522235742194965734">"Видимо като „<xliff:g id="DEVICE_NAME">^1</xliff:g>“ за другите устройства"</string>
     <string name="bluetooth_paired_device_title" msgid="8638994696317952019">"Вашите устройства"</string>
     <string name="bluetooth_pairing_page_title" msgid="7712127387361962608">"Сдвояване на ново устройство"</string>
     <string name="date_and_time" msgid="9062980487860757694">"Дата и час"</string>
@@ -312,6 +312,8 @@
     <string name="zone_auto" msgid="334783869352026648">"Автоматична часова зона"</string>
     <string name="zone_auto_summaryOn" msgid="6142830927278458314">"Използване на часовата зона, предоставена от мрежата"</string>
     <string name="zone_auto_summaryOff" msgid="2597745783162041390">"Използване на часовата зона, предоставена от мрежата"</string>
+    <string name="date_time_24hour_auto" msgid="2117383168985653422">"Автоматичен 24-часов формат"</string>
+    <string name="date_time_24hour_auto_summary" msgid="6351812925651480277">"Използване на стандартния формат за локала"</string>
     <string name="date_time_24hour_title" msgid="3203537578602803850">"24-часов формат"</string>
     <string name="date_time_24hour" msgid="1193032284921000063">"24-часов формат"</string>
     <string name="date_time_set_time_title" msgid="6296795651349047016">"Час"</string>
@@ -329,7 +331,7 @@
     <string name="lock_immediately_summary_with_exception" msgid="9119632173886172690">"Веднага след спящ режим, освен когато екранът се поддържа отключен от <xliff:g id="TRUST_AGENT_NAME">%1$s</xliff:g>"</string>
     <string name="lock_after_timeout_summary_with_exception" msgid="5579064842797188409">"<xliff:g id="TIMEOUT_STRING">%1$s</xliff:g> след спящ режим, освен когато екранът се поддържа отключен от <xliff:g id="TRUST_AGENT_NAME">%2$s</xliff:g>"</string>
     <string name="show_owner_info_on_lockscreen_label" msgid="5074906168357568434">"С информацията за собственика на заключения екран"</string>
-    <string name="owner_info_settings_title" msgid="5530285568897386122">"Закл. екран: Съобщ."</string>
+    <string name="owner_info_settings_title" msgid="5530285568897386122">"Съобщ. на заключен екран"</string>
     <string name="security_enable_widgets_title" msgid="2754833397070967846">"Приспособления: Акт."</string>
     <string name="security_enable_widgets_disabled_summary" msgid="6392489775303464905">"Деактивирано от администратора"</string>
     <string name="owner_info_settings_summary" msgid="7472393443779227052">"Няма"</string>
@@ -372,6 +374,9 @@
     <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="1961957425135180242">"Напред"</string>
+    <string name="setup_fingerprint_enroll_skip_title" msgid="362050541117362034">"Да се пропусне ли отпечатъкът?"</string>
+    <string name="setup_fingerprint_enroll_skip_after_adding_lock_text" msgid="958990414356204763">"Настройването на отпечатък отнема само една или две минути. Ако пропуснете тази стъпка, можете да добавите отпечатъка си по-късно от настройките."</string>
+    <string name="lock_screen_intro_skip_title" msgid="4988210105913705679">"Пропуск. на опцията за закл.?"</string>
     <string name="lock_screen_intro_skip_dialog_text_frp" product="tablet" msgid="1581834104051243425">"Функциите за защита на таблета няма да бъдат включени. Няма да можете да предотвратите използването му от други хора, ако бъде загубен, откраднат или нулиран."</string>
     <string name="lock_screen_intro_skip_dialog_text_frp" product="device" msgid="4629503416877189572">"Функциите за защита на устройството няма да бъдат включени. Няма да можете да предотвратите използването му от други хора, ако бъде загубено, откраднато или нулирано."</string>
     <string name="lock_screen_intro_skip_dialog_text_frp" product="default" msgid="2423428240245737909">"Функциите за защита на телефона няма да бъдат включени. Няма да можете да предотвратите използването му от други хора, ако бъде загубен, откраднат или нулиран."</string>
@@ -388,7 +393,7 @@
     <string name="security_settings_fingerprint_enroll_dialog_delete" msgid="4114615413240707936">"Изтриване"</string>
     <string name="security_settings_fingerprint_enroll_start_title" msgid="2068961812439460133">"Докоснете сензора"</string>
     <string name="security_settings_fingerprint_enroll_start_message" msgid="3909929328942564524">"Поставете пръста си върху сензора и го вдигнете, след като усетите вибриране"</string>
-    <string name="security_settings_fingerprint_enroll_repeat_title" msgid="2819679722403209778">"Вдигнете пръст и докоснете пак"</string>
+    <string name="security_settings_fingerprint_enroll_repeat_title" msgid="2819679722403209778">"Вдигнете пръст и докоснете отново"</string>
     <string name="security_settings_fingerprint_enroll_repeat_message" msgid="6158989350522518586">"Продължавайте да вдигате пръста си, за да добавите различните части от отпечатъка си"</string>
     <string name="security_settings_fingerprint_enroll_finish_title" msgid="7567276170287972230">"Отпечатъкът е добавен"</string>
     <string name="security_settings_fingerprint_enroll_finish_message" msgid="4796715961273420536">"Когато видите тази икона, използвайте отпечатъка си за идентификация или за одобряване на покупки."</string>
@@ -401,7 +406,7 @@
     <string name="security_settings_fingerprint_enroll_touch_dialog_message" msgid="2989019978041986175">"С показалеца си докоснете сензора на гърба на телефона."</string>
     <string name="security_settings_fingerprint_enroll_error_dialog_title" msgid="3618021988442639280">"Регистрирането не бе завършено"</string>
     <string name="security_settings_fingerprint_enroll_error_timeout_dialog_message" msgid="2942551158278899627">"Времевото ограничение за регистриране на отпечатък бе достигнато. Опитайте отново."</string>
-    <string name="security_settings_fingerprint_enroll_error_generic_dialog_message" msgid="3624760637222239293">"Регистрирането на отпечатък не проработи. Опитайте отново или използвайте друг пръст."</string>
+    <string name="security_settings_fingerprint_enroll_error_generic_dialog_message" msgid="3624760637222239293">"Регистрирането на отпечатък не бе успешно. Опитайте отново или използвайте друг пръст."</string>
     <string name="fingerprint_enroll_button_add" msgid="6317978977419045463">"Добавяне на друг"</string>
     <string name="fingerprint_enroll_button_next" msgid="6247009337616342759">"Напред"</string>
     <string name="security_settings_fingerprint_enroll_disclaimer" msgid="2624905914239271751">"Освен за отключване на телефона си можете да използвате отпечатъка си и за упълномощаване на покупки и достъп до приложения. "<annotation id="url">"Научете повече"</annotation></string>
@@ -457,7 +462,7 @@
     <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="lock_settings_picker_fingerprint_added_security_message" msgid="5768002109707648463">"За допълнителна сигурност задайте резервна опция за заключване на екрана."</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>
@@ -588,6 +593,7 @@
     <string name="lockpassword_pin_no_sequential_digits" msgid="680765285206990584">"Възходящите, низходящите и повтарящите се поредици от цифри не са разрешени"</string>
     <string name="lockpassword_ok_label" msgid="313822574062553672">"OK"</string>
     <string name="lockpassword_cancel_label" msgid="8818529276331121899">"Отказ"</string>
+    <string name="lockpassword_clear_label" msgid="5724429464960458155">"Изчистване"</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>
@@ -597,7 +603,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">"Trust agents"</string>
+    <string name="manage_trust_agents" msgid="4629279457536987768">"Надеждни агенти"</string>
     <string name="disabled_because_no_backup_security" msgid="6877660253409580377">"За да използвате, първо задайте заключване на екрана"</string>
     <string name="manage_trust_agents_summary" msgid="1475819820389620546">"Няма"</string>
     <plurals name="manage_trust_agents_summary_on" formatted="false" msgid="3935182396726101824">
@@ -781,6 +787,7 @@
     <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,6 +824,8 @@
     <string name="wifi_wps_available_first_item" msgid="4422547079984583502">"Налице е WPS"</string>
     <string name="wifi_wps_available_second_item" msgid="8427520131718215301">" (Налице е WPS)"</string>
     <string name="wifi_wps_nfc_enter_password" msgid="2288214226916117159">"Въведете паролата за мрежата"</string>
+    <string name="wifi_carrier_connect" msgid="8174696557882299911">"Wi‑Fi мрежа на оператор"</string>
+    <string name="wifi_carrier_content" msgid="4634077285415851933">"Свържете се през <xliff:g id="NAME">%1%s</xliff:g>"</string>
     <string name="wifi_scan_always_turnon_message" msgid="203123538572122989">"За да подобри точността на местоположението и за други цели, <xliff:g id="APP_NAME">%1$s</xliff:g> иска да включи сканирането за мрежи дори когато Wi-Fi е изключен.\n\nИскате ли да разрешите това за всички приложения, които искат да сканират?"</string>
     <string name="wifi_scan_always_turnoff_message" msgid="5538901671131941043">"За да изключите тази настройка, отворете „Разширени“ от менюто при препълване."</string>
     <string name="wifi_scan_always_confirm_allow" msgid="5355973075896817232">"Разрешаване"</string>
@@ -834,6 +843,7 @@
     <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_modify" msgid="6100248070440710782">"Промяна"</string>
     <string name="wifi_failed_forget_message" msgid="1348172929201654986">"Забравянето на мрежата не бе успешно"</string>
     <string name="wifi_save" msgid="3331121567988522826">"Запазване"</string>
     <string name="wifi_failed_save_message" msgid="6650004874143815692">"Запазването на мрежата не бе успешно"</string>
@@ -846,6 +856,7 @@
     <string name="wifi_advanced_titlebar" msgid="4485841401774142908">"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_title" msgid="3471132676909349382">"Информация за мрежата"</string>
     <string name="wifi_details_subnet_mask" msgid="6720279144174924410">"Подмрежова маска"</string>
     <string name="wifi_details_dns" msgid="8648826607751830768">"DNS"</string>
     <string name="wifi_details_ipv6_address_header" msgid="6734119149106422148">"IPv6 адреси"</string>
@@ -878,16 +889,15 @@
     <string name="wifi_p2p_cancel_connect_title" msgid="255267538099324413">"Да се анулира ли поканата?"</string>
     <string name="wifi_p2p_cancel_connect_message" msgid="7477756213423749402">"Искате ли да анулирате поканата за свързване с/ъс <xliff:g id="PEER_NAME">%1$s</xliff:g>?"</string>
     <string name="wifi_p2p_delete_group_message" msgid="834559380069647086">"Да се забрави ли тази група?"</string>
-    <string name="wifi_tether_checkbox_text" msgid="1847167643625779136">"Преносима точка за достъп до Wi‑Fi"</string>
     <string name="wifi_hotspot_checkbox_text" msgid="7763495093333664887">"Точка за достъп до Wi‑Fi"</string>
     <string name="wifi_hotspot_off_subtext" msgid="5466126533609394170">"Не споделяте с други устройства нито връзката с интернет, нито съдържание"</string>
     <string name="wifi_hotspot_tethering_on_subtext" product="tablet" msgid="5752490509369962007">"Връзката с интернет на този таблет се споделя през точка за достъп"</string>
     <string name="wifi_hotspot_tethering_on_subtext" product="default" msgid="6461075246164300670">"Връзката с интернет на този телефон се споделя през точка за достъп"</string>
     <string name="wifi_hotspot_on_local_only_subtext" msgid="2068110388011294735">"Приложението споделя съдържание. За да споделите връзката с интернет, изключете точката за достъп и я включете отново"</string>
-    <string name="wifi_hotspot_name_title" msgid="1341735529132128887">"Име на точката за Wi‑Fi"</string>
+    <string name="wifi_hotspot_name_title" msgid="8237000746618636778">"Име на точката за достъп"</string>
     <string name="wifi_hotspot_name_summary_connecting" msgid="3378299995508671967">"„<xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>“ се включва..."</string>
     <string name="wifi_hotspot_name_summary_connected" msgid="3888672084861445362">"Други устройства могат да се свързват към „<xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>“"</string>
-    <string name="wifi_hotspot_password_title" msgid="1955592302902091281">"Парола за точката за Wi-Fi"</string>
+    <string name="wifi_hotspot_password_title" msgid="8676859981917573801">"Парола за точката за достъп"</string>
     <string name="wifi_hotspot_ap_band_title" msgid="1165801173359290681">"Честота на точката за достъп"</string>
     <string name="wifi_hotspot_footer_info_regular" msgid="1203489406068036455">"Използвайте точка за достъп, за да създадете Wi‑Fi мрежа за другите си устройства. Точката осигурява достъп до интернет посредством мобилната ви връзка за данни. Може да бъдете таксувани допълнително за пренос на мобилни данни."</string>
     <string name="wifi_hotspot_footer_info_local_only" msgid="857988412470694109">"Приложенията могат да създават точки за достъп, за да споделят съдържание с устройства в близост."</string>
@@ -898,7 +908,6 @@
     <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 – точка за достъп до Wi‑Fi с 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>
@@ -939,7 +948,7 @@
     <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="emergency_address_summary" msgid="3266760199681945746">"Адресът, който спешните служби ще използват като ваше местоположение, ако извършите спешно обаждане посредством Wi-Fi"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"Дисплей"</string>
     <string name="sound_settings" msgid="5534671337768745343">"Звук"</string>
     <string name="all_volume_title" msgid="4296957391257836961">"Сила на звука"</string>
@@ -993,6 +1002,7 @@
     <string name="search_settings" msgid="1910951467596035063">"Търсене"</string>
     <string name="search_settings_summary" msgid="9205656546570654169">"Управление на настройки и история на търсене"</string>
     <string name="search_settings_no_results" msgid="8799027492641230999">"Няма резултати"</string>
+    <string name="search_clear_history" msgid="4196658962573162457">"Изчистване на историята"</string>
     <string name="display_settings" msgid="7965901687241669598">"Дисплей"</string>
     <string name="accelerometer_title" msgid="7854608399547349157">"Авт. завъртане на екрана"</string>
     <string name="color_mode_title" msgid="3159275920408338215">"Ярки цветове"</string>
@@ -1122,7 +1132,6 @@
     <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>
     <string name="device_status_activity_title" msgid="1411201799384697904">"Състояние"</string>
     <string name="device_status" msgid="607405385799807324">"Състояние"</string>
@@ -1150,7 +1159,6 @@
     <string name="status_wifi_mac_address" msgid="2202206684020765378">"MAC адрес за Wi‑Fi"</string>
     <string name="status_bt_address" msgid="4195174192087439720">"Адрес на Bluetooth"</string>
     <string name="status_serial_number" msgid="2257111183374628137">"Сериен номер"</string>
-    <string name="status_unavailable" msgid="7862009036663793314">"Няма данни"</string>
     <string name="status_up_time" msgid="7294859476816760399">"Време на активност"</string>
     <string name="status_awake_time" msgid="2393949909051183652">"Време на активност"</string>
     <string name="internal_memory" msgid="9129595691484260784">"Вътрешно хранилище"</string>
@@ -1326,6 +1334,7 @@
     <string name="menu_restore" msgid="8260067415075573273">"Възстановяване на стандартни"</string>
     <string name="restore_default_apn_completed" msgid="2824775307377604897">"Възстановяването на стандартните настройките за името на точката за достъп (APN) завърши."</string>
     <string name="reset_dashboard_title" msgid="6254873816990678620">"Опции за нулиране"</string>
+    <string name="reset_dashboard_summary" msgid="4851012632493522755">"Мрежата, приложенията или устройството могат да бъдат нулирани"</string>
     <string name="reset_network_title" msgid="6166025966016873843">"Нулиране на настройките за Wi-Fi, мобилни данни и Bluetooth"</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>
@@ -1334,17 +1343,14 @@
     <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="6617679904229218425">"Изтриване на всички данни (възстановяване на фабричните настройки)"</string>
-    <plurals name="master_clear_with_account_summary" formatted="false" msgid="5911377203778818712">
-      <item quantity="other"><xliff:g id="ACCOUNT_COUNT">%1$d</xliff:g> профила ще бъдат нулирани</item>
-      <item quantity="one">1 профил ще бъде нулиран</item>
-    </plurals>
-    <string name="master_clear_summary" msgid="6902443944660426951">"Вътрешното хранилище ще се нулира и всички данни ще бъдат изчистени"</string>
+    <string name="master_clear_title" msgid="3531267871084279512">"Изтриване на всички данни (възстановяване на фабричните настройки)"</string>
     <string name="master_clear_desc" product="tablet" msgid="9146059417023157222">"Това ще изтрие всички данни от "<b>"вътрешното хранилище"</b>" на таблета ви, включително:\n\n"<li>"профила ви в Google;"</li>\n<li>"данни и настройки от системата и приложенията;"</li>\n<li>"изтеглени приложения."</li></string>
-    <string name="master_clear_desc" product="default" msgid="4800386183314202571">"Това ще изтрие всички данни от "<b>"вътрешното хранилище"</b>" на телефона ви, включително:\n\n"<li>"профила ви в Google;"</li>\n<li>"данни и настройки от системата и приложенията;"</li>\n<li>"изтеглени приложения."</li></string>
+    <string name="master_clear_desc" product="default" msgid="4800386183314202571">"Това ще изтрие всички данни от "<b>"вътрешното хранилище"</b>" на телефона ви, включително:\n\n"<li>"профила ви в Google"</li>\n<li>"данни и настройки от системата и приложенията"</li>\n<li>"изтеглени приложения"</li></string>
     <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"Понастоящем сте влезли в следните профили:\n"</string>
     <string name="master_clear_other_users_present" product="default" msgid="5161423070702470742">\n\n"На това устройство има други потребители.\n"</string>
     <string name="master_clear_desc_also_erases_external" msgid="1903185203791274237"><li>"Музика"</li>\n<li>"Снимки"</li>\n<li>"Други потребителски данни"</li></string>
+    <string name="master_clear_desc_also_erases_esim" msgid="312352697653096008"><li>"Операторите за електронната SIM карта"</li></string>
+    <string name="master_clear_desc_no_cancel_mobile_plan" msgid="5460926449093211144">\n\n"Планът ви за мобилна услуга няма да бъде анулиран."</string>
     <string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="7744115866662613411">\n\n"За да изчистите музиката, снимките и другите потребителски данни, трябва да се изтрие "<b>"USB хранилището"</b>"."</string>
     <string name="master_clear_desc_erase_external_storage" product="default" msgid="4801026652617377093">\n\n"За да изчистите музиката, снимките и другите потребителски данни, трябва да се изтрие "<b>"SD картата"</b>"."</string>
     <string name="erase_external_storage" product="nosdcard" msgid="969364037450286809">"Изтриване на USB хранилището"</string>
@@ -1461,15 +1467,16 @@
     <string name="settings_safetylegal_activity_title" msgid="6901214628496951727">"Информация за безопасност"</string>
     <string name="settings_safetylegal_activity_unreachable" msgid="250674109915859456">"Нямате връзка за данни. За да видите тази информация сега, отворете %s от всеки компютър, свързан с интернет."</string>
     <string name="settings_safetylegal_activity_loading" msgid="8059022597639516348">"Зарежда се…"</string>
-    <string name="lockpassword_choose_your_password_header" msgid="8624900666929394990">"Изберете паролата си"</string>
-    <string name="lockpassword_choose_your_password_header_for_fingerprint" msgid="6624409510609085450">"Задайте парола, за да ползвате отпечатък"</string>
-    <string name="lockpassword_choose_your_pattern_header" msgid="6949761069941694050">"Изберете фигурата си"</string>
-    <string name="lockpassword_choose_your_pattern_header_for_fingerprint" msgid="5901096361617543819">"Задайте фигура, за да ползвате отпечатък"</string>
-    <string name="lockpassword_choose_your_pin_header" msgid="7598849519816138302">"Изберете своя ПИН"</string>
-    <string name="lockpassword_choose_your_pin_header_for_fingerprint" msgid="765344692615917183">"Задайте ПИН, за да ползвате отпечатък"</string>
-    <string name="lockpassword_confirm_your_password_header" msgid="6308478184889846633">"Потвърдете паролата си"</string>
+    <string name="lockpassword_choose_your_screen_lock_header" msgid="3872462096767152394">"Задайте опция за заключване на екрана"</string>
+    <string name="lockpassword_choose_your_password_message" msgid="1197569283524841412">"От съображения за сигурност задайте парола"</string>
+    <string name="lockpassword_choose_your_password_header_for_fingerprint" msgid="2541818487015343503">"Задайте парола, за да ползвате отпечатък"</string>
+    <string name="lockpassword_choose_your_pattern_header_for_fingerprint" msgid="7709785406243556723">"Задайте фигура, за да ползвате отпечатък"</string>
+    <string name="lockpassword_choose_your_pin_message" msgid="1875420718677275646">"От съображения за сигурност задайте ПИН код"</string>
+    <string name="lockpassword_choose_your_pin_header_for_fingerprint" msgid="1549639053195796674">"Задайте ПИН, за да ползвате отпечатък"</string>
+    <string name="lockpassword_choose_your_pattern_message" msgid="5986983400689720015">"От съображения за сигурност задайте фигура"</string>
+    <string name="lockpassword_confirm_your_password_header" msgid="1266027268220850931">"Въведете отново паролата си"</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="7744513791910572550">"Въведете отново ПИН кода си"</string>
     <string name="lockpassword_confirm_passwords_dont_match" msgid="5140892109439191415">"Паролите не си съответстват"</string>
     <string name="lockpassword_confirm_pins_dont_match" msgid="7226244811505606217">"ПИН кодовете не са идентични"</string>
     <string name="lockpassword_choose_lock_generic_header" msgid="3811438094903786145">"Избор на отключване"</string>
@@ -1488,6 +1495,12 @@
     <string name="lockpassword_strong_auth_required_work_pattern" msgid="3003781907040522053">"За допълнителна сигурност използвайте служебната си фигура"</string>
     <string name="lockpassword_strong_auth_required_work_pin" msgid="3367491332598821552">"За допълнителна сигурност въведете служебния си ПИН код"</string>
     <string name="lockpassword_strong_auth_required_work_password" msgid="8159775129968582940">"За допълнителна сигурност въведете служебната си парола"</string>
+    <string name="lockpassword_confirm_your_pattern_details_frp" msgid="6757336656791723193">"Фабр. настройки на телефона са били възстановени. За да го ползвате, въведете предишната си фигура."</string>
+    <string name="lockpassword_confirm_your_pin_details_frp" msgid="826520613445990470">"Фабр. настройки на телефона са били възстановени. За да го ползвате, въведете предишния си ПИН код."</string>
+    <string name="lockpassword_confirm_your_password_details_frp" msgid="8944081074615739040">"Фабр. настройки на телефона са били възстановени. За да го ползвате, въведете предишната си парола."</string>
+    <string name="lockpassword_confirm_your_pattern_header_frp" msgid="2898036091609128286">"Потвърждаване на фигурата"</string>
+    <string name="lockpassword_confirm_your_pin_header_frp" msgid="4141601774778898803">"Потвърждаване на ПИН кода"</string>
+    <string name="lockpassword_confirm_your_password_header_frp" msgid="3762615419295360480">"Потвърждаване на паролата"</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>
@@ -1496,7 +1509,7 @@
     <string name="lockpattern_change_lock_pin_label" msgid="266707138486731661">"Промяна на PIN кода за отключване"</string>
     <string name="lockpattern_recording_intro_header" msgid="308287052221942814">"Начертайте фигура за отключване"</string>
     <string name="lockpattern_recording_intro_footer" msgid="1118579101409152113">"Натиснете „Меню“ за помощ"</string>
-    <string name="lockpattern_recording_inprogress" msgid="6667844062721656773">"Вдигнете пръст, когато сте готови"</string>
+    <string name="lockpattern_recording_inprogress" msgid="6667844062721656773">"Вдигнете пръст, когато е готово"</string>
     <string name="lockpattern_recording_incorrect_too_short" msgid="1348234155120957561">"Свържете поне <xliff:g id="NUMBER">%d</xliff:g> точки. Опитайте отново."</string>
     <string name="lockpattern_pattern_entered_header" msgid="4316818983675591604">"Фигурата е записана"</string>
     <string name="lockpattern_need_to_confirm" msgid="8054853451639221265">"За потвърждение начертайте фигурата отново"</string>
@@ -1537,7 +1550,6 @@
     <string name="install_applications_title" msgid="4987712352256508946">"Всички източници: Разрешаване"</string>
     <string name="recent_app_category_title" msgid="6673071268966003928">"Наскоро отворени приложения"</string>
     <string name="see_all_apps_title" msgid="1317153498074308438">"Преглед на всички приложения (<xliff:g id="COUNT">%1$d</xliff:g>)"</string>
-    <string name="recent_app_summary" msgid="3366446669844932300">"Преди <xliff:g id="TIME">^1</xliff:g>"</string>
     <string name="install_all_warning" product="tablet" msgid="8310489909586138165">"Таблетът и личните ви данни са по-уязвими към атаки от неизвестни приложения. С инсталирането на приложения от този източник приемате, че вие носите отговорност в случай на повреда на устройството ви или при загуба на данни вследствие използването на такива приложения."</string>
     <string name="install_all_warning" product="default" msgid="1952257127370115988">"Телефонът и личните ви данни са по-уязвими към атаки от неизвестни приложения. С инсталирането на приложения от този източник приемате, че вие носите отговорност в случай на повреда на устройството ви или при загуба на данни вследствие използването на такива приложения."</string>
     <string name="advanced_settings" msgid="1777249286757067969">"Разширени настройки"</string>
@@ -1801,7 +1813,7 @@
     <string name="accessibility_settings_summary" msgid="981260486011624939">"Екранни четци, дисплей, контроли за взаимодействие"</string>
     <string name="vision_settings_title" msgid="4204111425716868288">"Настройки при зрителни проблеми"</string>
     <string name="vision_settings_description" msgid="5679491180156408260">"Можете да персонализирате устройството така, че да отговаря на нуждите ви. Тези функции за достъпност могат да бъдат променени по-късно от „Настройки“."</string>
-    <string name="vision_settings_suggestion_title" msgid="917294957154878441">"Увеличаване на размера на шрифта"</string>
+    <string name="vision_settings_suggestion_title" msgid="8058794060304707004">"Промяна на размера на шрифта"</string>
     <string name="screen_reader_category_title" msgid="7739154903913400641">"Екранни четци"</string>
     <string name="audio_and_captions_category_title" msgid="3420727114421447524">"Аудио и екранен текст"</string>
     <string name="display_category_title" msgid="685461049938269166">"Дисплей"</string>
@@ -1838,7 +1850,6 @@
     <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="preference_summary_default_combination" msgid="8532964268242666060">"<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>
@@ -1957,12 +1968,14 @@
     <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_whitelisted" msgid="7375400051141016808">"Приложението не може да бъде оптимизирано за разход на батерията"</string>
+    <string name="background_activity_warning_dialog_title" msgid="2216249969149568871">"Да се ограничи ли активността на заден план?"</string>
+    <string name="background_activity_warning_dialog_text" msgid="7049624449246121981">"Ако ограничите активността на заден за дадено приложение, то може да не функционира правилно"</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" msgid="6393929085382334341">"Използване от приложенията след пълно зареждане (<xliff:g id="RELATIVE_TIME">^1</xliff:g>)"</string>
+    <string name="power_usage_list_summary_device" msgid="4461926045610455423">"Използване от устройството след пълно зареждане (<xliff:g id="RELATIVE_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>
@@ -2208,14 +2221,14 @@
     <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_configure_lock_screen_hint" msgid="8058230497337529036">"Преди да можете да използвате хранилището за идентификационни данни, устройството ви трябва да има защитен заключен екран"</string>
+    <string name="credentials_configure_lock_screen_button" msgid="253239765216055321">"ЗАКЛЮЧВ.: ЗАДАВАНЕ"</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>
@@ -2335,8 +2348,6 @@
     <skip />
     <string name="cant_sync_dialog_title" msgid="2777238588398046285">"Не може да се синхронизира ръчно"</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">"MAC адрес за 4G"</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>
@@ -2350,6 +2361,7 @@
     <string name="misc_files_selected_count" msgid="4647048020823912088">"избрани са <xliff:g id="NUMBER">%1$d</xliff:g> от <xliff:g id="TOTAL">%2$d</xliff:g>"</string>
     <string name="misc_files_selected_count_bytes" msgid="2876232009069114352">"<xliff:g id="NUMBER">%1$s</xliff:g> от <xliff:g id="TOTAL">%2$s</xliff:g>"</string>
     <string name="select_all" msgid="1562774643280376715">"Избиране на всички"</string>
+    <string name="data_plan_usage_manage_plans_button_text" msgid="8997761990902708162">"Управление на плановете"</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>
@@ -2435,6 +2447,9 @@
     <string name="data_usage_metered_mobile" msgid="5423305619126978393">"Мобилни мрежи"</string>
     <string name="data_usage_metered_wifi" msgid="1761738002328299714">"Wi‑Fi мрежи с отчитане"</string>
     <string name="data_usage_metered_wifi_disabled" msgid="727808462375941567">"За да изберете мрежи с отчитане, включете Wi‑Fi."</string>
+    <string name="data_usage_metered_auto" msgid="1262028400911918865">"Автоматично"</string>
+    <string name="data_usage_metered_yes" msgid="9217539611385225894">"С отчитане"</string>
+    <string name="data_usage_metered_no" msgid="4025232961929071789">"Без отчитане"</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>
@@ -2526,9 +2541,6 @@
     <string name="backup_pw_set_button_text" msgid="2387480910044648795">"Задаване на парола за резервно копие"</string>
     <string name="backup_pw_cancel_button_text" msgid="8845630125391744615">"Отказ"</string>
     <string name="additional_system_update_settings_list_item_title" msgid="214987609894661992">"Допълнителни системни актуализации"</string>
-    <string name="selinux_status_disabled" msgid="924551035552323327">"Деактивирано"</string>
-    <string name="selinux_status_permissive" msgid="6004965534713398778">"Разрешаващо"</string>
-    <string name="selinux_status_enforcing" msgid="2252703756208463329">"Налагане"</string>
     <string name="ssl_ca_cert_warning" msgid="2045866713601984673">"Мрежата може да се наблюдава"</string>
     <string name="done_button" msgid="1991471253042622230">"Готово"</string>
     <plurals name="ssl_ca_cert_dialog_title" formatted="false" msgid="7145092748045794650">
@@ -2571,7 +2583,7 @@
     <string name="user_add_user_message_long" msgid="8562152293752222985">"Можете да споделите това устройство с други хора, като създадете допълнителни потребители. Всеки от тях има собствено работно пространство, което може да персонализира с приложения, тапет и др. Потребителите могат също да коригират настройки на устройството, които засягат всички – например Wi‑Fi.\n\nКогато добавите нов потребител, той трябва да настрои работното си пространство.\n\nВсеки потребител може да актуализира приложенията за всички останали потребители."</string>
     <string name="user_add_user_message_short" msgid="1511354412249044381">"Когато добавите нов потребител, той трябва да настрои работното си пространство.\n\nВсеки потребител може да актуализира приложенията за всички останали потребители."</string>
     <string name="user_setup_dialog_title" msgid="1765794166801864563">"Настройване на потребителя?"</string>
-    <string name="user_setup_dialog_message" msgid="1004068621380867148">"Уверете се, че човекът е налице да вземе устройството и да настрои работното си пространство"</string>
+    <string name="user_setup_dialog_message" msgid="1004068621380867148">"Уверете се, че човекът има възможност да вземе устройството и да настрои работното си пространство."</string>
     <string name="user_setup_profile_dialog_message" msgid="3896568553327558731">"Ще настроите ли потребителския профил сега?"</string>
     <string name="user_setup_button_setup_now" msgid="3391388430158437629">"Настройване сега"</string>
     <string name="user_setup_button_setup_later" msgid="3068729597269172401">"Не сега"</string>
@@ -2726,6 +2738,7 @@
       <item quantity="other">Показване на %d скрити елемента</item>
       <item quantity="one">Показване на %d скрит елемент</item>
     </plurals>
+    <string name="dashboard_suggestion_condition_footer_content_description" msgid="2898588191174845961">"Свиване"</string>
     <string name="network_dashboard_title" msgid="4771589228992391573">"Мрежа и интернет"</string>
     <string name="network_dashboard_summary_mobile" msgid="3851083934739500429">"мобилна мрежа"</string>
     <string name="network_dashboard_summary_data_usage" msgid="3843261364705042212">"пренос на данни"</string>
@@ -2828,8 +2841,14 @@
       <item quantity="other"><xliff:g id="ON_COUNT">%d</xliff:g> автоматични правила са включени</item>
       <item quantity="one">1 автоматично правило е включено</item>
     </plurals>
-    <string name="zen_mode_settings_title" msgid="842308776768942600">"Режим „Не безпокойте“"</string>
-    <string name="zen_mode_priority_settings_title" msgid="2623117023031824309">"Само приоритетни прекъсвания"</string>
+    <string name="zen_mode_settings_title" msgid="1066226840983908121">"Не безпокойте"</string>
+    <string name="zen_mode_behavior_settings_title" msgid="1463303933529313969">"Поведение"</string>
+    <string name="zen_mode_behavior_allow_title" msgid="3845615648136218141">"Разреш. на звуци и вибрир. от"</string>
+    <string name="zen_mode_behavior_no_sound" msgid="1219626004723208056">"Без звук"</string>
+    <string name="zen_mode_behavior_total_silence" msgid="6716603819806610626">"Без звук (пълна тишина)"</string>
+    <string name="zen_mode_behavior_no_sound_except" msgid="4968477585788243114">"Без звук освен за <xliff:g id="CATEGORIES">%1$s</xliff:g>"</string>
+    <!-- no translation found for zen_mode_behavior_alarms_only (2423480992071472963) -->
+    <skip />
     <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>
@@ -2871,13 +2890,15 @@
     <string name="notifications_title" msgid="8086372779371204971">"Известия"</string>
     <string name="app_notifications_title" msgid="5810577805218003760">"Известия за прилож."</string>
     <string name="notification_channel_title" msgid="2260666541030178452">"Категория с известия"</string>
+    <string name="notification_group_title" msgid="7180506440133859601">"Група на категорията с известия"</string>
     <string name="notification_importance_title" msgid="848692592679312666">"Важност"</string>
-    <string name="notification_importance_unspecified" msgid="2196023702875112081">"Нека приложението да реши"</string>
+    <string name="notification_importance_unspecified" msgid="6622173510486113958">"Разрешаване на звуковия сигнал"</string>
     <string name="notification_importance_blocked" msgid="7938180808339386300">"Без показване на известия"</string>
     <string name="notification_importance_min" msgid="5455049524984686275">"Без звук или визуално прекъсване"</string>
     <string name="notification_importance_low" msgid="8881468429453766553">"Без звук"</string>
     <string name="notification_importance_default" msgid="5958338024601957516">"Възпроизвеждане на звук"</string>
     <string name="notification_importance_high" msgid="2082429479238228527">"Възпроизвеждане на звук и показване на изскачащ прозорец на екрана"</string>
+    <string name="notification_importance_high_silent" msgid="2667033773703765252">"Показване на изскачащ прозорец на екрана"</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>
@@ -2920,8 +2941,13 @@
     <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="channel_group_notifications_off_desc" msgid="1620950416247316370">"Android блокира показването на тази група с известия на устройството"</string>
     <string name="notification_channels" msgid="5346841743182627500">"Категории"</string>
     <string name="notification_channels_other" msgid="5645317113885788226">"Други"</string>
+    <plurals name="notification_group_summary" formatted="false" msgid="3420621520561455358">
+      <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="no_channels" msgid="3077375508177744586">"Това приложение не е публикувало известия"</string>
     <string name="app_settings_link" msgid="8894946007543660906">"Допълнителни настройки в приложението"</string>
     <string name="app_notification_listing_summary_zero" msgid="6482582965081108108">"Включено за всички приложения"</string>
@@ -2998,12 +3024,14 @@
     <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>
+    <!-- no translation found for zen_mode_media_system_other (8900209390529859777) -->
+    <skip />
     <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="239685342222975733">"Ако един и същ човек се обади втори път в рамките на период от <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>
@@ -3032,10 +3060,11 @@
     <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="suggestion_button_text" msgid="3275010948381252006">"OK"</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="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>
@@ -3168,7 +3197,7 @@
     <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">
@@ -3216,6 +3245,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="sms_mirroring_pref" msgid="6475043279147376031">"Отразяване на SMS"</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>
@@ -3282,7 +3312,7 @@
     <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="permit_write_settings" msgid="658555006453212691">"Разрешаване на промяна на сист. настройки"</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>
@@ -3377,9 +3407,12 @@
     <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="connectivity_monitor_switch" msgid="9059759348648583421">"Наблюдение на връзката"</string>
+    <string name="connectivity_monitor_switch_summary" msgid="2828658652378866401">"Функцията за наблюдение на връзката ще събира регистрационни файлове, когато установи проблем с връзката, и ще изпрати на потребителя известие с подкана да подаде сигнал за програмна грешка"</string>
+    <string name="connectivity_monitor_toast" msgid="5551859612881173028">"За да приложите промяната във функцията за наблюдение на връзката, рестартирайте устройството"</string>
     <string name="camera_hal_hdrplus_switch" msgid="8377365197105267466">"HDR+ с Camera HAL"</string>
     <string name="camera_hal_hdrplus_toast" msgid="2063703797270055299">"За да приложите промяната, свързана с режима „HDR+ с Camera HAL“, рестартирайте устройството"</string>
+    <string name="camera_laser_sensor_switch" msgid="8913588990743234440">"Сензор на лазера на камерата"</string>
     <string name="ota_disable_automatic_update" msgid="2319639631655915050">"Автоматични системни актуализации"</string>
     <string name="usage" msgid="2977875522080448986">"Пренос на данни"</string>
     <string name="cellular_data_usage" msgid="2155683719898158203">"Пренос на мобилни данни"</string>
@@ -3401,11 +3434,11 @@
     </plurals>
     <string name="operator_warning" msgid="1862988028996859195">"Отчетените от оператора данни може да се различават от показаните на устройството"</string>
     <string name="data_used_template" msgid="3245919669966296505">"Използвали сте <xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="set_data_warning" msgid="6115364758236594593">"Предупр. за данните: Задаване"</string>
+    <string name="set_data_warning" msgid="6115364758236594593">"Предупр. за данните: задаване"</string>
     <string name="data_warning" msgid="209133958008062117">"Предупреждение за данните"</string>
     <string name="set_data_limit" msgid="2901526323210516923">"Задаване на лимит за данните"</string>
     <string name="data_limit" msgid="1885406964934590552">"Ограничение за данните"</string>
-    <string name="data_usage_template" msgid="392191945602400904">"Използвали сте <xliff:g id="ID_1">%1$s</xliff:g> за периода <xliff:g id="ID_2">%2$s</xliff:g>"</string>
+    <string name="data_usage_template" msgid="2923744765873163859">"Използвани <xliff:g id="ID_1">%1$s</xliff:g> за периода <xliff:g id="ID_2">%2$s</xliff:g>"</string>
     <string name="configure" msgid="1029654422228677273">"Конфигуриране"</string>
     <string name="data_usage_other_apps" msgid="3272872663517382050">"Други приложения, включени в преноса на данни"</string>
     <plurals name="data_saver_unrestricted_summary" formatted="false" msgid="2635267833484232703">
@@ -3474,7 +3507,7 @@
     <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="387052719462473500">"Управление на информацията на заключения екран"</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="8483187649355540109">"Поддръжка и съвети"</string>
@@ -3482,7 +3515,7 @@
     <string name="premium_sms_none" msgid="8268105565738040566">"Няма инсталирани приложения, които са заявили достъп до SMS съобщения, за които се таксува получателят"</string>
     <string name="premium_sms_warning" msgid="9086859595338944882">"SMS съобщенията, за които се таксува получателят, може да ви въвлекат в разходи и ще увеличат сметката към оператора ви. Ако дадете разрешението на дадено приложение, ще можете да изпращате такива съобщения чрез него."</string>
     <string name="premium_sms_access" msgid="4660047004791638305">"Достъп до SMS, за които получателят заплаща"</string>
-    <string name="bluetooth_disabled" msgid="2456198532288640046">"Устройството не е видимо за други устройства"</string>
+    <string name="bluetooth_disabled" msgid="6244000672828617410">"Изкл."</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>
@@ -3584,7 +3617,7 @@
     <string name="web_action_enable_title" msgid="4051513950976670853">"Мигновени приложения"</string>
     <string name="web_action_enable_summary" msgid="3108127559723396382">"Отваряйте връзките в приложения дори ако те не са инсталирани"</string>
     <string name="web_action_section_title" msgid="7364647086538399136">"Мигновени приложения"</string>
-    <string name="instant_apps_account" msgid="1433620209791992528">"Профил за мигновените приложения"</string>
+    <string name="instant_apps_settings" msgid="8827777916518348213">"Предпочитания за мигновените приложения"</string>
     <string name="domain_url_section_title" msgid="7046835219056428883">"Инсталирани приложения"</string>
     <string name="automatic_storage_manager_activation_warning" msgid="6353100011690933254">"Хранилището ви вече се управлява от съответния мениджър"</string>
     <string name="account_for_section_header" msgid="5356566418548737121">"Профили за <xliff:g id="USER_NAME">%1$s</xliff:g>"</string>
@@ -3631,7 +3664,9 @@
     <string name="enterprise_privacy_always_on_vpn_personal" msgid="9217774730260037434">"Режимът за винаги включена виртуална частна мрежа (VPN) е активиран в личния ви потребителски профил"</string>
     <string name="enterprise_privacy_always_on_vpn_work" msgid="7244472958208315814">"Режимът за винаги включена виртуална частна мрежа (VPN) е активиран в служебния ви потребителски профил"</string>
     <string name="enterprise_privacy_global_http_proxy" msgid="7936664553416257333">"Зададен е общ HTTP прокси сървър"</string>
-    <string name="enterprise_privacy_ca_certs" msgid="5885892204903688909">"Надеждни идентификационни данни"</string>
+    <string name="enterprise_privacy_ca_certs_device" msgid="2019652712782510262">"Надеждни идентификационни данни"</string>
+    <string name="enterprise_privacy_ca_certs_personal" msgid="2279084820904076599">"Надеждни идентификационни данни в личния ви потребителски профил"</string>
+    <string name="enterprise_privacy_ca_certs_work" msgid="6187377647815301809">"Надеждни идентификационни данни в служебния ви потребителски профил"</string>
     <plurals name="enterprise_privacy_number_ca_certs" formatted="false" msgid="526375234629534165">
       <item quantity="other">Поне <xliff:g id="COUNT_1">%d</xliff:g> сертификата от сертифициращ орган</item>
       <item quantity="one">Поне <xliff:g id="COUNT_0">%d</xliff:g> сертификат от сертифициращ орган</item>
@@ -3694,6 +3729,8 @@
     <string name="carrier_provisioning" msgid="4398683675591893169">"Carrier Provisioning Info"</string>
     <string name="trigger_carrier_provisioning" msgid="3434865918009286187">"Задействане на обезпечаването от оператора"</string>
     <string name="new_device_suggestion_title" msgid="698847081680980774">"Нови и вълнуващи неща"</string>
-    <string name="new_device_suggestion_summary" msgid="7172709269203435870">"Вижте водещите 5 функции"</string>
+    <string name="new_device_suggestion_summary" product="default" msgid="206396571522515855">"Запознайте се с новия си телефон"</string>
+    <string name="new_device_suggestion_summary" product="tablet" msgid="393751455688210956">"Запознайте се с новия си таблет"</string>
+    <string name="new_device_suggestion_summary" product="device" msgid="2939870049868336652">"Запознайте се с новото си устройство"</string>
     <string name="disabled_low_ram_device" msgid="3751578499721173344">"Тази функция не е налице на устройството"</string>
 </resources>
diff --git a/res/values-bn/arrays.xml b/res/values-bn/arrays.xml
index cca163c..cb0deba 100644
--- a/res/values-bn/arrays.xml
+++ b/res/values-bn/arrays.xml
@@ -69,7 +69,7 @@
     <item msgid="1922181315419294640"></item>
     <item msgid="8934131797783724664">"স্ক্যান করা হচ্ছে…"</item>
     <item msgid="8513729475867537913">"সংযুক্ত হচ্ছে..."</item>
-    <item msgid="515055375277271756">"প্রমাণীকরণ হচ্ছে..."</item>
+    <item msgid="515055375277271756">"যাচাইকরণ হচ্ছে..."</item>
     <item msgid="1943354004029184381">"IP ঠিকানা প্রাপ্ত করা হচ্ছে..."</item>
     <item msgid="4221763391123233270">"সংযুক্ত হয়েছে"</item>
     <item msgid="624838831631122137">"স্থগিত করা হয়েছে"</item>
@@ -83,7 +83,7 @@
     <item msgid="7714855332363650812"></item>
     <item msgid="8878186979715711006">"স্ক্যান করা হচ্ছে…"</item>
     <item msgid="355508996603873860">"<xliff:g id="NETWORK_NAME">%1$s</xliff:g> এর সাথে সংযুক্ত হচ্ছে…"</item>
-    <item msgid="554971459996405634">"<xliff:g id="NETWORK_NAME">%1$s</xliff:g> দিয়ে প্রমাণীকরণ করা হচ্ছে..."</item>
+    <item msgid="554971459996405634">"<xliff:g id="NETWORK_NAME">%1$s</xliff:g> দিয়ে যাচাইকরণ করা হচ্ছে..."</item>
     <item msgid="7928343808033020343">"<xliff:g id="NETWORK_NAME">%1$s</xliff:g> থেকে IP ঠিকানা জানা হচ্ছে…"</item>
     <item msgid="8937994881315223448">"<xliff:g id="NETWORK_NAME">%1$s</xliff:g> তে সংযুক্ত হয়েছে"</item>
     <item msgid="1330262655415760617">"স্থগিত করা হয়েছে"</item>
@@ -100,8 +100,6 @@
     <!-- no translation found for wifi_security_no_eap:0 (2084555984818107151) -->
     <!-- no translation found for wifi_security_no_eap:1 (397579322683471524) -->
     <!-- no translation found for wifi_security_no_eap:2 (1968820975358150484) -->
-    <!-- no translation found for wifi_ap_security:0 (5251664683198623324) -->
-    <!-- no translation found for wifi_ap_security:1 (7989073072260294673) -->
   <string-array name="wifi_eap_method">
     <item msgid="1160193392455075561">"PEAP"</item>
     <item msgid="7981731051382306293">"TLS"</item>
@@ -122,7 +120,7 @@
     <!-- no translation found for wifi_ap_band_config_2G_only:0 (7006771583217001015) -->
   <string-array name="wifi_p2p_wps_setup">
     <item msgid="5085064298144493867">"পুশ বোতাম"</item>
-    <item msgid="1624323946324499595">"যুক্ত করা ডিভাইস থেকে পিন"</item>
+    <item msgid="1624323946324499595">"চেনা ডিভাইস থেকে পিন"</item>
     <item msgid="5366790421523328066">"এই ডিভাইস থেকে পিন"</item>
   </string-array>
   <string-array name="wifi_p2p_status">
@@ -225,14 +223,14 @@
     <item msgid="2681427309183221543">"GID"</item>
   </string-array>
   <string-array name="app_install_location_entries">
-    <item msgid="8151497958991952759">"অভ্যন্তরীণ ডিভাইসের সঞ্চয়স্থান"</item>
+    <item msgid="8151497958991952759">"ইন্টারনাল ডিভাইসের স্টোরেজ"</item>
     <item msgid="3738430123799803530">"অপসারণযোগ্য SD কার্ড"</item>
     <item msgid="4498124044785815005">"সিস্টেমকে সিদ্ধান্ত নিতে দিন"</item>
   </string-array>
   <string-array name="app_ops_categories">
     <item msgid="6358963769537892925">"অবস্থান"</item>
     <item msgid="255608127647030286">"ব্যক্তিগত"</item>
-    <item msgid="4588829735729884491">"বার্তাপ্রেরণ"</item>
+    <item msgid="4588829735729884491">"মেসেজিং"</item>
     <item msgid="886742181977884584">"মাধ্যম"</item>
     <item msgid="7924928667052300589">"ডিভাইস"</item>
   </string-array>
@@ -240,7 +238,7 @@
     <item msgid="4979188868761515915">"অনির্দিষ্ট অবস্থান"</item>
     <item msgid="5789673140227507995">"সূক্ষ্ম অবস্থান"</item>
     <item msgid="1061584358377390581">"GPS"</item>
-    <item msgid="5387405117297558954">"কম্পন"</item>
+    <item msgid="5387405117297558954">"ভাইব্রেট"</item>
     <item msgid="3434165993711230924">"পরিচিতিগুলি পড়ুন"</item>
     <item msgid="616161687718081936">"পরিচিতি পরিবর্তন করুন"</item>
     <item msgid="7638002295329050091">"কল লগ পড়ুন"</item>
@@ -287,7 +285,7 @@
     <item msgid="485564189219029300">"VPN সক্রিয় করুন"</item>
     <item msgid="7155384795265164395">"ওয়ালপেপারে লিখুন"</item>
     <item msgid="1835836196806147034">"পরিকাঠামোর সহায়তা"</item>
-    <item msgid="5989890403088155055">"স্ক্রীনশটে সহায়তা"</item>
+    <item msgid="5989890403088155055">"স্ক্রিনশটে সহায়তা"</item>
     <item msgid="8582699692765917557">"ফোনে্র অবস্থা পড়ুন"</item>
     <item msgid="1474039653814954902">"ভয়েসমেল যোগ করুন"</item>
     <item msgid="7222837656938871633">"SIP ব্যবহার করুন"</item>
@@ -307,7 +305,7 @@
     <item msgid="6602854600289714121">"অবস্থান"</item>
     <item msgid="8677040780775113033">"অবস্থান"</item>
     <item msgid="1660743989948992916">"অবস্থান"</item>
-    <item msgid="8791172739860195290">"কম্পন"</item>
+    <item msgid="8791172739860195290">"ভাইব্রেট"</item>
     <item msgid="383413555642128046">"পরিচিতিগুলি পড়ুন"</item>
     <item msgid="3654594895269697313">"পরিচিতি পরিবর্তন করুন"</item>
     <item msgid="7928393476362362538">"কল লগ পড়ুন"</item>
@@ -335,7 +333,7 @@
     <item msgid="3493046322001257041">"অডিও প্লে করুন"</item>
     <item msgid="136815868796597058">"ক্লিপবোর্ড পড়ুন"</item>
     <item msgid="5238692940326972503">"ক্লিপবোর্ড সংশোধন করুন"</item>
-    <item msgid="5753789168376302997">"মিডিয়া বোতাম"</item>
+    <item msgid="5753789168376302997">"মিডিয়া বোতামগুলি"</item>
     <item msgid="3265262911688671938">"অডিও ফোকাস"</item>
     <item msgid="2098976479485046797">"মাস্টার ভলিউম"</item>
     <item msgid="5660213838861789350">"ভয়েস ভলিউম"</item>
@@ -354,7 +352,7 @@
     <item msgid="2482631530338029480">"VPN সক্রিয় করুন"</item>
     <item msgid="1662979573471871926">"ওয়ালপেপারে লিখুন"</item>
     <item msgid="5964768335278263478">"পরিকাঠামোর সহায়তা"</item>
-    <item msgid="2657138701132782702">"স্ক্রীনশটে সহায়তা"</item>
+    <item msgid="2657138701132782702">"স্ক্রিনশটে সহায়তা"</item>
     <item msgid="8571369610363539266">"ফোনের অবস্থা পড়ুন"</item>
     <item msgid="4542463358215230845">"ভয়েসমেল যোগ করুন"</item>
     <item msgid="864565065016166003">"SIP ব্যবহার করুন"</item>
@@ -468,8 +466,8 @@
   <string-array name="color_picker">
     <item msgid="7631642672260600032">"টিল"</item>
     <item msgid="8332294763632946560">"নীল"</item>
-    <item msgid="2023216417616991392">"বেগুনি নীলবর্ণ"</item>
-    <item msgid="3170497246594232819">"বেগুনি"</item>
+    <item msgid="2023216417616991392">"বেগুনী নীলবর্ণ"</item>
+    <item msgid="3170497246594232819">"বেগুনী"</item>
     <item msgid="4608643045752965568">"গোলাপী"</item>
     <item msgid="6131821495505931173">"লাল"</item>
   </string-array>
diff --git a/res/values-bn/strings.xml b/res/values-bn/strings.xml
index 25a3755..f056cd2 100644
--- a/res/values-bn/strings.xml
+++ b/res/values-bn/strings.xml
@@ -25,11 +25,11 @@
     <string name="dlg_switch" msgid="6243971420240639064">"পাল্টান"</string>
     <string name="device_info_default" msgid="7847265875578739287">"অজানা"</string>
     <plurals name="show_dev_countdown" formatted="false" msgid="7201398282729229649">
-      <item quantity="one">একজন বিকাশকারী হওয়া থেকে আপনি এখন <xliff:g id="STEP_COUNT_1">%1$d</xliff:g> পদক্ষেপ দূরে রয়েছেন৷</item>
-      <item quantity="other">একজন বিকাশকারী হওয়া থেকে আপনি এখন <xliff:g id="STEP_COUNT_1">%1$d</xliff:g> পদক্ষেপ দূরে রয়েছেন৷</item>
+      <item quantity="one">একজন ডেভেলপার হওয়া থেকে আপনি এখন <xliff:g id="STEP_COUNT_1">%1$d</xliff:g> পদক্ষেপ দূরে রয়েছেন৷</item>
+      <item quantity="other">একজন ডেভেলপার হওয়া থেকে আপনি এখন <xliff:g id="STEP_COUNT_1">%1$d</xliff:g> পদক্ষেপ দূরে রয়েছেন৷</item>
     </plurals>
-    <string name="show_dev_on" msgid="1110711554982716293">"আপনি এখন একজন বিকাশকারী!"</string>
-    <string name="show_dev_already" msgid="2151632240145446227">"কোনো প্রয়োজন নেই, আপনি ইতিমধ্যেই একজন বিকাশকারী।"</string>
+    <string name="show_dev_on" msgid="1110711554982716293">"আপনি এখন একজন ডেভেলপার!"</string>
+    <string name="show_dev_already" msgid="2151632240145446227">"কোনও প্রয়োজন নেই, আপনি ইতিমধ্যেই একজন ডেভেলপার।"</string>
     <string name="dev_settings_disabled_warning" msgid="4909448907673974370">"প্রথমে ডেভেলপারের বিকল্পগুলি সক্রিয় করুন।"</string>
     <string name="header_category_wireless_networks" msgid="5110914332313954940">"ওয়্যারলেস ও নেটওয়ার্ক"</string>
     <string name="header_category_connections" msgid="6471513040815680662">"সংযোগগুলি"</string>
@@ -74,12 +74,12 @@
     <string name="radioInfo_display_asu" msgid="1422248392727818082">"asu"</string>
     <string name="radioInfo_lac" msgid="8415219164758307156">"LAC"</string>
     <string name="radioInfo_cid" msgid="4362599198392643138">"CID"</string>
-    <string name="sdcard_unmount" product="nosdcard" msgid="6325292633327972272">"USB সঞ্চয়স্থান আনমাউন্ট করুন"</string>
+    <string name="sdcard_unmount" product="nosdcard" msgid="6325292633327972272">"USB স্টোরেজ আনমাউন্ট করুন"</string>
     <string name="sdcard_unmount" product="default" msgid="3364184561355611897">"SD কার্ড আনমাউন্ট করুন"</string>
-    <string name="sdcard_format" product="nosdcard" msgid="6285310523155166716">"USB সঞ্চয়স্থান মুছে ফেলুন"</string>
+    <string name="sdcard_format" product="nosdcard" msgid="6285310523155166716">"USB স্টোরেজ মুছে ফেলুন"</string>
     <string name="sdcard_format" product="default" msgid="6713185532039187532">"SD কার্ড মুছে ফেলুন"</string>
-    <string name="preview_pager_content_description" msgid="8926235999291761243">"পূর্বরূপ দেখুন"</string>
-    <string name="preview_page_indicator_content_description" msgid="4821343428913401264">"পূর্বরূপ, <xliff:g id="NUM_PAGES">%2$d</xliff:g>টির মধ্যে <xliff:g id="CURRENT_PAGE">%1$d</xliff:g> নম্বর পৃষ্ঠা"</string>
+    <string name="preview_pager_content_description" msgid="8926235999291761243">"প্রিভিউ"</string>
+    <string name="preview_page_indicator_content_description" msgid="4821343428913401264">"প্রিভিউ, <xliff:g id="NUM_PAGES">%2$d</xliff:g>টির মধ্যে <xliff:g id="CURRENT_PAGE">%1$d</xliff:g> নম্বর পৃষ্ঠা"</string>
     <string name="font_size_summary" msgid="1690992332887488183">"স্ক্রীনের পাঠ্য ছোট বা বড় করুন।"</string>
     <string name="font_size_make_smaller_desc" msgid="7919995133365371569">"আরো ছোট করুন"</string>
     <string name="font_size_make_larger_desc" msgid="4316986572233686061">"আরো বড় করুন"</string>
@@ -88,26 +88,26 @@
     <string name="font_size_preview_text_headline" msgid="7955317408475392247">"নমুনা পাঠ্য"</string>
     <string name="font_size_preview_text_title" msgid="1310536233106975546">"দ্যা ওয়ান্ডারফুল উইজার্ড অফ অজ"</string>
     <string name="font_size_preview_text_subtitle" msgid="4231671528173110093">"অধ্যায় ১১: দ্যা ওয়ান্ডারফুল এমারল্ড সিটি অফ ওজ"</string>
-    <string name="font_size_preview_text_body" msgid="2846183528684496723">"চোখে সবুজ চশমা লাগানো থাকলেও, ডরোথি এবং তার বন্ধু বিস্ময়কর শহরের জাঁকজমক দেখে প্রথমে স্তম্ভিত হয়ে উঠেছিল৷ রাস্তায় সারিবদ্ধভাবে থাকা সুন্দর সুন্দর ঘর, তার সবগুলি সবুজ মার্বেল নির্মিত এবং সর্বত্র চমকদার পান্না দিয়ে খচিত৷ তারা সেই একই সবুজ মার্বেলের তৈরি একটি ফুটপাথ ধরে হেঁটে চলেছিল, যেখানে একটির সাথে আর একটি ব্লগ সারিবদ্ধ পান্না দিয়ে যুক্ত করে কঠিনভাবে সেট করা এবং তা সূর্যের আলোকে চকচক করছিল৷ জানালার ফলকগুলি সবুজ কাচের ছিল; শহরের আকাশে একটি সবুজ ছোপ দেখা যাচ্ছিল, এবং সূর্যের আলোও ছিল সবুজ রঙের৷ \n\nসেখানে অনেক পুরুষ, মহিলা এবং শিশুরা হাঁটা হাঁটি করছিল, সকলে সবুজ রঙের কাপড় পরেছিল, এবং তাদের ত্বকের রঙ ছিল সবুজাভ৷ তারা ডরোথির দিকে তাকিয়ে ছিল এবং বিস্মিত চোখে তার আশ্চর্যজনক নিশ্চিত সহায়ক দৃষ্টি দেখে শিশুদের সবাই পালিয়ে গেল এবং সিংহটিকে দেখার সাথে সাথে তারা তাদের মায়েদের পিছনে লুকিয়ে গেল; কিন্তু কেউ তাদেরকে কিছু বলল না৷ রাস্তার পাশে অনেক দোকান ছিল, ডরোথি দেখল সেখানে রাখা সবকিছুই সবুজ রঙের৷ সবুজ মিছরি এবং সবুজ ভুট্টার খই বিক্রির জন্য সাজানো ছিল, তার সাথে সবুজ জুতা, সবুজ টুপি এবং সব ধরনের সবুজ জামাকাপড়ও ছিল৷ একটা লোক এক জায়গায় দাঁড়িয়ে সবুজ সরবৎ বিক্রি করছিল, এবং যখন একটি শিশু সেটা কিনল, ডরোথি লক্ষ্য করল দামের অর্থ হিসাবে একটি সবুজ পেনি দিতে৷ \n\nদেখে মনে হচ্ছিল সেখানে কোনো ঘোড়া বা অন্য কোনো ধরনের প্রাণী নেই; পুরুষেরা ছোট সবুজ গাড়িতে করে ঠেলে ঠেলে কাছাকাছি জিনিসগুলি বয়ে নিয়ে যাচ্ছিল৷ সবাইকে খুব খুশি, সন্তুষ্ট এবং সমৃদ্ধ বলে মনে হচ্ছিল৷"</string>
+    <string name="font_size_preview_text_body" msgid="2846183528684496723">"চোখে সবুজ চশমা লাগানো থাকলেও, ডরোথি এবং তার বন্ধু বিস্ময়কর শহরের জাঁকজমক দেখে প্রথমে স্তম্ভিত হয়ে উঠেছিল৷ রাস্তায় সারিবদ্ধভাবে থাকা সুন্দর সুন্দর ঘর, তার সবগুলি সবুজ মার্বেল নির্মিত এবং সর্বত্র চমকদার পান্না দিয়ে খচিত৷ তারা সেই একই সবুজ মার্বেলের তৈরি একটি ফুটপাথ ধরে হেঁটে চলেছিল, যেখানে একটির সাথে আর একটি ব্লগ সারিবদ্ধ পান্না দিয়ে যুক্ত করে কঠিনভাবে সেট করা এবং তা সূর্যের আলোকে চকচক করছিল৷ জানালার ফলকগুলি সবুজ কাচের ছিল; শহরের আকাশে একটি সবুজ ছোপ দেখা যাচ্ছিল, এবং সূর্যের আলোও ছিল সবুজ রঙের৷ \n\nসেখানে অনেক পুরুষ, মহিলা এবং শিশুরা হাঁটা হাঁটি করছিল, সকলে সবুজ রঙের কাপড় পরেছিল, এবং তাদের ত্বকের রঙ ছিল সবুজাভ৷ তারা ডরোথির দিকে তাকিয়ে ছিল এবং বিস্মিত চোখে তার আশ্চর্যজনক নিশ্চিত সহায়ক দৃষ্টি দেখে শিশুদের সবাই পালিয়ে গেল এবং সিংহটিকে দেখার সাথে সাথে তারা তাদের মায়েদের পিছনে লুকিয়ে গেল; কিন্তু কেউ তাদেরকে কিছু বলল না৷ রাস্তার পাশে অনেক দোকান ছিল, ডরোথি দেখল সেখানে রাখা সবকিছুই সবুজ রঙের৷ সবুজ মিছরি এবং সবুজ ভুট্টার খই বিক্রির জন্য সাজানো ছিল, তার সাথে সবুজ জুতা, সবুজ টুপি এবং সব ধরনের সবুজ জামাকাপড়ও ছিল৷ একটা লোক এক জায়গায় দাঁড়িয়ে সবুজ সরবৎ বিক্রি করছিল, এবং যখন একটি শিশু সেটা কিনল, ডরোথি লক্ষ্য করল দামের অর্থ হিসেবে একটি সবুজ পেনি দিতে৷ \n\nদেখে মনে হচ্ছিল সেখানে কোনো ঘোড়া বা অন্য কোনো ধরনের প্রাণী নেই; পুরুষেরা ছোট সবুজ গাড়িতে করে ঠেলে ঠেলে কাছাকাছি জিনিসগুলি বয়ে নিয়ে যাচ্ছিল৷ সবাইকে খুব খুশি, সন্তুষ্ট এবং সমৃদ্ধ বলে মনে হচ্ছিল৷"</string>
     <string name="font_size_save" msgid="3450855718056759095">"ঠিক আছে"</string>
-    <string name="sdcard_setting" product="nosdcard" msgid="8281011784066476192">"USB সঞ্চয়স্থান"</string>
+    <string name="sdcard_setting" product="nosdcard" msgid="8281011784066476192">"USB স্টোরেজ"</string>
     <string name="sdcard_setting" product="default" msgid="5922637503871474866">"SD কার্ড"</string>
     <string name="bluetooth" msgid="5549625000628014477">"ব্লুটুথ"</string>
     <string name="bluetooth_is_discoverable" msgid="8373421452106840526">"কাছাকাছি সমস্ত ব্লুটুথ ডিভাইসে দৃশ্যমান (<xliff:g id="DISCOVERABLE_TIME_PERIOD">%1$s</xliff:g>)"</string>
     <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>
     <string name="bluetooth_profile_details" msgid="6823621790324933337">"প্রোফাইল সেটিংস"</string>
     <string name="bluetooth_name_not_set" msgid="2653752006416027426">"কোনো নাম সেট করা নেই, অ্যাকাউন্ট নাম ব্যবহার করা হচ্ছে"</string>
     <string name="bluetooth_scan_for_devices" msgid="9214184305566815727">"ডিভাইসগুলির জন্য স্ক্যান করুন"</string>
-    <string name="bluetooth_rename_device" msgid="4352483834491958740">"এই ডিভাইসটির পুনঃনামকরণ করুন"</string>
-    <string name="bluetooth_rename_button" msgid="1648028693822994566">"আবার নামকরণ করুন"</string>
+    <string name="bluetooth_rename_device" msgid="4352483834491958740">"এই ডিভাইসটির নাম বদলান"</string>
+    <string name="bluetooth_rename_button" msgid="1648028693822994566">"নাম বদলান"</string>
     <string name="bluetooth_disconnect_title" msgid="7830252930348734303">"ডিভাইসের সংযোগ বিচ্ছিন্ন করবেন?"</string>
     <string name="bluetooth_disconnect_all_profiles" product="default" msgid="8208712728668714199">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> থেকে আপনার ফোনের সংযোগ বিচ্ছিন্ন হবে।"</string>
     <string name="bluetooth_disconnect_all_profiles" product="tablet" msgid="6611038575213485336">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> থেকে আপনার ট্যাবলেটের সংযোগ বিচ্ছিন্ন হবে।"</string>
@@ -162,11 +162,11 @@
     <string name="bluetooth_pb_acceptance_dialog_text" msgid="8930347091018455505">"<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g> আপনার পরিচিতিগুলি এবং কলের ইতিহাস অ্যাক্সেস করতে চায়৷ <xliff:g id="DEVICE_NAME_1">%2$s</xliff:g>কে অ্যাক্সেস করতে দেবেন?"</string>
     <string name="bluetooth_remember_choice" msgid="6919682671787049800">"আবার জিজ্ঞাসা করবেন না"</string>
     <string name="bluetooth_pb_remember_choice" msgid="3622898084442402071">"আবার জিজ্ঞাসা করবেন না"</string>
-    <string name="bluetooth_map_request" msgid="4595727689513143902">"বার্তা অ্যাক্সেসের অনুরোধ"</string>
+    <string name="bluetooth_map_request" msgid="4595727689513143902">"মেসেজ অ্যাক্সেসের অনুরোধ"</string>
     <string name="bluetooth_map_acceptance_dialog_text" msgid="8712508202081143737">"%1$s আপনার বার্তাগুলি অ্যাক্সেস করতে ইচ্ছুক। %2$s এ অ্যাক্সেস দেবেন?"</string>
     <string name="bluetooth_sap_request" msgid="2669762224045354417">"সিম অ্যাক্সেস করার অনুরোধ"</string>
     <string name="bluetooth_sap_acceptance_dialog_text" msgid="4414253873553608690">"<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g> আপনার সিম কার্ড অ্যাক্সেস করতে চায়। এই সিম কার্ড অ্যাক্সেসের অনুমোদন দিলে তা সংযোগের সময়ে আপনার ডিভাইসে ডেটা সংযোগ অক্ষম করবে। <xliff:g id="DEVICE_NAME_1">%2$s?</xliff:g> -এ অ্যাক্সেস দিন"</string>
-    <string name="bluetooth_device_name_summary" msgid="4757990010751789977">"অন্য ডিভাইসে <xliff:g id="DEVICE_NAME">^1</xliff:g> নামে দেখা যাবে"</string>
+    <string name="bluetooth_device_name_summary" msgid="522235742194965734">"অন্য ডিভাইসে “<xliff:g id="DEVICE_NAME">^1</xliff:g>” নামে দেখা যাবে"</string>
     <string name="bluetooth_paired_device_title" msgid="8638994696317952019">"আপনার ডিভাইসগুলি"</string>
     <string name="bluetooth_pairing_page_title" msgid="7712127387361962608">"নতুন ডিভাইস যুক্ত করুন"</string>
     <string name="date_and_time" msgid="9062980487860757694">"দিন ও তারিখ"</string>
@@ -184,10 +184,10 @@
     <string name="proxy_exclusionlist_label" msgid="7700491504623418701">"এর জন্য বাইপাস প্রক্সি"</string>
     <string name="proxy_defaultView_text" msgid="6387985519141433291">"ডিফল্ট পুনরুদ্ধার করুন"</string>
     <string name="proxy_action_text" msgid="2957063145357903951">"সম্পন্ন হয়েছে"</string>
-    <string name="proxy_hostname_label" msgid="8490171412999373362">"প্রক্সি হোস্টনাম"</string>
+    <string name="proxy_hostname_label" msgid="8490171412999373362">"প্রক্সি হোস্টনেম"</string>
     <string name="proxy_error" msgid="8926675299638611451">"মনোযোগ"</string>
     <string name="proxy_error_dismiss" msgid="4993171795485460060">"ঠিক আছে"</string>
-    <string name="proxy_error_invalid_host" msgid="6865850167802455230">"আপনার টাইপ করা হোস্টনাম বৈধ নয়।The hostname you typed isn\'t valid."</string>
+    <string name="proxy_error_invalid_host" msgid="6865850167802455230">"আপনার টাইপ করা হোস্টনেম বৈধ নয়।"</string>
     <string name="proxy_error_invalid_exclusion_list" msgid="678527645450894773">"আপনার টাইপ করা বাদ দেওয়ার তালিকা সঠিকভাবে ফরম্যাট করা নেই। বাদ দেওয়া ডোমেনগুলির একটি কমা চিহ্ন দ্বারা বিভাজিত তালিকা টাইপ করুন।"</string>
     <string name="proxy_error_empty_port" msgid="5539106187558215246">"আপনাকে পোর্ট ফিল্ডটি সম্পূর্ণ করতে হবে।"</string>
     <string name="proxy_error_empty_host_set_port" msgid="2451694104858226781">"যদি হোস্ট ফিল্ড খালি থাকে তাহলে পোর্ট ফিল্ড খালি থাকা আবশ্যক।"</string>
@@ -210,14 +210,14 @@
     <string name="radio_info_signal_strength_label" msgid="5155734002519307416">"সিগন্যাল ক্ষমতা:"</string>
     <string name="radio_info_call_status_label" msgid="2611065018172747413">"ভয়েস কলের স্থিতি:"</string>
     <string name="radio_info_ppp_sent_label" msgid="7748668735880404586">"ডেটা পাঠানো হয়েছে:"</string>
-    <string name="radio_info_message_waiting_label" msgid="1037302619943328273">"বার্তা অপেক্ষ:"</string>
+    <string name="radio_info_message_waiting_label" msgid="1037302619943328273">"মেসেজ অপেক্ষ:"</string>
     <string name="radio_info_phone_number_label" msgid="7942153178953255231">"ফোন নম্বর:"</string>
-    <string name="radio_info_band_mode_label" msgid="8730871744887454509">"রেডিও ব্যান্ড নির্বাচন করুন"</string>
+    <string name="radio_info_band_mode_label" msgid="8730871744887454509">"রেডিও ব্যান্ড বেছে নিন"</string>
     <string name="radio_info_voice_network_type_label" msgid="1443496502370667071">"ভয়েস নেটওয়ার্কের প্রকার:"</string>
     <string name="radio_info_data_network_type_label" msgid="7094323145105149312">"ডেটা নেটওয়ার্কের প্রকার:"</string>
     <string name="radio_info_set_perferred_label" msgid="3511830813500105512">"পছন্দের নেটওয়ার্ক সেট করুন:"</string>
-    <string name="radio_info_ping_hostname_v4" msgid="7045103377818314709">"হোস্টনামে(www.google.com) IPv4 পিংগ করুন:"</string>
-    <string name="radio_info_ping_hostname_v6" msgid="1130906124160553954">"হোস্টনামে(www.google.com) IPv6 পিংগ করুন:"</string>
+    <string name="radio_info_ping_hostname_v4" msgid="7045103377818314709">"হোস্টনামে(www.google.com) IPv4 পিং করুন:"</string>
+    <string name="radio_info_ping_hostname_v6" msgid="1130906124160553954">"হোস্টনামে(www.google.com) IPv6 পিং করুন:"</string>
     <string name="radio_info_http_client_test" msgid="2382286093023138339">"HTTP ক্লায়েন্ট পরীক্ষা:"</string>
     <string name="ping_test_label" msgid="579228584343892613">"পিং পরীক্ষা চালান"</string>
     <string name="radio_info_smsc_label" msgid="6399460520126501354">"SMSC:"</string>
@@ -231,21 +231,21 @@
     <string name="band_mode_failed" msgid="1495968863884716379">"অসফল"</string>
     <string name="band_mode_succeeded" msgid="2701016190055887575">"সফল"</string>
     <string name="sdcard_changes_instructions" msgid="4482324130377280131">"USB কেবল আবার সংযোগ করা হলে পরিবর্তনগুলি কার্যকরী হবে।"</string>
-    <string name="sdcard_settings_screen_mass_storage_text" msgid="3741220147296482474">"USB বিপুল সঞ্চয়স্থান সক্ষম করুন"</string>
+    <string name="sdcard_settings_screen_mass_storage_text" msgid="3741220147296482474">"USB বিপুল স্টোরেজ সক্রিয় করুন"</string>
     <string name="sdcard_settings_total_bytes_label" msgid="9184160745785062144">"মোট বাইট:"</string>
-    <string name="sdcard_settings_not_present_status" product="nosdcard" msgid="1636218515775929394">"USB সঞ্চয়স্থান মাউন্ট করা নেই৷"</string>
+    <string name="sdcard_settings_not_present_status" product="nosdcard" msgid="1636218515775929394">"USB স্টোরেজ মাউন্ট করা নেই৷"</string>
     <string name="sdcard_settings_not_present_status" product="default" msgid="2048419626134861599">"কোন SD কার্ড নেই।"</string>
     <string name="sdcard_settings_available_bytes_label" msgid="763232429899373001">"উপলব্ধ বাইট:"</string>
-    <string name="sdcard_settings_mass_storage_status" product="nosdcard" msgid="7993410985895217054">"USB সঞ্চয়স্থান একটি বড় সঞ্চয়স্থান ডিভাইস হিসাবে ব্যবহার করা হচ্ছে।"</string>
-    <string name="sdcard_settings_mass_storage_status" product="default" msgid="2742075324087038036">"SD সঞ্চয়স্থান একটি বড় সঞ্চয়স্থান ডিভাইস হিসাবে ব্যবহার করা হচ্ছে।"</string>
-    <string name="sdcard_settings_unmounted_status" product="nosdcard" msgid="5128923500235719226">"এখন USB সঞ্চয়স্থান সরানো নিরাপদ।"</string>
+    <string name="sdcard_settings_mass_storage_status" product="nosdcard" msgid="7993410985895217054">"USB স্টোরেজ একটি বড় স্টোরেজ ডিভাইস হিসাবে ব্যবহার করা হচ্ছে।"</string>
+    <string name="sdcard_settings_mass_storage_status" product="default" msgid="2742075324087038036">"SD স্টোরেজ একটি বড় স্টোরেজ ডিভাইস হিসাবে ব্যবহার করা হচ্ছে।"</string>
+    <string name="sdcard_settings_unmounted_status" product="nosdcard" msgid="5128923500235719226">"এখন USB স্টোরেজ সরানো নিরাপদ।"</string>
     <string name="sdcard_settings_unmounted_status" product="default" msgid="666233604712540408">"SD কার্ড এখন সরানো নিরাপদ।"</string>
-    <string name="sdcard_settings_bad_removal_status" product="nosdcard" msgid="7761390725880773697">"ব্যবহৃত হওয়ার সময়েই USB সঞ্চয়স্থান সরানো হয়েছে!"</string>
+    <string name="sdcard_settings_bad_removal_status" product="nosdcard" msgid="7761390725880773697">"ব্যবহৃত হওয়ার সময়েই USB স্টোরেজ সরানো হয়েছে!"</string>
     <string name="sdcard_settings_bad_removal_status" product="default" msgid="5145797653495907970">"ব্যবহৃত হওয়ার সময়েই SD কার্ড সরানো হয়েছে!"</string>
     <string name="sdcard_settings_used_bytes_label" msgid="8820289486001170836">"ব্যবহৃত বাইট:"</string>
-    <string name="sdcard_settings_scanning_status" product="nosdcard" msgid="7503429447676219564">"মিডিয়ার জন্য USB সঞ্চয়স্থান স্ক্যান করা হচ্ছে..."</string>
+    <string name="sdcard_settings_scanning_status" product="nosdcard" msgid="7503429447676219564">"মিডিয়ার জন্য USB স্টোরেজ স্ক্যান করা হচ্ছে..."</string>
     <string name="sdcard_settings_scanning_status" product="default" msgid="2763464949274455656">"মিডিয়ার জন্য SD কার্ড স্ক্যান করা হচ্ছে..."</string>
-    <string name="sdcard_settings_read_only_status" product="nosdcard" msgid="3624143937437417788">"USB সঞ্চয়স্থান শুধুমাত্র পাঠযোগ্য অবস্থায় মাউন্ট করা।"</string>
+    <string name="sdcard_settings_read_only_status" product="nosdcard" msgid="3624143937437417788">"USB স্টোরেজ শুধুমাত্র পাঠযোগ্য অবস্থায় মাউন্ট করা।"</string>
     <string name="sdcard_settings_read_only_status" product="default" msgid="4518291824764698112">"SD কার্ড শুধুমাত্র পাঠযোগ্য অবস্থায় মাউন্ট করা।"</string>
     <string name="skip_label" msgid="47510779345218297">"এড়িয়ে যান"</string>
     <string name="next_label" msgid="4693520878012668114">"পরবর্তী"</string>
@@ -271,13 +271,13 @@
     <string name="display_label" msgid="8074070940506840792">"স্ক্রীন"</string>
     <string name="phone_info_label" product="tablet" msgid="7820855350955963628">"ট্যাবলেট তথ্য"</string>
     <string name="phone_info_label" product="default" msgid="2127552523124277664">"ফোন তথ্য"</string>
-    <string name="sd_card_settings_label" product="nosdcard" msgid="8101475181301178428">"USB সঞ্চয়স্থান"</string>
+    <string name="sd_card_settings_label" product="nosdcard" msgid="8101475181301178428">"USB স্টোরেজ"</string>
     <string name="sd_card_settings_label" product="default" msgid="5743100901106177102">"SD কার্ড"</string>
     <string name="proxy_settings_label" msgid="3271174136184391743">"প্রক্সি সেটিংস"</string>
     <string name="cancel" msgid="6859253417269739139">"বাতিল"</string>
     <string name="okay" msgid="1997666393121016642">"ঠিক আছে"</string>
     <string name="forget" msgid="1400428660472591263">"ভুলে যান"</string>
-    <string name="save" msgid="879993180139353333">"সংরক্ষণ করুন"</string>
+    <string name="save" msgid="879993180139353333">"সেভ করুন"</string>
     <string name="done" msgid="6942539184162713160">"সম্পন্ন"</string>
     <string name="settings_label" msgid="1626402585530130914">"সেটিংস"</string>
     <string name="settings_label_launcher" msgid="8344735489639482340">"সেটিংস"</string>
@@ -297,7 +297,7 @@
     <string name="roaming_disable" msgid="1295279574370898378">"রোমিংয়ে থাকাকালীন ডেটা পরিষেবাগুলি সংযোগ করুন"</string>
     <string name="roaming_reenable_message" msgid="9141007271031717369">"আপনি আপনার হোম নেটওয়ার্ক থেকে ডেটা রোমিং বন্ধ করে দেওয়ার কারণে আপনি ডেটা সংযোগ হারিয়েছেন।"</string>
     <string name="roaming_turn_it_on_button" msgid="4387601818162120589">"এটি চালু করুন"</string>
-    <string name="roaming_warning" msgid="4275443317524544705">"আপনাকে উল্লেখযোগ্য পরিমাণে চার্জ করা হতে পারে৷"</string>
+    <string name="roaming_warning" msgid="4275443317524544705">"আপনার ব্যালেন্স খরচ হতে পারে৷"</string>
     <string name="roaming_warning_multiuser" product="tablet" msgid="6458990250829214777">"যখন আপনি ডেটা রোমিংয়ের অনুমতি দেবেন, তখন আপনাকে রোমিং চার্জ ধার্য করা হতে পারে!\n\nএই সেটিংস এই ট্যাবলেটের সমস্ত ব্যবহারকারীর উপর প্রভাব ফেলবে।"</string>
     <string name="roaming_warning_multiuser" product="default" msgid="6368421100292355440">"যখন আপনি ডেটা রোমিংয়ের অনুমতি দেবেন, তখন আপনাকে রোমিং চার্জ ধার্য করা হতে পারে!\n\nএই সেটিংস এই ফোনের সমস্ত ব্যবহারকারীর উপর প্রভাব ফেলবে।"</string>
     <string name="roaming_reenable_title" msgid="6068100976707316772">"ডেটা রোমিংয়ের অনুমতি দেবেন?"</string>
@@ -306,49 +306,50 @@
     <string name="date_and_time_settings_title" msgid="3350640463596716780">"তারিখ ও সময়"</string>
     <string name="date_and_time_settings_title_setup_wizard" msgid="2391530758339384324">"তারিখ এবং সময় সেট করুন"</string>
     <string name="date_and_time_settings_summary" msgid="7095318986757583584">"তারিখ, সময়, সময় অঞ্চল ও ফর্ম্যাট সেট করুন"</string>
-    <string name="date_time_auto" msgid="7076906458515908345">"স্বয়ংক্রিয় তারিখ ও সময়"</string>
+    <string name="date_time_auto" msgid="7076906458515908345">"অটোমেটিক তারিখ ও সময়"</string>
     <string name="date_time_auto_summaryOn" msgid="4609619490075140381">"নেটওয়ার্ক প্রদত্ত সময় ব্যবহার করুন"</string>
     <string name="date_time_auto_summaryOff" msgid="8698762649061882791">"নেটওয়ার্ক প্রদত্ত সময় ব্যবহার করুন"</string>
-    <string name="zone_auto" msgid="334783869352026648">"স্বয়ংক্রিয় সময় অঞ্চল"</string>
+    <string name="zone_auto" msgid="334783869352026648">"অটোমেটিক টাইম জোন"</string>
     <string name="zone_auto_summaryOn" msgid="6142830927278458314">"নেটওয়ার্ক প্রদত্ত অঞ্চলের সময় ব্যবহার করুন"</string>
     <string name="zone_auto_summaryOff" msgid="2597745783162041390">"নেটওয়ার্ক প্রদত্ত অঞ্চলের সময় ব্যবহার করুন"</string>
+    <string name="date_time_24hour_auto" msgid="2117383168985653422">"স্বয়ংক্রিয় ২৪-ঘণ্টা ফর্ম্যাট"</string>
+    <string name="date_time_24hour_auto_summary" msgid="6351812925651480277">"স্থানীয় ডিফল্ট ব্যবহার করুন"</string>
     <string name="date_time_24hour_title" msgid="3203537578602803850">"২৪-ঘণ্টা বিন্যাস"</string>
     <string name="date_time_24hour" msgid="1193032284921000063">"২৪ ঘন্টার ফর্ম্যাট ব্যবহার করুন"</string>
     <string name="date_time_set_time_title" msgid="6296795651349047016">"সময়"</string>
     <string name="date_time_set_time" msgid="5716856602742530696">"সময় সেট করুন"</string>
     <string name="date_time_set_timezone_title" msgid="3047322337368233197">"সময় অঞ্চল"</string>
-    <string name="date_time_set_timezone" msgid="5045627174274377814">"সময় অঞ্চল নির্বাচন করুন"</string>
+    <string name="date_time_set_timezone" msgid="5045627174274377814">"সময় অঞ্চল বেছে নিন"</string>
     <string name="date_time_set_date_title" msgid="6928286765325608604">"তারিখ"</string>
     <string name="date_time_set_date" msgid="7021491668550232105">"তারিখ সেট করুন"</string>
     <string name="zone_list_menu_sort_alphabetically" msgid="5683377702671088588">"বর্ণানুক্রমে সাজান"</string>
     <string name="zone_list_menu_sort_by_timezone" msgid="2720190443744884114">"সময় অঞ্চলের অনুসারে সাজান"</string>
     <string name="date_picker_title" msgid="1338210036394128512">"তারিখ"</string>
     <string name="time_picker_title" msgid="483460752287255019">"সময়"</string>
-    <string name="lock_after_timeout" msgid="4590337686681194648">"স্বয়ংক্রিয় লক"</string>
+    <string name="lock_after_timeout" msgid="4590337686681194648">"অটোমেটিক লক"</string>
     <string name="lock_after_timeout_summary" msgid="6128431871360905631">"<xliff:g id="TIMEOUT_STRING">%1$s</xliff:g> এর পর নিদ্রা মোডে নিয়ে যান"</string>
     <string name="lock_immediately_summary_with_exception" msgid="9119632173886172690">"অবিলম্বে, শুধুমাত্র <xliff:g id="TRUST_AGENT_NAME">%1$s</xliff:g> দ্বারা আনলক করে রেখে দেওয়ার সময় ছাড়া, নিদ্রা মোডে যাওয়ার পরে"</string>
     <string name="lock_after_timeout_summary_with_exception" msgid="5579064842797188409">"শুধুমাত্র <xliff:g id="TRUST_AGENT_NAME">%2$s</xliff:g> দ্বারা আনলক করে রেখে দেওয়ার সময় ছাড়া, নিদ্রা মোডে যাওয়ার <xliff:g id="TIMEOUT_STRING">%1$s</xliff:g> পরে"</string>
-    <string name="show_owner_info_on_lockscreen_label" msgid="5074906168357568434">"লক স্ক্রীনে মালিক তথ্য প্রদর্শন করুন"</string>
-    <string name="owner_info_settings_title" msgid="5530285568897386122">"লক স্ক্রীনের বার্তা"</string>
+    <string name="show_owner_info_on_lockscreen_label" msgid="5074906168357568434">"লক স্ক্রিনে মালিকের তথ্য প্রদর্শন করুন"</string>
+    <string name="owner_info_settings_title" msgid="5530285568897386122">"লক স্ক্রিনের মেসেজ"</string>
     <string name="security_enable_widgets_title" msgid="2754833397070967846">"উইজেটগুলি সক্ষম করুন"</string>
     <string name="security_enable_widgets_disabled_summary" msgid="6392489775303464905">"প্রশাসক দ্বারা অক্ষম করা হয়েছে"</string>
     <string name="owner_info_settings_summary" msgid="7472393443779227052">"কোনো কিছুই নয়"</string>
     <string name="owner_info_settings_status" msgid="120407527726476378">"<xliff:g id="COUNT_0">%1$d</xliff:g> / <xliff:g id="COUNT_1">%2$d</xliff:g>"</string>
-    <string name="owner_info_settings_edit_text_hint" msgid="7591869574491036360">"যেমন, জো এর Android৷"</string>
+    <string name="owner_info_settings_edit_text_hint" msgid="7591869574491036360">"যেমন, সুমনের Android"</string>
     <string name="user_info_settings_title" msgid="1195015434996724736">"ব্যবহারকারী তথ্য"</string>
-    <string name="show_profile_info_on_lockscreen_label" msgid="2741208907263877990">"লক স্ক্রীনে প্রোফাইল তথ্য প্রদর্শন করুন"</string>
+    <string name="show_profile_info_on_lockscreen_label" msgid="2741208907263877990">"লক স্ক্রিনে প্রোফাইলের তথ্য প্রদর্শন করুন"</string>
     <string name="profile_info_settings_title" msgid="3518603215935346604">"প্রোফাইল তথ্য"</string>
     <string name="Accounts_settings_title" msgid="1643879107901699406">"অ্যাকাউন্টগুলি"</string>
     <string name="location_settings_title" msgid="1369675479310751735">"অবস্থান"</string>
     <string name="account_settings_title" msgid="626177544686329806">"অ্যাকাউন্টগুলি"</string>
-    <!-- no translation found for security_settings_title (4918904614964215087) -->
-    <skip />
-    <string name="encryption_and_credential_settings_title" msgid="6514904533438791561">"এনক্রিপশান ও শংসাপত্র"</string>
+    <string name="security_settings_title" msgid="4918904614964215087">"নিরাপত্তা ও লোকেশন"</string>
+    <string name="encryption_and_credential_settings_title" msgid="6514904533438791561">"এনক্রিপশন ও ক্রেডেনশিয়াল"</string>
     <string name="encryption_and_credential_settings_summary" product="default" msgid="8721883002237981248">"ফোন এনক্রিপশন"</string>
     <string name="encryption_and_credential_settings_summary" product="tablet" msgid="7200428573872395685">"ডিভাইসটি এনক্রিপ্টেড"</string>
     <string name="lockscreen_settings_title" msgid="3922976395527087455">"স্কিন লকের পছন্দগুলি"</string>
-    <string name="security_settings_summary" msgid="967393342537986570">"আমার স্থান, স্ক্রীন আনলক, সিম কার্ড লক, ক্রেডেনশিয়াল সঞ্চয়স্থান লক সেট করুন"</string>
-    <string name="cdma_security_settings_summary" msgid="6068799952798901542">"আমার স্থান, স্ক্রীন আনলক, ক্রেডেনশিয়াল সঞ্চয়স্থান লক সেট করুন"</string>
+    <string name="security_settings_summary" msgid="967393342537986570">"আমার স্থান, স্ক্রিন আনলক, সিম কার্ড লক, ক্রেডেনশিয়াল স্টোরেজ লক সেট করুন"</string>
+    <string name="cdma_security_settings_summary" msgid="6068799952798901542">"আমার স্থান, স্ক্রিন আনলক, ক্রেডেনশিয়াল স্টোরেজ লক সেট করুন"</string>
     <string name="security_passwords_title" msgid="2881269890053568809">"গোপনীয়তা"</string>
     <string name="disabled_by_administrator_summary" msgid="1601828700318996341">"প্রশাসক দ্বারা অক্ষম করা হয়েছে"</string>
     <string name="security_status_title" msgid="5848766673665944640">"নিরাপত্তা স্থিতি"</string>
@@ -358,7 +359,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>
@@ -366,13 +367,16 @@
     <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দ্রষ্টব্য: আপনার আঙ্গুলের ছাপ একটি জটিল প্যাটার্ন বা PIN এর চাইতে কম নিরাপদ হতে পারে।"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_message" msgid="3508870672887336095">"আপনার ফোন আনলক করতে, কেনাকাটা অনুমোদন, বা অ্যাপ্লিকেশনগুলিতে প্রবেশ করতে শুধু আঙ্গুলের ছাপ নেওয়ার সেন্সরে স্পর্শ করুন৷ আপনি কাদের আঙ্গুলের ছাপ যোগ করছেন সেই বিষয়ে সতর্ক থাকুন৷ এমনকি যাদের আঙ্গুলের ছাপ যোগ করা হবে তারা এই জিনিসগুলি করতে পারবে।\n\nদ্রষ্টব্য: আপনার আঙ্গুলের ছাপ একটি জটিল প্যাটার্ন বা পিন-এর চাইতে কম নিরাপদ হতে পারে।"</string>
     <string name="security_settings_fingerprint_enroll_introduction_message_unlock_disabled" msgid="1550756694054944874">"আপনার ফোন আনলক বা কেনাকাটাগুলির অনুমোদন করতে আপনার আঙ্গুলের ছাপ ব্যবহার করুন। \n\nদ্রষ্টব্য: আপনি এই ডিভাইসটি আনলক করার জন্য আপনার আঙ্গুলের ছাপ ব্যবহার করতে পারবেন না। আরও তথ্যের জন্য, আপনার প্রতিষ্ঠানের প্রশাসকের সাথে যোগাযোগ করুন।"</string>
     <string name="security_settings_fingerprint_enroll_introduction_message_setup" msgid="6817326798834882531">"আপনার ফোন আনলক বা কেনাকাটাগুলি অনুমোদন করতে আপনার আঙ্গুলের ছাপ ব্যবহার করুন।\n\nদ্রষ্টব্য: একটি দৃঢ় বা সুরক্ষিত প্যাটার্ন বা পিনের তুলনায় আপনার আঙ্গুলের ছাপ কম সুরক্ষিত হতে পারে।"</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel" msgid="3199351118385606526">"বাতিল করুন"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue" msgid="7472492858148162530">"চালিয়ে যান"</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel_setup" msgid="5021369420474432665">"এড়িয়ে যান"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue_setup" msgid="1961957425135180242">"পরবর্তী"</string>
+    <string name="setup_fingerprint_enroll_skip_title" msgid="362050541117362034">"আঙ্গুলের ছাপ এড়িয়ে যেতে চান?"</string>
+    <string name="setup_fingerprint_enroll_skip_after_adding_lock_text" msgid="958990414356204763">"ফিঙ্গারপ্রিন্ট সেট-আপ করতে এক বা দুই সময় মিনিট লাগবে। আপনি যদি এড়িয়ে যেতে চান তবে পরে সেটিংসে গিয়ে পরিবর্তন করতে পারবেন।"</string>
+    <string name="lock_screen_intro_skip_title" msgid="4988210105913705679">"স্ক্রিন লক এড়িয়ে যেতে চান?"</string>
     <string name="lock_screen_intro_skip_dialog_text_frp" product="tablet" msgid="1581834104051243425">"ডিভাইসের সুরক্ষা বৈশিষ্ট্যগুলি চালু করা হবে না। এই ট্যাবলেটটি হারিয়ে গেলে, চুরি হয়ে গেলে অথবা রিসেট করা হলে সেটি অন্যদের ব্যবহার করতে আপনি আটকাতে পারবেন না।"</string>
     <string name="lock_screen_intro_skip_dialog_text_frp" product="device" msgid="4629503416877189572">"ডিভাইসের সুরক্ষা বৈশিষ্ট্যগুলি চালু করা হবে না। এই ডিভাইসটি হারিয়ে গেলে, চুরি হয়ে গেলে অথবা রিসেট করা হলে সেটি অন্যদের ব্যবহার করতে আপনি আটকাতে পারবেন না।"</string>
     <string name="lock_screen_intro_skip_dialog_text_frp" product="default" msgid="2423428240245737909">"ডিভাইসের সুরক্ষা বৈশিষ্ট্যগুলি চালু করা হবে না। এই ফোনটি হারিয়ে গেলে, চুরি হয়ে গেলে অথবা রিসেট করা হলে সেটি অন্যদের ব্যবহার করতে আপনি আটকাতে পারবেন না।"</string>
@@ -396,7 +400,7 @@
     <string name="security_settings_fingerprint_enroll_enrolling_skip" msgid="3710211704052369752">"এটি পরে করুন"</string>
     <string name="setup_fingerprint_enroll_enrolling_skip_title" msgid="6808422329107426923">"আঙ্গুলের ছাপ সেট আপ করা এড়িয়ে যাবেন?"</string>
     <string name="setup_fingerprint_enroll_enrolling_skip_message" msgid="274849306857859783">"আপনি আপনার ফোন আনলক করার একটি উপায় হিসেবে আপনার আঙ্গুলের ছাপ ব্যবহারের ব্যবস্থাটিকে বেছে নিয়েছেন। আপনি যদি এখনই এটিকে এড়িয়ে যান, তাহলে আপনাকে পরে আবার এটি সেট আপ করতে হবে। সেট আপ করতে মাত্র এক মিনিট এর মত সময় লাগতে পারে।"</string>
-    <string name="security_settings_fingerprint_enroll_setup_screen_lock" msgid="1195743489835505376">"স্ক্রীন লক সেট আপ করুন"</string>
+    <string name="security_settings_fingerprint_enroll_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="2989019978041986175">"আপনার ফোন এর পিছনে থাকা সেন্সর স্পর্শ করুন। আপনার তর্জনী ব্যবহার করুন।"</string>
@@ -422,14 +426,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_unplugged_text" msgid="4785376766063053901">"আপনার চার্জার প্লাগ-ইন করুন এবং আবার চেষ্টা করুন।"</string>
+    <string name="crypt_keeper_dialog_need_password_title" msgid="4058971800557767">"কোনও লক স্ক্রিন পিন বা পাসওয়ার্ড নেই"</string>
+    <string name="crypt_keeper_dialog_need_password_message" msgid="4071395977297369642">"এনক্রিপশন শুরু করার আগে আপনাকে লক স্ক্রিন পিন বা পাসওয়ার্ড সেট করতে হবে।"</string>
     <string name="crypt_keeper_confirm_title" msgid="5100339496381875522">"এনক্রিপ্ট?"</string>
     <string name="crypt_keeper_final_desc" product="tablet" msgid="517662068757620756">"এনক্রিপশন অপারেশন অপরিবর্তনীয় এবং আপনি এটা বিঘ্নিত করলে আপনি ডেটা হারাবেন। এনক্রিপশান হতে ঘণ্টা খানেক বা তার বেশি সময় লাগবে, এইসময়ে ট্যাবলেট কয়েকবার পুনর্সূচনা হবে।"</string>
     <string name="crypt_keeper_final_desc" product="default" msgid="287503113671320916">"এনক্রিপশন অপারেশন অপরিবর্তনীয় এবং আপনি এটা বিঘ্নিত করলে আপনি ডেটা হারাবেন। এনক্রিপশান হতে ঘণ্টা খানেক বা তার বেশি সময় লাগবে, এইসময়ে ফোন কয়েকবার পুনর্সূচনা হবে।"</string>
@@ -449,29 +453,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="lock_settings_picker_fingerprint_added_security_message" msgid="5768002109707648463">"অতিরিক্ত নিরাপত্তার জন্য একটি ব্যাক-আপ স্ক্রিন লক সেট করুন।"</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_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>
@@ -483,46 +487,54 @@
     <string name="unlock_set_unlock_password_title" msgid="8775603825675090937">"পাসওয়ার্ড"</string>
     <string name="unlock_set_unlock_password_summary" msgid="8856220848940929546">"উচ্চ নিরাপত্তা"</string>
     <string name="unlock_set_do_later_title" msgid="4894767558414979243">"এখনই নয়"</string>
-    <string name="current_screen_lock" msgid="4104091715420072219">"বর্তমান স্ক্রীন লক"</string>
+    <string name="current_screen_lock" msgid="4104091715420072219">"বর্তমান স্ক্রিন লক"</string>
     <string name="fingerprint_unlock_set_unlock_pattern" msgid="4939057588092120368">"আঙ্গুলের ছাপ + প্যাটার্ন"</string>
     <string name="fingerprint_unlock_set_unlock_pin" msgid="8010746824051056986">"আঙ্গুলের ছাপ + পিন"</string>
     <string name="fingerprint_unlock_set_unlock_password" msgid="7351131075806338634">"আঙ্গুলের ছাপ + পাসওয়ার্ড"</string>
     <string name="fingerprint_unlock_skip_fingerprint" msgid="1441077909803666681">"আঙ্গুলের ছাপ ছাড়াই চালিয়ে যান"</string>
-    <string name="fingerprint_unlock_title" msgid="2826226740306003991">"আপনি আপনার আঙ্গুলের ছাপ ব্যবহার করে আপনার ফোন আনলক করতে পারবেন। নিরাপত্তার জন্য, এই বিকল্পটির একটি ব্যাক আপ স্ক্রীন লকের প্রয়োজন।"</string>
-    <string name="unlock_set_unlock_disabled_summary" msgid="2051593894736282302">"প্রশাসক, এনক্রিপশন নীতি বা ক্রেডেনশিয়াল সঞ্চয়স্থান দ্বারা অক্ষম"</string>
+    <string name="fingerprint_unlock_title" msgid="2826226740306003991">"আপনি আপনার আঙুলের ছাপ ব্যবহার করে আপনার ফোন আনলক করতে পারবেন। নিরাপত্তার জন্য, এই বিকল্পটির একটি ব্যাক-আপ স্ক্রিন লকের প্রয়োজন।"</string>
+    <string name="unlock_set_unlock_disabled_summary" msgid="2051593894736282302">"প্রশাসক, এনক্রিপশন নীতি বা ক্রেডেনশিয়াল স্টোরেজ দ্বারা অক্ষম"</string>
     <string name="unlock_set_unlock_mode_off" msgid="5881952274566013651">"কোনো কিছুই নয়"</string>
     <string name="unlock_set_unlock_mode_none" msgid="8467360084676871617">"সোয়াইপ করুন"</string>
     <string name="unlock_set_unlock_mode_pattern" msgid="7837270780919299289">"প্যাটার্ন"</string>
     <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>
-    <!-- no translation found for unlock_disable_frp_warning_content_pattern_fingerprint (2986105377420905314) -->
-    <skip />
+    <string name="unlock_disable_frp_warning_content_pattern_fingerprint" msgid="2986105377420905314">"ডিভাইসের সুরক্ষা বৈশিষ্ট্যগুলি আপনার প্যাটার্ন ছাড়া কাজ করবে না।<xliff:g id="EMPTY_LINE">
+
+</xliff:g>এছাড়াও আপনার সেভ করা আঙ্গুলের ছাপগুলিকে এই ডিভাইস থেকে সরিয়ে দেওয়া হবে এবং আপনি সেগুলি দিয়ে আপনার ফোন আনলক, কেনাকাটা অনুমোদন, বা অ্যাপগুলিতে সাইন-ইন করতে পারবেন না।"</string>
     <string name="unlock_disable_frp_warning_content_pin" msgid="586996206210265131">"ডিভাইস সুরক্ষা বৈশিষ্ট্যগুলি আপনার পিন ছাড়া কাজ করবে না৷"</string>
-    <!-- no translation found for unlock_disable_frp_warning_content_pin_fingerprint (3370462835533123695) -->
-    <skip />
+    <string name="unlock_disable_frp_warning_content_pin_fingerprint" msgid="3370462835533123695">"ডিভাইসের সুরক্ষা বৈশিষ্ট্যগুলি আপনার পিন ছাড়া কাজ করবে না।<xliff:g id="EMPTY_LINE">
+
+</xliff:g>এছাড়াও আপনার সেভ করা আঙ্গুলের ছাপগুলিকে এই ডিভাইস থেকে সরিয়ে দেওয়া হবে এবং আপনি সেগুলি দিয়ে আপনার ফোন আনলক, কেনাকাটা অনুমোদন, বা অ্যাপগুলিতে সাইন-ইন করতে পারবেন না।"</string>
     <string name="unlock_disable_frp_warning_content_password" msgid="5420612686852555537">"ডিভাইস সুরক্ষা বৈশিষ্ট্যগুলি আপনার পাসওয়ার্ড ছাড়া কাজ করবে না৷"</string>
-    <!-- no translation found for unlock_disable_frp_warning_content_password_fingerprint (3595476296430536798) -->
-    <skip />
-    <string name="unlock_disable_frp_warning_content_unknown" msgid="1550718040483548220">"ডিভাইস সুরক্ষা বৈশিষ্ট্যগুলি আপনার স্ক্রীন লক ছাড়া কাজ করবে না৷"</string>
-    <!-- no translation found for unlock_disable_frp_warning_content_unknown_fingerprint (3679351662094349506) -->
-    <skip />
+    <string name="unlock_disable_frp_warning_content_password_fingerprint" msgid="3595476296430536798">"ডিভাইসের সুরক্ষা বৈশিষ্ট্যগুলি আপনার পাসওয়ার্ড ছাড়া কাজ করবে না।<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="3679351662094349506">"ডিভাইসের সুরক্ষা বৈশিষ্ট্যগুলি আপনার স্ক্রিন লক ছাড়া কাজ করবে না।<xliff:g id="EMPTY_LINE">
+
+</xliff:g>এছাড়াও আপনার সেভ করা আঙ্গুলের ছাপগুলিকে এই ডিভাইস থেকে সরিয়ে দেওয়া হবে এবং আপনি সেগুলি দিয়ে আপনার ফোন আনলক, কেনাকাটা অনুমোদন, বা অ্যাপগুলিতে সাইন-ইন করতে পারবেন না।"</string>
     <string name="unlock_disable_frp_warning_content_pattern_profile" msgid="8682200103576359918">"প্রোফাইল সুরক্ষার বৈশিষ্ট্যগুলি আপনার প্যাটার্ন ছাড়া কাজ করবে না৷"</string>
-    <!-- no translation found for unlock_disable_frp_warning_content_pattern_fingerprint_profile (6718155854303231675) -->
-    <skip />
+    <string name="unlock_disable_frp_warning_content_pattern_fingerprint_profile" msgid="6718155854303231675">"প্রোফাইলের সুরক্ষা বৈশিষ্ট্যগুলি আপনার প্যাটার্ন ছাড়া কাজ করবে না।<xliff:g id="EMPTY_LINE">
+
+</xliff:g>এছাড়াও আপনার সেভ করা আঙ্গুলের ছাপগুলিকে এই প্রোফাইল থেকে সরিয়ে দেওয়া হবে এবং আপনি সেগুলি দিয়ে আপনার প্রোফাইল আনলক, কেনাকাটা অনুমোদন, বা অ্যাপগুলিতে সাইন-ইন করতে পারবেন না।"</string>
     <string name="unlock_disable_frp_warning_content_pin_profile" msgid="7790688070593867767">"প্রোফাইল সুরক্ষার বৈশিষ্ট্যগুলি আপনার পিন ছাড়া কাজ করবে না৷"</string>
-    <!-- no translation found for unlock_disable_frp_warning_content_pin_fingerprint_profile (4209564603132870532) -->
-    <skip />
+    <string name="unlock_disable_frp_warning_content_pin_fingerprint_profile" msgid="4209564603132870532">"প্রোফাইলের সুরক্ষা বৈশিষ্ট্যগুলি আপনার পিন ছাড়া কাজ করবে না।<xliff:g id="EMPTY_LINE">
+
+</xliff:g>এছাড়াও আপনার সেভ করা আঙ্গুলের ছাপগুলিকে এই প্রোফাইল থেকে সরিয়ে দেওয়া হবে এবং আপনি সেগুলি দিয়ে আপনার প্রোফাইল আনলক, কেনাকাটা অনুমোদন, বা অ্যাপগুলিতে সাইন-ইন করতে পারবেন না।"</string>
     <string name="unlock_disable_frp_warning_content_password_profile" msgid="7569285520567674461">"প্রোফাইল সুরক্ষার বৈশিষ্ট্যগুলি আপনার পাসওয়ার্ড ছাড়া কাজ করবে না৷"</string>
-    <!-- no translation found for unlock_disable_frp_warning_content_password_fingerprint_profile (2994300676764706047) -->
-    <skip />
-    <string name="unlock_disable_frp_warning_content_unknown_profile" msgid="6984215718701688202">"আপনার স্ক্রীন লক ছাড়া প্রোফাইল সুরক্ষার বৈশিষ্ট্যগুলি কাজ করবে না৷"</string>
-    <!-- no translation found for unlock_disable_frp_warning_content_unknown_fingerprint_profile (4994062501123299418) -->
-    <skip />
+    <string name="unlock_disable_frp_warning_content_password_fingerprint_profile" msgid="2994300676764706047">"প্রোফাইলের সুরক্ষা বৈশিষ্ট্যগুলি আপনার পাসওয়ার্ড ছাড়া কাজ করবে না।<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="4994062501123299418">"প্রোফাইলের সুরক্ষা বৈশিষ্ট্যগুলি আপনার স্ক্রিন লক ছাড়া কাজ করবে না।<xliff:g id="EMPTY_LINE">
+
+</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>
@@ -530,13 +542,13 @@
     <string name="lock_failed_attempts_before_wipe" msgid="2219711062197089783">"আবার চেষ্টা করুন৷ <xliff:g id="TOTAL_ATTEMPTS">%2$d</xliff:g>টি প্রচেষ্টার মধ্যে <xliff:g id="CURRENT_ATTEMPTS">%1$d</xliff:g> নম্বর৷"</string>
     <string name="lock_last_attempt_before_wipe_warning_title" msgid="4277765862798876826">"আপনার ডেটা মুছে দেওয়া হবে"</string>
     <string name="lock_last_pattern_attempt_before_wipe_device" msgid="1688030823464420974">"পরের বারেও ভুল প্যাটার্ন আঁকলে এই ডিভাইসের ডেটা মুছে দেওয়া হবে"</string>
-    <string name="lock_last_pin_attempt_before_wipe_device" msgid="5350785938296254352">"পরের বারেও ভুল পিন লিখলে এই ডিভাইসের ডেটা মুছে দেওয়া হবে"</string>
+    <string name="lock_last_pin_attempt_before_wipe_device" msgid="5350785938296254352">"পরের বারও ভুল পিন লিখলে এই ডিভাইসের ডেটা মুছে দেওয়া হবে"</string>
     <string name="lock_last_password_attempt_before_wipe_device" msgid="6208035114731421034">"পরের বারেও ভুল পাসওয়ার্ড দিলে এই ডিভাইসের ডেটা মুছে দেওয়া হবে"</string>
     <string name="lock_last_pattern_attempt_before_wipe_user" msgid="7851504071368235547">"আপনি যদি পরের বারেও ভুল প্যাটার্ন আঁকেন, তাহলে ব্যবহারকারীর তালিকা থেকে আপনাকে মুছে দেওয়া হবে"</string>
-    <string name="lock_last_pin_attempt_before_wipe_user" msgid="4049024921333961715">"আপনি যদি পরের বারেও ভুল পিন দেন, তাহলে ব্যবহারকারীর তালিকা থেকে আপনাকে মুছে দেওয়া হবে"</string>
+    <string name="lock_last_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_pin_attempt_before_wipe_profile" msgid="5799931839127476913">"আপনি যদি পরের বারও ভুল পিন দেন, তাহলে আপনার অফিস প্রোফাইল এবং প্রোফাইলের ডেটা মুছে দেওয়া হবে"</string>
     <string name="lock_last_password_attempt_before_wipe_profile" msgid="6786586046975042158">"আপনি যদি পরের বারেও ভুল পাসওয়ার্ড দেন, তাহলে আপনার কর্মস্থলের প্রোফাইল এবং প্রোফাইলের ডেটা মুছে দেওয়া হবে"</string>
     <string name="lock_failed_attempts_now_wiping_device" msgid="5047439819181833824">"বহুবার ভুল ইনপুট দিয়েছেন। এই ডিভাইসের ডেটা মুছে দেওয়া হবে।"</string>
     <string name="lock_failed_attempts_now_wiping_user" msgid="6188180643494518001">"বহুবার ভুল ইনপুট দিয়েছেন। ব্যবহারকারীর তালিকা থেকে আপনাকে মুছে দেওয়া হবে।"</string>
@@ -581,6 +593,7 @@
     <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="lockpassword_clear_label" msgid="5724429464960458155">"খালি করুন"</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>
@@ -591,7 +604,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>
@@ -613,14 +626,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>
@@ -628,15 +641,15 @@
     <string name="bluetooth_pairing_dialog_title" msgid="1417255032435317301">"এই ডিভাইসের সাথে যুক্ত করবেন?"</string>
     <string name="bluetooth_pairing_dialog_sharing_phonebook_title" msgid="7664141669886358618">"ফোন বই শেয়ার করবেন?"</string>
     <string name="bluetooth_pairing_dialog_contants_request" msgid="5531109163573611348">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> আপনার পরিচিতিগুলি ও পুরোনো কলের তালিকা অ্যাক্সেস করতে চায়।"</string>
-    <string name="bluetooth_pairing_dialog_paring_request" msgid="8451248193517851958">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> ব্লুটুথ এর সাথে যুক্ত হতে চায়। সংযুক্ত করা হলে, এটি আপনার পরিচিতিগুলি এবং কলের ইতিহাস অ্যাক্সেস করতে পারবে।"</string>
-    <string name="bluetooth_preference_paired_devices" msgid="1970524193086791964">"যুক্ত করা ডিভাইসগুলি"</string>
+    <string name="bluetooth_pairing_dialog_paring_request" msgid="8451248193517851958">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> Bluetooth এর সাথে যুক্ত হতে চায়। সংযুক্ত করা হলে, এটি আপনার পরিচিতিগুলি এবং কলের ইতিহাস অ্যাক্সেস করতে পারবে।"</string>
+    <string name="bluetooth_preference_paired_devices" msgid="1970524193086791964">"চেনা ডিভাইসগুলি"</string>
     <string name="bluetooth_preference_found_devices" msgid="1647983835063249680">"উপলব্ধ ডিভাইসগুলি"</string>
     <string name="bluetooth_preference_no_found_devices" msgid="7594339669961811591">"কোনো ডিভাইস উপলব্ধ নয়"</string>
     <string name="bluetooth_device_context_connect" msgid="3997659895003244941">"সংযুক্ত করুন"</string>
     <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>
@@ -657,17 +670,17 @@
     <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>
-    <string name="bluetooth_device_advanced_rename_device" msgid="5148578059584955791">"আবার নামকরণ করুন"</string>
+    <string name="bluetooth_device_advanced_rename_device" msgid="5148578059584955791">"নাম বদলান"</string>
     <string name="bluetooth_device_advanced_enable_opp_title" msgid="8222550640371627365">"ইনকামিং ফাইল স্থানান্তরের অনুমতি দিন"</string>
     <string name="bluetooth_pan_user_profile_summary_connected" msgid="4602294638909590612">"ইন্টারনেট অ্যাক্সেসের জন্য ডিভাইসে সংযুক্ত"</string>
     <string name="bluetooth_pan_nap_profile_summary_connected" msgid="1561383706411975199">"ডিভাইসের সাথে স্থানীয় ইন্টারনেট সংযোগ ভাগ করছে"</string>
     <string name="bluetooth_dock_settings" msgid="3218335822716052885">"ডক সেটিংস"</string>
     <string name="bluetooth_dock_settings_title" msgid="5543069893044375188">"অডিওয়ের জন্য ডক ব্যবহার করুন"</string>
-    <string name="bluetooth_dock_settings_headset" msgid="1001821426078644650">"স্পিকার ফোন হিসাবে"</string>
+    <string name="bluetooth_dock_settings_headset" msgid="1001821426078644650">"স্পিকার ফোন হিসেবে"</string>
     <string name="bluetooth_dock_settings_a2dp" msgid="8791004998846630574">"সঙ্গীত এবং মিডিয়ার জন্য"</string>
     <string name="bluetooth_dock_settings_remember" msgid="5551459057010609115">"সেটিংস মনে রাখুন"</string>
     <string name="wifi_display_settings_title" msgid="8740852850033480136">"কাস্ট করুন"</string>
@@ -693,18 +706,18 @@
     <string name="nfc_disclaimer_title" msgid="4364003873202264039">"NFC চালু করুন"</string>
     <string name="nfc_disclaimer_content" msgid="5566907911915158075">"অর্থপ্রদান টার্মিনাল, অ্যাক্সেস রিডারগুলির এবং ইন্টারঅ্যাক্টিভ বিজ্ঞাপণ বা ট্যাগগুলির মত NFC এই ডিভাইস এবং আশেপাশে থাকা কোনো ডিভাইস বা টার্গেটগুলির মধ্যে ডেটা বিনিময় করে।"</string>
     <string name="android_beam_settings_title" msgid="7832812974600338649">"Android বীম"</string>
-    <string name="android_beam_on_summary" msgid="3618057099355636830">"NFC এর মাধ্যমে অ্যাপ্লিকেশান সামগ্রী প্রেরণ করতে প্রস্তুত"</string>
+    <string name="android_beam_on_summary" msgid="3618057099355636830">"NFC এর মাধ্যমে অ্যাপ্লিকেশন কন্টেন্ট পাঠাতে প্রস্তুত"</string>
     <string name="android_beam_off_summary" msgid="4663095428454779138">"বন্ধ করুন"</string>
     <string name="android_beam_disabled_summary" msgid="1737782116894793393">"NFC বন্ধ থাকার কারণে অনুপলব্ধ"</string>
     <string name="android_beam_label" msgid="6257036050366775040">"Android বীম"</string>
-    <string name="android_beam_explained" msgid="1810540319385192758">"যখন এই বৈশিষ্ট্যটি চালু থাকে, তখন আপনি আরেকটি NFC-সক্ষম ডিভাইসের কাছে ডিভাইসগুলি ধরে সামগ্রী বীম করতে পারবেন। উদাহরণস্বরূপ, আপনি ওয়েব পৃষ্ঠা, YouTube ভিডিও, পরিচিতি এবং আরো অনেক কিছু বীম করতে পারবেন।\n\nশুধু ডিভাইসগুলিকে একসাথে আনুন (সাধারণতঃ পর পর) এবং তারপর আপনার স্ক্রীনে আলতো চাপুন। অ্যাপ্লিকেশানটি নির্ধারণ করবে কি বীম করা হবে।"</string>
+    <string name="android_beam_explained" msgid="1810540319385192758">"যখন এই বৈশিষ্ট্যটি চালু থাকে, তখন আপনি আরও একটি NFC-সক্ষম ডিভাইসের কাছে ডিভাইসগুলি ধরে সামগ্রী বীম করতে পারবেন। উদাহরণস্বরূপ, আপনি ওয়েব পৃষ্ঠা, YouTube ভিডিও, পরিচিতি এবং আরও অনেক কিছু বীম করতে পারবেন।\n\nশুধু ডিভাইসগুলিকে একসাথে আনুন (সাধারণতঃ পর পর) এবং তারপর আপনার স্ক্রিনে আলতো চাপুন। অ্যাপ্লিকেশনটি নির্ধারণ করবে যে কি বীম করা হবে।"</string>
     <string name="wifi_quick_toggle_title" msgid="8850161330437693895">"ওয়াই-ফাই"</string>
     <string name="wifi_quick_toggle_summary" msgid="2696547080481267642">"ওয়াই-ফাই চালু করুন"</string>
     <string name="wifi_settings" msgid="29722149822540994">"ওয়াই-ফাই"</string>
     <string name="wifi_settings_category" msgid="8719175790520448014">"ওয়াই-ফাই সেটিংস"</string>
     <string name="wifi_settings_title" msgid="3103415012485692233">"ওয়াই-ফাই"</string>
     <string name="wifi_settings_summary" msgid="668767638556052820">"ওয়্যারলেস অ্যাক্সেস পয়েন্ট সেট আপ ও পরিচালনা করুন"</string>
-    <string name="wifi_select_network" msgid="4210954938345463209">"ওয়াই-ফাই নির্বাচন করুন"</string>
+    <string name="wifi_select_network" msgid="4210954938345463209">"ওয়াই-ফাই বেছে নিন"</string>
     <string name="wifi_starting" msgid="6732377932749942954">"ওয়াই-ফাই চালু করা হচ্ছে..."</string>
     <string name="wifi_stopping" msgid="8952524572499500804">"ওয়াই-ফাই বন্ধ করা হচ্ছে..."</string>
     <string name="wifi_error" msgid="3207971103917128179">"ত্রুটি"</string>
@@ -720,7 +733,7 @@
     <string name="wifi_poor_network_detection_summary" msgid="2784135142239546291">"ভালো ইন্টারনেট সংযোগ না হলে ওয়াই-ফাই ব্যবহার করবেন না"</string>
     <string name="wifi_avoid_poor_network_detection_summary" msgid="4674423884870027498">"শুধুমাত্র ভাল ইন্টারনেট সংযোগ আছে এমন নেটওয়ার্ক ব্যবহার করুন"</string>
     <string name="use_open_wifi_automatically_title" msgid="6851951242903078588">"খোলা নেটওয়ার্কে সংযুক্ত হন"</string>
-    <string name="use_open_wifi_automatically_summary" msgid="2982091714252931713">"উচ্চ গুণমানের বিনামূল্যের নেটওয়ার্কগুলিতে স্বয়ংক্রিয়ভাবে সংযুক্ত হন"</string>
+    <string name="use_open_wifi_automatically_summary" msgid="2982091714252931713">"উচ্চ গুণমানের বিনামূল্যের নেটওয়ার্কগুলিতে অটোমেটিক সংযুক্ত হবে"</string>
     <string name="use_open_wifi_automatically_summary_scoring_disabled" msgid="593964217679325831">"এটি ব্যবহার করার জন্য একটি নেটওয়ার্ক রেটিং প্রদানকারী বেছে নিন"</string>
     <string name="use_open_wifi_automatically_summary_scorer_unsupported_disabled" msgid="8472122600853650258">"এটি ব্যবহার করার জন্য একটি উপযুক্ত নেটওয়ার্ক রেটিং প্রদানকারী বেছে নিন"</string>
     <string name="wifi_install_credentials" msgid="3551143317298272860">"শংসাপত্রগুলি ইনস্টল করুন"</string>
@@ -734,9 +747,9 @@
     <string name="wifi_suspend_optimizations" msgid="1220174276403689487">"ওয়াই-ফাই  অপ্টিমাইজেশান"</string>
     <string name="wifi_suspend_optimizations_summary" msgid="4151428966089116856">"ওয়াই-ফাই চালু থাকাকালীন ব্যাটারি ব্যবহার কমান"</string>
     <string name="wifi_limit_optimizations_summary" msgid="9000801068363468950">"ওয়াই-ফাই দ্বারা ব্যাটারি ব্যবহার সীমিত করুন"</string>
-    <string name="wifi_switch_away_when_unvalidated" msgid="1707247692180853058">"ওয়াই ফাই থেকে ইন্টারনেটের অ্যাক্সেস চলে গেলে মোবাইল ডেটা ব্যবহার করুন।"</string>
+    <string name="wifi_switch_away_when_unvalidated" msgid="1707247692180853058">"ওয়াই-ফাই থেকে ইন্টারনেটের অ্যাক্সেস চলে গেলে মোবাইল ডেটা ব্যবহার করুন।"</string>
     <string name="wifi_cellular_data_fallback_title" msgid="8753386877755616476">"স্বয়ংক্রিয়ভাবে মোবাইল ডেটাতে চলে যান"</string>
-    <string name="wifi_cellular_data_fallback_summary" msgid="6375399280719867214">"ওয়াই ফাই এ ইন্টারনেট অ্যাক্সেস না থাকলে মোবাইল ডেটা ব্যবহার করুন৷ ডেটা ব্যবহারের খরচ প্রযোজ্য।"</string>
+    <string name="wifi_cellular_data_fallback_summary" msgid="6375399280719867214">"ওয়াই-ফাই এ ইন্টারনেট অ্যাক্সেস না থাকলে মোবাইল ডেটা ব্যবহার করুন৷ ডেটা ব্যবহারের খরচ প্রযোজ্য।"</string>
     <string name="wifi_add_network" msgid="6234851776910938957">"নেটওয়ার্ক যোগ করুন"</string>
     <string name="wifi_configure_settings_preference_title" msgid="2913345003906899146">"ওয়াই ফাই পছন্দগুলি"</string>
     <string name="wifi_configure_settings_preference_summary_wakeup_on" msgid="646393113104367290">"ওয়াই ফাই স্বয়ংক্রিয়ভাবে আবার চালু হয়"</string>
@@ -764,18 +777,19 @@
     <string name="wifi_advanced_toggle_description_collapsed" msgid="1463812308429197263">"উন্নত বিকল্পগুলির ড্রপ-ডাউন তালিকা৷ প্রসারিত করতে দুবার আলতো চাপুন৷"</string>
     <string name="wifi_wps_setup_title" msgid="8207552222481570175">"ওয়াই-ফাই সুরক্ষিত সেটআপ"</string>
     <string name="wifi_wps_setup_msg" msgid="315174329121275092">"WPS আরম্ভ হচ্ছে…"</string>
-    <string name="wifi_wps_onstart_pbc" msgid="817003360936932340">"আপনার রাউটারে ওয়াই-ফাই সুরক্ষিত সেটআপ বোতাম টিপুন। এটিকে \"WPS\" বলা হতে পারে বা এই চিহ্ন দ্বারা চিহ্নিত থাকতে পারে:"</string>
-    <string name="wifi_wps_onstart_pin" msgid="223344506445335358">"আপনার ওয়াই-ফাই রাউটারে <xliff:g id="NUMBER">%1$s</xliff:g> পিন দিন। সেট আপ সম্পূর্ণ হতে দুই মিনিটের মতো সময় নিতে পারে।"</string>
+    <string name="wifi_wps_onstart_pbc" msgid="817003360936932340">"আপনার রাউটারে ওয়াই-ফাই সুরক্ষিত সেট-আপ বোতাম টিপুন। এটিকে \"WPS\" বলা হতে পারে বা এই চিহ্ন দ্বারা চিহ্নিত থাকতে পারে:"</string>
+    <string name="wifi_wps_onstart_pin" msgid="223344506445335358">"আপনার ওয়াই-ফাই রাউটারে <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>
     <string name="wifi_wps_failed_generic" msgid="5668775022238832527">"WPS ব্যর্থ হয়েছে৷ দয়া করে কয়েক মিনিটের মধ্যে আবার চেষ্টা করুন৷"</string>
     <string name="wifi_wps_failed_wep" msgid="2702820087105284461">"ওয়্যারলেস রাউটার নিরাপত্তা সেটিং (WEP) সমর্থিত নয়"</string>
     <string name="wifi_wps_failed_tkip" msgid="4282401586860713349">"ওয়্যারলেস রাউটার নিরাপত্তা সেটিং (TKIP) সমর্থিত নয়"</string>
-    <string name="wifi_wps_failed_auth" msgid="1174614355181181958">"প্রমাণীকরণ ব্যর্থ। অনুগ্রহ করে আবার চেষ্টা করুন।"</string>
+    <string name="wifi_wps_failed_auth" msgid="1174614355181181958">"যাচাইকরণ ব্যর্থ। অনুগ্রহ করে আবার চেষ্টা করুন।"</string>
     <string name="wifi_wps_failed_overlap" msgid="5159533685596844778">"আরেকটি WPS অধিবেশন শনাক্ত হয়েছে। দয়া করে কয়েক মিনিটের মধ্যে আবার চেষ্টা করুন।"</string>
+    <string name="wifi_wps_failed_wifi_disconnected" msgid="3829472117754104164">"ওয়াই-ফাই সংযোগ বিচ্ছিন্ন হয়েছে। WPS এর সেট-আপ বাতিল হয়ে গেছে।"</string>
     <string name="wifi_ssid" msgid="5519636102673067319">"নেটওয়ার্ক নাম"</string>
-    <string name="wifi_ssid_hint" msgid="897593601067321355">"SSID প্রবেশ করুন"</string>
+    <string name="wifi_ssid_hint" msgid="897593601067321355">"SSID লিখুন"</string>
     <string name="wifi_security" msgid="6603611185592956936">"নিরাপত্তা"</string>
     <string name="wifi_signal" msgid="5514120261628065287">"সিগন্যাল ক্ষমতা"</string>
     <string name="wifi_status" msgid="4824568012414605414">"স্থিতি"</string>
@@ -785,31 +799,33 @@
     <string name="passpoint_label" msgid="6381371313076009926">"এর মাধ্যমে সংরক্ষিত"</string>
     <string name="passpoint_content" msgid="8447207162397870483">"<xliff:g id="NAME">%1$s</xliff:g> শংসাপত্রগুলি"</string>
     <string name="wifi_eap_method" msgid="8529436133640730382">"EAP পদ্ধতি"</string>
-    <string name="please_select_phase2" msgid="5231074529772044898">"ধাপ ২ প্রমাণীকরণ"</string>
-    <string name="wifi_eap_ca_cert" msgid="3521574865488892851">"CA শংসাপত্র"</string>
+    <string name="please_select_phase2" msgid="5231074529772044898">"ধাপ ২ যাচাইকরণ"</string>
+    <string name="wifi_eap_ca_cert" msgid="3521574865488892851">"CA সার্টিফিকেট"</string>
     <string name="wifi_eap_domain" msgid="8471124344218082064">"ডোমেন"</string>
-    <string name="wifi_eap_user_cert" msgid="1291089413368160789">"ব্যবহারকারীর শংসাপত্র"</string>
+    <string name="wifi_eap_user_cert" msgid="1291089413368160789">"ব্যবহারকারীর সার্টিফিকেট"</string>
     <string name="wifi_eap_identity" msgid="4359453783379679103">"পরিচয়"</string>
     <string name="wifi_eap_anonymous" msgid="2989469344116577955">"নামহীন পরিচয়"</string>
     <string name="wifi_password" msgid="5948219759936151048">"পাসওয়ার্ড"</string>
     <string name="wifi_show_password" msgid="6461249871236968884">"পাসওয়ার্ড দেখান"</string>
-    <string name="wifi_ap_band_config" msgid="1611826705989117930">"AP ব্যান্ড নির্বাচন করুন"</string>
+    <string name="wifi_ap_band_config" msgid="1611826705989117930">"AP ব্যান্ড বেছে নিন"</string>
     <string name="wifi_ap_choose_2G" msgid="8724267386885036210">"২.৪ GHz ব্যান্ড"</string>
     <string name="wifi_ap_choose_5G" msgid="8137061170937978040">"৫ GHz ব্যান্ড"</string>
     <string name="wifi_ip_settings" msgid="3359331401377059481">"IP সেটিংস"</string>
     <string name="wifi_shared" msgid="844142443226926070">"অন্য ডিভাইস ব্যবহারকারীদের সাথে শেয়ার করুন"</string>
     <string name="wifi_unchanged" msgid="3410422020930397102">"(অপরিবর্তিত)"</string>
-    <string name="wifi_unspecified" msgid="4917316464723064807">"অনুগ্রহ করে নির্বাচন করুন"</string>
-    <string name="wifi_multiple_cert_added" msgid="3240743501460165224">"(একাধিক শংসাপত্র যোগ করা হয়েছে)"</string>
+    <string name="wifi_unspecified" msgid="4917316464723064807">"অনুগ্রহ করে বেছে নিন"</string>
+    <string name="wifi_multiple_cert_added" msgid="3240743501460165224">"(একাধিক সার্টিফিকেট যোগ করা হয়েছে)"</string>
     <string name="wifi_use_system_certs" msgid="5270879895056893783">"সিস্টেমের শংসাপত্রগুলি ব্যবহার করুন"</string>
     <string name="wifi_do_not_provide_eap_user_cert" msgid="5160499244977160665">"প্রদান করবেন না"</string>
     <string name="wifi_do_not_validate_eap_server" msgid="4266754430576348471">"যাচাই করবেন না"</string>
-    <string name="wifi_do_not_validate_eap_server_warning" msgid="1787190245542586660">"কোনো শংসাপত্র নির্দিষ্ট করা নেই৷ আপনার সংযোগ ব্যক্তিগত করা হবে না৷"</string>
+    <string name="wifi_do_not_validate_eap_server_warning" msgid="1787190245542586660">"কোনও সার্টিফিকেট নির্দিষ্ট করা নেই৷ আপনার সংযোগ ব্যক্তিগত করা হবে না৷"</string>
     <string name="wifi_ssid_too_long" msgid="3474753269579895244">"নেটওয়ার্কের নাম খুব বড়।"</string>
     <string name="wifi_no_domain_warning" msgid="5223011964091727376">"একটি ডোমেন উল্লেখ করা আবশ্যক৷"</string>
     <string name="wifi_wps_available_first_item" msgid="4422547079984583502">"WPS উপলব্ধ"</string>
     <string name="wifi_wps_available_second_item" msgid="8427520131718215301">" (WPS উপলব্ধ)"</string>
     <string name="wifi_wps_nfc_enter_password" msgid="2288214226916117159">"আপনার নেটওয়ার্ক পাসওয়ার্ডটি লিখুন"</string>
+    <string name="wifi_carrier_connect" msgid="8174696557882299911">"পরিষেবা প্রদানকারীর ওয়াই-ফাই নেটওয়ার্ক"</string>
+    <string name="wifi_carrier_content" msgid="4634077285415851933">"<xliff:g id="NAME">%1%s</xliff:g> এর মাধ্যমে সংযুক্ত করুন"</string>
     <string name="wifi_scan_always_turnon_message" msgid="203123538572122989">"অবস্থান নির্ভুলতা উন্নতি ও অন্যান্য উদ্দ্যেশ্যের জন্য <xliff:g id="APP_NAME">%1$s</xliff:g> নেটওয়ার্ক স্ক্যান চালু করতে চাইছে, এমনকি ওয়াই-ফাই বন্ধ থাকা সত্ত্বেও।\n\nযে সব অ্যাপ্লিকেশানগুলি স্ক্যান করতে চাই তাদের জন্য এটির অনুমতি দেবেন?"</string>
     <string name="wifi_scan_always_turnoff_message" msgid="5538901671131941043">"এটি বন্ধ করতে, ওভারফ্লো মেনুতে ‘উন্নত’ লেখায় যান"</string>
     <string name="wifi_scan_always_confirm_allow" msgid="5355973075896817232">"অনুমতি দিন"</string>
@@ -827,11 +843,12 @@
     <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_modify" msgid="6100248070440710782">"বদলান"</string>
     <string name="wifi_failed_forget_message" msgid="1348172929201654986">"নেটওয়ার্ক ভুলে যেতে করতে ব্যর্থ হয়েছে"</string>
-    <string name="wifi_save" msgid="3331121567988522826">"সংরক্ষণ"</string>
+    <string name="wifi_save" msgid="3331121567988522826">"সেভ করুন"</string>
     <string name="wifi_failed_save_message" msgid="6650004874143815692">"নেটওয়ার্ক সংরক্ষণ করতে ব্যর্থ হয়েছে"</string>
     <string name="wifi_cancel" msgid="6763568902542968964">"বাতিল করুন"</string>
-    <string name="wifi_saved_access_points_titlebar" msgid="2996149477240134064">"সংরক্ষিত নেটওয়ার্ক"</string>
+    <string name="wifi_saved_access_points_titlebar" msgid="2996149477240134064">"সেভ করা নেটওয়ার্ক"</string>
     <plurals name="wifi_saved_access_points_summary" formatted="false" msgid="6094679048871529675">
       <item quantity="one">%dটি নেটওয়ার্ক</item>
       <item quantity="other">%dটি নেটওয়ার্ক</item>
@@ -839,13 +856,14 @@
     <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_title" msgid="3471132676909349382">"নেটওয়ার্কের তথ্য"</string>
     <string name="wifi_details_subnet_mask" msgid="6720279144174924410">"সাবনেট মাস্ক"</string>
     <string name="wifi_details_dns" msgid="8648826607751830768">"DNS"</string>
     <string name="wifi_details_ipv6_address_header" msgid="6734119149106422148">"IPv6 অ্যাড্রেসগুলি"</string>
-    <string name="wifi_saved_access_points_label" msgid="2013409399392285262">"সংরক্ষিত নেটওয়ার্ক"</string>
+    <string name="wifi_saved_access_points_label" msgid="2013409399392285262">"সেভ করা নেটওয়ার্ক"</string>
     <string name="wifi_advanced_settings_label" msgid="3654366894867838338">"IP সেটিংস"</string>
     <string name="wifi_advanced_not_available" msgid="5823045095444154586">"এই ব্যবহারকারীর জন্য ওয়াই-ফাই এর উন্নত সেটিংস উপলব্ধ নয়"</string>
-    <string name="wifi_ip_settings_menu_save" msgid="7296724066102908366">"সংরক্ষণ"</string>
+    <string name="wifi_ip_settings_menu_save" msgid="7296724066102908366">"সেভ করুন"</string>
     <string name="wifi_ip_settings_menu_cancel" msgid="6582567330136502340">"বাতিল করুন"</string>
     <string name="wifi_ip_settings_invalid_ip_address" msgid="2513142355364274970">"একটি বৈধ IP ঠিকানা টাইপ করুন।"</string>
     <string name="wifi_ip_settings_invalid_gateway" msgid="8164264988361096450">"একটি বৈধ গেটওয়ে ঠিকানা টাইপ করুন।"</string>
@@ -858,7 +876,7 @@
     <string name="wifi_p2p_settings_title" msgid="5444461191435291082">"ওয়াই-ফাই ডাইরেক্ট"</string>
     <string name="wifi_p2p_device_info" msgid="3191876744469364173">"ডিভাইস সংক্রান্ত তথ্য"</string>
     <string name="wifi_p2p_persist_network" msgid="1646424791818168590">"এই সংযোগটি মনে রাখুন"</string>
-    <string name="wifi_p2p_menu_search" msgid="3436429984738771974">"ডিভাইসগুলির জন্য অনুসন্ধান করুন"</string>
+    <string name="wifi_p2p_menu_search" msgid="3436429984738771974">"ডিভাইসগুলির জন্য খুঁজুন"</string>
     <string name="wifi_p2p_menu_searching" msgid="2396704492143633876">"অনুসন্ধান করছে..."</string>
     <string name="wifi_p2p_menu_rename" msgid="8448896306960060415">"ডিভাইস পুনঃনামকরণ করুন"</string>
     <string name="wifi_p2p_peer_devices" msgid="299526878463303432">"পিয়ার ডিভাইসগুলি"</string>
@@ -871,16 +889,15 @@
     <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_off_subtext" msgid="5466126533609394170">"অন্য ডিভাইসের সাথে ইন্টারনেট অথবা কন্টেন্ট শেয়ার করা হচ্ছে না"</string>
     <string name="wifi_hotspot_tethering_on_subtext" product="tablet" msgid="5752490509369962007">"হটস্পটের মাধ্যমে এই ট্যাবলেটের ইন্টারনেট সংযোগ শেয়ার করা হচ্ছে"</string>
     <string name="wifi_hotspot_tethering_on_subtext" product="default" msgid="6461075246164300670">"হটস্পটের মাধ্যমে এই ফোনের ইন্টারনেট সংযোগ শেয়ার করা হচ্ছে"</string>
     <string name="wifi_hotspot_on_local_only_subtext" msgid="2068110388011294735">"অ্যাপ কন্টেন্ট শেয়ার করছে। ইন্টারনেট সংযোগ শেয়ার করতে হটস্পট বন্ধ করে তারপর আবার চালু করুন"</string>
-    <string name="wifi_hotspot_name_title" msgid="1341735529132128887">"ওয়াই-ফাই এর নাম"</string>
+    <string name="wifi_hotspot_name_title" msgid="8237000746618636778">"হটস্পটের নাম"</string>
     <string name="wifi_hotspot_name_summary_connecting" msgid="3378299995508671967">"<xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g> চালু করা হচ্ছে..."</string>
     <string name="wifi_hotspot_name_summary_connected" msgid="3888672084861445362">"<xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g> এর সাথে অন্য ডিভাইস সংযুক্ত হতে পারে"</string>
-    <string name="wifi_hotspot_password_title" msgid="1955592302902091281">"ওয়াই-ফাই পাসওয়ার্ড"</string>
+    <string name="wifi_hotspot_password_title" msgid="8676859981917573801">"হটস্পটের পাসওয়ার্ড"</string>
     <string name="wifi_hotspot_ap_band_title" msgid="1165801173359290681">"AP Band"</string>
     <string name="wifi_hotspot_footer_info_regular" msgid="1203489406068036455">"আপনার অন্য ডিভাইসের জন্য একটি ওয়াই-ফাই নেটওয়ার্ক তৈরি করার জন্য হটস্পট ব্যবহার করুন। হটস্পট আপনার মোবাইলের ডেটা ব্যবহার করে ইন্টারনেট সংযোগ প্রদান করে। মোবাইলের ডেটার জন্য অতিরিক্ত চার্জ লাগতে পারে।"</string>
     <string name="wifi_hotspot_footer_info_local_only" msgid="857988412470694109">"অ্যাপগুলি আশেপাশের ডিভাইসের সাথে কন্টেন্ট শেয়ার করার জন্য হটস্পট তৈরি করতে পারে।"</string>
@@ -891,7 +908,6 @@
     <string name="wifi_tether_configure_ap_text" msgid="7974681394041609308">"ওয়াই-ফাই হটস্পট সেট করুন"</string>
     <string name="wifi_hotspot_configure_ap_text" msgid="5478614731464220432">"ওয়াই-ফাই হটস্পট সেটআপ"</string>
     <string name="wifi_hotspot_configure_ap_text_summary" msgid="5560680057727007011">"AndroidAP WPA2 PSK হটস্পট"</string>
-    <string name="wifi_tether_configure_subtext" msgid="2050196439900426456">"<xliff:g id="NETWORK_SSID">%1$s</xliff:g> <xliff:g id="NETWORK_SECURITY">%2$s</xliff:g> হটস্পট"</string>
     <string name="wifi_tether_configure_ssid_default" msgid="8467525402622138547">"AndroidHotspot"</string>
     <string name="wifi_calling_settings_title" msgid="4102921303993404577">"ওয়াই-ফাই কলিং"</string>
     <string name="wifi_calling_suggestion_title" msgid="9008010480466359578">"ওয়াই-ফাই কলিং চালু করুন"</string>
@@ -929,30 +945,30 @@
     <item msgid="2339246858001475047">"২"</item>
     <item msgid="6200207341126893791">"১"</item>
   </string-array>
-    <string name="wifi_calling_off_explanation" msgid="2597566001655908391">"ওয়াই-ফাই কলিং চালু থাকার সময়ে, আপনার পছন্দ এবং কোন সিগন্যাল বেশী শক্তিশালী তার উপর নির্ভর করে আপনার ফোন ওয়াই-ফাই নেটওয়ার্ক বা আপনার পরিষেবা প্রদানকারীর নেটওয়ার্কের মাধ্যমে আপনার কলের রুট তৈরি করে। এই বৈশিষ্ট্যটি চালু করার আগে, আপনার পরিষেবা প্রদানকারীর কাছে ফি-গুলি এবং অন্যান্য বিশদ বিবরণ সম্বন্ধে পরীক্ষা করুন।"</string>
+    <string name="wifi_calling_off_explanation" msgid="2597566001655908391">"ওয়াই-ফাই কলিং চালু থাকার সময়ে, আপনার পছন্দ এবং কোন সিগন্যাল বেশি শক্তিশালী তার উপর নির্ভর করে আপনার ফোন ওয়াই-ফাই নেটওয়ার্ক বা আপনার পরিষেবা প্রদানকারীর নেটওয়ার্কের মাধ্যমে আপনার কলের রুট তৈরি করে। এই বৈশিষ্ট্যটি চালু করার আগে, আপনার পরিষেবা প্রদানকারীর কাছে ফি-গুলি এবং অন্যান্য বিশদ বিবরণ সম্বন্ধে পরীক্ষা করুন।"</string>
     <string name="wifi_calling_off_explanation_2" msgid="2329334487851497223"></string>
     <string name="emergency_address_title" msgid="3571902448699714454">"জরুরী ঠিকানা আপডেট করুন"</string>
-    <string name="emergency_address_summary" msgid="306028701568728126">"আপনি যদি ওয়াই ফাই ব্যবহার করে ৯১১ এ কল করেন তাহলে জরুরি পরিষেবাগুলি  আপনার অবস্থান হিসাবে আপনার ঠিকানাকে ব্যবহার করে৷"</string>
+    <string name="emergency_address_summary" msgid="3266760199681945746">"আপনি ওয়াই-ফাই এর মাধ্যমে জরুরি কল করলে জরুরি পরিষেবাগুলি আপনার অবস্থান হিসেবে এই ঠিকানাটি ব্যবহার করবে"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"প্রদর্শন"</string>
-    <string name="sound_settings" msgid="5534671337768745343">"আওয়াজ"</string>
+    <string name="sound_settings" msgid="5534671337768745343">"সাউন্ড"</string>
     <string name="all_volume_title" msgid="4296957391257836961">"ভলিউম"</string>
     <string name="musicfx_title" msgid="3415566786340790345">"সঙ্গীত প্রভাব"</string>
     <string name="ring_volume_title" msgid="5592466070832128777">"রিং ভলিউম"</string>
-    <string name="vibrate_in_silent_title" msgid="3897968069156767036">"নিঃশব্দ থাকাকালীন কম্পন"</string>
-    <string name="notification_sound_title" msgid="5137483249425507572">"ডিফল্ট বিজ্ঞপ্তি শব্দ"</string>
+    <string name="vibrate_in_silent_title" msgid="3897968069156767036">"নিঃশব্দ থাকাকালীন ভাইব্রেট"</string>
+    <string name="notification_sound_title" msgid="5137483249425507572">"ডিফল্ট বিজ্ঞপ্তির সাউন্ড"</string>
     <string name="incoming_call_volume_title" msgid="8073714801365904099">"রিংটোন"</string>
     <string name="notification_volume_title" msgid="2012640760341080408">"বিজ্ঞপ্তি"</string>
     <string name="checkbox_notification_same_as_incoming_call" msgid="1073644356290338921">"বিজ্ঞপ্তির জন্য ইনকামিং কল ভলিউম ব্যবহার করুন"</string>
     <string name="home_work_profile_not_supported" msgid="1357721012342357037">"কর্মস্থলের প্রোফাইল সমর্থন করে না"</string>
-    <string name="notification_sound_dialog_title" msgid="3805140135741385667">"ডিফল্ট বিজ্ঞপ্তি শব্দ"</string>
+    <string name="notification_sound_dialog_title" msgid="3805140135741385667">"ডিফল্ট বিজ্ঞপ্তির সাউন্ড"</string>
     <string name="media_volume_title" msgid="3576565767317118106">"মিডিয়া"</string>
     <string name="media_volume_summary" msgid="5363248930648849974">"সঙ্গীত এবং ভিডিওগুলির জন্য ভলিউম সেট করুন"</string>
     <string name="alarm_volume_title" msgid="2285597478377758706">"অ্যালার্ম"</string>
     <string name="dock_settings_summary" msgid="455802113668982481">"সংযুক্ত ডকের জন্য অডিও সেটিংস"</string>
     <string name="dtmf_tone_enable_title" msgid="8533399267725365088">"ডায়াল প্যাড স্পর্শ টোন"</string>
     <string name="sound_effects_enable_title" msgid="4429690369187229592">"আলতো চাপ দিলে শব্দ"</string>
-    <string name="lock_sounds_enable_title" msgid="450098505659399520">"স্ক্রীন লক শব্দ"</string>
-    <string name="haptic_feedback_enable_title" msgid="7152163068278526530">"আলতো চাপে কম্পন"</string>
+    <string name="lock_sounds_enable_title" msgid="450098505659399520">"স্ক্রিন লক করার সাউন্ড"</string>
+    <string name="haptic_feedback_enable_title" msgid="7152163068278526530">"আলতো চাপে ভাইব্রেট"</string>
     <string name="audio_record_proc_title" msgid="4271091199976457534">"অপ্রয়োজনীয় আওয়াজ বাতিলকরণ"</string>
     <string name="volume_media_description" msgid="7949355934788807863">"সঙ্গীত, ভিডিও, গেম্স, ও অন্যান্য মিডিয়া"</string>
     <string name="volume_ring_description" msgid="5936851631698298989">"রিংটোন ও বিজ্ঞপ্তি"</string>
@@ -983,11 +999,12 @@
     <string name="accessibility_category_personal" msgid="1263518850905945594">"ব্যক্তিগত প্রোফাইল অ্যাকাউন্টগুলি"</string>
     <string name="accessibility_work_account_title" msgid="1231830766637939527">"কাজের অ্যাকাউন্ট - <xliff:g id="MANAGED_BY">%s</xliff:g>"</string>
     <string name="accessibility_personal_account_title" msgid="2169071663029067826">"ব্যক্তিগত অ্যাকাউন্ট - <xliff:g id="MANAGED_BY">%s</xliff:g>"</string>
-    <string name="search_settings" msgid="1910951467596035063">"অনুসন্ধান করুন"</string>
+    <string name="search_settings" msgid="1910951467596035063">"খুঁজুন"</string>
     <string name="search_settings_summary" msgid="9205656546570654169">"অনুসন্ধান সেটিংস এবং ইতিহাস পরিচালনা করুন"</string>
     <string name="search_settings_no_results" msgid="8799027492641230999">"কোনো ফলাফল নেই"</string>
+    <string name="search_clear_history" msgid="4196658962573162457">"ইতিহাস সাফ করুন"</string>
     <string name="display_settings" msgid="7965901687241669598">"প্রদর্শন"</string>
-    <string name="accelerometer_title" msgid="7854608399547349157">"স্বতঃ ঘূর্ণায়মান স্ক্রীন"</string>
+    <string name="accelerometer_title" msgid="7854608399547349157">"স্বতঃ ঘূর্ণায়মান স্ক্রিন"</string>
     <string name="color_mode_title" msgid="3159275920408338215">"উজ্জ্বল রঙ"</string>
     <string name="accelerometer_summary_on" product="tablet" msgid="429982132339828942">"যখন ট্যাবলেট ঘোরানো হবে তখন স্থিতিবিন্যাস স্বয়ংক্রিয়ভাবে পরিবর্তন করুন"</string>
     <string name="accelerometer_summary_on" product="default" msgid="1133737282813048021">"যখন ফোন ঘোরানো হবে তখন স্থিতি বিন্যাস স্বয়ংক্রিয়ভাবে পরিবর্তন করুন"</string>
@@ -1015,7 +1032,7 @@
     <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_text" msgid="1837277457033025056">"নাইট লাইট আপনার স্ক্রিনকে হলুদাভ বাদামি দেয়৷ এটি আপনাকে অস্পষ্ট আলোয় স্ক্রিনের দিকে স্বচ্ছন্দে তাকানোর সুবিধা দেয় এবং খুব সহজে ঘুমিয়ে পড়তে সহায়তা করে৷"</string>
     <string name="night_display_auto_mode_title" msgid="6574111412154833409">"সময়সূচী"</string>
     <string name="night_display_auto_mode_never" msgid="2483761922928753400">"কোনো কিছুই নয়"</string>
     <string name="night_display_auto_mode_custom" msgid="2379394568898721765">"কাস্টম সময়ে চালু করুন"</string>
@@ -1041,7 +1058,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>
@@ -1056,15 +1073,13 @@
     <string name="automatic_brightness" msgid="5014143533884135461">"স্বয়ংক্রিয় উজ্জ্বলতা"</string>
     <string name="lift_to_wake_title" msgid="4555378006856277635">"সক্রিয় করতে লিফ্ট করুন"</string>
     <string name="ambient_display_screen_title" msgid="4252755516328775766">"অ্যাম্বিয়েন্ট ডিসপ্লে"</string>
-    <!-- no translation found for ambient_display_screen_summary_always_on (7337555569694794132) -->
-    <skip />
+    <string name="ambient_display_screen_summary_always_on" msgid="7337555569694794132">"সর্বদা চালু / ব্যাটারির ব্যবহার বেড়ে যায়"</string>
     <string name="ambient_display_screen_summary_notifications" msgid="1449570742600868654">"নতুন বিজ্ঞপ্তি"</string>
     <string name="ambient_display_category_triggers" msgid="4359289754456268573">"কখন দেখানো হবে"</string>
     <string name="doze_title" msgid="2375510714460456687">"নতুন বিজ্ঞপ্তি"</string>
-    <string name="doze_summary" msgid="3846219936142814032">"যখন আপনি বিজ্ঞপ্তিগুলি পাবেন তখন স্ক্রীন জাগায়"</string>
+    <string name="doze_summary" msgid="3846219936142814032">"বিজ্ঞপ্তি এলে স্ক্রিনের আলো জ্বলবে"</string>
     <string name="doze_always_on_title" msgid="1046222370442629646">"সর্বদা চালু"</string>
-    <!-- no translation found for doze_always_on_summary (6978257596231155345) -->
-    <skip />
+    <string name="doze_always_on_summary" msgid="6978257596231155345">"সময়, বিজ্ঞপ্তির আইকন ও অন্যান্য তথ্য দেখানো হবে। ব্যাটারির ব্যবহার বেড়ে যায়।"</string>
     <string name="title_font_size" msgid="4405544325522105222">"হরফের আকার"</string>
     <string name="short_summary_font_size" msgid="6819778801232989076">"পাঠ্য বড় বা ছোট করুন"</string>
     <string name="sim_lock_settings" msgid="3392331196873564292">"সিম কার্ড লক সেটিংস"</string>
@@ -1100,39 +1115,38 @@
     <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>
     <string name="device_info_settings" product="default" msgid="475872867864762157">"ফোন স্থিতি"</string>
     <string name="system_update_settings_list_item_title" msgid="3342887311059985961">"সিস্টেম আপডেটগুলি"</string>
     <string name="system_update_settings_list_item_summary" msgid="3853057315907710747"></string>
-    <string name="firmware_version" msgid="4801135784886859972">"Android সংস্করণ"</string>
+    <string name="firmware_version" msgid="4801135784886859972">"Android ভার্সন"</string>
     <string name="security_patch" msgid="8438384045870296634">"Android সুরক্ষার প্যাচ লেবেল"</string>
     <string name="model_info" msgid="1952009518045740889">"মডেল"</string>
     <string name="hardware_info" msgid="2605080746512527805">"মডেল ও হার্ডওয়্যার"</string>
-    <string name="hardware_revision" msgid="8893547686367095527">"হার্ডওয়্যার সংস্করণ"</string>
+    <string name="hardware_revision" msgid="8893547686367095527">"হার্ডওয়্যার ভার্সন"</string>
     <string name="fcc_equipment_id" msgid="149114368246356737">"সরঞ্জাম ID"</string>
-    <string name="baseband_version" msgid="1848990160763524801">"বেসব্যান্ড সংস্করণ"</string>
-    <string name="kernel_version" msgid="9192574954196167602">"কার্নেল সংস্করণ"</string>
+    <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>
     <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="default" msgid="2599162787451519618">"ফোন নম্বর, সিগন্যাল ইত্যাদি"</string>
-    <string name="storage_settings" msgid="4211799979832404953">"সঞ্চয়স্থান"</string>
-    <string name="storage_usb_settings" msgid="7293054033137078060">"সঞ্চয়স্থান"</string>
-    <string name="storage_settings_title" msgid="8746016738388094064">"সঞ্চয়স্থান সেটিংস"</string>
-    <string name="storage_settings_summary" product="nosdcard" msgid="3543813623294870759">"USB সঞ্চয়স্থান আনমাউন্ট করুন, উপলব্ধ সঞ্চয়স্থান দেখুন"</string>
-    <string name="storage_settings_summary" product="default" msgid="9176693537325988610">"SD কার্ড আনমাউন্ট করুন, উপলব্ধ সঞ্চয়স্থান দেখুন"</string>
+    <string name="storage_settings" msgid="4211799979832404953">"স্টোরেজ"</string>
+    <string name="storage_usb_settings" msgid="7293054033137078060">"স্টোরেজ"</string>
+    <string name="storage_settings_title" msgid="8746016738388094064">"স্টোরেজ সেটিংস"</string>
+    <string name="storage_settings_summary" product="nosdcard" msgid="3543813623294870759">"USB স্টোরেজ আনমাউন্ট করুন, উপলব্ধ স্টোরেজ দেখুন"</string>
+    <string name="storage_settings_summary" product="default" msgid="9176693537325988610">"SD কার্ড আনমাউন্ট করুন, উপলব্ধ স্টোরেজ দেখুন"</string>
     <string name="status_number" product="tablet" msgid="1138837891091222272">"MDN"</string>
     <string name="status_number" product="default" msgid="5123197324870153205">"আমার ফোন নম্বর"</string>
     <string name="status_min_number" msgid="3519504522179420597">"MIN"</string>
     <string name="status_msid_number" msgid="909010114445780530">"MSID"</string>
-    <string name="status_prl_version" msgid="1007470446618081441">"PRL সংস্করণ"</string>
+    <string name="status_prl_version" msgid="1007470446618081441">"PRL ভার্সন"</string>
     <string name="status_meid_number" msgid="1751442889111731088">"MEID"</string>
     <string name="status_icc_id" msgid="943368755577172747">"ICCID"</string>
     <string name="status_network_type" msgid="3279383550222116235">"মোবাইল নেটওয়ার্ক ধরণ"</string>
@@ -1145,15 +1159,14 @@
     <string name="status_wifi_mac_address" msgid="2202206684020765378">"ওয়াই-ফাই MAC ঠিকানা"</string>
     <string name="status_bt_address" msgid="4195174192087439720">"ব্লুটুথ ঠিকানা"</string>
     <string name="status_serial_number" msgid="2257111183374628137">"ক্রমিক সংখ্যা"</string>
-    <string name="status_unavailable" msgid="7862009036663793314">"অনুপলব্ধ"</string>
     <string name="status_up_time" msgid="7294859476816760399">"আপ টাইম"</string>
     <string name="status_awake_time" msgid="2393949909051183652">"জাগ্রত সময়"</string>
-    <string name="internal_memory" msgid="9129595691484260784">"অভ্যন্তরীণ সঞ্চয়স্থান"</string>
-    <string name="sd_memory" product="nosdcard" msgid="2510246194083052841">"USB সঞ্চয়স্থান"</string>
+    <string name="internal_memory" msgid="9129595691484260784">"ইন্টারনাল স্টোরেজ"</string>
+    <string name="sd_memory" product="nosdcard" msgid="2510246194083052841">"USB স্টোরেজ"</string>
     <string name="sd_memory" product="default" msgid="151871913888051515">"SD কার্ড"</string>
     <string name="memory_available" msgid="5052397223077021181">"উপলব্ধ"</string>
     <string name="memory_available_read_only" msgid="6497534390167920206">"উপলব্ধ (শুধুমাত্র পঠনযোগ্য)"</string>
-    <string name="memory_size" msgid="6629067715017232195">"মোট স্থান"</string>
+    <string name="memory_size" msgid="6629067715017232195">"মোট জায়গা"</string>
     <string name="memory_calculating_size" msgid="2188358544203768588">"গণনা করা হচ্ছে..."</string>
     <string name="memory_apps_usage" msgid="5128673488173839077">"অ্যাপ্স এবং অ্যাপ ডেটা"</string>
     <string name="memory_media_usage" msgid="3738830697707880405">"মিডিয়া"</string>
@@ -1162,51 +1175,51 @@
     <string name="memory_music_usage" msgid="1363785144783011606">"অডিও (সঙ্গীত, রিংটোন, পডকাস্ট, ইত্যাদি)"</string>
     <string name="memory_media_misc_usage" msgid="6094866738586451683">"অন্যান্য ফাইলগুলি"</string>
     <string name="memory_media_cache_usage" msgid="6704293333141177910">"ক্যাশে করা ডেটা"</string>
-    <string name="sd_eject" product="nosdcard" msgid="4988563376492400073">"শেয়ার করা সঞ্চয়স্থান আনমাউন্ট করুন"</string>
+    <string name="sd_eject" product="nosdcard" msgid="4988563376492400073">"শেয়ার করা স্টোরেজ আনমাউন্ট করুন"</string>
     <string name="sd_eject" product="default" msgid="6915293408836853020">"SD কার্ড আনমাউন্ট করুন"</string>
-    <string name="sd_eject_summary" product="nosdcard" msgid="5009296896648072891">"অভ্যন্তরীণ USB সঞ্চয়স্থান আনমাউন্ট করুন"</string>
+    <string name="sd_eject_summary" product="nosdcard" msgid="5009296896648072891">"ইন্টারনাল USB স্টোরেজ আনমাউন্ট করুন"</string>
     <string name="sd_eject_summary" product="default" msgid="3300599435073550246">"আপনি যাতে SD কার্ড নিরাপদে সরাতে পারেন তাই তা আনমাউন্ট করুন"</string>
-    <string name="sd_insert_summary" product="nosdcard" msgid="5264016886409577313">"মাউন্ট করার জন্য USB সঞ্চয়স্থান ঢোকান"</string>
+    <string name="sd_insert_summary" product="nosdcard" msgid="5264016886409577313">"মাউন্ট করার জন্য USB স্টোরেজ ঢোকান"</string>
     <string name="sd_insert_summary" product="default" msgid="2048640010381803841">"মাউন্ট করার জন্য একটি SD কার্ড ঢোকান"</string>
-    <string name="sd_mount" product="nosdcard" msgid="8966695015677343116">"USB সঞ্চয়স্থান মাউন্ট করুন"</string>
+    <string name="sd_mount" product="nosdcard" msgid="8966695015677343116">"USB স্টোরেজ মাউন্ট করুন"</string>
     <string name="sd_mount" product="default" msgid="5940523765187704135">"SD কার্ড মাউন্ট করুন"</string>
     <string name="sd_mount_summary" product="nosdcard" msgid="4673411327373419641"></string>
     <string name="sd_mount_summary" product="default" msgid="4673411327373419641"></string>
-    <string name="sd_format" product="nosdcard" msgid="2148179271623099054">"USB সঞ্চয়স্থান মুছে ফেলুন"</string>
+    <string name="sd_format" product="nosdcard" msgid="2148179271623099054">"USB স্টোরেজ মুছে ফেলুন"</string>
     <string name="sd_format" product="default" msgid="2576054280507119870">"SD কার্ড মুছে ফেলুন"</string>
     <string name="sd_format_summary" product="nosdcard" msgid="6331905044907914603">"অভ্যন্তরীণ USB সঞ্চয়স্থানের সমস্ত ডেটা মুছে দেয়, যেমন সঙ্গীত বা ফটো"</string>
     <string name="sd_format_summary" product="default" msgid="212703692181793109">"SD কার্ডের সমস্ত তথ্য মুছে দেয়, যেমন সঙ্গীত এবং ফটো"</string>
     <string name="memory_clear_cache_title" msgid="5423840272171286191">"ক্যাশে করা ডেটা সাফ করবেন?"</string>
     <string name="memory_clear_cache_message" msgid="4550262490807415948">"এটি সব অ্যাপ্লিকেশানগুলি থেকে ক্যাশে করা ডেটা সাফ করে দেবে।"</string>
     <string name="mtp_ptp_mode_summary" msgid="3710436114807789270">"MTP অথবা PTP ফাংশন সক্রিয়"</string>
-    <string name="dlg_confirm_unmount_title" product="nosdcard" msgid="3077285629197874055">"USB সঞ্চয়স্থান আনমাউন্ট করবেন?"</string>
+    <string name="dlg_confirm_unmount_title" product="nosdcard" msgid="3077285629197874055">"USB স্টোরেজ আনমাউন্ট করবেন?"</string>
     <string name="dlg_confirm_unmount_title" product="default" msgid="3634502237262534381">"SD কার্ড আনমাউন্ট করবেন?"</string>
-    <string name="dlg_confirm_unmount_text" product="nosdcard" msgid="4322636662873269018">"আপনি যদি USB সঞ্চয়স্থান আনমাউন্ট করেন তাহলে আপনার USB সঞ্চয়স্থান আবার মাউন্ট না করা পর্যন্ত আপনি যে অ্যাপ্লিকেশানগুলি ব্যবহার করছেন সেগুলি থেকে যাবে এবং অনুপলব্ধ হতে পারে।"</string>
+    <string name="dlg_confirm_unmount_text" product="nosdcard" msgid="4322636662873269018">"আপনি যদি USB স্টোরেজ আনমাউন্ট করেন তাহলে আপনার USB স্টোরেজ আবার মাউন্ট না করা পর্যন্ত আপনি যে অ্যাপ্লিকেশনগুলি ব্যবহার করছেন সেগুলি বন্ধ হয়ে যাবে এবং অনুপলব্ধ হতে পারে।"</string>
     <string name="dlg_confirm_unmount_text" product="default" msgid="6998379994779187692">"আপনি যদি SD কার্ড আনমাউন্ট করেন, তাহলে কিছু অ্যাপ্লিকেশান যেগুলি আপনি ব্যবহার করছেন সেগুলি থেমে যাবে এবং SD কার্ড আবার মাউন্ট না করা পর্যন্ত নাও উপলব্ধ হতে পারে।"</string>
     <string name="dlg_error_unmount_title" product="nosdcard" msgid="4642742385125426529"></string>
     <string name="dlg_error_unmount_title" product="default" msgid="4642742385125426529"></string>
-    <string name="dlg_error_unmount_text" product="nosdcard" msgid="9191518889746166147">"USB সঞ্চয়স্থান আনমাউন্ট করা যায়নি। পরে আবার চেষ্টা করুন।"</string>
+    <string name="dlg_error_unmount_text" product="nosdcard" msgid="9191518889746166147">"USB স্টোরেজ আনমাউন্ট করা যায়নি। পরে আবার চেষ্টা করুন।"</string>
     <string name="dlg_error_unmount_text" product="default" msgid="3500976899159848422">"SD কার্ড আনমাউন্ট করা যায়নি। পরে আবার চেষ্টা করুন।"</string>
     <string name="unmount_inform_text" product="nosdcard" msgid="7120241136790744265">"USB স্টোরেজ আনমাউন্ট করা হবে।"</string>
     <string name="unmount_inform_text" product="default" msgid="1904212716075458402">"SD কার্ড আনমাউন্ট করা হবে।"</string>
     <string name="sd_ejecting_title" msgid="8824572198034365468">"আনমাউন্ট করা হচ্ছে"</string>
     <string name="sd_ejecting_summary" msgid="2028753069184908491">"আনমাউন্ট করার কাজ চলছে"</string>
-    <string name="storage_low_title" msgid="1388569749716225155">"সঞ্চয়স্থান পূর্ণ হতে চলেছে"</string>
-    <string name="storage_low_summary" msgid="7737465774892563129">"সিঙ্কের মতো কিছু সিস্টেম ফাংশনগুলি সঠিকভাবে কাজ নাও করতে পারে। অ্যাপ্লিকেশান ও মিডিয়া সামগ্রীর মতো আন পিন করা আইটেমগুলি মুছে ফেলার মাধ্যেমে স্থান মুক্ত করার চেষ্টা করুন।"</string>
-    <string name="storage_menu_rename" msgid="7141058657592615390">"আবার নামকরণ করুন"</string>
+    <string name="storage_low_title" msgid="1388569749716225155">"স্টোরেজ পূর্ণ হতে চলেছে"</string>
+    <string name="storage_low_summary" msgid="7737465774892563129">"সিঙ্কের মতো কিছু সিস্টেম কার্যকলাপগুলি সঠিকভাবে কাজ নাও করতে পারে। অ্যাপ ও মিডিয়া সামগ্রীর মতো আন পিন করা আইটেমগুলি মুছে ফেলার মাধ্যমে জায়গা মুক্ত করার চেষ্টা করুন।"</string>
+    <string name="storage_menu_rename" msgid="7141058657592615390">"নাম বদলান"</string>
     <string name="storage_menu_mount" msgid="1014683672493425425">"মাউন্ট করা"</string>
     <string name="storage_menu_unmount" msgid="681485356885955898">"বের করে নিন"</string>
     <string name="storage_menu_format" msgid="7690626079653152152">"ফর্ম্যাট করুন"</string>
-    <string name="storage_menu_format_public" msgid="7464714208010125682">"পোর্টেবল হিসাবে ফর্ম্যাট করুন"</string>
+    <string name="storage_menu_format_public" msgid="7464714208010125682">"পোর্টেবল হিসেবে ফর্ম্যাট করুন"</string>
     <string name="storage_menu_format_private" msgid="546017531835902096">"অভ্যন্তরীণ হিসেবে ফর্ম্যাট করুন"</string>
     <string name="storage_menu_migrate" msgid="3969621494238154294">"ডেটা স্থানান্তরন"</string>
     <string name="storage_menu_forget" msgid="6305824238997983426">"ভুলে যান"</string>
     <string name="storage_menu_set_up" msgid="4263294929451685366">"সেট আপ করুন"</string>
     <string name="storage_menu_explore" msgid="4637496051816521560">"ঘুরে দেখুন"</string>
-    <string name="storage_menu_free" msgid="6386070442027135427">"সঞ্চয়স্থান খালি করুন"</string>
-    <string name="storage_menu_manage" msgid="5914482953856430780">"সঞ্চয়স্থান পরিচালনা করুন"</string>
+    <string name="storage_menu_free" msgid="6386070442027135427">"স্টোরেজ খালি করুন"</string>
+    <string name="storage_menu_manage" msgid="5914482953856430780">"স্টোরেজ পরিচালনা করুন"</string>
     <string name="storage_title_usb" msgid="679612779321689418">"USB কম্পিউটার সংযোগ"</string>
-    <string name="usb_connection_category" msgid="7805945595165422882">"হিসাবে সংযুক্ত করুন"</string>
+    <string name="usb_connection_category" msgid="7805945595165422882">"হিসেবে সংযুক্ত করুন"</string>
     <string name="usb_mtp_title" msgid="3399663424394065964">"মিডিয়া ডিভাইস (MTP)"</string>
     <string name="usb_mtp_summary" msgid="4617321473211391236">"Windows এ অথবা Android ফাইল স্থানান্তর ব্যবহার করে Mac এ মিডিয়া ফাইলগুলি স্থানান্তর করতে দেয় (www.android.com/filetransfer দেখুন)"</string>
     <string name="usb_ptp_title" msgid="3852760810622389620">"ক্যামেরা (PTP)"</string>
@@ -1214,8 +1227,8 @@
     <string name="usb_midi_title" msgid="3069990264258413994">"MIDI"</string>
     <string name="usb_midi_summary" msgid="539169474810956358">"MIDI সক্ষমিত অ্যাপ্লিকেশানগুলিকে আপনার কম্পিউটারে MIDI সফ্টওয়্যারের সঙ্গে USB এর সাথে কাজ করতে দেয়৷"</string>
     <string name="storage_other_users" msgid="808708845102611856">"অন্য ব্যবহারকারীরা"</string>
-    <string name="storage_internal_title" msgid="690771193137801021">"ডিভাইসের সঞ্চয়স্থান"</string>
-    <string name="storage_external_title" msgid="3433462910096848696">"পোর্টেবল সঞ্চয়স্থান"</string>
+    <string name="storage_internal_title" msgid="690771193137801021">"ডিভাইসের স্টোরেজ"</string>
+    <string name="storage_external_title" msgid="3433462910096848696">"পোর্টেবল স্টোরেজ"</string>
     <string name="storage_volume_summary" msgid="7023441974367853372">"<xliff:g id="TOTAL">%2$s</xliff:g> এর মধ্যে <xliff:g id="USED">%1$s</xliff:g> ব্যবহৃত হয়েছে"</string>
     <string name="storage_size_large" msgid="5691585991420946254">"<xliff:g id="NUMBER">^1</xliff:g>"<small><small>" <xliff:g id="UNIT">^2</xliff:g>"</small></small>""</string>
     <string name="storage_volume_used" msgid="1303803057698959872">"<xliff:g id="TOTAL">%1$s</xliff:g> ব্যবহৃত হয়েছে"</string>
@@ -1230,31 +1243,31 @@
     <string name="storage_dialog_unmounted" msgid="6403320870103261477">"<xliff:g id="NAME_0">^1</xliff:g> নিরাপদভাবে সরানো হয়েছে, তবে এখনও উপলব্ধ রয়েছে। \n\n<xliff:g id="NAME_1">^1</xliff:g> ব্যবহার করতে, আপনাকে প্রথমে এটি মাউন্ট করতে হবে।"</string>
     <string name="storage_dialog_unmountable" msgid="3732209361668282254">"এই <xliff:g id="NAME_0">^1</xliff:g> ত্রুটিপূর্ণ রয়েছে। \n\n<xliff:g id="NAME_1">^1</xliff:g> ব্যবহার করতে, আপনাকে প্রথমে এটি সেট আপ করতে হবে।"</string>
     <string name="storage_dialog_unsupported" msgid="4503128224360482228">"এই ডিভাইসটি <xliff:g id="NAME_0">^1</xliff:g> সমর্থন করে না। \n\nএই ডিভাইসের সাথে <xliff:g id="NAME_1">^1</xliff:g> ব্যবহার করতে, আপনাকে প্রথমে এটি সেট আপ করতে হবে।"</string>
-    <string name="storage_internal_format_details" msgid="4018647158382548820">"ফর্ম্যাট করার পর, আপনি অন্যান্য ডিভাইসগুলিতে এই <xliff:g id="NAME_0">^1</xliff:g> ব্যবহার করতে পারেন৷ \n\nএই <xliff:g id="NAME_1">^1</xliff:g> এর সমস্ত ডেটা মুছে ফেলা হবে৷ প্রথমে ব্যাক আপ নেওয়ার কথা বিবেচনা করুন৷ \n\n"<b>"ফটোগুলি এবং অন্য মিডিয়ার ব্যাক আপ নিন"</b>" \nআপনার মিডিয়া ফাইলগুলি এই ডিভাইসের বিকল্প সঞ্চয়স্থানে সরান অথবা একটি USB তার ব্যবহার করে তাদের একটি কম্পিউটারে স্থানান্তর করুন৷ \n\n"<b>"অ্যাপ্লিকেশানগুলির ব্যাক আপ নিন"</b>" \nএই <xliff:g id="NAME_6">^1</xliff:g> এ সঞ্চিত সমস্ত অ্যাপ্লিকেশানগুলি আনইনস্টল করা হবে এবং তাদের ডেটা মুছে ফেলা হবে৷ এই অ্যাপ্লিকেশানগুলি রাথার জন্য তাদের এই ডিভাইসের বিকল্প সঞ্চয়স্থানে সরিয়ে দিন৷"</string>
-    <string name="storage_internal_unmount_details" msgid="3582802571684490057"><b>"যখন আপনি <xliff:g id="NAME_0">^1</xliff:g> সরিয়ে দেবেন, তখন এতে সঞ্চিত অ্যাপ্লিকেশানগুলি কাজ করা বন্ধ করে দেবে, এবং এতে সঞ্চিত মিডিয়া ফাইলগুলি এটি আবার না ঢোকানো পর্যন্ত উপলব্ধ হবে না৷"</b>" \n\nএই <xliff:g id="NAME_1">^1</xliff:g> শুধুমাত্র এই ডিভাইসে কাজ করার জন্য ফর্ম্যাট করা হয়েছে৷ অন্য কোন জায়গায় এটি কাজ করবে না৷"</string>
-    <string name="storage_internal_forget_details" msgid="9028875424669047327">"<xliff:g id="NAME">^1</xliff:g> এর মধ্যে থাকা অ্যাপ্লিকেশান, ছবি বা ডেটা ব্যবহার করার জন্য, এটিকে পুনরায় ঢোকান। \n\nঅনুরূপভাবে, ডিভাইস উপলব্ধ না থাকলে আপনি এই সঞ্চয়স্থান মনে নেই বেছে নিতে পারেন। \n\nআপনি যদি মনে নেই বাছেন, তবে ডিভাইসের মধ্যে থাকা সমস্ত ডেটা চিরতরে হারিয়ে যাবে। \n\nআপনি পরে অ্যাপটিকে পুনরায় ইনস্টল করতে পারেন, তবে এই ডিভাইসটিতে যে ডেটা সঞ্চিত আছে তা হারিয়ে যাবে।"</string>
+    <string name="storage_internal_format_details" msgid="4018647158382548820">"ফর্ম্যাট করার পর, আপনি অন্যান্য ডিভাইসগুলিতে এই <xliff:g id="NAME_0">^1</xliff:g> ব্যবহার করতে পারেন৷ \n\nএর সমস্ত ডেটা <xliff:g id="NAME_1">^1</xliff:g> মুছে ফেলা হবে৷ প্রথমে ব্যাক-আপ নেওয়ার কথা বিবেচনা করুন৷ \n\n"<b>"ফটোগুলি ও অন্য মিডিয়ার ব্যাক-আপ নিন"</b>" \nআপনার মিডিয়া ফাইলগুলি এই ডিভাইসের বিকল্প স্টোরেজে সরান অথবা একটি USB তার ব্যবহার করে তাদের একটি কম্পিউটারে স্থানান্তর করুন৷ \n\n"<b>"অ্যাপগুলির ব্যাক-আপ নিন"</b>" \nএই <xliff:g id="NAME_6">^1</xliff:g> এ মজুত সমস্ত অ্যাপগুলি আনইনস্টল করা হবে এবং তাদের ডেটা মুছে ফেলা হবে৷ এই অ্যাপগুলি রাথার জন্য তাদের এই ডিভাইসের বিকল্প স্টোরেজে সরিয়ে দিন৷"</string>
+    <string name="storage_internal_unmount_details" msgid="3582802571684490057"><b>"যখন আপনি <xliff:g id="NAME_0">^1</xliff:g> সরিয়ে দেবেন, তখন এতে সঞ্চিত অ্যাপ্লিকেশনগুলি কাজ করা বন্ধ করে দেবে, এবং এতে সঞ্চিত মিডিয়া ফাইলগুলি এটি আবার না ঢোকানো পর্যন্ত উপলব্ধ হবে না৷"</b>" \n\nএই <xliff:g id="NAME_1">^1</xliff:g> শুধুমাত্র এই ডিভাইসে কাজ করার জন্য ফর্ম্যাট করা হয়েছে৷ অন্য কোনও জায়গায় এটি কাজ করবে না৷"</string>
+    <string name="storage_internal_forget_details" msgid="9028875424669047327">"<xliff:g id="NAME">^1</xliff:g> এর মধ্যে থাকা অ্যাপ্লিকেশন, ছবি বা ডেটা ব্যবহার করার জন্য, এটিকে পুনরায় ঢোকান। \n\nঅনুরূপভাবে, ডিভাইস উপলব্ধ না থাকলে আপনি এই সঞ্চয়স্থান মনে নেই বেছে নিতে পারেন। \n\nআপনি যদি মনে নেই বাছেন, তবে ডিভাইসের মধ্যে থাকা সমস্ত ডেটা চিরতরে হারিয়ে যাবে। \n\nআপনি পরে অ্যাপটিকে পুনরায় ইনস্টল করতে পারেন, তবে এই ডিভাইসটিতে যে ডেটা সঞ্চিত আছে তা হারিয়ে যাবে।"</string>
     <string name="storage_internal_forget_confirm_title" msgid="1370847944388479245">"<xliff:g id="NAME">^1</xliff:g> ভুলতে চান?"</string>
-    <string name="storage_internal_forget_confirm" msgid="1148446041396902905">"<xliff:g id="NAME">^1</xliff:g> -এ সঞ্চিত সমস্ত অ্যাপ্লিকেশান, ফটো, এবং ডেটা চিরতরে হারিয়ে যাবে।"</string>
-    <string name="storage_detail_apps" msgid="6141154016753507490">"অ্যাপ্লিকেশানগুলি"</string>
-    <string name="storage_detail_images" msgid="6950678857740634769">"চিত্র"</string>
+    <string name="storage_internal_forget_confirm" msgid="1148446041396902905">"<xliff:g id="NAME">^1</xliff:g> -এ সঞ্চিত সমস্ত অ্যাপ্লিকেশন, ফটো, এবং ডেটা চিরতরে হারিয়ে যাবে।"</string>
+    <string name="storage_detail_apps" msgid="6141154016753507490">"অ্যাপ"</string>
+    <string name="storage_detail_images" msgid="6950678857740634769">"ছবি"</string>
     <string name="storage_detail_videos" msgid="2919743464827110953">"ভিডিও"</string>
     <string name="storage_detail_audio" msgid="1197685141676483213">"অডিও"</string>
     <string name="storage_detail_cached" msgid="8547136365247818567">"ক্যাশে করা ডেটা"</string>
     <string name="storage_detail_other" msgid="8404938385075638238">"অন্যান্য"</string>
     <string name="storage_detail_system" msgid="4629506366064709687">"সিস্টেম"</string>
     <string name="storage_detail_explore" msgid="7911344011431568294">"<xliff:g id="NAME">^1</xliff:g> এক্সপ্লোর করুন"</string>
-    <string name="storage_detail_dialog_other" msgid="8907101974576694793">"অন্যগুলির মধ্যে, অ্যাপগুলির দ্বারা সংরক্ষিত শেয়ার করা ফাইল, ইন্টারনেট বা ব্লুটুথ থেকে ডাউনলোড করা ফাইল, Android ফাইল এবং এই ধরণের আরো অনেক কিছু অন্তর্ভুক্ত রয়েছে৷\n\n<xliff:g id="NAME">^1</xliff:g> এর দৃশ্যমান সামগ্রী দেখতে, \'ঘুরে দেখুন\' এ আলতো চাপুন৷"</string>
+    <string name="storage_detail_dialog_other" msgid="8907101974576694793">"অন্যগুলির মধ্যে, অ্যাপগুলির দ্বারা সংরক্ষিত শেয়ার করা ফাইল, ইন্টারনেট বা ব্লুটুথ থেকে ডাউনলোড করা ফাইল, Android ফাইল এবং এই ধরণের আরও অনেক কিছু অন্তর্ভুক্ত রয়েছে৷\n\n<xliff:g id="NAME">^1</xliff:g> এর দৃশ্যমান কন্টেন্ট দেখতে, \'ঘুরে দেখুন\' এ আলতো চাপুন৷"</string>
     <string name="storage_detail_dialog_system" msgid="862835644848361569">"সিস্টেমের মধ্যে Android ভার্সন <xliff:g id="VERSION">%s</xliff:g> চালানোর জন্য ফাইলগুলি সামিল থাকে"</string>
-    <string name="storage_detail_dialog_user" msgid="3267254783294197804">"<xliff:g id="USER_0">^1</xliff:g> ফটো, গান, অ্যাপ, বা অন্যান্য ডেটা সংরক্ষণ করতে <xliff:g id="SIZE">^2</xliff:g> সঞ্চয়স্থান ব্যবহার করে থাকতে পারেন। \n\nবিশদ বিবরণ জানতে <xliff:g id="USER_1">^1</xliff:g> হিসাবে প্রবেশ করুন।"</string>
+    <string name="storage_detail_dialog_user" msgid="3267254783294197804">"<xliff:g id="USER_0">^1</xliff:g> ফটো, গান, অ্যাপ, বা অন্যান্য ডেটা সেভ করতে <xliff:g id="SIZE">^2</xliff:g> স্টোরেজ ব্যবহার করে থাকতে পারেন। \n\nবিশদ বিবরণ জানতে <xliff:g id="USER_1">^1</xliff:g> হিসাবে প্রবেশ করুন।"</string>
     <string name="storage_wizard_init_title" msgid="5085400514028585772">"আপনার <xliff:g id="NAME">^1</xliff:g> সেট আপ করুন"</string>
-    <string name="storage_wizard_init_external_title" msgid="4867326438945303598">"পোর্টেবল সঞ্চয়স্থান হিসাবে ব্যবহার করুন"</string>
+    <string name="storage_wizard_init_external_title" msgid="4867326438945303598">"পোর্টেবল স্টোরেজ হিসাবে ব্যবহার করুন"</string>
     <string name="storage_wizard_init_external_summary" msgid="7476105886344565074">"ডিভাইসগুলির মধ্যে ফটোগুলি ও অন্যান্য মিডিয়া সরানোর জন্য৷"</string>
-    <string name="storage_wizard_init_internal_title" msgid="9100613534261408519">"অভ্যন্তরীণ সঞ্চয়স্থান হিসাবে ব্যবহার করুন"</string>
+    <string name="storage_wizard_init_internal_title" msgid="9100613534261408519">"ইন্টারনাল স্টোরেজ হিসাবে ব্যবহার করুন"</string>
     <string name="storage_wizard_init_internal_summary" msgid="6240417501036216410">"শুধুমাত্র এই ডিভাইসটিতে অ্যাপ্লিকেশান এবং ফটোগুলি সহ কোনো কিছু সঞ্চয় করার জন্য৷ সেইগুলি ফর্ম্যাট করা প্রয়োজন যা এটিকে অন্য ডিভাইসগুলির সাথে কাজ করতে বাধা দেয়৷"</string>
-    <string name="storage_wizard_format_confirm_title" msgid="2814021794538252546">"অভ্যন্তরীণ সঞ্চয়স্থান হিসাবে ফর্ম্যাট করুন"</string>
-    <string name="storage_wizard_format_confirm_body" msgid="4401758710076806509">"<xliff:g id="NAME_0">^1</xliff:g> নিরাপদ করার জন্য এটি ফর্ম্যাট করা প্রযোজন হবে৷ \n\nফর্ম্যাট করার পরে এই <xliff:g id="NAME_1">^1</xliff:g> শুধুমাত্র এই ডিভাইসটির মধ্যে কাজ করবে৷ \n\n"<b>"ফর্ম্যাট করা হলে <xliff:g id="NAME_2">^1</xliff:g> এ বর্তমানে সঞ্চিত সমস্ত ডেটা মুছে যাবে৷"</b>" ডেটাটি যাতে হারিয়ে না যায় তার জন্য এটির ব্যাক আপ নেওয়ার কথা বিবেচনা করুন৷"</string>
-    <string name="storage_wizard_format_confirm_public_title" msgid="4905690038882041566">"পোর্টেবল সঞ্চয়স্থান হিসাবে ফর্ম্যাট করুন"</string>
-    <string name="storage_wizard_format_confirm_public_body" msgid="1516932692920060272">"<xliff:g id="NAME_0">^1</xliff:g> ফর্ম্যাট করার প্রযোজন হবে৷ \n\n"<b>"ফর্ম্যাট করা হলে <xliff:g id="NAME_1">^1</xliff:g> এ বর্তমানে সঞ্চিত সমস্ত ডেটা মুছে যাবে৷"</b>" ডেটাটি যাতে হারিয়ে না যায় তার জন্য এটির ব্যাক আপ নেওয়ার কথা বিবেচনা করুন৷"</string>
+    <string name="storage_wizard_format_confirm_title" msgid="2814021794538252546">"ইন্টারনাল স্টোরেজ হিসাবে ফর্ম্যাট করুন"</string>
+    <string name="storage_wizard_format_confirm_body" msgid="4401758710076806509">"<xliff:g id="NAME_0">^1</xliff:g> নিরাপদ করার জন্য এটি ফর্ম্যাট করা প্রযোজন হবে৷ \n\nফর্ম্যাট করার পরে এই <xliff:g id="NAME_1">^1</xliff:g> শুধুমাত্র এই ডিভাইসটির মধ্যে কাজ করবে৷ \n\n"<b>"ফর্ম্যাট করা হলে <xliff:g id="NAME_2">^1</xliff:g> এ বর্তমানে মজুত সমস্ত ডেটা মুছে যাবে৷"</b>" ডেটা যাতে হারিয়ে না যায় তার জন্য এটির ব্যাক-আপ নেওয়ার কথা বিবেচনা করুন৷"</string>
+    <string name="storage_wizard_format_confirm_public_title" msgid="4905690038882041566">"পোর্টেবল স্টোরেজ হিসাবে ফর্ম্যাট করুন"</string>
+    <string name="storage_wizard_format_confirm_public_body" msgid="1516932692920060272">"<xliff:g id="NAME_0">^1</xliff:g> ফর্ম্যাট করার প্রযোজন হবে৷ \n\n"<b>"ফর্ম্যাট করা হলে <xliff:g id="NAME_1">^1</xliff:g> এ বর্তমানে মজুত সমস্ত ডেটা মুছে যাবে৷"</b>" ডেটা যাতে হারিয়ে না যায় তার জন্য এটির ব্যাক-আপ নেওয়ার কথা বিবেচনা করুন৷"</string>
     <string name="storage_wizard_format_confirm_next" msgid="2774557300531702572">"মুছুন এবং ফর্ম্যাট করুন"</string>
     <string name="storage_wizard_format_progress_title" msgid="6487352396450582292">"<xliff:g id="NAME">^1</xliff:g> ফর্ম্যাট করা হচ্ছে…"</string>
     <string name="storage_wizard_format_progress_body" msgid="4445041233802828430">"ফর্ম্যাট করার সময় <xliff:g id="NAME">^1</xliff:g> সরাবেন না৷"</string>
@@ -1285,7 +1298,7 @@
     <string name="apn_apn" msgid="2479425126733513353">"APN"</string>
     <string name="apn_http_proxy" msgid="1826885957243696354">"প্রক্সি"</string>
     <string name="apn_http_port" msgid="3763259523984976226">"পোর্ট"</string>
-    <string name="apn_user" msgid="455637547356117761">"ব্যবহারকারীর নাম"</string>
+    <string name="apn_user" msgid="455637547356117761">"ইউজারনেম"</string>
     <string name="apn_password" msgid="5412301994998250968">"পাসওয়ার্ড"</string>
     <string name="apn_server" msgid="2436185314756372858">"সার্ভার"</string>
     <string name="apn_mmsc" msgid="3670124402105585737">"MMSC"</string>
@@ -1309,7 +1322,7 @@
     <string name="mvno_match_data" msgid="4560671695220540466">"MVNO মান"</string>
     <string name="menu_delete" msgid="6981294422841124659">"APN মুছে দিন"</string>
     <string name="menu_new" msgid="3014205883303921729">"নতুন APN"</string>
-    <string name="menu_save" msgid="8109345640668285399">"সংরক্ষণ"</string>
+    <string name="menu_save" msgid="8109345640668285399">"সেভ করুন"</string>
     <string name="menu_cancel" msgid="2194502410474697474">"খারিজ করুন"</string>
     <string name="error_title" msgid="7631322303341024692"></string>
     <string name="error_name_empty" msgid="5508155943840201232">"নাম ফিল্ডটি খালি থাকতে পারে না।"</string>
@@ -1321,6 +1334,7 @@
     <string name="menu_restore" msgid="8260067415075573273">"ডিফল্টে আবার সেট করুন"</string>
     <string name="restore_default_apn_completed" msgid="2824775307377604897">"ডিফল্ট APN সেটিংস আবার সেট করা সম্পন্ন হয়েছে।"</string>
     <string name="reset_dashboard_title" msgid="6254873816990678620">"রিসেটের বিকল্পগুলি"</string>
+    <string name="reset_dashboard_summary" msgid="4851012632493522755">"নেটওয়ার্ক, অ্যাপ, অথবা ডিভাইস রিসেট করা যায়"</string>
     <string name="reset_network_title" msgid="6166025966016873843">"ওয়াই-ফাই, মোবাইল এবং ব্লুটুথ রিসেট করুন"</string>
     <string name="reset_network_desc" msgid="5547979398298881406">"এগুলি সহ সমস্ত নেটওয়ার্ক সেটিংস আবার সেট করবে:\n\n"<li>"ওয়াই ফাই "</li>\n<li>"সেলুলার ডাটা "</li>\n<li>"ব্লুটুথ"</li></string>
     <string name="reset_network_button_text" msgid="2035676527471089853">"সেটিংস আবার সেট করুন"</string>
@@ -1329,20 +1343,17 @@
     <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="6617679904229218425">"সমস্ত ডেটা মুছুন (ফ্যাক্টরি রিসেট)"</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>
-    </plurals>
-    <string name="master_clear_summary" msgid="6902443944660426951">"অভ্যন্তরীণ স্টোরেজ এবং সমস্ত ডেটা রিসেট করা হবে"</string>
-    <string name="master_clear_desc" product="tablet" msgid="9146059417023157222">"এটি আপনার ট্যাবলেটের "<b>"অভ্যন্তরীণ সঞ্চয়স্থান"</b>", থেকে সমস্ত ডেটা মুছে দেবে, এগুলি সহ:\n\n"<li>"আপনার Google অ্যাকাউন্ট"</li>\n<li>"সিস্টেম এবং অ্যাপ্লিকেশান ডেটা এবং সেটিংস"</li>\n<li>"ডাউনলোড করা অ্যাপ্লিকেশানগুলি"</li></string>
-    <string name="master_clear_desc" product="default" msgid="4800386183314202571">"এটি আপনার ফোনের "<b>"অভ্যন্তরীণ সঞ্চয়স্থান"</b>" থেকে সমস্ত ডেটা মুছে দেবে, এগুলি সহ: \n\n"<li>"আপনার Google অ্যাকাউন্ট"</li>\n<li>"সিস্টেম এবং অ্যাপ্লিকেশান ডেটা এবং সেটিংস"</li>\n<li>"ডাউনলোড করা অ্যাপ্লিকেশানগুলি"</li></string>
+    <string name="master_clear_title" msgid="3531267871084279512">"সমস্ত ডেটা মুছুন (ফ্যাক্টরি রিসেট)"</string>
+    <string name="master_clear_desc" product="tablet" msgid="9146059417023157222">"এটি আপনার ট্যাবলেটের "<b>"ইন্টারনাল স্টোরেজ"</b>", থেকে সমস্ত ডেটা মুছে দেবে, এগুলি সহ:\n\n"<li>"আপনার Google অ্যাকাউন্ট"</li>\n<li>"সিস্টেম এবং অ্যাপ্লিকেশন ডেটা এবং সেটিংস"</li>\n<li>"ডাউনলোড করা অ্যাপ্লিকেশনগুলি"</li></string>
+    <string name="master_clear_desc" product="default" msgid="4800386183314202571">"এটি আপনার ফোনের "<b>"ইন্টারনাল স্টোরেজ"</b>", থেকে সমস্ত ডেটা মুছে দেবে, এগুলি সহ:\n\n"<li>"আপনার Google অ্যাকাউন্ট"</li>\n<li>"সিস্টেম এবং অ্যাপ্লিকেশন ডেটা এবং সেটিংস"</li>\n<li>"ডাউনলোড করা অ্যাপ্লিকেশনগুলি"</li></string>
     <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"আপনি বর্তমানে নিম্নলিখিত অ্যাকাউন্টে প্রবেশ করে আছেন:\n"</string>
     <string name="master_clear_other_users_present" product="default" msgid="5161423070702470742">\n\n"এই ডিভাইসে অন্যান্য ব্যবহারকারীরাও রয়েছেন৷\n"</string>
     <string name="master_clear_desc_also_erases_external" msgid="1903185203791274237"><li>"সঙ্গীত"</li>\n<li>"ফটো"</li>\n<li>"অন্যান্য ব্যবহারকারী ডেটা"</li></string>
+    <string name="master_clear_desc_also_erases_esim" msgid="312352697653096008"><li>"ই-সিম এ থাকা পরিষেবা প্রদানকারী"</li></string>
+    <string name="master_clear_desc_no_cancel_mobile_plan" msgid="5460926449093211144">\n\n"এতে আপনার মোবাইল পরিষেবার প্ল্যান বাতিল হবে না।"</string>
     <string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="7744115866662613411">\n\n"আপনার সঙ্গীত, ছবি এবং অন্যান্য ব্যবহারকারী ডেটা সাফ করতে, "<b>"USB সঞ্চয়স্থানটিকে"</b>" মুছে দিতে হবে।"</string>
     <string name="master_clear_desc_erase_external_storage" product="default" msgid="4801026652617377093">\n\n"আপনার সঙ্গীত, ছবি এবং অন্যান্য ব্যবহারকারী ডেটা সাফ করতে, "<b>"SD কার্ডটিকে"</b>" মুছে দিতে হবে।"</string>
-    <string name="erase_external_storage" product="nosdcard" msgid="969364037450286809">"USB সঞ্চয়স্থান মুছে ফেলুন"</string>
+    <string name="erase_external_storage" product="nosdcard" msgid="969364037450286809">"USB স্টোরেজ মুছে ফেলুন"</string>
     <string name="erase_external_storage" product="default" msgid="1397239046334307625">"SD কার্ড মুছে ফেলুন"</string>
     <string name="erase_external_storage_description" product="nosdcard" msgid="4728558173931599429">"অভ্যন্তরীণ USB সঞ্চয়স্থানের সমস্ত ডেটা মুছে দিন, যেমন সঙ্গীত বা ফটো"</string>
     <string name="erase_external_storage_description" product="default" msgid="1737638779582964966">"SD কার্ডের সমস্ত তথ্য মুছে দিন, যেমন সঙ্গীত এবং ফটো"</string>
@@ -1406,7 +1417,7 @@
     <string name="location_app_level_permissions" msgid="1825588230817081339">"অ্যাপ-স্তরের অনুমতিগুলি"</string>
     <string name="location_category_recent_location_requests" msgid="1938721350424447421">"সাম্প্রতিক অবস্থান অনুরোধগুলি"</string>
     <string name="location_no_recent_apps" msgid="2800907699722178041">"সম্প্রতি কোনো অ্যাপ্লিকেশান অবস্থানের অনুরোধ করেনি"</string>
-    <string name="location_category_location_services" msgid="7437150886946685979">"অবস্থান পরিষেবাগুলি"</string>
+    <string name="location_category_location_services" msgid="7437150886946685979">"লোকেশন পরিষেবা"</string>
     <string name="location_high_battery_use" msgid="517199943258508020">"উচ্চ ব্যাটারির ব্যবহার"</string>
     <string name="location_low_battery_use" msgid="8602232529541903596">"কম ব্যাটারির ব্যবহার"</string>
     <string name="location_mode_screen_title" msgid="4528716772270246542">"অবস্থান মোড"</string>
@@ -1419,7 +1430,7 @@
     <string name="location_scanning_bluetooth_always_scanning_title" msgid="5444989508204520019">"ব্লুটুথ স্ক্যানিং"</string>
     <string name="location_scanning_bluetooth_always_scanning_description" msgid="8602726521250591852">"যে কোনো সময়ে ব্লুটুথ ডিভাইসগুলিকে সনাক্ত করার জন্য সিস্টেম অ্যাপ্লিকেশান এবং পরিষেবাগুলিকে অনুমতি দিয়ে অবস্থান উন্নত করুন।"</string>
     <string name="location_network_based" msgid="9134175479520582215">"ওয়াই-ফাই ও মোবাইল নেটওয়ার্ক অবস্থান"</string>
-    <string name="location_neighborhood_level" msgid="5141318121229984788">"দ্রুত আপনার অবস্থান নির্ধারণ করতে অ্যাপ্লিকেশানগুলিকে Google অবস্থান পরিষেবা ব্যবহার করতে দিন। বেনামী অবস্থান ডেটা সংগ্রহ করা হবে এবং Google এ পাঠানো হবে।"</string>
+    <string name="location_neighborhood_level" msgid="5141318121229984788">"দ্রুত আপনার লোকেশন নির্ধারণ করতে অ্যাপগুলিকে Google লোকেশন পরিষেবা ব্যবহার করতে দিন। বেনামী লোকেশন ডেটা সংগ্রহ করা হবে এবং Google এ পাঠানো হবে।"</string>
     <string name="location_neighborhood_level_wifi" msgid="4234820941954812210">"ওয়াই-ফাই দ্বারা অবস্থান নির্ণয় করা হয়েছে"</string>
     <string name="location_gps" msgid="8392461023569708478">"GPS উপগ্রহ"</string>
     <string name="location_street_level" product="tablet" msgid="1669562198260860802">"আপনার অবস্থান উৎস সন্ধান করতে আপনার ট্যাবলেটের অ্যাপ্লিকেশানগুলিকে GPS ব্যবহার করতে দিন"</string>
@@ -1435,7 +1446,7 @@
     <string name="about_settings" product="tablet" msgid="593457295516533765">"ট্যাবলেট সম্পর্কে"</string>
     <string name="about_settings" product="default" msgid="1743378368185371685">"ফোন সম্পর্কে"</string>
     <string name="about_settings" product="emulator" msgid="221313099578564438">"ইমিউলেট করা ডিভাইস সম্পর্কে"</string>
-    <string name="about_settings_summary" msgid="3371517697156165959">"আইনি তথ্য, স্থিতি, সফ্টওয়্যার সংস্করণ দেখুন"</string>
+    <string name="about_settings_summary" msgid="3371517697156165959">"আইনি তথ্য, স্থিতি, সফ্টওয়্যার ভার্সন দেখুন"</string>
     <string name="legal_information" msgid="5769301644270604095">"আইনি তথ্য"</string>
     <string name="contributors_title" msgid="5917703088825286504">"প্রদায়কগণ"</string>
     <string name="manual" msgid="3025943393642974445">"ম্যানুয়াল"</string>
@@ -1446,28 +1457,29 @@
     <string name="terms_title" msgid="7697580845616764642">"চুক্তি এবং শর্তাবলী"</string>
     <string name="webview_license_title" msgid="2813507464175738967">"সিস্টেম ওয়েবভিউ লাইসেন্স"</string>
     <string name="wallpaper_attributions" msgid="3645880512943433928">"ওয়ালপেপারগুলি"</string>
-    <string name="wallpaper_attributions_values" msgid="2996183537914690469">"উপগ্রহ চিত্র প্রদানকারী:\n©2014 CNES / Astrium, DigitalGlobe, Bluesky"</string>
+    <string name="wallpaper_attributions_values" msgid="2996183537914690469">"উপগ্রহ ছবি প্রদানকারী:\n©2014 CNES / Astrium, DigitalGlobe, Bluesky"</string>
     <string name="settings_manual_activity_title" msgid="8133150693616006051">"ম্যানুয়াল"</string>
     <string name="settings_manual_activity_unavailable" msgid="4752403782883814898">"ম্যানুয়াল লোড হওয়ার সময়ে একটি সমস্যা হয়েছে।"</string>
-    <string name="settings_license_activity_title" msgid="8525014571806471216">"তৃতীয় পক্ষের লাইসেন্স"</string>
+    <string name="settings_license_activity_title" msgid="8525014571806471216">"থার্ড-পার্টি লাইসেন্স"</string>
     <string name="settings_license_activity_unavailable" msgid="4210539215951487627">"লাইসেন্সগুলি লোড হতে একটা সমস্যা হয়েছে।"</string>
     <string name="settings_license_activity_loading" msgid="3337535809093591740">"লোড হচ্ছে..."</string>
     <string name="settings_safetylegal_title" msgid="1289483965535937431">"নিরাপত্তা তথ্য"</string>
     <string name="settings_safetylegal_activity_title" msgid="6901214628496951727">"নিরাপত্তা তথ্য"</string>
     <string name="settings_safetylegal_activity_unreachable" msgid="250674109915859456">"আপনার কোনো ডেটা সংযোগ নেই। এখন এই তথ্য দেখতে, ইন্টারনেটের সাথে সংযুক্ত যে কোনো কম্পিউটার থেকে %s এ যান।"</string>
     <string name="settings_safetylegal_activity_loading" msgid="8059022597639516348">"লোড হচ্ছে..."</string>
-    <string name="lockpassword_choose_your_password_header" msgid="8624900666929394990">"আপনার পাসওয়ার্ড বাছুন"</string>
-    <string name="lockpassword_choose_your_password_header_for_fingerprint" msgid="6624409510609085450">"আঙ্গুলের ছাপ ব্যবহার করার জন্য পাসওয়ার্ড সেট করুন"</string>
-    <string name="lockpassword_choose_your_pattern_header" msgid="6949761069941694050">"আপনার প্যাটার্ন বেছে নিন"</string>
-    <string name="lockpassword_choose_your_pattern_header_for_fingerprint" msgid="5901096361617543819">"আঙ্গুলের ছাপ ব্যবহার করার জন্য প্যাটার্ন সেট করুন"</string>
-    <string name="lockpassword_choose_your_pin_header" msgid="7598849519816138302">"আপনার পিন বাছুন"</string>
-    <string name="lockpassword_choose_your_pin_header_for_fingerprint" msgid="765344692615917183">"আঙ্গুলের ছাপ ব্যবহার করার জন্য পিন সেট করুন"</string>
-    <string name="lockpassword_confirm_your_password_header" msgid="6308478184889846633">"আপনার পাসওয়ার্ড নিশ্চিত করুন"</string>
+    <string name="lockpassword_choose_your_screen_lock_header" msgid="3872462096767152394">"একটি স্ক্রিন লক সেট করুন"</string>
+    <string name="lockpassword_choose_your_password_message" msgid="1197569283524841412">"নিরাপত্তার জন্য একটি পাসওয়ার্ড সেট করুন"</string>
+    <string name="lockpassword_choose_your_password_header_for_fingerprint" msgid="2541818487015343503">"আঙ্গুলের ছাপ ব্যবহার করতে পাসওয়ার্ড সেট করুন"</string>
+    <string name="lockpassword_choose_your_pattern_header_for_fingerprint" msgid="7709785406243556723">"আঙ্গুলের ছাপ ব্যবহার করতে প্যাটার্ন সেট করুন"</string>
+    <string name="lockpassword_choose_your_pin_message" msgid="1875420718677275646">"নিরাপত্তার জন্য একটি পিন সেট করুন"</string>
+    <string name="lockpassword_choose_your_pin_header_for_fingerprint" msgid="1549639053195796674">"আঙ্গুলের ছাপ ব্যবহার করতে পিন সেট করুন"</string>
+    <string name="lockpassword_choose_your_pattern_message" msgid="5986983400689720015">"নিরাপত্তার জন্য একটি প্যাটার্ন সেট করুন"</string>
+    <string name="lockpassword_confirm_your_password_header" msgid="1266027268220850931">"আপনার পাসওয়ার্ডটি আবার লিখুন"</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="7744513791910572550">"আপনার পিনটি আবার লিখুন"</string>
     <string name="lockpassword_confirm_passwords_dont_match" msgid="5140892109439191415">"পাসওয়ার্ডগুলি মিলছে না"</string>
     <string name="lockpassword_confirm_pins_dont_match" msgid="7226244811505606217">"পিন মিলছে না"</string>
-    <string name="lockpassword_choose_lock_generic_header" msgid="3811438094903786145">"আনলক নির্বাচন করুন"</string>
+    <string name="lockpassword_choose_lock_generic_header" msgid="3811438094903786145">"আনলক বেছে নিন"</string>
     <string name="lockpassword_password_set_toast" msgid="4875050283108629383">"পাসওয়ার্ড সেট করা হয়েছে"</string>
     <string name="lockpassword_pin_set_toast" msgid="6011826444725291475">"পিন সেট করা হয়েছে"</string>
     <string name="lockpassword_pattern_set_toast" msgid="6867259621331406236">"প্যাটার্ন সেট করা হয়েছে"</string>
@@ -1475,20 +1487,20 @@
     <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>
-    <!-- no translation found for lockpassword_strong_auth_required_device_pattern (530802132223800623) -->
-    <skip />
-    <!-- no translation found for lockpassword_strong_auth_required_device_pin (7829294830078036417) -->
-    <skip />
-    <!-- no translation found for lockpassword_strong_auth_required_device_password (3552644641574796973) -->
-    <skip />
-    <!-- no translation found for lockpassword_strong_auth_required_work_pattern (3003781907040522053) -->
-    <skip />
-    <!-- no translation found for lockpassword_strong_auth_required_work_pin (3367491332598821552) -->
-    <skip />
-    <!-- no translation found for lockpassword_strong_auth_required_work_password (8159775129968582940) -->
-    <skip />
+    <string name="lockpassword_strong_auth_required_device_pattern" msgid="530802132223800623">"অতিরিক্ত নিরাপত্তার জন্য, আপনার ডিভাইসের প্যাটার্ন ব্যবহার করুন"</string>
+    <string name="lockpassword_strong_auth_required_device_pin" msgid="7829294830078036417">"অতিরিক্ত নিরাপত্তার জন্য, আপনার ডিভাইসের পিন লিখুন"</string>
+    <string name="lockpassword_strong_auth_required_device_password" msgid="3552644641574796973">"অতিরিক্ত নিরাপত্তার জন্য, আপনার ডিভাইসের পাসওয়ার্ড লিখুন"</string>
+    <string name="lockpassword_strong_auth_required_work_pattern" msgid="3003781907040522053">"অতিরিক্ত নিরাপত্তার জন্য, আপনার অফিসের প্যাটার্ন ব্যবহার করুন"</string>
+    <string name="lockpassword_strong_auth_required_work_pin" msgid="3367491332598821552">"অতিরিক্ত নিরাপত্তার জন্য, আপনার অফিসের পিন লিখুন"</string>
+    <string name="lockpassword_strong_auth_required_work_password" msgid="8159775129968582940">"অতিরিক্ত নিরাপত্তার জন্য, আপনার অফিসের পাসওয়ার্ড লিখুন"</string>
+    <string name="lockpassword_confirm_your_pattern_details_frp" msgid="6757336656791723193">"আপনার ফোন ফ্যাক্টরি সেটিংসে রিসেট করা হয়েছে। এই ফোনটি ব্যবহার করতে হলে, আপনার আগের প্যাটার্নটি দিন।"</string>
+    <string name="lockpassword_confirm_your_pin_details_frp" msgid="826520613445990470">"আপনার ফোন ফ্যাক্টরি সেটিংসে রিসেট করা হয়েছে। এই ফোনটি ব্যবহার করতে হলে আপনার আগের পিনটি লিখুন।"</string>
+    <string name="lockpassword_confirm_your_password_details_frp" msgid="8944081074615739040">"আপনার ফোন ফ্যাক্টরি সেটিংসে রিসেট করা হয়েছে। এই ফোনটি ব্যবহার করতে হলে, আপনার আগের পাসওয়ার্ডটি লিখুন।"</string>
+    <string name="lockpassword_confirm_your_pattern_header_frp" msgid="2898036091609128286">"প্যাটার্ন যাচাই করুন"</string>
+    <string name="lockpassword_confirm_your_pin_header_frp" msgid="4141601774778898803">"পিন যাচাই করুন"</string>
+    <string name="lockpassword_confirm_your_password_header_frp" msgid="3762615419295360480">"পাসওয়ার্ড যাচাই করুন"</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>
@@ -1511,8 +1523,8 @@
     <string name="lockpattern_settings_enable_summary" msgid="1165707416664252167">"স্ক্রীন আনলক করতে প্যাটার্ন আঁকা আবশ্যক"</string>
     <string name="lockpattern_settings_enable_visible_pattern_title" msgid="2615606088906120711">"প্যাটার্ন দৃশ্যমান করুন"</string>
     <string name="lockpattern_settings_enable_visible_pattern_title_profile" msgid="4864525074768391381">"প্রোফাইলের প্যাটার্ন দৃশ্যমান করুন"</string>
-    <string name="lockpattern_settings_enable_tactile_feedback_title" msgid="4389015658335522989">"আলতো চাপে কম্পন"</string>
-    <string name="lockpattern_settings_enable_power_button_instantly_locks" msgid="5735444062633666327">"পাওয়ার বোতাম চটপট লক হয়"</string>
+    <string name="lockpattern_settings_enable_tactile_feedback_title" msgid="4389015658335522989">"আলতো চাপে ভাইব্রেট"</string>
+    <string name="lockpattern_settings_enable_power_button_instantly_locks" msgid="5735444062633666327">"পাওয়ার বোতাম তৎক্ষণাৎ লক করে"</string>
     <string name="lockpattern_settings_power_button_instantly_locks_summary" msgid="8196258755143711694">"শুধুমাত্র <xliff:g id="TRUST_AGENT_NAME">%1$s</xliff:g> দ্বারা আনলক করে রেখে দেওয়ার সময় ছাড়া"</string>
     <string name="lockpattern_settings_choose_lock_pattern" msgid="1652352830005653447">"আনলক প্যাটার্ন সেট করুন"</string>
     <string name="lockpattern_settings_change_lock_pattern" msgid="1123908306116495545">"আনলক প্যাটার্ন পরিবর্তন করুন"</string>
@@ -1520,7 +1532,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>
@@ -1538,16 +1550,15 @@
     <string name="install_applications_title" msgid="4987712352256508946">"সব অ্যাপ্লিকেশান উৎসকে অনুমতি দিন"</string>
     <string name="recent_app_category_title" msgid="6673071268966003928">"সম্প্রতি চালু করা অ্যাপ"</string>
     <string name="see_all_apps_title" msgid="1317153498074308438">"<xliff:g id="COUNT">%1$d</xliff:g>টি অ্যাপের সবকটি দেখুন"</string>
-    <string name="recent_app_summary" msgid="3366446669844932300">"<xliff:g id="TIME">^1</xliff:g> আগে"</string>
     <string name="install_all_warning" product="tablet" msgid="8310489909586138165">"অজানা অ্যাপের দ্বারা আপনার ট্যাবলেট এবং ব্যক্তিগত তথ্য আক্রান্ত হওয়ার সম্ভাবনা সবচেয়ে বেশি। এই উৎস থেকে আসা অ্যাপগুলি ইনস্টল করে আপনি সম্মত হচ্ছেন যে সেগুলি ব্যবহারের ফলে আপনার ট্যাবলেটের কোনো ক্ষতি হলে বা ডেটা হারিয়ে গেলে তার জন্য আপনিই দায়ী থাকবেন।"</string>
     <string name="install_all_warning" product="default" msgid="1952257127370115988">"অজানা অ্যাপের দ্বারা আপনার ফোন এবং ব্যক্তিগত তথ্য আক্রান্ত হওয়ার সম্ভাবনা সবচেয়ে বেশি। এই উৎস থেকে আসা অ্যাপগুলি ইনস্টল করে আপনি সম্মত হচ্ছেন যে সেগুলি ব্যবহারের ফলে আপনার ফোনের কোনো ক্ষতি হলে বা ডেটা হারিয়ে গেলে তার জন্য আপনিই দায়ী থাকবেন।"</string>
     <string name="advanced_settings" msgid="1777249286757067969">"উন্নত সেটিংস"</string>
     <string name="advanced_settings_summary" msgid="4016682978071086747">"আরো সেটিংস বিকল্প সক্ষম করুন"</string>
-    <string name="application_info_label" msgid="5736524913065714880">"অ্যাপ্লিকেশান তথ্য"</string>
-    <string name="storage_label" msgid="8700867073480107253">"সঞ্চয়স্থান"</string>
+    <string name="application_info_label" msgid="5736524913065714880">"অ্যাপের তথ্য"</string>
+    <string name="storage_label" msgid="8700867073480107253">"স্টোরেজ"</string>
     <string name="auto_launch_label" msgid="2669236885531442195">"ডিফল্ট দ্বারা খোলে"</string>
     <string name="auto_launch_label_generic" msgid="3230569852551968694">"ডিফল্ট"</string>
-    <string name="screen_compatibility_label" msgid="663250687205465394">"স্ক্রীন সামঞ্জস্যতা"</string>
+    <string name="screen_compatibility_label" msgid="663250687205465394">"স্ক্রিন সামঞ্জস্যতা"</string>
     <string name="permissions_label" msgid="2605296874922726203">"অনুমতিগুলি"</string>
     <string name="cache_header_label" msgid="1877197634162461830">"ক্যাশে"</string>
     <string name="clear_cache_btn_text" msgid="5756314834291116325">"ক্যাশে সাফ করুন"</string>
@@ -1561,9 +1572,9 @@
     <string name="force_stop" msgid="7435006169872876756">"জোর করে বন্ধ করুন"</string>
     <string name="total_size_label" msgid="1048676419552557254">"সর্বমোট"</string>
     <string name="application_size_label" msgid="7376689739076506885">"অ্যাপের মাপ"</string>
-    <string name="external_code_size_label" msgid="3459343140355961335">"USB সঞ্চয়স্থান অ্যাপ্লিকেশান"</string>
+    <string name="external_code_size_label" msgid="3459343140355961335">"USB স্টোরেজ অ্যাপ্লিকেশন"</string>
     <string name="data_size_label" msgid="6117971066063850416">"ব্যবহারকারীর ডেটা"</string>
-    <string name="external_data_size_label" product="nosdcard" msgid="7533821466482000453">"USB সঞ্চয়স্থান ডেটা"</string>
+    <string name="external_data_size_label" product="nosdcard" msgid="7533821466482000453">"USB স্টোরেজ ডেটা"</string>
     <string name="external_data_size_label" product="default" msgid="626414192825329708">"SD কার্ড"</string>
     <string name="uninstall_text" msgid="3644892466144802466">"আনইনস্টল"</string>
     <string name="uninstall_all_users_text" msgid="851857393177950340">"সকল ব্যবহারকারীদের জন্য আনইনস্টল করুন"</string>
@@ -1587,24 +1598,24 @@
     <string name="default_emergency_app" msgid="1951760659640369980">"জরুরি অ্যাপ্লিকেশান"</string>
     <string name="reset_app_preferences" msgid="1321050641018356925">"অ্যাপ্লিকেশানগুলির পছন্দ আবার সেট করুন"</string>
     <string name="reset_app_preferences_title" msgid="6093179367325336662">"অ্যাপ্লিকেশানগুলির পছন্দ আবার সেট করবেন?"</string>
-    <string name="reset_app_preferences_desc" msgid="4822447731869201512">"এটি এইগুলির সমস্ত পছন্দ পরিবর্তন করবে:\n\n "<li>"অক্ষম করা অ্যাপ্লিকেশানগুলি"</li>\n" "<li>"অক্ষম করা অ্যাপ্লিকেশন বিজ্ঞপ্তিগুলি"</li>\n" "<li>"কার্যের জন্য ডিফল্ট অ্যাপ্লিকেশানগুলি"</li>\n" "<li>"অ্যাপ্লিকেশানগুলির জন্য পশ্চাদপট ডেটা সীমাবদ্ধগুলি"</li>\n" "<li>"যে কোনো অনুমতি সীমাবদ্ধগুলি"</li>\n\n" আপনি কোনো অ্যাপ্লিকেশন ডেটা হারাবেন না।"</string>
-    <string name="reset_app_preferences_button" msgid="2559089511841281242">"অ্যাপ্লিকেশানগুলি পুনরায় সেট করুন"</string>
-    <string name="manage_space_text" msgid="8852711522447794676">"স্থান পরিচালনা করুন"</string>
+    <string name="reset_app_preferences_desc" msgid="4822447731869201512">"এটি এইগুলির জন্য সমস্ত পছন্দ পরিবর্তন করবে:\n\n "<li>"অক্ষম করা অ্যাপ্লিকেশনগুলি"</li>\n" "<li>"অক্ষম করা অ্যাপ্লিকেশন বিজ্ঞপ্তিগুলি"</li>\n" "<li>"কার্যের জন্য ডিফল্ট অ্যাপ্লিকেশনগুলি"</li>\n" "<li>"অ্যাপ্লিকেশনগুলির জন্য ব্যাকগ্রাউন্ড ডেটা সীমাবদ্ধগুলি"</li>\n" "<li>"যে কোনও অনুমতি সীমাবদ্ধগুলি"</li>\n\n" আপনি কোনও অ্যাপ্লিকেশন ডেটা হারাবেন না।"</string>
+    <string name="reset_app_preferences_button" msgid="2559089511841281242">"অ্যাপ্লিকেশনগুলি পুনরায় সেট করুন"</string>
+    <string name="manage_space_text" msgid="8852711522447794676">"জায়গা পরিচালনা করুন"</string>
     <string name="filter" msgid="2018011724373033887">"ফিল্টার"</string>
     <string name="filter_dlg_title" msgid="8693024463731076091">"ফিল্টার বিকল্পগুলি বেছে নিন"</string>
     <string name="filter_apps_all" msgid="8899612398848280352">"সমস্ত অ্যাপ"</string>
     <string name="filter_apps_disabled" msgid="5862632369555319938">"অক্ষম করা অ্যাপগুলি"</string>
     <string name="filter_apps_third_party" msgid="7786348047690140979">"ডাউনলোড করা"</string>
     <string name="filter_apps_running" msgid="7767071454371350486">"চলমান"</string>
-    <string name="filter_apps_onsdcard" product="nosdcard" msgid="4843063154701023349">"USB সঞ্চয়স্থান"</string>
+    <string name="filter_apps_onsdcard" product="nosdcard" msgid="4843063154701023349">"USB স্টোরেজ"</string>
     <string name="filter_apps_onsdcard" product="default" msgid="1477351142334784771">"SD কার্ডে"</string>
     <string name="not_installed" msgid="2797554494953450291">"এই ব্যবহারকারীর জন্য ইনস্টল করা নেই"</string>
     <string name="installed" msgid="3070865169422600098">"ইনস্টল করা হয়েছে"</string>
     <string name="no_applications" msgid="7336588977497084921">"কোনো অ্যাপ্লিকেশান নেই"</string>
-    <string name="internal_storage" msgid="1584700623164275282">"অভ্যন্তরীণ সঞ্চয়স্থান"</string>
-    <string name="internal_storage_sentence" msgid="889098931914857143">"অভ্যন্তরীণ সঞ্চয়স্থান"</string>
-    <string name="sd_card_storage" product="nosdcard" msgid="2673203150465132465">"USB সঞ্চয়স্থান"</string>
-    <string name="sd_card_storage" product="default" msgid="7623513618171928235">"SD কার্ড সঞ্চয়স্থান"</string>
+    <string name="internal_storage" msgid="1584700623164275282">"ইন্টারনাল স্টোরেজ"</string>
+    <string name="internal_storage_sentence" msgid="889098931914857143">"ইন্টারনাল স্টোরেজ"</string>
+    <string name="sd_card_storage" product="nosdcard" msgid="2673203150465132465">"USB স্টোরেজ"</string>
+    <string name="sd_card_storage" product="default" msgid="7623513618171928235">"SD কার্ড স্টোরেজ"</string>
     <string name="recompute_size" msgid="7722567982831691718">"আকার আবার গণনা করা হচ্ছে..."</string>
     <string name="clear_data_dlg_title" msgid="5605258400134511197">"অ্যাপ্লিকেশান ডেটা মুছবেন?"</string>
     <string name="clear_data_dlg_text" msgid="3951297329833822490">"এই অ্যাপ্লিকেশানের সমস্ত ডেটা স্থায়ীভাবে মুছে যাবে। সমস্ত ফাইল, সেটিংস, অ্যাকাউন্ট, ডেটাবেস ইত্যাদি সবই।"</string>
@@ -1629,7 +1640,7 @@
     <string name="computing_size" msgid="1599186977475211186">"কম্পিউটিং..."</string>
     <string name="invalid_size_value" msgid="1582744272718752951">"প্যাকেজের মাপ গণনা করা যায়নি"</string>
     <string name="empty_list_msg" msgid="3552095537348807772">"আপনার কোনো তৃতীয় পক্ষের অ্যাপ্লিকেশান ইনস্টল করা নেই।"</string>
-    <string name="version_text" msgid="9189073826278676425">"সংস্করণ <xliff:g id="VERSION_NUM">%1$s</xliff:g>"</string>
+    <string name="version_text" msgid="9189073826278676425">"ভার্সন<xliff:g id="VERSION_NUM">%1$s</xliff:g>"</string>
     <string name="move_app" msgid="5042838441401731346">"সরান"</string>
     <string name="move_app_to_internal" product="tablet" msgid="2299714147283854957">"ট্যাবলেটে সরান"</string>
     <string name="move_app_to_internal" product="default" msgid="3895430471913858185">"ফোনে সরান"</string>
@@ -1637,7 +1648,7 @@
     <string name="move_app_to_sdcard" product="default" msgid="1143379049903056407">"SD কার্ডে সরান"</string>
     <string name="moving" msgid="6431016143218876491">"সরানো হচ্ছে"</string>
     <string name="another_migration_already_in_progress" msgid="7817354268848365487">"আরেকটি স্থানান্তরনের কাজ আগে থেকেই চলছে৷"</string>
-    <string name="insufficient_storage" msgid="481763122991093080">"পর্যাপ্ত সঞ্চয়স্থান নেই।"</string>
+    <string name="insufficient_storage" msgid="481763122991093080">"পর্যাপ্ত স্টোরেজ নেই।"</string>
     <string name="does_not_exist" msgid="1501243985586067053">"অ্যাপ্লিকেশানটি বিদ্যমান নেই।"</string>
     <string name="app_forward_locked" msgid="6331564656683790866">"অ্যাপ্লিকেশানটি অনুলিপি-সুরক্ষিত৷"</string>
     <string name="invalid_location" msgid="4354595459063675191">"ইনস্টল করা অবস্থান বৈধ নয়।"</string>
@@ -1647,7 +1658,7 @@
     <string name="force_stop_dlg_text" msgid="7208364204467835578">"আপনি একটি অ্যাপ্লিকেশানকে জোর করে বন্ধ করলে, তা অস্বাভাবিক ব্যবহার করতে পারে।"</string>
     <string name="move_app_failed_dlg_title" msgid="1282561064082384192"></string>
     <string name="move_app_failed_dlg_text" msgid="187885379493011720">"অ্যাপ্লিকেশান সরানো যায়নি। <xliff:g id="REASON">%1$s</xliff:g>"</string>
-    <string name="app_install_location_title" msgid="2068975150026852168">"পছন্দের ইনস্টল স্থান"</string>
+    <string name="app_install_location_title" msgid="2068975150026852168">"পছন্দের ইনস্টল লোকেশন"</string>
     <string name="app_install_location_summary" msgid="5155453752692959098">"নতুন অ্যাপ্লিকেশানগুলির জন্য পছন্দসই ইনস্টলেশানের অবস্থান পরিবর্তন করুন"</string>
     <string name="app_disable_dlg_title" msgid="3916469657537695436">"বিল্ট-ইন অ্যাপ্লিকেশান অক্ষম করবেন?"</string>
     <string name="app_disable_dlg_positive" msgid="7375627244201714263">"অ্যাপ্লিকেশান অক্ষম করুন"</string>
@@ -1657,15 +1668,15 @@
     <string name="app_disable_notifications_dlg_title" msgid="7669264654851761857">"বিজ্ঞপ্তিগুলি বন্ধ করবেন?"</string>
     <string name="app_disable_notifications_dlg_text" msgid="5088484670924769845">"আপনি যদি এই অ্যাপ্লিকেশানের জন্য বিজ্ঞপ্তিগুলিকে বন্ধ করনে তাহলে আপনি গুরুত্বপূর্ণ সতর্কতা এবং আপডেটগুলি নাও পেতে পারেন৷"</string>
     <string name="app_install_details_group_title" msgid="7084623031296083574">"স্টোর"</string>
-    <string name="app_install_details_title" msgid="6905279702654975207">"অ্যাপ্লিকেশানের বিশদ বিবরণ"</string>
+    <string name="app_install_details_title" msgid="6905279702654975207">"অ্যাপের বিশদ বিবরণ"</string>
     <string name="app_install_details_summary" msgid="6464796332049327547">"অ্যাপটিকে <xliff:g id="APP_STORE">%1$s</xliff:g> থেকে ইনস্টল করা হয়েছে"</string>
     <string name="instant_app_details_summary" msgid="4529934403276907045">"<xliff:g id="APP_STORE">%1$s</xliff:g> সম্পর্কে আরও তথ্য"</string>
     <string name="app_ops_settings" msgid="5108481883575527511">"অ্যাপ্লিকেশান ops"</string>
     <string name="app_ops_running" msgid="7706949900637284122">"চলমান"</string>
     <string name="app_ops_never_used" msgid="9114608022906887802">"(কখনো ব্যবহৃত হয়নি)"</string>
     <string name="no_default_apps" msgid="2915315663141025400">"কোনো ডিফল্ট অ্যাপ্লিকেশান নেই৷"</string>
-    <string name="storageuse_settings_title" msgid="5657014373502630403">"সঞ্চয়স্থান ব্যবহার"</string>
-    <string name="storageuse_settings_summary" msgid="3748286507165697834">"অ্যাপ্লিকেশান ব্যবহৃত সঞ্চয়স্থান দেখুন"</string>
+    <string name="storageuse_settings_title" msgid="5657014373502630403">"স্টোরেজ ব্যবহার"</string>
+    <string name="storageuse_settings_summary" msgid="3748286507165697834">"অ্যাপ্লিকেশন ব্যবহৃত স্টোরেজ দেখুন"</string>
     <string name="service_restarting" msgid="2242747937372354306">"পুনরায় আরম্ভ হচ্ছে"</string>
     <string name="cached" msgid="1059590879740175019">"ক্যাশে করা পশ্চাদপট প্রক্রিয়া"</string>
     <string name="no_running_services" msgid="2059536495597645347">"কিছুই চলছে না।"</string>
@@ -1686,7 +1697,7 @@
     <string name="running_processes_header_title" msgid="6588371727640789560">"ডিভাইস মেমরি"</string>
     <string name="running_processes_header_footer" msgid="723908176275428442">"অ্যাপ্লিকেশানের RAM ব্যবহার"</string>
     <string name="running_processes_header_system_prefix" msgid="6104153299581682047">"সিস্টেম"</string>
-    <string name="running_processes_header_apps_prefix" msgid="5787594452716832727">"অ্যাপ্লিকেশানগুলি"</string>
+    <string name="running_processes_header_apps_prefix" msgid="5787594452716832727">"অ্যাপ"</string>
     <string name="running_processes_header_free_prefix" msgid="4620613031737078415">"খালি"</string>
     <string name="running_processes_header_used_prefix" msgid="5924288703085123978">"ব্যবহৃত"</string>
     <string name="running_processes_header_cached_prefix" msgid="7950853188089434987">"ক্যাসে রাখা হয়েছে"</string>
@@ -1707,7 +1718,7 @@
     <string name="runningservicedetails_stop_dlg_title" msgid="4253292537154337233">"সিস্টেমের পরিষেবা বন্ধ করবেন?"</string>
     <string name="runningservicedetails_stop_dlg_text" product="tablet" msgid="3371302398335665793">"আপনি যদি এই পরিষেবা বন্ধ করেন তাহলে আপনার ট্যাবলেটের পাওয়ার বন্ধ করে আবার চালু না করা পর্যন্ত কিছু বৈশিষ্ট্য সঠিকভাবে কাজ করা বন্ধ করে দিতে পারে।"</string>
     <string name="runningservicedetails_stop_dlg_text" product="default" msgid="3920243762189484756">"আপনি যদি এই পরিষেবা বন্ধ করেন তাহলে আপনার ফোনের পাওয়ার বন্ধ করে আবার চালু না করা পর্যন্ত কিছু বৈশিষ্ট্য সঠিকভাবে কাজ করা বন্ধ করে দিতে পারে।"</string>
-    <string name="language_input_gesture_title" msgid="8749227808244881255">"ভাষা, ইনপুট ও অঙ্গভঙ্গি"</string>
+    <string name="language_input_gesture_title" msgid="8749227808244881255">"ভাষা, ইনপুট ও ইঙ্গিত"</string>
     <string name="language_input_gesture_summary_on_with_assist" msgid="7219895055450633449"></string>
     <string name="language_input_gesture_summary_on_non_assist" msgid="756147879200943161"></string>
     <string name="language_input_gesture_summary_off" msgid="4617198819416948217"></string>
@@ -1726,7 +1737,7 @@
     <string name="auto_punctuate_summary" msgid="4372126865670574837">"\"।\" প্রবেশ করাতে দুইবার \'স্পেস\' কী টিপুন"</string>
     <string name="show_password" msgid="4837897357002495384">"পাসওয়ার্ড দেখুন"</string>
     <string name="show_password_summary" msgid="3365397574784829969">"টাইপ করার সময় অক্ষরগুলি কয়েক মুহূর্তের জন্য দেখুন"</string>
-    <string name="spellchecker_security_warning" msgid="9060897418527708922">"এই বানান পরীক্ষকটি হয়তো পাসওয়ার্ড এবং ক্রেডিট কার্ড নম্বর সহ আপনার টাইপ করা সমস্ত পাঠ্য সংগ্রহ করতে সক্ষম হতে পারে। এটি <xliff:g id="SPELLCHECKER_APPLICATION_NAME">%1$s</xliff:g> অ্যাপ্লিকেশানের। এই বানান পরীক্ষকটি ব্যবহার করবেন?"</string>
+    <string name="spellchecker_security_warning" msgid="9060897418527708922">"এই বানান পরীক্ষকটি হয়তো পাসওয়ার্ড এবং ক্রেডিট কার্ড নম্বর সহ আপনার টাইপ করা সমস্ত টেক্সট সংগ্রহ করতে সক্ষম হতে পারে। এটি <xliff:g id="SPELLCHECKER_APPLICATION_NAME">%1$s</xliff:g> অ্যাপ থেকে এসেছে। এই বানান পরীক্ষকটি ব্যবহার করবেন?"</string>
     <string name="spellchecker_quick_settings" msgid="246728645150092058">"সেটিংস"</string>
     <string name="spellchecker_language" msgid="6041050114690541437">"ভাষা"</string>
     <string name="keyboard_and_input_methods_category" msgid="6035224122054465137">"কিবোর্ড এবং ইনপুট"</string>
@@ -1735,7 +1746,7 @@
     <string name="add_virtual_keyboard" msgid="3302152381456516928">"কীবোর্ডগুলি পরিচালনা করুন"</string>
     <string name="keyboard_assistance_category" msgid="5843634175231134014">"কীবোর্ড সহায়তা"</string>
     <string name="physical_keyboard_title" msgid="8285149877925752042">"ফিজিক্যাল কীবোর্ড"</string>
-    <string name="show_ime" msgid="2658582193437188227">"ভার্চুয়াল কীবোর্ড দেখান"</string>
+    <string name="show_ime" msgid="2658582193437188227">"ভার্চুয়াল কীবোর্ড দেখুন"</string>
     <string name="show_ime_summary" msgid="8164993045923240698">"ফিজিক্যাল কীবোর্ড সক্রিয় থাকার সময় এটিকে স্ক্রীনে রাখুন"</string>
     <string name="keyboard_shortcuts_helper" msgid="4839453720463798145">"কীবোর্ড শর্টকাট সাহায্যকারী"</string>
     <string name="keyboard_shortcuts_helper_summary" msgid="5871299901459743288">"উপলব্ধ শর্টকাটগুলি দেখান"</string>
@@ -1765,7 +1776,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>
@@ -1775,19 +1786,19 @@
     <string name="input_method" msgid="5434026103176856164">"ইনপুট পদ্ধতি"</string>
     <string name="current_input_method" msgid="2636466029213488159">"বর্তমান কীবোর্ড"</string>
     <string name="input_method_selector" msgid="4311213129681430709">"ইনপুট পদ্ধতি নির্বাচক"</string>
-    <string name="input_method_selector_show_automatically_title" msgid="1001612945471546158">"স্বয়ংক্রিয়"</string>
+    <string name="input_method_selector_show_automatically_title" msgid="1001612945471546158">"অটোমেটিক"</string>
     <string name="input_method_selector_always_show_title" msgid="3891824124222371634">"সবসময় দেখান"</string>
     <string name="input_method_selector_always_hide_title" msgid="7699647095118680424">"সর্বদা লুকান"</string>
     <string name="configure_input_method" msgid="1317429869771850228">"ইনপুট পদ্ধতিগুলি সেট আপ করুন"</string>
     <string name="input_method_settings" msgid="5801295625486269553">"সেটিংস"</string>
     <string name="input_method_settings_button" msgid="6778344383871619368">"সেটিংস"</string>
     <string name="input_methods_settings_label_format" msgid="6002887604815693322">"<xliff:g id="IME_NAME">%1$s</xliff:g> সেটিংস"</string>
-    <string name="input_methods_and_subtype_enabler_title" msgid="4421813273170250462">"সক্রিয় ইনপুট পদ্ধতিগুলি নির্বাচন করুন"</string>
-    <string name="onscreen_keyboard_settings_summary" msgid="5841558383556238653">"অন-স্ক্রীন কীবোর্ড সেটিংস"</string>
+    <string name="input_methods_and_subtype_enabler_title" msgid="4421813273170250462">"সক্রিয় ইনপুট পদ্ধতিগুলি বেছে নিন"</string>
+    <string name="onscreen_keyboard_settings_summary" msgid="5841558383556238653">"অন-স্ক্রিন কীবোর্ড সেটিংস"</string>
     <string name="builtin_keyboard_settings_title" msgid="7688732909551116798">"ফিজিক্যাল কীবোর্ড"</string>
     <string name="builtin_keyboard_settings_summary" msgid="2392531685358035899">"ফিজিক্যাল কীবোর্ড সেটিংস"</string>
     <string name="gadget_picker_title" msgid="98374951396755811">"গ্যাজেট চয়ন করুন"</string>
-    <string name="widget_picker_title" msgid="9130684134213467557">"উইজেট নির্বাচন করুন"</string>
+    <string name="widget_picker_title" msgid="9130684134213467557">"উইজেট বেছে নিন"</string>
     <string name="allow_bind_app_widget_activity_allow_bind_title" msgid="2538303018392590627">"উইজেট তৈরি করে ব্যবহারের অনুমতি দেবেন?"</string>
     <string name="allow_bind_app_widget_activity_allow_bind" msgid="1584388129273282080">"উইজেট তৈরি করার পরে, <xliff:g id="WIDGET_HOST_NAME">%1$s</xliff:g> যে ডেটাগুলি প্রদর্শন করে তা অ্যাক্সেস করতে পারবে।"</string>
     <string name="allow_bind_app_widget_activity_always_allow_bind" msgid="7037503685859688034">"উইজেট তৈরি করতে এবং তাদের ডেটা অ্যাক্সেস করতে <xliff:g id="WIDGET_HOST_NAME">%1$s</xliff:g> কে সর্বদা অনুমতি দিন"</string>
@@ -1802,7 +1813,7 @@
     <string name="accessibility_settings_summary" msgid="981260486011624939">"স্ক্রিন রিডার, ডিসপ্লে, ইন্টারঅ্যাকশন নিয়ন্ত্রণগুলি"</string>
     <string name="vision_settings_title" msgid="4204111425716868288">"দৃষ্টিশক্তি সেটিংস"</string>
     <string name="vision_settings_description" msgid="5679491180156408260">"আপনি এই ডিভাইসটি নিজের পছন্দমত সেট করতে পারেন৷ এই অ্যাক্সেসযোগ্যতার বৈশিষ্ট্যগুলি পরে সেটিংসে গিয়ে পরিবর্তন করা যাবে৷"</string>
-    <string name="vision_settings_suggestion_title" msgid="917294957154878441">"ফন্ট বড় করুন"</string>
+    <string name="vision_settings_suggestion_title" msgid="8058794060304707004">"হরফের মাপ পরিবর্তন করুন"</string>
     <string name="screen_reader_category_title" msgid="7739154903913400641">"স্ক্রিন রিডার"</string>
     <string name="audio_and_captions_category_title" msgid="3420727114421447524">"অডিও এবং অন-স্ক্রিন পাঠ্য"</string>
     <string name="display_category_title" msgid="685461049938269166">"ডিসপ্লে"</string>
@@ -1815,18 +1826,18 @@
     <string name="accessibility_captioning_title" msgid="7589266662024836291">"ক্যাপশান"</string>
     <string name="accessibility_screen_magnification_title" msgid="6001128808776506021">"বড় করে দেখা"</string>
     <string name="accessibility_screen_magnification_gestures_title" msgid="3719929521571489913">"তিনবার ট্যাপ করে বড় করে দেখুন"</string>
-    <string name="accessibility_screen_magnification_navbar_title" msgid="7141753038957538230">"বোতাম দিয়ে ম্যাগনিফাই করুন"</string>
-    <string name="accessibility_screen_magnification_state_navbar_gesture" msgid="2760906043221923793">"বোতাম এবং তিনবার ট্যাপ করার মাধ্যমে ম্যাগনিফাই করুন"</string>
+    <string name="accessibility_screen_magnification_navbar_title" msgid="7141753038957538230">"বোতাম দিয়ে বড় করুন"</string>
+    <string name="accessibility_screen_magnification_state_navbar_gesture" msgid="2760906043221923793">"বোতাম এবং তিনবার আলতো চাপার মাধ্যমে বড় করুন"</string>
     <string name="accessibility_preference_magnification_summary" msgid="5867883657521404509">"স্ক্রিনে জুম বাড়ান"</string>
     <string name="accessibility_screen_magnification_short_summary" msgid="3411979839172752057">"জুম করতে ৩ বার আলতো চাপ দিন"</string>
     <string name="accessibility_screen_magnification_navbar_short_summary" msgid="3693116360267980492">"জুম করার জন্য বোতামে ট্যাপ করুন"</string>
     <string name="accessibility_screen_magnification_summary" msgid="5258868553337478505"><b>"জুম করার জন্য"</b>" স্ক্রিনে ৩ বার দ্রুত ট্যাপ করুন।\n"<ul><li>"স্ক্রল করতে ২টি বা তার বেশি আঙ্গুল টেনে নিয়ে যান"</li>\n<li>"জুমের সমন্বয়ের জন্য ২টি বা তার বেশি আঙ্গুল ব্যবহার করুন"</li></ul>\n\n<b>" অস্থায়ী জুমের জন্য"</b>" স্ক্রিনে দ্রুত ৩ বার ট্যাপ করুন এবং তৃতীয় বার ট্যাপ করার সময় আঙ্গুলটি দিয়ে টিপে ধরুন।\n"<ul><li>"স্ক্রিনের উপরে বিভিন্ন দিকে যাওয়ার জন্য আঙ্গুল টেনে নিয়ে যান"</li>\n<li>"জুম কম করতে আঙ্গুল সরিয়ে নিন"</li></ul>\n\n"কিবোর্ডে অথবা নেভিগেশন বারে জুম করতে পারবেন না।"</string>
-    <string name="accessibility_screen_magnification_navbar_summary" msgid="1996584694050087161">"যখন ম্যাগনিফিকেশন চালু থাকবে তখন দ্রুত ম্যাগনিফাই করতে স্ক্রিনের মাঝখানের অ্যাক্সেসযোগ্যতা বোতামটি ব্যবহার করুন। \n\n"<b>" জুমের জন্য"</b>", অ্যাক্সেসযোগ্যতা বোতামটি ট্যাপ করুন, তারপর স্ক্রিনের যেকোনো জায়গায় ট্যাপ করুন।\n"<ul><li>"স্ক্রল করতে ২টি বা তার বেশি আঙ্গুল টেনে নিয়ে যান"</li>\n<li>" জুমের সমন্বয়ের জন্য ২ বা তার বেশি আঙ্গুল ব্যবহার করুন "</li></ul>\n\n<b>" অস্থায়ীভাবে জুমের জন্য"</b>"অ্যাক্সেসযোগ্যতা বোতামটি ট্যাপ করুন, তারপর স্ক্রিনের যেকোনো জায়গায় স্পর্শ করে টিপে ধরুন।\n"<ul><li>"স্ক্রিনের উপরে বিভিন্ন দিকে যাওয়ার জন্য আঙ্গুল টেনে নিয়ে যান"</li>\n<li>"জুম কম করতে আঙ্গুল সরিয়ে নিন"</li></ul>\n\n"কিবোর্ডে অথবা নেভিগেশন বারে জুম করতে পারবেন না।"</string>
-    <string name="accessibility_screen_magnification_navbar_configuration_warning" msgid="70533120652758190">"অ্যাক্সেসযোগ্যতা বোতামটি <xliff:g id="SERVICE">%1$s</xliff:g> এর সাথে সেট করা আছে। ম্যগ্নিফিকেশন ব্যবহার করার জন্য অ্যাক্সেসযোগ্যতা বোতামটি স্পর্শ করে টিপে ধরুন, তারপর ম্যাগনিফিকেশন বেছে নিন।"</string>
+    <string name="accessibility_screen_magnification_navbar_summary" msgid="1996584694050087161">"যখন ম্যাগনিফিকেশন চালু থাকবে তখন দ্রুত ম্যাগনিফাই করতে স্ক্রিনের মাঝখানের অ্যাক্সেসযোগ্যতা বোতামটি ব্যবহার করুন। \n\n"<b>"জুমের জন্য"</b>", অ্যাক্সেসযোগ্যতা বোতামটি ট্যাপ করুন, তারপর স্ক্রিনের যেকোনও জায়গায় ট্যাপ করুন।\n"<ul><li>"স্ক্রল করতে ২টি বা তার বেশি আঙ্গুল টেনে নিয়ে যান"</li>\n<li>"জুমের সমন্বয়ের জন্য ২ বা তার বেশি আঙ্গুল ব্যবহার করুন "</li></ul>\n\n<b>"অস্থায়ীভাবে জুমের জন্য"</b>"অ্যাক্সেসযোগ্যতা বোতামটি ট্যাপ করুন, তারপর স্ক্রিনের যেকোনও জায়গায় স্পর্শ করে টিপে ধরুন।\n"<ul><li>"স্ক্রিনের উপরে বিভিন্ন দিকে যাওয়ার জন্য আঙ্গুল টেনে নিয়ে যান"</li>\n<li>"জুম কম করতে আঙ্গুল সরিয়ে নিন"</li></ul>\n\n"কিবোর্ডে অথবা নেভিগেশন বারে জুম করতে পারবেন না।"</string>
+    <string name="accessibility_screen_magnification_navbar_configuration_warning" msgid="70533120652758190">"অ্যাক্সেসযোগ্যতা বোতামটি <xliff:g id="SERVICE">%1$s</xliff:g> এর সাথে সেট করা আছে। ম্যাগনিফিকেশন ব্যবহার করার জন্য অ্যাক্সেসযোগ্যতা বোতামটি স্পর্শ করে টিপে ধরুন, তারপর ম্যাগনিফিকেশন বেছে নিন।"</string>
     <string name="accessibility_global_gesture_preference_title" msgid="2048884356166982714">"ভলিউম কী শর্টকাট"</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="1765853731190717372">"যখন শর্টকাটটি চালু থাকবে, তখন দুটি ভলিউম কী ৩ সেকেন্ডের জন্য চেপে ধরে রেখে আপনি কোনও অ্যাক্সেসযোগ্যতা বৈশিষ্ট্য চালু করতে পারেন।"</string>
+    <string name="accessibility_shortcut_description" msgid="1765853731190717372">"যখন শর্টকাটটি চালু থাকবে, তখন দুটি ভলিউম বোতাম ৩ সেকেন্ডের জন্য চেপে ধরে রেখে আপনি কোনও অ্যাক্সেসযোগ্যতা বৈশিষ্ট্য চালু করতে পারেন।"</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>
@@ -1839,7 +1850,6 @@
     <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="preference_summary_default_combination" msgid="8532964268242666060">"<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>
@@ -1867,7 +1877,7 @@
     <string name="accessibility_menu_item_settings" msgid="3344942964710773365">"সেটিংস"</string>
     <string name="accessibility_feature_state_on" msgid="2864292320042673806">"চালু করুন"</string>
     <string name="accessibility_feature_state_off" msgid="4172584906487070211">"বন্ধ করুন"</string>
-    <string name="captioning_preview_title" msgid="1234015253497016890">"পূর্বরূপ"</string>
+    <string name="captioning_preview_title" msgid="1234015253497016890">"প্রিভিউ"</string>
     <string name="captioning_standard_options_title" msgid="3284211791180335844">"মানক বিকল্পগুলি"</string>
     <string name="captioning_locale" msgid="4559155661018823503">"ভাষা"</string>
     <string name="captioning_text_size" msgid="6737002449104466028">"পাঠ্য আকার"</string>
@@ -1875,13 +1885,13 @@
     <string name="captioning_custom_options_title" msgid="5067500939930322405">"কাস্টম বিকল্পগুলি"</string>
     <string name="captioning_background_color" msgid="9053011212948992570">"পশ্চাদপটের রঙ"</string>
     <string name="captioning_background_opacity" msgid="6029993616419971202">"পশ্চাদপট অস্পষ্টতা"</string>
-    <string name="captioning_window_color" msgid="6902052743419717394">"আখ্যান দেওয়ার উইন্ডোর রঙ"</string>
+    <string name="captioning_window_color" msgid="6902052743419717394">"শিরোনাম দেওয়ার উইন্ডোর রঙ"</string>
     <string name="captioning_window_opacity" msgid="5041556024849862376">"ক্যাপশান দেওয়া উইন্ডোর অস্বচ্ছতা"</string>
     <string name="captioning_foreground_color" msgid="85623486537640059">"পাঠ্যের রঙ"</string>
     <string name="captioning_foreground_opacity" msgid="4370967856995419788">"পাঠ্য অস্পষ্টতা"</string>
     <string name="captioning_edge_color" msgid="3670094753735263238">"এজ রঙ"</string>
     <string name="captioning_edge_type" msgid="5997247394951682154">"এজ প্রকার"</string>
-    <string name="captioning_typeface" msgid="1826169240566563259">"হরফ পরিবার"</string>
+    <string name="captioning_typeface" msgid="1826169240566563259">"ফন্ট ফ্যামিলি"</string>
     <string name="captioning_preview_text" msgid="4067935959797375065">"ক্যাপশান দেওয়া থাকলে এমন দেখায়"</string>
     <string name="captioning_preview_characters" msgid="7105909138497851769">"Aa"</string>
     <string name="locale_default" msgid="2593883646136326969">"ডিফল্ট"</string>
@@ -1900,8 +1910,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>
@@ -1932,12 +1942,12 @@
     <string name="print_feature_state_off" msgid="7294876968403966040">"বন্ধ করুন"</string>
     <string name="print_menu_item_add_service" msgid="3811645167869797802">"Add service"</string>
     <string name="print_menu_item_add_printer" msgid="8251218970577291032">"মুদ্রক যোগ করুন"</string>
-    <string name="print_menu_item_search" msgid="7025589328240514553">"অনুসন্ধান করুন"</string>
+    <string name="print_menu_item_search" msgid="7025589328240514553">"খুঁজুন"</string>
     <string name="print_searching_for_printers" msgid="4680248496457576358">"মুদ্রকগুলি অনুসন্ধান করা হচ্ছে"</string>
     <string name="print_service_disabled" msgid="7739452396114245222">"পরিষেবা অক্ষমিত"</string>
     <string name="print_print_jobs" msgid="3582094777756968793">"প্রিন্ট কাজগুলি"</string>
     <string name="print_print_job" msgid="7563741676053287211">"প্রিন্ট কাজ"</string>
-    <string name="print_restart" msgid="8373999687329384202">"পুনর্সূচনা"</string>
+    <string name="print_restart" msgid="8373999687329384202">"রিস্টার্ট করুন"</string>
     <string name="print_cancel" msgid="3621199386568672235">"বাতিল"</string>
     <string name="print_job_summary" msgid="8472427347192930694">"<xliff:g id="PRINTER">%1$s</xliff:g>\n<xliff:g id="TIME">%2$s</xliff:g>"</string>
     <string name="print_printing_state_title_template" msgid="5736107667714582025">"<xliff:g id="PRINT_JOB_NAME">%1$s</xliff:g> প্রিন্ট করা হচ্ছে"</string>
@@ -1958,12 +1968,14 @@
     <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_whitelisted" msgid="7375400051141016808">"অ্যাপটিকে সীমিত ব্যাটারি ব্যবহার করার জন্য অপ্টিমাইজ করা যাবে না"</string>
+    <string name="background_activity_warning_dialog_title" msgid="2216249969149568871">"ব্যাকগ্রাউন্ড কার্যকলাপ সীমিত করবেন?"</string>
+    <string name="background_activity_warning_dialog_text" msgid="7049624449246121981">"কোনও অ্যাপের ব্যাকগ্রাউন্ড কার্যকলাপ সীমিত করলে তা সঠিক ভাবে কাজ নাও করতে পারে"</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" msgid="6393929085382334341">"সম্পূর্ণ চার্জ করার সময় থেকে অ্যাপের ব্যবহার (<xliff:g id="RELATIVE_TIME">^1</xliff:g>)"</string>
+    <string name="power_usage_list_summary_device" msgid="4461926045610455423">"সম্পূর্ণ চার্জ করার সময় থেকে ডিভাইসের ব্যবহার (<xliff:g id="RELATIVE_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>
@@ -2023,7 +2035,7 @@
     <string name="power_idle" product="default" msgid="9055659695602194990">"ফোন নিষ্ক্রিয়"</string>
     <string name="power_unaccounted" msgid="709925017022660740">"বিবিধ"</string>
     <string name="power_overcounted" msgid="2762354976171358445">"নির্ধারিত থেকে বেশী"</string>
-    <string name="power_apps" msgid="2043554781293951327">"অ্যাপগুলি"</string>
+    <string name="power_apps" msgid="2043554781293951327">"অ্যাপ"</string>
     <string name="power_service" msgid="1599661212370831780">"পরিষেবাগুলি"</string>
     <string name="power_system" msgid="8290455327965307383">"সিস্টেম"</string>
     <string name="power_user" msgid="3706143225319881667">"অন্যান্য ব্যবহারকারী"</string>
@@ -2049,7 +2061,7 @@
     <string name="usage_type_computed_power" msgid="5862792259009981479">"শক্তির নির্ণিত ব্যবহার"</string>
     <string name="usage_type_actual_power" msgid="7047814738685578335">"শক্তির নিরীক্ষিত ব্যবহার"</string>
     <string name="battery_action_stop" msgid="649958863744041872">"জোর করে বন্ধ করুন"</string>
-    <string name="battery_action_app_details" msgid="7861051816778419018">"অ্যাপ্লিকেশান তথ্য"</string>
+    <string name="battery_action_app_details" msgid="7861051816778419018">"অ্যাপের তথ্য"</string>
     <string name="battery_action_app_settings" msgid="4570481408106287454">"অ্যাপ্লিকেশান সেটিংস"</string>
     <string name="battery_action_display" msgid="7338551244519110831">"স্ক্রীন সেটিংস"</string>
     <string name="battery_action_wifi" msgid="8181553479021841207">"ওয়াই-ফাই সেটিংস"</string>
@@ -2070,7 +2082,7 @@
     <string name="battery_sugg_bluetooth_headset" msgid="4071352514714259230">"একটি ভিন্ন ব্লুটুথ ডিভাইসের সাথে সংযোগ করে দেখুন"</string>
     <string name="battery_desc_apps" msgid="8530418792605735226">"অ্যাপ্লিকেশান দ্বারা ব্যবহৃত ব্যাটারি"</string>
     <string name="battery_sugg_apps_info" msgid="6907588126789841231">"অ্যাপ্লিকেশানটি বন্ধ করুন অথবা আনইনস্টল করুন"</string>
-    <string name="battery_sugg_apps_gps" msgid="5959067516281866135">"ব্যাটারি সংরক্ষণ মোড নির্বাচন করুন"</string>
+    <string name="battery_sugg_apps_gps" msgid="5959067516281866135">"ব্যাটারি সংরক্ষণ মোড বেছে নিন"</string>
     <string name="battery_sugg_apps_settings" msgid="3974902365643634514">"অ্যাপ্লিকেশান ব্যাটারি ব্যবহার কমানোর জন্য সেটিংসের প্রস্তাব দিতে পারে"</string>
     <string name="battery_desc_users" msgid="7682989161885027823">"ব্যবহারকারী দ্বারা ব্যবহৃত ব্যাটারি"</string>
     <string name="battery_desc_unaccounted" msgid="7404256448541818019">"শক্তির বিবিধ ব্যবহার"</string>
@@ -2139,7 +2151,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>
@@ -2187,17 +2199,17 @@
     <string name="gadget_brightness_state_half" msgid="3696671957608774204">"অর্ধ"</string>
     <string name="gadget_brightness_state_off" msgid="946382262872753084">"বন্ধ"</string>
     <string name="vpn_settings_title" msgid="5662579425832406705">"VPN"</string>
-    <string name="credentials_title" msgid="4446234003860769883">"ক্রেডেনশিয়াল সঞ্চয়স্থান"</string>
-    <string name="credentials_install" product="nosdcard" msgid="466093273825150847">"সঞ্চয়স্থান থেকে ইনস্টল করুন"</string>
+    <string name="credentials_title" msgid="4446234003860769883">"ক্রেডেনশিয়াল স্টোরেজ"</string>
+    <string name="credentials_install" product="nosdcard" msgid="466093273825150847">"স্টোরেজ থেকে ইনস্টল করুন"</string>
     <string name="credentials_install" product="default" msgid="953914549998062317">"SD কার্ড থেকে ইনস্টল করুন"</string>
-    <string name="credentials_install_summary" product="nosdcard" msgid="4220422806818210676">"সঞ্চয়স্থান থেকে শংসাপত্র ইনস্টল করুন"</string>
-    <string name="credentials_install_summary" product="default" msgid="5737658257407822713">"SD কার্ড থেকে শংসাপত্র ইনস্টল করুন"</string>
+    <string name="credentials_install_summary" product="nosdcard" msgid="4220422806818210676">"স্টোরেজ থেকে সার্টিফিকেট ইনস্টল করুন"</string>
+    <string name="credentials_install_summary" product="default" msgid="5737658257407822713">"এসডি কার্ড থেকে সার্টিফিকেট ইনস্টল করুন"</string>
     <string name="credentials_reset" msgid="3239382277144980418">"ক্রেডেনশিয়াল সাফ করুন"</string>
-    <string name="credentials_reset_summary" msgid="3369361230171260282">"সব শংসাপত্র সরান"</string>
+    <string name="credentials_reset_summary" msgid="3369361230171260282">"সব সার্টিফিকেট সরান"</string>
     <string name="trusted_credentials" msgid="4266945289534242402">"বিশ্বস্ত ক্রেডেনশিয়াল"</string>
     <string name="trusted_credentials_summary" msgid="6735221351155686632">"বিশ্বস্ত CA শংসাপত্রগুলি প্রদর্শন করুন"</string>
-    <string name="user_credentials" msgid="3719013347787187083">"ব্যবহারকারীর শংসাপত্র"</string>
-    <string name="user_credentials_summary" msgid="7271228342106080167">"সংরক্ষিত শংসাপত্র দেখুন এবং সংশোধন করুন"</string>
+    <string name="user_credentials" msgid="3719013347787187083">"ব্যবহারকারীর সার্টিফিকেট"</string>
+    <string name="user_credentials_summary" msgid="7271228342106080167">"সংরক্ষিত সার্টিফিকেট দেখুন এবং সংশোধন করুন"</string>
     <string name="advanced_security_title" msgid="2434776238010578865">"উন্নত"</string>
     <string name="credential_storage_type" msgid="8629968543494001364">"সঞ্চয়স্থানের প্রকার"</string>
     <string name="credential_storage_type_hardware" msgid="6077193544333904427">"হার্ডওয়্যার-ব্যাকড"</string>
@@ -2208,19 +2220,19 @@
     <string name="credentials_unlock" msgid="385427939577366499"></string>
     <string name="credentials_unlock_hint" msgid="2301301378040499348">"প্রমাণপত্রাদির সঞ্চয়স্থানের জন্য পাসওয়ার্ডটি টাইপ করুন।"</string>
     <string name="credentials_old_password" msgid="7553393815538684028">"বর্তমান পাসওয়ার্ড:"</string>
-    <string name="credentials_reset_hint" msgid="6297256880896133631">"সমস্ত সামগ্রী সরাবেন?"</string>
-    <string name="credentials_password_too_short" msgid="7502749986405522663">"পাসওয়ার্ড কমপক্ষে ৮টি অক্ষরের হতে হবে।"</string>
+    <string name="credentials_reset_hint" msgid="6297256880896133631">"সমস্ত কন্টেন্ট সরাবেন?"</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="8058230497337529036">"আপনি ক্রেডেনশিয়াল স্টোরেজ ব্যবহার করার আগে আপনার ডিভাইসে একটি সুরক্ষিত লক স্ক্রিন থাকতে হবে"</string>
+    <string name="credentials_configure_lock_screen_button" msgid="253239765216055321">"লক সেট করুন"</string>
     <string name="usage_access_title" msgid="332333405495457839">"ব্যবহারের অ্যাক্সেস যুক্ত অ্যাপ্স"</string>
     <string name="emergency_tone_title" msgid="1055954530111587114">"জরুরি টোন"</string>
     <string name="emergency_tone_summary" msgid="722259232924572153">"জরুরি কল স্থাপন করা সময় কি ধরণের কার্যকলাপ করবে তা সেট করুন"</string>
-    <string name="privacy_settings_title" msgid="2978878794187459190">"ব্যাক আপ"</string>
+    <string name="privacy_settings_title" msgid="2978878794187459190">"ব্যাক-আপ"</string>
     <string name="backup_section_title" msgid="7952232291452882740">"ব্যাকআপ ও পুনরুদ্ধার"</string>
     <string name="personal_data_section_title" msgid="7815209034443782061">"ব্যক্তিগত ডেটা"</string>
     <string name="backup_data_title" msgid="1239105919852668016">"আমার তথ্য ব্যাকআপ করুন"</string>
@@ -2228,13 +2240,13 @@
     <string name="backup_configure_account_title" msgid="3790872965773196615">"ব্যাকআপ অ্যাকাউন্ট"</string>
     <string name="include_app_data_title" msgid="2829970132260278394">"অ্যাপ্লিকেশান ডেটা অন্তর্ভুক্ত করুন"</string>
     <string name="auto_restore_title" msgid="5397528966329126506">"স্বয়ংক্রিয়ভাবে পুনঃস্থাপন করুন"</string>
-    <string name="auto_restore_summary" msgid="4235615056371993807">"অ্যাপ্লিকেশান পুনরায় ইনস্টল করার সময়, ব্যাক আপ সেটিংস এবং ডেটা পুনরুদ্ধার করুন"</string>
+    <string name="auto_restore_summary" msgid="4235615056371993807">"অ্যাপ পুনরায় ইনস্টল করার সময়, ব্যাক-আপ সেটিংস এবং ডেটা পুনরুদ্ধার করুন"</string>
     <string name="backup_inactive_title" msgid="685838037986644604">"ব্যাকঅ্যাপ সার্ভিস সক্রিয় নয়"</string>
-    <string name="backup_configure_account_default_summary" msgid="2436933224764745553">"কোনো অ্যাকাউন্ট বর্তমানে ব্যাক আপ ডেটা সংরক্ষণ করছে না"</string>
+    <string name="backup_configure_account_default_summary" msgid="2436933224764745553">"কোনও অ্যাকাউন্ট বর্তমানে ব্যাক-আপ ডেটা মজুত রাখছে না"</string>
     <string name="backup_erase_dialog_title" msgid="1027640829482174106"></string>
-    <string name="backup_erase_dialog_message" msgid="5221011285568343155">"আপনার ওয়াই-ফাই পাসওয়ার্ড, বুকমার্ক, অন্যান্য সেটিংস, এবং অ্যাপ্লিকেশান ডেটা ব্যাক আপ করা বন্ধ করুন, এছাড়াও Google সার্ভারগুলিতে সব অনুলিপি মুছে ফেলতে চান?"</string>
-    <string name="fullbackup_erase_dialog_message" msgid="694766389396659626">"ডিভাইস ডেটা (যেমন ওয়াই-ফাই এর পাসওয়ার্ড এবং কলের ইতিহাস) এবং অ্যাপ্লিকেশান ডেটা (যেমন অ্যাপ্লিকেশানগুলির দ্বারা সংরক্ষিত সেটিংস এবং ফাইলগুলি) এর ব্যাক আপ নেওয়া বন্ধ করবেন, তার সাথে দূরবর্তী সার্ভারে সমস্ত প্রতিলিপি মুছবেন?"</string>
-    <string name="fullbackup_data_summary" msgid="960850365007767734">"দূরবর্তীভাবে ডিভাইস ডেটার (যেমন, ওয়াই-ফাই এর পাসওয়ার্ডগুলি এবং কলের ইতিহাস) এবং অ্যাপ্লিকেশান ডেটার (যেমন অ্যাপ্লিকেশানগুলির দ্বারা সঞ্চিত সেটিংস এবং ফাইলগুলি)স্বয়ংক্রিয়ভাবে ব্যাক আপ নেওয়া হয়৷\n\nআপনি যখন স্বয়ংক্রিয় ব্যাক আপ চালু করুন তখন দূরবর্তীভাবে ডিভাইস এবং অ্যাপ্লিকেশানের ডেটা পর্যায়ক্রমে সংরক্ষিত হয়৷ অ্যাপ্লিকেশান ডেটা যেকোনো ডেটা হতে পারে যা অ্যাপ্লিকেশান সংরক্ষণ করে (বিকাশকারীর সেটিংস-এর উপর ভিত্তি করে), পরিচিতি, বার্তা এবং ফটোগুলির মত সম্ভাব্য সংবেদনশীল ডেটা অন্তর্ভুক্ত করে৷"</string>
+    <string name="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>
@@ -2257,7 +2269,7 @@
     <string name="untitled_apn" msgid="1230060359198685513">"শিরোনামহীন"</string>
     <string name="sound_category_sound_title" msgid="1488759370067953996">"সাধারণ"</string>
     <string name="notification_log_title" msgid="3766148588239398464">"বিজ্ঞপ্তির লগ"</string>
-    <string name="sound_category_call_ringtone_vibrate_title" msgid="1543777228646645163">"রিংটোন ও কম্পন কল করুন"</string>
+    <string name="sound_category_call_ringtone_vibrate_title" msgid="1543777228646645163">"রিংটোন ও ভাইব্রেট"</string>
     <string name="sound_category_system_title" msgid="1480844520622721141">"সিস্টেম"</string>
     <string name="wifi_setup_title" msgid="2970260757780025029">"ওয়াই-ফাই সেটআপ"</string>
     <string name="wifi_setup_title_editing_network" msgid="6020614644556717979">"ওয়াই-ফাই নেটওয়ার্ক<xliff:g id="NETWORK_NAME">%s</xliff:g> এর সাথে সংযোগ স্থাপন করুন"</string>
@@ -2273,7 +2285,7 @@
     <string name="wifi_setup_detail" msgid="2336990478140503605">"নেটওয়ার্ক বিশদ বিবরণ"</string>
     <string name="wifi_setup_connect" msgid="7954456989590237049">"সংযুক্ত করুন"</string>
     <string name="wifi_setup_forget" msgid="2562847595567347526">"ভুলে যান"</string>
-    <string name="wifi_setup_save" msgid="3659235094218508211">"সংরক্ষণ"</string>
+    <string name="wifi_setup_save" msgid="3659235094218508211">"সেভ করুন"</string>
     <string name="wifi_setup_cancel" msgid="3185216020264410239">"বাতিল"</string>
     <string name="wifi_setup_status_scanning" msgid="5317003416385428036">"নেটওয়ার্কগুলি স্ক্যান করা হচ্ছে..."</string>
     <string name="wifi_setup_status_select_network" msgid="3960480613544747397">"একটি নেটওয়ার্কে সংযোগ করতে সেটিতে আলতো চাপুন"</string>
@@ -2300,20 +2312,20 @@
     <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>
     <string name="sync_error" msgid="5060969083117872149">"সমন্বয় ত্রুটি"</string>
     <string name="last_synced" msgid="4242919465367022234">"শেষ সিঙ্ক হয়েছে: <xliff:g id="LAST_SYNC_TIME">%1$s</xliff:g>"</string>
     <string name="sync_in_progress" msgid="5151314196536070569">"এখনই সমন্বয় করুন…"</string>
-    <string name="settings_backup" msgid="2274732978260797031">"ব্যাক আপ সেটিংস"</string>
-    <string name="settings_backup_summary" msgid="7916877705938054035">"আমার সেটিংসের ব্যাক আপ নিন"</string>
+    <string name="settings_backup" msgid="2274732978260797031">"ব্যাক-আপ সেটিংস"</string>
+    <string name="settings_backup_summary" msgid="7916877705938054035">"আমার সেটিংসের ব্যাক-আপ নিন"</string>
     <string name="sync_menu_sync_now" msgid="6154608350395805683">"এখন সিঙ্ক করুন"</string>
-    <string name="sync_menu_sync_cancel" msgid="8292379009626966949">"সমন্বয় বাতিল করুন"</string>
+    <string name="sync_menu_sync_cancel" msgid="8292379009626966949">"সিঙ্ক বাতিল করুন"</string>
     <string name="sync_one_time_sync" msgid="3733796114909082260">"এখনই সিঙ্ক করতে আলতো চাপুন<xliff:g id="LAST_SYNC_TIME">
 %1$s</xliff:g>"</string>
     <string name="sync_gmail" msgid="714886122098006477">"Gmail"</string>
@@ -2328,16 +2340,14 @@
     <string name="header_add_an_account" msgid="756108499532023798">"একটি অ্যাকাউন্ট যোগ করুন"</string>
     <string name="finish_button_label" msgid="481587707657751116">"শেষ"</string>
     <string name="really_remove_account_title" msgid="8800653398717172460">"অ্যাকাউন্ট সরাবেন?"</string>
-    <string name="really_remove_account_message" product="tablet" msgid="1936147502815641161">"এই অ্যাকাউন্টটি মুছে দিলে এটি ট্যাবলেটটি থেকে সমস্ত বার্তা, পরিচিতি এবং অন্য ডেটা মুছে দেবে!"</string>
-    <string name="really_remove_account_message" product="default" msgid="3483528757922948356">"এই অ্যাকাউন্টটি মুছে দিলে এটি ফোন থেকে সমস্ত বার্তা, পরিচিতি এবং অন্য ডেটা মুছে দেবে!"</string>
+    <string name="really_remove_account_message" product="tablet" msgid="1936147502815641161">"এই অ্যাকাউন্টটি মুছে দিলে এটি ট্যাবলেটটি থেকে সমস্ত মেসেজ, পরিচিতি এবং অন্য ডেটা মুছে দেবে!"</string>
+    <string name="really_remove_account_message" product="default" msgid="3483528757922948356">"এই অ্যাকাউন্টটি মুছে দিলে এটি ফোন থেকে সমস্ত মেসেজ, পরিচিতি এবং অন্য ডেটা মুছে দেবে!"</string>
     <string name="remove_account_failed" msgid="3901397272647112455">"আপনার প্রশাসক এই পরিবর্তনটি করতে দেবেন না"</string>
     <string name="provider_label" msgid="7724593781904508866">"পুশ সদস্যতাগুলি"</string>
     <!-- no translation found for sync_item_title (4782834606909853006) -->
     <skip />
     <string name="cant_sync_dialog_title" msgid="2777238588398046285">"ম্যানুয়ালি সমন্বয় করা যাবে না"</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="cant_sync_dialog_message" msgid="1938380442159016449">"এই আইটেমটির জন্য সিঙ্ক বর্তমানে অক্ষম। এই সেটিং পরিবর্তন করতে, অস্থায়ীভাবে ব্যাকগ্রাউন্ড ডেটা এবং স্বয়ংক্রিয় সিঙ্ক চালু করুন।"</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>
@@ -2350,18 +2360,19 @@
     <string name="misc_files" msgid="6720680815969643497">"বিবিধ ফাইলগুলি"</string>
     <string name="misc_files_selected_count" msgid="4647048020823912088">"<xliff:g id="TOTAL">%2$d</xliff:g> এর মধ্যে <xliff:g id="NUMBER">%1$d</xliff:g> নির্বাচিত"</string>
     <string name="misc_files_selected_count_bytes" msgid="2876232009069114352">"<xliff:g id="TOTAL">%2$s</xliff:g>টির মধ্যে <xliff:g id="NUMBER">%1$s</xliff:g>"</string>
-    <string name="select_all" msgid="1562774643280376715">"সবগুলি নির্বাচন করুন"</string>
+    <string name="select_all" msgid="1562774643280376715">"সবগুলি বেছে নিন"</string>
+    <string name="data_plan_usage_manage_plans_button_text" msgid="8997761990902708162">"প্ল্যান পরিচালনা করুন"</string>
     <string name="data_usage_summary_title" msgid="3804110657238092929">"ডেটা ব্যবহার"</string>
     <string name="data_usage_app_summary_title" msgid="4147258989837459172">"অ্যাপ ডেটা ব্যবহার"</string>
     <string name="data_usage_accounting" msgid="7170028915873577387">"পরিষেবা প্রদানকারীর ডেটার হিসাব আপনার ডিভাইস থেকে ভিন্ন হতে পারে।"</string>
     <string name="data_usage_app" msgid="4970478397515423303">"অ্যাপ্লিকেশান ব্যবহার"</string>
-    <string name="data_usage_app_info_label" msgid="3409931235687866706">"অ্যাপ্লিকেশান তথ্য"</string>
+    <string name="data_usage_app_info_label" msgid="3409931235687866706">"অ্যাপের তথ্য"</string>
     <string name="data_usage_cellular_data" msgid="9168928285122125137">"মোবাইল ডেটা"</string>
     <string name="data_usage_data_limit" msgid="1193930999713192703">"ডেটা সীমা সেট করুন"</string>
     <string name="data_usage_cycle" msgid="5652529796195787949">"ডেটা ব্যবহারের চক্র"</string>
     <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>
@@ -2400,29 +2411,29 @@
     <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_auto_sync_on_dialog_title" msgid="2438617846762244389">"ডেটা স্বতঃ সিঙ্ক চালু করবেন?"</string>
-    <string name="data_usage_auto_sync_on_dialog" product="tablet" msgid="8581983093524041669">"ওয়েবে আপনার অ্যাকাউন্টে আপনি যে পরিবর্তন করবেন সেটি স্বয়ংক্রিয়ভাবে আপনার ট্যাবলেটে অনুলিপি করা হবে।\n\nকোনো কোনো অ্যাকাউন্ট আপনার ট্যাবলেটে করা পরিবর্তনগুলি স্বয়ংক্রিয়ভাবে ওয়েবে অনুলিপি করতে পারবে। Google অ্যাকাউন্ট এভাবেই কাজ করে।"</string>
-    <string name="data_usage_auto_sync_on_dialog" product="default" msgid="8651376294887142858">"ওয়েবে আপনার অ্যাকাউন্টে আপনি যে পরিবর্তন করবেন সেটি স্বয়ংক্রিয়ভাবে আপনার ফোনে অনুলিপি করা হবে।\n\nকোনো কোনো অ্যাকাউন্ট আপনার ফোনে করা পরিবর্তনগুলি স্বয়ংক্রিয়ভাবে ওয়েবে অনুলিপি করতে পারবে। Google অ্যাকাউন্ট এভাবেই কাজ করে।"</string>
-    <string name="data_usage_auto_sync_off_dialog_title" msgid="9013139130490125793">"ডেটা স্বতঃ সিঙ্ক বন্ধ করবেন?"</string>
-    <string name="data_usage_auto_sync_off_dialog" msgid="4025938250775413864">"এটি ডেটা এবং ব্যাটারি ব্যবহার সংরক্ষণ করবে, কিন্তু আপনাকে সাম্প্রতিক তথ্য সংগ্রহ করতে ম্যানুয়ালি প্রতিটি অ্যাকাউন্ট সিঙ্ক করতে হবে। আপডেট হলে আপনি তখন বিজ্ঞপ্তি পাবেন না।"</string>
+    <string name="data_usage_auto_sync_on_dialog_title" msgid="2438617846762244389">"ডেটা অটোমেটিক সিঙ্ক চালু করবেন?"</string>
+    <string name="data_usage_auto_sync_on_dialog" product="tablet" msgid="8581983093524041669">"ওয়েবে আপনার অ্যাকাউন্টে আপনি যে পরিবর্তন করবেন সেটি অটোমেটিক আপনার ট্যাবলেটে কপি করা হবে।\n\nকোনও কোনও অ্যাকাউন্ট আপনার ট্যাবলেটে করা পরিবর্তনগুলি অটোমেটিক ওয়েবে কপি করতে পারবে। Google অ্যাকাউন্ট এভাবেই কাজ করে।"</string>
+    <string name="data_usage_auto_sync_on_dialog" product="default" msgid="8651376294887142858">"ওয়েবে আপনার অ্যাকাউন্টে আপনি যে পরিবর্তন করবেন সেটি অটোমেটিক আপনার ফোনে কপি করা হবে।\n\nকোনও কোনও অ্যাকাউন্ট আপনার ফোনে করা পরিবর্তনগুলি অটোমেটিক ওয়েবে কপি করতে পারবে। Google অ্যাকাউন্ট এভাবেই কাজ করে।"</string>
+    <string name="data_usage_auto_sync_off_dialog_title" msgid="9013139130490125793">"ডেটা অটোমেটিক সিঙ্ক বন্ধ করবেন?"</string>
+    <string name="data_usage_auto_sync_off_dialog" msgid="4025938250775413864">"এটি ডেটা এবং ব্যাটারির খরচ বাঁচাবে, কিন্তু আপনাকে সাম্প্রতিক তথ্য সংগ্রহ করতে ম্যানুয়ালি প্রতিটি অ্যাকাউন্ট সিঙ্ক করতে হবে। আপডেট হলে আপনি তখন বিজ্ঞপ্তি পাবেন না।"</string>
     <string name="data_usage_cycle_editor_title" msgid="1373797281540188533">"ব্যবহার চক্র আবার সেট করার তারিখ"</string>
     <string name="data_usage_cycle_editor_subtitle" msgid="5512903797979928416">"প্রতিটি মাসের তারিখ:"</string>
     <string name="data_usage_cycle_editor_positive" msgid="8821760330497941117">"সেট"</string>
     <string name="data_usage_warning_editor_title" msgid="3704136912240060339">"ডেটা ব্যবহার সতর্কতা সেট করুন"</string>
     <string name="data_usage_limit_editor_title" msgid="9153595142385030015">"ডেটা ব্যবহার সীমা সেট করুন"</string>
     <string name="data_usage_limit_dialog_title" msgid="3023111643632996097">"ডেটা ব্যবহার সীমিত করা"</string>
-    <string name="data_usage_limit_dialog_mobile" product="tablet" msgid="4983487893343645667">"ডেটার ব্যবহার আপনার সেট করা সীমায় পৌঁছলে আপনার ট্যাবলেট মোবাইল ডেটা বন্ধ করে দেবে।\n\nযেহেতু আপনার ট্যাবলেট আপনার ডেটা ব্যবহারের হিসাব রাখে এবং আপনার পরিষেবা প্রদানকারীর রাখা হিসাব কিছুটা আলাদা হলেও হতে পারে, তাই যাতে কম মোবাইল ডাটা খরচ হোক এমনভাবে সীমা সেট করার কথা ভাবতে পারেন।"</string>
-    <string name="data_usage_limit_dialog_mobile" product="default" msgid="3926320594049434225">"ডেটার ব্যবহার আপনার সেট করা সীমায় পৌঁছলে আপনার ফোন মোবাইল ডেটা বন্ধ করে দেবে।\n\nযেহেতু আপনার ফোন আপনার ডেটা ব্যবহারের হিসাব রাখে এবং আপনার পরিষেবা প্রদানকারীর রাখা হিসাব কিছুটা আলাদা হলেও হতে পারে, তাই যাতে কম মোবাইল ডাটা খরচ হোক এমনভাবে সীমা সেট করার কথা ভাবতে পারেন।"</string>
-    <string name="data_usage_restrict_background_title" msgid="2201315502223035062">"পশ্চাদপট ডেটা সীমাবদ্ধ করবেন?"</string>
-    <string name="data_usage_restrict_background" msgid="434093644726734586">"আপনি যদি পটভূমির মোবাইল ডেটা সীমাবদ্ধ করেন, তাহলে ওয়াই ফাই এর সাথে সংযুক্ত না হওয়া পর্যন্ত কিছু কিছু অ্যাপ ও পরিষেবা কাজ করবে না।"</string>
-    <string name="data_usage_restrict_background_multiuser" product="tablet" msgid="7096707497743363380">"আপনি যদি পটভূমির মোবাইল ডেটা সীমাবদ্ধ করেন, তাহলে ওয়াই ফাই এর সাথে সংযুক্ত না হওয়া পর্যন্ত কিছু কিছু অ্যাপ ও পরিষেবা কাজ করবে না।\n\nএই সেটিংটি এই ট্যাবলেটের সমস্ত ব্যবহারকারীর ক্ষেত্রে প্রযোজ্য।"</string>
-    <string name="data_usage_restrict_background_multiuser" product="default" msgid="7910798414964288424">"আপনি যদি পটভূমির মোবাইল ডেটা সীমাবদ্ধ করেন, তাহলে ওয়াই ফাই এর সাথে সংযুক্ত না হওয়া পর্যন্ত কিছু কিছু অ্যাপ ও পরিষেবা কাজ করবে না।\n\nএই সেটিংটি এই ফোনের সমস্ত ব্যবহারকারীর ক্ষেত্রে প্রযোজ্য।"</string>
+    <string name="data_usage_limit_dialog_mobile" product="tablet" msgid="4983487893343645667">"ডেটার ব্যবহার আপনার সেট করা সীমায় পৌঁছলে আপনার ট্যাবলেট মোবাইল ডেটা বন্ধ করে দেবে।\n\nযেহেতু আপনার ট্যাবলেট আপনার ডেটা ব্যবহারের হিসাব রাখে এবং আপনার পরিষেবা প্রদানকারীর রাখা হিসাব কিছুটা আলাদা হলেও হতে পারে, তাই যাতে কম মোবাইল ডেটা খরচ হোক এমনভাবে সীমা সেট করার কথা ভাবতে পারেন।"</string>
+    <string name="data_usage_limit_dialog_mobile" product="default" msgid="3926320594049434225">"ডেটার ব্যবহার আপনার সেট করা সীমায় পৌঁছলে আপনার ফোন মোবাইল ডেটা বন্ধ করে দেবে।\n\nযেহেতু আপনার ফোন আপনার ডেটা ব্যবহারের হিসাব রাখে এবং আপনার পরিষেবা প্রদানকারীর রাখা হিসাব কিছুটা আলাদা হলেও হতে পারে, তাই যাতে কম মোবাইল ডেটা খরচ হোক এমনভাবে সীমা সেট করার কথা ভাবতে পারেন।"</string>
+    <string name="data_usage_restrict_background_title" msgid="2201315502223035062">"ব্যাকগ্রাউন্ড ডেটা সীমাবদ্ধ করবেন?"</string>
+    <string name="data_usage_restrict_background" msgid="434093644726734586">"আপনি যদি ব্যাকগ্রাউন্ডের মোবাইল ডেটা সীমাবদ্ধ করেন, তাহলে ওয়াই-ফাই এর সাথে সংযুক্ত না হওয়া পর্যন্ত কিছু কিছু অ্যাপ ও পরিষেবা কাজ করবে না।"</string>
+    <string name="data_usage_restrict_background_multiuser" product="tablet" msgid="7096707497743363380">"আপনি যদি ব্যাকগ্রাউন্ডের মোবাইল ডেটা সীমাবদ্ধ করেন, তাহলে ওয়াই-ফাই এর সাথে সংযুক্ত না হওয়া পর্যন্ত কিছু কিছু অ্যাপ ও পরিষেবা কাজ করবে না।\n\nএই সেটিংটি এই ট্যাবলেটের সমস্ত ব্যবহারকারীর ক্ষেত্রে প্রযোজ্য।"</string>
+    <string name="data_usage_restrict_background_multiuser" product="default" msgid="7910798414964288424">"আপনি যদি ব্যাকগ্রাউন্ডের মোবাইল ডেটা সীমাবদ্ধ করেন, তাহলে ওয়াই-ফাই এর সাথে সংযুক্ত না হওয়া পর্যন্ত কিছু কিছু অ্যাপ ও পরিষেবা কাজ করবে না।\n\nএই সেটিংটি এই ফোনের সমস্ত ব্যবহারকারীর ক্ষেত্রে প্রযোজ্য।"</string>
     <string name="data_usage_sweep_warning" msgid="6387081852568846982"><font size="18">"<xliff:g id="NUMBER">^1</xliff:g>"</font>" "<font size="9">"<xliff:g id="UNIT">^2</xliff:g>"</font>\n<font size="12">"সতর্কতা"</font></string>
     <string name="data_usage_sweep_limit" msgid="860566507375933039"><font size="18">"<xliff:g id="NUMBER">^1</xliff:g>"</font>" "<font size="9">"<xliff:g id="UNIT">^2</xliff:g>"</font>\n<font size="12">"সীমা"</font></string>
     <string name="data_usage_uninstalled_apps" msgid="614263770923231598">"সরানো অ্যাপ্লিকেশানগুলি"</string>
@@ -2432,10 +2443,13 @@
     <string name="data_usage_total_during_range_mobile" product="tablet" msgid="1925687342154538972">"<xliff:g id="RANGE">%2$s</xliff:g>: <xliff:g id="TOTAL">%1$s</xliff:g> ব্যবহার সম্পর্কে, যেহেতু আপনার ট্যাবলেট দ্বারা পরিমাপ করা হয়। আপনার ক্যারিয়ার ব্যবহারের জন্য আলাদা করে চার্জ করতে পারে।"</string>
     <string name="data_usage_total_during_range_mobile" product="default" msgid="5063981061103812900">"<xliff:g id="RANGE">%2$s</xliff:g>: <xliff:g id="TOTAL">%1$s</xliff:g> ব্যবহার সম্পর্কে, যেহেতু আপনার ফোন দ্বারা পরিমাপ করা হয়। আপনার ক্যারিয়ার ব্যবহারের জন্য আলাদা করে চার্জ করতে পারে।"</string>
     <string name="data_usage_metered_title" msgid="7383175371006596441">"নেটওয়ার্ক সীমাবদ্ধতা"</string>
-    <string name="data_usage_metered_body" msgid="7655851702771342507">"পটভূমির ডেটা সীমাবদ্ধ থাকলে পরিমাপ করা নেটওয়ার্কগুলিকে মোবাইল নেটওয়ার্ক হিসাবে ধরা হয়। বড় ডাউনলোডের জন্য এইসব নেটওয়ার্ক ব্যবহারের আগে অ্যাপগুলি সতর্ক বার্তা দেখাতে পারে।"</string>
+    <string name="data_usage_metered_body" msgid="7655851702771342507">"পটভূমির ডেটা সীমাবদ্ধ থাকলে পরিমাপ করা নেটওয়ার্কগুলিকে মোবাইল নেটওয়ার্ক হিসেবে ধরা হয়। বড় ডাউনলোডের জন্য এইসব নেটওয়ার্ক ব্যবহারের আগে অ্যাপগুলি সতর্ক মেসেজ দেখাতে পারে।"</string>
     <string name="data_usage_metered_mobile" msgid="5423305619126978393">"মোবাইল নেটওয়ার্কগুলি"</string>
     <string name="data_usage_metered_wifi" msgid="1761738002328299714">"পরিমাপ করা ওয়াই-ফাই নেটওয়ার্ক"</string>
     <string name="data_usage_metered_wifi_disabled" msgid="727808462375941567">"পরিমাপ করা নেটওয়ার্ক নির্বাচন করতে,ওয়াই-ফাই চালু করুন।"</string>
+    <string name="data_usage_metered_auto" msgid="1262028400911918865">"অটোমেটিক"</string>
+    <string name="data_usage_metered_yes" msgid="9217539611385225894">"পরিমাপ করা"</string>
+    <string name="data_usage_metered_no" msgid="4025232961929071789">"পরিমাপ করা নয়"</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>
@@ -2446,16 +2460,16 @@
     <string name="vpn_l2tp_secret" msgid="529359749677142076">"L2TP সিক্রেট"</string>
     <string name="vpn_ipsec_identifier" msgid="4098175859460006296">"IPSec আইডেন্টিফায়ার"</string>
     <string name="vpn_ipsec_secret" msgid="4526453255704888704">"IPSec আগে থেকে শেয়ার করা কী"</string>
-    <string name="vpn_ipsec_user_cert" msgid="6880651510020187230">"IPSec ব্যবহারকারী শংসাপত্র"</string>
-    <string name="vpn_ipsec_ca_cert" msgid="91338213449148229">"IPSec CA শংসাপত্র"</string>
+    <string name="vpn_ipsec_user_cert" msgid="6880651510020187230">"IPSec ব্যবহারকারী সার্টিফিকেট"</string>
+    <string name="vpn_ipsec_ca_cert" msgid="91338213449148229">"IPSec CA সার্টিফিকেট"</string>
     <string name="vpn_ipsec_server_cert" msgid="6599276718456935010">"IPSec সার্ভার সার্টিফিকেট"</string>
     <string name="vpn_show_options" msgid="7182688955890457003">"উন্নত বিকল্প দেখান"</string>
     <string name="vpn_search_domains" msgid="5391995501541199624">"DNS অনুসন্ধান ডোমেনগুলি"</string>
     <string name="vpn_dns_servers" msgid="5570715561245741829">"DNS সার্ভার (যেমন ৮.৮.৮.৮)"</string>
     <string name="vpn_routes" msgid="3818655448226312232">"ফরওয়ার্ডিং রুটগুলি (উদাহরণ 10.0.0.0 / 8)"</string>
-    <string name="vpn_username" msgid="1863901629860867849">"ব্যবহারকারীর নাম"</string>
+    <string name="vpn_username" msgid="1863901629860867849">"ইউজারনেম"</string>
     <string name="vpn_password" msgid="6756043647233596772">"পাসওয়ার্ড"</string>
-    <string name="vpn_save_login" msgid="6350322456427484881">"অ্যাকাউন্ট তথ্য সংরক্ষণ করুন"</string>
+    <string name="vpn_save_login" msgid="6350322456427484881">"অ্যাকাউন্ট তথ্য সেভ করুন"</string>
     <string name="vpn_not_used" msgid="9094191054524660891">"(অব্যবহৃত)"</string>
     <string name="vpn_no_ca_cert" msgid="8776029412793353361">"(সার্ভার যাচাই করবেন না)"</string>
     <string name="vpn_no_server_cert" msgid="2167487440231913330">"(সার্ভার থেকে প্রাপ্ত)"</string>
@@ -2466,7 +2480,7 @@
     <string name="vpn_always_on_invalid_reason_other" msgid="5959352052515258208">"দিয়ে থাকা তথ্য সর্বদা-চালু VPN গুলিতে কাজ করে না"</string>
     <string name="vpn_cancel" msgid="1979937976123659332">"বাতিল"</string>
     <string name="vpn_done" msgid="8678655203910995914">"খারিজ করুন"</string>
-    <string name="vpn_save" msgid="4233484051644764510">"সংরক্ষণ"</string>
+    <string name="vpn_save" msgid="4233484051644764510">"সেভ করুন"</string>
     <string name="vpn_connect" msgid="8469608541746132301">"সংযুক্ত করুন"</string>
     <string name="vpn_replace" msgid="5442836256121957861">"প্রতিস্থাপন করুন"</string>
     <string name="vpn_edit" msgid="8647191407179996943">"VPN প্রোফাইল সম্পাদনা করুন"</string>
@@ -2474,7 +2488,7 @@
     <string name="vpn_connect_to" msgid="5965299358485793260">"<xliff:g id="PROFILE">%s</xliff:g> এতে সংযোগ করুন"</string>
     <string name="vpn_disconnect_confirm" msgid="3743970132487505659">"এই VPN থেকে সংযোগ বিচ্ছিন্ন করবেন?"</string>
     <string name="vpn_disconnect" msgid="7426570492642111171">"সংযোগ বিচ্ছিন্ন করুন"</string>
-    <string name="vpn_version" msgid="1939804054179766249">"<xliff:g id="VERSION">%s</xliff:g> সংস্করণ"</string>
+    <string name="vpn_version" msgid="1939804054179766249">"ভার্সন<xliff:g id="VERSION">%s</xliff:g>"</string>
     <string name="vpn_forget_long" msgid="2232239391189465752">"VPN সরিয়ে দিন"</string>
     <string name="vpn_replace_vpn_title" msgid="2963898301277610248">"বিদ্যমান VPN প্রতিস্থাপন করতে চান?"</string>
     <string name="vpn_set_vpn_title" msgid="4009987321156037267">"সর্বদা-চালু VPN সেট করতে চান?"</string>
@@ -2496,30 +2510,30 @@
     <string name="vpn_always_on_summary_active" msgid="8800736191241875669">"সর্বদা-চালু সক্রিয় আছে"</string>
     <string name="vpn_require_connection" msgid="8388183166574269666">"VPN বিহীন সংযোগগুলি ব্লক করুন"</string>
     <string name="vpn_require_connection_title" msgid="159053539340576331">"VPN সংযোগ প্রয়োজন?"</string>
-    <string name="vpn_lockdown_summary" msgid="2200032066376720339">"সর্বদা সংযুক্ত থাকতে একটি VPN প্রোফাইল নির্বাচন করুন। এই VPN এ সংযুক্ত থাকাকালীন শুধুমাত্র নেটওয়ার্ক ট্রাফিকের অনুমতি দেওয়া হবে।"</string>
+    <string name="vpn_lockdown_summary" msgid="2200032066376720339">"সর্বদা সংযুক্ত থাকতে একটি VPN প্রোফাইল বেছে নিন। এই VPN এ সংযুক্ত থাকাকালীন শুধুমাত্র নেটওয়ার্ক ট্রাফিকের অনুমতি দেওয়া হবে।"</string>
     <string name="vpn_lockdown_none" msgid="9214462857336483711">"কোনো কিছুই নয়"</string>
     <string name="vpn_lockdown_config_error" msgid="3898576754914217248">"সর্বদা-চালু VPN এর সার্ভার্র এবং DNS উভয়েরই জন্য IP ঠিকানা প্রয়োজন।"</string>
     <string name="vpn_no_network" msgid="3050233675132726155">"কোনো নেটওয়ার্ক সংযোগ নেই। দয়া করে পরে আবার চেষ্টা করুন।"</string>
     <string name="vpn_disconnected" msgid="280531508768927471">"VPN থেকে সংযোগ বিচ্ছিন্ন হয়েছে"</string>
     <string name="vpn_disconnected_summary" msgid="3082851661207900606">"কোনো কিছুই নয়"</string>
-    <string name="vpn_missing_cert" msgid="5357192202207234745">"একটি শংসাপত্র পাওয়া যাচ্ছে না। প্রোফাইলটি সম্পাদনা করুন।"</string>
+    <string name="vpn_missing_cert" msgid="5357192202207234745">"একটি সার্টিফিকেট পাওয়া যাচ্ছে না। প্রোফাইলটি সম্পাদনা করুন।"</string>
     <string name="trusted_credentials_system_tab" msgid="3984284264816924534">"সিস্টেম"</string>
     <string name="trusted_credentials_user_tab" msgid="2244732111398939475">"ব্যবহারকারী"</string>
     <string name="trusted_credentials_disable_label" msgid="3864493185845818506">"অক্ষম করুন"</string>
     <string name="trusted_credentials_enable_label" msgid="2498444573635146913">"সক্ষম করুন"</string>
     <string name="trusted_credentials_remove_label" msgid="3633691709300260836">"সরান"</string>
     <string name="trusted_credentials_trust_label" msgid="8003264222650785429">"বিশ্বাস"</string>
-    <string name="trusted_credentials_enable_confirmation" msgid="83215982842660869">"সিস্টেমের CA শংসাপত্র সক্ষম করবেন?"</string>
-    <string name="trusted_credentials_disable_confirmation" msgid="8199697813361646792">"সিস্টেমের CA শংসাপত্র অক্ষম করবেন?"</string>
-    <string name="trusted_credentials_remove_confirmation" msgid="443561923016852941">"স্থায়ীভাবে ব্যবহারকারী CA শংসাপত্র সরাবেন?"</string>
+    <string name="trusted_credentials_enable_confirmation" msgid="83215982842660869">"সিস্টেমের CA সার্টিফিকেট সক্ষম করবেন?"</string>
+    <string name="trusted_credentials_disable_confirmation" msgid="8199697813361646792">"সিস্টেমের CA সার্টিফিকেট অক্ষম করবেন?"</string>
+    <string name="trusted_credentials_remove_confirmation" msgid="443561923016852941">"স্থায়ীভাবে ব্যবহারকারী CA সার্টিফিকেট সরাবেন?"</string>
     <string name="credential_contains" msgid="3984922924723974084">"এই এন্ট্রিতে এগুলি রয়েছে:"</string>
     <string name="one_userkey" msgid="6034020579534914349">"একটি ব্যবহারকারী কী"</string>
-    <string name="one_usercrt" msgid="2150319011101639509">"একটি ব্যবহারকারী শংসাপত্র"</string>
-    <string name="one_cacrt" msgid="6844397037970164809">"একটি CA শংসাপত্র"</string>
-    <string name="n_cacrts" msgid="5979300323482053820">"%dটি CA শংসাপত্র"</string>
+    <string name="one_usercrt" msgid="2150319011101639509">"একটি ব্যবহারকারী সার্টিফিকেট"</string>
+    <string name="one_cacrt" msgid="6844397037970164809">"একটি CA সার্টিফিকেট"</string>
+    <string name="n_cacrts" msgid="5979300323482053820">"%dটি CA সার্টিফিকেট"</string>
     <string name="user_credential_title" msgid="1954061209643070652">"শংসাপত্রের বিশদ বিবরণ"</string>
-    <string name="user_credential_removed" msgid="6514189495799401838">"সরানো শংসাপত্র: <xliff:g id="CREDENTIAL_NAME">%s</xliff:g>"</string>
-    <string name="user_credential_none_installed" msgid="3729607560420971841">"কোনো ব্যবহারকারীর শংসাপত্র ইনস্টল করা নেই"</string>
+    <string name="user_credential_removed" msgid="6514189495799401838">"সরানো সার্টিফিকেট: <xliff:g id="CREDENTIAL_NAME">%s</xliff:g>"</string>
+    <string name="user_credential_none_installed" msgid="3729607560420971841">"কোনও ব্যবহারকারীর সার্টিফিকেট ইনস্টল করা নেই"</string>
     <string name="spellcheckers_settings_title" msgid="399981228588011501">"বানান পরিক্ষক"</string>
     <string name="current_backup_pw_prompt" msgid="7735254412051914576">"এখানে আপনার বর্তমান সম্পূর্ণ ব্যাকআপ পাসওয়ার্ড টাইপ করুন"</string>
     <string name="new_backup_pw_prompt" msgid="8755501377391998428">"এখানে পুরো ব্যাকআপের জন্য একটি নতুন পাসওয়ার্ড টাইপ করুন"</string>
@@ -2527,9 +2541,6 @@
     <string name="backup_pw_set_button_text" msgid="2387480910044648795">"ব্যাকআপ পাসওয়ার্ড সেট করুন"</string>
     <string name="backup_pw_cancel_button_text" msgid="8845630125391744615">"বাতিল করুন"</string>
     <string name="additional_system_update_settings_list_item_title" msgid="214987609894661992">"অতিরিক্ত সিস্টেম আপডেটগুলি"</string>
-    <string name="selinux_status_disabled" msgid="924551035552323327">"অক্ষম হয়েছে"</string>
-    <string name="selinux_status_permissive" msgid="6004965534713398778">"অনুমতিসূচক"</string>
-    <string name="selinux_status_enforcing" msgid="2252703756208463329">"প্রয়োগ করা"</string>
     <string name="ssl_ca_cert_warning" msgid="2045866713601984673">"নেটওয়ার্ক নিরীক্ষণ করা হতে পারে"</string>
     <string name="done_button" msgid="1991471253042622230">"সম্পন্ন হয়েছে"</string>
     <plurals name="ssl_ca_cert_dialog_title" formatted="false" msgid="7145092748045794650">
@@ -2537,24 +2548,24 @@
       <item quantity="other">টি শংসাপত্রের উপরে ভরসা করুন বা সেগুলিকে সরান</item>
     </plurals>
     <plurals name="ssl_ca_cert_info_message_device_owner" formatted="false" msgid="1489335297837656666">
-      <item quantity="one"><xliff:g id="MANAGING_DOMAIN_1">%s</xliff:g>আপনার ডিভাইসের জন্য একটি শংসাপত্র কর্তৃপক্ষকে ইনস্টল করেছে, যেটি তাদেরকে ইমেল, অ্যাপ্লিকেশান, এবং নিরাপদ ওয়েবসাইটগুলি সহ ডিভাইসের নেটওয়ার্ক কার্যকলাপ নিরীক্ষণ করার অনুমতি দিতে পারে৷\n\nএই শংসাপত্রগুলির সম্পর্কে আরো তথ্যের জন্য, আপনার প্রশাসকের সাথে যোগাযোগ করুন৷</item>
-      <item quantity="other"><xliff:g id="MANAGING_DOMAIN_1">%s</xliff:g>আপনার ডিভাইসের জন্য একটি শংসাপত্র কর্তৃপক্ষকে ইনস্টল করেছে, যেটি তাদেরকে ইমেল, অ্যাপ্লিকেশান, এবং নিরাপদ ওয়েবসাইটগুলি সহ ডিভাইসের নেটওয়ার্ক কার্যকলাপ নিরীক্ষণ করার অনুমতি দিতে পারে৷\n\nএই শংসাপত্রগুলির সম্পর্কে আরো তথ্যের জন্য, আপনার প্রশাসকের সাথে যোগাযোগ করুন৷</item>
+      <item quantity="one"><xliff:g id="MANAGING_DOMAIN_1">%s</xliff:g>আপনার ডিভাইসের জন্য একটি সার্টিফিকেট কর্তৃপক্ষকে ইনস্টল করেছে, যেটি তাদেরকে ইমেল, অ্যাপ্লিকেশন এবং নিরাপদ ওয়েবসাইটগুলি সহ ডিভাইসের নেটওয়ার্ক কার্যকলাপ নিরীক্ষণ করার অনুমতি দিতে পারে৷\n\nএই সার্টিফিকেটগুলির সম্পর্কে আরও তথ্যের জন্য, আপনার প্রশাসকের সাথে যোগাযোগ করুন৷</item>
+      <item quantity="other"><xliff:g id="MANAGING_DOMAIN_1">%s</xliff:g>আপনার ডিভাইসের জন্য একটি সার্টিফিকেট কর্তৃপক্ষকে ইনস্টল করেছে, যেটি তাদেরকে ইমেল, অ্যাপ্লিকেশন, এবং নিরাপদ ওয়েবসাইটগুলি সহ ডিভাইসের নেটওয়ার্ক কার্যকলাপ নিরীক্ষণ করার অনুমতি দিতে পারে৷\n\nএই সার্টিফিকেটগুলির সম্পর্কে আরও তথ্যের জন্য, আপনার প্রশাসকের সাথে যোগাযোগ করুন৷</item>
     </plurals>
     <plurals name="ssl_ca_cert_info_message" formatted="false" msgid="30645643499556573">
-      <item quantity="one"><xliff:g id="MANAGING_DOMAIN_1">%s</xliff:g>আপনার কর্মস্থলের প্রোফাইলের জন্য শংসাপত্রের কর্তৃপক্ষগুলিকে ইনস্টল করেছে, যেগুলি তাদেরকে ইমেল, অ্যাপ্লিকেশান, এবং নিরাপদ ওয়েবসাইটগুলি সহ কর্মস্থলের নেটওয়ার্কের কার্যকলাপকে নিরীক্ষণ করার অনুমতি দিতে পারে৷\n\nএই শংসাপত্রগুলির সম্পর্কে আরো তথ্যের জন্য, আপনার প্রশাসকের সাথে যোগাযোগ করুন৷</item>
-      <item quantity="other"><xliff:g id="MANAGING_DOMAIN_1">%s</xliff:g>আপনার কর্মস্থলের প্রোফাইলের জন্য শংসাপত্রের কর্তৃপক্ষগুলিকে ইনস্টল করেছে, যেগুলি তাদেরকে ইমেল, অ্যাপ্লিকেশান, এবং নিরাপদ ওয়েবসাইটগুলি সহ কর্মস্থলের নেটওয়ার্কের কার্যকলাপকে নিরীক্ষণ করার অনুমতি দিতে পারে৷\n\nএই শংসাপত্রগুলির সম্পর্কে আরো তথ্যের জন্য, আপনার প্রশাসকের সাথে যোগাযোগ করুন৷</item>
+      <item quantity="one"><xliff:g id="MANAGING_DOMAIN_1">%s</xliff:g>আপনার অফিস প্রোফাইলের জন্য সার্টিফিকেটের কর্তৃপক্ষগুলিকে ইনস্টল করেছে, যেগুলি তাদেরকে ইমেল, অ্যাপ্লিকেশন এবং নিরাপদ ওয়েবসাইটগুলি সহ অফিস নেটওয়ার্কের কার্যকলাপকে নিরীক্ষণ করার অনুমতি দিতে পারে৷\n\nএই সার্টিফিকেটগুলির সম্পর্কে আরও তথ্যের জন্য, আপনার প্রশাসকের সাথে যোগাযোগ করুন৷</item>
+      <item quantity="other"><xliff:g id="MANAGING_DOMAIN_1">%s</xliff:g> আপনার অফিস প্রোফাইলের জন্য সার্টিফিকেটের কর্তৃপক্ষগুলিকে ইনস্টল করেছে, যেগুলি তাদেরকে ইমেল, অ্যাপ্লিকেশন, এবং নিরাপদ ওয়েবসাইটগুলি সহ অফিস নেটওয়ার্কের কার্যকলাপকে নিরীক্ষণ করার অনুমতি দিতে পারে৷\n\nএই সার্টিফিকেটগুলির সম্পর্কে আরও তথ্যের জন্য, আপনার প্রশাসকের সাথে যোগাযোগ করুন৷</item>
     </plurals>
     <string name="ssl_ca_cert_warning_message" msgid="8216218659139190498">"একজন তৃতীয় পক্ষ ইমেল অ্যাপ্লিকেশান, এবং নিরাপদ ওয়েবসাইটগুলি সহ আপনার নেটওয়ার্ক ক্রিয়াকলাপ নিরীক্ষণ করতে সক্ষম হবে। \n\nআপনার ডিভাইসে ইনস্টল করা একটি বিশ্বস্ত ক্রেডেনশিয়াল এটিকে সম্ভব করছে।"</string>
     <plurals name="ssl_ca_cert_settings_button" formatted="false" msgid="2426799352517325228">
-      <item quantity="one">টি শংসাপত্র পরীক্ষা করুন</item>
-      <item quantity="other">টি শংসাপত্র পরীক্ষা করুন</item>
+      <item quantity="one">টি সার্টিফিকেট পরীক্ষা করুন</item>
+      <item quantity="other">টি সার্টিফিকেট পরীক্ষা করুন</item>
     </plurals>
     <string name="user_settings_title" msgid="6151874007858148344">"ব্যবহারকারীগণ"</string>
     <string name="user_list_title" msgid="7937158411137563543">"ব্যবহারকারীরা ও প্রোফাইলগুলি"</string>
     <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>
@@ -2564,15 +2575,15 @@
     <string name="user_nickname" msgid="5148818000228994488">"ডাকনাম"</string>
     <string name="user_add_user_type_title" msgid="2146438670792322349">"যোগ করুন"</string>
     <string name="user_add_max_count" msgid="5405885348463433157">"আপনি <xliff:g id="USER_COUNT">%1$d</xliff:g> জন পর্যন্ত ব্যবহারকারী যোগ করতে পারেন"</string>
-    <string name="user_add_user_item_summary" msgid="4702776187132008661">"ব্যবহারকারীদের তাদের নিজস্ব অ্যাপ্লিকেশান এবং সামগ্রী আছে"</string>
-    <string name="user_add_profile_item_summary" msgid="5931663986889138941">"আপনি আপনার অ্যাকাউন্ট থেকে অ্যাপ্লিকেশান এবং সামগ্রী অ্যাক্সেস সীমাবদ্ধ করতে পারেন"</string>
+    <string name="user_add_user_item_summary" msgid="4702776187132008661">"ব্যবহারকারীদের তাঁদের নিজস্ব অ্যাপ্লিকেশন এবং কন্টেন্ট আছে"</string>
+    <string name="user_add_profile_item_summary" msgid="5931663986889138941">"আপনি আপনার অ্যাকাউন্ট থেকে অ্যাপ্লিকেশন এবং কন্টেন্ট অ্যাক্সেস সীমাবদ্ধ করতে পারেন"</string>
     <string name="user_add_user_item_title" msgid="8212199632466198969">"ব্যবহারকারী"</string>
     <string name="user_add_profile_item_title" msgid="8353515490730363621">"সীমাবদ্ধ প্রোফাইল"</string>
     <string name="user_add_user_title" msgid="2108112641783146007">"নতুন ব্যবহারকারী জুড়বেন?"</string>
-    <string name="user_add_user_message_long" msgid="8562152293752222985">"আপনি একাধিক ব্যবহারকারী তৈরি করে অন্যদের সাথে এই ডিভাইস শেয়ার করতে পারেন। প্রতিটি ব্যবহারকারীদের কাছে তাদের নিজস্ব স্থান রয়েছে যা তারা অ্যাপ্লিকেশান, ওয়ালপেপার, এবং আরো অনেক কিছু দিয়ে কাস্টমাইজ করতে পারেন। ব্যবহারকারীরা ওয়াই-ফাই এর মত ডিভাইস সেটিংস সামঞ্জস্য করতে পারবেন যার প্রভাব পড়বে সকলের উপর।\n\nনতুন ব্যবহারকারী তৈরি হওয়ার পরে, সেই ব্যক্তিকে তাদের স্থান সেট আপ করতে হবে।\n\nঅন্যান্য ব্যবহারকারীদের হয়ে যে কোনো ব্যবহারকারী অ্যাপ্লিকেশানগুলি আপডেট করতে পারবেন।"</string>
+    <string name="user_add_user_message_long" msgid="8562152293752222985">"আপনি একাধিক ব্যবহারকারী তৈরি করে অন্যদের সাথে এই ডিভাইস শেয়ার করতে পারেন। প্রতিটি ব্যবহারকারীদের কাছে তাঁদের নিজস্ব জায়গা রয়েছে যা তারা অ্যাপ, ওয়ালপেপার, এবং আরও অনেক কিছু দিয়ে কাস্টমাইজ করতে পারেন। ব্যবহারকারীরা ওয়াই-ফাই এর মতো ডিভাইস সেটিংস সামঞ্জস্য করতে পারবেন যার প্রভাব পড়বে সকলের ওপর।.\n\nনতুন ব্যবহারকারী তৈরি হওয়ার পরে, সেই ব্যক্তিকে তাঁদের জায়গা সেট-আপ করতে হবে।.\n\nঅন্যান্য ব্যবহারকারীদের হয়ে যেকোনও ব্যবহারকারী অ্যাপগুলি আপডেট করতে পারবেন।"</string>
     <string name="user_add_user_message_short" msgid="1511354412249044381">"আপনি একজন নতুন ব্যবহারকারী জুড়লে তাকে তার জায়গা সেট আপ করে নিতে হবে।\n\nযেকোনো ব্যবহারকারী অন্য সব ব্যবহারকারীর জন্য অ্যাপ্লিকেশান আপডেট করতে পারবেন।"</string>
     <string name="user_setup_dialog_title" msgid="1765794166801864563">"এখন ব্যবহারকারী সেট আপ করবেন?"</string>
-    <string name="user_setup_dialog_message" msgid="1004068621380867148">"নিশ্চিত করুন যে ব্যক্তিটি ডিভাইসটি নেওয়ার জন্য এবং তার স্থান সেট আপ করার জন্য উপলব্ধ আছেন"</string>
+    <string name="user_setup_dialog_message" msgid="1004068621380867148">"নিশ্চিত করুন, যে ব্যক্তিটি ডিভাইসটি নেওয়ার জন্য এবং তার জায়গা সেট-আপ করার জন্য উপলব্ধ আছেন"</string>
     <string name="user_setup_profile_dialog_message" msgid="3896568553327558731">"এখনই প্রোফাইল সেট আপ করবেন?"</string>
     <string name="user_setup_button_setup_now" msgid="3391388430158437629">"এখনই সেট আপ করুন"</string>
     <string name="user_setup_button_setup_later" msgid="3068729597269172401">"এখনই নয়"</string>
@@ -2580,7 +2591,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>
@@ -2588,8 +2599,8 @@
     <string name="user_confirm_remove_title" msgid="1163721647646152032">"এই ব্যবহারকারী সরাবেন?"</string>
     <string name="user_profile_confirm_remove_title" msgid="5573161550669867342">"এই প্রোফাইলটি সরাবেন?"</string>
     <string name="work_profile_confirm_remove_title" msgid="2017323555783522213">"কর্মস্থলের প্রোফাইল সরাবেন?"</string>
-    <string name="user_confirm_remove_self_message" product="tablet" msgid="2391372805233812410">"আপনি এই ট্যাবলেটে আপনার স্থান ও ডেটা হারিয়ে ফেলবেন। আপনি এটিকে পূর্বাবস্থায় ফেরাতে পারবেন না।"</string>
-    <string name="user_confirm_remove_self_message" product="default" msgid="7943645442479360048">"আপনি এই ফোনে আপনার স্থান ও ডেটা হারিয়ে ফেলবেন। আপনি এটিকে পূর্বাবস্থায় ফেরাতে পারবেন না।"</string>
+    <string name="user_confirm_remove_self_message" product="tablet" msgid="2391372805233812410">"আপনি এই ট্যাবলেটে আপনার জায়গা ও ডেটা হারিয়ে ফেলবেন। আপনি এটিকে আগের অবস্থায় ফেরাতে পারবেন না।"</string>
+    <string name="user_confirm_remove_self_message" product="default" msgid="7943645442479360048">"আপনি এই ফোনে আপনার জায়গা ও ডেটা হারিয়ে ফেলবেন। আপনি এটিকে আগের অবস্থায় ফেরাতে পারবেন না।"</string>
     <string name="user_confirm_remove_message" msgid="1020629390993095037">"সব অ্যাপ্লিকেশান ও ডেটা মুছে ফেলা হবে।"</string>
     <string name="work_profile_confirm_remove_message" msgid="323856589749078140">"যদি আপনি চালিয়ে যান তবে এই প্রোফাইলের সমস্ত অ্যাপ্লিকেশান ও ডেটা মুছে ফেলা হবে৷"</string>
     <string name="user_profile_confirm_remove_message" msgid="7373754145959298522">"সব অ্যাপ্লিকেশান ও ডেটা মুছে ফেলা হবে।"</string>
@@ -2612,7 +2623,7 @@
     <string name="emergency_info_summary" msgid="5062945162967838521">"<xliff:g id="USER_NAME">%1$s</xliff:g> এর তথ্য ও পরিচিতি"</string>
     <string name="application_restrictions" msgid="8207332020898004394">"অ্যাপ্লিকেশান এবং সামগ্রীর অনুমতি দিন"</string>
     <string name="apps_with_restrictions_header" msgid="3660449891478534440">"সীমাবদ্ধ সহ অ্যাপ্লিকেশানগুলি"</string>
-    <string name="apps_with_restrictions_settings_button" msgid="3841347287916635821">"অ্যাপ্লিকেশানের জন্য সেটিংস প্রসারিত করুন"</string>
+    <string name="apps_with_restrictions_settings_button" msgid="3841347287916635821">"অ্যাপ্লিকেশনের জন্য সেটিংস খুলুন"</string>
     <string name="global_change_warning" product="tablet" msgid="8045013389464294039">"এই সেটিংটি এই ট্যাবলেটের সব ব্যবহারকারীদের প্রভাবিত করবে।"</string>
     <string name="global_change_warning" product="default" msgid="2461264421590324675">"এই সেটিংটি এই ফোনের সব ব্যবহারকারীদের প্রভাবিত করবে।"</string>
     <string name="global_locale_change_title" msgid="5956281361384221451">"ভাষা পরিবর্তন করুন"</string>
@@ -2625,9 +2636,9 @@
     <string name="nfc_payment_use_default" msgid="3234730182120288495">"ডিফল্ট ব্যবহার করুন"</string>
     <string name="nfc_payment_favor_default" msgid="5743781166099608372">"সবসময়"</string>
     <string name="nfc_payment_favor_open" msgid="1923314062109977944">"অন্য কোনো অর্থপ্রদান অ্যাপ্লিকেশান খুলে থাকার সময় ব্যতিত"</string>
-    <string name="nfc_payment_pay_with" msgid="7524904024378144072">"ট্যাপ করে অর্থপ্রদান করুন টার্মিন্যালে, এর মাধ্যমে অর্থ প্রদান করুন:"</string>
-    <string name="nfc_how_it_works_title" msgid="1984068457698797207">"টার্মিনালে অর্থপ্রদানের পদ্ধতি"</string>
-    <string name="nfc_how_it_works_content" msgid="4749007806393224934">"একটি অর্থপ্রদানের অ্যাপ্লিকেশান সেট আপ করুন৷ তারপরে যোগাযোগহীন চিহ্ন সহ কোনো টার্মিনালের উপর শুধু আপনার ফোনের পিছনের দিকটি ধরুন৷"</string>
+    <string name="nfc_payment_pay_with" msgid="7524904024378144072">"ট্যাপ করে অর্থপ্রদান করুন টার্মিন্যালে, এর মাধ্যমে পেমেন্ট করুন:"</string>
+    <string name="nfc_how_it_works_title" msgid="1984068457698797207">"টার্মিনালে পেমেন্টের পদ্ধতি"</string>
+    <string name="nfc_how_it_works_content" msgid="4749007806393224934">"একটি পেমেন্টের অ্যাপ্লিকেশান সেট আপ করুন৷ তারপরে যোগাযোগহীন চিহ্ন সহ কোনো টার্মিনালের উপর শুধু আপনার ফোনের পিছনের দিকটি ধরুন৷"</string>
     <string name="nfc_how_it_works_got_it" msgid="259653300203217402">"বুঝেছি"</string>
     <string name="nfc_more_title" msgid="815910943655133280">"আরো..."</string>
     <string name="nfc_payment_set_default_label" msgid="7315817259485674542">"আপনার পছন্দ হিসেবে সেট করুন?"</string>
@@ -2637,7 +2648,7 @@
     <string name="restriction_menu_reset" msgid="2067644523489568173">"সীমাবদ্ধগুলি সরান"</string>
     <string name="restriction_menu_change_pin" msgid="740081584044302775">"পিন পরিবর্তন করুন"</string>
     <string name="app_notifications_switch_label" msgid="9124072219553687583">"বিজ্ঞপ্তিগুলি প্রদর্শন করুন"</string>
-    <string name="help_label" msgid="6886837949306318591">"সহায়তা এবং প্রতিক্রিয়া"</string>
+    <string name="help_label" msgid="6886837949306318591">"সহায়তা ও মতামত"</string>
     <string name="support_summary" msgid="2705726826263742491">"সহায়তা বিষয়ক নিবন্ধ, ফোন এবং চ্যাট, শুরু করার জন্য টিপ্স"</string>
     <string name="user_account_title" msgid="1127193807312271167">"সামগ্রীর জন্য অ্যাকাউন্ট"</string>
     <string name="user_picture_title" msgid="7297782792000291692">"ফটো ID"</string>
@@ -2653,7 +2664,7 @@
     <string name="call_manager_title" msgid="4479949569744516457">"কল ম্যানেজার"</string>
     <!-- no translation found for call_manager_summary (5918261959486952674) -->
     <skip />
-    <string name="cell_broadcast_settings" msgid="4124461751977706019">"জরুরী অবস্থার অ্যালার্ট"</string>
+    <string name="cell_broadcast_settings" msgid="4124461751977706019">"জরুরি সতর্কতা"</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>
@@ -2661,8 +2672,8 @@
     <string name="preferred_network_type_title" msgid="3431041717309776341">"পছন্দের নেটওয়ার্ক"</string>
     <string name="preferred_network_type_summary" msgid="6564884693884755019">"LTE (প্রস্তাবিত)"</string>
     <string name="work_sim_title" msgid="4843322164662606891">"কর্মস্থলের সিম"</string>
-    <string name="user_restrictions_title" msgid="5794473784343434273">"অ্যাপ্লিকেশান &amp; সামগ্রী অ্যাক্সেস"</string>
-    <string name="user_rename" msgid="8523499513614655279">"আবার নামকরণ করুন"</string>
+    <string name="user_restrictions_title" msgid="5794473784343434273">"অ্যাপ্লিকেশন ও কন্টেন্ট অ্যাক্সেস"</string>
+    <string name="user_rename" msgid="8523499513614655279">"নাম বদলান"</string>
     <string name="app_restrictions_custom_label" msgid="6160672982086584261">"অ্যাপ্লিকেশান সীমাবদ্ধগুলি সেট করুন"</string>
     <string name="user_restrictions_controlled_by" msgid="3164078767438313899">"<xliff:g id="APP">%1$s</xliff:g> দ্বারা নিয়ন্ত্রিত"</string>
     <string name="app_sees_restricted_accounts" msgid="7503264525057246240">"এই অ্যাপ্লিকেশানটি আপনার অ্যাকাউন্টগুলি করতে পারবে:"</string>
@@ -2670,7 +2681,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>
@@ -2682,7 +2693,7 @@
     <string name="wizard_finish" msgid="3286109692700083252">"শেষ"</string>
     <string name="user_image_take_photo" msgid="1280274310152803669">"ফটো তুলুন"</string>
     <string name="user_image_choose_photo" msgid="7940990613897477057">"গ্যালারি থেকে ফটো চয়ন করুন"</string>
-    <string name="user_image_photo_selector" msgid="5492565707299454873">"ফটো নির্বাচন করুন"</string>
+    <string name="user_image_photo_selector" msgid="5492565707299454873">"ফটো বেছে নিন"</string>
     <string name="regulatory_info_text" msgid="5623087902354026557"></string>
     <string name="sim_setup_wizard_title" msgid="1732682852692274928">"সিম কার্ডগুলি"</string>
     <string name="sim_settings_title" msgid="6822745211458959756">"সিম কার্ডগুলি"</string>
@@ -2695,7 +2706,7 @@
     <string name="select_sim_for_data" msgid="2366081042162853044">"ডেটার জন্য একটি সিম বেছে নিন"</string>
     <string name="data_switch_started" msgid="2040761479817166311">"ডেটা সিম পাল্টাতে এক মিনিট পর্যন্ত সময় লাগতে পারে..."</string>
     <string name="select_sim_for_calls" msgid="3503094771801109334">"এর মাধ্যমে কল করুন"</string>
-    <string name="sim_select_card" msgid="211285163525563293">"একটি সিম কার্ড নির্বাচন করুন"</string>
+    <string name="sim_select_card" msgid="211285163525563293">"একটি সিম কার্ড বেছে নিন"</string>
     <string name="sim_card_number_title" msgid="7845379943474336488">"সিম <xliff:g id="CARD_NUMBER">%1$d</xliff:g>"</string>
     <string name="sim_slot_empty" msgid="8964505511911854688">"সিম খালি"</string>
     <string name="sim_editor_name" msgid="1722945976676142029">"সিম এর নাম"</string>
@@ -2704,9 +2715,9 @@
     <string name="sim_editor_carrier" msgid="5684523444677746573">"পরিষেবা প্রদানকারী"</string>
     <string name="sim_editor_number" msgid="6705955651035440667">"সংখ্যা"</string>
     <string name="sim_editor_color" msgid="2542605938562414355">"সিম এর রঙ"</string>
-    <string name="sim_card_select_title" msgid="6668492557519243456">"সিম কার্ড নির্বাচন করুন"</string>
+    <string name="sim_card_select_title" msgid="6668492557519243456">"সিম কার্ড বেছে নিন"</string>
     <string name="color_orange" msgid="4417567658855022517">"কমলা"</string>
-    <string name="color_purple" msgid="3888532466427762504">"বেগুনি"</string>
+    <string name="color_purple" msgid="3888532466427762504">"বেগুনী"</string>
     <string name="sim_no_inserted_msg" msgid="210316755353227087">"কোনো সিম কার্ড ঢোকানো নেই"</string>
     <string name="sim_status_title" msgid="6744870675182447160">"সিম এর স্থিতি"</string>
     <string name="sim_call_back_title" msgid="5181549885999280334">"ডিফল্ট সিম থেকে কল ব্যাক করুন"</string>
@@ -2727,6 +2738,7 @@
       <item quantity="one">%dটি লুকানো আইটেম দেখান</item>
       <item quantity="other">%dটি লুকানো আইটেম দেখান</item>
     </plurals>
+    <string name="dashboard_suggestion_condition_footer_content_description" msgid="2898588191174845961">"সঙ্কুচিত করুন"</string>
     <string name="network_dashboard_title" msgid="4771589228992391573">"নেটওয়ার্ক ও ইন্টারনেট"</string>
     <string name="network_dashboard_summary_mobile" msgid="3851083934739500429">"মোবাইল"</string>
     <string name="network_dashboard_summary_data_usage" msgid="3843261364705042212">"ডেটার ব্যবহার"</string>
@@ -2734,16 +2746,16 @@
     <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_title" msgid="7838365599185397539">"অ্যাপ ও বিজ্ঞপ্তি"</string>
     <string name="app_and_notification_dashboard_summary" msgid="2363314178802548682">"অনুমতিগুলি, ডিফল্ট অ্যাপ্স"</string>
     <string name="account_dashboard_title" msgid="4936890821712178853">"ব্যবহারকারী এবং অ্যাকাউন্টগুলি"</string>
-    <string name="app_default_dashboard_title" msgid="7342549305933047317">"ডিফল্ট অ্যাপ্স"</string>
+    <string name="app_default_dashboard_title" msgid="7342549305933047317">"ডিফল্ট অ্যাপ"</string>
     <string name="system_dashboard_summary" msgid="5797743225249766685">"ভাষা, সময়, ব্যাকআপ, আপডেট"</string>
     <string name="search_results_title" msgid="1796252422574886932">"সেটিংস"</string>
-    <string name="search_menu" msgid="6283419262313758339">"সেটিংসে অনুসন্ধান করুন"</string>
-    <string name="query_hint_text" msgid="3350700807437473939">"সেটিংসে অনুসন্ধান করুন"</string>
+    <string name="search_menu" msgid="6283419262313758339">"সেটিংস খুঁজুন"</string>
+    <string name="query_hint_text" msgid="3350700807437473939">"সেটিংস খুঁজুন"</string>
     <string name="keywords_wifi" msgid="1395786161993828719">"wifi, wi-fi, নেটওয়ার্ক সংযোগ"</string>
-    <string name="keywords_more_default_sms_app" msgid="2265154063220360784">"পাঠ্য বার্তা, পাঠ্য বার্তা পাঠানো, বার্তাগুলি, বার্তালাপ"</string>
+    <string name="keywords_more_default_sms_app" msgid="2265154063220360784">"টেক্সট মেসেজ, টেক্সট মেসেজ পাঠানো, মেসেজগুলি, মেসেজিং"</string>
     <string name="keywords_more_mobile_networks" msgid="8995946622054642367">"সেলুলার, মোবাইল, সেলুলার পরিষেবা প্রদানকারী, ওয়্যারলেস, ডেটা, 4g, 3g, 2g, lte"</string>
     <string name="keywords_wifi_calling" msgid="1784064367330122679">"wifi, wi-fi, কল করুন, কল করা হচ্ছে"</string>
     <string name="keywords_home" msgid="3626170808219458848">"লঞ্চার"</string>
@@ -2751,14 +2763,14 @@
     <string name="keywords_display_brightness_level" msgid="3891383826236015854">"স্ক্রীন অস্পষ্ট করুন, টাচস্ক্রীন, ব্যাটারি"</string>
     <string name="keywords_display_auto_brightness" msgid="3325150824507953765">"স্ক্রীন অস্পষ্ট করুন, টাচস্ক্রীন, ব্যাটারি"</string>
     <string name="keywords_display_night_display" msgid="7630169927425425754">"স্ক্রীন অস্পষ্ট করুন, রাত্রি, আভা"</string>
-    <string name="keywords_display_wallpaper" msgid="7362076351860131776">"পটভূমি, ব্যক্তিগত করুন, প্রদর্শন কাস্টমাইজ করুন"</string>
+    <string name="keywords_display_wallpaper" msgid="7362076351860131776">"ব্যাকগ্রাউন্ড, ব্যক্তিগতকরণ, কাস্টমাইজ ডিসপ্লে"</string>
     <string name="keywords_display_font_size" msgid="3404655440064726124">"পাঠ্য আকার"</string>
     <string name="keywords_display_cast_screen" msgid="7684618996741933067">"প্রকল্প, কাস্ট করুন"</string>
-    <string name="keywords_storage" msgid="3299217909546089225">"স্থান, ডিস্ক, হার্ড ড্রাইভ, ডিভাইসের ব্যবহার"</string>
+    <string name="keywords_storage" msgid="3299217909546089225">"জায়গা, ডিস্ক, হার্ড ড্রাইভ, ডিভাইসের ব্যবহার"</string>
     <string name="keywords_battery" msgid="1173830745699768388">"পাওয়ারের ব্যবহার, চার্জ"</string>
     <string name="keywords_spell_checker" msgid="1399641226370605729">"বানান, অভিধান, বানান-পরীক্ষা, স্বতঃ-সংশোধন"</string>
     <string name="keywords_voice_input" msgid="769778245192531102">"শনাক্তকারী, ইনপুট, স্পিচ, বলুন, ভাষা, হ্যান্ডসফ্রী, হ্যান্ড ফ্রী, শনাক্তকরণ, আপত্তিকর, শব্দ, অডিও, ইতিহাস, ব্লুটুথ হেডসেট"</string>
-    <string name="keywords_text_to_speech_output" msgid="5150660047085754699">"হার, ভাষা, ডিফল্ট, কথা বলা, কথা বলছে, tts, অ্যাক্সেসযোগ্যতা, স্ক্রীন রিডার, অন্ধ"</string>
+    <string name="keywords_text_to_speech_output" msgid="5150660047085754699">"হার, ভাষা, ডিফল্ট, কথা বলা, কথা বলছে, tts, অ্যাক্সেসযোগ্যতা, স্ক্রিন রিডার, অন্ধ"</string>
     <string name="keywords_date_and_time" msgid="758325881602648204">"ঘড়ি, সেনাবাহিনী"</string>
     <string name="keywords_network_reset" msgid="6024276007080940820">"আবার সেট করুন, পুনরুদ্ধার করুন, ফ্যাক্টরি"</string>
     <string name="keywords_factory_data_reset" msgid="5894970373671252165">"মোছা, মুছুন, পুনরুদ্ধার করুন, সাফ করুন, সরান"</string>
@@ -2770,24 +2782,23 @@
     <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="3526905012224714078">"অঙ্গভঙ্গি"</string>
+    <string name="keywords_gesture" msgid="3526905012224714078">"ইঙ্গিত"</string>
     <string name="keywords_payment_settings" msgid="5220104934130446416">"অর্থপ্রদান, আলতো চাপা, পেমেন্ট"</string>
-    <string name="keywords_backup" msgid="470070289135403022">"ব্যাকআপ, ব্যাক আপ"</string>
-    <!-- no translation found for keywords_assist_gesture_launch (813968759791342591) -->
-    <skip />
+    <string name="keywords_backup" msgid="470070289135403022">"ব্যাক-আপ, ব্যাক-আপ করুন"</string>
+    <string name="keywords_assist_gesture_launch" msgid="813968759791342591">"ইঙ্গিত"</string>
     <string name="setup_wifi_nfc_tag" msgid="9028353016222911016">"ওয়াই-ফাই NFC ট্যাগ সেটআপ করুন"</string>
     <string name="write_tag" msgid="8571858602896222537">"লিখুন"</string>
     <string name="status_awaiting_tap" msgid="2130145523773160617">"লিখতে একটি ট্যাগে আলতো চাপুন..."</string>
@@ -2795,10 +2806,10 @@
     <string name="status_write_success" msgid="5228419086308251169">"সফল!"</string>
     <string name="status_failed_to_write" msgid="8072752734686294718">"NFC ট্যাগে ডেটা লিখতে ব্যর্থ হয়েছে৷ যদি সমস্যাটি থেকে যায়, তবে অন্য একটি ট্যাগ দিয়ে চেষ্টা করুন"</string>
     <string name="status_tag_not_writable" msgid="2511611539977682175">"NFC ট্যাগ লিখনযোগ্য নয়৷ দয়া করে একটি আলাদা ট্যাগ ব্যবহার করুন৷"</string>
-    <string name="default_sound" msgid="8821684447333687810">"ডিফল্ট শব্দ"</string>
+    <string name="default_sound" msgid="8821684447333687810">"ডিফল্ট সাউন্ড"</string>
     <string name="sound_settings_summary" msgid="4100853606668287965">"রিং ভলিউম <xliff:g id="PERCENTAGE">%1$s</xliff:g> তে রয়েছে"</string>
     <string name="sound_dashboard_summary" msgid="3402435125958012986">"ভলিউম, কম্পন, বিরক্ত করবেন না"</string>
-    <string name="sound_settings_summary_vibrate" msgid="1869282574422220096">"রিঙ্গারকে কম্পন অবস্থায় সেট করা হয়েছে"</string>
+    <string name="sound_settings_summary_vibrate" msgid="1869282574422220096">"রিঙ্গারকে ভাইব্রেট অবস্থায় সেট করা হয়েছে"</string>
     <string name="sound_settings_summary_silent" msgid="5074529767435584948">"রিঙ্গারকে নীরব অবস্থায় সেট করা হয়েছে"</string>
     <string name="sound_settings_example_summary" msgid="2404914514266523165">"রিং ভলিউম ৮০% তে রয়েছে"</string>
     <string name="media_volume_option_title" msgid="2811531786073003825">"মিডিয়া ভলিউম"</string>
@@ -2806,32 +2817,38 @@
     <string name="ring_volume_option_title" msgid="6767101703671248309">"রিং ভলিউম"</string>
     <string name="notification_volume_option_title" msgid="6064656124416882130">"বিজ্ঞপ্তির ভলিউম"</string>
     <string name="ringtone_title" msgid="5379026328015343686">"ফোন রিংটোন"</string>
-    <string name="notification_ringtone_title" msgid="4468722874617061231">"ডিফল্ট বিজ্ঞপ্তি শব্দ"</string>
+    <string name="notification_ringtone_title" msgid="4468722874617061231">"ডিফল্ট বিজ্ঞপ্তির সাউন্ড"</string>
     <string name="notification_unknown_sound_title" msgid="2535027767851838335">"শব্দটি অ্যাপ দ্বারা দেওয়া হয়েছে"</string>
-    <string name="notification_sound_default" msgid="565135733949733766">"বিজ্ঞপ্তির ডিফল্ট শব্দ"</string>
-    <string name="alarm_ringtone_title" msgid="6344025478514311386">"ডিফল্ট অ্যালার্মের শব্দ"</string>
-    <string name="vibrate_when_ringing_title" msgid="3806079144545849032">"এছাড়াও কল এলে ভাইব্রেট করুন"</string>
+    <string name="notification_sound_default" msgid="565135733949733766">"ডিফল্ট বিজ্ঞপ্তির সাউন্ড"</string>
+    <string name="alarm_ringtone_title" msgid="6344025478514311386">"ডিফল্ট অ্যালার্মের সাউন্ড"</string>
+    <string name="vibrate_when_ringing_title" msgid="3806079144545849032">"কল এলে ভাইব্রেট হবে"</string>
     <string name="other_sound_settings" msgid="3151004537006844718">"অন্যান্য শব্দগুলি"</string>
     <string name="dial_pad_tones_title" msgid="1999293510400911558">"ডায়াল প্যাডের টোনগুলি"</string>
     <string name="screen_locking_sounds_title" msgid="1340569241625989837">"স্ক্রিন লক হওয়ার শব্দ"</string>
     <string name="charging_sounds_title" msgid="1132272552057504251">"চার্জ হওয়ার সময় শব্দগুলি"</string>
     <string name="docking_sounds_title" msgid="155236288949940607">"ডকিং শব্দগুলি"</string>
     <string name="touch_sounds_title" msgid="5326587106892390176">"স্পর্শ শব্দ"</string>
-    <string name="vibrate_on_touch_title" msgid="5388579924689395023">"আলতো চাপে কম্পন"</string>
+    <string name="vibrate_on_touch_title" msgid="5388579924689395023">"আলতো চাপে ভাইব্রেট"</string>
     <string name="dock_audio_media_title" msgid="1346838179626123900">"ডক স্পিকার শুরু"</string>
     <string name="dock_audio_media_disabled" msgid="3430953622491538080">"সমস্ত অডিও"</string>
     <string name="dock_audio_media_enabled" msgid="667849382924908673">"কেবলমাত্র মিডিয়া অডিও"</string>
     <string name="emergency_tone_silent" msgid="1067515631635824291">"নীরব"</string>
     <string name="emergency_tone_alert" msgid="8941852695428130667">"সতর্কতা"</string>
-    <string name="emergency_tone_vibrate" msgid="8281126443204950847">"কম্পন"</string>
+    <string name="emergency_tone_vibrate" msgid="8281126443204950847">"ভাইব্রেট"</string>
     <string name="boot_sounds_title" msgid="567029107382343709">"ধ্বনিগুলিতে শক্তি"</string>
     <string name="zen_mode_settings_summary_off" msgid="1857165567766351925">"কোনো স্বয়ংক্রিয় নিয়ম চালু করা নেই"</string>
     <plurals name="zen_mode_settings_summary_on" formatted="false" msgid="1216562765753405784">
       <item quantity="one"><xliff:g id="ON_COUNT">%d</xliff:g>টি স্বয়ংক্রিয় নিয়ম চালু করা হয়েছে</item>
       <item quantity="other"><xliff:g id="ON_COUNT">%d</xliff:g>টি স্বয়ংক্রিয় নিয়ম চালু করা হয়েছে</item>
     </plurals>
-    <string name="zen_mode_settings_title" msgid="842308776768942600">"\'বিরক্ত করবেন না\' বিকল্পগুলি"</string>
-    <string name="zen_mode_priority_settings_title" msgid="2623117023031824309">"অগ্রাধিকার অনুমতিগুলি"</string>
+    <string name="zen_mode_settings_title" msgid="1066226840983908121">"বিরক্ত করবেন না"</string>
+    <string name="zen_mode_behavior_settings_title" msgid="1463303933529313969">"আচরণ"</string>
+    <string name="zen_mode_behavior_allow_title" msgid="3845615648136218141">"এগুলির সাউন্ড ও ভাইব্রেশন হবে"</string>
+    <string name="zen_mode_behavior_no_sound" msgid="1219626004723208056">"কোনও সাউন্ড নয়"</string>
+    <string name="zen_mode_behavior_total_silence" msgid="6716603819806610626">"কোনও সাউন্ড নয় (সম্পূর্ণ নীরব)"</string>
+    <string name="zen_mode_behavior_no_sound_except" msgid="4968477585788243114">"<xliff:g id="CATEGORIES">%1$s</xliff:g> ছাড়া কোনও সাউন্ড নয়"</string>
+    <!-- no translation found for zen_mode_behavior_alarms_only (2423480992071472963) -->
+    <skip />
     <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>
@@ -2853,33 +2870,35 @@
     <string name="ringtones_install_custom_sound_title" msgid="5948792721161302255">"কোনো কাস্টম শব্দ যোগ করবেন?"</string>
     <string name="ringtones_install_custom_sound_content" msgid="2195581481608512786">"এই ফাইলটি <xliff:g id="FOLDER_NAME">%s</xliff:g> ফোল্ডারে কপি করা হবে"</string>
     <string name="ringtones_category_preference_title" msgid="5675912303120102366">"রিংটোনগুলি"</string>
-    <string name="other_sound_category_preference_title" msgid="2521096636124314015">"অন্যান্য শব্দ এবং কম্পন"</string>
+    <string name="other_sound_category_preference_title" msgid="2521096636124314015">"অন্যান্য সাউন্ড এবং ভাইব্রেশন"</string>
     <string name="configure_notification_settings" msgid="7616737397127242615">"বিজ্ঞপ্তি"</string>
     <string name="advanced_section_header" msgid="8833934850242546903">"উন্নত"</string>
     <string name="profile_section_header" msgid="2320848161066912001">"কর্মস্থলের বিজ্ঞপ্তিগুলি"</string>
     <string name="notification_badging_title" msgid="5938709971403474078">"একাধিক বিজ্ঞপ্তি ডট দেখাতে দিন"</string>
     <string name="notification_pulse_title" msgid="1905382958860387030">"মিটমিট করা আলো"</string>
-    <string name="lock_screen_notifications_title" msgid="6173076173408887213">"লক স্ক্রীনে"</string>
+    <string name="lock_screen_notifications_title" msgid="6173076173408887213">"লক স্ক্রিনে"</string>
     <string name="lock_screen_notifications_summary_show" msgid="6407527697810672847">"সমস্ত বিজ্ঞপ্তির সামগ্রীগুলি দেখান"</string>
-    <string name="lock_screen_notifications_summary_hide" msgid="7891552853357258782">"সংবেদনশীল বিজ্ঞপ্তির সামগ্রী লুকান"</string>
-    <string name="lock_screen_notifications_summary_disable" msgid="859628910427886715">"কোনো বিজ্ঞপ্তি দেখাবেন না"</string>
+    <string name="lock_screen_notifications_summary_hide" msgid="7891552853357258782">"সংবেদনশীল বিজ্ঞপ্তির কন্টেন্ট লুকান"</string>
+    <string name="lock_screen_notifications_summary_disable" msgid="859628910427886715">"কোনও বিজ্ঞপ্তি দেখাবেন না"</string>
     <string name="lock_screen_notifications_interstitial_message" msgid="6164532459432182244">"আপনার ডিভাইস লক করা অবস্থায় আপনি কিভাবে বিজ্ঞপ্তি প্রদর্শন করতে চান?"</string>
     <string name="lock_screen_notifications_interstitial_title" msgid="1416589393106326972">"বিজ্ঞপ্তিগুলি"</string>
-    <string name="lock_screen_notifications_summary_show_profile" msgid="835870815661120772">"সমস্ত কর্মস্থলের বিজ্ঞপ্তির সামগ্রী দেখান"</string>
-    <string name="lock_screen_notifications_summary_hide_profile" msgid="256116258285695645">"সংবেদনশীল কর্মস্থলের বিজ্ঞপ্তির সামগ্রী লুকান"</string>
+    <string name="lock_screen_notifications_summary_show_profile" msgid="835870815661120772">"সমস্ত কর্মস্থলের বিজ্ঞপ্তির কন্টেন্ট দেখুন"</string>
+    <string name="lock_screen_notifications_summary_hide_profile" msgid="256116258285695645">"সংবেদনশীল কর্মস্থলের বিজ্ঞপ্তির কন্টেন্ট লুকান"</string>
     <string name="lock_screen_notifications_summary_disable_profile" msgid="4080720698960233358">"কোনো কর্মস্থলের বিজ্ঞপ্তি দেখাবেন না"</string>
     <string name="lock_screen_notifications_interstitial_message_profile" msgid="8307705621027472346">"আপনার ডিভাইস লক করা অবস্থায় আপনি কিভাবে প্রোফাইল বিজ্ঞপ্তিগুলি প্রদর্শন করতে চান?"</string>
     <string name="lock_screen_notifications_interstitial_title_profile" msgid="3169806586032521333">"প্রোফাইল বিজ্ঞপ্তিগুলি"</string>
     <string name="notifications_title" msgid="8086372779371204971">"বিজ্ঞপ্তি"</string>
-    <string name="app_notifications_title" msgid="5810577805218003760">"অ্যাপ বিজ্ঞপ্তিগুলি"</string>
+    <string name="app_notifications_title" msgid="5810577805218003760">"অ্যাপ বিজ্ঞপ্তি"</string>
     <string name="notification_channel_title" msgid="2260666541030178452">"বিজ্ঞপ্তির বিভাগ"</string>
+    <string name="notification_group_title" msgid="7180506440133859601">"বিজ্ঞপ্তির বিভাগের গ্রুপ"</string>
     <string name="notification_importance_title" msgid="848692592679312666">"গুরুত্ব"</string>
-    <string name="notification_importance_unspecified" msgid="2196023702875112081">"অ্যাপটিকে সিদ্ধান্ত নিতে দিন"</string>
+    <string name="notification_importance_unspecified" msgid="6622173510486113958">"সাউন্ডের অনুমতি দিন"</string>
     <string name="notification_importance_blocked" msgid="7938180808339386300">"কখনোই বিজ্ঞপ্তগুলি দেখায় না"</string>
     <string name="notification_importance_min" msgid="5455049524984686275">"কোনো শব্দ বা ভিজ্যুয়াল বাধা নেই"</string>
     <string name="notification_importance_low" msgid="8881468429453766553">"শব্দ করবে না"</string>
     <string name="notification_importance_default" msgid="5958338024601957516">"শব্দ করে"</string>
-    <string name="notification_importance_high" msgid="2082429479238228527">"শব্দ করে ও স্ক্রীনে ভেসে ওঠে"</string>
+    <string name="notification_importance_high" msgid="2082429479238228527">"সাউন্ড হবে ও স্ক্রিনে ভেসে উঠবে"</string>
+    <string name="notification_importance_high_silent" msgid="2667033773703765252">"স্ক্রিনে দেখান"</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>
@@ -2905,7 +2924,7 @@
     <string name="notification_listener_disable_warning_confirm" msgid="8333442186428083057">"বন্ধ করুন"</string>
     <string name="notification_listener_disable_warning_cancel" msgid="8586417377104211584">"বাতিল করুন"</string>
     <string name="vr_listeners_title" msgid="1318901577754715777">"(ভিআর)VR সহায়তাকারী পরিষেবাগুলি"</string>
-    <string name="no_vr_listeners" msgid="2689382881717507390">"vr সহায়তাকারী পরিষেবা হিসাবে চলার জন্য কোনো অ্যাপ্লিকেশান ইনস্টল করা নেই৷"</string>
+    <string name="no_vr_listeners" msgid="2689382881717507390">"vr সহায়তাকারী পরিষেবা হিসেবে চলার জন্য কোনো অ্যাপ্লিকেশান ইনস্টল করা নেই৷"</string>
     <string name="vr_listener_security_warning_title" msgid="8309673749124927122">"<xliff:g id="SERVICE">%1$s</xliff:g> এর জন্য (ভিআর)VR পরিষেবার অ্যাক্সেসের অনুমতি দেবেন?"</string>
     <string name="vr_listener_security_warning_summary" msgid="6931541068825094653">"ভার্চুয়াল রিয়ালিটি মোডে আপনি যখন অ্যাপ্লিকেশানগুলি ব্যবহার করবেন তখন <xliff:g id="VR_LISTENER_NAME">%1$s</xliff:g> চালাতে পারবেন৷"</string>
     <string name="display_vr_pref_title" msgid="8104485269504335481">"যখন ডিভাইসটি (ভিআর)VR মোডে থাকে"</string>
@@ -2916,15 +2935,19 @@
     <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>
-    <!-- no translation found for picture_in_picture_app_detail_summary (1264019085827708920) -->
-    <skip />
+    <string name="picture_in_picture_app_detail_summary" msgid="1264019085827708920">"অ্যাপটি খোলা থাকার সময় অথবা আপনি এটি ছেড়ে বেরিয়ে গেলে (যেমন, কোনও ভিডিও দেখার জন্য) এটিকে একটি ছবির-মধ্যে-ছবি সমেত উইন্ডো তৈরি করার অনুমতি দিন। চালু থাকা অন্যান্য অ্যাপের উপরে এই উইন্ডোটি দেখা যাবে।"</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="channel_group_notifications_off_desc" msgid="1620950416247316370">"Android এই বিভাগের বিজ্ঞপ্তিগুলিকে এই ডিভাইসে দেখাতে দিচ্ছে না"</string>
     <string name="notification_channels" msgid="5346841743182627500">"বিভাগগুলি"</string>
     <string name="notification_channels_other" msgid="5645317113885788226">"অন্যান্য"</string>
+    <plurals name="notification_group_summary" formatted="false" msgid="3420621520561455358">
+      <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="no_channels" msgid="3077375508177744586">"এই অ্যাপটি দ্বারা কোন বিজ্ঞপ্তি পোস্ট করা হয়নি"</string>
     <string name="app_settings_link" msgid="8894946007543660906">"অ্যাপের আরো সেটিংস"</string>
     <string name="app_notification_listing_summary_zero" msgid="6482582965081108108">"সমস্ত অ্যাপের জন্য চালু আছে"</string>
@@ -2946,21 +2969,21 @@
     <string name="notification_channel_badge_title" msgid="2240827899882847087">"বিজ্ঞপ্তির ডট দেখান"</string>
     <string name="app_notification_override_dnd_title" msgid="7867458246395884830">"\'বিরক্ত করবেন না\' ওভাররাইড করুন"</string>
     <string name="app_notification_override_dnd_summary" msgid="3516007157020189746">"যখন শুধুমাত্র অগ্রাধিকার সাপেক্ষে \'বিরক্ত করবেন না\' সেট করা থাকবে তখন বাধাদানের ক্ষেত্রে এই বিজ্ঞপ্তিগুলিকে চালু থাকতে দিন"</string>
-    <string name="app_notification_visibility_override_title" msgid="2187232730902430718">"লক স্ক্রীনে"</string>
+    <string name="app_notification_visibility_override_title" msgid="2187232730902430718">"লক স্ক্রিনে"</string>
     <string name="app_notification_row_banned" msgid="5983655258784814773">"অবরুদ্ধ"</string>
     <string name="app_notification_row_priority" msgid="7723839972982746568">"অগ্রাধিকার"</string>
     <string name="app_notification_row_sensitive" msgid="1809610030432329940">"সংবেদনশীল"</string>
     <string name="app_notifications_dialog_done" msgid="3484067728568791014">"সম্পন্ন হয়েছে"</string>
     <string name="app_notification_importance_title" msgid="8002263131149345584">"গুরুত্ব"</string>
     <string name="notification_show_lights_title" msgid="7671781299688190532">"মিটমিট করা আলো"</string>
-    <string name="notification_vibrate_title" msgid="1646667807969755957">"কম্পন"</string>
-    <string name="notification_channel_sound_title" msgid="3899212238513507941">"শব্দ"</string>
+    <string name="notification_vibrate_title" msgid="1646667807969755957">"ভাইব্রেট"</string>
+    <string name="notification_channel_sound_title" msgid="3899212238513507941">"সাউন্ড"</string>
     <string name="zen_mode_rule_delete_button" msgid="903658142711011617">"মুছুন"</string>
-    <string name="zen_mode_rule_rename_button" msgid="4642843370946599164">"নতুন নাম দিন"</string>
+    <string name="zen_mode_rule_rename_button" msgid="4642843370946599164">"নাম বদলান"</string>
     <string name="zen_mode_rule_name" msgid="5149068059383837549">"নিয়মের নাম"</string>
     <string name="zen_mode_rule_name_hint" msgid="3781174510556433384">"নিয়মের নাম লিখুন"</string>
     <string name="zen_mode_rule_name_warning" msgid="4517805381294494314">"নিয়মের নামটি ইতিমধ্যেই ব্যবহারে রয়েছে"</string>
-    <string name="zen_mode_add_rule" msgid="7459154136384467057">"আরো জুড়ুন"</string>
+    <string name="zen_mode_add_rule" msgid="7459154136384467057">"আরও জুড়ুন"</string>
     <string name="zen_mode_delete_rule" msgid="2985902330199039533">"নিয়ম মুছুন"</string>
     <string name="zen_mode_choose_rule_type" msgid="5423746638871953459">"কোন ধরণের নিয়ম চান বাছুন"</string>
     <string name="zen_mode_delete_rule_confirmation" msgid="6237882294348570283">"\"<xliff:g id="RULE">%1$s</xliff:g>\" নিয়ম মুছে ফেলবেন?"</string>
@@ -2975,9 +2998,9 @@
     <string name="zen_mode_event_rule_calendar" msgid="8787906563769067418">"এর জন্য ইভেন্টগুলি চলাকালীন"</string>
     <string name="zen_mode_event_rule_summary_calendar_template" msgid="5135844750232403975">"<xliff:g id="CALENDAR">%1$s</xliff:g> এর জন্য ইভেন্টগুলি চলাকালীন"</string>
     <string name="zen_mode_event_rule_summary_any_calendar" msgid="4936646399126636358">"যেকোনো ক্যালেন্ডার"</string>
-    <string name="zen_mode_event_rule_summary_reply_template" msgid="6590671260829837157">"যেখানে উত্তর হ\'ল <xliff:g id="REPLY">%1$s</xliff:g>"</string>
+    <string name="zen_mode_event_rule_summary_reply_template" msgid="6590671260829837157">"যেখানে উত্তর হল <xliff:g id="REPLY">%1$s</xliff:g>"</string>
     <string name="zen_mode_event_rule_calendar_any" msgid="6485568415998569885">"যেকোনো ক্যালেন্ডার"</string>
-    <string name="zen_mode_event_rule_reply" msgid="5166322024212403739">"যখানে উত্তর হ\'ল"</string>
+    <string name="zen_mode_event_rule_reply" msgid="5166322024212403739">"যেখানে উত্তর হল"</string>
     <string name="zen_mode_event_rule_reply_any_except_no" msgid="8868873496008825961">"হ্যাঁ, হয়তো বা উত্তর দেয় নি"</string>
     <string name="zen_mode_event_rule_reply_yes_or_maybe" msgid="2769656565454495824">"হ্যাঁ অথবা হয়তো"</string>
     <string name="zen_mode_event_rule_reply_yes" msgid="1003598835878784659">"হ্যাঁ"</string>
@@ -2993,20 +3016,22 @@
     <string name="summary_range_symbol_combination" msgid="5695218513421897027">"<xliff:g id="START">%1$s</xliff:g> - <xliff:g id="END">%2$s</xliff:g>"</string>
     <string name="summary_range_verbal_combination" msgid="8467306662961568656">"<xliff:g id="START">%1$s</xliff:g> থেকে <xliff:g id="END">%2$s</xliff:g>"</string>
     <string name="zen_mode_calls" msgid="7051492091133751208">"কল"</string>
-    <string name="zen_mode_messages" msgid="5886440273537510894">"বার্তাগুলি"</string>
-    <string name="zen_mode_all_messages" msgid="6449223378976743208">"সমস্ত বার্তা"</string>
+    <string name="zen_mode_messages" msgid="5886440273537510894">"মেসেজ"</string>
+    <string name="zen_mode_all_messages" msgid="6449223378976743208">"সমস্ত মেসেজ"</string>
     <string name="zen_mode_selected_messages" msgid="8245990149599142281">"নির্বাচিত বার্তাগুলি"</string>
     <string name="zen_mode_from_anyone" msgid="2638322015361252161">"যে কোনো ব্যক্তির কাছ থেকে"</string>
     <string name="zen_mode_from_contacts" msgid="2232335406106711637">"শুধুমাত্র পরিচিতিদের থেকে"</string>
     <string name="zen_mode_from_starred" msgid="2678345811950997027">"শুধুমাত্র তারকাচিহ্নিত পরিচিতিদের থেকে"</string>
     <string name="zen_mode_from_none" msgid="8219706639954614136">"কোনো কিছুই নয়"</string>
     <string name="zen_mode_alarms" msgid="2165302777886552926">"অ্যালার্মগুলি"</string>
+    <!-- no translation found for zen_mode_media_system_other (8900209390529859777) -->
+    <skip />
     <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="239685342222975733">"একই ব্যক্তি দ্বিতীয়বার কল করলে <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>
@@ -3026,21 +3051,22 @@
     <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>
     <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="suggestion_button_text" msgid="3275010948381252006">"ঠিক আছে"</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\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>
@@ -3050,15 +3076,15 @@
     <string name="experimental_preference" msgid="7083015446690681376">"(পরীক্ষামূলক)"</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="5560954719370251702">"আপনার ডিভাইস আনলক করার জন্য আঙ্গুলের ছাপ ব্যবহার করা ছাড়াও ডিভাইসটি চালু হওয়ার সময় পাসওয়ার্ড দেওয়ার মাধ্যমে আপনি এটিকে আরো সুরক্ষিত রাখতে পারেন। ডিভাইসটি চালু না হওয়া পর্যন্ত এতে কল, বার্তা, বা অ্যালার্ম সহ বিজ্ঞপ্তি আসবে না।\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_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>
@@ -3075,14 +3101,14 @@
     <string name="app_launch_supported_domain_urls_title" msgid="8250695258211477480">"সমর্থিত লিঙ্কগুলি"</string>
     <string name="app_launch_other_defaults_title" msgid="2516812499807835178">"অন্যান্য ডিফল্টগুলি"</string>
     <string name="storage_summary_format" msgid="5419902362347539755">"<xliff:g id="STORAGE_TYPE">%2$s</xliff:g> এ ব্যবহৃত <xliff:g id="SIZE">%1$s</xliff:g>"</string>
-    <string name="storage_type_internal" msgid="6042049833565674948">"অভ্যন্তরীণ সঞ্চয়স্থান"</string>
-    <string name="storage_type_external" msgid="7738894330670001898">"বাহ্যিক সঞ্চয়স্থান"</string>
+    <string name="storage_type_internal" msgid="6042049833565674948">"ইন্টারনাল স্টোরেজ"</string>
+    <string name="storage_type_external" msgid="7738894330670001898">"এক্সটারনাল স্টোরেজ"</string>
     <string name="app_data_usage" msgid="7942375313697452803">"অ্যাপ ডেটা ব্যবহার"</string>
     <string name="data_summary_format" msgid="6213211533341068366">"<xliff:g id="DATE">%2$s</xliff:g> পর্যন্ত <xliff:g id="SIZE">%1$s</xliff:g> ব্যবহৃত হয়েছে"</string>
     <string name="storage_used" msgid="7128074132917008743">"ব্যবহৃত সঞ্চয়স্থানের পরিমান"</string>
     <string name="change" msgid="6657848623929839991">"পরিবর্তন করুন"</string>
-    <string name="change_storage" msgid="600475265207060436">"সঞ্চয়স্থান পরিবর্তন করুন"</string>
-    <string name="notifications_label" msgid="8543457911148619898">"অ্যাপ বিজ্ঞপ্তিগুলি"</string>
+    <string name="change_storage" msgid="600475265207060436">"স্টোরেজ পরিবর্তন করুন"</string>
+    <string name="notifications_label" msgid="8543457911148619898">"অ্যাপ বিজ্ঞপ্তি"</string>
     <string name="notifications_enabled" msgid="6983396130566021385">"চালু আছে"</string>
     <string name="notifications_disabled" msgid="334416731283131597">"সবকিছু বন্ধ আছে"</string>
     <string name="notifications_partly_blocked" msgid="592071133950126656">"<xliff:g id="COUNT_1">%2$d</xliff:g>টির মধ্যে <xliff:g id="COUNT_0">%1$d</xliff:g>টি বিভাগ বন্ধ আছে"</string>
@@ -3107,7 +3133,7 @@
     </plurals>
     <string name="runtime_permissions_summary_no_permissions_granted" msgid="1679758182657005375">"কোন অনুমতি দেওয়া হয় নি"</string>
     <string name="runtime_permissions_summary_no_permissions_requested" msgid="7655100570513818534">"কোন অনুমতির অনুরোধ জানানো হয় নি"</string>
-    <string name="filter_all_apps" msgid="1988403195820688644">"সমস্ত অ্যাপ্লিকেশান"</string>
+    <string name="filter_all_apps" msgid="1988403195820688644">"সমস্ত অ্যাপ্লিকেশন"</string>
     <string name="filter_enabled_apps" msgid="5395727306799456250">"ইনস্টল করা অ্যাপগুলি"</string>
     <string name="filter_instant_apps" msgid="574277769963965565">"ঝটপট অ্যাপ"</string>
     <string name="filter_personal_apps" msgid="3277727374174355971">"ব্যক্তিগত"</string>
@@ -3121,10 +3147,10 @@
     <string name="advanced_apps" msgid="4812975097124803873">"উন্নত"</string>
     <string name="configure_apps" msgid="6685680790825882528">"অ্যাপ্লিকেশান কনফিগার করুন"</string>
     <string name="unknown_app" msgid="5275921288718717656">"অজানা অ্যাপ্লিকেশান"</string>
-    <string name="app_permissions" msgid="4148222031991883874">"অ্যাপ্লিকেশানের অনুমতি"</string>
+    <string name="app_permissions" msgid="4148222031991883874">"অ্যাপ্লিকেশনের অনুমতি"</string>
     <string name="app_permissions_summary" msgid="5163974162150406324">"যে অ্যাপগুলি <xliff:g id="APPS">%1$s</xliff:g> ব্যবহার করছে"</string>
     <string name="tap_to_wake" msgid="7211944147196888807">"জাগাতে আলতো চাপুন"</string>
-    <string name="tap_to_wake_summary" msgid="4341387904987585616">"ডিভাইসকে জাগাতে স্ক্রীনের যেকোনো জায়গায় দুবার আলতো চাপুন"</string>
+    <string name="tap_to_wake_summary" msgid="4341387904987585616">"ডিভাইসকে জাগাতে স্ক্রিনের যেকোনও জায়গায় দুবার ট্যাপ করুন"</string>
     <string name="domain_urls_title" msgid="3132983644568821250">"লিঙ্কগুলি খুলছে"</string>
     <string name="domain_urls_summary_none" msgid="2639588015479657864">"সমর্থিত লিঙ্কগুলি খোলে না"</string>
     <string name="domain_urls_summary_one" msgid="3704934031930978405">"<xliff:g id="DOMAIN">%s</xliff:g> খোলে"</string>
@@ -3141,7 +3167,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>
@@ -3153,7 +3179,7 @@
     <string name="default_app" msgid="6864503001385843060">"(ডিফল্ট)"</string>
     <string name="system_app" msgid="9068313769550747372">"(সিস্টেম)"</string>
     <string name="system_default_app" msgid="3091113402349739037">"(সিস্টেম ডিফল্ট)"</string>
-    <string name="apps_storage" msgid="4353308027210435513">"অ্যাপ্লিকেশানের সঞ্চয়স্থান"</string>
+    <string name="apps_storage" msgid="4353308027210435513">"অ্যাপ্লিকেশনের স্টোরেজ"</string>
     <string name="usage_access" msgid="5479504953931038165">"ব্যবহার অ্যাক্সেস"</string>
     <string name="permit_usage_access" msgid="4012876269445832300">"ব্যবহার অ্যাক্সেসের অনুমতি"</string>
     <string name="app_usage_preference" msgid="7065701732733134991">"পছন্দের অ্যাপ্লিকেশানগুলির ব্যবহার"</string>
@@ -3197,8 +3223,8 @@
     <string name="additional_permissions" msgid="6463784193877056080">"অতিরিক্ত অনুমতিগুলি"</string>
     <string name="additional_permissions_more" msgid="3538612272673191451">"আরো <xliff:g id="COUNT">%1$d</xliff:g>টি"</string>
     <string name="share_remote_bugreport_dialog_title" msgid="1124840737776588602">"ত্রুটির প্রতিবেদন শেয়ার করবেন?"</string>
-    <string name="share_remote_bugreport_dialog_message_finished" msgid="4973886976504823801">"আপনার আইটি প্রশাসক এই ডিভাইসটির সমস্যা নিবারণে সহায়তা করতে একটি ত্রুটির প্রতিবেদন চেয়েছেন৷ অ্যাপ্লিকেশান এবং ডেটা শেয়ার করা হতে পারে৷"</string>
-    <string name="share_remote_bugreport_dialog_message" msgid="3495929560689435496">"আপনার আইটি প্রশাসক এই ডিভাইসটির সমস্যা নিবারণে সহায়তা করতে একটি ত্রুটির প্রতিবেদন চেয়েছেন৷ অ্যাপ্লিকেশানগুলি এবং ডেটা শেয়ার করা হতে পারে এবং আপনার ডিভাইসটিকে অস্থায়ীভাবে ধীর করে দিতে পারে৷"</string>
+    <string name="share_remote_bugreport_dialog_message_finished" msgid="4973886976504823801">"আপনার আইটি প্রশাসক এই ডিভাইসটির সমস্যা নিবারণে সহায়তা করতে একটি ত্রুটির প্রতিবেদন চেয়েছেন৷ অ্যাপ্লিকেশন এবং ডেটা শেয়ার করা হতে পারে৷"</string>
+    <string name="share_remote_bugreport_dialog_message" msgid="3495929560689435496">"আপনার আইটি প্রশাসক এই ডিভাইসটির সমস্যা নিবারণে সহায়তা করতে একটি ত্রুটির প্রতিবেদন চেয়েছেন৷ অ্যাপ্লিকেশনগুলি এবং ডেটা শেয়ার করা হতে পারে এবং আপনার ডিভাইসটিকে অস্থায়ীভাবে ধীর করে দিতে পারে৷"</string>
     <string name="sharing_remote_bugreport_dialog_message" msgid="5859287696666024466">"এই ত্রুটির প্রতিবেদনটি আপনার আইটি প্রশাসকের সাথে শেয়ার করা হচ্ছে৷ আরো বিস্তারিত জানার জন্য তাদের সাথে যোগাযোগ করুন৷"</string>
     <string name="share_remote_bugreport_action" msgid="532226159318779397">"শেয়ার করুন"</string>
     <string name="decline_remote_bugreport_action" msgid="518720235407565134">"প্রত্যাখ্যান করুন"</string>
@@ -3206,28 +3232,29 @@
     <string name="usb_use_charging_only_desc" msgid="3066256793008540627">"শুধুমাত্র ডিভাইটি চার্জ করুন"</string>
     <string name="usb_use_power_only" msgid="6426550616883919530">"পাওয়ার সরবরাহ করুন"</string>
     <string name="usb_use_power_only_desc" msgid="3461232831015575152">"সংযুক্ত ডিভাইসটি চার্জ করুন। শুধুমাত্র USB চার্জিং সমর্থিত ডিভাইসেই এটি করা যাবে।"</string>
-    <string name="usb_use_file_transfers" msgid="7409600791007250137">"ফাইলগুলি স্থানান্তর করুন"</string>
-    <string name="usb_use_file_transfers_desc" msgid="4235764784331804488">"অন্য ডিভাইসে ফাইলগুলিকে স্থানান্তর করুন"</string>
-    <string name="usb_use_photo_transfers" msgid="7794775645350330454">"ফটোগুলির স্থানান্তর (PTP)"</string>
+    <string name="usb_use_file_transfers" msgid="7409600791007250137">"ফাইল ট্রান্সফার করুন"</string>
+    <string name="usb_use_file_transfers_desc" msgid="4235764784331804488">"অন্য ডিভাইসে ফাইল ট্রান্সফার করুন"</string>
+    <string name="usb_use_photo_transfers" msgid="7794775645350330454">"ফটো ট্রান্সফার করুন (PTP)"</string>
     <string name="usb_use_photo_transfers_desc" msgid="2963034811151325996">"যদি MTP সমর্থিত না হয় তবে ফটো বা ফাইলগুলি স্থানান্তর করুন (PTP)"</string>
-    <string name="usb_use_MIDI" msgid="870922185938298263">"MIDI হিসাবে ডিভাইসটি ব্যবহার করুন"</string>
-    <string name="usb_use_MIDI_desc" msgid="8473936990076693175">"MIDI হিসাবে এই ডিভাইসটি ব্যবহার করুন"</string>
+    <string name="usb_use_MIDI" msgid="870922185938298263">"MIDI হিসেবে ডিভাইসটি ব্যবহার করুন"</string>
+    <string name="usb_use_MIDI_desc" msgid="8473936990076693175">"MIDI হিসেবে এই ডিভাইসটি ব্যবহার করুন"</string>
     <string name="usb_use" msgid="3256040963685055320">"এটি করতে USB ব্যবহার করুন"</string>
     <string name="usb_pref" msgid="1400617804525116158">"USB"</string>
     <string name="usb_summary_charging_only" msgid="7544327009143659751">"এই ডিভাইসটি চার্জ করা হচ্ছে"</string>
     <string name="usb_summary_power_only" msgid="3629517713817003738">"সংযুক্ত ডিভাইসটি চার্জ করা হচ্ছে"</string>
     <string name="usb_summary_file_transfers" msgid="6435943692610175111">"ফাইলগুলি স্থানান্তর করা হচ্ছে"</string>
     <string name="usb_summary_photo_transfers" msgid="8440204169576585250">"ফটোগুলি স্থানান্তর করা হচ্ছে (PTP)"</string>
-    <string name="usb_summary_MIDI" msgid="5687906612187885908">"ডিভাইসটিকে MIDI হিসাবে ব্যবহার করা হচ্ছে"</string>
-    <string name="background_check_pref" msgid="7550258400138010979">"পটভূমি পরীক্ষা করুন"</string>
+    <string name="usb_summary_MIDI" msgid="5687906612187885908">"ডিভাইসটিকে MIDI হিসেবে ব্যবহার করা হচ্ছে"</string>
+    <string name="sms_mirroring_pref" msgid="6475043279147376031">"এসএমএস প্রতিবিম্ব"</string>
+    <string name="background_check_pref" msgid="7550258400138010979">"ব্যাকগ্রাউন্ড পরীক্ষা"</string>
     <string name="background_check_title" msgid="4534254315824525593">"সম্পূর্ণ পটভূমি অ্যাক্সেস করুন"</string>
     <string name="assist_access_context_title" msgid="2269032346698890257">"স্ক্রীন থেকে পাঠ্য ব্যবহার করুন"</string>
-    <string name="assist_access_context_summary" msgid="1991421283142279560">"সহায়তা অ্যাপ্লিকেশানটিকে স্ক্রীনের সামগ্রীসমূহকে পাঠ্য হিসাবে অ্যাক্সেস করার অনুমতি দিন"</string>
-    <string name="assist_access_screenshot_title" msgid="4034721336291215819">"স্ক্রীনশট ব্যবহার করুন"</string>
-    <string name="assist_access_screenshot_summary" msgid="6761636689013259901">"সহায়তা অ্যাপ্লিকেশানটিকে স্ক্রীনের একটি চিত্র অ্যাক্সেস করার অনুমতি দিন"</string>
+    <string name="assist_access_context_summary" msgid="1991421283142279560">"সহায়তা অ্যাপ্লিকেশনটিকে স্ক্রিনের সামগ্রীসমূহকে টেক্সট হিসাবে অ্যাক্সেস করার অনুমতি দিন"</string>
+    <string name="assist_access_screenshot_title" msgid="4034721336291215819">"স্ক্রিনশট ব্যবহার করুন"</string>
+    <string name="assist_access_screenshot_summary" msgid="6761636689013259901">"সহায়তা অ্যাপ্লিকেশনটিকে স্ক্রিনের একটি ছবি অ্যাক্সেস করার অনুমতি দিন"</string>
     <string name="assist_flash_title" msgid="506661221230034891">"স্ক্রীন ফ্ল্যাশ করুন"</string>
-    <string name="assist_flash_summary" msgid="9160668468824099262">"যখন সহায়তা অ্যাপ্লিকেশান স্ক্রীন বা স্ক্রীনশট থেকে পাঠ্য অ্যাক্সেস করে তখন স্ক্রীনের প্রান্তগুলিকে ফ্ল্যাশ করুন"</string>
-    <string name="assist_footer" msgid="1982791172085896864">"সহায়তা অ্যাপ্লিকেশান আপনার দেখা স্ক্রীনের তথ্যের উপর ভিত্তি করে আপনাকে সহায্য করতে পারে৷ কিছু অ্যাপ্লিকেশান আপনাকে ইন্টিগ্রেটেড সহায়তা দিতে উভয় লঞ্চার এবং ভয়েস ইনপুট পরিষেবাগুলিকে সমর্থন করে৷"</string>
+    <string name="assist_flash_summary" msgid="9160668468824099262">"যখন সহায়তা অ্যাপ্লিকেশন স্ক্রিন বা স্ক্রিনশট থেকে টেক্সট অ্যাক্সেস করে তখন স্ক্রিনের প্রান্তগুলিকে ফ্ল্যাশ করুন"</string>
+    <string name="assist_footer" msgid="1982791172085896864">"সহায়তা অ্যাপ্লিকেশন আপনার দেখা স্ক্রিনের তথ্যের উপর ভিত্তি করে আপনাকে সহায্য করতে পারে৷ কিছু অ্যাপ্লিকেশন আপনাকে ইন্টিগ্রেটেড সহায়তা দিতে উভয় লঞ্চার এবং ভয়েস ইনপুট পরিষেবাগুলিকে সমর্থন করে৷"</string>
     <string name="average_memory_use" msgid="829566450150198512">"গড় মেমরির ব্যবহার"</string>
     <string name="maximum_memory_use" msgid="7493720799710132496">"সর্বাধিক মেমরির ব্যবহার"</string>
     <string name="memory_usage" msgid="1781358557214390033">"মেমরির ব্যবহার"</string>
@@ -3285,7 +3312,7 @@
     <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="permit_write_settings" msgid="658555006453212691">"সিস্টেম সেটিংস পরিবর্তনের অনুমতি দিন"</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>
@@ -3296,14 +3323,14 @@
     <string name="camera_double_tap_power_gesture_desc" msgid="7355664631775680376">"আপনার স্ক্রীন আনলক না করেই দ্রুত ক্যামেরা খুলুন"</string>
     <string name="screen_zoom_title" msgid="5233515303733473927">"প্রদর্শনের আকার"</string>
     <string name="screen_zoom_short_summary" msgid="7291960817349834688">"স্ক্রীনের আইটেমগুলিকে ছোট বা বড় করুন"</string>
-    <string name="screen_zoom_keywords" msgid="9176477565403352552">"ঘনত্ব হিসাবে প্রদর্শন, স্ক্রীন জুম করা, স্কেল, স্কেলের মাপ"</string>
+    <string name="screen_zoom_keywords" msgid="9176477565403352552">"ঘনত্ব হিসেবে প্রদর্শন, স্ক্রিন জুম করা, স্কেল, স্কেলের মাপ"</string>
     <string name="screen_zoom_summary" msgid="6445488991799015407">"স্ক্রীনের আইটেমগুলিকে ছোট বা বড় করুন। আপনার স্ক্রীনের কিছু অ্যাপ্লিকেশান অবস্থান পরিবর্তন করতে পারে।"</string>
-    <string name="screen_zoom_preview_title" msgid="4680671508172336572">"পূর্বরূপ দেখুন"</string>
+    <string name="screen_zoom_preview_title" msgid="4680671508172336572">"প্রিভিউ"</string>
     <string name="screen_zoom_make_smaller_desc" msgid="4622359904253364742">"আরো ছোট করুন"</string>
     <string name="screen_zoom_make_larger_desc" msgid="2236171043607896594">"আরো বড় করুন"</string>
     <string name="screen_zoom_conversation_icon_alex" msgid="8443032489384985820">"অ"</string>
     <string name="screen_zoom_conversation_icon_pete" msgid="998709701837681129">"প"</string>
-    <string name="screen_zoom_conversation_message_1" msgid="6546951024984852686">"হাই সমীর!"</string>
+    <string name="screen_zoom_conversation_message_1" msgid="6546951024984852686">"হাই সুমন!"</string>
     <string name="screen_zoom_conversation_message_2" msgid="6935424214137738647">"হাই, আজকে কফি খাওয়া যাক, দেখা করবে?"</string>
     <string name="screen_zoom_conversation_message_3" msgid="5218221201861387402">"ভাল কথা৷ আমি একটি জায়গা জানি যেটা এখান থেকে খুব দূরে নয়৷"</string>
     <string name="screen_zoom_conversation_message_4" msgid="5564676794767555447">"ঠিক আছে!"</string>
@@ -3331,7 +3358,7 @@
     <string name="payment_summary" msgid="3472482669588561110">"<xliff:g id="APP_NAME">%1$s</xliff:g> হল ডিফল্ট"</string>
     <string name="location_on_summary" msgid="5127631544018313587">"চালু / <xliff:g id="LOCATION_MODE">%1$s</xliff:g>"</string>
     <string name="location_off_summary" msgid="6474350053215707957">"বন্ধ"</string>
-    <string name="backup_disabled" msgid="485189128759595412">"ব্যাক আপ নেওয়া অক্ষম করা রয়েছে"</string>
+    <string name="backup_disabled" msgid="485189128759595412">"ব্যাক-আপ নেওয়া অক্ষম করা রয়েছে"</string>
     <string name="about_summary" msgid="924181828102801010">"Android <xliff:g id="VERSION">%1$s</xliff:g> এ আপডেট করা হয়েছে"</string>
     <string name="disabled_by_policy_title" msgid="627023216027648534">"কাজটি অনুমোদিত নয়"</string>
     <string name="disabled_by_policy_title_adjust_volume" msgid="7399450998356045023">"ভলিউম পরিবর্তন করা যাবে না"</string>
@@ -3354,17 +3381,17 @@
     <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="night_display_suggestion_title" msgid="6602129097059325291">"নাইট লাইটের সময়সূচী সেট করুন"</string>
     <string name="night_display_suggestion_summary" msgid="1747638280833631187">"ঘুম আসতে অসুবিধা না হওয়ার জন্য স্ক্রিনের আভা অ্যাম্বার করুন"</string>
     <string name="condition_night_display_title" msgid="5599814941976856183">"নাইট লাইট চালু আছে"</string>
-    <string name="condition_night_display_summary" msgid="5443722724310650381">"স্ক্রীন হলুদাভ বাদামি আভা ধারণ করে৷ এটি আপনাকে ঘুমিয়ে পড়তে সহায়তা করতে পারে৷"</string>
+    <string name="condition_night_display_summary" msgid="5443722724310650381">"স্ক্রিন হলুদাভ বাদামি আভা ধারণ করে৷ এটি আপনাকে ঘুমিয়ে পড়তে সহায়তা করতে পারে৷"</string>
     <string name="suggestions_title" msgid="7280792342273268377">"প্রস্তাবনাগুলি"</string>
     <string name="suggestions_summary" msgid="2509040178581728056">"+<xliff:g id="ID_1">%1$d</xliff:g>টি"</string>
     <string name="suggestions_more_title" msgid="8223690393059519879">"+ আরও <xliff:g id="ID_1">%1$d</xliff:g>টি"</string>
@@ -3380,9 +3407,12 @@
     <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="connectivity_monitor_switch" msgid="9059759348648583421">"সংযোগ মনিটর"</string>
+    <string name="connectivity_monitor_switch_summary" msgid="2828658652378866401">"সংযোগে কোনও সমস্যা শনাক্ত হলে সংযোগ মনিটর লগ সংগ্রহ করবে ও ব্যবহারকারীকে বিজ্ঞপ্তি পাঠিয়ে সমস্যার বিষয়ে অভিযোগ করতে বলবে"</string>
+    <string name="connectivity_monitor_toast" msgid="5551859612881173028">"সংযোগ মনিটরে করা পরিবর্তন প্রয়োগ করতে ডিভাইসটি রিবুট করুন"</string>
     <string name="camera_hal_hdrplus_switch" msgid="8377365197105267466">"ক্যামেরায় HAL HDR+"</string>
     <string name="camera_hal_hdrplus_toast" msgid="2063703797270055299">"ক্যামেরায় HAL HDR+ পরিবর্তনটি প্রয়োগ করতে ডিভাইসটি বন্ধ করে আবার চালু করুন"</string>
+    <string name="camera_laser_sensor_switch" msgid="8913588990743234440">"ক্যামেরা লেজার সেন্সর"</string>
     <string name="ota_disable_automatic_update" msgid="2319639631655915050">"স্বয়ংক্রিয় সিস্টেম আপডেটগুলি"</string>
     <string name="usage" msgid="2977875522080448986">"ব্যবহার"</string>
     <string name="cellular_data_usage" msgid="2155683719898158203">"মোবাইল ডেটার ব্যবহার"</string>
@@ -3408,7 +3438,7 @@
     <string name="data_warning" msgid="209133958008062117">"ডেটা সতর্কতা"</string>
     <string name="set_data_limit" msgid="2901526323210516923">"ডেটা সীমা সেট করুন"</string>
     <string name="data_limit" msgid="1885406964934590552">"ডেটা সীমা"</string>
-    <string name="data_usage_template" msgid="392191945602400904">"<xliff:g id="ID_2">%2$s</xliff:g> এর মধ্যে <xliff:g id="ID_1">%1$s</xliff:g> ব্যবহৃত হয়েছে"</string>
+    <string name="data_usage_template" msgid="2923744765873163859">"<xliff:g id="ID_2">%2$s</xliff:g> এর মধ্যে <xliff:g id="ID_1">%1$s</xliff:g> ব্যবহার করা হয়েছে"</string>
     <string name="configure" msgid="1029654422228677273">"কনফিগার করুন"</string>
     <string name="data_usage_other_apps" msgid="3272872663517382050">"ব্যবহারের মধ্যে অন্যান্য অ্যাপ্স অন্তর্ভুক্ত রয়েছে"</string>
     <plurals name="data_saver_unrestricted_summary" formatted="false" msgid="2635267833484232703">
@@ -3422,17 +3452,17 @@
     <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_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>
     <string name="battery_saver_off_summary" msgid="8309471955051162327">"বন্ধ আছে / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="battery_saver_desc_turn_on_auto_never" msgid="6715896635178578813">"কখনই স্বয়ংক্রিয়ভাবে চালু করবেন না"</string>
+    <string name="battery_saver_desc_turn_on_auto_never" msgid="6715896635178578813">"কখনই নিজে থেকে চালু হবে না"</string>
     <string name="battery_saver_desc_turn_on_auto_pct" msgid="7472323223085636533">"%1$s ব্যাটারি থাকলে স্বয়ংক্রিয়ভাবে চালু করুন"</string>
     <string name="not_battery_optimizing" msgid="5362861851864837617">"ব্যাটারি অপটিমাইজেশান ব্যবহার করা হচ্ছে না"</string>
     <string name="lockscreen_remote_input" msgid="969871538778211843">"যদি ডিভাইসটি লক থাকে তাহলে, বিজ্ঞপ্তিগুলির মধ্যে উত্তর বা অন্যান্য পাঠ্য লেখা আটকায়"</string>
@@ -3446,7 +3476,7 @@
     <string name="notification_log_details_group" msgid="2430467015200368698">"গোষ্ঠী"</string>
     <string name="notification_log_details_group_summary" msgid="7945543958255585829">"(সারাংশ)"</string>
     <string name="notification_log_details_visibility" msgid="2552873780715930971">"দৃশ্যমানতা"</string>
-    <string name="notification_log_details_public_version" msgid="4247242364605495240">"সর্বজনীনন-সংস্করণ"</string>
+    <string name="notification_log_details_public_version" msgid="4247242364605495240">"সর্বজনীন-ভার্সন"</string>
     <string name="notification_log_details_priority" msgid="8371354971235991398">"অগ্রাধিকার"</string>
     <string name="notification_log_details_importance" msgid="2153168790791683139">"গুরুত্ব"</string>
     <string name="notification_log_details_explanation" msgid="1914295130775393551">"ব্যাখ্যা"</string>
@@ -3462,8 +3492,8 @@
     <string name="notification_log_details_icon" msgid="8939114059726188218">"আইকন"</string>
     <string name="notification_log_details_parcel" msgid="243148037601903212">"পার্সেলের আকার"</string>
     <string name="notification_log_details_ashmem" msgid="7241814108477320636">"ashmem"</string>
-    <string name="notification_log_details_sound" msgid="5506232879598808099">"শব্দ"</string>
-    <string name="notification_log_details_vibrate" msgid="6890065466625335940">"কম্পন"</string>
+    <string name="notification_log_details_sound" msgid="5506232879598808099">"সাউন্ড"</string>
+    <string name="notification_log_details_vibrate" msgid="6890065466625335940">"ভাইব্রেট"</string>
     <string name="notification_log_details_default" msgid="2345249399796730861">"ডিফল্ট"</string>
     <string name="notification_log_details_none" msgid="184131801230614059">"কোনো কিছুই নয়"</string>
     <string name="notification_log_details_ranking_null" msgid="244660392058720919">"রেঙ্কিং অবজেক্ট অনুপস্থিত।"</string>
@@ -3477,27 +3507,27 @@
     <string name="button_confirm_convert_fbe" msgid="7101855374850373091">"মুছুন ও রূপান্তর করুন"</string>
     <string name="reset_shortcut_manager_throttling" msgid="6495066467198668994">"ShortcutManager রেট-লিমিটিং আবার সেট করুন"</string>
     <string name="reset_shortcut_manager_throttling_complete" msgid="1826770872063707900">"ShortcutManager রেট-লিমিটিং আবার সেট করা হয়েছে"</string>
-    <string name="notification_suggestion_title" msgid="4506524937307816475">"লক স্ক্রীন বিজ্ঞপ্তিগুলি নিয়ন্ত্রণ করুন"</string>
-    <string name="notification_suggestion_summary" msgid="8521159741445416875">"বিজ্ঞপ্তির সামগ্রী দেখান বা লুকান"</string>
+    <string name="notification_suggestion_title" msgid="387052719462473500">"লক স্ক্রিনে নিয়ন্ত্রণের তথ্য"</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="8483187649355540109">"সহায়তা এবং টিপ্স"</string>
     <string name="developer_smallest_width" msgid="7516950434587313360">"সবচেয়ে কম প্রস্থ"</string>
     <string name="premium_sms_none" msgid="8268105565738040566">"ইনস্টল করা কোনো অ্যাপ্লিকেশানই প্রিমিয়াম SMS অ্যাক্সেসের অনুরোধ করেনি"</string>
     <string name="premium_sms_warning" msgid="9086859595338944882">"প্রিমিয়াম SMS এর জন্য অর্থ খরচ হতে পারে এবং আপনার পরিষেবা প্রদানকারীর বিলে যোগ করা হবে৷ আপনি যদি কোনো অ্যাপ্লিকেশানের জন্য অনুমতি সক্ষম করেন তাহলে আপনি সেই অ্যাপ্লিকেশানটি ব্যবহার করে প্রিমিয়াম SMS পাঠাতে পারবেন৷"</string>
     <string name="premium_sms_access" msgid="4660047004791638305">"প্রিমিয়াম SMS অ্যাক্সেস"</string>
-    <string name="bluetooth_disabled" msgid="2456198532288640046">"অন্য ডিভাইস থেকে দেখা যাচ্ছে না"</string>
+    <string name="bluetooth_disabled" msgid="6244000672828617410">"বন্ধ আছে"</string>
     <string name="bluetooth_connected_summary" msgid="7672528674593152862">"<xliff:g id="ID_1">%1$s</xliff:g> এর সাথে সংযুক্ত আছে"</string>
     <string name="bluetooth_connected_multiple_devices_summary" msgid="9173661896296663932">"একাধিক ডিভাইসের সাথে সংযুক্ত আছে"</string>
     <string name="demo_mode" msgid="2798762752209330277">"সিস্টেম UI ডেমো মোড"</string>
     <string name="quick_settings_developer_tiles" msgid="5947788063262762448">"দ্রুত সেটিংস ডেভেলপার টাইলস"</string>
     <string name="support_escalation_title" msgid="4111071371281023145">"আপনাকে সাহায্য করতে আমরা প্রস্তুত"</string>
-    <string name="support_escalation_24_7_title" msgid="8118369197749832074">"আমরা আপনাকে সহায়তা করার জন্য সপ্তাহে সাত দিন ২৪ ঘন্টা এখানে রয়েছি"</string>
-    <string name="support_escalation_24_7_content_description" msgid="3772776213036994533">"আমরা আপনাকে সহায়তা করার জন্য সপ্তাহে সাত দিন ২৪ ঘন্টা এখানে রয়েছি"</string>
-    <string name="support_escalation_summary" msgid="8473084168776014405">"যে কোনো সমস্যার সমাধান করার জন্য আমাদের সহায়তা টিম এখানে রয়েছে"</string>
-    <string name="support_escalation_24_7_summary" msgid="2802773279262547187">"আমাদের সহায়তা টিম সপ্তাহে সাত দিন ২৪ ঘন্টা এখানে রয়েছে"</string>
-    <string name="support_escalation_closed_summary" msgid="2240967274380168303">"সহায়তা অনুসন্ধান করুন বা সহায়তা প্রদান চালু থাকার সময়ে আমাদের সাথে যোগযোগ করুন (স্থানীয় সময়):&lt;br&gt;&lt;b&gt;<xliff:g id="OPERATION_HOURS">%s</xliff:g>&lt;/b&gt;"</string>
+    <string name="support_escalation_24_7_title" msgid="8118369197749832074">"আমরা আপনাকে সহায়তা করার জন্য সপ্তাহে সাত দিন ২৪ ঘণ্টা এখানে রয়েছি"</string>
+    <string name="support_escalation_24_7_content_description" msgid="3772776213036994533">"আমরা আপনাকে সহায়তা করার জন্য সপ্তাহে সাত দিন ২৪ ঘণ্টা এখানে রয়েছি"</string>
+    <string name="support_escalation_summary" msgid="8473084168776014405">"যেকোনও সমস্যার সমাধান করার জন্য আমাদের সহায়তা টিম এখানে রয়েছে"</string>
+    <string name="support_escalation_24_7_summary" msgid="2802773279262547187">"আমাদের সহায়তা টিম সপ্তাহে সাত দিন ২৪ ঘণ্টা এখানে রয়েছে"</string>
+    <string name="support_escalation_closed_summary" msgid="2240967274380168303">"সহায়তা খুঁজুন বা সহায়তা প্রদান চালু থাকার সময়ে আমাদের সাথে যোগযোগ করুন (স্থানীয় সময়):&lt;br&gt;&lt;b&gt;<xliff:g id="OPERATION_HOURS">%s</xliff:g>&lt;/b&gt;"</string>
     <string name="support_escalation_no_internet_summary" msgid="2526082812336597989">"ফোনের মাধ্যমে সহায়তা প্রদান করার সময় (স্থানীয় সময়)&lt;br&gt;&lt;b&gt;<xliff:g id="OPERATION_HOURS">%s</xliff:g>&lt;/b&gt;"</string>
-    <string name="support_escalation_unavailable_summary" msgid="5208552975245211898">"সহায়তা অনুসন্ধান করুন বা টিপ এবং কৌশলগুলি এক্সপ্লোর করুন"</string>
+    <string name="support_escalation_unavailable_summary" msgid="5208552975245211898">"সহায়তা খুঁজুন বা টিপ এবং কৌশলগুলি এক্সপ্লোর করুন"</string>
     <string name="support_country_list_title" msgid="823853371280534111">"এর জন্য সমর্থন:"</string>
     <string name="support_country_format" msgid="4502523713489559595">"<xliff:g id="COUNTRY">%1$s</xliff:g> - <xliff:g id="LANGUAGE">%2$s</xliff:g>"</string>
     <string name="support_phone_international_format" msgid="2143528744844720829">"<xliff:g id="LANGUAGE">%1$s</xliff:g> (<xliff:g id="PHONE">%2$s</xliff:g>)"</string>
@@ -3506,9 +3536,9 @@
     <string name="support_escalation_by_phone" msgid="4843223043487058711">"ফোন"</string>
     <string name="support_escalation_by_chat" msgid="977019859110763749">"চ্যাট করুন"</string>
     <string name="support_tips_and_tricks_title" msgid="4153466795695447828">"টিপ এবং কৌশলগুলি এক্সপ্লোর করুন"</string>
-    <string name="support_help_feedback_title" msgid="693440287222186718">"সহায়তায় অনুসন্ধান করুন এবং মতামত পাঠান"</string>
+    <string name="support_help_feedback_title" msgid="693440287222186718">"সহায়তায় খুঁজুন এবং মতামত পাঠান"</string>
     <string name="support_sign_in_required_title" msgid="1367187789121480440">"সহায়তায় যোগাযোগ করুন"</string>
-    <string name="support_sign_in_button_text" msgid="3054769428620671241">"প্রবেশ করুন"</string>
+    <string name="support_sign_in_button_text" msgid="3054769428620671241">"সাইন-ইন করুন"</string>
     <string name="support_sign_in_required_help" msgid="5200654782405538114">"সাইন ইন করতে পারছেন না?"</string>
     <string name="support_disclaimer_title" msgid="4825302018208770031">"সিস্টেমের তথ্য পাঠান"</string>
     <string name="support_disclaimer_do_not_show" msgid="3378367075323727539">"আর দেখাবেন না"</string>
@@ -3538,19 +3568,19 @@
     <string name="bluetooth_talkback_headphone" msgid="26580326066627664">"হেডফোন"</string>
     <string name="bluetooth_talkback_input_peripheral" msgid="5165842622743212268">"পেরিফেরাল ইনপুট"</string>
     <string name="bluetooth_talkback_bluetooth" msgid="5615463912185280812">"ব্লুটুথ"</string>
-    <string name="automatic_storage_manager_settings" msgid="7819434542155181607">"সঞ্চয়স্থান পরিচালনা করুন"</string>
-    <string name="automatic_storage_manager_text" msgid="4562950476680600604">"সঞ্চয়স্থান খালি করার কাজে সহায়তা করার জন্য, সঞ্চয়স্থানের পরিচালক আপনার ডিভাইস থেকে ব্যাক আপ নেওয়া ফটো এবং ভিডিওগুলিকে সরিয়ে দেয়৷"</string>
+    <string name="automatic_storage_manager_settings" msgid="7819434542155181607">"স্টোরেজ পরিচালনা করুন"</string>
+    <string name="automatic_storage_manager_text" msgid="4562950476680600604">"স্টোরেজ খালি করার কাজে সাহায্য করার জন্য, স্টোরেজ ম্যানেজার আপনার ডিভাইস থেকে ব্যাক-আপ নেওয়া ফটো এবং ভিডিওগুলিকে সরিয়ে দেয়৷"</string>
     <string name="automatic_storage_manager_days_title" msgid="2017913896160914647">"ফটো এবং ভিডিওগুলিকে সরান"</string>
     <string name="automatic_storage_manager_preference_title" msgid="5753702798151073383">"সঞ্চয়স্থানের পরিচালক"</string>
-    <string name="deletion_helper_automatic_title" msgid="6605660435498272520">"স্বয়ংক্রিয়"</string>
+    <string name="deletion_helper_automatic_title" msgid="6605660435498272520">"অটোমেটিক"</string>
     <string name="deletion_helper_manual_title" msgid="7947432164411214029">"ম্যানুয়াল"</string>
-    <string name="deletion_helper_preference_title" msgid="5271510052022285884">"এখনই স্থান খালি করুন"</string>
+    <string name="deletion_helper_preference_title" msgid="5271510052022285884">"এখনই জায়গা খালি করুন"</string>
     <string name="gesture_preference_title" msgid="5280023307132819052">"অঙ্গভঙ্গিগুলি"</string>
     <string name="gesture_preference_summary" product="default" msgid="8627850388011956901">"আপনার ফোন নিয়ন্ত্রণ করতে দ্রুত অঙ্গভঙ্গিগুলি"</string>
-    <string name="gesture_preference_summary" product="tablet" msgid="4717535378272065510">"আপনার ট্যাবলেট নিয়ন্ত্রণ করার দ্রুত অঙ্গভঙ্গি"</string>
-    <string name="gesture_preference_summary" product="device" msgid="4205941452664950852">"আপনার ডিভাইস নিয়ন্ত্রণ করার দ্রুত অঙ্গভঙ্গি"</string>
+    <string name="gesture_preference_summary" product="tablet" msgid="4717535378272065510">"আপনার ট্যাবলেট নিয়ন্ত্রণ করার দ্রুত ইঙ্গিত"</string>
+    <string name="gesture_preference_summary" product="device" msgid="4205941452664950852">"আপনার ডিভাইস নিয়ন্ত্রণ করার দ্রুত ইঙ্গিত"</string>
     <string name="double_tap_power_for_camera_title" msgid="64716226816032800">"ক্যামেরাতে সরাসরি যান"</string>
-    <string name="double_tap_power_for_camera_summary" msgid="242037150983277829">"ক্যামেরা দ্রুত খুলতে, পাওয়ার বোতামে দুবার আলতো চাপ দিন৷ যে কোনো স্ক্রীন থেকে কাজ করে৷"</string>
+    <string name="double_tap_power_for_camera_summary" msgid="242037150983277829">"ক্যামেরা দ্রুত খুলতে, পাওয়ার বোতাম দুবার প্রেস করুন৷ যেকোনও স্ক্রিনে কাজ করে৷"</string>
     <string name="double_tap_power_for_camera_suggestion_title" msgid="6500405261202883589">"ক্যামেরাটি তাড়াতাড়ি খুলুন"</string>
     <string name="double_tap_power_for_camera_suggestion_summary" msgid="7010153544554016996">"ক্যামেরা খোলার জন্য পাওয়ার বোতামটি দুবার টিপুন"</string>
     <string name="double_twist_for_camera_mode_title" msgid="4877834147983530479">"ক্যামেরা ফ্লিপ করুন"</string>
@@ -3559,9 +3589,9 @@
     <string name="double_twist_for_camera_suggestion_summary" product="default" msgid="447403641027147153">"সেলফি মোডে যাওয়ার জন্য ফোনটি ডবল টুইস্ট করুন"</string>
     <string name="double_twist_for_camera_suggestion_summary" product="tablet" msgid="1724660290703318739">"সেলফি মোডে যাওয়ার জন্য ট্যাবলেটটি ডবল টুইস্ট করুন"</string>
     <string name="double_twist_for_camera_suggestion_summary" product="device" msgid="5980398380988039489">"সেলফি মোডে যাওয়ার জন্য ডিভাইসটি ডবল টুইস্ট করুন"</string>
-    <string name="ambient_display_title" product="default" msgid="5144814600610448504">"ফোন চেক করতে দুবার আলতো চাপুন"</string>
-    <string name="ambient_display_title" product="tablet" msgid="8688795028609563837">"ট্যাবলেট চেক করতে দুবার আলতো চাপুন"</string>
-    <string name="ambient_display_title" product="device" msgid="3423781975742145894">"ডিভাইস চেক করতে দুবার আলতো চাপুন"</string>
+    <string name="ambient_display_title" product="default" msgid="5144814600610448504">"ফোন চেক করতে দুবার ট্যাপ করুন"</string>
+    <string name="ambient_display_title" product="tablet" msgid="8688795028609563837">"ট্যাবলেট চেক করতে দুবার ট্যাপ করুন"</string>
+    <string name="ambient_display_title" product="device" msgid="3423781975742145894">"ডিভাইস চেক করতে দুবার ট্যাপ করুন"</string>
     <string name="ambient_display_summary" msgid="525662960806416373">"সময়, বিজ্ঞপ্তির আইকন, এবং অন্যান্য তথ্য দেখতে আপনার স্ক্রিনে ডবল ট্যাপ করুন।"</string>
     <string name="ambient_display_suggestion_summary" msgid="5987443721392571847">"স্ক্রিন বন্ধ থাকলেও বিজ্ঞপ্তি দেখুন"</string>
     <string name="ambient_display_pickup_title" product="default" msgid="818688002837687268">"চেক করতে ফোনটিকে হাতে নিন"</string>
@@ -3587,15 +3617,15 @@
     <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="instant_apps_settings" msgid="8827777916518348213">"ঝটপট অ্যাপের পছন্দগুলি"</string>
     <string name="domain_url_section_title" msgid="7046835219056428883">"ইনস্টল করা অ্যাপ্স"</string>
-    <string name="automatic_storage_manager_activation_warning" msgid="6353100011690933254">"আপনার সঞ্চয়স্থান এখন সঞ্চয়স্থান পরিচালকের দ্বারা পরিচালিত হচ্ছে"</string>
+    <string name="automatic_storage_manager_activation_warning" msgid="6353100011690933254">"আপনার স্টোরেজ এখন স্টোরেজ ম্যানেজারের দ্বারা পরিচালিত হচ্ছে"</string>
     <string name="account_for_section_header" msgid="5356566418548737121">"<xliff:g id="USER_NAME">%1$s</xliff:g> এর অ্যাকাউন্ট"</string>
     <string name="configure_section_header" msgid="7391183586410814450">"কনফিগার"</string>
-    <string name="auto_sync_account_title" msgid="898796354710116383">"ডেটা স্বয়ংক্রিয়ভাবে সিঙ্ক করুন"</string>
+    <string name="auto_sync_account_title" msgid="898796354710116383">"ডেটা অটোমেটিক সিঙ্ক হবে"</string>
     <string name="auto_sync_personal_account_title" msgid="8496263182646100610">"ব্যাক্তিগত ডেটা স্বয়ংক্রিয়ভাবে সিঙ্ক করুন"</string>
     <string name="auto_sync_work_account_title" msgid="4489172450037434152">"কাজের ডেটা স্বয়ংক্রিয়ভাবে সিঙ্ক করুন"</string>
-    <string name="auto_sync_account_summary" msgid="692499211629185107">"অ্যাপকে স্বয়ংক্রিয়ভাবে ডেটা রিফ্রেশ করতে দিন"</string>
+    <string name="auto_sync_account_summary" msgid="692499211629185107">"অ্যাপকে অটোমেটিক ডেটা রিফ্রেশ করতে দিন"</string>
     <string name="account_sync_title" msgid="7214747784136106491">"অ্যাকাউন্ট সিঙ্ক"</string>
     <string name="account_sync_summary_some_on" msgid="3375930757891381175">"<xliff:g id="ID_2">%2$d</xliff:g>টির মধ্যে <xliff:g id="ID_1">%1$d</xliff:g>টি আইটেমের জন্য সিঙ্ক চালু আছে"</string>
     <string name="account_sync_summary_all_on" msgid="570431636622254156">"সমস্ত আইটেমের জন্য সিঙ্ক চালু আছে"</string>
@@ -3623,7 +3653,7 @@
     <string name="enterprise_privacy_location_access" msgid="4158197200885270634">"অবস্থানের অনুমতি"</string>
     <string name="enterprise_privacy_microphone_access" msgid="5717375623568864441">"মাইক্রোফোনের অনুমতি"</string>
     <string name="enterprise_privacy_camera_access" msgid="4858146118537519375">"ক্যামেরার অনুমতি"</string>
-    <string name="enterprise_privacy_enterprise_set_default_apps" msgid="3288495615791128724">"ডিফল্ট অ্যাপগুলি"</string>
+    <string name="enterprise_privacy_enterprise_set_default_apps" msgid="3288495615791128724">"ডিফল্ট অ্যাপ"</string>
     <plurals name="enterprise_privacy_number_packages" formatted="false" msgid="2765037387436064893">
       <item quantity="one"><xliff:g id="COUNT_1">%d</xliff:g>টি অ্যাপ</item>
       <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g>টি অ্যাপ</item>
@@ -3634,10 +3664,12 @@
     <string name="enterprise_privacy_always_on_vpn_personal" msgid="9217774730260037434">"আপনার ব্যক্তিগত প্রোফাইলে সর্বদা-চালু VPN অন করা আছে"</string>
     <string name="enterprise_privacy_always_on_vpn_work" msgid="7244472958208315814">"আপনার কর্মস্থলের প্রোফাইলে সর্বদা-চালু VPN অন করা আছে"</string>
     <string name="enterprise_privacy_global_http_proxy" msgid="7936664553416257333">"বৈশ্বিক HTTP প্রক্সী সেট করা আছে"</string>
-    <string name="enterprise_privacy_ca_certs" msgid="5885892204903688909">"বিশ্বস্ত শংসাপত্রগুলি"</string>
+    <string name="enterprise_privacy_ca_certs_device" msgid="2019652712782510262">"বিশ্বস্ত ক্রেডেনশিয়াল"</string>
+    <string name="enterprise_privacy_ca_certs_personal" msgid="2279084820904076599">"আপনার ব্যক্তিগত প্রোফাইলের বিশ্বস্ত ক্রেডেনশিয়াল"</string>
+    <string name="enterprise_privacy_ca_certs_work" msgid="6187377647815301809">"আপনার অফিস প্রোফাইলের বিশ্বস্ত ক্রেডেনশিয়াল"</string>
     <plurals name="enterprise_privacy_number_ca_certs" formatted="false" msgid="526375234629534165">
-      <item quantity="one">কমপক্ষে <xliff:g id="COUNT_1">%d</xliff:g>টি CA শংসাপত্র</item>
-      <item quantity="other">কমপক্ষে <xliff:g id="COUNT_1">%d</xliff:g>টি CA শংসাপত্র</item>
+      <item quantity="one">কমপক্ষে <xliff:g id="COUNT_1">%d</xliff:g>টি CA সার্টিফিকেট</item>
+      <item quantity="other">কমপক্ষে <xliff:g id="COUNT_1">%d</xliff:g>টি CA সার্টিফিকেট</item>
     </plurals>
     <string name="enterprise_privacy_lock_device" msgid="8791656477097208540">"প্রশাসক ডিভাইসটি লক করতে ও পাসওয়ার্ড আবার সেট করতে পারেন"</string>
     <string name="enterprise_privacy_wipe_device" msgid="2821960015797241790">"প্রশাসক ডিভাইসের সমস্ত ডেটা মুছে দিতে পারবেন"</string>
@@ -3650,7 +3682,7 @@
     <string name="do_disclosure_generic" msgid="8653670456990823307">"আপনার প্রতিষ্ঠান এই ডিভাইসটি পরিচালনা করে।"</string>
     <string name="do_disclosure_with_name" msgid="1141081465968481380">"এই ডিভাইসটি <xliff:g id="ORGANIZATION_NAME">%s</xliff:g> দ্বারা পরিচালিত।"</string>
     <string name="do_disclosure_learn_more_separator" msgid="3558079393757238670">" "</string>
-    <string name="do_disclosure_learn_more" msgid="2416766240581561009">"আরো জানুন"</string>
+    <string name="do_disclosure_learn_more" msgid="2416766240581561009">"আরও জানুন"</string>
     <plurals name="default_camera_app_title" formatted="false" msgid="1134677050353971363">
       <item quantity="one">ক্যামেরা অ্যাপগুলি</item>
       <item quantity="other">ক্যামেরা অ্যাপগুলি</item>
@@ -3669,7 +3701,7 @@
     <string name="app_names_concatenation_template_2" msgid="4309216198909946380">"<xliff:g id="FIRST_APP_NAME">%1$s</xliff:g>, <xliff:g id="SECOND_APP_NAME">%2$s</xliff:g>"</string>
     <string name="app_names_concatenation_template_3" msgid="8949045544491604376">"<xliff:g id="FIRST_APP_NAME">%1$s</xliff:g>, <xliff:g id="SECOND_APP_NAME">%2$s</xliff:g>, <xliff:g id="THIRD_APP_NAME">%3$s</xliff:g>"</string>
     <string name="storage_photos_videos" msgid="319854636702241898">"ফটো এবং ভিডিওগুলি"</string>
-    <string name="storage_music_audio" msgid="789779084825206838">"গান এবং অডিও"</string>
+    <string name="storage_music_audio" msgid="789779084825206838">"মিউজিক ও অডিও"</string>
     <string name="storage_games" msgid="7703159201697117621">"গেম্স"</string>
     <string name="storage_other_apps" msgid="5524321740031718083">"অন্যান্য অ্যাপ্লিকেশান"</string>
     <string name="storage_files" msgid="8581083146777364063">"ফাইল"</string>
@@ -3680,7 +3712,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="app_info_storage_title" msgid="5554719444625611987">"স্টোরেজ ব্যবহার হয়েছে"</string>
     <string name="webview_uninstalled_for_user" msgid="1819903169194420983">"(ইউজার <xliff:g id="USER">%s</xliff:g> এর জন্য আনইনস্টল হয়েছে)"</string>
     <string name="webview_disabled_for_user" msgid="1216426047631256825">"(ইউজার <xliff:g id="USER">%s</xliff:g> এর জন্য অক্ষম হয়েছে)"</string>
     <string name="autofill_app" msgid="7338387238377914374">"আপনাআপনি পূরণ করার পরিষেবা"</string>
@@ -3688,15 +3720,17 @@
     <string name="autofill_confirmation_message" msgid="2784869528908005194">"&lt;b&gt;নিশ্চিত করুন যে এই অ্যাপটি বিশ্বাসযোগ্য&lt;/b&gt; &lt;br/&gt; &lt;br/&gt; কোনও তথ্য নিজে থেকে পূরণ করা যাবে কি না, তা নির্ণয় করতে &lt;xliff:g id=app_name example=Google Autofill&gt;%1$s&lt;/xliff:g&gt; অ্যাপটি আপনার স্ক্রিনে যা দেখা যাচ্ছে সেই অনুযায়ী সিদ্ধান্ত নেয়।"</string>
     <string name="device_theme" msgid="4571803018917608588">"ডিভাইসের থিম"</string>
     <string name="default_theme" msgid="7085644992078579076">"ডিফল্ট"</string>
-    <string name="storage_manager_indicator" msgid="1516810749625915020">"সঞ্চয়স্থান পরিচালক: <xliff:g id="STATUS">^1</xliff:g>"</string>
+    <string name="storage_manager_indicator" msgid="1516810749625915020">"স্টোরেজ ম্যানেজার: <xliff:g id="STATUS">^1</xliff:g>"</string>
     <string name="storage_manager_indicator_off" msgid="7488057587180724388">"বন্ধ আছে"</string>
     <string name="storage_manager_indicator_on" msgid="8625551710194584733">"চালু আছে"</string>
     <string name="install_type_instant" msgid="3174425974536078647">"ঝটপট অ্যাপ"</string>
-    <string name="automatic_storage_manager_deactivation_warning" msgid="5605210730828410482">"সঞ্চয়স্থান পরিচালক বন্ধ করবেন?"</string>
-    <string name="storage_movies_tv" msgid="5498394447562086890">"সিনেমা এবং TV অ্যাপগুলি"</string>
+    <string name="automatic_storage_manager_deactivation_warning" msgid="5605210730828410482">"স্টোরেজ ম্যানেজার বন্ধ করবেন?"</string>
+    <string name="storage_movies_tv" msgid="5498394447562086890">"সিনেমা ও টিভি অ্যাপ"</string>
     <string name="carrier_provisioning" msgid="4398683675591893169">"পরিষেবা প্রদানকারীর ব্যবস্থামূলক তথ্য"</string>
     <string name="trigger_carrier_provisioning" msgid="3434865918009286187">"ট্রিগার পরিষেবা প্রদানকারীর ব্যবস্থা"</string>
     <string name="new_device_suggestion_title" msgid="698847081680980774">"নতুন এবং উত্তেজনাপূর্ণ আর কি আছে?"</string>
-    <string name="new_device_suggestion_summary" msgid="7172709269203435870">"সেরা ৫টি বৈশিষ্ট্য ব্যবহার করে দেখুন"</string>
+    <string name="new_device_suggestion_summary" product="default" msgid="206396571522515855">"আপনার নতুন ফোন চালিয়ে দেখুন"</string>
+    <string name="new_device_suggestion_summary" product="tablet" msgid="393751455688210956">"আপনার নতুন ট্যাবলেট চালিয়ে দেখুন"</string>
+    <string name="new_device_suggestion_summary" product="device" msgid="2939870049868336652">"আপনার নতুন ডিভাইস চালিয়ে দেখুন"</string>
     <string name="disabled_low_ram_device" msgid="3751578499721173344">"এই বৈশিষ্ট্যটি এই ডিভাইসে উপলব্ধ নেই"</string>
 </resources>
diff --git a/res/values-bs/arrays.xml b/res/values-bs/arrays.xml
index e0a99bd..2d6ab4e 100644
--- a/res/values-bs/arrays.xml
+++ b/res/values-bs/arrays.xml
@@ -100,8 +100,6 @@
     <!-- no translation found for wifi_security_no_eap:0 (2084555984818107151) -->
     <!-- no translation found for wifi_security_no_eap:1 (397579322683471524) -->
     <!-- no translation found for wifi_security_no_eap:2 (1968820975358150484) -->
-    <!-- no translation found for wifi_ap_security:0 (5251664683198623324) -->
-    <!-- no translation found for wifi_ap_security:1 (7989073072260294673) -->
   <string-array name="wifi_eap_method">
     <item msgid="1160193392455075561">"PEAP"</item>
     <item msgid="7981731051382306293">"TLS"</item>
diff --git a/res/values-bs/strings.xml b/res/values-bs/strings.xml
index e014da1..8e1bf17 100644
--- a/res/values-bs/strings.xml
+++ b/res/values-bs/strings.xml
@@ -90,7 +90,7 @@
     <string name="font_size_preview_text_title" msgid="1310536233106975546">"Čarobnjak iz Oza"</string>
     <string name="font_size_preview_text_subtitle" msgid="4231671528173110093">"Poglavlje 11: Smaragdni grad Oz"</string>
     <string name="font_size_preview_text_body" msgid="2846183528684496723">"I pored toga što su im oči bile zaštićene zelenim naočalama, Dorothy i njeni prijatelji su isprva bili zaslijepljeni blještavilom tog grada. Ulicama su se nizale predivne zelene kuće izgrađene od zelenog mermera i obasute svjetlucavim smaragdima. Hodali su trotoarom od istog zelenog mermera, a na spoju između blokova nalazili su se usko postavljeni redovi smaragda koji su svjetlucali od sunčevog sjaja. Prozorska okna su bila od zelenog stakla. Čak je i nebo iznad grada imalo zelenu nijansu, a sunčeve zrake su bile zelene. \n\nTu je bilo mnogo ljudi, muškaraca, žena i djece, šetali su odjeveni u zelenu odjeću i imali su zelenkastu kožu. S čuđenjem su gledali u Dodorthy i njenu čudnovatu družinu. Kada su vidjeli lava, sva djeca su pobjegla i sakrila se iza svoje majke; ali niko im se nije obraćao. Na ulici je bilo mnogo prodavnica, a Dorothy je vidjela da je u njima sve zeleno. U ponudi su bili zeleni slatkiši i zelene kokice, kao i zelene cipele, zeleni šeširi i raznorazna zelena odjeća. Na jednom mjestu čovjek je prodavao zelenu limunadu, a kada su je djeca kupovala, Dorothy je vidjela da plaćaju zelenim novčićima. \n\nIzgleda da nije bilo konja niti drugih životinja. Muškarci su nosili stvari naokolo u zelenim kolicima koja su gurali ispred sebe. Svi su izgledali sretno, zadovoljno i napredno."</string>
-    <string name="font_size_save" msgid="3450855718056759095">"U redu"</string>
+    <string name="font_size_save" msgid="3450855718056759095">"Uredu"</string>
     <string name="sdcard_setting" product="nosdcard" msgid="8281011784066476192">"USB pohrana"</string>
     <string name="sdcard_setting" product="default" msgid="5922637503871474866">"SD kartica"</string>
     <string name="bluetooth" msgid="5549625000628014477">"Bluetooth"</string>
@@ -107,8 +107,8 @@
     <string name="bluetooth_profile_details" msgid="6823621790324933337">"Postavke profila"</string>
     <string name="bluetooth_name_not_set" msgid="2653752006416027426">"Nije postavljeno ime, koristi se ime računa"</string>
     <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_rename_device" msgid="4352483834491958740">"Promjena naziva uređaja"</string>
+    <string name="bluetooth_rename_button" msgid="1648028693822994566">"Promijeni naziv"</string>
     <string name="bluetooth_disconnect_title" msgid="7830252930348734303">"Želite li prekinuti vezu s uređajem?"</string>
     <string name="bluetooth_disconnect_all_profiles" product="default" msgid="8208712728668714199">"Vaš telefon će prekinuti vezu s uređajem <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
     <string name="bluetooth_disconnect_all_profiles" product="tablet" msgid="6611038575213485336">"Vaš tablet će prekinuti vezu s uređajem <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
@@ -127,7 +127,7 @@
     <string name="bluetooth_unknown" msgid="644716244548801421"></string>
     <string name="bluetooth_device" msgid="5291950341750186887">"Neimenovani Bluetooth uređaj"</string>
     <string name="progress_scanning" msgid="192587958424295789">"Pretraživanje"</string>
-    <string name="bluetooth_no_devices_found" msgid="1085232930277181436">"Nije pronađen nijedan obližnji Bluetooth uređaj."</string>
+    <string name="bluetooth_no_devices_found" msgid="1085232930277181436">"Nema Bluetooth uređaja u blizini."</string>
     <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>
@@ -167,7 +167,7 @@
     <string name="bluetooth_map_acceptance_dialog_text" msgid="8712508202081143737">"%1$s želi pristupiti svojim porukama. Dozvoliti pristup za %2$s?"</string>
     <string name="bluetooth_sap_request" msgid="2669762224045354417">"Zahtjev za pristup SIM-u"</string>
     <string name="bluetooth_sap_acceptance_dialog_text" msgid="4414253873553608690">"<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g> želi pristupiti vašoj SIM kartici. Odobrenje pristupa SIM kartici će onemogućiti vezu za prijenos podataka na vašem uređaju za vrijeme trajanja veze. Odobri pristup uređaju <xliff:g id="DEVICE_NAME_1">%2$s?</xliff:g>"</string>
-    <string name="bluetooth_device_name_summary" msgid="4757990010751789977">"Uređaj je vidljiv drugim uređajima kao \'<xliff:g id="DEVICE_NAME">^1</xliff:g>\'"</string>
+    <string name="bluetooth_device_name_summary" msgid="522235742194965734">"Uređaj je vidljiv drugim uređajima kao \'<xliff:g id="DEVICE_NAME">^1</xliff:g>\'"</string>
     <string name="bluetooth_paired_device_title" msgid="8638994696317952019">"Vaši uređaji"</string>
     <string name="bluetooth_pairing_page_title" msgid="7712127387361962608">"Uparivanje novog uređaja"</string>
     <string name="date_and_time" msgid="9062980487860757694">"Datum i vrijeme"</string>
@@ -251,9 +251,9 @@
     <string name="skip_label" msgid="47510779345218297">"Preskoči"</string>
     <string name="next_label" msgid="4693520878012668114">"Naprijed"</string>
     <string name="language_picker_title" msgid="3596315202551687690">"Jezici"</string>
-    <string name="pref_title_lang_selection" msgid="2014920136978776034">"Izbor jezika"</string>
+    <string name="pref_title_lang_selection" msgid="2014920136978776034">"Postavke jezika"</string>
     <string name="locale_remove_menu" msgid="7651301406723638854">"Ukloni"</string>
-    <string name="add_a_language" msgid="2330538812283783022">"Dodaj jezik"</string>
+    <string name="add_a_language" msgid="2330538812283783022">"Dodajte jezik"</string>
     <plurals name="dlg_remove_locales_title" formatted="false" msgid="4276642359346122396">
       <item quantity="one">Želite li ukloniti odabrane jezike?</item>
       <item quantity="few">Želite li ukloniti odabrane jezike?</item>
@@ -288,8 +288,7 @@
     <string name="airplane_mode" msgid="8837269988154128601">"Način rada u avionu"</string>
     <string name="radio_controls_title" msgid="3447085191369779032">"Više"</string>
     <string name="wireless_networks_settings_title" msgid="3643009077742794212">"Bežična veza i mreže"</string>
-    <!-- no translation found for radio_controls_summary (1838624369870907268) -->
-    <skip />
+    <string name="radio_controls_summary" msgid="1838624369870907268">"Upravljanje značajkama Wi-Fi, Bluetooth, način rada u zrakoplovu, mobilne mreže i VPN-ovi"</string>
     <string name="cellular_data_title" msgid="6835451574385496662">"Mobilni podaci"</string>
     <string name="calls_title" msgid="3544471959217176768">"Pozivi"</string>
     <string name="sms_messages_title" msgid="1778636286080572535">"SMS poruke"</string>
@@ -315,6 +314,8 @@
     <string name="zone_auto" msgid="334783869352026648">"Automatska vremenska zona"</string>
     <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_auto" msgid="2117383168985653422">"Automatski format 24 sata"</string>
+    <string name="date_time_24hour_auto_summary" msgid="6351812925651480277">"Koristi lokalni zadani format"</string>
     <string name="date_time_24hour_title" msgid="3203537578602803850">"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>
@@ -327,7 +328,7 @@
     <string name="zone_list_menu_sort_by_timezone" msgid="2720190443744884114">"Poredaj po vremenskim zonama"</string>
     <string name="date_picker_title" msgid="1338210036394128512">"Datum"</string>
     <string name="time_picker_title" msgid="483460752287255019">"Vrijeme"</string>
-    <string name="lock_after_timeout" msgid="4590337686681194648">"Automatski zaključaj"</string>
+    <string name="lock_after_timeout" msgid="4590337686681194648">"Automatsko zaključavanje"</string>
     <string name="lock_after_timeout_summary" msgid="6128431871360905631">"<xliff:g id="TIMEOUT_STRING">%1$s</xliff:g> nakon stanja mirovanja"</string>
     <string name="lock_immediately_summary_with_exception" msgid="9119632173886172690">"Odmah nakon mirovanja, osim kada ga <xliff:g id="TRUST_AGENT_NAME">%1$s</xliff:g> drži otključanim"</string>
     <string name="lock_after_timeout_summary_with_exception" msgid="5579064842797188409">"<xliff:g id="TIMEOUT_STRING">%1$s</xliff:g> nakon mirovanja, osim kada <xliff:g id="TRUST_AGENT_NAME">%2$s</xliff:g> održava status nezaključano"</string>
@@ -344,8 +345,7 @@
     <string name="Accounts_settings_title" msgid="1643879107901699406">"Računi"</string>
     <string name="location_settings_title" msgid="1369675479310751735">"Lokacija"</string>
     <string name="account_settings_title" msgid="626177544686329806">"Računi"</string>
-    <!-- no translation found for security_settings_title (4918904614964215087) -->
-    <skip />
+    <string name="security_settings_title" msgid="4918904614964215087">"Sigurnost i lokacija"</string>
     <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>
@@ -360,23 +360,26 @@
     <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>
-    <string name="fingerprint_add_title" msgid="1926752654454033904">"Dodaj otisak prsta"</string>
+    <string name="fingerprint_add_title" msgid="1926752654454033904">"Dodajte otisak prsta"</string>
     <string name="fingerprint_enable_keyguard_toggle_title" msgid="5078060939636911795">"zaključavanje ekrana"</string>
     <plurals name="security_settings_fingerprint_preference_summary" formatted="false" msgid="624961700033979880">
-      <item quantity="one"><xliff:g id="COUNT_1">%1$d</xliff:g> otisak prsta je registrovan</item>
-      <item quantity="few"><xliff:g id="COUNT_1">%1$d</xliff:g> otisak prsta su registrovana</item>
-      <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> otisak prsta je registrovano</item>
+      <item quantity="one"><xliff:g id="COUNT_1">%1$d</xliff:g> otisak prsta je postavljen</item>
+      <item quantity="few"><xliff:g id="COUNT_1">%1$d</xliff:g> otiska prsta su postavljena</item>
+      <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> otisaka prstiju je postavljeno</item>
     </plurals>
     <string name="security_settings_fingerprint_preference_summary_none" msgid="1507739327565151923"></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" 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-a."</string>
     <string name="security_settings_fingerprint_enroll_introduction_message_unlock_disabled" msgid="1550756694054944874">"Pomoću otiska prsta otključavajte telefon ili odobravajte kupovinu.\n\nNapomena: otisak prsta ne možete koristiti za otključavanje ovog uređaja. Za više informacija, obratite se administratoru svoje organizacije"</string>
-    <string name="security_settings_fingerprint_enroll_introduction_message_setup" msgid="6817326798834882531">"Pomoću otiska prsta otključavajte telefon ili odobravajte kupovinu.\n\nNapomena: otisak vašeg prsta može biti manje siguran od jakog uzorka ili PIN koda."</string>
+    <string name="security_settings_fingerprint_enroll_introduction_message_setup" msgid="6817326798834882531">"Pomoću otiska prsta otključavajte telefon ili odobravajte kupovinu.\n\nNapomena: otisak vašeg prsta može biti manje siguran od jakog uzorka ili PIN-a."</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel" msgid="3199351118385606526">"Otkaži"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue" msgid="7472492858148162530">"Nastavi"</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel_setup" msgid="5021369420474432665">"Preskoči"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue_setup" msgid="1961957425135180242">"Naprijed"</string>
+    <string name="setup_fingerprint_enroll_skip_title" msgid="362050541117362034">"Preskočiti otisak prsta?"</string>
+    <string name="setup_fingerprint_enroll_skip_after_adding_lock_text" msgid="958990414356204763">"Postavljanje otiska prsta traje svega minut ili dva. Ako ovo preskočite, otisak prsta možete dodati kasnije u postavkama."</string>
+    <string name="lock_screen_intro_skip_title" msgid="4988210105913705679">"Preskočiti zaključani ekran?"</string>
     <string name="lock_screen_intro_skip_dialog_text_frp" product="tablet" msgid="1581834104051243425">"Funkcije za zaštitu uređaja neće se uključiti. Nećete moći spriječiti druge osobe da koriste ovaj tablet ako ga izgubite, ako vam ga ukradu ili ga vratite na početne postavke."</string>
     <string name="lock_screen_intro_skip_dialog_text_frp" product="device" msgid="4629503416877189572">"Funkcije za zaštitu uređaja neće se uključiti. Nećete moći spriječiti druge osobe da koriste ovaj uređaj ako ga izgubite, ako vam ga ukradu ili ga vratite na početne postavke."</string>
     <string name="lock_screen_intro_skip_dialog_text_frp" product="default" msgid="2423428240245737909">"Funkcije za zaštitu uređaja neće se uključiti. Nećete moći spriječiti druge osobe da koriste ovaj telefon ako ga izgubite, ako vam ga ukradu ili ga vratite na početne postavke."</string>
@@ -389,7 +392,7 @@
     <string name="security_settings_fingerprint_enroll_find_sensor_message" msgid="8793966374365960368">"Nalazi se na poleđini telefona. Koristite kažiprst."</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_content_description" msgid="2058830032070449160">"Ilustracija sa uređajem i lokacijom senzora za otisak prsta"</string>
     <string name="security_settings_fingerprint_enroll_dialog_name_label" msgid="7086763077909041106">"Ime"</string>
-    <string name="security_settings_fingerprint_enroll_dialog_ok" msgid="4150384963879569750">"U redu"</string>
+    <string name="security_settings_fingerprint_enroll_dialog_ok" msgid="4150384963879569750">"Uredu"</string>
     <string name="security_settings_fingerprint_enroll_dialog_delete" msgid="4114615413240707936">"Izbriši"</string>
     <string name="security_settings_fingerprint_enroll_start_title" msgid="2068961812439460133">"Dodirnite senzor"</string>
     <string name="security_settings_fingerprint_enroll_start_message" msgid="3909929328942564524">"Stavite prst na senzor i podignite ga kad osjetite vibraciju"</string>
@@ -397,17 +400,17 @@
     <string name="security_settings_fingerprint_enroll_repeat_message" msgid="6158989350522518586">"Nastavite podizati prst da dodate različite segmente otiska"</string>
     <string name="security_settings_fingerprint_enroll_finish_title" msgid="7567276170287972230">"Dodan je otisak prsta"</string>
     <string name="security_settings_fingerprint_enroll_finish_message" msgid="4796715961273420536">"Kada vidite ovu ikonu, koristite otisak prsta za identifikaciju ili odobravanje kupovine."</string>
-    <string name="security_settings_fingerprint_enroll_enrolling_skip" msgid="3710211704052369752">"Uradi to kasnije"</string>
+    <string name="security_settings_fingerprint_enroll_enrolling_skip" msgid="3710211704052369752">"Uradit ću to kasnije"</string>
     <string name="setup_fingerprint_enroll_enrolling_skip_title" msgid="6808422329107426923">"Preskočiti postavljanje otiska prsta?"</string>
     <string name="setup_fingerprint_enroll_enrolling_skip_message" msgid="274849306857859783">"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="2989019978041986175">"Dodirnite senzor na poleđini telefona. Koristite kažiprst."</string>
-    <string name="security_settings_fingerprint_enroll_error_dialog_title" msgid="3618021988442639280">"Upis nije dovršen"</string>
+    <string name="security_settings_fingerprint_enroll_error_dialog_title" msgid="3618021988442639280">"Registracija nije dovršena"</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="security_settings_fingerprint_enroll_error_generic_dialog_message" msgid="3624760637222239293">"Registracija otiska prsta nije uspjela. Pokušajte 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">"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="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>
@@ -452,7 +455,7 @@
     <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 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="crypt_keeper_switch_input_method" msgid="4168332125223483198">"Promjena načina 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>
@@ -462,7 +465,7 @@
     <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>
     <string name="setup_lock_settings_picker_title" product="default" msgid="1572244299605153324">"Zaštitite svoj telefon"</string>
-    <string name="setup_lock_settings_picker_fingerprint_message" msgid="5585650064305600578">"Za dodatnu sigurnost podesite rezervni način zaključavanja ekrana."</string>
+    <string name="lock_settings_picker_fingerprint_added_security_message" msgid="5768002109707648463">"Za dodatnu sigurnost postavite rezervni način zaključavanja ekrana."</string>
     <string name="setup_lock_settings_picker_message" product="tablet" msgid="8919671129189936210">"Spriječite da druge osobe koriste ovaj tablet bez vašeg odobrenja tako što ćete aktivirati funkcije za zaštitu uređaja. Odaberite koji način zaključavanja ekrana želite koristiti."</string>
     <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. Odaberite 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. Odaberite koji način zaključavanja ekrana želite koristiti."</string>
@@ -508,7 +511,7 @@
 
 </xliff:g>Vaši sačuvani otisci prstiju također će se ukloniti iz ovog uređaja i nećete ih moći koristiti za otključavanje telefona, odobravanje kupovine ili prijavljivanje u aplikacije."</string>
     <string name="unlock_disable_frp_warning_content_pin" msgid="586996206210265131">"Funkcija zaštite uređaja neće raditi bez PIN-a."</string>
-    <string name="unlock_disable_frp_warning_content_pin_fingerprint" msgid="3370462835533123695">"Funkcije za zaštitu uređaja neće raditi bez PIN koda.<xliff:g id="EMPTY_LINE">
+    <string name="unlock_disable_frp_warning_content_pin_fingerprint" msgid="3370462835533123695">"Funkcije za zaštitu uređaja neće raditi bez PIN-a.<xliff:g id="EMPTY_LINE">
 
 </xliff:g>Vaši sačuvani otisci prstiju također će se ukloniti iz ovog uređaja i nećete ih moći koristiti za otključavanje telefona, odobravanje kupovine ili prijavljivanje u aplikacije."</string>
     <string name="unlock_disable_frp_warning_content_password" msgid="5420612686852555537">"Funkcija zaštite uređaja neće raditi bez lozinke."</string>
@@ -524,7 +527,7 @@
 
 </xliff:g>Vaši sačuvani otisci prstiju također će se ukloniti iz ovog profila i nećete ih moći koristiti za otključavanje profila, odobravanje kupovine ili prijavljivanje u aplikacije."</string>
     <string name="unlock_disable_frp_warning_content_pin_profile" msgid="7790688070593867767">"Funkcije za zaštitu profila neće funkcionirati bez PIN-a."</string>
-    <string name="unlock_disable_frp_warning_content_pin_fingerprint_profile" msgid="4209564603132870532">"Funkcije za zaštitu profila neće raditi bez PIN koda.<xliff:g id="EMPTY_LINE">
+    <string name="unlock_disable_frp_warning_content_pin_fingerprint_profile" msgid="4209564603132870532">"Funkcije za zaštitu profila neće raditi bez PIN-a.<xliff:g id="EMPTY_LINE">
 
 </xliff:g>Vaši sačuvani otisci prstiju također će se ukloniti iz ovog profila i nećete ih moći koristiti za otključavanje profila, odobravanje kupovine ili prijavljivanje u aplikacije."</string>
     <string name="unlock_disable_frp_warning_content_password_profile" msgid="7569285520567674461">"Funkcije za zaštitu profila neće funkcionirati bez lozinke."</string>
@@ -542,13 +545,13 @@
     <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="1688030823464420974">"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="5350785938296254352">"Ako u sljedećem pokušaju unesete neispravan PIN kôd, podaci ovog uređaja će se izbrisati"</string>
+    <string name="lock_last_pin_attempt_before_wipe_device" msgid="5350785938296254352">"Ako u sljedećem pokušaju unesete neispravan PIN, podaci ovog uređaja će se izbrisati"</string>
     <string name="lock_last_password_attempt_before_wipe_device" msgid="6208035114731421034">"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_pin_attempt_before_wipe_user" msgid="4049024921333961715">"Ako u sljedećem pokušaju unesete neispravan PIN, 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_pin_attempt_before_wipe_profile" msgid="5799931839127476913">"Ako u sljedećem pokušaju unesete neispravan PIN, 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="5047439819181833824">"Previše je neispravnih pokušaja. Podaci ovog uređaja će se izbrisati."</string>
     <string name="lock_failed_attempts_now_wiping_user" msgid="6188180643494518001">"Previše je neispravnih pokušaja. Ovaj korisnik će se izbrisati."</string>
@@ -560,7 +563,7 @@
     <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_pin_recently_used" msgid="1401569207976460727">"Administrator uređaja ne dozvoljava korištenje nedavnog PIN-a"</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>
@@ -599,6 +602,7 @@
     <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="lockpassword_clear_label" msgid="5724429464960458155">"Obriš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>
@@ -660,8 +664,8 @@
     <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 uređajima s Bluetoothom u blizini."</string>
-    <string name="ble_scan_notify_text" msgid="1295915006005700650">"Radi poboljšanja preciznosti lociranja, sistemske aplikacije i usluge i dalje mogu detektirati uređaje s Bluetoothom. Ovo možete promijeniti u <xliff:g id="LINK_BEGIN_0">LINK_BEGIN</xliff:g>postavkama skeniranja<xliff:g id="LINK_END_1">LINK_END</xliff:g>."</string>
+    <string name="bluetooth_empty_list_bluetooth_off" msgid="6351930724051893423">"Kada je Bluetooth uključen, uređaj može komunicirati s 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 prepoznati uređaje s Bluetoothom. Ovo možete promijeniti u <xliff:g id="LINK_BEGIN_0">LINK_BEGIN</xliff:g>postavkama skeniranja<xliff:g id="LINK_END_1">LINK_END</xliff:g>."</string>
     <string name="bluetooth_connect_failed" msgid="4500234659813241053">"Nije povezan. Pokušajte ponovo."</string>
     <string name="device_details_title" msgid="6576953269221085300">"Detalji o uređaju"</string>
     <string name="bluetooth_device_mac_address" msgid="2513724313558236181">"Bluetooth adresa uređaja: <xliff:g id="ADDRESS">%1$s</xliff:g>"</string>
@@ -681,7 +685,7 @@
     <string name="bluetooth_device_advanced_online_mode_title" msgid="3689050071425683114">"Poveži se"</string>
     <string name="bluetooth_device_advanced_online_mode_summary" msgid="1204424107263248336">"Poveži se s Bluetooth uređajem"</string>
     <string name="bluetooth_device_advanced_profile_header_title" msgid="102745381968579605">"Koristi se za"</string>
-    <string name="bluetooth_device_advanced_rename_device" msgid="5148578059584955791">"Preimenuj"</string>
+    <string name="bluetooth_device_advanced_rename_device" msgid="5148578059584955791">"Promijeni naziv"</string>
     <string name="bluetooth_device_advanced_enable_opp_title" msgid="8222550640371627365">"Dozvoli dolazne transfere fajlova"</string>
     <string name="bluetooth_pan_user_profile_summary_connected" msgid="4602294638909590612">"Pov. na ur. za pris. int."</string>
     <string name="bluetooth_pan_nap_profile_summary_connected" msgid="1561383706411975199">"Dij. lok. int. veze s ur."</string>
@@ -717,7 +721,7 @@
     <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 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="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 približavanjem uređaja jedan drugome. Naprimjer, možete emitirati web stranice, videozapise s YouTubea, kontakte i drugo.\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>
@@ -757,7 +761,7 @@
     <string name="wifi_switch_away_when_unvalidated" msgid="1707247692180853058">"Prebaci se na prijenos mobilnih podataka kada Wi-Fi izgubi pristup Internetu."</string>
     <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_add_network" msgid="6234851776910938957">"Dodajte mrežu"</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>
@@ -794,6 +798,7 @@
     <string name="wifi_wps_failed_tkip" msgid="4282401586860713349">"Sigurnosna postavka za bežični usmjerivač (TKIP) nije podržana"</string>
     <string name="wifi_wps_failed_auth" msgid="1174614355181181958">"Provjeravanje vjerodostojnosti nije uspjelo. 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">"Wi‑Fi veza je prekinuta. Postavljanje funkcije WPS je otkazano."</string>
     <string name="wifi_ssid" msgid="5519636102673067319">"Ime mreže"</string>
     <string name="wifi_ssid_hint" msgid="897593601067321355">"Unesite SSID"</string>
     <string name="wifi_security" msgid="6603611185592956936">"Sigurnost"</string>
@@ -830,6 +835,8 @@
     <string name="wifi_wps_available_first_item" msgid="4422547079984583502">"WPS dostupan"</string>
     <string name="wifi_wps_available_second_item" msgid="8427520131718215301">" (WPS dostupan)"</string>
     <string name="wifi_wps_nfc_enter_password" msgid="2288214226916117159">"Unesite svoju lozinku za mrežu"</string>
+    <string name="wifi_carrier_connect" msgid="8174696557882299911">"Wi-Fi mreža mobilnog operatera"</string>
+    <string name="wifi_carrier_content" msgid="4634077285415851933">"Povežite se preko mobilnog operatera <xliff:g id="NAME">%1%s</xliff:g>"</string>
     <string name="wifi_scan_always_turnon_message" msgid="203123538572122989">"Da biste poboljšali preciznost lokacije te u druge svrhe, <xliff:g id="APP_NAME">%1$s</xliff:g> aplikacija želi uključiti skeniranje mreže, čak i kada je Wi-Fi isključen.\n\nŽelite li dozvoliti ovo za sve aplikacije koje žele izvršiti skeniranje?"</string>
     <string name="wifi_scan_always_turnoff_message" msgid="5538901671131941043">"Da ovo isključite, idite na Napredno u preklopnom meniju."</string>
     <string name="wifi_scan_always_confirm_allow" msgid="5355973075896817232">"Dozvoli"</string>
@@ -847,6 +854,7 @@
     <string name="wifi_connect" msgid="1076622875777072845">"Poveži se"</string>
     <string name="wifi_failed_connect_message" msgid="8491902558970292871">"Povezivanje na mrežu nije uspjelo"</string>
     <string name="wifi_forget" msgid="8168174695608386644">"Zaboravi"</string>
+    <string name="wifi_modify" msgid="6100248070440710782">"Izmijeni"</string>
     <string name="wifi_failed_forget_message" msgid="1348172929201654986">"Zaboravljanje mreže nije uspjelo"</string>
     <string name="wifi_save" msgid="3331121567988522826">"Sačuvaj"</string>
     <string name="wifi_failed_save_message" msgid="6650004874143815692">"Čuvanje mreže nije uspjelo"</string>
@@ -860,6 +868,7 @@
     <string name="wifi_advanced_titlebar" msgid="4485841401774142908">"Napredni 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_title" msgid="3471132676909349382">"Informacije o mreži"</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="6734119149106422148">"IPv6 adrese"</string>
@@ -881,27 +890,26 @@
     <string name="wifi_p2p_persist_network" msgid="1646424791818168590">"Zapamti ovu vezu"</string>
     <string name="wifi_p2p_menu_search" msgid="3436429984738771974">"Potraži uređaje"</string>
     <string name="wifi_p2p_menu_searching" msgid="2396704492143633876">"Pretraživanje…"</string>
-    <string name="wifi_p2p_menu_rename" msgid="8448896306960060415">"Preimenuj uređaj"</string>
+    <string name="wifi_p2p_menu_rename" msgid="8448896306960060415">"Promijeni naziv uređaja"</string>
     <string name="wifi_p2p_peer_devices" msgid="299526878463303432">"Ravnopravni uređaji"</string>
     <string name="wifi_p2p_remembered_groups" msgid="3847022927914068230">"Zapamćene grupe"</string>
     <string name="wifi_p2p_failed_connect_message" msgid="8491862096448192157">"Povezivanje nije uspjelo."</string>
-    <string name="wifi_p2p_failed_rename_message" msgid="2562182284946936380">"Preimenovanje uređaja nije uspjelo."</string>
+    <string name="wifi_p2p_failed_rename_message" msgid="2562182284946936380">"Promjena naziva uređaja nije uspjela."</string>
     <string name="wifi_p2p_disconnect_title" msgid="3216846049677448420">"Prekinuti vezu?"</string>
     <string name="wifi_p2p_disconnect_message" msgid="8227342771610125771">"Ako prekinete vezu, okončat će se veza s uređajem <xliff:g id="PEER_NAME">%1$s</xliff:g>."</string>
     <string name="wifi_p2p_disconnect_multiple_message" msgid="3283805371034883105">"Ako prekinete vezu, okončat će se veza s uređajem <xliff:g id="PEER_NAME">%1$s</xliff:g> i još <xliff:g id="PEER_COUNT">%2$s</xliff:g> uređaja."</string>
     <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">"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" msgid="7763495093333664887">"Wi‑Fi pristupna tačka"</string>
     <string name="wifi_hotspot_off_subtext" msgid="5466126533609394170">"Nema dijeljenja interneta ili sadržaja s drugim uređajima"</string>
     <string name="wifi_hotspot_tethering_on_subtext" product="tablet" msgid="5752490509369962007">"Internetska veza ovog tableta dijeli se putem pristupne tačke"</string>
     <string name="wifi_hotspot_tethering_on_subtext" product="default" msgid="6461075246164300670">"Internetska veza ovog telefona dijeli se putem pristupne tačke"</string>
     <string name="wifi_hotspot_on_local_only_subtext" msgid="2068110388011294735">"Aplikacija dijeli sadržaj. Za dijeljenje internetske veze isključite pa uključite pristupnu tačku"</string>
-    <string name="wifi_hotspot_name_title" msgid="1341735529132128887">"Naziv Wi‑Fi mreže"</string>
+    <string name="wifi_hotspot_name_title" msgid="8237000746618636778">"Naziv pristupne tačke"</string>
     <string name="wifi_hotspot_name_summary_connecting" msgid="3378299995508671967">"Uključivanje pristupne tačke <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>…"</string>
     <string name="wifi_hotspot_name_summary_connected" msgid="3888672084861445362">"Drugi uređaji se mogu povezati na pristupnu tačku <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>"</string>
-    <string name="wifi_hotspot_password_title" msgid="1955592302902091281">"Wi-Fi lozinka"</string>
+    <string name="wifi_hotspot_password_title" msgid="8676859981917573801">"Lozinka pristupne tačke"</string>
     <string name="wifi_hotspot_ap_band_title" msgid="1165801173359290681">"AP opseg"</string>
     <string name="wifi_hotspot_footer_info_regular" msgid="1203489406068036455">"Koristite pristupnu tačku da kreirate Wi‑Fi mrežu za ostale svoje uređaje. Pristupna tačka pruža internet koristeći vaš mobilni prijenos podataka. Mogu se naplaćivati dodatni troškovi za mobilni prijenos podataka."</string>
     <string name="wifi_hotspot_footer_info_local_only" msgid="857988412470694109">"Aplikacije mogu kreirati pristupnu tačku za dijeljenje sadržaja s uređajima u blizini."</string>
@@ -910,9 +918,8 @@
     <string name="wifi_tether_enabled_subtext" msgid="7842111748046063857">"<xliff:g id="NETWORK_SSID">%1$s</xliff:g> je aktivna"</string>
     <string name="wifi_tether_failed_subtext" msgid="1484941858530919002">"Greška kod prijenosne Wi-Fi pristupne tačke"</string>
     <string name="wifi_tether_configure_ap_text" msgid="7974681394041609308">"Postavljanje Wi-Fi pristupne tačke"</string>
-    <string name="wifi_hotspot_configure_ap_text" msgid="5478614731464220432">"Postavke Wi-Fi hotspot"</string>
+    <string name="wifi_hotspot_configure_ap_text" msgid="5478614731464220432">"Postavke Wi-Fi pristupne tačke"</string>
     <string name="wifi_hotspot_configure_ap_text_summary" msgid="5560680057727007011">"AndroidAP WPA2 PSK pristupna tačka"</string>
-    <string name="wifi_tether_configure_subtext" msgid="2050196439900426456">"<xliff:g id="NETWORK_SSID">%1$s</xliff:g> <xliff:g id="NETWORK_SECURITY">%2$s</xliff:g> pristupna tačka"</string>
     <string name="wifi_tether_configure_ssid_default" msgid="8467525402622138547">"Android pristupna tačka"</string>
     <string name="wifi_calling_settings_title" msgid="4102921303993404577">"Wi-Fi pozivanje"</string>
     <string name="wifi_calling_suggestion_title" msgid="9008010480466359578">"Uključite Wi-Fi pozive"</string>
@@ -939,7 +946,7 @@
     <item msgid="3194458950573886239">"0"</item>
   </string-array>
   <string-array name="wifi_calling_mode_choices_without_wifi_only">
-    <item msgid="5782108782860004851">"Prednost ima Wi-Fi"</item>
+    <item msgid="5782108782860004851">"Preferira se Wi-Fi"</item>
     <item msgid="5074515506087318555">"Preferira se mobilna mreža"</item>
   </string-array>
   <string-array name="wifi_calling_mode_choices_v2_without_wifi_only">
@@ -953,7 +960,7 @@
     <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="emergency_address_summary" msgid="3266760199681945746">"Adresa koju hitna služba koristi kao vašu lokaciju ukoliko pozovete 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>
@@ -964,8 +971,7 @@
     <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>
-    <!-- no translation found for home_work_profile_not_supported (1357721012342357037) -->
-    <skip />
+    <string name="home_work_profile_not_supported" msgid="1357721012342357037">"Ne podržava radne profile"</string>
     <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>
@@ -1008,6 +1014,7 @@
     <string name="search_settings" msgid="1910951467596035063">"Traži"</string>
     <string name="search_settings_summary" msgid="9205656546570654169">"Upravljanje postavkama pretraživanja i historije"</string>
     <string name="search_settings_no_results" msgid="8799027492641230999">"Nema rezultata"</string>
+    <string name="search_clear_history" msgid="4196658962573162457">"Obriši historiju"</string>
     <string name="display_settings" msgid="7965901687241669598">"Prikaz"</string>
     <string name="accelerometer_title" msgid="7854608399547349157">"Automatsko rotiranje ekrana"</string>
     <string name="color_mode_title" msgid="3159275920408338215">"Izražene boje"</string>
@@ -1067,7 +1074,7 @@
     <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_dock" msgid="2072657401664633283">"Dok je na 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>
@@ -1106,7 +1113,7 @@
     <string name="sim_reenter_new" msgid="6523819386793546888">"Ponovo unesite novi PIN"</string>
     <string name="sim_change_pin" msgid="7328607264898359112">"PIN za SIM"</string>
     <string name="sim_bad_pin" msgid="2345230873496357977">"Pogrešan PIN"</string>
-    <string name="sim_pins_dont_match" msgid="1695021563878890574">"PIN kodovi se ne podudaraju"</string>
+    <string name="sim_pins_dont_match" msgid="1695021563878890574">"PIN-ovi se ne podudaraju"</string>
     <string name="sim_change_failed" msgid="3602072380172511475">"Nije moguće promijeniti PIN.\nMožda je PIN neispravan."</string>
     <string name="sim_change_succeeded" msgid="8556135413096489627">"PIN za SIM uspješno promijenjen"</string>
     <string name="sim_lock_failed" msgid="2489611099235575984">"Ne možete otključati SIM.\nPIN je možda pogrešan."</string>
@@ -1118,11 +1125,11 @@
     <string name="sim_change_data_message" msgid="5854582807996717811">"Želite li za prijenos mobilnih podataka koristiti SIM karticu <xliff:g id="NEW_SIM">%1$s</xliff:g> umjesto SIM kartice <xliff:g id="OLD_SIM">%2$s</xliff:g>?"</string>
     <string name="sim_preferred_title" msgid="5567909634636045268">"Ažurirati željenu SIM karticu?"</string>
     <string name="sim_preferred_message" msgid="8466930554330635780">"SIM kartica <xliff:g id="NEW_SIM">%1$s</xliff:g> jedina je SIM kartica u vašem uređaju. Želite li tu SIM karticu koristiti za prijenos mobilnih podataka, pozive i SMS poruke?"</string>
-    <string name="wrong_pin_code_pukked" msgid="4003655226832658066">"PIN kôd za SIM je netačan. Za otključavanje uređaja sada morate kontaktirati svog operatera."</string>
+    <string name="wrong_pin_code_pukked" msgid="4003655226832658066">"PIN za SIM je netačan. Za otključavanje uređaja sada morate kontaktirati svog operatera."</string>
     <plurals name="wrong_pin_code" formatted="false" msgid="1582398808893048097">
-      <item quantity="one">PIN kôd za SIM je netačan. Preostao vam je još <xliff:g id="NUMBER_1">%d</xliff:g> pokušaj.</item>
-      <item quantity="few">PIN kôd za SIM je netačan. Preostala su vam još <xliff:g id="NUMBER_1">%d</xliff:g> pokušaja.</item>
-      <item quantity="other">PIN kôd za SIM je netačan. Preostalo vam je još <xliff:g id="NUMBER_1">%d</xliff:g> pokušaja.</item>
+      <item quantity="one">PIN za SIM je netačan. Preostao vam je još <xliff:g id="NUMBER_1">%d</xliff:g> pokušaj.</item>
+      <item quantity="few">PIN za SIM je netačan. Preostala su vam još <xliff:g id="NUMBER_1">%d</xliff:g> pokušaja.</item>
+      <item quantity="other">PIN za SIM je netačan. Preostalo vam je još <xliff:g id="NUMBER_1">%d</xliff:g> pokušaja.</item>
     </plurals>
     <string name="pin_failed" msgid="1848423634948587645">"Operacija PIN-a za SIM nije uspjela!"</string>
     <string name="device_info_settings" product="tablet" msgid="1119755927536987178">"Status tableta"</string>
@@ -1138,7 +1145,6 @@
     <string name="baseband_version" msgid="1848990160763524801">"Verzija nemoduliranog opsega"</string>
     <string name="kernel_version" msgid="9192574954196167602">"Verzija jezgre"</string>
     <string name="build_number" msgid="3075795840572241758">"Broj podverzije"</string>
-    <string name="selinux_status" msgid="6212165375172061672">"Status za SELinux"</string>
     <string name="device_info_not_available" msgid="8062521887156825182">"Nije dostupno"</string>
     <string name="device_status_activity_title" msgid="1411201799384697904">"Status"</string>
     <string name="device_status" msgid="607405385799807324">"Status"</string>
@@ -1156,11 +1162,9 @@
     <string name="status_prl_version" msgid="1007470446618081441">"Verzija PRL-a"</string>
     <string name="status_meid_number" msgid="1751442889111731088">"MEID"</string>
     <string name="status_icc_id" msgid="943368755577172747">"ICCID"</string>
-    <!-- no translation found for status_network_type (3279383550222116235) -->
-    <skip />
+    <string name="status_network_type" msgid="3279383550222116235">"Vrsta mobilne mreže"</string>
     <string name="status_latest_area_info" msgid="7222470836568238054">"Informacije o operateru"</string>
-    <!-- no translation found for status_data_state (5503181397066522950) -->
-    <skip />
+    <string name="status_data_state" msgid="5503181397066522950">"Stanje mobilne mreže"</string>
     <string name="status_service_state" msgid="2323931627519429503">"Stanje usluge"</string>
     <string name="status_signal_strength" msgid="3732655254188304547">"Jačina signala"</string>
     <string name="status_roaming" msgid="2638800467430913403">"Roming"</string>
@@ -1168,7 +1172,6 @@
     <string name="status_wifi_mac_address" msgid="2202206684020765378">"MAC adresa Wi-Fi mreže"</string>
     <string name="status_bt_address" msgid="4195174192087439720">"Bluetooth adresa"</string>
     <string name="status_serial_number" msgid="2257111183374628137">"Serijski broj"</string>
-    <string name="status_unavailable" msgid="7862009036663793314">"Nije dostupno"</string>
     <string name="status_up_time" msgid="7294859476816760399">"Vrijeme aktivnosti"</string>
     <string name="status_awake_time" msgid="2393949909051183652">"Vrijeme aktivnosti"</string>
     <string name="internal_memory" msgid="9129595691484260784">"Interna pohrana"</string>
@@ -1216,7 +1219,7 @@
     <string name="sd_ejecting_summary" msgid="2028753069184908491">"Deaktiviranje u toku"</string>
     <string name="storage_low_title" msgid="1388569749716225155">"Prostor za pohranu ponestaje"</string>
     <string name="storage_low_summary" msgid="7737465774892563129">"Neke funkcije sistema, kao što je sinhronizacija, možda neće raditi ispravno. Pokušajte osloboditi prostor brisanjem ili deaktiviranjem stavki kao što su aplikacije ili medijski sadržaj."</string>
-    <string name="storage_menu_rename" msgid="7141058657592615390">"Preimenuj"</string>
+    <string name="storage_menu_rename" msgid="7141058657592615390">"Promijeni naziv"</string>
     <string name="storage_menu_mount" msgid="1014683672493425425">"Montiraj"</string>
     <string name="storage_menu_unmount" msgid="681485356885955898">"Izbaci"</string>
     <string name="storage_menu_format" msgid="7690626079653152152">"Formatiraj"</string>
@@ -1233,9 +1236,9 @@
     <string name="usb_mtp_title" msgid="3399663424394065964">"Medijski uređaj (MTP)"</string>
     <string name="usb_mtp_summary" msgid="4617321473211391236">"Omogućava prenošenje medijskih fajlova u Windows ili korištenje Android File Transfer aplikacije za Mac (pogledajte www.android.com/filetransfer)"</string>
     <string name="usb_ptp_title" msgid="3852760810622389620">"Kamera (PTP)"</string>
-    <string name="usb_ptp_summary" msgid="7406889433172511530">"Omogućava vam da prenesete fotografije pomoću softvera fotoaparata i da prenesete sve datoteke na kompjutere koji ne podržavaju MTP"</string>
+    <string name="usb_ptp_summary" msgid="7406889433172511530">"Omogućava vam da prenesete fotografije pomoću softvera fotoaparata i da prenesete sve datoteke na računare koji ne podržavaju MTP"</string>
     <string name="usb_midi_title" msgid="3069990264258413994">"MIDI"</string>
-    <string name="usb_midi_summary" msgid="539169474810956358">"Omogućava da MIDI omogućene aplikacije rade preko USB-a sa MIDI softverom na vašem kompjuteru."</string>
+    <string name="usb_midi_summary" msgid="539169474810956358">"Omogućava da MIDI omogućene aplikacije rade preko USB-a sa MIDI softverom na vašem računaru."</string>
     <string name="storage_other_users" msgid="808708845102611856">"Drugi korisnici"</string>
     <string name="storage_internal_title" msgid="690771193137801021">"Uređaj za memoriju"</string>
     <string name="storage_external_title" msgid="3433462910096848696">"Prenosiva memorija"</string>
@@ -1249,7 +1252,7 @@
     <string name="storage_unmount_failure" msgid="5758387106579519489">"<xliff:g id="NAME">%1$s</xliff:g> se ne može sigurno izbaciti"</string>
     <string name="storage_format_success" msgid="3023144070597190555">"Uređaj <xliff:g id="NAME">%1$s</xliff:g> je formatiran"</string>
     <string name="storage_format_failure" msgid="6032640952779735766">"Ne može se formatirati <xliff:g id="NAME">%1$s</xliff:g>"</string>
-    <string name="storage_rename_title" msgid="8242663969839491485">"Preimenovati memoriju"</string>
+    <string name="storage_rename_title" msgid="8242663969839491485">"Promjena naziva pohrane"</string>
     <string name="storage_dialog_unmounted" msgid="6403320870103261477">"Ovaj uređaj (<xliff:g id="NAME_0">^1</xliff:g>) je uspješno uklonjen, ali je i dalje dostupan. \n\nDa biste koristili uređaj <xliff:g id="NAME_1">^1</xliff:g>, prvo ga morate priključiti."</string>
     <string name="storage_dialog_unmountable" msgid="3732209361668282254">"Ovaj <xliff:g id="NAME_0">^1</xliff:g> je oštećen. \n\nDa biste koristili ovaj <xliff:g id="NAME_1">^1</xliff:g>, najprije ga morate postaviti."</string>
     <string name="storage_dialog_unsupported" msgid="4503128224360482228">"Ovaj uređaj ne podržava <xliff:g id="NAME_0">^1</xliff:g>. \n\n Da biste koristili <xliff:g id="NAME_1">^1</xliff:g> s ovim uređajem, najprije ga morate postaviti."</string>
@@ -1257,7 +1260,7 @@
     <string name="storage_internal_unmount_details" msgid="3582802571684490057"><b>"Kada izbacite ovaj uređaj (<xliff:g id="NAME_0">^1</xliff:g>), aplikacije pohranjene na njemu će prestati radit, a medijske datoteke pohranjene na njemu neće biti dostupne dok ga ponovo ne umetnete."</b>" \n\nUređaj <xliff:g id="NAME_1">^1</xliff:g> je formatiran tako da funkcionira samo na ovom uređaju. Neće funkcionirati na bilo kojem drugom uređaju."</string>
     <string name="storage_internal_forget_details" msgid="9028875424669047327">"Da biste koristili aplikacije, slike ili podatke koje ovaj uređaj (<xliff:g id="NAME">^1</xliff:g>) sadrži, ponovo ga umetnite. \n\nUmjesto toga, možete odabrati da zaboravite ovu memoriju ukoliko uređaj nije dostupan \n\nAko odaberete da zaboravite memoriju, svi podaci koje uređaj sadrži će zauvijek biti izgubljeni \n\nAplikacije možete kasnije ponovo instalirati, ali njihovi podaci pohranjeni na ovom uređaju će biti izgubljeni."</string>
     <string name="storage_internal_forget_confirm_title" msgid="1370847944388479245">"Želite li zaboraviti uređaj <xliff:g id="NAME">^1</xliff:g>?"</string>
-    <string name="storage_internal_forget_confirm" msgid="1148446041396902905">"Sve aplikacije, fotografije i podaci sačuvani na ovom <xliff:g id="NAME">^1</xliff:g> bit će trajno izgubljeni."</string>
+    <string name="storage_internal_forget_confirm" msgid="1148446041396902905">"Sve aplikacije, fotografije i podaci pohranjeni na ovom <xliff:g id="NAME">^1</xliff:g> bit će trajno izgubljeni."</string>
     <string name="storage_detail_apps" msgid="6141154016753507490">"Aplikacije"</string>
     <string name="storage_detail_images" msgid="6950678857740634769">"Slike"</string>
     <string name="storage_detail_videos" msgid="2919743464827110953">"Video zapisi"</string>
@@ -1343,27 +1346,24 @@
     <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_dashboard_title" msgid="6254873816990678620">"Vrati opcije na zadane postavke"</string>
+    <string name="reset_dashboard_title" msgid="6254873816990678620">"Opcije vraćanja na zadano"</string>
+    <string name="reset_dashboard_summary" msgid="4851012632493522755">"Mreža, aplikacije ili uređaj mogu se vratiti na zadano"</string>
     <string name="reset_network_title" msgid="6166025966016873843">"Vrati Wi-Fi, mobilnu i Bluetooth vezu na zadane postavke"</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_button_text" msgid="2035676527471089853">"Vrati postavke na zadano"</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_final_button_text" msgid="1797434793741744635">"Vrati postavke na zadano"</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">"Postavke mreže vraćene su na zadano"</string>
-    <string name="master_clear_title" msgid="6617679904229218425">"Potpuno izbriši sve podatke (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_title" msgid="3531267871084279512">"Potpuno izbriši sve podatke (vraćanje na fabričke 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>"muziku"</li>\n<li>"fotografije"</li>\n<li>"ostale korisničke podatke"</li></string>
+    <string name="master_clear_desc_also_erases_esim" msgid="312352697653096008"><li>"Mobilni operateri na eSIM kartici"</li></string>
+    <string name="master_clear_desc_no_cancel_mobile_plan" msgid="5460926449093211144">\n\n"Ovim se neće otkazati vaš plan usluga mobilnog operatera."</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>
@@ -1384,7 +1384,7 @@
     <string name="master_clear_progress_text" msgid="6559096229480527510">"Pričekajte..."</string>
     <string name="call_settings_title" msgid="5188713413939232801">"Postavke poziva"</string>
     <string name="call_settings_summary" msgid="7291195704801002886">"Postavite govornu poštu, prosljeđivanje poziva, poziv na čekanju, ID pozivaoca"</string>
-    <string name="tether_settings_title_usb" msgid="6688416425801386511">"USB dijeljenje veze"</string>
+    <string name="tether_settings_title_usb" msgid="6688416425801386511">"Povezivanje mobitela USB-om"</string>
     <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>
@@ -1442,8 +1442,7 @@
     <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">"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 />
+    <string name="location_network_based" msgid="9134175479520582215">"Lokacija Wi-Fi i mob. mreža"</string>
     <string name="location_neighborhood_level" msgid="5141318121229984788">"Omogućava da aplikacije koriste Googleovu uslugu lokacije kako bi brže procijenile vašu lokaciju. Anonimni podaci o lokaciji se prikupljaju i šalju Googleu."</string>
     <string name="location_neighborhood_level_wifi" msgid="4234820941954812210">"Lokacija utvrđena putem Wi-Fi mreže"</string>
     <string name="location_gps" msgid="8392461023569708478">"GPS sateliti"</string>
@@ -1481,15 +1480,16 @@
     <string name="settings_safetylegal_activity_title" msgid="6901214628496951727">"Sigurnosne informacije"</string>
     <string name="settings_safetylegal_activity_unreachable" msgid="250674109915859456">"Nemate podatkovnu vezu. Da biste odmah vidjeli ove informacije, idite na %s sa bilo kojeg računara povezanog na Internet."</string>
     <string name="settings_safetylegal_activity_loading" msgid="8059022597639516348">"Učitavanje…"</string>
-    <string name="lockpassword_choose_your_password_header" msgid="8624900666929394990">"Odaberite svoju lozinku"</string>
-    <string name="lockpassword_choose_your_password_header_for_fingerprint" msgid="6624409510609085450">"Da koristite otisak prsta, postavite lozinku"</string>
-    <string name="lockpassword_choose_your_pattern_header" msgid="6949761069941694050">"Odaberite uzorak"</string>
-    <string name="lockpassword_choose_your_pattern_header_for_fingerprint" msgid="5901096361617543819">"Da koristite otisak prsta, postavite uzorak"</string>
-    <string name="lockpassword_choose_your_pin_header" msgid="7598849519816138302">"Odaberite PIN"</string>
-    <string name="lockpassword_choose_your_pin_header_for_fingerprint" msgid="765344692615917183">"Da koristite otisak prsta, postavite PIN kôd"</string>
-    <string name="lockpassword_confirm_your_password_header" msgid="6308478184889846633">"Potvrdite lozinku"</string>
+    <string name="lockpassword_choose_your_screen_lock_header" msgid="3872462096767152394">"Postavite zaključavanje ekrana"</string>
+    <string name="lockpassword_choose_your_password_message" msgid="1197569283524841412">"Postavite lozinku radi sigurnosti"</string>
+    <string name="lockpassword_choose_your_password_header_for_fingerprint" msgid="2541818487015343503">"Da koristite otisak prsta, postavite lozinku"</string>
+    <string name="lockpassword_choose_your_pattern_header_for_fingerprint" msgid="7709785406243556723">"Da koristite otisak prsta, postavite uzorak"</string>
+    <string name="lockpassword_choose_your_pin_message" msgid="1875420718677275646">"Postavite PIN radi sigurnosti"</string>
+    <string name="lockpassword_choose_your_pin_header_for_fingerprint" msgid="1549639053195796674">"Da koristite otisak prsta, postavite PIN"</string>
+    <string name="lockpassword_choose_your_pattern_message" msgid="5986983400689720015">"Postavite uzorak radi sigurnosti"</string>
+    <string name="lockpassword_confirm_your_password_header" msgid="1266027268220850931">"Ponovo unesite lozinku"</string>
     <string name="lockpassword_confirm_your_pattern_header" msgid="7543433733032330821">"Potvrdite uzorak"</string>
-    <string name="lockpassword_confirm_your_pin_header" msgid="49038294648213197">"Potvrdite PIN"</string>
+    <string name="lockpassword_confirm_your_pin_header" msgid="7744513791910572550">"Ponovo unesite PIN"</string>
     <string name="lockpassword_confirm_passwords_dont_match" msgid="5140892109439191415">"Lozinke se ne podudaraju"</string>
     <string name="lockpassword_confirm_pins_dont_match" msgid="7226244811505606217">"PIN-ovi se ne podudaraju"</string>
     <string name="lockpassword_choose_lock_generic_header" msgid="3811438094903786145">"Vrste otključavanja"</string>
@@ -1503,11 +1503,17 @@
     <string name="lockpassword_confirm_your_pin_generic_profile" msgid="3730141667547002246">"Za nastavak, unesite radni PIN."</string>
     <string name="lockpassword_confirm_your_password_generic_profile" msgid="4250642723467019894">"Za nastavak, unesite radnu lozinku."</string>
     <string name="lockpassword_strong_auth_required_device_pattern" msgid="530802132223800623">"Za dodatnu sigurnost, unesite uzorak uređaja"</string>
-    <string name="lockpassword_strong_auth_required_device_pin" msgid="7829294830078036417">"Za dodatnu sigurnost, unesite PIN kôd uređaja"</string>
+    <string name="lockpassword_strong_auth_required_device_pin" msgid="7829294830078036417">"Za dodatnu sigurnost, unesite PIN uređaja"</string>
     <string name="lockpassword_strong_auth_required_device_password" msgid="3552644641574796973">"Za dodatnu sigurnost, unesite lozinku uređaja"</string>
     <string name="lockpassword_strong_auth_required_work_pattern" msgid="3003781907040522053">"Za dodatnu sigurnost, unesite radni uzorak"</string>
-    <string name="lockpassword_strong_auth_required_work_pin" msgid="3367491332598821552">"Za dodatnu sigurnost, unesite radni PIN kôd"</string>
+    <string name="lockpassword_strong_auth_required_work_pin" msgid="3367491332598821552">"Za dodatnu sigurnost, unesite radni PIN"</string>
     <string name="lockpassword_strong_auth_required_work_password" msgid="8159775129968582940">"Za dodatnu sigurnost, unesite radnu lozinku"</string>
+    <string name="lockpassword_confirm_your_pattern_details_frp" msgid="6757336656791723193">"Vaš telefon je vraćen na fabričke postavke. Da koristite telefon, unesite prethodni obrazac."</string>
+    <string name="lockpassword_confirm_your_pin_details_frp" msgid="826520613445990470">"Vaš telefon je vraćen na fabričke postavke. Da koristite telefon, unesite prethodni PIN."</string>
+    <string name="lockpassword_confirm_your_password_details_frp" msgid="8944081074615739040">"Vaš telefon je vraćen na fabričke postavke. Da koristite telefon, unesite prethodnu lozinku."</string>
+    <string name="lockpassword_confirm_your_pattern_header_frp" msgid="2898036091609128286">"Potvrdite obrazac"</string>
+    <string name="lockpassword_confirm_your_pin_header_frp" msgid="4141601774778898803">"Potvrdite PIN"</string>
+    <string name="lockpassword_confirm_your_password_header_frp" msgid="3762615419295360480">"Potvrdite lozinku"</string>
     <string name="lockpassword_invalid_pin" msgid="15588049067548470">"Pogrešan PIN"</string>
     <string name="lockpassword_invalid_password" msgid="4038507398784975200">"Pogrešna lozinka"</string>
     <string name="lockpattern_need_to_unlock_wrong" msgid="1745247595356012176">"Pogrešan uzorak"</string>
@@ -1519,8 +1525,8 @@
     <string name="lockpattern_recording_inprogress" msgid="6667844062721656773">"Podignite prst kada završite"</string>
     <string name="lockpattern_recording_incorrect_too_short" msgid="1348234155120957561">"Povežite tačke (najmanje <xliff:g id="NUMBER">%d</xliff:g>). Pokušajte ponovo."</string>
     <string name="lockpattern_pattern_entered_header" msgid="4316818983675591604">"Uzorak snimljen"</string>
-    <string name="lockpattern_need_to_confirm" msgid="8054853451639221265">"Ponovo nacrtajte uzorak da biste potvrdili"</string>
-    <string name="lockpattern_pattern_confirmed_header" msgid="8455614172231880211">"Novi obrazac za otključavanje"</string>
+    <string name="lockpattern_need_to_confirm" msgid="8054853451639221265">"Ponovo nacrtajte uzorak da potvrdite"</string>
+    <string name="lockpattern_pattern_confirmed_header" msgid="8455614172231880211">"Novi uzorak za otključavanje"</string>
     <string name="lockpattern_confirm_button_text" msgid="1128204343957002841">"Potvrdi"</string>
     <string name="lockpattern_restart_button_text" msgid="3337574403350953926">"Nacrtaj ponovo"</string>
     <string name="lockpattern_retry_button_text" msgid="3480423193273588166">"Obriši"</string>
@@ -1531,7 +1537,7 @@
     <string name="lockpattern_settings_enable_visible_pattern_title" msgid="2615606088906120711">"Učini uzorak vidljivim"</string>
     <string name="lockpattern_settings_enable_visible_pattern_title_profile" msgid="4864525074768391381">"Neka uzorak profila bude vidljiv"</string>
     <string name="lockpattern_settings_enable_tactile_feedback_title" msgid="4389015658335522989">"Vibracija na dodir"</string>
-    <string name="lockpattern_settings_enable_power_button_instantly_locks" msgid="5735444062633666327">"Dugme za nap. odmah zaklj."</string>
+    <string name="lockpattern_settings_enable_power_button_instantly_locks" msgid="5735444062633666327">"Dugme za napaj. zaključ. tel."</string>
     <string name="lockpattern_settings_power_button_instantly_locks_summary" msgid="8196258755143711694">"Osim kada ga <xliff:g id="TRUST_AGENT_NAME">%1$s</xliff:g> drži otključanim"</string>
     <string name="lockpattern_settings_choose_lock_pattern" msgid="1652352830005653447">"Postavi uzorak otključavanja"</string>
     <string name="lockpattern_settings_change_lock_pattern" msgid="1123908306116495545">"Promijeni uzorak za otključavanje"</string>
@@ -1556,8 +1562,7 @@
     <string name="install_applications" msgid="4872012136210802181">"Nepoznati izvori"</string>
     <string name="install_applications_title" msgid="4987712352256508946">"Dopusti sve izvore aplikacija"</string>
     <string name="recent_app_category_title" msgid="6673071268966003928">"Nedavno otvarane aplikacije"</string>
-    <string name="see_all_apps_title" msgid="1317153498074308438">"Vidite sve aplikacije, ukupno <xliff:g id="COUNT">%1$d</xliff:g>"</string>
-    <string name="recent_app_summary" msgid="3366446669844932300">"Prije <xliff:g id="TIME">^1</xliff:g>"</string>
+    <string name="see_all_apps_title" msgid="1317153498074308438">"Prikaži sve aplikacije: <xliff:g id="COUNT">%1$d</xliff:g>"</string>
     <string name="install_all_warning" product="tablet" msgid="8310489909586138165">"Vaši podaci na tabletu i lični podaci su više izloženi napadima aplikacija iz nepoznatih izvora. Instaliranjem aplikacija iz takvih izvora, saglasni ste da ste vi odgovorni za bilo kakvu štetu na telefonu ili gubitak podataka koji mogu nastati korištenjem tih aplikacija."</string>
     <string name="install_all_warning" product="default" msgid="1952257127370115988">"Vaši podaci na telefonu i lični podaci više su izloženi napadima aplikacija iz nepoznatih izvora. Instaliranjem aplikacija iz takvih izvora, saglasni ste da ste vi odgovorni za bilo kakvu štetu na telefonu ili gubitak podataka koji mogu nastati korištenjem tih aplikacija."</string>
     <string name="advanced_settings" msgid="1777249286757067969">"Napredne postavke"</string>
@@ -1607,8 +1612,8 @@
     <string name="default_emergency_app" msgid="1951760659640369980">"Aplikacija za hitne situacije"</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="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 odobrenja"</li>\n\n" Nećete izgubiti podatke iz aplikacija."</string>
+    <string name="reset_app_preferences_button" msgid="2559089511841281242">"Vrati aplikacije na zadano"</string>
     <string name="manage_space_text" msgid="8852711522447794676">"Upravljaj prostorom"</string>
     <string name="filter" msgid="2018011724373033887">"Filter"</string>
     <string name="filter_dlg_title" msgid="8693024463731076091">"Odaberite opcije filtera"</string>
@@ -1628,7 +1633,7 @@
     <string name="recompute_size" msgid="7722567982831691718">"Ponovno izračunavanje veličine…"</string>
     <string name="clear_data_dlg_title" msgid="5605258400134511197">"Izbrisati podatke aplikacija?"</string>
     <string name="clear_data_dlg_text" msgid="3951297329833822490">"Svi podaci ove aplikacije će biti trajno izbrisani. To uključuje sve datoteke, postavke, račune, baze podataka itd."</string>
-    <string name="dlg_ok" msgid="2402639055725653590">"U redu"</string>
+    <string name="dlg_ok" msgid="2402639055725653590">"Uredu"</string>
     <string name="dlg_cancel" msgid="1674753358972975911">"Otkaži"</string>
     <string name="app_not_found_dlg_title" msgid="3127123411738434964"></string>
     <string name="app_not_found_dlg_text" msgid="4893589904687340011">"Aplikacija nije pronađena u listi instaliranih aplikacija."</string>
@@ -1678,7 +1683,7 @@
     <string name="app_disable_notifications_dlg_text" msgid="5088484670924769845">"Ako isključite obavještenja za ovu aplikaciju, mož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">"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="app_install_details_summary" msgid="6464796332049327547">"Aplikacija je instalirana iz 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>
@@ -1783,7 +1788,7 @@
     <string name="user_dict_settings_add_word_hint" msgid="5725254076556821247">"Unesite riječ"</string>
     <string name="user_dict_settings_add_shortcut_hint" msgid="7333763456561873445">"Opcionalna prečica"</string>
     <string name="user_dict_settings_edit_dialog_title" msgid="8967476444840548674">"Uredi riječ"</string>
-    <string name="user_dict_settings_context_menu_edit_title" msgid="2210564879320004837">"Uredi"</string>
+    <string name="user_dict_settings_context_menu_edit_title" msgid="2210564879320004837">"Uređivanje"</string>
     <string name="user_dict_settings_context_menu_delete_title" msgid="9140703913776549054">"Izbriši"</string>
     <string name="user_dict_settings_empty_text" msgid="1971969756133074922">"Nemate nijednu riječ u korisničkom rječniku. Da dodate riječ, dodirnite dugme Dodaj (+)."</string>
     <string name="user_dict_settings_all_languages" msgid="6742000040975959247">"Za sve jezike"</string>
@@ -1822,7 +1827,7 @@
     <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. Funkcije pristupačnosti se mogu kasnije promijeniti u Postavkama."</string>
-    <string name="vision_settings_suggestion_title" msgid="917294957154878441">"Povećaj veličinu slova"</string>
+    <string name="vision_settings_suggestion_title" msgid="8058794060304707004">"Promijenite veličinu fonta"</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>
@@ -1859,7 +1864,6 @@
     <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="preference_summary_default_combination" msgid="8532964268242666060">"<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>
@@ -1933,7 +1937,7 @@
     <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="disable_service_message" msgid="2247101878627941561">"Uslugu <xliff:g id="SERVICE">%1$s</xliff:g> možete zaustaviti dodirom na UREDU."</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>
@@ -1957,7 +1961,7 @@
     <string name="print_menu_item_add_printers" msgid="2890738028215834012">"Dodaj pisače"</string>
     <string name="print_feature_state_on" msgid="8098901852502441048">"Uključeno"</string>
     <string name="print_feature_state_off" msgid="7294876968403966040">"Isključeno"</string>
-    <string name="print_menu_item_add_service" msgid="3811645167869797802">"Dodaj uslugu"</string>
+    <string name="print_menu_item_add_service" msgid="3811645167869797802">"Dodajte uslugu"</string>
     <string name="print_menu_item_add_printer" msgid="8251218970577291032">"Dodaj štampač"</string>
     <string name="print_menu_item_search" msgid="7025589328240514553">"Pretraži"</string>
     <string name="print_searching_for_printers" msgid="4680248496457576358">"Pretraživanje štampača"</string>
@@ -1985,12 +1989,14 @@
     <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="background_activity_summary_whitelisted" msgid="7375400051141016808">"Nije moguće optimizirati aplikaciju za korištenje baterije"</string>
+    <string name="background_activity_warning_dialog_title" msgid="2216249969149568871">"Ograničiti aktivnost u pozadini?"</string>
+    <string name="background_activity_warning_dialog_text" msgid="7049624449246121981">"Ako aplikaciji ograničite aktivnost u pozadini, može raditi nepravilno"</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_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="power_usage_list_summary" msgid="6393929085382334341">"Korištenje aplikacije od potpunog punjenja (<xliff:g id="RELATIVE_TIME">^1</xliff:g>)"</string>
+    <string name="power_usage_list_summary_device" msgid="4461926045610455423">"Korištenje uređaja od potpunog punjenja (<xliff:g id="RELATIVE_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>
@@ -2004,8 +2010,7 @@
     <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) -->
-    <skip />
+    <string name="battery_stats_phone_signal_label" msgid="4137799310329041341">"Signal mobilne mreže"</string>
     <!-- no translation found for battery_stats_last_duration (1535831453827905957) -->
     <skip />
     <string name="awake" msgid="387122265874485088">"Vrijeme aktivnosti uređaja"</string>
@@ -2112,7 +2117,7 @@
     <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="67169726550144016">"Podaci o korištenju baterije su okvirni i mogu se promijeniti u zavisnosti od upotrebe"</string>
+    <string name="battery_footer_summary" msgid="67169726550144016">"Podaci o korištenju baterije su približni i mogu se promijeniti u zavisnosti od upotrebe"</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>
@@ -2167,7 +2172,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">"Prikaz sistemskih procesa"</string>
+    <string name="menu_show_system" msgid="8864603400415567635">"Prikaži sistemske procese"</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>
@@ -2225,7 +2230,7 @@
     <string name="trusted_credentials" msgid="4266945289534242402">"Pouzdani akreditivi"</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="user_credentials_summary" msgid="7271228342106080167">"Prikaz i izmjena pohranjenih 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>
@@ -2237,16 +2242,16 @@
     <string name="credentials_unlock_hint" msgid="2301301378040499348">"Unesite lozinku za pohranu akreditiva."</string>
     <string name="credentials_old_password" msgid="7553393815538684028">"Trenutna lozinka:"</string>
     <string name="credentials_reset_hint" msgid="6297256880896133631">"Ukloni sav sadržaj?"</string>
-    <string name="credentials_password_too_short" msgid="7502749986405522663">"Lozinka mora imati najmanje 8 znakova."</string>
     <string name="credentials_wrong_password" msgid="2541932597104054807">"Netačna lozinka."</string>
     <string name="credentials_reset_warning" msgid="5320653011511797600">"Netačna lozinka. Imate još jednu priliku za unošenje prije nego što se izbriše pohrana akreditiva."</string>
     <string name="credentials_reset_warning_plural" msgid="6514085665301095279">"Netačna lozinka. Imate još <xliff:g id="NUMBER">%1$d</xliff:g> pokušaja prije nego što se izbriše pohrana akreditiva."</string>
     <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 možete koristiti pohranu akreditiva."</string>
+    <string name="credentials_configure_lock_screen_hint" msgid="8058230497337529036">"Prije nego što mognete koristiti pohranu akreditiva, uređaj mora imati sigurno zaključavanje ekrana"</string>
+    <string name="credentials_configure_lock_screen_button" msgid="253239765216055321">"POSTAVI ZAKLJUČAVANJE"</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_title" msgid="1055954530111587114">"Ton za hitne pozive"</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">"Sigurnosno kopiranje"</string>
     <string name="backup_section_title" msgid="7952232291452882740">"Sigurnosna kopija i vraćanje"</string>
@@ -2291,7 +2296,7 @@
     <string name="wifi_setup_title_editing_network" msgid="6020614644556717979">"Povežite se na Wi-Fi mrežu <xliff:g id="NETWORK_NAME">%s</xliff:g>"</string>
     <string name="wifi_setup_title_connecting_network" msgid="5572226790101017822">"Povezivanje na Wi-Fi mrežu <xliff:g id="NETWORK_NAME">%s</xliff:g>..."</string>
     <string name="wifi_setup_title_connected_network" msgid="1608788657122010919">"Povezani ste na Wi-Fi mrežu <xliff:g id="NETWORK_NAME">%s</xliff:g>"</string>
-    <string name="wifi_setup_title_add_network" msgid="6932651000151032301">"Dodaj mrežu"</string>
+    <string name="wifi_setup_title_add_network" msgid="6932651000151032301">"Dodavanje mreže"</string>
     <string name="wifi_setup_not_connected" msgid="6997432604664057052">"Nije povezan"</string>
     <string name="wifi_setup_add_network" msgid="5939624680150051807">"Dodaj mrežu"</string>
     <string name="wifi_setup_refresh_list" msgid="3411615711486911064">"Osvježi spisak"</string>
@@ -2364,8 +2369,6 @@
     <skip />
     <string name="cant_sync_dialog_title" msgid="2777238588398046285">"Nije moguće ručno sinhronizovati"</string>
     <string name="cant_sync_dialog_message" msgid="1938380442159016449">"Sinhroniziranje za ovu stavku trenutno nije moguće. Da biste promijenili ovu postavku, privremeno uključite podatke u pozadini i automatsko sinhroniziranje."</string>
-    <string name="wimax_settings" msgid="2655139497028469039">"4G"</string>
-    <string name="status_wimax_mac_address" msgid="8390791848661413416">"4G MAC adresa"</string>
     <string name="enter_password" msgid="8035706727471334122">"Da biste pokrenuli Android, unesite lozinku"</string>
     <string name="enter_pin" msgid="5305333588093263790">"Da biste pokrenuli Android, unesite PIN"</string>
     <string name="enter_pattern" msgid="4187435713036808566">"Da biste pokrenuli Android, nacrtajte svoj obrazac"</string>
@@ -2379,6 +2382,7 @@
     <string name="misc_files_selected_count" msgid="4647048020823912088">"odabrano <xliff:g id="NUMBER">%1$d</xliff:g> od <xliff:g id="TOTAL">%2$d</xliff:g>"</string>
     <string name="misc_files_selected_count_bytes" msgid="2876232009069114352">"<xliff:g id="NUMBER">%1$s</xliff:g> od <xliff:g id="TOTAL">%2$s</xliff:g>"</string>
     <string name="select_all" msgid="1562774643280376715">"Označi sve"</string>
+    <string name="data_plan_usage_manage_plans_button_text" msgid="8997761990902708162">"Upravljaj planovima"</string>
     <string name="data_usage_summary_title" msgid="3804110657238092929">"Prijenos podataka"</string>
     <string name="data_usage_app_summary_title" msgid="4147258989837459172">"Prijenos podat. u aplik."</string>
     <string name="data_usage_accounting" msgid="7170028915873577387">"Obračun podataka operatera može se razlikovati od obračuna vašeg uređaja."</string>
@@ -2411,22 +2415,18 @@
     <string name="data_usage_label_background" msgid="3225844085975764519">"Pozadina"</string>
     <string name="data_usage_app_restricted" msgid="3568465218866589705">"ograničeno"</string>
     <string name="data_usage_disable_mobile" msgid="8656552431969276305">"Želite li isključiti prijenos mobilnih podataka?"</string>
-    <!-- no translation found for data_usage_disable_mobile_limit (4644364396844393848) -->
-    <skip />
+    <string name="data_usage_disable_mobile_limit" msgid="4644364396844393848">"Ograničenje za mobilne podatke"</string>
     <string name="data_usage_disable_4g_limit" msgid="6233554774946681175">"Postavi ograničenje za 4G podatke"</string>
     <string name="data_usage_disable_3g_limit" msgid="2558557840444266906">"Ograničenje 2G-3G podataka"</string>
     <string name="data_usage_disable_wifi_limit" msgid="1394901415264660888">"Ograniči Wi-Fi podatke"</string>
     <string name="data_usage_tab_wifi" msgid="481146038146585749">"Wi‑Fi"</string>
     <string name="data_usage_tab_ethernet" msgid="7298064366282319911">"Ethernet"</string>
-    <!-- no translation found for data_usage_tab_mobile (454140350007299045) -->
-    <skip />
+    <string name="data_usage_tab_mobile" msgid="454140350007299045">"Mobilno"</string>
     <string name="data_usage_tab_4g" msgid="1301978716067512235">"4G"</string>
     <string name="data_usage_tab_3g" msgid="6092169523081538718">"2G-3G"</string>
-    <!-- no translation found for data_usage_list_mobile (5588685410495019866) -->
-    <skip />
+    <string name="data_usage_list_mobile" msgid="5588685410495019866">"Mobilni uređaj"</string>
     <string name="data_usage_list_none" msgid="3933892774251050735">"Nema"</string>
-    <!-- no translation found for data_usage_enable_mobile (986782622560157977) -->
-    <skip />
+    <string name="data_usage_enable_mobile" msgid="986782622560157977">"Mobilni podaci"</string>
     <string name="data_usage_enable_3g" msgid="6304006671869578254">"2G-3G podaci"</string>
     <string name="data_usage_enable_4g" msgid="3635854097335036738">"4G podaci"</string>
     <string name="data_usage_forground_label" msgid="7654319010655983591">"Prvi plan:"</string>
@@ -2434,17 +2434,15 @@
     <string name="data_usage_app_settings" msgid="2279171379771253165">"Aplikacijske postavke"</string>
     <string name="data_usage_app_restrict_background" msgid="7359227831562303223">"Pozadinski podaci"</string>
     <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_background_summary_disabled" msgid="7401927377070755054">"Za ograničenje poz. podat. za ovu apl. ograničite mob. podatke."</string>
     <string name="data_usage_app_restrict_dialog_title" msgid="1613108390242737923">"Ograničiti podatke u pozadini?"</string>
-    <!-- no translation found for data_usage_app_restrict_dialog (1466689968707308512) -->
-    <skip />
+    <string name="data_usage_app_restrict_dialog" msgid="1466689968707308512">"Zbog te značajke aplikacija koja ovisi o pozadinskim podacima može prestati raditi kada su dostupne samo mobilne mreže.\n\nU postavkama možete pronaći prikladnije kontrole prijenosa podataka."</string>
     <string name="data_usage_restrict_denied_dialog" msgid="55012417305745608">"Ograničavanje prijenosa pozadinskih podataka moguće je samo ako ste postavili ograničenje za prijenos mobilnih podataka."</string>
     <string name="data_usage_auto_sync_on_dialog_title" msgid="2438617846762244389">"Uklj. autom. sinhron. podataka?"</string>
-    <string name="data_usage_auto_sync_on_dialog" product="tablet" msgid="8581983093524041669">"Sve promjene koje napravite na računima na webu automatski se kopiraju na tablet.\n\nNeki računi također mogu na web automatski kopirati promjene napravljene na tabletu. Google račun funkcionira na ovaj način."</string>
-    <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_on_dialog" product="tablet" msgid="8581983093524041669">"Promjene računa koje unesete na webu automatski će se kopirati na tablet.\n\nNeki računi također mogu automatski kopirati promjene s tableta na web. Google račun funkcionira na ovaj način."</string>
+    <string name="data_usage_auto_sync_on_dialog" product="default" msgid="8651376294887142858">"Promjene računa koje unesete na webu automatski će se kopirati na telefon.\n\nNeki računi također mogu automatski kopirati promjene s telefona na web. Google račun funkcionira 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_auto_sync_off_dialog" msgid="4025938250775413864">"Ovim će se uštedjeti na prijenosu podataka 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">"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>
@@ -2466,11 +2464,13 @@
     <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">"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 />
-    <string name="data_usage_metered_wifi" msgid="1761738002328299714">"Mjerene Wi-Fi mreže"</string>
-    <string name="data_usage_metered_wifi_disabled" msgid="727808462375941567">"Da biste odabrali mjerene mreže, uključite Wi-Fi."</string>
+    <string name="data_usage_metered_body" msgid="7655851702771342507">"Mreže s naplatom tretiraju se kao mobilne mreže kada je ograničeno korištenje podataka u pozadini. Aplikacije mogu dati upozorenje prije korištenja takvih mreža za velika preuzimanja."</string>
+    <string name="data_usage_metered_mobile" msgid="5423305619126978393">"Mobilne mreže"</string>
+    <string name="data_usage_metered_wifi" msgid="1761738002328299714">"Wi-Fi mreže s naplatom"</string>
+    <string name="data_usage_metered_wifi_disabled" msgid="727808462375941567">"Da odaberete mreže s naplatom, uključite Wi-Fi."</string>
+    <string name="data_usage_metered_auto" msgid="1262028400911918865">"Automatski"</string>
+    <string name="data_usage_metered_yes" msgid="9217539611385225894">"S naplatom"</string>
+    <string name="data_usage_metered_no" msgid="4025232961929071789">"Bez naplate"</string>
     <string name="data_usage_disclaimer" msgid="6887858149980673444">"Obračun podataka operatera može se razlikovati od obračuna vašeg uređaja."</string>
     <string name="cryptkeeper_emergency_call" msgid="198578731586097145">"Poziv za hitne slučajeve"</string>
     <string name="cryptkeeper_return_to_call" msgid="5613717339452772491">"Vrati se na poziv"</string>
@@ -2562,9 +2562,6 @@
     <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>
-    <string name="selinux_status_permissive" msgid="6004965534713398778">"Popustljiv"</string>
-    <string name="selinux_status_enforcing" msgid="2252703756208463329">"Izvršavanje"</string>
     <string name="ssl_ca_cert_warning" msgid="2045866713601984673">"Mreža može biti nadzirana"</string>
     <string name="done_button" msgid="1991471253042622230">"Gotovo"</string>
     <plurals name="ssl_ca_cert_dialog_title" formatted="false" msgid="7145092748045794650">
@@ -2582,7 +2579,7 @@
       <item quantity="few"> Domene <xliff:g id="MANAGING_DOMAIN_1">%s</xliff:g> su instalirale certifikate ovlaštenja za vaš radni profil, koji im mogu omogućiti da prati radne aktivnosti mreže, uključujući e-poštu, aplikacije i sigurne web lokacije.\n\nZa više informacija o ovim certifikatima, obratite se administratoru.</item>
       <item quantity="other"> Domena <xliff:g id="MANAGING_DOMAIN_1">%s</xliff:g> je instaliralo certifikate ovlaštenja za vaš radni profil, koji im mogu omogućiti da prati radne aktivnosti mreže, uključujući e-poštu, aplikacije i sigurne web lokacije.\n\nZa više informacija o ovim certifikatima, obratite se administratoru.</item>
     </plurals>
-    <string name="ssl_ca_cert_warning_message" msgid="8216218659139190498">"Treća strana je u stanju da prati vaše mrežne aktivnosti, uključujući poruke e-pošte, aplikacije i sigurne web lokacije. \n\nPouzdani akreditiv instaliran na vašem uređaju to omogućava."</string>
+    <string name="ssl_ca_cert_warning_message" msgid="8216218659139190498">"Treća strana je u stanju da prati vaše mrežne aktivnosti, uključujući e-poruke, aplikacije i sigurne web lokacije. \n\nPouzdani akreditiv instaliran na vašem uređaju to omogućava."</string>
     <plurals name="ssl_ca_cert_settings_button" formatted="false" msgid="2426799352517325228">
       <item quantity="one">Provjerite certifikate</item>
       <item quantity="few">Provjerite certifikate</item>
@@ -2610,7 +2607,7 @@
     <string name="user_add_user_title" msgid="2108112641783146007">"Dodati novog korisnika?"</string>
     <string name="user_add_user_message_long" msgid="8562152293752222985">"Za dijeljenje ovog uređaja s drugima možete napraviti dodatne korisnike. Svaki korisnik ima svoj prostor, koji može prilagoditi aplikacijama, pozadinskom slikom, i tako dalje. Korisnici također mogu prilagoditi postavke uređaja kao što su Wi-Fi koje utiču na sve ostale korisnike. \n\n Kada dodate novog korisnika, ta osoba treba uspostaviti svoj prostor. \n\n Svaki korisnik može ažurirati aplikacije za sve ostale korisnike."</string>
     <string name="user_add_user_message_short" msgid="1511354412249044381">"Kada dodate novog korisnika, ta osoba treba uspostaviti svoj prostor. \n\n Svaki korisnik može ažurirati aplikacije za sve ostale korisnike."</string>
-    <string name="user_setup_dialog_title" msgid="1765794166801864563">"Postaviti korisnika odmah?"</string>
+    <string name="user_setup_dialog_title" msgid="1765794166801864563">"Postaviti korisnika sada?"</string>
     <string name="user_setup_dialog_message" msgid="1004068621380867148">"Provjerite može li osoba uzeti uređaj i podesiti svoj prostor"</string>
     <string name="user_setup_profile_dialog_message" msgid="3896568553327558731">"Podesiti profil odmah?"</string>
     <string name="user_setup_button_setup_now" msgid="3391388430158437629">"Podesiti sada"</string>
@@ -2677,7 +2674,7 @@
     <string name="restriction_menu_change_pin" msgid="740081584044302775">"Promijeni PIN"</string>
     <string name="app_notifications_switch_label" msgid="9124072219553687583">"Prikaži obavještenja"</string>
     <string name="help_label" msgid="6886837949306318591">"Pomoć i pov. inform."</string>
-    <string name="support_summary" msgid="2705726826263742491">"Članci za pomoć, telefon i chat, prvi koraci"</string>
+    <string name="support_summary" msgid="2705726826263742491">"Članci za pomoć, telefon i chat, početak"</string>
     <string name="user_account_title" msgid="1127193807312271167">"Račun za sadržaj"</string>
     <string name="user_picture_title" msgid="7297782792000291692">"ID fotografije"</string>
     <string name="extreme_threats_title" msgid="6549541803542968699">"Ekstremne prijetnje"</string>
@@ -2692,7 +2689,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="4124461751977706019">"Upozorenja na hitne slučajeve"</string>
+    <string name="cell_broadcast_settings" msgid="4124461751977706019">"Poruke upozorenja"</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>
@@ -2701,7 +2698,7 @@
     <string name="preferred_network_type_summary" msgid="6564884693884755019">"LTE (preporučeno)"</string>
     <string name="work_sim_title" msgid="4843322164662606891">"SIM za Work"</string>
     <string name="user_restrictions_title" msgid="5794473784343434273">"Aplikacija i pristup sadržaju"</string>
-    <string name="user_rename" msgid="8523499513614655279">"PREIMENUJ"</string>
+    <string name="user_rename" msgid="8523499513614655279">"PROMIJENI NAZIV"</string>
     <string name="app_restrictions_custom_label" msgid="6160672982086584261">"Postavi ograničenja za aplikacije"</string>
     <string name="user_restrictions_controlled_by" msgid="3164078767438313899">"Kontroliše <xliff:g id="APP">%1$s</xliff:g>"</string>
     <string name="app_sees_restricted_accounts" msgid="7503264525057246240">"Ova aplikacija može pristupiti vašim računima"</string>
@@ -2767,6 +2764,7 @@
       <item quantity="few">Prikaži %d skrivene stavke</item>
       <item quantity="other">Prikaži %d skrivenih stavki</item>
     </plurals>
+    <string name="dashboard_suggestion_condition_footer_content_description" msgid="2898588191174845961">"Suzite"</string>
     <string name="network_dashboard_title" msgid="4771589228992391573">"Mreža i internet"</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>
@@ -2783,7 +2781,7 @@
     <string name="search_menu" msgid="6283419262313758339">"Pretraži postavke"</string>
     <string name="query_hint_text" msgid="3350700807437473939">"Pretraži postavke"</string>
     <string name="keywords_wifi" msgid="1395786161993828719">"wifi, wi-fi, mrežne veze"</string>
-    <string name="keywords_more_default_sms_app" msgid="2265154063220360784">"tekstualna poruka, slanje tekstualnih poruka, poruke, slanje poruka"</string>
+    <string name="keywords_more_default_sms_app" msgid="2265154063220360784">"SMS, slanje SMS-ova, poruke, slanje poruka"</string>
     <string name="keywords_more_mobile_networks" msgid="8995946622054642367">"mobilni, mobilni operater, bežični, podaci, 4g, 3g, 2g, lte"</string>
     <string name="keywords_wifi_calling" msgid="1784064367330122679">"wifi, wi-fi, pozovi, pozivanje"</string>
     <string name="keywords_home" msgid="3626170808219458848">"pokretač"</string>
@@ -2870,12 +2868,18 @@
       <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_settings_title" msgid="1066226840983908121">"Ne ometaj"</string>
+    <string name="zen_mode_behavior_settings_title" msgid="1463303933529313969">"Ponašanje"</string>
+    <string name="zen_mode_behavior_allow_title" msgid="3845615648136218141">"Omogući zvuke i vibracije od"</string>
+    <string name="zen_mode_behavior_no_sound" msgid="1219626004723208056">"Bez zvuka"</string>
+    <string name="zen_mode_behavior_total_silence" msgid="6716603819806610626">"Bez zvuka (Potpuno utišano)"</string>
+    <string name="zen_mode_behavior_no_sound_except" msgid="4968477585788243114">"Bez zvuka osim <xliff:g id="CATEGORIES">%1$s</xliff:g>"</string>
+    <!-- no translation found for zen_mode_behavior_alarms_only (2423480992071472963) -->
+    <skip />
     <string name="zen_mode_automation_settings_title" msgid="4228995740594063774">"Automatska pravila"</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_important_interruptions" msgid="3903928008177972500">"Samo prioritetno"</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>
@@ -2913,19 +2917,21 @@
     <string name="notifications_title" msgid="8086372779371204971">"Obavještenja"</string>
     <string name="app_notifications_title" msgid="5810577805218003760">"Obavještenja o aplikaciji"</string>
     <string name="notification_channel_title" msgid="2260666541030178452">"Kategorija obavještenja"</string>
+    <string name="notification_group_title" msgid="7180506440133859601">"Grupa kategorija obavještenja"</string>
     <string name="notification_importance_title" msgid="848692592679312666">"Značaj"</string>
-    <string name="notification_importance_unspecified" msgid="2196023702875112081">"Neka aplikacija odluči"</string>
+    <string name="notification_importance_unspecified" msgid="6622173510486113958">"Dozvoli zvuk"</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="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="notification_importance_high_silent" msgid="2667033773703765252">"Prikaži na ekranu"</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_interruption" msgid="7136150018111848721">"Dozvoli ometanja"</string>
-    <string name="allow_interruption_summary" msgid="7870159391333957050">"Dopusti aplikaciji da se oglasi, vibrira i/ili prikaže obavještenja na ekranu"</string>
+    <string name="allow_interruption_summary" msgid="7870159391333957050">"Dozvolite aplikaciji da aktivira zvuk, vibrira i/ili prikaže obavještenja na ekranu"</string>
     <string name="notification_channel_summary_min" msgid="5401718014765921892">"Manje važno"</string>
     <string name="notification_channel_summary_low" msgid="322317684244981244">"Srednje važno"</string>
     <string name="notification_channel_summary_default" msgid="1111749130423589931">"Veoma važno"</string>
@@ -2963,8 +2969,14 @@
     <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="channel_group_notifications_off_desc" msgid="1620950416247316370">"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>
+    <plurals name="notification_group_summary" formatted="false" msgid="3420621520561455358">
+      <item quantity="one"><xliff:g id="COUNT_1">%d</xliff:g> kategorija</item>
+      <item quantity="few"><xliff:g id="COUNT_1">%d</xliff:g> kategorije</item>
+      <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> kategorija</item>
+    </plurals>
     <string name="no_channels" msgid="3077375508177744586">"Ova aplikacija nije objavila nikakva obavještenja"</string>
     <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>
@@ -2986,7 +2998,7 @@
     <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="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_title" msgid="7867458246395884830">"Zamijeni način 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>
     <string name="app_notification_row_banned" msgid="5983655258784814773">"Blokirano"</string>
@@ -2998,14 +3010,14 @@
     <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_rename_button" msgid="4642843370946599164">"Promijeni naziv"</string>
     <string name="zen_mode_rule_name" msgid="5149068059383837549">"Ime pravila"</string>
     <string name="zen_mode_rule_name_hint" msgid="3781174510556433384">"Unesite ime pravila"</string>
     <string name="zen_mode_rule_name_warning" msgid="4517805381294494314">"Ime pravila se već koristi"</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">"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_choose_rule_type" msgid="5423746638871953459">"Odabir vrste pravila"</string>
+    <string name="zen_mode_delete_rule_confirmation" msgid="6237882294348570283">"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>
     <string name="zen_mode_rule_type_unknown" msgid="3049377282766700600">"Nepoznato"</string>
@@ -3043,12 +3055,14 @@
     <string name="zen_mode_from_starred" msgid="2678345811950997027">"Samo od kontakata označenih zvjezdicom"</string>
     <string name="zen_mode_from_none" msgid="8219706639954614136">"Ništa"</string>
     <string name="zen_mode_alarms" msgid="2165302777886552926">"Alarmi"</string>
+    <!-- no translation found for zen_mode_media_system_other (8900209390529859777) -->
+    <skip />
     <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">"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_repeat_callers_summary" msgid="239685342222975733">"Ukoliko ista osoba pozove ponovo 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>
@@ -3079,8 +3093,9 @@
     <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="suggestion_button_text" msgid="3275010948381252006">"Uredu"</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="restr_pin_enter_admin_pin" msgid="1085834515677448072">"Upišite 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>
@@ -3094,12 +3109,12 @@
     <string name="experimental_preference" msgid="7083015446690681376">"(Eksperimentalno)"</string>
     <string name="encryption_interstitial_header" msgid="468015813904595613">"Sigurno pokretanje"</string>
     <string name="encryption_continue_button" msgid="1121880322636992402">"Nastavi"</string>
-    <string name="encryption_interstitial_message_pin" msgid="2317181134653424679">"Uređaj možete dodatno zaštiti tako što ćete tražiti PIN kôd prije nego što se pokrene. Dok se uređaj ne pokrene, ne može primati pozive, poruke ili obavještenja, uključujući alarme. \n\nOvim se štite podaci na izgubljenim ili ukradenim uređajima. Želite li da se za pokretanje uređaja traži PIN kôd?"</string>
+    <string name="encryption_interstitial_message_pin" msgid="2317181134653424679">"Uređaj možete dodatno zaštiti tako što ćete tražiti PIN 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" 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_message_pin_for_fingerprint" msgid="4550632760119547492">"Osim korištenja otiska prsta za otključavanje, uređaj možete dodatno zaštiti zahtijevanjem unošenja 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 zahtijeva 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 zahtijevanjem unošenja 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 zahtijeva 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 zahtijevanjem unošenja lozinke 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 zahtijeva 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>
@@ -3127,8 +3142,7 @@
     <string name="change" msgid="6657848623929839991">"Izmijeni"</string>
     <string name="change_storage" msgid="600475265207060436">"Promijeni pohranu"</string>
     <string name="notifications_label" msgid="8543457911148619898">"Obavještenja o aplikaciji"</string>
-    <!-- no translation found for notifications_enabled (6983396130566021385) -->
-    <skip />
+    <string name="notifications_enabled" msgid="6983396130566021385">"Uključeno"</string>
     <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>
@@ -3170,7 +3184,7 @@
     <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 za aplikacije"</string>
-    <string name="app_permissions_summary" msgid="5163974162150406324">"Aplikacije koje koriste <xliff:g id="APPS">%1$s</xliff:g>"</string>
+    <string name="app_permissions_summary" msgid="5163974162150406324">"Aplikacije koje koriste aplikacije: <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>
@@ -3220,7 +3234,7 @@
     <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">"Obavještenja o upotrebi"</string>
-    <string name="show_all_apps" msgid="1512506948197818534">"Prikaži kompletno korištenje uređaja"</string>
+    <string name="show_all_apps" msgid="1512506948197818534">"Prikaži potpuno 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">"Visoka potrošnja"</string>
     <plurals name="power_high_usage_summary" formatted="false" msgid="467347882627862744">
@@ -3234,7 +3248,7 @@
       <item quantity="other">Aplikacije prazne bateriju</item>
     </plurals>
     <string name="high_power_filter_on" msgid="3222265297576680099">"Bez optimizacije"</string>
-    <string name="high_power_on" msgid="6216293998227583810">"Nije optimiziran"</string>
+    <string name="high_power_on" msgid="6216293998227583810">"Nije optimizirano"</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>
@@ -3253,23 +3267,24 @@
     <string name="sharing_remote_bugreport_dialog_message" msgid="5859287696666024466">"Ovaj izvještaj o grešci se dijeli sa vašim IT administratorom. Kontaktirajte ga da dobijete više informacija."</string>
     <string name="share_remote_bugreport_action" msgid="532226159318779397">"Podijelite"</string>
     <string name="decline_remote_bugreport_action" msgid="518720235407565134">"Odbij"</string>
-    <string name="usb_use_charging_only" msgid="2180443097365214467">"Puni bateriju ovog uređaja"</string>
+    <string name="usb_use_charging_only" msgid="2180443097365214467">"Punjenje 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="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" msgid="7409600791007250137">"Prijenos fajlova"</string>
     <string name="usb_use_file_transfers_desc" msgid="4235764784331804488">"Prebacite fajlove na drugi uređaj"</string>
-    <string name="usb_use_photo_transfers" msgid="7794775645350330454">"Prenesi fotografije (PTP)"</string>
+    <string name="usb_use_photo_transfers" msgid="7794775645350330454">"Prijenos fotografija (PTP)"</string>
     <string name="usb_use_photo_transfers_desc" msgid="2963034811151325996">"Prebacuje slike ili datoteke ukoliko MTP nije podržan (PTP)"</string>
-    <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_use_MIDI" msgid="870922185938298263">"Korištenje uređaja u MIDI načinu"</string>
+    <string name="usb_use_MIDI_desc" msgid="8473936990076693175">"Koristite uređaj u MIDI načinu"</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 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="sms_mirroring_pref" msgid="6475043279147376031">"Preslikavanje SMS poruka"</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">"Korištenje teksta sa ekrana"</string>
@@ -3337,7 +3352,7 @@
     <string name="write_settings_title" msgid="4232152481902542284">"Mogu mijenjati postavke sistema"</string>
     <string name="write_system_settings" msgid="3482913590601096763">"Izmjeni postavke sistema"</string>
     <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="permit_write_settings" msgid="658555006453212691">"Dozvoli izmjenu 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>
@@ -3435,12 +3450,15 @@
     <string name="color_temperature" msgid="2070126836910615605">"Hladna temperatura boje"</string>
     <string name="color_temperature_desc" msgid="4793729830226404052">"Koristite hladnije boje prikaza"</string>
     <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="connectivity_monitor_switch" msgid="9059759348648583421">"Nadzor povezivanja"</string>
+    <string name="connectivity_monitor_switch_summary" msgid="2828658652378866401">"Nadzor povezivanja će prikupiti zapisnike kada otkrije problem sa povezivanjem i obavijestiti korisnika da prijavi grešku"</string>
+    <string name="connectivity_monitor_toast" msgid="5551859612881173028">"Da primijenite promjenu na nadzoru povezivanja, ponovo pokrenite uređaj"</string>
     <string name="camera_hal_hdrplus_switch" msgid="8377365197105267466">"Kamera HAL HDR+"</string>
     <string name="camera_hal_hdrplus_toast" msgid="2063703797270055299">"Da primijenite promjenu za Kamera HAL HDR+, ponovo pokrenite uređaj"</string>
+    <string name="camera_laser_sensor_switch" msgid="8913588990743234440">"Laserski senzor kamere"</string>
     <string name="ota_disable_automatic_update" msgid="2319639631655915050">"Automatsko ažuriranje sistema"</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">"Prijenos 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>
@@ -3460,11 +3478,11 @@
     </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">"Postavi upozorenje o podacima"</string>
+    <string name="set_data_warning" msgid="6115364758236594593">"Postavljanje upozorenja 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="set_data_limit" msgid="2901526323210516923">"Postavljanje ograničenja 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="2923744765873163859">"<xliff:g id="ID_1">%1$s</xliff:g> iskorišteno <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 korištenje"</string>
     <plurals name="data_saver_unrestricted_summary" formatted="false" msgid="2635267833484232703">
@@ -3488,13 +3506,13 @@
     <string name="suggestion_additional_fingerprints" msgid="2214281455363797037">"Dodajte još jedan otisak prsta"</string>
     <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_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">"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="choose_spell_checker" msgid="6596539862291699367">"Odabir provjere pravopisa"</string>
     <string name="spell_checker_not_selected" msgid="8871083796179200696">"Nije odabrano"</string>
     <string name="notification_log_no_title" msgid="5678029849672024215">"(ništa)"</string>
     <string name="notification_log_details_delimiter" msgid="3116559361552416747">": "</string>
@@ -3535,7 +3553,7 @@
     <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>
     <string name="reset_shortcut_manager_throttling_complete" msgid="1826770872063707900">"Ograničenje norme Upravitelja prečicama je poništeno"</string>
-    <string name="notification_suggestion_title" msgid="4506524937307816475">"Kontrola obavještenja zaključanog ekrana"</string>
+    <string name="notification_suggestion_title" msgid="387052719462473500">"Kontrolirajte informacije na zaključanom ekranu"</string>
     <string name="notification_suggestion_summary" msgid="8521159741445416875">"Pokaži ili sakrij sadržaj obavještenja"</string>
     <string name="page_tab_title_summary" msgid="4070309266374993258">"Sve"</string>
     <string name="page_tab_title_support" msgid="8483187649355540109">"Podrška i savjeti"</string>
@@ -3543,7 +3561,7 @@
     <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">"Pristup premijum SMS-ovima"</string>
-    <string name="bluetooth_disabled" msgid="2456198532288640046">"Nije vidljivo drugim uređajima"</string>
+    <string name="bluetooth_disabled" msgid="6244000672828617410">"Isključeno"</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>
@@ -3562,7 +3580,7 @@
     <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">"Pozovi"</string>
-    <string name="support_escalation_by_chat" msgid="977019859110763749">"Pokreni razgovor"</string>
+    <string name="support_escalation_by_chat" msgid="977019859110763749">"Pokreni chat"</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>
@@ -3623,14 +3641,14 @@
     <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="525662960806416373">"Da provjerite vrijeme, ikone obavještenja i druge informacije, dodirnite ekran dvaput."</string>
+    <string name="ambient_display_summary" msgid="525662960806416373">"Provjera vremena, ikona obavještenja i drugih informacija kad se dvaput dodirne ekran."</string>
     <string name="ambient_display_suggestion_summary" msgid="5987443721392571847">"Provjera obavještenja kada je ekran isključen"</string>
     <string name="ambient_display_pickup_title" product="default" msgid="818688002837687268">"Provjera telefona kad se podigne"</string>
     <string name="ambient_display_pickup_title" product="tablet" msgid="4455864282995698097">"Podignite za provjeru tableta"</string>
     <string name="ambient_display_pickup_title" product="device" msgid="5380534405773531175">"Podignite za provjeru uređaja"</string>
-    <string name="ambient_display_pickup_summary" product="default" msgid="4567020486787561873">"Da provjerite vrijeme, ikone obavještenja i druge informacije, podignite telefon."</string>
-    <string name="ambient_display_pickup_summary" product="tablet" msgid="5435283849947236648">"Da provjerite vrijeme, ikone obavještenja i druge informacije, podignite tablet."</string>
-    <string name="ambient_display_pickup_summary" product="device" msgid="8256669101643381568">"Da provjerite vrijeme, ikone obavještenja i druge informacije, podignite uređaj."</string>
+    <string name="ambient_display_pickup_summary" product="default" msgid="4567020486787561873">"Provjera vremena, ikona obavještenja i drugih informacija kad se telefon podigne."</string>
+    <string name="ambient_display_pickup_summary" product="tablet" msgid="5435283849947236648">"Provjera vremena, ikona obavještenja i drugih informacija kad se tablet podigne."</string>
+    <string name="ambient_display_pickup_summary" product="device" msgid="8256669101643381568">"Provjera vremena, ikona obavještenja i drugih informacija kad se uređaj podigne."</string>
     <string name="ambient_display_pickup_suggestion_summary" msgid="7014700589991761035">"Provjerite obavještenja dok je ekran isključen"</string>
     <string name="fingerprint_swipe_for_notifications_title" msgid="5816346492253270243">"Prevlačenje prstom za obavještenja"</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="default" msgid="1770661868393713922">"Provjera obavještenja prevlačenjem prstom prema dolje po senzoru za otisak prsta na poleđini telefona."</string>
@@ -3648,7 +3666,7 @@
     <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="instant_apps_settings" msgid="8827777916518348213">"Postavke Instant-aplikacija"</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>
@@ -3697,7 +3715,9 @@
     <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>
-    <string name="enterprise_privacy_ca_certs" msgid="5885892204903688909">"Pouzdani akreditivi"</string>
+    <string name="enterprise_privacy_ca_certs_device" msgid="2019652712782510262">"Pouzdani akreditivi"</string>
+    <string name="enterprise_privacy_ca_certs_personal" msgid="2279084820904076599">"Pouzdani akreditivi na vašem ličnom profilu"</string>
+    <string name="enterprise_privacy_ca_certs_work" msgid="6187377647815301809">"Pouzdani akreditivi na vašem radnom profilu"</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>
@@ -3765,6 +3785,8 @@
     <string name="carrier_provisioning" msgid="4398683675591893169">"Operater koji pruža informacije"</string>
     <string name="trigger_carrier_provisioning" msgid="3434865918009286187">"Aktiviranje dodjele resursa operatera"</string>
     <string name="new_device_suggestion_title" msgid="698847081680980774">"Šta je novo i uzbudljivo?"</string>
-    <string name="new_device_suggestion_summary" msgid="7172709269203435870">"Pogledajte 5 najboljih funkcija"</string>
+    <string name="new_device_suggestion_summary" product="default" msgid="206396571522515855">"Upoznajte se s novim telefonom"</string>
+    <string name="new_device_suggestion_summary" product="tablet" msgid="393751455688210956">"Upoznajte se s novim tabletom"</string>
+    <string name="new_device_suggestion_summary" product="device" msgid="2939870049868336652">"Upoznajte se s novim uređajem"</string>
     <string name="disabled_low_ram_device" msgid="3751578499721173344">"Ova funkcija nije dostupna na ovom uređaju"</string>
 </resources>
diff --git a/res/values-ca/arrays.xml b/res/values-ca/arrays.xml
index 984552b..bc9e015 100644
--- a/res/values-ca/arrays.xml
+++ b/res/values-ca/arrays.xml
@@ -100,8 +100,6 @@
     <!-- no translation found for wifi_security_no_eap:0 (2084555984818107151) -->
     <!-- no translation found for wifi_security_no_eap:1 (397579322683471524) -->
     <!-- no translation found for wifi_security_no_eap:2 (1968820975358150484) -->
-    <!-- no translation found for wifi_ap_security:0 (5251664683198623324) -->
-    <!-- no translation found for wifi_ap_security:1 (7989073072260294673) -->
   <string-array name="wifi_eap_method">
     <item msgid="1160193392455075561">"PEAP"</item>
     <item msgid="7981731051382306293">"TLS"</item>
@@ -151,7 +149,7 @@
   </string-array>
   <string-array name="usage_stats_display_order_types">
     <item msgid="2100172576767439288">"Temps d\'ús"</item>
-    <item msgid="4796160515314745154">"Darrera vegada que es va fer servir"</item>
+    <item msgid="4796160515314745154">"Darrer ús"</item>
     <item msgid="2502754479975776899">"Nom de l\'aplicació"</item>
   </string-array>
   <string-array name="wifi_eap_entries">
@@ -318,15 +316,15 @@
     <item msgid="2154671955760380322">"Notificació de la publicació"</item>
     <item msgid="4282477730595931828">"Ubicació"</item>
     <item msgid="4891423912898525905">"Trucada"</item>
-    <item msgid="2623604824935968113">"Llegeix l\'SMS/MMS"</item>
-    <item msgid="4420177125221176306">"Escriu un SMS/MMS"</item>
+    <item msgid="2623604824935968113">"Llegeix SMS/MMS"</item>
+    <item msgid="4420177125221176306">"Escriu SMS/MMS"</item>
     <item msgid="3986142739951490025">"Rep SMS/MMS"</item>
     <item msgid="3984213795861739778">"Rep SMS/MMS"</item>
     <item msgid="3656243523752472788">"Rep SMS/MMS"</item>
     <item msgid="8105802370238551510">"Rep SMS/MMS"</item>
     <item msgid="1407766984645388488">"Envia SMS/MMS"</item>
-    <item msgid="3527273606643794973">"Llegeix l\'SMS/MMS"</item>
-    <item msgid="4370895547001583812">"Escriu un SMS/MMS"</item>
+    <item msgid="3527273606643794973">"Llegeix SMS/MMS"</item>
+    <item msgid="4370895547001583812">"Escriu SMS/MMS"</item>
     <item msgid="4218544235221631789">"Modifica la configuració"</item>
     <item msgid="736541391767350377">"Dibuixa a sobre"</item>
     <item msgid="5530815681721654194">"Accedeix a les notificacions"</item>
diff --git a/res/values-ca/strings.xml b/res/values-ca/strings.xml
index 81225ef..b19deba 100644
--- a/res/values-ca/strings.xml
+++ b/res/values-ca/strings.xml
@@ -166,7 +166,7 @@
     <string name="bluetooth_map_acceptance_dialog_text" msgid="8712508202081143737">"%1$s vol accedir als teus missatges. Vols donar-li accés a %2$s?"</string>
     <string name="bluetooth_sap_request" msgid="2669762224045354417">"Sol·licitud d\'accés a la SIM"</string>
     <string name="bluetooth_sap_acceptance_dialog_text" msgid="4414253873553608690">"<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g> vol accedir a la targeta SIM. Si hi concedeixes accés, es desactivarà la connectivitat de dades al dispositiu mentre duri la connexió. Dona accés a <xliff:g id="DEVICE_NAME_1">%2$s?</xliff:g>"</string>
-    <string name="bluetooth_device_name_summary" msgid="4757990010751789977">"Visible com a <xliff:g id="DEVICE_NAME">^1</xliff:g> per a altres dispositius"</string>
+    <string name="bluetooth_device_name_summary" msgid="522235742194965734">"Visible com a <xliff:g id="DEVICE_NAME">^1</xliff:g> per a altres dispositius"</string>
     <string name="bluetooth_paired_device_title" msgid="8638994696317952019">"Els teus dispositius"</string>
     <string name="bluetooth_pairing_page_title" msgid="7712127387361962608">"Vincula un dispositiu nou"</string>
     <string name="date_and_time" msgid="9062980487860757694">"Data i hora"</string>
@@ -312,6 +312,8 @@
     <string name="zone_auto" msgid="334783869352026648">"Zona horària automàtica"</string>
     <string name="zone_auto_summaryOn" msgid="6142830927278458314">"Utilitza la zona horària proporcionada per la xarxa"</string>
     <string name="zone_auto_summaryOff" msgid="2597745783162041390">"Utilitza la zona horària proporcionada per la xarxa"</string>
+    <string name="date_time_24hour_auto" msgid="2117383168985653422">"Format de 24 hores automàtic"</string>
+    <string name="date_time_24hour_auto_summary" msgid="6351812925651480277">"Utilitza la configuració regional predeterminada"</string>
     <string name="date_time_24hour_title" msgid="3203537578602803850">"Format de 24 hores"</string>
     <string name="date_time_24hour" msgid="1193032284921000063">"Format de 24 hores"</string>
     <string name="date_time_set_time_title" msgid="6296795651349047016">"Hora"</string>
@@ -372,6 +374,9 @@
     <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="1961957425135180242">"Següent"</string>
+    <string name="setup_fingerprint_enroll_skip_title" msgid="362050541117362034">"Ometre l\'empremta digital?"</string>
+    <string name="setup_fingerprint_enroll_skip_after_adding_lock_text" msgid="958990414356204763">"Només calen un parell de minuts per configurar l\'empremta digital. Si omets aquest pas, pots afegir-la més endavant a Configuració."</string>
+    <string name="lock_screen_intro_skip_title" msgid="4988210105913705679">"Ometre bloqueig de pantalla?"</string>
     <string name="lock_screen_intro_skip_dialog_text_frp" product="tablet" msgid="1581834104051243425">"Les funcions de protecció del dispositiu no s\'activaran. Si perds la tauleta, te la roben o se\'n restableixen les dades de fàbrica, no podràs evitar que altres persones la utilitzin."</string>
     <string name="lock_screen_intro_skip_dialog_text_frp" product="device" msgid="4629503416877189572">"Les funcions de protecció del dispositiu no s\'activaran. Si perds el dispositiu, te\'l roben o se\'n restableixen les dades de fàbrica, no podràs evitar que altres persones l\'utilitzin."</string>
     <string name="lock_screen_intro_skip_dialog_text_frp" product="default" msgid="2423428240245737909">"Les funcions de protecció del dispositiu no s\'activaran. Si perds el telèfon, te\'l roben o se\'n restableixen les dades de fàbrica, no podràs evitar que altres persones l\'utilitzin."</string>
@@ -389,7 +394,7 @@
     <string name="security_settings_fingerprint_enroll_start_title" msgid="2068961812439460133">"Toca el sensor"</string>
     <string name="security_settings_fingerprint_enroll_start_message" msgid="3909929328942564524">"Col·loca el dit al sensor i aixeca\'l quan notis una vibració"</string>
     <string name="security_settings_fingerprint_enroll_repeat_title" msgid="2819679722403209778">"Aixeca\'l i torna a tocar el sensor"</string>
-    <string name="security_settings_fingerprint_enroll_repeat_message" msgid="6158989350522518586">"Ves aixecant el dit perquè es puguin afegir les diferents parts de l\'empremta digital"</string>
+    <string name="security_settings_fingerprint_enroll_repeat_message" msgid="6158989350522518586">"Continua aixecant el dit per afegir les diferents parts de l\'empremta digital"</string>
     <string name="security_settings_fingerprint_enroll_finish_title" msgid="7567276170287972230">"Empremta digital afegida"</string>
     <string name="security_settings_fingerprint_enroll_finish_message" msgid="4796715961273420536">"Quan vegis aquesta icona, podràs fer servir l\'empremta digital per identificar-te o aprovar compres."</string>
     <string name="security_settings_fingerprint_enroll_enrolling_skip" msgid="3710211704052369752">"Fes-ho més tard"</string>
@@ -399,10 +404,10 @@
     <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="2989019978041986175">"Toca el sensor situat a la part posterior amb el dit índex."</string>
-    <string name="security_settings_fingerprint_enroll_error_dialog_title" msgid="3618021988442639280">"No s\'ha completat la inscripció"</string>
+    <string name="security_settings_fingerprint_enroll_error_dialog_title" msgid="3618021988442639280">"No s\'ha completat el registre"</string>
     <string name="security_settings_fingerprint_enroll_error_timeout_dialog_message" msgid="2942551158278899627">"S\'ha esgotat el temps d\'espera per inscriure l\'empremta digital. Torna-ho a provar."</string>
-    <string name="security_settings_fingerprint_enroll_error_generic_dialog_message" msgid="3624760637222239293">"La inscripció de l\'empremta digital no ha funcionat. Torna-ho a provar o fes servir un altre dit."</string>
-    <string name="fingerprint_enroll_button_add" msgid="6317978977419045463">"Afegeix-ne un altre"</string>
+    <string name="security_settings_fingerprint_enroll_error_generic_dialog_message" msgid="3624760637222239293">"El registre de l\'empremta digital no ha funcionat. Torna-ho a provar o fes servir un altre dit."</string>
+    <string name="fingerprint_enroll_button_add" msgid="6317978977419045463">"Afegeix-ne una altra"</string>
     <string name="fingerprint_enroll_button_next" msgid="6247009337616342759">"Següent"</string>
     <string name="security_settings_fingerprint_enroll_disclaimer" msgid="2624905914239271751">"A més de fer servir l\'empremta digital per desbloquejar el telèfon, també la pots fer servir per autoritzar compres i permetre l\'accés a determinades aplicacions. "<annotation id="url">"Més informació"</annotation></string>
     <string name="security_settings_fingerprint_enroll_disclaimer_lockscreen_disabled" msgid="7846871823167357942">" L\'opció de bloqueig de pantalla està desactivada. Per obtenir més informació, contacta amb l\'administrador de l\'organització. "<annotation id="admin_details">"Més informació"</annotation>\n\n"Pots continuar utilitzant l\'empremta digital per autoritzar compres i accedir a l\'aplicació. "<annotation id="url">"Més informació"</annotation></string>
@@ -457,7 +462,7 @@
     <string name="setup_lock_settings_picker_title" product="tablet" msgid="90329443364067215">"Protegeix la tauleta"</string>
     <string name="setup_lock_settings_picker_title" product="device" msgid="2399952075134938929">"Protegeix el dispositiu"</string>
     <string name="setup_lock_settings_picker_title" product="default" msgid="1572244299605153324">"Protegeix el telèfon"</string>
-    <string name="setup_lock_settings_picker_fingerprint_message" msgid="5585650064305600578">"Configura un bloqueig de pantalla alternatiu per a més seguretat."</string>
+    <string name="lock_settings_picker_fingerprint_added_security_message" msgid="5768002109707648463">"Defineix un bloqueig de pantalla alternatiu per a més seguretat."</string>
     <string name="setup_lock_settings_picker_message" product="tablet" msgid="8919671129189936210">"Activa les funcions de protecció del dispositiu per impedir que altres persones utilitzin aquesta tauleta sense permís. Tria el bloqueig de pantalla que vulguis utilitzar."</string>
     <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>
@@ -499,29 +504,37 @@
     <string name="unlock_disable_frp_warning_title" msgid="264008934468492550">"Vols suprimir la protecció del dispositiu?"</string>
     <string name="unlock_disable_frp_warning_title_profile" msgid="5507136301904313583">"Vols suprimir la protecció del perfil?"</string>
     <string name="unlock_disable_frp_warning_content_pattern" msgid="8869767290771023461">"Les funcions de protecció del dispositiu no funcionaran sense el teu patró."</string>
-    <!-- no translation found for unlock_disable_frp_warning_content_pattern_fingerprint (2986105377420905314) -->
-    <skip />
+    <string name="unlock_disable_frp_warning_content_pattern_fingerprint" msgid="2986105377420905314">"Les funcions de protecció del dispositiu no funcionen sense patró.<xliff:g id="EMPTY_LINE">
+
+</xliff:g>Les empremtes digitals que hagis desat també se suprimiran d\'aquest dispositiu i no podràs fer-les servir per desbloquejar el telèfon, autoritzar compres ni iniciar la sessió a les aplicacions."</string>
     <string name="unlock_disable_frp_warning_content_pin" msgid="586996206210265131">"Les funcions de protecció del dispositiu no funcionaran sense el teu PIN."</string>
-    <!-- no translation found for unlock_disable_frp_warning_content_pin_fingerprint (3370462835533123695) -->
-    <skip />
+    <string name="unlock_disable_frp_warning_content_pin_fingerprint" msgid="3370462835533123695">"Les funcions de protecció del dispositiu no funcionen sense PIN.<xliff:g id="EMPTY_LINE">
+
+</xliff:g>Les empremtes digitals que hagis desat també se suprimiran d\'aquest dispositiu i no podràs fer-les servir per desbloquejar el telèfon, autoritzar compres ni iniciar la sessió a les aplicacions."</string>
     <string name="unlock_disable_frp_warning_content_password" msgid="5420612686852555537">"Les funcions de protecció del dispositiu no funcionaran sense la teva contrasenya."</string>
-    <!-- no translation found for unlock_disable_frp_warning_content_password_fingerprint (3595476296430536798) -->
-    <skip />
+    <string name="unlock_disable_frp_warning_content_password_fingerprint" msgid="3595476296430536798">"Les funcions de protecció del dispositiu no funcionen sense contrasenya.<xliff:g id="EMPTY_LINE">
+
+</xliff:g>Les empremtes digitals que hagis desat també se suprimiran d\'aquest dispositiu i no podràs fer-les servir per desbloquejar el telèfon, autoritzar compres ni iniciar la sessió a les aplicacions."</string>
     <string name="unlock_disable_frp_warning_content_unknown" msgid="1550718040483548220">"Les funcions de protecció del dispositiu no funcionaran sense el teu bloqueig de pantalla."</string>
-    <!-- no translation found for unlock_disable_frp_warning_content_unknown_fingerprint (3679351662094349506) -->
-    <skip />
+    <string name="unlock_disable_frp_warning_content_unknown_fingerprint" msgid="3679351662094349506">"Les funcions de protecció del dispositiu no funcionen sense bloqueig de pantalla.<xliff:g id="EMPTY_LINE">
+
+</xliff:g>Les empremtes digitals que hagis desat també se suprimiran del dispositiu i no podràs fer-les servir per desbloquejar el telèfon, autoritzar compres ni iniciar la sessió a les aplicacions."</string>
     <string name="unlock_disable_frp_warning_content_pattern_profile" msgid="8682200103576359918">"Les funcions de protecció del perfil no funcionen sense patró."</string>
-    <!-- no translation found for unlock_disable_frp_warning_content_pattern_fingerprint_profile (6718155854303231675) -->
-    <skip />
+    <string name="unlock_disable_frp_warning_content_pattern_fingerprint_profile" msgid="6718155854303231675">"Les funcions de protecció del perfil no funcionen sense patró.<xliff:g id="EMPTY_LINE">
+
+</xliff:g>Les empremtes digitals que hagis desat també se suprimiran d\'aquest perfil i no podràs fer-les servir per desbloquejar-lo, autoritzar compres ni iniciar la sessió a les aplicacions."</string>
     <string name="unlock_disable_frp_warning_content_pin_profile" msgid="7790688070593867767">"Les funcions de protecció del perfil no funcionen sense PIN."</string>
-    <!-- no translation found for unlock_disable_frp_warning_content_pin_fingerprint_profile (4209564603132870532) -->
-    <skip />
+    <string name="unlock_disable_frp_warning_content_pin_fingerprint_profile" msgid="4209564603132870532">"Les funcions de protecció del perfil no funcionen sense PIN.<xliff:g id="EMPTY_LINE">
+
+</xliff:g>Les empremtes digitals que hagis desat també se suprimiran d\'aquest perfil i no podràs fer-les servir per desbloquejar-lo, autoritzar compres ni iniciar la sessió a les aplicacions."</string>
     <string name="unlock_disable_frp_warning_content_password_profile" msgid="7569285520567674461">"Les funcions de protecció del perfil no funcionen sense contrasenya."</string>
-    <!-- no translation found for unlock_disable_frp_warning_content_password_fingerprint_profile (2994300676764706047) -->
-    <skip />
+    <string name="unlock_disable_frp_warning_content_password_fingerprint_profile" msgid="2994300676764706047">"Les funcions de protecció del perfil no funcionen sense contrasenya.<xliff:g id="EMPTY_LINE">
+
+</xliff:g>Les empremtes digitals que hagis desat també se suprimiran d\'aquest perfil i no podràs fer-les servir per desbloquejar-lo, autoritzar compres ni iniciar la sessió a les aplicacions."</string>
     <string name="unlock_disable_frp_warning_content_unknown_profile" msgid="6984215718701688202">"Les funcions de protecció del perfil no funcionen sense bloqueig de pantalla."</string>
-    <!-- no translation found for unlock_disable_frp_warning_content_unknown_fingerprint_profile (4994062501123299418) -->
-    <skip />
+    <string name="unlock_disable_frp_warning_content_unknown_fingerprint_profile" msgid="4994062501123299418">"Les funcions de protecció del perfil no funcionen sense bloqueig de pantalla.<xliff:g id="EMPTY_LINE">
+
+</xliff:g>Les empremtes digitals que hagis desat també se suprimiran d\'aquest perfil i no podràs fer-les servir per desbloquejar-lo, autoritzar compres ni iniciar la sessió a les aplicacions."</string>
     <string name="unlock_disable_frp_warning_ok" msgid="7075138677177748705">"Sí, suprimeix"</string>
     <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>
@@ -580,6 +593,7 @@
     <string name="lockpassword_pin_no_sequential_digits" msgid="680765285206990584">"No es permet cap seqüència de dígits ascendents, descendents ni repetits"</string>
     <string name="lockpassword_ok_label" msgid="313822574062553672">"D\'acord"</string>
     <string name="lockpassword_cancel_label" msgid="8818529276331121899">"Cancel·la"</string>
+    <string name="lockpassword_clear_label" msgid="5724429464960458155">"Esborra"</string>
     <string name="lockpattern_tutorial_cancel_label" msgid="6431583477570493261">"Cancel·la"</string>
     <string name="lockpattern_tutorial_continue_label" msgid="3559793618653400434">"Següent"</string>
     <string name="lock_setup" msgid="3355847066343753943">"S\'ha completat la configuració."</string>
@@ -590,7 +604,7 @@
       <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> aplicació activa</item>
     </plurals>
     <string name="manage_trust_agents" msgid="4629279457536987768">"Agents de confiança"</string>
-    <string name="disabled_because_no_backup_security" msgid="6877660253409580377">"Per utilitzar-ho, has de configurar un bloqueig de pantalla"</string>
+    <string name="disabled_because_no_backup_security" msgid="6877660253409580377">"Per utilitzar aquesta opció, has de configurar un bloqueig de pantalla"</string>
     <string name="manage_trust_agents_summary" msgid="1475819820389620546">"Cap"</string>
     <plurals name="manage_trust_agents_summary_on" formatted="false" msgid="3935182396726101824">
       <item quantity="other"><xliff:g id="COUNT">%d</xliff:g> agents de confiança actius</item>
@@ -773,6 +787,7 @@
     <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>
@@ -809,6 +824,8 @@
     <string name="wifi_wps_available_first_item" msgid="4422547079984583502">"WPS disponible"</string>
     <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_carrier_connect" msgid="8174696557882299911">"Xarxa Wi-Fi de l\'operador"</string>
+    <string name="wifi_carrier_content" msgid="4634077285415851933">"Connecta\'t mitjançant <xliff:g id="NAME">%1%s</xliff:g>"</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_confirm_allow" msgid="5355973075896817232">"Permet"</string>
@@ -826,6 +843,7 @@
     <string name="wifi_connect" msgid="1076622875777072845">"Connecta"</string>
     <string name="wifi_failed_connect_message" msgid="8491902558970292871">"No s\'ha pogut connectar a la xarxa"</string>
     <string name="wifi_forget" msgid="8168174695608386644">"Esborra"</string>
+    <string name="wifi_modify" msgid="6100248070440710782">"Modifica"</string>
     <string name="wifi_failed_forget_message" msgid="1348172929201654986">"No s\'ha pogut esborrar la xarxa"</string>
     <string name="wifi_save" msgid="3331121567988522826">"Desa"</string>
     <string name="wifi_failed_save_message" msgid="6650004874143815692">"No s\'ha pogut desar la xarxa"</string>
@@ -838,6 +856,7 @@
     <string name="wifi_advanced_titlebar" msgid="4485841401774142908">"Config. avançada de 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_title" msgid="3471132676909349382">"Informació de la xarxa"</string>
     <string name="wifi_details_subnet_mask" msgid="6720279144174924410">"Màscara de la subxarxa"</string>
     <string name="wifi_details_dns" msgid="8648826607751830768">"DNS"</string>
     <string name="wifi_details_ipv6_address_header" msgid="6734119149106422148">"Adreces IPv6"</string>
@@ -870,16 +889,15 @@
     <string name="wifi_p2p_cancel_connect_title" msgid="255267538099324413">"Vols cancel·lar la invitació?"</string>
     <string name="wifi_p2p_cancel_connect_message" msgid="7477756213423749402">"Vols cancel·lar la invitació per connectar amb <xliff:g id="PEER_NAME">%1$s</xliff:g>?"</string>
     <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_off_subtext" msgid="5466126533609394170">"No s\'està compartint Internet o contingut amb altres dispositius"</string>
+    <string name="wifi_hotspot_off_subtext" msgid="5466126533609394170">"No s\'està compartint la connexió a Internet ni contingut amb altres dispositius"</string>
     <string name="wifi_hotspot_tethering_on_subtext" product="tablet" msgid="5752490509369962007">"S\'està compartint la connexió a Internet de la tauleta mitjançant el punt d\'accés Wi-Fi"</string>
     <string name="wifi_hotspot_tethering_on_subtext" product="default" msgid="6461075246164300670">"S\'està compartint la connexió a Internet del telèfon mitjançant el punt d\'accés Wi-Fi"</string>
     <string name="wifi_hotspot_on_local_only_subtext" msgid="2068110388011294735">"L\'aplicació està compartint contingut. Per compartir la connexió a Internet, desactiva el punt d\'accés Wi-Fi i torna\'l a activar."</string>
-    <string name="wifi_hotspot_name_title" msgid="1341735529132128887">"Nom de la Wi-Fi"</string>
+    <string name="wifi_hotspot_name_title" msgid="8237000746618636778">"Nom del punt d\'accés Wi-Fi"</string>
     <string name="wifi_hotspot_name_summary_connecting" msgid="3378299995508671967">"S\'està activant <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>..."</string>
     <string name="wifi_hotspot_name_summary_connected" msgid="3888672084861445362">"Altres dispositius es poden connectar a <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>"</string>
-    <string name="wifi_hotspot_password_title" msgid="1955592302902091281">"Contrasenya de la Wi-Fi"</string>
+    <string name="wifi_hotspot_password_title" msgid="8676859981917573801">"Contrasenya del punt d\'accés Wi-Fi"</string>
     <string name="wifi_hotspot_ap_band_title" msgid="1165801173359290681">"Banda del punt d\'accés"</string>
     <string name="wifi_hotspot_footer_info_regular" msgid="1203489406068036455">"Utilitza el punt d\'accés Wi-Fi per crear una xarxa Wi-Fi per a altres dispositius. El punt d\'accés Wi-Fi proporciona Internet mitjançant la teva connexió de dades mòbils. És possible que s\'hi apliquin càrrecs addicionals per l\'ús de dades mòbils."</string>
     <string name="wifi_hotspot_footer_info_local_only" msgid="857988412470694109">"Les aplicacions poden crear un punt d\'accés Wi-Fi per compartir contingut amb els dispositius que es trobin a prop."</string>
@@ -890,7 +908,6 @@
     <string name="wifi_tether_configure_ap_text" msgid="7974681394041609308">"Configura el punt d\'accés Wi-Fi"</string>
     <string name="wifi_hotspot_configure_ap_text" msgid="5478614731464220432">"Configuració del punt d\'accés Wi-Fi"</string>
     <string name="wifi_hotspot_configure_ap_text_summary" msgid="5560680057727007011">"Punt d\'accés Wi-Fi PSK AndroidAP WPA2"</string>
-    <string name="wifi_tether_configure_subtext" msgid="2050196439900426456">"Punt d\'accés Wi-Fi <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">"Trucades per Wi-Fi"</string>
     <string name="wifi_calling_suggestion_title" msgid="9008010480466359578">"Activa Trucades per Wi-Fi"</string>
@@ -902,7 +919,7 @@
     <skip />
     <string name="wifi_calling_roaming_mode_dialog_title" msgid="7800926602662078576">"Preferència en itinerància"</string>
   <string-array name="wifi_calling_mode_choices">
-    <item msgid="2124257075906188844">"Preferència per la Wi-Fi"</item>
+    <item msgid="2124257075906188844">"Preferència per a la Wi-Fi"</item>
     <item msgid="1335127656328817518">"Preferència per a dades mòbils"</item>
     <item msgid="3132912693346866895">"Només Wi-Fi"</item>
   </string-array>
@@ -917,7 +934,7 @@
     <item msgid="3194458950573886239">"0"</item>
   </string-array>
   <string-array name="wifi_calling_mode_choices_without_wifi_only">
-    <item msgid="5782108782860004851">"Preferència per la Wi-Fi"</item>
+    <item msgid="5782108782860004851">"Preferència per a la Wi-Fi"</item>
     <item msgid="5074515506087318555">"Preferència per a dades mòbils"</item>
   </string-array>
   <string-array name="wifi_calling_mode_choices_v2_without_wifi_only">
@@ -931,7 +948,7 @@
     <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="emergency_address_summary" msgid="3266760199681945746">"Adreça que utilitzen els serveis d\'emergència com la teva ubicació si fas una trucada d\'emergència per Wi-Fi"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"Pantalla"</string>
     <string name="sound_settings" msgid="5534671337768745343">"So"</string>
     <string name="all_volume_title" msgid="4296957391257836961">"Volum"</string>
@@ -983,15 +1000,16 @@
     <string name="accessibility_work_account_title" msgid="1231830766637939527">"Compte professional: <xliff:g id="MANAGED_BY">%s</xliff:g>"</string>
     <string name="accessibility_personal_account_title" msgid="2169071663029067826">"Compte personal: <xliff:g id="MANAGED_BY">%s</xliff:g>"</string>
     <string name="search_settings" msgid="1910951467596035063">"Cerca"</string>
-    <string name="search_settings_summary" msgid="9205656546570654169">"Gestiona la configuració i l\'historial de cerca"</string>
+    <string name="search_settings_summary" msgid="9205656546570654169">"Gestiona la configuració i l\'historial de cerques"</string>
     <string name="search_settings_no_results" msgid="8799027492641230999">"No s\'ha trobat cap resultat"</string>
+    <string name="search_clear_history" msgid="4196658962573162457">"Esborra l\'historial"</string>
     <string name="display_settings" msgid="7965901687241669598">"Pantalla"</string>
     <string name="accelerometer_title" msgid="7854608399547349157">"Gira pantalla automàticament"</string>
     <string name="color_mode_title" msgid="3159275920408338215">"Colors vius"</string>
     <string name="accelerometer_summary_on" product="tablet" msgid="429982132339828942">"Canvia l\'orientació automàticament en girar la tauleta"</string>
-    <string name="accelerometer_summary_on" product="default" msgid="1133737282813048021">"Canvia d\'orientació automàticament en girar el telèfon"</string>
+    <string name="accelerometer_summary_on" product="default" msgid="1133737282813048021">"Canvia l\'orientació automàticament en girar el telèfon"</string>
     <string name="accelerometer_summary_off" product="tablet" msgid="4781734213242521682">"Canvia l\'orientació automàticament en girar la tauleta"</string>
-    <string name="accelerometer_summary_off" product="default" msgid="5485489363715740761">"Canvia d\'orientació automàticament en girar el telèfon"</string>
+    <string name="accelerometer_summary_off" product="default" msgid="5485489363715740761">"Canvia l\'orientació automàticament en girar el telèfon"</string>
     <string name="brightness" msgid="8480105032417444275">"Nivell de brillantor"</string>
     <string name="brightness_title" msgid="5746272622112982836">"Brillantor"</string>
     <string name="brightness_summary" msgid="838917350127550703">"Ajusta la brillantor de la pantalla"</string>
@@ -1031,7 +1049,7 @@
     <string name="night_display_summary_on_auto_mode_never" msgid="9117830821363119835">"No es desactivarà mai automàticament"</string>
     <string name="night_display_summary_on_auto_mode_custom" msgid="5510753572245577263">"Es desactivarà automàticament a les <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="night_display_summary_on_auto_mode_twilight" msgid="852270120144683507">"Es desactivarà automàticament quan surti el sol"</string>
-    <string name="screen_timeout" msgid="4351334843529712571">"Repòs"</string>
+    <string name="screen_timeout" msgid="4351334843529712571">"Repòs després de"</string>
     <string name="screen_timeout_title" msgid="5130038655092628247">"La pantalla s\'apaga"</string>
     <string name="screen_timeout_summary" msgid="327761329263064327">"<xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> d\'inactivitat"</string>
     <string name="wallpaper_settings_title" msgid="5449180116365824625">"Fons de pantalla"</string>
@@ -1044,7 +1062,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">"Acoblat a la base"</string>
+    <string name="screensaver_settings_summary_dock" msgid="2072657401664633283">"Connectat 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>
@@ -1055,15 +1073,13 @@
     <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="ambient_display_screen_title" msgid="4252755516328775766">"Pantalla ambient"</string>
-    <!-- no translation found for ambient_display_screen_summary_always_on (7337555569694794132) -->
-    <skip />
+    <string name="ambient_display_screen_summary_always_on" msgid="7337555569694794132">"Sempre activada / Consumeix més bateria"</string>
     <string name="ambient_display_screen_summary_notifications" msgid="1449570742600868654">"Notificacions noves"</string>
     <string name="ambient_display_category_triggers" msgid="4359289754456268573">"Quan es mostra"</string>
     <string name="doze_title" msgid="2375510714460456687">"Notificacions noves"</string>
     <string name="doze_summary" msgid="3846219936142814032">"La pantalla s\'activa quan arriben notificacions"</string>
     <string name="doze_always_on_title" msgid="1046222370442629646">"Sempre activat"</string>
-    <!-- no translation found for doze_always_on_summary (6978257596231155345) -->
-    <skip />
+    <string name="doze_always_on_summary" msgid="6978257596231155345">"Mostra l\'hora, les icones de notificació i altres dades. Consumeix més bateria."</string>
     <string name="title_font_size" msgid="4405544325522105222">"Mida de la lletra"</string>
     <string name="short_summary_font_size" msgid="6819778801232989076">"Amplia o redueix el text"</string>
     <string name="sim_lock_settings" msgid="3392331196873564292">"Config. de bloqueig de SIM"</string>
@@ -1072,9 +1088,9 @@
     <string name="sim_lock_settings_summary_on" msgid="39103355956342985">"Bloquejada"</string>
     <string name="sim_lock_settings_title" msgid="9018585580955414596">"Bloqueig de targeta SIM"</string>
     <string name="sim_pin_toggle" msgid="1742123478029451888">"Bloqueja la targeta SIM"</string>
-    <string name="sim_lock_on" product="tablet" msgid="5058355081270397764">"Necessites el PIN per utilitzar la tauleta"</string>
+    <string name="sim_lock_on" product="tablet" msgid="5058355081270397764">"Sol·licita el PIN per utilitzar la tauleta"</string>
     <string name="sim_lock_on" product="default" msgid="2503536505568814324">"Sol·licita el PIN per utilitzar el telèfon"</string>
-    <string name="sim_lock_off" product="tablet" msgid="2813800553917012356">"Exigeix el PIN per utilitzar la tauleta"</string>
+    <string name="sim_lock_off" product="tablet" msgid="2813800553917012356">"Sol·licita el PIN per utilitzar la tauleta"</string>
     <string name="sim_lock_off" product="default" msgid="258981978215428916">"Sol·licita el PIN per utilitzar el telèfon"</string>
     <string name="sim_pin_change" msgid="6311414184279932368">"Canvia el PIN de la SIM"</string>
     <string name="sim_enter_pin" msgid="6608715137008508432">"PIN de la SIM"</string>
@@ -1116,7 +1132,6 @@
     <string name="baseband_version" msgid="1848990160763524801">"Versió de banda base"</string>
     <string name="kernel_version" msgid="9192574954196167602">"Versió del kernel"</string>
     <string name="build_number" msgid="3075795840572241758">"Número de compilació"</string>
-    <string name="selinux_status" msgid="6212165375172061672">"Estat de SELinux"</string>
     <string name="device_info_not_available" msgid="8062521887156825182">"No disponible"</string>
     <string name="device_status_activity_title" msgid="1411201799384697904">"Estat"</string>
     <string name="device_status" msgid="607405385799807324">"Estat"</string>
@@ -1144,7 +1159,6 @@
     <string name="status_wifi_mac_address" msgid="2202206684020765378">"Adreça MAC de Wi-Fi"</string>
     <string name="status_bt_address" msgid="4195174192087439720">"Adreça de Bluetooth"</string>
     <string name="status_serial_number" msgid="2257111183374628137">"Número de sèrie"</string>
-    <string name="status_unavailable" msgid="7862009036663793314">"No disponible"</string>
     <string name="status_up_time" msgid="7294859476816760399">"Temps actiu"</string>
     <string name="status_awake_time" msgid="2393949909051183652">"Temps d\'activació"</string>
     <string name="internal_memory" msgid="9129595691484260784">"Emmagatzematge intern"</string>
@@ -1217,8 +1231,8 @@
     <string name="storage_external_title" msgid="3433462910096848696">"Emmagatzematge portàtil"</string>
     <string name="storage_volume_summary" msgid="7023441974367853372">"S\'han utilitzat <xliff:g id="USED">%1$s</xliff:g> d\'un total de <xliff:g id="TOTAL">%2$s</xliff:g>"</string>
     <string name="storage_size_large" msgid="5691585991420946254">"<xliff:g id="NUMBER">^1</xliff:g>"<small><small>" <xliff:g id="UNIT">^2</xliff:g>"</small></small>""</string>
-    <string name="storage_volume_used" msgid="1303803057698959872">"Utilitzat de <xliff:g id="TOTAL">%1$s</xliff:g>"</string>
-    <string name="storage_volume_used_total" msgid="6113121714019000244">"Total utilitzat de <xliff:g id="TOTAL">%1$s</xliff:g>"</string>
+    <string name="storage_volume_used" msgid="1303803057698959872">"Utilitzat de: <xliff:g id="TOTAL">%1$s</xliff:g>"</string>
+    <string name="storage_volume_used_total" msgid="6113121714019000244">"Total utilitzat de: <xliff:g id="TOTAL">%1$s</xliff:g>"</string>
     <string name="storage_mount_success" msgid="687641090137253647">"S\'ha activat <xliff:g id="NAME">%1$s</xliff:g>"</string>
     <string name="storage_mount_failure" msgid="1042621107954547316">"No s\'ha pogut activar <xliff:g id="NAME">%1$s</xliff:g>"</string>
     <string name="storage_unmount_success" msgid="5737203344673441677">"S\'ha expulsat <xliff:g id="NAME">%1$s</xliff:g> de manera segura"</string>
@@ -1231,7 +1245,7 @@
     <string name="storage_dialog_unsupported" msgid="4503128224360482228">"Aquest dispositiu no admet <xliff:g id="NAME_0">^1</xliff:g>. \n\nPer fer servir <xliff:g id="NAME_1">^1</xliff:g> amb aquest dispositiu, primer l\'has d\'activar."</string>
     <string name="storage_internal_format_details" msgid="4018647158382548820">"Un cop l\'hagis formatat, podràs fer servir <xliff:g id="NAME_0">^1</xliff:g> en altres dispositius. \n\nTotes les dades que hi hagi a <xliff:g id="NAME_1">^1</xliff:g> s\'esborraran. Et recomanem que en facis una còpia de seguretat primer.\n\n"<b>"Fer una còpia de seguretat de les fotos i d\'altres fitxers multimèdia"</b>\n"Desplaça els fitxers multimèdia a un emmagatzematge alternatiu del dispositiu o transfereix-los a un ordinador mitjançant un cable USB. \n\n"<b>"Fer una còpia de seguretat de les aplicacions"</b>" \nTotes les aplicacions que hi hagi a <xliff:g id="NAME_6">^1</xliff:g> es desinstal·laran i se n\'esborraran les dades. Per conservar aquestes aplicacions, desplaça-les a un emmagatzematge alternatiu del dispositiu."</string>
     <string name="storage_internal_unmount_details" msgid="3582802571684490057"><b>"Si expulses <xliff:g id="NAME_0">^1</xliff:g>, les aplicacions que hi hagi instal·lades deixaran de funcionar i els fitxers multimèdia que contingui deixaran d\'estar disponibles fins que no es torni a inserir."</b>" \n\n<xliff:g id="NAME_1">^1</xliff:g> està formatat per funcionar només en aquest dispositiu. No funcionarà en altres dispositius."</string>
-    <string name="storage_internal_forget_details" msgid="9028875424669047327">"Torna a inserir el dispositiu d\'emmagatzematge <xliff:g id="NAME">^1</xliff:g> per fer servir les aplicacions, les fotos o les dades que conté. \n\nTambé pots triar que s\'esborri el contingut emmagatzemat si el dispositiu no està disponible. \n\nSi tries aquesta darrera opció, es perdran de manera permanent totes les dades emmagatzemades al dispositiu. \n\nPodràs tornar a instal·lar les aplicacions més endavant, però no podràs recuperar les dades que tenies emmagatzemades al dispositiu."</string>
+    <string name="storage_internal_forget_details" msgid="9028875424669047327">"Torna a inserir el dispositiu d\'emmagatzematge <xliff:g id="NAME">^1</xliff:g> per fer servir les aplicacions, les fotos o les dades que conté. \n\nTambé pots triar que s\'esborri el contingut emmagatzemat si el dispositiu no està disponible. \n\nSi tries aquesta darrera opció, es perdran permanentment totes les dades emmagatzemades al dispositiu. \n\nPodràs tornar a instal·lar les aplicacions més endavant, però no podràs recuperar les dades que tenies emmagatzemades al dispositiu."</string>
     <string name="storage_internal_forget_confirm_title" msgid="1370847944388479245">"Vols oblidar <xliff:g id="NAME">^1</xliff:g>?"</string>
     <string name="storage_internal_forget_confirm" msgid="1148446041396902905">"Les aplicacions, les fotos i les dades que s\'hagin desat a <xliff:g id="NAME">^1</xliff:g> es perdran per sempre."</string>
     <string name="storage_detail_apps" msgid="6141154016753507490">"Aplicacions"</string>
@@ -1320,6 +1334,7 @@
     <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>
     <string name="reset_dashboard_title" msgid="6254873816990678620">"Restableix les opcions"</string>
+    <string name="reset_dashboard_summary" msgid="4851012632493522755">"Es poden restablir la xarxa, les aplicacions o el dispositiu"</string>
     <string name="reset_network_title" msgid="6166025966016873843">"Restableix la Wi-Fi, les dades mòbils i el Bluetooth"</string>
     <string name="reset_network_desc" msgid="5547979398298881406">"Es restabliran totes les opcions de configuració de la xarxa, inclosos:\n\n"<li>"la Wi‑Fi"</li>\n<li>"les dades mòbils"</li>\n<li>"el Bluetooth"</li></string>
     <string name="reset_network_button_text" msgid="2035676527471089853">"Restableix la configuració"</string>
@@ -1328,17 +1343,14 @@
     <string name="reset_network_confirm_title" msgid="1759888886976962773">"Restablir?"</string>
     <string name="network_reset_not_available" msgid="7188610385577164676">"El restabliment de xarxa no està disponible per a aquest usuari"</string>
     <string name="reset_network_complete_toast" msgid="787829973559541880">"S\'ha restablert la configuració de la xarxa"</string>
-    <string name="master_clear_title" msgid="6617679904229218425">"Esborra totes les dades (restabliment de les dades de fàbrica)"</string>
-    <plurals name="master_clear_with_account_summary" formatted="false" msgid="5911377203778818712">
-      <item quantity="other">Es restabliran <xliff:g id="ACCOUNT_COUNT">%1$d</xliff:g> comptes</item>
-      <item quantity="one">Es restablirà 1 compte</item>
-    </plurals>
-    <string name="master_clear_summary" msgid="6902443944660426951">"Es restabliran l\'emmagatzematge intern i totes les dades"</string>
+    <string name="master_clear_title" msgid="3531267871084279512">"Esborra totes les dades (restabliment de les dades de fàbrica)"</string>
     <string name="master_clear_desc" product="tablet" msgid="9146059417023157222">"Aquesta acció esborrarà totes les dades de l\'"<b>"emmagatzematge intern"</b>" de la tauleta, com ara:\n\n"<li>"El teu compte de Google"</li>\n<li>"Les dades i la configuració del sistema i de les aplicacions"</li>\n<li>"Les aplicacions baixades"</li></string>
     <string name="master_clear_desc" product="default" msgid="4800386183314202571">"Aquesta acció esborrarà totes les dades de l\'"<b>"emmagatzematge intern"</b>" del teu telèfon, també:\n\n"<li>"El teu compte de Google"</li>\n<li>"Les dades i la configuració del sistema i de les aplicacions"</li>\n<li>"Les aplicacions baixades"</li></string>
     <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"Actualment has iniciat la sessió als comptes següents:\n"</string>
     <string name="master_clear_other_users_present" product="default" msgid="5161423070702470742">\n\n"En aquest dispositiu hi ha altres usuaris.\n"</string>
     <string name="master_clear_desc_also_erases_external" msgid="1903185203791274237"><li>"Música"</li>\n<li>"Fotos"</li>\n<li>"Altres dades de l\'usuari"</li></string>
+    <string name="master_clear_desc_also_erases_esim" msgid="312352697653096008"><li>"Operadors de telefonia mòbil de la targeta eSIM"</li></string>
+    <string name="master_clear_desc_no_cancel_mobile_plan" msgid="5460926449093211144">\n\n"No es cancel·larà el teu pla de servei mòbil."</string>
     <string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="7744115866662613411">\n\n"Per esborrar també música, imatges i altres dades d\'usuari, cal esborrar l\'"<b>"emmagatzematge USB"</b>"."</string>
     <string name="master_clear_desc_erase_external_storage" product="default" msgid="4801026652617377093">\n\n"Si vols suprimir música, imatges i altres dades de l\'usuari, cal que esborris la "<b>"targeta SD"</b>"."</string>
     <string name="erase_external_storage" product="nosdcard" msgid="969364037450286809">"Esborra l\'emmagatzematge USB"</string>
@@ -1455,15 +1467,16 @@
     <string name="settings_safetylegal_activity_title" msgid="6901214628496951727">"Informació de seguretat"</string>
     <string name="settings_safetylegal_activity_unreachable" msgid="250674109915859456">"No tens cap connexió de dades. Per visualitzar aquesta informació ara, dirigeix-te a %s des d\'un equip connectat a Internet."</string>
     <string name="settings_safetylegal_activity_loading" msgid="8059022597639516348">"S\'està carregant…"</string>
-    <string name="lockpassword_choose_your_password_header" msgid="8624900666929394990">"Tria una contrasenya"</string>
-    <string name="lockpassword_choose_your_password_header_for_fingerprint" msgid="6624409510609085450">"Defineix una contrasenya"</string>
-    <string name="lockpassword_choose_your_pattern_header" msgid="6949761069941694050">"Tria el teu patró"</string>
-    <string name="lockpassword_choose_your_pattern_header_for_fingerprint" msgid="5901096361617543819">"Defineix un patró"</string>
-    <string name="lockpassword_choose_your_pin_header" msgid="7598849519816138302">"Selecciona un PIN"</string>
-    <string name="lockpassword_choose_your_pin_header_for_fingerprint" msgid="765344692615917183">"Defineix un PIN"</string>
-    <string name="lockpassword_confirm_your_password_header" msgid="6308478184889846633">"Confirma la teva contrasenya"</string>
+    <string name="lockpassword_choose_your_screen_lock_header" msgid="3872462096767152394">"Defineix un bloqueig de pantalla"</string>
+    <string name="lockpassword_choose_your_password_message" msgid="1197569283524841412">"Per motius de seguretat, cal que defineixis una contrasenya"</string>
+    <string name="lockpassword_choose_your_password_header_for_fingerprint" msgid="2541818487015343503">"Defineix una contrasenya"</string>
+    <string name="lockpassword_choose_your_pattern_header_for_fingerprint" msgid="7709785406243556723">"Defineix un patró"</string>
+    <string name="lockpassword_choose_your_pin_message" msgid="1875420718677275646">"Per motius de seguretat, cal que defineixis un PIN"</string>
+    <string name="lockpassword_choose_your_pin_header_for_fingerprint" msgid="1549639053195796674">"Defineix un PIN"</string>
+    <string name="lockpassword_choose_your_pattern_message" msgid="5986983400689720015">"Per motius de seguretat, cal que defineixis un patró"</string>
+    <string name="lockpassword_confirm_your_password_header" msgid="1266027268220850931">"Torna a introduir la contrasenya"</string>
     <string name="lockpassword_confirm_your_pattern_header" msgid="7543433733032330821">"Confirma el patró"</string>
-    <string name="lockpassword_confirm_your_pin_header" msgid="49038294648213197">"Confirma el teu PIN"</string>
+    <string name="lockpassword_confirm_your_pin_header" msgid="7744513791910572550">"Torna a introduir el PIN"</string>
     <string name="lockpassword_confirm_passwords_dont_match" msgid="5140892109439191415">"Les contrasenyes no coincideixen"</string>
     <string name="lockpassword_confirm_pins_dont_match" msgid="7226244811505606217">"Els codis PIN no coincideixen"</string>
     <string name="lockpassword_choose_lock_generic_header" msgid="3811438094903786145">"Mètode de desbloqueig"</string>
@@ -1476,18 +1489,18 @@
     <string name="lockpassword_confirm_your_pattern_generic_profile" msgid="4435638308193361861">"Utilitza el patró de la feina per continuar"</string>
     <string name="lockpassword_confirm_your_pin_generic_profile" msgid="3730141667547002246">"Introdueix el PIN de la feina per continuar"</string>
     <string name="lockpassword_confirm_your_password_generic_profile" msgid="4250642723467019894">"Introdueix la contrasenya de la feina per continuar"</string>
-    <!-- no translation found for lockpassword_strong_auth_required_device_pattern (530802132223800623) -->
-    <skip />
-    <!-- no translation found for lockpassword_strong_auth_required_device_pin (7829294830078036417) -->
-    <skip />
-    <!-- no translation found for lockpassword_strong_auth_required_device_password (3552644641574796973) -->
-    <skip />
-    <!-- no translation found for lockpassword_strong_auth_required_work_pattern (3003781907040522053) -->
-    <skip />
-    <!-- no translation found for lockpassword_strong_auth_required_work_pin (3367491332598821552) -->
-    <skip />
-    <!-- no translation found for lockpassword_strong_auth_required_work_password (8159775129968582940) -->
-    <skip />
+    <string name="lockpassword_strong_auth_required_device_pattern" msgid="530802132223800623">"Per a més seguretat, utilitza el patró del dispositiu"</string>
+    <string name="lockpassword_strong_auth_required_device_pin" msgid="7829294830078036417">"Per a més seguretat, introdueix el PIN del dispositiu"</string>
+    <string name="lockpassword_strong_auth_required_device_password" msgid="3552644641574796973">"Per a més seguretat, introdueix la contrasenya del dispositiu"</string>
+    <string name="lockpassword_strong_auth_required_work_pattern" msgid="3003781907040522053">"Per a més seguretat, utilitza el patró de la feina"</string>
+    <string name="lockpassword_strong_auth_required_work_pin" msgid="3367491332598821552">"Per a més seguretat, introdueix el PIN de la feina"</string>
+    <string name="lockpassword_strong_auth_required_work_password" msgid="8159775129968582940">"Per a més seguretat, introdueix la contrasenya de la feina"</string>
+    <string name="lockpassword_confirm_your_pattern_details_frp" msgid="6757336656791723193">"S\'ha restablert el telèfon a les dades de fàbrica. Per utilitzar-lo, dibuixa el patró antic."</string>
+    <string name="lockpassword_confirm_your_pin_details_frp" msgid="826520613445990470">"S\'ha restablert el telèfon a les dades de fàbrica. Per utilitzar-lo, escriu el PIN antic."</string>
+    <string name="lockpassword_confirm_your_password_details_frp" msgid="8944081074615739040">"S\'ha restablert el telèfon a les dades de fàbrica. Per utilitzar-lo, escriu la contrasenya antiga."</string>
+    <string name="lockpassword_confirm_your_pattern_header_frp" msgid="2898036091609128286">"Verifica el patró"</string>
+    <string name="lockpassword_confirm_your_pin_header_frp" msgid="4141601774778898803">"Verifica el PIN"</string>
+    <string name="lockpassword_confirm_your_password_header_frp" msgid="3762615419295360480">"Verifica la contrasenya"</string>
     <string name="lockpassword_invalid_pin" msgid="15588049067548470">"PIN incorrecte"</string>
     <string name="lockpassword_invalid_password" msgid="4038507398784975200">"Contrasenya incorrecta"</string>
     <string name="lockpattern_need_to_unlock_wrong" msgid="1745247595356012176">"Patró incorrecte"</string>
@@ -1537,7 +1550,6 @@
     <string name="install_applications_title" msgid="4987712352256508946">"Permet totes les fonts d\'apl."</string>
     <string name="recent_app_category_title" msgid="6673071268966003928">"Aplicacions obertes fa poc"</string>
     <string name="see_all_apps_title" msgid="1317153498074308438">"Mostra totes les aplicacions (<xliff:g id="COUNT">%1$d</xliff:g>)"</string>
-    <string name="recent_app_summary" msgid="3366446669844932300">"Fa <xliff:g id="TIME">^1</xliff:g>"</string>
     <string name="install_all_warning" product="tablet" msgid="8310489909586138165">"La tauleta i les dades personals són més vulnerables a atacs d\'aplicacions desconegudes. En instal·lar aplicacions d\'aquesta font, acceptes que ets responsable de qualsevol dany a la tauleta i qualsevol pèrdua de dades que es pugui produir per l\'ús d\'aquestes aplicacions."</string>
     <string name="install_all_warning" product="default" msgid="1952257127370115988">"El telèfon i les dades personals són més vulnerables a atacs d\'aplicacions desconegudes. En instal·lar aplicacions d\'aquesta font, acceptes que ets responsable de qualsevol dany al telèfon i qualsevol pèrdua de dades que es pugui produir per l\'ús d\'aquestes aplicacions."</string>
     <string name="advanced_settings" msgid="1777249286757067969">"Configuració avançada"</string>
@@ -1606,7 +1618,7 @@
     <string name="sd_card_storage" product="default" msgid="7623513618171928235">"Emmag. targeta SD"</string>
     <string name="recompute_size" msgid="7722567982831691718">"S\'està tornant a calcular la mida..."</string>
     <string name="clear_data_dlg_title" msgid="5605258400134511197">"Vols eliminar les dades de l\'aplicació?"</string>
-    <string name="clear_data_dlg_text" msgid="3951297329833822490">"S\'eliminaran totes les dades d\'aquesta aplicació de manera permanent. Això inclou tots els fitxers, la configuració, els comptes, les bases de dades, etc."</string>
+    <string name="clear_data_dlg_text" msgid="3951297329833822490">"S\'eliminaran totes les dades d\'aquesta aplicació permanentment. Això inclou tots els fitxers, la configuració, els comptes, les bases de dades, etc."</string>
     <string name="dlg_ok" msgid="2402639055725653590">"D\'acord"</string>
     <string name="dlg_cancel" msgid="1674753358972975911">"Cancel·la"</string>
     <string name="app_not_found_dlg_title" msgid="3127123411738434964"></string>
@@ -1686,7 +1698,7 @@
     <string name="running_processes_header_footer" msgid="723908176275428442">"RAM utilitzada per aplicacions"</string>
     <string name="running_processes_header_system_prefix" msgid="6104153299581682047">"Sistema"</string>
     <string name="running_processes_header_apps_prefix" msgid="5787594452716832727">"Aplicacions"</string>
-    <string name="running_processes_header_free_prefix" msgid="4620613031737078415">"Disponible"</string>
+    <string name="running_processes_header_free_prefix" msgid="4620613031737078415">"Lliure"</string>
     <string name="running_processes_header_used_prefix" msgid="5924288703085123978">"En ús"</string>
     <string name="running_processes_header_cached_prefix" msgid="7950853188089434987">"A la memòria cau"</string>
     <string name="running_processes_header_ram" msgid="996092388884426817">"<xliff:g id="RAM_0">%1$s</xliff:g> de RAM"</string>
@@ -1735,8 +1747,8 @@
     <string name="keyboard_assistance_category" msgid="5843634175231134014">"Assistència per al teclat"</string>
     <string name="physical_keyboard_title" msgid="8285149877925752042">"Teclat físic"</string>
     <string name="show_ime" msgid="2658582193437188227">"Mostra el teclat virtual"</string>
-    <string name="show_ime_summary" msgid="8164993045923240698">"El deixa a la pantalla mentre el teclat físic està actiu"</string>
-    <string name="keyboard_shortcuts_helper" msgid="4839453720463798145">"Auxiliar per a les tecles de drecera"</string>
+    <string name="show_ime_summary" msgid="8164993045923240698">"Mantén-lo a la pantalla mentre el teclat físic està actiu"</string>
+    <string name="keyboard_shortcuts_helper" msgid="4839453720463798145">"Ajuda per a les tecles de drecera"</string>
     <string name="keyboard_shortcuts_helper_summary" msgid="5871299901459743288">"Mostra les dreceres disponibles"</string>
     <string name="default_keyboard_layout" msgid="4172606673510531271">"Predeterminat"</string>
     <string name="pointer_speed" msgid="1221342330217861616">"Velocitat del punter"</string>
@@ -1794,14 +1806,14 @@
     <string name="testing_usage_stats" msgid="7823048598893937339">"Estadístiques d\'ús"</string>
     <string name="display_order_text" msgid="8592776965827565271">"Ordena per:"</string>
     <string name="app_name_label" msgid="5440362857006046193">"Aplicació"</string>
-    <string name="last_time_used_label" msgid="8459441968795479307">"Darrera vegada que es va fer servir"</string>
+    <string name="last_time_used_label" msgid="8459441968795479307">"Darrer ús"</string>
     <string name="usage_time_label" msgid="295954901452833058">"Temps d\'ús"</string>
     <string name="accessibility_settings" msgid="3975902491934816215">"Accessibilitat"</string>
     <string name="accessibility_settings_title" msgid="2130492524656204459">"Configuració d\'accessibilitat"</string>
     <string name="accessibility_settings_summary" msgid="981260486011624939">"Lectors de pantalla, pantalla, controls d\'interacció"</string>
     <string name="vision_settings_title" msgid="4204111425716868288">"Configuració de visió"</string>
     <string name="vision_settings_description" msgid="5679491180156408260">"Pots personalitzar el dispositiu perquè s\'adapti a les teves necessitats. Aquestes funcions d\'accessibilitat es poden canviar més endavant des de Configuració."</string>
-    <string name="vision_settings_suggestion_title" msgid="917294957154878441">"Augmenta la mida de la lletra"</string>
+    <string name="vision_settings_suggestion_title" msgid="8058794060304707004">"Canvia la mida de la lletra"</string>
     <string name="screen_reader_category_title" msgid="7739154903913400641">"Lectors de pantalla"</string>
     <string name="audio_and_captions_category_title" msgid="3420727114421447524">"Àudio i text en pantalla"</string>
     <string name="display_category_title" msgid="685461049938269166">"Pantalla"</string>
@@ -1838,10 +1850,9 @@
     <string name="accessibility_display_inversion_preference_subtitle" msgid="7052959202195368109">"Pot afectar el rendiment"</string>
     <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="preference_summary_default_combination" msgid="8532964268242666060">"<xliff:g id="STATE">%1$s</xliff:g> / <xliff:g id="DESCRIPTION">%2$s</xliff:g>"</string>
     <string name="accessibility_summary_state_enabled" msgid="8359913912320966304">"ACTIVAT"</string>
     <string name="accessibility_summary_state_disabled" msgid="2241315620132005595">"DESACTIVADA"</string>
-    <string name="enable_quick_setting" msgid="2366999897816894536">"Mostra a Configuració ràpida"</string>
+    <string name="enable_quick_setting" msgid="2366999897816894536">"Mostra a configuració ràpida"</string>
     <string name="daltonizer_type" msgid="1124178250809091080">"Mode de correcció"</string>
     <plurals name="accessibilty_autoclick_preference_subtitle_extremely_short_delay" formatted="false" msgid="7340347830562315800">
       <item quantity="other">Retard molt breu (<xliff:g id="CLICK_DELAY_LABEL_1">%1$d</xliff:g> ms)</item>
@@ -1957,12 +1968,14 @@
     <string name="background_activity_summary_on" msgid="649282072540085599">"L\'aplicació es pot executar en segon pla quan no s\'utilitza"</string>
     <string name="background_activity_summary_off" msgid="7666330699090632040">"L\'activitat en segon pla de l\'aplicació està limitada quan no s\'utilitza"</string>
     <string name="background_activity_summary_disabled" msgid="3710669050484599847">"L\'aplicació no es pot executar en segon pla"</string>
+    <string name="background_activity_summary_whitelisted" msgid="7375400051141016808">"No es pot optimitzar l\'ús de la bateria de l\'aplicació"</string>
+    <string name="background_activity_warning_dialog_title" msgid="2216249969149568871">"Vols limitar l\'activitat en segon pla?"</string>
+    <string name="background_activity_warning_dialog_text" msgid="7049624449246121981">"Si limites l\'activitat en segon pla d\'una aplicació, és possible que no funcioni correctament"</string>
     <string name="device_screen_usage" msgid="3386088035570409683">"Ús de la pantalla des de l\'última càrrega completa"</string>
     <string name="device_screen_consumption" msgid="4607589286438986687">"Consum de la pantalla"</string>
     <string name="device_cellular_network" msgid="4724773411762382950">"Cerca de xarxes mòbils"</string>
-    <string name="power_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>
+    <string name="power_usage_list_summary" msgid="6393929085382334341">"Ús d\'aplicacions des de l\'última càrrega completa (<xliff:g id="RELATIVE_TIME">^1</xliff:g>)"</string>
+    <string name="power_usage_list_summary_device" msgid="4461926045610455423">"Ús del dispositiu des de l\'última càrrega completa (<xliff:g id="RELATIVE_TIME">^1</xliff:g>)"</string>
     <string name="screen_usage_summary" msgid="6687403051423153550">"Temps que la pantalla ha estat activa des de l\'última càrrega completa"</string>
     <string name="device_usage_list_summary" msgid="5623036661468763251">"Ús del dispositiu des de l\'última càrrega completa"</string>
     <string name="battery_since_unplugged" msgid="338073389740738437">"Ús de la bateria des que s\'ha desconnectat"</string>
@@ -2116,7 +2129,7 @@
     <string name="process_stats_type_cached" msgid="6314925846944806511">"Memòria"</string>
     <string name="process_stats_os_label" msgid="4813434110442733392">"SO Android"</string>
     <string name="process_stats_os_native" msgid="5322428494231768472">"Nadiu"</string>
-    <string name="process_stats_os_kernel" msgid="1938523592369780924">"Nucli"</string>
+    <string name="process_stats_os_kernel" msgid="1938523592369780924">"Kernel"</string>
     <string name="process_stats_os_zram" msgid="677138324651671575">"Z-Ram"</string>
     <string name="process_stats_os_cache" msgid="6432533624875078233">"Memòries cau"</string>
     <string name="process_stats_ram_use" msgid="976912589127397307">"Ús de memòria RAM"</string>
@@ -2128,11 +2141,11 @@
     <string name="mem_details_title" msgid="6548392825497290498">"Detalls de la memòria"</string>
     <string name="mem_state_subtitle" msgid="2407238869781011933">"Estats de la memòria"</string>
     <string name="mem_use_subtitle" msgid="7319468770222422412">"Ús de la memòria"</string>
-    <string name="mem_use_kernel_type" msgid="8698327165935012484">"Nucli"</string>
+    <string name="mem_use_kernel_type" msgid="8698327165935012484">"Kernel"</string>
     <string name="mem_use_native_type" msgid="5976704902328347400">"Nadiu"</string>
     <string name="mem_use_kernel_cache_type" msgid="6411475064463957513">"Memòries cau del nucli"</string>
     <string name="mem_use_zram_type" msgid="9087217476795358232">"Espai compartit ZRam"</string>
-    <string name="mem_use_free_type" msgid="717708548454880840">"Disponible"</string>
+    <string name="mem_use_free_type" msgid="717708548454880840">"Lliure"</string>
     <string name="mem_use_total" msgid="6308786055749777934">"Total"</string>
     <string name="menu_duration_3h" msgid="4714866438374738385">"3 hores"</string>
     <string name="menu_duration_6h" msgid="1940846763432184132">"6 hores"</string>
@@ -2208,14 +2221,14 @@
     <string name="credentials_unlock_hint" msgid="2301301378040499348">"Escriu la contrasenya per a l\'emmagatzematge de credencials."</string>
     <string name="credentials_old_password" msgid="7553393815538684028">"Contrasenya actual:"</string>
     <string name="credentials_reset_hint" msgid="6297256880896133631">"Vols suprimir tots els continguts?"</string>
-    <string name="credentials_password_too_short" msgid="7502749986405522663">"La contrasenya ha de tenir almenys 8 caràcters."</string>
     <string name="credentials_wrong_password" msgid="2541932597104054807">"La contrasenya no és correcta."</string>
     <string name="credentials_reset_warning" msgid="5320653011511797600">"Contrasenya incorrecta. Tens una oportunitat més abans que no s\'esborri l\'emmagatzematge de credencials."</string>
     <string name="credentials_reset_warning_plural" msgid="6514085665301095279">"Contrasenya incorrecta. Tens <xliff:g id="NUMBER">%1$d</xliff:g> oportunitats més abans que no s\'esborri l\'emmagatzematge de credencials."</string>
     <string name="credentials_erased" msgid="2907836028586342969">"Emmagatzematge de credencials esborrat."</string>
     <string name="credentials_not_erased" msgid="7685932772284216097">"L\'emmagatzematge de credencials no s\'ha esborrat."</string>
     <string name="credentials_enabled" msgid="7588607413349978930">"L\'emmagatzematge de credencials està activat."</string>
-    <string name="credentials_configure_lock_screen_hint" msgid="6757119179588664966">"Has de definir un PIN o una contrasenya a la pantalla de bloqueig per poder fer servir l\'emmagatzematge de credencials."</string>
+    <string name="credentials_configure_lock_screen_hint" msgid="8058230497337529036">"Per poder utilitzar l\'emmagatzematge de credencials, el dispositiu ha de tenir una pantalla de bloqueig segura"</string>
+    <string name="credentials_configure_lock_screen_button" msgid="253239765216055321">"DEFINEIX EL BLOQUEIG"</string>
     <string name="usage_access_title" msgid="332333405495457839">"Apps amb accés a dades d\'ús"</string>
     <string name="emergency_tone_title" msgid="1055954530111587114">"To d\'emergència"</string>
     <string name="emergency_tone_summary" msgid="722259232924572153">"Defineix el comportament quan es fa una trucada d\'emergència"</string>
@@ -2335,8 +2348,6 @@
     <skip />
     <string name="cant_sync_dialog_title" msgid="2777238588398046285">"No es pot sincronitzar manualment"</string>
     <string name="cant_sync_dialog_message" msgid="1938380442159016449">"En aquest moment, la sincronització d\'aquest element no està disponible. Per canviar la preferència, activa temporalment les dades en segon pla i la sincronització automàtica."</string>
-    <string name="wimax_settings" msgid="2655139497028469039">"4G"</string>
-    <string name="status_wimax_mac_address" msgid="8390791848661413416">"adreça MAC 4G"</string>
     <string name="enter_password" msgid="8035706727471334122">"Per iniciar Android, introdueix la contrasenya."</string>
     <string name="enter_pin" msgid="5305333588093263790">"Per iniciar Android, introdueix el PIN."</string>
     <string name="enter_pattern" msgid="4187435713036808566">"Per iniciar Android, dibuixa el patró."</string>
@@ -2350,6 +2361,7 @@
     <string name="misc_files_selected_count" msgid="4647048020823912088">"s\'han seleccionat <xliff:g id="NUMBER">%1$d</xliff:g> de <xliff:g id="TOTAL">%2$d</xliff:g>"</string>
     <string name="misc_files_selected_count_bytes" msgid="2876232009069114352">"<xliff:g id="NUMBER">%1$s</xliff:g> de <xliff:g id="TOTAL">%2$s</xliff:g>"</string>
     <string name="select_all" msgid="1562774643280376715">"Selecciona-ho tot"</string>
+    <string name="data_plan_usage_manage_plans_button_text" msgid="8997761990902708162">"Gestiona els plans"</string>
     <string name="data_usage_summary_title" msgid="3804110657238092929">"Ús de dades"</string>
     <string name="data_usage_app_summary_title" msgid="4147258989837459172">"Ús de dades de l\'aplicació"</string>
     <string name="data_usage_accounting" msgid="7170028915873577387">"El recompte de dades de l\'operador de telefonia mòbil pot ser diferent del calculat pel dispositiu."</string>
@@ -2372,7 +2384,7 @@
     <string name="data_usage_menu_sim_cards" msgid="6410498422797244073">"Targetes SIM"</string>
     <string name="data_usage_menu_cellular_networks" msgid="8339835014751511300">"Xarxes mòbils"</string>
     <string name="data_usage_cellular_data_summary" msgid="8413357481361268285">"En pausa al límit"</string>
-    <string name="account_settings_menu_auto_sync" msgid="6243013719753700377">"Sincronitza dades automàt."</string>
+    <string name="account_settings_menu_auto_sync" msgid="6243013719753700377">"Sincronització automàtica de dades"</string>
     <string name="account_settings_menu_auto_sync_personal" msgid="785541379617346438">"Sincr. dades personals autom."</string>
     <string name="account_settings_menu_auto_sync_work" msgid="329565580969147026">"Sincron. dades feina automàt."</string>
     <string name="data_usage_change_cycle" msgid="7776556448920114866">"Canvia el cicle..."</string>
@@ -2435,6 +2447,9 @@
     <string name="data_usage_metered_mobile" msgid="5423305619126978393">"Xarxes mòbils"</string>
     <string name="data_usage_metered_wifi" msgid="1761738002328299714">"Xarxes Wi‑Fi amb límit de dades"</string>
     <string name="data_usage_metered_wifi_disabled" msgid="727808462375941567">"Per seleccionar xarxes amb límit de dades, activa la Wi‑Fi."</string>
+    <string name="data_usage_metered_auto" msgid="1262028400911918865">"Automàtic"</string>
+    <string name="data_usage_metered_yes" msgid="9217539611385225894">"Amb límit de dades"</string>
+    <string name="data_usage_metered_no" msgid="4025232961929071789">"Sense límit de dades"</string>
     <string name="data_usage_disclaimer" msgid="6887858149980673444">"El recompte de dades de l\'operador de telefonia mòbil pot ser diferent del calculat pel dispositiu."</string>
     <string name="cryptkeeper_emergency_call" msgid="198578731586097145">"Trucada d\'emergència"</string>
     <string name="cryptkeeper_return_to_call" msgid="5613717339452772491">"Torna a la trucada"</string>
@@ -2510,7 +2525,7 @@
     <string name="trusted_credentials_trust_label" msgid="8003264222650785429">"Confia-hi"</string>
     <string name="trusted_credentials_enable_confirmation" msgid="83215982842660869">"Vols activar el certificat de CA del sistema?"</string>
     <string name="trusted_credentials_disable_confirmation" msgid="8199697813361646792">"Vols desactivar el certificat de CA del sistema?"</string>
-    <string name="trusted_credentials_remove_confirmation" msgid="443561923016852941">"Vols suprimir el certificat de CA d\'usuari de manera permanent?"</string>
+    <string name="trusted_credentials_remove_confirmation" msgid="443561923016852941">"Vols suprimir el certificat de CA d\'usuari permanentment?"</string>
     <string name="credential_contains" msgid="3984922924723974084">"Aquesta entrada conté:"</string>
     <string name="one_userkey" msgid="6034020579534914349">"una clau d\'usuari"</string>
     <string name="one_usercrt" msgid="2150319011101639509">"un certificat d\'usuari"</string>
@@ -2526,9 +2541,6 @@
     <string name="backup_pw_set_button_text" msgid="2387480910044648795">"Defineix contrasenya de seguretat"</string>
     <string name="backup_pw_cancel_button_text" msgid="8845630125391744615">"Cancel·la"</string>
     <string name="additional_system_update_settings_list_item_title" msgid="214987609894661992">"Actualitzacions addicionals del sistema"</string>
-    <string name="selinux_status_disabled" msgid="924551035552323327">"Desactivat"</string>
-    <string name="selinux_status_permissive" msgid="6004965534713398778">"Permissiu"</string>
-    <string name="selinux_status_enforcing" msgid="2252703756208463329">"En aplicació"</string>
     <string name="ssl_ca_cert_warning" msgid="2045866713601984673">"És possible que la xarxa estigui supervisada"</string>
     <string name="done_button" msgid="1991471253042622230">"Fet"</string>
     <plurals name="ssl_ca_cert_dialog_title" formatted="false" msgid="7145092748045794650">
@@ -2719,19 +2731,20 @@
     <string name="sim_notification_title" msgid="6272913297433198340">"S\'han canviat les targetes SIM"</string>
     <string name="sim_notification_summary" msgid="8858043655706669772">"Toca per configurar"</string>
     <string name="sim_pref_divider" msgid="6778907671867621874">"SIM preferida per a"</string>
-    <string name="sim_calls_ask_first_prefs_title" msgid="7941299533514115976">"Demana-m\'ho cada vegada"</string>
+    <string name="sim_calls_ask_first_prefs_title" msgid="7941299533514115976">"Pregunta sempre"</string>
     <string name="sim_selection_required_pref" msgid="3446721423206414652">"Has de seleccionar una preferència."</string>
     <string name="dashboard_title" msgid="5453710313046681820">"Configuració"</string>
     <plurals name="settings_suggestion_header_summary_hidden_items" formatted="false" msgid="5597356221942118048">
       <item quantity="other">Mostra %d elements amagats</item>
       <item quantity="one">Mostra %d element amagat</item>
     </plurals>
+    <string name="dashboard_suggestion_condition_footer_content_description" msgid="2898588191174845961">"Replega"</string>
     <string name="network_dashboard_title" msgid="4771589228992391573">"Xarxa i Internet"</string>
     <string name="network_dashboard_summary_mobile" msgid="3851083934739500429">"xarxa mòbil"</string>
     <string name="network_dashboard_summary_data_usage" msgid="3843261364705042212">"ús de dades"</string>
     <string name="network_dashboard_summary_hotspot" msgid="8494210248613254574">"punt d\'accés Wi-Fi"</string>
     <string name="connected_devices_dashboard_title" msgid="2355264951438890709">"Dispositius connectats"</string>
-    <string name="connected_devices_dashboard_summary" msgid="2390582103384791904">"Bluetooth, emissió, 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, 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>
@@ -2785,8 +2798,7 @@
     <string name="keywords_gesture" msgid="3526905012224714078">"gestos"</string>
     <string name="keywords_payment_settings" msgid="5220104934130446416">"paga, toca, pagaments"</string>
     <string name="keywords_backup" msgid="470070289135403022">"còpia de seguretat, crear una còpia de seguretat"</string>
-    <!-- no translation found for keywords_assist_gesture_launch (813968759791342591) -->
-    <skip />
+    <string name="keywords_assist_gesture_launch" msgid="813968759791342591">"gest"</string>
     <string name="setup_wifi_nfc_tag" msgid="9028353016222911016">"Configura l\'etiqueta d\'NFC per a Wi-Fi"</string>
     <string name="write_tag" msgid="8571858602896222537">"Escriu-hi"</string>
     <string name="status_awaiting_tap" msgid="2130145523773160617">"Toca una etiqueta per escriure..."</string>
@@ -2829,8 +2841,14 @@
       <item quantity="other"><xliff:g id="ON_COUNT">%d</xliff:g> regles automàtiques activades</item>
       <item quantity="one">1 regla automàtica activada</item>
     </plurals>
-    <string name="zen_mode_settings_title" msgid="842308776768942600">"Preferències per a No molestis"</string>
-    <string name="zen_mode_priority_settings_title" msgid="2623117023031824309">"Prioritat només permet"</string>
+    <string name="zen_mode_settings_title" msgid="1066226840983908121">"No molestis"</string>
+    <string name="zen_mode_behavior_settings_title" msgid="1463303933529313969">"Comportament"</string>
+    <string name="zen_mode_behavior_allow_title" msgid="3845615648136218141">"Permet sons i vibracions de:"</string>
+    <string name="zen_mode_behavior_no_sound" msgid="1219626004723208056">"Sense so"</string>
+    <string name="zen_mode_behavior_total_silence" msgid="6716603819806610626">"Sense so (Silenci total)"</string>
+    <string name="zen_mode_behavior_no_sound_except" msgid="4968477585788243114">"Sense so excepte <xliff:g id="CATEGORIES">%1$s</xliff:g>"</string>
+    <!-- no translation found for zen_mode_behavior_alarms_only (2423480992071472963) -->
+    <skip />
     <string name="zen_mode_automation_settings_title" msgid="4228995740594063774">"Regles automàtiques"</string>
     <string name="zen_mode_automation_suggestion_title" msgid="5105443455143476201">"Defineix regles de No molestis"</string>
     <string name="zen_mode_automation_suggestion_summary" msgid="4732808039946935657">"Limita sons i vibracions en hores concretes"</string>
@@ -2854,14 +2872,14 @@
     <string name="ringtones_category_preference_title" msgid="5675912303120102366">"Sons de trucada"</string>
     <string name="other_sound_category_preference_title" msgid="2521096636124314015">"Vibracions i altres sons"</string>
     <string name="configure_notification_settings" msgid="7616737397127242615">"Notificacions"</string>
-    <string name="advanced_section_header" msgid="8833934850242546903">"Avançada"</string>
+    <string name="advanced_section_header" msgid="8833934850242546903">"Configuració avançada"</string>
     <string name="profile_section_header" msgid="2320848161066912001">"Notificacions de la feina"</string>
     <string name="notification_badging_title" msgid="5938709971403474078">"Permet els punts de notificació"</string>
     <string name="notification_pulse_title" msgid="1905382958860387030">"Llum intermitent"</string>
     <string name="lock_screen_notifications_title" msgid="6173076173408887213">"A la pantalla de bloqueig"</string>
     <string name="lock_screen_notifications_summary_show" msgid="6407527697810672847">"Mostra tot el contingut de les notificacions"</string>
     <string name="lock_screen_notifications_summary_hide" msgid="7891552853357258782">"Amaga contingut sensible de les notificacions"</string>
-    <string name="lock_screen_notifications_summary_disable" msgid="859628910427886715">"No mostris cap notificació"</string>
+    <string name="lock_screen_notifications_summary_disable" msgid="859628910427886715">"No mostris les notificacions"</string>
     <string name="lock_screen_notifications_interstitial_message" msgid="6164532459432182244">"Com vols que es mostrin les notificacions quan el dispositiu estigui bloquejat?"</string>
     <string name="lock_screen_notifications_interstitial_title" msgid="1416589393106326972">"Notificacions"</string>
     <string name="lock_screen_notifications_summary_show_profile" msgid="835870815661120772">"Mostra tot el contingut de notific. professionals"</string>
@@ -2872,13 +2890,15 @@
     <string name="notifications_title" msgid="8086372779371204971">"Notificacions"</string>
     <string name="app_notifications_title" msgid="5810577805218003760">"Notificacions d\'aplicacions"</string>
     <string name="notification_channel_title" msgid="2260666541030178452">"Categoria de les notificacions"</string>
+    <string name="notification_group_title" msgid="7180506440133859601">"Grup de categories de notificacions"</string>
     <string name="notification_importance_title" msgid="848692592679312666">"Importància"</string>
-    <string name="notification_importance_unspecified" msgid="2196023702875112081">"Deixa que ho decideixi l\'aplicació"</string>
+    <string name="notification_importance_unspecified" msgid="6622173510486113958">"Permet el so"</string>
     <string name="notification_importance_blocked" msgid="7938180808339386300">"No mostris mai notificacions"</string>
     <string name="notification_importance_min" msgid="5455049524984686275">"Sense so ni interrupcions visuals"</string>
     <string name="notification_importance_low" msgid="8881468429453766553">"Sense so"</string>
     <string name="notification_importance_default" msgid="5958338024601957516">"Amb so"</string>
     <string name="notification_importance_high" msgid="2082429479238228527">"Amb so i amb una finestra emergent"</string>
+    <string name="notification_importance_high_silent" msgid="2667033773703765252">"Finestra emergent"</string>
     <string name="notification_importance_min_title" msgid="6974673091137544803">"Baixa"</string>
     <string name="notification_importance_low_title" msgid="8131254047772814309">"Mitjana"</string>
     <string name="notification_importance_default_title" msgid="9120383978536089489">"Alta"</string>
@@ -2910,20 +2930,24 @@
     <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">"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_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_keywords" msgid="8361318686701764690">"pip imatge en"</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>
-    <!-- no translation found for picture_in_picture_app_detail_summary (1264019085827708920) -->
-    <skip />
+    <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="1264019085827708920">"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="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>
     <string name="app_notifications_off_desc" msgid="4882445501376722969">"Android està impedint que les notificacions d\'aquesta aplicació es mostrin en aquest dispositiu"</string>
     <string name="channel_notifications_off_desc" msgid="5899225298718840635">"Android està impedint que les notificacions d\'aquesta categoria es mostrin en aquest dispositiu"</string>
+    <string name="channel_group_notifications_off_desc" msgid="1620950416247316370">"Android està impedint que aquest grup de notificacions es mostri en aquest dispositiu"</string>
     <string name="notification_channels" msgid="5346841743182627500">"Categories"</string>
     <string name="notification_channels_other" msgid="5645317113885788226">"Altres"</string>
+    <plurals name="notification_group_summary" formatted="false" msgid="3420621520561455358">
+      <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> categories</item>
+      <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> categoria</item>
+    </plurals>
     <string name="no_channels" msgid="3077375508177744586">"No hi ha cap notificació per a aquesta aplicació"</string>
     <string name="app_settings_link" msgid="8894946007543660906">"Opcions de configuració addicionals a l\'aplicació"</string>
     <string name="app_notification_listing_summary_zero" msgid="6482582965081108108">"S\'han activat per a totes les aplicacions"</string>
@@ -2986,7 +3010,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 substituir l\'hora de finalització"</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_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>
@@ -3000,12 +3024,14 @@
     <string name="zen_mode_from_starred" msgid="2678345811950997027">"Només dels contactes destacats"</string>
     <string name="zen_mode_from_none" msgid="8219706639954614136">"Cap"</string>
     <string name="zen_mode_alarms" msgid="2165302777886552926">"Alarmes"</string>
+    <!-- no translation found for zen_mode_media_system_other (8900209390529859777) -->
+    <skip />
     <string name="zen_mode_reminders" msgid="5458502056440485730">"Recordatoris"</string>
     <string name="zen_mode_events" msgid="7914446030988618264">"Esdeveniments"</string>
     <string name="zen_mode_all_callers" msgid="584186167367236922">"Totes les trucades"</string>
     <string name="zen_mode_selected_callers" msgid="3127598874060615742">"Contactes seleccionats"</string>
     <string name="zen_mode_repeat_callers" msgid="5019521886428322131">"Trucades repetides"</string>
-    <string name="zen_mode_repeat_callers_summary" msgid="7192713032364140137">"Si una mateixa persona truca dues vegades en un període de <xliff:g id="MINUTES">%d</xliff:g> minuts, permet la segona trucada"</string>
+    <string name="zen_mode_repeat_callers_summary" msgid="239685342222975733">"Si una mateixa persona truca dues vegades en menys de <xliff:g id="MINUTES">%d</xliff:g> minuts"</string>
     <string name="zen_mode_when" msgid="2767193283311106373">"Activa automàticam."</string>
     <string name="zen_mode_when_never" msgid="8809494351918405602">"Mai"</string>
     <string name="zen_mode_when_every_night" msgid="3122486110091921009">"Cada nit"</string>
@@ -3034,6 +3060,7 @@
     <string name="zen_mode_screen_off_visual_interruptions" msgid="4850792880144382633">"Quan la pantalla està desactivada"</string>
     <string name="zen_mode_no_visual_interruptions" msgid="8742776003822778472">"Quan la pantalla està activada o desactivada"</string>
     <string name="notification_app_settings_button" msgid="6685640230371477485">"Configuració de les notificacions"</string>
+    <string name="suggestion_button_text" msgid="3275010948381252006">"D\'acord"</string>
     <string name="device_feedback" msgid="3238056036766293294">"Envia suggeriments sobre el dispositiu"</string>
     <string name="restr_pin_enter_admin_pin" msgid="1085834515677448072">"Introdueix el PIN d\'administrador"</string>
     <string name="switch_on_text" msgid="1124106706920572386">"Activat"</string>
@@ -3050,10 +3077,10 @@
     <string name="encryption_interstitial_header" msgid="468015813904595613">"Inici segur"</string>
     <string name="encryption_continue_button" msgid="1121880322636992402">"Continua"</string>
     <string name="encryption_interstitial_message_pin" msgid="2317181134653424679">"Per augmentar la protecció del dispositiu, pots configurar-lo perquè demani un PIN abans d\'iniciar-se. Fins que no s\'iniciï, no podrà rebre trucades, missatges ni notificacions, com ara alarmes.\n\nD\'aquesta manera es protegeixen les dades en cas de pèrdua o robatori del dispositiu. Vols que demani un PIN per iniciar-se?"</string>
-    <string name="encryption_interstitial_message_pattern" msgid="7081249914068568570">"Per augmentar la protecció del dispositiu, pots configurar-lo perquè demani un patró abans d\'iniciar-se. Fins que no s\'iniciï, no podrà rebre trucades, missatges ni notificacions, com ara alarmes.\n\nD\'aquesta manera es protegeixen les dades en cas de pèrdua o robatori del dispositiu. Vols que demani un patró per iniciar-se?"</string>
+    <string name="encryption_interstitial_message_pattern" msgid="7081249914068568570">"Per augmentar la protecció del dispositiu, pots configurar-lo perquè demani un patró abans d\'iniciar-se. Fins que no s\'iniciï, no podrà rebre trucades, missatges ni notificacions, com ara alarmes.\n\nD\'aquesta manera es protegeixen les dades en cas de pèrdua o robatori del dispositiu. Vols que se\'t demani un patró en iniciar el dispositiu?"</string>
     <string name="encryption_interstitial_message_password" msgid="7796567133897436443">"Per millorar la protecció del dispositiu, pots configurar-lo perquè sol·liciti una contrasenya abans d\'iniciar-se. Fins que no s\'iniciï, no podrà rebre trucades, missatges ni notificacions, com ara alarmes.\n\nD\'aquesta manera es protegeixen les dades en cas de pèrdua o robatori del dispositiu. Vols que sol·liciti una contrasenya en iniciar-se?"</string>
     <string name="encryption_interstitial_message_pin_for_fingerprint" msgid="4550632760119547492">"A més de fer servir l\'empremta digital per desbloquejar el dispositiu, pots augmentar-ne la protecció configurant-lo perquè demani un PIN abans d\'iniciar-se. Fins que el dispositiu no s\'iniciï, no podrà rebre trucades, missatges ni notificacions, com ara alarmes.\n\nD\'aquesta manera es protegeixen les dades en cas de pèrdua o robatori del dispositiu. Vols que demani un PIN per iniciar-se?"</string>
-    <string name="encryption_interstitial_message_pattern_for_fingerprint" msgid="932184823193006087">"A més de fer servir l\'empremta digital per desbloquejar el dispositiu, pots augmentar-ne la protecció configurant-lo perquè demani un patró abans d\'iniciar-se. Fins que el dispositiu no s\'iniciï, no podrà rebre trucades, missatges ni notificacions, com ara alarmes.\n\nD\'aquesta manera es protegeixen les dades en cas de pèrdua o robatori del dispositiu. Vols que demani un patró per iniciar-se?"</string>
+    <string name="encryption_interstitial_message_pattern_for_fingerprint" msgid="932184823193006087">"A més de fer servir l\'empremta digital per desbloquejar el dispositiu, pots augmentar-ne la protecció configurant-lo perquè demani un patró abans d\'iniciar-se. Fins que el dispositiu no s\'iniciï, no podrà rebre trucades, missatges ni notificacions, com ara alarmes.\n\nD\'aquesta manera es protegeixen les dades en cas de pèrdua o robatori del dispositiu. Vols que se\'t demani un patró en iniciar el dispositiu?"</string>
     <string name="encryption_interstitial_message_password_for_fingerprint" msgid="5560954719370251702">"Per millorar la protecció del dispositiu, a més de fer servir la teva empremta digital per desbloquejar-lo, pots configurar-lo perquè sol·liciti una contrasenya abans d\'iniciar-se. Fins que no s\'iniciï, no podrà rebre trucades, missatges ni notificacions, com ara alarmes.\n\nAixò permet protegir les dades en cas de pèrdua o robatori del dispositiu. Vols que sol·liciti una contrasenya en iniciar-se?"</string>
     <string name="encryption_interstitial_yes" msgid="4439509435889513411">"Sí"</string>
     <string name="encryption_interstitial_no" msgid="8935031349097025137">"No"</string>
@@ -3073,11 +3100,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> en ús 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> utilitzats 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> d\'ús 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> utilitzats 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>
@@ -3134,7 +3161,7 @@
       <item quantity="one">1 aplicació que permet obrir enllaços compatibles</item>
     </plurals>
     <string name="app_link_open_always" msgid="2474058700623948148">"Obre en aquesta aplicació"</string>
-    <string name="app_link_open_ask" msgid="7800878430190575991">"Demana-m\'ho cada vegada"</string>
+    <string name="app_link_open_ask" msgid="7800878430190575991">"Pregunta sempre"</string>
     <string name="app_link_open_never" msgid="3407647600352398543">"No obris en aquesta aplicació"</string>
     <string name="fingerprint_not_recognized" msgid="1739529686957438119">"No s\'ha reconegut"</string>
     <string name="default_apps_title" msgid="1660450272764331490">"Predeterminada"</string>
@@ -3152,7 +3179,7 @@
     <string name="default_app" msgid="6864503001385843060">"(Predeterminat)"</string>
     <string name="system_app" msgid="9068313769550747372">"(Sistema)"</string>
     <string name="system_default_app" msgid="3091113402349739037">"(Opció predetermina del sistema)"</string>
-    <string name="apps_storage" msgid="4353308027210435513">"Emmagatzematge d\'aplicacions"</string>
+    <string name="apps_storage" msgid="4353308027210435513">"Emmagatzematge d\'apps"</string>
     <string name="usage_access" msgid="5479504953931038165">"Accés a dades d\'ús"</string>
     <string name="permit_usage_access" msgid="4012876269445832300">"Permet l\'accés a dades d\'ús"</string>
     <string name="app_usage_preference" msgid="7065701732733134991">"Preferències d\'ús de les aplicacions"</string>
@@ -3182,13 +3209,13 @@
       <item quantity="one"><xliff:g id="APP">%1$s</xliff:g> consumeix molta bateria</item>
     </plurals>
     <string name="high_power_filter_on" msgid="3222265297576680099">"Sense optimitzar"</string>
-    <string name="high_power_on" msgid="6216293998227583810">"No optimitzen la bateria"</string>
+    <string name="high_power_on" msgid="6216293998227583810">"Sense optimitzar"</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> d\'ús des de l\'última càrrega completa"</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_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>
@@ -3201,23 +3228,24 @@
     <string name="sharing_remote_bugreport_dialog_message" msgid="5859287696666024466">"Aquest informe d\'errors s\'està compartint amb l\'administrador de TI. Contacta-hi per obtenir-ne més informació."</string>
     <string name="share_remote_bugreport_action" msgid="532226159318779397">"Comparteix"</string>
     <string name="decline_remote_bugreport_action" msgid="518720235407565134">"Rebutja"</string>
-    <string name="usb_use_charging_only" msgid="2180443097365214467">"carregar aquest dispositiu"</string>
+    <string name="usb_use_charging_only" msgid="2180443097365214467">"Carregar aquest dispositiu"</string>
     <string name="usb_use_charging_only_desc" msgid="3066256793008540627">"Carrega només aquest dispositiu"</string>
-    <string name="usb_use_power_only" msgid="6426550616883919530">"subministrar corrent"</string>
+    <string name="usb_use_power_only" msgid="6426550616883919530">"Subministrar corrent"</string>
     <string name="usb_use_power_only_desc" msgid="3461232831015575152">"Carrega el dispositiu connectat. Només funciona amb dispositius que són compatibles amb la càrrega per USB."</string>
-    <string name="usb_use_file_transfers" msgid="7409600791007250137">"transferir fitxers"</string>
+    <string name="usb_use_file_transfers" msgid="7409600791007250137">"Transferir fitxers"</string>
     <string name="usb_use_file_transfers_desc" msgid="4235764784331804488">"Transfereix fitxers a un altre dispositiu"</string>
     <string name="usb_use_photo_transfers" msgid="7794775645350330454">"Transferir fotos (PTP)"</string>
     <string name="usb_use_photo_transfers_desc" msgid="2963034811151325996">"Transfereix fotos o fitxers si no s\'admet MTP (PTP)"</string>
-    <string name="usb_use_MIDI" msgid="870922185938298263">"fer servir el dispositiu com a MIDI"</string>
+    <string name="usb_use_MIDI" msgid="870922185938298263">"Utilitzar el dispositiu com a MIDI"</string>
     <string name="usb_use_MIDI_desc" msgid="8473936990076693175">"fer servir aquest dispositiu com a MIDI"</string>
     <string name="usb_use" msgid="3256040963685055320">"Utilitza l\'USB per"</string>
     <string name="usb_pref" msgid="1400617804525116158">"USB"</string>
-    <string name="usb_summary_charging_only" msgid="7544327009143659751">"Carrega aquest dispositiu"</string>
+    <string name="usb_summary_charging_only" msgid="7544327009143659751">"Càrrega del dispositiu"</string>
     <string name="usb_summary_power_only" msgid="3629517713817003738">"Subministra energia"</string>
     <string name="usb_summary_file_transfers" msgid="6435943692610175111">"Transfereix fitxers"</string>
     <string name="usb_summary_photo_transfers" msgid="8440204169576585250">"Transfereix fotos (PTP)"</string>
     <string name="usb_summary_MIDI" msgid="5687906612187885908">"Utilitza el dispositiu com a MIDI"</string>
+    <string name="sms_mirroring_pref" msgid="6475043279147376031">"Projecció de missatges SMS"</string>
     <string name="background_check_pref" msgid="7550258400138010979">"Comprovació en segon pla"</string>
     <string name="background_check_title" msgid="4534254315824525593">"Accés complet en segon pla"</string>
     <string name="assist_access_context_title" msgid="2269032346698890257">"Ús del text de la pantalla"</string>
@@ -3284,11 +3312,11 @@
     <string name="write_settings_title" msgid="4232152481902542284">"Pot modificar la configuració del sistema"</string>
     <string name="write_system_settings" msgid="3482913590601096763">"Modificar configuració sistema"</string>
     <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="permit_write_settings" msgid="658555006453212691">"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 d\'aquesta font"</string>
+    <string name="external_source_switch_title" msgid="3621381992793251070">"Permet baixades 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>
@@ -3379,9 +3407,12 @@
     <string name="color_temperature" msgid="2070126836910615605">"Temperatura de color freda"</string>
     <string name="color_temperature_desc" msgid="4793729830226404052">"Utilitza colors de pantalla més freds"</string>
     <string name="color_temperature_toast" msgid="4974218172133854827">"Desactiva la pantalla per aplicar el canvi de color"</string>
-    <string name="telephony_monitor_toast" msgid="7003764250271195384">"Per aplicar canvis al monitor de telefonia, reinicia el dispositiu"</string>
+    <string name="connectivity_monitor_switch" msgid="9059759348648583421">"Monitor de connectivitat"</string>
+    <string name="connectivity_monitor_switch_summary" msgid="2828658652378866401">"Quan el monitor de connectivitat detecta un problema, recopila registres i mostra una notificació a l\'usuari perquè informi de l\'error"</string>
+    <string name="connectivity_monitor_toast" msgid="5551859612881173028">"Per aplicar canvis al monitor de connectivitat, reinicia el dispositiu"</string>
     <string name="camera_hal_hdrplus_switch" msgid="8377365197105267466">"HDR+ a HAL de la càmera"</string>
     <string name="camera_hal_hdrplus_toast" msgid="2063703797270055299">"Per aplicar els canvis de HDR+ de HAL de la càmera, reinicia el dispositiu"</string>
+    <string name="camera_laser_sensor_switch" msgid="8913588990743234440">"Sensor del làser de la càmera"</string>
     <string name="ota_disable_automatic_update" msgid="2319639631655915050">"Actualitzacions del sistema automàtiques"</string>
     <string name="usage" msgid="2977875522080448986">"Ús"</string>
     <string name="cellular_data_usage" msgid="2155683719898158203">"Ús de dades mòbils"</string>
@@ -3407,7 +3438,7 @@
     <string name="data_warning" msgid="209133958008062117">"Advertiment de dades"</string>
     <string name="set_data_limit" msgid="2901526323210516923">"Defineix un límit de dades"</string>
     <string name="data_limit" msgid="1885406964934590552">"Límit de dades"</string>
-    <string name="data_usage_template" msgid="392191945602400904">"<xliff:g id="ID_1">%1$s</xliff:g> utilitzats durant el període <xliff:g id="ID_2">%2$s</xliff:g>"</string>
+    <string name="data_usage_template" msgid="2923744765873163859">"Utilitzats: <xliff:g id="ID_1">%1$s</xliff:g> (<xliff:g id="ID_2">%2$s</xliff:g>)"</string>
     <string name="configure" msgid="1029654422228677273">"Configura"</string>
     <string name="data_usage_other_apps" msgid="3272872663517382050">"Altres aplicacions que utilitzen dades"</string>
     <plurals name="data_saver_unrestricted_summary" formatted="false" msgid="2635267833484232703">
@@ -3435,7 +3466,7 @@
     <string name="battery_saver_desc_turn_on_auto_pct" msgid="7472323223085636533">"Activa automàticament quan quedi un %1$s de bateria"</string>
     <string name="not_battery_optimizing" msgid="5362861851864837617">"No s\'està fent servir l\'optimització de la bateria"</string>
     <string name="lockscreen_remote_input" msgid="969871538778211843">"Si el dispositiu està bloquejat, impedeix que s\'escriguin respostes o altres textos a les notificacions"</string>
-    <string name="default_spell_checker" msgid="8506899870026026660">"Corrector ortogr. predeterminat"</string>
+    <string name="default_spell_checker" msgid="8506899870026026660">"Corrector predeterminat"</string>
     <string name="choose_spell_checker" msgid="6596539862291699367">"Tria el corrector ortogràfic"</string>
     <string name="spell_checker_not_selected" msgid="8871083796179200696">"No s\'ha seleccionat"</string>
     <string name="notification_log_no_title" msgid="5678029849672024215">"(cap)"</string>
@@ -3476,7 +3507,7 @@
     <string name="button_confirm_convert_fbe" msgid="7101855374850373091">"Esborra i converteix"</string>
     <string name="reset_shortcut_manager_throttling" msgid="6495066467198668994">"Restableix la limitació de velocitat de ShortcutManager"</string>
     <string name="reset_shortcut_manager_throttling_complete" msgid="1826770872063707900">"S\'ha restablert la limitació de velocitat de ShortcutManager"</string>
-    <string name="notification_suggestion_title" msgid="4506524937307816475">"Controla notificacions de pantalla bloq."</string>
+    <string name="notification_suggestion_title" msgid="387052719462473500">"Controla la informació de la pantalla de bloqueig"</string>
     <string name="notification_suggestion_summary" msgid="8521159741445416875">"Mostra o oculta el contingut de la notificació"</string>
     <string name="page_tab_title_summary" msgid="4070309266374993258">"Tots"</string>
     <string name="page_tab_title_support" msgid="8483187649355540109">"Ajuda i consells"</string>
@@ -3484,11 +3515,11 @@
     <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>
     <string name="premium_sms_access" msgid="4660047004791638305">"Accés a SMS prèmium"</string>
-    <string name="bluetooth_disabled" msgid="2456198532288640046">"No visible per a altres dispositius"</string>
+    <string name="bluetooth_disabled" msgid="6244000672828617410">"Desactivat"</string>
     <string name="bluetooth_connected_summary" msgid="7672528674593152862">"Connectat a <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="bluetooth_connected_multiple_devices_summary" msgid="9173661896296663932">"Connectat a diversos dispositius"</string>
     <string name="demo_mode" msgid="2798762752209330277">"Mode de demostració de la IU del sistema"</string>
-    <string name="quick_settings_developer_tiles" msgid="5947788063262762448">"Camps de configuració ràpida per a desenvolupadors"</string>
+    <string name="quick_settings_developer_tiles" msgid="5947788063262762448">"Mosaics de configuració ràpida per a desenvolupadors"</string>
     <string name="support_escalation_title" msgid="4111071371281023145">"Som aquí per ajudar-te"</string>
     <string name="support_escalation_24_7_title" msgid="8118369197749832074">"Estem a la teva disposició les 24 hores del dia"</string>
     <string name="support_escalation_24_7_content_description" msgid="3772776213036994533">"Estem a la teva disposició les 24 hores del dia"</string>
@@ -3586,7 +3617,7 @@
     <string name="web_action_enable_title" msgid="4051513950976670853">"Aplicacions instantànies"</string>
     <string name="web_action_enable_summary" msgid="3108127559723396382">"Obre enllaços en aplicacions, encara que no estiguin instal·lades"</string>
     <string name="web_action_section_title" msgid="7364647086538399136">"Aplicacions instantànies"</string>
-    <string name="instant_apps_account" msgid="1433620209791992528">"Compte per a les aplicacions instantànies"</string>
+    <string name="instant_apps_settings" msgid="8827777916518348213">"Preferències d\'Aplicacions instantànies"</string>
     <string name="domain_url_section_title" msgid="7046835219056428883">"Aplicacions instal·lades"</string>
     <string name="automatic_storage_manager_activation_warning" msgid="6353100011690933254">"Ara mateix, el gestor d\'emmagatzematge gestiona el teu emmagatzematge"</string>
     <string name="account_for_section_header" msgid="5356566418548737121">"Comptes de l\'usuari <xliff:g id="USER_NAME">%1$s</xliff:g>"</string>
@@ -3633,7 +3664,9 @@
     <string name="enterprise_privacy_always_on_vpn_personal" msgid="9217774730260037434">"S\'ha activat l\'opció VPN sempre activada al teu perfil personal"</string>
     <string name="enterprise_privacy_always_on_vpn_work" msgid="7244472958208315814">"S\'ha activat l\'opció VPN sempre activada al teu perfil professional"</string>
     <string name="enterprise_privacy_global_http_proxy" msgid="7936664553416257333">"S\'ha definit el servidor intermediari HTTP global"</string>
-    <string name="enterprise_privacy_ca_certs" msgid="5885892204903688909">"Certificats de confiança"</string>
+    <string name="enterprise_privacy_ca_certs_device" msgid="2019652712782510262">"Certificats de confiança"</string>
+    <string name="enterprise_privacy_ca_certs_personal" msgid="2279084820904076599">"Certificats de confiança al teu perfil personal"</string>
+    <string name="enterprise_privacy_ca_certs_work" msgid="6187377647815301809">"Certificats de confiança al teu perfil professional"</string>
     <plurals name="enterprise_privacy_number_ca_certs" formatted="false" msgid="526375234629534165">
       <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> certificats de CA com a mínim</item>
       <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> certificat de CA com a mínim</item>
@@ -3682,7 +3715,7 @@
     <string name="app_info_storage_title" msgid="5554719444625611987">"Espai utilitzat"</string>
     <string name="webview_uninstalled_for_user" msgid="1819903169194420983">"(desinstal·lat per a <xliff:g id="USER">%s</xliff:g>)"</string>
     <string name="webview_disabled_for_user" msgid="1216426047631256825">"(desactivat per a <xliff:g id="USER">%s</xliff:g>)"</string>
-    <string name="autofill_app" msgid="7338387238377914374">"Servei d\'emplenament automàtic"</string>
+    <string name="autofill_app" msgid="7338387238377914374">"Servei 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>
@@ -3696,6 +3729,8 @@
     <string name="carrier_provisioning" msgid="4398683675591893169">"Informació de serveis de l\'operador de telefonia mòbil"</string>
     <string name="trigger_carrier_provisioning" msgid="3434865918009286187">"Activa els serveis de l\'operador de telefonia mòbil"</string>
     <string name="new_device_suggestion_title" msgid="698847081680980774">"Quines són les novetats més importants?"</string>
-    <string name="new_device_suggestion_summary" msgid="7172709269203435870">"Dona un cop d\'ull a les 5 funcions principals"</string>
+    <string name="new_device_suggestion_summary" product="default" msgid="206396571522515855">"Dona una ullada al teu telèfon nou"</string>
+    <string name="new_device_suggestion_summary" product="tablet" msgid="393751455688210956">"Dona una ullada a la teva tauleta nova"</string>
+    <string name="new_device_suggestion_summary" product="device" msgid="2939870049868336652">"Dona una ullada al teu dispositiu nou"</string>
     <string name="disabled_low_ram_device" msgid="3751578499721173344">"Aquesta funció no està disponible en aquest dispositiu"</string>
 </resources>
diff --git a/res/values-cs/arrays.xml b/res/values-cs/arrays.xml
index 8ead7f6..d2efa01 100644
--- a/res/values-cs/arrays.xml
+++ b/res/values-cs/arrays.xml
@@ -100,8 +100,6 @@
     <!-- no translation found for wifi_security_no_eap:0 (2084555984818107151) -->
     <!-- no translation found for wifi_security_no_eap:1 (397579322683471524) -->
     <!-- no translation found for wifi_security_no_eap:2 (1968820975358150484) -->
-    <!-- no translation found for wifi_ap_security:0 (5251664683198623324) -->
-    <!-- no translation found for wifi_ap_security:1 (7989073072260294673) -->
   <string-array name="wifi_eap_method">
     <item msgid="1160193392455075561">"PEAP"</item>
     <item msgid="7981731051382306293">"TLS"</item>
diff --git a/res/values-cs/strings.xml b/res/values-cs/strings.xml
index 5b20abe..d408663 100644
--- a/res/values-cs/strings.xml
+++ b/res/values-cs/strings.xml
@@ -168,7 +168,7 @@
     <string name="bluetooth_map_acceptance_dialog_text" msgid="8712508202081143737">"Zařízení %1$s žádá o přístup k vašim zprávám. Povolit přístup zařízení %2$s?"</string>
     <string name="bluetooth_sap_request" msgid="2669762224045354417">"Žádost o přístup k SIM kartě"</string>
     <string name="bluetooth_sap_acceptance_dialog_text" msgid="4414253873553608690">"Zařízení <xliff:g id="DEVICE_NAME_0">%1$s</xliff:g> žádá o přístup k SIM kartě. Po dobu přístupu zařízení k SIM kartě bude datové připojení ve vašem zařízení vypnuto. Chcete zařízení <xliff:g id="DEVICE_NAME_1">%2$s?</xliff:g> povolit přístup?"</string>
-    <string name="bluetooth_device_name_summary" msgid="4757990010751789977">"Viditelné pro ostatní zařízení jako „<xliff:g id="DEVICE_NAME">^1</xliff:g>“"</string>
+    <string name="bluetooth_device_name_summary" msgid="522235742194965734">"Viditelné pro ostatní zařízení jako „<xliff:g id="DEVICE_NAME">^1</xliff:g>“"</string>
     <string name="bluetooth_paired_device_title" msgid="8638994696317952019">"Vaše zařízení"</string>
     <string name="bluetooth_pairing_page_title" msgid="7712127387361962608">"Spárovat nové zařízení"</string>
     <string name="date_and_time" msgid="9062980487860757694">"Datum a čas"</string>
@@ -316,6 +316,8 @@
     <string name="zone_auto" msgid="334783869352026648">"Automatické čas. pásmo"</string>
     <string name="zone_auto_summaryOn" msgid="6142830927278458314">"Používat časové pásmo ze sítě"</string>
     <string name="zone_auto_summaryOff" msgid="2597745783162041390">"Používat časové pásmo ze sítě"</string>
+    <string name="date_time_24hour_auto" msgid="2117383168985653422">"Automatický 24hodinový formát"</string>
+    <string name="date_time_24hour_auto_summary" msgid="6351812925651480277">"Použít zdejší výchozí formát"</string>
     <string name="date_time_24hour_title" msgid="3203537578602803850">"24hodinový formát"</string>
     <string name="date_time_24hour" msgid="1193032284921000063">"Používat 24hodinový formát"</string>
     <string name="date_time_set_time_title" msgid="6296795651349047016">"Čas"</string>
@@ -378,6 +380,9 @@
     <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="1961957425135180242">"Další"</string>
+    <string name="setup_fingerprint_enroll_skip_title" msgid="362050541117362034">"Přeskočit zadání otisku prstu?"</string>
+    <string name="setup_fingerprint_enroll_skip_after_adding_lock_text" msgid="958990414356204763">"Nastavení otisku prstu trvá jen minutu nebo dvě. Pokud tento krok přeskočíte, můžete otisk prstu přidat později v nastavení."</string>
+    <string name="lock_screen_intro_skip_title" msgid="4988210105913705679">"Přeskočit zámek obrazovky?"</string>
     <string name="lock_screen_intro_skip_dialog_text_frp" product="tablet" msgid="1581834104051243425">"Nebudou zapnuty funkce ochrany zařízení. V případě ztráty, odcizení nebo resetování tabletu nebudete moci ostatním zabránit v jeho používání."</string>
     <string name="lock_screen_intro_skip_dialog_text_frp" product="device" msgid="4629503416877189572">"Nebudou zapnuty funkce ochrany zařízení. V případě ztráty, odcizení nebo resetování zařízení nebudete moci ostatním zabránit v jeho používání."</string>
     <string name="lock_screen_intro_skip_dialog_text_frp" product="default" msgid="2423428240245737909">"Nebudou zapnuty funkce ochrany zařízení. V případě ztráty, odcizení nebo resetování telefonu nebudete moci ostatním zabránit v jeho používání."</string>
@@ -463,7 +468,7 @@
     <string name="setup_lock_settings_picker_title" product="tablet" msgid="90329443364067215">"Ochraňte svůj tablet"</string>
     <string name="setup_lock_settings_picker_title" product="device" msgid="2399952075134938929">"Ochraňte své zařízení"</string>
     <string name="setup_lock_settings_picker_title" product="default" msgid="1572244299605153324">"Chraňte svůj telefon"</string>
-    <string name="setup_lock_settings_picker_fingerprint_message" msgid="5585650064305600578">"Pro ještě lepší zabezpečení nastavte záložní zámek obrazovky."</string>
+    <string name="lock_settings_picker_fingerprint_added_security_message" msgid="5768002109707648463">"Pro ještě lepší zabezpečení nastavte záložní zámek obrazovky."</string>
     <string name="setup_lock_settings_picker_message" product="tablet" msgid="8919671129189936210">"Aktivujte funkce ochrany zařízení a zabraňte tak ostatním v používání tabletu bez vašeho svolení. Vyberte zámek obrazovky, který chcete používat."</string>
     <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>
@@ -606,6 +611,7 @@
     <string name="lockpassword_pin_no_sequential_digits" msgid="680765285206990584">"Posloupnost rostoucích, klesajících nebo opakujících se číslic není povolena"</string>
     <string name="lockpassword_ok_label" msgid="313822574062553672">"OK"</string>
     <string name="lockpassword_cancel_label" msgid="8818529276331121899">"Zrušit"</string>
+    <string name="lockpassword_clear_label" msgid="5724429464960458155">"Vymazat"</string>
     <string name="lockpattern_tutorial_cancel_label" msgid="6431583477570493261">"Zrušit"</string>
     <string name="lockpattern_tutorial_continue_label" msgid="3559793618653400434">"Další"</string>
     <string name="lock_setup" msgid="3355847066343753943">"Nastavení je dokončeno."</string>
@@ -803,6 +809,7 @@
     <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>
@@ -839,6 +846,8 @@
     <string name="wifi_wps_available_first_item" msgid="4422547079984583502">"WPS je k dispozici"</string>
     <string name="wifi_wps_available_second_item" msgid="8427520131718215301">" (WPS je k dispozici)"</string>
     <string name="wifi_wps_nfc_enter_password" msgid="2288214226916117159">"Zadejte heslo sítě"</string>
+    <string name="wifi_carrier_connect" msgid="8174696557882299911">"Síť Wi-Fi operátora"</string>
+    <string name="wifi_carrier_content" msgid="4634077285415851933">"Připojit přes: <xliff:g id="NAME">%1%s</xliff:g>"</string>
     <string name="wifi_scan_always_turnon_message" msgid="203123538572122989">"Aplikace <xliff:g id="APP_NAME">%1$s</xliff:g> chce zapnout vyhledávání sítí (kvůli lepšímu určení polohy i kvůli jiným účelům) a hledat sítě i v případě, že je vypnut modul Wi-Fi.\n\nChcete tuto možnost povolit všem aplikacím, které chtějí vyhledávat sítě?"</string>
     <string name="wifi_scan_always_turnoff_message" msgid="5538901671131941043">"Chcete-li toto nastavení vypnout, přejděte do rozbalovací nabídky Rozšířené."</string>
     <string name="wifi_scan_always_confirm_allow" msgid="5355973075896817232">"Povolit"</string>
@@ -856,6 +865,7 @@
     <string name="wifi_connect" msgid="1076622875777072845">"Připojit"</string>
     <string name="wifi_failed_connect_message" msgid="8491902558970292871">"Připojení k síti se nezdařilo."</string>
     <string name="wifi_forget" msgid="8168174695608386644">"Odstranit"</string>
+    <string name="wifi_modify" msgid="6100248070440710782">"Upravit"</string>
     <string name="wifi_failed_forget_message" msgid="1348172929201654986">"Odstranění záznamu sítě se nezdařilo."</string>
     <string name="wifi_save" msgid="3331121567988522826">"Uložit"</string>
     <string name="wifi_failed_save_message" msgid="6650004874143815692">"Uložení sítě se nezdařilo."</string>
@@ -870,6 +880,7 @@
     <string name="wifi_advanced_titlebar" msgid="4485841401774142908">"Rozšířené nastavení"</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_title" msgid="3471132676909349382">"Informace o síti"</string>
     <string name="wifi_details_subnet_mask" msgid="6720279144174924410">"Maska podsítě"</string>
     <string name="wifi_details_dns" msgid="8648826607751830768">"DNS"</string>
     <string name="wifi_details_ipv6_address_header" msgid="6734119149106422148">"Adresy IPv6"</string>
@@ -902,16 +913,15 @@
     <string name="wifi_p2p_cancel_connect_title" msgid="255267538099324413">"Zrušit pozvánku?"</string>
     <string name="wifi_p2p_cancel_connect_message" msgid="7477756213423749402">"Chcete zrušit pozvánku ke spojení s klientem <xliff:g id="PEER_NAME">%1$s</xliff:g>?"</string>
     <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_off_subtext" msgid="5466126533609394170">"Internet ani obsah není sdílen s dalšími zařízeními"</string>
     <string name="wifi_hotspot_tethering_on_subtext" product="tablet" msgid="5752490509369962007">"Internetové připojení tohoto tabletu je sdíleno pomocí hotspotu"</string>
     <string name="wifi_hotspot_tethering_on_subtext" product="default" msgid="6461075246164300670">"Internetové připojení tohoto telefonu je sdíleno pomocí hotspotu"</string>
     <string name="wifi_hotspot_on_local_only_subtext" msgid="2068110388011294735">"Aplikace sdílí obsah. Chcete-li sdílet připojení k internetu, vypněte hotspot a znovu jej zapněte"</string>
-    <string name="wifi_hotspot_name_title" msgid="1341735529132128887">"Název Wi‑Fi"</string>
+    <string name="wifi_hotspot_name_title" msgid="8237000746618636778">"Název hotspotu"</string>
     <string name="wifi_hotspot_name_summary_connecting" msgid="3378299995508671967">"Zapínám hotspot <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>..."</string>
     <string name="wifi_hotspot_name_summary_connected" msgid="3888672084861445362">"Ostatní zařízení se mohou připojit k hostpotu <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>"</string>
-    <string name="wifi_hotspot_password_title" msgid="1955592302902091281">"Heslo k Wi-Fi"</string>
+    <string name="wifi_hotspot_password_title" msgid="8676859981917573801">"Heslo hotspotu"</string>
     <string name="wifi_hotspot_ap_band_title" msgid="1165801173359290681">"Pásmo přístupového bodu"</string>
     <string name="wifi_hotspot_footer_info_regular" msgid="1203489406068036455">"Pomocí hotspotu můžete vytvořit síť Wi‑Fi pro další zařízení. Hotspot poskytuje připojení k internetu pomocí vašeho mobilního datového připojení. Může to vést k dodatečným poplatkům za mobilní data."</string>
     <string name="wifi_hotspot_footer_info_local_only" msgid="857988412470694109">"Aplikace mohou vytvořit hotspot ke sdílení obsahu s okolními zařízeními."</string>
@@ -922,7 +932,6 @@
     <string name="wifi_tether_configure_ap_text" msgid="7974681394041609308">"Nastavit hotspot sítě Wi-Fi"</string>
     <string name="wifi_hotspot_configure_ap_text" msgid="5478614731464220432">"Nastavení Wi‑Fi hotspotu"</string>
     <string name="wifi_hotspot_configure_ap_text_summary" msgid="5560680057727007011">"Hotspot AndroidAP WPA2 PSK"</string>
-    <string name="wifi_tether_configure_subtext" msgid="2050196439900426456">"Hotspot <xliff:g id="NETWORK_SSID">%1$s</xliff:g> <xliff:g id="NETWORK_SECURITY">%2$s</xliff:g>"</string>
     <string name="wifi_tether_configure_ssid_default" msgid="8467525402622138547">"AndroidHotspot"</string>
     <string name="wifi_calling_settings_title" msgid="4102921303993404577">"Volání přes Wi-Fi"</string>
     <string name="wifi_calling_suggestion_title" msgid="9008010480466359578">"Zapněte volání přes Wi-Fi"</string>
@@ -963,7 +972,7 @@
     <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="emergency_address_summary" msgid="3266760199681945746">"Adresa, kterou nouzové služby použijí jako vaši polohu, pokud uskutečníte tísňové volání přes Wi-Fi"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"Obrazovka"</string>
     <string name="sound_settings" msgid="5534671337768745343">"Zvuk"</string>
     <string name="all_volume_title" msgid="4296957391257836961">"Hlasitost"</string>
@@ -1017,6 +1026,7 @@
     <string name="search_settings" msgid="1910951467596035063">"Vyhledávání"</string>
     <string name="search_settings_summary" msgid="9205656546570654169">"Správa nastavení a historie vyhledávání"</string>
     <string name="search_settings_no_results" msgid="8799027492641230999">"Žádné výsledky"</string>
+    <string name="search_clear_history" msgid="4196658962573162457">"Vymazat historii"</string>
     <string name="display_settings" msgid="7965901687241669598">"Obrazovka"</string>
     <string name="accelerometer_title" msgid="7854608399547349157">"Autom. otočení obrazovky"</string>
     <string name="color_mode_title" msgid="3159275920408338215">"Živé barvy"</string>
@@ -1148,7 +1158,6 @@
     <string name="baseband_version" msgid="1848990160763524801">"Verze základního pásma"</string>
     <string name="kernel_version" msgid="9192574954196167602">"Verze jádra"</string>
     <string name="build_number" msgid="3075795840572241758">"Číslo sestavení"</string>
-    <string name="selinux_status" msgid="6212165375172061672">"Stav zabezpečení SELinux"</string>
     <string name="device_info_not_available" msgid="8062521887156825182">"Nedostupný"</string>
     <string name="device_status_activity_title" msgid="1411201799384697904">"Stav"</string>
     <string name="device_status" msgid="607405385799807324">"Stav"</string>
@@ -1176,7 +1185,6 @@
     <string name="status_wifi_mac_address" msgid="2202206684020765378">"Adresa MAC sítě Wi-Fi"</string>
     <string name="status_bt_address" msgid="4195174192087439720">"Adresa Bluetooth"</string>
     <string name="status_serial_number" msgid="2257111183374628137">"Sériové číslo"</string>
-    <string name="status_unavailable" msgid="7862009036663793314">"Není k dispozici"</string>
     <string name="status_up_time" msgid="7294859476816760399">"Doba provozu"</string>
     <string name="status_awake_time" msgid="2393949909051183652">"Doba provozu"</string>
     <string name="internal_memory" msgid="9129595691484260784">"Interní úložiště"</string>
@@ -1352,7 +1360,8 @@
     <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>
     <string name="reset_dashboard_title" msgid="6254873816990678620">"Resetovat možnosti"</string>
-    <string name="reset_network_title" msgid="6166025966016873843">"Resetovat Wi-Fi, mobilní data a Bluetooth"</string>
+    <string name="reset_dashboard_summary" msgid="4851012632493522755">"Lze resetovat síť, aplikace nebo zařízení"</string>
+    <string name="reset_network_title" msgid="6166025966016873843">"Resetovat Wi-Fi, data a Bluetooth"</string>
     <string name="reset_network_desc" msgid="5547979398298881406">"Budou resetována nastavení všech sítí, včetně následujících:\n\n"<li>"Wi‑Fi"</li>\n<li>"Mobilní data"</li>\n<li>"Bluetooth"</li></string>
     <string name="reset_network_button_text" msgid="2035676527471089853">"Obnovit nastavení"</string>
     <string name="reset_network_final_desc" msgid="6388371121099245116">"Chcete resetovat všechna nastavení sítí? Tuto akci nelze vrátit zpět."</string>
@@ -1360,19 +1369,14 @@
     <string name="reset_network_confirm_title" msgid="1759888886976962773">"Resetovat?"</string>
     <string name="network_reset_not_available" msgid="7188610385577164676">"Pro tohoto uživatele resetování sítě není k dispozici"</string>
     <string name="reset_network_complete_toast" msgid="787829973559541880">"Nastavení sítí bylo resetováno"</string>
-    <string name="master_clear_title" msgid="6617679904229218425">"Vymazat všechna data (resetovat do továrního nastavení)"</string>
-    <plurals name="master_clear_with_account_summary" formatted="false" msgid="5911377203778818712">
-      <item quantity="few"><xliff:g id="ACCOUNT_COUNT">%1$d</xliff:g> účty budou obnoveny</item>
-      <item quantity="many"><xliff:g id="ACCOUNT_COUNT">%1$d</xliff:g> účtu bude obnoveno</item>
-      <item quantity="other"><xliff:g id="ACCOUNT_COUNT">%1$d</xliff:g> účtů bude obnoveno</item>
-      <item quantity="one">1 účet bude obnoven</item>
-    </plurals>
-    <string name="master_clear_summary" msgid="6902443944660426951">"Interní úložiště a všechna data budou vymazána"</string>
+    <string name="master_clear_title" msgid="3531267871084279512">"Vymazat data (tovární reset)"</string>
     <string name="master_clear_desc" product="tablet" msgid="9146059417023157222">"Tato akce smaže veškerá data z "<b>"interního úložiště"</b>" tabletu, mj. i:\n\n"<li>"váš účet Google"</li>\n<li>"nastavení a data systému a aplikací"</li>\n<li>"stažené aplikace"</li></string>
     <string name="master_clear_desc" product="default" msgid="4800386183314202571">"Tato akce smaže veškerá data z "<b>"interního úložiště"</b>" telefonu, mj. i:\n\n"<li>"váš účet Google"</li>\n<li>"nastavení a data systému a aplikací"</li>\n<li>"stažené aplikace"</li></string>
     <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"Aktuálně jste přihlášeni k těmto účtům:\n"</string>
     <string name="master_clear_other_users_present" product="default" msgid="5161423070702470742">\n\n"V tomto zařízení jsou přítomni další uživatelé.\n"</string>
     <string name="master_clear_desc_also_erases_external" msgid="1903185203791274237"><li>"hudba"</li>\n<li>"fotky"</li>\n<li>"další uživatelské údaje"</li></string>
+    <string name="master_clear_desc_also_erases_esim" msgid="312352697653096008"><li>"Operátoři na eSIM kartě"</li></string>
+    <string name="master_clear_desc_no_cancel_mobile_plan" msgid="5460926449093211144">\n\n"Tímto krokem nebude zrušen mobilní tarif."</string>
     <string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="7744115866662613411">\n\n"Chcete-li smazat také hudbu, obrázky a další uživatelská data, je potřeba vymazat "<b>"úložiště USB"</b>"."</string>
     <string name="master_clear_desc_erase_external_storage" product="default" msgid="4801026652617377093">\n\n"Chcete-li smazat také hudbu, obrázky a další uživatelská data, je potřeba vymazat "<b>"kartu SD"</b>"."</string>
     <string name="erase_external_storage" product="nosdcard" msgid="969364037450286809">"Smazat úložiště USB"</string>
@@ -1489,15 +1493,16 @@
     <string name="settings_safetylegal_activity_title" msgid="6901214628496951727">"Bezpečnostní informace"</string>
     <string name="settings_safetylegal_activity_unreachable" msgid="250674109915859456">"Datové připojení momentálně není k dispozici. Chcete-li tyto informace zobrazit, přejděte z libovolného počítače připojeného k internetu na stránku %s."</string>
     <string name="settings_safetylegal_activity_loading" msgid="8059022597639516348">"Načítání..."</string>
-    <string name="lockpassword_choose_your_password_header" msgid="8624900666929394990">"Zvolte heslo"</string>
-    <string name="lockpassword_choose_your_password_header_for_fingerprint" msgid="6624409510609085450">"Otisk vyžaduje nastavení hesla"</string>
-    <string name="lockpassword_choose_your_pattern_header" msgid="6949761069941694050">"Vyberte gesto"</string>
-    <string name="lockpassword_choose_your_pattern_header_for_fingerprint" msgid="5901096361617543819">"Otisk vyžaduje nastavení gesta"</string>
-    <string name="lockpassword_choose_your_pin_header" msgid="7598849519816138302">"Zvolte kód PIN"</string>
-    <string name="lockpassword_choose_your_pin_header_for_fingerprint" msgid="765344692615917183">"Otisk vyžaduje nastavení PINu"</string>
-    <string name="lockpassword_confirm_your_password_header" msgid="6308478184889846633">"Potvrďte heslo"</string>
+    <string name="lockpassword_choose_your_screen_lock_header" msgid="3872462096767152394">"Nastavení zámku obrazovky"</string>
+    <string name="lockpassword_choose_your_password_message" msgid="1197569283524841412">"Z bezpečnostních důvodů nastavte heslo"</string>
+    <string name="lockpassword_choose_your_password_header_for_fingerprint" msgid="2541818487015343503">"Otisk vyžaduje nastavení hesla"</string>
+    <string name="lockpassword_choose_your_pattern_header_for_fingerprint" msgid="7709785406243556723">"Otisk vyžaduje nastavení gesta"</string>
+    <string name="lockpassword_choose_your_pin_message" msgid="1875420718677275646">"Z bezpečnostních důvodů nastavte PIN"</string>
+    <string name="lockpassword_choose_your_pin_header_for_fingerprint" msgid="1549639053195796674">"Otisk vyžaduje nastavení PINu"</string>
+    <string name="lockpassword_choose_your_pattern_message" msgid="5986983400689720015">"Z bezpečnostních důvodů nastavte gesto"</string>
+    <string name="lockpassword_confirm_your_password_header" msgid="1266027268220850931">"Znovu zadejte heslo"</string>
     <string name="lockpassword_confirm_your_pattern_header" msgid="7543433733032330821">"Potvrďte své gesto"</string>
-    <string name="lockpassword_confirm_your_pin_header" msgid="49038294648213197">"Potvrďte kód PIN"</string>
+    <string name="lockpassword_confirm_your_pin_header" msgid="7744513791910572550">"Znovu zadejte PIN"</string>
     <string name="lockpassword_confirm_passwords_dont_match" msgid="5140892109439191415">"Hesla nejsou shodná"</string>
     <string name="lockpassword_confirm_pins_dont_match" msgid="7226244811505606217">"Kódy PIN nejsou shodné"</string>
     <string name="lockpassword_choose_lock_generic_header" msgid="3811438094903786145">"Výběr odemknutí"</string>
@@ -1516,13 +1521,19 @@
     <string name="lockpassword_strong_auth_required_work_pattern" msgid="3003781907040522053">"Za účelem zvýšení zabezpečení použijte pracovní gesto"</string>
     <string name="lockpassword_strong_auth_required_work_pin" msgid="3367491332598821552">"Za účelem zvýšení zabezpečení zadejte pracovní PIN"</string>
     <string name="lockpassword_strong_auth_required_work_password" msgid="8159775129968582940">"Za účelem zvýšení zabezpečení zadejte pracovní heslo"</string>
+    <string name="lockpassword_confirm_your_pattern_details_frp" msgid="6757336656791723193">"Telefon byl obnoven do továrního nastavení. Chcete-li tento telefon použít, zadejte předchozí gesto."</string>
+    <string name="lockpassword_confirm_your_pin_details_frp" msgid="826520613445990470">"Telefon byl obnoven do továrního nastavení. Chcete-li tento telefon použít, zadejte předchozí PIN."</string>
+    <string name="lockpassword_confirm_your_password_details_frp" msgid="8944081074615739040">"Telefon byl obnoven do továrního nastavení. Chcete-li tento telefon použít, zadejte předchozí heslo."</string>
+    <string name="lockpassword_confirm_your_pattern_header_frp" msgid="2898036091609128286">"Ověřte gesto"</string>
+    <string name="lockpassword_confirm_your_pin_header_frp" msgid="4141601774778898803">"Ověřte PIN"</string>
+    <string name="lockpassword_confirm_your_password_header_frp" msgid="3762615419295360480">"Ověřte heslo"</string>
     <string name="lockpassword_invalid_pin" msgid="15588049067548470">"Nesprávný kód PIN"</string>
     <string name="lockpassword_invalid_password" msgid="4038507398784975200">"Nesprávné heslo"</string>
     <string name="lockpattern_need_to_unlock_wrong" msgid="1745247595356012176">"Nesprávné gesto"</string>
     <string name="lock_settings_title" msgid="4213839087748988686">"Zabezpečení zařízení"</string>
     <string name="lockpattern_change_lock_pattern_label" msgid="5679630792003440352">"Změna bezpečnostního gesta"</string>
     <string name="lockpattern_change_lock_pin_label" msgid="266707138486731661">"Změna bezpečnostního kódu PIN"</string>
-    <string name="lockpattern_recording_intro_header" msgid="308287052221942814">"Proveďte gesto odemknutí"</string>
+    <string name="lockpattern_recording_intro_header" msgid="308287052221942814">"Proveďte odemykací gesto"</string>
     <string name="lockpattern_recording_intro_footer" msgid="1118579101409152113">"Nápovědu zobrazíte stisknutím klávesy Menu."</string>
     <string name="lockpattern_recording_inprogress" msgid="6667844062721656773">"Na závěr zvedněte prst z obrazovky"</string>
     <string name="lockpattern_recording_incorrect_too_short" msgid="1348234155120957561">"Spojte alespoň <xliff:g id="NUMBER">%d</xliff:g> tečky. Zkuste to znovu."</string>
@@ -1558,19 +1569,18 @@
     <string name="lock_settings_profile_unified_summary" msgid="9008819078132993492">"Stejný jako zámek obrazovky zařízení"</string>
     <string name="manageapplications_settings_title" msgid="7041951105633616745">"Spravovat aplikace"</string>
     <string name="manageapplications_settings_summary" msgid="1794401500935451259">"Umožňuje spravovat a odebírat instalované aplikace"</string>
-    <string name="applications_settings" msgid="5281808652705396152">"Informace o aplikaci"</string>
+    <string name="applications_settings" msgid="5281808652705396152">"O aplikaci"</string>
     <string name="applications_settings_summary" msgid="6683465446264515367">"Správa aplikací a klávesových zkratek rychlého spuštění"</string>
     <string name="applications_settings_header" msgid="1014813055054356646">"Nastavení aplikace"</string>
     <string name="install_applications" msgid="4872012136210802181">"Neznámé zdroje"</string>
     <string name="install_applications_title" msgid="4987712352256508946">"Povolit všechny zdroje aplikací"</string>
     <string name="recent_app_category_title" msgid="6673071268966003928">"Nedávno otevřené aplikace"</string>
     <string name="see_all_apps_title" msgid="1317153498074308438">"Zobrazit všechny aplikace (<xliff:g id="COUNT">%1$d</xliff:g>)"</string>
-    <string name="recent_app_summary" msgid="3366446669844932300">"Před <xliff:g id="TIME">^1</xliff:g>"</string>
     <string name="install_all_warning" product="tablet" msgid="8310489909586138165">"Tablet a osobní údaje jsou zranitelnější vůči útoku ze strany neznámých aplikací. Instalací aplikací z tohoto zdroje vyjadřujete souhlas s tím, že nesete odpovědnost za případné poškození tabletu nebo ztrátu dat, které jejich používání může způsobit."</string>
     <string name="install_all_warning" product="default" msgid="1952257127370115988">"Telefon a osobní údaje jsou zranitelnější vůči útoku ze strany neznámých aplikací. Instalací aplikací z tohoto zdroje vyjadřujete souhlas s tím, že nesete odpovědnost za případné poškození telefonu nebo ztrátu dat, které jejich používání může způsobit."</string>
     <string name="advanced_settings" msgid="1777249286757067969">"Upřesnit nastavení"</string>
     <string name="advanced_settings_summary" msgid="4016682978071086747">"Povolit další možnosti nastavení"</string>
-    <string name="application_info_label" msgid="5736524913065714880">"Informace o aplikaci"</string>
+    <string name="application_info_label" msgid="5736524913065714880">"O aplikaci"</string>
     <string name="storage_label" msgid="8700867073480107253">"Úložiště"</string>
     <string name="auto_launch_label" msgid="2669236885531442195">"Otevírat ve výchozím nastavení"</string>
     <string name="auto_launch_label_generic" msgid="3230569852551968694">"Výchozí aplikace"</string>
@@ -1831,7 +1841,7 @@
     <string name="accessibility_settings_summary" msgid="981260486011624939">"Čtečky obrazovky, zobrazení, ovládací prvky interakce"</string>
     <string name="vision_settings_title" msgid="4204111425716868288">"Nastavení pro slabozraké"</string>
     <string name="vision_settings_description" msgid="5679491180156408260">"Toto zařízení můžete přizpůsobit svým potřebám. Funkce přístupnosti lze později změnit v Nastavení."</string>
-    <string name="vision_settings_suggestion_title" msgid="917294957154878441">"Zvětšit písmo"</string>
+    <string name="vision_settings_suggestion_title" msgid="8058794060304707004">"Změňte velikost písma"</string>
     <string name="screen_reader_category_title" msgid="7739154903913400641">"Čtečky obrazovky"</string>
     <string name="audio_and_captions_category_title" msgid="3420727114421447524">"Zvuk a text na obrazovce"</string>
     <string name="display_category_title" msgid="685461049938269166">"Zobrazení"</string>
@@ -1868,7 +1878,6 @@
     <string name="accessibility_display_inversion_preference_subtitle" msgid="7052959202195368109">"Toto nastavení může mít dopad na výkon"</string>
     <string name="accessibility_autoclick_preference_title" msgid="7014499339068449623">"Kliknutí po zastavení kurzoru"</string>
     <string name="accessibility_autoclick_delay_preference_title" msgid="3962261178385106006">"Prodleva před kliknutím"</string>
-    <string name="preference_summary_default_combination" msgid="8532964268242666060">"<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">"ZAPNUTO"</string>
     <string name="accessibility_summary_state_disabled" msgid="2241315620132005595">"VYPNUTO"</string>
     <string name="enable_quick_setting" msgid="2366999897816894536">"Zobrazit v rychlém nastavení"</string>
@@ -2001,12 +2010,14 @@
     <string name="background_activity_summary_on" msgid="649282072540085599">"Když aplikace není používána, může běžet na pozadí"</string>
     <string name="background_activity_summary_off" msgid="7666330699090632040">"Když aplikace není používána, je její aktivita na pozadí omezena"</string>
     <string name="background_activity_summary_disabled" msgid="3710669050484599847">"Aplikace nemá povoleno spouštění na pozadí"</string>
+    <string name="background_activity_summary_whitelisted" msgid="7375400051141016808">"U aplikace nelze optimalizovat využití baterie"</string>
+    <string name="background_activity_warning_dialog_title" msgid="2216249969149568871">"Omezit aktivitu na pozadí?"</string>
+    <string name="background_activity_warning_dialog_text" msgid="7049624449246121981">"Pokud u aplikace omezíte aktivitu na pozadí, může dojít k nepředvídatelnému chování"</string>
     <string name="device_screen_usage" msgid="3386088035570409683">"Využití obrazovky od úplného nabití"</string>
     <string name="device_screen_consumption" msgid="4607589286438986687">"Spotřeba obrazovky"</string>
     <string name="device_cellular_network" msgid="4724773411762382950">"Vyhledávání mobilních sítí"</string>
-    <string name="power_last_full_charge_summary" msgid="532845389094620657">"Před <xliff:g id="TIME">^1</xliff:g>"</string>
-    <string name="power_usage_list_summary" msgid="6775339745194635000">"Využití aplikací od úplného nabití (před <xliff:g id="TIME">^1</xliff:g>)"</string>
-    <string name="power_usage_list_summary_device" msgid="7036566616386864302">"Využití zařízení od posledního úplného nabití (před <xliff:g id="TIME">^1</xliff:g>)"</string>
+    <string name="power_usage_list_summary" msgid="6393929085382334341">"Využití aplikace od posledního úplného nabití (<xliff:g id="RELATIVE_TIME">^1</xliff:g>)"</string>
+    <string name="power_usage_list_summary_device" msgid="4461926045610455423">"Využití zařízení od posledního úplného nabití (<xliff:g id="RELATIVE_TIME">^1</xliff:g>)"</string>
     <string name="screen_usage_summary" msgid="6687403051423153550">"Doba, po kterou byla od úplného nabití zapnutá obrazovka"</string>
     <string name="device_usage_list_summary" msgid="5623036661468763251">"Využití zařízení od úplného nabití"</string>
     <string name="battery_since_unplugged" msgid="338073389740738437">"Využití baterie od odpojení"</string>
@@ -2092,7 +2103,7 @@
     <string name="usage_type_computed_power" msgid="5862792259009981479">"Vypočtená spotřeba energie"</string>
     <string name="usage_type_actual_power" msgid="7047814738685578335">"Skutečná spotřeba energie"</string>
     <string name="battery_action_stop" msgid="649958863744041872">"Vynutit ukončení"</string>
-    <string name="battery_action_app_details" msgid="7861051816778419018">"Informace o aplikaci"</string>
+    <string name="battery_action_app_details" msgid="7861051816778419018">"O aplikaci"</string>
     <string name="battery_action_app_settings" msgid="4570481408106287454">"Nastavení aplikace"</string>
     <string name="battery_action_display" msgid="7338551244519110831">"Nastavení obrazovky"</string>
     <string name="battery_action_wifi" msgid="8181553479021841207">"Nastavení Wi-Fi"</string>
@@ -2208,7 +2219,7 @@
     <string name="tts_spoken_language" msgid="5542499183472504027">"Mluvený jazyk"</string>
     <string name="tts_install_voices_title" msgid="8808823756936022641">"Instalace hlasů"</string>
     <string name="tts_install_voices_text" msgid="5292606786380069134">"Pokračujte do aplikace <xliff:g id="TTS_APP_NAME">%s</xliff:g> a nainstalujte hlasy"</string>
-    <string name="tts_install_voices_open" msgid="667467793360277465">"Otevřít aplikaci"</string>
+    <string name="tts_install_voices_open" msgid="667467793360277465">"Do aplikace"</string>
     <string name="tts_install_voices_cancel" msgid="4711492804851107459">"Zrušit"</string>
     <string name="tts_reset" msgid="2661752909256313270">"Obnovit"</string>
     <string name="tts_play" msgid="2628469503798633884">"Přehrát"</string>
@@ -2252,14 +2263,14 @@
     <string name="credentials_unlock_hint" msgid="2301301378040499348">"Zadejte heslo pro úložiště pověření."</string>
     <string name="credentials_old_password" msgid="7553393815538684028">"Aktuální heslo:"</string>
     <string name="credentials_reset_hint" msgid="6297256880896133631">"Odstranit veškerý obsah?"</string>
-    <string name="credentials_password_too_short" msgid="7502749986405522663">"Heslo musí mít alespoň 8 znaků."</string>
     <string name="credentials_wrong_password" msgid="2541932597104054807">"Nesprávné heslo."</string>
     <string name="credentials_reset_warning" msgid="5320653011511797600">"Nesprávné heslo. Zbývá vám jeden pokus, než bude úložiště pověření smazáno."</string>
     <string name="credentials_reset_warning_plural" msgid="6514085665301095279">"Nesprávné heslo. Počet zbývajících pokusů, než bude úložiště pověření smazáno: <xliff:g id="NUMBER">%1$d</xliff:g>"</string>
     <string name="credentials_erased" msgid="2907836028586342969">"Úložiště pověření je vymazáno."</string>
     <string name="credentials_not_erased" msgid="7685932772284216097">"Úložiště pověření nelze smazat."</string>
     <string name="credentials_enabled" msgid="7588607413349978930">"Úložiště pověření je aktivováno."</string>
-    <string name="credentials_configure_lock_screen_hint" msgid="6757119179588664966">"Před použitím úložiště pověření musíte nastavit kód PIN nebo heslo zámku obrazovky."</string>
+    <string name="credentials_configure_lock_screen_hint" msgid="8058230497337529036">"Abyste mohli použít úložiště pověření, v zařízení musí být bezpečný zámek obrazovky"</string>
+    <string name="credentials_configure_lock_screen_button" msgid="253239765216055321">"NASTAVIT ZÁMEK"</string>
     <string name="usage_access_title" msgid="332333405495457839">"Přístup k dat. o používání"</string>
     <string name="emergency_tone_title" msgid="1055954530111587114">"Tísňové vyzvánění"</string>
     <string name="emergency_tone_summary" msgid="722259232924572153">"Nastavit chování při tísňovém volání"</string>
@@ -2379,8 +2390,6 @@
     <skip />
     <string name="cant_sync_dialog_title" msgid="2777238588398046285">"Nelze ručně synchronizovat"</string>
     <string name="cant_sync_dialog_message" msgid="1938380442159016449">"Synchronizace této položky je aktuálně deaktivována. Chcete-li nastavení změnit, dočasně zapněte přenos dat na pozadí a automatickou synchronizaci."</string>
-    <string name="wimax_settings" msgid="2655139497028469039">"4G"</string>
-    <string name="status_wimax_mac_address" msgid="8390791848661413416">"Adresa MAC sítě 4G"</string>
     <string name="enter_password" msgid="8035706727471334122">"Chcete-li spustit Android, zadejte heslo"</string>
     <string name="enter_pin" msgid="5305333588093263790">"Chcete-li spustit Android, zadejte PIN"</string>
     <string name="enter_pattern" msgid="4187435713036808566">"Chcete-li spustit Android, nakreslete gesto"</string>
@@ -2394,11 +2403,12 @@
     <string name="misc_files_selected_count" msgid="4647048020823912088">"vybráno: <xliff:g id="NUMBER">%1$d</xliff:g> z <xliff:g id="TOTAL">%2$d</xliff:g>"</string>
     <string name="misc_files_selected_count_bytes" msgid="2876232009069114352">"<xliff:g id="NUMBER">%1$s</xliff:g> z <xliff:g id="TOTAL">%2$s</xliff:g>"</string>
     <string name="select_all" msgid="1562774643280376715">"Vybrat vše"</string>
+    <string name="data_plan_usage_manage_plans_button_text" msgid="8997761990902708162">"Spravovat tarify"</string>
     <string name="data_usage_summary_title" msgid="3804110657238092929">"Využití dat"</string>
     <string name="data_usage_app_summary_title" msgid="4147258989837459172">"Využití dat apl."</string>
     <string name="data_usage_accounting" msgid="7170028915873577387">"Účtování dat operátora se může lišit od údajů zařízení."</string>
     <string name="data_usage_app" msgid="4970478397515423303">"Využití aplikací"</string>
-    <string name="data_usage_app_info_label" msgid="3409931235687866706">"INFORMACE O APLIKACI"</string>
+    <string name="data_usage_app_info_label" msgid="3409931235687866706">"O APLIKACI"</string>
     <string name="data_usage_cellular_data" msgid="9168928285122125137">"Mobilní data"</string>
     <string name="data_usage_data_limit" msgid="1193930999713192703">"Zadejte limit dat"</string>
     <string name="data_usage_cycle" msgid="5652529796195787949">"Cyklus počítání dat"</string>
@@ -2479,6 +2489,9 @@
     <string name="data_usage_metered_mobile" msgid="5423305619126978393">"Mobilní sítě"</string>
     <string name="data_usage_metered_wifi" msgid="1761738002328299714">"Měřené sítě Wi-Fi"</string>
     <string name="data_usage_metered_wifi_disabled" msgid="727808462375941567">"Chcete-li vybrat měřené sítě, zapněte připojení Wi-Fi."</string>
+    <string name="data_usage_metered_auto" msgid="1262028400911918865">"Automaticky"</string>
+    <string name="data_usage_metered_yes" msgid="9217539611385225894">"Měřená"</string>
+    <string name="data_usage_metered_no" msgid="4025232961929071789">"Neměřená"</string>
     <string name="data_usage_disclaimer" msgid="6887858149980673444">"Účtování dat operátora se může lišit od údajů zařízení."</string>
     <string name="cryptkeeper_emergency_call" msgid="198578731586097145">"Tísňové volání"</string>
     <string name="cryptkeeper_return_to_call" msgid="5613717339452772491">"Zpět k hovoru"</string>
@@ -2570,9 +2583,6 @@
     <string name="backup_pw_set_button_text" msgid="2387480910044648795">"Nastavit heslo pro zálohy"</string>
     <string name="backup_pw_cancel_button_text" msgid="8845630125391744615">"Zrušit"</string>
     <string name="additional_system_update_settings_list_item_title" msgid="214987609894661992">"Další aktualizace systému"</string>
-    <string name="selinux_status_disabled" msgid="924551035552323327">"Zakázáno"</string>
-    <string name="selinux_status_permissive" msgid="6004965534713398778">"Mírné"</string>
-    <string name="selinux_status_enforcing" msgid="2252703756208463329">"Přísné"</string>
     <string name="ssl_ca_cert_warning" msgid="2045866713601984673">"Síť může být monitorována"</string>
     <string name="done_button" msgid="1991471253042622230">"Hotovo"</string>
     <plurals name="ssl_ca_cert_dialog_title" formatted="false" msgid="7145092748045794650">
@@ -2626,7 +2636,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">"Nyní ne"</string>
+    <string name="user_setup_button_setup_later" msgid="3068729597269172401">"Teď 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>
@@ -2667,7 +2677,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 dotykem telefonu"</string>
+    <string name="nfc_payment_settings_title" msgid="1807298287380821613">"Platby přiložením 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>
@@ -2676,14 +2686,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 dotykem telefonu:"</string>
+    <string name="nfc_payment_pay_with" msgid="7524904024378144072">"Aplikace pro platby přiložením 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ě 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="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="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>
@@ -2780,6 +2790,7 @@
       <item quantity="other">Zobrazit %d skrytých položek</item>
       <item quantity="one">Zobrazit %d skrytou položku</item>
     </plurals>
+    <string name="dashboard_suggestion_condition_footer_content_description" msgid="2898588191174845961">"Sbalit"</string>
     <string name="network_dashboard_title" msgid="4771589228992391573">"Síť a internet"</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>
@@ -2884,8 +2895,14 @@
       <item quantity="other">Je zapnuto <xliff:g id="ON_COUNT">%d</xliff:g> automatických pravidel</item>
       <item quantity="one">Je zapnuto 1 automatické pravidlo</item>
     </plurals>
-    <string name="zen_mode_settings_title" msgid="842308776768942600">"Nastavení režimu Nerušit"</string>
-    <string name="zen_mode_priority_settings_title" msgid="2623117023031824309">"Pouze prioritní"</string>
+    <string name="zen_mode_settings_title" msgid="1066226840983908121">"Nerušit"</string>
+    <string name="zen_mode_behavior_settings_title" msgid="1463303933529313969">"Chování"</string>
+    <string name="zen_mode_behavior_allow_title" msgid="3845615648136218141">"Povolit zvuky a vibrace pro"</string>
+    <string name="zen_mode_behavior_no_sound" msgid="1219626004723208056">"Žádné zvuky"</string>
+    <string name="zen_mode_behavior_total_silence" msgid="6716603819806610626">"Žádné zvuky (úplné ticho)"</string>
+    <string name="zen_mode_behavior_no_sound_except" msgid="4968477585788243114">"Žádné zvuky. Výjimka: <xliff:g id="CATEGORIES">%1$s</xliff:g>"</string>
+    <!-- no translation found for zen_mode_behavior_alarms_only (2423480992071472963) -->
+    <skip />
     <string name="zen_mode_automation_settings_title" msgid="4228995740594063774">"Automatická pravidla"</string>
     <string name="zen_mode_automation_suggestion_title" msgid="5105443455143476201">"Nast. pravidel režimu Nerušit"</string>
     <string name="zen_mode_automation_suggestion_summary" msgid="4732808039946935657">"Omezit zvuky a vibrace v určitou dobu"</string>
@@ -2911,7 +2928,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ími"</string>
+    <string name="notification_badging_title" msgid="5938709971403474078">"Povolit puntíky s oznámením"</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>
@@ -2927,13 +2944,15 @@
     <string name="notifications_title" msgid="8086372779371204971">"Oznámení"</string>
     <string name="app_notifications_title" msgid="5810577805218003760">"Oznámení"</string>
     <string name="notification_channel_title" msgid="2260666541030178452">"Kategorie oznámení"</string>
+    <string name="notification_group_title" msgid="7180506440133859601">"Skupina kategorií oznámení"</string>
     <string name="notification_importance_title" msgid="848692592679312666">"Důležitost"</string>
-    <string name="notification_importance_unspecified" msgid="2196023702875112081">"Ponechat rozhodnutí na aplikaci"</string>
+    <string name="notification_importance_unspecified" msgid="6622173510486113958">"Povolit zvuk"</string>
     <string name="notification_importance_blocked" msgid="7938180808339386300">"Oznámení nikdy nezobrazovat"</string>
     <string name="notification_importance_min" msgid="5455049524984686275">"Bez zvukového a vizuálního vyrušení"</string>
     <string name="notification_importance_low" msgid="8881468429453766553">"Bez zvuku"</string>
     <string name="notification_importance_default" msgid="5958338024601957516">"Vydat zvukový signál"</string>
     <string name="notification_importance_high" msgid="2082429479238228527">"Vydat zvukový signál a vyskočit na obrazovku"</string>
+    <string name="notification_importance_high_silent" msgid="2667033773703765252">"Vyskočit na obrazovce"</string>
     <string name="notification_importance_min_title" msgid="6974673091137544803">"Nízká"</string>
     <string name="notification_importance_low_title" msgid="8131254047772814309">"Střední"</string>
     <string name="notification_importance_default_title" msgid="9120383978536089489">"Vysoká"</string>
@@ -2978,8 +2997,15 @@
     <string name="loading_notification_apps" msgid="5031818677010335895">"Načítání aplikací..."</string>
     <string name="app_notifications_off_desc" msgid="4882445501376722969">"Oznámení této aplikace jsou v zařízení blokována systémem Android"</string>
     <string name="channel_notifications_off_desc" msgid="5899225298718840635">"Tato kategorie oznámení je v zařízení blokována systémem Android"</string>
+    <string name="channel_group_notifications_off_desc" msgid="1620950416247316370">"Tato skupina oznámení je v zařízení blokována systémem Android"</string>
     <string name="notification_channels" msgid="5346841743182627500">"Kategorie"</string>
     <string name="notification_channels_other" msgid="5645317113885788226">"Jiné"</string>
+    <plurals name="notification_group_summary" formatted="false" msgid="3420621520561455358">
+      <item quantity="few"><xliff:g id="COUNT_1">%d</xliff:g> kategorie</item>
+      <item quantity="many"><xliff:g id="COUNT_1">%d</xliff:g> kategorie</item>
+      <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> kategorií</item>
+      <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> kategorie</item>
+    </plurals>
     <string name="no_channels" msgid="3077375508177744586">"Tato aplikace neodeslala žádná oznámení"</string>
     <string name="app_settings_link" msgid="8894946007543660906">"Další nastavení v aplikaci"</string>
     <string name="app_notification_listing_summary_zero" msgid="6482582965081108108">"Zapnuto pro všechny aplikace"</string>
@@ -3060,12 +3086,14 @@
     <string name="zen_mode_from_starred" msgid="2678345811950997027">"Pouze od oblíbených kontaktů"</string>
     <string name="zen_mode_from_none" msgid="8219706639954614136">"Žádné"</string>
     <string name="zen_mode_alarms" msgid="2165302777886552926">"Budíky"</string>
+    <!-- no translation found for zen_mode_media_system_other (8900209390529859777) -->
+    <skip />
     <string name="zen_mode_reminders" msgid="5458502056440485730">"Připomenutí"</string>
     <string name="zen_mode_events" msgid="7914446030988618264">"Události"</string>
     <string name="zen_mode_all_callers" msgid="584186167367236922">"Všichni volající"</string>
     <string name="zen_mode_selected_callers" msgid="3127598874060615742">"Vybraní volající"</string>
     <string name="zen_mode_repeat_callers" msgid="5019521886428322131">"Volající, kteří volají opakovaně"</string>
-    <string name="zen_mode_repeat_callers_summary" msgid="7192713032364140137">"Pokud stejná osoba zavolá podruhé během <xliff:g id="MINUTES">%d</xliff:g> min, bude povolena"</string>
+    <string name="zen_mode_repeat_callers_summary" msgid="239685342222975733">"Pokud stejná osoba zavolá podruhé během <xliff:g id="MINUTES">%d</xliff:g> min"</string>
     <string name="zen_mode_when" msgid="2767193283311106373">"Automaticky zapnout"</string>
     <string name="zen_mode_when_never" msgid="8809494351918405602">"Nikdy"</string>
     <string name="zen_mode_when_every_night" msgid="3122486110091921009">"Každou noc"</string>
@@ -3098,6 +3126,7 @@
     <string name="zen_mode_screen_off_visual_interruptions" msgid="4850792880144382633">"Při vypnuté obrazovce"</string>
     <string name="zen_mode_no_visual_interruptions" msgid="8742776003822778472">"Při zapnuté i vypnuté obrazovce"</string>
     <string name="notification_app_settings_button" msgid="6685640230371477485">"Nastavení oznámení"</string>
+    <string name="suggestion_button_text" msgid="3275010948381252006">"OK"</string>
     <string name="device_feedback" msgid="3238056036766293294">"Odeslat zpětnou vazbu o tomto zařízení"</string>
     <string name="restr_pin_enter_admin_pin" msgid="1085834515677448072">"Zadejte PIN administrátora"</string>
     <string name="switch_on_text" msgid="1124106706920572386">"Zapnuto"</string>
@@ -3132,7 +3161,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">"Odkazy na otevření"</string>
+    <string name="app_launch_domain_links_title" msgid="1160925981363706090">"Otevírání odkazů"</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>
@@ -3182,7 +3211,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>
@@ -3194,7 +3223,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">"Odkazy na otevření"</string>
+    <string name="domain_urls_title" msgid="3132983644568821250">"Otevírání odkazů"</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>
@@ -3294,6 +3323,7 @@
     <string name="usb_summary_file_transfers" msgid="6435943692610175111">"Přenos souborů"</string>
     <string name="usb_summary_photo_transfers" msgid="8440204169576585250">"Přenos fotek (PTP)"</string>
     <string name="usb_summary_MIDI" msgid="5687906612187885908">"Použití zařízení jako MIDI"</string>
+    <string name="sms_mirroring_pref" msgid="6475043279147376031">"Zrcadlení SMS"</string>
     <string name="background_check_pref" msgid="7550258400138010979">"Kontrola pozadí"</string>
     <string name="background_check_title" msgid="4534254315824525593">"Úplný přístup k pozadí"</string>
     <string name="assist_access_context_title" msgid="2269032346698890257">"Použití textu z obrazovky"</string>
@@ -3362,7 +3392,7 @@
     <string name="write_settings_title" msgid="4232152481902542284">"Smí měnit nastavení systému"</string>
     <string name="write_system_settings" msgid="3482913590601096763">"Změny nastavení systému"</string>
     <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="permit_write_settings" msgid="658555006453212691">"Povolit úpravy 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>
@@ -3463,9 +3493,12 @@
     <string name="color_temperature" msgid="2070126836910615605">"Studené barvy"</string>
     <string name="color_temperature_desc" msgid="4793729830226404052">"Použijí se studenější barvy zobrazení"</string>
     <string name="color_temperature_toast" msgid="4974218172133854827">"Chcete-li změnu barev použít, vypněte obrazovku"</string>
-    <string name="telephony_monitor_toast" msgid="7003764250271195384">"Chcete-li použít změnu sledování telefonních služeb, restartujte zařízení"</string>
+    <string name="connectivity_monitor_switch" msgid="9059759348648583421">"Connectivity Monitor"</string>
+    <string name="connectivity_monitor_switch_summary" msgid="2828658652378866401">"Služba ConnectivityMonitor při problému s připojením vygeneruje protokoly a zobrazí uživateli oznámení s výzvou k nahlášení chyby"</string>
+    <string name="connectivity_monitor_toast" msgid="5551859612881173028">"Chcete-li použít změnu sledování připojení, restartujte zařízení"</string>
     <string name="camera_hal_hdrplus_switch" msgid="8377365197105267466">"Fotoaparát HAL HDR+"</string>
     <string name="camera_hal_hdrplus_toast" msgid="2063703797270055299">"Chcete-li použít změnu fotoaparátu HAL HDR+, restartujte zařízení"</string>
+    <string name="camera_laser_sensor_switch" msgid="8913588990743234440">"Laserový senzor fotoaparátu"</string>
     <string name="ota_disable_automatic_update" msgid="2319639631655915050">"Automatické aktualizace systému"</string>
     <string name="usage" msgid="2977875522080448986">"Využití"</string>
     <string name="cellular_data_usage" msgid="2155683719898158203">"Využití mobilních dat"</string>
@@ -3493,7 +3526,7 @@
     <string name="data_warning" msgid="209133958008062117">"Upozornění na data"</string>
     <string name="set_data_limit" msgid="2901526323210516923">"Nastavit limit dat"</string>
     <string name="data_limit" msgid="1885406964934590552">"Limit dat"</string>
-    <string name="data_usage_template" msgid="392191945602400904">"V období <xliff:g id="ID_2">%2$s</xliff:g> jste využili <xliff:g id="ID_1">%1$s</xliff:g> dat"</string>
+    <string name="data_usage_template" msgid="2923744765873163859">"<xliff:g id="ID_1">%1$s</xliff:g> využito v období <xliff:g id="ID_2">%2$s</xliff:g>"</string>
     <string name="configure" msgid="1029654422228677273">"Konfigurovat"</string>
     <string name="data_usage_other_apps" msgid="3272872663517382050">"Ostatní aplikace zahrnuté do využití"</string>
     <plurals name="data_saver_unrestricted_summary" formatted="false" msgid="2635267833484232703">
@@ -3566,7 +3599,7 @@
     <string name="button_confirm_convert_fbe" msgid="7101855374850373091">"Vymazat a aktivovat"</string>
     <string name="reset_shortcut_manager_throttling" msgid="6495066467198668994">"Resetovat limity četnosti služby ShortcutManager"</string>
     <string name="reset_shortcut_manager_throttling_complete" msgid="1826770872063707900">"Limity četnosti služby ShortcutManager byly resetovány"</string>
-    <string name="notification_suggestion_title" msgid="4506524937307816475">"Správa oznámení na obrazovce uzamčení"</string>
+    <string name="notification_suggestion_title" msgid="387052719462473500">"Nastavte informace na obrazovce uzamčení"</string>
     <string name="notification_suggestion_summary" msgid="8521159741445416875">"Zobrazit nebo skrýt obsah oznámení"</string>
     <string name="page_tab_title_summary" msgid="4070309266374993258">"Vše"</string>
     <string name="page_tab_title_support" msgid="8483187649355540109">"Podpora a tipy"</string>
@@ -3574,7 +3607,7 @@
     <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>
     <string name="premium_sms_access" msgid="4660047004791638305">"Přístup k prémiovým SMS"</string>
-    <string name="bluetooth_disabled" msgid="2456198532288640046">"Neviditelné ostatním zařízením"</string>
+    <string name="bluetooth_disabled" msgid="6244000672828617410">"Vypnuto"</string>
     <string name="bluetooth_connected_summary" msgid="7672528674593152862">"Připojeno k zařízení <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="bluetooth_connected_multiple_devices_summary" msgid="9173661896296663932">"Připojeno k několika zařízením"</string>
     <string name="demo_mode" msgid="2798762752209330277">"Ukázkový režim uživatelského rozhraní systému"</string>
@@ -3682,7 +3715,7 @@
     <string name="web_action_enable_title" msgid="4051513950976670853">"Okamžité aplikace"</string>
     <string name="web_action_enable_summary" msgid="3108127559723396382">"Otevírejte odkazy v aplikacích, i když je nemáte nainstalované"</string>
     <string name="web_action_section_title" msgid="7364647086538399136">"Okamžité aplikace"</string>
-    <string name="instant_apps_account" msgid="1433620209791992528">"Účet okamžitých aplikací"</string>
+    <string name="instant_apps_settings" msgid="8827777916518348213">"Předvolby okamžitých aplikací"</string>
     <string name="domain_url_section_title" msgid="7046835219056428883">"Nainstalované aplikace"</string>
     <string name="automatic_storage_manager_activation_warning" msgid="6353100011690933254">"Úložiště je nyní spravováno správcem úložiště."</string>
     <string name="account_for_section_header" msgid="5356566418548737121">"Účty uživatele <xliff:g id="USER_NAME">%1$s</xliff:g>"</string>
@@ -3733,7 +3766,9 @@
     <string name="enterprise_privacy_always_on_vpn_personal" msgid="9217774730260037434">"Trvalá síť VPN je zapnutá v osobním profilu"</string>
     <string name="enterprise_privacy_always_on_vpn_work" msgid="7244472958208315814">"Trvalá síť VPN je zapnutá v pracovním profilu"</string>
     <string name="enterprise_privacy_global_http_proxy" msgid="7936664553416257333">"Globální proxy server protokolu HTTP je nastaven"</string>
-    <string name="enterprise_privacy_ca_certs" msgid="5885892204903688909">"Důvěryhodná pověření"</string>
+    <string name="enterprise_privacy_ca_certs_device" msgid="2019652712782510262">"Důvěryhodné identifikační údaje"</string>
+    <string name="enterprise_privacy_ca_certs_personal" msgid="2279084820904076599">"Důvěryhodné identifikační údaje ve vašem osobním profilu"</string>
+    <string name="enterprise_privacy_ca_certs_work" msgid="6187377647815301809">"Důvěryhodné identifikační údaje ve vašem pracovním profilu"</string>
     <plurals name="enterprise_privacy_number_ca_certs" formatted="false" msgid="526375234629534165">
       <item quantity="few">Minimálně <xliff:g id="COUNT_1">%d</xliff:g> certifikáty CA</item>
       <item quantity="many">Minimálně <xliff:g id="COUNT_1">%d</xliff:g> certifikátu CA</item>
@@ -3806,6 +3841,8 @@
     <string name="carrier_provisioning" msgid="4398683675591893169">"Informace o zprovoznění služby u operátora"</string>
     <string name="trigger_carrier_provisioning" msgid="3434865918009286187">"Spustit zprovoznění služby u operátora"</string>
     <string name="new_device_suggestion_title" msgid="698847081680980774">"Co je nové a zajímavé?"</string>
-    <string name="new_device_suggestion_summary" msgid="7172709269203435870">"Vyzkoušejte 5 nejpopulárnějších funkcí"</string>
+    <string name="new_device_suggestion_summary" product="default" msgid="206396571522515855">"Prohlédněte si svůj nový telefon"</string>
+    <string name="new_device_suggestion_summary" product="tablet" msgid="393751455688210956">"Prohlédněte si svůj nový tablet"</string>
+    <string name="new_device_suggestion_summary" product="device" msgid="2939870049868336652">"Prohlédněte si své nové zařízení"</string>
     <string name="disabled_low_ram_device" msgid="3751578499721173344">"Funkce v tomto zařízení není k dispozici"</string>
 </resources>
diff --git a/res/values-da/arrays.xml b/res/values-da/arrays.xml
index c54b814..b08e02a 100644
--- a/res/values-da/arrays.xml
+++ b/res/values-da/arrays.xml
@@ -100,8 +100,6 @@
     <!-- no translation found for wifi_security_no_eap:0 (2084555984818107151) -->
     <!-- no translation found for wifi_security_no_eap:1 (397579322683471524) -->
     <!-- no translation found for wifi_security_no_eap:2 (1968820975358150484) -->
-    <!-- no translation found for wifi_ap_security:0 (5251664683198623324) -->
-    <!-- no translation found for wifi_ap_security:1 (7989073072260294673) -->
   <string-array name="wifi_eap_method">
     <item msgid="1160193392455075561">"PEAP"</item>
     <item msgid="7981731051382306293">"TLS"</item>
@@ -413,7 +411,7 @@
     <item msgid="758587126802411846">"Sort på hvidt"</item>
     <item msgid="1495307195241623402">"Gult på sort"</item>
     <item msgid="6039700130994371612">"Gult på blåt"</item>
-    <item msgid="7169235156349580064">"Brugerdefineret"</item>
+    <item msgid="7169235156349580064">"Tilpasset"</item>
   </string-array>
   <string-array name="vpn_types_long">
     <item msgid="2732002039459078847">"PPTP-VPN"</item>
diff --git a/res/values-da/strings.xml b/res/values-da/strings.xml
index 91e9150..d57cae7 100644
--- a/res/values-da/strings.xml
+++ b/res/values-da/strings.xml
@@ -166,7 +166,7 @@
     <string name="bluetooth_map_acceptance_dialog_text" msgid="8712508202081143737">"%1$s vil gerne have adgang til dine beskeder. Vil du give %2$s adgang?"</string>
     <string name="bluetooth_sap_request" msgid="2669762224045354417">"Anmodning om SIM-adgang"</string>
     <string name="bluetooth_sap_acceptance_dialog_text" msgid="4414253873553608690">"<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g> vil have adgang til dit SIM-kort. Hvis du giver adgang til SIM-kortet, deaktiveres dataforbindelsen på din enhed, så længe den anden enhed er forbundet. Giv adgang til <xliff:g id="DEVICE_NAME_1">%2$s?</xliff:g>"</string>
-    <string name="bluetooth_device_name_summary" msgid="4757990010751789977">"Vises som \"<xliff:g id="DEVICE_NAME">^1</xliff:g>\" på andre enheder"</string>
+    <string name="bluetooth_device_name_summary" msgid="522235742194965734">"Vises som \"<xliff:g id="DEVICE_NAME">^1</xliff:g>\" på andre enheder"</string>
     <string name="bluetooth_paired_device_title" msgid="8638994696317952019">"Dine enheder"</string>
     <string name="bluetooth_pairing_page_title" msgid="7712127387361962608">"Par ny enhed"</string>
     <string name="date_and_time" msgid="9062980487860757694">"Dato og klokkeslæt"</string>
@@ -312,6 +312,8 @@
     <string name="zone_auto" msgid="334783869352026648">"Automatisk tidszone"</string>
     <string name="zone_auto_summaryOn" msgid="6142830927278458314">"Brug netværkets tidszone"</string>
     <string name="zone_auto_summaryOff" msgid="2597745783162041390">"Brug netværkets tidszone"</string>
+    <string name="date_time_24hour_auto" msgid="2117383168985653422">"Automatisk 24-timers format"</string>
+    <string name="date_time_24hour_auto_summary" msgid="6351812925651480277">"Brug landestandard"</string>
     <string name="date_time_24hour_title" msgid="3203537578602803850">"24-timersformat"</string>
     <string name="date_time_24hour" msgid="1193032284921000063">"Brug 24-timers format"</string>
     <string name="date_time_set_time_title" msgid="6296795651349047016">"Klokkeslæt"</string>
@@ -372,6 +374,9 @@
     <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="1961957425135180242">"Næste"</string>
+    <string name="setup_fingerprint_enroll_skip_title" msgid="362050541117362034">"Vil du ikke konfigurere fingeraftryk nu?"</string>
+    <string name="setup_fingerprint_enroll_skip_after_adding_lock_text" msgid="958990414356204763">"Konfigurationen af fingeraftryk tager ikke mere end et minut eller to. Hvis du springer dette trin over, kan du tilføje dit fingeraftryk på et senere tidspunkt i indstillingerne."</string>
+    <string name="lock_screen_intro_skip_title" msgid="4988210105913705679">"Vil du springe skærmlås over?"</string>
     <string name="lock_screen_intro_skip_dialog_text_frp" product="tablet" msgid="1581834104051243425">"Funktionerne til enhedsbeskyttelse aktiveres ikke. Du vil ikke kunne forhindre andre i at bruge denne tablet, hvis du mister den, eller hvis den bliver stjålet eller nulstillet."</string>
     <string name="lock_screen_intro_skip_dialog_text_frp" product="device" msgid="4629503416877189572">"Funktionerne til enhedsbeskyttelse aktiveres ikke. Du vil ikke kunne forhindre andre i at bruge denne enhed, hvis du mister den, eller hvis den bliver stjålet eller nulstillet."</string>
     <string name="lock_screen_intro_skip_dialog_text_frp" product="default" msgid="2423428240245737909">"Funktionerne til enhedsbeskyttelse aktiveres ikke. Du vil ikke kunne forhindre andre i at bruge denne telefon, hvis du mister den, eller hvis den bliver stjålet eller nulstillet."</string>
@@ -381,7 +386,7 @@
     <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="3051496861358227199">"Tryk på sensoren"</string>
-    <string name="security_settings_fingerprint_enroll_find_sensor_message" msgid="8793966374365960368">"Den findes på bagsiden af telefonen. Brug pegefingeren."</string>
+    <string name="security_settings_fingerprint_enroll_find_sensor_message" msgid="8793966374365960368">"Den sidder på bagsiden af telefonen. Brug pegefingeren."</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_content_description" msgid="2058830032070449160">"Illustration med enhed og placering af sensor til registrering af fingeraftryk"</string>
     <string name="security_settings_fingerprint_enroll_dialog_name_label" msgid="7086763077909041106">"Navn"</string>
     <string name="security_settings_fingerprint_enroll_dialog_ok" msgid="4150384963879569750">"OK"</string>
@@ -457,7 +462,7 @@
     <string name="setup_lock_settings_picker_title" product="tablet" msgid="90329443364067215">"Beskyt din tablet"</string>
     <string name="setup_lock_settings_picker_title" product="device" msgid="2399952075134938929">"Beskyt din enhed"</string>
     <string name="setup_lock_settings_picker_title" product="default" msgid="1572244299605153324">"Beskyt din telefon"</string>
-    <string name="setup_lock_settings_picker_fingerprint_message" msgid="5585650064305600578">"Konfigurer en alternativ metode til skærmlåsning for at opnå ekstra sikkerhed."</string>
+    <string name="lock_settings_picker_fingerprint_added_security_message" msgid="5768002109707648463">"Konfigurer en alternativ metode til skærmlåsning for at opnå større sikkerhed."</string>
     <string name="setup_lock_settings_picker_message" product="tablet" msgid="8919671129189936210">"Du kan forhindre andre i at bruge denne tablet uden din tilladelse ved at aktivere funktionerne til enhedsbeskyttelse. Vælg den skærmlås, du vil bruge."</string>
     <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>
@@ -588,6 +593,7 @@
     <string name="lockpassword_pin_no_sequential_digits" msgid="680765285206990584">"Stigende eller faldende talsekvens og gentagne tal er ikke tilladt"</string>
     <string name="lockpassword_ok_label" msgid="313822574062553672">"OK"</string>
     <string name="lockpassword_cancel_label" msgid="8818529276331121899">"Annuller"</string>
+    <string name="lockpassword_clear_label" msgid="5724429464960458155">"Ryd"</string>
     <string name="lockpattern_tutorial_cancel_label" msgid="6431583477570493261">"Annuller"</string>
     <string name="lockpattern_tutorial_continue_label" msgid="3559793618653400434">"Næste"</string>
     <string name="lock_setup" msgid="3355847066343753943">"Konfigurationen er fuldført."</string>
@@ -781,6 +787,7 @@
     <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>
@@ -817,6 +824,8 @@
     <string name="wifi_wps_available_first_item" msgid="4422547079984583502">"WPS er tilgængelig"</string>
     <string name="wifi_wps_available_second_item" msgid="8427520131718215301">" (WPS er tilgængelig)"</string>
     <string name="wifi_wps_nfc_enter_password" msgid="2288214226916117159">"Indtast adgangskoden til dit netværk"</string>
+    <string name="wifi_carrier_connect" msgid="8174696557882299911">"Wi-Fi-netværk for mobilselskab"</string>
+    <string name="wifi_carrier_content" msgid="4634077285415851933">"Opret forbindelse via <xliff:g id="NAME">%1%s</xliff:g>"</string>
     <string name="wifi_scan_always_turnon_message" msgid="203123538572122989">"For bl.a. at kunne angive en mere nøjagtig placering vil <xliff:g id="APP_NAME">%1$s</xliff:g> gerne aktivere netværkssøgning, selv når Wi-Fi er deaktiveret.\n\nVil du tillade dette for alle apps, der gerne vil søge?"</string>
     <string name="wifi_scan_always_turnoff_message" msgid="5538901671131941043">"Gå til Avanceret i prikmenuen for at slå denne funktion fra."</string>
     <string name="wifi_scan_always_confirm_allow" msgid="5355973075896817232">"Tillad"</string>
@@ -834,6 +843,7 @@
     <string name="wifi_connect" msgid="1076622875777072845">"Forbind"</string>
     <string name="wifi_failed_connect_message" msgid="8491902558970292871">"Der kunne ikke oprettes forbindelse til netværket"</string>
     <string name="wifi_forget" msgid="8168174695608386644">"Glem"</string>
+    <string name="wifi_modify" msgid="6100248070440710782">"Rediger"</string>
     <string name="wifi_failed_forget_message" msgid="1348172929201654986">"Netværket kunne ikke glemmes"</string>
     <string name="wifi_save" msgid="3331121567988522826">"Gem"</string>
     <string name="wifi_failed_save_message" msgid="6650004874143815692">"Netværk kunne ikke gemmes"</string>
@@ -846,6 +856,7 @@
     <string name="wifi_advanced_titlebar" msgid="4485841401774142908">"Avanceret 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_title" msgid="3471132676909349382">"Oplysninger om netværket"</string>
     <string name="wifi_details_subnet_mask" msgid="6720279144174924410">"Undernetmaske"</string>
     <string name="wifi_details_dns" msgid="8648826607751830768">"DNS"</string>
     <string name="wifi_details_ipv6_address_header" msgid="6734119149106422148">"IPv6-adresser"</string>
@@ -878,16 +889,15 @@
     <string name="wifi_p2p_cancel_connect_title" msgid="255267538099324413">"Vil du annullere invitationen?"</string>
     <string name="wifi_p2p_cancel_connect_message" msgid="7477756213423749402">"Vil du annullere invitationen til at oprette forbindelse med <xliff:g id="PEER_NAME">%1$s</xliff:g>?"</string>
     <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_off_subtext" msgid="5466126533609394170">"Deler ikke internet eller indhold med andre enheder"</string>
     <string name="wifi_hotspot_tethering_on_subtext" product="tablet" msgid="5752490509369962007">"Deler denne tablets internetforbindelse via hotspot"</string>
     <string name="wifi_hotspot_tethering_on_subtext" product="default" msgid="6461075246164300670">"Deler telefonens internetforbindelse via hotspot"</string>
     <string name="wifi_hotspot_on_local_only_subtext" msgid="2068110388011294735">"Appen deler indhold. Hvis du vil dele internetforbindelsen, skal du deaktivere hotspot og derefter aktivere det"</string>
-    <string name="wifi_hotspot_name_title" msgid="1341735529132128887">"Wi-Fi-navn"</string>
+    <string name="wifi_hotspot_name_title" msgid="8237000746618636778">"Navn på hotspot"</string>
     <string name="wifi_hotspot_name_summary_connecting" msgid="3378299995508671967">"Aktiverer <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>..."</string>
     <string name="wifi_hotspot_name_summary_connected" msgid="3888672084861445362">"Andre enheder kan oprette forbindelse til <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>"</string>
-    <string name="wifi_hotspot_password_title" msgid="1955592302902091281">"Wi-Fi-adgangskode"</string>
+    <string name="wifi_hotspot_password_title" msgid="8676859981917573801">"Adgangskode til hotspot"</string>
     <string name="wifi_hotspot_ap_band_title" msgid="1165801173359290681">"AP-bånd"</string>
     <string name="wifi_hotspot_footer_info_regular" msgid="1203489406068036455">"Brug hotspot til at oprette et Wi-Fi-netværk til dine andre enheder. Hotspot leverer internet via din mobildataforbindelse. Yderligere mobildatagebyrer kan forekomme."</string>
     <string name="wifi_hotspot_footer_info_local_only" msgid="857988412470694109">"Apps kan oprette et hotspot for at dele indhold med enheder i nærheden."</string>
@@ -898,7 +908,6 @@
     <string name="wifi_tether_configure_ap_text" msgid="7974681394041609308">"Konfiguration af Wi-Fi-hotspot"</string>
     <string name="wifi_hotspot_configure_ap_text" msgid="5478614731464220432">"Konfiguration af Wi-Fi-hotspot"</string>
     <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">"Opkald via Wi-Fi"</string>
     <string name="wifi_calling_suggestion_title" msgid="9008010480466359578">"Slå Wi-Fi-opkald til"</string>
@@ -939,7 +948,7 @@
     <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="emergency_address_summary" msgid="3266760199681945746">"Den adresse, der af nødtjenester anvendes som din placering, hvis du foretager et nødopkald via Wi-Fi"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"Skærm"</string>
     <string name="sound_settings" msgid="5534671337768745343">"Lyd"</string>
     <string name="all_volume_title" msgid="4296957391257836961">"Lydstyrke"</string>
@@ -993,6 +1002,7 @@
     <string name="search_settings" msgid="1910951467596035063">"Søg"</string>
     <string name="search_settings_summary" msgid="9205656546570654169">"Administrer søgeindstillinger og -historik"</string>
     <string name="search_settings_no_results" msgid="8799027492641230999">"Ingen resultater"</string>
+    <string name="search_clear_history" msgid="4196658962573162457">"Ryd historik"</string>
     <string name="display_settings" msgid="7965901687241669598">"Skærm"</string>
     <string name="accelerometer_title" msgid="7854608399547349157">"Roter skærm automatisk"</string>
     <string name="color_mode_title" msgid="3159275920408338215">"Levende farver"</string>
@@ -1049,7 +1059,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 dockingstationen"</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_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>
@@ -1062,10 +1072,10 @@
     <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="ambient_display_screen_title" msgid="4252755516328775766">"Inaktiv skærm"</string>
+    <string name="ambient_display_screen_title" msgid="4252755516328775766">"Aktiv låseskærm"</string>
     <string name="ambient_display_screen_summary_always_on" msgid="7337555569694794132">"Altid aktiveret/øget batteriforbrug"</string>
     <string name="ambient_display_screen_summary_notifications" msgid="1449570742600868654">"Nye underretninger"</string>
-    <string name="ambient_display_category_triggers" msgid="4359289754456268573">"Hvornår skal det vises"</string>
+    <string name="ambient_display_category_triggers" msgid="4359289754456268573">"Hvornår skal den vises"</string>
     <string name="doze_title" msgid="2375510714460456687">"Nye underretninger"</string>
     <string name="doze_summary" msgid="3846219936142814032">"Væk skærmen, når du modtager underretninger"</string>
     <string name="doze_always_on_title" msgid="1046222370442629646">"Altid aktiveret"</string>
@@ -1121,8 +1131,7 @@
     <string name="fcc_equipment_id" msgid="149114368246356737">"Udstyrs-id"</string>
     <string name="baseband_version" msgid="1848990160763524801">"Basebandversion"</string>
     <string name="kernel_version" msgid="9192574954196167602">"Kernesystem"</string>
-    <string name="build_number" msgid="3075795840572241758">"Versionnummer"</string>
-    <string name="selinux_status" msgid="6212165375172061672">"SELinux-status"</string>
+    <string name="build_number" msgid="3075795840572241758">"Buildnummer"</string>
     <string name="device_info_not_available" msgid="8062521887156825182">"Ikke tilgængelig"</string>
     <string name="device_status_activity_title" msgid="1411201799384697904">"Status"</string>
     <string name="device_status" msgid="607405385799807324">"Status"</string>
@@ -1150,7 +1159,6 @@
     <string name="status_wifi_mac_address" msgid="2202206684020765378">"MAC-adresse for Wi-Fi"</string>
     <string name="status_bt_address" msgid="4195174192087439720">"Bluetooth-adresse"</string>
     <string name="status_serial_number" msgid="2257111183374628137">"Serienummer"</string>
-    <string name="status_unavailable" msgid="7862009036663793314">"Utilgængelig"</string>
     <string name="status_up_time" msgid="7294859476816760399">"Oppetid"</string>
     <string name="status_awake_time" msgid="2393949909051183652">"Aktivtid"</string>
     <string name="internal_memory" msgid="9129595691484260784">"Intern lagerplads"</string>
@@ -1326,6 +1334,7 @@
     <string name="menu_restore" msgid="8260067415075573273">"Nulstil til standard"</string>
     <string name="restore_default_apn_completed" msgid="2824775307377604897">"Standardindstillingerne for adgangspunktet er nulstillet."</string>
     <string name="reset_dashboard_title" msgid="6254873816990678620">"Nulstil valg"</string>
+    <string name="reset_dashboard_summary" msgid="4851012632493522755">"Netværk, apps eller enheden kan nulstilles"</string>
     <string name="reset_network_title" msgid="6166025966016873843">"Nulstil Wi-Fi, mobil og Bluetooth"</string>
     <string name="reset_network_desc" msgid="5547979398298881406">"Denne handling nulstiller alle netværksindstillinger, bl.a.:\n\n"<li>"Wi‑Fi"</li>\n<li>"Mobildata"</li>\n<li>"Bluetooth"</li></string>
     <string name="reset_network_button_text" msgid="2035676527471089853">"Nulstil indstillinger"</string>
@@ -1334,17 +1343,14 @@
     <string name="reset_network_confirm_title" msgid="1759888886976962773">"Vil du nulstille?"</string>
     <string name="network_reset_not_available" msgid="7188610385577164676">"Gendannelse af netværk er ikke tilgængeligt for denne bruger"</string>
     <string name="reset_network_complete_toast" msgid="787829973559541880">"Netværksindstillingerne er blevet nulstillet"</string>
-    <string name="master_clear_title" msgid="6617679904229218425">"Ryd alle data (gendan fabriksindstillingerne)"</string>
-    <plurals name="master_clear_with_account_summary" formatted="false" msgid="5911377203778818712">
-      <item quantity="one"><xliff:g id="ACCOUNT_COUNT">%1$d</xliff:g> konto nulstilles</item>
-      <item quantity="other"><xliff:g id="ACCOUNT_COUNT">%1$d</xliff:g> konti nulstilles</item>
-    </plurals>
-    <string name="master_clear_summary" msgid="6902443944660426951">"Intern lagerplads og alle data nulstilles"</string>
+    <string name="master_clear_title" msgid="3531267871084279512">"Ryd alle data (gendan fabriksindstillinger)"</string>
     <string name="master_clear_desc" product="tablet" msgid="9146059417023157222">"Dette sletter alle data fra tablettens "<b>"interne lagerplads"</b>", f.eks.: \n\n"<li>"din Google-konto"</li>\n<li>"data og indstillinger for system og applikationer"</li>\n<li>"downloadede applikationer"</li></string>
     <string name="master_clear_desc" product="default" msgid="4800386183314202571">"Dette sletter alle data fra telefonens "<b>"interne lagerplads"</b>", f.eks.: \n\n"<li>"din Google-konto"</li>\n<li>"data og indstillinger for system og apps"</li>\n<li>"downloadede apps"</li></string>
     <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"Du er i øjeblikket logget ind på disse konti:\n"</string>
     <string name="master_clear_other_users_present" product="default" msgid="5161423070702470742">\n\n"Der er andre brugere til stede på denne enhed.\n"</string>
     <string name="master_clear_desc_also_erases_external" msgid="1903185203791274237"><li>"Musik"</li>\n<li>"Billeder"</li>\n<li>"Andre brugerdata"</li></string>
+    <string name="master_clear_desc_also_erases_esim" msgid="312352697653096008"><li>"Mobilselskaber på eSIM"</li></string>
+    <string name="master_clear_desc_no_cancel_mobile_plan" msgid="5460926449093211144">\n\n"Dette vil ikke automatisk opsige dit mobilabonnement."</string>
     <string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="7744115866662613411">\n\n"Ryd musik, billeder og andre brugerdata ved at formatere "<b>"USB-lager"</b>"."</string>
     <string name="master_clear_desc_erase_external_storage" product="default" msgid="4801026652617377093">\n\n"Hvis du vil rydde musik, billeder og andre brugerdata, skal du formatere "<b>"SD-kortet"</b>"."</string>
     <string name="erase_external_storage" product="nosdcard" msgid="969364037450286809">"Slet USB-lager"</string>
@@ -1461,15 +1467,16 @@
     <string name="settings_safetylegal_activity_title" msgid="6901214628496951727">"Sikkerhedsoplysninger"</string>
     <string name="settings_safetylegal_activity_unreachable" msgid="250674109915859456">"Du har ingen dataforbindelse. Se disse oplysninger nu ved at gå til %s på en computer, der har forbindelse til internettet."</string>
     <string name="settings_safetylegal_activity_loading" msgid="8059022597639516348">"Indlæser..."</string>
-    <string name="lockpassword_choose_your_password_header" msgid="8624900666929394990">"Vælg din adgangskode"</string>
-    <string name="lockpassword_choose_your_password_header_for_fingerprint" msgid="6624409510609085450">"Angiv adgangskode for at bruge fingeraftryk"</string>
-    <string name="lockpassword_choose_your_pattern_header" msgid="6949761069941694050">"Vælg dit mønster"</string>
-    <string name="lockpassword_choose_your_pattern_header_for_fingerprint" msgid="5901096361617543819">"Angiv mønster for at bruge fingeraftryk"</string>
-    <string name="lockpassword_choose_your_pin_header" msgid="7598849519816138302">"Vælg din pinkode"</string>
-    <string name="lockpassword_choose_your_pin_header_for_fingerprint" msgid="765344692615917183">"Angiv pinkode for at bruge fingeraftryk"</string>
-    <string name="lockpassword_confirm_your_password_header" msgid="6308478184889846633">"Bekræft din adgangskode"</string>
+    <string name="lockpassword_choose_your_screen_lock_header" msgid="3872462096767152394">"Konfigurer en skærmlås"</string>
+    <string name="lockpassword_choose_your_password_message" msgid="1197569283524841412">"Konfigurer en adgangskode af hensyn til sikkerheden"</string>
+    <string name="lockpassword_choose_your_password_header_for_fingerprint" msgid="2541818487015343503">"Angiv alternativ metode til fingeraftryk"</string>
+    <string name="lockpassword_choose_your_pattern_header_for_fingerprint" msgid="7709785406243556723">"Angiv alternativ metode til fingeraftryk"</string>
+    <string name="lockpassword_choose_your_pin_message" msgid="1875420718677275646">"Konfigurer en pinkode af hensyn til sikkerheden"</string>
+    <string name="lockpassword_choose_your_pin_header_for_fingerprint" msgid="1549639053195796674">"Angiv pinkode for at bruge fingeraftryk"</string>
+    <string name="lockpassword_choose_your_pattern_message" msgid="5986983400689720015">"Angiv et mønster af hensyn til sikkerheden"</string>
+    <string name="lockpassword_confirm_your_password_header" msgid="1266027268220850931">"Angiv din adgangskode igen"</string>
     <string name="lockpassword_confirm_your_pattern_header" msgid="7543433733032330821">"Bekræft dit mønster"</string>
-    <string name="lockpassword_confirm_your_pin_header" msgid="49038294648213197">"Bekræft din pinkode"</string>
+    <string name="lockpassword_confirm_your_pin_header" msgid="7744513791910572550">"Angiv din pinkode igen"</string>
     <string name="lockpassword_confirm_passwords_dont_match" msgid="5140892109439191415">"Adgangskoderne matcher ikke"</string>
     <string name="lockpassword_confirm_pins_dont_match" msgid="7226244811505606217">"Pinkoderne matcher ikke"</string>
     <string name="lockpassword_choose_lock_generic_header" msgid="3811438094903786145">"Vælg oplåsningsmetode"</string>
@@ -1488,6 +1495,12 @@
     <string name="lockpassword_strong_auth_required_work_pattern" msgid="3003781907040522053">"Brug mønsteret til din arbejdsprofil for at opnå øget sikkerhed"</string>
     <string name="lockpassword_strong_auth_required_work_pin" msgid="3367491332598821552">"Angiv pinkoden til din arbejdsprofil for at opnå øget sikkerhed"</string>
     <string name="lockpassword_strong_auth_required_work_password" msgid="8159775129968582940">"Angiv adgangskoden til din arbejdsprofil for at opnå øget sikkerhed"</string>
+    <string name="lockpassword_confirm_your_pattern_details_frp" msgid="6757336656791723193">"Telefonens fabriksindstillinger blev gendannet. Angiv dit tidligere mønster for at bruge telefonen."</string>
+    <string name="lockpassword_confirm_your_pin_details_frp" msgid="826520613445990470">"Telefonens fabriksindstillinger blev gendannet. Angiv din tidligere pinkode for at bruge telefonen."</string>
+    <string name="lockpassword_confirm_your_password_details_frp" msgid="8944081074615739040">"Telefonens fabriksindstillinger blev gendannet. Angiv din tidligere adgangskode for at bruge telefonen."</string>
+    <string name="lockpassword_confirm_your_pattern_header_frp" msgid="2898036091609128286">"Bekræft mønster"</string>
+    <string name="lockpassword_confirm_your_pin_header_frp" msgid="4141601774778898803">"Bekræft pinkode"</string>
+    <string name="lockpassword_confirm_your_password_header_frp" msgid="3762615419295360480">"Bekræft adgangskode"</string>
     <string name="lockpassword_invalid_pin" msgid="15588049067548470">"Forkert pinkode"</string>
     <string name="lockpassword_invalid_password" msgid="4038507398784975200">"Forkert adgangskode"</string>
     <string name="lockpattern_need_to_unlock_wrong" msgid="1745247595356012176">"Forkert mønster"</string>
@@ -1537,12 +1550,11 @@
     <string name="install_applications_title" msgid="4987712352256508946">"Tillad alle appkilder"</string>
     <string name="recent_app_category_title" msgid="6673071268966003928">"Senest åbnede apps"</string>
     <string name="see_all_apps_title" msgid="1317153498074308438">"Se alle <xliff:g id="COUNT">%1$d</xliff:g> apps"</string>
-    <string name="recent_app_summary" msgid="3366446669844932300">"For <xliff:g id="TIME">^1</xliff:g> siden"</string>
     <string name="install_all_warning" product="tablet" msgid="8310489909586138165">"Din tablet og dine personlige data er mere sårbare over for angreb fra ukendte apps. Når du installerer apps fra denne kilde, accepterer du, at du er ansvarlig for skader på din tablet eller tab af data, der kan skyldes brug af disse apps."</string>
     <string name="install_all_warning" product="default" msgid="1952257127370115988">"Din telefon og dine personlige data er mere sårbare over for angreb fra ukendte apps. Når du installerer apps fra denne kilde, accepterer du, at du er ansvarlig for skader på din telefon eller tab af data, der kan skyldes brug af disse apps."</string>
     <string name="advanced_settings" msgid="1777249286757067969">"Avancerede indstillinger"</string>
     <string name="advanced_settings_summary" msgid="4016682978071086747">"Aktivér flere indstillinger"</string>
-    <string name="application_info_label" msgid="5736524913065714880">"Oplysninger om appen"</string>
+    <string name="application_info_label" msgid="5736524913065714880">"Appinfo"</string>
     <string name="storage_label" msgid="8700867073480107253">"Lagerplads"</string>
     <string name="auto_launch_label" msgid="2669236885531442195">"Åbn som standard"</string>
     <string name="auto_launch_label_generic" msgid="3230569852551968694">"Standard"</string>
@@ -1801,7 +1813,7 @@
     <string name="accessibility_settings_summary" msgid="981260486011624939">"Skærmlæsere, visning, kontrolelementer til interaktion"</string>
     <string name="vision_settings_title" msgid="4204111425716868288">"Synsindstillinger"</string>
     <string name="vision_settings_description" msgid="5679491180156408260">"Du kan tilpasse denne enhed, så den passer til dine behov. Disse hjælpefunktioner kan ændres senere under Indstillinger."</string>
-    <string name="vision_settings_suggestion_title" msgid="917294957154878441">"Forøg skriftstørrelse"</string>
+    <string name="vision_settings_suggestion_title" msgid="8058794060304707004">"Skift skriftstørrelse"</string>
     <string name="screen_reader_category_title" msgid="7739154903913400641">"Skærmlæsere"</string>
     <string name="audio_and_captions_category_title" msgid="3420727114421447524">"Lyd og tekst på skærmen"</string>
     <string name="display_category_title" msgid="685461049938269166">"Skærm"</string>
@@ -1838,7 +1850,6 @@
     <string name="accessibility_display_inversion_preference_subtitle" msgid="7052959202195368109">"Kan påvirke ydeevnen"</string>
     <string name="accessibility_autoclick_preference_title" msgid="7014499339068449623">"Klik, efter markøren er stoppet"</string>
     <string name="accessibility_autoclick_delay_preference_title" msgid="3962261178385106006">"Forsinkelse forud for klik"</string>
-    <string name="preference_summary_default_combination" msgid="8532964268242666060">"<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">"TIL"</string>
     <string name="accessibility_summary_state_disabled" msgid="2241315620132005595">"FRA"</string>
     <string name="enable_quick_setting" msgid="2366999897816894536">"Vis i Hurtige indstillinger"</string>
@@ -1957,12 +1968,14 @@
     <string name="background_activity_summary_on" msgid="649282072540085599">"Appen må køre i baggrunden, når den ikke er i brug"</string>
     <string name="background_activity_summary_off" msgid="7666330699090632040">"Appens baggrundsaktivitet er begrænset, når den ikke er i brug"</string>
     <string name="background_activity_summary_disabled" msgid="3710669050484599847">"Appen har ikke tilladelse til at køre i baggrunden"</string>
+    <string name="background_activity_summary_whitelisted" msgid="7375400051141016808">"Appen kan ikke optimeres med hensyn til batteriforbrug"</string>
+    <string name="background_activity_warning_dialog_title" msgid="2216249969149568871">"Vil du begrænse baggrundsaktiviteten?"</string>
+    <string name="background_activity_warning_dialog_text" msgid="7049624449246121981">"Hvis du begrænser en apps baggrundsaktivitet, kan det medføre, at den ikke fungerer korrekt"</string>
     <string name="device_screen_usage" msgid="3386088035570409683">"Brug af skærmen siden fuld opladning"</string>
     <string name="device_screen_consumption" msgid="4607589286438986687">"Skærmens strømforbrug"</string>
     <string name="device_cellular_network" msgid="4724773411762382950">"Scanning af mobilnetværk"</string>
-    <string name="power_last_full_charge_summary" msgid="532845389094620657">"For <xliff:g id="TIME">^1</xliff:g> siden"</string>
-    <string name="power_usage_list_summary" msgid="6775339745194635000">"Appforbrug siden fuld opladning (for <xliff:g id="TIME">^1</xliff:g> siden)"</string>
-    <string name="power_usage_list_summary_device" msgid="7036566616386864302">"Brug af enheden siden fuld opladning (for <xliff:g id="TIME">^1</xliff:g> siden)"</string>
+    <string name="power_usage_list_summary" msgid="6393929085382334341">"Appforbrug siden fuld opladning (<xliff:g id="RELATIVE_TIME">^1</xliff:g>)"</string>
+    <string name="power_usage_list_summary_device" msgid="4461926045610455423">"Brug af enheden siden fuld opladning (<xliff:g id="RELATIVE_TIME">^1</xliff:g>)"</string>
     <string name="screen_usage_summary" msgid="6687403051423153550">"Hvor lang tid skærmen har været tændt siden fuld opladning"</string>
     <string name="device_usage_list_summary" msgid="5623036661468763251">"Brug af enheden siden fuld opladning"</string>
     <string name="battery_since_unplugged" msgid="338073389740738437">"Batteriforbrug siden afbrydelse"</string>
@@ -2048,7 +2061,7 @@
     <string name="usage_type_computed_power" msgid="5862792259009981479">"Beregnet strømforbrug"</string>
     <string name="usage_type_actual_power" msgid="7047814738685578335">"Registreret strømforbrug"</string>
     <string name="battery_action_stop" msgid="649958863744041872">"Tving til at standse"</string>
-    <string name="battery_action_app_details" msgid="7861051816778419018">"Oplysninger om appen"</string>
+    <string name="battery_action_app_details" msgid="7861051816778419018">"Appinfo"</string>
     <string name="battery_action_app_settings" msgid="4570481408106287454">"Indstillinger for app"</string>
     <string name="battery_action_display" msgid="7338551244519110831">"Indstillinger for skærm"</string>
     <string name="battery_action_wifi" msgid="8181553479021841207">"Indstillinger for Wi-Fi"</string>
@@ -2083,7 +2096,7 @@
     <string name="battery_overall_usage" msgid="2093409063297375436">"<xliff:g id="PERCENT">%1$s</xliff:g> af det samlede batteriforbrug"</string>
     <string name="battery_detail_since_full_charge" msgid="7515347842046955855">"Siden sidste fulde opladning"</string>
     <string name="battery_last_full_charge" msgid="7151251641099019361">"Sidste fulde opladning"</string>
-    <string name="battery_footer_summary" msgid="67169726550144016">"Data om batteriforbrug er omtrentlig og kan ændre sig afhængigt af brug"</string>
+    <string name="battery_footer_summary" msgid="67169726550144016">"Data om batteriforbrug er omtrentlige og kan ændre sig afhængigt af brug"</string>
     <string name="battery_detail_foreground" msgid="3350401514602032183">"Under aktiv brug"</string>
     <string name="battery_detail_background" msgid="1929644393553768999">"Mens den kører i baggrunden"</string>
     <string name="battery_detail_power_usage" msgid="6485766868610469101">"Batteriforbrug"</string>
@@ -2208,19 +2221,19 @@
     <string name="credentials_unlock_hint" msgid="2301301378040499348">"Skriv adgangskoden til lager for loginoplysninger."</string>
     <string name="credentials_old_password" msgid="7553393815538684028">"Nuværende adgangskode:"</string>
     <string name="credentials_reset_hint" msgid="6297256880896133631">"Vil du fjerne alt indhold?"</string>
-    <string name="credentials_password_too_short" msgid="7502749986405522663">"Adgangskoden skal indeholde mindst 8 tegn."</string>
     <string name="credentials_wrong_password" msgid="2541932597104054807">"Ugyldig adgangskode."</string>
     <string name="credentials_reset_warning" msgid="5320653011511797600">"Forkert adgangskode. Du har ét forsøg mere, inden lageret for loginoplysninger slettes."</string>
     <string name="credentials_reset_warning_plural" msgid="6514085665301095279">"Forkert adgangskode. Du har <xliff:g id="NUMBER">%1$d</xliff:g> forsøg mere, inden lageret for loginoplysninger slettes."</string>
     <string name="credentials_erased" msgid="2907836028586342969">"Lager for loginoplysninger er slettet."</string>
     <string name="credentials_not_erased" msgid="7685932772284216097">"Loginlageret kan ikke ryddes."</string>
     <string name="credentials_enabled" msgid="7588607413349978930">"Lager for loginoplysninger er aktiveret."</string>
-    <string name="credentials_configure_lock_screen_hint" msgid="6757119179588664966">"Du skal angive en pinkode eller adgangskode til skærmlåsen, før du kan bruge lageret til loginoplysninger."</string>
+    <string name="credentials_configure_lock_screen_hint" msgid="8058230497337529036">"Din enhed skal have en sikker låseskærm, før du kan bruge lageret til loginoplysninger"</string>
+    <string name="credentials_configure_lock_screen_button" msgid="253239765216055321">"KONFIGURER LÅSESKÆRM"</string>
     <string name="usage_access_title" msgid="332333405495457839">"Apps med adgang til forbrug"</string>
     <string name="emergency_tone_title" msgid="1055954530111587114">"Nødtone"</string>
     <string name="emergency_tone_summary" msgid="722259232924572153">"Angiv adfærd ved nødopkald"</string>
-    <string name="privacy_settings_title" msgid="2978878794187459190">"Sikkerhedskopiering"</string>
-    <string name="backup_section_title" msgid="7952232291452882740">"Sikkerhedskopiering og gendannelse"</string>
+    <string name="privacy_settings_title" msgid="2978878794187459190">"Backup"</string>
+    <string name="backup_section_title" msgid="7952232291452882740">"Backup og gendannelse"</string>
     <string name="personal_data_section_title" msgid="7815209034443782061">"Personlige oplysninger"</string>
     <string name="backup_data_title" msgid="1239105919852668016">"Sikkerhedskopiér data"</string>
     <string name="backup_data_summary" msgid="708773323451655666">"Sikkerhedskopiér appdata, Wi-Fi-adgangskoder og andre indstillinger på Googles servere"</string>
@@ -2228,7 +2241,7 @@
     <string name="include_app_data_title" msgid="2829970132260278394">"Inkluder appdata"</string>
     <string name="auto_restore_title" msgid="5397528966329126506">"Automatisk gendannelse"</string>
     <string name="auto_restore_summary" msgid="4235615056371993807">"Ved geninstallation af en app gendannes sikkerhedskopierede indstillinger og data"</string>
-    <string name="backup_inactive_title" msgid="685838037986644604">"Tjenesten til sikkerhedskopiering er deaktiveret"</string>
+    <string name="backup_inactive_title" msgid="685838037986644604">"Backuptjenesten er deaktiveret"</string>
     <string name="backup_configure_account_default_summary" msgid="2436933224764745553">"Der er ingen konto, der i øjeblikket lagrer sikkerhedskopierede data"</string>
     <string name="backup_erase_dialog_title" msgid="1027640829482174106"></string>
     <string name="backup_erase_dialog_message" msgid="5221011285568343155">"Vil du stoppe sikkerhedskopieringen af dine Wi-Fi-adgangskoder, bogmærker, andre indstillinger og appdata samt slette alle kopier på Googles servere?"</string>
@@ -2309,7 +2322,7 @@
     <string name="sync_error" msgid="5060969083117872149">"Synkroniseringsfejl"</string>
     <string name="last_synced" msgid="4242919465367022234">"Sidst synkroniseret <xliff:g id="LAST_SYNC_TIME">%1$s</xliff:g>"</string>
     <string name="sync_in_progress" msgid="5151314196536070569">"Synkroniserer nu…"</string>
-    <string name="settings_backup" msgid="2274732978260797031">"Indstillinger for sikkerhedskopiering"</string>
+    <string name="settings_backup" msgid="2274732978260797031">"Indstillinger for backup"</string>
     <string name="settings_backup_summary" msgid="7916877705938054035">"Sikkerhedskopier mine indstillinger"</string>
     <string name="sync_menu_sync_now" msgid="6154608350395805683">"Synkroniser nu"</string>
     <string name="sync_menu_sync_cancel" msgid="8292379009626966949">"Annuller synkronisering"</string>
@@ -2335,8 +2348,6 @@
     <skip />
     <string name="cant_sync_dialog_title" msgid="2777238588398046285">"Der kan ikke synkroniseres manuelt"</string>
     <string name="cant_sync_dialog_message" msgid="1938380442159016449">"Synkronisering af dette element er deaktiveret lige nu. Hvis du vil ændre indstillingen, skal du aktivere baggrundsdata og automatisk synkronisering midlertidigt."</string>
-    <string name="wimax_settings" msgid="2655139497028469039">"4G"</string>
-    <string name="status_wimax_mac_address" msgid="8390791848661413416">"4G MAC-adresse"</string>
     <string name="enter_password" msgid="8035706727471334122">"Start Android ved at indtaste din adgangskode"</string>
     <string name="enter_pin" msgid="5305333588093263790">"Start Android ved at indtaste din pinkode"</string>
     <string name="enter_pattern" msgid="4187435713036808566">"Start Android ved at tegne dit mønster"</string>
@@ -2350,11 +2361,12 @@
     <string name="misc_files_selected_count" msgid="4647048020823912088">"<xliff:g id="NUMBER">%1$d</xliff:g> valgte ud af <xliff:g id="TOTAL">%2$d</xliff:g>"</string>
     <string name="misc_files_selected_count_bytes" msgid="2876232009069114352">"<xliff:g id="NUMBER">%1$s</xliff:g> ud af <xliff:g id="TOTAL">%2$s</xliff:g>"</string>
     <string name="select_all" msgid="1562774643280376715">"Markér alle"</string>
+    <string name="data_plan_usage_manage_plans_button_text" msgid="8997761990902708162">"Administrer dataabonnement"</string>
     <string name="data_usage_summary_title" msgid="3804110657238092929">"Dataforbrug"</string>
     <string name="data_usage_app_summary_title" msgid="4147258989837459172">"Appens dataforbrug"</string>
     <string name="data_usage_accounting" msgid="7170028915873577387">"Mobilselskabets dataopgørelse kan variere afhængigt af din enhed."</string>
     <string name="data_usage_app" msgid="4970478397515423303">"Appforbrug"</string>
-    <string name="data_usage_app_info_label" msgid="3409931235687866706">"OPLYSNINGER OM APPEN"</string>
+    <string name="data_usage_app_info_label" msgid="3409931235687866706">"APPINFO"</string>
     <string name="data_usage_cellular_data" msgid="9168928285122125137">"Mobildata"</string>
     <string name="data_usage_data_limit" msgid="1193930999713192703">"Angiv datagrænse"</string>
     <string name="data_usage_cycle" msgid="5652529796195787949">"Cyklus for dataforbrug"</string>
@@ -2435,6 +2447,9 @@
     <string name="data_usage_metered_mobile" msgid="5423305619126978393">"Mobilnetværk"</string>
     <string name="data_usage_metered_wifi" msgid="1761738002328299714">"Forbrugsbaserede Wi-Fi-netværk"</string>
     <string name="data_usage_metered_wifi_disabled" msgid="727808462375941567">"Hvis du vil vælge forbrugsbaserede netværk, skal du slå Wi-Fi til."</string>
+    <string name="data_usage_metered_auto" msgid="1262028400911918865">"Automatisk"</string>
+    <string name="data_usage_metered_yes" msgid="9217539611385225894">"Forbrugsafregnet"</string>
+    <string name="data_usage_metered_no" msgid="4025232961929071789">"Ubegrænset brug til en fast pris"</string>
     <string name="data_usage_disclaimer" msgid="6887858149980673444">"Mobilselskabets dataopgørelse kan variere afhængigt af din enhed."</string>
     <string name="cryptkeeper_emergency_call" msgid="198578731586097145">"Nødopkald"</string>
     <string name="cryptkeeper_return_to_call" msgid="5613717339452772491">"Tilbage til opkald"</string>
@@ -2520,15 +2535,12 @@
     <string name="user_credential_removed" msgid="6514189495799401838">"Fjernede loginoplysninger: <xliff:g id="CREDENTIAL_NAME">%s</xliff:g>"</string>
     <string name="user_credential_none_installed" msgid="3729607560420971841">"Der er ikke installeret nogen brugerloginoplysninger"</string>
     <string name="spellcheckers_settings_title" msgid="399981228588011501">"Stavekontrol"</string>
-    <string name="current_backup_pw_prompt" msgid="7735254412051914576">"Angiv din aktuelle adgangskode til fuldstændig sikkerhedskopiering:"</string>
-    <string name="new_backup_pw_prompt" msgid="8755501377391998428">"Angiv din nye adgangskode til fuldstændig sikkerhedskopiering:"</string>
-    <string name="confirm_new_backup_pw_prompt" msgid="3238728882512787864">"Gentag din nye adgangskode til fuldstændig sikkerhedskopiering:"</string>
+    <string name="current_backup_pw_prompt" msgid="7735254412051914576">"Angiv din aktuelle adgangskode til fuldstændig backup:"</string>
+    <string name="new_backup_pw_prompt" msgid="8755501377391998428">"Angiv din nye adgangskode til fuldstændig backup:"</string>
+    <string name="confirm_new_backup_pw_prompt" msgid="3238728882512787864">"Gentag din nye adgangskode til fuldstændig backup:"</string>
     <string name="backup_pw_set_button_text" msgid="2387480910044648795">"Angiv adgangskode til sikkerhedskopi"</string>
     <string name="backup_pw_cancel_button_text" msgid="8845630125391744615">"Annuller"</string>
     <string name="additional_system_update_settings_list_item_title" msgid="214987609894661992">"Yderligere systemopdateringer"</string>
-    <string name="selinux_status_disabled" msgid="924551035552323327">"Deaktiveret"</string>
-    <string name="selinux_status_permissive" msgid="6004965534713398778">"Eftergivende"</string>
-    <string name="selinux_status_enforcing" msgid="2252703756208463329">"Håndhæver"</string>
     <string name="ssl_ca_cert_warning" msgid="2045866713601984673">"Netværket kan være overvåget"</string>
     <string name="done_button" msgid="1991471253042622230">"Luk"</string>
     <plurals name="ssl_ca_cert_dialog_title" formatted="false" msgid="7145092748045794650">
@@ -2726,6 +2738,7 @@
       <item quantity="one">Vis %d skjult element</item>
       <item quantity="other">Vis %d skjulte elementer</item>
     </plurals>
+    <string name="dashboard_suggestion_condition_footer_content_description" msgid="2898588191174845961">"Skjul"</string>
     <string name="network_dashboard_title" msgid="4771589228992391573">"Netværk og internet"</string>
     <string name="network_dashboard_summary_mobile" msgid="3851083934739500429">"mobilnetværk"</string>
     <string name="network_dashboard_summary_data_usage" msgid="3843261364705042212">"dataforbrug"</string>
@@ -2760,7 +2773,7 @@
     <string name="keywords_text_to_speech_output" msgid="5150660047085754699">"hastighed, sprog, standard, tale, indtaling, tts, hjælpefunktion, skærmlæser, blind"</string>
     <string name="keywords_date_and_time" msgid="758325881602648204">"ur, militærtid"</string>
     <string name="keywords_network_reset" msgid="6024276007080940820">"nulstil, gendan, fabriksdata"</string>
-    <string name="keywords_factory_data_reset" msgid="5894970373671252165">"slet, slet, gendan, ryd, fjern"</string>
+    <string name="keywords_factory_data_reset" msgid="5894970373671252165">"ryd, slet, gendan, rens, fjern"</string>
     <string name="keywords_printing" msgid="1701778563617114846">"printer"</string>
     <string name="keywords_sounds" msgid="7146245090127541167">"højttalerbip"</string>
     <string name="keywords_sounds_and_notifications_interruptions" msgid="5426093074031208917">"forstyr ikke, afbryd, afbrydelse, pause"</string>
@@ -2799,7 +2812,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">"Medielydstyrke"</string>
+    <string name="media_volume_option_title" msgid="2811531786073003825">"Lydstyrke for medier"</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>
@@ -2811,8 +2824,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">"Lyde for skærmlås"</string>
-    <string name="charging_sounds_title" msgid="1132272552057504251">"Opladningslyde"</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="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>
@@ -2828,8 +2841,14 @@
       <item quantity="one"><xliff:g id="ON_COUNT">%d</xliff:g> automatisk regel er slået til</item>
       <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">"Prioritet tillader kun"</string>
+    <string name="zen_mode_settings_title" msgid="1066226840983908121">"Forstyr ikke"</string>
+    <string name="zen_mode_behavior_settings_title" msgid="1463303933529313969">"Adfærd"</string>
+    <string name="zen_mode_behavior_allow_title" msgid="3845615648136218141">"Tillad lyde og vibrationer fra"</string>
+    <string name="zen_mode_behavior_no_sound" msgid="1219626004723208056">"Ingen lyd"</string>
+    <string name="zen_mode_behavior_total_silence" msgid="6716603819806610626">"Ingen lyd (total stilhed)"</string>
+    <string name="zen_mode_behavior_no_sound_except" msgid="4968477585788243114">"Ingen lyd undtagen fra <xliff:g id="CATEGORIES">%1$s</xliff:g>"</string>
+    <!-- no translation found for zen_mode_behavior_alarms_only (2423480992071472963) -->
+    <skip />
     <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>
@@ -2871,13 +2890,15 @@
     <string name="notifications_title" msgid="8086372779371204971">"Underretninger"</string>
     <string name="app_notifications_title" msgid="5810577805218003760">"Appunderretninger"</string>
     <string name="notification_channel_title" msgid="2260666541030178452">"Underretningskategori"</string>
+    <string name="notification_group_title" msgid="7180506440133859601">"Kategorigruppe for underretninger"</string>
     <string name="notification_importance_title" msgid="848692592679312666">"Vigtighed"</string>
-    <string name="notification_importance_unspecified" msgid="2196023702875112081">"Lad appen bestemme"</string>
+    <string name="notification_importance_unspecified" msgid="6622173510486113958">"Tillad lyd"</string>
     <string name="notification_importance_blocked" msgid="7938180808339386300">"Vis aldrig underretninger"</string>
     <string name="notification_importance_min" msgid="5455049524984686275">"Ingen lyd eller pop op-visning"</string>
     <string name="notification_importance_low" msgid="8881468429453766553">"Ingen lyd"</string>
     <string name="notification_importance_default" msgid="5958338024601957516">"Med lyd"</string>
     <string name="notification_importance_high" msgid="2082429479238228527">"Med lyd og pop op-visning"</string>
+    <string name="notification_importance_high_silent" msgid="2667033773703765252">"Pop op-visning"</string>
     <string name="notification_importance_min_title" msgid="6974673091137544803">"Lav"</string>
     <string name="notification_importance_low_title" msgid="8131254047772814309">"Middel"</string>
     <string name="notification_importance_default_title" msgid="9120383978536089489">"Høj"</string>
@@ -2898,7 +2919,7 @@
     </plurals>
     <string name="no_notification_listeners" msgid="3487091564454192821">"Ingen installerede apps har anmodet om adgang til underretninger."</string>
     <string name="notification_listener_security_warning_title" msgid="5522924135145843279">"Tillad adgang til underretninger for <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
-    <string name="notification_listener_security_warning_summary" msgid="119203147791040151">"<xliff:g id="NOTIFICATION_LISTENER_NAME">%1$s</xliff:g> kan læse alle underretninger, herunder personlige oplysninger såsom navne på kontaktpersoner og teksten i de meddelelser, du modtager. Underretningslytteren kan også afvise underretninger eller udløse handlingsknapper, de indeholder. \n\nDette gør det også muligt for appen at slå Forstyr ikke til eller fra og ændre relaterede indstillinger."</string>
+    <string name="notification_listener_security_warning_summary" msgid="119203147791040151">"<xliff:g id="NOTIFICATION_LISTENER_NAME">%1$s</xliff:g> kan læse alle underretninger, herunder personlige oplysninger såsom navne på kontaktpersoner og teksten i de meddelelser, du modtager. Underretningslytteren kan også afvise underretninger eller aktivere handlingsknapper, de indeholder. \n\nDette gør det også muligt for appen at slå Forstyr ikke til eller fra og ændre relaterede indstillinger."</string>
     <string name="notification_listener_disable_warning_summary" msgid="6738915379642948000">"Hvis du slår adgang til underretninger fra for <xliff:g id="NOTIFICATION_LISTENER_NAME">%1$s</xliff:g>, slås adgangen til Forstyr ikke muligvis også fra."</string>
     <string name="notification_listener_disable_warning_confirm" msgid="8333442186428083057">"Slå fra"</string>
     <string name="notification_listener_disable_warning_cancel" msgid="8586417377104211584">"Annuller"</string>
@@ -2920,8 +2941,13 @@
     <string name="loading_notification_apps" msgid="5031818677010335895">"Indlæser apps..."</string>
     <string name="app_notifications_off_desc" msgid="4882445501376722969">"Android blokerer underretninger for denne app, så de ikke vises på enheden"</string>
     <string name="channel_notifications_off_desc" msgid="5899225298718840635">"Android blokerer underretninger i denne kategori, så de ikke vises på enheden"</string>
+    <string name="channel_group_notifications_off_desc" msgid="1620950416247316370">"Android blokerer underretninger i denne gruppe, så de ikke vises på enheden"</string>
     <string name="notification_channels" msgid="5346841743182627500">"Kategorier"</string>
     <string name="notification_channels_other" msgid="5645317113885788226">"Andre"</string>
+    <plurals name="notification_group_summary" formatted="false" msgid="3420621520561455358">
+      <item quantity="one"><xliff:g id="COUNT_1">%d</xliff:g> kategori</item>
+      <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> kategorier</item>
+    </plurals>
     <string name="no_channels" msgid="3077375508177744586">"Denne app har ikke sendt nogen underretninger"</string>
     <string name="app_settings_link" msgid="8894946007543660906">"Yderligere indstillinger i appen"</string>
     <string name="app_notification_listing_summary_zero" msgid="6482582965081108108">"Aktiveret for alle apps"</string>
@@ -2942,7 +2968,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 slået til med angivelsen 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 konfigureret som 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>
@@ -2969,8 +2995,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 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_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_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>
@@ -2998,12 +3024,14 @@
     <string name="zen_mode_from_starred" msgid="2678345811950997027">"Kun fra stjernemarkerede kontaktpersoner"</string>
     <string name="zen_mode_from_none" msgid="8219706639954614136">"Ingen"</string>
     <string name="zen_mode_alarms" msgid="2165302777886552926">"Alarmer"</string>
+    <!-- no translation found for zen_mode_media_system_other (8900209390529859777) -->
+    <skip />
     <string name="zen_mode_reminders" msgid="5458502056440485730">"Påmindelser"</string>
     <string name="zen_mode_events" msgid="7914446030988618264">"Begivenheder"</string>
     <string name="zen_mode_all_callers" msgid="584186167367236922">"Alle opkaldere"</string>
     <string name="zen_mode_selected_callers" msgid="3127598874060615742">"Udvalgte opkald"</string>
     <string name="zen_mode_repeat_callers" msgid="5019521886428322131">"Gentagne opkald"</string>
-    <string name="zen_mode_repeat_callers_summary" msgid="7192713032364140137">"Tillad, hvis den samme person ringer to gange inden for <xliff:g id="MINUTES">%d</xliff:g> minutter"</string>
+    <string name="zen_mode_repeat_callers_summary" msgid="239685342222975733">"Hvis den samme person ringer for anden gang inden for <xliff:g id="MINUTES">%d</xliff:g> minutter"</string>
     <string name="zen_mode_when" msgid="2767193283311106373">"Aktivér automatisk"</string>
     <string name="zen_mode_when_never" msgid="8809494351918405602">"Aldrig"</string>
     <string name="zen_mode_when_every_night" msgid="3122486110091921009">"Hver nat"</string>
@@ -3032,6 +3060,7 @@
     <string name="zen_mode_screen_off_visual_interruptions" msgid="4850792880144382633">"Når skærmen er slukket"</string>
     <string name="zen_mode_no_visual_interruptions" msgid="8742776003822778472">"Når skærmen er tændt eller slukket"</string>
     <string name="notification_app_settings_button" msgid="6685640230371477485">"Indstillinger for underretninger"</string>
+    <string name="suggestion_button_text" msgid="3275010948381252006">"OK"</string>
     <string name="device_feedback" msgid="3238056036766293294">"Send feedback om denne enhed"</string>
     <string name="restr_pin_enter_admin_pin" msgid="1085834515677448072">"Indtast administratorpinkoden"</string>
     <string name="switch_on_text" msgid="1124106706920572386">"Til"</string>
@@ -3047,11 +3076,11 @@
     <string name="experimental_preference" msgid="7083015446690681376">"(Eksperimentel)"</string>
     <string name="encryption_interstitial_header" msgid="468015813904595613">"Sikker opstart"</string>
     <string name="encryption_continue_button" msgid="1121880322636992402">"Fortsæt"</string>
-    <string name="encryption_interstitial_message_pin" msgid="2317181134653424679">"Du kan beskytte denne enhed yderligere ved at kræve, at din pinkode skal angives, før enheden kan starte op. Før enheden er startet op, kan den ikke modtage opkald, meddelelser eller underretninger, herunder alarmer. \n\nDette hjælper med at beskytte data på enheder, du har mistet, eller som er blevet stjålet. Vil du kræve, at der skal angives en pinkode, før enheden kan starte op?"</string>
-    <string name="encryption_interstitial_message_pattern" msgid="7081249914068568570">"Du kan beskytte denne enhed yderligere ved at kræve, at dit mønster skal angives, før enheden kan starte op. Før enheden er startet op, kan den ikke modtage opkald, meddelelser eller underretninger, herunder alarmer. \n\nDette hjælper med at beskytte data på enheder, du har mistet, eller som er blevet stjålet. Vil du kræve, at der skal angives et mønster, før enheden kan starte op?"</string>
+    <string name="encryption_interstitial_message_pin" msgid="2317181134653424679">"Du kan beskytte denne enhed yderligere ved at kræve, at din pinkode skal angives, før enheden kan starte op. Før enheden er startet op, kan den ikke modtage opkald, beskeder eller underretninger, herunder alarmer. \n\nDette hjælper med at beskytte data på enheder, du har mistet, eller som er blevet stjålet. Vil du kræve, at der skal angives en pinkode, før enheden kan starte op?"</string>
+    <string name="encryption_interstitial_message_pattern" msgid="7081249914068568570">"Du kan beskytte denne enhed yderligere ved at kræve, at dit mønster skal angives, før enheden kan starte op. Før enheden er startet op, kan den ikke modtage opkald, beskeder eller underretninger, herunder alarmer. \n\nDette hjælper med at beskytte data på enheder, du har mistet, eller som er blevet stjålet. Vil du kræve, at der skal angives et mønster, før enheden kan starte op?"</string>
     <string name="encryption_interstitial_message_password" msgid="7796567133897436443">"Du kan beskytte denne enhed yderligere ved at kræve, at din adgangskode skal angives, før enheden kan starte op. Før enheden er startet op, kan den ikke modtage opkald, meddelelser eller underretninger, herunder alarmer. \n\nDette er med til at beskytte data på enheder, du har mistet, eller som er blevet stjålet. Vil du kræve, at der skal angives en adgangskode, før din enhed kan starte op?"</string>
-    <string name="encryption_interstitial_message_pin_for_fingerprint" msgid="4550632760119547492">"Ud over at låse din enhed op ved hjælp af dit fingeraftryk kan du beskytte din enhed yderligere ved at kræve, at din pinkode skal angives, før enheden kan starte op. Før enheden er startet op, kan den ikke modtage opkald, meddelelser eller underretninger, herunder alarmer.\n\nDette er med til at beskytte data på enheder, du har mistet, eller som er blevet stjålet. Vil du kræve, at der skal angives en pinkode, før din enhed kan starte op?"</string>
-    <string name="encryption_interstitial_message_pattern_for_fingerprint" msgid="932184823193006087">"Ud over at låse din enhed op ved hjælp af dit fingeraftryk kan du beskytte din enhed yderligere ved at kræve, at dit mønster skal angives, før enheden kan starte op. Før enheden er startet op, kan den ikke modtage opkald, meddelelser eller underretninger, herunder alarmer.\n\nDette er med til at beskytte data på enheder, du har mistet, eller som er blevet stjålet. Vil du kræve, at der skal angives et mønster, før din enhed kan starte op?"</string>
+    <string name="encryption_interstitial_message_pin_for_fingerprint" msgid="4550632760119547492">"Ud over at låse din enhed op ved hjælp af dit fingeraftryk kan du beskytte din enhed yderligere ved at kræve, at din pinkode skal angives, før enheden kan starte op. Før enheden er startet op, kan den ikke modtage opkald, beskeder eller underretninger, herunder alarmer.\n\nDette er med til at beskytte data på enheder, du har mistet, eller som er blevet stjålet. Vil du kræve, at der skal angives en pinkode, før din enhed kan starte op?"</string>
+    <string name="encryption_interstitial_message_pattern_for_fingerprint" msgid="932184823193006087">"Ud over at låse din enhed op ved hjælp af dit fingeraftryk kan du beskytte din enhed yderligere ved at kræve, at dit mønster skal angives, før enheden kan starte op. Før enheden er startet op, kan den ikke modtage opkald, beskeder eller underretninger, herunder alarmer.\n\nDette er med til at beskytte data på enheder, du har mistet, eller som er blevet stjålet. Vil du kræve, at der skal angives et mønster, før din enhed kan starte op?"</string>
     <string name="encryption_interstitial_message_password_for_fingerprint" msgid="5560954719370251702">"Ud over at kræve fingeraftryk til oplåsning kan du beskytte din enhed yderligere ved at kræve, at din adgangskode angives før opstart. Enheden kan ikke modtage opkald, beskeder eller underretninger, herunder alarmer, før den er startet op.\n\nDette er med til at beskytte data på enheder, du har mistet, eller som er blevet stjålet. Vil du kræve, at der skal angives en adgangskode, før din enhed kan starte op?"</string>
     <string name="encryption_interstitial_yes" msgid="4439509435889513411">"Ja"</string>
     <string name="encryption_interstitial_no" msgid="8935031349097025137">"Nej"</string>
@@ -3199,16 +3228,16 @@
     <string name="sharing_remote_bugreport_dialog_message" msgid="5859287696666024466">"Denne fejlrapport deles med din it-administrator. Kontakt vedkommende for at få flere oplysninger."</string>
     <string name="share_remote_bugreport_action" msgid="532226159318779397">"Del"</string>
     <string name="decline_remote_bugreport_action" msgid="518720235407565134">"Afvis"</string>
-    <string name="usb_use_charging_only" msgid="2180443097365214467">"Oplad denne enhed"</string>
-    <string name="usb_use_charging_only_desc" msgid="3066256793008540627">"Oplad denne enhed"</string>
+    <string name="usb_use_charging_only" msgid="2180443097365214467">"Oplade denne enhed"</string>
+    <string name="usb_use_charging_only_desc" msgid="3066256793008540627">"Oplade denne enhed"</string>
     <string name="usb_use_power_only" msgid="6426550616883919530">"Strømforsyning"</string>
     <string name="usb_use_power_only_desc" msgid="3461232831015575152">"Oplad den tilsluttede enhed. Virker kun med enheder, der understøtter USB-opladning."</string>
-    <string name="usb_use_file_transfers" msgid="7409600791007250137">"Overfør filer"</string>
+    <string name="usb_use_file_transfers" msgid="7409600791007250137">"Overføre filer"</string>
     <string name="usb_use_file_transfers_desc" msgid="4235764784331804488">"Overfør filer til en anden enhed"</string>
-    <string name="usb_use_photo_transfers" msgid="7794775645350330454">"Til at overføre billeder (PTP)"</string>
+    <string name="usb_use_photo_transfers" msgid="7794775645350330454">"Overføre billeder (PTP)"</string>
     <string name="usb_use_photo_transfers_desc" msgid="2963034811151325996">"Overfør billeder eller filer, hvis MTP ikke understøttes (PTP)"</string>
-    <string name="usb_use_MIDI" msgid="870922185938298263">"Brug enheden som MIDI"</string>
-    <string name="usb_use_MIDI_desc" msgid="8473936990076693175">"Brug denne enhed som MIDI"</string>
+    <string name="usb_use_MIDI" msgid="870922185938298263">"Bruge enheden som MIDI"</string>
+    <string name="usb_use_MIDI_desc" msgid="8473936990076693175">"Bruge denne enhed som MIDI"</string>
     <string name="usb_use" msgid="3256040963685055320">"Brug USB til"</string>
     <string name="usb_pref" msgid="1400617804525116158">"USB"</string>
     <string name="usb_summary_charging_only" msgid="7544327009143659751">"Opladning af denne enhed"</string>
@@ -3216,6 +3245,7 @@
     <string name="usb_summary_file_transfers" msgid="6435943692610175111">"Overførsel af filer"</string>
     <string name="usb_summary_photo_transfers" msgid="8440204169576585250">"Overførsel af billeder (PTP)"</string>
     <string name="usb_summary_MIDI" msgid="5687906612187885908">"Brug enheden som MIDI"</string>
+    <string name="sms_mirroring_pref" msgid="6475043279147376031">"Sms-spejling"</string>
     <string name="background_check_pref" msgid="7550258400138010979">"Baggrundstjek"</string>
     <string name="background_check_title" msgid="4534254315824525593">"Fuld baggrundsadgang"</string>
     <string name="assist_access_context_title" msgid="2269032346698890257">"Brug tekst fra skærmen"</string>
@@ -3282,7 +3312,7 @@
     <string name="write_settings_title" msgid="4232152481902542284">"Apps, som kan ændre systemindstillinger"</string>
     <string name="write_system_settings" msgid="3482913590601096763">"Rediger systemindstillinger"</string>
     <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="permit_write_settings" msgid="658555006453212691">"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>
@@ -3377,9 +3407,12 @@
     <string name="color_temperature" msgid="2070126836910615605">"Kølig farvetemperatur"</string>
     <string name="color_temperature_desc" msgid="4793729830226404052">"Brug køligere skærmfarver"</string>
     <string name="color_temperature_toast" msgid="4974218172133854827">"Du skal slå skærmen fra, før du kan anvende farveændringer"</string>
-    <string name="telephony_monitor_toast" msgid="7003764250271195384">"Genstart enheden for at anvende ændringen i forbindelse med Overvågning af telefoni"</string>
+    <string name="connectivity_monitor_switch" msgid="9059759348648583421">"Overvågning af forbindelse"</string>
+    <string name="connectivity_monitor_switch_summary" msgid="2828658652378866401">"ConnectivityMonitor indsamler logfiler, når der registreres et forbindelseproblem, og sender brugeren en underretning for at bede vedkommende om at indsende en fejlrapport"</string>
+    <string name="connectivity_monitor_toast" msgid="5551859612881173028">"Genstart enheden for at anvende ændringen i forbindelse med overvågning af forbindelse"</string>
     <string name="camera_hal_hdrplus_switch" msgid="8377365197105267466">"Camera HAL HDR+"</string>
     <string name="camera_hal_hdrplus_toast" msgid="2063703797270055299">"Genstart enheden for at anvende ændringen i forbindelse med Camera HAL HDR+"</string>
+    <string name="camera_laser_sensor_switch" msgid="8913588990743234440">"Kameraets lasersensor"</string>
     <string name="ota_disable_automatic_update" msgid="2319639631655915050">"Automatiske systemopdateringer"</string>
     <string name="usage" msgid="2977875522080448986">"Forbrug"</string>
     <string name="cellular_data_usage" msgid="2155683719898158203">"Mobildataforbrug"</string>
@@ -3399,13 +3432,13 @@
       <item quantity="one"><xliff:g id="COUNT">%1$d</xliff:g> begrænsning</item>
       <item quantity="other"><xliff:g id="COUNT">%1$d</xliff:g> begrænsninger</item>
     </plurals>
-    <string name="operator_warning" msgid="1862988028996859195">"Mobilselskabets dataopgørelse kan variere fra enhedens opgørelse."</string>
+    <string name="operator_warning" msgid="1862988028996859195">"Mobilselskabets dataopgørelse kan afvige fra enhedens opgørelse."</string>
     <string name="data_used_template" msgid="3245919669966296505">"<xliff:g id="ID_1">%1$s</xliff:g> brugt"</string>
     <string name="set_data_warning" msgid="6115364758236594593">"Konfigurer en dataadvarsel"</string>
     <string name="data_warning" msgid="209133958008062117">"Dataadvarsel"</string>
     <string name="set_data_limit" msgid="2901526323210516923">"Angiv datagrænse"</string>
     <string name="data_limit" msgid="1885406964934590552">"Datagrænse"</string>
-    <string name="data_usage_template" msgid="392191945602400904">"<xliff:g id="ID_1">%1$s</xliff:g> brugt i perioden <xliff:g id="ID_2">%2$s</xliff:g>"</string>
+    <string name="data_usage_template" msgid="2923744765873163859">"<xliff:g id="ID_1">%1$s</xliff:g> brugt <xliff:g id="ID_2">%2$s</xliff:g>"</string>
     <string name="configure" msgid="1029654422228677273">"Konfigurer"</string>
     <string name="data_usage_other_apps" msgid="3272872663517382050">"Andre apps, der er inkluderet i forbruget"</string>
     <plurals name="data_saver_unrestricted_summary" formatted="false" msgid="2635267833484232703">
@@ -3474,7 +3507,7 @@
     <string name="button_confirm_convert_fbe" msgid="7101855374850373091">"Ryd og konvertér"</string>
     <string name="reset_shortcut_manager_throttling" msgid="6495066467198668994">"Nulstil antalsbegrænsning i ShortcutManager"</string>
     <string name="reset_shortcut_manager_throttling_complete" msgid="1826770872063707900">"Antalsbegrænsning i ShortcutManager er nulstillet"</string>
-    <string name="notification_suggestion_title" msgid="4506524937307816475">"Konfigurer underretninger for låseskærm"</string>
+    <string name="notification_suggestion_title" msgid="387052719462473500">"Bestem selv, hvilke oplysninger der vises på din låseskærm"</string>
     <string name="notification_suggestion_summary" msgid="8521159741445416875">"Vis eller skjul indhold i underretninger"</string>
     <string name="page_tab_title_summary" msgid="4070309266374993258">"Alle"</string>
     <string name="page_tab_title_support" msgid="8483187649355540109">"Support og tips"</string>
@@ -3482,7 +3515,7 @@
     <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>
     <string name="premium_sms_access" msgid="4660047004791638305">"Adgang til overtakseret sms"</string>
-    <string name="bluetooth_disabled" msgid="2456198532288640046">"Kan ikke ses af andre enheder"</string>
+    <string name="bluetooth_disabled" msgid="6244000672828617410">"Deaktiveret"</string>
     <string name="bluetooth_connected_summary" msgid="7672528674593152862">"Forbundet med <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="bluetooth_connected_multiple_devices_summary" msgid="9173661896296663932">"Forbundet med flere enheder"</string>
     <string name="demo_mode" msgid="2798762752209330277">"Demotilstand for systemets brugerflade"</string>
@@ -3546,7 +3579,7 @@
     <string name="gesture_preference_summary" product="default" msgid="8627850388011956901">"Styr din telefon med hurtige bevægelser"</string>
     <string name="gesture_preference_summary" product="tablet" msgid="4717535378272065510">"Styr din tablet med hurtige bevægelser"</string>
     <string name="gesture_preference_summary" product="device" msgid="4205941452664950852">"Styr din enhed med hurtige bevægelser"</string>
-    <string name="double_tap_power_for_camera_title" msgid="64716226816032800">"Gå til kamera"</string>
+    <string name="double_tap_power_for_camera_title" msgid="64716226816032800">"Åbn kamera"</string>
     <string name="double_tap_power_for_camera_summary" msgid="242037150983277829">"Du kan åbne dit kamera hurtigt ved at trykke to gange på afbryderknappen. Denne genvej fungerer fra enhver skærm."</string>
     <string name="double_tap_power_for_camera_suggestion_title" msgid="6500405261202883589">"Åbn kameraet hurtigt"</string>
     <string name="double_tap_power_for_camera_suggestion_summary" msgid="7010153544554016996">"Tryk to gange på afbryderknappen for at åbne kameraet"</string>
@@ -3568,7 +3601,7 @@
     <string name="ambient_display_pickup_summary" product="tablet" msgid="5435283849947236648">"Se klokkeslæt, underretningsikoner og andre oplysninger, når du samler din tablet op."</string>
     <string name="ambient_display_pickup_summary" product="device" msgid="8256669101643381568">"Se klokkeslæt, underretningsikoner og andre oplysninger, når du samler din enhed op."</string>
     <string name="ambient_display_pickup_suggestion_summary" msgid="7014700589991761035">"Tjek underretninger ved slukket skærm"</string>
-    <string name="fingerprint_swipe_for_notifications_title" msgid="5816346492253270243">"Stryg over fingeraftryk for at se underretninger"</string>
+    <string name="fingerprint_swipe_for_notifications_title" msgid="5816346492253270243">"Stryg over fingeraftrykslæser for at se underretninger"</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="default" msgid="1770661868393713922">"Du kan tjekke dine underretninger ved at stryge nedad på fingeraftrykslæseren på bagsiden af telefonen."</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="tablet" msgid="902719947767712895">"Du kan tjekke dine underretninger ved at stryge nedad på fingeraftrykslæseren på bagsiden af din tablet."</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="device" msgid="5372926094116306647">"Du kan tjekke dine underretninger ved at stryge nedad på fingeraftrykslæseren på bagsiden af enheden."</string>
@@ -3584,7 +3617,7 @@
     <string name="web_action_enable_title" msgid="4051513950976670853">"Instant apps"</string>
     <string name="web_action_enable_summary" msgid="3108127559723396382">"Åbn links i apps – selv hvis de ikke er installeret"</string>
     <string name="web_action_section_title" msgid="7364647086538399136">"Instant apps"</string>
-    <string name="instant_apps_account" msgid="1433620209791992528">"Instant apps-konto"</string>
+    <string name="instant_apps_settings" msgid="8827777916518348213">"Præferencer for Instant Apps"</string>
     <string name="domain_url_section_title" msgid="7046835219056428883">"Installerede aps"</string>
     <string name="automatic_storage_manager_activation_warning" msgid="6353100011690933254">"Din lagerplads administreres nu af lageradministratoren"</string>
     <string name="account_for_section_header" msgid="5356566418548737121">"Konti for <xliff:g id="USER_NAME">%1$s</xliff:g>"</string>
@@ -3631,7 +3664,9 @@
     <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_global_http_proxy" msgid="7936664553416257333">"Global HTTP-proxy er konfigureret"</string>
-    <string name="enterprise_privacy_ca_certs" msgid="5885892204903688909">"Pålidelige loginoplysninger"</string>
+    <string name="enterprise_privacy_ca_certs_device" msgid="2019652712782510262">"Pålidelige loginoplysninger"</string>
+    <string name="enterprise_privacy_ca_certs_personal" msgid="2279084820904076599">"Pålidelige loginoplysninger på din personlige profil"</string>
+    <string name="enterprise_privacy_ca_certs_work" msgid="6187377647815301809">"Pålidelige loginoplysninger på din arbejdsprofil"</string>
     <plurals name="enterprise_privacy_number_ca_certs" formatted="false" msgid="526375234629534165">
       <item quantity="one">Mindst <xliff:g id="COUNT_1">%d</xliff:g> CA-certifikat</item>
       <item quantity="other">Mindst <xliff:g id="COUNT_1">%d</xliff:g> CA-certifikater</item>
@@ -3692,8 +3727,10 @@
     <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="carrier_provisioning" msgid="4398683675591893169">"Oplysninger om mobilselskab"</string>
-    <string name="trigger_carrier_provisioning" msgid="3434865918009286187">"Udløs mobilselskab"</string>
+    <string name="trigger_carrier_provisioning" msgid="3434865918009286187">"Aktivér mobilselskab"</string>
     <string name="new_device_suggestion_title" msgid="698847081680980774">"Hvad er nyt og spændende?"</string>
-    <string name="new_device_suggestion_summary" msgid="7172709269203435870">"Se de fem mest populære funktioner"</string>
+    <string name="new_device_suggestion_summary" product="default" msgid="206396571522515855">"Få en rundvisning på din nye telefon"</string>
+    <string name="new_device_suggestion_summary" product="tablet" msgid="393751455688210956">"Få en rundvisning på din nye tablet"</string>
+    <string name="new_device_suggestion_summary" product="device" msgid="2939870049868336652">"Få en rundvisning på din nye enhed"</string>
     <string name="disabled_low_ram_device" msgid="3751578499721173344">"Denne funktion er ikke tilgængelig på denne enhed"</string>
 </resources>
diff --git a/res/values-de/arrays.xml b/res/values-de/arrays.xml
index 40c8029..b3e05a9 100644
--- a/res/values-de/arrays.xml
+++ b/res/values-de/arrays.xml
@@ -100,8 +100,6 @@
     <!-- no translation found for wifi_security_no_eap:0 (2084555984818107151) -->
     <!-- no translation found for wifi_security_no_eap:1 (397579322683471524) -->
     <!-- no translation found for wifi_security_no_eap:2 (1968820975358150484) -->
-    <!-- no translation found for wifi_ap_security:0 (5251664683198623324) -->
-    <!-- no translation found for wifi_ap_security:1 (7989073072260294673) -->
   <string-array name="wifi_eap_method">
     <item msgid="1160193392455075561">"PEAP"</item>
     <item msgid="7981731051382306293">"TLS"</item>
diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index 0ad60aa..9cf6818 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -165,7 +165,7 @@
     <string name="bluetooth_map_acceptance_dialog_text" msgid="8712508202081143737">"%1$s möchte auf deine Nachrichten zugreifen. Möchtest du %2$s den Zugriff erlauben?"</string>
     <string name="bluetooth_sap_request" msgid="2669762224045354417">"Anfrage wegen Zugriff auf SIM"</string>
     <string name="bluetooth_sap_acceptance_dialog_text" msgid="4414253873553608690">"<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g> möchte auf deine SIM-Karte zugreifen. Wenn du den Zugriff auf die SIM-Karte gewährst, wird die Datenverbindung auf deinem Gerät für die Dauer der Verbindung deaktiviert. Möchtest du <xliff:g id="DEVICE_NAME_1">%2$s?</xliff:g> den Zugriff erlauben?"</string>
-    <string name="bluetooth_device_name_summary" msgid="4757990010751789977">"Für andere Geräte sichtbar als \"<xliff:g id="DEVICE_NAME">^1</xliff:g>\""</string>
+    <string name="bluetooth_device_name_summary" msgid="522235742194965734">"Für andere Geräte als \"<xliff:g id="DEVICE_NAME">^1</xliff:g>\" sichtbar"</string>
     <string name="bluetooth_paired_device_title" msgid="8638994696317952019">"Meine Geräte"</string>
     <string name="bluetooth_pairing_page_title" msgid="7712127387361962608">"Neues Gerät koppeln"</string>
     <string name="date_and_time" msgid="9062980487860757694">"Datum &amp; Uhrzeit"</string>
@@ -311,6 +311,8 @@
     <string name="zone_auto" msgid="334783869352026648">"Automatische Zeitzone"</string>
     <string name="zone_auto_summaryOn" msgid="6142830927278458314">"Vom Netzwerk angegebene Zeitzone beibehalten"</string>
     <string name="zone_auto_summaryOff" msgid="2597745783162041390">"Vom Netzwerk angegebene Zeitzone beibehalten"</string>
+    <string name="date_time_24hour_auto" msgid="2117383168985653422">"24-Stunden-Format als Standard"</string>
+    <string name="date_time_24hour_auto_summary" msgid="6351812925651480277">"Standardeinstellung für Sprache verwenden"</string>
     <string name="date_time_24hour_title" msgid="3203537578602803850">"24-Stunden-Format"</string>
     <string name="date_time_24hour" msgid="1193032284921000063">"24-Stunden-Format"</string>
     <string name="date_time_set_time_title" msgid="6296795651349047016">"Uhrzeit"</string>
@@ -371,6 +373,9 @@
     <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="1961957425135180242">"Weiter"</string>
+    <string name="setup_fingerprint_enroll_skip_title" msgid="362050541117362034">"Fingerabdruck überspringen?"</string>
+    <string name="setup_fingerprint_enroll_skip_after_adding_lock_text" msgid="958990414356204763">"Die Fingerabdruck-Einrichtung dauert nur ein, zwei Minuten. Wenn du sie jetzt überspringst, kannst du sie später über die Einstellungen nachholen."</string>
+    <string name="lock_screen_intro_skip_title" msgid="4988210105913705679">"Displaysperre überspringen?"</string>
     <string name="lock_screen_intro_skip_dialog_text_frp" product="tablet" msgid="1581834104051243425">"Die Geräteschutzfunktionen werden nicht aktiviert. Du kannst dann nicht verhindern, dass andere Personen dieses Tablet verwenden, falls es verloren geht, gestohlen oder zurückgesetzt wird."</string>
     <string name="lock_screen_intro_skip_dialog_text_frp" product="device" msgid="4629503416877189572">"Die Geräteschutzfunktionen werden nicht aktiviert. Du kannst dann nicht verhindern, dass andere Personen dieses Gerät verwenden, falls es verloren geht, gestohlen oder zurückgesetzt wird."</string>
     <string name="lock_screen_intro_skip_dialog_text_frp" product="default" msgid="2423428240245737909">"Die Geräteschutzfunktionen werden nicht aktiviert. Du kannst dann nicht verhindern, dass andere Personen dieses Smartphone verwenden, falls es verloren geht, gestohlen oder zurückgesetzt wird."</string>
@@ -456,7 +461,7 @@
     <string name="setup_lock_settings_picker_title" product="tablet" msgid="90329443364067215">"Tablet schützen"</string>
     <string name="setup_lock_settings_picker_title" product="device" msgid="2399952075134938929">"Gerät schützen"</string>
     <string name="setup_lock_settings_picker_title" product="default" msgid="1572244299605153324">"Smartphone schützen"</string>
-    <string name="setup_lock_settings_picker_fingerprint_message" msgid="5585650064305600578">"Richte eine alternative Displaysperre ein, um die Sicherheit zu erhöhen."</string>
+    <string name="lock_settings_picker_fingerprint_added_security_message" msgid="5768002109707648463">"Wenn du noch mehr Sicherheit möchtest, richte eine alternative Displaysperre ein."</string>
     <string name="setup_lock_settings_picker_message" product="tablet" msgid="8919671129189936210">"Du kannst verhindern, dass andere Personen dieses Tablet ohne deine Erlaubnis verwenden, indem du die Geräteschutzfunktionen aktivierst. Wähle eine Displaysperre aus."</string>
     <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>
@@ -587,6 +592,7 @@
     <string name="lockpassword_pin_no_sequential_digits" msgid="680765285206990584">"Aufsteigende, absteigende oder wiederholte Ziffernfolgen sind unzulässig"</string>
     <string name="lockpassword_ok_label" msgid="313822574062553672">"OK"</string>
     <string name="lockpassword_cancel_label" msgid="8818529276331121899">"Abbrechen"</string>
+    <string name="lockpassword_clear_label" msgid="5724429464960458155">"Löschen"</string>
     <string name="lockpattern_tutorial_cancel_label" msgid="6431583477570493261">"Abbrechen"</string>
     <string name="lockpattern_tutorial_continue_label" msgid="3559793618653400434">"Weiter"</string>
     <string name="lock_setup" msgid="3355847066343753943">"Die Einrichtung ist abgeschlossen."</string>
@@ -781,6 +787,7 @@
     <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>
@@ -817,6 +824,8 @@
     <string name="wifi_wps_available_first_item" msgid="4422547079984583502">"WPS verfügbar"</string>
     <string name="wifi_wps_available_second_item" msgid="8427520131718215301">" (WPS verfügbar)"</string>
     <string name="wifi_wps_nfc_enter_password" msgid="2288214226916117159">"Gib dein Netzwerkpasswort ein."</string>
+    <string name="wifi_carrier_connect" msgid="8174696557882299911">"WLAN eines Mobilfunkanbieters"</string>
+    <string name="wifi_carrier_content" msgid="4634077285415851933">"Über <xliff:g id="NAME">%1%s</xliff:g> verbinden"</string>
     <string name="wifi_scan_always_turnon_message" msgid="203123538572122989">"Zur Verbesserung der Standortgenauigkeit und zu anderen Zwecken möchte <xliff:g id="APP_NAME">%1$s</xliff:g> die Netzwerküberprüfung aktivieren, auch wenn das WLAN deaktiviert ist.\n\nMöchtest du dies für alle Apps zulassen, die eine Überprüfung durchführen möchten?"</string>
     <string name="wifi_scan_always_turnoff_message" msgid="5538901671131941043">"Rufe im Überlaufmenü \"Erweitert\" auf, um diese Option zu deaktivieren."</string>
     <string name="wifi_scan_always_confirm_allow" msgid="5355973075896817232">"Zulassen"</string>
@@ -834,6 +843,7 @@
     <string name="wifi_connect" msgid="1076622875777072845">"Verbinden"</string>
     <string name="wifi_failed_connect_message" msgid="8491902558970292871">"Netzwerkverbindung konnte nicht hergestellt werden."</string>
     <string name="wifi_forget" msgid="8168174695608386644">"Entfernen"</string>
+    <string name="wifi_modify" msgid="6100248070440710782">"Ändern"</string>
     <string name="wifi_failed_forget_message" msgid="1348172929201654986">"Netzwerk konnte nicht entfernt werden."</string>
     <string name="wifi_save" msgid="3331121567988522826">"Speichern"</string>
     <string name="wifi_failed_save_message" msgid="6650004874143815692">"Netzwerk konnte nicht gespeichert werden."</string>
@@ -846,6 +856,7 @@
     <string name="wifi_advanced_titlebar" msgid="4485841401774142908">"Erweiterte WLAN-Einstellungen"</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_title" msgid="3471132676909349382">"Netzwerkinfo"</string>
     <string name="wifi_details_subnet_mask" msgid="6720279144174924410">"Subnetzmaske"</string>
     <string name="wifi_details_dns" msgid="8648826607751830768">"DNS"</string>
     <string name="wifi_details_ipv6_address_header" msgid="6734119149106422148">"IPv6-Adressen"</string>
@@ -878,16 +889,15 @@
     <string name="wifi_p2p_cancel_connect_title" msgid="255267538099324413">"Einladung ablehnen?"</string>
     <string name="wifi_p2p_cancel_connect_message" msgid="7477756213423749402">"Möchtest du die Einladung zum Verbinden mit <xliff:g id="PEER_NAME">%1$s</xliff:g> ablehnen?"</string>
     <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_off_subtext" msgid="5466126533609394170">"Internetverbindung und Inhalte werden nicht für andere Geräte freigegeben"</string>
     <string name="wifi_hotspot_tethering_on_subtext" product="tablet" msgid="5752490509369962007">"Internetverbindung dieses Tablets wird über Hotspot freigegeben"</string>
     <string name="wifi_hotspot_tethering_on_subtext" product="default" msgid="6461075246164300670">"Internetverbindung dieses Smartphones wird über Hotspot freigegeben"</string>
     <string name="wifi_hotspot_on_local_only_subtext" msgid="2068110388011294735">"Es werden Inhalte per App geteilt. Wenn du eine Internetverbindung freigeben möchtest, deaktiviere den Hotspot und aktiviere ihn dann neu"</string>
-    <string name="wifi_hotspot_name_title" msgid="1341735529132128887">"WLAN-Name"</string>
+    <string name="wifi_hotspot_name_title" msgid="8237000746618636778">"Name des Hotspots"</string>
     <string name="wifi_hotspot_name_summary_connecting" msgid="3378299995508671967">"<xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g> wird aktiviert..."</string>
     <string name="wifi_hotspot_name_summary_connected" msgid="3888672084861445362">"Andere Geräte können sich mit <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g> verbinden"</string>
-    <string name="wifi_hotspot_password_title" msgid="1955592302902091281">"WLAN-Passwort"</string>
+    <string name="wifi_hotspot_password_title" msgid="8676859981917573801">"Passwort des Hotspots"</string>
     <string name="wifi_hotspot_ap_band_title" msgid="1165801173359290681">"Band für Zugangspunkt"</string>
     <string name="wifi_hotspot_footer_info_regular" msgid="1203489406068036455">"Mit einem Hotspot kannst du ein WLAN für andere Geräte einrichten. Die Internetverbindung wird über deine mobilen Daten hergestellt, darum können zusätzliche Kosten anfallen."</string>
     <string name="wifi_hotspot_footer_info_local_only" msgid="857988412470694109">"In Apps können über einen Hotspot Inhalte mit Geräten in der Nähe geteilt werden."</string>
@@ -898,7 +908,6 @@
     <string name="wifi_tether_configure_ap_text" msgid="7974681394041609308">"WLAN-Hotspot einrichten"</string>
     <string name="wifi_hotspot_configure_ap_text" msgid="5478614731464220432">"WLAN-Hotspot-Einrichtung"</string>
     <string name="wifi_hotspot_configure_ap_text_summary" msgid="5560680057727007011">"Hotspot AndroidAP WPA2-PSK"</string>
-    <string name="wifi_tether_configure_subtext" msgid="2050196439900426456">"Hotspot <xliff:g id="NETWORK_SSID">%1$s</xliff:g> <xliff:g id="NETWORK_SECURITY">%2$s</xliff:g>"</string>
     <string name="wifi_tether_configure_ssid_default" msgid="8467525402622138547">"AndroidHotspot"</string>
     <string name="wifi_calling_settings_title" msgid="4102921303993404577">"Anrufe über WLAN"</string>
     <string name="wifi_calling_suggestion_title" msgid="9008010480466359578">"Anrufe über WLAN aktivieren"</string>
@@ -939,7 +948,7 @@
     <string name="wifi_calling_off_explanation" msgid="2597566001655908391">"Wenn die Option \"Anrufe über WLAN\" aktiviert ist, kann dein Smartphone abhängig von deiner Einstellung und von der Signalstärke Anrufe über WLANs oder über das Netz deines Mobilfunkanbieters übertragen. Erkundige dich bei deinem Mobilfunkanbieter über die hierfür erhobenen Gebühren und andere Informationen, bevor du diese Funktion aktivierst."</string>
     <string name="wifi_calling_off_explanation_2" msgid="2329334487851497223"></string>
     <string name="emergency_address_title" msgid="3571902448699714454">"Notfalladresse aktualisieren"</string>
-    <string name="emergency_address_summary" msgid="306028701568728126">"Adresse, die bei einem Notruf über WLAN von Notdiensten als dein Standort verwendet wird"</string>
+    <string name="emergency_address_summary" msgid="3266760199681945746">"Adresse, die Notdiensten bei einem Notruf über WLAN als dein Standort angezeigt wird"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"Display"</string>
     <string name="sound_settings" msgid="5534671337768745343">"Töne"</string>
     <string name="all_volume_title" msgid="4296957391257836961">"Lautstärke"</string>
@@ -993,6 +1002,7 @@
     <string name="search_settings" msgid="1910951467596035063">"Suche"</string>
     <string name="search_settings_summary" msgid="9205656546570654169">"Sucheinstellungen und Suchverlauf verwalten"</string>
     <string name="search_settings_no_results" msgid="8799027492641230999">"Keine Ergebnisse"</string>
+    <string name="search_clear_history" msgid="4196658962573162457">"Verlauf löschen"</string>
     <string name="display_settings" msgid="7965901687241669598">"Display"</string>
     <string name="accelerometer_title" msgid="7854608399547349157">"Display automatisch drehen"</string>
     <string name="color_mode_title" msgid="3159275920408338215">"Kräftige Farben"</string>
@@ -1049,7 +1059,7 @@
     <string name="wallpaper_suggestion_summary" msgid="1579144009898110491">"Display personalisieren"</string>
     <string name="wallpaper_settings_fragment_title" msgid="519078346877860129">"Hintergrund auswählen"</string>
     <string name="screensaver_settings_title" msgid="1770575686476851778">"Bildschirmschoner"</string>
-    <string name="screensaver_settings_summary_either_long" msgid="7302740999250873332">"Während des Ladevorgangs und bei angedocktem Gerät"</string>
+    <string name="screensaver_settings_summary_either_long" msgid="7302740999250873332">"Während des Ladevorgangs oder bei angedocktem Gerät"</string>
     <string name="screensaver_settings_summary_either_short" msgid="6140527286137331478">"In beiden Fällen"</string>
     <string name="screensaver_settings_summary_sleep" msgid="9086186698140423493">"Während des Ladevorgangs"</string>
     <string name="screensaver_settings_summary_dock" msgid="2072657401664633283">"Bei angedocktem Gerät"</string>
@@ -1122,7 +1132,6 @@
     <string name="baseband_version" msgid="1848990160763524801">"Baseband-Version"</string>
     <string name="kernel_version" msgid="9192574954196167602">"Kernel-Version"</string>
     <string name="build_number" msgid="3075795840572241758">"Build-Nummer"</string>
-    <string name="selinux_status" msgid="6212165375172061672">"SELinux-Status"</string>
     <string name="device_info_not_available" msgid="8062521887156825182">"Nicht verfügbar"</string>
     <string name="device_status_activity_title" msgid="1411201799384697904">"Status"</string>
     <string name="device_status" msgid="607405385799807324">"Status"</string>
@@ -1150,7 +1159,6 @@
     <string name="status_wifi_mac_address" msgid="2202206684020765378">"WLAN-MAC-Adresse"</string>
     <string name="status_bt_address" msgid="4195174192087439720">"Bluetooth-Adresse"</string>
     <string name="status_serial_number" msgid="2257111183374628137">"Seriennummer"</string>
-    <string name="status_unavailable" msgid="7862009036663793314">"Nicht verfügbar"</string>
     <string name="status_up_time" msgid="7294859476816760399">"Betriebszeit"</string>
     <string name="status_awake_time" msgid="2393949909051183652">"Aktivzeit"</string>
     <string name="internal_memory" msgid="9129595691484260784">"Interner Speicher"</string>
@@ -1282,7 +1290,7 @@
     <string name="storage_wizard_move_progress_cancel" msgid="542047237524588792">"Verschieben abbrechen"</string>
     <string name="storage_wizard_slow_body" msgid="8010127667184768025">"Die <xliff:g id="NAME_0">^1</xliff:g> ist offenbar langsam. \n\nDu kannst fortfahren, aber hierher verschobene Apps bleiben eventuell hängen und Datenübertragungen können lange dauern. \n\nFür eine bessere Leistung solltest du eine schnellere <xliff:g id="NAME_1">^1</xliff:g> nutzen."</string>
     <string name="battery_status_title" msgid="9159414319574976203">"Akkustatus"</string>
-    <string name="battery_level_title" msgid="2965679202786873272">"Akkuladung"</string>
+    <string name="battery_level_title" msgid="2965679202786873272">"Akkustand"</string>
     <string name="apn_settings" msgid="3743170484827528406">"APNs"</string>
     <string name="apn_edit" msgid="1354715499708424718">"Zugangspunkt bearbeiten"</string>
     <string name="apn_not_set" msgid="4974192007399968164">"Nicht definiert"</string>
@@ -1326,6 +1334,7 @@
     <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>
     <string name="reset_dashboard_title" msgid="6254873816990678620">"Optionen zurücksetzen"</string>
+    <string name="reset_dashboard_summary" msgid="4851012632493522755">"Netzwerk, Apps oder Gerät können zurückgesetzt werden"</string>
     <string name="reset_network_title" msgid="6166025966016873843">"WLAN, mobile Daten &amp; Bluetooth zurücksetzen"</string>
     <string name="reset_network_desc" msgid="5547979398298881406">"Dadurch werden sämtliche Netzwerkeinstellungen zurückgesetzt, einschließlich:\n\n"<li>"WLAN"</li>\n<li>"Mobile Daten"</li>\n<li>"Bluetooth"</li></string>
     <string name="reset_network_button_text" msgid="2035676527471089853">"Einstellungen zurücksetzen"</string>
@@ -1334,17 +1343,14 @@
     <string name="reset_network_confirm_title" msgid="1759888886976962773">"Zurücksetzen?"</string>
     <string name="network_reset_not_available" msgid="7188610385577164676">"Das Zurücksetzen der Netzwerkeinstellungen ist für diesen Nutzer nicht verfügbar."</string>
     <string name="reset_network_complete_toast" msgid="787829973559541880">"Die Netzwerkeinstellungen wurden zurückgesetzt."</string>
-    <string name="master_clear_title" msgid="6617679904229218425">"Alle Daten löschen (auf Werkseinstellungen zurücksetzen)"</string>
-    <plurals name="master_clear_with_account_summary" formatted="false" msgid="5911377203778818712">
-      <item quantity="other"><xliff:g id="ACCOUNT_COUNT">%1$d</xliff:g> Konten werden zurückgesetzt</item>
-      <item quantity="one">1 Konto wird zurückgesetzt</item>
-    </plurals>
-    <string name="master_clear_summary" msgid="6902443944660426951">"Interner Speicher &amp; alle Daten werden zurückgesetzt"</string>
+    <string name="master_clear_title" msgid="3531267871084279512">"Alle Daten löschen (auf Werkseinstellungen zurücksetzen)"</string>
     <string name="master_clear_desc" product="tablet" msgid="9146059417023157222">"Hierdurch werden alle Daten aus dem "<b>"internen Speicher"</b>" deines Tablets gelöscht, u. a.\n\n"<li>"dein Google-Konto"</li>\n<li>"System- und App-Daten sowie entsprechende Einstellungen"</li>\n<li>"heruntergeladene Apps"</li></string>
     <string name="master_clear_desc" product="default" msgid="4800386183314202571">"Hierdurch werden alle Daten aus dem "<b>"internen Speicher"</b>" deines Telefons gelöscht, u. a.\n\n"<li>"dein Google-Konto"</li>\n<li>"System- und App-Daten sowie entsprechende Einstellungen"</li>\n<li>"heruntergeladene Apps"</li></string>
     <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"Du bist zurzeit in folgenden Konten angemeldet:\n"</string>
     <string name="master_clear_other_users_present" product="default" msgid="5161423070702470742">\n\n"Auf diesem Gerät sind andere Nutzer vorhanden.\n"</string>
     <string name="master_clear_desc_also_erases_external" msgid="1903185203791274237"><li>"Musik"</li>\n<li>"Fotos"</li>\n<li>"Sonstige Nutzerdaten"</li></string>
+    <string name="master_clear_desc_also_erases_esim" msgid="312352697653096008"><li>"Mobilfunkanbieter auf der eSIM"</li></string>
+    <string name="master_clear_desc_no_cancel_mobile_plan" msgid="5460926449093211144">\n\n"Dein Mobilfunkvertrag wird dadurch nicht gekündigt."</string>
     <string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="7744115866662613411">\n\n"Um auch Musik, Bilder und sonstige Nutzerdaten zu löschen, muss der "<b>"USB-Speicher"</b>" gelöscht werden."</string>
     <string name="master_clear_desc_erase_external_storage" product="default" msgid="4801026652617377093">\n\n"Um auch Musik, Bilder und sonstige Nutzerdaten zu löschen, muss die "<b>"SD-Karte"</b>" gelöscht werden."</string>
     <string name="erase_external_storage" product="nosdcard" msgid="969364037450286809">"USB-Speicher löschen"</string>
@@ -1461,15 +1467,16 @@
     <string name="settings_safetylegal_activity_title" msgid="6901214628496951727">"Sicherheitsinformationen"</string>
     <string name="settings_safetylegal_activity_unreachable" msgid="250674109915859456">"Es ist keine Datenverbindung vorhanden. Rufe %s von einem beliebigen, mit dem Internet verbundenen Computer auf, um diese Informationen jetzt anzuzeigen."</string>
     <string name="settings_safetylegal_activity_loading" msgid="8059022597639516348">"Wird geladen..."</string>
-    <string name="lockpassword_choose_your_password_header" msgid="8624900666929394990">"Passwort festlegen"</string>
-    <string name="lockpassword_choose_your_password_header_for_fingerprint" msgid="6624409510609085450">"Passwort festlegen, um Fingerabdruck zu verwenden"</string>
-    <string name="lockpassword_choose_your_pattern_header" msgid="6949761069941694050">"Muster wählen"</string>
-    <string name="lockpassword_choose_your_pattern_header_for_fingerprint" msgid="5901096361617543819">"Muster festlegen, um Fingerabdruck zu verwenden"</string>
-    <string name="lockpassword_choose_your_pin_header" msgid="7598849519816138302">"PIN festlegen"</string>
-    <string name="lockpassword_choose_your_pin_header_for_fingerprint" msgid="765344692615917183">"PIN festlegen, um Fingerabdruck zu verwenden"</string>
-    <string name="lockpassword_confirm_your_password_header" msgid="6308478184889846633">"Passwort bestätigen"</string>
+    <string name="lockpassword_choose_your_screen_lock_header" msgid="3872462096767152394">"Displaysperre einrichten"</string>
+    <string name="lockpassword_choose_your_password_message" msgid="1197569283524841412">"Richte aus Sicherheitsgründen ein Passwort ein"</string>
+    <string name="lockpassword_choose_your_password_header_for_fingerprint" msgid="2541818487015343503">"Alternative für Fingerabdruck einrichten"</string>
+    <string name="lockpassword_choose_your_pattern_header_for_fingerprint" msgid="7709785406243556723">"Alternative für Fingerabdruck einrichten"</string>
+    <string name="lockpassword_choose_your_pin_message" msgid="1875420718677275646">"Richte aus Sicherheitsgründen eine PIN ein"</string>
+    <string name="lockpassword_choose_your_pin_header_for_fingerprint" msgid="1549639053195796674">"PIN vergeben, um Fingerabdruck zu nutzen"</string>
+    <string name="lockpassword_choose_your_pattern_message" msgid="5986983400689720015">"Richte aus Sicherheitsgründen ein Muster ein"</string>
+    <string name="lockpassword_confirm_your_password_header" msgid="1266027268220850931">"Passwort noch einmal eingeben"</string>
     <string name="lockpassword_confirm_your_pattern_header" msgid="7543433733032330821">"Muster bestätigen"</string>
-    <string name="lockpassword_confirm_your_pin_header" msgid="49038294648213197">"PIN bestätigen"</string>
+    <string name="lockpassword_confirm_your_pin_header" msgid="7744513791910572550">"PIN noch einmal eingeben"</string>
     <string name="lockpassword_confirm_passwords_dont_match" msgid="5140892109439191415">"Die Passwörter stimmen nicht überein."</string>
     <string name="lockpassword_confirm_pins_dont_match" msgid="7226244811505606217">"Die PINs stimmen nicht überein."</string>
     <string name="lockpassword_choose_lock_generic_header" msgid="3811438094903786145">"Sperre einrichten"</string>
@@ -1488,6 +1495,12 @@
     <string name="lockpassword_strong_auth_required_work_pattern" msgid="3003781907040522053">"Verwende das Muster deines Arbeitsprofils, um die Sicherheit zu erhöhen"</string>
     <string name="lockpassword_strong_auth_required_work_pin" msgid="3367491332598821552">"Gib die PIN deines Arbeitsprofils ein, um die Sicherheit zu erhöhen"</string>
     <string name="lockpassword_strong_auth_required_work_password" msgid="8159775129968582940">"Gib das Passwort deines Arbeitsprofils ein, um die Sicherheit zu erhöhen"</string>
+    <string name="lockpassword_confirm_your_pattern_details_frp" msgid="6757336656791723193">"Dein Smartphone auf die Werkseinstellungen zurückgesetzt. Gib dein früheres Muster ein."</string>
+    <string name="lockpassword_confirm_your_pin_details_frp" msgid="826520613445990470">"Dein Smartphone auf die Werkseinstellungen zurückgesetzt. Gib deine frühere PIN ein."</string>
+    <string name="lockpassword_confirm_your_password_details_frp" msgid="8944081074615739040">"Dein Smartphone wurde auf die Werkseinstellungen zurückgesetzt. Gib dein früheres Passwort ein."</string>
+    <string name="lockpassword_confirm_your_pattern_header_frp" msgid="2898036091609128286">"Muster bestätigen"</string>
+    <string name="lockpassword_confirm_your_pin_header_frp" msgid="4141601774778898803">"PIN bestätigen"</string>
+    <string name="lockpassword_confirm_your_password_header_frp" msgid="3762615419295360480">"Passwort bestätigen"</string>
     <string name="lockpassword_invalid_pin" msgid="15588049067548470">"Falsche PIN"</string>
     <string name="lockpassword_invalid_password" msgid="4038507398784975200">"Falsches Passwort"</string>
     <string name="lockpattern_need_to_unlock_wrong" msgid="1745247595356012176">"Falsches Muster"</string>
@@ -1496,7 +1509,7 @@
     <string name="lockpattern_change_lock_pin_label" msgid="266707138486731661">"Entsperrungs-PIN ändern"</string>
     <string name="lockpattern_recording_intro_header" msgid="308287052221942814">"Zeichne ein Entsperrungsmuster."</string>
     <string name="lockpattern_recording_intro_footer" msgid="1118579101409152113">"Menütaste drücken, um die Hilfe aufzurufen"</string>
-    <string name="lockpattern_recording_inprogress" msgid="6667844062721656773">"Lasse die Tasten los, wenn du fertig bist."</string>
+    <string name="lockpattern_recording_inprogress" msgid="6667844062721656773">"Lass die Tasten los, wenn du fertig bist."</string>
     <string name="lockpattern_recording_incorrect_too_short" msgid="1348234155120957561">"Verbinde mindestens <xliff:g id="NUMBER">%d</xliff:g> Punkte. Bitte versuche es erneut."</string>
     <string name="lockpattern_pattern_entered_header" msgid="4316818983675591604">"Muster wurde aufgezeichnet."</string>
     <string name="lockpattern_need_to_confirm" msgid="8054853451639221265">"Zeichne das Muster zur Bestätigung erneut."</string>
@@ -1520,13 +1533,13 @@
     <string name="activity_not_found" msgid="5551664692991605325">"App ist nicht auf dem Telefon installiert."</string>
     <string name="lock_settings_profile_title" msgid="2121876391814535295">"Sicherheit des Arbeitsprofils"</string>
     <string name="lock_settings_profile_screen_lock_title" msgid="3334747927367115256">"Displaysperre des Arbeitsprofils"</string>
-    <string name="lock_settings_profile_unification_title" msgid="4973102698492659123">"Eine Sperre verwenden"</string>
-    <string name="lock_settings_profile_unification_summary" msgid="7178299172998641303">"Eine Sperre für Arbeitsprofil und Display verwenden"</string>
-    <string name="lock_settings_profile_unification_dialog_title" msgid="4824620230229285301">"Eine Sperre verwenden?"</string>
+    <string name="lock_settings_profile_unification_title" msgid="4973102698492659123">"Einheitliche Sperre verwenden"</string>
+    <string name="lock_settings_profile_unification_summary" msgid="7178299172998641303">"Einheitliche Sperre für Arbeitsprofil und Display verwenden"</string>
+    <string name="lock_settings_profile_unification_dialog_title" msgid="4824620230229285301">"Einheitliche Sperre verwenden?"</string>
     <string name="lock_settings_profile_unification_dialog_body" msgid="7128305504872026659">"Dein Gerät verwendet die Displaysperre des Arbeitsprofils. Die Arbeitsrichtlinien gelten für beide Sperren."</string>
     <string name="lock_settings_profile_unification_dialog_uncompliant_body" msgid="3221303098797469900">"Die Sperre deines Arbeitsprofils entspricht nicht den Sicherheitsanforderungen deines Unternehmens. Du kannst für das Display und dein Arbeitsprofil dieselbe Sperre verwenden. In diesem Fall gelten jedoch sämtliche Richtlinien des Arbeitsprofils auch für die Displaysperre."</string>
-    <string name="lock_settings_profile_unification_dialog_confirm" msgid="8249970828159656518">"Eine Sperre verwenden"</string>
-    <string name="lock_settings_profile_unification_dialog_uncompliant_confirm" msgid="5943758576756482777">"Eine Sperre verwenden"</string>
+    <string name="lock_settings_profile_unification_dialog_confirm" msgid="8249970828159656518">"Einheitliche Sperre verwenden"</string>
+    <string name="lock_settings_profile_unification_dialog_uncompliant_confirm" msgid="5943758576756482777">"Einheitliche Sperre verwenden"</string>
     <string name="lock_settings_profile_unified_summary" msgid="9008819078132993492">"Identisch mit Displaysperre des Geräts"</string>
     <string name="manageapplications_settings_title" msgid="7041951105633616745">"Apps verwalten"</string>
     <string name="manageapplications_settings_summary" msgid="1794401500935451259">"Installierte Apps verwalten und entfernen"</string>
@@ -1537,7 +1550,6 @@
     <string name="install_applications_title" msgid="4987712352256508946">"Alle App-Quellen zulassen"</string>
     <string name="recent_app_category_title" msgid="6673071268966003928">"Kürzlich geöffnete Apps"</string>
     <string name="see_all_apps_title" msgid="1317153498074308438">"Alle <xliff:g id="COUNT">%1$d</xliff:g> Apps anzeigen"</string>
-    <string name="recent_app_summary" msgid="3366446669844932300">"vor <xliff:g id="TIME">^1</xliff:g>"</string>
     <string name="install_all_warning" product="tablet" msgid="8310489909586138165">"Apps mit unbekannter Herkunft können gefährlich für dein Tablet und deine personenbezogenen Daten sein. Wenn du Apps aus dieser Quelle installierst, erklärst du dich damit einverstanden, dass du die Verantwortung für alle Schäden an deinem Tablet und jegliche Datenverluste trägst, die aus der Verwendung dieser Apps entstehen können."</string>
     <string name="install_all_warning" product="default" msgid="1952257127370115988">"Apps mit unbekannter Herkunft können gefährlich für dein Smartphone und deine personenbezogenen Daten sein. Wenn du Apps aus dieser Quelle installierst, erklärst du dich damit einverstanden, dass du die Verantwortung für alle Schäden an deinem Smartphone und jegliche Datenverluste trägst, die aus der Verwendung dieser Apps entstehen können."</string>
     <string name="advanced_settings" msgid="1777249286757067969">"Erweiterte Einstellungen"</string>
@@ -1706,7 +1718,7 @@
     <string name="runningservicedetails_stop_dlg_title" msgid="4253292537154337233">"Systemdienst beenden?"</string>
     <string name="runningservicedetails_stop_dlg_text" product="tablet" msgid="3371302398335665793">"Wenn du diesen Dienst beendest, funktionieren möglicherweise einige Funktionen deines Tablets nicht mehr richtig, bis du es aus- und wieder einschaltest."</string>
     <string name="runningservicedetails_stop_dlg_text" product="default" msgid="3920243762189484756">"Wenn du diesen Dienst beendest, funktionieren möglicherweise einige Funktionen deines Telefons nicht mehr richtig, bis du es aus- und wieder einschaltest."</string>
-    <string name="language_input_gesture_title" msgid="8749227808244881255">"Sprachen, Eingabe &amp; Gesten"</string>
+    <string name="language_input_gesture_title" msgid="8749227808244881255">"Sprachen, Eingabe &amp; Bewegungen"</string>
     <string name="language_input_gesture_summary_on_with_assist" msgid="7219895055450633449"></string>
     <string name="language_input_gesture_summary_on_non_assist" msgid="756147879200943161"></string>
     <string name="language_input_gesture_summary_off" msgid="4617198819416948217"></string>
@@ -1801,7 +1813,7 @@
     <string name="accessibility_settings_summary" msgid="981260486011624939">"Screenreader, Display, Interaktionssteuerung"</string>
     <string name="vision_settings_title" msgid="4204111425716868288">"Anzeigeeinstellungen"</string>
     <string name="vision_settings_description" msgid="5679491180156408260">"Du kannst dieses Gerät an deine Bedürfnisse anpassen. Diese Funktionen der Bedienungshilfen kannst du später in den Einstellungen ändern."</string>
-    <string name="vision_settings_suggestion_title" msgid="917294957154878441">"Schrift vergrößern"</string>
+    <string name="vision_settings_suggestion_title" msgid="8058794060304707004">"Schriftgröße ändern"</string>
     <string name="screen_reader_category_title" msgid="7739154903913400641">"Screenreader"</string>
     <string name="audio_and_captions_category_title" msgid="3420727114421447524">"Audiodienste und Text auf dem Bildschirm"</string>
     <string name="display_category_title" msgid="685461049938269166">"Bildschirm"</string>
@@ -1838,7 +1850,6 @@
     <string name="accessibility_display_inversion_preference_subtitle" msgid="7052959202195368109">"Kann sich auf die Leistung auswirken"</string>
     <string name="accessibility_autoclick_preference_title" msgid="7014499339068449623">"Klicken, wenn Zeiger stillsteht"</string>
     <string name="accessibility_autoclick_delay_preference_title" msgid="3962261178385106006">"Verzögerung vor Klick"</string>
-    <string name="preference_summary_default_combination" msgid="8532964268242666060">"<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">"AKTIVIERT"</string>
     <string name="accessibility_summary_state_disabled" msgid="2241315620132005595">"DEAKTIVIERT"</string>
     <string name="enable_quick_setting" msgid="2366999897816894536">"In Schnelleinstellungen anzeigen"</string>
@@ -1898,7 +1909,7 @@
     <string name="color_magenta" msgid="5059212823607815549">"Magenta"</string>
     <string name="enable_service_title" msgid="3061307612673835592">"<xliff:g id="SERVICE">%1$s</xliff:g> verwenden?"</string>
     <string name="capabilities_list_title" msgid="86713361724771971">"<xliff:g id="SERVICE">%1$s</xliff:g> muss:"</string>
-    <string name="touch_filtered_warning" msgid="8644034725268915030">"Deine Eingabe wird von \"Einstellungen\" nicht erkannt, weil eine App die Berechtigungsanfrage verdeckt."</string>
+    <string name="touch_filtered_warning" msgid="8644034725268915030">"Deine Eingabe wird von \"Einstellungen\" nicht erkannt, weil die Berechtigungsanfrage von einer App verdeckt wird."</string>
     <string name="enable_service_encryption_warning" msgid="3064686622453974606">"Wenn du <xliff:g id="SERVICE">%1$s</xliff:g> aktivierst, verwendet dein Gerät nicht die Displaysperre, um die Datenverschlüsselung zu verbessern."</string>
     <string name="secure_lock_encryption_warning" msgid="460911459695077779">"Da du eine Bedienungshilfe aktiviert hast, verwendet dein Gerät nicht die Displaysperre, um die Datenverschlüsselung zu verbessern."</string>
     <string name="enable_service_pattern_reason" msgid="777577618063306751">"Da die Aktivierung von <xliff:g id="SERVICE">%1$s</xliff:g> Auswirkungen auf die Datenverschlüsselung hat, musst du dein Muster bestätigen."</string>
@@ -1957,12 +1968,14 @@
     <string name="background_activity_summary_on" msgid="649282072540085599">"App kann im Hintergrund ausgeführt werden, wenn sie nicht verwendet wird"</string>
     <string name="background_activity_summary_off" msgid="7666330699090632040">"Die Hintergrundaktivitäten der App sind eingeschränkt, wenn sie nicht verwendet wird"</string>
     <string name="background_activity_summary_disabled" msgid="3710669050484599847">"App darf nicht im Hintergrund ausgeführt werden"</string>
+    <string name="background_activity_summary_whitelisted" msgid="7375400051141016808">"Der Akkuverbrauch der App kann nicht optimiert werden"</string>
+    <string name="background_activity_warning_dialog_title" msgid="2216249969149568871">"Hintergrundaktivität einschränken?"</string>
+    <string name="background_activity_warning_dialog_text" msgid="7049624449246121981">"Wenn du die Hintergrundaktivität einer App einschränkst, kann dies zu unerwünschtem Verhalten führen"</string>
     <string name="device_screen_usage" msgid="3386088035570409683">"Displaynutzung seit letzter vollständiger Aufladung"</string>
     <string name="device_screen_consumption" msgid="4607589286438986687">"Displayverbrauch"</string>
     <string name="device_cellular_network" msgid="4724773411762382950">"Mobilfunknetzsuche"</string>
-    <string name="power_last_full_charge_summary" msgid="532845389094620657">"vor <xliff:g id="TIME">^1</xliff:g>"</string>
-    <string name="power_usage_list_summary" msgid="6775339745194635000">"App-Verbrauch seit letzter vollständiger Aufladung (vor <xliff:g id="TIME">^1</xliff:g>)"</string>
-    <string name="power_usage_list_summary_device" msgid="7036566616386864302">"Gerätenutzung seit vollständiger Aufladung (vor <xliff:g id="TIME">^1</xliff:g>)"</string>
+    <string name="power_usage_list_summary" msgid="6393929085382334341">"App-Nutzung seit vollständiger Aufladung (<xliff:g id="RELATIVE_TIME">^1</xliff:g>)"</string>
+    <string name="power_usage_list_summary_device" msgid="4461926045610455423">"Geräteverbrauch seit vollständiger Aufladung (<xliff:g id="RELATIVE_TIME">^1</xliff:g>)"</string>
     <string name="screen_usage_summary" msgid="6687403051423153550">"Aktivierungsdauer des Displays seit letzter vollständiger Aufladung"</string>
     <string name="device_usage_list_summary" msgid="5623036661468763251">"Gerätenutzung seit letzter vollständiger Aufladung"</string>
     <string name="battery_since_unplugged" msgid="338073389740738437">"Akkuverbrauch seit dem Ausstecken"</string>
@@ -2208,14 +2221,14 @@
     <string name="credentials_unlock_hint" msgid="2301301378040499348">"Gib das Passwort für den Anmeldedatenspeicher ein."</string>
     <string name="credentials_old_password" msgid="7553393815538684028">"Aktuelles Passwort:"</string>
     <string name="credentials_reset_hint" msgid="6297256880896133631">"Alle Inhalte entfernen?"</string>
-    <string name="credentials_password_too_short" msgid="7502749986405522663">"Das Passwort muss mindestens 8 Zeichen lang sein."</string>
     <string name="credentials_wrong_password" msgid="2541932597104054807">"Falsches Passwort"</string>
     <string name="credentials_reset_warning" msgid="5320653011511797600">"Falsches Passwort. Du hast noch einen Versuch, bevor dein Anmeldedatenspeicher gelöscht wird."</string>
     <string name="credentials_reset_warning_plural" msgid="6514085665301095279">"Falsches Passwort. Du hast noch <xliff:g id="NUMBER">%1$d</xliff:g> Versuche, bevor dein Anmeldedatenspeicher gelöscht wird."</string>
     <string name="credentials_erased" msgid="2907836028586342969">"Speicher wurde gelöscht."</string>
     <string name="credentials_not_erased" msgid="7685932772284216097">"Anmeldedaten nicht gelöscht"</string>
     <string name="credentials_enabled" msgid="7588607413349978930">"Der Anmeldedatenspeicher ist aktiviert."</string>
-    <string name="credentials_configure_lock_screen_hint" msgid="6757119179588664966">"Zur Verwendung des Anmeldedatenspeichers musst du eine PIN oder ein Passwort für die Displaysperre festlegen."</string>
+    <string name="credentials_configure_lock_screen_hint" msgid="8058230497337529036">"Damit du den Anmeldedatenspeicher verwenden kannst, muss auf deinem Gerät ein sicherer Sperrbildschirm eingerichtet sein"</string>
+    <string name="credentials_configure_lock_screen_button" msgid="253239765216055321">"SPERRE EINRICHTEN"</string>
     <string name="usage_access_title" msgid="332333405495457839">"Apps mit Nutzungsdatenzugriff"</string>
     <string name="emergency_tone_title" msgid="1055954530111587114">"Notfallsignal"</string>
     <string name="emergency_tone_summary" msgid="722259232924572153">"Verhalten bei einem Notruf festlegen"</string>
@@ -2335,8 +2348,6 @@
     <skip />
     <string name="cant_sync_dialog_title" msgid="2777238588398046285">"Manuelle Synchronisierung nicht möglich"</string>
     <string name="cant_sync_dialog_message" msgid="1938380442159016449">"Die Synchronisierung hierfür ist deaktiviert. Zur Änderung dieser Einstellung aktiviere vorübergehend die Hintergrunddaten und die automatische Synchronisierung."</string>
-    <string name="wimax_settings" msgid="2655139497028469039">"4G"</string>
-    <string name="status_wimax_mac_address" msgid="8390791848661413416">"4G-MAC-Adresse"</string>
     <string name="enter_password" msgid="8035706727471334122">"Gib dein Passwort ein, um Android zu starten."</string>
     <string name="enter_pin" msgid="5305333588093263790">"Gib deine PIN ein, um Android zu starten."</string>
     <string name="enter_pattern" msgid="4187435713036808566">"Zeichne dein Muster, um Android zu starten."</string>
@@ -2350,6 +2361,7 @@
     <string name="misc_files_selected_count" msgid="4647048020823912088">"<xliff:g id="NUMBER">%1$d</xliff:g> von <xliff:g id="TOTAL">%2$d</xliff:g> ausgewählt"</string>
     <string name="misc_files_selected_count_bytes" msgid="2876232009069114352">"<xliff:g id="NUMBER">%1$s</xliff:g> von <xliff:g id="TOTAL">%2$s</xliff:g>"</string>
     <string name="select_all" msgid="1562774643280376715">"Alles auswählen"</string>
+    <string name="data_plan_usage_manage_plans_button_text" msgid="8997761990902708162">"Verträge verwalten"</string>
     <string name="data_usage_summary_title" msgid="3804110657238092929">"Datennutzung"</string>
     <string name="data_usage_app_summary_title" msgid="4147258989837459172">"Datennutzung durch Apps"</string>
     <string name="data_usage_accounting" msgid="7170028915873577387">"Dein Mobilfunkanbieter berechnet die Datennutzung eventuell anders als das Gerät."</string>
@@ -2435,6 +2447,9 @@
     <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_disabled" msgid="727808462375941567">"Um kostenpflichtige Netzwerke auszuwählen, aktiviere WLAN."</string>
+    <string name="data_usage_metered_auto" msgid="1262028400911918865">"Automatisch"</string>
+    <string name="data_usage_metered_yes" msgid="9217539611385225894">"Kostenpflichtig"</string>
+    <string name="data_usage_metered_no" msgid="4025232961929071789">"Nicht kostenpflichtig"</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>
     <string name="cryptkeeper_return_to_call" msgid="5613717339452772491">"Zurück zum Anruf"</string>
@@ -2526,9 +2541,6 @@
     <string name="backup_pw_set_button_text" msgid="2387480910044648795">"Passwort festlegen"</string>
     <string name="backup_pw_cancel_button_text" msgid="8845630125391744615">"Abbrechen"</string>
     <string name="additional_system_update_settings_list_item_title" msgid="214987609894661992">"Zusätzliche Systemupdates"</string>
-    <string name="selinux_status_disabled" msgid="924551035552323327">"Deaktiviert"</string>
-    <string name="selinux_status_permissive" msgid="6004965534713398778">"Moderat"</string>
-    <string name="selinux_status_enforcing" msgid="2252703756208463329">"Strikt"</string>
     <string name="ssl_ca_cert_warning" msgid="2045866713601984673">"Das Netzwerk wird möglicherweise überwacht."</string>
     <string name="done_button" msgid="1991471253042622230">"Fertig"</string>
     <plurals name="ssl_ca_cert_dialog_title" formatted="false" msgid="7145092748045794650">
@@ -2571,7 +2583,7 @@
     <string name="user_add_user_message_long" msgid="8562152293752222985">"Du kannst dieses Gerät für andere Nutzer freigeben, indem du weitere Nutzer erstellst. Jeder Nutzer erhält einen eigenen Bereich, in dem er Apps, den Hintergrund usw. personalisieren kann. Jeder Nutzer kann zudem Geräteeinstellungen wie WLAN ändern, die sich auf alle Nutzer auswirken.\n\nWenn du einen neuen Nutzer hinzufügst, muss dieser seinen Bereich einrichten.\n\nJeder Nutzer kann Apps für alle anderen Nutzer aktualisieren."</string>
     <string name="user_add_user_message_short" msgid="1511354412249044381">"Wenn du einen neuen Nutzer hinzufügst, muss dieser seinen Bereich einrichten.\n\nJeder Nutzer kann Apps für alle anderen Nutzer aktualisieren."</string>
     <string name="user_setup_dialog_title" msgid="1765794166801864563">"Nutzer jetzt einrichten?"</string>
-    <string name="user_setup_dialog_message" msgid="1004068621380867148">"Die Person muss Zugang zu dem Gerät haben und deinen Speicherplatz einrichten."</string>
+    <string name="user_setup_dialog_message" msgid="1004068621380867148">"Die Person muss Zugang zum Gerät haben und ihren Bereich einrichten."</string>
     <string name="user_setup_profile_dialog_message" msgid="3896568553327558731">"Profil jetzt einrichten?"</string>
     <string name="user_setup_button_setup_now" msgid="3391388430158437629">"Jetzt einrichten"</string>
     <string name="user_setup_button_setup_later" msgid="3068729597269172401">"Nicht jetzt"</string>
@@ -2726,6 +2738,7 @@
       <item quantity="other">%d ausgeblendete Elemente anzeigen</item>
       <item quantity="one">%d ausgeblendetes Element anzeigen</item>
     </plurals>
+    <string name="dashboard_suggestion_condition_footer_content_description" msgid="2898588191174845961">"Minimieren"</string>
     <string name="network_dashboard_title" msgid="4771589228992391573">"Netzwerk &amp; Internet"</string>
     <string name="network_dashboard_summary_mobile" msgid="3851083934739500429">"Mobilfunknetz"</string>
     <string name="network_dashboard_summary_data_usage" msgid="3843261364705042212">"Datennutzung"</string>
@@ -2807,7 +2820,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-Weckerton"</string>
+    <string name="alarm_ringtone_title" msgid="6344025478514311386">"Standard-Weckton"</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>
@@ -2828,8 +2841,14 @@
       <item quantity="other"><xliff:g id="ON_COUNT">%d</xliff:g> automatische Regeln aktiviert</item>
       <item quantity="one">1 automatische Regel aktiviert</item>
     </plurals>
-    <string name="zen_mode_settings_title" msgid="842308776768942600">"Einstellungen für \"Nicht stören\""</string>
-    <string name="zen_mode_priority_settings_title" msgid="2623117023031824309">"Nur wichtige Unterbrechungen zulassen"</string>
+    <string name="zen_mode_settings_title" msgid="1066226840983908121">"Bitte nicht stören"</string>
+    <string name="zen_mode_behavior_settings_title" msgid="1463303933529313969">"Verhalten"</string>
+    <string name="zen_mode_behavior_allow_title" msgid="3845615648136218141">"Töne &amp; Vibration zulassen von"</string>
+    <string name="zen_mode_behavior_no_sound" msgid="1219626004723208056">"Kein Ton"</string>
+    <string name="zen_mode_behavior_total_silence" msgid="6716603819806610626">"Kein Ton (Lautlos)"</string>
+    <string name="zen_mode_behavior_no_sound_except" msgid="4968477585788243114">"Kein Ton außer durch <xliff:g id="CATEGORIES">%1$s</xliff:g>"</string>
+    <!-- no translation found for zen_mode_behavior_alarms_only (2423480992071472963) -->
+    <skip />
     <string name="zen_mode_automation_settings_title" msgid="4228995740594063774">"Automatische Regeln"</string>
     <string name="zen_mode_automation_suggestion_title" msgid="5105443455143476201">"\"Nicht stören\"-Regeln einrichten"</string>
     <string name="zen_mode_automation_suggestion_summary" msgid="4732808039946935657">"Töne &amp; Vibrationen zu bestimmten Zeiten einschränken"</string>
@@ -2871,13 +2890,15 @@
     <string name="notifications_title" msgid="8086372779371204971">"Benachrichtigungen"</string>
     <string name="app_notifications_title" msgid="5810577805218003760">"App-Benachrichtigungen"</string>
     <string name="notification_channel_title" msgid="2260666541030178452">"Benachrichtigungskategorie"</string>
+    <string name="notification_group_title" msgid="7180506440133859601">"Kategoriegruppe für Benachrichtigungen"</string>
     <string name="notification_importance_title" msgid="848692592679312666">"Wichtigkeit"</string>
-    <string name="notification_importance_unspecified" msgid="2196023702875112081">"Entscheidung der App überlassen"</string>
+    <string name="notification_importance_unspecified" msgid="6622173510486113958">"Akustisches Signal erlauben"</string>
     <string name="notification_importance_blocked" msgid="7938180808339386300">"Niemals Benachrichtigungen anzeigen"</string>
     <string name="notification_importance_min" msgid="5455049524984686275">"Kein akustisches Signal und keine visuelle Unterbrechung"</string>
     <string name="notification_importance_low" msgid="8881468429453766553">"Kein Ton"</string>
-    <string name="notification_importance_default" msgid="5958338024601957516">"Akustisches Signal"</string>
+    <string name="notification_importance_default" msgid="5958338024601957516">"Akustisches Signal ausgeben"</string>
     <string name="notification_importance_high" msgid="2082429479238228527">"Akustisches Signal und Bildschirmbenachrichtigung"</string>
+    <string name="notification_importance_high_silent" msgid="2667033773703765252">"Bildschirmbenachrichtigung"</string>
     <string name="notification_importance_min_title" msgid="6974673091137544803">"Niedrig"</string>
     <string name="notification_importance_low_title" msgid="8131254047772814309">"Mittel"</string>
     <string name="notification_importance_default_title" msgid="9120383978536089489">"Hoch"</string>
@@ -2914,14 +2935,19 @@
     <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_summary" msgid="1264019085827708920">"Während die App geöffnet ist oder nachdem du sie verlässt (z. B. um ein Video weiter anzusehen) öffnet die App ein Bild-im-Bild-Fenster. Das Fenster wird über anderen Apps eingeblendet, die du gerade verwendest."</string>
+    <string name="picture_in_picture_app_detail_summary" msgid="1264019085827708920">"Während die App geöffnet ist oder nachdem du sie verlässt (z. B. um ein Video weiter anzusehen), öffnet die App ein Bild-im-Bild-Fenster. Das Fenster wird über anderen Apps eingeblendet, die du gerade verwendest."</string>
     <string name="manage_zen_access_title" msgid="2611116122628520522">"Zugriff während \"Nicht stören\""</string>
     <string name="zen_access_empty_text" msgid="8772967285742259540">"Keine installierte App hat während \"Nicht stören\" Zugriff angefordert."</string>
     <string name="loading_notification_apps" msgid="5031818677010335895">"Apps werden geladen..."</string>
     <string name="app_notifications_off_desc" msgid="4882445501376722969">"Android unterbindet, dass Benachrichtigungen dieser App auf dem Gerät angezeigt werden"</string>
     <string name="channel_notifications_off_desc" msgid="5899225298718840635">"Android unterbindet, dass Benachrichtigungen dieser Kategorie auf dem Gerät angezeigt werden"</string>
+    <string name="channel_group_notifications_off_desc" msgid="1620950416247316370">"Android unterbindet die Anzeige von Benachrichtigungen dieser Gruppe auf diesem Gerät"</string>
     <string name="notification_channels" msgid="5346841743182627500">"Kategorien"</string>
     <string name="notification_channels_other" msgid="5645317113885788226">"Andere"</string>
+    <plurals name="notification_group_summary" formatted="false" msgid="3420621520561455358">
+      <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> Kategorien</item>
+      <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> Kategorie</item>
+    </plurals>
     <string name="no_channels" msgid="3077375508177744586">"Für diese App gibt es keine Benachrichtigungen"</string>
     <string name="app_settings_link" msgid="8894946007543660906">"Zusätzliche Einstellungen in der App"</string>
     <string name="app_notification_listing_summary_zero" msgid="6482582965081108108">"Für alle Apps aktiviert"</string>
@@ -2942,7 +2968,7 @@
     <string name="notification_badge_title" msgid="6370122441168519809">"App-Benachrichtigungspunkt erlauben"</string>
     <string name="notification_channel_badge_title" msgid="2240827899882847087">"App-Benachrichtigungspunkt anzeigen"</string>
     <string name="app_notification_override_dnd_title" msgid="7867458246395884830">"\"Nicht stören\" deaktivieren"</string>
-    <string name="app_notification_override_dnd_summary" msgid="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 gemeldet 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>
@@ -2967,7 +2993,7 @@
     <string name="zen_mode_configure_rule" msgid="8865785428056490305">"Regel konfigurieren"</string>
     <string name="zen_schedule_rule_type_name" msgid="142936744435271449">"Zeitregel"</string>
     <string name="zen_schedule_rule_enabled_toast" msgid="3379499360390382259">"Automatische Regel zur Aktivierung des Status \"Nicht stören\" zu bestimmten Zeiten eingestellt"</string>
-    <string name="zen_event_rule_type_name" msgid="2645981990973086797">"Ereignisregel"</string>
+    <string name="zen_event_rule_type_name" msgid="2645981990973086797">"Terminregel"</string>
     <string name="zen_event_rule_enabled_toast" msgid="6910577623330811480">"Automatische Regel zur Aktivierung des Status \"Nicht stören\" während bestimmter Ereignisse eingestellt"</string>
     <string name="zen_mode_event_rule_calendar" msgid="8787906563769067418">"Während Terminen für"</string>
     <string name="zen_mode_event_rule_summary_calendar_template" msgid="5135844750232403975">"Während Terminen für <xliff:g id="CALENDAR">%1$s</xliff:g>"</string>
@@ -2993,17 +3019,19 @@
     <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 beliebiger Person"</string>
+    <string name="zen_mode_from_anyone" msgid="2638322015361252161">"Von allen"</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>
     <string name="zen_mode_alarms" msgid="2165302777886552926">"Wecker"</string>
+    <!-- no translation found for zen_mode_media_system_other (8900209390529859777) -->
+    <skip />
     <string name="zen_mode_reminders" msgid="5458502056440485730">"Erinnerungen"</string>
     <string name="zen_mode_events" msgid="7914446030988618264">"Termine"</string>
     <string name="zen_mode_all_callers" msgid="584186167367236922">"Alle Anrufer"</string>
     <string name="zen_mode_selected_callers" msgid="3127598874060615742">"ausgewählte Anrufer"</string>
     <string name="zen_mode_repeat_callers" msgid="5019521886428322131">"Wiederholte Anrufer"</string>
-    <string name="zen_mode_repeat_callers_summary" msgid="7192713032364140137">"Zulassen, falls dieselbe Person innerhalb von <xliff:g id="MINUTES">%d</xliff:g> Minuten erneut anruft"</string>
+    <string name="zen_mode_repeat_callers_summary" msgid="239685342222975733">"Wenn dieselbe Person innerhalb von <xliff:g id="MINUTES">%d</xliff:g> Minuten noch einmal anruft"</string>
     <string name="zen_mode_when" msgid="2767193283311106373">"Autom. aktivieren"</string>
     <string name="zen_mode_when_never" msgid="8809494351918405602">"Nie"</string>
     <string name="zen_mode_when_every_night" msgid="3122486110091921009">"Jede Nacht"</string>
@@ -3032,6 +3060,7 @@
     <string name="zen_mode_screen_off_visual_interruptions" msgid="4850792880144382633">"Bei deaktiviertem Display"</string>
     <string name="zen_mode_no_visual_interruptions" msgid="8742776003822778472">"Bei aktiviertem oder deaktiviertem Display"</string>
     <string name="notification_app_settings_button" msgid="6685640230371477485">"Benachrichtigungseinstellungen"</string>
+    <string name="suggestion_button_text" msgid="3275010948381252006">"Ok"</string>
     <string name="device_feedback" msgid="3238056036766293294">"Feedback zu diesem Gerät senden"</string>
     <string name="restr_pin_enter_admin_pin" msgid="1085834515677448072">"Administrator-PIN eingeben"</string>
     <string name="switch_on_text" msgid="1124106706920572386">"An"</string>
@@ -3216,6 +3245,7 @@
     <string name="usb_summary_file_transfers" msgid="6435943692610175111">"Dateien übertragen"</string>
     <string name="usb_summary_photo_transfers" msgid="8440204169576585250">"Fotos übertragen (PTP)"</string>
     <string name="usb_summary_MIDI" msgid="5687906612187885908">"Gerät als MIDI verwenden"</string>
+    <string name="sms_mirroring_pref" msgid="6475043279147376031">"SMS spiegeln"</string>
     <string name="background_check_pref" msgid="7550258400138010979">"Hintergrundprüfung"</string>
     <string name="background_check_title" msgid="4534254315824525593">"Vollständiger Zugriff auf Hintergrund"</string>
     <string name="assist_access_context_title" msgid="2269032346698890257">"Text auf Bildschirm verwenden"</string>
@@ -3282,7 +3312,7 @@
     <string name="write_settings_title" msgid="4232152481902542284">"Kann Systemeinstellungen ändern"</string>
     <string name="write_system_settings" msgid="3482913590601096763">"Systemeinstellungen ändern"</string>
     <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="permit_write_settings" msgid="658555006453212691">"Ä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>
@@ -3377,9 +3407,12 @@
     <string name="color_temperature" msgid="2070126836910615605">"Kalte Farbtemperatur"</string>
     <string name="color_temperature_desc" msgid="4793729830226404052">"Kältere Displayfarben verwenden"</string>
     <string name="color_temperature_toast" msgid="4974218172133854827">"Deaktiviere den Bildschirm, um die neue Farbeinstellung zu übernehmen"</string>
-    <string name="telephony_monitor_toast" msgid="7003764250271195384">"Gerät neu starten, damit die Änderungen bei Telephony Monitor wirksam werden"</string>
+    <string name="connectivity_monitor_switch" msgid="9059759348648583421">"Connectivity Monitor"</string>
+    <string name="connectivity_monitor_switch_summary" msgid="2828658652378866401">"Mit Connectivity Monitor werden Protokolle erfasst, wenn ein Verbindungsproblem entdeckt wird. Nutzer werden dazu aufgefordert, den Programmfehler zu melden."</string>
+    <string name="connectivity_monitor_toast" msgid="5551859612881173028">"Gerät neu starten, damit die Änderungen bei Connectivity Monitor wirksam werden"</string>
     <string name="camera_hal_hdrplus_switch" msgid="8377365197105267466">"Kamera HAL HDR+"</string>
     <string name="camera_hal_hdrplus_toast" msgid="2063703797270055299">"Gerät neu starten, damit die Änderungen bei Kamera HAL HDR+ wirksam werden"</string>
+    <string name="camera_laser_sensor_switch" msgid="8913588990743234440">"Kamera-Lasersensor"</string>
     <string name="ota_disable_automatic_update" msgid="2319639631655915050">"Automatische Systemupdates"</string>
     <string name="usage" msgid="2977875522080448986">"Nutzung"</string>
     <string name="cellular_data_usage" msgid="2155683719898158203">"Mobile Datennutzung"</string>
@@ -3405,7 +3438,7 @@
     <string name="data_warning" msgid="209133958008062117">"Warnlimit für mobile Daten"</string>
     <string name="set_data_limit" msgid="2901526323210516923">"Datenlimit festlegen"</string>
     <string name="data_limit" msgid="1885406964934590552">"Datenlimit"</string>
-    <string name="data_usage_template" msgid="392191945602400904">"<xliff:g id="ID_1">%1$s</xliff:g> im Zeitraum <xliff:g id="ID_2">%2$s</xliff:g> genutzt"</string>
+    <string name="data_usage_template" msgid="2923744765873163859">"Datennutzung im Zeitraum <xliff:g id="ID_2">%2$s</xliff:g>: <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="configure" msgid="1029654422228677273">"Konfigurieren"</string>
     <string name="data_usage_other_apps" msgid="3272872663517382050">"Weitere bei der Nutzung mitgerechnete Apps"</string>
     <plurals name="data_saver_unrestricted_summary" formatted="false" msgid="2635267833484232703">
@@ -3474,7 +3507,7 @@
     <string name="button_confirm_convert_fbe" msgid="7101855374850373091">"Löschen und wechseln"</string>
     <string name="reset_shortcut_manager_throttling" msgid="6495066467198668994">"Zugriffsbegrenzung im ShortcutManager zurücksetzen"</string>
     <string name="reset_shortcut_manager_throttling_complete" msgid="1826770872063707900">"Zugriffsbegrenzung im ShortcutManager zurückgesetzt"</string>
-    <string name="notification_suggestion_title" msgid="4506524937307816475">"Sperrbildschirm-Benachr. verwalten"</string>
+    <string name="notification_suggestion_title" msgid="387052719462473500">"Infos auf Sperrbildschirm festlegen"</string>
     <string name="notification_suggestion_summary" msgid="8521159741445416875">"Benachrichtigungsinhalt ein- oder ausblenden"</string>
     <string name="page_tab_title_summary" msgid="4070309266374993258">"Alle"</string>
     <string name="page_tab_title_support" msgid="8483187649355540109">"Support &amp; Tipps"</string>
@@ -3482,7 +3515,7 @@
     <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>
     <string name="premium_sms_access" msgid="4660047004791638305">"Zugriff auf Premium-SMS"</string>
-    <string name="bluetooth_disabled" msgid="2456198532288640046">"Für andere Geräte nicht sichtbar"</string>
+    <string name="bluetooth_disabled" msgid="6244000672828617410">"Aus"</string>
     <string name="bluetooth_connected_summary" msgid="7672528674593152862">"Mit <xliff:g id="ID_1">%1$s</xliff:g> verbunden"</string>
     <string name="bluetooth_connected_multiple_devices_summary" msgid="9173661896296663932">"Mit mehreren Geräten verbunden"</string>
     <string name="demo_mode" msgid="2798762752209330277">"Demomodus der System-UI"</string>
@@ -3494,7 +3527,7 @@
     <string name="support_escalation_24_7_summary" msgid="2802773279262547187">"Unser Kundenservice steht täglich rund um die Uhr zur Verfügung"</string>
     <string name="support_escalation_closed_summary" msgid="2240967274380168303">"Durchsuche die Hilfe oder versuche es noch einmal während der Geschäftszeiten des Supports (Ortszeit):&lt;br&gt;&lt;b&gt;<xliff:g id="OPERATION_HOURS">%s</xliff:g>&lt;/b&gt;"</string>
     <string name="support_escalation_no_internet_summary" msgid="2526082812336597989">"Geschäftszeiten des telefonischen Supports (Ortszeit)&lt;br&gt;&lt;b&gt;<xliff:g id="OPERATION_HOURS">%s</xliff:g>&lt;/b&gt;"</string>
-    <string name="support_escalation_unavailable_summary" msgid="5208552975245211898">"Hilfe durchsuchen oder Tipps &amp; Tricks erkunden"</string>
+    <string name="support_escalation_unavailable_summary" msgid="5208552975245211898">"In Hilfe suchen oder Tipps &amp; Tricks erkunden"</string>
     <string name="support_country_list_title" msgid="823853371280534111">"Kundenservice für:"</string>
     <string name="support_country_format" msgid="4502523713489559595">"<xliff:g id="COUNTRY">%1$s</xliff:g> – <xliff:g id="LANGUAGE">%2$s</xliff:g>"</string>
     <string name="support_phone_international_format" msgid="2143528744844720829">"<xliff:g id="LANGUAGE">%1$s</xliff:g> (<xliff:g id="PHONE">%2$s</xliff:g>)"</string>
@@ -3503,7 +3536,7 @@
     <string name="support_escalation_by_phone" msgid="4843223043487058711">"Anrufen"</string>
     <string name="support_escalation_by_chat" msgid="977019859110763749">"Chatten"</string>
     <string name="support_tips_and_tricks_title" msgid="4153466795695447828">"Tipps &amp; Tricks erkunden"</string>
-    <string name="support_help_feedback_title" msgid="693440287222186718">"Hilfe durchsuchen &amp; Feedback senden"</string>
+    <string name="support_help_feedback_title" msgid="693440287222186718">"In Hilfe suchen &amp; Feedback senden"</string>
     <string name="support_sign_in_required_title" msgid="1367187789121480440">"Kundenservice kontaktieren"</string>
     <string name="support_sign_in_button_text" msgid="3054769428620671241">"Anmelden"</string>
     <string name="support_sign_in_required_help" msgid="5200654782405538114">"Anmeldung nicht möglich?"</string>
@@ -3547,7 +3580,7 @@
     <string name="gesture_preference_summary" product="tablet" msgid="4717535378272065510">"Schnelle Gesten zum Steuern deines Tablets"</string>
     <string name="gesture_preference_summary" product="device" msgid="4205941452664950852">"Schnelle Gesten zum Steuern deines Geräts"</string>
     <string name="double_tap_power_for_camera_title" msgid="64716226816032800">"Zur Kamera wechseln"</string>
-    <string name="double_tap_power_for_camera_summary" msgid="242037150983277829">"Starte die Kamera direkt, indem du die Ein-/Aus-Taste zweimal drückst. Dies funktioniert auf jedem Display."</string>
+    <string name="double_tap_power_for_camera_summary" msgid="242037150983277829">"Ein-/Aus-Taste zweimal drücken, um Kamera direkt zu starten. Funktioniert bei jedem Display."</string>
     <string name="double_tap_power_for_camera_suggestion_title" msgid="6500405261202883589">"Kamera schnell öffnen"</string>
     <string name="double_tap_power_for_camera_suggestion_summary" msgid="7010153544554016996">"Ein-/Aus-Taste zweimal drücken, um die Kamera zu öffnen"</string>
     <string name="double_twist_for_camera_mode_title" msgid="4877834147983530479">"Kamera wechseln"</string>
@@ -3569,9 +3602,9 @@
     <string name="ambient_display_pickup_summary" product="device" msgid="8256669101643381568">"Gerät in die Hand nehmen, um Uhrzeit, Benachrichtigungen und andere Informationen anzusehen."</string>
     <string name="ambient_display_pickup_suggestion_summary" msgid="7014700589991761035">"Benachrichtigungen bei inaktivem Display ansehen"</string>
     <string name="fingerprint_swipe_for_notifications_title" msgid="5816346492253270243">"Benachr. mit Fingerabdruck"</string>
-    <string name="fingerprint_swipe_for_notifications_summary" product="default" msgid="1770661868393713922">"Du kannst deine Benachrichtigungen lesen, indem du auf der Rückseite deines Smartphones über den Fingerabdrucksensor nach unten wischst."</string>
-    <string name="fingerprint_swipe_for_notifications_summary" product="tablet" msgid="902719947767712895">"Du kannst deine Benachrichtigungen lesen, indem du auf der Rückseite deines Tablets über den Fingerabdrucksensor nach unten wischst."</string>
-    <string name="fingerprint_swipe_for_notifications_summary" product="device" msgid="5372926094116306647">"Du kannst deine Benachrichtigungen lesen, indem du auf der Rückseite deines Geräts über den Fingerabdrucksensor nach unten wischst."</string>
+    <string name="fingerprint_swipe_for_notifications_summary" product="default" msgid="1770661868393713922">"Auf der Rückseite des Smartphones über den Fingerabdrucksensor nach unten wischen, um Benachrichtigungen zu lesen."</string>
+    <string name="fingerprint_swipe_for_notifications_summary" product="tablet" msgid="902719947767712895">"Auf der Rückseite des Tablets über den Fingerabdrucksensor nach unten wischen, um Benachrichtigungen zu lesen."</string>
+    <string name="fingerprint_swipe_for_notifications_summary" product="device" msgid="5372926094116306647">"Auf der Rückseite des Geräts über den Fingerabdrucksensor nach unten wischen, um Benachrichtigungen zu lesen."</string>
     <string name="fingerprint_swipe_for_notifications_suggestion_title" msgid="1677291167470357802">"Benachrichtigungen schnell ansehen"</string>
     <string name="fingerprint_swipe_for_notifications_suggestion_summary" msgid="127592803294414082">"Auf dem Fingerabdrucksensor nach unten wischen"</string>
     <string name="gesture_setting_on" msgid="3455094265233870280">"An"</string>
@@ -3584,7 +3617,7 @@
     <string name="web_action_enable_title" msgid="4051513950976670853">"Instant-Apps"</string>
     <string name="web_action_enable_summary" msgid="3108127559723396382">"Links in Apps öffnen, selbst wenn diese nicht installiert sind"</string>
     <string name="web_action_section_title" msgid="7364647086538399136">"Instant-Apps"</string>
-    <string name="instant_apps_account" msgid="1433620209791992528">"Instant-Apps-Konto"</string>
+    <string name="instant_apps_settings" msgid="8827777916518348213">"Android Instant Apps-Einstellungen"</string>
     <string name="domain_url_section_title" msgid="7046835219056428883">"Installierte Apps"</string>
     <string name="automatic_storage_manager_activation_warning" msgid="6353100011690933254">"Dein Speicher wird jetzt vom Speichermanager verwaltet"</string>
     <string name="account_for_section_header" msgid="5356566418548737121">"Konten für <xliff:g id="USER_NAME">%1$s</xliff:g>"</string>
@@ -3604,8 +3637,8 @@
     <string name="enterprise_privacy_exposure_category" msgid="7313392680107938517">"Art von Informationen, die deine Organisation sehen kann"</string>
     <string name="enterprise_privacy_exposure_changes_category" msgid="9079283547182933771">"Änderungen des Administrators deiner Organisation"</string>
     <string name="enterprise_privacy_device_access_category" msgid="5423434164248819058">"Mein Zugriff auf dieses Gerät"</string>
-    <string name="enterprise_privacy_enterprise_data" msgid="2773968662865848413">"Daten zu deinem Arbeitskonto, etwa E-Mail und Kalender"</string>
-    <string name="enterprise_privacy_installed_packages" msgid="2313698828178764590">"Liste der Apps auf deinem Gerät"</string>
+    <string name="enterprise_privacy_enterprise_data" msgid="2773968662865848413">"Daten zum Arbeitskonto, etwa E-Mail und Kalender"</string>
+    <string name="enterprise_privacy_installed_packages" msgid="2313698828178764590">"Liste der Apps auf dem Gerät"</string>
     <string name="enterprise_privacy_usage_stats" msgid="4398411405572759370">"Nutzungsdauer und genutzte Datenmenge für jede App"</string>
     <string name="enterprise_privacy_network_logs" msgid="161722817268849590">"Neuestes Protokoll zum Netzwerkverkehr"</string>
     <string name="enterprise_privacy_bug_reports" msgid="843225086779037863">"Neuester Fehlerbericht"</string>
@@ -3630,8 +3663,10 @@
     <string name="enterprise_privacy_always_on_vpn_device" msgid="4409098287763221215">"Durchgehend aktives VPN wurde aktiviert"</string>
     <string name="enterprise_privacy_always_on_vpn_personal" msgid="9217774730260037434">"Durchgehend aktives VPN wurde für dein persönliches Profil aktiviert"</string>
     <string name="enterprise_privacy_always_on_vpn_work" msgid="7244472958208315814">"Durchgehend aktives VPN wurde für dein Arbeitsprofil aktiviert"</string>
-    <string name="enterprise_privacy_global_http_proxy" msgid="7936664553416257333">"Globaler HTTP-Proxy wurde eingerichet"</string>
-    <string name="enterprise_privacy_ca_certs" msgid="5885892204903688909">"Vertrauenswürdige Anmeldedaten"</string>
+    <string name="enterprise_privacy_global_http_proxy" msgid="7936664553416257333">"Globaler HTTP-Proxy wurde eingerichtet"</string>
+    <string name="enterprise_privacy_ca_certs_device" msgid="2019652712782510262">"Vertrauenswürdige Anmeldedaten"</string>
+    <string name="enterprise_privacy_ca_certs_personal" msgid="2279084820904076599">"Vertrauenswürdige Anmeldedaten in deinem privaten Profil"</string>
+    <string name="enterprise_privacy_ca_certs_work" msgid="6187377647815301809">"Vertrauenswürdige Anmeldedaten in deinem Arbeitsprofil"</string>
     <plurals name="enterprise_privacy_number_ca_certs" formatted="false" msgid="526375234629534165">
       <item quantity="other">Mindestens <xliff:g id="COUNT_1">%d</xliff:g> CA-Zertifikate</item>
       <item quantity="one">Mindestens <xliff:g id="COUNT_0">%d</xliff:g> CA-Zertifikat</item>
@@ -3694,6 +3729,8 @@
     <string name="carrier_provisioning" msgid="4398683675591893169">"Informationen zur Nutzerverwaltung durch den Anbieter"</string>
     <string name="trigger_carrier_provisioning" msgid="3434865918009286187">"Nutzerverwaltung durch den Anbieter auslösen"</string>
     <string name="new_device_suggestion_title" msgid="698847081680980774">"Was gibt\'s Neues?"</string>
-    <string name="new_device_suggestion_summary" msgid="7172709269203435870">"Die fünf besten Funktionen"</string>
+    <string name="new_device_suggestion_summary" product="default" msgid="206396571522515855">"Lass dir zeigen, was dein neues Smartphone alles kann"</string>
+    <string name="new_device_suggestion_summary" product="tablet" msgid="393751455688210956">"Lass dir zeigen, was dein neues Tablet alles kann"</string>
+    <string name="new_device_suggestion_summary" product="device" msgid="2939870049868336652">"Lass dir zeigen, was dein neues Gerät alles kann"</string>
     <string name="disabled_low_ram_device" msgid="3751578499721173344">"Diese Funktion ist auf diesem Gerät nicht verfügbar"</string>
 </resources>
diff --git a/res/values-el/arrays.xml b/res/values-el/arrays.xml
index 6e1ba8b..c9e7dfe 100644
--- a/res/values-el/arrays.xml
+++ b/res/values-el/arrays.xml
@@ -100,8 +100,6 @@
     <!-- no translation found for wifi_security_no_eap:0 (2084555984818107151) -->
     <!-- no translation found for wifi_security_no_eap:1 (397579322683471524) -->
     <!-- no translation found for wifi_security_no_eap:2 (1968820975358150484) -->
-    <!-- no translation found for wifi_ap_security:0 (5251664683198623324) -->
-    <!-- no translation found for wifi_ap_security:1 (7989073072260294673) -->
   <string-array name="wifi_eap_method">
     <item msgid="1160193392455075561">"PEAP"</item>
     <item msgid="7981731051382306293">"TLS"</item>
diff --git a/res/values-el/strings.xml b/res/values-el/strings.xml
index 5537dee..7603968 100644
--- a/res/values-el/strings.xml
+++ b/res/values-el/strings.xml
@@ -166,7 +166,7 @@
     <string name="bluetooth_map_acceptance_dialog_text" msgid="8712508202081143737">"%1$s επιθυμεί να αποκτήσει πρόσβαση στα μηνύματά σας. Παραχώρηση πρόσβασης σε %2$s;"</string>
     <string name="bluetooth_sap_request" msgid="2669762224045354417">"Αίτημα πρόσβασης SIM"</string>
     <string name="bluetooth_sap_acceptance_dialog_text" msgid="4414253873553608690">"Η συσκευή <xliff:g id="DEVICE_NAME_0">%1$s</xliff:g> επιθυμεί πρόσβαση στην κάρτα SIM. Η χορήγηση πρόσβασης στην κάρτα SIM θα απενεργοποιήσει τη σύνδεση δεδομένων στη συσκευή σας κατά τη διάρκεια της σύνδεσης. Παραχώρηση πρόσβασης στη συσκευή <xliff:g id="DEVICE_NAME_1">%2$s?</xliff:g>"</string>
-    <string name="bluetooth_device_name_summary" msgid="4757990010751789977">"Ορατή ως \"<xliff:g id="DEVICE_NAME">^1</xliff:g>\" σε άλλες συσκευές"</string>
+    <string name="bluetooth_device_name_summary" msgid="522235742194965734">"Ορατή ως \"<xliff:g id="DEVICE_NAME">^1</xliff:g>\" σε άλλες συσκευές"</string>
     <string name="bluetooth_paired_device_title" msgid="8638994696317952019">"Οι συσκευές σας"</string>
     <string name="bluetooth_pairing_page_title" msgid="7712127387361962608">"Σύζευξη νέας συσκευής"</string>
     <string name="date_and_time" msgid="9062980487860757694">"Ημερομηνία &amp; ώρα"</string>
@@ -312,6 +312,8 @@
     <string name="zone_auto" msgid="334783869352026648">"Αυτόματη ζώνη ώρας"</string>
     <string name="zone_auto_summaryOn" msgid="6142830927278458314">"Χρήση ζώνης ώρας που παρέχεται από το δίκτυο"</string>
     <string name="zone_auto_summaryOff" msgid="2597745783162041390">"Χρήση ζώνης ώρας που παρέχεται από το δίκτυο"</string>
+    <string name="date_time_24hour_auto" msgid="2117383168985653422">"Αυτόματη μορφή 24ώρου"</string>
+    <string name="date_time_24hour_auto_summary" msgid="6351812925651480277">"Χρήση προεπιλογής τοπικών ρυθμίσεων"</string>
     <string name="date_time_24hour_title" msgid="3203537578602803850">"24ωρη μορφή"</string>
     <string name="date_time_24hour" msgid="1193032284921000063">"Χρήση μορφής 24ώρου"</string>
     <string name="date_time_set_time_title" msgid="6296795651349047016">"Ώρα"</string>
@@ -372,6 +374,9 @@
     <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="1961957425135180242">"Επόμενο"</string>
+    <string name="setup_fingerprint_enroll_skip_title" msgid="362050541117362034">"Παράβλεψη δακτ. αποτυπώματος;"</string>
+    <string name="setup_fingerprint_enroll_skip_after_adding_lock_text" msgid="958990414356204763">"Απαιτούνται ένα έως δύο λεπτά για τη ρύθμιση δακτυλικού αποτυπώματος. Εάν παραβλέψετε αυτό το βήμα, μπορείτε να προσθέσετε το δακτυλικό αποτύπωμά σας αργότερα στις ρυθμίσεις."</string>
+    <string name="lock_screen_intro_skip_title" msgid="4988210105913705679">"Παράβλεψη κλειδώματος οθόνης;"</string>
     <string name="lock_screen_intro_skip_dialog_text_frp" product="tablet" msgid="1581834104051243425">"Οι λειτουργίες προστασίας συσκευής δεν θα ενεργοποιηθούν. Δεν θα μπορείτε να αποτρέψετε άλλους χρήστες από τη χρήση αυτού του tablet εάν χαθεί, κλαπεί ή επαναφερθεί."</string>
     <string name="lock_screen_intro_skip_dialog_text_frp" product="device" msgid="4629503416877189572">"Οι λειτουργίες προστασίας συσκευής δεν θα ενεργοποιηθούν. Δεν θα μπορείτε να αποτρέψετε άλλους χρήστες από τη χρήση αυτής της συσκευής εάν χαθεί, κλαπεί ή επαναφερθεί."</string>
     <string name="lock_screen_intro_skip_dialog_text_frp" product="default" msgid="2423428240245737909">"Οι λειτουργίες προστασίας συσκευής δεν θα ενεργοποιηθούν. Δεν θα μπορείτε να αποτρέψετε άλλους χρήστες από τη χρήση αυτού του τηλεφώνου εάν χαθεί, κλαπεί ή επαναφερθεί."</string>
@@ -457,7 +462,7 @@
     <string name="setup_lock_settings_picker_title" product="tablet" msgid="90329443364067215">"Προστατέψτε το tablet σας"</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="lock_settings_picker_fingerprint_added_security_message" msgid="5768002109707648463">"Για πρόσθετη ασφάλεια, ρυθμίστε ένα εφεδρικό κλείδωμα οθόνης."</string>
     <string name="setup_lock_settings_picker_message" product="tablet" msgid="8919671129189936210">"Αποτρέψτε άλλους από τη χρήση αυτού του tablet χωρίς την άδειά σας ενεργοποιώντας τις λειτουργίες προστασίας συσκευής. Επιλέξτε το κλείδωμα οθόνης που θέλετε να χρησιμοποιήσετε."</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>
@@ -588,6 +593,7 @@
     <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="lockpassword_clear_label" msgid="5724429464960458155">"Διαγραφή"</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>
@@ -781,6 +787,7 @@
     <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,6 +824,8 @@
     <string name="wifi_wps_available_first_item" msgid="4422547079984583502">"Διαθέσιμο WPS"</string>
     <string name="wifi_wps_available_second_item" msgid="8427520131718215301">" (Διαθέσιμο WPS)"</string>
     <string name="wifi_wps_nfc_enter_password" msgid="2288214226916117159">"Εισαγάγετε κωδικό πρόσβασης δικτύου"</string>
+    <string name="wifi_carrier_connect" msgid="8174696557882299911">"Δίκτυο Wi‑Fi εταιρείας κιν. τηλεφωνίας"</string>
+    <string name="wifi_carrier_content" msgid="4634077285415851933">"Σύνδεση μέσω <xliff:g id="NAME">%1%s</xliff:g>"</string>
     <string name="wifi_scan_always_turnon_message" msgid="203123538572122989">"Για τη βελτίωση της ακρίβειας της τοποθεσίας σας και για άλλους σκοπούς, η εφαρμογή <xliff:g id="APP_NAME">%1$s</xliff:g> επιθυμεί να ενεργοποιήσει τη σάρωση δικτύων, ακόμη και όταν το Wi-Fi είναι απενεργοποιημένο.\n\nΝα επιτρέπεται αυτή η ενέργεια για όλες τις εφαρμογές που επιθυμούν σάρωση;"</string>
     <string name="wifi_scan_always_turnoff_message" msgid="5538901671131941043">"Για να το απενεργοποιήσετε, μεταβείτε στις Σύνθετες ρυθμίσεις, στο μενού υπερχείλισης."</string>
     <string name="wifi_scan_always_confirm_allow" msgid="5355973075896817232">"Να επιτρέπεται"</string>
@@ -834,6 +843,7 @@
     <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_modify" msgid="6100248070440710782">"Τροποποίηση"</string>
     <string name="wifi_failed_forget_message" msgid="1348172929201654986">"Αποτυχία κατάργησης απομνημόνευσης δικτύου"</string>
     <string name="wifi_save" msgid="3331121567988522826">"Αποθήκευση"</string>
     <string name="wifi_failed_save_message" msgid="6650004874143815692">"Αποτυχία αποθήκευσης δικτύου"</string>
@@ -846,6 +856,7 @@
     <string name="wifi_advanced_titlebar" msgid="4485841401774142908">"Σύνθετο 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_title" msgid="3471132676909349382">"Πληροφορίες δικτύου"</string>
     <string name="wifi_details_subnet_mask" msgid="6720279144174924410">"Μάσκα υποδικτύου"</string>
     <string name="wifi_details_dns" msgid="8648826607751830768">"DNS"</string>
     <string name="wifi_details_ipv6_address_header" msgid="6734119149106422148">"Διευθύνσεις IPv6"</string>
@@ -878,16 +889,15 @@
     <string name="wifi_p2p_cancel_connect_title" msgid="255267538099324413">"Ακύρωση πρόσκλησης;"</string>
     <string name="wifi_p2p_cancel_connect_message" msgid="7477756213423749402">"Θέλετε να ακυρώσετε την πρόσκληση για τη σύνδεση με τη συσκευή <xliff:g id="PEER_NAME">%1$s</xliff:g>;"</string>
     <string name="wifi_p2p_delete_group_message" msgid="834559380069647086">"Διαγραφή αυτής της ομάδας;"</string>
-    <string name="wifi_tether_checkbox_text" msgid="1847167643625779136">"Φορητό σημείο πρόσβασης Wi-Fi"</string>
     <string name="wifi_hotspot_checkbox_text" msgid="7763495093333664887">"Σημείο πρόσβασης Wi-Fi"</string>
     <string name="wifi_hotspot_off_subtext" msgid="5466126533609394170">"Δεν γίνεται κοινή χρήση διαδικτύου ή περιεχομένου με άλλες συσκευές"</string>
     <string name="wifi_hotspot_tethering_on_subtext" product="tablet" msgid="5752490509369962007">"Γίνεται κοινή χρήση της σύνδεσης αυτού του tablet στο διαδίκτυο μέσω σημείου πρόσβασης Wi-Fi"</string>
     <string name="wifi_hotspot_tethering_on_subtext" product="default" msgid="6461075246164300670">"Γίνεται κοινή χρήση της σύνδεσης αυτού του τηλεφώνου στο διαδίκτυο μέσω σημείου πρόσβασης Wi-Fi"</string>
     <string name="wifi_hotspot_on_local_only_subtext" msgid="2068110388011294735">"Η εφαρμογή μοιράζεται περιεχόμενο. Για να μοιραστείτε τη σύνδεση στο διαδίκτυο, απενεργοποιήστε το σημείο πρόσβασης Wi-Fi και, στη συνέχεια, ενεργοποιήστε το"</string>
-    <string name="wifi_hotspot_name_title" msgid="1341735529132128887">"Όνομα Wi‑Fi"</string>
+    <string name="wifi_hotspot_name_title" msgid="8237000746618636778">"Όνομα σημείου πρόσβασης Wi-Fi"</string>
     <string name="wifi_hotspot_name_summary_connecting" msgid="3378299995508671967">"Ενεργοποίηση σημείου πρόσβασης Wi-Fi <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>..."</string>
     <string name="wifi_hotspot_name_summary_connected" msgid="3888672084861445362">"Είναι δυνατή η σύνδεση άλλων συσκευών στο σημείο πρόσβασης Wi-Fi <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>"</string>
-    <string name="wifi_hotspot_password_title" msgid="1955592302902091281">"Κωδικός πρόσβασης Wi-Fi"</string>
+    <string name="wifi_hotspot_password_title" msgid="8676859981917573801">"Κωδικός σημείου πρόσβασης Wi-Fi"</string>
     <string name="wifi_hotspot_ap_band_title" msgid="1165801173359290681">"Ζώνη σημείου πρόσβασης"</string>
     <string name="wifi_hotspot_footer_info_regular" msgid="1203489406068036455">"Χρησιμοποιήστε σημείο πρόσβασης Wi-Fi, για να δημιουργήσετε ένα δίκτυο Wi-Fi για τις άλλες συσκευές σας. Το σημείο πρόσβασης Wi-Fi παρέχει πρόσβαση στο διαδίκτυο χρησιμοποιώντας τη σύνδεση δεδομένων κινητής τηλεφωνίας. Ενδέχεται να ισχύουν επιπρόσθετες χρεώσεις δεδομένων κινητής τηλεφωνίας."</string>
     <string name="wifi_hotspot_footer_info_local_only" msgid="857988412470694109">"Οι εφαρμογές μπορούν να δημιουργούν ένα σημείο πρόσβασης Wi-Fi, για να μοιράζονται περιεχόμενο με κοντινές συσκευές."</string>
@@ -898,7 +908,6 @@
     <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">"Σημείο πρόσβασης Wi-Fi AndroidAP WPA2 PSK"</string>
-    <string name="wifi_tether_configure_subtext" msgid="2050196439900426456">"Σημείο πρόσβασης Wi-Fi <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>
@@ -939,7 +948,7 @@
     <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="emergency_address_summary" msgid="3266760199681945746">"Η διεύθυνση που θα χρησιμοποιηθεί από τις υπηρεσίες έκτακτης ανάγκης ως η τοποθεσία σας εάν πραγματοποιήσετε μια κλήση έκτακτης ανάγκης μέσω Wi-Fi"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"Προβολή"</string>
     <string name="sound_settings" msgid="5534671337768745343">"Ήχος"</string>
     <string name="all_volume_title" msgid="4296957391257836961">"Ρυθμίσεις έντασης"</string>
@@ -993,6 +1002,7 @@
     <string name="search_settings" msgid="1910951467596035063">"Αναζήτηση"</string>
     <string name="search_settings_summary" msgid="9205656546570654169">"Διαχείριση ρυθμίσεων αναζήτησης και ιστορικού"</string>
     <string name="search_settings_no_results" msgid="8799027492641230999">"Δεν υπάρχουν αποτελέσματα"</string>
+    <string name="search_clear_history" msgid="4196658962573162457">"Διαγραφή ιστορικού"</string>
     <string name="display_settings" msgid="7965901687241669598">"Προβολή"</string>
     <string name="accelerometer_title" msgid="7854608399547349157">"Αυτόματη περιστροφή οθόνης"</string>
     <string name="color_mode_title" msgid="3159275920408338215">"Έντονα χρώματα"</string>
@@ -1078,23 +1088,23 @@
     <string name="sim_lock_settings_summary_on" msgid="39103355956342985">"Κλειδωμένο"</string>
     <string name="sim_lock_settings_title" msgid="9018585580955414596">"Κλείδωμα κάρτας SIM"</string>
     <string name="sim_pin_toggle" msgid="1742123478029451888">"Κλείδωμα κάρτας SIM"</string>
-    <string name="sim_lock_on" product="tablet" msgid="5058355081270397764">"Απαιτείται αριθμός PIN για τη χρήση του tablet"</string>
-    <string name="sim_lock_on" product="default" msgid="2503536505568814324">"Απαιτείται αριθμός PIN για τη χρήση του τηλεφώνου"</string>
-    <string name="sim_lock_off" product="tablet" msgid="2813800553917012356">"Απαιτείται αριθμός PIN για τη χρήση του tablet"</string>
-    <string name="sim_lock_off" product="default" msgid="258981978215428916">"Απαιτείται αριθμός PIN για τη χρήση του τηλεφώνου"</string>
+    <string name="sim_lock_on" product="tablet" msgid="5058355081270397764">"Απαιτείται PIN για τη χρήση του tablet"</string>
+    <string name="sim_lock_on" product="default" msgid="2503536505568814324">"Απαιτείται PIN για τη χρήση του τηλεφώνου"</string>
+    <string name="sim_lock_off" product="tablet" msgid="2813800553917012356">"Απαιτείται PIN για τη χρήση του tablet"</string>
+    <string name="sim_lock_off" product="default" msgid="258981978215428916">"Απαιτείται PIN για τη χρήση του τηλεφώνου"</string>
     <string name="sim_pin_change" msgid="6311414184279932368">"Αλλαγή αριθμού PIN κάρτας SIM"</string>
     <string name="sim_enter_pin" msgid="6608715137008508432">"Αριθμός PIN κάρτας SIM"</string>
     <string name="sim_enable_sim_lock" msgid="4517742794997166918">"Κλείδωμα κάρτας SIM"</string>
     <string name="sim_disable_sim_lock" msgid="7664729528754784824">"Ξεκλείδωμα κάρτας SIM"</string>
-    <string name="sim_enter_old" msgid="6074196344494634348">"Παλιός αριθμός PIN κάρτας SIM"</string>
-    <string name="sim_enter_new" msgid="8742727032729243562">"Νέος αριθμός PIN κάρτας SIM"</string>
+    <string name="sim_enter_old" msgid="6074196344494634348">"Παλιό PIN κάρτας SIM"</string>
+    <string name="sim_enter_new" msgid="8742727032729243562">"Νέο PIN κάρτας SIM"</string>
     <string name="sim_reenter_new" msgid="6523819386793546888">"Πληκτρολογήστε ξανά το νέο PIN"</string>
     <string name="sim_change_pin" msgid="7328607264898359112">"Αριθμός PIN κάρτας SIM"</string>
     <string name="sim_bad_pin" msgid="2345230873496357977">"Εσφαλμένο PIN"</string>
     <string name="sim_pins_dont_match" msgid="1695021563878890574">"Οι αριθμοί PIN δεν ταιριάζουν"</string>
-    <string name="sim_change_failed" msgid="3602072380172511475">"Δεν είναι δυνατή η αλλαγή PIN.\nΠιθανόν ο αριθμός PIN να είναι λάθος."</string>
-    <string name="sim_change_succeeded" msgid="8556135413096489627">"Ο αριθμός PIN της κάρτας SIM άλλαξε επιτυχώς"</string>
-    <string name="sim_lock_failed" msgid="2489611099235575984">"Δεν είναι δυνατή η αλλαγή της κατάστασης κλειδώματος της κάρτας SIM.\nΠιθανόν ο αριθμός PIN να είναι λάθος."</string>
+    <string name="sim_change_failed" msgid="3602072380172511475">"Δεν αλλάζει το PIN.\nΊσως να είναι λάθος."</string>
+    <string name="sim_change_succeeded" msgid="8556135413096489627">"Το PIN της κάρτας SIM άλλαξε"</string>
+    <string name="sim_lock_failed" msgid="2489611099235575984">"Δεν είναι δυνατή η αλλαγή της κατάστασης κλειδώματος της κάρτας SIM.\nΠιθανόν το PIN να είναι λάθος."</string>
     <string name="sim_enter_ok" msgid="6475946836899218919">"OK"</string>
     <string name="sim_enter_cancel" msgid="6240422158517208036">"Ακύρωση"</string>
     <string name="sim_multi_sims_title" msgid="9159427879911231239">"Βρέθηκαν πολλές SIM"</string>
@@ -1122,7 +1132,6 @@
     <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>
     <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>
@@ -1150,7 +1159,6 @@
     <string name="status_wifi_mac_address" msgid="2202206684020765378">"Διεύθυνση MAC Wi-Fi"</string>
     <string name="status_bt_address" msgid="4195174192087439720">"Διεύθυνση Bluetooth"</string>
     <string name="status_serial_number" msgid="2257111183374628137">"Σειριακός αριθμός"</string>
-    <string name="status_unavailable" msgid="7862009036663793314">"Μη διαθέσιμο"</string>
     <string name="status_up_time" msgid="7294859476816760399">"Χρόνος από την τελευταία εκκίνηση"</string>
     <string name="status_awake_time" msgid="2393949909051183652">"Χρόνος αφύπνισης"</string>
     <string name="internal_memory" msgid="9129595691484260784">"Εσωτερικός αποθηκευτικός χώρος"</string>
@@ -1326,7 +1334,8 @@
     <string name="menu_restore" msgid="8260067415075573273">"Επαναφορά στις προεπιλογές"</string>
     <string name="restore_default_apn_completed" msgid="2824775307377604897">"Η επαναφορά των προεπιλογών APN ολοκληρώθηκε."</string>
     <string name="reset_dashboard_title" msgid="6254873816990678620">"Επαναφορά επιλογών"</string>
-    <string name="reset_network_title" msgid="6166025966016873843">"Επαναφορά Wi-Fi, δικτύου κινητής τηλεφωνίας και Bluetooth"</string>
+    <string name="reset_dashboard_summary" msgid="4851012632493522755">"Μπορεί να γίνει επαναφορά δικτύου, εφαρμογών ή συσκευής"</string>
+    <string name="reset_network_title" msgid="6166025966016873843">"Επαναφ. Wi-Fi/mobile/Bluetooth"</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>
     <string name="reset_network_final_desc" msgid="6388371121099245116">"Επαναφορά όλων των ρυθμίσεων δικτύου; Δεν είναι δυνατή η αναίρεση αυτής της ενέργειας!"</string>
@@ -1334,17 +1343,14 @@
     <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="6617679904229218425">"Διαγραφή όλων των δεδομένων (Επαναφορά εργοστασιακών ρυθμίσεων)"</string>
-    <plurals name="master_clear_with_account_summary" formatted="false" msgid="5911377203778818712">
-      <item quantity="other">Θα γίνει επαναφορά <xliff:g id="ACCOUNT_COUNT">%1$d</xliff:g> λογαριασμών</item>
-      <item quantity="one">Θα γίνει επαναφορά 1 λογαριασμού</item>
-    </plurals>
-    <string name="master_clear_summary" msgid="6902443944660426951">"Θα γίνει επαναφορά του εσωτερικού αποθηκευτικού χώρου και όλων των δεδομένων"</string>
+    <string name="master_clear_title" msgid="3531267871084279512">"Διαγραφή δεδ. (επαναφορά)"</string>
     <string name="master_clear_desc" product="tablet" msgid="9146059417023157222">"Με αυτόν τον τρόπο, θα διαγραφούν όλα τα δεδομένα από τον "<b>"εσωτερικό χώρο αποθήκευσης"</b>" της συσκευής σας tablet, συμπεριλαμβανομένων:\n\nΤων δεδομένων και των ρυθμίσεων συστήματος "<li>"του Λογαριασμού σας Google "</li>\n<li></li>\n<li>"Ληφθείσες εφαρμογές"</li></string>
     <string name="master_clear_desc" product="default" msgid="4800386183314202571">"Με αυτόν τον τρόπο, θα διαγραφούν όλα τα δεδομένα από τον "<b>"εσωτερικό χώρο αποθήκευσης"</b>" της συσκευής σας tablet, συμπεριλαμβανομένων:\n\nΤων δεδομένων και των ρυθμίσεων συστήματος "<li>"του Λογαριασμού σας Google "</li>\n<li></li>\n<li>"Ληφθείσες εφαρμογές"</li></string>
     <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"Αυτήν τη στιγμή είστε συνδεδεμένοι στους παρακάτω λογαριασμούς:\n"</string>
     <string name="master_clear_other_users_present" product="default" msgid="5161423070702470742">\n\n"Υπάρχουν άλλοι χρήστες σε αυτήν τη συσκευή.\n"</string>
     <string name="master_clear_desc_also_erases_external" msgid="1903185203791274237"><li>"Μουσική"</li>\n<li>"Φωτογραφίες"</li>\n<li>"Άλλα δεδομένα χρήστη"</li></string>
+    <string name="master_clear_desc_also_erases_esim" msgid="312352697653096008"><li>"Εταιρείες κινητής τηλεφωνίας με eSIM"</li></string>
+    <string name="master_clear_desc_no_cancel_mobile_plan" msgid="5460926449093211144">\n\n"Με αυτήν την ενέργεια, δεν θα ακυρωθεί το πρόγραμμα υπηρεσίας κινητής τηλεφωνίας που χρησιμοποιείτε."</string>
     <string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="7744115866662613411">\n\n"Πρέπει να γίνει διαγραφή του "<b>"αποθηκευτικού χώρου USB"</b>" για να γίνει, επίσης, διαγραφή της μουσικής, των εικόνων και άλλων δεδομένων."</string>
     <string name="master_clear_desc_erase_external_storage" product="default" msgid="4801026652617377093">\n\n"Πρέπει να γίνει διαγραφή της "<b>"κάρτας SD"</b>" για να γίνει, επίσης, διαγραφή της μουσικής, των εικόνων και άλλων δεδομένων."</string>
     <string name="erase_external_storage" product="nosdcard" msgid="969364037450286809">"Διαγρ. αποθ. χώρου USB"</string>
@@ -1461,20 +1467,21 @@
     <string name="settings_safetylegal_activity_title" msgid="6901214628496951727">"Πληροφορίες ασφάλειας"</string>
     <string name="settings_safetylegal_activity_unreachable" msgid="250674109915859456">"Δεν είστε συνδεδεμένοι σε υπηρεσία δεδομένων. Για να προβάλετε αυτές τις πληροφορίες τώρα, μεταβείτε στο %s από οποιονδήποτε υπολογιστή με σύνδεση στο Διαδίκτυο."</string>
     <string name="settings_safetylegal_activity_loading" msgid="8059022597639516348">"Φόρτωση..."</string>
-    <string name="lockpassword_choose_your_password_header" msgid="8624900666929394990">"Επιλέξτε τον κωδικό πρ/σης"</string>
-    <string name="lockpassword_choose_your_password_header_for_fingerprint" msgid="6624409510609085450">"Για χρήση δακτ. αποτ. ορίστε κωδ. πρόσβ."</string>
-    <string name="lockpassword_choose_your_pattern_header" msgid="6949761069941694050">"Επιλέξτε το μοτίβο σας"</string>
-    <string name="lockpassword_choose_your_pattern_header_for_fingerprint" msgid="5901096361617543819">"Για χρήση δακτ. αποτ. ορίστε μοτίβο"</string>
-    <string name="lockpassword_choose_your_pin_header" msgid="7598849519816138302">"Επιλέξτε τον αριθμό PIN"</string>
-    <string name="lockpassword_choose_your_pin_header_for_fingerprint" msgid="765344692615917183">"Για χρήση δακτ. αποτ. ορίστε αρ. PIN"</string>
-    <string name="lockpassword_confirm_your_password_header" msgid="6308478184889846633">"Επιβεβαιώστε τον κωδικό πρόσβασης"</string>
+    <string name="lockpassword_choose_your_screen_lock_header" msgid="3872462096767152394">"Ορισμός κλειδώματος οθόνης"</string>
+    <string name="lockpassword_choose_your_password_message" msgid="1197569283524841412">"Για λόγους ασφαλείας, ορίστε έναν κωδικό πρόσβασης"</string>
+    <string name="lockpassword_choose_your_password_header_for_fingerprint" msgid="2541818487015343503">"Για χρήση δακτ. αποτ. ορίστε κωδ. πρόσβ."</string>
+    <string name="lockpassword_choose_your_pattern_header_for_fingerprint" msgid="7709785406243556723">"Για χρήση δακτ. αποτυπ. ορίστε μοτίβο"</string>
+    <string name="lockpassword_choose_your_pin_message" msgid="1875420718677275646">"Για λόγους ασφαλείας, ορίστε έναν αριθμό PIN"</string>
+    <string name="lockpassword_choose_your_pin_header_for_fingerprint" msgid="1549639053195796674">"Για χρήση δακτ. αποτ. ορίστε PIN"</string>
+    <string name="lockpassword_choose_your_pattern_message" msgid="5986983400689720015">"Για λόγους ασφαλείας, ορίστε ένα μοτίβο"</string>
+    <string name="lockpassword_confirm_your_password_header" msgid="1266027268220850931">"Εισαγάγετε ξανά τον κωδικό πρόσβασής σας"</string>
     <string name="lockpassword_confirm_your_pattern_header" msgid="7543433733032330821">"Επιβεβαίωση μοτίβου"</string>
-    <string name="lockpassword_confirm_your_pin_header" msgid="49038294648213197">"Επιβεβαιώστε το PIN"</string>
+    <string name="lockpassword_confirm_your_pin_header" msgid="7744513791910572550">"Εισαγάγετε ξανά τον αριθμό PIN"</string>
     <string name="lockpassword_confirm_passwords_dont_match" msgid="5140892109439191415">"Οι κωδικοί πρόσβασης δεν ταιριάζουν"</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">"Ο αριθμός PIN έχει οριστεί"</string>
+    <string name="lockpassword_pin_set_toast" msgid="6011826444725291475">"Το PIN έχει οριστεί"</string>
     <string name="lockpassword_pattern_set_toast" msgid="6867259621331406236">"Το μοτίβο έχει οριστεί"</string>
     <string name="lockpassword_confirm_your_pattern_generic" msgid="2920960858283879113">"Χρησιμοποιήστε το μοτίβο της συσκευής σας για να συνεχίσετε"</string>
     <string name="lockpassword_confirm_your_pin_generic" msgid="4062335874438910487">"Εισαγάγετε το PIN της συσκευής σας για να συνεχίσετε"</string>
@@ -1488,6 +1495,12 @@
     <string name="lockpassword_strong_auth_required_work_pattern" msgid="3003781907040522053">"Για πρόσθετη ασφάλεια, εισαγάγετε το μοτίβο εργασίας σας"</string>
     <string name="lockpassword_strong_auth_required_work_pin" msgid="3367491332598821552">"Για πρόσθετη ασφάλεια, εισαγάγετε τον αριθμό PIN εργασίας σας"</string>
     <string name="lockpassword_strong_auth_required_work_password" msgid="8159775129968582940">"Για πρόσθετη ασφάλεια, εισαγάγετε τον κωδικό πρόσβασης εργασίας σας"</string>
+    <string name="lockpassword_confirm_your_pattern_details_frp" msgid="6757336656791723193">"Έγινε επαναφορά των εργοστασιακών ρυθμίσεων του τηλεφώνου. Εισαγάγετε το παλιό μοτίβο."</string>
+    <string name="lockpassword_confirm_your_pin_details_frp" msgid="826520613445990470">"Έγινε επαναφορά των εργοστασιακών ρυθμίσεων του τηλεφώνου. Εισαγάγετε τον παλιό κωδικό PIN."</string>
+    <string name="lockpassword_confirm_your_password_details_frp" msgid="8944081074615739040">"Έγινε επαναφορά των εργοστασιακών ρυθμίσεων του τηλεφώνου. Εισαγάγετε τον παλιό κωδικό πρόσβασης."</string>
+    <string name="lockpassword_confirm_your_pattern_header_frp" msgid="2898036091609128286">"Επαλήθευση μοτίβου"</string>
+    <string name="lockpassword_confirm_your_pin_header_frp" msgid="4141601774778898803">"Επιβεβαίωση κωδικού PIN"</string>
+    <string name="lockpassword_confirm_your_password_header_frp" msgid="3762615419295360480">"Επαλήθευση κωδικού πρόσβασης"</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>
@@ -1537,7 +1550,6 @@
     <string name="install_applications_title" msgid="4987712352256508946">"Αποδ. όλων των πηγών εφαρμογής"</string>
     <string name="recent_app_category_title" msgid="6673071268966003928">"Εφαρμογές που ανοίχτηκαν πρόσφατα"</string>
     <string name="see_all_apps_title" msgid="1317153498074308438">"Δείτε και τις <xliff:g id="COUNT">%1$d</xliff:g> εφαρμογές"</string>
-    <string name="recent_app_summary" msgid="3366446669844932300">"<xliff:g id="TIME">^1</xliff:g> πριν"</string>
     <string name="install_all_warning" product="tablet" msgid="8310489909586138165">"Το tablet σας και τα προσωπικά δεδομένα σας είναι πιο ευάλωτα σε επιθέσεις από άγνωστες εφαρμογές. Με την εγκατάσταση εφαρμογών από αυτήν την πηγή, συμφωνείτε ότι είστε υπεύθυνοι για οποιαδήποτε ζημιά στο tablet ή απώλεια δεδομένων που μπορεί να προκύψει από τη χρήση τους."</string>
     <string name="install_all_warning" product="default" msgid="1952257127370115988">"Το τηλέφωνό σας και τα προσωπικά δεδομένα σας είναι πιο ευάλωτα σε επιθέσεις από άγνωστες εφαρμογές. Με την εγκατάσταση εφαρμογών από αυτήν την πηγή, συμφωνείτε ότι είστε υπεύθυνοι για οποιαδήποτε ζημιά στο τηλέφωνο ή απώλεια δεδομένων που μπορεί να προκύψει από τη χρήση τους."</string>
     <string name="advanced_settings" msgid="1777249286757067969">"Σύνθετες ρυθμίσεις"</string>
@@ -1801,7 +1813,7 @@
     <string name="accessibility_settings_summary" msgid="981260486011624939">"Στοιχεία ελέγχου αναγνωστών οθόνης, οθόνης, αλληλεπίδρασης"</string>
     <string name="vision_settings_title" msgid="4204111425716868288">"Ρυθμίσεις όρασης"</string>
     <string name="vision_settings_description" msgid="5679491180156408260">"Μπορείτε να προσαρμόσετε αυτήν τη συσκευή σύμφωνα με τις ανάγκες σας. Οι λειτουργίες προσβασιμότητας μπορούν να τροποποιηθούν αργότερα από τις ρυθμίσεις."</string>
-    <string name="vision_settings_suggestion_title" msgid="917294957154878441">"Αύξηση μεγέθους γραμματοσειράς"</string>
+    <string name="vision_settings_suggestion_title" msgid="8058794060304707004">"Αλλαγή μεγέθους γραμματοσειράς"</string>
     <string name="screen_reader_category_title" msgid="7739154903913400641">"Αναγνώστες οθόνης"</string>
     <string name="audio_and_captions_category_title" msgid="3420727114421447524">"Ήχος και κείμενο στην οθόνη"</string>
     <string name="display_category_title" msgid="685461049938269166">"Οθόνη"</string>
@@ -1838,7 +1850,6 @@
     <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="preference_summary_default_combination" msgid="8532964268242666060">"<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>
@@ -1957,12 +1968,14 @@
     <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_whitelisted" msgid="7375400051141016808">"Δεν είναι δυνατή η βελτιστοποίηση της εφαρμογής για χρήση μπαταρίας"</string>
+    <string name="background_activity_warning_dialog_title" msgid="2216249969149568871">"Να περιοριστεί η δραστηριότητα στο παρασκήνιο;"</string>
+    <string name="background_activity_warning_dialog_text" msgid="7049624449246121981">"Εάν περιορίσετε τη δραστηριότητα στο παρασκήνιο για μια εφαρμογή, μπορεί να μην λειτουργήσει σωστά"</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" msgid="6393929085382334341">"Χρήση της εφαρμογής από την πλήρη φόρτιση (<xliff:g id="RELATIVE_TIME">^1</xliff:g>)"</string>
+    <string name="power_usage_list_summary_device" msgid="4461926045610455423">"Χρήση της συσκευής από την πλήρη φόρτιση (<xliff:g id="RELATIVE_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>
@@ -2208,14 +2221,14 @@
     <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">"Πρέπε να ορίσετε έναν κωδικό PIN ή έναν κωδικό κλειδώματος οθόνης πριν χρησιμοποιήσετε τον χώρο αποθήκευσης διαπιστευτηρίων."</string>
+    <string name="credentials_configure_lock_screen_hint" msgid="8058230497337529036">"Για να αρχίσετε να χρησιμοποιείτε τον αποθηκευτικό χώρο διαπιστευτηρίων, η συσκευή σας θα πρέπει να διαθέτει οθόνη ασφαλούς κλειδώματος"</string>
+    <string name="credentials_configure_lock_screen_button" msgid="253239765216055321">"ΡΥΘΜΙΣΗ ΚΛΕΙΔΩΜΑΤΟΣ"</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>
@@ -2335,8 +2348,6 @@
     <skip />
     <string name="cant_sync_dialog_title" msgid="2777238588398046285">"Δεν είναι δυνατός ο μη αυτόματος συγχρονισμός"</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, εισαγάγετε το PIN σας"</string>
     <string name="enter_pattern" msgid="4187435713036808566">"Για να ξεκινήσετε το Android, σχεδιάστε το μοτίβο σας"</string>
@@ -2350,6 +2361,7 @@
     <string name="misc_files_selected_count" msgid="4647048020823912088">"Επιλέχθηκαν <xliff:g id="NUMBER">%1$d</xliff:g> από <xliff:g id="TOTAL">%2$d</xliff:g>"</string>
     <string name="misc_files_selected_count_bytes" msgid="2876232009069114352">"<xliff:g id="NUMBER">%1$s</xliff:g> από <xliff:g id="TOTAL">%2$s</xliff:g>"</string>
     <string name="select_all" msgid="1562774643280376715">"Επιλογή όλων"</string>
+    <string name="data_plan_usage_manage_plans_button_text" msgid="8997761990902708162">"Διαχείριση προγραμμάτων"</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>
@@ -2435,6 +2447,9 @@
     <string name="data_usage_metered_mobile" msgid="5423305619126978393">"Δίκτυα κινητής τηλεφωνίας"</string>
     <string name="data_usage_metered_wifi" msgid="1761738002328299714">"Δίκτυα Wi‑Fi με βάση τη χρήση"</string>
     <string name="data_usage_metered_wifi_disabled" msgid="727808462375941567">"Για επιλογή δικτύων με βάση τη χρήση, ενεργοποιήστε το Wi-Fi."</string>
+    <string name="data_usage_metered_auto" msgid="1262028400911918865">"Αυτόματα"</string>
+    <string name="data_usage_metered_yes" msgid="9217539611385225894">"Με περιορισμούς"</string>
+    <string name="data_usage_metered_no" msgid="4025232961929071789">"Χωρίς περιορισμούς"</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>
@@ -2526,9 +2541,6 @@
     <string name="backup_pw_set_button_text" msgid="2387480910044648795">"Ορισμός εφεδρικού κωδικού πρόσβασης"</string>
     <string name="backup_pw_cancel_button_text" msgid="8845630125391744615">"Ακύρωση"</string>
     <string name="additional_system_update_settings_list_item_title" msgid="214987609894661992">"Πρόσθετες ενημερώσεις συστήματος"</string>
-    <string name="selinux_status_disabled" msgid="924551035552323327">"Απενεργοποιημένο"</string>
-    <string name="selinux_status_permissive" msgid="6004965534713398778">"Ανεκτικό"</string>
-    <string name="selinux_status_enforcing" msgid="2252703756208463329">"Επιβολή"</string>
     <string name="ssl_ca_cert_warning" msgid="2045866713601984673">"Το δίκτυο ενδέχεται να παρακολουθείται"</string>
     <string name="done_button" msgid="1991471253042622230">"Τέλος"</string>
     <plurals name="ssl_ca_cert_dialog_title" formatted="false" msgid="7145092748045794650">
@@ -2726,6 +2738,7 @@
       <item quantity="other">Εμφάνιση %d κρυφών στοιχείων</item>
       <item quantity="one">Εμφάνιση %d κρυφού στοιχείου</item>
     </plurals>
+    <string name="dashboard_suggestion_condition_footer_content_description" msgid="2898588191174845961">"Σύμπτυξη"</string>
     <string name="network_dashboard_title" msgid="4771589228992391573">"Δίκτυο και διαδίκτυο"</string>
     <string name="network_dashboard_summary_mobile" msgid="3851083934739500429">"δίκτυο κινητής τηλεφωνίας"</string>
     <string name="network_dashboard_summary_data_usage" msgid="3843261364705042212">"χρήση δεδομένων"</string>
@@ -2828,8 +2841,14 @@
       <item quantity="other">Ενεργοποιήθηκαν <xliff:g id="ON_COUNT">%d</xliff:g> αυτόματοι κανόνες</item>
       <item quantity="one">Ενεργοποιήθηκε 1 αυτόματος κανόνας</item>
     </plurals>
-    <string name="zen_mode_settings_title" msgid="842308776768942600">"Προτ/σεις \"Μην ενοχλείτε\""</string>
-    <string name="zen_mode_priority_settings_title" msgid="2623117023031824309">"Μόνο προτεραιότητας"</string>
+    <string name="zen_mode_settings_title" msgid="1066226840983908121">"Μην ενοχλείτε"</string>
+    <string name="zen_mode_behavior_settings_title" msgid="1463303933529313969">"Συμπεριφορά"</string>
+    <string name="zen_mode_behavior_allow_title" msgid="3845615648136218141">"Να επιτρέπονται ήχοι και δονήσεις από"</string>
+    <string name="zen_mode_behavior_no_sound" msgid="1219626004723208056">"Χωρίς ήχο"</string>
+    <string name="zen_mode_behavior_total_silence" msgid="6716603819806610626">"Χωρίς ήχο (πλήρης σίγαση)"</string>
+    <string name="zen_mode_behavior_no_sound_except" msgid="4968477585788243114">"Χωρίς ήχο, εκτός από <xliff:g id="CATEGORIES">%1$s</xliff:g>"</string>
+    <!-- no translation found for zen_mode_behavior_alarms_only (2423480992071472963) -->
+    <skip />
     <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>
@@ -2871,13 +2890,15 @@
     <string name="notifications_title" msgid="8086372779371204971">"Ειδοποιήσεις"</string>
     <string name="app_notifications_title" msgid="5810577805218003760">"Ειδοπ/σεις εφ/γών"</string>
     <string name="notification_channel_title" msgid="2260666541030178452">"Κατηγορία ειδοποιήσεων"</string>
+    <string name="notification_group_title" msgid="7180506440133859601">"Ομάδα κατηγοριών ειδοποιήσεων"</string>
     <string name="notification_importance_title" msgid="848692592679312666">"Βαρύτητα"</string>
-    <string name="notification_importance_unspecified" msgid="2196023702875112081">"Να αποφασίσει η εφαρμογή"</string>
+    <string name="notification_importance_unspecified" msgid="6622173510486113958">"Να επιτρέπεται ο ήχος"</string>
     <string name="notification_importance_blocked" msgid="7938180808339386300">"Να μην εμφανίζονται ποτέ ειδοποιήσεις"</string>
     <string name="notification_importance_min" msgid="5455049524984686275">"Χωρίς ηχητική ή οπτική διακοπή"</string>
     <string name="notification_importance_low" msgid="8881468429453766553">"Χωρίς ήχο"</string>
     <string name="notification_importance_default" msgid="5958338024601957516">"Αναπαραγωγή ήχου"</string>
     <string name="notification_importance_high" msgid="2082429479238228527">"Αναπαραγωγή ήχου και εμφάνιση στην οθόνη"</string>
+    <string name="notification_importance_high_silent" msgid="2667033773703765252">"Εμφάνιση στην οθόνη"</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>
@@ -2920,8 +2941,13 @@
     <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="channel_group_notifications_off_desc" msgid="1620950416247316370">"Το Android αποκλείει την εμφάνιση των ειδοποιήσεων αυτής της ομάδας σε αυτήν τη συσκευή"</string>
     <string name="notification_channels" msgid="5346841743182627500">"Κατηγορίες"</string>
     <string name="notification_channels_other" msgid="5645317113885788226">"Άλλα"</string>
+    <plurals name="notification_group_summary" formatted="false" msgid="3420621520561455358">
+      <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="no_channels" msgid="3077375508177744586">"Αυτή η εφαρμογή δεν έχει δημοσιεύσει ειδοποιήσεις"</string>
     <string name="app_settings_link" msgid="8894946007543660906">"Επιπλέον ρυθμίσεις στην εφαρμογή"</string>
     <string name="app_notification_listing_summary_zero" msgid="6482582965081108108">"Ενεργές για όλες τις εφαρμογές"</string>
@@ -2998,12 +3024,14 @@
     <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>
+    <!-- no translation found for zen_mode_media_system_other (8900209390529859777) -->
+    <skip />
     <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="239685342222975733">"Εάν το ίδιο άτομο καλέσει δεύτερη φορά εντός διαστήματος <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>
@@ -3032,6 +3060,7 @@
     <string name="zen_mode_screen_off_visual_interruptions" msgid="4850792880144382633">"Όταν η οθόνη είναι απενεργοποιημένη"</string>
     <string name="zen_mode_no_visual_interruptions" msgid="8742776003822778472">"Όταν η οθόνη είναι ενεργοποιημένη ή απενεργοποιημένη"</string>
     <string name="notification_app_settings_button" msgid="6685640230371477485">"Ρυθμίσεις ειδοποιήσεων"</string>
+    <string name="suggestion_button_text" msgid="3275010948381252006">"ΟΚ"</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>
@@ -3182,7 +3211,7 @@
     <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>
@@ -3216,6 +3245,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="sms_mirroring_pref" msgid="6475043279147376031">"SMS mirroring"</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>
@@ -3282,7 +3312,7 @@
     <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="permit_write_settings" msgid="658555006453212691">"Να επιτρέπεται η τροποπ. των ρυθμ. συστήματος"</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>
@@ -3377,12 +3407,15 @@
     <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="connectivity_monitor_switch" msgid="9059759348648583421">"Παρακολούθηση συνδεσιμότητας"</string>
+    <string name="connectivity_monitor_switch_summary" msgid="2828658652378866401">"Η υπηρεσία ConnectivityMonitor θα συλλέξει αρχεία καταγραφής μόλις εντοπίσει κάποιο πρόβλημα συνδεσιμότητας και θα εμφανίσει μια ειδοποίηση στον χρήστη για να υποβάλει αναφορά σφάλματος"</string>
+    <string name="connectivity_monitor_toast" msgid="5551859612881173028">"Για να πραγματοποιήσετε αλλαγές στην παρακολούθηση συνδεσιμότητας, επανεκκινήστε τη συσκευή"</string>
     <string name="camera_hal_hdrplus_switch" msgid="8377365197105267466">"HDR+ HAL κάμερας"</string>
     <string name="camera_hal_hdrplus_toast" msgid="2063703797270055299">"Για να πραγματοποιήσετε αλλαγές στο HDR+ HAL κάμερας, επανεκκινήστε τη συσκευή"</string>
+    <string name="camera_laser_sensor_switch" msgid="8913588990743234440">"Αισθητήρας λέιζερ κάμερας"</string>
     <string name="ota_disable_automatic_update" msgid="2319639631655915050">"Αυτόματες ενημερώσεις συστήματος"</string>
     <string name="usage" msgid="2977875522080448986">"Χρήση"</string>
-    <string name="cellular_data_usage" msgid="2155683719898158203">"Χρήση δεδομένων κινητής τηλεφωνίας"</string>
+    <string name="cellular_data_usage" msgid="2155683719898158203">"Χρήση δεδ. κιν. τηλεφ."</string>
     <string name="wifi_data_usage" msgid="686754111095324306">"Χρήση δεδομένων Wi-Fi"</string>
     <string name="ethernet_data_usage" msgid="5108764537574354616">"Χρήση δεδομένων Ethernet"</string>
     <string name="wifi" msgid="1081550856200013637">"Wi-Fi"</string>
@@ -3405,7 +3438,7 @@
     <string name="data_warning" msgid="209133958008062117">"Προειδοποίηση δεδομένων"</string>
     <string name="set_data_limit" msgid="2901526323210516923">"Ορισμός ορίου δεδομένων"</string>
     <string name="data_limit" msgid="1885406964934590552">"Όριο δεδομένων"</string>
-    <string name="data_usage_template" msgid="392191945602400904">"Χρησιμοποιήθηκαν <xliff:g id="ID_1">%1$s</xliff:g> μεταξύ <xliff:g id="ID_2">%2$s</xliff:g>"</string>
+    <string name="data_usage_template" msgid="2923744765873163859">"Χρησιμοποιήθηκαν <xliff:g id="ID_1">%1$s</xliff:g> κατά την περίοδο <xliff:g id="ID_2">%2$s</xliff:g>"</string>
     <string name="configure" msgid="1029654422228677273">"Διαμόρφωση"</string>
     <string name="data_usage_other_apps" msgid="3272872663517382050">"Άλλες εφαρμογές που περιλαμβάνονται στη χρήση"</string>
     <plurals name="data_saver_unrestricted_summary" formatted="false" msgid="2635267833484232703">
@@ -3474,7 +3507,7 @@
     <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="387052719462473500">"Έλεγχος πληροφοριών στην οθόνη κλειδώματος"</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="8483187649355540109">"Υποστήριξη και συμβουλές"</string>
@@ -3482,7 +3515,7 @@
     <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 Premium"</string>
-    <string name="bluetooth_disabled" msgid="2456198532288640046">"Μη ορατό σε άλλες συσκευές"</string>
+    <string name="bluetooth_disabled" msgid="6244000672828617410">"Ανενεργό"</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>
@@ -3584,7 +3617,7 @@
     <string name="web_action_enable_title" msgid="4051513950976670853">"Instant Εφαρμογές"</string>
     <string name="web_action_enable_summary" msgid="3108127559723396382">"Άνοιγμα συνδέσμων σε εφαρμογές, ακόμα και αν δεν είναι εγκατεστημένες"</string>
     <string name="web_action_section_title" msgid="7364647086538399136">"Instant Εφαρμογές"</string>
-    <string name="instant_apps_account" msgid="1433620209791992528">"Λογαριασμός Instant Εφαρμογών"</string>
+    <string name="instant_apps_settings" msgid="8827777916518348213">"Προτιμήσεις Instant Εφαρμογών"</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>
@@ -3631,7 +3664,9 @@
     <string name="enterprise_privacy_always_on_vpn_personal" msgid="9217774730260037434">"Η λειτουργία \"Μονίμως ενεργό VPN\" είναι ενεργοποιημένη στο προσωπικό προφίλ σας"</string>
     <string name="enterprise_privacy_always_on_vpn_work" msgid="7244472958208315814">"Η λειτουργία \"Μονίμως ενεργό VPN\" είναι ενεργοποιημένη στο προφίλ εργασίας σας"</string>
     <string name="enterprise_privacy_global_http_proxy" msgid="7936664553416257333">"Ο γενικός διακομιστής μεσολάβησης HTTP ορίστηκε"</string>
-    <string name="enterprise_privacy_ca_certs" msgid="5885892204903688909">"Αξιόπιστα διαπιστευτήρια"</string>
+    <string name="enterprise_privacy_ca_certs_device" msgid="2019652712782510262">"Αξιόπιστα διαπιστευτήρια"</string>
+    <string name="enterprise_privacy_ca_certs_personal" msgid="2279084820904076599">"Αξιόπιστα διαπιστευτήρια στο προσωπικό προφίλ σας"</string>
+    <string name="enterprise_privacy_ca_certs_work" msgid="6187377647815301809">"Αξιόπιστα διαπιστευτήρια στο προφίλ εργασίας σας"</string>
     <plurals name="enterprise_privacy_number_ca_certs" formatted="false" msgid="526375234629534165">
       <item quantity="other">Τουλάχιστον <xliff:g id="COUNT_1">%d</xliff:g> πιστοποιητικά CA</item>
       <item quantity="one">Τουλάχιστον <xliff:g id="COUNT_0">%d</xliff:g> πιστοποιητικό CA</item>
@@ -3680,7 +3715,7 @@
     <string name="app_info_storage_title" msgid="5554719444625611987">"Χώρος που χρησιμοποιείται"</string>
     <string name="webview_uninstalled_for_user" msgid="1819903169194420983">"(απεγκαταστάθηκε για <xliff:g id="USER">%s</xliff:g>)"</string>
     <string name="webview_disabled_for_user" msgid="1216426047631256825">"(απενεργοποιήθηκε για <xliff:g id="USER">%s</xliff:g>)"</string>
-    <string name="autofill_app" msgid="7338387238377914374">"Υπηρεσία αυτόματης συμπλήρωσης"</string>
+    <string name="autofill_app" msgid="7338387238377914374">"Υπηρεσία αυτόμ. συμπλήρωσης"</string>
     <string name="autofill_keywords" msgid="7485591824120812710">"αυτόματη, συμπλήρωση, αυτόματη συμπλήρωση"</string>
     <string name="autofill_confirmation_message" msgid="2784869528908005194">"&lt;b&gt;Βεβαιωθείτε ότι εμπιστεύεστε αυτήν την εφαρμογή&lt;/b&gt; &lt;br/&gt; &lt;br/&gt; &lt;xliff:g id=app_name example=Google Autofill&gt;%1$s&lt;/xliff:g&gt; χρησιμοποιεί το περιεχόμενο της οθόνης σας για να διαπιστώσει τι μπορεί να συμπληρωθεί αυτόματα."</string>
     <string name="device_theme" msgid="4571803018917608588">"Θέμα συσκευής"</string>
@@ -3690,10 +3725,12 @@
     <string name="storage_manager_indicator_on" msgid="8625551710194584733">"Ενεργή"</string>
     <string name="install_type_instant" msgid="3174425974536078647">"Instant Εφαρμογή"</string>
     <string name="automatic_storage_manager_deactivation_warning" msgid="5605210730828410482">"Απενεργοποίηση διαχείρισης αποθηκευτικού χώρου;"</string>
-    <string name="storage_movies_tv" msgid="5498394447562086890">"Εφαρμογές ταινιών και TV"</string>
+    <string name="storage_movies_tv" msgid="5498394447562086890">"Εφαρμογές ταινιών/TV"</string>
     <string name="carrier_provisioning" msgid="4398683675591893169">"Πληροφορίες παροχής εταιρείας κινητής τηλεφωνίας"</string>
     <string name="trigger_carrier_provisioning" msgid="3434865918009286187">"Ενεργοποίηση παροχής εταιρείας κινητής τηλεφωνίας"</string>
     <string name="new_device_suggestion_title" msgid="698847081680980774">"Τι νέο και συναρπαστικό υπάρχει;"</string>
-    <string name="new_device_suggestion_summary" msgid="7172709269203435870">"Δείτε τις κορυφαίες 5 λειτουργίες"</string>
+    <string name="new_device_suggestion_summary" product="default" msgid="206396571522515855">"Περιηγηθείτε στο νέο τηλέφωνό σας"</string>
+    <string name="new_device_suggestion_summary" product="tablet" msgid="393751455688210956">"Περιηγηθείτε στο νέο σας tablet"</string>
+    <string name="new_device_suggestion_summary" product="device" msgid="2939870049868336652">"Περιηγηθείτε στη νέα συσκευή σας"</string>
     <string name="disabled_low_ram_device" msgid="3751578499721173344">"Αυτή η λειτουργία δεν είναι διαθέσιμη σε αυτήν τη συσκευή"</string>
 </resources>
diff --git a/res/values-en-rAU/arrays.xml b/res/values-en-rAU/arrays.xml
index f3beb46..1e36841 100644
--- a/res/values-en-rAU/arrays.xml
+++ b/res/values-en-rAU/arrays.xml
@@ -100,8 +100,6 @@
     <!-- no translation found for wifi_security_no_eap:0 (2084555984818107151) -->
     <!-- no translation found for wifi_security_no_eap:1 (397579322683471524) -->
     <!-- no translation found for wifi_security_no_eap:2 (1968820975358150484) -->
-    <!-- no translation found for wifi_ap_security:0 (5251664683198623324) -->
-    <!-- no translation found for wifi_ap_security:1 (7989073072260294673) -->
   <string-array name="wifi_eap_method">
     <item msgid="1160193392455075561">"PEAP"</item>
     <item msgid="7981731051382306293">"TLS"</item>
diff --git a/res/values-en-rAU/strings.xml b/res/values-en-rAU/strings.xml
index 34242d0..052d078 100644
--- a/res/values-en-rAU/strings.xml
+++ b/res/values-en-rAU/strings.xml
@@ -166,7 +166,7 @@
     <string name="bluetooth_map_acceptance_dialog_text" msgid="8712508202081143737">"%1$s wants to access your messages. Give access to %2$s?"</string>
     <string name="bluetooth_sap_request" msgid="2669762224045354417">"SIM access request"</string>
     <string name="bluetooth_sap_acceptance_dialog_text" msgid="4414253873553608690">"<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g> wants to access your SIM card. Granting access to the SIM card will disable data connectivity on your device for the duration of the connection. Give access to <xliff:g id="DEVICE_NAME_1">%2$s?</xliff:g>"</string>
-    <string name="bluetooth_device_name_summary" msgid="4757990010751789977">"Visible as \'<xliff:g id="DEVICE_NAME">^1</xliff:g>\' to other devices"</string>
+    <string name="bluetooth_device_name_summary" msgid="522235742194965734">"Visible as “<xliff:g id="DEVICE_NAME">^1</xliff:g>” to other devices"</string>
     <string name="bluetooth_paired_device_title" msgid="8638994696317952019">"Your devices"</string>
     <string name="bluetooth_pairing_page_title" msgid="7712127387361962608">"Pair new device"</string>
     <string name="date_and_time" msgid="9062980487860757694">"Date &amp; time"</string>
@@ -312,6 +312,8 @@
     <string name="zone_auto" msgid="334783869352026648">"Automatic time zone"</string>
     <string name="zone_auto_summaryOn" msgid="6142830927278458314">"Use network-provided time zone"</string>
     <string name="zone_auto_summaryOff" msgid="2597745783162041390">"Use network-provided time zone"</string>
+    <string name="date_time_24hour_auto" msgid="2117383168985653422">"Automatic 24‑hour format"</string>
+    <string name="date_time_24hour_auto_summary" msgid="6351812925651480277">"Use locale default"</string>
     <string name="date_time_24hour_title" msgid="3203537578602803850">"24‑hour format"</string>
     <string name="date_time_24hour" msgid="1193032284921000063">"Use 24-hour format"</string>
     <string name="date_time_set_time_title" msgid="6296795651349047016">"Time"</string>
@@ -372,6 +374,9 @@
     <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="1961957425135180242">"Next"</string>
+    <string name="setup_fingerprint_enroll_skip_title" msgid="362050541117362034">"Skip fingerprint?"</string>
+    <string name="setup_fingerprint_enroll_skip_after_adding_lock_text" msgid="958990414356204763">"Fingerprint setup only takes a minute or two. If you skip this, you can add your fingerprint later in settings."</string>
+    <string name="lock_screen_intro_skip_title" msgid="4988210105913705679">"Skip screen lock?"</string>
     <string name="lock_screen_intro_skip_dialog_text_frp" product="tablet" msgid="1581834104051243425">"Device protection features won’t be turned on. You won’t be able to prevent others from using this tablet if it’s lost, stolen or reset."</string>
     <string name="lock_screen_intro_skip_dialog_text_frp" product="device" msgid="4629503416877189572">"Device protection features won’t be turned on. You won’t be able to prevent others from using this device if it’s lost, stolen or reset."</string>
     <string name="lock_screen_intro_skip_dialog_text_frp" product="default" msgid="2423428240245737909">"Device protection features won’t be turned on. You won’t be able to prevent others from using this phone if it’s lost, stolen or reset."</string>
@@ -457,7 +462,7 @@
     <string name="setup_lock_settings_picker_title" product="tablet" msgid="90329443364067215">"Protect your tablet"</string>
     <string name="setup_lock_settings_picker_title" product="device" msgid="2399952075134938929">"Protect your device"</string>
     <string name="setup_lock_settings_picker_title" product="default" msgid="1572244299605153324">"Protect your phone"</string>
-    <string name="setup_lock_settings_picker_fingerprint_message" msgid="5585650064305600578">"For added security, set up a backup screen lock."</string>
+    <string name="lock_settings_picker_fingerprint_added_security_message" msgid="5768002109707648463">"For added security, set a backup screen lock."</string>
     <string name="setup_lock_settings_picker_message" product="tablet" msgid="8919671129189936210">"Prevent others from using this tablet 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="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>
@@ -588,6 +593,7 @@
     <string name="lockpassword_pin_no_sequential_digits" msgid="680765285206990584">"Ascending, descending or repeated sequence of digits isn\'t allowed"</string>
     <string name="lockpassword_ok_label" msgid="313822574062553672">"OK"</string>
     <string name="lockpassword_cancel_label" msgid="8818529276331121899">"Cancel"</string>
+    <string name="lockpassword_clear_label" msgid="5724429464960458155">"Clear"</string>
     <string name="lockpattern_tutorial_cancel_label" msgid="6431583477570493261">"Cancel"</string>
     <string name="lockpattern_tutorial_continue_label" msgid="3559793618653400434">"Next"</string>
     <string name="lock_setup" msgid="3355847066343753943">"Set up is complete."</string>
@@ -781,6 +787,7 @@
     <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>
@@ -817,6 +824,8 @@
     <string name="wifi_wps_available_first_item" msgid="4422547079984583502">"WPS available"</string>
     <string name="wifi_wps_available_second_item" msgid="8427520131718215301">" (WPS available)"</string>
     <string name="wifi_wps_nfc_enter_password" msgid="2288214226916117159">"Enter your network password"</string>
+    <string name="wifi_carrier_connect" msgid="8174696557882299911">"Operator Wi‑Fi network"</string>
+    <string name="wifi_carrier_content" msgid="4634077285415851933">"Connect via <xliff:g id="NAME">%1%s</xliff:g>"</string>
     <string name="wifi_scan_always_turnon_message" msgid="203123538572122989">"To improve location accuracy and for other purposes, <xliff:g id="APP_NAME">%1$s</xliff:g> wants to turn on network scanning, even when Wi-Fi is off.\n\nAllow this for all apps that want to scan?"</string>
     <string name="wifi_scan_always_turnoff_message" msgid="5538901671131941043">"To turn this off, go to Advanced in the overflow menu."</string>
     <string name="wifi_scan_always_confirm_allow" msgid="5355973075896817232">"Allow"</string>
@@ -834,6 +843,7 @@
     <string name="wifi_connect" msgid="1076622875777072845">"Connect"</string>
     <string name="wifi_failed_connect_message" msgid="8491902558970292871">"Failed to connect to network"</string>
     <string name="wifi_forget" msgid="8168174695608386644">"Forget"</string>
+    <string name="wifi_modify" msgid="6100248070440710782">"Modify"</string>
     <string name="wifi_failed_forget_message" msgid="1348172929201654986">"Failed to forget network"</string>
     <string name="wifi_save" msgid="3331121567988522826">"Save"</string>
     <string name="wifi_failed_save_message" msgid="6650004874143815692">"Failed to save network"</string>
@@ -846,6 +856,7 @@
     <string name="wifi_advanced_titlebar" msgid="4485841401774142908">"Advanced 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_title" msgid="3471132676909349382">"Network info"</string>
     <string name="wifi_details_subnet_mask" msgid="6720279144174924410">"Subnet mask"</string>
     <string name="wifi_details_dns" msgid="8648826607751830768">"DNS"</string>
     <string name="wifi_details_ipv6_address_header" msgid="6734119149106422148">"IPv6 addresses"</string>
@@ -878,16 +889,15 @@
     <string name="wifi_p2p_cancel_connect_title" msgid="255267538099324413">"Cancel invitation"</string>
     <string name="wifi_p2p_cancel_connect_message" msgid="7477756213423749402">"Do you want to cancel invitation to connect with <xliff:g id="PEER_NAME">%1$s</xliff:g>?"</string>
     <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_off_subtext" msgid="5466126533609394170">"Not sharing Internet or content with other devices"</string>
     <string name="wifi_hotspot_tethering_on_subtext" product="tablet" msgid="5752490509369962007">"Sharing this tablet’s Internet connection via hotspot"</string>
     <string name="wifi_hotspot_tethering_on_subtext" product="default" msgid="6461075246164300670">"Sharing this phone’s Internet connection via hotspot"</string>
     <string name="wifi_hotspot_on_local_only_subtext" msgid="2068110388011294735">"App is sharing content. To share Internet connection, turn hotspot off, then on"</string>
-    <string name="wifi_hotspot_name_title" msgid="1341735529132128887">"Wi‑Fi name"</string>
+    <string name="wifi_hotspot_name_title" msgid="8237000746618636778">"Hotspot name"</string>
     <string name="wifi_hotspot_name_summary_connecting" msgid="3378299995508671967">"Turning on <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>..."</string>
     <string name="wifi_hotspot_name_summary_connected" msgid="3888672084861445362">"Other devices can connect to <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>"</string>
-    <string name="wifi_hotspot_password_title" msgid="1955592302902091281">"Wi‑Fi password"</string>
+    <string name="wifi_hotspot_password_title" msgid="8676859981917573801">"Hotspot password"</string>
     <string name="wifi_hotspot_ap_band_title" msgid="1165801173359290681">"AP band"</string>
     <string name="wifi_hotspot_footer_info_regular" msgid="1203489406068036455">"Use hotspot to create a Wi‑Fi network for your other devices. Hotspot provides Internet using your mobile data connection. Additional mobile data charges may apply."</string>
     <string name="wifi_hotspot_footer_info_local_only" msgid="857988412470694109">"Apps can create a hotspot to share content with nearby devices."</string>
@@ -898,7 +908,6 @@
     <string name="wifi_tether_configure_ap_text" msgid="7974681394041609308">"Set up Wi‑Fi hotspot"</string>
     <string name="wifi_hotspot_configure_ap_text" msgid="5478614731464220432">"Wi‑Fi hotspot setup"</string>
     <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">"Android Hotspot"</string>
     <string name="wifi_calling_settings_title" msgid="4102921303993404577">"Wi-Fi Calling"</string>
     <string name="wifi_calling_suggestion_title" msgid="9008010480466359578">"Turn on Wi-Fi Calling"</string>
@@ -939,7 +948,7 @@
     <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="emergency_address_summary" msgid="3266760199681945746">"Address used by emergency services as your location if you make an emergency call using Wi‑Fi"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"Display"</string>
     <string name="sound_settings" msgid="5534671337768745343">"Sound"</string>
     <string name="all_volume_title" msgid="4296957391257836961">"Volumes"</string>
@@ -993,6 +1002,7 @@
     <string name="search_settings" msgid="1910951467596035063">"Search"</string>
     <string name="search_settings_summary" msgid="9205656546570654169">"Manage search settings and history"</string>
     <string name="search_settings_no_results" msgid="8799027492641230999">"No results"</string>
+    <string name="search_clear_history" msgid="4196658962573162457">"Clear history"</string>
     <string name="display_settings" msgid="7965901687241669598">"Display"</string>
     <string name="accelerometer_title" msgid="7854608399547349157">"Auto-rotate screen"</string>
     <string name="color_mode_title" msgid="3159275920408338215">"Vivid colours"</string>
@@ -1122,7 +1132,6 @@
     <string name="baseband_version" msgid="1848990160763524801">"Baseband version"</string>
     <string name="kernel_version" msgid="9192574954196167602">"Kernel version"</string>
     <string name="build_number" msgid="3075795840572241758">"Build number"</string>
-    <string name="selinux_status" msgid="6212165375172061672">"SELinux status"</string>
     <string name="device_info_not_available" msgid="8062521887156825182">"Not available"</string>
     <string name="device_status_activity_title" msgid="1411201799384697904">"Status"</string>
     <string name="device_status" msgid="607405385799807324">"Status"</string>
@@ -1150,7 +1159,6 @@
     <string name="status_wifi_mac_address" msgid="2202206684020765378">"Wi‑Fi MAC address"</string>
     <string name="status_bt_address" msgid="4195174192087439720">"Bluetooth address"</string>
     <string name="status_serial_number" msgid="2257111183374628137">"Serial number"</string>
-    <string name="status_unavailable" msgid="7862009036663793314">"Unavailable"</string>
     <string name="status_up_time" msgid="7294859476816760399">"Uptime"</string>
     <string name="status_awake_time" msgid="2393949909051183652">"Awake time"</string>
     <string name="internal_memory" msgid="9129595691484260784">"Internal storage"</string>
@@ -1326,6 +1334,7 @@
     <string name="menu_restore" msgid="8260067415075573273">"Reset to default"</string>
     <string name="restore_default_apn_completed" msgid="2824775307377604897">"Reset default APN settings completed"</string>
     <string name="reset_dashboard_title" msgid="6254873816990678620">"Reset options"</string>
+    <string name="reset_dashboard_summary" msgid="4851012632493522755">"Network, apps or device can be reset"</string>
     <string name="reset_network_title" msgid="6166025966016873843">"Reset Wi-Fi, mobile &amp; Bluetooth"</string>
     <string name="reset_network_desc" msgid="5547979398298881406">"This will reset all network settings, including:\n\n"<li>"Wi‑Fi"</li>\n<li>"Mobile data"</li>\n<li>"Bluetooth"</li></string>
     <string name="reset_network_button_text" msgid="2035676527471089853">"Reset settings"</string>
@@ -1334,17 +1343,14 @@
     <string name="reset_network_confirm_title" msgid="1759888886976962773">"Reset?"</string>
     <string name="network_reset_not_available" msgid="7188610385577164676">"Network reset is not available for this user"</string>
     <string name="reset_network_complete_toast" msgid="787829973559541880">"Network settings have been reset"</string>
-    <string name="master_clear_title" msgid="6617679904229218425">"Erase all data (factory reset)"</string>
-    <plurals name="master_clear_with_account_summary" formatted="false" msgid="5911377203778818712">
-      <item quantity="other"><xliff:g id="ACCOUNT_COUNT">%1$d</xliff:g> accounts will be reset</item>
-      <item quantity="one">1 account will be reset</item>
-    </plurals>
-    <string name="master_clear_summary" msgid="6902443944660426951">"Internal storage &amp; all data will be reset"</string>
+    <string name="master_clear_title" msgid="3531267871084279512">"Erase all data (factory reset)"</string>
     <string name="master_clear_desc" product="tablet" msgid="9146059417023157222">"This will erase all data from your tablet\'s "<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" msgid="4800386183314202571">"This will erase all data from your phone\'s "<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_accounts" product="default" msgid="6412857499147999073">\n\n"You are currently signed in to the following accounts:\n"</string>
     <string name="master_clear_other_users_present" product="default" msgid="5161423070702470742">\n\n"There are other users present on this device.\n"</string>
     <string name="master_clear_desc_also_erases_external" msgid="1903185203791274237"><li>"Music"</li>\n<li>"Photos"</li>\n<li>"Other user data"</li></string>
+    <string name="master_clear_desc_also_erases_esim" msgid="312352697653096008"><li>"Operators on eSIM"</li></string>
+    <string name="master_clear_desc_no_cancel_mobile_plan" msgid="5460926449093211144">\n\n"This will not cancel your mobile service plan."</string>
     <string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="7744115866662613411">\n\n"To clear music, pictures and other user data, the "<b>"USB storage"</b>" needs to be erased."</string>
     <string name="master_clear_desc_erase_external_storage" product="default" msgid="4801026652617377093">\n\n"To clear music, pictures and other user data, the "<b>"SD card"</b>" needs to be erased."</string>
     <string name="erase_external_storage" product="nosdcard" msgid="969364037450286809">"Erase USB storage"</string>
@@ -1461,15 +1467,16 @@
     <string name="settings_safetylegal_activity_title" msgid="6901214628496951727">"Safety information"</string>
     <string name="settings_safetylegal_activity_unreachable" msgid="250674109915859456">"You don\'t have a data connection. To view this information now, go to %s from any computer connected to the Internet."</string>
     <string name="settings_safetylegal_activity_loading" msgid="8059022597639516348">"Loading…"</string>
-    <string name="lockpassword_choose_your_password_header" msgid="8624900666929394990">"Choose your password"</string>
-    <string name="lockpassword_choose_your_password_header_for_fingerprint" msgid="6624409510609085450">"To use fingerprint, set password"</string>
-    <string name="lockpassword_choose_your_pattern_header" msgid="6949761069941694050">"Choose your pattern"</string>
-    <string name="lockpassword_choose_your_pattern_header_for_fingerprint" msgid="5901096361617543819">"To use fingerprint, set pattern"</string>
-    <string name="lockpassword_choose_your_pin_header" msgid="7598849519816138302">"Choose your PIN"</string>
-    <string name="lockpassword_choose_your_pin_header_for_fingerprint" msgid="765344692615917183">"To use fingerprint, set PIN"</string>
-    <string name="lockpassword_confirm_your_password_header" msgid="6308478184889846633">"Confirm your password"</string>
+    <string name="lockpassword_choose_your_screen_lock_header" msgid="3872462096767152394">"Set a screen lock"</string>
+    <string name="lockpassword_choose_your_password_message" msgid="1197569283524841412">"For security, set a password"</string>
+    <string name="lockpassword_choose_your_password_header_for_fingerprint" msgid="2541818487015343503">"To use fingerprint, set a password"</string>
+    <string name="lockpassword_choose_your_pattern_header_for_fingerprint" msgid="7709785406243556723">"To use fingerprint, set a pattern"</string>
+    <string name="lockpassword_choose_your_pin_message" msgid="1875420718677275646">"For security, set a PIN"</string>
+    <string name="lockpassword_choose_your_pin_header_for_fingerprint" msgid="1549639053195796674">"To use fingerprint, set a PIN"</string>
+    <string name="lockpassword_choose_your_pattern_message" msgid="5986983400689720015">"For security, set a pattern"</string>
+    <string name="lockpassword_confirm_your_password_header" msgid="1266027268220850931">"Re-enter your password"</string>
     <string name="lockpassword_confirm_your_pattern_header" msgid="7543433733032330821">"Confirm your pattern"</string>
-    <string name="lockpassword_confirm_your_pin_header" msgid="49038294648213197">"Confirm your PIN"</string>
+    <string name="lockpassword_confirm_your_pin_header" msgid="7744513791910572550">"Re-enter your PIN"</string>
     <string name="lockpassword_confirm_passwords_dont_match" msgid="5140892109439191415">"Passwords don\'t match"</string>
     <string name="lockpassword_confirm_pins_dont_match" msgid="7226244811505606217">"PINs don\'t match"</string>
     <string name="lockpassword_choose_lock_generic_header" msgid="3811438094903786145">"Unlock selection"</string>
@@ -1488,6 +1495,12 @@
     <string name="lockpassword_strong_auth_required_work_pattern" msgid="3003781907040522053">"For added security, use your work pattern"</string>
     <string name="lockpassword_strong_auth_required_work_pin" msgid="3367491332598821552">"For added security, enter your work PIN"</string>
     <string name="lockpassword_strong_auth_required_work_password" msgid="8159775129968582940">"For added security, enter your work password"</string>
+    <string name="lockpassword_confirm_your_pattern_details_frp" msgid="6757336656791723193">"Your phone was reset to factory settings. To use this phone, enter your previous pattern."</string>
+    <string name="lockpassword_confirm_your_pin_details_frp" msgid="826520613445990470">"Your phone was reset to factory settings. To use this phone, enter your previous PIN."</string>
+    <string name="lockpassword_confirm_your_password_details_frp" msgid="8944081074615739040">"Your phone was reset to factory settings. To use this phone, enter your previous password."</string>
+    <string name="lockpassword_confirm_your_pattern_header_frp" msgid="2898036091609128286">"Verify pattern"</string>
+    <string name="lockpassword_confirm_your_pin_header_frp" msgid="4141601774778898803">"Verify PIN"</string>
+    <string name="lockpassword_confirm_your_password_header_frp" msgid="3762615419295360480">"Verify password"</string>
     <string name="lockpassword_invalid_pin" msgid="15588049067548470">"Wrong PIN"</string>
     <string name="lockpassword_invalid_password" msgid="4038507398784975200">"Wrong password"</string>
     <string name="lockpattern_need_to_unlock_wrong" msgid="1745247595356012176">"Wrong pattern"</string>
@@ -1537,7 +1550,6 @@
     <string name="install_applications_title" msgid="4987712352256508946">"Allow all app sources"</string>
     <string name="recent_app_category_title" msgid="6673071268966003928">"Recently opened apps"</string>
     <string name="see_all_apps_title" msgid="1317153498074308438">"See all <xliff:g id="COUNT">%1$d</xliff:g> apps"</string>
-    <string name="recent_app_summary" msgid="3366446669844932300">"<xliff:g id="TIME">^1</xliff:g> ago"</string>
     <string name="install_all_warning" product="tablet" msgid="8310489909586138165">"Your tablet and personal data are more vulnerable to attack by unknown apps. By installing apps from this source, you agree that you are responsible for any damage to your tablet or loss of data that may result from their use."</string>
     <string name="install_all_warning" product="default" msgid="1952257127370115988">"Your phone and personal data are more vulnerable to attack by unknown apps. By installing apps from this source, you agree that you are responsible for any damage to your phone or loss of data that may result from their use."</string>
     <string name="advanced_settings" msgid="1777249286757067969">"Advanced settings"</string>
@@ -1801,7 +1813,7 @@
     <string name="accessibility_settings_summary" msgid="981260486011624939">"Screen readers, display, interaction controls"</string>
     <string name="vision_settings_title" msgid="4204111425716868288">"Vision settings"</string>
     <string name="vision_settings_description" msgid="5679491180156408260">"You can customise this device to fit your needs. These accessibility features can be changed later in Settings."</string>
-    <string name="vision_settings_suggestion_title" msgid="917294957154878441">"Increase font size"</string>
+    <string name="vision_settings_suggestion_title" msgid="8058794060304707004">"Change font size"</string>
     <string name="screen_reader_category_title" msgid="7739154903913400641">"Screen readers"</string>
     <string name="audio_and_captions_category_title" msgid="3420727114421447524">"Audio &amp; on-screen text"</string>
     <string name="display_category_title" msgid="685461049938269166">"Display"</string>
@@ -1838,7 +1850,6 @@
     <string name="accessibility_display_inversion_preference_subtitle" msgid="7052959202195368109">"May affect performance"</string>
     <string name="accessibility_autoclick_preference_title" msgid="7014499339068449623">"Click after cursor stops moving"</string>
     <string name="accessibility_autoclick_delay_preference_title" msgid="3962261178385106006">"Delay before click"</string>
-    <string name="preference_summary_default_combination" msgid="8532964268242666060">"<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">"ON"</string>
     <string name="accessibility_summary_state_disabled" msgid="2241315620132005595">"OFF"</string>
     <string name="enable_quick_setting" msgid="2366999897816894536">"Show in Quick Settings"</string>
@@ -1957,12 +1968,14 @@
     <string name="background_activity_summary_on" msgid="649282072540085599">"App can run in the background when not in use"</string>
     <string name="background_activity_summary_off" msgid="7666330699090632040">"App\'s background activity is limited when not in use"</string>
     <string name="background_activity_summary_disabled" msgid="3710669050484599847">"App not allowed to run in background"</string>
+    <string name="background_activity_summary_whitelisted" msgid="7375400051141016808">"App can not be optimised for battery use"</string>
+    <string name="background_activity_warning_dialog_title" msgid="2216249969149568871">"Limit background activity?"</string>
+    <string name="background_activity_warning_dialog_text" msgid="7049624449246121981">"If you limit background activity for an app, it may misbehave"</string>
     <string name="device_screen_usage" msgid="3386088035570409683">"Screen usage since full charge"</string>
     <string name="device_screen_consumption" msgid="4607589286438986687">"Screen consumption"</string>
     <string name="device_cellular_network" msgid="4724773411762382950">"Mobile network scanning"</string>
-    <string name="power_last_full_charge_summary" msgid="532845389094620657">"<xliff:g id="TIME">^1</xliff:g> ago"</string>
-    <string name="power_usage_list_summary" msgid="6775339745194635000">"App usage since full charge (<xliff:g id="TIME">^1</xliff:g> ago)"</string>
-    <string name="power_usage_list_summary_device" msgid="7036566616386864302">"Device usage since full charge (<xliff:g id="TIME">^1</xliff:g> ago)"</string>
+    <string name="power_usage_list_summary" msgid="6393929085382334341">"App usage since full charge (<xliff:g id="RELATIVE_TIME">^1</xliff:g>)"</string>
+    <string name="power_usage_list_summary_device" msgid="4461926045610455423">"Device usage since full charge (<xliff:g id="RELATIVE_TIME">^1</xliff:g>)"</string>
     <string name="screen_usage_summary" msgid="6687403051423153550">"Amount of time screen has been on since full charge"</string>
     <string name="device_usage_list_summary" msgid="5623036661468763251">"Device usage since full charge"</string>
     <string name="battery_since_unplugged" msgid="338073389740738437">"Battery use since unplugged"</string>
@@ -2208,14 +2221,14 @@
     <string name="credentials_unlock_hint" msgid="2301301378040499348">"Type the password for credential storage."</string>
     <string name="credentials_old_password" msgid="7553393815538684028">"Current password:"</string>
     <string name="credentials_reset_hint" msgid="6297256880896133631">"Remove all the contents?"</string>
-    <string name="credentials_password_too_short" msgid="7502749986405522663">"The password must contain at least 8 characters."</string>
     <string name="credentials_wrong_password" msgid="2541932597104054807">"Incorrect password."</string>
     <string name="credentials_reset_warning" msgid="5320653011511797600">"Incorrect password. You have one more chance before credential storage is erased."</string>
     <string name="credentials_reset_warning_plural" msgid="6514085665301095279">"Incorrect password. You have <xliff:g id="NUMBER">%1$d</xliff:g> more chances before credential storage is erased."</string>
     <string name="credentials_erased" msgid="2907836028586342969">"Credential storage has been erased."</string>
     <string name="credentials_not_erased" msgid="7685932772284216097">"Credential storage couldn\'t be erased."</string>
     <string name="credentials_enabled" msgid="7588607413349978930">"Credential storage is enabled."</string>
-    <string name="credentials_configure_lock_screen_hint" msgid="6757119179588664966">"You need to set a lock screen PIN or password before you can use credential storage."</string>
+    <string name="credentials_configure_lock_screen_hint" msgid="8058230497337529036">"Before you can use credential storage, your device needs to have a secure lock screen"</string>
+    <string name="credentials_configure_lock_screen_button" msgid="253239765216055321">"SET LOCK"</string>
     <string name="usage_access_title" msgid="332333405495457839">"Apps with usage access"</string>
     <string name="emergency_tone_title" msgid="1055954530111587114">"Emergency tone"</string>
     <string name="emergency_tone_summary" msgid="722259232924572153">"Set behaviour when an emergency call is placed"</string>
@@ -2335,8 +2348,6 @@
     <skip />
     <string name="cant_sync_dialog_title" msgid="2777238588398046285">"Cannot sync manually"</string>
     <string name="cant_sync_dialog_message" msgid="1938380442159016449">"Sync for this item is currently disabled. To change your preference, temporarily turn on background data and automatic sync."</string>
-    <string name="wimax_settings" msgid="2655139497028469039">"4G"</string>
-    <string name="status_wimax_mac_address" msgid="8390791848661413416">"4G MAC address"</string>
     <string name="enter_password" msgid="8035706727471334122">"To start Android, enter your password"</string>
     <string name="enter_pin" msgid="5305333588093263790">"To start Android, enter your PIN"</string>
     <string name="enter_pattern" msgid="4187435713036808566">"To start Android, draw your pattern"</string>
@@ -2350,6 +2361,7 @@
     <string name="misc_files_selected_count" msgid="4647048020823912088">"selected <xliff:g id="NUMBER">%1$d</xliff:g> out of <xliff:g id="TOTAL">%2$d</xliff:g>"</string>
     <string name="misc_files_selected_count_bytes" msgid="2876232009069114352">"<xliff:g id="NUMBER">%1$s</xliff:g> out of <xliff:g id="TOTAL">%2$s</xliff:g>"</string>
     <string name="select_all" msgid="1562774643280376715">"Select all"</string>
+    <string name="data_plan_usage_manage_plans_button_text" msgid="8997761990902708162">"Manage plans"</string>
     <string name="data_usage_summary_title" msgid="3804110657238092929">"Data usage"</string>
     <string name="data_usage_app_summary_title" msgid="4147258989837459172">"App data usage"</string>
     <string name="data_usage_accounting" msgid="7170028915873577387">"Operator data accounting may differ from your device."</string>
@@ -2435,6 +2447,9 @@
     <string name="data_usage_metered_mobile" msgid="5423305619126978393">"Mobile networks"</string>
     <string name="data_usage_metered_wifi" msgid="1761738002328299714">"Metered Wi‑Fi networks"</string>
     <string name="data_usage_metered_wifi_disabled" msgid="727808462375941567">"To select metered networks, turn Wi‑Fi on."</string>
+    <string name="data_usage_metered_auto" msgid="1262028400911918865">"Automatic"</string>
+    <string name="data_usage_metered_yes" msgid="9217539611385225894">"Metered"</string>
+    <string name="data_usage_metered_no" msgid="4025232961929071789">"Not metered"</string>
     <string name="data_usage_disclaimer" msgid="6887858149980673444">"Operator data accounting may differ from your device."</string>
     <string name="cryptkeeper_emergency_call" msgid="198578731586097145">"Emergency call"</string>
     <string name="cryptkeeper_return_to_call" msgid="5613717339452772491">"Return to call"</string>
@@ -2526,9 +2541,6 @@
     <string name="backup_pw_set_button_text" msgid="2387480910044648795">"Set backup password"</string>
     <string name="backup_pw_cancel_button_text" msgid="8845630125391744615">"Cancel"</string>
     <string name="additional_system_update_settings_list_item_title" msgid="214987609894661992">"Additional system updates"</string>
-    <string name="selinux_status_disabled" msgid="924551035552323327">"Disabled"</string>
-    <string name="selinux_status_permissive" msgid="6004965534713398778">"Permissive"</string>
-    <string name="selinux_status_enforcing" msgid="2252703756208463329">"Enforcing"</string>
     <string name="ssl_ca_cert_warning" msgid="2045866713601984673">"Network may be monitored"</string>
     <string name="done_button" msgid="1991471253042622230">"Done"</string>
     <plurals name="ssl_ca_cert_dialog_title" formatted="false" msgid="7145092748045794650">
@@ -2871,13 +2883,15 @@
     <string name="notifications_title" msgid="8086372779371204971">"Notifications"</string>
     <string name="app_notifications_title" msgid="5810577805218003760">"App notifications"</string>
     <string name="notification_channel_title" msgid="2260666541030178452">"Notification category"</string>
+    <string name="notification_group_title" msgid="7180506440133859601">"Notification category group"</string>
     <string name="notification_importance_title" msgid="848692592679312666">"Importance"</string>
-    <string name="notification_importance_unspecified" msgid="2196023702875112081">"Let the app decide"</string>
+    <string name="notification_importance_unspecified" msgid="6622173510486113958">"Allow sound"</string>
     <string name="notification_importance_blocked" msgid="7938180808339386300">"Never show notifications"</string>
     <string name="notification_importance_min" msgid="5455049524984686275">"No sound or visual interruption"</string>
     <string name="notification_importance_low" msgid="8881468429453766553">"No sound"</string>
     <string name="notification_importance_default" msgid="5958338024601957516">"Make sound"</string>
     <string name="notification_importance_high" msgid="2082429479238228527">"Make sound and pop up on screen"</string>
+    <string name="notification_importance_high_silent" msgid="2667033773703765252">"Pop on screen"</string>
     <string name="notification_importance_min_title" msgid="6974673091137544803">"Low"</string>
     <string name="notification_importance_low_title" msgid="8131254047772814309">"Medium"</string>
     <string name="notification_importance_default_title" msgid="9120383978536089489">"High"</string>
@@ -2920,8 +2934,13 @@
     <string name="loading_notification_apps" msgid="5031818677010335895">"Loading apps..."</string>
     <string name="app_notifications_off_desc" msgid="4882445501376722969">"Android is blocking this app\'s notifications from appearing on this device"</string>
     <string name="channel_notifications_off_desc" msgid="5899225298718840635">"Android is blocking this category of notifications from appearing on this device"</string>
+    <string name="channel_group_notifications_off_desc" msgid="1620950416247316370">"Android is blocking this group of notifications from appearing on this device"</string>
     <string name="notification_channels" msgid="5346841743182627500">"Categories"</string>
     <string name="notification_channels_other" msgid="5645317113885788226">"Other"</string>
+    <plurals name="notification_group_summary" formatted="false" msgid="3420621520561455358">
+      <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> categories</item>
+      <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> category</item>
+    </plurals>
     <string name="no_channels" msgid="3077375508177744586">"This app has not posted any notifications"</string>
     <string name="app_settings_link" msgid="8894946007543660906">"Additional settings in the app"</string>
     <string name="app_notification_listing_summary_zero" msgid="6482582965081108108">"Turned on for all apps"</string>
@@ -2998,6 +3017,7 @@
     <string name="zen_mode_from_starred" msgid="2678345811950997027">"From starred contacts only"</string>
     <string name="zen_mode_from_none" msgid="8219706639954614136">"None"</string>
     <string name="zen_mode_alarms" msgid="2165302777886552926">"Alarms"</string>
+    <string name="zen_mode_alarms_summary" msgid="3774926045611788635">"Alarms are always a priority and make sound"</string>
     <string name="zen_mode_reminders" msgid="5458502056440485730">"Reminders"</string>
     <string name="zen_mode_events" msgid="7914446030988618264">"Events"</string>
     <string name="zen_mode_all_callers" msgid="584186167367236922">"All callers"</string>
@@ -3023,15 +3043,16 @@
     <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>
     <string name="zen_mode_no_visual_interruptions" msgid="8742776003822778472">"When screen is on or off"</string>
     <string name="notification_app_settings_button" msgid="6685640230371477485">"Notification settings"</string>
+    <string name="suggestion_button_text" msgid="3275010948381252006">"OK"</string>
     <string name="device_feedback" msgid="3238056036766293294">"Send feedback about this device"</string>
     <string name="restr_pin_enter_admin_pin" msgid="1085834515677448072">"Enter admin PIN"</string>
     <string name="switch_on_text" msgid="1124106706920572386">"On"</string>
@@ -3216,6 +3237,7 @@
     <string name="usb_summary_file_transfers" msgid="6435943692610175111">"Transferring files"</string>
     <string name="usb_summary_photo_transfers" msgid="8440204169576585250">"Transferring photos (PTP)"</string>
     <string name="usb_summary_MIDI" msgid="5687906612187885908">"Using device as MIDI"</string>
+    <string name="sms_mirroring_pref" msgid="6475043279147376031">"SMS Mirroring"</string>
     <string name="background_check_pref" msgid="7550258400138010979">"Background check"</string>
     <string name="background_check_title" msgid="4534254315824525593">"Full background access"</string>
     <string name="assist_access_context_title" msgid="2269032346698890257">"Use text from screen"</string>
@@ -3282,7 +3304,7 @@
     <string name="write_settings_title" msgid="4232152481902542284">"Can modify system settings"</string>
     <string name="write_system_settings" msgid="3482913590601096763">"Modify system settings"</string>
     <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="permit_write_settings" msgid="658555006453212691">"Allow modifying 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>
@@ -3377,9 +3399,12 @@
     <string name="color_temperature" msgid="2070126836910615605">"Cool colour temperature"</string>
     <string name="color_temperature_desc" msgid="4793729830226404052">"Use cooler display colours"</string>
     <string name="color_temperature_toast" msgid="4974218172133854827">"To apply colour change, turn off screen"</string>
-    <string name="telephony_monitor_toast" msgid="7003764250271195384">"To apply telephony monitor change, reboot device"</string>
+    <string name="connectivity_monitor_switch" msgid="9059759348648583421">"Connectivity Monitor"</string>
+    <string name="connectivity_monitor_switch_summary" msgid="2828658652378866401">"Connectivity Monitor will collect logs when it detects a connectivity problem and prompt notification to user to file a bug"</string>
+    <string name="connectivity_monitor_toast" msgid="5551859612881173028">"To apply connectivity monitor change, reboot device"</string>
     <string name="camera_hal_hdrplus_switch" msgid="8377365197105267466">"Camera HAL HDR+"</string>
     <string name="camera_hal_hdrplus_toast" msgid="2063703797270055299">"To apply Camera HAL HDR+ change, reboot device"</string>
+    <string name="camera_laser_sensor_switch" msgid="8913588990743234440">"Camera Laser Sensor"</string>
     <string name="ota_disable_automatic_update" msgid="2319639631655915050">"Automatic system updates"</string>
     <string name="usage" msgid="2977875522080448986">"Usage"</string>
     <string name="cellular_data_usage" msgid="2155683719898158203">"Mobile data usage"</string>
@@ -3405,7 +3430,7 @@
     <string name="data_warning" msgid="209133958008062117">"Data warning"</string>
     <string name="set_data_limit" msgid="2901526323210516923">"Set data limit"</string>
     <string name="data_limit" msgid="1885406964934590552">"Data limit"</string>
-    <string name="data_usage_template" msgid="392191945602400904">"<xliff:g id="ID_1">%1$s</xliff:g> used between <xliff:g id="ID_2">%2$s</xliff:g>"</string>
+    <string name="data_usage_template" msgid="2923744765873163859">"<xliff:g id="ID_1">%1$s</xliff:g> used <xliff:g id="ID_2">%2$s</xliff:g>"</string>
     <string name="configure" msgid="1029654422228677273">"Configure"</string>
     <string name="data_usage_other_apps" msgid="3272872663517382050">"Other apps included in usage"</string>
     <plurals name="data_saver_unrestricted_summary" formatted="false" msgid="2635267833484232703">
@@ -3474,7 +3499,7 @@
     <string name="button_confirm_convert_fbe" msgid="7101855374850373091">"Wipe and convert"</string>
     <string name="reset_shortcut_manager_throttling" msgid="6495066467198668994">"Reset ShortcutManager rate-limiting"</string>
     <string name="reset_shortcut_manager_throttling_complete" msgid="1826770872063707900">"ShortcutManager rate-limiting has been reset"</string>
-    <string name="notification_suggestion_title" msgid="4506524937307816475">"Control lock screen notifications"</string>
+    <string name="notification_suggestion_title" msgid="387052719462473500">"Control info on lock screen"</string>
     <string name="notification_suggestion_summary" msgid="8521159741445416875">"Show or hide notification content"</string>
     <string name="page_tab_title_summary" msgid="4070309266374993258">"All"</string>
     <string name="page_tab_title_support" msgid="8483187649355540109">"Support &amp; tips"</string>
@@ -3482,7 +3507,7 @@
     <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>
     <string name="premium_sms_access" msgid="4660047004791638305">"Premium SMS access"</string>
-    <string name="bluetooth_disabled" msgid="2456198532288640046">"Not visible to other devices"</string>
+    <string name="bluetooth_disabled" msgid="6244000672828617410">"Off"</string>
     <string name="bluetooth_connected_summary" msgid="7672528674593152862">"Connected to <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="bluetooth_connected_multiple_devices_summary" msgid="9173661896296663932">"Connected to multiple devices"</string>
     <string name="demo_mode" msgid="2798762752209330277">"System UI demo mode"</string>
@@ -3584,7 +3609,7 @@
     <string name="web_action_enable_title" msgid="4051513950976670853">"Instant apps"</string>
     <string name="web_action_enable_summary" msgid="3108127559723396382">"Open links in apps, even if they’re not installed"</string>
     <string name="web_action_section_title" msgid="7364647086538399136">"Instant apps"</string>
-    <string name="instant_apps_account" msgid="1433620209791992528">"Instant apps account"</string>
+    <string name="instant_apps_settings" msgid="8827777916518348213">"Instant Apps preferences"</string>
     <string name="domain_url_section_title" msgid="7046835219056428883">"Installed apps"</string>
     <string name="automatic_storage_manager_activation_warning" msgid="6353100011690933254">"Your storage is now being managed by the storage manager"</string>
     <string name="account_for_section_header" msgid="5356566418548737121">"Accounts for <xliff:g id="USER_NAME">%1$s</xliff:g>"</string>
@@ -3631,7 +3656,9 @@
     <string name="enterprise_privacy_always_on_vpn_personal" msgid="9217774730260037434">"Always-on VPN turned on in your personal profile"</string>
     <string name="enterprise_privacy_always_on_vpn_work" msgid="7244472958208315814">"Always-on VPN turned on in your work profile"</string>
     <string name="enterprise_privacy_global_http_proxy" msgid="7936664553416257333">"Global HTTP proxy set"</string>
-    <string name="enterprise_privacy_ca_certs" msgid="5885892204903688909">"Trusted credentials"</string>
+    <string name="enterprise_privacy_ca_certs_device" msgid="2019652712782510262">"Trusted credentials"</string>
+    <string name="enterprise_privacy_ca_certs_personal" msgid="2279084820904076599">"Trusted credentials in your personal profile"</string>
+    <string name="enterprise_privacy_ca_certs_work" msgid="6187377647815301809">"Trusted credentials in your work profile"</string>
     <plurals name="enterprise_privacy_number_ca_certs" formatted="false" msgid="526375234629534165">
       <item quantity="other">Minimum <xliff:g id="COUNT_1">%d</xliff:g> CA certificates</item>
       <item quantity="one">Minimum <xliff:g id="COUNT_0">%d</xliff:g> CA certificate</item>
@@ -3694,6 +3721,8 @@
     <string name="carrier_provisioning" msgid="4398683675591893169">"Operator Provisioning Info"</string>
     <string name="trigger_carrier_provisioning" msgid="3434865918009286187">"Trigger Operator Provisioning"</string>
     <string name="new_device_suggestion_title" msgid="698847081680980774">"What\'s new and exciting?"</string>
-    <string name="new_device_suggestion_summary" msgid="7172709269203435870">"Check out the top 5 features"</string>
+    <string name="new_device_suggestion_summary" product="default" msgid="206396571522515855">"Take a tour of your new phone"</string>
+    <string name="new_device_suggestion_summary" product="tablet" msgid="393751455688210956">"Take a tour of your new tablet"</string>
+    <string name="new_device_suggestion_summary" product="device" msgid="2939870049868336652">"Take a tour of your new device"</string>
     <string name="disabled_low_ram_device" msgid="3751578499721173344">"This feature is not available on this device"</string>
 </resources>
diff --git a/res/values-en-rCA-nokeys/strings.xml b/res/values-en-rCA-nokeys/strings.xml
new file mode 100644
index 0000000..05263e9
--- /dev/null
+++ b/res/values-en-rCA-nokeys/strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2007 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+  
+          http://www.apache.org/licenses/LICENSE-2.0
+  
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT 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="applications_settings_summary" msgid="6616938758022986257">"Manage applications"</string>
+</resources>
diff --git a/res/values-en-rCA/arrays.xml b/res/values-en-rCA/arrays.xml
new file mode 100644
index 0000000..1e36841
--- /dev/null
+++ b/res/values-en-rCA/arrays.xml
@@ -0,0 +1,479 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+/*
+**
+** Copyright 2007 The Android Open Source Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+**     http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT 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-array name="timezone_filters">
+    <item msgid="5296756001147094692">"America"</item>
+    <item msgid="3005562397632768392">"Europe"</item>
+    <item msgid="5696915123093701218">"Africa"</item>
+    <item msgid="4439789052790868249">"Asia"</item>
+    <item msgid="956915953069815961">"Australia"</item>
+    <item msgid="5345178126174698955">"Pacific"</item>
+    <item msgid="8392017019801393511">"All"</item>
+  </string-array>
+  <string-array name="screen_timeout_entries">
+    <item msgid="3342301044271143016">"15 seconds"</item>
+    <item msgid="8881760709354815449">"30 seconds"</item>
+    <item msgid="7589406073232279088">"1 minute"</item>
+    <item msgid="7001195990902244174">"2 minutes"</item>
+    <item msgid="7489864775127957179">"5 minutes"</item>
+    <item msgid="2314124409517439288">"10 minutes"</item>
+    <item msgid="6864027152847611413">"30 minutes"</item>
+  </string-array>
+  <string-array name="dream_timeout_entries">
+    <item msgid="3149294732238283185">"Never"</item>
+    <item msgid="2194151041885903260">"15 seconds"</item>
+    <item msgid="5892295237131074341">"30 seconds"</item>
+    <item msgid="3538441365970038213">"1 minute"</item>
+    <item msgid="412343871668955639">"2 minutes"</item>
+    <item msgid="5076853889688991690">"5 minutes"</item>
+    <item msgid="1903860996174927898">"10 minutes"</item>
+    <item msgid="6415509612413178727">"30 minutes"</item>
+  </string-array>
+  <string-array name="lock_after_timeout_entries">
+    <item msgid="8929270399652145290">"Immediately"</item>
+    <item msgid="6736512735606834431">"5 seconds"</item>
+    <item msgid="8044619388267891375">"15 seconds"</item>
+    <item msgid="1822002388249545488">"30 seconds"</item>
+    <item msgid="8538071621211916519">"1 minute"</item>
+    <item msgid="5663439580228932882">"2 minutes"</item>
+    <item msgid="49888496216106852">"5 minutes"</item>
+    <item msgid="9002737361305019353">"10 minutes"</item>
+    <item msgid="4322676235684793329">"30 minutes"</item>
+  </string-array>
+  <string-array name="entries_font_size">
+    <item msgid="8166647333858618801">"Small"</item>
+    <item msgid="6986443533756848935">"Default"</item>
+    <item msgid="38373998008112077">"Large"</item>
+    <item msgid="7635254317531872272">"Largest"</item>
+  </string-array>
+  <string-array name="wifi_status">
+    <item msgid="1922181315419294640"></item>
+    <item msgid="8934131797783724664">"Scanning…"</item>
+    <item msgid="8513729475867537913">"Connecting…"</item>
+    <item msgid="515055375277271756">"Authenticating…"</item>
+    <item msgid="1943354004029184381">"Obtaining IP address…"</item>
+    <item msgid="4221763391123233270">"Connected"</item>
+    <item msgid="624838831631122137">"Suspended"</item>
+    <item msgid="7979680559596111948">"Disconnecting…"</item>
+    <item msgid="1634960474403853625">"Disconnected"</item>
+    <item msgid="746097431216080650">"Unsuccessful"</item>
+    <item msgid="6367044185730295334">"Blocked"</item>
+    <item msgid="503942654197908005">"Temporarily avoiding poor connection"</item>
+  </string-array>
+  <string-array name="wifi_status_with_ssid">
+    <item msgid="7714855332363650812"></item>
+    <item msgid="8878186979715711006">"Scanning…"</item>
+    <item msgid="355508996603873860">"Connecting to <xliff:g id="NETWORK_NAME">%1$s</xliff:g>…"</item>
+    <item msgid="554971459996405634">"Authenticating with <xliff:g id="NETWORK_NAME">%1$s</xliff:g>…"</item>
+    <item msgid="7928343808033020343">"Obtaining IP address from <xliff:g id="NETWORK_NAME">%1$s</xliff:g>…"</item>
+    <item msgid="8937994881315223448">"Connected to <xliff:g id="NETWORK_NAME">%1$s</xliff:g>"</item>
+    <item msgid="1330262655415760617">"Suspended"</item>
+    <item msgid="7698638434317271902">"Disconnecting from <xliff:g id="NETWORK_NAME">%1$s</xliff:g>…"</item>
+    <item msgid="197508606402264311">"Disconnected"</item>
+    <item msgid="8578370891960825148">"Unsuccessful"</item>
+    <item msgid="5660739516542454527">"Blocked"</item>
+    <item msgid="1805837518286731242">"Temporarily avoiding poor connection"</item>
+  </string-array>
+    <!-- no translation found for wifi_security:0 (8491993170197127709) -->
+    <!-- no translation found for wifi_security:1 (6524315248437318854) -->
+    <!-- no translation found for wifi_security:2 (1532568756571457140) -->
+    <!-- no translation found for wifi_security:3 (3620707702811709779) -->
+    <!-- no translation found for wifi_security_no_eap:0 (2084555984818107151) -->
+    <!-- no translation found for wifi_security_no_eap:1 (397579322683471524) -->
+    <!-- no translation found for wifi_security_no_eap:2 (1968820975358150484) -->
+  <string-array name="wifi_eap_method">
+    <item msgid="1160193392455075561">"PEAP"</item>
+    <item msgid="7981731051382306293">"TLS"</item>
+    <item msgid="2892994535305020162">"TTLS"</item>
+    <item msgid="435667726254379514">"PWD"</item>
+    <item msgid="8549485714107012129">"SIM"</item>
+    <item msgid="1023893786681286517">"AKA"</item>
+    <item msgid="3030483188676375009">"AKA\'"</item>
+  </string-array>
+  <string-array name="eap_method_without_sim_auth">
+    <item msgid="4047867891913819797">"PEAP"</item>
+    <item msgid="641030570679578504">"TLS"</item>
+    <item msgid="3079489731769553856">"TTLS"</item>
+    <item msgid="35269224158638258">"PWD"</item>
+  </string-array>
+    <!-- no translation found for wifi_ap_band_config_full:0 (1085243288162893079) -->
+    <!-- no translation found for wifi_ap_band_config_full:1 (5531376834915607202) -->
+    <!-- no translation found for wifi_ap_band_config_2G_only:0 (7006771583217001015) -->
+  <string-array name="wifi_p2p_wps_setup">
+    <item msgid="5085064298144493867">"Push button"</item>
+    <item msgid="1624323946324499595">"PIN from peer device"</item>
+    <item msgid="5366790421523328066">"PIN from this device"</item>
+  </string-array>
+  <string-array name="wifi_p2p_status">
+    <item msgid="1701505390737218306">"Connected"</item>
+    <item msgid="3189211552661432651">"Invited"</item>
+    <item msgid="3206450250360237549">"Unsuccessful"</item>
+    <item msgid="7785896708926971207">"Available"</item>
+    <item msgid="2330782789550628803">"Out of range"</item>
+  </string-array>
+  <string-array name="bluetooth_visibility_timeout_entries">
+    <item msgid="8151962652413645395">"2 minutes"</item>
+    <item msgid="8675215713017289017">"5 minutes"</item>
+    <item msgid="477015974247590543">"1 hour"</item>
+    <item msgid="5198271470953124739">"Never time out"</item>
+  </string-array>
+  <string-array name="wifi_signal">
+    <item msgid="2245412278046491293">"Poor"</item>
+    <item msgid="2042505933058940139">"Poor"</item>
+    <item msgid="1344546617235886412">"Fair"</item>
+    <item msgid="6019931571712517411">"Good"</item>
+    <item msgid="8986346415847956850">"Excellent"</item>
+  </string-array>
+  <string-array name="data_usage_data_range">
+    <item msgid="5013973108901348144">"Last 30 days"</item>
+    <item msgid="6600989128423965319">"Set usage cycle..."</item>
+  </string-array>
+  <string-array name="usage_stats_display_order_types">
+    <item msgid="2100172576767439288">"Usage time"</item>
+    <item msgid="4796160515314745154">"Last time used"</item>
+    <item msgid="2502754479975776899">"App name"</item>
+  </string-array>
+  <string-array name="wifi_eap_entries">
+    <item msgid="8615575908717909498">"PEAP"</item>
+    <item msgid="8667872640594311615">"TLS"</item>
+    <item msgid="7182812872984827322">"TTLS"</item>
+    <item msgid="2318274046749286642">"PWD"</item>
+  </string-array>
+  <string-array name="wifi_peap_phase2_entries">
+    <item msgid="2577747762745812488">"None"</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">"None"</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">"None"</item>
+    <item msgid="6189918678874123056">"PAP"</item>
+    <item msgid="1524112260493662517">"MSCHAP"</item>
+    <item msgid="5923246669412752932">"MSCHAPV2"</item>
+    <item msgid="8651992560135239389">"GTC"</item>
+  </string-array>
+  <string-array name="wifi_ip_settings">
+    <item msgid="3906714200993111074">"DHCP"</item>
+    <item msgid="628395202971532382">"Static"</item>
+  </string-array>
+  <string-array name="wifi_proxy_settings">
+    <item msgid="4473276491748503377">"None"</item>
+    <item msgid="8673874894887358090">"Manual"</item>
+    <item msgid="168893341855953140">"Proxy Auto-Config"</item>
+  </string-array>
+  <string-array name="apn_auth_entries">
+    <item msgid="3856896061242872146">"None"</item>
+    <item msgid="5756844015743664882">"PAP"</item>
+    <item msgid="535934025797984365">"CHAP"</item>
+    <item msgid="8383098660619805783">"PAP or CHAP"</item>
+  </string-array>
+  <string-array name="apn_protocol_entries">
+    <item msgid="4852355456199302715">"IPv4"</item>
+    <item msgid="4394161344888484571">"IPv6"</item>
+    <item msgid="8084938354605535381">"IPv4/IPv6"</item>
+  </string-array>
+  <string-array name="bearer_entries">
+    <item msgid="1697455674244601285">"Unspecified"</item>
+    <item msgid="1317061551798123908">"LTE"</item>
+    <item msgid="5005435684511894770">"HSPAP"</item>
+    <item msgid="7700603056475539235">"HSPA"</item>
+    <item msgid="245973007602397887">"HSUPA"</item>
+    <item msgid="6291566767651194016">"HSDPA"</item>
+    <item msgid="2005841400859926251">"UMTS"</item>
+    <item msgid="3757385691174882861">"EDGE"</item>
+    <item msgid="2979115073474306864">"GPRS"</item>
+    <item msgid="2271750502778879106">"eHRPD"</item>
+    <item msgid="4173379084783381337">"EVDO_B"</item>
+    <item msgid="2033682802005776093">"EVDO_A"</item>
+    <item msgid="5753917125831466719">"EVDO_0"</item>
+    <item msgid="4713807936577071142">"1xRTT"</item>
+    <item msgid="1142355797022021906">"IS95B"</item>
+    <item msgid="7471182818083460781">"IS95A"</item>
+  </string-array>
+  <string-array name="mvno_type_entries">
+    <item msgid="4367119357633573465">"None"</item>
+    <item msgid="6062567900587138000">"SPN"</item>
+    <item msgid="2454085083342423481">"IMSI"</item>
+    <item msgid="2681427309183221543">"GID"</item>
+  </string-array>
+  <string-array name="app_install_location_entries">
+    <item msgid="8151497958991952759">"Internal device storage"</item>
+    <item msgid="3738430123799803530">"Removable SD card"</item>
+    <item msgid="4498124044785815005">"Let the system decide"</item>
+  </string-array>
+  <string-array name="app_ops_categories">
+    <item msgid="6358963769537892925">"Location"</item>
+    <item msgid="255608127647030286">"Personal"</item>
+    <item msgid="4588829735729884491">"Messaging"</item>
+    <item msgid="886742181977884584">"Media"</item>
+    <item msgid="7924928667052300589">"Device"</item>
+  </string-array>
+  <string-array name="app_ops_summaries">
+    <item msgid="4979188868761515915">"coarse location"</item>
+    <item msgid="5789673140227507995">"fine location"</item>
+    <item msgid="1061584358377390581">"GPS"</item>
+    <item msgid="5387405117297558954">"vibrate"</item>
+    <item msgid="3434165993711230924">"read contacts"</item>
+    <item msgid="616161687718081936">"modify contacts"</item>
+    <item msgid="7638002295329050091">"read call log"</item>
+    <item msgid="6546959730920410907">"modify call log"</item>
+    <item msgid="446877710771379667">"read calendar"</item>
+    <item msgid="7674458294386319722">"modify calendar"</item>
+    <item msgid="8281201165558093009">"Wi-Fi scan"</item>
+    <item msgid="8694611243479480497">"notification"</item>
+    <item msgid="7776439107987345446">"cell scan"</item>
+    <item msgid="514615766544675057">"call phone"</item>
+    <item msgid="8181415497109310680">"read SMS"</item>
+    <item msgid="6816551144382117307">"write SMS"</item>
+    <item msgid="4600463921908905030">"receive SMS"</item>
+    <item msgid="5958926493289432745">"receive emergency SMS"</item>
+    <item msgid="4945269495221089540">"receive MMS"</item>
+    <item msgid="5570472453573929087">"receive WAP push"</item>
+    <item msgid="7125408150230860501">"send SMS"</item>
+    <item msgid="7080337936612188061">"read ICC SMS"</item>
+    <item msgid="587124103118495063">"write ICC SMS"</item>
+    <item msgid="2320577158869025503">"modify settings"</item>
+    <item msgid="1545733463471924009">"draw on top"</item>
+    <item msgid="3609046903962454582">"access notifications"</item>
+    <item msgid="4671646036128214513">"camera"</item>
+    <item msgid="1097324338692486211">"record audio"</item>
+    <item msgid="5031552983987798163">"play audio"</item>
+    <item msgid="8374996688066472414">"read clipboard"</item>
+    <item msgid="3045529469061083747">"modify clipboard"</item>
+    <item msgid="5124443975763747838">"media buttons"</item>
+    <item msgid="4547883971364273343">"audio focus"</item>
+    <item msgid="2603878814882344450">"master volume"</item>
+    <item msgid="7136963238377062018">"voice volume"</item>
+    <item msgid="4270236897655923007">"ring volume"</item>
+    <item msgid="6325739889222559394">"media volume"</item>
+    <item msgid="5762123934816216821">"alarm volume"</item>
+    <item msgid="785049718065337473">"notification volume"</item>
+    <item msgid="6700305533746877052">"Bluetooth volume"</item>
+    <item msgid="2029227495214047094">"keep awake"</item>
+    <item msgid="26109888160231211">"monitor location"</item>
+    <item msgid="5753382310468855812">"monitor high power location"</item>
+    <item msgid="3356591542543137332">"get usage stats"</item>
+    <item msgid="3073734345226842233">"mute/unmute microphone"</item>
+    <item msgid="2111767435887685265">"show toast"</item>
+    <item msgid="1091168669714823370">"project media"</item>
+    <item msgid="485564189219029300">"activate VPN"</item>
+    <item msgid="7155384795265164395">"write wallpaper"</item>
+    <item msgid="1835836196806147034">"assist structure"</item>
+    <item msgid="5989890403088155055">"assist screenshot"</item>
+    <item msgid="8582699692765917557">"read phone state"</item>
+    <item msgid="1474039653814954902">"add voicemail"</item>
+    <item msgid="7222837656938871633">"use sip"</item>
+    <item msgid="6108267038969274380">"process outgoing call"</item>
+    <item msgid="4823402479973873358">"fingerprint"</item>
+    <item msgid="5895843015407713543">"body sensors"</item>
+    <item msgid="1436446526955010826">"read mobile broadcasts"</item>
+    <item msgid="884172201575690484">"mock location"</item>
+    <item msgid="3591971310048485247">"read storage"</item>
+    <item msgid="4041187808621866119">"write storage"</item>
+    <item msgid="6628873315024166197">"turn on screen"</item>
+    <item msgid="3253368931113490863">"get accounts"</item>
+    <item msgid="780392378084812901">"run in background"</item>
+    <item msgid="2629748510881309577">"accessibility volume"</item>
+  </string-array>
+  <string-array name="app_ops_labels">
+    <item msgid="6602854600289714121">"Location"</item>
+    <item msgid="8677040780775113033">"Location"</item>
+    <item msgid="1660743989948992916">"Location"</item>
+    <item msgid="8791172739860195290">"Vibrate"</item>
+    <item msgid="383413555642128046">"Read contacts"</item>
+    <item msgid="3654594895269697313">"Modify contacts"</item>
+    <item msgid="7928393476362362538">"Read call log"</item>
+    <item msgid="6248591205254641116">"Modify call log"</item>
+    <item msgid="6093344633066170692">"Read calendar"</item>
+    <item msgid="1334886368750347692">"Modify calendar"</item>
+    <item msgid="1638204101698708656">"Location"</item>
+    <item msgid="2154671955760380322">"Post notification"</item>
+    <item msgid="4282477730595931828">"Location"</item>
+    <item msgid="4891423912898525905">"Call phone"</item>
+    <item msgid="2623604824935968113">"Read SMS/MMS"</item>
+    <item msgid="4420177125221176306">"Write SMS/MMS"</item>
+    <item msgid="3986142739951490025">"Receive SMS/MMS"</item>
+    <item msgid="3984213795861739778">"Receive SMS/MMS"</item>
+    <item msgid="3656243523752472788">"Receive SMS/MMS"</item>
+    <item msgid="8105802370238551510">"Receive SMS/MMS"</item>
+    <item msgid="1407766984645388488">"Send SMS/MMS"</item>
+    <item msgid="3527273606643794973">"Read SMS/MMS"</item>
+    <item msgid="4370895547001583812">"Write SMS/MMS"</item>
+    <item msgid="4218544235221631789">"Modify settings"</item>
+    <item msgid="736541391767350377">"Draw on top"</item>
+    <item msgid="5530815681721654194">"Access notifications"</item>
+    <item msgid="781213371706962767">"Camera"</item>
+    <item msgid="1720492593061838172">"Record audio"</item>
+    <item msgid="3493046322001257041">"Play audio"</item>
+    <item msgid="136815868796597058">"Read clipboard"</item>
+    <item msgid="5238692940326972503">"Modify clipboard"</item>
+    <item msgid="5753789168376302997">"Media buttons"</item>
+    <item msgid="3265262911688671938">"Audio focus"</item>
+    <item msgid="2098976479485046797">"Master volume"</item>
+    <item msgid="5660213838861789350">"Voice volume"</item>
+    <item msgid="7983336752371254444">"Ring volume"</item>
+    <item msgid="7878027809189330917">"Media volume"</item>
+    <item msgid="7260546305036218513">"Alarm volume"</item>
+    <item msgid="9103719301075748925">"Notification volume"</item>
+    <item msgid="7025966722295861512">"Bluetooth volume"</item>
+    <item msgid="4665183401128289653">"Keep awake"</item>
+    <item msgid="8584357129746649222">"Location"</item>
+    <item msgid="7669257279311110599">"Location"</item>
+    <item msgid="3459320345690097795">"Get usage stats"</item>
+    <item msgid="1312534577834048535">"Mute/unmute microphone"</item>
+    <item msgid="427580389823724225">"Show toast"</item>
+    <item msgid="4992007785575926253">"Project media"</item>
+    <item msgid="2482631530338029480">"Activate VPN"</item>
+    <item msgid="1662979573471871926">"Write wallpaper"</item>
+    <item msgid="5964768335278263478">"Assist structure"</item>
+    <item msgid="2657138701132782702">"Assist screenshot"</item>
+    <item msgid="8571369610363539266">"Read phone state"</item>
+    <item msgid="4542463358215230845">"Add voicemail"</item>
+    <item msgid="864565065016166003">"Use sip"</item>
+    <item msgid="1958009349883195116">"Process outgoing call"</item>
+    <item msgid="8526563410140613458">"Fingerprint"</item>
+    <item msgid="7864822459293570891">"Body sensors"</item>
+    <item msgid="6798698496904810960">"Read mobile broadcasts"</item>
+    <item msgid="5242052845700875820">"Mock location"</item>
+    <item msgid="1246296877820358565">"Read storage"</item>
+    <item msgid="2404067308793740341">"Write storage"</item>
+    <item msgid="5832543806893763620">"Turn on screen"</item>
+    <item msgid="5258373962467495905">"Get accounts"</item>
+    <item msgid="334625385979270703">"Run in background"</item>
+    <item msgid="9039213578110332702">"Accessibility volume"</item>
+  </string-array>
+  <string-array name="long_press_timeout_selector_titles">
+    <item msgid="3511504869290423954">"Short"</item>
+    <item msgid="2560532955514699713">"Medium"</item>
+    <item msgid="2372711992605524591">"Long"</item>
+  </string-array>
+  <string-array name="captioning_typeface_selector_titles">
+    <item msgid="1319652728542138112">"Default"</item>
+    <item msgid="1016452621833735880">"Sans-serif"</item>
+    <item msgid="2496277987934654454">"Sans-serif condensed"</item>
+    <item msgid="7247838127505318669">"Sans-serif monospace"</item>
+    <item msgid="4478414822462359763">"Serif"</item>
+    <item msgid="7502451783483660829">"Serif monospace"</item>
+    <item msgid="639503332147461010">"Casual"</item>
+    <item msgid="7967169925231332424">"Cursive"</item>
+    <item msgid="561832997193039673">"Small capitals"</item>
+  </string-array>
+  <string-array name="captioning_font_size_selector_titles">
+    <item msgid="4800919809575254054">"Very small"</item>
+    <item msgid="6781094565687692782">"Small"</item>
+    <item msgid="8222123259497646551">"Normal"</item>
+    <item msgid="5813217276778560466">"Large"</item>
+    <item msgid="9044232017390975191">"Very large"</item>
+  </string-array>
+  <string-array name="captioning_edge_type_selector_titles">
+    <item msgid="4733815704128258753">"Default"</item>
+    <item msgid="3217099060748617005">"None"</item>
+    <item msgid="7467615139904599420">"Outline"</item>
+    <item msgid="5623165557468608975">"Drop shadow"</item>
+    <item msgid="8088451174058214588">"Raised"</item>
+    <item msgid="3821418743395480313">"Depressed"</item>
+  </string-array>
+  <string-array name="captioning_opacity_selector_titles">
+    <item msgid="7622491218136667566">"25%"</item>
+    <item msgid="2367156416247936773">"50%"</item>
+    <item msgid="5395560410107149298">"75%"</item>
+    <item msgid="8342334626783983353">"100%"</item>
+  </string-array>
+  <string-array name="captioning_preset_selector_titles">
+    <item msgid="7009918361545506251">"Use app defaults"</item>
+    <item msgid="1770533843436933500">"White on black"</item>
+    <item msgid="758587126802411846">"Black on white"</item>
+    <item msgid="1495307195241623402">"Yellow on black"</item>
+    <item msgid="6039700130994371612">"Yellow on blue"</item>
+    <item msgid="7169235156349580064">"Customise"</item>
+  </string-array>
+  <string-array name="vpn_types_long">
+    <item msgid="2732002039459078847">"PPTP VPN"</item>
+    <item msgid="3799752201662127867">"L2TP/IPSec VPN with preshared keys"</item>
+    <item msgid="4725504331295252103">"L2TP/IPSec VPN with certificates"</item>
+    <item msgid="7526551163264034377">"IPSec VPN with preshared keys and Xauth authentication"</item>
+    <item msgid="8064740940687465039">"IPSec VPN with certificates and Xauth authentication"</item>
+    <item msgid="4946199982372391490">"IPSec VPN with certificates and hybrid authentication"</item>
+  </string-array>
+  <string-array name="vpn_states">
+    <item msgid="8621078286418985762">"Disconnected"</item>
+    <item msgid="6692305604213080515">"Initialising..."</item>
+    <item msgid="8001704909356800092">"Connecting…"</item>
+    <item msgid="4039737283841672166">"Connected"</item>
+    <item msgid="4042143101664725090">"Timeout"</item>
+    <item msgid="7664124146786465092">"Unsuccessful"</item>
+  </string-array>
+  <string-array name="security_settings_premium_sms_values">
+    <item msgid="7389829271787670252">"Ask"</item>
+    <item msgid="5077768429488260031">"Never allow"</item>
+    <item msgid="1417929597727989746">"Always allow"</item>
+  </string-array>
+  <string-array name="ram_states">
+    <item msgid="3944681673818150669">"Normal"</item>
+    <item msgid="3256987280393708586">"Moderate"</item>
+    <item msgid="4662917179231875995">"Low"</item>
+    <item msgid="5264929699714647509">"Critical"</item>
+    <item msgid="5606155978847838966">"?"</item>
+  </string-array>
+  <string-array name="proc_stats_memory_states">
+    <item msgid="8845855295876909468">"Normal"</item>
+    <item msgid="866544120205026771">"Moderate"</item>
+    <item msgid="7851902244436886890">"Low"</item>
+    <item msgid="3022922196817563960">"Critical"</item>
+  </string-array>
+  <string-array name="proc_stats_process_states">
+    <item msgid="5069825997142785829">"Persistent"</item>
+    <item msgid="5779398140277006695">"Top activity"</item>
+    <item msgid="1439598363694578255">"Important (foreground)"</item>
+    <item msgid="3396458970745718652">"Important (background)"</item>
+    <item msgid="5214825238247511992">"Backup"</item>
+    <item msgid="311372689168254967">"Heavy weight"</item>
+    <item msgid="7438189122367820362">"Service (running)"</item>
+    <item msgid="918687422516982498">"Service (restarting)"</item>
+    <item msgid="6807727069641853029">"Receiver"</item>
+    <item msgid="6782857406100845127">"Home"</item>
+    <item msgid="2860945127596974299">"Last activity"</item>
+    <item msgid="8610560843693675830">"Cached (activity)"</item>
+    <item msgid="4338089220026248848">"Cached (activity client)"</item>
+    <item msgid="6652164677254579050">"Cached (empty)"</item>
+  </string-array>
+  <string-array name="color_picker">
+    <item msgid="7631642672260600032">"Teal"</item>
+    <item msgid="8332294763632946560">"Blue"</item>
+    <item msgid="2023216417616991392">"Indigo"</item>
+    <item msgid="3170497246594232819">"Purple"</item>
+    <item msgid="4608643045752965568">"Pink"</item>
+    <item msgid="6131821495505931173">"Red"</item>
+  </string-array>
+  <string-array name="automatic_storage_management_days">
+    <item msgid="687318592238852312">"Over 30 days old"</item>
+    <item msgid="2900554746706302178">"Over 60 days old"</item>
+    <item msgid="5692284879054004388">"Over 90 days old"</item>
+  </string-array>
+</resources>
diff --git a/res/values-en-rCA/config.xml b/res/values-en-rCA/config.xml
new file mode 100644
index 0000000..153e247
--- /dev/null
+++ b/res/values-en-rCA/config.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2007 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT 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="config_backup_settings_label" msgid="4423938073600296337"></string>
+</resources>
diff --git a/res/values-en-rCA/strings.xml b/res/values-en-rCA/strings.xml
new file mode 100644
index 0000000..c2b5fc3
--- /dev/null
+++ b/res/values-en-rCA/strings.xml
@@ -0,0 +1,3728 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2007 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT 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="yes" msgid="4676390750360727396">"Yes"</string>
+    <string name="no" msgid="6731231425810196216">"No"</string>
+    <string name="create" msgid="3578857613172647409">"Create"</string>
+    <string name="allow" msgid="3349662621170855910">"Allow"</string>
+    <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>
+    <string name="header_category_personal" msgid="3310195187905720823">"Personal"</string>
+    <string name="header_category_access" msgid="7580499097416970962">"Access"</string>
+    <string name="header_category_system" msgid="2816866961183068977">"System"</string>
+    <string name="radio_info_data_connection_enable" msgid="8656750679353982712">"Enable data connection"</string>
+    <string name="radio_info_data_connection_disable" msgid="8541302390883231216">"Disable data connection"</string>
+    <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>
+    <string name="radioInfo_menu_viewSDN" msgid="7130280686244955669">"View Service Dialling Numbers"</string>
+    <string name="radioInfo_menu_getIMS" msgid="185171476413967831">"IMS Service Status"</string>
+    <string name="radio_info_ims_reg_status_title" msgid="16971785902696970">"IMS Status"</string>
+    <string name="radio_info_ims_reg_status_registered" msgid="5614116179751126247">"Registered"</string>
+    <string name="radio_info_ims_reg_status_not_registered" msgid="4438054067642750717">"Not Registered"</string>
+    <string name="radio_info_ims_feature_status_available" msgid="3687807290327566879">"Available"</string>
+    <string name="radio_info_ims_feature_status_unavailable" msgid="4606182208970114368">"Unavailable"</string>
+    <string name="radio_info_ims_reg_status" msgid="7534612158445529715">"IMS Registration: <xliff:g id="STATUS">%1$s</xliff:g>\nVoice over LTE: <xliff:g id="AVAILABILITY_0">%2$s</xliff:g>\nVoice over Wi-Fi: <xliff:g id="AVAILABILITY_1">%3$s</xliff:g>\nVideo Calling: <xliff:g id="AVAILABILITY_2">%4$s</xliff:g>\nUT Interface: <xliff:g id="AVAILABILITY_3">%5$s</xliff:g>"</string>
+    <string name="radioInfo_service_in" msgid="1697703164394784618">"In service"</string>
+    <string name="radioInfo_service_out" msgid="7999094221728929681">"Out of service"</string>
+    <string name="radioInfo_service_emergency" msgid="6274434235469661525">"Emergency Calls Only"</string>
+    <string name="radioInfo_service_off" msgid="7536423790014501173">"Radio off"</string>
+    <string name="radioInfo_roaming_in" msgid="9045363884600341051">"Roaming"</string>
+    <string name="radioInfo_roaming_not" msgid="4849214885629672819">"Not roaming"</string>
+    <string name="radioInfo_phone_idle" msgid="7489244938838742820">"Idle"</string>
+    <string name="radioInfo_phone_ringing" msgid="4883724645684297895">"Ringing"</string>
+    <string name="radioInfo_phone_offhook" msgid="5873835692449118954">"Call in progress"</string>
+    <string name="radioInfo_data_disconnected" msgid="1959735267890719418">"Disconnected"</string>
+    <string name="radioInfo_data_connecting" msgid="8404571440697917823">"Connecting"</string>
+    <string name="radioInfo_data_connected" msgid="7074301157399238697">"Connected"</string>
+    <string name="radioInfo_data_suspended" msgid="5315325487890334196">"Suspended"</string>
+    <string name="radioInfo_unknown" msgid="1476509178755955088">"unknown"</string>
+    <string name="radioInfo_display_packets" msgid="8654359809877290639">"pkts"</string>
+    <string name="radioInfo_display_bytes" msgid="4018206969492931883">"bytes"</string>
+    <string name="radioInfo_display_dbm" msgid="3621221793699882781">"dBm"</string>
+    <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">"Unmount USB storage"</string>
+    <string name="sdcard_unmount" product="default" msgid="3364184561355611897">"Unmount SD card"</string>
+    <string name="sdcard_format" product="nosdcard" msgid="6285310523155166716">"Erase USB storage"</string>
+    <string name="sdcard_format" product="default" msgid="6713185532039187532">"Erase SD card"</string>
+    <string name="preview_pager_content_description" msgid="8926235999291761243">"Preview"</string>
+    <string name="preview_page_indicator_content_description" msgid="4821343428913401264">"Preview, page <xliff:g id="CURRENT_PAGE">%1$d</xliff:g> of <xliff:g id="NUM_PAGES">%2$d</xliff:g>"</string>
+    <string name="font_size_summary" msgid="1690992332887488183">"Make the text on screen smaller or larger."</string>
+    <string name="font_size_make_smaller_desc" msgid="7919995133365371569">"Make smaller"</string>
+    <string name="font_size_make_larger_desc" msgid="4316986572233686061">"Make larger"</string>
+    <!-- no translation found for font_size_preview_text (4818424565068376732) -->
+    <skip />
+    <string name="font_size_preview_text_headline" msgid="7955317408475392247">"Sample text"</string>
+    <string name="font_size_preview_text_title" msgid="1310536233106975546">"The Wonderful Wizard of Oz"</string>
+    <string name="font_size_preview_text_subtitle" msgid="4231671528173110093">"Chapter 11: The Wonderful Emerald City of Oz"</string>
+    <string name="font_size_preview_text_body" msgid="2846183528684496723">"Even with eyes protected by the green spectacles Dorothy and her friends were at first dazzled by the brilliancy of the wonderful City. The streets were lined with beautiful houses all built of green marble and studded everywhere with sparkling emeralds. They walked over a pavement of the same green marble, and where the blocks were joined together were rows of emeralds, set closely, and glittering in the brightness of the sun. The window panes were of green glass; even the sky above the City had a green tint, and the rays of the sun were green. \n\nThere were many people, men, women and children, walking about, and these were all dressed in green clothes and had greenish skins. They looked at Dorothy and her strangely assorted company with wondering eyes, and the children all ran away and hid behind their mothers when they saw the Lion; but no one spoke to them. Many shops stood in the street, and Dorothy saw that everything in them was green. Green candy and green pop-corn were offered for sale, as well as green shoes, green hats and green clothes of all sorts. At one place a man was selling green lemonade, and when the children bought it Dorothy could see that they paid for it with green pennies. \n\nThere seemed to be no horses or animals of any kind; the men carried things around in little green carts, which they pushed before them. Everyone seemed happy, contented and prosperous."</string>
+    <string name="font_size_save" msgid="3450855718056759095">"OK"</string>
+    <string name="sdcard_setting" product="nosdcard" msgid="8281011784066476192">"USB storage"</string>
+    <string name="sdcard_setting" product="default" msgid="5922637503871474866">"SD card"</string>
+    <string name="bluetooth" msgid="5549625000628014477">"Bluetooth"</string>
+    <string name="bluetooth_is_discoverable" msgid="8373421452106840526">"Visible to all Bluetooth devices nearby (<xliff:g id="DISCOVERABLE_TIME_PERIOD">%1$s</xliff:g>)"</string>
+    <string name="bluetooth_is_discoverable_always" msgid="2849387702249327748">"Visible to all Bluetooth devices nearby"</string>
+    <string name="bluetooth_not_visible_to_other_devices" msgid="9120274591523391910">"Not visible to other Bluetooth devices"</string>
+    <string name="bluetooth_only_visible_to_paired_devices" msgid="2049983392373296028">"Only visible to paired devices"</string>
+    <string name="bluetooth_visibility_timeout" msgid="8002247464357005429">"Visibility timeout"</string>
+    <string name="bluetooth_lock_voice_dialing" msgid="3139322992062086225">"Lock voice dialling"</string>
+    <string name="bluetooth_lock_voice_dialing_summary" msgid="4741338867496787042">"Prevent use of the Bluetooth dialler when the screen is locked"</string>
+    <string name="bluetooth_devices" msgid="1886018064039454227">"Bluetooth devices"</string>
+    <string name="bluetooth_device_name" msgid="8415828355207423800">"Device name"</string>
+    <string name="bluetooth_device_details" msgid="4594773497930028085">"Device settings"</string>
+    <string name="bluetooth_profile_details" msgid="6823621790324933337">"Profile settings"</string>
+    <string name="bluetooth_name_not_set" msgid="2653752006416027426">"No name set, using account name"</string>
+    <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="7830252930348734303">"Disconnect device?"</string>
+    <string name="bluetooth_disconnect_all_profiles" product="default" msgid="8208712728668714199">"Your phone will disconnect from <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
+    <string name="bluetooth_disconnect_all_profiles" product="tablet" msgid="6611038575213485336">"Your tablet will disconnect from <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
+    <string name="bluetooth_disconnect_all_profiles" product="device" msgid="3995834526315103965">"Your device will disconnect from <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
+    <string name="bluetooth_disconnect_dialog_ok" msgid="3308586619539119106">"Disconnect"</string>
+    <string name="bluetooth_empty_list_user_restricted" msgid="603521233563983689">"You don\'t have permission to change Bluetooth settings."</string>
+    <string name="bluetooth_pairing_pref_title" msgid="7429413067477968637">"Pair new device"</string>
+    <string name="bluetooth_is_visible_message" msgid="6222396240776971862">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> is visible to nearby devices while the Bluetooth settings are open."</string>
+    <string name="bluetooth_footer_mac_message" product="default" msgid="1109366350000220283">"Phone\'s Bluetooth address: <xliff:g id="BLUETOOTH_MAC_ADDRESS">%1$s</xliff:g>"</string>
+    <string name="bluetooth_footer_mac_message" product="tablet" msgid="6807634484499166486">"Tablet\'s Bluetooth address: <xliff:g id="BLUETOOTH_MAC_ADDRESS">%1$s</xliff:g>"</string>
+    <string name="bluetooth_footer_mac_message" product="device" msgid="8413944740341742061">"Device\'s Bluetooth address: <xliff:g id="BLUETOOTH_MAC_ADDRESS">%1$s</xliff:g>"</string>
+    <string name="bluetooth_is_disconnect_question" msgid="5334933802445256306">"Disconnect <xliff:g id="DEVICE_NAME">%1$s</xliff:g>?"</string>
+    <string name="bluetooth_broadcasting" msgid="16583128958125247">"Broadcasting"</string>
+    <string name="bluetooth_disable_profile_title" msgid="5916643979709342557">"Disable profile?"</string>
+    <string name="bluetooth_disable_profile_message" msgid="2895844842011809904">"This will disable:&lt;br&gt;&lt;b&gt;<xliff:g id="PROFILE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;From:&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">"Unnamed Bluetooth device"</string>
+    <string name="progress_scanning" msgid="192587958424295789">"Searching"</string>
+    <string name="bluetooth_no_devices_found" msgid="1085232930277181436">"No nearby Bluetooth devices were found."</string>
+    <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="3144149432555230410">"Received files"</string>
+    <string name="device_picker" msgid="4978696506172252813">"Choose Bluetooth device"</string>
+    <string name="bluetooth_ask_enablement" msgid="3387222809404177525">"<xliff:g id="APP_NAME">%1$s</xliff:g> wants to turn on Bluetooth"</string>
+    <string name="bluetooth_ask_disablement" msgid="5890386255790160573">"<xliff:g id="APP_NAME">%1$s</xliff:g> wants to turn off Bluetooth"</string>
+    <string name="bluetooth_ask_enablement_no_name" msgid="1644353686104482763">"An app wants to turn on Bluetooth"</string>
+    <string name="bluetooth_ask_disablement_no_name" msgid="9218830122674868548">"An app wants to turn off Bluetooth"</string>
+    <string name="bluetooth_ask_discovery" product="tablet" msgid="4791779658660357386">"<xliff:g id="APP_NAME">%1$s</xliff:g> wants to make your tablet visible to other Bluetooth devices for <xliff:g id="TIMEOUT">%2$d</xliff:g> seconds."</string>
+    <string name="bluetooth_ask_discovery" product="default" msgid="1308225382575535366">"<xliff:g id="APP_NAME">%1$s</xliff:g> wants to make your phone visible to other Bluetooth devices for <xliff:g id="TIMEOUT">%2$d</xliff:g> seconds."</string>
+    <string name="bluetooth_ask_discovery_no_name" product="tablet" msgid="225715443477752935">"An app wants to make your tablet visible to other Bluetooth devices for <xliff:g id="TIMEOUT">%1$d</xliff:g> seconds."</string>
+    <string name="bluetooth_ask_discovery_no_name" product="default" msgid="4949152735544109994">"An app wants to make your phone visible to other Bluetooth devices for <xliff:g id="TIMEOUT">%1$d</xliff:g> seconds."</string>
+    <string name="bluetooth_ask_lasting_discovery" product="tablet" msgid="8528329166577187961">"<xliff:g id="APP_NAME">%1$s</xliff:g> wants to make your tablet visible to other Bluetooth devices. You can change this later in Bluetooth settings."</string>
+    <string name="bluetooth_ask_lasting_discovery" product="default" msgid="4398738575307583138">"<xliff:g id="APP_NAME">%1$s</xliff:g> wants to make your phone visible to other Bluetooth devices. You can change this later in Bluetooth settings."</string>
+    <string name="bluetooth_ask_lasting_discovery_no_name" product="tablet" msgid="1702590641426207062">"An app wants to make your tablet visible to other Bluetooth devices. You can change this later in Bluetooth settings."</string>
+    <string name="bluetooth_ask_lasting_discovery_no_name" product="default" msgid="8549952177383992238">"An app wants to make your phone visible to other Bluetooth devices. You can change this later in Bluetooth settings."</string>
+    <string name="bluetooth_ask_enablement_and_discovery" product="tablet" msgid="1141843490422565755">"<xliff:g id="APP_NAME">%1$s</xliff:g> wants to turn on Bluetooth and make your tablet visible to other devices for <xliff:g id="TIMEOUT">%2$d</xliff:g> seconds."</string>
+    <string name="bluetooth_ask_enablement_and_discovery" product="default" msgid="5195836980079191473">"<xliff:g id="APP_NAME">%1$s</xliff:g> wants to turn on Bluetooth and make your phone visible to other devices for <xliff:g id="TIMEOUT">%2$d</xliff:g> seconds."</string>
+    <string name="bluetooth_ask_enablement_and_discovery_no_name" product="tablet" msgid="7009338445281693765">"An app wants to turn on Bluetooth and make your tablet visible to other devices for <xliff:g id="TIMEOUT">%1$d</xliff:g> seconds."</string>
+    <string name="bluetooth_ask_enablement_and_discovery_no_name" product="default" msgid="8386904242279878734">"An app wants to turn on Bluetooth and make your phone visible to other devices for <xliff:g id="TIMEOUT">%1$d</xliff:g> seconds."</string>
+    <string name="bluetooth_ask_enablement_and_lasting_discovery" product="tablet" msgid="2279471426575892686">"<xliff:g id="APP_NAME">%1$s</xliff:g> wants to turn on Bluetooth and make your tablet visible to other devices. You can change this later in Bluetooth settings."</string>
+    <string name="bluetooth_ask_enablement_and_lasting_discovery" product="default" msgid="6961969825475461450">"<xliff:g id="APP_NAME">%1$s</xliff:g> wants to turn on Bluetooth and make your phone visible to other devices. You can change this later in Bluetooth settings."</string>
+    <string name="bluetooth_ask_enablement_and_lasting_discovery_no_name" product="tablet" msgid="692477613671555006">"An app wants to turn on Bluetooth and make your tablet visible to other devices. You can change this later in Bluetooth settings."</string>
+    <string name="bluetooth_ask_enablement_and_lasting_discovery_no_name" product="default" msgid="6374480121751597648">"An app wants to turn on Bluetooth and make your phone visible to other devices. You can change this later in Bluetooth settings."</string>
+    <string name="bluetooth_turning_on" msgid="4850574877288036646">"Turning on Bluetooth…"</string>
+    <string name="bluetooth_turning_off" msgid="2337747302892025192">"Turning Bluetooth off…"</string>
+    <string name="bluetooth_auto_connect" msgid="40711424456733571">"Auto-connect"</string>
+    <string name="bluetooth_connection_permission_request" msgid="4747918249032890077">"Bluetooth connection request"</string>
+    <string name="bluetooth_connection_notif_message" msgid="3603316575471431846">"Tap to connect to \"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>\"."</string>
+    <string name="bluetooth_connection_dialog_text" msgid="8455427559949998023">"Do you want to connect to \"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>\"?"</string>
+    <string name="bluetooth_phonebook_request" msgid="3951420080540915279">"Phone book access request"</string>
+    <string name="bluetooth_pb_acceptance_dialog_text" msgid="8930347091018455505">"<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g> wants to access your contacts and call history. Give access to <xliff:g id="DEVICE_NAME_1">%2$s</xliff:g>?"</string>
+    <string name="bluetooth_remember_choice" msgid="6919682671787049800">"Don\'t ask again"</string>
+    <string name="bluetooth_pb_remember_choice" msgid="3622898084442402071">"Don\'t ask again"</string>
+    <string name="bluetooth_map_request" msgid="4595727689513143902">"Message access request"</string>
+    <string name="bluetooth_map_acceptance_dialog_text" msgid="8712508202081143737">"%1$s wants to access your messages. Give access to %2$s?"</string>
+    <string name="bluetooth_sap_request" msgid="2669762224045354417">"SIM access request"</string>
+    <string name="bluetooth_sap_acceptance_dialog_text" msgid="4414253873553608690">"<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g> wants to access your SIM card. Granting access to the SIM card will disable data connectivity on your device for the duration of the connection. Give access to <xliff:g id="DEVICE_NAME_1">%2$s?</xliff:g>"</string>
+    <string name="bluetooth_device_name_summary" msgid="522235742194965734">"Visible as “<xliff:g id="DEVICE_NAME">^1</xliff:g>” to other devices"</string>
+    <string name="bluetooth_paired_device_title" msgid="8638994696317952019">"Your devices"</string>
+    <string name="bluetooth_pairing_page_title" msgid="7712127387361962608">"Pair new device"</string>
+    <string name="date_and_time" msgid="9062980487860757694">"Date &amp; time"</string>
+    <string name="choose_timezone" msgid="1362834506479536274">"Choose time zone"</string>
+    <!-- no translation found for intent_sender_data_label (6332324780477289261) -->
+    <skip />
+    <string name="intent_sender_sendbroadcast_text" msgid="1415735148895872715">"Send <xliff:g id="BROADCAST">broadcast</xliff:g>"</string>
+    <string name="intent_sender_action_label" msgid="616458370005452389">"<xliff:g id="ACTION">Action</xliff:g>:"</string>
+    <string name="intent_sender_startactivity_text" msgid="5080516029580421895">"Start <xliff:g id="ACTIVITY">activity</xliff:g>"</string>
+    <string name="intent_sender_resource_label" msgid="6963659726895482829">"<xliff:g id="RESOURCE">Resource</xliff:g>:"</string>
+    <string name="intent_sender_account_label" msgid="465210404475603404">"Account:"</string>
+    <string name="proxy_settings_title" msgid="9049437837600320881">"Proxy"</string>
+    <string name="proxy_clear_text" msgid="5555400754952012657">"Clear"</string>
+    <string name="proxy_port_label" msgid="5655276502233453400">"Proxy port"</string>
+    <string name="proxy_exclusionlist_label" msgid="7700491504623418701">"Bypass proxy for"</string>
+    <string name="proxy_defaultView_text" msgid="6387985519141433291">"Restore defaults"</string>
+    <string name="proxy_action_text" msgid="2957063145357903951">"Done"</string>
+    <string name="proxy_hostname_label" msgid="8490171412999373362">"Proxy hostname"</string>
+    <string name="proxy_error" msgid="8926675299638611451">"Attention"</string>
+    <string name="proxy_error_dismiss" msgid="4993171795485460060">"OK"</string>
+    <string name="proxy_error_invalid_host" msgid="6865850167802455230">"The hostname that you typed isn\'t valid."</string>
+    <string name="proxy_error_invalid_exclusion_list" msgid="678527645450894773">"The exclusion list that you\'ve typed isn\'t properly formatted. Type a comma-separated list of excluded domains."</string>
+    <string name="proxy_error_empty_port" msgid="5539106187558215246">"You need to complete the port field."</string>
+    <string name="proxy_error_empty_host_set_port" msgid="2451694104858226781">"The port field must be empty if the host field is empty."</string>
+    <string name="proxy_error_invalid_port" msgid="5988270202074492710">"The port that you typed is not valid."</string>
+    <string name="proxy_warning_limited_support" msgid="7229337138062837422">"The HTTP proxy is used by the browser but may not be used by the other apps."</string>
+    <string name="proxy_url_title" msgid="7185282894936042359">"PAC URL: "</string>
+    <string name="radio_info_signal_location_label" msgid="3242990404410530456">"Mobile location info (deprecated):"</string>
+    <string name="radio_info_neighboring_location_label" msgid="5766020323342985397">"Neighbour mobile info (deprecated):"</string>
+    <string name="radio_info_cell_info_refresh_rate" msgid="7062777594049622128">"Mobile info refresh rate:"</string>
+    <string name="radio_info_cellinfo_label" msgid="6213223844927623098">"All mobile measurement info:"</string>
+    <string name="radio_info_dcrtinfo_label" msgid="4062076024399431876">"Data connection real-time info:"</string>
+    <string name="radio_info_gprs_service_label" msgid="4209624131644060517">"Data service:"</string>
+    <string name="radio_info_roaming_label" msgid="6141505430275138647">"Roaming:"</string>
+    <string name="radio_info_imei_label" msgid="1220524224732944192">"IMEI:"</string>
+    <string name="radio_info_call_redirect_label" msgid="2743797189722106231">"Call redirect:"</string>
+    <string name="radio_info_ppp_resets_label" msgid="3587319503902576102">"Number of PPP reset since boot:"</string>
+    <string name="radio_info_current_network_label" msgid="9151285540639134945">"Current network:"</string>
+    <string name="radio_info_ppp_received_label" msgid="363579470428151850">"Data Received:"</string>
+    <string name="radio_info_gsm_service_label" msgid="1370863866816125489">"Voice service:"</string>
+    <string name="radio_info_signal_strength_label" msgid="5155734002519307416">"Signal strength"</string>
+    <string name="radio_info_call_status_label" msgid="2611065018172747413">"Voice call status:"</string>
+    <string name="radio_info_ppp_sent_label" msgid="7748668735880404586">"Data sent"</string>
+    <string name="radio_info_message_waiting_label" msgid="1037302619943328273">"Message waiting:"</string>
+    <string name="radio_info_phone_number_label" msgid="7942153178953255231">"Phone number:"</string>
+    <string name="radio_info_band_mode_label" msgid="8730871744887454509">"Select radio band"</string>
+    <string name="radio_info_voice_network_type_label" msgid="1443496502370667071">"Voice network type:"</string>
+    <string name="radio_info_data_network_type_label" msgid="7094323145105149312">"Data network type:"</string>
+    <string name="radio_info_set_perferred_label" msgid="3511830813500105512">"Set preferred network type:"</string>
+    <string name="radio_info_ping_hostname_v4" msgid="7045103377818314709">"Ping Hostname(www.google.com) IPv4:"</string>
+    <string name="radio_info_ping_hostname_v6" msgid="1130906124160553954">"Ping Hostname(www.google.com) IPv6:"</string>
+    <string name="radio_info_http_client_test" msgid="2382286093023138339">"HTTP Client test:"</string>
+    <string name="ping_test_label" msgid="579228584343892613">"Run ping test"</string>
+    <string name="radio_info_smsc_label" msgid="6399460520126501354">"SMSC:"</string>
+    <string name="radio_info_smsc_update_label" msgid="7258686760358791539">"Update"</string>
+    <string name="radio_info_smsc_refresh_label" msgid="6902302130315125102">"Refresh"</string>
+    <string name="radio_info_toggle_dns_check_label" msgid="6625185764803245075">"Toggle DNS check"</string>
+    <string name="oem_radio_info_label" msgid="6163141792477958941">"OEM-specific Info/Settings"</string>
+    <string name="band_mode_title" msgid="4071411679019296568">"Set Radio Band Mode"</string>
+    <string name="band_mode_loading" msgid="3555063585133586152">"Loading band list…"</string>
+    <string name="band_mode_set" msgid="5730560180249458484">"Set"</string>
+    <string name="band_mode_failed" msgid="1495968863884716379">"Unsuccessful"</string>
+    <string name="band_mode_succeeded" msgid="2701016190055887575">"Successful"</string>
+    <string name="sdcard_changes_instructions" msgid="4482324130377280131">"Changes take effect when the USB cable is reconnected."</string>
+    <string name="sdcard_settings_screen_mass_storage_text" msgid="3741220147296482474">"Enable USB mass storage"</string>
+    <string name="sdcard_settings_total_bytes_label" msgid="9184160745785062144">"Total bytes:"</string>
+    <string name="sdcard_settings_not_present_status" product="nosdcard" msgid="1636218515775929394">"USB storage not mounted."</string>
+    <string name="sdcard_settings_not_present_status" product="default" msgid="2048419626134861599">"No SD card."</string>
+    <string name="sdcard_settings_available_bytes_label" msgid="763232429899373001">"Available bytes:"</string>
+    <string name="sdcard_settings_mass_storage_status" product="nosdcard" msgid="7993410985895217054">"USB storage is being used as a mass storage device."</string>
+    <string name="sdcard_settings_mass_storage_status" product="default" msgid="2742075324087038036">"SD card is being used as a mass storage device."</string>
+    <string name="sdcard_settings_unmounted_status" product="nosdcard" msgid="5128923500235719226">"It is now safe to remove the USB storage."</string>
+    <string name="sdcard_settings_unmounted_status" product="default" msgid="666233604712540408">"It is now safe to remove the SD card."</string>
+    <string name="sdcard_settings_bad_removal_status" product="nosdcard" msgid="7761390725880773697">"USB storage was removed while still in use!"</string>
+    <string name="sdcard_settings_bad_removal_status" product="default" msgid="5145797653495907970">"SD card was removed while still in use!"</string>
+    <string name="sdcard_settings_used_bytes_label" msgid="8820289486001170836">"Used bytes:"</string>
+    <string name="sdcard_settings_scanning_status" product="nosdcard" msgid="7503429447676219564">"Scanning USB storage for media…"</string>
+    <string name="sdcard_settings_scanning_status" product="default" msgid="2763464949274455656">"Scanning SD card for media…"</string>
+    <string name="sdcard_settings_read_only_status" product="nosdcard" msgid="3624143937437417788">"USB storage mounted read-only."</string>
+    <string name="sdcard_settings_read_only_status" product="default" msgid="4518291824764698112">"SD card mounted read-only."</string>
+    <string name="skip_label" msgid="47510779345218297">"Skip"</string>
+    <string name="next_label" msgid="4693520878012668114">"Next"</string>
+    <string name="language_picker_title" msgid="3596315202551687690">"Languages"</string>
+    <string name="pref_title_lang_selection" msgid="2014920136978776034">"Language preferences"</string>
+    <string name="locale_remove_menu" msgid="7651301406723638854">"Remove"</string>
+    <string name="add_a_language" msgid="2330538812283783022">"Add a language"</string>
+    <plurals name="dlg_remove_locales_title" formatted="false" msgid="4276642359346122396">
+      <item quantity="other">Remove selected languages?</item>
+      <item quantity="one">Remove selected language?</item>
+    </plurals>
+    <string name="dlg_remove_locales_message" msgid="1361354927342876114">"Text will be displayed in another language."</string>
+    <string name="dlg_remove_locales_error_title" msgid="2653242337224911425">"Can’t remove all languages"</string>
+    <string name="dlg_remove_locales_error_message" msgid="6697381512654262821">"Keep at least one preferred language"</string>
+    <string name="locale_not_translated" msgid="516862628177166755">"May not be available in some apps"</string>
+    <string name="action_drag_label_move_up" msgid="9052210023727612540">"Move up"</string>
+    <string name="action_drag_label_move_down" msgid="7448713844582912157">"Move down"</string>
+    <string name="action_drag_label_move_top" msgid="557081389352288310">"Move to top"</string>
+    <string name="action_drag_label_move_bottom" msgid="2468642142414126482">"Move to bottom"</string>
+    <string name="action_drag_label_remove" msgid="2861038147166966206">"Remove language"</string>
+    <string name="activity_picker_label" msgid="6295660302548177109">"Choose activity"</string>
+    <string name="device_info_label" msgid="6551553813651711205">"Device info"</string>
+    <string name="display_label" msgid="8074070940506840792">"Screen"</string>
+    <string name="phone_info_label" product="tablet" msgid="7820855350955963628">"Tablet info"</string>
+    <string name="phone_info_label" product="default" msgid="2127552523124277664">"Phone info"</string>
+    <string name="sd_card_settings_label" product="nosdcard" msgid="8101475181301178428">"USB storage"</string>
+    <string name="sd_card_settings_label" product="default" msgid="5743100901106177102">"SD card"</string>
+    <string name="proxy_settings_label" msgid="3271174136184391743">"Proxy settings"</string>
+    <string name="cancel" msgid="6859253417269739139">"Cancel"</string>
+    <string name="okay" msgid="1997666393121016642">"OK"</string>
+    <string name="forget" msgid="1400428660472591263">"Forget"</string>
+    <string name="save" msgid="879993180139353333">"Save"</string>
+    <string name="done" msgid="6942539184162713160">"Done"</string>
+    <string name="settings_label" msgid="1626402585530130914">"Settings"</string>
+    <string name="settings_label_launcher" msgid="8344735489639482340">"Settings"</string>
+    <string name="settings_shortcut" msgid="3936651951364030415">"Settings shortcut"</string>
+    <string name="activity_list_empty" msgid="6428823323471264836">"No matching activities found."</string>
+    <string name="airplane_mode" msgid="8837269988154128601">"Aeroplane mode"</string>
+    <string name="radio_controls_title" msgid="3447085191369779032">"More"</string>
+    <string name="wireless_networks_settings_title" msgid="3643009077742794212">"Wireless &amp; networks"</string>
+    <string name="radio_controls_summary" msgid="1838624369870907268">"Manage Wi‑Fi, Bluetooth, aeroplane mode, mobile networks, &amp; VPNs"</string>
+    <string name="cellular_data_title" msgid="6835451574385496662">"Mobile data"</string>
+    <string name="calls_title" msgid="3544471959217176768">"Calls"</string>
+    <string name="sms_messages_title" msgid="1778636286080572535">"SMS messages"</string>
+    <string name="cellular_data_summary" msgid="4660351864416939504">"Allow data usage over mobile network"</string>
+    <string name="allow_data_usage_title" msgid="2238205944729213062">"Allow data usage when roaming"</string>
+    <string name="roaming" msgid="3596055926335478572">"Data roaming"</string>
+    <string name="roaming_enable" msgid="3737380951525303961">"Connect to data services when roaming"</string>
+    <string name="roaming_disable" msgid="1295279574370898378">"Connect to data services when roaming"</string>
+    <string name="roaming_reenable_message" msgid="9141007271031717369">"You have lost data connectivity because you left your home network with data roaming turned off."</string>
+    <string name="roaming_turn_it_on_button" msgid="4387601818162120589">"Turn it on"</string>
+    <string name="roaming_warning" msgid="4275443317524544705">"You may incur significant charges."</string>
+    <string name="roaming_warning_multiuser" product="tablet" msgid="6458990250829214777">"When you allow data roaming, you may incur significant roaming charges!\n\nThis setting affects all users on this tablet."</string>
+    <string name="roaming_warning_multiuser" product="default" msgid="6368421100292355440">"When you allow data roaming, you may incur significant roaming charges!\n\nThis setting affects all users on this phone."</string>
+    <string name="roaming_reenable_title" msgid="6068100976707316772">"Allow data roaming?"</string>
+    <string name="networks" msgid="6333316876545927039">"Operator selection"</string>
+    <string name="sum_carrier_select" msgid="3616956422251879163">"Choose a network operator"</string>
+    <string name="date_and_time_settings_title" msgid="3350640463596716780">"Date &amp; time"</string>
+    <string name="date_and_time_settings_title_setup_wizard" msgid="2391530758339384324">"Set date and time"</string>
+    <string name="date_and_time_settings_summary" msgid="7095318986757583584">"Set date, time, time zone, &amp; formats"</string>
+    <string name="date_time_auto" msgid="7076906458515908345">"Automatic date &amp; time"</string>
+    <string name="date_time_auto_summaryOn" msgid="4609619490075140381">"Use network-provided time"</string>
+    <string name="date_time_auto_summaryOff" msgid="8698762649061882791">"Use network-provided time"</string>
+    <string name="zone_auto" msgid="334783869352026648">"Automatic time zone"</string>
+    <string name="zone_auto_summaryOn" msgid="6142830927278458314">"Use network-provided time zone"</string>
+    <string name="zone_auto_summaryOff" msgid="2597745783162041390">"Use network-provided time zone"</string>
+    <string name="date_time_24hour_auto" msgid="2117383168985653422">"Automatic 24‑hour format"</string>
+    <string name="date_time_24hour_auto_summary" msgid="6351812925651480277">"Use locale default"</string>
+    <string name="date_time_24hour_title" msgid="3203537578602803850">"24‑hour format"</string>
+    <string name="date_time_24hour" msgid="1193032284921000063">"Use 24-hour format"</string>
+    <string name="date_time_set_time_title" msgid="6296795651349047016">"Time"</string>
+    <string name="date_time_set_time" msgid="5716856602742530696">"Set time"</string>
+    <string name="date_time_set_timezone_title" msgid="3047322337368233197">"Time zone"</string>
+    <string name="date_time_set_timezone" msgid="5045627174274377814">"Select time zone"</string>
+    <string name="date_time_set_date_title" msgid="6928286765325608604">"Date"</string>
+    <string name="date_time_set_date" msgid="7021491668550232105">"Set date"</string>
+    <string name="zone_list_menu_sort_alphabetically" msgid="5683377702671088588">"Sort alphabetically"</string>
+    <string name="zone_list_menu_sort_by_timezone" msgid="2720190443744884114">"Sort by time zone"</string>
+    <string name="date_picker_title" msgid="1338210036394128512">"Date"</string>
+    <string name="time_picker_title" msgid="483460752287255019">"Time"</string>
+    <string name="lock_after_timeout" msgid="4590337686681194648">"Automatically lock"</string>
+    <string name="lock_after_timeout_summary" msgid="6128431871360905631">"<xliff:g id="TIMEOUT_STRING">%1$s</xliff:g> after sleep"</string>
+    <string name="lock_immediately_summary_with_exception" msgid="9119632173886172690">"Immediately after sleep, except when kept unlocked by <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> after sleep, except when kept unlocked by <xliff:g id="TRUST_AGENT_NAME">%2$s</xliff:g>"</string>
+    <string name="show_owner_info_on_lockscreen_label" msgid="5074906168357568434">"Show owner info on lock screen"</string>
+    <string name="owner_info_settings_title" msgid="5530285568897386122">"Lock screen message"</string>
+    <string name="security_enable_widgets_title" msgid="2754833397070967846">"Enable widgets"</string>
+    <string name="security_enable_widgets_disabled_summary" msgid="6392489775303464905">"Disabled by admin"</string>
+    <string name="owner_info_settings_summary" msgid="7472393443779227052">"None"</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">"e.g. Joe\'s Android."</string>
+    <string name="user_info_settings_title" msgid="1195015434996724736">"User info"</string>
+    <string name="show_profile_info_on_lockscreen_label" msgid="2741208907263877990">"Show profile info on lock screen"</string>
+    <string name="profile_info_settings_title" msgid="3518603215935346604">"Profile info"</string>
+    <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="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>
+    <string name="lockscreen_settings_title" msgid="3922976395527087455">"Lock screen preferences"</string>
+    <string name="security_settings_summary" msgid="967393342537986570">"Set My Location, screen unlock, SIM card lock, credential storage lock"</string>
+    <string name="cdma_security_settings_summary" msgid="6068799952798901542">"Set My Location, screen unlock, credential storage lock"</string>
+    <string name="security_passwords_title" msgid="2881269890053568809">"Privacy"</string>
+    <string name="disabled_by_administrator_summary" msgid="1601828700318996341">"Disabled by admin"</string>
+    <string name="security_status_title" msgid="5848766673665944640">"Security status"</string>
+    <string name="security_dashboard_summary" msgid="6757421634477554939">"Screen lock, fingerprint"</string>
+    <string name="security_dashboard_summary_no_fingerprint" msgid="8129641548372335540">"Screen lock"</string>
+    <string name="security_settings_fingerprint_preference_title" msgid="2488725232406204350">"Fingerprint"</string>
+    <string name="fingerprint_manage_category_title" msgid="8293801041700001681">"Manage fingerprints"</string>
+    <string name="fingerprint_usage_category_title" msgid="8438526918999536619">"Use fingerprint for"</string>
+    <string name="fingerprint_add_title" msgid="1926752654454033904">"Add fingerprint"</string>
+    <string name="fingerprint_enable_keyguard_toggle_title" msgid="5078060939636911795">"screen lock"</string>
+    <plurals name="security_settings_fingerprint_preference_summary" formatted="false" msgid="624961700033979880">
+      <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> fingerprints set up</item>
+      <item quantity="one"><xliff:g id="COUNT_0">%1$d</xliff:g> fingerprint set up</item>
+    </plurals>
+    <string name="security_settings_fingerprint_preference_summary_none" msgid="1507739327565151923"></string>
+    <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="1550756694054944874">"Use your fingerprint to unlock your phone or approve purchases.\n\nNote: You can’t use your fingerprint to unlock this device. For more information, contact your organisation’s admin."</string>
+    <string name="security_settings_fingerprint_enroll_introduction_message_setup" msgid="6817326798834882531">"Use your fingerprint to unlock your phone or approve purchases.\n\nNote: Your fingerprint may be less secure than a strong pattern or PIN."</string>
+    <string name="security_settings_fingerprint_enroll_introduction_cancel" msgid="3199351118385606526">"Cancel"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_continue" msgid="7472492858148162530">"Continue"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_cancel_setup" msgid="5021369420474432665">"Skip"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_continue_setup" msgid="1961957425135180242">"Next"</string>
+    <string name="setup_fingerprint_enroll_skip_title" msgid="362050541117362034">"Skip fingerprint?"</string>
+    <string name="setup_fingerprint_enroll_skip_after_adding_lock_text" msgid="958990414356204763">"Fingerprint setup only takes a minute or two. If you skip this, you can add your fingerprint later in settings."</string>
+    <string name="lock_screen_intro_skip_title" msgid="4988210105913705679">"Skip screen lock?"</string>
+    <string name="lock_screen_intro_skip_dialog_text_frp" product="tablet" msgid="1581834104051243425">"Device protection features won’t be turned on. You won’t be able to prevent others from using this tablet if it’s lost, stolen or reset."</string>
+    <string name="lock_screen_intro_skip_dialog_text_frp" product="device" msgid="4629503416877189572">"Device protection features won’t be turned on. You won’t be able to prevent others from using this device if it’s lost, stolen or reset."</string>
+    <string name="lock_screen_intro_skip_dialog_text_frp" product="default" msgid="2423428240245737909">"Device protection features won’t be turned on. You won’t be able to prevent others from using this phone if it’s lost, stolen or reset."</string>
+    <string name="lock_screen_intro_skip_dialog_text" product="tablet" msgid="5219287483885558525">"Device protection features won’t be turned on. You won’t be able to prevent others from using this tablet if it’s lost or stolen."</string>
+    <string name="lock_screen_intro_skip_dialog_text" product="device" msgid="1466238255429527112">"Device protection features won’t be turned on. You won’t be able to prevent others from using this device if it’s lost or stolen."</string>
+    <string name="lock_screen_intro_skip_dialog_text" product="default" msgid="3008526710555416125">"Device protection features won’t be turned on. You won’t be able to prevent others from using this phone if it’s lost or stolen."</string>
+    <string name="skip_anyway_button_label" msgid="2323522873558834513">"Skip anyway"</string>
+    <string name="go_back_button_label" msgid="4745265266186209467">"Go back"</string>
+    <string name="security_settings_fingerprint_enroll_find_sensor_title" msgid="3051496861358227199">"Touch the sensor"</string>
+    <string name="security_settings_fingerprint_enroll_find_sensor_message" msgid="8793966374365960368">"It’s on the back of your phone. Use your index finger."</string>
+    <string name="security_settings_fingerprint_enroll_find_sensor_content_description" msgid="2058830032070449160">"Illustration with device and fingerprint sensor location"</string>
+    <string name="security_settings_fingerprint_enroll_dialog_name_label" msgid="7086763077909041106">"Name"</string>
+    <string name="security_settings_fingerprint_enroll_dialog_ok" msgid="4150384963879569750">"OK"</string>
+    <string name="security_settings_fingerprint_enroll_dialog_delete" msgid="4114615413240707936">"Delete"</string>
+    <string name="security_settings_fingerprint_enroll_start_title" msgid="2068961812439460133">"Touch the sensor"</string>
+    <string name="security_settings_fingerprint_enroll_start_message" msgid="3909929328942564524">"Put your finger on the sensor and lift after you feel a vibration"</string>
+    <string name="security_settings_fingerprint_enroll_repeat_title" msgid="2819679722403209778">"Lift, then touch again"</string>
+    <string name="security_settings_fingerprint_enroll_repeat_message" msgid="6158989350522518586">"Keep lifting your finger to add the different parts of your fingerprint"</string>
+    <string name="security_settings_fingerprint_enroll_finish_title" msgid="7567276170287972230">"Fingerprint added"</string>
+    <string name="security_settings_fingerprint_enroll_finish_message" msgid="4796715961273420536">"When you see this icon, use your fingerprint for identification or to approve purchases."</string>
+    <string name="security_settings_fingerprint_enroll_enrolling_skip" msgid="3710211704052369752">"Do it later"</string>
+    <string name="setup_fingerprint_enroll_enrolling_skip_title" msgid="6808422329107426923">"Skip fingerprint setup?"</string>
+    <string name="setup_fingerprint_enroll_enrolling_skip_message" msgid="274849306857859783">"You’ve chosen to use your fingerprint as one way to unlock your phone. If you skip now, you’ll need to set this up later. Setup takes only a minute or so."</string>
+    <string name="security_settings_fingerprint_enroll_setup_screen_lock" msgid="1195743489835505376">"Set up screen lock"</string>
+    <string name="security_settings_fingerprint_enroll_done" msgid="4014607378328187567">"Done"</string>
+    <string name="security_settings_fingerprint_enroll_touch_dialog_title" msgid="1863561601428695160">"Whoops, that\'s not the sensor"</string>
+    <string name="security_settings_fingerprint_enroll_touch_dialog_message" msgid="2989019978041986175">"Touch the sensor on the back of your phone. Use your index finger."</string>
+    <string name="security_settings_fingerprint_enroll_error_dialog_title" msgid="3618021988442639280">"Enrolment was not completed"</string>
+    <string name="security_settings_fingerprint_enroll_error_timeout_dialog_message" msgid="2942551158278899627">"Fingerprint enrolment time limit reached. Try again."</string>
+    <string name="security_settings_fingerprint_enroll_error_generic_dialog_message" msgid="3624760637222239293">"Fingerprint enrolment didn\'t work. Try again or use a different finger."</string>
+    <string name="fingerprint_enroll_button_add" msgid="6317978977419045463">"Add another"</string>
+    <string name="fingerprint_enroll_button_next" msgid="6247009337616342759">"Next"</string>
+    <string name="security_settings_fingerprint_enroll_disclaimer" msgid="2624905914239271751">"In addition to unlocking your phone, you can also use your fingerprint to authorise purchases and app access. "<annotation id="url">"Learn more"</annotation></string>
+    <string name="security_settings_fingerprint_enroll_disclaimer_lockscreen_disabled" msgid="7846871823167357942">" The screen lock option is disabled. To find out more, contact your organisation\'s admin. "<annotation id="admin_details">"More details"</annotation>\n\n"You can still use your fingerprint to authorise purchases and app access. "<annotation id="url">"Learn more"</annotation></string>
+    <string name="security_settings_fingerprint_enroll_lift_touch_again" msgid="1888772560642539718">"Lift finger, then touch sensor again"</string>
+    <string name="fingerprint_add_max" msgid="1020927549936895822">"You can add up to <xliff:g id="COUNT">%d</xliff:g> fingerprints"</string>
+    <string name="fingerprint_intro_error_max" msgid="6864066984678078441">"You’ve added the maximum number of fingerprints"</string>
+    <string name="fingerprint_intro_error_unknown" msgid="1905692132326523040">"Can’t add more fingerprints"</string>
+    <string name="fingerprint_last_delete_title" msgid="6410310101247028988">"Remove all fingerprints?"</string>
+    <string name="fingerprint_delete_title" msgid="1368196182612202898">"Remove \'<xliff:g id="FINGERPRINT_ID">%1$s</xliff:g>\'"</string>
+    <string name="fingerprint_delete_message" msgid="8597787803567398131">"Do you want to delete this fingerprint?"</string>
+    <string name="fingerprint_last_delete_message" msgid="7852321001254275878">"You won\'t be able to use your fingerprints to unlock your phone, authorise purchases or sign in to apps with them"</string>
+    <string name="fingerprint_last_delete_message_profile_challenge" msgid="6521520787746771912">"You won\'t be able to use your fingerprints to unlock your work profile, authorise purchases or sign in to work apps"</string>
+    <string name="fingerprint_last_delete_confirm" msgid="2634726361059274289">"Yes, remove"</string>
+    <string name="confirm_fingerprint_icon_content_description" msgid="5255544532157079096">"Use your fingerprint to continue."</string>
+    <string name="crypt_keeper_settings_title" msgid="4219233835490520414">"Encryption"</string>
+    <string name="crypt_keeper_encrypt_title" product="tablet" msgid="1060273569887301457">"Encrypt tablet"</string>
+    <string name="crypt_keeper_encrypt_title" product="default" msgid="1878996487755806122">"Encrypt phone"</string>
+    <string name="crypt_keeper_encrypted_summary" msgid="1868233637888132906">"Encrypted"</string>
+    <string name="crypt_keeper_desc" product="tablet" msgid="503014594435731275">"You can encrypt your accounts, settings, downloaded apps and their data, media and other files. After you encrypt your tablet, assuming you\'ve set up a screen lock (that is, a pattern or numeric PIN or password), you\'ll need to unlock the screen to decrypt the tablet every time you power it on. The only other way to decrypt is to perform a factory data reset, erasing all your data.\n\nEncryption takes an hour or more. You must start with a charged battery and keep your tablet plugged in throughout the process. If you interrupt it, you\'ll lose some or all of your data"</string>
+    <string name="crypt_keeper_desc" product="default" msgid="2579929266645543631">"You can encrypt your accounts, settings, downloaded apps and their data, media and other files. After you encrypt your phone, assuming you\'ve set up a screen lock (that is, a pattern or numeric PIN or password), you\'ll need to unlock the screen to decrypt the phone every time you power it on. The only other way to decrypt is to perform a factory data reset, erasing all your data.\n\nEncryption takes an hour or more. You must start with a charged battery and keep your phone plugged in throughout the process. If you interrupt it, you\'ll lose some or all of your data."</string>
+    <string name="crypt_keeper_button_text" product="tablet" msgid="1189623490604750854">"Encrypt tablet"</string>
+    <string name="crypt_keeper_button_text" product="default" msgid="2008346408473255519">"Encrypt phone"</string>
+    <string name="crypt_keeper_low_charge_text" msgid="2029407131227814893">"Please charge your battery and try again."</string>
+    <string name="crypt_keeper_unplugged_text" msgid="4785376766063053901">"Please plug in your charger and try again."</string>
+    <string name="crypt_keeper_dialog_need_password_title" msgid="4058971800557767">"No lock-screen PIN or password"</string>
+    <string name="crypt_keeper_dialog_need_password_message" msgid="4071395977297369642">"You need to set a lock screen PIN or password before you can start encryption."</string>
+    <string name="crypt_keeper_confirm_title" msgid="5100339496381875522">"Encrypt?"</string>
+    <string name="crypt_keeper_final_desc" product="tablet" msgid="517662068757620756">"The encryption operation is irreversible and if you interrupt it, you\'ll lose data. Encryption takes an hour or more, during which the tablet will restart several times."</string>
+    <string name="crypt_keeper_final_desc" product="default" msgid="287503113671320916">"The encryption operation is irreversible and if you interrupt it, you\'ll lose data. Encryption takes an hour or more, during which the phone will restart several times."</string>
+    <string name="crypt_keeper_setup_title" msgid="1783951453124244969">"Encrypting"</string>
+    <string name="crypt_keeper_setup_description" product="tablet" msgid="6689952371032099350">"Wait while your tablet is being encrypted. <xliff:g id="PERCENT">^1</xliff:g>% complete."</string>
+    <string name="crypt_keeper_setup_description" product="default" msgid="951918761585534875">"Wait while your phone is being encrypted. <xliff:g id="PERCENT">^1</xliff:g>% complete."</string>
+    <string name="crypt_keeper_setup_time_remaining" product="tablet" msgid="1655047311546745695">"Wait while your tablet is being encrypted. Time remaining: <xliff:g id="DURATION">^1</xliff:g>"</string>
+    <string name="crypt_keeper_setup_time_remaining" product="default" msgid="1862964662304683072">"Wait while your phone is being encrypted. Time remaining: <xliff:g id="DURATION">^1</xliff:g>"</string>
+    <string name="crypt_keeper_force_power_cycle" product="tablet" msgid="556504311511212648">"To unlock your tablet, turn it off and then on."</string>
+    <string name="crypt_keeper_force_power_cycle" product="default" msgid="1794353635603020327">"To unlock your phone, turn it off and then on."</string>
+    <string name="crypt_keeper_warn_wipe" msgid="2738374897337991667">"Warning: Your device will be wiped after <xliff:g id="COUNT">^1</xliff:g> more failed attempts to be unlocked!"</string>
+    <string name="crypt_keeper_enter_password" msgid="2223340178473871064">"Type your password"</string>
+    <string name="crypt_keeper_failed_title" msgid="7133499413023075961">"Encryption unsuccessful"</string>
+    <string name="crypt_keeper_failed_summary" product="tablet" msgid="8219375738445017266">"Encryption was interrupted and can\'t be completed. As a result, the data on your tablet is no longer accessible. \n\n To resume using your tablet, you need to perform a factory reset. When you set up your tablet after the reset, you\'ll have an opportunity to restore any data that was backed up to your Google account."</string>
+    <string name="crypt_keeper_failed_summary" product="default" msgid="3270131542549577953">"Encryption was interrupted and can\'t be completed. As a result, the data on your phone is no longer accessible. \n\nTo resume using your phone, you need to perform a factory reset. When you set up your phone after the reset, you\'ll have an opportunity to restore any data that was backed up to your Google account."</string>
+    <string name="crypt_keeper_data_corrupt_title" msgid="8759119849089795751">"Decryption unsuccessful"</string>
+    <string name="crypt_keeper_data_corrupt_summary" product="tablet" msgid="840107296925798402">"The password that you entered is correct, but unfortunately your data is corrupt. \n\nTo resume using your tablet, you will need to perform a factory reset. When you set up your tablet after the reset, you\'ll have an opportunity to restore any data that was backed up to your Google account."</string>
+    <string name="crypt_keeper_data_corrupt_summary" product="default" msgid="8843311420059663824">"The password that you entered is correct, but unfortunately your data is corrupt. \n\nTo resume using your phone, you need to perform a factory reset. When you set up your phone after the reset, you’ll have an opportunity to restore any data that was backed up to your Google account."</string>
+    <string name="crypt_keeper_switch_input_method" msgid="4168332125223483198">"Switch input method"</string>
+    <string name="suggested_lock_settings_title" msgid="8971630898700461034">"Set screen lock"</string>
+    <string name="suggested_lock_settings_summary" msgid="8778462376012231110">"Protect your device"</string>
+    <string name="suggested_fingerprint_lock_settings_title" msgid="3655973509619012084">"Use fingerprint"</string>
+    <string name="suggested_fingerprint_lock_settings_summary" msgid="2149569133725273864">"Unlock with your fingerprint"</string>
+    <string name="lock_settings_picker_title" msgid="1095755849152582712">"Choose screen lock"</string>
+    <string name="lock_settings_picker_title_profile" msgid="8822511284992306796">"Choose work lock"</string>
+    <string name="setup_lock_settings_picker_title" product="tablet" msgid="90329443364067215">"Protect your tablet"</string>
+    <string name="setup_lock_settings_picker_title" product="device" msgid="2399952075134938929">"Protect your device"</string>
+    <string name="setup_lock_settings_picker_title" product="default" msgid="1572244299605153324">"Protect your phone"</string>
+    <string name="lock_settings_picker_fingerprint_added_security_message" msgid="5768002109707648463">"For added security, set a backup screen lock."</string>
+    <string name="setup_lock_settings_picker_message" product="tablet" msgid="8919671129189936210">"Prevent others from using this tablet 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="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>
+    <string name="unlock_set_unlock_launch_picker_title_profile" msgid="124176557311393483">"Work profile lock"</string>
+    <string name="unlock_set_unlock_launch_picker_change_title" msgid="5045866882028324941">"Change lock screen"</string>
+    <string name="unlock_set_unlock_launch_picker_change_summary" msgid="2790960639554590668">"Change or disable pattern, PIN or password security"</string>
+    <string name="unlock_set_unlock_launch_picker_enable_summary" msgid="4791110798817242301">"Choose a method to lock the screen"</string>
+    <string name="unlock_set_unlock_off_title" msgid="7117155352183088342">"None"</string>
+    <string name="unlock_set_unlock_off_summary" msgid="94361581669110415"></string>
+    <string name="unlock_set_unlock_none_title" msgid="5679243878975864640">"Swipe"</string>
+    <string name="unlock_set_unlock_none_summary" msgid="8914673583104628191">"No security"</string>
+    <string name="unlock_set_unlock_pattern_title" msgid="2912067603917311700">"Pattern"</string>
+    <string name="unlock_set_unlock_pattern_summary" msgid="7062696666227725593">"Medium security"</string>
+    <string name="unlock_set_unlock_pin_title" msgid="5846029709462329515">"PIN"</string>
+    <string name="unlock_set_unlock_pin_summary" msgid="907878650556383388">"Medium to high security"</string>
+    <string name="unlock_set_unlock_password_title" msgid="8775603825675090937">"Password"</string>
+    <string name="unlock_set_unlock_password_summary" msgid="8856220848940929546">"High security"</string>
+    <string name="unlock_set_do_later_title" msgid="4894767558414979243">"Not now"</string>
+    <string name="current_screen_lock" msgid="4104091715420072219">"Current screen lock"</string>
+    <string name="fingerprint_unlock_set_unlock_pattern" msgid="4939057588092120368">"Fingerprint + Pattern"</string>
+    <string name="fingerprint_unlock_set_unlock_pin" msgid="8010746824051056986">"Fingerprint + PIN"</string>
+    <string name="fingerprint_unlock_set_unlock_password" msgid="7351131075806338634">"Fingerprint + Password"</string>
+    <string name="fingerprint_unlock_skip_fingerprint" msgid="1441077909803666681">"Continue without fingerprint"</string>
+    <string name="fingerprint_unlock_title" msgid="2826226740306003991">"You can unlock your phone using your fingerprint. For security, this option requires a backup screen lock."</string>
+    <string name="unlock_set_unlock_disabled_summary" msgid="2051593894736282302">"Disabled by admin, encryption policy or credential storage"</string>
+    <string name="unlock_set_unlock_mode_off" msgid="5881952274566013651">"None"</string>
+    <string name="unlock_set_unlock_mode_none" msgid="8467360084676871617">"Swipe"</string>
+    <string name="unlock_set_unlock_mode_pattern" msgid="7837270780919299289">"Pattern"</string>
+    <string name="unlock_set_unlock_mode_pin" msgid="3541326261341386690">"PIN"</string>
+    <string name="unlock_set_unlock_mode_password" msgid="1203938057264146610">"Password"</string>
+    <string name="unlock_setup_wizard_fingerprint_details" msgid="7893457665921363009">"Once you\'ve set up a screen lock, you can also set up your fingerprint in Settings &gt; Security."</string>
+    <string name="unlock_disable_lock_title" msgid="1427036227416979120">"Turn off screen lock"</string>
+    <string name="unlock_disable_frp_warning_title" msgid="264008934468492550">"Remove device protection?"</string>
+    <string name="unlock_disable_frp_warning_title_profile" msgid="5507136301904313583">"Remove profile protection?"</string>
+    <string name="unlock_disable_frp_warning_content_pattern" msgid="8869767290771023461">"Device protection features will not work without your pattern."</string>
+    <string name="unlock_disable_frp_warning_content_pattern_fingerprint" msgid="2986105377420905314">"Device protection features will not work without your pattern.<xliff:g id="EMPTY_LINE">
+
+</xliff:g>Your saved fingerprints will also be removed from this device and you won\'t be able to unlock your phone, authorise purchases or sign in to apps with them."</string>
+    <string name="unlock_disable_frp_warning_content_pin" msgid="586996206210265131">"Device protection features will not work without your PIN."</string>
+    <string name="unlock_disable_frp_warning_content_pin_fingerprint" msgid="3370462835533123695">"Device protection features will not work without your PIN.<xliff:g id="EMPTY_LINE">
+
+</xliff:g>Your saved fingerprints will also be removed from this device and you won\'t be able to unlock your phone, authorise purchases or sign in to apps with them."</string>
+    <string name="unlock_disable_frp_warning_content_password" msgid="5420612686852555537">"Device protection features will not work without your password."</string>
+    <string name="unlock_disable_frp_warning_content_password_fingerprint" msgid="3595476296430536798">"Device protection features will not work without your password.<xliff:g id="EMPTY_LINE">
+
+</xliff:g>Your saved fingerprints will also be removed from this device and you won\'t be able to unlock your phone, authorise purchases or sign in to apps with them."</string>
+    <string name="unlock_disable_frp_warning_content_unknown" msgid="1550718040483548220">"Device protection features will not work without your screen lock."</string>
+    <string name="unlock_disable_frp_warning_content_unknown_fingerprint" msgid="3679351662094349506">"Device protection features will not work without your screen lock.<xliff:g id="EMPTY_LINE">
+
+</xliff:g>Your saved fingerprints will also be removed from this device and you won\'t be able to unlock your phone, authorise purchases or sign in to apps with them."</string>
+    <string name="unlock_disable_frp_warning_content_pattern_profile" msgid="8682200103576359918">"Profile protection features will not work without your pattern."</string>
+    <string name="unlock_disable_frp_warning_content_pattern_fingerprint_profile" msgid="6718155854303231675">"Profile protection features will not work without your pattern.<xliff:g id="EMPTY_LINE">
+
+</xliff:g>Your saved fingerprints will also be removed from this profile and you won\'t be able to unlock your profile, authorise purchases or sign in to apps with them."</string>
+    <string name="unlock_disable_frp_warning_content_pin_profile" msgid="7790688070593867767">"Profile protection features will not work without your PIN."</string>
+    <string name="unlock_disable_frp_warning_content_pin_fingerprint_profile" msgid="4209564603132870532">"Profile protection features will not work without your PIN.<xliff:g id="EMPTY_LINE">
+
+</xliff:g>Your saved fingerprints will also be removed from this profile and you won\'t be able to unlock your profile, authorise purchases or sign in to apps with them."</string>
+    <string name="unlock_disable_frp_warning_content_password_profile" msgid="7569285520567674461">"Profile protection features will not work without your password."</string>
+    <string name="unlock_disable_frp_warning_content_password_fingerprint_profile" msgid="2994300676764706047">"Profile protection features will not work without your password.<xliff:g id="EMPTY_LINE">
+
+</xliff:g>Your saved fingerprints will also be removed from this profile and you won\'t be able to unlock your profile, authorise purchases or sign in to apps with them."</string>
+    <string name="unlock_disable_frp_warning_content_unknown_profile" msgid="6984215718701688202">"Profile protection features will not work without your screen lock."</string>
+    <string name="unlock_disable_frp_warning_content_unknown_fingerprint_profile" msgid="4994062501123299418">"Profile protection features will not work without your screen lock.<xliff:g id="EMPTY_LINE">
+
+</xliff:g>Your saved fingerprints will also be removed from this profile and you won\'t be able to unlock your profile, authorise purchases or sign in to apps with them."</string>
+    <string name="unlock_disable_frp_warning_ok" msgid="7075138677177748705">"Yes, remove"</string>
+    <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_failed_attempts_before_wipe" msgid="2219711062197089783">"Try again. Attempt <xliff:g id="CURRENT_ATTEMPTS">%1$d</xliff:g> of <xliff:g id="TOTAL_ATTEMPTS">%2$d</xliff:g>."</string>
+    <string name="lock_last_attempt_before_wipe_warning_title" msgid="4277765862798876826">"Your data will be deleted"</string>
+    <string name="lock_last_pattern_attempt_before_wipe_device" msgid="1688030823464420974">"If you enter an incorrect pattern on the next attempt, this device\'s data will be deleted"</string>
+    <string name="lock_last_pin_attempt_before_wipe_device" msgid="5350785938296254352">"If you enter an incorrect PIN on the next attempt, this device\'s data will be deleted"</string>
+    <string name="lock_last_password_attempt_before_wipe_device" msgid="6208035114731421034">"If you enter an incorrect password on the next attempt, this device\'s data will be deleted"</string>
+    <string name="lock_last_pattern_attempt_before_wipe_user" msgid="7851504071368235547">"If you enter an incorrect pattern on the next attempt, this user will be deleted"</string>
+    <string name="lock_last_pin_attempt_before_wipe_user" msgid="4049024921333961715">"If you enter an incorrect PIN on the next attempt, this user will be deleted"</string>
+    <string name="lock_last_password_attempt_before_wipe_user" msgid="4660886542496781672">"If you enter an incorrect password on the next attempt, this user will be deleted"</string>
+    <string name="lock_last_pattern_attempt_before_wipe_profile" msgid="2437716252059050291">"If you enter an incorrect pattern on the next attempt, your work profile and its data will be deleted"</string>
+    <string name="lock_last_pin_attempt_before_wipe_profile" msgid="5799931839127476913">"If you enter an incorrect PIN on the next attempt, your work profile and its data will be deleted"</string>
+    <string name="lock_last_password_attempt_before_wipe_profile" msgid="6786586046975042158">"If you enter an incorrect password on the next attempt, your work profile and its data will be deleted"</string>
+    <string name="lock_failed_attempts_now_wiping_device" msgid="5047439819181833824">"Too many incorrect attempts. This device\'s data will be deleted."</string>
+    <string name="lock_failed_attempts_now_wiping_user" msgid="6188180643494518001">"Too many incorrect attempts. This user will be deleted."</string>
+    <string name="lock_failed_attempts_now_wiping_profile" msgid="1745475043685915442">"Too many incorrect attempts. This work profile and its data will be deleted."</string>
+    <string name="lock_failed_attempts_now_wiping_dialog_dismiss" msgid="8246716090548717312">"Dismiss"</string>
+    <string name="lockpassword_password_too_short" msgid="2726090378672764986">"Must be at least <xliff:g id="COUNT">%d</xliff:g> characters"</string>
+    <string name="lockpassword_pin_too_short" msgid="3638188874397727648">"PIN must be at least <xliff:g id="COUNT">%d</xliff:g> digits"</string>
+    <string name="lockpassword_continue_label" msgid="4602203784934526940">"Continue"</string>
+    <string name="lockpassword_password_too_long" msgid="4591720174765403476">"Must be fewer than <xliff:g id="NUMBER">%d</xliff:g> characters"</string>
+    <string name="lockpassword_pin_too_long" msgid="2079396149560490458">"Must be fewer than <xliff:g id="NUMBER">%d</xliff:g> digits"</string>
+    <string name="lockpassword_pin_contains_non_digits" msgid="7284664023164191198">"Must only contain digits 0-9"</string>
+    <string name="lockpassword_pin_recently_used" msgid="1401569207976460727">"Device admin doesn\'t allow using a recent PIN"</string>
+    <string name="lockpassword_illegal_character" msgid="8049611046639943217">"This can\'t include an invalid character"</string>
+    <string name="lockpassword_password_requires_alpha" msgid="3036589522150097731">"Must contain at least one letter"</string>
+    <string name="lockpassword_password_requires_digit" msgid="5140062925787058765">"Must contain at least one digit"</string>
+    <string name="lockpassword_password_requires_symbol" msgid="5944350865681510893">"Must contain at least one symbol"</string>
+    <plurals name="lockpassword_password_requires_letters" formatted="false" msgid="9013132344745898400">
+      <item quantity="other">Must contain at least <xliff:g id="COUNT">%d</xliff:g> letters</item>
+      <item quantity="one">Must contain at least 1 letter</item>
+    </plurals>
+    <plurals name="lockpassword_password_requires_lowercase" formatted="false" msgid="2626327674921055486">
+      <item quantity="other">Must contain at least <xliff:g id="COUNT">%d</xliff:g> lowercase letters</item>
+      <item quantity="one">Must contain at least 1 lowercase letter</item>
+    </plurals>
+    <plurals name="lockpassword_password_requires_uppercase" formatted="false" msgid="7860796359913920356">
+      <item quantity="other">Must contain at least <xliff:g id="COUNT">%d</xliff:g> uppercase letters</item>
+      <item quantity="one">Must contain at least 1 uppercase letter</item>
+    </plurals>
+    <plurals name="lockpassword_password_requires_numeric" formatted="false" msgid="1967587658356336828">
+      <item quantity="other">Must contain at least <xliff:g id="COUNT">%d</xliff:g> numerical digits</item>
+      <item quantity="one">Must contain at least 1 numerical digit</item>
+    </plurals>
+    <plurals name="lockpassword_password_requires_symbols" formatted="false" msgid="6751305770863640574">
+      <item quantity="other">Must contain at least <xliff:g id="COUNT">%d</xliff:g> special symbols</item>
+      <item quantity="one">Must contain at least 1 special symbol</item>
+    </plurals>
+    <plurals name="lockpassword_password_requires_nonletter" formatted="false" msgid="4440596998172043055">
+      <item quantity="other">Must contain at least <xliff:g id="COUNT">%d</xliff:g> non-letter characters</item>
+      <item quantity="one">Must contain at least 1 non-letter character</item>
+    </plurals>
+    <string name="lockpassword_password_recently_used" msgid="942665351220525547">"Device admin doesn\'t allow using a recent password"</string>
+    <string name="lockpassword_pin_no_sequential_digits" msgid="680765285206990584">"Ascending, descending or repeated sequence of digits isn\'t allowed"</string>
+    <string name="lockpassword_ok_label" msgid="313822574062553672">"OK"</string>
+    <string name="lockpassword_cancel_label" msgid="8818529276331121899">"Cancel"</string>
+    <string name="lockpassword_clear_label" msgid="5724429464960458155">"Clear"</string>
+    <string name="lockpattern_tutorial_cancel_label" msgid="6431583477570493261">"Cancel"</string>
+    <string name="lockpattern_tutorial_continue_label" msgid="3559793618653400434">"Next"</string>
+    <string name="lock_setup" msgid="3355847066343753943">"Set up is complete."</string>
+    <string name="manage_device_admin" msgid="537804979483211453">"Device admin apps"</string>
+    <string name="number_of_device_admins_none" msgid="7185056721919496069">"No active apps"</string>
+    <plurals name="number_of_device_admins" formatted="false" msgid="3361891840111523393">
+      <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> active apps</item>
+      <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> active app</item>
+    </plurals>
+    <string name="manage_trust_agents" msgid="4629279457536987768">"Trust agents"</string>
+    <string name="disabled_because_no_backup_security" msgid="6877660253409580377">"To use, first set a screen lock"</string>
+    <string name="manage_trust_agents_summary" msgid="1475819820389620546">"None"</string>
+    <plurals name="manage_trust_agents_summary_on" formatted="false" msgid="3935182396726101824">
+      <item quantity="other"><xliff:g id="COUNT">%d</xliff:g> active trust agents</item>
+      <item quantity="one">1 active trust agent</item>
+    </plurals>
+    <string name="bluetooth_quick_toggle_title" msgid="1037056952714061893">"Bluetooth"</string>
+    <string name="bluetooth_quick_toggle_summary" msgid="5293641680139873341">"Turn on 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">"Manage connections, set device name &amp; discoverability"</string>
+    <string name="bluetooth_pairing_request" msgid="2605098826364694673">"Pair with <xliff:g id="DEVICE_NAME">%1$s</xliff:g>?"</string>
+    <string name="bluetooth_pairing_key_msg" msgid="418124944140102021">"Bluetooth pairing code"</string>
+    <string name="bluetooth_enter_passkey_msg" msgid="6813273136442138444">"Type the pairing code then press Return or Enter"</string>
+    <string name="bluetooth_enable_alphanumeric_pin" msgid="7222713483058171357">"PIN contains letters or symbols"</string>
+    <string name="bluetooth_pin_values_hint" msgid="3815897557875873646">"Usually 0000 or 1234"</string>
+    <string name="bluetooth_pin_values_hint_16_digits" msgid="7849359451584101077">"Must be 16 digits"</string>
+    <string name="bluetooth_enter_pin_other_device" msgid="4637977124526813470">"You may also need to type this PIN on the other device."</string>
+    <string name="bluetooth_enter_passkey_other_device" msgid="2798719004030279602">"You may also need to type this passkey on the other device."</string>
+    <string name="bluetooth_confirm_passkey_msg" msgid="3708312912841950052">"To pair with:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;Make sure that it is showing this passkey:&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">"From:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;Pair with this device?"</string>
+    <string name="bluetooth_display_passkey_pin_msg" msgid="2796550001376088433">"To pair with:<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>Type on it:<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>, then press Return or Enter."</string>
+    <string name="bluetooth_pairing_shares_phonebook" msgid="2277931851483023208">"Allow <xliff:g id="DEVICE_NAME">%1$s</xliff:g> to access your contacts and call history"</string>
+    <string name="bluetooth_error_title" msgid="6850384073923533096"></string>
+    <string name="bluetooth_connecting_error_message" msgid="1397388344342081090">"Couldn\'t connect to <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
+    <string name="bluetooth_preference_scan_title" msgid="2277464653118896016">"Scan for devices"</string>
+    <string name="bluetooth_search_for_devices" msgid="2754007356491461674">"Refresh"</string>
+    <string name="bluetooth_searching_for_devices" msgid="9203739709307871727">"Searching…"</string>
+    <string name="bluetooth_preference_device_settings" msgid="907776049862799122">"Device settings"</string>
+    <string name="bluetooth_preference_paired_dialog_title" msgid="8875124878198774180">"Paired device"</string>
+    <string name="bluetooth_preference_paired_dialog_name_label" msgid="8111146086595617285">"Name"</string>
+    <string name="bluetooth_preference_paired_dialog_internet_option" msgid="7112953286863428412">"Internet connection"</string>
+    <string name="bluetooth_preference_paired_dialog_keyboard_option" msgid="2271954176947879628">"Keyboard"</string>
+    <string name="bluetooth_preference_paired_dialog_contacts_option" msgid="7747163316331917594">"Contacts and call history"</string>
+    <string name="bluetooth_pairing_dialog_title" msgid="1417255032435317301">"Pair with this device?"</string>
+    <string name="bluetooth_pairing_dialog_sharing_phonebook_title" msgid="7664141669886358618">"Share phone book?"</string>
+    <string name="bluetooth_pairing_dialog_contants_request" msgid="5531109163573611348">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> wants to access your contacts and call history."</string>
+    <string name="bluetooth_pairing_dialog_paring_request" msgid="8451248193517851958">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> wants to pair with Bluetooth. When connected, it will have access to your contacts and call history."</string>
+    <string name="bluetooth_preference_paired_devices" msgid="1970524193086791964">"Paired devices"</string>
+    <string name="bluetooth_preference_found_devices" msgid="1647983835063249680">"Available devices"</string>
+    <string name="bluetooth_preference_no_found_devices" msgid="7594339669961811591">"No devices available"</string>
+    <string name="bluetooth_device_context_connect" msgid="3997659895003244941">"Connect"</string>
+    <string name="bluetooth_device_context_disconnect" msgid="8220072022970148683">"Disconnect"</string>
+    <string name="bluetooth_device_context_pair_connect" msgid="7611522504813927727">"Pair &amp; connect"</string>
+    <string name="bluetooth_device_context_unpair" msgid="662992425948536144">"Unpair"</string>
+    <string name="bluetooth_device_context_disconnect_unpair" msgid="7644014238070043798">"Disconnect &amp; unpair"</string>
+    <string name="bluetooth_device_context_connect_advanced" msgid="2643129703569788771">"Options…"</string>
+    <string name="bluetooth_menu_advanced" msgid="8572178316357220524">"Advanced"</string>
+    <string name="bluetooth_advanced_titlebar" msgid="2142159726881547669">"Advanced Bluetooth"</string>
+    <string name="bluetooth_empty_list_bluetooth_off" msgid="6351930724051893423">"When Bluetooth is turned on, your device can communicate with other nearby Bluetooth devices."</string>
+    <string name="ble_scan_notify_text" msgid="1295915006005700650">"To improve location accuracy, system apps and services can still detect Bluetooth devices. You can change this in <xliff:g id="LINK_BEGIN_0">LINK_BEGIN</xliff:g>scanning settings<xliff:g id="LINK_END_1">LINK_END</xliff:g>."</string>
+    <string name="bluetooth_connect_failed" msgid="4500234659813241053">"Couldn\'t connect. Try again."</string>
+    <string name="device_details_title" msgid="6576953269221085300">"Device details"</string>
+    <string name="bluetooth_device_mac_address" msgid="2513724313558236181">"Device\'s Bluetooth address: <xliff:g id="ADDRESS">%1$s</xliff:g>"</string>
+    <string name="bluetooth_unpair_dialog_title" msgid="38467834196432400">"Forget device?"</string>
+    <string name="bluetooth_unpair_dialog_body" product="default" msgid="9087609557757135712">"Your phone will no longer be paired with <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
+    <string name="bluetooth_unpair_dialog_body" product="tablet" msgid="7785695793007576501">"Your tablet will no longer be paired with <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
+    <string name="bluetooth_unpair_dialog_body" product="device" msgid="251257782642157557">"Your device will no longer be paired with <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
+    <string name="bluetooth_unpair_dialog_forget_confirm_button" msgid="3829370108973879006">"Forget device"</string>
+    <string name="bluetooth_connect_specific_profiles_title" msgid="6952214406025825164">"Connect to…"</string>
+    <string name="bluetooth_disconnect_a2dp_profile" msgid="3524648279150937177">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> will be disconnected from media audio."</string>
+    <string name="bluetooth_disconnect_headset_profile" msgid="8635908811168780720">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> will be disconnected from hands-free audio."</string>
+    <string name="bluetooth_disconnect_hid_profile" msgid="3282295189719352075">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> will be disconnected from input device."</string>
+    <string name="bluetooth_disconnect_pan_user_profile" msgid="8037627994382458698">"Internet access via <xliff:g id="DEVICE_NAME">%1$s</xliff:g> will be disconnected."</string>
+    <string name="bluetooth_disconnect_pan_nap_profile" product="tablet" msgid="1262792320446274407">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> will be disconnected from sharing this tablet\'s Internet connection."</string>
+    <string name="bluetooth_disconnect_pan_nap_profile" product="default" msgid="5700332050175684571">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> will be disconnected from sharing this phone\'s Internet connection."</string>
+    <string name="bluetooth_device_advanced_title" msgid="6066342531927499308">"Paired Bluetooth device"</string>
+    <string name="bluetooth_device_advanced_online_mode_title" msgid="3689050071425683114">"Connect"</string>
+    <string name="bluetooth_device_advanced_online_mode_summary" msgid="1204424107263248336">"Connect to Bluetooth device"</string>
+    <string name="bluetooth_device_advanced_profile_header_title" msgid="102745381968579605">"Use for"</string>
+    <string name="bluetooth_device_advanced_rename_device" msgid="5148578059584955791">"Rename"</string>
+    <string name="bluetooth_device_advanced_enable_opp_title" msgid="8222550640371627365">"Allow incoming file transfers"</string>
+    <string name="bluetooth_pan_user_profile_summary_connected" msgid="4602294638909590612">"Connected to device for Internet access"</string>
+    <string name="bluetooth_pan_nap_profile_summary_connected" msgid="1561383706411975199">"Sharing local Internet connection with device"</string>
+    <string name="bluetooth_dock_settings" msgid="3218335822716052885">"Dock Settings"</string>
+    <string name="bluetooth_dock_settings_title" msgid="5543069893044375188">"Use dock for audio"</string>
+    <string name="bluetooth_dock_settings_headset" msgid="1001821426078644650">"As speaker phone"</string>
+    <string name="bluetooth_dock_settings_a2dp" msgid="8791004998846630574">"For music and media"</string>
+    <string name="bluetooth_dock_settings_remember" msgid="5551459057010609115">"Remember settings"</string>
+    <string name="wifi_display_settings_title" msgid="8740852850033480136">"Cast"</string>
+    <string name="wifi_display_enable_menu_item" msgid="4883036464138167674">"Enable wireless display"</string>
+    <string name="wifi_display_no_devices_found" msgid="1382012407154143453">"No nearby devices were found."</string>
+    <string name="wifi_display_status_connecting" msgid="5688608834000748607">"Connecting"</string>
+    <string name="wifi_display_status_connected" msgid="8364125226376985558">"Connected"</string>
+    <string name="wifi_display_status_in_use" msgid="8556830875615434792">"In use"</string>
+    <string name="wifi_display_status_not_available" msgid="5714978725794210102">"Unavailable"</string>
+    <string name="wifi_display_details" msgid="7791118209992162698">"Display settings"</string>
+    <string name="wifi_display_options_title" msgid="5740656401635054838">"Wireless display options"</string>
+    <string name="wifi_display_options_forget" msgid="9119048225398894580">"Forget"</string>
+    <string name="wifi_display_options_done" msgid="5703116500357822557">"Done"</string>
+    <string name="wifi_display_options_name" msgid="4756080222307467898">"Name"</string>
+    <string name="wifi_band_24ghz" msgid="852929254171856911">"2.4 GHz"</string>
+    <string name="wifi_band_5ghz" msgid="6433822023268515117">"5 GHz"</string>
+    <string name="link_speed" msgid="8896664974117585555">"%1$d Mbps"</string>
+    <string name="wifi_ask_enable" msgid="2795469717302060104">"<xliff:g id="REQUESTER">%s</xliff:g> wants to turn on Wi-Fi"</string>
+    <string name="wifi_ask_disable" msgid="728366570145493573">"<xliff:g id="REQUESTER">%s</xliff:g> wants to turn off Wi-Fi"</string>
+    <string name="nfc_quick_toggle_title" msgid="6769159366307299004">"NFC"</string>
+    <string name="nfc_quick_toggle_summary" product="tablet" msgid="8302974395787498915">"Allow data exchange when the tablet touches another device"</string>
+    <string name="nfc_quick_toggle_summary" product="default" msgid="5237208142892767592">"Allow data exchange when the phone touches another device"</string>
+    <string name="nfc_disclaimer_title" msgid="4364003873202264039">"Turn on NFC"</string>
+    <string name="nfc_disclaimer_content" msgid="5566907911915158075">"NFC exchanges data between this device and other nearby devices or targets, such as payment terminals, access readers and interactive ads or tags."</string>
+    <string name="android_beam_settings_title" msgid="7832812974600338649">"Android Beam"</string>
+    <string name="android_beam_on_summary" msgid="3618057099355636830">"Ready to transmit app content via NFC"</string>
+    <string name="android_beam_off_summary" msgid="4663095428454779138">"Off"</string>
+    <string name="android_beam_disabled_summary" msgid="1737782116894793393">"Unavailable because NFC is turned off"</string>
+    <string name="android_beam_label" msgid="6257036050366775040">"Android Beam"</string>
+    <string name="android_beam_explained" msgid="1810540319385192758">"When this feature is turned on, you can beam app content to another NFC-capable device by holding the devices close together. For example, you can beam web pages, YouTube videos, contacts and more.\n\nJust bring the devices together (typically back to back) and then tap your screen. The app determines what gets beamed."</string>
+    <string name="wifi_quick_toggle_title" msgid="8850161330437693895">"Wi‑Fi"</string>
+    <string name="wifi_quick_toggle_summary" msgid="2696547080481267642">"Turn on Wi‑Fi"</string>
+    <string name="wifi_settings" msgid="29722149822540994">"Wi‑Fi"</string>
+    <string name="wifi_settings_category" msgid="8719175790520448014">"Wi‑Fi settings"</string>
+    <string name="wifi_settings_title" msgid="3103415012485692233">"Wi‑Fi"</string>
+    <string name="wifi_settings_summary" msgid="668767638556052820">"Set up &amp; manage wireless access points"</string>
+    <string name="wifi_select_network" msgid="4210954938345463209">"Select Wi‑Fi"</string>
+    <string name="wifi_starting" msgid="6732377932749942954">"Turning Wi‑Fi on…"</string>
+    <string name="wifi_stopping" msgid="8952524572499500804">"Turning off Wi‑Fi…"</string>
+    <string name="wifi_error" msgid="3207971103917128179">"Error"</string>
+    <string name="wifi_sap_no_channel_error" msgid="3108445199311817111">"5 GHz band not available in this country"</string>
+    <string name="wifi_in_airplane_mode" msgid="8652520421778203796">"In aeroplane mode"</string>
+    <string name="wifi_notify_open_networks" msgid="76298880708051981">"Open network notification"</string>
+    <string name="wifi_notify_open_networks_summary" msgid="2761326999921366960">"Notify when a high‑quality public network is available"</string>
+    <string name="wifi_wakeup" msgid="8815640989361538036">"Turn on Wi‑Fi automatically"</string>
+    <string name="wifi_wakeup_summary" msgid="2530814331062997163">"Wi‑Fi will turn back on near high‑quality saved networks, like your home network"</string>
+    <string name="wifi_wakeup_summary_scanning_disabled" msgid="7247227922074840445">"Unavailable because Wi‑Fi scanning is turned off"</string>
+    <string name="wifi_wakeup_summary_scoring_disabled" msgid="108339002136866897">"To use, select a network rating provider"</string>
+    <string name="wifi_poor_network_detection" msgid="4925789238170207169">"Avoid poor connections"</string>
+    <string name="wifi_poor_network_detection_summary" msgid="2784135142239546291">"Don\'t use a Wi‑Fi network unless it has a good Internet connection"</string>
+    <string name="wifi_avoid_poor_network_detection_summary" msgid="4674423884870027498">"Only use networks that have a good Internet connection"</string>
+    <string name="use_open_wifi_automatically_title" msgid="6851951242903078588">"Connect to open networks"</string>
+    <string name="use_open_wifi_automatically_summary" msgid="2982091714252931713">"Automatically connect to high‑quality public networks"</string>
+    <string name="use_open_wifi_automatically_summary_scoring_disabled" msgid="593964217679325831">"To use, select a network rating provider"</string>
+    <string name="use_open_wifi_automatically_summary_scorer_unsupported_disabled" msgid="8472122600853650258">"To use, select a compatible network rating provider"</string>
+    <string name="wifi_install_credentials" msgid="3551143317298272860">"Install certificates"</string>
+    <string name="wifi_scan_notify_text" msgid="5593805423071186757">"To improve location accuracy, system apps and services can still scan for Wi‑Fi networks. You can change this in <xliff:g id="LINK_BEGIN_0">LINK_BEGIN</xliff:g>scanning settings<xliff:g id="LINK_END_1">LINK_END</xliff:g>."</string>
+    <string name="wifi_scan_notify_text_scanning_off" msgid="3426075479272242098">"To improve location accuracy, turn on Wi-Fi scanning in <xliff:g id="LINK_BEGIN_0">LINK_BEGIN</xliff:g>scanning settings<xliff:g id="LINK_END_1">LINK_END</xliff:g>."</string>
+    <string name="wifi_scan_notify_remember_choice" msgid="7104867814641144485">"Don\'t show again"</string>
+    <string name="wifi_setting_sleep_policy_title" msgid="5149574280392680092">"Keep Wi‑Fi on during sleep"</string>
+    <string name="wifi_setting_on_during_sleep_title" msgid="8308975500029751565">"Wi‑Fi on during sleep"</string>
+    <string name="wifi_setting_sleep_policy_error" msgid="8174902072673071961">"There was a problem while changing the setting"</string>
+    <string name="wifi_suspend_efficiency_title" msgid="2338325886934703895">"Improve efficiency"</string>
+    <string name="wifi_suspend_optimizations" msgid="1220174276403689487">"Wi‑Fi optimisation"</string>
+    <string name="wifi_suspend_optimizations_summary" msgid="4151428966089116856">"Minimise battery usage when Wi‑Fi is on"</string>
+    <string name="wifi_limit_optimizations_summary" msgid="9000801068363468950">"Limit battery used by Wi‑Fi"</string>
+    <string name="wifi_switch_away_when_unvalidated" msgid="1707247692180853058">"Switch to mobile data if Wi‑Fi loses Internet access."</string>
+    <string name="wifi_cellular_data_fallback_title" msgid="8753386877755616476">"Switch to mobile data automatically"</string>
+    <string name="wifi_cellular_data_fallback_summary" msgid="6375399280719867214">"Use mobile data when Wi‑Fi has no Internet access. Data usage may apply."</string>
+    <string name="wifi_add_network" msgid="6234851776910938957">"Add network"</string>
+    <string name="wifi_configure_settings_preference_title" msgid="2913345003906899146">"Wi‑Fi preferences"</string>
+    <string name="wifi_configure_settings_preference_summary_wakeup_on" msgid="646393113104367290">"Wi‑Fi turns back on automatically"</string>
+    <string name="wifi_configure_settings_preference_summary_wakeup_off" msgid="2782566279864356713">"Wi‑Fi doesn\'t turn back on automatically"</string>
+    <string name="wifi_access_points" msgid="7053990007031968609">"Wi‑Fi networks"</string>
+    <string name="wifi_menu_wps_pbc" msgid="2668564692207863017">"WPS Push Button"</string>
+    <string name="wifi_menu_more_options" msgid="2448097861752719396">"More options"</string>
+    <string name="wifi_menu_wps_pin" msgid="6426448256268695933">"WPS Pin Entry"</string>
+    <string name="wifi_menu_p2p" msgid="7619851399250896797">"Wi‑Fi Direct"</string>
+    <string name="wifi_menu_scan" msgid="1470911530412095868">"Scan"</string>
+    <string name="wifi_menu_advanced" msgid="7522252991919573664">"Advanced"</string>
+    <string name="wifi_menu_configure" msgid="6150926852602171938">"Configure"</string>
+    <string name="wifi_menu_connect" msgid="4996220309848349408">"Connect to network"</string>
+    <string name="wifi_menu_remember" msgid="8814185749388713796">"Remember network"</string>
+    <string name="wifi_menu_forget" msgid="8736964302477327114">"Forget network"</string>
+    <string name="wifi_menu_modify" msgid="2068554918652440105">"Modify network"</string>
+    <string name="wifi_menu_write_to_nfc" msgid="7692881642188240324">"Write to NFC tag"</string>
+    <string name="wifi_empty_list_wifi_off" msgid="8056223875951079463">"To see available networks, turn Wi‑Fi on."</string>
+    <string name="wifi_empty_list_wifi_on" msgid="8746108031587976356">"Searching for Wi‑Fi networks…"</string>
+    <string name="wifi_empty_list_user_restricted" msgid="7322372065475939129">"You don\'t have permission to change the Wi‑Fi network."</string>
+    <string name="wifi_more" msgid="3195296805089107950">"More"</string>
+    <string name="wifi_setup_wps" msgid="8128702488486283957">"Automatic setup (WPS)"</string>
+    <string name="wifi_show_advanced" msgid="3409422789616520979">"Advanced options"</string>
+    <string name="wifi_advanced_toggle_description_expanded" msgid="2380600578544493084">"Drop down list Advanced Options. Double-tap to collapse."</string>
+    <string name="wifi_advanced_toggle_description_collapsed" msgid="1463812308429197263">"Drop down list Advanced Options. Double-tap to expand."</string>
+    <string name="wifi_wps_setup_title" msgid="8207552222481570175">"Wi‑Fi Protected Setup"</string>
+    <string name="wifi_wps_setup_msg" msgid="315174329121275092">"Starting WPS…"</string>
+    <string name="wifi_wps_onstart_pbc" msgid="817003360936932340">"Press the Wi‑Fi Protected Setup button on your router. It may be called \"WPS\" or marked with this symbol:"</string>
+    <string name="wifi_wps_onstart_pin" msgid="223344506445335358">"Enter pin <xliff:g id="NUMBER">%1$s</xliff:g> on your Wi‑Fi router. The setup can take up to two minutes to complete."</string>
+    <string name="wifi_wps_complete" msgid="2388138550456729134">"WPS succeeded. Connecting to the network…"</string>
+    <string name="wifi_wps_connected" msgid="7153432445748931183">"Connected to Wi‑Fi network <xliff:g id="NETWORK_NAME">%s</xliff:g>"</string>
+    <string name="wifi_wps_in_progress" msgid="3372311348221357944">"WPS is already in progress and can take up to two minutes to complete"</string>
+    <string name="wifi_wps_failed_generic" msgid="5668775022238832527">"Request failed. Please try again in a few minutes."</string>
+    <string name="wifi_wps_failed_wep" msgid="2702820087105284461">"The wireless router security setting (WEP) is not supported"</string>
+    <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>
+    <string name="wifi_signal" msgid="5514120261628065287">"Signal strength"</string>
+    <string name="wifi_status" msgid="4824568012414605414">"Status"</string>
+    <string name="wifi_speed" msgid="3526198708812322037">"Link speed"</string>
+    <string name="wifi_frequency" msgid="7791090119577812214">"Frequency"</string>
+    <string name="wifi_ip_address" msgid="1440054061044402918">"IP address"</string>
+    <string name="passpoint_label" msgid="6381371313076009926">"Saved via"</string>
+    <string name="passpoint_content" msgid="8447207162397870483">"<xliff:g id="NAME">%1$s</xliff:g> credentials"</string>
+    <string name="wifi_eap_method" msgid="8529436133640730382">"EAP method"</string>
+    <string name="please_select_phase2" msgid="5231074529772044898">"Phase-2 authentication"</string>
+    <string name="wifi_eap_ca_cert" msgid="3521574865488892851">"CA certificate"</string>
+    <string name="wifi_eap_domain" msgid="8471124344218082064">"Domain"</string>
+    <string name="wifi_eap_user_cert" msgid="1291089413368160789">"User certificate"</string>
+    <string name="wifi_eap_identity" msgid="4359453783379679103">"Identity"</string>
+    <string name="wifi_eap_anonymous" msgid="2989469344116577955">"Anonymous identity"</string>
+    <string name="wifi_password" msgid="5948219759936151048">"Password"</string>
+    <string name="wifi_show_password" msgid="6461249871236968884">"Show password"</string>
+    <string name="wifi_ap_band_config" msgid="1611826705989117930">"Select AP band"</string>
+    <string name="wifi_ap_choose_2G" msgid="8724267386885036210">"2.4 GHz band"</string>
+    <string name="wifi_ap_choose_5G" msgid="8137061170937978040">"5 GHz band"</string>
+    <string name="wifi_ip_settings" msgid="3359331401377059481">"IP settings"</string>
+    <string name="wifi_shared" msgid="844142443226926070">"Share with other device users"</string>
+    <string name="wifi_unchanged" msgid="3410422020930397102">"(unchanged)"</string>
+    <string name="wifi_unspecified" msgid="4917316464723064807">"Please select"</string>
+    <string name="wifi_multiple_cert_added" msgid="3240743501460165224">"(Multiple certificates added)"</string>
+    <string name="wifi_use_system_certs" msgid="5270879895056893783">"Use system certificates"</string>
+    <string name="wifi_do_not_provide_eap_user_cert" msgid="5160499244977160665">"Do not provide"</string>
+    <string name="wifi_do_not_validate_eap_server" msgid="4266754430576348471">"Do not validate"</string>
+    <string name="wifi_do_not_validate_eap_server_warning" msgid="1787190245542586660">"No certificate specified. Your connection will not be private."</string>
+    <string name="wifi_ssid_too_long" msgid="3474753269579895244">"Network name is too long."</string>
+    <string name="wifi_no_domain_warning" msgid="5223011964091727376">"Must specify a domain."</string>
+    <string name="wifi_wps_available_first_item" msgid="4422547079984583502">"WPS available"</string>
+    <string name="wifi_wps_available_second_item" msgid="8427520131718215301">" (WPS available)"</string>
+    <string name="wifi_wps_nfc_enter_password" msgid="2288214226916117159">"Enter your network password"</string>
+    <string name="wifi_carrier_connect" msgid="8174696557882299911">"Operator Wi‑Fi network"</string>
+    <string name="wifi_carrier_content" msgid="4634077285415851933">"Connect via <xliff:g id="NAME">%1%s</xliff:g>"</string>
+    <string name="wifi_scan_always_turnon_message" msgid="203123538572122989">"To improve location accuracy and for other purposes, <xliff:g id="APP_NAME">%1$s</xliff:g> wants to turn on network scanning, even when Wi-Fi is off.\n\nAllow this for all apps that want to scan?"</string>
+    <string name="wifi_scan_always_turnoff_message" msgid="5538901671131941043">"To turn this off, go to Advanced in the overflow menu."</string>
+    <string name="wifi_scan_always_confirm_allow" msgid="5355973075896817232">"Allow"</string>
+    <string name="wifi_scan_always_confirm_deny" msgid="4463982053823520710">"Deny"</string>
+    <string name="wifi_hotspot_title" msgid="7726205804813286950">"Sign in to connect?"</string>
+    <string name="wifi_hotspot_message" msgid="3673833421453455747">"<xliff:g id="APP_NAME">%1$s</xliff:g> requires you to sign in online before you connect to the network."</string>
+    <string name="wifi_hotspot_connect" msgid="5065506390164939225">"CONNECT"</string>
+    <string name="no_internet_access_text" msgid="7133561752896706392">"This network has no Internet access. Stay connected?"</string>
+    <string name="no_internet_access_remember" msgid="4697314331614625075">"Don\'t ask again for this network"</string>
+    <string name="lost_internet_access_title" msgid="6228530645663584505">"Wi‑Fi is not connected to the Internet"</string>
+    <string name="lost_internet_access_text" msgid="9029649339816197345">"You can switch to the mobile network whenever Wi‑Fi has a bad connection. Data usage charges may apply."</string>
+    <string name="lost_internet_access_switch" msgid="2262459569601190039">"Switch to mobile"</string>
+    <string name="lost_internet_access_cancel" msgid="338273139419871110">"Stay on Wi‑Fi"</string>
+    <string name="lost_internet_access_persist" msgid="7634876061262676255">"Never show again"</string>
+    <string name="wifi_connect" msgid="1076622875777072845">"Connect"</string>
+    <string name="wifi_failed_connect_message" msgid="8491902558970292871">"Failed to connect to network"</string>
+    <string name="wifi_forget" msgid="8168174695608386644">"Forget"</string>
+    <string name="wifi_modify" msgid="6100248070440710782">"Modify"</string>
+    <string name="wifi_failed_forget_message" msgid="1348172929201654986">"Failed to forget network"</string>
+    <string name="wifi_save" msgid="3331121567988522826">"Save"</string>
+    <string name="wifi_failed_save_message" msgid="6650004874143815692">"Failed to save network"</string>
+    <string name="wifi_cancel" msgid="6763568902542968964">"Cancel"</string>
+    <string name="wifi_saved_access_points_titlebar" msgid="2996149477240134064">"Saved networks"</string>
+    <plurals name="wifi_saved_access_points_summary" formatted="false" msgid="6094679048871529675">
+      <item quantity="other">%d networks</item>
+      <item quantity="one">1 network</item>
+    </plurals>
+    <string name="wifi_advanced_titlebar" msgid="4485841401774142908">"Advanced 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_title" msgid="3471132676909349382">"Network info"</string>
+    <string name="wifi_details_subnet_mask" msgid="6720279144174924410">"Subnet mask"</string>
+    <string name="wifi_details_dns" msgid="8648826607751830768">"DNS"</string>
+    <string name="wifi_details_ipv6_address_header" msgid="6734119149106422148">"IPv6 addresses"</string>
+    <string name="wifi_saved_access_points_label" msgid="2013409399392285262">"Saved networks"</string>
+    <string name="wifi_advanced_settings_label" msgid="3654366894867838338">"IP settings"</string>
+    <string name="wifi_advanced_not_available" msgid="5823045095444154586">"Wi‑Fi advanced settings are not available for this user"</string>
+    <string name="wifi_ip_settings_menu_save" msgid="7296724066102908366">"Save"</string>
+    <string name="wifi_ip_settings_menu_cancel" msgid="6582567330136502340">"Cancel"</string>
+    <string name="wifi_ip_settings_invalid_ip_address" msgid="2513142355364274970">"Please type a valid IP address."</string>
+    <string name="wifi_ip_settings_invalid_gateway" msgid="8164264988361096450">"Please type a valid gateway address."</string>
+    <string name="wifi_ip_settings_invalid_dns" msgid="8744583948328391047">"Type a valid DNS address."</string>
+    <string name="wifi_ip_settings_invalid_network_prefix_length" msgid="40470058023181052">"Type a network prefix length between 0 and 32."</string>
+    <string name="wifi_dns1" msgid="7344118050720080045">"DNS 1"</string>
+    <string name="wifi_dns2" msgid="1368601006824882659">"DNS 2"</string>
+    <string name="wifi_gateway" msgid="163914742461092086">"Gateway"</string>
+    <string name="wifi_network_prefix_length" msgid="3028785234245085998">"Network prefix length"</string>
+    <string name="wifi_p2p_settings_title" msgid="5444461191435291082">"Wi‑Fi Direct"</string>
+    <string name="wifi_p2p_device_info" msgid="3191876744469364173">"Device information"</string>
+    <string name="wifi_p2p_persist_network" msgid="1646424791818168590">"Remember this connection"</string>
+    <string name="wifi_p2p_menu_search" msgid="3436429984738771974">"Search for devices"</string>
+    <string name="wifi_p2p_menu_searching" msgid="2396704492143633876">"Searching…"</string>
+    <string name="wifi_p2p_menu_rename" msgid="8448896306960060415">"Rename device"</string>
+    <string name="wifi_p2p_peer_devices" msgid="299526878463303432">"Peer devices"</string>
+    <string name="wifi_p2p_remembered_groups" msgid="3847022927914068230">"Remembered groups"</string>
+    <string name="wifi_p2p_failed_connect_message" msgid="8491862096448192157">"Could not connect."</string>
+    <string name="wifi_p2p_failed_rename_message" msgid="2562182284946936380">"Failed to rename device."</string>
+    <string name="wifi_p2p_disconnect_title" msgid="3216846049677448420">"Disconnect?"</string>
+    <string name="wifi_p2p_disconnect_message" msgid="8227342771610125771">"If you disconnect, your connection with <xliff:g id="PEER_NAME">%1$s</xliff:g> will end."</string>
+    <string name="wifi_p2p_disconnect_multiple_message" msgid="3283805371034883105">"If you disconnect, your connection with <xliff:g id="PEER_NAME">%1$s</xliff:g> and <xliff:g id="PEER_COUNT">%2$s</xliff:g> other devices will end."</string>
+    <string name="wifi_p2p_cancel_connect_title" msgid="255267538099324413">"Cancel invitation"</string>
+    <string name="wifi_p2p_cancel_connect_message" msgid="7477756213423749402">"Do you want to cancel invitation to connect with <xliff:g id="PEER_NAME">%1$s</xliff:g>?"</string>
+    <string name="wifi_p2p_delete_group_message" msgid="834559380069647086">"Forget this group?"</string>
+    <string name="wifi_hotspot_checkbox_text" msgid="7763495093333664887">"Wi‑Fi hotspot"</string>
+    <string name="wifi_hotspot_off_subtext" msgid="5466126533609394170">"Not sharing Internet or content with other devices"</string>
+    <string name="wifi_hotspot_tethering_on_subtext" product="tablet" msgid="5752490509369962007">"Sharing this tablet’s Internet connection via hotspot"</string>
+    <string name="wifi_hotspot_tethering_on_subtext" product="default" msgid="6461075246164300670">"Sharing this phone’s Internet connection via hotspot"</string>
+    <string name="wifi_hotspot_on_local_only_subtext" msgid="2068110388011294735">"App is sharing content. To share Internet connection, turn hotspot off, then on"</string>
+    <string name="wifi_hotspot_name_title" msgid="8237000746618636778">"Hotspot name"</string>
+    <string name="wifi_hotspot_name_summary_connecting" msgid="3378299995508671967">"Turning on <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>..."</string>
+    <string name="wifi_hotspot_name_summary_connected" msgid="3888672084861445362">"Other devices can connect to <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>"</string>
+    <string name="wifi_hotspot_password_title" msgid="8676859981917573801">"Hotspot password"</string>
+    <string name="wifi_hotspot_ap_band_title" msgid="1165801173359290681">"AP band"</string>
+    <string name="wifi_hotspot_footer_info_regular" msgid="1203489406068036455">"Use hotspot to create a Wi‑Fi network for your other devices. Hotspot provides Internet using your mobile data connection. Additional mobile data charges may apply."</string>
+    <string name="wifi_hotspot_footer_info_local_only" msgid="857988412470694109">"Apps can create a hotspot to share content with nearby devices."</string>
+    <string name="wifi_tether_starting" msgid="1322237938998639724">"Turning hotspot on…"</string>
+    <string name="wifi_tether_stopping" msgid="4835852171686388107">"Turning off hotspot…"</string>
+    <string name="wifi_tether_enabled_subtext" msgid="7842111748046063857">"<xliff:g id="NETWORK_SSID">%1$s</xliff:g> is active"</string>
+    <string name="wifi_tether_failed_subtext" msgid="1484941858530919002">"Portable Wi‑Fi hotspot error"</string>
+    <string name="wifi_tether_configure_ap_text" msgid="7974681394041609308">"Set up Wi‑Fi hotspot"</string>
+    <string name="wifi_hotspot_configure_ap_text" msgid="5478614731464220432">"Wi‑Fi hotspot setup"</string>
+    <string name="wifi_hotspot_configure_ap_text_summary" msgid="5560680057727007011">"AndroidAP WPA2 PSK hotspot"</string>
+    <string name="wifi_tether_configure_ssid_default" msgid="8467525402622138547">"Android Hotspot"</string>
+    <string name="wifi_calling_settings_title" msgid="4102921303993404577">"Wi-Fi Calling"</string>
+    <string name="wifi_calling_suggestion_title" msgid="9008010480466359578">"Turn on Wi-Fi Calling"</string>
+    <string name="wifi_calling_suggestion_summary" msgid="3765923249566552233">"Use Wi-Fi instead of mobile network"</string>
+    <string name="wifi_calling_mode_title" msgid="2164073796253284289">"Calling preference"</string>
+    <string name="wifi_calling_mode_dialog_title" msgid="8149690312199253909">"Wi-Fi Calling mode"</string>
+    <string name="wifi_calling_roaming_mode_title" msgid="1565039047187685115">"Roaming preference"</string>
+    <!-- no translation found for wifi_calling_roaming_mode_summary (8642014873060687717) -->
+    <skip />
+    <string name="wifi_calling_roaming_mode_dialog_title" msgid="7800926602662078576">"Roaming preference"</string>
+  <string-array name="wifi_calling_mode_choices">
+    <item msgid="2124257075906188844">"Wi-Fi preferred"</item>
+    <item msgid="1335127656328817518">"Mobile preferred"</item>
+    <item msgid="3132912693346866895">"Wi-Fi only"</item>
+  </string-array>
+  <string-array name="wifi_calling_mode_choices_v2">
+    <item msgid="742988808283756263">"Wi-Fi"</item>
+    <item msgid="7715869266611010880">"Mobile"</item>
+    <item msgid="2838022395783120596">"Wi-Fi only"</item>
+  </string-array>
+  <string-array name="wifi_calling_mode_values">
+    <item msgid="4799585830102342375">"2"</item>
+    <item msgid="1171822231056612021">"1"</item>
+    <item msgid="3194458950573886239">"0"</item>
+  </string-array>
+  <string-array name="wifi_calling_mode_choices_without_wifi_only">
+    <item msgid="5782108782860004851">"Wi-Fi preferred"</item>
+    <item msgid="5074515506087318555">"Mobile preferred"</item>
+  </string-array>
+  <string-array name="wifi_calling_mode_choices_v2_without_wifi_only">
+    <item msgid="6132150507201243768">"Wi-Fi"</item>
+    <item msgid="1118703915148755405">"Mobile"</item>
+  </string-array>
+  <string-array name="wifi_calling_mode_values_without_wifi_only">
+    <item msgid="2339246858001475047">"2"</item>
+    <item msgid="6200207341126893791">"1"</item>
+  </string-array>
+    <string name="wifi_calling_off_explanation" msgid="2597566001655908391">"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="3266760199681945746">"Address used by emergency services as your location if you make an emergency call using Wi‑Fi"</string>
+    <string name="display_settings_title" msgid="1708697328627382561">"Display"</string>
+    <string name="sound_settings" msgid="5534671337768745343">"Sound"</string>
+    <string name="all_volume_title" msgid="4296957391257836961">"Volumes"</string>
+    <string name="musicfx_title" msgid="3415566786340790345">"Music effects"</string>
+    <string name="ring_volume_title" msgid="5592466070832128777">"Ring volume"</string>
+    <string name="vibrate_in_silent_title" msgid="3897968069156767036">"Vibrate when silent"</string>
+    <string name="notification_sound_title" msgid="5137483249425507572">"Default notification sound"</string>
+    <string name="incoming_call_volume_title" msgid="8073714801365904099">"Ringtone"</string>
+    <string name="notification_volume_title" msgid="2012640760341080408">"Notification"</string>
+    <string name="checkbox_notification_same_as_incoming_call" msgid="1073644356290338921">"Use incoming call volume for notifications"</string>
+    <string name="home_work_profile_not_supported" msgid="1357721012342357037">"Doesn\'t support work profiles"</string>
+    <string name="notification_sound_dialog_title" msgid="3805140135741385667">"Default notification sound"</string>
+    <string name="media_volume_title" msgid="3576565767317118106">"Media"</string>
+    <string name="media_volume_summary" msgid="5363248930648849974">"Set volume for music and videos"</string>
+    <string name="alarm_volume_title" msgid="2285597478377758706">"Alarm"</string>
+    <string name="dock_settings_summary" msgid="455802113668982481">"Audio settings for the attached dock"</string>
+    <string name="dtmf_tone_enable_title" msgid="8533399267725365088">"Dial-pad touch tones"</string>
+    <string name="sound_effects_enable_title" msgid="4429690369187229592">"Tap sounds"</string>
+    <string name="lock_sounds_enable_title" msgid="450098505659399520">"Screen lock sounds"</string>
+    <string name="haptic_feedback_enable_title" msgid="7152163068278526530">"Vibrate on tap"</string>
+    <string name="audio_record_proc_title" msgid="4271091199976457534">"Noise cancellation"</string>
+    <string name="volume_media_description" msgid="7949355934788807863">"Music, video, games &amp; other media"</string>
+    <string name="volume_ring_description" msgid="5936851631698298989">"Ringtone &amp; notifications"</string>
+    <string name="volume_notification_description" msgid="5810902320215328321">"Notifications"</string>
+    <string name="volume_alarm_description" msgid="8322615148532654841">"Alarms"</string>
+    <string name="volume_ring_mute" msgid="3018992671608737202">"Mute ringtone &amp; notifications"</string>
+    <string name="volume_media_mute" msgid="3399059928695998166">"Mute music &amp; other media"</string>
+    <string name="volume_notification_mute" msgid="7955193480006444159">"Mute notifications"</string>
+    <string name="volume_alarm_mute" msgid="4452239420351035936">"Mute alarms"</string>
+    <string name="dock_settings" msgid="1820107306693002541">"Dock"</string>
+    <string name="dock_settings_title" msgid="9161438664257429372">"Dock settings"</string>
+    <string name="dock_audio_settings_title" msgid="3324750259959570305">"Audio"</string>
+    <string name="dock_audio_summary_desk" msgid="6487784412371139335">"Settings for the attached desktop dock"</string>
+    <string name="dock_audio_summary_car" msgid="6740897586006248450">"Settings for the attached car dock"</string>
+    <string name="dock_audio_summary_none" product="tablet" msgid="8215337394914283607">"Tablet not docked"</string>
+    <string name="dock_audio_summary_none" product="default" msgid="289909253741048784">"Phone not docked"</string>
+    <string name="dock_audio_summary_unknown" msgid="4465059868974255693">"Settings for the attached dock"</string>
+    <string name="dock_not_found_title" msgid="3290961741828952424">"Dock not found"</string>
+    <string name="dock_not_found_text" product="tablet" msgid="8405432495282299143">"You need to dock the tablet before setting up dock audio."</string>
+    <string name="dock_not_found_text" product="default" msgid="1460497923342627801">"You need to dock the phone before setting up dock audio."</string>
+    <string name="dock_sounds_enable_title" msgid="885839627097024110">"Dock insertion sound"</string>
+    <string name="dock_sounds_enable_summary_on" product="tablet" msgid="838102386448981339">"Play sound when inserting or removing tablet from dock"</string>
+    <string name="dock_sounds_enable_summary_on" product="default" msgid="8491180514199743771">"Play sound when inserting or removing phone from dock"</string>
+    <string name="dock_sounds_enable_summary_off" product="tablet" msgid="4308252722466813560">"Don\'t play sound when inserting or removing tablet from dock"</string>
+    <string name="dock_sounds_enable_summary_off" product="default" msgid="2034927992716667672">"Don\'t play sound when inserting or removing phone from dock"</string>
+    <string name="account_settings" msgid="6403589284618783461">"Accounts"</string>
+    <string name="accessibility_category_work" msgid="4339262969083355720">"Work profile accounts - <xliff:g id="MANAGED_BY">%s</xliff:g>"</string>
+    <string name="accessibility_category_personal" msgid="1263518850905945594">"Personal profile accounts"</string>
+    <string name="accessibility_work_account_title" msgid="1231830766637939527">"Work account - <xliff:g id="MANAGED_BY">%s</xliff:g>"</string>
+    <string name="accessibility_personal_account_title" msgid="2169071663029067826">"Personal account - <xliff:g id="MANAGED_BY">%s</xliff:g>"</string>
+    <string name="search_settings" msgid="1910951467596035063">"Search"</string>
+    <string name="search_settings_summary" msgid="9205656546570654169">"Manage search settings and history"</string>
+    <string name="search_settings_no_results" msgid="8799027492641230999">"No results"</string>
+    <string name="search_clear_history" msgid="4196658962573162457">"Clear history"</string>
+    <string name="display_settings" msgid="7965901687241669598">"Display"</string>
+    <string name="accelerometer_title" msgid="7854608399547349157">"Auto-rotate screen"</string>
+    <string name="color_mode_title" msgid="3159275920408338215">"Vivid colours"</string>
+    <string name="accelerometer_summary_on" product="tablet" msgid="429982132339828942">"Switch orientation automatically when rotating tablet"</string>
+    <string name="accelerometer_summary_on" product="default" msgid="1133737282813048021">"Switch orientation automatically when rotating phone"</string>
+    <string name="accelerometer_summary_off" product="tablet" msgid="4781734213242521682">"Switch orientation automatically when rotating tablet"</string>
+    <string name="accelerometer_summary_off" product="default" msgid="5485489363715740761">"Switch orientation automatically when rotating phone"</string>
+    <string name="brightness" msgid="8480105032417444275">"Brightness level"</string>
+    <string name="brightness_title" msgid="5746272622112982836">"Brightness"</string>
+    <string name="brightness_summary" msgid="838917350127550703">"Adjust the brightness of the screen"</string>
+    <string name="auto_brightness_title" msgid="6341042882350279391">"Adaptive brightness"</string>
+    <string name="auto_brightness_summary" msgid="1799041158760605375">"Optimise brightness level for available light"</string>
+    <string name="auto_brightness_summary_off" msgid="2802336459335410626">"Off"</string>
+    <string name="auto_brightness_summary_very_low" msgid="6483976609035853764">"Preferred brightness is very low"</string>
+    <string name="auto_brightness_summary_low" msgid="5609877905833960427">"Preferred brightness is low"</string>
+    <string name="auto_brightness_summary_default" msgid="7225666614394726845">"Preferred brightness is default"</string>
+    <string name="auto_brightness_summary_high" msgid="7172304165631136027">"Preferred brightness is high"</string>
+    <string name="auto_brightness_summary_very_high" msgid="979277812582279078">"Preferred brightness is very high"</string>
+    <string name="auto_brightness_off_title" msgid="2996864829946190795">"Off"</string>
+    <string name="auto_brightness_very_low_title" msgid="8252988638614126320">"Very low"</string>
+    <string name="auto_brightness_low_title" msgid="1632186441514863377">"Low"</string>
+    <string name="auto_brightness_default_title" msgid="936771997353506620">"Default"</string>
+    <string name="auto_brightness_high_title" msgid="2527853305981497345">"High"</string>
+    <string name="auto_brightness_very_high_title" msgid="8867164854439331022">"Very high"</string>
+    <string name="auto_brightness_subtitle" msgid="6454652530864093466">"Your preferred brightness level"</string>
+    <string name="auto_brightness_off_summary" msgid="7629228736838155268">"Don\'t adjust for available light"</string>
+    <string name="auto_brightness_very_high_summary" msgid="4551003097086220709">"Increased battery usage"</string>
+    <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_auto_mode_title" msgid="6574111412154833409">"Schedule"</string>
+    <string name="night_display_auto_mode_never" msgid="2483761922928753400">"None"</string>
+    <string name="night_display_auto_mode_custom" msgid="2379394568898721765">"Turns on at custom time"</string>
+    <string name="night_display_auto_mode_twilight" msgid="589042813708244059">"Turns on from sunset to sunrise"</string>
+    <string name="night_display_start_time_title" msgid="8918016772613689584">"Start time"</string>
+    <string name="night_display_end_time_title" msgid="8286061578083519350">"End time"</string>
+    <string name="night_display_status_title" msgid="1784041143360286267">"Status"</string>
+    <string name="night_display_temperature_title" msgid="1435292789272017136">"Intensity"</string>
+    <string name="night_display_summary_off" msgid="1792750041697946539">"Off / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
+    <string name="night_display_summary_off_auto_mode_never" msgid="3583590137322963513">"Will never turn on automatically"</string>
+    <string name="night_display_summary_off_auto_mode_custom" msgid="6365668239253173208">"Will turn on automatically at <xliff:g id="ID_1">%1$s</xliff:g>"</string>
+    <string name="night_display_summary_off_auto_mode_twilight" msgid="3596291693781757392">"Will turn on automatically at sunset"</string>
+    <string name="night_display_summary_on" msgid="1355713529996456744">"On / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
+    <string name="night_display_summary_on_auto_mode_never" msgid="9117830821363119835">"Will never turn off automatically"</string>
+    <string name="night_display_summary_on_auto_mode_custom" msgid="5510753572245577263">"Will turn off automatically at <xliff:g id="ID_1">%1$s</xliff:g>"</string>
+    <string name="night_display_summary_on_auto_mode_twilight" msgid="852270120144683507">"Will turn off automatically at sunrise"</string>
+    <string name="screen_timeout" msgid="4351334843529712571">"Sleep"</string>
+    <string name="screen_timeout_title" msgid="5130038655092628247">"Screen turns off"</string>
+    <string name="screen_timeout_summary" msgid="327761329263064327">"After <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> of inactivity"</string>
+    <string name="wallpaper_settings_title" msgid="5449180116365824625">"Wallpaper"</string>
+    <string name="wallpaper_settings_summary_default" msgid="3395741565658711416">"Default"</string>
+    <string name="wallpaper_settings_summary_custom" msgid="515035303981687172">"Custom"</string>
+    <string name="wallpaper_suggestion_title" msgid="8583988696513822528">"Change wallpaper"</string>
+    <string name="wallpaper_suggestion_summary" msgid="1579144009898110491">"Personalise your screen"</string>
+    <string name="wallpaper_settings_fragment_title" msgid="519078346877860129">"Choose wallpaper from"</string>
+    <string name="screensaver_settings_title" msgid="1770575686476851778">"Screen saver"</string>
+    <string name="screensaver_settings_summary_either_long" msgid="7302740999250873332">"While charging or docked"</string>
+    <string name="screensaver_settings_summary_either_short" msgid="6140527286137331478">"Either"</string>
+    <string name="screensaver_settings_summary_sleep" msgid="9086186698140423493">"While charging"</string>
+    <string name="screensaver_settings_summary_dock" msgid="2072657401664633283">"While docked"</string>
+    <string name="screensaver_settings_summary_never" msgid="5165622985174349585">"Never"</string>
+    <string name="screensaver_settings_summary_off" msgid="2481581696365146473">"Off"</string>
+    <string name="screensaver_settings_disabled_prompt" msgid="1239088321034437608">"To control what happens when the phone is docked and/or sleeping, turn the screen saver on."</string>
+    <string name="screensaver_settings_when_to_dream" msgid="7262410541382890146">"When to start"</string>
+    <string name="screensaver_settings_current" msgid="4663846038247130023">"Current screen saver"</string>
+    <string name="screensaver_settings_dream_start" msgid="4998187847985120168">"Start now"</string>
+    <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="ambient_display_screen_title" msgid="4252755516328775766">"Ambient display"</string>
+    <string name="ambient_display_screen_summary_always_on" msgid="7337555569694794132">"Always on/Increased battery usage"</string>
+    <string name="ambient_display_screen_summary_notifications" msgid="1449570742600868654">"New notifications"</string>
+    <string name="ambient_display_category_triggers" msgid="4359289754456268573">"When to show"</string>
+    <string name="doze_title" msgid="2375510714460456687">"New notifications"</string>
+    <string name="doze_summary" msgid="3846219936142814032">"Wake screen when you receive notifications"</string>
+    <string name="doze_always_on_title" msgid="1046222370442629646">"Always on"</string>
+    <string name="doze_always_on_summary" msgid="6978257596231155345">"Show time, notification icons and other info. Increased battery usage."</string>
+    <string name="title_font_size" msgid="4405544325522105222">"Font size"</string>
+    <string name="short_summary_font_size" msgid="6819778801232989076">"Make text larger or smaller"</string>
+    <string name="sim_lock_settings" msgid="3392331196873564292">"SIM card lock settings"</string>
+    <string name="sim_lock_settings_category" msgid="6242052161214271091">"SIM card lock"</string>
+    <string name="sim_lock_settings_summary_off" msgid="8028944267104896401">"Off"</string>
+    <string name="sim_lock_settings_summary_on" msgid="39103355956342985">"Locked"</string>
+    <string name="sim_lock_settings_title" msgid="9018585580955414596">"SIM card lock"</string>
+    <string name="sim_pin_toggle" msgid="1742123478029451888">"Lock SIM card"</string>
+    <string name="sim_lock_on" product="tablet" msgid="5058355081270397764">"Require PIN to use tablet"</string>
+    <string name="sim_lock_on" product="default" msgid="2503536505568814324">"Require PIN to use phone"</string>
+    <string name="sim_lock_off" product="tablet" msgid="2813800553917012356">"Require PIN to use tablet"</string>
+    <string name="sim_lock_off" product="default" msgid="258981978215428916">"Require PIN to use phone"</string>
+    <string name="sim_pin_change" msgid="6311414184279932368">"Change SIM PIN"</string>
+    <string name="sim_enter_pin" msgid="6608715137008508432">"SIM PIN"</string>
+    <string name="sim_enable_sim_lock" msgid="4517742794997166918">"Lock SIM card"</string>
+    <string name="sim_disable_sim_lock" msgid="7664729528754784824">"Unlock SIM card"</string>
+    <string name="sim_enter_old" msgid="6074196344494634348">"Old SIM PIN"</string>
+    <string name="sim_enter_new" msgid="8742727032729243562">"New SIM PIN"</string>
+    <string name="sim_reenter_new" msgid="6523819386793546888">"Re‑type new PIN"</string>
+    <string name="sim_change_pin" msgid="7328607264898359112">"SIM PIN"</string>
+    <string name="sim_bad_pin" msgid="2345230873496357977">"Incorrect PIN"</string>
+    <string name="sim_pins_dont_match" msgid="1695021563878890574">"PINs don\'t match"</string>
+    <string name="sim_change_failed" msgid="3602072380172511475">"Can\'t change PIN.\nPossibly incorrect PIN."</string>
+    <string name="sim_change_succeeded" msgid="8556135413096489627">"SIM PIN changed successfully"</string>
+    <string name="sim_lock_failed" msgid="2489611099235575984">"Can\'t change SIM card lock state.\nPossibly incorrect PIN."</string>
+    <string name="sim_enter_ok" msgid="6475946836899218919">"OK"</string>
+    <string name="sim_enter_cancel" msgid="6240422158517208036">"Cancel"</string>
+    <string name="sim_multi_sims_title" msgid="9159427879911231239">"Multiple SIMs found"</string>
+    <string name="sim_multi_sims_summary" msgid="2698176447067691396">"Choose the SIM you prefer for mobile data."</string>
+    <string name="sim_change_data_title" msgid="294357201685244532">"Change data SIM?"</string>
+    <string name="sim_change_data_message" msgid="5854582807996717811">"Use <xliff:g id="NEW_SIM">%1$s</xliff:g> instead of <xliff:g id="OLD_SIM">%2$s</xliff:g> for mobile data?"</string>
+    <string name="sim_preferred_title" msgid="5567909634636045268">"Update preferred SIM card?"</string>
+    <string name="sim_preferred_message" msgid="8466930554330635780">"<xliff:g id="NEW_SIM">%1$s</xliff:g> is the only SIM in your device. Do you want to use this SIM for mobile data, calls and SMS messages?"</string>
+    <string name="wrong_pin_code_pukked" msgid="4003655226832658066">"Incorrect SIM PIN code; you must now contact your carrier to unlock your device."</string>
+    <plurals name="wrong_pin_code" formatted="false" msgid="1582398808893048097">
+      <item quantity="other">Incorrect SIM PIN code, you have <xliff:g id="NUMBER_1">%d</xliff:g> remaining attempts.</item>
+      <item quantity="one">Incorrect SIM PIN code, you have <xliff:g id="NUMBER_0">%d</xliff:g> remaining attempt before you must contact your operator to unlock your device.</item>
+    </plurals>
+    <string name="pin_failed" msgid="1848423634948587645">"SIM PIN operation failed!"</string>
+    <string name="device_info_settings" product="tablet" msgid="1119755927536987178">"Tablet status"</string>
+    <string name="device_info_settings" product="default" msgid="475872867864762157">"Phone status"</string>
+    <string name="system_update_settings_list_item_title" msgid="3342887311059985961">"System updates"</string>
+    <string name="system_update_settings_list_item_summary" msgid="3853057315907710747"></string>
+    <string name="firmware_version" msgid="4801135784886859972">"Android version"</string>
+    <string name="security_patch" msgid="8438384045870296634">"Android security patch level"</string>
+    <string name="model_info" msgid="1952009518045740889">"Model"</string>
+    <string name="hardware_info" msgid="2605080746512527805">"Model &amp; hardware"</string>
+    <string name="hardware_revision" msgid="8893547686367095527">"Hardware version"</string>
+    <string name="fcc_equipment_id" msgid="149114368246356737">"Equipment ID"</string>
+    <string name="baseband_version" msgid="1848990160763524801">"Baseband version"</string>
+    <string name="kernel_version" msgid="9192574954196167602">"Kernel version"</string>
+    <string name="build_number" msgid="3075795840572241758">"Build number"</string>
+    <string name="device_info_not_available" msgid="8062521887156825182">"Not available"</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 of the battery, network and other information"</string>
+    <string name="device_status_summary" product="default" msgid="2599162787451519618">"Phone number, signal, etc."</string>
+    <string name="storage_settings" msgid="4211799979832404953">"Storage"</string>
+    <string name="storage_usb_settings" msgid="7293054033137078060">"Storage"</string>
+    <string name="storage_settings_title" msgid="8746016738388094064">"Storage settings"</string>
+    <string name="storage_settings_summary" product="nosdcard" msgid="3543813623294870759">"Unmount USB storage, view available storage"</string>
+    <string name="storage_settings_summary" product="default" msgid="9176693537325988610">"Unmount SD card, view available storage"</string>
+    <string name="status_number" product="tablet" msgid="1138837891091222272">"MDN"</string>
+    <string name="status_number" product="default" msgid="5123197324870153205">"My phone number"</string>
+    <string name="status_min_number" msgid="3519504522179420597">"MIN"</string>
+    <string name="status_msid_number" msgid="909010114445780530">"MSID"</string>
+    <string name="status_prl_version" msgid="1007470446618081441">"PRL version"</string>
+    <string name="status_meid_number" msgid="1751442889111731088">"MEID"</string>
+    <string name="status_icc_id" msgid="943368755577172747">"ICCID"</string>
+    <string name="status_network_type" msgid="3279383550222116235">"Mobile network type"</string>
+    <string name="status_latest_area_info" msgid="7222470836568238054">"Operator info"</string>
+    <string name="status_data_state" msgid="5503181397066522950">"Mobile network state"</string>
+    <string name="status_service_state" msgid="2323931627519429503">"Service status"</string>
+    <string name="status_signal_strength" msgid="3732655254188304547">"Signal strength"</string>
+    <string name="status_roaming" msgid="2638800467430913403">"Roaming"</string>
+    <string name="status_operator" msgid="2274875196954742087">"Network"</string>
+    <string name="status_wifi_mac_address" msgid="2202206684020765378">"Wi‑Fi MAC address"</string>
+    <string name="status_bt_address" msgid="4195174192087439720">"Bluetooth address"</string>
+    <string name="status_serial_number" msgid="2257111183374628137">"Serial number"</string>
+    <string name="status_up_time" msgid="7294859476816760399">"Uptime"</string>
+    <string name="status_awake_time" msgid="2393949909051183652">"Awake time"</string>
+    <string name="internal_memory" msgid="9129595691484260784">"Internal storage"</string>
+    <string name="sd_memory" product="nosdcard" msgid="2510246194083052841">"USB storage"</string>
+    <string name="sd_memory" product="default" msgid="151871913888051515">"SD card"</string>
+    <string name="memory_available" msgid="5052397223077021181">"Available"</string>
+    <string name="memory_available_read_only" msgid="6497534390167920206">"Available (read-only)"</string>
+    <string name="memory_size" msgid="6629067715017232195">"Total space"</string>
+    <string name="memory_calculating_size" msgid="2188358544203768588">"Calculating..."</string>
+    <string name="memory_apps_usage" msgid="5128673488173839077">"Apps &amp; app data"</string>
+    <string name="memory_media_usage" msgid="3738830697707880405">"Media"</string>
+    <string name="memory_downloads_usage" msgid="3755173051677533027">"Downloads"</string>
+    <string name="memory_dcim_usage" msgid="558887013613822577">"Pictures, videos"</string>
+    <string name="memory_music_usage" msgid="1363785144783011606">"Audio (music, ringtones, podcasts, etc.)"</string>
+    <string name="memory_media_misc_usage" msgid="6094866738586451683">"Other files"</string>
+    <string name="memory_media_cache_usage" msgid="6704293333141177910">"Cached data"</string>
+    <string name="sd_eject" product="nosdcard" msgid="4988563376492400073">"Unmount shared storage"</string>
+    <string name="sd_eject" product="default" msgid="6915293408836853020">"Unmount SD card"</string>
+    <string name="sd_eject_summary" product="nosdcard" msgid="5009296896648072891">"Unmount the internal USB storage"</string>
+    <string name="sd_eject_summary" product="default" msgid="3300599435073550246">"Unmount the SD card so that you can remove it safely"</string>
+    <string name="sd_insert_summary" product="nosdcard" msgid="5264016886409577313">"Insert USB storage for mounting"</string>
+    <string name="sd_insert_summary" product="default" msgid="2048640010381803841">"Insert an SD card for mounting"</string>
+    <string name="sd_mount" product="nosdcard" msgid="8966695015677343116">"Mount USB storage"</string>
+    <string name="sd_mount" product="default" msgid="5940523765187704135">"Mount SD card"</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">"Erase USB storage"</string>
+    <string name="sd_format" product="default" msgid="2576054280507119870">"Erase SD card"</string>
+    <string name="sd_format_summary" product="nosdcard" msgid="6331905044907914603">"Erases all data on the internal USB storage, such as music and photos"</string>
+    <string name="sd_format_summary" product="default" msgid="212703692181793109">"Erases all data on the SD card, such as music and photos"</string>
+    <string name="memory_clear_cache_title" msgid="5423840272171286191">"Clear cached data?"</string>
+    <string name="memory_clear_cache_message" msgid="4550262490807415948">"This will clear cached data for all apps."</string>
+    <string name="mtp_ptp_mode_summary" msgid="3710436114807789270">"MTP or PTP function is active"</string>
+    <string name="dlg_confirm_unmount_title" product="nosdcard" msgid="3077285629197874055">"Unmount USB storage"</string>
+    <string name="dlg_confirm_unmount_title" product="default" msgid="3634502237262534381">"Unmount SD card?"</string>
+    <string name="dlg_confirm_unmount_text" product="nosdcard" msgid="4322636662873269018">"If you unmount the USB storage, some apps that you are using will stop and may be unavailable until you remount the USB storage."</string>
+    <string name="dlg_confirm_unmount_text" product="default" msgid="6998379994779187692">"If you unmount the SD card, some apps that you are using will stop and may be unavailable until you remount the SD card."</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">"Cannot unmount USB storage. Try again later."</string>
+    <string name="dlg_error_unmount_text" product="default" msgid="3500976899159848422">"Couldn\'t unmount SD card. Try again later."</string>
+    <string name="unmount_inform_text" product="nosdcard" msgid="7120241136790744265">"USB storage will be unmounted."</string>
+    <string name="unmount_inform_text" product="default" msgid="1904212716075458402">"SD card will be unmounted."</string>
+    <string name="sd_ejecting_title" msgid="8824572198034365468">"Unmounting"</string>
+    <string name="sd_ejecting_summary" msgid="2028753069184908491">"Unmount in progress"</string>
+    <string name="storage_low_title" msgid="1388569749716225155">"Storage space is running out"</string>
+    <string name="storage_low_summary" msgid="7737465774892563129">"Some system functions, such as syncing, may not work correctly. Try to free space by deleting or unpinning items, such as apps or media content."</string>
+    <string name="storage_menu_rename" msgid="7141058657592615390">"Rename"</string>
+    <string name="storage_menu_mount" msgid="1014683672493425425">"Mount"</string>
+    <string name="storage_menu_unmount" msgid="681485356885955898">"Eject"</string>
+    <string name="storage_menu_format" msgid="7690626079653152152">"Format"</string>
+    <string name="storage_menu_format_public" msgid="7464714208010125682">"Format as portable"</string>
+    <string name="storage_menu_format_private" msgid="546017531835902096">"Format as internal"</string>
+    <string name="storage_menu_migrate" msgid="3969621494238154294">"Migrate data"</string>
+    <string name="storage_menu_forget" msgid="6305824238997983426">"Forget"</string>
+    <string name="storage_menu_set_up" msgid="4263294929451685366">"Set-up"</string>
+    <string name="storage_menu_explore" msgid="4637496051816521560">"Explore"</string>
+    <string name="storage_menu_free" msgid="6386070442027135427">"Free up space"</string>
+    <string name="storage_menu_manage" msgid="5914482953856430780">"Manage storage"</string>
+    <string name="storage_title_usb" msgid="679612779321689418">"USB computer connection"</string>
+    <string name="usb_connection_category" msgid="7805945595165422882">"Connect as"</string>
+    <string name="usb_mtp_title" msgid="3399663424394065964">"Media device (MTP)"</string>
+    <string name="usb_mtp_summary" msgid="4617321473211391236">"Lets you transfer media files on Windows or using Android File Transfer on Mac (see www.android.com/filetransfer)"</string>
+    <string name="usb_ptp_title" msgid="3852760810622389620">"Camera (PTP)"</string>
+    <string name="usb_ptp_summary" msgid="7406889433172511530">"Lets you transfer photos using camera software and transfer any files on computers that don\'t support MTP"</string>
+    <string name="usb_midi_title" msgid="3069990264258413994">"MIDI"</string>
+    <string name="usb_midi_summary" msgid="539169474810956358">"Lets MIDI-enabled applications work over USB with MIDI software on your computer."</string>
+    <string name="storage_other_users" msgid="808708845102611856">"Other users"</string>
+    <string name="storage_internal_title" msgid="690771193137801021">"Device storage"</string>
+    <string name="storage_external_title" msgid="3433462910096848696">"Portable storage"</string>
+    <string name="storage_volume_summary" msgid="7023441974367853372">"<xliff:g id="USED">%1$s</xliff:g> used of <xliff:g id="TOTAL">%2$s</xliff:g>"</string>
+    <string name="storage_size_large" msgid="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">"Used of <xliff:g id="TOTAL">%1$s</xliff:g>"</string>
+    <string name="storage_volume_used_total" msgid="6113121714019000244">"Total used of <xliff:g id="TOTAL">%1$s</xliff:g>"</string>
+    <string name="storage_mount_success" msgid="687641090137253647">"<xliff:g id="NAME">%1$s</xliff:g> is mounted"</string>
+    <string name="storage_mount_failure" msgid="1042621107954547316">"Couldn\'t mount <xliff:g id="NAME">%1$s</xliff:g>"</string>
+    <string name="storage_unmount_success" msgid="5737203344673441677">"<xliff:g id="NAME">%1$s</xliff:g> is safely ejected"</string>
+    <string name="storage_unmount_failure" msgid="5758387106579519489">"Couldn\'t safely eject <xliff:g id="NAME">%1$s</xliff:g>"</string>
+    <string name="storage_format_success" msgid="3023144070597190555">"<xliff:g id="NAME">%1$s</xliff:g> is formatted"</string>
+    <string name="storage_format_failure" msgid="6032640952779735766">"Couldn\'t format <xliff:g id="NAME">%1$s</xliff:g>"</string>
+    <string name="storage_rename_title" msgid="8242663969839491485">"Rename storage"</string>
+    <string name="storage_dialog_unmounted" msgid="6403320870103261477">"This <xliff:g id="NAME_0">^1</xliff:g> is safely ejected, but still available. \n\nTo use this <xliff:g id="NAME_1">^1</xliff:g>, you have to mount it first."</string>
+    <string name="storage_dialog_unmountable" msgid="3732209361668282254">"This <xliff:g id="NAME_0">^1</xliff:g> is corrupted. \n\nTo use this <xliff:g id="NAME_1">^1</xliff:g>, you have to set it up first."</string>
+    <string name="storage_dialog_unsupported" msgid="4503128224360482228">"This device doesn’t support this <xliff:g id="NAME_0">^1</xliff:g>. \n\nTo use this <xliff:g id="NAME_1">^1</xliff:g> with this device, you have to set it up first."</string>
+    <string name="storage_internal_format_details" msgid="4018647158382548820">"After formatting, you can use this <xliff:g id="NAME_0">^1</xliff:g> in other devices. \n\nAll data on this <xliff:g id="NAME_1">^1</xliff:g> will be erased. Consider backing up first. \n\n"<b>"Back up photos &amp; other media"</b>" \nMove your media files to alternative storage on this device, or transfer them to a computer using a USB cable. \n\n"<b>"Back up apps"</b>" \nAll apps stored on this <xliff:g id="NAME_6">^1</xliff:g> will be uninstalled and their data will be erased. To keep these apps, move them to alternative storage on this device."</string>
+    <string name="storage_internal_unmount_details" msgid="3582802571684490057"><b>"When you eject this <xliff:g id="NAME_0">^1</xliff:g>, apps stored on it will stop working, and media files stored on it will not be available until it is reinserted."</b>" \n\nThis <xliff:g id="NAME_1">^1</xliff:g> is formatted to work on this device only. It won’t work on any others."</string>
+    <string name="storage_internal_forget_details" msgid="9028875424669047327">"To use the apps, photos or data this <xliff:g id="NAME">^1</xliff:g> contains, reinsert it. \n\nAlternatively, you can choose to forget this storage if the device isn’t available. \n\nIf you choose to forget, all the data the device contains will be lost forever. \n\nYou can reinstall the apps later, but their data stored on this device will be lost."</string>
+    <string name="storage_internal_forget_confirm_title" msgid="1370847944388479245">"Forget <xliff:g id="NAME">^1</xliff:g>?"</string>
+    <string name="storage_internal_forget_confirm" msgid="1148446041396902905">"All the apps, photos and data stored on this <xliff:g id="NAME">^1</xliff:g> will be lost forever."</string>
+    <string name="storage_detail_apps" msgid="6141154016753507490">"Apps"</string>
+    <string name="storage_detail_images" msgid="6950678857740634769">"Images"</string>
+    <string name="storage_detail_videos" msgid="2919743464827110953">"Videos"</string>
+    <string name="storage_detail_audio" msgid="1197685141676483213">"Audio"</string>
+    <string name="storage_detail_cached" msgid="8547136365247818567">"Cached data"</string>
+    <string name="storage_detail_other" msgid="8404938385075638238">"Other"</string>
+    <string name="storage_detail_system" msgid="4629506366064709687">"System"</string>
+    <string name="storage_detail_explore" msgid="7911344011431568294">"Explore <xliff:g id="NAME">^1</xliff:g>"</string>
+    <string name="storage_detail_dialog_other" msgid="8907101974576694793">"Other includes shared files saved by apps, files downloaded from the Internet or Bluetooth, Android files and so on. \n\nTo see the visible contents of this <xliff:g id="NAME">^1</xliff:g>, tap Explore."</string>
+    <string name="storage_detail_dialog_system" msgid="862835644848361569">"System includes files used to run Android version <xliff:g id="VERSION">%s</xliff:g>"</string>
+    <string name="storage_detail_dialog_user" msgid="3267254783294197804">"<xliff:g id="USER_0">^1</xliff:g> may have saved photos, music, apps or other data, using <xliff:g id="SIZE">^2</xliff:g> of storage. \n\nTo view details, switch to <xliff:g id="USER_1">^1</xliff:g>."</string>
+    <string name="storage_wizard_init_title" msgid="5085400514028585772">"Set up your <xliff:g id="NAME">^1</xliff:g>"</string>
+    <string name="storage_wizard_init_external_title" msgid="4867326438945303598">"Use as portable storage"</string>
+    <string name="storage_wizard_init_external_summary" msgid="7476105886344565074">"For moving photos and other media between devices."</string>
+    <string name="storage_wizard_init_internal_title" msgid="9100613534261408519">"Use as internal storage"</string>
+    <string name="storage_wizard_init_internal_summary" msgid="6240417501036216410">"For storing anything on this device only, including apps and photos. Requires formatting that prevents it from working with other devices."</string>
+    <string name="storage_wizard_format_confirm_title" msgid="2814021794538252546">"Format as internal storage"</string>
+    <string name="storage_wizard_format_confirm_body" msgid="4401758710076806509">"This requires the <xliff:g id="NAME_0">^1</xliff:g> to be formatted to make it secure. \n\nAfter formatting, this <xliff:g id="NAME_1">^1</xliff:g> will only work in this device. \n\n"<b>"Formatting erases all data currently stored on the <xliff:g id="NAME_2">^1</xliff:g>."</b>" To avoid losing the data, consider backing it up."</string>
+    <string name="storage_wizard_format_confirm_public_title" msgid="4905690038882041566">"Format as portable storage"</string>
+    <string name="storage_wizard_format_confirm_public_body" msgid="1516932692920060272">"This requires the <xliff:g id="NAME_0">^1</xliff:g> to be formatted. \n\n"<b>"Formatting erases all data currently stored on the <xliff:g id="NAME_1">^1</xliff:g>."</b>" To avoid losing the data, consider backing it up."</string>
+    <string name="storage_wizard_format_confirm_next" msgid="2774557300531702572">"Erase &amp; format"</string>
+    <string name="storage_wizard_format_progress_title" msgid="6487352396450582292">"Formatting <xliff:g id="NAME">^1</xliff:g>…"</string>
+    <string name="storage_wizard_format_progress_body" msgid="4445041233802828430">"Don\'t remove the <xliff:g id="NAME">^1</xliff:g> while it\'s formatting."</string>
+    <string name="storage_wizard_migrate_title" msgid="1363078147938160407">"Move data to new storage"</string>
+    <string name="storage_wizard_migrate_body" msgid="890751699549542345">"You can move your photos, files and some apps to this new <xliff:g id="NAME">^1</xliff:g>. \n\nThe move takes about <xliff:g id="TIME">^2</xliff:g> and will free <xliff:g id="SIZE">^3</xliff:g> on internal storage. Some apps won’t work while it’s underway."</string>
+    <string name="storage_wizard_migrate_now" msgid="4523444323744239143">"Move now"</string>
+    <string name="storage_wizard_migrate_later" msgid="3173482328116026253">"Move later"</string>
+    <string name="storage_wizard_migrate_confirm_title" msgid="8564833529613286965">"Move data now"</string>
+    <string name="storage_wizard_migrate_confirm_body" msgid="4212060581792135962"><b>"The move takes about <xliff:g id="TIME">^1</xliff:g>. It will free <xliff:g id="SIZE">^2</xliff:g> on <xliff:g id="NAME">^3</xliff:g>."</b></string>
+    <string name="storage_wizard_migrate_confirm_next" msgid="5509475628423823202">"Move"</string>
+    <string name="storage_wizard_migrate_progress_title" msgid="1665479429044202868">"Moving data…"</string>
+    <string name="storage_wizard_migrate_details" msgid="3709728824651136227">"During the move: \n• Don\'t remove the <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> is ready"</string>
+    <string name="storage_wizard_ready_external_body" msgid="2879508114260597474">"Your <xliff:g id="NAME">^1</xliff:g> is ready to use with photos and other media."</string>
+    <string name="storage_wizard_ready_internal_body" msgid="122532674037860197">"Your new <xliff:g id="NAME">^1</xliff:g> is working. \n\nTo move photos, files and app data to this device, go to Settings &gt; Storage."</string>
+    <string name="storage_wizard_move_confirm_title" msgid="292782012677890250">"Move <xliff:g id="APP">^1</xliff:g>"</string>
+    <string name="storage_wizard_move_confirm_body" msgid="5176432115206478941">"Moving <xliff:g id="APP">^1</xliff:g> and its data to <xliff:g id="NAME_0">^2</xliff:g> will take only a few moments. You won\'t be able to use the app until the move is complete. \n\nDon\'t remove the <xliff:g id="NAME_1">^2</xliff:g> during the move."</string>
+    <string name="storage_wizard_move_progress_title" msgid="4443920302548035674">"Moving <xliff:g id="APP">^1</xliff:g>…"</string>
+    <string name="storage_wizard_move_progress_body" msgid="7802577486578105609">"Don\'t remove the <xliff:g id="NAME">^1</xliff:g> during the move. \n\nThe <xliff:g id="APP">^2</xliff:g> app on this device won\'t be available until the move is complete."</string>
+    <string name="storage_wizard_move_progress_cancel" msgid="542047237524588792">"Cancel move"</string>
+    <string name="storage_wizard_slow_body" msgid="8010127667184768025">"This <xliff:g id="NAME_0">^1</xliff:g> appears to be slow. \n\nYou can continue, but apps moved to this location may stutter and data transfers may take a long time. \n\nConsider using a faster <xliff:g id="NAME_1">^1</xliff:g> for better performance."</string>
+    <string name="battery_status_title" msgid="9159414319574976203">"Battery status"</string>
+    <string name="battery_level_title" msgid="2965679202786873272">"Battery level"</string>
+    <string name="apn_settings" msgid="3743170484827528406">"APNs"</string>
+    <string name="apn_edit" msgid="1354715499708424718">"Edit access point"</string>
+    <string name="apn_not_set" msgid="4974192007399968164">"Not set"</string>
+    <string name="apn_name" msgid="4115580098369824123">"Name"</string>
+    <string name="apn_apn" msgid="2479425126733513353">"APN"</string>
+    <string name="apn_http_proxy" msgid="1826885957243696354">"Proxy"</string>
+    <string name="apn_http_port" msgid="3763259523984976226">"Port"</string>
+    <string name="apn_user" msgid="455637547356117761">"Username"</string>
+    <string name="apn_password" msgid="5412301994998250968">"Password"</string>
+    <string name="apn_server" msgid="2436185314756372858">"Server"</string>
+    <string name="apn_mmsc" msgid="3670124402105585737">"MMSC"</string>
+    <string name="apn_mms_proxy" msgid="5374082621073999275">"MMS proxy"</string>
+    <string name="apn_mms_port" msgid="4074188088199243040">"MMS port"</string>
+    <string name="apn_mcc" msgid="4258628382260674636">"MCC"</string>
+    <string name="apn_mnc" msgid="8629374076888809874">"MNC"</string>
+    <string name="apn_auth_type" msgid="6167205395676037015">"Authentication type"</string>
+    <string name="apn_auth_type_none" msgid="5069592676845549926">"None"</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 or CHAP"</string>
+    <string name="apn_type" msgid="469613123902220544">"APN type"</string>
+    <string name="apn_protocol" msgid="3272222921649348640">"APN protocol"</string>
+    <string name="apn_roaming_protocol" msgid="3386954381510788422">"APN roaming protocol"</string>
+    <string name="carrier_enabled" msgid="407655861175280806">"APN enable/disable"</string>
+    <string name="carrier_enabled_summaryOn" msgid="6338915271908057531">"APN enabled"</string>
+    <string name="carrier_enabled_summaryOff" msgid="4300790190221203756">"APN disabled"</string>
+    <string name="bearer" msgid="594270280031923558">"Bearer"</string>
+    <string name="mvno_type" msgid="2543253857818336421">"MVNO type"</string>
+    <string name="mvno_match_data" msgid="4560671695220540466">"MVNO value"</string>
+    <string name="menu_delete" msgid="6981294422841124659">"Delete APN"</string>
+    <string name="menu_new" msgid="3014205883303921729">"New APN"</string>
+    <string name="menu_save" msgid="8109345640668285399">"Save"</string>
+    <string name="menu_cancel" msgid="2194502410474697474">"Discard"</string>
+    <string name="error_title" msgid="7631322303341024692"></string>
+    <string name="error_name_empty" msgid="5508155943840201232">"The Name field can\'t be empty."</string>
+    <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>
+    <string name="reset_dashboard_title" msgid="6254873816990678620">"Reset options"</string>
+    <string name="reset_dashboard_summary" msgid="4851012632493522755">"Network, apps or device can be reset"</string>
+    <string name="reset_network_title" msgid="6166025966016873843">"Reset Wi-Fi, mobile &amp; Bluetooth"</string>
+    <string name="reset_network_desc" msgid="5547979398298881406">"This will reset all network settings, including:\n\n"<li>"Wi‑Fi"</li>\n<li>"Mobile data"</li>\n<li>"Bluetooth"</li></string>
+    <string name="reset_network_button_text" msgid="2035676527471089853">"Reset settings"</string>
+    <string name="reset_network_final_desc" msgid="6388371121099245116">"Reset all network settings? You can\'t undo this action!"</string>
+    <string name="reset_network_final_button_text" msgid="1797434793741744635">"Reset settings"</string>
+    <string name="reset_network_confirm_title" msgid="1759888886976962773">"Reset?"</string>
+    <string name="network_reset_not_available" msgid="7188610385577164676">"Network reset is not available for this user"</string>
+    <string name="reset_network_complete_toast" msgid="787829973559541880">"Network settings have been reset"</string>
+    <string name="master_clear_title" msgid="3531267871084279512">"Erase all data (factory reset)"</string>
+    <string name="master_clear_desc" product="tablet" msgid="9146059417023157222">"This will erase all data from your tablet\'s "<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" msgid="4800386183314202571">"This will erase all data from your phone\'s "<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_accounts" product="default" msgid="6412857499147999073">\n\n"You are currently signed in to the following accounts:\n"</string>
+    <string name="master_clear_other_users_present" product="default" msgid="5161423070702470742">\n\n"There are other users present on this device.\n"</string>
+    <string name="master_clear_desc_also_erases_external" msgid="1903185203791274237"><li>"Music"</li>\n<li>"Photos"</li>\n<li>"Other user data"</li></string>
+    <string name="master_clear_desc_also_erases_esim" msgid="312352697653096008"><li>"Operators on eSIM"</li></string>
+    <string name="master_clear_desc_no_cancel_mobile_plan" msgid="5460926449093211144">\n\n"This will not cancel your mobile service plan."</string>
+    <string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="7744115866662613411">\n\n"To clear music, pictures and other user data, the "<b>"USB storage"</b>" needs to be erased."</string>
+    <string name="master_clear_desc_erase_external_storage" product="default" msgid="4801026652617377093">\n\n"To clear music, pictures and other user data, the "<b>"SD card"</b>" needs to be erased."</string>
+    <string name="erase_external_storage" product="nosdcard" msgid="969364037450286809">"Erase USB storage"</string>
+    <string name="erase_external_storage" product="default" msgid="1397239046334307625">"Erase SD card"</string>
+    <string name="erase_external_storage_description" product="nosdcard" msgid="4728558173931599429">"Erase all the data on the internal USB storage, such as music or photos"</string>
+    <string name="erase_external_storage_description" product="default" msgid="1737638779582964966">"Erase all the data on the SD card, such as music or photos"</string>
+    <string name="erase_esim_storage" msgid="1886761972867390123">"Erase eSIMs"</string>
+    <string name="erase_esim_storage_description" product="default" msgid="708691303677321598">"Erase all eSIMs on the phone. This will not cancel your mobile service plan."</string>
+    <string name="erase_esim_storage_description" product="tablet" msgid="1780953956941209107">"Erase all eSIMs on the tablet. This will not cancel your mobile service plan."</string>
+    <string name="master_clear_button_text" product="tablet" msgid="3130786116528304116">"Reset tablet"</string>
+    <string name="master_clear_button_text" product="default" msgid="7550632653343157971">"Reset phone"</string>
+    <string name="master_clear_final_desc" msgid="7318683914280403086">"Erase all your personal information and downloaded apps? You can\'t undo this action!"</string>
+    <string name="master_clear_final_button_text" msgid="5390908019019242910">"Erase everything"</string>
+    <string name="master_clear_failed" msgid="2503230016394586353">"No reset was performed because the System Clear service isn\'t available."</string>
+    <string name="master_clear_confirm_title" msgid="7572642091599403668">"Reset?"</string>
+    <string name="master_clear_not_available" msgid="1000370707967468909">"Factory reset is not available for this user"</string>
+    <string name="master_clear_progress_title" msgid="5194793778701994634">"Erasing"</string>
+    <string name="master_clear_progress_text" msgid="6559096229480527510">"Please wait..."</string>
+    <string name="call_settings_title" msgid="5188713413939232801">"Call settings"</string>
+    <string name="call_settings_summary" msgid="7291195704801002886">"Set up voicemail, call forwarding, call waiting, caller ID"</string>
+    <string name="tether_settings_title_usb" msgid="6688416425801386511">"USB tethering"</string>
+    <string name="tether_settings_title_wifi" msgid="3277144155960302049">"Portable hotspot"</string>
+    <string name="tether_settings_title_bluetooth" msgid="355855408317564420">"Bluetooth tethering"</string>
+    <string name="tether_settings_title_usb_bluetooth" msgid="5355828977109785001">"Tethering"</string>
+    <string name="tether_settings_title_all" msgid="3058586928118801157">"Hotspot &amp; tethering"</string>
+    <string name="tether_settings_summary_hotspot_on_tether_on" msgid="930464462687425777">"Hotspot on, tethering"</string>
+    <string name="tether_settings_summary_hotspot_on_tether_off" msgid="3473671453891735907">"Hotspot on"</string>
+    <string name="tether_settings_summary_hotspot_off_tether_on" msgid="1618256180720077354">"Tethering"</string>
+    <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_subtext" product="default" msgid="5991482890033484794">"Share phone’s Internet connection via USB"</string>
+    <string name="usb_tethering_subtext" product="tablet" msgid="5988796139573211318">"Share tablet’s Internet connection via USB"</string>
+    <string name="bluetooth_tether_checkbox_text" msgid="2379175828878753652">"Bluetooth tethering"</string>
+    <string name="bluetooth_tethering_subtext" product="tablet" msgid="4558227863463153412">"Share tablet’s Internet connection via Bluetooth"</string>
+    <string name="bluetooth_tethering_subtext" product="default" msgid="1055197887836203595">"Share phone’s Internet connection via Bluetooth"</string>
+    <string name="bluetooth_tethering_off_subtext_config" msgid="6326877798974938021">"Sharing this <xliff:g id="DEVICE_NAME">%1$d</xliff:g>’s Internet connection via Bluetooth"</string>
+    <string name="bluetooth_tethering_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="1308462275952345985">"Use hotspot and tethering to provide Internet to other devices through your mobile data connection. Apps can also create a hotspot to share content with nearby devices."</string>
+    <string name="tethering_help_button_text" msgid="656117495547173630">"Help"</string>
+    <string name="network_settings_title" msgid="2876509814832830757">"Mobile network"</string>
+    <string name="manage_mobile_plan_title" msgid="7630170375010107744">"Mobile plan"</string>
+    <string name="sms_application_title" msgid="4903928270533250448">"SMS app"</string>
+    <string name="sms_change_default_dialog_title" msgid="1958688831875804286">"Change SMS app?"</string>
+    <string name="sms_change_default_dialog_text" msgid="1522783933230274787">"Use <xliff:g id="NEW_APP">%1$s</xliff:g> instead of <xliff:g id="CURRENT_APP">%2$s</xliff:g> as your SMS app?"</string>
+    <string name="sms_change_default_no_previous_dialog_text" msgid="602683880284921998">"Use <xliff:g id="NEW_APP">%s</xliff:g> as your SMS app?"</string>
+    <string name="network_scorer_picker_title" msgid="6383879578279046456">"Network rating provider"</string>
+    <string name="network_scorer_picker_none_preference" msgid="9028375117241790936">"None"</string>
+    <string name="network_scorer_change_active_dialog_title" msgid="3776301550387574975">"Change Wi‑Fi assistant?"</string>
+    <string name="network_scorer_change_active_dialog_text" msgid="8035173880322990715">"Use <xliff:g id="NEW_APP">%1$s</xliff:g> instead of <xliff:g id="CURRENT_APP">%2$s</xliff:g> to manage your network connections?"</string>
+    <string name="network_scorer_change_active_no_previous_dialog_text" msgid="7444620909047611601">"Use <xliff:g id="NEW_APP">%s</xliff:g> to manage your network connections?"</string>
+    <string name="mobile_unknown_sim_operator" msgid="2156912373230276157">"Unknown SIM operator"</string>
+    <string name="mobile_no_provisioning_url" msgid="9053814051811634125">"<xliff:g id="OPERATOR">%1$s</xliff:g> has no known provisioning website"</string>
+    <string name="mobile_insert_sim_card" msgid="9052590985784056395">"Please insert SIM card and restart"</string>
+    <string name="mobile_connect_to_internet" msgid="1733894125065249639">"Please connect to the internet"</string>
+    <string name="location_title" msgid="1029961368397484576">"My Location"</string>
+    <string name="managed_profile_location_switch_title" msgid="6712332547063039683">"Location for work profile"</string>
+    <string name="location_mode_title" msgid="3982009713118421689">"Mode"</string>
+    <string name="location_mode_high_accuracy_title" msgid="8241802585110932849">"High accuracy"</string>
+    <string name="location_mode_battery_saving_title" msgid="711273645208158637">"Battery saving"</string>
+    <string name="location_mode_sensors_only_title" msgid="3040366132175435160">"Device only"</string>
+    <string name="location_mode_location_off_title" msgid="2829713015012529465">"Location off"</string>
+    <string name="location_app_level_permissions" msgid="1825588230817081339">"App-level permissions"</string>
+    <string name="location_category_recent_location_requests" msgid="1938721350424447421">"Recent location requests"</string>
+    <string name="location_no_recent_apps" msgid="2800907699722178041">"No apps have requested location recently"</string>
+    <string name="location_category_location_services" msgid="7437150886946685979">"Location services"</string>
+    <string name="location_high_battery_use" msgid="517199943258508020">"High battery use"</string>
+    <string name="location_low_battery_use" msgid="8602232529541903596">"Low battery use"</string>
+    <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="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>
+    <string name="location_scanning_bluetooth_always_scanning_title" msgid="5444989508204520019">"Bluetooth scanning"</string>
+    <string name="location_scanning_bluetooth_always_scanning_description" msgid="8602726521250591852">"Improve location by allowing system apps and services to detect Bluetooth devices at any time."</string>
+    <string name="location_network_based" msgid="9134175479520582215">"Wi‑Fi &amp; mobile network location"</string>
+    <string name="location_neighborhood_level" msgid="5141318121229984788">"Let apps use Google\'s location service to estimate your location faster. Anonymous location data will be collected and sent to Google."</string>
+    <string name="location_neighborhood_level_wifi" msgid="4234820941954812210">"Location determined by Wi‑Fi"</string>
+    <string name="location_gps" msgid="8392461023569708478">"GPS satellites"</string>
+    <string name="location_street_level" product="tablet" msgid="1669562198260860802">"Let apps use GPS on your tablet to pinpoint your location"</string>
+    <string name="location_street_level" product="default" msgid="4617445745492014203">"Let apps use GPS on your phone to pinpoint your location"</string>
+    <string name="assisted_gps" msgid="4649317129586736885">"Use assisted GPS"</string>
+    <string name="assisted_gps_enabled" msgid="8751899609589792803">"Use server to assist GPS (un-tick to reduce network usage)"</string>
+    <string name="assisted_gps_disabled" msgid="6982698333968010748">"Use server to assist GPS (un-tick to improve GPS performance)"</string>
+    <string name="use_location_title" msgid="5206937465504979977">"Location &amp; Google search"</string>
+    <string name="use_location_summary" msgid="3978805802386162520">"Let Google use your location to improve search results and other services"</string>
+    <string name="location_access_title" msgid="7064108942964081243">"Access to my location"</string>
+    <string name="location_access_summary" msgid="69031404093194341">"Let apps that have asked your permission use your location information"</string>
+    <string name="location_sources_heading" msgid="1278732419851088319">"Location sources"</string>
+    <string name="about_settings" product="tablet" msgid="593457295516533765">"About tablet"</string>
+    <string name="about_settings" product="default" msgid="1743378368185371685">"About phone"</string>
+    <string name="about_settings" product="emulator" msgid="221313099578564438">"About emulated device"</string>
+    <string name="about_settings_summary" msgid="3371517697156165959">"View legal info, status, software version"</string>
+    <string name="legal_information" msgid="5769301644270604095">"Legal information"</string>
+    <string name="contributors_title" msgid="5917703088825286504">"Contributors"</string>
+    <string name="manual" msgid="3025943393642974445">"Manual"</string>
+    <string name="regulatory_labels" msgid="1293050314122427492">"Regulatory labels"</string>
+    <string name="safety_and_regulatory_info" msgid="5103161279848427185">"Safety &amp; regulatory manual"</string>
+    <string name="copyright_title" msgid="865906688917260647">"Copyright"</string>
+    <string name="license_title" msgid="1990487604356037871">"Licence"</string>
+    <string name="terms_title" msgid="7697580845616764642">"Terms and conditions"</string>
+    <string name="webview_license_title" msgid="2813507464175738967">"System WebView Licence"</string>
+    <string name="wallpaper_attributions" msgid="3645880512943433928">"Wallpapers"</string>
+    <string name="wallpaper_attributions_values" msgid="2996183537914690469">"Satellite imagery providers:\n©2014 CNES/Astrium, DigitalGlobe, Bluesky"</string>
+    <string name="settings_manual_activity_title" msgid="8133150693616006051">"Manual"</string>
+    <string name="settings_manual_activity_unavailable" msgid="4752403782883814898">"There is a problem loading the manual."</string>
+    <string name="settings_license_activity_title" msgid="8525014571806471216">"Third-party licences"</string>
+    <string name="settings_license_activity_unavailable" msgid="4210539215951487627">"There is a problem loading the licences."</string>
+    <string name="settings_license_activity_loading" msgid="3337535809093591740">"Loading…"</string>
+    <string name="settings_safetylegal_title" msgid="1289483965535937431">"Safety information"</string>
+    <string name="settings_safetylegal_activity_title" msgid="6901214628496951727">"Safety information"</string>
+    <string name="settings_safetylegal_activity_unreachable" msgid="250674109915859456">"You don\'t have a data connection. To view this information now, go to %s from any computer connected to the Internet."</string>
+    <string name="settings_safetylegal_activity_loading" msgid="8059022597639516348">"Loading…"</string>
+    <string name="lockpassword_choose_your_screen_lock_header" msgid="3872462096767152394">"Set a screen lock"</string>
+    <string name="lockpassword_choose_your_password_message" msgid="1197569283524841412">"For security, set a password"</string>
+    <string name="lockpassword_choose_your_password_header_for_fingerprint" msgid="2541818487015343503">"To use fingerprint, set a password"</string>
+    <string name="lockpassword_choose_your_pattern_header_for_fingerprint" msgid="7709785406243556723">"To use fingerprint, set a pattern"</string>
+    <string name="lockpassword_choose_your_pin_message" msgid="1875420718677275646">"For security, set a PIN"</string>
+    <string name="lockpassword_choose_your_pin_header_for_fingerprint" msgid="1549639053195796674">"To use fingerprint, set a PIN"</string>
+    <string name="lockpassword_choose_your_pattern_message" msgid="5986983400689720015">"For security, set a pattern"</string>
+    <string name="lockpassword_confirm_your_password_header" msgid="1266027268220850931">"Re-enter your password"</string>
+    <string name="lockpassword_confirm_your_pattern_header" msgid="7543433733032330821">"Confirm your pattern"</string>
+    <string name="lockpassword_confirm_your_pin_header" msgid="7744513791910572550">"Re-enter your PIN"</string>
+    <string name="lockpassword_confirm_passwords_dont_match" msgid="5140892109439191415">"Passwords don\'t match"</string>
+    <string name="lockpassword_confirm_pins_dont_match" msgid="7226244811505606217">"PINs don\'t match"</string>
+    <string name="lockpassword_choose_lock_generic_header" msgid="3811438094903786145">"Unlock selection"</string>
+    <string name="lockpassword_password_set_toast" msgid="4875050283108629383">"password has been set"</string>
+    <string name="lockpassword_pin_set_toast" msgid="6011826444725291475">"PIN has been set"</string>
+    <string name="lockpassword_pattern_set_toast" msgid="6867259621331406236">"Pattern has been set"</string>
+    <string name="lockpassword_confirm_your_pattern_generic" msgid="2920960858283879113">"Use your device pattern to continue"</string>
+    <string name="lockpassword_confirm_your_pin_generic" msgid="4062335874438910487">"Enter your device PIN to continue"</string>
+    <string name="lockpassword_confirm_your_password_generic" msgid="3976394862548354966">"Enter your device password to continue"</string>
+    <string name="lockpassword_confirm_your_pattern_generic_profile" msgid="4435638308193361861">"Use your work pattern to continue"</string>
+    <string name="lockpassword_confirm_your_pin_generic_profile" msgid="3730141667547002246">"Enter your work PIN to continue"</string>
+    <string name="lockpassword_confirm_your_password_generic_profile" msgid="4250642723467019894">"Enter your work password to continue"</string>
+    <string name="lockpassword_strong_auth_required_device_pattern" msgid="530802132223800623">"For added security, use your device pattern"</string>
+    <string name="lockpassword_strong_auth_required_device_pin" msgid="7829294830078036417">"For added security, enter your device PIN"</string>
+    <string name="lockpassword_strong_auth_required_device_password" msgid="3552644641574796973">"For added security, enter your device password"</string>
+    <string name="lockpassword_strong_auth_required_work_pattern" msgid="3003781907040522053">"For added security, use your work pattern"</string>
+    <string name="lockpassword_strong_auth_required_work_pin" msgid="3367491332598821552">"For added security, enter your work PIN"</string>
+    <string name="lockpassword_strong_auth_required_work_password" msgid="8159775129968582940">"For added security, enter your work password"</string>
+    <string name="lockpassword_confirm_your_pattern_details_frp" msgid="6757336656791723193">"Your phone was reset to factory settings. To use this phone, enter your previous pattern."</string>
+    <string name="lockpassword_confirm_your_pin_details_frp" msgid="826520613445990470">"Your phone was reset to factory settings. To use this phone, enter your previous PIN."</string>
+    <string name="lockpassword_confirm_your_password_details_frp" msgid="8944081074615739040">"Your phone was reset to factory settings. To use this phone, enter your previous password."</string>
+    <string name="lockpassword_confirm_your_pattern_header_frp" msgid="2898036091609128286">"Verify pattern"</string>
+    <string name="lockpassword_confirm_your_pin_header_frp" msgid="4141601774778898803">"Verify PIN"</string>
+    <string name="lockpassword_confirm_your_password_header_frp" msgid="3762615419295360480">"Verify password"</string>
+    <string name="lockpassword_invalid_pin" msgid="15588049067548470">"Wrong PIN"</string>
+    <string name="lockpassword_invalid_password" msgid="4038507398784975200">"Wrong password"</string>
+    <string name="lockpattern_need_to_unlock_wrong" msgid="1745247595356012176">"Wrong pattern"</string>
+    <string name="lock_settings_title" msgid="4213839087748988686">"Device security"</string>
+    <string name="lockpattern_change_lock_pattern_label" msgid="5679630792003440352">"Change unlock pattern"</string>
+    <string name="lockpattern_change_lock_pin_label" msgid="266707138486731661">"Change unlock PIN"</string>
+    <string name="lockpattern_recording_intro_header" msgid="308287052221942814">"Draw an unlock pattern"</string>
+    <string name="lockpattern_recording_intro_footer" msgid="1118579101409152113">"Press Menu for help."</string>
+    <string name="lockpattern_recording_inprogress" msgid="6667844062721656773">"Release finger when you\'ve finished"</string>
+    <string name="lockpattern_recording_incorrect_too_short" msgid="1348234155120957561">"Connect at least <xliff:g id="NUMBER">%d</xliff:g> dots. Try again."</string>
+    <string name="lockpattern_pattern_entered_header" msgid="4316818983675591604">"Pattern recorded"</string>
+    <string name="lockpattern_need_to_confirm" msgid="8054853451639221265">"Draw pattern again to confirm"</string>
+    <string name="lockpattern_pattern_confirmed_header" msgid="8455614172231880211">"Your new unlock pattern"</string>
+    <string name="lockpattern_confirm_button_text" msgid="1128204343957002841">"Confirm"</string>
+    <string name="lockpattern_restart_button_text" msgid="3337574403350953926">"Redraw"</string>
+    <string name="lockpattern_retry_button_text" msgid="3480423193273588166">"Clear"</string>
+    <string name="lockpattern_continue_button_text" msgid="4723771754714471410">"Continue"</string>
+    <string name="lockpattern_settings_title" msgid="3207750489460466680">"Unlock pattern"</string>
+    <string name="lockpattern_settings_enable_title" msgid="6920616873671115281">"Require pattern"</string>
+    <string name="lockpattern_settings_enable_summary" msgid="1165707416664252167">"Must draw pattern to unlock screen"</string>
+    <string name="lockpattern_settings_enable_visible_pattern_title" msgid="2615606088906120711">"Make pattern visible"</string>
+    <string name="lockpattern_settings_enable_visible_pattern_title_profile" msgid="4864525074768391381">"Make profile pattern visible"</string>
+    <string name="lockpattern_settings_enable_tactile_feedback_title" msgid="4389015658335522989">"Vibrate on tap"</string>
+    <string name="lockpattern_settings_enable_power_button_instantly_locks" msgid="5735444062633666327">"Power button instantly locks"</string>
+    <string name="lockpattern_settings_power_button_instantly_locks_summary" msgid="8196258755143711694">"Except when kept unlocked by <xliff:g id="TRUST_AGENT_NAME">%1$s</xliff:g>"</string>
+    <string name="lockpattern_settings_choose_lock_pattern" msgid="1652352830005653447">"Set unlock pattern"</string>
+    <string name="lockpattern_settings_change_lock_pattern" msgid="1123908306116495545">"Change unlock pattern"</string>
+    <string name="lockpattern_settings_help_how_to_record" msgid="2614673439060830433">"How to draw an unlock pattern"</string>
+    <string name="lockpattern_too_many_failed_confirmation_attempts" msgid="6909161623701848863">"Too many incorrect attempts. Try again in <xliff:g id="NUMBER">%d</xliff:g> seconds."</string>
+    <string name="activity_not_found" msgid="5551664692991605325">"Application is not installed on your phone."</string>
+    <string name="lock_settings_profile_title" msgid="2121876391814535295">"Work profile security"</string>
+    <string name="lock_settings_profile_screen_lock_title" msgid="3334747927367115256">"Work profile screen lock"</string>
+    <string name="lock_settings_profile_unification_title" msgid="4973102698492659123">"Use one lock"</string>
+    <string name="lock_settings_profile_unification_summary" msgid="7178299172998641303">"Use one lock for work profile and device screen"</string>
+    <string name="lock_settings_profile_unification_dialog_title" msgid="4824620230229285301">"Use one lock?"</string>
+    <string name="lock_settings_profile_unification_dialog_body" msgid="7128305504872026659">"Your device will use your work profile screen lock. Work policies will apply to both locks."</string>
+    <string name="lock_settings_profile_unification_dialog_uncompliant_body" msgid="3221303098797469900">"Your work profile lock doesn\'t meet your organisation\'s security requirements. You can use the same lock for your device screen and your work profile, but any work lock policies will apply."</string>
+    <string name="lock_settings_profile_unification_dialog_confirm" msgid="8249970828159656518">"Use one lock"</string>
+    <string name="lock_settings_profile_unification_dialog_uncompliant_confirm" msgid="5943758576756482777">"Use one lock"</string>
+    <string name="lock_settings_profile_unified_summary" msgid="9008819078132993492">"Same as device screen lock"</string>
+    <string name="manageapplications_settings_title" msgid="7041951105633616745">"Manage apps"</string>
+    <string name="manageapplications_settings_summary" msgid="1794401500935451259">"Manage and remove installed apps"</string>
+    <string name="applications_settings" msgid="5281808652705396152">"App info"</string>
+    <string name="applications_settings_summary" msgid="6683465446264515367">"Manage apps, set up quick-launch shortcuts"</string>
+    <string name="applications_settings_header" msgid="1014813055054356646">"App settings"</string>
+    <string name="install_applications" msgid="4872012136210802181">"Unknown sources"</string>
+    <string name="install_applications_title" msgid="4987712352256508946">"Allow all app sources"</string>
+    <string name="recent_app_category_title" msgid="6673071268966003928">"Recently opened apps"</string>
+    <string name="see_all_apps_title" msgid="1317153498074308438">"See all <xliff:g id="COUNT">%1$d</xliff:g> apps"</string>
+    <string name="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>
+    <string name="advanced_settings_summary" msgid="4016682978071086747">"Enable more settings options"</string>
+    <string name="application_info_label" msgid="5736524913065714880">"App info"</string>
+    <string name="storage_label" msgid="8700867073480107253">"Storage"</string>
+    <string name="auto_launch_label" msgid="2669236885531442195">"Open by default"</string>
+    <string name="auto_launch_label_generic" msgid="3230569852551968694">"Defaults"</string>
+    <string name="screen_compatibility_label" msgid="663250687205465394">"Screen compatibility"</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">"Clear cache"</string>
+    <string name="cache_size_label" msgid="7505481393108282913">"Cache"</string>
+    <plurals name="uri_permissions_text" formatted="false" msgid="3983110543017963732">
+      <item quantity="other">%d items</item>
+      <item quantity="one">1 item</item>
+    </plurals>
+    <string name="clear_uri_btn_text" msgid="8575655132961012158">"Clear access"</string>
+    <string name="controls_label" msgid="7611113077086853799">"Controls"</string>
+    <string name="force_stop" msgid="7435006169872876756">"Force stop"</string>
+    <string name="total_size_label" msgid="1048676419552557254">"Total"</string>
+    <string name="application_size_label" msgid="7376689739076506885">"App size"</string>
+    <string name="external_code_size_label" msgid="3459343140355961335">"USB storage app"</string>
+    <string name="data_size_label" msgid="6117971066063850416">"User data"</string>
+    <string name="external_data_size_label" product="nosdcard" msgid="7533821466482000453">"USB storage data"</string>
+    <string name="external_data_size_label" product="default" msgid="626414192825329708">"SD card"</string>
+    <string name="uninstall_text" msgid="3644892466144802466">"Uninstall"</string>
+    <string name="uninstall_all_users_text" msgid="851857393177950340">"Uninstall for all users"</string>
+    <string name="install_text" msgid="884360662922471113">"Install"</string>
+    <string name="disable_text" msgid="6544054052049395202">"Disable"</string>
+    <string name="enable_text" msgid="9217362512327828987">"Enable"</string>
+    <string name="clear_user_data_text" msgid="5597622864770098388">"Clear data"</string>
+    <string name="app_factory_reset" msgid="6635744722502563022">"Uninstall updates"</string>
+    <string name="auto_launch_enable_text" msgid="4275746249511874845">"You\'ve chosen to launch this app by default for some actions."</string>
+    <string name="always_allow_bind_appwidgets_text" msgid="566822577792032925">"You\'ve chosen to allow this app to create widgets and access their data."</string>
+    <string name="auto_launch_disable_text" msgid="7800385822185540166">"No defaults set."</string>
+    <string name="clear_activities" msgid="7408923511535174430">"Clear defaults"</string>
+    <string name="screen_compatibility_text" msgid="1616155457673106022">"This app may not be designed for your screen. You can control how it adjusts to your screen here."</string>
+    <string name="ask_compatibility" msgid="7225195569089607846">"Ask when launched"</string>
+    <string name="enable_compatibility" msgid="5806819252068617811">"Scale app"</string>
+    <string name="unknown" msgid="1592123443519355854">"Unknown"</string>
+    <string name="sort_order_alpha" msgid="1410278099123670628">"Sort by name"</string>
+    <string name="sort_order_size" msgid="7024513286636502362">"Sort by size"</string>
+    <string name="show_running_services" msgid="5736278767975544570">"Show running services"</string>
+    <string name="show_background_processes" msgid="2009840211972293429">"Show cached processes"</string>
+    <string name="default_emergency_app" msgid="1951760659640369980">"Emergency app"</string>
+    <string name="reset_app_preferences" msgid="1321050641018356925">"Reset app preferences"</string>
+    <string name="reset_app_preferences_title" msgid="6093179367325336662">"Reset app preferences?"</string>
+    <string name="reset_app_preferences_desc" msgid="4822447731869201512">"This will reset all preferences for:\n\n "<li>"Disabled apps"</li>\n" "<li>"Disabled app notifications"</li>\n" "<li>"Default applications for actions"</li>\n" "<li>"Background data restrictions for apps"</li>\n" "<li>"Any permission restrictions"</li>\n\n" You will not lose any app data."</string>
+    <string name="reset_app_preferences_button" msgid="2559089511841281242">"Reset apps"</string>
+    <string name="manage_space_text" msgid="8852711522447794676">"Manage space"</string>
+    <string name="filter" msgid="2018011724373033887">"Filter"</string>
+    <string name="filter_dlg_title" msgid="8693024463731076091">"Choose filter options"</string>
+    <string name="filter_apps_all" msgid="8899612398848280352">"All apps"</string>
+    <string name="filter_apps_disabled" msgid="5862632369555319938">"Disabled apps"</string>
+    <string name="filter_apps_third_party" msgid="7786348047690140979">"Downloaded"</string>
+    <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="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>
+    <string name="internal_storage" msgid="1584700623164275282">"Internal storage"</string>
+    <string name="internal_storage_sentence" msgid="889098931914857143">"internal storage"</string>
+    <string name="sd_card_storage" product="nosdcard" msgid="2673203150465132465">"USB storage"</string>
+    <string name="sd_card_storage" product="default" msgid="7623513618171928235">"SD card storage"</string>
+    <string name="recompute_size" msgid="7722567982831691718">"Recomputing size…"</string>
+    <string name="clear_data_dlg_title" msgid="5605258400134511197">"Delete app data?"</string>
+    <string name="clear_data_dlg_text" msgid="3951297329833822490">"All of this app\'s data will be deleted permanently. This includes all files, settings, accounts, databases, etc."</string>
+    <string name="dlg_ok" msgid="2402639055725653590">"OK"</string>
+    <string name="dlg_cancel" msgid="1674753358972975911">"Cancel"</string>
+    <string name="app_not_found_dlg_title" msgid="3127123411738434964"></string>
+    <string name="app_not_found_dlg_text" msgid="4893589904687340011">"The app wasn\'t found in the list of installed apps."</string>
+    <string name="clear_data_failed" msgid="7214074331627422248">"Couldn\'t clear app data."</string>
+    <string name="clear_failed_dlg_title" msgid="2387060805294783175">"Clear data"</string>
+    <string name="clear_failed_dlg_text" msgid="5464475937929941008">"Couldn\'t clear data for app."</string>
+    <string name="security_settings_desc" product="tablet" msgid="1292421279262430109">"This app can access the following on your tablet:"</string>
+    <string name="security_settings_desc" product="default" msgid="61749028818785244">"This app can access the following on your phone:"</string>
+    <string name="security_settings_desc_multi" product="tablet" msgid="7300932212437084403">"This app can access the following on your tablet. In order to improve performance and reduce memory usage, some of these permissions are available to <xliff:g id="BASE_APP_NAME">%1$s</xliff:g> because it runs in the same process as <xliff:g id="ADDITIONAL_APPS_LIST">%2$s</xliff:g>:"</string>
+    <string name="security_settings_desc_multi" product="default" msgid="6610268420793984752">"This app can access the following on your phone. In order to improve performance and reduce memory usage, some of these permissions are available to <xliff:g id="BASE_APP_NAME">%1$s</xliff:g> because it runs in the same process as <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> and <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> and <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">"This app may charge you money:"</string>
+    <string name="security_settings_premium_sms_desc" msgid="8734171334263713717">"Send premium SMS"</string>
+    <string name="computing_size" msgid="1599186977475211186">"Computing…"</string>
+    <string name="invalid_size_value" msgid="1582744272718752951">"Couldn\'t compute the package size."</string>
+    <string name="empty_list_msg" msgid="3552095537348807772">"You don\'t have any third-party apps installed."</string>
+    <string name="version_text" msgid="9189073826278676425">"Version <xliff:g id="VERSION_NUM">%1$s</xliff:g>"</string>
+    <string name="move_app" msgid="5042838441401731346">"Move"</string>
+    <string name="move_app_to_internal" product="tablet" msgid="2299714147283854957">"Move to tablet"</string>
+    <string name="move_app_to_internal" product="default" msgid="3895430471913858185">"Move to phone"</string>
+    <string name="move_app_to_sdcard" product="nosdcard" msgid="4350451696315265420">"Move to USB storage"</string>
+    <string name="move_app_to_sdcard" product="default" msgid="1143379049903056407">"Move to SD card"</string>
+    <string name="moving" msgid="6431016143218876491">"Moving"</string>
+    <string name="another_migration_already_in_progress" msgid="7817354268848365487">"Another migration is already in progress."</string>
+    <string name="insufficient_storage" msgid="481763122991093080">"Not enough storage space."</string>
+    <string name="does_not_exist" msgid="1501243985586067053">"App doesn\'t exist."</string>
+    <string name="app_forward_locked" msgid="6331564656683790866">"App is copy-protected."</string>
+    <string name="invalid_location" msgid="4354595459063675191">"Install location isn\'t valid."</string>
+    <string name="system_package" msgid="1352722848400644991">"System updates cannot be installed on external media."</string>
+    <string name="move_error_device_admin" msgid="8673026002690505763">"Device admin app can\'t be installed on external media"</string>
+    <string name="force_stop_dlg_title" msgid="977530651470711366">"Force stop?"</string>
+    <string name="force_stop_dlg_text" msgid="7208364204467835578">"If you force-stop an app, it may misbehave."</string>
+    <string name="move_app_failed_dlg_title" msgid="1282561064082384192"></string>
+    <string name="move_app_failed_dlg_text" msgid="187885379493011720">"Couldn\'t move app. <xliff:g id="REASON">%1$s</xliff:g>"</string>
+    <string name="app_install_location_title" msgid="2068975150026852168">"Preferred install location"</string>
+    <string name="app_install_location_summary" msgid="5155453752692959098">"Change the preferred installation location for new applications."</string>
+    <string name="app_disable_dlg_title" msgid="3916469657537695436">"Disable built-in app?"</string>
+    <string name="app_disable_dlg_positive" msgid="7375627244201714263">"Disable app"</string>
+    <string name="app_disable_dlg_text" msgid="5632072173181990531">"If you disable this app, Android and other apps may no longer function as intended."</string>
+    <string name="app_special_disable_dlg_title" msgid="2690148680327142674">"Delete data and disable app?"</string>
+    <string name="app_special_disable_dlg_text" msgid="5832078825810635913">"If you disable this app, Android and other apps may no longer function as intended. Your data will also be deleted."</string>
+    <string name="app_disable_notifications_dlg_title" msgid="7669264654851761857">"Turn off notifications"</string>
+    <string name="app_disable_notifications_dlg_text" msgid="5088484670924769845">"If you turn off notifications for this app, you may miss important alerts and updates."</string>
+    <string name="app_install_details_group_title" msgid="7084623031296083574">"Store"</string>
+    <string name="app_install_details_title" msgid="6905279702654975207">"App details"</string>
+    <string name="app_install_details_summary" msgid="6464796332049327547">"App installed from <xliff:g id="APP_STORE">%1$s</xliff:g>"</string>
+    <string name="instant_app_details_summary" msgid="4529934403276907045">"More info on <xliff:g id="APP_STORE">%1$s</xliff:g>"</string>
+    <string name="app_ops_settings" msgid="5108481883575527511">"App ops"</string>
+    <string name="app_ops_running" msgid="7706949900637284122">"Running"</string>
+    <string name="app_ops_never_used" msgid="9114608022906887802">"(Never used)"</string>
+    <string name="no_default_apps" msgid="2915315663141025400">"No default Apps."</string>
+    <string name="storageuse_settings_title" msgid="5657014373502630403">"Storage use"</string>
+    <string name="storageuse_settings_summary" msgid="3748286507165697834">"View storage used by apps"</string>
+    <string name="service_restarting" msgid="2242747937372354306">"Restarting"</string>
+    <string name="cached" msgid="1059590879740175019">"Cached background process"</string>
+    <string name="no_running_services" msgid="2059536495597645347">"Nothing running."</string>
+    <string name="service_started_by_app" msgid="818675099014723551">"Started by app."</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> free"</string>
+    <string name="service_foreground_processes" msgid="7583975676795574276">"<xliff:g id="MEMORY">%1$s</xliff:g> used"</string>
+    <string name="memory" msgid="6609961111091483458">"RAM"</string>
+    <!-- no translation found for service_process_name (4098932168654826656) -->
+    <skip />
+    <string name="running_process_item_user_label" msgid="3129887865552025943">"User: <xliff:g id="USER_NAME">%1$s</xliff:g>"</string>
+    <string name="running_process_item_removed_user_label" msgid="8250168004291472959">"Removed user"</string>
+    <string name="running_processes_item_description_s_s" msgid="5790575965282023145">"<xliff:g id="NUMPROCESS">%1$d</xliff:g> process and <xliff:g id="NUMSERVICES">%2$d</xliff:g> service"</string>
+    <string name="running_processes_item_description_s_p" msgid="8019860457123222953">"<xliff:g id="NUMPROCESS">%1$d</xliff:g> process and <xliff:g id="NUMSERVICES">%2$d</xliff:g> services"</string>
+    <string name="running_processes_item_description_p_s" msgid="744424668287252915">"<xliff:g id="NUMPROCESS">%1$d</xliff:g> processes and <xliff:g id="NUMSERVICES">%2$d</xliff:g> service"</string>
+    <string name="running_processes_item_description_p_p" msgid="1607384595790852782">"<xliff:g id="NUMPROCESS">%1$d</xliff:g> processes and <xliff:g id="NUMSERVICES">%2$d</xliff:g> services"</string>
+    <string name="running_processes_header_title" msgid="6588371727640789560">"Device memory"</string>
+    <string name="running_processes_header_footer" msgid="723908176275428442">"App RAM usage"</string>
+    <string name="running_processes_header_system_prefix" msgid="6104153299581682047">"System"</string>
+    <string name="running_processes_header_apps_prefix" msgid="5787594452716832727">"Apps"</string>
+    <string name="running_processes_header_free_prefix" msgid="4620613031737078415">"Free"</string>
+    <string name="running_processes_header_used_prefix" msgid="5924288703085123978">"Used"</string>
+    <string name="running_processes_header_cached_prefix" msgid="7950853188089434987">"Cached"</string>
+    <string name="running_processes_header_ram" msgid="996092388884426817">"<xliff:g id="RAM_0">%1$s</xliff:g> of RAM"</string>
+    <string name="runningservicedetails_settings_title" msgid="3224004818524731568">"Running app"</string>
+    <string name="no_services" msgid="7133900764462288263">"Not active"</string>
+    <string name="runningservicedetails_services_title" msgid="391168243725357375">"Services"</string>
+    <string name="runningservicedetails_processes_title" msgid="928115582044655268">"Processes"</string>
+    <string name="service_stop" msgid="6369807553277527248">"Stop"</string>
+    <string name="service_manage" msgid="1876642087421959194">"Settings"</string>
+    <string name="service_stop_description" msgid="9146619928198961643">"This service was started by its app. Stopping it may cause the app to fail."</string>
+    <string name="heavy_weight_stop_description" msgid="6050413065144035971">"This app can\'t be stopped safely. If you stop it, you may lose some of your current work."</string>
+    <string name="background_process_stop_description" msgid="3834163804031287685">"This is an old app process that is still running in case it\'s needed again. There is usually no reason to stop it."</string>
+    <string name="service_manage_description" msgid="479683614471552426">"<xliff:g id="CLIENT_NAME">%1$s</xliff:g>: currently in use. Tap Settings to control it."</string>
+    <string name="main_running_process_description" msgid="1130702347066340890">"Main process in use."</string>
+    <string name="process_service_in_use_description" msgid="8993335064403217080">"Service <xliff:g id="COMP_NAME">%1$s</xliff:g> is in use."</string>
+    <string name="process_provider_in_use_description" msgid="5586603325677678940">"Provider <xliff:g id="COMP_NAME">%1$s</xliff:g> is in use."</string>
+    <string name="runningservicedetails_stop_dlg_title" msgid="4253292537154337233">"Stop system service?"</string>
+    <string name="runningservicedetails_stop_dlg_text" product="tablet" msgid="3371302398335665793">"If you stop this service, some features of your tablet may stop working correctly until you turn it off and then on again."</string>
+    <string name="runningservicedetails_stop_dlg_text" product="default" msgid="3920243762189484756">"If you stop this service, some features of your phone may stop working correctly until you turn it off and then on again."</string>
+    <string name="language_input_gesture_title" msgid="8749227808244881255">"Languages, input &amp; gestures"</string>
+    <string name="language_input_gesture_summary_on_with_assist" msgid="7219895055450633449"></string>
+    <string name="language_input_gesture_summary_on_non_assist" msgid="756147879200943161"></string>
+    <string name="language_input_gesture_summary_off" msgid="4617198819416948217"></string>
+    <string name="language_settings" msgid="8758655933029560944">"Languages &amp; input"</string>
+    <string name="language_keyboard_settings_title" msgid="3709159207482544398">"Languages &amp; input"</string>
+    <string name="input_assistance" msgid="7577795275222555487">"Input assistance"</string>
+    <string name="keyboard_settings_category" msgid="8275523930352487827">"Keyboard &amp; input methods"</string>
+    <string name="phone_language" msgid="7116581601133118044">"Languages"</string>
+    <string name="phone_language_summary" msgid="3871309445655554211"></string>
+    <string name="auto_replace" msgid="6199184757891937822">"Auto-replace"</string>
+    <string name="auto_replace_summary" msgid="370288728200084466">"Correct mistyped words"</string>
+    <string name="auto_caps" msgid="6379232078052591265">"Auto-capitalisation"</string>
+    <string name="auto_caps_summary" msgid="6358102538315261466">"Capitalise first letter in sentences"</string>
+    <string name="auto_punctuate" msgid="4595367243950425833">"Auto-punctuate"</string>
+    <string name="hardkeyboard_category" msgid="5957168411305769899">"Physical keyboard settings"</string>
+    <string name="auto_punctuate_summary" msgid="4372126865670574837">"Press Space key twice to insert \".\""</string>
+    <string name="show_password" msgid="4837897357002495384">"Show passwords"</string>
+    <string name="show_password_summary" msgid="3365397574784829969">"Display characters briefly as you type"</string>
+    <string name="spellchecker_security_warning" msgid="9060897418527708922">"This spell checker may be able to collect all the text that you type, including personal data like passwords and credit card numbers. It comes from the app <xliff:g id="SPELLCHECKER_APPLICATION_NAME">%1$s</xliff:g>. Use this spell checker?"</string>
+    <string name="spellchecker_quick_settings" msgid="246728645150092058">"Settings"</string>
+    <string name="spellchecker_language" msgid="6041050114690541437">"Language"</string>
+    <string name="keyboard_and_input_methods_category" msgid="6035224122054465137">"Keyboard &amp; inputs"</string>
+    <string name="virtual_keyboard_category" msgid="1012830752318677119">"Virtual keyboard"</string>
+    <string name="available_virtual_keyboard_category" msgid="7645766574969139819">"Available virtual keyboard"</string>
+    <string name="add_virtual_keyboard" msgid="3302152381456516928">"Manage keyboards"</string>
+    <string name="keyboard_assistance_category" msgid="5843634175231134014">"Keyboard assistance"</string>
+    <string name="physical_keyboard_title" msgid="8285149877925752042">"Physical keyboard"</string>
+    <string name="show_ime" msgid="2658582193437188227">"Show virtual keyboard"</string>
+    <string name="show_ime_summary" msgid="8164993045923240698">"Keep it on screen while physical keyboard is active"</string>
+    <string name="keyboard_shortcuts_helper" msgid="4839453720463798145">"Keyboard shortcuts helper"</string>
+    <string name="keyboard_shortcuts_helper_summary" msgid="5871299901459743288">"Display available shortcuts"</string>
+    <string name="default_keyboard_layout" msgid="4172606673510531271">"Default"</string>
+    <string name="pointer_speed" msgid="1221342330217861616">"Pointer speed"</string>
+    <string name="game_controller_settings_category" msgid="8794508575329923718">"Game Controller"</string>
+    <string name="vibrate_input_devices" msgid="2599591466928793082">"Use vibrator"</string>
+    <string name="vibrate_input_devices_summary" msgid="4595570516865299153">"Redirect vibrator to game controller when connected."</string>
+    <string name="keyboard_layout_dialog_title" msgid="8030087214949381372">"Choose keyboard layout"</string>
+    <string name="keyboard_layout_dialog_setup_button" msgid="8514583747236476384">"Set up keyboard layouts"</string>
+    <string name="keyboard_layout_dialog_switch_hint" msgid="3889961090676293795">"To switch, press Control-Spacebar"</string>
+    <string name="keyboard_layout_default_label" msgid="2952672513543482165">"Default"</string>
+    <string name="keyboard_layout_picker_title" msgid="556081931972771610">"Keyboard layouts"</string>
+    <string name="user_dict_settings_title" msgid="3427169369758733521">"Personal dictionary"</string>
+    <string name="user_dict_settings_summary" msgid="7965571192902870454"></string>
+    <string name="user_dict_settings_add_menu_title" msgid="4056762757149923551">"Add"</string>
+    <string name="user_dict_settings_add_dialog_title" msgid="4702613990174126482">"Add to dictionary"</string>
+    <string name="user_dict_settings_add_screen_title" msgid="742580720124344291">"Phrase"</string>
+    <string name="user_dict_settings_add_dialog_more_options" msgid="8848798370746019825">"More options"</string>
+    <string name="user_dict_settings_add_dialog_less_options" msgid="2441785268726036101">"Fewer options"</string>
+    <string name="user_dict_settings_add_dialog_confirm" msgid="6225823625332416144">"OK"</string>
+    <string name="user_dict_settings_add_word_option_name" msgid="7868879174905963135">"Word:"</string>
+    <string name="user_dict_settings_add_shortcut_option_name" msgid="660089258866063925">"Shortcut:"</string>
+    <string name="user_dict_settings_add_locale_option_name" msgid="5696358317061318532">"Language:"</string>
+    <string name="user_dict_settings_add_word_hint" msgid="5725254076556821247">"Type a word"</string>
+    <string name="user_dict_settings_add_shortcut_hint" msgid="7333763456561873445">"Optional shortcut"</string>
+    <string name="user_dict_settings_edit_dialog_title" msgid="8967476444840548674">"Edit word"</string>
+    <string name="user_dict_settings_context_menu_edit_title" msgid="2210564879320004837">"Edit"</string>
+    <string name="user_dict_settings_context_menu_delete_title" msgid="9140703913776549054">"Delete"</string>
+    <string name="user_dict_settings_empty_text" msgid="1971969756133074922">"You don’t have any words in the user dictionary. To add a word, tap the Add (+) button."</string>
+    <string name="user_dict_settings_all_languages" msgid="6742000040975959247">"For all languages"</string>
+    <string name="user_dict_settings_more_languages" msgid="7316375944684977910">"More languages…"</string>
+    <string name="testing" msgid="6584352735303604146">"Testing"</string>
+    <string name="testing_phone_info" product="tablet" msgid="193561832258534798">"Tablet information"</string>
+    <string name="testing_phone_info" product="default" msgid="8656693364332840056">"Phone information"</string>
+    <string name="input_methods_settings_title" msgid="6800066636850553887">"Text input"</string>
+    <string name="input_method" msgid="5434026103176856164">"Input method"</string>
+    <string name="current_input_method" msgid="2636466029213488159">"Current Keyboard"</string>
+    <string name="input_method_selector" msgid="4311213129681430709">"Input method selector"</string>
+    <string name="input_method_selector_show_automatically_title" msgid="1001612945471546158">"Automatic"</string>
+    <string name="input_method_selector_always_show_title" msgid="3891824124222371634">"Always show"</string>
+    <string name="input_method_selector_always_hide_title" msgid="7699647095118680424">"Always hide"</string>
+    <string name="configure_input_method" msgid="1317429869771850228">"Set up input methods"</string>
+    <string name="input_method_settings" msgid="5801295625486269553">"Settings"</string>
+    <string name="input_method_settings_button" msgid="6778344383871619368">"Settings"</string>
+    <string name="input_methods_settings_label_format" msgid="6002887604815693322">"<xliff:g id="IME_NAME">%1$s</xliff:g> Settings"</string>
+    <string name="input_methods_and_subtype_enabler_title" msgid="4421813273170250462">"Choose active input methods"</string>
+    <string name="onscreen_keyboard_settings_summary" msgid="5841558383556238653">"On-screen keyboard settings"</string>
+    <string name="builtin_keyboard_settings_title" msgid="7688732909551116798">"Physical keyboard"</string>
+    <string name="builtin_keyboard_settings_summary" msgid="2392531685358035899">"Physical keyboard settings"</string>
+    <string name="gadget_picker_title" msgid="98374951396755811">"Choose gadget"</string>
+    <string name="widget_picker_title" msgid="9130684134213467557">"Choose widget"</string>
+    <string name="allow_bind_app_widget_activity_allow_bind_title" msgid="2538303018392590627">"Create widget and allow access?"</string>
+    <string name="allow_bind_app_widget_activity_allow_bind" msgid="1584388129273282080">"After you create the widget, <xliff:g id="WIDGET_HOST_NAME">%1$s</xliff:g> can access all the data that it displays."</string>
+    <string name="allow_bind_app_widget_activity_always_allow_bind" msgid="7037503685859688034">"Always allow <xliff:g id="WIDGET_HOST_NAME">%1$s</xliff:g> to create widgets and access their data"</string>
+    <string name="usage_stats_label" msgid="5890846333487083609">"Usage statistics"</string>
+    <string name="testing_usage_stats" msgid="7823048598893937339">"Usage statistics"</string>
+    <string name="display_order_text" msgid="8592776965827565271">"Sort by:"</string>
+    <string name="app_name_label" msgid="5440362857006046193">"App"</string>
+    <string name="last_time_used_label" msgid="8459441968795479307">"Last time used"</string>
+    <string name="usage_time_label" msgid="295954901452833058">"Usage time"</string>
+    <string name="accessibility_settings" msgid="3975902491934816215">"Accessibility"</string>
+    <string name="accessibility_settings_title" msgid="2130492524656204459">"Accessibility settings"</string>
+    <string name="accessibility_settings_summary" msgid="981260486011624939">"Screen readers, display, interaction controls"</string>
+    <string name="vision_settings_title" msgid="4204111425716868288">"Vision settings"</string>
+    <string name="vision_settings_description" msgid="5679491180156408260">"You can customise this device to fit your needs. These accessibility features can be changed later in Settings."</string>
+    <string name="vision_settings_suggestion_title" msgid="8058794060304707004">"Change font size"</string>
+    <string name="screen_reader_category_title" msgid="7739154903913400641">"Screen readers"</string>
+    <string name="audio_and_captions_category_title" msgid="3420727114421447524">"Audio &amp; on-screen text"</string>
+    <string name="display_category_title" msgid="685461049938269166">"Display"</string>
+    <string name="interaction_control_category_title" msgid="7836591031872839151">"Interaction controls"</string>
+    <string name="user_installed_services_category_title" msgid="6426376488922158647">"Downloaded services"</string>
+    <string name="experimental_category_title" msgid="5272318666666893547">"Experimental"</string>
+    <string name="talkback_title" msgid="7912059827205988080">"Talkback"</string>
+    <string name="talkback_summary" msgid="8331244650729024963">"Screen reader primarily for people with blindness and low vision"</string>
+    <string name="select_to_speak_summary" msgid="4282846695497544515">"Tap items on your screen to hear them read aloud"</string>
+    <string name="accessibility_captioning_title" msgid="7589266662024836291">"Captions"</string>
+    <string name="accessibility_screen_magnification_title" msgid="6001128808776506021">"Magnification"</string>
+    <string name="accessibility_screen_magnification_gestures_title" msgid="3719929521571489913">"Magnify with triple-tap"</string>
+    <string name="accessibility_screen_magnification_navbar_title" msgid="7141753038957538230">"Magnify with button"</string>
+    <string name="accessibility_screen_magnification_state_navbar_gesture" msgid="2760906043221923793">"Magnify with button &amp; triple-tap"</string>
+    <string name="accessibility_preference_magnification_summary" msgid="5867883657521404509">"Zoom in on screen"</string>
+    <string name="accessibility_screen_magnification_short_summary" msgid="3411979839172752057">"Tap 3 times to zoom"</string>
+    <string name="accessibility_screen_magnification_navbar_short_summary" msgid="3693116360267980492">"Tap a button to zoom"</string>
+    <string name="accessibility_screen_magnification_summary" msgid="5258868553337478505"><b>"To zoom"</b>", quickly tap the screen 3 times.\n"<ul><li>"Drag 2 or more fingers to scroll"</li>\n<li>"Pinch 2 or more fingers to adjust zoom"</li></ul>\n\n<b>"To zoom temporarily"</b>", quickly tap the screen 3 times and hold down your finger on the third tap.\n"<ul><li>"Drag to move around the screen"</li>\n<li>"Lift finger to zoom out"</li></ul>\n\n"You can\'t zoom in on the keyboard and navigation bar."</string>
+    <string name="accessibility_screen_magnification_navbar_summary" msgid="1996584694050087161">"When magnification is turned on, use the Accessibility button at the bottom of the screen to quickly magnify.\n\n"<b>"To zoom"</b>", tap the Accessibility button, then tap anywhere on the screen.\n"<ul><li>"Drag 2 or more fingers to scroll"</li>\n<li>"Pinch 2 or more fingers to adjust zoom"</li></ul>\n\n<b>"To zoom temporarily"</b>", tap the Accessibility button, then touch &amp; hold anywhere on the screen.\n"<ul><li>"Drag to move around the screen"</li>\n<li>"Lift finger to zoom out"</li></ul>\n\n"You can’t zoom in on the keyboard or navigation bar."</string>
+    <string name="accessibility_screen_magnification_navbar_configuration_warning" msgid="70533120652758190">"The accessibility button is set to <xliff:g id="SERVICE">%1$s</xliff:g>. To use magnification, touch &amp; hold the accessibility button, then select magnification."</string>
+    <string name="accessibility_global_gesture_preference_title" msgid="2048884356166982714">"Volume key shortcut"</string>
+    <string name="accessibility_shortcut_service_title" msgid="4779360749706905640">"Shortcut service"</string>
+    <string name="accessibility_shortcut_service_on_lock_screen_title" msgid="5490636079625489534">"Allow from lock screen"</string>
+    <string name="accessibility_shortcut_description" msgid="1765853731190717372">"When the shortcut is on, you can press both volume keys for 3 seconds to start an accessibility feature."</string>
+    <string name="accessibility_toggle_high_text_contrast_preference_title" msgid="2567402942683463779">"High-contrast text"</string>
+    <string name="accessibility_toggle_screen_magnification_auto_update_preference_title" msgid="7218498768415430963">"Auto update screen magnification"</string>
+    <string name="accessibility_toggle_screen_magnification_auto_update_preference_summary" msgid="4392059334816220155">"Update screen magnification on app transitions"</string>
+    <string name="accessibility_power_button_ends_call_prerefence_title" msgid="6673851944175874235">"Power button ends call"</string>
+    <string name="accessibility_toggle_large_pointer_icon_title" msgid="535173100516295580">"Large mouse cursor"</string>
+    <string name="accessibility_toggle_master_mono_title" msgid="4363806997971905302">"Mono audio"</string>
+    <string name="accessibility_toggle_master_mono_summary" msgid="5634277025251530927">"Combine channels when playing audio"</string>
+    <string name="accessibility_long_press_timeout_preference_title" msgid="6708467774619266508">"Touch &amp; hold delay"</string>
+    <string name="accessibility_display_inversion_preference_title" msgid="2119647786141420802">"Colour inversion"</string>
+    <string name="accessibility_display_inversion_preference_subtitle" msgid="7052959202195368109">"May affect performance"</string>
+    <string name="accessibility_autoclick_preference_title" msgid="7014499339068449623">"Click after cursor stops moving"</string>
+    <string name="accessibility_autoclick_delay_preference_title" msgid="3962261178385106006">"Delay before click"</string>
+    <string name="accessibility_summary_state_enabled" msgid="8359913912320966304">"ON"</string>
+    <string name="accessibility_summary_state_disabled" msgid="2241315620132005595">"OFF"</string>
+    <string name="enable_quick_setting" msgid="2366999897816894536">"Show in Quick Settings"</string>
+    <string name="daltonizer_type" msgid="1124178250809091080">"Correction mode"</string>
+    <plurals name="accessibilty_autoclick_preference_subtitle_extremely_short_delay" formatted="false" msgid="7340347830562315800">
+      <item quantity="other">Extremely short delay (<xliff:g id="CLICK_DELAY_LABEL_1">%1$d</xliff:g> ms)</item>
+      <item quantity="one">Extremely short delay (<xliff:g id="CLICK_DELAY_LABEL_0">%1$d</xliff:g> ms)</item>
+    </plurals>
+    <plurals name="accessibilty_autoclick_preference_subtitle_very_short_delay" formatted="false" msgid="5589565607652364932">
+      <item quantity="other">Very short delay (<xliff:g id="CLICK_DELAY_LABEL_1">%1$d</xliff:g> ms)</item>
+      <item quantity="one">Very short delay (<xliff:g id="CLICK_DELAY_LABEL_0">%1$d</xliff:g> ms)</item>
+    </plurals>
+    <plurals name="accessibilty_autoclick_preference_subtitle_short_delay" formatted="false" msgid="5887754135102768400">
+      <item quantity="other">Short delay (<xliff:g id="CLICK_DELAY_LABEL_1">%1$d</xliff:g> ms)</item>
+      <item quantity="one">Short delay (<xliff:g id="CLICK_DELAY_LABEL_0">%1$d</xliff:g> ms)</item>
+    </plurals>
+    <plurals name="accessibilty_autoclick_preference_subtitle_long_delay" formatted="false" msgid="6340683412750219405">
+      <item quantity="other">Long delay (<xliff:g id="CLICK_DELAY_LABEL_1">%1$d</xliff:g> ms)</item>
+      <item quantity="one">Long delay (<xliff:g id="CLICK_DELAY_LABEL_0">%1$d</xliff:g> ms)</item>
+    </plurals>
+    <plurals name="accessibilty_autoclick_preference_subtitle_very_long_delay" formatted="false" msgid="3503199424330634970">
+      <item quantity="other">Very long delay (<xliff:g id="CLICK_DELAY_LABEL_1">%1$d</xliff:g> ms)</item>
+      <item quantity="one">Very long delay (<xliff:g id="CLICK_DELAY_LABEL_0">%1$d</xliff:g> ms)</item>
+    </plurals>
+    <string name="accessibility_menu_item_settings" msgid="3344942964710773365">"Settings"</string>
+    <string name="accessibility_feature_state_on" msgid="2864292320042673806">"On"</string>
+    <string name="accessibility_feature_state_off" msgid="4172584906487070211">"Off"</string>
+    <string name="captioning_preview_title" msgid="1234015253497016890">"Preview"</string>
+    <string name="captioning_standard_options_title" msgid="3284211791180335844">"Standard options"</string>
+    <string name="captioning_locale" msgid="4559155661018823503">"Language"</string>
+    <string name="captioning_text_size" msgid="6737002449104466028">"Text size"</string>
+    <string name="captioning_preset" msgid="8939737196538429044">"Caption style"</string>
+    <string name="captioning_custom_options_title" msgid="5067500939930322405">"Customisation options"</string>
+    <string name="captioning_background_color" msgid="9053011212948992570">"Background colour"</string>
+    <string name="captioning_background_opacity" msgid="6029993616419971202">"Background opacity"</string>
+    <string name="captioning_window_color" msgid="6902052743419717394">"Caption window colour"</string>
+    <string name="captioning_window_opacity" msgid="5041556024849862376">"Caption window opacity"</string>
+    <string name="captioning_foreground_color" msgid="85623486537640059">"Text colour"</string>
+    <string name="captioning_foreground_opacity" msgid="4370967856995419788">"Text opacity"</string>
+    <string name="captioning_edge_color" msgid="3670094753735263238">"Edge colour"</string>
+    <string name="captioning_edge_type" msgid="5997247394951682154">"Edge type"</string>
+    <string name="captioning_typeface" msgid="1826169240566563259">"Font family"</string>
+    <string name="captioning_preview_text" msgid="4067935959797375065">"Captions will look like this"</string>
+    <string name="captioning_preview_characters" msgid="7105909138497851769">"Aa"</string>
+    <string name="locale_default" msgid="2593883646136326969">"Default"</string>
+    <string name="color_title" msgid="4258931051732243983">"Colour"</string>
+    <string name="color_unspecified" msgid="5179683785413568326">"Default"</string>
+    <string name="color_none" msgid="3475640044925814795">"None"</string>
+    <string name="color_white" msgid="8045195170201590239">"White"</string>
+    <string name="color_gray" msgid="9192312087142726313">"Grey"</string>
+    <string name="color_black" msgid="7517353520909872561">"Black"</string>
+    <string name="color_red" msgid="4949354900304125428">"Red"</string>
+    <string name="color_green" msgid="5537717328428845841">"Green"</string>
+    <string name="color_blue" msgid="7731984529016953223">"Blue"</string>
+    <string name="color_cyan" msgid="7033027180641173211">"Cyan"</string>
+    <string name="color_yellow" msgid="9112680561610873529">"Yellow"</string>
+    <string name="color_magenta" msgid="5059212823607815549">"Magenta"</string>
+    <string name="enable_service_title" msgid="3061307612673835592">"Use <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
+    <string name="capabilities_list_title" msgid="86713361724771971">"<xliff:g id="SERVICE">%1$s</xliff:g> needs to:"</string>
+    <string name="touch_filtered_warning" msgid="8644034725268915030">"Because an app is obscuring a permission request, Settings can’t verify your response."</string>
+    <string name="enable_service_encryption_warning" msgid="3064686622453974606">"If you turn on <xliff:g id="SERVICE">%1$s</xliff:g>, your device won’t use your screen lock to enhance data encryption."</string>
+    <string name="secure_lock_encryption_warning" msgid="460911459695077779">"Because you\'ve turned on an accessibility service, your device won’t use your screen lock to enhance data encryption."</string>
+    <string name="enable_service_pattern_reason" msgid="777577618063306751">"Because turning on <xliff:g id="SERVICE">%1$s</xliff:g> affects data encryption, you need to confirm your pattern."</string>
+    <string name="enable_service_pin_reason" msgid="7882035264853248228">"Because turning on <xliff:g id="SERVICE">%1$s</xliff:g> affects data encryption, you need to confirm your PIN."</string>
+    <string name="enable_service_password_reason" msgid="1224075277603097951">"Because turning on <xliff:g id="SERVICE">%1$s</xliff:g> affects data encryption, you need to confirm your password."</string>
+    <string name="capability_title_receiveAccessibilityEvents" msgid="1869032063969970755">"Observe your actions"</string>
+    <string name="capability_desc_receiveAccessibilityEvents" msgid="6640333613848713883">"Receive notifications when you\'re interacting with an app."</string>
+    <string name="disable_service_title" msgid="3624005212728512896">"Stop <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
+    <string name="disable_service_message" msgid="2247101878627941561">"Tapping OK will stop <xliff:g id="SERVICE">%1$s</xliff:g>."</string>
+    <string name="accessibility_no_services_installed" msgid="7200948194639038807">"No services installed"</string>
+    <string name="accessibility_no_service_selected" msgid="2840969718780083998">"No service selected"</string>
+    <string name="accessibility_service_default_description" msgid="1072730037861494125">"No description provided."</string>
+    <string name="settings_button" msgid="3006713718908152930">"Settings"</string>
+    <string name="print_settings" msgid="4742428530112487843">"Printing"</string>
+    <string name="print_settings_summary_no_service" msgid="6354322414246865875">"Off"</string>
+    <plurals name="print_settings_summary" formatted="false" msgid="6005468025646083029">
+      <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>
+    <string name="print_menu_item_settings" msgid="6591330373682227082">"Settings"</string>
+    <string name="print_menu_item_add_printers" msgid="2890738028215834012">"Add printers"</string>
+    <string name="print_feature_state_on" msgid="8098901852502441048">"On"</string>
+    <string name="print_feature_state_off" msgid="7294876968403966040">"Off"</string>
+    <string name="print_menu_item_add_service" msgid="3811645167869797802">"Add service"</string>
+    <string name="print_menu_item_add_printer" msgid="8251218970577291032">"Add printer"</string>
+    <string name="print_menu_item_search" msgid="7025589328240514553">"Search"</string>
+    <string name="print_searching_for_printers" msgid="4680248496457576358">"Searching for printers"</string>
+    <string name="print_service_disabled" msgid="7739452396114245222">"Service disabled"</string>
+    <string name="print_print_jobs" msgid="3582094777756968793">"Print jobs"</string>
+    <string name="print_print_job" msgid="7563741676053287211">"Print job"</string>
+    <string name="print_restart" msgid="8373999687329384202">"Restart"</string>
+    <string name="print_cancel" msgid="3621199386568672235">"Cancel"</string>
+    <string name="print_job_summary" msgid="8472427347192930694">"<xliff:g id="PRINTER">%1$s</xliff:g>\n<xliff:g id="TIME">%2$s</xliff:g>"</string>
+    <string name="print_printing_state_title_template" msgid="5736107667714582025">"Printing <xliff:g id="PRINT_JOB_NAME">%1$s</xliff:g>"</string>
+    <string name="print_cancelling_state_title_template" msgid="7102968925358219875">"Cancelling <xliff:g id="PRINT_JOB_NAME">%1$s</xliff:g>"</string>
+    <string name="print_failed_state_title_template" msgid="1436099128973357969">"Printer error <xliff:g id="PRINT_JOB_NAME">%1$s</xliff:g>"</string>
+    <string name="print_blocked_state_title_template" msgid="9065391617425962424">"Printer blocked <xliff:g id="PRINT_JOB_NAME">%1$s</xliff:g>"</string>
+    <string name="print_search_box_shown_utterance" msgid="7730361832020726951">"Search box shown"</string>
+    <string name="print_search_box_hidden_utterance" msgid="7980832833405818400">"Search box hidden"</string>
+    <string name="printer_info_desc" msgid="5824995108703060003">"More information about this printer"</string>
+    <string name="power_usage_summary_title" msgid="7190304207330319919">"Battery"</string>
+    <string name="power_usage_summary" msgid="7237084831082848168">"What has been using the battery"</string>
+    <string name="power_usage_not_available" msgid="3109326074656512387">"Battery usage data isn\'t available."</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> remaining"</string>
+    <string name="power_charge_remaining" msgid="6132074970943913135">"<xliff:g id="UNTIL_CHARGED">%1$s</xliff:g> to charge"</string>
+    <string name="background_activity_title" msgid="8618384801540759730">"Background activity"</string>
+    <string name="background_activity_summary" msgid="8140094430510517362">"Allow the app to run in the background"</string>
+    <string name="background_activity_summary_on" msgid="649282072540085599">"App can run in the background when not in use"</string>
+    <string name="background_activity_summary_off" msgid="7666330699090632040">"App\'s background activity is limited when not in use"</string>
+    <string name="background_activity_summary_disabled" msgid="3710669050484599847">"App not allowed to run in background"</string>
+    <string name="background_activity_summary_whitelisted" msgid="7375400051141016808">"App can not be optimised for battery use"</string>
+    <string name="background_activity_warning_dialog_title" msgid="2216249969149568871">"Limit background activity?"</string>
+    <string name="background_activity_warning_dialog_text" msgid="7049624449246121981">"If you limit background activity for an app, it may misbehave"</string>
+    <string name="device_screen_usage" msgid="3386088035570409683">"Screen usage since full charge"</string>
+    <string name="device_screen_consumption" msgid="4607589286438986687">"Screen consumption"</string>
+    <string name="device_cellular_network" msgid="4724773411762382950">"Mobile network scanning"</string>
+    <string name="power_usage_list_summary" msgid="6393929085382334341">"App usage since full charge (<xliff:g id="RELATIVE_TIME">^1</xliff:g>)"</string>
+    <string name="power_usage_list_summary_device" msgid="4461926045610455423">"Device usage since full charge (<xliff:g id="RELATIVE_TIME">^1</xliff:g>)"</string>
+    <string name="screen_usage_summary" msgid="6687403051423153550">"Amount of time screen has been on since full charge"</string>
+    <string name="device_usage_list_summary" msgid="5623036661468763251">"Device usage since full charge"</string>
+    <string name="battery_since_unplugged" msgid="338073389740738437">"Battery use since unplugged"</string>
+    <string name="battery_since_reset" msgid="7464546661121187045">"Battery use since reset"</string>
+    <string name="battery_stats_on_battery" msgid="4970762168505236033">"<xliff:g id="TIME">%1$s</xliff:g> on battery"</string>
+    <string name="battery_stats_duration" msgid="7464501326709469282">"<xliff:g id="TIME">%1$s</xliff:g> since unplugged"</string>
+    <string name="battery_stats_charging_label" msgid="4223311142875178785">"Charging"</string>
+    <string name="battery_stats_screen_on_label" msgid="7150221809877509708">"Screen ON"</string>
+    <string name="battery_stats_gps_on_label" msgid="1193657533641951256">"GPS on"</string>
+    <string name="battery_stats_camera_on_label" msgid="4935637383628414968">"Camera on"</string>
+    <string name="battery_stats_flashlight_on_label" msgid="4319637669889411307">"Flashlight on"</string>
+    <string name="battery_stats_wifi_running_label" msgid="1845839195549226252">"Wi‑Fi"</string>
+    <string name="battery_stats_wake_lock_label" msgid="1908942681902324095">"Awake"</string>
+    <string name="battery_stats_phone_signal_label" msgid="4137799310329041341">"Mobile network signal"</string>
+    <!-- no translation found for battery_stats_last_duration (1535831453827905957) -->
+    <skip />
+    <string name="awake" msgid="387122265874485088">"Device awake time"</string>
+    <string name="wifi_on_time" msgid="3208518458663637035">"Wi‑Fi on time"</string>
+    <string name="bluetooth_on_time" msgid="3056108148042308690">"Wi‑Fi on time"</string>
+    <string name="advanced_battery_title" msgid="2068039111517508622">"Advanced battery usage"</string>
+    <string name="history_details_title" msgid="3608240585315506067">"History details"</string>
+    <string name="battery_details_title" msgid="6101394441569858580">"Battery usage"</string>
+    <string name="details_subtitle" msgid="32593908269911734">"Use details"</string>
+    <string name="controls_subtitle" msgid="390468421138288702">"Adjust power use"</string>
+    <string name="packages_subtitle" msgid="4736416171658062768">"Included packages"</string>
+    <string name="battery_abnormal_details_title" msgid="5469019021857291216">"Apps draining battery"</string>
+    <string name="battery_abnormal_wakelock_summary" msgid="4326186999058828831">"Keeping device awake"</string>
+    <string name="battery_abnormal_wakeup_alarm_summary" msgid="644657277875785240">"Waking up device in background"</string>
+    <string name="battery_abnormal_location_summary" msgid="6552797246798806002">"Requesting location frequently"</string>
+    <string name="battery_abnormal_apps_summary" msgid="792553273248686972">"<xliff:g id="NUMBER">%1$d</xliff:g> apps misbehaving"</string>
+    <string name="dialog_stop_title" msgid="6395127715596746479">"Stop app?"</string>
+    <string name="dialog_stop_message" product="default" msgid="4006631636646776488">"Your phone can\'t manage battery normally because <xliff:g id="APP">%1$s</xliff:g> is keeping your phone awake.\n\nTo try to fix this issue, you can stop the app.\n\nIf this keeps happening, you may need to uninstall the app to improve battery performance."</string>
+    <string name="dialog_stop_message" product="tablet" msgid="2369957934555162428">"Your tablet can\'t manage battery normally because <xliff:g id="APP">%1$s</xliff:g> is keeping your tablet awake.\n\nTo try to fix this issue, you can stop the app.\n\nIf this keeps happening, you may need to uninstall the app to improve battery performance."</string>
+    <string name="dialog_stop_message" product="device" msgid="6195430620406365292">"Your device can\'t manage battery normally because <xliff:g id="APP">%1$s</xliff:g> is keeping your device awake.\n\nTo try to fix this issue, you can stop the app.\n\nIf this keeps happening, you may need to uninstall the app to improve battery performance."</string>
+    <string name="dialog_stop_message_wakeup_alarm" product="default" msgid="1638726742782558262">"Your phone can\'t manage battery normally because <xliff:g id="APP_0">%1$s</xliff:g> keeps waking up your phone.\n\nTo try to fix this issue, you can stop <xliff:g id="APP_1">%1$s</xliff:g>.\n\nIf this keeps happening, you may need to uninstall the app to improve battery performance."</string>
+    <string name="dialog_stop_message_wakeup_alarm" product="tablet" msgid="8771690983566539742">"Your tablet can\'t manage battery normally because <xliff:g id="APP_0">%1$s</xliff:g> keeps waking up your tablet.\n\nTo try to fix this issue, you can stop <xliff:g id="APP_1">%1$s</xliff:g>.\n\nIf this keeps happening, you may need to uninstall the app to improve battery performance."</string>
+    <string name="dialog_stop_message_wakeup_alarm" product="device" msgid="2854944538238649520">"Your device can\'t manage battery normally because <xliff:g id="APP_0">%1$s</xliff:g> keeps waking up your device.\n\nTo try to fix this issue, you can stop <xliff:g id="APP_1">%1$s</xliff:g>.\n\nIf this keeps happening, you may need to uninstall the app to improve battery performance."</string>
+    <string name="dialog_stop_ok" msgid="2319777211264004900">"Stop app"</string>
+    <string name="dialog_background_check_title" msgid="6936542136153283692">"Turn off background usage &amp; stop app?"</string>
+    <string name="dialog_background_check_message" product="default" msgid="4045827746349279563">"Your phone can\'t manage battery normally because <xliff:g id="APP_0">%1$s</xliff:g> keeps waking up your phone.\n\nTo try to fix this issue, you can stop <xliff:g id="APP_1">%1$s</xliff:g> and prevent it from running in the background."</string>
+    <string name="dialog_background_check_message" product="tablet" msgid="8348214419901788270">"Your tablet can\'t manage battery normally because <xliff:g id="APP_0">%1$s</xliff:g> keeps waking up your tablet.\n\nTo try to fix this issue, you can stop <xliff:g id="APP_1">%1$s</xliff:g> and prevent it from running in the background."</string>
+    <string name="dialog_background_check_message" product="device" msgid="5847977433118915863">"Your device can\'t manage battery normally because <xliff:g id="APP_0">%1$s</xliff:g> keeps waking up your device.\n\nTo try to fix this issue, you can stop <xliff:g id="APP_1">%1$s</xliff:g> and prevent it from running in the background."</string>
+    <string name="dialog_background_check_ok" msgid="412876934682899659">"Turn off"</string>
+    <string name="dialog_location_title" msgid="5888917530725874727">"Turn off location?"</string>
+    <string name="dialog_location_message" product="default" msgid="7774807745601479888">"Your phone can\'t manage battery normally because <xliff:g id="APP">%1$s</xliff:g> keeps requesting your location when you\'re not using the app.\n\nTo fix this issue, you can turn off location for this app."</string>
+    <string name="dialog_location_message" product="tablet" msgid="118745801732181618">"Your tablet can\'t manage battery normally because <xliff:g id="APP">%1$s</xliff:g> keeps requesting your location when you\'re not using the app.\n\nTo fix this issue, you can turn off location for this app."</string>
+    <string name="dialog_location_message" product="device" msgid="6783678153382298295">"Your device can\'t manage battery normally because <xliff:g id="APP">%1$s</xliff:g> keeps requesting your location when you\'re not using the app.\n\nTo fix this issue, you can turn off location for this app."</string>
+    <string name="dialog_location_ok" msgid="4572391197601313986">"Turn off"</string>
+    <string name="power_screen" msgid="3023346080675904613">"Screen"</string>
+    <string name="power_flashlight" msgid="7794409781003567614">"Flashlight"</string>
+    <string name="power_camera" msgid="4976286950934622605">"Camera"</string>
+    <string name="power_wifi" msgid="1135085252964054957">"Wi‑Fi"</string>
+    <string name="power_bluetooth" msgid="4373329044379008289">"Bluetooth"</string>
+    <string name="power_cell" msgid="3392999761958982492">"Mobile network standby"</string>
+    <string name="power_phone" msgid="5392641106474567277">"Voice calls"</string>
+    <string name="power_idle" product="tablet" msgid="4612478572401640759">"Tablet idle"</string>
+    <string name="power_idle" product="default" msgid="9055659695602194990">"Phone idle"</string>
+    <string name="power_unaccounted" msgid="709925017022660740">"Miscellaneous"</string>
+    <string name="power_overcounted" msgid="2762354976171358445">"Over-counted"</string>
+    <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="3706143225319881667">"Other users"</string>
+    <string name="usage_type_cpu" msgid="715162150698338714">"CPU total"</string>
+    <string name="usage_type_cpu_foreground" msgid="6500579611933211831">"CPU foreground"</string>
+    <string name="usage_type_wake_lock" msgid="5125438890233677880">"Keep awake"</string>
+    <string name="usage_type_gps" msgid="7989688715128160790">"GPS"</string>
+    <string name="usage_type_wifi_running" msgid="3134357198266380400">"Wi‑Fi running"</string>
+    <string name="usage_type_phone" product="tablet" msgid="262638572890253393">"Tablet"</string>
+    <string name="usage_type_phone" product="default" msgid="9108247984998041853">"Phone"</string>
+    <string name="usage_type_data_send" msgid="8971710128438365919">"Mobile packets sent"</string>
+    <string name="usage_type_data_recv" msgid="5468564329333954445">"Mobile packets received"</string>
+    <string name="usage_type_radio_active" msgid="1732647857619420121">"Mobile radio active"</string>
+    <string name="usage_type_data_wifi_send" msgid="1847552143597396162">"Wi‑Fi packets sent"</string>
+    <string name="usage_type_data_wifi_recv" msgid="5678475911549183829">"Wi‑Fi packets received"</string>
+    <string name="usage_type_audio" msgid="6957269406840886290">"Audio"</string>
+    <string name="usage_type_video" msgid="4295357792078579944">"Video"</string>
+    <string name="usage_type_camera" msgid="8299433109956769757">"Camera"</string>
+    <string name="usage_type_flashlight" msgid="1516392356962208230">"Flashlight"</string>
+    <string name="usage_type_on_time" msgid="3351200096173733159">"Time on"</string>
+    <string name="usage_type_no_coverage" msgid="3797004252954385053">"Time without a signal"</string>
+    <string name="usage_type_total_battery_capacity" msgid="3798285287848675346">"Total battery capacity"</string>
+    <string name="usage_type_computed_power" msgid="5862792259009981479">"Computed power use"</string>
+    <string name="usage_type_actual_power" msgid="7047814738685578335">"Observed power use"</string>
+    <string name="battery_action_stop" msgid="649958863744041872">"Force stop"</string>
+    <string name="battery_action_app_details" msgid="7861051816778419018">"App info"</string>
+    <string name="battery_action_app_settings" msgid="4570481408106287454">"App settings"</string>
+    <string name="battery_action_display" msgid="7338551244519110831">"Screen settings"</string>
+    <string name="battery_action_wifi" msgid="8181553479021841207">"Wi‑Fi settings"</string>
+    <string name="battery_action_bluetooth" msgid="8374789049507723142">"Bluetooth settings"</string>
+    <string name="battery_desc_voice" msgid="8980322055722959211">"Battery used by voice calls"</string>
+    <string name="battery_desc_standby" product="tablet" msgid="6284747418668280364">"Battery used when tablet is idle"</string>
+    <string name="battery_desc_standby" product="default" msgid="3009080001948091424">"Battery used when phone is idle"</string>
+    <string name="battery_desc_radio" msgid="5479196477223185367">"Battery used by mobile radio"</string>
+    <string name="battery_sugg_radio" msgid="8211336978326295047">"Switch to aeroplane mode to save power in areas with no mobile coverage"</string>
+    <string name="battery_desc_flashlight" msgid="2908579430841025494">"Battery used by the flashlight"</string>
+    <string name="battery_desc_camera" msgid="7375389919760613499">"Battery used by the camera"</string>
+    <string name="battery_desc_display" msgid="5432795282958076557">"Battery used by the display and backlight"</string>
+    <string name="battery_sugg_display" msgid="3370202402045141760">"Reduce the screen brightness and/or screen timeout"</string>
+    <string name="battery_desc_wifi" msgid="2375567464707394131">"Battery used by Wi‑Fi"</string>
+    <string name="battery_sugg_wifi" msgid="7776093125855397043">"Turn off Wi‑Fi when not using it or when it isn\'t available"</string>
+    <string name="battery_desc_bluetooth" msgid="8069070756186680367">"Battery used by Bluetooth"</string>
+    <string name="battery_sugg_bluetooth_basic" msgid="4565141162650835009">"Turn off Bluetooth when you aren\'t using it"</string>
+    <string name="battery_sugg_bluetooth_headset" msgid="4071352514714259230">"Try connecting to a different Bluetooth device"</string>
+    <string name="battery_desc_apps" msgid="8530418792605735226">"Battery used by app"</string>
+    <string name="battery_sugg_apps_info" msgid="6907588126789841231">"Stop or uninstall the app"</string>
+    <string name="battery_sugg_apps_gps" msgid="5959067516281866135">"Select battery-saving mode"</string>
+    <string name="battery_sugg_apps_settings" msgid="3974902365643634514">"The application may offer settings to reduce battery use"</string>
+    <string name="battery_desc_users" msgid="7682989161885027823">"Battery used by user"</string>
+    <string name="battery_desc_unaccounted" msgid="7404256448541818019">"Miscellaneous power use"</string>
+    <string name="battery_msg_unaccounted" msgid="1963583522633067961">"Battery use is an approximation of power use and does not include every source of battery drain. Miscellaneous is the difference between the computed approximate power use and the actual drain observed on the battery."</string>
+    <string name="battery_desc_overcounted" msgid="5481865509489228603">"Over-counted power use"</string>
+    <string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g> mAh"</string>
+    <string name="battery_used_for" msgid="2690821851327075443">"Used for <xliff:g id="TIME">^1</xliff:g>"</string>
+    <string name="battery_active_for" msgid="2964359540508103032">"Active for <xliff:g id="TIME">^1</xliff:g>"</string>
+    <string name="battery_screen_usage" msgid="6537658662149713585">"Screen usage <xliff:g id="TIME">^1</xliff:g>"</string>
+    <string name="battery_used_by" msgid="1135316757755282999">"<xliff:g id="PERCENT">%1$s</xliff:g> used by <xliff:g id="APP">%2$s</xliff:g>"</string>
+    <string name="battery_overall_usage" msgid="2093409063297375436">"<xliff:g id="PERCENT">%1$s</xliff:g> of overall battery"</string>
+    <string name="battery_detail_since_full_charge" msgid="7515347842046955855">"Breakdown since last full charge"</string>
+    <string name="battery_last_full_charge" msgid="7151251641099019361">"Last full charge"</string>
+    <string name="battery_footer_summary" msgid="67169726550144016">"Battery usage data is approximate and can change based on usage"</string>
+    <string name="battery_detail_foreground" msgid="3350401514602032183">"While in active use"</string>
+    <string name="battery_detail_background" msgid="1929644393553768999">"While in background"</string>
+    <string name="battery_detail_power_usage" msgid="6485766868610469101">"Battery usage"</string>
+    <string name="battery_detail_power_percentage" msgid="8064814503316094497">"<xliff:g id="PERCENT">%1$s</xliff:g> of total app usage (<xliff:g id="POWER">%2$d</xliff:g>mAh)"</string>
+    <string name="battery_detail_info_title" msgid="8227822131405620369">"Since full charge"</string>
+    <string name="battery_detail_manage_title" msgid="9094314252105828014">"Manage battery usage"</string>
+    <string name="estimated_time_left" msgid="7514194472683370877">"Estimated time left"</string>
+    <string name="estimated_charging_time_left" msgid="5614442409326164691">"Until fully charged"</string>
+    <string name="estimated_time_description" msgid="8760210909000037089">"Estimate may change based on usage"</string>
+    <string name="menu_stats_unplugged" msgid="8296577130840261624">"<xliff:g id="UNPLUGGED">%1$s</xliff:g> since unplugged"</string>
+    <string name="menu_stats_last_unplugged" msgid="5922246077592434526">"While last for unplugged for <xliff:g id="UNPLUGGED">%1$s</xliff:g>"</string>
+    <string name="menu_stats_total" msgid="8973377864854807854">"Usage totals"</string>
+    <string name="menu_stats_refresh" msgid="1676215433344981075">"Refresh"</string>
+    <string name="process_kernel_label" msgid="3916858646836739323">"Android OS"</string>
+    <string name="process_mediaserver_label" msgid="6500382062945689285">"Media server"</string>
+    <string name="process_dex2oat_label" msgid="2592408651060518226">"App optimisation"</string>
+    <string name="battery_saver" msgid="1426682272004907982">"Battery saver"</string>
+    <string name="battery_saver_turn_on_automatically_title" msgid="9023847300114669426">"Turn on automatically"</string>
+    <string name="battery_saver_turn_on_automatically_never" msgid="6610846456314373">"Never"</string>
+    <string name="battery_saver_turn_on_automatically_pct" msgid="8665950426992057191">"at <xliff:g id="PERCENT">%1$s</xliff:g> battery"</string>
+    <string name="battery_percentage" msgid="723291197508049369">"Battery percentage"</string>
+    <string name="battery_percentage_description" msgid="8511658577507384014">"Show battery percentage in status bar"</string>
+    <string name="process_stats_summary_title" msgid="1144688045609771677">"Process Stats"</string>
+    <string name="process_stats_summary" msgid="109387941605607762">"Geeky stats about running processes"</string>
+    <string name="app_memory_use" msgid="7849258480392171939">"Memory use"</string>
+    <string name="process_stats_total_duration" msgid="7417201400853728029">"<xliff:g id="USEDRAM">%1$s</xliff:g> of <xliff:g id="TOTALRAM">%2$s</xliff:g> used over last <xliff:g id="TIMEDURATION">%3$s</xliff:g>"</string>
+    <string name="process_stats_total_duration_percentage" msgid="6522457033380025618">"<xliff:g id="PERCENT">%1$s</xliff:g> of RAM used over <xliff:g id="TIMEDURATION">%2$s</xliff:g>"</string>
+    <string name="process_stats_type_background" msgid="3934992858120683459">"Background"</string>
+    <string name="process_stats_type_foreground" msgid="7713118254089580536">"Foreground"</string>
+    <string name="process_stats_type_cached" msgid="6314925846944806511">"Cached"</string>
+    <string name="process_stats_os_label" msgid="4813434110442733392">"Android OS"</string>
+    <string name="process_stats_os_native" msgid="5322428494231768472">"Native"</string>
+    <string name="process_stats_os_kernel" msgid="1938523592369780924">"Kernel"</string>
+    <string name="process_stats_os_zram" msgid="677138324651671575">"Z-Ram"</string>
+    <string name="process_stats_os_cache" msgid="6432533624875078233">"Caches"</string>
+    <string name="process_stats_ram_use" msgid="976912589127397307">"RAM use"</string>
+    <string name="process_stats_bg_ram_use" msgid="5398191511030462404">"RAM use (background)"</string>
+    <string name="process_stats_run_time" msgid="6520628955709369115">"Running time"</string>
+    <string name="processes_subtitle" msgid="6827502409379462438">"Processes"</string>
+    <string name="services_subtitle" msgid="4296402367067266425">"Services"</string>
+    <string name="menu_proc_stats_duration" msgid="2323483592994720196">"Duration"</string>
+    <string name="mem_details_title" msgid="6548392825497290498">"Memory details"</string>
+    <string name="mem_state_subtitle" msgid="2407238869781011933">"Memory states"</string>
+    <string name="mem_use_subtitle" msgid="7319468770222422412">"Memory use"</string>
+    <string name="mem_use_kernel_type" msgid="8698327165935012484">"Kernel"</string>
+    <string name="mem_use_native_type" msgid="5976704902328347400">"Native"</string>
+    <string name="mem_use_kernel_cache_type" msgid="6411475064463957513">"Kernel caches"</string>
+    <string name="mem_use_zram_type" msgid="9087217476795358232">"ZRam swap"</string>
+    <string name="mem_use_free_type" msgid="717708548454880840">"Free"</string>
+    <string name="mem_use_total" msgid="6308786055749777934">"Total"</string>
+    <string name="menu_duration_3h" msgid="4714866438374738385">"3 hours"</string>
+    <string name="menu_duration_6h" msgid="1940846763432184132">"6 hours"</string>
+    <string name="menu_duration_12h" msgid="7890465404584356294">"12 hours"</string>
+    <string name="menu_duration_1d" msgid="3393631127622285458">"1 day"</string>
+    <string name="menu_show_system" msgid="8864603400415567635">"Show system"</string>
+    <string name="menu_hide_system" msgid="4106826741703745733">"Hide system"</string>
+    <string name="menu_show_percentage" msgid="4717204046118199806">"Show percentages"</string>
+    <string name="menu_use_uss" msgid="467765290771543089">"Use Uss"</string>
+    <string name="menu_proc_stats_type" msgid="4700209061072120948">"Stats type"</string>
+    <string name="menu_proc_stats_type_background" msgid="2236161340134898852">"Background"</string>
+    <string name="menu_proc_stats_type_foreground" msgid="2286182659954958586">"Foreground"</string>
+    <string name="menu_proc_stats_type_cached" msgid="5084272779786820693">"Cached"</string>
+    <string name="voice_input_output_settings" msgid="1336135218350444783">"Voice input &amp; output"</string>
+    <string name="voice_input_output_settings_title" msgid="2442850635048676991">"Voice input &amp; output settings"</string>
+    <string name="voice_search_settings_title" msgid="2775469246913196536">"Voice search"</string>
+    <string name="keyboard_settings_title" msgid="5080115226780201234">"Android keyboard"</string>
+    <string name="voice_input_settings" msgid="1099937800539324567">"Voice input settings"</string>
+    <string name="voice_input_settings_title" msgid="2676028028084981891">"Voice input"</string>
+    <string name="voice_service_preference_section_title" msgid="3778706644257601021">"Voice input services"</string>
+    <string name="voice_interactor_preference_summary" msgid="1801414022026937190">"Full hotword and interaction"</string>
+    <string name="voice_recognizer_preference_summary" msgid="669880813593690527">"Simple speech to text"</string>
+    <string name="voice_interaction_security_warning" msgid="6378608263983737325">"This voice input service will be able to perform always-on voice monitoring, and control voice enabled applications on your behalf. It comes from the <xliff:g id="VOICE_INPUT_SERVICE_APP_NAME">%s</xliff:g> application. Enable the use of this service?"</string>
+    <string name="tts_engine_preference_title" msgid="1578826947311494239">"Preferred engine"</string>
+    <string name="tts_engine_settings_title" msgid="6886964122861384818">"Engine settings"</string>
+    <string name="tts_sliders_title" msgid="992059150784095263">"Speech rate &amp; pitch"</string>
+    <string name="tts_engine_section_title" msgid="6289240207677024034">"Engine"</string>
+    <string name="tts_install_voice_title" msgid="6275828614052514320">"Voices"</string>
+    <string name="tts_spoken_language" msgid="5542499183472504027">"Spoken Language"</string>
+    <string name="tts_install_voices_title" msgid="8808823756936022641">"Install Voices"</string>
+    <string name="tts_install_voices_text" msgid="5292606786380069134">"Continue to the <xliff:g id="TTS_APP_NAME">%s</xliff:g> app to install voices"</string>
+    <string name="tts_install_voices_open" msgid="667467793360277465">"Open App"</string>
+    <string name="tts_install_voices_cancel" msgid="4711492804851107459">"Cancel"</string>
+    <string name="tts_reset" msgid="2661752909256313270">"Reset"</string>
+    <string name="tts_play" msgid="2628469503798633884">"Play"</string>
+    <string name="gadget_title" msgid="5519037532720577836">"Power control"</string>
+    <string name="gadget_toggle_wifi" msgid="319262861956544493">"Updating Wi‑Fi setting"</string>
+    <string name="gadget_toggle_bluetooth" msgid="7538903239807020826">"Updating Bluetooth setting"</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">"on"</string>
+    <string name="gadget_state_off" msgid="5220212352953066317">"off"</string>
+    <string name="gadget_state_turning_on" msgid="3395992057029439039">"turning on"</string>
+    <string name="gadget_state_turning_off" msgid="2395546048102176157">"turning off"</string>
+    <string name="gadget_wifi" msgid="4712584536500629417">"Wi‑Fi"</string>
+    <string name="gadget_bluetooth" msgid="8998572807378694410">"Bluetooth"</string>
+    <string name="gadget_location" msgid="2974757497945178165">"Location"</string>
+    <string name="gadget_sync" msgid="858895763714222152">"Sync"</string>
+    <string name="gadget_brightness_template" msgid="930541920933123603">"Brightness <xliff:g id="ID_1">%1$s</xliff:g>"</string>
+    <string name="gadget_brightness_state_auto" msgid="6667967252426515446">"auto"</string>
+    <string name="gadget_brightness_state_full" msgid="6814570109772137631">"full"</string>
+    <string name="gadget_brightness_state_half" msgid="3696671957608774204">"half"</string>
+    <string name="gadget_brightness_state_off" msgid="946382262872753084">"off"</string>
+    <string name="vpn_settings_title" msgid="5662579425832406705">"VPN"</string>
+    <string name="credentials_title" msgid="4446234003860769883">"Credential storage"</string>
+    <string name="credentials_install" product="nosdcard" msgid="466093273825150847">"Install from storage"</string>
+    <string name="credentials_install" product="default" msgid="953914549998062317">"Install from SD card"</string>
+    <string name="credentials_install_summary" product="nosdcard" msgid="4220422806818210676">"Install certificates from storage"</string>
+    <string name="credentials_install_summary" product="default" msgid="5737658257407822713">"Install certificates from SD card"</string>
+    <string name="credentials_reset" msgid="3239382277144980418">"Clear credentials"</string>
+    <string name="credentials_reset_summary" msgid="3369361230171260282">"Remove all certificates"</string>
+    <string name="trusted_credentials" msgid="4266945289534242402">"Trusted credentials"</string>
+    <string name="trusted_credentials_summary" msgid="6735221351155686632">"Display trusted CA certificates"</string>
+    <string name="user_credentials" msgid="3719013347787187083">"User credentials"</string>
+    <string name="user_credentials_summary" msgid="7271228342106080167">"View and modify stored credentials"</string>
+    <string name="advanced_security_title" msgid="2434776238010578865">"Advanced"</string>
+    <string name="credential_storage_type" msgid="8629968543494001364">"Storage type"</string>
+    <string name="credential_storage_type_hardware" msgid="6077193544333904427">"Hardware-backed"</string>
+    <string name="credential_storage_type_software" msgid="4403117271207715378">"Software only"</string>
+    <string name="credentials_settings_not_available" msgid="7968275634486624215">"Credentials are not available for this user"</string>
+    <string name="credential_for_vpn_and_apps" msgid="4168197158768443365">"Installed for VPN and apps"</string>
+    <string name="credential_for_wifi" msgid="6228425986551591864">"Installed for Wi-Fi"</string>
+    <string name="credentials_unlock" msgid="385427939577366499"></string>
+    <string name="credentials_unlock_hint" msgid="2301301378040499348">"Type the password for credential storage."</string>
+    <string name="credentials_old_password" msgid="7553393815538684028">"Current password:"</string>
+    <string name="credentials_reset_hint" msgid="6297256880896133631">"Remove all the contents?"</string>
+    <string name="credentials_wrong_password" msgid="2541932597104054807">"Incorrect password."</string>
+    <string name="credentials_reset_warning" msgid="5320653011511797600">"Incorrect password. You have one more chance before credential storage is erased."</string>
+    <string name="credentials_reset_warning_plural" msgid="6514085665301095279">"Incorrect password. You have <xliff:g id="NUMBER">%1$d</xliff:g> more chances before credential storage is erased."</string>
+    <string name="credentials_erased" msgid="2907836028586342969">"Credential storage has been erased."</string>
+    <string name="credentials_not_erased" msgid="7685932772284216097">"Credential storage couldn\'t be erased."</string>
+    <string name="credentials_enabled" msgid="7588607413349978930">"Credential storage is enabled."</string>
+    <string name="credentials_configure_lock_screen_hint" msgid="8058230497337529036">"Before you can use credential storage, your device needs to have a secure lock screen"</string>
+    <string name="credentials_configure_lock_screen_button" msgid="253239765216055321">"SET LOCK"</string>
+    <string name="usage_access_title" msgid="332333405495457839">"Apps with usage access"</string>
+    <string name="emergency_tone_title" msgid="1055954530111587114">"Emergency tone"</string>
+    <string name="emergency_tone_summary" msgid="722259232924572153">"Set behaviour when an emergency call is placed"</string>
+    <string name="privacy_settings_title" msgid="2978878794187459190">"Backup"</string>
+    <string name="backup_section_title" msgid="7952232291452882740">"Backup &amp; restore"</string>
+    <string name="personal_data_section_title" msgid="7815209034443782061">"Personal data"</string>
+    <string name="backup_data_title" msgid="1239105919852668016">"Back up my data"</string>
+    <string name="backup_data_summary" msgid="708773323451655666">"Back up app data, Wi‑Fi passwords and other settings to Google servers"</string>
+    <string name="backup_configure_account_title" msgid="3790872965773196615">"Backup account"</string>
+    <string name="include_app_data_title" msgid="2829970132260278394">"Include app data"</string>
+    <string name="auto_restore_title" msgid="5397528966329126506">"Automatic restore"</string>
+    <string name="auto_restore_summary" msgid="4235615056371993807">"When reinstalling an app, restore backed-up settings and data"</string>
+    <string name="backup_inactive_title" msgid="685838037986644604">"Backup service isn\'t active"</string>
+    <string name="backup_configure_account_default_summary" msgid="2436933224764745553">"No account is currently storing backed up data"</string>
+    <string name="backup_erase_dialog_title" msgid="1027640829482174106"></string>
+    <string name="backup_erase_dialog_message" msgid="5221011285568343155">"Stop backing up your Wi‑Fi passwords, bookmarks, other settings and app data, plus erase all copies on Google servers?"</string>
+    <string name="fullbackup_erase_dialog_message" msgid="694766389396659626">"Stop backing up device data (such as Wi-Fi passwords and call history) and app data (such as settings and files stored by apps), plus erase all copies on remote servers?"</string>
+    <string name="fullbackup_data_summary" msgid="960850365007767734">"Automatically back up device data (such as Wi-Fi passwords and call history) and app data (such as settings and files stored by apps) remotely.\n\nWhen you turn on automatic backup, device and app data is periodically saved remotely. App data can be any data that an app has saved (based on developer settings), including potentially sensitive data such as contacts, messages and photos."</string>
+    <string name="device_admin_settings_title" msgid="4960761799560705902">"Device admin settings"</string>
+    <string name="active_device_admin_msg" msgid="578748451637360192">"Device admin app"</string>
+    <string name="remove_device_admin" msgid="9207368982033308173">"Deactivate this device admin app"</string>
+    <string name="uninstall_device_admin" msgid="271120195128542165">"Uninstall app"</string>
+    <string name="remove_and_uninstall_device_admin" msgid="3837625952436169878">"Deactivate &amp; uninstall"</string>
+    <string name="select_device_admin_msg" msgid="7347389359013278077">"Device admin apps"</string>
+    <string name="no_device_admins" msgid="4846602835339095768">"No device admin apps available"</string>
+    <string name="personal_device_admin_title" msgid="2849617316347669861">"Personal"</string>
+    <string name="managed_device_admin_title" msgid="7853955652864478435">"Work"</string>
+    <string name="no_trust_agents" msgid="7450273545568977523">"No available trust agents"</string>
+    <string name="add_device_admin_msg" msgid="1501847129819382149">"Activate device admin app?"</string>
+    <string name="add_device_admin" msgid="4192055385312215731">"Activate this device admin app"</string>
+    <string name="device_admin_add_title" msgid="3140663753671809044">"Device admin"</string>
+    <string name="device_admin_warning" msgid="7482834776510188134">"Activating this admin app will allow the app <xliff:g id="APP_NAME">%1$s</xliff:g> to perform the following operations:"</string>
+    <string name="device_admin_status" msgid="7234814785374977990">"This admin app is active and allows the app <xliff:g id="APP_NAME">%1$s</xliff:g> to perform the following operations:"</string>
+    <string name="profile_owner_add_title" msgid="6249331160676175009">"Activate Profile Manager?"</string>
+    <string name="adding_profile_owner_warning" msgid="1354474524852805802">"By proceeding, your user will be managed by your admin, which may also be able to store associated data, in addition to your personal data.\n\nYour admin has the ability to monitor and manage settings, access, apps and data associated with this user, including network activity and your device\'s location information."</string>
+    <string name="admin_disabled_other_options" msgid="7712694507069054530">"Other options are disabled by your admin"</string>
+    <string name="admin_more_details" msgid="7901420667346456102">"More details"</string>
+    <string name="untitled_apn" msgid="1230060359198685513">"Untitled"</string>
+    <string name="sound_category_sound_title" msgid="1488759370067953996">"General"</string>
+    <string name="notification_log_title" msgid="3766148588239398464">"Notification log"</string>
+    <string name="sound_category_call_ringtone_vibrate_title" msgid="1543777228646645163">"Call ringtone &amp; vibrate"</string>
+    <string name="sound_category_system_title" msgid="1480844520622721141">"System"</string>
+    <string name="wifi_setup_title" msgid="2970260757780025029">"Wi‑Fi setup"</string>
+    <string name="wifi_setup_title_editing_network" msgid="6020614644556717979">"Connect to Wi‑Fi network <xliff:g id="NETWORK_NAME">%s</xliff:g>"</string>
+    <string name="wifi_setup_title_connecting_network" msgid="5572226790101017822">"Connecting to Wi‑Fi network <xliff:g id="NETWORK_NAME">%s</xliff:g>…"</string>
+    <string name="wifi_setup_title_connected_network" msgid="1608788657122010919">"Connected to Wi‑Fi network <xliff:g id="NETWORK_NAME">%s</xliff:g>"</string>
+    <string name="wifi_setup_title_add_network" msgid="6932651000151032301">"Add a network"</string>
+    <string name="wifi_setup_not_connected" msgid="6997432604664057052">"Not connected"</string>
+    <string name="wifi_setup_add_network" msgid="5939624680150051807">"Add network"</string>
+    <string name="wifi_setup_refresh_list" msgid="3411615711486911064">"Refresh list"</string>
+    <string name="wifi_setup_skip" msgid="6661541841684895522">"Skip"</string>
+    <string name="wifi_setup_next" msgid="3388694784447820477">"Next"</string>
+    <string name="wifi_setup_back" msgid="144777383739164044">"Back"</string>
+    <string name="wifi_setup_detail" msgid="2336990478140503605">"Network details"</string>
+    <string name="wifi_setup_connect" msgid="7954456989590237049">"Connect"</string>
+    <string name="wifi_setup_forget" msgid="2562847595567347526">"Forget"</string>
+    <string name="wifi_setup_save" msgid="3659235094218508211">"Save"</string>
+    <string name="wifi_setup_cancel" msgid="3185216020264410239">"Cancel"</string>
+    <string name="wifi_setup_status_scanning" msgid="5317003416385428036">"Scanning networks..."</string>
+    <string name="wifi_setup_status_select_network" msgid="3960480613544747397">"Tap a network to connect to it"</string>
+    <string name="wifi_setup_status_existing_network" msgid="6394925174802598186">"Connect to existing network"</string>
+    <string name="wifi_setup_status_unsecured_network" msgid="8143046977328718252">"Connect to unsecured network"</string>
+    <string name="wifi_setup_status_edit_network" msgid="4765340816724760717">"Type network configuration"</string>
+    <string name="wifi_setup_status_new_network" msgid="7468952850452301083">"Connect to new network"</string>
+    <string name="wifi_setup_status_connecting" msgid="4971421484401530740">"Connecting…"</string>
+    <string name="wifi_setup_status_proceed_to_next" msgid="6708250000342940031">"Go to the next step"</string>
+    <string name="wifi_setup_status_eap_not_supported" msgid="6796317704783144190">"EAP isn\'t supported."</string>
+    <string name="wifi_setup_eap_not_supported" msgid="6812710317883658843">"You can\'t configure an EAP Wi‑Fi connection during setup. After setup, you can do that in Settings &gt; Wireless &amp; networks."</string>
+    <string name="wifi_setup_description_connecting" msgid="2793554932006756795">"Connecting can take a few minutes..."</string>
+    <string name="wifi_setup_description_connected" msgid="6649168170073219153">"Tap "<b>"Next"</b>" to continue with setup.\n\nTap "<b>"Back"</b>" to connect to a different Wi‑Fi network."</string>
+    <string name="accessibility_sync_enabled" msgid="558480439730263116">"Sync enabled"</string>
+    <string name="accessibility_sync_disabled" msgid="1741194106479011384">"Sync disabled"</string>
+    <string name="accessibility_sync_in_progress" msgid="4501160520879902723">"Syncing now"</string>
+    <string name="accessibility_sync_error" msgid="8703299118794272041">"Sync error..."</string>
+    <string name="sync_failed" msgid="1696499856374109647">"Sync failed"</string>
+    <string name="sync_active" msgid="8476943765960863040">"Sync active"</string>
+    <string name="account_sync_settings_title" msgid="5131314922423053588">"Sync"</string>
+    <string name="sync_is_failing" msgid="1591561768344128377">"Sync is currently experiencing problems. It will be back shortly."</string>
+    <string name="add_account_label" msgid="7811707265834013767">"Add account"</string>
+    <string name="managed_profile_not_available_label" msgid="852263300911325904">"Work profile isn\'t available yet"</string>
+    <string name="work_mode_label" msgid="5794470908668593961">"Work mode"</string>
+    <string name="work_mode_summary" msgid="1620246003886940776">"Allow work profile to function, including apps, background sync and related features"</string>
+    <string name="remove_managed_profile_label" msgid="3856519337797285325">"Remove work profile"</string>
+    <string name="background_data" msgid="5779592891375473817">"Background data"</string>
+    <string name="background_data_summary" msgid="8328521479872763452">"Apps can sync, send and receive data at any time"</string>
+    <string name="background_data_dialog_title" msgid="6059217698124786537">"Disable background data?"</string>
+    <string name="background_data_dialog_message" msgid="6981661606680941633">"Disabling background data extends battery life and lowers data use. Some apps may still use the background data connection."</string>
+    <string name="sync_automatically" msgid="1682730255435062059">"Auto-sync app data"</string>
+    <string name="sync_enabled" msgid="4551148952179416813">"Sync is ON"</string>
+    <string name="sync_disabled" msgid="8511659877596511991">"Sync is OFF"</string>
+    <string name="sync_error" msgid="5060969083117872149">"Sync error"</string>
+    <string name="last_synced" msgid="4242919465367022234">"Last synced <xliff:g id="LAST_SYNC_TIME">%1$s</xliff:g>"</string>
+    <string name="sync_in_progress" msgid="5151314196536070569">"Syncing now…"</string>
+    <string name="settings_backup" msgid="2274732978260797031">"Back up settings"</string>
+    <string name="settings_backup_summary" msgid="7916877705938054035">"Back up my settings"</string>
+    <string name="sync_menu_sync_now" msgid="6154608350395805683">"Sync now"</string>
+    <string name="sync_menu_sync_cancel" msgid="8292379009626966949">"Cancel sync"</string>
+    <string name="sync_one_time_sync" msgid="3733796114909082260">"Tap to sync now<xliff:g id="LAST_SYNC_TIME">
+%1$s</xliff:g>"</string>
+    <string name="sync_gmail" msgid="714886122098006477">"Gmail"</string>
+    <string name="sync_calendar" msgid="9056527206714733735">"Calendar"</string>
+    <string name="sync_contacts" msgid="9174914394377828043">"Contacts"</string>
+    <string name="sync_plug" msgid="3905078969081888738"><font fgcolor="#ffffffff">"Welcome to Google sync!"</font>" \nA Google approach to syncing data to allow access to your contacts, appointments and more from wherever you are."</string>
+    <string name="header_application_sync_settings" msgid="6205903695598000286">"App sync settings"</string>
+    <string name="header_data_and_synchronization" msgid="5165024023936509896">"Data &amp; synchronisation"</string>
+    <string name="preference_change_password_title" msgid="8955581790270130056">"Change password"</string>
+    <string name="header_account_settings" msgid="5382475087121880626">"Account settings"</string>
+    <string name="remove_account_label" msgid="5921986026504804119">"Remove account"</string>
+    <string name="header_add_an_account" msgid="756108499532023798">"Add an account"</string>
+    <string name="finish_button_label" msgid="481587707657751116">"Finish"</string>
+    <string name="really_remove_account_title" msgid="8800653398717172460">"Remove account?"</string>
+    <string name="really_remove_account_message" product="tablet" msgid="1936147502815641161">"Removing this account will delete all of its messages, contacts and other data from the tablet!"</string>
+    <string name="really_remove_account_message" product="default" msgid="3483528757922948356">"Removing this account will delete all of its messages, contacts and other data from the phone!"</string>
+    <string name="remove_account_failed" msgid="3901397272647112455">"This change isn\'t allowed by your admin"</string>
+    <string name="provider_label" msgid="7724593781904508866">"Push subscriptions"</string>
+    <!-- no translation found for sync_item_title (4782834606909853006) -->
+    <skip />
+    <string name="cant_sync_dialog_title" msgid="2777238588398046285">"Cannot sync manually"</string>
+    <string name="cant_sync_dialog_message" msgid="1938380442159016449">"Sync for this item is currently disabled. To change your preference, temporarily turn on background data and automatic sync."</string>
+    <string name="enter_password" msgid="8035706727471334122">"To start Android, enter your password"</string>
+    <string name="enter_pin" msgid="5305333588093263790">"To start Android, enter your PIN"</string>
+    <string name="enter_pattern" msgid="4187435713036808566">"To start Android, draw your pattern"</string>
+    <string name="cryptkeeper_wrong_pattern" msgid="8423835922362956999">"Wrong Pattern"</string>
+    <string name="cryptkeeper_wrong_password" msgid="5200857195368904047">"Wrong Password"</string>
+    <string name="cryptkeeper_wrong_pin" msgid="755720788765259382">"Wrong PIN"</string>
+    <string name="checking_decryption" msgid="8287458611802609493">"Checking…"</string>
+    <string name="starting_android" msgid="4001324195902252681">"Starting Android…"</string>
+    <string name="delete" msgid="4219243412325163003">"Delete"</string>
+    <string name="misc_files" msgid="6720680815969643497">"Misc. files"</string>
+    <string name="misc_files_selected_count" msgid="4647048020823912088">"selected <xliff:g id="NUMBER">%1$d</xliff:g> out of <xliff:g id="TOTAL">%2$d</xliff:g>"</string>
+    <string name="misc_files_selected_count_bytes" msgid="2876232009069114352">"<xliff:g id="NUMBER">%1$s</xliff:g> out of <xliff:g id="TOTAL">%2$s</xliff:g>"</string>
+    <string name="select_all" msgid="1562774643280376715">"Select all"</string>
+    <string name="data_plan_usage_manage_plans_button_text" msgid="8997761990902708162">"Manage plans"</string>
+    <string name="data_usage_summary_title" msgid="3804110657238092929">"Data usage"</string>
+    <string name="data_usage_app_summary_title" msgid="4147258989837459172">"App data usage"</string>
+    <string name="data_usage_accounting" msgid="7170028915873577387">"Operator data accounting may differ from your device."</string>
+    <string name="data_usage_app" msgid="4970478397515423303">"App usage"</string>
+    <string name="data_usage_app_info_label" msgid="3409931235687866706">"APP INFO"</string>
+    <string name="data_usage_cellular_data" msgid="9168928285122125137">"Mobile data"</string>
+    <string name="data_usage_data_limit" msgid="1193930999713192703">"Set data limit"</string>
+    <string name="data_usage_cycle" msgid="5652529796195787949">"Data usage cycle"</string>
+    <string name="data_usage_app_items_header_text" msgid="5017850810459372828">"App usage"</string>
+    <string name="data_usage_menu_roaming" msgid="8042359966835203296">"Data roaming"</string>
+    <string name="data_usage_menu_restrict_background" msgid="1989394568592253331">"Restrict background data"</string>
+    <string name="data_usage_menu_allow_background" msgid="2694761978633359223">"Allow background data"</string>
+    <string name="data_usage_menu_split_4g" msgid="5322857680792601899">"Separate 4G usage"</string>
+    <string name="data_usage_menu_show_wifi" msgid="2296217964873872571">"Show Wi‑Fi"</string>
+    <string name="data_usage_menu_hide_wifi" msgid="7290056718050186769">"Hide Wi‑Fi"</string>
+    <string name="data_usage_menu_show_ethernet" msgid="5181361208532314097">"Show Ethernet usage"</string>
+    <string name="data_usage_menu_hide_ethernet" msgid="3326702187179943681">"Hide Ethernet usage"</string>
+    <string name="data_usage_menu_metered" msgid="6235119991372755026">"Network restrictions"</string>
+    <string name="data_usage_menu_auto_sync" msgid="8203999775948778560">"Auto-sync data"</string>
+    <string name="data_usage_menu_sim_cards" msgid="6410498422797244073">"SIM cards"</string>
+    <string name="data_usage_menu_cellular_networks" msgid="8339835014751511300">"Mobile networks"</string>
+    <string name="data_usage_cellular_data_summary" msgid="8413357481361268285">"Paused at limit"</string>
+    <string name="account_settings_menu_auto_sync" msgid="6243013719753700377">"Auto-sync data"</string>
+    <string name="account_settings_menu_auto_sync_personal" msgid="785541379617346438">"Auto-sync personal data"</string>
+    <string name="account_settings_menu_auto_sync_work" msgid="329565580969147026">"Auto-sync work data"</string>
+    <string name="data_usage_change_cycle" msgid="7776556448920114866">"Change cycle…"</string>
+    <string name="data_usage_pick_cycle_day" msgid="4470796861757050966">"Day of month to reset data usage cycle:"</string>
+    <string name="data_usage_empty" msgid="8621855507876539282">"No apps used data during this period."</string>
+    <string name="data_usage_label_foreground" msgid="4938034231928628164">"Foreground"</string>
+    <string name="data_usage_label_background" msgid="3225844085975764519">"Background"</string>
+    <string name="data_usage_app_restricted" msgid="3568465218866589705">"restricted"</string>
+    <string name="data_usage_disable_mobile" msgid="8656552431969276305">"Turn off mobile data?"</string>
+    <string name="data_usage_disable_mobile_limit" msgid="4644364396844393848">"Set mobile data limit"</string>
+    <string name="data_usage_disable_4g_limit" msgid="6233554774946681175">"Set 4G data limit"</string>
+    <string name="data_usage_disable_3g_limit" msgid="2558557840444266906">"Set 2G-3G data limit"</string>
+    <string name="data_usage_disable_wifi_limit" msgid="1394901415264660888">"Set Wi‑Fi data limit"</string>
+    <string name="data_usage_tab_wifi" msgid="481146038146585749">"Wi‑Fi"</string>
+    <string name="data_usage_tab_ethernet" msgid="7298064366282319911">"Ethernet"</string>
+    <string name="data_usage_tab_mobile" msgid="454140350007299045">"Mobile"</string>
+    <string name="data_usage_tab_4g" msgid="1301978716067512235">"4G"</string>
+    <string name="data_usage_tab_3g" msgid="6092169523081538718">"2G-3G"</string>
+    <string name="data_usage_list_mobile" msgid="5588685410495019866">"Mobile"</string>
+    <string name="data_usage_list_none" msgid="3933892774251050735">"None"</string>
+    <string name="data_usage_enable_mobile" msgid="986782622560157977">"Mobile data"</string>
+    <string name="data_usage_enable_3g" msgid="6304006671869578254">"2G-3G data"</string>
+    <string name="data_usage_enable_4g" msgid="3635854097335036738">"4G data"</string>
+    <string name="data_usage_forground_label" msgid="7654319010655983591">"Foreground:"</string>
+    <string name="data_usage_background_label" msgid="2722008379947694926">"Background:"</string>
+    <string name="data_usage_app_settings" msgid="2279171379771253165">"App settings"</string>
+    <string name="data_usage_app_restrict_background" msgid="7359227831562303223">"Background data"</string>
+    <string name="data_usage_app_restrict_background_summary" msgid="5853552187570622572">"Enable usage of mobile data in the background"</string>
+    <string name="data_usage_app_restrict_background_summary_disabled" msgid="7401927377070755054">"To restrict background data for this app, first set a mobile data limit."</string>
+    <string name="data_usage_app_restrict_dialog_title" msgid="1613108390242737923">"Restrict background data?"</string>
+    <string name="data_usage_app_restrict_dialog" msgid="1466689968707308512">"This feature may cause an app that depends on background data to stop working when only mobile networks are available.\n\nYou can find more appropriate data usage controls in the settings available within the app."</string>
+    <string name="data_usage_restrict_denied_dialog" msgid="55012417305745608">"Restricting background data is possible only when you’ve set a mobile data limit."</string>
+    <string name="data_usage_auto_sync_on_dialog_title" msgid="2438617846762244389">"Turn auto-sync data on?"</string>
+    <string name="data_usage_auto_sync_on_dialog" product="tablet" msgid="8581983093524041669">"Any changes that you make to your accounts on the web will be automatically copied to your tablet.\n\nSome accounts may also automatically copy any changes that you make on the tablet to the web. A Google account works this way."</string>
+    <string name="data_usage_auto_sync_on_dialog" product="default" msgid="8651376294887142858">"Any changes that you make to your accounts on the web will be automatically copied to your phone.\n\nSome accounts may also automatically copy any changes that you make on the phone to the web. A Google account works this way."</string>
+    <string name="data_usage_auto_sync_off_dialog_title" msgid="9013139130490125793">"Turn auto-sync data off?"</string>
+    <string name="data_usage_auto_sync_off_dialog" msgid="4025938250775413864">"This will conserve data and battery usage, but you\'ll need to sync each account manually to collect recent information and you won\'t receive notifications when updates occur."</string>
+    <string name="data_usage_cycle_editor_title" msgid="1373797281540188533">"Usage cycle reset date"</string>
+    <string name="data_usage_cycle_editor_subtitle" msgid="5512903797979928416">"Date of each month:"</string>
+    <string name="data_usage_cycle_editor_positive" msgid="8821760330497941117">"Set"</string>
+    <string name="data_usage_warning_editor_title" msgid="3704136912240060339">"Set data usage warning"</string>
+    <string name="data_usage_limit_editor_title" msgid="9153595142385030015">"Set data usage limit"</string>
+    <string name="data_usage_limit_dialog_title" msgid="3023111643632996097">"Limiting data usage"</string>
+    <string name="data_usage_limit_dialog_mobile" product="tablet" msgid="4983487893343645667">"Your tablet will turn off mobile data once it reaches the limit you set.\n\nSince data usage is measured by your tablet, and your operator may account for usage differently, consider setting a conservative limit."</string>
+    <string name="data_usage_limit_dialog_mobile" product="default" msgid="3926320594049434225">"Your phone will turn off mobile data once it reaches the limit you set.\n\nSince data usage is measured by your phone, and your operator may account for usage differently, consider setting a conservative limit."</string>
+    <string name="data_usage_restrict_background_title" msgid="2201315502223035062">"Restrict background data?"</string>
+    <string name="data_usage_restrict_background" msgid="434093644726734586">"If you restrict background mobile data, some apps and services won’t work unless you’re connected to Wi‑Fi."</string>
+    <string name="data_usage_restrict_background_multiuser" product="tablet" msgid="7096707497743363380">"If you restrict background mobile data, some apps and services won’t work unless you’re connected to Wi‑Fi.\n\nThis setting affects all users on this tablet."</string>
+    <string name="data_usage_restrict_background_multiuser" product="default" msgid="7910798414964288424">"If you restrict background mobile data, some apps and services won’t work unless you’re connected to Wi‑Fi.\n\nThis setting affects all users on this phone."</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">"warning"</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">"limit"</font></string>
+    <string name="data_usage_uninstalled_apps" msgid="614263770923231598">"Removed apps"</string>
+    <string name="data_usage_uninstalled_apps_users" msgid="7986294489899813194">"Removed apps and users"</string>
+    <string name="data_usage_received_sent" msgid="5039699009276621757">"<xliff:g id="RECEIVED">%1$s</xliff:g> received, <xliff:g id="SENT">%2$s</xliff:g> sent"</string>
+    <string name="data_usage_total_during_range" msgid="4091294280619255237">"<xliff:g id="RANGE">%2$s</xliff:g>: about <xliff:g id="TOTAL">%1$s</xliff:g> used."</string>
+    <string name="data_usage_total_during_range_mobile" product="tablet" msgid="1925687342154538972">"<xliff:g id="RANGE">%2$s</xliff:g>: About <xliff:g id="TOTAL">%1$s</xliff:g> used, as measured by your tablet. Your operator\'s data usage accounting may differ."</string>
+    <string name="data_usage_total_during_range_mobile" product="default" msgid="5063981061103812900">"<xliff:g id="RANGE">%2$s</xliff:g>: About <xliff:g id="TOTAL">%1$s</xliff:g> used, as measured by your phone. Your operator\'s data usage accounting may differ."</string>
+    <string name="data_usage_metered_title" msgid="7383175371006596441">"Network restrictions"</string>
+    <string name="data_usage_metered_body" msgid="7655851702771342507">"Metered networks are treated like mobile networks when background data is restricted. Apps may warn before using these networks for large downloads."</string>
+    <string name="data_usage_metered_mobile" msgid="5423305619126978393">"Mobile networks"</string>
+    <string name="data_usage_metered_wifi" msgid="1761738002328299714">"Metered Wi‑Fi networks"</string>
+    <string name="data_usage_metered_wifi_disabled" msgid="727808462375941567">"To select metered networks, turn Wi‑Fi on."</string>
+    <string name="data_usage_metered_auto" msgid="1262028400911918865">"Automatic"</string>
+    <string name="data_usage_metered_yes" msgid="9217539611385225894">"Metered"</string>
+    <string name="data_usage_metered_no" msgid="4025232961929071789">"Not metered"</string>
+    <string name="data_usage_disclaimer" msgid="6887858149980673444">"Operator data accounting may differ from your device."</string>
+    <string name="cryptkeeper_emergency_call" msgid="198578731586097145">"Emergency call"</string>
+    <string name="cryptkeeper_return_to_call" msgid="5613717339452772491">"Return to call"</string>
+    <string name="vpn_name" msgid="4689699885361002297">"Name"</string>
+    <string name="vpn_type" msgid="5435733139514388070">"Type"</string>
+    <string name="vpn_server" msgid="2123096727287421913">"Server address"</string>
+    <string name="vpn_mppe" msgid="6639001940500288972">"PPP encryption (MPPE)"</string>
+    <string name="vpn_l2tp_secret" msgid="529359749677142076">"L2TP secret"</string>
+    <string name="vpn_ipsec_identifier" msgid="4098175859460006296">"IPSec identifier"</string>
+    <string name="vpn_ipsec_secret" msgid="4526453255704888704">"IPSec preshared key"</string>
+    <string name="vpn_ipsec_user_cert" msgid="6880651510020187230">"IPSec user certificate"</string>
+    <string name="vpn_ipsec_ca_cert" msgid="91338213449148229">"IPSec CA certificate"</string>
+    <string name="vpn_ipsec_server_cert" msgid="6599276718456935010">"IPSec server certificate"</string>
+    <string name="vpn_show_options" msgid="7182688955890457003">"Show advanced options"</string>
+    <string name="vpn_search_domains" msgid="5391995501541199624">"DNS search domains"</string>
+    <string name="vpn_dns_servers" msgid="5570715561245741829">"DNS servers (e.g. 8.8.8.8)"</string>
+    <string name="vpn_routes" msgid="3818655448226312232">"Forwarding routes (e.g. 10.0.0.0/8)"</string>
+    <string name="vpn_username" msgid="1863901629860867849">"Username"</string>
+    <string name="vpn_password" msgid="6756043647233596772">"Password"</string>
+    <string name="vpn_save_login" msgid="6350322456427484881">"Save account information"</string>
+    <string name="vpn_not_used" msgid="9094191054524660891">"(not used)"</string>
+    <string name="vpn_no_ca_cert" msgid="8776029412793353361">"(don\'t verify server)"</string>
+    <string name="vpn_no_server_cert" msgid="2167487440231913330">"(received from server)"</string>
+    <string name="vpn_always_on_invalid_reason_type" msgid="7574518311224455825">"This VPN type can\'t stay connected at all times"</string>
+    <string name="vpn_always_on_invalid_reason_server" msgid="477304620899799383">"Always-on VPN only supports numeric server addresses"</string>
+    <string name="vpn_always_on_invalid_reason_no_dns" msgid="2226648961940273294">"A DNS server must be specified for always-on VPN"</string>
+    <string name="vpn_always_on_invalid_reason_dns" msgid="3551394495620249972">"DNS server addresses must be numeric for always-on VPN"</string>
+    <string name="vpn_always_on_invalid_reason_other" msgid="5959352052515258208">"The information entered doesn\'t support always-on VPN"</string>
+    <string name="vpn_cancel" msgid="1979937976123659332">"Cancel"</string>
+    <string name="vpn_done" msgid="8678655203910995914">"Dismiss"</string>
+    <string name="vpn_save" msgid="4233484051644764510">"Save"</string>
+    <string name="vpn_connect" msgid="8469608541746132301">"Connect"</string>
+    <string name="vpn_replace" msgid="5442836256121957861">"Replace"</string>
+    <string name="vpn_edit" msgid="8647191407179996943">"Edit VPN profile"</string>
+    <string name="vpn_forget" msgid="3684651372749415446">"Forget"</string>
+    <string name="vpn_connect_to" msgid="5965299358485793260">"Connect to <xliff:g id="PROFILE">%s</xliff:g>"</string>
+    <string name="vpn_disconnect_confirm" msgid="3743970132487505659">"Disconnect this VPN?"</string>
+    <string name="vpn_disconnect" msgid="7426570492642111171">"Disconnect"</string>
+    <string name="vpn_version" msgid="1939804054179766249">"Version <xliff:g id="VERSION">%s</xliff:g>"</string>
+    <string name="vpn_forget_long" msgid="2232239391189465752">"Forget VPN"</string>
+    <string name="vpn_replace_vpn_title" msgid="2963898301277610248">"Replace existing VPN?"</string>
+    <string name="vpn_set_vpn_title" msgid="4009987321156037267">"Set always-on VPN?"</string>
+    <string name="vpn_first_always_on_vpn_message" msgid="3025322109743675467">"By turning on this setting, you won\'t have an Internet connection until the VPN successfully connects"</string>
+    <string name="vpn_replace_always_on_vpn_enable_message" msgid="2577928591361606641">"Your existing VPN will be replaced and you won\'t have an Internet connection until the VPN successfully connects"</string>
+    <string name="vpn_replace_always_on_vpn_disable_message" msgid="3011818750025879902">"You\'re already connected to an always-on VPN. If you connect to a different one, your existing VPN will be replaced and always-on mode will turn off."</string>
+    <string name="vpn_replace_vpn_message" msgid="5611635724578812860">"You\'re already connected to a VPN. If you connect to a different one, your existing VPN will be replaced."</string>
+    <string name="vpn_turn_on" msgid="2363136869284273872">"Turn on"</string>
+    <string name="vpn_cant_connect_title" msgid="4517706987875907511">"<xliff:g id="VPN_NAME">%1$s</xliff:g> can\'t connect"</string>
+    <string name="vpn_cant_connect_message" msgid="1352832123114214283">"This app doesn\'t support always-on VPN"</string>
+    <string name="vpn_title" msgid="6317731879966640551">"VPN"</string>
+    <string name="vpn_create" msgid="5628219087569761496">"Add VPN profile"</string>
+    <string name="vpn_menu_edit" msgid="408275284159243490">"Edit profile"</string>
+    <string name="vpn_menu_delete" msgid="8098021690546891414">"Delete profile"</string>
+    <string name="vpn_menu_lockdown" msgid="7863024538064268139">"Always-on VPN"</string>
+    <string name="vpn_no_vpns_added" msgid="5002741367858707244">"No VPNs added"</string>
+    <string name="vpn_always_on_summary" msgid="2821344524094363617">"Stay connected to VPN at all times"</string>
+    <string name="vpn_always_on_summary_not_supported" msgid="592304911378771510">"Not supported by this app"</string>
+    <string name="vpn_always_on_summary_active" msgid="8800736191241875669">"Always-on active"</string>
+    <string name="vpn_require_connection" msgid="8388183166574269666">"Block connections without VPN"</string>
+    <string name="vpn_require_connection_title" msgid="159053539340576331">"Require VPN connection?"</string>
+    <string name="vpn_lockdown_summary" msgid="2200032066376720339">"Select a VPN profile to always remain connected to. Network traffic will only be allowed when connected to this VPN."</string>
+    <string name="vpn_lockdown_none" msgid="9214462857336483711">"None"</string>
+    <string name="vpn_lockdown_config_error" msgid="3898576754914217248">"Always-on VPN requires an IP address for both server and DNS."</string>
+    <string name="vpn_no_network" msgid="3050233675132726155">"There is no network connection. Please try again later."</string>
+    <string name="vpn_disconnected" msgid="280531508768927471">"Disconnected from VPN"</string>
+    <string name="vpn_disconnected_summary" msgid="3082851661207900606">"None"</string>
+    <string name="vpn_missing_cert" msgid="5357192202207234745">"A certificate is missing. Try editing the profile."</string>
+    <string name="trusted_credentials_system_tab" msgid="3984284264816924534">"System"</string>
+    <string name="trusted_credentials_user_tab" msgid="2244732111398939475">"User"</string>
+    <string name="trusted_credentials_disable_label" msgid="3864493185845818506">"Disable"</string>
+    <string name="trusted_credentials_enable_label" msgid="2498444573635146913">"Enable"</string>
+    <string name="trusted_credentials_remove_label" msgid="3633691709300260836">"Remove"</string>
+    <string name="trusted_credentials_trust_label" msgid="8003264222650785429">"Trust"</string>
+    <string name="trusted_credentials_enable_confirmation" msgid="83215982842660869">"Enable the system CA certificate?"</string>
+    <string name="trusted_credentials_disable_confirmation" msgid="8199697813361646792">"Disable the system CA certificate?"</string>
+    <string name="trusted_credentials_remove_confirmation" msgid="443561923016852941">"Permanently remove the user CA certificate?"</string>
+    <string name="credential_contains" msgid="3984922924723974084">"This entry contains:"</string>
+    <string name="one_userkey" msgid="6034020579534914349">"one user key"</string>
+    <string name="one_usercrt" msgid="2150319011101639509">"one user certificate"</string>
+    <string name="one_cacrt" msgid="6844397037970164809">"one CA certificate"</string>
+    <string name="n_cacrts" msgid="5979300323482053820">"%d CA certificates"</string>
+    <string name="user_credential_title" msgid="1954061209643070652">"Credential details"</string>
+    <string name="user_credential_removed" msgid="6514189495799401838">"Removed credential: <xliff:g id="CREDENTIAL_NAME">%s</xliff:g>"</string>
+    <string name="user_credential_none_installed" msgid="3729607560420971841">"No user credentials installed"</string>
+    <string name="spellcheckers_settings_title" msgid="399981228588011501">"Spell checker"</string>
+    <string name="current_backup_pw_prompt" msgid="7735254412051914576">"Type your current full backup password here"</string>
+    <string name="new_backup_pw_prompt" msgid="8755501377391998428">"Type a new password for full backups here"</string>
+    <string name="confirm_new_backup_pw_prompt" msgid="3238728882512787864">"Retype your new full backup password here"</string>
+    <string name="backup_pw_set_button_text" msgid="2387480910044648795">"Set backup password"</string>
+    <string name="backup_pw_cancel_button_text" msgid="8845630125391744615">"Cancel"</string>
+    <string name="additional_system_update_settings_list_item_title" msgid="214987609894661992">"Additional system updates"</string>
+    <string name="ssl_ca_cert_warning" msgid="2045866713601984673">"Network may be monitored"</string>
+    <string name="done_button" msgid="1991471253042622230">"Done"</string>
+    <plurals name="ssl_ca_cert_dialog_title" formatted="false" msgid="7145092748045794650">
+      <item quantity="other">Trust or remove certificates</item>
+      <item quantity="one">Trust or remove certificate</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> 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="one"><xliff:g id="MANAGING_DOMAIN_0">%s</xliff:g> has installed a certificate authority on your device, which may allow them to monitor your device network activity, including emails, apps and secure websites.\n\nFor more information about this certificate, contact your admin.</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> 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="one"><xliff:g id="MANAGING_DOMAIN_0">%s</xliff:g> has installed a certificate authority for your work profile, which may allow them to monitor work network activity, including emails, apps and secure websites.\n\nFor more information about this certificate, contact your admin.</item>
+    </plurals>
+    <string name="ssl_ca_cert_warning_message" msgid="8216218659139190498">"A third party is capable of monitoring your network activity, including emails, apps and secure websites.\n\nA trusted credential installed on your device is making this possible."</string>
+    <plurals name="ssl_ca_cert_settings_button" formatted="false" msgid="2426799352517325228">
+      <item quantity="other">Check certificates</item>
+      <item quantity="one">Check certificate</item>
+    </plurals>
+    <string name="user_settings_title" msgid="6151874007858148344">"Users"</string>
+    <string name="user_list_title" msgid="7937158411137563543">"Users &amp; profiles"</string>
+    <string name="user_add_user_or_profile_menu" msgid="6923838875175259418">"Add user or profile"</string>
+    <string name="user_add_user_menu" msgid="1675956975014862382">"Add user"</string>
+    <string name="user_summary_restricted_profile" msgid="6354966213806839107">"Restricted profile"</string>
+    <string name="user_need_lock_message" msgid="5879715064416886811">"Before you can create a restricted profile, you\'ll need to set up a screen lock to protect your apps and personal data."</string>
+    <string name="user_set_lock_button" msgid="8311219392856626841">"Set lock"</string>
+    <string name="user_summary_not_set_up" msgid="8778205026866794909">"Not set up"</string>
+    <string name="user_summary_restricted_not_set_up" msgid="1628116001964325544">"Not set up - Restricted profile"</string>
+    <string name="user_summary_managed_profile_not_set_up" msgid="1659125858619760573">"Not set up – Work profile"</string>
+    <string name="user_admin" msgid="993402590002400782">"Admin"</string>
+    <string name="user_you" msgid="1639158809315025986">"You (<xliff:g id="NAME">%s</xliff:g>)"</string>
+    <string name="user_nickname" msgid="5148818000228994488">"Nickname"</string>
+    <string name="user_add_user_type_title" msgid="2146438670792322349">"Add"</string>
+    <string name="user_add_max_count" msgid="5405885348463433157">"You can add up to <xliff:g id="USER_COUNT">%1$d</xliff:g> users"</string>
+    <string name="user_add_user_item_summary" msgid="4702776187132008661">"Users have their own apps and content"</string>
+    <string name="user_add_profile_item_summary" msgid="5931663986889138941">"You can restrict access to apps and content from your account"</string>
+    <string name="user_add_user_item_title" msgid="8212199632466198969">"User"</string>
+    <string name="user_add_profile_item_title" msgid="8353515490730363621">"Restricted profile"</string>
+    <string name="user_add_user_title" msgid="2108112641783146007">"Add new user?"</string>
+    <string name="user_add_user_message_long" msgid="8562152293752222985">"You can share this device with other people by creating additional users. Each user has their own space, which they can customise with apps, wallpaper and so on. Users can also adjust device settings like Wi‑Fi that affect everyone.\n\nWhen you add a new user, that person needs to set up their space.\n\nAny user can update apps for all other users."</string>
+    <string name="user_add_user_message_short" msgid="1511354412249044381">"When you add a new user, that person needs to set up their space.\n\nAny user can update apps for all other users."</string>
+    <string name="user_setup_dialog_title" msgid="1765794166801864563">"Set up user now?"</string>
+    <string name="user_setup_dialog_message" msgid="1004068621380867148">"Make sure that the person is available to take the device and set up their space"</string>
+    <string name="user_setup_profile_dialog_message" msgid="3896568553327558731">"Set up profile now?"</string>
+    <string name="user_setup_button_setup_now" msgid="3391388430158437629">"Set up now"</string>
+    <string name="user_setup_button_setup_later" msgid="3068729597269172401">"Not now"</string>
+    <string name="user_cannot_manage_message" product="tablet" msgid="7153048188252553320">"Only the tablet\'s owner can manage users."</string>
+    <string name="user_cannot_manage_message" product="default" msgid="959315813089950649">"Only the phone\'s owner can manage users."</string>
+    <string name="user_cannot_add_accounts_message" msgid="5116692653439737050">"Restricted profiles cannot add accounts"</string>
+    <string name="user_remove_user_menu" msgid="6897150520686691355">"Delete <xliff:g id="USER_NAME">%1$s</xliff:g> from this device"</string>
+    <string name="user_lockscreen_settings" msgid="4965661345247084878">"Lock screen settings"</string>
+    <string name="user_add_on_lockscreen_menu" msgid="9072312646546364619">"Add users from lock screen"</string>
+    <string name="user_new_user_name" msgid="369856859816028856">"New user"</string>
+    <string name="user_new_profile_name" msgid="2632088404952119900">"New profile"</string>
+    <string name="user_confirm_remove_self_title" msgid="8432050170899479556">"Delete yourself?"</string>
+    <string name="user_confirm_remove_title" msgid="1163721647646152032">"Remove this user?"</string>
+    <string name="user_profile_confirm_remove_title" msgid="5573161550669867342">"Remove this profile?"</string>
+    <string name="work_profile_confirm_remove_title" msgid="2017323555783522213">"Remove work profile?"</string>
+    <string name="user_confirm_remove_self_message" product="tablet" msgid="2391372805233812410">"You will lose your space and data on this tablet. You can\'t undo this action."</string>
+    <string name="user_confirm_remove_self_message" product="default" msgid="7943645442479360048">"You will lose your space and data on this phone. You can\'t undo this action."</string>
+    <string name="user_confirm_remove_message" msgid="1020629390993095037">"All apps and data will be deleted."</string>
+    <string name="work_profile_confirm_remove_message" msgid="323856589749078140">"All apps and data in this profile will be deleted if you continue."</string>
+    <string name="user_profile_confirm_remove_message" msgid="7373754145959298522">"All apps and data will be deleted."</string>
+    <string name="user_adding_new_user" msgid="1521674650874241407">"Adding new user…"</string>
+    <string name="user_delete_user_description" msgid="3158592592118767056">"Delete user"</string>
+    <string name="user_delete_button" msgid="5131259553799403201">"Delete"</string>
+    <string name="user_guest" msgid="8475274842845401871">"Guest"</string>
+    <string name="user_exit_guest_title" msgid="5613997155527410675">"Remove guest"</string>
+    <string name="user_exit_guest_confirm_title" msgid="3405527634738147409">"Remove guest?"</string>
+    <string name="user_exit_guest_confirm_message" msgid="2194459201944413257">"All apps and data in this session will be deleted."</string>
+    <string name="user_exit_guest_dialog_remove" msgid="6351370829952745350">"Remove"</string>
+    <string name="user_enable_calling" msgid="5128605672081602348">"Turn on phone calls"</string>
+    <string name="user_enable_calling_sms" msgid="9172507088023097063">"Turn on phone calls &amp; SMS"</string>
+    <string name="user_remove_user" msgid="6490483480937295389">"Remove user"</string>
+    <string name="user_enable_calling_confirm_title" msgid="4315789475268695378">"Turn on phone calls?"</string>
+    <string name="user_enable_calling_confirm_message" msgid="8061594235219352787">"Call history will be shared with this user."</string>
+    <string name="user_enable_calling_and_sms_confirm_title" msgid="7243308401401932681">"Turn on phone calls &amp; SMS?"</string>
+    <string name="user_enable_calling_and_sms_confirm_message" msgid="4025082715546544967">"Call and SMS history will be shared with this user."</string>
+    <string name="emergency_info_title" msgid="208607506217060337">"Emergency information"</string>
+    <string name="emergency_info_summary" msgid="5062945162967838521">"Info &amp; contacts for <xliff:g id="USER_NAME">%1$s</xliff:g>"</string>
+    <string name="application_restrictions" msgid="8207332020898004394">"Allow apps and content"</string>
+    <string name="apps_with_restrictions_header" msgid="3660449891478534440">"Applications with restrictions"</string>
+    <string name="apps_with_restrictions_settings_button" msgid="3841347287916635821">"Expand settings for application"</string>
+    <string name="global_change_warning" product="tablet" msgid="8045013389464294039">"This setting affects all users on this tablet."</string>
+    <string name="global_change_warning" product="default" msgid="2461264421590324675">"This setting affects all users on this phone."</string>
+    <string name="global_locale_change_title" msgid="5956281361384221451">"Change language"</string>
+    <string name="nfc_payment_settings_title" msgid="1807298287380821613">"Tap &amp; pay"</string>
+    <string name="nfc_payment_how_it_works" msgid="3028822263837896720">"How it works"</string>
+    <string name="nfc_payment_no_apps" msgid="5477904979148086424">"Pay with your phone in shops"</string>
+    <string name="nfc_payment_default" msgid="8648420259219150395">"Payment default"</string>
+    <string name="nfc_payment_default_not_set" msgid="7485060884228447765">"Not set"</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">"Use default"</string>
+    <string name="nfc_payment_favor_default" msgid="5743781166099608372">"always"</string>
+    <string name="nfc_payment_favor_open" msgid="1923314062109977944">"Except when another payment app is open"</string>
+    <string name="nfc_payment_pay_with" msgid="7524904024378144072">"At a Tap &amp; pay terminal, pay with:"</string>
+    <string name="nfc_how_it_works_title" msgid="1984068457698797207">"Paying at the terminal"</string>
+    <string name="nfc_how_it_works_content" msgid="4749007806393224934">"Set up a payment app. Then just hold the back of your phone up to any terminal with the contactless symbol."</string>
+    <string name="nfc_how_it_works_got_it" msgid="259653300203217402">"Got it"</string>
+    <string name="nfc_more_title" msgid="815910943655133280">"More..."</string>
+    <string name="nfc_payment_set_default_label" msgid="7315817259485674542">"Set as your preference?"</string>
+    <string name="nfc_payment_set_default" msgid="8532426406310833489">"Always use <xliff:g id="APP">%1$s</xliff:g> when you Tap &amp; pay?"</string>
+    <string name="nfc_payment_set_default_instead_of" msgid="6993301165940432743">"Always use <xliff:g id="APP_0">%1$s</xliff:g> instead of <xliff:g id="APP_1">%2$s</xliff:g> when you Tap &amp; pay?"</string>
+    <string name="restriction_settings_title" msgid="4233515503765879736">"Restrictions"</string>
+    <string name="restriction_menu_reset" msgid="2067644523489568173">"Remove restrictions"</string>
+    <string name="restriction_menu_change_pin" msgid="740081584044302775">"Change PIN"</string>
+    <string name="app_notifications_switch_label" msgid="9124072219553687583">"Show notifications"</string>
+    <string name="help_label" msgid="6886837949306318591">"Help &amp; feedback"</string>
+    <string name="support_summary" msgid="2705726826263742491">"Help articles, phone &amp; chat, getting started"</string>
+    <string name="user_account_title" msgid="1127193807312271167">"Account for content"</string>
+    <string name="user_picture_title" msgid="7297782792000291692">"Photo ID"</string>
+    <string name="extreme_threats_title" msgid="6549541803542968699">"Extreme threats"</string>
+    <string name="extreme_threats_summary" msgid="8777860706500920667">"Receive alerts for extreme threats to life and property"</string>
+    <string name="severe_threats_title" msgid="8362676353803170963">"Severe threats"</string>
+    <string name="severe_threats_summary" msgid="8848126509420177320">"Receive alerts for severe threats to life and property"</string>
+    <string name="amber_alerts_title" msgid="2772220337031146529">"AMBER alerts"</string>
+    <string name="amber_alerts_summary" msgid="4312984614037904489">"Receive bulletins about child abductions"</string>
+    <string name="repeat_title" msgid="6473587828597786996">"Repeat"</string>
+    <string name="call_manager_enable_title" msgid="7718226115535784017">"Enable Call Manager"</string>
+    <string name="call_manager_enable_summary" msgid="8458447798019519240">"Allow this service to manage how your calls are made."</string>
+    <string name="call_manager_title" msgid="4479949569744516457">"Call Manager"</string>
+    <!-- no translation found for call_manager_summary (5918261959486952674) -->
+    <skip />
+    <string name="cell_broadcast_settings" msgid="4124461751977706019">"Emergency alerts"</string>
+    <string name="network_operators_settings" msgid="2583178259504630435">"Network operators"</string>
+    <string name="access_point_names" msgid="1381602020438634481">"Access point names"</string>
+    <string name="enhanced_4g_lte_mode_title" msgid="5808043757309522392">"Enhanced 4G LTE Mode"</string>
+    <string name="enhanced_4g_lte_mode_summary" msgid="1376589643017218924">"Use LTE data to enhance voice and communications (Recommended)"</string>
+    <string name="preferred_network_type_title" msgid="3431041717309776341">"Preferred network type"</string>
+    <string name="preferred_network_type_summary" msgid="6564884693884755019">"LTE (recommended)"</string>
+    <string name="work_sim_title" msgid="4843322164662606891">"Work SIM"</string>
+    <string name="user_restrictions_title" msgid="5794473784343434273">"App &amp; content access"</string>
+    <string name="user_rename" msgid="8523499513614655279">"RENAME"</string>
+    <string name="app_restrictions_custom_label" msgid="6160672982086584261">"Set app restrictions"</string>
+    <string name="user_restrictions_controlled_by" msgid="3164078767438313899">"Controlled by <xliff:g id="APP">%1$s</xliff:g>"</string>
+    <string name="app_sees_restricted_accounts" msgid="7503264525057246240">"This app can access your accounts"</string>
+    <string name="app_sees_restricted_accounts_and_controlled_by" msgid="6968697624437267294">"This app can access your accounts. Controlled by <xliff:g id="APP">%1$s</xliff:g>"</string>
+    <string name="restriction_wifi_config_title" msgid="8889556384136994814">"Wi‑Fi and Mobile"</string>
+    <string name="restriction_wifi_config_summary" msgid="70888791513065244">"Allow modification of Wi‑Fi and Mobile settings"</string>
+    <string name="restriction_bluetooth_config_title" msgid="8871681580962503671">"Bluetooth"</string>
+    <string name="restriction_bluetooth_config_summary" msgid="8372319681287562506">"Allow modification of Bluetooth pairings and settings"</string>
+    <string name="restriction_nfc_enable_title" msgid="5888100955212267941">"NFC"</string>
+    <string name="restriction_nfc_enable_summary_config" msgid="3232480757215851738">"Allow data exchange when this <xliff:g id="DEVICE_NAME">%1$s</xliff:g> touches another NFC device"</string>
+    <string name="restriction_nfc_enable_summary" product="tablet" msgid="3891097373396149915">"Allow data exchange when the tablet touches another device"</string>
+    <string name="restriction_nfc_enable_summary" product="default" msgid="825331120501418592">"Allow data exchange when the phone touches another device"</string>
+    <string name="restriction_location_enable_title" msgid="5020268888245775164">"Location"</string>
+    <string name="restriction_location_enable_summary" msgid="3489765572281788755">"Let apps use your location information"</string>
+    <string name="wizard_back" msgid="5567007959434765743">"Back"</string>
+    <string name="wizard_next" msgid="3606212602795100640">"Next"</string>
+    <string name="wizard_finish" msgid="3286109692700083252">"Finish"</string>
+    <string name="user_image_take_photo" msgid="1280274310152803669">"Take photo"</string>
+    <string name="user_image_choose_photo" msgid="7940990613897477057">"Choose photo from Gallery"</string>
+    <string name="user_image_photo_selector" msgid="5492565707299454873">"Select photo"</string>
+    <string name="regulatory_info_text" msgid="5623087902354026557"></string>
+    <string name="sim_setup_wizard_title" msgid="1732682852692274928">"SIM cards"</string>
+    <string name="sim_settings_title" msgid="6822745211458959756">"SIM cards"</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">"SIM cards have changed"</string>
+    <string name="sim_cards_changed_message_summary" msgid="8258058274989383204">"Tap to set activities"</string>
+    <string name="sim_cellular_data_unavailable" msgid="9109302537004566098">"Mobile data is unavailable"</string>
+    <string name="sim_cellular_data_unavailable_summary" msgid="5416535001368135327">"Tap to select a data SIM"</string>
+    <string name="sim_calls_always_use" msgid="7936774751250119715">"Always use this for calls"</string>
+    <string name="select_sim_for_data" msgid="2366081042162853044">"Select a SIM for data"</string>
+    <string name="data_switch_started" msgid="2040761479817166311">"Switching data SIM, this may take up to a minute..."</string>
+    <string name="select_sim_for_calls" msgid="3503094771801109334">"Call with"</string>
+    <string name="sim_select_card" msgid="211285163525563293">"Select a SIM card"</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 empty"</string>
+    <string name="sim_editor_name" msgid="1722945976676142029">"SIM name"</string>
+    <string name="sim_name_hint" msgid="7038643345238968930">"Enter SIM name"</string>
+    <string name="sim_editor_title" msgid="4034301817366627870">"SIM slot %1$d"</string>
+    <string name="sim_editor_carrier" msgid="5684523444677746573">"Operator"</string>
+    <string name="sim_editor_number" msgid="6705955651035440667">"Number"</string>
+    <string name="sim_editor_color" msgid="2542605938562414355">"SIM colour"</string>
+    <string name="sim_card_select_title" msgid="6668492557519243456">"Select SIM card"</string>
+    <string name="color_orange" msgid="4417567658855022517">"Orange"</string>
+    <string name="color_purple" msgid="3888532466427762504">"Purple"</string>
+    <string name="sim_no_inserted_msg" msgid="210316755353227087">"No SIM cards inserted"</string>
+    <string name="sim_status_title" msgid="6744870675182447160">"SIM status"</string>
+    <string name="sim_call_back_title" msgid="5181549885999280334">"Call back from default SIM"</string>
+    <string name="sim_outgoing_call_title" msgid="1019763076116874255">"SIM for outgoing calls"</string>
+    <string name="sim_other_call_settings" msgid="8247802316114482477">"Other call settings"</string>
+    <string name="preferred_network_offload_title" msgid="1605829724169550275">"Preferred network Offload"</string>
+    <string name="preferred_network_offload_header" msgid="2321173571529106767">"Disable Network Name Broadcast"</string>
+    <string name="preferred_network_offload_footer" msgid="5857279426054744020">"Disable Network Name Broadcast protects from third parties getting access to your network information."</string>
+    <string name="preferred_network_offload_popup" msgid="2252915199889604600">"Disabling Network Name Broadcast will prevent automatic connection to hidden networks."</string>
+    <string name="sim_signal_strength" msgid="9144010043784767984">"<xliff:g id="DBM">%1$d</xliff:g> dBm <xliff:g id="ASU">%2$d</xliff:g> asu"</string>
+    <string name="sim_notification_title" msgid="6272913297433198340">"SIM cards changed."</string>
+    <string name="sim_notification_summary" msgid="8858043655706669772">"Tap to set up"</string>
+    <string name="sim_pref_divider" msgid="6778907671867621874">"Preferred SIM for"</string>
+    <string name="sim_calls_ask_first_prefs_title" msgid="7941299533514115976">"Ask every time"</string>
+    <string name="sim_selection_required_pref" msgid="3446721423206414652">"Selection required"</string>
+    <string name="dashboard_title" msgid="5453710313046681820">"Settings"</string>
+    <plurals name="settings_suggestion_header_summary_hidden_items" formatted="false" msgid="5597356221942118048">
+      <item quantity="other">Show %d hidden items</item>
+      <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_mobile" msgid="3851083934739500429">"Mobile"</string>
+    <string name="network_dashboard_summary_data_usage" msgid="3843261364705042212">"Data Usage"</string>
+    <string name="network_dashboard_summary_hotspot" msgid="8494210248613254574">"Hotspot"</string>
+    <string name="connected_devices_dashboard_title" msgid="2355264951438890709">"Connected devices"</string>
+    <string name="connected_devices_dashboard_summary" msgid="2390582103384791904">"Bluetooth, cast, NFC"</string>
+    <string name="connected_devices_dashboard_no_nfc_summary" msgid="9106040742715366495">"Bluetooth, Cast"</string>
+    <string name="app_and_notification_dashboard_title" msgid="7838365599185397539">"Apps &amp; notifications"</string>
+    <string name="app_and_notification_dashboard_summary" msgid="2363314178802548682">"Permissions, default apps"</string>
+    <string name="account_dashboard_title" msgid="4936890821712178853">"Users &amp; accounts"</string>
+    <string name="app_default_dashboard_title" msgid="7342549305933047317">"Default apps"</string>
+    <string name="system_dashboard_summary" msgid="5797743225249766685">"Languages, time, backup, updates"</string>
+    <string name="search_results_title" msgid="1796252422574886932">"Settings"</string>
+    <string name="search_menu" msgid="6283419262313758339">"Search Settings"</string>
+    <string name="query_hint_text" msgid="3350700807437473939">"Search settings"</string>
+    <string name="keywords_wifi" msgid="1395786161993828719">"wi-fi, Wi-Fi, network connection"</string>
+    <string name="keywords_more_default_sms_app" msgid="2265154063220360784">"text message, texting, messages, messaging"</string>
+    <string name="keywords_more_mobile_networks" msgid="8995946622054642367">"mobile, mobile operator, wireless, data, 4g,3g, 2g, lte"</string>
+    <string name="keywords_wifi_calling" msgid="1784064367330122679">"wi-fi, Wi-Fi, call, calling"</string>
+    <string name="keywords_home" msgid="3626170808219458848">"launcher"</string>
+    <string name="keywords_display" msgid="8910345814565493016">"screen, touchscreen"</string>
+    <string name="keywords_display_brightness_level" msgid="3891383826236015854">"dim screen, touchscreen, battery"</string>
+    <string name="keywords_display_auto_brightness" msgid="3325150824507953765">"dim screen, touchscreen, battery"</string>
+    <string name="keywords_display_night_display" msgid="7630169927425425754">"dim screen, night, tint"</string>
+    <string name="keywords_display_wallpaper" msgid="7362076351860131776">"background, personalise, customise display"</string>
+    <string name="keywords_display_font_size" msgid="3404655440064726124">"text size"</string>
+    <string name="keywords_display_cast_screen" msgid="7684618996741933067">"project, cast"</string>
+    <string name="keywords_storage" msgid="3299217909546089225">"space, disk, hard drive, device usage"</string>
+    <string name="keywords_battery" msgid="1173830745699768388">"power usage, charge"</string>
+    <string name="keywords_spell_checker" msgid="1399641226370605729">"spelling, dictionary, spellcheck, auto-correct"</string>
+    <string name="keywords_voice_input" msgid="769778245192531102">"recogniser, input, speech, speak, language, hands-free, hand free recognition, offensive word, audio history, Bluetooth headset"</string>
+    <string name="keywords_text_to_speech_output" msgid="5150660047085754699">"rate, language, default, speak, speaking, tts, accessibility, screen reader, blind"</string>
+    <string name="keywords_date_and_time" msgid="758325881602648204">"clock, military"</string>
+    <string name="keywords_network_reset" msgid="6024276007080940820">"reset, restore, factory"</string>
+    <string name="keywords_factory_data_reset" msgid="5894970373671252165">"wipe, delete, restore, clear, remove"</string>
+    <string name="keywords_printing" msgid="1701778563617114846">"printer"</string>
+    <string name="keywords_sounds" msgid="7146245090127541167">"speaker beep"</string>
+    <string name="keywords_sounds_and_notifications_interruptions" msgid="5426093074031208917">"don\'t disturb, interrupt, interruption, break"</string>
+    <string name="keywords_app" msgid="6334757056536837791">"RAM"</string>
+    <string name="keywords_location" msgid="6615286961552714686">"nearby, location, history, reporting"</string>
+    <string name="keywords_location_mode" msgid="8584992704568356084">"accuracy"</string>
+    <string name="keywords_accounts" msgid="1957925565953357627">"account"</string>
+    <string name="keywords_users" msgid="3434190133131387942">"restriction, restrict, restricted"</string>
+    <string name="keywords_keyboard_and_ime" msgid="9143339015329957107">"text correction, correct, sound, vibrate, auto, language, gesture, suggest, suggestion, theme, offensive, word, type, emoji, international"</string>
+    <string name="keywords_reset_apps" msgid="5293291209613191845">"reset, preferences, default"</string>
+    <string name="keywords_emergency_app" msgid="3143078441279044780">"emergency, ice, app, default"</string>
+    <string name="keywords_default_phone_app" msgid="4213090563141778486">"phone, dialer, default"</string>
+    <string name="keywords_all_apps" msgid="7814015440655563156">"apps, download, applications, system"</string>
+    <string name="keywords_app_permissions" msgid="4229936435938011023">"apps, permissions, security"</string>
+    <string name="keywords_default_apps" msgid="223872637509160136">"apps, default"</string>
+    <string name="keywords_ignore_optimizations" msgid="6102579291119055029">"ignore optimisations, doze, app standby"</string>
+    <string name="keywords_color_mode" msgid="6362744316886077510">"vibrant, RGB, sRGB, colour, natural, standard"</string>
+    <string name="keywords_color_temperature" msgid="2688947724153266364">"colour temperature D65 D73 white yellow blue warm cool"</string>
+    <string name="keywords_lockscreen" msgid="5746561909668570047">"slide to unlock, password, pattern, PIN"</string>
+    <string name="keywords_profile_challenge" msgid="789611397846512845">"work challenge, work, profile"</string>
+    <string name="keywords_unification" msgid="1922900767659821025">"work profile, managed profile, unify, unification, work, profile"</string>
+    <string name="keywords_gesture" msgid="3526905012224714078">"gestures"</string>
+    <string name="keywords_payment_settings" msgid="5220104934130446416">"pay, tap, payments"</string>
+    <string name="keywords_backup" msgid="470070289135403022">"backup, back up"</string>
+    <string name="keywords_assist_gesture_launch" msgid="813968759791342591">"gesture"</string>
+    <string name="setup_wifi_nfc_tag" msgid="9028353016222911016">"Set up Wi-Fi NFC Tag"</string>
+    <string name="write_tag" msgid="8571858602896222537">"Write"</string>
+    <string name="status_awaiting_tap" msgid="2130145523773160617">"Tap a tag to write..."</string>
+    <string name="status_invalid_password" msgid="2575271864572897406">"Invalid password, try again."</string>
+    <string name="status_write_success" msgid="5228419086308251169">"Success!"</string>
+    <string name="status_failed_to_write" msgid="8072752734686294718">"Unable to write data to NFC tag. If the problem persists, try a different tag"</string>
+    <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_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>
+    <string name="media_volume_option_title" msgid="2811531786073003825">"Media volume"</string>
+    <string name="alarm_volume_option_title" msgid="8219324421222242421">"Alarm volume"</string>
+    <string name="ring_volume_option_title" msgid="6767101703671248309">"Ring volume"</string>
+    <string name="notification_volume_option_title" msgid="6064656124416882130">"Notification volume"</string>
+    <string name="ringtone_title" msgid="5379026328015343686">"Phone ringtone"</string>
+    <string name="notification_ringtone_title" msgid="4468722874617061231">"Default notification sound"</string>
+    <string name="notification_unknown_sound_title" msgid="2535027767851838335">"App provided sound"</string>
+    <string name="notification_sound_default" msgid="565135733949733766">"Default notification sound"</string>
+    <string name="alarm_ringtone_title" msgid="6344025478514311386">"Default alarm sound"</string>
+    <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="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>
+    <string name="vibrate_on_touch_title" msgid="5388579924689395023">"Vibrate on tap"</string>
+    <string name="dock_audio_media_title" msgid="1346838179626123900">"Dock speaker plays"</string>
+    <string name="dock_audio_media_disabled" msgid="3430953622491538080">"All audio"</string>
+    <string name="dock_audio_media_enabled" msgid="667849382924908673">"Media audio only"</string>
+    <string name="emergency_tone_silent" msgid="1067515631635824291">"Silent"</string>
+    <string name="emergency_tone_alert" msgid="8941852695428130667">"Alert"</string>
+    <string name="emergency_tone_vibrate" msgid="8281126443204950847">"Vibrate"</string>
+    <string name="boot_sounds_title" msgid="567029107382343709">"Power on sounds"</string>
+    <string name="zen_mode_settings_summary_off" msgid="1857165567766351925">"No automatic rules turned on"</string>
+    <plurals name="zen_mode_settings_summary_on" formatted="false" msgid="1216562765753405784">
+      <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_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>
+    <string name="zen_mode_automation_suggestion_summary" msgid="4732808039946935657">"Limit sounds &amp; vibrations at certain times"</string>
+    <string name="zen_mode_option_important_interruptions" msgid="3903928008177972500">"Priority only"</string>
+    <string name="zen_mode_option_alarms" msgid="5785372117288803600">"Alarms only"</string>
+    <string name="zen_mode_option_no_interruptions" msgid="8107126344850276878">"Total silence"</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">"Block visual disturbances"</string>
+    <string name="sound_work_settings" msgid="6774324553228566442">"Work profile sounds"</string>
+    <string name="work_use_personal_sounds_title" msgid="1148331221338458874">"Use personal profile sounds"</string>
+    <string name="work_use_personal_sounds_summary" msgid="6207040454949823153">"Sounds are the same for work and personal profiles"</string>
+    <string name="work_ringtone_title" msgid="5806657896300235315">"Work phone ringtone"</string>
+    <string name="work_notification_ringtone_title" msgid="6081247402404510004">"Default work notification sound"</string>
+    <string name="work_alarm_ringtone_title" msgid="1441926676833738891">"Default work alarm sound"</string>
+    <string name="work_sound_same_as_personal" msgid="3123383644475266478">"Same as personal profile"</string>
+    <string name="work_sync_dialog_title" msgid="7123973297187354813">"Replace sounds?"</string>
+    <string name="work_sync_dialog_yes" msgid="7243884940551635717">"Replace"</string>
+    <string name="work_sync_dialog_message" msgid="7841728953710863208">"Your personal profile sounds will be used for your work profile"</string>
+    <string name="ringtones_install_custom_sound_title" msgid="5948792721161302255">"Add custom sound?"</string>
+    <string name="ringtones_install_custom_sound_content" msgid="2195581481608512786">"This file will be copied to the <xliff:g id="FOLDER_NAME">%s</xliff:g> folder"</string>
+    <string name="ringtones_category_preference_title" msgid="5675912303120102366">"Ringtones"</string>
+    <string name="other_sound_category_preference_title" msgid="2521096636124314015">"Other sounds and vibrations"</string>
+    <string name="configure_notification_settings" msgid="7616737397127242615">"Notifications"</string>
+    <string name="advanced_section_header" msgid="8833934850242546903">"Advanced"</string>
+    <string name="profile_section_header" msgid="2320848161066912001">"Work notifications"</string>
+    <string name="notification_badging_title" msgid="5938709971403474078">"Allow notification dots"</string>
+    <string name="notification_pulse_title" msgid="1905382958860387030">"Blink light"</string>
+    <string name="lock_screen_notifications_title" msgid="6173076173408887213">"On the lock screen"</string>
+    <string name="lock_screen_notifications_summary_show" msgid="6407527697810672847">"Show all notification content"</string>
+    <string name="lock_screen_notifications_summary_hide" msgid="7891552853357258782">"Hide sensitive notification content"</string>
+    <string name="lock_screen_notifications_summary_disable" msgid="859628910427886715">"Don\'t show notifications at all"</string>
+    <string name="lock_screen_notifications_interstitial_message" msgid="6164532459432182244">"When your device is locked, how do you want notifications to be displayed?"</string>
+    <string name="lock_screen_notifications_interstitial_title" msgid="1416589393106326972">"Notifications"</string>
+    <string name="lock_screen_notifications_summary_show_profile" msgid="835870815661120772">"Show all work notification content"</string>
+    <string name="lock_screen_notifications_summary_hide_profile" msgid="256116258285695645">"Hide sensitive work notification content"</string>
+    <string name="lock_screen_notifications_summary_disable_profile" msgid="4080720698960233358">"Don’t show work notifications at all"</string>
+    <string name="lock_screen_notifications_interstitial_message_profile" msgid="8307705621027472346">"When your device is locked, how do you want profile notifications to be displayed?"</string>
+    <string name="lock_screen_notifications_interstitial_title_profile" msgid="3169806586032521333">"Profile notifications"</string>
+    <string name="notifications_title" msgid="8086372779371204971">"Notifications"</string>
+    <string name="app_notifications_title" msgid="5810577805218003760">"App notifications"</string>
+    <string name="notification_channel_title" msgid="2260666541030178452">"Notification category"</string>
+    <string name="notification_group_title" msgid="7180506440133859601">"Notification category group"</string>
+    <string name="notification_importance_title" msgid="848692592679312666">"Importance"</string>
+    <string name="notification_importance_unspecified" msgid="6622173510486113958">"Allow sound"</string>
+    <string name="notification_importance_blocked" msgid="7938180808339386300">"Never show notifications"</string>
+    <string name="notification_importance_min" msgid="5455049524984686275">"No sound or visual interruption"</string>
+    <string name="notification_importance_low" msgid="8881468429453766553">"No sound"</string>
+    <string name="notification_importance_default" msgid="5958338024601957516">"Make sound"</string>
+    <string name="notification_importance_high" msgid="2082429479238228527">"Make sound and pop up on screen"</string>
+    <string name="notification_importance_high_silent" msgid="2667033773703765252">"Pop on screen"</string>
+    <string name="notification_importance_min_title" msgid="6974673091137544803">"Low"</string>
+    <string name="notification_importance_low_title" msgid="8131254047772814309">"Medium"</string>
+    <string name="notification_importance_default_title" msgid="9120383978536089489">"High"</string>
+    <string name="notification_importance_high_title" msgid="3058778300264746473">"Urgent"</string>
+    <string name="allow_interruption" msgid="7136150018111848721">"Allow interruptions"</string>
+    <string name="allow_interruption_summary" msgid="7870159391333957050">"Let the app make sound, vibrate and/or pop notifications on screen"</string>
+    <string name="notification_channel_summary_min" msgid="5401718014765921892">"Low importance"</string>
+    <string name="notification_channel_summary_low" msgid="322317684244981244">"Medium importance"</string>
+    <string name="notification_channel_summary_default" msgid="1111749130423589931">"High importance"</string>
+    <string name="notification_channel_summary_high" msgid="2085017556511003283">"Urgent importance"</string>
+    <string name="default_notification_assistant" msgid="7631945224761430146">"Notification assistant"</string>
+    <string name="manage_notification_access_title" msgid="7510080164564944891">"Notification access"</string>
+    <string name="work_profile_notification_access_blocked_summary" msgid="8748026238701253040">"Access to work profile notifications is blocked"</string>
+    <string name="manage_notification_access_summary_zero" msgid="2409912785614953348">"Apps cannot read notifications"</string>
+    <plurals name="manage_notification_access_summary_nonzero" formatted="false" msgid="7930130030691218387">
+      <item quantity="other">%d apps can read notifications</item>
+      <item quantity="one">%d app can read notifications</item>
+    </plurals>
+    <string name="no_notification_listeners" msgid="3487091564454192821">"No installed apps have requested notification access."</string>
+    <string name="notification_listener_security_warning_title" msgid="5522924135145843279">"Allow notification access for <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
+    <string name="notification_listener_security_warning_summary" msgid="119203147791040151">"<xliff:g id="NOTIFICATION_LISTENER_NAME">%1$s</xliff:g> will be able to read all notifications, including personal information such as contact names and the text of messages that you receive. It will also be able to dismiss notifications or trigger action buttons that they contain. \n\nThis will also give the app the ability to turn Do Not Disturb on or off and change related settings."</string>
+    <string name="notification_listener_disable_warning_summary" msgid="6738915379642948000">"If you turn off notification access for <xliff:g id="NOTIFICATION_LISTENER_NAME">%1$s</xliff:g>, Do Not Disturb access may also be turned off."</string>
+    <string name="notification_listener_disable_warning_confirm" msgid="8333442186428083057">"Turn off"</string>
+    <string name="notification_listener_disable_warning_cancel" msgid="8586417377104211584">"cancel"</string>
+    <string name="vr_listeners_title" msgid="1318901577754715777">"VR helper services"</string>
+    <string name="no_vr_listeners" msgid="2689382881717507390">"No installed apps have requested to be run as VR helper services."</string>
+    <string name="vr_listener_security_warning_title" msgid="8309673749124927122">"Allow VR service access for <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> will be able to run when you are using applications in virtual reality mode."</string>
+    <string name="display_vr_pref_title" msgid="8104485269504335481">"When device is in VR"</string>
+    <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_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="1264019085827708920">"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="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>
+    <string name="app_notifications_off_desc" msgid="4882445501376722969">"Android is blocking this app\'s notifications from appearing on this device"</string>
+    <string name="channel_notifications_off_desc" msgid="5899225298718840635">"Android is blocking this category of notifications from appearing on this device"</string>
+    <string name="channel_group_notifications_off_desc" msgid="1620950416247316370">"Android is blocking this group of notifications from appearing on this device"</string>
+    <string name="notification_channels" msgid="5346841743182627500">"Categories"</string>
+    <string name="notification_channels_other" msgid="5645317113885788226">"Other"</string>
+    <plurals name="notification_group_summary" formatted="false" msgid="3420621520561455358">
+      <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> categories</item>
+      <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> category</item>
+    </plurals>
+    <string name="no_channels" msgid="3077375508177744586">"This app has not posted any notifications"</string>
+    <string name="app_settings_link" msgid="8894946007543660906">"Additional settings in the app"</string>
+    <string name="app_notification_listing_summary_zero" msgid="6482582965081108108">"Turned on for all apps"</string>
+    <plurals name="app_notification_listing_summary_others" formatted="false" msgid="5668835155965827890">
+      <item quantity="other">Turned off for <xliff:g id="COUNT_1">%d</xliff:g> apps</item>
+      <item quantity="one">Turned off for <xliff:g id="COUNT_0">%d</xliff:g> app</item>
+    </plurals>
+    <plurals name="deleted_channels" formatted="false" msgid="8028574302599397935">
+      <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> categories deleted</item>
+      <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> category deleted</item>
+    </plurals>
+    <string name="notification_toggle_on" msgid="650145396718191048">"On"</string>
+    <string name="notification_toggle_off" msgid="2142010737190671762">"Off"</string>
+    <string name="app_notification_block_title" msgid="4069351066849087649">"Block all"</string>
+    <string name="app_notification_block_summary" msgid="4744020456943215352">"Never show these notifications"</string>
+    <string name="notification_content_block_title" msgid="5854232570963006360">"Show notifications"</string>
+    <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_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>
+    <string name="app_notification_row_sensitive" msgid="1809610030432329940">"Sensitive"</string>
+    <string name="app_notifications_dialog_done" msgid="3484067728568791014">"Done"</string>
+    <string name="app_notification_importance_title" msgid="8002263131149345584">"Importance"</string>
+    <string name="notification_show_lights_title" msgid="7671781299688190532">"Blink light"</string>
+    <string name="notification_vibrate_title" msgid="1646667807969755957">"Vibrate"</string>
+    <string name="notification_channel_sound_title" msgid="3899212238513507941">"Sound"</string>
+    <string name="zen_mode_rule_delete_button" msgid="903658142711011617">"Delete"</string>
+    <string name="zen_mode_rule_rename_button" msgid="4642843370946599164">"Rename"</string>
+    <string name="zen_mode_rule_name" msgid="5149068059383837549">"Rule name"</string>
+    <string name="zen_mode_rule_name_hint" msgid="3781174510556433384">"Enter rule name"</string>
+    <string name="zen_mode_rule_name_warning" msgid="4517805381294494314">"Rule name already in use"</string>
+    <string name="zen_mode_add_rule" msgid="7459154136384467057">"Add more"</string>
+    <string name="zen_mode_delete_rule" msgid="2985902330199039533">"Delete rule"</string>
+    <string name="zen_mode_choose_rule_type" msgid="5423746638871953459">"Choose rule type"</string>
+    <string name="zen_mode_delete_rule_confirmation" msgid="6237882294348570283">"Delete \"<xliff:g id="RULE">%1$s</xliff:g>\" rule?"</string>
+    <string name="zen_mode_delete_rule_button" msgid="4248741120307752294">"Delete"</string>
+    <string name="zen_mode_rule_type" msgid="2289413469580142888">"Rule type"</string>
+    <string name="zen_mode_rule_type_unknown" msgid="3049377282766700600">"Unknown"</string>
+    <string name="zen_mode_configure_rule" msgid="8865785428056490305">"Configure rule"</string>
+    <string name="zen_schedule_rule_type_name" msgid="142936744435271449">"Time rule"</string>
+    <string name="zen_schedule_rule_enabled_toast" msgid="3379499360390382259">"Automatic rule set to turn on Do Not Disturb during specified times"</string>
+    <string name="zen_event_rule_type_name" msgid="2645981990973086797">"Event rule"</string>
+    <string name="zen_event_rule_enabled_toast" msgid="6910577623330811480">"Automatic rule set to turn on Do Not Disturb during specified events"</string>
+    <string name="zen_mode_event_rule_calendar" msgid="8787906563769067418">"During events for"</string>
+    <string name="zen_mode_event_rule_summary_calendar_template" msgid="5135844750232403975">"During events for <xliff:g id="CALENDAR">%1$s</xliff:g>"</string>
+    <string name="zen_mode_event_rule_summary_any_calendar" msgid="4936646399126636358">"any calendar"</string>
+    <string name="zen_mode_event_rule_summary_reply_template" msgid="6590671260829837157">"Where reply is <xliff:g id="REPLY">%1$s</xliff:g>"</string>
+    <string name="zen_mode_event_rule_calendar_any" msgid="6485568415998569885">"Any calendar"</string>
+    <string name="zen_mode_event_rule_reply" msgid="5166322024212403739">"Where reply is"</string>
+    <string name="zen_mode_event_rule_reply_any_except_no" msgid="8868873496008825961">"Yes, Maybe or Not replied"</string>
+    <string name="zen_mode_event_rule_reply_yes_or_maybe" msgid="2769656565454495824">"Yes or Maybe"</string>
+    <string name="zen_mode_event_rule_reply_yes" msgid="1003598835878784659">"Yes"</string>
+    <string name="zen_mode_rule_not_found_text" msgid="8963662446092059836">"Rule not found."</string>
+    <string name="zen_mode_rule_summary_enabled_combination" msgid="976098744828219297">"On / <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">"Days"</string>
+    <string name="zen_mode_schedule_rule_days_none" msgid="4954143628634166317">"None"</string>
+    <string name="zen_mode_schedule_rule_days_all" msgid="146511166522076034">"Every day"</string>
+    <string name="zen_mode_schedule_alarm_title" msgid="767054141267122030">"Alarm can override end time"</string>
+    <string name="zen_mode_schedule_alarm_summary" msgid="4597050434723180422">"Stop at the end time or next alarm, whichever comes first"</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> to <xliff:g id="END">%2$s</xliff:g>"</string>
+    <string name="zen_mode_calls" msgid="7051492091133751208">"Calls"</string>
+    <string name="zen_mode_messages" msgid="5886440273537510894">"Messages"</string>
+    <string name="zen_mode_all_messages" msgid="6449223378976743208">"All messages"</string>
+    <string name="zen_mode_selected_messages" msgid="8245990149599142281">"Selected messages"</string>
+    <string name="zen_mode_from_anyone" msgid="2638322015361252161">"From anyone"</string>
+    <string name="zen_mode_from_contacts" msgid="2232335406106711637">"From contacts only"</string>
+    <string name="zen_mode_from_starred" msgid="2678345811950997027">"From starred contacts only"</string>
+    <string name="zen_mode_from_none" msgid="8219706639954614136">"None"</string>
+    <string name="zen_mode_alarms" msgid="2165302777886552926">"Alarms"</string>
+    <string name="zen_mode_alarms_summary" msgid="3774926045611788635">"Alarms are always a priority and make sound"</string>
+    <string name="zen_mode_reminders" msgid="5458502056440485730">"Reminders"</string>
+    <string name="zen_mode_events" msgid="7914446030988618264">"Events"</string>
+    <string name="zen_mode_all_callers" msgid="584186167367236922">"All callers"</string>
+    <string name="zen_mode_selected_callers" msgid="3127598874060615742">"Selected callers"</string>
+    <string name="zen_mode_repeat_callers" msgid="5019521886428322131">"Repeat callers"</string>
+    <string name="zen_mode_repeat_callers_summary" msgid="7192713032364140137">"If the same person calls a second time within a <xliff:g id="MINUTES">%d</xliff:g>-minute period, allow it"</string>
+    <string name="zen_mode_when" msgid="2767193283311106373">"Automatically turn on"</string>
+    <string name="zen_mode_when_never" msgid="8809494351918405602">"Never"</string>
+    <string name="zen_mode_when_every_night" msgid="3122486110091921009">"Every night"</string>
+    <string name="zen_mode_when_weeknights" msgid="8354070633893273783">"Weeknights"</string>
+    <string name="zen_mode_start_time" msgid="8102602297273744441">"Start time"</string>
+    <string name="zen_mode_end_time" msgid="8774327885892705505">"End time"</string>
+    <string name="zen_mode_end_time_next_day_summary_format" msgid="4201521691238728701">"<xliff:g id="FORMATTED_TIME">%s</xliff:g> next day"</string>
+    <string name="zen_mode_summary_alarms_only_indefinite" msgid="2061973221027570123">"Change to alarms only indefinitely"</string>
+    <plurals name="zen_mode_summary_alarms_only_by_minute" formatted="false" msgid="6122003583875424601">
+      <item quantity="other">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="one">Change to alarms only for one minute until <xliff:g id="FORMATTEDTIME_0">%2$s</xliff:g></item>
+    </plurals>
+    <plurals name="zen_mode_summary_alarms_only_by_hour" formatted="false" msgid="2407703455581767748">
+      <item quantity="other">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="one">Change to alarms only for one hour until <xliff:g id="FORMATTEDTIME_0">%2$s</xliff:g></item>
+    </plurals>
+    <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_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_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>
+    <string name="zen_mode_no_visual_interruptions" msgid="8742776003822778472">"When screen is on or off"</string>
+    <string name="notification_app_settings_button" msgid="6685640230371477485">"Notification settings"</string>
+    <string name="suggestion_button_text" msgid="3275010948381252006">"OK"</string>
+    <string name="device_feedback" msgid="3238056036766293294">"Send feedback about this device"</string>
+    <string name="restr_pin_enter_admin_pin" msgid="1085834515677448072">"Enter admin PIN"</string>
+    <string name="switch_on_text" msgid="1124106706920572386">"On"</string>
+    <string name="switch_off_text" msgid="1139356348100829659">"Off"</string>
+    <string name="screen_pinning_title" msgid="2292573232264116542">"Screen pinning"</string>
+    <string name="screen_pinning_description" msgid="3360904523688769289">"When this setting is turned on, you can use screen pinning to keep the current screen in view until you unpin.\n\nTo use screen pinning:\n\n1. Make sure that screen pinning is turned on.\n\n2. Open the screen that you want to pin.\n\n3. Tap Overview.\n\n4. Swipe up and then tap the pin icon."</string>
+    <string name="screen_pinning_unlock_pattern" msgid="8282268570060313339">"Ask for unlock pattern before unpinning"</string>
+    <string name="screen_pinning_unlock_pin" msgid="8757588350454795286">"Ask for PIN before unpinning"</string>
+    <string name="screen_pinning_unlock_password" msgid="2514079566873826434">"Ask for password before unpinning"</string>
+    <string name="screen_pinning_unlock_none" msgid="3814188275713871856">"Lock device when unpinning"</string>
+    <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="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>
+    <string name="encryption_interstitial_message_pattern" msgid="7081249914068568570">"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" 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="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>
+    <string name="encrypt_talkback_dialog_require_pattern" msgid="1499790256154146639">"Require pattern?"</string>
+    <string name="encrypt_talkback_dialog_require_password" msgid="8841994614218049215">"Require password?"</string>
+    <string name="encrypt_talkback_dialog_message_pin" msgid="7582096542997635316">"When you enter your PIN to start this device, accessibility services like <xliff:g id="SERVICE">%1$s</xliff:g> won\'t yet be available."</string>
+    <string name="encrypt_talkback_dialog_message_pattern" msgid="2020083142199612743">"When you enter your pattern to start this device, accessibility services like <xliff:g id="SERVICE">%1$s</xliff:g> won\'t yet be available."</string>
+    <string name="encrypt_talkback_dialog_message_password" msgid="4155875981789127796">"When you enter your password to start this device, accessibility services like <xliff:g id="SERVICE">%1$s</xliff:g> won\'t yet be available."</string>
+    <string name="direct_boot_unaware_dialog_message" msgid="7870273558547549125">"Note: After a reboot, this app can\'t start until you unlock your phone"</string>
+    <string name="imei_information_title" msgid="8499085421609752290">"IMEI information"</string>
+    <string name="imei_information_summary" msgid="2074095606556565233">"IMEI-related information"</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">"Open by default"</string>
+    <string name="app_launch_domain_links_title" msgid="1160925981363706090">"Opening links"</string>
+    <string name="app_launch_open_domain_urls_title" msgid="8914721351596745701">"Open supported links"</string>
+    <string name="app_launch_open_domain_urls_summary" msgid="5367573364240712217">"Open without asking"</string>
+    <string name="app_launch_supported_domain_urls_title" msgid="8250695258211477480">"Supported links"</string>
+    <string name="app_launch_other_defaults_title" msgid="2516812499807835178">"Other defaults"</string>
+    <string name="storage_summary_format" msgid="5419902362347539755">"<xliff:g id="SIZE">%1$s</xliff:g> used in <xliff:g id="STORAGE_TYPE">%2$s</xliff:g>"</string>
+    <string name="storage_type_internal" msgid="6042049833565674948">"Internal storage"</string>
+    <string name="storage_type_external" msgid="7738894330670001898">"External storage"</string>
+    <string name="app_data_usage" msgid="7942375313697452803">"App data usage"</string>
+    <string name="data_summary_format" msgid="6213211533341068366">"<xliff:g id="SIZE">%1$s</xliff:g> used since <xliff:g id="DATE">%2$s</xliff:g>"</string>
+    <string name="storage_used" msgid="7128074132917008743">"Storage used"</string>
+    <string name="change" msgid="6657848623929839991">"Change"</string>
+    <string name="change_storage" msgid="600475265207060436">"Change storage"</string>
+    <string name="notifications_label" msgid="8543457911148619898">"App notifications"</string>
+    <string name="notifications_enabled" msgid="6983396130566021385">"On"</string>
+    <string name="notifications_disabled" msgid="334416731283131597">"Everything turned off"</string>
+    <string name="notifications_partly_blocked" msgid="592071133950126656">"<xliff:g id="COUNT_0">%1$d</xliff:g> of <xliff:g id="COUNT_1">%2$d</xliff:g> categories turned off"</string>
+    <string name="notifications_silenced" msgid="4728603513072110381">"Silenced"</string>
+    <string name="notifications_redacted" msgid="4493588975742803160">"Sensitive content not on lock screen"</string>
+    <string name="notifications_hidden" msgid="3619610536038757468">"Not on lock screen"</string>
+    <string name="notifications_priority" msgid="1066342037602085552">"Do Not Disturb overridden"</string>
+    <string name="notifications_summary_divider" msgid="9013807608804041387">" / "</string>
+    <string name="notification_summary_level" msgid="2726571692704140826">"Level %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="other"><xliff:g id="COUNT_1">%d</xliff:g> permissions granted</item>
+      <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> permission granted</item>
+    </plurals>
+    <plurals name="runtime_permissions_summary" formatted="false" msgid="1564663886246010959">
+      <item quantity="other"><xliff:g id="COUNT_2">%d</xliff:g> of <xliff:g id="COUNT_3">%d</xliff:g> permissions granted</item>
+      <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> of <xliff:g id="COUNT_1">%d</xliff:g> permission granted</item>
+    </plurals>
+    <plurals name="runtime_permissions_additional_count" formatted="false" msgid="931276038884210752">
+      <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> additional permissions</item>
+      <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> additional permission</item>
+    </plurals>
+    <string name="runtime_permissions_summary_no_permissions_granted" msgid="1679758182657005375">"No permissions granted"</string>
+    <string name="runtime_permissions_summary_no_permissions_requested" msgid="7655100570513818534">"No permissions requested"</string>
+    <string name="filter_all_apps" msgid="1988403195820688644">"All apps"</string>
+    <string name="filter_enabled_apps" msgid="5395727306799456250">"Installed apps"</string>
+    <string name="filter_instant_apps" msgid="574277769963965565">"Instant apps"</string>
+    <string name="filter_personal_apps" msgid="3277727374174355971">"Personal"</string>
+    <string name="filter_work_apps" msgid="24519936790795574">"Work"</string>
+    <string name="filter_notif_all_apps" msgid="2299049859443680242">"Apps: All"</string>
+    <string name="filter_notif_blocked_apps" msgid="3300375727887991342">"Apps: Turned off"</string>
+    <string name="filter_notif_urgent_channels" msgid="3972473613117159653">"Categories: Urgent importance"</string>
+    <string name="filter_notif_low_channels" msgid="4128487387390004604">"Categories: Low importance"</string>
+    <string name="filter_notif_blocked_channels" msgid="5880190882221644289">"Categories: Turned off"</string>
+    <string name="filter_notif_dnd_channels" msgid="1817930848881696728">"Categories: Overrides Do Not Disturb"</string>
+    <string name="advanced_apps" msgid="4812975097124803873">"Advanced"</string>
+    <string name="configure_apps" msgid="6685680790825882528">"Configure apps"</string>
+    <string name="unknown_app" msgid="5275921288718717656">"Unknown app"</string>
+    <string name="app_permissions" msgid="4148222031991883874">"App permissions"</string>
+    <string name="app_permissions_summary" msgid="5163974162150406324">"Apps using <xliff:g id="APPS">%1$s</xliff:g>"</string>
+    <string name="tap_to_wake" msgid="7211944147196888807">"Tap to wake"</string>
+    <string name="tap_to_wake_summary" msgid="4341387904987585616">"Double-tap anywhere on the screen to wake device"</string>
+    <string name="domain_urls_title" msgid="3132983644568821250">"Opening links"</string>
+    <string name="domain_urls_summary_none" msgid="2639588015479657864">"Don’t open supported links"</string>
+    <string name="domain_urls_summary_one" msgid="3704934031930978405">"Open <xliff:g id="DOMAIN">%s</xliff:g>"</string>
+    <string name="domain_urls_summary_some" msgid="3950089361819428455">"Open <xliff:g id="DOMAIN">%s</xliff:g> and other URLs"</string>
+    <string name="domain_urls_apps_summary_off" msgid="1833056772600031220">"No app opening supported links"</string>
+    <plurals name="domain_urls_apps_summary_on" formatted="false" msgid="240214361240709399">
+      <item quantity="other"><xliff:g id="COUNT">%d</xliff:g> apps opening supported links</item>
+      <item quantity="one">One app opening supported links</item>
+    </plurals>
+    <string name="app_link_open_always" msgid="2474058700623948148">"Open in this app"</string>
+    <string name="app_link_open_ask" msgid="7800878430190575991">"Ask every time"</string>
+    <string name="app_link_open_never" msgid="3407647600352398543">"Don’t open in this app"</string>
+    <string name="fingerprint_not_recognized" msgid="1739529686957438119">"Not recognised"</string>
+    <string name="default_apps_title" msgid="1660450272764331490">"Default"</string>
+    <string name="default_for_work" msgid="9152194239366247932">"Default for work"</string>
+    <string name="assist_and_voice_input_title" msgid="1733165754793221197">"Assist &amp; voice input"</string>
+    <string name="default_assist_title" msgid="8868488975409247921">"Assist app"</string>
+    <string name="assistant_security_warning_title" msgid="8673079231955467177">"Make <xliff:g id="ASSISTANT_APP_NAME">%s</xliff:g> your assistant?"</string>
+    <string name="assistant_security_warning" msgid="8498726261327239136">"The assistant will be able to read information about apps that are in use on your system, including information visible on your screen or accessible within the apps."</string>
+    <string name="assistant_security_warning_agree" msgid="7710290206928033908">"Agree"</string>
+    <string name="assistant_security_warning_disagree" msgid="877419950830205913">"Disagree"</string>
+    <string name="choose_voice_input_title" msgid="975471367067718019">"Choose voice input"</string>
+    <string name="default_browser_title" msgid="8101772675085814670">"Browser app"</string>
+    <string name="default_browser_title_none" msgid="2124785489953628553">"No default Browser"</string>
+    <string name="default_phone_title" msgid="282005908059637350">"Phone app"</string>
+    <string name="default_app" msgid="6864503001385843060">"(Default)"</string>
+    <string name="system_app" msgid="9068313769550747372">"(System)"</string>
+    <string name="system_default_app" msgid="3091113402349739037">"(System default)"</string>
+    <string name="apps_storage" msgid="4353308027210435513">"Apps storage"</string>
+    <string name="usage_access" msgid="5479504953931038165">"Usage access"</string>
+    <string name="permit_usage_access" msgid="4012876269445832300">"Permit usage access"</string>
+    <string name="app_usage_preference" msgid="7065701732733134991">"App usage preferences"</string>
+    <string name="usage_access_description" msgid="1352111094596416795">"Usage access allows an app to track what other apps that you\'re using and how often, as well as your operator, language settings and other details."</string>
+    <string name="memory_settings_title" msgid="7490541005204254222">"Memory"</string>
+    <string name="memory_details_title" msgid="8542565326053693320">"Memory details"</string>
+    <string name="always_running" msgid="6042448320077429656">"Always running (<xliff:g id="PERCENTAGE">%s</xliff:g>)"</string>
+    <string name="sometimes_running" msgid="6611250683037700864">"Sometimes running (<xliff:g id="PERCENTAGE">%s</xliff:g>)"</string>
+    <string name="rarely_running" msgid="348413460168817458">"Rarely running (<xliff:g id="PERCENTAGE">%s</xliff:g>)"</string>
+    <string name="memory_max_use" msgid="6874803757715963097">"Maximum"</string>
+    <string name="memory_avg_use" msgid="7382015389130622870">"Average"</string>
+    <string name="memory_max_desc" msgid="2861832149718335864">"Maximum <xliff:g id="MEMORY">%1$s</xliff:g>"</string>
+    <string name="memory_avg_desc" msgid="1551240906596518412">"Average <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">"Battery optimisation"</string>
+    <string name="additional_battery_info" msgid="4754099329165411970">"Usage alerts"</string>
+    <string name="show_all_apps" msgid="1512506948197818534">"Show full device usage"</string>
+    <string name="hide_extra_apps" msgid="5016497281322459633">"Show app usage"</string>
+    <string name="power_high_usage_title" msgid="6027369425057347826">"High usage"</string>
+    <plurals name="power_high_usage_summary" formatted="false" msgid="467347882627862744">
+      <item quantity="other"><xliff:g id="NUMBER">%2$d</xliff:g> apps behaving abnormally</item>
+      <item quantity="one"><xliff:g id="APP">%1$s</xliff:g> behaving abnormally</item>
+    </plurals>
+    <plurals name="power_high_usage_title" formatted="false" msgid="3826660033363082922">
+      <item quantity="other">Apps draining battery</item>
+      <item quantity="one"><xliff:g id="APP">%1$s</xliff:g> draining battery</item>
+    </plurals>
+    <string name="high_power_filter_on" msgid="3222265297576680099">"Not optimised"</string>
+    <string name="high_power_on" msgid="6216293998227583810">"Not optimised"</string>
+    <string name="high_power_off" msgid="3393904131961263278">"Optimising battery use"</string>
+    <string name="high_power_system" msgid="7362862974428225301">"Battery optimisation not available"</string>
+    <string name="high_power_desc" msgid="6283926163708585760">"Don’t apply battery optimisation. May drain your battery more quickly."</string>
+    <string name="high_power_prompt_title" msgid="6358673688590282655">"Let app always run in background?"</string>
+    <string name="high_power_prompt_body" msgid="1031422980602565049">"Allowing <xliff:g id="APP_NAME">%1$s</xliff:g> to always run in the background may reduce battery life. \n\nYou can change this later from Settings &gt; Apps &amp; notifications."</string>
+    <string name="battery_summary" msgid="8044042095190688654">"<xliff:g id="PERCENTAGE">%1$s</xliff:g> use since last full charge"</string>
+    <string name="battery_power_management" msgid="5571519699679107523">"Power management"</string>
+    <string name="no_battery_summary" msgid="3528036835462846814">"No battery use since last full charge"</string>
+    <string name="app_notification_preferences" msgid="1599319335092722613">"App settings"</string>
+    <string name="system_ui_settings" msgid="579824306467081123">"Show SystemUI Tuner"</string>
+    <string name="additional_permissions" msgid="6463784193877056080">"Additional permissions"</string>
+    <string name="additional_permissions_more" msgid="3538612272673191451">"<xliff:g id="COUNT">%1$d</xliff:g> more"</string>
+    <string name="share_remote_bugreport_dialog_title" msgid="1124840737776588602">"Share bug report?"</string>
+    <string name="share_remote_bugreport_dialog_message_finished" msgid="4973886976504823801">"Your IT admin requested a bug report to help troubleshoot this device. Apps and data may be shared."</string>
+    <string name="share_remote_bugreport_dialog_message" msgid="3495929560689435496">"Your IT admin requested a bug report to help troubleshoot this device. Apps and data may be shared, and your device may temporarily slow down."</string>
+    <string name="sharing_remote_bugreport_dialog_message" msgid="5859287696666024466">"This bug report is being shared with your IT admin. Contact them for more details."</string>
+    <string name="share_remote_bugreport_action" msgid="532226159318779397">"Share"</string>
+    <string name="decline_remote_bugreport_action" msgid="518720235407565134">"Decline"</string>
+    <string name="usb_use_charging_only" msgid="2180443097365214467">"Charge this device"</string>
+    <string name="usb_use_charging_only_desc" msgid="3066256793008540627">"Just charge this device"</string>
+    <string name="usb_use_power_only" msgid="6426550616883919530">"Supply power"</string>
+    <string name="usb_use_power_only_desc" msgid="3461232831015575152">"Charge the connected device. Works only with devices that support USB charging."</string>
+    <string name="usb_use_file_transfers" msgid="7409600791007250137">"Transfer files"</string>
+    <string name="usb_use_file_transfers_desc" msgid="4235764784331804488">"Transfer files to another device"</string>
+    <string name="usb_use_photo_transfers" msgid="7794775645350330454">"Transfer photos (PTP)"</string>
+    <string name="usb_use_photo_transfers_desc" msgid="2963034811151325996">"Transfer photos or files if MTP is not supported (PTP)"</string>
+    <string name="usb_use_MIDI" msgid="870922185938298263">"Use device as MIDI"</string>
+    <string name="usb_use_MIDI_desc" msgid="8473936990076693175">"Use this device as MIDI"</string>
+    <string name="usb_use" msgid="3256040963685055320">"Use USB to"</string>
+    <string name="usb_pref" msgid="1400617804525116158">"USB"</string>
+    <string name="usb_summary_charging_only" msgid="7544327009143659751">"Charging this device"</string>
+    <string name="usb_summary_power_only" msgid="3629517713817003738">"Supplying power"</string>
+    <string name="usb_summary_file_transfers" msgid="6435943692610175111">"Transferring files"</string>
+    <string name="usb_summary_photo_transfers" msgid="8440204169576585250">"Transferring photos (PTP)"</string>
+    <string name="usb_summary_MIDI" msgid="5687906612187885908">"Using device as MIDI"</string>
+    <string name="sms_mirroring_pref" msgid="6475043279147376031">"SMS Mirroring"</string>
+    <string name="background_check_pref" msgid="7550258400138010979">"Background check"</string>
+    <string name="background_check_title" msgid="4534254315824525593">"Full background access"</string>
+    <string name="assist_access_context_title" msgid="2269032346698890257">"Use text from screen"</string>
+    <string name="assist_access_context_summary" msgid="1991421283142279560">"Allow the assist app to access the screen contents as text"</string>
+    <string name="assist_access_screenshot_title" msgid="4034721336291215819">"Use screenshot"</string>
+    <string name="assist_access_screenshot_summary" msgid="6761636689013259901">"Allow the assist app to access an image of the screen"</string>
+    <string name="assist_flash_title" msgid="506661221230034891">"Flash screen"</string>
+    <string name="assist_flash_summary" msgid="9160668468824099262">"Flash edges of screen when assist app accesses text from screen or screenshot"</string>
+    <string name="assist_footer" msgid="1982791172085896864">"Assist apps can help you based on information from the screen that you’re viewing. Some apps support both launcher and voice input services to give you integrated assistance."</string>
+    <string name="average_memory_use" msgid="829566450150198512">"Average memory use"</string>
+    <string name="maximum_memory_use" msgid="7493720799710132496">"Maximum memory use"</string>
+    <string name="memory_usage" msgid="1781358557214390033">"Memory usage"</string>
+    <string name="app_list_memory_use" msgid="6987417883876419338">"App usage"</string>
+    <string name="memory_details" msgid="5943436005716991782">"Details"</string>
+    <string name="memory_use_summary" msgid="5608257211903075754">"<xliff:g id="SIZE">%1$s</xliff:g> avg memory used in last 3 hours"</string>
+    <string name="no_memory_use_summary" msgid="2016900536806235588">"No memory used in last 3 hours"</string>
+    <string name="sort_avg_use" msgid="3998036180505143129">"Sort by avg. use"</string>
+    <string name="sort_max_use" msgid="4629247978290075124">"Sort by max. use"</string>
+    <string name="memory_performance" msgid="5661005192284103281">"Performance"</string>
+    <string name="total_memory" msgid="2017287600738630165">"Total memory"</string>
+    <string name="average_used" msgid="5338339266517245782">"Average used (%)"</string>
+    <string name="free_memory" msgid="4003936141603549746">"Free"</string>
+    <string name="memory_usage_apps" msgid="5650192998273294098">"Memory used by apps"</string>
+    <plurals name="memory_usage_apps_summary" formatted="false" msgid="6089210945574265774">
+      <item quantity="other"><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="one">1 app used memory in the last <xliff:g id="DURATION_0">%2$s</xliff:g></item>
+    </plurals>
+    <string name="running_frequency" msgid="6622624669948277693">"Frequency"</string>
+    <string name="memory_maximum_usage" msgid="6513785462055278341">"Maximum usage"</string>
+    <string name="no_data_usage" msgid="9131454024293628063">"No data used"</string>
+    <string name="zen_access_warning_dialog_title" msgid="1198189958031157142">"Allow access to Do Not Disturb for <xliff:g id="APP">%1$s</xliff:g>?"</string>
+    <string name="zen_access_warning_dialog_summary" msgid="4015885767653010873">"The app will be able to turn on/off Do Not Disturb and make changes to related settings."</string>
+    <string name="zen_access_disabled_package_warning" msgid="302820100078584431">"Must stay turned on because notification access is on"</string>
+    <string name="zen_access_revoke_warning_dialog_title" msgid="558779234015793950">"Revoke access to Do Not Disturb for <xliff:g id="APP">%1$s</xliff:g>?"</string>
+    <string name="zen_access_revoke_warning_dialog_summary" msgid="5518216907304930148">"All Do Not Disturb rules created by this app will be removed."</string>
+    <string name="ignore_optimizations_on" msgid="6915689518016285116">"Don’t optimise"</string>
+    <string name="ignore_optimizations_off" msgid="6153196256410296835">"Optimise"</string>
+    <string name="ignore_optimizations_on_desc" msgid="2321398930330555815">"May drain your battery more quickly"</string>
+    <string name="ignore_optimizations_off_desc" msgid="5255731062045426544">"Recommended for better battery life"</string>
+    <string name="ignore_optimizations_title" msgid="2829637961185027768">"Allow <xliff:g id="APP">%s</xliff:g> to ignore battery optimisations?"</string>
+    <string name="app_list_preference_none" msgid="108006867520327904">"None"</string>
+    <string name="work_profile_usage_access_warning" msgid="2918050775124911939">"Turning off usage access for this app doesn\'t prevent your admin from tracking data usage for apps in your work profile"</string>
+    <string name="accessibility_lock_screen_progress" msgid="2408292742980383166">"<xliff:g id="COUNT_0">%1$d</xliff:g> of <xliff:g id="COUNT_1">%2$d</xliff:g> characters used"</string>
+    <string name="draw_overlay" msgid="6564116025404257047">"Display over other apps"</string>
+    <string name="system_alert_window_settings" msgid="8466613169103527868">"Display over other apps"</string>
+    <string name="system_alert_window_apps_title" msgid="7005760279028569491">"Apps"</string>
+    <string name="system_alert_window_access_title" msgid="6297115362542361241">"Display over other apps"</string>
+    <string name="permit_draw_overlay" msgid="7456536798718633432">"Allow display over other apps"</string>
+    <string name="app_overlay_permission_preference" msgid="9039432222453006038">"App display on top permission"</string>
+    <string name="allow_overlay_description" msgid="8961670023925421358">"Allow this app to display on top of other apps that you’re using. It may interfere with your use of those apps or change the way they seem to appear or behave."</string>
+    <string name="keywords_vr_listener" msgid="7441221822576384680">"VR virtual reality listener stereo helper service"</string>
+    <string name="keywords_system_alert_window" msgid="5049498015597864850">"system alert window dialogue display on top of other apps"</string>
+    <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="app_permission_summary_allowed" msgid="1505409933012886711">"Allowed"</string>
+    <string name="app_permission_summary_not_allowed" msgid="2592617058101882802">"Not allowed"</string>
+    <string name="keywords_install_other_apps" msgid="761078076051006558">"install apps unknown sources"</string>
+    <string name="write_settings" msgid="4797457275727195681">"Modify system settings"</string>
+    <string name="keywords_write_settings" msgid="6415597272561105138">"write modify system settings"</string>
+    <string name="write_settings_summary" msgid="4302268998611412696">"<xliff:g id="COUNT_0">%1$d</xliff:g> of <xliff:g id="COUNT_1">%2$d</xliff:g> apps allowed to modify system settings"</string>
+    <string name="filter_install_sources_apps" msgid="3102976274848199118">"Can install other apps"</string>
+    <string name="filter_write_settings_apps" msgid="2914615026197322551">"Can modify system settings"</string>
+    <string name="write_settings_title" msgid="4232152481902542284">"Can modify system settings"</string>
+    <string name="write_system_settings" msgid="3482913590601096763">"Modify system settings"</string>
+    <string name="write_settings_preference" msgid="3407383041273067448">"App modify system settings permission"</string>
+    <string name="permit_write_settings" msgid="658555006453212691">"Allow modifying 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>
+    <string name="camera_double_tap_power_gesture_title" msgid="1651873760405034645">"Press power button twice for camera"</string>
+    <string name="camera_double_tap_power_gesture_desc" msgid="7355664631775680376">"Quickly open camera without unlocking your screen"</string>
+    <string name="screen_zoom_title" msgid="5233515303733473927">"Display size"</string>
+    <string name="screen_zoom_short_summary" msgid="7291960817349834688">"Make items on screen larger or smaller"</string>
+    <string name="screen_zoom_keywords" msgid="9176477565403352552">"display, density, screen zoom, scale, scaling"</string>
+    <string name="screen_zoom_summary" msgid="6445488991799015407">"Make the items on your screen smaller or larger. Some apps on your screen may change position."</string>
+    <string name="screen_zoom_preview_title" msgid="4680671508172336572">"Preview"</string>
+    <string name="screen_zoom_make_smaller_desc" msgid="4622359904253364742">"Make smaller"</string>
+    <string name="screen_zoom_make_larger_desc" msgid="2236171043607896594">"Make larger"</string>
+    <string name="screen_zoom_conversation_icon_alex" msgid="8443032489384985820">"A"</string>
+    <string name="screen_zoom_conversation_icon_pete" msgid="998709701837681129">"P"</string>
+    <string name="screen_zoom_conversation_message_1" msgid="6546951024984852686">"Hi Pete!"</string>
+    <string name="screen_zoom_conversation_message_2" msgid="6935424214137738647">"Hey, want to grab coffee and catch up today?"</string>
+    <string name="screen_zoom_conversation_message_3" msgid="5218221201861387402">"Sounds great. I know a good place not too far from here."</string>
+    <string name="screen_zoom_conversation_message_4" msgid="5564676794767555447">"Perfect!"</string>
+    <string name="screen_zoom_conversation_timestamp_1" msgid="7453710416319650556">"Tue 6:00 p.m."</string>
+    <string name="screen_zoom_conversation_timestamp_2" msgid="7107225702890747588">"Tue 6:01 p.m."</string>
+    <string name="screen_zoom_conversation_timestamp_3" msgid="3785674344762707688">"Tue 6:02 p.m."</string>
+    <string name="screen_zoom_conversation_timestamp_4" msgid="2511469395448561259">"Tue 6:03 p.m."</string>
+    <string name="disconnected" msgid="4836600637485526329">"Not connected"</string>
+    <string name="data_usage_summary_format" msgid="7507047900192160585">"<xliff:g id="AMOUNT">%1$s</xliff:g> of data used"</string>
+    <plurals name="notification_summary" formatted="false" msgid="3941492005316143599">
+      <item quantity="other">Off for <xliff:g id="COUNT">%d</xliff:g> apps</item>
+      <item quantity="one">Off for 1 app</item>
+    </plurals>
+    <string name="notification_summary_none" msgid="4586376436702610">"On for all apps"</string>
+    <string name="apps_summary" msgid="193158055537070092">"<xliff:g id="COUNT">%1$d</xliff:g> apps installed"</string>
+    <string name="apps_summary_example" msgid="2118896966712746139">"24 apps installed"</string>
+    <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">"Internal storage: <xliff:g id="PERCENTAGE">%1$s</xliff:g> used – <xliff:g id="FREE_SPACE">%2$s</xliff:g> free"</string>
+    <string name="display_summary" msgid="6737806235882127328">"Sleep after <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> of inactivity"</string>
+    <string name="display_dashboard_summary" msgid="4145888780290131488">"Wallpaper, sleep, font size"</string>
+    <string name="display_summary_example" msgid="9102633726811090523">"Sleep after 10 minutes of inactivity"</string>
+    <string name="memory_summary" msgid="8080825904671961872">"Avg <xliff:g id="USED_MEMORY">%1$s</xliff:g> of <xliff:g id="TOTAL_MEMORY">%2$s</xliff:g> memory used"</string>
+    <string name="users_and_accounts_summary" msgid="245282689646897882">"Current user: <xliff:g id="USER_NAME">%1$s</xliff:g>"</string>
+    <string name="users_summary" msgid="1674864467098487328">"Signed in as <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> is default"</string>
+    <string name="location_on_summary" msgid="5127631544018313587">"ON / <xliff:g id="LOCATION_MODE">%1$s</xliff:g>"</string>
+    <string name="location_off_summary" msgid="6474350053215707957">"OFF"</string>
+    <string name="backup_disabled" msgid="485189128759595412">"Backup disabled"</string>
+    <string name="about_summary" msgid="924181828102801010">"Updated to Android <xliff:g id="VERSION">%1$s</xliff:g>"</string>
+    <string name="disabled_by_policy_title" msgid="627023216027648534">"Action not allowed"</string>
+    <string name="disabled_by_policy_title_adjust_volume" msgid="7399450998356045023">"Can\'t change volume"</string>
+    <string name="disabled_by_policy_title_outgoing_calls" msgid="7919816644946067058">"Calling not allowed"</string>
+    <string name="disabled_by_policy_title_sms" msgid="5733307423899610340">"SMS not allowed"</string>
+    <string name="disabled_by_policy_title_camera" msgid="6225008536855644874">"Camera not allowed"</string>
+    <string name="disabled_by_policy_title_screen_capture" msgid="4066913623298047094">"Screenshot not allowed"</string>
+    <string name="default_admin_support_msg" msgid="2853684309779513863">"This action is disabled. To find out more, contact your organisation\'s admin."</string>
+    <string name="admin_support_more_info" msgid="8901377038510512654">"More details"</string>
+    <string name="admin_profile_owner_message" msgid="5860816886981109626">"Your admin can monitor and manage apps and data associated with your work profile, including settings, permissions, corporate access, network activity and the device\'s location information."</string>
+    <string name="admin_profile_owner_user_message" msgid="3842630535450382172">"Your admin can monitor and manage apps and data associated with this user, including settings, permissions, corporate access, network activity and the device\'s location information."</string>
+    <string name="admin_device_owner_message" msgid="6232893638259790789">"Your admin can monitor and manage apps and data associated with this device, including settings, permissions, corporate access, network activity and the device\'s location information."</string>
+    <string name="condition_turn_off" msgid="1960945836880080298">"Turn off"</string>
+    <string name="condition_turn_on" msgid="9089876276117874591">"Turn on"</string>
+    <string name="condition_expand_show" msgid="608202020023489939">"Show"</string>
+    <string name="condition_expand_hide" msgid="948507739223760667">"Hide"</string>
+    <string name="condition_hotspot_title" msgid="7778958849468560027">"Hotspot is on"</string>
+    <string name="condition_hotspot_summary" msgid="3433182779269409683">"Portable Wi-Fi hotspot <xliff:g id="ID_1">%1$s</xliff:g> is active, Wi-Fi for this device is turned off."</string>
+    <string name="condition_airplane_title" msgid="287356299107070503">"Aeroplane mode is on"</string>
+    <string name="condition_airplane_summary" msgid="5561586417832393666">"Wi-Fi, Bluetooth and mobile network are turned off. You can\'t make phone calls or connect to the Internet."</string>
+    <string name="condition_zen_title" msgid="2679168532600816392">"Do Not Disturb is on (<xliff:g id="ID_1">%1$s</xliff:g>)"</string>
+    <string name="condition_battery_title" msgid="3272131008388575349">"Battery Saver is on"</string>
+    <string name="condition_battery_summary" msgid="4418839236027977450">"Performance is reduced. Location services and background data are turned off."</string>
+    <string name="condition_cellular_title" msgid="1327317003797575735">"Mobile data is off"</string>
+    <string name="condition_cellular_summary" msgid="1818046558419658463">"Internet is available only via Wi-Fi"</string>
+    <string name="condition_bg_data_title" msgid="2483860304802846542">"Data Saver is on"</string>
+    <string name="condition_bg_data_summary" msgid="656957852895282228">"Background data is only available via Wi-Fi. This may affect some apps or services when Wi-Fi is not available."</string>
+    <string name="condition_work_title" msgid="7293722361184366648">"Work profile is off"</string>
+    <string name="condition_work_summary" msgid="7543202177571590378">"Apps, background sync and other features related to your work profile are turned off."</string>
+    <string name="night_display_suggestion_title" msgid="6602129097059325291">"Set Night Light schedule"</string>
+    <string name="night_display_suggestion_summary" msgid="1747638280833631187">"Tint screen amber to help you fall asleep"</string>
+    <string name="condition_night_display_title" msgid="5599814941976856183">"Night Light is on"</string>
+    <string name="condition_night_display_summary" msgid="5443722724310650381">"Screen is tinted amber. This may help you fall asleep."</string>
+    <string name="suggestions_title" msgid="7280792342273268377">"Suggestions"</string>
+    <string name="suggestions_summary" msgid="2509040178581728056">"+<xliff:g id="ID_1">%1$d</xliff:g>"</string>
+    <string name="suggestions_more_title" msgid="8223690393059519879">"+<xliff:g id="ID_1">%1$d</xliff:g> more"</string>
+    <plurals name="suggestions_collapsed_title" formatted="false" msgid="1857433444865249823">
+      <item quantity="other"><xliff:g id="COUNT">%1$d</xliff:g> suggestions</item>
+      <item quantity="one">1 suggestion</item>
+    </plurals>
+    <plurals name="suggestions_collapsed_summary" formatted="false" msgid="7680263825371165461">
+      <item quantity="other">+<xliff:g id="COUNT">%1$d</xliff:g> suggestions</item>
+      <item quantity="one">+1 suggestion</item>
+    </plurals>
+    <string name="suggestion_remove" msgid="904627293892092439">"Remove"</string>
+    <string name="color_temperature" msgid="2070126836910615605">"Cool colour temperature"</string>
+    <string name="color_temperature_desc" msgid="4793729830226404052">"Use cooler display colours"</string>
+    <string name="color_temperature_toast" msgid="4974218172133854827">"To apply colour change, turn off screen"</string>
+    <string name="connectivity_monitor_switch" msgid="9059759348648583421">"Connectivity Monitor"</string>
+    <string name="connectivity_monitor_switch_summary" msgid="2828658652378866401">"Connectivity Monitor will collect logs when it detects a connectivity problem and prompt notification to user to file a bug"</string>
+    <string name="connectivity_monitor_toast" msgid="5551859612881173028">"To apply connectivity monitor change, reboot device"</string>
+    <string name="camera_hal_hdrplus_switch" msgid="8377365197105267466">"Camera HAL HDR+"</string>
+    <string name="camera_hal_hdrplus_toast" msgid="2063703797270055299">"To apply Camera HAL HDR+ change, reboot device"</string>
+    <string name="camera_laser_sensor_switch" msgid="8913588990743234440">"Camera Laser Sensor"</string>
+    <string name="ota_disable_automatic_update" msgid="2319639631655915050">"Automatic system updates"</string>
+    <string name="usage" msgid="2977875522080448986">"Usage"</string>
+    <string name="cellular_data_usage" msgid="2155683719898158203">"Mobile data usage"</string>
+    <string name="wifi_data_usage" msgid="686754111095324306">"Wi-Fi data usage"</string>
+    <string name="ethernet_data_usage" msgid="5108764537574354616">"Ethernet data usage"</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> mobile data"</string>
+    <string name="wifi_data_template" msgid="6265570748799357386">"<xliff:g id="AMOUNT">^1</xliff:g> Wi-Fi data"</string>
+    <string name="ethernet_data_template" msgid="5782476509881033590">"<xliff:g id="AMOUNT">^1</xliff:g> ethernet data"</string>
+    <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_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>
+      <item quantity="one">1 restriction</item>
+    </plurals>
+    <string name="operator_warning" msgid="1862988028996859195">"Operator data accounting may differ from device accounting"</string>
+    <string name="data_used_template" msgid="3245919669966296505">"<xliff:g id="ID_1">%1$s</xliff:g> used"</string>
+    <string name="set_data_warning" msgid="6115364758236594593">"Set data warning"</string>
+    <string name="data_warning" msgid="209133958008062117">"Data warning"</string>
+    <string name="set_data_limit" msgid="2901526323210516923">"Set data limit"</string>
+    <string name="data_limit" msgid="1885406964934590552">"Data limit"</string>
+    <string name="data_usage_template" msgid="2923744765873163859">"<xliff:g id="ID_1">%1$s</xliff:g> used <xliff:g id="ID_2">%2$s</xliff:g>"</string>
+    <string name="configure" msgid="1029654422228677273">"Configure"</string>
+    <string name="data_usage_other_apps" msgid="3272872663517382050">"Other apps included in usage"</string>
+    <plurals name="data_saver_unrestricted_summary" formatted="false" msgid="2635267833484232703">
+      <item quantity="other"><xliff:g id="COUNT">%1$d</xliff:g> apps allowed to use unrestricted data when Data Saver is on</item>
+      <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="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>
+    <string name="unrestricted_app_title" msgid="4465437191723332066">"Unrestricted data usage"</string>
+    <string name="unrestricted_app_summary" msgid="6458008993501723912">"Allow unrestricted data access when Data Saver is on"</string>
+    <string name="home_app" msgid="4066188520886810030">"Home app"</string>
+    <string name="no_default_home" msgid="7184117487704520238">"No default Home"</string>
+    <string name="lockpattern_settings_require_cred_before_startup" msgid="3832020101401318248">"Secure start-up"</string>
+    <string name="lockpattern_settings_require_pattern_before_startup_summary" msgid="7873036097628404476">"Require pattern to start up your device. While off, this device can\'t receive calls, messages, notifications or alarms."</string>
+    <string name="lockpattern_settings_require_pin_before_startup_summary" msgid="6022831284097476933">"Require PIN to start up your device. While off, this device can\'t receive calls, messages, notifications or alarms."</string>
+    <string name="lockpattern_settings_require_password_before_startup_summary" msgid="6818285221244966231">"Require password to start up your device. While off, this device can\'t receive calls, messages, notifications or alarms."</string>
+    <string name="suggestion_additional_fingerprints" msgid="2214281455363797037">"Add another fingerprint"</string>
+    <string name="suggestion_additional_fingerprints_summary" msgid="5471253233176471245">"Unlock with a different finger"</string>
+    <string name="battery_saver_on_summary" msgid="9072203872401530722">"On / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
+    <string name="battery_saver_off_summary" msgid="8309471955051162327">"Off/<xliff:g id="ID_1">%1$s</xliff:g>"</string>
+    <string name="battery_saver_desc_turn_on_auto_never" msgid="6715896635178578813">"Never turn on automatically"</string>
+    <string name="battery_saver_desc_turn_on_auto_pct" msgid="7472323223085636533">"Turn on automatically at %1$s battery"</string>
+    <string name="not_battery_optimizing" msgid="5362861851864837617">"Not using battery optimisation"</string>
+    <string name="lockscreen_remote_input" msgid="969871538778211843">"If device is locked, prevent typing replies or other text in notifications"</string>
+    <string name="default_spell_checker" msgid="8506899870026026660">"Default spell checker"</string>
+    <string name="choose_spell_checker" msgid="6596539862291699367">"Choose spell checker"</string>
+    <string name="spell_checker_not_selected" msgid="8871083796179200696">"Not selected"</string>
+    <string name="notification_log_no_title" msgid="5678029849672024215">"(none)"</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">"key"</string>
+    <string name="notification_log_details_group" msgid="2430467015200368698">"group"</string>
+    <string name="notification_log_details_group_summary" msgid="7945543958255585829">"(summary)"</string>
+    <string name="notification_log_details_visibility" msgid="2552873780715930971">"visibility"</string>
+    <string name="notification_log_details_public_version" msgid="4247242364605495240">"publicVersion"</string>
+    <string name="notification_log_details_priority" msgid="8371354971235991398">"priority"</string>
+    <string name="notification_log_details_importance" msgid="2153168790791683139">"importance"</string>
+    <string name="notification_log_details_explanation" msgid="1914295130775393551">"explanation"</string>
+    <string name="notification_log_details_badge" msgid="3258183328267662285">"can show badge"</string>
+    <string name="notification_log_details_content_intent" msgid="1113554570409128083">"intent"</string>
+    <string name="notification_log_details_delete_intent" msgid="905118520685297007">"delete intent"</string>
+    <string name="notification_log_details_full_screen_intent" msgid="7118560817013522978">"full screen intent"</string>
+    <string name="notification_log_details_actions" msgid="242523930165118066">"actions"</string>
+    <string name="notification_log_details_title" msgid="7177091647508863295">"title"</string>
+    <string name="notification_log_details_remoteinput" msgid="8328591329858827409">"remote inputs"</string>
+    <string name="notification_log_details_content_view" msgid="6638731378278561786">"customised view"</string>
+    <string name="notification_log_details_extras" msgid="4188418723779942047">"extras"</string>
+    <string name="notification_log_details_icon" msgid="8939114059726188218">"icon"</string>
+    <string name="notification_log_details_parcel" msgid="243148037601903212">"parcel size"</string>
+    <string name="notification_log_details_ashmem" msgid="7241814108477320636">"ashmem"</string>
+    <string name="notification_log_details_sound" msgid="5506232879598808099">"sound"</string>
+    <string name="notification_log_details_vibrate" msgid="6890065466625335940">"vibrate"</string>
+    <string name="notification_log_details_default" msgid="2345249399796730861">"Default"</string>
+    <string name="notification_log_details_none" msgid="184131801230614059">"None"</string>
+    <string name="notification_log_details_ranking_null" msgid="244660392058720919">"Ranking object is missing."</string>
+    <string name="notification_log_details_ranking_none" msgid="599607025882587844">"Ranking object doesn\'t contain this key."</string>
+    <string name="special_access" msgid="3458780842491881155">"Special app access"</string>
+    <plurals name="special_access_summary" formatted="false" msgid="260765309935675867">
+      <item quantity="other"><xliff:g id="COUNT">%d</xliff:g> apps can use unrestricted data</item>
+      <item quantity="one">1 app can use unrestricted data</item>
+    </plurals>
+    <string name="confirm_convert_to_fbe_warning" msgid="1487005506049137659">"Really wipe user data and convert to file encryption?"</string>
+    <string name="button_confirm_convert_fbe" msgid="7101855374850373091">"Wipe and convert"</string>
+    <string name="reset_shortcut_manager_throttling" msgid="6495066467198668994">"Reset ShortcutManager rate-limiting"</string>
+    <string name="reset_shortcut_manager_throttling_complete" msgid="1826770872063707900">"ShortcutManager rate-limiting has been reset"</string>
+    <string name="notification_suggestion_title" msgid="387052719462473500">"Control info on lock screen"</string>
+    <string name="notification_suggestion_summary" msgid="8521159741445416875">"Show or hide notification content"</string>
+    <string name="page_tab_title_summary" msgid="4070309266374993258">"All"</string>
+    <string name="page_tab_title_support" msgid="8483187649355540109">"Support &amp; tips"</string>
+    <string name="developer_smallest_width" msgid="7516950434587313360">"Smallest width"</string>
+    <string name="premium_sms_none" msgid="8268105565738040566">"No installed apps have requested Premium SMS access"</string>
+    <string name="premium_sms_warning" msgid="9086859595338944882">"Premium SMS may cost you money and will add up to your mobile bills. If you enable permission for an app, you will be able to send premium SMS using that app."</string>
+    <string name="premium_sms_access" msgid="4660047004791638305">"Premium SMS access"</string>
+    <string name="bluetooth_disabled" msgid="6244000672828617410">"Off"</string>
+    <string name="bluetooth_connected_summary" msgid="7672528674593152862">"Connected to <xliff:g id="ID_1">%1$s</xliff:g>"</string>
+    <string name="bluetooth_connected_multiple_devices_summary" msgid="9173661896296663932">"Connected to multiple devices"</string>
+    <string name="demo_mode" msgid="2798762752209330277">"System UI demo mode"</string>
+    <string name="quick_settings_developer_tiles" msgid="5947788063262762448">"Quick settings developer tiles"</string>
+    <string name="support_escalation_title" msgid="4111071371281023145">"We\'re here to help"</string>
+    <string name="support_escalation_24_7_title" msgid="8118369197749832074">"We\'re here for you 24/7"</string>
+    <string name="support_escalation_24_7_content_description" msgid="3772776213036994533">"We\'re here for you 24/7"</string>
+    <string name="support_escalation_summary" msgid="8473084168776014405">"Our support team is here to help address any issue"</string>
+    <string name="support_escalation_24_7_summary" msgid="2802773279262547187">"Our support team is available all day, every day"</string>
+    <string name="support_escalation_closed_summary" msgid="2240967274380168303">"Search help or come back during support hours (local time):&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">"Phone support hours (local time)&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">"Search help or explore tips &amp; tricks"</string>
+    <string name="support_country_list_title" msgid="823853371280534111">"Support for:"</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">"Travelling abroad?"</string>
+    <string name="support_international_phone_summary" msgid="208231793637026927">"International charges may apply"</string>
+    <string name="support_escalation_by_phone" msgid="4843223043487058711">"Phone"</string>
+    <string name="support_escalation_by_chat" msgid="977019859110763749">"Chat"</string>
+    <string name="support_tips_and_tricks_title" msgid="4153466795695447828">"Explore tips &amp; tricks"</string>
+    <string name="support_help_feedback_title" msgid="693440287222186718">"Search help &amp; send feedback"</string>
+    <string name="support_sign_in_required_title" msgid="1367187789121480440">"Contact support"</string>
+    <string name="support_sign_in_button_text" msgid="3054769428620671241">"Sign In"</string>
+    <string name="support_sign_in_required_help" msgid="5200654782405538114">"Can\'t sign in?"</string>
+    <string name="support_disclaimer_title" msgid="4825302018208770031">"Send system information"</string>
+    <string name="support_disclaimer_do_not_show" msgid="3378367075323727539">"Do not show this again"</string>
+    <string name="support_account_request_prefix" msgid="6387847874661861650">"Requesting as"</string>
+    <string name="support_account_picker_add_account" msgid="5076277544846506214">"Add account"</string>
+    <string name="support_system_information_title" msgid="3439905790018934773">"System information"</string>
+    <string name="managed_profile_settings_title" msgid="2729481936758125054">"Work profile settings"</string>
+    <string name="managed_profile_contact_search_title" msgid="6034734926815544221">"Contact search"</string>
+    <string name="managed_profile_contact_search_summary" msgid="5431253552272970512">"Allow contact searches by your organisation to identify callers and contacts"</string>
+    <plurals name="hours" formatted="false" msgid="7020844602875333472">
+      <item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> hours</item>
+      <item quantity="one">1 hour</item>
+    </plurals>
+    <plurals name="minutes" formatted="false" msgid="4666832442068789413">
+      <item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> minutes</item>
+      <item quantity="one">1 minute</item>
+    </plurals>
+    <plurals name="seconds" formatted="false" msgid="3876307354560025025">
+      <item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> seconds</item>
+      <item quantity="one">1 second</item>
+    </plurals>
+    <string name="support_estimated_wait_time" msgid="6523081420029378051">"~<xliff:g id="ESTIMATE">%1$s</xliff:g> wait"</string>
+    <string name="bluetooth_talkback_computer" msgid="4875089335641234463">"Computer"</string>
+    <string name="bluetooth_talkback_headset" msgid="5140152177885220949">"Headset"</string>
+    <string name="bluetooth_talkback_phone" msgid="4260255181240622896">"Telephone"</string>
+    <string name="bluetooth_talkback_imaging" msgid="551146170554589119">"Imaging"</string>
+    <string name="bluetooth_talkback_headphone" msgid="26580326066627664">"Headphone"</string>
+    <string name="bluetooth_talkback_input_peripheral" msgid="5165842622743212268">"Input Peripheral"</string>
+    <string name="bluetooth_talkback_bluetooth" msgid="5615463912185280812">"Bluetooth"</string>
+    <string name="automatic_storage_manager_settings" msgid="7819434542155181607">"Manage storage"</string>
+    <string name="automatic_storage_manager_text" msgid="4562950476680600604">"To help free up storage space, storage manager removes backed up photos and videos from your device."</string>
+    <string name="automatic_storage_manager_days_title" msgid="2017913896160914647">"Remove photos &amp; videos"</string>
+    <string name="automatic_storage_manager_preference_title" msgid="5753702798151073383">"Storage manager"</string>
+    <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_summary" product="default" msgid="8627850388011956901">"Quick gestures to control your phone"</string>
+    <string name="gesture_preference_summary" product="tablet" msgid="4717535378272065510">"Quick gestures to control your tablet"</string>
+    <string name="gesture_preference_summary" product="device" msgid="4205941452664950852">"Quick gestures to control your device"</string>
+    <string name="double_tap_power_for_camera_title" msgid="64716226816032800">"Jump to camera"</string>
+    <string name="double_tap_power_for_camera_summary" msgid="242037150983277829">"To quickly open camera, press the power button twice. Works from any screen."</string>
+    <string name="double_tap_power_for_camera_suggestion_title" msgid="6500405261202883589">"Open camera quickly"</string>
+    <string name="double_tap_power_for_camera_suggestion_summary" msgid="7010153544554016996">"Press power button twice to open camera"</string>
+    <string name="double_twist_for_camera_mode_title" msgid="4877834147983530479">"Flip camera"</string>
+    <string name="double_twist_for_camera_mode_summary" msgid="122977081337563340"></string>
+    <string name="double_twist_for_camera_suggestion_title" msgid="4689410222517954869">"Take selfies faster"</string>
+    <string name="double_twist_for_camera_suggestion_summary" product="default" msgid="447403641027147153">"Double-twist phone for selfie mode"</string>
+    <string name="double_twist_for_camera_suggestion_summary" product="tablet" msgid="1724660290703318739">"Double-twist tablet for selfie mode"</string>
+    <string name="double_twist_for_camera_suggestion_summary" product="device" msgid="5980398380988039489">"Double-twist device for selfie mode"</string>
+    <string name="ambient_display_title" product="default" msgid="5144814600610448504">"Double-tap to check phone"</string>
+    <string name="ambient_display_title" product="tablet" msgid="8688795028609563837">"Double-tap to check tablet"</string>
+    <string name="ambient_display_title" product="device" msgid="3423781975742145894">"Double-tap to check device"</string>
+    <string name="ambient_display_summary" msgid="525662960806416373">"To check time, notification icons and other info, double-tap your screen."</string>
+    <string name="ambient_display_suggestion_summary" msgid="5987443721392571847">"Check notifications when screen is off"</string>
+    <string name="ambient_display_pickup_title" product="default" msgid="818688002837687268">"Lift to check phone"</string>
+    <string name="ambient_display_pickup_title" product="tablet" msgid="4455864282995698097">"Lift to check tablet"</string>
+    <string name="ambient_display_pickup_title" product="device" msgid="5380534405773531175">"Lift to check device"</string>
+    <string name="ambient_display_pickup_summary" product="default" msgid="4567020486787561873">"To check time, notification icons and other info, pick up your phone."</string>
+    <string name="ambient_display_pickup_summary" product="tablet" msgid="5435283849947236648">"To check time, notification icons and other info, pick up your tablet."</string>
+    <string name="ambient_display_pickup_summary" product="device" msgid="8256669101643381568">"To check time, notification icons and other info, pick up your device."</string>
+    <string name="ambient_display_pickup_suggestion_summary" msgid="7014700589991761035">"Check notifications when screen is off"</string>
+    <string name="fingerprint_swipe_for_notifications_title" msgid="5816346492253270243">"Swipe fingerprint for notifications"</string>
+    <string name="fingerprint_swipe_for_notifications_summary" product="default" msgid="1770661868393713922">"To check your notifications, swipe down on the fingerprint sensor on the back of your phone."</string>
+    <string name="fingerprint_swipe_for_notifications_summary" product="tablet" msgid="902719947767712895">"To check your notifications, swipe down on the fingerprint sensor on the back of your tablet."</string>
+    <string name="fingerprint_swipe_for_notifications_summary" product="device" msgid="5372926094116306647">"To check your notifications, swipe down on the fingerprint sensor on the back of your device."</string>
+    <string name="fingerprint_swipe_for_notifications_suggestion_title" msgid="1677291167470357802">"See notifications quickly"</string>
+    <string name="fingerprint_swipe_for_notifications_suggestion_summary" msgid="127592803294414082">"Swipe down on the fingerprint sensor"</string>
+    <string name="gesture_setting_on" msgid="3455094265233870280">"On"</string>
+    <string name="gesture_setting_off" msgid="5230169535435881894">"Off"</string>
+    <string name="oem_unlock_enable_disabled_summary_bootloader_unlocked" msgid="4265541229765635629">"Bootloader is already unlocked"</string>
+    <string name="oem_unlock_enable_disabled_summary_connectivity" msgid="415954951226204461">"Connect to the Internet first"</string>
+    <string name="oem_unlock_enable_disabled_summary_connectivity_or_locked" msgid="5884723935668892613">"Connect to the Internet or contact your carrier"</string>
+    <string name="oem_unlock_enable_disabled_summary_sim_locked_device" msgid="4149387448213399630">"Unavailable on mobile-locked devices"</string>
+    <string name="automatic_storage_manager_freed_bytes" msgid="7517560170441007788">"<xliff:g id="SIZE">%1$s</xliff:g> total made available\n\nLast ran on <xliff:g id="DATE">%2$s</xliff:g>"</string>
+    <string name="web_action_enable_title" msgid="4051513950976670853">"Instant apps"</string>
+    <string name="web_action_enable_summary" msgid="3108127559723396382">"Open links in apps, even if they’re not installed"</string>
+    <string name="web_action_section_title" msgid="7364647086538399136">"Instant apps"</string>
+    <string name="instant_apps_settings" msgid="8827777916518348213">"Instant Apps preferences"</string>
+    <string name="domain_url_section_title" msgid="7046835219056428883">"Installed apps"</string>
+    <string name="automatic_storage_manager_activation_warning" msgid="6353100011690933254">"Your storage is now being managed by the storage manager"</string>
+    <string name="account_for_section_header" msgid="5356566418548737121">"Accounts for <xliff:g id="USER_NAME">%1$s</xliff:g>"</string>
+    <string name="configure_section_header" msgid="7391183586410814450">"Configure"</string>
+    <string name="auto_sync_account_title" msgid="898796354710116383">"Automatically sync data"</string>
+    <string name="auto_sync_personal_account_title" msgid="8496263182646100610">"Automatically sync personal data"</string>
+    <string name="auto_sync_work_account_title" msgid="4489172450037434152">"Automatically sync work data"</string>
+    <string name="auto_sync_account_summary" msgid="692499211629185107">"Let apps refresh data automatically"</string>
+    <string name="account_sync_title" msgid="7214747784136106491">"Account sync"</string>
+    <string name="account_sync_summary_some_on" msgid="3375930757891381175">"Sync on for <xliff:g id="ID_1">%1$d</xliff:g> of <xliff:g id="ID_2">%2$d</xliff:g> items"</string>
+    <string name="account_sync_summary_all_on" msgid="570431636622254156">"Sync on for all items"</string>
+    <string name="account_sync_summary_all_off" msgid="8782409931761182734">"Sync off for all items"</string>
+    <string name="enterprise_privacy_settings" msgid="1177106810374146496">"Managed device info"</string>
+    <string name="enterprise_privacy_settings_summary_generic" msgid="5853292305730761128">"Changes &amp; settings managed by your organisation"</string>
+    <string name="enterprise_privacy_settings_summary_with_name" msgid="4266234968317996188">"Changes &amp; settings managed by <xliff:g id="ORGANIZATION_NAME">%s</xliff:g>"</string>
+    <string name="enterprise_privacy_header" msgid="7402406406883832509">"To provide access to your work data, your organisation may change settings and install software on your device.\n\nFor more details, contact your organisation\'s admin."</string>
+    <string name="enterprise_privacy_exposure_category" msgid="7313392680107938517">"Types of information that your organisation can see"</string>
+    <string name="enterprise_privacy_exposure_changes_category" msgid="9079283547182933771">"Changes made by your organisation\'s admin"</string>
+    <string name="enterprise_privacy_device_access_category" msgid="5423434164248819058">"Your access to this device"</string>
+    <string name="enterprise_privacy_enterprise_data" msgid="2773968662865848413">"Data associated with your work account, such as email and calendar"</string>
+    <string name="enterprise_privacy_installed_packages" msgid="2313698828178764590">"List of apps on your device"</string>
+    <string name="enterprise_privacy_usage_stats" msgid="4398411405572759370">"Amount of time and data spent in each app"</string>
+    <string name="enterprise_privacy_network_logs" msgid="161722817268849590">"Most recent network traffic log"</string>
+    <string name="enterprise_privacy_bug_reports" msgid="843225086779037863">"Most recent bug report"</string>
+    <string name="enterprise_privacy_security_logs" msgid="5377362481617301074">"Most recent security log"</string>
+    <string name="enterprise_privacy_none" msgid="7706621148858381189">"None"</string>
+    <string name="enterprise_privacy_enterprise_installed_packages" msgid="6353757812144878828">"Apps installed"</string>
+    <string name="enterprise_privacy_apps_count_estimation_info" msgid="7433213592572082606">"Number of apps is estimated. It may not include apps installed outside of the Play Store."</string>
+    <plurals name="enterprise_privacy_number_packages_lower_bound" formatted="false" msgid="3005116533873542976">
+      <item quantity="other">Minimum <xliff:g id="COUNT_1">%d</xliff:g> apps</item>
+      <item quantity="one">Minimum <xliff:g id="COUNT_0">%d</xliff:g> app</item>
+    </plurals>
+    <string name="enterprise_privacy_location_access" msgid="4158197200885270634">"Location permissions"</string>
+    <string name="enterprise_privacy_microphone_access" msgid="5717375623568864441">"Microphone permissions"</string>
+    <string name="enterprise_privacy_camera_access" msgid="4858146118537519375">"Camera permissions"</string>
+    <string name="enterprise_privacy_enterprise_set_default_apps" msgid="3288495615791128724">"Default apps"</string>
+    <plurals name="enterprise_privacy_number_packages" formatted="false" msgid="2765037387436064893">
+      <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> apps</item>
+      <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> app</item>
+    </plurals>
+    <string name="enterprise_privacy_input_method" msgid="6531350246850814920">"Default keyboard"</string>
+    <string name="enterprise_privacy_input_method_name" msgid="4941106433683067953">"Set to <xliff:g id="APP_LABEL">%s</xliff:g>"</string>
+    <string name="enterprise_privacy_always_on_vpn_device" msgid="4409098287763221215">"Always-on VPN turned on"</string>
+    <string name="enterprise_privacy_always_on_vpn_personal" msgid="9217774730260037434">"Always-on VPN turned on in your personal profile"</string>
+    <string name="enterprise_privacy_always_on_vpn_work" msgid="7244472958208315814">"Always-on VPN turned on in your work profile"</string>
+    <string name="enterprise_privacy_global_http_proxy" msgid="7936664553416257333">"Global HTTP proxy set"</string>
+    <string name="enterprise_privacy_ca_certs_device" msgid="2019652712782510262">"Trusted credentials"</string>
+    <string name="enterprise_privacy_ca_certs_personal" msgid="2279084820904076599">"Trusted credentials in your personal profile"</string>
+    <string name="enterprise_privacy_ca_certs_work" msgid="6187377647815301809">"Trusted credentials in your work profile"</string>
+    <plurals name="enterprise_privacy_number_ca_certs" formatted="false" msgid="526375234629534165">
+      <item quantity="other">Minimum <xliff:g id="COUNT_1">%d</xliff:g> CA certificates</item>
+      <item quantity="one">Minimum <xliff:g id="COUNT_0">%d</xliff:g> CA certificate</item>
+    </plurals>
+    <string name="enterprise_privacy_lock_device" msgid="8791656477097208540">"Admin can lock the device and reset password"</string>
+    <string name="enterprise_privacy_wipe_device" msgid="2821960015797241790">"Admin can delete all device data"</string>
+    <string name="enterprise_privacy_failed_password_wipe_device" msgid="1001255609345002878">"Failed password attempts before deleting all device data"</string>
+    <string name="enterprise_privacy_failed_password_wipe_work" msgid="4040565826652951057">"Failed password attempts before deleting work profile data"</string>
+    <plurals name="enterprise_privacy_number_failed_password_wipe" formatted="false" msgid="5279099270351036696">
+      <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> attempts</item>
+      <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> attempt</item>
+    </plurals>
+    <string name="do_disclosure_generic" msgid="8653670456990823307">"This device is managed by your organisation."</string>
+    <string name="do_disclosure_with_name" msgid="1141081465968481380">"This device is managed by <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">"Find out more"</string>
+    <plurals name="default_camera_app_title" formatted="false" msgid="1134677050353971363">
+      <item quantity="other">Camera apps</item>
+      <item quantity="one">Camera app</item>
+    </plurals>
+    <string name="default_calendar_app_title" msgid="3545972964391065220">"Calendar app"</string>
+    <string name="default_contacts_app_title" msgid="3497370557378660098">"Contacts app"</string>
+    <plurals name="default_email_app_title" formatted="false" msgid="42826975161049245">
+      <item quantity="other">Email client apps</item>
+      <item quantity="one">Email client app</item>
+    </plurals>
+    <string name="default_map_app_title" msgid="7560143381633608567">"Map app"</string>
+    <plurals name="default_phone_app_title" formatted="false" msgid="6714041230953195024">
+      <item quantity="other">Phone apps</item>
+      <item quantity="one">Phone app</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">"Photos &amp; videos"</string>
+    <string name="storage_music_audio" msgid="789779084825206838">"Music &amp; audio"</string>
+    <string name="storage_games" msgid="7703159201697117621">"Games"</string>
+    <string name="storage_other_apps" msgid="5524321740031718083">"Other apps"</string>
+    <string name="storage_files" msgid="8581083146777364063">"Files"</string>
+    <string name="storage_size_large_alternate" msgid="3550744227788333060">"<xliff:g id="NUMBER">^1</xliff:g>"<small>" <xliff:g id="UNIT">^2</xliff:g>"</small>""</string>
+    <string name="storage_volume_total" msgid="3499221850532701342">"Used of <xliff:g id="TOTAL">%1$s</xliff:g>"</string>
+    <string name="storage_percent_full" msgid="6095012055875077036">"used"</string>
+    <string name="clear_instant_app_data" msgid="2004222610585890909">"Clear app"</string>
+    <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>
+    <string name="autofill_keywords" msgid="7485591824120812710">"auto, fill, auto-fill"</string>
+    <string name="autofill_confirmation_message" msgid="2784869528908005194">"&lt;b&gt;Make sure that you trust this app&lt;/b&gt; &lt;br/&gt; &lt;br/&gt; &lt;xliff:g id=app_name example=Google Auto-fill&gt;%1$s&lt;/xliff:g&gt; uses what\'s on your screen to determine what can be auto-filled."</string>
+    <string name="device_theme" msgid="4571803018917608588">"Device theme"</string>
+    <string name="default_theme" msgid="7085644992078579076">"Default"</string>
+    <string name="storage_manager_indicator" msgid="1516810749625915020">"Storage Manager: <xliff:g id="STATUS">^1</xliff:g>"</string>
+    <string name="storage_manager_indicator_off" msgid="7488057587180724388">"Off"</string>
+    <string name="storage_manager_indicator_on" msgid="8625551710194584733">"On"</string>
+    <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="carrier_provisioning" msgid="4398683675591893169">"Operator Provisioning Info"</string>
+    <string name="trigger_carrier_provisioning" msgid="3434865918009286187">"Trigger Operator Provisioning"</string>
+    <string name="new_device_suggestion_title" msgid="698847081680980774">"What\'s new and exciting?"</string>
+    <string name="new_device_suggestion_summary" product="default" msgid="206396571522515855">"Take a tour of your new phone"</string>
+    <string name="new_device_suggestion_summary" product="tablet" msgid="393751455688210956">"Take a tour of your new tablet"</string>
+    <string name="new_device_suggestion_summary" product="device" msgid="2939870049868336652">"Take a tour of your new device"</string>
+    <string name="disabled_low_ram_device" msgid="3751578499721173344">"This feature is not available on this device"</string>
+</resources>
diff --git a/res/values-en-rGB/arrays.xml b/res/values-en-rGB/arrays.xml
index f3beb46..1e36841 100644
--- a/res/values-en-rGB/arrays.xml
+++ b/res/values-en-rGB/arrays.xml
@@ -100,8 +100,6 @@
     <!-- no translation found for wifi_security_no_eap:0 (2084555984818107151) -->
     <!-- no translation found for wifi_security_no_eap:1 (397579322683471524) -->
     <!-- no translation found for wifi_security_no_eap:2 (1968820975358150484) -->
-    <!-- no translation found for wifi_ap_security:0 (5251664683198623324) -->
-    <!-- no translation found for wifi_ap_security:1 (7989073072260294673) -->
   <string-array name="wifi_eap_method">
     <item msgid="1160193392455075561">"PEAP"</item>
     <item msgid="7981731051382306293">"TLS"</item>
diff --git a/res/values-en-rGB/strings.xml b/res/values-en-rGB/strings.xml
index 34242d0..052d078 100644
--- a/res/values-en-rGB/strings.xml
+++ b/res/values-en-rGB/strings.xml
@@ -166,7 +166,7 @@
     <string name="bluetooth_map_acceptance_dialog_text" msgid="8712508202081143737">"%1$s wants to access your messages. Give access to %2$s?"</string>
     <string name="bluetooth_sap_request" msgid="2669762224045354417">"SIM access request"</string>
     <string name="bluetooth_sap_acceptance_dialog_text" msgid="4414253873553608690">"<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g> wants to access your SIM card. Granting access to the SIM card will disable data connectivity on your device for the duration of the connection. Give access to <xliff:g id="DEVICE_NAME_1">%2$s?</xliff:g>"</string>
-    <string name="bluetooth_device_name_summary" msgid="4757990010751789977">"Visible as \'<xliff:g id="DEVICE_NAME">^1</xliff:g>\' to other devices"</string>
+    <string name="bluetooth_device_name_summary" msgid="522235742194965734">"Visible as “<xliff:g id="DEVICE_NAME">^1</xliff:g>” to other devices"</string>
     <string name="bluetooth_paired_device_title" msgid="8638994696317952019">"Your devices"</string>
     <string name="bluetooth_pairing_page_title" msgid="7712127387361962608">"Pair new device"</string>
     <string name="date_and_time" msgid="9062980487860757694">"Date &amp; time"</string>
@@ -312,6 +312,8 @@
     <string name="zone_auto" msgid="334783869352026648">"Automatic time zone"</string>
     <string name="zone_auto_summaryOn" msgid="6142830927278458314">"Use network-provided time zone"</string>
     <string name="zone_auto_summaryOff" msgid="2597745783162041390">"Use network-provided time zone"</string>
+    <string name="date_time_24hour_auto" msgid="2117383168985653422">"Automatic 24‑hour format"</string>
+    <string name="date_time_24hour_auto_summary" msgid="6351812925651480277">"Use locale default"</string>
     <string name="date_time_24hour_title" msgid="3203537578602803850">"24‑hour format"</string>
     <string name="date_time_24hour" msgid="1193032284921000063">"Use 24-hour format"</string>
     <string name="date_time_set_time_title" msgid="6296795651349047016">"Time"</string>
@@ -372,6 +374,9 @@
     <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="1961957425135180242">"Next"</string>
+    <string name="setup_fingerprint_enroll_skip_title" msgid="362050541117362034">"Skip fingerprint?"</string>
+    <string name="setup_fingerprint_enroll_skip_after_adding_lock_text" msgid="958990414356204763">"Fingerprint setup only takes a minute or two. If you skip this, you can add your fingerprint later in settings."</string>
+    <string name="lock_screen_intro_skip_title" msgid="4988210105913705679">"Skip screen lock?"</string>
     <string name="lock_screen_intro_skip_dialog_text_frp" product="tablet" msgid="1581834104051243425">"Device protection features won’t be turned on. You won’t be able to prevent others from using this tablet if it’s lost, stolen or reset."</string>
     <string name="lock_screen_intro_skip_dialog_text_frp" product="device" msgid="4629503416877189572">"Device protection features won’t be turned on. You won’t be able to prevent others from using this device if it’s lost, stolen or reset."</string>
     <string name="lock_screen_intro_skip_dialog_text_frp" product="default" msgid="2423428240245737909">"Device protection features won’t be turned on. You won’t be able to prevent others from using this phone if it’s lost, stolen or reset."</string>
@@ -457,7 +462,7 @@
     <string name="setup_lock_settings_picker_title" product="tablet" msgid="90329443364067215">"Protect your tablet"</string>
     <string name="setup_lock_settings_picker_title" product="device" msgid="2399952075134938929">"Protect your device"</string>
     <string name="setup_lock_settings_picker_title" product="default" msgid="1572244299605153324">"Protect your phone"</string>
-    <string name="setup_lock_settings_picker_fingerprint_message" msgid="5585650064305600578">"For added security, set up a backup screen lock."</string>
+    <string name="lock_settings_picker_fingerprint_added_security_message" msgid="5768002109707648463">"For added security, set a backup screen lock."</string>
     <string name="setup_lock_settings_picker_message" product="tablet" msgid="8919671129189936210">"Prevent others from using this tablet 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="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>
@@ -588,6 +593,7 @@
     <string name="lockpassword_pin_no_sequential_digits" msgid="680765285206990584">"Ascending, descending or repeated sequence of digits isn\'t allowed"</string>
     <string name="lockpassword_ok_label" msgid="313822574062553672">"OK"</string>
     <string name="lockpassword_cancel_label" msgid="8818529276331121899">"Cancel"</string>
+    <string name="lockpassword_clear_label" msgid="5724429464960458155">"Clear"</string>
     <string name="lockpattern_tutorial_cancel_label" msgid="6431583477570493261">"Cancel"</string>
     <string name="lockpattern_tutorial_continue_label" msgid="3559793618653400434">"Next"</string>
     <string name="lock_setup" msgid="3355847066343753943">"Set up is complete."</string>
@@ -781,6 +787,7 @@
     <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>
@@ -817,6 +824,8 @@
     <string name="wifi_wps_available_first_item" msgid="4422547079984583502">"WPS available"</string>
     <string name="wifi_wps_available_second_item" msgid="8427520131718215301">" (WPS available)"</string>
     <string name="wifi_wps_nfc_enter_password" msgid="2288214226916117159">"Enter your network password"</string>
+    <string name="wifi_carrier_connect" msgid="8174696557882299911">"Operator Wi‑Fi network"</string>
+    <string name="wifi_carrier_content" msgid="4634077285415851933">"Connect via <xliff:g id="NAME">%1%s</xliff:g>"</string>
     <string name="wifi_scan_always_turnon_message" msgid="203123538572122989">"To improve location accuracy and for other purposes, <xliff:g id="APP_NAME">%1$s</xliff:g> wants to turn on network scanning, even when Wi-Fi is off.\n\nAllow this for all apps that want to scan?"</string>
     <string name="wifi_scan_always_turnoff_message" msgid="5538901671131941043">"To turn this off, go to Advanced in the overflow menu."</string>
     <string name="wifi_scan_always_confirm_allow" msgid="5355973075896817232">"Allow"</string>
@@ -834,6 +843,7 @@
     <string name="wifi_connect" msgid="1076622875777072845">"Connect"</string>
     <string name="wifi_failed_connect_message" msgid="8491902558970292871">"Failed to connect to network"</string>
     <string name="wifi_forget" msgid="8168174695608386644">"Forget"</string>
+    <string name="wifi_modify" msgid="6100248070440710782">"Modify"</string>
     <string name="wifi_failed_forget_message" msgid="1348172929201654986">"Failed to forget network"</string>
     <string name="wifi_save" msgid="3331121567988522826">"Save"</string>
     <string name="wifi_failed_save_message" msgid="6650004874143815692">"Failed to save network"</string>
@@ -846,6 +856,7 @@
     <string name="wifi_advanced_titlebar" msgid="4485841401774142908">"Advanced 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_title" msgid="3471132676909349382">"Network info"</string>
     <string name="wifi_details_subnet_mask" msgid="6720279144174924410">"Subnet mask"</string>
     <string name="wifi_details_dns" msgid="8648826607751830768">"DNS"</string>
     <string name="wifi_details_ipv6_address_header" msgid="6734119149106422148">"IPv6 addresses"</string>
@@ -878,16 +889,15 @@
     <string name="wifi_p2p_cancel_connect_title" msgid="255267538099324413">"Cancel invitation"</string>
     <string name="wifi_p2p_cancel_connect_message" msgid="7477756213423749402">"Do you want to cancel invitation to connect with <xliff:g id="PEER_NAME">%1$s</xliff:g>?"</string>
     <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_off_subtext" msgid="5466126533609394170">"Not sharing Internet or content with other devices"</string>
     <string name="wifi_hotspot_tethering_on_subtext" product="tablet" msgid="5752490509369962007">"Sharing this tablet’s Internet connection via hotspot"</string>
     <string name="wifi_hotspot_tethering_on_subtext" product="default" msgid="6461075246164300670">"Sharing this phone’s Internet connection via hotspot"</string>
     <string name="wifi_hotspot_on_local_only_subtext" msgid="2068110388011294735">"App is sharing content. To share Internet connection, turn hotspot off, then on"</string>
-    <string name="wifi_hotspot_name_title" msgid="1341735529132128887">"Wi‑Fi name"</string>
+    <string name="wifi_hotspot_name_title" msgid="8237000746618636778">"Hotspot name"</string>
     <string name="wifi_hotspot_name_summary_connecting" msgid="3378299995508671967">"Turning on <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>..."</string>
     <string name="wifi_hotspot_name_summary_connected" msgid="3888672084861445362">"Other devices can connect to <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>"</string>
-    <string name="wifi_hotspot_password_title" msgid="1955592302902091281">"Wi‑Fi password"</string>
+    <string name="wifi_hotspot_password_title" msgid="8676859981917573801">"Hotspot password"</string>
     <string name="wifi_hotspot_ap_band_title" msgid="1165801173359290681">"AP band"</string>
     <string name="wifi_hotspot_footer_info_regular" msgid="1203489406068036455">"Use hotspot to create a Wi‑Fi network for your other devices. Hotspot provides Internet using your mobile data connection. Additional mobile data charges may apply."</string>
     <string name="wifi_hotspot_footer_info_local_only" msgid="857988412470694109">"Apps can create a hotspot to share content with nearby devices."</string>
@@ -898,7 +908,6 @@
     <string name="wifi_tether_configure_ap_text" msgid="7974681394041609308">"Set up Wi‑Fi hotspot"</string>
     <string name="wifi_hotspot_configure_ap_text" msgid="5478614731464220432">"Wi‑Fi hotspot setup"</string>
     <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">"Android Hotspot"</string>
     <string name="wifi_calling_settings_title" msgid="4102921303993404577">"Wi-Fi Calling"</string>
     <string name="wifi_calling_suggestion_title" msgid="9008010480466359578">"Turn on Wi-Fi Calling"</string>
@@ -939,7 +948,7 @@
     <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="emergency_address_summary" msgid="3266760199681945746">"Address used by emergency services as your location if you make an emergency call using Wi‑Fi"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"Display"</string>
     <string name="sound_settings" msgid="5534671337768745343">"Sound"</string>
     <string name="all_volume_title" msgid="4296957391257836961">"Volumes"</string>
@@ -993,6 +1002,7 @@
     <string name="search_settings" msgid="1910951467596035063">"Search"</string>
     <string name="search_settings_summary" msgid="9205656546570654169">"Manage search settings and history"</string>
     <string name="search_settings_no_results" msgid="8799027492641230999">"No results"</string>
+    <string name="search_clear_history" msgid="4196658962573162457">"Clear history"</string>
     <string name="display_settings" msgid="7965901687241669598">"Display"</string>
     <string name="accelerometer_title" msgid="7854608399547349157">"Auto-rotate screen"</string>
     <string name="color_mode_title" msgid="3159275920408338215">"Vivid colours"</string>
@@ -1122,7 +1132,6 @@
     <string name="baseband_version" msgid="1848990160763524801">"Baseband version"</string>
     <string name="kernel_version" msgid="9192574954196167602">"Kernel version"</string>
     <string name="build_number" msgid="3075795840572241758">"Build number"</string>
-    <string name="selinux_status" msgid="6212165375172061672">"SELinux status"</string>
     <string name="device_info_not_available" msgid="8062521887156825182">"Not available"</string>
     <string name="device_status_activity_title" msgid="1411201799384697904">"Status"</string>
     <string name="device_status" msgid="607405385799807324">"Status"</string>
@@ -1150,7 +1159,6 @@
     <string name="status_wifi_mac_address" msgid="2202206684020765378">"Wi‑Fi MAC address"</string>
     <string name="status_bt_address" msgid="4195174192087439720">"Bluetooth address"</string>
     <string name="status_serial_number" msgid="2257111183374628137">"Serial number"</string>
-    <string name="status_unavailable" msgid="7862009036663793314">"Unavailable"</string>
     <string name="status_up_time" msgid="7294859476816760399">"Uptime"</string>
     <string name="status_awake_time" msgid="2393949909051183652">"Awake time"</string>
     <string name="internal_memory" msgid="9129595691484260784">"Internal storage"</string>
@@ -1326,6 +1334,7 @@
     <string name="menu_restore" msgid="8260067415075573273">"Reset to default"</string>
     <string name="restore_default_apn_completed" msgid="2824775307377604897">"Reset default APN settings completed"</string>
     <string name="reset_dashboard_title" msgid="6254873816990678620">"Reset options"</string>
+    <string name="reset_dashboard_summary" msgid="4851012632493522755">"Network, apps or device can be reset"</string>
     <string name="reset_network_title" msgid="6166025966016873843">"Reset Wi-Fi, mobile &amp; Bluetooth"</string>
     <string name="reset_network_desc" msgid="5547979398298881406">"This will reset all network settings, including:\n\n"<li>"Wi‑Fi"</li>\n<li>"Mobile data"</li>\n<li>"Bluetooth"</li></string>
     <string name="reset_network_button_text" msgid="2035676527471089853">"Reset settings"</string>
@@ -1334,17 +1343,14 @@
     <string name="reset_network_confirm_title" msgid="1759888886976962773">"Reset?"</string>
     <string name="network_reset_not_available" msgid="7188610385577164676">"Network reset is not available for this user"</string>
     <string name="reset_network_complete_toast" msgid="787829973559541880">"Network settings have been reset"</string>
-    <string name="master_clear_title" msgid="6617679904229218425">"Erase all data (factory reset)"</string>
-    <plurals name="master_clear_with_account_summary" formatted="false" msgid="5911377203778818712">
-      <item quantity="other"><xliff:g id="ACCOUNT_COUNT">%1$d</xliff:g> accounts will be reset</item>
-      <item quantity="one">1 account will be reset</item>
-    </plurals>
-    <string name="master_clear_summary" msgid="6902443944660426951">"Internal storage &amp; all data will be reset"</string>
+    <string name="master_clear_title" msgid="3531267871084279512">"Erase all data (factory reset)"</string>
     <string name="master_clear_desc" product="tablet" msgid="9146059417023157222">"This will erase all data from your tablet\'s "<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" msgid="4800386183314202571">"This will erase all data from your phone\'s "<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_accounts" product="default" msgid="6412857499147999073">\n\n"You are currently signed in to the following accounts:\n"</string>
     <string name="master_clear_other_users_present" product="default" msgid="5161423070702470742">\n\n"There are other users present on this device.\n"</string>
     <string name="master_clear_desc_also_erases_external" msgid="1903185203791274237"><li>"Music"</li>\n<li>"Photos"</li>\n<li>"Other user data"</li></string>
+    <string name="master_clear_desc_also_erases_esim" msgid="312352697653096008"><li>"Operators on eSIM"</li></string>
+    <string name="master_clear_desc_no_cancel_mobile_plan" msgid="5460926449093211144">\n\n"This will not cancel your mobile service plan."</string>
     <string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="7744115866662613411">\n\n"To clear music, pictures and other user data, the "<b>"USB storage"</b>" needs to be erased."</string>
     <string name="master_clear_desc_erase_external_storage" product="default" msgid="4801026652617377093">\n\n"To clear music, pictures and other user data, the "<b>"SD card"</b>" needs to be erased."</string>
     <string name="erase_external_storage" product="nosdcard" msgid="969364037450286809">"Erase USB storage"</string>
@@ -1461,15 +1467,16 @@
     <string name="settings_safetylegal_activity_title" msgid="6901214628496951727">"Safety information"</string>
     <string name="settings_safetylegal_activity_unreachable" msgid="250674109915859456">"You don\'t have a data connection. To view this information now, go to %s from any computer connected to the Internet."</string>
     <string name="settings_safetylegal_activity_loading" msgid="8059022597639516348">"Loading…"</string>
-    <string name="lockpassword_choose_your_password_header" msgid="8624900666929394990">"Choose your password"</string>
-    <string name="lockpassword_choose_your_password_header_for_fingerprint" msgid="6624409510609085450">"To use fingerprint, set password"</string>
-    <string name="lockpassword_choose_your_pattern_header" msgid="6949761069941694050">"Choose your pattern"</string>
-    <string name="lockpassword_choose_your_pattern_header_for_fingerprint" msgid="5901096361617543819">"To use fingerprint, set pattern"</string>
-    <string name="lockpassword_choose_your_pin_header" msgid="7598849519816138302">"Choose your PIN"</string>
-    <string name="lockpassword_choose_your_pin_header_for_fingerprint" msgid="765344692615917183">"To use fingerprint, set PIN"</string>
-    <string name="lockpassword_confirm_your_password_header" msgid="6308478184889846633">"Confirm your password"</string>
+    <string name="lockpassword_choose_your_screen_lock_header" msgid="3872462096767152394">"Set a screen lock"</string>
+    <string name="lockpassword_choose_your_password_message" msgid="1197569283524841412">"For security, set a password"</string>
+    <string name="lockpassword_choose_your_password_header_for_fingerprint" msgid="2541818487015343503">"To use fingerprint, set a password"</string>
+    <string name="lockpassword_choose_your_pattern_header_for_fingerprint" msgid="7709785406243556723">"To use fingerprint, set a pattern"</string>
+    <string name="lockpassword_choose_your_pin_message" msgid="1875420718677275646">"For security, set a PIN"</string>
+    <string name="lockpassword_choose_your_pin_header_for_fingerprint" msgid="1549639053195796674">"To use fingerprint, set a PIN"</string>
+    <string name="lockpassword_choose_your_pattern_message" msgid="5986983400689720015">"For security, set a pattern"</string>
+    <string name="lockpassword_confirm_your_password_header" msgid="1266027268220850931">"Re-enter your password"</string>
     <string name="lockpassword_confirm_your_pattern_header" msgid="7543433733032330821">"Confirm your pattern"</string>
-    <string name="lockpassword_confirm_your_pin_header" msgid="49038294648213197">"Confirm your PIN"</string>
+    <string name="lockpassword_confirm_your_pin_header" msgid="7744513791910572550">"Re-enter your PIN"</string>
     <string name="lockpassword_confirm_passwords_dont_match" msgid="5140892109439191415">"Passwords don\'t match"</string>
     <string name="lockpassword_confirm_pins_dont_match" msgid="7226244811505606217">"PINs don\'t match"</string>
     <string name="lockpassword_choose_lock_generic_header" msgid="3811438094903786145">"Unlock selection"</string>
@@ -1488,6 +1495,12 @@
     <string name="lockpassword_strong_auth_required_work_pattern" msgid="3003781907040522053">"For added security, use your work pattern"</string>
     <string name="lockpassword_strong_auth_required_work_pin" msgid="3367491332598821552">"For added security, enter your work PIN"</string>
     <string name="lockpassword_strong_auth_required_work_password" msgid="8159775129968582940">"For added security, enter your work password"</string>
+    <string name="lockpassword_confirm_your_pattern_details_frp" msgid="6757336656791723193">"Your phone was reset to factory settings. To use this phone, enter your previous pattern."</string>
+    <string name="lockpassword_confirm_your_pin_details_frp" msgid="826520613445990470">"Your phone was reset to factory settings. To use this phone, enter your previous PIN."</string>
+    <string name="lockpassword_confirm_your_password_details_frp" msgid="8944081074615739040">"Your phone was reset to factory settings. To use this phone, enter your previous password."</string>
+    <string name="lockpassword_confirm_your_pattern_header_frp" msgid="2898036091609128286">"Verify pattern"</string>
+    <string name="lockpassword_confirm_your_pin_header_frp" msgid="4141601774778898803">"Verify PIN"</string>
+    <string name="lockpassword_confirm_your_password_header_frp" msgid="3762615419295360480">"Verify password"</string>
     <string name="lockpassword_invalid_pin" msgid="15588049067548470">"Wrong PIN"</string>
     <string name="lockpassword_invalid_password" msgid="4038507398784975200">"Wrong password"</string>
     <string name="lockpattern_need_to_unlock_wrong" msgid="1745247595356012176">"Wrong pattern"</string>
@@ -1537,7 +1550,6 @@
     <string name="install_applications_title" msgid="4987712352256508946">"Allow all app sources"</string>
     <string name="recent_app_category_title" msgid="6673071268966003928">"Recently opened apps"</string>
     <string name="see_all_apps_title" msgid="1317153498074308438">"See all <xliff:g id="COUNT">%1$d</xliff:g> apps"</string>
-    <string name="recent_app_summary" msgid="3366446669844932300">"<xliff:g id="TIME">^1</xliff:g> ago"</string>
     <string name="install_all_warning" product="tablet" msgid="8310489909586138165">"Your tablet and personal data are more vulnerable to attack by unknown apps. By installing apps from this source, you agree that you are responsible for any damage to your tablet or loss of data that may result from their use."</string>
     <string name="install_all_warning" product="default" msgid="1952257127370115988">"Your phone and personal data are more vulnerable to attack by unknown apps. By installing apps from this source, you agree that you are responsible for any damage to your phone or loss of data that may result from their use."</string>
     <string name="advanced_settings" msgid="1777249286757067969">"Advanced settings"</string>
@@ -1801,7 +1813,7 @@
     <string name="accessibility_settings_summary" msgid="981260486011624939">"Screen readers, display, interaction controls"</string>
     <string name="vision_settings_title" msgid="4204111425716868288">"Vision settings"</string>
     <string name="vision_settings_description" msgid="5679491180156408260">"You can customise this device to fit your needs. These accessibility features can be changed later in Settings."</string>
-    <string name="vision_settings_suggestion_title" msgid="917294957154878441">"Increase font size"</string>
+    <string name="vision_settings_suggestion_title" msgid="8058794060304707004">"Change font size"</string>
     <string name="screen_reader_category_title" msgid="7739154903913400641">"Screen readers"</string>
     <string name="audio_and_captions_category_title" msgid="3420727114421447524">"Audio &amp; on-screen text"</string>
     <string name="display_category_title" msgid="685461049938269166">"Display"</string>
@@ -1838,7 +1850,6 @@
     <string name="accessibility_display_inversion_preference_subtitle" msgid="7052959202195368109">"May affect performance"</string>
     <string name="accessibility_autoclick_preference_title" msgid="7014499339068449623">"Click after cursor stops moving"</string>
     <string name="accessibility_autoclick_delay_preference_title" msgid="3962261178385106006">"Delay before click"</string>
-    <string name="preference_summary_default_combination" msgid="8532964268242666060">"<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">"ON"</string>
     <string name="accessibility_summary_state_disabled" msgid="2241315620132005595">"OFF"</string>
     <string name="enable_quick_setting" msgid="2366999897816894536">"Show in Quick Settings"</string>
@@ -1957,12 +1968,14 @@
     <string name="background_activity_summary_on" msgid="649282072540085599">"App can run in the background when not in use"</string>
     <string name="background_activity_summary_off" msgid="7666330699090632040">"App\'s background activity is limited when not in use"</string>
     <string name="background_activity_summary_disabled" msgid="3710669050484599847">"App not allowed to run in background"</string>
+    <string name="background_activity_summary_whitelisted" msgid="7375400051141016808">"App can not be optimised for battery use"</string>
+    <string name="background_activity_warning_dialog_title" msgid="2216249969149568871">"Limit background activity?"</string>
+    <string name="background_activity_warning_dialog_text" msgid="7049624449246121981">"If you limit background activity for an app, it may misbehave"</string>
     <string name="device_screen_usage" msgid="3386088035570409683">"Screen usage since full charge"</string>
     <string name="device_screen_consumption" msgid="4607589286438986687">"Screen consumption"</string>
     <string name="device_cellular_network" msgid="4724773411762382950">"Mobile network scanning"</string>
-    <string name="power_last_full_charge_summary" msgid="532845389094620657">"<xliff:g id="TIME">^1</xliff:g> ago"</string>
-    <string name="power_usage_list_summary" msgid="6775339745194635000">"App usage since full charge (<xliff:g id="TIME">^1</xliff:g> ago)"</string>
-    <string name="power_usage_list_summary_device" msgid="7036566616386864302">"Device usage since full charge (<xliff:g id="TIME">^1</xliff:g> ago)"</string>
+    <string name="power_usage_list_summary" msgid="6393929085382334341">"App usage since full charge (<xliff:g id="RELATIVE_TIME">^1</xliff:g>)"</string>
+    <string name="power_usage_list_summary_device" msgid="4461926045610455423">"Device usage since full charge (<xliff:g id="RELATIVE_TIME">^1</xliff:g>)"</string>
     <string name="screen_usage_summary" msgid="6687403051423153550">"Amount of time screen has been on since full charge"</string>
     <string name="device_usage_list_summary" msgid="5623036661468763251">"Device usage since full charge"</string>
     <string name="battery_since_unplugged" msgid="338073389740738437">"Battery use since unplugged"</string>
@@ -2208,14 +2221,14 @@
     <string name="credentials_unlock_hint" msgid="2301301378040499348">"Type the password for credential storage."</string>
     <string name="credentials_old_password" msgid="7553393815538684028">"Current password:"</string>
     <string name="credentials_reset_hint" msgid="6297256880896133631">"Remove all the contents?"</string>
-    <string name="credentials_password_too_short" msgid="7502749986405522663">"The password must contain at least 8 characters."</string>
     <string name="credentials_wrong_password" msgid="2541932597104054807">"Incorrect password."</string>
     <string name="credentials_reset_warning" msgid="5320653011511797600">"Incorrect password. You have one more chance before credential storage is erased."</string>
     <string name="credentials_reset_warning_plural" msgid="6514085665301095279">"Incorrect password. You have <xliff:g id="NUMBER">%1$d</xliff:g> more chances before credential storage is erased."</string>
     <string name="credentials_erased" msgid="2907836028586342969">"Credential storage has been erased."</string>
     <string name="credentials_not_erased" msgid="7685932772284216097">"Credential storage couldn\'t be erased."</string>
     <string name="credentials_enabled" msgid="7588607413349978930">"Credential storage is enabled."</string>
-    <string name="credentials_configure_lock_screen_hint" msgid="6757119179588664966">"You need to set a lock screen PIN or password before you can use credential storage."</string>
+    <string name="credentials_configure_lock_screen_hint" msgid="8058230497337529036">"Before you can use credential storage, your device needs to have a secure lock screen"</string>
+    <string name="credentials_configure_lock_screen_button" msgid="253239765216055321">"SET LOCK"</string>
     <string name="usage_access_title" msgid="332333405495457839">"Apps with usage access"</string>
     <string name="emergency_tone_title" msgid="1055954530111587114">"Emergency tone"</string>
     <string name="emergency_tone_summary" msgid="722259232924572153">"Set behaviour when an emergency call is placed"</string>
@@ -2335,8 +2348,6 @@
     <skip />
     <string name="cant_sync_dialog_title" msgid="2777238588398046285">"Cannot sync manually"</string>
     <string name="cant_sync_dialog_message" msgid="1938380442159016449">"Sync for this item is currently disabled. To change your preference, temporarily turn on background data and automatic sync."</string>
-    <string name="wimax_settings" msgid="2655139497028469039">"4G"</string>
-    <string name="status_wimax_mac_address" msgid="8390791848661413416">"4G MAC address"</string>
     <string name="enter_password" msgid="8035706727471334122">"To start Android, enter your password"</string>
     <string name="enter_pin" msgid="5305333588093263790">"To start Android, enter your PIN"</string>
     <string name="enter_pattern" msgid="4187435713036808566">"To start Android, draw your pattern"</string>
@@ -2350,6 +2361,7 @@
     <string name="misc_files_selected_count" msgid="4647048020823912088">"selected <xliff:g id="NUMBER">%1$d</xliff:g> out of <xliff:g id="TOTAL">%2$d</xliff:g>"</string>
     <string name="misc_files_selected_count_bytes" msgid="2876232009069114352">"<xliff:g id="NUMBER">%1$s</xliff:g> out of <xliff:g id="TOTAL">%2$s</xliff:g>"</string>
     <string name="select_all" msgid="1562774643280376715">"Select all"</string>
+    <string name="data_plan_usage_manage_plans_button_text" msgid="8997761990902708162">"Manage plans"</string>
     <string name="data_usage_summary_title" msgid="3804110657238092929">"Data usage"</string>
     <string name="data_usage_app_summary_title" msgid="4147258989837459172">"App data usage"</string>
     <string name="data_usage_accounting" msgid="7170028915873577387">"Operator data accounting may differ from your device."</string>
@@ -2435,6 +2447,9 @@
     <string name="data_usage_metered_mobile" msgid="5423305619126978393">"Mobile networks"</string>
     <string name="data_usage_metered_wifi" msgid="1761738002328299714">"Metered Wi‑Fi networks"</string>
     <string name="data_usage_metered_wifi_disabled" msgid="727808462375941567">"To select metered networks, turn Wi‑Fi on."</string>
+    <string name="data_usage_metered_auto" msgid="1262028400911918865">"Automatic"</string>
+    <string name="data_usage_metered_yes" msgid="9217539611385225894">"Metered"</string>
+    <string name="data_usage_metered_no" msgid="4025232961929071789">"Not metered"</string>
     <string name="data_usage_disclaimer" msgid="6887858149980673444">"Operator data accounting may differ from your device."</string>
     <string name="cryptkeeper_emergency_call" msgid="198578731586097145">"Emergency call"</string>
     <string name="cryptkeeper_return_to_call" msgid="5613717339452772491">"Return to call"</string>
@@ -2526,9 +2541,6 @@
     <string name="backup_pw_set_button_text" msgid="2387480910044648795">"Set backup password"</string>
     <string name="backup_pw_cancel_button_text" msgid="8845630125391744615">"Cancel"</string>
     <string name="additional_system_update_settings_list_item_title" msgid="214987609894661992">"Additional system updates"</string>
-    <string name="selinux_status_disabled" msgid="924551035552323327">"Disabled"</string>
-    <string name="selinux_status_permissive" msgid="6004965534713398778">"Permissive"</string>
-    <string name="selinux_status_enforcing" msgid="2252703756208463329">"Enforcing"</string>
     <string name="ssl_ca_cert_warning" msgid="2045866713601984673">"Network may be monitored"</string>
     <string name="done_button" msgid="1991471253042622230">"Done"</string>
     <plurals name="ssl_ca_cert_dialog_title" formatted="false" msgid="7145092748045794650">
@@ -2871,13 +2883,15 @@
     <string name="notifications_title" msgid="8086372779371204971">"Notifications"</string>
     <string name="app_notifications_title" msgid="5810577805218003760">"App notifications"</string>
     <string name="notification_channel_title" msgid="2260666541030178452">"Notification category"</string>
+    <string name="notification_group_title" msgid="7180506440133859601">"Notification category group"</string>
     <string name="notification_importance_title" msgid="848692592679312666">"Importance"</string>
-    <string name="notification_importance_unspecified" msgid="2196023702875112081">"Let the app decide"</string>
+    <string name="notification_importance_unspecified" msgid="6622173510486113958">"Allow sound"</string>
     <string name="notification_importance_blocked" msgid="7938180808339386300">"Never show notifications"</string>
     <string name="notification_importance_min" msgid="5455049524984686275">"No sound or visual interruption"</string>
     <string name="notification_importance_low" msgid="8881468429453766553">"No sound"</string>
     <string name="notification_importance_default" msgid="5958338024601957516">"Make sound"</string>
     <string name="notification_importance_high" msgid="2082429479238228527">"Make sound and pop up on screen"</string>
+    <string name="notification_importance_high_silent" msgid="2667033773703765252">"Pop on screen"</string>
     <string name="notification_importance_min_title" msgid="6974673091137544803">"Low"</string>
     <string name="notification_importance_low_title" msgid="8131254047772814309">"Medium"</string>
     <string name="notification_importance_default_title" msgid="9120383978536089489">"High"</string>
@@ -2920,8 +2934,13 @@
     <string name="loading_notification_apps" msgid="5031818677010335895">"Loading apps..."</string>
     <string name="app_notifications_off_desc" msgid="4882445501376722969">"Android is blocking this app\'s notifications from appearing on this device"</string>
     <string name="channel_notifications_off_desc" msgid="5899225298718840635">"Android is blocking this category of notifications from appearing on this device"</string>
+    <string name="channel_group_notifications_off_desc" msgid="1620950416247316370">"Android is blocking this group of notifications from appearing on this device"</string>
     <string name="notification_channels" msgid="5346841743182627500">"Categories"</string>
     <string name="notification_channels_other" msgid="5645317113885788226">"Other"</string>
+    <plurals name="notification_group_summary" formatted="false" msgid="3420621520561455358">
+      <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> categories</item>
+      <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> category</item>
+    </plurals>
     <string name="no_channels" msgid="3077375508177744586">"This app has not posted any notifications"</string>
     <string name="app_settings_link" msgid="8894946007543660906">"Additional settings in the app"</string>
     <string name="app_notification_listing_summary_zero" msgid="6482582965081108108">"Turned on for all apps"</string>
@@ -2998,6 +3017,7 @@
     <string name="zen_mode_from_starred" msgid="2678345811950997027">"From starred contacts only"</string>
     <string name="zen_mode_from_none" msgid="8219706639954614136">"None"</string>
     <string name="zen_mode_alarms" msgid="2165302777886552926">"Alarms"</string>
+    <string name="zen_mode_alarms_summary" msgid="3774926045611788635">"Alarms are always a priority and make sound"</string>
     <string name="zen_mode_reminders" msgid="5458502056440485730">"Reminders"</string>
     <string name="zen_mode_events" msgid="7914446030988618264">"Events"</string>
     <string name="zen_mode_all_callers" msgid="584186167367236922">"All callers"</string>
@@ -3023,15 +3043,16 @@
     <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>
     <string name="zen_mode_no_visual_interruptions" msgid="8742776003822778472">"When screen is on or off"</string>
     <string name="notification_app_settings_button" msgid="6685640230371477485">"Notification settings"</string>
+    <string name="suggestion_button_text" msgid="3275010948381252006">"OK"</string>
     <string name="device_feedback" msgid="3238056036766293294">"Send feedback about this device"</string>
     <string name="restr_pin_enter_admin_pin" msgid="1085834515677448072">"Enter admin PIN"</string>
     <string name="switch_on_text" msgid="1124106706920572386">"On"</string>
@@ -3216,6 +3237,7 @@
     <string name="usb_summary_file_transfers" msgid="6435943692610175111">"Transferring files"</string>
     <string name="usb_summary_photo_transfers" msgid="8440204169576585250">"Transferring photos (PTP)"</string>
     <string name="usb_summary_MIDI" msgid="5687906612187885908">"Using device as MIDI"</string>
+    <string name="sms_mirroring_pref" msgid="6475043279147376031">"SMS Mirroring"</string>
     <string name="background_check_pref" msgid="7550258400138010979">"Background check"</string>
     <string name="background_check_title" msgid="4534254315824525593">"Full background access"</string>
     <string name="assist_access_context_title" msgid="2269032346698890257">"Use text from screen"</string>
@@ -3282,7 +3304,7 @@
     <string name="write_settings_title" msgid="4232152481902542284">"Can modify system settings"</string>
     <string name="write_system_settings" msgid="3482913590601096763">"Modify system settings"</string>
     <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="permit_write_settings" msgid="658555006453212691">"Allow modifying 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>
@@ -3377,9 +3399,12 @@
     <string name="color_temperature" msgid="2070126836910615605">"Cool colour temperature"</string>
     <string name="color_temperature_desc" msgid="4793729830226404052">"Use cooler display colours"</string>
     <string name="color_temperature_toast" msgid="4974218172133854827">"To apply colour change, turn off screen"</string>
-    <string name="telephony_monitor_toast" msgid="7003764250271195384">"To apply telephony monitor change, reboot device"</string>
+    <string name="connectivity_monitor_switch" msgid="9059759348648583421">"Connectivity Monitor"</string>
+    <string name="connectivity_monitor_switch_summary" msgid="2828658652378866401">"Connectivity Monitor will collect logs when it detects a connectivity problem and prompt notification to user to file a bug"</string>
+    <string name="connectivity_monitor_toast" msgid="5551859612881173028">"To apply connectivity monitor change, reboot device"</string>
     <string name="camera_hal_hdrplus_switch" msgid="8377365197105267466">"Camera HAL HDR+"</string>
     <string name="camera_hal_hdrplus_toast" msgid="2063703797270055299">"To apply Camera HAL HDR+ change, reboot device"</string>
+    <string name="camera_laser_sensor_switch" msgid="8913588990743234440">"Camera Laser Sensor"</string>
     <string name="ota_disable_automatic_update" msgid="2319639631655915050">"Automatic system updates"</string>
     <string name="usage" msgid="2977875522080448986">"Usage"</string>
     <string name="cellular_data_usage" msgid="2155683719898158203">"Mobile data usage"</string>
@@ -3405,7 +3430,7 @@
     <string name="data_warning" msgid="209133958008062117">"Data warning"</string>
     <string name="set_data_limit" msgid="2901526323210516923">"Set data limit"</string>
     <string name="data_limit" msgid="1885406964934590552">"Data limit"</string>
-    <string name="data_usage_template" msgid="392191945602400904">"<xliff:g id="ID_1">%1$s</xliff:g> used between <xliff:g id="ID_2">%2$s</xliff:g>"</string>
+    <string name="data_usage_template" msgid="2923744765873163859">"<xliff:g id="ID_1">%1$s</xliff:g> used <xliff:g id="ID_2">%2$s</xliff:g>"</string>
     <string name="configure" msgid="1029654422228677273">"Configure"</string>
     <string name="data_usage_other_apps" msgid="3272872663517382050">"Other apps included in usage"</string>
     <plurals name="data_saver_unrestricted_summary" formatted="false" msgid="2635267833484232703">
@@ -3474,7 +3499,7 @@
     <string name="button_confirm_convert_fbe" msgid="7101855374850373091">"Wipe and convert"</string>
     <string name="reset_shortcut_manager_throttling" msgid="6495066467198668994">"Reset ShortcutManager rate-limiting"</string>
     <string name="reset_shortcut_manager_throttling_complete" msgid="1826770872063707900">"ShortcutManager rate-limiting has been reset"</string>
-    <string name="notification_suggestion_title" msgid="4506524937307816475">"Control lock screen notifications"</string>
+    <string name="notification_suggestion_title" msgid="387052719462473500">"Control info on lock screen"</string>
     <string name="notification_suggestion_summary" msgid="8521159741445416875">"Show or hide notification content"</string>
     <string name="page_tab_title_summary" msgid="4070309266374993258">"All"</string>
     <string name="page_tab_title_support" msgid="8483187649355540109">"Support &amp; tips"</string>
@@ -3482,7 +3507,7 @@
     <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>
     <string name="premium_sms_access" msgid="4660047004791638305">"Premium SMS access"</string>
-    <string name="bluetooth_disabled" msgid="2456198532288640046">"Not visible to other devices"</string>
+    <string name="bluetooth_disabled" msgid="6244000672828617410">"Off"</string>
     <string name="bluetooth_connected_summary" msgid="7672528674593152862">"Connected to <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="bluetooth_connected_multiple_devices_summary" msgid="9173661896296663932">"Connected to multiple devices"</string>
     <string name="demo_mode" msgid="2798762752209330277">"System UI demo mode"</string>
@@ -3584,7 +3609,7 @@
     <string name="web_action_enable_title" msgid="4051513950976670853">"Instant apps"</string>
     <string name="web_action_enable_summary" msgid="3108127559723396382">"Open links in apps, even if they’re not installed"</string>
     <string name="web_action_section_title" msgid="7364647086538399136">"Instant apps"</string>
-    <string name="instant_apps_account" msgid="1433620209791992528">"Instant apps account"</string>
+    <string name="instant_apps_settings" msgid="8827777916518348213">"Instant Apps preferences"</string>
     <string name="domain_url_section_title" msgid="7046835219056428883">"Installed apps"</string>
     <string name="automatic_storage_manager_activation_warning" msgid="6353100011690933254">"Your storage is now being managed by the storage manager"</string>
     <string name="account_for_section_header" msgid="5356566418548737121">"Accounts for <xliff:g id="USER_NAME">%1$s</xliff:g>"</string>
@@ -3631,7 +3656,9 @@
     <string name="enterprise_privacy_always_on_vpn_personal" msgid="9217774730260037434">"Always-on VPN turned on in your personal profile"</string>
     <string name="enterprise_privacy_always_on_vpn_work" msgid="7244472958208315814">"Always-on VPN turned on in your work profile"</string>
     <string name="enterprise_privacy_global_http_proxy" msgid="7936664553416257333">"Global HTTP proxy set"</string>
-    <string name="enterprise_privacy_ca_certs" msgid="5885892204903688909">"Trusted credentials"</string>
+    <string name="enterprise_privacy_ca_certs_device" msgid="2019652712782510262">"Trusted credentials"</string>
+    <string name="enterprise_privacy_ca_certs_personal" msgid="2279084820904076599">"Trusted credentials in your personal profile"</string>
+    <string name="enterprise_privacy_ca_certs_work" msgid="6187377647815301809">"Trusted credentials in your work profile"</string>
     <plurals name="enterprise_privacy_number_ca_certs" formatted="false" msgid="526375234629534165">
       <item quantity="other">Minimum <xliff:g id="COUNT_1">%d</xliff:g> CA certificates</item>
       <item quantity="one">Minimum <xliff:g id="COUNT_0">%d</xliff:g> CA certificate</item>
@@ -3694,6 +3721,8 @@
     <string name="carrier_provisioning" msgid="4398683675591893169">"Operator Provisioning Info"</string>
     <string name="trigger_carrier_provisioning" msgid="3434865918009286187">"Trigger Operator Provisioning"</string>
     <string name="new_device_suggestion_title" msgid="698847081680980774">"What\'s new and exciting?"</string>
-    <string name="new_device_suggestion_summary" msgid="7172709269203435870">"Check out the top 5 features"</string>
+    <string name="new_device_suggestion_summary" product="default" msgid="206396571522515855">"Take a tour of your new phone"</string>
+    <string name="new_device_suggestion_summary" product="tablet" msgid="393751455688210956">"Take a tour of your new tablet"</string>
+    <string name="new_device_suggestion_summary" product="device" msgid="2939870049868336652">"Take a tour of your new device"</string>
     <string name="disabled_low_ram_device" msgid="3751578499721173344">"This feature is not available on this device"</string>
 </resources>
diff --git a/res/values-en-rIN/arrays.xml b/res/values-en-rIN/arrays.xml
index f3beb46..1e36841 100644
--- a/res/values-en-rIN/arrays.xml
+++ b/res/values-en-rIN/arrays.xml
@@ -100,8 +100,6 @@
     <!-- no translation found for wifi_security_no_eap:0 (2084555984818107151) -->
     <!-- no translation found for wifi_security_no_eap:1 (397579322683471524) -->
     <!-- no translation found for wifi_security_no_eap:2 (1968820975358150484) -->
-    <!-- no translation found for wifi_ap_security:0 (5251664683198623324) -->
-    <!-- no translation found for wifi_ap_security:1 (7989073072260294673) -->
   <string-array name="wifi_eap_method">
     <item msgid="1160193392455075561">"PEAP"</item>
     <item msgid="7981731051382306293">"TLS"</item>
diff --git a/res/values-en-rIN/strings.xml b/res/values-en-rIN/strings.xml
index 34242d0..052d078 100644
--- a/res/values-en-rIN/strings.xml
+++ b/res/values-en-rIN/strings.xml
@@ -166,7 +166,7 @@
     <string name="bluetooth_map_acceptance_dialog_text" msgid="8712508202081143737">"%1$s wants to access your messages. Give access to %2$s?"</string>
     <string name="bluetooth_sap_request" msgid="2669762224045354417">"SIM access request"</string>
     <string name="bluetooth_sap_acceptance_dialog_text" msgid="4414253873553608690">"<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g> wants to access your SIM card. Granting access to the SIM card will disable data connectivity on your device for the duration of the connection. Give access to <xliff:g id="DEVICE_NAME_1">%2$s?</xliff:g>"</string>
-    <string name="bluetooth_device_name_summary" msgid="4757990010751789977">"Visible as \'<xliff:g id="DEVICE_NAME">^1</xliff:g>\' to other devices"</string>
+    <string name="bluetooth_device_name_summary" msgid="522235742194965734">"Visible as “<xliff:g id="DEVICE_NAME">^1</xliff:g>” to other devices"</string>
     <string name="bluetooth_paired_device_title" msgid="8638994696317952019">"Your devices"</string>
     <string name="bluetooth_pairing_page_title" msgid="7712127387361962608">"Pair new device"</string>
     <string name="date_and_time" msgid="9062980487860757694">"Date &amp; time"</string>
@@ -312,6 +312,8 @@
     <string name="zone_auto" msgid="334783869352026648">"Automatic time zone"</string>
     <string name="zone_auto_summaryOn" msgid="6142830927278458314">"Use network-provided time zone"</string>
     <string name="zone_auto_summaryOff" msgid="2597745783162041390">"Use network-provided time zone"</string>
+    <string name="date_time_24hour_auto" msgid="2117383168985653422">"Automatic 24‑hour format"</string>
+    <string name="date_time_24hour_auto_summary" msgid="6351812925651480277">"Use locale default"</string>
     <string name="date_time_24hour_title" msgid="3203537578602803850">"24‑hour format"</string>
     <string name="date_time_24hour" msgid="1193032284921000063">"Use 24-hour format"</string>
     <string name="date_time_set_time_title" msgid="6296795651349047016">"Time"</string>
@@ -372,6 +374,9 @@
     <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="1961957425135180242">"Next"</string>
+    <string name="setup_fingerprint_enroll_skip_title" msgid="362050541117362034">"Skip fingerprint?"</string>
+    <string name="setup_fingerprint_enroll_skip_after_adding_lock_text" msgid="958990414356204763">"Fingerprint setup only takes a minute or two. If you skip this, you can add your fingerprint later in settings."</string>
+    <string name="lock_screen_intro_skip_title" msgid="4988210105913705679">"Skip screen lock?"</string>
     <string name="lock_screen_intro_skip_dialog_text_frp" product="tablet" msgid="1581834104051243425">"Device protection features won’t be turned on. You won’t be able to prevent others from using this tablet if it’s lost, stolen or reset."</string>
     <string name="lock_screen_intro_skip_dialog_text_frp" product="device" msgid="4629503416877189572">"Device protection features won’t be turned on. You won’t be able to prevent others from using this device if it’s lost, stolen or reset."</string>
     <string name="lock_screen_intro_skip_dialog_text_frp" product="default" msgid="2423428240245737909">"Device protection features won’t be turned on. You won’t be able to prevent others from using this phone if it’s lost, stolen or reset."</string>
@@ -457,7 +462,7 @@
     <string name="setup_lock_settings_picker_title" product="tablet" msgid="90329443364067215">"Protect your tablet"</string>
     <string name="setup_lock_settings_picker_title" product="device" msgid="2399952075134938929">"Protect your device"</string>
     <string name="setup_lock_settings_picker_title" product="default" msgid="1572244299605153324">"Protect your phone"</string>
-    <string name="setup_lock_settings_picker_fingerprint_message" msgid="5585650064305600578">"For added security, set up a backup screen lock."</string>
+    <string name="lock_settings_picker_fingerprint_added_security_message" msgid="5768002109707648463">"For added security, set a backup screen lock."</string>
     <string name="setup_lock_settings_picker_message" product="tablet" msgid="8919671129189936210">"Prevent others from using this tablet 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="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>
@@ -588,6 +593,7 @@
     <string name="lockpassword_pin_no_sequential_digits" msgid="680765285206990584">"Ascending, descending or repeated sequence of digits isn\'t allowed"</string>
     <string name="lockpassword_ok_label" msgid="313822574062553672">"OK"</string>
     <string name="lockpassword_cancel_label" msgid="8818529276331121899">"Cancel"</string>
+    <string name="lockpassword_clear_label" msgid="5724429464960458155">"Clear"</string>
     <string name="lockpattern_tutorial_cancel_label" msgid="6431583477570493261">"Cancel"</string>
     <string name="lockpattern_tutorial_continue_label" msgid="3559793618653400434">"Next"</string>
     <string name="lock_setup" msgid="3355847066343753943">"Set up is complete."</string>
@@ -781,6 +787,7 @@
     <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>
@@ -817,6 +824,8 @@
     <string name="wifi_wps_available_first_item" msgid="4422547079984583502">"WPS available"</string>
     <string name="wifi_wps_available_second_item" msgid="8427520131718215301">" (WPS available)"</string>
     <string name="wifi_wps_nfc_enter_password" msgid="2288214226916117159">"Enter your network password"</string>
+    <string name="wifi_carrier_connect" msgid="8174696557882299911">"Operator Wi‑Fi network"</string>
+    <string name="wifi_carrier_content" msgid="4634077285415851933">"Connect via <xliff:g id="NAME">%1%s</xliff:g>"</string>
     <string name="wifi_scan_always_turnon_message" msgid="203123538572122989">"To improve location accuracy and for other purposes, <xliff:g id="APP_NAME">%1$s</xliff:g> wants to turn on network scanning, even when Wi-Fi is off.\n\nAllow this for all apps that want to scan?"</string>
     <string name="wifi_scan_always_turnoff_message" msgid="5538901671131941043">"To turn this off, go to Advanced in the overflow menu."</string>
     <string name="wifi_scan_always_confirm_allow" msgid="5355973075896817232">"Allow"</string>
@@ -834,6 +843,7 @@
     <string name="wifi_connect" msgid="1076622875777072845">"Connect"</string>
     <string name="wifi_failed_connect_message" msgid="8491902558970292871">"Failed to connect to network"</string>
     <string name="wifi_forget" msgid="8168174695608386644">"Forget"</string>
+    <string name="wifi_modify" msgid="6100248070440710782">"Modify"</string>
     <string name="wifi_failed_forget_message" msgid="1348172929201654986">"Failed to forget network"</string>
     <string name="wifi_save" msgid="3331121567988522826">"Save"</string>
     <string name="wifi_failed_save_message" msgid="6650004874143815692">"Failed to save network"</string>
@@ -846,6 +856,7 @@
     <string name="wifi_advanced_titlebar" msgid="4485841401774142908">"Advanced 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_title" msgid="3471132676909349382">"Network info"</string>
     <string name="wifi_details_subnet_mask" msgid="6720279144174924410">"Subnet mask"</string>
     <string name="wifi_details_dns" msgid="8648826607751830768">"DNS"</string>
     <string name="wifi_details_ipv6_address_header" msgid="6734119149106422148">"IPv6 addresses"</string>
@@ -878,16 +889,15 @@
     <string name="wifi_p2p_cancel_connect_title" msgid="255267538099324413">"Cancel invitation"</string>
     <string name="wifi_p2p_cancel_connect_message" msgid="7477756213423749402">"Do you want to cancel invitation to connect with <xliff:g id="PEER_NAME">%1$s</xliff:g>?"</string>
     <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_off_subtext" msgid="5466126533609394170">"Not sharing Internet or content with other devices"</string>
     <string name="wifi_hotspot_tethering_on_subtext" product="tablet" msgid="5752490509369962007">"Sharing this tablet’s Internet connection via hotspot"</string>
     <string name="wifi_hotspot_tethering_on_subtext" product="default" msgid="6461075246164300670">"Sharing this phone’s Internet connection via hotspot"</string>
     <string name="wifi_hotspot_on_local_only_subtext" msgid="2068110388011294735">"App is sharing content. To share Internet connection, turn hotspot off, then on"</string>
-    <string name="wifi_hotspot_name_title" msgid="1341735529132128887">"Wi‑Fi name"</string>
+    <string name="wifi_hotspot_name_title" msgid="8237000746618636778">"Hotspot name"</string>
     <string name="wifi_hotspot_name_summary_connecting" msgid="3378299995508671967">"Turning on <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>..."</string>
     <string name="wifi_hotspot_name_summary_connected" msgid="3888672084861445362">"Other devices can connect to <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>"</string>
-    <string name="wifi_hotspot_password_title" msgid="1955592302902091281">"Wi‑Fi password"</string>
+    <string name="wifi_hotspot_password_title" msgid="8676859981917573801">"Hotspot password"</string>
     <string name="wifi_hotspot_ap_band_title" msgid="1165801173359290681">"AP band"</string>
     <string name="wifi_hotspot_footer_info_regular" msgid="1203489406068036455">"Use hotspot to create a Wi‑Fi network for your other devices. Hotspot provides Internet using your mobile data connection. Additional mobile data charges may apply."</string>
     <string name="wifi_hotspot_footer_info_local_only" msgid="857988412470694109">"Apps can create a hotspot to share content with nearby devices."</string>
@@ -898,7 +908,6 @@
     <string name="wifi_tether_configure_ap_text" msgid="7974681394041609308">"Set up Wi‑Fi hotspot"</string>
     <string name="wifi_hotspot_configure_ap_text" msgid="5478614731464220432">"Wi‑Fi hotspot setup"</string>
     <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">"Android Hotspot"</string>
     <string name="wifi_calling_settings_title" msgid="4102921303993404577">"Wi-Fi Calling"</string>
     <string name="wifi_calling_suggestion_title" msgid="9008010480466359578">"Turn on Wi-Fi Calling"</string>
@@ -939,7 +948,7 @@
     <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="emergency_address_summary" msgid="3266760199681945746">"Address used by emergency services as your location if you make an emergency call using Wi‑Fi"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"Display"</string>
     <string name="sound_settings" msgid="5534671337768745343">"Sound"</string>
     <string name="all_volume_title" msgid="4296957391257836961">"Volumes"</string>
@@ -993,6 +1002,7 @@
     <string name="search_settings" msgid="1910951467596035063">"Search"</string>
     <string name="search_settings_summary" msgid="9205656546570654169">"Manage search settings and history"</string>
     <string name="search_settings_no_results" msgid="8799027492641230999">"No results"</string>
+    <string name="search_clear_history" msgid="4196658962573162457">"Clear history"</string>
     <string name="display_settings" msgid="7965901687241669598">"Display"</string>
     <string name="accelerometer_title" msgid="7854608399547349157">"Auto-rotate screen"</string>
     <string name="color_mode_title" msgid="3159275920408338215">"Vivid colours"</string>
@@ -1122,7 +1132,6 @@
     <string name="baseband_version" msgid="1848990160763524801">"Baseband version"</string>
     <string name="kernel_version" msgid="9192574954196167602">"Kernel version"</string>
     <string name="build_number" msgid="3075795840572241758">"Build number"</string>
-    <string name="selinux_status" msgid="6212165375172061672">"SELinux status"</string>
     <string name="device_info_not_available" msgid="8062521887156825182">"Not available"</string>
     <string name="device_status_activity_title" msgid="1411201799384697904">"Status"</string>
     <string name="device_status" msgid="607405385799807324">"Status"</string>
@@ -1150,7 +1159,6 @@
     <string name="status_wifi_mac_address" msgid="2202206684020765378">"Wi‑Fi MAC address"</string>
     <string name="status_bt_address" msgid="4195174192087439720">"Bluetooth address"</string>
     <string name="status_serial_number" msgid="2257111183374628137">"Serial number"</string>
-    <string name="status_unavailable" msgid="7862009036663793314">"Unavailable"</string>
     <string name="status_up_time" msgid="7294859476816760399">"Uptime"</string>
     <string name="status_awake_time" msgid="2393949909051183652">"Awake time"</string>
     <string name="internal_memory" msgid="9129595691484260784">"Internal storage"</string>
@@ -1326,6 +1334,7 @@
     <string name="menu_restore" msgid="8260067415075573273">"Reset to default"</string>
     <string name="restore_default_apn_completed" msgid="2824775307377604897">"Reset default APN settings completed"</string>
     <string name="reset_dashboard_title" msgid="6254873816990678620">"Reset options"</string>
+    <string name="reset_dashboard_summary" msgid="4851012632493522755">"Network, apps or device can be reset"</string>
     <string name="reset_network_title" msgid="6166025966016873843">"Reset Wi-Fi, mobile &amp; Bluetooth"</string>
     <string name="reset_network_desc" msgid="5547979398298881406">"This will reset all network settings, including:\n\n"<li>"Wi‑Fi"</li>\n<li>"Mobile data"</li>\n<li>"Bluetooth"</li></string>
     <string name="reset_network_button_text" msgid="2035676527471089853">"Reset settings"</string>
@@ -1334,17 +1343,14 @@
     <string name="reset_network_confirm_title" msgid="1759888886976962773">"Reset?"</string>
     <string name="network_reset_not_available" msgid="7188610385577164676">"Network reset is not available for this user"</string>
     <string name="reset_network_complete_toast" msgid="787829973559541880">"Network settings have been reset"</string>
-    <string name="master_clear_title" msgid="6617679904229218425">"Erase all data (factory reset)"</string>
-    <plurals name="master_clear_with_account_summary" formatted="false" msgid="5911377203778818712">
-      <item quantity="other"><xliff:g id="ACCOUNT_COUNT">%1$d</xliff:g> accounts will be reset</item>
-      <item quantity="one">1 account will be reset</item>
-    </plurals>
-    <string name="master_clear_summary" msgid="6902443944660426951">"Internal storage &amp; all data will be reset"</string>
+    <string name="master_clear_title" msgid="3531267871084279512">"Erase all data (factory reset)"</string>
     <string name="master_clear_desc" product="tablet" msgid="9146059417023157222">"This will erase all data from your tablet\'s "<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" msgid="4800386183314202571">"This will erase all data from your phone\'s "<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_accounts" product="default" msgid="6412857499147999073">\n\n"You are currently signed in to the following accounts:\n"</string>
     <string name="master_clear_other_users_present" product="default" msgid="5161423070702470742">\n\n"There are other users present on this device.\n"</string>
     <string name="master_clear_desc_also_erases_external" msgid="1903185203791274237"><li>"Music"</li>\n<li>"Photos"</li>\n<li>"Other user data"</li></string>
+    <string name="master_clear_desc_also_erases_esim" msgid="312352697653096008"><li>"Operators on eSIM"</li></string>
+    <string name="master_clear_desc_no_cancel_mobile_plan" msgid="5460926449093211144">\n\n"This will not cancel your mobile service plan."</string>
     <string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="7744115866662613411">\n\n"To clear music, pictures and other user data, the "<b>"USB storage"</b>" needs to be erased."</string>
     <string name="master_clear_desc_erase_external_storage" product="default" msgid="4801026652617377093">\n\n"To clear music, pictures and other user data, the "<b>"SD card"</b>" needs to be erased."</string>
     <string name="erase_external_storage" product="nosdcard" msgid="969364037450286809">"Erase USB storage"</string>
@@ -1461,15 +1467,16 @@
     <string name="settings_safetylegal_activity_title" msgid="6901214628496951727">"Safety information"</string>
     <string name="settings_safetylegal_activity_unreachable" msgid="250674109915859456">"You don\'t have a data connection. To view this information now, go to %s from any computer connected to the Internet."</string>
     <string name="settings_safetylegal_activity_loading" msgid="8059022597639516348">"Loading…"</string>
-    <string name="lockpassword_choose_your_password_header" msgid="8624900666929394990">"Choose your password"</string>
-    <string name="lockpassword_choose_your_password_header_for_fingerprint" msgid="6624409510609085450">"To use fingerprint, set password"</string>
-    <string name="lockpassword_choose_your_pattern_header" msgid="6949761069941694050">"Choose your pattern"</string>
-    <string name="lockpassword_choose_your_pattern_header_for_fingerprint" msgid="5901096361617543819">"To use fingerprint, set pattern"</string>
-    <string name="lockpassword_choose_your_pin_header" msgid="7598849519816138302">"Choose your PIN"</string>
-    <string name="lockpassword_choose_your_pin_header_for_fingerprint" msgid="765344692615917183">"To use fingerprint, set PIN"</string>
-    <string name="lockpassword_confirm_your_password_header" msgid="6308478184889846633">"Confirm your password"</string>
+    <string name="lockpassword_choose_your_screen_lock_header" msgid="3872462096767152394">"Set a screen lock"</string>
+    <string name="lockpassword_choose_your_password_message" msgid="1197569283524841412">"For security, set a password"</string>
+    <string name="lockpassword_choose_your_password_header_for_fingerprint" msgid="2541818487015343503">"To use fingerprint, set a password"</string>
+    <string name="lockpassword_choose_your_pattern_header_for_fingerprint" msgid="7709785406243556723">"To use fingerprint, set a pattern"</string>
+    <string name="lockpassword_choose_your_pin_message" msgid="1875420718677275646">"For security, set a PIN"</string>
+    <string name="lockpassword_choose_your_pin_header_for_fingerprint" msgid="1549639053195796674">"To use fingerprint, set a PIN"</string>
+    <string name="lockpassword_choose_your_pattern_message" msgid="5986983400689720015">"For security, set a pattern"</string>
+    <string name="lockpassword_confirm_your_password_header" msgid="1266027268220850931">"Re-enter your password"</string>
     <string name="lockpassword_confirm_your_pattern_header" msgid="7543433733032330821">"Confirm your pattern"</string>
-    <string name="lockpassword_confirm_your_pin_header" msgid="49038294648213197">"Confirm your PIN"</string>
+    <string name="lockpassword_confirm_your_pin_header" msgid="7744513791910572550">"Re-enter your PIN"</string>
     <string name="lockpassword_confirm_passwords_dont_match" msgid="5140892109439191415">"Passwords don\'t match"</string>
     <string name="lockpassword_confirm_pins_dont_match" msgid="7226244811505606217">"PINs don\'t match"</string>
     <string name="lockpassword_choose_lock_generic_header" msgid="3811438094903786145">"Unlock selection"</string>
@@ -1488,6 +1495,12 @@
     <string name="lockpassword_strong_auth_required_work_pattern" msgid="3003781907040522053">"For added security, use your work pattern"</string>
     <string name="lockpassword_strong_auth_required_work_pin" msgid="3367491332598821552">"For added security, enter your work PIN"</string>
     <string name="lockpassword_strong_auth_required_work_password" msgid="8159775129968582940">"For added security, enter your work password"</string>
+    <string name="lockpassword_confirm_your_pattern_details_frp" msgid="6757336656791723193">"Your phone was reset to factory settings. To use this phone, enter your previous pattern."</string>
+    <string name="lockpassword_confirm_your_pin_details_frp" msgid="826520613445990470">"Your phone was reset to factory settings. To use this phone, enter your previous PIN."</string>
+    <string name="lockpassword_confirm_your_password_details_frp" msgid="8944081074615739040">"Your phone was reset to factory settings. To use this phone, enter your previous password."</string>
+    <string name="lockpassword_confirm_your_pattern_header_frp" msgid="2898036091609128286">"Verify pattern"</string>
+    <string name="lockpassword_confirm_your_pin_header_frp" msgid="4141601774778898803">"Verify PIN"</string>
+    <string name="lockpassword_confirm_your_password_header_frp" msgid="3762615419295360480">"Verify password"</string>
     <string name="lockpassword_invalid_pin" msgid="15588049067548470">"Wrong PIN"</string>
     <string name="lockpassword_invalid_password" msgid="4038507398784975200">"Wrong password"</string>
     <string name="lockpattern_need_to_unlock_wrong" msgid="1745247595356012176">"Wrong pattern"</string>
@@ -1537,7 +1550,6 @@
     <string name="install_applications_title" msgid="4987712352256508946">"Allow all app sources"</string>
     <string name="recent_app_category_title" msgid="6673071268966003928">"Recently opened apps"</string>
     <string name="see_all_apps_title" msgid="1317153498074308438">"See all <xliff:g id="COUNT">%1$d</xliff:g> apps"</string>
-    <string name="recent_app_summary" msgid="3366446669844932300">"<xliff:g id="TIME">^1</xliff:g> ago"</string>
     <string name="install_all_warning" product="tablet" msgid="8310489909586138165">"Your tablet and personal data are more vulnerable to attack by unknown apps. By installing apps from this source, you agree that you are responsible for any damage to your tablet or loss of data that may result from their use."</string>
     <string name="install_all_warning" product="default" msgid="1952257127370115988">"Your phone and personal data are more vulnerable to attack by unknown apps. By installing apps from this source, you agree that you are responsible for any damage to your phone or loss of data that may result from their use."</string>
     <string name="advanced_settings" msgid="1777249286757067969">"Advanced settings"</string>
@@ -1801,7 +1813,7 @@
     <string name="accessibility_settings_summary" msgid="981260486011624939">"Screen readers, display, interaction controls"</string>
     <string name="vision_settings_title" msgid="4204111425716868288">"Vision settings"</string>
     <string name="vision_settings_description" msgid="5679491180156408260">"You can customise this device to fit your needs. These accessibility features can be changed later in Settings."</string>
-    <string name="vision_settings_suggestion_title" msgid="917294957154878441">"Increase font size"</string>
+    <string name="vision_settings_suggestion_title" msgid="8058794060304707004">"Change font size"</string>
     <string name="screen_reader_category_title" msgid="7739154903913400641">"Screen readers"</string>
     <string name="audio_and_captions_category_title" msgid="3420727114421447524">"Audio &amp; on-screen text"</string>
     <string name="display_category_title" msgid="685461049938269166">"Display"</string>
@@ -1838,7 +1850,6 @@
     <string name="accessibility_display_inversion_preference_subtitle" msgid="7052959202195368109">"May affect performance"</string>
     <string name="accessibility_autoclick_preference_title" msgid="7014499339068449623">"Click after cursor stops moving"</string>
     <string name="accessibility_autoclick_delay_preference_title" msgid="3962261178385106006">"Delay before click"</string>
-    <string name="preference_summary_default_combination" msgid="8532964268242666060">"<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">"ON"</string>
     <string name="accessibility_summary_state_disabled" msgid="2241315620132005595">"OFF"</string>
     <string name="enable_quick_setting" msgid="2366999897816894536">"Show in Quick Settings"</string>
@@ -1957,12 +1968,14 @@
     <string name="background_activity_summary_on" msgid="649282072540085599">"App can run in the background when not in use"</string>
     <string name="background_activity_summary_off" msgid="7666330699090632040">"App\'s background activity is limited when not in use"</string>
     <string name="background_activity_summary_disabled" msgid="3710669050484599847">"App not allowed to run in background"</string>
+    <string name="background_activity_summary_whitelisted" msgid="7375400051141016808">"App can not be optimised for battery use"</string>
+    <string name="background_activity_warning_dialog_title" msgid="2216249969149568871">"Limit background activity?"</string>
+    <string name="background_activity_warning_dialog_text" msgid="7049624449246121981">"If you limit background activity for an app, it may misbehave"</string>
     <string name="device_screen_usage" msgid="3386088035570409683">"Screen usage since full charge"</string>
     <string name="device_screen_consumption" msgid="4607589286438986687">"Screen consumption"</string>
     <string name="device_cellular_network" msgid="4724773411762382950">"Mobile network scanning"</string>
-    <string name="power_last_full_charge_summary" msgid="532845389094620657">"<xliff:g id="TIME">^1</xliff:g> ago"</string>
-    <string name="power_usage_list_summary" msgid="6775339745194635000">"App usage since full charge (<xliff:g id="TIME">^1</xliff:g> ago)"</string>
-    <string name="power_usage_list_summary_device" msgid="7036566616386864302">"Device usage since full charge (<xliff:g id="TIME">^1</xliff:g> ago)"</string>
+    <string name="power_usage_list_summary" msgid="6393929085382334341">"App usage since full charge (<xliff:g id="RELATIVE_TIME">^1</xliff:g>)"</string>
+    <string name="power_usage_list_summary_device" msgid="4461926045610455423">"Device usage since full charge (<xliff:g id="RELATIVE_TIME">^1</xliff:g>)"</string>
     <string name="screen_usage_summary" msgid="6687403051423153550">"Amount of time screen has been on since full charge"</string>
     <string name="device_usage_list_summary" msgid="5623036661468763251">"Device usage since full charge"</string>
     <string name="battery_since_unplugged" msgid="338073389740738437">"Battery use since unplugged"</string>
@@ -2208,14 +2221,14 @@
     <string name="credentials_unlock_hint" msgid="2301301378040499348">"Type the password for credential storage."</string>
     <string name="credentials_old_password" msgid="7553393815538684028">"Current password:"</string>
     <string name="credentials_reset_hint" msgid="6297256880896133631">"Remove all the contents?"</string>
-    <string name="credentials_password_too_short" msgid="7502749986405522663">"The password must contain at least 8 characters."</string>
     <string name="credentials_wrong_password" msgid="2541932597104054807">"Incorrect password."</string>
     <string name="credentials_reset_warning" msgid="5320653011511797600">"Incorrect password. You have one more chance before credential storage is erased."</string>
     <string name="credentials_reset_warning_plural" msgid="6514085665301095279">"Incorrect password. You have <xliff:g id="NUMBER">%1$d</xliff:g> more chances before credential storage is erased."</string>
     <string name="credentials_erased" msgid="2907836028586342969">"Credential storage has been erased."</string>
     <string name="credentials_not_erased" msgid="7685932772284216097">"Credential storage couldn\'t be erased."</string>
     <string name="credentials_enabled" msgid="7588607413349978930">"Credential storage is enabled."</string>
-    <string name="credentials_configure_lock_screen_hint" msgid="6757119179588664966">"You need to set a lock screen PIN or password before you can use credential storage."</string>
+    <string name="credentials_configure_lock_screen_hint" msgid="8058230497337529036">"Before you can use credential storage, your device needs to have a secure lock screen"</string>
+    <string name="credentials_configure_lock_screen_button" msgid="253239765216055321">"SET LOCK"</string>
     <string name="usage_access_title" msgid="332333405495457839">"Apps with usage access"</string>
     <string name="emergency_tone_title" msgid="1055954530111587114">"Emergency tone"</string>
     <string name="emergency_tone_summary" msgid="722259232924572153">"Set behaviour when an emergency call is placed"</string>
@@ -2335,8 +2348,6 @@
     <skip />
     <string name="cant_sync_dialog_title" msgid="2777238588398046285">"Cannot sync manually"</string>
     <string name="cant_sync_dialog_message" msgid="1938380442159016449">"Sync for this item is currently disabled. To change your preference, temporarily turn on background data and automatic sync."</string>
-    <string name="wimax_settings" msgid="2655139497028469039">"4G"</string>
-    <string name="status_wimax_mac_address" msgid="8390791848661413416">"4G MAC address"</string>
     <string name="enter_password" msgid="8035706727471334122">"To start Android, enter your password"</string>
     <string name="enter_pin" msgid="5305333588093263790">"To start Android, enter your PIN"</string>
     <string name="enter_pattern" msgid="4187435713036808566">"To start Android, draw your pattern"</string>
@@ -2350,6 +2361,7 @@
     <string name="misc_files_selected_count" msgid="4647048020823912088">"selected <xliff:g id="NUMBER">%1$d</xliff:g> out of <xliff:g id="TOTAL">%2$d</xliff:g>"</string>
     <string name="misc_files_selected_count_bytes" msgid="2876232009069114352">"<xliff:g id="NUMBER">%1$s</xliff:g> out of <xliff:g id="TOTAL">%2$s</xliff:g>"</string>
     <string name="select_all" msgid="1562774643280376715">"Select all"</string>
+    <string name="data_plan_usage_manage_plans_button_text" msgid="8997761990902708162">"Manage plans"</string>
     <string name="data_usage_summary_title" msgid="3804110657238092929">"Data usage"</string>
     <string name="data_usage_app_summary_title" msgid="4147258989837459172">"App data usage"</string>
     <string name="data_usage_accounting" msgid="7170028915873577387">"Operator data accounting may differ from your device."</string>
@@ -2435,6 +2447,9 @@
     <string name="data_usage_metered_mobile" msgid="5423305619126978393">"Mobile networks"</string>
     <string name="data_usage_metered_wifi" msgid="1761738002328299714">"Metered Wi‑Fi networks"</string>
     <string name="data_usage_metered_wifi_disabled" msgid="727808462375941567">"To select metered networks, turn Wi‑Fi on."</string>
+    <string name="data_usage_metered_auto" msgid="1262028400911918865">"Automatic"</string>
+    <string name="data_usage_metered_yes" msgid="9217539611385225894">"Metered"</string>
+    <string name="data_usage_metered_no" msgid="4025232961929071789">"Not metered"</string>
     <string name="data_usage_disclaimer" msgid="6887858149980673444">"Operator data accounting may differ from your device."</string>
     <string name="cryptkeeper_emergency_call" msgid="198578731586097145">"Emergency call"</string>
     <string name="cryptkeeper_return_to_call" msgid="5613717339452772491">"Return to call"</string>
@@ -2526,9 +2541,6 @@
     <string name="backup_pw_set_button_text" msgid="2387480910044648795">"Set backup password"</string>
     <string name="backup_pw_cancel_button_text" msgid="8845630125391744615">"Cancel"</string>
     <string name="additional_system_update_settings_list_item_title" msgid="214987609894661992">"Additional system updates"</string>
-    <string name="selinux_status_disabled" msgid="924551035552323327">"Disabled"</string>
-    <string name="selinux_status_permissive" msgid="6004965534713398778">"Permissive"</string>
-    <string name="selinux_status_enforcing" msgid="2252703756208463329">"Enforcing"</string>
     <string name="ssl_ca_cert_warning" msgid="2045866713601984673">"Network may be monitored"</string>
     <string name="done_button" msgid="1991471253042622230">"Done"</string>
     <plurals name="ssl_ca_cert_dialog_title" formatted="false" msgid="7145092748045794650">
@@ -2871,13 +2883,15 @@
     <string name="notifications_title" msgid="8086372779371204971">"Notifications"</string>
     <string name="app_notifications_title" msgid="5810577805218003760">"App notifications"</string>
     <string name="notification_channel_title" msgid="2260666541030178452">"Notification category"</string>
+    <string name="notification_group_title" msgid="7180506440133859601">"Notification category group"</string>
     <string name="notification_importance_title" msgid="848692592679312666">"Importance"</string>
-    <string name="notification_importance_unspecified" msgid="2196023702875112081">"Let the app decide"</string>
+    <string name="notification_importance_unspecified" msgid="6622173510486113958">"Allow sound"</string>
     <string name="notification_importance_blocked" msgid="7938180808339386300">"Never show notifications"</string>
     <string name="notification_importance_min" msgid="5455049524984686275">"No sound or visual interruption"</string>
     <string name="notification_importance_low" msgid="8881468429453766553">"No sound"</string>
     <string name="notification_importance_default" msgid="5958338024601957516">"Make sound"</string>
     <string name="notification_importance_high" msgid="2082429479238228527">"Make sound and pop up on screen"</string>
+    <string name="notification_importance_high_silent" msgid="2667033773703765252">"Pop on screen"</string>
     <string name="notification_importance_min_title" msgid="6974673091137544803">"Low"</string>
     <string name="notification_importance_low_title" msgid="8131254047772814309">"Medium"</string>
     <string name="notification_importance_default_title" msgid="9120383978536089489">"High"</string>
@@ -2920,8 +2934,13 @@
     <string name="loading_notification_apps" msgid="5031818677010335895">"Loading apps..."</string>
     <string name="app_notifications_off_desc" msgid="4882445501376722969">"Android is blocking this app\'s notifications from appearing on this device"</string>
     <string name="channel_notifications_off_desc" msgid="5899225298718840635">"Android is blocking this category of notifications from appearing on this device"</string>
+    <string name="channel_group_notifications_off_desc" msgid="1620950416247316370">"Android is blocking this group of notifications from appearing on this device"</string>
     <string name="notification_channels" msgid="5346841743182627500">"Categories"</string>
     <string name="notification_channels_other" msgid="5645317113885788226">"Other"</string>
+    <plurals name="notification_group_summary" formatted="false" msgid="3420621520561455358">
+      <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> categories</item>
+      <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> category</item>
+    </plurals>
     <string name="no_channels" msgid="3077375508177744586">"This app has not posted any notifications"</string>
     <string name="app_settings_link" msgid="8894946007543660906">"Additional settings in the app"</string>
     <string name="app_notification_listing_summary_zero" msgid="6482582965081108108">"Turned on for all apps"</string>
@@ -2998,6 +3017,7 @@
     <string name="zen_mode_from_starred" msgid="2678345811950997027">"From starred contacts only"</string>
     <string name="zen_mode_from_none" msgid="8219706639954614136">"None"</string>
     <string name="zen_mode_alarms" msgid="2165302777886552926">"Alarms"</string>
+    <string name="zen_mode_alarms_summary" msgid="3774926045611788635">"Alarms are always a priority and make sound"</string>
     <string name="zen_mode_reminders" msgid="5458502056440485730">"Reminders"</string>
     <string name="zen_mode_events" msgid="7914446030988618264">"Events"</string>
     <string name="zen_mode_all_callers" msgid="584186167367236922">"All callers"</string>
@@ -3023,15 +3043,16 @@
     <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>
     <string name="zen_mode_no_visual_interruptions" msgid="8742776003822778472">"When screen is on or off"</string>
     <string name="notification_app_settings_button" msgid="6685640230371477485">"Notification settings"</string>
+    <string name="suggestion_button_text" msgid="3275010948381252006">"OK"</string>
     <string name="device_feedback" msgid="3238056036766293294">"Send feedback about this device"</string>
     <string name="restr_pin_enter_admin_pin" msgid="1085834515677448072">"Enter admin PIN"</string>
     <string name="switch_on_text" msgid="1124106706920572386">"On"</string>
@@ -3216,6 +3237,7 @@
     <string name="usb_summary_file_transfers" msgid="6435943692610175111">"Transferring files"</string>
     <string name="usb_summary_photo_transfers" msgid="8440204169576585250">"Transferring photos (PTP)"</string>
     <string name="usb_summary_MIDI" msgid="5687906612187885908">"Using device as MIDI"</string>
+    <string name="sms_mirroring_pref" msgid="6475043279147376031">"SMS Mirroring"</string>
     <string name="background_check_pref" msgid="7550258400138010979">"Background check"</string>
     <string name="background_check_title" msgid="4534254315824525593">"Full background access"</string>
     <string name="assist_access_context_title" msgid="2269032346698890257">"Use text from screen"</string>
@@ -3282,7 +3304,7 @@
     <string name="write_settings_title" msgid="4232152481902542284">"Can modify system settings"</string>
     <string name="write_system_settings" msgid="3482913590601096763">"Modify system settings"</string>
     <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="permit_write_settings" msgid="658555006453212691">"Allow modifying 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>
@@ -3377,9 +3399,12 @@
     <string name="color_temperature" msgid="2070126836910615605">"Cool colour temperature"</string>
     <string name="color_temperature_desc" msgid="4793729830226404052">"Use cooler display colours"</string>
     <string name="color_temperature_toast" msgid="4974218172133854827">"To apply colour change, turn off screen"</string>
-    <string name="telephony_monitor_toast" msgid="7003764250271195384">"To apply telephony monitor change, reboot device"</string>
+    <string name="connectivity_monitor_switch" msgid="9059759348648583421">"Connectivity Monitor"</string>
+    <string name="connectivity_monitor_switch_summary" msgid="2828658652378866401">"Connectivity Monitor will collect logs when it detects a connectivity problem and prompt notification to user to file a bug"</string>
+    <string name="connectivity_monitor_toast" msgid="5551859612881173028">"To apply connectivity monitor change, reboot device"</string>
     <string name="camera_hal_hdrplus_switch" msgid="8377365197105267466">"Camera HAL HDR+"</string>
     <string name="camera_hal_hdrplus_toast" msgid="2063703797270055299">"To apply Camera HAL HDR+ change, reboot device"</string>
+    <string name="camera_laser_sensor_switch" msgid="8913588990743234440">"Camera Laser Sensor"</string>
     <string name="ota_disable_automatic_update" msgid="2319639631655915050">"Automatic system updates"</string>
     <string name="usage" msgid="2977875522080448986">"Usage"</string>
     <string name="cellular_data_usage" msgid="2155683719898158203">"Mobile data usage"</string>
@@ -3405,7 +3430,7 @@
     <string name="data_warning" msgid="209133958008062117">"Data warning"</string>
     <string name="set_data_limit" msgid="2901526323210516923">"Set data limit"</string>
     <string name="data_limit" msgid="1885406964934590552">"Data limit"</string>
-    <string name="data_usage_template" msgid="392191945602400904">"<xliff:g id="ID_1">%1$s</xliff:g> used between <xliff:g id="ID_2">%2$s</xliff:g>"</string>
+    <string name="data_usage_template" msgid="2923744765873163859">"<xliff:g id="ID_1">%1$s</xliff:g> used <xliff:g id="ID_2">%2$s</xliff:g>"</string>
     <string name="configure" msgid="1029654422228677273">"Configure"</string>
     <string name="data_usage_other_apps" msgid="3272872663517382050">"Other apps included in usage"</string>
     <plurals name="data_saver_unrestricted_summary" formatted="false" msgid="2635267833484232703">
@@ -3474,7 +3499,7 @@
     <string name="button_confirm_convert_fbe" msgid="7101855374850373091">"Wipe and convert"</string>
     <string name="reset_shortcut_manager_throttling" msgid="6495066467198668994">"Reset ShortcutManager rate-limiting"</string>
     <string name="reset_shortcut_manager_throttling_complete" msgid="1826770872063707900">"ShortcutManager rate-limiting has been reset"</string>
-    <string name="notification_suggestion_title" msgid="4506524937307816475">"Control lock screen notifications"</string>
+    <string name="notification_suggestion_title" msgid="387052719462473500">"Control info on lock screen"</string>
     <string name="notification_suggestion_summary" msgid="8521159741445416875">"Show or hide notification content"</string>
     <string name="page_tab_title_summary" msgid="4070309266374993258">"All"</string>
     <string name="page_tab_title_support" msgid="8483187649355540109">"Support &amp; tips"</string>
@@ -3482,7 +3507,7 @@
     <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>
     <string name="premium_sms_access" msgid="4660047004791638305">"Premium SMS access"</string>
-    <string name="bluetooth_disabled" msgid="2456198532288640046">"Not visible to other devices"</string>
+    <string name="bluetooth_disabled" msgid="6244000672828617410">"Off"</string>
     <string name="bluetooth_connected_summary" msgid="7672528674593152862">"Connected to <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="bluetooth_connected_multiple_devices_summary" msgid="9173661896296663932">"Connected to multiple devices"</string>
     <string name="demo_mode" msgid="2798762752209330277">"System UI demo mode"</string>
@@ -3584,7 +3609,7 @@
     <string name="web_action_enable_title" msgid="4051513950976670853">"Instant apps"</string>
     <string name="web_action_enable_summary" msgid="3108127559723396382">"Open links in apps, even if they’re not installed"</string>
     <string name="web_action_section_title" msgid="7364647086538399136">"Instant apps"</string>
-    <string name="instant_apps_account" msgid="1433620209791992528">"Instant apps account"</string>
+    <string name="instant_apps_settings" msgid="8827777916518348213">"Instant Apps preferences"</string>
     <string name="domain_url_section_title" msgid="7046835219056428883">"Installed apps"</string>
     <string name="automatic_storage_manager_activation_warning" msgid="6353100011690933254">"Your storage is now being managed by the storage manager"</string>
     <string name="account_for_section_header" msgid="5356566418548737121">"Accounts for <xliff:g id="USER_NAME">%1$s</xliff:g>"</string>
@@ -3631,7 +3656,9 @@
     <string name="enterprise_privacy_always_on_vpn_personal" msgid="9217774730260037434">"Always-on VPN turned on in your personal profile"</string>
     <string name="enterprise_privacy_always_on_vpn_work" msgid="7244472958208315814">"Always-on VPN turned on in your work profile"</string>
     <string name="enterprise_privacy_global_http_proxy" msgid="7936664553416257333">"Global HTTP proxy set"</string>
-    <string name="enterprise_privacy_ca_certs" msgid="5885892204903688909">"Trusted credentials"</string>
+    <string name="enterprise_privacy_ca_certs_device" msgid="2019652712782510262">"Trusted credentials"</string>
+    <string name="enterprise_privacy_ca_certs_personal" msgid="2279084820904076599">"Trusted credentials in your personal profile"</string>
+    <string name="enterprise_privacy_ca_certs_work" msgid="6187377647815301809">"Trusted credentials in your work profile"</string>
     <plurals name="enterprise_privacy_number_ca_certs" formatted="false" msgid="526375234629534165">
       <item quantity="other">Minimum <xliff:g id="COUNT_1">%d</xliff:g> CA certificates</item>
       <item quantity="one">Minimum <xliff:g id="COUNT_0">%d</xliff:g> CA certificate</item>
@@ -3694,6 +3721,8 @@
     <string name="carrier_provisioning" msgid="4398683675591893169">"Operator Provisioning Info"</string>
     <string name="trigger_carrier_provisioning" msgid="3434865918009286187">"Trigger Operator Provisioning"</string>
     <string name="new_device_suggestion_title" msgid="698847081680980774">"What\'s new and exciting?"</string>
-    <string name="new_device_suggestion_summary" msgid="7172709269203435870">"Check out the top 5 features"</string>
+    <string name="new_device_suggestion_summary" product="default" msgid="206396571522515855">"Take a tour of your new phone"</string>
+    <string name="new_device_suggestion_summary" product="tablet" msgid="393751455688210956">"Take a tour of your new tablet"</string>
+    <string name="new_device_suggestion_summary" product="device" msgid="2939870049868336652">"Take a tour of your new device"</string>
     <string name="disabled_low_ram_device" msgid="3751578499721173344">"This feature is not available on this device"</string>
 </resources>
diff --git a/res/values-en-rXC-nokeys/strings.xml b/res/values-en-rXC-nokeys/strings.xml
new file mode 100644
index 0000000..3e6fb6f
--- /dev/null
+++ b/res/values-en-rXC-nokeys/strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2007 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+  
+          http://www.apache.org/licenses/LICENSE-2.0
+  
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT 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="applications_settings_summary" msgid="6616938758022986257">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‏‎‏‏‏‏‎‏‎‏‎‎‎‎‎‏‎‏‏‎‏‎‏‏‏‏‏‎‎‎‎‎‏‏‎‎‎‏‏‏‏‎‎‏‎‏‏‏‏‎‏‎‎‎‎‏‎‎‎‏‎Manage applications‎‏‎‎‏‎"</string>
+</resources>
diff --git a/res/values-en-rXC/arrays.xml b/res/values-en-rXC/arrays.xml
new file mode 100644
index 0000000..27e5bb2
--- /dev/null
+++ b/res/values-en-rXC/arrays.xml
@@ -0,0 +1,479 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+/*
+**
+** Copyright 2007 The Android Open Source Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+**     http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT 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-array name="timezone_filters">
+    <item msgid="5296756001147094692">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‏‎‎‏‏‎‎‎‎‎‎‏‏‏‎‏‏‎‏‏‏‎‎‎‎‏‎‏‎‎‎‎‎‏‏‎‎‏‎‎‏‎‏‎‏‎‎‎‎‏‏‎‏‎‏‎‎‏‎‎‎America‎‏‎‎‏‎"</item>
+    <item msgid="3005562397632768392">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‏‎‎‏‏‎‏‏‎‏‎‏‏‏‏‎‎‏‏‏‎‎‎‏‎‎‏‏‏‎‎‏‎‏‎‏‎‎‏‎‏‏‎‎‎‎‏‎‏‎‎‏‏‎‎‎‏‎‎‎‎Europe‎‏‎‎‏‎"</item>
+    <item msgid="5696915123093701218">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‏‏‏‏‎‎‎‎‏‏‏‏‏‎‎‎‎‎‏‎‎‎‎‏‏‏‏‎‏‏‏‏‎‎‏‏‏‎‎‎‏‏‎‏‎‎‎‎‎‎‏‎‎‏‏‎‎‎‏‎‎Africa‎‏‎‎‏‎"</item>
+    <item msgid="4439789052790868249">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‏‏‎‏‏‎‎‏‏‏‎‏‎‏‎‎‏‏‎‎‏‎‎‏‏‏‏‎‏‏‎‏‏‎‎‏‎‏‎‎‎‏‎‎‏‎‎‎‏‎‎‏‎‎‎‏‏‎‎‏‎Asia‎‏‎‎‏‎"</item>
+    <item msgid="956915953069815961">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‎‏‏‎‏‎‏‎‎‎‏‏‏‏‎‏‎‎‏‎‏‏‏‏‏‏‏‎‏‎‏‎‎‎‏‏‎‏‎‏‎‎‎‎‏‎‏‏‏‏‎‎‎‏‎‎‏‏‎‎‏‎Australia‎‏‎‎‏‎"</item>
+    <item msgid="5345178126174698955">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‏‎‏‎‎‎‏‎‏‏‎‏‏‏‏‎‎‎‏‏‎‎‏‎‏‏‏‏‏‎‎‎‏‏‏‏‏‏‎‏‎‏‎‎‏‎‏‏‏‏‎‏‏‏‎‎‏‎‏‏‎Pacific‎‏‎‎‏‎"</item>
+    <item msgid="8392017019801393511">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‎‏‎‎‎‏‏‏‎‏‏‎‎‏‏‎‏‏‏‏‎‎‎‎‎‏‎‎‎‏‎‎‎‏‏‎‎‏‎‎‏‎‏‏‎‏‎‏‏‎‎‏‎‏‏‎‎‏‏‏‎All‎‏‎‎‏‎"</item>
+  </string-array>
+  <string-array name="screen_timeout_entries">
+    <item msgid="3342301044271143016">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‏‏‏‎‎‏‏‎‎‎‏‎‎‎‏‏‏‏‎‏‎‎‎‏‎‏‏‏‎‏‏‎‏‏‎‎‎‎‏‏‎‎‏‎‏‏‎‏‏‎‎‎‎‏‏‎‏‎‎‎‎15 seconds‎‏‎‎‏‎"</item>
+    <item msgid="8881760709354815449">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‏‎‏‏‎‏‎‎‎‎‏‎‎‏‎‏‏‎‏‎‎‏‎‎‏‏‏‎‏‎‏‏‏‏‎‏‎‎‎‏‏‏‎‏‎‏‏‏‏‏‏‏‏‏‎‏‏‎‎‏‎30 seconds‎‏‎‎‏‎"</item>
+    <item msgid="7589406073232279088">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‏‎‎‏‎‏‎‏‎‎‏‎‏‏‏‏‏‏‎‎‏‎‎‏‏‏‎‎‏‏‏‏‏‎‏‏‎‎‏‏‎‎‏‏‏‏‎‎‎‏‏‎‎‎‏‏‎‎‎‎‎1 minute‎‏‎‎‏‎"</item>
+    <item msgid="7001195990902244174">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‎‎‎‏‎‎‏‎‏‎‎‏‎‎‏‏‏‏‏‎‏‎‏‎‏‎‎‎‏‏‏‎‏‎‎‎‏‎‎‏‏‏‏‎‎‎‎‎‎‎‏‏‎‏‎‎‏‏‏‎‎2 minutes‎‏‎‎‏‎"</item>
+    <item msgid="7489864775127957179">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‎‏‏‏‏‏‏‏‎‎‎‏‎‏‎‏‏‎‎‎‎‏‎‏‎‏‎‎‎‏‏‏‏‎‎‏‎‎‏‏‎‏‏‎‎‏‏‏‏‏‏‎‏‎‏‏‏‎‏‏‎5 minutes‎‏‎‎‏‎"</item>
+    <item msgid="2314124409517439288">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‎‎‎‎‎‎‎‏‏‏‎‏‎‏‏‎‏‎‏‏‏‏‏‎‎‎‏‏‏‏‎‎‎‎‏‏‎‏‎‏‏‎‎‎‏‏‏‏‏‎‎‏‎‎‏‏‏‎‎‎‎10 minutes‎‏‎‎‏‎"</item>
+    <item msgid="6864027152847611413">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‏‏‏‏‎‏‎‎‎‎‎‏‏‏‏‎‏‏‎‎‎‏‎‏‎‏‎‎‎‎‎‎‏‏‏‎‎‎‎‏‏‏‏‎‎‎‏‎‎‏‏‎‎‎‎‏‎‏‎‏‎30 minutes‎‏‎‎‏‎"</item>
+  </string-array>
+  <string-array name="dream_timeout_entries">
+    <item msgid="3149294732238283185">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‏‎‏‏‏‎‏‏‎‏‎‎‏‎‎‎‏‎‏‎‏‏‎‏‏‏‏‏‏‎‎‏‎‎‎‎‎‎‎‏‎‎‏‎‎‏‏‎‎‎‎‏‏‎‏‏‎‎‎‏‎Never‎‏‎‎‏‎"</item>
+    <item msgid="2194151041885903260">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‏‏‏‎‎‏‏‏‎‎‏‏‎‎‏‏‎‎‎‎‏‎‏‏‏‏‏‏‎‏‎‏‏‎‏‏‎‎‏‎‏‎‎‏‏‎‎‏‏‎‎‏‏‎‎‏‏‏‎‎‎15 seconds‎‏‎‎‏‎"</item>
+    <item msgid="5892295237131074341">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‎‎‎‏‏‏‎‎‎‏‎‏‏‎‏‎‎‎‏‏‎‏‎‎‏‏‎‎‏‎‏‎‏‎‎‎‏‏‏‎‏‏‎‎‎‏‏‏‏‎‏‏‎‎‏‎‎‏‎‏‎30 seconds‎‏‎‎‏‎"</item>
+    <item msgid="3538441365970038213">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‎‎‎‏‎‎‎‏‏‎‏‏‎‎‎‏‎‎‎‏‏‎‏‎‏‏‎‎‏‏‎‎‎‏‎‏‎‎‏‏‎‎‎‏‎‎‏‎‏‏‎‏‏‏‎‎‎‏‎‏‎1 minute‎‏‎‎‏‎"</item>
+    <item msgid="412343871668955639">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‎‏‏‏‎‏‏‎‏‏‏‎‎‎‏‏‏‏‎‎‎‎‏‎‎‏‎‎‎‏‎‎‎‎‏‏‎‎‎‎‏‎‎‎‏‏‎‎‏‎‏‎‎‏‏‏‏‏‎‏‏‏‎2 minutes‎‏‎‎‏‎"</item>
+    <item msgid="5076853889688991690">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‎‏‏‎‎‏‏‏‎‏‎‎‏‎‎‏‏‎‏‏‏‎‏‏‎‏‏‎‏‏‎‏‏‏‏‏‎‏‏‏‏‎‎‎‏‏‏‏‎‏‏‏‏‏‎‎‏‎‏‎‎5 minutes‎‏‎‎‏‎"</item>
+    <item msgid="1903860996174927898">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‏‎‏‎‎‏‏‎‏‎‏‏‏‏‎‏‏‏‏‏‎‏‏‏‏‏‎‏‎‎‏‎‏‎‏‎‏‎‏‏‏‎‏‎‎‏‎‏‏‎‎‎‎‎‎‏‏‎‏‎‎10 minutes‎‏‎‎‏‎"</item>
+    <item msgid="6415509612413178727">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‏‎‎‏‎‎‎‎‏‎‎‎‎‏‏‏‏‎‎‎‎‎‎‎‎‎‎‎‎‏‏‎‏‏‎‎‏‏‏‏‏‏‎‏‏‏‎‏‎‎‏‏‎‏‏‎‎‏‏‏‎30 minutes‎‏‎‎‏‎"</item>
+  </string-array>
+  <string-array name="lock_after_timeout_entries">
+    <item msgid="8929270399652145290">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‏‎‏‏‏‏‏‎‏‎‏‏‎‎‏‎‎‏‎‎‎‎‎‏‏‏‏‎‏‎‎‎‎‎‏‎‏‎‏‎‏‏‎‏‎‎‏‎‏‎‎‎‏‎‎‎‏‎‏‎‎Immediately‎‏‎‎‏‎"</item>
+    <item msgid="6736512735606834431">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‏‏‎‏‎‏‏‏‏‏‎‎‏‏‏‎‎‏‏‎‏‎‏‎‎‏‎‎‎‎‏‏‎‏‏‎‏‎‏‏‏‏‎‏‏‎‎‎‎‏‎‎‏‏‏‏‏‏‏‏‎5 seconds‎‏‎‎‏‎"</item>
+    <item msgid="8044619388267891375">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‏‏‏‏‏‎‏‎‎‏‎‎‎‎‏‏‏‎‏‎‏‎‏‏‎‏‏‎‎‎‎‏‏‏‏‎‏‏‏‎‏‏‎‏‏‎‎‎‏‎‏‎‏‎‏‎‏‏‏‏‎15 seconds‎‏‎‎‏‎"</item>
+    <item msgid="1822002388249545488">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‏‎‎‏‎‏‎‎‏‎‎‏‎‎‎‎‏‏‎‏‏‎‎‎‎‏‎‎‏‏‎‎‏‎‏‏‏‎‎‎‎‏‏‏‎‎‎‎‏‎‏‏‎‎‎‏‎‎‎‎‎30 seconds‎‏‎‎‏‎"</item>
+    <item msgid="8538071621211916519">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‎‏‏‎‎‏‏‏‏‏‎‏‎‏‎‏‎‎‏‎‏‏‏‎‎‏‏‏‎‎‏‎‎‎‎‏‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‎‏‏‏‎‎‏‏‏‎1 minute‎‏‎‎‏‎"</item>
+    <item msgid="5663439580228932882">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‏‏‏‎‏‎‎‏‏‎‎‎‏‎‎‏‎‏‎‎‎‏‎‎‏‎‏‎‏‏‎‎‎‎‏‎‎‏‏‎‏‏‏‎‏‏‎‏‎‏‎‏‎‎‎‏‎‎‏‎‎2 minutes‎‏‎‎‏‎"</item>
+    <item msgid="49888496216106852">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‎‎‎‏‎‏‏‎‎‎‏‎‎‏‏‏‏‎‏‎‏‎‏‎‎‏‎‏‎‏‎‏‏‏‏‎‏‎‏‎‏‏‎‏‏‏‎‎‏‏‏‎‏‏‎‎‏‎‎‎5 minutes‎‏‎‎‏‎"</item>
+    <item msgid="9002737361305019353">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‏‏‎‎‏‏‏‏‎‎‎‎‎‎‏‎‎‏‎‏‏‏‏‎‏‏‏‎‎‏‏‏‏‎‏‎‏‎‏‏‏‎‎‏‎‎‏‎‎‎‏‏‏‏‎‏‏‎‎‏‎10 minutes‎‏‎‎‏‎"</item>
+    <item msgid="4322676235684793329">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‏‎‏‏‏‏‏‏‏‏‎‏‎‎‏‏‏‎‏‏‎‎‏‎‎‎‏‎‎‏‎‎‎‎‏‏‎‎‎‎‎‎‏‏‏‏‎‎‏‎‏‏‏‏‏‏‎‎‎‏‎30 minutes‎‏‎‎‏‎"</item>
+  </string-array>
+  <string-array name="entries_font_size">
+    <item msgid="8166647333858618801">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‎‎‎‏‎‏‎‏‎‏‎‏‏‏‎‎‎‎‏‎‎‏‏‏‏‎‏‏‎‎‏‏‏‏‎‎‏‎‎‎‏‎‎‎‏‎‏‎‏‏‎‏‏‎‏‏‎‎‎‏‎Small‎‏‎‎‏‎"</item>
+    <item msgid="6986443533756848935">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‎‎‎‎‏‏‏‏‎‏‎‎‏‏‎‏‎‏‎‏‎‏‏‎‎‎‎‎‏‏‎‏‎‎‎‎‏‏‏‎‎‏‏‎‏‏‎‏‏‎‏‏‎‎‏‎‎‏‏‏‎Default‎‏‎‎‏‎"</item>
+    <item msgid="38373998008112077">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‎‎‎‏‎‎‎‏‎‎‎‎‏‎‏‎‏‎‎‏‏‏‏‎‎‏‎‏‎‏‎‎‏‏‏‏‏‏‎‎‎‏‎‏‎‎‏‎‎‏‏‏‏‎‎‏‏‎‏‎Large‎‏‎‎‏‎"</item>
+    <item msgid="7635254317531872272">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‏‎‎‏‏‏‏‏‎‏‎‏‏‏‎‏‏‏‏‏‎‏‎‏‏‎‎‏‎‎‏‏‎‏‏‎‎‏‎‎‎‎‎‏‎‎‏‏‏‏‎‎‎‎‎‏‎‎‎‎‎Largest‎‏‎‎‏‎"</item>
+  </string-array>
+  <string-array name="wifi_status">
+    <item msgid="1922181315419294640"></item>
+    <item msgid="8934131797783724664">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‏‎‏‏‏‏‏‏‏‏‎‎‎‏‏‎‏‎‎‏‏‎‎‎‏‎‎‎‏‏‏‏‎‏‏‏‎‏‏‎‏‎‏‏‏‏‎‎‎‎‏‎‎‏‏‏‏‎‎‎‎Scanning…‎‏‎‎‏‎"</item>
+    <item msgid="8513729475867537913">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‎‏‏‎‎‎‏‎‎‏‏‎‏‏‎‏‎‏‏‏‏‏‎‏‏‎‎‏‏‏‎‎‎‎‏‎‏‏‎‏‏‎‏‏‎‏‏‏‎‎‎‏‏‏‏‏‏‎‎‏‎Connecting…‎‏‎‎‏‎"</item>
+    <item msgid="515055375277271756">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‎‏‏‏‏‏‎‎‏‎‎‏‎‏‏‏‎‏‏‎‎‎‎‎‏‎‎‎‏‎‏‎‎‎‏‎‏‏‎‎‎‎‏‏‏‎‏‎‏‎‏‎‏‎‏‏‎‎‏‏‎‎‎Authenticating…‎‏‎‎‏‎"</item>
+    <item msgid="1943354004029184381">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‏‎‏‎‏‏‏‏‏‎‎‎‎‎‏‎‏‏‏‎‎‎‏‎‏‎‏‏‏‎‎‏‏‎‏‎‏‏‏‏‏‏‏‎‎‎‎‏‏‎‎‏‎‏‏‏‏‏‎‏‎Obtaining IP address…‎‏‎‎‏‎"</item>
+    <item msgid="4221763391123233270">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‏‎‏‎‏‎‎‏‎‏‏‎‏‎‏‏‎‏‏‏‎‏‏‎‏‏‏‏‏‎‏‏‎‏‎‏‏‎‏‎‎‏‏‎‎‎‎‏‏‎‎‏‏‏‏‏‎‏‏‎‎Connected‎‏‎‎‏‎"</item>
+    <item msgid="624838831631122137">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‎‏‎‎‎‏‎‏‎‏‎‏‏‏‏‎‏‏‏‏‏‏‎‎‏‏‎‏‏‎‏‎‏‏‎‎‏‎‎‏‏‏‏‏‎‎‎‏‏‏‏‏‎‏‏‎‏‏‎‎‏‎Suspended‎‏‎‎‏‎"</item>
+    <item msgid="7979680559596111948">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‏‏‏‎‏‎‏‏‏‏‎‏‏‎‎‎‎‏‎‏‎‎‏‏‎‎‎‎‏‏‎‏‎‏‏‏‏‏‎‏‎‎‎‏‎‎‎‎‏‎‎‎‎‏‎‎‏‏‎‎‎Disconnecting…‎‏‎‎‏‎"</item>
+    <item msgid="1634960474403853625">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‎‏‏‎‏‎‏‏‎‎‎‎‏‎‎‎‏‎‏‏‏‏‏‎‎‎‏‏‏‎‎‏‏‎‏‎‏‎‏‎‎‏‎‏‎‏‎‏‎‏‎‏‎‎‏‏‏‎‎‏‎Disconnected‎‏‎‎‏‎"</item>
+    <item msgid="746097431216080650">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‎‏‎‏‎‎‏‎‏‏‎‏‎‏‎‏‎‏‎‏‏‏‎‏‎‏‎‎‏‎‎‏‎‎‎‏‏‎‏‏‏‎‏‏‏‎‏‎‎‎‏‏‏‎‎‎‎‏‎‏‎‎Unsuccessful‎‏‎‎‏‎"</item>
+    <item msgid="6367044185730295334">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‏‎‎‎‎‏‎‏‏‏‎‎‎‏‎‎‏‎‎‎‏‏‏‏‎‎‏‏‏‏‏‎‏‏‏‏‏‎‏‎‏‎‏‏‏‎‏‎‎‏‏‎‎‎‏‎‎‏‏‎‎Blocked‎‏‎‎‏‎"</item>
+    <item msgid="503942654197908005">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‎‏‏‏‏‎‏‏‏‏‏‏‏‎‎‏‎‏‏‏‎‏‎‎‏‎‏‏‎‎‏‎‎‎‏‎‏‎‏‎‏‎‎‎‏‎‎‏‎‎‎‎‏‎‎‎‏‎‎‏‎‏‎Temporarily avoiding poor connection‎‏‎‎‏‎"</item>
+  </string-array>
+  <string-array name="wifi_status_with_ssid">
+    <item msgid="7714855332363650812"></item>
+    <item msgid="8878186979715711006">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‏‎‏‏‎‎‏‏‎‏‎‏‏‎‏‎‏‎‎‎‎‎‎‎‎‏‎‎‏‏‏‏‎‏‏‏‎‏‏‏‎‏‎‎‎‎‎‎‎‎‎‎‎‎‎‏‏‏‏‎‎Scanning…‎‏‎‎‏‎"</item>
+    <item msgid="355508996603873860">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‎‏‏‏‎‎‏‏‏‎‏‏‏‏‎‎‎‎‎‏‎‏‏‎‎‎‏‏‎‎‏‎‎‎‎‎‎‏‎‎‎‎‎‏‏‏‏‎‎‎‏‎‏‎‎‏‎‎‎‏‎‎‎Connecting to ‎‏‎‎‏‏‎<xliff:g id="NETWORK_NAME">%1$s</xliff:g>‎‏‎‎‏‏‏‎…‎‏‎‎‏‎"</item>
+    <item msgid="554971459996405634">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‎‏‏‏‏‏‏‎‏‏‎‎‏‏‏‎‏‎‎‏‏‏‏‎‎‏‏‎‏‎‎‎‏‏‏‏‎‏‏‎‎‏‎‎‎‎‏‏‎‎‏‏‏‏‏‎‎‎‎‎‏‎‎Authenticating with ‎‏‎‎‏‏‎<xliff:g id="NETWORK_NAME">%1$s</xliff:g>‎‏‎‎‏‏‏‎…‎‏‎‎‏‎"</item>
+    <item msgid="7928343808033020343">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‏‏‏‎‎‎‎‎‎‏‏‏‎‎‏‎‎‎‏‎‏‎‏‎‏‏‏‏‏‏‏‎‏‏‏‎‏‏‏‏‏‎‎‏‏‏‎‏‏‎‎‏‏‎‏‏‎‏‏‏‎Obtaining IP address from ‎‏‎‎‏‏‎<xliff:g id="NETWORK_NAME">%1$s</xliff:g>‎‏‎‎‏‏‏‎…‎‏‎‎‏‎"</item>
+    <item msgid="8937994881315223448">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‏‏‎‎‎‎‎‎‏‎‏‎‎‎‏‎‎‎‏‎‏‏‏‏‏‏‎‏‎‎‏‏‎‎‎‏‎‎‎‎‏‏‎‏‏‎‏‏‎‏‏‏‏‎‎‏‏‎‎‎‎Connected to ‎‏‎‎‏‏‎<xliff:g id="NETWORK_NAME">%1$s</xliff:g>‎‏‎‎‏‏‏‎‎‏‎‎‏‎"</item>
+    <item msgid="1330262655415760617">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‎‎‏‎‎‏‏‏‎‏‏‎‎‎‎‎‏‎‏‎‏‏‎‏‎‏‏‎‎‏‎‎‏‎‏‎‎‎‎‎‎‏‏‎‎‎‏‏‎‏‏‎‏‏‏‎‏‎‎‏‎Suspended‎‏‎‎‏‎"</item>
+    <item msgid="7698638434317271902">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‏‎‏‎‏‏‎‏‎‏‏‏‎‎‎‎‏‏‏‎‏‏‎‏‏‏‎‏‏‏‏‎‏‎‏‏‏‎‏‎‎‏‏‎‏‎‎‎‎‎‏‏‎‏‎‏‏‏‏‎‎Disconnecting from ‎‏‎‎‏‏‎<xliff:g id="NETWORK_NAME">%1$s</xliff:g>‎‏‎‎‏‏‏‎…‎‏‎‎‏‎"</item>
+    <item msgid="197508606402264311">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‎‏‎‏‎‏‎‏‏‏‏‎‏‏‎‏‏‎‎‎‏‎‎‎‎‎‏‏‏‏‏‏‏‎‏‎‎‏‎‏‏‎‎‎‎‎‏‏‏‏‏‎‎‏‏‏‏‎‏‏‏‎Disconnected‎‏‎‎‏‎"</item>
+    <item msgid="8578370891960825148">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‎‏‏‏‎‎‎‎‏‏‎‎‎‏‏‏‏‏‏‎‏‏‏‎‎‎‎‎‎‏‎‎‎‏‏‎‏‏‏‎‎‎‎‎‎‎‏‏‎‏‎‏‎‎‏‏‏‏‎‎‎Unsuccessful‎‏‎‎‏‎"</item>
+    <item msgid="5660739516542454527">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‏‏‏‎‏‎‎‎‏‏‏‎‏‏‏‏‏‏‎‎‏‎‎‏‏‎‎‏‎‎‏‏‎‎‎‏‏‎‎‎‎‏‏‏‏‎‎‎‏‎‏‎‏‏‏‏‏‏‏‏‎Blocked‎‏‎‎‏‎"</item>
+    <item msgid="1805837518286731242">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‏‎‎‏‎‎‎‎‏‏‏‏‏‎‎‏‏‏‏‏‏‎‏‎‎‏‏‏‏‎‏‏‎‏‏‏‏‎‎‎‏‏‎‏‏‎‏‏‎‏‏‏‏‏‏‎‏‎‏‎‎Temporarily avoiding poor connection‎‏‎‎‏‎"</item>
+  </string-array>
+    <!-- no translation found for wifi_security:0 (8491993170197127709) -->
+    <!-- no translation found for wifi_security:1 (6524315248437318854) -->
+    <!-- no translation found for wifi_security:2 (1532568756571457140) -->
+    <!-- no translation found for wifi_security:3 (3620707702811709779) -->
+    <!-- no translation found for wifi_security_no_eap:0 (2084555984818107151) -->
+    <!-- no translation found for wifi_security_no_eap:1 (397579322683471524) -->
+    <!-- no translation found for wifi_security_no_eap:2 (1968820975358150484) -->
+  <string-array name="wifi_eap_method">
+    <item msgid="1160193392455075561">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‎‎‎‎‎‎‎‏‏‎‎‏‏‏‎‏‎‏‎‏‏‎‏‏‏‏‏‎‎‏‎‏‎‏‎‎‎‎‎‎‏‎‏‎‎‏‎‎‎‏‏‎‏‏‏‎‏‎‎‏‎PEAP‎‏‎‎‏‎"</item>
+    <item msgid="7981731051382306293">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‏‏‏‎‏‏‎‎‎‏‎‎‏‏‎‎‏‏‏‎‎‎‎‏‏‎‏‎‎‎‏‎‏‎‏‎‎‏‎‏‏‎‎‎‏‏‏‏‎‏‎‏‏‏‏‏‎‏‎‏‎TLS‎‏‎‎‏‎"</item>
+    <item msgid="2892994535305020162">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‏‎‎‎‎‎‏‎‎‏‎‏‏‏‏‏‏‎‏‏‎‎‏‏‎‎‏‏‏‎‏‏‏‏‏‎‎‎‎‎‎‎‎‎‏‎‎‎‎‎‏‏‎‎‎‎‎‎‏‎‎TTLS‎‏‎‎‏‎"</item>
+    <item msgid="435667726254379514">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‎‏‏‏‏‎‎‎‎‎‏‎‏‏‏‏‎‎‏‏‎‏‎‏‏‏‏‏‎‏‎‎‎‏‏‏‏‏‎‏‏‏‏‏‏‎‏‎‎‏‎‎‎‏‏‏‏‏‏‎‏‎‎PWD‎‏‎‎‏‎"</item>
+    <item msgid="8549485714107012129">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‎‏‏‎‏‎‏‎‎‏‎‏‏‏‎‏‏‏‏‏‏‏‏‏‎‏‎‏‏‎‏‏‏‎‎‏‏‎‏‎‎‎‎‎‎‎‎‏‎‏‎‎‎‎‏‎‎‎‎‏‎SIM‎‏‎‎‏‎"</item>
+    <item msgid="1023893786681286517">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‎‏‏‏‎‎‎‏‏‎‏‎‏‏‎‎‏‏‎‎‏‏‏‏‏‏‎‎‏‎‏‏‎‎‎‏‎‏‏‎‏‏‏‏‎‎‎‎‏‏‏‏‏‎‏‏‏‎‏‎‏‎AKA‎‏‎‎‏‎"</item>
+    <item msgid="3030483188676375009">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‏‎‏‎‎‎‎‎‏‏‏‎‎‏‏‏‎‎‎‎‎‏‏‎‎‏‏‏‎‏‏‎‎‏‏‎‏‏‎‏‏‎‎‏‎‎‏‏‎‎‎‏‏‏‏‎‎‎‎‏‎AKA\'‎‏‎‎‏‎"</item>
+  </string-array>
+  <string-array name="eap_method_without_sim_auth">
+    <item msgid="4047867891913819797">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‏‎‎‎‎‎‏‎‏‏‎‎‏‏‏‎‏‎‏‎‎‏‏‎‎‏‏‎‏‎‏‏‎‎‏‏‎‎‏‏‏‎‏‏‏‎‎‎‎‏‏‎‏‎‎‏‎‏‎‏‎PEAP‎‏‎‎‏‎"</item>
+    <item msgid="641030570679578504">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‎‏‎‎‎‏‏‏‎‎‏‎‏‎‏‏‎‎‏‎‏‏‏‏‎‏‎‎‎‎‏‎‏‏‏‏‏‏‎‎‎‎‏‎‏‏‎‏‎‏‏‏‏‏‎‎‎‏‎‎‎‎TLS‎‏‎‎‏‎"</item>
+    <item msgid="3079489731769553856">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‏‎‏‎‏‎‏‏‏‏‎‎‏‎‎‎‏‎‏‏‏‎‎‏‏‎‎‎‎‏‎‏‏‏‏‏‏‎‎‏‎‏‏‎‎‏‎‏‎‎‏‏‏‏‎‎‎‎‎‎‎TTLS‎‏‎‎‏‎"</item>
+    <item msgid="35269224158638258">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‎‏‏‏‏‏‏‏‏‎‏‎‏‎‎‏‏‎‏‎‎‏‎‏‏‎‎‎‎‏‎‏‎‎‏‎‏‏‏‏‎‏‎‏‎‏‏‎‎‎‎‏‎‏‏‎‎‏‎‎PWD‎‏‎‎‏‎"</item>
+  </string-array>
+    <!-- no translation found for wifi_ap_band_config_full:0 (1085243288162893079) -->
+    <!-- no translation found for wifi_ap_band_config_full:1 (5531376834915607202) -->
+    <!-- no translation found for wifi_ap_band_config_2G_only:0 (7006771583217001015) -->
+  <string-array name="wifi_p2p_wps_setup">
+    <item msgid="5085064298144493867">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‎‏‏‎‏‎‎‏‎‎‎‏‏‏‎‎‎‏‏‏‎‎‎‎‏‎‎‏‏‎‎‎‏‏‏‎‏‏‏‎‏‏‎‎‎‏‏‏‎‎‎‏‎‎‏‎‏‎‏‏‎Push button‎‏‎‎‏‎"</item>
+    <item msgid="1624323946324499595">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‎‏‏‎‏‎‎‎‏‎‏‎‏‏‎‎‎‎‏‎‎‎‎‎‎‏‎‏‏‏‏‎‏‏‎‎‏‏‎‏‎‏‎‏‎‎‎‏‏‏‎‎‏‎‎‎‏‎‏‏‎PIN from peer device‎‏‎‎‏‎"</item>
+    <item msgid="5366790421523328066">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‏‎‏‎‎‏‏‏‏‎‏‎‏‎‏‎‏‎‏‏‎‏‏‏‎‏‎‎‎‎‏‏‎‎‏‎‏‏‎‏‏‏‎‏‏‏‏‎‏‏‎‎‎‏‎‎‎‎‏‎‎PIN from this device‎‏‎‎‏‎"</item>
+  </string-array>
+  <string-array name="wifi_p2p_status">
+    <item msgid="1701505390737218306">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‎‏‏‏‏‎‎‏‏‏‎‎‏‏‏‏‎‏‏‎‎‎‏‎‎‎‏‏‎‏‎‎‏‏‏‎‎‏‎‎‏‏‎‏‏‏‎‏‏‎‏‏‎‎‎‎‎‎‏‎‎Connected‎‏‎‎‏‎"</item>
+    <item msgid="3189211552661432651">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‏‏‎‎‎‏‎‎‎‎‏‎‎‏‎‏‏‎‏‏‎‎‎‎‎‎‏‎‏‎‎‎‏‏‎‏‏‏‏‏‎‏‎‎‏‏‏‎‏‎‎‏‎‏‎‎‏‎‏‏‎Invited‎‏‎‎‏‎"</item>
+    <item msgid="3206450250360237549">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‏‏‎‎‎‏‏‏‏‏‏‏‏‎‎‏‏‎‎‏‏‎‎‎‎‎‏‏‏‎‏‎‎‎‏‎‏‎‏‎‏‏‏‏‎‎‏‎‏‏‎‏‏‏‏‎‏‏‎‏‎Unsuccessful‎‏‎‎‏‎"</item>
+    <item msgid="7785896708926971207">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‏‏‎‎‎‎‎‎‏‏‎‏‎‎‎‎‏‏‏‏‏‏‎‎‏‏‏‎‎‎‏‎‏‎‎‏‎‏‏‏‏‎‎‏‏‎‎‏‏‏‎‏‎‏‎‎‎‏‏‏‎Available‎‏‎‎‏‎"</item>
+    <item msgid="2330782789550628803">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‎‎‎‎‎‏‎‏‏‎‎‎‏‎‎‏‏‎‏‎‏‎‎‏‏‎‎‏‎‎‎‏‏‎‏‏‏‏‎‎‎‎‏‎‎‏‎‏‏‏‏‏‏‏‎‎‎‎‏‏‎Out-of-range‎‏‎‎‏‎"</item>
+  </string-array>
+  <string-array name="bluetooth_visibility_timeout_entries">
+    <item msgid="8151962652413645395">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‎‎‎‏‎‎‏‎‎‎‎‏‏‎‎‏‎‏‏‎‏‏‎‏‎‏‏‏‎‏‏‎‎‏‏‏‎‏‎‏‏‏‎‏‏‏‎‏‎‎‏‎‎‏‎‏‎‎‏‏‎2 minutes‎‏‎‎‏‎"</item>
+    <item msgid="8675215713017289017">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‏‎‎‎‎‏‏‎‎‏‎‎‏‎‎‎‏‏‏‎‏‎‏‏‏‎‏‎‎‏‎‎‏‏‎‎‎‏‎‎‏‎‎‎‎‏‎‏‏‎‎‏‎‎‏‏‏‎‎‏‎5 minutes‎‏‎‎‏‎"</item>
+    <item msgid="477015974247590543">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‎‏‏‏‏‎‏‎‎‏‏‏‏‎‏‎‏‏‎‎‏‏‏‎‎‎‎‎‎‎‎‏‎‏‎‎‎‏‎‎‏‏‎‏‏‎‏‏‏‎‏‎‏‎‏‎‎‎‏‏‏‏‎1 hour‎‏‎‎‏‎"</item>
+    <item msgid="5198271470953124739">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‏‎‎‎‎‎‏‎‎‎‏‏‏‏‏‏‏‎‎‎‎‏‎‏‏‏‎‎‎‏‏‏‏‎‎‎‎‎‏‏‎‏‎‏‎‏‎‏‎‎‏‏‏‎‎‎‎‎‏‏‎Never time out‎‏‎‎‏‎"</item>
+  </string-array>
+  <string-array name="wifi_signal">
+    <item msgid="2245412278046491293">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‏‏‏‏‎‎‏‎‏‎‎‏‎‏‎‎‏‏‏‎‏‎‎‏‎‎‎‏‏‏‏‏‎‏‏‏‎‏‎‎‎‎‏‏‎‎‎‎‎‎‏‎‏‎‎‏‏‏‎‏‎Poor‎‏‎‎‏‎"</item>
+    <item msgid="2042505933058940139">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‏‏‎‎‎‏‎‏‏‎‎‎‎‏‏‏‎‎‎‎‎‏‎‏‎‎‏‏‎‎‎‎‏‏‏‏‏‎‎‏‏‎‏‏‎‎‎‏‏‏‎‎‏‏‏‎‏‎‏‏‎Poor‎‏‎‎‏‎"</item>
+    <item msgid="1344546617235886412">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‎‎‏‎‏‎‏‎‏‎‎‎‏‏‎‎‏‎‏‎‎‎‎‎‎‏‏‎‎‏‎‏‎‎‎‎‎‏‎‎‏‏‎‎‎‏‎‏‎‎‎‏‎‏‎‎‏‏‎‎‎Fair‎‏‎‎‏‎"</item>
+    <item msgid="6019931571712517411">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‎‎‏‏‏‎‎‎‏‎‏‏‎‎‎‏‎‏‏‏‏‏‎‏‏‏‏‎‏‎‎‏‏‎‎‎‎‎‎‏‎‏‎‏‎‏‏‎‎‏‎‏‎‎‏‎‎‎‏‏‎Good‎‏‎‎‏‎"</item>
+    <item msgid="8986346415847956850">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‏‏‎‎‏‎‏‏‎‏‎‏‏‏‏‎‏‎‏‎‎‏‏‏‎‏‎‎‎‎‎‏‏‎‎‏‎‎‏‏‏‎‎‎‏‏‏‎‎‎‎‏‎‏‏‏‎‎‏‎‎Excellent‎‏‎‎‏‎"</item>
+  </string-array>
+  <string-array name="data_usage_data_range">
+    <item msgid="5013973108901348144">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‎‏‎‏‏‎‎‏‎‏‎‏‎‎‏‏‎‏‎‏‏‏‏‏‏‎‏‎‎‎‏‏‎‏‎‏‎‏‏‎‏‏‎‏‎‎‎‎‎‎‏‏‎‎‏‏‎‎‎‎‎Last 30 days‎‏‎‎‏‎"</item>
+    <item msgid="6600989128423965319">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‏‎‏‏‏‎‎‏‏‎‏‏‎‏‏‎‏‏‎‎‏‎‏‎‎‎‏‏‏‎‎‎‎‏‎‏‏‏‏‎‏‏‎‏‎‎‎‎‎‎‏‎‏‎‎‎‎‏‏‏‎Set usage cycle...‎‏‎‎‏‎"</item>
+  </string-array>
+  <string-array name="usage_stats_display_order_types">
+    <item msgid="2100172576767439288">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‏‏‎‏‎‎‏‎‎‏‎‏‎‏‎‎‏‏‏‏‏‏‎‏‎‏‎‎‏‏‎‏‎‏‎‏‎‎‏‏‏‏‎‏‎‏‏‏‎‎‎‏‏‎‏‏‏‎‎‎‎Usage time‎‏‎‎‏‎"</item>
+    <item msgid="4796160515314745154">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‎‎‏‎‏‎‎‎‏‏‏‏‎‏‏‎‎‎‏‎‏‎‎‏‎‎‏‏‏‏‎‏‏‎‎‏‎‎‎‏‎‏‏‎‏‏‏‏‏‏‏‏‎‏‎‎‎‎‏‎‎Last time used‎‏‎‎‏‎"</item>
+    <item msgid="2502754479975776899">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‎‎‏‎‏‎‏‏‏‎‏‏‏‎‎‏‎‎‎‏‏‏‏‏‎‎‎‎‎‏‏‏‏‎‏‎‏‏‏‏‏‎‎‏‎‏‎‎‎‎‏‎‏‎‎‎‎‎‏‏‎App name‎‏‎‎‏‎"</item>
+  </string-array>
+  <string-array name="wifi_eap_entries">
+    <item msgid="8615575908717909498">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‎‏‏‏‏‎‎‏‎‎‎‎‏‎‏‎‏‏‎‎‏‎‏‎‎‏‎‎‎‏‎‎‎‏‏‎‏‎‎‎‏‎‏‏‎‏‎‏‎‏‎‏‏‏‏‏‏‎‏‎‎PEAP‎‏‎‎‏‎"</item>
+    <item msgid="8667872640594311615">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‏‎‎‎‎‏‎‎‏‎‏‎‎‏‏‏‏‎‎‎‎‎‏‏‏‏‏‎‎‎‎‎‎‏‎‎‏‏‏‏‎‎‏‏‎‏‏‏‏‎‎‏‏‎‏‏‏‏‏‏‎TLS‎‏‎‎‏‎"</item>
+    <item msgid="7182812872984827322">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‎‎‏‏‏‎‏‎‏‏‏‎‎‏‏‏‏‎‏‎‎‏‎‎‎‎‎‎‎‏‏‏‎‏‏‎‎‏‎‏‏‏‎‏‎‎‎‏‎‏‎‏‏‎‏‏‏‎‏‎‎TTLS‎‏‎‎‏‎"</item>
+    <item msgid="2318274046749286642">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‎‎‎‎‎‎‏‎‏‏‎‎‎‎‏‎‏‎‎‏‏‏‏‏‎‏‏‎‎‏‏‏‏‎‎‎‎‏‏‏‏‏‏‏‏‎‏‎‎‎‎‎‏‏‏‏‎‎‏‎‎PWD‎‏‎‎‏‎"</item>
+  </string-array>
+  <string-array name="wifi_peap_phase2_entries">
+    <item msgid="2577747762745812488">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‎‎‏‏‏‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‏‏‏‎‏‏‏‎‏‏‎‎‎‏‏‏‎‎‎‎‎‏‎‏‏‎‏‎‎‏‏‎‎‎‎‎‏‎‎‎‎None‎‏‎‎‏‎"</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">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‏‏‏‏‏‏‏‏‎‎‎‏‎‏‎‎‏‏‎‏‎‏‎‏‏‎‏‏‏‏‏‎‎‏‎‎‏‏‏‎‎‏‎‎‏‎‏‎‏‎‏‎‏‎‏‏‏‏‎‎‎None‎‏‎‎‏‎"</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">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‏‎‎‏‎‎‏‏‏‏‎‏‏‎‏‎‎‎‎‎‎‏‏‏‎‏‏‎‎‎‏‏‎‎‎‎‏‎‏‎‏‏‎‎‏‏‎‎‏‏‎‏‎‎‎‏‏‎‏‎‎None‎‏‎‎‏‎"</item>
+    <item msgid="6189918678874123056">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‎‏‎‏‏‏‏‎‎‏‏‏‎‎‎‎‎‎‏‎‎‎‏‏‏‏‏‎‎‎‏‎‏‎‏‎‏‏‎‏‏‎‎‎‏‏‏‎‏‎‏‏‎‎‏‏‎‎‎‎‎PAP‎‏‎‎‏‎"</item>
+    <item msgid="1524112260493662517">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‎‏‎‏‎‎‏‎‎‏‏‎‏‎‏‏‏‏‎‎‎‎‎‎‎‏‏‎‏‎‎‏‏‏‎‎‏‎‎‎‏‎‏‎‏‏‎‏‏‎‎‏‎‎‏‏‎‏‎‏‎MSCHAP‎‏‎‎‏‎"</item>
+    <item msgid="5923246669412752932">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‎‎‏‎‎‎‏‏‎‎‏‏‏‎‎‏‏‎‎‏‎‏‏‏‎‏‏‎‏‎‎‎‏‏‏‏‎‏‎‏‏‏‎‎‏‏‎‏‏‏‏‎‎‎‏‎‎‏‎‎‎MSCHAPV2‎‏‎‎‏‎"</item>
+    <item msgid="8651992560135239389">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‎‎‏‏‎‏‎‏‏‎‎‏‎‎‏‎‏‎‏‎‏‎‎‎‏‎‏‏‏‎‏‏‏‏‎‏‏‎‏‏‎‏‏‏‎‏‎GTC‎‏‎‎‏‎"</item>
+  </string-array>
+  <string-array name="wifi_ip_settings">
+    <item msgid="3906714200993111074">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‎‏‏‎‎‎‏‏‎‏‏‏‎‏‏‎‏‏‏‏‏‏‎‏‏‏‎‏‏‏‏‏‏‏‎‏‎‎‏‎‏‎‏‏‎‎‎‏‏‏‎‎‎‎‏‎‎‎‏‎‎DHCP‎‏‎‎‏‎"</item>
+    <item msgid="628395202971532382">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‎‏‎‎‎‏‎‏‏‏‎‎‎‏‎‎‎‎‎‏‎‎‎‎‏‏‎‏‏‏‎‎‏‎‎‏‏‏‎‏‎‏‏‎‏‎‏‏‏‏‏‎‎‎‏‎‏‏‏‏‎‎Static‎‏‎‎‏‎"</item>
+  </string-array>
+  <string-array name="wifi_proxy_settings">
+    <item msgid="4473276491748503377">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‏‏‏‎‎‎‎‏‎‏‎‎‎‏‎‎‎‏‎‏‎‏‎‎‎‏‎‎‏‏‎‏‎‎‎‎‏‏‎‎‎‏‏‎‎‏‏‎‏‏‏‏‎‏‎‏‎‎‎‏‎None‎‏‎‎‏‎"</item>
+    <item msgid="8673874894887358090">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‏‎‎‎‎‏‎‏‏‏‏‏‏‏‎‎‏‎‏‏‎‏‎‎‎‎‏‎‏‎‏‏‏‏‏‏‏‏‏‏‎‎‎‎‏‎‎‎‏‏‏‎‏‎‎‎‏‎‏‎‎Manual‎‏‎‎‏‎"</item>
+    <item msgid="168893341855953140">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‎‏‎‏‎‎‏‎‏‏‎‎‎‎‎‎‎‎‏‏‏‏‎‎‏‏‎‎‏‎‏‏‏‏‏‏‎‎‏‎‎‎‎‎‎‏‎‏‏‎‎‎‎‏‏‏‏‎‏‎‎‎Proxy Auto-Config‎‏‎‎‏‎"</item>
+  </string-array>
+  <string-array name="apn_auth_entries">
+    <item msgid="3856896061242872146">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‎‏‎‏‏‎‎‎‎‏‏‎‎‏‏‏‎‎‏‎‏‎‎‎‏‎‎‎‎‏‏‏‎‎‎‏‏‏‏‏‏‏‎‎‎‎‎‏‎‎‎‏‎‏‎‏‎‎‏‎‎None‎‏‎‎‏‎"</item>
+    <item msgid="5756844015743664882">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‏‏‏‏‏‏‏‎‎‏‎‎‎‏‏‎‏‎‏‏‎‎‏‎‎‎‎‏‏‎‎‏‏‎‎‏‏‎‏‏‏‏‎‎‎‎‎‎‎‎‏‎‏‏‏‏‎‎‏‎‎PAP‎‏‎‎‏‎"</item>
+    <item msgid="535934025797984365">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‎‏‏‏‏‏‎‏‏‏‎‎‎‎‎‎‎‎‎‏‎‏‎‎‏‎‏‎‎‎‎‎‏‎‏‏‏‎‏‎‏‏‏‎‏‏‏‏‏‎‎‎‎‎‎‏‏‎‏‏‎‏‎CHAP‎‏‎‎‏‎"</item>
+    <item msgid="8383098660619805783">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‎‏‎‎‎‏‎‏‎‏‏‎‏‎‏‏‏‏‏‏‏‏‎‏‎‎‎‎‏‏‏‏‎‏‏‏‎‏‎‎‏‎‏‏‏‏‏‎‎‏‎‎‎‏‎‏‎‏‏‏‎PAP or CHAP‎‏‎‎‏‎"</item>
+  </string-array>
+  <string-array name="apn_protocol_entries">
+    <item msgid="4852355456199302715">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‎‎‏‏‎‏‎‏‎‏‏‏‎‎‎‎‎‏‏‏‏‎‎‏‎‏‎‎‎‎‎‏‏‎‏‎‏‎‏‏‎‎‎‎‎‎‎‏‏‏‏‎‎‎‏‏‏‎‏‏‎IPv4‎‏‎‎‏‎"</item>
+    <item msgid="4394161344888484571">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‏‏‎‎‏‏‏‏‏‎‏‏‎‎‏‏‎‎‏‎‎‏‏‏‎‏‏‎‎‎‏‏‏‏‏‏‏‏‎‏‎‏‎‎‏‎‏‏‎‎‏‎‏‏‎‏‏‎‏‏‎IPv6‎‏‎‎‏‎"</item>
+    <item msgid="8084938354605535381">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‎‎‎‎‎‎‏‏‎‎‏‏‎‏‏‏‏‎‎‎‏‎‎‏‏‎‎‏‎‎‎‎‎‎‎‏‎‎‏‏‎‎‎‏‏‎‏‏‎‎‎‎‏‎‎‏‎‏‎‏‎IPv4/IPv6‎‏‎‎‏‎"</item>
+  </string-array>
+  <string-array name="bearer_entries">
+    <item msgid="1697455674244601285">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‎‏‏‏‏‎‎‎‏‏‏‎‏‎‎‏‎‎‏‎‏‏‏‏‎‎‎‏‎‎‏‏‎‏‎‏‎‏‎‏‎‎‏‎‎‎‎‏‎‏‎‏‏‏‎‎‎‏‎‏‎Unspecified‎‏‎‎‏‎"</item>
+    <item msgid="1317061551798123908">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‎‎‏‎‎‏‎‎‎‏‏‏‎‎‏‎‎‏‎‎‏‎‎‎‎‎‎‎‏‏‎‏‎‏‏‎‎‏‎‎‎‎‎‎‎‏‏‏‏‏‎‏‏‎‎‎‎‏‎‎‎LTE‎‏‎‎‏‎"</item>
+    <item msgid="5005435684511894770">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‎‏‎‏‎‏‏‏‎‏‏‎‏‏‏‎‎‎‎‏‎‎‏‏‏‏‎‎‎‎‏‏‎‎‎‏‎‏‏‎‎‏‎‏‎‏‎‎‏‏‎‎‏‏‏‏‎‎‏‎‎HSPAP‎‏‎‎‏‎"</item>
+    <item msgid="7700603056475539235">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‏‎‏‎‏‏‎‏‏‏‏‎‎‎‎‎‏‎‎‏‏‎‏‎‏‏‏‎‎‎‏‎‏‎‎‏‏‎‎‎‎‎‏‏‎‎‎‎‎‏‏‏‎‎‏‎‎‎‏‏‎HSPA‎‏‎‎‏‎"</item>
+    <item msgid="245973007602397887">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‎‏‎‏‏‎‏‏‎‏‎‎‏‏‏‎‏‏‏‏‏‎‎‏‎‎‏‎‏‏‎‏‎‏‏‏‎‎‏‏‏‏‎‎‏‏‎‏‏‎‎‏‎‏‎‏‏‏‏‏‏‎HSUPA‎‏‎‎‏‎"</item>
+    <item msgid="6291566767651194016">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‎‏‏‏‎‏‎‏‎‎‎‎‎‎‏‎‎‎‏‎‏‎‏‎‎‏‎‎‎‎‎‏‏‎‏‎‏‎‎‎‎‎‎‎‏‎‎‎‎‏‎‎‏‎‏‎‎‎‎‎‎HSDPA‎‏‎‎‏‎"</item>
+    <item msgid="2005841400859926251">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‏‎‏‏‏‏‎‏‎‏‏‎‎‎‏‎‏‏‏‎‎‎‏‎‎‎‎‎‎‏‏‎‏‏‏‎‎‎‎‎‎‏‏‏‎‎‎‏‏‏‏‎‏‏‏‎‏‎‏‏‎UMTS‎‏‎‎‏‎"</item>
+    <item msgid="3757385691174882861">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‎‏‎‎‎‎‏‎‎‏‎‎‏‏‏‎‏‎‏‎‎‏‏‎‎‎‎‎‏‏‏‎‏‏‏‎‏‎‎‏‏‏‎‏‎‏‎‎‏‏‏‎‎‎‏‎‏‏‎‏‎EDGE‎‏‎‎‏‎"</item>
+    <item msgid="2979115073474306864">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‏‎‎‏‎‏‎‏‎‏‏‏‏‏‏‏‎‎‎‏‎‏‏‎‎‎‎‎‎‎‎‏‎‎‏‏‎‏‏‏‎‎‏‎‏‎‏‎‎‎‏‏‎‎‏‏‎‎‎‎‎GPRS‎‏‎‎‏‎"</item>
+    <item msgid="2271750502778879106">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‏‏‏‏‏‎‎‎‎‏‏‎‏‏‏‎‎‎‎‏‎‎‎‎‏‎‏‏‏‏‎‎‏‎‎‎‎‏‏‏‎‎‏‏‎‎‏‏‏‏‎‎‏‎‎‎‎‎‏‎‎eHRPD‎‏‎‎‏‎"</item>
+    <item msgid="4173379084783381337">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‏‎‎‏‏‏‏‎‏‎‏‎‏‏‎‏‎‎‏‎‎‎‏‎‏‎‏‎‏‎‎‎‎‏‎‏‏‎‎‎‏‏‏‎‏‏‏‎‏‎‏‏‎‏‎‏‏‎‎‏‎EVDO_B‎‏‎‎‏‎"</item>
+    <item msgid="2033682802005776093">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‏‏‎‎‎‎‏‏‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‏‎‏‏‏‏‎‎‎‏‏‏‎‏‏‎‎‎‎‎‎‎‎‏‎‏‏‎‏‏‎‏‏‏‎‏‎EVDO_A‎‏‎‎‏‎"</item>
+    <item msgid="5753917125831466719">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‏‏‏‏‏‏‎‏‏‎‏‎‎‎‎‎‎‏‎‏‎‎‏‎‎‎‏‏‏‏‏‏‎‎‎‎‎‎‏‏‏‎‎‎‏‎‎‏‏‏‏‎‏‏‎‏‏‏‏‏‎EVDO_0‎‏‎‎‏‎"</item>
+    <item msgid="4713807936577071142">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‎‎‎‏‎‏‏‎‏‎‏‎‏‏‎‎‏‏‏‏‎‏‎‏‎‏‏‏‏‏‏‎‏‏‏‏‎‎‎‏‎‏‏‏‏‏‏‎‏‎‎‎‎‎‏‎‎‏‏‎‎1xRTT‎‏‎‎‏‎"</item>
+    <item msgid="1142355797022021906">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‎‏‏‏‏‏‏‎‏‏‎‏‎‎‏‏‏‎‏‏‎‏‎‎‎‏‎‏‏‏‎‎‎‎‎‎‎‏‎‎‏‏‎‏‏‎‎‎‏‏‎‎‏‎‎‎‏‎‎‏‎‎IS95B‎‏‎‎‏‎"</item>
+    <item msgid="7471182818083460781">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‎‏‏‏‏‎‏‎‏‏‏‎‏‏‏‏‏‎‎‏‎‎‏‏‎‎‎‎‎‏‏‎‎‎‏‏‏‏‎‏‏‏‎‏‏‏‎‏‎‏‏‎‏‎‏‎‏‏‎‏‎IS95A‎‏‎‎‏‎"</item>
+  </string-array>
+  <string-array name="mvno_type_entries">
+    <item msgid="4367119357633573465">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‏‏‎‎‏‎‎‏‏‎‏‏‎‎‎‏‏‏‏‏‏‏‏‎‏‎‏‎‏‏‏‏‎‎‏‏‎‏‏‏‏‎‏‏‎‎‏‏‎‎‏‎‎‏‎‏‏‎‎‏‎None‎‏‎‎‏‎"</item>
+    <item msgid="6062567900587138000">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‎‏‎‎‎‎‏‎‎‎‏‎‏‎‎‏‎‎‎‏‎‏‏‎‎‎‏‎‎‏‏‏‏‏‎‏‎‎‏‎‏‏‏‎‏‎‎‏‏‎‏‏‏‏‎‏‎‎‎‎‎SPN‎‏‎‎‏‎"</item>
+    <item msgid="2454085083342423481">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‎‎‏‎‎‎‎‎‏‏‏‎‏‎‏‎‏‎‎‏‎‏‏‎‎‎‎‏‏‎‎‎‏‎‎‏‎‎‏‏‎‏‎‏‏‏‎‎‎‏‎‏‏‎‏‏‏‎‎‏‎IMSI‎‏‎‎‏‎"</item>
+    <item msgid="2681427309183221543">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‎‏‎‏‎‎‏‏‎‏‏‎‎‏‎‏‎‏‏‏‏‏‏‎‏‏‏‎‎‏‎‎‏‏‏‎‏‏‏‎‎‏‎‏‏‎‏‏‏‏‏‏‎‎‏‎‎‏‏‏‎GID‎‏‎‎‏‎"</item>
+  </string-array>
+  <string-array name="app_install_location_entries">
+    <item msgid="8151497958991952759">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‎‎‎‏‎‎‎‏‏‏‏‏‏‏‏‏‎‎‎‎‎‎‏‏‎‏‎‎‏‎‎‎‏‎‎‏‎‎‎‎‏‎‎‏‎‏‏‏‏‎‏‏‎‏‏‏‎‏‏‏‎Internal device storage‎‏‎‎‏‎"</item>
+    <item msgid="3738430123799803530">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‎‎‏‏‏‏‏‎‎‎‎‏‏‎‎‏‎‎‏‎‎‏‏‎‎‎‏‏‏‏‏‏‏‎‏‎‏‎‏‏‎‏‎‎‏‏‏‏‎‏‏‎‏‎‎‎‏‎‏‎‎Removable SD card‎‏‎‎‏‎"</item>
+    <item msgid="4498124044785815005">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‏‏‏‎‎‏‏‎‏‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‎‏‎‎‏‎‏‎‏‎‎‎‏‏‎‏‎‎‎‎‎‏‏‎‏‏‏‎‏‏‏‎‏‎Let the system decide‎‏‎‎‏‎"</item>
+  </string-array>
+  <string-array name="app_ops_categories">
+    <item msgid="6358963769537892925">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‏‎‎‎‎‎‏‏‏‏‏‏‏‎‎‏‎‎‏‏‏‏‎‏‏‎‏‏‎‏‏‎‏‏‏‎‏‏‏‎‎‎‏‎‏‎‎‏‎‎‏‎‎‎‏‏‏‏‎‏‎Location‎‏‎‎‏‎"</item>
+    <item msgid="255608127647030286">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‎‏‎‏‏‏‎‎‎‏‏‎‎‎‎‎‏‏‎‏‎‎‎‏‏‏‏‎‎‏‏‏‎‎‎‏‎‎‎‎‏‏‎‏‎‏‎‎‏‏‏‎‎‎‎‎‎‏‏‏‎‎Personal‎‏‎‎‏‎"</item>
+    <item msgid="4588829735729884491">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‏‏‏‏‏‎‏‎‏‏‏‎‏‏‎‎‏‏‎‎‎‏‎‏‎‏‎‎‏‏‏‏‏‏‎‎‏‏‏‎‏‏‎‏‏‏‏‎‏‏‎‏‎‏‎‎‏‎‏‏‎Messaging‎‏‎‎‏‎"</item>
+    <item msgid="886742181977884584">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‎‏‏‎‎‎‏‎‎‏‏‏‎‎‏‎‏‎‏‏‏‎‏‎‏‎‎‎‎‏‏‏‏‏‏‎‎‎‎‏‎‎‏‎‏‏‎‎‎‎‏‏‏‏‎‏‎‏‎‎‎‎Media‎‏‎‎‏‎"</item>
+    <item msgid="7924928667052300589">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‏‏‎‏‏‏‏‏‏‎‏‏‎‎‎‎‎‎‎‎‏‎‏‎‎‎‏‎‎‏‏‏‎‏‎‏‏‏‏‏‎‏‏‎‎‏‎‏‏‎‎‏‎‎‏‎‏‏‎‏‎Device‎‏‎‎‏‎"</item>
+  </string-array>
+  <string-array name="app_ops_summaries">
+    <item msgid="4979188868761515915">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‎‏‎‏‎‎‎‏‏‎‎‏‏‎‏‎‎‎‎‏‏‏‏‎‎‏‎‏‎‎‏‏‎‎‎‎‎‎‎‏‏‎‏‏‏‏‏‏‎‏‏‏‏‎‎‎‏‎‏‏‎coarse location‎‏‎‎‏‎"</item>
+    <item msgid="5789673140227507995">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‎‎‎‎‎‏‎‏‏‎‎‏‎‎‎‎‏‏‎‏‎‎‎‎‏‎‏‏‏‏‎‎‏‎‎‎‏‏‏‎‎‎‎‏‏‎‎‎‎‏‏‏‎‎‎‏‏‎‏‏‎fine location‎‏‎‎‏‎"</item>
+    <item msgid="1061584358377390581">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‎‏‏‏‎‏‎‏‏‏‎‏‏‏‎‎‎‎‎‎‏‎‏‎‏‏‎‎‏‎‏‏‏‎‏‎‎‎‎‏‏‎‎‏‎‎‎‎‎‎‎‎‏‏‏‏‏‎‏‎‏‎GPS‎‏‎‎‏‎"</item>
+    <item msgid="5387405117297558954">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‏‎‏‎‏‏‎‎‎‎‏‏‏‏‏‎‏‎‎‎‎‏‏‎‏‎‎‏‎‎‎‏‎‏‎‏‏‎‏‎‎‏‎‎‏‎‎‎‎‏‎‏‏‎‏‎‏‎‏‎‎vibrate‎‏‎‎‏‎"</item>
+    <item msgid="3434165993711230924">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‏‏‏‏‏‎‏‎‏‎‎‎‏‎‎‏‏‎‏‏‏‏‎‎‎‏‏‎‏‎‏‏‏‎‏‎‏‏‏‎‎‎‏‎‎‏‎‏‏‏‏‏‏‏‎‎‏‏‎‎‎read contacts‎‏‎‎‏‎"</item>
+    <item msgid="616161687718081936">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‎‏‎‎‎‏‎‎‎‏‏‎‏‎‎‎‎‏‎‏‏‏‏‎‎‏‎‏‎‎‏‎‏‏‎‎‎‏‎‏‎‎‏‎‎‎‎‏‏‎‏‎‏‏‎‎‏‎‎‎‎‎modify contacts‎‏‎‎‏‎"</item>
+    <item msgid="7638002295329050091">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‏‎‎‏‏‏‏‏‏‏‏‏‏‎‏‎‎‎‏‎‏‎‎‏‏‏‏‎‏‎‏‎‎‏‏‎‏‎‏‏‎‏‎‎‏‏‎‎‏‏‎‏‏‏‏‎‏‎‏‏‎read call log‎‏‎‎‏‎"</item>
+    <item msgid="6546959730920410907">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‏‎‏‎‏‏‎‏‏‎‏‏‎‏‏‏‏‎‎‏‎‎‏‏‎‎‎‎‎‎‏‎‎‎‎‎‎‏‎‎‏‏‎‎‎‏‎‎‏‏‏‏‎‎‎‏‏‎‏‏‎modify call log‎‏‎‎‏‎"</item>
+    <item msgid="446877710771379667">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‎‏‏‏‏‎‎‎‏‏‎‎‏‏‏‎‏‎‎‎‎‎‏‏‏‎‏‎‎‏‎‎‎‎‏‎‎‎‏‎‎‏‎‎‎‏‎‏‎‏‏‏‎‏‏‏‎‏‎‎‏‏‎read calendar‎‏‎‎‏‎"</item>
+    <item msgid="7674458294386319722">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‏‎‏‎‏‎‎‎‎‎‎‏‎‎‏‎‎‏‏‏‎‎‏‎‏‎‎‎‎‏‏‎‎‎‎‎‎‏‏‏‎‎‏‎‎‏‏‎‎‎‎‏‎‏‏‎‏‎‏‎‎modify calendar‎‏‎‎‏‎"</item>
+    <item msgid="8281201165558093009">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‎‎‏‎‏‏‏‎‏‏‎‎‏‎‏‏‏‏‎‎‏‎‎‏‎‏‎‏‏‎‎‏‏‎‏‎‏‎‏‎‎‏‎‎‎‎‎‏‎‏‎‎‏‏‎‏‎‎‎‏‎wi-fi scan‎‏‎‎‏‎"</item>
+    <item msgid="8694611243479480497">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‏‎‎‎‏‎‏‎‏‎‎‏‎‏‏‏‎‏‏‎‏‏‎‏‏‏‎‎‎‎‏‎‎‎‏‏‏‎‏‏‎‏‏‎‎‎‏‏‏‎‎‎‏‎‏‏‎‎‎‏‎notification‎‏‎‎‏‎"</item>
+    <item msgid="7776439107987345446">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‏‎‏‏‏‏‏‎‏‎‏‏‎‏‏‏‎‏‏‎‎‎‏‎‏‎‏‎‏‏‎‏‏‎‎‏‎‎‎‎‏‎‏‎‏‎‎‏‎‎‎‎‎‎‏‎‎‏‏‎‎cell scan‎‏‎‎‏‎"</item>
+    <item msgid="514615766544675057">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‎‏‏‏‏‏‎‎‏‎‎‏‎‎‎‏‎‎‏‎‎‎‎‏‎‏‎‎‎‎‎‎‏‎‏‎‎‎‏‎‏‏‎‏‎‏‏‏‏‏‎‎‎‎‏‏‏‏‎‎‎‏‎call phone‎‏‎‎‏‎"</item>
+    <item msgid="8181415497109310680">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‎‎‎‏‏‎‎‎‏‎‏‎‎‎‏‏‏‎‏‎‎‎‎‎‏‏‎‎‎‎‏‏‎‎‎‏‎‎‎‏‎‎‏‏‏‎‎‎‏‏‎‎‏‏‎‏‏‎‎‎‎read SMS‎‏‎‎‏‎"</item>
+    <item msgid="6816551144382117307">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‏‏‏‎‏‎‎‏‏‎‎‏‎‏‎‎‎‎‎‏‎‎‏‎‎‏‏‎‎‏‏‏‎‎‏‎‎‎‏‎‏‏‎‏‏‎‏‏‎‏‎‏‏‎‏‏‏‎‏‏‎write SMS‎‏‎‎‏‎"</item>
+    <item msgid="4600463921908905030">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‏‏‏‏‏‏‎‏‏‎‎‎‎‎‏‎‎‎‎‏‏‎‎‏‎‎‎‎‎‎‎‎‏‎‏‏‎‏‏‎‎‎‎‏‎‏‏‏‎‏‎‎‎‏‎‎‎‏‏‎‎receive SMS‎‏‎‎‏‎"</item>
+    <item msgid="5958926493289432745">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‎‎‏‎‏‎‏‏‎‎‏‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‏‏‏‎‏‎‏‏‎‎‏‎‏‏‏‎‎‏‎‎‎‏‏‎‏‎‏‎‏‎‎‏‎receive emergency SMS‎‏‎‎‏‎"</item>
+    <item msgid="4945269495221089540">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‎‏‎‎‏‎‏‎‎‎‎‏‎‎‏‎‎‎‎‎‎‏‏‎‎‏‏‏‏‎‎‏‏‏‎‏‎‎‏‏‏‎‏‎‎‏‏‏‎‏‎‏‎‎‎‎‎‏‎‎‎receive MMS‎‏‎‎‏‎"</item>
+    <item msgid="5570472453573929087">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‏‏‎‏‎‏‎‎‏‏‏‎‎‏‎‎‏‎‏‏‎‎‏‎‏‏‏‎‏‏‎‏‎‎‏‎‎‏‎‏‏‏‏‏‎‏‏‎‏‎‎‎‎‏‏‏‏‏‏‏‎receive WAP push‎‏‎‎‏‎"</item>
+    <item msgid="7125408150230860501">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‎‎‏‎‏‏‏‎‎‎‏‎‏‎‎‎‏‎‎‎‏‏‏‏‎‏‎‏‏‏‏‎‏‎‏‎‎‎‏‎‏‏‏‏‎‎‎‎‎‎‏‎‏‏‎‏‎‏‎‏‎send SMS‎‏‎‎‏‎"</item>
+    <item msgid="7080337936612188061">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‎‎‏‎‎‏‎‎‎‎‏‎‎‏‏‎‏‎‎‏‏‏‎‏‎‏‏‏‎‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‏‎‏‏‏‏‏‏‎‎‏‏‏‎‏‎read ICC SMS‎‏‎‎‏‎"</item>
+    <item msgid="587124103118495063">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‎‏‎‎‎‎‎‏‎‎‏‎‏‏‏‏‎‎‎‏‎‎‏‎‎‎‎‏‎‏‏‎‏‎‏‎‏‎‏‏‏‎‎‏‎‏‎‎‏‏‏‎‏‎‏‎‏‎‏‏‏‎write ICC SMS‎‏‎‎‏‎"</item>
+    <item msgid="2320577158869025503">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‎‎‎‎‎‎‏‏‎‏‎‎‎‏‎‏‏‎‎‎‏‎‏‎‎‎‎‏‏‎‎‎‏‏‎‎‎‏‎‎‎‏‏‎‎‎‎‎‎‎‏‎‏‏‎‏‏‏‏‏‎modify settings‎‏‎‎‏‎"</item>
+    <item msgid="1545733463471924009">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‎‏‎‏‎‏‏‏‎‎‏‏‏‎‎‎‏‏‎‎‎‏‏‎‎‏‎‏‎‎‏‏‎‏‏‏‏‎‏‎‏‏‎‏‏‎‏‎‎‎‏‏‎‎‏‎‏‎‎‏‎draw on top‎‏‎‎‏‎"</item>
+    <item msgid="3609046903962454582">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‎‎‏‎‎‎‎‏‎‏‎‏‏‏‏‎‏‎‎‏‎‎‎‎‏‎‎‏‏‎‏‎‎‎‎‎‎‏‏‎‎‏‏‏‏‏‎‎‏‎‏‎‎‎‏‏‎‏‏‎‎access notifications‎‏‎‎‏‎"</item>
+    <item msgid="4671646036128214513">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‎‎‎‎‏‏‎‏‎‏‎‏‎‎‎‎‎‏‎‏‎‏‎‏‎‎‎‏‏‎‎‎‎‎‏‏‏‏‎‎‏‎‎‎‏‎‏‎‏‏‎‏‏‏‏‏‎‎‎‏‎camera‎‏‎‎‏‎"</item>
+    <item msgid="1097324338692486211">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‎‏‏‏‏‎‎‏‏‏‎‏‎‎‏‏‏‏‎‏‎‏‎‏‎‏‏‎‎‎‎‎‏‎‎‏‏‎‎‏‎‎‏‏‏‏‏‏‏‎‏‎‎‎‏‎‎‎‎‏‏‎record audio‎‏‎‎‏‎"</item>
+    <item msgid="5031552983987798163">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‎‏‎‏‏‏‎‏‎‎‏‏‏‎‏‎‏‎‏‎‏‏‎‎‎‏‏‏‏‏‎‏‎‏‏‏‎‎‏‎‎‏‏‎‎‏‎‎‎‎‎‎‏‎‎‏‎‎‏‏‎play audio‎‏‎‎‏‎"</item>
+    <item msgid="8374996688066472414">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‎‏‎‎‎‎‏‏‏‎‎‏‏‏‏‏‎‏‏‏‎‎‎‏‏‏‎‏‎‏‏‏‏‎‏‏‎‏‎‎‎‏‏‎‎‏‏‎‏‎‎‏‏‏‎‏‏‏‏‎‎read clipboard‎‏‎‎‏‎"</item>
+    <item msgid="3045529469061083747">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‏‎‏‎‎‏‎‎‎‎‏‏‏‏‏‎‎‏‎‎‏‏‏‎‏‎‏‎‏‎‎‎‏‏‎‎‎‏‎‏‏‏‏‎‏‎‏‏‎‎‏‎‎‏‏‎‎‎‏‏‎modify clipboard‎‏‎‎‏‎"</item>
+    <item msgid="5124443975763747838">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‎‏‏‏‎‎‎‏‏‏‎‏‏‎‏‎‏‏‏‎‏‎‏‎‎‏‎‏‎‎‏‏‏‏‏‎‏‏‎‎‏‎‎‏‏‏‏‎‎‎‏‏‏‏‏‏‏‏‏‎‎media buttons‎‏‎‎‏‎"</item>
+    <item msgid="4547883971364273343">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‏‏‏‏‎‎‎‏‏‏‎‏‎‏‎‏‎‏‎‎‎‏‏‎‎‎‎‎‎‏‎‏‎‎‎‎‏‏‎‏‏‏‎‎‎‎‏‏‏‏‎‎‏‎‏‏‏‏‏‏‎audio focus‎‏‎‎‏‎"</item>
+    <item msgid="2603878814882344450">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‎‏‎‎‎‎‏‎‎‎‏‎‏‏‎‏‎‏‎‏‏‏‏‏‏‏‎‎‎‏‏‏‎‏‏‏‎‎‏‏‏‎‏‎‎‎‏‎‏‏‏‎‎‎‎‎‎‎‏‎‎master volume‎‏‎‎‏‎"</item>
+    <item msgid="7136963238377062018">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‎‎‏‏‎‎‎‎‏‎‏‏‏‎‎‏‎‏‏‎‎‏‎‎‎‎‎‎‏‎‎‎‎‏‏‎‎‏‏‏‏‏‎‎‎‏‏‏‏‏‏‎‏‎‎‎‎‎‏‎‎voice volume‎‏‎‎‏‎"</item>
+    <item msgid="4270236897655923007">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‏‎‏‏‎‏‎‎‎‎‏‎‏‏‏‎‏‏‎‏‏‏‎‏‎‏‎‏‎‏‏‎‏‏‏‏‏‎‎‎‏‏‎‎‎‎‏‎‎‎‎‏‎‎‏‏‏‏‏‏‎ring volume‎‏‎‎‏‎"</item>
+    <item msgid="6325739889222559394">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‎‏‏‏‏‏‎‎‏‎‎‏‏‎‎‎‏‎‏‎‏‏‏‎‏‎‎‏‏‏‏‏‏‏‏‎‏‎‏‎‎‎‎‏‎‎‏‎‎‏‏‎‏‎‏‎‎‎‏‎‎media volume‎‏‎‎‏‎"</item>
+    <item msgid="5762123934816216821">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‏‏‏‏‏‏‏‏‎‏‏‏‎‎‏‎‏‏‎‏‎‎‏‏‎‎‎‎‏‎‎‎‏‏‏‎‎‏‏‏‏‏‏‏‎‎‏‎‎‏‏‎‏‏‏‏‎‏‎‏‎alarm volume‎‏‎‎‏‎"</item>
+    <item msgid="785049718065337473">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‎‏‎‏‎‏‏‏‎‎‏‎‏‎‎‎‎‏‏‏‎‏‎‎‎‏‏‏‏‎‎‏‎‏‎‎‎‎‏‎‎‏‏‏‎‎‎‎‏‎‏‎‎‏‎‎‎‎‎‎‏‎notification volume‎‏‎‎‏‎"</item>
+    <item msgid="6700305533746877052">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‏‏‎‎‏‏‏‏‏‏‎‎‎‏‎‎‎‏‎‎‎‏‏‎‎‎‏‎‎‎‎‏‏‎‎‏‏‎‎‏‎‎‎‏‎‎‎‏‎‎‏‎‎‏‏‏‏‏‎‎‎bluetooth volume‎‏‎‎‏‎"</item>
+    <item msgid="2029227495214047094">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‏‏‎‎‎‎‏‎‏‎‎‏‎‏‎‎‎‎‏‏‏‎‏‎‎‏‏‏‏‏‎‏‎‏‎‎‏‎‏‏‎‎‎‎‎‏‎‏‏‏‏‏‎‏‏‏‎‏‏‎‎keep awake‎‏‎‎‏‎"</item>
+    <item msgid="26109888160231211">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‎‏‏‏‏‎‏‏‏‎‎‏‏‎‎‎‎‏‎‏‏‎‎‏‏‏‎‎‎‎‏‎‎‎‎‏‏‏‎‏‎‏‎‎‏‏‎‏‏‏‏‎‎‏‎‏‎‏‏‎monitor location‎‏‎‎‏‎"</item>
+    <item msgid="5753382310468855812">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‏‏‏‏‏‏‎‏‏‎‎‎‎‎‎‏‏‏‏‎‏‎‏‏‏‎‏‎‏‎‎‎‏‎‎‎‏‎‎‎‎‎‏‏‎‎‏‎‏‎‎‎‎‎‎‎‎‏‎‎‎monitor high power location‎‏‎‎‏‎"</item>
+    <item msgid="3356591542543137332">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‏‏‏‎‏‎‎‏‎‏‎‏‎‎‎‎‎‎‏‎‎‎‏‏‏‎‎‏‎‏‎‏‎‏‎‏‎‏‎‏‏‏‎‏‎‎‏‏‏‎‏‎‎‎‏‏‎‏‎‎‎get usage stats‎‏‎‎‏‎"</item>
+    <item msgid="3073734345226842233">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‏‎‏‎‏‎‏‎‏‎‎‎‎‎‎‏‏‎‎‏‎‎‎‏‏‎‏‎‎‎‎‎‎‏‎‏‎‎‏‎‏‎‎‏‏‏‏‏‎‎‎‎‎‏‏‏‏‎‎‏‎mute/unmute microphone‎‏‎‎‏‎"</item>
+    <item msgid="2111767435887685265">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‏‏‎‏‎‏‎‎‏‏‏‎‏‎‎‎‎‎‎‏‎‏‎‎‏‎‏‏‎‏‎‏‏‎‎‎‎‏‎‏‎‎‏‎‏‎‏‎‏‏‏‎‏‎‎‏‎‎‎‏‎show toast‎‏‎‎‏‎"</item>
+    <item msgid="1091168669714823370">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‎‏‏‏‏‎‎‏‎‎‏‎‎‏‎‎‏‏‏‎‎‎‎‎‏‏‏‏‏‏‎‏‏‎‏‎‎‎‏‏‎‎‎‏‏‎‎‏‏‏‎‎‎‏‏‎‎‏‎‏‎‎project media‎‏‎‎‏‎"</item>
+    <item msgid="485564189219029300">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‎‏‏‏‏‎‏‎‏‏‏‏‎‏‎‎‎‏‎‎‏‎‎‎‎‎‏‏‏‎‏‎‏‏‎‏‏‎‎‎‎‎‏‏‎‏‎‎‎‎‎‎‎‏‎‎‏‏‎‏‎‎‎activate VPN‎‏‎‎‏‎"</item>
+    <item msgid="7155384795265164395">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‎‎‏‏‎‏‎‎‏‏‎‏‎‎‎‎‏‎‎‎‏‎‎‎‏‏‏‏‎‏‏‏‏‎‎‏‎‎‎‎‎‎‏‎‏‏‏‎‎‏‎‎‎‏‏‎‏‎‏‏‎write wallpaper‎‏‎‎‏‎"</item>
+    <item msgid="1835836196806147034">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‏‎‎‏‎‏‏‏‏‎‏‎‎‎‏‏‎‎‏‏‎‏‎‎‏‎‏‏‎‏‎‏‏‎‎‎‎‏‏‎‏‏‏‏‎‎‏‏‏‎‏‏‏‏‎‏‏‎‏‎‎assist structure‎‏‎‎‏‎"</item>
+    <item msgid="5989890403088155055">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‎‎‏‏‎‎‏‎‎‎‎‎‎‏‎‏‏‏‎‏‏‎‎‏‎‏‎‏‏‏‏‏‎‏‏‏‏‎‎‏‎‏‏‏‎‏‎‎‎‎‎‏‏‎‏‎‏‏‏‏‎assist screenshot‎‏‎‎‏‎"</item>
+    <item msgid="8582699692765917557">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‎‏‏‏‎‎‎‏‏‎‏‏‏‏‎‏‏‏‏‏‏‏‏‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‏‎‏‎‏‎‏‏‎‎‎‏‎‏‏‏‎‏‎‏‎read phone state‎‏‎‎‏‎"</item>
+    <item msgid="1474039653814954902">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‎‏‎‎‎‏‏‏‎‏‎‎‏‏‎‏‎‏‏‏‎‏‎‎‎‎‎‏‎‏‎‏‏‏‏‎‎‏‏‏‏‎‏‎‏‏‏‎‏‎‏‏‏‎‎‏‎‏‏‎‎add voicemail‎‏‎‎‏‎"</item>
+    <item msgid="7222837656938871633">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‎‏‎‎‎‎‏‏‏‏‎‎‏‎‏‎‏‏‎‎‏‎‎‏‎‏‎‎‏‎‏‎‏‏‎‎‎‎‏‎‎‏‏‏‏‏‏‏‏‎‏‏‎‏‎‏‎‎‎‏‎use sip‎‏‎‎‏‎"</item>
+    <item msgid="6108267038969274380">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‎‏‎‎‏‏‎‎‎‏‎‎‏‏‏‎‏‏‎‎‏‎‎‎‎‎‏‎‎‏‎‎‏‎‏‎‏‏‏‏‏‏‎‏‏‎‏‎‎‎‎‎‎‎‎‎‏‏‎‎‎process outgoing call‎‏‎‎‏‎"</item>
+    <item msgid="4823402479973873358">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‎‎‏‎‏‏‏‏‎‎‎‎‎‎‏‎‏‎‏‏‎‎‎‎‎‎‎‎‎‎‎‎‎‎‏‏‏‎‎‏‎‏‎‎‏‎‏‏‎‏‏‎‏‏‎‎‏‏‏‎‎fingerprint‎‏‎‎‏‎"</item>
+    <item msgid="5895843015407713543">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‎‎‎‏‏‏‎‏‎‎‏‎‎‎‏‏‏‏‎‏‏‏‏‏‏‏‎‎‎‎‏‎‏‎‎‎‏‏‎‏‏‎‎‎‎‎‏‏‏‏‎‏‎‎‎‎‎‏‏‏‎body sensors‎‏‎‎‏‎"</item>
+    <item msgid="1436446526955010826">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‎‎‏‏‏‏‏‎‏‏‏‏‎‏‎‎‏‎‎‎‏‎‎‎‎‎‎‏‎‏‏‏‎‎‎‏‏‏‏‏‏‏‏‏‎‎‏‏‏‎‏‏‎‎‎‎‏‎‏‎‎read cell broadcasts‎‏‎‎‏‎"</item>
+    <item msgid="884172201575690484">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‎‏‏‎‎‎‏‎‎‎‏‎‏‎‎‏‏‎‏‎‏‏‏‏‎‏‏‏‎‏‏‎‎‏‎‏‏‎‎‏‏‎‎‎‏‏‎‏‏‎‎‎‎‏‏‏‏‎‏‎‎‎mock location‎‏‎‎‏‎"</item>
+    <item msgid="3591971310048485247">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‎‎‎‏‏‏‎‏‏‎‎‏‎‎‏‏‏‏‏‎‏‏‏‎‎‎‎‎‎‎‎‏‏‎‏‎‏‏‎‏‎‏‎‏‏‎‎‏‏‏‏‏‎‏‏‏‏‏‏‏‎read storage‎‏‎‎‏‎"</item>
+    <item msgid="4041187808621866119">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‏‎‎‎‎‎‎‏‎‏‎‏‎‎‏‎‏‏‏‎‏‏‏‎‎‏‏‎‏‎‎‏‏‎‏‏‏‎‎‎‏‎‏‏‏‎‏‎‏‏‎‎‏‎‎‎‎‏‏‏‎write storage‎‏‎‎‏‎"</item>
+    <item msgid="6628873315024166197">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‏‎‏‏‏‏‏‏‏‏‏‎‎‏‏‏‏‏‎‏‎‎‏‎‏‎‎‎‏‎‏‎‎‎‏‏‎‎‎‏‎‏‎‎‏‏‎‏‏‏‎‏‎‎‏‏‎‏‎‏‎turn on screen‎‏‎‎‏‎"</item>
+    <item msgid="3253368931113490863">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‏‏‎‏‎‎‏‎‎‏‏‎‎‏‎‎‏‎‎‏‏‏‎‎‏‏‏‎‎‏‎‎‎‏‏‎‎‏‎‎‏‏‏‏‏‏‎‏‏‎‎‏‏‎‏‎‏‏‏‏‎get accounts‎‏‎‎‏‎"</item>
+    <item msgid="780392378084812901">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‎‏‎‏‎‏‏‎‏‎‏‎‎‏‎‎‎‎‎‏‎‏‎‏‏‏‎‏‏‏‎‏‏‎‎‎‏‎‎‏‎‏‎‏‎‏‏‏‎‏‎‎‎‎‏‏‎‎‏‎‏‎run in background‎‏‎‎‏‎"</item>
+    <item msgid="2629748510881309577">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‎‏‎‎‎‏‏‏‏‏‏‎‏‎‏‏‏‏‏‎‎‏‎‏‎‏‏‎‎‏‏‎‏‏‏‏‏‎‏‏‎‎‎‏‎‏‏‎‎‎‏‏‏‎‎‎‏‎‎‏‎accessibility volume‎‏‎‎‏‎"</item>
+  </string-array>
+  <string-array name="app_ops_labels">
+    <item msgid="6602854600289714121">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‏‎‏‏‏‎‏‎‎‎‏‎‎‎‎‎‏‏‎‏‎‏‎‎‎‏‏‎‏‎‎‎‏‎‎‏‏‏‎‏‎‎‏‎‎‏‏‏‏‏‏‏‏‏‎‎‏‎‎‏‎Location‎‏‎‎‏‎"</item>
+    <item msgid="8677040780775113033">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‏‎‎‎‎‏‏‎‏‎‏‏‎‎‎‎‏‎‏‎‏‎‎‏‏‏‎‏‏‏‏‏‏‏‏‏‏‎‏‎‏‏‎‏‏‏‎‎‎‎‎‏‎‏‎‎‏‎‎‏‎Location‎‏‎‎‏‎"</item>
+    <item msgid="1660743989948992916">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‎‏‏‏‎‎‎‎‏‏‎‎‎‎‏‎‎‏‎‏‏‏‎‏‏‏‎‎‎‎‎‏‏‏‏‏‏‏‎‎‎‏‏‎‎‏‎‎‏‏‎‏‏‎‎‏‎‏‎‎‎Location‎‏‎‎‏‎"</item>
+    <item msgid="8791172739860195290">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‏‎‏‎‎‎‎‎‎‎‎‎‏‎‎‎‎‏‎‏‎‎‎‎‎‏‏‏‎‏‏‏‏‏‏‎‎‏‏‏‎‏‏‎‏‏‏‎‎‏‏‏‏‏‎‏‏‎‏‎‎Vibrate‎‏‎‎‏‎"</item>
+    <item msgid="383413555642128046">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‎‏‏‏‎‏‎‏‎‏‎‎‏‎‎‎‏‎‏‎‎‎‏‎‎‏‏‎‎‎‏‏‏‏‎‎‏‎‎‎‎‏‏‏‏‎‎‏‎‏‎‏‏‎‏‎‏‎‏‏‏‎‎Read contacts‎‏‎‎‏‎"</item>
+    <item msgid="3654594895269697313">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‎‎‏‎‏‎‏‏‎‏‏‏‏‎‏‏‏‎‏‎‏‎‏‏‎‎‎‏‏‏‎‎‎‎‏‎‏‎‎‎‎‎‎‏‏‎‎‏‎‏‏‏‎‎‏‎‎‎‎‏‎Modify contacts‎‏‎‎‏‎"</item>
+    <item msgid="7928393476362362538">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‏‏‏‎‎‎‎‎‎‏‏‏‎‏‎‎‏‏‏‏‏‏‎‏‏‏‎‎‎‎‏‏‏‏‏‎‎‎‎‏‏‎‏‎‎‏‎‏‏‏‏‎‏‎‏‎‏‎‏‎‎Read call log‎‏‎‎‏‎"</item>
+    <item msgid="6248591205254641116">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‎‏‏‎‏‎‏‏‎‏‏‏‎‏‏‏‎‏‎‎‏‎‎‏‏‎‎‎‎‎‏‏‏‏‏‏‏‏‎‏‎‏‎‏‎‎‏‏‎‏‎‏‏‏‎‏‏‏‎‎‎Modify call log‎‏‎‎‏‎"</item>
+    <item msgid="6093344633066170692">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‎‏‎‎‏‎‎‎‏‏‏‏‏‏‏‎‏‎‎‎‏‎‏‎‏‎‎‎‏‏‏‎‏‎‏‏‏‏‏‏‎‎‎‏‎‎‏‎‏‎‎‏‎‏‎‎‎‏‎‎‎Read calendar‎‏‎‎‏‎"</item>
+    <item msgid="1334886368750347692">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‎‎‏‎‏‎‎‎‎‏‏‎‎‏‏‏‏‎‎‎‎‎‎‏‎‏‎‎‎‏‏‏‎‎‎‎‏‏‏‎‎‎‎‎‎‎‏‎‎‏‎‏‏‎‏‎‏‏‎‎‎Modify calendar‎‏‎‎‏‎"</item>
+    <item msgid="1638204101698708656">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‎‏‏‎‏‎‏‏‏‏‎‎‎‎‎‏‎‎‎‏‏‏‏‏‎‎‏‏‎‏‏‎‏‏‏‏‎‏‎‏‎‏‏‎‏‏‏‎‎‏‎‎‏‎‏‏‎‎‎‎‎Location‎‏‎‎‏‎"</item>
+    <item msgid="2154671955760380322">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‏‏‎‏‏‏‏‎‎‏‏‎‏‏‏‎‏‏‏‎‏‎‏‏‏‎‏‎‎‏‎‏‎‎‏‎‏‎‎‏‎‏‏‏‏‏‏‏‏‎‎‏‏‎‏‎‎‎‏‎‎Post notification‎‏‎‎‏‎"</item>
+    <item msgid="4282477730595931828">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‏‎‏‏‎‏‏‎‏‏‏‎‎‏‏‎‏‎‏‎‏‏‎‎‏‏‏‎‎‏‏‏‎‎‏‎‏‎‏‏‎‎‎‏‎‎‎‎‎‏‏‎‏‎‏‏‎‏‎‎‎Location‎‏‎‎‏‎"</item>
+    <item msgid="4891423912898525905">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‎‎‏‏‏‏‏‎‎‎‎‏‏‏‎‏‎‏‎‎‎‎‏‎‎‎‏‎‎‎‎‎‎‏‏‎‎‎‏‎‏‎‏‎‏‏‏‏‏‎‏‎‏‏‎‏‎‎‎‏‎Call phone‎‏‎‎‏‎"</item>
+    <item msgid="2623604824935968113">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‎‏‎‎‎‏‏‎‏‎‎‎‏‏‏‎‏‎‏‎‏‎‏‏‎‎‎‎‎‎‎‏‎‏‎‏‎‏‎‎‏‏‏‏‎‎‏‎‏‏‎‏‎‏‏‏‎‎‎‏‎Read SMS/MMS‎‏‎‎‏‎"</item>
+    <item msgid="4420177125221176306">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‏‏‎‏‎‏‎‏‎‏‏‏‏‎‎‏‏‏‏‏‏‎‏‎‏‏‎‏‎‎‏‎‎‎‎‏‎‎‎‏‏‏‎‏‏‎‎‏‎‎‏‏‏‏‏‏‎‎‏‎‎Write SMS/MMS‎‏‎‎‏‎"</item>
+    <item msgid="3986142739951490025">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‎‏‏‏‎‏‎‏‎‎‎‏‏‎‎‏‏‏‏‏‏‎‏‏‎‎‏‏‏‏‎‏‎‏‏‎‏‏‎‎‏‏‏‏‏‎‎‏‎‎‏‏‏‏‏‎‏‎‎‏‎Receive SMS/MMS‎‏‎‎‏‎"</item>
+    <item msgid="3984213795861739778">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‎‏‏‏‎‏‎‎‏‎‏‎‏‏‎‎‎‏‎‏‎‏‎‏‎‏‏‎‏‎‎‎‏‎‏‏‏‎‎‎‏‏‎‎‏‎‏‏‏‎‎‏‎‎‎‎‎‎‏‎‎Receive SMS/MMS‎‏‎‎‏‎"</item>
+    <item msgid="3656243523752472788">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‎‎‏‎‏‎‏‏‏‏‎‏‏‎‎‏‎‏‏‎‎‎‎‏‏‏‎‎‏‏‏‏‏‏‎‏‏‎‎‏‎‏‏‎‏‎‏‏‎‎‎‎‏‏‎‏‎‏‎‎‎Receive SMS/MMS‎‏‎‎‏‎"</item>
+    <item msgid="8105802370238551510">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‎‎‎‎‎‏‏‏‏‏‎‏‏‎‎‏‏‎‎‎‎‏‎‎‏‏‏‏‎‎‏‏‎‎‎‏‏‎‎‏‎‏‏‎‏‎‎‏‎‏‎‏‏‏‎‏‎‏‏‎‎Receive SMS/MMS‎‏‎‎‏‎"</item>
+    <item msgid="1407766984645388488">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‎‎‏‏‏‎‎‎‏‎‎‏‎‏‏‎‎‏‎‎‏‎‎‏‏‏‎‏‎‎‏‎‎‏‏‎‎‏‎‎‏‏‏‏‏‎‏‎‏‎‎‎‏‏‎‎‏‎‎‎‎Send SMS/MMS‎‏‎‎‏‎"</item>
+    <item msgid="3527273606643794973">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‎‎‎‎‏‏‏‏‎‎‏‏‎‏‏‎‎‏‎‎‏‎‏‎‏‎‎‎‎‎‏‎‏‏‎‏‏‎‎‏‏‏‎‏‎‏‎‎‎‏‎‎‎‎‎‏‏‏‎‏‎Read SMS/MMS‎‏‎‎‏‎"</item>
+    <item msgid="4370895547001583812">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‏‏‎‎‏‎‏‎‏‎‎‎‏‎‎‎‏‎‏‎‎‏‎‏‎‏‏‏‏‎‎‎‏‏‎‏‎‏‎‏‏‏‎‏‏‎‏‏‏‎‎‎‏‏‎‎‎‏‎‎‎Write SMS/MMS‎‏‎‎‏‎"</item>
+    <item msgid="4218544235221631789">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‏‎‏‎‏‎‎‎‏‎‏‏‎‏‎‎‎‏‏‏‏‎‏‎‎‎‎‏‏‎‎‏‎‎‎‏‏‎‏‎‏‎‎‎‎‏‎‎‎‎‏‏‎‎‏‎‏‏‎‏‎Modify settings‎‏‎‎‏‎"</item>
+    <item msgid="736541391767350377">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‎‏‎‏‎‎‎‏‏‏‎‎‎‏‎‏‏‏‎‎‎‎‏‏‏‏‏‏‎‎‏‎‏‎‎‏‎‏‎‏‎‏‎‏‎‎‎‏‎‏‏‎‎‎‏‏‎‏‎‎‏‎Draw on top‎‏‎‎‏‎"</item>
+    <item msgid="5530815681721654194">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‏‏‎‎‏‏‎‎‎‎‎‏‎‏‏‎‎‏‏‏‏‎‎‎‏‏‏‏‎‎‎‏‏‎‏‏‎‎‏‎‏‏‎‏‏‏‎‏‏‎‏‏‏‎‏‏‎‎‏‎‎Access notifications‎‏‎‎‏‎"</item>
+    <item msgid="781213371706962767">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‎‏‎‏‎‏‏‎‏‎‏‏‏‎‏‏‎‏‏‎‏‎‏‏‎‏‏‎‎‎‎‏‎‏‎‏‎‎‏‏‎‎‎‎‎‏‏‏‏‎‎‏‏‎‏‎‎‏‏‏‏‎Camera‎‏‎‎‏‎"</item>
+    <item msgid="1720492593061838172">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‎‏‏‏‏‏‏‎‎‎‎‎‎‏‏‎‏‎‏‎‏‏‏‎‎‏‎‏‏‏‎‏‏‎‎‎‎‎‏‎‎‏‎‎‎‎‏‏‏‏‎‏‎‏‎‏‏‏‎‎‎Record audio‎‏‎‎‏‎"</item>
+    <item msgid="3493046322001257041">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‎‎‎‎‎‏‏‏‏‎‎‏‏‏‎‎‏‎‏‏‎‎‎‏‏‏‏‏‎‏‏‏‎‏‏‎‏‏‎‏‏‏‏‎‏‎‏‎‎‎‏‎‎‏‎‏‎‎‎‏‎Play audio‎‏‎‎‏‎"</item>
+    <item msgid="136815868796597058">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‎‎‏‏‏‏‏‎‎‏‏‎‎‎‎‏‎‎‎‏‎‏‎‎‏‏‏‎‏‏‎‎‏‎‏‏‎‏‎‎‎‎‎‏‏‏‏‏‎‎‏‏‎‏‎‎‎‎‏‎‎Read clipboard‎‏‎‎‏‎"</item>
+    <item msgid="5238692940326972503">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‏‎‎‎‏‎‏‏‎‎‏‏‏‎‎‏‎‎‏‏‎‏‏‏‏‎‎‏‎‎‏‏‎‎‏‏‏‎‎‎‏‎‎‏‎‎‏‎‏‏‎‎‎‏‎‏‎‏‏‏‎Modify clipboard‎‏‎‎‏‎"</item>
+    <item msgid="5753789168376302997">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‏‏‏‏‏‏‎‏‏‎‎‏‏‎‎‏‎‎‎‎‏‏‎‎‎‎‏‏‏‎‎‎‎‏‎‏‏‎‎‎‏‏‏‏‎‏‎‎‏‏‎‏‏‎‎‏‎‏‎‏‎Media buttons‎‏‎‎‏‎"</item>
+    <item msgid="3265262911688671938">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‏‏‎‏‎‏‎‏‎‎‎‎‏‎‎‎‏‎‏‏‎‏‎‏‎‎‎‏‎‏‏‎‏‏‎‏‎‏‏‏‎‏‏‎‎‎‎‎‎‎‏‎‏‏‎‎‎‎‏‎‎Audio focus‎‏‎‎‏‎"</item>
+    <item msgid="2098976479485046797">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‏‏‎‏‎‎‏‎‎‎‎‏‎‎‎‎‏‏‏‏‏‏‏‏‏‏‎‎‏‎‏‏‏‎‏‏‏‎‎‏‏‎‏‏‎‎‏‏‎‎‎‎‎‎‎‎‏‏‎‏‎Master volume‎‏‎‎‏‎"</item>
+    <item msgid="5660213838861789350">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‏‏‏‎‏‎‎‎‏‏‎‏‎‎‎‏‏‏‏‎‎‏‏‏‏‏‏‏‎‏‎‏‎‎‏‎‎‎‎‏‏‎‏‏‎‏‏‎‏‎‎‎‏‎‏‎‎‏‏‎‎Voice volume‎‏‎‎‏‎"</item>
+    <item msgid="7983336752371254444">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‏‏‏‎‏‏‎‎‏‎‏‎‏‎‎‎‎‎‏‎‎‏‏‏‏‎‏‎‏‎‎‎‏‏‏‏‎‏‏‎‏‎‎‎‏‏‎‎‎‏‎‎‏‎‏‎‏‏‎‎‎Ring volume‎‏‎‎‏‎"</item>
+    <item msgid="7878027809189330917">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‏‏‎‏‎‏‎‏‎‏‎‎‎‏‏‎‎‎‎‎‏‎‎‎‏‏‎‏‏‎‎‎‏‎‎‏‎‏‏‎‎‎‎‎‏‏‏‏‏‏‏‏‏‏‏‎‎‏‎‏‎Media volume‎‏‎‎‏‎"</item>
+    <item msgid="7260546305036218513">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‎‏‎‎‏‏‎‎‎‎‏‎‏‎‏‎‎‏‎‎‎‏‏‎‎‏‎‏‎‏‏‏‏‎‏‎‏‏‏‏‎‏‎‏‎‏‏‏‎‎‎‎‏‎‎‏‎‎‎‏‎Alarm volume‎‏‎‎‏‎"</item>
+    <item msgid="9103719301075748925">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‏‏‏‎‎‏‎‏‎‏‏‎‏‏‏‎‏‎‎‎‎‏‏‏‏‎‎‎‏‎‎‎‎‎‏‏‎‏‏‏‏‏‎‎‏‏‎‎‏‎‎‎‎‎‏‏‏‏‎‏‎Notification volume‎‏‎‎‏‎"</item>
+    <item msgid="7025966722295861512">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‎‎‎‏‏‎‎‎‎‎‎‏‎‎‏‏‏‏‏‏‏‎‎‎‎‎‏‎‎‎‏‏‏‏‏‎‎‎‏‎‏‎‎‏‎‎‎‏‎‎‎‏‎‎‎‎‏‎‎‎‎Bluetooth volume‎‏‎‎‏‎"</item>
+    <item msgid="4665183401128289653">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‎‎‎‎‏‎‏‏‏‏‏‎‎‎‎‎‏‏‏‏‏‎‎‏‎‏‏‎‎‎‎‎‏‏‎‎‎‏‎‎‏‏‎‎‏‏‏‎‎‏‎‏‎‏‏‏‎‏‎‏‎Keep awake‎‏‎‎‏‎"</item>
+    <item msgid="8584357129746649222">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‎‏‏‏‎‎‏‎‎‎‎‏‏‏‎‎‎‎‏‏‎‏‎‏‎‎‏‏‏‏‎‏‏‏‏‏‏‎‏‎‎‏‎‎‎‎‎‏‎‎‎‎‏‎‎‎‎‏‏‎‎Location‎‏‎‎‏‎"</item>
+    <item msgid="7669257279311110599">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‏‎‏‎‎‏‏‎‏‏‏‎‏‎‏‎‏‏‎‎‏‏‎‏‏‏‎‎‏‎‏‏‎‎‎‎‎‏‏‎‏‎‏‎‏‏‏‎‎‎‎‏‏‏‎‎‎‏‏‏‎Location‎‏‎‎‏‎"</item>
+    <item msgid="3459320345690097795">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‎‎‎‎‎‎‎‎‎‎‎‏‏‏‏‏‏‎‎‏‏‎‎‎‎‏‏‎‏‎‏‏‎‎‎‏‎‎‏‎‎‎‏‏‏‏‎‎‏‎‎‎‏‎‎‎‎‎‏‏‎Get usage stats‎‏‎‎‏‎"</item>
+    <item msgid="1312534577834048535">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‎‎‏‎‎‎‏‏‎‏‏‏‎‎‎‎‏‏‏‏‎‎‏‏‏‏‏‎‏‎‎‏‎‎‏‏‎‎‏‏‎‏‏‏‎‎‏‏‏‏‎‎‎‎‎‏‎‏‏‏‎Mute/unmute microphone‎‏‎‎‏‎"</item>
+    <item msgid="427580389823724225">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‎‏‏‏‎‏‏‏‏‎‏‏‏‏‎‎‎‏‎‎‏‎‎‎‎‏‏‎‎‏‎‏‏‎‎‎‎‎‎‏‎‏‏‏‎‏‏‎‏‏‏‎‏‎‏‏‎‎‎‎‎‏‎Show toast‎‏‎‎‏‎"</item>
+    <item msgid="4992007785575926253">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‎‏‎‏‎‏‎‎‎‏‏‏‎‎‏‎‏‏‎‎‏‎‏‎‎‎‎‏‏‏‎‏‎‏‏‏‎‎‏‏‏‏‎‎‏‏‎‎‏‎‎‏‏‏‏‎‏‏‎‏‎Project media‎‏‎‎‏‎"</item>
+    <item msgid="2482631530338029480">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‎‎‏‎‎‏‏‏‎‏‎‎‎‎‎‏‎‏‎‎‎‎‏‏‏‎‎‏‎‎‏‎‏‎‎‏‏‏‏‏‏‎‏‏‏‎‎‎‏‏‏‏‏‎‏‎‏‎‎‎‎Activate VPN‎‏‎‎‏‎"</item>
+    <item msgid="1662979573471871926">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‎‏‏‏‎‎‎‏‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‏‏‏‎‎‎‏‏‏‏‎‎‏‏‎‎‎‎‏‎‏‏‎‎‎‎‎‏‏‏‎‏‏‎‏‏‎‎Write wallpaper‎‏‎‎‏‎"</item>
+    <item msgid="5964768335278263478">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‎‎‏‎‏‏‎‎‎‏‏‏‎‎‎‏‏‏‎‏‎‎‏‏‎‎‏‎‏‎‏‏‏‏‏‏‏‏‎‎‎‎‏‎‎‏‎‎‏‏‎‎‏‎‏‏‎‏‏‎‎Assist structure‎‏‎‎‏‎"</item>
+    <item msgid="2657138701132782702">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‎‏‎‎‏‏‏‎‎‎‎‎‎‎‎‎‏‏‎‏‏‎‎‏‎‎‏‎‎‎‎‎‏‏‏‏‏‏‏‏‎‏‏‎‎‏‎‏‏‏‎‎‎‏‏‎‏‏‏‎‎Assist screenshot‎‏‎‎‏‎"</item>
+    <item msgid="8571369610363539266">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‎‏‏‎‏‏‏‏‎‎‏‏‏‎‎‏‏‏‏‏‎‎‏‏‏‏‏‏‎‏‏‎‎‎‎‎‎‏‎‎‏‏‎‎‎‎‎‎‏‏‏‏‎‏‎‎‎‎‏‎‎Read phone state‎‏‎‎‏‎"</item>
+    <item msgid="4542463358215230845">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‏‏‏‏‎‎‎‎‏‎‏‎‎‎‎‏‎‎‏‎‎‏‎‏‏‎‏‏‎‏‏‏‎‏‏‏‏‎‏‎‎‏‎‏‏‎‎‏‎‏‎‏‎‏‏‏‏‏‎‏‎Add voicemail‎‏‎‎‏‎"</item>
+    <item msgid="864565065016166003">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‎‏‎‏‏‏‏‏‏‏‏‏‏‏‎‎‎‏‏‎‏‎‏‎‏‏‎‎‎‏‎‎‏‎‎‎‏‏‎‎‎‎‎‎‎‎‏‎‎‎‏‏‎‎‏‏‏‎‎‏‏‎Use sip‎‏‎‎‏‎"</item>
+    <item msgid="1958009349883195116">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‏‎‏‏‎‎‏‎‏‏‎‎‎‎‏‏‏‏‏‏‎‎‏‎‎‎‎‏‎‎‏‏‎‏‏‎‏‎‏‎‏‏‏‎‎‏‏‎‏‏‏‎‏‏‏‎‏‏‎‎‎Process outgoing call‎‏‎‎‏‎"</item>
+    <item msgid="8526563410140613458">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‎‏‏‎‎‏‎‏‎‏‎‎‎‏‏‏‎‎‎‎‎‎‏‏‏‏‏‎‏‏‏‏‎‎‎‎‎‏‎‎‎‏‏‎‎‏‎‎‏‎‏‏‎‏‎‏‎‎‏‎‎Fingerprint‎‏‎‎‏‎"</item>
+    <item msgid="7864822459293570891">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‏‏‎‏‎‎‏‎‎‏‎‏‎‏‏‏‎‏‏‎‎‏‎‏‏‎‏‏‎‏‏‎‏‎‏‏‏‎‏‏‎‏‎‏‎‎‎‏‎‏‏‏‎‏‎‎‏‎‏‏‎Body sensors‎‏‎‎‏‎"</item>
+    <item msgid="6798698496904810960">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‏‏‏‎‎‏‎‏‏‎‎‏‏‏‎‏‎‏‎‎‎‏‎‎‎‎‏‏‎‎‎‎‏‎‏‎‏‏‏‏‏‏‏‎‎‏‎‏‎‎‎‏‏‏‎‏‎‎‎‎‎Read cell broadcasts‎‏‎‎‏‎"</item>
+    <item msgid="5242052845700875820">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‎‎‎‏‏‎‏‎‎‏‎‏‎‎‎‏‎‎‎‎‏‏‏‎‏‎‎‏‏‏‎‎‎‎‏‏‎‎‎‏‎‏‏‎‎‎Mock location‎‏‎‎‏‎"</item>
+    <item msgid="1246296877820358565">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‎‎‎‏‎‏‎‎‏‎‏‏‏‎‏‏‏‏‎‎‎‏‏‎‏‎‎‎‎‎‏‏‏‏‏‏‎‎‏‎‏‎‎‏‎‎‏‎‏‏‏‏‏‎‏‎‎‏‎‏‎Read storage‎‏‎‎‏‎"</item>
+    <item msgid="2404067308793740341">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‎‎‎‏‎‏‎‏‏‏‎‎‏‏‏‏‎‏‏‎‎‏‏‏‏‎‏‎‏‏‏‎‎‏‎‎‏‏‎‎‎‏‏‏‏‎‏‏‏‏‎‎‎‎‏‏‎‏‎‏‎Write storage‎‏‎‎‏‎"</item>
+    <item msgid="5832543806893763620">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‎‎‎‎‏‏‏‏‎‎‎‏‎‏‎‏‏‎‏‏‏‎‏‏‎‎‎‎‏‎‏‏‎‎‏‎‏‏‎‎‏‏‏‎‏‎‏‎‏‏‎‎‎‎‏‎‎‏‎‎‎Turn on screen‎‏‎‎‏‎"</item>
+    <item msgid="5258373962467495905">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‏‎‎‎‏‏‏‏‏‎‎‏‎‏‏‏‏‏‏‏‎‏‎‎‎‎‏‎‎‏‎‎‎‎‎‏‎‎‎‎‏‎‎‏‏‏‎‎‏‏‏‏‏‏‏‎‎‎‎‏‎Get accounts‎‏‎‎‏‎"</item>
+    <item msgid="334625385979270703">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‎‏‏‏‎‎‏‎‏‎‎‏‎‎‏‏‎‏‎‏‎‎‎‎‎‎‎‏‎‎‎‎‎‎‎‎‎‎‎‎‎‏‏‏‏‏‎‏‎‏‎‏‏‎‎‎‏‎‏‏‏‏‎Run in background‎‏‎‎‏‎"</item>
+    <item msgid="9039213578110332702">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‏‏‎‏‎‏‏‏‎‎‎‏‏‎‏‏‏‏‎‎‏‏‎‏‏‎‏‏‏‎‎‎‎‏‎‎‎‎‏‎‎‏‏‏‎‏‏‎‏‏‏‏‎‎‎‏‏‏‏‎‎Accessibility volume‎‏‎‎‏‎"</item>
+  </string-array>
+  <string-array name="long_press_timeout_selector_titles">
+    <item msgid="3511504869290423954">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‎‎‎‎‏‎‏‏‏‎‏‏‎‏‎‏‏‏‏‏‎‎‎‏‎‎‏‎‏‏‏‎‏‎‎‏‎‎‎‏‏‏‎‎‎‎‏‏‎‏‏‎‏‎‎‏‎‎‏‎‎Short‎‏‎‎‏‎"</item>
+    <item msgid="2560532955514699713">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‎‎‏‏‏‎‎‎‏‎‎‎‏‏‎‏‎‏‏‏‎‎‏‎‏‎‎‎‎‎‏‎‎‎‎‏‎‎‏‎‎‎‏‎‎‏‏‏‏‏‏‏‏‏‎‎‎‎‎‏‎Medium‎‏‎‎‏‎"</item>
+    <item msgid="2372711992605524591">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‎‎‎‎‏‏‏‎‏‏‎‏‏‎‎‏‎‎‎‎‏‏‏‏‏‏‎‎‎‏‏‏‎‎‎‏‏‎‎‎‏‏‏‏‏‏‎‎‎‎‏‎‎‏‏‎‏‏‏‏‎Long‎‏‎‎‏‎"</item>
+  </string-array>
+  <string-array name="captioning_typeface_selector_titles">
+    <item msgid="1319652728542138112">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‎‎‏‎‎‏‎‏‎‎‎‎‎‏‎‏‏‎‎‏‎‎‏‎‏‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‎‎‎‏‎‎‎‎‏‏‏‏‎‎‎‎‎‎‎‎‎Default‎‏‎‎‏‎"</item>
+    <item msgid="1016452621833735880">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‎‏‏‏‎‎‎‎‏‏‎‏‏‎‎‏‎‏‎‏‎‎‏‎‎‎‏‏‎‎‎‏‎‏‏‏‏‎‏‏‎‏‎‏‎‎‎‎‎‏‏‏‎‏‏‎‎‏‎‎‎‎Sans-serif‎‏‎‎‏‎"</item>
+    <item msgid="2496277987934654454">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‎‎‏‎‏‎‏‎‎‏‎‎‏‎‎‎‏‏‏‏‏‎‎‏‏‎‏‎‏‎‏‎‏‎‏‏‎‏‏‏‏‎‎‎‏‏‎‎‏‏‏‏‏‏‏‏‎‏‏‎‎Sans-serif condensed‎‏‎‎‏‎"</item>
+    <item msgid="7247838127505318669">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‎‏‎‎‏‎‎‏‎‏‎‏‎‏‏‏‏‏‏‎‎‏‏‎‎‎‎‎‎‏‎‏‎‎‏‏‎‏‏‏‏‏‎‎‏‎‏‎‎‎‏‏‎‎‎‎‏‏‎‏‎Sans-serif monospace‎‏‎‎‏‎"</item>
+    <item msgid="4478414822462359763">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‏‏‏‎‎‎‏‎‎‏‏‎‏‎‎‎‎‏‏‎‏‎‎‎‏‏‎‏‏‎‏‎‏‎‎‏‏‎‏‏‎‏‏‎‏‎‎‎‏‎‎‎‏‏‎‏‎‎‏‏‎Serif‎‏‎‎‏‎"</item>
+    <item msgid="7502451783483660829">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‏‎‎‎‎‎‎‏‏‏‏‎‎‎‎‏‎‎‎‎‎‎‏‎‎‏‎‏‏‎‏‏‏‎‏‏‎‎‎‎‏‎‏‎‎‎‎‏‏‎‏‎‎‎‎‏‏‏‎‏‎Serif monospace‎‏‎‎‏‎"</item>
+    <item msgid="639503332147461010">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‎‏‎‎‎‏‏‎‏‏‏‏‏‏‏‏‏‏‎‎‎‏‏‏‎‎‏‎‎‎‏‏‏‎‎‎‏‎‏‎‏‎‎‏‏‏‏‏‏‏‎‏‏‏‎‎‏‎‎‏‎‎Casual‎‏‎‎‏‎"</item>
+    <item msgid="7967169925231332424">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‏‏‏‎‏‎‎‏‎‎‎‏‎‎‎‏‎‎‏‎‏‏‎‏‎‏‎‏‏‏‎‎‏‎‏‎‏‎‎‏‎‏‏‎‏‏‎‎‏‏‎‎‎‏‎‎‏‎‎‎‎Cursive‎‏‎‎‏‎"</item>
+    <item msgid="561832997193039673">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‎‏‏‏‏‏‏‏‎‎‏‏‎‎‎‎‎‎‏‎‎‎‎‎‏‎‎‎‏‎‎‏‎‏‏‏‎‎‏‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‎‎‏‏‏‎‎‏‎Small capitals‎‏‎‎‏‎"</item>
+  </string-array>
+  <string-array name="captioning_font_size_selector_titles">
+    <item msgid="4800919809575254054">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‎‎‏‎‏‎‏‎‎‎‎‎‎‏‎‎‏‎‏‏‎‎‏‎‎‎‎‏‎‏‏‎‎‏‎‎‏‏‎‏‏‏‏‎‎‏‏‏‏‎‎‎‎‎‏‎‎‏‏‎‎Very small‎‏‎‎‏‎"</item>
+    <item msgid="6781094565687692782">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‏‏‏‎‎‎‎‏‏‎‏‏‎‏‎‎‏‎‎‏‏‎‎‏‎‏‎‎‎‏‏‎‏‎‎‎‎‎‏‎‎‏‎‏‏‎‎‎‏‏‎‏‏‏‏‎‏‏‏‎‎Small‎‏‎‎‏‎"</item>
+    <item msgid="8222123259497646551">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‎‎‏‎‎‎‎‏‏‎‏‎‏‏‎‏‏‎‎‏‏‎‎‎‏‎‏‎‏‎‏‏‎‏‎‏‏‏‎‏‎‏‎‏‏‎‎‎‏‎‎‏‏‏‎‏‎‏‏‏‎Normal‎‏‎‎‏‎"</item>
+    <item msgid="5813217276778560466">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‎‎‎‎‏‎‏‎‏‏‎‎‏‎‏‏‎‎‏‎‎‏‎‏‎‎‎‎‎‏‎‎‎‎‎‎‏‎‎‎‏‏‎‎‏‎‏‏‏‎‏‏‏‏‎‏‎‎‏‎‎Large‎‏‎‎‏‎"</item>
+    <item msgid="9044232017390975191">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‏‏‎‏‏‎‎‎‎‎‏‏‏‎‎‏‎‎‎‏‎‎‎‏‏‎‎‏‏‏‏‏‎‏‏‎‏‏‎‎‏‏‎‏‏‎‏‏‏‎‎‎‏‏‎‏‎‏‏‏‎Very large‎‏‎‎‏‎"</item>
+  </string-array>
+  <string-array name="captioning_edge_type_selector_titles">
+    <item msgid="4733815704128258753">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‎‎‎‏‏‎‏‏‎‎‎‏‏‏‏‎‎‏‎‎‎‏‎‎‏‏‎‏‎‏‎‏‎‏‎‎‏‎‏‏‏‎‏‏‎‎‎‎‎‎‏‎‏‏‎‎‎‎‎‏‎Default‎‏‎‎‏‎"</item>
+    <item msgid="3217099060748617005">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‏‏‎‎‏‎‏‎‎‏‎‏‎‏‏‎‏‏‏‎‏‎‎‎‏‏‎‏‎‎‎‎‎‎‏‏‎‎‏‎‏‎‏‎‎‎‎‎‎‏‎‏‎‎‏‎‏‏‎‏‎None‎‏‎‎‏‎"</item>
+    <item msgid="7467615139904599420">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‎‏‏‏‏‎‏‎‎‎‏‎‎‏‎‎‏‏‎‎‎‏‏‎‎‏‏‏‏‎‎‏‎‏‎‏‎‏‎‏‎‏‏‏‏‎‏‏‎‏‎‏‎‏‏‏‏‏‎‎‎Outline‎‏‎‎‏‎"</item>
+    <item msgid="5623165557468608975">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‏‏‏‎‎‎‎‎‏‎‎‏‎‏‏‏‏‏‏‏‎‏‎‎‏‎‎‎‎‎‎‏‏‏‏‎‎‎‏‎‎‎‎‎‏‎‏‏‏‎‎‏‏‏‎‎‏‏‏‏‎Drop shadow‎‏‎‎‏‎"</item>
+    <item msgid="8088451174058214588">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‎‎‎‎‎‎‏‏‏‏‏‏‏‏‏‏‎‎‏‏‎‏‏‏‏‏‎‏‎‎‎‎‎‏‎‎‏‏‎‏‎‏‎‎‏‏‎‎‎‏‎‎‏‎‏‏‏‏‎‎‎Raised‎‏‎‎‏‎"</item>
+    <item msgid="3821418743395480313">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‎‏‎‏‎‎‎‎‏‎‎‎‎‏‏‎‏‎‎‎‎‎‎‏‏‎‎‏‏‎‏‏‎‎‏‎‎‎‎‏‏‎‏‏‎‏‏‏‎‎‏‎‏‏‏‏‏‎‎‏‎Depressed‎‏‎‎‏‎"</item>
+  </string-array>
+  <string-array name="captioning_opacity_selector_titles">
+    <item msgid="7622491218136667566">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‏‎‎‏‏‏‎‎‏‎‎‎‏‎‎‎‎‏‏‏‎‏‏‎‎‎‎‎‏‎‎‏‎‎‎‎‏‎‎‏‎‎‏‎‎‎‎‏‎‏‎‏‏‎‏‎‏‏‏‎‎25%‎‏‎‎‏‎"</item>
+    <item msgid="2367156416247936773">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‎‎‎‎‏‏‎‏‏‎‎‏‏‏‎‏‎‏‎‎‎‎‏‏‏‎‎‎‎‎‎‎‎‏‏‎‎‎‏‏‏‏‏‎‏‎‏‏‎‏‏‏‎‎‎‎‎‏‎‏‎50%‎‏‎‎‏‎"</item>
+    <item msgid="5395560410107149298">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‏‎‏‎‏‏‏‎‎‎‎‎‏‏‏‎‎‎‎‏‏‎‎‏‏‎‏‏‎‎‏‎‏‎‎‎‏‎‎‏‏‎‎‎‏‏‏‏‏‎‏‏‏‏‏‏‎‎‏‎‎75%‎‏‎‎‏‎"</item>
+    <item msgid="8342334626783983353">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‎‎‏‏‏‏‎‎‎‏‎‏‏‏‏‎‏‏‎‏‎‎‏‎‎‏‎‎‏‎‏‏‏‎‏‎‏‏‏‎‎‏‏‎‎‏‏‏‎‏‏‎‏‏‏‏‏‎‎‏‎100%‎‏‎‎‏‎"</item>
+  </string-array>
+  <string-array name="captioning_preset_selector_titles">
+    <item msgid="7009918361545506251">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‎‎‎‏‎‏‎‎‏‎‎‎‎‎‏‏‏‎‏‏‏‎‎‏‏‏‎‎‎‎‎‏‎‏‎‎‎‏‏‎‏‎‎‎‎‏‏‏‏‏‎‏‏‏‎‎‏‎‏‏‎Use app defaults‎‏‎‎‏‎"</item>
+    <item msgid="1770533843436933500">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‏‎‎‎‏‎‎‏‎‎‏‎‎‎‏‏‎‎‏‏‎‎‏‎‎‏‏‎‎‏‏‎‎‎‎‎‏‏‎‏‏‏‎‏‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‎‎White on black‎‏‎‎‏‎"</item>
+    <item msgid="758587126802411846">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‎‏‎‏‎‏‎‎‎‎‏‏‏‎‎‎‎‏‎‏‎‏‏‏‏‏‎‎‏‎‎‎‎‎‎‎‎‎‎‏‏‏‏‎‏‏‏‏‏‎‎‎‏‎‏‎‎‎‏‏‎‎Black on white‎‏‎‎‏‎"</item>
+    <item msgid="1495307195241623402">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‎‏‎‎‏‏‎‎‎‎‎‎‎‏‏‎‎‏‎‏‏‏‏‏‏‎‎‎‏‎‏‏‏‎‏‎‎‏‏‏‎‏‏‎‎‏‏‎‏‏‏‏‎‏‏‎‏‎‏‎‎Yellow on black‎‏‎‎‏‎"</item>
+    <item msgid="6039700130994371612">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‎‎‏‏‏‏‎‏‎‎‎‏‎‏‎‏‎‎‏‏‎‏‎‎‎‏‎‎‏‏‏‏‏‎‎‏‏‏‎‎‏‏‎‎‏‎‏‏‏‏‎‎‎‎‎‏‏‏‎‎‎Yellow on blue‎‏‎‎‏‎"</item>
+    <item msgid="7169235156349580064">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‎‎‏‏‎‏‏‏‏‏‏‎‎‎‏‏‏‏‎‏‎‏‏‎‎‎‏‏‏‏‏‏‎‏‎‏‎‏‏‏‎‏‎‏‎‏‏‏‎‎‏‏‎‎‏‎‎‎‎‎‎Custom‎‏‎‎‏‎"</item>
+  </string-array>
+  <string-array name="vpn_types_long">
+    <item msgid="2732002039459078847">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‎‏‎‏‏‏‏‎‏‎‏‎‎‎‎‎‎‏‎‏‎‏‏‎‎‎‎‏‎‏‎‎‏‏‏‏‏‎‎‏‏‎‎‏‏‏‏‎‎‎‏‎‏‎‏‏‏‏‏‏‎PPTP VPN‎‏‎‎‏‎"</item>
+    <item msgid="3799752201662127867">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‎‏‎‎‏‎‏‏‏‎‏‏‎‏‏‎‏‏‏‎‎‏‏‏‏‏‏‎‏‏‎‏‎‏‏‎‏‎‎‏‎‏‎‎‎‏‎‏‏‏‏‎‏‏‏‏‏‎‏‏‎L2TP/IPSec VPN with pre-shared keys‎‏‎‎‏‎"</item>
+    <item msgid="4725504331295252103">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‎‎‎‏‏‎‎‏‎‏‎‎‎‏‎‏‏‏‎‏‎‎‏‎‎‏‏‏‎‎‎‎‏‎‏‏‎‏‏‎‏‏‎‎‎‏‎‏‏‏‏‎‏‎‎‎‎‏‏‏‎L2TP/IPSec VPN with certificates‎‏‎‎‏‎"</item>
+    <item msgid="7526551163264034377">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‏‎‎‎‎‏‏‏‎‎‏‏‏‎‏‎‏‏‏‎‎‏‏‎‎‏‏‏‏‏‎‏‎‏‏‎‎‎‏‎‎‏‏‏‏‏‏‎‎‏‏‎‎‏‎‎‏‎‎‏‎IPSec VPN with pre-shared keys and Xauth authentication‎‏‎‎‏‎"</item>
+    <item msgid="8064740940687465039">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‏‏‏‏‏‏‏‎‏‎‏‏‏‎‏‏‎‏‏‏‎‎‏‎‏‎‎‎‎‎‎‏‏‏‏‏‎‎‏‏‏‎‎‏‏‏‎‏‏‎‏‎‎‏‎‎‏‏‏‏‎IPSec VPN with certificates and Xauth authentication‎‏‎‎‏‎"</item>
+    <item msgid="4946199982372391490">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‎‏‎‎‏‎‏‎‎‏‎‎‎‏‏‎‏‏‏‎‏‎‏‎‏‏‎‏‏‎‎‎‏‎‎‏‎‏‎‏‏‎‎‏‏‎‎‎‏‎‏‎‎‏‎‎‎‎‏‎‎IPSec VPN with certificates and hybrid authentication‎‏‎‎‏‎"</item>
+  </string-array>
+  <string-array name="vpn_states">
+    <item msgid="8621078286418985762">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‎‏‏‏‏‎‏‎‎‏‎‎‎‎‏‏‏‎‎‏‎‎‎‎‎‏‏‎‎‏‏‎‏‎‏‎‏‏‎‏‎‏‏‎‎‏‎‎‎‎‏‏‎‎‏‎‎‎‏‎‎Disconnected‎‏‎‎‏‎"</item>
+    <item msgid="6692305604213080515">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‏‏‎‎‏‏‎‏‏‏‏‏‏‏‎‏‏‎‎‎‎‏‏‏‏‏‎‏‎‏‎‏‏‎‏‏‎‏‏‏‏‎‏‎‎‎‎‎‎‎‎‏‏‏‎‎‎‎‏‏‎Initializing…‎‏‎‎‏‎"</item>
+    <item msgid="8001704909356800092">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‏‏‏‏‎‎‎‎‏‎‏‏‏‏‎‎‎‏‎‎‎‎‏‏‏‎‎‎‎‏‎‏‏‏‏‏‏‎‏‏‎‏‏‎‎‎‎‏‏‎‎‎‎‏‎‏‏‏‎‎‎Connecting…‎‏‎‎‏‎"</item>
+    <item msgid="4039737283841672166">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‏‎‎‎‎‎‎‏‎‎‎‎‎‎‎‎‎‏‏‏‏‎‏‎‎‏‏‏‏‏‏‏‏‏‎‏‎‏‎‎‏‎‎‎‏‏‎‎‎‎‏‏‏‏‏‎‎‏‏‎‎Connected‎‏‎‎‏‎"</item>
+    <item msgid="4042143101664725090">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‏‎‎‎‎‎‎‏‏‎‎‎‏‎‎‏‎‎‏‏‏‎‏‏‏‏‎‎‎‎‎‏‏‎‏‎‎‎‎‎‎‏‎‏‏‎‎‎‏‎‎‎‎‏‏‎‎‎‏‎‎Timeout‎‏‎‎‏‎"</item>
+    <item msgid="7664124146786465092">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‏‎‏‎‎‏‎‏‏‏‎‎‎‏‏‏‎‎‎‎‎‏‎‎‏‏‏‎‎‎‏‎‎‎‏‏‏‎‏‏‎‎‏‏‎‏‏‏‎‏‎‏‎‏‎‎‎‏‎‎‎Unsuccessful‎‏‎‎‏‎"</item>
+  </string-array>
+  <string-array name="security_settings_premium_sms_values">
+    <item msgid="7389829271787670252">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‎‏‏‎‏‎‎‎‏‏‎‏‏‏‏‏‎‎‏‎‏‎‎‏‎‎‎‏‏‏‎‏‎‏‏‏‏‎‏‏‎‎‎‎‎‎‎‎‏‎‏‎‏‏‏‎‏‏‎‎‎Ask‎‏‎‎‏‎"</item>
+    <item msgid="5077768429488260031">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‎‏‏‎‎‏‏‏‎‏‏‏‏‏‎‏‏‎‏‏‎‏‏‏‏‎‏‏‏‏‎‎‎‎‏‏‎‏‎‏‎‏‏‏‎‏‎‎‎‎‏‏‏‎‏‏‏‏‏‏‎Never allow‎‏‎‎‏‎"</item>
+    <item msgid="1417929597727989746">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‎‎‏‏‏‎‏‎‏‏‎‏‎‏‏‏‏‏‏‏‎‏‏‏‎‏‎‎‏‏‏‎‎‏‎‏‎‎‎‏‎‏‏‎‏‏‎‏‏‏‏‏‏‏‏‏‎‎‏‎‎Always allow‎‏‎‎‏‎"</item>
+  </string-array>
+  <string-array name="ram_states">
+    <item msgid="3944681673818150669">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‎‏‏‎‏‎‏‏‏‏‏‎‎‏‎‏‎‎‏‏‎‎‎‏‎‏‎‏‎‎‎‏‏‏‏‏‏‏‏‎‏‏‎‎‏‎‎‏‎‏‏‏‎‎‎‎‏‏‎‏‎Normal‎‏‎‎‏‎"</item>
+    <item msgid="3256987280393708586">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‏‏‎‏‎‎‏‏‎‎‏‏‎‎‏‎‎‏‎‎‏‎‏‎‏‏‎‎‏‏‎‏‏‏‎‏‏‏‎‏‎‏‎‏‎‎‏‎‎‏‎‎‎‎‏‎‏‎‏‎‎Moderate‎‏‎‎‏‎"</item>
+    <item msgid="4662917179231875995">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‎‎‎‎‏‎‏‏‎‏‏‎‎‎‎‎‎‎‏‎‎‏‏‏‏‎‎‎‎‎‏‎‎‏‎‏‎‎‏‎‏‏‏‎‏‎‏‏‎‎‏‏‏‎‎‏‏‎‏‏‎Low‎‏‎‎‏‎"</item>
+    <item msgid="5264929699714647509">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‏‎‎‏‎‎‎‏‎‎‎‎‏‏‎‎‏‎‎‏‏‎‏‎‏‎‏‎‏‏‎‎‎‏‏‎‏‏‏‎‎‏‎‏‎‏‎‎‎‏‎‏‏‏‎‏‎‏‎‏‎Critical‎‏‎‎‏‎"</item>
+    <item msgid="5606155978847838966">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‏‏‎‏‏‏‎‎‏‏‎‏‎‎‎‏‎‎‎‏‎‎‏‎‏‎‎‎‏‏‏‏‏‎‏‎‏‎‏‎‏‎‎‎‎‏‏‎‎‎‏‎‏‏‏‏‎‏‏‎‎?‎‏‎‎‏‎"</item>
+  </string-array>
+  <string-array name="proc_stats_memory_states">
+    <item msgid="8845855295876909468">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‏‎‏‎‏‏‎‎‎‎‏‎‏‏‎‎‏‎‏‎‏‎‎‎‎‏‏‎‎‎‏‏‎‏‎‏‎‏‎‎‎‎‎‎‎‏‎‎‏‎‎‏‏‎‎‏‏‏‎‎‎Normal‎‏‎‎‏‎"</item>
+    <item msgid="866544120205026771">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‎‏‏‎‎‎‎‎‎‎‏‏‎‏‎‎‏‎‏‎‏‎‏‎‎‏‎‎‏‎‏‎‎‎‎‏‏‎‎‎‎‎‏‏‎‎‎‏‎‎‏‎‏‏‏‎‏‎‎‏‏‎Moderate‎‏‎‎‏‎"</item>
+    <item msgid="7851902244436886890">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‏‏‎‎‏‏‏‏‎‏‏‏‏‎‎‎‏‏‏‏‎‏‏‏‏‏‎‏‎‏‏‏‏‎‏‎‏‏‎‎‎‎‎‎‏‏‎‎‎‏‎‏‎‏‏‎‏‎‏‎‎Low‎‏‎‎‏‎"</item>
+    <item msgid="3022922196817563960">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‏‎‎‏‏‏‏‏‎‎‏‏‏‎‎‏‎‎‏‏‏‎‏‏‏‎‎‎‏‏‎‎‏‏‎‎‏‏‏‏‎‏‎‎‎‏‎‏‎‎‎‏‎‎‏‏‏‎‎‎‎Critical‎‏‎‎‏‎"</item>
+  </string-array>
+  <string-array name="proc_stats_process_states">
+    <item msgid="5069825997142785829">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‎‏‏‎‎‏‎‏‏‎‏‏‏‎‏‎‎‎‏‏‏‏‏‎‎‎‏‎‎‎‏‎‎‎‎‎‏‎‏‏‏‏‎‎‎‏‏‏‏‏‏‏‎‎‏‎‎‏‎‏‎Persistent‎‏‎‎‏‎"</item>
+    <item msgid="5779398140277006695">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‎‎‎‎‎‎‏‏‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‎‏‏‏‎‏‏‏‎‏‏‎‎‎‎‏‏‏‎‏‎‎‎‎‏‎‏‏‎‎‏‏‏‎Top activity‎‏‎‎‏‎"</item>
+    <item msgid="1439598363694578255">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‎‎‏‏‏‏‏‏‏‎‏‎‎‏‏‏‏‎‏‏‎‎‎‏‎‏‎‏‏‎‎‏‏‏‏‏‎‎‏‏‏‏‏‏‏‎‏‏‏‎‏‎‎‏‎‎‏‏‏‏‎Important (foreground)‎‏‎‎‏‎"</item>
+    <item msgid="3396458970745718652">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‏‏‏‏‎‎‏‎‎‎‏‎‏‎‏‎‎‏‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‏‎‏‎‏‏‏‏‏‎‎‏‏‎‎‎‏‏‏‎‏‏‏‏‏‎‎‎Important (background)‎‏‎‎‏‎"</item>
+    <item msgid="5214825238247511992">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‏‎‎‎‎‏‎‏‏‏‏‎‏‏‎‎‎‏‏‏‏‏‏‎‏‏‎‎‏‏‎‎‎‎‏‏‎‏‏‏‏‏‎‎‎‎‎‏‎‏‏‏‏‎‏‏‏‎‎‎‎Backup‎‏‎‎‏‎"</item>
+    <item msgid="311372689168254967">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‎‏‏‏‎‎‎‏‎‏‎‎‏‎‎‎‏‏‎‏‏‏‏‏‎‎‏‏‏‏‏‎‏‎‎‎‏‎‏‎‏‎‎‎‎‏‏‏‎‎‎‏‏‏‏‏‏‏‎‏‏‏‎Heavy weight‎‏‎‎‏‎"</item>
+    <item msgid="7438189122367820362">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‎‏‏‏‎‎‏‏‏‎‎‏‏‏‎‎‎‎‎‏‏‎‎‏‏‎‎‎‏‏‏‏‏‎‏‎‏‏‏‎‏‎‎‎‏‎‎‏‎‎‏‎‎‏‎‎‏‎‏‎‎Service (running)‎‏‎‎‏‎"</item>
+    <item msgid="918687422516982498">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‎‏‏‎‎‏‎‏‏‏‏‏‏‏‏‎‏‎‏‎‏‎‏‎‏‎‏‏‏‏‏‏‎‎‏‏‎‏‎‏‏‏‏‏‎‎‏‏‏‎‎‏‎‏‏‏‎‎‎‏‎‎Service (restarting)‎‏‎‎‏‎"</item>
+    <item msgid="6807727069641853029">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‏‏‏‎‎‏‏‏‏‎‎‏‏‏‏‎‎‏‏‏‏‎‏‏‎‎‏‏‎‏‏‏‎‎‎‏‏‏‎‏‎‎‎‎‎‏‎‎‏‎‎‎‎‏‏‎‎‏‎‏‎Receiver‎‏‎‎‏‎"</item>
+    <item msgid="6782857406100845127">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‏‏‏‎‎‎‏‎‎‎‎‏‏‎‎‎‏‏‎‎‏‏‎‏‏‏‏‏‏‎‏‎‏‏‎‎‏‏‎‎‎‏‎‎‏‎‏‏‎‎‏‎‎‏‎‎‎‏‏‏‎Home‎‏‎‎‏‎"</item>
+    <item msgid="2860945127596974299">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‎‏‏‏‏‎‏‏‎‏‎‎‎‎‎‏‏‏‏‎‎‏‏‎‏‏‏‏‏‎‎‎‎‏‎‎‎‏‎‎‏‏‎‏‎‏‏‎‎‎‎‎‏‏‎‏‏‎‏‏‎Last activity‎‏‎‎‏‎"</item>
+    <item msgid="8610560843693675830">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‎‏‏‏‎‏‏‏‏‏‏‎‏‏‎‏‏‎‏‏‎‏‏‏‎‏‏‏‎‏‏‏‎‏‎‏‎‎‏‏‏‏‏‏‏‏‎‏‎‏‎‏‎‎‏‏‎‏‏‎‎Cached (activity)‎‏‎‎‏‎"</item>
+    <item msgid="4338089220026248848">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‏‏‎‎‎‎‏‏‎‎‏‏‏‏‏‏‏‏‎‏‎‎‏‎‏‎‎‏‎‏‎‏‎‎‏‏‏‎‎‏‏‏‎‏‏‎‏‎‏‏‏‎‏‎‎‏‎‎‎‎‎Cached (activity client)‎‏‎‎‏‎"</item>
+    <item msgid="6652164677254579050">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‏‏‎‎‎‏‎‏‎‎‎‏‎‎‏‏‏‏‎‎‏‎‎‎‎‏‏‏‎‏‏‏‏‏‏‏‎‎‏‎‏‎‎‏‎‎‎‎‎‎‏‏‎‏‏‎‏‎‏‎‎Cached (empty)‎‏‎‎‏‎"</item>
+  </string-array>
+  <string-array name="color_picker">
+    <item msgid="7631642672260600032">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‏‎‎‏‏‏‏‎‏‎‎‏‎‎‎‎‏‎‏‎‏‎‎‏‎‎‏‏‏‎‎‎‎‏‎‎‏‏‎‎‏‏‏‎‎‏‎‏‎‎‎‎‏‏‏‎‎‎‎‎‎Teal‎‏‎‎‏‎"</item>
+    <item msgid="8332294763632946560">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‎‎‏‏‏‎‏‎‎‎‏‎‎‏‎‎‎‎‎‏‏‏‏‏‎‎‎‎‏‏‏‎‏‏‏‎‎‎‏‏‎‎‎‎‎‏‏‎‏‏‎‏‏‎‎‎‎‎‎‎‎Blue‎‏‎‎‏‎"</item>
+    <item msgid="2023216417616991392">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‏‏‎‎‎‎‎‏‎‎‏‏‏‏‏‎‏‎‎‎‏‎‎‏‏‏‎‎‏‏‎‎‎‎‏‏‏‏‎‎‏‏‎‎‏‎‎‏‎‏‎‎‏‎‏‎‎‎‎‎‎Indigo‎‏‎‎‏‎"</item>
+    <item msgid="3170497246594232819">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‏‎‏‏‏‏‏‏‏‏‏‏‏‏‎‏‏‏‏‎‎‏‏‏‎‎‏‎‏‎‏‎‎‎‎‎‏‎‎‏‏‎‏‎‎‏‏‏‎‎‎‏‏‏‏‏‎‎‏‏‎Purple‎‏‎‎‏‎"</item>
+    <item msgid="4608643045752965568">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‏‏‏‏‏‏‏‏‎‏‎‏‎‎‏‏‎‎‎‎‎‏‏‎‏‏‏‎‏‎‏‏‎‏‏‎‏‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‏‏‎‎‎‎‎‎‎Pink‎‏‎‎‏‎"</item>
+    <item msgid="6131821495505931173">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‎‏‎‏‎‎‎‏‏‎‎‎‏‎‎‏‏‎‏‏‎‎‏‎‏‎‎‏‏‎‎‏‎‎‎‏‏‎‏‏‏‏‎‎‎‏‎‎‏‎‏‏‏‎‏‎‎‏‎‏‎Red‎‏‎‎‏‎"</item>
+  </string-array>
+  <string-array name="automatic_storage_management_days">
+    <item msgid="687318592238852312">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‎‏‎‎‏‏‎‎‎‏‎‎‏‏‏‎‏‏‎‎‎‏‎‎‏‏‏‏‎‎‎‏‏‏‎‎‏‏‏‏‎‏‎‏‏‎‎‎‏‏‎‎‎‏‏‎‏‏‎‎‎‎Over 30 days old‎‏‎‎‏‎"</item>
+    <item msgid="2900554746706302178">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‏‎‎‎‎‏‎‎‎‎‎‎‏‏‎‏‎‏‏‏‎‎‏‎‏‏‎‎‏‎‏‎‎‎‎‏‎‎‎‎‎‎‎‎‏‎‎‏‎‏‎‎‏‏‏‎‎‎‏‎‎Over 60 days old‎‏‎‎‏‎"</item>
+    <item msgid="5692284879054004388">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‏‏‏‎‏‏‏‏‏‏‏‏‎‎‎‎‏‏‏‎‏‏‏‏‎‎‎‎‎‏‎‎‎‎‎‎‎‏‎‏‎‏‏‏‎‏‏‎‎‎‎‎‏‎‏‎‎‏‎‎‎Over 90 days old‎‏‎‎‏‎"</item>
+  </string-array>
+</resources>
diff --git a/res/values-en-rXC/config.xml b/res/values-en-rXC/config.xml
new file mode 100644
index 0000000..153e247
--- /dev/null
+++ b/res/values-en-rXC/config.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2007 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT 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="config_backup_settings_label" msgid="4423938073600296337"></string>
+</resources>
diff --git a/res/values-en-rXC/strings.xml b/res/values-en-rXC/strings.xml
new file mode 100644
index 0000000..0ce3e48
--- /dev/null
+++ b/res/values-en-rXC/strings.xml
@@ -0,0 +1,3727 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2007 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT 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="yes" msgid="4676390750360727396">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‎‎‎‎‏‏‏‎‎‏‎‏‏‏‏‎‎‎‎‎‏‎‎‏‏‏‎‎‎‏‏‎‎‎‏‎‎‎‏‎‏‏‎‎‎‏‏‎‏‏‏‏‎‏‏‎‎‏‎‎‎Yes‎‏‎‎‏‎"</string>
+    <string name="no" msgid="6731231425810196216">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‏‏‎‏‎‏‏‎‏‎‏‎‎‎‏‎‎‎‏‏‎‏‎‏‎‎‎‏‎‏‏‏‎‏‎‎‎‏‎‏‏‏‎‎‏‏‏‎‎‏‏‎‏‏‏‏‏‎‎‎‎No‎‏‎‎‏‎"</string>
+    <string name="create" msgid="3578857613172647409">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‎‎‎‏‏‎‏‎‏‎‏‎‏‎‏‎‏‎‎‎‎‎‎‎‏‎‎‏‏‎‎‏‏‏‏‎‏‏‎‏‏‎‏‏‏‎‏‎‎‏‎‏‏‏‏‏‎‎‎‏‎Create‎‏‎‎‏‎"</string>
+    <string name="allow" msgid="3349662621170855910">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‏‏‏‎‎‏‏‏‏‏‎‎‎‏‏‎‎‏‎‎‎‏‏‎‏‎‎‎‎‎‎‏‏‏‎‎‎‏‎‎‏‎‏‎‏‏‏‎‏‏‏‏‏‏‏‎‎‏‏‎‎Allow‎‏‎‎‏‎"</string>
+    <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>
+    <string name="header_category_personal" msgid="3310195187905720823">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‏‏‎‏‏‏‏‏‎‎‎‎‎‎‏‎‏‏‎‎‏‏‏‏‏‏‎‎‎‎‏‏‏‎‎‎‎‏‎‏‎‎‏‏‏‏‏‏‎‎‎‏‏‏‏‏‎‏‏‏‎Personal‎‏‎‎‏‎"</string>
+    <string name="header_category_access" msgid="7580499097416970962">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‏‎‎‏‎‎‏‏‎‎‏‏‎‏‎‏‎‏‏‏‏‏‎‎‎‏‎‎‎‎‎‏‎‎‎‏‏‎‏‏‎‏‎‏‎‎‏‏‎‎‏‎‏‏‎‏‎‎‏‎‎Access‎‏‎‎‏‎"</string>
+    <string name="header_category_system" msgid="2816866961183068977">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‎‏‏‏‎‎‎‏‎‏‏‏‏‎‎‎‎‏‎‏‏‎‎‏‎‎‏‏‏‎‏‎‏‎‎‎‏‏‎‏‏‎‎‏‏‏‎‏‎‎‏‏‎‎‏‏‎‎‎‏‎System‎‏‎‎‏‎"</string>
+    <string name="radio_info_data_connection_enable" msgid="8656750679353982712">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‏‎‎‎‎‎‏‎‎‎‏‎‏‏‏‏‎‏‎‎‏‏‏‎‎‎‎‎‏‎‏‎‎‎‎‎‎‎‎‎‎‎‏‏‏‏‏‏‏‏‏‎‏‏‏‏‏‎‎‎‎Enable Data Connection‎‏‎‎‏‎"</string>
+    <string name="radio_info_data_connection_disable" msgid="8541302390883231216">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‎‏‏‎‏‎‎‎‏‎‎‎‏‏‎‎‏‏‎‏‎‏‎‎‎‏‎‏‎‏‎‎‏‏‏‏‏‏‎‎‏‎‏‎‎‎‏‎‎‏‎‏‏‏‏‏‎‎‎‎‎Disable Data Connection‎‏‎‎‏‎"</string>
+    <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">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‎‏‏‏‎‏‎‎‏‏‏‏‎‎‎‎‎‎‏‎‎‎‏‎‎‎‏‏‎‎‏‎‎‎‏‎‏‎‎‎‏‏‎‎‎‎‏‎‎‎‎‏‎‎‎‏‏‏‏‎‎Wifi 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 Dialing Numbers‎‏‎‎‏‎"</string>
+    <string name="radioInfo_menu_viewSDN" msgid="7130280686244955669">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‎‎‏‎‏‏‏‏‎‎‏‏‏‏‎‏‏‎‎‎‏‎‎‎‎‎‎‏‏‎‎‏‏‏‎‎‎‏‏‏‎‏‎‏‏‎‎‎‎‏‏‎‎‎‎‏‎‏‎‏‎View Service Dialing Numbers‎‏‎‎‏‎"</string>
+    <string name="radioInfo_menu_getIMS" msgid="185171476413967831">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‎‏‎‏‎‏‎‎‏‎‎‎‏‏‏‎‏‏‏‎‎‎‏‏‏‏‎‏‎‎‎‎‎‏‎‏‎‎‎‏‏‎‎‎‎‎‏‏‎‏‏‎‏‏‏‎‏‎‏‏‏‎IMS Service Status‎‏‎‎‏‎"</string>
+    <string name="radio_info_ims_reg_status_title" msgid="16971785902696970">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‎‏‏‎‏‏‏‏‎‎‎‏‎‎‏‎‏‏‏‎‏‏‏‏‏‏‏‏‎‏‎‏‎‏‏‏‏‎‏‏‏‏‎‎‏‎‏‎‏‎‎‎‎‎‏‎‏‎‎IMS Status‎‏‎‎‏‎"</string>
+    <string name="radio_info_ims_reg_status_registered" msgid="5614116179751126247">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‏‏‎‏‏‏‏‎‏‎‎‏‎‏‎‏‏‎‎‎‏‏‏‎‏‎‏‏‏‎‏‎‏‏‎‏‏‏‎‏‎‏‏‎‏‏‎‎‎‏‎‎‏‏‏‎‎‏‏‏‎Registered‎‏‎‎‏‎"</string>
+    <string name="radio_info_ims_reg_status_not_registered" msgid="4438054067642750717">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‏‏‎‏‏‎‎‏‎‏‏‏‎‎‏‎‎‎‏‎‏‎‏‎‏‎‎‏‎‎‏‎‎‎‏‏‏‏‎‏‎‎‏‎‏‏‎‏‎‏‏‎‏‏‏‏‏‏‎‏‎Not Registered‎‏‎‎‏‎"</string>
+    <string name="radio_info_ims_feature_status_available" msgid="3687807290327566879">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‎‎‏‏‎‎‏‎‏‏‎‏‏‎‏‏‏‎‎‏‎‎‏‏‎‎‎‏‎‎‎‏‎‏‎‎‎‎‎‏‎‎‏‎‎‎‎‎‏‎‏‎‎‎‎‏‏‏‏‏‎Available‎‏‎‎‏‎"</string>
+    <string name="radio_info_ims_feature_status_unavailable" msgid="4606182208970114368">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‏‏‏‏‏‏‏‎‏‏‎‎‎‏‏‏‎‎‏‎‎‏‎‏‎‎‎‎‏‎‎‎‎‎‎‎‎‏‏‎‎‎‏‏‎‏‎‎‎‏‎‏‎‏‎‎‎‎‎‎‎Unavailable‎‏‎‎‏‎"</string>
+    <string name="radio_info_ims_reg_status" msgid="7534612158445529715">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‏‎‎‎‏‎‎‏‎‎‎‎‎‏‎‏‎‎‎‏‏‏‎‏‎‏‏‎‏‎‎‎‏‎‎‎‎‏‏‏‏‏‎‎‎‎‏‎‏‎‏‎‎‏‏‏‎‎‏‏‎IMS Registration: ‎‏‎‎‏‏‎<xliff:g id="STATUS">%1$s</xliff:g>‎‏‎‎‏‏‏‎‎‏‎‎‏‏‎\n‎‏‎‎‏‏‏‎Voice over LTE: ‎‏‎‎‏‏‎<xliff:g id="AVAILABILITY_0">%2$s</xliff:g>‎‏‎‎‏‏‏‎‎‏‎‎‏‏‎\n‎‏‎‎‏‏‏‎Voice over WiFi: ‎‏‎‎‏‏‎<xliff:g id="AVAILABILITY_1">%3$s</xliff:g>‎‏‎‎‏‏‏‎‎‏‎‎‏‏‎\n‎‏‎‎‏‏‏‎Video Calling: ‎‏‎‎‏‏‎<xliff:g id="AVAILABILITY_2">%4$s</xliff:g>‎‏‎‎‏‏‏‎‎‏‎‎‏‏‎\n‎‏‎‎‏‏‏‎UT Interface: ‎‏‎‎‏‏‎<xliff:g id="AVAILABILITY_3">%5$s</xliff:g>‎‏‎‎‏‏‏‎‎‏‎‎‏‎"</string>
+    <string name="radioInfo_service_in" msgid="1697703164394784618">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‎‏‏‏‏‎‎‎‏‏‏‏‎‏‏‏‎‏‎‎‎‎‎‎‏‎‎‎‎‏‏‏‏‏‏‏‏‏‎‎‏‏‏‎‏‏‎‎‎‏‏‏‎‏‏‎‏‎‏‎‎In Service‎‏‎‎‏‎"</string>
+    <string name="radioInfo_service_out" msgid="7999094221728929681">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‏‏‏‏‎‎‎‎‎‎‏‎‎‏‏‏‏‏‎‏‏‏‎‏‎‎‎‎‎‏‎‎‏‎‏‏‎‎‎‎‏‎‎‎‎‏‎‏‎‏‏‏‏‎‎‏‎‎‎‏‎Out of Service‎‏‎‎‏‎"</string>
+    <string name="radioInfo_service_emergency" msgid="6274434235469661525">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‎‏‏‏‎‎‎‏‎‎‏‏‎‏‎‎‎‏‎‎‏‎‏‏‎‎‎‏‏‎‎‏‏‎‏‏‏‎‏‏‏‎‎‎‎‎‎‎‎‏‎‏‎‏‎‏‎‏‎‏‎Emergency Calls Only‎‏‎‎‏‎"</string>
+    <string name="radioInfo_service_off" msgid="7536423790014501173">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‏‎‎‎‏‎‎‏‎‏‏‎‏‏‎‎‎‎‎‏‏‎‎‎‎‎‎‏‏‏‏‎‎‎‎‎‏‎‎‏‏‏‏‎‎‎‎‏‎‎‎‏‎‎‏‏‎‏‎‏‎Radio Off‎‏‎‎‏‎"</string>
+    <string name="radioInfo_roaming_in" msgid="9045363884600341051">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‏‏‎‏‏‎‎‎‎‏‏‏‏‎‎‏‎‏‏‎‏‎‎‎‎‏‏‏‎‏‎‏‎‏‎‏‏‏‎‎‎‎‎‎‎‎‏‏‎‎‏‎‎‎‏‏‏‎‏‏‎Roaming‎‏‎‎‏‎"</string>
+    <string name="radioInfo_roaming_not" msgid="4849214885629672819">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‎‎‏‏‎‏‎‎‏‎‏‏‏‏‎‏‏‏‏‏‎‎‏‏‏‏‏‏‎‎‎‎‏‎‎‏‎‏‏‏‏‏‏‎‎‎‏‏‏‏‎‏‎‏‏‏‎‎‏‏‎Not Roaming‎‏‎‎‏‎"</string>
+    <string name="radioInfo_phone_idle" msgid="7489244938838742820">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‎‏‏‏‏‏‏‎‏‏‏‏‎‎‏‎‎‏‎‎‏‎‎‏‎‏‏‏‏‎‎‏‎‏‏‏‎‏‏‎‎‎‎‎‎‎‎‏‎‏‏‏‎‎‏‎‎‏‎‎‎Idle‎‏‎‎‏‎"</string>
+    <string name="radioInfo_phone_ringing" msgid="4883724645684297895">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‎‎‏‏‏‏‎‎‎‏‏‎‎‏‏‏‏‎‎‏‏‎‏‏‎‎‎‎‏‎‏‎‏‏‏‎‏‏‎‏‎‏‎‏‎‏‎‎‎‎‎‎‏‎‏‎‎‏‏‏‎Ringing‎‏‎‎‏‎"</string>
+    <string name="radioInfo_phone_offhook" msgid="5873835692449118954">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‎‎‎‏‏‎‎‎‎‏‎‎‎‎‎‎‏‏‏‎‎‏‏‏‎‎‎‎‏‏‏‏‏‏‎‏‎‏‏‏‎‎‎‎‏‎‏‏‏‎‏‎‏‏‏‎‏‎‏‎‎Call in Progress‎‏‎‎‏‎"</string>
+    <string name="radioInfo_data_disconnected" msgid="1959735267890719418">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‏‎‏‏‎‎‏‏‎‎‏‎‎‏‏‎‎‎‎‎‏‏‎‏‎‏‏‏‏‏‎‏‎‎‎‎‎‏‏‎‏‏‏‎‎‏‏‎‏‎‏‎‏‎‏‏‏‎‏‎‎Disconnected‎‏‎‎‏‎"</string>
+    <string name="radioInfo_data_connecting" msgid="8404571440697917823">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‎‏‎‎‏‎‏‎‎‎‏‏‎‎‎‎‏‎‎‏‎‎‏‏‎‎‏‎‎‎‏‎‏‏‎‎‎‎‏‏‎‎‎‏‎‏‎‎‎‎‎‏‎‏‏‏‏‏‏‏‎Connecting‎‏‎‎‏‎"</string>
+    <string name="radioInfo_data_connected" msgid="7074301157399238697">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‎‎‏‎‎‎‏‎‏‏‎‎‏‏‏‏‎‏‏‏‎‏‏‎‏‎‏‏‏‏‏‎‎‎‎‎‏‏‏‎‏‎‏‎‏‎‎‏‏‎‎‎‎‎‏‎‏‎‎‏‎Connected‎‏‎‎‏‎"</string>
+    <string name="radioInfo_data_suspended" msgid="5315325487890334196">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‏‎‎‏‏‏‎‎‎‎‏‏‏‏‎‏‎‏‎‎‎‏‎‏‏‏‏‎‏‎‎‏‎‎‏‏‎‏‎‎‏‎‎‎‏‎‎‎‎‎‎‏‏‏‏‏‎‏‎‎‎Suspended‎‏‎‎‏‎"</string>
+    <string name="radioInfo_unknown" msgid="1476509178755955088">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‎‏‎‎‎‏‏‏‏‏‎‏‏‎‎‏‏‏‎‏‎‏‎‎‎‏‏‎‎‏‏‏‎‎‏‏‎‏‎‏‏‎‏‎‎‎‏‏‏‎‎‏‏‎‎‏‎‎‎‎‎Unknown‎‏‎‎‏‎"</string>
+    <string name="radioInfo_display_packets" msgid="8654359809877290639">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‏‎‎‎‎‎‎‏‏‎‏‎‎‏‏‏‎‏‏‎‎‏‏‎‎‏‎‎‏‏‏‏‎‎‏‎‎‎‏‎‎‏‏‏‎‎‏‎‏‏‏‎‏‎‎‎‏‏‏‏‎pkts‎‏‎‎‏‎"</string>
+    <string name="radioInfo_display_bytes" msgid="4018206969492931883">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‎‏‏‏‏‏‎‎‎‎‏‏‏‎‎‎‏‎‎‏‏‏‏‏‎‎‏‏‎‎‎‎‏‎‏‎‏‎‏‎‎‎‎‎‎‎‎‎‎‏‎‏‎‎‏‎‏‎‏‏‎bytes‎‏‎‎‏‎"</string>
+    <string name="radioInfo_display_dbm" msgid="3621221793699882781">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‎‎‏‎‎‏‎‎‎‎‎‏‎‎‏‎‏‎‏‎‎‎‎‎‏‎‎‏‎‎‎‎‏‎‏‎‎‏‏‎‎‎‏‎‎‏‏‎‎‏‏‏‎‎‎‏‏‏‎‏‎dBm‎‏‎‎‏‎"</string>
+    <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">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‎‏‏‏‏‏‎‎‎‏‏‏‏‏‏‏‎‏‎‎‎‎‏‎‎‎‏‏‎‎‎‏‏‏‎‏‏‏‏‎‏‎‎‎‏‎‏‎‏‏‏‏‏‎‏‏‎‎‎‎‎Unmount USB storage‎‏‎‎‏‎"</string>
+    <string name="sdcard_unmount" product="default" msgid="3364184561355611897">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‏‏‏‎‏‎‏‎‏‏‏‏‏‏‏‏‏‏‎‎‎‎‎‎‏‎‎‎‏‏‎‎‏‎‏‎‎‏‏‏‎‏‎‎‎‏‎‏‏‏‏‎‏‏‏‏‏‎‎‏‎Unmount SD card‎‏‎‎‏‎"</string>
+    <string name="sdcard_format" product="nosdcard" msgid="6285310523155166716">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‎‏‏‏‎‎‏‏‏‎‎‏‏‏‏‎‏‎‎‎‏‎‎‏‏‏‏‎‏‎‏‎‏‎‏‏‏‎‏‏‎‎‎‎‎‎‏‏‎‏‎‏‏‏‏‏‏‏‎‎‎Erase USB storage‎‏‎‎‏‎"</string>
+    <string name="sdcard_format" product="default" msgid="6713185532039187532">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‏‏‎‏‎‎‏‎‏‎‏‎‎‎‎‎‎‏‏‎‏‎‏‎‏‏‎‎‎‏‏‎‎‏‎‎‎‏‏‏‏‏‎‎‏‏‎‎‏‏‎‎‎‏‎‎‏‏‎‎‎Erase SD card‎‏‎‎‏‎"</string>
+    <string name="preview_pager_content_description" msgid="8926235999291761243">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‏‎‏‏‏‏‏‎‎‎‎‎‎‏‎‏‏‏‎‎‎‏‎‏‏‎‎‏‎‎‎‏‏‏‏‏‎‎‎‏‎‏‏‎‏‏‏‎‎‎‏‎‎‏‎‏‏‎‏‏‎Preview‎‏‎‎‏‎"</string>
+    <string name="preview_page_indicator_content_description" msgid="4821343428913401264">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‎‎‏‎‏‏‏‎‏‎‎‎‏‏‎‏‏‎‏‎‎‏‎‎‏‏‎‏‏‏‎‏‎‏‎‎‏‎‎‎‏‏‎‎‎‎‎‎‏‏‎‏‏‎‏‏‎‎‎‎‎Preview, page ‎‏‎‎‏‏‎<xliff:g id="CURRENT_PAGE">%1$d</xliff:g>‎‏‎‎‏‏‏‎ of ‎‏‎‎‏‏‎<xliff:g id="NUM_PAGES">%2$d</xliff:g>‎‏‎‎‏‏‏‎‎‏‎‎‏‎"</string>
+    <string name="font_size_summary" msgid="1690992332887488183">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‎‏‏‏‎‏‏‏‎‏‏‏‏‎‎‏‏‏‎‎‏‎‎‏‎‎‎‏‎‏‎‎‎‏‏‏‏‎‏‎‏‎‏‎‏‏‏‏‎‏‏‎‏‎‏‏‎‏‏‏‎Make the text on screen smaller or larger.‎‏‎‎‏‎"</string>
+    <string name="font_size_make_smaller_desc" msgid="7919995133365371569">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‏‏‎‏‏‏‏‎‏‎‎‏‎‏‏‏‏‎‎‏‏‎‎‏‏‏‎‎‏‎‏‎‎‎‏‏‎‎‎‏‎‎‎‎‏‏‎‎‎‎‏‎‏‎‏‏‎‎‎‏‎Make smaller‎‏‎‎‏‎"</string>
+    <string name="font_size_make_larger_desc" msgid="4316986572233686061">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‏‎‏‏‏‏‏‎‏‎‎‏‎‎‎‎‎‏‎‎‎‏‏‎‏‎‏‎‎‏‎‎‎‎‏‎‎‎‎‏‏‏‏‎‏‎‏‏‏‏‎‎‎‎‏‎‏‏‎‏‎Make larger‎‏‎‎‏‎"</string>
+    <string name="font_size_preview_text" msgid="4818424565068376732">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‎‎‏‎‏‏‎‏‏‏‏‎‎‏‏‏‏‎‏‏‏‎‎‏‏‏‎‎‏‏‏‎‎‎‎‏‏‏‏‎‏‎‏‎‏‎‏‎‏‎‏‎‏‎‎‏‏‏‎‎‎Servez à ce monsieur une bière et des kiwis.‎‏‎‎‏‎"</string>
+    <string name="font_size_preview_text_headline" msgid="7955317408475392247">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‏‏‏‎‎‏‏‎‎‏‏‎‏‏‏‏‎‏‏‏‎‎‎‎‏‎‎‎‏‎‏‎‏‏‏‏‏‎‏‎‏‎‎‎‎‎‏‎‏‎‎‎‏‏‏‏‎‏‏‏‎Sample text‎‏‎‎‏‎"</string>
+    <string name="font_size_preview_text_title" msgid="1310536233106975546">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‏‎‏‏‏‎‎‎‎‏‎‏‎‏‎‏‏‏‏‏‎‎‏‏‏‏‎‏‎‏‎‏‎‏‏‎‎‏‏‏‎‏‎‎The Wonderful Wizard of Oz‎‏‎‎‏‎"</string>
+    <string name="font_size_preview_text_subtitle" msgid="4231671528173110093">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‏‎‏‎‏‎‏‏‏‎‎‏‏‏‏‎‏‎‏‎‏‏‎‏‎‏‎‏‏‎‏‎‎‎‏‎‏‏‏‎‎‏‎‎‏‎‎‎‎‎‏‏‎‏‎‎‏‏‎‏‎Chapter 11: The Wonderful Emerald City of Oz‎‏‎‎‏‎"</string>
+    <string name="font_size_preview_text_body" msgid="2846183528684496723">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‎‏‏‏‎‏‏‏‏‏‏‏‏‎‏‎‏‏‎‎‏‏‎‏‎‏‏‎‏‏‏‏‎‎‎‎‏‏‎‎‏‏‏‎‏‎‏‎‎‏‏‏‎‏‎‏‎‎‏‏‎Even with eyes protected by the green spectacles Dorothy and her friends were at first dazzled by the brilliancy of the wonderful City. The streets were lined with beautiful houses all built of green marble and studded everywhere with sparkling emeralds. They walked over a pavement of the same green marble, and where the blocks were joined together were rows of emeralds, set closely, and glittering in the brightness of the sun. The window panes were of green glass; even the sky above the City had a green tint, and the rays of the sun were green. ‎‏‎‎‏‏‎\n‎‏‎‎‏‏‏‎‎‏‎‎‏‏‎\n‎‏‎‎‏‏‏‎There were many people, men, women and children, walking about, and these were all dressed in green clothes and had greenish skins. They looked at Dorothy and her strangely assorted company with wondering eyes, and the children all ran away and hid behind their mothers when they saw the Lion; but no one spoke to them. Many shops stood in the street, and Dorothy saw that everything in them was green. Green candy and green pop-corn were offered for sale, as well as green shoes, green hats and green clothes of all sorts. At one place a man was selling green lemonade, and when the children bought it Dorothy could see that they paid for it with green pennies. ‎‏‎‎‏‏‎\n‎‏‎‎‏‏‏‎‎‏‎‎‏‏‎\n‎‏‎‎‏‏‏‎There seemed to be no horses nor animals of any kind; the men carried things around in little green carts, which they pushed before them. Everyone seeemed happy and contented and prosperous.‎‏‎‎‏‎"</string>
+    <string name="font_size_save" msgid="3450855718056759095">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‏‏‏‏‏‏‏‎‎‎‏‏‏‏‏‎‎‏‏‎‏‏‏‏‏‏‎‏‏‏‏‏‏‏‎‏‏‏‏‎‎‏‏‎‎‎‎‎‏‏‏‏‎‎‏‏‎‏‏‏‎OK‎‏‎‎‏‎"</string>
+    <string name="sdcard_setting" product="nosdcard" msgid="8281011784066476192">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‎‎‏‎‏‏‏‎‏‏‎‎‎‎‎‏‎‎‎‎‎‏‎‏‎‏‏‏‏‏‎‎‏‎‏‎‎‎‎‏‏‎‏‏‎‎‏‎‏‎‎‎‏‎‏‎‎‎‎‎‎USB storage‎‏‎‎‏‎"</string>
+    <string name="sdcard_setting" product="default" msgid="5922637503871474866">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‎‎‏‎‎‎‏‏‎‎‎‏‎‏‏‎‏‏‏‏‎‏‏‎‏‏‏‎‎‎‏‎‎‏‏‏‏‎‏‎‏‎‏‎‎‏‎‏‏‏‎‎‏‎‏‏‎‎‏‎‎SD card‎‏‎‎‏‎"</string>
+    <string name="bluetooth" msgid="5549625000628014477">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‏‏‎‏‎‎‎‎‎‏‎‎‎‎‏‏‏‎‏‎‏‎‎‎‏‎‎‎‏‏‏‎‏‏‏‏‎‎‎‎‏‏‏‏‎‏‎‎‏‏‎‏‏‎‎‎‏‏‎‏‎Bluetooth‎‏‎‎‏‎"</string>
+    <string name="bluetooth_is_discoverable" msgid="8373421452106840526">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‎‏‎‎‎‎‏‏‎‏‎‎‎‏‎‏‏‏‏‎‎‏‏‏‎‎‏‎‎‏‎‎‎‏‏‏‎‏‏‏‎‏‏‎‏‎‏‏‏‎‎‏‏‏‎‎‏‏‏‎‎Visible to all nearby Bluetooth devices (‎‏‎‎‏‏‎<xliff:g id="DISCOVERABLE_TIME_PERIOD">%1$s</xliff:g>‎‏‎‎‏‏‏‎)‎‏‎‎‏‎"</string>
+    <string name="bluetooth_is_discoverable_always" msgid="2849387702249327748">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‎‏‏‏‏‎‎‎‏‎‏‏‎‎‎‎‏‏‏‏‎‎‎‎‎‏‎‎‏‎‏‏‏‎‏‏‏‏‏‏‎‎‎‎‎‎‎‎‏‏‎‎‏‎‎‎‎‏‎‎‎Visible to all nearby Bluetooth devices‎‏‎‎‏‎"</string>
+    <string name="bluetooth_not_visible_to_other_devices" msgid="9120274591523391910">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‏‏‏‎‏‎‎‏‎‎‎‏‏‎‏‏‏‎‎‏‎‏‏‎‏‎‏‏‎‏‏‏‎‎‎‏‏‏‎‎‎‏‎‏‏‏‎‎‏‎‎‏‏‎‏‎‎‏‏‎‎Not visible to other Bluetooth devices‎‏‎‎‏‎"</string>
+    <string name="bluetooth_only_visible_to_paired_devices" msgid="2049983392373296028">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‏‏‎‎‎‏‏‏‎‎‏‏‎‎‎‎‎‎‎‏‎‎‎‎‏‎‎‎‏‎‏‏‏‎‎‏‏‏‎‏‏‏‎‎‎‏‎‎‏‎‏‏‏‎‎‏‏‏‎‎‎Only visible to paired devices‎‏‎‎‏‎"</string>
+    <string name="bluetooth_visibility_timeout" msgid="8002247464357005429">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‏‏‏‏‎‎‎‎‏‏‎‏‏‎‏‏‎‎‎‏‏‎‏‎‏‎‏‏‏‏‎‎‏‏‎‏‏‏‎‎‎‏‎‏‎‎‎‎‏‎‎‎‎‏‏‏‎‏‎‏‎Visibility timeout‎‏‎‎‏‎"</string>
+    <string name="bluetooth_lock_voice_dialing" msgid="3139322992062086225">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‏‎‏‏‏‎‎‏‎‎‎‏‎‎‎‏‏‏‎‏‏‎‏‎‎‎‎‎‏‏‏‎‎‎‎‏‎‎‎‏‎‎‏‏‏‎‏‏‏‏‎‎‎‏‎‏‎‎‎‏‎Lock voice dialing‎‏‎‎‏‎"</string>
+    <string name="bluetooth_lock_voice_dialing_summary" msgid="4741338867496787042">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‎‎‎‏‏‏‎‎‏‏‎‎‏‎‎‏‏‏‏‎‏‎‎‏‎‏‎‎‎‏‎‎‏‏‎‎‏‏‏‎‎‏‏‎‎‎‎‏‏‏‎‎‎‏‏‎‎‎‏‎‎Prevent use of the bluetooth dialer when the screen is locked‎‏‎‎‏‎"</string>
+    <string name="bluetooth_devices" msgid="1886018064039454227">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‏‎‏‎‎‎‏‎‏‏‎‎‎‏‏‏‏‎‏‏‎‏‏‎‏‏‏‏‏‏‎‎‏‎‏‏‎‎‎‎‏‎‏‎‏‎‏‎‎‏‏‎‎‎‎‏‎‎‏‏‎Bluetooth devices‎‏‎‎‏‎"</string>
+    <string name="bluetooth_device_name" msgid="8415828355207423800">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‎‏‎‎‏‏‎‎‏‎‏‏‎‎‎‎‎‏‏‏‎‏‎‎‏‏‎‎‏‏‎‏‎‎‏‎‏‏‎‎‏‏‎‎‎‏‏‎‎‏‏‏‎‎‏‏‏‎‎‎‎Device name‎‏‎‎‏‎"</string>
+    <string name="bluetooth_device_details" msgid="4594773497930028085">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‏‏‏‏‏‏‎‎‎‎‏‏‏‏‏‎‏‎‏‎‎‎‏‎‎‏‏‎‏‏‏‏‎‏‏‏‎‏‏‏‏‏‏‏‏‎‎‏‎‏‎‎‎‎‏‏‎‏‎‏‎Device settings‎‏‎‎‏‎"</string>
+    <string name="bluetooth_profile_details" msgid="6823621790324933337">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‏‏‏‎‏‎‏‏‎‎‏‎‎‏‎‏‏‏‏‏‏‏‎‏‏‏‎‏‎‏‏‏‏‏‎‏‏‏‏‎‏‏‏‎‏‏‎‎‎‎‏‎‏‏‎‏‏‎‎‏‎Profile settings‎‏‎‎‏‎"</string>
+    <string name="bluetooth_name_not_set" msgid="2653752006416027426">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‎‏‎‎‏‏‎‏‎‏‎‎‎‎‎‎‎‏‎‏‎‏‏‎‎‎‏‏‏‏‎‎‎‎‎‎‎‏‏‎‏‎‎‎‎‏‎‎‏‏‏‏‎‎‏‎‎‎‏‎‎No name set, using account name‎‏‎‎‏‎"</string>
+    <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="7830252930348734303">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‏‏‎‎‏‎‏‎‏‎‏‎‏‎‏‎‎‏‎‏‏‎‎‎‏‏‎‏‏‎‏‏‏‏‏‎‏‏‏‎‎‏‎‏‏‏‎‏‎‏‏‏‎‏‎‏‏‏‏‏‎Disconnect device?‎‏‎‎‏‎"</string>
+    <string name="bluetooth_disconnect_all_profiles" product="default" msgid="8208712728668714199">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‎‎‎‏‏‏‏‎‏‎‏‏‎‎‏‏‎‏‎‎‏‎‏‏‏‏‎‎‎‎‏‎‏‏‏‏‏‎‎‎‎‏‏‎‏‎‏‏‎‏‎‎‏‏‎‏‎‏‏‏‎Your phone will disconnect from ‎‏‎‎‏‏‎<xliff:g id="DEVICE_NAME">%1$s</xliff:g>‎‏‎‎‏‏‏‎.‎‏‎‎‏‎"</string>
+    <string name="bluetooth_disconnect_all_profiles" product="tablet" msgid="6611038575213485336">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‏‎‏‏‏‎‏‏‏‏‏‏‎‎‏‎‎‎‎‎‏‎‎‎‏‏‏‎‏‎‏‏‎‎‎‎‎‎‎‎‎‎‎‏‎‎‎‏‏‏‎‏‎‎‎‏‏‎‎‎‎Your tablet will disconnect from ‎‏‎‎‏‏‎<xliff:g id="DEVICE_NAME">%1$s</xliff:g>‎‏‎‎‏‏‏‎.‎‏‎‎‏‎"</string>
+    <string name="bluetooth_disconnect_all_profiles" product="device" msgid="3995834526315103965">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‎‏‏‏‎‏‏‏‎‏‎‎‎‎‎‎‏‏‏‎‎‏‎‏‎‏‎‎‏‎‏‏‎‎‏‎‎‏‎‎‎‎‎‎‏‏‎‎‎‏‏‎‏‏‎‏‏‏‎‏‎Your device will disconnect from ‎‏‎‎‏‏‎<xliff:g id="DEVICE_NAME">%1$s</xliff:g>‎‏‎‎‏‏‏‎.‎‏‎‎‏‎"</string>
+    <string name="bluetooth_disconnect_dialog_ok" msgid="3308586619539119106">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‏‏‎‏‏‏‏‎‏‎‏‎‎‏‏‏‎‏‏‎‎‎‎‎‎‎‎‎‎‎‏‏‎‏‏‎‎‎‏‏‏‏‎‏‎‏‎‏‏‏‎‎‎‎‎‎‎‎‏‎‎Disconnect‎‏‎‎‏‎"</string>
+    <string name="bluetooth_empty_list_user_restricted" msgid="603521233563983689">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‎‏‎‎‎‎‏‏‎‎‎‎‎‎‎‏‎‎‎‏‏‎‏‎‏‏‏‎‏‎‏‎‎‎‏‎‎‏‏‏‏‏‏‎‎‏‎‎‏‏‏‏‏‎‏‎‎‏‎‎‏‎You don’t have permission to change Bluetooth settings.‎‏‎‎‏‎"</string>
+    <string name="bluetooth_pairing_pref_title" msgid="7429413067477968637">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‎‏‏‏‎‎‎‏‏‎‏‎‏‎‎‏‎‎‏‏‏‏‎‏‎‎‏‎‎‏‏‏‏‎‎‎‏‎‏‎‏‎‏‏‎‏‏‎‎‏‏‎‏‏‏‏‏‏‎‏‎Pair new device‎‏‎‎‏‎"</string>
+    <string name="bluetooth_is_visible_message" msgid="6222396240776971862">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‎‏‏‎‎‏‎‏‏‎‏‎‎‏‏‎‎‏‎‎‎‏‏‎‏‎‎‏‏‏‎‎‏‏‏‏‎‎‏‏‏‏‎‎‏‏‎‎‎‏‏‎‎‏‎‏‎‏‏‎‎‎‏‎‎‏‏‎<xliff:g id="DEVICE_NAME">%1$s</xliff:g>‎‏‎‎‏‏‏‎ is visible to nearby devices while Bluetooth settings is open.‎‏‎‎‏‎"</string>
+    <string name="bluetooth_footer_mac_message" product="default" msgid="1109366350000220283">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‎‏‏‏‏‎‏‏‎‎‏‎‏‎‏‎‎‎‎‏‎‏‏‎‏‎‎‎‏‎‏‎‏‎‎‎‏‏‎‎‎‏‎‎‎‏‏‏‎‏‎‎‎‎‏‏‏‏‎‏‏‎Phone\'s Bluetooth address: ‎‏‎‎‏‏‎<xliff:g id="BLUETOOTH_MAC_ADDRESS">%1$s</xliff:g>‎‏‎‎‏‏‏‎‎‏‎‎‏‎"</string>
+    <string name="bluetooth_footer_mac_message" product="tablet" msgid="6807634484499166486">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‏‏‏‎‎‏‏‏‏‎‎‏‏‎‎‏‎‎‏‏‎‏‏‏‏‏‏‎‏‏‎‎‏‎‎‏‎‏‎‎‎‏‎‏‏‎‏‏‎‏‎‏‎‎‎‏‎‏‏‎‎Tablet\'s Bluetooth address: ‎‏‎‎‏‏‎<xliff:g id="BLUETOOTH_MAC_ADDRESS">%1$s</xliff:g>‎‏‎‎‏‏‏‎‎‏‎‎‏‎"</string>
+    <string name="bluetooth_footer_mac_message" product="device" msgid="8413944740341742061">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‎‏‎‎‏‏‎‎‎‏‎‎‎‏‎‏‎‏‏‎‎‎‏‎‏‎‎‏‏‎‎‎‏‏‏‏‏‏‎‏‎‏‎‏‏‏‏‏‏‎‎‏‏‏‏‎‏‏‎‏‎Device\'s Bluetooth address: ‎‏‎‎‏‏‎<xliff:g id="BLUETOOTH_MAC_ADDRESS">%1$s</xliff:g>‎‏‎‎‏‏‏‎‎‏‎‎‏‎"</string>
+    <string name="bluetooth_is_disconnect_question" msgid="5334933802445256306">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‏‎‏‎‎‎‎‎‏‎‎‏‎‏‏‏‏‏‏‎‎‎‎‎‎‏‏‏‎‎‎‏‎‎‏‎‏‏‏‏‏‎‎‏‎‎‏‏‎‏‏‎‎‏‏‏‎‎‏‎‎Disconnect ‎‏‎‎‏‏‎<xliff:g id="DEVICE_NAME">%1$s</xliff:g>‎‏‎‎‏‏‏‎?‎‏‎‎‏‎"</string>
+    <string name="bluetooth_broadcasting" msgid="16583128958125247">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‎‏‏‎‏‏‏‎‏‎‏‏‏‎‏‎‏‎‎‏‎‎‎‏‎‎‏‎‎‏‎‏‏‎‏‏‎‏‎‎‎‎‎‏‎‎‎‏‎‎‏‎‏‏‏‏‏‏‎Broadcasting‎‏‎‎‏‎"</string>
+    <string name="bluetooth_disable_profile_title" msgid="5916643979709342557">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‎‎‏‎‎‎‎‏‏‏‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‎‏‎‎‎‎‏‎‎‎‏‎‎‎‎‎‏‏‏‎‏‏‎‎‎‏‏‎‏‎‏‏‏‎‏‎Disable profile?‎‏‎‎‏‎"</string>
+    <string name="bluetooth_disable_profile_message" msgid="2895844842011809904">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‏‎‎‎‎‎‏‏‎‎‎‎‎‎‎‏‏‎‏‏‏‎‎‎‏‎‏‎‎‏‏‏‏‏‎‎‏‏‎‎‎‎‏‎‏‏‎‏‏‎‎‎‎‏‏‏‎‎‎‎‎This will disable:&lt;br&gt;&lt;b&gt;‎‏‎‎‏‏‎<xliff:g id="PROFILE_NAME">%1$s</xliff:g>‎‏‎‎‏‏‏‎&lt;/b&gt;&lt;br&gt;&lt;br&gt;From:&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">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‏‎‎‏‎‏‏‏‎‎‎‎‏‏‎‎‏‎‎‎‏‏‎‎‏‏‎‎‎‏‎‎‎‎‎‏‎‎‎‎‎‏‏‎‏‏‏‎‎‎‏‏‏‎‎‎‎‏‏‏‎Unnamed Bluetooth device‎‏‎‎‏‎"</string>
+    <string name="progress_scanning" msgid="192587958424295789">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‎‏‎‏‎‏‎‏‎‏‏‎‎‎‎‏‏‎‏‎‏‏‎‏‏‏‎‏‎‎‏‎‏‎‎‎‏‏‏‏‎‎‏‎‏‏‏‎‏‏‎‎‏‎‏‏‎‏‏‎‏‎Searching‎‏‎‎‏‎"</string>
+    <string name="bluetooth_no_devices_found" msgid="1085232930277181436">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‎‏‏‏‏‎‎‎‎‏‏‏‏‏‎‎‎‎‏‎‏‏‎‎‏‏‎‎‏‏‎‏‎‏‎‏‏‏‎‏‏‏‎‏‎‎‏‎‎‎‏‏‏‏‏‏‏‏‏‎‎‎No nearby Bluetooth devices were found.‎‏‎‎‏‎"</string>
+    <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="3144149432555230410">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‏‎‏‏‏‎‏‎‎‎‏‎‎‏‎‎‎‎‏‏‎‏‎‎‎‎‎‎‎‎‏‎‎‎‎‎‎‎‏‏‎‎‏‏‎‏‎‏‎‏‎‎‏‏‎‎‏‎‏‎‎Received files‎‏‎‎‏‎"</string>
+    <string name="device_picker" msgid="4978696506172252813">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‎‏‎‏‎‎‎‏‎‏‏‏‏‏‏‎‎‎‏‎‎‎‎‏‏‎‎‎‎‎‎‏‎‏‏‎‏‏‏‎‎‎‎‎‎‎‏‎‎‎‏‎‏‎‎‎‏‏‎‏‎Choose Bluetooth device‎‏‎‎‏‎"</string>
+    <string name="bluetooth_ask_enablement" msgid="3387222809404177525">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‏‏‏‏‎‎‎‎‎‎‎‏‏‏‎‏‎‏‎‏‎‎‏‏‎‎‏‎‏‏‏‎‏‎‎‏‏‎‏‎‎‎‏‎‏‏‏‏‏‏‎‎‎‏‏‏‎‏‎‏‎‎‏‎‎‏‏‎<xliff:g id="APP_NAME">%1$s</xliff:g>‎‏‎‎‏‏‏‎ wants to turn on Bluetooth‎‏‎‎‏‎"</string>
+    <string name="bluetooth_ask_disablement" msgid="5890386255790160573">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‎‎‎‏‏‎‏‏‏‏‏‎‏‏‎‏‏‎‏‏‎‎‎‏‎‏‏‏‎‏‎‎‏‏‏‎‎‎‏‏‎‏‏‏‎‎‏‏‏‎‏‎‏‎‏‏‏‏‎‏‎‎‏‎‎‏‏‎<xliff:g id="APP_NAME">%1$s</xliff:g>‎‏‎‎‏‏‏‎ wants to turn off Bluetooth‎‏‎‎‏‎"</string>
+    <string name="bluetooth_ask_enablement_no_name" msgid="1644353686104482763">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‎‏‏‎‏‏‎‏‎‎‎‏‏‏‏‎‏‎‏‎‏‏‏‏‎‏‏‏‎‎‏‎‎‎‎‏‎‏‎‏‏‏‎‎‏‎‏‎‎‎‏‏‏‏‎‎‏‎‏‏‎An app wants to turn on Bluetooth‎‏‎‎‏‎"</string>
+    <string name="bluetooth_ask_disablement_no_name" msgid="9218830122674868548">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‏‏‏‏‏‏‏‎‏‏‏‏‏‏‎‏‏‏‎‏‎‎‏‎‎‏‏‏‎‎‏‏‎‎‏‎‏‎‏‏‎‏‎‎‏‏‎‏‎‎‎‏‎‏‎‎‎‏‎‎‎An app wants to turn off Bluetooth‎‏‎‎‏‎"</string>
+    <string name="bluetooth_ask_discovery" product="tablet" msgid="4791779658660357386">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‎‎‏‎‎‏‏‏‏‏‏‏‏‏‎‏‎‎‏‎‎‎‏‏‎‏‏‎‎‎‏‎‏‏‎‎‎‏‏‎‎‏‎‎‏‎‏‎‎‏‎‏‎‎‎‎‏‎‏‎‎‎‏‎‎‏‏‎<xliff:g id="APP_NAME">%1$s</xliff:g>‎‏‎‎‏‏‏‎ wants to make your tablet visible to other Bluetooth devices for ‎‏‎‎‏‏‎<xliff:g id="TIMEOUT">%2$d</xliff:g>‎‏‎‎‏‏‏‎ seconds.‎‏‎‎‏‎"</string>
+    <string name="bluetooth_ask_discovery" product="default" msgid="1308225382575535366">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‎‎‏‎‎‎‏‎‎‏‏‏‏‏‎‎‎‎‎‎‎‎‎‎‏‏‎‏‏‏‎‏‏‏‏‎‏‎‎‏‎‎‎‎‎‏‏‏‎‏‎‏‎‎‎‎‎‏‏‎‎‎‏‎‎‏‏‎<xliff:g id="APP_NAME">%1$s</xliff:g>‎‏‎‎‏‏‏‎ wants to make your phone visible to other Bluetooth devices for ‎‏‎‎‏‏‎<xliff:g id="TIMEOUT">%2$d</xliff:g>‎‏‎‎‏‏‏‎ seconds.‎‏‎‎‏‎"</string>
+    <string name="bluetooth_ask_discovery_no_name" product="tablet" msgid="225715443477752935">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‎‏‎‏‏‎‎‏‎‎‎‎‏‏‏‏‎‎‏‏‎‏‏‏‏‏‏‏‏‏‏‏‏‏‏‎‎‏‏‎‎‏‏‏‏‏‎‏‎‏‏‎‎‎‏‏‎‎‏‏‏‎An app wants to make your tablet visible to other Bluetooth devices for ‎‏‎‎‏‏‎<xliff:g id="TIMEOUT">%1$d</xliff:g>‎‏‎‎‏‏‏‎ seconds.‎‏‎‎‏‎"</string>
+    <string name="bluetooth_ask_discovery_no_name" product="default" msgid="4949152735544109994">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‎‏‎‎‏‎‏‎‏‏‏‎‏‏‏‎‏‏‎‎‎‎‏‏‎‎‎‎‏‏‏‏‎‏‎‏‎‏‎‎‎‎‏‎‎‏‏‎‏‎‏‏‏‎‏‎‏‎‏‎‎An app wants to make your phone visible to other Bluetooth devices for ‎‏‎‎‏‏‎<xliff:g id="TIMEOUT">%1$d</xliff:g>‎‏‎‎‏‏‏‎ seconds.‎‏‎‎‏‎"</string>
+    <string name="bluetooth_ask_lasting_discovery" product="tablet" msgid="8528329166577187961">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‎‏‏‎‎‏‎‏‏‎‏‎‏‎‏‏‎‏‏‎‎‎‏‏‎‎‎‏‎‎‏‎‎‏‎‏‎‏‏‎‏‏‏‏‏‎‏‏‏‏‎‎‎‏‏‏‏‎‎‏‎‎‏‎‎‏‏‎<xliff:g id="APP_NAME">%1$s</xliff:g>‎‏‎‎‏‏‏‎ wants to make your tablet visible to other Bluetooth devices. You can change this later in Bluetooth settings.‎‏‎‎‏‎"</string>
+    <string name="bluetooth_ask_lasting_discovery" product="default" msgid="4398738575307583138">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‏‏‎‏‎‎‎‎‏‎‏‏‎‏‏‏‎‏‎‏‎‏‏‎‏‏‎‏‏‏‎‎‎‎‎‏‎‎‎‎‎‏‎‎‎‎‏‎‏‏‏‎‏‎‏‎‎‎‏‎‎‎‏‎‎‏‏‎<xliff:g id="APP_NAME">%1$s</xliff:g>‎‏‎‎‏‏‏‎ wants to make your phone visible to other Bluetooth devices. You can change this later in Bluetooth settings.‎‏‎‎‏‎"</string>
+    <string name="bluetooth_ask_lasting_discovery_no_name" product="tablet" msgid="1702590641426207062">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‎‏‏‏‏‎‏‎‎‎‎‎‏‏‎‏‎‎‎‏‎‎‏‎‏‎‏‎‏‏‏‎‏‏‎‎‎‎‎‏‏‏‎‏‎‎‎‏‎‎‎‏‎‏‎‏‎‏‏‎‎An app wants to make your tablet visible to other Bluetooth devices. You can change this later in Bluetooth settings.‎‏‎‎‏‎"</string>
+    <string name="bluetooth_ask_lasting_discovery_no_name" product="default" msgid="8549952177383992238">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‎‏‏‎‏‎‏‎‎‏‏‏‏‎‎‎‏‎‎‎‎‎‏‏‎‏‎‎‏‎‏‎‏‎‏‏‏‎‎‎‏‏‎‎‏‏‏‎‏‎‏‏‏‎‏‎‏‏‏‎‎An app wants to make your phone visible to other Bluetooth devices. You can change this later in Bluetooth settings.‎‏‎‎‏‎"</string>
+    <string name="bluetooth_ask_enablement_and_discovery" product="tablet" msgid="1141843490422565755">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‎‏‏‏‏‏‏‎‏‏‎‎‎‏‎‏‎‎‏‎‎‏‎‎‏‏‎‏‎‏‏‎‏‎‎‏‏‏‎‏‏‏‎‏‎‏‎‏‎‏‎‏‏‎‏‏‏‏‎‏‏‎‎‏‎‎‏‏‎<xliff:g id="APP_NAME">%1$s</xliff:g>‎‏‎‎‏‏‏‎ wants to turn on Bluetooth and make your tablet visible to other devices for ‎‏‎‎‏‏‎<xliff:g id="TIMEOUT">%2$d</xliff:g>‎‏‎‎‏‏‏‎ seconds.‎‏‎‎‏‎"</string>
+    <string name="bluetooth_ask_enablement_and_discovery" product="default" msgid="5195836980079191473">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‏‎‎‎‎‎‎‏‏‎‏‏‎‏‎‏‎‎‏‎‎‎‏‏‎‏‎‎‎‏‏‎‎‏‎‎‎‏‏‏‎‏‎‏‎‏‏‎‎‏‎‏‏‎‏‏‎‎‎‏‎‎‏‎‎‏‏‎<xliff:g id="APP_NAME">%1$s</xliff:g>‎‏‎‎‏‏‏‎ wants to turn on Bluetooth and make your phone visible to other devices for ‎‏‎‎‏‏‎<xliff:g id="TIMEOUT">%2$d</xliff:g>‎‏‎‎‏‏‏‎ seconds.‎‏‎‎‏‎"</string>
+    <string name="bluetooth_ask_enablement_and_discovery_no_name" product="tablet" msgid="7009338445281693765">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‎‎‎‏‎‏‎‎‎‏‏‎‎‎‏‎‏‏‎‎‎‎‏‎‏‏‎‏‏‏‎‎‏‏‎‏‏‎‎‎‎‎‎‏‎‎‎‏‎‎‎‎‎‏‎‎‎‏‎‏‎An app wants to turn on Bluetooth and make your tablet visible to other devices for ‎‏‎‎‏‏‎<xliff:g id="TIMEOUT">%1$d</xliff:g>‎‏‎‎‏‏‏‎ seconds.‎‏‎‎‏‎"</string>
+    <string name="bluetooth_ask_enablement_and_discovery_no_name" product="default" msgid="8386904242279878734">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‎‏‎‎‎‏‏‎‎‏‎‎‎‏‎‎‎‏‎‎‏‏‏‏‏‎‎‎‏‏‏‏‏‏‏‎‎‏‎‎‏‏‏‏‎‎‎‏‎‎‎‎‎‏‎‎‏‏‏‎‎An app wants to turn on Bluetooth and make your phone visible to other devices for ‎‏‎‎‏‏‎<xliff:g id="TIMEOUT">%1$d</xliff:g>‎‏‎‎‏‏‏‎ seconds.‎‏‎‎‏‎"</string>
+    <string name="bluetooth_ask_enablement_and_lasting_discovery" product="tablet" msgid="2279471426575892686">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‏‏‏‏‏‎‏‎‎‎‏‎‎‏‎‎‏‏‏‏‎‎‏‎‏‏‏‏‎‏‏‏‎‎‎‎‏‎‏‏‎‏‎‏‏‎‎‎‎‎‎‎‏‏‎‎‏‏‏‎‎‎‏‎‎‏‏‎<xliff:g id="APP_NAME">%1$s</xliff:g>‎‏‎‎‏‏‏‎ wants to turn on Bluetooth and make your tablet visible to other devices. You can change this later in Bluetooth settings.‎‏‎‎‏‎"</string>
+    <string name="bluetooth_ask_enablement_and_lasting_discovery" product="default" msgid="6961969825475461450">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‎‎‎‎‏‎‎‏‏‏‎‏‏‏‏‎‎‎‏‎‏‎‏‎‏‎‏‏‏‎‎‏‎‎‎‎‎‏‏‏‎‏‎‎‎‎‎‎‎‎‎‏‎‏‎‎‏‎‏‎‎‎‏‎‎‏‏‎<xliff:g id="APP_NAME">%1$s</xliff:g>‎‏‎‎‏‏‏‎ wants to turn on Bluetooth and make your phone visible to other devices. You can change this later in Bluetooth settings.‎‏‎‎‏‎"</string>
+    <string name="bluetooth_ask_enablement_and_lasting_discovery_no_name" product="tablet" msgid="692477613671555006">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‎‏‎‎‏‏‎‎‏‏‏‎‎‎‎‏‎‏‏‎‎‏‎‏‏‏‎‎‎‏‎‎‎‎‎‎‏‏‏‎‎‏‏‎‏‏‎‎‏‏‏‏‏‏‎‏‏‏‏‏‎‎An app wants to turn on Bluetooth and make your tablet visible to other devices. You can change this later in Bluetooth settings.‎‏‎‎‏‎"</string>
+    <string name="bluetooth_ask_enablement_and_lasting_discovery_no_name" product="default" msgid="6374480121751597648">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‏‎‎‎‎‏‏‏‎‏‏‎‏‎‏‏‎‎‏‏‏‏‏‎‎‏‎‏‏‎‏‏‎‏‎‎‏‏‎‎‏‎‏‎‏‏‏‏‎‎‏‎‎‏‎‏‎‎‎‎‎An app wants to turn on Bluetooth and make your phone visible to other devices. You can change this later in Bluetooth settings.‎‏‎‎‏‎"</string>
+    <string name="bluetooth_turning_on" msgid="4850574877288036646">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‎‎‏‏‎‏‎‏‎‎‎‎‏‎‏‏‎‏‎‎‎‎‏‎‎‏‏‎‏‏‎‎‎‏‎‏‎‎‏‎‏‏‏‏‏‏‏‏‏‎‎‏‎‎‏‎‎‏‏‎‎Turning Bluetooth on…‎‏‎‎‏‎"</string>
+    <string name="bluetooth_turning_off" msgid="2337747302892025192">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‎‎‎‎‎‏‏‏‎‎‎‏‎‏‎‏‏‎‎‎‏‏‎‎‏‎‎‏‎‎‏‏‏‎‏‏‏‎‎‎‎‎‎‏‏‎‏‏‎‏‎‏‎‏‏‎‏‎‎‎‎Turning Bluetooth off…‎‏‎‎‏‎"</string>
+    <string name="bluetooth_auto_connect" msgid="40711424456733571">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‎‎‎‏‎‎‏‎‎‎‎‏‎‏‎‎‎‏‎‏‏‎‏‎‎‏‏‎‎‏‎‏‎‎‏‎‎‎‎‏‎‏‏‎‎‏‏‎‎‏‏‏‎‎‎‎‎‏‏‎Auto-connect‎‏‎‎‏‎"</string>
+    <string name="bluetooth_connection_permission_request" msgid="4747918249032890077">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‎‎‎‏‏‏‏‎‎‎‏‏‏‏‏‏‏‏‏‎‎‏‏‏‏‏‎‏‏‏‏‏‎‎‎‎‎‎‏‏‎‎‏‏‎‎‏‏‎‏‏‎‏‏‎‏‏‏‎‏‎Bluetooth connection request‎‏‎‎‏‎"</string>
+    <string name="bluetooth_connection_notif_message" msgid="3603316575471431846">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‎‎‏‎‎‎‎‎‎‎‎‏‏‎‎‎‏‏‎‏‎‏‎‏‎‏‎‏‏‎‎‎‏‏‏‎‎‏‎‎‎‎‎‎‎‏‏‏‎‎‎‎‏‎‏‎‎‏‏‎‎Tap to connect to \"‎‏‎‎‏‏‎<xliff:g id="DEVICE_NAME">%1$s</xliff:g>‎‏‎‎‏‏‏‎\".‎‏‎‎‏‎"</string>
+    <string name="bluetooth_connection_dialog_text" msgid="8455427559949998023">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‎‏‎‏‎‏‎‏‎‏‏‏‏‎‏‏‎‏‏‎‏‎‎‏‎‎‎‏‎‎‏‎‎‏‏‎‏‏‎‏‏‏‏‎‎‎‎‏‎‏‏‏‏‏‎‎‎‏‏‏‎Do you want to connect to \"‎‏‎‎‏‏‎<xliff:g id="DEVICE_NAME">%1$s</xliff:g>‎‏‎‎‏‏‏‎\"?‎‏‎‎‏‎"</string>
+    <string name="bluetooth_phonebook_request" msgid="3951420080540915279">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‎‏‏‎‏‏‎‏‎‏‏‎‎‏‎‎‎‎‏‏‏‎‏‎‎‎‎‎‏‎‏‏‎‎‏‎‏‏‏‏‏‏‎‎‏‎‎‏‎‏‏‎‎‏‎‎‏‏‏‏‎Phone book access request‎‏‎‎‏‎"</string>
+    <string name="bluetooth_pb_acceptance_dialog_text" msgid="8930347091018455505">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‏‎‏‏‏‏‏‎‏‏‏‎‏‏‏‏‎‏‏‏‎‏‎‏‏‏‎‏‎‏‎‎‎‎‎‏‎‎‎‏‏‎‎‏‎‎‎‏‏‎‎‏‏‏‎‏‎‎‎‏‎‎‏‎‎‏‏‎<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g>‎‏‎‎‏‏‏‎ wants to access your contacts and call history. Give access to ‎‏‎‎‏‏‎<xliff:g id="DEVICE_NAME_1">%2$s</xliff:g>‎‏‎‎‏‏‏‎?‎‏‎‎‏‎"</string>
+    <string name="bluetooth_remember_choice" msgid="6919682671787049800">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‎‎‎‎‎‎‎‎‎‏‏‏‏‎‏‎‎‏‏‎‏‎‏‏‏‎‏‎‎‏‎‏‏‎‏‎‎‏‎‎‏‎‏‏‎‎‎‎‎‎‏‏‎‏‎‎‏‎‎‎‎Don’t ask again‎‏‎‎‏‎"</string>
+    <string name="bluetooth_pb_remember_choice" msgid="3622898084442402071">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‎‎‏‎‎‏‎‎‎‏‏‏‎‎‎‏‏‏‏‎‏‎‎‏‏‏‎‎‏‏‏‎‎‏‎‎‏‎‏‎‎‎‎‏‏‏‏‎‏‏‎‏‎‎‎‏‎‏‏‏‎Don’t ask again‎‏‎‎‏‎"</string>
+    <string name="bluetooth_map_request" msgid="4595727689513143902">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‏‏‏‏‏‏‎‎‎‏‏‏‎‏‎‎‏‏‎‏‏‏‏‏‏‏‎‎‎‎‎‎‎‎‎‏‏‏‎‏‏‎‏‏‏‎‎‎‏‏‏‎‎‏‎‏‏‏‏‎‎Message access request‎‏‎‎‏‎"</string>
+    <string name="bluetooth_map_acceptance_dialog_text" msgid="8712508202081143737">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‏‎‎‎‏‏‏‎‏‎‎‏‎‎‎‎‏‏‎‎‎‎‎‎‏‏‎‎‏‎‎‎‎‏‏‏‏‎‏‏‏‎‎‏‎‏‎‎‏‎‏‏‏‎‏‏‏‎‎‏‎%1$s wants to access your messages. Give access to %2$s?‎‏‎‎‏‎"</string>
+    <string name="bluetooth_sap_request" msgid="2669762224045354417">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‎‏‎‏‎‎‎‎‏‏‎‎‏‏‏‎‎‏‏‎‏‎‎‏‏‎‎‏‎‎‎‎‎‏‏‎‏‏‏‏‏‎‏‎‏‏‏‎‏‏‎‏‏‎‏‏‎‎‎‏‎SIM access request‎‏‎‎‏‎"</string>
+    <string name="bluetooth_sap_acceptance_dialog_text" msgid="4414253873553608690">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‏‏‎‏‎‏‎‎‎‎‏‎‏‎‎‏‎‏‎‎‏‎‎‎‎‎‏‎‏‎‏‎‎‎‎‏‏‎‎‎‏‏‏‎‎‎‎‎‏‏‏‏‏‏‏‏‎‎‏‎‎‎‏‎‎‏‏‎<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g>‎‏‎‎‏‏‏‎ wants to access your SIM card. Granting access to the SIM card will disable data connectivity on your device for the duration of the connection. Give access to ‎‏‎‎‏‏‎<xliff:g id="DEVICE_NAME_1">%2$s?</xliff:g>‎‏‎‎‏‏‏‎‎‏‎‎‏‎"</string>
+    <string name="bluetooth_device_name_summary" msgid="522235742194965734">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‎‏‏‏‏‏‎‎‏‏‏‏‏‏‎‏‎‏‏‎‏‎‏‎‏‎‎‎‏‏‏‏‏‏‏‏‏‎‏‎‎‎‏‎‏‏‎‎‎‏‏‏‎‎‏‏‏‎‎‏‏‎‎Visible as “‎‏‎‎‏‏‎<xliff:g id="DEVICE_NAME">^1</xliff:g>‎‏‎‎‏‏‏‎” to other devices‎‏‎‎‏‎"</string>
+    <string name="bluetooth_paired_device_title" msgid="8638994696317952019">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‎‏‏‏‏‏‏‎‎‎‏‏‏‏‎‏‏‏‏‏‏‏‏‎‎‏‏‏‏‎‏‎‏‎‏‎‏‎‎‎‎‎‏‏‏‏‏‎‎‎‎‎‎‎‎‏‎‎‏‏‎Your devices‎‏‎‎‏‎"</string>
+    <string name="bluetooth_pairing_page_title" msgid="7712127387361962608">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‏‎‏‏‎‎‎‎‎‏‏‎‏‏‏‏‏‎‏‎‏‏‏‏‏‏‏‏‏‎‎‎‏‎‏‎‎‏‎‎‎‏‎‏‎‏‏‎‏‎‏‎‎‏‏‏‎‎‎‎‎Pair new device‎‏‎‎‏‎"</string>
+    <string name="date_and_time" msgid="9062980487860757694">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‏‏‎‏‏‏‎‎‎‏‏‎‎‎‏‎‏‏‎‎‏‎‏‏‏‏‎‎‎‏‏‎‏‎‎‏‎‎‏‏‏‏‎‎‏‎‏‎‎‏‎‎‏‎‏‏‏‏‏‎‎Date &amp; time‎‏‎‎‏‎"</string>
+    <string name="choose_timezone" msgid="1362834506479536274">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‎‎‏‎‏‏‏‎‏‎‎‏‏‏‎‎‎‎‏‎‏‏‎‎‎‎‏‏‎‏‎‏‎‏‏‎‎‏‎‏‏‎‏‏‏‎‎‎‏‎‎‎‏‎‎‏‎‎‏‎‎Choose time zone‎‏‎‎‏‎"</string>
+    <!-- no translation found for intent_sender_data_label (6332324780477289261) -->
+    <skip />
+    <string name="intent_sender_sendbroadcast_text" msgid="1415735148895872715">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‎‎‏‏‏‎‏‎‎‏‎‏‏‎‏‏‎‎‏‏‏‎‎‏‏‏‎‏‏‏‏‏‎‏‎‏‏‏‏‏‏‎‎‏‎‎‏‎‎‏‏‎‏‏‎‎‏‎‏‏‎Send ‎‏‎‎‏‏‎<xliff:g id="BROADCAST">broadcast</xliff:g>‎‏‎‎‏‏‏‎‎‏‎‎‏‎"</string>
+    <string name="intent_sender_action_label" msgid="616458370005452389">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‎‏‎‎‎‏‎‎‎‏‏‏‎‎‎‎‏‏‎‎‏‏‎‎‏‏‏‏‏‎‎‎‏‎‎‏‎‏‏‏‏‏‏‎‏‏‏‎‎‎‏‏‎‎‏‏‎‎‏‎‏‎‎‏‎‎‏‏‎<xliff:g id="ACTION">Action</xliff:g>‎‏‎‎‏‏‏‎:‎‏‎‎‏‎"</string>
+    <string name="intent_sender_startactivity_text" msgid="5080516029580421895">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‎‏‏‎‏‎‎‎‎‎‎‏‏‎‎‏‏‏‏‎‎‏‏‎‏‎‎‏‎‏‎‎‎‎‏‎‏‏‎‏‎‎‎‏‏‎‏‎‏‎‏‏‎‎‎‎‎‏‏‏‎Start ‎‏‎‎‏‏‎<xliff:g id="ACTIVITY">activity</xliff:g>‎‏‎‎‏‏‏‎‎‏‎‎‏‎"</string>
+    <string name="intent_sender_resource_label" msgid="6963659726895482829">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‎‎‎‎‏‎‏‎‎‎‏‏‏‏‏‎‎‎‏‏‏‎‏‎‎‎‎‎‎‏‏‎‎‏‏‎‎‏‎‎‏‏‎‎‏‎‎‎‎‏‏‏‏‏‎‎‏‏‎‏‎‎‏‎‎‏‏‎<xliff:g id="RESOURCE">Resource</xliff:g>‎‏‎‎‏‏‏‎:‎‏‎‎‏‎"</string>
+    <string name="intent_sender_account_label" msgid="465210404475603404">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‎‏‏‏‏‎‎‏‏‏‎‏‎‎‏‏‎‎‎‎‏‎‎‏‏‎‎‏‎‏‏‏‏‎‏‎‎‎‏‎‎‏‎‏‎‏‏‎‎‎‏‎‎‏‏‏‎‎‏‏‎‎‎Account:‎‏‎‎‏‎"</string>
+    <string name="proxy_settings_title" msgid="9049437837600320881">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‏‏‎‏‏‎‎‏‎‏‏‎‎‎‎‎‏‏‏‏‏‏‎‎‎‏‎‎‎‏‏‎‏‏‏‏‎‎‏‎‎‏‎‏‎‏‏‎‏‏‎‏‎‏‏‏‎‎‎‏‎Proxy‎‏‎‎‏‎"</string>
+    <string name="proxy_clear_text" msgid="5555400754952012657">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‏‏‎‏‎‎‎‏‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‎‏‏‎‏‏‎‎‎‎‏‏‏‏‏‎‏‏‎‏‎‎‎‎‎‎‎‏‏‎‏‏‏‎‎‎‏‎Clear‎‏‎‎‏‎"</string>
+    <string name="proxy_port_label" msgid="5655276502233453400">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‏‏‏‎‎‏‏‏‏‎‏‏‏‎‎‏‎‏‎‎‎‎‎‎‎‏‎‎‎‎‎‎‏‏‏‎‎‎‏‏‏‏‎‏‎‎‎‏‎‎‏‏‎‏‎‏‏‎‎‎‎Proxy port‎‏‎‎‏‎"</string>
+    <string name="proxy_exclusionlist_label" msgid="7700491504623418701">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‏‎‏‎‏‏‎‏‏‏‎‏‏‎‏‎‎‏‎‎‎‎‏‏‏‎‎‏‎‏‏‏‏‎‎‎‏‏‏‏‏‏‎‏‏‏‏‏‏‏‎‏‎‏‎‎‏‏‎‏‎Bypass proxy for‎‏‎‎‏‎"</string>
+    <string name="proxy_defaultView_text" msgid="6387985519141433291">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‏‎‎‎‏‎‏‎‎‏‏‎‏‎‏‎‏‏‏‎‏‏‏‏‏‏‎‎‎‎‎‏‎‎‏‎‏‏‎‎‎‎‏‏‏‎‏‎‏‏‏‏‏‏‎‎‏‎‏‏‎Restore defaults‎‏‎‎‏‎"</string>
+    <string name="proxy_action_text" msgid="2957063145357903951">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‏‎‎‏‎‎‎‎‏‎‎‏‏‎‎‏‏‎‎‏‎‏‎‎‎‎‏‏‎‏‏‏‎‏‎‏‎‏‏‏‎‏‎‏‎‎‎‎‏‎‎‎‎‏‎‎‏‏‏‏‎Done‎‏‎‎‏‎"</string>
+    <string name="proxy_hostname_label" msgid="8490171412999373362">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‎‏‎‏‏‏‎‏‎‎‏‏‎‎‏‎‎‏‎‏‏‏‏‎‏‎‏‎‏‏‎‏‎‎‏‎‎‎‎‎‎‎‎‏‎‎‎‎‎‎‏‎‎‎‏‏‎‎‏‎‎Proxy hostname‎‏‎‎‏‎"</string>
+    <string name="proxy_error" msgid="8926675299638611451">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‏‎‏‏‏‏‏‎‎‎‎‏‏‏‏‎‏‎‏‏‏‏‏‎‎‎‏‏‏‎‏‏‎‏‎‎‎‎‏‏‎‏‏‎‏‎‎‎‏‏‎‏‏‏‏‏‏‎‏‏‎Attention‎‏‎‎‏‎"</string>
+    <string name="proxy_error_dismiss" msgid="4993171795485460060">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‎‏‎‏‎‏‎‎‏‎‏‏‎‏‎‎‏‏‏‏‎‏‎‎‏‎‏‏‎‎‎‎‎‏‎‎‎‏‏‎‏‎‎‏‎‎‎‎‎‏‏‎‎‏‎‏‏‏‎‎‎OK‎‏‎‎‏‎"</string>
+    <string name="proxy_error_invalid_host" msgid="6865850167802455230">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‏‏‏‏‎‏‎‎‏‎‎‎‎‏‏‎‎‏‏‎‎‏‎‏‏‎‎‏‏‏‎‎‏‏‎‎‏‏‏‎‏‎‏‏‏‏‏‎‎‏‎‎‏‎‏‏‏‏‏‎‎The hostname you typed isn’t valid.‎‏‎‎‏‎"</string>
+    <string name="proxy_error_invalid_exclusion_list" msgid="678527645450894773">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‎‏‎‎‏‎‏‏‎‏‎‏‎‏‎‎‏‏‏‎‏‎‏‎‎‏‏‎‎‎‏‏‎‏‏‎‏‎‏‏‎‎‎‎‏‏‏‏‏‏‏‎‏‏‎‏‏‎‏‎‏‎The exclusion list you typed isn’t properly formatted. Type a comma-separated list of excluded domains.‎‏‎‎‏‎"</string>
+    <string name="proxy_error_empty_port" msgid="5539106187558215246">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‏‏‎‎‏‏‎‏‏‏‏‎‏‏‎‏‏‎‏‏‏‎‏‏‏‎‏‎‏‏‏‎‏‎‏‎‏‎‎‏‎‎‏‏‎‏‎‏‏‏‏‎‎‏‎‎‏‏‏‎‎You need to complete the port field.‎‏‎‎‏‎"</string>
+    <string name="proxy_error_empty_host_set_port" msgid="2451694104858226781">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‎‎‏‎‎‎‎‎‎‏‏‎‎‎‏‎‏‎‏‎‏‏‎‎‏‏‎‎‎‏‏‏‏‎‎‏‏‏‏‏‏‏‏‎‎‏‏‏‎‎‎‎‎‏‎‏‏‏‎‏‎The port field must be empty if the host field is empty.‎‏‎‎‏‎"</string>
+    <string name="proxy_error_invalid_port" msgid="5988270202074492710">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‎‎‏‏‎‎‎‏‏‎‏‎‏‎‎‏‏‏‎‎‎‎‎‎‎‏‎‏‏‎‎‎‎‏‎‏‏‎‏‏‎‏‎‎‏‏‏‎‏‏‏‏‎‎‏‎‎‏‏‎‎The port you typed isn’t valid.‎‏‎‎‏‎"</string>
+    <string name="proxy_warning_limited_support" msgid="7229337138062837422">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‎‏‎‎‎‏‎‏‎‎‏‏‏‏‎‎‎‎‏‏‏‏‎‏‎‎‏‏‎‎‎‎‏‎‏‏‏‏‎‎‎‏‏‎‎‏‎‎‎‏‏‎‏‎‏‎‏‏‏‎‎The HTTP proxy is used by the browser but may not be used by the other apps.‎‏‎‎‏‎"</string>
+    <string name="proxy_url_title" msgid="7185282894936042359">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‎‎‏‏‏‎‏‏‎‏‏‏‎‏‎‎‎‎‎‎‏‎‏‏‏‎‎‏‎‏‎‎‎‎‏‏‎‏‎‏‏‎‏‎‎‏‏‎‏‎‏‏‎‏‏‏‎‏‏‏‎PAC URL: ‎‏‎‎‏‎ "</string>
+    <string name="radio_info_signal_location_label" msgid="3242990404410530456">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‏‏‎‏‎‎‎‎‎‎‎‏‎‏‏‎‏‎‏‎‏‎‎‏‎‏‏‏‎‎‏‏‏‎‎‎‏‏‏‎‎‎‏‏‏‏‎‏‏‎‏‎‏‎‎‏‏‎‎‎‎Cell Location Info (deprecated):‎‏‎‎‏‎"</string>
+    <string name="radio_info_neighboring_location_label" msgid="5766020323342985397">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‎‎‎‎‎‎‎‎‎‏‎‏‎‎‎‎‎‏‎‎‏‏‏‎‏‏‏‏‎‎‏‏‎‏‎‎‏‎‎‎‏‎‏‎‏‎‏‎‏‎‎‎‏‎‏‏‎‏‎‏‎Neighbor Cell Info (deprecated):‎‏‎‎‏‎"</string>
+    <string name="radio_info_cell_info_refresh_rate" msgid="7062777594049622128">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‎‎‏‎‎‎‎‎‎‏‎‎‎‎‎‎‎‏‏‎‏‏‎‎‏‏‎‏‎‎‏‏‎‏‎‎‏‏‏‎‏‎‏‎‎‏‏‏‎‎‎‎‎‏‏‏‎‎‎‎‎Cell Info Refresh Rate:‎‏‎‎‏‎"</string>
+    <string name="radio_info_cellinfo_label" msgid="6213223844927623098">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‎‏‏‎‎‎‏‏‏‎‎‏‏‏‎‎‏‏‏‎‎‎‏‎‏‎‏‎‏‏‏‏‏‎‏‎‏‏‏‎‎‏‎‏‏‏‎‎‏‏‏‏‏‎‏‏‏‎‏‎‎All Cell Measurement Info:‎‏‎‎‏‎"</string>
+    <string name="radio_info_dcrtinfo_label" msgid="4062076024399431876">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‏‎‎‎‎‏‎‏‏‏‏‏‎‏‏‎‎‏‎‎‏‎‎‏‏‏‏‏‎‏‎‏‎‏‎‎‏‏‏‏‎‏‎‏‏‎‎‎‏‎‎‎‏‏‎‎‎‏‎‎‎Data Connection Real-Time Info:‎‏‎‎‏‎"</string>
+    <string name="radio_info_gprs_service_label" msgid="4209624131644060517">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‏‎‏‎‎‏‏‎‏‎‏‏‏‎‎‏‎‏‏‎‏‏‎‏‏‎‎‎‎‎‎‏‏‏‎‎‏‎‎‎‏‏‏‎‎‏‏‏‎‎‏‏‎‏‏‎‎‏‎‏‎Data Service:‎‏‎‎‏‎"</string>
+    <string name="radio_info_roaming_label" msgid="6141505430275138647">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‎‏‎‏‎‎‏‏‏‎‏‏‎‎‎‎‎‎‏‎‏‎‏‎‎‏‏‎‎‏‎‏‎‏‎‏‏‎‏‎‏‏‏‎‏‎‏‎‎‏‎‎‎‏‎‏‎‏‏‏‎Roaming:‎‏‎‎‏‎"</string>
+    <string name="radio_info_imei_label" msgid="1220524224732944192">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‎‎‎‎‏‏‏‏‎‎‎‎‎‎‏‎‏‏‎‎‎‏‎‏‎‎‎‎‏‏‎‏‎‏‏‎‏‏‏‏‎‏‏‏‎‏‎‏‎‏‏‏‎‏‎‎‎‎‎‎‎IMEI:‎‏‎‎‏‎"</string>
+    <string name="radio_info_call_redirect_label" msgid="2743797189722106231">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‎‏‏‎‎‎‎‏‎‎‏‏‏‏‏‎‏‏‎‏‎‎‎‎‎‎‎‏‏‎‏‏‏‏‎‏‎‎‎‏‏‎‎‏‏‏‏‎‏‎‎‏‎‏‏‏‎‏‏‏‎Call Redirect:‎‏‎‎‏‎"</string>
+    <string name="radio_info_ppp_resets_label" msgid="3587319503902576102">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‎‎‎‏‏‏‎‎‏‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‏‎‏‎‎‎‏‎‏‎‏‏‏‏‏‎‎‎‏‏‎‎‎‏‏‎‏‏‏‏‎‎‏‏‎‎Number of PPP Reset Since Boot:‎‏‎‎‏‎"</string>
+    <string name="radio_info_current_network_label" msgid="9151285540639134945">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‏‏‏‎‏‏‏‏‏‏‏‏‏‏‏‎‎‏‎‏‏‎‏‏‎‏‏‎‏‎‏‎‏‏‏‏‏‏‏‏‎‏‏‎‏‏‎‏‎‏‎‎‏‏‏‎‎‎‎‏‎Current Network:‎‏‎‎‏‎"</string>
+    <string name="radio_info_ppp_received_label" msgid="363579470428151850">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‎‏‏‏‎‏‎‎‎‎‏‎‏‏‏‎‏‏‎‎‎‏‏‎‎‏‏‎‏‎‎‎‎‏‏‏‏‎‎‏‏‏‏‏‏‎‏‎‏‎‎‎‎‎‎‎‏‎‏‎‏‎‎Data Received:‎‏‎‎‏‎"</string>
+    <string name="radio_info_gsm_service_label" msgid="1370863866816125489">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‎‎‏‏‎‎‎‎‎‏‏‎‎‏‎‎‏‎‎‏‎‏‏‎‏‏‎‎‎‏‏‏‏‎‎‎‏‏‏‏‏‏‏‎‎‏‎‏‏‎‏‎‎‎‏‏‎‎‎‏‎Voice Service:‎‏‎‎‏‎"</string>
+    <string name="radio_info_signal_strength_label" msgid="5155734002519307416">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‎‏‏‏‏‎‎‎‏‏‎‎‏‏‎‏‏‎‎‎‏‏‎‎‎‎‏‎‎‏‎‏‎‎‎‎‏‎‎‏‎‎‎‎‏‏‏‏‎‏‎‎‏‎‎‏‏‎‎‎‎Signal Strength:‎‏‎‎‏‎"</string>
+    <string name="radio_info_call_status_label" msgid="2611065018172747413">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‎‏‎‎‎‎‏‏‏‏‎‎‎‏‎‏‏‏‎‏‏‏‎‎‏‏‎‎‏‏‎‎‏‏‎‏‏‎‏‎‎‎‏‎‏‎‏‎‏‏‏‎‏‎‎‏‎‏‎‏‎Voice Call Status:‎‏‎‎‏‎"</string>
+    <string name="radio_info_ppp_sent_label" msgid="7748668735880404586">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‏‎‏‏‏‎‎‎‏‎‎‎‏‏‎‎‏‏‎‏‎‎‏‎‏‎‎‏‎‎‏‏‏‏‎‎‎‏‎‏‎‎‏‏‏‎‎‏‏‏‏‎‎‏‏‎‏‎‏‎‎Data Sent:‎‏‎‎‏‎"</string>
+    <string name="radio_info_message_waiting_label" msgid="1037302619943328273">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‎‏‏‏‎‎‏‏‎‎‏‎‏‎‎‏‏‏‏‎‏‎‎‏‏‏‏‎‎‏‎‏‎‏‎‏‎‎‏‎‎‏‏‎‏‏‏‎‏‏‎‏‎‎‎‎‏‎‎‎‏‎Message Waiting:‎‏‎‎‏‎"</string>
+    <string name="radio_info_phone_number_label" msgid="7942153178953255231">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‏‏‏‎‎‎‏‏‏‎‎‎‎‎‏‏‎‎‏‎‎‎‏‏‏‏‎‎‏‎‏‎‎‏‏‏‎‎‏‏‏‏‏‏‏‎‎‎‏‎‎‏‎‎‏‏‏‏‏‏‎Phone Number:‎‏‎‎‏‎"</string>
+    <string name="radio_info_band_mode_label" msgid="8730871744887454509">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‏‎‎‏‎‎‏‎‏‎‏‎‎‏‎‎‏‎‎‏‏‎‎‏‏‎‎‎‎‎‎‎‎‏‎‏‏‎‎‎‎‎‏‎‏‏‏‏‏‎‏‏‎‎‏‎‏‏‎‏‎Select Radio Band‎‏‎‎‏‎"</string>
+    <string name="radio_info_voice_network_type_label" msgid="1443496502370667071">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‎‏‎‎‎‎‎‎‏‎‎‎‎‏‎‏‎‏‎‎‎‏‏‎‏‎‏‏‏‏‎‎‎‎‏‎‎‏‎‏‎‎‏‎‏‎‎‎‏‎‏‎‎‎‏‏‏‏‏‏‎Voice Network Type:‎‏‎‎‏‎"</string>
+    <string name="radio_info_data_network_type_label" msgid="7094323145105149312">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‎‎‏‎‎‏‏‏‎‏‎‎‎‎‎‏‏‎‎‏‎‏‎‏‎‎‎‎‎‎‏‎‏‎‎‏‏‏‎‏‎‎‏‏‎‎‎‎‏‏‎‏‏‎‎‎‎‎‎‎‎Data Network Type:‎‏‎‎‏‎"</string>
+    <string name="radio_info_set_perferred_label" msgid="3511830813500105512">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‎‎‎‎‏‎‏‏‏‏‎‎‏‎‎‎‎‏‏‏‏‎‎‎‎‏‎‎‏‎‏‏‎‏‎‏‏‏‏‏‎‎‎‏‏‏‏‎‎‎‏‏‎‎‏‎‏‎‎‎‎Set Preferred Network Type:‎‏‎‎‏‎"</string>
+    <string name="radio_info_ping_hostname_v4" msgid="7045103377818314709">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‎‎‎‏‏‏‎‎‎‏‎‏‎‎‏‏‏‏‎‎‎‎‏‏‎‎‏‎‎‎‎‏‎‎‎‎‏‏‎‎‎‎‏‏‏‏‏‎‎‏‏‏‏‏‎‏‎‏‎‏‎Ping Hostname(www.google.com) IPv4:‎‏‎‎‏‎"</string>
+    <string name="radio_info_ping_hostname_v6" msgid="1130906124160553954">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‎‏‏‏‏‏‎‏‏‎‎‎‏‏‏‎‎‏‎‎‏‎‎‏‎‎‎‎‎‏‏‎‎‏‏‎‎‏‏‏‎‎‏‏‏‎‏‎‏‎‎‏‏‏‏‏‎‎‎‏‎‎Ping Hostname(www.google.com) IPv6:‎‏‎‎‏‎"</string>
+    <string name="radio_info_http_client_test" msgid="2382286093023138339">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‎‎‎‏‎‎‎‎‏‏‏‏‏‎‎‏‎‏‎‎‏‎‎‏‎‏‎‎‎‏‏‎‎‏‏‏‏‏‏‏‏‏‏‏‎‏‎‏‎‎‏‎‎‎‏‎‎‎‏‏‎HTTP Client Test:‎‏‎‎‏‎"</string>
+    <string name="ping_test_label" msgid="579228584343892613">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‎‏‎‎‎‎‎‎‎‏‎‎‏‏‏‎‏‎‏‎‏‎‏‎‏‎‏‎‎‎‎‎‏‏‏‎‏‏‎‎‏‎‎‎‏‏‏‏‏‎‎‏‎‏‎‎‎‎‏‎‏‎Run Ping Test‎‏‎‎‏‎"</string>
+    <string name="radio_info_smsc_label" msgid="6399460520126501354">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‏‎‎‎‏‏‎‎‏‏‏‏‎‏‏‏‎‎‏‏‎‏‏‎‏‏‏‏‏‏‏‏‎‎‎‎‎‏‎‎‎‏‏‎‏‏‎‏‎‎‎‏‏‏‏‎‏‎‏‎‎SMSC:‎‏‎‎‏‎"</string>
+    <string name="radio_info_smsc_update_label" msgid="7258686760358791539">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‎‏‎‎‏‎‏‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‏‎‎‏‏‎‎‏‏‏‏‏‏‏‎‎‎‎‎‏‎‎‎‏‎‎‏‎‎‏‎‏‏‏‎‎‏‏‎Update‎‏‎‎‏‎"</string>
+    <string name="radio_info_smsc_refresh_label" msgid="6902302130315125102">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‏‏‏‏‏‏‎‎‏‎‎‏‏‏‏‎‎‏‏‏‎‎‏‏‎‏‏‏‏‎‏‏‎‎‎‏‏‏‎‏‏‎‏‎‏‏‏‎‎‎‎‏‎‏‏‎‏‏‏‎‎Refresh‎‏‎‎‏‎"</string>
+    <string name="radio_info_toggle_dns_check_label" msgid="6625185764803245075">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‏‎‏‏‏‏‏‏‎‎‎‏‎‏‏‎‎‎‏‏‎‏‎‏‏‎‎‏‏‏‏‏‎‎‏‎‎‎‎‏‎‎‏‎‎‏‏‏‎‏‎‎‎‎‎‏‎‎‏‏‎Toggle DNS Check‎‏‎‎‏‎"</string>
+    <string name="oem_radio_info_label" msgid="6163141792477958941">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‎‏‎‏‏‎‎‎‎‏‏‏‏‏‏‎‎‎‎‎‏‏‎‎‏‏‏‎‎‏‏‏‏‎‎‏‎‎‎‎‎‎‏‏‎‏‎‏‎‎‏‏‎‎‎‏‏‏‎‏‎OEM-specific Info/Settings‎‏‎‎‏‎"</string>
+    <string name="band_mode_title" msgid="4071411679019296568">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‏‎‎‎‏‎‎‎‎‎‎‎‏‎‎‎‏‏‏‏‎‏‎‏‏‎‎‏‏‏‎‎‏‏‏‎‎‏‎‏‎‎‏‎‎‏‏‎‎‏‏‏‎‎‏‏‏‎‎‎‎Set Radio Band Mode‎‏‎‎‏‎"</string>
+    <string name="band_mode_loading" msgid="3555063585133586152">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‎‎‎‏‎‏‎‏‎‏‏‎‎‎‎‏‏‏‏‏‎‏‏‏‏‏‏‎‏‏‎‎‎‎‎‏‏‏‎‏‎‎‎‎‎‏‏‎‎‏‏‎‏‏‏‎‏‎‎‎‎Loading Band List…‎‏‎‎‏‎"</string>
+    <string name="band_mode_set" msgid="5730560180249458484">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‏‏‏‏‏‎‎‎‎‏‏‏‎‎‎‎‏‎‏‎‎‎‎‏‏‏‏‏‎‏‎‎‎‎‏‏‏‏‎‎‎‏‎‎‎‏‏‏‎‏‏‏‎‎‏‏‎‏‎‎‎Set‎‏‎‎‏‎"</string>
+    <string name="band_mode_failed" msgid="1495968863884716379">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‎‏‎‎‏‏‎‎‎‎‏‎‏‎‏‏‏‏‏‏‏‏‎‎‎‎‎‏‎‏‏‏‎‏‏‎‏‏‏‎‎‏‎‎‏‎‏‎‏‎‎‏‎‏‎‏‏‎‏‏‎Unsuccessful‎‏‎‎‏‎"</string>
+    <string name="band_mode_succeeded" msgid="2701016190055887575">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‎‏‎‏‎‏‏‏‏‎‏‏‏‏‏‎‏‏‏‏‏‏‏‎‏‎‏‎‎‎‎‎‏‏‎‎‏‏‎‏‏‏‎‎‎‎‏‏‎‎‏‎‏‏‎‏‎‏‏‏‎Successful‎‏‎‎‏‎"</string>
+    <string name="sdcard_changes_instructions" msgid="4482324130377280131">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‏‏‏‎‎‎‏‏‎‏‎‎‎‏‏‎‏‎‏‎‎‎‎‎‏‏‎‎‎‏‎‏‎‏‏‏‎‏‎‎‏‏‎‎‏‎‏‎‏‎‏‎‏‎‎‎‎‎‏‏‎Changes take effect when USB cable is reconnected.‎‏‎‎‏‎"</string>
+    <string name="sdcard_settings_screen_mass_storage_text" msgid="3741220147296482474">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‎‎‏‏‏‏‏‎‏‎‏‏‎‏‏‏‏‎‏‏‏‏‏‎‎‏‏‎‏‏‏‏‎‎‏‎‎‎‏‎‎‏‎‎‎‎‏‏‎‏‎‎‏‎‏‎‏‎‏‎‎Enable USB mass storage‎‏‎‎‏‎"</string>
+    <string name="sdcard_settings_total_bytes_label" msgid="9184160745785062144">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‏‏‏‏‎‏‏‏‎‏‎‎‏‎‏‏‎‎‎‏‏‎‎‎‏‎‎‏‏‏‎‏‏‏‎‎‏‎‎‏‏‎‏‎‏‏‏‏‎‎‏‏‎‎‎‎‎‎‎‎‎Total bytes:‎‏‎‎‏‎"</string>
+    <string name="sdcard_settings_not_present_status" product="nosdcard" msgid="1636218515775929394">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‎‏‏‎‏‎‏‏‎‏‎‏‎‎‎‎‎‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‏‏‎‏‏‎‏‏‏‏‎‎‎‎‏‏‎‎‏‎‎USB storage not mounted.‎‏‎‎‏‎"</string>
+    <string name="sdcard_settings_not_present_status" product="default" msgid="2048419626134861599">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‏‏‎‎‎‏‏‎‏‏‎‏‎‏‏‏‎‎‏‎‏‏‎‎‏‏‎‎‎‎‎‎‎‏‏‎‏‎‏‏‎‏‎‎‏‏‏‏‎‏‏‏‎‎‎‏‏‏‏‏‎No SD card.‎‏‎‎‏‎"</string>
+    <string name="sdcard_settings_available_bytes_label" msgid="763232429899373001">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‎‏‎‏‎‏‎‎‏‎‏‏‏‏‎‎‎‏‎‏‏‏‏‎‏‏‎‎‏‏‏‏‎‏‎‎‏‎‎‏‏‎‏‎‏‏‏‎‏‏‎‎‏‏‏‎‎‏‎‎‏‎Available bytes:‎‏‎‎‏‎"</string>
+    <string name="sdcard_settings_mass_storage_status" product="nosdcard" msgid="7993410985895217054">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‏‏‏‎‏‏‏‎‏‏‏‎‎‏‎‎‏‏‎‎‏‏‏‏‎‎‎‎‏‏‎‏‎‏‎‏‏‏‏‏‏‏‎‏‎‏‎‎‎‏‏‏‏‎‎‏‏‏‏‎‎USB storage is being used as a mass storage device.‎‏‎‎‏‎"</string>
+    <string name="sdcard_settings_mass_storage_status" product="default" msgid="2742075324087038036">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‎‏‏‎‎‎‎‎‏‏‎‏‏‏‎‎‏‏‏‎‏‏‏‏‏‎‏‎‏‎‏‎‎‏‏‏‏‎‎‏‎‎‏‎‎‏‏‏‎‎‎‎‎‏‎‏‎‏‎‎‎SD card is being used as a mass storage device.‎‏‎‎‏‎"</string>
+    <string name="sdcard_settings_unmounted_status" product="nosdcard" msgid="5128923500235719226">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‎‏‏‏‎‎‏‎‏‏‎‏‏‎‎‏‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‎‏‏‏‏‏‎‏‏‎‏‎‎‎‎‎‎‎‎‏‎‎‎‏‏‏‎‏‎‎It’s now safe to remove the USB storage.‎‏‎‎‏‎"</string>
+    <string name="sdcard_settings_unmounted_status" product="default" msgid="666233604712540408">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‎‏‎‎‏‎‎‏‏‏‏‏‎‏‏‏‎‏‏‏‏‏‏‏‎‏‏‏‏‎‎‎‎‎‎‏‎‎‏‎‏‎‎‎‏‏‎‏‎‏‎‎‎‏‏‏‏‏‎‎‎‎It’s now safe to remove the SD card.‎‏‎‎‏‎"</string>
+    <string name="sdcard_settings_bad_removal_status" product="nosdcard" msgid="7761390725880773697">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‏‎‏‏‏‎‏‏‎‏‎‏‏‏‏‏‏‏‏‏‏‎‏‏‏‏‏‎‎‏‎‏‏‎‏‏‎‎‏‎‎‎‏‎‎‏‏‏‏‏‎‎‎‏‎‎‎‎‎‏‎USB storage was removed while still in use!‎‏‎‎‏‎"</string>
+    <string name="sdcard_settings_bad_removal_status" product="default" msgid="5145797653495907970">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‎‏‏‏‎‏‏‎‏‎‎‏‏‎‎‎‏‎‏‏‏‎‏‏‎‎‏‏‏‏‎‎‎‏‏‎‏‎‏‎‏‎‎‏‏‎‎‎‎‏‏‎‏‎‎‎‎‎‏‎‎SD card was removed while still in use!‎‏‎‎‏‎"</string>
+    <string name="sdcard_settings_used_bytes_label" msgid="8820289486001170836">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‏‎‏‎‎‏‏‎‎‏‏‏‏‏‏‏‎‏‏‎‏‎‎‎‏‏‏‎‎‎‏‏‏‏‎‏‎‎‏‏‎‏‏‎‎‏‏‎‏‎‎‏‏‎‎‏‎‏‎‎‎Used bytes:‎‏‎‎‏‎"</string>
+    <string name="sdcard_settings_scanning_status" product="nosdcard" msgid="7503429447676219564">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‏‎‎‎‎‎‏‎‎‎‎‏‏‎‎‎‏‎‎‏‎‏‎‏‎‎‏‏‏‏‏‎‏‎‎‏‏‏‏‏‎‎‏‎‎‏‎‏‎‎‎‎‏‎‏‎‏‏‎‎‎Scanning USB storage for media…‎‏‎‎‏‎"</string>
+    <string name="sdcard_settings_scanning_status" product="default" msgid="2763464949274455656">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‎‏‏‎‎‏‎‏‏‎‎‏‏‏‎‎‏‏‎‎‏‎‏‏‏‎‏‎‏‏‎‏‏‎‏‎‏‎‏‏‏‏‏‏‎‎‏‎‏‏‏‎‎‏‏‎‏‎‎‎‎Scanning SD card for media…‎‏‎‎‏‎"</string>
+    <string name="sdcard_settings_read_only_status" product="nosdcard" msgid="3624143937437417788">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‎‎‏‎‎‏‎‎‏‎‏‏‏‎‎‎‏‎‏‏‏‎‏‏‎‏‎‏‏‎‏‎‎‏‎‏‏‏‎‏‎‏‏‏‏‏‎‎‎‎‎‏‎‎‏‏‏‏‎‎‎USB storage mounted read-only.‎‏‎‎‏‎"</string>
+    <string name="sdcard_settings_read_only_status" product="default" msgid="4518291824764698112">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‏‏‏‎‏‎‏‏‎‏‎‎‎‎‏‏‎‎‏‎‎‏‏‏‏‎‎‏‏‏‎‎‎‏‏‎‏‎‏‎‎‏‏‎‏‎‏‏‏‏‏‎‎‎‎‎‎‎‎‎‎SD card mounted read-only.‎‏‎‎‏‎"</string>
+    <string name="skip_label" msgid="47510779345218297">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‎‎‎‏‎‏‎‏‎‎‎‏‏‎‎‏‎‏‎‏‏‎‎‏‏‎‏‎‏‎‏‎‏‎‏‏‏‎‏‏‏‏‏‏‎‏‎‏‎‏‎‏‏‏‏‏‎‎‏‎Skip‎‏‎‎‏‎"</string>
+    <string name="next_label" msgid="4693520878012668114">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‎‏‏‏‏‎‎‎‏‎‏‏‏‏‏‎‎‎‎‎‏‏‏‏‏‎‏‎‎‏‏‎‎‎‏‏‎‎‎‏‏‎‏‎‎‏‎‎Next‎‏‎‎‏‎"</string>
+    <string name="language_picker_title" msgid="3596315202551687690">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‎‎‎‏‏‏‏‎‏‎‎‎‏‎‏‎‏‏‎‏‏‎‎‏‏‏‏‏‎‏‏‎‎‏‎‎‎‏‏‎‏‏‏‎‎‎‏‎‏‎‏‎‎‎‎‎‏‎‏‎‎Languages‎‏‎‎‏‎"</string>
+    <string name="pref_title_lang_selection" msgid="2014920136978776034">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‏‎‏‏‏‏‏‏‎‏‏‎‎‏‏‎‏‏‏‏‎‎‏‏‎‎‎‎‎‏‏‎‎‏‏‏‎‏‏‎‎‏‏‎‏‎‏‏‏‏‏‏‏‏‏‎‎‎‏‎‎Language preferences‎‏‎‎‏‎"</string>
+    <string name="locale_remove_menu" msgid="7651301406723638854">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‏‎‏‎‎‎‏‎‏‏‏‎‏‏‏‎‎‎‏‎‎‎‎‏‎‏‏‏‎‏‎‏‎‎‎‏‎‎‏‏‎‏‎‏‏‎‎‎‎‏‏‎‎‏‎‎‎‏‏‎‎Remove‎‏‎‎‏‎"</string>
+    <string name="add_a_language" msgid="2330538812283783022">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‎‎‎‎‎‏‎‏‎‏‏‏‏‎‏‏‏‏‎‎‏‎‏‏‎‎‏‏‏‎‏‏‏‎‎‏‎‏‏‎‏‏‏‏‏‎‎‎‎‏‏‏‎‏‏‎‏‏‏‎‎Add a language‎‏‎‎‏‎"</string>
+    <plurals name="dlg_remove_locales_title" formatted="false" msgid="4276642359346122396">
+      <item quantity="other">‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‏‎‏‏‎‏‎‏‏‎‎‏‏‎‏‎‏‏‏‏‏‎‎‏‎‎‎‏‎‎‏‏‎‏‎‎‎‎‏‏‎‏‏‎‏‏‎‎‏‏‏‎‏‎‎‏‏‏‎‎‎Remove selected languages?‎‏‎‎‏‎</item>
+      <item quantity="one">‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‏‎‏‏‎‏‎‏‏‎‎‏‏‎‏‎‏‏‏‏‏‎‎‏‎‎‎‏‎‎‏‏‎‏‎‎‎‎‏‏‎‏‏‎‏‏‎‎‏‏‏‎‏‎‎‏‏‏‎‎‎Remove selected language?‎‏‎‎‏‎</item>
+    </plurals>
+    <string name="dlg_remove_locales_message" msgid="1361354927342876114">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‎‎‏‎‏‏‏‎‎‏‎‎‏‎‎‎‎‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‎‏‎‏‏‏‏‏‏‏‏‏‏‏‎‏‎‏‏‏‎‏‎‎‏‎‎Text will be displayed in another language.‎‏‎‎‏‎"</string>
+    <string name="dlg_remove_locales_error_title" msgid="2653242337224911425">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‎‏‎‎‏‏‎‏‎‎‏‎‎‎‏‏‎‏‎‏‏‏‎‏‏‎‎‏‎‎‏‎‎‏‎‏‎‏‎‏‎‎‎‏‎‏‏‎‏‎‏‎‎‏‎‎‎‎‎‏‎Can’t remove all languages‎‏‎‎‏‎"</string>
+    <string name="dlg_remove_locales_error_message" msgid="6697381512654262821">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‏‏‎‎‏‏‏‏‎‎‎‏‏‏‏‎‎‎‎‏‎‎‎‎‎‎‎‎‎‏‏‎‎‎‏‏‎‎‎‎‎‏‏‎‏‎‎‏‎‎‏‎‎‎‏‎‎‏‎‏‎Keep at least one preferred language‎‏‎‎‏‎"</string>
+    <string name="locale_not_translated" msgid="516862628177166755">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‎‏‏‏‏‏‎‎‏‎‏‏‎‎‎‏‎‎‎‎‏‏‏‏‎‏‎‎‏‎‎‏‏‎‎‏‏‎‎‎‏‎‏‏‎‎‏‏‎‎‎‎‎‏‏‎‏‎‎‎‏‏‎May not be available in some apps‎‏‎‎‏‎"</string>
+    <string name="action_drag_label_move_up" msgid="9052210023727612540">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‏‏‎‏‏‎‎‏‏‏‏‏‏‏‏‎‏‎‎‏‎‎‎‎‏‏‏‎‎‏‎‏‎‎‎‎‏‎‎‎‎‎‏‏‏‏‎‎‎‎‏‎‎‏‏‏‏‏‎‎‎Move up‎‏‎‎‏‎"</string>
+    <string name="action_drag_label_move_down" msgid="7448713844582912157">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‎‏‏‏‎‏‎‏‏‏‏‏‎‎‏‎‎‏‎‏‏‏‎‎‎‏‏‎‏‏‎‏‎‎‏‏‏‏‏‎‎‏‏‎‎‎‎‏‎‎‎‎‏‎‎‏‏‏‎‏‎Move down‎‏‎‎‏‎"</string>
+    <string name="action_drag_label_move_top" msgid="557081389352288310">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‎‏‏‏‏‏‏‎‏‏‏‎‏‏‎‎‏‎‎‏‏‎‏‎‎‏‎‎‏‎‎‏‏‏‎‎‏‏‎‏‎‏‎‎‏‏‎‎‎‎‎‎‎‎‎‎‏‏‎‏‏‎‎Move to top‎‏‎‎‏‎"</string>
+    <string name="action_drag_label_move_bottom" msgid="2468642142414126482">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‎‎‏‎‎‏‎‎‎‎‏‎‎‏‏‎‎‎‎‎‏‏‏‏‎‎‏‎‏‏‏‏‏‎‎‎‎‎‏‎‎‏‏‏‎‎‏‏‏‏‎‏‏‎‎‏‎‎‏‎‎Move to bottom‎‏‎‎‏‎"</string>
+    <string name="action_drag_label_remove" msgid="2861038147166966206">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‎‏‏‏‏‎‏‏‎‏‎‎‎‏‏‏‎‎‏‏‎‎‎‎‏‎‎‏‎‏‎‏‎‎‏‎‏‎‏‏‏‎‏‎‏‎‎‏‎‎‎‏‏‎‏‏‏‏‏‎‎Remove language‎‏‎‎‏‎"</string>
+    <string name="activity_picker_label" msgid="6295660302548177109">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‎‏‏‏‎‏‎‏‏‏‏‎‏‎‏‎‏‏‎‏‏‎‏‏‎‎‎‎‎‏‏‏‎‏‏‏‏‏‏‎‏‎‎‏‏‎‎‏‎‎‎‎‏‏‎‏‎‏‎‏‎Choose activity‎‏‎‎‏‎"</string>
+    <string name="device_info_label" msgid="6551553813651711205">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‏‎‏‎‏‏‏‎‏‎‏‏‏‏‎‎‏‎‏‏‎‏‏‏‏‎‏‏‎‏‎‏‏‏‎‏‏‎‎‏‎‎‎‎‏‏‏‎‎‏‎‎‏‏‏‎‎‏‎‏‎Device info‎‏‎‎‏‎"</string>
+    <string name="display_label" msgid="8074070940506840792">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‎‎‎‎‎‎‎‎‏‏‎‎‏‏‎‏‏‏‎‎‏‎‏‏‏‏‎‏‏‏‏‏‏‏‎‎‎‎‏‏‎‏‏‎‏‏‎‏‏‏‏‎‏‏‎‏‏‎‎‎‎Screen‎‏‎‎‏‎"</string>
+    <string name="phone_info_label" product="tablet" msgid="7820855350955963628">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‏‏‎‎‏‎‎‎‏‎‎‏‎‏‎‎‎‎‏‎‏‎‎‎‎‎‎‏‎‏‎‎‏‎‎‏‎‏‏‏‎‎‎‏‎‏‏‏‎‏‎‎‏‏‏‎‏‏‎‎‎Tablet info‎‏‎‎‏‎"</string>
+    <string name="phone_info_label" product="default" msgid="2127552523124277664">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‏‏‎‏‏‎‎‎‎‏‏‎‏‎‎‏‎‏‎‏‏‎‏‏‏‏‏‏‎‏‎‏‏‏‎‏‏‏‎‎‏‏‏‏‎‎‎‎‎‎‎‏‏‎‏‎‎‎‎‎‎Phone info‎‏‎‎‏‎"</string>
+    <string name="sd_card_settings_label" product="nosdcard" msgid="8101475181301178428">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‎‎‎‎‎‏‏‎‏‏‏‎‎‎‏‏‏‎‎‎‏‏‎‎‎‎‎‏‎‎‎‎‎‎‏‎‎‎‎‏‏‎‎‏‏‎‏‎‎‎‎‎‎‎‏‏‏‏‎‎‎USB storage‎‏‎‎‏‎"</string>
+    <string name="sd_card_settings_label" product="default" msgid="5743100901106177102">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‏‏‏‏‏‎‏‏‎‎‏‏‏‎‎‏‎‏‏‏‏‏‎‏‎‏‏‏‎‏‎‏‏‏‏‏‏‎‏‎‏‎‎‎‏‏‎‏‎‏‎‎‎‏‎‎‏‏‏‎‎SD card‎‏‎‎‏‎"</string>
+    <string name="proxy_settings_label" msgid="3271174136184391743">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‏‏‎‏‎‏‏‎‎‏‎‏‏‎‎‎‏‎‏‏‏‎‎‎‏‎‏‏‏‎‏‎‎‎‎‏‏‎‏‏‎‏‏‏‎‏‎‎‏‎‎‎‎‎‏‏‏‏‏‏‎Proxy settings‎‏‎‎‏‎"</string>
+    <string name="cancel" msgid="6859253417269739139">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‏‏‏‏‎‎‏‏‎‎‎‎‏‏‏‏‎‏‏‎‏‎‏‎‎‏‎‎‎‎‏‎‎‎‎‎‏‎‏‏‏‏‏‏‎‎‏‏‏‏‏‎‏‎‎‎‎‎‏‏‎Cancel‎‏‎‎‏‎"</string>
+    <string name="okay" msgid="1997666393121016642">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‏‎‏‏‏‎‏‏‏‎‎‏‎‎‏‎‎‎‏‏‎‎‎‎‎‎‎‎‎‎‎‏‏‏‎‏‏‎‏‏‎‏‏‎‏‏‎‎‏‎‏‏‎‏‎‎‎‎‏‎‎OK‎‏‎‎‏‎"</string>
+    <string name="forget" msgid="1400428660472591263">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‎‎‏‏‎‏‏‎‏‏‏‏‎‏‎‏‎‎‏‎‎‏‏‏‎‎‏‎‎‏‏‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‏‏‎‎‏‏‏‎‎‏‏‏‏‏‎Forget‎‏‎‎‏‎"</string>
+    <string name="save" msgid="879993180139353333">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‎‏‏‎‎‎‎‏‏‎‏‏‎‎‏‎‏‏‏‎‏‎‎‏‎‎‎‏‎‏‎‎‎‏‎‏‎‏‏‏‏‏‎‎‎‏‏‏‏‎‏‎‎‏‏‏‏‎‏‎‏‎Save‎‏‎‎‏‎"</string>
+    <string name="done" msgid="6942539184162713160">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‎‎‎‎‎‏‎‏‏‎‎‎‏‏‎‏‏‎‏‎‏‎‎‏‏‎‏‎‏‏‎‏‎‏‏‏‎‎‏‏‏‏‏‏‏‎‏‎‏‏‏‎‎‏‎‎‏‎‎‎‎Done‎‏‎‎‏‎"</string>
+    <string name="settings_label" msgid="1626402585530130914">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‎‏‏‎‏‎‎‏‎‎‏‎‎‎‏‎‎‏‎‎‏‎‎‎‏‎‎‎‏‏‎‏‎‏‎‎‎‏‎‎‏‏‎‎‏‏‏‎‎‎‎‏‏‏‏‎‎‎‏‎‎Settings‎‏‎‎‏‎"</string>
+    <string name="settings_label_launcher" msgid="8344735489639482340">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‎‎‏‏‏‏‎‎‏‏‏‎‎‏‏‏‎‏‎‎‏‎‏‏‎‏‏‏‎‎‏‎‏‏‎‎‏‎‎‎‏‏‏‎‏‎‎‎‎‎‏‏‏‏‏‎‎‏‎‎‎Settings‎‏‎‎‏‎"</string>
+    <string name="settings_shortcut" msgid="3936651951364030415">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‎‏‏‎‏‎‏‎‎‎‎‏‏‏‎‎‏‏‎‎‎‎‎‏‎‏‏‏‏‎‏‎‏‏‎‏‎‏‏‎‎‏‏‎‏‎‏‏‏‏‏‏‏‏‎‎‏‏‏‏‎Settings shortcut‎‏‎‎‏‎"</string>
+    <string name="activity_list_empty" msgid="6428823323471264836">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‏‎‎‏‎‎‏‏‎‏‏‏‏‏‎‎‎‏‎‎‏‏‎‎‎‎‎‎‎‏‎‏‎‏‏‏‎‏‎‎‎‎‎‎‎‎‏‏‏‏‎‎‎‏‎‎‎‏‎‎‎No matching activities found.‎‏‎‎‏‎"</string>
+    <string name="airplane_mode" msgid="8837269988154128601">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‏‎‏‎‏‎‏‎‎‏‎‎‎‏‎‎‏‎‏‎‎‎‏‏‏‎‏‏‎‏‏‏‏‏‎‎‎‎‏‎‎‏‎‏‏‎‏‏‏‎‎‎‏‏‎‏‏‎‎‏‎Airplane mode‎‏‎‎‏‎"</string>
+    <string name="radio_controls_title" msgid="3447085191369779032">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‏‏‏‏‏‏‎‏‎‏‏‎‏‎‎‎‎‎‎‏‏‎‏‏‎‏‏‏‏‏‎‏‎‏‏‎‎‎‎‏‏‎‏‎‏‏‏‎‎‏‏‏‎‏‎‏‏‎‎‎‎More‎‏‎‎‏‎"</string>
+    <string name="wireless_networks_settings_title" msgid="3643009077742794212">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‎‎‏‎‏‎‎‎‏‏‏‎‏‎‎‏‎‎‎‏‎‏‏‏‎‏‎‎‎‏‏‎‏‎‎‎‎‏‏‎‎‎‎‏‏‏‏‏‎‏‎‏‏‏‏‎‎‏‎‎‎Wireless &amp; networks‎‏‎‎‏‎"</string>
+    <string name="radio_controls_summary" msgid="1838624369870907268">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‏‎‎‏‏‎‎‎‎‏‎‎‎‎‎‏‏‎‏‏‎‎‎‏‏‏‏‏‎‏‏‏‏‎‎‏‏‎‎‎‏‎‎‎‎‎‏‎‎‏‏‏‏‎‎‎‎‏‎‎‎Manage Wi‑Fi, Bluetooth, airplane mode, mobile networks, &amp; VPNs‎‏‎‎‏‎"</string>
+    <string name="cellular_data_title" msgid="6835451574385496662">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‏‏‏‎‏‏‎‏‏‏‎‎‎‏‏‎‎‏‏‎‏‏‏‏‏‏‎‏‏‎‏‏‏‎‏‎‏‎‏‎‎‎‎‏‏‏‎‏‎‎‏‎‎‏‎‏‎‏‏‎‎Mobile data‎‏‎‎‏‎"</string>
+    <string name="calls_title" msgid="3544471959217176768">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‎‎‎‏‎‎‏‏‎‎‎‎‎‏‏‏‏‏‏‎‎‏‏‏‎‏‏‏‏‎‏‎‏‏‎‏‎‏‏‏‏‎‎‏‎‎‎‎‎‎‎‎‏‏‎‎‎‎‎‎‎Calls‎‏‎‎‏‎"</string>
+    <string name="sms_messages_title" msgid="1778636286080572535">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‏‎‎‎‏‎‏‎‏‏‏‎‏‏‏‏‏‏‎‎‎‏‎‎‎‏‏‏‎‏‎‏‎‎‎‎‎‏‏‏‎‎‏‏‏‏‎‏‏‏‎‎‎‏‏‏‎‏‏‏‎SMS messages‎‏‎‎‏‎"</string>
+    <string name="cellular_data_summary" msgid="4660351864416939504">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‎‎‎‎‏‎‏‎‏‏‎‎‏‏‏‎‎‏‎‏‎‏‎‏‎‏‎‎‎‎‏‏‏‏‏‎‏‏‏‎‎‏‏‎‏‎‏‎‏‏‎‏‏‏‏‏‎‎‎‎‎Allow data usage over mobile network‎‏‎‎‏‎"</string>
+    <string name="allow_data_usage_title" msgid="2238205944729213062">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‏‏‏‏‎‎‎‎‏‏‏‏‏‎‏‏‎‏‎‎‎‏‏‏‎‎‏‎‏‎‏‏‏‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‏‎‎‎‏‎‎‎‎‏‏‎‎Allow data usage when roaming‎‏‎‎‏‎"</string>
+    <string name="roaming" msgid="3596055926335478572">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‎‎‎‏‏‏‏‎‎‏‏‏‏‏‎‎‎‎‎‏‏‏‎‎‏‏‏‏‏‏‏‏‎‎‎‏‏‎‏‎‏‎‏‎‎‎‎‏‏‎‏‏‎‎‏‎‏‏‎‎‎Data roaming‎‏‎‎‏‎"</string>
+    <string name="roaming_enable" msgid="3737380951525303961">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‎‎‏‏‏‏‎‏‏‏‎‏‏‏‎‏‏‎‎‎‎‎‏‎‏‏‎‎‏‎‎‎‎‏‎‏‏‏‏‏‏‎‏‎‎‎‏‎‎‏‏‎‏‎‎‏‏‎‎‏‎Connect to data services when roaming‎‏‎‎‏‎"</string>
+    <string name="roaming_disable" msgid="1295279574370898378">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‎‎‎‏‏‏‏‏‏‎‎‏‏‏‎‎‎‎‎‏‏‏‏‎‏‎‎‏‎‎‎‎‎‎‏‏‎‎‏‏‎‎‏‎‎‏‎‏‎‎‎‏‏‏‎‎‏‎‏‎‎Connect to data services when roaming‎‏‎‎‏‎"</string>
+    <string name="roaming_reenable_message" msgid="9141007271031717369">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‏‏‏‎‏‏‎‏‏‎‏‏‎‏‏‎‎‎‎‏‏‎‏‎‏‏‏‎‏‎‎‎‏‏‏‏‎‎‎‏‏‎‏‏‏‎‏‏‏‏‎‏‏‏‏‏‏‎‎‏‎You have lost data connectivity because you left your home network with data roaming turned off.‎‏‎‎‏‎"</string>
+    <string name="roaming_turn_it_on_button" msgid="4387601818162120589">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‏‏‎‎‏‏‏‎‎‎‏‏‏‏‏‎‎‏‎‎‏‎‎‏‏‎‏‏‎‏‏‎‏‎‏‏‎‏‏‎‏‎‎‏‎‏‎‎‎‏‏‏‏‎‎‎‏‏‎‏‎Turn it on‎‏‎‎‏‎"</string>
+    <string name="roaming_warning" msgid="4275443317524544705">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‏‎‏‏‎‏‎‏‎‏‎‏‎‏‏‎‏‏‎‏‎‎‎‎‏‎‏‏‏‎‎‎‎‏‏‎‎‏‎‏‏‏‏‎‎‎‏‏‏‏‎‎‏‏‎‎‎‎‎‏‎You may incur significant charges.‎‏‎‎‏‎"</string>
+    <string name="roaming_warning_multiuser" product="tablet" msgid="6458990250829214777">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‏‎‎‏‏‎‏‎‎‎‏‎‏‏‏‏‎‎‎‏‎‏‏‎‏‎‎‏‎‏‏‏‎‏‎‎‎‏‏‎‎‎‏‎‏‏‏‏‎‏‎‎‎‎‏‏‏‎‎‏‎When you allow data roaming, you may incur significant roaming charges!‎‏‎‎‏‏‎\n‎‏‎‎‏‏‏‎‎‏‎‎‏‏‎\n‎‏‎‎‏‏‏‎This setting affects all users on this tablet.‎‏‎‎‏‎"</string>
+    <string name="roaming_warning_multiuser" product="default" msgid="6368421100292355440">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‏‎‎‎‎‏‏‎‎‎‎‏‎‎‏‎‏‏‎‏‎‎‏‏‏‏‏‏‏‏‎‏‎‏‏‏‎‎‎‎‎‏‏‏‎‎‏‏‎‏‎‏‎‏‏‏‎‎‎‎‎When you allow data roaming, you may incur significant roaming charges!‎‏‎‎‏‏‎\n‎‏‎‎‏‏‏‎‎‏‎‎‏‏‎\n‎‏‎‎‏‏‏‎This setting affects all users on this phone.‎‏‎‎‏‎"</string>
+    <string name="roaming_reenable_title" msgid="6068100976707316772">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‎‏‎‎‎‎‏‏‎‏‏‎‎‎‏‏‏‎‎‏‏‎‏‏‎‎‎‎‎‎‏‎‏‎‎‏‏‏‎‏‎‏‏‏‎‎‏‎‏‏‎‎‎‎‏‎‎‏‎‎‎Allow data roaming?‎‏‎‎‏‎"</string>
+    <string name="networks" msgid="6333316876545927039">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‎‏‏‏‏‏‏‎‎‏‎‎‎‏‏‏‎‏‏‎‎‎‏‎‎‏‎‎‏‏‎‏‎‏‎‎‏‎‎‎‎‎‎‏‏‎‏‎‎‏‏‏‎‏‏‏‏‏‏‏‎Operator selection‎‏‎‎‏‎"</string>
+    <string name="sum_carrier_select" msgid="3616956422251879163">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‎‎‏‎‎‎‏‏‎‎‏‎‎‎‎‎‎‎‏‎‏‎‏‏‎‎‏‏‏‏‎‏‏‏‎‎‎‏‏‎‎‏‎‎‎‎‎‏‏‎‏‎‏‏‏‏‏‎‏‏‎Choose a network operator‎‏‎‎‏‎"</string>
+    <string name="date_and_time_settings_title" msgid="3350640463596716780">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‏‏‏‎‎‏‏‏‏‏‏‏‏‏‎‏‏‏‎‏‏‎‏‏‏‏‏‏‏‏‎‎‏‎‏‎‏‎‏‏‏‎‏‏‏‎‎‎‎‎‏‎‏‏‏‎‏‏‎‎‎Date &amp; time‎‏‎‎‏‎"</string>
+    <string name="date_and_time_settings_title_setup_wizard" msgid="2391530758339384324">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‎‎‎‏‎‎‏‏‎‎‎‎‎‏‏‎‏‏‎‎‏‎‎‎‏‏‎‏‏‏‎‎‏‎‎‎‎‎‏‏‏‏‎‏‎‏‎‏‎‏‎‎‎‎‎‎‎‏‎‎‎Set date and time‎‏‎‎‏‎"</string>
+    <string name="date_and_time_settings_summary" msgid="7095318986757583584">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‎‎‏‎‎‏‏‏‎‏‏‏‏‎‏‎‎‎‏‏‎‎‎‎‎‏‏‎‏‎‎‏‏‏‎‏‏‏‎‎‎‏‎‏‎‎‏‏‎‎‏‎‏‏‏‎‎‎‎‎‎Set date, time, time zone, &amp; formats‎‏‎‎‏‎"</string>
+    <string name="date_time_auto" msgid="7076906458515908345">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‎‎‏‎‎‎‏‏‎‏‏‎‎‎‏‏‏‎‎‎‏‏‏‎‏‏‎‏‏‏‎‏‎‎‎‎‏‎‎‎‎‎‏‎‎‎‏‎‎‏‏‎‏‏‏‏‏‎‎‏‎Automatic date &amp; time‎‏‎‎‏‎"</string>
+    <string name="date_time_auto_summaryOn" msgid="4609619490075140381">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‏‏‏‏‏‏‏‏‏‎‎‎‏‎‏‎‏‎‎‎‏‎‎‎‎‎‎‎‏‏‎‏‏‏‏‏‏‎‏‎‎‏‎‏‎‏‏‎‎‎‎‏‎‎‎‏‏‏‎‏‎Use network-provided time‎‏‎‎‏‎"</string>
+    <string name="date_time_auto_summaryOff" msgid="8698762649061882791">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‏‎‎‎‏‎‏‏‏‎‎‎‎‎‏‏‎‏‏‎‏‎‎‎‏‎‏‎‏‎‎‏‎‎‏‎‏‏‎‎‎‏‎‎‏‏‏‏‏‎‏‏‏‎‏‎‎‏‏‏‎Use network-provided time‎‏‎‎‏‎"</string>
+    <string name="zone_auto" msgid="334783869352026648">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‎‏‏‏‎‎‏‎‏‎‎‏‎‏‎‏‏‎‎‏‎‎‎‎‏‎‎‏‏‏‏‏‎‎‏‎‎‏‎‏‎‎‎‎‏‎‎‎‏‎‎‎‏‎‎‎‎‏‏‎‎‎‎Automatic time zone‎‏‎‎‏‎"</string>
+    <string name="zone_auto_summaryOn" msgid="6142830927278458314">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‎‏‎‏‎‎‏‏‏‏‏‏‏‎‏‏‏‎‎‎‎‎‏‎‏‏‏‎‏‎‏‎‎‏‏‏‏‎‏‏‎‏‏‏‎‏‎‎‎‏‎‏‏‏‎‎‏‎‏‎‎Use network-provided time zone‎‏‎‎‏‎"</string>
+    <string name="zone_auto_summaryOff" msgid="2597745783162041390">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‎‏‎‎‎‎‎‎‏‏‎‏‎‎‎‎‏‏‎‎‎‎‎‎‎‏‏‎‏‎‏‏‏‏‏‎‎‎‏‎‎‏‎‎‎‏‏‏‎‏‎‎‎‎‏‎‏‏‏‎‎Use network-provided time zone‎‏‎‎‏‎"</string>
+    <string name="date_time_24hour_auto" msgid="2117383168985653422">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‏‏‎‏‎‏‏‎‎‎‏‎‎‏‏‏‎‏‎‎‏‏‎‎‎‏‏‎‎‎‎‏‏‎‎‎‏‏‎‎‎‏‏‏‏‏‏‎‎‎‎‎‏‎‏‎‏‏‏‎‎Automatic 24‑hour format‎‏‎‎‏‎"</string>
+    <string name="date_time_24hour_auto_summary" msgid="6351812925651480277">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‏‎‎‎‎‎‏‎‎‏‏‎‎‎‏‎‏‏‎‎‎‎‏‏‎‎‏‏‏‏‎‏‏‎‎‏‎‎‏‏‎‎‎‎‏‏‏‎‏‏‏‎‏‏‎‏‎‏‎‏‎Use locale default‎‏‎‎‏‎"</string>
+    <string name="date_time_24hour_title" msgid="3203537578602803850">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‏‏‎‎‎‏‏‏‎‏‎‏‎‏‎‎‎‎‎‎‎‏‏‏‎‏‎‎‎‏‏‎‎‏‎‏‎‎‏‏‏‏‎‎‎‎‏‏‎‎‏‎‏‎‎‎‏‎‏‎‎24‑hour format‎‏‎‎‏‎"</string>
+    <string name="date_time_24hour" msgid="1193032284921000063">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‎‎‎‎‏‎‎‎‏‏‏‎‏‎‎‎‎‎‎‎‏‎‎‎‏‎‏‎‏‏‎‎‏‏‎‎‎‏‎‎‏‎‎‏‏‏‏‏‎‎‎‎‎‏‏‏‏‏‏‏‎Use 24-hour format‎‏‎‎‏‎"</string>
+    <string name="date_time_set_time_title" msgid="6296795651349047016">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‎‏‏‏‎‏‏‎‎‎‏‎‏‎‏‏‎‏‏‎‎‏‎‎‏‎‎‎‎‏‏‏‎‏‎‏‏‏‏‎‎‎‏‎‎‏‏‎‎‏‏‎‏‏‏‎‏‎‎‎‎Time‎‏‎‎‏‎"</string>
+    <string name="date_time_set_time" msgid="5716856602742530696">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‏‏‏‏‎‏‎‏‎‏‏‎‎‏‎‏‏‎‏‎‏‏‎‎‏‎‏‎‎‏‏‏‏‏‏‎‎‏‎‏‎‎‎‎‏‎‏‎‎‎‏‎‏‎‎‎‏‎‎‎‎Set time‎‏‎‎‏‎"</string>
+    <string name="date_time_set_timezone_title" msgid="3047322337368233197">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‏‎‏‎‎‏‎‎‏‎‏‎‎‏‎‎‎‎‏‏‏‎‎‎‎‏‎‏‎‎‏‏‏‎‏‎‏‏‏‏‎‎‏‎‎‏‎‏‎‏‎‎‏‏‏‎‏‏‎‏‎Time zone‎‏‎‎‏‎"</string>
+    <string name="date_time_set_timezone" msgid="5045627174274377814">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‎‏‏‎‎‎‎‎‎‏‎‏‏‎‏‎‏‎‏‏‎‎‏‎‏‏‏‎‏‎‎‏‏‏‏‏‏‎‏‎‏‏‏‎‏‎‏‎‏‎‎‎‎‏‎‏‎‏‏‎‎Select time zone‎‏‎‎‏‎"</string>
+    <string name="date_time_set_date_title" msgid="6928286765325608604">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‎‎‎‎‎‎‏‎‎‏‏‎‎‎‏‏‏‎‎‎‎‎‎‏‏‎‏‎‏‏‏‏‏‏‎‏‎‏‎‎‎‏‎‏‏‏‏‎‎‏‏‎‏‎‎‏‏‏‎‎‎Date‎‏‎‎‏‎"</string>
+    <string name="date_time_set_date" msgid="7021491668550232105">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‎‎‎‏‎‏‏‏‎‎‎‏‎‏‎‏‏‎‎‏‎‏‏‏‏‎‎‎‏‎‎‏‏‎‎‏‎‏‎‎‏‏‎‏‎‎‏‎‏‎‎‎‎‎‏‎‏‎‎‏‎Set date‎‏‎‎‏‎"</string>
+    <string name="zone_list_menu_sort_alphabetically" msgid="5683377702671088588">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‏‏‏‎‏‏‎‏‏‏‏‏‎‏‏‎‏‎‎‏‏‏‏‎‏‎‎‎‏‎‏‎‎‏‎‎‎‎‎‏‎‏‎‏‏‏‏‏‏‎‏‏‏‏‎‎‏‏‎‎‎Sort alphabetically‎‏‎‎‏‎"</string>
+    <string name="zone_list_menu_sort_by_timezone" msgid="2720190443744884114">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‎‏‎‏‏‏‎‎‎‎‎‎‎‎‎‎‏‏‏‎‏‏‎‎‏‎‏‏‏‏‏‎‎‎‎‎‏‏‎‏‎‎‏‏‎‏‏‏‎‏‎‏‏‎‎‏‎‎‏‎‎Sort by time zone‎‏‎‎‏‎"</string>
+    <string name="date_picker_title" msgid="1338210036394128512">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‎‎‏‎‏‎‎‏‎‎‏‎‎‏‎‎‎‏‏‎‏‏‏‏‎‎‎‎‎‎‎‏‏‏‏‎‎‎‏‎‎‎‏‎‎‏‏‏‎‏‎‎‏‎‎‎‎‎‎‎‎Date‎‏‎‎‏‎"</string>
+    <string name="time_picker_title" msgid="483460752287255019">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‎‏‏‏‏‎‏‎‏‏‎‏‎‏‏‎‎‏‏‎‎‎‏‏‏‏‏‏‏‎‎‎‏‎‎‎‏‎‏‏‏‎‏‏‎‎‏‏‎‎‏‎‎‏‏‏‏‎‏‎‏‏‎Time‎‏‎‎‏‎"</string>
+    <string name="lock_after_timeout" msgid="4590337686681194648">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‏‏‏‏‏‎‏‏‎‏‎‎‎‎‏‎‎‏‏‏‏‏‎‎‏‏‏‎‎‎‏‎‏‏‎‏‏‎‏‏‏‎‎‎‏‎‎‏‎‎‎‎‏‎‎‏‏‎‎‎‎Automatically lock‎‏‎‎‏‎"</string>
+    <string name="lock_after_timeout_summary" msgid="6128431871360905631">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‎‏‎‏‎‎‎‎‏‏‎‎‏‎‎‏‎‎‎‎‎‏‎‏‎‎‎‏‎‎‏‏‎‎‏‎‏‎‏‎‎‏‏‎‎‎‏‏‎‎‎‏‏‎‎‏‏‏‏‏‎‎‏‎‎‏‏‎<xliff:g id="TIMEOUT_STRING">%1$s</xliff:g>‎‏‎‎‏‏‏‎ after sleep‎‏‎‎‏‎"</string>
+    <string name="lock_immediately_summary_with_exception" msgid="9119632173886172690">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‏‏‏‎‏‎‎‎‏‏‏‏‎‏‏‏‎‎‎‏‎‎‏‎‎‏‎‎‏‏‏‎‏‏‏‎‏‎‏‏‎‏‎‏‎‏‏‎‏‏‏‎‎‎‎‏‎‎‏‎‎Immediately after sleep, except when kept unlocked by ‎‏‎‎‏‏‎<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>‎‏‎‎‏‏‏‎ after sleep, except when kept unlocked by ‎‏‎‎‏‏‎<xliff:g id="TRUST_AGENT_NAME">%2$s</xliff:g>‎‏‎‎‏‏‏‎‎‏‎‎‏‎"</string>
+    <string name="show_owner_info_on_lockscreen_label" msgid="5074906168357568434">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‎‏‏‎‎‏‏‎‏‏‎‏‏‎‏‏‎‎‎‎‎‏‎‎‎‏‎‏‏‎‏‎‏‎‎‏‎‏‏‎‎‏‎‎‎‎‏‏‏‏‏‏‏‎‏‏‎‎‏‎‎Show owner info on lock screen‎‏‎‎‏‎"</string>
+    <string name="owner_info_settings_title" msgid="5530285568897386122">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‏‏‎‎‏‎‏‏‏‏‏‏‏‎‎‎‎‏‎‏‎‏‏‎‏‏‎‎‏‎‎‏‏‎‎‎‏‎‎‏‏‎‎‏‎‎‎‎‎‏‏‎‏‎‎‎‏‎‏‎‎Lock screen message‎‏‎‎‏‎"</string>
+    <string name="security_enable_widgets_title" msgid="2754833397070967846">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‎‏‏‎‎‎‏‏‏‎‏‏‎‎‏‎‎‎‏‎‎‏‏‎‎‎‎‎‏‏‏‏‏‏‏‏‏‏‎‎‏‏‎‎‎‎‏‏‎‏‎‎‎‎‏‎‎‏‏‎‎Enable widgets‎‏‎‎‏‎"</string>
+    <string name="security_enable_widgets_disabled_summary" msgid="6392489775303464905">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‏‎‎‎‏‎‏‏‎‏‏‎‏‎‏‎‏‏‏‏‏‎‎‏‎‏‎‎‏‏‏‎‏‏‏‏‎‏‎‎‎‏‏‏‏‎‎‏‎‏‏‏‏‏‎‎‏‎‎‏‎Disabled by admin‎‏‎‎‏‎"</string>
+    <string name="owner_info_settings_summary" msgid="7472393443779227052">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‎‏‏‏‏‎‏‏‎‎‏‏‎‏‎‎‎‏‏‎‎‎‏‏‏‏‏‏‎‎‏‎‎‏‏‎‎‏‏‎‏‎‏‏‎‎‏‎‏‏‎‏‏‎‏‎‏‏‎‎‎None‎‏‎‎‏‎"</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">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‏‎‎‏‎‏‎‏‏‎‏‏‏‎‏‏‏‏‎‏‎‎‏‎‎‏‏‏‏‎‎‏‎‎‎‎‏‎‏‎‎‎‏‎‎‏‎‏‏‎‏‎‏‏‎‎‏‎‎‎‎E.g., Joe’s Android.‎‏‎‎‏‎"</string>
+    <string name="user_info_settings_title" msgid="1195015434996724736">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‎‎‎‎‏‎‎‏‎‏‎‏‏‎‎‎‏‏‎‎‎‎‏‏‎‏‎‎‏‏‏‎‏‎‎‎‎‎‎‏‎‏‏‎‏‎‏‏‎‏‎‎‎‎‎‎‎‎‎‎‎User info‎‏‎‎‏‎"</string>
+    <string name="show_profile_info_on_lockscreen_label" msgid="2741208907263877990">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‎‏‏‎‎‎‎‎‏‎‏‎‏‎‏‏‏‎‏‎‏‏‏‏‏‎‏‎‎‏‎‎‎‏‎‎‏‎‎‏‏‎‎‏‏‎‏‎‎‎‏‏‎‏‏‎‎‏‏‎‎Show profile info on lock screen‎‏‎‎‏‎"</string>
+    <string name="profile_info_settings_title" msgid="3518603215935346604">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‎‎‎‎‏‏‎‏‎‏‎‎‏‎‎‏‎‏‏‎‏‏‏‏‏‎‏‏‏‎‎‎‎‏‏‏‎‏‎‏‏‏‏‏‏‎‎‏‎‏‏‏‏‎‏‎‏‏‎‎‎Profile info‎‏‎‎‏‎"</string>
+    <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="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>
+    <string name="lockscreen_settings_title" msgid="3922976395527087455">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‎‏‏‎‎‏‏‏‎‎‎‏‎‎‏‏‎‏‏‎‎‎‏‏‏‏‏‏‎‎‏‏‎‏‎‏‏‎‏‎‎‎‏‎‎‏‏‎‎‏‎‏‎‏‎‏‏‏‏‏‎Lock screen preferences‎‏‎‎‏‎"</string>
+    <string name="security_settings_summary" msgid="967393342537986570">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‎‏‏‎‏‎‏‏‎‏‏‎‎‏‏‎‏‏‏‏‏‎‎‎‏‏‏‏‎‏‎‎‏‏‏‎‎‎‎‎‎‏‏‎‏‏‏‏‏‎‎‏‎‎‎‎‎‏‎‏‎‎Set My Location, screen unlock, SIM card lock, credential storage lock‎‏‎‎‏‎"</string>
+    <string name="cdma_security_settings_summary" msgid="6068799952798901542">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‎‏‎‎‎‎‏‏‏‎‎‎‏‎‏‏‎‏‎‏‎‏‏‎‎‏‏‏‎‎‏‏‎‏‏‏‎‏‏‏‏‏‎‎‎‏‏‎‎‏‎‏‎‎‏‎‎‏‏‎‎Set My Location, screen unlock, credential storage lock‎‏‎‎‏‎"</string>
+    <string name="security_passwords_title" msgid="2881269890053568809">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‎‏‏‏‏‏‏‏‏‏‎‎‎‏‎‏‎‎‏‏‏‎‏‏‎‎‏‏‎‎‎‎‏‎‏‎‏‎‏‎‏‎‏‏‏‏‏‏‏‎‎‏‎‎‏‎‏‎‎‏‎Privacy‎‏‎‎‏‎"</string>
+    <string name="disabled_by_administrator_summary" msgid="1601828700318996341">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‎‏‏‎‎‎‏‏‏‎‏‎‏‏‎‏‎‏‏‎‏‎‏‏‎‏‏‏‎‏‎‏‎‎‎‏‏‎‎‎‏‎‏‎‎‎‎‏‎‏‏‏‎‏‏‏‎‏‎‏‎Disabled by admin‎‏‎‎‏‎"</string>
+    <string name="security_status_title" msgid="5848766673665944640">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‎‎‎‏‎‎‏‎‏‎‏‎‏‏‏‏‏‏‏‎‎‏‎‎‏‏‎‏‎‎‏‏‎‏‏‎‎‎‎‎‎‎‎‎‎‏‏‎‏‏‎‎‎‏‎‎‎‎‎‎‎Security status‎‏‎‎‏‎"</string>
+    <string name="security_dashboard_summary" msgid="6757421634477554939">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‏‏‎‏‏‏‎‎‎‏‏‏‎‎‏‎‏‏‏‏‎‎‏‎‏‏‎‎‏‎‎‏‏‎‎‎‏‎‎‏‎‎‏‎‏‏‏‏‏‏‎‎‏‏‏‏‏‎‏‏‎Screen lock, fingerprint‎‏‎‎‏‎"</string>
+    <string name="security_dashboard_summary_no_fingerprint" msgid="8129641548372335540">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‎‎‎‎‏‏‎‏‎‎‏‎‎‏‎‎‏‎‎‏‏‏‏‎‏‎‏‎‎‏‏‎‎‎‎‏‏‏‏‏‏‏‎‏‎‏‎‏‏‎‏‏‏‎‏‏‎‏‎‎‎Screen lock‎‏‎‎‏‎"</string>
+    <string name="security_settings_fingerprint_preference_title" msgid="2488725232406204350">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‎‎‏‎‏‎‎‎‏‎‎‏‏‎‏‏‏‎‏‎‎‏‏‎‏‎‎‏‏‎‏‏‏‏‎‏‎‎‎‏‏‏‏‏‏‎‎‎‏‏‏‏‏‎‏‏‏‏‏‎‎Fingerprint‎‏‎‎‏‎"</string>
+    <string name="fingerprint_manage_category_title" msgid="8293801041700001681">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‎‎‏‏‎‎‎‏‏‎‎‏‏‎‎‎‎‎‎‎‎‎‎‏‏‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‏‏‎‎‎‏‎‏‏‏‏‎‎‏‎‎‎‏‎Manage fingerprints‎‏‎‎‏‎"</string>
+    <string name="fingerprint_usage_category_title" msgid="8438526918999536619">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‎‏‎‏‎‎‎‏‏‎‏‏‏‎‏‎‏‎‏‏‏‎‎‎‎‏‏‎‎‎‎‎‏‎‏‎‏‎‎‎‏‎‎‏‏‏‏‏‎‎‏‏‏‏‏‎‏‎‏‏‎Use fingerprint for‎‏‎‎‏‎"</string>
+    <string name="fingerprint_add_title" msgid="1926752654454033904">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‏‎‏‎‏‎‏‏‏‏‎‏‎‎‏‏‎‎‏‏‎‏‎‏‎‏‎‎‏‎‏‏‎‎‏‎‏‏‎‎‎‏‏‎‎‎‎‎‏‏‎‏‏‏‏‏‎‎‎‎‎Add fingerprint‎‏‎‎‏‎"</string>
+    <string name="fingerprint_enable_keyguard_toggle_title" msgid="5078060939636911795">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‎‏‏‎‎‏‏‏‏‎‎‎‏‏‏‎‎‏‎‏‏‎‎‎‎‏‎‏‎‎‎‏‎‏‏‎‏‏‎‏‏‎‎‎‎‎‏‎‏‏‏‎‏‎‏‏‎‎‏‏‎screen lock‎‏‎‎‏‎"</string>
+    <plurals name="security_settings_fingerprint_preference_summary" formatted="false" msgid="624961700033979880">
+      <item quantity="other">‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‎‏‎‎‎‏‎‏‎‏‏‎‎‎‏‎‎‏‏‏‏‎‏‎‏‏‎‏‎‏‏‏‎‎‎‎‎‏‎‏‏‏‏‏‏‏‏‏‎‎‏‎‏‏‏‏‎‏‎‎‎‎‎‏‎‎‏‏‎<xliff:g id="COUNT_1">%1$d</xliff:g>‎‏‎‎‏‏‏‎ fingerprints set up‎‏‎‎‏‎</item>
+      <item quantity="one">‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‎‏‎‎‎‏‎‏‎‏‏‎‎‎‏‎‎‏‏‏‏‎‏‎‏‏‎‏‎‏‏‏‎‎‎‎‎‏‎‏‏‏‏‏‏‏‏‏‎‎‏‎‏‏‏‏‎‏‎‎‎‎‎‏‎‎‏‏‎<xliff:g id="COUNT_0">%1$d</xliff:g>‎‏‎‎‏‏‏‎ fingerprint set up‎‏‎‎‏‎</item>
+    </plurals>
+    <string name="security_settings_fingerprint_preference_summary_none" msgid="1507739327565151923"></string>
+    <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, authorize purchases, or sign in to apps. Be careful whose fingerprints you add. Even one added print can do any of these things.‎‏‎‎‏‏‎\n‎‏‎‎‏‏‏‎‎‏‎‎‏‏‎\n‎‏‎‎‏‏‏‎Note: Your fingerprint may be less secure than a strong pattern or PIN.‎‏‎‎‏‎"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_message_unlock_disabled" msgid="1550756694054944874">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‎‏‎‏‏‎‎‎‎‏‎‏‎‏‏‎‎‏‎‎‏‏‏‏‏‏‏‏‎‎‏‏‏‎‏‎‎‎‏‏‎‏‎‎‎‏‎‎‎‎‎‎‎‏‏‎‏‎‏‎‎Use your fingerprint to unlock your phone or approve purchases.‎‏‎‎‏‏‎\n‎‏‎‎‏‏‏‎‎‏‎‎‏‏‎\n‎‏‎‎‏‏‏‎Note: You can’t use your fingerprint to unlock this device. For more information, contact your organization’s admin.‎‏‎‎‏‎"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_message_setup" msgid="6817326798834882531">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‏‏‏‎‏‎‎‏‏‏‎‎‎‎‎‎‎‎‏‎‏‎‎‏‏‎‏‎‏‎‎‏‎‎‏‎‎‏‎‎‏‏‎‏‏‏‎‏‎‏‏‏‏‏‏‎‎‎‏‏‎Use your fingerprint to unlock your phone or approve purchases.‎‏‎‎‏‏‎\n‎‏‎‎‏‏‏‎‎‏‎‎‏‏‎\n‎‏‎‎‏‏‏‎Note: Your fingerprint may be less secure than a strong pattern or PIN.‎‏‎‎‏‎"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_cancel" msgid="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="1961957425135180242">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‏‎‏‏‎‎‏‏‏‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‎‎‏‎‎‎‎‏‏‏‎‏‏‎‎‏‏‏‏‏‎‏‎‏‏‎‎‏‏‏‎‏‎‎‏‎‎Next‎‏‎‎‏‎"</string>
+    <string name="setup_fingerprint_enroll_skip_title" msgid="362050541117362034">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‎‏‏‏‎‏‎‎‎‎‎‏‏‎‎‏‎‎‎‎‏‏‎‎‎‎‏‏‎‎‏‎‎‎‎‏‏‎‎‎‎‎‏‎‎‏‏‏‎‎‏‏‏‏‎‏‏‏‎‎‏‎‎Skip fingerprint?‎‏‎‎‏‎"</string>
+    <string name="setup_fingerprint_enroll_skip_after_adding_lock_text" msgid="958990414356204763">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‎‏‏‎‏‎‏‎‎‏‏‏‏‎‎‎‎‎‏‎‎‏‎‏‏‎‎‏‏‎‏‏‎‏‏‏‎‏‎‏‏‎‏‎‎‏‏‎‎‏‏‎‎‏‏‎‏‏‎‏‏‎Fingerprint setup only takes a minute or two. If you skip this, you can add your fingerprint later in settings.‎‏‎‎‏‎"</string>
+    <string name="lock_screen_intro_skip_title" msgid="4988210105913705679">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‎‏‎‏‎‎‏‏‏‎‎‏‏‎‏‎‏‏‏‎‏‎‏‎‏‎‎‏‏‎‏‎‎‏‎‎‎‎‎‎‎‎‎‎‎‎‎‎‎‏‎‎‏‏‎‎‏‏‏‏‎Skip screen lock?‎‏‎‎‏‎"</string>
+    <string name="lock_screen_intro_skip_dialog_text_frp" product="tablet" msgid="1581834104051243425">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‎‏‎‏‏‏‏‏‎‎‏‏‏‏‎‎‏‏‎‏‏‎‏‏‏‏‎‎‏‎‎‏‏‎‎‏‏‎‎‏‎‎‏‎‏‎‎‏‏‎‎‏‏‎‏‎‎‎‎‏‎Device protection features won’t be turned on. You won’t be able to prevent others from using this tablet if it’s lost, stolen or reset.‎‏‎‎‏‎"</string>
+    <string name="lock_screen_intro_skip_dialog_text_frp" product="device" msgid="4629503416877189572">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‎‎‎‎‎‎‏‏‏‏‏‏‎‏‎‎‏‏‎‎‏‏‎‏‎‏‎‎‎‏‎‏‏‎‎‏‎‏‏‎‏‏‎‎‎‎‎‎‏‎‎‏‏‏‎‎‎‏‎‎‎Device protection features won’t be turned on. You won’t be able to prevent others from using this device if it’s lost, stolen or reset.‎‏‎‎‏‎"</string>
+    <string name="lock_screen_intro_skip_dialog_text_frp" product="default" msgid="2423428240245737909">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‎‎‎‏‏‎‏‎‎‎‎‏‏‎‏‏‏‏‏‏‎‎‏‎‎‏‎‏‎‎‎‎‎‏‏‎‎‏‏‏‏‏‏‏‎‏‎‎‏‎‎‏‏‎‏‏‎‏‎‏‎Device protection features won’t be turned on. You won’t be able to prevent others from using this phone if it’s lost, stolen or reset.‎‏‎‎‏‎"</string>
+    <string name="lock_screen_intro_skip_dialog_text" product="tablet" msgid="5219287483885558525">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‏‎‎‎‎‏‏‎‏‏‏‎‏‎‏‎‎‎‏‎‎‏‎‏‎‎‎‎‎‏‎‎‏‎‎‏‏‎‏‎‎‏‎‎‎‎‎‏‏‎‏‎‏‏‏‏‏‏‎‏‎Device protection features won’t be turned on. You won’t be able to prevent others from using this tablet if it’s lost or stolen.‎‏‎‎‏‎"</string>
+    <string name="lock_screen_intro_skip_dialog_text" product="device" msgid="1466238255429527112">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‎‏‎‎‎‏‎‏‏‎‎‏‎‎‎‏‏‏‏‏‏‏‏‎‏‏‎‎‏‏‎‎‎‎‏‎‏‏‏‏‎‏‏‏‎‎‏‎‎‏‏‎‎‏‎‎‏‎‎‎‎Device protection features won’t be turned on. You won’t be able to prevent others from using this device if it’s lost or stolen.‎‏‎‎‏‎"</string>
+    <string name="lock_screen_intro_skip_dialog_text" product="default" msgid="3008526710555416125">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‏‎‎‏‏‏‎‎‎‎‎‎‎‏‏‎‏‏‏‏‎‎‎‏‏‎‏‎‎‏‏‏‎‏‏‏‏‏‏‎‏‏‏‎‎‎‎‏‎‏‏‎‎‎‏‏‏‏‎‏‎Device protection features won’t be turned on. You won’t be able to prevent others from using this phone if it’s lost or stolen.‎‏‎‎‏‎"</string>
+    <string name="skip_anyway_button_label" msgid="2323522873558834513">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‎‎‎‎‎‎‏‏‏‏‏‎‏‏‎‎‏‏‏‏‏‎‏‏‏‏‏‎‎‎‏‏‎‎‎‏‏‏‏‏‏‎‎‎‎‎‎‏‏‏‎‏‎‏‎‏‎‎‎‏‎Skip anyway‎‏‎‎‏‎"</string>
+    <string name="go_back_button_label" msgid="4745265266186209467">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‎‎‎‏‏‏‎‏‏‎‏‎‏‎‎‏‎‎‎‏‏‎‎‏‏‏‏‎‎‎‏‏‏‏‎‎‎‎‎‎‎‏‏‏‎‏‎‎‏‎‎‎‏‎‏‏‏‎‏‏‎Go back‎‏‎‎‏‎"</string>
+    <string name="security_settings_fingerprint_enroll_find_sensor_title" msgid="3051496861358227199">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‏‎‏‎‎‏‎‏‏‎‎‏‎‎‎‏‏‎‎‎‎‎‏‏‏‎‏‎‎‏‎‏‎‏‏‎‎‏‏‏‏‎‎‏‏‏‏‏‏‏‏‎‏‏‏‏‏‏‏‏‎Touch the sensor‎‏‎‎‏‎"</string>
+    <string name="security_settings_fingerprint_enroll_find_sensor_message" msgid="8793966374365960368">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‏‎‏‎‎‎‎‎‏‎‏‎‎‏‏‏‎‎‎‏‏‏‎‏‎‎‏‏‎‎‏‏‎‏‏‎‏‏‎‏‎‎‎‎‎‎‎‏‏‎‎‎‏‎‏‏‎‎‎‎‎It’s on the back of your phone. Use your index finger.‎‏‎‎‏‎"</string>
+    <string name="security_settings_fingerprint_enroll_find_sensor_content_description" msgid="2058830032070449160">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‏‏‎‎‏‎‎‏‎‎‏‎‎‏‏‎‏‏‏‏‎‎‎‎‎‎‎‏‏‎‎‎‏‎‏‎‎‏‏‏‎‏‏‏‎‎‎‏‏‎‎‎‎‎‎‎‏‎‎‎‎Illustration with device and fingerprint sensor location‎‏‎‎‏‎"</string>
+    <string name="security_settings_fingerprint_enroll_dialog_name_label" msgid="7086763077909041106">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‎‎‏‎‎‏‎‏‏‎‎‏‎‎‏‏‏‏‎‏‎‏‏‏‏‎‎‎‏‏‎‏‏‎‏‎‎‎‎‏‏‏‏‏‎‏‎‎‏‏‏‏‏‏‎‏‎‎‏‎‎Name‎‏‎‎‏‎"</string>
+    <string name="security_settings_fingerprint_enroll_dialog_ok" msgid="4150384963879569750">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‏‎‎‏‏‎‎‏‏‎‎‏‎‎‏‎‎‎‎‏‎‎‏‎‎‎‏‎‏‎‎‎‏‏‎‏‎‎‏‎‏‎‏‎‎‎‎‎‏‎‎‏‎‏‎‏‎‏‏‎‎OK‎‏‎‎‏‎"</string>
+    <string name="security_settings_fingerprint_enroll_dialog_delete" msgid="4114615413240707936">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‏‎‎‏‎‎‎‏‏‎‏‎‎‎‎‎‏‏‎‎‏‏‏‎‏‎‏‏‎‎‎‎‏‏‎‏‏‎‎‎‏‏‏‏‎‎‏‏‏‎‏‏‎‏‏‎‎‎‎‎‎Delete‎‏‎‎‏‎"</string>
+    <string name="security_settings_fingerprint_enroll_start_title" msgid="2068961812439460133">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‏‏‎‎‏‎‏‏‎‏‏‎‎‏‏‎‏‏‎‏‏‏‎‎‏‏‏‎‎‏‏‏‏‏‎‎‎‏‎‎‏‏‎‏‎‏‏‎‏‎‎‏‎‎‏‎‎‏‎‏‎Touch the sensor‎‏‎‎‏‎"</string>
+    <string name="security_settings_fingerprint_enroll_start_message" msgid="3909929328942564524">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‎‏‏‎‎‏‎‎‎‎‏‎‏‏‎‏‏‏‎‎‎‎‎‎‎‎‏‎‎‏‎‎‏‏‎‎‏‎‎‎‎‎‎‎‏‏‎‎‎‏‎‎‏‎‏‎‏‏‎‎‎Put your finger on the sensor and lift after you feel a vibration‎‏‎‎‏‎"</string>
+    <string name="security_settings_fingerprint_enroll_repeat_title" msgid="2819679722403209778">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‎‏‏‏‎‎‏‎‎‎‎‏‏‎‎‎‎‎‏‏‏‏‎‎‎‏‎‎‏‎‏‎‏‎‏‎‎‎‏‏‎‏‏‏‎‎‏‎‎‎‏‎‎‎‏‏‎‎‏‎‎Lift, then touch again‎‏‎‎‏‎"</string>
+    <string name="security_settings_fingerprint_enroll_repeat_message" msgid="6158989350522518586">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‎‏‎‏‎‏‏‏‏‎‎‏‎‎‏‎‎‎‎‎‎‎‏‎‏‏‏‎‏‎‏‏‏‏‎‏‎‏‎‎‏‏‏‎‏‏‏‏‏‏‎‎‎‎‏‏‏‎‏‎‎Keep lifting your finger to add the different parts of your fingerprint‎‏‎‎‏‎"</string>
+    <string name="security_settings_fingerprint_enroll_finish_title" msgid="7567276170287972230">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‏‎‎‏‎‎‎‎‎‏‎‎‎‏‎‏‏‏‎‏‏‎‎‏‎‏‎‏‎‏‏‎‏‏‏‏‎‏‎‎‏‎‏‎‏‏‏‏‏‏‏‏‏‎‎‎‎‏‏‎‎Fingerprint added‎‏‎‎‏‎"</string>
+    <string name="security_settings_fingerprint_enroll_finish_message" msgid="4796715961273420536">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‎‎‏‎‏‎‎‏‎‎‎‏‎‏‎‏‏‎‏‏‏‏‎‎‎‎‎‎‏‎‏‏‎‎‎‎‎‎‏‎‎‏‏‎‎‎‎‎‏‎‏‎‏‏‏‏‏‎‎‎‎When you see this icon, use your fingerprint for identification or to approve purchases.‎‏‎‎‏‎"</string>
+    <string name="security_settings_fingerprint_enroll_enrolling_skip" msgid="3710211704052369752">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‎‎‏‏‎‏‏‏‏‏‎‏‎‏‎‏‎‎‎‏‏‏‏‎‎‎‏‏‎‎‏‎‎‏‎‏‏‎‎‎‏‎‎‏‏‏‎‎‏‎‎‏‎‏‎‏‏‎‎‎‎Do it later‎‏‎‎‏‎"</string>
+    <string name="setup_fingerprint_enroll_enrolling_skip_title" msgid="6808422329107426923">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‏‏‏‎‎‏‏‏‏‏‎‎‎‏‏‎‎‎‎‎‎‎‎‎‏‎‎‏‎‎‏‎‎‏‏‏‎‏‎‎‏‎‎‏‎‎‏‎‏‏‏‎‎‏‏‎‏‎‏‏‎Skip fingerprint setup?‎‏‎‎‏‎"</string>
+    <string name="setup_fingerprint_enroll_enrolling_skip_message" msgid="274849306857859783">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‎‏‎‏‏‏‏‎‏‎‎‎‎‎‏‏‏‎‏‎‏‏‏‏‏‏‏‎‏‎‎‎‎‎‏‏‎‎‎‎‎‎‏‏‎‎‏‏‎‏‎‏‎‏‏‎‎‎‏‏‏‎You’ve chosen to use your fingerprint as one way to unlock your phone. If you skip now, you’ll need to set this up later. Setup takes only a minute or so.‎‏‎‎‏‎"</string>
+    <string name="security_settings_fingerprint_enroll_setup_screen_lock" msgid="1195743489835505376">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‎‎‎‎‏‎‎‏‏‎‎‎‎‎‏‎‎‎‏‎‎‏‎‏‏‏‏‎‎‏‏‎‎‎‏‎‎‎‏‎‎‎‎‏‏‎‎‏‎‏‏‎‏‏‏‎‎‎‎‎‎Set up screen lock‎‏‎‎‏‎"</string>
+    <string name="security_settings_fingerprint_enroll_done" msgid="4014607378328187567">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‎‏‏‏‏‎‏‏‎‏‏‎‏‏‎‎‎‎‎‎‎‎‏‎‎‎‏‏‏‏‏‎‏‎‎‏‏‏‏‎‏‎‎‏‏‏‏‏‎‎‏‎‏‎‏‎‏‏‏‏‎Done‎‏‎‎‏‎"</string>
+    <string name="security_settings_fingerprint_enroll_touch_dialog_title" msgid="1863561601428695160">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‏‎‎‏‏‏‎‏‏‏‎‎‏‎‏‏‎‎‏‏‎‏‏‎‎‏‏‏‎‎‏‎‎‏‏‎‎‎‏‏‎‏‏‏‎‎‏‎‏‎‎‎‎‏‏‏‏‎‎‎‎Whoops, that’s not the sensor‎‏‎‎‏‎"</string>
+    <string name="security_settings_fingerprint_enroll_touch_dialog_message" msgid="2989019978041986175">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‏‎‎‏‎‏‏‏‏‎‏‏‎‎‏‎‎‎‎‏‏‏‎‏‎‏‎‏‎‏‏‎‎‎‎‏‏‎‏‏‏‏‎‏‎‎‎‎‏‏‎‎‎‏‏‏‏‏‏‏‎Touch the sensor on the back of your phone. Use your index finger.‎‏‎‎‏‎"</string>
+    <string name="security_settings_fingerprint_enroll_error_dialog_title" msgid="3618021988442639280">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‎‎‏‎‎‎‏‏‎‏‎‏‏‏‎‎‏‎‏‏‏‏‎‏‎‏‎‎‎‏‎‏‎‎‏‎‏‎‏‎‏‏‎‏‎‎‎‎‏‎‏‏‏‎‏‏‎‎‎‎‎Enrollment was not completed‎‏‎‎‏‎"</string>
+    <string name="security_settings_fingerprint_enroll_error_timeout_dialog_message" msgid="2942551158278899627">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‏‎‎‎‏‏‎‏‎‏‏‎‎‎‎‎‏‎‏‎‏‎‏‏‎‎‎‎‎‎‏‎‏‎‏‎‏‎‏‎‎‎‎‎‏‏‎‎‎‏‏‏‏‎‏‎‏‎‏‏‎Fingerprint enrollment time limit reached. Try again.‎‏‎‎‏‎"</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">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‎‏‏‏‏‎‏‎‏‏‎‏‏‏‏‏‏‎‎‎‎‏‏‎‎‏‏‏‏‏‏‎‎‏‏‏‎‏‏‏‎‎‏‎‏‎‏‎‏‎‏‎‎‏‎‏‎‏‏‏‎Add another‎‏‎‎‏‎"</string>
+    <string name="fingerprint_enroll_button_next" msgid="6247009337616342759">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‎‏‏‎‏‎‏‏‎‎‎‏‏‏‎‏‎‏‎‏‏‏‏‎‎‏‎‎‏‏‏‏‏‏‎‏‎‎‏‎‏‎‏‏‏‎‎‏‏‏‏‎‏‏‏‎‎‏‏‏‎Next‎‏‎‎‏‎"</string>
+    <string name="security_settings_fingerprint_enroll_disclaimer" msgid="2624905914239271751">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‎‏‎‎‎‏‏‎‏‏‎‏‏‎‎‎‏‎‏‎‎‎‎‎‎‏‎‏‏‎‎‎‏‎‏‏‎‎‎‎‏‏‎‏‏‏‎‎‎‎‏‏‎‏‎‎‎‏‏‏‎In addition to unlocking your phone, you can also use your fingerprint to authorize purchases and app access. ‎‏‎‎‏‏‎"<annotation id="url">"‎‏‎‎‏‏‏‎Learn more‎‏‎‎‏‏‎"</annotation>"‎‏‎‎‏‏‏‎‎‏‎‎‏‎"</string>
+    <string name="security_settings_fingerprint_enroll_disclaimer_lockscreen_disabled" msgid="7846871823167357942">" ‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‏‏‎‎‏‏‏‎‎‏‎‏‏‎‏‏‎‎‎‎‎‏‎‏‏‎‎‏‎‏‎‎‎‎‎‏‏‏‏‎‏‎‎‏‏‎‎‎‎‎‏‏‏‏‏‏‎‏‏‎‎ The screen lock option is disabled. To learn more, contact your organization\'s admin. ‎‏‎‎‏‏‎"<annotation id="admin_details">"‎‏‎‎‏‏‏‎More details‎‏‎‎‏‏‎"</annotation>"‎‏‎‎‏‏‏‎‎‏‎‎‏‏‎\n‎‏‎‎‏‏‏‎‎‏‎‎‏‏‎\n‎‏‎‎‏‏‏‎You can still use your fingerprint to authorize purchases and app access. ‎‏‎‎‏‏‎"<annotation id="url">"‎‏‎‎‏‏‏‎Learn more‎‏‎‎‏‏‎"</annotation>"‎‏‎‎‏‏‏‎‎‏‎‎‏‎"</string>
+    <string name="security_settings_fingerprint_enroll_lift_touch_again" msgid="1888772560642539718">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‏‎‏‎‎‎‏‏‎‏‏‎‎‏‎‎‎‏‎‎‏‎‏‎‎‎‏‏‎‎‎‎‎‎‏‎‏‎‎‏‏‎‏‎‏‎‎‎‎‎‎‎‏‏‎‎‎‏‏‎‎Lift finger, then touch sensor again‎‏‎‎‏‎"</string>
+    <string name="fingerprint_add_max" msgid="1020927549936895822">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‎‏‏‏‎‎‎‏‎‏‎‏‏‎‎‎‏‎‎‎‎‎‎‏‏‎‎‏‎‏‎‎‏‎‎‏‏‎‏‏‎‎‏‏‎‎‎‎‎‎‏‏‏‎‏‎‎‏‏‏‎‎You can add up to ‎‏‎‎‏‏‎<xliff:g id="COUNT">%d</xliff:g>‎‏‎‎‏‏‏‎ fingerprints‎‏‎‎‏‎"</string>
+    <string name="fingerprint_intro_error_max" msgid="6864066984678078441">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‏‏‏‏‎‏‎‎‎‎‏‎‎‎‎‏‎‎‎‎‏‎‎‎‏‏‏‎‎‎‏‎‎‎‎‎‎‎‏‏‏‎‎‏‎‎‏‏‎‏‏‏‏‏‏‎‏‎‎‏‎You’ve added the maximum number of fingerprints‎‏‎‎‏‎"</string>
+    <string name="fingerprint_intro_error_unknown" msgid="1905692132326523040">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‏‎‏‎‎‏‏‏‎‎‏‎‎‏‏‎‎‎‎‎‏‏‏‎‎‏‎‏‏‏‎‎‎‏‏‎‏‎‎‏‎‏‎‎‎‏‎‎‎‎‎‎‏‎‏‎‎‎‎‎‎Can’t add more fingerprints‎‏‎‎‏‎"</string>
+    <string name="fingerprint_last_delete_title" msgid="6410310101247028988">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‏‎‎‎‏‏‏‏‎‏‎‏‏‏‏‏‏‏‏‏‎‎‎‏‎‎‏‎‏‏‏‎‎‏‎‎‏‏‏‎‏‏‎‏‎‏‏‎‏‏‏‎‏‏‏‏‏‏‎‎‎Remove all fingerprints?‎‏‎‎‏‎"</string>
+    <string name="fingerprint_delete_title" msgid="1368196182612202898">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‎‎‏‎‏‏‏‏‏‏‎‎‏‏‎‎‏‏‏‏‎‎‏‎‏‏‎‏‏‏‎‏‎‏‏‏‏‎‏‎‎‏‎‏‎‏‎‏‎‏‎‏‏‎‎‏‎‎‏‎‎Remove \'‎‏‎‎‏‏‎<xliff:g id="FINGERPRINT_ID">%1$s</xliff:g>‎‏‎‎‏‏‏‎\'‎‏‎‎‏‎"</string>
+    <string name="fingerprint_delete_message" msgid="8597787803567398131">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‎‏‏‏‎‏‎‏‎‎‎‏‎‏‏‏‏‎‏‎‎‏‏‏‎‏‎‎‎‏‎‎‏‏‎‏‏‏‎‏‎‎‏‎‎‎‎‏‏‏‎‎‏‏‏‏‎‎‏‏‎Do you want to delete this fingerprint?‎‏‎‎‏‎"</string>
+    <string name="fingerprint_last_delete_message" msgid="7852321001254275878">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‏‏‎‎‏‏‏‏‏‎‎‏‎‎‎‎‏‏‎‎‎‏‎‏‏‎‎‎‏‏‏‎‎‏‏‎‎‎‎‏‏‎‎‏‏‏‎‎‏‎‏‏‎‎‏‎‎‏‏‎‎You won\'t be able to use your fingerprints to unlock your phone, authorize purchases, or sign in to apps with them‎‏‎‎‏‎"</string>
+    <string name="fingerprint_last_delete_message_profile_challenge" msgid="6521520787746771912">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‏‎‏‎‏‎‎‎‎‎‎‏‎‎‎‏‏‎‎‎‏‎‎‏‏‎‏‎‏‎‎‏‏‏‎‎‏‏‏‏‏‎‎‎‏‏‎‏‎‎‏‏‏‏‎‎‏‎‎‎‎You won\'t be able to use your fingerprints to unlock your work profile, authorize purchases, or sign in to work apps‎‏‎‎‏‎"</string>
+    <string name="fingerprint_last_delete_confirm" msgid="2634726361059274289">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‎‏‎‎‏‎‎‏‎‎‎‎‎‏‏‎‏‏‎‏‏‎‏‎‏‎‏‎‎‏‏‏‏‏‏‏‎‏‎‎‏‎‏‏‏‎‏‎‏‏‏‎‎‎‏‏‎‎‎‏‎Yes, remove‎‏‎‎‏‎"</string>
+    <string name="confirm_fingerprint_icon_content_description" msgid="5255544532157079096">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‏‎‎‎‏‏‏‎‏‏‏‏‎‏‏‏‎‎‎‏‏‏‏‎‏‎‎‎‎‎‏‎‏‏‎‎‎‏‏‏‏‎‎‎‎‎‎‏‏‏‏‎‎‎‏‏‏‎‎‎‎Use your fingerprint to continue.‎‏‎‎‏‎"</string>
+    <string name="crypt_keeper_settings_title" msgid="4219233835490520414">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‏‎‏‎‏‎‎‎‏‏‎‏‏‎‏‏‏‎‏‎‏‏‎‏‎‎‎‏‏‎‏‎‎‏‎‎‏‎‏‏‏‎‎‎‏‎‏‎‏‏‎‏‎‏‎‏‏‏‏‎‎Encryption‎‏‎‎‏‎"</string>
+    <string name="crypt_keeper_encrypt_title" product="tablet" msgid="1060273569887301457">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‎‏‏‏‎‏‎‏‏‎‏‏‎‏‏‎‏‏‎‎‏‎‎‏‏‎‎‎‏‏‎‏‏‏‎‎‏‏‏‎‏‏‏‏‎‎‎‏‎‏‏‏‏‎‏‎‏‎‎‎‏‎Encrypt tablet‎‏‎‎‏‎"</string>
+    <string name="crypt_keeper_encrypt_title" product="default" msgid="1878996487755806122">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‏‎‏‎‎‎‎‏‎‎‏‏‏‎‎‎‏‎‎‏‎‏‎‏‏‎‎‏‏‎‏‎‏‎‏‎‏‏‏‎‎‏‎‎‎‎‏‏‎‏‎‏‏‎‏‎‏‎‏‎‎Encrypt phone‎‏‎‎‏‎"</string>
+    <string name="crypt_keeper_encrypted_summary" msgid="1868233637888132906">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‏‎‎‏‏‏‏‎‏‏‎‏‎‏‎‎‏‏‎‎‏‎‎‏‏‎‎‎‎‏‏‎‎‏‏‏‏‏‎‎‎‎‏‎‎‎‎‎‎‏‏‏‎‎‏‎‏‎‏‎‎Encrypted‎‏‎‎‏‎"</string>
+    <string name="crypt_keeper_desc" product="tablet" msgid="503014594435731275">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‎‏‏‏‏‎‏‏‏‏‏‎‏‏‎‎‎‏‎‎‎‏‎‎‎‏‏‎‏‏‏‏‎‎‏‎‏‎‎‎‏‎‏‏‎‏‏‏‎‎‏‏‏‏‎‏‎‎‏‎‏‏‎You can encrypt your accounts, settings, downloaded apps and their data, media, and other files. After you encrypt your tablet, assuming you’ve set up a screen lock (that is, a pattern or numeric PIN or password), you’ll need to unlock the screen to decrypt the tablet every time you power it on. The only other way to decrypt is to perform a factory data reset, erasing all your data.‎‏‎‎‏‏‎\n‎‏‎‎‏‏‏‎‎‏‎‎‏‏‎\n‎‏‎‎‏‏‏‎Encryption takes an hour or more. You must start with a charged battery and keep your tablet plugged in throughout the process. If you interrupt it, you’ll lose some or all of your data‎‏‎‎‏‎"</string>
+    <string name="crypt_keeper_desc" product="default" msgid="2579929266645543631">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‎‎‏‏‏‏‎‎‏‏‎‏‏‎‏‏‏‏‏‏‏‏‏‏‏‏‏‏‏‎‏‏‏‏‎‎‎‎‎‎‏‎‏‎‏‎‏‎‏‎‏‎‏‏‎‎‏‏‏‏‎You can encrypt your accounts, settings, downloaded apps and their data, media, and other files. After you encrypt your phone, assuming you’ve set up a screen lock (that is, a pattern or numeric PIN or password), you’ll need to unlock the screen to decrypt the phone every time you power it on. The only other way to decrypt is to perform a factory data reset, erasing all your data.‎‏‎‎‏‏‎\n‎‏‎‎‏‏‏‎‎‏‎‎‏‏‎\n‎‏‎‎‏‏‏‎Encryption takes an hour or more. You must start with a charged battery and keep your phone plugged in throughout the process. If you interrupt it, you’ll lose some or all of your data.‎‏‎‎‏‎"</string>
+    <string name="crypt_keeper_button_text" product="tablet" msgid="1189623490604750854">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‎‎‎‎‏‎‎‎‎‎‏‎‎‏‏‎‎‏‎‎‎‏‎‎‎‎‏‏‎‎‎‎‎‏‎‏‏‏‏‏‎‏‎‎‏‏‎‏‏‎‎‎‎‎‎‎‎‏‏‎‎Encrypt tablet‎‏‎‎‏‎"</string>
+    <string name="crypt_keeper_button_text" product="default" msgid="2008346408473255519">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‏‎‏‏‏‏‎‏‏‏‏‏‎‎‎‏‎‏‎‎‎‏‏‎‏‎‏‎‏‏‏‏‎‏‏‎‏‏‏‏‏‎‏‎‏‏‎‏‏‏‏‎‎‏‎‏‏‏‏‏‎Encrypt phone‎‏‎‎‏‎"</string>
+    <string name="crypt_keeper_low_charge_text" msgid="2029407131227814893">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‏‏‎‎‎‎‏‎‏‎‎‏‏‏‏‎‎‏‏‏‎‎‎‎‏‎‎‎‏‎‎‏‏‎‎‏‎‏‏‏‏‎‏‎‎‏‏‏‏‎‏‏‏‏‏‎‏‏‎‏‎Charge your battery and try again.‎‏‎‎‏‎"</string>
+    <string name="crypt_keeper_unplugged_text" msgid="4785376766063053901">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‎‎‏‎‎‏‏‎‏‎‎‏‎‎‎‏‎‎‏‎‏‏‎‏‎‎‎‎‏‎‎‏‎‎‎‏‏‎‎‏‏‎‎‎‏‎‎‎‏‏‎‎‎‏‎‎‏‏‎‏‎Plug in your charger and try again.‎‏‎‎‏‎"</string>
+    <string name="crypt_keeper_dialog_need_password_title" msgid="4058971800557767">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‎‏‎‎‏‏‏‎‎‏‏‎‏‎‏‏‏‎‎‏‏‏‎‏‎‎‎‎‎‏‎‎‎‏‎‏‎‎‏‏‎‏‎‏‏‎‎‎‏‏‎‎‎‏‏‏‎No lock screen PIN or password‎‏‎‎‏‎"</string>
+    <string name="crypt_keeper_dialog_need_password_message" msgid="4071395977297369642">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‏‎‎‎‏‎‎‎‎‎‎‎‏‎‎‎‎‎‎‏‎‎‎‏‎‎‎‏‏‏‏‏‎‏‏‎‏‏‎‎‎‎‏‏‏‎‎‏‏‎‏‎‎‎‏‎‏‎‏‎‎You need to set a lock screen PIN or password before you can start encryption.‎‏‎‎‏‎"</string>
+    <string name="crypt_keeper_confirm_title" msgid="5100339496381875522">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‎‏‏‎‏‏‎‎‏‎‎‎‎‎‎‎‏‎‏‏‏‎‏‏‏‏‏‏‏‏‎‎‏‎‏‏‏‎‏‏‏‏‎‎‏‎‎‎‎‏‎‏‎‏‎‎‎‎‏‎‎Encrypt?‎‏‎‎‏‎"</string>
+    <string name="crypt_keeper_final_desc" product="tablet" msgid="517662068757620756">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‎‏‏‏‏‏‎‎‏‎‏‏‏‏‎‎‎‏‏‎‏‎‏‏‏‎‏‎‎‎‏‎‏‎‏‎‎‏‏‏‏‏‏‏‎‏‏‏‏‎‏‎‎‎‎‎‎‏‎‏‎‎‎The encryption operation is irreversible and if you interrupt it, you’ll lose data. Encryption takes an hour or more, during which the tablet will restart several times.‎‏‎‎‏‎"</string>
+    <string name="crypt_keeper_final_desc" product="default" msgid="287503113671320916">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‎‏‎‏‏‏‏‏‏‏‏‎‏‎‏‏‎‏‎‏‎‏‎‎‎‏‏‏‏‎‎‎‎‎‎‏‎‎‎‏‏‎‎‏‎‏‎‏‎‎‏‎‏‎‏‎‏‎‏‎‎‎The encryption operation is irreversible and if you interrupt it, you’ll lose data. Encryption takes an hour or more, during which the phone will restart several times.‎‏‎‎‏‎"</string>
+    <string name="crypt_keeper_setup_title" msgid="1783951453124244969">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‏‎‎‎‏‏‎‎‎‎‎‏‏‏‎‏‏‏‏‎‎‏‏‎‎‏‎‏‎‎‎‏‎‏‎‎‎‎‎‎‎‎‏‏‎‎‏‏‎‏‎‏‏‏‏‎‏‎‎‏‎Encrypting‎‏‎‎‏‎"</string>
+    <string name="crypt_keeper_setup_description" product="tablet" msgid="6689952371032099350">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‏‏‎‎‏‏‎‏‎‏‏‏‎‏‏‏‏‏‎‎‎‎‏‏‏‏‎‎‏‎‎‎‏‏‏‏‏‎‏‎‎‏‏‎‏‎‎‎‏‎‏‎‎‎‎‏‎‏‏‎‎Wait while your tablet is being encrypted. ‎‏‎‎‏‏‎<xliff:g id="PERCENT">^1</xliff:g>‎‏‎‎‏‏‏‎% complete.‎‏‎‎‏‎"</string>
+    <string name="crypt_keeper_setup_description" product="default" msgid="951918761585534875">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‎‏‏‎‏‎‎‏‏‎‏‎‏‏‏‏‎‎‏‎‏‎‎‎‏‎‎‎‏‏‏‏‏‎‏‏‏‎‏‎‏‎‏‎‏‏‏‏‎‎‏‏‏‏‎‎‏‏‎‏‏‎Wait while your phone is being encrypted. ‎‏‎‎‏‏‎<xliff:g id="PERCENT">^1</xliff:g>‎‏‎‎‏‏‏‎% complete.‎‏‎‎‏‎"</string>
+    <string name="crypt_keeper_setup_time_remaining" product="tablet" msgid="1655047311546745695">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‎‏‏‎‏‏‏‏‎‏‏‏‏‏‏‎‏‎‎‎‏‏‎‎‎‎‏‎‏‏‎‏‎‎‏‏‎‎‏‏‎‏‎‏‏‎‎‎‎‎‏‏‎‏‎‏‏‏‏‏‎Wait while your tablet is being encrypted. Time remaining: ‎‏‎‎‏‏‎<xliff:g id="DURATION">^1</xliff:g>‎‏‎‎‏‏‏‎‎‏‎‎‏‎"</string>
+    <string name="crypt_keeper_setup_time_remaining" product="default" msgid="1862964662304683072">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‏‎‎‏‏‏‎‏‏‎‏‎‏‎‎‏‎‏‎‎‎‏‏‏‏‏‎‏‎‏‏‎‏‏‎‏‏‏‎‎‎‏‏‎‏‎‏‏‎‏‎‎‎‏‎‎‎‎‎‎‎Wait while your phone is being encrypted. Time remaining: ‎‏‎‎‏‏‎<xliff:g id="DURATION">^1</xliff:g>‎‏‎‎‏‏‏‎‎‏‎‎‏‎"</string>
+    <string name="crypt_keeper_force_power_cycle" product="tablet" msgid="556504311511212648">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‎‏‏‏‏‏‏‎‏‏‏‎‎‏‎‎‎‏‏‎‎‏‏‎‏‏‏‎‎‏‎‎‎‎‏‎‏‏‏‎‎‏‏‎‎‏‎‏‏‎‎‎‏‎‎‏‏‎‏‎‎‎‎To unlock your tablet, turn it off and then on.‎‏‎‎‏‎"</string>
+    <string name="crypt_keeper_force_power_cycle" product="default" msgid="1794353635603020327">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‏‎‎‎‏‏‏‎‎‏‏‎‏‏‎‏‎‎‏‏‎‎‎‏‏‏‏‏‏‏‏‎‏‎‏‏‏‎‎‎‏‏‎‎‎‏‏‏‏‎‏‎‎‎‏‎‎‏‏‏‎To unlock your phone, turn it off and then on.‎‏‎‎‏‎"</string>
+    <string name="crypt_keeper_warn_wipe" msgid="2738374897337991667">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‎‏‏‎‎‎‎‎‎‎‎‎‏‎‏‎‏‎‎‏‎‏‏‏‎‏‎‏‏‏‏‎‏‎‎‏‏‎‏‎‏‏‎‏‏‎‎‎‎‎‎‏‏‏‏‏‎‎‏‏‎Warning: Your device will be wiped after ‎‏‎‎‏‏‎<xliff:g id="COUNT">^1</xliff:g>‎‏‎‎‏‏‏‎ more failed attempts to be unlocked!‎‏‎‎‏‎"</string>
+    <string name="crypt_keeper_enter_password" msgid="2223340178473871064">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‏‏‏‎‏‏‎‏‏‎‏‎‏‏‏‎‎‏‎‎‎‎‎‏‏‏‎‎‏‏‎‏‎‎‎‎‏‏‎‎‏‎‎‏‏‏‏‎‎‏‏‎‏‏‎‏‏‎‎‎‎Type your password‎‏‎‎‏‎"</string>
+    <string name="crypt_keeper_failed_title" msgid="7133499413023075961">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‏‎‎‎‏‏‏‏‏‏‎‏‎‏‏‏‏‎‏‎‏‏‎‏‎‏‏‎‎‏‎‏‎‏‎‏‏‏‎‎‏‏‏‏‎‎‏‎Encryption unsuccessful‎‏‎‎‏‎"</string>
+    <string name="crypt_keeper_failed_summary" product="tablet" msgid="8219375738445017266">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‎‎‏‎‎‎‎‏‎‎‎‏‎‎‎‏‎‏‏‎‏‎‏‎‏‏‏‏‏‎‎‏‏‏‎‏‎‏‏‏‏‎‏‎‏‎‏‏‎‎‎‎‏‎‏‏‎‎‏‎‎Encryption was interrupted and can’t complete. As a result, the data on your tablet is no longer accessible. ‎‏‎‎‏‏‎\n‎‏‎‎‏‏‏‎‎‏‎‎‏‏‎\n‎‏‎‎‏‏‏‎ To resume using your tablet, you need to perform a factory reset. When you set up your tablet after the reset, you’ll have an opportunity to restore any data that was backed up to your Google Account.‎‏‎‎‏‎"</string>
+    <string name="crypt_keeper_failed_summary" product="default" msgid="3270131542549577953">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‏‏‎‏‎‏‏‎‎‎‎‏‏‏‎‏‎‏‏‏‎‏‎‎‏‏‏‏‏‏‏‎‎‎‏‎‎‏‏‏‎‏‏‏‏‏‎‎‎‎‎‎‏‏‏‎‎‎‎‏‎Encryption was interrupted and can’t complete. As a result, the data on your phone is no longer accessible. ‎‏‎‎‏‏‎\n‎‏‎‎‏‏‏‎‎‏‎‎‏‏‎\n‎‏‎‎‏‏‏‎To resume using your phone, you need to perform a factory reset. When you set up your phone after the reset, you’ll have an opportunity to restore any data that was backed up to your Google Account.‎‏‎‎‏‎"</string>
+    <string name="crypt_keeper_data_corrupt_title" msgid="8759119849089795751">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‏‎‎‏‏‎‎‎‏‏‏‎‏‎‏‎‎‏‎‏‎‎‎‏‏‎‎‎‎‏‎‎‏‏‏‎‎‎‎‏‎‎‏‎‎‎‎‎‎‏‏‎‏‎‏‎‎‏‏‏‎Decryption unsuccessful‎‏‎‎‏‎"</string>
+    <string name="crypt_keeper_data_corrupt_summary" product="tablet" msgid="840107296925798402">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‎‏‎‏‏‏‎‏‎‏‎‎‎‏‎‏‎‏‎‎‏‎‎‏‎‎‎‏‎‏‎‏‎‏‏‏‎‎‏‏‏‏‎‎‏‏‏‎‏‎‎‎‎‎‎‎‎‎‎‏‎‎The password you entered is correct, but unfortunately your data is corrupt. ‎‏‎‎‏‏‎\n‎‏‎‎‏‏‏‎‎‏‎‎‏‏‎\n‎‏‎‎‏‏‏‎To resume using your tablet, you need to perform a factory reset. When you set up your tablet after the reset, you’ll have an opportunity to restore any data that was backed up to your Google Account.‎‏‎‎‏‎"</string>
+    <string name="crypt_keeper_data_corrupt_summary" product="default" msgid="8843311420059663824">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‏‎‏‎‏‎‏‏‏‎‎‏‏‏‎‎‎‎‎‎‏‏‏‎‎‎‎‏‏‏‏‏‎‏‏‎‏‏‎‎‏‏‏‏‏‎‏‏‏‏‎‏‏‏‎‏‎‎‎‎‎The password you entered is correct, but unfortunately your data is corrupt. ‎‏‎‎‏‏‎\n‎‏‎‎‏‏‏‎‎‏‎‎‏‏‎\n‎‏‎‎‏‏‏‎To resume using your phone, you need to perform a factory reset. When you set up your phone after the reset, you’ll have an opportunity to restore any data that was backed up to your Google Account.‎‏‎‎‏‎"</string>
+    <string name="crypt_keeper_switch_input_method" msgid="4168332125223483198">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‏‎‎‏‏‏‎‏‏‎‎‎‏‏‏‎‎‎‏‏‏‏‏‏‏‎‏‏‏‎‏‎‏‏‎‏‏‏‎‎‏‎‏‏‎‏‏‏‎‏‏‏‎‎‏‏‏‏‏‎‎Switch input method‎‏‎‎‏‎"</string>
+    <string name="suggested_lock_settings_title" msgid="8971630898700461034">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‏‏‎‎‏‎‎‎‎‎‎‏‏‎‏‎‎‎‏‎‏‏‎‎‎‏‎‎‏‏‎‎‎‏‎‎‏‏‏‏‎‏‎‏‏‎‏‎‎‎‏‏‏‏‏‎‏‎‏‎‎Set screen lock‎‏‎‎‏‎"</string>
+    <string name="suggested_lock_settings_summary" msgid="8778462376012231110">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‏‎‎‏‏‏‎‏‎‎‏‏‎‏‎‏‏‏‎‏‎‎‎‎‎‏‎‏‎‏‎‎‏‏‎‎‎‏‎‏‎‏‏‏‎‎‏‏‎‎‎‏‏‏‎‎‎‏‏‎‎Protect your device‎‏‎‎‏‎"</string>
+    <string name="suggested_fingerprint_lock_settings_title" msgid="3655973509619012084">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‎‎‏‎‏‎‏‏‏‏‎‎‏‎‏‎‎‎‎‎‏‎‎‎‏‎‎‏‎‏‏‎‏‏‎‏‎‎‎‏‎‏‎‎‎‏‎‏‎‎‎‏‏‏‏‏‎‏‎‎‎Use fingerprint‎‏‎‎‏‎"</string>
+    <string name="suggested_fingerprint_lock_settings_summary" msgid="2149569133725273864">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‏‏‎‏‏‏‎‏‎‏‎‎‏‏‎‎‏‏‎‏‏‎‏‏‏‏‎‎‏‏‏‏‏‎‏‏‏‏‎‏‎‏‏‎‏‏‎‎‏‏‏‏‎‎‎‎‏‎‎‎‎Unlock with your fingerprint‎‏‎‎‏‎"</string>
+    <string name="lock_settings_picker_title" msgid="1095755849152582712">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‎‏‏‏‏‎‎‏‏‎‏‎‎‏‏‏‎‏‎‎‎‎‎‏‎‎‎‏‏‏‎‏‎‎‏‎‏‎‏‎‎‏‎‏‏‏‏‎‏‎‏‎‎‎‎‏‏‏‎‎‎‎Choose screen lock‎‏‎‎‏‎"</string>
+    <string name="lock_settings_picker_title_profile" msgid="8822511284992306796">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‏‎‏‎‎‏‏‎‏‏‏‏‏‏‎‏‏‎‏‏‎‏‎‎‎‏‎‏‎‎‏‎‎‎‎‎‏‏‎‏‎‏‏‏‎‏‏‎‏‏‏‎‎‏‏‎‏‏‎‎‎Choose work lock‎‏‎‎‏‎"</string>
+    <string name="setup_lock_settings_picker_title" product="tablet" msgid="90329443364067215">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‎‎‏‏‎‏‎‎‎‎‎‎‏‏‏‎‏‎‏‎‎‎‏‎‎‏‏‎‎‏‏‏‎‎‎‎‎‏‏‏‏‎‎‏‎‏‎‏‎‏‏‏‏‎‎‎‏‏‏‏‎Protect your tablet‎‏‎‎‏‎"</string>
+    <string name="setup_lock_settings_picker_title" product="device" msgid="2399952075134938929">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‎‎‎‏‎‏‎‎‏‏‏‎‎‏‎‏‎‏‏‏‏‎‏‏‎‎‏‎‎‏‏‎‎‏‎‎‎‏‏‎‎‎‎‏‎‎‏‎‏‏‏‏‎‎‏‏‎‎‎‏‎Protect your device‎‏‎‎‏‎"</string>
+    <string name="setup_lock_settings_picker_title" product="default" msgid="1572244299605153324">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‎‏‎‏‏‏‎‏‎‎‎‏‏‎‏‏‏‎‏‏‏‏‎‏‏‏‎‎‎‏‎‎‎‎‏‎‎‎‎‏‏‎‎‏‎‎‎‏‎‏‏‎‎‎‏‎‏‏‎‎‎Protect your phone‎‏‎‎‏‎"</string>
+    <string name="lock_settings_picker_fingerprint_added_security_message" msgid="5768002109707648463">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‎‎‎‎‎‎‎‎‏‏‎‎‎‎‎‎‏‏‏‏‎‏‎‏‏‎‏‏‏‏‎‎‏‏‎‎‏‏‎‏‎‎‏‏‏‏‏‏‏‏‎‏‏‏‎‎‏‏‏‏‎For added security, set a backup screen lock.‎‏‎‎‏‎"</string>
+    <string name="setup_lock_settings_picker_message" product="tablet" msgid="8919671129189936210">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‏‎‏‏‏‏‎‎‏‎‎‏‎‎‎‎‏‎‎‏‏‎‏‎‎‎‏‎‎‎‏‏‎‎‎‎‏‎‏‎‏‏‎‎‎‏‏‎‏‏‎‎‎‏‎‏‎‎‏‎‎Prevent others from using this tablet without your permission by activating device protection features. Choose the screen lock you want to use.‎‏‎‎‏‎"</string>
+    <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 you want 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 you want 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>
+    <string name="unlock_set_unlock_launch_picker_title_profile" msgid="124176557311393483">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‎‎‏‏‏‎‏‏‏‎‎‏‎‎‏‎‏‎‎‏‏‏‏‎‏‎‏‏‏‏‎‎‎‎‏‏‏‏‏‏‏‎‎‏‏‏‏‏‏‏‏‎‏‏‎‎‏‎‏‏‎Work profile lock‎‏‎‎‏‎"</string>
+    <string name="unlock_set_unlock_launch_picker_change_title" msgid="5045866882028324941">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‎‏‏‎‎‎‎‎‎‏‏‎‏‎‎‎‎‏‎‏‎‎‏‏‎‎‎‏‏‏‏‎‏‏‏‏‎‎‏‏‎‏‎‎‏‏‎‎‏‎‎‎‎‏‎‎‏‏‎‏‎Change lock screen‎‏‎‎‏‎"</string>
+    <string name="unlock_set_unlock_launch_picker_change_summary" msgid="2790960639554590668">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‎‏‏‎‏‎‏‏‏‎‏‏‎‏‏‏‏‎‏‏‏‏‏‎‏‎‏‎‎‎‎‏‏‏‏‎‏‎‏‏‏‏‏‏‏‎‎‏‎‏‏‏‏‏‎‎‏‏‎‎‎Change or disable pattern, PIN, or password security‎‏‎‎‏‎"</string>
+    <string name="unlock_set_unlock_launch_picker_enable_summary" msgid="4791110798817242301">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‎‎‏‎‎‏‏‏‏‏‎‏‎‏‏‏‎‎‎‏‏‏‏‎‎‎‏‏‎‎‎‏‏‎‏‏‎‎‎‎‏‎‏‎‎‎‏‎‏‏‎‎‏‎‏‏‏‏‎‏‎Choose a method to lock the screen‎‏‎‎‏‎"</string>
+    <string name="unlock_set_unlock_off_title" msgid="7117155352183088342">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‎‎‏‎‏‏‎‎‎‏‎‏‎‎‏‏‎‏‏‏‎‎‎‏‎‏‎‏‏‎‏‎‎‎‏‎‎‎‏‎‎‏‎‎‏‎‏‎‎‏‎‎‏‏‎‏‎‏‏‎‎None‎‏‎‎‏‎"</string>
+    <string name="unlock_set_unlock_off_summary" msgid="94361581669110415"></string>
+    <string name="unlock_set_unlock_none_title" msgid="5679243878975864640">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‏‏‏‎‏‏‎‏‎‎‎‎‏‎‏‏‏‎‏‎‎‎‏‏‎‏‏‏‏‏‎‎‏‏‏‏‎‎‏‎‏‎‏‎‏‏‏‏‏‏‏‏‎‏‎‎‎‎‎‎‎Swipe‎‏‎‎‏‎"</string>
+    <string name="unlock_set_unlock_none_summary" msgid="8914673583104628191">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‏‎‏‏‏‎‏‏‎‏‏‏‎‏‎‎‏‎‎‎‎‏‏‎‎‏‎‎‎‏‎‏‎‎‎‏‏‎‎‎‎‎‏‎‏‎‎‏‎‏‎‏‏‏‎‏‏‏‏‏‎No security‎‏‎‎‏‎"</string>
+    <string name="unlock_set_unlock_pattern_title" msgid="2912067603917311700">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‏‎‎‎‎‏‏‎‏‎‎‏‏‎‏‏‏‏‏‎‎‎‎‎‏‏‏‎‏‎‎‏‎‏‎‏‎‏‏‎‏‎‏‎‎‎‎‎‏‏‏‎‏‏‎‏‎‏‎‎‎Pattern‎‏‎‎‏‎"</string>
+    <string name="unlock_set_unlock_pattern_summary" msgid="7062696666227725593">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‎‎‏‎‎‎‎‎‎‎‏‏‏‎‏‏‏‏‎‏‎‎‏‏‎‎‏‎‏‎‏‏‏‎‏‎‏‏‎‏‎‏‏‎‏‏‎‏‎‏‎‏‎‎‎‏‏‎‎‏‎Medium security‎‏‎‎‏‎"</string>
+    <string name="unlock_set_unlock_pin_title" msgid="5846029709462329515">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‎‎‎‏‎‎‏‎‎‎‎‏‎‏‎‎‎‏‎‏‎‎‎‎‏‏‎‎‎‎‎‏‎‎‏‎‏‏‏‎‎‎‎‏‏‏‎‏‏‎‎‎‏‎‏‎‏‎‏‏‎PIN‎‏‎‎‏‎"</string>
+    <string name="unlock_set_unlock_pin_summary" msgid="907878650556383388">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‎‏‏‎‎‏‎‎‏‏‎‎‏‎‏‏‎‏‏‏‎‏‏‎‏‎‎‏‎‏‎‎‏‎‎‎‏‏‎‎‏‎‎‏‏‎‎‎‎‎‎‎‎‏‎‎‏‏‏‎‎‎Medium to high security‎‏‎‎‏‎"</string>
+    <string name="unlock_set_unlock_password_title" msgid="8775603825675090937">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‏‎‎‏‏‏‎‎‏‎‎‏‎‎‏‏‎‏‎‏‎‎‏‎‏‏‏‏‎‎‏‎‏‏‏‎‏‏‏‎‏‏‎‎‎‎‏‏‏‎‏‏‏‏‏‏‏‎‎‏‎Password‎‏‎‎‏‎"</string>
+    <string name="unlock_set_unlock_password_summary" msgid="8856220848940929546">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‏‎‏‎‏‏‏‎‎‏‏‏‏‎‎‏‏‏‎‏‏‏‏‏‎‎‎‎‏‎‎‏‏‎‎‏‏‎‎‎‏‎‎‎‎‏‎‏‎‎‏‎‎‎‎‎‏‎‏‎‎High security‎‏‎‎‏‎"</string>
+    <string name="unlock_set_do_later_title" msgid="4894767558414979243">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‎‎‏‏‏‏‏‎‏‏‎‏‏‎‏‏‎‏‎‏‎‎‏‎‏‎‎‏‎‎‏‎‏‎‎‏‎‏‏‎‏‏‏‎‎‏‎‏‎‎‎‎‏‎‏‎‏‎‏‏‎Not now‎‏‎‎‏‎"</string>
+    <string name="current_screen_lock" msgid="4104091715420072219">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‏‎‎‎‏‏‏‏‎‏‎‎‏‎‏‎‏‎‎‏‏‎‏‎‏‎‏‏‏‎‏‏‎‏‏‏‎‎‏‏‏‏‎‎‏‎‏‎‏‎‎‏‎‎‎‏‏‎‏‏‎Current screen lock‎‏‎‎‏‎"</string>
+    <string name="fingerprint_unlock_set_unlock_pattern" msgid="4939057588092120368">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‎‏‎‎‏‎‎‎‏‎‏‏‎‎‎‎‏‏‏‎‏‎‏‏‎‏‎‏‎‏‎‎‎‏‏‏‎‏‏‎‏‏‎‏‏‎‏‎‏‏‎‏‎‎‏‏‎‎‎‎‎Fingerprint + Pattern‎‏‎‎‏‎"</string>
+    <string name="fingerprint_unlock_set_unlock_pin" msgid="8010746824051056986">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‏‏‏‏‎‎‏‎‏‎‏‏‏‏‏‎‎‎‏‏‏‏‎‎‏‎‏‏‎‎‏‏‎‎‎‏‎‎‏‎‎‏‏‎‏‏‏‎‎‎‎‏‎‏‎‏‏‎‏‎‎Fingerprint + PIN‎‏‎‎‏‎"</string>
+    <string name="fingerprint_unlock_set_unlock_password" msgid="7351131075806338634">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‎‏‏‎‎‎‎‎‎‏‎‎‎‏‏‏‎‏‏‎‏‏‎‎‎‎‏‏‏‏‏‏‎‏‏‎‏‏‎‎‎‏‎‏‏‎‎‏‏‏‏‎‎‏‎‎‏‎‏‎‎Fingerprint + Password‎‏‎‎‏‎"</string>
+    <string name="fingerprint_unlock_skip_fingerprint" msgid="1441077909803666681">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‎‎‏‏‏‏‏‏‏‏‏‏‏‎‏‏‏‏‎‎‏‎‏‏‏‎‎‏‎‏‎‎‏‎‏‏‏‎‎‎‎‎‏‎‏‎‎‎‏‏‎‎‏‏‏‏‏‎‎‏‎Continue without fingerprint‎‏‎‎‏‎"</string>
+    <string name="fingerprint_unlock_title" msgid="2826226740306003991">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‎‏‏‏‎‎‏‏‏‎‎‎‏‏‎‎‎‏‏‎‎‎‏‏‏‏‏‏‎‎‎‎‏‏‏‎‏‎‏‎‎‏‏‎‎‏‎‎‏‎‎‎‎‎‎‏‎‏‏‏‎You can unlock your phone using your fingerprint. For security, this option requires a backup screen lock.‎‏‎‎‏‎"</string>
+    <string name="unlock_set_unlock_disabled_summary" msgid="2051593894736282302">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‏‏‎‎‎‏‏‏‏‎‎‎‏‎‏‏‏‎‎‏‏‏‎‎‎‏‏‏‎‎‎‎‎‏‏‏‎‎‎‏‏‏‎‏‏‏‎‎‎‎‏‎‏‎‏‏‏‏‏‎‎Disabled by admin, encryption policy, or credential storage‎‏‎‎‏‎"</string>
+    <string name="unlock_set_unlock_mode_off" msgid="5881952274566013651">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‎‎‎‏‏‎‏‎‎‎‎‎‏‏‏‎‎‏‎‎‎‏‏‎‏‏‏‎‎‎‎‎‎‏‏‏‎‏‎‎‏‏‏‎‏‏‏‎‎‎‏‎‏‏‎‏‎‎‏‏‎None‎‏‎‎‏‎"</string>
+    <string name="unlock_set_unlock_mode_none" msgid="8467360084676871617">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‎‏‎‏‏‎‎‎‎‎‏‎‎‎‎‏‏‎‏‏‎‎‏‎‎‎‏‎‏‎‎‏‎‎‎‎‎‏‏‏‏‏‎‎‏‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎Swipe‎‏‎‎‏‎"</string>
+    <string name="unlock_set_unlock_mode_pattern" msgid="7837270780919299289">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‏‏‎‎‏‏‎‎‎‎‏‏‏‎‎‏‎‏‎‎‎‏‎‎‎‎‎‎‎‏‏‎‏‎‎‏‎‎‏‏‏‏‏‎‎‎‏‏‏‏‎‎‏‏‎‏‏‎‎‏‎Pattern‎‏‎‎‏‎"</string>
+    <string name="unlock_set_unlock_mode_pin" msgid="3541326261341386690">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‎‎‎‏‎‎‏‎‎‏‎‏‎‏‎‏‎‎‎‏‎‏‏‏‏‎‎‎‏‏‎‏‎‎‎‏‎‎‎‎‎‎‏‏‏‏‏‏‎‏‏‏‏‏‎‎‎‎‏‎‎PIN‎‏‎‎‏‎"</string>
+    <string name="unlock_set_unlock_mode_password" msgid="1203938057264146610">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‎‎‎‎‏‎‏‏‎‏‎‏‎‎‏‏‏‏‏‏‎‏‎‎‏‎‎‎‏‏‎‎‏‎‏‎‏‏‎‎‏‏‎‏‏‎‏‎‏‎‎‎‏‎‏‏‎‎‏‎‎Password‎‏‎‎‏‎"</string>
+    <string name="unlock_setup_wizard_fingerprint_details" msgid="7893457665921363009">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‏‏‎‏‏‎‎‎‏‎‏‏‎‎‏‏‎‎‎‏‏‏‏‎‏‏‎‏‎‎‎‎‎‎‏‎‏‏‎‏‎‎‏‏‏‎‏‎‏‏‎‎‎‏‎‎‎‎‎‏‎Once you’ve set up a screen lock, you can also set up your fingerprint in Settings &gt; Security.‎‏‎‎‏‎"</string>
+    <string name="unlock_disable_lock_title" msgid="1427036227416979120">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‎‎‏‏‏‏‎‎‏‏‎‏‏‏‎‏‏‎‎‏‏‏‏‎‎‎‏‏‎‏‎‏‏‎‎‎‏‏‎‎‏‏‎‏‎‏‏‏‎‏‏‎‏‎‏‏‎‎‎‎‎Turn off screen lock‎‏‎‎‏‎"</string>
+    <string name="unlock_disable_frp_warning_title" msgid="264008934468492550">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‎‏‎‏‏‏‎‏‎‏‎‎‏‏‏‏‏‎‎‏‎‏‎‏‏‏‎‏‎‎‎‏‎‎‏‎‎‏‎‎‎‎‏‏‎‎‎‎‏‏‏‎‏‎‎‎‎‎‏‏‎‎Remove device protection?‎‏‎‎‏‎"</string>
+    <string name="unlock_disable_frp_warning_title_profile" msgid="5507136301904313583">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‏‏‎‎‎‏‏‎‏‏‎‏‎‏‎‎‎‏‏‏‎‏‎‎‏‎‎‏‏‏‎‏‏‏‎‎‏‎‏‎‏‎‏‎‎‎‏‏‏‏‎‎‏‏‏‎‏‏‏‏‎Remove profile protection?‎‏‎‎‏‎"</string>
+    <string name="unlock_disable_frp_warning_content_pattern" msgid="8869767290771023461">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‏‎‏‏‎‎‎‏‎‏‏‏‏‎‏‏‏‏‏‎‎‏‎‏‏‎‏‏‎‏‎‏‏‏‏‎‏‏‎‎‏‎‎‏‎‎‏‎‎‏‏‎‎‏‏‎‎‏‎‏‎Device protection features will not work without your pattern.‎‏‎‎‏‎"</string>
+    <string name="unlock_disable_frp_warning_content_pattern_fingerprint" msgid="2986105377420905314">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‏‎‎‏‎‏‏‏‎‎‎‎‏‏‎‎‎‏‏‏‎‎‎‎‎‏‎‏‎‎‎‎‏‎‏‏‎‎‎‎‏‏‏‎‏‎‎‎‏‎‏‏‎‏‏‎‎‎‏‎‎Device protection features will not work without your pattern.‎‏‎‎‏‏‎<xliff:g id="EMPTY_LINE">
+
+</xliff:g>‎‏‎‎‏‏‏‎Your saved fingerprints will also be removed from this device and you won\'t be able to unlock your phone, authorize purchases, or sign in to apps with them.‎‏‎‎‏‎"</string>
+    <string name="unlock_disable_frp_warning_content_pin" msgid="586996206210265131">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‎‏‎‎‎‎‎‏‎‎‏‎‏‎‏‏‎‏‏‎‏‏‏‏‏‎‎‎‎‏‎‎‎‎‎‏‏‏‎‏‎‏‎‏‎‎‎‏‏‎‎‎‎‎‎‏‎‏‎‏‏‎Device protection features will not work without your PIN.‎‏‎‎‏‎"</string>
+    <string name="unlock_disable_frp_warning_content_pin_fingerprint" msgid="3370462835533123695">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‏‏‏‎‏‏‎‎‎‏‏‎‎‏‎‎‏‎‏‎‎‎‎‏‎‏‏‏‎‏‏‎‏‎‎‎‏‎‎‏‏‎‏‏‏‎‎‏‎‎‎‎‎‏‏‎‏‏‏‏‎Device protection features will not work without your PIN.‎‏‎‎‏‏‎<xliff:g id="EMPTY_LINE">
+
+</xliff:g>‎‏‎‎‏‏‏‎Your saved fingerprints will also be removed from this device and you won\'t be able to unlock your phone, authorize purchases, or sign in to apps with them.‎‏‎‎‏‎"</string>
+    <string name="unlock_disable_frp_warning_content_password" msgid="5420612686852555537">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‏‎‏‏‎‎‏‏‏‎‎‏‏‏‏‎‎‎‏‎‏‎‎‎‎‏‎‎‏‏‏‎‎‎‎‎‏‏‎‏‎‎‏‎‏‎‎‎‎‎‏‏‎‎‎‏‎‎‎‏‎Device protection features will not work without your password.‎‏‎‎‏‎"</string>
+    <string name="unlock_disable_frp_warning_content_password_fingerprint" msgid="3595476296430536798">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‎‎‎‏‏‏‏‎‎‏‎‏‏‎‏‏‎‎‏‎‏‎‏‎‎‏‎‎‎‏‎‏‎‏‏‏‎‎‎‏‎‏‎‎‎‏‎‎‏‎‎‎‎‏‎‏‏‏‏‎‎Device protection features will not work without your password.‎‏‎‎‏‏‎<xliff:g id="EMPTY_LINE">
+
+</xliff:g>‎‏‎‎‏‏‏‎Your saved fingerprints will also be removed from this device and you won\'t be able to unlock your phone, authorize purchases, or sign in to apps with them.‎‏‎‎‏‎"</string>
+    <string name="unlock_disable_frp_warning_content_unknown" msgid="1550718040483548220">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‎‏‎‏‏‎‎‎‎‏‎‏‎‏‎‎‎‎‎‏‏‏‎‏‎‏‏‏‎‏‏‏‏‏‎‏‏‏‎‎‏‏‏‏‏‏‎‎‏‏‎‎‎‎‏‏‏‏‎‎‎Device protection features will not work without your screen lock.‎‏‎‎‏‎"</string>
+    <string name="unlock_disable_frp_warning_content_unknown_fingerprint" msgid="3679351662094349506">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‎‎‏‏‎‎‎‎‏‏‏‏‏‎‏‎‏‏‏‎‏‏‎‏‎‏‏‏‏‎‏‏‎‏‏‎‏‏‏‎‎‎‎‎‎‏‏‏‎‏‎‎‏‏‎‎‎‎‏‎‎Device protection features will not work without your screen lock.‎‏‎‎‏‏‎<xliff:g id="EMPTY_LINE">
+
+</xliff:g>‎‏‎‎‏‏‏‎Your saved fingerprints will also be removed from this device and you won\'t be able to unlock your phone, authorize purchases, or sign in to apps with them.‎‏‎‎‏‎"</string>
+    <string name="unlock_disable_frp_warning_content_pattern_profile" msgid="8682200103576359918">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‏‎‎‎‎‏‏‏‏‏‎‏‎‏‎‏‏‏‏‎‏‏‏‏‏‏‏‎‎‏‏‏‎‎‏‎‏‎‎‎‎‏‏‏‎‏‎‏‎‎‏‏‏‏‏‎‏‏‏‎‎Profile protection features will not work without your pattern.‎‏‎‎‏‎"</string>
+    <string name="unlock_disable_frp_warning_content_pattern_fingerprint_profile" msgid="6718155854303231675">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‏‏‎‏‎‎‏‏‏‎‏‏‏‎‏‎‏‏‏‏‎‎‏‎‎‏‏‏‏‎‏‏‏‎‎‏‎‏‏‏‎‏‎‎‎‏‏‏‏‏‏‎‏‎‏‏‏‎‏‏‎Profile protection features will not work without your pattern.‎‏‎‎‏‏‎<xliff:g id="EMPTY_LINE">
+
+</xliff:g>‎‏‎‎‏‏‏‎Your saved fingerprints will also be removed from this profile and you won\'t be able to unlock your profile, authorize purchases, or sign in to apps with them.‎‏‎‎‏‎"</string>
+    <string name="unlock_disable_frp_warning_content_pin_profile" msgid="7790688070593867767">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‏‏‎‎‎‎‎‏‏‏‏‎‎‎‎‏‎‏‎‏‏‎‎‎‎‏‎‏‏‏‏‏‏‎‏‏‏‎‎‏‏‏‏‎‏‏‏‎‏‏‏‏‏‏‏‏‎‏‏‏‎Profile protection features will not work without your PIN.‎‏‎‎‏‎"</string>
+    <string name="unlock_disable_frp_warning_content_pin_fingerprint_profile" msgid="4209564603132870532">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‏‎‏‎‎‏‏‎‏‎‏‏‎‏‏‎‎‎‎‎‏‎‏‏‎‏‎‎‎‎‎‎‏‏‎‎‏‏‎‎‏‎‏‎‏‏‏‏‏‏‏‏‏‎‎‎‎‏‎‎‎Profile protection features will not work without your PIN.‎‏‎‎‏‏‎<xliff:g id="EMPTY_LINE">
+
+</xliff:g>‎‏‎‎‏‏‏‎Your saved fingerprints will also be removed from this profile and you won\'t be able to unlock your profile, authorize purchases, or sign in to apps with them.‎‏‎‎‏‎"</string>
+    <string name="unlock_disable_frp_warning_content_password_profile" msgid="7569285520567674461">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‏‎‎‏‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‎‏‎‎‏‏‏‏‎‎‎‎‎‎‏‏‏‏‎‎‎‏‏‎‏‎‎‏‏‎‎‏‎‏‏‏‎‏‎Profile protection features will not work without your password.‎‏‎‎‏‎"</string>
+    <string name="unlock_disable_frp_warning_content_password_fingerprint_profile" msgid="2994300676764706047">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‏‎‎‏‏‎‎‎‏‏‎‏‏‏‏‎‎‏‎‎‏‎‎‏‏‎‎‏‏‏‎‏‏‏‎‏‎‏‎‎‎‏‎‏‏‎‏‎‎‏‎‎‏‏‏‏‏‏‏‏‎Profile protection features will not work without your password.‎‏‎‎‏‏‎<xliff:g id="EMPTY_LINE">
+
+</xliff:g>‎‏‎‎‏‏‏‎Your saved fingerprints will also be removed from this profile and you won\'t be able to unlock your profile, authorize purchases, or sign in to apps with them.‎‏‎‎‏‎"</string>
+    <string name="unlock_disable_frp_warning_content_unknown_profile" msgid="6984215718701688202">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‎‎‎‎‏‏‏‎‏‏‎‎‏‏‏‎‏‎‏‏‎‎‏‏‎‎‎‏‎‎‏‏‎‎‏‏‏‏‏‎‏‎‎‏‏‏‏‎‎‏‎‏‏‎‎‎‏‎‏‎‎Profile protection features will not work without your screen lock.‎‏‎‎‏‎"</string>
+    <string name="unlock_disable_frp_warning_content_unknown_fingerprint_profile" msgid="4994062501123299418">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‎‏‎‏‎‏‎‎‏‏‏‎‎‏‏‏‏‎‎‏‎‏‏‎‎‎‏‎‏‎‎‏‎‏‎‏‏‎‎‎‏‏‎‏‏‎‎‏‏‎‎‎‎‏‎‏‏‎‏‎‎Profile protection features will not work without your screen lock.‎‏‎‎‏‏‎<xliff:g id="EMPTY_LINE">
+
+</xliff:g>‎‏‎‎‏‏‏‎Your saved fingerprints will also be removed from this profile and you won\'t be able to unlock your profile, authorize purchases, or sign in to apps with them.‎‏‎‎‏‎"</string>
+    <string name="unlock_disable_frp_warning_ok" msgid="7075138677177748705">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‎‎‏‎‎‏‎‎‏‎‎‎‎‏‎‎‏‎‏‏‏‎‎‏‏‏‎‏‎‎‎‏‏‎‎‏‏‏‎‎‎‎‏‎Yes, remove‎‏‎‎‏‎"</string>
+    <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_failed_attempts_before_wipe" msgid="2219711062197089783">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‏‏‏‎‏‏‎‎‏‏‎‏‏‏‏‏‏‏‏‏‎‏‏‏‎‎‏‏‎‏‎‏‎‏‏‎‎‏‎‎‎‎‏‏‎‎‏‏‎‏‎‏‏‏‏‏‎‏‏‏‎Try again. Attempt ‎‏‎‎‏‏‎<xliff:g id="CURRENT_ATTEMPTS">%1$d</xliff:g>‎‏‎‎‏‏‏‎ of ‎‏‎‎‏‏‎<xliff:g id="TOTAL_ATTEMPTS">%2$d</xliff:g>‎‏‎‎‏‏‏‎.‎‏‎‎‏‎"</string>
+    <string name="lock_last_attempt_before_wipe_warning_title" msgid="4277765862798876826">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‏‎‏‏‎‏‎‏‏‏‎‏‏‎‏‎‏‏‎‏‎‏‏‎‎‎‏‏‎‎‏‏‏‏‎‎‎‏‏‎‏‎‏‏‎‏‏‎‎‎‎‎‏‎‎‏‏‎‏‎‎Your data will be deleted‎‏‎‎‏‎"</string>
+    <string name="lock_last_pattern_attempt_before_wipe_device" msgid="1688030823464420974">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‎‏‏‏‎‏‏‎‏‏‎‏‎‎‎‏‎‏‏‏‎‎‎‏‎‏‏‏‎‎‏‎‎‎‏‎‏‎‎‎‎‎‎‏‏‏‎‎‎‏‏‎‎‏‏‎‏‏‏‎‎If you enter an incorrect pattern on the next attempt, this device\'s data will be deleted‎‏‎‎‏‎"</string>
+    <string name="lock_last_pin_attempt_before_wipe_device" msgid="5350785938296254352">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‏‎‏‎‎‏‎‎‎‎‎‏‏‏‎‎‏‏‏‏‎‏‏‏‎‏‏‎‎‎‎‏‎‎‎‏‎‏‎‎‏‏‎‏‏‎‏‎‏‏‏‏‏‎‎‏‎‎‎‎‎If you enter an incorrect PIN on the next attempt, this device\'s data will be deleted‎‏‎‎‏‎"</string>
+    <string name="lock_last_password_attempt_before_wipe_device" msgid="6208035114731421034">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‎‏‏‎‎‎‏‎‎‏‏‏‎‏‎‏‏‏‏‏‎‎‎‎‏‎‏‏‏‎‎‏‎‏‏‎‏‎‏‏‎‏‏‏‏‎‏‏‏‏‎‏‎‏‏‎‏‎‏‎‎If you enter an incorrect password on the next attempt, this device\'s data will be deleted‎‏‎‎‏‎"</string>
+    <string name="lock_last_pattern_attempt_before_wipe_user" msgid="7851504071368235547">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‏‏‎‎‏‏‏‏‎‏‏‎‎‎‏‎‎‏‎‏‎‏‎‏‏‎‏‎‏‎‎‏‎‏‏‎‎‏‏‎‏‏‏‏‏‏‎‏‏‎‏‎‎‎‎‏‏‎‏‏‎If you enter an incorrect pattern on the next attempt, this user will be deleted‎‏‎‎‏‎"</string>
+    <string name="lock_last_pin_attempt_before_wipe_user" msgid="4049024921333961715">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‏‎‎‎‎‎‏‏‎‎‎‏‎‎‎‎‎‏‏‎‏‎‏‏‎‏‏‎‏‎‎‏‏‎‏‎‏‏‎‏‎‎‎‎‏‎‎‏‎‎‏‏‏‏‏‏‎‎‏‏‎If you enter an incorrect PIN on the next attempt, this user will be deleted‎‏‎‎‏‎"</string>
+    <string name="lock_last_password_attempt_before_wipe_user" msgid="4660886542496781672">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‎‎‎‎‏‎‏‎‏‏‏‎‏‏‎‎‏‎‏‏‏‎‎‏‏‏‎‏‏‎‏‎‏‏‏‏‏‏‏‎‏‎‏‏‎‏‎‏‎‏‎‏‎‏‏‎‏‎‎‎‎If you enter an incorrect password on the next attempt, this user will be deleted‎‏‎‎‏‎"</string>
+    <string name="lock_last_pattern_attempt_before_wipe_profile" msgid="2437716252059050291">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‎‎‎‏‏‏‎‏‎‏‎‎‏‎‎‎‎‎‏‎‎‎‎‎‎‏‎‎‎‎‎‎‎‎‏‏‎‎‏‎‏‏‎‏‎‎‏‎‎‎‎‏‎‎‏‏‎‎‏‏‎If you enter an incorrect pattern on the next attempt, your work profile and its data will be deleted‎‏‎‎‏‎"</string>
+    <string name="lock_last_pin_attempt_before_wipe_profile" msgid="5799931839127476913">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‎‎‎‎‎‏‏‏‏‏‎‏‎‏‏‏‏‏‏‏‎‏‎‎‎‏‏‏‎‏‎‎‎‎‎‎‏‎‏‎‏‎‏‏‏‏‎‏‏‎‏‎‏‎‏‏‎‎‎‏‎If you enter an incorrect PIN on the next attempt, your work profile and its data will be deleted‎‏‎‎‏‎"</string>
+    <string name="lock_last_password_attempt_before_wipe_profile" msgid="6786586046975042158">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‏‏‏‎‎‎‏‎‏‏‏‎‏‏‎‎‏‏‎‎‎‎‎‎‏‏‎‏‏‎‎‎‎‏‏‏‏‎‎‏‎‎‎‏‏‏‏‎‎‎‏‎‎‏‏‎‏‏‏‎‎If you enter an incorrect password on the next attempt, your work profile and its data will be deleted‎‏‎‎‏‎"</string>
+    <string name="lock_failed_attempts_now_wiping_device" msgid="5047439819181833824">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‎‏‏‎‎‎‎‎‏‏‎‎‎‎‎‏‏‎‏‏‏‏‎‎‎‏‎‏‏‏‏‎‎‏‏‏‎‏‏‏‏‏‏‎‏‎‏‏‏‏‏‎‎‏‏‎‎‎‎‎‎Too many incorrect attempts. This device\'s data will be deleted.‎‏‎‎‏‎"</string>
+    <string name="lock_failed_attempts_now_wiping_user" msgid="6188180643494518001">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‎‏‎‏‏‏‏‎‎‎‎‎‏‏‎‏‎‏‎‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‎‏‏‏‎‎‎‎‎‏‎‏‏‏‎‎‏‏‏‏‎‎‎‏‎Too many incorrect attempts. This user will be deleted.‎‏‎‎‏‎"</string>
+    <string name="lock_failed_attempts_now_wiping_profile" msgid="1745475043685915442">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‏‎‎‎‎‎‏‏‏‎‎‏‎‎‏‎‏‏‎‎‎‏‎‎‏‏‎‏‏‏‏‎‎‏‏‏‎‎‏‏‎‏‎‏‎‏‎‏‏‎‏‏‎‎‏‏‎‎‏‎‎Too many incorrect attempts. This work profile and its data will be deleted.‎‏‎‎‏‎"</string>
+    <string name="lock_failed_attempts_now_wiping_dialog_dismiss" msgid="8246716090548717312">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‎‎‏‎‎‏‏‏‎‎‏‎‎‎‏‏‏‎‎‎‏‎‎‏‎‏‏‏‎‏‏‎‎‏‎‎‏‎‏‎‎‏‏‏‏‎‎‎‎‏‏‏‎‎‎‎‎‎‎‎‎Dismiss‎‏‎‎‏‎"</string>
+    <string name="lockpassword_password_too_short" msgid="2726090378672764986">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‎‏‎‏‏‏‎‏‎‏‎‏‎‎‎‎‎‏‎‎‏‏‎‎‎‎‎‏‏‎‎‎‎‏‏‎‎‏‏‎‎‏‏‎‎‏‏‏‏‎‎‎‎‎‏‏‏‎‏‎‎Must be at least ‎‏‎‎‏‏‎<xliff:g id="COUNT">%d</xliff:g>‎‏‎‎‏‏‏‎ characters‎‏‎‎‏‎"</string>
+    <string name="lockpassword_pin_too_short" msgid="3638188874397727648">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‎‎‏‎‎‏‏‏‏‏‎‏‎‏‏‏‎‎‎‏‏‎‎‎‎‎‎‏‎‏‎‏‏‏‎‎‎‏‎‎‎‎‎‏‎‎‏‏‏‎‏‏‏‎‏‎‎‎‎‎‎PIN must be at least ‎‏‎‎‏‏‎<xliff:g id="COUNT">%d</xliff:g>‎‏‎‎‏‏‏‎ digits‎‏‎‎‏‎"</string>
+    <string name="lockpassword_continue_label" msgid="4602203784934526940">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‏‏‏‏‏‏‎‏‏‏‏‎‎‏‎‎‏‏‏‏‏‏‏‏‎‏‎‏‎‏‏‏‏‎‎‎‏‏‏‏‏‎‏‏‎‎‎‎‏‏‏‏‏‏‎‏‏‏‎‎‎Continue‎‏‎‎‏‎"</string>
+    <string name="lockpassword_password_too_long" msgid="4591720174765403476">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‏‏‏‏‏‎‏‏‏‎‎‏‎‎‎‏‎‎‎‏‎‎‏‎‏‎‏‏‏‏‎‎‎‏‎‎‏‏‏‎‎‎‏‎‏‏‏‎‏‏‎‏‎‏‎‏‎‏‎‎‎Must be fewer than ‎‏‎‎‏‏‎<xliff:g id="NUMBER">%d</xliff:g>‎‏‎‎‏‏‏‎ characters‎‏‎‎‏‎"</string>
+    <string name="lockpassword_pin_too_long" msgid="2079396149560490458">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‏‏‎‎‏‏‎‏‏‎‏‏‎‏‏‏‏‏‏‏‏‏‎‎‎‏‏‏‏‏‏‎‏‎‎‏‏‏‎‏‏‏‏‎‎‎‏‏‏‎‎‏‏‏‎‏‏‎‏‎‎Must be fewer than ‎‏‎‎‏‏‎<xliff:g id="NUMBER">%d</xliff:g>‎‏‎‎‏‏‏‎ digits‎‏‎‎‏‎"</string>
+    <string name="lockpassword_pin_contains_non_digits" msgid="7284664023164191198">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‎‏‎‏‎‎‎‏‏‎‎‎‎‏‎‏‎‎‏‏‎‏‎‏‎‏‎‏‎‏‎‏‎‎‎‎‏‏‎‎‎‏‎‏‎‎‎‎‎‎‎‏‏‏‎‏‏‏‏‎‎Must contain only digits 0-9‎‏‎‎‏‎"</string>
+    <string name="lockpassword_pin_recently_used" msgid="1401569207976460727">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‎‎‏‏‎‏‏‏‎‎‏‏‎‏‎‏‏‏‏‏‏‏‎‎‎‏‎‎‏‏‎‏‎‎‎‏‏‎‎‏‎‎‎‎‎‎‎‎‎‎‎‏‏‎‏‏‎‏‏‏‎Device admin doesn\'t allow using a recent PIN‎‏‎‎‏‎"</string>
+    <string name="lockpassword_illegal_character" msgid="8049611046639943217">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‏‏‏‏‏‎‏‏‎‏‎‏‏‏‏‏‎‏‏‎‏‎‎‏‏‎‎‏‎‎‏‎‎‏‏‏‎‎‎‎‏‎‎‎‏‎‏‏‏‏‏‎‎‎‏‏‎‎‎‏‎This can\'t include an invalid character‎‏‎‎‏‎"</string>
+    <string name="lockpassword_password_requires_alpha" msgid="3036589522150097731">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‏‎‏‎‎‎‏‎‎‏‎‎‎‎‏‎‎‎‏‎‎‎‎‏‎‏‎‎‏‏‏‏‎‏‎‎‎‏‏‎‏‏‏‎‎‎‎‎‎‎‏‏‎‏‎‎‎‎‏‏‎Must contain at least one letter‎‏‎‎‏‎"</string>
+    <string name="lockpassword_password_requires_digit" msgid="5140062925787058765">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‎‏‏‏‎‏‎‏‎‏‎‏‎‎‏‎‏‎‏‏‏‏‏‏‏‏‏‏‎‏‏‎‏‏‏‎‏‎‏‏‎‎‎‏‎‏‎‏‎‎‏‎‎‏‎‎‏‏‎‏‎Must contain at least one digit‎‏‎‎‏‎"</string>
+    <string name="lockpassword_password_requires_symbol" msgid="5944350865681510893">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‎‎‏‎‎‏‏‏‏‏‏‎‏‎‎‏‎‎‏‏‏‎‎‏‏‏‏‎‎‎‏‎‏‎‎‏‎‎‏‏‏‎‏‏‎‏‏‏‎‎‎‏‏‏‏‎‏‏‎‏‎Must contain at least one symbol‎‏‎‎‏‎"</string>
+    <plurals name="lockpassword_password_requires_letters" formatted="false" msgid="9013132344745898400">
+      <item quantity="other">‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‏‏‎‏‎‎‎‏‎‏‎‏‎‎‎‏‎‏‎‎‎‎‎‏‏‏‎‏‎‎‏‎‏‎‏‎‎‎‏‎‏‎‎‏‏‎‏‏‎‎‎‏‏‎‏‎‎‎‎‎‎Must contain at least ‎‏‎‎‏‏‎<xliff:g id="COUNT">%d</xliff:g>‎‏‎‎‏‏‏‎ letters‎‏‎‎‏‎</item>
+      <item quantity="one">‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‏‏‎‏‎‎‎‏‎‏‎‏‎‎‎‏‎‏‎‎‎‎‎‏‏‏‎‏‎‎‏‎‏‎‏‎‎‎‏‎‏‎‎‏‏‎‏‏‎‎‎‏‏‎‏‎‎‎‎‎‎Must contain at least 1 letter‎‏‎‎‏‎</item>
+    </plurals>
+    <plurals name="lockpassword_password_requires_lowercase" formatted="false" msgid="2626327674921055486">
+      <item quantity="other">‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‎‏‎‎‎‏‏‏‎‎‏‎‏‎‎‏‎‏‏‏‎‎‎‏‏‎‏‎‏‏‏‏‏‏‏‏‎‏‏‏‎‎‏‎‎‏‏‏‎‏‎‎‏‏‏‏‏‏‏‎‎Must contain at least ‎‏‎‎‏‏‎<xliff:g id="COUNT">%d</xliff:g>‎‏‎‎‏‏‏‎ lowercase letters‎‏‎‎‏‎</item>
+      <item quantity="one">‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‎‏‎‎‎‏‏‏‎‎‏‎‏‎‎‏‎‏‏‏‎‎‎‏‏‎‏‎‏‏‏‏‏‏‏‏‎‏‏‏‎‎‏‎‎‏‏‏‎‏‎‎‏‏‏‏‏‏‏‎‎Must contain at least 1 lowercase letter‎‏‎‎‏‎</item>
+    </plurals>
+    <plurals name="lockpassword_password_requires_uppercase" formatted="false" msgid="7860796359913920356">
+      <item quantity="other">‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‏‏‎‏‎‎‎‏‎‏‏‏‎‎‏‎‏‎‎‎‏‎‏‎‎‏‎‎‎‎‎‏‏‏‎‎‎‏‎‏‏‎‏‎‎‏‎‏‎‏‏‏‎‏‏‎‎‏‎‎‎Must contain at least ‎‏‎‎‏‏‎<xliff:g id="COUNT">%d</xliff:g>‎‏‎‎‏‏‏‎ uppercase letters‎‏‎‎‏‎</item>
+      <item quantity="one">‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‏‏‎‏‎‎‎‏‎‏‏‏‎‎‏‎‏‎‎‎‏‎‏‎‎‏‎‎‎‎‎‏‏‏‎‎‎‏‎‏‏‎‏‎‎‏‎‏‎‏‏‏‎‏‏‎‎‏‎‎‎Must contain at least 1 uppercase letter‎‏‎‎‏‎</item>
+    </plurals>
+    <plurals name="lockpassword_password_requires_numeric" formatted="false" msgid="1967587658356336828">
+      <item quantity="other">‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‏‎‏‏‎‏‎‎‏‏‏‎‎‏‎‎‎‏‏‎‏‎‎‎‏‏‎‎‏‏‏‏‎‎‎‎‏‏‎‎‎‏‎‏‏‎‏‎‏‎‎‎‏‎‏‏‏‏‎‎‎Must contain at least ‎‏‎‎‏‏‎<xliff:g id="COUNT">%d</xliff:g>‎‏‎‎‏‏‏‎ numerical digits‎‏‎‎‏‎</item>
+      <item quantity="one">‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‏‎‏‏‎‏‎‎‏‏‏‎‎‏‎‎‎‏‏‎‏‎‎‎‏‏‎‎‏‏‏‏‎‎‎‎‏‏‎‎‎‏‎‏‏‎‏‎‏‎‎‎‏‎‏‏‏‏‎‎‎Must contain at least 1 numerical digit‎‏‎‎‏‎</item>
+    </plurals>
+    <plurals name="lockpassword_password_requires_symbols" formatted="false" msgid="6751305770863640574">
+      <item quantity="other">‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‏‏‎‏‏‎‏‏‎‎‎‏‎‏‏‏‎‏‎‎‏‏‎‏‎‏‎‎‎‎‏‎‎‎‏‎‎‏‎‏‏‏‏‏‎‎‏‏‏‏‏‏‏‏‏‏‏‏‏‎‎Must contain at least ‎‏‎‎‏‏‎<xliff:g id="COUNT">%d</xliff:g>‎‏‎‎‏‏‏‎ special symbols‎‏‎‎‏‎</item>
+      <item quantity="one">‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‏‏‎‏‏‎‏‏‎‎‎‏‎‏‏‏‎‏‎‎‏‏‎‏‎‏‎‎‎‎‏‎‎‎‏‎‎‏‎‏‏‏‏‏‎‎‏‏‏‏‏‏‏‏‏‏‏‏‏‎‎Must contain at least 1 special symbol‎‏‎‎‏‎</item>
+    </plurals>
+    <plurals name="lockpassword_password_requires_nonletter" formatted="false" msgid="4440596998172043055">
+      <item quantity="other">‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‏‏‎‏‏‎‏‎‎‎‎‎‎‎‏‎‏‎‏‏‎‏‏‏‎‎‎‏‎‏‎‎‏‎‏‎‏‎‏‏‎‏‎‏‏‏‏‎‎‏‏‏‎‎‏‎‏‏‏‏‎Must contain at least ‎‏‎‎‏‏‎<xliff:g id="COUNT">%d</xliff:g>‎‏‎‎‏‏‏‎ non-letter characters‎‏‎‎‏‎</item>
+      <item quantity="one">‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‏‏‎‏‏‎‏‎‎‎‎‎‎‎‏‎‏‎‏‏‎‏‏‏‎‎‎‏‎‏‎‎‏‎‏‎‏‎‏‏‎‏‎‏‏‏‏‎‎‏‏‏‎‎‏‎‏‏‏‏‎Must contain at least 1 non-letter character‎‏‎‎‏‎</item>
+    </plurals>
+    <string name="lockpassword_password_recently_used" msgid="942665351220525547">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‎‏‏‎‏‎‎‎‏‎‏‎‏‎‎‎‎‎‏‎‏‎‎‏‎‎‏‎‎‎‏‏‏‏‎‎‏‏‎‎‏‎‎‎‏‎‏‏‏‏‎‎‏‏‏‏‎‏‎‏‏‎Device admin doesn\'t allow using a recent password‎‏‎‎‏‎"</string>
+    <string name="lockpassword_pin_no_sequential_digits" msgid="680765285206990584">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‎‏‎‎‏‎‏‏‏‎‎‏‎‏‎‎‏‎‎‎‎‎‏‏‎‏‎‏‏‏‎‎‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‏‏‏‏‎‏‏‏‏‏‎‎‎‎Ascending, descending, or repeated sequence of digits isn\'t allowed‎‏‎‎‏‎"</string>
+    <string name="lockpassword_ok_label" msgid="313822574062553672">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‎‏‏‏‎‎‎‏‎‏‏‎‏‎‏‏‏‎‏‎‏‏‏‏‏‏‎‏‏‏‏‏‏‎‏‎‎‏‎‏‏‏‏‏‏‏‎‏‎‎‏‎‏‎‎‏‎‎‏‎‎‎‎OK‎‏‎‎‏‎"</string>
+    <string name="lockpassword_cancel_label" msgid="8818529276331121899">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‏‎‏‎‎‏‏‎‎‎‎‏‏‎‏‏‎‏‎‏‏‎‏‎‎‏‏‏‎‏‏‏‏‏‎‏‎‎‎‏‏‎‎‏‎‏‎‏‏‏‎‎‏‏‏‎‏‎‏‏‎Cancel‎‏‎‎‏‎"</string>
+    <string name="lockpassword_clear_label" msgid="5724429464960458155">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‏‏‏‏‎‏‏‏‎‎‎‏‎‏‎‎‎‎‏‎‎‏‎‎‎‏‎‎‏‏‏‎‎‎‎‎‏‎‏‏‏‏‏‏‎‏‎‏‏‏‎‏‏‎‏‎‏‎‏‏‎Clear‎‏‎‎‏‎"</string>
+    <string name="lockpattern_tutorial_cancel_label" msgid="6431583477570493261">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‏‎‎‏‎‏‎‎‎‎‎‏‏‎‎‏‎‎‏‏‎‎‎‏‏‎‎‎‏‏‎‎‏‎‏‏‏‏‎‏‏‏‎‎‎‏‎‏‏‎‏‏‎‏‎‎‏‏‎‏‎Cancel‎‏‎‎‏‎"</string>
+    <string name="lockpattern_tutorial_continue_label" msgid="3559793618653400434">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‎‎‎‏‎‏‏‎‎‏‏‎‏‏‏‎‏‏‎‏‎‏‏‎‏‏‏‏‏‎‎‎‎‎‎‏‏‎‎‎‏‎‎‏‏‏‎‎‏‏‎‏‎‏‏‏‎‎‏‎‎Next‎‏‎‎‏‎"</string>
+    <string name="lock_setup" msgid="3355847066343753943">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‏‏‏‎‏‎‎‏‎‎‏‎‎‏‎‏‏‏‎‏‎‎‏‎‎‎‎‎‎‏‏‏‎‏‎‏‏‏‏‏‎‏‎‎‏‏‎‎‏‎‎‎‏‏‎‏‎‏‏‏‎Setup is complete.‎‏‎‎‏‎"</string>
+    <string name="manage_device_admin" msgid="537804979483211453">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‎‏‏‏‏‏‎‏‏‏‎‏‏‎‏‎‏‎‏‎‏‎‏‏‎‎‎‏‏‏‏‎‎‎‏‎‎‎‏‎‎‎‏‎‎‎‎‏‏‏‎‏‏‎‏‎‏‏‏‏‎‏‎Device admin apps‎‏‎‎‏‎"</string>
+    <string name="number_of_device_admins_none" msgid="7185056721919496069">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‎‎‏‏‏‎‏‏‎‏‏‎‎‏‏‏‎‎‏‏‎‎‎‎‎‏‎‏‎‏‎‎‎‎‎‏‎‎‎‎‏‎‏‏‎‏‎‎‏‏‏‏‏‎‎‎‎‏‎‏‎No active apps‎‏‎‎‏‎"</string>
+    <plurals name="number_of_device_admins" formatted="false" msgid="3361891840111523393">
+      <item quantity="other">‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‏‏‏‎‏‎‏‎‎‏‏‏‏‏‎‏‎‏‏‎‏‏‎‏‎‎‎‏‎‎‎‎‎‏‏‏‎‎‏‎‎‎‎‏‏‎‏‏‎‏‏‎‎‏‎‎‎‎‎‏‎‎‏‎‎‏‏‎<xliff:g id="COUNT_1">%d</xliff:g>‎‏‎‎‏‏‏‎ active apps‎‏‎‎‏‎</item>
+      <item quantity="one">‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‏‏‏‎‏‎‏‎‎‏‏‏‏‏‎‏‎‏‏‎‏‏‎‏‎‎‎‏‎‎‎‎‎‏‏‏‎‎‏‎‎‎‎‏‏‎‏‏‎‏‏‎‎‏‎‎‎‎‎‏‎‎‏‎‎‏‏‎<xliff:g id="COUNT_0">%d</xliff:g>‎‏‎‎‏‏‏‎ active app‎‏‎‎‏‎</item>
+    </plurals>
+    <string name="manage_trust_agents" msgid="4629279457536987768">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‎‎‎‎‎‎‏‏‏‏‏‎‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‏‏‏‎‎‎‎‎‎‏‎‎‎‎‎‎‏‎‏‎‏‎‎‏‎‎‏‏‏‏‎‎‎‎Trust agents‎‏‎‎‏‎"</string>
+    <string name="disabled_because_no_backup_security" msgid="6877660253409580377">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‏‏‏‏‎‏‏‏‎‎‏‎‎‏‎‏‏‎‏‏‏‎‎‎‏‏‏‏‏‎‏‎‎‎‏‎‎‏‎‎‏‏‎‏‎‎‎‏‎‏‎‏‎‏‎‏‏‎‎‏‎To use, first set a screen lock‎‏‎‎‏‎"</string>
+    <string name="manage_trust_agents_summary" msgid="1475819820389620546">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‎‏‎‎‎‏‏‏‏‎‏‏‎‎‏‎‏‎‏‎‎‏‎‎‏‏‏‎‏‎‏‏‎‎‏‎‏‏‎‎‏‏‎‏‏‏‎‏‏‎‏‏‎‏‎‎‎‎‏‎‎None‎‏‎‎‏‎"</string>
+    <plurals name="manage_trust_agents_summary_on" formatted="false" msgid="3935182396726101824">
+      <item quantity="other">‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‎‏‏‎‏‎‎‏‏‏‎‎‏‎‎‏‎‎‏‏‏‎‎‎‏‎‏‎‎‏‎‏‎‎‏‏‎‎‏‏‏‎‏‎‏‏‎‎‎‏‏‏‎‏‎‎‎‎‎‎‎‎‏‎‎‏‏‎<xliff:g id="COUNT">%d</xliff:g>‎‏‎‎‏‏‏‎ active trust agents‎‏‎‎‏‎</item>
+      <item quantity="one">‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‎‏‏‎‏‎‎‏‏‏‎‎‏‎‎‏‎‎‏‏‏‎‎‎‏‎‏‎‎‏‎‏‎‎‏‏‎‎‏‏‏‎‏‎‏‏‎‎‎‏‏‏‎‏‎‎‎‎‎‎‎1 active trust agent‎‏‎‎‏‎</item>
+    </plurals>
+    <string name="bluetooth_quick_toggle_title" msgid="1037056952714061893">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‎‏‏‏‎‎‏‏‎‎‏‎‎‎‏‎‏‏‏‎‏‏‏‎‎‏‏‎‏‏‏‎‎‏‏‏‎‎‏‎‏‏‏‏‎‏‏‏‎‏‎‎‎‎‏‎‎‎‏‎‏‎Bluetooth‎‏‎‎‏‎"</string>
+    <string name="bluetooth_quick_toggle_summary" msgid="5293641680139873341">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‏‎‎‏‎‏‏‏‎‏‏‎‏‏‎‎‏‎‏‏‎‎‎‎‏‏‏‏‏‎‏‎‏‎‎‎‏‏‏‏‎‎‎‎‎‏‏‎‏‏‎‎‎‎‏‏‏‏‎‏‎Turn on 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">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‏‏‎‏‎‎‎‎‎‏‎‎‏‏‏‏‎‎‏‎‎‏‏‏‎‏‎‎‏‎‎‏‎‏‎‎‏‎‏‎‎‎‏‎‏‎‏‎‏‏‏‎‏‏‎‏‏‏‏‎‎Manage connections, set device name &amp; discoverability‎‏‎‎‏‎"</string>
+    <string name="bluetooth_pairing_request" msgid="2605098826364694673">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‎‏‎‎‎‎‏‎‎‏‏‏‎‎‏‎‏‎‏‏‏‎‎‏‎‏‎‎‏‎‎‎‎‏‏‎‎‏‎‎‎‎‎‏‎‎‏‏‎‎‎‎‏‎‎‏‎‎‎‏‎Pair with ‎‏‎‎‏‏‎<xliff:g id="DEVICE_NAME">%1$s</xliff:g>‎‏‎‎‏‏‏‎?‎‏‎‎‏‎"</string>
+    <string name="bluetooth_pairing_key_msg" msgid="418124944140102021">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‎‏‏‏‎‏‏‏‎‎‏‏‎‏‎‏‏‏‏‎‏‎‎‏‏‎‏‎‏‏‏‏‎‏‏‏‏‏‎‎‏‏‎‎‏‏‎‏‏‎‏‎‎‏‏‎‎‎‎‏‎‏‎Bluetooth pairing code‎‏‎‎‏‎"</string>
+    <string name="bluetooth_enter_passkey_msg" msgid="6813273136442138444">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‏‏‏‎‏‎‎‎‏‏‎‏‏‎‎‏‏‎‏‏‏‏‎‏‎‎‎‏‏‎‏‏‏‏‏‏‎‏‎‏‏‎‎‎‎‏‎‏‏‏‏‏‎‏‎‎‏‏‎‎‎Type the pairing code then press Return or Enter‎‏‎‎‏‎"</string>
+    <string name="bluetooth_enable_alphanumeric_pin" msgid="7222713483058171357">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‎‏‎‎‎‎‏‏‏‏‎‎‎‎‏‏‏‎‏‏‏‎‏‎‎‏‎‏‎‎‏‏‎‎‎‎‎‎‎‏‏‎‏‏‎‏‎‎‏‏‎‏‏‏‎‏‏‏‎‏‎PIN contains letters or symbols‎‏‎‎‏‎"</string>
+    <string name="bluetooth_pin_values_hint" msgid="3815897557875873646">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‎‏‎‎‏‏‏‏‎‏‎‎‏‏‎‎‏‎‏‎‏‎‎‏‏‏‎‎‏‎‎‎‎‏‎‎‎‏‏‏‏‎‎‎‏‏‎‏‎‏‏‏‎‏‏‎‏‏‏‎‎Usually 0000 or 1234‎‏‎‎‏‎"</string>
+    <string name="bluetooth_pin_values_hint_16_digits" msgid="7849359451584101077">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‏‏‎‎‏‏‏‎‏‏‏‎‏‎‎‎‎‏‏‎‏‏‎‏‎‏‎‏‎‏‏‎‎‎‏‎‎‎‎‎‎‏‏‎‎‏‏‏‏‎‏‎‏‏‎‏‎‏‎‏‎Must be 16 digits‎‏‎‎‏‎"</string>
+    <string name="bluetooth_enter_pin_other_device" msgid="4637977124526813470">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‎‎‎‎‎‏‎‏‏‏‎‏‎‏‏‎‎‏‏‏‏‎‎‏‏‏‏‏‎‎‏‎‎‏‏‏‏‏‎‎‏‏‏‎‏‏‏‏‎‎‎‏‎‎‎‏‏‏‏‎‎You may also need to type this PIN on the other device.‎‏‎‎‏‎"</string>
+    <string name="bluetooth_enter_passkey_other_device" msgid="2798719004030279602">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‎‏‏‎‏‏‎‏‎‏‏‏‎‎‎‎‏‏‎‎‎‎‎‏‏‎‏‏‎‎‎‏‏‏‎‏‎‏‎‏‏‏‎‎‎‎‎‏‏‏‏‏‏‎‏‏‎‎‏‎‎You may also need to type this passkey on the other device.‎‏‎‎‏‎"</string>
+    <string name="bluetooth_confirm_passkey_msg" msgid="3708312912841950052">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‎‎‏‏‎‏‏‏‎‏‏‎‏‎‎‏‎‎‏‎‏‏‏‏‎‎‏‎‎‏‎‏‏‏‎‏‏‏‏‏‎‎‎‎‎‏‎‎‎‎‏‏‎‏‏‎‎‏‎‎‎To pair with:&lt;br&gt;&lt;b&gt;‎‏‎‎‏‏‎<xliff:g id="DEVICE_NAME">%1$s</xliff:g>‎‏‎‎‏‏‏‎&lt;/b&gt;&lt;br&gt;&lt;br&gt;Make sure it is showing this passkey:&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">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‎‏‏‎‎‏‏‎‏‏‎‎‏‏‏‏‎‎‎‎‏‎‎‎‏‏‎‎‏‏‎‎‏‏‎‏‏‏‏‎‎‏‎‎‎‏‏‎‏‎‎‏‎‎‎‎‎‎‏‏‎From:&lt;br&gt;&lt;b&gt;‎‏‎‎‏‏‎<xliff:g id="DEVICE_NAME">%1$s</xliff:g>‎‏‎‎‏‏‏‎&lt;/b&gt;&lt;br&gt;&lt;br&gt;Pair with this device?‎‏‎‎‏‎"</string>
+    <string name="bluetooth_display_passkey_pin_msg" msgid="2796550001376088433">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‎‏‏‎‏‏‎‎‏‏‏‏‎‏‎‏‎‏‏‏‎‏‏‎‏‎‎‎‏‏‎‏‎‏‎‎‏‎‏‎‎‎‏‏‏‏‎‏‎‎‎‏‎‏‏‏‎‎‎‏‎To pair with:‎‏‎‎‏‏‎<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>‎‏‎‎‏‏‏‎Type on it:‎‏‎‎‏‏‎<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>‎‏‎‎‏‏‏‎, then press Return or Enter.‎‏‎‎‏‎"</string>
+    <string name="bluetooth_pairing_shares_phonebook" msgid="2277931851483023208">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‏‏‏‏‏‎‎‏‏‏‎‎‏‏‎‏‎‏‏‎‏‏‏‏‎‎‏‏‎‎‏‎‏‏‏‎‎‎‏‏‎‎‎‏‏‎‎‎‎‏‏‏‎‏‏‎‏‎‎‎‎Allow ‎‏‎‎‏‏‎<xliff:g id="DEVICE_NAME">%1$s</xliff:g>‎‏‎‎‏‏‏‎ to access your contacts and call history‎‏‎‎‏‎"</string>
+    <string name="bluetooth_error_title" msgid="6850384073923533096"></string>
+    <string name="bluetooth_connecting_error_message" msgid="1397388344342081090">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‎‎‏‏‎‏‏‎‎‏‎‎‏‎‎‎‎‏‎‏‎‏‎‎‏‎‏‏‏‎‏‎‎‏‎‏‏‏‎‎‎‏‏‏‏‏‏‎‏‏‏‎‎‏‎‎‎‎‏‎‎Couldn’t connect to ‎‏‎‎‏‏‎<xliff:g id="DEVICE_NAME">%1$s</xliff:g>‎‏‎‎‏‏‏‎.‎‏‎‎‏‎"</string>
+    <string name="bluetooth_preference_scan_title" msgid="2277464653118896016">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‏‏‏‏‏‎‎‏‏‎‏‏‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‎‏‏‎‏‎‏‎‎‎‏‏‏‏‎‏‏‏‏‎‎‏‎‎‎‎‎Scan for devices‎‏‎‎‏‎"</string>
+    <string name="bluetooth_search_for_devices" msgid="2754007356491461674">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‎‏‏‎‎‎‏‏‏‎‎‎‎‎‏‏‎‎‏‏‎‎‎‏‏‎‎‏‎‏‏‏‎‎‎‎‎‏‏‏‏‏‎‎‎‏‏‏‎‏‎‎‎‎‏‎‏‎‏‎‎Refresh‎‏‎‎‏‎"</string>
+    <string name="bluetooth_searching_for_devices" msgid="9203739709307871727">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‏‏‏‏‏‎‏‏‏‎‏‎‎‏‎‎‎‎‎‎‏‎‎‎‎‎‎‎‏‎‎‎‏‎‏‎‎‏‏‏‎‎‏‏‏‏‏‎‎‎‎‏‏‏‏‎‏‏‏‏‎Searching…‎‏‎‎‏‎"</string>
+    <string name="bluetooth_preference_device_settings" msgid="907776049862799122">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‎‏‏‎‎‏‎‎‏‏‎‎‏‎‎‎‏‎‎‎‏‏‎‎‎‎‎‎‏‏‏‏‏‏‎‏‏‏‎‏‎‏‏‎‏‏‏‏‎‏‏‏‏‎‎‎‏‎‎‏‎‎Device settings‎‏‎‎‏‎"</string>
+    <string name="bluetooth_preference_paired_dialog_title" msgid="8875124878198774180">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‏‎‏‏‎‎‏‎‏‎‏‎‏‏‎‎‎‏‏‏‎‎‎‎‏‏‎‏‏‏‏‎‎‏‏‎‎‏‎‎‎‏‎‏‎‎‎‏‏‎‎‏‏‎‏‎‎‏‎‎‎Paired device‎‏‎‎‏‎"</string>
+    <string name="bluetooth_preference_paired_dialog_name_label" msgid="8111146086595617285">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‎‎‎‎‏‎‎‏‎‎‎‎‏‎‎‏‎‏‎‎‎‏‏‎‎‏‎‎‎‎‎‏‏‏‎‎‏‏‎‏‎‏‎‎‏‏‏‎‎‎‏‎‎‎‎‎‎‏‎‏‎Name‎‏‎‎‏‎"</string>
+    <string name="bluetooth_preference_paired_dialog_internet_option" msgid="7112953286863428412">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‎‎‏‎‏‎‏‏‎‏‏‎‎‏‎‎‏‎‎‏‎‏‎‏‎‏‎‎‎‎‎‎‏‏‏‏‎‏‏‏‎‎‎‏‎‎‎‏‏‎‏‏‎‎‏‏‏‏‎‎‎Internet connection‎‏‎‎‏‎"</string>
+    <string name="bluetooth_preference_paired_dialog_keyboard_option" msgid="2271954176947879628">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‏‏‏‏‏‎‎‎‎‏‏‏‏‎‎‏‏‎‏‎‎‏‎‎‏‎‎‏‎‏‎‏‏‏‏‎‏‏‏‏‎‎‎‏‎‏‏‏‏‏‏‎‏‏‎‎‏‏‎‎‎Keyboard‎‏‎‎‏‎"</string>
+    <string name="bluetooth_preference_paired_dialog_contacts_option" msgid="7747163316331917594">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‏‎‏‏‏‎‎‎‎‎‏‏‎‏‏‏‎‎‏‏‏‏‏‏‏‏‎‏‎‏‏‎‏‏‏‎‏‏‏‎‎‏‏‎‏‎‏‏‎‎‎‏‎‎‎‏‏‎‏‎‎Contacts and call history‎‏‎‎‏‎"</string>
+    <string name="bluetooth_pairing_dialog_title" msgid="1417255032435317301">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‎‎‏‏‏‎‏‎‏‎‏‏‎‎‎‏‏‎‎‏‏‏‏‏‎‎‎‏‎‏‏‎‏‏‎‎‎‏‏‏‎‎‎‏‎‎‎‏‏‎‏‎‎‎‏‏‎‏‎‏‎Pair with this device?‎‏‎‎‏‎"</string>
+    <string name="bluetooth_pairing_dialog_sharing_phonebook_title" msgid="7664141669886358618">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‏‎‏‎‎‏‎‏‏‏‎‎‏‎‎‎‎‎‎‎‎‎‏‏‏‏‏‎‎‎‎‎‏‏‎‏‏‏‎‏‏‎‎‎‎‏‏‏‎‏‎‎‎‏‎‏‏‎‏‎‎Share phone book?‎‏‎‎‏‎"</string>
+    <string name="bluetooth_pairing_dialog_contants_request" msgid="5531109163573611348">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‏‏‎‎‏‏‎‎‎‎‏‎‎‏‏‏‎‎‏‎‎‏‏‏‏‎‏‎‏‎‏‎‏‏‎‎‏‎‏‏‎‏‏‎‏‎‎‎‏‎‏‏‎‏‎‏‎‏‎‎‎‎‏‎‎‏‏‎<xliff:g id="DEVICE_NAME">%1$s</xliff:g>‎‏‎‎‏‏‏‎ wants to access your contacts and call history.‎‏‎‎‏‎"</string>
+    <string name="bluetooth_pairing_dialog_paring_request" msgid="8451248193517851958">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‎‏‎‏‎‏‎‎‏‎‎‎‏‏‎‏‏‏‎‏‎‏‏‏‎‏‎‎‏‎‎‏‎‎‏‏‎‏‎‎‏‎‏‏‎‎‎‏‎‏‎‏‎‎‏‏‎‏‏‎‎‎‏‎‎‏‏‎<xliff:g id="DEVICE_NAME">%1$s</xliff:g>‎‏‎‎‏‏‏‎ wants to pair with Bluetooth. When connected, it will have access to your contacts and call history.‎‏‎‎‏‎"</string>
+    <string name="bluetooth_preference_paired_devices" msgid="1970524193086791964">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‏‎‏‏‎‏‎‏‏‎‎‎‏‎‏‏‎‏‎‏‎‏‎‏‎‎‎‎‎‎‏‏‎‏‏‎‎‏‎‎‎‎‎‎‎‏‏‎‎‎‎‏‎‎‎‏‏‏‎‎‎Paired devices‎‏‎‎‏‎"</string>
+    <string name="bluetooth_preference_found_devices" msgid="1647983835063249680">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‎‏‏‎‏‏‎‏‏‏‏‎‏‏‎‏‎‎‎‎‏‎‎‏‎‎‎‏‎‎‎‎‏‏‎‎‏‎‎‎‎‏‏‏‏‏‏‎‏‎‏‏‎‎‎‏‎‎‎‎‎Available devices‎‏‎‎‏‎"</string>
+    <string name="bluetooth_preference_no_found_devices" msgid="7594339669961811591">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‏‎‎‏‎‏‏‎‎‏‎‎‏‎‎‎‎‎‏‏‏‎‏‏‎‎‎‏‎‏‏‏‏‎‏‏‏‎‏‏‏‎‏‏‎‎‏‎‎‏‏‎‏‎‎‎‎‏‏‏‎No devices available‎‏‎‎‏‎"</string>
+    <string name="bluetooth_device_context_connect" msgid="3997659895003244941">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‎‏‏‏‎‏‏‏‏‎‏‎‏‎‎‎‏‎‏‎‎‏‏‏‏‏‏‎‎‏‏‏‎‏‏‎‎‏‏‏‏‏‏‎‎‏‏‎‏‎‎‏‏‎‎‎‏‏‎‏‎Connect‎‏‎‎‏‎"</string>
+    <string name="bluetooth_device_context_disconnect" msgid="8220072022970148683">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‎‎‏‎‎‎‎‏‎‎‏‏‏‎‎‎‏‏‏‏‏‏‏‏‎‎‏‏‏‏‏‏‏‏‎‏‎‏‎‎‎‎‏‏‎‎‏‎‎‏‏‏‎‏‎‎‏‎‏‏‎Disconnect‎‏‎‎‏‎"</string>
+    <string name="bluetooth_device_context_pair_connect" msgid="7611522504813927727">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‏‎‎‏‏‎‏‎‎‎‎‏‏‎‎‎‏‏‏‏‎‏‏‎‎‎‏‏‏‏‏‏‏‎‏‏‎‏‎‏‎‎‏‏‎‏‎‏‏‏‎‏‎‎‏‎‏‏‏‏‎Pair &amp; connect‎‏‎‎‏‎"</string>
+    <string name="bluetooth_device_context_unpair" msgid="662992425948536144">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‎‏‎‎‏‎‎‏‏‎‎‏‏‎‏‏‎‏‏‎‎‎‎‎‏‏‎‎‏‎‏‎‎‎‏‎‏‎‏‏‎‏‏‏‏‏‏‎‏‏‏‎‏‎‏‎‏‎‎‎‎‎Unpair‎‏‎‎‏‎"</string>
+    <string name="bluetooth_device_context_disconnect_unpair" msgid="7644014238070043798">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‏‎‏‎‎‎‎‏‎‏‎‎‏‏‏‏‏‏‏‎‎‏‏‏‎‎‏‏‎‎‏‎‎‏‏‎‎‎‏‏‎‎‎‏‎‏‏‏‎‏‎‎‏‎‎‏‎‏‏‎‎Disconnect &amp; unpair‎‏‎‎‏‎"</string>
+    <string name="bluetooth_device_context_connect_advanced" msgid="2643129703569788771">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‎‏‎‎‏‎‏‎‏‏‏‎‎‏‎‎‏‎‎‎‎‏‏‏‎‏‏‎‎‎‏‎‎‏‎‎‏‎‎‎‏‏‏‏‏‎‎‎‏‏‏‏‎‏‏‎‎‎‏‏‎Options…‎‏‎‎‏‎"</string>
+    <string name="bluetooth_menu_advanced" msgid="8572178316357220524">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‎‏‏‎‏‏‏‏‎‏‏‎‎‏‏‏‏‏‏‎‏‏‎‎‎‎‏‎‏‏‏‎‏‎‎‏‏‏‎‎‎‏‏‏‎‎‏‏‏‎‎‎‏‎‏‎‏‏‎‎‎Advanced‎‏‎‎‏‎"</string>
+    <string name="bluetooth_advanced_titlebar" msgid="2142159726881547669">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‏‏‎‏‏‎‏‏‏‎‏‎‎‏‏‏‏‎‏‎‏‏‏‎‏‏‎‎‎‎‎‎‎‏‎‎‏‏‏‎‏‏‎‎‎‎‏‎‎‏‎‏‏‎‎‏‎‏‎‏‎Advanced Bluetooth‎‏‎‎‏‎"</string>
+    <string name="bluetooth_empty_list_bluetooth_off" msgid="6351930724051893423">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‏‎‎‎‎‎‏‎‎‏‏‎‏‎‎‏‎‏‏‏‎‏‎‏‎‏‏‎‏‏‏‎‏‏‎‏‎‎‎‎‎‎‎‎‏‎‏‏‏‏‎‎‏‎‏‎‏‏‏‏‎When Bluetooth is turned on, your device can communicate with other nearby Bluetooth devices.‎‏‎‎‏‎"</string>
+    <string name="ble_scan_notify_text" msgid="1295915006005700650">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‎‎‎‏‏‏‏‏‏‏‎‎‎‎‎‎‎‎‏‏‏‏‎‏‎‏‎‎‏‏‏‏‏‎‎‎‎‎‎‏‎‎‎‏‎‏‏‎‏‎‎‎‎‎‏‎‏‎‏‎‎To improve location accuracy, system apps and services can still detect Bluetooth devices. You can change this in ‎‏‎‎‏‏‎<xliff:g id="LINK_BEGIN_0">LINK_BEGIN</xliff:g>‎‏‎‎‏‏‏‎scanning settings‎‏‎‎‏‏‎<xliff:g id="LINK_END_1">LINK_END</xliff:g>‎‏‎‎‏‏‏‎.‎‏‎‎‏‎"</string>
+    <string name="bluetooth_connect_failed" msgid="4500234659813241053">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‏‏‏‎‎‏‏‏‎‏‎‎‎‎‎‎‏‎‏‏‏‎‎‏‎‏‎‎‎‏‏‏‎‎‎‎‎‎‎‏‎‎‎‏‏‎‏‏‎‎‎‎‏‏‎‏‏‏‎‏‎Couldn\'t connect. Try again.‎‏‎‎‏‎"</string>
+    <string name="device_details_title" msgid="6576953269221085300">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‏‎‏‏‎‏‎‎‎‏‏‎‎‎‎‎‏‎‎‎‎‎‏‎‎‏‏‎‏‏‏‏‎‏‎‎‎‏‎‎‎‏‎‎‎‏‎‏‎‎‎‎‎‏‏‏‎‏‎‎‎Device details‎‏‎‎‏‎"</string>
+    <string name="bluetooth_device_mac_address" msgid="2513724313558236181">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‎‎‏‎‏‏‏‎‎‎‏‎‏‎‎‎‏‎‏‎‏‏‏‏‎‎‎‏‏‏‏‎‎‏‎‎‏‏‏‎‎‏‏‎‏‎‏‏‏‏‎‎‎‎‎‏‎‏‎‏‎Device\'s Bluetooth address: ‎‏‎‎‏‏‎<xliff:g id="ADDRESS">%1$s</xliff:g>‎‏‎‎‏‏‏‎‎‏‎‎‏‎"</string>
+    <string name="bluetooth_unpair_dialog_title" msgid="38467834196432400">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‎‎‎‏‎‎‎‏‎‎‎‏‎‏‎‏‎‏‎‎‏‎‎‏‎‏‎‏‎‎‏‏‎‎‎‏‎‎‎‏‏‏‎‏‎‎‏‎‏‏‎‎‎‎‏‎‎‎‎‎Forget device?‎‏‎‎‏‎"</string>
+    <string name="bluetooth_unpair_dialog_body" product="default" msgid="9087609557757135712">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‏‏‏‎‎‎‎‏‏‏‎‏‏‎‏‎‏‏‎‎‏‎‏‏‏‏‏‎‏‎‎‏‏‎‏‏‏‎‎‎‏‏‏‏‎‎‎‎‏‎‏‏‎‏‏‎‎‎‎‎‎Your phone will no longer be paired with ‎‏‎‎‏‏‎<xliff:g id="DEVICE_NAME">%1$s</xliff:g>‎‏‎‎‏‏‏‎‎‏‎‎‏‎"</string>
+    <string name="bluetooth_unpair_dialog_body" product="tablet" msgid="7785695793007576501">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‏‏‎‎‎‎‎‎‏‏‎‎‎‏‎‏‏‎‎‏‎‎‎‏‎‎‏‎‏‏‎‎‎‏‏‏‎‏‏‏‏‎‎‎‎‏‎‎‎‏‎‏‏‎‏‏‎‏‎‏‎Your tablet will no longer be paired with ‎‏‎‎‏‏‎<xliff:g id="DEVICE_NAME">%1$s</xliff:g>‎‏‎‎‏‏‏‎‎‏‎‎‏‎"</string>
+    <string name="bluetooth_unpair_dialog_body" product="device" msgid="251257782642157557">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‎‏‎‏‏‎‏‏‏‏‏‎‎‏‎‏‎‎‏‎‏‏‎‎‏‏‏‏‏‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‏‏‏‏‏‏‎‏‎‏‎Your device will no longer be paired with ‎‏‎‎‏‏‎<xliff:g id="DEVICE_NAME">%1$s</xliff:g>‎‏‎‎‏‏‏‎‎‏‎‎‏‎"</string>
+    <string name="bluetooth_unpair_dialog_forget_confirm_button" msgid="3829370108973879006">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‎‏‎‏‎‎‏‎‎‏‎‎‏‎‏‎‎‏‏‏‏‏‎‏‎‎‏‏‎‏‎‎‎‎‏‎‏‏‏‎‎‎‏‏‎‎‎‎‏‏‏‎‏‏‎‏‏‏‏‎‎Forget device‎‏‎‎‏‎"</string>
+    <string name="bluetooth_connect_specific_profiles_title" msgid="6952214406025825164">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‎‎‎‎‎‏‏‏‏‎‏‏‎‎‏‏‏‎‏‎‎‎‏‎‏‎‏‎‏‏‏‏‏‎‎‏‏‎‎‎‎‏‎‏‏‏‎‎‏‎‏‏‏‎‎‎‏‏‎‎‎Connect to…‎‏‎‎‏‎"</string>
+    <string name="bluetooth_disconnect_a2dp_profile" msgid="3524648279150937177">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‎‎‎‎‏‏‏‎‏‎‏‎‎‎‎‏‎‎‎‎‏‏‏‎‏‏‏‏‎‏‏‏‏‏‎‎‏‏‏‏‏‎‏‏‏‏‎‎‎‏‎‎‎‏‎‏‏‎‎‏‎‎‏‎‎‏‏‎<xliff:g id="DEVICE_NAME">%1$s</xliff:g>‎‏‎‎‏‏‏‎ will be disconnected from media audio.‎‏‎‎‏‎"</string>
+    <string name="bluetooth_disconnect_headset_profile" msgid="8635908811168780720">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‎‏‏‏‏‏‎‏‏‎‎‎‏‏‏‎‏‎‎‏‎‏‎‎‏‏‏‏‎‎‎‎‏‎‏‎‎‏‏‎‎‎‎‏‏‎‎‏‎‎‎‏‏‎‏‏‎‎‎‎‎‎‏‎‎‏‏‎<xliff:g id="DEVICE_NAME">%1$s</xliff:g>‎‏‎‎‏‏‏‎ will be disconnected from handsfree audio.‎‏‎‎‏‎"</string>
+    <string name="bluetooth_disconnect_hid_profile" msgid="3282295189719352075">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‏‏‎‏‏‎‎‎‏‏‎‏‎‎‎‎‏‏‏‎‎‎‎‏‎‏‎‏‏‎‏‎‏‏‏‏‎‎‏‏‎‎‏‎‎‎‎‎‎‎‏‏‎‎‎‎‏‎‏‏‎‎‏‎‎‏‏‎<xliff:g id="DEVICE_NAME">%1$s</xliff:g>‎‏‎‎‏‏‏‎ will be disconnected from input device.‎‏‎‎‏‎"</string>
+    <string name="bluetooth_disconnect_pan_user_profile" msgid="8037627994382458698">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‏‏‏‏‏‎‎‎‏‎‏‏‎‏‏‎‎‏‎‎‎‎‎‏‎‎‏‏‎‏‏‎‎‎‎‏‏‏‏‎‎‏‏‎‏‏‎‏‏‏‏‏‎‏‎‎‏‎‏‎‎Internet access via ‎‏‎‎‏‏‎<xliff:g id="DEVICE_NAME">%1$s</xliff:g>‎‏‎‎‏‏‏‎ will be disconnected.‎‏‎‎‏‎"</string>
+    <string name="bluetooth_disconnect_pan_nap_profile" product="tablet" msgid="1262792320446274407">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‎‎‎‏‏‎‎‎‎‏‏‎‎‏‎‏‎‏‏‎‏‏‏‎‏‏‎‎‏‏‎‎‎‏‎‏‎‏‎‎‏‎‏‎‏‎‎‏‏‎‏‏‎‏‏‎‎‏‏‏‎‎‏‎‎‏‏‎<xliff:g id="DEVICE_NAME">%1$s</xliff:g>‎‏‎‎‏‏‏‎ will be disconnected from sharing this tablet’s Internet connection.‎‏‎‎‏‎"</string>
+    <string name="bluetooth_disconnect_pan_nap_profile" product="default" msgid="5700332050175684571">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‏‏‏‏‎‎‎‏‏‎‏‏‏‎‏‎‎‏‎‏‏‏‎‎‏‏‎‎‎‏‎‎‏‎‎‎‎‏‏‏‏‏‏‎‏‏‏‎‏‏‏‏‏‏‎‏‏‎‏‏‎‎‏‎‎‏‏‎<xliff:g id="DEVICE_NAME">%1$s</xliff:g>‎‏‎‎‏‏‏‎ will be disconnected from sharing this phone’s Internet connection.‎‏‎‎‏‎"</string>
+    <string name="bluetooth_device_advanced_title" msgid="6066342531927499308">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‎‏‎‎‎‎‏‎‏‏‏‏‏‏‏‏‏‎‏‎‎‏‏‎‎‏‎‎‎‏‎‏‎‏‎‏‎‏‏‎‎‎‎‏‏‏‏‎‎‎‏‎‎‎‏‎‏‏‎‎‎Paired Bluetooth device‎‏‎‎‏‎"</string>
+    <string name="bluetooth_device_advanced_online_mode_title" msgid="3689050071425683114">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‎‎‏‏‎‎‏‏‎‎‏‎‎‎‏‎‎‎‏‏‎‏‏‏‏‏‏‎‏‎‎‏‏‎‎‏‏‏‏‏‎‏‎‏‎‎‎‎‏‏‏‎‏‎‏‎‏‎‏‎‎Connect‎‏‎‎‏‎"</string>
+    <string name="bluetooth_device_advanced_online_mode_summary" msgid="1204424107263248336">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‎‎‎‎‏‎‏‏‎‏‏‎‏‏‏‏‏‎‎‏‎‏‎‏‏‎‎‎‎‎‏‎‎‎‎‎‎‏‎‏‎‏‏‏‏‏‎‎‎‏‏‏‏‏‎‏‎‎‎‎‎Connect to Bluetooth device‎‏‎‎‏‎"</string>
+    <string name="bluetooth_device_advanced_profile_header_title" msgid="102745381968579605">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‎‎‏‏‎‏‏‎‏‏‎‏‎‎‎‎‎‏‏‎‎‏‏‎‎‎‎‏‎‏‏‎‏‎‏‎‏‎‎‎‏‏‎‎‏‎‎‎‏‏‎‎‎‎‎‏‎‏‎‏‎Use for‎‏‎‎‏‎"</string>
+    <string name="bluetooth_device_advanced_rename_device" msgid="5148578059584955791">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‎‏‏‏‎‏‏‏‎‎‏‏‎‏‏‎‏‏‎‎‎‏‏‏‎‏‏‏‏‎‎‎‎‎‏‏‏‏‏‎‏‏‏‎‎‏‏‎‎‏‎‏‏‎‎‎‏‏‏‏‎Rename‎‏‎‎‏‎"</string>
+    <string name="bluetooth_device_advanced_enable_opp_title" msgid="8222550640371627365">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‎‎‏‎‎‎‎‏‏‏‎‎‎‏‎‏‏‏‏‎‎‎‏‏‏‏‏‎‎‎‎‏‎‎‏‏‎‎‎‎‎‎‏‎‏‏‏‏‎‏‎‏‎‏‏‎‎‏‎‏‎Allow incoming file transfers‎‏‎‎‏‎"</string>
+    <string name="bluetooth_pan_user_profile_summary_connected" msgid="4602294638909590612">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‏‏‏‏‏‏‎‏‏‏‏‎‏‎‏‎‎‎‏‎‏‎‎‏‎‏‏‏‎‎‎‎‏‏‏‏‏‏‏‎‎‏‎‎‎‎‎‎‏‏‎‎‎‏‎‏‎‏‎‎‎Connected to device for Internet access‎‏‎‎‏‎"</string>
+    <string name="bluetooth_pan_nap_profile_summary_connected" msgid="1561383706411975199">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‎‏‎‏‏‎‏‎‏‎‏‏‎‎‏‎‎‏‏‎‎‎‏‏‎‏‎‏‎‏‎‏‏‎‏‎‏‏‎‎‎‏‎‎‏‏‎‎‎‎‏‎‎‎‎‏‏‏‏‏‎Sharing local Internet connection with device‎‏‎‎‏‎"</string>
+    <string name="bluetooth_dock_settings" msgid="3218335822716052885">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‏‏‎‎‏‎‏‎‏‎‎‏‏‏‎‏‎‎‏‏‎‏‏‎‎‎‎‏‎‎‎‏‏‎‎‎‏‏‏‎‎‏‏‏‏‎‏‎‎‏‎‏‏‎‎‏‎‏‎‏‎Dock Settings‎‏‎‎‏‎"</string>
+    <string name="bluetooth_dock_settings_title" msgid="5543069893044375188">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‏‏‎‎‏‏‏‎‏‏‎‎‏‏‏‏‎‎‎‎‏‎‏‏‎‎‏‏‎‎‎‎‎‏‎‎‎‎‎‏‎‎‏‎‏‎‎‎‏‏‏‎‏‎‎‏‎‏‎‎‎Use dock for audio‎‏‎‎‏‎"</string>
+    <string name="bluetooth_dock_settings_headset" msgid="1001821426078644650">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‎‏‏‎‏‏‏‏‎‎‏‏‏‎‎‏‎‏‏‏‏‎‏‎‎‎‏‏‏‎‏‏‏‎‏‎‏‏‏‎‎‏‎‏‎‏‏‏‏‏‎‎‏‏‎‏‎‏‎‏‎‎As speaker phone‎‏‎‎‏‎"</string>
+    <string name="bluetooth_dock_settings_a2dp" msgid="8791004998846630574">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‏‎‎‏‏‏‏‏‏‏‏‏‏‏‏‎‏‏‎‎‎‏‏‏‏‎‎‎‎‎‏‏‏‏‏‎‏‏‏‎‏‏‏‏‏‏‎‎‏‎‏‎‏‎‏‎‏‏‏‎‎For music and media‎‏‎‎‏‎"</string>
+    <string name="bluetooth_dock_settings_remember" msgid="5551459057010609115">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‏‏‎‏‎‎‎‎‏‎‏‎‏‎‏‏‏‏‏‎‏‎‎‏‏‎‎‏‎‏‏‏‎‏‏‎‎‎‏‏‏‏‏‎‎‎‎‎‏‎‏‏‏‏‎‏‏‎‏‏‎Remember settings‎‏‎‎‏‎"</string>
+    <string name="wifi_display_settings_title" msgid="8740852850033480136">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‏‎‎‏‎‏‎‎‏‏‎‏‏‎‏‏‏‏‏‏‎‏‎‏‏‎‏‏‎‎‏‎‏‎‎‎‎‎‏‏‎‏‎‎‏‏‎‏‎‎‎‏‏‏‎‎‏‎‎‎‎Cast‎‏‎‎‏‎"</string>
+    <string name="wifi_display_enable_menu_item" msgid="4883036464138167674">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‎‎‏‏‏‏‎‎‎‏‎‎‎‎‎‎‎‏‏‏‏‏‎‎‏‎‏‎‏‏‏‎‏‏‏‎‎‎‏‏‏‏‎‎‎‎‏‎‎‏‎‏‎‏‏‏‏‎‏‎‎Enable wireless display‎‏‎‎‏‎"</string>
+    <string name="wifi_display_no_devices_found" msgid="1382012407154143453">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‎‎‏‏‎‎‏‎‏‏‎‏‏‏‏‎‎‏‎‎‏‏‏‏‎‏‏‎‎‏‎‎‏‎‏‏‏‎‎‏‏‎‏‎‏‏‏‏‎‎‎‎‏‏‎‏‏‏‎‏‎No nearby devices were found.‎‏‎‎‏‎"</string>
+    <string name="wifi_display_status_connecting" msgid="5688608834000748607">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‏‏‏‎‏‏‏‏‎‎‎‏‏‏‏‏‏‏‏‏‏‎‎‏‏‎‎‎‎‏‎‏‎‎‎‎‏‏‎‎‎‎‏‏‏‎‎‎‎‎‎‎‎‎‏‏‏‏‏‏‎Connecting‎‏‎‎‏‎"</string>
+    <string name="wifi_display_status_connected" msgid="8364125226376985558">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‎‏‎‎‎‎‎‏‎‎‏‏‎‏‎‏‎‏‏‏‏‎‎‏‎‏‎‎‎‎‎‎‏‏‏‏‎‎‎‏‎‏‎‏‎‏‏‏‏‎‏‏‏‏‎‏‎‏‏‎‎Connected‎‏‎‎‏‎"</string>
+    <string name="wifi_display_status_in_use" msgid="8556830875615434792">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‎‏‏‎‏‎‏‏‏‏‏‏‏‏‏‏‏‎‎‎‎‏‎‏‏‎‎‎‎‏‏‎‏‎‎‎‎‎‏‎‎‏‏‏‎‎‎‏‏‎‎‎‎‎‏‎‏‎‎‎‎In use‎‏‎‎‏‎"</string>
+    <string name="wifi_display_status_not_available" msgid="5714978725794210102">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‏‏‏‏‎‏‎‎‏‏‏‏‏‎‏‎‏‏‏‎‏‏‎‏‏‏‏‏‎‎‏‏‎‎‎‏‏‏‏‎‎‎‎‎‏‏‏‎‎‎‎‏‎‎‏‏‎‏‏‎‎Unavailable‎‏‎‎‏‎"</string>
+    <string name="wifi_display_details" msgid="7791118209992162698">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‏‏‎‎‎‎‎‏‏‏‏‏‏‎‎‏‏‏‎‎‏‎‏‏‏‎‏‏‏‎‎‏‏‏‎‏‏‎‏‎‏‎‎‎‏‏‏‏‏‏‎‏‏‎‎‎‏‎‏‎‎Display settings‎‏‎‎‏‎"</string>
+    <string name="wifi_display_options_title" msgid="5740656401635054838">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‏‏‏‏‏‎‏‎‏‎‏‎‏‏‏‎‏‎‎‎‏‎‎‏‎‏‎‎‏‏‏‏‏‏‎‏‎‎‎‎‎‏‏‏‏‎‎‏‎‏‎‎‏‏‏‏‎‏‏‎‎Wireless display options‎‏‎‎‏‎"</string>
+    <string name="wifi_display_options_forget" msgid="9119048225398894580">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‏‏‏‎‏‎‎‎‏‏‎‏‎‏‎‏‏‏‏‎‎‎‎‎‏‎‏‏‏‏‎‏‎‏‎‎‏‎‎‎‏‏‏‎‏‎‏‎‏‏‏‏‏‏‏‏‎‏‎‎‎Forget‎‏‎‎‏‎"</string>
+    <string name="wifi_display_options_done" msgid="5703116500357822557">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‏‏‏‏‎‎‏‎‎‏‎‏‏‎‎‎‏‎‏‎‎‎‏‏‏‏‎‏‏‎‎‏‏‏‎‎‎‏‏‏‏‏‏‏‎‎‏‏‏‎‎‎‎‏‎‏‏‏‎‏‎Done‎‏‎‎‏‎"</string>
+    <string name="wifi_display_options_name" msgid="4756080222307467898">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‎‎‏‎‎‎‎‎‎‎‎‎‏‏‏‏‏‏‎‏‏‏‎‎‎‎‏‏‎‏‏‎‏‏‎‏‏‏‏‎‎‏‎‏‏‏‎‎‎‎‏‎‎‏‏‏‏‎‏‎‎Name‎‏‎‎‏‎"</string>
+    <string name="wifi_band_24ghz" msgid="852929254171856911">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‎‏‎‏‏‏‏‎‏‎‏‏‎‎‎‏‏‎‏‏‎‏‎‏‎‎‎‏‏‎‎‏‏‏‏‎‏‎‏‏‏‎‎‏‏‏‏‎‏‎‎‎‎‎‎‎‎‏‏‏‏‎2.4 GHz‎‏‎‎‏‎"</string>
+    <string name="wifi_band_5ghz" msgid="6433822023268515117">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‏‎‎‏‎‏‎‎‏‎‎‏‏‎‎‎‎‏‏‏‎‎‎‎‏‎‏‎‏‏‎‏‎‏‎‏‎‎‎‎‎‎‎‏‎‎‏‏‏‏‎‏‎‎‏‎‏‏‎‏‎5 GHz‎‏‎‎‏‎"</string>
+    <string name="link_speed" msgid="8896664974117585555">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‏‎‏‏‎‏‏‏‎‏‏‏‎‏‎‎‏‏‎‏‏‎‏‎‏‎‎‎‎‏‎‎‏‎‏‏‏‏‏‏‎‎‎‎‎‏‎‎‎‎‏‎‏‎‎‏‎‎‏‏‎%1$d Mbps‎‏‎‎‏‎"</string>
+    <string name="wifi_ask_enable" msgid="2795469717302060104">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‎‏‏‎‏‏‎‎‏‎‏‏‏‎‎‎‎‎‎‎‏‏‏‎‎‏‎‏‏‎‎‏‏‎‎‎‎‎‏‎‎‏‏‎‏‎‏‎‎‏‎‎‎‏‎‎‏‎‎‎‎‎‏‎‎‏‏‎<xliff:g id="REQUESTER">%s</xliff:g>‎‏‎‎‏‏‏‎ wants to turn on Wi-Fi‎‏‎‎‏‎"</string>
+    <string name="wifi_ask_disable" msgid="728366570145493573">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‎‏‎‏‎‎‎‎‏‏‎‏‏‏‎‏‎‏‏‎‏‏‎‎‎‏‎‎‏‎‏‎‏‎‏‏‏‏‏‎‎‏‎‏‎‏‎‏‏‎‎‏‎‎‏‎‎‎‏‎‏‎‎‏‎‎‏‏‎<xliff:g id="REQUESTER">%s</xliff:g>‎‏‎‎‏‏‏‎ wants to turn off Wi-Fi‎‏‎‎‏‎"</string>
+    <string name="nfc_quick_toggle_title" msgid="6769159366307299004">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‏‏‎‏‏‏‏‏‎‎‎‎‏‏‏‎‎‎‏‎‏‎‎‏‎‏‎‎‎‏‎‎‎‎‎‎‏‏‎‎‎‎‎‏‎‎‏‏‏‏‏‎‏‎‏‏‏‏‎‎‎NFC‎‏‎‎‏‎"</string>
+    <string name="nfc_quick_toggle_summary" product="tablet" msgid="8302974395787498915">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‎‎‏‏‎‎‏‏‏‎‏‎‎‎‎‏‎‏‏‏‎‎‏‏‏‎‎‎‏‏‎‏‎‎‎‎‎‎‎‏‎‎‏‏‏‏‎‏‎‏‎‏‏‎‏‎‎‎‏‏‎Allow data exchange when the tablet touches another device‎‏‎‎‏‎"</string>
+    <string name="nfc_quick_toggle_summary" product="default" msgid="5237208142892767592">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‏‎‎‎‏‎‏‎‏‏‏‎‎‏‎‎‏‏‎‏‎‎‎‎‏‏‏‎‏‏‎‏‏‎‏‏‏‏‏‎‏‎‎‎‎‎‎‏‏‎‎‏‎‏‏‎‏‎‎‎‎Allow data exchange when the phone touches another device‎‏‎‎‏‎"</string>
+    <string name="nfc_disclaimer_title" msgid="4364003873202264039">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‏‏‎‎‏‎‎‏‎‎‎‎‎‎‎‎‏‏‏‎‎‏‏‎‎‏‏‎‏‎‏‏‎‏‎‎‏‎‏‎‎‏‏‎‎‏‎‏‎‏‏‏‏‏‏‎‎‏‏‏‎Turn on NFC‎‏‎‎‏‎"</string>
+    <string name="nfc_disclaimer_content" msgid="5566907911915158075">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‏‏‎‏‎‏‎‎‎‎‎‏‏‎‏‎‎‎‎‏‎‏‎‎‎‎‎‎‎‏‎‎‏‎‏‏‎‎‎‎‎‎‏‏‏‎‏‏‏‎‏‎‎‎‏‏‏‎‏‏‎NFC exchanges data between this device and other nearby devices or targets, such as payment terminals, access readers, and interactive ads or tags.‎‏‎‎‏‎"</string>
+    <string name="android_beam_settings_title" msgid="7832812974600338649">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‏‏‎‎‏‎‏‏‎‎‏‏‏‎‏‏‏‏‎‏‏‏‏‎‎‏‏‎‎‏‏‏‏‏‏‏‎‎‎‏‏‏‏‏‏‎‏‏‏‏‎‎‏‏‎‏‏‎‎‏‎Android Beam‎‏‎‎‏‎"</string>
+    <string name="android_beam_on_summary" msgid="3618057099355636830">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‎‎‏‎‎‎‏‏‎‏‎‏‏‏‏‎‏‎‏‏‏‏‎‎‎‎‏‏‎‎‏‏‏‎‎‎‎‎‏‎‏‏‎‎‎‏‎‎‎‏‎‎‎‏‎‏‏‏‏‎‎Ready to transmit app content via NFC‎‏‎‎‏‎"</string>
+    <string name="android_beam_off_summary" msgid="4663095428454779138">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‎‎‎‎‏‎‏‏‎‏‏‎‏‎‏‎‎‏‎‎‏‎‎‏‎‏‏‎‎‎‎‎‎‏‏‎‏‏‎‎‏‎‏‏‏‎‎‎‏‎‎‏‎‎‎‎‎‎‏‎‎Off‎‏‎‎‏‎"</string>
+    <string name="android_beam_disabled_summary" msgid="1737782116894793393">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‏‎‎‎‎‎‎‏‏‏‎‏‏‏‎‏‎‏‏‏‏‎‏‎‎‎‎‎‏‏‎‎‏‏‏‎‏‎‎‎‏‎‏‎‎‏‎‏‏‏‏‎‏‎‏‏‎‎‎‏‎Unavailable because NFC is turned off‎‏‎‎‏‎"</string>
+    <string name="android_beam_label" msgid="6257036050366775040">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‎‏‏‎‏‏‎‏‎‏‎‏‎‏‏‏‎‏‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‎‎‏‏‏‎‏‏‎‎‏‎‏‏‏‏‏‏‎‎‎‎‎‎‎‎‎Android Beam‎‏‎‎‏‎"</string>
+    <string name="android_beam_explained" msgid="1810540319385192758">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‏‎‎‏‎‎‏‎‎‎‎‎‎‏‎‏‎‏‎‎‏‏‎‏‎‎‏‏‏‏‏‎‏‏‎‎‎‏‏‏‏‎‏‎‎‎‎‎‏‎‎‏‎‎‏‏‎‏‏‎‎When this feature is turned on, you can beam app content to another NFC-capable device by holding the devices close together. For example, you can beam web pages, YouTube videos, contacts, and more.‎‏‎‎‏‏‎\n‎‏‎‎‏‏‏‎‎‏‎‎‏‏‎\n‎‏‎‎‏‏‏‎Just bring the devices together (typically back to back) and then tap your screen. The app determines what gets beamed.‎‏‎‎‏‎"</string>
+    <string name="wifi_quick_toggle_title" msgid="8850161330437693895">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‏‎‏‎‏‏‎‏‎‎‏‎‎‎‎‏‎‏‏‎‏‏‎‏‎‏‏‏‎‎‎‎‎‎‎‏‏‎‏‎‎‎‏‏‎‎‏‎‎‎‎‏‏‏‎‎‎‏‏‏‎Wi‑Fi‎‏‎‎‏‎"</string>
+    <string name="wifi_quick_toggle_summary" msgid="2696547080481267642">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‎‏‎‏‎‏‏‎‏‏‎‎‎‎‎‎‏‏‏‏‎‏‎‎‏‎‎‎‎‏‏‎‎‏‎‎‎‎‏‏‎‎‏‏‏‏‎‏‏‏‏‏‏‎‏‏‏‎‏‎‎Turn on Wi‑Fi‎‏‎‎‏‎"</string>
+    <string name="wifi_settings" msgid="29722149822540994">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‎‏‏‏‏‏‎‏‎‎‏‏‎‎‏‏‎‎‎‎‎‏‎‎‎‏‏‎‏‎‎‎‏‏‎‎‎‏‎‎‎‏‎‎‎‏‎‏‏‎‎‏‏‎‎‎‎‏‎‎Wi‑Fi‎‏‎‎‏‎"</string>
+    <string name="wifi_settings_category" msgid="8719175790520448014">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‏‎‎‏‎‎‎‎‎‎‎‎‏‎‏‏‏‏‎‎‎‎‏‎‏‏‏‏‎‏‏‏‎‎‎‎‎‎‏‎‏‎‎‎‎‎‏‏‎‏‎‎‎‎‎‎‏‏‏‎‎Wi‑Fi settings‎‏‎‎‏‎"</string>
+    <string name="wifi_settings_title" msgid="3103415012485692233">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‏‎‏‏‎‎‎‏‎‎‎‏‏‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‏‏‏‎‏‎‎‏‎‏‏‏‏‏‎‏‏‎‏‎‎‏‎‎‏‎Wi‑Fi‎‏‎‎‏‎"</string>
+    <string name="wifi_settings_summary" msgid="668767638556052820">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‎‏‎‎‏‎‏‎‎‎‏‏‏‏‏‏‏‎‎‎‎‏‎‎‏‏‏‏‏‏‎‏‏‏‏‎‏‎‏‏‎‏‎‎‏‎‎‎‎‏‏‎‏‎‏‎‏‎‏‎‎‎Set up &amp; manage wireless access points‎‏‎‎‏‎"</string>
+    <string name="wifi_select_network" msgid="4210954938345463209">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‏‎‏‎‎‏‏‏‎‎‎‎‎‏‎‏‎‎‎‏‎‎‏‏‎‏‎‎‏‎‏‏‎‎‎‏‎‏‎‎‎‎‏‎‎‎‎‏‏‏‎‏‏‎‏‎‏‎‎‏‎Select Wi‑Fi‎‏‎‎‏‎"</string>
+    <string name="wifi_starting" msgid="6732377932749942954">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‏‏‎‏‎‏‏‎‏‏‏‎‎‎‏‏‎‏‏‎‎‎‎‎‏‏‏‏‎‏‏‎‎‏‏‏‎‎‏‏‏‏‎‏‎‎‏‏‎‎‎‎‏‎‏‎‏‎‏‎‎Turning Wi‑Fi on…‎‏‎‎‏‎"</string>
+    <string name="wifi_stopping" msgid="8952524572499500804">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‏‏‎‎‎‎‏‏‏‏‎‏‏‏‎‎‎‎‎‏‏‎‏‎‏‎‏‎‏‎‎‎‏‎‏‎‏‏‎‎‏‎‎‏‏‏‎‏‏‏‏‏‎‎‎‎‎‏‎‎‎Turning off Wi‑Fi…‎‏‎‎‏‎"</string>
+    <string name="wifi_error" msgid="3207971103917128179">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‏‏‎‎‏‎‎‎‎‏‎‏‎‎‎‎‎‎‎‎‏‎‏‏‏‎‎‎‏‏‏‏‎‎‏‎‏‎‏‏‎‎‏‎‏‎‏‏‏‎‎‏‏‏‏‏‎‎‏‏‎Error‎‏‎‎‏‎"</string>
+    <string name="wifi_sap_no_channel_error" msgid="3108445199311817111">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‏‎‏‏‎‎‏‎‎‎‏‏‎‏‏‎‏‎‏‎‎‏‏‏‎‎‎‎‏‎‎‎‎‏‎‎‏‎‏‏‏‏‏‏‏‏‎‎‏‎‎‏‏‎‎‏‎‏‏‏‎5 GHz band not available in this country‎‏‎‎‏‎"</string>
+    <string name="wifi_in_airplane_mode" msgid="8652520421778203796">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‏‎‎‎‎‎‎‏‎‎‏‏‏‏‏‎‏‏‎‏‎‏‏‏‏‎‏‏‎‎‎‎‎‏‏‏‏‏‏‎‎‏‏‏‎‎‏‎‎‏‎‎‏‎‎‏‎‏‎‎‎In Airplane mode‎‏‎‎‏‎"</string>
+    <string name="wifi_notify_open_networks" msgid="76298880708051981">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‎‎‏‏‎‎‎‎‏‏‏‏‎‎‎‏‎‎‎‏‎‏‏‎‏‏‎‏‏‎‎‎‎‎‎‏‎‏‎‏‏‏‎‏‎‎‎‎‎‏‎‎‎‎‎‎‏‏‎‏‎Open network notification‎‏‎‎‏‎"</string>
+    <string name="wifi_notify_open_networks_summary" msgid="2761326999921366960">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‎‏‏‎‎‏‎‏‎‎‏‎‎‎‏‏‎‏‎‎‎‏‎‎‎‏‏‎‏‎‏‏‏‎‏‏‎‎‎‎‎‎‏‎‎‎‎‏‎‏‏‏‏‎‏‏‎‎‎‎‎Notify when a high‑quality public network is available‎‏‎‎‏‎"</string>
+    <string name="wifi_wakeup" msgid="8815640989361538036">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‏‎‏‎‎‏‎‏‎‏‏‏‎‏‏‏‎‎‏‎‏‏‎‎‎‏‎‏‏‏‎‎‎‏‏‎‎‏‎‎‎‏‎‎‏‎‎‎‎‎‏‏‏‏‏‏‎‏‎‎‎Turn on Wi‑Fi automatically‎‏‎‎‏‎"</string>
+    <string name="wifi_wakeup_summary" msgid="2530814331062997163">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‎‎‏‏‎‎‎‏‏‏‏‏‎‏‎‎‎‎‏‎‎‎‏‏‏‎‎‏‏‎‏‎‏‎‏‏‎‏‏‏‏‎‏‎‎‏‎‏‎‎‎‎‏‎‏‎‏‎‏‏‎Wi‑Fi will turn back on near high‑quality saved networks, like your home network‎‏‎‎‏‎"</string>
+    <string name="wifi_wakeup_summary_scanning_disabled" msgid="7247227922074840445">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‎‏‎‎‏‎‎‏‎‎‏‏‎‏‎‏‎‎‏‏‎‏‏‎‎‏‎‏‏‏‎‎‏‏‎‏‏‎‎‏‎‎‎‎‎‎‏‎‏‏‎‏‎‏‏‏‏‏‎‏‎Unavailable because Wi‑Fi scanning is turned off‎‏‎‎‏‎"</string>
+    <string name="wifi_wakeup_summary_scoring_disabled" msgid="108339002136866897">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‎‎‏‏‏‎‎‎‎‎‎‎‏‏‏‎‎‏‎‏‏‎‏‏‏‏‏‏‏‎‎‏‏‎‎‏‏‎‏‏‎‎‎‎‎‎‏‏‎‎‎‎‎‏‎‏‎‎‎‏‎To use, select a network rating provider‎‏‎‎‏‎"</string>
+    <string name="wifi_poor_network_detection" msgid="4925789238170207169">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‎‏‎‎‎‏‎‏‏‎‏‏‏‏‏‎‏‎‏‏‎‎‏‏‎‏‏‎‏‏‎‏‎‎‏‏‏‎‎‏‎‎‏‏‏‏‎‎‎‎‏‏‏‏‎‎‎‎‎‏‎Avoid poor connections‎‏‎‎‏‎"</string>
+    <string name="wifi_poor_network_detection_summary" msgid="2784135142239546291">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‎‏‏‎‏‎‏‎‎‎‏‏‎‎‏‏‏‏‎‎‎‎‏‎‏‎‎‏‎‎‏‎‏‏‏‏‏‏‎‏‏‏‏‎‏‎‏‎‏‎‏‏‏‎‏‏‎‎‏‏‎Don’t use a Wi‑Fi network unless it has a good Internet connection‎‏‎‎‏‎"</string>
+    <string name="wifi_avoid_poor_network_detection_summary" msgid="4674423884870027498">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‎‎‎‎‏‏‎‏‏‏‏‎‏‏‏‎‎‎‏‏‏‏‎‎‎‎‎‏‏‏‎‏‎‎‏‏‎‏‎‎‎‏‏‏‏‎‎‎‏‎‎‎‏‏‏‎‏‎‏‎‎Only use networks that have a good Internet connection‎‏‎‎‏‎"</string>
+    <string name="use_open_wifi_automatically_title" msgid="6851951242903078588">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‏‏‏‏‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‏‎‏‎‏‏‎‏‎‎‎‏‎‏‎‏‏‏‎‎‎‏‎‎‎‏‏‎‎‎‏‏‎‏‎‏‏‏‏‎‎‎Connect to open networks‎‏‎‎‏‎"</string>
+    <string name="use_open_wifi_automatically_summary" msgid="2982091714252931713">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‏‎‎‏‎‏‏‎‎‎‏‎‏‎‎‎‎‏‎‎‏‎‎‏‏‏‎‏‎‏‎‎‎‎‏‏‏‎‏‎‏‏‏‎‏‎‎‎‎‎‏‎‏‎‎‎‎‎‎‏‎Automatically connect to high‑quality public networks‎‏‎‎‏‎"</string>
+    <string name="use_open_wifi_automatically_summary_scoring_disabled" msgid="593964217679325831">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‎‏‎‎‎‎‎‏‏‏‏‏‎‎‎‏‎‏‏‏‏‎‏‎‎‏‏‏‏‎‎‎‏‏‏‎‎‎‎‎‏‎‎‎‏‏‎‏‎‏‎‏‎‏‎‎‎‎‏‏‏‎To use, select a network rating provider‎‏‎‎‏‎"</string>
+    <string name="use_open_wifi_automatically_summary_scorer_unsupported_disabled" msgid="8472122600853650258">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‎‏‎‏‏‎‎‏‎‎‏‏‎‎‎‎‎‏‏‎‏‎‎‏‏‏‏‎‎‏‎‎‎‏‎‏‎‏‏‏‎‎‎‎‏‎‏‏‏‎‏‏‎‏‎‏‎‎‏‎‎To use, select a compatible network rating provider‎‏‎‎‏‎"</string>
+    <string name="wifi_install_credentials" msgid="3551143317298272860">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‎‎‎‏‎‏‎‎‏‎‎‎‎‎‏‏‎‎‏‎‎‎‎‎‏‎‎‎‎‏‎‎‎‏‏‎‎‎‎‏‎‎‎‎‏‏‎‏‏‎‏‎‎‏‎‏‏‏‎‎‎Install certificates‎‏‎‎‏‎"</string>
+    <string name="wifi_scan_notify_text" msgid="5593805423071186757">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‏‏‎‏‏‎‏‎‎‎‎‏‎‎‏‏‎‎‎‎‎‏‏‎‎‏‎‏‎‎‏‎‎‎‎‎‏‏‎‎‏‏‏‏‏‏‎‎‏‏‏‏‎‏‎‎‎‏‎‏‎To improve location accuracy, system apps and services can still scan for Wi‑Fi networks. You can change this in ‎‏‎‎‏‏‎<xliff:g id="LINK_BEGIN_0">LINK_BEGIN</xliff:g>‎‏‎‎‏‏‏‎scanning settings‎‏‎‎‏‏‎<xliff:g id="LINK_END_1">LINK_END</xliff:g>‎‏‎‎‏‏‏‎.‎‏‎‎‏‎"</string>
+    <string name="wifi_scan_notify_text_scanning_off" msgid="3426075479272242098">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‏‏‏‏‏‎‎‎‏‎‏‏‏‏‎‏‏‏‎‏‎‏‏‏‏‏‏‏‎‎‎‎‏‎‏‏‏‎‏‏‎‎‏‎‏‎‏‏‏‎‏‏‏‎‏‏‎‎‏‎‎To improve location accuracy, turn on Wi-Fi scanning in ‎‏‎‎‏‏‎<xliff:g id="LINK_BEGIN_0">LINK_BEGIN</xliff:g>‎‏‎‎‏‏‏‎scanning settings‎‏‎‎‏‏‎<xliff:g id="LINK_END_1">LINK_END</xliff:g>‎‏‎‎‏‏‏‎.‎‏‎‎‏‎"</string>
+    <string name="wifi_scan_notify_remember_choice" msgid="7104867814641144485">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‎‎‏‎‏‎‎‏‏‎‎‏‏‎‎‎‏‏‏‏‏‎‏‎‎‎‏‎‎‏‎‏‏‎‏‏‏‏‎‎‏‎‏‎‏‎‎‏‎‎‏‎‏‎‏‎‎‏‎‏‎Don’t show again‎‏‎‎‏‎"</string>
+    <string name="wifi_setting_sleep_policy_title" msgid="5149574280392680092">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‎‏‏‏‎‏‏‏‎‏‏‎‏‏‏‏‎‏‏‎‏‎‎‎‎‏‏‎‎‎‏‏‏‏‏‏‎‏‎‎‏‎‏‏‎‎‏‎‎‎‏‎‏‎‎‏‏‏‎‎‎Keep Wi‑Fi on during sleep‎‏‎‎‏‎"</string>
+    <string name="wifi_setting_on_during_sleep_title" msgid="8308975500029751565">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‎‎‏‏‎‏‎‎‏‏‏‏‎‏‏‎‏‎‎‏‎‎‏‏‎‎‎‏‏‏‎‎‎‏‏‎‏‎‏‏‎‎‏‎‎‏‏‏‎‎‎‏‎‎‎‎‏‏‎‏‎Wi‑Fi on during sleep‎‏‎‎‏‎"</string>
+    <string name="wifi_setting_sleep_policy_error" msgid="8174902072673071961">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‎‎‎‏‎‏‏‏‎‎‏‏‎‎‎‏‎‏‏‎‎‎‎‏‏‏‏‏‎‏‏‎‎‎‏‏‎‏‎‎‏‎‎‎‎‏‏‏‎‎‏‏‎‏‎‏‏‎‎‏‎There was a problem changing the setting‎‏‎‎‏‎"</string>
+    <string name="wifi_suspend_efficiency_title" msgid="2338325886934703895">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‎‎‎‎‎‏‏‏‎‎‏‏‎‏‏‎‎‏‏‏‎‎‎‎‎‎‎‏‎‏‎‏‎‎‏‏‏‏‎‏‎‏‏‏‏‏‎‏‏‏‏‏‎‎‎‏‎‏‏‏‎Improve efficiency‎‏‎‎‏‎"</string>
+    <string name="wifi_suspend_optimizations" msgid="1220174276403689487">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‎‎‎‎‏‏‏‎‏‏‏‎‏‏‏‎‏‏‏‎‎‎‎‎‏‎‏‎‎‎‏‎‎‏‎‏‎‎‎‏‏‏‎‎‎‏‏‏‏‎‎‎‎‎‎‎‏‏‏‏‎Wi‑Fi optimization‎‏‎‎‏‎"</string>
+    <string name="wifi_suspend_optimizations_summary" msgid="4151428966089116856">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‏‎‎‏‏‎‎‏‏‏‎‎‏‏‎‏‎‏‏‎‏‎‏‎‎‏‏‎‎‏‎‎‎‎‏‎‎‎‎‎‎‎‏‎‎‏‎‎‏‏‎‎‏‎‏‏‏‎‎‎‎Minimize battery usage when Wi‑Fi is on‎‏‎‎‏‎"</string>
+    <string name="wifi_limit_optimizations_summary" msgid="9000801068363468950">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‏‏‎‎‏‏‏‎‏‎‎‏‎‏‎‎‎‏‎‎‏‏‏‎‎‎‏‎‎‎‏‎‎‏‎‏‏‏‎‎‎‎‏‎‏‏‎‏‎‎‎‎‏‎‎‏‎‏‏‎‎Limit battery used by Wi‑Fi‎‏‎‎‏‎"</string>
+    <string name="wifi_switch_away_when_unvalidated" msgid="1707247692180853058">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‎‏‏‏‏‎‏‏‎‎‎‏‎‏‎‏‏‏‎‎‏‎‏‏‏‎‏‏‎‎‎‎‏‏‎‎‎‎‎‎‏‎‏‏‏‎‎‏‎‎‎‏‎‏‎‎‎‎‏‎‎Switch to mobile data if Wi‑Fi loses Internet access.‎‏‎‎‏‎"</string>
+    <string name="wifi_cellular_data_fallback_title" msgid="8753386877755616476">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‏‎‎‏‎‏‏‏‏‎‏‎‎‏‎‎‎‏‏‎‏‏‏‏‏‏‎‎‏‏‏‎‎‏‏‎‎‎‏‏‎‎‎‎‎‏‏‎‏‏‎‎‏‏‎‏‏‏‎‎‎Switch to mobile data automatically‎‏‎‎‏‎"</string>
+    <string name="wifi_cellular_data_fallback_summary" msgid="6375399280719867214">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‏‎‎‎‎‏‏‏‏‎‎‏‏‏‏‏‎‏‏‏‏‏‎‏‏‏‏‎‎‎‎‏‎‏‎‎‏‎‎‏‎‏‏‎‏‎‏‎‏‏‎‏‎‏‎‎‏‏‏‎‎Use mobile data when Wi‑Fi has no Internet access. Data usage may apply.‎‏‎‎‏‎"</string>
+    <string name="wifi_add_network" msgid="6234851776910938957">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‎‏‏‎‏‎‎‎‎‏‏‎‏‎‏‎‎‏‎‎‏‎‏‎‏‎‎‎‎‏‎‎‏‏‎‏‏‏‏‏‏‏‎‏‎‏‎‏‎‎‏‏‎‏‎‎‏‏‎‏‎Add network‎‏‎‎‏‎"</string>
+    <string name="wifi_configure_settings_preference_title" msgid="2913345003906899146">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‏‎‎‎‎‏‏‎‏‏‏‎‎‏‎‎‎‏‏‏‏‏‎‏‏‎‎‎‎‏‏‏‎‎‏‎‎‎‎‎‎‏‏‏‏‎‎‏‏‏‎‎‏‏‎‎‏‎‏‎‎Wi‑Fi preferences‎‏‎‎‏‎"</string>
+    <string name="wifi_configure_settings_preference_summary_wakeup_on" msgid="646393113104367290">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‎‏‎‎‎‏‏‏‏‏‎‎‎‎‏‏‏‎‎‏‏‎‎‎‏‏‏‎‎‏‎‎‏‎‎‏‏‏‏‎‏‏‎‎‎‎‎‏‏‏‏‏‎‏‎‏‏‏‎‏‎‎Wi‑Fi turns back on automatically‎‏‎‎‏‎"</string>
+    <string name="wifi_configure_settings_preference_summary_wakeup_off" msgid="2782566279864356713">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‎‏‏‎‏‎‎‏‏‏‎‏‏‎‏‎‏‎‎‏‎‏‎‎‏‎‎‏‏‏‏‏‎‎‏‏‎‏‎‎‏‎‏‏‏‎‎‎‏‏‏‏‎‏‏‎‏‎‎‏‎Wi‑Fi doesn\'t turn back on automatically‎‏‎‎‏‎"</string>
+    <string name="wifi_access_points" msgid="7053990007031968609">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‎‎‎‏‏‏‏‎‎‏‎‎‏‏‎‎‏‏‏‎‏‎‎‎‏‎‎‏‏‎‏‎‏‎‏‎‎‏‎‎‏‎‏‏‏‎‏‏‎‎‏‏‎‏‏‎‎‎‎‏‎Wi‑Fi networks‎‏‎‎‏‎"</string>
+    <string name="wifi_menu_wps_pbc" msgid="2668564692207863017">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‎‏‎‏‎‎‎‎‏‎‎‎‏‎‏‎‎‏‎‏‎‏‏‏‎‎‏‎‏‏‏‎‏‎‏‏‎‎‏‏‎‎‏‏‎‎‎‎‎‏‎‎‏‏‏‎‏‎‎‏‎WPS Push Button‎‏‎‎‏‎"</string>
+    <string name="wifi_menu_more_options" msgid="2448097861752719396">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‎‎‎‏‏‏‏‏‏‎‎‏‎‏‏‎‎‏‎‎‎‎‎‎‏‎‎‎‏‏‏‎‎‎‎‏‎‎‏‎‏‎‏‎‎‎‎‎‏‎‎‎‎‎‏‎‎‏‎‎‎More options‎‏‎‎‏‎"</string>
+    <string name="wifi_menu_wps_pin" msgid="6426448256268695933">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‏‎‎‏‎‎‏‎‏‏‏‏‎‏‎‏‎‏‎‎‏‎‏‎‎‎‏‏‏‏‏‎‏‎‏‎‎‏‎‏‎‎‏‎‏‏‏‏‏‎‎‏‎‏‏‏‏‏‎‏‎WPS Pin Entry‎‏‎‎‏‎"</string>
+    <string name="wifi_menu_p2p" msgid="7619851399250896797">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‏‎‎‏‏‎‏‏‏‏‏‏‎‎‏‎‎‏‏‎‎‏‏‏‏‎‎‏‏‏‎‏‎‏‎‏‏‎‎‏‏‏‎‎‏‏‏‎‎‏‏‏‏‎‎‏‏‏‎‏‎Wi‑Fi Direct‎‏‎‎‏‎"</string>
+    <string name="wifi_menu_scan" msgid="1470911530412095868">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‎‏‎‎‎‏‏‎‏‎‎‏‏‎‏‏‏‎‏‎‎‎‏‏‏‏‏‎‎‏‏‎‎‎‏‎‎‎‏‏‏‏‎‏‎‎‏‏‏‎‎‏‎‏‏‏‏‏‎‎‎Scan‎‏‎‎‏‎"</string>
+    <string name="wifi_menu_advanced" msgid="7522252991919573664">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‏‎‎‎‎‏‏‎‎‏‎‎‎‏‏‎‏‎‎‏‎‎‏‏‏‏‎‏‏‏‎‏‎‏‎‏‏‏‏‏‏‏‎‎‎‏‎‎‏‎‏‎‏‎‏‎‎‎‎‎‎Advanced‎‏‎‎‏‎"</string>
+    <string name="wifi_menu_configure" msgid="6150926852602171938">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‎‏‎‏‎‏‎‏‏‏‎‎‎‏‏‏‏‎‏‏‎‏‏‎‎‎‏‎‎‎‏‎‏‎‎‎‏‏‎‎‎‎‏‏‏‎‎‏‎‎‏‎‎‎‏‎‎‎‏‎‎Configure‎‏‎‎‏‎"</string>
+    <string name="wifi_menu_connect" msgid="4996220309848349408">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‎‏‎‏‎‏‎‏‎‏‏‎‎‎‏‎‎‎‏‏‏‏‏‎‎‏‏‎‏‎‎‏‎‏‎‎‎‎‎‏‏‎‏‎‎‏‎‏‏‎‏‎‏‏‏‎‎‎‎‎‎Connect to network‎‏‎‎‏‎"</string>
+    <string name="wifi_menu_remember" msgid="8814185749388713796">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‏‎‏‎‎‏‎‏‎‎‏‎‎‏‎‎‎‏‏‏‎‎‏‏‏‏‎‏‎‏‎‏‎‎‎‎‏‎‎‏‏‏‏‏‏‏‎‏‏‏‏‏‎‏‎‎‎‏‎‎‎Remember network‎‏‎‎‏‎"</string>
+    <string name="wifi_menu_forget" msgid="8736964302477327114">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‏‎‎‏‎‎‏‏‏‏‏‏‏‏‏‎‏‏‏‎‏‎‏‏‏‏‏‎‎‎‏‎‎‎‎‎‎‏‏‎‏‏‎‏‏‏‏‏‏‎‏‏‎‎‎‎‏‎‏‎‎Forget network‎‏‎‎‏‎"</string>
+    <string name="wifi_menu_modify" msgid="2068554918652440105">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‏‏‎‎‏‎‏‏‎‏‎‎‏‏‏‏‏‎‏‏‏‎‏‏‏‏‎‏‎‎‏‎‎‏‎‎‏‎‏‎‏‎‏‎‎‏‏‎‏‏‏‎‎‎‏‎‏‎‎‏‎Modify network‎‏‎‎‏‎"</string>
+    <string name="wifi_menu_write_to_nfc" msgid="7692881642188240324">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‏‎‏‎‏‏‎‎‎‎‏‎‏‎‎‏‏‎‏‏‎‎‎‏‏‎‎‎‎‏‎‎‏‏‎‏‏‏‎‎‎‎‎‎‏‏‏‏‎‏‎‏‏‏‎‎‎‏‎‎‎Write to NFC tag‎‏‎‎‏‎"</string>
+    <string name="wifi_empty_list_wifi_off" msgid="8056223875951079463">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‏‏‏‏‏‏‎‎‏‏‎‏‎‏‏‏‎‏‎‎‏‏‏‎‏‏‏‎‎‏‏‏‎‏‎‏‎‎‎‏‎‏‎‏‏‎‏‏‎‎‎‎‎‎‏‎‎‏‏‏‎To see available networks, turn Wi‑Fi on.‎‏‎‎‏‎"</string>
+    <string name="wifi_empty_list_wifi_on" msgid="8746108031587976356">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‏‎‎‏‎‏‏‎‎‎‎‎‎‏‏‎‏‎‏‎‏‏‏‎‏‎‏‎‎‏‏‏‎‏‎‏‏‏‏‏‏‏‏‎‎‎‎‎‎‏‎‎‏‎‏‎‎‏‎‎‎Searching for Wi‑Fi networks…‎‏‎‎‏‎"</string>
+    <string name="wifi_empty_list_user_restricted" msgid="7322372065475939129">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‎‏‎‏‏‎‎‏‏‏‏‎‎‏‎‎‏‎‏‎‏‎‎‏‏‎‎‏‎‎‎‏‎‎‏‏‏‏‏‎‏‏‏‏‏‏‎‎‏‎‏‏‎‎‏‏‏‎‎‏‎You don’t have permission to change the Wi‑Fi network.‎‏‎‎‏‎"</string>
+    <string name="wifi_more" msgid="3195296805089107950">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‏‏‎‎‎‏‎‏‎‏‏‏‏‏‏‏‏‎‎‏‏‎‎‎‎‎‏‏‏‏‎‎‏‎‏‏‎‏‎‎‎‏‏‎‏‏‎‏‏‏‏‏‏‏‏‎‏‏‏‎‎More‎‏‎‎‏‎"</string>
+    <string name="wifi_setup_wps" msgid="8128702488486283957">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‎‎‎‎‏‏‎‎‏‏‏‎‏‏‏‏‎‎‏‏‏‏‎‏‏‎‎‎‎‏‏‏‎‏‏‏‎‎‎‎‏‏‏‏‎‎‎‎‏‎‏‎‏‎‏‏‎‏‎‏‎Automatic setup (WPS)‎‏‎‎‏‎"</string>
+    <string name="wifi_show_advanced" msgid="3409422789616520979">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‏‏‏‏‎‏‎‏‎‎‎‎‏‎‏‏‎‎‏‏‏‏‏‏‎‏‏‎‏‎‎‏‏‎‎‎‎‎‏‏‎‏‏‎‏‏‎‎‏‏‏‏‎‎‎‏‎‎‏‏‎Advanced options‎‏‎‎‏‎"</string>
+    <string name="wifi_advanced_toggle_description_expanded" msgid="2380600578544493084">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‎‎‎‏‎‎‎‎‏‎‎‏‏‎‎‏‎‏‏‏‏‎‎‏‏‏‎‎‏‏‏‏‏‏‎‎‎‎‏‏‏‎‏‏‏‏‏‎‎‎‏‎‎‎‎‏‏‏‎‎‎Drop down list Advanced Options. Double-tap to collapse.‎‏‎‎‏‎"</string>
+    <string name="wifi_advanced_toggle_description_collapsed" msgid="1463812308429197263">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‎‏‎‎‎‏‎‏‎‎‎‎‏‎‎‎‎‎‎‏‏‎‎‎‏‎‎‏‏‏‏‏‎‏‎‏‏‏‎‎‎‏‎‎‎‏‎‎‏‏‏‏‏‏‎‎‏‏‏‏‎Drop down list Advanced Options. Double-tap to expand.‎‏‎‎‏‎"</string>
+    <string name="wifi_wps_setup_title" msgid="8207552222481570175">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‎‎‎‏‏‏‏‎‎‏‏‏‎‎‎‏‎‏‎‏‎‏‎‎‎‎‏‎‏‏‎‎‏‎‎‎‎‏‏‏‏‎‏‏‎‏‎‏‏‎‎‏‎‏‏‏‏‏‏‏‎Wi‑Fi Protected Setup‎‏‎‎‏‎"</string>
+    <string name="wifi_wps_setup_msg" msgid="315174329121275092">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‎‏‏‏‎‎‎‏‎‏‏‏‏‏‏‎‏‏‏‎‎‏‎‏‏‎‎‎‎‏‏‏‏‎‏‎‎‏‏‎‎‏‏‎‎‎‎‏‏‏‏‏‎‎‏‏‎‏‎‏‎‎‎Starting WPS…‎‏‎‎‏‎"</string>
+    <string name="wifi_wps_onstart_pbc" msgid="817003360936932340">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‎‏‎‏‏‎‏‎‏‎‏‏‎‏‎‎‏‎‏‎‎‎‎‏‏‏‎‏‎‎‏‏‎‎‏‎‎‏‏‏‏‎‎‏‎‎‎‏‏‎‎‏‏‏‏‏‏‎‏‎‎‎Press the Wi‑Fi Protected Setup button on your router. It may be called “WPS” or marked with this symbol:‎‏‎‎‏‎"</string>
+    <string name="wifi_wps_onstart_pin" msgid="223344506445335358">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‎‏‎‏‏‎‎‎‏‏‎‎‏‎‏‏‏‏‎‏‎‏‎‏‎‎‏‎‏‎‎‏‏‎‎‎‏‎‎‏‏‎‏‎‏‏‎‎‎‏‎‏‏‎‎‏‏‏‏‏‎‎Enter pin ‎‏‎‎‏‏‎<xliff:g id="NUMBER">%1$s</xliff:g>‎‏‎‎‏‏‏‎ on your Wi‑Fi router. The setup can take up to two minutes to complete.‎‏‎‎‏‎"</string>
+    <string name="wifi_wps_complete" msgid="2388138550456729134">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‎‎‎‏‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‏‏‎‏‏‏‏‎‏‎‏‏‎‎‏‏‎‎‎‏‏‏‎‏‏‏‏‏‎‎‎‏‎‏‏‏‎‎WPS succeeded. Connecting to the network…‎‏‎‎‏‎"</string>
+    <string name="wifi_wps_connected" msgid="7153432445748931183">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‎‎‏‏‎‏‎‎‎‏‏‎‎‎‎‏‏‎‎‎‏‏‏‎‏‎‎‎‏‎‏‎‏‏‎‏‏‎‎‏‏‏‏‎‎‏‏‎‏‎‏‎‎‏‏‎‏‏‏‏‎Connected to Wi‑Fi network ‎‏‎‎‏‏‎<xliff:g id="NETWORK_NAME">%s</xliff:g>‎‏‎‎‏‏‏‎‎‏‎‎‏‎"</string>
+    <string name="wifi_wps_in_progress" msgid="3372311348221357944">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‏‏‏‎‏‏‎‎‏‏‎‎‏‏‎‏‏‎‏‏‎‏‎‎‏‏‎‏‏‏‎‎‏‏‏‎‏‏‎‎‎‎‎‎‏‎‏‎‏‏‏‏‎‏‏‏‏‎‎‎‎WPS is already in progress and can take up to two minutes to complete‎‏‎‎‏‎"</string>
+    <string name="wifi_wps_failed_generic" msgid="5668775022238832527">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‏‏‏‎‏‎‏‎‏‎‏‏‏‎‎‎‏‎‎‎‏‏‎‏‏‎‎‏‎‎‏‎‏‎‎‎‎‎‏‎‎‏‏‏‎‎‎‏‎‏‏‏‏‎‎‎‏‏‏‏‎WPS failed. Please try again in a few minutes.‎‏‎‎‏‎"</string>
+    <string name="wifi_wps_failed_wep" msgid="2702820087105284461">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‎‏‎‏‏‎‎‎‎‎‏‎‎‏‎‏‏‎‎‎‏‎‎‎‏‏‎‎‏‎‎‎‏‏‏‏‏‎‏‏‎‎‏‏‎‏‏‎‏‎‎‏‎‏‏‎‏‏‎‏‎The wireless router security setting (WEP) is not supported‎‏‎‎‏‎"</string>
+    <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 canceled.‎‏‎‎‏‎"</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>
+    <string name="wifi_signal" msgid="5514120261628065287">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‏‏‎‎‏‎‎‎‎‏‏‎‎‎‎‏‎‏‏‏‎‎‏‎‏‎‎‏‏‎‏‏‎‎‏‏‎‎‎‏‏‏‏‏‏‏‏‏‎‏‏‎‎‎‎‎‎‏‏‏‎Signal strength‎‏‎‎‏‎"</string>
+    <string name="wifi_status" msgid="4824568012414605414">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‎‎‏‎‏‏‏‏‎‏‎‎‎‏‎‎‏‏‏‏‎‎‎‎‏‎‏‏‏‎‏‎‏‏‏‎‏‎‏‎‏‏‏‏‎‏‎‏‏‎‎‎‎‏‏‎‎‏‏‎‎Status‎‏‎‎‏‎"</string>
+    <string name="wifi_speed" msgid="3526198708812322037">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‎‎‎‎‏‏‏‎‏‏‏‏‏‎‎‏‎‎‏‏‎‎‎‎‏‎‏‏‎‎‎‎‎‏‏‎‎‎‏‏‎‎‏‏‎‎‎‏‎‏‎‎‏‏‏‏‎‏‎‏‎Link speed‎‏‎‎‏‎"</string>
+    <string name="wifi_frequency" msgid="7791090119577812214">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‏‏‎‎‎‎‎‏‏‏‏‏‏‎‎‎‎‎‏‏‎‎‏‎‏‏‏‏‎‏‎‎‏‏‏‎‎‏‏‏‏‏‎‏‏‎‏‏‏‏‎‎‏‏‏‏‎‏‏‎‎Frequency‎‏‎‎‏‎"</string>
+    <string name="wifi_ip_address" msgid="1440054061044402918">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‎‎‏‏‏‏‏‏‏‏‎‎‎‎‎‏‏‎‎‏‏‎‎‎‏‎‎‏‏‏‏‎‏‏‎‏‏‏‏‎‏‎‎‏‎‎‎‎‏‎‏‎‏‏‏‎‎‏‏‎‎IP address‎‏‎‎‏‎"</string>
+    <string name="passpoint_label" msgid="6381371313076009926">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‏‎‎‎‏‎‎‎‏‏‏‏‎‎‏‎‏‏‏‏‎‏‏‎‎‏‏‎‎‎‏‏‎‏‏‏‏‏‎‎‎‎‏‏‎‏‏‏‏‎‏‏‏‏‎‎‎‏‏‎‎Saved via‎‏‎‎‏‎"</string>
+    <string name="passpoint_content" msgid="8447207162397870483">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‎‏‎‏‎‎‏‏‏‎‏‎‏‎‎‎‎‎‏‎‎‎‏‎‏‎‎‎‏‎‏‏‎‎‏‎‏‏‎‏‏‏‎‎‎‏‎‎‏‎‎‏‏‎‎‏‎‎‏‏‎‎‏‎‎‏‏‎<xliff:g id="NAME">%1$s</xliff:g>‎‏‎‎‏‏‏‎ credentials‎‏‎‎‏‎"</string>
+    <string name="wifi_eap_method" msgid="8529436133640730382">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‎‏‏‎‎‏‎‏‏‏‏‎‏‎‏‎‎‏‎‎‏‏‏‏‏‎‎‏‎‎‎‎‎‎‎‎‎‎‎‎‏‎‎‏‎‏‏‏‎‏‏‏‎‎‎‎‏‏‏‎‎EAP method‎‏‎‎‏‎"</string>
+    <string name="please_select_phase2" msgid="5231074529772044898">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‏‎‎‎‏‎‎‏‏‎‎‎‏‎‎‎‎‎‏‎‏‎‎‏‎‎‎‏‏‏‎‎‎‏‎‎‏‎‏‎‏‎‎‎‎‎‎‎‎‎‏‎‎‏‏‎‎‎‏‎‎Phase 2 authentication‎‏‎‎‏‎"</string>
+    <string name="wifi_eap_ca_cert" msgid="3521574865488892851">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‎‎‎‎‏‏‎‏‏‏‏‏‎‎‏‎‎‏‎‏‏‎‏‎‏‏‏‎‏‎‎‏‏‎‏‏‎‏‏‎‏‎‎‎‏‏‎‏‎‎‏‏‏‎‏‏‎‎‏‏‎CA certificate‎‏‎‎‏‎"</string>
+    <string name="wifi_eap_domain" msgid="8471124344218082064">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‎‏‎‏‏‎‎‎‏‏‏‏‎‏‏‏‏‎‏‎‏‎‏‏‎‏‎‏‏‎‎‎‏‎‎‏‎‏‎‎‏‎‎‎‎‏‎‏‏‎‏‏‎‎‎‏‎‎‎‎‎Domain‎‏‎‎‏‎"</string>
+    <string name="wifi_eap_user_cert" msgid="1291089413368160789">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‎‎‎‏‏‏‏‎‏‎‏‎‏‏‎‏‏‏‏‎‏‏‏‏‏‎‏‏‎‎‏‎‎‎‎‏‎‎‎‏‎‎‏‏‏‎‏‎‎‎‏‎‎‎‎‏‎‏‎‏‎User certificate‎‏‎‎‏‎"</string>
+    <string name="wifi_eap_identity" msgid="4359453783379679103">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‏‏‎‎‎‏‏‏‏‏‏‏‏‏‏‎‎‏‎‎‎‎‎‏‏‏‏‎‎‏‎‏‏‏‎‏‎‎‎‏‎‏‎‎‎‎‎‏‎‏‏‏‎‏‏‏‏‏‏‏‎Identity‎‏‎‎‏‎"</string>
+    <string name="wifi_eap_anonymous" msgid="2989469344116577955">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‏‎‎‏‎‏‏‏‏‏‎‎‏‎‏‏‏‎‏‎‏‎‎‎‎‏‏‏‏‎‎‏‎‎‏‎‏‏‏‏‏‏‎‏‎‎‎‏‎‏‏‎‏‎‏‎‎‎‏‏‎Anonymous identity‎‏‎‎‏‎"</string>
+    <string name="wifi_password" msgid="5948219759936151048">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‎‎‏‎‏‎‎‎‏‏‎‎‎‏‎‏‎‎‏‎‎‏‎‏‏‎‏‏‎‏‎‎‏‏‎‎‏‏‏‏‎‏‎‎‎‎‎‏‏‏‏‎‎‎‎‎‏‎‎‎‎Password‎‏‎‎‏‎"</string>
+    <string name="wifi_show_password" msgid="6461249871236968884">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‏‎‎‏‏‎‏‎‏‎‏‎‏‏‏‏‏‎‎‎‏‎‎‎‎‏‏‎‎‏‎‏‎‏‎‎‎‎‎‏‏‏‏‎‎‎‏‏‎‎‎‏‏‎‏‏‎‏‎‎‎Show password‎‏‎‎‏‎"</string>
+    <string name="wifi_ap_band_config" msgid="1611826705989117930">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‎‏‏‎‎‏‎‏‏‏‏‎‎‏‎‏‏‎‏‏‏‏‎‏‏‎‎‏‎‏‏‎‏‎‎‏‏‏‏‏‏‎‎‎‎‎‏‎‎‏‏‏‏‏‏‎‏‎‏‎‎Select AP Band‎‏‎‎‏‎"</string>
+    <string name="wifi_ap_choose_2G" msgid="8724267386885036210">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‏‎‎‏‎‎‎‏‎‎‏‎‏‏‎‏‎‎‏‎‏‏‏‏‎‏‏‏‎‎‎‏‏‎‎‎‏‏‎‎‏‏‏‎‏‏‎‏‏‎‎‎‏‎‏‏‎‎‏‎‎2.4 GHz Band‎‏‎‎‏‎"</string>
+    <string name="wifi_ap_choose_5G" msgid="8137061170937978040">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‎‎‎‎‏‏‏‎‏‏‎‎‏‎‏‎‎‏‏‎‎‎‎‎‎‏‎‏‏‏‏‎‎‎‎‏‎‏‏‎‎‎‎‏‏‏‎‏‏‏‎‎‏‎‏‏‏‎‎‎‎5 GHz Band‎‏‎‎‏‎"</string>
+    <string name="wifi_ip_settings" msgid="3359331401377059481">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‏‏‏‎‏‎‎‏‏‏‏‎‏‎‏‏‏‏‏‎‎‎‎‏‏‏‎‎‎‏‏‎‏‏‎‏‏‏‏‎‎‏‎‏‎‎‎‏‎‎‏‎‏‎‎‏‏‎‎‏‎IP settings‎‏‎‎‏‎"</string>
+    <string name="wifi_shared" msgid="844142443226926070">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‎‏‎‏‏‏‎‏‏‎‏‏‎‏‏‏‏‏‏‏‏‎‎‎‏‎‏‎‎‎‏‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‎‎‎‏‎‏‏‏‏‏‏‎‏‏‎‎Share with other device users‎‏‎‎‏‎"</string>
+    <string name="wifi_unchanged" msgid="3410422020930397102">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‏‏‏‏‎‏‎‏‎‏‎‎‎‏‎‎‎‎‎‎‏‏‎‎‎‎‏‎‎‏‎‎‎‎‏‏‏‎‏‏‏‎‎‏‏‏‏‎‎‎‏‏‏‎‏‎‏‏‏‎‎(unchanged)‎‏‎‎‏‎"</string>
+    <string name="wifi_unspecified" msgid="4917316464723064807">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‎‏‎‎‎‎‏‏‏‏‎‏‏‏‎‏‎‎‎‏‎‏‎‎‎‏‎‏‏‎‎‎‎‏‏‏‏‏‏‏‏‏‏‏‎‏‏‏‎‏‏‏‏‏‏‎‎‏‏‏‎Please select‎‏‎‎‏‎"</string>
+    <string name="wifi_multiple_cert_added" msgid="3240743501460165224">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‏‏‎‎‏‏‏‏‏‎‎‏‎‏‏‎‏‏‏‏‎‎‎‎‏‎‏‏‎‏‎‏‏‏‎‎‏‎‏‏‎‎‎‎‎‏‎‏‎‎‏‎‎‏‏‎‏‎‎‎‎(Multiple certificates added)‎‏‎‎‏‎"</string>
+    <string name="wifi_use_system_certs" msgid="5270879895056893783">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‏‎‎‏‎‎‏‎‎‏‎‏‏‏‏‎‏‏‎‏‎‏‎‏‎‏‏‎‏‎‎‏‎‏‏‎‏‎‎‏‏‏‎‏‎‏‎‎‎‏‏‏‎‏‎‏‎‏‏‏‎Use system certificates‎‏‎‎‏‎"</string>
+    <string name="wifi_do_not_provide_eap_user_cert" msgid="5160499244977160665">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‎‏‏‏‏‎‎‏‏‏‎‏‏‏‎‎‎‏‏‎‏‎‏‏‏‎‎‎‏‏‎‎‏‎‎‎‏‎‎‎‏‎‎‏‎‎‎‎‎‎‎‏‏‏‎‏‏‎‎‏‎Do not provide‎‏‎‎‏‎"</string>
+    <string name="wifi_do_not_validate_eap_server" msgid="4266754430576348471">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‏‎‏‏‎‎‏‏‎‏‏‎‏‎‎‎‏‏‏‎‏‎‎‎‏‏‎‎‎‏‏‎‎‎‏‎‎‏‎‏‎‎‏‏‏‏‎‎‏‏‎‏‎‎‏‏‎‏‏‏‎Do not validate‎‏‎‎‏‎"</string>
+    <string name="wifi_do_not_validate_eap_server_warning" msgid="1787190245542586660">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‏‎‎‎‏‏‎‎‏‏‎‏‎‏‏‎‎‎‎‎‎‎‎‎‏‏‏‏‎‎‏‏‎‎‏‏‏‎‎‏‏‎‏‏‏‏‏‎‏‎‎‏‎‎‏‎‎‏‎‎‎No certificate specified. Your connection will not be private.‎‏‎‎‏‎"</string>
+    <string name="wifi_ssid_too_long" msgid="3474753269579895244">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‎‎‎‎‎‎‏‏‏‎‎‎‏‏‎‎‏‏‎‏‏‎‏‏‎‎‎‎‎‏‎‎‏‎‏‏‎‏‏‎‏‏‏‏‏‏‎‏‎‎‎‏‏‏‎‎‏‏‎‎‎Network name is too long.‎‏‎‎‏‎"</string>
+    <string name="wifi_no_domain_warning" msgid="5223011964091727376">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‏‎‎‎‎‏‏‏‏‎‏‏‏‏‎‏‏‏‎‏‏‎‏‏‎‏‎‏‎‏‏‎‏‎‎‏‎‏‎‎‏‏‎‏‎‏‏‏‏‏‏‎‎‎‎‏‎‎‎‎‎Must specify a domain.‎‏‎‎‏‎"</string>
+    <string name="wifi_wps_available_first_item" msgid="4422547079984583502">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‏‏‎‏‎‏‏‎‎‎‎‎‎‎‎‎‏‎‏‏‎‎‏‎‎‎‏‏‎‎‏‏‏‎‎‎‏‏‏‎‏‏‎‎‎‎‎‏‎‎‏‏‎‏‎‎‏‏‏‎‎WPS available‎‏‎‎‏‎"</string>
+    <string name="wifi_wps_available_second_item" msgid="8427520131718215301">" ‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‎‏‎‎‏‏‏‏‎‏‎‎‏‎‎‏‎‎‎‎‏‏‏‎‏‎‎‎‏‎‏‎‏‏‎‎‏‎‎‎‎‏‎‎‎‏‏‏‎‏‏‎‏‎‎‎‎‏‎‏‎ (WPS available)‎‏‎‎‏‎"</string>
+    <string name="wifi_wps_nfc_enter_password" msgid="2288214226916117159">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‏‏‏‏‏‏‎‎‎‎‎‏‎‏‎‏‏‏‏‎‏‎‏‏‎‏‏‏‎‏‎‎‎‏‎‏‎‏‎‏‎‏‎‎‏‎‎‎‏‎‏‎‏‎‏‎‎‏‏‏‎Enter your network password‎‏‎‎‏‎"</string>
+    <string name="wifi_carrier_connect" msgid="8174696557882299911">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‎‎‎‏‎‏‏‏‎‎‏‎‎‏‎‏‏‎‏‏‎‎‏‏‎‏‎‏‎‎‏‏‏‏‏‏‎‎‏‎‏‏‏‎‏‏‎‏‎‏‏‎‎‎‎‎‎‏‏‏‎Carrier Wi‑Fi network‎‏‎‎‏‎"</string>
+    <string name="wifi_carrier_content" msgid="4634077285415851933">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‎‎‎‎‎‏‎‎‏‏‏‏‏‎‎‎‏‏‎‎‏‎‏‏‏‏‎‏‎‎‎‏‏‎‏‎‏‏‏‎‏‎‏‏‎‎‎‏‎‏‏‏‏‎‎‏‏‏‎‏‎Connect via ‎‏‎‎‏‏‎<xliff:g id="NAME">%1%s</xliff:g>‎‏‎‎‏‏‏‎‎‏‎‎‏‎"</string>
+    <string name="wifi_scan_always_turnon_message" msgid="203123538572122989">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‎‏‎‏‎‏‏‎‏‎‎‎‏‏‎‏‎‎‎‏‏‏‏‎‎‏‎‎‎‎‎‏‏‏‎‏‎‎‎‎‏‏‏‎‎‏‎‎‏‏‎‏‏‎‏‏‎‏‏‎‏‎To improve location accuracy and for other purposes, ‎‏‎‎‏‏‎<xliff:g id="APP_NAME">%1$s</xliff:g>‎‏‎‎‏‏‏‎ wants to turn on network scanning, even when Wi-Fi is off.‎‏‎‎‏‏‎\n‎‏‎‎‏‏‏‎‎‏‎‎‏‏‎\n‎‏‎‎‏‏‏‎Allow this for all apps that want to scan?‎‏‎‎‏‎"</string>
+    <string name="wifi_scan_always_turnoff_message" msgid="5538901671131941043">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‏‏‎‎‏‏‎‏‏‏‏‎‎‎‏‎‎‎‎‏‏‎‏‏‏‎‎‏‎‎‏‏‏‎‎‏‏‎‏‎‎‎‏‏‎‎‎‎‏‎‎‎‏‎‏‏‎‎‏‏‎To turn this off, go to Advanced in the overflow menu.‎‏‎‎‏‎"</string>
+    <string name="wifi_scan_always_confirm_allow" msgid="5355973075896817232">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‏‎‏‎‎‏‎‏‎‏‎‎‎‎‏‏‏‏‎‏‎‎‏‎‎‎‏‎‏‎‏‎‎‏‏‏‎‏‏‎‎‎‏‎‏‏‎‏‎‏‏‎‎‏‎‏‎‎‎‎‎Allow‎‏‎‎‏‎"</string>
+    <string name="wifi_scan_always_confirm_deny" msgid="4463982053823520710">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‏‏‎‏‏‏‏‏‎‎‏‏‎‏‎‎‎‎‎‎‎‎‎‎‎‏‏‎‏‏‎‏‏‎‎‏‏‏‎‏‏‏‏‎‏‎‎‏‏‏‏‏‏‏‎‎‎‏‏‎‎Deny‎‏‎‎‏‎"</string>
+    <string name="wifi_hotspot_title" msgid="7726205804813286950">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‏‎‏‏‎‎‏‏‏‎‎‎‏‏‏‏‏‏‏‏‎‎‏‏‏‏‏‎‏‎‎‎‏‎‎‏‎‏‏‏‎‏‎‎‏‏‏‏‏‏‏‎‎‎‏‎‎‏‏‎‎Sign in to connect?‎‏‎‎‏‎"</string>
+    <string name="wifi_hotspot_message" msgid="3673833421453455747">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‎‎‏‎‏‏‏‏‏‏‎‎‎‎‎‏‎‏‎‎‎‎‎‎‏‎‎‎‎‎‏‏‎‎‎‏‏‎‏‏‎‎‎‎‏‏‏‏‎‎‎‏‏‎‎‎‎‎‏‏‎‎‏‎‎‏‏‎<xliff:g id="APP_NAME">%1$s</xliff:g>‎‏‎‎‏‏‏‎ requires you to sign in online before you connect to the network.‎‏‎‎‏‎"</string>
+    <string name="wifi_hotspot_connect" msgid="5065506390164939225">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‎‏‏‎‎‏‎‎‏‏‎‎‎‏‎‎‏‎‏‏‎‎‏‏‏‎‎‏‎‏‎‎‎‎‎‏‎‏‎‎‎‎‎‎‏‎‏‎‎‎‎‏‏‏‎‏‏‎‎‏‎CONNECT‎‏‎‎‏‎"</string>
+    <string name="no_internet_access_text" msgid="7133561752896706392">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‎‎‎‎‎‎‎‏‎‎‏‏‏‏‎‎‏‏‏‏‎‎‎‏‎‏‏‏‎‎‎‏‎‎‏‎‏‏‏‎‏‎‏‏‎‎‎‎This network has no Internet access. Stay connected?‎‏‎‎‏‎"</string>
+    <string name="no_internet_access_remember" msgid="4697314331614625075">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‎‎‎‏‎‎‏‏‎‎‎‎‎‎‏‏‎‏‏‎‎‏‏‏‏‏‏‏‎‏‎‎‎‏‏‎‎‎‏‏‏‏‎‏‏‎‏‏‏‏‎‏‎‎‏‏‎‎‏‏‎Don’t ask again for this network‎‏‎‎‏‎"</string>
+    <string name="lost_internet_access_title" msgid="6228530645663584505">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‎‏‏‎‎‏‏‏‎‎‎‎‎‎‏‎‏‏‏‏‏‎‎‏‏‏‏‏‎‎‏‏‏‏‏‏‎‏‏‎‏‎‎‏‏‎‎‏‎‎‎‎‏‏‏‏‏‎‎‏‎Wi‑Fi is not connected to the Internet‎‏‎‎‏‎"</string>
+    <string name="lost_internet_access_text" msgid="9029649339816197345">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‏‏‎‏‎‏‎‎‏‏‏‏‏‏‎‎‎‎‏‎‎‎‏‏‏‎‏‏‏‏‎‎‎‎‏‎‎‎‎‏‎‏‎‏‏‎‏‏‏‏‎‎‏‏‏‎‎‎‎‏‎You can switch to the mobile network whenever Wi‑Fi has a bad connection. Data usage charges may apply.‎‏‎‎‏‎"</string>
+    <string name="lost_internet_access_switch" msgid="2262459569601190039">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‏‏‏‏‎‏‏‎‎‏‎‏‏‏‎‏‏‏‏‎‏‏‏‏‏‏‎‏‏‏‎‏‎‏‎‎‏‏‎‎‎‎‏‏‎‎‎‏‏‎‎‎‏‎‎‏‎‏‏‏‎Switch to mobile‎‏‎‎‏‎"</string>
+    <string name="lost_internet_access_cancel" msgid="338273139419871110">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‎‏‏‏‎‎‏‎‏‏‎‎‎‏‏‏‎‎‏‎‎‏‏‎‏‎‎‎‎‎‏‏‎‎‏‎‎‎‎‎‏‎‏‏‎‏‎‏‏‏‎‏‏‏‏‎‎‎‎‏‏‎‎Stay on Wi‑Fi‎‏‎‎‏‎"</string>
+    <string name="lost_internet_access_persist" msgid="7634876061262676255">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‏‎‎‏‏‏‏‏‎‏‎‎‏‎‎‎‎‏‏‏‎‏‎‏‎‎‏‏‏‎‎‎‏‏‏‏‏‎‏‏‎‎‏‎‎‎‎‎‎‎‎‏‎‎‎‏‏‏‏‏‎Never show again‎‏‎‎‏‎"</string>
+    <string name="wifi_connect" msgid="1076622875777072845">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‎‏‏‏‎‏‏‏‏‎‎‎‎‏‏‏‎‏‏‏‎‏‏‎‎‏‏‎‏‎‎‏‎‎‎‏‏‏‏‎‎‎‎‎‎‎‏‏‏‏‏‏‎‏‏‎‎‏‏‎‏‎Connect‎‏‎‎‏‎"</string>
+    <string name="wifi_failed_connect_message" msgid="8491902558970292871">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‎‏‎‏‏‏‎‏‏‎‎‏‎‏‎‎‏‏‎‎‎‏‏‎‎‎‏‎‏‎‏‎‎‏‏‎‏‎‏‎‎‏‏‏‏‎‏‎‏‎‏‎‏‎‎‎‎‏‏‏‎Failed to connect to network‎‏‎‎‏‎"</string>
+    <string name="wifi_forget" msgid="8168174695608386644">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‎‎‎‏‎‏‎‏‏‎‏‏‎‎‏‎‏‏‏‏‏‎‎‏‏‎‏‏‏‏‎‏‏‎‏‏‎‎‎‏‎‎‏‎‏‎‎‎‎‏‎‎‎‏‎‏‎‏‎‎‎Forget‎‏‎‎‏‎"</string>
+    <string name="wifi_modify" msgid="6100248070440710782">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‎‏‎‎‏‎‏‎‏‎‎‎‎‏‏‎‏‏‏‏‎‏‎‎‏‏‎‎‏‎‏‏‎‎‎‎‎‏‏‎‎‎‎‏‎‏‏‏‎‎‏‎‎‏‏‏‏‏‏‎‎Modify‎‏‎‎‏‎"</string>
+    <string name="wifi_failed_forget_message" msgid="1348172929201654986">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‎‎‏‎‏‎‏‏‎‏‎‏‏‎‏‎‏‏‎‎‎‎‏‎‎‎‏‎‏‏‎‏‏‏‎‎‏‏‎‏‏‏‎‎‏‏‎‎‏‏‎‎‏‏‎‎‏‎‏‎‎Failed to forget network‎‏‎‎‏‎"</string>
+    <string name="wifi_save" msgid="3331121567988522826">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‏‏‏‎‎‎‏‏‏‎‏‎‏‎‎‎‎‏‎‏‎‏‏‎‏‎‏‎‏‏‎‎‎‎‏‏‏‎‎‏‏‎‎‏‎‎‎‏‏‏‏‏‎‏‎‎‏‎‏‎‎Save‎‏‎‎‏‎"</string>
+    <string name="wifi_failed_save_message" msgid="6650004874143815692">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‏‏‎‎‎‏‎‎‏‎‎‏‏‎‎‏‎‎‎‎‎‎‏‏‎‎‏‏‎‎‏‎‎‏‎‏‏‏‏‏‎‏‎‏‎‏‎‏‏‎‎‎‎‎‎‎‏‏‎‎‎Failed to save network‎‏‎‎‏‎"</string>
+    <string name="wifi_cancel" msgid="6763568902542968964">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‏‏‎‏‏‏‎‏‏‏‎‏‎‎‎‎‎‏‏‎‎‎‎‏‎‏‎‎‏‏‏‏‏‎‎‏‏‏‏‏‎‎‏‏‏‏‎‎‏‎‎‎‏‎‎‎‎‏‎‎‎Cancel‎‏‎‎‏‎"</string>
+    <string name="wifi_saved_access_points_titlebar" msgid="2996149477240134064">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‏‎‎‏‏‎‎‏‎‏‎‎‎‏‏‏‎‏‏‎‎‎‎‏‎‎‏‏‎‏‎‎‎‏‎‎‏‏‎‏‏‏‏‎‏‏‎‏‏‎‎‏‏‎‏‏‎‎‎‎‎Saved networks‎‏‎‎‏‎"</string>
+    <plurals name="wifi_saved_access_points_summary" formatted="false" msgid="6094679048871529675">
+      <item quantity="other">‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‎‏‎‎‏‎‎‏‎‏‎‎‏‎‏‎‎‏‏‎‎‏‎‎‏‏‎‏‏‏‎‏‎‎‎‎‎‎‎‎‎‎‎‎‏‏‎‎‏‏‎‎‏‏‎‎‏‎‏‏‎%d networks‎‏‎‎‏‎</item>
+      <item quantity="one">‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‎‏‎‎‏‎‎‏‎‏‎‎‏‎‏‎‎‏‏‎‎‏‎‎‏‏‎‏‏‏‎‏‎‎‎‎‎‎‎‎‎‎‎‎‏‏‎‎‏‏‎‎‏‏‎‎‏‎‏‏‎1 network‎‏‎‎‏‎</item>
+    </plurals>
+    <string name="wifi_advanced_titlebar" msgid="4485841401774142908">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‏‏‏‎‎‏‎‎‎‎‎‎‏‏‏‎‏‎‎‎‏‏‏‏‏‏‎‎‏‏‏‎‎‏‏‏‎‏‏‏‏‏‎‎‏‏‏‏‎‏‎‏‏‎‏‏‏‏‎‎‎Advanced 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_title" msgid="3471132676909349382">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‎‎‎‎‎‎‏‎‏‎‏‏‏‏‏‏‎‎‎‎‏‏‎‎‎‏‏‏‎‏‎‏‏‏‏‏‎‏‏‎‏‏‏‎‏‎‏‏‏‎‏‎‎‎‎‎‎‏‏‎‎Network info‎‏‎‎‏‎"</string>
+    <string name="wifi_details_subnet_mask" msgid="6720279144174924410">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‏‏‎‏‎‏‎‎‎‎‏‏‎‎‏‏‏‎‏‎‎‏‎‎‎‏‏‎‏‎‏‎‏‏‎‎‎‎‎‎‎‎‏‏‎‎‏‏‎‎‏‎‎‏‏‏‏‎‏‎‎Subnet mask‎‏‎‎‏‎"</string>
+    <string name="wifi_details_dns" msgid="8648826607751830768">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‏‎‎‎‎‎‎‎‎‏‏‎‏‏‎‎‏‏‎‏‏‏‏‏‏‎‎‏‏‏‏‎‏‏‏‎‏‏‏‏‏‏‏‎‏‎‎‏‏‏‎‎‏‏‏‏‎‎‎‎‎DNS‎‏‎‎‏‎"</string>
+    <string name="wifi_details_ipv6_address_header" msgid="6734119149106422148">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‏‏‎‏‎‏‏‏‎‏‎‎‎‏‏‎‎‏‎‏‏‎‏‎‏‏‏‏‏‏‏‎‏‏‎‏‏‎‏‎‎‏‎‎‏‏‏‎‎‎‎‏‏‎‎‎‎‏‎‎‎IPv6 addresses‎‏‎‎‏‎"</string>
+    <string name="wifi_saved_access_points_label" msgid="2013409399392285262">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‏‎‏‏‏‏‏‏‎‎‎‏‎‎‎‏‎‎‎‏‎‎‏‎‏‏‏‎‎‏‏‎‎‏‏‎‎‎‏‏‎‏‎‏‏‎‏‏‎‎‏‎‎‏‎‎‏‏‏‎‎Saved networks‎‏‎‎‏‎"</string>
+    <string name="wifi_advanced_settings_label" msgid="3654366894867838338">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‎‎‏‎‏‎‏‏‎‏‏‎‏‏‏‎‏‎‏‏‎‏‎‏‎‏‎‎‎‏‎‎‎‏‏‏‏‎‎‎‏‎‏‏‎‏‏‏‎‏‎‏‏‎‎‎‎‎‏‎‎IP settings‎‏‎‎‏‎"</string>
+    <string name="wifi_advanced_not_available" msgid="5823045095444154586">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‎‎‎‎‏‏‎‎‏‏‏‏‏‎‎‏‏‏‎‎‏‎‏‎‏‎‎‏‏‎‎‏‏‎‎‏‎‎‎‎‎‏‏‏‏‎‎‎‏‎‎‎‏‏‎‏‏‎‏‎‎Wi‑Fi advanced settings are not available for this user‎‏‎‎‏‎"</string>
+    <string name="wifi_ip_settings_menu_save" msgid="7296724066102908366">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‎‏‎‏‎‏‎‎‎‎‏‏‎‎‏‎‏‎‏‏‏‏‏‎‎‎‎‎‏‏‏‎‎‎‎‎‎‎‎‏‏‎‏‏‏‎‎‏‎‏‎‏‏‏‎‎‏‏‏‎‎Save‎‏‎‎‏‎"</string>
+    <string name="wifi_ip_settings_menu_cancel" msgid="6582567330136502340">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‏‎‏‏‎‏‎‏‏‎‎‏‏‏‏‏‏‎‏‎‎‎‎‏‏‏‎‎‎‏‎‏‏‏‏‎‏‏‏‎‎‎‎‎‏‎‏‏‎‎‎‎‎‏‎‎‎‏‎‎‎Cancel‎‏‎‎‏‎"</string>
+    <string name="wifi_ip_settings_invalid_ip_address" msgid="2513142355364274970">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‏‏‏‎‎‏‏‎‏‎‏‎‎‎‎‎‏‏‎‎‎‏‎‏‏‏‏‎‎‏‏‏‏‎‎‎‏‏‎‎‎‏‏‎‏‎‎Type a valid IP address.‎‏‎‎‏‎"</string>
+    <string name="wifi_ip_settings_invalid_gateway" msgid="8164264988361096450">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‎‎‎‏‎‏‎‎‏‏‎‏‎‏‎‎‏‎‏‏‏‏‎‎‎‎‎‎‎‎‏‏‎‎‏‏‎‏‏‎‏‎‏‏‏‏‏‏‏‏‎‏‎‎‎‎‎‎‏‎‎Type a valid gateway address.‎‏‎‎‏‎"</string>
+    <string name="wifi_ip_settings_invalid_dns" msgid="8744583948328391047">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‏‎‎‏‎‏‎‏‏‎‏‏‎‎‎‎‎‎‎‎‏‏‎‎‎‏‎‏‎‎‏‎‏‏‎‎‏‎‏‏‎‎‏‎‎‏‎‏‎‎‎‏‏‎‎‎‎‏‏‏‎Type a valid DNS address.‎‏‎‎‏‎"</string>
+    <string name="wifi_ip_settings_invalid_network_prefix_length" msgid="40470058023181052">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‎‎‎‏‎‎‎‏‏‏‏‏‏‎‎‎‏‏‏‎‏‎‎‏‏‎‏‏‎‏‎‏‎‎‎‏‎‎‎‎‎‏‎‏‏‎‏‏‎‏‎‏‏‏‏‏‏‎‎‎Type a network prefix length between 0 and 32.‎‏‎‎‏‎"</string>
+    <string name="wifi_dns1" msgid="7344118050720080045">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‎‏‎‏‏‏‏‎‏‎‏‏‏‎‎‎‏‏‎‎‎‏‏‏‎‏‎‎‏‏‎‏‎‎‎‏‏‎‏‏‎‏‎‎‎‏‏‎‎‎‎‎‏‎‏‎‏‏‎‏‎DNS 1‎‏‎‎‏‎"</string>
+    <string name="wifi_dns2" msgid="1368601006824882659">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‎‎‏‎‏‏‏‏‏‏‏‎‎‎‏‏‏‏‏‏‎‏‎‏‏‏‎‏‎‏‎‏‎‎‏‏‎‎‎‎‏‎‏‎‎‎‎‎‎‎‎‏‏‏‏‎‎‎‏‏‎DNS 2‎‏‎‎‏‎"</string>
+    <string name="wifi_gateway" msgid="163914742461092086">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‎‏‎‏‎‎‏‎‎‎‏‏‎‎‏‎‏‎‏‏‏‏‎‎‏‎‏‏‎‏‏‏‏‏‏‎‏‏‏‎‏‎‏‏‏‏‏‎‏‎‎‎‎‏‏‏‏‎‏‏‎‎Gateway‎‏‎‎‏‎"</string>
+    <string name="wifi_network_prefix_length" msgid="3028785234245085998">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‏‎‏‎‎‎‎‎‏‎‎‎‎‏‏‎‏‎‎‎‎‎‎‏‏‏‏‏‏‎‎‏‎‏‎‎‎‎‏‎‎‎‎‎‎‏‏‎‏‎‏‏‎‎‏‎‏‏‏‎‎Network prefix length‎‏‎‎‏‎"</string>
+    <string name="wifi_p2p_settings_title" msgid="5444461191435291082">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‏‎‏‏‏‎‎‎‏‏‏‎‏‎‎‏‏‏‎‎‏‎‎‏‏‎‏‏‏‎‎‎‏‏‎‎‏‏‏‎‎‏‏‎‏‎‎‎‏‎‎‏‏‏‎‎‏‎‏‎‎Wi‑Fi Direct‎‏‎‎‏‎"</string>
+    <string name="wifi_p2p_device_info" msgid="3191876744469364173">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‏‏‎‎‎‏‎‎‏‎‏‏‏‏‎‏‎‎‏‎‏‏‏‏‏‏‎‎‏‏‏‎‎‎‎‎‏‏‏‎‏‏‎‏‎‎‏‏‏‏‎‏‏‏‎‎‏‏‎‏‎Device information‎‏‎‎‏‎"</string>
+    <string name="wifi_p2p_persist_network" msgid="1646424791818168590">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‎‏‏‎‏‏‎‏‏‎‎‏‎‏‎‎‎‏‏‎‏‎‏‎‎‎‎‎‎‎‎‎‎‎‎‏‏‎‏‏‎‏‏‏‏‏‏‎‏‎‎‏‎‎‎‎‏‏‏‎‎Remember this connection‎‏‎‎‏‎"</string>
+    <string name="wifi_p2p_menu_search" msgid="3436429984738771974">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‏‏‏‏‏‎‏‏‎‎‎‎‏‎‏‎‎‏‏‎‏‏‎‏‏‏‎‏‎‎‏‏‎‏‏‏‏‏‎‏‏‎‏‏‎‎‎‎‎‏‎‎‎‎‎‎‎‏‏‎‎Search for devices‎‏‎‎‏‎"</string>
+    <string name="wifi_p2p_menu_searching" msgid="2396704492143633876">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‎‎‎‏‎‏‎‎‎‎‏‎‏‏‎‎‏‏‏‎‎‎‎‎‏‎‎‏‏‎‎‎‏‏‎‏‏‏‎‎‏‏‎‏‏‏‏‎‎‏‎‏‏‏‎‏‎‏‎‎‎Searching…‎‏‎‎‏‎"</string>
+    <string name="wifi_p2p_menu_rename" msgid="8448896306960060415">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‎‏‎‏‎‏‎‎‎‎‎‎‏‎‎‎‎‎‏‎‎‏‏‎‏‏‎‏‎‏‎‏‎‎‎‎‎‏‏‏‎‏‏‎‏‏‎‎‏‏‏‏‏‏‏‏‏‏‏‏‎Rename device‎‏‎‎‏‎"</string>
+    <string name="wifi_p2p_peer_devices" msgid="299526878463303432">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‎‏‏‏‎‎‎‎‏‎‏‎‎‎‎‎‏‎‎‎‏‎‎‎‎‏‏‎‏‏‏‏‏‎‎‏‏‏‎‏‏‏‏‏‎‎‏‎‎‏‏‏‏‏‎‎‎‎‏‎‎‎‎Peer devices‎‏‎‎‏‎"</string>
+    <string name="wifi_p2p_remembered_groups" msgid="3847022927914068230">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‎‏‎‏‎‏‏‎‎‎‏‏‎‏‎‏‏‏‏‎‏‏‏‏‏‎‎‎‎‏‏‏‎‏‎‏‎‎‎‏‏‎‎‏‏‏‏‎‏‎‎‏‎‎‎‎‎‏‏‎‎Remembered groups‎‏‎‎‏‎"</string>
+    <string name="wifi_p2p_failed_connect_message" msgid="8491862096448192157">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‎‏‎‏‏‏‎‏‏‎‎‏‎‎‏‎‎‏‏‏‏‎‎‏‎‏‎‏‏‎‏‏‏‏‎‎‎‏‏‎‎‏‎‏‏‏‏‏‏‏‏‎‏‎‎‏‏‏‎‏‎Couldn’t connect.‎‏‎‎‏‎"</string>
+    <string name="wifi_p2p_failed_rename_message" msgid="2562182284946936380">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‎‎‏‏‏‎‎‎‏‏‏‎‏‎‏‏‎‎‏‏‎‎‏‏‎‏‏‎‏‎‎‏‎‎‎‎‎‎‎‎‏‏‏‏‏‎‎‏‎‎‏‎‎‎‏‏‏‏‎‎‎Failed to rename device.‎‏‎‎‏‎"</string>
+    <string name="wifi_p2p_disconnect_title" msgid="3216846049677448420">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‏‏‎‎‏‎‏‎‎‏‎‎‏‎‎‎‏‎‎‎‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‎‎‏‎‎‏‎‎‏‎‎‏‎‏‎‎‏‏‏‎‎‏‎‎‎Disconnect?‎‏‎‎‏‎"</string>
+    <string name="wifi_p2p_disconnect_message" msgid="8227342771610125771">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‎‎‏‎‎‎‏‎‏‏‎‏‎‏‏‎‎‏‎‎‏‎‏‎‏‎‎‏‎‎‎‏‎‎‏‏‎‎‏‏‎‎‏‏‎‎‎‎‎‏‎‏‏‏‎‎‏‎‏‏‎If you disconnect, your connection with ‎‏‎‎‏‏‎<xliff:g id="PEER_NAME">%1$s</xliff:g>‎‏‎‎‏‏‏‎ will end.‎‏‎‎‏‎"</string>
+    <string name="wifi_p2p_disconnect_multiple_message" msgid="3283805371034883105">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‏‏‎‏‏‎‎‏‎‎‏‎‎‏‏‎‏‎‏‏‏‎‎‏‎‏‏‎‎‎‏‎‏‏‎‎‎‎‎‎‏‏‎‏‏‏‎‏‎‏‎‎‎‎‏‎‎‎‎‏‎If you disconnect, your connection with ‎‏‎‎‏‏‎<xliff:g id="PEER_NAME">%1$s</xliff:g>‎‏‎‎‏‏‏‎ and ‎‏‎‎‏‏‎<xliff:g id="PEER_COUNT">%2$s</xliff:g>‎‏‎‎‏‏‏‎ other devices will end.‎‏‎‎‏‎"</string>
+    <string name="wifi_p2p_cancel_connect_title" msgid="255267538099324413">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‎‏‎‏‏‏‎‎‎‏‎‏‎‏‏‏‎‎‏‎‎‎‏‏‏‏‎‎‏‎‎‏‏‎‎‏‏‎‎‎‏‏‎‎‏‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‎Cancel invitation?‎‏‎‎‏‎"</string>
+    <string name="wifi_p2p_cancel_connect_message" msgid="7477756213423749402">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‎‏‏‏‏‏‎‎‎‏‏‎‎‏‎‏‎‎‏‏‏‎‏‎‏‎‎‎‎‏‎‎‎‎‏‎‎‎‎‏‎‏‏‏‏‎‏‏‏‎‎‏‎‎‎‏‏‎‏‎‎Do you want to cancel invitation to connect with ‎‏‎‎‏‏‎<xliff:g id="PEER_NAME">%1$s</xliff:g>‎‏‎‎‏‏‏‎?‎‏‎‎‏‎"</string>
+    <string name="wifi_p2p_delete_group_message" msgid="834559380069647086">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‎‏‎‏‏‏‎‎‏‎‏‎‎‏‏‏‏‎‎‏‏‎‏‎‏‎‏‎‏‏‎‏‎‎‎‎‏‎‎‎‎‎‏‎‏‏‎‎‎‎‎‏‎‏‏‏‎‏‏‏‎‎Forget this group?‎‏‎‎‏‎"</string>
+    <string name="wifi_hotspot_checkbox_text" msgid="7763495093333664887">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‏‎‏‏‏‎‏‏‏‏‎‏‎‏‏‏‏‎‎‏‏‎‏‎‎‏‏‏‏‎‎‏‎‏‎‏‏‎‏‎‎‏‎‎‎‎‏‎‎‏‎‎‎‏‏‏‎‏‏‏‎Wi‑Fi hotspot‎‏‎‎‏‎"</string>
+    <string name="wifi_hotspot_off_subtext" msgid="5466126533609394170">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‏‎‏‏‏‏‎‏‏‎‏‏‏‎‎‏‎‏‎‏‎‎‎‏‏‏‏‏‎‎‎‏‏‏‎‏‎‎‏‎‎‎‎‎‎‎‎‎‏‏‏‏‏‏‏‏‏‎‏‎‎Not sharing Internet or content with other devices‎‏‎‎‏‎"</string>
+    <string name="wifi_hotspot_tethering_on_subtext" product="tablet" msgid="5752490509369962007">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‏‏‏‏‏‏‎‏‎‏‎‎‏‏‏‏‎‎‏‏‏‎‏‎‎‎‏‏‏‏‏‎‏‎‎‎‏‏‎‎‏‏‎‏‎‏‏‎‏‏‏‎‎‎‎‏‎‏‏‏‎Sharing this tablet’s Internet connection via hotspot‎‏‎‎‏‎"</string>
+    <string name="wifi_hotspot_tethering_on_subtext" product="default" msgid="6461075246164300670">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‏‎‎‏‏‎‏‎‏‎‏‎‎‏‎‏‏‎‎‏‏‎‏‏‎‏‎‎‎‏‎‎‎‎‏‎‏‎‏‏‎‎‎‏‎‏‎‏‎‎‏‏‎‏‏‏‏‏‏‎‎Sharing this phone’s Internet connection via hotspot‎‏‎‎‏‎"</string>
+    <string name="wifi_hotspot_on_local_only_subtext" msgid="2068110388011294735">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‏‏‎‎‏‎‏‏‎‎‏‏‎‏‏‎‎‏‏‏‎‏‏‏‎‎‎‎‏‏‎‎‏‎‎‏‏‎‏‏‎‏‎‏‎‏‏‎‎‎‎‎‎‎‎‎‏‏‏‏‎App is sharing content. To share Internet connection, turn hotspot off, then on‎‏‎‎‏‎"</string>
+    <string name="wifi_hotspot_name_title" msgid="8237000746618636778">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‎‎‏‎‎‏‎‎‏‏‏‏‏‎‏‏‎‏‎‎‏‎‎‎‏‎‎‏‏‎‎‏‏‏‎‎‏‏‎‏‎‏‎‎‏‏‎‎‏‎‎‏‏‏‏‎‏‎‏‎‎Hotspot name‎‏‎‎‏‎"</string>
+    <string name="wifi_hotspot_name_summary_connecting" msgid="3378299995508671967">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‏‏‏‎‏‏‏‎‎‎‏‎‎‎‏‎‎‎‎‏‏‏‏‏‎‎‏‎‎‏‏‎‏‎‎‎‏‏‏‏‏‏‏‏‏‎‎‎‎‏‎‏‏‏‎‏‏‏‏‏‎Turning on ‎‏‎‎‏‏‎<xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>‎‏‎‎‏‏‏‎...‎‏‎‎‏‎"</string>
+    <string name="wifi_hotspot_name_summary_connected" msgid="3888672084861445362">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‎‏‎‏‏‏‏‏‎‏‏‏‎‏‎‏‎‏‏‎‏‎‏‎‏‎‎‎‎‏‏‏‏‎‏‎‎‎‏‎‎‏‎‎‏‏‏‎‎‏‎‎‏‏‏‏‎‎‏‎‎Other devices can connect to ‎‏‎‎‏‏‎<xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>‎‏‎‎‏‏‏‎‎‏‎‎‏‎"</string>
+    <string name="wifi_hotspot_password_title" msgid="8676859981917573801">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‏‎‎‎‎‏‏‎‏‎‏‎‎‏‏‎‎‏‏‎‎‎‏‎‏‏‏‎‎‏‏‏‏‎‏‏‏‏‏‏‏‏‏‏‏‏‎‏‎‎‏‎‏‎‏‎‏‎‎‏‎Hotspot password‎‏‎‎‏‎"</string>
+    <string name="wifi_hotspot_ap_band_title" msgid="1165801173359290681">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‎‎‎‎‎‎‏‎‏‏‎‏‏‏‎‎‎‎‎‏‏‏‏‏‏‏‎‏‏‎‎‏‎‎‎‎‏‏‎‏‎‎‎‎‎‏‏‎‏‎‎‏‎‎‏‏‏‎‎‏‎AP Band‎‏‎‎‏‎"</string>
+    <string name="wifi_hotspot_footer_info_regular" msgid="1203489406068036455">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‎‎‎‎‏‎‏‏‎‎‏‏‏‎‏‎‎‏‏‏‎‎‏‏‏‏‎‏‎‎‎‎‏‎‏‏‏‎‏‎‎‎‎‏‏‎‎‏‎‎‏‏‎‏‏‎‎‏‏‏‎Use hotspot to create a Wi‑Fi network for your other devices. Hotspot provides Internet using your mobile data connection. Additional mobile data charges may apply.‎‏‎‎‏‎"</string>
+    <string name="wifi_hotspot_footer_info_local_only" msgid="857988412470694109">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‎‏‎‏‏‏‏‏‎‏‎‎‎‎‎‏‎‏‏‏‏‏‏‏‎‏‎‏‎‎‏‎‏‎‎‏‎‏‎‏‏‎‏‏‏‏‎‎‏‎‎‎‎‏‏‎‏‏‏‎‏‎Apps can create a hotspot to share content with nearby devices.‎‏‎‎‏‎"</string>
+    <string name="wifi_tether_starting" msgid="1322237938998639724">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‎‎‏‎‎‏‎‏‏‎‎‏‏‎‎‎‏‎‎‎‎‏‏‎‎‏‏‎‎‏‏‎‎‏‏‎‏‎‎‎‏‏‏‎‏‏‏‏‏‏‎‎‎‏‏‎‏‏‎‎‎Turning hotspot on…‎‏‎‎‏‎"</string>
+    <string name="wifi_tether_stopping" msgid="4835852171686388107">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‎‎‏‏‎‎‎‏‏‏‎‎‎‏‏‎‎‏‎‏‏‏‏‎‏‏‎‏‏‎‏‏‏‏‏‏‏‎‏‎‏‎‏‏‎‎‏‎‎‎‎‏‏‎‎‎‏‎‏‏‎Turning off hotspot…‎‏‎‎‏‎"</string>
+    <string name="wifi_tether_enabled_subtext" msgid="7842111748046063857">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‏‏‎‎‏‏‎‏‎‏‎‎‏‏‎‎‎‏‏‏‎‎‎‏‎‏‎‏‏‏‏‎‎‏‏‏‎‎‏‏‎‏‎‎‎‎‎‎‏‎‎‎‏‏‏‏‎‎‎‏‎‎‏‎‎‏‏‎<xliff:g id="NETWORK_SSID">%1$s</xliff:g>‎‏‎‎‏‏‏‎ is active‎‏‎‎‏‎"</string>
+    <string name="wifi_tether_failed_subtext" msgid="1484941858530919002">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‎‏‎‎‏‎‎‏‏‎‏‏‏‎‎‏‎‎‏‎‏‏‎‎‎‎‎‎‏‎‏‏‎‏‎‏‏‏‎‏‏‎‎‎‎‎‎‎‎‎‏‎‎‏‎‏‏‎‏‎‎Portable Wi‑Fi hotspot error‎‏‎‎‏‎"</string>
+    <string name="wifi_tether_configure_ap_text" msgid="7974681394041609308">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‏‏‏‎‏‎‏‎‏‎‏‏‏‏‎‎‎‎‏‎‎‏‏‏‏‎‎‏‏‏‏‎‏‎‎‎‏‏‎‎‎‏‎‎‎‏‎‏‏‏‎‎‎‏‎‏‏‏‎‎‎Set up Wi‑Fi hotspot‎‏‎‎‏‎"</string>
+    <string name="wifi_hotspot_configure_ap_text" msgid="5478614731464220432">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‏‏‎‎‎‎‎‎‎‏‏‏‏‏‏‏‎‎‏‏‎‎‎‏‎‎‏‎‎‏‎‎‎‎‏‎‎‎‏‎‎‏‎‏‏‎‎‏‏‏‏‏‎‎‎‏‎‎‎‎‎Wi‑Fi hotspot setup‎‏‎‎‏‎"</string>
+    <string name="wifi_hotspot_configure_ap_text_summary" msgid="5560680057727007011">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‏‏‎‏‎‎‏‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‎‎‏‏‎‎‏‏‏‏‏‏‏‎‎‏‏‎‏‎‏‎‏‎‏‏‏‎‎‏‎‎‏‎‎‎‏‏‎AndroidAP WPA2 PSK hotspot‎‏‎‎‏‎"</string>
+    <string name="wifi_tether_configure_ssid_default" msgid="8467525402622138547">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‎‏‎‏‏‎‎‎‎‎‏‎‏‎‏‏‎‎‎‏‎‏‏‏‏‏‎‏‏‎‏‎‎‏‎‏‏‏‏‎‎‎‏‏‏‎‎‏‏‎‎‎‏‎‏‏‎‎‏‏‎AndroidHotspot‎‏‎‎‏‎"</string>
+    <string name="wifi_calling_settings_title" msgid="4102921303993404577">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‏‎‎‎‏‏‏‏‎‎‎‎‏‎‎‎‎‎‎‏‎‎‏‏‎‎‎‎‎‎‎‏‎‎‎‏‏‏‏‎‏‎‎‎‏‏‎‎‏‏‎‎‏‎‏‎‎‎‎‏‎Wi-Fi calling‎‏‎‎‏‎"</string>
+    <string name="wifi_calling_suggestion_title" msgid="9008010480466359578">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‏‏‎‏‎‎‎‎‎‎‏‎‏‏‏‎‎‎‎‏‏‏‎‎‏‏‏‎‎‎‏‏‎‏‎‏‎‎‏‏‎‎‎‏‎‏‏‏‎‏‎‏‎‎‎‏‏‎‏‎‎Turn on Wi-Fi Calling‎‏‎‎‏‎"</string>
+    <string name="wifi_calling_suggestion_summary" msgid="3765923249566552233">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‎‏‎‎‎‏‎‎‎‎‏‏‎‎‏‏‏‏‏‏‎‎‏‏‏‏‏‎‎‎‏‎‎‏‎‏‏‏‎‎‏‏‎‎‏‎‎‏‎‎‎‎‏‎‏‎‏‎‎‏‎Use Wi-Fi instead of mobile network‎‏‎‎‏‎"</string>
+    <string name="wifi_calling_mode_title" msgid="2164073796253284289">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‏‏‏‎‎‎‎‎‏‎‎‎‎‏‎‏‎‏‎‏‏‎‏‎‎‏‏‎‏‏‏‎‎‏‎‏‎‏‏‎‏‎‎‎‎‏‏‏‎‏‏‏‏‏‎‎‎‎‎‏‎Calling preference‎‏‎‎‏‎"</string>
+    <string name="wifi_calling_mode_dialog_title" msgid="8149690312199253909">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‎‎‎‏‎‎‎‏‏‎‎‏‏‎‎‎‎‏‎‎‎‎‏‎‏‎‎‎‏‏‏‏‏‎‎‎‎‎‎‏‎‏‎‎‎‎‏‎‏‏‏‏‏‎‎‏‎‏‎‏‎Wi-Fi calling mode‎‏‎‎‏‎"</string>
+    <string name="wifi_calling_roaming_mode_title" msgid="1565039047187685115">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‎‏‎‏‏‎‏‏‏‎‎‎‎‎‏‎‎‎‏‎‏‎‏‏‏‎‎‎‏‎‏‏‎‎‏‏‎‎‏‏‏‏‎‎‏‏‎‏‏‏‏‎‏‏‏‏‏‎‏‏‎Roaming preference‎‏‎‎‏‎"</string>
+    <!-- no translation found for wifi_calling_roaming_mode_summary (8642014873060687717) -->
+    <skip />
+    <string name="wifi_calling_roaming_mode_dialog_title" msgid="7800926602662078576">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‏‏‎‎‎‏‎‎‎‎‏‎‎‏‏‏‎‏‎‏‎‏‏‎‏‎‎‏‏‏‏‏‏‏‏‎‏‎‎‏‎‎‎‏‎‏‏‎‏‎‎‎‎‏‏‏‎‎‎‎‎Roaming preference‎‏‎‎‏‎"</string>
+  <string-array name="wifi_calling_mode_choices">
+    <item msgid="2124257075906188844">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‏‏‎‏‎‏‏‏‏‎‏‎‏‏‏‎‎‎‎‎‏‎‎‎‏‏‏‎‎‏‎‎‎‏‎‎‏‏‏‏‏‏‏‏‏‎‎‏‎‏‏‎‎‎‏‎‏‏‎‎‎Wi-Fi preferred‎‏‎‎‏‎"</item>
+    <item msgid="1335127656328817518">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‎‎‏‎‏‎‎‎‎‏‏‏‎‏‎‏‎‎‏‏‏‎‎‎‎‏‏‏‏‎‎‏‎‏‎‏‎‏‎‎‎‏‏‏‎‏‏‎‏‎‏‏‎‏‏‎‏‏‏‎‎Mobile preferred‎‏‎‎‏‎"</item>
+    <item msgid="3132912693346866895">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‏‎‏‏‎‏‏‏‏‎‏‎‎‏‎‏‎‏‏‏‎‏‏‏‏‏‏‎‏‏‏‎‎‏‏‏‎‏‎‎‎‎‎‎‏‎‎‏‎‏‏‎‏‏‎‎‏‏‏‏‎Wi-Fi only‎‏‎‎‏‎"</item>
+  </string-array>
+  <string-array name="wifi_calling_mode_choices_v2">
+    <item msgid="742988808283756263">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‎‏‎‏‎‎‏‎‎‏‏‏‏‏‎‏‎‎‎‎‎‎‏‏‎‎‎‏‎‎‏‏‏‎‏‎‏‏‏‎‏‏‎‎‎‎‎‎‏‎‏‏‎‏‏‏‎‎‏‏‏‎Wi-Fi‎‏‎‎‏‎"</item>
+    <item msgid="7715869266611010880">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‏‎‏‏‎‎‎‏‎‏‎‎‎‏‎‎‎‏‏‎‎‎‏‏‎‏‏‏‏‎‏‏‎‎‎‏‏‎‏‏‎‎‏‏‏‏‏‏‏‏‎‏‎‏‎‎‎‎‎‎‎Mobile‎‏‎‎‏‎"</item>
+    <item msgid="2838022395783120596">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‎‏‏‏‎‏‏‎‎‎‏‎‏‎‏‎‏‏‏‎‎‏‎‏‎‏‎‏‎‎‎‏‏‏‎‏‎‏‎‎‎‎‎‏‏‎‎‎‎‏‏‎‏‏‎‏‎‏‎‎‎Wi-Fi only‎‏‎‎‏‎"</item>
+  </string-array>
+  <string-array name="wifi_calling_mode_values">
+    <item msgid="4799585830102342375">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‎‎‏‎‏‎‎‏‏‎‏‏‏‎‎‎‏‏‎‏‏‏‏‎‎‎‏‎‎‎‎‏‏‎‎‎‎‎‏‏‏‏‏‏‏‎‎‏‏‎‏‎‏‏‏‎‎‏‏‏‎2‎‏‎‎‏‎"</item>
+    <item msgid="1171822231056612021">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‎‎‎‎‎‏‎‎‎‎‏‏‎‎‏‎‎‏‏‎‎‎‎‏‏‏‎‎‎‏‎‎‏‏‏‎‎‎‎‎‏‎‎‎‏‏‏‏‏‎‏‎‏‎‏‏‎‏‎‏‎1‎‏‎‎‏‎"</item>
+    <item msgid="3194458950573886239">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‏‏‎‎‎‏‎‏‎‏‎‎‏‏‏‏‏‏‏‏‎‏‏‏‏‏‎‏‏‎‎‏‎‏‏‎‏‎‎‎‎‏‏‎‎‎‎‎‏‎‏‏‎‎‎‏‏‏‏‏‎0‎‏‎‎‏‎"</item>
+  </string-array>
+  <string-array name="wifi_calling_mode_choices_without_wifi_only">
+    <item msgid="5782108782860004851">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‎‎‎‎‎‎‏‏‏‏‏‎‎‎‏‎‏‏‎‏‎‏‎‎‏‏‎‏‏‎‎‏‎‏‏‏‎‎‎‎‏‎‎‏‎‏‏‎‏‏‎‏‏‏‏‏‎‎‏‏‎Wi-Fi preferred‎‏‎‎‏‎"</item>
+    <item msgid="5074515506087318555">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‎‏‏‎‎‏‏‎‏‏‎‎‎‏‎‎‏‏‎‎‏‏‏‏‎‏‏‏‏‎‎‎‎‎‏‏‏‎‎‎‏‎‏‏‏‏‎‏‎‏‎‎‎‎‎‏‏‎‏‏‎Mobile preferred‎‏‎‎‏‎"</item>
+  </string-array>
+  <string-array name="wifi_calling_mode_choices_v2_without_wifi_only">
+    <item msgid="6132150507201243768">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‎‏‎‏‎‎‎‏‏‎‎‏‏‏‎‎‎‏‏‎‎‏‏‎‎‏‎‏‏‎‎‏‎‎‏‎‏‏‏‏‎‏‏‎‎‎‏‎‏‎‏‎‎‏‏‏‏‎‎‎‎Wi-Fi‎‏‎‎‏‎"</item>
+    <item msgid="1118703915148755405">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‎‏‏‏‏‏‎‎‎‎‏‏‎‎‏‏‎‏‏‏‏‎‏‎‎‏‎‎‎‏‎‎‏‏‏‏‏‎‏‎‎‎‏‏‏‏‏‎‎‎‎‎‏‏‏‎‎‏‏‎‏‎Mobile‎‏‎‎‏‎"</item>
+  </string-array>
+  <string-array name="wifi_calling_mode_values_without_wifi_only">
+    <item msgid="2339246858001475047">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‎‎‎‎‎‏‏‏‎‏‏‎‏‎‏‎‏‏‎‎‏‎‎‏‏‏‏‏‏‎‎‏‏‏‎‏‎‎‏‎‎‎‎‎‎‏‏‎‎‏‎‏‏‏‏‎‎‏‏‏‎2‎‏‎‎‏‎"</item>
+    <item msgid="6200207341126893791">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‎‏‏‎‎‎‎‎‏‎‏‏‏‎‎‎‏‏‏‏‏‎‏‏‏‎‏‎‎‎‎‎‎‏‎‏‏‎‏‎‎‎‏‏‎‏‎‎‎‎‎‎‏‏‎‏‏‏‏‏‎1‎‏‎‎‏‎"</item>
+  </string-array>
+    <string name="wifi_calling_off_explanation" msgid="2597566001655908391">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‎‏‎‎‎‎‎‎‏‏‎‎‎‏‏‎‏‎‎‎‏‎‎‎‎‏‎‎‎‎‎‏‏‎‎‏‎‏‎‏‎‏‎‏‎‎‎‎‏‎‎‎‎‎‏‎‎‏‏‏‎When Wi-Fi calling is on, your phone can route calls via Wi-Fi networks or your carrier’s 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>
+    <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="3266760199681945746">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‏‏‎‏‎‏‎‏‎‏‎‏‏‏‎‏‏‏‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‎‎‎‏‏‎‏‏‎‏‎‎‏‏‎‎‎‎‏‎‎‏‎‎‏‎‎Address used by emergency services as your location if you make an emergency call using Wi‑Fi‎‏‎‎‏‎"</string>
+    <string name="display_settings_title" msgid="1708697328627382561">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‎‏‏‏‏‎‏‏‎‏‏‎‏‎‎‎‎‎‏‏‎‎‏‎‏‎‏‎‏‏‎‏‎‏‎‏‎‏‏‏‏‏‏‎‎‏‏‏‏‎‎‏‎‎‏‎‎‎‎‏‎Display‎‏‎‎‏‎"</string>
+    <string name="sound_settings" msgid="5534671337768745343">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‏‏‎‎‏‏‎‎‏‏‏‏‎‎‎‏‏‎‏‎‎‏‎‎‎‎‎‏‏‏‏‏‏‏‎‎‎‎‏‏‏‏‎‏‏‏‏‏‏‎‎‏‎‏‏‏‏‏‏‏‎Sound‎‏‎‎‏‎"</string>
+    <string name="all_volume_title" msgid="4296957391257836961">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‏‎‏‏‏‎‏‎‎‎‎‏‏‏‎‏‏‎‏‏‏‏‏‏‏‎‏‏‎‎‏‎‏‎‎‎‏‏‏‎‏‎‎‏‏‎‎‏‏‏‎‏‏‎‏‎‎‎‎‏‎Volumes‎‏‎‎‏‎"</string>
+    <string name="musicfx_title" msgid="3415566786340790345">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‏‏‏‏‎‏‏‎‎‏‏‎‏‎‎‎‎‏‏‏‏‏‏‎‎‏‎‏‎‏‎‎‏‏‏‎‎‏‏‏‎‏‏‏‎‎‏‎‎‎‎‎‎‏‎‎‏‎‎‏‎Music effects‎‏‎‎‏‎"</string>
+    <string name="ring_volume_title" msgid="5592466070832128777">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‏‏‎‏‏‎‎‏‏‏‎‎‎‏‏‎‏‏‏‎‎‏‎‎‎‎‏‎‏‏‏‎‎‎‏‎‎‏‎‏‏‏‏‏‏‎‏‎‎‎‏‏‎‎‎‎‏‎‎‏‎Ring volume‎‏‎‎‏‎"</string>
+    <string name="vibrate_in_silent_title" msgid="3897968069156767036">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‎‏‏‎‎‎‎‏‏‎‎‎‎‏‎‏‏‏‎‏‎‏‎‎‏‏‏‎‎‏‏‏‏‎‏‏‏‏‏‎‎‏‏‏‏‎‎‎‎‏‎‏‎‎‏‏‏‏‎‎‎Vibrate when silent‎‏‎‎‏‎"</string>
+    <string name="notification_sound_title" msgid="5137483249425507572">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‎‏‏‏‎‏‎‎‏‏‎‎‎‎‎‎‎‎‎‏‏‏‎‎‏‎‏‏‏‎‏‏‏‎‎‏‏‎‎‎‎‏‏‎‏‏‏‎‎‏‎‎‏‏‏‏‎‏‎‎‎Default notification sound‎‏‎‎‏‎"</string>
+    <string name="incoming_call_volume_title" msgid="8073714801365904099">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‎‎‎‎‎‎‎‎‏‎‏‏‏‎‎‏‏‎‎‎‏‏‎‏‎‏‎‏‏‏‏‎‎‎‎‏‎‎‏‏‏‎‏‎‎‏‏‎‏‎‏‎‏‏‏‎‎‎‏‏‎Ringtone‎‏‎‎‏‎"</string>
+    <string name="notification_volume_title" msgid="2012640760341080408">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‏‎‏‏‏‏‏‎‏‏‏‎‎‏‎‏‎‏‏‎‎‎‎‏‏‎‏‏‏‎‏‎‏‏‎‎‏‎‎‏‏‎‏‎‎‎‏‎‏‎‎‏‎‏‎‏‏‎‎‎‎Notification‎‏‎‎‏‎"</string>
+    <string name="checkbox_notification_same_as_incoming_call" msgid="1073644356290338921">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‎‏‏‏‎‏‏‏‎‎‏‏‎‎‏‎‏‏‎‎‏‏‏‎‏‏‎‏‎‏‎‎‎‎‏‏‏‏‏‎‎‏‎‎‏‏‏‏‎‎‎‎‎‎‏‏‎‏‎‎‏‎Use incoming call volume for notifications‎‏‎‎‏‎"</string>
+    <string name="home_work_profile_not_supported" msgid="1357721012342357037">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‎‎‏‎‏‏‎‏‎‏‏‏‏‎‎‏‏‎‎‎‎‎‎‏‎‎‎‏‎‎‏‏‎‏‎‎‏‎‏‏‏‏‏‏‏‏‏‏‏‏‎‎‎‎‏‎‏‏‎‏‎Doesn\'t support work profiles‎‏‎‎‏‎"</string>
+    <string name="notification_sound_dialog_title" msgid="3805140135741385667">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‎‏‎‎‏‏‎‎‏‏‏‎‏‎‎‏‎‎‏‎‏‏‎‎‏‎‏‎‏‏‏‏‏‏‏‏‎‏‏‏‎‎‏‎‎‏‏‎‏‎‏‏‏‏‎‎‎‎‏‏‎Default notification sound‎‏‎‎‏‎"</string>
+    <string name="media_volume_title" msgid="3576565767317118106">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‎‎‎‏‏‎‏‎‎‎‏‎‏‎‎‎‎‎‏‏‏‎‎‏‏‏‎‏‏‎‏‎‏‏‎‎‏‏‎‎‎‎‏‎‎‏‎‏‏‏‎‎‏‎‎‏‏‎‏‎‎Media‎‏‎‎‏‎"</string>
+    <string name="media_volume_summary" msgid="5363248930648849974">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‏‎‏‎‎‏‏‎‏‏‏‎‎‎‎‏‎‏‏‎‎‏‏‏‏‏‎‎‏‎‎‏‏‎‎‏‎‏‎‏‎‎‎‏‎‏‏‏‏‏‏‎‎‎‏‏‎‏‏‎‎Set volume for music and videos‎‏‎‎‏‎"</string>
+    <string name="alarm_volume_title" msgid="2285597478377758706">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‏‏‏‏‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‏‏‎‎‏‏‎‎‎‎‎‎‎‏‏‎‎‎‏‏‏‏‎‎‎‎‎‏‏‏‏‏‏‏‏‏‎‎‏‎‎Alarm‎‏‎‎‏‎"</string>
+    <string name="dock_settings_summary" msgid="455802113668982481">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‎‏‏‏‏‎‎‏‎‏‎‎‏‏‎‏‎‏‎‏‎‏‏‎‎‏‏‎‏‏‏‎‎‎‎‎‎‏‎‎‎‏‏‏‎‎‏‎‏‎‎‏‏‎‏‏‎‏‎‎‎‏‎Audio settings for the attached dock‎‏‎‎‏‎"</string>
+    <string name="dtmf_tone_enable_title" msgid="8533399267725365088">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‎‏‏‎‎‏‏‎‏‏‎‎‏‎‏‏‏‎‎‏‎‏‏‎‏‏‎‎‎‎‎‎‏‏‏‏‎‏‎‏‏‎‎‏‎‏‎‎‏‏‏‏‎‏‏‎‎‎‎‎‎Dial pad touch tones‎‏‎‎‏‎"</string>
+    <string name="sound_effects_enable_title" msgid="4429690369187229592">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‏‏‎‏‎‏‏‏‏‎‎‏‎‏‏‎‏‎‏‏‏‏‏‎‏‎‏‏‏‏‎‏‏‎‎‎‎‏‎‏‏‏‏‏‏‎‏‎‏‏‏‏‏‎‎‏‏‎‎‎‎Tap sounds‎‏‎‎‏‎"</string>
+    <string name="lock_sounds_enable_title" msgid="450098505659399520">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‎‏‏‏‏‎‎‎‏‏‏‏‏‏‎‎‎‏‎‎‏‎‎‎‏‏‎‏‎‎‏‏‎‎‎‏‏‏‏‏‎‎‎‎‏‏‎‎‏‏‏‏‎‏‎‏‏‎‎‎‎‎‎Screen lock sound‎‏‎‎‏‎"</string>
+    <string name="haptic_feedback_enable_title" msgid="7152163068278526530">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‎‎‏‏‎‏‎‎‎‎‎‏‏‎‎‏‎‏‏‎‎‏‏‎‏‎‏‎‏‎‏‏‎‏‎‎‎‏‏‎‏‎‎‎‏‏‎‏‎‎‏‎‎‏‎‎‎‎‏‎‎Vibrate on tap‎‏‎‎‏‎"</string>
+    <string name="audio_record_proc_title" msgid="4271091199976457534">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‏‎‏‏‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‎‏‏‎‏‎‎‎‏‎‎‏‏‎‎‎‏‏‏‏‎‎‏‎‎‏‏‎‎‎‏‎‏‎‎‏‏‏‏‏‎‎Noise cancellation‎‏‎‎‏‎"</string>
+    <string name="volume_media_description" msgid="7949355934788807863">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‏‏‏‎‎‏‎‏‎‎‎‏‏‏‎‎‏‎‎‏‎‎‎‏‏‎‏‎‏‏‏‎‏‏‏‎‎‎‏‏‏‎‏‎‏‏‏‎‏‏‎‎‏‎‏‏‎‏‏‏‎Music, video, games, &amp; other media‎‏‎‎‏‎"</string>
+    <string name="volume_ring_description" msgid="5936851631698298989">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‎‎‏‎‎‏‏‎‎‎‏‏‏‏‏‎‏‏‏‏‎‎‎‏‏‎‏‎‏‎‏‎‏‏‏‏‏‎‎‏‎‎‏‏‎‏‎‎‏‎‎‎‎‏‏‎‏‏‎‏‎Ringtone &amp; notifications‎‏‎‎‏‎"</string>
+    <string name="volume_notification_description" msgid="5810902320215328321">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‎‎‎‎‏‎‏‎‎‏‎‎‎‏‏‏‏‎‎‎‏‏‎‏‏‏‏‏‎‏‏‎‏‏‎‎‏‏‏‎‏‏‎‏‏‎‎‎‎‏‏‎‎‏‎‎‎‎‎‏‎Notifications‎‏‎‎‏‎"</string>
+    <string name="volume_alarm_description" msgid="8322615148532654841">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‎‎‏‏‎‏‏‏‏‏‏‏‏‏‎‏‏‏‏‎‎‏‏‎‎‎‎‏‏‏‏‎‏‎‏‎‏‎‎‏‎‎‏‎‏‏‏‎‎‎‏‎‏‏‏‏‏‎‎‏‎Alarms‎‏‎‎‏‎"</string>
+    <string name="volume_ring_mute" msgid="3018992671608737202">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‏‎‎‏‏‏‏‎‎‏‎‏‏‎‎‏‏‏‎‏‏‏‎‏‎‏‏‎‏‏‏‎‏‎‏‎‏‎‏‏‏‏‏‏‎‎‎‎‏‏‎‏‏‎‏‏‎‎‏‎‎Mute ringtone &amp; notifications‎‏‎‎‏‎"</string>
+    <string name="volume_media_mute" msgid="3399059928695998166">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‏‏‏‏‎‎‏‎‏‎‏‏‏‏‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‎‎‎‎‏‎‎‎‎‏‏‎‎‎‎‏‎‎‎‎‏‏‎‏‏‎‏‎‏‏‎‎Mute music &amp; other media‎‏‎‎‏‎"</string>
+    <string name="volume_notification_mute" msgid="7955193480006444159">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‏‏‏‎‎‏‏‎‎‏‏‎‏‎‎‎‎‏‏‎‎‏‎‏‎‎‏‎‎‏‎‏‎‏‏‏‎‏‎‎‏‎‎‏‏‎‏‎‎‏‎‎‎‏‏‏‏‏‏‏‎Mute notifications‎‏‎‎‏‎"</string>
+    <string name="volume_alarm_mute" msgid="4452239420351035936">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‏‏‎‏‏‏‎‎‏‎‎‏‏‎‎‎‏‎‎‎‎‎‏‎‏‎‎‏‏‏‏‏‎‎‎‏‎‎‎‎‎‎‏‏‏‎‏‏‏‎‏‎‎‎‏‎‎‎‎‎‎Mute alarms‎‏‎‎‏‎"</string>
+    <string name="dock_settings" msgid="1820107306693002541">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‏‎‎‏‎‏‎‎‎‎‏‎‎‏‎‏‎‎‎‏‏‏‏‏‎‎‏‏‏‎‏‏‏‏‎‎‏‎‎‎‎‏‏‏‏‎‎‎‎‏‎‏‎‎‏‎‏‏‎‏‎Dock‎‏‎‎‏‎"</string>
+    <string name="dock_settings_title" msgid="9161438664257429372">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‏‏‏‏‎‎‏‎‎‎‏‏‏‏‏‏‎‏‏‏‏‏‏‎‏‏‎‎‏‏‏‏‏‏‏‎‏‎‎‏‎‏‏‏‏‏‎‏‏‏‏‏‎‏‏‏‏‏‎‎‎Dock settings‎‏‎‎‏‎"</string>
+    <string name="dock_audio_settings_title" msgid="3324750259959570305">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‏‏‏‎‎‎‏‎‎‎‏‏‏‏‏‎‎‎‏‎‏‎‏‏‏‏‏‏‎‎‎‎‎‎‏‏‏‏‎‎‎‏‏‏‎‎‎‏‏‏‏‏‏‎‎‎‎‎‎‏‎Audio‎‏‎‎‏‎"</string>
+    <string name="dock_audio_summary_desk" msgid="6487784412371139335">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‏‎‏‎‎‎‎‎‏‎‎‏‎‎‏‏‏‏‎‏‏‎‎‎‏‏‎‎‏‎‎‏‏‏‏‎‏‎‏‏‎‎‏‎‏‎‏‏‏‎‏‏‎‎‎‎‎‏‏‏‎Settings for the attached desktop dock‎‏‎‎‏‎"</string>
+    <string name="dock_audio_summary_car" msgid="6740897586006248450">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‏‏‎‏‏‎‎‎‏‏‎‎‎‏‏‏‏‎‏‎‏‎‏‎‎‎‏‏‏‏‎‎‎‎‎‏‎‎‏‏‎‎‎‎‏‏‎‎‏‏‎‎‎‎‎‎‎‎‏‎‎Settings for the attached car dock‎‏‎‎‏‎"</string>
+    <string name="dock_audio_summary_none" product="tablet" msgid="8215337394914283607">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‎‎‏‎‎‎‎‎‎‎‏‎‏‎‏‏‏‏‎‏‏‏‎‏‎‏‎‏‎‏‏‏‏‏‎‏‏‏‎‏‏‎‎‏‎‏‎‏‎‎‎‎‎‏‎‏‎‏‏‏‎Tablet not docked‎‏‎‎‏‎"</string>
+    <string name="dock_audio_summary_none" product="default" msgid="289909253741048784">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‎‏‏‏‎‎‎‎‎‎‎‏‎‏‏‏‏‏‎‏‏‎‏‏‏‎‏‏‏‎‎‎‏‎‎‏‏‎‎‏‎‏‎‏‎‏‎‏‏‏‎‎‏‏‏‏‎‏‎‎‎‎‎Phone not docked‎‏‎‎‏‎"</string>
+    <string name="dock_audio_summary_unknown" msgid="4465059868974255693">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‏‏‎‏‏‏‏‏‎‏‏‏‎‎‎‏‎‏‎‎‎‏‎‎‏‎‏‏‎‎‏‏‏‏‏‏‎‎‎‏‎‎‎‎‎‎‎‎‏‏‏‎‎‏‎‎‏‏‎‏‎Settings for the attached dock‎‏‎‎‏‎"</string>
+    <string name="dock_not_found_title" msgid="3290961741828952424">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‏‏‎‏‏‎‏‎‏‎‏‏‏‏‎‏‏‎‎‎‎‏‎‎‎‏‎‎‏‎‎‏‎‏‏‏‎‎‎‏‏‏‎‏‏‎‎‏‎‎‎‏‎‏‏‎‏‎‎‎‎Dock not found‎‏‎‎‏‎"</string>
+    <string name="dock_not_found_text" product="tablet" msgid="8405432495282299143">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‎‏‎‎‏‎‏‎‎‏‏‎‎‎‎‏‏‎‎‎‎‏‎‏‎‎‏‎‎‎‎‏‎‎‎‎‏‏‎‏‎‎‏‏‏‎‏‎‎‎‎‏‎‎‎‎‎‏‏‏‎You need to dock the tablet before setting up dock audio.‎‏‎‎‏‎"</string>
+    <string name="dock_not_found_text" product="default" msgid="1460497923342627801">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‎‏‎‎‎‏‎‎‎‏‎‎‏‎‏‏‏‎‏‏‎‎‎‏‏‏‏‏‏‎‎‎‏‏‎‎‎‎‎‎‏‎‎‎‎‏‏‏‎‎‏‏‏‏‎‏‏‎‎‏‎You need to dock the phone before setting up dock audio.‎‏‎‎‏‎"</string>
+    <string name="dock_sounds_enable_title" msgid="885839627097024110">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‎‏‏‎‎‎‏‎‎‏‎‏‏‎‎‏‎‎‎‏‎‎‏‏‏‎‎‏‎‏‎‎‎‏‏‎‏‎‎‎‏‎‏‎‏‎‎‏‎‎‏‏‎‎‏‏‎‏‏‏‎‎Dock insert sound‎‏‎‎‏‎"</string>
+    <string name="dock_sounds_enable_summary_on" product="tablet" msgid="838102386448981339">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‎‏‎‏‏‏‎‏‎‎‎‎‏‏‎‎‎‏‎‎‏‏‎‏‎‏‏‏‎‎‎‎‏‎‏‎‏‏‎‏‏‎‎‏‎‏‏‎‏‏‏‎‏‎‏‎‏‏‎‏‏‎Play sound when inserting or removing tablet from dock‎‏‎‎‏‎"</string>
+    <string name="dock_sounds_enable_summary_on" product="default" msgid="8491180514199743771">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‎‏‎‏‏‏‎‏‎‏‏‎‏‎‏‏‏‎‏‏‏‎‏‏‎‎‎‎‏‎‎‎‎‎‎‎‏‎‎‏‏‎‎‎‎‎‏‎‏‏‎‏‎‎‎‏‏‎‏‏‎Play sound when inserting or removing phone from dock‎‏‎‎‏‎"</string>
+    <string name="dock_sounds_enable_summary_off" product="tablet" msgid="4308252722466813560">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‏‎‏‏‏‏‎‎‏‎‎‏‏‏‏‏‏‏‎‏‎‎‎‎‎‏‏‎‎‏‏‎‎‏‎‏‎‎‏‏‏‏‏‎‎‏‏‏‎‏‏‎‎‏‏‏‏‎‎‎‎Don’t play sound when inserting or removing tablet from dock‎‏‎‎‏‎"</string>
+    <string name="dock_sounds_enable_summary_off" product="default" msgid="2034927992716667672">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‏‏‎‎‎‎‏‏‏‏‎‏‏‎‎‎‎‏‎‎‎‎‏‏‏‎‏‎‎‏‎‏‎‏‎‏‎‏‏‎‎‎‎‎‎‎‏‎‏‎‏‏‎‎‎‏‏‎‎‎‎Don’t play sound when inserting or removing phone from dock‎‏‎‎‏‎"</string>
+    <string name="account_settings" msgid="6403589284618783461">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‏‎‎‎‏‏‎‏‏‏‏‎‎‎‎‏‏‏‏‎‏‎‎‎‎‏‏‎‏‏‎‏‎‏‎‏‎‎‏‏‎‎‏‏‎‏‎‎‏‎‏‎‏‏‏‎‎‏‎‏‎Accounts‎‏‎‎‏‎"</string>
+    <string name="accessibility_category_work" msgid="4339262969083355720">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‏‏‎‎‎‎‏‏‏‎‎‎‎‎‏‎‏‎‎‎‏‎‏‎‏‏‏‎‎‎‎‏‎‎‏‏‎‎‏‏‏‎‎‎‎‏‏‎‎‎‏‎‎‏‎‎‏‎‎‎‎Work profile accounts - ‎‏‎‎‏‏‎<xliff:g id="MANAGED_BY">%s</xliff:g>‎‏‎‎‏‏‏‎‎‏‎‎‏‎"</string>
+    <string name="accessibility_category_personal" msgid="1263518850905945594">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‎‎‎‏‏‎‎‎‏‎‎‎‏‏‏‎‏‎‏‏‏‎‏‏‎‎‏‏‎‏‎‏‎‎‏‏‎‏‎‎‎‎‏‎‎‎‏‏‎‏‎‏‏‏‏‏‏‎‏‎‎Personal profile accounts‎‏‎‎‏‎"</string>
+    <string name="accessibility_work_account_title" msgid="1231830766637939527">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‎‎‎‏‎‎‎‏‏‎‎‎‎‏‎‏‎‏‏‏‏‎‎‎‏‏‏‎‎‏‎‎‎‏‎‎‏‏‎‏‏‎‎‏‏‏‏‏‏‎‏‏‎‏‎‎‎‏‏‏‎Work account - ‎‏‎‎‏‏‎<xliff:g id="MANAGED_BY">%s</xliff:g>‎‏‎‎‏‏‏‎‎‏‎‎‏‎"</string>
+    <string name="accessibility_personal_account_title" msgid="2169071663029067826">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‏‏‏‎‎‎‎‏‏‎‏‎‎‎‎‏‎‏‏‏‎‎‏‎‏‏‏‏‎‏‏‎‏‏‏‏‎‎‏‏‎‏‏‎‏‎‏‎‎‎‎‎‎‎‏‏‎‎‏‎‎Personal account - ‎‏‎‎‏‏‎<xliff:g id="MANAGED_BY">%s</xliff:g>‎‏‎‎‏‏‏‎‎‏‎‎‏‎"</string>
+    <string name="search_settings" msgid="1910951467596035063">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‏‎‏‎‏‎‎‎‎‏‎‏‎‎‎‏‎‎‎‎‎‎‏‏‏‏‎‎‎‎‏‏‎‎‎‏‎‎‎‏‎‎‏‎‏‎‏‏‎‎‏‏‏‏‏‏‎‏‏‏‎Search‎‏‎‎‏‎"</string>
+    <string name="search_settings_summary" msgid="9205656546570654169">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‏‏‏‏‏‏‎‎‎‎‎‏‎‎‎‎‏‏‏‏‏‏‎‏‏‎‏‎‏‏‏‏‏‏‏‎‏‎‎‏‎‏‏‏‏‏‎‏‎‎‎‏‏‏‎‏‏‎‎‏‎Manage search settings and history‎‏‎‎‏‎"</string>
+    <string name="search_settings_no_results" msgid="8799027492641230999">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‏‎‏‎‎‎‎‏‏‏‎‎‎‏‏‎‏‏‎‎‏‏‏‎‎‎‏‎‏‎‏‎‎‎‏‏‏‏‎‎‎‏‏‎‏‏‎‏‎‎‎‎‏‎‎‏‎‏‏‏‎No results‎‏‎‎‏‎"</string>
+    <string name="search_clear_history" msgid="4196658962573162457">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‏‎‏‎‎‎‏‏‏‏‎‏‏‎‎‎‎‏‏‏‎‎‎‏‎‏‏‏‎‏‏‏‎‎‏‏‏‎‏‎‎‎‎‏‏‏‏‏‎‏‏‏‏‏‎‏‏‎‎‏‎Clear history‎‏‎‎‏‎"</string>
+    <string name="display_settings" msgid="7965901687241669598">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‏‏‏‎‏‎‎‎‏‏‎‎‏‎‎‏‎‎‎‏‎‏‏‎‎‎‎‏‎‎‎‏‏‏‏‏‏‎‏‏‏‎‎‏‎‏‏‏‏‎‏‏‏‏‎‏‏‏‏‎‎Display‎‏‎‎‏‎"</string>
+    <string name="accelerometer_title" msgid="7854608399547349157">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‏‏‎‏‎‎‎‎‎‎‎‏‎‎‏‎‏‏‎‎‏‎‏‏‏‎‎‏‎‏‎‏‎‎‎‎‏‏‎‏‎‎‎‏‏‎‏‏‏‎‎‎‏‎‏‎‎‏‎‏‎Auto-rotate screen‎‏‎‎‏‎"</string>
+    <string name="color_mode_title" msgid="3159275920408338215">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‏‎‏‏‏‏‎‏‏‎‎‎‎‎‎‎‎‎‎‎‏‎‏‏‎‏‏‎‎‎‎‎‎‏‏‏‎‏‏‎‎‎‏‎‎‏‎‏‏‏‏‏‎‎‏‎‎‏‏‏‎Vivid colors‎‏‎‎‏‎"</string>
+    <string name="accelerometer_summary_on" product="tablet" msgid="429982132339828942">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‎‏‏‏‎‏‏‏‏‏‎‏‏‏‏‎‎‏‏‎‏‎‎‏‏‏‏‎‎‎‏‎‏‎‎‎‎‏‏‏‏‎‎‎‎‏‎‏‏‎‏‎‎‎‏‏‎‎‏‏‏‎‎Switch orientation automatically when rotating tablet‎‏‎‎‏‎"</string>
+    <string name="accelerometer_summary_on" product="default" msgid="1133737282813048021">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‎‏‏‏‏‏‎‏‏‏‎‏‏‏‏‎‏‏‎‎‎‎‎‎‎‏‏‎‏‎‏‎‎‏‎‏‎‏‎‏‏‎‎‎‎‎‎‏‏‎‏‎‎‏‏‎‏‎‏‎‏‎Switch orientation automatically when rotating phone‎‏‎‎‏‎"</string>
+    <string name="accelerometer_summary_off" product="tablet" msgid="4781734213242521682">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‎‎‏‎‎‏‎‏‏‏‎‎‎‎‏‎‎‎‎‏‏‏‏‎‏‏‏‎‏‎‏‎‎‏‏‎‏‎‏‎‎‏‏‏‎‎‎‎‏‎‎‎‎‏‎‏‎‎‏‎‎Switch orientation automatically when rotating tablet‎‏‎‎‏‎"</string>
+    <string name="accelerometer_summary_off" product="default" msgid="5485489363715740761">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‏‏‎‎‎‎‏‎‎‎‎‎‎‏‎‏‏‏‏‏‏‎‎‎‎‎‏‏‎‏‎‎‏‏‏‏‎‏‏‏‎‏‎‏‏‏‎‏‎‏‎‎‎‏‎‏‏‎‎‏‎Switch orientation automatically when rotating phone‎‏‎‎‏‎"</string>
+    <string name="brightness" msgid="8480105032417444275">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‎‏‎‏‏‎‏‎‏‏‏‏‎‏‏‎‎‎‏‎‏‎‎‏‏‎‎‎‏‏‏‏‎‎‏‏‎‎‏‏‏‏‏‎‏‎‎‎‎‎‎‏‏‎‏‏‎‎‏‏‎Brightness level‎‏‎‎‏‎"</string>
+    <string name="brightness_title" msgid="5746272622112982836">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‏‏‏‏‏‎‏‏‏‏‏‎‏‏‎‏‏‏‎‎‏‎‎‎‎‎‎‏‎‎‏‏‎‏‏‏‏‎‎‏‏‎‎‎‏‏‎‎‎‏‏‏‎‎‏‏‎‏‎‎‎Brightness‎‏‎‎‏‎"</string>
+    <string name="brightness_summary" msgid="838917350127550703">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‎‏‎‏‏‏‎‏‎‎‏‎‎‎‏‏‎‏‏‏‎‏‏‏‎‎‎‏‎‏‎‎‏‏‎‏‎‎‏‎‎‎‎‏‏‏‏‎‎‎‎‎‎‏‏‏‎‏‏‏‏‎Adjust the brightness of the screen‎‏‎‎‏‎"</string>
+    <string name="auto_brightness_title" msgid="6341042882350279391">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‎‏‏‏‏‏‏‏‏‏‏‏‏‏‏‎‏‎‎‎‏‏‏‎‎‏‏‏‏‎‏‏‏‏‎‎‎‎‎‎‎‎‎‏‏‏‏‎‏‎‏‎‏‏‎‏‏‏‏‏‎Adaptive brightness‎‏‎‎‏‎"</string>
+    <string name="auto_brightness_summary" msgid="1799041158760605375">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‏‎‎‎‏‏‏‏‎‏‏‏‎‏‏‏‏‎‏‎‎‏‏‎‎‏‏‎‏‏‏‏‎‏‎‎‎‎‏‏‏‎‏‏‏‎‏‎‎‏‏‎‏‎‏‏‏‏‏‏‎Optimize brightness level for available light‎‏‎‎‏‎"</string>
+    <string name="auto_brightness_summary_off" msgid="2802336459335410626">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‎‏‏‎‏‏‏‎‎‎‏‏‏‏‏‎‎‏‏‎‎‎‏‎‏‎‎‏‏‎‎‎‏‏‏‏‏‏‎‏‎‎‎‎‎‎‏‎‎‎‏‏‏‏‎‎‎‎‏‎‎Off‎‏‎‎‏‎"</string>
+    <string name="auto_brightness_summary_very_low" msgid="6483976609035853764">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‏‎‎‏‏‏‏‏‏‎‏‏‏‎‏‏‎‏‏‎‎‏‎‏‏‏‏‏‎‏‎‏‎‎‎‏‏‎‎‎‎‏‏‎‎‎‎‏‏‏‏‏‏‏‎‎‎‏‎‎‎Preferred brightness is very low‎‏‎‎‏‎"</string>
+    <string name="auto_brightness_summary_low" msgid="5609877905833960427">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‏‏‎‏‏‏‎‏‏‎‏‎‎‏‎‎‏‎‏‎‎‎‏‏‏‎‏‏‏‎‏‎‎‎‏‎‏‎‎‎‏‎‏‏‏‎‏‎‎‎‏‏‏‏‏‎‏‎‏‏‎Preferred brightness is low‎‏‎‎‏‎"</string>
+    <string name="auto_brightness_summary_default" msgid="7225666614394726845">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‎‏‎‎‎‏‎‎‎‏‏‎‏‎‏‏‏‎‎‏‏‎‎‎‎‎‎‎‏‎‏‎‏‎‎‎‎‏‏‎‎‏‎‏‏‎‏‎‏‎‎‏‏‎‏‏‏‏‎‏‎Preferred brightness is default‎‏‎‎‏‎"</string>
+    <string name="auto_brightness_summary_high" msgid="7172304165631136027">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‎‎‏‏‏‎‎‎‏‎‎‏‎‎‏‎‎‏‎‎‏‎‏‎‎‎‏‏‎‏‎‏‏‏‎‏‎‏‏‏‏‏‏‏‏‎‎‏‎‎‎‏‎‎‎‏‏‎‏‏‎Preferred brightness is high‎‏‎‎‏‎"</string>
+    <string name="auto_brightness_summary_very_high" msgid="979277812582279078">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‎‏‏‎‏‏‎‎‏‎‏‏‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‏‏‎‏‏‎‏‎‏‏‎‏‏‎‎‎‏‏‎‏‏‎‎‏‏‏‏‎‏‎‎‏‏‎‎Preferred brightness is very high‎‏‎‎‏‎"</string>
+    <string name="auto_brightness_off_title" msgid="2996864829946190795">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‏‎‎‏‏‎‎‏‎‏‏‏‎‎‎‎‎‎‎‎‏‎‏‎‏‏‏‏‎‏‎‎‏‏‎‎‏‏‎‎‏‏‎‏‏‏‎‏‏‎‏‏‏‏‎‎‏‎‏‏‎Off‎‏‎‎‏‎"</string>
+    <string name="auto_brightness_very_low_title" msgid="8252988638614126320">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‎‎‏‎‏‎‎‎‏‎‎‎‏‎‎‎‎‎‎‏‎‏‏‏‎‎‎‎‏‏‎‎‏‎‏‏‏‏‏‎‏‏‎‏‏‏‏‏‏‏‏‎‏‏‏‏‎‎‎‎‎Very low‎‏‎‎‏‎"</string>
+    <string name="auto_brightness_low_title" msgid="1632186441514863377">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‎‏‏‎‏‎‏‎‎‏‏‎‏‎‏‏‎‎‎‎‏‏‏‎‏‎‏‏‏‎‏‏‏‏‎‏‏‎‏‏‎‎‏‏‏‏‎‎‏‎‏‏‎‎‎‏‎‎‎‏‎Low‎‏‎‎‏‎"</string>
+    <string name="auto_brightness_default_title" msgid="936771997353506620">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‎‏‏‎‏‎‎‎‎‎‎‎‎‎‎‎‏‎‏‎‏‎‎‏‎‏‎‏‏‎‎‎‏‏‎‎‏‏‏‎‎‏‎‎‏‏‏‏‏‎‏‏‏‎‎‏‏‏‏‎‎‎Default‎‏‎‎‏‎"</string>
+    <string name="auto_brightness_high_title" msgid="2527853305981497345">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‎‎‏‏‎‎‎‏‎‏‎‎‏‎‏‏‏‏‎‏‎‎‏‏‎‎‎‎‎‏‎‎‏‎‏‏‎‏‎‏‎‎‏‎‏‏‏‏‎‎‎‎‎‎‎‎‎‎‎‏‎High‎‏‎‎‏‎"</string>
+    <string name="auto_brightness_very_high_title" msgid="8867164854439331022">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‏‎‏‏‎‎‎‎‏‏‏‎‎‏‏‏‏‏‏‏‎‏‏‏‎‏‎‎‎‏‏‏‎‎‎‏‏‎‏‎‏‏‏‏‎‏‎‎‎‏‎‎‏‏‎‎‏‏‏‎‎Very high‎‏‎‎‏‎"</string>
+    <string name="auto_brightness_subtitle" msgid="6454652530864093466">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‏‎‎‏‏‎‎‏‎‎‏‏‏‎‎‎‏‎‎‎‎‏‎‎‎‏‏‏‎‏‎‏‎‎‏‎‏‎‏‏‏‎‏‎‏‏‏‏‏‎‎‏‎‎‎‏‏‎‏‎‎Your preferred brightness level‎‏‎‎‏‎"</string>
+    <string name="auto_brightness_off_summary" msgid="7629228736838155268">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‏‎‎‏‏‏‏‎‎‎‎‎‎‏‏‏‎‏‏‏‎‎‎‏‏‏‎‏‎‏‏‎‎‎‎‏‎‏‏‏‎‎‎‎‏‎‏‏‏‏‎‎‎‎‎‎‎‏‎‎‎Don\'t adjust for available light‎‏‎‎‏‎"</string>
+    <string name="auto_brightness_very_high_summary" msgid="4551003097086220709">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‏‏‏‏‎‎‏‎‏‎‎‎‎‏‏‎‏‎‎‏‎‎‏‏‎‏‎‎‎‏‎‏‏‏‎‏‏‎‎‎‎‏‏‎‏‏‎‏‏‎‎‏‏‎‏‎‎‏‎‏‎Increased battery usage‎‏‎‎‏‎"</string>
+    <string name="auto_brightness_disclaimer" msgid="871436423746343406">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‎‏‏‎‎‎‎‎‏‎‏‏‏‏‏‏‏‎‏‏‎‏‏‎‎‏‏‏‏‎‏‏‏‎‎‎‏‏‎‏‏‏‏‎‎‏‏‎‏‎‎‎‏‏‏‏‎‏‏‏‎‎Optimize 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_auto_mode_title" msgid="6574111412154833409">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‏‎‏‏‎‎‏‏‏‎‏‏‏‏‏‎‏‏‏‏‎‏‏‏‏‏‏‏‏‎‎‎‏‎‏‏‎‏‎‏‎‏‎‎‏‎‎‏‏‎‏‎‎‎‎‎‎‎‎‏‎Schedule‎‏‎‎‏‎"</string>
+    <string name="night_display_auto_mode_never" msgid="2483761922928753400">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‎‎‏‎‎‏‏‏‏‎‎‎‎‎‎‏‏‎‎‎‎‏‎‎‏‏‏‏‎‎‏‏‎‎‏‎‏‏‎‎‏‏‏‏‎‎‏‏‏‎‏‎‏‏‏‏‏‎‎‎‎None‎‏‎‎‏‎"</string>
+    <string name="night_display_auto_mode_custom" msgid="2379394568898721765">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‎‎‎‏‎‎‎‎‎‏‎‏‎‏‎‎‏‏‏‎‏‏‎‎‎‎‎‎‏‏‏‏‏‎‏‏‏‎‏‏‎‎‏‏‏‎‏‏‎‏‏‏‏‏‏‎‎‏‎‏‎Turns on at custom time‎‏‎‎‏‎"</string>
+    <string name="night_display_auto_mode_twilight" msgid="589042813708244059">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‎‏‎‎‎‎‎‏‎‏‏‎‎‏‎‏‏‎‎‏‏‎‏‎‏‎‎‎‏‎‏‏‏‎‏‎‎‏‎‎‏‎‎‏‏‏‎‎‏‎‏‎‎‎‏‎‏‏‎‏‏‎Turns on from sunset to sunrise‎‏‎‎‏‎"</string>
+    <string name="night_display_start_time_title" msgid="8918016772613689584">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‏‎‏‏‏‏‎‎‎‎‏‏‎‎‏‎‏‎‎‏‎‎‎‎‎‎‎‏‎‏‎‎‏‎‎‎‏‎‎‏‏‏‎‏‎‏‎‏‎‎‎‎‏‏‏‏‎‎‎‎‎Start time‎‏‎‎‏‎"</string>
+    <string name="night_display_end_time_title" msgid="8286061578083519350">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‎‎‏‎‏‏‏‏‏‏‏‎‎‎‎‎‎‎‎‏‎‎‎‏‏‎‏‎‏‎‎‏‎‏‎‎‏‎‏‎‏‏‏‎‎‏‎‎‏‎‏‏‎‏‏‏‎‏‏‎‎End time‎‏‎‎‏‎"</string>
+    <string name="night_display_status_title" msgid="1784041143360286267">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‏‎‎‎‏‏‎‎‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‏‏‏‏‎‏‏‎‏‏‎‏‎‏‎‏‎‏‏‏‏‏‎‏‏‏‎‎‎‏‏‏‎‏‏‎Status‎‏‎‎‏‎"</string>
+    <string name="night_display_temperature_title" msgid="1435292789272017136">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‎‎‏‏‏‏‏‎‏‎‏‏‎‎‏‎‏‏‏‏‎‎‏‎‏‏‏‏‏‏‏‏‎‏‎‏‎‎‏‏‏‏‎‎‏‏‏‏‏‎‎‎‏‏‏‏‎‎‎‎‎Intensity‎‏‎‎‏‎"</string>
+    <string name="night_display_summary_off" msgid="1792750041697946539">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‏‎‎‎‏‏‏‎‎‎‎‏‎‎‏‎‎‎‎‎‏‎‏‎‏‎‏‎‎‎‎‏‏‏‏‎‎‏‏‏‏‎‎‏‎‎‎‎‏‎‏‏‏‎‏‎‏‎‏‏‎Off / ‎‏‎‎‏‏‎<xliff:g id="ID_1">%1$s</xliff:g>‎‏‎‎‏‏‏‎‎‏‎‎‏‎"</string>
+    <string name="night_display_summary_off_auto_mode_never" msgid="3583590137322963513">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‎‎‎‏‏‎‏‏‏‎‏‏‎‏‏‏‏‎‎‎‎‎‏‏‏‏‏‎‎‏‎‎‎‎‏‏‏‎‏‏‏‎‏‎‏‎‎‎‎‎‏‎‎‎‏‏‏‎‎‏‎Will never turn on automatically‎‏‎‎‏‎"</string>
+    <string name="night_display_summary_off_auto_mode_custom" msgid="6365668239253173208">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‏‎‎‎‎‏‎‏‎‏‏‏‎‏‏‎‎‏‎‏‏‎‎‎‏‎‎‏‎‏‏‎‏‏‏‎‏‎‏‎‏‎‏‏‏‏‏‏‎‎‏‏‏‏‎‏‏‎‎‎‎Will turn on automatically at ‎‏‎‎‏‏‎<xliff:g id="ID_1">%1$s</xliff:g>‎‏‎‎‏‏‏‎‎‏‎‎‏‎"</string>
+    <string name="night_display_summary_off_auto_mode_twilight" msgid="3596291693781757392">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‎‎‎‏‏‏‏‎‏‎‎‎‏‎‎‏‏‎‎‎‎‎‏‏‏‏‎‏‏‏‎‏‎‏‎‎‏‎‎‎‏‏‎‎‏‎‏‎‏‏‎‏‏‏‎‏‎‎‎‎‎Will turn on automatically at sunset‎‏‎‎‏‎"</string>
+    <string name="night_display_summary_on" msgid="1355713529996456744">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‎‎‏‎‏‏‎‏‎‎‎‎‎‏‏‏‎‏‏‎‎‏‎‎‎‏‎‏‏‏‎‎‏‏‎‎‏‎‏‎‎‎‎‏‎‎‏‏‎‎‏‏‎‎‏‎‏‎‎‎‎On / ‎‏‎‎‏‏‎<xliff:g id="ID_1">%1$s</xliff:g>‎‏‎‎‏‏‏‎‎‏‎‎‏‎"</string>
+    <string name="night_display_summary_on_auto_mode_never" msgid="9117830821363119835">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‏‏‏‎‏‎‎‎‏‎‎‏‎‎‎‎‏‎‏‎‏‏‎‏‎‎‏‎‏‏‎‏‏‏‎‏‎‏‏‏‎‏‎‎‏‏‏‏‎‏‏‎‏‏‎‏‏‎‏‏‎Will never turn off automatically‎‏‎‎‏‎"</string>
+    <string name="night_display_summary_on_auto_mode_custom" msgid="5510753572245577263">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‏‏‎‎‎‏‏‏‏‎‏‎‎‎‏‎‎‎‎‏‎‎‏‎‏‏‎‏‎‎‏‏‏‏‏‎‎‏‏‎‏‎‎‏‏‎‎‏‏‏‏‎‎‎‏‎‏‏‏‏‎Will turn off automatically at ‎‏‎‎‏‏‎<xliff:g id="ID_1">%1$s</xliff:g>‎‏‎‎‏‏‏‎‎‏‎‎‏‎"</string>
+    <string name="night_display_summary_on_auto_mode_twilight" msgid="852270120144683507">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‎‏‎‏‏‏‏‎‏‎‎‏‏‏‏‎‏‏‏‏‏‎‎‏‎‏‎‎‎‏‎‏‎‎‎‏‏‏‏‏‎‎‏‏‏‎‏‎‎‎‎‎‏‏‏‏‏‎‎‏‏‎Will turn off automatically at sunrise‎‏‎‎‏‎"</string>
+    <string name="screen_timeout" msgid="4351334843529712571">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‏‏‎‎‎‏‏‎‎‎‏‏‎‎‎‎‏‎‏‏‏‏‏‏‏‏‎‎‎‏‎‏‏‏‏‏‎‏‎‏‏‏‏‎‎‏‎‏‎‎‏‏‏‎‏‏‏‎‏‏‎Sleep‎‏‎‎‏‎"</string>
+    <string name="screen_timeout_title" msgid="5130038655092628247">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‎‏‏‏‎‎‏‏‎‎‎‏‏‎‎‎‏‏‏‎‏‏‏‏‏‎‏‎‎‎‎‎‏‎‎‎‏‏‎‏‎‎‎‏‏‎‎‏‏‎‏‏‎‎‎‏‎‏‏‏‎Screen turns off‎‏‎‎‏‎"</string>
+    <string name="screen_timeout_summary" msgid="327761329263064327">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‎‏‏‏‎‎‏‎‎‎‏‏‎‎‎‏‏‏‎‎‎‏‎‎‏‏‎‎‎‏‎‏‎‎‎‎‎‏‏‏‎‏‎‏‎‏‏‎‏‏‎‏‎‏‎‎‎‎‎‏‏‏‎After ‎‏‎‎‏‏‎<xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g>‎‏‎‎‏‏‏‎ of inactivity‎‏‎‎‏‎"</string>
+    <string name="wallpaper_settings_title" msgid="5449180116365824625">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‏‎‏‏‏‎‎‏‏‏‏‏‎‏‏‎‎‎‎‎‎‏‏‏‎‎‎‏‏‏‏‎‎‎‎‏‎‎‎‏‏‎‏‏‎‏‎‏‎‎‏‎‎‏‏‏‎‎‎‏‎Wallpaper‎‏‎‎‏‎"</string>
+    <string name="wallpaper_settings_summary_default" msgid="3395741565658711416">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‏‏‏‏‎‎‏‎‎‎‎‎‎‎‎‏‏‎‎‎‏‏‏‏‎‏‏‎‎‏‏‎‏‎‏‎‎‎‎‏‏‏‎‏‏‏‎‎‎‏‎‏‎‏‏‏‏‎‎‎‎Default‎‏‎‎‏‎"</string>
+    <string name="wallpaper_settings_summary_custom" msgid="515035303981687172">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‎‏‏‏‏‏‎‎‏‎‎‏‎‏‏‏‎‎‎‏‎‏‏‏‏‎‎‎‎‏‎‏‎‏‎‏‎‎‏‎‎‏‏‏‎‏‎‎‏‎‎‎‎‏‏‎‎‎‎‏‎‎‎Custom‎‏‎‎‏‎"</string>
+    <string name="wallpaper_suggestion_title" msgid="8583988696513822528">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‎‏‏‏‎‎‏‎‎‎‎‎‎‏‏‏‎‏‎‎‎‎‏‏‏‏‎‏‎‏‎‏‎‎‏‏‏‎‏‎‏‏‎‎‏‎‏‏‏‏‏‏‎‏‎‎‎‎‎‎‎Change wallpaper‎‏‎‎‏‎"</string>
+    <string name="wallpaper_suggestion_summary" msgid="1579144009898110491">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‎‏‎‏‏‏‏‎‏‎‏‎‎‎‏‏‏‏‏‏‎‎‎‏‏‏‎‎‎‎‏‏‏‏‏‏‎‎‏‎‏‎‎‏‏‎‏‎‏‏‏‎‎‎‎‏‏‎‏‏‎Personalize your screen‎‏‎‎‏‎"</string>
+    <string name="wallpaper_settings_fragment_title" msgid="519078346877860129">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‎‏‏‏‏‏‎‎‏‏‎‏‎‎‎‎‏‎‎‎‏‏‎‎‎‎‎‎‎‏‏‎‎‏‏‏‎‎‎‏‎‎‎‎‎‎‎‏‏‏‏‎‎‏‎‎‏‎‎‎‎‏‎Choose wallpaper from‎‏‎‎‏‎"</string>
+    <string name="screensaver_settings_title" msgid="1770575686476851778">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‏‎‎‎‏‎‎‏‎‎‏‎‎‏‎‏‏‎‎‏‎‎‏‏‎‏‎‎‏‎‏‏‏‎‎‎‎‏‏‎‎‏‎‏‎‏‏‎‏‎‏‎‎‏‎‎‎‎‏‎‎Screen saver‎‏‎‎‏‎"</string>
+    <string name="screensaver_settings_summary_either_long" msgid="7302740999250873332">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‎‏‎‏‎‏‎‏‏‎‎‎‏‎‎‎‏‏‎‎‎‎‏‏‏‏‏‏‎‏‎‎‏‎‏‏‎‎‎‎‎‏‏‏‏‎‎‎‏‎‏‏‏‏‏‏‎‏‎‎‎While charging or docked‎‏‎‎‏‎"</string>
+    <string name="screensaver_settings_summary_either_short" msgid="6140527286137331478">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‎‏‎‏‎‎‏‏‎‏‏‏‏‎‎‎‏‎‎‏‎‎‎‎‏‎‎‎‎‏‏‎‎‏‏‏‏‏‎‎‏‏‏‏‎‎‎‏‏‏‏‏‎‎‎‏‎‏‏‎‎Either‎‏‎‎‏‎"</string>
+    <string name="screensaver_settings_summary_sleep" msgid="9086186698140423493">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‏‏‏‎‎‎‎‏‏‎‎‎‏‎‎‏‏‏‏‎‏‎‏‎‏‎‎‏‎‏‎‎‏‎‎‏‏‎‎‎‏‎‏‎‎‎‎‏‎‏‎‏‎‏‎‎‎‏‎‏‎While charging‎‏‎‎‏‎"</string>
+    <string name="screensaver_settings_summary_dock" msgid="2072657401664633283">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‏‏‎‎‏‏‎‎‎‎‏‏‏‎‎‎‏‏‏‎‏‏‏‎‏‏‎‎‏‏‏‎‎‏‏‏‎‏‎‎‏‏‎‏‏‏‏‏‏‎‎‏‏‏‎‎‎‎‏‏‎While docked‎‏‎‎‏‎"</string>
+    <string name="screensaver_settings_summary_never" msgid="5165622985174349585">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‎‏‏‏‏‎‏‎‏‏‏‏‏‏‏‏‏‎‏‎‏‎‏‏‏‏‎‎‏‎‎‎‎‎‏‎‏‏‏‎‏‎‎‎‏‏‏‏‎‏‏‏‎‎‎‏‎‎‎‏‎Never‎‏‎‎‏‎"</string>
+    <string name="screensaver_settings_summary_off" msgid="2481581696365146473">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‎‎‏‎‎‏‏‏‎‎‎‎‎‏‎‏‏‎‎‏‎‏‏‎‎‏‏‏‏‎‏‎‎‏‎‎‏‏‏‏‎‏‎‎‏‎‏‏‎‎‎‏‎‏‏‎‏‎‎‏‎Off‎‏‎‎‏‎"</string>
+    <string name="screensaver_settings_disabled_prompt" msgid="1239088321034437608">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‎‎‎‏‎‎‏‏‎‎‏‎‎‎‏‎‎‎‎‎‎‏‎‎‎‎‏‏‎‏‎‏‎‏‎‎‏‎‎‏‎‏‏‏‏‏‎‎‎‎‏‏‏‏‏‎‏‎‎‎‎To control what happens when the phone is docked and/or sleeping, turn screen saver on.‎‏‎‎‏‎"</string>
+    <string name="screensaver_settings_when_to_dream" msgid="7262410541382890146">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‎‏‎‎‏‏‎‎‏‎‎‏‎‏‎‎‎‎‏‏‏‏‏‎‏‎‎‎‏‏‎‏‎‏‎‎‎‎‏‎‏‏‎‏‏‏‏‏‎‎‏‎‏‎‏‎‎‎‏‎‎When to start‎‏‎‎‏‎"</string>
+    <string name="screensaver_settings_current" msgid="4663846038247130023">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‎‎‎‎‏‎‏‏‏‎‎‏‎‏‎‎‏‏‏‏‎‏‎‎‎‎‏‎‏‏‏‏‏‏‎‎‏‏‎‏‎‏‎‏‎‏‎‎‎‎‏‏‏‎‏‎‎‏‏‏‎Current screen saver‎‏‎‎‏‎"</string>
+    <string name="screensaver_settings_dream_start" msgid="4998187847985120168">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‎‏‎‏‎‏‎‏‏‏‎‏‎‎‏‎‎‎‎‏‎‏‎‏‏‏‎‏‏‎‏‏‏‏‏‏‏‏‎‏‎‎‏‏‏‏‎‎‎‎‏‏‏‎‏‎‏‎‎‎‎Start now‎‏‎‎‏‎"</string>
+    <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="ambient_display_screen_title" msgid="4252755516328775766">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‏‎‏‏‎‎‎‎‎‏‎‎‏‏‎‏‎‎‏‎‏‎‎‏‏‏‎‎‎‎‏‎‏‎‏‏‎‏‎‏‏‏‎‎‎‎‎‏‎‎‎‎‎‏‎‏‎‏‏‎‎Ambient display‎‏‎‎‏‎"</string>
+    <string name="ambient_display_screen_summary_always_on" msgid="7337555569694794132">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‎‏‎‏‏‏‎‏‎‏‎‎‎‎‏‏‏‎‏‏‏‏‏‎‏‎‏‎‎‎‏‎‎‎‏‏‎‏‎‏‏‎‎‎‏‏‏‎‎‎‎‏‏‎‎‏‎‏‎‎‎Always on / Increased battery usage‎‏‎‎‏‎"</string>
+    <string name="ambient_display_screen_summary_notifications" msgid="1449570742600868654">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‎‏‎‎‎‎‎‏‏‏‎‏‏‏‏‎‏‎‎‎‏‏‏‎‏‎‎‏‎‎‎‎‎‏‎‏‏‎‎‎‎‏‏‎‎‎‏‎‎‎‏‏‎‎‏‎‏‏‏‎‎New notifications‎‏‎‎‏‎"</string>
+    <string name="ambient_display_category_triggers" msgid="4359289754456268573">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‏‏‎‎‎‏‏‏‏‏‏‏‎‏‎‎‏‏‏‎‏‏‏‎‏‏‏‏‎‏‏‎‎‏‏‏‎‏‎‏‏‏‎‏‏‎‎‏‏‏‏‏‎‎‎‏‏‏‎‏‎When to show‎‏‎‎‏‎"</string>
+    <string name="doze_title" msgid="2375510714460456687">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‎‎‎‎‏‏‏‏‎‏‏‏‏‎‎‎‎‎‏‎‎‏‏‎‏‎‎‎‏‎‏‎‎‏‏‏‏‎‎‎‏‏‎‎‏‏‎‎‎‏‏‎‏‏‏‎‏‏‏‏‎New notifications‎‏‎‎‏‎"</string>
+    <string name="doze_summary" msgid="3846219936142814032">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‎‏‎‏‎‏‏‎‎‎‎‎‏‎‎‎‎‏‎‎‏‎‏‎‎‏‏‏‎‏‎‏‏‏‎‏‏‏‎‏‎‎‎‏‎‏‏‎‏‎‏‏‎‏‎‏‎‎‎‎‎Wake screen when you receive notifications‎‏‎‎‏‎"</string>
+    <string name="doze_always_on_title" msgid="1046222370442629646">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‎‏‏‏‎‏‎‎‎‎‏‎‎‏‏‏‎‏‏‎‏‏‎‏‏‎‎‏‏‏‏‏‎‏‎‏‎‎‏‎‎‏‏‎‎‏‏‎‏‎‎‏‎‎‎‎‎‏‏‏‎‎Always on‎‏‎‎‏‎"</string>
+    <string name="doze_always_on_summary" msgid="6978257596231155345">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‎‎‎‎‏‏‎‏‎‏‏‏‏‏‎‎‎‎‎‎‎‏‎‎‏‏‏‏‏‎‏‏‎‏‏‎‏‎‎‎‎‏‏‏‎‏‏‏‏‏‏‎‏‎‎‏‎‎‎‏‎Show time, notification icons, and other info. Increased battery usage.‎‏‎‎‏‎"</string>
+    <string name="title_font_size" msgid="4405544325522105222">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‏‏‎‏‎‎‏‎‎‎‏‏‏‎‏‎‎‎‏‏‎‎‏‏‏‎‎‎‏‏‏‏‎‏‎‎‏‏‏‏‏‎‏‏‏‎‏‎‎‎‏‏‏‎‎‎‎‏‏‎‎Font size‎‏‎‎‏‎"</string>
+    <string name="short_summary_font_size" msgid="6819778801232989076">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‏‏‏‎‏‎‏‎‎‏‎‎‏‎‏‏‏‎‎‎‏‎‏‎‏‏‏‏‏‏‎‏‏‏‏‎‎‎‏‏‏‎‏‏‎‏‎‎‏‎‏‏‏‎‎‏‎‏‎‎‎Make text larger or smaller‎‏‎‎‏‎"</string>
+    <string name="sim_lock_settings" msgid="3392331196873564292">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‏‏‏‏‎‎‎‏‎‎‏‏‏‏‏‏‏‎‏‏‎‏‎‎‎‎‎‎‎‎‎‎‏‏‏‎‎‎‎‏‏‏‏‏‏‏‏‎‎‎‎‎‏‎‎‎‎‏‎‎‎SIM card lock settings‎‏‎‎‏‎"</string>
+    <string name="sim_lock_settings_category" msgid="6242052161214271091">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‎‏‏‎‏‎‏‎‎‎‎‎‎‎‏‏‏‎‎‏‎‏‎‏‏‏‏‎‎‏‏‎‏‎‏‎‏‎‏‎‎‎‏‎‏‏‎‎‏‏‏‎‎‏‏‏‎‎‏‏‎SIM card lock‎‏‎‎‏‎"</string>
+    <string name="sim_lock_settings_summary_off" msgid="8028944267104896401">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‏‏‏‏‎‏‏‎‏‏‎‎‏‎‎‎‏‎‏‎‎‏‎‎‎‏‎‏‏‎‎‏‎‎‏‎‎‎‏‏‎‎‏‎‎‏‎‎‎‏‎‏‏‎‎‏‎‎‎‏‎Off‎‏‎‎‏‎"</string>
+    <string name="sim_lock_settings_summary_on" msgid="39103355956342985">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‎‎‎‏‎‎‎‏‎‏‎‏‏‏‎‏‏‎‎‎‏‎‎‏‎‏‏‏‎‎‎‏‎‎‏‎‏‎‎‏‏‎‏‏‎‏‏‎‎‎‎‏‏‎‎‏‎‎‏‎Locked‎‏‎‎‏‎"</string>
+    <string name="sim_lock_settings_title" msgid="9018585580955414596">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‏‏‎‏‎‎‏‎‏‎‎‎‎‏‏‏‎‎‏‏‏‏‎‎‏‏‎‏‏‎‏‎‏‎‎‏‎‏‎‎‏‏‏‎‏‎‏‏‎‎‎‎‎‏‎‎‎‏‎‎‎SIM card lock‎‏‎‎‏‎"</string>
+    <string name="sim_pin_toggle" msgid="1742123478029451888">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‏‎‎‎‎‎‏‎‏‏‎‏‎‏‎‎‎‏‎‎‎‎‎‏‎‎‏‎‏‎‏‏‎‏‏‎‏‏‎‏‎‎‎‎‎‏‎‎‎‎‏‎‎‏‏‏‎‎‎‎‎Lock SIM card‎‏‎‎‏‎"</string>
+    <string name="sim_lock_on" product="tablet" msgid="5058355081270397764">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‎‏‏‎‎‎‏‏‎‎‏‎‏‏‏‎‎‎‏‏‎‎‏‎‎‏‎‏‎‏‏‎‎‏‏‎‏‏‏‎‏‎‏‎‎‎‎‎‏‎‏‏‎‏‎‎‎‏‎‎‎Require PIN to use tablet‎‏‎‎‏‎"</string>
+    <string name="sim_lock_on" product="default" msgid="2503536505568814324">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‎‎‏‎‏‎‏‏‏‏‏‎‎‏‎‏‏‎‎‏‎‎‏‏‎‎‎‎‎‎‎‎‎‎‎‎‏‎‏‎‎‏‏‎‏‏‏‎‎‏‎‎‏‏‏‏‎‏‎‎‎Require PIN to use phone‎‏‎‎‏‎"</string>
+    <string name="sim_lock_off" product="tablet" msgid="2813800553917012356">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‎‏‏‏‎‎‎‎‏‏‎‎‏‎‏‎‎‎‎‎‏‎‏‏‎‎‏‎‎‎‎‏‎‏‎‏‎‎‎‎‎‏‎‏‎‏‎‏‏‎‎‏‏‎‎‎‎‏‎‎‎Require PIN to use tablet‎‏‎‎‏‎"</string>
+    <string name="sim_lock_off" product="default" msgid="258981978215428916">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‎‏‎‏‏‏‎‎‏‏‎‎‎‎‎‎‏‎‏‏‎‏‎‏‏‏‏‎‎‏‎‏‎‏‏‏‎‏‏‎‎‎‎‏‎‎‎‏‏‎‎‏‏‎‎‏‏‎‏‎‎‎Require PIN to use phone‎‏‎‎‏‎"</string>
+    <string name="sim_pin_change" msgid="6311414184279932368">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‎‏‏‏‏‎‎‏‎‏‏‎‏‎‏‎‎‏‎‏‏‏‎‎‎‎‏‎‏‏‏‎‎‏‎‎‎‏‎‏‏‏‎‏‏‏‏‏‏‏‎‏‏‏‎‏‎‎‎‎‎Change SIM PIN‎‏‎‎‏‎"</string>
+    <string name="sim_enter_pin" msgid="6608715137008508432">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‏‎‏‏‏‎‏‏‎‏‏‎‏‏‎‏‏‏‏‏‎‏‏‎‎‏‏‏‎‎‎‏‎‎‏‏‎‎‏‎‎‎‏‏‏‎‎‏‏‏‏‎‎‎‎‏‎‎‎‎‎SIM PIN‎‏‎‎‏‎"</string>
+    <string name="sim_enable_sim_lock" msgid="4517742794997166918">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‏‏‏‎‏‎‏‏‎‎‏‎‎‎‏‏‏‏‏‏‎‎‏‎‎‎‏‎‏‏‎‏‎‎‏‎‎‏‏‎‎‎‏‎‏‏‏‏‎‎‏‏‎‏‎‎‎‏‏‎‎Lock SIM card‎‏‎‎‏‎"</string>
+    <string name="sim_disable_sim_lock" msgid="7664729528754784824">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‏‎‏‎‎‏‎‏‏‏‏‎‏‎‎‏‎‏‏‎‏‏‏‎‎‏‎‏‏‎‎‏‏‏‎‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‏‎‎‎‏‏‏‎‎‎‎Unlock SIM card‎‏‎‎‏‎"</string>
+    <string name="sim_enter_old" msgid="6074196344494634348">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‎‏‎‎‎‏‎‎‏‎‏‏‏‏‏‎‎‎‎‏‎‏‏‎‎‏‎‎‏‎‎‏‎‎‎‏‏‎‎‏‎‏‎‎‎‎‏‏‎‏‎‏‎‏‏‎‏‏‎‎‎Old SIM PIN‎‏‎‎‏‎"</string>
+    <string name="sim_enter_new" msgid="8742727032729243562">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‏‎‎‏‎‏‎‏‎‏‎‎‎‏‏‎‎‏‏‏‏‏‏‎‏‎‏‎‎‏‎‏‎‎‏‎‎‎‎‎‏‎‎‎‎‎‎‎‏‏‏‏‏‎‏‎‏‎‏‎‎New SIM PIN‎‏‎‎‏‎"</string>
+    <string name="sim_reenter_new" msgid="6523819386793546888">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‏‎‏‎‏‎‎‎‏‎‎‏‎‏‎‎‎‎‏‏‎‎‏‎‏‎‏‎‏‏‏‎‏‎‎‎‏‎‏‎‎‎‏‎‏‏‎‏‎‏‎‎‏‎‎‎‏‎‎‎‎Re‑type new PIN‎‏‎‎‏‎"</string>
+    <string name="sim_change_pin" msgid="7328607264898359112">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‎‏‎‏‏‎‏‏‎‏‎‎‎‏‏‏‎‎‎‏‎‏‏‏‏‎‏‎‏‎‎‏‎‎‏‎‏‎‎‏‏‏‎‏‎‎‎‏‏‏‏‏‎‏‎‎‏‎‎‎‎SIM PIN‎‏‎‎‏‎"</string>
+    <string name="sim_bad_pin" msgid="2345230873496357977">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‎‎‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‏‏‎‎‎‎‏‏‎‏‏‏‎‎‏‎‏‏‎‎‎‎‎‏‏‏‏‎‎‎‏‏‎‎‎‏‎‏‏‎‎‏‎Incorrect PIN‎‏‎‎‏‎"</string>
+    <string name="sim_pins_dont_match" msgid="1695021563878890574">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‎‏‏‏‏‎‎‎‎‏‎‏‏‏‏‎‏‏‎‏‎‎‏‎‎‎‎‏‏‎‏‏‏‎‎‏‏‎‏‎‎‎‎‎‏‏‎‏‏‏‎‎‎‏‎‎‏‏‏‎‎PINs don’t match‎‏‎‎‏‎"</string>
+    <string name="sim_change_failed" msgid="3602072380172511475">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‎‎‎‏‏‏‏‏‏‏‎‏‎‎‏‎‎‎‎‏‏‎‏‏‏‏‏‎‏‏‎‎‎‎‏‏‎‏‏‎‏‏‎‏‏‎‏‎‏‎‎‎‏‏‏‏‎‎‏‏‎Can’t change PIN.‎‏‎‎‏‏‎\n‎‏‎‎‏‏‏‎Possibly incorrect PIN.‎‏‎‎‏‎"</string>
+    <string name="sim_change_succeeded" msgid="8556135413096489627">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‎‏‏‎‏‎‏‏‏‏‎‏‎‏‏‏‏‏‏‏‏‏‎‏‎‎‏‏‎‏‏‎‏‎‏‏‏‏‎‎‎‎‎‏‏‎‏‎‎‎‏‎‏‎‎‏‏‎‏‏‎SIM PIN changed successfully‎‏‎‎‏‎"</string>
+    <string name="sim_lock_failed" msgid="2489611099235575984">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‎‎‏‎‏‎‎‎‏‏‎‎‏‏‏‎‎‎‎‎‎‎‎‏‏‎‏‎‏‎‏‎‏‏‏‎‏‏‎‎‏‏‏‎‎‏‏‎‏‎‎‎‏‎‏‏‎‎‎‎‎Can’t change SIM card lock state.‎‏‎‎‏‏‎\n‎‏‎‎‏‏‏‎Possibly incorrect PIN.‎‏‎‎‏‎"</string>
+    <string name="sim_enter_ok" msgid="6475946836899218919">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‏‎‎‏‏‏‎‏‏‏‏‏‎‎‏‎‏‏‏‏‎‏‎‏‎‏‏‎‎‏‎‎‏‏‎‏‏‎‏‏‎‎‎‏‎‏‎‎‎‏‎‏‏‏‏‎‎‏‏‏‎OK‎‏‎‎‏‎"</string>
+    <string name="sim_enter_cancel" msgid="6240422158517208036">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‎‏‏‎‏‎‎‏‏‎‏‎‎‏‏‎‏‏‏‎‏‏‏‎‎‎‏‏‏‏‎‏‎‏‏‎‏‏‏‎‎‏‎‏‎‎‎‎‎‎‏‏‏‏‏‎‎‏‎‎‎Cancel‎‏‎‎‏‎"</string>
+    <string name="sim_multi_sims_title" msgid="9159427879911231239">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‏‏‏‏‎‎‎‏‏‏‎‎‏‏‎‏‎‎‏‏‎‎‏‎‎‎‎‎‏‏‎‎‎‏‏‏‏‏‏‎‏‎‏‏‎‎‎‎‏‏‏‏‎‎‎‎‎‏‏‏‎Multiple SIMs found‎‏‎‎‏‎"</string>
+    <string name="sim_multi_sims_summary" msgid="2698176447067691396">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‎‏‎‏‎‏‏‏‎‎‎‏‏‏‎‏‏‎‎‏‎‎‏‎‏‏‏‎‏‏‎‏‏‏‎‎‏‏‎‎‏‎‏‏‏‎‎‏‏‎‎‏‏‎‎‎‎‏‎‎‎Choose the SIM you prefer for mobile data.‎‏‎‎‏‎"</string>
+    <string name="sim_change_data_title" msgid="294357201685244532">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‎‏‏‏‎‎‎‎‎‏‎‏‎‏‏‏‎‎‎‏‎‎‎‏‎‏‎‎‎‎‏‎‏‏‏‎‏‏‏‎‎‎‎‏‏‎‏‏‏‎‏‎‏‎‎‏‏‏‎‏‎‎‎Change data SIM?‎‏‎‎‏‎"</string>
+    <string name="sim_change_data_message" msgid="5854582807996717811">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‎‎‎‏‎‎‏‏‏‏‏‏‏‎‏‎‏‎‎‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‏‏‎‎‎‎‎‎‏‏‎‏‏‎‏‎‏‏‏‏‎‎‏‏‎Use ‎‏‎‎‏‏‎<xliff:g id="NEW_SIM">%1$s</xliff:g>‎‏‎‎‏‏‏‎ instead of ‎‏‎‎‏‏‎<xliff:g id="OLD_SIM">%2$s</xliff:g>‎‏‎‎‏‏‏‎ for mobile data?‎‏‎‎‏‎"</string>
+    <string name="sim_preferred_title" msgid="5567909634636045268">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‏‏‎‏‎‏‎‎‎‏‎‏‎‎‏‏‎‎‎‎‎‏‎‏‎‎‎‎‎‎‎‎‏‎‎‏‏‏‏‏‎‏‎‎‏‏‎‏‏‎‏‏‏‏‎‏‎‏‎‎‎Update preferred SIM card?‎‏‎‎‏‎"</string>
+    <string name="sim_preferred_message" msgid="8466930554330635780">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‎‏‎‏‏‎‎‎‎‎‎‎‏‎‎‏‎‏‎‎‎‏‏‏‏‎‏‎‏‎‏‏‏‏‎‎‏‏‎‎‎‏‏‏‎‏‎‏‏‏‏‎‎‎‎‎‎‏‎‎‎‎‏‎‎‏‏‎<xliff:g id="NEW_SIM">%1$s</xliff:g>‎‏‎‎‏‏‏‎ is the only SIM in your device. Do you want to use this SIM for mobile data, calls, and SMS messages?‎‏‎‎‏‎"</string>
+    <string name="wrong_pin_code_pukked" msgid="4003655226832658066">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‎‏‏‏‏‎‎‎‏‏‏‏‏‏‎‏‎‏‏‏‎‎‏‏‎‏‏‏‎‏‏‎‏‏‏‎‎‏‏‏‏‏‏‏‎‎‎‏‏‏‏‎‏‎‎‏‎‎‏‎‎Incorrect SIM PIN code you must now contact your carrier to unlock your device.‎‏‎‎‏‎"</string>
+    <plurals name="wrong_pin_code" formatted="false" msgid="1582398808893048097">
+      <item quantity="other">‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‎‏‎‏‏‏‏‏‎‏‎‏‏‏‎‎‏‏‏‏‎‏‎‏‎‏‎‏‎‎‏‏‎‎‎‏‎‎‎‏‎‎‏‎‎‏‎‎‎‏‎‏‎‎‏‎‎‎‎‏‎Incorrect SIM PIN code, you have ‎‏‎‎‏‏‎<xliff:g id="NUMBER_1">%d</xliff:g>‎‏‎‎‏‏‏‎ remaining attempts.‎‏‎‎‏‎</item>
+      <item quantity="one">‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‎‏‎‏‏‏‏‏‎‏‎‏‏‏‎‎‏‏‏‏‎‏‎‏‎‏‎‏‎‎‏‏‎‎‎‏‎‎‎‏‎‎‏‎‎‏‎‎‎‏‎‏‎‎‏‎‎‎‎‏‎Incorrect SIM PIN code, you have ‎‏‎‎‏‏‎<xliff:g id="NUMBER_0">%d</xliff:g>‎‏‎‎‏‏‏‎ remaining attempt before you must contact your carrier to unlock your device.‎‏‎‎‏‎</item>
+    </plurals>
+    <string name="pin_failed" msgid="1848423634948587645">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‏‎‎‏‏‎‏‎‎‏‏‎‏‏‏‎‏‎‏‏‏‎‎‎‎‎‎‎‏‎‏‎‏‎‏‏‏‎‎‎‏‏‎‎‎‎‎‎‎‎‎‎‎‏‏‏‏‏‎‏‎SIM PIN operation failed!‎‏‎‎‏‎"</string>
+    <string name="device_info_settings" product="tablet" msgid="1119755927536987178">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‎‏‏‏‏‏‎‎‎‏‎‏‎‎‎‏‎‏‏‎‎‎‎‎‏‎‏‎‏‎‏‎‏‎‏‏‏‏‏‏‏‏‎‏‎‏‏‏‎‏‏‎‎‎‎‏‎‏‎‏‎‎Tablet status‎‏‎‎‏‎"</string>
+    <string name="device_info_settings" product="default" msgid="475872867864762157">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‎‏‏‏‏‎‏‎‎‏‏‎‏‎‏‎‏‎‎‎‏‏‏‏‎‏‏‎‏‎‎‎‎‏‏‏‏‏‎‏‎‏‎‎‏‏‎‏‎‏‎‏‏‏‎‎‏‎‏‏‎‏‎Phone status‎‏‎‎‏‎"</string>
+    <string name="system_update_settings_list_item_title" msgid="3342887311059985961">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‏‏‏‎‎‏‏‎‎‏‎‎‎‏‎‏‎‎‏‎‎‏‎‎‏‏‎‎‎‏‎‎‏‎‏‏‏‏‏‎‎‏‎‎‎‎‏‎‎‏‏‎‎‎‏‎‏‎‎‏‎System updates‎‏‎‎‏‎"</string>
+    <string name="system_update_settings_list_item_summary" msgid="3853057315907710747"></string>
+    <string name="firmware_version" msgid="4801135784886859972">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‎‎‏‎‏‎‏‎‎‎‎‏‎‎‎‎‏‏‏‏‏‎‎‎‏‏‏‏‎‎‎‏‎‎‎‎‏‎‎‏‏‎‎‎‏‏‏‏‏‎‎‎‏‏‎‎‎‏‎‎‎Android version‎‏‎‎‏‎"</string>
+    <string name="security_patch" msgid="8438384045870296634">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‎‏‎‏‎‎‎‏‏‎‏‏‎‎‏‎‏‎‎‏‏‎‎‏‎‏‎‎‏‏‎‎‏‏‎‎‎‏‏‎‏‏‎‎‎‎‏‎‏‏‏‎‎‎‏‏‏‎‏‎‎Android security patch level‎‏‎‎‏‎"</string>
+    <string name="model_info" msgid="1952009518045740889">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‏‎‏‏‎‎‎‏‎‏‏‎‏‏‏‎‏‏‏‎‎‏‎‏‎‎‎‎‏‎‎‎‎‎‎‏‎‏‎‎‏‏‎‎‎‎‏‏‏‏‏‏‎‏‎‏‏‎‎‏‎Model‎‏‎‎‏‎"</string>
+    <string name="hardware_info" msgid="2605080746512527805">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‎‏‎‎‎‎‏‎‎‏‏‏‎‎‎‏‏‎‏‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‎‎‎‏‎‏‏‎‏‎‏‏‎‎‎‏‏‎‏‏‏‏‎‏‎Model &amp; hardware‎‏‎‎‏‎"</string>
+    <string name="hardware_revision" msgid="8893547686367095527">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‏‎‏‏‎‏‏‎‏‏‎‎‎‎‏‏‏‎‏‎‏‎‎‎‎‎‎‎‎‎‏‎‏‏‏‎‏‏‏‎‏‎‎‎‎‏‏‎‏‎‏‎‏‏‏‎‎‏‏‏‎Hardware version‎‏‎‎‏‎"</string>
+    <string name="fcc_equipment_id" msgid="149114368246356737">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‎‏‎‏‎‎‎‎‏‎‎‎‏‏‏‎‎‎‎‏‎‏‎‏‏‏‎‏‎‎‏‎‏‎‏‏‎‎‎‏‏‏‎‏‏‎‎‎‏‏‎‏‏‎‎‎‎‎‎‎‏‎Equipment ID‎‏‎‎‏‎"</string>
+    <string name="baseband_version" msgid="1848990160763524801">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‏‎‎‏‏‎‏‎‏‎‎‎‏‏‏‎‏‏‏‎‏‏‎‎‎‎‎‏‎‎‏‏‏‏‎‏‏‎‎‎‎‎‎‎‏‎‎‏‎‏‏‎‏‏‎‎‎‎‎‏‎Baseband version‎‏‎‎‏‎"</string>
+    <string name="kernel_version" msgid="9192574954196167602">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‏‏‏‏‏‎‎‏‎‎‏‎‏‎‎‏‎‏‏‎‎‎‏‏‎‏‏‏‎‏‏‎‏‏‎‎‎‎‎‎‎‎‏‏‏‏‏‎‏‎‏‏‏‎‏‏‎‎‏‎‎Kernel version‎‏‎‎‏‎"</string>
+    <string name="build_number" msgid="3075795840572241758">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‏‎‏‎‏‎‏‎‏‏‏‏‎‏‏‎‏‏‎‎‎‎‎‎‎‏‎‏‎‏‎‎‏‏‏‎‏‏‏‎‏‏‏‎‏‎‏‏‎‏‏‏‎‏‎‏‏‏‏‎‎Build number‎‏‎‎‏‎"</string>
+    <string name="device_info_not_available" msgid="8062521887156825182">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‏‏‏‏‏‏‏‎‎‎‏‏‏‏‎‏‎‏‎‎‏‏‏‏‎‎‎‎‎‏‏‏‎‏‎‏‏‏‎‎‏‎‏‏‎‏‏‎‏‏‎‎‎‏‎‏‏‏‏‎‎Not available‎‏‎‎‏‎"</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 of the battery, network, and other information‎‏‎‎‏‎"</string>
+    <string name="device_status_summary" product="default" msgid="2599162787451519618">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‎‏‎‎‎‎‎‏‎‎‏‎‎‎‎‏‎‏‎‎‏‏‎‎‏‎‎‎‏‏‎‎‎‎‏‏‎‏‏‏‎‏‏‎‎‏‎‎‎‎‏‎‏‎‎‎‎‎‏‎‎Phone number, signal, etc.‎‏‎‎‏‎"</string>
+    <string name="storage_settings" msgid="4211799979832404953">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‏‎‏‎‎‏‏‏‎‎‏‏‎‏‎‏‎‎‎‏‏‏‎‎‎‏‎‎‎‎‏‏‏‏‏‎‏‏‏‎‏‎‎‎‎‏‏‎‏‎‏‏‏‏‎‏‏‎‎‏‎Storage‎‏‎‎‏‎"</string>
+    <string name="storage_usb_settings" msgid="7293054033137078060">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‎‏‎‏‎‎‏‏‎‏‏‎‎‎‏‎‎‎‏‎‎‎‎‎‎‎‎‎‏‎‏‏‏‏‎‎‏‏‎‏‏‏‎‏‏‎‎‎‏‏‏‏‎‎‏‎‏‏‎‎‎Storage‎‏‎‎‏‎"</string>
+    <string name="storage_settings_title" msgid="8746016738388094064">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‏‎‎‏‎‏‏‎‎‎‎‎‎‎‎‏‎‏‏‏‏‏‏‎‎‎‏‎‏‎‎‏‏‎‏‏‎‎‏‏‏‏‏‎‎‎‏‎‏‏‎‎‎‏‏‏‎‎‎‎‎Storage settings‎‏‎‎‏‎"</string>
+    <string name="storage_settings_summary" product="nosdcard" msgid="3543813623294870759">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‎‎‎‏‎‎‏‎‏‏‏‎‎‎‏‎‎‏‏‏‏‎‏‏‎‏‏‎‏‏‏‎‎‏‏‎‏‎‏‎‏‏‏‎‎‏‎‎‎‏‎‎‏‏‏‎‎‏‏‏‎Unmount USB storage, view available storage‎‏‎‎‏‎"</string>
+    <string name="storage_settings_summary" product="default" msgid="9176693537325988610">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‏‏‏‏‎‏‎‏‏‎‏‎‎‎‏‎‏‎‏‎‎‎‏‎‎‏‏‎‏‏‏‎‏‎‎‎‏‏‏‏‎‎‎‎‎‎‏‏‏‎‏‏‎‎‎‎‎‎‏‎‎Unmount SD card, view available storage‎‏‎‎‏‎"</string>
+    <string name="status_number" product="tablet" msgid="1138837891091222272">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‎‏‏‏‏‏‏‎‎‏‏‎‏‏‏‏‏‎‏‏‏‎‎‎‎‎‏‏‏‎‎‏‏‎‎‏‏‎‎‏‏‏‏‏‏‎‏‎‎‏‏‏‏‎‎‎‎‎‎‎‎‎MDN‎‏‎‎‏‎"</string>
+    <string name="status_number" product="default" msgid="5123197324870153205">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‎‏‏‏‎‎‎‏‏‎‎‏‎‏‎‎‎‎‎‎‏‏‎‏‎‎‏‎‏‎‏‏‎‏‏‏‎‎‎‏‏‏‎‏‏‏‏‏‎‎‏‏‏‏‏‏‎‏‎‏‎My phone number‎‏‎‎‏‎"</string>
+    <string name="status_min_number" msgid="3519504522179420597">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‎‎‎‎‏‏‎‏‎‏‏‏‏‏‎‎‏‎‏‎‏‎‏‏‎‏‏‏‎‎‏‏‏‏‎‏‏‏‏‎‎‎‏‎‏‎‏‎‎‎‎‏‏‎‏‏‎‏‎‏‎MIN‎‏‎‎‏‎"</string>
+    <string name="status_msid_number" msgid="909010114445780530">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‎‏‏‎‎‏‎‎‏‏‏‎‏‎‏‏‏‎‎‏‏‏‏‏‎‎‎‏‎‎‎‎‎‏‎‎‎‏‏‎‎‎‏‏‏‎‎‏‎‎‏‏‎‎‎‏‏‎‎‏‎‎MSID‎‏‎‎‏‎"</string>
+    <string name="status_prl_version" msgid="1007470446618081441">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‎‏‏‎‏‏‏‏‏‏‎‏‏‎‏‎‎‎‎‎‏‎‎‎‎‏‎‎‎‏‎‎‎‏‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‏‎‎‎‏‎‏‎‎‎‎‏‎PRL version‎‏‎‎‏‎"</string>
+    <string name="status_meid_number" msgid="1751442889111731088">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‏‎‎‎‎‏‎‎‏‏‏‎‎‏‏‎‎‎‎‎‎‎‎‎‎‏‏‏‎‎‏‏‎‎‎‏‏‏‏‎‎‎‏‏‎‏‏‏‏‎‏‏‏‎‎‏‎‎‎‎‎MEID‎‏‎‎‏‎"</string>
+    <string name="status_icc_id" msgid="943368755577172747">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‎‏‏‎‏‎‎‎‏‎‏‏‏‏‎‎‎‎‏‎‎‏‏‏‎‎‎‏‎‏‎‎‏‎‎‎‎‎‏‏‎‎‎‎‏‎‎‏‏‎‎‏‏‎‎‎‎‏‎‏‏‎ICCID‎‏‎‎‏‎"</string>
+    <string name="status_network_type" msgid="3279383550222116235">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‏‏‎‏‏‎‎‎‎‎‏‎‏‎‏‏‎‏‎‏‏‏‏‏‎‏‏‎‏‏‎‎‏‎‎‏‎‎‏‏‏‏‏‏‏‎‏‎‎‏‎‏‏‎‎‎‏‎‏‏‎Mobile network type‎‏‎‎‏‎"</string>
+    <string name="status_latest_area_info" msgid="7222470836568238054">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‎‏‎‎‎‎‏‏‏‎‏‏‎‏‎‏‏‏‏‎‏‏‏‏‎‏‎‏‏‎‏‎‎‏‏‎‎‏‎‎‎‏‎‎‏‎‏‎‎‏‏‏‏‏‏‎‎‏‏‎‎Operator info‎‏‎‎‏‎"</string>
+    <string name="status_data_state" msgid="5503181397066522950">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‏‏‎‎‎‏‎‏‏‏‏‏‎‎‏‏‏‎‏‎‎‏‎‏‎‎‏‎‏‏‎‏‎‎‏‎‏‎‏‏‎‎‎‎‎‎‏‎‎‎‎‏‎‏‎‎‎‏‏‎‎Mobile network state‎‏‎‎‏‎"</string>
+    <string name="status_service_state" msgid="2323931627519429503">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‎‎‎‎‎‏‎‎‎‎‎‎‎‏‎‎‎‎‏‏‏‎‎‎‎‎‎‎‏‎‏‎‎‏‎‎‏‎‎‏‎‏‏‏‎‏‎‎‏‎‏‏‎‏‏‏‏‏‏‏‎Service state‎‏‎‎‏‎"</string>
+    <string name="status_signal_strength" msgid="3732655254188304547">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‎‎‏‏‏‏‎‎‏‏‎‏‎‎‎‎‏‏‏‎‎‎‏‎‏‏‎‏‎‏‎‏‏‏‏‎‏‏‏‎‎‎‏‏‏‎‏‎‏‎‎‎‏‎‏‎‎‎‏‏‎Signal strength‎‏‎‎‏‎"</string>
+    <string name="status_roaming" msgid="2638800467430913403">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‎‏‎‎‏‎‎‏‏‏‏‎‏‏‏‎‎‏‏‏‎‎‎‎‏‎‏‏‎‏‎‎‏‏‏‎‎‏‎‏‏‎‏‎‏‎‏‏‎‏‎‏‎‏‏‏‏‎‏‏‎Roaming‎‏‎‎‏‎"</string>
+    <string name="status_operator" msgid="2274875196954742087">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‏‏‏‏‏‎‎‏‎‎‎‏‏‏‏‏‏‎‏‎‏‏‏‏‎‎‎‎‎‏‎‏‎‏‏‎‏‏‎‏‎‏‎‏‏‎‎‎‏‏‎‏‎‏‎‎‎‏‏‏‎Network‎‏‎‎‏‎"</string>
+    <string name="status_wifi_mac_address" msgid="2202206684020765378">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‏‏‏‎‏‎‎‎‏‏‏‏‏‏‎‎‏‏‏‏‎‏‎‎‏‏‏‏‏‎‏‏‎‎‏‏‎‎‎‎‏‏‎‎‎‏‏‏‎‎‏‎‏‏‎‎‎‎‏‎‎Wi‑Fi MAC address‎‏‎‎‏‎"</string>
+    <string name="status_bt_address" msgid="4195174192087439720">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‏‎‏‎‎‎‏‏‏‎‎‎‎‏‎‎‎‎‎‎‏‎‏‏‎‎‏‏‎‏‏‎‎‎‏‎‎‏‎‎‎‎‏‎‎‎‎‏‏‎‎‏‎‏‏‎‏‎‎‎‎Bluetooth address‎‏‎‎‏‎"</string>
+    <string name="status_serial_number" msgid="2257111183374628137">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‏‏‏‏‎‏‎‏‎‎‏‎‏‏‎‏‏‏‏‎‏‎‏‎‏‎‎‏‏‎‎‏‏‏‏‏‏‎‎‏‏‎‏‏‎‎‏‏‎‏‎‏‎‎‏‎‏‎‎‏‎Serial number‎‏‎‎‏‎"</string>
+    <string name="status_up_time" msgid="7294859476816760399">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‎‏‎‏‎‎‏‏‏‏‎‎‏‎‎‎‏‏‎‎‎‎‎‎‏‎‏‏‎‏‎‏‏‎‏‎‎‎‎‎‏‏‏‎‎‎‎‎‏‏‏‎‎‏‎‎‏‏‏‏‎Up time‎‏‎‎‏‎"</string>
+    <string name="status_awake_time" msgid="2393949909051183652">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‎‎‎‏‎‎‏‏‏‎‎‏‎‎‎‎‎‏‎‎‏‏‎‎‎‎‏‎‎‎‏‏‎‎‏‏‎‎‎‏‎‎‏‏‎‎‎‏‎‎‏‎‎‎‏‎‎‏‎‎‎Awake time‎‏‎‎‏‎"</string>
+    <string name="internal_memory" msgid="9129595691484260784">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‏‏‏‎‏‎‏‏‎‎‏‎‏‏‎‏‎‏‏‎‏‏‏‎‏‎‎‏‎‎‏‎‎‏‎‏‏‏‎‏‏‎‏‏‎‎‏‎‏‎‎‏‏‎‏‏‎‎‎‎‎Internal storage‎‏‎‎‏‎"</string>
+    <string name="sd_memory" product="nosdcard" msgid="2510246194083052841">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‎‎‏‎‏‏‎‏‎‏‏‎‎‎‏‎‏‏‏‏‏‎‎‏‏‏‎‏‎‎‎‏‏‎‎‏‎‎‎‏‏‎‎‎‏‎‏‏‏‏‎‏‎‎‏‎‏‎‎‏‎USB storage‎‏‎‎‏‎"</string>
+    <string name="sd_memory" product="default" msgid="151871913888051515">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‎‏‎‏‎‎‎‎‏‏‎‏‏‏‎‎‎‏‏‏‎‏‎‏‏‎‎‏‏‎‏‏‏‎‏‏‎‏‎‏‎‎‏‏‏‏‏‏‏‎‎‎‏‎‎‏‏‏‎‏‏‎SD card‎‏‎‎‏‎"</string>
+    <string name="memory_available" msgid="5052397223077021181">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‎‏‏‎‎‎‎‏‏‏‎‏‏‎‏‏‏‎‎‎‏‎‎‎‎‎‎‏‎‏‏‏‎‎‎‏‏‎‏‎‏‏‎‏‎‎‎‎‎‏‎‏‏‏‏‏‏‏‎‏‎Available‎‏‎‎‏‎"</string>
+    <string name="memory_available_read_only" msgid="6497534390167920206">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‏‎‏‎‎‎‏‎‏‎‏‏‏‏‏‎‎‎‎‏‎‎‎‏‏‎‏‎‎‎‏‏‏‎‎‏‏‏‎‏‎‏‏‏‏‏‎‏‏‏‏‎‎‏‎‎‏‏‏‎‎Available (read-only)‎‏‎‎‏‎"</string>
+    <string name="memory_size" msgid="6629067715017232195">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‏‎‏‏‏‏‏‏‏‏‏‏‎‎‏‎‏‏‎‏‏‏‏‏‎‏‏‎‏‏‏‎‏‎‎‏‏‎‎‏‏‏‎‎‏‏‎‎‏‏‏‏‎‏‎‎‎‎‏‏‎Total space‎‏‎‎‏‎"</string>
+    <string name="memory_calculating_size" msgid="2188358544203768588">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‏‏‏‎‎‏‎‏‏‏‏‎‏‎‎‏‏‏‎‎‏‎‎‎‎‎‎‎‎‏‏‎‎‏‎‎‎‏‏‏‎‏‎‎‏‏‏‎‎‎‏‏‎‎‎‎‏‏‎‎‎Calculating…‎‏‎‎‏‎"</string>
+    <string name="memory_apps_usage" msgid="5128673488173839077">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‎‏‏‏‎‎‏‎‏‏‎‎‏‎‏‏‎‏‎‏‎‏‎‏‏‏‎‏‎‏‎‏‎‏‏‏‏‎‎‏‎‎‎‎‏‎‏‏‎‎‏‎‏‏‏‎‎‏‎‏‎Apps &amp; app data‎‏‎‎‏‎"</string>
+    <string name="memory_media_usage" msgid="3738830697707880405">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‎‎‏‏‏‏‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‎‏‏‎‏‎‏‏‏‎‏‏‏‎‎‎‎‏‏‎‏‎‎‎‎‏‏‏‏‏‏‏‏‎‏‎‏‎‏‎Media‎‏‎‎‏‎"</string>
+    <string name="memory_downloads_usage" msgid="3755173051677533027">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‎‏‎‎‎‎‎‏‏‏‎‏‎‎‎‎‏‏‎‏‏‏‏‏‏‏‏‎‏‎‏‎‎‏‏‏‎‏‎‏‏‎‏‏‏‏‏‎‎‎‏‏‎‏‏‎‎‎‏‏‎Downloads‎‏‎‎‏‎"</string>
+    <string name="memory_dcim_usage" msgid="558887013613822577">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‎‏‏‏‏‏‏‏‎‎‎‎‎‏‏‎‎‏‎‎‎‎‏‏‎‎‎‏‏‏‎‎‎‏‏‏‎‎‎‎‎‎‎‏‏‏‏‏‏‎‎‎‏‎‎‏‏‏‎‎‎‏‎Pictures, videos‎‏‎‎‏‎"</string>
+    <string name="memory_music_usage" msgid="1363785144783011606">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‎‎‏‎‏‏‏‎‏‏‎‏‎‎‏‎‎‎‏‏‎‏‎‏‏‏‎‏‎‎‎‏‎‎‎‎‏‎‏‏‏‏‏‎‏‏‏‏‏‏‏‏‎‎‎‏‎‏‏‎‎Audio (music, ringtones, podcasts, etc.)‎‏‎‎‏‎"</string>
+    <string name="memory_media_misc_usage" msgid="6094866738586451683">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‎‏‎‎‏‎‎‏‎‏‎‏‎‏‎‏‎‎‎‏‎‎‎‎‎‎‎‏‏‎‏‏‏‎‏‎‏‏‎‎‏‎‎‏‏‏‏‏‏‏‏‎‏‏‏‎‎‎‏‏‎Other files‎‏‎‎‏‎"</string>
+    <string name="memory_media_cache_usage" msgid="6704293333141177910">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‏‏‎‏‎‎‎‎‏‎‏‎‎‏‏‎‏‏‏‏‎‏‎‎‎‎‏‏‏‏‏‏‏‏‏‏‏‏‏‎‎‏‏‎‎‏‎‎‎‏‏‎‎‎‏‏‎‏‏‎‎Cached data‎‏‎‎‏‎"</string>
+    <string name="sd_eject" product="nosdcard" msgid="4988563376492400073">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‎‏‎‏‎‎‏‏‏‎‏‎‏‏‏‎‏‏‏‏‏‏‏‏‎‏‎‏‏‏‎‏‏‎‏‏‎‏‎‏‏‎‏‎‎‏‎‎‏‏‎‏‏‏‎‎‏‎‎‏‎Unmount shared storage‎‏‎‎‏‎"</string>
+    <string name="sd_eject" product="default" msgid="6915293408836853020">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‏‏‏‏‏‏‏‏‏‎‎‎‎‎‎‎‏‏‏‎‏‎‏‏‎‏‏‏‎‏‏‎‏‏‏‏‎‏‎‏‎‎‏‎‎‎‎‏‏‏‎‏‎‎‎‏‏‏‎‎‎Unmount SD card‎‏‎‎‏‎"</string>
+    <string name="sd_eject_summary" product="nosdcard" msgid="5009296896648072891">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‎‏‎‏‏‎‎‎‎‏‎‎‏‎‎‏‏‎‎‎‏‏‏‏‏‏‎‎‏‎‏‏‎‎‏‏‎‎‏‎‏‏‎‎‏‏‎‎‏‏‏‎‏‎‏‏‏‎‏‏‎Unmount the internal USB storage‎‏‎‎‏‎"</string>
+    <string name="sd_eject_summary" product="default" msgid="3300599435073550246">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‏‏‎‏‏‏‎‎‏‏‏‎‎‎‎‏‎‏‎‏‏‎‏‏‎‎‏‎‏‏‏‎‏‎‎‏‎‏‏‎‏‎‎‏‏‏‏‏‎‏‏‏‏‎‏‎‎‏‏‎‎Unmount the SD card so you can safely remove it‎‏‎‎‏‎"</string>
+    <string name="sd_insert_summary" product="nosdcard" msgid="5264016886409577313">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‏‎‎‏‎‎‎‎‏‏‎‏‏‎‎‎‏‎‏‏‎‏‏‏‎‏‏‏‏‏‎‏‏‏‏‎‎‎‎‏‏‎‎‏‏‏‎‎‎‎‏‏‎‏‏‎‎‎‎‏‎Insert USB storage for mounting‎‏‎‎‏‎"</string>
+    <string name="sd_insert_summary" product="default" msgid="2048640010381803841">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‏‏‎‎‎‏‏‎‏‏‏‎‎‎‏‏‏‎‏‏‎‎‏‏‏‏‎‎‎‎‏‏‏‎‏‏‎‏‏‏‎‏‎‏‏‏‎‎‎‎‎‏‎‏‎‎‎‎‎‏‎Insert an SD card for mounting‎‏‎‎‏‎"</string>
+    <string name="sd_mount" product="nosdcard" msgid="8966695015677343116">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‏‏‎‎‎‏‏‏‎‎‎‎‎‎‎‏‏‎‎‏‏‎‎‏‏‎‏‏‏‏‏‏‎‎‏‎‏‎‏‏‎‏‏‎‏‎‏‏‎‏‎‏‏‎‎‎‏‏‎‎‎Mount USB storage‎‏‎‎‏‎"</string>
+    <string name="sd_mount" product="default" msgid="5940523765187704135">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‎‎‏‎‎‏‏‏‎‎‎‎‏‏‏‏‏‎‏‎‏‏‏‎‎‎‏‏‏‏‏‎‎‎‏‏‏‏‎‎‎‏‏‏‎‏‏‏‎‏‎‏‎‏‎‎‎‏‏‏‎Mount SD card‎‏‎‎‏‎"</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">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‏‏‎‏‏‏‎‎‏‏‏‏‏‏‎‏‏‏‎‏‏‎‏‎‏‎‏‎‎‏‏‏‏‏‏‎‏‏‏‏‎‎‏‏‏‏‎‎‎‎‏‎‏‎‏‎‏‏‏‎‎Erase USB storage‎‏‎‎‏‎"</string>
+    <string name="sd_format" product="default" msgid="2576054280507119870">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‎‎‏‏‏‎‏‏‏‏‏‏‏‏‏‏‏‎‏‏‏‎‏‏‏‎‎‎‎‎‏‏‎‏‏‏‏‏‎‎‎‎‎‎‎‏‎‏‏‎‎‎‏‏‏‏‏‏‏‎‎Erase SD card‎‏‎‎‏‎"</string>
+    <string name="sd_format_summary" product="nosdcard" msgid="6331905044907914603">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‎‏‏‏‏‏‎‏‏‏‏‏‎‏‏‏‎‎‏‎‎‎‎‏‎‏‏‏‎‎‏‎‏‎‎‏‎‎‏‏‏‏‎‏‎‏‏‏‎‏‎‏‎‏‏‎‏‎‏‏‎Erases all data on the internal USB storage, such as music and photos‎‏‎‎‏‎"</string>
+    <string name="sd_format_summary" product="default" msgid="212703692181793109">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‎‏‎‏‎‏‏‏‏‎‎‏‏‏‎‏‎‏‏‎‎‏‏‏‎‎‎‎‏‏‎‎‎‏‏‏‎‏‏‏‎‏‎‎‎‏‏‏‎‏‎‎‏‎‏‎‏‎‏‎‏‎Erases all data on the SD card, such as music and photos‎‏‎‎‏‎"</string>
+    <string name="memory_clear_cache_title" msgid="5423840272171286191">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‏‎‏‏‎‏‎‎‎‏‎‏‎‏‎‏‏‎‎‏‏‏‏‏‏‏‎‏‏‎‏‎‎‏‎‏‎‎‏‏‏‎‏‎‎‎‏‏‏‏‏‎‏‎‏‎‏‏‏‏‎Clear cached data?‎‏‎‎‏‎"</string>
+    <string name="memory_clear_cache_message" msgid="4550262490807415948">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‏‏‏‏‎‎‏‎‎‏‎‏‏‏‎‎‎‏‏‏‏‎‏‎‎‎‎‎‏‎‎‎‎‏‏‏‎‏‎‏‏‏‎‎‎‎‏‏‎‏‎‎‏‎‎‎‏‏‎‎‎This will clear cached data for all apps.‎‏‎‎‏‎"</string>
+    <string name="mtp_ptp_mode_summary" msgid="3710436114807789270">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‎‎‏‏‎‏‏‏‏‏‏‎‎‎‎‏‏‏‎‏‏‏‏‏‏‏‎‎‏‏‎‏‏‎‎‎‏‏‏‎‎‏‏‎‎‎‎‏‎‏‏‎‏‏‎‏‎‏‏‎‎MTP or PTP function is active‎‏‎‎‏‎"</string>
+    <string name="dlg_confirm_unmount_title" product="nosdcard" msgid="3077285629197874055">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‏‎‏‎‏‎‏‏‎‏‎‎‏‎‏‏‎‏‏‎‏‏‏‏‏‎‎‏‏‏‎‎‎‎‎‎‏‏‎‎‎‎‎‎‏‏‏‏‎‎‏‏‏‎‎‎‎‏‏‏‎Unmount USB storage?‎‏‎‎‏‎"</string>
+    <string name="dlg_confirm_unmount_title" product="default" msgid="3634502237262534381">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‎‎‏‎‎‏‏‏‎‎‎‎‎‏‎‏‏‎‎‎‏‎‎‎‎‏‏‏‎‏‎‎‎‎‏‏‎‏‏‎‎‏‎‏‎‏‎‏‎‏‏‎‏‏‏‎‏‏‎‏‎Unmount SD card?‎‏‎‎‏‎"</string>
+    <string name="dlg_confirm_unmount_text" product="nosdcard" msgid="4322636662873269018">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‏‎‏‏‏‏‏‏‏‏‎‏‎‎‎‏‎‏‏‏‎‎‏‎‎‏‎‎‎‏‏‏‏‏‏‏‏‎‏‎‎‏‎‎‎‎‏‎‎‎‏‏‎‎‎‏‏‎‏‎‎If you unmount the USB storage, some apps you are using will stop and may be unavailable until you remount the USB storage.‎‏‎‎‏‎"</string>
+    <string name="dlg_confirm_unmount_text" product="default" msgid="6998379994779187692">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‎‎‎‏‎‎‎‏‏‏‏‏‎‎‏‏‏‏‎‏‏‎‎‎‎‏‏‎‏‎‏‏‏‎‎‎‎‎‎‎‎‎‏‏‎‏‏‏‏‎‎‏‏‏‏‎‏‏‎‎‎If you unmount the SD card, some apps you are using will stop and may be unavailable until you remount the SD card.‎‏‎‎‏‎"</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">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‏‏‏‏‏‎‎‎‏‏‏‎‏‏‎‏‎‏‎‏‏‎‏‏‏‎‏‏‎‏‎‎‎‎‎‏‏‎‎‏‏‏‎‎‏‏‏‏‎‎‎‏‏‎‎‎‎‎‏‏‎Couldn’t unmount USB storage. Try again later.‎‏‎‎‏‎"</string>
+    <string name="dlg_error_unmount_text" product="default" msgid="3500976899159848422">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‎‎‎‎‏‎‎‏‎‏‎‏‏‏‏‏‎‏‏‏‏‏‏‏‎‎‎‎‏‏‎‏‏‎‎‏‎‏‎‎‎‏‎‏‎‏‏‏‎‏‎‏‏‏‏‎‎‏‏‎‎Couldn’t unmount SD card. Try again later.‎‏‎‎‏‎"</string>
+    <string name="unmount_inform_text" product="nosdcard" msgid="7120241136790744265">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‎‎‏‎‏‏‎‏‎‎‎‎‎‎‏‎‏‏‎‏‏‎‎‏‎‏‏‎‏‏‎‏‏‎‎‏‏‎‎‎‏‎‎‏‎‎‏‎‏‏‎‎‏‏‎‎‏‎‎‏‎USB storage will be unmounted.‎‏‎‎‏‎"</string>
+    <string name="unmount_inform_text" product="default" msgid="1904212716075458402">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‏‎‏‎‎‏‏‎‏‏‎‏‎‎‎‏‏‏‏‏‎‏‏‎‎‎‎‎‎‏‎‏‎‏‏‎‎‏‏‏‎‏‎‏‏‎‎‏‏‏‏‏‎‏‏‎‎‎‏‎‎SD card will be unmounted.‎‏‎‎‏‎"</string>
+    <string name="sd_ejecting_title" msgid="8824572198034365468">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‏‎‏‎‎‏‏‏‎‏‏‏‎‎‏‎‏‏‎‏‏‎‏‎‏‎‎‎‏‏‎‏‎‏‏‎‏‎‏‎‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‏‏‎‎‎Unmounting‎‏‎‎‏‎"</string>
+    <string name="sd_ejecting_summary" msgid="2028753069184908491">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‏‏‎‎‎‎‏‎‎‏‏‏‏‎‎‏‎‏‎‎‎‎‏‎‏‎‏‎‏‏‏‎‏‎‎‏‏‎‏‏‏‏‏‏‏‏‏‏‏‏‎‎‏‏‎‎‏‎‏‏‎Unmount in progress‎‏‎‎‏‎"</string>
+    <string name="storage_low_title" msgid="1388569749716225155">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‎‎‏‏‎‏‎‎‎‏‎‏‎‎‏‏‎‎‎‎‏‏‎‏‎‏‎‎‏‎‎‏‎‏‎‏‏‎‏‏‎‎‎‎‎‏‎‎‏‏‎‎‏‎‎‎‎‎‏‏‎Storage space is running out‎‏‎‎‏‎"</string>
+    <string name="storage_low_summary" msgid="7737465774892563129">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‏‎‏‏‎‏‏‎‎‎‎‏‎‎‎‎‎‎‎‎‎‎‏‎‎‎‎‎‏‎‎‏‏‏‏‎‎‎‏‏‎‏‏‎‏‎‏‏‏‎‏‎‏‎‏‏‏‎‎‏‎Some system functions, such as syncing, may not work correctly. Try to free space by deleting or unpinning items, such as apps or media content.‎‏‎‎‏‎"</string>
+    <string name="storage_menu_rename" msgid="7141058657592615390">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‎‎‏‏‎‎‎‏‏‎‏‎‎‎‏‎‎‎‏‏‎‎‎‎‎‎‏‏‏‎‎‏‏‏‏‎‎‎‎‎‏‎‎‏‎‎‏‎‎‎‎‏‏‏‎‏‏‏‏‎‎Rename‎‏‎‎‏‎"</string>
+    <string name="storage_menu_mount" msgid="1014683672493425425">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‎‏‏‏‎‎‎‎‏‎‏‎‎‏‏‏‎‎‎‎‏‎‏‏‎‏‏‎‎‏‎‎‏‎‎‏‎‎‏‎‏‏‏‎‎‎‎‎‎‎‎‏‏‎‎‎‏‎‎‎‏‎Mount‎‏‎‎‏‎"</string>
+    <string name="storage_menu_unmount" msgid="681485356885955898">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‎‏‎‎‏‎‏‏‏‎‏‎‏‎‎‎‏‏‏‏‏‎‏‎‏‎‎‏‎‎‏‎‎‏‎‎‎‏‏‎‏‎‎‎‏‎‏‎‏‎‏‎‏‎‎‏‏‏‎‏‎‎Eject‎‏‎‎‏‎"</string>
+    <string name="storage_menu_format" msgid="7690626079653152152">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‏‎‏‎‏‎‏‏‏‎‏‎‏‎‎‏‎‏‏‏‏‎‏‎‏‏‎‎‎‎‏‏‏‎‏‎‎‎‎‏‎‏‎‎‏‏‎‎‎‏‎‏‏‎‎‏‏‎‎‎‎Format‎‏‎‎‏‎"</string>
+    <string name="storage_menu_format_public" msgid="7464714208010125682">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‎‏‏‏‏‎‎‏‎‏‏‏‏‏‏‏‏‏‏‎‎‎‎‎‎‏‎‏‏‎‏‏‏‏‏‎‎‏‎‎‎‎‎‏‎‏‎‎‎‎‎‏‎‏‏‏‎‎‏‎‎Format as portable‎‏‎‎‏‎"</string>
+    <string name="storage_menu_format_private" msgid="546017531835902096">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‎‏‏‏‏‏‏‎‎‏‎‎‏‏‏‏‎‏‏‎‎‎‎‎‎‎‏‏‎‏‎‏‏‎‎‎‏‎‎‎‏‏‎‏‏‎‏‏‏‎‏‎‎‎‏‎‎‏‎‎‎‎‎Format as internal‎‏‎‎‏‎"</string>
+    <string name="storage_menu_migrate" msgid="3969621494238154294">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‎‏‏‏‎‎‎‏‎‏‏‎‏‏‏‎‏‏‎‏‏‎‏‏‎‏‏‏‏‎‎‏‎‎‎‎‏‏‎‏‎‎‏‎‎‎‎‎‏‏‏‎‎‎‏‏‎‏‏‎‎Migrate data‎‏‎‎‏‎"</string>
+    <string name="storage_menu_forget" msgid="6305824238997983426">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‎‏‏‏‏‎‎‎‎‎‏‎‏‏‎‎‏‎‎‏‏‎‏‏‏‏‎‎‎‏‎‏‎‏‎‏‏‎‎‎‎‏‎‏‏‏‎‏‎‎‎‎‏‏‎‎‎‎‏‎‎Forget‎‏‎‎‏‎"</string>
+    <string name="storage_menu_set_up" msgid="4263294929451685366">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‏‎‏‏‎‎‏‎‏‎‏‎‎‏‎‎‎‏‎‎‎‎‏‎‎‏‏‎‏‎‎‎‎‎‏‎‏‎‏‏‎‎‎‏‎‎‎‏‎‏‎‏‏‏‏‏‎‏‏‎‎Set up‎‏‎‎‏‎"</string>
+    <string name="storage_menu_explore" msgid="4637496051816521560">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‎‎‎‎‎‏‎‏‏‎‏‏‏‎‏‏‎‎‏‎‎‎‎‏‎‏‏‎‏‎‏‎‏‏‏‏‏‏‎‎‏‏‎‎‏‏‎‏‏‏‏‏‎‏‎‏‏‎‎‎‎Explore‎‏‎‎‏‎"</string>
+    <string name="storage_menu_free" msgid="6386070442027135427">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‏‎‎‎‏‎‎‏‏‏‏‏‏‏‏‎‎‎‎‏‎‎‏‏‏‎‏‏‎‏‏‎‏‏‏‏‏‎‏‎‎‏‏‎‎‎‏‏‎‎‎‏‏‏‎‎‎‎‏‏‎Free up space‎‏‎‎‏‎"</string>
+    <string name="storage_menu_manage" msgid="5914482953856430780">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‎‎‏‎‎‎‎‏‎‏‎‎‎‏‏‏‎‏‏‎‏‏‏‎‏‎‎‏‎‎‎‎‎‏‏‎‏‎‏‏‎‏‏‏‎‎‏‏‎‎‏‎‏‎‏‏‏‏‎‎‎Manage storage‎‏‎‎‏‎"</string>
+    <string name="storage_title_usb" msgid="679612779321689418">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‎‏‎‎‏‎‏‏‎‏‏‏‎‎‏‏‏‏‎‎‎‎‎‏‏‏‎‎‎‏‏‎‏‏‎‎‎‎‏‎‎‏‎‎‏‎‎‎‎‎‏‎‏‎‏‎‎‏‎‏‎‎USB computer connection‎‏‎‎‏‎"</string>
+    <string name="usb_connection_category" msgid="7805945595165422882">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‏‏‎‎‎‏‎‏‎‏‎‎‎‏‎‎‏‎‏‎‎‎‏‎‏‎‎‏‎‎‏‏‏‏‏‏‏‏‎‏‏‏‎‎‎‎‏‏‎‏‎‏‎‎‏‎‎‎‏‎‎Connect as‎‏‎‎‏‎"</string>
+    <string name="usb_mtp_title" msgid="3399663424394065964">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‏‏‏‏‎‎‏‎‏‏‏‎‎‎‎‎‎‏‏‏‏‏‎‏‏‏‏‏‎‏‎‎‏‏‏‎‏‏‏‎‎‏‎‏‎‏‏‏‏‎‎‎‎‎‏‎‏‏‎‎‎Media device (MTP)‎‏‎‎‏‎"</string>
+    <string name="usb_mtp_summary" msgid="4617321473211391236">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‎‎‎‎‎‎‎‏‎‏‎‎‎‎‎‎‎‏‎‏‎‏‏‎‏‎‏‎‏‎‎‏‎‎‎‎‏‎‎‎‏‏‎‎‎‏‎‏‏‏‎‏‎‎‎‎‎‏‎‎‎Lets you transfer media files on Windows, or using Android File Transfer on Mac (see www.android.com/filetransfer)‎‏‎‎‏‎"</string>
+    <string name="usb_ptp_title" msgid="3852760810622389620">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‎‏‎‏‎‏‏‏‎‏‏‏‏‏‎‎‎‎‎‏‏‎‎‎‏‎‏‏‎‏‏‎‎‎‎‏‏‎‏‏‎‎‎‏‏‎‎‎‏‏‎‏‎‏‏‏‎‏‎‎‎Camera (PTP)‎‏‎‎‏‎"</string>
+    <string name="usb_ptp_summary" msgid="7406889433172511530">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‎‏‏‎‏‏‎‎‏‎‏‎‏‎‎‎‏‏‏‎‏‎‏‏‎‎‏‎‎‎‏‏‎‎‏‎‏‏‎‏‎‏‏‏‏‎‎‎‏‎‏‏‎‎‏‎‏‎‏‎‎Lets you transfer photos using camera software, and transfer any files on computers that don’t support MTP‎‏‎‎‏‎"</string>
+    <string name="usb_midi_title" msgid="3069990264258413994">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‏‎‏‎‏‎‎‏‏‎‏‎‏‏‎‎‏‎‏‏‏‏‏‎‎‎‎‏‎‎‏‏‏‏‎‏‎‎‎‎‎‏‏‏‏‏‎‎‎‏‎‏‏‎‏‎‏‎‏‎‎MIDI‎‏‎‎‏‎"</string>
+    <string name="usb_midi_summary" msgid="539169474810956358">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‎‏‏‏‏‏‎‏‏‏‏‎‏‏‏‎‎‎‎‎‏‏‏‏‎‎‎‏‏‏‏‏‎‏‏‎‏‏‏‏‎‏‎‏‏‏‎‏‎‎‏‎‏‎‎‏‎‎‎‏‏‎‎Lets MIDI enabled applications work over USB with MIDI software on your computer.‎‏‎‎‏‎"</string>
+    <string name="storage_other_users" msgid="808708845102611856">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‎‏‎‏‏‎‎‏‏‏‎‎‏‎‎‎‏‏‏‎‎‎‏‏‎‏‎‎‎‏‏‏‎‏‏‏‏‎‎‎‎‏‏‏‎‏‎‏‏‏‏‎‏‏‎‎‏‎‎‎‎‎Other users‎‏‎‎‏‎"</string>
+    <string name="storage_internal_title" msgid="690771193137801021">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‎‏‎‎‏‏‎‎‏‎‏‏‎‎‎‎‏‏‏‎‎‏‎‏‏‏‏‎‏‏‎‎‎‎‏‎‎‎‎‎‎‏‏‎‏‎‎‏‎‎‏‏‏‎‎‏‏‏‏‎‏‎Device storage‎‏‎‎‏‎"</string>
+    <string name="storage_external_title" msgid="3433462910096848696">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‏‏‏‏‏‎‏‎‎‏‏‎‎‎‎‏‏‏‎‎‎‏‎‏‎‎‏‏‎‏‎‏‎‎‎‏‏‏‎‎‏‏‎‏‎‎‏‏‎‏‏‏‎‎‏‏‏‎‎‎‎Portable storage‎‏‎‎‏‎"</string>
+    <string name="storage_volume_summary" msgid="7023441974367853372">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‎‎‎‏‎‏‏‏‏‎‎‎‎‏‎‎‎‏‏‏‎‏‎‎‎‎‏‏‏‎‎‎‏‏‏‎‏‏‎‎‎‎‏‏‏‎‎‏‏‎‏‏‎‎‏‏‏‏‎‎‎‎‏‎‎‏‏‎<xliff:g id="USED">%1$s</xliff:g>‎‏‎‎‏‏‏‎ used of ‎‏‎‎‏‏‎<xliff:g id="TOTAL">%2$s</xliff:g>‎‏‎‎‏‏‏‎‎‏‎‎‏‎"</string>
+    <string name="storage_size_large" msgid="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">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‎‎‏‎‎‎‎‏‏‎‎‎‎‎‎‎‏‎‎‏‏‏‏‏‏‎‎‏‎‎‎‏‏‏‏‏‎‎‏‏‎‏‏‎‏‏‏‏‎‎‏‎‎‎‎‎‎‎‎‎‎Used of ‎‏‎‎‏‏‎<xliff:g id="TOTAL">%1$s</xliff:g>‎‏‎‎‏‏‏‎‎‏‎‎‏‎"</string>
+    <string name="storage_volume_used_total" msgid="6113121714019000244">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‎‏‎‎‏‏‎‏‎‏‏‎‎‎‏‎‏‎‏‏‏‏‎‎‏‏‏‏‎‏‏‎‏‎‎‎‏‏‎‏‎‏‎‎‎‏‎‏‏‏‏‏‏‎‏‏‎‏‎‎‎Total used of ‎‏‎‎‏‏‎<xliff:g id="TOTAL">%1$s</xliff:g>‎‏‎‎‏‏‏‎‎‏‎‎‏‎"</string>
+    <string name="storage_mount_success" msgid="687641090137253647">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‎‏‎‎‏‏‎‎‎‏‎‏‎‏‏‏‏‏‏‎‏‏‏‏‎‏‏‎‏‏‎‎‏‏‏‏‎‏‎‎‏‎‏‏‏‏‏‏‎‎‏‏‏‎‎‎‎‏‏‏‏‎‎‏‎‎‏‏‎<xliff:g id="NAME">%1$s</xliff:g>‎‏‎‎‏‏‏‎ is mounted‎‏‎‎‏‎"</string>
+    <string name="storage_mount_failure" msgid="1042621107954547316">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‎‏‏‏‎‎‏‏‏‏‎‎‎‎‎‏‎‎‎‏‎‎‏‎‏‏‏‏‏‏‎‏‎‎‏‏‎‏‏‏‏‎‏‎‎‎‏‏‏‏‎‏‎‎‏‏‏‎‏‎‎‎Couldn’t mount ‎‏‎‎‏‏‎<xliff:g id="NAME">%1$s</xliff:g>‎‏‎‎‏‏‏‎‎‏‎‎‏‎"</string>
+    <string name="storage_unmount_success" msgid="5737203344673441677">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‏‏‏‏‏‎‎‏‏‏‏‎‏‎‏‎‎‏‎‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‏‎‏‏‏‎‎‎‏‏‎‎‎‎‏‏‏‏‎‎‎‏‏‎‏‎‎‏‎‎‏‏‎<xliff:g id="NAME">%1$s</xliff:g>‎‏‎‎‏‏‏‎ is safely ejected‎‏‎‎‏‎"</string>
+    <string name="storage_unmount_failure" msgid="5758387106579519489">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‏‏‏‏‏‏‏‎‏‎‎‏‏‏‏‎‎‏‏‎‏‎‎‏‎‎‎‎‎‏‏‎‏‏‏‎‏‏‎‏‏‏‎‎‏‎‎‏‏‎‎‎‎‎‎‎‎‎‎‏‎Couldn’t safely eject ‎‏‎‎‏‏‎<xliff:g id="NAME">%1$s</xliff:g>‎‏‎‎‏‏‏‎‎‏‎‎‏‎"</string>
+    <string name="storage_format_success" msgid="3023144070597190555">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‏‎‎‏‏‏‏‏‎‏‎‎‎‏‎‏‏‏‎‏‏‎‎‎‎‎‏‏‏‏‎‏‎‎‎‎‏‏‎‎‎‏‏‎‎‎‏‎‎‎‏‏‏‎‎‏‏‎‏‏‎‎‏‎‎‏‏‎<xliff:g id="NAME">%1$s</xliff:g>‎‏‎‎‏‏‏‎ is formatted‎‏‎‎‏‎"</string>
+    <string name="storage_format_failure" msgid="6032640952779735766">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‎‎‏‏‏‎‏‏‏‎‎‎‎‎‏‏‏‏‏‎‏‏‏‏‏‎‏‏‏‏‏‏‎‏‏‏‏‏‏‎‏‎‎‏‎‎‎‎‎‎‏‎‏‏‎‏‎‏‏‎‎Couldn’t format ‎‏‎‎‏‏‎<xliff:g id="NAME">%1$s</xliff:g>‎‏‎‎‏‏‏‎‎‏‎‎‏‎"</string>
+    <string name="storage_rename_title" msgid="8242663969839491485">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‎‎‏‎‎‏‏‎‎‎‏‏‏‏‎‏‎‎‏‏‎‎‏‏‎‏‎‏‏‎‎‎‎‏‎‏‎‎‏‏‎‎‎‏‏‎‏‎‏‎‎‏‏‎‎‏‏‏‎‏‎Rename storage‎‏‎‎‏‎"</string>
+    <string name="storage_dialog_unmounted" msgid="6403320870103261477">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‏‎‎‎‏‏‎‏‏‏‎‏‎‎‏‎‏‎‏‎‎‏‏‎‎‏‏‏‏‎‏‏‎‏‎‏‎‏‎‏‏‎‎‏‏‎‏‎‎‎‎‏‎‎‏‎‎‏‎‏‎This ‎‏‎‎‏‏‎<xliff:g id="NAME_0">^1</xliff:g>‎‏‎‎‏‏‏‎ is safely ejected, but still available. ‎‏‎‎‏‏‎\n‎‏‎‎‏‏‏‎‎‏‎‎‏‏‎\n‎‏‎‎‏‏‏‎To use this ‎‏‎‎‏‏‎<xliff:g id="NAME_1">^1</xliff:g>‎‏‎‎‏‏‏‎, you have to mount it first.‎‏‎‎‏‎"</string>
+    <string name="storage_dialog_unmountable" msgid="3732209361668282254">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‎‎‏‏‏‏‎‎‏‎‏‏‎‏‏‏‏‎‎‎‏‎‏‎‎‎‏‏‏‏‏‎‏‏‎‏‏‎‏‎‎‎‎‎‎‎‎‏‎‏‏‏‏‎‎‎‏‏‏‎‎This ‎‏‎‎‏‏‎<xliff:g id="NAME_0">^1</xliff:g>‎‏‎‎‏‏‏‎ is corrupted. ‎‏‎‎‏‏‎\n‎‏‎‎‏‏‏‎‎‏‎‎‏‏‎\n‎‏‎‎‏‏‏‎To use this ‎‏‎‎‏‏‎<xliff:g id="NAME_1">^1</xliff:g>‎‏‎‎‏‏‏‎, you have to set it up first.‎‏‎‎‏‎"</string>
+    <string name="storage_dialog_unsupported" msgid="4503128224360482228">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‏‏‏‎‎‏‏‏‏‏‏‎‎‏‎‏‎‎‏‏‎‏‎‎‎‎‏‎‏‏‏‎‏‏‏‏‎‎‎‎‏‎‏‎‏‏‎‎‎‏‎‏‏‎‏‏‎‏‎‎‎This device doesn’t support this ‎‏‎‎‏‏‎<xliff:g id="NAME_0">^1</xliff:g>‎‏‎‎‏‏‏‎. ‎‏‎‎‏‏‎\n‎‏‎‎‏‏‏‎‎‏‎‎‏‏‎\n‎‏‎‎‏‏‏‎To use this ‎‏‎‎‏‏‎<xliff:g id="NAME_1">^1</xliff:g>‎‏‎‎‏‏‏‎ with this device, you have to set it up first.‎‏‎‎‏‎"</string>
+    <string name="storage_internal_format_details" msgid="4018647158382548820">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‎‏‏‏‏‏‎‎‎‏‎‏‎‎‎‏‏‎‏‎‎‏‎‎‏‏‎‎‏‎‎‎‎‎‎‏‎‎‎‎‎‏‏‎‎‏‎‏‎‏‏‏‎‏‎‏‎‏‎‎‎After formatting, you can use this ‎‏‎‎‏‏‎<xliff:g id="NAME_0">^1</xliff:g>‎‏‎‎‏‏‏‎ in other devices. ‎‏‎‎‏‏‎\n‎‏‎‎‏‏‏‎‎‏‎‎‏‏‎\n‎‏‎‎‏‏‏‎All data on this ‎‏‎‎‏‏‎<xliff:g id="NAME_1">^1</xliff:g>‎‏‎‎‏‏‏‎ will be erased. Consider backing up first. ‎‏‎‎‏‏‎\n‎‏‎‎‏‏‏‎‎‏‎‎‏‏‎\n‎‏‎‎‏‏‏‎‎‏‎‎‏‏‎"<b>"‎‏‎‎‏‏‏‎Back up photos &amp; other media‎‏‎‎‏‏‎"</b>"‎‏‎‎‏‏‏‎ ‎‏‎‎‏‏‎\n‎‏‎‎‏‏‏‎Move your media files to alternative storage on this device, or transfer them to a computer using a USB cable. ‎‏‎‎‏‏‎\n‎‏‎‎‏‏‏‎‎‏‎‎‏‏‎\n‎‏‎‎‏‏‏‎‎‏‎‎‏‏‎"<b>"‎‏‎‎‏‏‏‎Back up apps‎‏‎‎‏‏‎"</b>"‎‏‎‎‏‏‏‎ ‎‏‎‎‏‏‎\n‎‏‎‎‏‏‏‎All apps stored on this ‎‏‎‎‏‏‎<xliff:g id="NAME_6">^1</xliff:g>‎‏‎‎‏‏‏‎ will be uninstalled and their data will be erased. To keep these apps, move them to alternative storage on this device.‎‏‎‎‏‎"</string>
+    <string name="storage_internal_unmount_details" msgid="3582802571684490057">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‎‎‎‏‏‎‏‏‏‎‎‎‏‎‏‎‏‎‏‏‏‏‏‏‎‏‎‎‏‏‎‏‏‎‎‏‏‎‎‏‏‏‎‎‎‎‏‎‏‎‏‏‎‏‎‎‏‎‎‏‎‎‏‎‎‏‏‎"<b>"‎‏‎‎‏‏‏‎When you eject this ‎‏‎‎‏‏‎<xliff:g id="NAME_0">^1</xliff:g>‎‏‎‎‏‏‏‎, apps stored on it will stop working, and media files stored on it will not be available until it is reinserted.‎‏‎‎‏‏‎"</b>"‎‏‎‎‏‏‏‎ ‎‏‎‎‏‏‎\n‎‏‎‎‏‏‏‎‎‏‎‎‏‏‎\n‎‏‎‎‏‏‏‎This ‎‏‎‎‏‏‎<xliff:g id="NAME_1">^1</xliff:g>‎‏‎‎‏‏‏‎ is formatted to work on this device only. It won’t work on any others.‎‏‎‎‏‎"</string>
+    <string name="storage_internal_forget_details" msgid="9028875424669047327">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‏‏‎‏‎‏‎‎‏‏‎‏‎‎‎‎‎‎‏‎‎‏‎‏‏‏‎‎‏‎‎‏‏‎‎‎‏‎‏‎‎‏‏‏‎‎‎‏‏‎‏‎‎‎‎‏‏‏‏‏‎To use the apps, photos, or data this ‎‏‎‎‏‏‎<xliff:g id="NAME">^1</xliff:g>‎‏‎‎‏‏‏‎ contains, reinsert it. ‎‏‎‎‏‏‎\n‎‏‎‎‏‏‏‎‎‏‎‎‏‏‎\n‎‏‎‎‏‏‏‎Alternatively, you can choose to forget this storage if the device isn’t available. ‎‏‎‎‏‏‎\n‎‏‎‎‏‏‏‎‎‏‎‎‏‏‎\n‎‏‎‎‏‏‏‎If you choose to forget, all the data the device contains will be lost forever. ‎‏‎‎‏‏‎\n‎‏‎‎‏‏‏‎‎‏‎‎‏‏‎\n‎‏‎‎‏‏‏‎You can reinstall the apps later, but their data stored on this device will be lost.‎‏‎‎‏‎"</string>
+    <string name="storage_internal_forget_confirm_title" msgid="1370847944388479245">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‎‎‏‏‎‎‎‎‎‏‏‎‎‎‏‏‏‎‏‎‏‏‏‏‎‎‎‏‎‎‏‏‏‏‏‎‎‏‎‏‏‎‎‏‏‎‎‎‏‎‎‏‎‎‎‎‏‏‎‏‎Forget ‎‏‎‎‏‏‎<xliff:g id="NAME">^1</xliff:g>‎‏‎‎‏‏‏‎?‎‏‎‎‏‎"</string>
+    <string name="storage_internal_forget_confirm" msgid="1148446041396902905">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‎‏‏‏‏‏‏‏‏‎‎‎‎‎‎‎‏‏‎‎‏‏‎‎‏‎‏‏‏‎‎‎‎‎‏‎‏‎‎‏‎‏‎‏‎‎‏‏‏‏‎‏‏‏‏‏‏‏‎‎‏‎All the apps, photos, and data stored on this ‎‏‎‎‏‏‎<xliff:g id="NAME">^1</xliff:g>‎‏‎‎‏‏‏‎ will be lost forever.‎‏‎‎‏‎"</string>
+    <string name="storage_detail_apps" msgid="6141154016753507490">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‎‏‎‏‎‎‏‏‏‎‎‏‏‏‎‎‎‎‏‏‎‎‎‎‏‎‏‎‎‏‏‏‏‏‏‏‏‎‎‎‏‏‏‎‎‏‎‏‏‏‎‎‏‎‏‎‎‎‏‎‎Apps‎‏‎‎‏‎"</string>
+    <string name="storage_detail_images" msgid="6950678857740634769">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‎‎‎‎‎‏‏‏‎‏‎‏‏‏‎‎‎‏‎‏‏‎‎‏‏‎‎‎‎‏‎‎‎‏‏‏‎‏‏‏‎‎‏‎‏‏‎‎‏‎‏‎‏‎‎‏‎‎‎‏‎Images‎‏‎‎‏‎"</string>
+    <string name="storage_detail_videos" msgid="2919743464827110953">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‏‎‎‎‏‎‎‎‎‏‎‏‎‎‎‎‎‎‏‏‎‎‏‏‎‏‏‎‎‎‏‏‏‎‎‎‎‏‎‎‏‎‎‏‏‏‎‎‎‏‏‎‎‎‏‎‏‎‎‏‎Videos‎‏‎‎‏‎"</string>
+    <string name="storage_detail_audio" msgid="1197685141676483213">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‎‎‎‎‏‎‎‏‏‏‏‏‎‎‎‎‏‎‎‎‎‏‎‎‏‎‏‎‎‏‏‎‏‏‏‎‎‏‏‎‎‎‏‏‏‏‏‎‎‎‏‎‏‎‎‎‏‏‎‏‎Audio‎‏‎‎‏‎"</string>
+    <string name="storage_detail_cached" msgid="8547136365247818567">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‎‏‏‎‏‎‎‏‏‏‎‏‏‎‎‎‎‏‏‏‎‎‏‏‏‏‎‏‎‏‎‏‎‎‎‏‎‏‏‎‏‎‏‏‎‏‏‎‏‎‏‏‎‏‎‎‎‏‏‏‎Cached data‎‏‎‎‏‎"</string>
+    <string name="storage_detail_other" msgid="8404938385075638238">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‎‏‎‎‏‎‏‎‎‏‎‎‎‏‎‏‎‏‏‎‏‏‏‎‏‏‏‎‎‎‎‏‎‎‎‏‎‏‏‏‏‎‏‎‏‎‎‎‏‏‏‏‏‏‎‏‏‏‏‎‎Other‎‏‎‎‏‎"</string>
+    <string name="storage_detail_system" msgid="4629506366064709687">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‎‎‎‎‎‎‏‏‏‏‏‏‎‏‎‎‏‏‏‏‏‎‎‎‎‎‏‏‎‎‎‎‎‎‏‎‏‎‏‏‎‎‏‎‎‏‎‏‎‎‎‎‎‎‏‏‎‏‏‏‎System‎‏‎‎‏‎"</string>
+    <string name="storage_detail_explore" msgid="7911344011431568294">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‏‏‎‏‏‏‎‎‏‎‏‎‏‎‏‏‏‏‎‏‎‏‏‏‎‏‏‎‎‏‎‏‏‎‎‏‎‏‎‎‏‎‏‎‏‏‏‎‎‎‏‏‏‎‏‎‎‏‏‎‎Explore ‎‏‎‎‏‏‎<xliff:g id="NAME">^1</xliff:g>‎‏‎‎‏‏‏‎‎‏‎‎‏‎"</string>
+    <string name="storage_detail_dialog_other" msgid="8907101974576694793">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‏‎‏‏‏‎‎‏‏‏‎‎‎‏‏‎‎‎‏‎‎‎‎‎‏‏‎‏‏‏‎‏‎‏‎‎‏‏‎‏‎‎‏‏‎‎‎‎‎‏‏‎‎‎‎‎‏‎‎‏‎Other includes shared files saved by apps, files downloaded from the Internet or Bluetooth, Android files, and so on. ‎‏‎‎‏‏‎\n‎‏‎‎‏‏‏‎‎‏‎‎‏‏‎\n‎‏‎‎‏‏‏‎To see the visible contents of this ‎‏‎‎‏‏‎<xliff:g id="NAME">^1</xliff:g>‎‏‎‎‏‏‏‎, tap Explore.‎‏‎‎‏‎"</string>
+    <string name="storage_detail_dialog_system" msgid="862835644848361569">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‎‏‎‏‏‏‏‏‏‏‎‎‏‎‏‏‎‏‎‎‎‎‏‏‏‎‎‏‎‏‎‎‎‏‏‏‎‏‎‏‏‏‎‏‏‎‏‎‏‎‎‎‎‎‏‏‎‎‎‎‏‎System includes files used to run Android version ‎‏‎‎‏‏‎<xliff:g id="VERSION">%s</xliff:g>‎‏‎‎‏‏‏‎‎‏‎‎‏‎"</string>
+    <string name="storage_detail_dialog_user" msgid="3267254783294197804">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‏‏‎‏‎‏‎‏‎‏‏‏‏‎‎‏‏‏‏‎‏‏‏‎‏‎‏‎‎‎‏‎‏‏‎‎‏‏‏‏‎‎‏‎‎‏‎‏‎‎‎‎‎‎‏‎‏‏‎‎‎‎‏‎‎‏‏‎<xliff:g id="USER_0">^1</xliff:g>‎‏‎‎‏‏‏‎ may have saved photos, music, apps, or other data, using ‎‏‎‎‏‏‎<xliff:g id="SIZE">^2</xliff:g>‎‏‎‎‏‏‏‎ of storage. ‎‏‎‎‏‏‎\n‎‏‎‎‏‏‏‎‎‏‎‎‏‏‎\n‎‏‎‎‏‏‏‎To view details, switch to ‎‏‎‎‏‏‎<xliff:g id="USER_1">^1</xliff:g>‎‏‎‎‏‏‏‎.‎‏‎‎‏‎"</string>
+    <string name="storage_wizard_init_title" msgid="5085400514028585772">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‎‏‏‎‏‎‎‏‎‎‏‎‏‏‏‏‏‎‎‎‏‏‎‏‎‎‏‎‏‏‏‎‏‎‏‏‎‏‎‎‎‎‏‏‎‏‎‎‎‎‏‏‎‎‏‎‏‏‎‎‎Set up your ‎‏‎‎‏‏‎<xliff:g id="NAME">^1</xliff:g>‎‏‎‎‏‏‏‎‎‏‎‎‏‎"</string>
+    <string name="storage_wizard_init_external_title" msgid="4867326438945303598">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‎‎‏‏‏‎‎‎‏‏‎‎‎‎‏‏‎‏‏‏‏‎‎‏‏‎‏‏‏‎‏‎‎‏‏‏‎‎‏‏‎‎‏‏‏‎‏‎‏‏‎‎‎‎‏‎‏‏‏‎‎Use as portable storage‎‏‎‎‏‎"</string>
+    <string name="storage_wizard_init_external_summary" msgid="7476105886344565074">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‎‏‏‏‏‏‎‎‎‎‎‎‎‏‏‏‎‏‏‎‏‎‏‏‎‎‎‏‏‎‎‎‏‎‏‎‏‏‎‎‎‏‏‎‎‏‎‏‎‎‎‏‎‏‎‏‎‎‏‎‎For moving photos and other media between devices.‎‏‎‎‏‎"</string>
+    <string name="storage_wizard_init_internal_title" msgid="9100613534261408519">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‏‏‏‎‎‏‎‎‏‎‏‏‏‏‎‏‏‏‏‏‏‏‎‎‏‎‏‎‏‏‎‏‎‎‏‏‏‏‎‎‎‎‏‏‎‏‏‏‎‎‏‏‎‎‎‎‎‏‏‏‎Use as internal storage‎‏‎‎‏‎"</string>
+    <string name="storage_wizard_init_internal_summary" msgid="6240417501036216410">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‎‏‏‎‏‎‎‏‏‎‏‎‎‏‏‎‏‎‏‎‏‎‏‎‎‏‏‏‎‏‏‎‏‏‏‏‎‏‏‎‎‏‎‏‎‎‎‎‎‎‎‎‎‏‎‏‏‎‏‎‎For storing anything on this device only, including apps and photos. Requires formatting that prevents it from working with other devices.‎‏‎‎‏‎"</string>
+    <string name="storage_wizard_format_confirm_title" msgid="2814021794538252546">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‎‏‏‏‎‎‎‎‏‏‎‏‎‏‏‎‏‎‎‏‏‏‏‎‏‎‎‏‏‎‏‎‏‏‎‏‏‎‏‎‏‎‎‎‏‏‏‎‏‎‎‏‎‎‎‎‎‎‏‎‎Format as internal storage‎‏‎‎‏‎"</string>
+    <string name="storage_wizard_format_confirm_body" msgid="4401758710076806509">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‏‏‎‏‎‎‎‏‎‏‏‎‎‎‏‏‎‎‎‎‎‎‏‏‏‎‎‏‏‎‏‎‏‏‎‏‎‎‎‏‏‏‎‎‎‎‎‏‎‏‎‏‎‏‏‎‏‏‎‏‎This requires the ‎‏‎‎‏‏‎<xliff:g id="NAME_0">^1</xliff:g>‎‏‎‎‏‏‏‎ to be formatted to make it secure. ‎‏‎‎‏‏‎\n‎‏‎‎‏‏‏‎‎‏‎‎‏‏‎\n‎‏‎‎‏‏‏‎After formatting, this ‎‏‎‎‏‏‎<xliff:g id="NAME_1">^1</xliff:g>‎‏‎‎‏‏‏‎ will only work in this device. ‎‏‎‎‏‏‎\n‎‏‎‎‏‏‏‎‎‏‎‎‏‏‎\n‎‏‎‎‏‏‏‎‎‏‎‎‏‏‎"<b>"‎‏‎‎‏‏‏‎Formatting erases all data currently stored on the ‎‏‎‎‏‏‎<xliff:g id="NAME_2">^1</xliff:g>‎‏‎‎‏‏‏‎.‎‏‎‎‏‏‎"</b>"‎‏‎‎‏‏‏‎ To avoid losing the data, consider backing it up.‎‏‎‎‏‎"</string>
+    <string name="storage_wizard_format_confirm_public_title" msgid="4905690038882041566">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‎‏‎‎‎‎‎‏‎‏‎‎‏‎‎‎‎‎‏‏‎‎‎‏‏‎‎‏‎‏‎‏‎‎‎‏‏‎‏‏‏‏‎‎‎‏‏‏‏‏‏‎‏‏‎‏‏‏‏‎‎Format as portable storage‎‏‎‎‏‎"</string>
+    <string name="storage_wizard_format_confirm_public_body" msgid="1516932692920060272">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‎‏‎‏‎‎‎‎‏‏‎‏‎‎‏‏‏‎‏‎‎‎‏‏‏‏‏‏‎‏‎‎‎‏‎‏‏‎‏‎‏‏‎‏‎‏‎‎‏‎‎‏‎‏‏‏‎‎‎‎‎This requires the ‎‏‎‎‏‏‎<xliff:g id="NAME_0">^1</xliff:g>‎‏‎‎‏‏‏‎ to be formatted. ‎‏‎‎‏‏‎\n‎‏‎‎‏‏‏‎‎‏‎‎‏‏‎\n‎‏‎‎‏‏‏‎‎‏‎‎‏‏‎"<b>"‎‏‎‎‏‏‏‎Formatting erases all data currently stored on the ‎‏‎‎‏‏‎<xliff:g id="NAME_1">^1</xliff:g>‎‏‎‎‏‏‏‎.‎‏‎‎‏‏‎"</b>"‎‏‎‎‏‏‏‎ To avoid losing the data, consider backing it up.‎‏‎‎‏‎"</string>
+    <string name="storage_wizard_format_confirm_next" msgid="2774557300531702572">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‎‏‏‎‏‎‎‎‎‎‎‏‎‎‏‏‎‏‎‏‎‎‏‎‏‎‏‎‎‎‏‎‎‎‏‏‎‎‏‎‏‎‎‎‏‎‏‎‏‎‏‏‎‎‏‎‏‏‎‎‎Erase &amp; format‎‏‎‎‏‎"</string>
+    <string name="storage_wizard_format_progress_title" msgid="6487352396450582292">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‏‎‏‎‎‎‎‎‎‏‏‏‏‎‏‏‎‏‎‎‏‎‏‎‎‎‏‎‎‎‎‏‎‎‏‏‎‎‏‏‎‏‏‏‎‏‎‎‏‏‏‏‎‎‎‏‎‏‎‎‎Formatting ‎‏‎‎‏‏‎<xliff:g id="NAME">^1</xliff:g>‎‏‎‎‏‏‏‎…‎‏‎‎‏‎"</string>
+    <string name="storage_wizard_format_progress_body" msgid="4445041233802828430">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‏‏‎‏‏‎‏‎‏‏‏‏‏‏‏‏‎‏‎‏‎‏‏‏‎‎‏‏‏‎‎‎‏‎‎‎‏‏‎‎‏‎‎‎‎‎‎‏‏‎‏‎‏‎‎‎‏‏‏‎‎Don’t remove the ‎‏‎‎‏‏‎<xliff:g id="NAME">^1</xliff:g>‎‏‎‎‏‏‏‎ while it’s formatting.‎‏‎‎‏‎"</string>
+    <string name="storage_wizard_migrate_title" msgid="1363078147938160407">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‎‎‏‎‏‏‏‎‏‎‏‎‏‎‏‎‎‎‎‎‎‏‎‏‏‎‏‎‏‎‎‎‏‎‎‎‏‏‏‏‎‎‏‏‏‎‎‎‏‏‏‏‎‎‎‏‎‏‏‏‎Move data to new storage‎‏‎‎‏‎"</string>
+    <string name="storage_wizard_migrate_body" msgid="890751699549542345">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‎‏‏‎‎‎‏‎‏‏‏‎‎‏‎‎‏‎‏‎‏‏‏‏‏‎‎‏‏‏‎‎‎‏‎‏‎‏‎‏‏‏‎‎‏‏‏‎‏‎‏‏‏‏‏‎‎‏‎‎‏‎You can move your photos, files, and some apps to this new ‎‏‎‎‏‏‎<xliff:g id="NAME">^1</xliff:g>‎‏‎‎‏‏‏‎. ‎‏‎‎‏‏‎\n‎‏‎‎‏‏‏‎‎‏‎‎‏‏‎\n‎‏‎‎‏‏‏‎The move takes about ‎‏‎‎‏‏‎<xliff:g id="TIME">^2</xliff:g>‎‏‎‎‏‏‏‎ and will free ‎‏‎‎‏‏‎<xliff:g id="SIZE">^3</xliff:g>‎‏‎‎‏‏‏‎ on internal storage. Some apps won’t work while it’s underway.‎‏‎‎‏‎"</string>
+    <string name="storage_wizard_migrate_now" msgid="4523444323744239143">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‏‏‏‎‏‏‎‎‎‏‏‎‏‎‎‎‎‎‎‎‏‎‏‎‎‏‎‏‎‏‏‎‏‏‏‎‎‎‎‎‏‎‎‎‎‏‎‎‏‏‏‎‎‎‏‎‎‏‏‏‎Move now‎‏‎‎‏‎"</string>
+    <string name="storage_wizard_migrate_later" msgid="3173482328116026253">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‏‏‎‎‎‎‎‎‏‎‏‎‎‏‏‏‏‎‎‏‎‏‎‏‏‏‎‏‎‎‎‏‎‏‎‎‎‏‎‏‎‏‎‏‏‏‎‏‏‎‏‏‏‎‎‎‏‏‎‏‎Move later‎‏‎‎‏‎"</string>
+    <string name="storage_wizard_migrate_confirm_title" msgid="8564833529613286965">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‎‏‏‎‏‏‎‏‏‏‎‎‎‏‏‎‎‏‏‎‏‎‏‏‎‏‏‏‎‏‏‏‏‏‎‎‏‏‏‏‎‏‎‎‎‏‏‏‏‏‏‎‎‎‏‏‎‏‎‏‎Move data now‎‏‎‎‏‎"</string>
+    <string name="storage_wizard_migrate_confirm_body" msgid="4212060581792135962">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‏‎‏‎‎‏‏‏‎‏‎‎‎‎‏‏‏‏‏‎‏‏‎‎‏‎‎‎‎‏‎‏‏‏‏‎‎‎‏‎‎‏‎‏‎‎‏‏‏‎‏‏‎‎‎‏‏‎‏‎‎‎‏‎‎‏‏‎"<b>"‎‏‎‎‏‏‏‎The move takes about ‎‏‎‎‏‏‎<xliff:g id="TIME">^1</xliff:g>‎‏‎‎‏‏‏‎. It will free ‎‏‎‎‏‏‎<xliff:g id="SIZE">^2</xliff:g>‎‏‎‎‏‏‏‎ on ‎‏‎‎‏‏‎<xliff:g id="NAME">^3</xliff:g>‎‏‎‎‏‏‏‎.‎‏‎‎‏‏‎"</b>"‎‏‎‎‏‏‏‎‎‏‎‎‏‎"</string>
+    <string name="storage_wizard_migrate_confirm_next" msgid="5509475628423823202">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‏‏‎‎‎‏‏‏‎‏‎‏‏‎‎‏‎‏‏‎‏‏‏‎‎‏‎‎‏‏‎‎‎‎‏‎‏‏‎‏‏‏‏‏‏‎‏‏‏‏‏‏‎‏‏‎‎‎‏‎‎Move‎‏‎‎‏‎"</string>
+    <string name="storage_wizard_migrate_progress_title" msgid="1665479429044202868">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‎‏‏‏‎‎‎‏‏‏‎‎‏‏‏‏‏‎‎‎‏‎‏‏‎‏‏‏‎‏‏‏‎‏‎‎‏‏‏‎‎‏‏‎‎‏‏‎‏‏‎‏‎‏‏‏‎‏‎‎‎Moving data…‎‏‎‎‏‎"</string>
+    <string name="storage_wizard_migrate_details" msgid="3709728824651136227">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‎‎‏‏‎‏‏‏‏‎‏‏‏‎‎‏‏‎‏‎‏‎‏‏‎‏‏‎‎‎‎‎‎‏‏‎‎‏‎‏‏‎‏‏‏‎‏‏‏‏‎‎‏‏‏‎‎‎‏‏‎During the move: ‎‏‎‎‏‏‎\n‎‏‎‎‏‏‏‎• Don’t remove the ‎‏‎‎‏‏‎<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>‎‏‎‎‏‏‏‎ is ready‎‏‎‎‏‎"</string>
+    <string name="storage_wizard_ready_external_body" msgid="2879508114260597474">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‎‏‏‏‏‏‏‏‎‏‏‎‎‎‎‏‎‎‎‏‎‏‎‏‏‏‏‏‏‎‏‎‎‏‏‎‎‏‎‏‏‎‏‏‏‎‎‏‏‎‏‎‏‏‏‎‎‎‏‎‎Your ‎‏‎‎‏‏‎<xliff:g id="NAME">^1</xliff:g>‎‏‎‎‏‏‏‎ is all set to use with photos and other media.‎‏‎‎‏‎"</string>
+    <string name="storage_wizard_ready_internal_body" msgid="122532674037860197">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‎‎‏‏‏‎‏‏‎‎‏‏‎‏‎‏‎‎‏‎‏‏‎‏‎‎‎‏‎‏‎‏‏‏‎‏‎‏‏‎‎‏‏‏‏‏‎‎‎‏‏‏‎‏‏‎‎‏‎‏‎Your new ‎‏‎‎‏‏‎<xliff:g id="NAME">^1</xliff:g>‎‏‎‎‏‏‏‎ is working. ‎‏‎‎‏‏‎\n‎‏‎‎‏‏‏‎‎‏‎‎‏‏‎\n‎‏‎‎‏‏‏‎To move photos, files, and app data to this device, go to Settings &gt; Storage.‎‏‎‎‏‎"</string>
+    <string name="storage_wizard_move_confirm_title" msgid="292782012677890250">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‎‏‏‏‎‎‎‎‎‏‎‎‎‎‎‎‏‎‏‎‏‏‏‎‏‏‎‎‎‎‎‏‏‏‎‏‏‎‎‏‎‎‏‎‏‎‎‎‏‎‎‎‎‎‏‏‎‎‏‎‏‎‎Move ‎‏‎‎‏‏‎<xliff:g id="APP">^1</xliff:g>‎‏‎‎‏‏‏‎‎‏‎‎‏‎"</string>
+    <string name="storage_wizard_move_confirm_body" msgid="5176432115206478941">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‎‏‏‏‏‏‎‏‎‏‏‎‎‏‏‎‎‎‎‏‏‎‎‏‎‏‎‏‎‎‏‏‎‏‏‎‏‏‎‎‏‏‏‎‎‏‎‏‏‏‎‎‎‏‎‏‏‏‎‏‎Moving ‎‏‎‎‏‏‎<xliff:g id="APP">^1</xliff:g>‎‏‎‎‏‏‏‎ and its data to ‎‏‎‎‏‏‎<xliff:g id="NAME_0">^2</xliff:g>‎‏‎‎‏‏‏‎ will take only a few moments. You won’t be able to use the app until the move is complete. ‎‏‎‎‏‏‎\n‎‏‎‎‏‏‏‎‎‏‎‎‏‏‎\n‎‏‎‎‏‏‏‎Don’t remove the ‎‏‎‎‏‏‎<xliff:g id="NAME_1">^2</xliff:g>‎‏‎‎‏‏‏‎ during the move.‎‏‎‎‏‎"</string>
+    <string name="storage_wizard_move_progress_title" msgid="4443920302548035674">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‏‏‎‏‏‎‏‎‏‎‏‏‏‏‏‏‏‎‎‏‏‏‏‏‏‎‎‎‎‏‏‎‎‎‏‏‏‎‎‎‎‏‎‏‏‎‏‎‏‎‎‎‎‏‎‏‏‎‏‎‎Moving ‎‏‎‎‏‏‎<xliff:g id="APP">^1</xliff:g>‎‏‎‎‏‏‏‎…‎‏‎‎‏‎"</string>
+    <string name="storage_wizard_move_progress_body" msgid="7802577486578105609">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‏‏‎‎‎‏‎‎‏‎‎‎‎‏‎‏‎‎‏‎‏‏‏‎‎‎‏‎‎‏‎‏‏‎‏‏‏‏‏‏‎‎‏‎‏‎‏‏‏‏‎‏‎‎‎‎‏‎‎‏‎Don’t remove the ‎‏‎‎‏‏‎<xliff:g id="NAME">^1</xliff:g>‎‏‎‎‏‏‏‎ during the move. ‎‏‎‎‏‏‎\n‎‏‎‎‏‏‏‎‎‏‎‎‏‏‎\n‎‏‎‎‏‏‏‎The ‎‏‎‎‏‏‎<xliff:g id="APP">^2</xliff:g>‎‏‎‎‏‏‏‎ app on this device won’t be available until the move is complete.‎‏‎‎‏‎"</string>
+    <string name="storage_wizard_move_progress_cancel" msgid="542047237524588792">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‎‏‏‏‏‏‏‎‎‎‎‏‎‏‏‎‏‏‏‏‎‏‎‎‎‏‎‏‏‏‎‎‏‏‎‏‎‎‎‎‏‎‎‎‏‎‏‎‎‎‏‎‎‎‏‏‏‏‏‎‎‎‎Cancel move‎‏‎‎‏‎"</string>
+    <string name="storage_wizard_slow_body" msgid="8010127667184768025">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‏‏‏‏‎‎‏‎‏‎‎‏‏‎‏‏‎‎‎‎‏‎‏‎‏‏‎‎‏‎‎‎‎‎‎‎‎‎‎‏‎‎‏‏‏‎‎‏‎‏‎‎‎‎‎‏‏‎‎‏‎This ‎‏‎‎‏‏‎<xliff:g id="NAME_0">^1</xliff:g>‎‏‎‎‏‏‏‎ appears to be slow. ‎‏‎‎‏‏‎\n‎‏‎‎‏‏‏‎‎‏‎‎‏‏‎\n‎‏‎‎‏‏‏‎You can continue, but apps moved to this location may stutter and data transfers may take a long time. ‎‏‎‎‏‏‎\n‎‏‎‎‏‏‏‎‎‏‎‎‏‏‎\n‎‏‎‎‏‏‏‎Consider using a faster ‎‏‎‎‏‏‎<xliff:g id="NAME_1">^1</xliff:g>‎‏‎‎‏‏‏‎ for better performance.‎‏‎‎‏‎"</string>
+    <string name="battery_status_title" msgid="9159414319574976203">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‏‏‏‏‎‎‎‏‏‏‎‎‏‏‎‎‎‏‏‎‏‏‎‎‏‎‏‏‏‎‎‎‎‏‎‎‏‏‏‎‎‏‎‎‏‎‎‎‎‏‏‎‏‏‎‎‏‎‏‏‎Battery status‎‏‎‎‏‎"</string>
+    <string name="battery_level_title" msgid="2965679202786873272">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‏‎‎‏‎‎‏‎‏‎‎‎‎‎‏‏‎‏‎‏‏‎‎‎‎‏‎‏‏‎‏‎‎‏‏‏‏‏‏‎‎‎‎‎‎‎‎‎‏‏‏‏‏‎‏‏‏‎‎‎‎Battery level‎‏‎‎‏‎"</string>
+    <string name="apn_settings" msgid="3743170484827528406">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‎‎‏‏‏‏‏‏‎‎‏‎‎‏‏‎‏‎‎‏‏‎‏‏‏‎‎‏‎‏‎‎‏‎‎‏‏‏‎‏‏‏‏‏‎‎‎‏‏‏‎‎‏‏‎‏‎‏‏‎‎APNs‎‏‎‎‏‎"</string>
+    <string name="apn_edit" msgid="1354715499708424718">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‎‎‏‎‏‏‎‎‏‏‎‎‏‏‏‎‏‎‏‎‏‎‎‏‎‎‎‏‏‏‎‎‎‎‏‏‏‏‎‏‎‏‏‎‎‎‏‎‎‎‏‎‎‎‎‎‏‏‏‎‎Edit access point‎‏‎‎‏‎"</string>
+    <string name="apn_not_set" msgid="4974192007399968164">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‎‏‎‏‎‎‎‎‎‏‏‏‏‏‏‎‎‎‎‏‎‏‎‎‎‏‏‎‏‎‏‏‏‏‎‏‏‎‏‎‏‎‎‏‏‎‎‎‏‏‎‏‏‎‏‎‎‏‎‎‎Not set‎‏‎‎‏‎"</string>
+    <string name="apn_name" msgid="4115580098369824123">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‏‎‎‏‎‎‎‏‏‏‎‏‎‏‏‏‏‎‏‎‎‏‎‎‏‎‏‏‎‏‎‏‎‎‎‎‎‎‎‎‎‎‎‎‎‎‏‎‎‏‎‏‎‏‏‏‏‎‏‏‎Name‎‏‎‎‏‎"</string>
+    <string name="apn_apn" msgid="2479425126733513353">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‎‎‏‎‎‏‏‎‏‎‎‎‏‎‏‏‎‎‎‎‎‎‎‎‎‏‎‎‎‎‏‎‎‏‏‎‎‎‏‎‎‎‎‏‎‎‎‎‎‎‏‎‏‎‎‎‏‎‎‏‎APN‎‏‎‎‏‎"</string>
+    <string name="apn_http_proxy" msgid="1826885957243696354">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‏‎‎‏‎‏‎‏‏‎‏‎‎‏‏‎‎‏‏‏‎‎‎‏‏‎‎‏‎‏‎‎‏‏‏‎‏‎‏‎‏‎‎‎‏‏‏‏‎‏‎‎‏‏‏‎‎‎‏‎‎Proxy‎‏‎‎‏‎"</string>
+    <string name="apn_http_port" msgid="3763259523984976226">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‎‏‎‎‎‎‏‏‏‎‎‏‏‏‎‎‏‎‎‎‏‎‎‏‏‎‎‏‎‎‏‏‎‏‎‎‏‎‏‏‏‎‏‎‏‏‏‎‏‎‎‏‎‏‏‎‎‎‏‎‎Port‎‏‎‎‏‎"</string>
+    <string name="apn_user" msgid="455637547356117761">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‎‏‏‏‏‎‎‏‎‏‎‎‏‎‏‎‏‏‏‏‏‏‏‏‏‎‏‏‏‏‎‏‏‎‏‏‎‎‎‏‏‏‏‏‎‏‏‏‎‏‏‎‏‏‎‎‎‎‎‎‎‏‎Username‎‏‎‎‏‎"</string>
+    <string name="apn_password" msgid="5412301994998250968">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‏‎‏‏‎‎‎‏‏‏‎‎‎‏‎‏‏‎‏‏‏‏‏‏‏‏‎‏‎‎‏‎‎‏‎‏‎‎‎‎‎‎‏‎‎‎‏‏‏‏‎‏‏‏‎‏‏‎‎‎‎Password‎‏‎‎‏‎"</string>
+    <string name="apn_server" msgid="2436185314756372858">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‎‎‎‏‏‏‎‎‏‏‏‏‎‎‎‏‎‎‎‏‏‎‏‎‎‎‏‎‏‏‏‎‎‏‎‏‎‎‎‏‎‎‏‏‏‎‏‎‏‎‎‏‎‏‏‏‏‎‏‎‎Server‎‏‎‎‏‎"</string>
+    <string name="apn_mmsc" msgid="3670124402105585737">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‎‎‏‎‏‏‏‎‏‏‏‎‏‏‏‎‎‏‏‎‏‎‏‏‎‎‏‎‏‏‎‏‎‏‎‎‏‏‏‏‏‏‏‏‎‎‎‏‎‎‎‎‎‏‎‎‏‎‎‏‎MMSC‎‏‎‎‏‎"</string>
+    <string name="apn_mms_proxy" msgid="5374082621073999275">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‏‎‏‎‏‎‎‏‎‏‎‎‏‎‎‏‎‎‏‏‏‎‏‎‏‎‏‏‏‎‏‏‎‏‏‎‏‎‏‏‎‏‏‏‎‏‎‎‎‏‎‏‏‎‏‎‏‎‏‏‎MMS proxy‎‏‎‎‏‎"</string>
+    <string name="apn_mms_port" msgid="4074188088199243040">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‏‎‎‎‏‎‎‎‏‎‏‎‎‏‏‎‏‏‎‎‎‏‏‏‏‎‏‎‏‏‏‏‎‎‎‏‎‎‏‏‏‏‏‎‎‏‏‎‎‏‎‏‎‎‏‎‎‎‎‎‎MMS port‎‏‎‎‏‎"</string>
+    <string name="apn_mcc" msgid="4258628382260674636">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‏‎‏‏‎‎‎‏‏‎‎‏‏‎‏‎‏‏‏‏‏‏‏‏‎‎‏‏‎‏‎‏‎‎‏‏‎‎‎‎‏‎‏‏‎‏‎‎‎‎‎‎‎‏‎‎‏‏‎‎‎MCC‎‏‎‎‏‎"</string>
+    <string name="apn_mnc" msgid="8629374076888809874">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‎‏‏‏‏‏‎‎‎‎‎‏‏‎‏‏‎‎‏‎‎‎‎‎‎‎‎‎‏‎‏‎‎‏‏‎‏‏‏‎‏‏‎‎‎‎‎‎‎‎‎‏‏‎‎‏‎‎‏‎‎MNC‎‏‎‎‏‎"</string>
+    <string name="apn_auth_type" msgid="6167205395676037015">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‎‏‎‏‏‎‎‏‎‏‏‎‎‏‎‏‎‎‎‎‏‎‏‎‎‎‎‏‏‏‎‏‎‎‏‎‎‎‏‎‎‏‎‎‎‏‏‏‏‏‏‏‏‎‎‏‎‏‏‏‎Authentication type‎‏‎‎‏‎"</string>
+    <string name="apn_auth_type_none" msgid="5069592676845549926">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‎‏‏‎‎‏‎‏‏‎‏‎‏‏‎‎‏‏‏‏‏‎‏‎‏‏‏‎‎‎‎‎‎‎‏‏‎‏‎‎‏‏‎‎‏‏‏‏‏‎‎‏‎‏‏‎‎‏‏‎‎None‎‏‎‎‏‎"</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 or CHAP‎‏‎‎‏‎"</string>
+    <string name="apn_type" msgid="469613123902220544">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‎‏‏‏‏‎‏‎‎‎‎‏‎‎‎‏‏‎‎‏‏‎‏‎‏‎‎‏‎‏‏‏‏‎‏‎‎‎‎‎‎‎‏‏‎‏‏‎‏‎‏‎‎‏‎‎‎‎‎‎‎‎‎APN type‎‏‎‎‏‎"</string>
+    <string name="apn_protocol" msgid="3272222921649348640">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‏‏‎‏‎‏‏‎‏‎‎‏‎‏‎‎‎‏‎‏‎‏‏‎‏‎‎‏‎‎‎‎‎‏‏‎‏‏‎‎‏‏‎‎‏‏‏‎‎‎‎‎‎‎‏‎‎‎‎‎‎APN protocol‎‏‎‎‏‎"</string>
+    <string name="apn_roaming_protocol" msgid="3386954381510788422">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‏‏‏‏‎‎‎‎‎‎‎‎‏‏‏‎‎‎‎‏‎‎‎‏‎‎‎‎‏‎‏‎‏‏‎‎‎‏‏‎‎‏‏‏‎‏‎‎‎‏‎‏‎‏‎‎‎‏‏‎‎APN roaming protocol‎‏‎‎‏‎"</string>
+    <string name="carrier_enabled" msgid="407655861175280806">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‎‏‏‏‎‏‏‎‏‎‏‎‎‎‎‏‎‎‏‎‎‎‏‏‎‏‏‎‎‎‏‎‎‎‏‎‏‏‏‏‏‏‎‏‎‏‎‏‏‎‎‏‎‎‏‎‏‎‎‏‏‎‎APN enable/disable‎‏‎‎‏‎"</string>
+    <string name="carrier_enabled_summaryOn" msgid="6338915271908057531">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‎‏‏‏‏‏‏‏‏‎‎‎‎‏‎‏‏‎‎‏‏‏‎‏‏‎‏‎‏‏‎‏‎‎‏‏‎‏‏‎‎‎‎‎‏‏‏‎‎‎‎‏‏‎‏‏‏‎‏‏‎APN enabled‎‏‎‎‏‎"</string>
+    <string name="carrier_enabled_summaryOff" msgid="4300790190221203756">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‏‎‏‏‏‎‏‎‏‏‏‏‎‏‏‏‏‎‎‏‏‏‏‎‎‏‎‎‎‎‏‏‎‏‎‏‏‎‎‏‏‏‏‎‏‎‎‏‏‎‎‏‎‎‏‎‏‏‎‎‎APN disabled‎‏‎‎‏‎"</string>
+    <string name="bearer" msgid="594270280031923558">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‎‏‎‎‎‎‎‏‏‏‏‏‏‎‏‎‎‎‏‎‏‏‎‏‎‏‎‏‏‏‏‎‎‏‏‎‏‏‏‎‏‏‏‏‏‏‏‏‎‏‏‎‏‎‏‏‎‎‏‏‎‎Bearer‎‏‎‎‏‎"</string>
+    <string name="mvno_type" msgid="2543253857818336421">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‎‎‏‏‎‏‎‎‏‎‏‏‎‏‏‏‎‎‏‏‏‏‏‎‏‎‎‎‏‎‏‏‎‎‎‎‏‏‏‎‎‏‏‏‎‏‎‏‏‏‎‎‏‎‏‎‎‏‎‏‎MVNO type‎‏‎‎‏‎"</string>
+    <string name="mvno_match_data" msgid="4560671695220540466">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‏‏‏‏‎‏‎‎‏‎‏‎‏‏‎‎‎‎‏‎‏‎‏‏‏‏‏‎‎‏‎‎‏‎‏‎‏‏‎‎‏‏‎‎‏‎‎‎‎‏‎‎‎‎‏‏‎‎‏‎‎MVNO value‎‏‎‎‏‎"</string>
+    <string name="menu_delete" msgid="6981294422841124659">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‎‎‎‎‏‏‏‎‎‎‏‎‏‎‎‎‏‎‏‎‎‏‎‎‏‎‏‎‎‎‎‎‎‎‎‏‏‏‎‏‏‏‎‎‎‏‏‎‎‏‏‏‎‎‏‏‎‎‏‏‎Delete APN‎‏‎‎‏‎"</string>
+    <string name="menu_new" msgid="3014205883303921729">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‏‎‎‏‏‏‎‏‎‏‎‎‏‎‎‏‏‏‎‎‎‏‎‎‎‏‏‏‏‏‏‎‏‎‏‎‎‎‏‏‏‎‎‏‎‎‎‎‏‎‎‎‎‏‎‎‎‎‎‏‎New APN‎‏‎‎‏‎"</string>
+    <string name="menu_save" msgid="8109345640668285399">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‎‎‎‎‏‎‎‎‏‎‏‎‎‎‏‎‏‏‏‎‏‏‏‎‎‏‎‏‎‎‏‎‎‎‎‎‏‏‏‎‎‏‎‏‎‏‎‎‏‎‎‏‏‏‎‏‎‏‏‏‎Save‎‏‎‎‏‎"</string>
+    <string name="menu_cancel" msgid="2194502410474697474">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‏‏‏‎‎‏‏‏‎‏‎‎‎‏‏‏‎‎‎‎‎‏‎‏‎‎‎‎‏‎‏‏‏‎‏‏‎‎‎‏‎‏‎‏‎‎‏‏‎‎‏‏‎‎‎‎‎‎‏‎‎Discard‎‏‎‎‏‎"</string>
+    <string name="error_title" msgid="7631322303341024692"></string>
+    <string name="error_name_empty" msgid="5508155943840201232">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‏‏‎‎‎‏‏‏‎‎‎‎‏‏‏‎‎‏‏‎‏‎‏‎‎‏‎‏‏‏‎‎‎‎‎‎‎‎‎‎‏‏‎‏‎‎‏‏‏‎‏‎‎‎‎‏‎‎‎‎‎The Name field can’t be empty.‎‏‎‎‏‎"</string>
+    <string name="error_apn_empty" msgid="4932211013600863642">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‎‏‎‎‎‏‏‏‎‎‏‎‏‎‏‏‏‎‏‏‏‏‎‎‏‎‎‎‏‏‏‎‏‏‏‎‏‏‏‏‎‎‏‎‏‏‏‎‎‏‎‏‏‎‎‏‏‎‏‎‎The APN can’t 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">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‏‎‏‎‎‎‎‎‎‏‏‏‎‎‎‏‎‏‎‏‎‎‏‎‎‎‏‎‎‏‏‎‏‏‎‎‎‏‏‎‎‏‏‎‏‏‏‎‏‎‎‎‎‎‎‎‏‏‎‏‎Carrier 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>
+    <string name="reset_dashboard_title" msgid="6254873816990678620">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‎‏‏‎‏‏‎‎‏‏‎‏‏‏‎‎‎‏‏‎‏‎‎‏‏‎‎‎‏‏‎‎‏‎‎‎‏‎‎‏‏‏‏‎‏‏‏‏‏‏‏‎‎‏‎‏‏‏‎‎‎Reset options‎‏‎‎‏‎"</string>
+    <string name="reset_dashboard_summary" msgid="4851012632493522755">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‎‎‏‏‎‏‎‏‎‎‏‎‎‏‎‎‎‎‏‎‎‏‎‎‏‎‎‏‏‎‎‏‏‎‎‎‏‎‏‏‎‏‎‏‎‏‏‏‏‏‏‏‎‏‎‎‎‎‏‏‎Network, apps, or device can be reset‎‏‎‎‏‎"</string>
+    <string name="reset_network_title" msgid="6166025966016873843">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‎‏‎‏‏‎‎‏‎‎‏‎‎‎‎‏‏‏‏‏‏‏‏‏‎‎‏‎‎‏‏‏‎‏‎‎‎‏‎‎‎‏‎‏‎‏‎‎‎‏‎‏‎‏‏‏‎‎‏‏‎Reset Wi-Fi, mobile &amp; Bluetooth‎‏‎‎‏‎"</string>
+    <string name="reset_network_desc" msgid="5547979398298881406">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‏‏‎‎‏‏‏‏‏‏‏‎‎‏‏‎‎‎‎‏‏‏‎‏‏‏‏‎‎‏‎‎‏‎‎‎‏‏‎‎‏‎‏‎‎‏‎‎‏‏‎‏‎‏‏‏‏‏‏‎‎This will reset all network settings, including:‎‏‎‎‏‏‎\n‎‏‎‎‏‏‏‎‎‏‎‎‏‏‎\n‎‏‎‎‏‏‏‎‎‏‎‎‏‏‎"<li>"‎‏‎‎‏‏‏‎Wi‑Fi‎‏‎‎‏‏‎"</li>"‎‏‎‎‏‏‏‎‎‏‎‎‏‏‎\n‎‏‎‎‏‏‏‎‎‏‎‎‏‏‎"<li>"‎‏‎‎‏‏‏‎Mobile data‎‏‎‎‏‏‎"</li>"‎‏‎‎‏‏‏‎‎‏‎‎‏‏‎\n‎‏‎‎‏‏‏‎‎‏‎‎‏‏‎"<li>"‎‏‎‎‏‏‏‎Bluetooth‎‏‎‎‏‏‎"</li>"‎‏‎‎‏‏‏‎‎‏‎‎‏‎"</string>
+    <string name="reset_network_button_text" msgid="2035676527471089853">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‏‏‎‎‎‏‎‎‎‎‎‎‎‎‏‎‏‏‎‏‎‎‎‎‎‏‎‎‎‎‏‎‏‎‎‏‏‎‎‎‎‎‏‏‏‏‎‏‏‎‎‎‏‎‏‏‏‏‎‏‎Reset settings‎‏‎‎‏‎"</string>
+    <string name="reset_network_final_desc" msgid="6388371121099245116">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‏‎‎‎‏‎‏‎‏‎‎‎‎‎‎‎‏‏‎‏‏‎‏‏‎‎‎‎‎‎‎‎‎‏‏‎‎‏‏‏‏‏‎‎‎‎‎‎‎‏‏‎‎‎‏‏‏‏‎‎‎Reset all network settings? You can’t undo this action!‎‏‎‎‏‎"</string>
+    <string name="reset_network_final_button_text" msgid="1797434793741744635">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‏‎‎‎‏‏‏‏‎‎‎‏‏‏‎‎‎‏‎‏‎‏‏‎‏‎‏‏‏‏‏‏‎‎‏‏‏‏‏‎‎‏‏‏‎‏‏‏‏‎‎‏‏‏‏‏‏‎‏‏‎Reset settings‎‏‎‎‏‎"</string>
+    <string name="reset_network_confirm_title" msgid="1759888886976962773">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‏‎‎‎‎‏‏‎‏‏‎‎‎‏‏‎‎‎‎‏‏‎‎‏‏‏‏‎‎‏‎‏‎‎‎‎‎‏‏‎‏‎‏‏‎‏‏‎‎‎‎‎‏‏‎‏‎‏‎‏‎Reset?‎‏‎‎‏‎"</string>
+    <string name="network_reset_not_available" msgid="7188610385577164676">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‎‎‏‏‏‏‎‎‎‎‏‏‎‎‎‏‎‎‏‏‎‎‎‎‏‏‏‏‎‎‎‎‏‏‎‏‎‎‎‎‎‎‏‎‏‎‏‏‏‏‏‏‏‎‎‎‎‏‎‎‎Network reset is not available for this user‎‏‎‎‏‎"</string>
+    <string name="reset_network_complete_toast" msgid="787829973559541880">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‎‏‎‏‎‏‏‏‎‏‏‏‎‏‏‏‎‏‏‏‏‎‎‏‎‏‏‏‏‏‏‎‏‎‏‎‏‎‏‏‎‏‏‎‎‎‎‎‎‎‎‎‎‎‏‏‏‏‎‎‎‎Network settings have been reset‎‏‎‎‏‎"</string>
+    <string name="master_clear_title" msgid="3531267871084279512">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‎‎‎‏‎‎‎‎‎‎‎‏‏‎‎‏‎‏‎‏‎‏‏‎‏‎‏‏‎‏‎‏‎‏‏‎‏‎‏‏‏‎‏‎‎‏‏‏‎‏‏‎‏‏‎‏‏‎‎‎‎Erase all data (factory reset)‎‏‎‎‏‎"</string>
+    <string name="master_clear_desc" product="tablet" msgid="9146059417023157222">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‏‏‏‎‏‏‏‎‏‏‎‏‎‏‎‏‎‏‎‎‏‎‎‏‎‏‎‎‏‏‏‏‎‏‏‎‎‏‎‎‏‎‎‎‎‎‎‏‎‎‏‏‏‏‏‎‎‏‏‎‎This will erase all data from your tablet’s ‎‏‎‎‏‏‎"<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" msgid="4800386183314202571">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‎‎‏‎‏‎‎‏‏‏‏‎‎‏‏‎‎‏‎‏‏‏‎‎‏‏‎‎‏‏‎‏‏‎‎‏‎‎‏‎‎‎‏‎‏‏‎‏‏‏‏‏‏‏‎‎‏‎‏‏‎This will erase all data from your phone’s ‎‏‎‎‏‏‎"<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_accounts" product="default" msgid="6412857499147999073">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‏‎‎‎‏‏‏‏‏‏‏‏‎‎‎‎‏‎‏‏‏‏‏‎‏‎‏‏‎‎‏‎‏‏‏‏‏‏‏‎‏‎‏‎‏‎‎‏‎‏‏‏‎‏‏‎‎‎‎‏‎‎‏‎‎‏‏‎\n‎‏‎‎‏‏‏‎‎‏‎‎‏‏‎\n‎‏‎‎‏‏‏‎You are currently signed into the following accounts:‎‏‎‎‏‏‎\n‎‏‎‎‏‏‏‎‎‏‎‎‏‎"</string>
+    <string name="master_clear_other_users_present" product="default" msgid="5161423070702470742">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‎‏‏‏‏‎‏‎‎‎‎‏‎‎‎‎‏‏‏‎‏‏‏‎‏‏‏‏‏‎‏‏‏‎‎‎‏‎‏‏‏‎‏‎‎‎‎‎‎‏‏‎‎‏‎‏‎‏‏‎‎‎‏‎‎‏‏‎\n‎‏‎‎‏‏‏‎‎‏‎‎‏‏‎\n‎‏‎‎‏‏‏‎There are other users present on this device.‎‏‎‎‏‏‎\n‎‏‎‎‏‏‏‎‎‏‎‎‏‎"</string>
+    <string name="master_clear_desc_also_erases_external" msgid="1903185203791274237">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‏‎‏‎‎‏‏‎‏‎‎‏‎‏‏‏‏‎‎‎‏‏‎‏‏‎‏‏‏‏‏‏‏‏‎‏‏‏‎‎‎‎‏‎‎‎‏‎‎‎‎‎‏‏‏‏‏‏‎‏‎‎‏‎‎‏‏‎"<li>"‎‏‎‎‏‏‏‎Music‎‏‎‎‏‏‎"</li>"‎‏‎‎‏‏‏‎‎‏‎‎‏‏‎\n‎‏‎‎‏‏‏‎‎‏‎‎‏‏‎"<li>"‎‏‎‎‏‏‏‎Photos‎‏‎‎‏‏‎"</li>"‎‏‎‎‏‏‏‎‎‏‎‎‏‏‎\n‎‏‎‎‏‏‏‎‎‏‎‎‏‏‎"<li>"‎‏‎‎‏‏‏‎Other user data‎‏‎‎‏‏‎"</li>"‎‏‎‎‏‏‏‎‎‏‎‎‏‎"</string>
+    <string name="master_clear_desc_also_erases_esim" msgid="312352697653096008">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‎‏‏‏‎‎‎‏‎‏‎‏‎‏‏‎‏‏‎‎‏‏‎‎‎‏‏‏‏‏‏‎‏‎‎‏‎‎‎‎‏‏‏‏‏‏‎‏‏‎‏‏‏‎‎‏‎‎‏‎‎‎‎‎‏‎‎‏‏‎"<li>"‎‏‎‎‏‏‏‎Carriers on eSIM‎‏‎‎‏‏‎"</li>"‎‏‎‎‏‏‏‎‎‏‎‎‏‎"</string>
+    <string name="master_clear_desc_no_cancel_mobile_plan" msgid="5460926449093211144">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‏‎‏‏‏‏‎‎‏‎‎‏‎‎‎‏‏‎‏‏‏‎‏‎‏‏‎‎‎‎‎‏‎‏‏‎‏‎‏‏‏‏‎‎‎‏‏‏‎‏‎‎‎‎‎‎‏‎‎‎‎‎‏‎‎‏‏‎\n‎‏‎‎‏‏‏‎‎‏‎‎‏‏‎\n‎‏‎‎‏‏‏‎This will not cancel your mobile service plan.‎‏‎‎‏‎"</string>
+    <string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="7744115866662613411">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‏‎‏‏‎‏‏‏‏‎‎‎‏‎‏‎‎‎‎‎‎‏‎‏‏‎‎‏‏‏‎‎‎‎‏‏‏‏‏‎‎‏‎‎‎‎‏‏‎‎‎‏‏‎‏‎‎‎‏‏‎‎‏‎‎‏‏‎\n‎‏‎‎‏‏‏‎‎‏‎‎‏‏‎\n‎‏‎‎‏‏‏‎To clear music, pictures, and other user data, the ‎‏‎‎‏‏‎"<b>"‎‏‎‎‏‏‏‎USB storage‎‏‎‎‏‏‎"</b>"‎‏‎‎‏‏‏‎ needs to be erased.‎‏‎‎‏‎"</string>
+    <string name="master_clear_desc_erase_external_storage" product="default" msgid="4801026652617377093">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‎‎‏‎‏‎‏‎‎‎‎‎‏‎‏‎‏‏‎‎‎‏‎‎‏‏‎‏‏‎‏‏‏‎‏‎‎‏‏‏‎‎‎‏‎‎‎‎‎‏‎‏‎‏‎‎‎‏‎‏‎‎‏‎‎‏‏‎\n‎‏‎‎‏‏‏‎‎‏‎‎‏‏‎\n‎‏‎‎‏‏‏‎To clear music, pictures, and other user data, the ‎‏‎‎‏‏‎"<b>"‎‏‎‎‏‏‏‎SD card‎‏‎‎‏‏‎"</b>"‎‏‎‎‏‏‏‎ needs to be erased.‎‏‎‎‏‎"</string>
+    <string name="erase_external_storage" product="nosdcard" msgid="969364037450286809">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‎‏‏‎‏‎‏‏‏‎‎‏‏‏‏‎‏‏‏‏‏‎‏‏‏‎‏‎‎‏‏‎‎‎‏‏‎‎‏‎‎‎‎‏‏‎‏‎‎‎‏‏‎‏‏‎‏‏‎‎‏‎Erase USB storage‎‏‎‎‏‎"</string>
+    <string name="erase_external_storage" product="default" msgid="1397239046334307625">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‎‎‏‏‎‏‏‎‎‎‏‏‏‏‏‏‏‏‎‏‏‎‎‎‎‎‏‎‎‏‏‏‏‏‏‏‎‎‎‎‏‏‏‏‏‏‎‏‏‏‎‏‎‎‏‎‏‎‎‏‎Erase SD card‎‏‎‎‏‎"</string>
+    <string name="erase_external_storage_description" product="nosdcard" msgid="4728558173931599429">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‎‎‎‏‏‎‎‏‏‏‏‏‎‎‏‏‎‏‏‎‏‎‎‏‏‎‏‏‎‎‏‏‎‎‎‎‏‏‏‏‎‏‏‎‎‏‏‏‎‏‏‎‎‏‎‎‎‏‎‏‎Erase all the data on the internal USB storage, such as music or photos‎‏‎‎‏‎"</string>
+    <string name="erase_external_storage_description" product="default" msgid="1737638779582964966">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‏‎‎‎‎‎‎‏‏‏‎‏‎‏‎‏‎‏‎‏‎‏‎‎‎‎‏‏‎‏‏‏‏‏‎‎‏‏‏‏‏‏‎‎‎‏‏‎‎‏‎‎‏‏‏‎‎‏‏‎‎Erase all the data on the SD card, such as music or photos‎‏‎‎‏‎"</string>
+    <string name="erase_esim_storage" msgid="1886761972867390123">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‏‎‏‎‎‎‏‎‏‏‏‏‎‎‏‎‎‎‎‎‎‎‎‎‎‏‎‎‏‎‎‏‎‎‎‎‎‏‏‏‏‎‎‏‏‏‎‏‏‎‏‎‏‎‏‎‏‎‏‏‎Erase eSIMs‎‏‎‎‏‎"</string>
+    <string name="erase_esim_storage_description" product="default" msgid="708691303677321598">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‎‏‎‎‏‏‏‎‏‎‏‎‏‏‏‎‎‎‏‏‎‏‏‏‏‏‏‎‎‎‏‏‎‎‎‏‏‎‎‎‏‏‎‎‎‎‏‏‎‎‎‎‏‎‏‏‏‏‏‏‎‎Erase all eSIMs on the phone. This will not cancel your mobile service plan.‎‏‎‎‏‎"</string>
+    <string name="erase_esim_storage_description" product="tablet" msgid="1780953956941209107">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‏‎‎‎‏‎‏‏‎‏‏‏‎‎‏‏‏‎‎‎‎‎‏‏‎‎‎‎‎‎‎‏‏‏‎‎‏‏‎‎‏‏‏‎‏‎‎‏‏‏‏‎‎‎‎‏‎‎‏‏‎Erase all eSIMs on the tablet. This will not cancel your mobile service plan.‎‏‎‎‏‎"</string>
+    <string name="master_clear_button_text" product="tablet" msgid="3130786116528304116">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‏‎‏‏‎‏‏‏‎‎‏‎‏‏‎‎‏‎‎‏‎‏‏‎‎‎‏‎‏‎‏‎‎‏‏‏‎‏‏‎‎‏‎‎‏‏‏‎‏‏‏‏‏‏‏‏‎‏‎‎‎Reset tablet‎‏‎‎‏‎"</string>
+    <string name="master_clear_button_text" product="default" msgid="7550632653343157971">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‏‎‎‎‏‏‎‎‏‎‎‏‎‎‏‏‏‏‎‎‎‏‏‎‎‏‎‎‏‎‏‎‏‎‏‏‏‏‏‏‏‎‏‏‏‏‏‎‏‏‏‎‏‏‎‏‎‎‏‏‎Reset phone‎‏‎‎‏‎"</string>
+    <string name="master_clear_final_desc" msgid="7318683914280403086">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‎‏‎‏‏‎‎‏‎‎‎‏‎‎‏‏‎‎‎‎‎‎‏‏‏‏‏‎‎‏‏‏‎‏‏‎‎‎‎‎‏‏‎‎‏‎‎‎‎‎‎‎‏‎‎‎‏‏‏‎‎Erase all your personal information and downloaded apps? You can’t undo this action!‎‏‎‎‏‎"</string>
+    <string name="master_clear_final_button_text" msgid="5390908019019242910">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‏‎‏‎‏‏‎‏‎‎‎‎‎‏‎‏‏‎‏‎‎‏‎‎‎‏‏‏‏‏‏‏‎‎‏‎‎‏‏‏‎‎‏‎‎‏‎‏‏‏‎‏‏‎‎‏‏‏‏‎‎Erase everything‎‏‎‎‏‎"</string>
+    <string name="master_clear_failed" msgid="2503230016394586353">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‎‎‏‎‏‎‏‏‏‏‎‏‎‏‎‎‎‎‏‎‎‏‏‎‏‏‏‏‏‏‏‎‏‏‏‎‎‏‎‎‏‎‏‏‎‏‏‎‏‎‎‎‏‏‏‏‎‎‎‏‎No reset was performed because the System Clear service isn’t available.‎‏‎‎‏‎"</string>
+    <string name="master_clear_confirm_title" msgid="7572642091599403668">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‏‎‎‏‎‎‎‏‎‏‏‏‎‏‏‎‏‏‎‏‏‏‎‏‏‏‎‎‎‏‎‏‏‎‎‎‏‏‏‏‎‏‎‎‎‎‎‏‏‎‏‎‏‎‎‏‎‏‎‎‎Reset?‎‏‎‎‏‎"</string>
+    <string name="master_clear_not_available" msgid="1000370707967468909">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‎‏‏‎‏‏‏‏‎‎‎‏‎‎‎‎‎‎‏‏‏‏‏‎‏‏‎‏‏‏‏‎‏‎‏‎‎‎‎‎‏‏‎‏‏‎‏‏‎‎‏‎‏‎‏‏‎‏‏‎‏‎Factory reset is not available for this user‎‏‎‎‏‎"</string>
+    <string name="master_clear_progress_title" msgid="5194793778701994634">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‏‎‎‎‎‎‎‏‎‏‏‏‏‎‎‏‏‏‎‏‎‏‏‎‏‎‏‏‎‎‏‎‎‏‎‎‏‏‏‏‎‎‎‏‎‎‎‎‏‎‏‎‏‎‎‎‏‎‏‎‎Erasing‎‏‎‎‏‎"</string>
+    <string name="master_clear_progress_text" msgid="6559096229480527510">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‏‎‏‏‎‎‎‎‎‏‏‎‏‎‎‏‎‏‏‏‎‏‎‎‎‏‎‎‏‏‏‎‎‏‎‏‏‏‎‎‏‎‏‎‎‏‏‏‎‏‏‎‏‎‎‏‎‏‏‎‎Please wait...‎‏‎‎‏‎"</string>
+    <string name="call_settings_title" msgid="5188713413939232801">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‏‎‎‎‎‎‎‎‎‎‏‎‎‎‎‎‎‎‏‏‎‏‎‏‏‎‏‏‏‏‏‎‎‏‏‏‎‎‏‎‎‏‏‏‎‎‎‎‎‎‎‎‎‎‏‎‎‎‎‏‎Call settings‎‏‎‎‏‎"</string>
+    <string name="call_settings_summary" msgid="7291195704801002886">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‎‏‎‏‎‎‏‎‏‏‏‏‏‎‎‎‎‏‏‏‏‏‎‏‏‏‎‎‏‏‏‏‎‏‎‎‏‎‎‎‎‏‎‎‏‎‎‎‎‏‎‏‏‎‎‎‎‏‏‎‎Set up voicemail, call forwarding, call waiting, caller ID‎‏‎‎‏‎"</string>
+    <string name="tether_settings_title_usb" msgid="6688416425801386511">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‏‏‎‎‏‏‎‏‎‎‏‎‎‎‎‎‎‏‏‏‎‏‎‎‏‏‎‏‎‏‏‏‎‎‎‏‏‏‎‎‎‏‏‏‏‎‎‎‏‎‏‎‎‎‎‎‏‏‏‏‎USB tethering‎‏‎‎‏‎"</string>
+    <string name="tether_settings_title_wifi" msgid="3277144155960302049">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‏‏‎‏‎‏‏‏‏‎‏‎‏‏‎‎‎‎‎‏‎‎‏‏‏‏‏‏‎‎‏‎‏‏‎‏‏‏‎‎‎‎‏‎‏‏‎‏‏‎‎‏‏‏‏‎‎‎‎‏‎Portable hotspot‎‏‎‎‏‎"</string>
+    <string name="tether_settings_title_bluetooth" msgid="355855408317564420">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‎‏‏‏‎‎‏‏‏‏‎‎‎‎‎‏‎‎‎‎‎‎‏‎‎‏‏‎‏‏‏‏‎‎‎‏‎‎‎‎‏‎‏‎‏‏‏‎‎‎‎‏‏‎‎‎‎‎‎‏‎‎‎Bluetooth tethering‎‏‎‎‏‎"</string>
+    <string name="tether_settings_title_usb_bluetooth" msgid="5355828977109785001">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‏‎‏‎‎‏‎‏‎‎‏‏‏‎‏‏‏‎‏‎‎‎‎‏‎‏‎‎‎‎‎‎‏‎‏‎‎‏‎‏‏‏‏‏‎‏‎‏‏‎‎‏‏‎‏‎‏‎‎‏‎Tethering‎‏‎‎‏‎"</string>
+    <string name="tether_settings_title_all" msgid="3058586928118801157">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‏‎‏‎‎‏‏‏‎‎‏‎‎‏‎‎‏‎‎‎‏‎‎‏‏‎‏‏‎‎‏‎‎‏‎‏‎‎‏‎‏‏‎‎‏‎‏‎‎‎‏‏‎‎‎‎‎‏‎‏‎Hotspot &amp; tethering‎‏‎‎‏‎"</string>
+    <string name="tether_settings_summary_hotspot_on_tether_on" msgid="930464462687425777">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‎‏‏‎‎‏‏‏‎‏‎‎‏‏‎‏‎‏‏‎‎‎‏‏‏‏‏‏‏‏‎‏‏‏‏‏‎‏‎‎‏‏‎‏‏‏‏‎‏‎‏‎‎‏‏‏‏‎‎‎‏‎Hotspot on, tethering‎‏‎‎‏‎"</string>
+    <string name="tether_settings_summary_hotspot_on_tether_off" msgid="3473671453891735907">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‎‎‎‎‎‎‏‏‎‏‎‎‏‏‏‏‎‏‎‏‏‏‎‎‏‎‎‎‎‏‏‏‎‎‏‏‏‎‏‎‎‎‎‏‏‎‏‏‎‎‎‏‎‏‏‎‎‎‏‏‎Hotspot on‎‏‎‎‏‎"</string>
+    <string name="tether_settings_summary_hotspot_off_tether_on" msgid="1618256180720077354">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‎‏‏‎‎‏‏‏‎‏‎‏‎‎‏‏‎‎‏‏‎‏‏‎‏‏‎‎‎‎‏‎‎‏‏‏‎‏‏‎‎‏‏‎‏‎‎‎‏‎‏‎‎‎‏‎‏‎‏‎‎Tethering‎‏‎‎‏‎"</string>
+    <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_subtext" product="default" msgid="5991482890033484794">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‎‎‏‏‎‎‏‎‎‏‏‎‎‎‎‎‎‏‎‏‏‏‏‏‎‎‎‏‏‎‏‏‏‎‏‎‎‏‎‎‎‏‏‎‏‏‎‏‎‎‏‏‏‏‏‏‏‎‏‎‎Share phone’s Internet connection via USB‎‏‎‎‏‎"</string>
+    <string name="usb_tethering_subtext" product="tablet" msgid="5988796139573211318">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‎‎‏‏‎‎‎‏‏‏‎‎‎‏‏‏‏‎‏‎‎‏‎‏‏‎‏‏‏‏‏‎‎‎‏‏‎‏‏‏‏‏‎‏‏‏‏‏‎‎‎‎‏‎‏‏‎‏‏‎‎Share tablet’s Internet connection via USB‎‏‎‎‏‎"</string>
+    <string name="bluetooth_tether_checkbox_text" msgid="2379175828878753652">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‎‎‎‏‎‎‎‎‎‏‎‎‏‎‎‎‎‏‏‏‏‏‎‎‏‏‏‏‏‎‎‏‏‎‏‎‏‎‎‎‎‎‏‏‎‏‏‏‏‏‏‏‎‏‏‏‎‏‎‎‎Bluetooth tethering‎‏‎‎‏‎"</string>
+    <string name="bluetooth_tethering_subtext" product="tablet" msgid="4558227863463153412">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‏‏‏‏‎‏‎‎‎‎‏‎‎‎‎‏‎‏‎‎‎‎‎‏‎‏‏‏‎‏‎‏‏‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‏‏‏‏‎‎‎‎‎‏‎‎‎Share tablet’s Internet connection via Bluetooth‎‏‎‎‏‎"</string>
+    <string name="bluetooth_tethering_subtext" product="default" msgid="1055197887836203595">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‎‏‏‏‎‏‎‏‎‎‏‎‎‏‏‎‏‎‎‎‎‏‏‏‎‎‎‏‏‎‏‏‎‏‎‎‎‎‎‏‏‏‎‎‎‎‎‏‎‏‎‏‎‎‏‎‎‏‎‏‏‎Share phone’s Internet connection via Bluetooth‎‏‎‎‏‎"</string>
+    <string name="bluetooth_tethering_off_subtext_config" msgid="6326877798974938021">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‎‏‏‏‏‏‎‎‏‏‎‏‏‎‎‏‎‏‎‏‏‏‎‏‎‏‏‎‎‏‎‎‎‎‎‏‎‎‏‏‎‏‎‎‏‏‎‏‏‎‏‏‏‎‏‎‎‏‎‏‎Sharing this ‎‏‎‎‏‏‎<xliff:g id="DEVICE_NAME">%1$d</xliff:g>‎‏‎‎‏‏‏‎’s Internet connection via Bluetooth‎‏‎‎‏‎"</string>
+    <string name="bluetooth_tethering_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="1308462275952345985">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‎‎‏‎‎‎‏‎‏‎‎‎‏‎‎‏‎‏‏‏‏‎‎‎‎‎‎‏‏‏‏‎‏‎‎‎‎‎‏‎‎‎‏‏‏‎‎‎‎‎‏‏‏‎‎‎‎‎‎‏‎Use hotspot and tethering to provide Internet to other devices through your mobile data connection. Apps can also create a hotspot to share content with nearby devices.‎‏‎‎‏‎"</string>
+    <string name="tethering_help_button_text" msgid="656117495547173630">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‎‏‎‎‏‎‎‎‏‏‎‏‎‏‏‏‏‏‏‏‏‎‏‏‎‎‎‏‎‏‏‎‎‏‏‎‏‎‎‎‎‎‎‏‎‎‎‎‏‏‎‏‎‏‏‏‏‏‏‏‎‎Help‎‏‎‎‏‎"</string>
+    <string name="network_settings_title" msgid="2876509814832830757">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‎‏‏‏‏‏‏‎‏‎‏‏‎‏‏‎‏‎‏‎‎‏‏‎‏‏‏‏‏‎‏‎‏‎‏‎‎‎‎‎‏‎‎‏‎‎‎‏‏‎‎‏‎‎‏‎‎‏‎‏‎Mobile network‎‏‎‎‏‎"</string>
+    <string name="manage_mobile_plan_title" msgid="7630170375010107744">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‏‎‎‏‏‏‏‎‎‎‏‏‏‏‎‎‏‏‏‏‏‎‎‎‎‏‏‏‏‎‎‏‏‎‏‎‎‎‏‎‏‏‏‏‏‏‎‎‎‎‎‏‎‏‏‎‎‎‎‎‎Mobile plan‎‏‎‎‏‎"</string>
+    <string name="sms_application_title" msgid="4903928270533250448">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‎‏‎‎‎‎‎‎‏‏‏‎‎‏‎‎‎‎‎‎‏‏‎‎‎‏‏‏‏‎‏‎‏‎‎‏‎‎‏‎‎‎‎‏‎‏‎‎‏‏‎‏‏‎‎‏‎‎‎‎‎SMS app‎‏‎‎‏‎"</string>
+    <string name="sms_change_default_dialog_title" msgid="1958688831875804286">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‏‎‏‏‎‎‏‎‏‏‏‎‏‎‏‎‏‎‎‏‎‎‎‏‏‏‎‏‎‏‏‏‎‎‎‏‎‏‏‏‏‎‏‏‎‏‏‎‏‏‎‎‎‏‏‏‏‏‏‎‎Change SMS app?‎‏‎‎‏‎"</string>
+    <string name="sms_change_default_dialog_text" msgid="1522783933230274787">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‎‏‎‏‎‎‏‎‎‎‏‎‎‎‎‎‎‎‏‏‏‏‏‎‏‎‏‏‎‏‎‏‎‎‎‏‏‏‎‏‏‏‎‎‏‏‎‏‏‎‎‎‏‏‏‎‎‎‏‏‎Use ‎‏‎‎‏‏‎<xliff:g id="NEW_APP">%1$s</xliff:g>‎‏‎‎‏‏‏‎ instead of ‎‏‎‎‏‏‎<xliff:g id="CURRENT_APP">%2$s</xliff:g>‎‏‎‎‏‏‏‎ as your SMS app?‎‏‎‎‏‎"</string>
+    <string name="sms_change_default_no_previous_dialog_text" msgid="602683880284921998">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‎‏‎‎‎‎‏‎‏‏‏‎‏‎‎‏‎‏‎‎‏‏‏‎‎‏‎‏‏‏‏‎‎‎‏‎‎‎‎‏‏‏‏‎‎‏‎‏‎‎‎‎‎‏‎‎‎‏‏‏‎‎Use ‎‏‎‎‏‏‎<xliff:g id="NEW_APP">%s</xliff:g>‎‏‎‎‏‏‏‎ as your SMS app?‎‏‎‎‏‎"</string>
+    <string name="network_scorer_picker_title" msgid="6383879578279046456">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‏‎‎‎‏‎‎‏‏‎‎‎‎‎‎‏‏‎‎‎‏‎‏‎‎‏‏‏‎‎‏‏‏‎‎‎‎‎‏‏‎‎‎‏‎‏‏‎‏‏‎‏‎‎‏‏‏‎‎‎‎Network rating provider‎‏‎‎‏‎"</string>
+    <string name="network_scorer_picker_none_preference" msgid="9028375117241790936">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‏‏‎‏‎‏‎‎‏‎‏‏‎‎‏‏‏‎‏‏‎‏‎‏‎‏‎‏‏‎‏‏‎‎‏‎‎‎‏‎‏‏‎‎‎‎‏‏‎‎‎‏‏‏‎‏‏‎‎‎‎None‎‏‎‎‏‎"</string>
+    <string name="network_scorer_change_active_dialog_title" msgid="3776301550387574975">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‎‏‎‎‎‏‏‎‏‎‎‎‎‎‎‏‏‏‏‎‎‏‎‎‎‎‎‎‏‎‎‏‏‎‏‏‏‎‎‏‏‎‏‏‏‎‏‏‏‎‎‎‏‎‏‏‏‏‏‏‎Change Wi‑Fi assistant?‎‏‎‎‏‎"</string>
+    <string name="network_scorer_change_active_dialog_text" msgid="8035173880322990715">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‏‏‏‏‏‎‎‎‎‎‏‎‏‎‏‎‏‏‎‎‎‎‎‏‎‎‏‎‎‏‏‎‏‏‎‏‎‎‏‎‎‏‏‎‎‎‏‎‎‎‏‎‎‏‏‏‏‎‏‏‎Use ‎‏‎‎‏‏‎<xliff:g id="NEW_APP">%1$s</xliff:g>‎‏‎‎‏‏‏‎ instead of ‎‏‎‎‏‏‎<xliff:g id="CURRENT_APP">%2$s</xliff:g>‎‏‎‎‏‏‏‎ to manage your network connections?‎‏‎‎‏‎"</string>
+    <string name="network_scorer_change_active_no_previous_dialog_text" msgid="7444620909047611601">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‎‏‏‏‎‏‎‏‎‎‎‎‏‎‎‏‏‎‏‏‎‏‎‎‎‏‏‎‎‎‎‎‎‎‏‏‎‎‏‏‏‎‏‎‏‎‎‎‎‎‎‎‏‏‎‏‎‎‎‏‎Use ‎‏‎‎‏‏‎<xliff:g id="NEW_APP">%s</xliff:g>‎‏‎‎‏‏‏‎ to manage your network connections?‎‏‎‎‏‎"</string>
+    <string name="mobile_unknown_sim_operator" msgid="2156912373230276157">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‏‏‎‏‏‏‏‎‏‏‏‎‏‏‏‎‎‏‎‎‎‏‏‎‎‎‎‎‎‎‏‎‏‎‏‎‎‎‎‎‏‎‎‏‎‎‎‎‏‏‏‎‎‎‏‏‏‏‎‏‎Unknown SIM operator‎‏‎‎‏‎"</string>
+    <string name="mobile_no_provisioning_url" msgid="9053814051811634125">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‏‏‎‏‏‎‏‎‎‏‎‏‏‎‎‏‏‎‏‏‏‏‏‎‏‎‎‏‎‎‏‏‎‏‎‎‏‎‏‎‏‏‎‎‎‎‏‎‏‎‏‏‏‏‎‎‏‏‎‏‎‎‏‎‎‏‏‎<xliff:g id="OPERATOR">%1$s</xliff:g>‎‏‎‎‏‏‏‎ has no known provisioning website‎‏‎‎‏‎"</string>
+    <string name="mobile_insert_sim_card" msgid="9052590985784056395">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‏‏‎‏‏‎‏‎‎‎‎‏‎‏‎‎‎‎‏‏‏‎‎‎‏‎‎‏‏‏‏‏‎‏‎‎‏‎‎‎‏‏‏‏‏‏‎‏‏‎‏‎‎‏‎‎‏‎‏‏‎Please insert SIM card and restart‎‏‎‎‏‎"</string>
+    <string name="mobile_connect_to_internet" msgid="1733894125065249639">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‏‎‎‎‎‎‎‏‎‎‎‎‎‎‎‎‎‏‏‏‏‎‎‎‎‏‎‏‎‎‏‎‏‎‏‎‏‎‏‎‎‏‏‎‏‎‏‎‎‎‏‏‎‏‏‎‎‏‏‏‎Please connect to the internet‎‏‎‎‏‎"</string>
+    <string name="location_title" msgid="1029961368397484576">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‎‏‏‏‎‎‏‎‎‏‎‏‏‎‎‏‎‏‎‎‎‎‏‏‎‏‎‎‎‎‏‎‏‎‏‏‏‏‎‏‏‎‏‎‏‎‎‎‏‎‎‏‎‎‎‏‎‎‎‎‎‎My Location‎‏‎‎‏‎"</string>
+    <string name="managed_profile_location_switch_title" msgid="6712332547063039683">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‏‏‎‏‎‎‏‎‎‏‏‎‏‏‏‏‏‏‏‎‏‏‏‎‎‎‏‏‎‏‎‏‏‎‎‏‏‏‏‏‏‏‎‎‎‏‎‎‎‏‏‎‏‏‎‎‎‎‏‏‎Location for work profile‎‏‎‎‏‎"</string>
+    <string name="location_mode_title" msgid="3982009713118421689">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‎‏‏‏‎‏‎‎‎‎‏‎‏‏‏‏‎‎‎‎‏‎‏‏‏‏‎‎‏‎‎‎‏‎‏‎‏‎‎‏‎‏‎‎‎‎‏‎‎‎‏‎‏‎‏‏‏‎‎‏‎Mode‎‏‎‎‏‎"</string>
+    <string name="location_mode_high_accuracy_title" msgid="8241802585110932849">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‎‎‏‎‎‏‏‎‎‎‎‎‏‏‎‎‎‎‏‏‏‏‎‎‏‎‎‎‏‏‎‎‎‎‏‎‎‏‏‎‏‏‏‎‏‏‏‎‏‏‎‏‎‏‏‏‎‎‎‏‎High accuracy‎‏‎‎‏‎"</string>
+    <string name="location_mode_battery_saving_title" msgid="711273645208158637">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‎‏‎‎‏‏‏‎‏‏‏‏‎‏‏‏‏‎‎‏‏‏‎‎‏‏‏‎‎‏‎‏‎‎‎‎‎‏‎‏‏‏‎‏‎‏‏‎‎‎‎‎‏‏‎‏‎‏‏‎‏‎Battery saving‎‏‎‎‏‎"</string>
+    <string name="location_mode_sensors_only_title" msgid="3040366132175435160">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‏‎‏‎‎‎‏‏‎‎‎‏‏‎‎‎‏‏‎‎‏‏‏‎‎‎‏‏‎‏‏‏‏‏‏‏‎‏‏‏‎‎‎‏‏‏‏‏‎‏‎‏‏‎‎‏‏‎‎‎‎Device only‎‏‎‎‏‎"</string>
+    <string name="location_mode_location_off_title" msgid="2829713015012529465">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‎‏‏‏‎‏‎‎‎‏‎‏‎‎‏‎‏‎‎‎‏‏‏‏‏‏‏‎‏‎‏‎‎‏‎‎‎‎‎‏‏‏‏‏‎‎‎‏‎‏‎‏‎‎‏‏‏‎‎‏‎Location off‎‏‎‎‏‎"</string>
+    <string name="location_app_level_permissions" msgid="1825588230817081339">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‏‎‎‏‎‏‎‏‎‏‎‏‏‏‎‎‏‎‏‎‏‏‎‏‎‎‏‎‏‏‎‏‎‎‏‏‏‏‏‏‏‏‎‎‎‏‏‎‎‏‏‏‏‏‏‏‏‎‏‏‎App-level permissions‎‏‎‎‏‎"</string>
+    <string name="location_category_recent_location_requests" msgid="1938721350424447421">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‏‎‏‎‏‏‏‎‎‏‏‏‏‎‏‏‏‎‎‎‏‏‎‎‏‎‏‏‏‏‏‎‎‎‏‎‏‎‎‎‎‎‏‏‏‏‎‎‏‎‎‏‏‎‏‏‏‏‎‏‎Recent location requests‎‏‎‎‏‎"</string>
+    <string name="location_no_recent_apps" msgid="2800907699722178041">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‎‏‏‎‏‏‎‏‏‏‏‎‏‏‎‏‎‎‏‎‏‎‏‏‎‏‏‎‏‎‎‎‏‎‏‎‏‎‎‏‏‎‎‎‏‏‎‎‏‏‎‏‏‏‏‏‏‎‎‏‎No apps have requested location recently‎‏‎‎‏‎"</string>
+    <string name="location_category_location_services" msgid="7437150886946685979">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‎‏‏‏‎‎‏‏‎‏‏‎‎‎‎‏‎‎‎‏‎‏‎‏‎‎‏‏‏‏‏‏‎‏‎‏‎‏‏‏‎‎‎‎‎‏‎‎‎‏‎‎‎‎‎‏‏‎‏‏‎Location services‎‏‎‎‏‎"</string>
+    <string name="location_high_battery_use" msgid="517199943258508020">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‎‏‏‏‏‏‎‎‏‎‏‏‎‏‎‏‏‏‎‏‏‎‏‎‎‏‏‎‏‏‏‎‏‎‏‏‏‏‏‏‎‎‎‏‏‎‏‎‎‎‏‎‏‎‏‏‏‏‎‏‎‎‎High battery use‎‏‎‎‏‎"</string>
+    <string name="location_low_battery_use" msgid="8602232529541903596">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‎‏‏‏‎‏‏‎‎‎‎‏‎‏‎‎‎‏‎‎‏‏‏‎‏‎‎‎‏‎‏‏‎‏‏‎‏‎‏‎‎‏‏‏‏‎‏‏‎‏‎‎‏‏‏‎‏‏‎‎‎Low battery use‎‏‎‎‏‎"</string>
+    <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="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>
+    <string name="location_scanning_bluetooth_always_scanning_title" msgid="5444989508204520019">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‏‎‏‏‏‎‎‏‎‎‎‎‎‏‏‏‏‏‎‏‎‎‎‏‏‎‏‏‏‏‏‎‎‎‏‎‎‏‎‎‎‎‏‎‎‏‏‎‎‎‏‎‎‏‎‏‎‎‏‏‎Bluetooth scanning‎‏‎‎‏‎"</string>
+    <string name="location_scanning_bluetooth_always_scanning_description" msgid="8602726521250591852">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‎‏‏‏‎‏‏‎‎‎‏‏‎‎‎‎‎‏‏‎‎‎‏‏‎‎‎‏‎‎‎‏‏‏‏‎‏‏‏‏‏‎‎‏‎‎‏‏‎‏‎‎‎‏‏‎‏‏‎‎‎Improve location by allowing system apps and services to detect Bluetooth devices at any time.‎‏‎‎‏‎"</string>
+    <string name="location_network_based" msgid="9134175479520582215">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‏‏‏‎‏‏‎‎‎‎‏‏‎‎‎‏‏‏‎‎‎‎‏‏‎‏‎‎‎‎‏‎‎‏‎‎‏‏‏‎‏‎‎‎‎‏‎‏‏‎‏‎‎‏‎‎‎‏‏‏‎Wi‑Fi &amp; mobile network location‎‏‎‎‏‎"</string>
+    <string name="location_neighborhood_level" msgid="5141318121229984788">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‎‏‏‏‎‏‎‏‏‎‎‏‏‎‏‎‎‎‎‏‏‎‎‏‎‏‏‏‎‏‏‎‎‏‎‏‎‎‏‏‎‎‎‏‎‎‏‎‎‏‎‎‎‎‎‏‎‏‎‎‎Let apps use Google’s location service to estimate your location faster. Anonymous location data will be collected and sent to Google.‎‏‎‎‏‎"</string>
+    <string name="location_neighborhood_level_wifi" msgid="4234820941954812210">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‏‎‏‎‏‏‎‎‎‏‎‏‎‎‎‏‏‎‏‏‎‎‏‏‎‏‎‏‏‎‏‎‏‏‎‎‏‎‎‏‏‎‏‎‎‎‎‎‏‎‎‏‎‎‏‏‎‎‏‎‎Location determined by Wi‑Fi‎‏‎‎‏‎"</string>
+    <string name="location_gps" msgid="8392461023569708478">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‎‏‎‎‎‏‏‏‏‎‎‎‎‎‎‎‎‎‏‎‏‏‎‏‎‏‎‏‏‏‏‏‎‏‎‏‎‎‏‎‏‏‏‏‎‎‎‎‎‏‎‏‏‎‏‏‏‏‏‎‎GPS satellites‎‏‎‎‏‎"</string>
+    <string name="location_street_level" product="tablet" msgid="1669562198260860802">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‎‏‏‏‎‎‏‎‏‎‏‏‎‏‏‏‏‎‎‏‏‏‏‏‏‎‎‏‎‎‏‏‏‏‎‏‏‏‎‎‎‎‏‎‎‏‎‎‎‏‏‏‏‎‎‎‎‎‏‎‎Let apps use GPS on your tablet to pinpoint your location‎‏‎‎‏‎"</string>
+    <string name="location_street_level" product="default" msgid="4617445745492014203">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‎‎‎‎‎‎‎‏‎‏‎‎‎‏‏‏‎‏‏‎‎‏‏‏‎‎‎‎‏‏‏‏‎‏‎‏‏‎‏‏‎‎‎‎‏‎‏‏‎‏‎‎‎‏‏‏‏‎‏‏‎Let apps use GPS on your phone to pinpoint your location‎‏‎‎‏‎"</string>
+    <string name="assisted_gps" msgid="4649317129586736885">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‎‎‎‎‏‎‎‎‎‏‎‏‏‎‏‏‎‎‎‏‎‏‎‎‏‎‏‏‏‏‎‏‎‏‎‏‎‎‏‎‎‏‏‏‏‏‏‏‏‏‏‎‏‏‏‏‎‏‎‏‎Use assisted GPS‎‏‎‎‏‎"</string>
+    <string name="assisted_gps_enabled" msgid="8751899609589792803">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‏‎‎‏‎‏‏‏‎‏‎‎‏‏‏‏‏‏‏‎‎‏‎‏‎‎‏‏‎‏‎‎‏‎‏‏‎‏‏‏‏‎‏‎‏‏‎‎‎‎‎‎‎‎‏‎‎‎‏‏‎Use server to assist GPS (uncheck to reduce network usage)‎‏‎‎‏‎"</string>
+    <string name="assisted_gps_disabled" msgid="6982698333968010748">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‎‎‎‎‏‏‏‎‎‏‏‏‏‎‎‎‎‏‏‏‎‎‏‎‎‎‏‏‏‎‎‎‏‎‎‏‏‏‏‎‎‎‎‎‎‎‎‎‏‏‎‏‏‏‏‏‏‏‎‎‎Use server to assist GPS (uncheck to improve GPS performance)‎‏‎‎‏‎"</string>
+    <string name="use_location_title" msgid="5206937465504979977">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‏‎‎‎‎‏‎‎‎‎‏‎‏‏‎‎‎‎‏‎‎‎‎‎‏‎‎‏‏‎‎‎‏‏‏‏‎‎‎‏‏‎‎‎‏‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎Location &amp; Google search‎‏‎‎‏‎"</string>
+    <string name="use_location_summary" msgid="3978805802386162520">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‎‏‏‏‎‎‏‏‎‏‏‏‏‎‎‎‏‏‏‎‏‏‎‎‏‎‏‏‏‏‏‏‎‎‎‏‎‏‏‏‏‏‎‏‏‎‎‎‎‎‏‏‎‏‎‏‏‎‎‎‎Let Google use your location to improve search results and other services‎‏‎‎‏‎"</string>
+    <string name="location_access_title" msgid="7064108942964081243">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‎‎‏‎‎‎‎‎‏‎‎‎‏‏‎‎‎‎‎‏‏‎‏‎‏‎‎‎‎‎‎‎‏‎‎‎‎‎‎‎‏‎‎‎‏‏‎‎‎‎‏‎‎‏‎‏‏‎‏‏‎Access to my location‎‏‎‎‏‎"</string>
+    <string name="location_access_summary" msgid="69031404093194341">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‎‎‎‏‏‏‏‎‏‎‏‎‎‏‏‏‏‏‏‏‎‏‏‎‎‏‎‎‎‏‏‏‏‏‏‎‏‎‏‎‎‏‎‎‏‎‎‎‎‎‎‎‏‏‎‎‏‎‏‎Let apps that have asked your permission use your location information‎‏‎‎‏‎"</string>
+    <string name="location_sources_heading" msgid="1278732419851088319">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‎‎‎‏‏‎‏‏‏‏‏‎‏‏‏‏‏‎‎‎‎‏‎‏‏‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‏‏‏‏‏‏‏‏‎‎‎‏‏‎‏‏‏‏‏‏‎Location sources‎‏‎‎‏‎"</string>
+    <string name="about_settings" product="tablet" msgid="593457295516533765">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‎‏‎‎‎‎‎‏‏‏‏‎‎‎‏‏‎‎‎‏‎‎‏‎‎‎‏‎‎‎‎‎‏‏‎‎‎‏‎‏‎‎‎‎‎‏‎‎‎‎‏‎‎‎‎‎‎‎‏‎‏‎About tablet‎‏‎‎‏‎"</string>
+    <string name="about_settings" product="default" msgid="1743378368185371685">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‏‎‎‎‎‎‏‏‎‎‎‏‏‎‏‏‏‎‎‏‎‏‏‎‎‎‏‏‏‎‎‏‏‎‎‎‏‏‎‎‏‎‏‎‎‎‎‎‏‏‎‎‎‎‏‎‎‏‎‏‎About phone‎‏‎‎‏‎"</string>
+    <string name="about_settings" product="emulator" msgid="221313099578564438">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‎‏‎‏‏‎‎‎‏‎‎‏‎‎‏‎‎‎‎‏‏‎‎‎‏‎‏‏‏‎‏‏‎‏‏‎‎‏‎‎‎‎‏‎‏‎‏‎‏‏‏‏‏‎‏‎‏‎‏‏‎‎About emulated device‎‏‎‎‏‎"</string>
+    <string name="about_settings_summary" msgid="3371517697156165959">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‏‏‏‎‏‏‎‎‏‎‏‎‎‎‎‎‏‎‎‏‎‏‏‏‏‎‏‏‏‎‎‎‎‏‎‎‏‏‏‎‏‏‏‏‏‎‏‏‎‎‎‏‎‏‎‎‎‏‏‏‎View legal info, status, software version‎‏‎‎‏‎"</string>
+    <string name="legal_information" msgid="5769301644270604095">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‎‎‎‎‎‎‎‏‎‎‎‎‏‎‏‎‏‏‎‏‎‏‎‎‎‏‏‏‎‏‎‎‎‏‎‎‏‏‎‏‎‎‏‏‏‎‎‎‏‏‏‏‎‎‏‏‏‏‏‏‎Legal information‎‏‎‎‏‎"</string>
+    <string name="contributors_title" msgid="5917703088825286504">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‎‎‏‎‎‎‎‏‏‏‏‏‏‏‏‎‎‏‏‏‏‎‎‏‏‎‏‏‎‎‎‏‏‏‏‏‏‎‏‎‏‎‎‏‏‎‏‏‏‏‏‏‎‏‏‎‏‎‎‎‎Contributors‎‏‎‎‏‎"</string>
+    <string name="manual" msgid="3025943393642974445">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‏‎‎‏‏‏‏‏‏‏‏‎‎‏‎‎‏‏‏‏‎‏‏‏‏‏‎‎‎‎‎‎‎‎‎‎‏‎‎‎‎‏‏‏‏‎‎‎‏‏‎‎‏‏‏‎‏‏‎‏‎Manual‎‏‎‎‏‎"</string>
+    <string name="regulatory_labels" msgid="1293050314122427492">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‎‎‎‏‏‏‏‏‎‎‎‏‏‏‎‏‎‏‏‎‎‏‏‎‏‎‎‎‏‏‏‎‏‎‎‏‏‏‏‏‏‎‎‏‎‏‏‏‏‏‎‎‎‏‏‎‎‏‎‎‎Regulatory labels‎‏‎‎‏‎"</string>
+    <string name="safety_and_regulatory_info" msgid="5103161279848427185">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‎‏‏‎‏‏‎‏‎‎‏‎‎‎‎‏‎‎‏‎‎‎‏‎‎‏‎‏‎‏‏‏‎‏‎‎‏‏‏‎‎‏‎‎‏‎‏‎‏‏‏‎‏‎‏‏‎‎‎‏‎Safety &amp; regulatory manual‎‏‎‎‏‎"</string>
+    <string name="copyright_title" msgid="865906688917260647">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‎‏‏‎‎‎‎‎‎‎‏‎‎‎‏‎‏‎‎‎‏‏‎‎‎‏‎‏‏‏‎‏‏‏‎‎‏‏‎‎‎‏‏‎‎‎‏‎‎‏‎‎‏‎‏‏‎‎‏‏‏‎Copyright‎‏‎‎‏‎"</string>
+    <string name="license_title" msgid="1990487604356037871">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‏‎‏‏‏‎‎‏‏‏‏‏‏‎‏‎‎‎‎‏‏‏‏‎‏‏‏‎‎‎‎‏‏‎‏‏‎‏‏‏‎‏‎‏‏‎‏‏‏‏‎‎‏‏‏‎‏‏‏‏‎License‎‏‎‎‏‎"</string>
+    <string name="terms_title" msgid="7697580845616764642">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‏‎‏‎‏‏‎‏‎‎‏‏‎‏‎‎‏‏‎‎‏‏‏‏‏‏‏‎‏‏‎‏‏‏‎‎‏‏‎‏‎‏‏‎‏‎‎‏‎‏‏‎‏‏‏‎‎‎‏‎‎Terms and conditions‎‏‎‎‏‎"</string>
+    <string name="webview_license_title" msgid="2813507464175738967">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‎‏‏‏‎‎‎‎‏‎‏‏‏‎‎‏‎‏‏‎‎‎‏‎‎‎‎‏‏‏‎‎‏‏‏‏‎‎‎‏‏‎‏‎‏‏‏‎‎‎‎‎‎‏‎‏‎‏‏‏‎System WebView License‎‏‎‎‏‎"</string>
+    <string name="wallpaper_attributions" msgid="3645880512943433928">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‎‎‏‎‏‎‎‏‏‎‎‎‏‏‎‎‎‏‎‏‎‎‎‎‎‎‏‎‏‎‎‎‎‎‏‏‏‎‎‎‎‎‏‏‎‎‏‎‏‎‎‎‏‏‎‎‏‎‎‎‎Wallpapers‎‏‎‎‏‎"</string>
+    <string name="wallpaper_attributions_values" msgid="2996183537914690469">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‏‎‎‏‏‎‎‏‎‏‎‎‏‎‎‏‎‏‎‏‎‎‎‎‏‏‎‏‏‎‏‎‎‎‏‏‎‏‎‎‎‏‏‏‎‎‏‏‏‎‏‏‏‎‏‎‎‏‎‏‎Satellite imagery providers:‎‏‎‎‏‏‎\n‎‏‎‎‏‏‏‎©2014 CNES / Astrium, DigitalGlobe, Bluesky‎‏‎‎‏‎"</string>
+    <string name="settings_manual_activity_title" msgid="8133150693616006051">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‎‎‎‎‏‏‎‏‏‏‏‎‏‏‎‎‎‎‎‏‎‏‏‏‎‏‏‎‏‏‏‎‏‏‎‏‏‎‏‏‎‏‎‎‎‎‏‏‎‎‏‏‏‎‏‎‎‎‏‏‎Manual‎‏‎‎‏‎"</string>
+    <string name="settings_manual_activity_unavailable" msgid="4752403782883814898">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‎‎‎‏‏‏‏‏‎‎‏‏‏‏‏‎‏‏‏‎‎‎‎‎‏‏‏‏‏‎‏‎‏‏‎‎‎‎‎‎‎‎‏‏‎‎‏‎‏‏‎‏‏‏‏‏‎‎‏‎‎There is a problem loading the manual.‎‏‎‎‏‎"</string>
+    <string name="settings_license_activity_title" msgid="8525014571806471216">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‎‏‏‎‎‏‎‎‏‏‏‎‏‏‏‎‏‏‏‏‏‎‎‏‎‏‎‏‏‏‏‎‏‎‎‏‏‎‎‎‏‏‎‏‏‎‏‏‎‏‎‎‎‎‏‏‎‎‎‎‎Third-party licenses‎‏‎‎‏‎"</string>
+    <string name="settings_license_activity_unavailable" msgid="4210539215951487627">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‏‎‏‎‎‏‏‎‏‏‏‎‏‏‎‏‎‏‏‏‎‎‎‏‏‎‏‏‏‏‎‎‎‏‏‏‏‎‏‎‎‎‏‏‏‏‏‎‎‎‏‎‏‎‎‎‏‎‏‏‎There is a problem loading the licenses.‎‏‎‎‏‎"</string>
+    <string name="settings_license_activity_loading" msgid="3337535809093591740">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‏‏‏‎‎‏‎‏‎‎‎‏‎‏‎‎‏‏‏‏‎‎‏‎‎‎‏‎‏‎‏‎‎‏‏‎‎‎‏‎‏‎‏‏‎‏‏‎‎‎‏‎‏‎‏‏‏‏‎‎‎Loading…‎‏‎‎‏‎"</string>
+    <string name="settings_safetylegal_title" msgid="1289483965535937431">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‎‎‎‏‏‏‏‎‎‏‎‏‎‎‏‎‏‎‏‎‏‏‎‏‎‏‎‏‏‎‏‎‏‏‎‏‎‏‎‏‎‏‎‎‏‏‏‎‎‎‏‏‏‎‎‏‎‏‏‏‎Safety information‎‏‎‎‏‎"</string>
+    <string name="settings_safetylegal_activity_title" msgid="6901214628496951727">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‏‏‏‏‏‏‎‎‎‏‏‎‎‎‎‎‏‎‏‎‎‎‏‎‎‎‏‏‏‏‏‏‎‎‏‎‎‏‎‎‏‎‏‎‎‏‎‎‏‎‎‏‏‎‏‎‏‏‏‏‎Safety information‎‏‎‎‏‎"</string>
+    <string name="settings_safetylegal_activity_unreachable" msgid="250674109915859456">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‎‏‎‏‏‎‏‏‏‏‎‏‎‏‎‎‏‎‎‏‎‏‏‎‎‎‏‏‎‎‏‎‏‏‎‏‏‏‏‏‎‏‏‎‎‎‎‎‎‏‎‏‎‎‎‎‎‎‎‎‎‎You don’t have a data connection. To view this information now, go to %s from any computer connected to the Internet.‎‏‎‎‏‎"</string>
+    <string name="settings_safetylegal_activity_loading" msgid="8059022597639516348">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‏‏‏‏‏‏‎‏‎‏‏‏‎‏‏‎‎‏‏‎‎‏‎‏‏‎‏‎‏‎‏‎‎‎‎‏‎‎‏‎‎‏‏‎‎‎‏‏‎‎‎‎‏‎‏‏‏‏‎‎‎Loading…‎‏‎‎‏‎"</string>
+    <string name="lockpassword_choose_your_screen_lock_header" msgid="3872462096767152394">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‎‏‎‏‏‎‏‏‏‏‎‏‏‎‏‏‏‏‏‏‏‏‎‎‎‎‏‎‏‎‎‎‎‎‏‏‏‏‏‏‏‎‎‎‎‏‏‏‎‎‎‏‎‎‎‎‏‎‏‎‎Set a screen lock‎‏‎‎‏‎"</string>
+    <string name="lockpassword_choose_your_password_message" msgid="1197569283524841412">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‎‎‎‎‏‎‎‏‏‏‏‎‏‎‎‏‏‏‏‎‏‏‏‎‏‎‏‏‎‎‎‏‏‎‏‎‎‏‏‎‏‎‏‎‏‏‎‎‏‏‏‏‏‏‎‎‎‏‎‎‎For security, set a password‎‏‎‎‏‎"</string>
+    <string name="lockpassword_choose_your_password_header_for_fingerprint" msgid="2541818487015343503">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‎‎‏‏‎‏‎‎‎‏‏‎‎‏‎‏‏‎‏‎‎‏‏‏‎‎‏‎‎‏‏‎‎‎‏‎‎‎‎‏‎‎‏‎‎‎‎‎‎‏‎‏‏‎‎‎‏‏‏‏‎To use fingerprint, set a password‎‏‎‎‏‎"</string>
+    <string name="lockpassword_choose_your_pattern_header_for_fingerprint" msgid="7709785406243556723">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‏‎‏‎‏‏‏‏‏‏‏‎‏‎‏‎‏‎‎‎‏‏‏‏‏‎‏‎‏‎‎‏‎‎‎‏‏‎‏‎‎‎‏‏‎‏‎‎‏‏‎‏‎‏‏‏‎‎‏‏‎To use fingerprint, set a pattern‎‏‎‎‏‎"</string>
+    <string name="lockpassword_choose_your_pin_message" msgid="1875420718677275646">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‏‎‏‎‎‎‎‎‎‏‏‎‏‏‎‏‎‏‎‏‎‎‏‏‎‏‎‏‎‎‎‎‏‏‎‏‎‎‏‎‏‎‏‎‏‎‏‏‎‎‏‏‏‏‏‏‏‏‏‎‎For security, set a PIN‎‏‎‎‏‎"</string>
+    <string name="lockpassword_choose_your_pin_header_for_fingerprint" msgid="1549639053195796674">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‎‏‎‏‏‎‎‎‎‎‎‏‎‏‏‎‏‏‎‎‏‎‎‎‎‎‏‎‎‎‏‎‏‏‏‏‏‏‎‎‏‏‏‎‏‏‏‎‎‎‎‎‏‏‎‎‎‎‏‎‎To use fingerprint, set a PIN‎‏‎‎‏‎"</string>
+    <string name="lockpassword_choose_your_pattern_message" msgid="5986983400689720015">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‎‎‏‏‎‎‎‏‎‏‏‎‎‎‎‎‏‎‎‏‏‎‏‎‏‏‏‎‏‎‏‏‏‎‏‎‎‏‎‎‎‏‎‏‎‏‎‏‏‎‏‎‏‏‎‎‏‏‏‏‎For security, set a pattern‎‏‎‎‏‎"</string>
+    <string name="lockpassword_confirm_your_password_header" msgid="1266027268220850931">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‎‎‎‏‏‎‎‏‎‎‎‏‏‏‎‏‎‏‎‏‎‎‎‏‎‏‏‏‏‎‏‏‏‏‏‎‎‏‎‎‎‎‏‏‎‎‎‏‎‎‏‎‏‏‏‏‎‎‏‏‎Re-enter your password‎‏‎‎‏‎"</string>
+    <string name="lockpassword_confirm_your_pattern_header" msgid="7543433733032330821">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‏‎‎‎‏‎‏‎‏‏‏‏‏‎‏‎‏‎‎‏‎‎‎‎‎‎‏‏‎‏‏‎‏‏‎‎‎‎‎‏‎‏‏‏‎‏‎‎‎‏‏‎‎‏‎‎‎‏‎‏‎Confirm your pattern‎‏‎‎‏‎"</string>
+    <string name="lockpassword_confirm_your_pin_header" msgid="7744513791910572550">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‏‎‏‏‎‏‏‏‏‎‏‎‎‎‎‎‏‎‏‎‎‏‎‎‎‎‏‎‏‏‏‏‎‏‎‎‏‏‏‏‎‎‎‏‎‏‏‏‎‎‏‎‎‎‎‎‎‏‏‎‎Re-enter your PIN‎‏‎‎‏‎"</string>
+    <string name="lockpassword_confirm_passwords_dont_match" msgid="5140892109439191415">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‎‏‏‏‎‏‎‏‏‎‎‎‎‎‎‏‏‏‏‎‎‎‏‎‎‎‏‎‏‏‎‎‏‎‏‏‏‎‏‏‏‎‏‏‎‏‎‎‏‎‎‏‎‏‏‏‎‏‏‏‎Passwords don’t match‎‏‎‎‏‎"</string>
+    <string name="lockpassword_confirm_pins_dont_match" msgid="7226244811505606217">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‎‏‎‎‎‏‎‎‏‎‎‎‏‏‎‎‎‏‏‏‎‏‎‏‏‏‏‎‏‎‏‎‏‎‎‏‏‏‎‎‏‏‎‏‎‎‎‏‏‏‏‎‎‏‎‎‏‎‎‏‎PINs don’t match‎‏‎‎‏‎"</string>
+    <string name="lockpassword_choose_lock_generic_header" msgid="3811438094903786145">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‎‏‎‎‏‏‏‎‎‏‎‎‏‏‏‏‎‎‏‎‏‏‎‎‎‎‎‎‏‏‏‎‎‎‏‎‎‎‏‎‎‎‎‏‏‎‏‏‏‎‏‎‏‎‏‎‎‎‎‏‎Unlock selection‎‏‎‎‏‎"</string>
+    <string name="lockpassword_password_set_toast" msgid="4875050283108629383">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‎‎‏‏‏‎‏‎‎‏‏‏‏‎‏‎‏‎‎‎‎‏‏‎‎‏‏‏‎‏‎‎‎‎‏‎‏‏‎‏‏‎‏‏‎‏‏‏‏‎‏‏‏‎‎‎‎‏‏‏‎Password has been set‎‏‎‎‏‎"</string>
+    <string name="lockpassword_pin_set_toast" msgid="6011826444725291475">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‎‎‏‏‎‏‏‎‏‏‏‎‎‏‎‎‏‏‎‎‎‏‎‎‏‏‎‎‏‎‏‎‏‎‎‏‎‎‏‎‎‏‏‎‏‎‎‎‏‎‎‏‏‏‎‏‎‎‏‏‎PIN has been set‎‏‎‎‏‎"</string>
+    <string name="lockpassword_pattern_set_toast" msgid="6867259621331406236">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‏‏‏‏‎‏‎‎‏‏‎‏‎‏‏‎‏‎‎‎‎‎‏‏‏‏‎‏‏‏‎‎‎‏‎‏‏‏‎‏‎‏‏‏‏‎‎‎‏‏‎‏‏‎‎‏‏‏‎‎‎Pattern has been set‎‏‎‎‏‎"</string>
+    <string name="lockpassword_confirm_your_pattern_generic" msgid="2920960858283879113">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‏‎‎‎‏‎‎‎‏‎‎‏‎‏‎‏‎‏‏‎‎‏‏‎‏‏‎‎‏‎‏‏‏‎‎‎‏‏‎‏‎‏‎‎‏‎‏‎‏‎‏‎‏‏‎‎‏‎‎‏‎Use your device pattern to continue‎‏‎‎‏‎"</string>
+    <string name="lockpassword_confirm_your_pin_generic" msgid="4062335874438910487">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‏‎‎‎‎‏‏‎‎‎‎‎‎‏‎‏‎‎‎‎‏‏‏‏‎‏‎‎‎‏‏‎‎‎‏‎‎‏‎‎‎‎‎‏‏‏‎‏‎‎‏‎‎‎‎‏‎‏‏‏‎Enter your device PIN to continue‎‏‎‎‏‎"</string>
+    <string name="lockpassword_confirm_your_password_generic" msgid="3976394862548354966">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‎‏‏‏‎‎‏‎‏‏‏‎‏‏‏‏‏‏‏‎‎‎‎‎‏‏‏‏‎‏‎‎‎‏‎‎‏‏‏‎‎‎‏‎‎‎‎‎‎‏‏‏‏‎‎‏‎‏‏‎‎Enter your device password to continue‎‏‎‎‏‎"</string>
+    <string name="lockpassword_confirm_your_pattern_generic_profile" msgid="4435638308193361861">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‏‏‎‏‏‎‎‎‏‏‏‎‏‎‎‎‏‏‎‏‏‎‎‎‏‎‏‎‎‏‎‎‏‏‏‏‏‏‏‏‏‎‏‎‏‏‎‏‏‏‏‏‏‏‎‎‎‏‎‏‎Use your work pattern to continue‎‏‎‎‏‎"</string>
+    <string name="lockpassword_confirm_your_pin_generic_profile" msgid="3730141667547002246">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‎‎‏‏‏‏‎‎‎‏‎‎‎‎‏‎‎‎‎‎‎‎‎‏‎‏‎‏‎‏‏‎‎‎‎‎‎‎‎‎‎‏‎‏‏‎‏‏‎‏‎‏‏‎‎‎‎‏‏‎‎Enter your work PIN to continue‎‏‎‎‏‎"</string>
+    <string name="lockpassword_confirm_your_password_generic_profile" msgid="4250642723467019894">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‏‎‏‎‏‏‏‏‏‏‎‏‎‏‎‏‎‎‎‏‎‎‎‎‏‎‎‏‎‎‏‏‏‏‏‏‎‏‎‏‏‎‎‏‏‏‎‎‎‏‏‎‎‏‏‏‎‏‏‎‎Enter your work password to continue‎‏‎‎‏‎"</string>
+    <string name="lockpassword_strong_auth_required_device_pattern" msgid="530802132223800623">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‎‏‏‏‏‏‎‏‎‏‏‏‎‏‏‏‎‎‏‎‎‏‏‎‏‏‏‎‏‎‎‎‎‏‏‎‎‏‎‎‏‏‏‎‎‎‎‎‏‏‎‏‎‏‎‎‏‎‏‏‏‏‎For added security, use your device pattern‎‏‎‎‏‎"</string>
+    <string name="lockpassword_strong_auth_required_device_pin" msgid="7829294830078036417">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‏‏‎‎‏‎‏‎‎‏‏‏‎‎‏‏‏‏‏‎‎‎‏‎‏‎‏‎‏‎‏‎‎‏‎‎‏‎‎‏‏‎‏‎‏‎‎‎‏‎‎‏‏‏‎‎‎‎‎‏‎For added security, enter your device PIN‎‏‎‎‏‎"</string>
+    <string name="lockpassword_strong_auth_required_device_password" msgid="3552644641574796973">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‎‎‎‏‎‏‎‎‏‏‎‏‏‎‎‎‎‏‏‏‎‏‏‏‏‎‏‎‏‎‎‏‎‎‏‎‎‏‎‎‎‎‏‎‏‎‏‏‏‏‏‎‏‎‏‎‏‏‎‏‎For added security, enter your device password‎‏‎‎‏‎"</string>
+    <string name="lockpassword_strong_auth_required_work_pattern" msgid="3003781907040522053">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‏‎‎‏‏‎‏‎‏‏‏‏‏‎‎‏‎‎‏‏‏‎‏‏‏‎‏‎‏‏‎‎‏‏‏‏‏‏‏‎‎‏‎‏‎‏‎‎‏‏‏‏‎‏‎‎‎‏‎‏‎For added security, use your work pattern‎‏‎‎‏‎"</string>
+    <string name="lockpassword_strong_auth_required_work_pin" msgid="3367491332598821552">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‏‏‏‎‏‎‏‏‏‎‏‏‏‎‏‏‏‎‏‏‏‎‎‎‎‏‏‎‎‏‏‏‎‏‏‏‏‏‎‎‎‎‏‎‎‏‏‏‎‎‏‎‏‎‏‏‎‎‎‎‎For added security, enter your work PIN‎‏‎‎‏‎"</string>
+    <string name="lockpassword_strong_auth_required_work_password" msgid="8159775129968582940">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‎‎‎‏‎‎‏‏‏‏‎‏‎‏‎‏‏‎‎‎‎‎‏‏‏‏‏‏‏‎‎‏‎‏‎‎‏‏‎‏‏‎‎‎‎‎‏‎‎‎‎‏‎‎‎‏‏‏‎‎‎For added security, enter your work password‎‏‎‎‏‎"</string>
+    <string name="lockpassword_confirm_your_pattern_details_frp" msgid="6757336656791723193">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‏‏‎‏‏‏‎‎‎‏‏‎‏‏‏‎‎‎‎‏‏‏‏‎‎‎‏‏‎‎‏‎‏‏‏‏‏‏‎‎‏‎‏‏‏‏‎‏‏‏‎‎‏‎‏‏‏‎‎‏‎Your phone was reset to factory settings. To use this phone, enter your previous pattern.‎‏‎‎‏‎"</string>
+    <string name="lockpassword_confirm_your_pin_details_frp" msgid="826520613445990470">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‎‏‎‏‏‎‏‏‏‏‎‎‎‎‏‏‎‎‏‎‎‎‎‎‏‏‏‏‎‎‏‏‎‏‎‏‏‏‏‏‏‏‏‎‎‎‏‏‏‏‎‎‎‎‏‎‎‎‏‏‎‎Your phone was reset to factory settings. To use this phone, enter your previous PIN.‎‏‎‎‏‎"</string>
+    <string name="lockpassword_confirm_your_password_details_frp" msgid="8944081074615739040">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‏‏‎‎‎‎‎‏‏‏‏‏‏‏‎‎‎‎‏‎‎‏‎‏‏‎‎‏‎‏‏‏‏‏‏‎‏‏‎‎‎‎‏‏‏‏‏‎‎‎‏‎‏‎‏‎‎‎‎‎‎Your phone was reset to factory settings. To use this phone, enter your previous password.‎‏‎‎‏‎"</string>
+    <string name="lockpassword_confirm_your_pattern_header_frp" msgid="2898036091609128286">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‏‎‎‎‎‎‏‏‎‏‏‏‏‏‏‎‎‏‎‎‎‏‏‏‏‎‎‎‏‎‎‎‏‎‏‎‏‎‎‏‏‏‏‏‏‎‎‏‏‏‎‏‎‏‎‏‏‏‏‎‎Verify pattern‎‏‎‎‏‎"</string>
+    <string name="lockpassword_confirm_your_pin_header_frp" msgid="4141601774778898803">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‏‎‎‏‎‏‏‏‏‎‎‏‏‏‏‎‏‏‎‎‏‏‎‏‏‏‏‎‏‏‏‏‏‎‏‎‏‏‎‏‎‎‏‎‏‏‎‏‏‎‎‏‎‏‏‏‎‎‏‏‎Verify PIN‎‏‎‎‏‎"</string>
+    <string name="lockpassword_confirm_your_password_header_frp" msgid="3762615419295360480">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‎‏‎‎‎‎‏‏‎‏‏‏‎‏‏‏‏‏‏‎‏‏‎‎‏‎‎‏‏‏‏‎‎‏‎‏‏‎‎‎‎‎‎‏‏‏‏‎‎‏‎‏‏‏‏‎‎‎‎‎‎Verify password‎‏‎‎‏‎"</string>
+    <string name="lockpassword_invalid_pin" msgid="15588049067548470">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‎‏‏‎‏‏‎‏‏‏‎‏‏‎‎‎‎‏‎‎‏‏‏‏‏‏‎‏‏‏‏‏‏‏‎‏‏‎‏‎‎‏‏‎‎‏‏‏‏‏‎‎‏‏‎‏‏‎‎Wrong PIN‎‏‎‎‏‎"</string>
+    <string name="lockpassword_invalid_password" msgid="4038507398784975200">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‏‎‎‎‎‎‎‎‏‎‏‏‏‎‏‎‏‎‎‏‎‎‎‏‎‏‎‏‎‎‎‎‏‏‏‏‎‏‎‏‏‏‎‏‏‎‎‎‎‎‎‏‎‏‏‎‎‎‎‎‎Wrong password‎‏‎‎‏‎"</string>
+    <string name="lockpattern_need_to_unlock_wrong" msgid="1745247595356012176">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‏‎‎‎‎‎‏‏‏‎‎‎‎‏‎‏‏‏‎‏‎‏‏‏‎‎‎‎‏‏‏‏‎‏‏‎‎‏‎‎‏‏‎‎‏‎‏‏‏‏‏‎‏‎‎‏‎‎‎‎‎Wrong pattern‎‏‎‎‏‎"</string>
+    <string name="lock_settings_title" msgid="4213839087748988686">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‏‎‏‎‎‏‏‏‏‎‏‎‏‎‎‏‎‎‎‎‎‏‎‏‎‎‏‏‎‎‎‎‏‏‎‏‏‏‏‎‏‏‏‏‎‎‏‏‏‏‏‏‎‎‎‎‏‏‏‎‎Device security‎‏‎‎‏‎"</string>
+    <string name="lockpattern_change_lock_pattern_label" msgid="5679630792003440352">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‏‏‏‎‏‏‎‏‎‎‏‎‎‎‎‏‏‎‏‎‎‎‎‏‏‏‎‏‎‎‎‎‎‏‎‎‏‎‏‏‏‏‎‎‎‏‎‎‏‏‏‎‏‏‏‎‎‎‎‎‎Change unlock pattern‎‏‎‎‏‎"</string>
+    <string name="lockpattern_change_lock_pin_label" msgid="266707138486731661">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‎‏‎‏‏‏‎‏‏‎‎‏‏‏‎‎‎‏‎‎‎‏‎‏‏‏‎‏‎‏‎‏‏‏‎‎‎‏‎‎‏‎‎‎‎‎‎‎‎‎‎‏‏‏‎‎‎‏‏‎‏‎Change unlock PIN‎‏‎‎‏‎"</string>
+    <string name="lockpattern_recording_intro_header" msgid="308287052221942814">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‎‏‏‏‎‎‎‏‎‎‎‏‏‏‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‏‏‎‎‏‏‎‎‏‎‎‎‏‎‏‎‏‎‎‎‏‏‎‎‎‎‎‏‏‏‏‎‎Draw an unlock pattern‎‏‎‎‏‎"</string>
+    <string name="lockpattern_recording_intro_footer" msgid="1118579101409152113">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‎‏‏‏‏‏‎‎‎‎‏‎‏‏‏‏‏‏‏‎‏‏‏‎‎‎‏‎‎‎‎‏‎‏‎‎‎‏‎‏‎‏‎‏‏‎‎‎‎‏‏‎‎‎‏‏‏‎‎‎‏‎Press Menu for help.‎‏‎‎‏‎"</string>
+    <string name="lockpattern_recording_inprogress" msgid="6667844062721656773">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‏‏‎‎‏‎‎‎‏‎‎‎‏‏‏‏‎‎‎‎‏‏‎‏‏‎‎‎‏‏‏‎‏‎‎‎‎‎‏‏‏‎‎‎‏‏‎‎‎‏‏‏‏‏‎‎‎‏‎‏‎Release finger when done‎‏‎‎‏‎"</string>
+    <string name="lockpattern_recording_incorrect_too_short" msgid="1348234155120957561">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‎‎‏‎‏‎‏‏‎‏‎‏‏‏‏‎‎‎‏‏‏‏‎‏‎‎‏‎‎‎‏‎‎‎‏‎‎‎‎‎‏‎‎‎‏‎‎‏‏‎‎‎‎‏‏‏‏‎‎‏‎Connect at least ‎‏‎‎‏‏‎<xliff:g id="NUMBER">%d</xliff:g>‎‏‎‎‏‏‏‎ dots. Try again.‎‏‎‎‏‎"</string>
+    <string name="lockpattern_pattern_entered_header" msgid="4316818983675591604">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‏‎‏‏‏‏‏‎‏‎‎‎‎‏‏‎‏‎‏‏‏‏‏‏‏‏‏‎‏‎‎‎‎‎‎‏‏‎‏‎‎‏‎‏‎‏‏‏‏‎‏‏‏‎‏‏‎‏‎‎‎Pattern recorded‎‏‎‎‏‎"</string>
+    <string name="lockpattern_need_to_confirm" msgid="8054853451639221265">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‏‏‏‏‏‏‎‎‏‎‎‎‏‎‎‏‎‏‏‎‏‎‎‎‏‎‎‏‏‎‏‎‏‏‏‎‏‏‎‎‏‎‎‎‏‏‏‎‏‏‎‎‎‎‎‏‎‎‎‏‎Draw pattern again to confirm‎‏‎‎‏‎"</string>
+    <string name="lockpattern_pattern_confirmed_header" msgid="8455614172231880211">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‎‏‎‏‎‏‎‏‏‎‎‎‎‏‏‎‎‎‎‎‎‏‎‎‏‎‏‎‎‎‏‏‎‏‎‏‏‎‏‎‎‎‏‏‏‏‎‎‏‏‏‎‎‎‎‏‎‎‏‏‎Your new unlock pattern‎‏‎‎‏‎"</string>
+    <string name="lockpattern_confirm_button_text" msgid="1128204343957002841">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‎‏‏‏‏‏‎‏‎‏‎‎‎‎‎‏‎‏‏‏‏‏‏‎‏‏‏‏‏‏‎‎‏‎‎‏‏‏‎‎‏‏‏‎‎‎‎‎‏‏‎‏‎‎‏‎‏‏‎‎‏‎Confirm‎‏‎‎‏‎"</string>
+    <string name="lockpattern_restart_button_text" msgid="3337574403350953926">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‏‏‏‎‎‏‎‏‎‎‎‏‎‏‏‏‎‎‏‎‎‎‏‏‏‏‎‎‏‎‎‏‎‎‏‏‎‎‏‎‏‎‏‏‎‏‏‏‏‏‏‏‏‏‎‎‎‏‏‎‎Redraw‎‏‎‎‏‎"</string>
+    <string name="lockpattern_retry_button_text" msgid="3480423193273588166">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‎‎‎‎‎‏‎‎‏‏‎‎‏‏‏‏‎‎‏‎‎‏‏‏‎‏‎‎‎‏‎‎‎‏‏‏‎‎‎‏‏‎‏‎‎‏‎‏‏‎‎‏‏‏‎‎‎‏‏‎‎Clear‎‏‎‎‏‎"</string>
+    <string name="lockpattern_continue_button_text" msgid="4723771754714471410">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‎‎‎‏‏‎‎‎‏‏‏‎‎‎‏‏‎‏‎‏‎‏‏‎‎‎‏‎‎‎‎‏‏‏‏‏‏‏‎‎‎‏‏‏‏‎‎‏‏‎‏‏‏‏‏‏‎‎‏‎‎Continue‎‏‎‎‏‎"</string>
+    <string name="lockpattern_settings_title" msgid="3207750489460466680">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‏‏‎‎‏‎‎‎‎‏‎‎‎‎‏‏‏‎‎‎‎‎‎‏‎‎‏‏‎‎‏‎‎‏‎‎‎‏‏‎‎‎‎‎‎‏‏‎‎‎‏‏‏‏‏‏‏‎‎‎‎Unlock pattern‎‏‎‎‏‎"</string>
+    <string name="lockpattern_settings_enable_title" msgid="6920616873671115281">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‎‎‎‎‎‎‎‎‏‎‏‎‏‏‏‏‏‎‎‎‎‏‏‎‎‎‎‏‎‎‏‎‏‏‎‏‏‎‏‏‏‏‎‏‏‏‎‎‎‎‏‎‎‎‎‏‎‎‎‏‎Require pattern‎‏‎‎‏‎"</string>
+    <string name="lockpattern_settings_enable_summary" msgid="1165707416664252167">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‎‎‎‎‎‎‏‎‏‏‎‏‎‏‏‎‏‏‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‎‏‎‎‏‎‎‏‏‏‏‏‎‎‏‏‏‏‏‎‎‎‎‎‏‏‏‎Must draw pattern to unlock screen‎‏‎‎‏‎"</string>
+    <string name="lockpattern_settings_enable_visible_pattern_title" msgid="2615606088906120711">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‎‏‎‎‎‏‎‎‏‏‎‎‎‏‏‏‏‏‏‏‏‏‏‎‎‎‎‏‎‎‏‏‏‎‎‏‏‎‎‏‏‎‎‏‎‎‎‏‏‏‏‎‎‎‎‎‎‏‏‏‎Make pattern visible‎‏‎‎‏‎"</string>
+    <string name="lockpattern_settings_enable_visible_pattern_title_profile" msgid="4864525074768391381">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‎‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‎‏‏‏‏‎‎‏‎‎‎‎‎‏‏‏‎‏‎‏‎‎‎‏‏‎‎‏‏‏‎‏‏‎‎‏‏‎‏‎‏‎‏‎Make profile pattern visible‎‏‎‎‏‎"</string>
+    <string name="lockpattern_settings_enable_tactile_feedback_title" msgid="4389015658335522989">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‏‏‎‎‏‏‏‎‏‎‎‎‏‏‏‎‏‎‏‎‎‏‏‏‏‏‎‎‏‎‏‏‏‏‎‎‏‎‏‏‎‏‏‏‎‏‎‏‎‎‎‎‏‎‏‎‏‏‎‏‎Vibrate on tap‎‏‎‎‏‎"</string>
+    <string name="lockpattern_settings_enable_power_button_instantly_locks" msgid="5735444062633666327">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‏‏‏‏‏‎‎‏‏‎‎‎‎‏‏‎‎‎‏‏‏‏‏‏‏‏‎‎‏‎‏‏‏‏‏‎‎‏‏‎‎‏‏‏‎‎‏‎‎‏‏‏‎‎‎‏‎‏‏‏‎Power button instantly locks‎‏‎‎‏‎"</string>
+    <string name="lockpattern_settings_power_button_instantly_locks_summary" msgid="8196258755143711694">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‎‎‎‏‏‎‏‏‏‏‏‎‏‏‏‏‎‏‎‏‏‏‏‎‏‎‎‏‏‎‎‎‎‎‏‏‏‎‎‎‎‏‏‎‏‎‏‏‏‎‏‏‏‏‎‎‏‏‏‎‎Except when kept unlocked by ‎‏‎‎‏‏‎<xliff:g id="TRUST_AGENT_NAME">%1$s</xliff:g>‎‏‎‎‏‏‏‎‎‏‎‎‏‎"</string>
+    <string name="lockpattern_settings_choose_lock_pattern" msgid="1652352830005653447">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‎‏‏‎‏‏‏‎‏‏‏‎‎‏‎‏‎‏‏‎‎‎‏‎‎‏‎‎‏‏‏‏‎‏‎‎‎‎‎‏‏‎‎‏‎‎‏‎‏‏‏‏‏‏‎‎‎‏‏‏‎Set unlock pattern‎‏‎‎‏‎"</string>
+    <string name="lockpattern_settings_change_lock_pattern" msgid="1123908306116495545">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‎‏‏‏‏‏‎‎‏‏‎‎‎‏‏‏‎‏‏‎‎‏‎‏‎‎‏‏‎‎‏‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‎‎‏‎‎‎‏‎‏‏‏‎‎‏‎Change unlock pattern‎‏‎‎‏‎"</string>
+    <string name="lockpattern_settings_help_how_to_record" msgid="2614673439060830433">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‎‏‎‎‎‏‎‎‏‎‎‏‎‎‏‎‏‏‏‏‏‎‏‎‎‎‏‏‏‏‎‎‎‎‏‎‏‏‎‏‏‏‏‎‏‎‏‎‏‎‎‎‏‏‏‎‎‎‎‏‎How to draw an unlock pattern‎‏‎‎‏‎"</string>
+    <string name="lockpattern_too_many_failed_confirmation_attempts" msgid="6909161623701848863">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‏‏‏‏‏‏‏‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‎‎‏‏‏‏‏‏‎‏‎‎‏‎‎‎‎‎‏‎‏‎‎‎‎‎‏‏‎‎‎‏‏‏‏‏‎Too many incorrect attempts. Try again in ‎‏‎‎‏‏‎<xliff:g id="NUMBER">%d</xliff:g>‎‏‎‎‏‏‏‎ seconds.‎‏‎‎‏‎"</string>
+    <string name="activity_not_found" msgid="5551664692991605325">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‏‏‎‏‎‎‎‎‏‎‏‏‎‏‏‏‏‎‎‏‏‎‎‏‏‏‏‏‏‏‎‏‎‎‎‏‏‏‎‏‎‏‏‏‏‎‏‏‏‎‏‎‎‏‎‎‏‏‎‏‎Application is not installed on your phone.‎‏‎‎‏‎"</string>
+    <string name="lock_settings_profile_title" msgid="2121876391814535295">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‏‏‎‏‎‏‏‏‎‎‏‎‎‏‏‎‏‎‏‏‎‏‎‏‎‏‏‎‎‎‎‎‏‏‏‏‎‏‏‎‎‏‎‎‏‎‎‏‏‎‎‎‎‏‏‏‏‏‏‏‎Work profile security‎‏‎‎‏‎"</string>
+    <string name="lock_settings_profile_screen_lock_title" msgid="3334747927367115256">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‏‏‏‎‎‏‎‎‎‏‏‏‎‏‏‎‎‏‏‏‏‎‎‏‎‎‏‎‎‏‎‏‏‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‎‎‏‏‏‏‏‏‎‎‎‎Work profile screen lock‎‏‎‎‏‎"</string>
+    <string name="lock_settings_profile_unification_title" msgid="4973102698492659123">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‎‏‎‏‎‎‎‎‎‏‎‎‎‎‎‎‎‎‏‎‏‎‎‎‏‏‏‎‎‎‏‏‏‏‏‏‎‎‏‏‎‎‎‏‎‎‎‎‎‏‎‏‏‎‏‏‎‎‏‏‎Use one lock‎‏‎‎‏‎"</string>
+    <string name="lock_settings_profile_unification_summary" msgid="7178299172998641303">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‎‎‏‏‏‎‎‏‏‏‏‎‎‏‏‏‎‎‎‏‎‎‎‏‎‎‎‎‏‏‎‎‏‎‏‎‎‎‎‏‎‎‎‎‎‏‏‏‎‏‏‎‏‎‎‏‎‏‏‏‎Use one lock for work profile and device screen‎‏‎‎‏‎"</string>
+    <string name="lock_settings_profile_unification_dialog_title" msgid="4824620230229285301">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‎‎‏‎‏‏‏‏‎‏‎‎‎‏‏‏‏‏‏‎‏‎‎‎‏‎‎‏‏‎‎‏‎‏‏‎‏‏‏‏‏‎‏‎‏‏‎‏‏‎‎‏‏‎‏‏‎‏‎‏‎Use one lock?‎‏‎‎‏‎"</string>
+    <string name="lock_settings_profile_unification_dialog_body" msgid="7128305504872026659">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‎‎‏‎‏‏‏‎‏‏‎‎‏‏‎‏‎‏‎‎‎‎‎‏‎‏‏‎‏‏‎‏‏‏‎‎‎‏‎‏‏‎‏‏‏‏‎‏‎‎‏‎‎‎‏‎‎‎‏‏‎Your device will use your work profile screen lock. Work policies will apply to both locks.‎‏‎‎‏‎"</string>
+    <string name="lock_settings_profile_unification_dialog_uncompliant_body" msgid="3221303098797469900">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‏‏‎‎‏‎‏‏‎‏‎‎‎‏‎‏‏‏‏‎‎‎‎‏‏‎‎‏‏‏‏‎‎‏‎‏‏‎‏‏‎‎‎‎‎‎‏‏‎‎‎‎‏‏‎‎‏‏‎‎‎Your work profile lock doesn\'t meet your organization\'s security requirements. You can use the same lock for your device screen and your work profile, but any work lock policies will apply.‎‏‎‎‏‎"</string>
+    <string name="lock_settings_profile_unification_dialog_confirm" msgid="8249970828159656518">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‎‎‏‎‎‏‏‏‏‏‎‏‏‏‎‎‏‎‎‎‏‏‎‎‎‎‏‎‎‎‎‎‏‎‏‏‏‏‎‎‏‎‏‎‏‎‏‎‎‎‏‎‎‏‎‎‎‏‏‎‎Use one lock‎‏‎‎‏‎"</string>
+    <string name="lock_settings_profile_unification_dialog_uncompliant_confirm" msgid="5943758576756482777">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‎‎‏‎‎‏‏‏‏‏‎‎‎‏‏‏‏‎‎‎‏‏‏‎‏‏‏‏‎‎‏‎‎‏‏‎‎‏‎‎‎‎‎‎‎‏‏‎‎‎‏‎‏‏‎‏‏‎‎‏‎Use one lock‎‏‎‎‏‎"</string>
+    <string name="lock_settings_profile_unified_summary" msgid="9008819078132993492">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‏‏‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‏‏‎‎‎‏‎‎‎‎‏‎‏‏‏‏‎‎‎‎‏‎‎‎‎‏‏‎‏‏‏‎‏‎‏‎‎‎Same as device screen lock‎‏‎‎‏‎"</string>
+    <string name="manageapplications_settings_title" msgid="7041951105633616745">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‎‎‎‏‏‎‏‏‏‎‏‎‎‎‎‎‏‎‎‏‎‎‏‏‏‎‎‎‏‎‎‎‎‎‎‎‏‏‏‏‎‏‏‎‎‎‎‎‎‎‏‏‎‏‏‎‏‎‎‏‎Manage apps‎‏‎‎‏‎"</string>
+    <string name="manageapplications_settings_summary" msgid="1794401500935451259">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‏‎‎‎‏‏‏‎‎‏‏‎‏‏‏‏‏‏‏‎‏‎‏‎‏‎‎‎‎‏‏‎‏‏‏‏‏‎‏‎‏‏‏‏‎‏‏‏‎‎‏‎‎‏‏‏‏‎‏‏‎Manage and remove installed apps‎‏‎‎‏‎"</string>
+    <string name="applications_settings" msgid="5281808652705396152">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‏‎‎‏‎‏‎‎‏‏‎‎‏‏‎‎‎‎‎‎‏‏‏‏‏‏‎‎‎‏‎‎‎‏‎‎‎‎‎‏‎‏‏‎‏‏‏‏‎‏‎‏‏‎‏‏‏‎‎‎‎App info‎‏‎‎‏‎"</string>
+    <string name="applications_settings_summary" msgid="6683465446264515367">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‏‏‎‎‏‏‎‎‎‎‎‎‎‏‏‏‎‎‎‎‎‏‏‎‏‎‎‏‏‎‏‏‎‎‎‏‎‎‏‏‎‎‎‏‏‎‏‎‏‎‏‏‎‎‏‎‎‏‏‏‎Manage apps, set up quick launch shortcuts‎‏‎‎‏‎"</string>
+    <string name="applications_settings_header" msgid="1014813055054356646">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‎‏‏‏‎‎‎‎‏‎‏‎‏‎‏‎‏‎‏‏‏‎‎‎‏‏‎‎‎‏‏‎‎‏‎‏‏‏‏‏‏‎‎‎‏‏‎‏‎‎‎‎‎‏‎‏‎‎‏‏‎‎App settings‎‏‎‎‏‎"</string>
+    <string name="install_applications" msgid="4872012136210802181">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‎‎‏‏‏‎‎‏‏‏‎‎‏‏‎‏‏‏‎‏‎‎‏‏‏‎‎‏‏‎‎‏‎‎‎‎‎‎‏‏‏‏‎‎‏‎‏‎‎‏‏‎‎‎‎‎‎‏‎‏‎Unknown sources‎‏‎‎‏‎"</string>
+    <string name="install_applications_title" msgid="4987712352256508946">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‎‏‎‏‎‎‏‏‎‏‏‏‏‏‏‎‏‎‎‏‏‏‏‏‎‏‎‏‎‏‎‏‎‏‏‎‎‎‎‏‎‎‏‏‏‏‎‎‎‏‎‎‎‎‎‏‎‎‏‎‎Allow all app sources‎‏‎‎‏‎"</string>
+    <string name="recent_app_category_title" msgid="6673071268966003928">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‏‏‎‎‏‎‎‏‏‎‏‏‏‎‎‎‎‎‏‎‏‏‏‏‎‏‏‎‏‎‏‏‎‎‏‏‏‎‎‏‎‏‎‏‎‏‏‏‎‏‎‎‏‏‎‏‏‎‎‎‎Recently opened apps‎‏‎‎‏‎"</string>
+    <string name="see_all_apps_title" msgid="1317153498074308438">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‎‎‏‎‎‏‎‎‎‏‏‏‎‏‏‏‏‎‎‎‎‎‏‎‎‎‎‎‏‎‏‏‏‏‏‏‎‏‏‎‎‎‎‏‏‏‎‏‏‏‏‏‎‏‎‏‎‏‏‎‎See all ‎‏‎‎‏‏‎<xliff:g id="COUNT">%1$d</xliff:g>‎‏‎‎‏‏‏‎ apps‎‏‎‎‏‎"</string>
+    <string name="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>
+    <string name="advanced_settings_summary" msgid="4016682978071086747">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‎‏‏‏‏‎‏‏‏‏‏‎‎‎‎‏‏‏‏‏‏‏‏‎‎‎‏‏‎‎‏‎‎‎‏‏‎‏‎‎‏‎‎‏‎‎‎‎‎‏‏‎‏‎‎‏‏‎‏‏‎Enable more settings options‎‏‎‎‏‎"</string>
+    <string name="application_info_label" msgid="5736524913065714880">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‏‏‏‏‏‎‎‏‏‏‎‎‎‎‏‏‏‎‏‏‎‎‎‎‎‎‏‏‏‏‎‏‏‎‎‎‎‏‏‏‎‏‎‏‏‏‏‎‎‏‎‎‏‏‎‎‎‎‎‎‎App info‎‏‎‎‏‎"</string>
+    <string name="storage_label" msgid="8700867073480107253">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‏‎‎‎‎‏‎‎‎‎‎‎‏‎‎‎‏‎‎‎‎‏‎‏‎‏‏‎‎‏‎‏‎‎‏‎‎‏‏‏‏‎‏‎‏‎Storage‎‏‎‎‏‎"</string>
+    <string name="auto_launch_label" msgid="2669236885531442195">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‎‏‎‏‎‎‎‎‏‎‏‏‎‎‎‎‏‎‎‎‏‏‎‎‏‏‏‎‎‎‎‏‏‏‏‏‎‏‏‏‏‎‎‎‏‎‏‏‏‏‎‎‎‎‎‏‎‎‏‏‎Open by default‎‏‎‎‏‎"</string>
+    <string name="auto_launch_label_generic" msgid="3230569852551968694">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‏‏‎‎‏‏‎‏‎‏‎‏‎‏‎‎‏‎‏‎‎‎‏‎‏‎‏‎‎‎‏‎‎‎‏‏‎‏‏‏‎‎‏‎‎‎‏‏‎‏‏‏‏‎‏‏‎‏‏‎‎Defaults‎‏‎‎‏‎"</string>
+    <string name="screen_compatibility_label" msgid="663250687205465394">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‎‏‎‎‏‎‎‏‏‎‏‎‎‎‏‎‏‎‏‏‎‏‏‏‏‏‏‎‎‎‏‏‎‎‏‏‏‏‏‏‎‏‎‏‎‎‏‎‏‏‏‎‏‎‎‏‏‎‎‏‎‎Screen compatibility‎‏‎‎‏‎"</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">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‏‏‏‏‏‏‏‎‎‎‏‎‏‎‎‎‏‎‎‏‏‏‎‏‎‏‏‏‏‏‏‏‎‎‎‏‎‎‏‏‏‎‏‏‏‏‎‎‏‎‎‏‎‎‏‎‎‏‎‏‎Clear cache‎‏‎‎‏‎"</string>
+    <string name="cache_size_label" msgid="7505481393108282913">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‏‎‎‎‎‎‏‎‏‎‎‎‏‏‎‏‎‎‏‏‏‎‎‎‏‏‏‏‏‎‏‏‎‎‎‎‏‎‎‎‎‏‎‏‏‏‏‎‏‏‏‎‎‎‏‎‎‎‎‏‎Cache‎‏‎‎‏‎"</string>
+    <plurals name="uri_permissions_text" formatted="false" msgid="3983110543017963732">
+      <item quantity="other">‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‎‏‏‏‎‏‎‎‎‏‏‎‏‏‎‏‏‎‎‏‏‏‏‎‏‏‏‏‎‏‏‏‏‎‎‏‏‎‏‏‎‎‏‎‏‏‏‏‎‎‎‎‏‏‎‏‎‏‎‎‎%d items‎‏‎‎‏‎</item>
+      <item quantity="one">‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‎‏‏‏‎‏‎‎‎‏‏‎‏‏‎‏‏‎‎‏‏‏‏‎‏‏‏‏‎‏‏‏‏‎‎‏‏‎‏‏‎‎‏‎‏‏‏‏‎‎‎‎‏‏‎‏‎‏‎‎‎1 item‎‏‎‎‏‎</item>
+    </plurals>
+    <string name="clear_uri_btn_text" msgid="8575655132961012158">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‎‏‏‏‎‎‎‎‎‎‏‎‏‏‎‏‏‎‎‎‏‏‏‎‏‎‎‎‎‏‎‏‏‏‎‎‎‏‏‎‎‏‎‏‎‏‏‏‏‎‎‏‏‎‏‏‏‏‏‎‎Clear access‎‏‎‎‏‎"</string>
+    <string name="controls_label" msgid="7611113077086853799">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‏‎‎‏‏‎‏‎‎‎‎‎‎‎‎‏‏‎‏‏‎‎‎‎‎‏‎‎‏‎‏‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‎‏‏‎‏‎‏‎‏‎‎‏‏‏‎Controls‎‏‎‎‏‎"</string>
+    <string name="force_stop" msgid="7435006169872876756">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‎‏‏‏‎‎‏‎‏‏‏‎‎‏‏‏‎‎‏‎‏‎‏‏‏‎‎‎‎‎‎‏‏‎‏‎‎‎‎‏‏‏‎‎‎‏‎‎‎‏‎‎‏‏‎‏‎‏‎‎‎Force stop‎‏‎‎‏‎"</string>
+    <string name="total_size_label" msgid="1048676419552557254">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‎‏‏‏‎‏‎‎‎‏‏‎‏‏‎‏‎‎‏‎‏‏‎‏‎‎‏‎‏‏‎‏‏‏‏‏‏‏‏‎‎‎‎‏‎‎‎‏‏‏‎‎‎‏‏‎‎‎‏‏‎‎Total‎‏‎‎‏‎"</string>
+    <string name="application_size_label" msgid="7376689739076506885">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‎‏‏‎‎‏‎‏‏‏‏‏‎‏‎‎‎‏‎‎‎‎‏‏‏‎‏‏‏‏‏‏‏‎‏‏‏‏‏‎‏‏‎‎‏‎‎‏‎‏‎‏‎‎‎‎‎‏‎‏‎App size‎‏‎‎‏‎"</string>
+    <string name="external_code_size_label" msgid="3459343140355961335">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‎‎‎‎‎‎‎‎‎‎‏‎‎‎‎‎‏‏‏‎‎‏‎‎‎‎‎‏‏‏‏‏‏‏‎‏‎‎‎‏‏‎‎‏‏‏‏‏‎‎‎‏‏‏‏‏‎‏‏‏‎USB storage app‎‏‎‎‏‎"</string>
+    <string name="data_size_label" msgid="6117971066063850416">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‎‏‎‎‏‏‏‎‎‏‏‏‎‏‏‎‎‏‏‎‎‏‎‎‎‏‎‏‎‎‏‎‏‎‏‎‏‏‎‏‏‎‏‎‏‎‎‎‏‎‏‏‏‎‏‏‎‎‎‎‎User data‎‏‎‎‏‎"</string>
+    <string name="external_data_size_label" product="nosdcard" msgid="7533821466482000453">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‏‎‎‎‏‎‎‎‏‏‎‏‏‎‎‎‎‎‏‎‏‎‏‏‎‏‎‏‎‎‏‏‎‏‏‎‏‏‎‏‏‏‏‏‎‏‎‎‎‎‏‎‎‏‎‎‎‏‎‏‎USB storage data‎‏‎‎‏‎"</string>
+    <string name="external_data_size_label" product="default" msgid="626414192825329708">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‎‏‎‎‎‏‎‏‏‎‎‎‏‎‏‏‏‏‎‎‎‎‏‏‎‎‎‏‏‏‎‏‏‎‏‎‏‏‎‎‏‏‏‎‏‏‏‏‎‏‎‎‎‎‎‏‎‏‏‎‎‎SD card‎‏‎‎‏‎"</string>
+    <string name="uninstall_text" msgid="3644892466144802466">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‎‎‏‎‏‎‎‏‎‏‎‏‎‏‎‎‎‎‏‎‎‏‏‎‎‎‏‎‏‏‏‏‎‎‎‏‎‎‎‎‏‏‏‎‏‏‏‏‎‏‏‎‏‎‏‎‎‎‏‎‎Uninstall‎‏‎‎‏‎"</string>
+    <string name="uninstall_all_users_text" msgid="851857393177950340">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‎‏‎‏‏‏‏‎‏‎‎‏‎‎‏‏‎‎‏‏‏‏‏‎‎‏‎‎‏‎‎‏‎‎‏‏‏‏‎‏‎‏‎‎‏‎‏‏‏‏‎‎‎‏‎‎‎‎‏‎‎‎Uninstall for all users‎‏‎‎‏‎"</string>
+    <string name="install_text" msgid="884360662922471113">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‎‏‏‎‎‎‏‎‎‎‏‎‏‏‏‏‎‎‎‎‏‎‏‎‏‎‏‏‎‎‏‎‏‏‏‏‎‏‏‎‏‎‎‏‎‏‎‏‎‎‏‏‎‏‏‎‎‏‎‎‏‎Install‎‏‎‎‏‎"</string>
+    <string name="disable_text" msgid="6544054052049395202">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‏‎‏‎‏‏‎‏‎‎‎‏‎‎‏‎‎‏‏‎‎‏‏‏‏‏‎‏‎‎‎‎‏‎‏‏‎‏‎‏‏‏‎‎‎‎‎‏‏‏‏‎‎‎‎‎‎‎‏‎‎Disable‎‏‎‎‏‎"</string>
+    <string name="enable_text" msgid="9217362512327828987">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‏‏‏‏‏‏‏‎‏‎‏‎‏‎‏‎‎‏‏‎‎‏‎‏‏‏‏‎‏‎‎‎‏‎‎‏‎‏‎‎‏‏‎‏‎‏‏‎‎‏‎‏‏‏‏‏‏‎‏‏‎Enable‎‏‎‎‏‎"</string>
+    <string name="clear_user_data_text" msgid="5597622864770098388">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‏‏‎‏‏‎‏‎‏‏‏‎‏‏‎‎‎‎‎‎‎‏‎‏‎‏‏‎‏‎‎‎‏‎‎‏‎‎‏‏‏‎‎‏‏‏‏‎‎‏‎‎‏‏‎‏‎‏‎‎‎Clear data‎‏‎‎‏‎"</string>
+    <string name="app_factory_reset" msgid="6635744722502563022">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‏‏‎‎‎‎‎‏‎‏‏‎‏‏‏‎‎‏‏‎‏‎‏‎‏‎‏‎‏‏‎‏‏‏‎‎‏‏‏‏‎‎‎‎‎‎‏‏‎‏‎‎‏‏‎‎‏‏‏‎‎Uninstall updates‎‏‎‎‏‎"</string>
+    <string name="auto_launch_enable_text" msgid="4275746249511874845">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‏‎‏‏‎‏‎‏‎‏‏‎‏‎‎‎‎‎‎‎‏‎‎‎‏‏‏‏‎‏‎‏‏‏‏‏‏‏‎‏‏‏‎‏‎‎‏‏‎‎‎‏‎‎‎‏‏‏‎‏‎You’ve chosen to launch this app by default for some actions.‎‏‎‎‏‎"</string>
+    <string name="always_allow_bind_appwidgets_text" msgid="566822577792032925">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‎‏‏‏‏‏‏‏‎‏‏‏‎‏‏‏‎‎‎‎‏‎‎‎‏‎‎‎‎‏‏‎‎‏‏‏‏‏‏‏‏‏‎‏‏‏‎‎‏‎‎‎‎‎‏‎‎‏‏‏‎‏‎You’ve chosen to allow this app to create widgets and access their data.‎‏‎‎‏‎"</string>
+    <string name="auto_launch_disable_text" msgid="7800385822185540166">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‏‏‎‎‎‏‎‎‎‎‎‎‏‎‎‎‏‎‎‏‏‎‎‏‎‎‏‏‏‎‏‏‏‎‏‎‎‏‎‏‏‏‎‎‏‏‎‎‏‎‏‎‎‏‎‎‎‏‏‎‎No defaults set.‎‏‎‎‏‎"</string>
+    <string name="clear_activities" msgid="7408923511535174430">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‎‏‏‎‏‏‎‏‎‎‎‏‏‏‎‎‏‎‎‎‏‎‏‎‏‏‎‏‏‏‏‏‏‎‎‏‎‎‎‏‏‎‎‎‎‎‎‎‎‎‏‏‎‎‎‏‏‏‏‎‎Clear defaults‎‏‎‎‏‎"</string>
+    <string name="screen_compatibility_text" msgid="1616155457673106022">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‎‏‏‎‎‏‏‎‏‏‎‏‏‎‏‏‏‏‎‎‏‏‎‏‎‎‏‏‎‏‏‏‎‏‎‎‎‏‏‎‏‎‏‎‎‎‎‏‎‎‏‎‎‏‏‎‎‏‏‎‎This app may not be designed for your screen. You can control how it adjusts to your screen here.‎‏‎‎‏‎"</string>
+    <string name="ask_compatibility" msgid="7225195569089607846">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‎‏‎‎‎‏‎‎‎‏‎‏‎‎‎‎‏‏‎‏‎‎‎‏‎‏‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‏‏‏‏‏‏‏‏‎‎‎‏‎‏‎‎‏‏‎‎Ask when launched‎‏‎‎‏‎"</string>
+    <string name="enable_compatibility" msgid="5806819252068617811">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‎‎‎‎‏‎‎‏‎‏‎‏‏‏‏‏‎‏‏‏‎‏‎‏‏‎‎‎‎‎‎‎‏‎‏‎‎‏‏‏‎‎‏‏‎‎‎‎‏‏‏‎‎‏‎‏‎‎‏‏‎Scale app‎‏‎‎‏‎"</string>
+    <string name="unknown" msgid="1592123443519355854">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‎‏‏‎‎‎‎‏‏‎‎‎‎‏‎‏‏‎‏‏‏‏‎‏‎‏‏‎‎‎‏‎‎‎‎‏‏‎‎‎‏‎‏‎‏‏‏‏‏‎‏‏‏‏‎‎‏‏‏‎‎Unknown‎‏‎‎‏‎"</string>
+    <string name="sort_order_alpha" msgid="1410278099123670628">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‎‎‏‏‏‎‎‏‎‎‏‎‎‏‎‏‎‎‎‎‎‏‏‏‎‏‎‏‏‎‎‎‏‏‎‎‏‏‎‎‎‏‏‏‏‎‎‎‏‏‏‎‎‏‏‎‎‏‎‎‎Sort by name‎‏‎‎‏‎"</string>
+    <string name="sort_order_size" msgid="7024513286636502362">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‎‎‎‏‎‏‏‏‏‏‎‎‎‎‎‏‎‏‎‏‏‎‎‏‏‏‎‏‏‏‏‎‎‎‎‏‏‏‏‏‏‎‏‎‏‏‏‏‏‏‎‏‎‏‎‏‏‎‏‎‎Sort by size‎‏‎‎‏‎"</string>
+    <string name="show_running_services" msgid="5736278767975544570">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‏‏‏‏‏‎‎‏‏‎‏‏‎‏‎‏‏‎‏‏‎‎‏‎‎‏‎‏‏‎‏‏‏‎‎‏‏‏‎‎‏‏‎‎‎‎‏‏‎‏‏‎‏‏‏‏‏‎‏‎‎Show running services‎‏‎‎‏‎"</string>
+    <string name="show_background_processes" msgid="2009840211972293429">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‏‎‏‏‏‏‏‎‎‏‎‎‎‏‏‎‎‎‏‏‎‎‎‎‎‏‏‎‎‎‏‏‎‎‎‏‏‏‏‎‎‏‏‏‏‎‎‎‎‎‏‏‎‎‏‏‎‏‎‏‎Show cached processes‎‏‎‎‏‎"</string>
+    <string name="default_emergency_app" msgid="1951760659640369980">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‏‎‏‏‎‎‎‏‎‏‏‎‎‎‎‎‏‎‏‏‏‏‏‏‏‎‏‎‏‎‏‎‎‏‎‎‎‏‏‏‎‎‏‎‎‏‎‎‎‎‏‏‎‎‏‏‏‏‎‎‎Emergency app‎‏‎‎‏‎"</string>
+    <string name="reset_app_preferences" msgid="1321050641018356925">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‎‎‏‎‎‏‎‏‎‏‎‏‎‏‎‏‎‎‎‎‏‎‎‎‏‏‏‏‎‎‎‎‏‏‎‎‎‎‏‏‎‎‏‏‏‎‎‎‎‏‎‎‏‎‏‏‏‏‎‏‎Reset app preferences‎‏‎‎‏‎"</string>
+    <string name="reset_app_preferences_title" msgid="6093179367325336662">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‎‏‎‎‏‎‎‎‏‏‏‏‎‏‎‏‎‎‏‎‎‏‎‏‏‎‎‏‏‏‏‏‏‏‏‎‎‎‏‎‏‎‏‎‏‎‎‎‎‏‎‎‎‏‎‏‎‏‏‎‎Reset app preferences?‎‏‎‎‏‎"</string>
+    <string name="reset_app_preferences_desc" msgid="4822447731869201512">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‎‎‏‎‏‏‏‎‏‏‎‎‏‏‎‎‎‏‏‎‏‎‏‎‏‎‎‏‎‏‏‎‎‏‎‏‏‏‏‏‎‎‏‏‏‎‏‏‎‏‎‎‎‏‏‎‏‎‎‎‎This will reset all preferences for:‎‏‎‎‏‏‎\n‎‏‎‎‏‏‏‎‎‏‎‎‏‏‎\n‎‏‎‎‏‏‏‎ ‎‏‎‎‏‏‎"<li>"‎‏‎‎‏‏‏‎Disabled apps‎‏‎‎‏‏‎"</li>"‎‏‎‎‏‏‏‎‎‏‎‎‏‏‎\n‎‏‎‎‏‏‏‎ ‎‏‎‎‏‏‎"<li>"‎‏‎‎‏‏‏‎Disabled app notifications‎‏‎‎‏‏‎"</li>"‎‏‎‎‏‏‏‎‎‏‎‎‏‏‎\n‎‏‎‎‏‏‏‎ ‎‏‎‎‏‏‎"<li>"‎‏‎‎‏‏‏‎Default applications for actions‎‏‎‎‏‏‎"</li>"‎‏‎‎‏‏‏‎‎‏‎‎‏‏‎\n‎‏‎‎‏‏‏‎ ‎‏‎‎‏‏‎"<li>"‎‏‎‎‏‏‏‎Background data restrictions for apps‎‏‎‎‏‏‎"</li>"‎‏‎‎‏‏‏‎‎‏‎‎‏‏‎\n‎‏‎‎‏‏‏‎ ‎‏‎‎‏‏‎"<li>"‎‏‎‎‏‏‏‎Any permission restrictions‎‏‎‎‏‏‎"</li>"‎‏‎‎‏‏‏‎‎‏‎‎‏‏‎\n‎‏‎‎‏‏‏‎‎‏‎‎‏‏‎\n‎‏‎‎‏‏‏‎ You will not lose any app data.‎‏‎‎‏‎"</string>
+    <string name="reset_app_preferences_button" msgid="2559089511841281242">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‎‎‏‏‏‎‎‎‎‎‏‏‏‎‏‏‎‏‏‎‎‏‎‏‏‎‏‎‎‎‏‏‎‏‎‏‏‎‏‏‏‎‏‎‎‎‏‏‎‏‎‎‏‏‎‏‏‎‏‎‎Reset apps‎‏‎‎‏‎"</string>
+    <string name="manage_space_text" msgid="8852711522447794676">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‏‎‏‎‏‏‎‏‏‎‏‏‎‎‏‎‎‏‏‎‎‎‏‏‏‎‎‏‏‏‎‏‏‎‏‎‏‎‎‎‎‎‏‎‎‎‏‎‎‎‎‏‏‏‏‏‎‏‎‎‎Manage space‎‏‎‎‏‎"</string>
+    <string name="filter" msgid="2018011724373033887">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‏‏‎‎‎‎‎‎‎‎‎‏‎‏‏‎‏‎‏‎‏‏‏‏‏‎‎‎‏‎‏‎‏‏‏‏‏‏‎‏‎‏‎‎‎‎‎‎‎‎‏‏‏‎‎‏‏‏‏‏‎Filter‎‏‎‎‏‎"</string>
+    <string name="filter_dlg_title" msgid="8693024463731076091">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‏‎‎‎‏‎‏‎‎‎‏‏‏‏‎‏‎‎‏‏‏‎‏‏‎‎‎‏‎‎‏‏‎‎‎‎‎‏‏‏‏‎‎‎‏‎‏‎‏‎‏‏‏‏‏‏‏‎‏‏‎Choose filter options‎‏‎‎‏‎"</string>
+    <string name="filter_apps_all" msgid="8899612398848280352">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‏‎‏‏‏‎‎‎‎‎‎‏‏‏‎‎‎‏‏‎‎‏‎‏‎‎‏‏‎‎‎‏‏‎‎‎‎‎‎‎‎‎‏‏‏‎‎‎‎‏‏‏‎‎‏‎‎‎‎‎‎All apps‎‏‎‎‏‎"</string>
+    <string name="filter_apps_disabled" msgid="5862632369555319938">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‎‎‎‏‎‏‎‏‏‏‎‎‎‏‎‎‎‎‎‏‎‎‎‏‎‏‎‎‎‎‎‏‏‏‎‎‎‎‎‎‏‏‎‏‎‎‏‎‏‏‎‎‏‎‎‎‎‎‏‎‎Disabled apps‎‏‎‎‏‎"</string>
+    <string name="filter_apps_third_party" msgid="7786348047690140979">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‏‏‎‎‎‎‎‎‏‏‏‎‏‎‏‎‏‎‏‎‎‏‎‎‏‎‏‏‏‎‏‎‏‎‎‎‎‎‏‎‎‎‎‎‏‎‎‎‏‏‎‏‎‎‏‏‎‎‏‏‎Downloaded‎‏‎‎‏‎"</string>
+    <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="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>
+    <string name="internal_storage" msgid="1584700623164275282">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‎‏‎‏‏‏‏‏‏‏‎‏‏‏‏‏‏‏‎‎‏‏‎‏‎‎‏‎‎‎‎‏‎‏‏‏‎‎‎‎‏‎‏‏‏‏‏‏‏‎‏‎‎‏‎‏‎‎‏‎‎Internal storage‎‏‎‎‏‎"</string>
+    <string name="internal_storage_sentence" msgid="889098931914857143">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‎‏‏‎‎‎‏‎‏‎‏‏‎‏‎‏‏‎‏‏‎‏‏‎‎‎‏‎‎‏‎‎‏‎‏‏‎‏‏‏‏‎‏‏‎‏‏‎‏‏‎‏‎‏‎‏‏‎‏‏‏‎internal storage‎‏‎‎‏‎"</string>
+    <string name="sd_card_storage" product="nosdcard" msgid="2673203150465132465">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‎‏‎‏‎‎‎‏‏‎‎‏‎‎‏‎‎‎‎‎‎‎‎‏‏‎‏‎‎‎‏‎‎‎‏‏‏‏‏‎‏‏‎‏‏‏‏‎‎‏‏‏‏‎‏‏‎‎‎‏‎USB storage‎‏‎‎‏‎"</string>
+    <string name="sd_card_storage" product="default" msgid="7623513618171928235">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‏‎‎‏‏‏‎‎‏‏‎‎‎‎‏‎‏‎‎‏‎‎‏‏‏‏‏‎‏‎‎‏‏‏‏‏‎‏‏‏‏‏‎‏‏‎‎‏‏‏‏‎‏‎‏‎‏‎‏‏‎SD card storage‎‏‎‎‏‎"</string>
+    <string name="recompute_size" msgid="7722567982831691718">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‏‎‏‏‎‎‏‎‏‏‎‎‎‎‎‏‎‎‏‎‏‎‏‎‏‎‏‎‎‎‎‏‏‎‏‎‎‏‏‏‏‏‎‎‏‏‏‎‎‏‏‏‏‏‎‎‎‏‏‎‎Recomputing size…‎‏‎‎‏‎"</string>
+    <string name="clear_data_dlg_title" msgid="5605258400134511197">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‏‏‎‏‏‏‎‎‏‎‎‏‏‏‏‎‎‎‎‎‏‏‎‏‎‎‎‏‎‎‏‎‎‏‏‎‎‏‎‎‏‎‏‎‏‎‏‏‏‎‏‎‎‏‎‏‏‏‎‏‎Delete app data?‎‏‎‎‏‎"</string>
+    <string name="clear_data_dlg_text" msgid="3951297329833822490">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‎‏‏‎‏‏‎‏‎‏‎‏‏‏‎‏‎‎‏‏‏‏‏‏‏‏‎‎‏‎‎‏‎‎‏‎‏‎‏‏‎‎‎‏‏‏‎‎‏‎‎‏‎‎‎‏‏‎‏‎‎All this app’s data will be deleted permanently. This includes all files, settings, accounts, databases, etc.‎‏‎‎‏‎"</string>
+    <string name="dlg_ok" msgid="2402639055725653590">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‎‎‎‏‎‏‎‏‎‏‏‏‏‏‏‎‎‎‏‏‎‏‏‏‏‏‎‏‏‏‎‏‎‎‎‎‎‎‎‎‎‎‎‏‏‏‏‎‏‏‏‎‎‏‎‏‎‏‏‎‎OK‎‏‎‎‏‎"</string>
+    <string name="dlg_cancel" msgid="1674753358972975911">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‎‏‏‏‎‎‏‏‏‏‎‏‏‏‏‎‏‎‏‏‎‏‎‎‏‏‏‎‏‎‎‎‎‏‏‏‏‏‏‏‏‎‎‏‏‏‏‏‏‎‏‏‎‎‏‎‎‏‏‏‎Cancel‎‏‎‎‏‎"</string>
+    <string name="app_not_found_dlg_title" msgid="3127123411738434964"></string>
+    <string name="app_not_found_dlg_text" msgid="4893589904687340011">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‎‎‏‏‏‏‏‎‏‎‎‏‏‎‎‎‎‏‏‎‎‎‎‏‎‏‏‏‎‏‎‎‏‎‎‏‎‏‎‏‎‎‏‏‏‎‎‏‏‎‎‏‏‏‏‎‏‎‏‏‎The app wasn’t found in the list of installed apps.‎‏‎‎‏‎"</string>
+    <string name="clear_data_failed" msgid="7214074331627422248">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‎‏‎‎‎‎‎‏‏‏‎‏‏‎‎‎‏‎‏‎‎‏‏‎‎‎‎‏‏‏‏‏‏‏‏‏‏‏‏‎‏‎‏‎‏‎‎‎‎‎‏‎‎‎‏‎‏‎‎‎‎Couldn’t clear app data.‎‏‎‎‏‎"</string>
+    <string name="clear_failed_dlg_title" msgid="2387060805294783175">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‎‎‎‏‎‎‏‎‎‎‎‎‏‎‎‎‏‎‏‏‎‎‏‎‎‏‏‏‏‎‏‏‏‏‎‎‏‏‎‏‏‎‏‎‎‏‏‏‏‎‏‎‏‏‎‎‎‏‏‏‎Clear data‎‏‎‎‏‎"</string>
+    <string name="clear_failed_dlg_text" msgid="5464475937929941008">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‏‎‏‏‏‏‎‏‎‏‎‏‏‎‏‏‎‏‏‏‏‏‏‎‏‎‎‏‏‏‎‏‏‎‏‏‏‏‏‏‏‎‏‏‏‏‎‏‎‎‎‎‎‎‎‏‎‎‎‎‎Couldn’t clear data for app.‎‏‎‎‏‎"</string>
+    <string name="security_settings_desc" product="tablet" msgid="1292421279262430109">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‎‎‎‏‏‏‏‎‏‏‏‏‏‎‎‏‏‎‏‎‎‏‎‎‏‏‏‎‎‏‎‏‎‎‏‎‏‎‎‏‎‏‏‏‏‏‎‏‎‎‏‏‏‎‎‏‏‏‎‏‎This app can access the following on your tablet:‎‏‎‎‏‎"</string>
+    <string name="security_settings_desc" product="default" msgid="61749028818785244">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‎‎‎‏‏‎‏‏‎‏‏‎‏‏‎‎‎‎‎‎‏‏‎‏‎‏‎‎‎‎‏‏‏‏‏‏‏‏‏‏‎‎‎‎‎‎‏‎‎‏‏‏‏‎‏‏‏‎‎‎This app can access the following on your phone:‎‏‎‎‏‎"</string>
+    <string name="security_settings_desc_multi" product="tablet" msgid="7300932212437084403">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‎‏‎‏‎‏‎‏‎‎‏‎‎‎‎‏‏‏‏‏‎‎‏‎‏‎‏‎‎‏‎‎‏‎‏‏‏‎‎‎‎‏‎‎‏‏‏‎‏‎‎‎‏‏‏‏‎‎‏‏‎This app can access the following on your tablet. In order to improve performance and reduce memory usage, some of these permissions are available to ‎‏‎‎‏‏‎<xliff:g id="BASE_APP_NAME">%1$s</xliff:g>‎‏‎‎‏‏‏‎ because it runs in the same process as ‎‏‎‎‏‏‎<xliff:g id="ADDITIONAL_APPS_LIST">%2$s</xliff:g>‎‏‎‎‏‏‏‎:‎‏‎‎‏‎"</string>
+    <string name="security_settings_desc_multi" product="default" msgid="6610268420793984752">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‏‎‏‏‏‎‏‏‏‏‎‎‎‏‏‎‎‏‎‎‎‎‎‏‏‎‏‏‎‎‏‎‎‎‏‏‎‏‏‎‏‎‎‎‎‏‏‎‎‏‏‎‏‏‏‏‎‎‎‎‎This app can access the following on your phone. In order to improve performance and reduce memory usage, some of these permissions are available to ‎‏‎‎‏‏‎<xliff:g id="BASE_APP_NAME">%1$s</xliff:g>‎‏‎‎‏‏‏‎ because it runs in the same process as ‎‏‎‎‏‏‎<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>‎‏‎‎‏‏‏‎ and ‎‏‎‎‏‏‎<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>‎‏‎‎‏‏‏‎ and ‎‏‎‎‏‏‎<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">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‏‏‏‏‏‏‎‏‏‏‏‎‎‏‏‏‏‏‏‎‎‎‎‏‎‏‎‏‎‎‎‎‎‏‏‏‎‏‎‎‎‏‏‏‎‎‏‎‎‏‎‎‎‎‏‏‎‏‏‎‎This app may charge you money:‎‏‎‎‏‎"</string>
+    <string name="security_settings_premium_sms_desc" msgid="8734171334263713717">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‏‎‎‏‎‎‏‏‎‏‏‎‎‎‎‎‎‎‏‎‏‎‎‎‏‏‎‏‏‎‎‎‏‎‏‎‎‎‏‏‎‎‎‎‎‎‏‎‏‏‏‏‏‎‏‏‎‏‎‏‎Send premium SMS‎‏‎‎‏‎"</string>
+    <string name="computing_size" msgid="1599186977475211186">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‎‏‏‎‎‎‏‏‎‎‎‏‎‏‏‏‎‏‎‎‎‎‎‏‎‏‎‏‎‏‎‎‏‎‎‏‏‏‎‏‎‏‏‏‎‎‏‎‏‏‏‏‏‎‏‏‎‎‏‎‎Computing…‎‏‎‎‏‎"</string>
+    <string name="invalid_size_value" msgid="1582744272718752951">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‎‏‎‏‏‏‏‏‎‏‏‏‎‎‎‎‏‎‎‏‏‎‎‎‎‏‏‏‏‏‎‎‎‎‎‏‏‎‏‎‏‏‏‏‎‏‏‎‏‏‎‎‏‎‏‏‎‏‏‏‎Couldn’t compute package size.‎‏‎‎‏‎"</string>
+    <string name="empty_list_msg" msgid="3552095537348807772">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‎‎‎‏‎‏‎‎‏‎‏‏‏‎‎‏‎‏‎‎‎‎‎‏‎‎‏‎‎‏‎‎‎‏‏‏‏‏‏‎‏‏‎‏‎‎‎‎‏‏‎‎‎‏‎‏‏‏‎‎‎You don’t have any third-party apps installed.‎‏‎‎‏‎"</string>
+    <string name="version_text" msgid="9189073826278676425">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‏‏‏‏‏‎‎‎‎‏‏‎‎‎‏‎‎‏‎‏‏‏‏‏‎‏‎‏‏‎‎‎‏‏‏‎‎‎‏‎‏‏‏‎‎‎‎‏‎‏‏‏‏‏‎‎‏‎‎‏‎version ‎‏‎‎‏‏‎<xliff:g id="VERSION_NUM">%1$s</xliff:g>‎‏‎‎‏‏‏‎‎‏‎‎‏‎"</string>
+    <string name="move_app" msgid="5042838441401731346">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‎‏‎‏‏‏‏‏‏‎‏‏‏‏‎‎‎‎‏‎‏‏‎‏‏‎‎‎‎‎‏‎‎‏‏‏‎‏‏‎‏‏‏‏‎‏‎‎‏‎‎‏‎‎‎‏‎‎‏‎‎Move‎‏‎‎‏‎"</string>
+    <string name="move_app_to_internal" product="tablet" msgid="2299714147283854957">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‏‏‏‏‏‏‏‎‏‎‏‎‎‎‏‏‏‎‎‏‏‏‎‏‎‏‎‏‎‎‏‎‎‎‎‏‏‏‎‎‏‎‏‏‎‏‏‎‎‏‏‎‎‏‏‎‏‏‎‏‎Move to tablet‎‏‎‎‏‎"</string>
+    <string name="move_app_to_internal" product="default" msgid="3895430471913858185">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‎‏‏‎‎‎‎‎‏‏‏‏‎‏‎‏‏‎‎‏‎‏‏‎‎‎‎‎‎‎‎‏‎‏‎‏‏‎‏‎‏‎‎‎‎‏‏‎‎‏‎‎‏‎‎‎‏‎‎‏‎Move to phone‎‏‎‎‏‎"</string>
+    <string name="move_app_to_sdcard" product="nosdcard" msgid="4350451696315265420">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‏‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‏‎‎‎‏‏‎‎‎‏‎‎‏‎‏‎‎‎‏‏‎‏‎‏‏‏‎‏‏‏‏‏‎‎‎‏‏‎‎‎‏‏‎‎‎Move to USB storage‎‏‎‎‏‎"</string>
+    <string name="move_app_to_sdcard" product="default" msgid="1143379049903056407">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‎‏‏‏‏‏‏‎‏‏‏‏‎‎‎‎‏‏‎‎‏‎‎‏‏‎‎‎‎‎‎‏‎‎‎‎‏‎‎‎‏‏‎‎‎‎‏‏‎‎‏‏‎‎‎‎‏‎‏‏‏‎Move to SD card‎‏‎‎‏‎"</string>
+    <string name="moving" msgid="6431016143218876491">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‏‎‎‏‎‎‏‏‏‏‏‏‏‎‎‎‏‏‏‏‎‎‎‏‏‎‏‏‏‏‏‏‏‎‎‏‎‏‎‏‏‏‎‏‎‎‏‎‎‎‎‎‎‏‎‎‏‎‏‏‎Moving‎‏‎‎‏‎"</string>
+    <string name="another_migration_already_in_progress" msgid="7817354268848365487">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‏‏‎‎‎‏‏‏‏‏‎‎‏‏‎‏‎‎‏‎‎‏‎‎‏‎‏‎‎‎‎‏‎‏‏‎‎‎‎‏‎‏‏‏‎‎‎‏‏‏‏‏‏‎‏‎‏‏‏‏‎Another migration is already in progress.‎‏‎‎‏‎"</string>
+    <string name="insufficient_storage" msgid="481763122991093080">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‎‏‏‏‏‎‏‎‏‎‏‏‏‏‏‎‎‏‎‎‎‏‎‎‎‎‎‎‏‎‎‎‎‎‎‎‏‏‏‏‎‎‎‏‎‎‎‏‎‏‎‏‎‏‎‏‎‏‏‎‎‎‎Not enough storage space.‎‏‎‎‏‎"</string>
+    <string name="does_not_exist" msgid="1501243985586067053">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‎‏‎‎‏‏‎‏‎‏‎‏‎‏‏‏‏‏‎‏‎‏‏‏‎‎‏‏‎‏‏‏‎‎‏‎‎‎‎‎‏‏‎‎‏‎‎‏‎‏‏‎‎‏‏‎‏‏‎‏‎App doesn’t exist.‎‏‎‎‏‎"</string>
+    <string name="app_forward_locked" msgid="6331564656683790866">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‎‏‏‏‏‏‎‏‏‏‏‎‎‎‏‏‏‏‎‎‏‎‎‎‎‎‏‎‎‏‎‏‏‎‏‎‎‎‎‎‏‏‏‎‎‎‏‏‎‎‏‎‎‎‎‏‎‎‏‎‎App is copy-protected.‎‏‎‎‏‎"</string>
+    <string name="invalid_location" msgid="4354595459063675191">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‏‏‎‎‎‏‏‎‏‏‏‎‏‎‏‎‎‎‎‏‎‏‏‏‏‏‏‏‏‎‎‏‎‏‏‎‎‎‎‎‎‏‎‎‏‏‏‏‏‎‎‏‎‎‏‏‎‏‏‏‎Install location isn’t valid.‎‏‎‎‏‎"</string>
+    <string name="system_package" msgid="1352722848400644991">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‎‎‏‎‏‏‎‎‎‏‎‏‏‏‎‏‎‏‏‎‎‏‎‎‎‎‏‏‎‏‏‏‏‎‏‎‎‏‏‏‏‎‎‏‏‎‎‏‏‎‏‏‎‏‏‏‏‏‏‏‎System updates can’t be installed on external media.‎‏‎‎‏‎"</string>
+    <string name="move_error_device_admin" msgid="8673026002690505763">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‏‎‎‎‎‏‎‏‏‏‎‎‏‏‎‎‎‏‏‏‎‎‏‏‎‎‏‎‏‎‏‎‎‎‏‎‎‎‎‏‎‏‏‏‏‏‏‏‏‏‎‎‎‎‏‎‎‎‏‏‎Device admin app can\'t be installed on external media‎‏‎‎‏‎"</string>
+    <string name="force_stop_dlg_title" msgid="977530651470711366">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‎‏‏‎‏‏‎‎‏‎‎‎‎‏‏‏‎‎‎‏‎‏‏‏‏‎‎‏‎‏‏‎‎‎‏‎‏‏‏‏‏‎‏‏‏‏‏‎‎‏‎‏‎‎‏‎‎‎‏‏‎‎Force stop?‎‏‎‎‏‎"</string>
+    <string name="force_stop_dlg_text" msgid="7208364204467835578">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‎‏‎‎‎‎‎‎‏‎‎‏‎‏‎‎‎‎‎‏‎‎‎‎‏‏‎‏‎‏‏‎‏‎‏‎‏‏‏‏‎‎‏‎‎‏‎‏‎‎‏‎‏‎‏‏‏‎‏‎‎If you force stop an app, it may misbehave.‎‏‎‎‏‎"</string>
+    <string name="move_app_failed_dlg_title" msgid="1282561064082384192"></string>
+    <string name="move_app_failed_dlg_text" msgid="187885379493011720">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‎‏‎‏‎‏‎‎‏‏‎‏‏‏‎‎‎‎‎‎‎‏‏‎‎‎‎‎‏‏‏‎‏‎‏‏‏‎‎‏‎‏‎‏‏‏‎‏‎‎‎‎‏‎‎‎‎‏‎‎‎‎Couldn’t move app. ‎‏‎‎‏‏‎<xliff:g id="REASON">%1$s</xliff:g>‎‏‎‎‏‏‏‎‎‏‎‎‏‎"</string>
+    <string name="app_install_location_title" msgid="2068975150026852168">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‏‏‎‎‏‎‏‏‎‏‏‎‎‏‏‏‏‎‎‏‏‏‏‎‏‏‏‏‏‏‏‎‎‎‏‎‎‏‏‏‎‏‏‎‎‎‎‎‎‏‏‏‎‏‎‎‏‎‎‎‎Preferred install location‎‏‎‎‏‎"</string>
+    <string name="app_install_location_summary" msgid="5155453752692959098">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‎‏‏‏‏‎‎‎‏‎‏‏‏‏‎‏‏‎‎‏‏‏‎‏‏‏‏‏‏‎‎‏‎‎‎‏‎‎‏‏‎‏‏‏‏‏‏‎‎‏‏‏‎‏‏‏‏‎‏‎‎Change the preferred installation location for new apps‎‏‎‎‏‎"</string>
+    <string name="app_disable_dlg_title" msgid="3916469657537695436">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‎‏‏‎‎‏‎‏‏‎‏‎‎‎‎‏‏‎‎‎‎‏‏‎‎‏‏‏‎‎‏‏‎‏‏‏‎‎‏‎‎‎‎‏‎‏‎‎‏‏‏‎‏‏‎‎‏‏‎‎‎Disable built-in app?‎‏‎‎‏‎"</string>
+    <string name="app_disable_dlg_positive" msgid="7375627244201714263">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‎‏‏‎‎‏‎‏‏‎‏‏‎‏‏‏‏‏‎‏‏‏‏‎‎‏‏‎‏‎‎‏‏‏‏‎‎‏‎‏‎‏‏‎‎‎‏‎‎‎‏‎‎‏‎‏‎‏‏‏‎Disable app‎‏‎‎‏‎"</string>
+    <string name="app_disable_dlg_text" msgid="5632072173181990531">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‏‏‏‎‎‎‏‎‏‎‎‏‎‎‏‎‎‎‏‏‏‏‎‎‏‏‎‏‎‎‏‎‏‏‏‏‏‏‎‏‏‏‏‏‏‏‏‏‎‏‏‎‏‎‎‎‎‎‏‏‎If you disable this app, Android and other apps may no longer function as intended.‎‏‎‎‏‎"</string>
+    <string name="app_special_disable_dlg_title" msgid="2690148680327142674">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‎‏‎‏‎‏‎‏‎‏‎‏‎‏‎‏‎‎‏‏‏‏‏‏‏‎‎‎‏‏‎‎‎‎‏‏‏‏‏‎‎‎‏‎‏‎‎‏‏‏‎‏‎‎‎‏‎‎‏‎‎Delete data and disable app?‎‏‎‎‏‎"</string>
+    <string name="app_special_disable_dlg_text" msgid="5832078825810635913">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‎‎‎‎‏‏‏‎‏‏‏‏‏‎‏‏‎‏‎‎‏‏‎‎‏‎‏‎‏‏‎‏‏‎‏‎‏‎‎‎‎‏‎‏‎‎‏‎‏‏‎‎‏‎‎‎‏‎‎‏‎If you disable this app, Android and other apps may no longer function as intended. Your data will also be deleted.‎‏‎‎‏‎"</string>
+    <string name="app_disable_notifications_dlg_title" msgid="7669264654851761857">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‏‎‏‎‎‏‏‎‏‏‏‎‏‎‏‏‎‎‏‏‏‎‎‏‎‎‎‏‏‏‏‏‎‎‎‎‏‏‏‎‎‏‎‏‏‏‏‎‎‏‏‎‏‏‎‎‎‎‎‏‎Turn off notifications?‎‏‎‎‏‎"</string>
+    <string name="app_disable_notifications_dlg_text" msgid="5088484670924769845">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‎‏‏‎‏‎‎‏‏‏‎‏‏‏‏‎‏‏‎‏‏‏‎‏‏‎‎‏‎‎‏‎‎‏‏‏‎‏‏‏‏‏‎‏‏‏‎‎‏‎‏‎‎‎‏‏‎‏‎‏‎If you turn off notifications for this app, you may miss important alerts and updates.‎‏‎‎‏‎"</string>
+    <string name="app_install_details_group_title" msgid="7084623031296083574">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‎‎‏‎‎‏‎‏‎‎‎‏‏‎‏‎‎‎‏‏‎‎‎‏‏‏‎‎‎‏‏‎‏‎‏‏‏‏‏‏‎‏‎‎‎‏‎‎‎‏‏‎‎‏‏‏‎‏‏‎‎Store‎‏‎‎‏‎"</string>
+    <string name="app_install_details_title" msgid="6905279702654975207">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‏‏‏‏‏‏‎‏‎‏‎‎‎‏‏‏‏‎‏‏‎‏‎‎‏‏‎‏‏‏‎‎‎‏‏‏‎‏‏‏‎‏‏‎‏‏‏‏‏‏‎‎‏‏‏‎‎‏‏‏‎App details‎‏‎‎‏‎"</string>
+    <string name="app_install_details_summary" msgid="6464796332049327547">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‏‎‎‏‏‎‏‏‎‏‏‏‏‎‎‏‎‎‏‎‎‎‎‎‎‎‏‏‎‎‎‏‎‏‎‏‎‎‎‎‏‏‎‎‎‏‏‎‎‏‎‏‏‎‏‏‏‎‏‏‎App installed from ‎‏‎‎‏‏‎<xliff:g id="APP_STORE">%1$s</xliff:g>‎‏‎‎‏‏‏‎‎‏‎‎‏‎"</string>
+    <string name="instant_app_details_summary" msgid="4529934403276907045">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‏‏‏‎‏‏‎‏‏‏‎‏‏‎‎‎‏‏‏‏‎‏‎‏‎‏‏‎‏‏‎‏‎‎‏‏‎‎‏‎‎‏‎‎‎‎‏‎‎‎‏‎‎‎‏‎‎‏‎‏‎More info on ‎‏‎‎‏‏‎<xliff:g id="APP_STORE">%1$s</xliff:g>‎‏‎‎‏‏‏‎‎‏‎‎‏‎"</string>
+    <string name="app_ops_settings" msgid="5108481883575527511">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‎‏‏‎‏‏‏‎‎‏‎‎‏‏‏‏‏‎‎‏‎‎‏‏‎‏‎‏‎‎‎‎‏‏‎‎‎‎‎‎‏‎‎‏‏‎‏‎‏‎‎‎‎‏‎‏‎‏‏‏‎App ops‎‏‎‎‏‎"</string>
+    <string name="app_ops_running" msgid="7706949900637284122">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‏‎‏‎‏‏‏‏‎‏‎‎‏‎‎‏‎‏‏‎‎‎‎‏‏‎‎‏‏‏‏‏‏‎‎‏‎‎‏‏‎‏‏‏‏‎‏‎‎‏‏‏‎‎‎‏‏‎‏‎‎Running‎‏‎‎‏‎"</string>
+    <string name="app_ops_never_used" msgid="9114608022906887802">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‏‏‏‎‎‏‏‏‏‏‎‏‏‎‎‏‎‏‏‏‏‎‏‏‎‏‎‎‏‎‏‎‎‎‎‎‎‏‎‎‏‎‏‎‎‏‎‏‏‏‏‎‎‏‏‏‏‎‏‎‎(Never used)‎‏‎‎‏‎"</string>
+    <string name="no_default_apps" msgid="2915315663141025400">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‏‎‎‎‎‏‏‏‎‏‎‏‎‏‎‎‏‎‎‎‎‎‏‎‎‏‏‎‎‏‎‎‏‏‎‏‏‎‏‎‎‏‏‏‎‎‏‏‎‏‏‎‎‏‏‏‏‎‎‎‎No default Apps.‎‏‎‎‏‎"</string>
+    <string name="storageuse_settings_title" msgid="5657014373502630403">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‏‏‏‎‏‎‎‎‎‎‎‏‏‏‎‎‎‎‎‎‏‎‎‏‏‎‎‏‏‎‏‏‏‏‎‏‏‏‏‎‎‏‏‏‎‎‏‏‏‎‏‎‎‎‎‎‎‎‏‏‎Storage use‎‏‎‎‏‎"</string>
+    <string name="storageuse_settings_summary" msgid="3748286507165697834">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‎‏‎‎‎‎‎‎‎‏‎‎‏‎‎‏‎‏‏‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‎‎‎‎‎‎‎‎‎‎‎‏‎‎‎‏‏‏‎‎‏‎‏‎‏‎‎View storage used by apps‎‏‎‎‏‎"</string>
+    <string name="service_restarting" msgid="2242747937372354306">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‏‏‏‏‎‎‎‏‏‏‏‏‏‏‎‏‎‏‏‏‎‏‎‏‏‏‎‏‏‏‎‎‏‏‏‏‏‏‎‏‎‎‎‏‏‎‏‏‎‏‏‏‎‎‎‎‎‎‏‎‎Restarting‎‏‎‎‏‎"</string>
+    <string name="cached" msgid="1059590879740175019">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‎‏‏‏‎‏‎‏‏‎‏‎‎‎‏‏‎‏‏‎‎‎‏‎‎‏‎‏‎‏‎‎‎‏‎‏‎‎‎‏‎‏‎‎‎‎‎‏‎‎‎‏‎‏‎‏‎‏‎‏‏‎Cached background process‎‏‎‎‏‎"</string>
+    <string name="no_running_services" msgid="2059536495597645347">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‏‏‎‎‏‎‎‏‎‏‎‎‏‏‏‏‎‎‎‏‏‎‎‎‎‏‏‏‏‏‏‎‎‏‏‎‎‎‎‎‏‏‎‎‏‏‏‎‏‏‏‎‎‎‏‎‎‎‏‏‎Nothing running.‎‏‎‎‏‎"</string>
+    <string name="service_started_by_app" msgid="818675099014723551">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‎‏‎‏‏‎‏‎‏‏‏‎‎‏‎‎‎‎‏‎‎‏‎‏‎‏‎‏‎‎‎‏‏‏‏‏‏‎‎‏‏‏‎‏‎‏‏‏‏‎‏‏‏‏‏‎‏‏‏‏‏‎Started by app.‎‏‎‎‏‎"</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>‎‏‎‎‏‏‏‎ free‎‏‎‎‏‎"</string>
+    <string name="service_foreground_processes" msgid="7583975676795574276">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‏‎‎‏‎‎‏‏‏‏‏‏‏‎‏‏‎‎‎‏‏‎‏‏‎‎‏‎‎‏‎‎‏‎‎‎‏‎‎‏‏‎‏‎‎‏‎‏‏‎‎‎‎‎‎‎‎‏‎‎‎‎‏‎‎‏‏‎<xliff:g id="MEMORY">%1$s</xliff:g>‎‏‎‎‏‏‏‎ used‎‏‎‎‏‎"</string>
+    <string name="memory" msgid="6609961111091483458">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‏‎‏‏‏‎‏‏‏‎‏‏‎‏‎‎‏‏‎‎‏‎‎‏‏‏‎‎‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‎‏‎‎‏‏‎‏‎‎‎‎‏‎‎RAM‎‏‎‎‏‎"</string>
+    <!-- no translation found for service_process_name (4098932168654826656) -->
+    <skip />
+    <string name="running_process_item_user_label" msgid="3129887865552025943">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‏‎‏‏‎‏‏‎‏‏‏‏‏‎‎‏‏‎‎‎‎‏‏‎‏‏‏‎‎‏‎‎‏‏‎‏‎‎‎‎‏‎‎‎‏‎‏‏‏‎‎‏‎‏‎‏‎‏‏‏‎User: ‎‏‎‎‏‏‎<xliff:g id="USER_NAME">%1$s</xliff:g>‎‏‎‎‏‏‏‎‎‏‎‎‏‎"</string>
+    <string name="running_process_item_removed_user_label" msgid="8250168004291472959">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‎‎‏‎‎‏‏‏‏‏‏‎‎‏‏‏‏‏‎‎‎‎‎‏‎‏‏‎‏‎‏‏‎‎‎‏‎‎‎‏‎‏‏‎‎‎‏‎‏‏‏‎‎‎‏‏‏‏‏‏‎Removed user‎‏‎‎‏‎"</string>
+    <string name="running_processes_item_description_s_s" msgid="5790575965282023145">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‏‎‎‎‎‏‎‎‎‏‎‏‎‎‏‎‎‎‏‏‏‏‏‏‎‎‎‏‏‎‎‏‎‏‏‎‏‏‎‏‏‏‎‏‎‎‏‎‎‏‎‎‏‏‎<xliff:g id="NUMPROCESS">%1$d</xliff:g>‎‏‎‎‏‏‏‎ process and ‎‏‎‎‏‏‎<xliff:g id="NUMSERVICES">%2$d</xliff:g>‎‏‎‎‏‏‏‎ service‎‏‎‎‏‎"</string>
+    <string name="running_processes_item_description_s_p" msgid="8019860457123222953">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‏‏‏‏‎‏‎‎‏‏‎‎‎‏‎‎‎‏‎‎‏‎‎‏‏‎‎‎‎‎‏‏‏‏‏‏‎‎‎‎‏‎‎‎‎‎‎‏‎‏‎‏‏‎‏‎‏‎‎‏‎‎‏‎‎‏‏‎<xliff:g id="NUMPROCESS">%1$d</xliff:g>‎‏‎‎‏‏‏‎ process and ‎‏‎‎‏‏‎<xliff:g id="NUMSERVICES">%2$d</xliff:g>‎‏‎‎‏‏‏‎ services‎‏‎‎‏‎"</string>
+    <string name="running_processes_item_description_p_s" msgid="744424668287252915">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‎‏‎‏‎‎‏‎‏‎‏‎‎‏‎‏‏‏‎‏‎‎‏‎‎‏‎‏‎‏‎‏‎‏‎‏‏‎‏‎‎‏‏‎‎‏‎‏‏‏‎‎‏‏‎‏‏‎‎‏‏‎‎‏‎‎‏‏‎<xliff:g id="NUMPROCESS">%1$d</xliff:g>‎‏‎‎‏‏‏‎ processes and ‎‏‎‎‏‏‎<xliff:g id="NUMSERVICES">%2$d</xliff:g>‎‏‎‎‏‏‏‎ service‎‏‎‎‏‎"</string>
+    <string name="running_processes_item_description_p_p" msgid="1607384595790852782">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‎‏‏‎‎‏‎‎‏‏‏‎‏‎‎‏‎‎‏‏‏‏‎‎‎‏‏‎‎‎‎‎‏‎‎‏‏‎‎‎‏‏‎‎‎‏‏‏‎‎‏‎‏‎‏‎‏‏‏‎‎‎‏‎‎‏‏‎<xliff:g id="NUMPROCESS">%1$d</xliff:g>‎‏‎‎‏‏‏‎ processes and ‎‏‎‎‏‏‎<xliff:g id="NUMSERVICES">%2$d</xliff:g>‎‏‎‎‏‏‏‎ services‎‏‎‎‏‎"</string>
+    <string name="running_processes_header_title" msgid="6588371727640789560">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‏‎‏‏‎‏‏‎‏‏‏‎‏‎‎‏‏‎‎‏‎‎‏‎‏‏‎‏‏‏‏‏‏‎‏‎‎‏‎‎‎‎‎‏‏‎‎‎‎‎‏‎‎‎‏‏‏‎‎‎‎Device memory‎‏‎‎‏‎"</string>
+    <string name="running_processes_header_footer" msgid="723908176275428442">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‎‏‎‏‎‎‎‎‎‏‎‏‏‏‏‎‏‎‏‏‎‏‎‏‎‎‏‏‎‏‎‏‎‎‎‎‎‏‏‏‎‎‏‎‏‏‏‎‏‎‏‎‎‎‏‎‏‏‎‏‎‎App RAM usage‎‏‎‎‏‎"</string>
+    <string name="running_processes_header_system_prefix" msgid="6104153299581682047">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‎‏‎‎‏‎‏‏‎‏‏‎‎‏‎‎‏‏‏‏‎‎‎‏‎‏‎‏‏‎‏‏‎‏‎‎‎‎‎‏‏‎‎‎‎‏‎‎‎‎‎‏‎‏‏‏‏‏‏‏‎System‎‏‎‎‏‎"</string>
+    <string name="running_processes_header_apps_prefix" msgid="5787594452716832727">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‎‎‎‎‎‏‎‏‎‎‎‏‏‎‏‎‏‎‏‎‎‏‏‏‏‏‎‏‏‎‏‎‎‎‏‎‎‎‏‏‎‏‎‏‎‏‎‎‎‏‏‏‏‏‎‏‎‏‏‏‎Apps‎‏‎‎‏‎"</string>
+    <string name="running_processes_header_free_prefix" msgid="4620613031737078415">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‎‎‎‎‎‎‎‏‏‏‏‏‏‎‏‏‎‏‏‏‎‎‎‏‎‎‏‎‎‏‎‎‎‎‎‏‎‎‏‏‏‎‏‎‏‎‏‏‎‎‏‎‏‎‎‎‏‏‏‏‎Free‎‏‎‎‏‎"</string>
+    <string name="running_processes_header_used_prefix" msgid="5924288703085123978">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‎‎‏‎‎‎‏‏‎‏‏‏‎‏‎‎‏‏‎‏‎‎‏‎‏‏‏‏‏‏‏‎‏‏‏‎‎‎‏‏‏‏‏‏‏‎‎‏‏‎‎‏‏‎‎‎‏‎‏‎‎Used‎‏‎‎‏‎"</string>
+    <string name="running_processes_header_cached_prefix" msgid="7950853188089434987">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‏‏‏‎‎‏‎‏‎‏‏‏‎‎‎‏‏‎‏‎‏‏‎‏‏‎‎‏‎‏‏‎‎‎‎‏‎‏‎‏‏‎‏‎‎‏‎‏‎‎‏‏‎‏‏‎‏‎‏‏‎Cached‎‏‎‎‏‎"</string>
+    <string name="running_processes_header_ram" msgid="996092388884426817">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‎‏‏‎‏‏‏‎‏‎‎‏‎‏‏‎‏‎‏‎‎‏‏‎‎‎‎‎‎‎‎‎‎‏‎‏‎‏‏‏‎‏‏‎‏‎‎‏‏‎‎‎‎‎‏‎‎‎‎‎‏‎‎‏‎‎‏‏‎<xliff:g id="RAM_0">%1$s</xliff:g>‎‏‎‎‏‏‏‎ of RAM‎‏‎‎‏‎"</string>
+    <string name="runningservicedetails_settings_title" msgid="3224004818524731568">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‏‏‎‎‏‎‏‏‏‏‎‏‏‏‏‏‎‏‏‏‎‏‎‎‏‏‎‏‎‎‎‎‏‎‏‎‎‏‎‏‎‎‎‎‎‏‏‏‏‎‎‎‏‎‏‏‎‎‎‎‎Running app‎‏‎‎‏‎"</string>
+    <string name="no_services" msgid="7133900764462288263">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‎‎‏‏‎‎‎‎‎‎‎‎‏‎‏‏‎‏‎‎‏‏‏‏‎‎‏‎‏‏‎‎‎‎‎‎‏‎‏‎‏‎‎‏‏‎‎‎‏‏‎‏‏‎‎‎‎‏‏‏‎Not active‎‏‎‎‏‎"</string>
+    <string name="runningservicedetails_services_title" msgid="391168243725357375">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‎‏‏‏‎‏‎‏‏‎‏‏‎‏‏‎‏‏‎‏‎‏‎‏‏‏‎‎‎‏‏‏‏‏‎‏‏‎‏‎‏‎‏‎‎‏‏‏‎‏‎‎‎‏‎‎‏‏‏‏‏‏‎Services‎‏‎‎‏‎"</string>
+    <string name="runningservicedetails_processes_title" msgid="928115582044655268">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‎‏‏‎‎‏‏‏‎‎‎‎‏‎‏‎‏‎‏‎‎‎‎‏‏‎‏‎‎‎‏‎‏‏‎‏‎‎‏‎‎‎‏‏‎‏‏‎‎‏‏‏‎‏‎‏‎‎‏‎‎‎Processes‎‏‎‎‏‎"</string>
+    <string name="service_stop" msgid="6369807553277527248">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‏‎‎‎‎‏‏‎‎‏‏‎‎‎‎‏‏‎‏‎‎‎‏‏‏‎‎‎‏‎‎‏‎‏‎‎‏‎‏‏‎‏‎‏‎‎‎‎‎‏‎‎‏‏‎‏‎‎‎‎‎Stop‎‏‎‎‏‎"</string>
+    <string name="service_manage" msgid="1876642087421959194">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‏‎‏‎‎‎‎‎‏‎‏‏‎‎‏‎‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‏‏‏‏‎‏‎‏‎‏‎‏‎‏‎‏‏‏‎‎‎‎‎‏‏‎‏‎‎Settings‎‏‎‎‏‎"</string>
+    <string name="service_stop_description" msgid="9146619928198961643">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‏‏‏‎‏‏‏‎‏‏‏‏‎‏‎‏‎‎‏‎‎‏‎‏‏‏‎‏‎‎‏‎‎‎‏‏‏‏‎‎‏‏‏‎‏‏‎‏‏‎‎‏‏‏‏‎‏‎‏‏‎This service was started by its app. Stopping it may cause the app to fail.‎‏‎‎‏‎"</string>
+    <string name="heavy_weight_stop_description" msgid="6050413065144035971">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‎‎‏‏‏‏‏‏‎‏‏‏‎‏‏‎‎‎‏‎‏‎‏‎‎‎‎‎‎‏‎‏‎‏‎‎‎‏‎‎‏‎‏‎‏‏‏‎‏‎‏‎‏‎‎‎‎‎‏‏‎This app can’t safely be stopped. If you stop it, you may lose some of your current work.‎‏‎‎‏‎"</string>
+    <string name="background_process_stop_description" msgid="3834163804031287685">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‎‏‎‏‎‎‏‏‎‏‎‏‏‎‏‎‏‏‏‏‏‎‏‎‏‎‏‎‎‏‎‏‏‏‎‏‏‏‏‏‎‎‏‎‎‎‎‎‎‎‎‏‏‎‎‎‎‏‎‏‎This is an old app process that is still running in case it’s needed again. There is usually no reason to stop it.‎‏‎‎‏‎"</string>
+    <string name="service_manage_description" msgid="479683614471552426">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‎‏‏‏‏‎‏‎‏‎‏‎‎‎‎‎‏‎‏‏‎‏‏‎‏‏‎‏‎‎‏‎‏‏‎‏‎‏‎‎‏‎‎‏‏‎‏‏‏‏‏‏‎‏‏‎‏‎‏‎‏‎‎‎‏‎‎‏‏‎<xliff:g id="CLIENT_NAME">%1$s</xliff:g>‎‏‎‎‏‏‏‎: currently in use. Tap Settings to control it.‎‏‎‎‏‎"</string>
+    <string name="main_running_process_description" msgid="1130702347066340890">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‎‏‏‏‏‏‎‏‏‎‎‎‏‎‎‎‎‏‏‏‏‏‏‎‎‏‎‏‏‎‎‏‏‏‏‏‏‏‎‎‏‎‏‏‎‏‏‏‏‎‏‏‎‎‎‎‏‏‎‏‎‎Main process in use.‎‏‎‎‏‎"</string>
+    <string name="process_service_in_use_description" msgid="8993335064403217080">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‏‏‎‎‏‏‎‎‏‏‏‎‏‎‏‏‏‏‏‎‏‎‎‏‎‏‏‏‏‎‏‎‎‎‏‏‏‏‎‏‎‎‎‏‏‎‎‎‏‎‏‎‏‎‏‏‏‎‎‎‎Service ‎‏‎‎‏‏‎<xliff:g id="COMP_NAME">%1$s</xliff:g>‎‏‎‎‏‏‏‎ is in use.‎‏‎‎‏‎"</string>
+    <string name="process_provider_in_use_description" msgid="5586603325677678940">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‏‏‎‏‏‎‎‎‎‏‏‏‏‎‎‏‏‎‏‎‎‎‏‎‎‎‎‎‎‎‏‎‏‎‎‎‎‎‎‎‏‎‎‎‏‎‏‏‎‎‎‏‎‏‎‏‏‏‎‎‎Provider ‎‏‎‎‏‏‎<xliff:g id="COMP_NAME">%1$s</xliff:g>‎‏‎‎‏‏‏‎ is in use.‎‏‎‎‏‎"</string>
+    <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 power 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 power it off and then on again.‎‏‎‎‏‎"</string>
+    <string name="language_input_gesture_title" msgid="8749227808244881255">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‏‎‎‏‎‏‏‎‏‎‏‏‏‎‎‎‎‎‎‎‎‏‎‏‎‏‏‎‎‎‎‏‎‎‎‏‎‏‏‎‎‏‏‏‏‏‎‏‎‏‏‏‎‏‏‎‎‏‏‏‎Languages, input &amp; gestures‎‏‎‎‏‎"</string>
+    <string name="language_input_gesture_summary_on_with_assist" msgid="7219895055450633449"></string>
+    <string name="language_input_gesture_summary_on_non_assist" msgid="756147879200943161"></string>
+    <string name="language_input_gesture_summary_off" msgid="4617198819416948217"></string>
+    <string name="language_settings" msgid="8758655933029560944">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‏‎‎‏‏‎‎‎‏‏‎‎‏‏‏‏‏‏‏‏‎‎‏‎‏‎‏‎‎‏‏‎‏‏‏‎‎‎‎‏‏‎‎‎‎‎‏‏‎‎‏‎‎‏‏‏‎‎‎‎‎Languages &amp; input‎‏‎‎‏‎"</string>
+    <string name="language_keyboard_settings_title" msgid="3709159207482544398">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‎‎‏‏‎‏‏‏‏‎‎‏‏‎‎‏‎‏‎‎‏‎‏‎‎‏‎‏‏‎‏‏‎‎‎‏‎‏‎‏‏‏‎‏‏‏‎‏‎‎‎‏‎‎‎‎‏‏‏‎‎Languages &amp; input‎‏‎‎‏‎"</string>
+    <string name="input_assistance" msgid="7577795275222555487">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‏‎‎‏‎‎‏‎‏‎‎‏‏‎‏‏‏‏‎‎‏‎‏‎‎‏‏‏‎‏‏‎‏‎‎‎‎‏‎‎‎‏‏‎‎‎‎‏‏‎‏‏‎‏‎‏‏‏‏‏‎Input assistance‎‏‎‎‏‎"</string>
+    <string name="keyboard_settings_category" msgid="8275523930352487827">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‎‎‏‎‏‏‎‏‏‎‎‎‏‎‎‏‎‎‎‏‎‎‏‎‏‎‏‏‎‏‎‎‎‏‏‎‏‏‏‎‎‏‏‏‏‎‎‎‏‏‎‏‏‎‎‏‎‎‏‏‎Keyboard &amp; input methods‎‏‎‎‏‎"</string>
+    <string name="phone_language" msgid="7116581601133118044">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‎‎‏‎‏‏‎‎‎‎‏‏‎‎‏‎‏‏‎‏‎‏‎‎‎‎‏‎‏‏‎‎‏‏‏‎‏‎‎‏‏‏‏‎‏‏‎‎‎‎‏‎‎‏‎‏‏‏‎‎‎Languages‎‏‎‎‏‎"</string>
+    <string name="phone_language_summary" msgid="3871309445655554211"></string>
+    <string name="auto_replace" msgid="6199184757891937822">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‎‏‏‎‎‎‎‎‎‏‏‏‏‏‏‎‏‏‎‏‏‎‏‏‎‎‎‏‎‏‎‎‏‏‏‏‎‎‏‎‏‎‏‎‎‎‏‏‎‏‏‎‎‎‎‏‏‏‏‎‎Auto-replace‎‏‎‎‏‎"</string>
+    <string name="auto_replace_summary" msgid="370288728200084466">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‎‏‏‏‎‏‎‎‏‎‎‎‏‏‏‎‎‎‎‏‏‏‏‎‏‎‎‎‏‎‏‏‏‎‏‏‎‎‏‎‏‏‎‎‏‎‎‏‏‏‏‎‏‏‏‏‏‏‎‎‏‎‎Correct mistyped words‎‏‎‎‏‎"</string>
+    <string name="auto_caps" msgid="6379232078052591265">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‏‎‎‎‏‎‎‎‎‏‏‏‏‎‎‏‎‏‎‏‏‏‎‎‎‏‏‎‏‏‎‎‎‎‎‎‎‎‎‏‏‎‏‎‎‎‎‎‎‏‏‎‏‎‏‎‎‎‎‏‎Auto-capitalization‎‏‎‎‏‎"</string>
+    <string name="auto_caps_summary" msgid="6358102538315261466">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‏‎‎‎‎‎‏‏‏‏‎‎‏‎‎‎‎‏‎‎‏‎‎‏‎‎‏‎‎‏‏‎‏‎‎‏‏‏‎‎‏‎‏‎‎‏‏‎‎‏‏‎‎‎‎‏‏‎‏‎‎Capitalize first letter in sentences‎‏‎‎‏‎"</string>
+    <string name="auto_punctuate" msgid="4595367243950425833">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‏‏‏‏‏‏‎‎‎‏‏‎‎‎‎‎‎‏‏‎‎‎‏‎‏‎‎‏‎‎‏‏‏‏‎‎‎‎‏‎‎‎‎‏‏‎‎‎‎‏‏‎‏‏‏‎‏‎‎‏‎Auto-punctuate‎‏‎‎‏‎"</string>
+    <string name="hardkeyboard_category" msgid="5957168411305769899">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‎‎‏‎‏‎‏‎‏‏‎‎‎‎‎‏‏‏‎‏‎‎‎‏‏‎‏‏‏‎‎‎‏‏‏‏‎‎‎‎‏‏‏‎‏‏‏‏‏‎‏‏‏‎‏‎‏‎‏‏‎Physical keyboard settings‎‏‎‎‏‎"</string>
+    <string name="auto_punctuate_summary" msgid="4372126865670574837">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‏‏‎‎‏‎‏‎‏‏‎‎‏‏‏‎‏‎‏‎‎‎‏‏‏‎‎‎‎‏‎‎‎‏‎‏‎‎‏‏‏‏‎‎‏‎‎‏‎‎‏‎‏‏‏‏‎‏‎‏‎Press Space key twice to insert \".\"‎‏‎‎‏‎"</string>
+    <string name="show_password" msgid="4837897357002495384">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‎‎‏‏‎‎‏‎‎‎‏‏‏‎‏‎‏‎‏‎‎‎‎‎‎‎‏‏‏‎‎‎‏‏‏‏‏‏‏‎‏‏‏‏‎‏‎‏‎‏‎‏‏‎‎‏‏‎‎‎‎Show passwords‎‏‎‎‏‎"</string>
+    <string name="show_password_summary" msgid="3365397574784829969">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‏‏‏‎‏‎‏‏‎‏‎‎‎‏‎‎‏‎‏‏‎‏‎‎‎‎‏‏‎‏‏‏‏‏‎‏‎‎‎‎‎‎‏‎‏‏‎‎‏‎‏‎‎‎‎‏‎‎‎‏‎Display characters briefly as you type‎‏‎‎‏‎"</string>
+    <string name="spellchecker_security_warning" msgid="9060897418527708922">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‏‏‎‏‏‎‏‏‏‏‏‎‏‏‎‎‎‏‏‎‎‎‏‏‎‎‏‎‎‎‎‎‏‎‎‏‏‎‎‏‏‎‎‏‎‎‎‏‎‏‏‎‏‏‏‏‏‎‏‎‎This spell checker may be able to collect all the text you type, including personal data like passwords and credit card numbers. It comes from the app ‎‏‎‎‏‏‎<xliff:g id="SPELLCHECKER_APPLICATION_NAME">%1$s</xliff:g>‎‏‎‎‏‏‏‎. Use this spell checker?‎‏‎‎‏‎"</string>
+    <string name="spellchecker_quick_settings" msgid="246728645150092058">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‎‏‎‏‏‎‏‏‎‏‏‎‎‏‎‎‎‏‏‏‎‎‏‏‎‎‏‎‏‎‏‎‎‎‎‏‎‎‎‎‏‎‏‎‏‏‎‏‎‏‎‏‏‎‎‎‏‏‎‏‎‎Settings‎‏‎‎‏‎"</string>
+    <string name="spellchecker_language" msgid="6041050114690541437">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‎‎‏‏‏‏‎‏‎‏‏‎‎‎‎‏‏‏‏‏‎‎‎‏‎‎‏‎‏‎‎‎‏‏‎‎‎‏‏‏‎‏‏‎‎‏‏‎‎‏‏‏‎‏‏‏‏‏‎‏‎Language‎‏‎‎‏‎"</string>
+    <string name="keyboard_and_input_methods_category" msgid="6035224122054465137">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‎‎‏‏‏‏‎‎‎‎‎‏‎‏‏‎‏‏‎‎‎‏‎‏‏‏‎‎‏‏‏‎‏‏‏‎‏‏‏‎‏‏‎‎‏‏‎‏‎‏‏‎‎‏‏‏‎‎‎‏‎Keyboard &amp; inputs‎‏‎‎‏‎"</string>
+    <string name="virtual_keyboard_category" msgid="1012830752318677119">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‎‏‏‏‎‎‎‎‎‏‏‏‎‎‏‎‎‏‏‎‎‎‎‏‏‎‎‏‏‏‏‏‏‏‎‎‏‏‎‎‎‏‎‏‏‏‏‏‎‎‎‎‎‎‏‏‏‏‏‏‏‎Virtual keyboard‎‏‎‎‏‎"</string>
+    <string name="available_virtual_keyboard_category" msgid="7645766574969139819">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‏‎‏‎‎‎‎‏‏‎‏‏‎‎‏‏‏‎‎‎‎‎‏‏‎‎‎‎‏‏‏‎‎‎‎‎‏‎‎‏‎‏‏‏‎‎‏‏‎‎‏‎‎‏‏‎‏‎‏‏‎Available virtual keyboard‎‏‎‎‏‎"</string>
+    <string name="add_virtual_keyboard" msgid="3302152381456516928">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‏‏‎‏‏‏‎‏‎‎‏‏‏‎‎‏‏‎‏‎‎‎‎‏‏‎‎‎‎‏‏‎‏‎‏‎‏‏‏‎‏‏‎‏‎‎‎‎‎‏‏‏‎‏‎‎‎‎‎‎‎Manage keyboards‎‏‎‎‏‎"</string>
+    <string name="keyboard_assistance_category" msgid="5843634175231134014">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‎‎‎‏‎‎‎‏‏‎‎‎‏‏‎‎‎‎‏‎‎‏‎‏‎‎‏‎‎‏‎‎‏‎‏‏‏‏‏‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‏‏‏‏‏‎‎Keyboard assistance‎‏‎‎‏‎"</string>
+    <string name="physical_keyboard_title" msgid="8285149877925752042">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‎‎‏‎‏‏‏‏‏‎‏‎‏‏‎‎‎‎‏‏‏‏‏‎‏‎‏‎‏‏‎‏‏‎‎‎‏‎‏‎‎‎‏‎‏‎‏‎‏‏‎‎‏‏‏‎‏‎‏‎‎Physical keyboard‎‏‎‎‏‎"</string>
+    <string name="show_ime" msgid="2658582193437188227">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‎‏‎‎‏‏‏‎‎‏‎‏‎‎‏‎‏‏‏‎‎‏‏‎‏‎‏‏‎‏‎‎‏‏‏‎‎‎‎‎‎‎‎‎‏‎‏‎‎‎‎‎‏‎‎‎‎‎‏‏‎Show virtual keyboard‎‏‎‎‏‎"</string>
+    <string name="show_ime_summary" msgid="8164993045923240698">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‎‎‎‏‎‏‎‎‏‏‏‏‏‏‏‎‎‎‎‏‏‏‏‎‏‎‏‎‎‏‎‎‏‏‏‏‏‏‎‎‏‎‏‎‎‎‎‏‏‎‏‎‏‏‏‏‏‎‏‎‎Keep it on screen while physical keyboard is active‎‏‎‎‏‎"</string>
+    <string name="keyboard_shortcuts_helper" msgid="4839453720463798145">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‎‎‏‏‎‎‏‎‏‎‎‏‎‎‏‏‎‎‎‏‏‎‎‎‎‏‎‎‏‎‏‎‏‎‏‏‎‎‏‎‏‏‏‏‏‏‏‎‏‏‏‏‏‎‎‎‎‎‎‏‎Keyboard shortcuts helper‎‏‎‎‏‎"</string>
+    <string name="keyboard_shortcuts_helper_summary" msgid="5871299901459743288">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‎‎‎‏‎‏‏‏‏‎‏‏‎‎‎‎‏‏‎‎‎‎‏‎‎‏‏‏‎‎‏‎‎‏‎‎‎‏‎‎‏‎‏‏‎‏‎‎‎‎‏‎‎‎‏‏‏‎‎‎‎Display available shortcuts‎‏‎‎‏‎"</string>
+    <string name="default_keyboard_layout" msgid="4172606673510531271">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‏‎‎‏‏‏‏‎‏‎‎‎‎‎‎‏‎‎‏‏‏‎‏‎‏‎‎‏‏‎‎‎‎‎‏‎‎‎‎‎‎‏‎‏‎‎‎‎‎‎‎‎‏‏‎‎‎‏‏‏‎Default‎‏‎‎‏‎"</string>
+    <string name="pointer_speed" msgid="1221342330217861616">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‎‎‎‎‏‏‏‏‎‎‏‏‎‎‎‏‎‏‎‎‎‏‏‎‎‎‎‎‏‏‎‏‏‏‎‏‏‏‎‎‏‎‎‎‏‎‎‏‎‎‎‏‏‏‏‏‎‎‎‎‎Pointer speed‎‏‎‎‏‎"</string>
+    <string name="game_controller_settings_category" msgid="8794508575329923718">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‏‎‏‎‎‎‎‎‏‏‎‎‎‏‎‏‏‏‏‎‏‏‏‏‎‏‎‎‎‎‏‏‎‏‏‎‏‎‏‎‏‎‏‎‏‎‏‏‎‎‏‎‏‎‎‎‎‏‏‎‎Game Controller‎‏‎‎‏‎"</string>
+    <string name="vibrate_input_devices" msgid="2599591466928793082">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‎‏‎‎‎‎‎‏‎‎‏‏‏‎‎‏‏‎‏‎‏‎‏‎‏‎‏‎‎‏‏‏‏‎‏‏‎‏‏‎‏‏‎‏‎‏‏‎‎‏‎‏‏‏‏‏‏‎‏‎‎Use vibrator‎‏‎‎‏‎"</string>
+    <string name="vibrate_input_devices_summary" msgid="4595570516865299153">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‏‏‏‏‏‏‎‎‎‏‏‎‏‎‏‏‏‏‏‏‎‎‎‎‏‎‎‏‎‏‏‎‎‏‏‎‎‎‎‎‎‎‏‏‏‎‏‏‎‎‏‎‏‏‎‏‎‎‎‏‎Redirect vibrator to game controller when connected.‎‏‎‎‏‎"</string>
+    <string name="keyboard_layout_dialog_title" msgid="8030087214949381372">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‏‏‏‏‎‏‏‏‎‎‎‎‏‎‎‏‏‎‎‏‏‏‎‎‎‏‏‎‏‏‎‏‏‎‏‎‎‏‏‏‎‏‏‎‏‎‏‏‎‏‎‎‏‏‏‏‏‏‎‎‎Choose keyboard layout‎‏‎‎‏‎"</string>
+    <string name="keyboard_layout_dialog_setup_button" msgid="8514583747236476384">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‎‏‏‎‎‎‏‎‏‎‎‏‏‏‏‎‎‎‎‎‏‏‎‎‏‏‏‎‎‏‎‏‎‎‎‎‎‏‎‏‏‎‎‎‎‎‏‏‎‏‎‏‏‏‏‎‎‎‎‎‎Set up keyboard layouts‎‏‎‎‏‎"</string>
+    <string name="keyboard_layout_dialog_switch_hint" msgid="3889961090676293795">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‎‏‎‏‏‏‏‏‏‎‏‏‏‏‏‎‏‎‏‏‎‎‎‎‎‎‎‎‏‎‎‎‎‏‏‏‏‏‎‏‏‎‏‎‎‎‎‎‎‎‎‎‏‎‏‎‎‎‏‏‎To switch, press Control-Spacebar‎‏‎‎‏‎"</string>
+    <string name="keyboard_layout_default_label" msgid="2952672513543482165">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‏‎‎‎‏‏‏‏‏‎‏‎‎‎‎‎‎‎‎‎‎‎‎‎‎‎‎‏‏‏‎‏‎‎‏‏‏‏‎‏‎‎‎‏‏‎‏‎‏‎‏‏‎‎‏‏‎‏‎‏‎Default‎‏‎‎‏‎"</string>
+    <string name="keyboard_layout_picker_title" msgid="556081931972771610">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‎‏‏‏‏‏‏‎‏‏‎‏‏‏‏‎‎‏‏‎‎‏‏‎‎‏‎‎‏‎‎‎‏‎‎‏‎‏‎‎‏‏‏‏‏‏‏‏‏‏‏‏‏‏‎‎‎‏‏‎‏‎‎Keyboard layouts‎‏‎‎‏‎"</string>
+    <string name="user_dict_settings_title" msgid="3427169369758733521">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‏‏‏‏‏‎‎‎‏‏‏‏‏‏‎‎‎‎‎‎‎‏‏‎‎‎‏‎‎‏‎‎‎‏‎‏‏‎‎‏‎‎‎‏‏‎‎‏‎‏‎‎‏‏‎‏‎‎‎‏‎Personal dictionary‎‏‎‎‏‎"</string>
+    <string name="user_dict_settings_summary" msgid="7965571192902870454"></string>
+    <string name="user_dict_settings_add_menu_title" msgid="4056762757149923551">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‏‎‎‎‎‏‎‎‏‏‎‎‏‎‎‎‎‏‎‎‎‎‏‏‏‎‏‏‏‏‏‎‎‏‎‏‏‏‏‏‎‏‎‎‏‎‎‏‏‎‎‎‏‏‎‏‏‏‏‏‎Add‎‏‎‎‏‎"</string>
+    <string name="user_dict_settings_add_dialog_title" msgid="4702613990174126482">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‎‎‎‏‎‏‎‎‎‎‏‏‎‎‎‎‏‎‏‎‏‎‎‎‎‎‏‎‎‎‏‏‎‎‎‎‎‎‎‏‏‏‎‎‎‏‏‏‎‎‎‏‏‎‎‏‎‎‏‎‎Add to dictionary‎‏‎‎‏‎"</string>
+    <string name="user_dict_settings_add_screen_title" msgid="742580720124344291">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‎‏‎‏‎‎‏‎‎‏‏‏‎‎‎‏‎‏‏‎‏‎‎‏‏‏‎‏‏‎‎‎‎‏‎‎‎‎‎‎‏‎‎‎‎‏‎‏‏‎‏‏‏‏‏‏‎‎‎‏‏‎Phrase‎‏‎‎‏‎"</string>
+    <string name="user_dict_settings_add_dialog_more_options" msgid="8848798370746019825">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‏‎‏‎‏‏‎‎‏‏‎‏‎‎‏‏‏‏‏‏‎‎‏‏‏‏‎‎‎‎‏‏‏‎‎‏‎‏‎‏‏‏‏‏‎‎‏‎‏‏‏‏‏‏‏‏‎‎‎‏‎More options‎‏‎‎‏‎"</string>
+    <string name="user_dict_settings_add_dialog_less_options" msgid="2441785268726036101">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‎‎‎‏‏‏‏‎‎‎‏‎‏‏‏‏‎‏‏‎‏‏‎‎‎‎‏‏‏‏‎‎‏‎‎‎‎‎‏‏‎‎‏‎‎‏‏‏‎‏‏‎‏‎‎‎‎‏‎‏‎Less options‎‏‎‎‏‎"</string>
+    <string name="user_dict_settings_add_dialog_confirm" msgid="6225823625332416144">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‎‏‏‎‎‏‏‎‎‏‏‎‏‎‎‏‎‎‎‏‏‎‎‏‏‎‎‏‏‏‏‏‎‏‏‎‎‎‏‎‏‏‎‎‎‏‎‏‏‏‏‎‏‎‎‏‎‎‎‎‎OK‎‏‎‎‏‎"</string>
+    <string name="user_dict_settings_add_word_option_name" msgid="7868879174905963135">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‏‏‎‏‎‎‏‏‎‎‏‏‏‏‎‏‏‏‏‏‏‏‏‎‏‎‏‏‎‎‏‎‎‎‎‎‏‎‏‏‏‏‎‏‎‎‏‎‎‎‏‎‎‏‏‏‏‏‏‏‎Word:‎‏‎‎‏‎"</string>
+    <string name="user_dict_settings_add_shortcut_option_name" msgid="660089258866063925">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‎‏‎‎‏‎‎‏‎‏‎‎‏‎‎‎‏‏‎‏‏‏‎‏‎‏‏‏‏‎‎‎‎‎‎‏‎‏‏‎‎‎‎‏‏‎‎‏‏‏‎‏‎‎‎‏‏‎‏‎‏‎Shortcut:‎‏‎‎‏‎"</string>
+    <string name="user_dict_settings_add_locale_option_name" msgid="5696358317061318532">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‏‏‏‏‎‎‎‎‏‏‎‏‏‎‎‎‎‏‏‏‏‎‏‏‎‏‎‏‎‏‏‏‎‎‎‏‏‏‎‎‏‎‎‎‎‎‏‎‎‏‏‏‏‎‎‎‎‏‎‎‎Language:‎‏‎‎‏‎"</string>
+    <string name="user_dict_settings_add_word_hint" msgid="5725254076556821247">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‏‏‏‏‎‏‏‏‎‏‎‎‎‎‏‏‎‎‎‎‎‎‏‏‏‏‏‏‏‎‏‏‏‎‏‎‎‎‎‎‎‏‏‎‏‏‎‎‎‎‏‎‏‏‏‏‏‏‏‏‎Type a word‎‏‎‎‏‎"</string>
+    <string name="user_dict_settings_add_shortcut_hint" msgid="7333763456561873445">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‎‏‎‏‏‏‎‎‎‏‏‎‏‏‎‎‎‎‏‏‎‎‎‎‎‎‎‏‏‏‏‏‏‏‏‏‎‎‎‏‏‏‎‎‏‎‎‎‎‎‏‎‎‎‏‎‎‏‎‏‎Optional shortcut‎‏‎‎‏‎"</string>
+    <string name="user_dict_settings_edit_dialog_title" msgid="8967476444840548674">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‏‏‎‎‎‏‏‏‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‏‎‎‎‎‏‎‎‏‏‎‏‎‎‏‏‎‎‏‏‏‎‏‎‏‏‎‎‏‎‏‎‎‎‎‏‎‎Edit word‎‏‎‎‏‎"</string>
+    <string name="user_dict_settings_context_menu_edit_title" msgid="2210564879320004837">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‏‏‏‎‏‎‏‎‏‏‎‏‏‎‎‎‎‎‎‏‎‎‎‎‏‎‏‏‏‎‏‏‎‎‎‎‏‏‎‏‎‎‏‎‏‎‏‏‏‎‎‎‏‏‏‎‎‏‎‏‎Edit‎‏‎‎‏‎"</string>
+    <string name="user_dict_settings_context_menu_delete_title" msgid="9140703913776549054">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‏‏‏‎‏‏‎‏‏‎‏‎‎‏‎‎‏‏‎‏‏‏‎‎‎‏‏‏‏‎‏‏‎‎‎‏‏‎‏‎‏‏‎‎‏‎‎‎‏‏‎‎‏‎‏‏‏‏‏‎‎Delete‎‏‎‎‏‎"</string>
+    <string name="user_dict_settings_empty_text" msgid="1971969756133074922">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‏‎‏‏‎‏‎‏‏‏‎‏‏‏‎‏‏‎‎‎‎‎‎‎‏‎‏‏‏‎‎‏‎‏‏‎‎‎‏‎‎‎‎‎‎‎‏‎‎‏‏‏‏‏‏‎‏‎‏‎‎You don’t have any words in the user dictionary. To add a word, tap the Add (+) button.‎‏‎‎‏‎"</string>
+    <string name="user_dict_settings_all_languages" msgid="6742000040975959247">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‏‏‎‏‏‎‎‏‎‎‎‎‎‏‏‎‎‏‎‏‎‏‎‏‎‎‎‏‎‎‎‎‏‏‏‎‎‎‎‎‏‎‏‎‏‎‎‎‎‏‎‎‏‏‎‎‏‏‏‏‎For all languages‎‏‎‎‏‎"</string>
+    <string name="user_dict_settings_more_languages" msgid="7316375944684977910">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‎‏‎‏‏‎‎‎‏‎‎‎‏‏‏‏‏‏‎‏‎‎‏‎‏‎‎‎‎‏‏‎‏‎‏‎‎‎‏‎‏‎‎‏‎‎‏‏‏‏‏‎‏‏‏‏‎‏‏‎‎More languages…‎‏‎‎‏‎"</string>
+    <string name="testing" msgid="6584352735303604146">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‏‎‏‏‎‏‏‎‎‎‎‎‎‏‎‏‎‎‎‏‏‏‏‎‏‏‎‏‎‏‏‎‎‏‏‏‏‎‏‎‎‏‎‎‏‎‎‏‎‏‏‏‏‎‏‏‎‎‏‎‎Testing‎‏‎‎‏‎"</string>
+    <string name="testing_phone_info" product="tablet" msgid="193561832258534798">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‎‏‎‏‎‏‎‏‎‏‏‏‏‏‎‏‎‏‎‏‏‎‏‏‏‎‏‎‏‏‏‏‏‏‏‎‏‏‏‎‏‎‏‏‏‏‏‏‏‏‏‎‏‏‎‎‎‏‏‏‎‎Tablet information‎‏‎‎‏‎"</string>
+    <string name="testing_phone_info" product="default" msgid="8656693364332840056">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‏‎‎‎‎‎‏‎‎‎‏‎‏‏‎‎‎‎‎‎‏‎‏‏‏‏‏‏‏‏‏‎‏‏‏‎‏‎‎‎‏‎‏‎‎‏‎‎‎‏‎‎‎‏‏‏‏‎‎‎‎Phone information‎‏‎‎‏‎"</string>
+    <string name="input_methods_settings_title" msgid="6800066636850553887">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‏‏‏‎‎‏‎‏‏‏‏‎‏‎‏‏‎‎‎‎‏‎‎‏‎‎‏‏‏‏‏‏‎‎‏‎‎‏‏‏‎‏‏‎‎‏‏‎‎‏‎‎‎‎‎‏‏‏‏‏‎Text input‎‏‎‎‏‎"</string>
+    <string name="input_method" msgid="5434026103176856164">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‏‎‏‏‎‏‏‎‏‎‎‏‏‎‎‎‏‎‎‏‏‏‏‏‎‎‏‏‎‎‏‏‏‏‎‎‎‎‎‎‏‏‏‎‏‎‎‎‎‎‏‎‎‏‏‎‎‏‎‎‎Input method‎‏‎‎‏‎"</string>
+    <string name="current_input_method" msgid="2636466029213488159">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‎‏‎‎‏‎‎‏‎‏‏‎‏‎‎‏‏‎‏‏‏‏‏‎‎‎‏‎‏‎‎‎‏‏‎‏‏‎‏‎‎‏‏‏‏‎‎‏‎‏‎‎‎‎‎‏‏‏‏‏‎Current Keyboard‎‏‎‎‏‎"</string>
+    <string name="input_method_selector" msgid="4311213129681430709">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‏‎‏‏‏‏‎‏‎‏‎‎‏‎‎‎‎‎‎‏‎‏‏‏‏‏‏‏‏‏‏‎‏‎‎‏‏‎‏‎‏‎‎‏‎‏‏‎‏‎‎‎‏‎‏‏‎‏‎‏‎Input method selector‎‏‎‎‏‎"</string>
+    <string name="input_method_selector_show_automatically_title" msgid="1001612945471546158">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‎‏‏‎‏‏‏‏‎‎‏‏‎‎‏‏‏‎‎‎‏‏‎‏‎‏‎‏‎‏‏‎‎‏‎‎‏‎‏‎‎‎‎‏‏‏‎‏‎‎‎‏‏‎‎‏‎‏‏‏‎‎Automatic‎‏‎‎‏‎"</string>
+    <string name="input_method_selector_always_show_title" msgid="3891824124222371634">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‎‏‏‎‎‎‎‎‎‎‏‎‏‎‎‎‏‎‎‏‎‏‏‎‏‎‏‏‏‏‎‏‎‏‎‎‏‎‎‏‎‎‎‏‏‏‏‏‎‏‏‏‎‎‏‏‎‎‏‎‎Always show‎‏‎‎‏‎"</string>
+    <string name="input_method_selector_always_hide_title" msgid="7699647095118680424">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‏‎‏‎‏‏‎‏‏‎‏‎‏‎‏‎‎‏‎‎‎‎‏‏‏‏‎‏‎‎‎‏‎‎‎‎‎‏‏‎‏‎‏‎‏‏‎‏‎‎‎‏‎‏‏‎‏‎‎‎‎Always hide‎‏‎‎‏‎"</string>
+    <string name="configure_input_method" msgid="1317429869771850228">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‎‎‏‎‎‏‎‎‏‎‎‎‎‏‏‏‎‎‏‏‎‏‏‏‏‏‎‎‏‎‎‎‏‏‎‎‎‎‏‏‏‏‎‏‏‎‎‎‎‎‎‏‏‏‏‏‎‏‎‎‎Set up input methods‎‏‎‎‏‎"</string>
+    <string name="input_method_settings" msgid="5801295625486269553">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‎‎‎‎‏‎‎‎‎‎‏‎‎‏‎‏‎‏‏‏‏‎‏‎‎‎‏‎‏‎‎‎‎‎‏‎‎‎‏‎‎‎‏‎‏‏‏‏‏‏‎‎‎‏‏‏‎‎‎‏‎Settings‎‏‎‎‏‎"</string>
+    <string name="input_method_settings_button" msgid="6778344383871619368">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‏‏‏‎‎‎‎‏‎‎‎‏‏‎‎‎‎‏‎‎‎‏‎‎‏‏‎‏‏‏‎‎‏‏‎‏‏‏‏‎‏‏‏‎‏‎‎‏‎‎‎‏‎‎‏‎‏‎‎‎‎Settings‎‏‎‎‏‎"</string>
+    <string name="input_methods_settings_label_format" msgid="6002887604815693322">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‎‎‏‏‎‏‎‎‏‏‏‎‏‎‎‎‏‎‏‎‎‏‏‏‏‎‎‎‏‏‎‎‏‏‏‏‏‎‏‎‎‎‏‎‏‎‎‎‎‏‏‎‎‎‎‎‏‎‏‎‎‎‏‎‎‏‏‎<xliff:g id="IME_NAME">%1$s</xliff:g>‎‏‎‎‏‏‏‎ settings‎‏‎‎‏‎"</string>
+    <string name="input_methods_and_subtype_enabler_title" msgid="4421813273170250462">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‏‏‎‏‎‏‎‏‏‏‎‏‎‏‏‎‏‏‏‏‏‎‏‏‏‏‏‎‏‎‎‎‎‎‏‎‎‏‏‎‏‎‏‏‏‎‎‎‏‎‏‎‏‏‎‏‏‏‏‎‎Choose active input methods‎‏‎‎‏‎"</string>
+    <string name="onscreen_keyboard_settings_summary" msgid="5841558383556238653">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‎‎‎‏‎‎‎‏‎‎‎‏‎‏‏‎‎‎‏‎‎‏‏‎‎‏‏‎‎‏‏‎‎‎‏‎‏‎‎‏‎‎‏‏‎‎‎‏‏‏‎‏‎‎‏‏‏‏‎‏‎Onscreen keyboard settings‎‏‎‎‏‎"</string>
+    <string name="builtin_keyboard_settings_title" msgid="7688732909551116798">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‏‎‏‎‏‎‏‏‎‎‏‏‏‏‎‏‏‏‎‏‏‏‎‏‏‎‎‎‎‎‏‏‎‏‏‎‏‎‏‎‎‏‏‎‎‏‏‎‎‎‎‏‏‏‏‏‏‏‏‎‎Physical keyboard‎‏‎‎‏‎"</string>
+    <string name="builtin_keyboard_settings_summary" msgid="2392531685358035899">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‎‎‎‏‎‎‏‏‎‎‏‏‏‏‏‏‏‎‏‎‏‏‏‎‎‏‎‎‎‏‎‎‎‎‏‏‏‎‏‎‎‎‎‏‏‏‏‎‎‎‏‏‏‎‏‏‏‎‏‏‎Physical keyboard settings‎‏‎‎‏‎"</string>
+    <string name="gadget_picker_title" msgid="98374951396755811">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‎‎‏‏‎‏‎‏‏‏‎‏‎‏‏‏‏‏‏‏‎‏‏‏‏‏‏‏‎‏‎‎‎‎‎‎‏‏‎‎‏‏‎‎‏‏‎‎‏‎‎‏‎‏‏‎‎‎‏‏‎Choose gadget‎‏‎‎‏‎"</string>
+    <string name="widget_picker_title" msgid="9130684134213467557">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‏‏‏‎‏‎‏‏‎‏‏‎‏‎‏‏‎‏‎‎‏‏‎‏‎‏‏‏‏‏‏‏‏‎‎‎‎‎‎‏‎‏‏‎‏‎‏‏‏‏‎‏‏‎‏‎‎‏‎‏‎Choose widget‎‏‎‎‏‎"</string>
+    <string name="allow_bind_app_widget_activity_allow_bind_title" msgid="2538303018392590627">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‎‎‏‏‎‎‏‏‏‎‎‏‏‏‎‏‏‏‎‏‎‎‏‎‎‏‎‏‏‎‎‎‏‏‏‏‏‎‎‏‎‏‏‏‏‎‎‏‏‎‎‏‎‎‏‎‎‎‏‏‎Create widget and allow access?‎‏‎‎‏‎"</string>
+    <string name="allow_bind_app_widget_activity_allow_bind" msgid="1584388129273282080">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‎‏‎‏‏‏‏‏‏‏‎‎‏‏‏‎‎‎‎‎‏‎‎‏‏‎‏‏‏‏‏‎‏‏‏‏‏‎‏‎‏‏‎‏‏‏‏‏‏‏‏‎‎‎‏‎‎‎‎‎‎After you create the widget, ‎‏‎‎‏‏‎<xliff:g id="WIDGET_HOST_NAME">%1$s</xliff:g>‎‏‎‎‏‏‏‎ can access all data it displays.‎‏‎‎‏‎"</string>
+    <string name="allow_bind_app_widget_activity_always_allow_bind" msgid="7037503685859688034">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‎‎‎‏‏‎‏‎‏‎‏‎‎‎‏‏‏‏‎‎‎‏‎‏‎‎‎‎‏‏‏‎‎‏‎‏‎‎‏‎‏‎‏‏‎‎‏‏‏‏‏‎‎‏‏‎‎‎‏‎‎Always allow ‎‏‎‎‏‏‎<xliff:g id="WIDGET_HOST_NAME">%1$s</xliff:g>‎‏‎‎‏‏‏‎ to create widgets and access their data‎‏‎‎‏‎"</string>
+    <string name="usage_stats_label" msgid="5890846333487083609">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‎‎‎‏‏‏‎‎‎‎‎‎‎‏‏‏‏‏‎‏‏‎‎‎‎‏‏‏‎‏‏‏‏‏‎‏‏‏‏‎‏‎‎‎‏‏‏‏‎‎‎‎‎‏‎‏‏‎‎‏‎Usage statistics‎‏‎‎‏‎"</string>
+    <string name="testing_usage_stats" msgid="7823048598893937339">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‏‏‎‎‏‎‎‏‎‎‎‏‎‎‎‎‏‏‎‏‎‏‎‎‎‎‎‎‏‎‎‏‏‏‎‏‏‎‏‏‎‎‎‎‏‏‎‎‎‎‏‎‏‎‏‏‏‎‏‏‎Usage statistics‎‏‎‎‏‎"</string>
+    <string name="display_order_text" msgid="8592776965827565271">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‎‏‏‏‎‎‏‏‏‏‏‏‏‎‏‎‏‏‎‏‎‎‎‏‏‏‏‏‏‎‏‏‏‎‏‎‎‏‎‎‏‏‏‏‏‎‎‏‎‏‏‎‏‏‎‏‎‏‏‏‎Sort by:‎‏‎‎‏‎"</string>
+    <string name="app_name_label" msgid="5440362857006046193">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‏‎‏‏‏‎‎‎‎‎‎‎‎‎‎‎‏‏‎‏‎‎‏‏‎‎‎‏‏‎‏‏‎‏‎‏‎‎‎‏‎‎‏‏‎‎‎‏‏‎‏‏‏‏‏‏‎‎‎‏‎App‎‏‎‎‏‎"</string>
+    <string name="last_time_used_label" msgid="8459441968795479307">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‎‏‎‏‎‏‏‎‎‏‎‏‏‏‏‏‏‎‎‏‏‎‏‎‎‏‏‎‏‎‎‎‏‏‎‎‎‎‎‏‎‏‎‏‏‏‏‎‏‏‎‏‎‎‎‎‏‎‏‏‎Last time used‎‏‎‎‏‎"</string>
+    <string name="usage_time_label" msgid="295954901452833058">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‎‏‏‏‎‎‎‎‎‏‏‎‏‏‎‏‏‏‎‎‎‏‎‏‏‎‏‎‏‎‎‎‏‏‎‎‏‎‏‎‏‎‎‎‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‎Usage time‎‏‎‎‏‎"</string>
+    <string name="accessibility_settings" msgid="3975902491934816215">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‎‏‏‏‎‎‏‎‏‏‎‏‎‎‏‏‏‏‏‎‎‏‎‎‎‎‎‎‎‏‎‎‏‏‎‏‎‏‎‏‏‏‎‏‎‏‏‏‎‏‏‏‏‏‎‏‎‏‏‏‎Accessibility‎‏‎‎‏‎"</string>
+    <string name="accessibility_settings_title" msgid="2130492524656204459">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‏‏‎‏‏‎‎‏‎‎‎‏‎‎‎‎‎‏‏‏‏‎‏‎‏‎‎‏‏‏‎‏‎‎‎‎‏‏‎‎‎‎‏‎‎‎‎‏‏‎‏‎‏‎‏‎‏‎‏‏‎Accessibility settings‎‏‎‎‏‎"</string>
+    <string name="accessibility_settings_summary" msgid="981260486011624939">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‎‏‏‎‏‏‎‎‏‏‏‏‎‎‎‏‎‎‎‏‏‎‎‏‏‎‏‏‎‏‎‎‎‏‏‎‎‏‏‎‏‏‎‎‏‏‎‎‏‏‏‎‏‏‏‏‎‏‎‏‏‎Screen readers, display, interaction controls‎‏‎‎‏‎"</string>
+    <string name="vision_settings_title" msgid="4204111425716868288">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‏‎‏‎‎‏‎‏‏‎‎‎‎‎‎‎‎‎‎‏‎‎‎‏‎‎‎‏‎‎‏‏‏‏‏‎‎‎‎‎‎‎‏‏‏‏‎‏‎‏‎‎‏‏‎‎‎‎‎‎‎Vision Settings‎‏‎‎‏‎"</string>
+    <string name="vision_settings_description" msgid="5679491180156408260">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‏‏‏‎‏‏‎‏‎‎‎‏‏‎‎‏‏‎‏‏‎‎‏‎‎‎‏‏‎‎‎‏‏‎‏‎‎‎‏‎‏‏‏‏‏‏‎‏‎‎‎‏‏‏‎‎‎‏‎‎‎You can customize this device to fit your needs. These accessibility features can be changed later in Settings.‎‏‎‎‏‎"</string>
+    <string name="vision_settings_suggestion_title" msgid="8058794060304707004">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‏‏‏‏‏‏‎‏‎‏‏‎‏‎‎‏‎‏‏‎‏‎‎‎‎‎‎‎‎‎‏‎‎‎‏‎‎‏‏‏‏‏‎‏‎‏‏‎‏‏‎‏‏‎‏‏‏‏‎‎‎Change font size‎‏‎‎‏‎"</string>
+    <string name="screen_reader_category_title" msgid="7739154903913400641">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‏‎‏‏‎‏‏‎‎‏‏‏‎‎‎‎‎‎‎‎‎‏‏‎‎‎‎‏‏‎‎‏‏‏‎‏‎‏‏‏‏‎‏‏‎‎‎‎‏‎‎‏‎‏‎‎‎‎‎‏‎Screen readers‎‏‎‎‏‎"</string>
+    <string name="audio_and_captions_category_title" msgid="3420727114421447524">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‏‏‏‏‎‏‏‏‏‎‎‎‏‏‎‏‏‏‎‏‎‎‏‎‏‏‏‏‏‏‎‏‎‎‎‎‏‎‏‎‎‎‏‏‎‎‏‎‏‎‏‏‎‏‏‎‎‏‎‎‎Audio &amp; on-screen text‎‏‎‎‏‎"</string>
+    <string name="display_category_title" msgid="685461049938269166">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‎‏‎‎‏‏‎‎‎‎‎‏‏‎‎‏‏‏‏‏‏‎‎‏‏‎‎‎‏‎‏‏‏‎‏‎‎‏‏‏‎‏‏‏‏‏‏‎‏‎‎‏‏‏‏‏‎‏‏‏‎‎Display‎‏‎‎‏‎"</string>
+    <string name="interaction_control_category_title" msgid="7836591031872839151">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‏‏‎‎‏‏‎‎‎‎‎‏‎‎‏‎‏‎‏‎‎‎‎‎‎‏‏‎‎‎‎‎‎‎‎‎‏‏‎‎‏‎‏‎‏‏‎‏‏‏‎‏‏‏‏‎‏‏‏‏‎Interaction controls‎‏‎‎‏‎"</string>
+    <string name="user_installed_services_category_title" msgid="6426376488922158647">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‏‎‎‏‎‎‏‎‏‏‏‏‎‎‎‏‎‎‏‏‎‏‎‏‏‏‏‎‎‏‎‎‎‏‏‏‎‎‏‎‎‎‎‎‏‎‎‏‎‏‏‎‎‎‏‏‎‏‏‏‎Downloaded services‎‏‎‎‏‎"</string>
+    <string name="experimental_category_title" msgid="5272318666666893547">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‏‎‎‏‎‎‏‎‏‎‏‏‎‎‎‎‏‎‎‏‏‏‏‎‎‏‎‎‏‎‏‏‎‏‎‏‎‏‎‏‎‏‏‏‎‏‏‎‎‎‎‎‏‏‏‎‏‎‏‏‎Experimental‎‏‎‎‏‎"</string>
+    <string name="talkback_title" msgid="7912059827205988080">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‏‏‎‏‏‏‎‎‏‏‎‏‎‏‎‎‏‎‎‎‎‏‏‏‏‏‏‎‎‎‏‏‎‎‏‎‎‏‎‎‎‎‎‎‎‏‎‏‏‏‏‎‏‏‏‏‎‎‎‎‎Talkback‎‏‎‎‏‎"</string>
+    <string name="talkback_summary" msgid="8331244650729024963">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‎‎‏‏‏‎‎‏‏‏‏‎‏‎‎‎‎‏‏‎‏‏‎‏‏‏‏‎‎‏‏‏‎‏‏‏‏‎‎‏‎‎‏‏‏‎‏‎‏‏‎‏‏‏‎‎‎‎‏‏‎Screen reader primarily for people with blindness and low vision‎‏‎‎‏‎"</string>
+    <string name="select_to_speak_summary" msgid="4282846695497544515">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‏‎‏‏‎‏‏‎‏‏‏‏‏‎‏‏‏‎‏‎‎‏‏‎‎‎‎‎‏‏‎‎‏‎‎‎‏‎‎‏‎‏‏‎‎‎‏‏‎‎‏‏‎‏‎‎‎‎‏‏‎Tap items on your screen to hear them read aloud‎‏‎‎‏‎"</string>
+    <string name="accessibility_captioning_title" msgid="7589266662024836291">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‏‎‎‏‎‏‎‏‎‎‏‎‎‏‏‏‏‏‎‏‏‏‎‏‎‎‎‏‏‏‎‎‎‏‏‏‏‎‏‏‎‏‎‎‎‏‏‏‎‏‎‎‏‏‎‎‎‎‏‏‎Captions‎‏‎‎‏‎"</string>
+    <string name="accessibility_screen_magnification_title" msgid="6001128808776506021">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‎‎‏‏‎‏‎‎‏‎‎‎‎‏‎‎‏‎‏‎‏‏‎‏‏‎‏‏‎‎‏‏‎‎‏‎‎‏‏‏‏‏‎‎‏‎‎‏‏‎‏‎‏‎‏‎‎‏‎‏‎Magnification‎‏‎‎‏‎"</string>
+    <string name="accessibility_screen_magnification_gestures_title" msgid="3719929521571489913">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‎‎‏‏‏‎‎‏‏‏‏‏‏‏‎‏‏‎‎‎‎‎‏‏‎‎‎‎‏‏‎‏‏‎‏‎‏‏‎‎‎‎‎‏‏‏‏‎‏‎‎‎‎‏‏‏‏‎‎‏‎Magnify with triple-tap‎‏‎‎‏‎"</string>
+    <string name="accessibility_screen_magnification_navbar_title" msgid="7141753038957538230">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‎‎‏‏‎‎‎‏‏‏‎‎‏‎‎‏‏‎‏‎‏‎‎‎‏‏‎‎‏‏‏‎‎‎‎‎‏‎‏‎‎‎‎‏‎‏‏‎‏‎‏‏‏‎‏‏‎‏‏‎‎Magnify with button‎‏‎‎‏‎"</string>
+    <string name="accessibility_screen_magnification_state_navbar_gesture" msgid="2760906043221923793">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‎‏‏‎‎‏‎‏‎‎‎‎‏‎‏‏‎‏‎‏‎‏‏‎‏‎‏‏‎‎‎‏‏‏‎‎‎‏‏‏‏‎‎‎‏‏‎‏‎‏‏‏‏‏‎‏‎‎‎‏‎Magnify with button &amp; triple-tap‎‏‎‎‏‎"</string>
+    <string name="accessibility_preference_magnification_summary" msgid="5867883657521404509">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‎‎‎‏‎‏‏‎‏‏‏‎‏‏‏‎‏‎‎‏‎‎‎‏‏‎‎‎‏‏‎‏‏‏‎‏‏‏‏‎‎‎‏‎‎‎‎‏‏‎‏‎‎‏‎‏‏‏‎‏‎Zoom in on screen‎‏‎‎‏‎"</string>
+    <string name="accessibility_screen_magnification_short_summary" msgid="3411979839172752057">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‏‏‏‏‎‏‎‏‏‎‎‏‏‏‎‎‏‎‎‏‏‎‎‏‎‏‏‎‎‎‎‏‎‏‏‎‏‎‏‎‏‏‏‏‏‎‏‏‎‎‏‎‏‎‏‏‏‎‎‏‎Tap 3 times to zoom‎‏‎‎‏‎"</string>
+    <string name="accessibility_screen_magnification_navbar_short_summary" msgid="3693116360267980492">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‎‎‏‏‎‏‎‎‎‎‎‎‏‎‎‏‎‏‎‏‏‏‎‎‎‎‏‏‎‎‏‏‏‏‏‏‏‏‏‏‎‏‎‎‏‏‎‏‏‏‏‎‏‏‎‎‏‏‎‎‎Tap a button to zoom‎‏‎‎‏‎"</string>
+    <string name="accessibility_screen_magnification_summary" msgid="5258868553337478505">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‏‎‎‎‏‏‏‏‏‎‏‏‎‏‎‎‎‎‎‏‎‎‎‏‎‏‏‎‎‎‏‎‏‎‏‎‎‎‏‎‎‏‏‏‎‎‎‏‏‏‎‏‎‏‏‎‏‎‎‏‎‎‏‎‎‏‏‎"<b>"‎‏‎‎‏‏‏‎To zoom‎‏‎‎‏‏‎"</b>"‎‏‎‎‏‏‏‎, quickly tap the screen 3 times.‎‏‎‎‏‏‎\n‎‏‎‎‏‏‏‎‎‏‎‎‏‏‎"<ul>"‎‏‎‎‏‏‏‎‎‏‎‎‏‏‎"<li>"‎‏‎‎‏‏‏‎Drag 2 or more fingers to scroll‎‏‎‎‏‏‎"</li>"‎‏‎‎‏‏‏‎‎‏‎‎‏‏‎\n‎‏‎‎‏‏‏‎‎‏‎‎‏‏‎"<li>"‎‏‎‎‏‏‏‎Pinch 2 or more fingers to adjust zoom‎‏‎‎‏‏‎"</li>"‎‏‎‎‏‏‏‎‎‏‎‎‏‏‎"</ul>"‎‏‎‎‏‏‏‎‎‏‎‎‏‏‎\n‎‏‎‎‏‏‏‎‎‏‎‎‏‏‎\n‎‏‎‎‏‏‏‎‎‏‎‎‏‏‎"<b>"‎‏‎‎‏‏‏‎To zoom temporarily‎‏‎‎‏‏‎"</b>"‎‏‎‎‏‏‏‎, quickly tap the screen 3 times and hold down your finger on the third tap.‎‏‎‎‏‏‎\n‎‏‎‎‏‏‏‎‎‏‎‎‏‏‎"<ul>"‎‏‎‎‏‏‏‎‎‏‎‎‏‏‎"<li>"‎‏‎‎‏‏‏‎Drag to move around the screen‎‏‎‎‏‏‎"</li>"‎‏‎‎‏‏‏‎‎‏‎‎‏‏‎\n‎‏‎‎‏‏‏‎‎‏‎‎‏‏‎"<li>"‎‏‎‎‏‏‏‎Lift finger to zoom out‎‏‎‎‏‏‎"</li>"‎‏‎‎‏‏‏‎‎‏‎‎‏‏‎"</ul>"‎‏‎‎‏‏‏‎‎‏‎‎‏‏‎\n‎‏‎‎‏‏‏‎‎‏‎‎‏‏‎\n‎‏‎‎‏‏‏‎You can\'t zoom in on the keyboard and navigation bar.‎‏‎‎‏‎"</string>
+    <string name="accessibility_screen_magnification_navbar_summary" msgid="1996584694050087161">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‏‎‏‏‏‎‏‏‎‏‎‏‎‏‎‎‏‎‏‏‎‎‏‏‎‎‏‏‎‏‏‎‏‏‎‎‏‏‎‏‎‏‏‎‎‏‏‎‎‎‎‎‏‏‏‏‏‎‎‏‎When magnification is turned on, use the Accessibility button at the bottom of the screen to quickly magnify.‎‏‎‎‏‏‎\n‎‏‎‎‏‏‏‎‎‏‎‎‏‏‎\n‎‏‎‎‏‏‏‎‎‏‎‎‏‏‎"<b>"‎‏‎‎‏‏‏‎To zoom‎‏‎‎‏‏‎"</b>"‎‏‎‎‏‏‏‎, tap the Accessibility button, then tap anywhere on the screen.‎‏‎‎‏‏‎\n‎‏‎‎‏‏‏‎‎‏‎‎‏‏‎"<ul>"‎‏‎‎‏‏‏‎‎‏‎‎‏‏‎"<li>"‎‏‎‎‏‏‏‎Drag 2 or more fingers to scroll‎‏‎‎‏‏‎"</li>"‎‏‎‎‏‏‏‎‎‏‎‎‏‏‎\n‎‏‎‎‏‏‏‎‎‏‎‎‏‏‎"<li>"‎‏‎‎‏‏‏‎Pinch 2 or more fingers to adjust zoom‎‏‎‎‏‏‎"</li>"‎‏‎‎‏‏‏‎‎‏‎‎‏‏‎"</ul>"‎‏‎‎‏‏‏‎‎‏‎‎‏‏‎\n‎‏‎‎‏‏‏‎‎‏‎‎‏‏‎\n‎‏‎‎‏‏‏‎‎‏‎‎‏‏‎"<b>"‎‏‎‎‏‏‏‎To zoom temporarily‎‏‎‎‏‏‎"</b>"‎‏‎‎‏‏‏‎, tap the Accessibility button, then touch &amp; hold anywhere on the screen.‎‏‎‎‏‏‎\n‎‏‎‎‏‏‏‎‎‏‎‎‏‏‎"<ul>"‎‏‎‎‏‏‏‎‎‏‎‎‏‏‎"<li>"‎‏‎‎‏‏‏‎Drag to move around the screen‎‏‎‎‏‏‎"</li>"‎‏‎‎‏‏‏‎‎‏‎‎‏‏‎\n‎‏‎‎‏‏‏‎‎‏‎‎‏‏‎"<li>"‎‏‎‎‏‏‏‎Lift finger to zoom out‎‏‎‎‏‏‎"</li>"‎‏‎‎‏‏‏‎‎‏‎‎‏‏‎"</ul>"‎‏‎‎‏‏‏‎‎‏‎‎‏‏‎\n‎‏‎‎‏‏‏‎‎‏‎‎‏‏‎\n‎‏‎‎‏‏‏‎You can’t zoom in on the keyboard or navigation bar.‎‏‎‎‏‎"</string>
+    <string name="accessibility_screen_magnification_navbar_configuration_warning" msgid="70533120652758190">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‎‎‎‏‏‏‏‏‎‏‎‏‎‎‏‎‏‎‏‎‏‏‏‏‏‏‏‏‏‏‎‎‎‎‏‎‏‏‎‏‎‎‎‎‏‎‎‏‏‎‎‏‎‏‎‏‏‏‎‎The Accessibility button is set to ‎‏‎‎‏‏‎<xliff:g id="SERVICE">%1$s</xliff:g>‎‏‎‎‏‏‏‎. To use magnification, touch &amp; hold the Accessibility button, then select magnification.‎‏‎‎‏‎"</string>
+    <string name="accessibility_global_gesture_preference_title" msgid="2048884356166982714">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‏‏‎‎‎‏‏‎‏‏‏‏‎‎‎‏‏‎‎‏‎‏‏‏‎‏‏‏‎‏‏‎‏‎‏‏‎‎‏‏‎‎‎‎‎‎‎‏‏‏‎‎‎‎‏‏‏‎‏‎‎Volume key shortcut‎‏‎‎‏‎"</string>
+    <string name="accessibility_shortcut_service_title" msgid="4779360749706905640">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‎‎‏‎‎‏‎‏‎‎‏‏‏‎‏‏‎‎‏‏‎‏‎‎‎‏‏‏‏‎‎‏‏‎‏‏‏‎‏‏‏‎‎‏‏‎‎‎‏‎‎‎‎‎‏‎‏‎‎‎‎Shortcut service‎‏‎‎‏‎"</string>
+    <string name="accessibility_shortcut_service_on_lock_screen_title" msgid="5490636079625489534">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‏‏‎‎‎‎‏‏‎‎‏‎‏‎‏‎‏‎‎‎‎‏‏‎‏‏‎‎‎‏‏‏‏‏‎‏‎‎‎‎‎‏‎‏‎‏‎‎‏‏‎‎‎‏‏‏‏‏‏‎‎Allow from lock screen‎‏‎‎‏‎"</string>
+    <string name="accessibility_shortcut_description" msgid="1765853731190717372">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‏‎‎‎‏‎‎‎‎‎‎‏‏‎‎‏‎‎‏‎‏‎‎‏‏‏‎‎‏‏‎‏‎‏‎‎‏‏‏‎‏‎‏‏‏‎‏‏‏‎‏‏‏‎‏‏‏‏‎‎‎When the shortcut is on, you can press both volume keys for 3 seconds to start an accessibility feature.‎‏‎‎‏‎"</string>
+    <string name="accessibility_toggle_high_text_contrast_preference_title" msgid="2567402942683463779">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‎‎‏‏‏‎‏‎‎‎‎‏‎‎‏‏‏‏‏‏‎‏‎‏‏‏‏‏‏‎‏‎‏‎‎‏‏‏‏‏‎‎‎‎‏‏‎‎‎‎‎‎‎‏‏‎‎‎‏‏‎High contrast text‎‏‎‎‏‎"</string>
+    <string name="accessibility_toggle_screen_magnification_auto_update_preference_title" msgid="7218498768415430963">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‎‏‎‎‎‎‏‎‏‏‎‏‎‏‎‎‎‎‏‎‎‏‏‎‎‎‏‎‎‏‏‏‎‏‏‎‏‏‏‏‏‏‏‏‎‎‎‏‏‎‎‏‎‎‏‏‎‎‏‏‎Auto update screen magnification‎‏‎‎‏‎"</string>
+    <string name="accessibility_toggle_screen_magnification_auto_update_preference_summary" msgid="4392059334816220155">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‏‏‎‎‏‏‏‏‎‎‏‏‏‎‏‏‏‎‏‎‏‎‏‏‎‎‎‏‏‏‏‎‎‏‎‎‎‎‏‎‏‎‎‎‏‏‎‎‎‎‏‏‏‏‏‏‏‎‏‏‎Update screen magnification on app transitions‎‏‎‎‏‎"</string>
+    <string name="accessibility_power_button_ends_call_prerefence_title" msgid="6673851944175874235">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‏‏‎‎‏‎‎‏‏‏‏‎‎‏‎‎‏‎‎‎‏‏‏‏‏‎‏‏‏‏‎‏‎‎‎‎‎‎‏‎‎‏‏‏‎‎‏‏‎‎‎‎‏‎‏‏‏‎‏‏‎Power button ends call‎‏‎‎‏‎"</string>
+    <string name="accessibility_toggle_large_pointer_icon_title" msgid="535173100516295580">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‎‏‏‏‏‏‎‏‏‎‏‏‎‏‎‏‎‏‎‎‎‏‎‎‎‏‏‎‎‏‎‏‏‏‎‏‎‏‏‎‎‏‏‏‏‎‎‏‎‎‎‎‏‏‏‎‎‏‏‏‎‎‎Large mouse pointer‎‏‎‎‏‎"</string>
+    <string name="accessibility_toggle_master_mono_title" msgid="4363806997971905302">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‏‏‎‎‏‎‎‎‏‏‏‏‎‏‎‏‏‎‏‏‎‏‎‏‏‎‎‎‎‎‎‏‏‏‏‎‎‏‏‏‏‎‏‎‏‎‏‎‏‎‏‏‎‎‎‏‎‏‏‎‎Mono audio‎‏‎‎‏‎"</string>
+    <string name="accessibility_toggle_master_mono_summary" msgid="5634277025251530927">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‏‏‏‎‎‎‏‏‎‎‎‎‏‏‏‏‏‎‎‏‎‎‎‏‏‎‏‎‎‏‎‏‎‎‎‎‎‏‎‎‎‎‏‏‎‎‎‏‏‎‎‎‏‎‏‎‏‏‏‏‎Combine channels when playing audio‎‏‎‎‏‎"</string>
+    <string name="accessibility_long_press_timeout_preference_title" msgid="6708467774619266508">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‏‏‎‏‎‎‎‏‏‎‎‏‎‏‎‎‎‎‏‏‏‏‏‎‎‏‎‏‏‏‏‎‎‏‎‏‎‏‎‏‎‏‏‎‎‎‏‎‏‏‎‏‏‏‎‎‏‏‎‎‎Touch &amp; hold delay‎‏‎‎‏‎"</string>
+    <string name="accessibility_display_inversion_preference_title" msgid="2119647786141420802">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‏‏‎‏‎‏‏‎‏‎‏‎‏‎‎‎‎‎‎‎‎‏‏‎‏‏‏‎‎‏‎‏‏‏‎‏‏‏‏‎‎‏‏‏‎‎‎‎‏‏‎‏‎‎‎‎‎‎‏‎‎Color inversion‎‏‎‎‏‎"</string>
+    <string name="accessibility_display_inversion_preference_subtitle" msgid="7052959202195368109">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‎‎‎‏‏‏‏‎‎‎‎‏‎‎‏‎‎‏‎‏‎‎‎‎‎‏‏‎‏‎‏‏‎‏‏‎‎‎‏‎‏‏‎‏‎‏‏‎‏‎‎‎‏‎‏‎‏‏‎‏‎May affect performance‎‏‎‎‏‎"</string>
+    <string name="accessibility_autoclick_preference_title" msgid="7014499339068449623">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‎‎‎‏‎‏‎‏‏‎‎‎‏‎‎‎‎‎‎‏‏‏‏‏‏‏‎‎‎‎‎‎‎‏‏‎‎‏‏‎‎‎‏‏‎‎‏‎‎‎‏‏‎‏‎‏‎‏‏‏‎Click after pointer stops moving‎‏‎‎‏‎"</string>
+    <string name="accessibility_autoclick_delay_preference_title" msgid="3962261178385106006">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‎‏‏‎‏‏‏‏‏‏‎‎‏‏‎‎‎‏‏‏‏‎‎‎‏‏‎‎‎‏‏‏‏‏‎‎‏‏‏‏‎‏‏‏‎‎‎‎‎‏‎‎‎‏‎‏‎‏‏‎‎Delay before click‎‏‎‎‏‎"</string>
+    <string name="accessibility_summary_state_enabled" msgid="8359913912320966304">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‎‏‎‎‎‎‎‎‎‏‎‎‎‏‏‎‎‎‎‏‎‏‏‎‏‎‎‏‎‎‎‏‏‎‎‎‏‎‏‏‏‏‎‎‏‎‏‏‏‏‏‎‏‎‏‎‎‎‎‎‎ON‎‏‎‎‏‎"</string>
+    <string name="accessibility_summary_state_disabled" msgid="2241315620132005595">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‏‏‏‏‎‎‎‏‏‎‏‎‏‏‎‎‎‎‎‎‏‎‏‎‏‏‏‎‎‏‏‏‎‏‏‏‏‎‎‎‎‎‎‎‏‎‏‎‎‏‏‎‏‏‎‏‏‎‏‏‎OFF‎‏‎‎‏‎"</string>
+    <string name="enable_quick_setting" msgid="2366999897816894536">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‎‎‎‎‏‏‎‏‏‎‎‏‎‏‎‎‎‏‎‏‏‏‎‏‏‏‎‏‏‎‏‏‏‏‎‎‏‏‎‎‎‎‏‏‎‎‎‎‏‏‎‎‎‏‎‎‏‎‎‎‎Show in Quick Settings‎‏‎‎‏‎"</string>
+    <string name="daltonizer_type" msgid="1124178250809091080">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‎‏‏‏‏‏‎‎‏‏‎‎‏‏‏‏‎‎‎‏‎‎‎‏‎‏‎‎‏‏‎‏‏‎‏‏‏‏‎‏‏‎‎‏‎‎‎‏‎‎‏‎‎‎‎‎‎‏‎‎‎‎Correction mode‎‏‎‎‏‎"</string>
+    <plurals name="accessibilty_autoclick_preference_subtitle_extremely_short_delay" formatted="false" msgid="7340347830562315800">
+      <item quantity="other">‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‎‏‎‏‏‏‎‏‏‏‏‎‎‎‏‎‎‏‏‏‎‏‏‏‎‏‏‎‎‎‎‎‏‎‎‎‎‏‏‏‏‎‎‏‏‏‎‏‏‏‏‎‎‎‎‏‏‎‎‎‎Extremely short delay (‎‏‎‎‏‏‎<xliff:g id="CLICK_DELAY_LABEL_1">%1$d</xliff:g>‎‏‎‎‏‏‏‎ ms)‎‏‎‎‏‎</item>
+      <item quantity="one">‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‎‏‎‏‏‏‎‏‏‏‏‎‎‎‏‎‎‏‏‏‎‏‏‏‎‏‏‎‎‎‎‎‏‎‎‎‎‏‏‏‏‎‎‏‏‏‎‏‏‏‏‎‎‎‎‏‏‎‎‎‎Extremely short delay (‎‏‎‎‏‏‎<xliff:g id="CLICK_DELAY_LABEL_0">%1$d</xliff:g>‎‏‎‎‏‏‏‎ ms)‎‏‎‎‏‎</item>
+    </plurals>
+    <plurals name="accessibilty_autoclick_preference_subtitle_very_short_delay" formatted="false" msgid="5589565607652364932">
+      <item quantity="other">‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‏‏‎‏‏‎‎‏‎‎‏‎‎‎‏‎‎‎‎‎‎‏‎‎‏‏‏‎‎‎‏‎‏‏‎‎‏‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‏‎‎‎‎‏‎‎‎Very short delay (‎‏‎‎‏‏‎<xliff:g id="CLICK_DELAY_LABEL_1">%1$d</xliff:g>‎‏‎‎‏‏‏‎ ms)‎‏‎‎‏‎</item>
+      <item quantity="one">‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‏‏‎‏‏‎‎‏‎‎‏‎‎‎‏‎‎‎‎‎‎‏‎‎‏‏‏‎‎‎‏‎‏‏‎‎‏‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‏‎‎‎‎‏‎‎‎Very short delay (‎‏‎‎‏‏‎<xliff:g id="CLICK_DELAY_LABEL_0">%1$d</xliff:g>‎‏‎‎‏‏‏‎ ms)‎‏‎‎‏‎</item>
+    </plurals>
+    <plurals name="accessibilty_autoclick_preference_subtitle_short_delay" formatted="false" msgid="5887754135102768400">
+      <item quantity="other">‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‎‎‎‏‏‎‏‏‎‏‎‏‏‎‎‎‎‎‎‏‎‎‏‏‎‎‎‎‏‏‏‏‎‎‏‏‏‎‏‎‎‎‏‏‎‏‎‎‎‏‎‏‎‎‎‏‎‎‎‎‎Short delay (‎‏‎‎‏‏‎<xliff:g id="CLICK_DELAY_LABEL_1">%1$d</xliff:g>‎‏‎‎‏‏‏‎ ms)‎‏‎‎‏‎</item>
+      <item quantity="one">‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‎‎‎‏‏‎‏‏‎‏‎‏‏‎‎‎‎‎‎‏‎‎‏‏‎‎‎‎‏‏‏‏‎‎‏‏‏‎‏‎‎‎‏‏‎‏‎‎‎‏‎‏‎‎‎‏‎‎‎‎‎Short delay (‎‏‎‎‏‏‎<xliff:g id="CLICK_DELAY_LABEL_0">%1$d</xliff:g>‎‏‎‎‏‏‏‎ ms)‎‏‎‎‏‎</item>
+    </plurals>
+    <plurals name="accessibilty_autoclick_preference_subtitle_long_delay" formatted="false" msgid="6340683412750219405">
+      <item quantity="other">‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‎‏‏‏‏‏‏‏‏‏‏‎‏‎‏‎‎‎‎‏‏‏‏‏‏‎‎‎‎‎‏‏‎‎‏‎‎‎‏‏‎‎‎‎‎‎‏‏‏‎‎‎‏‎‎‎‏‏‎‏‎Long delay (‎‏‎‎‏‏‎<xliff:g id="CLICK_DELAY_LABEL_1">%1$d</xliff:g>‎‏‎‎‏‏‏‎ ms)‎‏‎‎‏‎</item>
+      <item quantity="one">‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‎‏‏‏‏‏‏‏‏‏‏‎‏‎‏‎‎‎‎‏‏‏‏‏‏‎‎‎‎‎‏‏‎‎‏‎‎‎‏‏‎‎‎‎‎‎‏‏‏‎‎‎‏‎‎‎‏‏‎‏‎Long delay (‎‏‎‎‏‏‎<xliff:g id="CLICK_DELAY_LABEL_0">%1$d</xliff:g>‎‏‎‎‏‏‏‎ ms)‎‏‎‎‏‎</item>
+    </plurals>
+    <plurals name="accessibilty_autoclick_preference_subtitle_very_long_delay" formatted="false" msgid="3503199424330634970">
+      <item quantity="other">‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‎‎‎‎‏‎‎‏‏‏‎‏‏‏‎‏‏‏‎‏‎‏‎‏‎‎‎‎‏‏‎‏‎‎‎‎‏‎‎‏‎‏‎‎‏‎‎‏‎‏‏‎‏‏‎‏‏‎‏‎‎Very long delay (‎‏‎‎‏‏‎<xliff:g id="CLICK_DELAY_LABEL_1">%1$d</xliff:g>‎‏‎‎‏‏‏‎ ms)‎‏‎‎‏‎</item>
+      <item quantity="one">‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‎‎‎‎‏‎‎‏‏‏‎‏‏‏‎‏‏‏‎‏‎‏‎‏‎‎‎‎‏‏‎‏‎‎‎‎‏‎‎‏‎‏‎‎‏‎‎‏‎‏‏‎‏‏‎‏‏‎‏‎‎Very long delay (‎‏‎‎‏‏‎<xliff:g id="CLICK_DELAY_LABEL_0">%1$d</xliff:g>‎‏‎‎‏‏‏‎ ms)‎‏‎‎‏‎</item>
+    </plurals>
+    <string name="accessibility_menu_item_settings" msgid="3344942964710773365">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‏‏‏‎‎‏‏‎‏‎‏‏‏‎‎‏‏‏‏‏‏‏‏‎‎‏‏‏‎‏‏‏‎‏‎‏‏‎‎‎‎‏‏‏‎‎‎‏‎‎‏‎‎‏‏‏‎‏‎‏‎Settings‎‏‎‎‏‎"</string>
+    <string name="accessibility_feature_state_on" msgid="2864292320042673806">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‎‏‏‏‏‏‎‎‎‎‎‎‎‎‎‎‎‎‏‎‏‎‏‏‎‎‎‎‎‏‏‏‏‏‎‏‎‎‎‎‎‏‎‏‏‏‏‎‎‏‏‎‏‎‎‎‏‏‏‎‎On‎‏‎‎‏‎"</string>
+    <string name="accessibility_feature_state_off" msgid="4172584906487070211">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‏‎‎‏‏‏‏‎‎‏‏‏‏‏‏‏‏‏‏‏‏‏‎‏‏‏‎‏‎‏‏‏‏‎‏‎‎‏‎‏‎‎‎‏‎‏‏‏‏‏‏‎‎‎‎‎‎‎‏‏‎Off‎‏‎‎‏‎"</string>
+    <string name="captioning_preview_title" msgid="1234015253497016890">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‎‎‎‏‎‎‏‎‎‎‎‎‎‎‎‏‏‎‏‎‎‏‎‏‎‏‎‏‏‏‎‎‎‎‎‎‎‎‎‏‏‎‏‎‎‏‏‏‎‎‏‎‎‎‏‏‏‎‏‎‎Preview‎‏‎‎‏‎"</string>
+    <string name="captioning_standard_options_title" msgid="3284211791180335844">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‏‏‎‏‏‎‎‏‎‎‏‏‏‏‎‏‏‏‎‏‎‎‏‏‏‎‎‏‎‎‏‏‏‏‎‎‎‏‏‏‎‏‎‎‎‎‎‎‏‎‏‎‏‏‏‎‎‏‎‎‎Standard options‎‏‎‎‏‎"</string>
+    <string name="captioning_locale" msgid="4559155661018823503">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‏‏‏‏‎‏‎‎‎‏‎‏‎‏‎‏‏‏‏‏‏‏‏‎‏‎‏‏‎‎‎‏‎‎‏‎‏‎‏‏‏‏‎‎‏‏‏‏‏‎‏‏‎‏‎‎‏‏‏‏‎Language‎‏‎‎‏‎"</string>
+    <string name="captioning_text_size" msgid="6737002449104466028">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‏‏‎‏‎‏‏‏‏‏‏‎‏‎‏‎‎‏‎‎‎‎‎‎‏‎‎‎‏‎‎‎‎‏‎‏‏‏‎‎‏‏‏‎‏‏‏‏‎‎‎‎‎‏‏‎‏‏‎‎‎Text size‎‏‎‎‏‎"</string>
+    <string name="captioning_preset" msgid="8939737196538429044">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‏‏‎‎‎‎‎‏‎‎‎‎‎‏‎‏‎‎‏‏‏‎‎‏‏‏‎‏‏‎‎‏‎‎‎‏‎‎‎‎‎‏‎‎‏‏‏‏‏‏‏‎‎‏‏‏‎‏‎‎‎Caption style‎‏‎‎‏‎"</string>
+    <string name="captioning_custom_options_title" msgid="5067500939930322405">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‎‏‏‎‎‏‎‏‎‎‏‏‎‏‏‎‎‎‎‏‎‏‎‎‎‎‎‏‏‎‎‎‏‏‏‏‏‎‎‎‎‎‎‏‎‏‎‎‎‏‎‏‏‏‏‎‎‏‎‏‎Custom options‎‏‎‎‏‎"</string>
+    <string name="captioning_background_color" msgid="9053011212948992570">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‏‏‎‏‏‎‏‎‎‎‏‎‏‏‎‎‎‎‎‏‏‎‏‏‏‎‏‏‏‎‏‏‎‏‏‏‎‏‏‏‎‎‏‏‏‏‏‏‎‎‏‎‎‎‏‏‏‎‏‎‎Background color‎‏‎‎‏‎"</string>
+    <string name="captioning_background_opacity" msgid="6029993616419971202">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‎‎‏‏‏‎‏‎‏‏‏‎‏‏‎‏‎‏‏‏‎‎‏‏‏‏‏‎‏‏‏‏‎‎‎‎‏‎‎‏‎‏‎‏‏‏‏‎‎‎‎‎‏‎‎‎‎‎‏‎‎Background opacity‎‏‎‎‏‎"</string>
+    <string name="captioning_window_color" msgid="6902052743419717394">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‏‏‏‏‏‏‎‎‏‎‎‏‎‎‎‎‎‏‎‎‎‏‏‎‎‏‏‎‏‏‎‎‏‎‎‎‏‎‎‎‏‎‏‎‏‏‏‎‎‏‏‏‎‎‎‏‎‎‏‎‎Caption window color‎‏‎‎‏‎"</string>
+    <string name="captioning_window_opacity" msgid="5041556024849862376">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‎‏‎‏‏‏‏‏‎‏‏‏‎‎‏‏‎‏‎‎‎‏‏‏‏‏‏‎‎‏‎‎‏‎‎‎‎‏‏‎‏‎‎‎‎‎‎‎‏‏‏‎‏‏‏‎‏‎‎‎‎Caption window opacity‎‏‎‎‏‎"</string>
+    <string name="captioning_foreground_color" msgid="85623486537640059">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‎‎‏‏‎‎‏‏‎‎‎‎‎‎‏‏‎‎‏‎‎‎‎‏‏‎‏‏‎‏‏‏‏‎‏‏‏‎‎‎‎‎‎‏‏‎‏‎‏‎‎‎‎‏‏‏‏‎‏‏‎Text color‎‏‎‎‏‎"</string>
+    <string name="captioning_foreground_opacity" msgid="4370967856995419788">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‏‏‎‎‏‎‏‎‏‎‎‎‏‏‎‎‏‏‎‎‎‎‎‏‏‎‏‏‏‎‎‎‏‎‎‎‏‏‎‏‏‏‎‎‏‏‎‎‎‏‏‎‏‎‎‎‏‏‎‎‎Text opacity‎‏‎‎‏‎"</string>
+    <string name="captioning_edge_color" msgid="3670094753735263238">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‎‎‏‎‏‏‏‎‏‏‏‎‏‏‎‎‏‎‏‏‏‎‏‏‏‎‏‏‏‏‎‎‏‎‎‎‎‏‏‎‏‎‏‎‎‏‎‎‎‏‎‎‎‎‎‎‎‏‏‎‎Edge color‎‏‎‎‏‎"</string>
+    <string name="captioning_edge_type" msgid="5997247394951682154">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‎‎‏‏‎‎‏‏‏‎‏‎‏‎‎‎‎‎‎‎‏‎‏‏‏‎‏‏‎‎‎‏‏‏‏‎‎‎‏‏‏‎‏‏‎‏‎‏‏‎‎‎‎‏‏‎‏‎‏‎‎Edge type‎‏‎‎‏‎"</string>
+    <string name="captioning_typeface" msgid="1826169240566563259">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‏‎‎‏‎‏‎‏‎‏‏‏‏‏‎‏‏‎‏‏‎‎‏‏‏‏‏‏‏‎‏‏‎‎‏‏‏‎‏‏‎‏‏‏‎‎‎‎‎‎‎‏‏‎‏‏‏‎‏‏‎Font family‎‏‎‎‏‎"</string>
+    <string name="captioning_preview_text" msgid="4067935959797375065">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‏‎‎‎‎‏‏‏‎‏‎‎‎‎‏‏‎‏‏‎‎‎‏‏‎‎‏‏‏‏‎‏‏‏‎‎‏‏‎‎‎‎‏‎‏‎‏‎‎‎‎‎‎‏‎‏‏‎‎‏‎Captions will look like this‎‏‎‎‏‎"</string>
+    <string name="captioning_preview_characters" msgid="7105909138497851769">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‎‎‏‎‏‎‎‏‏‏‎‏‎‏‎‎‎‎‏‎‏‎‏‏‎‏‏‎‎‏‏‏‎‏‏‎‎‏‎‏‏‏‎‏‏‏‎‏‎‎‎‏‎‏‏‏‏‎‎‏‎Aa‎‏‎‎‏‎"</string>
+    <string name="locale_default" msgid="2593883646136326969">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‎‎‏‏‏‏‏‏‏‏‏‏‎‏‎‏‎‎‏‏‎‏‏‎‏‏‏‎‏‏‏‎‎‏‎‎‏‎‏‎‎‏‏‎‏‎‎‏‏‎‏‏‎‎‏‏‏‎‎‏‎Default‎‏‎‎‏‎"</string>
+    <string name="color_title" msgid="4258931051732243983">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‏‎‏‏‎‎‎‏‏‎‏‎‏‏‎‎‎‎‏‏‎‎‏‏‏‎‏‎‎‎‎‎‏‏‎‏‎‏‏‎‎‎‎‏‏‎‎‏‎‏‏‎‎‎‎‎‏‏‏‏‎Color‎‏‎‎‏‎"</string>
+    <string name="color_unspecified" msgid="5179683785413568326">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‎‏‏‏‏‏‏‎‎‎‎‏‏‏‏‎‏‏‏‎‏‏‏‏‎‏‎‏‏‎‏‎‏‏‏‎‎‏‏‎‏‏‎‏‎‎‏‎‎‏‏‏‎‏‎‎‎‏‏‎‎Default‎‏‎‎‏‎"</string>
+    <string name="color_none" msgid="3475640044925814795">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‎‎‎‎‎‎‏‏‏‎‏‏‏‏‏‏‎‏‎‎‎‎‏‏‎‏‎‎‏‏‎‎‎‏‎‎‏‏‏‎‏‏‎‏‎‎‎‎‏‎‎‎‎‎‎‎‏‎‏‏‎None‎‏‎‎‏‎"</string>
+    <string name="color_white" msgid="8045195170201590239">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‏‏‏‏‏‎‏‎‎‏‏‎‎‏‎‎‎‏‏‎‎‏‏‎‎‎‎‏‏‏‎‎‏‏‎‎‏‎‎‎‏‏‎‏‏‏‎‏‏‎‎‏‏‏‎‏‏‏‏‏‎White‎‏‎‎‏‎"</string>
+    <string name="color_gray" msgid="9192312087142726313">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‏‏‏‏‏‎‎‏‎‎‎‏‏‎‏‎‎‏‏‏‎‎‏‎‎‎‏‏‏‏‏‎‏‎‏‎‏‎‏‎‏‎‏‏‏‏‏‏‏‎‏‎‏‎‏‎‏‎‎‏‎Gray‎‏‎‎‏‎"</string>
+    <string name="color_black" msgid="7517353520909872561">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‏‎‎‎‎‏‎‏‎‎‏‏‎‎‎‎‎‎‎‏‎‎‏‏‎‎‏‎‏‏‎‏‏‎‎‎‏‏‎‏‏‏‎‏‎‏‏‎‏‏‎‏‏‎‏‏‎‎‎‏‎Black‎‏‎‎‏‎"</string>
+    <string name="color_red" msgid="4949354900304125428">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‎‏‎‎‏‎‏‎‏‏‏‏‏‎‏‎‎‏‎‎‎‎‎‎‏‏‏‏‎‎‎‏‏‎‏‏‏‏‏‏‎‏‏‏‎‏‎‏‏‏‎‏‏‏‏‏‎‏‎‎‎Red‎‏‎‎‏‎"</string>
+    <string name="color_green" msgid="5537717328428845841">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‏‏‎‎‏‏‎‏‏‎‎‏‏‏‏‎‏‏‎‎‏‎‎‏‎‎‎‏‏‏‏‏‎‎‏‏‏‎‎‎‎‏‏‎‏‏‎‎‏‎‏‏‎‎‎‏‎‎‎‏‎Green‎‏‎‎‏‎"</string>
+    <string name="color_blue" msgid="7731984529016953223">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‏‎‏‏‎‏‎‎‏‏‎‏‏‎‎‎‎‏‏‎‏‏‏‏‎‏‏‎‏‎‎‏‏‏‎‎‏‏‎‏‏‏‏‏‎‎‎‏‏‎‎‏‏‎‎‎‎‏‏‏‎Blue‎‏‎‎‏‎"</string>
+    <string name="color_cyan" msgid="7033027180641173211">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‎‎‎‏‏‎‎‏‏‎‏‎‎‏‎‏‎‏‎‎‏‏‏‏‎‏‎‏‎‏‎‎‏‏‎‏‏‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‎‏‏‎‏‏‎Cyan‎‏‎‎‏‎"</string>
+    <string name="color_yellow" msgid="9112680561610873529">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‏‏‏‎‎‏‏‏‎‏‏‎‏‎‏‏‏‏‏‎‏‎‏‏‎‎‎‎‏‎‎‏‎‎‏‎‎‏‏‎‏‏‎‎‎‏‎‏‏‎‏‎‏‎‏‏‏‎‎‏‎Yellow‎‏‎‎‏‎"</string>
+    <string name="color_magenta" msgid="5059212823607815549">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‎‏‏‎‎‎‏‏‎‏‎‏‏‏‏‎‏‏‏‏‎‏‎‎‎‎‏‎‎‎‎‏‏‎‏‎‎‎‏‏‏‏‏‎‏‎‏‎‏‏‎‏‎‏‏‏‏‏‎‏‎Magenta‎‏‎‎‏‎"</string>
+    <string name="enable_service_title" msgid="3061307612673835592">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‏‎‏‎‎‏‏‏‏‎‏‏‏‏‏‏‎‎‏‏‎‎‎‎‏‏‎‏‏‏‏‎‎‎‎‏‏‎‎‏‏‏‏‏‏‎‎‎‎‎‏‎‎‏‎‎‏‎‎‎‎Use ‎‏‎‎‏‏‎<xliff:g id="SERVICE">%1$s</xliff:g>‎‏‎‎‏‏‏‎?‎‏‎‎‏‎"</string>
+    <string name="capabilities_list_title" msgid="86713361724771971">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‎‎‏‏‎‎‏‏‎‏‎‎‎‎‎‏‎‎‎‏‎‏‎‏‎‏‏‏‏‏‎‏‎‎‏‎‏‏‏‎‎‎‏‎‏‎‎‎‏‏‏‎‏‎‎‎‎‎‏‏‎‎‏‎‎‏‏‎<xliff:g id="SERVICE">%1$s</xliff:g>‎‏‎‎‏‏‏‎ needs to:‎‏‎‎‏‎"</string>
+    <string name="touch_filtered_warning" msgid="8644034725268915030">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‎‏‏‏‏‏‏‏‎‏‎‏‏‏‎‎‎‏‏‏‏‏‎‎‏‎‎‎‏‏‎‏‏‎‎‏‏‏‎‎‏‎‏‏‏‎‎‎‎‎‏‏‎‏‎‏‎‏‏‎‎Because an app is obscuring a permission request, Settings can’t verify your response.‎‏‎‎‏‎"</string>
+    <string name="enable_service_encryption_warning" msgid="3064686622453974606">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‏‎‏‎‏‎‎‎‎‏‏‏‏‏‏‏‎‏‎‎‎‎‏‏‏‏‏‎‏‏‏‎‎‏‏‏‎‏‎‎‎‎‏‎‏‏‎‎‎‏‏‎‎‏‎‎‏‏‏‎‎If you turn on ‎‏‎‎‏‏‎<xliff:g id="SERVICE">%1$s</xliff:g>‎‏‎‎‏‏‏‎, your device won’t use your screen lock to enhance data encryption.‎‏‎‎‏‎"</string>
+    <string name="secure_lock_encryption_warning" msgid="460911459695077779">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‎‏‏‏‏‎‎‏‏‎‎‏‎‏‎‏‏‏‏‏‎‎‏‎‎‎‎‏‏‏‏‏‎‏‎‏‎‎‎‎‎‎‏‎‎‎‎‎‏‎‏‎‎‏‏‎‎‏‎‎‏‏‎Because you’ve turned on an accessibility service, your device won’t use your screen lock to enhance data encryption.‎‏‎‎‏‎"</string>
+    <string name="enable_service_pattern_reason" msgid="777577618063306751">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‎‏‎‏‎‏‏‎‎‏‎‏‎‏‎‎‎‎‎‏‎‏‎‏‏‏‎‎‏‎‏‎‎‏‏‎‏‏‏‏‏‎‏‎‏‎‎‏‎‏‏‏‏‏‏‏‏‏‏‏‏‎Because turning on ‎‏‎‎‏‏‎<xliff:g id="SERVICE">%1$s</xliff:g>‎‏‎‎‏‏‏‎ affects data encryption, you need to confirm your pattern.‎‏‎‎‏‎"</string>
+    <string name="enable_service_pin_reason" msgid="7882035264853248228">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‏‏‎‏‎‏‏‎‎‎‏‎‏‎‎‏‏‏‎‏‎‏‎‏‎‎‎‎‎‎‎‎‎‏‎‎‏‎‏‎‏‏‏‎‎‎‎‎‏‎‎‎‏‏‏‎‎‏‎‎‎Because turning on ‎‏‎‎‏‏‎<xliff:g id="SERVICE">%1$s</xliff:g>‎‏‎‎‏‏‏‎ affects data encryption, you need to confirm your PIN.‎‏‎‎‏‎"</string>
+    <string name="enable_service_password_reason" msgid="1224075277603097951">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‎‎‎‎‏‏‏‏‏‏‎‎‏‏‎‎‏‎‎‏‏‏‏‏‏‎‏‎‏‏‎‎‎‎‏‏‏‏‎‏‏‏‏‎‏‏‎‎‏‏‎‏‎‏‎‏‏‏‏‏‎Because turning on ‎‏‎‎‏‏‎<xliff:g id="SERVICE">%1$s</xliff:g>‎‏‎‎‏‏‏‎ affects data encryption, you need to confirm your password.‎‏‎‎‏‎"</string>
+    <string name="capability_title_receiveAccessibilityEvents" msgid="1869032063969970755">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‏‎‎‏‏‏‏‏‎‎‎‎‎‎‏‎‎‎‏‎‏‏‎‎‎‎‏‎‎‏‏‏‎‏‏‎‏‎‏‏‏‏‏‎‏‏‎‎‏‎‏‎‎‏‎‎‎‎‏‏‎Observe your actions‎‏‎‎‏‎"</string>
+    <string name="capability_desc_receiveAccessibilityEvents" msgid="6640333613848713883">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‏‏‎‎‎‎‏‎‎‏‏‏‎‎‏‏‎‏‎‎‎‎‏‏‏‏‎‏‎‏‏‎‎‎‏‏‏‎‎‎‏‎‎‏‏‏‎‏‏‎‏‎‏‎‎‏‏‎‏‏‎Receive notifications when you’re interacting with an app.‎‏‎‎‏‎"</string>
+    <string name="disable_service_title" msgid="3624005212728512896">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‎‎‏‎‎‏‎‎‏‎‏‏‎‎‎‎‏‏‎‏‏‎‎‎‏‎‏‎‎‏‎‎‏‎‎‎‏‏‎‏‏‎‎‎‏‏‎‏‎‎‎‏‏‎‎‎‎‎‎‎‎Stop ‎‏‎‎‏‏‎<xliff:g id="SERVICE">%1$s</xliff:g>‎‏‎‎‏‏‏‎?‎‏‎‎‏‎"</string>
+    <string name="disable_service_message" msgid="2247101878627941561">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‏‏‏‏‎‎‏‎‏‏‏‏‎‏‎‎‏‏‏‏‎‏‎‎‎‎‎‎‏‏‎‎‎‎‎‏‏‎‏‏‏‎‏‏‎‎‏‏‏‏‎‎‏‎‏‏‏‎‎‏‎Tapping OK will stop ‎‏‎‎‏‏‎<xliff:g id="SERVICE">%1$s</xliff:g>‎‏‎‎‏‏‏‎.‎‏‎‎‏‎"</string>
+    <string name="accessibility_no_services_installed" msgid="7200948194639038807">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‎‎‏‏‏‏‏‎‏‏‏‎‏‏‏‎‏‎‎‎‎‎‏‏‏‎‏‏‎‎‎‏‎‎‏‏‎‏‏‏‎‎‏‏‎‏‎‎‏‎‎‏‎‏‎‏‎‏‏‏‎No services installed‎‏‎‎‏‎"</string>
+    <string name="accessibility_no_service_selected" msgid="2840969718780083998">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‎‏‏‏‎‏‏‎‏‏‎‏‎‎‏‎‎‏‏‎‏‏‏‎‏‎‎‎‎‎‏‏‏‎‎‏‏‎‎‎‎‏‏‏‎‎‏‏‏‏‏‏‎‎‎‏‏‏‏‎‎No service selected‎‏‎‎‏‎"</string>
+    <string name="accessibility_service_default_description" msgid="1072730037861494125">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‎‏‏‏‎‏‏‏‎‎‎‏‏‎‎‎‏‏‎‏‎‎‏‎‎‏‎‎‏‎‎‏‎‏‏‏‎‏‎‏‎‎‎‎‎‎‎‏‎‏‏‎‏‎‏‏‎‏‏‎‏‎No description provided.‎‏‎‎‏‎"</string>
+    <string name="settings_button" msgid="3006713718908152930">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‏‎‎‏‏‎‏‏‏‎‎‏‏‏‏‏‏‏‏‎‎‎‏‏‎‎‏‎‎‏‏‏‎‏‎‎‏‏‎‏‎‎‎‎‎‏‏‎‏‏‎‎‎‏‏‎‎‎‏‎‎Settings‎‏‎‎‏‎"</string>
+    <string name="print_settings" msgid="4742428530112487843">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‎‎‎‏‏‏‎‏‎‎‎‎‎‏‏‏‏‏‎‏‏‎‎‏‏‏‏‏‎‎‏‎‎‏‏‎‎‎‎‎‏‎‎‎‎‏‏‎‎‎‎‏‏‎‏‎‎‎‏‏‎Printing‎‏‎‎‏‎"</string>
+    <string name="print_settings_summary_no_service" msgid="6354322414246865875">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‏‎‎‎‎‎‏‎‏‏‏‏‎‎‎‏‎‏‏‎‏‎‎‏‎‎‎‏‏‎‏‏‎‎‎‏‎‏‏‏‏‏‎‎‏‎‏‎‏‎‏‏‏‏‎‏‎‎‏‏‎Off‎‏‎‎‏‎"</string>
+    <plurals name="print_settings_summary" formatted="false" msgid="6005468025646083029">
+      <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">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‎‎‏‏‎‎‏‎‎‏‎‏‎‏‎‏‏‎‎‎‏‏‏‏‎‎‏‎‎‏‎‏‎‎‎‎‎‎‎‏‏‏‏‏‏‏‏‎‏‎‏‎‎‏‎‏‏‎‎‎‎Print 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>
+    <string name="print_menu_item_settings" msgid="6591330373682227082">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‏‎‏‏‎‏‏‏‏‎‎‏‎‎‎‏‏‏‎‎‎‎‎‎‏‏‎‏‎‏‏‏‎‎‎‎‏‎‎‏‎‎‏‎‎‏‏‎‎‏‏‏‏‎‎‎‏‎‏‎‎Settings‎‏‎‎‏‎"</string>
+    <string name="print_menu_item_add_printers" msgid="2890738028215834012">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‏‎‎‎‎‎‎‏‏‏‎‏‏‏‏‏‎‏‏‎‏‏‏‎‏‎‏‏‏‎‏‏‏‏‏‎‏‎‎‎‎‏‎‎‏‎‎‏‎‏‎‏‏‎‎‏‏‏‎‎‎Add printers‎‏‎‎‏‎"</string>
+    <string name="print_feature_state_on" msgid="8098901852502441048">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‎‎‎‎‎‏‏‎‎‏‎‏‎‎‎‏‎‏‎‎‎‏‎‏‎‎‏‏‎‎‏‏‎‏‎‏‎‎‏‎‏‎‎‏‎‎‏‏‏‏‎‎‎‏‎‏‏‎‎‎‎On‎‏‎‎‏‎"</string>
+    <string name="print_feature_state_off" msgid="7294876968403966040">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‎‏‎‏‎‎‏‏‏‏‎‎‏‎‎‏‏‎‏‏‏‏‏‏‎‎‏‏‏‏‏‎‏‏‎‏‏‏‏‎‎‏‎‏‏‎‎‏‏‎‎‎‎‏‎‏‏‎‎‎‎Off‎‏‎‎‏‎"</string>
+    <string name="print_menu_item_add_service" msgid="3811645167869797802">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‎‏‎‎‏‏‏‎‎‏‎‏‏‎‏‎‏‏‏‏‎‎‎‏‎‏‎‏‏‏‎‏‎‎‎‎‏‎‏‏‎‏‏‎‏‎‏‎‎‏‎‏‏‎‏‎‏‎‏‎‎Add service‎‏‎‎‏‎"</string>
+    <string name="print_menu_item_add_printer" msgid="8251218970577291032">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‎‎‏‎‏‎‎‎‎‎‏‎‎‎‏‏‎‏‏‏‏‏‏‎‏‏‏‏‏‏‎‏‏‎‎‏‎‎‏‏‏‎‎‏‎‏‎‎‎‏‏‏‎‎‎‏‏‎‎‎‎Add printer‎‏‎‎‏‎"</string>
+    <string name="print_menu_item_search" msgid="7025589328240514553">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‎‎‎‏‎‏‏‏‏‏‏‏‏‏‏‎‏‎‎‎‎‏‎‎‎‏‎‏‎‏‎‏‎‏‏‏‏‎‎‎‏‏‎‏‎‎‎‏‎‏‎‏‏‏‏‏‏‎‎‏‎Search‎‏‎‎‏‎"</string>
+    <string name="print_searching_for_printers" msgid="4680248496457576358">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‎‎‎‎‏‏‏‏‎‎‏‏‏‎‎‏‎‏‎‏‎‎‏‏‎‏‎‏‏‏‏‎‎‎‏‏‏‏‏‎‏‎‎‎‏‏‏‎‏‏‏‏‏‎‏‎‎‏‏‎‎Searching for printers‎‏‎‎‏‎"</string>
+    <string name="print_service_disabled" msgid="7739452396114245222">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‏‎‏‏‎‏‏‎‏‎‎‎‎‎‎‎‏‏‏‎‏‏‏‏‎‎‏‎‏‏‏‎‏‎‏‎‎‏‏‎‏‏‏‏‎‏‏‏‎‏‏‎‎‏‏‎‎‏‏‎‎Service disabled‎‏‎‎‏‎"</string>
+    <string name="print_print_jobs" msgid="3582094777756968793">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‎‎‎‏‏‎‏‏‎‏‏‎‎‎‏‎‏‎‎‎‎‎‏‏‏‎‎‎‏‎‏‏‏‎‏‏‏‏‏‏‏‏‎‎‎‏‏‎‎‏‏‏‎‏‎‏‏‎‎‏‎Print jobs‎‏‎‎‏‎"</string>
+    <string name="print_print_job" msgid="7563741676053287211">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‏‎‎‎‏‏‏‏‎‏‏‏‏‏‎‎‏‏‏‎‏‏‏‏‏‎‏‎‏‏‎‏‏‏‎‏‏‏‏‏‏‎‎‏‎‏‎‏‎‎‎‏‎‎‏‎‏‎‏‏‎Print job‎‏‎‎‏‎"</string>
+    <string name="print_restart" msgid="8373999687329384202">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‎‏‎‎‎‎‏‏‎‏‏‎‎‏‏‎‏‏‎‎‎‏‎‏‏‎‎‏‎‎‏‎‏‎‎‎‏‎‎‎‎‎‎‎‎‎‎‎‎‏‏‏‎‎‎‎‏‎‏‎‎Restart‎‏‎‎‏‎"</string>
+    <string name="print_cancel" msgid="3621199386568672235">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‎‎‏‎‎‏‎‎‎‎‎‏‎‎‎‏‎‏‎‏‏‎‏‎‎‏‏‏‏‏‏‏‏‎‎‏‎‏‎‎‏‎‎‏‏‏‎‎‎‎‏‏‏‏‏‎‏‎‏‏‎Cancel‎‏‎‎‏‎"</string>
+    <string name="print_job_summary" msgid="8472427347192930694">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‎‏‎‏‏‎‎‏‎‏‎‎‎‎‎‏‏‎‏‏‏‏‎‎‏‎‎‎‏‎‎‎‏‏‏‎‏‎‏‏‏‏‎‏‎‏‏‎‎‎‎‏‏‎‎‎‎‏‏‎‎‎‏‎‎‏‏‎<xliff:g id="PRINTER">%1$s</xliff:g>‎‏‎‎‏‏‏‎‎‏‎‎‏‏‎\n‎‏‎‎‏‏‏‎‎‏‎‎‏‏‎<xliff:g id="TIME">%2$s</xliff:g>‎‏‎‎‏‏‏‎‎‏‎‎‏‎"</string>
+    <string name="print_printing_state_title_template" msgid="5736107667714582025">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‏‏‏‏‏‎‎‏‏‎‏‎‏‎‏‏‏‏‏‏‏‎‎‎‏‎‎‎‎‏‎‏‎‏‏‏‏‎‎‎‎‏‎‏‏‎‏‎‎‏‏‎‎‎‎‎‏‎‎‏‎Printing ‎‏‎‎‏‏‎<xliff:g id="PRINT_JOB_NAME">%1$s</xliff:g>‎‏‎‎‏‏‏‎‎‏‎‎‏‎"</string>
+    <string name="print_cancelling_state_title_template" msgid="7102968925358219875">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‎‎‏‎‏‎‎‏‎‎‏‎‏‏‎‏‎‎‎‎‏‎‎‏‏‎‏‎‏‎‏‏‏‏‏‎‏‎‎‏‏‏‎‏‎‏‏‎‎‎‏‎‎‏‏‎‎‎‏‏‎Cancelling ‎‏‎‎‏‏‎<xliff:g id="PRINT_JOB_NAME">%1$s</xliff:g>‎‏‎‎‏‏‏‎‎‏‎‎‏‎"</string>
+    <string name="print_failed_state_title_template" msgid="1436099128973357969">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‎‎‏‏‏‏‏‎‏‏‏‎‎‎‎‎‏‏‎‎‏‎‎‎‏‏‎‎‏‎‎‎‏‏‎‎‏‎‏‏‎‏‎‎‎‏‏‏‎‎‏‏‏‎‎‏‎‎‎‏‎Printer error ‎‏‎‎‏‏‎<xliff:g id="PRINT_JOB_NAME">%1$s</xliff:g>‎‏‎‎‏‏‏‎‎‏‎‎‏‎"</string>
+    <string name="print_blocked_state_title_template" msgid="9065391617425962424">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‏‏‎‏‏‏‎‎‏‏‏‎‏‎‏‏‏‏‎‏‏‎‏‎‎‏‎‏‎‏‎‎‎‎‏‎‎‏‏‏‏‎‏‎‎‏‏‏‎‏‎‏‏‎‏‏‏‎‎‎‎Printer blocked ‎‏‎‎‏‏‎<xliff:g id="PRINT_JOB_NAME">%1$s</xliff:g>‎‏‎‎‏‏‏‎‎‏‎‎‏‎"</string>
+    <string name="print_search_box_shown_utterance" msgid="7730361832020726951">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‏‎‏‏‎‏‎‎‎‏‏‏‏‏‎‎‎‎‏‏‎‎‏‎‎‎‎‏‎‎‎‎‎‏‏‎‏‏‎‏‎‏‎‏‎‏‎‏‎‏‎‎‏‎‏‎‎‏‏‏‎Search box shown‎‏‎‎‏‎"</string>
+    <string name="print_search_box_hidden_utterance" msgid="7980832833405818400">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‏‏‏‎‏‏‎‎‎‎‎‏‏‎‎‏‏‏‎‏‎‎‏‎‏‏‎‏‎‏‏‏‏‏‏‎‏‏‏‎‏‏‎‏‏‎‎‏‎‏‏‎‎‎‏‎‎‎‎‎‎Search box hidden‎‏‎‎‏‎"</string>
+    <string name="printer_info_desc" msgid="5824995108703060003">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‎‎‎‎‏‏‎‏‎‏‏‎‏‎‎‎‏‎‏‎‎‎‏‏‎‎‎‎‎‏‏‏‎‎‎‎‏‎‏‎‎‎‏‎‎‏‎‎‎‎‎‎‎‎‏‎‎‎‏‏‎More information about this printer‎‏‎‎‏‎"</string>
+    <string name="power_usage_summary_title" msgid="7190304207330319919">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‎‎‏‏‏‏‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‎‏‎‏‎‎‏‎‏‎‏‎‎‎‏‏‏‎‏‎‏‏‏‎‎‏‏‏‏‎‎‎‏‎‏‏‏‏‎Battery‎‏‎‎‏‎"</string>
+    <string name="power_usage_summary" msgid="7237084831082848168">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‎‏‎‎‎‏‏‎‏‏‏‏‎‏‎‎‏‎‏‎‎‏‎‎‏‏‏‏‎‏‏‎‎‏‏‎‎‎‎‎‏‏‏‏‏‎‎‏‏‏‏‏‏‎‏‎‏‎‎‎‎What has been using the battery‎‏‎‎‏‎"</string>
+    <string name="power_usage_not_available" msgid="3109326074656512387">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‏‎‏‏‎‎‏‎‎‏‏‎‏‎‎‎‏‎‏‏‏‎‎‏‎‏‏‏‎‏‎‎‏‎‏‎‏‏‎‎‎‎‏‎‏‏‎‏‏‎‎‏‏‎‎‎‎‎‏‏‎Battery usage data isn’t available.‎‏‎‎‏‎"</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>‎‏‎‎‏‏‏‎ remaining‎‏‎‎‏‎"</string>
+    <string name="power_charge_remaining" msgid="6132074970943913135">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‎‏‎‏‎‎‎‏‏‎‎‏‏‎‎‎‎‎‎‏‏‎‏‏‎‎‏‎‎‏‏‎‏‎‏‏‎‎‏‎‏‏‎‎‏‏‏‏‏‏‎‎‏‎‏‎‏‏‏‏‎‎‏‎‎‏‏‎<xliff:g id="UNTIL_CHARGED">%1$s</xliff:g>‎‏‎‎‏‏‏‎ to charge‎‏‎‎‏‎"</string>
+    <string name="background_activity_title" msgid="8618384801540759730">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‎‏‏‏‏‎‎‏‏‎‏‎‏‎‏‎‎‏‏‏‎‏‎‏‎‎‎‎‏‎‎‏‏‎‎‏‎‏‏‏‎‏‏‎‎‏‏‎‎‎‎‎‏‎‏‏‎‎‏‎‎Background activity‎‏‎‎‏‎"</string>
+    <string name="background_activity_summary" msgid="8140094430510517362">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‎‎‎‎‏‏‏‏‎‏‏‏‎‏‏‎‏‏‎‎‏‏‎‎‎‎‎‏‏‎‏‎‏‎‎‎‏‎‏‏‎‏‏‏‎‎‎‎‏‏‎‎‎‏‏‏‎‎‏‎‎Allow the app to run in the background‎‏‎‎‏‎"</string>
+    <string name="background_activity_summary_on" msgid="649282072540085599">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‎‏‎‎‏‎‎‎‎‎‎‏‎‏‎‏‏‎‏‏‎‏‎‎‏‏‎‏‎‏‏‎‏‏‏‎‎‏‏‎‎‎‏‏‏‏‏‏‏‏‏‎‏‎‏‎‏‏‏‏‏‎App can run in the background when not in use‎‏‎‎‏‎"</string>
+    <string name="background_activity_summary_off" msgid="7666330699090632040">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‏‎‏‎‎‏‏‎‎‏‎‎‎‏‎‎‎‏‏‏‎‎‏‎‎‏‏‏‎‎‏‎‎‎‎‏‏‏‏‏‏‎‎‎‎‎‎‏‏‏‎‏‎‏‏‎‏‎‎‎‎App\'s background activity is limited when not in use‎‏‎‎‏‎"</string>
+    <string name="background_activity_summary_disabled" msgid="3710669050484599847">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‎‎‏‏‎‏‏‏‏‏‏‎‏‏‏‏‎‎‎‏‏‏‎‏‎‏‏‏‎‏‏‎‏‎‎‏‎‎‏‎‏‎‏‏‏‎‏‎‏‏‎‎‎‎‏‎‎‏‏‏‎App not allowed to run in background‎‏‎‎‏‎"</string>
+    <string name="background_activity_summary_whitelisted" msgid="7375400051141016808">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‎‏‏‎‎‏‎‏‏‎‏‎‏‎‏‎‏‏‏‏‎‏‎‎‎‏‎‏‎‎‎‏‏‏‎‎‏‎‏‎‏‎‎‎‎‏‏‏‏‏‎‎‏‏‏‎‏‎‎‎‎App can not be optimized for battery use‎‏‎‎‏‎"</string>
+    <string name="background_activity_warning_dialog_title" msgid="2216249969149568871">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‏‏‏‎‏‏‎‎‎‎‎‏‏‎‏‏‎‎‏‏‏‎‎‏‏‎‏‎‏‏‎‏‎‎‎‎‏‎‏‎‎‎‎‏‎‏‏‎‎‏‏‏‎‏‏‎‎‏‏‏‎Limit background activity?‎‏‎‎‏‎"</string>
+    <string name="background_activity_warning_dialog_text" msgid="7049624449246121981">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‎‎‎‏‏‏‎‏‎‏‎‏‎‏‎‎‏‏‎‎‎‎‎‏‎‏‏‎‎‎‎‎‏‎‎‏‎‎‏‏‏‎‎‏‎‏‎‎‏‏‏‏‏‏‏‏‏‏‎‏‎If you limit background activity for an app, it may misbehave‎‏‎‎‏‎"</string>
+    <string name="device_screen_usage" msgid="3386088035570409683">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‏‏‏‎‏‏‏‏‏‏‎‏‏‏‎‎‏‏‎‏‎‎‏‎‎‎‎‎‏‏‎‎‏‎‏‎‎‏‎‏‏‏‏‏‏‏‏‎‎‎‎‎‏‏‎‏‎‎‏‏‎Screen usage since full charge‎‏‎‎‏‎"</string>
+    <string name="device_screen_consumption" msgid="4607589286438986687">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‏‏‏‏‏‏‏‏‎‎‎‏‎‏‏‏‎‎‏‎‎‎‎‎‏‎‏‏‎‏‎‎‎‎‎‏‎‎‎‏‎‏‏‏‎‏‏‎‎‎‏‏‏‎‏‏‏‏‏‏‎Screen consumption‎‏‎‎‏‎"</string>
+    <string name="device_cellular_network" msgid="4724773411762382950">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‎‎‎‏‏‎‎‏‎‎‎‏‏‏‎‎‎‏‎‎‎‏‏‎‎‎‏‎‏‎‎‏‎‏‎‎‎‏‎‎‏‏‏‎‏‎‏‎‏‎‎‎‎‏‏‎‎‏‏‎‎Mobile network scanning‎‏‎‎‏‎"</string>
+    <string name="power_usage_list_summary" msgid="6393929085382334341">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‏‎‎‎‏‎‏‏‏‎‏‏‏‏‎‎‏‏‎‎‏‎‏‎‎‎‎‎‎‏‏‎‏‏‎‏‎‏‎‎‎‎‎‎‏‎‎‏‎‏‏‏‏‎‎‎‎‏‎‏‎App usage since full charge (‎‏‎‎‏‏‎<xliff:g id="RELATIVE_TIME">^1</xliff:g>‎‏‎‎‏‏‏‎)‎‏‎‎‏‎"</string>
+    <string name="power_usage_list_summary_device" msgid="4461926045610455423">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‏‏‎‏‏‏‏‎‏‎‏‏‏‏‏‏‎‎‏‎‎‎‎‏‏‎‎‏‎‎‏‎‎‎‏‎‏‎‏‎‏‏‎‎‏‎‏‏‎‎‎‏‎‏‏‏‏‏‏‏‎Device usage since full charge (‎‏‎‎‏‏‎<xliff:g id="RELATIVE_TIME">^1</xliff:g>‎‏‎‎‏‏‏‎)‎‏‎‎‏‎"</string>
+    <string name="screen_usage_summary" msgid="6687403051423153550">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‏‏‎‎‏‏‎‎‏‏‏‎‎‏‏‎‏‏‎‏‏‎‏‎‎‏‎‎‏‏‎‏‎‏‎‏‏‏‏‏‎‎‎‎‏‎‏‏‏‏‎‏‏‎‎‎‏‏‏‎‎Amount of time screen has been on since full charge‎‏‎‎‏‎"</string>
+    <string name="device_usage_list_summary" msgid="5623036661468763251">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‎‏‎‏‎‎‎‎‎‏‏‎‏‎‎‏‎‏‏‎‏‏‏‎‏‏‎‎‎‎‎‎‏‎‏‎‎‎‏‏‏‎‎‏‏‎Device usage since full charge‎‏‎‎‏‎"</string>
+    <string name="battery_since_unplugged" msgid="338073389740738437">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‎‏‏‏‎‎‏‎‏‏‎‎‎‏‎‎‎‏‎‎‏‏‏‏‏‏‎‏‎‎‏‏‏‎‏‏‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‏‏‏‎‎‎‎‏‎‏‎Battery use since unplugged‎‏‎‎‏‎"</string>
+    <string name="battery_since_reset" msgid="7464546661121187045">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‎‏‏‏‏‎‎‏‎‏‏‏‎‏‏‎‎‏‎‏‏‎‏‎‎‎‏‏‏‎‏‏‎‎‎‏‎‏‏‏‎‏‎‎‏‏‎‏‏‏‎‎‏‏‏‎‎‏‎‏‎Battery use since reset‎‏‎‎‏‎"</string>
+    <string name="battery_stats_on_battery" msgid="4970762168505236033">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‎‏‎‎‏‏‏‏‏‎‏‏‏‎‏‏‎‎‎‏‏‏‎‏‏‎‏‏‎‎‏‎‎‏‎‎‏‎‏‏‎‏‎‎‎‏‏‏‏‎‏‎‎‏‎‎‎‎‎‏‎‎‏‎‎‏‏‎<xliff:g id="TIME">%1$s</xliff:g>‎‏‎‎‏‏‏‎ on battery‎‏‎‎‏‎"</string>
+    <string name="battery_stats_duration" msgid="7464501326709469282">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‎‏‏‏‏‎‎‏‎‏‏‏‎‎‏‏‏‏‎‎‎‏‏‎‏‎‎‎‎‏‏‏‎‎‏‏‏‏‏‏‎‎‏‏‎‎‏‏‎‎‎‎‎‏‏‎‎‎‏‎‎‎‏‎‎‏‏‎<xliff:g id="TIME">%1$s</xliff:g>‎‏‎‎‏‏‏‎ since unplugged‎‏‎‎‏‎"</string>
+    <string name="battery_stats_charging_label" msgid="4223311142875178785">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‏‎‏‎‏‎‎‏‏‏‎‎‎‎‏‏‎‏‏‏‎‎‎‏‏‎‏‏‏‎‏‏‏‏‏‏‎‎‎‎‎‏‏‎‎‎‏‎‎‏‏‏‎‎‏‎‎‎‎‏‎Charging‎‏‎‎‏‎"</string>
+    <string name="battery_stats_screen_on_label" msgid="7150221809877509708">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‎‎‏‏‎‎‏‏‏‎‏‎‏‎‏‏‎‎‎‎‏‏‎‏‏‎‏‎‎‏‎‎‎‎‏‎‏‏‏‏‏‏‏‏‏‏‏‎‎‏‏‎‎‏‎‎‏‏‎‎‎Screen on‎‏‎‎‏‎"</string>
+    <string name="battery_stats_gps_on_label" msgid="1193657533641951256">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‎‎‎‎‏‎‎‏‎‎‎‎‏‎‏‏‏‎‎‏‎‎‏‏‎‎‏‏‏‏‎‏‏‏‎‎‎‎‏‏‎‎‏‎‏‎‎‎‏‎‎‎‎‎‎‏‏‎‎‎‎GPS on‎‏‎‎‏‎"</string>
+    <string name="battery_stats_camera_on_label" msgid="4935637383628414968">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‎‏‎‎‎‏‏‏‏‏‏‎‏‏‏‎‏‎‎‎‎‎‎‎‏‏‎‎‏‏‎‏‏‏‏‏‎‏‎‎‏‏‏‏‎‏‎‏‏‏‏‏‏‏‏‏‏‎‎‎‎Camera on‎‏‎‎‏‎"</string>
+    <string name="battery_stats_flashlight_on_label" msgid="4319637669889411307">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‏‎‏‏‏‏‏‏‎‎‏‎‎‏‏‎‏‏‏‏‏‎‎‏‎‎‏‏‎‎‎‎‏‎‎‎‎‎‏‎‎‏‏‏‏‎‎‎‏‎‎‎‏‏‏‎‏‎‏‏‎Flashlight on‎‏‎‎‏‎"</string>
+    <string name="battery_stats_wifi_running_label" msgid="1845839195549226252">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‏‎‎‏‏‎‎‏‏‏‎‏‏‎‏‏‏‏‎‎‏‏‏‏‎‏‏‏‏‏‏‏‏‎‏‏‎‎‏‏‎‏‎‎‎‏‎‏‎‏‎‏‎‎‎‎‏‏‎‎‎Wi‑Fi‎‏‎‎‏‎"</string>
+    <string name="battery_stats_wake_lock_label" msgid="1908942681902324095">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‏‎‏‎‎‏‏‏‏‏‎‏‏‏‏‎‏‏‎‏‎‏‎‎‎‎‎‏‎‏‎‏‎‎‏‏‎‏‎‏‏‏‏‎‏‎‎‏‏‎‎‏‎‏‏‏‏‏‏‏‎Awake‎‏‎‎‏‎"</string>
+    <string name="battery_stats_phone_signal_label" msgid="4137799310329041341">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‏‎‎‏‎‏‏‎‏‏‎‎‎‏‏‎‏‎‏‎‏‎‎‎‏‏‎‎‏‎‏‏‏‏‎‎‎‎‎‎‎‏‎‎‏‏‎‏‎‎‎‏‏‎‏‏‏‏‎‏‎Mobile network signal‎‏‎‎‏‎"</string>
+    <!-- no translation found for battery_stats_last_duration (1535831453827905957) -->
+    <skip />
+    <string name="awake" msgid="387122265874485088">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‎‏‏‏‎‏‎‏‎‏‏‏‏‏‎‏‎‏‎‏‎‏‏‎‏‎‎‏‏‎‎‏‎‏‎‏‏‎‎‎‎‏‎‏‏‏‏‏‎‎‏‏‏‏‎‏‏‎‎‎‎‎‎Device awake time‎‏‎‎‏‎"</string>
+    <string name="wifi_on_time" msgid="3208518458663637035">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‏‏‎‎‏‎‎‎‎‏‏‎‏‏‏‏‎‎‏‎‏‎‎‎‏‎‎‏‏‏‏‎‎‏‏‏‏‏‏‎‏‏‏‎‎‎‎‏‎‎‎‎‎‎‏‎‏‎‏‏‎Wi‑Fi on time‎‏‎‎‏‎"</string>
+    <string name="bluetooth_on_time" msgid="3056108148042308690">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‏‎‏‎‎‏‏‎‏‎‎‏‎‏‏‏‏‎‏‎‎‎‏‎‏‎‏‏‎‎‏‎‏‏‏‏‎‎‏‏‏‏‎‏‎‎‎‏‏‏‎‎‎‏‎‏‎‎‏‎‎Wi‑Fi on time‎‏‎‎‏‎"</string>
+    <string name="advanced_battery_title" msgid="2068039111517508622">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‏‏‎‎‏‎‏‏‎‎‏‏‎‎‏‎‎‏‏‎‏‎‎‏‏‏‎‏‎‏‏‎‏‏‏‏‏‎‎‏‏‏‎‏‏‎‎‏‎‏‎‎‎‎‎‎‏‏‏‎‎Advanced battery usage‎‏‎‎‏‎"</string>
+    <string name="history_details_title" msgid="3608240585315506067">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‎‎‏‎‎‎‎‏‎‎‏‏‎‎‎‎‏‎‏‏‏‎‏‏‎‎‎‏‏‏‏‎‏‏‏‏‏‏‏‎‎‎‎‎‏‏‎‏‎‏‏‏‏‎‎‏‎‎‏‏‎History details‎‏‎‎‏‎"</string>
+    <string name="battery_details_title" msgid="6101394441569858580">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‎‏‎‎‏‎‏‎‏‏‎‎‏‎‎‎‎‎‎‏‏‏‏‎‏‎‏‏‎‎‎‎‎‏‎‎‎‏‎‏‎‎‎‎‎‏‏‏‎‏‎‎‎‎‎‏‎‏‎‎‎Battery usage‎‏‎‎‏‎"</string>
+    <string name="details_subtitle" msgid="32593908269911734">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‎‏‏‏‏‏‏‎‎‏‏‏‏‎‎‏‎‏‏‏‏‏‏‏‏‎‎‏‎‏‎‎‏‎‎‎‏‎‎‎‏‎‏‎‎‎‎‏‏‏‎‏‎‏‏‎‏‏‎‎Use details‎‏‎‎‏‎"</string>
+    <string name="controls_subtitle" msgid="390468421138288702">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‎‏‏‏‎‏‎‏‏‎‏‎‏‏‎‎‏‏‏‎‎‎‏‏‏‏‎‏‎‏‏‏‎‏‎‎‎‏‏‏‏‏‎‏‎‎‏‎‎‏‎‎‎‎‎‎‏‏‏‏‏‎‎Adjust power use‎‏‎‎‏‎"</string>
+    <string name="packages_subtitle" msgid="4736416171658062768">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‎‎‎‏‏‎‏‏‏‎‏‏‎‎‏‎‎‎‎‏‎‏‏‎‏‎‎‏‏‏‎‏‏‏‎‎‎‎‎‏‏‎‎‎‎‎‏‎‏‎‏‏‏‎‏‏‎‎‎‎‎Included packages‎‏‎‎‏‎"</string>
+    <string name="battery_abnormal_details_title" msgid="5469019021857291216">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‏‎‏‏‏‏‏‎‎‏‎‏‏‏‎‏‏‎‏‏‏‏‎‏‎‎‏‏‎‎‎‎‎‎‏‏‏‎‏‎‏‎‎‎‎‏‏‏‏‎‏‏‏‏‎‏‎‎‎‎‎Apps draining battery‎‏‎‎‏‎"</string>
+    <string name="battery_abnormal_wakelock_summary" msgid="4326186999058828831">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‏‏‎‎‎‎‎‎‏‎‎‏‏‎‏‏‎‏‎‎‎‎‏‎‎‏‏‏‏‎‎‎‏‏‏‎‏‏‎‏‎‎‎‎‏‎‎‎‏‏‏‎‎‎‎‏‏‏‏‏‎Keeping device awake‎‏‎‎‏‎"</string>
+    <string name="battery_abnormal_wakeup_alarm_summary" msgid="644657277875785240">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‎‏‎‎‎‏‏‏‏‎‎‏‎‎‏‎‎‏‎‎‎‎‏‏‎‎‎‎‎‏‏‏‏‎‎‎‏‏‎‏‎‏‎‎‎‎‎‎‎‏‏‏‎‎‎‎‏‏‎‎‎‎Waking up device in background‎‏‎‎‏‎"</string>
+    <string name="battery_abnormal_location_summary" msgid="6552797246798806002">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‏‎‏‎‏‏‏‏‎‎‎‎‎‎‏‏‎‏‏‎‎‏‏‎‎‎‎‎‏‎‏‏‎‏‎‎‏‎‎‏‏‎‎‏‏‎‏‏‏‎‏‏‏‏‏‏‎‎‏‎‎Requesting location frequently‎‏‎‎‏‎"</string>
+    <string name="battery_abnormal_apps_summary" msgid="792553273248686972">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‎‏‎‏‎‏‏‏‏‏‏‏‏‏‎‏‏‎‏‏‏‎‎‎‎‎‎‎‎‏‎‏‏‏‏‎‏‏‎‎‎‏‏‏‏‏‎‏‎‎‎‏‏‎‏‏‏‏‏‎‎‎‎‏‎‎‏‏‎<xliff:g id="NUMBER">%1$d</xliff:g>‎‏‎‎‏‏‏‎ apps misbehaving‎‏‎‎‏‎"</string>
+    <string name="dialog_stop_title" msgid="6395127715596746479">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‏‎‎‎‏‏‎‎‎‎‎‎‎‎‎‎‏‏‏‎‏‏‎‎‎‏‏‎‎‏‎‎‎‏‎‏‎‏‏‎‎‏‏‎‎‎‏‏‏‏‏‎‏‏‏‎‏‏‏‏‎Stop app?‎‏‎‎‏‎"</string>
+    <string name="dialog_stop_message" product="default" msgid="4006631636646776488">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‎‏‏‏‏‎‎‏‏‎‏‎‎‏‏‎‏‎‏‎‎‎‏‏‏‏‏‎‏‏‎‏‏‎‎‎‎‎‏‎‏‏‎‎‎‏‎‎‏‏‏‎‏‎‏‎‏‎‎‎‎Your phone can\'t manage battery normally because ‎‏‎‎‏‏‎<xliff:g id="APP">%1$s</xliff:g>‎‏‎‎‏‏‏‎ is keeping your phone awake.‎‏‎‎‏‏‎\n‎‏‎‎‏‏‏‎‎‏‎‎‏‏‎\n‎‏‎‎‏‏‏‎To try to fix this issue, you can stop the app.‎‏‎‎‏‏‎\n‎‏‎‎‏‏‏‎‎‏‎‎‏‏‎\n‎‏‎‎‏‏‏‎If this keeps happening, you may need to uninstall the app to improve battery performance.‎‏‎‎‏‎"</string>
+    <string name="dialog_stop_message" product="tablet" msgid="2369957934555162428">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‎‎‎‎‏‏‏‎‎‎‏‏‏‏‎‎‏‎‎‎‎‎‏‎‏‏‏‏‎‏‎‏‎‏‎‏‏‏‎‎‎‏‏‏‎‏‏‎‎‏‏‏‎‎‏‏‏‏‎‎‎Your tablet can\'t manage battery normally because ‎‏‎‎‏‏‎<xliff:g id="APP">%1$s</xliff:g>‎‏‎‎‏‏‏‎ is keeping your tablet awake.‎‏‎‎‏‏‎\n‎‏‎‎‏‏‏‎‎‏‎‎‏‏‎\n‎‏‎‎‏‏‏‎To try to fix this issue, you can stop the app.‎‏‎‎‏‏‎\n‎‏‎‎‏‏‏‎‎‏‎‎‏‏‎\n‎‏‎‎‏‏‏‎If this keeps happening, you may need to uninstall the app to improve battery performance.‎‏‎‎‏‎"</string>
+    <string name="dialog_stop_message" product="device" msgid="6195430620406365292">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‎‏‎‏‏‏‏‏‏‎‏‎‏‎‎‏‎‏‏‏‎‏‎‏‎‎‏‏‎‎‎‎‏‏‏‏‏‏‏‎‎‏‏‎‎‎‏‏‏‏‎‎‎‏‏‎‏‏‎‎‎Your device can\'t manage battery normally because ‎‏‎‎‏‏‎<xliff:g id="APP">%1$s</xliff:g>‎‏‎‎‏‏‏‎ is keeping your device awake.‎‏‎‎‏‏‎\n‎‏‎‎‏‏‏‎‎‏‎‎‏‏‎\n‎‏‎‎‏‏‏‎To try to fix this issue, you can stop the app.‎‏‎‎‏‏‎\n‎‏‎‎‏‏‏‎‎‏‎‎‏‏‎\n‎‏‎‎‏‏‏‎If this keeps happening, you may need to uninstall the app to improve battery performance.‎‏‎‎‏‎"</string>
+    <string name="dialog_stop_message_wakeup_alarm" product="default" msgid="1638726742782558262">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‎‏‏‎‏‎‏‏‏‏‎‏‏‏‏‎‏‏‎‏‎‏‎‎‏‎‏‎‎‏‎‎‏‎‏‏‎‏‏‏‏‏‎‎‏‏‎‎‎‎‎‎‎‎‏‏‎‏‏‎‎Your phone can\'t manage battery normally because ‎‏‎‎‏‏‎<xliff:g id="APP_0">%1$s</xliff:g>‎‏‎‎‏‏‏‎ keeps waking up your phone.‎‏‎‎‏‏‎\n‎‏‎‎‏‏‏‎‎‏‎‎‏‏‎\n‎‏‎‎‏‏‏‎To try to fix this issue, you can stop ‎‏‎‎‏‏‎<xliff:g id="APP_1">%1$s</xliff:g>‎‏‎‎‏‏‏‎.‎‏‎‎‏‏‎\n‎‏‎‎‏‏‏‎‎‏‎‎‏‏‎\n‎‏‎‎‏‏‏‎If this keeps happening, you may need to uninstall the app to improve battery performance.‎‏‎‎‏‎"</string>
+    <string name="dialog_stop_message_wakeup_alarm" product="tablet" msgid="8771690983566539742">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‏‎‎‏‏‎‏‏‏‎‏‏‎‏‎‎‏‏‏‎‎‏‏‏‏‎‎‏‏‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‏‏‏‏‏‎‏‏‏‏‎‏‏‏‏‎‎Your tablet can\'t manage battery normally because ‎‏‎‎‏‏‎<xliff:g id="APP_0">%1$s</xliff:g>‎‏‎‎‏‏‏‎ keeps waking up your tablet.‎‏‎‎‏‏‎\n‎‏‎‎‏‏‏‎‎‏‎‎‏‏‎\n‎‏‎‎‏‏‏‎To try to fix this issue, you can stop ‎‏‎‎‏‏‎<xliff:g id="APP_1">%1$s</xliff:g>‎‏‎‎‏‏‏‎.‎‏‎‎‏‏‎\n‎‏‎‎‏‏‏‎‎‏‎‎‏‏‎\n‎‏‎‎‏‏‏‎If this keeps happening, you may need to uninstall the app to improve battery performance.‎‏‎‎‏‎"</string>
+    <string name="dialog_stop_message_wakeup_alarm" product="device" msgid="2854944538238649520">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‎‏‏‏‏‎‎‏‏‏‏‎‏‏‎‎‏‏‎‎‏‏‏‎‏‏‏‎‎‏‏‎‏‏‏‏‎‎‏‎‏‎‎‎‎‎‎‎‎‏‎‎‏‎‏‏‎‎‎‎‎Your device can\'t manage battery normally because ‎‏‎‎‏‏‎<xliff:g id="APP_0">%1$s</xliff:g>‎‏‎‎‏‏‏‎ keeps waking up your device.‎‏‎‎‏‏‎\n‎‏‎‎‏‏‏‎‎‏‎‎‏‏‎\n‎‏‎‎‏‏‏‎To try to fix this issue, you can stop ‎‏‎‎‏‏‎<xliff:g id="APP_1">%1$s</xliff:g>‎‏‎‎‏‏‏‎.‎‏‎‎‏‏‎\n‎‏‎‎‏‏‏‎‎‏‎‎‏‏‎\n‎‏‎‎‏‏‏‎If this keeps happening, you may need to uninstall the app to improve battery performance.‎‏‎‎‏‎"</string>
+    <string name="dialog_stop_ok" msgid="2319777211264004900">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‎‎‎‎‎‎‏‏‎‎‎‏‏‎‎‎‎‎‎‏‎‎‎‏‎‏‎‏‎‎‏‏‏‎‏‏‎‏‏‎‏‏‏‏‏‏‏‏‎‎‏‏‎‎‏‎‎‏‎‎‎Stop app‎‏‎‎‏‎"</string>
+    <string name="dialog_background_check_title" msgid="6936542136153283692">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‎‎‎‎‎‏‎‎‎‎‏‏‏‎‎‎‏‏‎‎‎‏‎‏‎‎‏‎‎‏‎‎‏‎‏‎‏‏‏‏‎‎‏‎‎‎‎‏‏‏‎‎‎‏‏‎‏‏‎‎‎Turn off background usage &amp; stop app?‎‏‎‎‏‎"</string>
+    <string name="dialog_background_check_message" product="default" msgid="4045827746349279563">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‏‏‎‏‎‏‎‏‎‏‏‏‎‎‏‏‎‎‏‎‎‏‎‏‏‏‎‎‏‎‎‎‏‎‏‏‎‏‎‎‏‎‏‎‎‏‎‏‏‎Your phone can\'t manage battery normally because ‎‏‎‎‏‏‎<xliff:g id="APP_0">%1$s</xliff:g>‎‏‎‎‏‏‏‎ keeps waking up your phone.‎‏‎‎‏‏‎\n‎‏‎‎‏‏‏‎‎‏‎‎‏‏‎\n‎‏‎‎‏‏‏‎To try to fix this issue, you can stop ‎‏‎‎‏‏‎<xliff:g id="APP_1">%1$s</xliff:g>‎‏‎‎‏‏‏‎ and prevent it from running in the background.‎‏‎‎‏‎"</string>
+    <string name="dialog_background_check_message" product="tablet" msgid="8348214419901788270">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‎‎‏‏‏‏‎‏‏‎‏‎‏‏‎‏‎‎‎‎‏‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‎‎‎‎‏‎‏‎‎‎‏‏‎‎‎‎‎‏‏‎‏‏‏‎‎Your tablet can\'t manage battery normally because ‎‏‎‎‏‏‎<xliff:g id="APP_0">%1$s</xliff:g>‎‏‎‎‏‏‏‎ keeps waking up your tablet.‎‏‎‎‏‏‎\n‎‏‎‎‏‏‏‎‎‏‎‎‏‏‎\n‎‏‎‎‏‏‏‎To try to fix this issue, you can stop ‎‏‎‎‏‏‎<xliff:g id="APP_1">%1$s</xliff:g>‎‏‎‎‏‏‏‎ and prevent it from running in the background.‎‏‎‎‏‎"</string>
+    <string name="dialog_background_check_message" product="device" msgid="5847977433118915863">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‎‎‎‏‎‎‏‎‏‎‎‎‎‎‏‏‎‎‎‎‎‏‏‏‏‏‎‏‏‏‎‏‎‎‏‏‏‎‎‎‏‏‎‏‏‎‏‏‏‏‎‏‎‎‎‏‎‏‏‏‎Your device can\'t manage battery normally because ‎‏‎‎‏‏‎<xliff:g id="APP_0">%1$s</xliff:g>‎‏‎‎‏‏‏‎ keeps waking up your device.‎‏‎‎‏‏‎\n‎‏‎‎‏‏‏‎‎‏‎‎‏‏‎\n‎‏‎‎‏‏‏‎To try to fix this issue, you can stop ‎‏‎‎‏‏‎<xliff:g id="APP_1">%1$s</xliff:g>‎‏‎‎‏‏‏‎ and prevent it from running in the background.‎‏‎‎‏‎"</string>
+    <string name="dialog_background_check_ok" msgid="412876934682899659">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‎‏‏‏‎‏‏‎‏‏‏‎‏‎‏‏‎‏‎‏‎‏‎‏‏‎‎‎‏‎‎‏‏‏‎‎‏‏‏‎‏‏‏‎‎‏‏‏‏‏‎‏‎‎‏‏‎‎‏‎‏‏‎Turn off‎‏‎‎‏‎"</string>
+    <string name="dialog_location_title" msgid="5888917530725874727">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‎‎‎‏‏‎‏‏‏‎‎‏‏‎‏‎‎‎‏‏‎‏‎‎‏‎‏‏‎‎‎‏‏‎‏‎‎‏‏‏‏‏‎‎‎‏‏‏‏‏‎‎‎‎‏‎‎‏‏‏‎Turn off location?‎‏‎‎‏‎"</string>
+    <string name="dialog_location_message" product="default" msgid="7774807745601479888">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‏‎‏‏‏‏‏‎‎‏‎‏‏‎‏‎‏‎‏‎‎‏‏‏‎‎‏‏‏‎‏‏‎‎‎‏‏‎‎‎‏‎‎‎‎‎‏‎‎‏‎‎‏‏‎‏‎‎‎‎‎Your phone can\'t manage battery normally because ‎‏‎‎‏‏‎<xliff:g id="APP">%1$s</xliff:g>‎‏‎‎‏‏‏‎ keeps requesting your location when you\'re not using the app.‎‏‎‎‏‏‎\n‎‏‎‎‏‏‏‎‎‏‎‎‏‏‎\n‎‏‎‎‏‏‏‎To fix this issue, you can turn off location for this app.‎‏‎‎‏‎"</string>
+    <string name="dialog_location_message" product="tablet" msgid="118745801732181618">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‎‎‏‏‏‎‏‎‎‏‎‏‏‏‎‏‏‏‏‎‏‎‏‎‏‏‎‏‎‏‏‏‎‎‏‎‏‏‎‏‎‎‎‎‏‏‎‎‏‏‏‎‎‏‏‏‎‎‏‎‎Your tablet can\'t manage battery normally because ‎‏‎‎‏‏‎<xliff:g id="APP">%1$s</xliff:g>‎‏‎‎‏‏‏‎ keeps requesting your location when you\'re not using the app.‎‏‎‎‏‏‎\n‎‏‎‎‏‏‏‎‎‏‎‎‏‏‎\n‎‏‎‎‏‏‏‎To fix this issue, you can turn off location for this app.‎‏‎‎‏‎"</string>
+    <string name="dialog_location_message" product="device" msgid="6783678153382298295">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‏‏‏‎‎‎‏‎‎‏‎‎‎‏‏‏‎‏‏‏‎‏‎‏‎‏‏‎‏‏‎‎‏‎‏‎‏‏‏‎‏‏‏‎‎‎‎‎‎‎‏‎‏‎‏‏‎‏‏‏‎Your device can\'t manage battery normally because ‎‏‎‎‏‏‎<xliff:g id="APP">%1$s</xliff:g>‎‏‎‎‏‏‏‎ keeps requesting your location when you\'re not using the app.‎‏‎‎‏‏‎\n‎‏‎‎‏‏‏‎‎‏‎‎‏‏‎\n‎‏‎‎‏‏‏‎To fix this issue, you can turn off location for this app.‎‏‎‎‏‎"</string>
+    <string name="dialog_location_ok" msgid="4572391197601313986">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‏‏‏‏‎‏‏‏‎‏‎‎‎‏‏‎‎‏‎‏‏‎‎‏‎‎‎‏‏‎‎‏‎‎‏‏‎‎‏‎‎‏‏‎‎‎‏‏‎‏‎‎‏‏‎‎‎‎‏‎‎Turn off‎‏‎‎‏‎"</string>
+    <string name="power_screen" msgid="3023346080675904613">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‏‎‎‏‏‏‏‏‎‏‎‏‎‎‎‏‎‏‎‏‎‎‏‏‏‏‎‏‏‏‏‏‎‎‏‏‏‏‎‎‎‎‎‏‏‎‏‏‏‏‎‎‎‏‏‎‎‏‎‏‎Screen‎‏‎‎‏‎"</string>
+    <string name="power_flashlight" msgid="7794409781003567614">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‏‏‎‎‎‎‏‎‏‎‏‏‎‏‎‎‏‏‏‎‎‏‏‎‎‏‏‎‎‎‏‏‎‏‏‎‏‎‎‎‏‏‎‎‎‏‎‎‎‎‎‏‏‏‏‏‏‏‏‎‎Flashlight‎‏‎‎‏‎"</string>
+    <string name="power_camera" msgid="4976286950934622605">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‎‏‎‏‎‎‎‎‏‏‏‏‎‏‎‏‎‎‏‎‏‎‎‏‏‏‎‏‏‏‎‎‏‎‏‎‏‏‎‏‏‏‏‎‏‎‏‏‎‎‎‏‏‎‎‎‏‏‎‏‎Camera‎‏‎‎‏‎"</string>
+    <string name="power_wifi" msgid="1135085252964054957">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‎‏‏‏‏‏‏‎‎‎‎‎‎‏‎‏‎‎‎‏‎‎‎‎‎‎‏‏‎‎‎‎‎‏‏‎‎‏‎‏‏‎‏‎‎‏‏‏‏‎‏‏‏‏‎‏‎‏‏‎‏‎Wi‑Fi‎‏‎‎‏‎"</string>
+    <string name="power_bluetooth" msgid="4373329044379008289">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‏‏‎‎‏‎‏‏‎‎‎‏‎‎‏‎‏‏‏‏‏‎‎‏‏‎‎‎‎‏‎‏‎‎‎‎‎‎‎‏‏‎‏‏‏‏‏‏‏‏‎‏‎‎‏‎‎‎‎‏‎Bluetooth‎‏‎‎‏‎"</string>
+    <string name="power_cell" msgid="3392999761958982492">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‏‏‏‏‎‎‎‏‎‏‏‎‎‏‎‏‏‎‏‏‎‏‎‎‏‏‏‎‎‏‏‏‏‏‏‎‏‎‎‎‏‏‎‎‏‏‎‏‎‎‏‏‎‏‎‏‏‏‎‎‎Mobile network standby‎‏‎‎‏‎"</string>
+    <string name="power_phone" msgid="5392641106474567277">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‏‎‏‎‏‏‎‏‎‏‏‎‏‎‎‎‎‎‏‎‏‎‎‎‎‎‏‏‏‏‎‏‎‎‎‎‏‎‎‏‎‏‏‎‎‎‎‎‎‏‏‎‎‏‏‎‏‏‎‏‎Voice calls‎‏‎‎‏‎"</string>
+    <string name="power_idle" product="tablet" msgid="4612478572401640759">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‎‎‎‎‎‎‎‎‎‎‏‎‏‏‎‏‎‎‎‎‏‏‎‏‎‎‏‎‏‏‎‏‏‎‏‎‎‎‎‏‏‎‎‏‏‏‎‎‎‏‎‏‎‎‏‏‎‏‏‏‎Tablet idle‎‏‎‎‏‎"</string>
+    <string name="power_idle" product="default" msgid="9055659695602194990">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‏‏‎‏‏‎‏‎‏‏‎‎‎‎‏‎‏‎‏‎‏‎‎‎‎‎‏‏‏‎‏‎‎‎‏‏‎‎‏‏‎‎‎‎‏‏‎‏‏‎‏‎‎‎‏‎‏‏‏‎‎Phone idle‎‏‎‎‏‎"</string>
+    <string name="power_unaccounted" msgid="709925017022660740">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‎‏‎‎‏‏‏‎‏‏‎‏‎‎‎‏‎‏‎‎‏‎‎‎‎‏‎‏‎‏‎‏‎‏‎‎‎‏‏‎‎‏‏‎‎‏‎‎‎‎‎‎‎‏‎‎‎‎‏‎‎‎Miscellaneous‎‏‎‎‏‎"</string>
+    <string name="power_overcounted" msgid="2762354976171358445">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‎‏‏‎‎‏‎‏‎‏‎‏‏‏‎‏‏‎‏‏‎‎‏‏‎‏‏‏‎‎‎‏‏‎‏‎‎‎‏‏‏‎‎‏‏‏‏‏‏‎‎‎‏‏‏‎‏‏‎‏‎Over-counted‎‏‎‎‏‎"</string>
+    <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="3706143225319881667">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‎‎‏‏‎‏‏‎‏‏‏‎‏‏‎‏‏‏‎‏‏‎‏‎‎‎‎‎‏‎‎‏‏‏‏‏‏‏‏‎‏‎‎‏‎‏‏‏‏‎‏‏‏‏‎‎‎‎‏‏‎Other users‎‏‎‎‏‎"</string>
+    <string name="usage_type_cpu" msgid="715162150698338714">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‎‏‎‎‏‏‏‏‎‏‏‎‎‏‏‎‎‎‏‎‎‎‎‏‎‏‏‏‏‏‏‎‏‏‏‎‏‎‎‏‎‏‏‎‏‏‏‎‎‏‎‎‏‏‎‎‏‏‎‏‎‎CPU total‎‏‎‎‏‎"</string>
+    <string name="usage_type_cpu_foreground" msgid="6500579611933211831">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‏‎‏‎‎‎‏‏‎‏‏‎‏‎‏‏‎‎‏‎‏‎‏‏‎‏‏‏‎‎‏‎‏‎‏‏‎‏‏‎‏‏‎‎‏‏‏‏‏‏‎‎‏‎‏‏‎‏‏‏‎CPU foreground‎‏‎‎‏‎"</string>
+    <string name="usage_type_wake_lock" msgid="5125438890233677880">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‎‏‏‏‎‎‏‎‎‎‎‏‎‎‏‏‎‏‏‏‏‎‎‎‎‎‏‏‏‏‎‏‎‎‏‎‎‏‎‏‏‎‎‏‏‏‎‎‏‎‎‎‎‎‏‏‏‎‎‎‎Keep awake‎‏‎‎‏‎"</string>
+    <string name="usage_type_gps" msgid="7989688715128160790">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‏‏‏‎‏‏‏‎‎‎‎‏‎‎‎‏‎‎‏‏‏‎‎‎‏‏‏‎‎‎‏‎‎‎‏‏‎‎‏‎‏‎‎‏‎‏‎‎‎‎‏‎‎‎‎‏‎‏‏‎‎GPS‎‏‎‎‏‎"</string>
+    <string name="usage_type_wifi_running" msgid="3134357198266380400">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‏‎‏‏‎‏‏‏‏‏‏‏‎‏‏‏‏‎‎‏‎‏‎‎‎‎‏‏‏‏‏‎‏‎‎‏‏‏‎‏‏‎‏‏‎‎‏‏‎‎‎‎‎‏‏‏‎‎‎‎‎Wi‑Fi running‎‏‎‎‏‎"</string>
+    <string name="usage_type_phone" product="tablet" msgid="262638572890253393">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‎‏‎‏‏‏‎‏‎‎‏‎‏‎‎‎‏‎‏‎‎‎‏‏‎‎‎‏‏‏‏‏‏‏‎‎‏‎‏‏‏‎‎‎‎‎‏‏‎‏‎‎‎‎‏‎‏‎‎‎‏‎Tablet‎‏‎‎‏‎"</string>
+    <string name="usage_type_phone" product="default" msgid="9108247984998041853">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‏‏‏‎‎‏‏‎‎‏‏‎‏‏‏‏‏‏‏‏‎‏‎‎‏‎‎‎‏‏‏‎‎‏‏‏‏‏‏‏‏‎‎‏‏‏‎‎‏‎‎‎‏‏‏‏‏‏‎‏‎Phone‎‏‎‎‏‎"</string>
+    <string name="usage_type_data_send" msgid="8971710128438365919">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‏‏‎‎‏‎‎‎‎‎‎‏‏‏‏‎‏‎‏‎‏‏‎‏‎‎‏‏‏‏‏‎‎‎‎‏‎‏‎‏‎‏‏‏‏‏‎‎‏‏‏‎‏‏‎‏‏‏‏‏‎Mobile packets sent‎‏‎‎‏‎"</string>
+    <string name="usage_type_data_recv" msgid="5468564329333954445">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‏‎‏‏‏‏‏‎‎‏‎‎‎‎‏‏‏‏‏‎‎‏‎‎‏‎‎‎‏‎‏‎‏‎‎‏‎‏‎‏‎‎‏‎‏‎‎‏‎‏‏‏‏‎‎‎‏‏‎‏‎Mobile packets received‎‏‎‎‏‎"</string>
+    <string name="usage_type_radio_active" msgid="1732647857619420121">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‏‎‎‎‎‎‎‎‏‎‏‏‏‎‎‏‏‎‏‎‎‎‎‎‏‎‏‏‏‏‏‎‏‎‏‎‎‎‏‏‏‏‏‏‎‏‎‎‎‎‏‏‏‏‎‏‏‎‎‏‎Mobile radio active‎‏‎‎‏‎"</string>
+    <string name="usage_type_data_wifi_send" msgid="1847552143597396162">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‏‎‎‏‏‎‏‎‎‎‏‏‏‏‎‏‎‎‏‎‏‏‏‎‎‎‏‎‏‏‎‎‎‏‏‏‎‎‏‎‎‎‏‎‎‏‏‎‎‎‎‎‏‏‎‎‎‎‏‎‎Wi‑Fi packets sent‎‏‎‎‏‎"</string>
+    <string name="usage_type_data_wifi_recv" msgid="5678475911549183829">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‏‏‏‎‏‏‎‎‏‏‎‏‏‏‏‏‏‏‏‏‏‏‎‎‎‎‎‏‎‏‏‏‎‏‎‏‏‎‎‎‎‎‎‎‎‏‏‎‎‏‏‏‎‏‎‏‎‏‎‏‎Wi‑Fi packets received‎‏‎‎‏‎"</string>
+    <string name="usage_type_audio" msgid="6957269406840886290">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‎‎‎‎‏‎‎‎‏‏‎‏‎‎‏‎‏‏‏‏‏‎‏‎‏‎‏‎‎‎‎‏‎‎‎‏‎‏‏‏‎‎‎‏‏‎‎‏‎‏‎‎‎‎‎‏‎‎‏‎‎Audio‎‏‎‎‏‎"</string>
+    <string name="usage_type_video" msgid="4295357792078579944">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‏‎‏‏‏‎‎‏‏‏‎‎‎‎‏‎‏‏‎‏‎‎‏‎‎‏‏‏‎‏‏‏‎‏‎‎‎‎‎‎‏‏‎‎‏‏‎‎‏‎‎‎‏‏‏‎‏‎‎‎‎Video‎‏‎‎‏‎"</string>
+    <string name="usage_type_camera" msgid="8299433109956769757">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‎‎‏‏‎‎‏‎‏‏‎‏‏‎‎‎‎‎‏‎‎‏‏‏‎‎‎‎‏‏‏‏‎‏‎‎‎‎‎‏‎‏‏‎‏‎‏‏‎‏‏‏‏‏‎‏‏‏‎‏‎Camera‎‏‎‎‏‎"</string>
+    <string name="usage_type_flashlight" msgid="1516392356962208230">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‎‏‎‏‎‎‎‎‏‎‏‏‎‏‎‎‏‏‏‎‏‏‎‏‎‎‎‎‏‎‎‎‎‎‎‎‏‏‎‏‏‎‎‏‏‎‎‎‏‎‎‏‏‏‏‎‎‏‏‎‎Flashlight‎‏‎‎‏‎"</string>
+    <string name="usage_type_on_time" msgid="3351200096173733159">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‏‏‏‎‏‎‎‎‎‎‎‏‏‏‎‏‏‎‏‎‏‎‏‏‏‎‏‏‎‏‏‎‎‏‏‏‏‎‏‏‎‎‎‎‏‎‏‏‎‏‎‏‎‎‏‎‎‏‏‏‎Time on‎‏‎‎‏‎"</string>
+    <string name="usage_type_no_coverage" msgid="3797004252954385053">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‎‏‎‎‏‎‏‏‎‎‎‏‏‎‏‎‏‎‏‏‎‏‎‎‎‎‎‎‎‎‏‎‏‎‏‏‏‏‏‏‏‏‏‎‎‏‎‏‏‎‏‎‏‎‎‏‏‏‎‏‎Time without a signal‎‏‎‎‏‎"</string>
+    <string name="usage_type_total_battery_capacity" msgid="3798285287848675346">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‎‏‎‎‏‎‏‏‎‏‏‎‎‎‏‏‏‎‎‎‎‏‎‏‏‎‎‎‎‏‎‏‏‎‎‏‏‏‎‏‎‎‎‎‎‎‎‎‏‎‎‎‎‎‎‏‎‎‏‎‎Total battery capacity‎‏‎‎‏‎"</string>
+    <string name="usage_type_computed_power" msgid="5862792259009981479">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‎‎‎‏‎‏‎‏‏‏‎‎‏‏‎‏‎‎‏‎‎‏‏‏‏‏‏‏‎‏‎‎‎‏‏‎‎‎‏‏‎‎‏‏‎‎‏‎‏‏‎‎‎‎‏‎‎‏‏‏‎Computed power use‎‏‎‎‏‎"</string>
+    <string name="usage_type_actual_power" msgid="7047814738685578335">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‎‎‎‏‏‏‎‎‏‏‏‎‏‏‎‏‏‏‏‎‎‎‏‎‏‎‎‏‏‏‏‏‎‏‏‎‎‎‎‏‏‏‎‏‏‏‎‎‏‏‎‎‎‏‎‏‏‏‏‏‎Observed power use‎‏‎‎‏‎"</string>
+    <string name="battery_action_stop" msgid="649958863744041872">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‎‏‎‎‏‎‎‎‎‎‏‎‏‎‎‎‏‏‏‏‎‎‎‏‎‎‏‎‎‏‎‎‏‏‎‎‎‎‎‎‏‎‏‎‎‏‎‎‎‎‎‏‏‏‎‎‏‎‎‎‎‎Force stop‎‏‎‎‏‎"</string>
+    <string name="battery_action_app_details" msgid="7861051816778419018">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‏‏‎‏‎‎‎‏‏‎‎‎‎‎‎‏‎‎‎‎‏‏‏‏‏‎‏‎‎‏‎‎‏‏‎‎‎‎‎‎‎‏‎‎‎‏‎‎‏‎‏‏‎‏‎‎‏‎‏‎‎App info‎‏‎‎‏‎"</string>
+    <string name="battery_action_app_settings" msgid="4570481408106287454">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‏‏‏‏‎‏‏‎‏‏‎‏‏‎‎‏‏‏‎‎‏‎‏‎‎‎‎‎‎‎‎‎‏‏‏‎‏‎‏‏‎‎‏‏‏‏‎‏‎‎‎‏‎‏‎‏‏‏‏‎‎App settings‎‏‎‎‏‎"</string>
+    <string name="battery_action_display" msgid="7338551244519110831">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‎‏‎‏‏‏‎‏‎‏‏‏‏‏‎‎‎‏‎‏‎‏‏‏‏‎‎‏‏‎‏‏‏‏‏‏‏‎‎‎‏‏‏‏‏‏‏‏‏‎‎‎‏‎‏‎‏‏‏‏‎Screen settings‎‏‎‎‏‎"</string>
+    <string name="battery_action_wifi" msgid="8181553479021841207">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‎‎‎‏‏‎‎‎‏‎‏‎‏‎‏‏‎‏‏‏‏‎‎‎‏‎‏‎‏‎‎‏‏‎‏‏‏‏‏‏‎‏‎‏‎‏‎‎‏‎‏‏‎‎‏‏‎‏‏‏‎Wi‑Fi settings‎‏‎‎‏‎"</string>
+    <string name="battery_action_bluetooth" msgid="8374789049507723142">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‎‏‎‎‎‎‏‏‏‎‎‏‎‎‏‏‏‎‏‎‎‏‎‎‎‏‎‎‏‏‎‏‏‏‎‎‏‎‏‏‏‏‎‏‎‎‏‏‎‏‏‏‏‎‎‎‎‏‏‎‎Bluetooth settings‎‏‎‎‏‎"</string>
+    <string name="battery_desc_voice" msgid="8980322055722959211">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‏‏‎‎‏‎‏‎‎‎‎‎‏‎‎‎‎‎‏‏‎‏‎‏‎‏‎‎‎‏‏‏‎‎‏‏‏‏‏‏‏‎‎‏‎‎‎‎‎‎‎‏‎‏‏‎‏‎‏‏‎Battery used by voice calls‎‏‎‎‏‎"</string>
+    <string name="battery_desc_standby" product="tablet" msgid="6284747418668280364">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‎‏‏‏‎‎‏‏‎‏‏‏‏‏‏‎‏‎‎‎‎‏‏‏‏‎‏‎‏‎‏‏‎‎‎‎‏‏‎‎‎‏‏‎‏‎‏‎‏‎‏‎‎‎‏‎‏‏‎‎‎Battery used when tablet is idle‎‏‎‎‏‎"</string>
+    <string name="battery_desc_standby" product="default" msgid="3009080001948091424">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‏‎‎‏‏‏‎‎‎‎‏‎‎‏‏‎‎‏‏‎‎‏‎‏‎‎‎‏‏‎‏‎‏‎‎‎‏‏‎‏‏‎‎‏‎‎‎‎‎‏‎‎‎‎‏‎‎‎‎‎‎Battery used when phone is idle‎‏‎‎‏‎"</string>
+    <string name="battery_desc_radio" msgid="5479196477223185367">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‏‏‎‎‎‎‎‎‏‎‏‎‎‎‎‎‎‏‎‎‎‎‏‎‏‎‏‎‎‏‏‏‏‏‏‏‎‏‏‏‎‏‎‏‏‎‏‎‏‎‏‏‏‏‎‏‎‏‏‏‎Battery used by cell radio‎‏‎‎‏‎"</string>
+    <string name="battery_sugg_radio" msgid="8211336978326295047">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‎‎‎‏‏‏‏‏‎‏‎‎‏‎‎‎‎‏‏‏‎‏‏‏‏‎‎‏‏‏‏‎‏‏‎‎‎‎‏‎‏‎‏‏‎‎‎‏‎‎‏‎‎‎‎‎‎‏‏‏‎Switch to airplane mode to save power in areas with no cell coverage‎‏‎‎‏‎"</string>
+    <string name="battery_desc_flashlight" msgid="2908579430841025494">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‏‎‎‎‎‏‎‏‏‏‎‏‎‏‎‏‏‎‎‏‏‎‎‏‎‏‎‏‎‎‎‎‎‎‎‎‎‏‎‎‏‎‎‏‏‎‎‎‎‎‏‏‏‏‎‏‎‏‏‎‎Battery used by the flashlight‎‏‎‎‏‎"</string>
+    <string name="battery_desc_camera" msgid="7375389919760613499">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‎‏‏‎‎‏‎‏‏‎‏‎‏‎‏‎‎‏‏‎‎‎‎‎‏‏‏‎‎‎‏‏‎‏‏‏‎‏‎‏‎‏‎‎‎‎‎‎‎‎‎‎‎‏‏‏‏‎‏‏‎Battery used by the camera‎‏‎‎‏‎"</string>
+    <string name="battery_desc_display" msgid="5432795282958076557">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‏‎‏‏‎‏‏‎‎‏‎‏‎‎‏‎‏‎‏‎‏‎‎‎‎‏‏‎‏‎‎‏‎‎‏‎‎‎‏‎‎‎‏‎‎‏‎‎‏‎‏‎‏‎‎‎‏‏‎‏‎Battery used by the display and backlight‎‏‎‎‏‎"</string>
+    <string name="battery_sugg_display" msgid="3370202402045141760">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‏‏‏‎‏‏‎‎‎‏‎‏‎‏‎‏‏‏‎‏‎‎‏‏‏‎‏‎‏‎‎‎‎‎‏‏‎‎‎‏‎‎‎‏‏‎‏‎‎‎‏‏‎‎‎‎‎‎‎‎‎Reduce the screen brightness and/or screen timeout‎‏‎‎‏‎"</string>
+    <string name="battery_desc_wifi" msgid="2375567464707394131">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‎‎‎‎‏‏‏‏‎‏‏‏‏‎‏‏‎‏‏‎‎‎‎‎‎‏‎‏‏‏‎‏‏‎‎‏‏‏‎‏‏‏‎‎‎‎‎‎‏‎‏‎‎‏‎‏‎‎‏‏‎Battery used by Wi‑Fi‎‏‎‎‏‎"</string>
+    <string name="battery_sugg_wifi" msgid="7776093125855397043">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‏‎‏‏‏‏‏‎‏‎‏‎‎‎‏‏‏‎‏‏‎‏‏‏‏‏‏‏‏‎‎‏‏‎‏‎‏‏‏‏‎‏‏‏‏‏‎‎‎‏‎‎‏‎‏‏‎‎‏‏‎Turn off Wi‑Fi when not using it or when it isn’t available‎‏‎‎‏‎"</string>
+    <string name="battery_desc_bluetooth" msgid="8069070756186680367">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‏‏‏‏‏‏‏‏‏‎‏‏‎‎‎‏‏‎‎‏‎‎‎‏‏‎‎‏‏‏‎‏‏‎‎‏‏‏‏‏‏‏‏‏‏‏‏‎‏‏‎‎‎‎‏‎‏‏‏‏‎Battery used by Bluetooth‎‏‎‎‏‎"</string>
+    <string name="battery_sugg_bluetooth_basic" msgid="4565141162650835009">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‏‏‏‏‎‏‎‏‏‎‏‎‏‎‏‎‎‎‏‏‏‎‏‏‎‎‏‏‎‏‎‎‎‏‎‏‎‏‎‏‎‎‎‏‎‎‎‏‏‎‎‎‎‏‎‎‎‎‎‏‎Turn off Bluetooth when you aren’t using it‎‏‎‎‏‎"</string>
+    <string name="battery_sugg_bluetooth_headset" msgid="4071352514714259230">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‏‎‎‎‏‎‎‎‎‎‎‎‎‏‎‏‏‎‎‏‏‎‎‎‏‎‏‎‏‎‎‎‏‎‏‎‏‏‏‎‏‏‏‏‏‏‎‎‏‏‏‏‎‎‎‏‏‏‏‎‎Try connecting to a different Bluetooth device‎‏‎‎‏‎"</string>
+    <string name="battery_desc_apps" msgid="8530418792605735226">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‎‏‏‎‎‏‏‎‎‎‏‎‎‎‏‎‎‎‏‎‏‎‏‏‎‎‏‎‎‎‎‏‏‏‏‎‏‎‎‏‎‏‎‎‏‏‎‏‏‎‎‏‎‎‏‏‏‎‏‎‎Battery used by app‎‏‎‎‏‎"</string>
+    <string name="battery_sugg_apps_info" msgid="6907588126789841231">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‏‏‏‏‏‏‎‏‏‏‎‎‏‎‏‎‏‏‏‎‏‏‎‎‏‏‎‏‏‎‏‎‏‎‎‎‎‎‎‎‎‎‏‏‏‎‏‏‎‎‎‏‎‏‎‎‏‏‏‏‎Stop or uninstall the app‎‏‎‎‏‎"</string>
+    <string name="battery_sugg_apps_gps" msgid="5959067516281866135">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‎‎‏‎‏‎‏‏‎‎‏‎‏‏‎‏‏‏‎‎‎‏‎‏‎‏‎‏‎‏‏‎‎‏‎‎‏‎‎‎‏‏‎‎‏‏‎‎‎‏‏‏‏‎‎‏‎‏‏‏‎Select battery-saving mode‎‏‎‎‏‎"</string>
+    <string name="battery_sugg_apps_settings" msgid="3974902365643634514">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‎‏‏‏‎‎‏‎‏‎‎‏‏‎‏‏‎‎‎‎‏‎‏‎‎‏‎‎‎‏‎‎‎‎‎‏‎‎‎‎‏‏‎‎‎‏‏‏‎‏‏‏‎‏‎‏‎‎‏‎‎The app may offer settings to reduce battery use‎‏‎‎‏‎"</string>
+    <string name="battery_desc_users" msgid="7682989161885027823">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‏‎‏‎‏‎‎‏‏‏‏‏‎‏‏‏‎‏‎‏‏‏‏‎‏‏‏‏‏‎‏‏‏‏‏‏‎‏‎‏‎‏‎‏‎‏‎‎‏‏‎‏‏‏‏‎‏‏‏‏‎Battery used by user‎‏‎‎‏‎"</string>
+    <string name="battery_desc_unaccounted" msgid="7404256448541818019">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‎‏‏‎‏‏‎‎‎‎‎‏‎‎‏‏‎‏‎‎‎‎‎‎‎‎‏‎‏‎‏‏‎‎‎‏‎‎‏‏‏‎‏‎‏‏‏‏‏‏‎‎‏‎‏‎‎‎‏‏‎Miscellaneous power use‎‏‎‎‏‎"</string>
+    <string name="battery_msg_unaccounted" msgid="1963583522633067961">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‏‎‏‏‎‏‎‎‎‎‎‎‎‎‎‎‏‏‎‎‏‏‎‎‏‏‏‏‎‏‏‏‎‎‎‏‎‏‎‏‏‎‏‎‏‎‏‎‏‏‎‏‏‎‏‏‏‎‎‏‎Battery use is an approximation of power use and does not include every source of battery drain. Miscellaneous is the difference between the computed approximate power use and the actual drain observed on the battery.‎‏‎‎‏‎"</string>
+    <string name="battery_desc_overcounted" msgid="5481865509489228603">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‏‏‎‎‎‎‎‏‎‎‏‏‎‏‏‏‏‏‏‏‏‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‎‎‏‎‎‏‎‎‎‏‏‏‎‏‏‎‎‏‏‏‎‏‏‎Over-counted power use‎‏‎‎‏‎"</string>
+    <string name="mah" msgid="95245196971239711">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‎‎‏‏‎‏‎‏‎‎‏‎‎‏‏‎‎‎‎‏‎‎‎‎‎‎‎‎‏‎‎‎‎‏‎‎‎‎‎‎‏‎‎‎‎‏‏‎‏‎‎‏‎‎‎‏‏‏‏‏‎‎‏‎‎‏‏‎<xliff:g id="NUMBER">%d</xliff:g>‎‏‎‎‏‏‏‎ mAh‎‏‎‎‏‎"</string>
+    <string name="battery_used_for" msgid="2690821851327075443">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‎‏‎‏‎‏‎‏‎‏‏‏‏‎‏‏‏‎‎‎‎‎‏‏‎‏‏‏‏‎‎‏‏‎‏‎‎‎‏‏‎‏‎‏‏‎‎‏‎‏‎‎‎‏‏‏‎‎‏‏‎Used for ‎‏‎‎‏‏‎<xliff:g id="TIME">^1</xliff:g>‎‏‎‎‏‏‏‎‎‏‎‎‏‎"</string>
+    <string name="battery_active_for" msgid="2964359540508103032">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‏‎‎‏‎‎‏‎‎‎‏‏‏‎‎‎‎‏‎‏‎‏‎‎‏‎‏‏‏‏‎‏‎‏‏‎‏‎‎‎‎‏‏‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‎‎‎Active for ‎‏‎‎‏‏‎<xliff:g id="TIME">^1</xliff:g>‎‏‎‎‏‏‏‎‎‏‎‎‏‎"</string>
+    <string name="battery_screen_usage" msgid="6537658662149713585">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‏‎‏‎‏‎‏‏‏‎‏‎‎‏‏‎‏‏‎‏‏‏‏‎‏‎‏‎‎‏‎‎‏‏‎‎‎‎‏‏‎‎‎‎‎‏‏‎‏‏‏‎‏‎‏‏‎‎‎‏‎Screen usage ‎‏‎‎‏‏‎<xliff:g id="TIME">^1</xliff:g>‎‏‎‎‏‏‏‎‎‏‎‎‏‎"</string>
+    <string name="battery_used_by" msgid="1135316757755282999">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‎‏‏‏‏‏‏‎‎‎‎‎‏‎‏‏‏‎‏‎‎‏‎‎‏‎‎‏‏‎‏‏‏‎‏‎‏‏‎‎‎‏‏‎‏‎‏‎‎‎‏‏‎‎‎‏‏‎‏‏‏‎‎‏‎‎‏‏‎<xliff:g id="PERCENT">%1$s</xliff:g>‎‏‎‎‏‏‏‎ used by ‎‏‎‎‏‏‎<xliff:g id="APP">%2$s</xliff:g>‎‏‎‎‏‏‏‎‎‏‎‎‏‎"</string>
+    <string name="battery_overall_usage" msgid="2093409063297375436">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‏‏‎‏‎‎‎‎‏‏‎‏‎‏‎‎‏‎‎‎‎‏‏‏‎‎‏‏‏‎‏‎‎‎‏‏‎‏‏‎‏‏‎‎‎‏‎‏‏‏‎‎‏‏‎‎‏‏‎‎‎‎‏‎‎‏‏‎<xliff:g id="PERCENT">%1$s</xliff:g>‎‏‎‎‏‏‏‎ of overall battery‎‏‎‎‏‎"</string>
+    <string name="battery_detail_since_full_charge" msgid="7515347842046955855">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‏‎‎‎‎‏‎‎‏‎‏‏‏‏‏‎‎‎‎‏‎‎‎‎‏‎‏‏‎‏‎‏‏‎‎‎‏‎‏‏‎‏‎‏‎‎‎‏‎‎‎‏‎‏‎‎‏‏‏‏‎Breakdown since last full charge‎‏‎‎‏‎"</string>
+    <string name="battery_last_full_charge" msgid="7151251641099019361">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‎‎‏‏‎‎‏‏‏‏‏‎‎‏‎‏‏‎‎‏‎‏‏‏‏‎‏‎‏‎‎‎‎‏‏‏‎‎‏‎‎‎‏‎‏‏‏‎‎‏‎‎‎‏‏‎‎‎‎‏‎Last full charge‎‏‎‎‏‎"</string>
+    <string name="battery_footer_summary" msgid="67169726550144016">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‎‎‎‏‏‏‎‏‏‏‎‏‎‏‎‎‎‏‎‏‎‎‎‎‎‏‎‏‎‏‎‏‎‏‎‏‎‏‎‏‏‏‎‎‏‏‏‎‏‎‎‎‎‎‏‎‎‎‎‎Battery usage data is approximate and can change based on usage‎‏‎‎‏‎"</string>
+    <string name="battery_detail_foreground" msgid="3350401514602032183">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‏‏‏‎‎‏‏‏‏‏‏‏‎‎‎‎‎‏‎‎‎‏‏‎‏‏‎‏‎‎‏‎‎‏‎‎‏‏‎‎‏‎‎‎‏‏‏‎‏‏‎‎‎‎‏‏‎‏‏‏‎While in active use‎‏‎‎‏‎"</string>
+    <string name="battery_detail_background" msgid="1929644393553768999">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‏‎‏‎‏‏‎‎‎‏‏‏‎‏‏‏‏‎‎‏‎‏‎‏‏‎‏‎‎‎‏‎‏‏‎‎‏‎‎‏‏‎‎‎‏‎‏‏‎‎‏‎‎‎‏‎‎‏‏‏‎While in background‎‏‎‎‏‎"</string>
+    <string name="battery_detail_power_usage" msgid="6485766868610469101">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‏‎‏‎‎‎‎‎‎‎‏‎‎‎‎‏‎‎‏‎‏‎‎‏‏‎‏‎‏‎‎‏‏‎‏‏‏‎‎‎‎‏‏‎‎‏‎‎‏‏‎‎‏‏‏‎‏‏‎‏‎Battery usage‎‏‎‎‏‎"</string>
+    <string name="battery_detail_power_percentage" msgid="8064814503316094497">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‏‏‏‏‏‏‏‎‏‎‏‏‏‏‏‏‏‎‏‎‎‎‎‎‏‏‏‏‏‏‎‎‎‎‎‏‏‎‎‏‎‎‏‎‏‏‏‏‏‏‏‎‎‎‏‎‎‎‎‏‎‎‏‎‎‏‏‎<xliff:g id="PERCENT">%1$s</xliff:g>‎‏‎‎‏‏‏‎ of total app usage (‎‏‎‎‏‏‎<xliff:g id="POWER">%2$d</xliff:g>‎‏‎‎‏‏‏‎mAh)‎‏‎‎‏‎"</string>
+    <string name="battery_detail_info_title" msgid="8227822131405620369">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‎‎‏‎‎‎‏‎‏‏‏‏‎‎‎‏‏‎‎‎‏‎‏‎‎‎‏‎‏‎‏‏‏‎‎‏‏‎‎‎‎‏‏‏‏‎‎‎‎‏‎‎‏‎‎‏‎‎‎‏‎Since full charge‎‏‎‎‏‎"</string>
+    <string name="battery_detail_manage_title" msgid="9094314252105828014">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‏‏‏‎‎‎‏‏‎‏‎‏‎‏‏‏‏‏‏‎‏‎‏‎‎‎‎‎‏‏‏‎‏‎‎‎‏‎‎‎‏‎‏‎‎‏‎‎‎‏‏‎‏‎‏‎‏‏‏‎‎Manage battery usage‎‏‎‎‏‎"</string>
+    <string name="estimated_time_left" msgid="7514194472683370877">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‏‎‎‎‎‏‎‎‎‏‏‏‏‏‎‎‏‎‎‎‎‎‎‎‏‏‏‏‏‎‎‏‏‏‎‏‎‏‏‏‏‏‏‎‏‏‏‏‏‎‎‏‎‏‏‏‏‏‎‏‎Estimated time left‎‏‎‎‏‎"</string>
+    <string name="estimated_charging_time_left" msgid="5614442409326164691">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‏‏‎‏‏‏‏‎‏‎‏‎‏‎‎‎‎‎‎‏‏‎‎‏‏‏‏‏‏‏‏‎‏‎‏‏‏‏‎‎‎‏‏‎‎‎‏‏‏‎‏‎‏‏‎‏‎‎‏‏‎Until fully charged‎‏‎‎‏‎"</string>
+    <string name="estimated_time_description" msgid="8760210909000037089">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‏‎‎‏‏‎‎‏‎‎‏‎‏‎‎‎‎‏‎‏‎‏‏‎‏‎‎‎‎‏‏‏‏‏‎‎‎‏‏‏‎‎‏‎‏‏‏‏‎‎‏‎‏‏‏‎‎‎‎‏‎Estimate may change based on usage‎‏‎‎‏‎"</string>
+    <string name="menu_stats_unplugged" msgid="8296577130840261624">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‎‎‏‏‎‎‏‎‎‎‏‏‎‏‎‏‏‏‎‎‏‏‏‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‎‏‏‏‎‏‎‎‎‎‎‎‏‏‏‏‏‏‏‎‎‎‎‎‏‎‎‏‏‎<xliff:g id="UNPLUGGED">%1$s</xliff:g>‎‏‎‎‏‏‏‎ since unplugged‎‏‎‎‏‎"</string>
+    <string name="menu_stats_last_unplugged" msgid="5922246077592434526">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‎‎‏‎‎‎‏‏‎‎‎‎‎‎‎‎‏‎‏‏‎‏‏‎‏‏‏‎‎‎‎‏‏‏‏‏‎‏‎‏‏‎‎‎‏‏‏‏‎‏‏‏‎‏‎‏‏‏‏‎‎While last unplugged for ‎‏‎‎‏‏‎<xliff:g id="UNPLUGGED">%1$s</xliff:g>‎‏‎‎‏‏‏‎‎‏‎‎‏‎"</string>
+    <string name="menu_stats_total" msgid="8973377864854807854">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‏‏‎‎‏‎‎‎‎‏‏‏‏‏‎‏‎‏‏‏‏‎‏‎‎‎‎‎‎‎‎‎‎‏‏‎‎‎‎‎‎‏‏‎‎‎‏‎‎‏‎‏‎‎‏‎‏‏‏‎‎Usage totals‎‏‎‎‏‎"</string>
+    <string name="menu_stats_refresh" msgid="1676215433344981075">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‎‏‏‏‎‏‎‎‎‎‏‏‎‎‎‏‏‏‎‏‎‎‎‎‏‏‏‎‎‎‏‏‏‏‏‏‏‎‎‎‏‏‏‎‎‎‎‏‏‎‎‎‎‏‎‏‎‎‏‏‎Refresh‎‏‎‎‏‎"</string>
+    <string name="process_kernel_label" msgid="3916858646836739323">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‎‏‏‎‎‏‎‏‏‎‏‏‎‏‏‏‏‎‏‎‎‎‏‎‏‏‏‏‏‏‎‏‏‎‎‎‎‎‎‏‏‏‏‎‏‏‏‏‏‏‎‎‏‏‏‏‏‎‏‏‎Android OS‎‏‎‎‏‎"</string>
+    <string name="process_mediaserver_label" msgid="6500382062945689285">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‏‎‏‎‎‎‏‏‎‏‎‏‏‏‏‏‏‏‏‏‎‎‎‎‏‎‏‏‏‎‏‏‎‏‏‎‎‎‏‏‎‎‏‎‏‏‎‏‏‏‏‎‏‏‎‎‎‏‎‏‎Mediaserver‎‏‎‎‏‎"</string>
+    <string name="process_dex2oat_label" msgid="2592408651060518226">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‎‎‏‏‏‏‏‏‏‎‏‎‎‎‎‏‎‏‎‏‏‏‏‎‏‏‏‎‏‏‎‏‎‏‏‏‎‎‎‏‏‏‎‎‏‎‎‏‏‏‎‏‎‏‎‏‎‎‏‎‎App optimization‎‏‎‎‏‎"</string>
+    <string name="battery_saver" msgid="1426682272004907982">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‎‎‏‏‏‏‎‎‏‏‎‎‏‎‎‏‎‏‏‏‏‏‏‏‎‏‏‏‏‎‏‎‏‏‏‎‎‎‏‏‎‎‏‏‎‎‏‎‎‎‏‏‏‏‎‎‏‏‏‎‎Battery saver‎‏‎‎‏‎"</string>
+    <string name="battery_saver_turn_on_automatically_title" msgid="9023847300114669426">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‏‏‎‏‎‎‏‏‏‎‏‏‎‎‏‎‎‏‎‏‎‏‎‎‏‏‏‏‎‎‎‏‏‏‏‎‏‎‏‏‎‎‏‏‏‏‎‏‏‏‏‏‎‏‏‏‎‎‏‎‎Turn on automatically‎‏‎‎‏‎"</string>
+    <string name="battery_saver_turn_on_automatically_never" msgid="6610846456314373">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‎‏‎‏‏‎‏‏‏‎‏‏‏‏‏‎‎‏‎‎‎‎‏‏‏‏‎‏‎‎‎‏‎‏‎‏‏‎‎‎‏‎‏‏‏‏‎‏‎‎‎‎‎‎‏‎‏‎Never‎‏‎‎‏‎"</string>
+    <string name="battery_saver_turn_on_automatically_pct" msgid="8665950426992057191">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‏‎‎‎‎‏‎‎‎‎‏‏‏‎‏‎‎‎‏‏‏‏‏‏‏‏‏‏‏‏‎‎‏‎‏‎‎‎‎‎‎‎‎‏‏‎‎‏‏‎‏‏‎‏‏‎‎‏‏‏‎at ‎‏‎‎‏‏‎<xliff:g id="PERCENT">%1$s</xliff:g>‎‏‎‎‏‏‏‎ battery‎‏‎‎‏‎"</string>
+    <string name="battery_percentage" msgid="723291197508049369">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‎‏‎‏‎‎‎‎‎‏‎‎‏‏‎‏‎‎‏‎‏‏‎‎‎‎‎‏‏‎‎‎‏‎‎‎‎‏‎‏‎‎‎‏‎‎‏‎‏‏‎‎‏‏‏‎‏‏‎‎‏‎Battery percentage‎‏‎‎‏‎"</string>
+    <string name="battery_percentage_description" msgid="8511658577507384014">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‎‏‏‎‎‎‎‏‏‏‏‏‎‏‏‏‏‏‎‎‎‏‏‎‎‎‎‏‎‎‏‎‏‎‎‏‏‎‏‏‏‎‏‏‏‏‏‏‏‎‏‎‏‏‎‎‏‏‏‎‎Show battery percentage in status bar‎‏‎‎‏‎"</string>
+    <string name="process_stats_summary_title" msgid="1144688045609771677">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‎‏‏‏‏‏‏‏‎‎‎‏‎‏‎‏‏‏‏‏‏‏‎‏‏‎‏‏‎‎‏‏‏‎‎‎‏‎‎‏‏‎‏‎‎‏‏‏‎‎‎‏‎‏‎‎‏‏‏‎‏‎Process Stats‎‏‎‎‏‎"</string>
+    <string name="process_stats_summary" msgid="109387941605607762">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‎‎‏‏‏‎‎‎‎‏‎‎‏‎‎‏‏‏‏‏‏‏‎‎‎‎‎‎‏‏‎‏‏‎‏‎‎‎‎‏‏‏‎‏‎‎‎‎‏‎‎‏‎‏‎‏‎‎‏‎‎Geeky stats about running processes‎‏‎‎‏‎"</string>
+    <string name="app_memory_use" msgid="7849258480392171939">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‏‏‎‎‏‏‏‎‏‏‏‎‎‎‏‎‏‎‏‏‎‎‎‎‎‎‎‎‎‎‏‏‎‎‎‏‏‏‏‏‏‏‏‏‎‏‏‏‎‎‎‏‏‎‏‎‎‎‏‏‎Memory use‎‏‎‎‏‎"</string>
+    <string name="process_stats_total_duration" msgid="7417201400853728029">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‎‏‏‎‏‏‏‎‏‏‏‏‎‎‏‏‎‎‎‏‎‏‏‎‎‎‎‎‎‏‎‎‎‏‎‏‎‏‏‎‏‎‏‎‏‎‎‎‏‎‏‏‎‎‎‏‏‏‎‏‎‎‏‎‎‏‏‎<xliff:g id="USEDRAM">%1$s</xliff:g>‎‏‎‎‏‏‏‎ of ‎‏‎‎‏‏‎<xliff:g id="TOTALRAM">%2$s</xliff:g>‎‏‎‎‏‏‏‎ used over last ‎‏‎‎‏‏‎<xliff:g id="TIMEDURATION">%3$s</xliff:g>‎‏‎‎‏‏‏‎‎‏‎‎‏‎"</string>
+    <string name="process_stats_total_duration_percentage" msgid="6522457033380025618">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‏‎‏‎‏‎‎‎‎‏‎‎‎‏‏‎‏‏‎‎‎‎‎‏‏‏‎‏‎‏‎‎‏‎‎‏‎‏‎‏‏‏‎‏‎‏‎‏‎‏‎‏‎‎‎‏‎‎‏‎‎‎‏‎‎‏‏‎<xliff:g id="PERCENT">%1$s</xliff:g>‎‏‎‎‏‏‏‎ of RAM used over ‎‏‎‎‏‏‎<xliff:g id="TIMEDURATION">%2$s</xliff:g>‎‏‎‎‏‏‏‎‎‏‎‎‏‎"</string>
+    <string name="process_stats_type_background" msgid="3934992858120683459">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‎‏‏‎‏‎‎‏‏‎‏‏‏‏‏‎‎‏‏‏‎‎‏‎‎‏‏‏‏‏‏‎‏‏‎‏‏‏‏‏‏‎‏‏‎‏‏‏‏‏‏‏‏‏‎‎‎‎‏‏‎Background‎‏‎‎‏‎"</string>
+    <string name="process_stats_type_foreground" msgid="7713118254089580536">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‏‎‏‏‎‎‎‎‏‎‏‎‏‎‎‎‎‎‎‎‎‎‏‎‏‏‏‏‏‎‏‎‏‏‎‏‏‎‎‏‎‏‏‏‎‎‏‎‏‏‏‏‏‏‏‏‏‎‎‎‎Foreground‎‏‎‎‏‎"</string>
+    <string name="process_stats_type_cached" msgid="6314925846944806511">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‎‏‏‏‏‎‏‎‎‎‏‏‎‎‎‏‏‏‏‏‏‎‎‏‏‎‎‏‏‎‎‏‎‎‏‎‎‎‎‏‎‎‏‏‏‏‏‏‎‏‏‎‎‏‏‎‏‏‏‏‎Cached‎‏‎‎‏‎"</string>
+    <string name="process_stats_os_label" msgid="4813434110442733392">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‎‎‏‎‏‏‎‎‏‏‎‎‏‏‎‎‎‎‎‎‏‏‎‏‎‎‏‎‎‎‎‏‏‏‏‎‏‎‏‎‏‏‏‏‏‏‏‏‏‏‏‏‎‏‎‏‎‎‎‎‎Android OS‎‏‎‎‏‎"</string>
+    <string name="process_stats_os_native" msgid="5322428494231768472">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‏‎‎‏‏‏‎‏‏‏‎‏‎‎‎‏‎‎‎‎‏‎‎‎‎‏‎‎‎‎‎‏‏‏‎‏‎‎‎‏‏‎‏‎‎‎‎‎‏‏‎‏‏‎‎‏‏‎‎‎‎Native‎‏‎‎‏‎"</string>
+    <string name="process_stats_os_kernel" msgid="1938523592369780924">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‏‎‏‎‏‏‏‎‎‏‏‏‎‎‎‎‎‏‎‎‏‏‏‎‏‏‏‏‏‎‏‏‏‏‏‏‏‏‏‎‏‎‏‎‎‎‏‏‏‎‎‎‏‎‏‏‏‏‎‎‎Kernel‎‏‎‎‏‎"</string>
+    <string name="process_stats_os_zram" msgid="677138324651671575">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‎‏‎‎‏‎‏‏‎‎‏‎‏‏‎‏‎‏‏‎‏‏‎‏‏‎‏‏‏‏‏‏‏‏‎‎‎‏‎‏‎‏‎‏‎‏‎‎‎‎‎‎‎‎‎‎‏‎‏‏‏‎Z-Ram‎‏‎‎‏‎"</string>
+    <string name="process_stats_os_cache" msgid="6432533624875078233">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‏‎‎‏‎‏‎‎‎‏‎‎‏‏‏‏‎‎‏‏‎‏‎‎‎‎‎‎‎‎‏‏‎‏‎‎‎‏‏‎‏‏‏‏‎‏‎‏‎‎‏‎‎‏‎‏‏‎‎‏‎Caches‎‏‎‎‏‎"</string>
+    <string name="process_stats_ram_use" msgid="976912589127397307">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‎‏‏‎‏‏‎‎‎‏‏‏‎‏‎‏‏‎‎‎‎‏‏‎‏‎‎‏‎‏‏‏‎‏‎‏‏‏‎‎‎‏‎‏‏‏‎‏‎‏‏‏‏‏‎‏‏‏‎‏‏‎RAM use‎‏‎‎‏‎"</string>
+    <string name="process_stats_bg_ram_use" msgid="5398191511030462404">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‏‎‏‎‏‏‏‎‏‎‏‎‎‎‏‏‏‎‏‎‏‎‎‏‎‏‎‎‎‎‎‏‎‏‎‎‎‏‏‏‏‏‏‏‏‏‏‏‎‏‏‏‏‏‎‎‎‏‎‎‎RAM use (background)‎‏‎‎‏‎"</string>
+    <string name="process_stats_run_time" msgid="6520628955709369115">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‏‎‏‎‎‏‏‏‏‏‎‏‏‏‏‎‏‏‎‏‎‏‏‏‏‏‎‎‏‏‎‎‏‎‎‏‎‎‏‎‏‏‏‎‏‏‏‎‏‎‏‏‎‎‎‏‏‎‏‏‎Run time‎‏‎‎‏‎"</string>
+    <string name="processes_subtitle" msgid="6827502409379462438">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‏‏‏‎‏‏‎‎‎‎‎‎‎‎‏‎‏‎‎‏‎‏‎‎‎‏‎‎‏‎‎‎‎‏‏‎‎‎‏‎‏‏‏‏‏‎‏‏‏‏‎‏‎‎‏‎‎‏‏‎‎Processes‎‏‎‎‏‎"</string>
+    <string name="services_subtitle" msgid="4296402367067266425">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‏‎‏‏‏‎‎‏‏‏‏‏‏‏‏‎‎‎‏‏‎‎‏‏‎‎‎‎‏‎‎‎‎‏‎‏‎‎‏‏‎‎‎‏‎‎‎‏‏‏‎‏‎‏‏‏‏‎‎‏‎Services‎‏‎‎‏‎"</string>
+    <string name="menu_proc_stats_duration" msgid="2323483592994720196">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‎‎‎‎‎‎‏‏‏‏‏‎‏‎‏‎‏‏‎‎‎‎‎‎‎‏‎‎‎‏‏‏‏‎‎‏‏‏‏‎‎‏‏‎‎‎‎‎‏‎‎‏‏‏‎‎‎‏‎‎‎Duration‎‏‎‎‏‎"</string>
+    <string name="mem_details_title" msgid="6548392825497290498">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‏‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‎‏‎‎‏‎‏‎‎‎‏‏‏‎‏‎‏‎‏‏‏‏‎‏‏‏‎‎‎‎‏‏‏‎‎‎‎‎‎‏‎‎Memory details‎‏‎‎‏‎"</string>
+    <string name="mem_state_subtitle" msgid="2407238869781011933">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‎‎‎‏‎‏‏‎‏‎‎‎‎‎‏‏‏‎‏‎‏‏‏‏‏‏‏‏‎‏‏‏‏‎‏‎‏‏‎‎‏‏‏‏‎‏‎‏‏‏‎‏‏‏‎‏‏‏‎‏‎Memory states‎‏‎‎‏‎"</string>
+    <string name="mem_use_subtitle" msgid="7319468770222422412">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‎‏‎‏‏‎‎‏‎‎‏‏‏‏‏‏‏‎‏‎‎‎‎‏‎‎‎‎‏‏‏‏‏‎‎‏‏‎‏‎‏‏‎‎‎‎‏‏‏‎‎‏‏‎‎‎‏‏‎‎‎Memory use‎‏‎‎‏‎"</string>
+    <string name="mem_use_kernel_type" msgid="8698327165935012484">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‏‎‎‎‏‎‏‏‎‏‏‎‏‎‏‎‏‎‏‎‎‏‏‏‏‎‎‎‏‏‎‎‎‎‎‏‏‎‏‎‏‏‏‏‏‏‎‎‏‎‏‎‏‎‎‎‎‏‎‎‎Kernel‎‏‎‎‏‎"</string>
+    <string name="mem_use_native_type" msgid="5976704902328347400">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‎‎‏‎‏‏‏‏‎‎‎‏‏‎‎‎‎‏‎‏‎‏‏‏‎‎‎‏‎‏‎‏‎‏‏‎‏‎‎‏‏‏‎‏‏‏‏‎‏‎‏‏‎‎‎‎‏‎‎‎‎Native‎‏‎‎‏‎"</string>
+    <string name="mem_use_kernel_cache_type" msgid="6411475064463957513">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‏‎‎‎‏‏‏‏‏‎‏‎‎‎‏‎‎‎‏‎‏‎‎‏‏‎‏‎‎‎‎‎‎‏‏‏‏‎‏‎‎‏‏‎‎‎‎‏‏‏‏‎‎‎‎‎‏‎‎‏‎Kernel caches‎‏‎‎‏‎"</string>
+    <string name="mem_use_zram_type" msgid="9087217476795358232">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‏‏‏‎‎‎‎‏‏‏‎‎‎‏‎‎‏‎‎‎‎‎‏‎‎‏‏‎‎‎‏‎‎‏‎‏‎‎‎‏‏‎‏‏‏‏‎‏‏‏‎‎‎‎‎‏‏‎‎‎‎ZRam swap‎‏‎‎‏‎"</string>
+    <string name="mem_use_free_type" msgid="717708548454880840">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‎‏‎‎‏‏‏‏‏‎‏‎‏‏‏‎‏‎‎‎‎‎‎‎‏‏‏‏‏‎‏‎‎‏‎‏‎‏‏‏‎‏‎‏‎‎‎‎‏‎‏‏‎‎‏‎‎‏‎‎‎‎Free‎‏‎‎‏‎"</string>
+    <string name="mem_use_total" msgid="6308786055749777934">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‎‏‏‏‏‎‎‎‏‏‎‏‎‏‎‎‏‏‏‏‎‏‏‏‏‏‏‎‎‎‎‎‏‎‎‎‏‏‏‎‎‏‏‏‎‎‏‏‏‎‏‎‎‎‎‎‏‏‏‎‎Total‎‏‎‎‏‎"</string>
+    <string name="menu_duration_3h" msgid="4714866438374738385">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‎‎‎‏‎‏‏‎‏‏‏‎‏‎‎‏‎‎‏‎‎‎‎‎‏‎‏‏‏‎‎‏‎‏‏‎‏‎‏‏‏‏‎‎‏‏‎‎‏‎‎‏‏‏‎‏‎‎‎‏‎3 hours‎‏‎‎‏‎"</string>
+    <string name="menu_duration_6h" msgid="1940846763432184132">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‏‎‏‎‏‏‏‎‏‏‏‏‎‏‎‎‎‏‎‏‏‏‎‏‏‎‎‏‎‎‏‎‏‎‎‏‏‏‎‏‎‏‏‏‏‎‎‎‏‎‎‏‎‏‎‎‎‏‎‎‎6 hours‎‏‎‎‏‎"</string>
+    <string name="menu_duration_12h" msgid="7890465404584356294">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‏‏‎‏‏‎‎‎‎‎‎‎‏‎‎‏‎‎‎‎‎‏‏‏‏‎‏‎‏‏‏‎‎‎‎‎‏‏‎‎‎‎‏‎‎‏‏‎‏‎‎‏‏‏‎‎‎‏‏‎‎12 hours‎‏‎‎‏‎"</string>
+    <string name="menu_duration_1d" msgid="3393631127622285458">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‏‏‏‏‎‎‎‏‏‎‎‎‏‎‎‏‏‎‎‏‏‎‎‎‎‏‏‏‏‏‎‎‎‏‎‎‏‎‏‎‎‎‏‎‎‏‏‏‏‎‎‎‏‎‎‏‎‎‏‎‎1 day‎‏‎‎‏‎"</string>
+    <string name="menu_show_system" msgid="8864603400415567635">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‏‎‏‏‎‎‎‎‎‏‎‏‎‏‏‎‎‏‎‏‏‏‎‏‎‎‏‏‎‏‏‏‎‏‎‎‎‏‏‏‏‏‎‏‎‏‎‏‏‏‏‏‎‎‎‏‎‎‏‏‎Show system‎‏‎‎‏‎"</string>
+    <string name="menu_hide_system" msgid="4106826741703745733">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‏‎‎‎‏‏‏‏‏‏‏‎‎‏‏‎‎‎‎‏‎‎‏‎‏‎‎‏‏‎‏‎‎‏‎‏‎‏‎‏‎‎‏‏‏‎‏‎‎‎‎‎‏‏‎‎‎‏‎‏‎Hide system‎‏‎‎‏‎"</string>
+    <string name="menu_show_percentage" msgid="4717204046118199806">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‎‎‎‏‎‏‏‏‎‏‏‎‏‏‏‎‎‎‎‎‎‎‎‏‎‏‏‎‎‏‎‎‏‏‎‏‏‏‏‎‏‎‎‏‎‎‏‎‎‎‎‏‏‏‏‏‏‏‏‎‎Show percentages‎‏‎‎‏‎"</string>
+    <string name="menu_use_uss" msgid="467765290771543089">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‎‏‏‏‏‎‎‏‏‏‏‏‎‏‏‏‎‏‎‏‏‎‎‎‎‎‏‏‎‏‏‎‏‏‏‎‏‎‏‎‏‏‎‎‎‏‏‏‏‏‎‏‎‎‎‎‏‏‎‎‎‏‎Use Uss‎‏‎‎‏‎"</string>
+    <string name="menu_proc_stats_type" msgid="4700209061072120948">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‎‎‎‏‎‎‏‏‏‎‏‎‎‏‏‏‏‏‏‏‎‎‏‏‏‏‎‎‏‏‏‏‏‏‏‏‎‏‎‎‎‏‏‎‏‎‏‎‏‏‎‎‎‏‏‏‎‏‎‎‎Stats type‎‏‎‎‏‎"</string>
+    <string name="menu_proc_stats_type_background" msgid="2236161340134898852">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‏‏‏‏‎‎‎‎‏‎‎‎‎‏‏‏‎‎‎‎‏‏‏‎‎‏‎‎‎‎‏‎‎‎‏‏‎‎‏‏‎‎‏‏‏‎‏‏‏‏‎‎‏‎‏‎‎‏‎‎‎Background‎‏‎‎‏‎"</string>
+    <string name="menu_proc_stats_type_foreground" msgid="2286182659954958586">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‏‏‏‏‏‎‏‏‏‎‏‎‎‎‏‎‎‏‏‏‎‎‎‎‎‏‎‎‎‎‏‏‏‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‎‎‎‎‏‏‏‏‏‎‏‎‎Foreground‎‏‎‎‏‎"</string>
+    <string name="menu_proc_stats_type_cached" msgid="5084272779786820693">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‎‏‏‎‏‎‎‎‏‏‏‎‏‏‏‏‎‏‏‏‎‎‏‎‎‏‏‏‏‏‎‏‎‏‎‎‎‏‏‎‎‎‎‏‏‎‎‏‏‏‎‎‎‏‎‏‎‏‎‏‎Cached‎‏‎‎‏‎"</string>
+    <string name="voice_input_output_settings" msgid="1336135218350444783">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‎‎‏‎‏‎‎‎‏‎‏‎‏‏‏‎‎‏‏‏‏‏‏‎‎‏‏‎‏‏‏‎‎‏‎‏‏‎‏‎‏‎‏‎‏‏‎‏‎‎‎‎‏‏‏‎‏‏‏‏‎Voice input &amp; output‎‏‎‎‏‎"</string>
+    <string name="voice_input_output_settings_title" msgid="2442850635048676991">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‎‎‎‏‏‏‏‎‎‏‏‎‏‎‏‏‏‏‏‏‏‎‏‏‎‏‎‏‏‎‏‏‎‏‎‏‎‏‏‎‏‎‎‏‏‏‏‎‏‏‏‎‎‏‏‏‏‏‏‏‎Voice input &amp; output settings‎‏‎‎‏‎"</string>
+    <string name="voice_search_settings_title" msgid="2775469246913196536">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‎‏‏‎‏‎‎‎‎‏‎‎‎‏‏‏‎‎‏‎‏‎‎‏‎‎‏‏‎‎‏‏‎‎‏‏‎‏‎‎‏‎‎‎‎‎‏‏‎‎‎‏‏‏‏‏‏‎‎‎‎Voice search‎‏‎‎‏‎"</string>
+    <string name="keyboard_settings_title" msgid="5080115226780201234">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‎‏‏‎‏‎‎‎‎‎‎‎‎‎‏‏‎‎‎‏‏‏‏‎‎‎‏‎‎‎‎‏‎‏‏‎‎‏‎‎‏‎‎‏‎‏‏‏‎‎‎‏‎‎‎‏‎‎‏‎‎Android keyboard‎‏‎‎‏‎"</string>
+    <string name="voice_input_settings" msgid="1099937800539324567">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‎‏‏‏‏‎‏‎‎‎‎‏‏‏‏‎‎‎‎‏‏‏‎‎‏‏‎‏‎‎‎‎‏‎‏‎‎‎‎‏‎‏‎‏‏‏‏‎‎‎‎‎‎‏‎‎‏‎‏‏‏‎Voice input settings‎‏‎‎‏‎"</string>
+    <string name="voice_input_settings_title" msgid="2676028028084981891">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‎‏‎‏‎‎‏‎‎‎‏‏‎‎‏‎‏‎‎‏‎‏‎‏‎‎‎‎‎‎‏‏‎‏‏‎‏‏‏‏‏‏‏‎‏‎‎‏‎‎‎‎‏‎‎‎‎‎‏‏‎Voice input‎‏‎‎‏‎"</string>
+    <string name="voice_service_preference_section_title" msgid="3778706644257601021">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‎‏‎‎‎‏‏‏‎‎‎‎‏‎‏‎‏‎‎‏‏‎‏‎‏‏‎‎‎‎‏‎‏‎‎‏‎‏‏‎‎‎‎‏‏‏‏‏‎‏‎‏‏‏‏‏‏‏‎‏‎Voice input services‎‏‎‎‏‎"</string>
+    <string name="voice_interactor_preference_summary" msgid="1801414022026937190">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‏‎‎‎‏‏‏‏‏‏‏‏‏‏‏‎‏‎‎‎‏‎‎‎‎‎‏‎‎‎‏‏‏‏‎‎‎‏‎‏‎‎‏‎‏‏‎‎‎‎‏‏‎‏‏‎‎‏‏‎‎Full hotword and interaction‎‏‎‎‏‎"</string>
+    <string name="voice_recognizer_preference_summary" msgid="669880813593690527">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‎‏‎‎‏‎‏‎‎‏‎‏‏‏‏‏‎‎‏‎‏‎‎‎‎‏‏‎‏‎‎‎‎‎‎‎‎‎‎‎‏‏‎‏‎‎‎‎‎‎‎‎‏‏‎‎‏‏‏‏‏‎Simple speech to text‎‏‎‎‏‎"</string>
+    <string name="voice_interaction_security_warning" msgid="6378608263983737325">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‏‎‎‎‏‎‎‎‎‏‎‏‎‏‎‏‏‏‏‎‎‏‏‎‏‎‏‏‏‎‏‏‏‎‎‎‎‎‎‏‏‏‏‏‎‎‏‎‏‎‎‏‏‏‏‎‏‏‎‏‎This voice input service will be able to perform always-on voice monitoring and control voice enabled applications on your behalf. It comes from the ‎‏‎‎‏‏‎<xliff:g id="VOICE_INPUT_SERVICE_APP_NAME">%s</xliff:g>‎‏‎‎‏‏‏‎ application. Enable the use of this service?‎‏‎‎‏‎"</string>
+    <string name="tts_engine_preference_title" msgid="1578826947311494239">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‎‏‎‏‏‏‏‎‏‎‎‏‎‎‎‏‏‏‏‎‏‎‏‏‏‏‏‎‎‏‎‏‏‏‎‎‎‏‎‏‎‎‎‎‏‏‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎Preferred engine‎‏‎‎‏‎"</string>
+    <string name="tts_engine_settings_title" msgid="6886964122861384818">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‏‏‏‏‏‎‎‏‎‎‏‏‎‏‏‎‏‎‎‏‎‏‏‎‎‎‎‏‏‎‎‎‏‏‎‎‎‎‎‎‎‎‏‏‎‎‏‏‎‏‎‎‎‏‏‏‎‎‏‎‎Engine settings‎‏‎‎‏‎"</string>
+    <string name="tts_sliders_title" msgid="992059150784095263">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‎‏‏‎‏‏‏‎‎‎‏‎‎‏‎‎‎‎‎‎‎‏‎‎‎‏‎‏‎‏‎‎‏‏‏‏‎‏‎‏‎‏‎‎‏‎‏‏‎‎‏‎‎‎‎‎‏‏‏‏‏‎Speech rate &amp; pitch‎‏‎‎‏‎"</string>
+    <string name="tts_engine_section_title" msgid="6289240207677024034">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‎‏‏‏‎‏‎‎‎‏‏‏‏‏‎‏‏‏‏‎‏‎‏‎‎‏‎‏‏‎‏‎‎‏‎‏‏‎‏‏‎‎‎‏‎‏‏‎‎‏‏‏‎‎‏‎‎‎‏‎‎Engine‎‏‎‎‏‎"</string>
+    <string name="tts_install_voice_title" msgid="6275828614052514320">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‎‏‏‏‎‎‎‏‏‎‎‎‎‎‏‏‏‎‎‎‏‏‎‏‏‏‏‏‏‎‏‎‏‎‏‏‏‏‎‏‎‏‎‏‎‎‎‎‏‎‏‎‎‎‎‏‎‎‎‎‎Voices‎‏‎‎‏‎"</string>
+    <string name="tts_spoken_language" msgid="5542499183472504027">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‏‏‎‎‏‏‏‎‏‎‏‎‏‏‏‎‏‎‎‏‏‎‏‎‎‏‎‎‎‏‎‏‎‏‏‎‏‏‎‎‎‏‎‏‎‏‏‎‏‏‎‎‏‏‎‏‏‎‏‏‎Spoken Language‎‏‎‎‏‎"</string>
+    <string name="tts_install_voices_title" msgid="8808823756936022641">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‏‎‏‎‎‎‏‏‏‏‏‏‎‎‏‏‏‎‏‎‏‎‎‎‏‎‎‏‎‎‏‎‏‎‎‏‎‎‏‏‎‎‎‏‏‎‎‎‏‎‏‎‎‏‏‏‎‎‎‏‎Install Voices‎‏‎‎‏‎"</string>
+    <string name="tts_install_voices_text" msgid="5292606786380069134">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‏‎‎‏‎‏‏‏‎‎‏‏‎‎‎‏‏‏‎‏‏‏‎‏‎‏‎‎‏‎‏‎‏‏‏‎‎‎‎‎‎‎‎‏‎‏‏‏‏‎‎‏‎‎‎‎‏‏‏‎‎Continue to the ‎‏‎‎‏‏‎<xliff:g id="TTS_APP_NAME">%s</xliff:g>‎‏‎‎‏‏‏‎ app to install voices‎‏‎‎‏‎"</string>
+    <string name="tts_install_voices_open" msgid="667467793360277465">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‎‏‎‎‏‎‏‎‎‎‎‏‏‎‏‎‏‎‎‏‎‎‏‏‎‏‎‏‏‏‏‏‏‎‎‏‎‎‏‎‎‎‎‎‎‏‏‎‎‏‏‏‏‏‏‎‏‏‎‎‏‎Open App‎‏‎‎‏‎"</string>
+    <string name="tts_install_voices_cancel" msgid="4711492804851107459">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‎‎‎‏‎‏‏‎‎‎‏‎‏‎‎‏‎‏‎‏‏‎‏‏‏‏‏‎‎‏‎‏‎‎‏‎‏‏‏‏‎‏‎‏‏‎‎‎‎‏‏‎‏‎‎‎‎‎‏‏‎Cancel‎‏‎‎‏‎"</string>
+    <string name="tts_reset" msgid="2661752909256313270">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‎‏‎‎‏‏‏‏‎‎‎‎‎‏‏‏‎‎‏‎‎‎‏‎‏‎‏‏‎‎‎‏‏‏‎‎‎‎‎‏‎‏‎‏‏‏‎‎‏‎‎‏‏‎‏‏‎‏‏‎‎Reset‎‏‎‎‏‎"</string>
+    <string name="tts_play" msgid="2628469503798633884">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‎‏‎‎‎‏‏‏‏‎‏‎‎‎‏‏‎‎‏‏‎‎‎‏‎‏‏‎‎‏‏‎‎‏‎‎‏‏‎‏‏‏‎‏‎‏‏‎‎‏‎‏‏‎‎‏‏‏‎‎‎Play‎‏‎‎‏‎"</string>
+    <string name="gadget_title" msgid="5519037532720577836">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‏‏‎‎‏‎‎‏‎‏‏‏‏‎‎‎‏‏‏‏‎‏‏‎‎‏‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‎‏‏‏‎‏‏‏‏‎‏‎‎‏‎‏‏‎‎‎Power control‎‏‎‎‏‎"</string>
+    <string name="gadget_toggle_wifi" msgid="319262861956544493">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‎‏‏‏‎‎‎‏‏‎‏‏‏‎‎‎‏‏‏‏‏‏‏‏‏‎‎‎‎‏‏‎‏‎‎‏‎‎‏‏‏‎‎‏‎‎‏‏‏‏‎‏‏‏‏‏‏‎‏‏‎‏‎Updating Wi‑Fi setting‎‏‎‎‏‎"</string>
+    <string name="gadget_toggle_bluetooth" msgid="7538903239807020826">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‏‎‎‎‏‎‎‏‏‏‏‏‏‎‎‏‎‎‎‎‏‎‎‎‏‏‎‏‏‏‎‎‎‏‎‎‏‎‏‏‏‏‎‏‎‎‏‎‏‏‏‏‎‎‎‏‏‎‏‎‎Updating Bluetooth setting‎‏‎‎‏‎"</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">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‏‏‏‏‏‏‏‎‎‎‏‎‎‎‎‏‏‏‏‏‏‎‏‎‏‎‎‏‏‏‏‎‏‎‏‏‏‏‎‎‎‎‎‎‎‎‏‏‎‎‎‏‏‏‎‏‏‎‎‎‎on‎‏‎‎‏‎"</string>
+    <string name="gadget_state_off" msgid="5220212352953066317">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‏‎‎‎‎‏‏‏‎‎‎‏‏‏‏‎‏‎‏‏‎‏‏‏‏‎‏‎‎‎‏‎‎‏‎‏‏‏‎‏‏‏‏‏‏‎‏‎‎‎‏‏‎‏‎‎‏‏‎‏‎off‎‏‎‎‏‎"</string>
+    <string name="gadget_state_turning_on" msgid="3395992057029439039">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‏‏‏‏‎‎‏‎‎‎‎‎‏‏‏‏‏‏‎‎‏‏‎‎‏‎‎‎‎‏‏‏‏‎‏‏‎‏‎‎‏‎‎‏‏‎‏‎‏‏‏‎‎‎‏‏‏‏‏‏‎turning on‎‏‎‎‏‎"</string>
+    <string name="gadget_state_turning_off" msgid="2395546048102176157">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‎‎‎‏‎‎‏‏‏‏‏‎‏‎‏‏‎‎‎‎‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‎‎‏‏‏‎‎‎‏‎‎‏‎‏‎‏‏‎‎‏‏‏‎‏‎turning off‎‏‎‎‏‎"</string>
+    <string name="gadget_wifi" msgid="4712584536500629417">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‎‎‎‏‎‏‏‎‎‏‏‎‎‏‏‏‎‏‏‎‏‎‏‎‏‎‏‎‏‏‏‎‏‎‎‎‎‎‎‏‏‏‏‎‎‏‏‎‏‏‏‏‏‎‏‎‏‎‎‏‎Wi‑Fi‎‏‎‎‏‎"</string>
+    <string name="gadget_bluetooth" msgid="8998572807378694410">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‏‏‎‎‏‏‏‎‎‎‎‏‎‏‎‏‏‎‏‎‎‏‎‎‏‎‏‎‏‎‏‏‎‏‎‏‎‏‎‎‏‎‏‏‏‏‏‏‎‎‎‏‎‎‎‎‏‎‏‎‎Bluetooth‎‏‎‎‏‎"</string>
+    <string name="gadget_location" msgid="2974757497945178165">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‏‎‎‏‎‏‎‎‏‎‎‎‎‏‏‏‎‏‏‎‎‎‏‎‏‏‏‎‏‏‏‏‎‏‎‏‏‏‏‏‎‎‏‏‏‏‎‎‎‎‎‎‎‎‏‏‎‏‎‏‎Location‎‏‎‎‏‎"</string>
+    <string name="gadget_sync" msgid="858895763714222152">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‎‏‎‏‏‏‏‏‎‏‎‏‏‎‏‏‎‏‎‎‏‎‎‏‎‎‏‎‏‎‏‏‏‏‏‏‏‎‏‎‎‎‏‏‎‎‎‏‎‏‎‎‎‎‏‎‎‏‎‎‎‎Sync‎‏‎‎‏‎"</string>
+    <string name="gadget_brightness_template" msgid="930541920933123603">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‎‏‏‎‎‏‏‏‎‏‎‎‏‏‏‏‏‎‎‏‎‏‏‏‏‎‎‏‎‎‏‏‎‎‏‎‏‏‏‎‏‎‏‎‎‎‎‎‏‎‏‏‎‎‎‎‏‎‎‏‏‎Brightness ‎‏‎‎‏‏‎<xliff:g id="ID_1">%1$s</xliff:g>‎‏‎‎‏‏‏‎‎‏‎‎‏‎"</string>
+    <string name="gadget_brightness_state_auto" msgid="6667967252426515446">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‏‏‎‎‏‎‎‎‏‎‎‏‎‏‏‎‎‎‎‎‏‏‏‎‎‎‏‏‎‎‏‏‏‏‏‎‏‏‎‏‎‎‎‏‏‏‏‎‎‎‏‏‏‏‏‏‎‏‏‎‎auto‎‏‎‎‏‎"</string>
+    <string name="gadget_brightness_state_full" msgid="6814570109772137631">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‏‏‏‎‏‎‎‏‎‎‏‎‎‎‏‏‎‏‏‏‎‏‏‎‏‎‎‎‏‏‏‎‎‎‎‏‏‏‏‏‎‏‏‎‏‎‎‎‎‏‎‎‏‎‎‏‏‏‏‏‎full‎‏‎‎‏‎"</string>
+    <string name="gadget_brightness_state_half" msgid="3696671957608774204">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‎‎‏‏‎‏‎‎‏‏‎‏‎‎‏‏‎‏‏‏‏‎‎‎‏‏‏‏‎‏‎‎‎‏‎‎‎‏‏‎‏‎‏‏‎‎‏‏‏‎‏‎‎‎‏‏‏‏‎‎‎half‎‏‎‎‏‎"</string>
+    <string name="gadget_brightness_state_off" msgid="946382262872753084">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‎‏‏‎‏‎‎‏‎‎‎‏‎‎‎‏‏‏‎‎‏‏‎‏‎‎‏‏‏‎‏‏‎‏‎‎‎‎‏‎‎‎‎‏‎‏‏‎‎‎‎‏‏‏‎‏‏‏‏‎‎‎off‎‏‎‎‏‎"</string>
+    <string name="vpn_settings_title" msgid="5662579425832406705">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‏‏‏‎‏‎‎‏‎‏‎‏‏‎‎‎‎‏‎‏‏‏‏‏‏‏‎‎‎‏‏‏‎‏‎‏‎‎‏‎‏‏‎‏‎‎‎‎‏‏‏‎‏‎‏‏‎‎‎‏‎VPN‎‏‎‎‏‎"</string>
+    <string name="credentials_title" msgid="4446234003860769883">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‏‏‎‏‏‎‏‏‎‏‎‎‎‎‏‏‎‎‏‎‎‏‎‎‎‏‎‎‏‏‏‏‎‏‎‎‎‏‏‎‎‎‏‎‎‏‎‎‏‏‎‎‎‏‎‏‏‎‏‏‎Credential storage‎‏‎‎‏‎"</string>
+    <string name="credentials_install" product="nosdcard" msgid="466093273825150847">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‎‏‏‏‏‎‎‏‏‏‎‏‏‏‏‏‏‎‎‏‎‏‎‏‎‏‏‏‎‎‏‏‏‏‎‎‏‎‏‎‎‎‏‏‎‎‎‎‎‎‎‏‏‏‎‏‏‏‏‏‏‏‎Install from storage‎‏‎‎‏‎"</string>
+    <string name="credentials_install" product="default" msgid="953914549998062317">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‎‏‏‎‏‎‎‏‏‏‏‎‎‏‏‏‏‏‏‎‎‎‎‏‏‏‎‏‎‏‎‏‎‏‎‏‎‏‎‏‏‎‏‏‎‎‎‎‎‏‎‏‎‏‏‏‎‏‏‎‏‎Install from SD card‎‏‎‎‏‎"</string>
+    <string name="credentials_install_summary" product="nosdcard" msgid="4220422806818210676">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‏‎‏‎‏‎‎‏‎‎‎‏‏‏‏‏‎‏‎‎‎‎‏‎‏‏‏‎‏‎‎‏‏‎‏‎‎‏‎‏‏‎‏‏‎‏‎‎‎‎‏‏‎‏‏‏‎‏‎‎‎Install certificates from storage‎‏‎‎‏‎"</string>
+    <string name="credentials_install_summary" product="default" msgid="5737658257407822713">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‏‏‏‏‏‎‏‎‎‎‎‎‎‏‎‎‎‎‎‏‏‏‎‎‏‎‎‏‎‎‏‎‎‎‏‏‎‏‏‎‎‎‎‏‎‏‎‎‏‎‏‏‎‏‏‏‏‎‎‏‎Install certificates from SD card‎‏‎‎‏‎"</string>
+    <string name="credentials_reset" msgid="3239382277144980418">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‏‏‎‎‏‏‏‏‎‏‎‎‏‎‎‏‏‎‎‏‎‎‎‎‎‏‎‎‏‎‏‎‎‎‎‎‏‏‏‎‏‏‎‎‎‎‏‎‏‎‏‏‏‏‎‎‎‎‏‎‎Clear credentials‎‏‎‎‏‎"</string>
+    <string name="credentials_reset_summary" msgid="3369361230171260282">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‏‏‏‎‏‏‎‎‎‎‏‎‎‏‏‎‎‎‎‎‎‎‏‎‏‏‏‏‏‏‏‎‏‏‎‎‎‏‎‏‎‏‎‎‏‏‎‎‎‏‎‏‎‏‏‏‏‎‏‎‎Remove all certificates‎‏‎‎‏‎"</string>
+    <string name="trusted_credentials" msgid="4266945289534242402">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‏‎‏‏‎‎‏‏‎‏‏‏‎‎‏‏‏‏‎‎‎‎‏‎‎‎‏‎‎‎‏‏‎‎‏‎‏‎‏‏‎‏‏‎‏‏‏‏‏‏‏‎‎‏‏‎‎‎‏‎‎Trusted credentials‎‏‎‎‏‎"</string>
+    <string name="trusted_credentials_summary" msgid="6735221351155686632">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‏‏‎‏‎‏‏‏‏‎‎‎‎‏‎‏‎‎‎‎‎‎‏‎‎‎‏‎‎‏‎‏‎‏‏‏‎‏‎‎‎‎‏‎‏‏‎‏‏‏‎‎‏‏‏‎‏‎‎‎‎Display trusted CA certificates‎‏‎‎‏‎"</string>
+    <string name="user_credentials" msgid="3719013347787187083">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‎‎‏‏‏‎‎‏‏‏‎‎‏‎‎‏‎‏‏‎‏‏‏‎‏‏‏‏‏‎‎‎‎‏‎‏‏‏‎‎‏‎‏‎‏‎‏‎‎‎‏‏‏‎‎‎‏‎‏‏‎User credentials‎‏‎‎‏‎"</string>
+    <string name="user_credentials_summary" msgid="7271228342106080167">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‎‏‎‎‏‏‏‎‏‎‎‎‏‎‎‏‎‏‏‏‏‎‏‎‎‏‏‏‎‎‎‎‏‎‏‏‏‏‏‏‏‏‎‎‎‏‎‎‎‎‏‏‏‎‏‎‎‏‏‏‎View and modify stored credentials‎‏‎‎‏‎"</string>
+    <string name="advanced_security_title" msgid="2434776238010578865">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‎‎‎‏‏‏‎‎‏‎‏‎‎‎‎‏‎‎‎‎‎‎‎‏‎‏‏‎‏‎‏‎‎‏‏‎‎‎‏‎‏‏‏‎‏‎‏‏‎‏‏‏‏‎‏‏‎‎‎‏‎Advanced‎‏‎‎‏‎"</string>
+    <string name="credential_storage_type" msgid="8629968543494001364">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‎‏‏‏‏‏‎‎‎‎‏‏‏‏‎‎‏‏‏‎‏‎‏‎‏‎‏‎‏‎‏‏‎‎‎‏‏‏‎‎‎‎‎‏‎‏‎‏‎‎‏‎‏‏‎‏‎‏‎‎‎Storage type‎‏‎‎‏‎"</string>
+    <string name="credential_storage_type_hardware" msgid="6077193544333904427">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‎‏‎‎‎‏‎‏‎‏‏‎‏‎‎‎‎‏‏‏‎‏‎‏‎‏‎‎‏‎‎‎‏‎‎‏‎‏‎‏‎‎‎‏‏‏‎‎‏‎‏‎‎‎‏‎‏‎‏‏‎Hardware-backed‎‏‎‎‏‎"</string>
+    <string name="credential_storage_type_software" msgid="4403117271207715378">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‏‏‎‏‎‎‎‏‏‎‏‏‎‎‎‎‎‎‏‏‏‏‎‏‎‏‎‎‎‏‎‏‎‏‏‎‏‎‏‏‏‎‎‏‎‎‏‎‎‎‏‎‎‎‏‏‎‎‏‎‎Software only‎‏‎‎‏‎"</string>
+    <string name="credentials_settings_not_available" msgid="7968275634486624215">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‏‏‏‎‏‎‎‏‎‏‎‏‎‎‎‎‎‎‎‎‎‏‏‏‏‎‎‎‏‏‎‎‏‎‎‏‏‏‏‏‏‎‎‏‏‎‏‏‏‏‏‏‏‏‎‏‎‏‏‏‎Credentials are not available for this user‎‏‎‎‏‎"</string>
+    <string name="credential_for_vpn_and_apps" msgid="4168197158768443365">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‏‎‎‏‏‏‎‏‏‎‎‎‎‏‏‎‏‎‎‏‎‎‏‏‏‎‏‏‎‏‎‏‏‎‏‎‎‎‏‎‏‏‏‏‎‏‏‏‏‏‏‏‏‏‏‎‎‏‎‏‎Installed for VPN and apps‎‏‎‎‏‎"</string>
+    <string name="credential_for_wifi" msgid="6228425986551591864">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‎‏‏‎‎‏‏‎‏‏‏‏‏‏‎‏‎‎‎‎‎‏‏‎‏‏‏‏‎‏‏‎‎‏‏‎‎‎‏‏‏‎‎‎‎‎‏‏‎‎‏‏‏‎‏‏‏‎‎‎‎Installed for Wi-Fi‎‏‎‎‏‎"</string>
+    <string name="credentials_unlock" msgid="385427939577366499"></string>
+    <string name="credentials_unlock_hint" msgid="2301301378040499348">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‏‏‏‏‏‏‏‎‏‏‏‏‏‏‎‏‏‏‎‏‎‏‏‎‏‎‎‏‎‎‎‏‎‏‏‏‎‎‏‏‏‎‎‎‏‎‎‎‏‏‎‎‏‎‎‏‎‏‎‎‎Type the password for credential storage.‎‏‎‎‏‎"</string>
+    <string name="credentials_old_password" msgid="7553393815538684028">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‏‎‎‎‏‏‎‏‎‎‏‏‎‎‎‎‏‎‏‏‏‎‏‎‎‏‏‏‏‏‎‏‎‏‏‏‏‏‎‏‎‎‎‎‏‏‎‏‎‎‎‎‎‏‏‏‏‏‎‎‎Current password:‎‏‎‎‏‎"</string>
+    <string name="credentials_reset_hint" msgid="6297256880896133631">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‎‏‏‏‎‏‏‎‎‏‎‎‎‏‎‏‏‎‎‏‏‏‎‎‎‏‎‎‏‏‎‏‎‏‎‏‎‎‏‏‎‎‏‎‏‏‎‎‏‎‎‏‏‏‏‏‏‏‏‏‎Remove all the contents?‎‏‎‎‏‎"</string>
+    <string name="credentials_wrong_password" msgid="2541932597104054807">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‎‎‏‏‎‏‎‎‎‏‏‎‏‏‎‎‎‎‏‎‎‎‏‏‏‎‏‎‏‎‏‏‎‏‎‏‎‏‎‏‏‏‏‏‏‎‎‏‎‎‏‎‎‎‎‏‎‏‏‏‎Incorrect password.‎‏‎‎‏‎"</string>
+    <string name="credentials_reset_warning" msgid="5320653011511797600">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‏‎‎‏‏‏‎‏‎‏‏‎‏‏‎‎‎‎‎‏‏‎‏‏‏‎‎‏‎‏‎‏‎‏‎‎‎‏‎‎‎‏‎‏‏‏‏‎‎‏‏‏‎‏‏‎‎‎‎‎‎Incorrect password. You have one more chance before credential storage is erased.‎‏‎‎‏‎"</string>
+    <string name="credentials_reset_warning_plural" msgid="6514085665301095279">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‏‎‏‎‎‏‏‎‎‏‏‎‏‎‏‎‏‏‏‎‎‏‏‎‎‏‏‎‎‏‎‎‎‏‎‎‏‎‏‏‏‏‎‎‎‏‏‎‎‎‏‏‎‏‏‎‏‏‏‏‎Incorrect password. You have ‎‏‎‎‏‏‎<xliff:g id="NUMBER">%1$d</xliff:g>‎‏‎‎‏‏‏‎ more chances before credential storage is erased.‎‏‎‎‏‎"</string>
+    <string name="credentials_erased" msgid="2907836028586342969">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‏‎‎‎‎‏‎‏‏‎‏‎‏‎‏‏‎‏‎‏‎‏‏‏‎‏‏‎‎‎‏‎‏‏‎‎‏‏‏‏‏‎‎‎‏‎‏‏‏‎‏‎‎‎‏‏‏‎‎‏‎Credential storage is erased.‎‏‎‎‏‎"</string>
+    <string name="credentials_not_erased" msgid="7685932772284216097">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‏‎‏‎‏‎‏‎‏‎‎‏‏‏‏‎‏‎‏‏‎‎‏‎‎‎‏‎‎‏‏‏‎‎‏‏‏‎‎‎‏‎‎‎‏‎‏‏‎‎‏‏‎‎‏‎‎‎‎‏‎Credential storage couldn’t be erased.‎‏‎‎‏‎"</string>
+    <string name="credentials_enabled" msgid="7588607413349978930">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‏‎‎‏‎‏‎‏‎‎‎‎‎‎‏‎‎‏‏‎‎‎‏‏‏‏‎‎‎‏‏‏‏‏‎‎‏‎‎‏‏‏‏‏‎‎‎‏‎‎‏‏‎‎‏‏‎‎‏‎‎Credential storage is enabled.‎‏‎‎‏‎"</string>
+    <string name="credentials_configure_lock_screen_hint" msgid="8058230497337529036">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‏‏‏‏‏‏‎‏‎‏‎‎‏‎‎‏‎‏‎‏‏‏‏‏‎‎‎‏‎‏‏‎‏‎‎‎‎‎‎‎‎‏‎‏‏‏‎‏‎‎‏‎‏‏‎‎‏‏‎‎‎Before you can use credential storage, your device need to have a secure lock screen‎‏‎‎‏‎"</string>
+    <string name="credentials_configure_lock_screen_button" msgid="253239765216055321">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‎‏‎‏‏‏‎‎‎‎‎‏‏‏‎‏‏‎‎‎‎‎‎‏‏‏‎‎‏‏‎‎‎‏‎‎‎‏‎‏‏‎‏‎‎‏‏‎‏‎‎‎‎‎‎‎‏‏‎‎‏‎SET LOCK‎‏‎‎‏‎"</string>
+    <string name="usage_access_title" msgid="332333405495457839">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‎‏‏‏‎‎‏‎‎‏‏‏‎‎‏‎‏‎‏‏‏‏‎‏‏‏‏‎‎‎‏‎‏‏‎‏‎‏‏‎‎‎‏‏‎‏‎‏‏‏‏‎‎‎‎‎‏‎‏‏‏‏‎Apps with usage access‎‏‎‎‏‎"</string>
+    <string name="emergency_tone_title" msgid="1055954530111587114">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‎‏‏‏‎‏‎‏‎‎‏‏‏‏‎‎‎‎‎‎‏‎‎‎‎‏‏‎‎‏‏‏‎‏‎‏‎‎‏‎‎‎‏‎‎‎‎‎‎‎‎‏‏‎‎‏‎‏‎‏‎‎Emergency tone‎‏‎‎‏‎"</string>
+    <string name="emergency_tone_summary" msgid="722259232924572153">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‎‏‎‏‎‎‎‎‎‎‏‎‏‏‏‏‏‏‎‏‎‏‏‏‏‎‎‏‎‎‎‎‏‎‏‏‎‎‎‏‏‎‏‏‏‎‎‎‏‏‎‎‏‏‏‏‏‏‎‎‏‎Set behavior when an emergency call is placed‎‏‎‎‏‎"</string>
+    <string name="privacy_settings_title" msgid="2978878794187459190">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‏‎‎‏‎‏‎‏‎‏‏‏‎‎‎‏‏‎‏‎‎‏‏‏‏‎‏‏‎‎‎‎‎‏‎‎‎‏‏‏‏‏‎‎‏‏‎‎‏‎‏‎‎‏‏‏‎‏‏‎‎Backup‎‏‎‎‏‎"</string>
+    <string name="backup_section_title" msgid="7952232291452882740">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‏‏‏‎‎‏‎‏‏‏‎‎‎‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‎‎‏‏‏‎‏‏‏‎‎‎‎‏‎‎‎‏‏‏‏‎‎‏‏‎‏‎‎‎Backup &amp; restore‎‏‎‎‏‎"</string>
+    <string name="personal_data_section_title" msgid="7815209034443782061">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‏‏‎‎‎‏‏‏‎‏‎‏‎‎‏‏‎‎‏‏‎‎‏‏‎‏‎‏‏‏‎‎‎‏‏‏‎‏‏‏‎‎‎‏‏‏‏‏‎‏‏‏‏‎‏‎‏‏‎‏‎Personal data‎‏‎‎‏‎"</string>
+    <string name="backup_data_title" msgid="1239105919852668016">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‎‎‎‏‎‎‏‏‎‎‏‎‎‎‏‏‎‎‎‎‎‏‎‎‎‏‎‎‏‏‎‏‏‏‏‏‏‏‏‎‎‏‏‎‏‏‏‎‎‏‎‎‎‏‏‏‎‎‎‎‎Back up my data‎‏‎‎‏‎"</string>
+    <string name="backup_data_summary" msgid="708773323451655666">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‎‏‎‎‏‏‏‎‏‎‏‏‎‎‎‎‏‎‎‎‏‏‎‎‏‎‏‎‏‎‎‎‏‏‎‏‎‏‎‎‏‏‎‏‏‏‏‏‎‎‏‎‏‏‏‏‏‎‎‏‎‎Back up app data, Wi‑Fi passwords, and other settings to Google servers‎‏‎‎‏‎"</string>
+    <string name="backup_configure_account_title" msgid="3790872965773196615">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‎‏‎‎‏‎‎‏‏‎‏‏‏‏‏‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‏‎‎‎‎‏‏‎‎‎‏‎‏‎‏‏‏‏‏‏‎‏‎‏‎‎‎‏‏‏‎Backup account‎‏‎‎‏‎"</string>
+    <string name="include_app_data_title" msgid="2829970132260278394">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‎‏‏‏‎‏‎‎‎‏‏‎‎‎‎‏‎‎‏‎‏‏‎‏‎‏‏‏‎‏‏‎‏‎‏‎‎‏‎‏‎‏‏‎‏‏‎‏‎‎‎‎‎‏‏‏‏‎‏‎‎Include app data‎‏‎‎‏‎"</string>
+    <string name="auto_restore_title" msgid="5397528966329126506">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‏‎‏‎‏‏‏‎‎‏‏‏‏‏‎‏‏‏‏‏‏‏‏‏‏‏‏‏‎‏‎‏‏‏‏‎‏‏‏‎‏‏‎‏‏‏‎‎‏‏‏‎‎‏‏‎‏‎‏‎‎Automatic restore‎‏‎‎‏‎"</string>
+    <string name="auto_restore_summary" msgid="4235615056371993807">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‏‎‏‎‏‏‎‎‎‏‏‏‏‏‏‎‏‏‎‏‎‏‏‏‎‎‏‏‏‏‎‏‏‎‎‎‎‏‎‏‏‎‎‏‎‏‎‎‏‏‎‎‏‏‎‎‏‏‏‏‎When reinstalling an app, restore backed up settings and data‎‏‎‎‏‎"</string>
+    <string name="backup_inactive_title" msgid="685838037986644604">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‎‏‎‎‏‏‎‎‎‎‏‎‎‏‎‎‏‎‏‏‎‎‎‎‎‏‏‏‏‏‏‎‏‎‎‏‏‏‎‏‎‎‏‎‏‎‎‎‏‎‎‏‎‎‏‏‏‏‏‎‎‎Backup service isn\'t active‎‏‎‎‏‎"</string>
+    <string name="backup_configure_account_default_summary" msgid="2436933224764745553">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‎‎‎‏‏‏‎‏‎‎‎‏‏‎‏‏‏‎‎‏‏‏‎‏‏‎‏‏‎‏‎‎‎‎‏‏‎‏‏‏‎‎‏‏‎‎‏‎‎‏‏‏‎‏‎‏‎‎‎‏‎No account is currently storing backed up data‎‏‎‎‏‎"</string>
+    <string name="backup_erase_dialog_title" msgid="1027640829482174106"></string>
+    <string name="backup_erase_dialog_message" msgid="5221011285568343155">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‏‎‎‎‎‏‏‏‎‏‎‎‏‏‎‎‎‎‏‎‎‎‎‏‏‎‏‎‎‎‏‎‎‏‎‎‏‎‎‏‏‎‏‏‎‏‎‎‏‏‎‎‎‏‏‏‎‎‏‏‎Stop backing up your Wi‑Fi passwords, bookmarks, other settings, and app data, plus erase all copies on Google servers?‎‏‎‎‏‎"</string>
+    <string name="fullbackup_erase_dialog_message" msgid="694766389396659626">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‎‏‎‎‏‏‎‏‎‎‏‎‎‎‏‎‎‏‏‏‎‎‏‎‏‏‎‎‏‏‎‏‎‎‎‎‏‏‏‎‏‏‏‏‎‎‏‎‏‏‏‎‏‏‎‏‎‏‎‏‎‎Stop backing up device data (such as Wi-Fi passwords and call history) and app data (such as settings and files stored by apps), plus erase all copies on remote servers?‎‏‎‎‏‎"</string>
+    <string name="fullbackup_data_summary" msgid="960850365007767734">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‎‏‏‎‏‎‏‎‏‎‏‎‏‏‎‏‎‎‎‎‎‎‏‎‏‎‎‎‎‏‏‏‏‎‎‎‎‏‎‎‏‎‏‏‏‏‎‏‎‏‎‎‎‏‎‏‏‎‏‏‎‎Automatically back up device data (such as Wi-Fi passwords and call history) and app data (such as settings and files stored by apps) remotely.‎‏‎‎‏‏‎\n‎‏‎‎‏‏‏‎‎‏‎‎‏‏‎\n‎‏‎‎‏‏‏‎When you turn on automatic backup, device and app data is periodically saved remotely. App data can be any data that an app has saved (based on developer settings), including potentially sensitive data such as contacts, messages, and photos.‎‏‎‎‏‎"</string>
+    <string name="device_admin_settings_title" msgid="4960761799560705902">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‎‏‎‎‏‏‎‏‏‎‎‎‎‎‏‎‏‎‏‎‏‎‎‏‎‎‏‎‏‏‎‎‏‏‏‎‎‎‏‎‎‏‎‎‏‎‏‏‎‏‏‏‎‏‏‎‏‏‏‎‎Device admin settings‎‏‎‎‏‎"</string>
+    <string name="active_device_admin_msg" msgid="578748451637360192">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‎‏‎‎‎‎‎‎‎‏‎‎‎‎‎‏‎‎‎‎‎‏‎‏‎‎‏‏‎‏‎‎‎‎‎‏‎‎‎‏‎‎‏‏‎‏‏‏‏‎‏‏‎‎‏‎‎‎‎‎‎‎Device admin app‎‏‎‎‏‎"</string>
+    <string name="remove_device_admin" msgid="9207368982033308173">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‏‏‏‏‏‏‎‎‎‏‏‏‎‎‏‎‎‏‎‏‎‏‎‎‏‏‏‎‎‏‏‏‎‎‏‎‎‎‎‎‏‎‏‏‏‎‎‏‏‎‏‎‎‎‎‎‏‏‎‏‎Deactivate this device admin app‎‏‎‎‏‎"</string>
+    <string name="uninstall_device_admin" msgid="271120195128542165">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‎‏‎‏‏‏‏‎‎‎‎‏‏‎‎‏‏‎‏‏‎‎‏‏‎‎‎‎‏‏‎‎‎‏‎‏‎‎‎‎‏‎‎‏‎‎‏‎‎‎‎‏‏‏‏‎‏‎‏‎‏‎Uninstall app‎‏‎‎‏‎"</string>
+    <string name="remove_and_uninstall_device_admin" msgid="3837625952436169878">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‎‏‎‏‎‏‎‎‎‎‎‏‏‏‏‏‏‏‎‎‎‏‏‏‏‎‎‎‏‎‎‏‏‎‏‏‏‏‎‎‎‏‏‏‎‎‏‎‏‏‎‎‏‎‎‏‎‏‏‎‎Deactivate &amp; uninstall‎‏‎‎‏‎"</string>
+    <string name="select_device_admin_msg" msgid="7347389359013278077">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‎‏‎‏‏‏‏‏‎‏‏‏‎‎‏‎‏‎‏‏‏‎‏‏‎‎‎‏‏‎‏‎‎‎‏‎‎‏‏‏‏‎‎‎‏‎‏‏‎‎‎‏‎‏‏‏‏‏‎‏‎Device admin apps‎‏‎‎‏‎"</string>
+    <string name="no_device_admins" msgid="4846602835339095768">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‎‎‏‏‎‏‎‎‎‎‏‎‏‎‎‏‎‏‏‏‏‎‎‏‏‎‎‏‏‎‏‎‏‏‏‏‏‏‎‎‏‎‎‏‏‎‏‎‏‏‏‎‏‏‎‏‏‎‎‎‎No device admin apps available‎‏‎‎‏‎"</string>
+    <string name="personal_device_admin_title" msgid="2849617316347669861">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‎‏‏‏‏‎‎‎‏‎‏‏‏‏‎‏‏‏‏‏‏‏‎‏‏‎‎‏‏‏‏‎‏‏‏‎‏‎‏‏‎‏‎‎‎‏‏‎‏‏‎‏‎‏‏‎‎‏‎‏‎Personal‎‏‎‎‏‎"</string>
+    <string name="managed_device_admin_title" msgid="7853955652864478435">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‏‏‎‎‏‏‏‏‏‏‏‎‏‏‎‏‏‎‏‏‎‎‎‎‏‏‎‏‏‏‏‎‎‎‏‎‏‎‏‎‏‎‎‎‏‎‎‎‏‏‎‎‏‏‏‎‎‎‏‏‎Work‎‏‎‎‏‎"</string>
+    <string name="no_trust_agents" msgid="7450273545568977523">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‎‏‏‏‎‏‏‎‎‏‎‎‏‎‏‏‎‎‎‎‎‏‎‏‎‎‎‏‎‎‎‎‎‎‏‏‎‎‏‎‎‎‎‏‎‎‎‎‎‎‏‎‎‏‏‏‎‎‏‏‎No available trust agents‎‏‎‎‏‎"</string>
+    <string name="add_device_admin_msg" msgid="1501847129819382149">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‎‏‎‎‏‏‎‏‎‏‏‏‏‎‏‎‎‎‏‎‎‎‎‎‎‎‎‏‏‏‏‎‎‏‏‏‏‏‎‏‎‎‏‏‎‎‎‎‎‎‎‏‏‎‎‎‎‏‎‏‎Activate device admin app?‎‏‎‎‏‎"</string>
+    <string name="add_device_admin" msgid="4192055385312215731">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‏‎‏‎‎‎‏‎‏‏‎‏‎‎‏‎‏‏‎‎‎‎‏‎‏‎‎‏‏‎‎‏‏‎‎‎‎‏‎‎‏‏‎‎‎‏‎‎‎‎‏‎‏‎‏‏‎‎‏‏‎Activate this device admin app‎‏‎‎‏‎"</string>
+    <string name="device_admin_add_title" msgid="3140663753671809044">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‏‎‏‏‏‎‎‏‎‏‎‏‏‏‏‎‎‎‎‏‎‎‎‎‏‎‏‏‎‏‎‎‎‏‎‎‏‎‎‎‏‏‎‏‏‎‎‏‏‎‎‎‎‎‎‏‎‏‎‎‎Device admin‎‏‎‎‏‎"</string>
+    <string name="device_admin_warning" msgid="7482834776510188134">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‎‏‏‏‏‏‎‏‏‎‎‎‎‏‎‏‏‏‏‎‏‎‎‏‎‏‎‏‎‏‎‏‏‏‏‎‏‏‎‏‎‏‎‎‎‏‎‎‏‎‏‎‎‏‏‎‎‏‏‎‎Activating this admin app will allow the app ‎‏‎‎‏‏‎<xliff:g id="APP_NAME">%1$s</xliff:g>‎‏‎‎‏‏‏‎ to perform the following operations:‎‏‎‎‏‎"</string>
+    <string name="device_admin_status" msgid="7234814785374977990">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‎‏‎‎‎‏‏‎‎‏‏‏‎‎‏‏‏‎‎‏‏‎‏‏‎‏‏‏‎‎‏‏‎‎‏‎‎‎‎‎‎‏‎‎‏‏‏‏‏‏‏‏‏‏‎‎‎‏‏‎‎This admin app is active and allows the app ‎‏‎‎‏‏‎<xliff:g id="APP_NAME">%1$s</xliff:g>‎‏‎‎‏‏‏‎ to perform the following operations:‎‏‎‎‏‎"</string>
+    <string name="profile_owner_add_title" msgid="6249331160676175009">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‎‏‏‎‏‎‏‏‏‎‏‎‎‎‎‏‎‏‎‏‏‎‎‏‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‎‎‏‎‎‎‎‎‏‏‎‎‏‎‏‎‎‎‎‏‎Activate Profile Manager?‎‏‎‎‏‎"</string>
+    <string name="adding_profile_owner_warning" msgid="1354474524852805802">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‎‎‏‎‏‏‎‎‏‏‎‎‎‎‎‎‏‏‏‏‎‏‏‎‎‏‏‏‎‏‏‎‏‏‏‏‎‎‏‎‏‎‏‎‏‏‏‎‎‎‎‎‏‎‏‎‏‎‏‎‎By proceeding, your user will be managed by your admin which may also be able to store associated data, in addition to your personal data.‎‏‎‎‏‏‎\n‎‏‎‎‏‏‏‎‎‏‎‎‏‏‎\n‎‏‎‎‏‏‏‎Your admin has the ability to monitor and manage settings, access, apps, and data associated with this user, including network activity and your device\'s location information.‎‏‎‎‏‎"</string>
+    <string name="admin_disabled_other_options" msgid="7712694507069054530">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‏‎‏‏‎‎‎‎‏‎‎‎‏‏‏‏‏‏‏‎‏‏‎‎‏‎‏‎‎‏‏‎‎‎‏‎‏‏‏‏‎‏‎‏‎‎‎‏‏‏‏‎‎‏‎‎‎‎‏‎‎Other options are disabled by your admin‎‏‎‎‏‎"</string>
+    <string name="admin_more_details" msgid="7901420667346456102">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‏‏‎‏‏‎‏‎‎‏‏‏‎‏‏‏‏‏‎‎‎‎‏‏‏‎‏‏‏‏‎‎‎‎‏‎‎‎‎‏‏‏‎‏‏‎‎‎‏‏‏‎‎‎‏‎‎‏‏‎‎More details‎‏‎‎‏‎"</string>
+    <string name="untitled_apn" msgid="1230060359198685513">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‎‎‎‏‎‎‎‏‎‎‏‎‎‎‎‎‏‏‎‏‎‏‏‎‎‎‎‏‎‎‏‎‏‎‏‎‎‏‎‏‎‎‏‏‏‎‏‏‏‎‎‏‎‏‎‎‏‎‎‏‎Untitled‎‏‎‎‏‎"</string>
+    <string name="sound_category_sound_title" msgid="1488759370067953996">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‎‏‎‎‏‎‏‎‏‎‎‏‎‎‏‎‎‎‏‎‏‏‎‎‎‎‏‎‎‏‏‎‎‎‎‎‏‏‏‎‏‏‏‏‎‏‎‎‏‎‎‏‎‏‎‎‏‏‎‎‎General‎‏‎‎‏‎"</string>
+    <string name="notification_log_title" msgid="3766148588239398464">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‎‏‎‎‎‏‎‎‎‏‎‎‎‎‎‎‏‏‎‎‎‎‏‎‏‏‏‏‏‏‏‎‎‏‎‏‎‏‎‏‏‎‎‏‎‎‏‎‎‏‏‎‎‏‎‎‎‎‎‎‎Notification log‎‏‎‎‏‎"</string>
+    <string name="sound_category_call_ringtone_vibrate_title" msgid="1543777228646645163">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‎‏‎‏‎‏‏‎‏‏‎‎‏‎‎‏‏‎‎‏‎‎‏‏‎‏‎‏‏‏‎‎‏‏‎‏‏‏‎‏‎‎‎‏‏‏‏‏‏‏‎‏‏‎‏‎‏‎‏‏‎Call ringtone &amp; vibrate‎‏‎‎‏‎"</string>
+    <string name="sound_category_system_title" msgid="1480844520622721141">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‎‏‎‎‏‎‎‎‏‏‎‏‎‎‎‎‎‏‎‎‎‎‏‏‏‏‏‎‏‏‏‎‎‎‏‏‎‏‎‎‏‏‎‏‎‎‎‎‏‎‎‎‎‏‏‏‎‏‎‏‎System‎‏‎‎‏‎"</string>
+    <string name="wifi_setup_title" msgid="2970260757780025029">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‏‎‎‏‎‎‏‏‏‎‎‎‎‏‏‏‏‏‎‎‎‏‏‎‏‏‎‎‎‎‎‎‏‏‎‏‏‏‎‎‎‎‏‎‏‏‎‎‏‏‏‎‏‏‎‎‎‏‎‏‎Wi‑Fi setup‎‏‎‎‏‎"</string>
+    <string name="wifi_setup_title_editing_network" msgid="6020614644556717979">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‎‎‏‏‏‎‎‎‏‏‎‏‏‎‎‎‎‏‎‏‎‎‎‏‏‏‏‎‏‏‏‎‎‎‏‎‎‏‎‏‎‎‎‏‎‏‎‏‏‏‏‏‏‎‎‏‏‎‏‏‎Connect to Wi‑Fi network ‎‏‎‎‏‏‎<xliff:g id="NETWORK_NAME">%s</xliff:g>‎‏‎‎‏‏‏‎‎‏‎‎‏‎"</string>
+    <string name="wifi_setup_title_connecting_network" msgid="5572226790101017822">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‏‏‎‏‎‏‎‏‎‏‎‎‏‎‎‎‎‏‏‎‏‎‏‏‏‏‏‎‎‎‎‏‏‏‏‏‏‏‏‎‎‎‏‎‏‏‏‎‎‏‎‎‏‏‎‏‏‏‏‎‎Connecting to Wi‑Fi network ‎‏‎‎‏‏‎<xliff:g id="NETWORK_NAME">%s</xliff:g>‎‏‎‎‏‏‏‎…‎‏‎‎‏‎"</string>
+    <string name="wifi_setup_title_connected_network" msgid="1608788657122010919">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‎‏‏‎‎‏‎‏‎‎‏‏‏‎‎‏‎‎‎‎‏‏‎‎‎‎‏‎‏‎‎‎‏‎‏‎‎‏‏‎‏‏‏‏‎‏‏‎‎‏‏‏‎‎‏‎‎‏‏‏‎Connected to Wi‑Fi network ‎‏‎‎‏‏‎<xliff:g id="NETWORK_NAME">%s</xliff:g>‎‏‎‎‏‏‏‎‎‏‎‎‏‎"</string>
+    <string name="wifi_setup_title_add_network" msgid="6932651000151032301">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‎‎‎‎‎‎‏‏‎‏‎‏‏‎‏‏‏‎‎‏‎‏‎‏‏‎‏‎‏‎‎‏‎‏‏‏‏‏‎‎‎‎‏‎‎‏‎‎‎‎‎‏‏‏‏‎‏‏‎‏‎Add a network‎‏‎‎‏‎"</string>
+    <string name="wifi_setup_not_connected" msgid="6997432604664057052">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‎‎‎‏‎‎‎‏‏‎‏‏‏‏‎‏‏‏‏‏‏‏‏‎‎‎‎‏‎‏‎‎‎‏‎‎‏‎‏‏‏‏‎‎‏‏‎‎‏‏‎‎‏‏‎‏‏‏‎‎‎Not connected‎‏‎‎‏‎"</string>
+    <string name="wifi_setup_add_network" msgid="5939624680150051807">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‎‎‏‎‎‏‏‎‏‏‎‏‏‏‎‎‏‎‎‏‎‎‏‎‏‏‎‏‎‏‎‏‎‏‏‏‎‏‏‏‏‏‎‎‏‎‏‎‏‎‏‏‏‏‎‏‏‏‏‏‎Add network‎‏‎‎‏‎"</string>
+    <string name="wifi_setup_refresh_list" msgid="3411615711486911064">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‏‏‏‏‎‏‎‏‏‎‎‎‎‏‏‏‏‏‏‎‎‏‏‎‏‎‏‎‎‎‎‎‎‎‎‏‎‏‎‏‎‎‎‏‏‎‏‎‎‎‏‎‎‏‎‏‏‎‎‎‎Refresh list‎‏‎‎‏‎"</string>
+    <string name="wifi_setup_skip" msgid="6661541841684895522">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‏‏‎‎‎‏‏‏‎‎‏‎‏‎‎‎‏‏‎‏‎‎‎‎‎‎‏‎‏‎‏‏‏‎‏‎‎‎‎‎‎‏‏‏‏‎‎‏‎‏‏‏‎‎‏‎‎‎‏‎‎Skip‎‏‎‎‏‎"</string>
+    <string name="wifi_setup_next" msgid="3388694784447820477">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‏‏‏‏‎‎‎‎‎‏‏‏‎‎‎‎‏‏‏‏‏‏‏‏‎‎‏‏‏‏‎‎‏‏‏‏‎‎‏‏‏‎‏‏‎‎‏‏‎‎‏‎‏‎‏‏‏‏‎‏‎Next‎‏‎‎‏‎"</string>
+    <string name="wifi_setup_back" msgid="144777383739164044">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‎‏‎‏‎‎‎‎‎‎‎‏‎‎‏‎‏‏‎‏‎‎‏‎‎‎‎‏‏‎‏‏‏‎‎‎‏‎‏‎‎‏‎‎‎‏‎‎‎‎‏‎‏‏‎‎‎‏‏‎‎‎Back‎‏‎‎‏‎"</string>
+    <string name="wifi_setup_detail" msgid="2336990478140503605">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‎‎‎‎‎‏‏‎‏‏‏‎‏‎‏‎‏‎‎‎‎‏‏‏‎‏‎‏‎‎‏‏‏‏‎‏‎‎‎‎‏‎‎‎‏‏‏‏‎‏‏‎‎‎‏‏‎‏‎‏‎Network details‎‏‎‎‏‎"</string>
+    <string name="wifi_setup_connect" msgid="7954456989590237049">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‏‏‏‎‎‏‏‎‎‎‏‏‏‏‏‎‏‎‎‎‎‏‏‏‏‏‎‎‏‏‎‎‏‏‎‏‏‎‏‎‎‏‏‎‎‎‏‎‏‏‏‏‎‏‏‏‏‎‎‏‎Connect‎‏‎‎‏‎"</string>
+    <string name="wifi_setup_forget" msgid="2562847595567347526">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‎‎‏‏‏‎‎‏‎‎‎‏‎‎‎‏‎‎‎‎‎‏‎‎‏‏‏‏‎‏‎‎‎‎‏‏‎‏‎‎‎‎‎‏‎‏‏‏‎‏‏‏‎‏‎‎‎‏‏‎‎Forget‎‏‎‎‏‎"</string>
+    <string name="wifi_setup_save" msgid="3659235094218508211">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‎‎‏‎‏‏‎‎‏‎‎‎‎‎‏‏‎‏‏‎‏‏‏‎‏‏‏‎‎‏‎‎‎‏‎‎‏‎‎‎‏‎‎‏‏‎‎‎‎‏‏‏‏‎‏‏‎‎‏‏‎Save‎‏‎‎‏‎"</string>
+    <string name="wifi_setup_cancel" msgid="3185216020264410239">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‏‏‎‎‎‎‏‏‎‏‎‎‎‎‏‎‏‎‎‏‎‎‎‏‏‎‎‎‎‎‏‎‏‏‎‎‏‎‏‏‏‏‏‎‎‏‎‏‏‏‎‎‎‏‏‏‏‏‏‏‎Cancel‎‏‎‎‏‎"</string>
+    <string name="wifi_setup_status_scanning" msgid="5317003416385428036">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‏‎‎‏‏‏‎‎‏‎‎‏‏‏‎‎‏‎‏‎‎‏‏‎‏‏‏‏‏‎‏‏‏‏‏‏‎‎‏‏‎‎‎‏‎‎‎‏‏‎‏‎‎‏‎‎‎‏‎‎‎Scanning networks…‎‏‎‎‏‎"</string>
+    <string name="wifi_setup_status_select_network" msgid="3960480613544747397">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‎‏‏‎‏‏‏‏‎‏‏‎‎‏‏‏‎‏‎‎‎‎‏‎‎‎‏‎‎‏‏‎‏‏‏‎‎‎‏‎‎‏‏‏‏‏‏‎‎‎‎‏‏‎‎‎‎‏‎‏‎Tap a network to connect to it‎‏‎‎‏‎"</string>
+    <string name="wifi_setup_status_existing_network" msgid="6394925174802598186">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‏‎‎‎‏‎‏‏‏‏‏‏‎‏‎‏‎‏‏‎‏‎‎‏‎‎‎‎‏‎‎‏‎‎‎‏‎‏‎‎‏‏‏‏‏‏‎‎‏‎‎‏‎‎‏‎‏‎‏‎‎Connect to existing network‎‏‎‎‏‎"</string>
+    <string name="wifi_setup_status_unsecured_network" msgid="8143046977328718252">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‎‎‎‏‎‎‎‎‎‎‎‏‏‏‏‎‏‎‏‎‎‎‎‏‎‏‎‏‎‎‎‎‏‎‎‎‏‏‏‏‏‏‏‏‎‎‏‎‎‎‎‏‏‎‏‎‏‏‎‎‎Connect to unsecured network‎‏‎‎‏‎"</string>
+    <string name="wifi_setup_status_edit_network" msgid="4765340816724760717">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‎‎‏‎‎‎‏‎‎‎‎‏‏‏‏‎‎‏‎‎‎‎‏‏‏‎‎‏‏‎‎‏‎‏‏‎‏‎‎‎‏‏‎‎‏‎‎‏‏‎‎‎‏‎‎‎‏‏‎‏‎Type network configuration‎‏‎‎‏‎"</string>
+    <string name="wifi_setup_status_new_network" msgid="7468952850452301083">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‎‏‏‏‏‎‏‎‎‏‏‏‎‎‎‎‏‏‎‏‎‎‎‎‏‎‏‏‏‎‎‏‎‏‏‏‎‏‎‏‏‎‎‏‏‏‎‎‎‏‎‏‎‎‎‏‏‎‏‏‎Connect to new network‎‏‎‎‏‎"</string>
+    <string name="wifi_setup_status_connecting" msgid="4971421484401530740">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‎‏‎‎‏‏‏‏‏‏‏‎‎‎‎‎‏‎‎‏‏‎‎‎‎‎‎‎‎‎‎‏‎‏‏‎‎‏‏‏‏‏‏‏‏‎‎‏‎‏‏‏‎‏‏‏‎‏‎‎‎Connecting…‎‏‎‎‏‎"</string>
+    <string name="wifi_setup_status_proceed_to_next" msgid="6708250000342940031">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‏‏‎‏‎‎‎‏‏‎‎‎‎‏‏‏‏‏‎‏‏‏‎‏‎‏‎‏‎‏‎‏‏‏‏‎‏‏‏‏‎‏‎‎‎‏‏‏‏‎‎‏‎‏‏‏‏‏‏‏‎Go to the next step‎‏‎‎‏‎"</string>
+    <string name="wifi_setup_status_eap_not_supported" msgid="6796317704783144190">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‏‏‏‎‎‏‎‏‎‎‎‏‎‏‎‏‏‏‏‎‏‏‏‏‎‎‎‏‏‎‏‎‏‏‏‎‎‏‎‎‏‏‎‎‎‎‏‎‎‏‎‎‏‏‏‏‏‏‏‎‎EAP isn’t supported.‎‏‎‎‏‎"</string>
+    <string name="wifi_setup_eap_not_supported" msgid="6812710317883658843">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‏‏‏‎‏‎‎‎‏‎‏‏‏‎‎‏‏‎‏‏‏‏‏‏‎‎‎‎‎‏‎‏‎‏‏‏‎‎‎‏‏‎‎‎‎‎‎‏‎‎‏‎‎‏‎‏‏‎‏‏‎You can’t configure an EAP Wi‑Fi connection during setup. After setup, you can do that in Settings &gt; Wireless &amp; networks.‎‏‎‎‏‎"</string>
+    <string name="wifi_setup_description_connecting" msgid="2793554932006756795">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‎‏‏‎‏‏‎‎‎‏‎‎‏‎‏‏‎‎‏‏‎‏‏‎‏‎‎‎‏‏‏‎‎‏‏‎‏‏‎‎‏‏‎‏‏‎‏‎‎‎‎‏‏‎‏‏‏‎‏‏‎Connecting can take a few minutes…‎‏‎‎‏‎"</string>
+    <string name="wifi_setup_description_connected" msgid="6649168170073219153">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‏‏‎‎‎‏‎‎‎‏‏‎‏‎‎‏‎‏‏‏‎‎‏‏‏‎‎‎‏‏‎‎‏‏‎‏‎‎‎‎‏‏‎‎‎‏‏‎‎‎‎‎‎‏‎‏‎‎‎‏‎Tap ‎‏‎‎‏‏‎"<b>"‎‏‎‎‏‏‏‎Next‎‏‎‎‏‏‎"</b>"‎‏‎‎‏‏‏‎ to continue with setup.‎‏‎‎‏‏‎\n‎‏‎‎‏‏‏‎‎‏‎‎‏‏‎\n‎‏‎‎‏‏‏‎Tap ‎‏‎‎‏‏‎"<b>"‎‏‎‎‏‏‏‎Back‎‏‎‎‏‏‎"</b>"‎‏‎‎‏‏‏‎ to connect to a different Wi‑Fi network.‎‏‎‎‏‎"</string>
+    <string name="accessibility_sync_enabled" msgid="558480439730263116">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‎‏‏‏‏‏‏‏‎‎‎‎‎‎‎‎‎‏‏‏‏‏‎‎‎‎‎‎‎‎‎‏‎‎‎‎‎‎‎‎‏‎‎‎‎‎‎‏‎‏‎‏‎‎‎‏‎‎‏‏‎‎‎Sync enabled‎‏‎‎‏‎"</string>
+    <string name="accessibility_sync_disabled" msgid="1741194106479011384">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‏‎‎‎‎‎‏‎‏‎‎‏‏‏‏‏‎‏‏‎‏‏‎‏‎‎‎‎‏‎‎‎‏‎‎‏‏‎‏‎‏‏‏‏‎‏‏‎‎‏‏‎‎‎‏‏‏‎‎‎‎Sync disabled‎‏‎‎‏‎"</string>
+    <string name="accessibility_sync_in_progress" msgid="4501160520879902723">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‏‏‏‎‎‏‏‏‎‏‏‏‎‏‎‏‎‏‎‏‏‎‏‎‎‏‎‏‎‏‎‎‎‏‎‎‎‎‎‎‏‏‏‏‎‎‎‏‎‎‎‎‎‎‎‎‎‎‏‏‎Syncing now‎‏‎‎‏‎"</string>
+    <string name="accessibility_sync_error" msgid="8703299118794272041">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‏‎‎‎‏‏‎‎‏‎‎‎‎‏‎‏‎‏‎‎‎‏‏‎‏‏‏‏‏‎‏‏‏‏‎‏‏‎‏‏‎‎‏‏‏‏‏‎‏‏‎‏‎‎‏‎‏‎‎‏‎Sync error.‎‏‎‎‏‎"</string>
+    <string name="sync_failed" msgid="1696499856374109647">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‎‏‏‏‏‎‎‎‏‎‏‏‎‎‏‎‏‏‎‏‏‎‏‎‎‎‎‏‏‎‎‎‎‏‎‎‏‎‏‎‏‏‏‎‎‎‎‏‎‏‎‏‏‏‎‎‏‏‏‏‎Sync failed‎‏‎‎‏‎"</string>
+    <string name="sync_active" msgid="8476943765960863040">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‎‏‎‏‏‎‏‎‎‏‎‎‎‎‏‎‎‏‏‏‎‏‏‏‎‎‎‏‎‎‏‏‏‏‏‏‎‎‎‎‏‏‏‏‎‎‏‎‏‏‎‏‎‏‎‎‎‎‎‎‎Sync active‎‏‎‎‏‎"</string>
+    <string name="account_sync_settings_title" msgid="5131314922423053588">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‎‏‏‏‎‎‏‏‎‏‏‎‎‎‎‏‎‏‏‏‏‎‏‏‏‏‎‎‎‎‏‎‏‏‎‏‏‎‏‎‏‏‏‏‏‏‏‎‏‏‎‏‎‎‎‏‎‏‎‎‎Sync‎‏‎‎‏‎"</string>
+    <string name="sync_is_failing" msgid="1591561768344128377">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‎‏‏‎‎‎‎‏‎‏‏‎‎‏‎‏‏‏‎‎‏‏‏‏‏‏‏‎‏‏‏‏‎‎‎‎‎‎‏‏‏‏‏‎‏‎‎‎‏‎‏‏‎‏‏‏‏‎‎‏‎Sync is currently experiencing problems. It will be back shortly.‎‏‎‎‏‎"</string>
+    <string name="add_account_label" msgid="7811707265834013767">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‏‏‎‎‎‏‏‎‏‎‎‎‏‏‎‎‎‎‏‎‎‏‎‏‏‏‏‎‏‎‏‏‏‏‎‏‎‏‎‏‏‏‏‏‏‏‎‏‎‏‎‎‎‏‎‎‎‏‏‏‎Add account‎‏‎‎‏‎"</string>
+    <string name="managed_profile_not_available_label" msgid="852263300911325904">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‎‏‎‏‏‏‏‎‏‎‎‏‏‏‏‎‏‏‎‎‎‏‏‏‏‎‏‎‎‏‏‏‎‏‎‎‏‏‏‏‎‏‎‏‏‏‏‏‎‎‎‏‎‏‏‎‏‎‎‎‎‎Work profile isn’t available yet‎‏‎‎‏‎"</string>
+    <string name="work_mode_label" msgid="5794470908668593961">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‎‎‎‎‎‏‏‎‏‎‏‎‎‎‎‏‏‎‎‎‏‎‎‏‎‏‏‏‎‏‎‎‏‏‎‎‏‎‎‎‎‏‏‎‏‏‎‎‎‏‏‏‎‎‏‎‏‎‎‏‎Work mode‎‏‎‎‏‎"</string>
+    <string name="work_mode_summary" msgid="1620246003886940776">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‎‏‏‎‎‏‏‏‏‏‎‎‎‏‎‎‎‏‎‏‎‎‏‎‎‏‏‏‏‏‏‏‎‏‏‎‎‏‏‎‏‏‎‏‎‏‏‎‎‎‏‎‎‏‏‎‏‎‎‎‎Allow work profile to function, including apps, background sync, and related features‎‏‎‎‏‎"</string>
+    <string name="remove_managed_profile_label" msgid="3856519337797285325">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‎‏‎‏‏‎‎‎‎‏‎‏‎‎‎‏‏‎‏‏‏‏‏‎‎‏‏‏‏‎‏‎‏‏‏‎‏‏‎‏‎‏‎‎‏‏‏‏‎‏‎‏‏‏‎‎‏‏‎‏‎Remove work profile‎‏‎‎‏‎"</string>
+    <string name="background_data" msgid="5779592891375473817">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‎‎‎‎‎‎‏‏‎‏‎‏‎‎‏‏‏‏‎‏‎‎‎‏‏‏‎‎‏‏‏‏‎‏‎‎‏‏‎‎‏‏‏‎‏‏‎‏‎‏‎‎‏‎‎‏‏‎‎‏‎Background data‎‏‎‎‏‎"</string>
+    <string name="background_data_summary" msgid="8328521479872763452">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‎‎‏‏‏‎‎‏‎‏‎‎‏‏‎‏‏‎‏‎‎‎‏‎‏‎‎‎‏‏‎‏‏‎‎‎‎‎‎‎‎‏‏‎‏‏‎‏‎‏‏‎‎‎‏‏‏‏‎‎‎Apps can sync, send, and receive data at any time‎‏‎‎‏‎"</string>
+    <string name="background_data_dialog_title" msgid="6059217698124786537">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‎‏‎‎‎‎‎‏‎‏‏‎‏‎‏‎‏‎‏‎‎‏‏‎‎‏‎‎‏‎‏‏‎‎‎‏‎‏‏‏‏‏‎‎‏‏‏‎‏‎‏‏‎‏‏‎‏‎‎‏‎Disable background data?‎‏‎‎‏‎"</string>
+    <string name="background_data_dialog_message" msgid="6981661606680941633">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‎‎‎‎‏‏‏‎‎‎‏‏‏‏‎‏‏‎‎‎‎‎‏‏‏‏‎‏‏‎‏‎‏‎‎‎‎‎‏‏‎‎‏‏‎‏‎‏‎‏‎‎‎‏‎‎‎‎‎‏‎Disabling background data extends battery life and lowers data use. Some apps may still use the background data connection.‎‏‎‎‏‎"</string>
+    <string name="sync_automatically" msgid="1682730255435062059">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‎‏‏‏‎‏‎‏‏‎‏‎‎‏‎‎‎‎‏‎‎‏‎‎‎‎‎‎‎‏‏‏‏‎‎‎‎‎‎‎‎‎‏‎‎‏‎‏‏‎‏‏‎‎‏‎‏‎‏‏‎Auto-sync app data‎‏‎‎‏‎"</string>
+    <string name="sync_enabled" msgid="4551148952179416813">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‏‏‏‏‎‎‏‎‏‎‎‎‏‏‏‎‏‏‎‏‏‏‎‏‏‎‏‏‏‏‏‎‎‏‏‎‏‎‎‎‏‎‏‏‏‎‎‏‏‏‏‎‏‏‏‎‏‏‎‏‎Sync is ON‎‏‎‎‏‎"</string>
+    <string name="sync_disabled" msgid="8511659877596511991">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‎‏‏‎‎‎‎‏‏‏‏‏‎‏‏‏‏‏‎‏‏‎‎‎‏‏‏‏‏‏‎‏‏‏‎‏‎‎‎‏‎‏‎‏‏‎‏‏‏‏‏‎‏‏‏‏‎‏‏‏‎Sync is OFF‎‏‎‎‏‎"</string>
+    <string name="sync_error" msgid="5060969083117872149">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‎‏‏‎‎‎‏‏‏‏‎‎‎‎‏‎‏‏‎‎‏‎‎‏‎‎‎‏‎‎‏‎‎‎‏‎‎‏‏‏‏‎‎‏‏‎‏‎‎‏‎‎‎‎‎‏‎‏‎‏‎Sync error‎‏‎‎‏‎"</string>
+    <string name="last_synced" msgid="4242919465367022234">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‏‎‏‎‏‏‏‎‎‎‎‏‏‏‏‎‎‎‎‎‏‏‎‎‎‏‏‎‎‎‎‏‎‏‏‏‏‏‎‎‏‎‏‎‏‎‏‎‏‎‏‎‏‎‎‏‏‎‏‎‎Last synced ‎‏‎‎‏‏‎<xliff:g id="LAST_SYNC_TIME">%1$s</xliff:g>‎‏‎‎‏‏‏‎‎‏‎‎‏‎"</string>
+    <string name="sync_in_progress" msgid="5151314196536070569">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‎‏‏‏‎‏‏‏‏‏‎‏‎‎‏‎‎‏‎‎‏‏‏‏‏‎‎‎‎‎‎‎‏‎‏‎‏‏‏‏‎‏‎‏‏‎‎‏‎‎‎‏‏‎‏‎‏‎‎‏‎Syncing now…‎‏‎‎‏‎"</string>
+    <string name="settings_backup" msgid="2274732978260797031">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‏‏‏‏‏‎‎‏‎‎‎‏‎‏‏‏‏‎‎‏‏‎‎‏‎‏‏‏‎‏‏‏‏‎‎‎‎‎‎‏‏‎‎‏‏‏‏‎‎‏‏‎‎‏‏‎‎‏‏‏‎Back up settings‎‏‎‎‏‎"</string>
+    <string name="settings_backup_summary" msgid="7916877705938054035">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‏‏‎‏‏‏‎‏‏‏‏‎‎‏‏‎‎‏‏‎‎‏‎‏‎‏‎‎‎‎‎‎‎‎‎‎‏‎‏‎‎‏‎‏‏‎‏‎‏‎‏‏‏‎‎‏‎‎‏‏‎Back up my settings‎‏‎‎‏‎"</string>
+    <string name="sync_menu_sync_now" msgid="6154608350395805683">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‎‏‎‏‎‏‏‎‏‎‎‏‏‎‎‎‏‏‏‏‏‎‏‎‏‏‏‏‏‎‏‎‏‎‎‎‏‏‏‏‏‏‏‎‏‎‏‎‏‏‏‏‏‏‏‏‎‎‏‏‎Sync now‎‏‎‎‏‎"</string>
+    <string name="sync_menu_sync_cancel" msgid="8292379009626966949">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‎‎‏‏‎‎‎‏‎‏‎‎‎‏‏‏‎‎‏‎‏‏‎‎‎‏‏‎‎‎‏‏‏‎‏‏‏‎‏‏‏‎‎‎‏‎‎‎‏‎‏‏‏‎‏‎‎‏‎‏‎Cancel sync‎‏‎‎‏‎"</string>
+    <string name="sync_one_time_sync" msgid="3733796114909082260">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‎‎‏‏‏‏‎‏‎‎‎‏‎‎‎‏‏‎‏‏‏‏‎‎‏‎‎‎‏‎‏‏‎‏‎‎‏‏‏‎‎‎‏‏‏‎‏‏‎‎‏‎‏‎‎‏‎‏‎‎‎Tap to sync now‎‏‎‎‏‏‎<xliff:g id="LAST_SYNC_TIME">
+%1$s</xliff:g>‎‏‎‎‏‏‏‎‎‏‎‎‏‎"</string>
+    <string name="sync_gmail" msgid="714886122098006477">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‎‏‎‎‏‏‏‏‎‏‎‏‏‏‏‎‎‏‎‎‏‎‎‏‎‎‎‏‏‏‏‏‏‎‎‏‎‏‎‎‎‎‎‏‎‎‎‎‏‏‎‎‏‏‏‎‎‏‏‎‏‎Gmail‎‏‎‎‏‎"</string>
+    <string name="sync_calendar" msgid="9056527206714733735">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‏‏‎‏‏‎‏‎‏‏‏‏‎‎‏‏‏‏‏‏‏‎‎‎‎‎‏‎‏‏‎‎‏‏‏‎‏‏‏‎‎‏‎‎‎‏‏‏‎‏‎‎‏‎‏‎‎‏‏‏‎Calendar‎‏‎‎‏‎"</string>
+    <string name="sync_contacts" msgid="9174914394377828043">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‏‏‏‏‎‏‎‏‎‎‏‏‏‏‎‏‏‎‎‎‎‎‎‎‎‏‏‏‏‏‏‎‏‎‎‏‏‎‎‎‎‎‏‎‎‎‏‏‎‏‏‎‏‏‎‎‏‎‏‏‎Contacts‎‏‎‎‏‎"</string>
+    <string name="sync_plug" msgid="3905078969081888738">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‎‏‏‎‎‎‏‏‎‎‎‏‏‎‏‎‎‎‎‎‏‎‏‎‎‎‎‏‏‏‏‎‎‎‏‏‏‏‏‏‏‎‎‏‎‏‏‏‏‏‏‏‏‏‏‎‎‎‏‎‎‎‏‎‎‏‏‎"<font fgcolor="#ffffffff">"‎‏‎‎‏‏‏‎Welcome to Google sync!‎‏‎‎‏‏‎"</font>"‎‏‎‎‏‏‏‎ ‎‏‎‎‏‏‎\n‎‏‎‎‏‏‏‎A Google approach to syncing data to allow access to your contacts, appointments, and more from wherever you are.‎‏‎‎‏‎"</string>
+    <string name="header_application_sync_settings" msgid="6205903695598000286">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‎‏‏‎‎‎‎‏‏‏‏‏‏‏‎‎‏‏‎‎‏‎‎‎‎‏‏‏‏‏‏‎‎‏‏‎‎‏‏‎‎‏‏‏‎‎‎‏‏‎‎‎‏‎‎‏‏‏‏‎‎App sync settings‎‏‎‎‏‎"</string>
+    <string name="header_data_and_synchronization" msgid="5165024023936509896">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‎‏‏‏‏‎‏‎‏‏‎‏‏‏‎‏‏‎‎‏‏‏‏‏‏‎‏‏‏‏‏‏‏‎‏‏‎‎‎‏‏‎‎‎‎‎‏‎‎‏‏‏‏‏‎‎‏‎‎‎‎Data &amp; synchronization‎‏‎‎‏‎"</string>
+    <string name="preference_change_password_title" msgid="8955581790270130056">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‏‏‎‎‎‏‎‎‏‎‎‎‏‎‎‏‏‏‏‎‎‎‏‏‎‎‎‎‏‎‎‎‎‏‏‎‎‎‎‎‎‎‏‎‎‎‎‎‎‏‏‏‏‎‎‎‏‎‎‎‎Change password‎‏‎‎‏‎"</string>
+    <string name="header_account_settings" msgid="5382475087121880626">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‏‎‏‎‏‎‏‏‎‎‏‎‎‏‏‎‎‏‎‎‏‎‎‏‎‎‏‎‏‏‏‏‏‏‎‎‎‏‎‎‏‎‏‎‎‎‎‏‎‏‏‎‎‎‏‏‎‎‏‎‎Account settings‎‏‎‎‏‎"</string>
+    <string name="remove_account_label" msgid="5921986026504804119">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‎‎‏‏‏‏‎‏‏‏‎‏‎‏‎‎‏‎‎‎‎‏‎‏‎‏‎‎‏‎‏‎‏‎‏‎‏‏‏‎‎‎‏‎‏‏‏‎Remove account‎‏‎‎‏‎"</string>
+    <string name="header_add_an_account" msgid="756108499532023798">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‎‏‎‏‎‎‏‏‏‏‏‏‎‎‎‏‏‏‏‎‎‏‎‏‎‏‏‎‎‏‎‎‏‏‏‏‎‎‏‎‎‎‎‏‎‏‎‎‎‎‏‏‏‏‏‏‏‎‏‏‎‎Add an account‎‏‎‎‏‎"</string>
+    <string name="finish_button_label" msgid="481587707657751116">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‎‏‏‏‏‎‏‎‏‎‏‏‏‎‏‏‏‏‎‎‎‏‎‏‏‏‎‏‏‏‏‏‏‏‎‎‏‏‎‎‏‎‎‎‏‎‏‎‎‎‏‎‏‎‎‏‎‎‏‏‎‎‎Finish‎‏‎‎‏‎"</string>
+    <string name="really_remove_account_title" msgid="8800653398717172460">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‏‎‏‎‎‎‏‎‎‎‏‎‎‎‏‏‎‎‏‏‏‎‏‎‎‎‏‏‎‏‏‎‎‏‎‏‏‏‎‏‏‏‏‏‎‎‎‎‏‎‏‎‏‏‏‎‏‏‎‎‎Remove account?‎‏‎‎‏‎"</string>
+    <string name="really_remove_account_message" product="tablet" msgid="1936147502815641161">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‏‎‏‎‏‏‎‏‏‏‏‎‏‎‎‏‎‎‏‏‏‏‏‎‎‏‎‏‎‏‎‎‏‎‏‎‎‎‎‏‎‏‎‏‏‏‏‏‏‏‏‎‎‏‎‎‏‎‎‏‎Removing this account will delete all of its messages, contacts, and other data from the tablet!‎‏‎‎‏‎"</string>
+    <string name="really_remove_account_message" product="default" msgid="3483528757922948356">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‎‎‎‎‎‏‎‏‎‏‏‏‏‏‏‏‏‎‏‎‏‏‏‏‎‎‏‎‏‏‏‎‎‏‎‎‏‏‎‏‏‎‏‎‏‏‏‎‎‏‎‏‎‎‎‎‎‏‎‎‎Removing this account will delete all of its messages, contacts, and other data from the phone!‎‏‎‎‏‎"</string>
+    <string name="remove_account_failed" msgid="3901397272647112455">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‎‏‏‎‎‎‏‎‎‏‎‎‏‎‎‎‏‏‎‎‎‎‏‎‎‏‏‎‎‎‏‎‎‎‏‏‏‏‎‎‏‏‏‏‎‎‎‏‎‏‏‏‎‎‎‎‎‏‏‏‎This change isn\'t allowed by your admin‎‏‎‎‏‎"</string>
+    <string name="provider_label" msgid="7724593781904508866">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‏‎‏‏‎‎‏‏‎‎‏‏‎‏‎‎‎‏‎‏‎‎‎‏‏‏‏‎‎‎‏‏‎‏‎‎‏‎‎‏‏‏‎‎‎‎‎‎‎‏‏‏‏‏‎‎‎‎‏‎‎Push subscriptions‎‏‎‎‏‎"</string>
+    <!-- no translation found for sync_item_title (4782834606909853006) -->
+    <skip />
+    <string name="cant_sync_dialog_title" msgid="2777238588398046285">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‎‏‏‎‏‎‎‎‏‎‏‎‏‎‏‏‏‎‏‏‏‏‎‎‏‎‎‎‎‎‎‏‏‏‎‏‏‏‏‏‏‎‎‏‎‎‎‎‏‏‎‎‎‏‎‎‏‏‎‏‎Can’t manually sync‎‏‎‎‏‎"</string>
+    <string name="cant_sync_dialog_message" msgid="1938380442159016449">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‏‎‏‎‏‏‏‎‎‏‏‎‏‎‎‎‎‎‏‎‏‎‏‏‏‏‎‏‏‏‏‏‏‏‏‎‎‏‏‏‎‎‏‏‏‏‏‎‏‎‏‎‎‎‎‎‎‎‎‏‎Sync for this item is currently disabled. To change this setting, temporarily turn on background data and automatic sync.‎‏‎‎‏‎"</string>
+    <string name="enter_password" msgid="8035706727471334122">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‏‏‏‏‏‎‎‎‎‏‎‎‏‎‎‏‎‎‎‎‏‎‏‏‎‎‎‏‏‎‎‏‎‎‏‎‎‎‏‎‎‏‎‏‎‏‎‎‎‎‏‎‏‏‏‎‏‎‏‎‎To start Android, enter your password‎‏‎‎‏‎"</string>
+    <string name="enter_pin" msgid="5305333588093263790">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‏‎‎‏‏‎‏‎‎‎‎‎‎‏‎‏‎‏‎‎‏‏‎‎‏‎‏‎‎‎‎‏‏‏‎‏‎‎‏‏‏‏‏‏‎‏‎‏‏‏‏‏‏‎‏‎‏‏‏‎‎To start Android, enter your PIN‎‏‎‎‏‎"</string>
+    <string name="enter_pattern" msgid="4187435713036808566">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‏‎‏‎‎‎‎‏‏‏‎‎‏‏‎‎‎‎‏‎‏‎‎‏‏‎‎‎‎‏‎‏‎‎‏‏‎‏‎‏‎‏‏‏‏‏‏‏‎‎‎‏‎‏‏‏‎‏‏‎‎To start Android, draw your pattern‎‏‎‎‏‎"</string>
+    <string name="cryptkeeper_wrong_pattern" msgid="8423835922362956999">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‎‏‎‎‏‏‏‎‎‏‏‏‎‏‏‏‏‎‏‎‎‎‏‎‎‎‏‏‏‏‎‏‎‏‏‎‏‎‎‏‏‏‏‎‎‏‏‏‏‏‎‎‏‏‎‎‎‏‏‏‎Wrong Pattern‎‏‎‎‏‎"</string>
+    <string name="cryptkeeper_wrong_password" msgid="5200857195368904047">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‏‎‎‎‎‎‏‎‏‏‎‏‎‎‏‎‏‎‎‎‎‎‎‏‎‎‎‎‎‏‎‏‏‎‎‏‎‏‏‏‏‏‏‏‎‏‏‏‎‏‎‏‎‏‏‎‏‏‏‏‎Wrong Password‎‏‎‎‏‎"</string>
+    <string name="cryptkeeper_wrong_pin" msgid="755720788765259382">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‎‏‎‏‎‎‏‏‏‏‏‎‎‏‏‎‏‏‏‎‎‎‎‎‎‏‏‎‏‏‎‏‎‏‎‏‏‏‎‏‏‏‎‏‏‎‎‏‏‎‏‏‎‎‏‏‏‎‏‏‎‎Wrong PIN‎‏‎‎‏‎"</string>
+    <string name="checking_decryption" msgid="8287458611802609493">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‎‎‏‏‎‎‎‎‎‎‏‎‏‏‏‏‎‏‏‏‏‎‏‏‎‎‏‎‏‏‎‏‎‏‏‏‎‎‏‏‏‏‏‏‎‎‎‏‎‏‏‏‎‏‎‏‎‏‎‏‎Checking…‎‏‎‎‏‎"</string>
+    <string name="starting_android" msgid="4001324195902252681">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‎‏‏‏‏‎‎‎‎‏‏‏‏‎‎‎‏‏‏‏‎‎‏‎‎‏‏‏‏‏‏‏‏‏‏‏‏‏‏‎‏‏‎‏‏‏‏‎‎‏‏‎‏‎‎‎‏‎‎‏‎Starting Android…‎‏‎‎‏‎"</string>
+    <string name="delete" msgid="4219243412325163003">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‏‎‏‎‏‎‎‎‏‏‎‏‏‏‎‎‎‎‏‏‏‎‎‎‎‏‏‏‎‏‏‎‏‏‎‎‏‎‎‎‏‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‏‎‏‏‎Delete‎‏‎‎‏‎"</string>
+    <string name="misc_files" msgid="6720680815969643497">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‏‏‎‏‎‏‎‎‎‏‎‎‏‎‏‎‎‏‏‏‏‎‎‏‏‎‎‎‎‎‏‎‏‏‎‎‏‎‏‎‎‏‏‏‎‎‏‎‏‎‏‏‏‏‏‎‏‎‎‏‎Misc files‎‏‎‎‏‎"</string>
+    <string name="misc_files_selected_count" msgid="4647048020823912088">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‎‎‎‎‎‏‏‏‏‏‎‏‏‎‏‎‎‎‎‏‏‎‎‎‏‏‎‏‏‏‎‎‎‏‏‏‎‏‏‎‎‏‎‎‎‎‏‎‏‏‏‎‏‎‎‏‏‎‎‎‎selected ‎‏‎‎‏‏‎<xliff:g id="NUMBER">%1$d</xliff:g>‎‏‎‎‏‏‏‎ out of ‎‏‎‎‏‏‎<xliff:g id="TOTAL">%2$d</xliff:g>‎‏‎‎‏‏‏‎‎‏‎‎‏‎"</string>
+    <string name="misc_files_selected_count_bytes" msgid="2876232009069114352">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‎‏‏‏‏‏‏‎‏‎‏‎‎‏‏‎‏‏‎‏‏‏‎‎‎‏‎‏‏‏‏‏‏‎‎‎‎‎‏‎‏‏‎‎‎‎‏‏‎‎‏‏‏‏‏‏‎‎‎‎‎‎‏‎‎‏‏‎<xliff:g id="NUMBER">%1$s</xliff:g>‎‏‎‎‏‏‏‎ out of ‎‏‎‎‏‏‎<xliff:g id="TOTAL">%2$s</xliff:g>‎‏‎‎‏‏‏‎‎‏‎‎‏‎"</string>
+    <string name="select_all" msgid="1562774643280376715">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‎‏‎‏‏‎‏‏‎‎‎‎‎‎‎‏‎‏‏‏‎‏‎‎‎‎‏‎‎‎‎‏‎‏‎‎‏‎‏‏‎‏‏‎‏‏‏‏‎‎‏‏‏‎‎‎‏‎‏‏‎Select all‎‏‎‎‏‎"</string>
+    <string name="data_plan_usage_manage_plans_button_text" msgid="8997761990902708162">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‏‏‎‎‏‏‎‏‏‏‏‎‎‏‏‏‏‎‎‎‏‏‎‏‏‎‏‏‏‏‎‎‏‎‎‏‎‏‎‎‎‏‎‎‎‏‏‏‎‏‏‏‏‏‎‎‎‎‏‎‎Manage plans‎‏‎‎‏‎"</string>
+    <string name="data_usage_summary_title" msgid="3804110657238092929">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‎‏‎‎‏‏‎‎‏‎‏‎‏‏‏‎‏‎‏‎‎‏‏‏‏‏‎‎‏‏‎‏‏‎‏‎‏‏‏‏‎‏‎‎‎‏‎‎‏‏‎‎‏‎‎‎‎‎‎‏‎Data usage‎‏‎‎‏‎"</string>
+    <string name="data_usage_app_summary_title" msgid="4147258989837459172">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‏‎‎‏‏‎‎‎‏‏‏‎‎‎‎‎‎‏‏‎‎‎‎‏‎‏‎‎‎‎‎‎‎‎‎‎‏‏‎‎‏‏‏‎‏‎‎‏‏‏‏‎‏‏‏‎‎‏‎‎‎App data usage‎‏‎‎‏‎"</string>
+    <string name="data_usage_accounting" msgid="7170028915873577387">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‎‎‏‏‏‎‎‎‎‎‎‏‎‎‎‎‏‏‏‏‎‏‎‎‏‏‏‏‎‏‏‏‏‏‏‏‏‏‏‎‏‏‎‎‎‏‏‏‏‎‎‏‏‎‏‎‏‎‏‏‎Carrier data accounting may differ from your device.‎‏‎‎‏‎"</string>
+    <string name="data_usage_app" msgid="4970478397515423303">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‎‏‎‎‏‏‏‏‏‎‏‎‏‎‏‎‏‏‏‏‏‏‎‎‎‏‎‎‏‎‎‎‏‏‏‏‏‎‏‎‏‎‎‎‏‏‎‏‏‏‏‎‎‏‎‎‎‏‏‏‎App usage‎‏‎‎‏‎"</string>
+    <string name="data_usage_app_info_label" msgid="3409931235687866706">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‏‏‏‏‎‏‎‏‎‎‏‎‏‎‎‎‎‎‏‎‎‏‏‎‎‏‎‎‎‏‏‎‏‎‏‏‏‎‏‎‏‏‏‏‎‎‏‎‎‎‎‏‎‏‎‏‎‎‏‎‎APP INFO‎‏‎‎‏‎"</string>
+    <string name="data_usage_cellular_data" msgid="9168928285122125137">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‏‏‏‏‎‎‏‏‏‏‏‎‏‎‎‏‎‎‏‏‏‎‏‏‎‎‏‎‎‎‏‏‏‏‎‏‏‎‏‏‏‏‎‎‎‏‎‏‏‏‎‏‎‏‎‏‎‎‎‏‎Mobile data‎‏‎‎‏‎"</string>
+    <string name="data_usage_data_limit" msgid="1193930999713192703">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‎‎‎‎‏‎‎‏‎‎‎‏‏‎‏‏‎‎‎‏‏‏‏‎‏‎‏‏‎‎‏‎‎‏‎‎‎‎‏‏‏‎‏‏‎‏‎‏‏‎‏‎‏‏‏‏‏‏‏‏‎Set data limit‎‏‎‎‏‎"</string>
+    <string name="data_usage_cycle" msgid="5652529796195787949">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‏‏‏‎‎‏‏‏‎‎‎‏‏‏‎‏‎‎‎‏‏‏‏‎‎‏‏‎‏‎‏‏‏‎‎‎‏‎‎‎‏‏‏‏‏‎‏‎‎‏‎‎‏‎‏‎‏‏‎‏‎Data usage cycle‎‏‎‎‏‎"</string>
+    <string name="data_usage_app_items_header_text" msgid="5017850810459372828">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‎‏‎‏‏‎‏‎‎‎‏‎‏‏‏‏‏‏‎‎‏‎‏‏‏‎‎‏‏‏‏‏‎‏‎‏‎‏‎‏‎‏‏‎‎‎‏‏‏‏‎‏‎‎‎‏‏‏‎‎‎App usage‎‏‎‎‏‎"</string>
+    <string name="data_usage_menu_roaming" msgid="8042359966835203296">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‏‏‏‏‏‎‎‏‏‏‎‎‎‎‏‏‎‎‏‏‏‏‎‎‎‏‏‏‏‎‎‏‎‎‏‏‎‎‎‎‏‎‎‎‏‏‎‏‏‏‎‎‏‏‏‎‎‎‎‎‎Data roaming‎‏‎‎‏‎"</string>
+    <string name="data_usage_menu_restrict_background" msgid="1989394568592253331">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‏‎‏‏‏‎‎‏‏‎‏‏‏‎‏‏‏‏‏‏‏‏‎‏‎‎‎‏‏‏‏‎‎‎‏‏‎‎‎‎‏‎‎‎‎‏‏‎‎‎‎‏‏‎‎‏‎‎‏‏‎Restrict background data‎‏‎‎‏‎"</string>
+    <string name="data_usage_menu_allow_background" msgid="2694761978633359223">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‎‏‎‏‎‏‏‎‎‏‎‏‏‎‏‏‎‏‏‏‏‎‏‏‏‏‎‏‏‏‏‏‏‎‏‎‏‎‏‎‏‎‏‏‏‎‎‎‏‏‏‏‎‏‏‏‎‏‏‏‎Allow background data‎‏‎‎‏‎"</string>
+    <string name="data_usage_menu_split_4g" msgid="5322857680792601899">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‏‎‎‏‏‏‎‏‏‏‏‎‏‎‎‏‎‏‏‎‏‏‎‏‏‎‏‏‏‏‏‎‎‏‎‏‏‎‎‏‏‎‏‎‎‏‎‎‎‏‎‏‎‎‏‎‏‎‏‏‎Separate 4G usage‎‏‎‎‏‎"</string>
+    <string name="data_usage_menu_show_wifi" msgid="2296217964873872571">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‏‏‏‏‏‏‎‏‏‏‎‏‏‏‎‎‏‏‏‎‎‎‎‏‎‎‏‎‏‎‏‏‏‎‏‏‎‎‏‎‏‏‎‏‎‏‏‏‎‏‎‎‏‎‏‏‏‎‏‏‎Show Wi‑Fi‎‏‎‎‏‎"</string>
+    <string name="data_usage_menu_hide_wifi" msgid="7290056718050186769">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‎‏‎‏‎‎‏‎‏‎‏‏‎‏‏‏‏‎‏‏‏‏‏‏‎‏‎‏‏‏‏‎‏‏‏‏‏‏‎‏‎‏‎‎‏‏‎‏‎‏‏‎‎‎‎‏‎‎‎‏‎Hide Wi‑Fi‎‏‎‎‏‎"</string>
+    <string name="data_usage_menu_show_ethernet" msgid="5181361208532314097">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‎‏‏‏‏‏‏‎‎‏‏‏‏‏‏‎‎‏‎‎‏‎‎‏‎‎‎‏‎‎‏‎‏‏‏‏‏‎‎‎‏‏‏‎‏‎‏‎‎‏‏‏‏‏‏‏‎‎‎‏‎Show Ethernet usage‎‏‎‎‏‎"</string>
+    <string name="data_usage_menu_hide_ethernet" msgid="3326702187179943681">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‏‏‏‎‎‎‏‎‏‎‏‎‏‏‎‏‎‎‏‎‎‎‎‎‎‎‏‏‎‏‏‏‏‏‎‎‎‏‏‎‎‎‎‎‎‎‏‎‎‏‏‏‎‎‎‎‎‎‎‏‎Hide Ethernet usage‎‏‎‎‏‎"</string>
+    <string name="data_usage_menu_metered" msgid="6235119991372755026">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‎‏‏‎‏‎‎‎‎‏‏‏‏‎‎‏‏‎‎‎‏‎‎‏‏‎‎‎‏‏‎‏‏‎‎‏‏‎‏‏‎‏‎‏‏‎‏‏‎‎‎‎‎‏‎‏‎‎‏‎‎Network restrictions‎‏‎‎‏‎"</string>
+    <string name="data_usage_menu_auto_sync" msgid="8203999775948778560">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‎‎‎‏‏‏‎‏‏‎‏‎‎‏‏‏‎‏‏‎‎‏‎‏‎‏‎‎‎‏‎‏‏‏‏‎‏‏‎‎‏‏‏‏‏‎‏‎‏‏‎‎‎‏‎‎‎‎‎‎‎Auto-sync data‎‏‎‎‏‎"</string>
+    <string name="data_usage_menu_sim_cards" msgid="6410498422797244073">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‏‎‎‎‏‏‏‏‎‏‏‎‏‎‏‎‏‎‏‎‎‏‎‏‏‎‎‏‏‏‏‎‏‏‎‎‎‎‎‎‏‎‎‎‎‎‎‏‎‏‏‎‏‎‏‎‏‎‎‏‎SIM cards‎‏‎‎‏‎"</string>
+    <string name="data_usage_menu_cellular_networks" msgid="8339835014751511300">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‎‎‏‏‏‎‏‏‏‏‎‏‎‎‎‎‏‎‏‏‏‏‎‎‎‎‏‎‎‏‏‏‎‎‏‏‏‎‏‎‎‎‎‎‏‏‏‎‎‎‏‏‎‎‎‎‎‏‎‎‎Mobile networks‎‏‎‎‏‎"</string>
+    <string name="data_usage_cellular_data_summary" msgid="8413357481361268285">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‎‏‎‎‏‏‎‎‎‎‏‎‎‏‎‎‎‎‎‎‎‎‎‎‏‏‎‏‏‎‏‎‏‏‎‎‏‏‏‎‏‎‎‏‏‏‎‏‏‏‏‎‎‎‏‏‏‏‎‏‎Paused at limit‎‏‎‎‏‎"</string>
+    <string name="account_settings_menu_auto_sync" msgid="6243013719753700377">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‎‏‏‎‏‎‏‎‎‎‏‏‏‎‏‎‎‎‏‏‏‏‏‎‎‏‏‎‏‎‏‏‎‏‎‏‏‏‎‎‏‏‏‏‎‎‏‏‎‏‎‎‎‎‎‏‏‎‎‏‎Auto-sync data‎‏‎‎‏‎"</string>
+    <string name="account_settings_menu_auto_sync_personal" msgid="785541379617346438">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‎‏‎‏‎‏‏‏‎‎‏‏‎‏‏‎‎‏‏‎‏‏‎‏‏‏‎‎‏‎‎‎‎‏‎‎‎‎‏‏‏‎‏‏‎‎‏‎‏‎‎‏‏‏‎‎‎‎‏‏‎‎Auto-sync personal data‎‏‎‎‏‎"</string>
+    <string name="account_settings_menu_auto_sync_work" msgid="329565580969147026">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‎‏‏‏‎‎‏‎‎‏‎‎‏‎‏‏‎‏‏‎‏‎‎‎‏‎‎‏‏‎‎‏‎‏‎‏‏‏‏‏‎‏‏‏‎‎‎‏‏‏‏‎‏‎‏‎‎‏‎‎‏‎‎Auto-sync work data‎‏‎‎‏‎"</string>
+    <string name="data_usage_change_cycle" msgid="7776556448920114866">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‏‎‏‏‏‏‏‎‏‎‏‏‏‏‏‎‎‎‎‎‏‏‏‎‎‎‏‏‎‏‏‎‏‎‎‏‏‎‏‎‏‎‎‎‎‎‎‏‎‏‏‎‏‎‏‏‎‎‏‎‎Change cycle…‎‏‎‎‏‎"</string>
+    <string name="data_usage_pick_cycle_day" msgid="4470796861757050966">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‏‏‏‎‎‎‎‎‏‎‏‏‎‏‏‏‎‏‏‎‎‎‎‎‏‏‏‎‏‏‏‏‎‏‏‏‏‏‏‏‎‏‎‏‏‏‎‏‎‎‎‎‎‏‎‏‎‏‏‎‎Day of month to reset data usage cycle:‎‏‎‎‏‎"</string>
+    <string name="data_usage_empty" msgid="8621855507876539282">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‎‏‏‏‏‎‏‎‎‏‏‎‏‏‏‏‏‎‏‏‏‏‏‎‎‏‏‏‎‏‏‎‎‎‏‏‏‎‏‏‏‎‎‏‏‏‏‎‏‎‏‏‏‎‎‏‎‎‏‎‎No apps used data during this period.‎‏‎‎‏‎"</string>
+    <string name="data_usage_label_foreground" msgid="4938034231928628164">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‎‏‎‎‏‎‎‎‎‏‏‏‎‏‏‎‏‎‏‏‏‏‏‏‏‎‎‎‏‎‎‏‏‎‏‎‏‏‎‏‎‎‏‏‎‎‏‎‎‎‏‏‏‏‎‎‎‏‎‎‎Foreground‎‏‎‎‏‎"</string>
+    <string name="data_usage_label_background" msgid="3225844085975764519">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‏‏‎‎‏‏‎‎‎‏‎‎‏‎‎‎‎‎‎‎‎‎‎‏‏‎‏‎‏‏‎‏‏‏‎‏‎‏‏‎‎‎‎‏‎‏‎‎‏‏‏‎‎‎‏‎‎‏‏‏‎Background‎‏‎‎‏‎"</string>
+    <string name="data_usage_app_restricted" msgid="3568465218866589705">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‎‎‎‏‏‎‎‎‎‏‎‏‏‎‏‏‏‏‎‎‎‎‏‏‎‏‎‏‏‏‎‎‎‎‏‏‏‏‏‎‎‎‎‏‎‎‏‏‎‎‎‎‎‎‎‎‏‎‎‏‎restricted‎‏‎‎‏‎"</string>
+    <string name="data_usage_disable_mobile" msgid="8656552431969276305">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‏‎‎‎‎‎‏‎‎‎‏‎‎‏‎‎‎‎‎‎‏‎‎‏‎‎‏‎‏‎‎‎‏‏‏‏‎‎‎‏‎‎‏‎‏‎‎‏‎‎‎‏‏‎‎‏‎‎‎‏‎Turn off mobile data?‎‏‎‎‏‎"</string>
+    <string name="data_usage_disable_mobile_limit" msgid="4644364396844393848">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‎‎‎‎‎‏‏‏‎‏‎‎‎‎‎‏‏‎‎‎‏‏‎‎‏‏‏‏‏‏‏‎‎‎‎‏‎‏‏‎‎‎‎‏‏‎‏‎‎‏‎‏‎‏‏‏‏‎‎‎‎Set mobile data limit‎‏‎‎‏‎"</string>
+    <string name="data_usage_disable_4g_limit" msgid="6233554774946681175">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‎‏‏‎‏‎‎‎‎‎‏‎‎‎‎‎‏‎‎‏‎‎‎‎‏‎‏‎‏‎‎‎‎‎‎‎‏‎‏‎‎‎‏‏‎‎‎‏‎‎‎‏‎‏‎‏‎‏‏‏‎Set 4G data limit‎‏‎‎‏‎"</string>
+    <string name="data_usage_disable_3g_limit" msgid="2558557840444266906">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‎‎‏‏‏‎‎‎‎‎‎‏‏‏‎‏‎‎‏‎‏‏‎‎‏‏‎‎‏‏‎‏‎‎‎‎‏‏‏‏‏‎‎‎‏‎‎‏‏‎‎‏‏‎‎‏‏‎‏‎‎Set 2G-3G data limit‎‏‎‎‏‎"</string>
+    <string name="data_usage_disable_wifi_limit" msgid="1394901415264660888">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‎‎‏‏‎‏‎‏‏‎‏‏‏‎‏‎‏‏‏‏‎‏‏‏‎‎‏‎‎‏‎‏‏‎‎‏‏‎‎‎‏‎‏‎‎‎‏‎‏‏‎‏‏‎‎‏‏‎‎‎‎Set Wi‑Fi data limit‎‏‎‎‏‎"</string>
+    <string name="data_usage_tab_wifi" msgid="481146038146585749">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‎‏‏‏‏‎‏‎‏‎‏‏‎‏‎‏‎‏‏‏‏‏‏‏‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‏‎‏‎‎‎‎‎‏‎‏‎‏‎‎‏‎‎‏‎‏‎‏‎Wi‑Fi‎‏‎‎‏‎"</string>
+    <string name="data_usage_tab_ethernet" msgid="7298064366282319911">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‎‏‎‏‎‏‎‎‎‏‏‏‏‏‏‎‏‏‏‎‏‏‎‏‏‏‏‏‏‏‎‏‎‏‎‎‎‎‏‏‎‎‎‏‏‎‏‎‏‎‎‎‎‎‏‎‎‏‏‏‎Ethernet‎‏‎‎‏‎"</string>
+    <string name="data_usage_tab_mobile" msgid="454140350007299045">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‎‏‏‏‏‎‎‏‎‎‏‏‎‏‎‏‏‎‏‏‏‎‎‎‏‏‏‏‏‎‎‎‎‎‎‎‎‎‎‏‎‏‏‎‏‏‎‏‎‎‏‎‏‏‏‏‏‎‎‏‎‏‎Mobile‎‏‎‎‏‎"</string>
+    <string name="data_usage_tab_4g" msgid="1301978716067512235">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‎‎‏‎‎‎‎‏‎‎‎‏‏‎‎‎‏‏‏‎‏‎‏‏‏‏‏‎‎‏‏‏‏‏‎‎‎‏‎‏‎‎‏‎‏‎‏‏‏‏‏‏‏‎‏‎‏‎‏‏‎4G‎‏‎‎‏‎"</string>
+    <string name="data_usage_tab_3g" msgid="6092169523081538718">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‎‏‎‎‏‎‎‎‏‎‏‏‏‎‏‏‏‎‏‏‏‏‏‎‎‏‏‏‎‏‎‎‏‏‏‎‏‎‏‏‏‏‎‎‎‏‏‎‏‏‎‎‏‎‎‏‏‏‏‎‎2G-3G‎‏‎‎‏‎"</string>
+    <string name="data_usage_list_mobile" msgid="5588685410495019866">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‏‏‎‏‏‎‎‎‏‏‏‎‏‏‏‏‏‏‏‏‏‏‎‎‎‏‎‏‎‏‎‎‏‏‎‏‏‏‏‏‎‏‏‎‏‎‏‏‏‎‏‏‎‏‎‏‏‎‏‎‎Mobile‎‏‎‎‏‎"</string>
+    <string name="data_usage_list_none" msgid="3933892774251050735">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‎‏‏‎‏‎‎‏‎‏‏‏‏‏‏‏‏‏‏‎‏‎‏‎‎‎‏‎‏‎‏‏‎‎‎‏‏‎‏‏‎‏‎‏‏‎‏‏‎‏‏‎‏‏‏‎‏‏‏‏‎None‎‏‎‎‏‎"</string>
+    <string name="data_usage_enable_mobile" msgid="986782622560157977">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‎‏‏‎‏‏‎‏‏‎‎‎‏‏‏‎‎‎‎‎‏‏‎‎‏‎‎‎‏‎‎‏‎‏‎‎‎‎‎‏‏‏‎‏‎‎‎‎‎‎‎‎‏‎‎‎‏‏‎‎‏‎Mobile data‎‏‎‎‏‎"</string>
+    <string name="data_usage_enable_3g" msgid="6304006671869578254">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‎‏‏‏‎‏‏‏‏‏‎‎‎‏‎‏‎‏‎‎‏‎‏‎‏‎‏‏‎‎‎‎‎‎‏‎‎‏‏‏‏‎‏‎‏‎‎‎‏‏‎‎‎‎‎‎‏‏‏‎‎2G-3G data‎‏‎‎‏‎"</string>
+    <string name="data_usage_enable_4g" msgid="3635854097335036738">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‎‎‏‎‎‏‏‏‎‏‎‏‎‎‏‎‎‏‏‎‎‎‎‎‏‎‎‏‏‎‏‏‎‏‏‎‏‏‎‎‏‏‎‏‏‎‏‎‏‎‏‏‎‏‎‎‎‎‏‎‎4G data‎‏‎‎‏‎"</string>
+    <string name="data_usage_forground_label" msgid="7654319010655983591">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‏‎‏‎‎‎‏‏‏‎‎‏‏‎‎‏‏‎‏‎‏‎‎‏‎‏‎‏‏‏‏‏‏‎‏‏‏‎‏‎‏‎‏‏‎‏‎‏‎‏‏‏‏‏‏‎‎‏‏‏‎Foreground:‎‏‎‎‏‎"</string>
+    <string name="data_usage_background_label" msgid="2722008379947694926">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‎‏‎‏‏‏‎‎‎‏‏‎‏‎‎‎‎‏‎‎‎‎‏‏‎‎‏‏‎‎‏‎‎‎‏‎‎‏‏‎‏‎‏‏‎‎‏‏‏‎‏‏‎‏‎‎‏‏‏‎‎Background:‎‏‎‎‏‎"</string>
+    <string name="data_usage_app_settings" msgid="2279171379771253165">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‏‏‏‏‏‎‏‎‎‎‎‏‎‎‏‏‏‏‏‎‎‏‎‎‏‎‏‏‎‏‎‏‏‎‎‏‏‎‎‎‎‎‎‎‏‎‏‎‎‎‎‏‏‎‏‎‏‏‎‏‎App settings‎‏‎‎‏‎"</string>
+    <string name="data_usage_app_restrict_background" msgid="7359227831562303223">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‎‏‏‎‎‎‏‎‎‎‎‏‎‎‏‏‏‎‏‎‏‎‏‏‏‎‎‎‏‏‎‏‎‎‎‏‎‏‏‏‎‎‎‎‎‏‏‏‎‏‏‎‏‏‏‏‎‏‏‏‎Background data‎‏‎‎‏‎"</string>
+    <string name="data_usage_app_restrict_background_summary" msgid="5853552187570622572">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‎‎‎‏‎‎‏‏‏‎‏‏‏‏‏‏‏‏‏‎‏‎‏‏‎‎‏‏‎‏‏‏‏‏‏‎‎‏‎‏‏‎‏‏‏‎‎‏‎‎‎‎‎‏‏‎‏‏‎‎‎Enable usage of mobile data in the background‎‏‎‎‏‎"</string>
+    <string name="data_usage_app_restrict_background_summary_disabled" msgid="7401927377070755054">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‎‏‏‎‏‎‏‏‏‎‎‎‏‏‏‎‏‏‎‏‏‎‏‏‏‎‏‏‎‏‏‏‏‎‏‏‏‎‎‎‏‎‏‎‏‎‎‎‏‏‎‎‏‏‏‎‏‏‏‎‎To restrict background data for this app, first set a mobile data limit.‎‏‎‎‏‎"</string>
+    <string name="data_usage_app_restrict_dialog_title" msgid="1613108390242737923">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‎‏‏‎‎‏‏‎‎‎‏‎‏‏‏‎‏‎‎‏‏‎‎‎‏‎‎‎‏‏‎‎‏‎‎‎‏‎‎‏‏‏‏‎‏‏‎‏‏‏‏‏‎‎‎‎‎‎‏‏‎Restrict background data?‎‏‎‎‏‎"</string>
+    <string name="data_usage_app_restrict_dialog" msgid="1466689968707308512">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‎‏‎‎‎‏‎‏‏‎‏‎‏‎‏‏‏‎‏‎‏‏‎‎‎‎‎‏‎‏‏‏‎‏‎‎‎‏‏‎‏‏‎‏‏‎‎‎‏‎‏‏‏‏‏‎‎‎‎‎‎This feature may cause an app that depends on background data to stop working when only mobile networks are available.‎‏‎‎‏‏‎\n‎‏‎‎‏‏‏‎‎‏‎‎‏‏‎\n‎‏‎‎‏‏‏‎You can find more appropriate data usage controls in the settings available within the app.‎‏‎‎‏‎"</string>
+    <string name="data_usage_restrict_denied_dialog" msgid="55012417305745608">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‎‎‎‏‏‎‎‎‎‏‏‎‏‏‏‎‎‎‏‏‎‎‎‎‎‎‎‏‎‎‎‎‏‏‏‏‎‏‏‏‏‏‎‏‎‎‏‏‎‎‎‏‏‎‎‏‎‎‎‎Restricting background data is possible only when you’ve set a mobile data limit.‎‏‎‎‏‎"</string>
+    <string name="data_usage_auto_sync_on_dialog_title" msgid="2438617846762244389">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‎‎‎‏‏‏‎‏‎‏‏‏‏‎‏‏‎‏‏‎‎‎‎‎‎‎‏‎‏‏‏‎‎‎‏‏‎‎‏‏‎‎‎‏‎‎‎‎‏‎‎‏‎‎‏‎‎‏‎‏‎Turn auto-sync data on?‎‏‎‎‏‎"</string>
+    <string name="data_usage_auto_sync_on_dialog" product="tablet" msgid="8581983093524041669">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‎‏‏‏‎‎‎‏‏‎‎‏‎‏‎‏‎‏‎‎‎‎‏‎‎‏‏‏‎‏‏‏‏‏‎‏‏‏‏‎‏‎‎‎‏‎‎‎‏‏‏‏‏‏‎‎‎‏‎‏‎Any changes you make to your accounts on the web will be automatically copied to your tablet.‎‏‎‎‏‏‎\n‎‏‎‎‏‏‏‎‎‏‎‎‏‏‎\n‎‏‎‎‏‏‏‎Some accounts may also automatically copy any changes you make on the tablet to the web. A Google Account works this way.‎‏‎‎‏‎"</string>
+    <string name="data_usage_auto_sync_on_dialog" product="default" msgid="8651376294887142858">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‏‎‎‎‎‎‎‎‏‏‏‏‏‏‎‏‏‏‎‎‏‏‏‎‎‏‏‏‎‎‏‏‏‎‏‎‏‏‏‏‏‎‏‏‏‎‏‏‎‏‎‏‏‏‎‎‏‎‏‎‎Any changes you make to your accounts on the web will be automatically copied to your phone.‎‏‎‎‏‏‎\n‎‏‎‎‏‏‏‎‎‏‎‎‏‏‎\n‎‏‎‎‏‏‏‎Some accounts may also automatically copy any changes you make on the phone to the web. A Google Account works this way.‎‏‎‎‏‎"</string>
+    <string name="data_usage_auto_sync_off_dialog_title" msgid="9013139130490125793">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‏‏‎‏‎‎‎‏‎‏‎‏‎‎‎‏‏‎‏‎‎‏‎‎‏‎‎‏‎‎‎‏‏‎‎‎‎‎‎‎‏‎‎‏‎‏‏‏‏‏‎‏‏‏‏‎‎‎‎‏‎Turn auto-sync data off?‎‏‎‎‏‎"</string>
+    <string name="data_usage_auto_sync_off_dialog" msgid="4025938250775413864">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‎‏‏‏‏‏‎‏‏‏‏‏‎‎‎‎‎‎‎‏‏‎‎‎‎‎‏‎‎‎‏‏‏‏‎‏‎‎‏‎‎‎‎‎‎‏‎‎‎‏‎‎‎‏‏‎‏‎‎‎‎This will conserve data and battery usage, but you’ll need to sync each account manually to collect recent information. And you won’t receive notifications when updates occur.‎‏‎‎‏‎"</string>
+    <string name="data_usage_cycle_editor_title" msgid="1373797281540188533">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‎‎‏‏‎‎‎‏‎‎‎‎‏‎‏‏‎‏‎‏‎‏‎‏‏‎‎‏‎‏‎‎‏‏‏‏‏‎‎‏‏‎‎‏‏‎‏‎‏‎‎‏‎‏‏‏‎‏‎‏‎Usage cycle reset date‎‏‎‎‏‎"</string>
+    <string name="data_usage_cycle_editor_subtitle" msgid="5512903797979928416">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‏‏‎‎‏‎‎‎‎‎‎‏‏‏‎‎‎‏‎‎‏‏‎‎‏‎‏‏‏‎‏‎‏‏‏‏‎‏‏‏‏‏‏‎‏‏‎‏‎‏‏‏‎‏‏‎‎‎‎‎‎Date of each month:‎‏‎‎‏‎"</string>
+    <string name="data_usage_cycle_editor_positive" msgid="8821760330497941117">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‏‎‏‎‎‏‏‎‏‏‎‏‎‎‏‏‎‎‎‎‎‏‎‎‎‏‏‏‏‏‏‎‏‎‎‎‏‏‏‏‎‏‏‎‎‏‎‏‏‏‏‎‎‏‏‏‏‏‎‏‎Set‎‏‎‎‏‎"</string>
+    <string name="data_usage_warning_editor_title" msgid="3704136912240060339">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‎‎‏‏‎‏‏‎‎‏‏‏‏‎‏‏‏‏‎‎‏‏‏‎‎‏‎‏‎‏‏‏‎‏‎‏‎‏‏‏‏‎‏‏‎‎‏‎‎‏‏‏‏‎‏‏‎‎‏‏‎Set data usage warning‎‏‎‎‏‎"</string>
+    <string name="data_usage_limit_editor_title" msgid="9153595142385030015">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‏‏‏‏‎‎‎‎‏‎‎‎‎‎‎‏‏‎‏‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‏‏‎‎‏‏‏‎‏‎‎‏‏‎‏‏‏‏‏‏‏‎Set data usage limit‎‏‎‎‏‎"</string>
+    <string name="data_usage_limit_dialog_title" msgid="3023111643632996097">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‏‎‎‏‏‏‏‏‎‏‎‎‎‏‎‎‎‎‎‎‎‎‎‎‎‏‎‏‏‏‎‏‎‎‏‏‎‎‎‏‎‏‏‏‏‎‎‎‏‏‏‏‎‎‎‎‎‎‎‏‎Limiting data usage‎‏‎‎‏‎"</string>
+    <string name="data_usage_limit_dialog_mobile" product="tablet" msgid="4983487893343645667">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‎‏‎‏‎‎‏‎‏‎‎‎‏‏‏‎‎‏‏‏‏‏‎‏‎‏‎‏‏‏‎‏‏‎‎‏‎‎‏‏‎‏‎‏‎‎‏‎‏‏‏‏‏‏‏‎‎‎‏‏‎Your tablet will turn off mobile data once it reaches the limit you set.‎‏‎‎‏‏‎\n‎‏‎‎‏‏‏‎‎‏‎‎‏‏‎\n‎‏‎‎‏‏‏‎Since data usage is measured by your tablet, and your carrier may account for usage differently, consider setting a conservative limit.‎‏‎‎‏‎"</string>
+    <string name="data_usage_limit_dialog_mobile" product="default" msgid="3926320594049434225">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‎‏‏‎‎‏‏‏‏‏‎‏‎‎‎‏‎‏‏‏‏‏‎‎‎‏‏‏‎‎‎‏‏‎‏‎‏‎‎‏‏‏‏‎‎‎‎‎‎‎‏‎‎‏‏‏‎‎‎‏‎Your phone will turn off mobile data once it reaches the limit you set.‎‏‎‎‏‏‎\n‎‏‎‎‏‏‏‎‎‏‎‎‏‏‎\n‎‏‎‎‏‏‏‎Since data usage is measured by your phone, and your carrier may account for usage differently, consider setting a conservative limit.‎‏‎‎‏‎"</string>
+    <string name="data_usage_restrict_background_title" msgid="2201315502223035062">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‏‏‏‎‏‎‎‎‏‏‎‎‏‎‏‎‎‏‎‎‏‏‎‎‏‎‎‏‎‏‎‎‎‏‎‎‏‎‎‏‎‎‎‎‏‎‎‎‏‎‏‎‏‎‏‏‎‏‏‎‎Restrict background data?‎‏‎‎‏‎"</string>
+    <string name="data_usage_restrict_background" msgid="434093644726734586">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‎‏‏‏‏‎‎‎‎‎‎‏‏‎‎‎‏‏‎‏‎‏‏‏‎‏‏‏‏‎‏‎‏‏‎‏‎‏‎‎‏‏‎‎‎‏‎‎‎‎‏‏‏‎‏‏‏‏‏‎‏‎‎If you restrict background mobile data, some apps and services won’t work unless you’re connected to Wi‑Fi.‎‏‎‎‏‎"</string>
+    <string name="data_usage_restrict_background_multiuser" product="tablet" msgid="7096707497743363380">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‎‎‏‎‎‏‏‏‏‏‎‎‏‎‎‏‎‎‎‏‏‏‎‏‏‏‏‎‏‎‎‎‎‏‎‏‏‏‎‏‏‎‎‎‎‎‏‎‏‏‎‏‎‎‏‏‎‏‎‎‎If you restrict background mobile data, some apps and services won’t work unless you’re connected to Wi‑Fi.‎‏‎‎‏‏‎\n‎‏‎‎‏‏‏‎‎‏‎‎‏‏‎\n‎‏‎‎‏‏‏‎This setting affects all users on this tablet.‎‏‎‎‏‎"</string>
+    <string name="data_usage_restrict_background_multiuser" product="default" msgid="7910798414964288424">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‏‏‎‏‏‏‎‎‏‎‎‎‏‏‎‎‏‏‎‏‎‎‏‏‏‏‏‎‏‏‎‎‎‏‎‏‏‎‏‎‏‎‏‏‎‏‏‎‏‎‏‏‏‎‏‎‏‎‎‎‎If you restrict background mobile data, some apps and services won’t work unless you’re connected to Wi‑Fi.‎‏‎‎‏‏‎\n‎‏‎‎‏‏‏‎‎‏‎‎‏‏‎\n‎‏‎‎‏‏‏‎This setting affects all users on this phone.‎‏‎‎‏‎"</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">"‎‏‎‎‏‏‏‎warning‎‏‎‎‏‏‎"</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">"‎‏‎‎‏‏‏‎limit‎‏‎‎‏‏‎"</font>"‎‏‎‎‏‏‏‎‎‏‎‎‏‎"</string>
+    <string name="data_usage_uninstalled_apps" msgid="614263770923231598">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‎‏‎‎‎‏‎‎‎‎‏‏‎‎‏‎‎‏‏‎‏‏‎‏‎‎‏‎‏‎‎‏‎‏‎‎‎‎‏‎‎‎‏‎‏‎‏‏‎‏‎‎‏‎‏‏‎‏‏‏‎‎Removed apps‎‏‎‎‏‎"</string>
+    <string name="data_usage_uninstalled_apps_users" msgid="7986294489899813194">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‏‏‏‎‏‏‎‏‎‏‎‏‎‎‎‎‎‏‎‎‏‎‎‎‎‏‏‎‎‏‏‏‏‏‏‎‎‎‏‎‎‎‏‏‎‏‎‎‏‎‎‏‎‏‎‎‏‎‏‎‎Removed apps and users‎‏‎‎‏‎"</string>
+    <string name="data_usage_received_sent" msgid="5039699009276621757">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‎‏‎‏‏‏‏‏‎‎‎‎‏‎‎‏‏‎‏‏‏‎‎‎‏‏‎‎‎‎‏‎‎‏‏‎‏‏‎‏‎‎‏‎‎‎‏‏‎‎‏‏‏‎‏‏‏‏‎‏‎‎‏‎‎‏‏‎<xliff:g id="RECEIVED">%1$s</xliff:g>‎‏‎‎‏‏‏‎ received, ‎‏‎‎‏‏‎<xliff:g id="SENT">%2$s</xliff:g>‎‏‎‎‏‏‏‎ sent‎‏‎‎‏‎"</string>
+    <string name="data_usage_total_during_range" msgid="4091294280619255237">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‏‎‎‎‏‏‎‎‎‏‏‏‎‎‏‏‎‎‏‎‎‏‏‏‏‎‎‎‏‎‏‏‏‎‏‏‏‏‏‎‎‏‎‏‏‏‏‎‎‏‎‏‏‏‎‎‎‏‎‏‎‎‏‎‎‏‏‎<xliff:g id="RANGE">%2$s</xliff:g>‎‏‎‎‏‏‏‎: about ‎‏‎‎‏‏‎<xliff:g id="TOTAL">%1$s</xliff:g>‎‏‎‎‏‏‏‎ used.‎‏‎‎‏‎"</string>
+    <string name="data_usage_total_during_range_mobile" product="tablet" msgid="1925687342154538972">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‏‎‏‎‏‎‏‏‏‎‎‏‎‏‏‎‏‎‏‎‎‏‏‎‏‏‏‏‎‏‎‏‏‎‎‏‏‎‎‏‎‏‏‎‎‏‎‏‏‏‏‏‏‏‎‏‏‏‎‎‎‎‏‎‎‏‏‎<xliff:g id="RANGE">%2$s</xliff:g>‎‏‎‎‏‏‏‎: about ‎‏‎‎‏‏‎<xliff:g id="TOTAL">%1$s</xliff:g>‎‏‎‎‏‏‏‎ used, as measured by your tablet. Your carrier’s data usage accounting may differ.‎‏‎‎‏‎"</string>
+    <string name="data_usage_total_during_range_mobile" product="default" msgid="5063981061103812900">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‎‏‏‎‎‏‎‎‎‏‏‎‏‏‎‏‏‏‏‏‏‏‏‏‎‎‎‏‏‏‏‎‏‎‎‎‎‏‏‎‎‏‏‎‎‎‎‎‎‎‎‏‎‎‏‎‎‏‎‎‎‎‏‎‎‏‏‎<xliff:g id="RANGE">%2$s</xliff:g>‎‏‎‎‏‏‏‎: about ‎‏‎‎‏‏‎<xliff:g id="TOTAL">%1$s</xliff:g>‎‏‎‎‏‏‏‎ used, as measured by your phone. Your carrier’s data usage accounting may differ.‎‏‎‎‏‎"</string>
+    <string name="data_usage_metered_title" msgid="7383175371006596441">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‎‏‏‎‎‏‏‏‎‏‏‎‎‏‎‎‏‏‏‎‏‏‏‎‎‎‎‏‏‏‎‏‎‏‏‏‎‏‎‎‎‎‏‎‏‏‎‏‎‏‎‏‎‏‎‏‏‎‎‏‎Network restrictions‎‏‎‎‏‎"</string>
+    <string name="data_usage_metered_body" msgid="7655851702771342507">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‏‎‏‎‎‎‏‏‏‏‏‏‎‎‎‎‏‏‎‎‏‎‎‎‏‏‏‏‏‎‏‎‏‏‎‎‏‏‎‎‎‎‎‏‎‏‎‏‏‏‎‎‏‎‏‎‏‎‏‏‎Metered networks are treated like mobile networks when background data is restricted. Apps may warn before using these networks for large downloads.‎‏‎‎‏‎"</string>
+    <string name="data_usage_metered_mobile" msgid="5423305619126978393">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‏‎‏‏‎‏‎‎‎‎‏‏‎‏‏‏‎‎‏‏‏‎‏‏‏‎‏‎‎‎‎‎‏‎‎‎‎‏‏‏‎‎‎‏‏‎‎‎‎‏‏‏‎‏‎‏‏‎‎‏‎Mobile networks‎‏‎‎‏‎"</string>
+    <string name="data_usage_metered_wifi" msgid="1761738002328299714">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‏‎‎‎‎‏‏‏‎‎‏‎‏‏‏‏‎‎‏‏‎‏‏‎‎‎‎‏‎‎‎‎‏‎‎‎‎‎‎‏‎‏‎‏‏‎‏‎‏‎‎‎‏‏‎‎‎‎‏‎‎Metered Wi‑Fi networks‎‏‎‎‏‎"</string>
+    <string name="data_usage_metered_wifi_disabled" msgid="727808462375941567">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‎‏‎‏‎‎‎‎‏‏‎‎‏‏‎‏‏‎‎‎‏‏‏‏‏‎‎‎‎‏‏‎‎‎‎‎‎‎‏‏‏‎‎‎‎‏‏‏‏‎‏‎‏‏‎‏‏‏‏‏‏‎To select metered networks, turn Wi‑Fi on.‎‏‎‎‏‎"</string>
+    <string name="data_usage_metered_auto" msgid="1262028400911918865">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‎‎‎‏‏‎‎‎‎‎‏‏‏‎‏‎‎‎‎‎‎‎‏‎‎‏‎‎‏‏‏‎‎‏‎‎‏‏‎‎‏‏‏‏‎‎‏‎‎‏‏‏‎‎‎‏‎‎‎‏‎Automatic‎‏‎‎‏‎"</string>
+    <string name="data_usage_metered_yes" msgid="9217539611385225894">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‏‏‏‏‏‏‏‎‏‎‏‏‎‏‎‎‎‏‏‏‎‏‏‏‎‎‎‎‏‎‎‏‏‏‏‏‏‎‏‏‎‏‎‏‎‏‏‎‎‎‏‎‏‎‏‎‎‏‏‎‎Metered‎‏‎‎‏‎"</string>
+    <string name="data_usage_metered_no" msgid="4025232961929071789">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‎‏‏‏‏‏‎‏‏‏‎‎‏‎‎‎‎‎‎‎‎‎‎‎‏‏‎‏‎‏‏‎‎‎‎‏‏‏‏‏‏‎‎‏‏‏‎‎‏‏‎‎‏‎‏‎‏‏‎‏‎Not metered‎‏‎‎‏‎"</string>
+    <string name="data_usage_disclaimer" msgid="6887858149980673444">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‏‏‏‏‏‎‎‏‎‏‏‎‏‎‎‏‎‏‏‎‎‏‏‏‏‏‏‎‎‏‏‏‎‏‎‎‏‏‏‎‎‎‎‎‏‎‎‏‎‏‎‏‏‎‏‎‎‏‎‎‎Carrier data accounting may differ from your device.‎‏‎‎‏‎"</string>
+    <string name="cryptkeeper_emergency_call" msgid="198578731586097145">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‎‏‎‏‎‏‏‎‎‎‎‎‏‎‏‏‏‏‏‏‎‎‏‎‎‏‏‎‏‏‏‏‎‎‏‎‎‎‎‏‎‎‎‏‏‎‎‎‎‏‏‏‏‏‏‏‏‏‎‎‏‎Emergency call‎‏‎‎‏‎"</string>
+    <string name="cryptkeeper_return_to_call" msgid="5613717339452772491">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‏‏‎‏‏‏‏‎‎‏‏‏‏‏‏‎‏‏‏‎‎‎‏‎‏‏‎‏‎‏‏‎‏‏‏‏‏‎‎‎‏‎‎‎‏‎‎‏‎‎‎‎‏‎‎‎‏‎‏‏‎Return to call‎‏‎‎‏‎"</string>
+    <string name="vpn_name" msgid="4689699885361002297">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‎‎‎‏‎‎‎‏‎‏‎‏‎‎‏‎‏‎‎‏‎‎‏‏‎‎‏‎‏‏‎‏‏‎‏‎‎‎‏‎‎‎‎‏‏‏‏‏‎‏‏‏‎‎‏‏‏‎‎‏‎Name‎‏‎‎‏‎"</string>
+    <string name="vpn_type" msgid="5435733139514388070">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‏‎‏‏‎‏‏‎‏‏‏‏‏‎‎‏‏‎‏‎‎‏‏‏‏‏‎‏‏‎‎‏‏‎‏‎‏‎‎‏‎‎‏‎‏‏‏‎‏‏‏‎‎‏‏‎‎‏‏‎‎Type‎‏‎‎‏‎"</string>
+    <string name="vpn_server" msgid="2123096727287421913">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‏‏‎‏‎‏‏‏‎‏‏‎‏‏‎‎‎‎‎‏‎‎‏‏‏‎‎‏‏‎‎‎‏‏‎‏‏‏‎‎‎‎‏‎‏‏‎‏‏‎‏‏‏‏‎‏‏‎‎‏‎Server address‎‏‎‎‏‎"</string>
+    <string name="vpn_mppe" msgid="6639001940500288972">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‏‏‎‎‎‎‏‎‎‎‏‎‎‏‏‏‏‎‎‏‎‎‎‏‎‏‏‏‎‎‎‎‎‏‏‎‏‎‏‎‎‏‏‎‎‎‎‏‎‏‎‏‏‏‎‎‏‏‎‎‎PPP encryption (MPPE)‎‏‎‎‏‎"</string>
+    <string name="vpn_l2tp_secret" msgid="529359749677142076">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‎‏‏‏‏‏‎‏‎‏‏‎‎‎‏‎‏‎‏‎‎‏‏‏‏‎‎‎‏‏‎‎‏‏‏‏‎‏‏‏‏‎‎‏‎‏‎‏‎‏‎‎‎‎‎‎‏‏‏‏‎‎‎L2TP secret‎‏‎‎‏‎"</string>
+    <string name="vpn_ipsec_identifier" msgid="4098175859460006296">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‏‎‎‎‏‏‎‏‏‏‏‏‏‎‏‎‎‏‎‏‎‎‏‏‏‎‏‏‎‎‏‎‏‎‏‎‎‎‏‏‎‎‎‏‏‏‏‎‎‎‎‏‏‎‎‏‏‎‎‎‎IPSec identifier‎‏‎‎‏‎"</string>
+    <string name="vpn_ipsec_secret" msgid="4526453255704888704">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‏‏‏‎‏‏‎‏‎‎‎‏‎‎‏‏‎‎‎‏‎‏‎‎‎‎‎‎‏‏‏‏‏‏‏‎‏‎‏‏‎‎‏‏‎‏‎‎‎‏‎‏‏‎‎‎‎‎‎‎‎IPSec pre-shared key‎‏‎‎‏‎"</string>
+    <string name="vpn_ipsec_user_cert" msgid="6880651510020187230">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‏‏‏‏‎‏‏‏‏‏‎‎‏‏‏‏‏‏‎‎‎‎‎‏‎‏‏‏‏‏‎‏‎‏‏‎‎‎‎‎‎‎‏‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‎IPSec user certificate‎‏‎‎‏‎"</string>
+    <string name="vpn_ipsec_ca_cert" msgid="91338213449148229">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‎‎‏‏‎‏‎‎‎‏‎‎‎‏‏‏‏‏‏‏‏‎‎‏‏‏‏‏‎‎‎‎‎‏‏‏‎‎‎‎‏‏‏‎‎‎‏‎‎‏‏‏‎‏‎‎‎‏‎‏‎IPSec CA certificate‎‏‎‎‏‎"</string>
+    <string name="vpn_ipsec_server_cert" msgid="6599276718456935010">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‏‎‏‏‏‎‎‏‎‏‎‏‎‏‎‏‎‏‏‏‎‎‏‏‎‏‏‎‎‎‎‎‎‎‏‎‎‎‏‎‎‎‎‏‏‎‎‏‎‎‏‎‎‏‏‎‎‎‏‎‎IPSec server certificate‎‏‎‎‏‎"</string>
+    <string name="vpn_show_options" msgid="7182688955890457003">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‎‎‏‏‏‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‏‎‎‎‏‏‎‎‏‏‎‎‎‎‏‏‏‏‏‏‏‎‎‎‏‏‎‏‏‎‎‏‏‎‏‎‏‎‏‏‎Show advanced options‎‏‎‎‏‎"</string>
+    <string name="vpn_search_domains" msgid="5391995501541199624">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‏‎‏‎‏‏‎‏‎‏‎‎‎‎‏‏‎‏‏‏‎‏‎‏‎‏‏‏‎‎‏‏‎‎‏‏‏‏‎‏‏‏‏‎‎‎‎‎‏‏‏‏‎‎‎‎‏‎‎‎‎DNS search domains‎‏‎‎‏‎"</string>
+    <string name="vpn_dns_servers" msgid="5570715561245741829">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‏‏‎‏‎‏‎‎‏‏‏‏‎‎‏‎‏‎‎‎‎‏‎‎‏‎‎‏‏‎‏‏‏‏‎‎‏‏‎‎‏‎‏‏‎‎‎‏‎‎‏‏‎‎‎‎‎‏‎‏‎DNS servers (e.g. 8.8.8.8)‎‏‎‎‏‎"</string>
+    <string name="vpn_routes" msgid="3818655448226312232">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‎‏‎‎‏‏‏‏‏‏‏‎‏‎‎‏‎‏‏‎‏‏‏‎‎‏‎‏‏‏‏‎‎‏‏‏‎‎‏‎‎‎‏‏‏‎‏‏‎‎‎‎‎‎‏‎‏‎‎‎‎Forwarding routes (e.g. 10.0.0.0/8)‎‏‎‎‏‎"</string>
+    <string name="vpn_username" msgid="1863901629860867849">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‏‎‎‏‏‏‎‏‏‏‎‏‏‏‏‎‏‎‎‎‏‎‏‎‏‎‎‎‎‎‏‏‎‎‎‎‎‎‏‎‎‎‎‎‏‏‏‎‏‏‏‏‎‎‎‎‏‎‎‏‎Username‎‏‎‎‏‎"</string>
+    <string name="vpn_password" msgid="6756043647233596772">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‏‏‎‏‏‏‎‎‎‎‏‎‎‏‎‎‏‎‎‏‏‏‏‎‎‏‏‎‏‏‏‏‎‎‎‎‎‏‏‎‎‏‎‎‏‎‎‏‏‏‎‏‎‏‏‎‎‏‎‎‎Password‎‏‎‎‏‎"</string>
+    <string name="vpn_save_login" msgid="6350322456427484881">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‏‎‎‎‎‎‏‎‎‎‎‎‏‏‏‎‎‎‎‎‏‎‏‎‎‎‎‎‏‏‏‏‎‎‎‎‏‎‎‎‏‎‏‏‏‏‎‏‎‏‏‎‏‏‎‏‎‎‎‏‎Save account information‎‏‎‎‏‎"</string>
+    <string name="vpn_not_used" msgid="9094191054524660891">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‏‏‏‎‎‎‏‏‎‏‎‏‎‎‎‎‏‏‏‎‏‎‎‏‎‏‎‎‏‎‏‏‏‏‎‎‎‏‏‏‏‎‏‎‎‎‏‏‏‏‎‎‏‎‎‏‏‎‏‏‎(not used)‎‏‎‎‏‎"</string>
+    <string name="vpn_no_ca_cert" msgid="8776029412793353361">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‏‎‎‏‏‏‎‎‏‎‏‎‏‎‏‏‏‎‎‎‎‏‎‎‎‎‎‎‏‏‏‎‎‏‏‏‏‏‏‎‏‏‎‏‏‎‎‎‎‏‎‎‏‎‎‏‎‎‎‏‎(don’t verify server)‎‏‎‎‏‎"</string>
+    <string name="vpn_no_server_cert" msgid="2167487440231913330">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‏‏‏‎‎‎‎‏‎‏‎‎‎‏‏‏‎‏‏‎‎‏‎‏‎‏‏‏‏‏‎‏‎‎‏‎‎‎‏‎‎‏‎‎‏‏‎‏‎‏‏‏‎‏‏‏‎‎‏‎‎(received from server)‎‏‎‎‏‎"</string>
+    <string name="vpn_always_on_invalid_reason_type" msgid="7574518311224455825">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‏‎‎‏‎‎‎‏‏‏‏‎‎‎‎‏‏‎‎‎‎‏‎‎‎‏‎‏‏‏‎‎‎‏‎‏‎‎‏‏‏‎‎‏‏‎‏‏‎‎‏‎‏‎‎‏‎‎‎‏‎This VPN type can\'t stay connected at all times‎‏‎‎‏‎"</string>
+    <string name="vpn_always_on_invalid_reason_server" msgid="477304620899799383">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‎‏‏‏‏‎‏‎‎‏‏‏‏‏‏‎‏‏‏‎‏‎‎‎‎‎‎‏‏‎‎‎‎‏‏‎‏‎‎‏‏‎‎‎‏‎‏‎‎‏‎‎‎‏‎‏‎‏‎‏‏‏‎Always-on VPN only supports numeric server addresses‎‏‎‎‏‎"</string>
+    <string name="vpn_always_on_invalid_reason_no_dns" msgid="2226648961940273294">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‏‏‏‎‏‏‏‎‎‏‏‎‏‎‏‎‎‏‎‏‎‏‏‎‏‏‏‎‏‏‏‏‏‏‏‏‏‏‏‏‎‎‎‏‎‎‏‏‏‎‎‎‏‎‎‎‏‏‏‎‎A DNS server must be specified for always-on VPN‎‏‎‎‏‎"</string>
+    <string name="vpn_always_on_invalid_reason_dns" msgid="3551394495620249972">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‎‎‎‏‎‏‎‎‏‎‎‏‎‎‎‏‎‏‏‎‎‏‏‏‏‎‏‎‎‏‎‎‏‎‎‎‏‎‏‏‏‎‎‎‏‏‏‏‏‎‎‏‎‏‏‏‎‏‎‎‎DNS server addresses must be numeric for always-on VPN‎‏‎‎‏‎"</string>
+    <string name="vpn_always_on_invalid_reason_other" msgid="5959352052515258208">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‎‎‏‎‏‎‏‏‎‎‏‏‏‏‎‏‏‏‏‏‎‎‎‏‏‏‏‎‎‎‏‎‎‏‎‏‏‎‏‎‏‎‏‎‏‎‏‏‏‏‏‏‎‏‏‎‎‎‎‎‎The information entered doesn\'t support always-on VPN‎‏‎‎‏‎"</string>
+    <string name="vpn_cancel" msgid="1979937976123659332">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‏‎‏‏‎‏‏‏‏‎‏‎‎‎‏‎‎‏‏‏‎‎‎‏‏‎‎‏‎‏‏‎‎‎‎‎‎‎‏‎‏‎‎‎‎‎‎‏‎‏‎‎‎‏‎‎‎‏‎‎‎Cancel‎‏‎‎‏‎"</string>
+    <string name="vpn_done" msgid="8678655203910995914">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‏‎‎‎‎‏‏‏‎‎‎‎‏‏‎‎‎‏‏‎‏‏‏‎‏‏‎‏‎‎‏‎‏‏‎‏‎‎‏‏‎‏‎‏‏‏‎‎‏‏‏‏‏‏‎‎‏‎‏‎‎Dismiss‎‏‎‎‏‎"</string>
+    <string name="vpn_save" msgid="4233484051644764510">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‏‎‏‎‏‏‎‎‎‎‎‎‎‏‎‏‏‎‏‏‎‏‎‏‎‎‎‎‏‎‏‎‎‏‎‎‏‎‎‏‎‎‎‏‎‏‎‏‎‎‎‏‎‏‎‏‏‏‏‎‎Save‎‏‎‎‏‎"</string>
+    <string name="vpn_connect" msgid="8469608541746132301">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‎‏‎‏‏‎‎‎‏‎‏‎‎‎‎‏‏‎‎‎‎‎‎‏‏‎‎‎‎‏‎‎‎‏‎‏‎‏‏‎‎‏‎‎‎‏‏‏‎‏‎‏‎‏‎‎‏‏‎‏‎Connect‎‏‎‎‏‎"</string>
+    <string name="vpn_replace" msgid="5442836256121957861">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‏‎‏‏‏‎‎‎‏‎‎‎‏‏‎‏‎‏‏‎‏‎‏‏‏‏‎‎‏‏‎‏‎‎‎‎‏‏‎‎‎‏‎‎‎‎‏‎‏‏‎‏‏‏‏‎‎‏‎‏‎Replace‎‏‎‎‏‎"</string>
+    <string name="vpn_edit" msgid="8647191407179996943">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‏‎‎‎‎‎‎‎‎‎‎‎‏‏‏‏‏‏‏‎‏‏‎‎‎‏‎‏‎‎‏‎‎‎‎‏‏‏‎‎‎‏‏‎‎‎‎‏‏‏‏‏‎‎‎‎‏‏‏‏‎Edit VPN profile‎‏‎‎‏‎"</string>
+    <string name="vpn_forget" msgid="3684651372749415446">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‎‎‏‏‎‎‏‎‎‎‏‎‏‎‎‎‎‎‏‎‏‏‏‎‎‏‏‎‏‏‎‎‎‎‎‏‏‏‏‎‎‎‏‎‎‏‏‎‎‏‎‎‎‎‎‏‎‏‏‎‎Forget‎‏‎‎‏‎"</string>
+    <string name="vpn_connect_to" msgid="5965299358485793260">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‎‎‏‎‏‏‎‎‏‎‎‏‎‎‎‎‎‎‎‎‎‎‏‎‏‎‎‏‎‎‏‏‏‎‎‏‎‏‏‎‏‎‎‏‎‏‎‎‏‎‎‏‏‏‏‎‏‏‎‎‎Connect to ‎‏‎‎‏‏‎<xliff:g id="PROFILE">%s</xliff:g>‎‏‎‎‏‏‏‎‎‏‎‎‏‎"</string>
+    <string name="vpn_disconnect_confirm" msgid="3743970132487505659">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‎‎‏‏‏‏‏‏‎‏‎‏‎‏‎‎‎‎‎‎‏‏‏‏‏‏‏‏‏‏‎‎‎‏‎‎‏‎‎‏‎‏‏‏‎‎‎‎‎‏‏‎‏‏‏‏‏‎‏‏‎Disconnect this VPN?‎‏‎‎‏‎"</string>
+    <string name="vpn_disconnect" msgid="7426570492642111171">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‎‏‏‏‎‎‎‏‎‎‎‎‎‏‏‏‏‎‏‎‏‎‎‎‎‎‏‏‏‏‏‏‎‎‎‏‎‏‎‏‎‏‎‎‏‎‏‎‏‏‏‎‏‏‎‎‎‎‏‏‎Disconnect‎‏‎‎‏‎"</string>
+    <string name="vpn_version" msgid="1939804054179766249">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‏‎‏‎‏‏‏‎‏‎‏‏‏‎‎‏‎‎‎‏‏‎‎‎‎‎‏‎‎‏‏‏‏‏‏‏‎‎‏‏‏‏‏‏‎‏‎‏‏‏‏‏‏‏‏‎‏‎‎‏‎Version ‎‏‎‎‏‏‎<xliff:g id="VERSION">%s</xliff:g>‎‏‎‎‏‏‏‎‎‏‎‎‏‎"</string>
+    <string name="vpn_forget_long" msgid="2232239391189465752">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‏‏‏‎‏‏‏‏‏‎‏‎‏‎‎‎‎‎‎‏‏‏‏‎‎‏‏‎‎‎‏‏‏‏‎‏‎‏‏‏‏‎‏‏‎‏‏‏‏‎‏‎‏‎‎‏‏‎‎‎‎Forget VPN‎‏‎‎‏‎"</string>
+    <string name="vpn_replace_vpn_title" msgid="2963898301277610248">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‏‎‎‏‎‎‏‎‎‎‎‏‏‏‏‎‎‎‎‏‏‏‎‎‏‏‎‏‎‎‏‏‎‏‏‎‎‎‎‎‏‎‎‏‎‎‏‎‎‎‎‏‎‎‎‎‏‎‎‎‎Replace existing VPN?‎‏‎‎‏‎"</string>
+    <string name="vpn_set_vpn_title" msgid="4009987321156037267">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‎‏‏‏‏‎‏‎‎‏‏‎‎‏‎‏‎‏‏‎‎‎‏‏‏‎‎‏‎‎‎‎‎‏‏‏‎‏‎‏‎‎‏‏‎‏‏‎‏‎‏‎‏‎‎‏‎‎‏‏‎Set always-on VPN?‎‏‎‎‏‎"</string>
+    <string name="vpn_first_always_on_vpn_message" msgid="3025322109743675467">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‏‎‎‏‏‏‏‏‏‏‎‎‎‎‎‏‏‎‏‎‎‏‏‎‏‏‏‎‎‎‎‏‎‎‏‎‎‏‏‎‏‎‎‎‎‎‏‏‏‎‎‎‎‏‎‎‏‎‏‏‎By turning on this setting, you won\'t have an Internet connection until the VPN successfully connects‎‏‎‎‏‎"</string>
+    <string name="vpn_replace_always_on_vpn_enable_message" msgid="2577928591361606641">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‎‎‏‏‏‏‎‎‎‏‏‎‏‎‏‎‎‏‎‎‎‏‏‎‎‏‎‏‎‎‏‏‏‎‎‎‎‏‏‎‏‏‏‎‏‎‎‎‎‎‏‏‏‏‏‏‎‎‎‏‎Your existing VPN will be replaced, and you won\'t have an Internet connection until the VPN successfully connects‎‏‎‎‏‎"</string>
+    <string name="vpn_replace_always_on_vpn_disable_message" msgid="3011818750025879902">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‏‎‎‏‏‏‎‎‏‏‎‎‎‎‏‎‎‎‎‏‎‎‏‏‎‎‏‎‎‎‏‎‎‎‏‏‎‎‏‎‎‏‏‏‎‏‎‏‎‎‎‏‎‏‎‏‏‏‏‎‎You\'re already connected to an always-on VPN. If you connect to a different one, your existing VPN will be replaced, and always-on mode will turn off.‎‏‎‎‏‎"</string>
+    <string name="vpn_replace_vpn_message" msgid="5611635724578812860">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‏‏‎‏‏‏‏‎‎‎‎‎‏‎‎‎‏‎‎‎‏‏‏‏‎‏‎‏‏‎‏‏‎‏‎‎‎‏‏‎‏‎‎‏‎‏‏‏‎‎‏‏‏‎‏‏‏‏‎‎‎You\'re already connected to a VPN. If you connect to a different one, your existing VPN will be replaced.‎‏‎‎‏‎"</string>
+    <string name="vpn_turn_on" msgid="2363136869284273872">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‎‎‎‎‏‏‎‎‏‎‏‏‏‎‎‎‏‏‎‎‎‏‏‏‎‏‏‎‎‏‎‏‎‎‎‏‎‏‎‏‎‎‎‏‎‏‎‏‏‏‏‎‏‏‎‏‎‎‎‎‎Turn on‎‏‎‎‏‎"</string>
+    <string name="vpn_cant_connect_title" msgid="4517706987875907511">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‏‏‏‎‏‎‏‏‎‎‏‎‎‎‎‏‏‏‏‎‏‎‎‏‎‎‎‏‏‏‎‏‎‎‏‏‏‎‏‎‎‏‎‎‏‎‏‏‎‏‏‏‏‎‏‏‎‏‏‏‎‎‏‎‎‏‏‎<xliff:g id="VPN_NAME">%1$s</xliff:g>‎‏‎‎‏‏‏‎ can\'t connect‎‏‎‎‏‎"</string>
+    <string name="vpn_cant_connect_message" msgid="1352832123114214283">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‎‎‏‎‏‏‎‎‎‏‏‎‎‎‏‏‏‎‎‏‏‎‏‎‎‏‎‏‏‏‏‏‏‎‏‎‏‏‏‏‎‏‎‏‏‏‎‏‎‎‏‏‏‎‎‎‏‎‏‏‎This app doesn\'t support always-on VPN‎‏‎‎‏‎"</string>
+    <string name="vpn_title" msgid="6317731879966640551">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‎‏‏‏‏‎‏‎‏‏‎‏‎‎‎‏‎‏‏‏‏‎‏‎‏‏‎‎‎‎‎‎‏‎‏‏‏‎‎‏‎‎‏‎‏‎‎‎‏‎‎‏‏‎‏‎‎‏‏‏‎VPN‎‏‎‎‏‎"</string>
+    <string name="vpn_create" msgid="5628219087569761496">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‏‏‏‎‎‎‎‏‏‎‏‏‎‏‏‏‎‎‏‏‎‏‏‏‎‎‎‎‏‏‎‎‏‎‎‎‏‎‏‎‏‎‏‏‎‎‏‏‎‏‎‎‏‏‎‏‏‎‎‎‎Add VPN profile‎‏‎‎‏‎"</string>
+    <string name="vpn_menu_edit" msgid="408275284159243490">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‎‏‏‏‎‏‏‎‏‎‏‎‏‎‎‏‏‏‏‏‎‎‎‎‏‏‎‏‎‏‎‎‏‏‎‎‏‎‏‏‏‎‎‎‏‎‎‎‏‎‎‏‎‎‏‏‏‎‎‎‏‎‎Edit profile‎‏‎‎‏‎"</string>
+    <string name="vpn_menu_delete" msgid="8098021690546891414">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‎‎‎‎‎‏‏‎‎‎‎‏‏‏‏‏‎‎‏‏‏‏‎‏‎‎‏‎‏‎‎‎‏‎‎‎‎‏‏‏‎‏‎‎‏‎‏‎‏‎‏‎‏‎‎‏‎‏‏‎‎Delete profile‎‏‎‎‏‎"</string>
+    <string name="vpn_menu_lockdown" msgid="7863024538064268139">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‏‏‎‏‎‎‎‏‏‏‏‏‎‎‎‏‎‎‏‏‎‎‏‎‏‎‎‎‎‏‎‎‎‎‏‏‏‎‎‎‎‎‎‎‎‎‏‎‏‎‏‏‎‏‏‎‏‎‏‏‎Always-on VPN‎‏‎‎‏‎"</string>
+    <string name="vpn_no_vpns_added" msgid="5002741367858707244">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‎‏‎‏‎‏‏‎‏‏‎‏‎‏‎‎‏‏‏‎‏‏‎‎‎‏‎‎‏‎‏‏‎‏‏‎‎‏‎‏‏‏‏‎‏‎‏‏‏‎‏‏‎‎‏‎‏‏‎‎‎No VPNs added‎‏‎‎‏‎"</string>
+    <string name="vpn_always_on_summary" msgid="2821344524094363617">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‎‏‏‏‎‎‏‎‎‏‏‏‎‏‏‎‏‏‎‏‏‏‏‎‎‏‎‏‏‎‎‎‎‎‏‏‏‎‏‎‎‎‏‏‎‏‎‏‎‏‏‏‏‏‏‎‎‎‎‏‎Stay connected to VPN at all times‎‏‎‎‏‎"</string>
+    <string name="vpn_always_on_summary_not_supported" msgid="592304911378771510">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‎‏‎‎‎‎‎‏‏‏‎‎‎‎‏‎‎‏‎‏‎‎‎‏‎‏‏‎‏‏‏‎‎‎‎‎‏‎‏‏‏‎‎‏‏‎‏‏‎‏‏‏‎‎‎‏‏‎‏‏‎‎Not supported by this app‎‏‎‎‏‎"</string>
+    <string name="vpn_always_on_summary_active" msgid="8800736191241875669">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‏‎‏‎‎‎‏‎‎‎‏‎‎‏‏‏‏‏‏‎‏‏‏‏‎‎‎‎‎‎‎‎‏‎‎‎‏‏‏‎‎‏‎‏‎‏‏‏‎‎‎‎‏‏‎‏‎‏‎‏‎Always-on active‎‏‎‎‏‎"</string>
+    <string name="vpn_require_connection" msgid="8388183166574269666">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‎‏‎‎‎‏‏‎‏‎‎‎‏‏‎‏‎‎‎‎‎‎‏‎‎‏‎‏‏‏‎‎‎‎‏‎‏‎‎‏‎‎‏‎‎‎‎‏‎‏‎‎‏‏‏‎‎‎‏‎‎Block connections without VPN‎‏‎‎‏‎"</string>
+    <string name="vpn_require_connection_title" msgid="159053539340576331">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‎‏‎‏‎‎‎‏‏‎‏‎‏‎‎‎‏‎‎‏‎‎‏‎‏‏‎‎‏‏‏‏‏‎‎‎‎‏‎‏‎‏‎‎‏‏‏‏‎‎‏‏‎‎‏‎‎‏‎‏‏‎Require VPN connection?‎‏‎‎‏‎"</string>
+    <string name="vpn_lockdown_summary" msgid="2200032066376720339">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‏‏‏‎‏‎‎‎‏‎‎‎‎‎‎‏‎‏‎‏‏‎‎‎‎‎‏‎‎‎‎‏‎‎‏‎‏‏‎‏‏‎‏‎‎‏‎‏‏‏‏‏‏‏‎‏‎‎‏‏‎Select a VPN profile to always remain connected to. Network traffic will only be allowed when connected to this VPN.‎‏‎‎‏‎"</string>
+    <string name="vpn_lockdown_none" msgid="9214462857336483711">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‏‏‏‏‏‏‏‎‎‎‎‎‎‏‎‏‏‎‎‏‎‎‏‎‎‏‎‏‏‏‏‏‏‏‏‏‏‎‎‏‎‎‏‎‎‏‏‎‏‏‏‏‎‏‏‏‏‏‏‏‎None‎‏‎‎‏‎"</string>
+    <string name="vpn_lockdown_config_error" msgid="3898576754914217248">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‎‏‏‎‎‎‎‏‏‎‏‎‏‎‎‎‎‏‏‎‏‏‏‎‎‏‏‏‎‎‏‎‏‏‏‎‎‏‎‎‎‎‎‏‏‏‎‎‏‏‎‏‎‎‏‎‎‎‎‎‎Always-on VPN requires an IP address for both server and DNS.‎‏‎‎‏‎"</string>
+    <string name="vpn_no_network" msgid="3050233675132726155">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‏‎‏‎‎‏‎‏‎‏‎‎‏‎‎‏‏‎‏‏‎‏‎‏‏‏‎‏‏‏‏‎‎‎‎‎‎‎‏‏‏‎‎‎‎‏‏‎‏‎‏‏‏‎‎‎‏‎‏‏‎There is no network connection. Please try again later.‎‏‎‎‏‎"</string>
+    <string name="vpn_disconnected" msgid="280531508768927471">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‎‏‎‏‏‏‏‏‎‎‏‎‎‏‎‏‎‎‏‎‏‏‏‏‎‏‎‏‏‏‏‎‎‎‎‎‎‎‏‏‏‏‎‎‏‏‏‏‎‏‏‏‎‏‏‏‎‏‏‏‏‎Disconnected from VPN‎‏‎‎‏‎"</string>
+    <string name="vpn_disconnected_summary" msgid="3082851661207900606">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‏‎‏‎‏‏‎‎‏‎‎‎‎‏‏‏‏‏‎‏‎‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‏‎‎‎‎‏‎‏‎‎‎‏‎‎‎‏‏‎‏‏‏‏‏‎‎None‎‏‎‎‏‎"</string>
+    <string name="vpn_missing_cert" msgid="5357192202207234745">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‏‎‏‎‎‏‎‏‏‎‎‎‏‎‎‏‎‎‎‏‏‏‏‎‏‏‎‎‏‎‎‏‏‏‏‎‎‎‎‎‏‏‏‎‎‎‎‎‏‎‏‎‏‎‏‏‏‎‎‏‎A certificate is missing. Try editing the profile.‎‏‎‎‏‎"</string>
+    <string name="trusted_credentials_system_tab" msgid="3984284264816924534">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‎‏‏‏‎‏‎‎‏‎‏‏‎‎‎‎‎‏‎‏‎‏‏‎‏‏‎‏‏‏‏‎‎‎‎‎‏‎‎‏‎‏‏‏‎‏‎‏‎‏‏‏‎‏‏‏‎‏‏‎‎System‎‏‎‎‏‎"</string>
+    <string name="trusted_credentials_user_tab" msgid="2244732111398939475">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‏‏‏‏‎‎‏‎‎‏‏‎‏‏‏‎‎‎‏‏‏‏‏‏‎‏‏‎‎‏‎‏‎‎‏‏‏‏‎‏‏‎‎‎‏‎‏‎‏‎‏‏‎‏‎‏‎‎‏‏‎User‎‏‎‎‏‎"</string>
+    <string name="trusted_credentials_disable_label" msgid="3864493185845818506">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‎‏‎‏‏‎‏‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‎‏‎‎‏‏‏‏‎‏‏‎‏‏‎‏‎‎‎‎‎‏‏‏‏‏‎‏‎‎‏‎‎‎‏‎‏‎‎Disable‎‏‎‎‏‎"</string>
+    <string name="trusted_credentials_enable_label" msgid="2498444573635146913">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‎‎‏‎‏‎‏‎‏‏‎‎‎‏‎‎‎‎‏‎‎‎‎‏‏‎‏‎‎‎‏‏‎‏‏‎‏‎‎‎‎‏‏‎‎‏‏‏‎‏‎‎‏‎‏‎‎‎‎‏‎Enable‎‏‎‎‏‎"</string>
+    <string name="trusted_credentials_remove_label" msgid="3633691709300260836">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‎‎‏‎‎‏‏‎‏‏‎‏‎‏‏‏‎‏‏‏‎‏‎‏‏‎‏‏‏‎‎‎‎‏‎‎‎‎‎‏‏‏‏‏‏‎‏‏‏‏‏‏‏‏‏‎‎‏‎‎‎Remove‎‏‎‎‏‎"</string>
+    <string name="trusted_credentials_trust_label" msgid="8003264222650785429">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‏‏‏‏‎‎‎‏‎‎‎‏‎‏‎‎‏‏‏‎‎‏‏‎‏‎‎‎‎‏‎‎‏‎‏‎‏‎‏‏‎‎‎‏‎‏‎‏‏‏‏‎‏‎‎‏‎‏‎‏‎Trust‎‏‎‎‏‎"</string>
+    <string name="trusted_credentials_enable_confirmation" msgid="83215982842660869">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‎‎‏‏‎‎‏‎‎‏‏‏‏‎‏‎‎‏‎‎‎‏‏‏‏‏‏‎‏‏‎‏‏‎‎‎‏‏‏‏‏‎‎‎‏‏‎‎‏‎‎‎‎‎‎‎‎‏‎‏‎Enable the system CA certificate?‎‏‎‎‏‎"</string>
+    <string name="trusted_credentials_disable_confirmation" msgid="8199697813361646792">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‎‎‎‏‏‏‎‎‏‎‏‏‎‎‏‎‏‏‎‏‏‎‏‏‎‏‏‏‏‎‏‎‎‏‏‎‏‏‏‏‎‏‏‏‏‏‎‏‏‏‎‎‏‏‎‎‏‎‎‎‎Disable the system CA certificate?‎‏‎‎‏‎"</string>
+    <string name="trusted_credentials_remove_confirmation" msgid="443561923016852941">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‎‏‏‏‏‎‎‎‏‎‎‏‏‏‏‏‎‏‏‎‎‏‎‎‏‏‏‎‎‎‎‎‎‎‏‎‎‏‎‏‎‎‏‏‏‏‎‎‎‎‎‏‎‏‏‏‎‎‏‏‎‏‎Permanently remove the user CA certificate?‎‏‎‎‏‎"</string>
+    <string name="credential_contains" msgid="3984922924723974084">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‎‏‏‏‎‏‎‎‏‏‎‏‎‏‎‎‏‎‏‎‎‏‎‎‏‎‎‏‎‏‏‏‏‎‎‏‎‏‏‏‏‎‏‏‏‎‏‎‏‏‏‏‏‏‎‎‎‏‎‎‎This entry contains:‎‏‎‎‏‎"</string>
+    <string name="one_userkey" msgid="6034020579534914349">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‎‎‏‏‏‎‏‏‏‏‎‏‎‎‏‎‎‏‎‏‏‎‏‏‏‏‏‏‎‏‎‏‏‎‏‎‏‎‎‏‎‎‏‏‎‏‎‎‎‎‏‏‎‎‏‎‏‏‎‏‎one user key‎‏‎‎‏‎"</string>
+    <string name="one_usercrt" msgid="2150319011101639509">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‏‏‎‏‏‏‎‏‎‏‏‏‎‏‏‏‎‏‏‏‏‎‏‏‏‏‏‏‎‏‏‎‏‎‏‎‎‏‏‏‏‎‏‏‏‎‎‎‎‎‏‏‎‏‎‏‎‏‎‏‎one user certificate‎‏‎‎‏‎"</string>
+    <string name="one_cacrt" msgid="6844397037970164809">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‏‏‏‎‏‏‏‏‏‏‎‎‎‎‏‎‏‏‏‎‏‏‎‏‎‏‏‏‏‏‎‎‎‏‎‏‏‏‏‏‎‎‏‎‏‎‎‎‏‏‎‎‎‏‎‎‏‎‎‏‎one CA certificate‎‏‎‎‏‎"</string>
+    <string name="n_cacrts" msgid="5979300323482053820">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‎‎‏‎‏‏‏‏‏‎‏‎‏‎‏‏‏‏‎‏‏‏‏‏‎‏‏‎‏‏‏‎‏‎‏‎‏‎‎‎‎‏‏‎‏‎‏‎‏‏‎‎‏‎‏‏‏‏‎‎‎%d CA certificates‎‏‎‎‏‎"</string>
+    <string name="user_credential_title" msgid="1954061209643070652">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‏‎‏‏‎‎‎‏‏‏‏‎‎‎‏‏‏‎‎‎‎‏‎‏‎‎‎‏‎‎‏‎‏‏‏‎‎‎‏‎‎‏‎‏‎‎‏‏‎‏‎‎‏‎‏‏‏‏‎‎‎Credential details‎‏‎‎‏‎"</string>
+    <string name="user_credential_removed" msgid="6514189495799401838">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‏‎‏‎‎‏‏‎‎‏‏‏‎‎‎‎‏‏‎‎‏‏‎‏‎‏‎‏‎‎‏‏‎‎‎‎‏‎‏‏‎‏‎‎‎‏‎‎‏‏‎‏‎‏‏‎‏‏‏‎‎Removed credential: ‎‏‎‎‏‏‎<xliff:g id="CREDENTIAL_NAME">%s</xliff:g>‎‏‎‎‏‏‏‎‎‏‎‎‏‎"</string>
+    <string name="user_credential_none_installed" msgid="3729607560420971841">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‎‎‏‏‏‏‎‎‎‎‏‎‎‎‏‏‏‎‏‎‎‏‎‏‎‎‎‎‏‏‎‏‏‏‏‎‏‎‎‎‎‎‎‎‏‏‎‏‎‏‎‏‎‏‎‎‎‎‎‏‎No user credentials installed‎‏‎‎‏‎"</string>
+    <string name="spellcheckers_settings_title" msgid="399981228588011501">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‎‏‏‏‎‏‏‎‎‎‏‏‎‏‎‎‎‎‎‏‎‎‏‏‎‎‏‏‏‎‏‏‏‎‎‏‏‎‏‏‎‏‎‎‎‎‎‎‎‎‏‏‏‏‏‏‏‎‏‏‎‏‎Spell checker‎‏‎‎‏‎"</string>
+    <string name="current_backup_pw_prompt" msgid="7735254412051914576">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‏‎‏‏‎‏‎‏‏‎‎‏‎‎‏‎‎‏‎‎‏‏‏‎‎‏‏‏‏‎‎‏‎‏‎‏‏‎‏‎‎‎‎‎‏‎‎‏‏‏‏‏‎‏‎‏‎‎‎‎‎Type your current full backup password here‎‏‎‎‏‎"</string>
+    <string name="new_backup_pw_prompt" msgid="8755501377391998428">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‏‎‎‏‏‎‎‎‎‎‎‏‏‏‎‎‏‎‏‎‎‎‎‏‏‏‎‏‎‎‏‏‎‏‎‏‏‏‏‎‎‏‎‎‏‎‏‏‎‏‎‏‏‏‎‏‏‏‎‎‎Type a new password for full backups here‎‏‎‎‏‎"</string>
+    <string name="confirm_new_backup_pw_prompt" msgid="3238728882512787864">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‏‏‎‎‏‏‏‏‎‎‏‎‎‏‎‎‎‏‏‎‏‏‎‎‎‎‏‎‎‏‎‏‎‏‎‏‏‏‏‏‏‎‎‎‏‏‏‏‏‎‎‏‏‎‎‏‏‎‎‎‎Retype your new full backup password here‎‏‎‎‏‎"</string>
+    <string name="backup_pw_set_button_text" msgid="2387480910044648795">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‎‎‎‏‎‎‏‎‎‎‏‎‎‎‎‎‏‎‎‏‎‎‏‏‏‏‎‎‏‏‏‏‏‏‏‏‎‎‏‏‏‏‎‎‏‏‎‏‎‏‎‏‎‏‎‏‏‎‏‏‎Set backup password‎‏‎‎‏‎"</string>
+    <string name="backup_pw_cancel_button_text" msgid="8845630125391744615">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‏‎‏‎‏‏‎‎‎‎‎‏‏‏‏‏‏‏‎‏‏‎‏‏‏‎‏‏‏‎‎‏‏‏‏‎‎‏‏‏‏‎‎‎‎‎‎‎‏‏‏‎‎‏‏‎‎‏‏‏‎Cancel‎‏‎‎‏‎"</string>
+    <string name="additional_system_update_settings_list_item_title" msgid="214987609894661992">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‎‏‎‏‎‏‏‏‏‏‎‏‏‏‏‎‎‏‎‏‎‎‎‎‏‎‏‏‏‏‎‎‏‎‏‏‎‏‏‏‎‎‎‎‏‏‎‏‎‏‏‏‏‎‏‏‎‏‎‎‎‎Additional system updates‎‏‎‎‏‎"</string>
+    <string name="ssl_ca_cert_warning" msgid="2045866713601984673">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‏‏‎‎‎‏‏‎‎‏‎‎‎‏‏‎‎‎‎‎‏‏‏‎‏‏‏‏‏‏‎‎‎‎‏‎‎‎‎‎‏‎‏‎‏‏‎‎‏‎‎‎‏‎‏‎‎‎‎‏‎Network may be monitored‎‏‎‎‏‎"</string>
+    <string name="done_button" msgid="1991471253042622230">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‏‎‏‏‏‎‏‎‎‎‏‏‎‎‏‎‎‎‎‎‏‎‎‎‏‏‎‏‏‎‏‎‏‎‏‎‎‎‎‎‎‎‎‏‏‏‏‎‏‏‏‏‎‎‎‏‎‏‏‎‎Done‎‏‎‎‏‎"</string>
+    <plurals name="ssl_ca_cert_dialog_title" formatted="false" msgid="7145092748045794650">
+      <item quantity="other">‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‎‎‏‏‎‎‏‎‏‎‎‎‎‏‏‏‎‏‏‏‏‏‏‏‏‏‏‏‎‏‏‏‏‏‏‎‎‏‏‏‏‏‎‏‎‎‏‏‏‏‎‏‎‏‎‏‏‎‏‎‎Trust or remove certificates‎‏‎‎‏‎</item>
+      <item quantity="one">‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‎‎‏‏‎‎‏‎‏‎‎‎‎‏‏‏‎‏‏‏‏‏‏‏‏‏‏‏‎‏‏‏‏‏‏‎‎‏‏‏‏‏‎‏‎‎‏‏‏‏‎‏‎‏‎‏‏‎‏‎‎Trust or remove certificate‎‏‎‎‏‎</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>‎‏‎‎‏‏‏‎ has installed certificate authorities on your device, which may allow them to monitor your device network activity, including emails, apps, and secure websites.‎‏‎‎‏‏‎\n‎‏‎‎‏‏‏‎‎‏‎‎‏‏‎\n‎‏‎‎‏‏‏‎For more information about these certificates, contact your admin.‎‏‎‎‏‎</item>
+      <item quantity="one">‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‎‏‎‎‏‎‏‎‏‎‏‏‎‎‏‎‏‏‏‎‏‎‎‏‎‎‎‎‎‎‎‎‎‎‏‏‎‎‎‏‎‎‎‎‎‏‏‎‏‎‏‎‎‏‎‏‏‎‏‎‎‎‏‎‎‏‏‎<xliff:g id="MANAGING_DOMAIN_0">%s</xliff:g>‎‏‎‎‏‏‏‎ has installed a certificate authority on your device, which may allow them to monitor your device network activity, including emails, apps, and secure websites.‎‏‎‎‏‏‎\n‎‏‎‎‏‏‏‎‎‏‎‎‏‏‎\n‎‏‎‎‏‏‏‎For more information about this certificate, contact your admin.‎‏‎‎‏‎</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>‎‏‎‎‏‏‏‎ has installed certificate authorities for your work profile, which may allow them to monitor work network activity, including emails, apps, and secure websites.‎‏‎‎‏‏‎\n‎‏‎‎‏‏‏‎‎‏‎‎‏‏‎\n‎‏‎‎‏‏‏‎For more information about these certificates, contact your admin.‎‏‎‎‏‎</item>
+      <item quantity="one">‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‎‏‏‏‏‏‎‏‏‎‎‏‏‏‎‎‎‎‎‎‎‎‎‏‏‎‎‏‏‏‎‎‏‏‎‏‎‏‏‎‏‎‎‎‏‎‎‏‏‏‎‏‏‎‏‏‏‎‏‎‎‏‎‎‏‏‎<xliff:g id="MANAGING_DOMAIN_0">%s</xliff:g>‎‏‎‎‏‏‏‎ has installed a certificate authority for your work profile, which may allow them to monitor work network activity, including emails, apps, and secure websites.‎‏‎‎‏‏‎\n‎‏‎‎‏‏‏‎‎‏‎‎‏‏‎\n‎‏‎‎‏‏‏‎For more information about this certificate, contact your admin.‎‏‎‎‏‎</item>
+    </plurals>
+    <string name="ssl_ca_cert_warning_message" msgid="8216218659139190498">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‎‎‏‎‎‎‎‎‎‏‎‏‏‏‎‏‏‏‏‏‎‏‎‏‎‏‏‎‏‏‎‎‏‏‏‎‏‏‏‎‏‏‎‏‎‏‏‏‏‏‏‎‏‏‏‎‎‎‏‎‎A third party is capable of monitoring your network activity, including emails, apps, and secure websites.‎‏‎‎‏‏‎\n‎‏‎‎‏‏‏‎‎‏‎‎‏‏‎\n‎‏‎‎‏‏‏‎A trusted credential installed on your device is making this possible.‎‏‎‎‏‎"</string>
+    <plurals name="ssl_ca_cert_settings_button" formatted="false" msgid="2426799352517325228">
+      <item quantity="other">‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‎‎‎‏‏‎‏‎‏‏‎‏‏‎‏‏‏‎‎‏‎‎‏‎‎‏‏‏‎‏‎‎‎‎‏‏‏‏‏‏‎‎‎‏‎‏‏‏‎‎‎‏‏‎‏‎‏‏‎‎‎Check certificates‎‏‎‎‏‎</item>
+      <item quantity="one">‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‎‎‎‏‏‎‏‎‏‏‎‏‏‎‏‏‏‎‎‏‎‎‏‎‎‏‏‏‎‏‎‎‎‎‏‏‏‏‏‏‎‎‎‏‎‏‏‏‎‎‎‏‏‎‏‎‏‏‎‎‎Check certificate‎‏‎‎‏‎</item>
+    </plurals>
+    <string name="user_settings_title" msgid="6151874007858148344">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‎‏‎‏‎‏‎‏‏‏‏‏‏‏‎‏‏‎‎‎‏‏‎‏‎‎‎‎‏‏‏‎‏‏‎‏‎‏‎‏‎‏‏‏‏‏‏‏‎‎‏‏‏‏‏‏‏‎‎‎‎Users‎‏‎‎‏‎"</string>
+    <string name="user_list_title" msgid="7937158411137563543">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‏‏‏‎‎‎‏‎‎‏‏‎‎‏‏‏‎‎‏‏‏‎‎‎‎‏‎‏‏‎‏‎‎‏‎‏‏‏‎‏‏‎‏‏‏‎‏‏‏‎‏‏‏‎‎‏‎‏‏‏‎Users &amp; profiles‎‏‎‎‏‎"</string>
+    <string name="user_add_user_or_profile_menu" msgid="6923838875175259418">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‎‎‎‎‎‎‎‏‎‏‏‎‎‏‏‎‏‎‏‎‏‏‎‎‎‏‎‏‏‏‎‏‏‏‎‎‏‏‎‏‏‏‎‎‏‎‎‎‏‏‎‏‎‎‎‏‏‎‏‎‎Add user or profile‎‏‎‎‏‎"</string>
+    <string name="user_add_user_menu" msgid="1675956975014862382">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‎‏‏‏‎‏‎‎‎‎‏‎‎‎‏‏‎‎‎‏‏‏‏‏‏‏‎‏‎‎‏‏‏‎‏‎‏‎‎‏‏‎‎‏‎‏‎‏‏‏‏‎‎‎‏‎‏‏‏‎‎Add user‎‏‎‎‏‎"</string>
+    <string name="user_summary_restricted_profile" msgid="6354966213806839107">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‏‎‎‎‎‎‏‏‎‎‎‏‎‏‏‎‎‎‎‎‎‎‎‏‏‎‎‏‏‏‏‏‎‏‎‏‏‎‎‏‎‎‎‎‏‏‎‏‎‏‎‏‎‏‎‎‎‎‏‏‎Restricted profile‎‏‎‎‏‎"</string>
+    <string name="user_need_lock_message" msgid="5879715064416886811">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‎‎‎‏‏‎‎‏‏‎‎‎‏‏‏‏‎‎‎‏‏‎‏‏‎‎‏‎‏‏‏‏‎‎‏‏‎‎‎‏‎‏‎‎‏‏‏‎‎‎‎‎‎‎‎‏‏‎‏‏‎Before you can create a restricted profile, you’ll need to set up a screen lock to protect your apps and personal data.‎‏‎‎‏‎"</string>
+    <string name="user_set_lock_button" msgid="8311219392856626841">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‎‎‏‏‎‏‎‏‎‏‏‏‎‏‏‎‎‎‏‎‎‎‎‎‎‎‎‎‏‏‎‎‏‎‎‏‏‎‎‎‏‏‏‎‏‎‎‏‎‏‏‎‏‎‎‏‏‎‎‏‎Set lock‎‏‎‎‏‎"</string>
+    <string name="user_summary_not_set_up" msgid="8778205026866794909">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‏‎‎‏‏‏‎‏‎‎‏‎‎‏‏‏‎‎‏‎‏‏‏‏‎‏‏‎‏‎‎‎‎‏‏‏‏‏‏‏‎‎‎‏‏‎‎‏‎‎‎‏‏‎‎‏‏‏‎‏‎Not set up‎‏‎‎‏‎"</string>
+    <string name="user_summary_restricted_not_set_up" msgid="1628116001964325544">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‎‏‏‎‏‎‎‏‏‎‎‎‎‎‏‏‏‎‏‎‏‏‏‎‎‎‎‎‏‎‏‎‏‏‏‎‎‎‏‏‎‏‏‎‎‏‏‏‏‎‏‎‏‎‏‎‏‎‎‎‎Not set up - Restricted profile‎‏‎‎‏‎"</string>
+    <string name="user_summary_managed_profile_not_set_up" msgid="1659125858619760573">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‎‏‏‏‎‎‎‎‎‏‏‎‎‏‏‎‎‏‏‎‎‎‏‎‏‏‎‏‏‎‎‏‎‎‎‎‏‎‏‏‎‎‏‎‎‎‎‏‏‏‏‏‏‎‏‏‏‏‎‏‎Not set up - Work profile‎‏‎‎‏‎"</string>
+    <string name="user_admin" msgid="993402590002400782">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‎‏‏‎‏‏‏‎‎‏‎‎‏‎‏‎‎‎‏‏‎‎‏‏‎‎‏‎‎‎‏‏‏‎‎‎‎‎‎‎‎‏‎‏‏‏‏‎‎‏‏‏‎‎‎‎‎‏‏‏‎‎Admin‎‏‎‎‏‎"</string>
+    <string name="user_you" msgid="1639158809315025986">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‎‏‏‎‏‎‏‏‏‏‏‏‎‏‏‏‎‏‏‎‎‏‎‎‎‎‎‎‏‎‎‏‏‏‏‏‏‎‏‎‏‏‎‎‏‎‏‎‎‏‎‎‎‏‎‎‎‎‏‎‎You (‎‏‎‎‏‏‎<xliff:g id="NAME">%s</xliff:g>‎‏‎‎‏‏‏‎)‎‏‎‎‏‎"</string>
+    <string name="user_nickname" msgid="5148818000228994488">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‎‏‏‏‎‏‏‏‎‏‎‎‎‏‎‎‎‏‏‎‏‎‏‏‎‎‎‏‎‎‎‎‏‏‎‎‏‏‎‎‏‎‎‏‎‏‎‎‏‏‎‏‏‎‏‏‏‎‎‎‎Nickname‎‏‎‎‏‎"</string>
+    <string name="user_add_user_type_title" msgid="2146438670792322349">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‏‏‎‏‏‏‎‎‏‎‎‏‏‎‏‎‏‏‏‎‏‎‎‏‏‎‎‏‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‎‏‏‏‎‏‏‎‏‎‎‏‎‏‏‎‏‎Add‎‏‎‎‏‎"</string>
+    <string name="user_add_max_count" msgid="5405885348463433157">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‏‎‏‏‎‎‎‎‎‏‎‏‏‎‎‏‎‎‎‎‎‎‎‏‎‏‎‏‎‎‏‏‎‎‏‏‏‎‏‎‎‏‏‎‏‏‎‏‎‏‎‏‏‏‎‎‎‏‎‏‎You can add up to ‎‏‎‎‏‏‎<xliff:g id="USER_COUNT">%1$d</xliff:g>‎‏‎‎‏‏‏‎ users‎‏‎‎‏‎"</string>
+    <string name="user_add_user_item_summary" msgid="4702776187132008661">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‎‎‎‏‎‏‎‎‎‎‏‏‏‎‎‏‏‏‏‎‎‎‎‎‎‏‏‎‏‎‎‏‏‏‎‎‎‎‏‎‏‎‏‏‎‏‎‏‏‎‎‎‏‏‎‏‎‏‎‏‎Users have their own apps and content‎‏‎‎‏‎"</string>
+    <string name="user_add_profile_item_summary" msgid="5931663986889138941">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‎‎‏‎‎‏‎‏‎‎‎‏‏‎‎‎‎‎‎‎‏‏‏‏‏‎‎‎‎‎‎‎‎‎‎‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‎‏‎You can restrict access to apps and content from your account‎‏‎‎‏‎"</string>
+    <string name="user_add_user_item_title" msgid="8212199632466198969">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‎‎‎‏‏‏‏‏‎‏‏‏‏‎‎‏‏‎‎‎‎‎‎‎‏‏‏‎‎‎‏‏‏‏‎‏‏‎‏‏‏‏‎‏‏‏‎‎‎‎‎‏‏‎‏‏‏‎‎‏‎User‎‏‎‎‏‎"</string>
+    <string name="user_add_profile_item_title" msgid="8353515490730363621">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‎‎‏‏‏‏‏‎‏‏‎‏‏‎‏‎‎‏‏‎‎‎‎‏‎‏‎‎‎‏‏‏‏‎‏‎‏‎‏‏‎‏‎‎‏‏‎‎‏‎‏‎‏‏‏‎‎‏‎‏‎Restricted profile‎‏‎‎‏‎"</string>
+    <string name="user_add_user_title" msgid="2108112641783146007">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‏‏‎‏‎‏‎‎‎‎‎‏‏‎‎‎‎‏‎‏‎‏‎‎‎‏‏‏‎‏‎‎‎‏‏‏‏‏‏‏‏‏‏‎‏‎‏‎‎‏‏‎‎‎‎‏‎‏‏‏‎Add new user?‎‏‎‎‏‎"</string>
+    <string name="user_add_user_message_long" msgid="8562152293752222985">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‎‏‏‎‏‏‎‏‎‎‏‎‏‏‏‎‎‎‎‎‎‎‏‎‎‏‎‏‏‎‎‏‏‏‎‏‏‏‏‎‎‏‎‏‏‎‏‏‎‏‎‏‎‎‎‎‏‎‎‏‎You can share this device with other people by creating additional users. Each user has their own space, which they can customize with apps, wallpaper, and so on. Users can also adjust device settings like Wi‑Fi that affect everyone.‎‏‎‎‏‏‎\n‎‏‎‎‏‏‏‎‎‏‎‎‏‏‎\n‎‏‎‎‏‏‏‎When you add a new user, that person needs to set up their space.‎‏‎‎‏‏‎\n‎‏‎‎‏‏‏‎‎‏‎‎‏‏‎\n‎‏‎‎‏‏‏‎Any user can update apps for all other users.‎‏‎‎‏‎"</string>
+    <string name="user_add_user_message_short" msgid="1511354412249044381">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‎‏‎‎‏‏‏‏‏‎‎‏‎‏‏‎‏‎‎‎‏‏‎‏‎‏‎‎‏‎‎‏‎‏‏‏‏‏‎‏‎‎‏‎‏‏‎‏‎‏‎‏‏‎‎‏‏‏‎‏‎When you add a new user, that person needs to set up their space.‎‏‎‎‏‏‎\n‎‏‎‎‏‏‏‎‎‏‎‎‏‏‎\n‎‏‎‎‏‏‏‎Any user can update apps for all other users.‎‏‎‎‏‎"</string>
+    <string name="user_setup_dialog_title" msgid="1765794166801864563">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‏‎‎‎‏‎‎‎‎‎‎‏‎‏‎‏‏‏‎‎‎‏‏‏‎‎‎‎‎‏‏‎‏‎‏‎‏‎‏‎‏‏‏‎‏‎‎‏‎‏‏‏‎‏‏‏‎‎‏‏‎Set up user now?‎‏‎‎‏‎"</string>
+    <string name="user_setup_dialog_message" msgid="1004068621380867148">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‎‏‏‎‏‏‏‏‎‏‏‏‏‎‎‏‎‏‎‏‏‎‎‎‏‎‏‏‏‎‏‏‎‎‎‏‏‏‎‎‎‎‏‎‏‏‏‎‏‎‏‎‎‎‏‎‎‏‏‎‎‎Make sure the person is available to take the device and set up their space‎‏‎‎‏‎"</string>
+    <string name="user_setup_profile_dialog_message" msgid="3896568553327558731">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‎‏‏‎‎‎‎‏‎‎‏‏‎‏‏‎‎‏‎‎‎‏‏‏‎‏‎‎‎‏‎‏‎‎‎‎‎‎‎‎‏‏‎‎‎‎‎‎‎‎‎‎‎‏‎‎‏‎‏‏‎Set up profile now?‎‏‎‎‏‎"</string>
+    <string name="user_setup_button_setup_now" msgid="3391388430158437629">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‏‏‏‏‎‎‎‏‎‎‎‎‏‎‏‎‎‎‎‏‏‏‎‎‏‏‏‏‎‎‎‏‎‎‏‎‏‏‏‏‎‏‏‎‏‎‎‏‏‏‎‎‏‏‏‏‏‏‎‏‎Set up now‎‏‎‎‏‎"</string>
+    <string name="user_setup_button_setup_later" msgid="3068729597269172401">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‏‎‏‎‏‎‎‏‎‏‏‎‎‏‎‏‎‎‎‏‎‏‎‎‏‏‏‏‎‏‎‏‎‏‎‎‏‏‏‏‎‏‎‎‏‏‏‎‎‎‎‎‏‎‏‏‎‎‎‏‎Not now‎‏‎‎‏‎"</string>
+    <string name="user_cannot_manage_message" product="tablet" msgid="7153048188252553320">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‎‎‏‏‎‏‎‎‎‏‎‎‏‎‏‏‏‎‏‏‎‏‏‎‏‏‎‏‏‏‎‎‎‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‎‎‏‏‎‏‎‎‎‎Only the tablet’s owner can manage users.‎‏‎‎‏‎"</string>
+    <string name="user_cannot_manage_message" product="default" msgid="959315813089950649">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‎‏‏‎‏‎‏‎‏‎‎‎‎‎‎‏‎‏‏‎‎‏‎‏‎‎‏‏‎‎‎‏‏‏‎‏‎‏‎‏‎‎‏‎‎‎‎‏‏‏‎‏‏‏‎‏‏‏‎‎‏‎Only the phone’s owner can manage users.‎‏‎‎‏‎"</string>
+    <string name="user_cannot_add_accounts_message" msgid="5116692653439737050">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‎‏‏‏‎‎‎‎‎‎‏‎‎‎‏‎‎‏‎‎‏‏‎‏‏‎‏‏‏‏‏‎‎‎‎‏‎‎‏‎‎‎‎‎‎‏‎‏‏‏‎‎‏‏‎‏‏‎‏‎‎Restricted profiles cannot add accounts‎‏‎‎‏‎"</string>
+    <string name="user_remove_user_menu" msgid="6897150520686691355">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‏‏‏‏‏‎‏‏‎‏‏‏‏‎‎‏‏‎‎‏‏‏‎‏‏‎‏‏‎‎‎‏‏‎‏‏‏‏‏‎‏‏‏‎‎‏‎‎‎‏‎‎‎‎‎‏‏‎‏‏‎Delete ‎‏‎‎‏‏‎<xliff:g id="USER_NAME">%1$s</xliff:g>‎‏‎‎‏‏‏‎ from this device‎‏‎‎‏‎"</string>
+    <string name="user_lockscreen_settings" msgid="4965661345247084878">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‎‏‎‎‏‏‏‎‏‎‎‏‏‎‎‏‎‎‏‎‏‎‏‎‏‏‏‏‎‎‏‎‏‏‏‎‎‏‎‏‎‏‏‏‎‏‎‎‎‎‎‏‎‏‎‎‏‏‏‎‎Lock screen settings‎‏‎‎‏‎"</string>
+    <string name="user_add_on_lockscreen_menu" msgid="9072312646546364619">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‏‏‎‏‏‏‏‎‎‏‏‏‎‏‎‏‎‏‎‎‎‏‎‎‏‎‎‎‏‏‏‎‏‏‎‎‏‎‏‎‏‏‏‎‎‎‎‏‏‎‎‎‏‏‎‎‏‎‏‏‎Add users from lock screen‎‏‎‎‏‎"</string>
+    <string name="user_new_user_name" msgid="369856859816028856">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‎‏‏‏‎‏‎‎‏‎‎‎‎‏‏‏‏‏‏‏‏‎‏‏‎‏‏‎‏‎‏‎‏‏‏‎‏‏‎‎‎‏‎‎‏‏‎‏‏‎‏‎‏‎‏‎‏‏‏‎‎‎‎New user‎‏‎‎‏‎"</string>
+    <string name="user_new_profile_name" msgid="2632088404952119900">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‎‏‎‎‏‎‎‎‎‏‏‏‎‎‎‎‏‏‏‎‎‏‏‏‎‏‎‏‎‏‏‏‏‎‏‎‏‎‎‏‏‎‎‎‎‏‏‏‏‎‏‎‎‏‎‏‏‏‎‎‎New profile‎‏‎‎‏‎"</string>
+    <string name="user_confirm_remove_self_title" msgid="8432050170899479556">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‎‏‎‏‎‎‎‎‎‏‎‎‏‎‏‎‏‎‎‎‏‏‏‏‎‏‎‎‏‎‎‏‏‏‎‎‏‎‏‏‏‏‎‎‎‎‏‏‏‏‎‎‎‎‎‎‎‏‎‎‎Delete yourself?‎‏‎‎‏‎"</string>
+    <string name="user_confirm_remove_title" msgid="1163721647646152032">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‎‎‎‎‎‎‏‎‎‏‏‎‎‏‎‏‏‏‏‎‏‎‏‎‏‏‎‎‎‏‎‎‎‎‎‏‎‏‏‎‎‎‎‏‏‎‎‏‎‏‎‏‎‏‏‎‎‎‎‎‎Remove this user?‎‏‎‎‏‎"</string>
+    <string name="user_profile_confirm_remove_title" msgid="5573161550669867342">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‏‏‎‏‎‏‎‏‎‏‏‏‏‏‎‏‏‎‎‎‏‏‏‎‎‏‏‏‎‎‎‎‎‏‏‏‏‎‎‎‏‎‏‎‏‏‏‎‏‎‎‏‎‏‎‎‏‏‏‎‎Remove this profile?‎‏‎‎‏‎"</string>
+    <string name="work_profile_confirm_remove_title" msgid="2017323555783522213">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‏‎‏‏‏‏‏‏‏‏‏‎‏‏‏‏‏‎‎‏‎‎‎‏‎‏‎‏‏‏‏‏‎‎‏‏‏‎‎‎‎‎‎‏‎‎‏‏‎‏‏‏‏‎‏‎‎‏‎‏‎Remove work profile?‎‏‎‎‏‎"</string>
+    <string name="user_confirm_remove_self_message" product="tablet" msgid="2391372805233812410">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‎‎‎‏‎‎‏‎‏‏‏‏‏‏‎‏‏‏‎‎‏‏‏‎‎‏‎‏‎‏‏‏‎‏‎‏‎‏‏‏‏‏‎‏‏‎‏‎‎‎‏‏‏‎‏‏‏‎‏‎‎You will lose your space and data on this tablet. You can’t undo this action.‎‏‎‎‏‎"</string>
+    <string name="user_confirm_remove_self_message" product="default" msgid="7943645442479360048">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‏‏‏‎‎‎‏‏‏‏‎‏‎‏‏‏‏‏‏‏‎‏‏‏‎‎‎‏‎‏‎‏‎‏‎‎‏‎‏‎‎‎‏‎‎‎‎‎‏‎‎‎‎‎‏‏‎‎‎‎‎You will lose your space and data on this phone. You can’t undo this action.‎‏‎‎‏‎"</string>
+    <string name="user_confirm_remove_message" msgid="1020629390993095037">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‎‏‏‏‎‎‎‏‎‏‎‏‎‎‎‎‎‎‎‎‏‎‎‎‎‎‏‏‎‎‎‎‎‏‎‎‏‎‏‏‏‎‏‏‏‎‏‏‏‏‎‎‏‎‏‏‏‏‏‎‏‎All apps and data will be deleted.‎‏‎‎‏‎"</string>
+    <string name="work_profile_confirm_remove_message" msgid="323856589749078140">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‎‏‏‏‎‎‎‏‏‏‏‏‏‎‏‎‎‏‎‎‎‏‏‏‎‏‏‎‏‎‎‎‏‏‏‏‏‎‎‎‏‎‏‎‎‏‏‏‎‎‏‎‎‎‎‏‏‏‏‏‎‎‎All apps and data in this profile will be deleted if you continue.‎‏‎‎‏‎"</string>
+    <string name="user_profile_confirm_remove_message" msgid="7373754145959298522">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‎‏‏‎‎‏‎‏‎‏‎‎‏‏‎‏‎‏‏‎‎‏‎‏‎‎‏‏‏‏‏‏‎‎‏‎‏‏‏‏‎‏‏‏‏‏‎‎‎‏‎‏‏‏‎‏‏‎‏‎‎All apps and data will be deleted.‎‏‎‎‏‎"</string>
+    <string name="user_adding_new_user" msgid="1521674650874241407">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‎‏‎‏‎‎‎‏‏‏‏‎‎‎‎‏‎‎‏‏‎‎‎‎‏‎‎‎‎‏‏‎‎‏‎‏‎‎‎‏‎‎‏‏‎‏‏‎‎‎‎‏‎‏‏‏‏‏‏‏‎Adding new user…‎‏‎‎‏‎"</string>
+    <string name="user_delete_user_description" msgid="3158592592118767056">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‏‎‏‏‏‏‎‏‎‏‎‏‏‎‎‏‎‎‏‏‎‎‏‏‏‎‏‎‎‏‎‎‎‎‏‏‎‏‏‎‏‎‏‏‎‏‎‏‏‏‎‏‏‏‎‏‎‎‎‎‎Delete user‎‏‎‎‏‎"</string>
+    <string name="user_delete_button" msgid="5131259553799403201">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‎‏‏‏‎‎‏‏‎‏‎‏‏‏‏‎‎‏‎‏‎‏‏‎‎‎‎‎‏‎‏‎‏‎‏‎‏‎‎‎‏‎‏‎‏‏‏‏‎‏‏‎‏‏‎‎‎‎‎‏‎Delete‎‏‎‎‏‎"</string>
+    <string name="user_guest" msgid="8475274842845401871">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‎‏‎‏‏‎‎‏‏‏‏‎‎‎‏‏‏‎‎‏‏‎‎‏‎‎‎‎‏‏‎‎‏‏‎‏‏‎‎‏‏‎‏‎‏‏‎‏‎‎‏‏‎‎‎‎‏‏‏‏‎Guest‎‏‎‎‏‎"</string>
+    <string name="user_exit_guest_title" msgid="5613997155527410675">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‏‏‎‏‏‏‏‎‏‎‎‎‏‏‏‎‏‏‎‎‏‎‏‎‏‎‏‏‎‎‏‏‎‎‎‏‎‏‎‎‎‎‏‏‏‏‎‎‎‎‏‏‏‏‏‏‎‎‏‏‎Remove guest‎‏‎‎‏‎"</string>
+    <string name="user_exit_guest_confirm_title" msgid="3405527634738147409">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‏‏‏‏‎‏‎‎‎‎‏‎‏‏‎‏‏‏‎‏‎‏‎‏‎‏‏‏‎‎‏‎‏‏‎‏‎‏‎‏‎‏‏‏‏‏‏‏‎‎‎‎‎‏‎‏‎‎‎‏‎Remove guest?‎‏‎‎‏‎"</string>
+    <string name="user_exit_guest_confirm_message" msgid="2194459201944413257">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‏‏‏‎‎‏‏‏‎‏‎‎‎‏‎‎‏‎‎‏‎‎‎‎‎‏‎‎‎‏‏‏‎‏‎‏‏‏‏‏‏‎‏‏‏‏‏‎‎‏‎‎‎‏‎‎‏‎‎‏‎All apps and data in this session will be deleted.‎‏‎‎‏‎"</string>
+    <string name="user_exit_guest_dialog_remove" msgid="6351370829952745350">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‏‎‎‎‎‎‏‎‎‏‎‎‏‎‎‏‏‎‏‎‎‎‎‏‏‏‏‎‎‏‏‎‏‏‎‎‎‎‎‏‏‏‎‎‎‏‏‏‏‏‏‏‏‎‎‎‎‏‏‎‎Remove‎‏‎‎‏‎"</string>
+    <string name="user_enable_calling" msgid="5128605672081602348">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‎‏‏‏‎‎‏‎‏‏‎‎‎‏‏‏‎‏‏‏‏‎‏‎‏‏‏‏‏‎‏‎‏‏‎‏‎‏‏‏‏‎‏‎‎‎‏‏‎‏‏‏‎‎‏‎‏‏‎‎‎Turn on phone calls‎‏‎‎‏‎"</string>
+    <string name="user_enable_calling_sms" msgid="9172507088023097063">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‏‏‏‏‎‏‎‎‏‎‏‏‎‏‎‎‏‎‏‎‏‎‎‏‏‎‎‏‎‎‏‏‏‎‎‏‎‏‎‏‏‏‏‎‏‎‎‎‏‏‏‎‏‏‏‎‎‏‏‏‎Turn on phone calls &amp; SMS‎‏‎‎‏‎"</string>
+    <string name="user_remove_user" msgid="6490483480937295389">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‏‎‏‎‎‎‎‏‎‎‏‎‏‏‎‏‎‏‎‎‎‏‎‏‎‏‏‎‎‏‏‏‏‏‎‏‏‏‎‎‏‏‏‎‏‏‏‎‏‏‏‎‎‎‎‏‏‏‎‏‎Remove user‎‏‎‎‏‎"</string>
+    <string name="user_enable_calling_confirm_title" msgid="4315789475268695378">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‏‎‏‏‏‏‏‎‎‏‎‎‏‏‎‎‎‎‏‏‏‎‏‎‏‎‎‏‎‏‏‎‎‏‏‎‏‏‎‎‎‎‏‎‏‎‎‏‎‏‎‏‎‏‎‏‎‎‏‎‎Turn on phone calls?‎‏‎‎‏‎"</string>
+    <string name="user_enable_calling_confirm_message" msgid="8061594235219352787">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‏‏‏‏‏‏‏‎‎‎‎‎‏‎‎‎‏‎‎‏‎‎‏‏‏‏‏‎‏‎‏‎‏‎‎‏‏‎‎‏‎‏‏‎‎‎‎‏‏‏‎‎‏‏‎‏‎‎‏‏‎Call history will be shared with this user.‎‏‎‎‏‎"</string>
+    <string name="user_enable_calling_and_sms_confirm_title" msgid="7243308401401932681">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‎‏‎‎‏‎‎‎‎‏‎‏‎‏‏‎‎‏‏‎‏‎‎‏‏‏‎‏‎‏‎‎‏‎‎‎‎‎‏‎‏‎‏‎‎‎‏‎‏‎‏‏‏‎‎‎‏‎‎‏‎Turn on phone calls &amp; SMS?‎‏‎‎‏‎"</string>
+    <string name="user_enable_calling_and_sms_confirm_message" msgid="4025082715546544967">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‎‏‏‏‏‏‎‏‏‎‏‏‏‏‏‏‎‏‏‏‎‏‏‎‎‏‏‏‎‏‏‎‏‎‏‏‏‎‏‏‎‏‏‏‎‏‏‎‏‎‏‏‎‏‎‎‎‏‏‏‎Call and SMS history will be shared with this user.‎‏‎‎‏‎"</string>
+    <string name="emergency_info_title" msgid="208607506217060337">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‎‏‎‏‎‏‏‏‎‎‏‎‏‎‎‎‏‏‏‏‏‎‏‏‎‏‎‏‏‏‏‏‏‎‎‎‏‏‎‎‎‏‏‎‎‎‏‎‎‎‏‏‏‏‏‏‏‎‎‎‏‎Emergency information‎‏‎‎‏‎"</string>
+    <string name="emergency_info_summary" msgid="5062945162967838521">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‎‏‏‎‎‏‎‎‎‎‏‏‎‎‏‏‎‎‎‏‏‏‎‎‏‏‎‏‎‎‎‏‎‎‏‏‏‏‏‏‏‎‏‎‏‏‏‎‏‏‏‏‎‎‏‏‏‎‎‏‎Info &amp; contacts for ‎‏‎‎‏‏‎<xliff:g id="USER_NAME">%1$s</xliff:g>‎‏‎‎‏‏‏‎‎‏‎‎‏‎"</string>
+    <string name="application_restrictions" msgid="8207332020898004394">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‎‎‎‏‏‏‏‎‎‏‏‎‎‏‎‎‏‏‎‎‏‏‏‏‏‏‎‏‎‎‎‏‏‎‏‏‎‏‎‏‎‎‎‎‎‏‏‏‏‏‎‏‏‎‏‎‏‎‏‎‎Allow apps and content‎‏‎‎‏‎"</string>
+    <string name="apps_with_restrictions_header" msgid="3660449891478534440">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‎‎‏‎‏‏‎‎‏‏‎‎‏‎‎‎‎‏‏‏‏‏‎‎‏‎‎‎‎‏‎‎‏‎‏‏‏‎‏‏‎‎‎‏‏‏‏‏‏‎‎‏‎‎‏‎‏‎‎‎‎Applications with restrictions‎‏‎‎‏‎"</string>
+    <string name="apps_with_restrictions_settings_button" msgid="3841347287916635821">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‎‏‎‏‎‏‎‎‏‏‏‏‎‎‏‏‎‏‎‏‎‎‎‎‎‎‎‏‏‎‎‎‏‎‏‏‎‎‏‎‏‏‏‎‎‏‏‎‎‏‏‎‏‎‏‎‏‏‎‏‎Expand settings for application‎‏‎‎‏‎"</string>
+    <string name="global_change_warning" product="tablet" msgid="8045013389464294039">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‏‏‏‏‏‎‏‎‎‏‎‏‏‎‏‎‎‎‎‏‎‎‎‎‏‏‎‏‏‎‏‎‏‏‎‎‎‏‎‎‎‏‏‏‏‏‎‏‎‎‏‎‏‎‎‏‎‏‏‏‎This setting affects all users on this tablet.‎‏‎‎‏‎"</string>
+    <string name="global_change_warning" product="default" msgid="2461264421590324675">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‎‎‏‎‎‎‏‎‏‎‎‎‎‎‏‎‏‎‏‎‏‏‏‏‎‎‏‏‎‏‏‏‏‎‏‏‎‎‏‏‎‎‏‎‏‏‎‏‎‏‎‏‏‏‎‎‎‎‏‏‎This setting affects all users on this phone.‎‏‎‎‏‎"</string>
+    <string name="global_locale_change_title" msgid="5956281361384221451">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‎‎‏‎‏‎‏‎‏‎‎‎‏‏‏‏‎‏‏‎‎‏‎‏‎‏‏‏‎‎‏‎‎‏‏‏‏‎‎‏‎‏‏‎‎‎‏‎‏‎‏‏‎‎‎‎‏‎‏‏‎Change language‎‏‎‎‏‎"</string>
+    <string name="nfc_payment_settings_title" msgid="1807298287380821613">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‏‎‎‏‎‎‎‏‎‏‎‎‏‏‎‏‎‎‎‎‎‎‏‏‎‏‏‏‏‎‎‎‎‏‏‎‏‎‎‎‎‎‎‏‎‏‏‏‎‏‏‎‎‏‏‎‏‏‎‏‎Tap &amp; pay‎‏‎‎‏‎"</string>
+    <string name="nfc_payment_how_it_works" msgid="3028822263837896720">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‏‎‏‎‎‎‎‎‏‎‎‎‏‎‎‎‏‎‎‏‏‏‎‎‏‏‎‏‎‎‏‏‎‎‏‏‏‏‎‏‏‎‏‎‎‎‏‏‎‎‎‎‎‎‎‏‎‎‎‎‎How it works‎‏‎‎‏‎"</string>
+    <string name="nfc_payment_no_apps" msgid="5477904979148086424">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‏‏‎‎‎‎‎‎‎‏‎‏‎‏‏‎‏‏‎‏‏‎‎‎‏‏‏‎‎‎‏‎‏‎‏‏‎‏‏‏‎‏‏‏‎‎‎‏‏‏‎‎‏‎‎‏‏‎‎‎‎Pay with your phone in stores‎‏‎‎‏‎"</string>
+    <string name="nfc_payment_default" msgid="8648420259219150395">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‏‎‎‎‎‎‎‎‎‏‎‏‎‏‎‏‏‏‎‎‎‏‏‎‎‏‏‏‏‎‎‎‏‎‏‏‎‎‎‎‏‏‎‎‏‎‎‏‎‏‏‎‎‎‏‏‏‎‏‏‎Payment default‎‏‎‎‏‎"</string>
+    <string name="nfc_payment_default_not_set" msgid="7485060884228447765">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‎‏‏‏‏‏‏‎‎‎‎‎‎‏‎‎‎‏‏‏‎‎‏‏‎‏‏‏‎‏‏‏‎‏‏‎‏‎‎‏‏‎‏‏‏‎‎‏‏‏‏‎‎‎‎‏‎‏‎‏‎Not set‎‏‎‎‏‎"</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">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‏‏‎‎‏‏‏‎‎‏‎‎‎‎‎‏‎‎‎‏‏‏‏‏‎‏‏‎‎‏‎‏‏‎‎‏‏‎‎‎‎‎‏‏‏‎‏‏‎‎‎‎‏‏‏‎‏‏‏‏‎Use default‎‏‎‎‏‎"</string>
+    <string name="nfc_payment_favor_default" msgid="5743781166099608372">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‏‏‏‏‏‎‏‏‎‏‏‎‎‎‎‎‎‎‏‎‏‎‎‎‏‎‎‏‏‏‏‎‏‎‎‎‏‏‏‏‎‎‏‎‎‎‏‏‎‎‏‏‎‎‏‏‎‏‎‎‎Always‎‏‎‎‏‎"</string>
+    <string name="nfc_payment_favor_open" msgid="1923314062109977944">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‏‎‏‎‏‎‏‏‎‎‎‎‏‏‏‏‏‎‏‏‏‏‏‏‎‎‏‏‎‎‎‎‎‏‏‏‏‎‎‏‎‏‎‎‎‎‏‎‏‏‎‏‎‏‎‏‏‎‎‎‎Except when another payment app is open‎‏‎‎‏‎"</string>
+    <string name="nfc_payment_pay_with" msgid="7524904024378144072">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‏‎‎‎‎‏‏‎‏‏‎‏‏‏‎‏‎‏‎‎‎‏‎‏‎‏‏‏‎‏‏‎‏‏‎‏‏‏‏‏‎‏‏‏‎‏‏‏‎‏‎‏‎‏‎‎‏‎‎‎‎At a Tap &amp; pay terminal, pay with:‎‏‎‎‏‎"</string>
+    <string name="nfc_how_it_works_title" msgid="1984068457698797207">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‏‎‏‏‏‎‎‎‏‎‎‎‏‏‎‏‎‎‏‏‏‏‎‎‎‎‎‎‎‎‎‎‏‏‏‏‎‎‏‏‎‎‎‏‏‎‏‎‎‏‏‎‏‎‎‏‎‏‏‏‎Paying at the terminal‎‏‎‎‏‎"</string>
+    <string name="nfc_how_it_works_content" msgid="4749007806393224934">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‎‎‎‏‏‏‏‎‎‏‏‏‏‏‎‏‏‏‎‏‎‏‏‏‎‎‎‎‎‏‎‎‎‏‏‏‏‎‏‎‎‎‎‎‎‎‎‎‏‏‏‎‏‏‏‎‎‏‏‎‎Set up a payment app. Then just hold the back of your phone up to any terminal with the contactless symbol.‎‏‎‎‏‎"</string>
+    <string name="nfc_how_it_works_got_it" msgid="259653300203217402">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‎‏‎‏‏‏‎‎‏‏‎‏‎‎‏‏‏‏‎‎‏‎‏‎‎‏‏‎‏‎‎‎‎‎‎‏‏‎‏‎‏‏‏‏‎‏‏‏‎‎‎‎‏‏‏‏‏‏‎‏‎‎Got it‎‏‎‎‏‎"</string>
+    <string name="nfc_more_title" msgid="815910943655133280">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‎‏‎‏‏‎‏‎‏‎‎‏‎‏‎‏‏‎‎‏‎‏‎‏‎‏‏‏‎‎‎‏‎‏‏‎‎‏‏‏‎‏‎‏‏‎‎‎‎‎‎‎‎‎‏‏‎‎‎‎‎‎More...‎‏‎‎‏‎"</string>
+    <string name="nfc_payment_set_default_label" msgid="7315817259485674542">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‎‏‎‏‏‎‎‎‎‏‏‏‎‎‎‎‎‎‎‏‎‎‎‎‏‎‎‏‎‏‏‎‎‎‎‏‎‏‎‏‎‎‎‎‏‎‏‏‏‏‎‎‎‎‏‎‏‏‏‎‎Set as your preference?‎‏‎‎‏‎"</string>
+    <string name="nfc_payment_set_default" msgid="8532426406310833489">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‎‏‏‎‎‏‏‎‏‎‎‏‎‏‎‎‎‏‎‎‏‎‎‏‏‏‎‎‎‎‎‏‏‏‎‎‎‏‎‏‎‎‎‏‏‏‏‎‏‏‎‏‎‏‎‏‎‎‎‏‎Always use ‎‏‎‎‏‏‎<xliff:g id="APP">%1$s</xliff:g>‎‏‎‎‏‏‏‎ when you Tap &amp; pay?‎‏‎‎‏‎"</string>
+    <string name="nfc_payment_set_default_instead_of" msgid="6993301165940432743">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‎‎‎‏‎‎‎‎‏‏‎‏‎‎‏‏‎‎‏‎‎‏‎‏‏‎‏‏‏‎‏‏‏‎‏‏‎‎‏‏‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‎‎‏‏‏‎Always use ‎‏‎‎‏‏‎<xliff:g id="APP_0">%1$s</xliff:g>‎‏‎‎‏‏‏‎ instead of ‎‏‎‎‏‏‎<xliff:g id="APP_1">%2$s</xliff:g>‎‏‎‎‏‏‏‎ when you Tap &amp; pay?‎‏‎‎‏‎"</string>
+    <string name="restriction_settings_title" msgid="4233515503765879736">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‏‎‏‎‏‏‎‎‎‎‎‎‎‏‏‏‎‏‏‏‏‏‏‎‏‎‏‏‏‎‏‎‏‎‎‏‎‎‎‏‎‎‏‎‏‏‏‏‏‎‏‏‏‎‏‏‏‎‎‎‎Restrictions‎‏‎‎‏‎"</string>
+    <string name="restriction_menu_reset" msgid="2067644523489568173">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‏‏‎‎‏‎‏‏‎‎‎‏‏‎‏‏‏‏‏‏‏‎‏‏‏‏‎‏‎‏‎‎‎‎‎‎‎‏‏‎‎‎‎‎‏‎‏‎‎‏‎‏‏‎‏‎‏‏‎‏‎Remove restrictions‎‏‎‎‏‎"</string>
+    <string name="restriction_menu_change_pin" msgid="740081584044302775">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‎‏‎‏‎‎‏‎‎‎‏‎‏‎‏‎‎‏‏‎‎‎‏‎‎‎‏‏‏‏‎‎‏‎‎‎‏‏‏‎‎‎‏‎‎‏‏‏‎‎‎‎‏‏‎‏‏‎‏‏‏‎Change PIN‎‏‎‎‏‎"</string>
+    <string name="app_notifications_switch_label" msgid="9124072219553687583">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‏‏‏‎‏‎‎‏‏‏‏‏‎‎‏‏‎‏‏‏‎‏‎‏‎‏‏‏‏‎‎‏‏‏‏‏‏‎‎‎‎‎‎‏‏‏‏‎‏‎‎‎‎‎‎‏‏‏‏‏‎Show notifications‎‏‎‎‏‎"</string>
+    <string name="help_label" msgid="6886837949306318591">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‏‏‏‏‏‎‎‏‎‎‏‎‏‏‏‏‎‏‏‎‏‎‏‎‎‎‎‎‎‏‏‏‏‎‏‎‎‎‎‏‎‏‎‏‎‎‏‎‏‏‏‎‏‏‏‏‏‏‏‏‎Help &amp; feedback‎‏‎‎‏‎"</string>
+    <string name="support_summary" msgid="2705726826263742491">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‎‏‎‏‏‎‎‎‏‏‎‎‏‎‏‎‏‏‎‎‎‎‏‏‎‏‏‎‏‎‎‎‎‎‏‎‏‎‏‏‎‎‏‎‎‎‎‎‏‎‎‎‎‎‎‏‏‎‏‏‎Help articles, phone &amp; chat, getting started‎‏‎‎‏‎"</string>
+    <string name="user_account_title" msgid="1127193807312271167">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‎‏‏‏‏‏‎‏‎‎‏‎‎‏‎‎‏‏‎‎‎‏‏‎‎‏‎‏‏‏‎‏‎‏‏‎‏‏‏‎‏‏‏‏‎‎‎‏‏‎‏‏‏‎‎‏‏‏‏‏‏‎Account for content‎‏‎‎‏‎"</string>
+    <string name="user_picture_title" msgid="7297782792000291692">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‎‏‎‏‎‏‎‎‎‏‏‎‏‏‏‎‏‏‏‎‏‏‎‎‏‎‎‎‏‎‏‏‎‏‎‏‎‎‏‎‎‎‏‎‏‏‎‎‎‎‏‏‎‏‏‎‏‏‎‎‎Photo ID‎‏‎‎‏‎"</string>
+    <string name="extreme_threats_title" msgid="6549541803542968699">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‏‎‏‎‏‏‏‎‎‏‎‎‏‎‏‎‎‏‎‏‏‎‎‏‎‎‎‏‏‏‎‎‎‎‎‏‏‎‏‏‏‏‏‏‏‏‏‏‏‎‎‏‎‏‏‏‏‎‏‏‎Extreme threats‎‏‎‎‏‎"</string>
+    <string name="extreme_threats_summary" msgid="8777860706500920667">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‏‎‎‏‏‏‎‏‎‎‎‏‎‎‏‏‏‎‎‏‏‏‎‎‏‏‏‎‎‎‏‏‎‎‏‎‏‏‎‏‏‎‎‎‏‏‎‎‎‏‎‏‎‏‎‏‏‎‏‏‎Receive alerts for extreme threats to life and property‎‏‎‎‏‎"</string>
+    <string name="severe_threats_title" msgid="8362676353803170963">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‎‏‎‎‎‎‎‎‏‏‏‎‎‎‏‏‎‎‎‏‏‏‎‏‎‏‏‎‎‎‎‏‏‏‏‏‏‏‏‏‏‏‏‏‎‎‏‏‎‏‎‎‏‎‎‏‎‎‏‏‎Severe threats‎‏‎‎‏‎"</string>
+    <string name="severe_threats_summary" msgid="8848126509420177320">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‏‎‏‎‏‏‎‎‏‎‏‎‏‏‎‏‏‏‎‎‎‎‏‎‏‏‏‎‎‏‎‏‎‎‎‏‏‎‏‏‎‏‎‎‏‏‏‎‎‏‏‏‏‎‏‎‏‎‎‎‎Receive alerts for severe threats to life and property‎‏‎‎‏‎"</string>
+    <string name="amber_alerts_title" msgid="2772220337031146529">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‎‏‏‎‎‏‏‏‏‎‎‎‏‏‏‎‎‏‏‏‏‎‏‏‎‏‎‏‎‏‏‎‏‎‏‏‏‏‎‏‏‎‏‎‏‏‏‎‏‏‎‎‎‎‏‎‎‎‎‏‎AMBER alerts‎‏‎‎‏‎"</string>
+    <string name="amber_alerts_summary" msgid="4312984614037904489">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‏‎‏‏‏‏‎‏‏‎‏‎‏‏‎‎‏‏‎‎‏‎‏‎‎‏‏‏‏‏‎‎‎‎‎‏‎‏‏‏‎‏‎‎‎‏‎‏‏‏‎‎‎‏‏‎‏‎‎‏‎Receive bulletins about child abductions‎‏‎‎‏‎"</string>
+    <string name="repeat_title" msgid="6473587828597786996">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‏‎‎‏‏‏‎‏‎‏‏‎‏‏‎‎‏‏‎‏‏‏‎‏‎‏‎‎‏‏‏‎‎‎‎‏‏‏‎‏‏‏‎‏‎‎‎‎‏‎‎‏‎‏‏‏‎‏‎‎‎Repeat‎‏‎‎‏‎"</string>
+    <string name="call_manager_enable_title" msgid="7718226115535784017">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‏‎‏‏‎‎‎‏‏‏‎‎‏‎‏‎‎‏‎‏‏‏‎‎‎‎‏‎‎‏‎‏‏‎‎‎‏‎‏‎‎‏‏‏‎‏‎‎‏‎‎‎‎‏‎‏‎‎‎‏‎Enable Call Manager‎‏‎‎‏‎"</string>
+    <string name="call_manager_enable_summary" msgid="8458447798019519240">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‎‏‎‏‎‏‏‎‎‎‏‎‎‏‏‏‎‎‎‏‎‏‏‏‎‏‎‏‎‎‏‎‎‎‎‎‎‎‏‎‎‎‏‏‎‏‏‏‎‎‏‏‎‎‎‎‏‎‎‎‎Allow this service to manage how your calls are made.‎‏‎‎‏‎"</string>
+    <string name="call_manager_title" msgid="4479949569744516457">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‏‏‏‎‎‎‏‎‏‎‏‏‏‏‏‏‏‎‏‎‎‏‏‎‎‏‎‏‏‏‎‏‏‏‎‎‎‏‎‎‏‎‎‏‎‎‏‏‎‏‎‏‎‏‏‎‏‎‎‏‎Call Manager‎‏‎‎‏‎"</string>
+    <!-- no translation found for call_manager_summary (5918261959486952674) -->
+    <skip />
+    <string name="cell_broadcast_settings" msgid="4124461751977706019">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‏‎‎‏‎‎‏‏‏‏‎‏‎‎‎‎‏‎‎‎‎‎‎‏‏‏‎‎‎‏‏‏‎‎‎‎‎‏‎‏‎‎‎‏‎‎‎‎‎‎‏‎‎‎‏‎‎‎‏‏‎Emergency alerts‎‏‎‎‏‎"</string>
+    <string name="network_operators_settings" msgid="2583178259504630435">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‎‎‏‏‏‏‎‏‏‎‎‏‎‏‎‎‏‎‏‎‏‏‏‏‎‎‎‎‏‏‎‏‎‏‎‏‎‏‎‎‏‎‎‏‎‎‎‎‏‎‏‎‏‎‏‎‎‎‏‏‎Network operators‎‏‎‎‏‎"</string>
+    <string name="access_point_names" msgid="1381602020438634481">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‎‎‏‏‎‎‏‎‏‏‎‎‎‏‏‎‏‏‏‏‏‎‏‏‎‏‏‏‏‎‏‏‎‎‎‏‎‎‏‏‎‏‎‎‏‏‏‎‏‏‏‏‏‏‏‏‎‎‎‏‎Access point names‎‏‎‎‏‎"</string>
+    <string name="enhanced_4g_lte_mode_title" msgid="5808043757309522392">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‎‎‎‎‏‎‎‏‏‎‏‎‎‏‎‏‎‎‎‏‎‎‎‎‎‏‏‎‎‏‏‎‎‎‏‎‎‏‎‏‏‎‏‏‏‏‏‏‎‎‎‏‏‏‎‏‏‎‎‎‎Enhanced 4G LTE Mode‎‏‎‎‏‎"</string>
+    <string name="enhanced_4g_lte_mode_summary" msgid="1376589643017218924">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‎‎‏‏‎‎‎‏‏‎‏‎‏‎‏‎‎‎‎‎‏‏‏‏‏‏‎‎‏‎‏‎‎‎‎‏‏‎‎‎‎‏‎‏‏‏‏‎‏‎‏‏‎‏‏‎‏‏‎‎‎Use LTE data to enhance voice and communications (Recommended)‎‏‎‎‏‎"</string>
+    <string name="preferred_network_type_title" msgid="3431041717309776341">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‏‏‏‏‏‎‎‏‏‏‎‏‏‎‎‎‎‎‏‎‎‏‎‎‎‎‏‏‎‏‏‏‎‎‎‏‏‏‎‎‏‎‏‏‏‎‏‎‎‎‎‏‏‏‎‏‎‏‎‏‎Preferred network type‎‏‎‎‏‎"</string>
+    <string name="preferred_network_type_summary" msgid="6564884693884755019">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‏‎‏‏‎‎‎‏‏‎‏‏‎‎‏‎‎‏‏‏‏‏‎‏‏‎‎‎‏‏‎‎‏‎‏‎‎‏‏‎‎‏‏‎‎‏‎‏‏‏‎‎‎‏‎‎‏‎‏‏‎LTE (recommended)‎‏‎‎‏‎"</string>
+    <string name="work_sim_title" msgid="4843322164662606891">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‎‎‏‏‎‎‏‏‎‏‏‎‏‏‏‎‏‏‏‏‏‏‎‏‏‎‎‏‎‎‎‎‎‏‎‏‎‏‏‏‏‏‎‏‏‎‎‏‏‏‎‎‎‎‏‎‏‎‏‏‎Work SIM‎‏‎‎‏‎"</string>
+    <string name="user_restrictions_title" msgid="5794473784343434273">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‎‎‎‎‎‏‏‎‏‎‏‎‎‎‎‏‏‎‏‏‎‎‏‏‎‏‎‎‏‏‎‏‏‎‎‎‎‎‎‏‏‎‏‎‏‎‎‏‎‏‎‎‎‎‏‎‎‎‎‏‎App &amp; content access‎‏‎‎‏‎"</string>
+    <string name="user_rename" msgid="8523499513614655279">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‎‏‏‎‎‏‎‎‏‎‎‏‏‎‎‎‏‏‎‏‏‎‏‎‎‏‎‏‏‏‏‏‎‎‎‎‎‎‏‏‎‏‏‏‎‏‎‏‏‏‏‏‎‎‏‎‏‏‏‏‎RENAME‎‏‎‎‏‎"</string>
+    <string name="app_restrictions_custom_label" msgid="6160672982086584261">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‎‏‎‏‎‏‏‏‏‏‏‏‎‎‎‏‏‎‏‏‎‏‏‎‏‏‏‏‏‏‎‎‎‎‏‎‏‎‎‏‏‏‏‎‎‎‎‎‎‏‏‏‏‏‎‎‎‏‎‏‎Set app restrictions‎‏‎‎‏‎"</string>
+    <string name="user_restrictions_controlled_by" msgid="3164078767438313899">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‏‎‏‏‏‏‏‎‏‎‎‏‎‎‎‏‎‎‎‎‏‏‎‏‏‏‏‏‏‏‏‏‏‏‏‎‏‎‎‎‎‏‎‎‎‎‏‏‏‎‎‏‏‎‏‎‏‎‏‏‎Controlled by ‎‏‎‎‏‏‎<xliff:g id="APP">%1$s</xliff:g>‎‏‎‎‏‏‏‎‎‏‎‎‏‎"</string>
+    <string name="app_sees_restricted_accounts" msgid="7503264525057246240">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‏‎‎‎‎‎‏‎‎‎‎‎‏‏‏‏‎‎‏‏‎‏‎‏‎‏‎‎‏‏‎‏‏‏‏‏‏‏‎‏‎‎‏‏‏‏‎‎‎‏‎‎‎‎‏‎‎‎‎‎‎This app can access your accounts‎‏‎‎‏‎"</string>
+    <string name="app_sees_restricted_accounts_and_controlled_by" msgid="6968697624437267294">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‎‎‎‎‏‎‏‏‎‏‎‏‏‏‎‎‏‎‎‏‏‎‎‏‎‎‎‏‎‏‎‏‎‎‏‏‏‎‏‏‎‎‎‏‎‎‎‏‏‎‏‏‎‏‎‏‏‏‏‎‎This app can access your accounts. Controlled by ‎‏‎‎‏‏‎<xliff:g id="APP">%1$s</xliff:g>‎‏‎‎‏‏‏‎‎‏‎‎‏‎"</string>
+    <string name="restriction_wifi_config_title" msgid="8889556384136994814">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‏‎‏‏‎‏‎‏‏‏‏‎‎‎‎‎‏‏‎‎‎‏‏‎‏‏‏‎‏‎‏‏‎‏‏‏‎‏‎‎‏‎‏‎‏‎‎‏‏‏‏‏‏‏‏‏‏‏‏‎‎Wi‑Fi and Mobile‎‏‎‎‏‎"</string>
+    <string name="restriction_wifi_config_summary" msgid="70888791513065244">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‎‎‎‏‏‏‏‏‎‏‏‏‏‎‏‏‎‎‎‏‏‏‏‏‎‏‎‏‏‏‏‎‏‎‎‏‎‏‏‎‎‎‏‎‏‏‎‎‏‏‏‎‎‎‏‏‏‎‎‎Allow modification of Wi‑Fi and Mobile settings‎‏‎‎‏‎"</string>
+    <string name="restriction_bluetooth_config_title" msgid="8871681580962503671">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‏‎‏‏‎‎‎‏‏‏‏‎‏‎‎‎‏‎‏‏‎‏‏‎‎‏‎‎‏‏‎‎‏‎‎‏‏‎‏‎‎‏‎‏‎‏‎‏‏‎‏‏‏‏‏‏‎‏‏‏‎Bluetooth‎‏‎‎‏‎"</string>
+    <string name="restriction_bluetooth_config_summary" msgid="8372319681287562506">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‎‏‎‎‎‎‏‏‎‎‎‎‎‏‏‏‎‏‎‎‎‏‏‎‎‏‎‎‎‏‎‎‎‏‎‏‎‎‏‎‏‎‎‎‎‎‏‎‎‏‎‏‎‎‎‎‏‎‏‎‎Allow modification of Bluetooth pairings and settings‎‏‎‎‏‎"</string>
+    <string name="restriction_nfc_enable_title" msgid="5888100955212267941">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‎‎‎‏‏‎‏‏‎‏‏‎‏‎‏‏‏‏‎‎‏‎‎‏‏‏‏‏‎‏‎‎‏‏‎‏‎‎‎‏‎‎‎‎‏‏‎‎‎‎‎‏‏‎‏‎‎‏‎‏‎NFC‎‏‎‎‏‎"</string>
+    <string name="restriction_nfc_enable_summary_config" msgid="3232480757215851738">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‏‏‎‎‏‏‎‏‏‏‎‎‎‎‎‏‎‏‎‎‎‎‎‏‏‏‏‏‎‏‎‎‏‏‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‎‎‏‏‎‏‏‎‏‎‎Allow data exchange when this ‎‏‎‎‏‏‎<xliff:g id="DEVICE_NAME">%1$s</xliff:g>‎‏‎‎‏‏‏‎ touches another NFC device‎‏‎‎‏‎"</string>
+    <string name="restriction_nfc_enable_summary" product="tablet" msgid="3891097373396149915">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‎‏‎‏‏‏‏‏‏‏‏‏‏‏‏‏‎‏‎‎‎‏‏‏‎‎‎‏‏‏‏‏‎‏‏‏‏‎‏‏‏‎‏‏‏‎‏‎‎‏‏‎‏‎‎‏‏‎‏‏‎Allow data exchange when the tablet touches another device‎‏‎‎‏‎"</string>
+    <string name="restriction_nfc_enable_summary" product="default" msgid="825331120501418592">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‎‏‎‏‏‎‏‏‏‎‏‎‎‎‎‏‎‏‎‏‎‎‏‎‎‏‎‎‎‎‎‎‎‎‎‏‏‏‎‎‎‏‏‏‏‏‏‏‎‏‎‏‎‎‏‏‎‎‎‎‎‎Allow data exchange when the phone touches another device‎‏‎‎‏‎"</string>
+    <string name="restriction_location_enable_title" msgid="5020268888245775164">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‎‏‎‏‏‎‏‎‏‎‏‏‏‎‎‏‎‎‏‏‏‏‏‏‎‏‎‎‏‎‎‏‎‎‎‎‏‏‎‏‎‏‎‏‏‎‏‎‏‎‏‏‎‎‏‏‏‏‎‎‎Location‎‏‎‎‏‎"</string>
+    <string name="restriction_location_enable_summary" msgid="3489765572281788755">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‎‎‎‎‎‏‏‎‏‏‏‎‎‎‏‎‎‎‏‏‎‏‎‎‏‏‎‎‎‏‏‎‎‏‎‏‎‎‏‏‏‏‏‎‎‏‏‎‏‎‎‏‎‏‎‏‎‎‏‏‎Let apps use your location information‎‏‎‎‏‎"</string>
+    <string name="wizard_back" msgid="5567007959434765743">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‏‏‎‏‎‏‎‎‎‎‎‏‏‏‏‏‏‏‎‎‎‎‏‏‏‏‏‎‎‏‏‎‏‎‏‏‏‏‏‎‎‎‎‏‏‎‏‎‎‏‎‏‏‎‏‎‏‏‏‏‎Back‎‏‎‎‏‎"</string>
+    <string name="wizard_next" msgid="3606212602795100640">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‎‎‏‎‎‎‎‎‏‎‏‏‏‏‎‏‎‏‏‏‎‏‎‎‎‎‎‏‎‏‏‏‎‏‏‎‎‎‏‎‎‎‏‏‏‎‎‎‏‎‎‏‏‏‏‎‎‎‎‎‎Next‎‏‎‎‏‎"</string>
+    <string name="wizard_finish" msgid="3286109692700083252">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‏‏‎‏‏‎‎‏‏‎‏‎‏‎‎‏‏‎‏‏‎‏‎‏‏‎‏‎‏‏‎‏‏‏‏‎‎‏‎‏‏‎‏‏‎‏‎‎‎‏‎‎‎‎‏‏‎‏‎‎‎Finish‎‏‎‎‏‎"</string>
+    <string name="user_image_take_photo" msgid="1280274310152803669">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‎‎‎‏‏‏‎‎‎‏‎‎‎‏‏‏‎‎‏‎‏‎‏‏‎‎‏‏‏‎‏‎‏‏‏‏‏‎‏‏‎‏‏‏‎‏‎‏‎‏‎‏‎‏‎‏‎‏‎‏‎Take photo‎‏‎‎‏‎"</string>
+    <string name="user_image_choose_photo" msgid="7940990613897477057">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‏‏‏‎‎‎‏‏‎‏‎‎‎‎‎‏‎‎‎‎‏‏‏‎‎‎‏‏‏‏‏‎‎‎‏‎‎‎‎‏‎‎‎‏‏‏‏‏‏‎‏‏‏‏‎‎‎‎‎‏‎Choose photo from Gallery‎‏‎‎‏‎"</string>
+    <string name="user_image_photo_selector" msgid="5492565707299454873">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‏‏‎‎‎‎‏‏‏‎‎‏‏‎‎‎‎‎‏‏‎‏‏‎‏‎‎‎‏‏‏‏‎‎‎‏‎‎‎‏‎‎‏‏‎‏‏‏‏‏‏‏‏‎‎‏‏‎‎‏‎Select photo‎‏‎‎‏‎"</string>
+    <string name="regulatory_info_text" msgid="5623087902354026557"></string>
+    <string name="sim_setup_wizard_title" msgid="1732682852692274928">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‏‎‎‎‎‎‎‎‏‎‏‏‏‎‏‏‏‎‎‏‏‏‎‏‏‏‏‏‏‏‎‏‎‏‏‏‎‎‏‎‎‎‏‎‎‎‏‎‏‏‏‎‏‏‏‏‎‎‎‎‎SIM cards‎‏‎‎‏‎"</string>
+    <string name="sim_settings_title" msgid="6822745211458959756">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‏‏‏‎‏‎‏‎‏‏‏‏‎‏‎‎‎‎‏‎‏‎‎‏‏‏‏‏‎‎‎‏‎‎‏‎‎‎‎‎‎‎‏‎‎‎‏‏‏‎‎‏‏‎‎‎‏‏‎‎‎SIM cards‎‏‎‎‏‎"</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">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‏‏‎‏‏‎‏‎‎‏‎‏‎‎‎‎‎‎‎‎‎‎‎‎‎‏‏‏‎‏‏‏‎‏‏‎‏‎‎‎‏‏‎‏‎‎‏‏‎‏‎‎‎‏‎‎‎‏‏‏‎SIM cards have changed‎‏‎‎‏‎"</string>
+    <string name="sim_cards_changed_message_summary" msgid="8258058274989383204">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‎‎‏‎‏‎‎‏‏‎‏‎‏‎‎‎‎‏‎‎‎‎‏‏‏‏‏‏‎‏‏‏‏‏‏‏‎‎‏‏‎‏‏‏‏‎‎‏‏‏‏‎‎‎‏‎‎‏‎‎‎Tap to set activities‎‏‎‎‏‎"</string>
+    <string name="sim_cellular_data_unavailable" msgid="9109302537004566098">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‏‏‏‎‎‏‏‎‏‎‏‎‏‎‏‏‏‏‏‎‎‏‏‎‎‏‎‎‏‏‏‎‏‏‎‏‏‎‏‏‏‎‎‎‏‏‎‎‎‏‏‎‎‏‎‏‎‎‏‎‎Mobile data is unavailable‎‏‎‎‏‎"</string>
+    <string name="sim_cellular_data_unavailable_summary" msgid="5416535001368135327">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‏‎‏‏‎‎‏‎‏‎‏‏‎‏‏‎‎‏‎‏‏‏‏‎‎‎‏‎‏‎‏‏‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‎‏‏‎‏‎‎‏‏‏‏‏‎Tap to select a data SIM‎‏‎‎‏‎"</string>
+    <string name="sim_calls_always_use" msgid="7936774751250119715">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‏‏‏‎‎‎‏‎‎‏‎‏‎‎‎‏‎‏‏‎‏‎‎‏‎‏‎‏‏‏‎‏‏‏‏‎‏‎‎‎‏‏‎‏‎‏‏‏‏‏‎‎‎‎‏‎‎‎‏‏‎Always use this for calls‎‏‎‎‏‎"</string>
+    <string name="select_sim_for_data" msgid="2366081042162853044">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‎‎‎‎‏‏‎‏‎‏‏‎‎‎‎‎‎‎‏‎‎‎‏‎‏‎‏‏‏‏‏‏‏‎‏‏‏‏‏‎‎‏‏‏‎‎‏‎‎‏‎‎‏‎‏‏‎‏‎‎‎Select a SIM for data‎‏‎‎‏‎"</string>
+    <string name="data_switch_started" msgid="2040761479817166311">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‏‏‎‎‎‏‎‏‎‎‏‎‎‎‏‏‏‏‎‏‏‏‎‎‎‎‎‎‏‏‏‎‎‎‏‏‏‏‎‎‏‏‎‏‎‏‏‏‏‏‎‏‏‏‏‎‎‏‏‏‎Switching data SIM, this may take up to a minute...‎‏‎‎‏‎"</string>
+    <string name="select_sim_for_calls" msgid="3503094771801109334">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‎‎‎‎‏‎‎‏‏‏‎‏‎‏‏‏‏‏‏‎‎‎‏‎‎‎‏‎‎‏‏‏‏‏‏‏‏‎‏‏‏‎‏‏‏‎‏‏‎‎‏‏‎‏‎‏‎‏‏‎‎Call with‎‏‎‎‏‎"</string>
+    <string name="sim_select_card" msgid="211285163525563293">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‎‏‎‏‎‏‏‏‎‏‏‏‎‏‎‏‎‎‎‏‎‏‎‏‏‏‏‎‎‏‎‎‏‏‏‏‎‎‏‎‎‎‎‎‎‎‏‏‎‎‎‏‏‏‎‎‏‏‏‎‏‎Select a SIM card‎‏‎‎‏‎"</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 empty‎‏‎‎‏‎"</string>
+    <string name="sim_editor_name" msgid="1722945976676142029">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‎‏‏‏‏‏‏‎‏‎‎‏‎‎‏‎‎‎‏‎‎‎‏‏‏‏‎‎‏‎‏‏‏‎‏‎‏‏‏‏‏‎‎‎‎‏‎‎‏‎‏‏‏‏‎‎‏‏‎‏‎SIM name‎‏‎‎‏‎"</string>
+    <string name="sim_name_hint" msgid="7038643345238968930">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‎‎‎‏‏‎‏‎‏‏‏‎‎‏‎‎‏‎‎‎‏‏‎‏‎‏‎‎‏‎‎‎‎‏‎‏‏‎‏‎‎‎‏‎‏‏‎‎‏‎‏‎‎‏‏‎‎‎‏‎‎Enter SIM name‎‏‎‎‏‎"</string>
+    <string name="sim_editor_title" msgid="4034301817366627870">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‎‏‏‏‏‏‏‏‏‏‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‎‎‎‏‏‎‏‎‏‎‎‏‏‎‏‏‎‎‏‏‏‎‎‎‏‏‎‎‎‎‏‏‏‏‎‎SIM slot %1$d‎‏‎‎‏‎"</string>
+    <string name="sim_editor_carrier" msgid="5684523444677746573">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‏‏‏‎‏‏‏‎‎‎‏‏‎‏‏‏‏‎‏‏‏‏‏‏‎‏‎‎‎‏‏‏‏‏‎‏‎‏‏‎‎‏‎‏‏‎‎‏‏‏‏‏‏‎‎‎‏‏‎‏‎Carrier‎‏‎‎‏‎"</string>
+    <string name="sim_editor_number" msgid="6705955651035440667">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‏‏‎‏‎‎‎‏‎‎‎‎‎‏‎‏‎‏‏‏‎‎‏‎‎‎‏‎‏‎‎‎‏‎‏‏‎‏‏‏‏‏‎‏‏‎‏‎‎‏‏‎‎‎‎‏‏‎‏‏‎Number‎‏‎‎‏‎"</string>
+    <string name="sim_editor_color" msgid="2542605938562414355">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‎‎‏‏‎‏‎‎‏‎‎‏‎‎‏‎‎‏‏‎‏‎‏‎‎‎‎‏‎‎‏‏‏‎‏‏‏‏‎‎‏‏‏‏‏‎‏‏‎‏‏‏‎‎‎‏‎‎‏‏‎SIM color‎‏‎‎‏‎"</string>
+    <string name="sim_card_select_title" msgid="6668492557519243456">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‏‏‎‎‏‎‎‎‏‎‏‏‎‎‏‏‏‏‏‎‏‎‏‎‎‏‏‎‎‏‎‏‏‏‏‎‎‏‎‎‎‏‎‏‎‏‎‎‏‎‎‎‏‏‎‎‎‎‎‎‎Select SIM card‎‏‎‎‏‎"</string>
+    <string name="color_orange" msgid="4417567658855022517">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‏‏‎‏‎‏‎‎‏‏‏‎‎‏‎‏‏‎‏‎‎‏‏‎‎‎‎‏‎‏‏‎‎‏‎‏‎‏‎‎‏‏‏‎‏‎‏‏‏‏‏‏‏‎‏‏‎‏‎‏‎Orange‎‏‎‎‏‎"</string>
+    <string name="color_purple" msgid="3888532466427762504">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‎‏‎‏‏‏‏‏‎‏‏‎‏‏‎‏‎‏‏‏‏‎‏‎‏‏‎‏‎‎‎‎‎‏‏‏‎‎‎‎‎‎‎‎‎‎‎‏‎‏‏‏‎‏‎‎‏‎‎‎‎Purple‎‏‎‎‏‎"</string>
+    <string name="sim_no_inserted_msg" msgid="210316755353227087">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‎‏‎‏‎‏‏‏‎‏‎‏‏‎‎‏‏‎‎‎‏‏‏‏‏‏‎‎‏‏‎‎‎‎‏‎‏‎‎‏‎‎‏‎‎‎‏‎‎‏‏‏‏‎‏‎‎‏‏‏‏‎No SIM cards inserted‎‏‎‎‏‎"</string>
+    <string name="sim_status_title" msgid="6744870675182447160">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‏‏‎‏‏‎‎‏‏‎‏‎‏‎‎‏‏‎‎‎‎‎‏‎‎‏‎‎‏‎‏‎‏‎‏‎‎‎‏‏‎‎‏‎‏‏‏‎‏‎‏‎‎‎‏‏‏‎‎‎‎SIM status‎‏‎‎‏‎"</string>
+    <string name="sim_call_back_title" msgid="5181549885999280334">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‎‏‏‏‏‏‏‎‏‎‎‎‏‎‎‏‎‎‎‎‎‎‏‎‏‎‏‏‎‎‎‏‎‏‎‎‏‏‏‏‎‎‏‏‏‏‏‏‎‎‎‎‏‏‎‎‏‏‏‎‎Call back from default SIM‎‏‎‎‏‎"</string>
+    <string name="sim_outgoing_call_title" msgid="1019763076116874255">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‎‏‏‏‎‎‎‏‎‎‏‏‎‏‏‏‎‏‏‎‏‎‎‎‏‏‏‎‏‎‏‏‎‎‎‏‏‎‎‎‎‎‎‎‏‏‎‎‎‎‏‎‎‎‎‎‎‏‏‏‏‎SIM for outgoing calls‎‏‎‎‏‎"</string>
+    <string name="sim_other_call_settings" msgid="8247802316114482477">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‎‎‏‎‎‏‏‏‎‏‏‎‎‎‎‏‎‏‎‎‏‎‎‎‎‎‎‏‏‏‏‏‏‏‎‏‏‎‏‎‎‏‎‏‏‏‎‏‎‏‎‏‎‎‏‎‏‏‎‏‎Other call settings‎‏‎‎‏‎"</string>
+    <string name="preferred_network_offload_title" msgid="1605829724169550275">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‎‏‏‎‎‏‎‎‏‎‎‏‎‎‎‎‏‏‎‏‏‎‏‎‎‎‎‎‎‏‎‎‎‏‏‎‏‏‏‎‎‎‏‏‏‎‏‏‏‎‎‏‏‏‎‎‎‎‏‏‎Preferred network Offload‎‏‎‎‏‎"</string>
+    <string name="preferred_network_offload_header" msgid="2321173571529106767">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‎‎‎‎‎‎‏‏‎‏‏‎‎‏‏‏‎‏‏‏‎‎‎‏‎‎‎‎‏‎‏‏‎‎‎‏‎‎‎‎‎‏‎‎‎‏‏‎‎‏‎‏‎‏‎‎‏‏‏‏‎Disable Network Name Broadcast‎‏‎‎‏‎"</string>
+    <string name="preferred_network_offload_footer" msgid="5857279426054744020">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‎‎‎‏‎‏‎‎‏‎‎‏‎‎‏‏‏‏‎‎‏‎‎‏‏‎‏‎‏‏‎‏‎‏‎‎‎‎‏‏‎‎‏‎‎‏‏‎‎‏‏‏‏‏‎‏‎‏‎‎‎Disable Network Name Broadcast protects from third parties getting access to your network information.‎‏‎‎‏‎"</string>
+    <string name="preferred_network_offload_popup" msgid="2252915199889604600">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‏‏‏‏‎‏‎‎‎‎‏‏‏‏‏‏‎‏‏‎‎‏‏‏‎‎‎‎‎‎‎‏‎‏‏‎‎‏‏‏‏‏‏‏‎‏‏‏‏‏‏‏‏‏‏‏‏‎‎‎‎Disabling Network Name Broadcast will prevent automatic connection to hidden networks.‎‏‎‎‏‎"</string>
+    <string name="sim_signal_strength" msgid="9144010043784767984">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‏‏‏‎‏‏‏‎‎‏‏‎‎‎‎‎‏‏‎‎‏‎‏‏‎‎‎‎‎‎‎‏‎‎‏‎‎‏‏‎‎‏‎‏‎‎‏‎‏‎‎‏‏‏‏‏‎‎‎‎‎‎‏‎‎‏‏‎<xliff:g id="DBM">%1$d</xliff:g>‎‏‎‎‏‏‏‎ dBm ‎‏‎‎‏‏‎<xliff:g id="ASU">%2$d</xliff:g>‎‏‎‎‏‏‏‎ asu‎‏‎‎‏‎"</string>
+    <string name="sim_notification_title" msgid="6272913297433198340">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‎‏‏‏‎‎‎‎‏‏‎‏‏‏‎‏‏‏‎‏‎‏‏‎‏‎‎‎‏‎‏‎‎‎‎‎‎‏‎‏‎‏‎‎‎‏‏‏‏‏‏‏‎‎‎‎‎‏‎‎‎SIM cards changed.‎‏‎‎‏‎"</string>
+    <string name="sim_notification_summary" msgid="8858043655706669772">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‏‎‏‎‏‏‏‎‏‏‏‎‎‎‎‏‎‏‏‏‏‏‎‎‎‏‎‏‏‏‎‏‏‏‏‏‎‏‎‎‏‏‎‎‎‏‏‏‎‎‏‎‏‏‎‎‏‏‎‎‎Tap to set up‎‏‎‎‏‎"</string>
+    <string name="sim_pref_divider" msgid="6778907671867621874">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‏‏‏‎‎‎‎‏‎‎‏‏‏‎‎‎‎‏‎‎‏‎‎‏‏‏‎‎‏‎‎‎‎‎‏‎‏‏‎‏‎‏‏‏‎‎‎‎‎‎‎‏‏‏‏‏‎‎‏‎‎Preferred SIM for‎‏‎‎‏‎"</string>
+    <string name="sim_calls_ask_first_prefs_title" msgid="7941299533514115976">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‏‏‏‎‎‎‏‏‎‏‎‏‎‎‏‎‏‎‎‏‏‏‎‏‏‎‎‏‏‏‎‏‎‏‏‎‎‎‎‏‎‏‎‏‏‎‎‎‏‎‏‏‏‎‎‎‏‎‎‎‎Ask every time‎‏‎‎‏‎"</string>
+    <string name="sim_selection_required_pref" msgid="3446721423206414652">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‏‏‏‏‏‏‎‏‎‏‎‏‎‎‏‏‎‏‏‎‏‏‎‏‏‏‏‏‎‏‏‏‎‏‎‏‏‏‏‏‎‎‏‎‎‏‏‏‏‎‎‏‎‎‏‏‏‏‎‎‎Selection required‎‏‎‎‏‎"</string>
+    <string name="dashboard_title" msgid="5453710313046681820">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‏‎‏‏‏‎‏‎‏‏‏‏‎‏‏‏‏‎‎‎‏‎‏‎‎‎‏‎‎‏‏‏‏‏‎‏‎‎‎‎‏‎‎‎‎‎‏‎‏‎‎‎‏‏‎‏‏‏‎‎‎Settings‎‏‎‎‏‎"</string>
+    <plurals name="settings_suggestion_header_summary_hidden_items" formatted="false" msgid="5597356221942118048">
+      <item quantity="other">‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‏‏‎‏‏‎‏‎‏‏‎‏‏‏‎‎‏‏‎‏‏‏‎‏‎‎‏‏‏‏‏‎‏‎‏‎‎‎‏‎‏‏‏‎‏‎‏‏‎‏‏‎‏‎‏‎‎‎‎‎‎Show %d hidden items‎‏‎‎‏‎</item>
+      <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_mobile" msgid="3851083934739500429">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‎‏‎‏‎‏‏‏‎‎‎‏‏‏‎‎‏‏‎‎‎‏‏‎‏‏‏‏‎‏‎‎‏‎‏‎‎‏‎‏‏‏‎‎‏‎‎‎‏‏‎‏‏‎‎‎‏‏‎‏‎mobile‎‏‎‎‏‎"</string>
+    <string name="network_dashboard_summary_data_usage" msgid="3843261364705042212">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‎‏‎‏‎‏‎‏‎‏‏‎‎‎‎‎‎‎‎‏‏‏‎‏‏‎‎‏‎‏‎‎‎‏‏‎‎‎‏‏‏‎‏‎‎‎‎‏‏‏‏‏‎‎‏‎‎‏‎‎‎data usage‎‏‎‎‏‎"</string>
+    <string name="network_dashboard_summary_hotspot" msgid="8494210248613254574">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‎‏‎‏‏‏‏‎‎‎‎‏‎‏‏‏‏‏‏‏‎‎‏‏‎‏‏‏‏‎‎‎‎‏‎‎‎‎‎‏‎‎‏‏‎‏‎‏‎‏‎‏‏‎‏‎‏‏‏‎‎hotspot‎‏‎‎‏‎"</string>
+    <string name="connected_devices_dashboard_title" msgid="2355264951438890709">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‎‎‎‎‏‎‏‎‏‏‏‏‏‎‎‏‎‏‎‎‏‏‏‏‏‏‏‎‏‎‎‏‏‏‏‎‎‏‏‏‎‎‎‏‎‏‎‏‎‏‏‎‏‏‎‏‎‏‎‏‎Connected devices‎‏‎‎‏‎"</string>
+    <string name="connected_devices_dashboard_summary" msgid="2390582103384791904">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‎‎‎‏‎‎‏‎‏‏‎‏‎‎‎‎‏‏‎‏‏‏‎‎‎‎‎‏‏‏‎‏‎‏‏‎‏‎‏‎‏‎‎‎‎‎‎‏‏‎‏‏‎‏‏‎‎‎‎‎‎Bluetooth, Cast, NFC‎‏‎‎‏‎"</string>
+    <string name="connected_devices_dashboard_no_nfc_summary" msgid="9106040742715366495">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‏‏‏‎‎‏‎‏‏‏‏‏‎‎‏‎‎‏‏‏‏‏‎‎‏‏‏‏‎‏‎‎‎‎‏‏‏‏‎‎‏‎‎‎‏‎‎‏‏‏‎‎‎‏‎‏‏‏‏‏‎Bluetooth, Cast‎‏‎‎‏‎"</string>
+    <string name="app_and_notification_dashboard_title" msgid="7838365599185397539">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‏‏‎‎‏‏‎‎‎‏‏‏‎‏‏‏‎‏‏‏‏‏‏‏‏‎‏‏‏‎‏‎‎‏‏‏‎‎‎‏‎‏‏‎‎‏‏‎‎‏‏‏‎‎‏‎‎‎‏‏‎Apps &amp; notifications‎‏‎‎‏‎"</string>
+    <string name="app_and_notification_dashboard_summary" msgid="2363314178802548682">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‎‎‎‎‏‏‎‎‏‏‎‎‎‎‏‎‏‏‎‏‏‎‏‏‏‎‎‏‎‏‏‎‏‎‎‎‎‎‏‎‏‎‏‏‎‏‏‏‏‏‏‏‏‏‎‎‏‎‏‎‎Permissions, default apps‎‏‎‎‏‎"</string>
+    <string name="account_dashboard_title" msgid="4936890821712178853">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‎‏‎‎‏‎‎‎‎‎‏‏‎‏‎‏‏‏‎‎‎‎‎‎‏‎‏‏‏‎‏‎‏‎‏‏‎‎‎‎‏‎‏‎‎‏‏‎‏‏‏‎‏‎‏‎‎‏‎‏‎Users &amp; accounts‎‏‎‎‏‎"</string>
+    <string name="app_default_dashboard_title" msgid="7342549305933047317">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‎‏‎‏‏‏‏‎‎‏‎‏‏‏‏‏‏‎‎‏‏‎‏‏‎‎‎‎‏‏‏‏‎‏‎‏‏‏‏‎‏‏‏‎‎‎‏‎‎‏‏‎‎‎‎‏‎‏‎‏‎Default apps‎‏‎‎‏‎"</string>
+    <string name="system_dashboard_summary" msgid="5797743225249766685">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‎‎‎‎‎‏‏‏‎‏‎‏‏‎‏‏‏‎‎‎‏‎‏‏‏‏‏‎‏‏‎‏‏‏‏‏‏‏‏‏‎‎‎‎‏‎‎‏‏‏‎‏‎‎‎‏‏‏‎‏‎Languages, time, backup, updates‎‏‎‎‏‎"</string>
+    <string name="search_results_title" msgid="1796252422574886932">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‏‎‎‎‏‏‏‎‏‏‎‏‏‎‎‏‎‎‏‎‎‎‎‎‏‏‏‏‏‎‏‏‎‏‏‎‏‎‎‎‎‎‏‎‏‏‎‏‎‎‎‎‎‎‎‏‎‏‎‎‎Settings‎‏‎‎‏‎"</string>
+    <string name="search_menu" msgid="6283419262313758339">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‎‏‏‏‎‎‏‏‎‎‏‏‎‎‏‏‎‎‎‎‏‎‎‎‎‏‏‏‎‎‏‏‎‎‎‏‎‎‎‎‏‏‏‎‏‏‏‏‏‏‏‎‏‎‎‎‎‎‏‏‎Search settings‎‏‎‎‏‎"</string>
+    <string name="query_hint_text" msgid="3350700807437473939">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‏‏‏‎‏‎‎‎‎‎‎‎‎‎‎‏‎‏‎‎‏‎‏‎‎‎‎‏‏‎‏‎‏‏‏‏‏‏‏‎‏‏‎‎‏‏‎‏‏‎‎‎‏‎‎‏‎‎‏‏‎Search settings‎‏‎‎‏‎"</string>
+    <string name="keywords_wifi" msgid="1395786161993828719">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‎‎‏‏‎‏‎‏‏‏‏‎‏‏‎‏‎‏‎‎‎‎‎‏‏‏‏‎‏‎‎‎‎‎‎‎‎‎‎‎‏‏‎‎‎‏‎‎‏‎‎‏‎‏‏‎‏‏‏‏‎wifi, wi-fi, network connection‎‏‎‎‏‎"</string>
+    <string name="keywords_more_default_sms_app" msgid="2265154063220360784">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‏‏‏‏‎‏‏‎‏‏‏‏‎‏‏‏‎‎‎‏‏‎‎‏‏‏‏‎‏‎‎‎‎‎‏‏‏‏‎‎‏‎‎‎‎‏‎‎‎‏‏‎‎‏‎‏‎‎‎‎‎text message, texting, messages, messaging‎‏‎‎‏‎"</string>
+    <string name="keywords_more_mobile_networks" msgid="8995946622054642367">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‏‏‎‎‏‏‎‏‏‎‎‎‎‎‎‎‎‏‎‏‏‏‎‎‏‎‏‎‎‏‎‎‏‎‎‏‏‏‏‏‎‎‎‏‎‎‏‏‎‎‏‎‏‎‏‏‏‏‏‏‎cellular, mobile, cell carrier, wireless, data, 4g,3g, 2g, lte‎‏‎‎‏‎"</string>
+    <string name="keywords_wifi_calling" msgid="1784064367330122679">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‏‎‎‎‏‏‎‎‎‎‏‎‎‏‎‎‎‏‎‏‎‎‎‏‎‏‏‎‏‏‏‏‎‏‏‏‎‎‏‎‎‏‎‎‏‏‎‏‏‎‏‏‏‎‏‏‎‏‏‏‎wifi, wi-fi, call, calling‎‏‎‎‏‎"</string>
+    <string name="keywords_home" msgid="3626170808219458848">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‎‎‏‎‎‏‎‏‎‎‏‎‏‎‏‏‏‏‏‏‎‎‏‎‎‎‏‏‎‏‎‎‎‏‏‎‏‏‎‎‏‏‏‏‏‏‎‏‏‏‎‏‎‎‏‎‎‎‎‎‎launcher‎‏‎‎‏‎"</string>
+    <string name="keywords_display" msgid="8910345814565493016">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‏‎‏‏‏‎‏‎‎‏‏‏‏‏‏‎‏‎‎‎‎‏‎‎‏‏‏‏‎‎‏‎‏‏‏‏‎‎‎‏‎‎‎‎‏‎‎‏‏‎‎‏‎‎‎‏‏‎‎‎‎screen, touchscreen‎‏‎‎‏‎"</string>
+    <string name="keywords_display_brightness_level" msgid="3891383826236015854">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‎‏‏‎‎‎‎‎‎‎‎‎‏‏‏‏‏‎‎‎‏‏‏‏‏‎‎‎‏‏‏‏‎‏‏‏‎‏‏‏‏‏‏‏‏‎‎‎‎‏‎‎‏‏‏‎‏‏‏‎‎dim screen, touchscreen, battery‎‏‎‎‏‎"</string>
+    <string name="keywords_display_auto_brightness" msgid="3325150824507953765">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‏‏‏‎‎‎‏‎‎‏‎‏‎‏‎‎‏‏‏‏‎‎‎‎‏‏‏‎‏‎‏‏‎‏‏‏‎‏‏‎‎‏‎‎‏‏‎‏‎‎‏‎‎‏‏‎‎‏‎‏‎dim screen, touchscreen, battery‎‏‎‎‏‎"</string>
+    <string name="keywords_display_night_display" msgid="7630169927425425754">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‏‎‎‏‏‏‏‎‎‎‏‏‏‏‎‎‏‏‏‏‎‎‎‏‏‏‏‏‎‏‏‎‎‏‎‎‎‎‎‎‏‏‏‏‏‎‎‎‎‎‎‏‎‏‎‏‏‎‏‎‎dim screen, night, tint‎‏‎‎‏‎"</string>
+    <string name="keywords_display_wallpaper" msgid="7362076351860131776">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‎‏‏‎‎‎‏‎‏‎‏‏‎‏‎‏‏‎‎‏‎‏‏‎‏‏‏‏‏‎‏‎‎‎‎‏‏‏‏‎‏‏‎‏‎‏‎‎‎‏‏‏‏‏‎‎‎‎‎‎‎background, personalize, customize display‎‏‎‎‏‎"</string>
+    <string name="keywords_display_font_size" msgid="3404655440064726124">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‏‏‏‏‎‎‏‏‏‏‏‏‏‏‎‎‎‏‎‎‎‎‎‏‎‏‎‏‏‎‎‎‎‏‏‏‏‎‏‎‏‎‎‎‏‏‎‎‎‏‎‎‎‏‏‎‏‏‎‎‎text size‎‏‎‎‏‎"</string>
+    <string name="keywords_display_cast_screen" msgid="7684618996741933067">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‏‎‏‎‏‎‏‎‎‏‎‏‎‏‎‎‎‎‎‎‎‏‎‎‎‎‏‏‎‎‏‏‏‏‏‏‎‎‎‎‎‏‎‏‏‎‎‎‏‎‎‎‎‎‎‎‏‎‏‏‎project, cast‎‏‎‎‏‎"</string>
+    <string name="keywords_storage" msgid="3299217909546089225">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‏‏‎‏‏‏‎‎‏‎‎‏‎‎‏‎‏‏‎‏‎‎‏‏‎‏‎‏‎‏‏‎‏‏‏‏‎‎‎‏‏‎‎‏‏‏‏‏‏‎‏‏‎‎‎‎‏‎‎‏‎space, disk, hard drive, device usage‎‏‎‎‏‎"</string>
+    <string name="keywords_battery" msgid="1173830745699768388">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‎‎‎‎‎‏‎‎‏‎‏‎‎‏‎‎‏‎‎‎‏‏‎‏‏‎‎‎‎‎‎‎‏‏‏‏‏‏‎‏‏‏‎‏‏‏‎‏‏‎‎‎‎‏‎‎‎‏‎‎‎power usage, charge‎‏‎‎‏‎"</string>
+    <string name="keywords_spell_checker" msgid="1399641226370605729">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‎‎‏‏‎‏‏‎‏‏‎‎‏‎‎‎‎‏‏‎‎‏‎‎‎‏‏‏‏‎‎‏‏‏‏‎‏‏‎‎‏‏‏‏‏‏‏‎‎‎‏‎‏‎‏‎‎‎‎‏‎spelling, dictionary, spellcheck, auto-correct‎‏‎‎‏‎"</string>
+    <string name="keywords_voice_input" msgid="769778245192531102">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‎‏‎‏‎‏‎‏‎‏‏‏‎‏‏‎‎‏‏‎‏‎‎‏‏‏‏‎‎‎‏‎‎‏‏‎‎‏‎‎‎‎‏‏‎‎‎‏‏‏‏‎‎‏‎‎‏‏‏‏‎‎recognizer, input, speech, speak, language, hands-free, hand free, recognition, offensive, word, audio, history, bluetooth headset‎‏‎‎‏‎"</string>
+    <string name="keywords_text_to_speech_output" msgid="5150660047085754699">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‎‏‏‏‎‏‏‏‏‎‏‎‏‏‎‏‎‎‏‎‎‎‎‎‎‏‏‎‎‎‎‎‎‎‎‏‎‏‎‏‎‏‏‏‏‏‎‏‏‎‎‏‎‏‎‎‏‎‏‏‎rate, language, default, speak, speaking, tts, accessibility, screen reader, blind‎‏‎‎‏‎"</string>
+    <string name="keywords_date_and_time" msgid="758325881602648204">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‎‏‎‏‎‏‎‎‎‎‏‏‎‎‎‎‏‏‏‎‏‎‏‎‏‏‏‏‏‎‎‎‏‏‏‎‎‏‏‏‎‏‎‎‏‎‎‏‎‏‎‎‎‏‎‎‎‏‏‎‎‎clock, military‎‏‎‎‏‎"</string>
+    <string name="keywords_network_reset" msgid="6024276007080940820">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‎‎‏‏‏‎‎‏‏‎‏‎‏‎‎‎‎‏‏‏‎‎‎‏‏‏‎‎‎‏‎‎‎‏‏‎‏‏‏‏‎‏‏‏‏‏‎‏‎‏‎‏‎‎‎‏‎‏‎‎‎reset, restore, factory‎‏‎‎‏‎"</string>
+    <string name="keywords_factory_data_reset" msgid="5894970373671252165">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‎‎‎‏‏‏‎‎‏‏‏‏‎‎‏‎‎‏‎‎‎‏‎‏‎‎‏‎‎‏‏‎‏‏‎‎‎‎‏‎‎‎‎‎‎‏‏‏‎‎‎‎‏‏‎‎‎‏‎‏‎wipe, delete, restore, clear, remove‎‏‎‎‏‎"</string>
+    <string name="keywords_printing" msgid="1701778563617114846">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‎‏‏‏‏‎‎‏‏‏‎‏‏‏‏‎‏‏‏‎‏‎‎‏‎‏‏‎‎‏‎‏‎‎‏‎‏‏‎‎‎‏‎‏‏‏‎‎‏‎‏‎‏‏‎‏‏‏‏‎‎printer‎‏‎‎‏‎"</string>
+    <string name="keywords_sounds" msgid="7146245090127541167">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‎‎‏‏‎‎‏‎‏‏‎‎‏‎‎‏‎‎‎‎‎‎‎‎‏‏‎‎‎‎‎‎‏‎‏‎‏‏‏‎‏‏‏‎‎‏‏‏‎‎‏‏‏‎‏‎‏‏‏‏‎speaker beep‎‏‎‎‏‎"</string>
+    <string name="keywords_sounds_and_notifications_interruptions" msgid="5426093074031208917">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‏‎‏‏‎‏‎‎‏‏‎‏‎‏‎‏‏‎‏‎‏‏‏‎‎‏‏‎‏‏‏‏‎‎‏‏‏‏‎‏‎‏‏‎‎‏‏‎‏‎‎‏‏‏‎‏‎‏‎‏‎dont don’t disturb, interrupt, interruption, break‎‏‎‎‏‎"</string>
+    <string name="keywords_app" msgid="6334757056536837791">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‎‏‏‏‏‏‏‎‏‎‎‏‏‎‎‏‎‎‏‏‏‏‏‏‏‎‏‎‏‏‎‏‏‏‎‏‎‏‎‎‎‏‏‎‏‏‏‏‏‏‏‎‏‎‎‏‏‏‏‏‎RAM‎‏‎‎‏‎"</string>
+    <string name="keywords_location" msgid="6615286961552714686">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‏‎‏‏‏‏‎‎‏‏‏‎‎‎‏‏‏‎‎‎‎‏‏‏‎‎‎‏‎‎‏‏‎‏‏‎‏‎‎‏‏‏‏‏‎‏‏‎‏‎‏‏‏‎‏‏‏‏‏‎‎nearby, location, history, reporting‎‏‎‎‏‎"</string>
+    <string name="keywords_location_mode" msgid="8584992704568356084">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‎‏‏‏‎‎‏‎‎‏‎‎‎‎‎‎‎‏‎‏‎‏‏‎‎‎‎‏‎‎‏‎‏‎‏‏‎‎‎‏‏‏‎‏‏‏‏‎‏‏‎‎‏‏‏‏‎‏‎‎‎accuracy‎‏‎‎‏‎"</string>
+    <string name="keywords_accounts" msgid="1957925565953357627">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‏‎‏‏‎‎‏‎‏‎‏‏‏‏‏‏‎‎‏‎‏‏‏‎‏‏‎‏‏‎‏‏‏‏‏‏‎‏‎‎‏‏‏‎‎‎‏‏‎‏‏‏‎‎‏‏‏‎‏‏‎account‎‏‎‎‏‎"</string>
+    <string name="keywords_users" msgid="3434190133131387942">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‏‏‏‏‏‎‏‎‏‎‎‎‏‎‏‏‎‎‎‏‏‎‏‏‏‎‏‏‎‎‏‎‎‎‎‎‎‏‏‏‎‎‏‎‏‎‏‎‎‏‎‎‎‎‏‎‎‏‏‎‎restriction, restrict, restricted‎‏‎‎‏‎"</string>
+    <string name="keywords_keyboard_and_ime" msgid="9143339015329957107">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‏‏‏‎‏‏‏‎‎‎‏‏‏‎‏‎‏‎‏‎‎‏‏‎‎‏‎‎‎‎‎‏‎‏‎‏‏‎‏‏‎‏‏‎‎‏‎‎‎‏‎‎‏‏‏‏‎‎‏‏‎text correction, correct, sound, vibrate, auto, language, gesture, suggest, suggestion, theme, offensive, word, type, emoji, international‎‏‎‎‏‎"</string>
+    <string name="keywords_reset_apps" msgid="5293291209613191845">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‏‎‎‏‎‏‏‏‎‏‎‏‏‎‎‎‏‏‎‎‎‏‎‎‏‏‏‏‎‏‏‎‎‎‎‏‏‎‏‏‎‎‎‏‎‎‏‎‏‎‏‎‏‎‏‎‎‏‎‏‎reset, preferences, default‎‏‎‎‏‎"</string>
+    <string name="keywords_emergency_app" msgid="3143078441279044780">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‏‎‏‏‏‎‎‏‏‏‏‎‎‏‏‏‎‏‎‏‎‎‏‏‎‎‎‎‏‎‎‎‏‎‎‏‏‎‏‎‎‎‎‎‎‎‏‏‏‏‎‎‏‎‏‎‏‏‎‎‎emergency, ice, app, default‎‏‎‎‏‎"</string>
+    <string name="keywords_default_phone_app" msgid="4213090563141778486">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‏‎‏‎‎‏‏‏‎‏‏‏‏‏‏‎‎‏‏‏‏‎‎‎‏‎‏‏‏‎‎‏‎‏‏‎‏‎‎‏‏‏‎‏‏‎‏‏‏‏‎‎‎‎‏‏‎‏‏‎‎phone, dialer, default‎‏‎‎‏‎"</string>
+    <string name="keywords_all_apps" msgid="7814015440655563156">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‏‏‎‎‎‏‏‏‎‎‎‎‏‏‏‏‎‏‎‏‏‎‏‎‎‏‎‎‏‎‎‏‎‎‎‏‏‎‏‏‎‎‎‏‎‎‏‏‏‎‎‏‏‎‎‏‎‏‎‎‎apps, download, applications, system‎‏‎‎‏‎"</string>
+    <string name="keywords_app_permissions" msgid="4229936435938011023">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‏‎‏‎‏‎‏‏‎‎‏‏‏‏‎‎‎‎‎‎‏‏‎‎‎‏‏‎‏‏‏‏‏‏‏‎‏‎‎‏‎‎‎‏‎‎‏‎‎‏‏‏‏‎‎‎‏‏‏‏‎apps, permissions, security‎‏‎‎‏‎"</string>
+    <string name="keywords_default_apps" msgid="223872637509160136">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‎‏‎‏‏‎‎‎‏‏‎‏‏‎‏‎‏‏‎‏‎‏‏‏‏‏‎‏‎‎‏‎‎‏‎‎‏‏‎‏‎‏‎‎‏‏‏‎‎‏‏‎‎‏‏‎‎‏‎‎‎‎apps, default‎‏‎‎‏‎"</string>
+    <string name="keywords_ignore_optimizations" msgid="6102579291119055029">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‎‏‎‎‏‎‏‏‎‎‎‎‏‎‏‏‎‏‏‏‏‎‎‎‏‎‎‎‎‏‎‎‏‏‎‎‏‏‎‎‏‏‏‎‎‏‏‏‎‎‎‎‏‎‏‏‎‏‎‏‎ignore optimizations, doze, app standby‎‏‎‎‏‎"</string>
+    <string name="keywords_color_mode" msgid="6362744316886077510">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‏‎‎‎‎‏‎‎‏‏‎‏‎‎‎‎‎‎‏‎‎‎‏‏‏‏‏‎‏‎‏‏‎‏‎‎‏‎‏‎‎‎‎‏‎‏‎‏‎‎‎‎‎‏‎‎‎‏‏‎‎vibrant, RGB, sRGB, color, natural, standard‎‏‎‎‏‎"</string>
+    <string name="keywords_color_temperature" msgid="2688947724153266364">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‎‏‎‏‎‏‎‏‎‎‎‏‎‎‎‎‏‏‏‏‏‎‏‏‎‏‎‏‎‏‎‏‏‏‎‏‏‏‎‎‎‎‎‎‎‎‏‎‎‎‎‎‏‎‏‏‏‏‎‎‎color temperature D65 D73 white yellow blue warm cool‎‏‎‎‏‎"</string>
+    <string name="keywords_lockscreen" msgid="5746561909668570047">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‏‏‏‏‏‎‏‏‏‏‏‏‏‏‏‎‎‎‏‏‏‎‎‏‏‏‎‎‎‎‏‏‏‎‎‏‏‎‎‏‎‏‎‏‏‏‏‎‎‎‏‏‏‎‏‏‏‏‏‏‎slide to unlock, password, pattern, PIN‎‏‎‎‏‎"</string>
+    <string name="keywords_profile_challenge" msgid="789611397846512845">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‎‏‎‏‎‏‏‏‏‎‏‎‏‎‏‎‎‎‎‏‏‎‏‏‎‎‎‎‏‏‏‏‏‏‏‏‏‎‎‏‏‏‏‎‏‏‎‏‏‎‏‎‎‏‏‎‎‏‏‎‏‎work challenge, work, profile‎‏‎‎‏‎"</string>
+    <string name="keywords_unification" msgid="1922900767659821025">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‏‎‏‎‏‎‏‎‏‏‏‏‏‎‎‎‎‏‎‎‎‎‎‎‏‏‏‏‎‏‏‎‏‎‏‎‏‎‏‏‎‎‎‎‏‎‎‎‎‏‏‏‏‏‏‎‎‎‎‏‎work profile, managed profile, unify, unification, work, profile‎‏‎‎‏‎"</string>
+    <string name="keywords_gesture" msgid="3526905012224714078">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‎‎‎‎‏‏‏‏‎‎‏‎‎‎‎‏‎‏‎‏‎‏‏‎‏‏‎‎‎‎‎‏‏‎‏‎‎‎‏‏‎‎‏‎‏‏‏‎‎‏‎‏‎‏‎‏‏‏‏‎‎gestures‎‏‎‎‏‎"</string>
+    <string name="keywords_payment_settings" msgid="5220104934130446416">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‏‎‎‎‎‏‏‏‎‎‎‏‏‎‎‎‏‎‎‏‏‏‎‎‎‏‏‏‏‏‎‎‎‎‎‏‎‎‎‏‏‎‏‏‏‏‏‏‎‎‎‎‎‏‎‏‎‎‎‎‎pay, tap, payments‎‏‎‎‏‎"</string>
+    <string name="keywords_backup" msgid="470070289135403022">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‎‏‏‏‏‎‏‎‎‎‎‏‏‎‎‎‎‎‎‏‏‎‎‏‏‎‏‏‏‏‏‏‏‏‏‎‏‏‎‏‏‎‎‎‎‏‏‎‎‎‎‎‎‎‎‎‎‎‏‏‏‎‎backup, back up‎‏‎‎‏‎"</string>
+    <string name="keywords_assist_gesture_launch" msgid="813968759791342591">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‎‏‎‏‏‎‏‎‎‏‎‏‏‏‏‎‎‏‏‎‎‎‏‎‎‎‏‏‎‎‏‎‎‎‎‎‏‏‎‏‎‎‎‎‎‏‏‎‏‎‎‏‏‏‏‏‏‏‏‏‏‎gesture‎‏‎‎‏‎"</string>
+    <string name="setup_wifi_nfc_tag" msgid="9028353016222911016">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‏‏‎‏‎‏‎‎‏‎‏‏‎‎‏‎‎‏‏‏‎‎‏‏‏‎‏‏‏‏‏‎‎‏‏‎‏‏‎‎‏‎‏‏‎‎‎‎‏‎‏‎‎‎‏‎‏‎‎‎‎Set up Wi-Fi NFC Tag‎‏‎‎‏‎"</string>
+    <string name="write_tag" msgid="8571858602896222537">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‎‏‏‎‏‏‏‏‎‏‎‏‎‏‎‏‏‎‏‏‏‏‏‏‏‎‏‏‏‏‎‏‎‎‏‎‏‎‎‎‎‎‎‏‎‏‏‎‏‎‎‏‎‏‎‎‏‎‎‏‎Write‎‏‎‎‏‎"</string>
+    <string name="status_awaiting_tap" msgid="2130145523773160617">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‏‏‎‏‏‎‎‎‏‏‏‏‏‏‎‎‏‏‎‎‎‎‎‏‎‎‎‏‎‏‏‎‎‎‎‎‎‏‏‎‎‎‏‏‎‎‏‏‏‏‎‎‏‎‏‎‏‎‎‏‎Tap a tag to write...‎‏‎‎‏‎"</string>
+    <string name="status_invalid_password" msgid="2575271864572897406">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‎‎‏‏‏‎‏‏‏‏‎‏‎‎‏‏‎‏‎‎‎‎‎‏‏‏‎‏‏‏‎‎‏‏‏‏‏‏‏‎‏‏‎‎‏‏‏‎‏‎‎‎‎‏‏‏‏‏‏‎‎Invalid password, try again.‎‏‎‎‏‎"</string>
+    <string name="status_write_success" msgid="5228419086308251169">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‏‎‎‎‏‎‎‎‏‏‏‏‎‎‎‏‎‎‏‏‎‏‏‏‎‏‎‏‎‎‏‎‏‎‎‎‎‏‎‎‎‏‏‎‏‎‎‏‎‏‏‎‎‎‏‎‎‎‎‏‎Success!‎‏‎‎‏‎"</string>
+    <string name="status_failed_to_write" msgid="8072752734686294718">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‎‎‎‎‎‎‎‎‏‎‎‎‎‎‏‎‏‏‎‏‏‏‎‏‎‏‏‏‎‏‎‎‎‏‏‎‏‎‎‎‏‎‏‎‎‎‏‏‎‎‏‎‏‎‏‏‏‏‏‎‎Unable to write data to NFC tag. If the problem persists, try a different tag‎‏‎‎‏‎"</string>
+    <string name="status_tag_not_writable" msgid="2511611539977682175">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‎‎‏‎‏‏‎‏‏‎‏‏‎‎‎‎‏‎‎‏‎‏‏‎‎‎‏‏‎‏‏‏‎‏‏‎‎‎‏‎‎‏‎‎‎‎‏‏‏‏‎‎‏‏‏‏‏‏‏‏‎NFC tag is not writable. 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_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>
+    <string name="media_volume_option_title" msgid="2811531786073003825">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‏‎‎‎‏‎‏‎‎‎‎‏‏‎‏‏‎‎‏‏‏‏‎‎‏‏‎‎‏‏‏‎‏‎‏‏‏‎‎‏‏‎‎‎‏‎Media volume‎‏‎‎‏‎"</string>
+    <string name="alarm_volume_option_title" msgid="8219324421222242421">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‎‎‏‎‎‎‎‏‎‎‎‎‏‏‏‎‏‎‎‎‎‎‎‎‎‎‏‏‎‏‏‎‎‏‎‎‏‎‏‎‎‏‎‏‎‎‎‏‏‎‎‎‎‏‏‏‎‏‎‏‎Alarm volume‎‏‎‎‏‎"</string>
+    <string name="ring_volume_option_title" msgid="6767101703671248309">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‏‏‎‏‏‏‏‎‏‎‎‏‏‎‎‏‎‎‏‏‎‎‏‎‎‏‎‏‎‏‎‏‎‏‏‎‎‏‎‎‎‎‏‏‏‏‏‏‎‏‎‏‏‎‏‏‎‏‎‏‎Ring volume‎‏‎‎‏‎"</string>
+    <string name="notification_volume_option_title" msgid="6064656124416882130">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‎‏‎‎‎‎‏‎‏‎‎‏‏‏‏‏‏‏‎‎‏‎‎‏‏‏‎‎‏‏‏‏‏‏‎‎‏‏‎‎‎‎‏‏‏‏‏‏‎‏‎‏‏‏‎‏‎‎‏‎‎Notification volume‎‏‎‎‏‎"</string>
+    <string name="ringtone_title" msgid="5379026328015343686">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‏‎‏‎‏‎‏‎‎‏‏‎‎‎‏‎‎‎‏‏‏‏‏‏‎‎‏‎‎‎‏‎‏‏‏‎‏‏‎‏‎‏‎‎‎‎‎‏‎‎‎‎‎‏‎‎‎‏‏‎‎Phone ringtone‎‏‎‎‏‎"</string>
+    <string name="notification_ringtone_title" msgid="4468722874617061231">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‏‏‏‎‎‎‎‎‎‏‎‎‎‎‎‏‎‏‏‏‏‏‎‎‎‏‏‏‎‎‏‏‎‏‎‏‎‎‏‏‎‏‏‎‎‏‎‏‏‏‏‏‎‏‏‎‏‏‏‏‎Default notification sound‎‏‎‎‏‎"</string>
+    <string name="notification_unknown_sound_title" msgid="2535027767851838335">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‎‎‏‏‎‎‏‎‏‏‏‎‎‎‏‏‏‎‏‎‎‏‎‏‎‎‏‎‏‏‎‏‏‏‏‎‏‎‎‎‏‏‏‏‎‏‏‎‏‎‏‏‎‏‏‏‏‏‏‏‎App provided sound‎‏‎‎‏‎"</string>
+    <string name="notification_sound_default" msgid="565135733949733766">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‎‏‏‏‏‏‏‏‎‏‎‏‏‏‏‏‎‎‎‎‏‏‏‏‏‏‎‏‎‎‏‎‏‎‏‏‏‏‏‏‏‏‎‏‎‎‎‎‎‏‏‎‏‏‏‎‎‎‎‏‏‎‎Default notification sound‎‏‎‎‏‎"</string>
+    <string name="alarm_ringtone_title" msgid="6344025478514311386">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‏‎‎‎‎‎‎‎‏‎‏‎‏‎‎‎‎‎‎‏‏‎‎‎‏‏‏‏‏‎‎‎‎‏‎‎‏‏‎‏‏‏‏‏‏‎‎‎‎‎‎‎‏‏‎‏‏‎‏‎‎Default alarm sound‎‏‎‎‏‎"</string>
+    <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="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>
+    <string name="vibrate_on_touch_title" msgid="5388579924689395023">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‏‎‏‎‏‏‎‎‏‎‎‎‎‎‎‏‎‏‎‎‏‏‏‎‎‏‎‎‎‎‏‏‏‏‏‎‏‏‏‎‏‎‎‏‏‎‎‏‏‏‎‏‎‏‎‎‏‏‏‏‎Vibrate on tap‎‏‎‎‏‎"</string>
+    <string name="dock_audio_media_title" msgid="1346838179626123900">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‎‎‏‎‏‎‏‏‎‎‎‎‏‏‏‎‏‏‏‎‎‎‏‏‎‎‎‎‎‏‎‎‎‎‏‎‏‎‎‎‏‏‎‎‏‎‎‎‎‎‏‎‎‏‏‏‏‏‎‎‎Dock speaker plays‎‏‎‎‏‎"</string>
+    <string name="dock_audio_media_disabled" msgid="3430953622491538080">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‏‏‏‏‏‎‎‏‏‏‎‏‎‎‏‏‎‎‏‎‎‎‏‎‎‏‎‎‎‏‎‎‎‏‎‏‎‏‏‏‎‎‏‎‏‎‏‎‎‎‏‎‏‎‏‎‎‎‎‎‎All audio‎‏‎‎‏‎"</string>
+    <string name="dock_audio_media_enabled" msgid="667849382924908673">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‎‏‎‎‏‎‏‎‎‎‏‎‎‏‎‏‎‏‏‎‏‎‏‏‏‏‎‎‏‏‎‏‏‎‎‎‎‏‎‏‏‎‎‏‏‏‏‏‏‏‎‎‎‏‎‎‎‎‎‎‏‎Media audio only‎‏‎‎‏‎"</string>
+    <string name="emergency_tone_silent" msgid="1067515631635824291">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‎‏‏‏‎‏‏‎‏‎‎‎‎‏‎‎‏‎‎‏‏‏‏‎‎‏‏‏‏‏‎‎‏‏‏‏‏‏‏‎‏‎‏‎‎‎‏‏‏‏‏‏‎‏‎‏‎‎‎‏‏‎Silent‎‏‎‎‏‎"</string>
+    <string name="emergency_tone_alert" msgid="8941852695428130667">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‏‏‎‎‎‎‎‏‎‏‏‏‏‏‎‏‎‏‏‏‏‎‏‎‎‏‏‎‏‎‎‎‏‎‎‎‏‏‎‏‏‏‎‎‏‏‏‎‎‏‏‏‎‏‏‎‏‎‏‏‎Alert‎‏‎‎‏‎"</string>
+    <string name="emergency_tone_vibrate" msgid="8281126443204950847">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‎‎‏‎‏‏‏‎‏‏‎‎‎‏‏‏‏‎‎‎‏‎‎‏‏‏‏‏‏‏‏‏‎‎‏‏‎‏‎‏‎‎‏‏‎‎‏‏‏‎‏‏‎‎‏‏‏‏‏‏‎Vibrate‎‏‎‎‏‎"</string>
+    <string name="boot_sounds_title" msgid="567029107382343709">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‎‏‏‏‏‏‏‏‎‏‏‏‏‎‎‏‏‏‏‏‎‏‏‏‏‏‏‎‎‎‎‎‎‎‏‎‏‎‏‏‎‏‎‏‎‎‏‏‎‏‏‎‎‎‎‎‎‏‏‏‎‏‎Power on sounds‎‏‎‎‏‎"</string>
+    <string name="zen_mode_settings_summary_off" msgid="1857165567766351925">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‏‎‎‏‏‏‎‎‎‏‎‏‏‏‏‏‏‎‏‎‎‎‏‏‏‏‏‎‏‎‎‎‎‎‏‏‏‏‎‎‏‏‎‎‏‏‎‏‎‎‎‎‎‎‏‏‎‏‎‏‎No automatic rules turned on‎‏‎‎‏‎"</string>
+    <plurals name="zen_mode_settings_summary_on" formatted="false" msgid="1216562765753405784">
+      <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_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>
+    <string name="zen_mode_automation_suggestion_summary" msgid="4732808039946935657">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‎‎‎‏‏‎‏‎‏‏‏‎‎‏‎‎‏‏‏‏‏‏‎‏‎‏‏‎‎‎‏‏‏‎‏‏‎‎‏‎‎‏‏‎‎‏‎‏‏‏‎‏‎‏‏‎‏‎‎‏‎Limit sounds &amp; vibrations at certain times‎‏‎‎‏‎"</string>
+    <string name="zen_mode_option_important_interruptions" msgid="3903928008177972500">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‎‏‏‎‎‎‏‎‏‏‎‏‏‎‎‎‏‎‎‏‏‏‎‏‎‏‏‎‏‏‏‎‏‏‎‎‎‎‏‎‎‏‎‏‎‏‏‏‎‏‎‏‎‎‎‏‎‏‎‎‎Priority only‎‏‎‎‏‎"</string>
+    <string name="zen_mode_option_alarms" msgid="5785372117288803600">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‎‎‎‎‎‏‎‎‏‎‎‏‏‏‎‎‎‏‎‏‎‏‎‎‏‎‎‏‏‏‎‏‏‎‎‎‎‏‏‏‎‎‏‎‏‏‎‏‏‏‎‏‎‎‎‏‎‎‎‎‎Alarms only‎‏‎‎‏‎"</string>
+    <string name="zen_mode_option_no_interruptions" msgid="8107126344850276878">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‎‎‎‎‏‎‎‎‎‎‏‎‎‏‎‎‏‏‎‎‎‏‏‏‎‏‎‏‎‎‎‎‏‏‏‎‎‎‎‎‎‎‏‏‎‎‎‎‎‎‏‎‎‎‎‎‏‏‏‎‎Total silence‎‏‎‎‏‎"</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">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‏‏‎‏‏‎‏‏‎‎‏‎‏‏‏‎‎‎‏‏‎‏‎‏‎‏‎‎‏‏‏‏‎‏‏‏‎‎‎‎‎‏‏‏‎‎‏‏‎‏‏‎‏‎‏‏‎‏‎‎‎Block visual disturbances‎‏‎‎‏‎"</string>
+    <string name="sound_work_settings" msgid="6774324553228566442">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‏‏‏‎‎‎‎‎‎‎‏‏‎‎‏‏‏‏‎‎‎‏‎‎‏‎‏‎‎‎‎‎‏‏‎‎‎‏‏‎‎‏‎‏‎‎‏‏‏‏‏‏‏‎‏‎‏‎‏‎‎Work profile sounds‎‏‎‎‏‎"</string>
+    <string name="work_use_personal_sounds_title" msgid="1148331221338458874">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‎‏‏‏‏‏‏‏‎‏‏‏‏‏‎‏‏‎‎‎‏‎‎‏‎‏‎‎‏‎‏‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‎‎‎‏‎‏‎‏‏‏‏‏‎‏‎‎Use personal profile sounds‎‏‎‎‏‎"</string>
+    <string name="work_use_personal_sounds_summary" msgid="6207040454949823153">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‎‏‏‎‎‎‏‎‎‎‏‏‏‏‎‏‎‏‏‎‎‏‏‎‏‎‎‎‎‏‎‎‏‏‏‏‏‏‎‎‎‎‏‏‎‏‏‎‎‎‏‎‏‎‏‏‎‎‎‏‎Sounds are the same for work and personal profiles‎‏‎‎‏‎"</string>
+    <string name="work_ringtone_title" msgid="5806657896300235315">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‎‎‎‎‏‎‎‏‎‏‎‏‎‏‏‎‎‏‎‎‏‎‎‏‎‏‏‏‎‏‏‏‏‎‎‏‎‎‏‏‎‎‎‏‎‏‎‎‏‎‏‎‎‎‏‏‎‎‏‏‎Work phone ringtone‎‏‎‎‏‎"</string>
+    <string name="work_notification_ringtone_title" msgid="6081247402404510004">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‎‏‎‎‎‏‏‎‎‏‎‎‏‏‏‎‏‏‏‎‎‏‎‎‏‎‏‎‏‏‏‎‏‎‏‏‏‎‎‏‎‏‏‎‎‏‏‏‏‎‎‏‎‎‏‏‎‏‎‎‎Default work notification sound‎‏‎‎‏‎"</string>
+    <string name="work_alarm_ringtone_title" msgid="1441926676833738891">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‎‏‎‎‎‎‎‎‎‎‏‎‏‏‎‎‎‎‎‎‏‎‏‎‏‏‎‎‎‏‎‎‎‏‎‎‏‏‎‏‎‏‎‏‏‎‏‎‎‎‎‎‏‎‎‎‏‎‏‏‎Default work alarm sound‎‏‎‎‏‎"</string>
+    <string name="work_sound_same_as_personal" msgid="3123383644475266478">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‏‎‏‏‎‏‎‏‏‎‎‎‎‏‏‏‏‏‎‎‏‏‏‎‎‎‎‎‎‏‎‏‎‎‏‎‎‎‏‏‎‏‏‎‏‎‎‏‎‏‎‏‏‎‏‎‏‏‏‎‎Same as personal profile‎‏‎‎‏‎"</string>
+    <string name="work_sync_dialog_title" msgid="7123973297187354813">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‎‎‏‎‏‏‎‏‏‏‎‏‎‏‏‎‏‏‏‏‏‏‏‏‏‎‎‎‎‎‏‎‏‎‎‎‎‎‏‏‏‎‎‎‎‏‏‏‏‎‎‎‏‎‏‏‏‏‎‏‎Replace sounds?‎‏‎‎‏‎"</string>
+    <string name="work_sync_dialog_yes" msgid="7243884940551635717">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‎‏‎‎‏‎‎‎‎‏‏‏‎‏‏‏‎‎‏‎‏‏‏‏‏‎‎‏‎‏‎‎‎‎‏‏‎‏‏‎‎‎‎‏‏‏‎‎‎‎‏‏‎‎‎‎‎‏‎‏‎Replace‎‏‎‎‏‎"</string>
+    <string name="work_sync_dialog_message" msgid="7841728953710863208">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‏‏‎‎‏‏‎‏‎‎‏‏‎‏‏‎‏‎‏‎‏‏‏‎‏‏‏‏‏‎‏‎‎‏‏‎‏‏‎‏‎‏‎‎‏‏‏‎‎‎‏‏‎‏‏‎‏‎‎‎‎Your personal profile sounds will be used for your work profile‎‏‎‎‏‎"</string>
+    <string name="ringtones_install_custom_sound_title" msgid="5948792721161302255">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‎‎‏‎‏‎‎‎‏‏‏‎‎‏‎‏‏‎‏‏‎‏‏‏‎‏‏‎‎‎‏‏‏‎‏‏‎‎‏‏‏‏‏‏‏‎‏‏‎‎‎‎‏‏‏‎‏‏‏‏‎Add custom sound?‎‏‎‎‏‎"</string>
+    <string name="ringtones_install_custom_sound_content" msgid="2195581481608512786">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‏‏‏‎‎‏‏‏‏‎‎‎‎‏‎‎‎‏‎‏‏‎‏‏‏‎‎‏‏‎‎‎‏‏‏‎‏‎‏‏‎‎‏‏‏‎‎‎‎‏‎‏‎‎‎‏‎‎‏‎‎This file will be copied to the ‎‏‎‎‏‏‎<xliff:g id="FOLDER_NAME">%s</xliff:g>‎‏‎‎‏‏‏‎ folder‎‏‎‎‏‎"</string>
+    <string name="ringtones_category_preference_title" msgid="5675912303120102366">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‏‏‏‎‏‏‎‎‎‏‎‎‏‏‏‎‎‏‎‎‎‎‏‎‏‎‏‎‏‏‎‏‏‎‏‏‏‎‏‏‏‏‏‎‎‎‏‏‎‎‏‏‏‏‎‏‏‏‏‎‎Ringtones‎‏‎‎‏‎"</string>
+    <string name="other_sound_category_preference_title" msgid="2521096636124314015">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‎‎‏‎‏‏‏‏‏‏‎‎‏‎‏‏‏‏‎‎‎‎‎‎‏‎‎‎‏‎‎‎‎‎‎‎‏‎‎‏‏‏‏‏‎‎‏‏‏‎‎‏‏‎‎‏‏‏‏‏‎Other sounds and vibrations‎‏‎‎‏‎"</string>
+    <string name="configure_notification_settings" msgid="7616737397127242615">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‏‎‎‏‏‎‏‏‎‏‎‎‎‎‎‏‎‏‏‎‎‏‎‎‏‏‏‎‏‎‏‏‎‏‏‏‎‎‏‏‎‎‏‏‏‏‏‎‎‎‏‏‎‏‏‏‎‏‏‏‎Notifications‎‏‎‎‏‎"</string>
+    <string name="advanced_section_header" msgid="8833934850242546903">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‏‎‏‎‏‎‎‏‏‎‎‎‎‏‏‏‎‎‎‎‏‏‏‏‎‎‎‏‎‎‏‎‏‏‎‏‏‎‏‎‎‏‏‎‏‎‎‎‏‏‎‎‏‏‎‏‎‏‏‏‎Advanced‎‏‎‎‏‎"</string>
+    <string name="profile_section_header" msgid="2320848161066912001">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‎‎‎‎‎‎‏‏‎‏‎‏‎‏‎‎‏‏‏‏‎‎‎‏‏‎‏‏‎‎‏‎‏‎‏‎‎‎‎‎‎‎‏‏‎‎‎‎‏‎‎‏‎‎‎‎‎‎‎‏‎Work notifications‎‏‎‎‏‎"</string>
+    <string name="notification_badging_title" msgid="5938709971403474078">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‎‎‏‎‎‏‏‎‏‎‏‎‏‎‎‎‏‎‎‏‎‏‎‎‎‎‎‏‎‎‎‏‏‏‎‏‏‎‎‏‎‎‏‏‎‎‎‎‎‏‎‎‏‎‎‏‏‏‏‎‎Allow notification dots‎‏‎‎‏‎"</string>
+    <string name="notification_pulse_title" msgid="1905382958860387030">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‏‎‏‎‎‏‏‏‎‎‎‏‎‏‎‎‎‏‏‏‏‎‏‏‎‏‎‎‏‎‏‏‎‏‏‏‏‏‏‏‎‏‎‎‏‏‎‎‎‎‏‎‏‏‎‏‎‏‏‎‎Blink light‎‏‎‎‏‎"</string>
+    <string name="lock_screen_notifications_title" msgid="6173076173408887213">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‎‏‎‏‏‎‏‎‏‎‏‏‎‎‏‎‏‏‎‎‎‎‎‏‎‎‏‎‏‏‎‎‎‏‏‏‎‏‏‏‎‏‏‎‏‏‏‎‎‎‎‏‏‎‏‎‏‏‎‏‎On the lock screen‎‏‎‎‏‎"</string>
+    <string name="lock_screen_notifications_summary_show" msgid="6407527697810672847">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‏‎‎‎‏‏‏‎‏‏‎‎‎‎‎‏‏‏‎‎‎‏‏‏‏‏‏‎‎‎‎‏‏‏‎‎‎‏‏‏‏‎‏‏‎‏‎‎‏‏‎‎‏‏‎‎‏‏‏‏‎Show all notification content‎‏‎‎‏‎"</string>
+    <string name="lock_screen_notifications_summary_hide" msgid="7891552853357258782">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‏‏‎‏‏‎‎‎‎‏‎‎‎‏‏‎‏‏‎‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‏‎‏‎‎‏‎‏‎‎‎‏‏‎‏‎‎‎‎‎‎‏‏‏‏‎‎Hide sensitive notification content‎‏‎‎‏‎"</string>
+    <string name="lock_screen_notifications_summary_disable" msgid="859628910427886715">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‎‏‎‏‏‏‏‏‎‏‏‏‎‎‎‎‎‎‎‏‏‏‏‏‏‎‎‎‎‏‎‎‎‎‏‎‎‏‎‏‏‎‏‎‏‏‏‎‏‎‏‎‎‎‏‏‏‏‎‏‏‎Don’t show notifications at all‎‏‎‎‏‎"</string>
+    <string name="lock_screen_notifications_interstitial_message" msgid="6164532459432182244">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‎‏‎‏‏‎‎‎‏‏‎‎‏‏‎‏‎‎‎‏‏‎‎‏‏‏‎‎‎‏‎‏‏‎‏‎‏‏‎‏‎‎‏‎‎‎‎‎‎‎‎‏‏‏‏‎‎‏‎‎‎When your device is locked, how do you want notifications to show?‎‏‎‎‏‎"</string>
+    <string name="lock_screen_notifications_interstitial_title" msgid="1416589393106326972">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‎‎‏‏‏‎‏‎‏‎‎‎‏‎‏‏‏‏‎‎‏‎‎‎‏‏‎‎‎‎‏‏‎‎‎‎‏‎‏‏‎‎‎‎‎‏‎‏‎‏‎‏‏‎‏‏‏‏‎‎‎Notifications‎‏‎‎‏‎"</string>
+    <string name="lock_screen_notifications_summary_show_profile" msgid="835870815661120772">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‎‏‎‏‏‏‎‎‏‏‎‎‏‏‎‎‏‏‏‎‎‎‎‎‏‎‏‎‎‎‎‎‎‎‏‎‏‏‎‎‏‏‎‎‎‏‏‎‏‏‏‎‏‎‎‎‎‎‏‎‎‎Show all work notification content‎‏‎‎‏‎"</string>
+    <string name="lock_screen_notifications_summary_hide_profile" msgid="256116258285695645">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‎‏‎‏‏‏‎‎‎‏‏‎‏‏‏‏‎‏‎‎‎‎‏‏‎‎‎‎‏‎‏‎‎‎‏‎‎‎‏‎‏‎‎‏‎‎‎‏‏‎‎‏‎‏‎‎‏‏‏‎‏‎Hide sensitive work notification content‎‏‎‎‏‎"</string>
+    <string name="lock_screen_notifications_summary_disable_profile" msgid="4080720698960233358">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‏‎‎‎‏‎‏‎‎‎‎‏‏‎‏‎‎‎‎‏‏‏‎‏‏‎‏‎‏‏‏‎‏‎‎‏‎‎‎‏‏‎‏‏‏‏‎‎‎‎‏‏‏‎‎‎‏‏‏‎‎Don’t show work notifications at all‎‏‎‎‏‎"</string>
+    <string name="lock_screen_notifications_interstitial_message_profile" msgid="8307705621027472346">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‎‎‏‏‎‏‎‎‏‎‏‎‏‏‏‎‎‏‏‎‎‎‏‏‏‏‏‏‎‎‎‎‎‏‏‏‏‏‎‏‏‎‏‏‏‏‎‎‎‎‏‏‏‏‎‏‏‎‏‎‎When your device is locked, how do you want profile notifications to show?‎‏‎‎‏‎"</string>
+    <string name="lock_screen_notifications_interstitial_title_profile" msgid="3169806586032521333">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‏‎‏‏‏‏‏‏‏‏‎‏‎‏‏‎‏‎‏‎‎‏‎‎‏‎‏‏‏‎‏‎‏‏‏‏‎‎‏‎‏‎‎‏‏‎‎‎‎‎‎‎‎‏‏‏‎‏‎‏‎Profile notifications‎‏‎‎‏‎"</string>
+    <string name="notifications_title" msgid="8086372779371204971">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‎‎‎‎‎‎‏‏‏‎‎‎‏‎‎‏‎‎‎‏‎‎‏‏‎‎‏‏‎‎‎‎‏‎‏‏‏‏‎‎‏‏‏‏‎‎‎‏‎‎‎‏‎‏‏‎‏‎‏‏‎Notifications‎‏‎‎‏‎"</string>
+    <string name="app_notifications_title" msgid="5810577805218003760">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‎‎‎‎‏‎‏‎‎‎‏‏‎‏‎‏‎‎‎‏‏‎‏‏‏‎‏‎‎‏‏‎‎‎‏‏‏‏‎‎‏‎‎‏‏‎‏‏‏‎‏‏‎‎‏‏‎‎‎‎‎App notifications‎‏‎‎‏‎"</string>
+    <string name="notification_channel_title" msgid="2260666541030178452">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‏‏‏‏‎‏‎‏‏‏‏‏‏‎‎‎‎‎‎‎‎‎‏‏‏‏‎‏‏‏‎‏‎‏‎‏‏‎‏‏‎‏‏‎‏‏‏‏‏‏‏‎‏‎‎‏‎‏‎‎‎Notification category‎‏‎‎‏‎"</string>
+    <string name="notification_group_title" msgid="7180506440133859601">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‎‎‏‏‏‎‏‎‎‏‏‎‎‏‎‎‏‎‎‎‏‎‎‏‎‎‎‎‎‎‏‏‎‏‏‏‏‎‎‏‎‏‎‏‎‏‎‏‏‎‎‏‎‎‎‏‎‎‎‏‎Notification category group‎‏‎‎‏‎"</string>
+    <string name="notification_importance_title" msgid="848692592679312666">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‎‏‎‏‏‏‏‎‎‎‏‏‏‎‎‏‎‏‎‎‏‎‏‏‎‏‎‏‎‏‎‎‏‏‏‏‎‎‎‏‎‎‏‏‏‏‏‎‏‏‏‎‏‎‎‎‏‏‎‏‎‎Importance‎‏‎‎‏‎"</string>
+    <string name="notification_importance_unspecified" msgid="6622173510486113958">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‏‎‏‏‏‏‏‎‎‏‏‎‏‎‏‎‏‏‏‏‏‎‏‏‏‎‎‎‏‏‎‏‎‏‎‏‏‎‎‎‎‏‏‎‏‎‏‏‏‏‏‎‏‎‏‎‎‏‏‎‎Allow sound‎‏‎‎‏‎"</string>
+    <string name="notification_importance_blocked" msgid="7938180808339386300">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‏‏‏‎‎‎‏‎‏‎‏‎‎‎‎‏‎‏‎‏‎‏‏‎‎‎‏‏‎‎‎‎‏‎‏‏‏‏‏‎‎‏‎‎‎‏‏‎‏‏‏‏‏‎‏‏‏‏‎‎‎Never show notifications‎‏‎‎‏‎"</string>
+    <string name="notification_importance_min" msgid="5455049524984686275">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‏‎‏‏‏‎‏‏‎‏‎‎‎‎‏‏‏‎‏‎‏‎‏‎‎‏‎‎‎‎‎‏‎‎‎‎‏‏‏‎‎‎‎‎‎‎‏‎‎‏‏‎‏‏‎‎‎‎‏‏‎No sound or visual interruption‎‏‎‎‏‎"</string>
+    <string name="notification_importance_low" msgid="8881468429453766553">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‏‎‏‏‎‏‎‎‎‎‎‏‎‏‎‏‎‎‎‎‎‏‏‏‏‎‏‏‎‎‎‎‎‏‎‏‎‏‏‏‎‎‎‎‎‎‏‎‏‏‏‏‏‎‎‏‏‎‎‏‎No sound‎‏‎‎‏‎"</string>
+    <string name="notification_importance_default" msgid="5958338024601957516">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‎‎‏‎‏‎‏‏‎‎‎‎‎‏‎‎‎‏‎‎‏‏‎‏‏‏‎‏‎‏‏‎‎‎‎‎‎‎‎‏‏‎‏‎‎‎‏‏‎‏‎‎‏‎‎‎‏‏‎‎‎Make sound‎‏‎‎‏‎"</string>
+    <string name="notification_importance_high" msgid="2082429479238228527">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‏‏‎‎‏‏‏‎‎‏‏‎‎‏‎‎‎‏‏‎‏‎‎‏‎‏‎‎‎‎‎‎‎‎‏‏‏‏‎‎‏‎‏‏‏‏‎‏‏‎‏‎‎‎‏‎‏‏‏‏‎Make sound and pop on screen‎‏‎‎‏‎"</string>
+    <string name="notification_importance_high_silent" msgid="2667033773703765252">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‎‏‎‏‎‎‎‎‎‎‏‏‎‎‏‏‎‏‎‏‎‎‎‏‎‏‏‎‎‎‏‎‏‏‎‏‏‎‎‏‎‏‎‏‎‎‎‏‏‏‎‏‎‎‎‎‎‏‎‎‎Pop on screen‎‏‎‎‏‎"</string>
+    <string name="notification_importance_min_title" msgid="6974673091137544803">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‎‎‎‎‏‏‎‎‏‎‏‏‎‎‎‎‎‏‎‎‎‎‏‏‏‎‎‏‎‎‎‏‎‏‎‏‏‎‏‏‏‎‏‎‏‎‏‎‎‎‏‎‎‏‏‎‎‎‏‏‎Low‎‏‎‎‏‎"</string>
+    <string name="notification_importance_low_title" msgid="8131254047772814309">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‎‎‎‎‏‏‎‏‏‎‎‎‎‎‎‎‎‏‎‎‎‏‏‏‏‎‎‏‏‎‏‎‎‏‏‏‏‏‏‏‎‏‎‎‏‎‏‎‏‎‏‏‏‏‏‎‎‏‎‏‎Medium‎‏‎‎‏‎"</string>
+    <string name="notification_importance_default_title" msgid="9120383978536089489">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‏‏‏‎‏‎‎‏‎‎‏‎‎‎‎‏‏‏‎‎‏‏‏‎‏‎‎‎‎‎‎‏‎‏‏‏‏‏‎‎‏‏‏‎‏‎‏‏‎‏‏‏‏‎‎‏‎‎‎‏‎High‎‏‎‎‏‎"</string>
+    <string name="notification_importance_high_title" msgid="3058778300264746473">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‏‎‏‎‎‏‏‏‎‎‏‎‏‏‏‏‎‏‏‎‏‎‏‎‏‎‎‎‎‏‏‏‎‎‎‏‏‏‏‏‎‏‎‎‎‎‎‎‏‏‎‏‏‏‏‎‏‎‎‏‎Urgent‎‏‎‎‏‎"</string>
+    <string name="allow_interruption" msgid="7136150018111848721">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‎‎‏‏‎‎‎‎‏‎‎‎‏‎‏‏‎‎‏‎‏‎‏‎‎‎‎‏‏‏‏‎‏‏‎‏‎‏‏‏‎‏‎‎‎‏‎‎‎‎‎‏‎‎‎‏‎‎‎‏‎Allow interruptions‎‏‎‎‏‎"</string>
+    <string name="allow_interruption_summary" msgid="7870159391333957050">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‏‏‎‏‎‎‏‏‏‎‎‎‎‏‏‎‏‏‎‎‎‏‎‎‎‏‎‎‏‎‏‏‏‏‏‎‎‎‏‎‏‎‏‎‎‎‏‏‏‏‎‏‏‎‏‏‏‎‏‎‎Let the app make sound, vibrate, and/or pop notifications on screen‎‏‎‎‏‎"</string>
+    <string name="notification_channel_summary_min" msgid="5401718014765921892">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‏‎‏‎‏‏‏‏‎‏‏‎‏‏‎‎‎‎‎‏‏‏‏‎‏‎‏‎‎‎‏‏‎‏‏‎‏‏‏‏‎‎‏‏‎‏‏‏‎‏‏‎‎‏‏‎‎‏‎‎‎Low importance‎‏‎‎‏‎"</string>
+    <string name="notification_channel_summary_low" msgid="322317684244981244">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‎‏‏‏‎‎‎‏‏‏‏‎‎‏‎‎‎‏‏‎‏‎‎‎‏‏‏‎‎‏‏‏‏‎‎‎‏‎‎‎‏‏‏‏‏‏‏‎‏‎‎‏‎‏‏‏‏‏‏‏‎‎‎Medium importance‎‏‎‎‏‎"</string>
+    <string name="notification_channel_summary_default" msgid="1111749130423589931">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‎‏‏‏‏‎‏‏‎‏‏‎‏‏‎‏‏‏‎‎‏‏‏‏‏‎‎‎‏‏‎‎‏‏‏‏‎‎‎‏‏‏‏‏‏‎‏‎‏‏‏‎‎‎‎‏‎‏‎‏‏‎High importance‎‏‎‎‏‎"</string>
+    <string name="notification_channel_summary_high" msgid="2085017556511003283">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‏‏‎‎‏‏‏‎‏‏‏‏‎‏‏‏‏‎‎‎‎‏‏‎‏‎‏‏‏‎‏‏‎‏‏‎‎‏‎‎‏‎‏‎‏‎‎‏‎‎‏‎‏‎‎‏‎‎‏‏‎Urgent importance‎‏‎‎‏‎"</string>
+    <string name="default_notification_assistant" msgid="7631945224761430146">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‏‎‎‏‏‏‏‎‏‎‏‎‎‎‎‏‏‏‎‏‏‎‏‏‏‏‏‏‎‎‎‎‎‎‏‏‎‎‏‎‎‏‎‎‏‏‎‏‎‎‎‎‏‎‎‎‎‎‏‎‎Notification assistant‎‏‎‎‏‎"</string>
+    <string name="manage_notification_access_title" msgid="7510080164564944891">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‏‎‎‎‎‎‏‏‏‎‎‏‎‎‏‎‏‎‏‎‎‎‎‏‏‏‏‎‏‎‎‏‏‎‏‏‏‎‎‏‏‎‎‏‏‏‎‎‎‏‏‏‏‏‏‏‏‎‏‏‎Notification access‎‏‎‎‏‎"</string>
+    <string name="work_profile_notification_access_blocked_summary" msgid="8748026238701253040">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‏‎‎‏‎‏‏‎‎‏‏‏‎‎‏‏‏‎‏‏‏‎‎‎‎‎‏‏‏‏‎‏‏‎‏‏‏‎‎‏‎‏‎‏‏‎‏‏‎‎‎‏‏‎‏‏‎‎‎‎‎Access to work profile notifications is blocked‎‏‎‎‏‎"</string>
+    <string name="manage_notification_access_summary_zero" msgid="2409912785614953348">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‎‎‎‏‎‏‏‏‎‎‎‏‏‎‏‏‏‎‏‎‏‏‏‎‏‎‎‏‎‎‎‎‎‏‏‎‎‏‎‎‎‎‎‎‎‏‎‏‏‎‏‏‏‎‎‎‎‏‎‎‎Apps cannot read notifications‎‏‎‎‏‎"</string>
+    <plurals name="manage_notification_access_summary_nonzero" formatted="false" msgid="7930130030691218387">
+      <item quantity="other">‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‏‏‏‎‎‎‎‎‏‏‎‏‎‏‏‏‏‎‏‏‎‎‏‏‏‏‏‏‎‏‎‎‏‏‏‎‎‎‎‎‎‎‎‏‏‏‏‏‎‎‏‏‏‏‎‏‎‎‏‏‎%d apps can read notifications‎‏‎‎‏‎</item>
+      <item quantity="one">‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‏‏‏‎‎‎‎‎‏‏‎‏‎‏‏‏‏‎‏‏‎‎‏‏‏‏‏‏‎‏‎‎‏‏‏‎‎‎‎‎‎‎‎‏‏‏‏‏‎‎‏‏‏‏‎‏‎‎‏‏‎%d app can read notifications‎‏‎‎‏‎</item>
+    </plurals>
+    <string name="no_notification_listeners" msgid="3487091564454192821">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‎‎‎‎‎‏‏‎‎‏‎‎‏‎‏‎‎‎‏‏‎‏‎‎‏‏‎‏‎‏‏‎‏‏‏‎‏‎‎‎‏‏‎‏‏‎‏‎‎‏‏‎‏‎‏‏‎‏‎‏‎No installed apps have requested notification access.‎‏‎‎‏‎"</string>
+    <string name="notification_listener_security_warning_title" msgid="5522924135145843279">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‏‏‎‎‏‎‏‎‎‏‎‏‎‏‎‏‏‏‏‎‎‎‏‏‏‏‎‏‎‎‏‏‏‏‎‎‏‏‎‎‏‏‎‎‏‎‏‎‏‎‏‎‎‏‎‎‏‏‏‏‎Allow notification access for ‎‏‎‎‏‏‎<xliff:g id="SERVICE">%1$s</xliff:g>‎‏‎‎‏‏‏‎?‎‏‎‎‏‎"</string>
+    <string name="notification_listener_security_warning_summary" msgid="119203147791040151">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‎‎‏‏‏‎‏‎‎‏‏‏‎‏‏‏‏‏‏‎‏‎‏‎‎‎‎‏‏‎‏‎‎‎‎‎‎‎‏‏‎‎‎‏‎‏‏‏‏‏‏‎‏‎‎‏‎‏‏‏‎‎‏‎‎‏‏‎<xliff:g id="NOTIFICATION_LISTENER_NAME">%1$s</xliff:g>‎‏‎‎‏‏‏‎ will be able to read all notifications, including personal information such as contact names and the text of messages you receive. It will also be able to dismiss notifications or trigger action buttons they contain. ‎‏‎‎‏‏‎\n‎‏‎‎‏‏‏‎‎‏‎‎‏‏‎\n‎‏‎‎‏‏‏‎This will also give the app the ability to turn Do Not Disturb on or off and change related settings.‎‏‎‎‏‎"</string>
+    <string name="notification_listener_disable_warning_summary" msgid="6738915379642948000">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‏‏‎‏‏‎‎‎‎‏‎‏‎‏‏‎‏‏‏‏‏‏‎‏‎‏‎‏‎‏‎‏‏‏‏‏‎‎‎‎‏‎‎‎‏‏‎‏‏‎‎‏‏‎‏‎‎‎‎‎‎If you turn off notification access for ‎‏‎‎‏‏‎<xliff:g id="NOTIFICATION_LISTENER_NAME">%1$s</xliff:g>‎‏‎‎‏‏‏‎, Do Not Disturb access may also be turned off.‎‏‎‎‏‎"</string>
+    <string name="notification_listener_disable_warning_confirm" msgid="8333442186428083057">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‎‎‏‏‏‎‏‎‎‏‏‎‎‏‎‏‎‏‎‏‏‎‎‎‎‏‎‎‎‎‎‏‏‏‏‎‎‏‎‎‏‏‎‎‏‏‏‎‏‎‏‏‎‏‏‏‎‎‎‏‎Turn off‎‏‎‎‏‎"</string>
+    <string name="notification_listener_disable_warning_cancel" msgid="8586417377104211584">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‎‏‏‏‎‎‏‎‏‎‎‏‎‎‎‏‎‏‎‏‎‎‎‏‏‏‎‎‏‎‎‏‎‏‏‏‏‎‎‎‏‎‎‏‏‎‏‎‏‏‏‎‏‎‎‎‎‎‎‎‎Cancel‎‏‎‎‏‎"</string>
+    <string name="vr_listeners_title" msgid="1318901577754715777">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‎‎‏‎‎‏‎‎‏‏‎‏‏‎‏‎‏‏‎‏‏‏‏‏‏‏‏‏‎‏‎‎‎‎‏‏‏‏‎‎‎‏‎‏‏‎‏‎‎‏‏‎‏‎‎‎‎‎‎‏‎VR helper services‎‏‎‎‏‎"</string>
+    <string name="no_vr_listeners" msgid="2689382881717507390">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‎‏‎‏‎‏‎‏‎‎‏‎‏‎‎‏‏‎‏‏‎‏‏‏‏‎‏‏‎‏‏‎‎‎‎‏‏‏‎‎‏‎‎‏‏‏‎‏‎‏‎‏‎‎‏‏‏‏‏‎‎No installed apps have requested to be run as VR helper services.‎‏‎‎‏‎"</string>
+    <string name="vr_listener_security_warning_title" msgid="8309673749124927122">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‎‎‏‏‎‏‎‏‎‎‎‏‏‏‏‎‎‏‎‎‎‎‏‏‏‏‏‏‏‎‎‎‏‏‏‏‏‏‏‏‏‎‏‎‏‏‎‎‏‏‏‎‏‎‎‏‎‎‏‎‎Allow VR service access for ‎‏‎‎‏‏‎<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>‎‏‎‎‏‏‏‎ will be able to run when you are using applications in virtual reality mode.‎‏‎‎‏‎"</string>
+    <string name="display_vr_pref_title" msgid="8104485269504335481">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‎‎‎‎‎‏‏‏‏‎‎‎‏‏‏‎‏‎‏‎‎‏‏‎‏‎‎‏‏‏‎‎‏‎‎‎‎‎‏‏‎‎‎‏‎‎‎‏‏‏‏‎‎‏‏‏‏‎‎‏‎When device is in VR‎‏‎‎‏‎"</string>
+    <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_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="1264019085827708920">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‎‎‎‏‏‎‎‎‏‎‏‎‏‎‏‏‎‎‏‎‏‎‏‎‏‎‎‏‎‏‎‏‏‎‎‎‎‎‎‏‎‎‏‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‎‎‎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>
+    <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>
+    <string name="app_notifications_off_desc" msgid="4882445501376722969">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‎‎‏‏‏‏‎‎‎‎‎‏‏‏‏‎‏‏‏‎‎‏‎‏‎‎‎‎‏‎‏‏‎‎‎‎‏‏‎‎‎‎‏‏‎‏‏‏‏‎‎‎‎‎‎‏‏‎‎‏‎Android is blocking this app\'s notifications from appearing on this device‎‏‎‎‏‎"</string>
+    <string name="channel_notifications_off_desc" msgid="5899225298718840635">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‎‎‎‏‏‏‎‏‏‏‏‎‎‏‎‎‎‎‏‎‎‎‏‎‎‏‏‏‎‏‎‏‏‏‎‎‎‎‏‎‎‎‏‎‎‏‎‏‎‏‏‏‎‎‏‏‏‎‏‏‎Android is blocking this category of notifications from appearing on this device‎‏‎‎‏‎"</string>
+    <string name="channel_group_notifications_off_desc" msgid="1620950416247316370">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‎‏‏‎‎‏‏‏‏‏‏‎‏‏‎‎‎‏‎‏‏‏‎‏‎‎‎‎‏‎‏‏‏‏‏‎‏‏‏‏‎‎‎‏‎‏‎‏‏‏‏‏‏‎‎‏‎‎‏‎‎Android is blocking this group of notifications from appearing on this device‎‏‎‎‏‎"</string>
+    <string name="notification_channels" msgid="5346841743182627500">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‏‎‏‎‎‎‏‏‎‎‏‏‏‏‎‎‏‏‎‎‎‎‏‏‏‏‎‎‏‎‎‏‎‏‎‎‏‎‏‎‎‎‎‏‏‎‎‎‎‎‏‎‏‎‏‎‏‏‎‎‎Categories‎‏‎‎‏‎"</string>
+    <string name="notification_channels_other" msgid="5645317113885788226">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‏‏‏‎‎‏‎‏‏‎‎‎‎‎‏‏‎‎‏‎‎‎‎‎‎‎‎‏‎‏‎‎‎‎‎‏‏‎‎‏‏‎‎‎‏‎‎‎‏‎‎‎‎‏‎‎‎‎‏‎‎Other‎‏‎‎‏‎"</string>
+    <plurals name="notification_group_summary" formatted="false" msgid="3420621520561455358">
+      <item quantity="other">‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‏‏‏‏‎‏‏‏‏‎‎‎‎‏‏‏‏‏‎‏‎‎‏‎‎‏‏‎‎‏‎‏‎‏‎‎‎‎‎‏‏‏‏‏‎‏‎‎‎‎‎‎‏‏‏‏‏‏‏‎‎‎‏‎‎‏‏‎<xliff:g id="COUNT_1">%d</xliff:g>‎‏‎‎‏‏‏‎ categories‎‏‎‎‏‎</item>
+      <item quantity="one">‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‏‏‏‏‎‏‏‏‏‎‎‎‎‏‏‏‏‏‎‏‎‎‏‎‎‏‏‎‎‏‎‏‎‏‎‎‎‎‎‏‏‏‏‏‎‏‎‎‎‎‎‎‏‏‏‏‏‏‏‎‎‎‏‎‎‏‏‎<xliff:g id="COUNT_0">%d</xliff:g>‎‏‎‎‏‏‏‎ category‎‏‎‎‏‎</item>
+    </plurals>
+    <string name="no_channels" msgid="3077375508177744586">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‏‎‏‎‏‎‏‏‎‏‎‏‎‎‎‎‏‎‎‎‏‎‏‏‏‎‎‎‎‏‎‏‎‏‎‏‎‏‏‎‏‎‏‏‏‏‏‏‎‎‏‎‏‏‎‎‏‎‏‎‎This app has not posted any notifications‎‏‎‎‏‎"</string>
+    <string name="app_settings_link" msgid="8894946007543660906">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‏‎‏‏‎‏‏‏‎‎‎‏‎‎‏‏‎‎‏‎‎‏‎‎‎‏‎‎‎‎‏‏‎‎‏‏‏‏‏‎‏‎‏‏‎‏‎‎‎‎‎‏‎‏‏‎‏‎‏‎‎Additional settings in the app‎‏‎‎‏‎"</string>
+    <string name="app_notification_listing_summary_zero" msgid="6482582965081108108">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‏‎‎‏‏‏‏‏‎‏‏‎‏‏‎‎‎‎‏‎‏‏‎‏‏‏‎‎‎‏‎‎‏‏‎‎‏‎‏‎‏‎‎‎‎‏‏‎‏‏‏‎‏‎‎‎‏‏‎‎‎Turned on for all apps‎‏‎‎‏‎"</string>
+    <plurals name="app_notification_listing_summary_others" formatted="false" msgid="5668835155965827890">
+      <item quantity="other">‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‏‏‏‎‏‎‏‎‏‎‏‏‏‎‏‏‏‏‏‏‏‎‎‎‏‎‏‎‎‎‏‎‎‎‎‏‏‎‎‏‎‏‏‎‏‏‎‏‏‎‏‏‎‎‏‏‎‎‏‎‎Turned off for ‎‏‎‎‏‏‎<xliff:g id="COUNT_1">%d</xliff:g>‎‏‎‎‏‏‏‎ apps‎‏‎‎‏‎</item>
+      <item quantity="one">‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‏‏‏‎‏‎‏‎‏‎‏‏‏‎‏‏‏‏‏‏‏‎‎‎‏‎‏‎‎‎‏‎‎‎‎‏‏‎‎‏‎‏‏‎‏‏‎‏‏‎‏‏‎‎‏‏‎‎‏‎‎Turned off for ‎‏‎‎‏‏‎<xliff:g id="COUNT_0">%d</xliff:g>‎‏‎‎‏‏‏‎ app‎‏‎‎‏‎</item>
+    </plurals>
+    <plurals name="deleted_channels" formatted="false" msgid="8028574302599397935">
+      <item quantity="other">‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‏‏‏‏‎‏‏‎‏‎‏‏‎‎‏‏‏‎‎‏‏‏‎‎‏‎‏‎‎‏‏‏‏‏‏‏‎‏‎‎‎‏‎‎‎‏‎‎‎‎‏‎‎‎‏‎‏‏‏‏‎‎‏‎‎‏‏‎<xliff:g id="COUNT_1">%d</xliff:g>‎‏‎‎‏‏‏‎ categories deleted‎‏‎‎‏‎</item>
+      <item quantity="one">‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‏‏‏‏‎‏‏‎‏‎‏‏‎‎‏‏‏‎‎‏‏‏‎‎‏‎‏‎‎‏‏‏‏‏‏‏‎‏‎‎‎‏‎‎‎‏‎‎‎‎‏‎‎‎‏‎‏‏‏‏‎‎‏‎‎‏‏‎<xliff:g id="COUNT_0">%d</xliff:g>‎‏‎‎‏‏‏‎ category deleted‎‏‎‎‏‎</item>
+    </plurals>
+    <string name="notification_toggle_on" msgid="650145396718191048">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‎‏‎‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‏‏‏‏‏‎‎‏‎‏‏‎‎‏‎‏‏‏‏‏‎‏‏‏‏‏‎‎‏‎‎‎‎‎‏‏‏‎‎‏‎‎‎‎On‎‏‎‎‏‎"</string>
+    <string name="notification_toggle_off" msgid="2142010737190671762">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‏‏‎‏‏‎‏‏‏‎‎‏‏‏‏‏‎‎‏‏‎‏‏‎‏‎‏‎‏‎‏‎‎‏‏‏‎‏‎‏‎‎‏‎‏‎‎‏‎‏‎‏‏‎‎‏‎‎‏‎‎Off‎‏‎‎‏‎"</string>
+    <string name="app_notification_block_title" msgid="4069351066849087649">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‏‎‎‎‎‏‏‏‏‎‎‏‎‎‏‏‏‏‎‏‎‎‏‏‏‏‎‎‎‎‏‎‎‏‎‏‏‏‏‎‎‏‎‏‏‎‎‏‎‎‎‎‏‎‏‎‎‎‎‏‎Block all‎‏‎‎‏‎"</string>
+    <string name="app_notification_block_summary" msgid="4744020456943215352">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‎‎‎‏‏‏‎‏‎‏‏‎‎‎‏‎‎‏‎‏‎‏‏‏‏‎‎‎‎‏‏‏‏‏‏‏‎‏‎‎‏‎‎‏‎‏‏‎‎‎‏‎‏‏‏‏‏‎‎‎‎Never show these notifications‎‏‎‎‏‎"</string>
+    <string name="notification_content_block_title" msgid="5854232570963006360">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‎‎‎‏‎‎‏‏‏‏‏‎‎‏‏‎‏‎‎‏‏‎‎‎‎‎‎‏‏‎‎‏‏‎‎‎‏‏‎‎‎‏‎‏‏‎‎‏‎‎‏‏‏‎‎‏‏‎‎‎‎Show notifications‎‏‎‎‏‎"</string>
+    <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_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>
+    <string name="app_notification_row_sensitive" msgid="1809610030432329940">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‏‎‎‏‎‎‎‏‏‏‎‏‎‎‎‎‎‏‏‎‏‎‏‏‏‏‎‎‎‎‏‎‎‏‎‏‏‏‏‎‎‏‏‏‎‎‏‎‎‎‎‎‏‏‎‏‎‏‎‎‎Sensitive‎‏‎‎‏‎"</string>
+    <string name="app_notifications_dialog_done" msgid="3484067728568791014">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‎‎‎‎‎‏‎‏‏‎‎‏‏‏‏‎‎‏‎‏‎‎‏‎‎‎‏‏‏‏‎‎‎‏‏‎‏‎‏‏‏‏‏‎‏‎‏‎‏‏‏‏‏‏‏‎‎‏‏‎‎Done‎‏‎‎‏‎"</string>
+    <string name="app_notification_importance_title" msgid="8002263131149345584">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‏‏‏‏‎‎‎‎‏‏‎‏‏‎‏‏‏‏‏‏‏‏‏‎‏‎‏‏‏‎‎‎‎‎‏‏‎‏‎‏‏‏‎‎‏‎‏‎‎‎‏‏‎‎‏‏‎‎‎‎‎Importance‎‏‎‎‏‎"</string>
+    <string name="notification_show_lights_title" msgid="7671781299688190532">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‏‎‏‎‎‏‏‏‎‏‏‏‏‎‏‎‎‏‎‎‎‏‏‏‎‎‎‏‏‏‏‏‏‎‏‎‎‏‏‎‎‏‏‎‎‎‏‏‎‎‏‎‎‏‎‎‎‏‎‎‎Blink light‎‏‎‎‏‎"</string>
+    <string name="notification_vibrate_title" msgid="1646667807969755957">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‎‏‏‎‏‏‎‏‏‎‏‎‎‎‏‎‎‎‏‏‏‎‏‎‎‏‎‏‏‎‎‏‏‏‎‏‎‎‎‏‏‎‏‏‏‏‎‎‎‎‏‏‎‎‏‏‎‏‎‏‎Vibrate‎‏‎‎‏‎"</string>
+    <string name="notification_channel_sound_title" msgid="3899212238513507941">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‎‏‏‎‎‎‎‏‏‏‎‎‏‏‎‎‏‎‎‎‏‏‎‏‏‏‏‏‎‎‏‏‏‏‎‎‎‏‏‏‎‏‎‎‎‎‎‎‏‏‏‎‎‏‏‎‎‏‎‏‎Sound‎‏‎‎‏‎"</string>
+    <string name="zen_mode_rule_delete_button" msgid="903658142711011617">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‎‏‏‎‎‏‎‎‎‏‎‏‎‎‏‏‏‎‎‎‎‎‏‎‎‏‎‏‏‎‎‎‎‎‎‏‎‏‎‏‎‏‏‎‏‏‏‎‏‏‎‎‏‎‎‏‎‎‎‎‏‎Delete‎‏‎‎‏‎"</string>
+    <string name="zen_mode_rule_rename_button" msgid="4642843370946599164">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‎‎‎‎‎‏‏‎‏‏‏‎‏‎‏‏‎‎‎‏‎‏‏‏‎‎‏‎‎‏‏‏‎‎‎‏‎‎‎‎‏‏‎‎‏‎‎‏‏‎‎‎‏‏‏‏‏‏‎‎‎Rename‎‏‎‎‏‎"</string>
+    <string name="zen_mode_rule_name" msgid="5149068059383837549">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‎‏‏‏‎‏‏‏‎‏‎‏‎‎‏‎‏‎‏‎‎‎‎‏‏‏‏‎‎‏‏‏‏‎‏‏‏‏‏‎‎‎‏‎‎‎‏‏‎‎‏‏‎‏‏‎‏‏‎‏‎Rule name‎‏‎‎‏‎"</string>
+    <string name="zen_mode_rule_name_hint" msgid="3781174510556433384">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‎‏‎‎‎‏‏‏‏‎‎‏‎‏‏‎‏‏‏‎‎‎‏‎‏‏‏‏‎‎‎‎‏‏‏‏‎‏‏‏‏‎‏‎‎‏‎‎‏‎‏‏‏‏‏‎‏‎‎‎‎Enter rule name‎‏‎‎‏‎"</string>
+    <string name="zen_mode_rule_name_warning" msgid="4517805381294494314">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‏‏‏‎‏‎‏‏‎‎‏‎‎‏‏‏‏‎‎‎‎‎‎‎‏‏‏‎‏‏‎‏‎‏‎‎‎‏‏‎‏‎‎‎‎‎‎‏‎‎‏‎‎‏‏‎‏‎‏‎‎Rule name already in use‎‏‎‎‏‎"</string>
+    <string name="zen_mode_add_rule" msgid="7459154136384467057">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‎‏‏‏‏‎‎‎‎‏‎‎‎‎‏‏‏‏‎‏‎‎‏‎‏‎‏‎‏‎‏‏‎‎‎‎‎‎‎‏‎‏‎‎‏‏‏‏‎‎‎‎‎‏‏‏‎‎‎‏‎Add more‎‏‎‎‏‎"</string>
+    <string name="zen_mode_delete_rule" msgid="2985902330199039533">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‏‎‎‏‎‏‏‏‎‎‎‎‎‎‎‎‏‏‏‎‎‏‎‏‏‎‎‏‎‏‏‎‏‏‎‏‏‎‎‎‎‏‏‎‎‏‎‏‏‏‏‎‎‎‏‎‏‏‎‏‎Delete rule‎‏‎‎‏‎"</string>
+    <string name="zen_mode_choose_rule_type" msgid="5423746638871953459">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‏‎‏‏‎‏‎‎‎‏‎‏‎‎‎‎‎‏‎‎‏‏‎‏‎‏‎‎‏‏‏‏‎‎‎‏‏‎‏‎‏‏‏‎‏‎‎‎‎‎‎‎‎‎‏‏‎‎‏‏‎Choose rule type‎‏‎‎‏‎"</string>
+    <string name="zen_mode_delete_rule_confirmation" msgid="6237882294348570283">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‎‏‏‎‏‎‎‏‎‎‎‏‎‏‏‎‏‎‎‎‏‏‏‎‎‏‎‏‏‎‏‎‎‎‎‏‎‏‎‏‏‎‎‎‎‏‎‏‏‏‏‎‏‎‏‎‏‎‏‏‎Delete “‎‏‎‎‏‏‎<xliff:g id="RULE">%1$s</xliff:g>‎‏‎‎‏‏‏‎” rule?‎‏‎‎‏‎"</string>
+    <string name="zen_mode_delete_rule_button" msgid="4248741120307752294">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‏‎‏‎‏‏‏‏‎‏‏‎‏‎‎‎‏‏‏‏‏‎‎‎‏‎‎‏‏‏‎‎‎‎‏‎‏‎‎‎‏‎‎‏‏‏‏‎‏‏‎‏‎‏‏‎‎‏‏‎‎Delete‎‏‎‎‏‎"</string>
+    <string name="zen_mode_rule_type" msgid="2289413469580142888">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‏‏‏‏‏‏‎‎‎‏‎‏‏‎‏‎‎‎‎‏‎‏‏‎‏‎‏‏‏‎‏‏‎‏‏‎‎‏‎‏‎‎‎‏‏‎‏‎‏‎‎‏‎‎‏‎‏‎‎‎‎Rule type‎‏‎‎‏‎"</string>
+    <string name="zen_mode_rule_type_unknown" msgid="3049377282766700600">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‏‎‏‎‎‏‎‏‎‎‎‏‏‎‎‏‎‎‎‎‎‏‏‏‏‎‏‏‎‏‏‏‏‏‎‏‎‏‏‏‎‏‎‎‏‎‎‎‎‎‎‎‎‎‏‏‏‎‎‎‎Unknown‎‏‎‎‏‎"</string>
+    <string name="zen_mode_configure_rule" msgid="8865785428056490305">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‏‎‏‏‎‎‎‎‏‎‎‏‏‎‎‏‏‎‎‎‏‏‎‏‏‏‏‏‏‎‏‏‎‏‏‎‎‎‏‎‎‏‎‎‎‏‎‎‎‎‎‏‎‏‎‎‎‎‎‏‎Configure rule‎‏‎‎‏‎"</string>
+    <string name="zen_schedule_rule_type_name" msgid="142936744435271449">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‎‎‏‏‏‏‏‏‏‎‏‏‏‏‎‏‎‎‎‎‎‎‏‏‎‏‏‎‎‎‏‏‎‏‎‏‎‏‏‎‏‎‏‎‎‏‎‎‎‏‏‏‎‎‎‏‏‎‎‏‎Time rule‎‏‎‎‏‎"</string>
+    <string name="zen_schedule_rule_enabled_toast" msgid="3379499360390382259">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‏‏‏‎‏‏‏‎‎‏‏‎‎‏‏‎‎‏‎‎‏‏‎‎‎‎‏‏‎‏‎‎‏‏‏‎‏‎‏‏‏‎‏‎‏‎‎‎‎‎‏‎‏‎‏‏‎‎‏‏‎Automatic rule set to turn on Do Not Disturb during specified times‎‏‎‎‏‎"</string>
+    <string name="zen_event_rule_type_name" msgid="2645981990973086797">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‎‏‎‎‏‎‏‏‏‎‎‎‎‏‏‎‏‎‏‎‏‎‎‏‏‎‏‎‎‎‎‎‏‏‏‎‎‎‎‎‏‎‎‎‎‎‎‏‏‏‎‎‎‏‎‎‏‏‎‏‎Event rule‎‏‎‎‏‎"</string>
+    <string name="zen_event_rule_enabled_toast" msgid="6910577623330811480">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‏‏‏‏‏‏‏‎‎‏‏‏‎‏‎‎‏‏‎‏‏‎‏‏‏‏‎‎‎‎‎‎‏‏‏‏‎‏‏‎‎‏‎‏‎‏‏‎‏‏‏‎‎‏‎‏‏‎‎‎‎Automatic rule set to turn on Do Not Disturb during specified events‎‏‎‎‏‎"</string>
+    <string name="zen_mode_event_rule_calendar" msgid="8787906563769067418">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‏‎‎‏‏‏‏‏‎‏‎‎‏‏‏‎‏‎‏‎‎‏‏‏‎‏‎‏‏‎‎‏‏‏‎‎‏‏‎‎‎‏‏‏‎‏‏‎‎‏‏‏‏‎‎‏‏‎‏‎‎During events for‎‏‎‎‏‎"</string>
+    <string name="zen_mode_event_rule_summary_calendar_template" msgid="5135844750232403975">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‎‏‏‏‎‏‎‎‎‏‏‎‎‎‏‎‏‏‏‏‏‎‎‏‎‏‏‎‏‏‏‎‎‏‏‏‎‎‏‎‏‎‎‎‎‏‎‎‎‎‎‎‎‎‎‎‎‏‏‏‎During events for ‎‏‎‎‏‏‎<xliff:g id="CALENDAR">%1$s</xliff:g>‎‏‎‎‏‏‏‎‎‏‎‎‏‎"</string>
+    <string name="zen_mode_event_rule_summary_any_calendar" msgid="4936646399126636358">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‎‏‎‎‏‎‎‎‎‎‏‎‎‏‏‏‏‏‎‏‏‎‏‏‏‏‏‎‏‎‎‏‏‎‎‏‏‎‏‎‎‏‏‏‏‎‎‎‎‏‏‏‎‏‎‎‎‏‏‎‎any calendar‎‏‎‎‏‎"</string>
+    <string name="zen_mode_event_rule_summary_reply_template" msgid="6590671260829837157">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‏‎‏‏‎‏‏‏‎‏‏‎‏‏‎‎‎‏‎‎‏‎‎‏‎‏‏‏‏‏‎‎‎‏‎‏‎‎‏‎‎‎‏‏‎‏‏‎‎‏‏‏‎‏‏‎‎‏‎‏‎Where reply is ‎‏‎‎‏‏‎<xliff:g id="REPLY">%1$s</xliff:g>‎‏‎‎‏‏‏‎‎‏‎‎‏‎"</string>
+    <string name="zen_mode_event_rule_calendar_any" msgid="6485568415998569885">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‏‎‏‎‎‎‎‎‎‎‎‏‎‏‎‏‏‏‏‎‎‎‎‏‏‏‎‎‏‏‎‎‎‎‏‎‎‎‎‏‎‏‏‎‎‏‏‎‏‏‎‏‏‎‎‏‏‏‎‏‎Any calendar‎‏‎‎‏‎"</string>
+    <string name="zen_mode_event_rule_reply" msgid="5166322024212403739">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‎‏‏‏‏‎‏‏‎‎‏‎‎‏‏‏‎‏‏‎‏‎‎‎‎‎‏‎‎‎‏‏‏‎‎‎‎‏‏‏‎‏‎‏‎‎‎‏‎‏‏‎‎‎‎‏‏‎‏‏‎Where reply is‎‏‎‎‏‎"</string>
+    <string name="zen_mode_event_rule_reply_any_except_no" msgid="8868873496008825961">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‏‎‏‏‎‎‎‏‎‏‎‎‏‎‎‏‎‎‎‏‎‏‏‏‎‏‎‎‏‎‎‎‏‏‏‏‎‏‏‏‏‎‏‏‏‎‎‏‏‏‎‎‎‏‏‎‏‎‎‏‎Yes, Maybe, or Not replied‎‏‎‎‏‎"</string>
+    <string name="zen_mode_event_rule_reply_yes_or_maybe" msgid="2769656565454495824">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‎‏‏‎‎‏‏‎‏‏‏‏‏‏‎‎‏‎‏‏‏‏‏‏‏‎‎‎‏‏‎‏‎‏‎‏‏‎‏‏‏‏‏‎‎‏‏‎‎‎‎‎‎‏‎‏‎‎‎‎‎Yes or Maybe‎‏‎‎‏‎"</string>
+    <string name="zen_mode_event_rule_reply_yes" msgid="1003598835878784659">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‎‏‏‎‏‏‏‏‎‏‏‎‏‎‏‏‏‏‏‏‏‏‏‎‏‎‎‏‎‏‏‏‎‏‏‎‏‏‎‎‎‏‏‎‎‏‏‏‎‏‏‏‎‏‎‎‏‎‎‏‏‎Yes‎‏‎‎‏‎"</string>
+    <string name="zen_mode_rule_not_found_text" msgid="8963662446092059836">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‏‏‎‎‎‏‏‎‎‏‎‏‎‏‎‏‎‎‏‏‏‎‎‎‎‎‎‎‏‏‎‏‎‎‎‏‏‏‎‏‎‎‏‏‏‎‎‎‎‏‎‎‏‎‏‏‏‏‎‎‎Rule not found.‎‏‎‎‏‎"</string>
+    <string name="zen_mode_rule_summary_enabled_combination" msgid="976098744828219297">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‎‏‏‎‏‏‎‎‎‏‎‏‏‏‏‎‎‏‏‎‎‏‎‏‎‎‎‏‏‎‎‎‎‎‏‏‏‎‎‏‏‎‎‎‎‏‏‎‎‏‏‏‏‏‎‏‎‎‎‎‏‎On / ‎‏‎‎‏‏‎<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">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‏‏‎‎‎‏‎‏‎‏‏‏‎‎‏‎‎‎‎‎‏‏‏‏‎‎‎‏‎‎‏‎‎‎‎‎‎‎‏‎‏‎‎‎‏‎‎‎‎‏‎‏‎‏‏‏‏‏‎‎‎Days‎‏‎‎‏‎"</string>
+    <string name="zen_mode_schedule_rule_days_none" msgid="4954143628634166317">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‎‏‎‎‏‏‎‎‎‎‎‎‏‎‏‎‎‏‏‏‎‏‏‎‎‎‎‏‏‏‎‎‏‏‏‏‎‎‎‎‎‎‎‏‎‎‎‏‎‏‎‎‎‎‏‎‏‏‎‏‎None‎‏‎‎‏‎"</string>
+    <string name="zen_mode_schedule_rule_days_all" msgid="146511166522076034">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‎‏‎‏‎‎‎‎‎‏‎‎‎‏‎‎‎‎‎‏‏‎‎‏‎‎‎‎‏‎‎‏‏‎‏‎‎‎‎‏‎‏‏‎‏‎‎‏‎‏‎‏‏‏‎‎‎‎‎‏‎‎Every day‎‏‎‎‏‎"</string>
+    <string name="zen_mode_schedule_alarm_title" msgid="767054141267122030">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‎‏‎‏‎‏‎‏‎‎‏‎‏‎‎‎‏‏‏‏‏‏‎‏‎‏‏‎‏‎‏‏‎‏‏‎‏‏‎‏‏‏‎‎‎‎‎‎‏‎‏‏‏‎‏‏‎‏‏‏‎‎Alarm can override end time‎‏‎‎‏‎"</string>
+    <string name="zen_mode_schedule_alarm_summary" msgid="4597050434723180422">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‏‏‏‏‏‏‎‎‏‏‎‎‎‎‎‎‎‎‎‏‎‎‎‎‎‎‏‏‏‎‏‎‎‎‎‎‎‎‏‏‏‎‏‎‏‏‏‎‏‏‏‏‏‎‎‎‎‏‏‎‎Stop at the end time or next alarm, whichever comes first‎‏‎‎‏‎"</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>‎‏‎‎‏‏‏‎ to ‎‏‎‎‏‏‎<xliff:g id="END">%2$s</xliff:g>‎‏‎‎‏‏‏‎‎‏‎‎‏‎"</string>
+    <string name="zen_mode_calls" msgid="7051492091133751208">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‎‎‎‏‏‏‎‏‏‎‏‏‏‏‏‎‏‏‏‎‏‎‏‏‎‎‏‎‎‏‎‎‏‏‎‎‏‎‎‎‎‎‎‎‏‏‏‎‏‏‏‏‏‎‏‎‏‎‎‎‎Calls‎‏‎‎‏‎"</string>
+    <string name="zen_mode_messages" msgid="5886440273537510894">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‎‎‎‏‏‎‏‏‎‎‎‎‏‏‎‏‎‏‏‎‎‎‏‏‏‏‎‏‏‎‏‏‎‏‏‏‏‏‎‎‎‎‎‏‏‎‏‎‏‏‎‏‏‏‏‎‏‏‏‎‎Messages‎‏‎‎‏‎"</string>
+    <string name="zen_mode_all_messages" msgid="6449223378976743208">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‏‎‎‏‏‎‎‎‎‎‎‎‎‎‏‏‏‏‏‎‎‏‏‏‏‏‏‎‎‏‏‎‎‏‎‏‎‎‎‎‏‏‎‏‏‎‎‏‏‏‏‏‎‎‏‎‏‎‎‎‎All messages‎‏‎‎‏‎"</string>
+    <string name="zen_mode_selected_messages" msgid="8245990149599142281">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‎‎‏‎‎‏‏‎‏‏‏‏‏‎‏‎‎‏‎‎‎‏‎‏‏‎‏‎‎‎‎‏‏‎‎‎‎‎‏‏‏‎‏‎‎‎‏‎‎‎‎‏‏‎‎‎‏‎‎‏‎Selected messages‎‏‎‎‏‎"</string>
+    <string name="zen_mode_from_anyone" msgid="2638322015361252161">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‎‏‎‎‏‎‎‏‏‏‎‏‎‎‏‏‎‎‏‏‏‏‏‎‎‏‎‏‎‎‎‎‎‎‎‎‏‎‏‏‎‎‏‏‎‎‏‏‏‎‏‏‎‏‎‎‎‎‎‏‎From anyone‎‏‎‎‏‎"</string>
+    <string name="zen_mode_from_contacts" msgid="2232335406106711637">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‏‏‏‎‏‏‏‏‏‎‏‎‏‏‎‏‏‎‎‏‎‎‏‏‏‎‎‏‎‏‏‏‎‏‎‎‏‎‎‎‎‏‎‎‏‎‎‏‎‏‏‎‎‏‎‏‎‏‎‏‎From contacts only‎‏‎‎‏‎"</string>
+    <string name="zen_mode_from_starred" msgid="2678345811950997027">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‎‏‎‏‎‎‏‎‏‎‏‏‎‏‏‎‎‏‎‏‎‏‎‏‎‎‏‏‎‏‎‏‎‎‏‎‏‏‏‏‏‏‏‎‏‎‎‎‏‏‏‎‎‎‏‎‎‎‏‏‎From starred contacts only‎‏‎‎‏‎"</string>
+    <string name="zen_mode_from_none" msgid="8219706639954614136">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‎‎‏‎‎‎‎‏‎‎‏‎‎‏‎‎‎‎‏‏‏‎‏‎‎‎‏‏‏‎‏‎‎‎‎‎‎‏‏‎‏‎‏‎‎‎‎‏‎‏‏‏‎‏‏‏‏‎‎‎‎None‎‏‎‎‏‎"</string>
+    <string name="zen_mode_alarms" msgid="2165302777886552926">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‏‏‏‎‎‎‎‎‏‏‎‎‏‎‏‏‎‎‏‏‎‏‏‎‎‏‏‏‎‏‏‏‏‎‏‏‎‎‎‏‏‎‎‎‎‎‏‏‎‎‏‏‎‏‎‏‏‏‏‎‎Alarms‎‏‎‎‏‎"</string>
+    <string name="zen_mode_alarms_summary" msgid="3774926045611788635">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‎‏‎‎‎‏‏‎‎‎‏‏‎‎‏‏‏‎‏‏‎‎‏‏‏‏‎‎‏‏‏‏‎‎‏‎‎‎‎‎‏‏‏‏‏‎‎‎‏‎‎‏‎‏‎‏‏‎‏‏‎Alarms are always a priority and make sound‎‏‎‎‏‎"</string>
+    <string name="zen_mode_reminders" msgid="5458502056440485730">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‏‎‏‏‏‏‎‎‎‎‎‎‎‏‏‏‏‏‏‎‏‎‏‏‎‎‏‏‎‎‏‎‏‏‏‏‏‏‎‏‏‏‏‏‏‏‎‏‎‏‏‏‎‏‏‎‎‎‏‎‎Reminders‎‏‎‎‏‎"</string>
+    <string name="zen_mode_events" msgid="7914446030988618264">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‏‏‎‏‏‏‎‏‎‏‎‏‏‏‎‎‎‎‏‎‏‎‏‏‏‎‏‏‏‎‎‎‏‏‏‏‎‎‎‏‎‎‏‏‏‎‏‎‏‎‏‎‎‎‎‏‏‎‎‎‎Events‎‏‎‎‏‎"</string>
+    <string name="zen_mode_all_callers" msgid="584186167367236922">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‎‏‎‎‎‎‎‎‏‏‎‏‏‎‏‏‏‎‎‏‎‎‎‏‏‏‎‎‏‎‏‎‏‏‏‎‎‏‎‎‏‏‏‏‎‏‏‏‏‏‏‎‏‎‎‏‏‏‎‏‎‎All callers‎‏‎‎‏‎"</string>
+    <string name="zen_mode_selected_callers" msgid="3127598874060615742">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‏‎‏‏‎‏‏‎‎‏‏‏‎‏‏‏‎‏‏‎‏‎‎‏‏‎‏‎‏‏‏‏‎‎‎‎‎‏‎‎‏‎‏‏‎‏‏‏‎‎‎‎‎‎‏‏‏‏‏‎‎Selected callers‎‏‎‎‏‎"</string>
+    <string name="zen_mode_repeat_callers" msgid="5019521886428322131">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‎‏‎‏‏‎‏‎‏‎‎‎‏‏‏‎‏‏‎‎‏‎‎‎‏‏‏‏‏‎‏‎‎‏‏‎‏‏‎‏‏‎‏‏‏‏‎‏‏‎‎‏‎‏‎‏‎‎‏‏‎Repeat callers‎‏‎‎‏‎"</string>
+    <string name="zen_mode_repeat_callers_summary" msgid="7192713032364140137">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‎‎‏‏‏‏‎‏‎‎‎‏‏‎‏‎‎‏‏‎‎‏‏‎‎‏‎‎‏‏‏‏‎‎‎‏‎‏‏‎‎‎‏‏‎‎‏‎‎‏‏‎‎‏‏‎‏‎‎‏‎If the same person calls a second time within a ‎‏‎‎‏‏‎<xliff:g id="MINUTES">%d</xliff:g>‎‏‎‎‏‏‏‎ minute period, allow it‎‏‎‎‏‎"</string>
+    <string name="zen_mode_when" msgid="2767193283311106373">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‎‏‏‎‎‏‏‎‎‏‏‏‎‎‎‎‏‎‏‏‏‎‏‎‎‎‎‏‎‏‎‎‎‏‎‎‏‎‎‏‏‎‏‎‏‏‏‏‏‎‎‏‎‏‎‎‎‏‎‏‎Automatically turn on‎‏‎‎‏‎"</string>
+    <string name="zen_mode_when_never" msgid="8809494351918405602">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‏‎‏‎‎‏‎‎‎‎‎‏‏‎‎‏‏‏‎‎‎‏‏‏‎‎‎‎‎‎‏‏‏‎‎‎‏‏‏‎‏‎‎‎‎‎‎‏‎‏‏‏‏‏‏‎‎‎‏‎‎Never‎‏‎‎‏‎"</string>
+    <string name="zen_mode_when_every_night" msgid="3122486110091921009">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‏‎‏‏‎‏‎‏‎‏‎‏‎‏‎‎‏‏‎‎‏‎‎‏‎‎‏‎‏‏‎‏‎‎‎‎‎‎‎‏‏‏‏‎‏‏‎‎‎‏‏‎‎‏‏‏‎‎‎‏‎Every night‎‏‎‎‏‎"</string>
+    <string name="zen_mode_when_weeknights" msgid="8354070633893273783">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‎‎‏‏‏‏‏‎‏‏‏‏‏‎‎‏‏‏‏‎‏‏‏‏‏‎‏‎‏‏‎‏‎‎‎‏‏‎‏‏‏‎‏‏‎‎‏‎‎‎‎‎‏‎‏‏‎‏‏‏‎Weeknights‎‏‎‎‏‎"</string>
+    <string name="zen_mode_start_time" msgid="8102602297273744441">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‎‎‎‎‎‏‏‏‎‎‏‎‎‎‏‏‏‎‎‏‏‏‎‏‏‏‎‎‎‎‏‎‎‏‎‏‎‏‎‎‎‎‏‏‏‏‏‏‏‏‎‎‎‎‏‏‏‎‎‏‎Start time‎‏‎‎‏‎"</string>
+    <string name="zen_mode_end_time" msgid="8774327885892705505">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‏‎‎‏‏‏‎‎‎‏‎‎‏‎‏‎‏‏‎‎‏‎‏‏‏‎‎‏‎‏‎‎‏‏‎‏‎‏‏‏‎‎‎‎‎‏‎‏‏‏‎‎‏‏‏‎‎‎‎‏‎End time‎‏‎‎‏‎"</string>
+    <string name="zen_mode_end_time_next_day_summary_format" msgid="4201521691238728701">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‏‎‏‎‎‏‎‎‏‏‏‎‏‏‎‎‏‏‎‏‏‎‏‏‎‏‏‏‏‎‏‏‎‎‏‎‎‏‏‎‎‎‏‎‎‎‎‎‎‎‏‏‏‏‏‏‏‏‎‏‎‎‏‎‎‏‏‎<xliff:g id="FORMATTED_TIME">%s</xliff:g>‎‏‎‎‏‏‏‎ next day‎‏‎‎‏‎"</string>
+    <string name="zen_mode_summary_alarms_only_indefinite" msgid="2061973221027570123">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‏‏‎‎‏‎‎‏‏‏‎‏‏‎‎‏‏‎‎‏‏‎‏‏‏‎‎‎‎‎‏‏‏‏‏‏‏‎‏‏‎‏‏‏‎‏‏‎‎‎‎‏‏‏‎‎‏‎‏‏‎Change to alarms only indefinitely‎‏‎‎‏‎"</string>
+    <plurals name="zen_mode_summary_alarms_only_by_minute" formatted="false" msgid="6122003583875424601">
+      <item quantity="other">‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‎‏‎‎‏‏‏‏‎‏‎‏‏‎‏‏‏‎‎‏‏‏‎‏‎‎‏‎‏‏‏‎‎‎‏‎‏‎‎‏‎‎‎‎‎‎‏‎‎‎‎‏‎‏‎‏‏‎‎‏‎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="one">‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‎‏‎‎‏‏‏‏‎‏‎‏‏‎‏‏‏‎‎‏‏‏‎‏‎‎‏‎‏‏‏‎‎‎‏‎‏‎‎‏‎‎‎‎‎‎‏‎‎‎‎‏‎‏‎‏‏‎‎‏‎Change to alarms only for one minute until ‎‏‎‎‏‏‎<xliff:g id="FORMATTEDTIME_0">%2$s</xliff:g>‎‏‎‎‏‏‏‎‎‏‎‎‏‎</item>
+    </plurals>
+    <plurals name="zen_mode_summary_alarms_only_by_hour" formatted="false" msgid="2407703455581767748">
+      <item quantity="other">‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‎‎‎‏‎‏‏‎‏‎‎‏‏‏‏‎‎‎‎‏‏‎‎‎‏‎‎‏‎‏‎‎‏‎‏‎‎‏‏‎‏‏‏‎‏‎‎‎‏‎‎‎‎‏‎‎‎‏‎‎‎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="one">‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‎‎‎‏‎‏‏‎‏‎‎‏‏‏‏‎‎‎‎‏‏‎‎‎‏‎‎‏‎‏‎‎‏‎‏‎‎‏‏‎‏‏‏‎‏‎‎‎‏‎‎‎‎‏‎‎‎‏‎‎‎Change to alarms only for one hour until ‎‏‎‎‏‏‎<xliff:g id="FORMATTEDTIME_0">%2$s</xliff:g>‎‏‎‎‏‏‏‎‎‏‎‎‏‎</item>
+    </plurals>
+    <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_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_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>
+    <string name="zen_mode_no_visual_interruptions" msgid="8742776003822778472">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‏‎‎‏‎‏‎‏‎‏‎‎‏‎‎‏‎‏‎‎‎‏‏‏‎‏‎‎‎‏‎‎‏‎‏‎‏‎‏‎‏‎‏‎‎‏‏‏‏‎‎‎‎‏‏‎‏‎‎‎‎When screen is on or off‎‏‎‎‏‎"</string>
+    <string name="notification_app_settings_button" msgid="6685640230371477485">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‏‏‎‎‏‏‎‎‏‎‎‎‎‎‏‎‏‎‏‎‎‏‎‏‏‏‏‎‎‎‎‏‎‎‏‏‎‏‎‏‏‎‏‎‎‏‎‎‎‏‏‏‏‏‏‎‏‏‎‏‎Notification settings‎‏‎‎‏‎"</string>
+    <string name="suggestion_button_text" msgid="3275010948381252006">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‏‏‎‏‎‏‏‏‎‎‏‏‎‎‏‎‏‏‎‏‎‎‎‏‏‎‏‏‎‎‎‏‎‏‎‏‏‏‎‎‎‏‏‏‏‎‎‏‏‎‎‏‏‎‏‎‎‏‏‎‎Ok‎‏‎‎‏‎"</string>
+    <string name="device_feedback" msgid="3238056036766293294">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‏‏‎‎‏‏‏‎‏‏‏‏‏‏‏‎‎‎‏‎‏‏‎‎‏‏‏‏‎‎‏‏‏‎‏‎‎‏‎‎‎‎‏‏‏‎‎‏‏‏‎‏‎‎‏‎‏‏‏‎‎Send feedback about this device‎‏‎‎‏‎"</string>
+    <string name="restr_pin_enter_admin_pin" msgid="1085834515677448072">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‎‏‏‏‏‎‎‎‏‎‎‎‏‏‎‏‎‏‎‎‎‏‎‏‏‏‏‎‏‎‎‏‎‏‏‏‏‏‏‎‏‎‎‎‎‎‎‎‎‎‏‏‏‏‎‎‎‏‎‎‎‎Enter admin PIN‎‏‎‎‏‎"</string>
+    <string name="switch_on_text" msgid="1124106706920572386">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‎‏‏‏‏‏‎‎‏‏‎‎‏‏‎‏‎‎‎‎‏‎‎‎‏‏‎‎‎‎‎‎‏‏‎‏‏‏‎‏‎‎‎‏‎‏‎‎‎‎‏‎‏‏‏‏‎‎‎‏‎‎On‎‏‎‎‏‎"</string>
+    <string name="switch_off_text" msgid="1139356348100829659">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‎‏‏‏‏‏‏‎‎‏‏‏‏‏‏‎‎‏‏‏‎‏‎‎‎‏‏‏‏‏‏‏‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‎‎‎‎‏‏‏‎‏‏‎‏‏‎Off‎‏‎‎‏‎"</string>
+    <string name="screen_pinning_title" msgid="2292573232264116542">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‏‏‏‏‏‏‎‏‎‎‎‎‏‏‎‏‏‎‏‏‎‎‏‏‎‏‎‏‎‏‎‎‏‎‏‎‏‎‏‎‏‎‏‏‏‏‏‏‏‎‎‏‎‎‏‏‏‏‏‎‎Screen pinning‎‏‎‎‏‎"</string>
+    <string name="screen_pinning_description" msgid="3360904523688769289">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‏‏‏‎‏‎‏‎‎‏‎‎‎‏‎‏‎‏‎‎‏‏‎‏‏‎‏‏‏‎‎‎‎‎‏‎‎‏‏‏‏‎‎‎‏‏‏‏‎‏‏‏‎‎‎‎‏‎‎‏‎When this setting is turned on, you can use screen pinning to keep the current screen in view until you unpin.‎‏‎‎‏‏‎\n‎‏‎‎‏‏‏‎‎‏‎‎‏‏‎\n‎‏‎‎‏‏‏‎To use screen pinning:‎‏‎‎‏‏‎\n‎‏‎‎‏‏‏‎‎‏‎‎‏‏‎\n‎‏‎‎‏‏‏‎1. Make sure screen pinning is turned on.‎‏‎‎‏‏‎\n‎‏‎‎‏‏‏‎‎‏‎‎‏‏‎\n‎‏‎‎‏‏‏‎2. Open the screen you want to pin.‎‏‎‎‏‏‎\n‎‏‎‎‏‏‏‎‎‏‎‎‏‏‎\n‎‏‎‎‏‏‏‎3. Tap Overview.‎‏‎‎‏‏‎\n‎‏‎‎‏‏‏‎‎‏‎‎‏‏‎\n‎‏‎‎‏‏‏‎4. Swipe up and then tap the pin icon.‎‏‎‎‏‎"</string>
+    <string name="screen_pinning_unlock_pattern" msgid="8282268570060313339">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‎‎‏‎‏‏‏‏‎‎‎‎‏‎‎‎‎‏‏‏‎‏‏‎‎‎‏‎‎‎‎‏‎‏‎‎‏‏‎‏‎‎‏‏‏‏‎‏‎‎‏‎‏‏‏‏‏‎‏‏‎Ask for unlock pattern before unpinning‎‏‎‎‏‎"</string>
+    <string name="screen_pinning_unlock_pin" msgid="8757588350454795286">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‏‎‎‏‏‎‎‎‏‎‎‏‎‎‏‏‎‏‎‎‎‎‏‏‎‏‎‎‎‏‏‏‏‏‎‏‏‏‏‏‎‏‎‏‎‎‎‎‏‏‎‎‎‎‎‏‎‏‏‎‎Ask for PIN before unpinning‎‏‎‎‏‎"</string>
+    <string name="screen_pinning_unlock_password" msgid="2514079566873826434">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‎‎‏‎‏‏‏‎‎‎‏‏‏‏‎‎‏‏‏‎‎‎‎‎‏‎‏‏‏‏‎‎‎‎‎‎‏‎‎‏‎‏‎‏‎‎‎‏‎‏‎‎‏‎‎‎‎‎‏‎‎Ask for password before unpinning‎‏‎‎‏‎"</string>
+    <string name="screen_pinning_unlock_none" msgid="3814188275713871856">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‎‏‎‎‏‏‏‎‏‏‏‎‏‎‏‏‏‎‎‎‎‎‎‎‎‏‏‏‎‏‎‎‎‎‎‎‎‏‏‎‎‎‏‎‏‎‎‎‏‏‏‏‏‏‏‏‎‎‎‎‎Lock device when unpinning‎‏‎‎‏‎"</string>
+    <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="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‎‏‎‎‏‏‏‎‎‏‎‎‏‏‎\n‎‏‎‎‏‏‏‎This helps protect data on lost or stolen devices. Require PIN to start your device?‎‏‎‎‏‎"</string>
+    <string name="encryption_interstitial_message_pattern" msgid="7081249914068568570">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‎‎‏‎‎‏‎‎‎‏‎‏‏‎‏‎‎‏‏‏‎‏‎‎‎‏‏‏‎‏‎‏‏‏‎‏‏‏‎‏‎‎‏‎‏‎‎‎‏‎‎‏‏‏‏‏‏‎‏‎‎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‎‏‎‎‏‏‏‎‎‏‎‎‏‏‎\n‎‏‎‎‏‏‏‎This helps protect data on lost or stolen devices. Require pattern to start your device?‎‏‎‎‏‎"</string>
+    <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‎‏‎‎‏‏‏‎‎‏‎‎‏‏‎\n‎‏‎‎‏‏‏‎This 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‎‏‎‎‏‏‏‎‎‏‎‎‏‏‎\n‎‏‎‎‏‏‏‎This 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‎‏‎‎‏‏‏‎‎‏‎‎‏‏‎\n‎‏‎‎‏‏‏‎This helps protect data on lost or stolen devices. Require pattern to start your device?‎‏‎‎‏‎"</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‎‏‎‎‏‏‏‎‎‏‎‎‏‏‎\n‎‏‎‎‏‏‏‎This 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>
+    <string name="encrypt_talkback_dialog_require_pattern" msgid="1499790256154146639">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‎‏‎‎‏‏‎‏‎‎‎‎‎‏‎‏‎‎‏‏‎‏‎‎‏‎‏‎‏‎‏‎‏‏‏‏‏‎‏‎‏‎‎‎‏‏‏‏‎‏‏‏‎‏‎‎‏‏‏‏‎Require pattern?‎‏‎‎‏‎"</string>
+    <string name="encrypt_talkback_dialog_require_password" msgid="8841994614218049215">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‏‎‏‎‏‎‏‏‎‏‎‏‎‎‎‏‎‎‏‏‎‏‎‎‎‎‎‏‎‎‏‏‎‏‏‎‎‏‏‎‎‎‏‎‎‏‎‎‎‏‏‎‏‎‏‏‏‏‏‏‎Require password?‎‏‎‎‏‎"</string>
+    <string name="encrypt_talkback_dialog_message_pin" msgid="7582096542997635316">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‏‎‎‏‎‎‏‏‏‎‎‏‎‎‎‎‎‏‎‎‏‎‏‎‎‎‏‎‎‏‎‏‏‎‏‎‎‎‎‏‎‏‏‏‎‏‏‎‎‎‎‎‏‏‏‏‎‏‎‎‎When you enter your PIN to start this device, accessibility services like ‎‏‎‎‏‏‎<xliff:g id="SERVICE">%1$s</xliff:g>‎‏‎‎‏‏‏‎ won’t yet be available.‎‏‎‎‏‎"</string>
+    <string name="encrypt_talkback_dialog_message_pattern" msgid="2020083142199612743">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‏‏‎‎‎‎‎‎‏‎‎‎‏‏‎‎‎‏‏‎‏‏‏‎‏‎‏‎‎‎‏‏‏‎‏‏‏‎‎‏‎‎‎‎‎‎‎‏‎‏‎‏‎‏‎‎‎‏‏‏‎When you enter your pattern to start this device, accessibility services like ‎‏‎‎‏‏‎<xliff:g id="SERVICE">%1$s</xliff:g>‎‏‎‎‏‏‏‎ won’t yet be available.‎‏‎‎‏‎"</string>
+    <string name="encrypt_talkback_dialog_message_password" msgid="4155875981789127796">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‏‎‎‏‏‎‏‎‏‏‎‎‏‎‏‎‎‎‏‏‎‎‏‎‏‏‏‏‏‏‎‎‏‎‎‏‎‎‎‏‏‏‏‎‎‏‏‎‎‏‎‎‎‏‏‏‎‏‎‎‎When you enter your password to start this device, accessibility services like ‎‏‎‎‏‏‎<xliff:g id="SERVICE">%1$s</xliff:g>‎‏‎‎‏‏‏‎ won’t yet be available.‎‏‎‎‏‎"</string>
+    <string name="direct_boot_unaware_dialog_message" msgid="7870273558547549125">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‏‏‎‏‎‎‏‏‏‎‎‎‏‏‎‏‎‏‎‎‎‎‎‏‏‎‏‎‎‏‎‏‏‏‏‎‎‏‏‎‎‎‎‎‎‏‎‎‏‎‏‏‏‏‎‎‎‏‎‏‎Note: After a reboot, this app can\'t start until you unlock your phone‎‏‎‎‏‎"</string>
+    <string name="imei_information_title" msgid="8499085421609752290">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‎‏‎‏‏‏‏‏‎‎‏‎‏‏‎‏‎‎‎‏‎‎‏‎‏‎‎‏‎‎‏‎‏‏‏‎‏‏‎‎‎‎‎‎‎‎‎‏‎‏‏‎‏‏‏‎‎‎‏‎‎IMEI information‎‏‎‎‏‎"</string>
+    <string name="imei_information_summary" msgid="2074095606556565233">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‏‏‎‎‏‏‎‎‏‎‎‎‏‎‏‎‏‎‏‎‏‏‏‏‎‏‏‏‎‎‎‏‎‎‏‏‎‎‎‎‎‎‎‎‏‎‎‏‏‏‏‎‏‏‏‏‎‎‎‏‎IMEI relative information‎‏‎‎‏‎"</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">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‏‎‎‏‏‎‎‎‏‎‏‏‏‎‏‏‎‎‏‎‏‎‎‎‏‏‎‏‎‏‏‎‏‏‎‎‎‏‎‏‏‎‏‎‏‏‏‎‎‏‏‏‎‏‏‎‎‎‎‎‎Open by default‎‏‎‎‏‎"</string>
+    <string name="app_launch_domain_links_title" msgid="1160925981363706090">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‎‎‎‎‎‎‎‏‏‏‎‎‎‏‏‏‎‎‎‎‎‎‎‎‎‏‏‏‎‏‏‏‏‎‎‏‏‎‏‏‎‏‎‎‏‎‎‏‏‎‎‎‏‏‏‎‏‎‏‎‎Opening links‎‏‎‎‏‎"</string>
+    <string name="app_launch_open_domain_urls_title" msgid="8914721351596745701">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‏‎‏‏‏‎‏‏‎‏‏‏‎‏‏‏‎‎‏‏‏‏‎‏‎‏‏‎‎‏‎‎‏‎‎‏‏‎‎‎‎‎‏‏‏‎‏‎‎‎‏‏‏‏‏‎‎‏‎‏‎Open supported links‎‏‎‎‏‎"</string>
+    <string name="app_launch_open_domain_urls_summary" msgid="5367573364240712217">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‏‎‏‎‎‏‏‏‏‏‎‏‎‏‏‏‎‎‏‏‏‎‎‎‏‎‎‏‎‏‎‎‎‎‎‏‎‏‏‎‏‎‏‎‏‎‎‎‎‎‏‎‎‎‎‏‏‎‎‏‎Open without asking‎‏‎‎‏‎"</string>
+    <string name="app_launch_supported_domain_urls_title" msgid="8250695258211477480">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‎‎‏‎‏‎‎‎‎‎‎‎‎‏‎‏‏‎‏‏‏‎‎‏‏‏‏‏‏‎‎‎‏‏‏‏‏‎‏‏‎‎‎‏‏‏‏‎‎‏‏‏‏‏‏‎‏‎‎‎‎Supported links‎‏‎‎‏‎"</string>
+    <string name="app_launch_other_defaults_title" msgid="2516812499807835178">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‎‎‏‎‏‏‏‎‏‏‎‏‏‎‎‎‎‎‏‏‏‎‏‎‎‎‏‎‎‏‎‎‏‎‎‏‎‏‎‎‏‏‏‏‎‎‎‏‎‏‎‎‎‎‏‎‏‎‏‎‎Other defaults‎‏‎‎‏‎"</string>
+    <string name="storage_summary_format" msgid="5419902362347539755">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‏‎‏‏‎‎‏‏‎‏‏‏‎‏‎‏‏‏‎‎‎‏‏‏‏‎‏‏‏‎‎‏‎‎‎‏‎‎‎‎‎‏‏‎‏‎‎‎‏‏‎‏‎‎‏‎‏‎‏‏‎‎‏‎‎‏‏‎<xliff:g id="SIZE">%1$s</xliff:g>‎‏‎‎‏‏‏‎ used in ‎‏‎‎‏‏‎<xliff:g id="STORAGE_TYPE">%2$s</xliff:g>‎‏‎‎‏‏‏‎‎‏‎‎‏‎"</string>
+    <string name="storage_type_internal" msgid="6042049833565674948">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‎‎‏‏‏‏‎‏‏‎‎‏‏‎‏‎‏‏‎‎‎‏‎‎‏‏‏‏‏‎‏‏‏‏‎‎‏‏‏‎‎‎‏‏‏‏‎‏‏‏‎‏‏‏‎‎‎‏‎‎‎Internal storage‎‏‎‎‏‎"</string>
+    <string name="storage_type_external" msgid="7738894330670001898">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‏‎‏‏‎‏‏‎‎‏‏‎‎‎‎‏‎‎‏‏‎‏‏‎‎‏‎‎‎‎‏‎‏‏‎‏‏‏‎‏‏‏‏‎‏‎‏‎‏‏‏‎‏‏‏‎‏‎‏‎‎External storage‎‏‎‎‏‎"</string>
+    <string name="app_data_usage" msgid="7942375313697452803">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‏‏‏‎‎‎‏‏‏‎‎‎‏‏‏‏‏‏‎‎‎‏‎‎‎‏‎‎‎‏‏‎‏‏‎‏‏‏‎‎‎‏‎‎‏‎‏‏‎‎‏‏‎‎‎‎‎‎‏‏‎App data usage‎‏‎‎‏‎"</string>
+    <string name="data_summary_format" msgid="6213211533341068366">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‎‏‏‎‎‎‏‏‏‎‎‏‏‏‎‎‎‎‏‎‏‏‏‏‏‎‎‎‎‏‏‏‎‏‏‏‎‎‏‎‎‏‏‏‏‎‎‎‏‏‎‎‎‏‎‎‏‏‏‎‎‎‏‎‎‏‏‎<xliff:g id="SIZE">%1$s</xliff:g>‎‏‎‎‏‏‏‎ used since ‎‏‎‎‏‏‎<xliff:g id="DATE">%2$s</xliff:g>‎‏‎‎‏‏‏‎‎‏‎‎‏‎"</string>
+    <string name="storage_used" msgid="7128074132917008743">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‎‎‏‎‏‏‏‎‏‏‎‎‎‎‎‎‎‎‎‏‏‎‏‎‏‎‎‎‎‏‏‎‎‎‎‏‎‎‏‎‏‎‏‏‎‎‏‏‏‎‎‏‎‏‏‎‎‏‏‏‎Storage used‎‏‎‎‏‎"</string>
+    <string name="change" msgid="6657848623929839991">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‏‏‎‎‎‏‏‎‎‏‎‏‎‏‏‎‏‏‏‎‎‎‎‎‏‏‎‎‎‏‏‏‎‏‎‏‏‎‏‎‏‎‎‏‎‏‎‏‎‎‎‏‎‏‏‏‎‏‏‏‎Change‎‏‎‎‏‎"</string>
+    <string name="change_storage" msgid="600475265207060436">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‎‏‎‎‎‎‏‎‏‎‏‎‏‎‏‎‏‎‎‎‏‎‎‎‏‎‎‏‎‎‏‏‏‏‏‏‏‎‎‎‏‎‎‏‏‎‏‎‎‎‏‏‏‏‏‎‏‎‏‎‎‎Change storage‎‏‎‎‏‎"</string>
+    <string name="notifications_label" msgid="8543457911148619898">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‎‏‏‎‏‎‎‏‎‎‎‎‎‏‏‏‎‏‎‏‏‎‏‏‎‏‎‎‎‏‏‏‏‎‏‏‏‎‎‎‎‎‏‏‏‎‏‎‏‎‎‎‎‏‏‏‏‎‏‎‎App notifications‎‏‎‎‏‎"</string>
+    <string name="notifications_enabled" msgid="6983396130566021385">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‎‎‎‎‏‏‏‎‏‎‏‎‎‎‎‎‎‎‎‏‏‏‎‎‎‏‏‏‏‏‏‏‏‎‎‎‎‎‏‏‏‎‎‏‏‎‏‎‎‎‎‏‎‎‎‎‏‎‎‏‎On‎‏‎‎‏‎"</string>
+    <string name="notifications_disabled" msgid="334416731283131597">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‎‏‏‏‎‎‏‎‏‎‎‏‎‎‎‎‎‏‎‏‏‎‎‎‏‏‏‏‏‎‏‏‎‎‏‎‏‏‎‎‎‏‎‏‎‎‎‎‎‎‏‏‎‎‏‏‎‎‏‏‎‏‎Everything turned off‎‏‎‎‏‎"</string>
+    <string name="notifications_partly_blocked" msgid="592071133950126656">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‎‏‎‎‎‎‎‏‏‎‏‏‏‎‏‏‏‎‏‎‏‏‎‎‎‏‏‏‏‎‎‏‏‎‏‎‎‏‏‎‏‏‏‎‎‎‎‏‎‏‎‏‎‎‏‎‎‎‎‎‎‎‎‏‎‎‏‏‎<xliff:g id="COUNT_0">%1$d</xliff:g>‎‏‎‎‏‏‏‎ of ‎‏‎‎‏‏‎<xliff:g id="COUNT_1">%2$d</xliff:g>‎‏‎‎‏‏‏‎ categories turned off‎‏‎‎‏‎"</string>
+    <string name="notifications_silenced" msgid="4728603513072110381">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‎‎‎‏‏‎‎‏‏‏‏‏‎‏‎‏‏‏‏‏‏‏‎‏‎‏‏‏‏‎‎‎‏‎‎‎‎‏‎‏‎‎‏‏‏‏‎‎‏‎‏‏‎‎‏‎‏‏‎‏‎Silenced‎‏‎‎‏‎"</string>
+    <string name="notifications_redacted" msgid="4493588975742803160">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‏‏‏‎‎‏‎‏‏‏‎‎‎‏‏‎‏‏‏‏‎‏‎‏‏‏‎‏‏‎‎‎‏‎‎‏‏‏‎‎‎‎‏‎‏‏‎‏‏‏‎‎‏‏‎‏‏‎‎‎‎Sensitive content not on lock screen‎‏‎‎‏‎"</string>
+    <string name="notifications_hidden" msgid="3619610536038757468">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‎‎‏‎‎‎‏‏‏‎‏‏‎‏‏‏‎‎‎‎‏‎‎‏‏‎‏‎‏‏‏‎‎‎‎‏‏‏‎‏‏‎‎‏‏‏‏‏‎‏‎‎‎‏‎‏‏‏‎‎‎Not on lock screen‎‏‎‎‏‎"</string>
+    <string name="notifications_priority" msgid="1066342037602085552">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‎‏‏‏‎‏‏‎‎‏‏‎‎‎‏‏‎‏‎‎‎‎‏‏‎‏‏‏‎‏‏‏‏‏‎‎‎‎‏‎‏‎‏‏‎‏‎‏‎‏‎‏‎‏‎‏‏‎‎‎‎‎Do Not Disturb overridden‎‏‎‎‏‎"</string>
+    <string name="notifications_summary_divider" msgid="9013807608804041387">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‏‏‎‏‎‎‎‏‎‏‏‏‎‏‏‏‏‎‏‎‎‏‎‎‎‎‏‏‎‏‎‏‎‏‎‎‎‏‏‏‏‎‏‎‎‏‏‎‎‎‏‎‏‎‏‎‏‎‏‏‎ / ‎‏‎‎‏‎"</string>
+    <string name="notification_summary_level" msgid="2726571692704140826">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‎‏‎‏‏‏‎‏‎‏‏‎‏‎‏‏‏‎‏‎‏‎‎‎‎‎‏‎‎‎‏‎‏‏‏‎‎‏‎‎‎‏‎‎‎‎‎‎‏‏‏‎‎‎‎‏‏‎‏‎‎Level %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="other">‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‏‎‎‎‏‏‎‏‏‎‏‏‎‎‎‏‎‎‎‏‎‏‎‎‏‏‎‏‎‎‎‏‏‎‎‏‏‎‎‎‏‎‏‎‏‎‎‏‎‏‏‏‎‏‎‎‏‏‎‏‎‎‏‎‎‏‏‎<xliff:g id="COUNT_1">%d</xliff:g>‎‏‎‎‏‏‏‎ permissions granted‎‏‎‎‏‎</item>
+      <item quantity="one">‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‏‎‎‎‏‏‎‏‏‎‏‏‎‎‎‏‎‎‎‏‎‏‎‎‏‏‎‏‎‎‎‏‏‎‎‏‏‎‎‎‏‎‏‎‏‎‎‏‎‏‏‏‎‏‎‎‏‏‎‏‎‎‏‎‎‏‏‎<xliff:g id="COUNT_0">%d</xliff:g>‎‏‎‎‏‏‏‎ permission granted‎‏‎‎‏‎</item>
+    </plurals>
+    <plurals name="runtime_permissions_summary" formatted="false" msgid="1564663886246010959">
+      <item quantity="other">‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‎‏‎‏‏‎‏‏‎‏‏‎‏‏‎‎‏‏‎‏‏‎‎‎‎‎‏‏‏‎‏‏‏‏‎‎‏‎‎‏‎‎‏‏‎‏‏‎‎‎‎‎‎‏‎‎‏‏‏‏‎‎‏‎‎‏‏‎<xliff:g id="COUNT_2">%d</xliff:g>‎‏‎‎‏‏‏‎ of ‎‏‎‎‏‏‎<xliff:g id="COUNT_3">%d</xliff:g>‎‏‎‎‏‏‏‎ permissions granted‎‏‎‎‏‎</item>
+      <item quantity="one">‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‎‏‎‏‏‎‏‏‎‏‏‎‏‏‎‎‏‏‎‏‏‎‎‎‎‎‏‏‏‎‏‏‏‏‎‎‏‎‎‏‎‎‏‏‎‏‏‎‎‎‎‎‎‏‎‎‏‏‏‏‎‎‏‎‎‏‏‎<xliff:g id="COUNT_0">%d</xliff:g>‎‏‎‎‏‏‏‎ of ‎‏‎‎‏‏‎<xliff:g id="COUNT_1">%d</xliff:g>‎‏‎‎‏‏‏‎ permission granted‎‏‎‎‏‎</item>
+    </plurals>
+    <plurals name="runtime_permissions_additional_count" formatted="false" msgid="931276038884210752">
+      <item quantity="other">‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‎‏‏‎‎‏‏‏‎‏‏‎‎‏‎‎‎‏‏‏‎‏‎‎‏‏‏‏‏‏‎‎‎‏‏‎‏‏‎‎‎‎‏‏‎‏‎‏‏‏‎‎‎‎‏‎‎‎‎‎‎‎‎‏‎‎‏‏‎<xliff:g id="COUNT_1">%d</xliff:g>‎‏‎‎‏‏‏‎ additional permissions‎‏‎‎‏‎</item>
+      <item quantity="one">‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‎‏‏‎‎‏‏‏‎‏‏‎‎‏‎‎‎‏‏‏‎‏‎‎‏‏‏‏‏‏‎‎‎‏‏‎‏‏‎‎‎‎‏‏‎‏‎‏‏‏‎‎‎‎‏‎‎‎‎‎‎‎‎‏‎‎‏‏‎<xliff:g id="COUNT_0">%d</xliff:g>‎‏‎‎‏‏‏‎ additional permission‎‏‎‎‏‎</item>
+    </plurals>
+    <string name="runtime_permissions_summary_no_permissions_granted" msgid="1679758182657005375">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‎‏‏‏‎‏‎‎‏‏‏‏‏‎‏‏‎‎‏‏‎‎‏‎‏‎‏‎‏‏‎‏‏‎‎‏‏‏‎‏‎‎‏‏‏‎‎‏‎‏‏‏‎‎‏‏‏‏‏‏‎No permissions granted‎‏‎‎‏‎"</string>
+    <string name="runtime_permissions_summary_no_permissions_requested" msgid="7655100570513818534">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‏‎‏‎‎‎‏‏‏‏‎‎‎‏‏‎‎‎‎‏‎‏‏‎‏‎‎‏‎‎‎‏‎‎‎‏‎‏‎‏‏‏‎‏‏‏‎‎‎‎‏‏‏‎‏‎‎‏‏‎‎No permissions requested‎‏‎‎‏‎"</string>
+    <string name="filter_all_apps" msgid="1988403195820688644">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‏‎‏‏‏‎‎‏‏‎‎‎‎‎‏‏‏‎‏‎‎‎‏‎‏‎‏‏‏‏‏‎‏‏‎‏‎‎‏‎‎‏‎‎‏‏‎‎‎‏‎‏‎‎‎‎‎‏‎‎‎All apps‎‏‎‎‏‎"</string>
+    <string name="filter_enabled_apps" msgid="5395727306799456250">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‏‎‏‎‏‏‏‎‎‎‎‏‎‏‏‏‏‎‎‏‎‏‏‎‎‏‎‏‏‏‎‏‎‎‏‎‏‎‏‎‏‎‎‎‎‎‎‏‏‏‏‏‏‏‏‏‏‎‏‎‎Installed apps‎‏‎‎‏‎"</string>
+    <string name="filter_instant_apps" msgid="574277769963965565">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‎‏‏‏‏‏‏‏‏‏‏‎‎‎‎‎‏‏‏‏‏‎‏‎‎‏‎‏‏‎‏‏‎‏‎‎‎‏‎‎‎‏‏‎‏‏‎‎‎‎‏‏‎‎‎‏‏‏‏‏‎‏‎Instant apps‎‏‎‎‏‎"</string>
+    <string name="filter_personal_apps" msgid="3277727374174355971">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‏‏‎‏‎‏‏‏‏‏‎‎‏‏‎‏‎‎‏‏‏‎‏‎‏‏‏‎‎‏‎‎‎‎‎‎‎‎‏‏‏‏‎‎‏‎‎‎‎‎‏‎‎‎‎‎‎‎‏‏‎Personal‎‏‎‎‏‎"</string>
+    <string name="filter_work_apps" msgid="24519936790795574">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‎‏‏‏‏‎‏‎‏‏‏‎‎‎‏‏‏‎‎‏‏‎‎‎‎‎‎‏‎‏‎‏‎‏‎‎‏‎‏‎‏‎‎‏‎‎‏‎‏‎‏‎‎‏‏‎‏‏‎‎Work‎‏‎‎‏‎"</string>
+    <string name="filter_notif_all_apps" msgid="2299049859443680242">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‏‏‏‏‏‏‏‎‎‏‏‏‏‏‎‏‏‏‎‏‏‎‏‎‏‎‏‎‏‎‎‏‎‎‎‏‎‎‎‎‏‏‎‏‎‏‏‎‎‎‏‏‏‏‏‏‎‎‏‎‎Apps: All‎‏‎‎‏‎"</string>
+    <string name="filter_notif_blocked_apps" msgid="3300375727887991342">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‏‏‎‏‏‏‎‎‏‏‎‏‎‏‎‎‏‎‏‎‎‎‏‏‏‏‎‏‎‎‎‎‎‏‏‎‎‎‎‏‎‏‎‏‏‏‎‎‎‎‏‎‎‎‏‎‏‏‏‎‎Apps: Turned off‎‏‎‎‏‎"</string>
+    <string name="filter_notif_urgent_channels" msgid="3972473613117159653">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‎‏‏‏‎‎‏‎‎‎‎‏‎‎‎‎‏‏‏‏‏‎‏‏‎‏‎‎‎‎‏‏‏‏‎‏‎‏‏‏‎‏‎‏‏‏‏‏‏‎‎‎‏‏‏‎‎‏‎‏‎Categories: Urgent importance‎‏‎‎‏‎"</string>
+    <string name="filter_notif_low_channels" msgid="4128487387390004604">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‏‎‎‏‎‏‎‎‏‎‏‏‎‏‎‏‎‏‎‏‎‏‏‎‎‏‏‏‏‎‏‏‏‎‎‏‎‎‎‎‏‏‏‏‏‏‎‎‏‏‎‏‎‏‏‏‏‏‎‎‎Categories: Low importance‎‏‎‎‏‎"</string>
+    <string name="filter_notif_blocked_channels" msgid="5880190882221644289">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‎‎‎‏‏‎‎‏‏‎‏‎‏‎‏‎‎‎‏‎‎‏‏‏‎‎‏‏‏‏‏‎‏‎‏‎‎‏‎‎‏‏‏‏‏‏‎‏‏‎‏‎‎‎‎‎‎‎‎‏‎Categories: Turned off‎‏‎‎‏‎"</string>
+    <string name="filter_notif_dnd_channels" msgid="1817930848881696728">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‏‎‎‏‎‎‏‏‏‎‏‎‏‎‎‏‎‏‏‎‎‏‏‏‏‎‎‏‏‎‏‎‏‎‎‏‏‏‎‏‎‎‎‏‎‏‎‏‏‏‏‏‏‏‎‏‏‎‎‎‎Categories: Overrides Do Not Disturb‎‏‎‎‏‎"</string>
+    <string name="advanced_apps" msgid="4812975097124803873">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‎‎‏‎‏‏‎‎‏‎‏‏‎‎‎‏‏‏‏‏‎‏‎‏‏‎‎‏‏‏‎‎‎‎‎‎‏‏‏‎‏‏‎‎‏‏‎‏‎‏‎‏‎‎‏‎‎‎‎‏‎Advanced‎‏‎‎‏‎"</string>
+    <string name="configure_apps" msgid="6685680790825882528">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‏‏‎‎‏‏‎‎‏‎‎‎‎‏‎‎‏‏‏‏‎‏‎‎‎‎‎‏‏‏‎‎‏‎‏‎‏‏‎‏‎‏‎‎‎‏‎‏‎‎‏‏‏‎‏‎‎‎‎‎‎Configure apps‎‏‎‎‏‎"</string>
+    <string name="unknown_app" msgid="5275921288718717656">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‏‎‎‏‎‎‏‏‎‏‏‏‏‏‎‏‎‏‏‎‎‏‏‏‎‏‎‏‏‎‎‎‎‏‎‏‎‎‎‎‎‎‎‎‎‎‎‏‎‎‏‎‏‏‎‏‏‎‎‎‎Unknown app‎‏‎‎‏‎"</string>
+    <string name="app_permissions" msgid="4148222031991883874">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‏‎‎‏‏‎‎‏‎‎‎‏‎‏‏‏‎‎‎‏‏‏‏‏‎‏‎‏‏‎‏‏‏‎‏‎‎‏‎‏‎‎‏‏‎‏‎‎‏‎‎‎‎‏‏‎‎‎‏‎‎App permissions‎‏‎‎‏‎"</string>
+    <string name="app_permissions_summary" msgid="5163974162150406324">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‎‏‏‏‏‎‏‎‏‎‏‎‎‎‎‏‏‏‏‏‎‎‏‎‎‎‏‏‏‏‏‏‏‏‎‎‎‏‎‎‎‏‎‏‎‎‏‏‏‎‎‎‏‎‏‏‎‏‎‎‎Apps using ‎‏‎‎‏‏‎<xliff:g id="APPS">%1$s</xliff:g>‎‏‎‎‏‏‏‎‎‏‎‎‏‎"</string>
+    <string name="tap_to_wake" msgid="7211944147196888807">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‎‏‎‎‎‎‎‏‎‏‎‏‏‏‏‏‏‎‎‎‏‏‏‏‏‏‎‏‏‏‎‎‏‎‎‏‏‎‏‎‎‎‎‎‏‏‎‎‎‏‏‎‏‏‏‎‎‏‏‏‎Tap to wake‎‏‎‎‏‎"</string>
+    <string name="tap_to_wake_summary" msgid="4341387904987585616">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‏‏‎‎‎‎‏‏‏‏‏‏‏‎‏‏‎‏‎‏‎‏‎‎‏‏‎‎‎‏‎‎‎‏‎‎‏‏‏‏‎‏‏‎‎‏‎‏‏‏‎‎‎‏‎‏‎‎‎‎‎Double-tap anywhere on the screen to wake device‎‏‎‎‏‎"</string>
+    <string name="domain_urls_title" msgid="3132983644568821250">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‏‎‏‏‎‏‏‏‏‎‏‎‏‎‎‏‏‎‎‎‎‎‎‎‎‏‏‎‏‎‎‎‎‏‎‏‏‎‏‎‎‎‏‎‎‎‎‏‏‏‏‎‎‎‎‎‎‎‏‎‎Opening links‎‏‎‎‏‎"</string>
+    <string name="domain_urls_summary_none" msgid="2639588015479657864">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‎‏‎‎‏‎‏‎‎‎‎‏‏‎‏‏‎‎‏‏‎‏‎‏‎‎‎‎‏‎‏‎‎‎‎‎‎‎‎‎‏‎‏‏‎‎‎‏‎‏‎‏‏‎‎‎‏‎‎‎‎Don’t open supported links‎‏‎‎‏‎"</string>
+    <string name="domain_urls_summary_one" msgid="3704934031930978405">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‎‎‏‏‎‏‏‎‏‎‏‎‏‎‎‏‎‎‎‏‏‏‎‏‏‏‏‏‎‏‎‏‏‎‎‏‏‎‎‎‎‎‎‎‎‏‏‏‎‎‎‎‎‏‏‎‎‏‎‏‎Open ‎‏‎‎‏‏‎<xliff:g id="DOMAIN">%s</xliff:g>‎‏‎‎‏‏‏‎‎‏‎‎‏‎"</string>
+    <string name="domain_urls_summary_some" msgid="3950089361819428455">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‎‏‏‎‏‏‎‏‎‎‎‏‏‎‎‎‏‎‎‏‎‏‎‏‏‎‎‎‏‎‎‏‏‎‏‎‎‏‎‎‏‎‏‏‏‏‏‎‎‏‏‎‎‏‏‎‎‏‏‏‎Open ‎‏‎‎‏‏‎<xliff:g id="DOMAIN">%s</xliff:g>‎‏‎‎‏‏‏‎ and other URLs‎‏‎‎‏‎"</string>
+    <string name="domain_urls_apps_summary_off" msgid="1833056772600031220">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‏‎‎‏‎‏‏‏‎‎‎‎‎‏‎‏‎‎‏‏‎‏‏‎‏‏‎‎‎‎‏‏‎‏‏‏‏‏‏‏‎‎‏‎‏‏‏‎‎‏‏‏‏‏‏‏‎‏‎‎‎No app opening supported links‎‏‎‎‏‎"</string>
+    <plurals name="domain_urls_apps_summary_on" formatted="false" msgid="240214361240709399">
+      <item quantity="other">‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‎‏‎‏‏‎‏‎‏‎‏‎‏‎‏‏‎‏‎‎‏‏‎‏‏‎‎‎‎‎‏‎‏‎‏‏‏‏‎‏‏‎‎‏‏‎‎‏‎‏‎‎‏‎‎‎‏‎‏‏‏‎‎‏‎‎‏‏‎<xliff:g id="COUNT">%d</xliff:g>‎‏‎‎‏‏‏‎ apps opening supported links‎‏‎‎‏‎</item>
+      <item quantity="one">‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‎‏‎‏‏‎‏‎‏‎‏‎‏‎‏‏‎‏‎‎‏‏‎‏‏‎‎‎‎‎‏‎‏‎‏‏‏‏‎‏‏‎‎‏‏‎‎‏‎‏‎‎‏‎‎‎‏‎‏‏‏‎One app opening supported links‎‏‎‎‏‎</item>
+    </plurals>
+    <string name="app_link_open_always" msgid="2474058700623948148">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‎‎‏‎‎‏‎‏‎‏‎‏‏‎‎‏‏‏‏‏‎‏‎‎‎‏‏‏‏‎‏‏‎‏‎‎‎‎‏‎‎‏‏‏‏‎‏‎‏‎‎‏‎‏‏‏‎‏‎‎‎Open in this app‎‏‎‎‏‎"</string>
+    <string name="app_link_open_ask" msgid="7800878430190575991">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‏‏‎‎‎‏‎‎‎‎‏‎‎‏‎‎‏‎‎‏‏‎‎‏‏‎‎‏‏‏‏‏‎‏‏‏‏‎‎‎‎‏‎‎‎‎‏‎‎‎‎‏‎‏‏‏‎‏‏‏‎Ask every time‎‏‎‎‏‎"</string>
+    <string name="app_link_open_never" msgid="3407647600352398543">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‏‏‏‏‎‏‎‎‏‎‏‎‎‏‏‎‎‏‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‎‏‎‏‎‏‏‎‏‏‏‏‎‎‎‏‏‎‎‏‏‎‎‏‏‏‏‎Don’t open in this app‎‏‎‎‏‎"</string>
+    <string name="fingerprint_not_recognized" msgid="1739529686957438119">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‎‎‎‏‏‎‏‎‎‎‎‏‎‎‎‏‎‏‎‏‎‏‏‎‏‎‏‏‎‎‎‎‎‏‏‎‏‎‎‏‎‏‎‎‏‏‏‎Not recognized‎‏‎‎‏‎"</string>
+    <string name="default_apps_title" msgid="1660450272764331490">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‎‏‏‏‎‎‎‎‏‎‏‏‎‎‎‏‏‎‏‎‏‎‏‏‏‎‎‏‏‏‎‎‎‎‏‏‎‏‎‏‎‎‎‏‏‎‎‎‎‏‎‏‏‏‏‎‎‎‏‎‎Default‎‏‎‎‏‎"</string>
+    <string name="default_for_work" msgid="9152194239366247932">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‏‏‏‏‎‎‎‎‎‎‏‏‎‎‏‎‎‎‎‎‎‎‏‎‏‎‏‏‏‎‎‏‏‎‎‎‏‏‎‎‏‏‎‏‎‎‏‏‎‏‎‏‏‏‏‏‏‏‎‎‎Default for work‎‏‎‎‏‎"</string>
+    <string name="assist_and_voice_input_title" msgid="1733165754793221197">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‏‎‎‎‎‎‎‎‏‏‎‏‎‏‏‏‎‎‎‏‎‎‎‏‎‎‏‎‎‎‏‏‏‏‏‏‎‏‎‏‎‎‏‎‎‏‎‏‏‏‎‎‎‏‎‎‏‏‎‏‎Assist &amp; voice input‎‏‎‎‏‎"</string>
+    <string name="default_assist_title" msgid="8868488975409247921">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‏‎‏‏‎‎‎‏‎‎‏‏‎‎‏‏‎‎‏‏‏‎‏‏‏‏‎‎‎‏‏‎‎‎‎‏‏‎‏‏‏‏‎‎‎‏‏‏‎‏‏‎‏‎‏‏‎‎‎‏‎Assist app‎‏‎‎‏‎"</string>
+    <string name="assistant_security_warning_title" msgid="8673079231955467177">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‏‎‎‎‎‏‎‏‏‏‎‎‏‏‏‏‎‏‏‏‏‎‎‏‏‏‎‎‎‎‎‎‏‎‎‏‏‎‎‎‎‏‎‏‏‏‏‏‏‎‏‏‏‎‏‎‏‎‎‏‎Make ‎‏‎‎‏‏‎<xliff:g id="ASSISTANT_APP_NAME">%s</xliff:g>‎‏‎‎‏‏‏‎ your assistant?‎‏‎‎‏‎"</string>
+    <string name="assistant_security_warning" msgid="8498726261327239136">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‎‏‎‏‏‏‏‏‎‎‎‏‏‎‎‎‏‎‏‎‏‎‎‎‎‎‎‏‏‎‏‎‏‎‎‏‏‎‏‏‎‎‎‏‏‎‎‏‎‏‏‏‏‏‏‎‎‎‎‎‎The assistant will be able to read information about apps in use on your system, including information visible on your screen or accessible within the apps.‎‏‎‎‏‎"</string>
+    <string name="assistant_security_warning_agree" msgid="7710290206928033908">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‏‎‏‏‎‎‎‎‎‎‎‎‎‏‏‏‎‏‎‎‎‎‎‏‎‏‏‏‏‎‏‎‎‎‏‏‎‎‎‏‏‏‏‎‎‏‎‏‏‎‎‎‎‏‏‏‎‏‎‎‎Agree‎‏‎‎‏‎"</string>
+    <string name="assistant_security_warning_disagree" msgid="877419950830205913">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‎‏‏‎‎‎‎‏‎‏‏‎‏‎‎‏‏‏‎‎‎‏‏‎‎‏‎‏‏‏‏‏‎‏‎‎‎‎‎‎‏‎‎‏‏‎‎‏‏‏‎‏‏‏‏‎‏‏‎‎‏‎Disagree‎‏‎‎‏‎"</string>
+    <string name="choose_voice_input_title" msgid="975471367067718019">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‎‏‏‎‏‏‎‎‎‏‎‎‏‏‎‎‏‎‎‏‎‎‎‎‎‏‎‏‎‎‏‎‎‎‎‏‎‏‎‏‎‎‎‏‎‏‏‎‏‎‎‎‏‏‎‎‎‎‎‏‏‎Choose voice input‎‏‎‎‏‎"</string>
+    <string name="default_browser_title" msgid="8101772675085814670">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‎‎‎‎‎‏‏‎‏‏‏‏‎‏‎‎‎‏‏‏‎‏‎‏‎‎‏‎‏‎‏‎‏‏‎‏‎‏‏‏‎‏‎‎‏‏‎‎‏‎‏‏‏‎‎‎‏‏‏‎‎Browser app‎‏‎‎‏‎"</string>
+    <string name="default_browser_title_none" msgid="2124785489953628553">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‏‏‎‏‎‏‏‏‏‏‎‎‏‏‎‎‎‎‎‏‎‎‏‎‎‏‎‏‎‏‎‎‎‎‎‎‏‎‎‏‎‏‏‏‎‎‏‎‎‎‎‏‏‎‎‎‏‎‎‏‎No default Browser‎‏‎‎‏‎"</string>
+    <string name="default_phone_title" msgid="282005908059637350">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‎‏‎‏‏‏‏‏‎‏‎‎‏‏‏‏‎‎‎‏‎‏‏‏‎‎‎‎‏‎‎‎‏‎‏‏‎‎‏‏‏‎‏‎‎‏‏‎‎‎‏‏‎‎‏‏‎‎‏‏‎‎Phone app‎‏‎‎‏‎"</string>
+    <string name="default_app" msgid="6864503001385843060">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‏‏‏‏‎‏‎‎‎‎‏‏‏‎‎‏‏‏‎‏‎‎‎‏‏‏‎‎‎‎‏‎‏‏‎‏‎‎‏‏‎‏‎‎‏‎‏‏‏‎‎‏‎‏‏‏‎‏‎‎‎(Default)‎‏‎‎‏‎"</string>
+    <string name="system_app" msgid="9068313769550747372">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‏‏‎‏‏‏‎‏‏‎‎‏‎‎‎‏‏‏‏‏‎‏‎‏‎‎‏‏‏‏‎‏‎‎‎‏‏‏‎‏‏‎‏‏‎‎‎‏‎‏‏‎‏‏‏‎‏‏‎‎‎(System)‎‏‎‎‏‎"</string>
+    <string name="system_default_app" msgid="3091113402349739037">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‏‎‏‎‏‏‏‎‎‏‎‏‏‏‎‏‎‏‏‏‎‏‎‎‎‎‏‏‎‎‎‏‎‎‏‏‏‎‎‎‎‎‎‏‎‏‎‏‏‏‎‎‎‎‎‏‏‏‎‏‎(System default)‎‏‎‎‏‎"</string>
+    <string name="apps_storage" msgid="4353308027210435513">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‏‏‎‎‎‏‏‎‏‎‏‎‎‎‎‎‏‏‏‎‏‎‎‏‎‏‎‏‏‏‏‏‏‏‏‏‏‎‏‏‏‏‎‎‎‎‎‎‏‎‏‏‏‎‏‏‏‎‎‏‎Apps storage‎‏‎‎‏‎"</string>
+    <string name="usage_access" msgid="5479504953931038165">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‏‏‎‎‎‎‎‎‏‎‏‏‎‎‎‏‏‏‎‎‏‎‏‏‏‎‎‏‎‏‎‏‎‏‎‎‎‎‎‎‏‏‎‏‎‏‏‏‏‏‎‏‏‏‎‏‎‏‎‏‎Usage access‎‏‎‎‏‎"</string>
+    <string name="permit_usage_access" msgid="4012876269445832300">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‎‏‏‏‏‎‏‏‎‎‎‎‏‎‎‏‏‎‎‏‏‎‏‏‎‏‎‎‏‎‏‏‎‏‏‏‏‏‏‎‏‎‎‏‏‏‎‏‏‏‏‎‎‏‏‎‏‏‎‎‎Permit usage access‎‏‎‎‏‎"</string>
+    <string name="app_usage_preference" msgid="7065701732733134991">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‎‎‏‎‎‎‎‎‏‏‏‎‎‏‏‎‏‎‏‎‎‏‎‎‏‎‏‎‎‏‎‎‏‏‎‎‎‏‏‎‏‎‏‏‏‎‏‎‏‎‎‎‏‎‎‎‏‏‏‏‎App usage preferences‎‏‎‎‏‎"</string>
+    <string name="usage_access_description" msgid="1352111094596416795">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‎‎‏‎‏‏‎‎‎‎‏‏‏‎‏‎‏‎‎‏‏‏‏‎‎‎‎‎‎‏‏‏‎‎‏‎‎‏‎‎‏‎‎‎‏‎‏‏‎‏‎‏‎‎‎‏‏‎‏‏‎Usage access allows an app to track what other apps you’re using and how often, as well as your carrier, language settings, and other details.‎‏‎‎‏‎"</string>
+    <string name="memory_settings_title" msgid="7490541005204254222">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‎‏‏‏‏‏‏‏‎‎‏‏‏‎‏‏‏‏‏‏‎‏‎‏‏‎‏‏‏‎‎‎‏‏‏‎‏‎‏‏‎‎‏‎‎‏‏‎‏‏‏‎‎‎‎‎‏‏‏‎‎Memory‎‏‎‎‏‎"</string>
+    <string name="memory_details_title" msgid="8542565326053693320">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‎‏‏‎‏‎‎‎‏‏‎‏‎‏‎‎‏‎‎‏‏‏‏‎‎‏‏‏‎‏‎‏‎‎‎‏‏‏‏‏‏‏‏‏‏‏‎‏‎‏‏‏‏‎‎‎‏‎‎‎‎Memory details‎‏‎‎‏‎"</string>
+    <string name="always_running" msgid="6042448320077429656">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‎‎‏‏‏‏‎‏‏‎‏‏‎‎‎‏‎‏‏‎‏‎‏‏‏‎‏‏‏‎‎‏‏‎‏‏‏‏‎‏‏‏‏‎‏‏‏‏‏‎‏‏‏‎‎‏‏‎‎‎‎Always running (‎‏‎‎‏‏‎<xliff:g id="PERCENTAGE">%s</xliff:g>‎‏‎‎‏‏‏‎)‎‏‎‎‏‎"</string>
+    <string name="sometimes_running" msgid="6611250683037700864">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‏‎‏‏‏‎‏‏‏‏‏‏‏‏‏‎‎‎‎‏‎‏‏‏‎‏‏‏‏‏‏‎‎‎‏‏‏‎‎‎‎‏‎‏‎‏‎‏‎‎‏‏‎‎‎‎‎‎‎‎‎Sometimes running (‎‏‎‎‏‏‎<xliff:g id="PERCENTAGE">%s</xliff:g>‎‏‎‎‏‏‏‎)‎‏‎‎‏‎"</string>
+    <string name="rarely_running" msgid="348413460168817458">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‎‏‏‏‎‎‏‏‎‏‎‏‎‏‏‏‎‏‎‎‎‎‎‎‏‏‎‎‏‎‎‎‏‏‎‎‎‎‎‏‎‏‎‎‏‏‏‎‏‏‏‎‏‏‎‎‏‏‎‎‏‎‎Rarely running (‎‏‎‎‏‏‎<xliff:g id="PERCENTAGE">%s</xliff:g>‎‏‎‎‏‏‏‎)‎‏‎‎‏‎"</string>
+    <string name="memory_max_use" msgid="6874803757715963097">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‏‏‏‏‎‏‏‎‏‎‎‎‎‎‏‏‎‏‎‏‏‎‎‏‎‏‏‏‏‏‏‎‎‏‏‏‎‎‏‎‏‏‏‎‎‎‏‏‏‏‎‎‏‏‎‏‏‎‎‏‎Maximum‎‏‎‎‏‎"</string>
+    <string name="memory_avg_use" msgid="7382015389130622870">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‎‏‏‎‎‏‏‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‎‏‎‏‎‎‎‎‎‏‏‏‎‎‏‏‎‎‏‎‎‎‎‎‏‏‏‏‎‎‏‎‏‏‎‎Average‎‏‎‎‏‎"</string>
+    <string name="memory_max_desc" msgid="2861832149718335864">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‎‏‏‏‏‎‏‏‎‏‏‏‎‏‎‎‎‏‎‏‎‎‏‎‏‏‎‏‎‏‏‏‎‎‏‎‏‏‎‎‎‎‎‏‎‎‎‎‎‎‎‏‎‏‏‏‏‎‎‎‎Maximum ‎‏‎‎‏‏‎<xliff:g id="MEMORY">%1$s</xliff:g>‎‏‎‎‏‏‏‎‎‏‎‎‏‎"</string>
+    <string name="memory_avg_desc" msgid="1551240906596518412">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‎‏‎‏‏‎‎‎‎‏‏‏‎‎‎‏‏‏‎‏‎‏‏‎‎‎‏‎‏‎‏‏‏‏‏‎‏‎‏‏‏‏‎‏‏‎‎‎‏‎‏‎‎‎‎‎‏‏‎‎‎Average ‎‏‎‎‏‏‎<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">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‎‎‎‎‎‎‎‎‎‎‎‏‎‎‎‏‎‎‏‎‎‎‏‎‎‎‎‏‏‏‏‎‏‎‏‎‏‏‎‎‏‏‎‏‏‏‎‎‏‏‎‏‎‎‎‎‎‏‏‎‎Battery optimization‎‏‎‎‏‎"</string>
+    <string name="additional_battery_info" msgid="4754099329165411970">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‎‎‎‏‏‏‏‏‏‎‎‏‏‏‏‏‎‏‎‎‎‎‏‎‎‏‏‎‏‏‎‎‏‏‎‏‏‏‎‏‎‎‏‏‏‏‎‎‎‏‏‎‏‎‎‎‎‎‏‎‎Usage alerts‎‏‎‎‏‎"</string>
+    <string name="show_all_apps" msgid="1512506948197818534">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‎‏‎‎‏‏‏‏‏‏‎‏‏‎‎‎‎‎‎‏‎‎‎‎‏‏‏‎‎‏‎‎‎‏‏‏‏‎‏‎‎‏‎‎‎‎‏‎‎‎‎‎‏‎‏‎‎‏‏‎‎Show full device usage‎‏‎‎‏‎"</string>
+    <string name="hide_extra_apps" msgid="5016497281322459633">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‎‏‎‏‏‎‎‏‏‏‏‎‎‎‏‎‏‏‎‏‏‎‏‏‎‎‏‎‏‏‏‎‎‏‎‏‏‏‏‏‎‎‎‎‎‎‏‎‎‎‎‏‏‏‏‏‎‎‎‏‎Show app usage‎‏‎‎‏‎"</string>
+    <string name="power_high_usage_title" msgid="6027369425057347826">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‎‎‏‏‏‎‏‎‎‏‎‏‏‎‎‎‎‏‎‎‏‎‎‎‏‏‏‎‏‏‎‎‎‏‏‎‏‎‎‏‎‏‏‏‏‏‏‏‏‎‎‎‏‏‏‏‎‎‏‎‎High usage‎‏‎‎‏‎"</string>
+    <plurals name="power_high_usage_summary" formatted="false" msgid="467347882627862744">
+      <item quantity="other">‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‎‏‏‏‏‎‎‏‏‏‏‏‎‎‎‏‎‏‏‎‏‎‎‏‏‎‏‏‎‎‎‏‎‏‎‎‏‎‏‎‎‏‎‎‎‎‏‎‎‏‎‎‎‎‏‏‎‏‏‎‎‎‎‎‏‎‎‏‏‎<xliff:g id="NUMBER">%2$d</xliff:g>‎‏‎‎‏‏‏‎ apps behaving abnormally‎‏‎‎‏‎</item>
+      <item quantity="one">‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‎‏‏‏‏‎‎‏‏‏‏‏‎‎‎‏‎‏‏‎‏‎‎‏‏‎‏‏‎‎‎‏‎‏‎‎‏‎‏‎‎‏‎‎‎‎‏‎‎‏‎‎‎‎‏‏‎‏‏‎‎‎‎‎‏‎‎‏‏‎<xliff:g id="APP">%1$s</xliff:g>‎‏‎‎‏‏‏‎ behaving abnormally‎‏‎‎‏‎</item>
+    </plurals>
+    <plurals name="power_high_usage_title" formatted="false" msgid="3826660033363082922">
+      <item quantity="other">‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‎‏‎‏‎‎‎‏‏‎‏‏‎‎‎‎‎‏‏‏‎‎‎‎‎‏‏‎‏‎‎‏‏‏‎‎‏‏‎‎‏‎‏‎‎‏‏‏‏‏‏‎‏‎‏‎‏‎‏‎‎Apps draining battery‎‏‎‎‏‎</item>
+      <item quantity="one">‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‎‏‎‏‎‎‎‏‏‎‏‏‎‎‎‎‎‏‏‏‎‎‎‎‎‏‏‎‏‎‎‏‏‏‎‎‏‏‎‎‏‎‏‎‎‏‏‏‏‏‏‎‏‎‏‎‏‎‏‎‎‎‏‎‎‏‏‎<xliff:g id="APP">%1$s</xliff:g>‎‏‎‎‏‏‏‎ draining battery‎‏‎‎‏‎</item>
+    </plurals>
+    <string name="high_power_filter_on" msgid="3222265297576680099">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‏‏‎‎‏‎‏‏‎‏‏‏‏‏‎‎‏‎‎‏‎‎‏‏‎‏‏‏‎‏‎‎‎‎‏‎‎‎‏‎‎‎‎‎‎‏‎‏‏‎‏‎‏‎‏‎‎‎‏‏‎Not optimized‎‏‎‎‏‎"</string>
+    <string name="high_power_on" msgid="6216293998227583810">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‎‏‏‎‎‏‎‎‎‏‎‎‏‎‏‏‎‏‏‎‎‏‏‏‎‏‎‎‏‎‏‏‏‏‏‏‏‎‏‏‏‏‏‏‎‏‏‏‎‎‏‏‎‏‎‎‎‎‏‎‎Not optimized‎‏‎‎‏‎"</string>
+    <string name="high_power_off" msgid="3393904131961263278">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‏‏‏‏‎‎‎‏‏‎‎‏‏‎‎‏‎‎‎‏‏‏‎‏‎‎‏‏‏‎‎‎‏‎‏‏‎‏‎‎‏‎‎‎‎‎‎‏‎‏‎‎‏‎‏‎‏‏‏‎‎Optimizing battery use‎‏‎‎‏‎"</string>
+    <string name="high_power_system" msgid="7362862974428225301">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‎‏‏‎‎‎‏‎‏‏‏‎‎‎‏‎‎‏‎‎‏‏‎‏‏‏‎‏‎‏‏‏‏‎‎‎‏‎‏‎‏‎‏‏‏‎‎‏‏‏‏‏‎‎‎‏‎‏‎‏‎Battery optimization not available‎‏‎‎‏‎"</string>
+    <string name="high_power_desc" msgid="6283926163708585760">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‎‏‏‏‎‎‏‏‎‏‎‎‏‏‏‏‏‏‎‏‏‎‎‎‏‏‎‏‎‏‎‏‏‏‏‎‏‎‏‎‎‎‏‎‎‎‏‎‎‏‏‏‎‎‏‎‎‎‎‎‎Don’t apply battery optimization. May drain your battery more quickly.‎‏‎‎‏‎"</string>
+    <string name="high_power_prompt_title" msgid="6358673688590282655">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‏‎‎‎‎‎‏‏‏‏‏‎‏‎‎‎‏‏‎‎‎‎‎‎‎‏‏‏‏‎‏‏‎‎‏‏‎‎‎‎‏‎‏‏‏‏‏‎‏‏‏‏‏‎‎‏‏‏‏‏‎Let app always run in background?‎‏‎‎‏‎"</string>
+    <string name="high_power_prompt_body" msgid="1031422980602565049">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‎‏‏‏‎‎‏‎‏‎‎‎‎‎‏‎‏‏‎‎‏‏‎‏‏‏‏‎‎‎‏‏‏‎‎‏‏‏‏‏‏‏‏‎‏‏‎‎‏‎‎‎‏‏‎‏‏‏‎‎‏‎Allowing ‎‏‎‎‏‏‎<xliff:g id="APP_NAME">%1$s</xliff:g>‎‏‎‎‏‏‏‎ to always run in the background may reduce battery life. ‎‏‎‎‏‏‎\n‎‏‎‎‏‏‏‎‎‏‎‎‏‏‎\n‎‏‎‎‏‏‏‎You can change this later from Settings &gt; Apps &amp; notifications.‎‏‎‎‏‎"</string>
+    <string name="battery_summary" msgid="8044042095190688654">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‏‏‏‏‏‎‏‎‎‎‏‎‎‎‏‎‏‏‎‏‏‎‏‎‏‎‏‎‏‎‎‏‏‎‏‎‎‎‏‎‎‎‎‏‎‏‎‎‎‎‏‏‏‎‎‎‏‏‏‎‎‎‏‎‎‏‏‎<xliff:g id="PERCENTAGE">%1$s</xliff:g>‎‏‎‎‏‏‏‎ use since last full charge‎‏‎‎‏‎"</string>
+    <string name="battery_power_management" msgid="5571519699679107523">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‏‏‎‏‎‏‎‏‎‎‏‎‎‎‎‎‎‎‏‏‏‎‏‎‎‏‎‏‏‏‎‎‏‏‏‎‎‏‏‏‎‏‏‎‏‏‎‏‏‎‎‏‏‏‎‎‎‎‏‏‎Power management‎‏‎‎‏‎"</string>
+    <string name="no_battery_summary" msgid="3528036835462846814">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‎‎‎‎‏‏‏‏‎‏‏‎‎‎‎‏‏‎‏‎‏‏‎‎‏‏‏‏‎‎‏‏‏‏‎‎‎‏‎‎‎‎‎‏‏‎‎‏‏‎‎‏‎‏‎‏‏‏‏‎‎No battery use since last full charge‎‏‎‎‏‎"</string>
+    <string name="app_notification_preferences" msgid="1599319335092722613">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‎‏‏‎‎‎‏‏‎‎‎‏‏‏‏‎‏‏‎‎‎‏‏‏‎‏‏‎‎‎‏‏‎‎‏‎‏‎‎‏‏‏‎‏‏‎‎‏‏‎‏‏‏‎‏‏‎‏‎‏‎App settings‎‏‎‎‏‎"</string>
+    <string name="system_ui_settings" msgid="579824306467081123">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‎‏‎‎‎‎‎‎‎‏‎‏‏‏‏‏‏‎‎‏‏‎‎‏‎‎‎‏‎‎‏‏‏‏‎‏‏‎‎‎‏‏‎‏‏‏‎‎‎‏‎‏‏‏‎‏‎‎‎‏‏‎Show SystemUI Tuner‎‏‎‎‏‎"</string>
+    <string name="additional_permissions" msgid="6463784193877056080">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‏‎‎‏‏‎‏‏‎‎‏‏‏‏‏‏‏‎‎‏‎‏‏‏‏‎‏‎‎‏‎‎‏‏‎‎‏‏‎‏‎‎‏‏‏‎‎‏‏‎‏‎‎‏‎‏‎‎‎‎‎Additional permissions‎‏‎‎‏‎"</string>
+    <string name="additional_permissions_more" msgid="3538612272673191451">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‎‎‎‏‎‎‎‏‏‎‏‏‏‎‏‎‏‏‎‏‎‎‎‏‏‏‎‏‎‎‎‏‎‏‏‎‏‎‎‎‎‏‎‏‏‏‏‏‎‏‏‎‎‎‎‏‏‎‏‏‎‎‏‎‎‏‏‎<xliff:g id="COUNT">%1$d</xliff:g>‎‏‎‎‏‏‏‎ more‎‏‎‎‏‎"</string>
+    <string name="share_remote_bugreport_dialog_title" msgid="1124840737776588602">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‎‏‏‏‏‏‎‎‏‏‏‎‎‎‎‏‏‏‏‎‎‏‎‏‏‎‎‎‎‏‏‏‏‏‏‎‎‎‎‎‎‏‏‏‏‏‏‎‏‎‏‏‏‎‎‏‏‏‎‏‎‎Share bug report?‎‏‎‎‏‎"</string>
+    <string name="share_remote_bugreport_dialog_message_finished" msgid="4973886976504823801">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‎‏‎‏‎‎‎‎‎‏‏‎‏‏‎‎‏‎‏‏‏‏‎‏‏‎‏‎‎‎‏‏‎‎‏‏‏‎‎‎‎‎‏‎‏‏‏‏‏‏‏‏‏‏‏‏‏‎‎‏‎Your IT admin requested a bug report to help troubleshoot this device. Apps and data may be shared.‎‏‎‎‏‎"</string>
+    <string name="share_remote_bugreport_dialog_message" msgid="3495929560689435496">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‎‎‎‎‏‎‎‎‎‏‎‎‎‎‎‎‏‎‎‏‎‏‏‎‏‎‎‏‏‏‎‎‏‎‎‎‏‎‏‎‏‏‏‎‎‏‏‎‎‎‏‏‎‏‏‎‏‎‎‎‎Your IT admin requested a bug report to help troubleshoot this device. Apps and data may be shared, and your device may temporarily slow down.‎‏‎‎‏‎"</string>
+    <string name="sharing_remote_bugreport_dialog_message" msgid="5859287696666024466">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‎‎‎‏‎‏‎‏‎‎‎‎‎‏‎‏‏‏‏‏‎‎‎‏‏‏‎‏‏‏‎‎‎‏‎‎‏‎‎‏‏‎‎‎‎‏‎‏‏‎‏‎‎‎‎‏‎‎‏‎‎This bug report is being shared with your IT admin. Contact them for more details.‎‏‎‎‏‎"</string>
+    <string name="share_remote_bugreport_action" msgid="532226159318779397">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‎‏‏‏‏‏‎‏‏‎‎‎‏‎‏‏‎‏‏‎‎‎‏‏‎‏‏‏‏‏‎‎‏‏‏‏‏‎‎‏‎‏‏‏‎‏‏‏‎‎‎‏‏‎‎‎‎‎‎‏‎‏‎Share‎‏‎‎‏‎"</string>
+    <string name="decline_remote_bugreport_action" msgid="518720235407565134">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‎‏‏‏‏‏‎‎‏‏‎‎‏‎‏‏‎‏‏‏‎‏‎‏‎‎‏‏‏‎‎‏‎‎‏‎‎‏‎‏‎‎‎‏‏‎‎‏‏‎‎‎‎‏‎‏‎‎‏‏‏‎‎Decline‎‏‎‎‏‎"</string>
+    <string name="usb_use_charging_only" msgid="2180443097365214467">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‏‏‏‎‎‏‎‎‎‎‏‎‎‏‏‏‏‏‎‏‎‏‏‏‎‎‎‏‏‏‎‎‏‏‏‏‎‏‏‎‎‏‏‏‏‏‏‏‎‏‎‏‎‎‎‎‎‎‏‏‎Charge this device‎‏‎‎‏‎"</string>
+    <string name="usb_use_charging_only_desc" msgid="3066256793008540627">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‏‎‏‎‏‎‎‎‏‏‎‏‏‎‎‎‏‎‎‎‎‏‎‎‏‏‏‎‏‎‏‏‏‎‎‏‎‏‏‎‎‏‏‏‎‎‎‎‏‎‏‏‏‏‎‏‎‎‏‏‎Just charge this device‎‏‎‎‏‎"</string>
+    <string name="usb_use_power_only" msgid="6426550616883919530">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‏‎‎‏‎‎‏‎‏‏‏‏‏‎‏‏‎‎‎‏‏‎‏‏‏‏‎‎‏‎‎‏‏‎‏‎‎‏‏‎‏‏‏‎‏‏‏‏‏‎‏‎‏‎‏‎‏‎‏‎‎Supply power‎‏‎‎‏‎"</string>
+    <string name="usb_use_power_only_desc" msgid="3461232831015575152">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‎‎‎‎‎‎‎‎‏‎‎‎‏‏‎‎‎‏‎‎‏‏‏‎‏‎‏‏‏‏‏‎‎‎‎‏‏‎‎‏‏‎‏‎‎‏‎‏‏‏‏‎‎‏‏‏‎‎‎‎‎Charge the connected device. Works only with devices that support USB charging.‎‏‎‎‏‎"</string>
+    <string name="usb_use_file_transfers" msgid="7409600791007250137">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‎‏‏‎‏‏‎‏‎‏‎‎‎‎‏‏‎‎‎‎‏‎‏‎‏‎‎‏‎‏‏‎‎‎‏‏‎‏‏‏‎‎‎‎‏‏‎‎‎‏‏‎‏‏‎‏‏‎‎‏‎Transfer files‎‏‎‎‏‎"</string>
+    <string name="usb_use_file_transfers_desc" msgid="4235764784331804488">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‏‎‏‎‏‏‎‎‏‎‎‎‎‏‏‏‎‏‎‏‏‎‏‎‎‎‎‏‎‎‎‏‏‎‏‎‎‎‏‏‎‏‎‎‏‏‎‎‏‏‏‏‎‏‎‎‏‎‎‎‎Transfer files to another device‎‏‎‎‏‎"</string>
+    <string name="usb_use_photo_transfers" msgid="7794775645350330454">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‏‏‎‎‎‎‏‎‏‏‎‎‏‎‎‏‏‎‏‏‎‎‏‎‎‏‏‎‏‎‏‎‎‏‎‎‏‏‏‏‏‎‎‏‎‎‎‎‎‎‎‎‎‏‎‏‎‏‏‎‎Transfer photos (PTP)‎‏‎‎‏‎"</string>
+    <string name="usb_use_photo_transfers_desc" msgid="2963034811151325996">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‏‎‎‏‎‎‎‏‏‏‏‎‏‏‎‏‎‎‎‎‎‏‏‏‎‏‏‎‎‎‏‏‏‏‏‏‏‏‎‎‏‎‏‎‏‎‎‏‏‎‏‏‎‎‏‎‏‏‎‎‎Transfer photos or files if MTP is not supported (PTP)‎‏‎‎‏‎"</string>
+    <string name="usb_use_MIDI" msgid="870922185938298263">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‎‏‏‎‎‎‎‎‏‎‏‏‎‎‎‏‎‎‎‏‏‎‎‎‏‏‏‎‏‎‎‎‏‏‏‏‏‏‏‎‏‏‎‏‏‏‏‏‎‎‏‎‏‏‎‎‏‎‏‏‏‎Use device as MIDI‎‏‎‎‏‎"</string>
+    <string name="usb_use_MIDI_desc" msgid="8473936990076693175">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‎‏‎‏‏‎‎‏‏‎‎‏‎‏‏‏‏‎‎‎‏‏‎‎‏‎‏‏‏‎‏‎‏‏‏‎‏‎‎‏‎‎‎‎‎‏‏‎‏‎‏‎‏‎‏‏‎‏‏‏‎Use this device as MIDI‎‏‎‎‏‎"</string>
+    <string name="usb_use" msgid="3256040963685055320">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‏‏‎‏‎‎‏‎‏‏‏‏‏‏‎‎‏‎‎‎‎‎‎‎‎‎‎‏‎‏‎‏‎‏‏‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‎‏‎‏‏‎‎‎‎Use USB to‎‏‎‎‏‎"</string>
+    <string name="usb_pref" msgid="1400617804525116158">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‎‎‏‏‎‏‏‎‏‏‏‏‏‏‏‏‏‏‏‎‎‏‏‏‏‎‎‎‏‏‏‏‎‎‎‎‏‏‎‎‏‏‏‎‏‎‎‏‏‎‏‎‏‏‏‏‏‏‏‎‎USB‎‏‎‎‏‎"</string>
+    <string name="usb_summary_charging_only" msgid="7544327009143659751">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‏‎‎‎‏‎‏‏‎‎‏‎‏‏‎‏‎‏‎‏‎‏‏‏‎‎‎‏‎‏‏‏‏‎‎‏‎‏‏‎‎‏‎‎‏‎‎‏‏‏‎‎‏‏‏‎‎‏‏‏‎Charging this device‎‏‎‎‏‎"</string>
+    <string name="usb_summary_power_only" msgid="3629517713817003738">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‎‎‏‎‎‏‎‏‏‏‏‎‏‎‏‎‎‎‏‏‎‎‏‎‎‎‎‏‎‏‏‏‎‏‏‎‎‎‎‎‏‏‎‎‏‏‏‎‎‏‏‎‏‏‎‏‏‎‏‎‎Supplying power‎‏‎‎‏‎"</string>
+    <string name="usb_summary_file_transfers" msgid="6435943692610175111">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‏‎‎‏‎‏‎‏‎‎‎‏‎‎‎‏‎‎‎‎‏‎‏‏‎‎‎‎‎‏‏‏‏‎‎‎‎‏‏‏‎‎‏‎‎‎‎‎‎‎‎‎‏‎‎‎‎‏‏‏‎Transferring files‎‏‎‎‏‎"</string>
+    <string name="usb_summary_photo_transfers" msgid="8440204169576585250">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‎‏‎‏‎‎‏‎‎‎‎‏‏‎‏‎‎‎‎‎‏‏‏‏‏‎‎‏‎‏‎‏‏‏‏‏‎‏‏‎‎‎‏‎‎‎‎‏‏‎‎‎‎‎‏‎‎‎‏‎‎Transferring photos (PTP)‎‏‎‎‏‎"</string>
+    <string name="usb_summary_MIDI" msgid="5687906612187885908">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‏‏‏‎‏‏‏‎‏‏‏‏‏‎‎‎‎‎‎‎‏‏‏‎‏‏‎‏‏‎‎‎‏‏‏‏‎‎‎‎‏‏‎‏‏‏‏‏‎‎‎‏‎‏‎‏‎‏‎‎‎Using device as MIDI‎‏‎‎‏‎"</string>
+    <string name="sms_mirroring_pref" msgid="6475043279147376031">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‏‎‎‏‏‏‎‏‏‎‏‏‏‏‏‏‏‎‎‏‏‎‎‎‏‏‏‎‎‏‎‏‏‏‏‎‏‏‎‏‏‏‎‎‎‎‎‏‏‏‎‏‏‎‎‏‏‏‏‏‎SMS Mirroring‎‏‎‎‏‎"</string>
+    <string name="background_check_pref" msgid="7550258400138010979">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‏‎‎‎‏‏‎‎‎‏‏‏‏‏‏‎‏‎‎‎‎‎‎‎‎‎‏‏‎‎‎‎‏‏‏‎‏‎‏‎‎‎‏‎‏‎‏‎‎‎‎‏‎‏‏‎‎‎‏‏‎Background check‎‏‎‎‏‎"</string>
+    <string name="background_check_title" msgid="4534254315824525593">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‏‏‏‎‏‏‏‎‏‏‎‎‏‏‏‎‏‎‎‎‎‏‎‎‎‏‏‎‏‏‎‏‏‎‎‎‎‎‎‎‎‎‎‎‏‎‏‏‎‎‎‏‎‎‎‏‏‎‎‏‎Full background access‎‏‎‎‏‎"</string>
+    <string name="assist_access_context_title" msgid="2269032346698890257">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‏‏‏‏‎‏‏‏‏‏‎‏‎‎‏‏‏‎‎‎‏‏‏‎‎‏‎‏‏‏‎‎‎‎‎‎‏‏‎‏‏‎‏‏‏‎‏‏‏‏‎‎‎‎‎‏‎‎‎‏‎Use text from screen‎‏‎‎‏‎"</string>
+    <string name="assist_access_context_summary" msgid="1991421283142279560">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‏‎‏‏‏‎‏‎‎‎‏‎‏‏‏‏‎‎‏‏‎‎‎‏‏‎‏‏‎‎‏‎‎‎‏‏‏‏‎‏‏‎‎‏‎‎‏‎‎‎‎‏‏‎‎‎‏‎‎‎‎Allow the assist app to access the screen contents as text‎‏‎‎‏‎"</string>
+    <string name="assist_access_screenshot_title" msgid="4034721336291215819">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‎‏‏‏‏‏‏‏‏‏‏‎‎‎‏‏‎‏‎‏‏‎‏‎‏‏‎‏‏‎‏‏‎‎‎‏‎‏‎‏‎‎‏‏‏‏‎‎‏‎‎‏‏‏‎‎‏‎‏‏‎Use screenshot‎‏‎‎‏‎"</string>
+    <string name="assist_access_screenshot_summary" msgid="6761636689013259901">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‏‏‎‏‏‏‎‏‎‏‏‎‎‎‏‎‏‎‎‎‏‎‏‏‏‏‏‎‎‏‏‏‎‏‎‎‏‏‏‎‎‎‏‎‎‎‏‏‏‏‏‎‎‏‏‏‏‏‎‏‎Allow the assist app to access an image of the screen‎‏‎‎‏‎"</string>
+    <string name="assist_flash_title" msgid="506661221230034891">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‎‏‏‏‏‏‎‎‎‎‏‎‎‎‎‎‎‎‎‏‎‏‏‎‏‏‎‎‏‎‎‏‎‎‎‎‎‎‏‏‏‎‎‎‎‏‏‎‏‏‏‏‏‏‏‏‎‎‏‎‏‏‎Flash screen‎‏‎‎‏‎"</string>
+    <string name="assist_flash_summary" msgid="9160668468824099262">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‏‏‏‏‎‎‏‎‎‎‎‏‎‎‏‏‏‎‏‏‎‏‏‎‏‏‏‏‏‏‏‎‎‏‎‏‎‏‏‎‎‎‎‏‏‏‎‎‏‎‎‏‏‎‏‏‏‏‏‎‎Flash edges of screen when assist app accesses text from screen or screenshot‎‏‎‎‏‎"</string>
+    <string name="assist_footer" msgid="1982791172085896864">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‏‎‏‏‏‎‎‎‎‏‎‎‎‏‎‎‏‎‏‎‎‎‎‏‎‎‎‎‏‏‎‏‎‎‏‏‏‏‏‏‎‏‎‏‏‏‎‏‎‏‏‎‏‎‏‎‎‎‎‎‎Assist apps can help you based on information from the screen you’re viewing. Some apps support both launcher and voice input services to give you integrated assistance.‎‏‎‎‏‎"</string>
+    <string name="average_memory_use" msgid="829566450150198512">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‎‏‎‏‏‏‎‎‎‎‎‏‏‎‎‏‏‎‏‏‎‎‏‎‎‏‎‏‎‏‎‎‎‏‎‏‎‏‏‎‎‏‎‎‎‏‏‎‎‏‏‎‎‏‏‏‏‎‎‎‎‎Average memory use‎‏‎‎‏‎"</string>
+    <string name="maximum_memory_use" msgid="7493720799710132496">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‎‏‏‏‏‏‏‏‏‏‏‏‎‎‎‎‏‎‏‏‎‏‎‏‏‏‎‏‎‎‏‎‏‎‎‎‏‎‏‎‏‏‎‏‏‎‏‏‏‎‎‏‎‎‎‏‎‎‎‎‎Maximum memory use‎‏‎‎‏‎"</string>
+    <string name="memory_usage" msgid="1781358557214390033">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‏‎‎‎‏‎‏‏‏‎‎‎‏‎‏‎‏‎‎‎‎‎‏‎‏‎‏‏‎‏‏‏‎‏‎‎‎‏‎‏‏‏‎‏‏‎‏‏‎‏‏‏‎‎‎‏‎‎‎‏‎Memory usage‎‏‎‎‏‎"</string>
+    <string name="app_list_memory_use" msgid="6987417883876419338">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‎‎‎‎‏‏‏‏‏‎‎‎‎‏‎‎‏‎‏‏‏‎‎‎‏‎‏‏‎‏‏‎‎‎‎‏‏‎‏‎‏‎‏‎‎‏‏‎‎‏‏‏‎‎‎‎‏‎‏‎‎App usage‎‏‎‎‏‎"</string>
+    <string name="memory_details" msgid="5943436005716991782">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‎‎‏‎‎‏‏‏‏‎‏‏‎‏‎‏‎‎‏‏‏‎‎‎‏‏‏‎‏‎‏‏‏‎‏‎‎‎‎‎‎‏‏‏‎‎‎‏‏‏‏‏‎‎‏‎‎‏‏‎‎Details‎‏‎‎‏‎"</string>
+    <string name="memory_use_summary" msgid="5608257211903075754">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‏‏‎‏‏‏‎‏‎‏‎‎‏‎‎‎‏‎‎‎‎‎‏‏‏‎‎‎‎‏‏‎‏‏‎‎‏‎‎‎‎‎‎‏‎‏‏‎‎‏‎‏‏‎‏‎‏‎‏‎‎‎‏‎‎‏‏‎<xliff:g id="SIZE">%1$s</xliff:g>‎‏‎‎‏‏‏‎ avg memory used in last 3 hours‎‏‎‎‏‎"</string>
+    <string name="no_memory_use_summary" msgid="2016900536806235588">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‏‎‏‏‏‏‏‏‏‏‎‏‎‏‏‏‏‎‎‎‎‏‎‏‏‎‏‎‎‎‏‎‏‎‏‏‏‎‏‎‎‎‎‏‎‏‎‏‏‏‎‏‏‏‎‎‎‏‎‎‎No memory used in last 3 hours‎‏‎‎‏‎"</string>
+    <string name="sort_avg_use" msgid="3998036180505143129">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‎‏‏‏‎‏‏‏‏‎‏‏‏‏‏‎‎‎‎‎‏‎‏‏‏‎‎‏‎‏‎‎‎‎‏‎‎‎‏‎‏‎‏‏‎‎‏‎‎‏‏‏‎‏‎‏‏‎‎‏‎Sort by avg use‎‏‎‎‏‎"</string>
+    <string name="sort_max_use" msgid="4629247978290075124">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‎‎‎‎‎‎‏‏‏‏‏‎‎‏‏‎‎‏‎‎‏‎‎‎‎‎‏‎‎‏‏‎‏‎‏‏‎‎‏‎‏‏‎‎‏‏‎‏‎‏‎‏‏‏‏‏‎‏‎‎‎Sort by max use‎‏‎‎‏‎"</string>
+    <string name="memory_performance" msgid="5661005192284103281">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‏‏‏‎‏‎‎‎‏‏‏‏‏‏‏‎‏‏‏‎‎‎‏‏‏‎‏‎‏‎‏‎‎‏‎‏‏‎‏‏‏‏‎‎‎‏‏‎‎‎‏‎‎‏‏‏‎‎‎‏‎Performance‎‏‎‎‏‎"</string>
+    <string name="total_memory" msgid="2017287600738630165">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‏‎‏‏‏‏‏‏‏‏‏‎‏‏‎‏‏‎‎‎‎‏‏‎‎‎‏‎‏‎‎‎‎‎‏‏‏‏‎‏‎‎‏‏‎‏‏‏‏‎‏‎‎‎‎‏‎‏‎‏‎Total memory‎‏‎‎‏‎"</string>
+    <string name="average_used" msgid="5338339266517245782">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‏‎‏‎‎‎‎‏‎‏‎‏‏‎‎‏‎‏‏‏‎‏‎‎‎‏‏‏‎‏‏‏‎‏‏‏‎‏‎‎‎‏‏‏‏‎‎‏‏‏‏‏‎‏‎‏‎‏‏‎‎Average used (%)‎‏‎‎‏‎"</string>
+    <string name="free_memory" msgid="4003936141603549746">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‎‏‏‏‏‎‎‏‎‎‎‎‏‏‎‏‎‏‏‎‏‎‏‏‎‏‎‎‏‏‏‏‏‏‏‏‏‎‏‎‎‎‎‎‏‎‏‏‎‎‏‎‎‎‏‏‎‎‏‎‎Free‎‏‎‎‏‎"</string>
+    <string name="memory_usage_apps" msgid="5650192998273294098">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‏‏‏‎‎‏‏‎‏‎‎‏‏‎‎‎‎‏‎‎‏‎‎‏‏‎‎‎‏‎‎‎‏‏‏‎‎‏‏‏‏‎‏‎‏‎‎‏‏‏‏‏‎‎‎‏‎‎‏‎‎Memory used by apps‎‏‎‎‏‎"</string>
+    <plurals name="memory_usage_apps_summary" formatted="false" msgid="6089210945574265774">
+      <item quantity="other">‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‎‏‎‎‏‎‎‎‎‎‎‏‎‎‏‏‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‎‏‏‎‏‎‏‎‏‏‏‏‏‏‏‏‎‎‎‏‏‏‎‏‎‏‏‏‎‎‎‏‎‎‏‏‎<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="one">‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‎‏‎‎‏‎‎‎‎‎‎‏‎‎‏‏‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‎‏‏‎‏‎‏‎‏‏‏‏‏‏‏‏‎‎‎‏‏‏‎‏‎‏‏‏‎‎1 app used memory in the last ‎‏‎‎‏‏‎<xliff:g id="DURATION_0">%2$s</xliff:g>‎‏‎‎‏‏‏‎‎‏‎‎‏‎</item>
+    </plurals>
+    <string name="running_frequency" msgid="6622624669948277693">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‏‎‏‏‏‏‏‎‏‎‎‎‎‏‎‎‏‎‏‎‎‎‎‎‏‏‎‎‏‎‎‏‎‏‎‏‎‎‎‎‎‎‎‏‎‏‏‏‎‎‏‏‏‎‏‏‏‏‎‏‎Frequency‎‏‎‎‏‎"</string>
+    <string name="memory_maximum_usage" msgid="6513785462055278341">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‏‎‏‎‎‏‏‎‎‏‎‏‏‎‎‏‏‏‎‏‎‏‎‏‏‏‎‏‏‏‎‎‎‎‎‎‏‏‏‎‏‎‎‎‏‎‎‏‎‏‏‏‎‎‎‎‎‏‎‏‎Maximum usage‎‏‎‎‏‎"</string>
+    <string name="no_data_usage" msgid="9131454024293628063">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‏‏‏‎‏‎‏‏‏‎‎‏‎‏‏‏‎‎‎‏‎‎‎‎‏‏‎‏‏‏‏‏‏‎‎‎‏‏‎‏‎‏‎‏‎‎‏‏‏‎‎‎‏‎‎‏‏‏‏‏‎No data used‎‏‎‎‏‎"</string>
+    <string name="zen_access_warning_dialog_title" msgid="1198189958031157142">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‎‎‎‎‏‎‏‎‎‎‎‎‏‏‎‏‎‎‏‏‎‏‏‎‏‎‏‏‎‎‏‎‎‏‎‏‏‏‏‎‎‎‏‏‎‎‏‎‎‏‏‏‏‎‎‏‎‏‏‎‎Allow access to Do Not Disturb for ‎‏‎‎‏‏‎<xliff:g id="APP">%1$s</xliff:g>‎‏‎‎‏‏‏‎?‎‏‎‎‏‎"</string>
+    <string name="zen_access_warning_dialog_summary" msgid="4015885767653010873">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‎‏‏‏‏‎‏‏‏‎‏‏‎‏‎‎‏‎‏‎‏‏‎‏‎‏‎‎‎‎‎‏‏‏‏‏‏‎‎‎‎‎‎‏‎‎‏‎‏‏‎‏‏‎‏‏‏‎‎‏‎The app will be able to turn on/off Do Not Disturb and make changes to related settings.‎‏‎‎‏‎"</string>
+    <string name="zen_access_disabled_package_warning" msgid="302820100078584431">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‎‏‏‏‎‎‎‎‏‏‎‎‏‏‏‏‎‏‎‏‎‏‎‏‎‎‎‏‏‎‏‏‎‏‎‎‎‎‎‎‎‎‏‎‎‎‎‏‎‎‎‎‏‎‎‏‏‎‏‏‏‏‎Must stay turned on because notification access is on‎‏‎‎‏‎"</string>
+    <string name="zen_access_revoke_warning_dialog_title" msgid="558779234015793950">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‎‏‏‏‏‏‏‏‎‎‎‎‎‏‎‎‏‎‏‏‏‎‏‏‎‎‎‎‎‎‏‎‏‏‎‏‏‏‎‏‏‎‎‎‎‎‎‏‎‏‎‎‏‏‎‎‎‏‏‏‏‎‎Revoke access to Do Not Disturb for ‎‏‎‎‏‏‎<xliff:g id="APP">%1$s</xliff:g>‎‏‎‎‏‏‏‎?‎‏‎‎‏‎"</string>
+    <string name="zen_access_revoke_warning_dialog_summary" msgid="5518216907304930148">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‏‏‎‎‏‎‎‏‎‏‎‎‏‎‏‎‎‏‎‏‎‎‎‎‏‎‏‎‎‏‎‏‏‎‎‏‎‏‏‏‎‏‏‏‎‎‎‎‏‎‏‏‎‏‏‎‎‏‎‎‎All Do Not Disturb rules created by this app will be removed.‎‏‎‎‏‎"</string>
+    <string name="ignore_optimizations_on" msgid="6915689518016285116">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‏‏‏‏‏‏‏‏‏‎‎‏‎‏‏‏‎‏‏‎‏‏‏‏‏‎‎‏‏‏‎‎‏‎‏‎‎‏‎‎‎‎‎‎‏‏‎‎‏‎‎‏‏‎‏‏‏‏‎‎‎Don’t optimize‎‏‎‎‏‎"</string>
+    <string name="ignore_optimizations_off" msgid="6153196256410296835">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‎‏‎‏‎‏‏‎‎‏‎‎‏‎‎‎‏‎‏‏‎‏‏‎‎‏‎‎‏‏‏‎‏‎‎‎‏‎‎‏‏‎‎‏‎‏‏‎‎‎‏‎‎‎‎‎‎‎‏‏‎Optimize‎‏‎‎‏‎"</string>
+    <string name="ignore_optimizations_on_desc" msgid="2321398930330555815">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‎‎‎‎‎‎‏‏‎‏‏‏‎‏‎‎‎‏‎‎‎‎‎‎‎‏‏‏‎‎‏‎‎‎‎‎‎‏‎‏‎‎‏‏‎‎‎‏‎‏‎‏‏‎‏‎‎‏‏‏‎May drain your battery more quickly‎‏‎‎‏‎"</string>
+    <string name="ignore_optimizations_off_desc" msgid="5255731062045426544">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‏‎‎‎‏‏‏‏‎‎‎‎‎‎‎‏‏‎‏‏‏‎‎‎‏‏‏‎‎‎‎‎‏‏‎‎‎‎‏‏‎‏‎‎‎‏‎‎‎‎‏‏‎‏‏‏‎‎‎‎‎Recommended for better battery life‎‏‎‎‏‎"</string>
+    <string name="ignore_optimizations_title" msgid="2829637961185027768">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‎‏‏‏‎‏‎‎‎‏‎‎‏‏‏‎‎‏‎‎‏‎‏‏‏‎‏‏‏‏‎‎‏‏‏‏‎‏‏‎‎‏‎‎‏‏‏‎‎‏‏‎‏‎‏‏‏‎‎‎‎Allow ‎‏‎‎‏‏‎<xliff:g id="APP">%s</xliff:g>‎‏‎‎‏‏‏‎ to ignore battery optimizations?‎‏‎‎‏‎"</string>
+    <string name="app_list_preference_none" msgid="108006867520327904">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‎‎‏‏‎‏‏‏‏‏‏‏‏‎‏‏‎‏‏‏‏‎‏‎‏‏‎‎‎‏‏‏‏‎‏‏‏‏‎‏‏‎‏‎‎‎‎‏‎‎‎‎‏‏‏‎‎‎‎‎‎None‎‏‎‎‏‎"</string>
+    <string name="work_profile_usage_access_warning" msgid="2918050775124911939">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‏‎‎‎‎‏‏‏‏‏‏‎‏‏‏‏‏‏‏‏‏‎‏‏‏‎‎‎‎‎‏‎‏‏‏‏‏‏‎‏‏‏‏‏‏‎‏‎‎‏‏‏‎‏‎‎‎‎‏‏‎Turning off usage access for this app doesn\'t prevent your admin from tracking data usage for apps in your work profile‎‏‎‎‏‎"</string>
+    <string name="accessibility_lock_screen_progress" msgid="2408292742980383166">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‎‎‎‏‎‏‏‎‏‎‏‏‏‏‏‏‏‎‎‏‎‏‏‏‏‏‎‏‎‏‏‏‎‏‎‎‎‏‏‏‏‏‏‏‎‎‏‏‎‎‎‏‏‎‏‏‏‏‏‎‎‎‏‎‎‏‏‎<xliff:g id="COUNT_0">%1$d</xliff:g>‎‏‎‎‏‏‏‎ of ‎‏‎‎‏‏‎<xliff:g id="COUNT_1">%2$d</xliff:g>‎‏‎‎‏‏‏‎ characters used‎‏‎‎‏‎"</string>
+    <string name="draw_overlay" msgid="6564116025404257047">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‏‎‏‏‎‎‎‏‏‎‎‎‎‏‏‎‏‏‎‎‏‎‏‏‏‏‏‏‎‎‏‏‎‏‏‎‏‎‏‎‏‎‏‏‎‏‏‏‎‎‏‏‎‎‎‏‎‏‏‏‎Display over other apps‎‏‎‎‏‎"</string>
+    <string name="system_alert_window_settings" msgid="8466613169103527868">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‎‏‎‏‎‏‏‏‏‏‏‏‎‏‏‏‎‎‏‏‏‏‎‏‎‎‎‏‏‎‏‏‏‎‏‏‎‎‎‎‏‏‏‏‎‏‎‏‏‏‏‏‏‎‏‏‏‏‎‎‎Display over other apps‎‏‎‎‏‎"</string>
+    <string name="system_alert_window_apps_title" msgid="7005760279028569491">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‎‎‎‏‎‎‏‏‏‎‎‏‎‏‏‏‎‏‎‏‏‏‎‏‏‎‏‏‎‎‎‎‏‏‎‏‎‎‎‎‏‎‏‎‎‎‎‏‎‏‎‏‏‎‎‏‎‎‏‏‎Apps‎‏‎‎‏‎"</string>
+    <string name="system_alert_window_access_title" msgid="6297115362542361241">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‎‏‏‏‎‏‏‎‎‎‏‏‏‏‎‏‏‎‎‏‎‎‎‎‏‏‏‏‎‎‎‎‎‏‎‏‏‏‏‏‏‏‏‎‎‎‎‏‏‎‏‎‏‎‎‏‏‎‎‏‎Display over other apps‎‏‎‎‏‎"</string>
+    <string name="permit_draw_overlay" msgid="7456536798718633432">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‎‏‏‏‎‏‏‏‏‎‏‎‏‏‏‏‎‎‎‎‏‎‏‏‎‏‏‎‎‏‎‎‎‏‏‎‎‏‎‎‎‎‎‎‏‎‏‎‎‏‎‏‏‏‎‏‏‎‎‎‎Allow display over other apps‎‏‎‎‏‎"</string>
+    <string name="app_overlay_permission_preference" msgid="9039432222453006038">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‏‏‎‏‎‏‏‏‎‎‏‎‏‎‎‎‎‎‏‏‏‎‏‏‎‏‏‎‏‎‎‏‏‏‏‎‏‎‎‎‎‏‏‏‏‏‏‏‏‏‏‎‏‏‎‏‎‏‏‎‎App display on top permission‎‏‎‎‏‎"</string>
+    <string name="allow_overlay_description" msgid="8961670023925421358">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‏‏‎‎‎‏‎‏‏‏‏‎‎‎‏‏‏‏‏‏‎‏‏‎‎‏‏‏‏‏‏‎‎‎‏‎‎‏‎‏‎‏‏‏‎‏‎‏‎‏‎‏‎‎‏‎‏‏‏‎‎Allow this app to display on top of other apps you’re using. It may interfere with your use of those apps or change the way they seem to appear or behave.‎‏‎‎‏‎"</string>
+    <string name="keywords_vr_listener" msgid="7441221822576384680">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‎‏‏‏‎‏‎‎‎‏‎‎‏‎‎‎‎‏‏‏‏‏‎‏‎‎‏‎‏‎‎‎‎‏‎‏‏‎‎‎‏‏‎‎‏‏‎‏‏‎‏‎‏‎‏‎‏‎‎‎‎vr virtual reality listener stereo helper service‎‏‎‎‏‎"</string>
+    <string name="keywords_system_alert_window" msgid="5049498015597864850">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‎‏‏‎‎‎‎‏‎‎‏‏‎‏‏‎‏‎‏‏‏‎‏‏‎‎‎‏‎‎‎‏‏‎‎‏‏‏‎‎‎‎‎‎‎‎‏‎‎‏‏‏‏‎‎‏‎‎‏‎‎system alert window dialog display on top other apps‎‏‎‎‏‎"</string>
+    <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="app_permission_summary_allowed" msgid="1505409933012886711">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‎‏‎‎‏‏‏‎‎‏‎‎‎‏‎‎‏‎‏‎‎‏‎‏‏‎‏‏‏‎‏‎‏‎‏‎‏‎‎‏‎‎‏‏‏‏‏‎‎‏‎‎‏‎‏‏‎‏‏‏‎Allowed‎‏‎‎‏‎"</string>
+    <string name="app_permission_summary_not_allowed" msgid="2592617058101882802">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‎‎‏‏‏‏‏‏‏‎‏‎‏‏‎‏‎‎‏‏‎‏‏‏‏‎‏‎‎‏‏‎‎‎‏‎‏‏‎‎‎‏‏‏‏‏‏‎‏‏‏‏‏‎‏‏‎‎‏‎‎Not allowed‎‏‎‎‏‎"</string>
+    <string name="keywords_install_other_apps" msgid="761078076051006558">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‎‏‎‏‎‏‎‎‎‏‏‏‏‏‏‏‎‎‏‎‎‎‏‏‏‏‎‏‎‎‏‎‏‎‎‎‏‎‏‎‏‏‎‏‏‏‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‎install apps unknown sources‎‏‎‎‏‎"</string>
+    <string name="write_settings" msgid="4797457275727195681">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‎‎‏‎‏‎‎‏‎‎‏‏‏‏‏‏‏‏‎‏‏‏‏‏‏‎‎‏‎‏‏‎‏‎‎‎‏‏‎‏‎‏‎‏‎‎‏‎‏‏‏‎‎‎‏‎‎‎‎‏‎Modify system settings‎‏‎‎‏‎"</string>
+    <string name="keywords_write_settings" msgid="6415597272561105138">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‏‎‎‏‎‎‎‎‏‎‎‎‏‏‎‎‎‏‏‏‏‎‏‏‏‎‏‎‎‏‏‎‎‏‎‎‏‏‏‏‏‎‎‎‎‎‏‏‏‎‎‎‏‏‏‏‎‎‏‎‎write modify system settings‎‏‎‎‏‎"</string>
+    <string name="write_settings_summary" msgid="4302268998611412696">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‏‎‏‏‏‎‏‏‎‏‎‎‏‎‏‏‏‎‏‎‏‏‎‏‏‏‎‎‎‎‎‏‏‏‏‎‎‏‏‎‏‎‎‎‏‎‏‎‎‏‏‎‏‏‎‏‏‎‎‎‎‎‏‎‎‏‏‎<xliff:g id="COUNT_0">%1$d</xliff:g>‎‏‎‎‏‏‏‎ of ‎‏‎‎‏‏‎<xliff:g id="COUNT_1">%2$d</xliff:g>‎‏‎‎‏‏‏‎ apps allowed to modify system settings‎‏‎‎‏‎"</string>
+    <string name="filter_install_sources_apps" msgid="3102976274848199118">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‏‎‏‏‎‎‎‎‏‏‏‏‏‏‏‏‏‏‎‎‎‏‏‏‏‎‏‏‎‏‎‏‎‎‎‎‏‏‎‎‏‎‏‎‏‎‏‏‎‎‎‏‏‏‎‎‏‏‏‎‎Can install other apps‎‏‎‎‏‎"</string>
+    <string name="filter_write_settings_apps" msgid="2914615026197322551">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‏‎‎‎‎‏‏‏‎‎‏‎‏‏‎‎‏‎‏‎‏‏‏‎‏‏‎‎‏‎‎‎‏‏‎‏‏‎‎‎‎‎‎‏‏‏‎‏‏‎‏‏‎‎‏‏‎‏‏‏‎Can modify system settings‎‏‎‎‏‎"</string>
+    <string name="write_settings_title" msgid="4232152481902542284">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‏‎‏‎‏‎‏‏‏‎‏‏‏‎‏‎‎‎‎‎‎‏‎‎‎‎‏‎‎‏‏‎‎‏‏‏‎‎‎‏‎‏‏‎‏‎‏‏‏‏‎‏‏‏‎‎‏‏‎‎‎Can modify system settings‎‏‎‎‏‎"</string>
+    <string name="write_system_settings" msgid="3482913590601096763">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‎‎‎‎‎‏‎‏‎‏‎‏‏‏‎‎‏‎‏‏‎‏‏‏‎‏‎‏‎‎‎‏‎‏‏‏‎‎‏‎‏‎‎‎‏‎‎‏‏‏‏‎‎‎‏‏‏‎‏‏‎Modify system settings‎‏‎‎‏‎"</string>
+    <string name="write_settings_preference" msgid="3407383041273067448">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‏‏‏‏‎‏‎‎‏‎‎‏‎‏‏‏‎‏‎‎‏‏‎‏‎‎‏‎‏‎‏‎‏‏‎‎‏‏‎‎‎‏‎‏‎‏‏‏‎‏‏‏‏‎‏‏‏‎‎‎‎App modify system settings permission‎‏‎‎‏‎"</string>
+    <string name="permit_write_settings" msgid="658555006453212691">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‎‏‎‎‏‎‎‏‎‎‎‏‏‏‎‏‎‏‎‎‎‎‏‎‎‏‎‏‎‎‎‎‎‏‎‎‎‏‎‏‏‎‎‏‎‏‏‏‎‎‏‏‎‎‎‎‏‎‎‏‏‎Allow modifying 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>
+    <string name="camera_double_tap_power_gesture_title" msgid="1651873760405034645">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‎‏‏‎‏‏‏‎‏‏‎‎‏‎‏‎‎‎‏‎‎‏‏‎‏‏‏‎‏‏‎‏‏‏‏‎‏‎‏‏‏‎‏‏‎‎‎‏‎‏‏‎‏‎‎‏‎‏‎‏‎Press power button twice for camera‎‏‎‎‏‎"</string>
+    <string name="camera_double_tap_power_gesture_desc" msgid="7355664631775680376">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‎‏‏‎‎‎‎‏‎‏‎‎‏‎‎‏‎‎‏‎‎‎‎‎‎‎‏‎‏‎‏‏‎‏‏‏‏‏‏‎‎‏‎‎‏‏‎‏‎‏‏‏‎‏‏‏‏‎‎‎‎Quickly open camera without unlocking your screen‎‏‎‎‏‎"</string>
+    <string name="screen_zoom_title" msgid="5233515303733473927">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‏‎‎‎‏‎‏‎‎‎‎‏‎‎‏‎‏‏‏‎‎‏‏‏‎‎‎‎‏‎‏‏‏‏‎‏‏‎‎‏‏‎‏‎‏‎‏‏‎‎‏‎‏‎‎‎‎‏‏‏‎Display size‎‏‎‎‏‎"</string>
+    <string name="screen_zoom_short_summary" msgid="7291960817349834688">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‎‏‎‏‎‎‏‏‎‎‏‎‎‎‏‏‏‏‏‏‏‎‏‏‏‎‏‎‏‎‎‏‏‎‏‎‎‎‏‏‎‏‎‎‎‎‏‏‎‏‏‏‏‏‎‎‎‎‎‎‎Make items on screen larger or smaller‎‏‎‎‏‎"</string>
+    <string name="screen_zoom_keywords" msgid="9176477565403352552">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‏‏‏‏‎‏‎‏‏‎‎‏‎‏‏‎‎‏‎‏‏‎‏‏‏‎‏‎‎‎‎‎‎‏‏‏‎‎‏‏‎‏‎‏‎‏‎‎‏‏‎‏‏‏‏‎‏‎‎‎‎display density, screen zoom, scale, scaling‎‏‎‎‏‎"</string>
+    <string name="screen_zoom_summary" msgid="6445488991799015407">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‏‎‎‏‎‏‏‏‎‎‏‎‏‏‏‏‏‎‏‎‎‎‎‏‎‏‏‎‏‎‎‏‏‏‏‏‏‏‎‏‏‏‏‎‏‏‏‏‎‏‏‏‏‏‏‎‏‏‏‏‎Make the items on your screen smaller or larger. Some apps on your screen may change position.‎‏‎‎‏‎"</string>
+    <string name="screen_zoom_preview_title" msgid="4680671508172336572">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‎‎‎‎‏‏‏‏‎‏‎‏‎‎‎‏‎‏‎‏‏‏‏‎‏‏‏‏‏‏‏‏‏‎‏‎‏‏‏‎‎‏‏‏‎‏‏‎‏‏‎‏‏‎‏‏‏‏‎‎‎Preview‎‏‎‎‏‎"</string>
+    <string name="screen_zoom_make_smaller_desc" msgid="4622359904253364742">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‎‎‎‎‎‎‏‎‎‏‎‏‏‏‏‎‏‎‏‏‏‏‎‏‎‏‏‏‏‎‏‏‎‏‎‏‎‎‎‎‎‏‏‏‏‏‎‎‏‎‏‎‎‎‎‎‎‏‏‎‎Make smaller‎‏‎‎‏‎"</string>
+    <string name="screen_zoom_make_larger_desc" msgid="2236171043607896594">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‏‏‏‏‎‎‎‎‏‎‎‎‎‏‏‏‏‎‎‏‏‎‏‏‎‏‏‏‎‏‏‎‎‏‏‏‎‏‎‎‎‎‏‏‎‏‏‎‎‎‏‎‎‎‎‏‎‎‏‎‎Make larger‎‏‎‎‏‎"</string>
+    <string name="screen_zoom_conversation_icon_alex" msgid="8443032489384985820">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‎‏‎‏‎‎‏‎‏‎‏‏‏‎‏‎‏‏‎‏‎‏‎‏‎‎‎‎‏‏‏‎‎‏‎‎‏‏‎‏‏‏‏‏‏‏‎‎‎‏‎‎‏‏‎‏‏‏‎‎‎A‎‏‎‎‏‎"</string>
+    <string name="screen_zoom_conversation_icon_pete" msgid="998709701837681129">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‎‏‏‎‏‏‏‎‏‏‏‎‎‎‎‏‎‎‎‎‏‎‎‏‎‏‏‏‎‏‎‏‏‎‎‏‏‏‏‎‎‎‏‎‏‎‏‏‏‎‎‎‏‏‏‏‎‏‎‎‏‎P‎‏‎‎‏‎"</string>
+    <string name="screen_zoom_conversation_message_1" msgid="6546951024984852686">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‏‎‏‎‏‏‎‏‏‎‏‏‎‏‏‏‎‎‎‏‎‏‎‎‎‏‎‏‎‎‎‏‏‏‏‎‎‎‎‏‏‎‏‎‎‎‎‎‏‎‎‎‏‏‎‎‏‏‏‎‎Hi Pete!‎‏‎‎‏‎"</string>
+    <string name="screen_zoom_conversation_message_2" msgid="6935424214137738647">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‎‎‎‎‎‎‏‏‏‏‏‏‏‎‎‏‎‎‏‏‏‎‎‏‎‎‏‏‏‏‎‎‏‎‏‎‎‏‎‏‎‎‏‎‏‎‎‏‎‏‎‏‏‎‎‏‎‏‏‏‎Hey, want to grab coffee and catch up today?‎‏‎‎‏‎"</string>
+    <string name="screen_zoom_conversation_message_3" msgid="5218221201861387402">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‏‎‎‎‎‏‏‎‏‎‏‎‏‏‎‏‏‎‎‎‏‎‎‎‏‎‎‏‎‎‏‎‏‎‎‎‎‏‎‏‏‏‎‎‎‎‏‎‎‏‎‎‏‎‎‎‏‎‏‎‎Sounds great. I know of a good place not too far from here.‎‏‎‎‏‎"</string>
+    <string name="screen_zoom_conversation_message_4" msgid="5564676794767555447">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‏‏‎‏‎‎‏‏‏‎‎‏‏‎‏‏‎‏‎‎‎‎‎‎‏‏‏‏‏‏‎‏‏‎‎‏‏‏‏‏‏‎‏‎‏‎‏‏‏‎‏‏‎‏‏‏‎‏‏‏‎Perfect!‎‏‎‎‏‎"</string>
+    <string name="screen_zoom_conversation_timestamp_1" msgid="7453710416319650556">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‎‏‏‏‎‏‏‏‎‎‎‎‏‏‏‎‎‏‏‎‎‎‏‎‎‎‎‏‏‏‎‏‎‏‏‏‎‏‎‏‏‏‎‎‏‎‎‏‏‎‏‎‏‏‏‏‏‏‎‎‎Tue 6:00PM‎‏‎‎‏‎"</string>
+    <string name="screen_zoom_conversation_timestamp_2" msgid="7107225702890747588">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‎‎‏‎‏‎‏‎‎‎‎‏‏‏‏‏‎‎‎‎‎‎‎‏‏‏‏‎‏‏‏‏‏‏‏‏‎‏‎‏‎‏‎‎‎‎‏‏‎‏‏‎‏‏‎‎‎‏‎‎‎Tue 6:01PM‎‏‎‎‏‎"</string>
+    <string name="screen_zoom_conversation_timestamp_3" msgid="3785674344762707688">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‎‏‎‎‏‎‎‎‏‎‎‏‎‏‏‎‏‎‏‎‏‏‎‎‎‎‏‎‎‏‎‏‏‎‏‎‏‏‏‎‎‏‎‎‎‎‎‎‏‏‏‎‏‏‏‎‏‎‎‎‎Tue 6:02PM‎‏‎‎‏‎"</string>
+    <string name="screen_zoom_conversation_timestamp_4" msgid="2511469395448561259">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‎‎‏‎‏‏‎‏‏‎‏‎‏‎‎‎‏‎‎‎‎‎‎‏‏‎‏‏‏‏‎‏‏‎‏‏‏‏‏‏‏‎‎‏‏‏‏‏‏‏‏‎‎‏‏‎‏‎‏‏‎Tue 6:03PM‎‏‎‎‏‎"</string>
+    <string name="disconnected" msgid="4836600637485526329">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‎‎‏‏‎‎‎‏‏‏‏‏‎‎‎‎‏‏‏‎‏‎‏‎‎‏‏‏‏‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‏‎‏‏‎‏‎‎‏‏‏‎‎‏‎Not connected‎‏‎‎‏‎"</string>
+    <string name="data_usage_summary_format" msgid="7507047900192160585">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‏‎‎‎‎‎‏‎‏‏‏‎‎‏‏‎‎‏‎‎‎‏‎‎‏‎‏‎‏‎‎‎‏‎‏‎‏‏‎‎‏‎‏‏‏‎‏‏‏‎‏‏‎‏‎‎‏‎‎‏‎‎‏‎‎‏‏‎<xliff:g id="AMOUNT">%1$s</xliff:g>‎‏‎‎‏‏‏‎ of data used‎‏‎‎‏‎"</string>
+    <plurals name="notification_summary" formatted="false" msgid="3941492005316143599">
+      <item quantity="other">‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‎‏‏‎‏‎‏‏‎‎‏‎‏‏‏‏‏‏‏‎‎‎‎‏‏‎‎‎‏‎‎‎‏‏‎‏‏‏‏‎‏‎‎‏‎‎‏‎‏‎‎‏‏‏‏‎‏‏‏‏‎Off for ‎‏‎‎‏‏‎<xliff:g id="COUNT">%d</xliff:g>‎‏‎‎‏‏‏‎ apps‎‏‎‎‏‎</item>
+      <item quantity="one">‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‎‏‏‎‏‎‏‏‎‎‏‎‏‏‏‏‏‏‏‎‎‎‎‏‏‎‎‎‏‎‎‎‏‏‎‏‏‏‏‎‏‎‎‏‎‎‏‎‏‎‎‏‏‏‏‎‏‏‏‏‎Off for 1 app‎‏‎‎‏‎</item>
+    </plurals>
+    <string name="notification_summary_none" msgid="4586376436702610">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‎‏‎‏‏‎‎‎‎‎‏‎‎‏‎‏‏‎‏‎‎‏‎‎‎‏‏‏‏‏‎‏‎‎‏‎‏‎‎‎‎‏‏‎‏‏‏‎‏‏‎‎‏‎‎‏‎‎On for all apps‎‏‎‎‏‎"</string>
+    <string name="apps_summary" msgid="193158055537070092">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‎‏‎‏‎‏‎‏‎‏‏‏‎‎‎‏‏‏‏‎‎‎‎‏‏‏‎‏‎‎‏‏‎‎‏‎‏‏‏‎‎‏‎‏‎‏‏‎‏‎‎‎‎‎‎‎‎‏‏‎‎‎‎‏‎‎‏‏‎<xliff:g id="COUNT">%1$d</xliff:g>‎‏‎‎‏‏‏‎ apps installed‎‏‎‎‏‎"</string>
+    <string name="apps_summary_example" msgid="2118896966712746139">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‏‏‎‏‎‏‏‎‎‏‏‏‏‏‎‏‎‏‎‏‏‎‎‏‎‎‎‎‏‎‎‏‏‎‎‎‏‎‎‏‎‎‎‎‏‏‏‎‎‎‎‎‏‎‎‏‏‎‏‏‎24 apps installed‎‏‎‎‏‎"</string>
+    <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">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‏‏‎‏‏‎‏‎‏‎‏‎‎‎‎‎‏‏‎‏‎‎‏‏‎‏‏‏‎‏‏‏‎‏‏‏‏‎‏‎‏‎‎‎‏‏‏‎‏‎‏‏‏‏‎‎‏‎‎‏‎Internal storage: ‎‏‎‎‏‏‎<xliff:g id="PERCENTAGE">%1$s</xliff:g>‎‏‎‎‏‏‏‎ used - ‎‏‎‎‏‏‎<xliff:g id="FREE_SPACE">%2$s</xliff:g>‎‏‎‎‏‏‏‎ free‎‏‎‎‏‎"</string>
+    <string name="display_summary" msgid="6737806235882127328">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‏‏‎‏‏‎‎‎‎‎‎‏‎‏‏‏‏‏‏‏‎‎‎‏‎‎‏‎‏‎‏‏‎‏‏‏‎‎‏‎‏‎‏‎‎‏‏‏‏‏‏‏‏‏‏‎‎‎‎‎‎Sleep after ‎‏‎‎‏‏‎<xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g>‎‏‎‎‏‏‏‎ of inactivity‎‏‎‎‏‎"</string>
+    <string name="display_dashboard_summary" msgid="4145888780290131488">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‏‎‎‏‏‎‎‎‏‎‎‏‎‎‏‎‎‏‏‏‏‏‏‎‎‎‎‏‎‎‏‏‏‎‏‏‎‏‏‏‏‎‎‎‏‎‎‎‎‏‏‎‎‎‏‎‎‎‎‎‎Wallpaper, sleep, font size‎‏‎‎‏‎"</string>
+    <string name="display_summary_example" msgid="9102633726811090523">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‏‏‏‎‎‏‎‏‎‎‏‏‎‎‎‎‏‏‎‏‎‎‏‎‎‏‎‏‏‎‎‎‏‏‏‏‎‎‎‏‎‎‎‎‏‎‏‎‏‏‏‎‎‏‎‏‏‎‏‏‎Sleep after 10 minutes of inactivity‎‏‎‎‏‎"</string>
+    <string name="memory_summary" msgid="8080825904671961872">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‏‏‎‏‏‏‎‎‎‏‎‏‏‎‎‎‏‎‏‎‎‎‏‏‏‎‏‏‏‏‏‏‎‎‏‏‎‎‏‏‎‎‎‏‎‎‎‎‎Avg ‎‏‎‎‏‏‎<xliff:g id="USED_MEMORY">%1$s</xliff:g>‎‏‎‎‏‏‏‎ of ‎‏‎‎‏‏‎<xliff:g id="TOTAL_MEMORY">%2$s</xliff:g>‎‏‎‎‏‏‏‎ memory used‎‏‎‎‏‎"</string>
+    <string name="users_and_accounts_summary" msgid="245282689646897882">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‎‏‎‏‏‎‏‏‎‎‏‏‏‎‏‏‎‏‎‏‏‎‏‎‎‏‏‏‎‏‎‎‎‎‎‎‏‏‏‏‏‎‏‎‎‏‎‏‎‏‎‏‎‏‏‎‏‏‎‏‎‎Current user: ‎‏‎‎‏‏‎<xliff:g id="USER_NAME">%1$s</xliff:g>‎‏‎‎‏‏‏‎‎‏‎‎‏‎"</string>
+    <string name="users_summary" msgid="1674864467098487328">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‎‏‏‏‎‎‏‏‏‏‏‎‎‏‎‏‎‎‎‎‎‏‎‏‏‎‏‏‏‏‏‎‏‎‎‎‎‏‎‏‎‏‎‎‎‏‎‎‏‎‏‎‎‎‏‎‎‎‎‎‎Signed in as ‎‏‎‎‏‏‎<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>‎‏‎‎‏‏‏‎ is default‎‏‎‎‏‎"</string>
+    <string name="location_on_summary" msgid="5127631544018313587">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‎‏‏‏‎‎‏‎‏‎‎‏‎‎‎‎‎‎‎‏‏‎‏‏‏‎‎‎‏‏‎‏‎‎‎‎‎‏‎‎‏‏‎‎‏‎‏‎‎‎‎‏‎‏‏‏‎‎‏‏‎ON / ‎‏‎‎‏‏‎<xliff:g id="LOCATION_MODE">%1$s</xliff:g>‎‏‎‎‏‏‏‎‎‏‎‎‏‎"</string>
+    <string name="location_off_summary" msgid="6474350053215707957">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‏‎‎‏‏‏‎‏‏‎‎‏‏‎‎‎‎‎‏‏‎‎‎‏‎‎‏‎‎‎‏‎‎‎‎‏‎‏‏‏‎‏‎‎‎‎‏‎‎‎‏‏‎‎‏‏‎‏‎‏‎OFF‎‏‎‎‏‎"</string>
+    <string name="backup_disabled" msgid="485189128759595412">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‎‏‏‏‏‎‏‎‏‏‏‎‏‏‏‎‏‏‏‏‎‎‏‏‏‏‎‎‎‏‎‎‏‎‎‏‎‎‏‎‎‏‏‎‎‎‏‏‎‏‎‎‎‏‏‎‎‏‎‏‎‎‎Back up disabled‎‏‎‎‏‎"</string>
+    <string name="about_summary" msgid="924181828102801010">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‎‏‏‎‎‏‏‎‏‎‎‏‏‎‏‎‏‏‎‏‎‎‏‏‏‏‎‎‏‏‏‏‎‎‎‏‏‏‏‏‏‎‎‎‎‎‏‎‎‎‏‏‎‎‏‏‏‎‎‏‎‎Updated to Android ‎‏‎‎‏‏‎<xliff:g id="VERSION">%1$s</xliff:g>‎‏‎‎‏‏‏‎‎‏‎‎‏‎"</string>
+    <string name="disabled_by_policy_title" msgid="627023216027648534">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‎‏‎‎‎‏‎‏‏‎‎‏‏‏‎‏‎‎‎‏‎‎‏‎‎‏‎‏‎‏‏‏‏‏‎‎‏‎‏‎‎‎‎‎‎‎‏‎‎‎‎‏‎‎‎‎‏‎‏‏‎‎Action not allowed‎‏‎‎‏‎"</string>
+    <string name="disabled_by_policy_title_adjust_volume" msgid="7399450998356045023">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‎‏‏‎‏‎‏‏‎‎‎‎‎‎‏‎‎‎‎‏‎‏‏‏‏‎‏‎‏‎‏‎‎‎‎‏‏‏‏‎‏‎‏‏‏‏‏‎‏‏‎‎‏‏‎‏‏‏‏‏‎Can\'t change volume‎‏‎‎‏‎"</string>
+    <string name="disabled_by_policy_title_outgoing_calls" msgid="7919816644946067058">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‏‏‎‏‏‏‏‎‏‎‎‎‏‏‎‏‎‏‏‏‎‏‎‎‎‏‏‏‎‎‎‏‎‎‎‎‎‎‏‏‏‏‎‎‎‏‏‏‏‏‏‎‎‏‏‏‎‎‏‎‎Calling not allowed‎‏‎‎‏‎"</string>
+    <string name="disabled_by_policy_title_sms" msgid="5733307423899610340">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‏‏‏‏‏‎‎‏‎‎‎‎‏‏‎‎‏‏‎‎‏‎‏‏‏‎‎‏‏‏‎‎‎‏‎‏‏‎‏‎‎‏‎‏‎‏‏‎‏‏‎‎‏‏‏‎‎‏‎‎‎SMS not allowed‎‏‎‎‏‎"</string>
+    <string name="disabled_by_policy_title_camera" msgid="6225008536855644874">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‎‏‏‎‎‏‏‎‎‎‏‏‏‎‏‎‏‏‎‎‎‏‎‎‏‎‎‎‎‏‏‎‎‎‏‏‎‎‎‎‏‏‏‎‎‎‎‎‏‎‏‎‏‏‎‎‏‎‏‎‎Camera not allowed‎‏‎‎‏‎"</string>
+    <string name="disabled_by_policy_title_screen_capture" msgid="4066913623298047094">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‏‎‎‎‎‏‏‏‎‎‎‎‏‎‎‏‎‏‎‎‎‏‏‎‎‏‎‎‏‎‎‏‏‎‎‎‏‏‏‎‎‎‎‎‎‏‏‏‏‏‎‎‎‏‏‏‎‏‏‎‎Screenshot not allowed‎‏‎‎‏‎"</string>
+    <string name="default_admin_support_msg" msgid="2853684309779513863">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‎‏‏‏‏‎‎‏‏‎‏‎‎‏‎‏‎‎‏‎‏‏‎‎‎‎‏‎‏‎‏‎‎‎‎‏‏‎‎‎‎‎‏‏‏‎‎‎‎‎‏‎‎‎‎‎‎‏‏‏‎This action is disabled. To learn more, contact your organization\'s admin.‎‏‎‎‏‎"</string>
+    <string name="admin_support_more_info" msgid="8901377038510512654">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‏‎‏‏‏‎‎‎‏‎‎‎‎‎‎‎‏‎‏‏‎‏‎‎‎‎‎‏‎‏‎‎‏‎‎‎‎‎‏‏‏‏‎‎‏‏‎‏‏‎‏‎‎‎‎‎‏‏‏‎‎More details‎‏‎‎‏‎"</string>
+    <string name="admin_profile_owner_message" msgid="5860816886981109626">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‎‎‎‏‎‏‎‏‎‏‎‏‏‏‎‎‏‏‎‏‏‏‏‎‏‎‎‎‎‎‏‎‎‎‏‎‎‎‎‏‏‏‏‎‏‎‏‎‎‏‏‏‎‏‏‏‏‎‏‎‎Your admin can monitor and manage apps and data associated with your work profile, including settings, permissions, corporate access, network activity, and the device\'s location information.‎‏‎‎‏‎"</string>
+    <string name="admin_profile_owner_user_message" msgid="3842630535450382172">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‎‏‎‏‎‏‎‏‎‎‏‏‏‏‎‎‎‏‎‎‎‎‎‏‏‏‎‎‏‏‏‎‎‏‎‎‏‎‎‏‎‏‏‎‏‏‎‎‏‏‏‏‎‏‎‏‏‏‎‎‎Your admin can monitor and manage apps and data associated with this user, including settings, permissions, corporate access, network activity, and the device\'s location information.‎‏‎‎‏‎"</string>
+    <string name="admin_device_owner_message" msgid="6232893638259790789">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‎‏‏‎‎‏‏‏‏‏‏‏‏‎‏‎‏‏‏‏‏‎‏‏‏‏‎‏‏‎‎‏‏‏‏‏‎‏‎‎‎‏‎‎‎‏‎‏‎‎‏‏‏‏‎‎‎‏‎‏‎Your admin can monitor and manage apps and data associated with this device, including settings, permissions, corporate access, network activity, and the device\'s location information.‎‏‎‎‏‎"</string>
+    <string name="condition_turn_off" msgid="1960945836880080298">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‏‎‏‏‎‎‏‏‎‏‏‎‏‎‏‎‏‏‎‏‏‏‎‏‏‎‎‏‎‏‎‏‏‏‏‏‎‎‎‎‎‏‎‎‏‎‏‎‏‏‎‏‏‎‏‎‏‎‏‎‎Turn off‎‏‎‎‏‎"</string>
+    <string name="condition_turn_on" msgid="9089876276117874591">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‏‏‏‎‎‎‏‎‎‏‎‏‏‎‏‏‏‎‏‎‎‏‎‏‎‎‎‎‎‎‎‏‏‎‏‎‎‏‎‎‎‎‎‏‏‎‏‎‎‏‏‏‏‎‎‏‏‏‏‏‎Turn on‎‏‎‎‏‎"</string>
+    <string name="condition_expand_show" msgid="608202020023489939">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‎‏‎‎‎‎‏‏‏‎‎‎‎‏‏‎‎‎‏‎‎‏‎‎‎‎‎‏‏‏‏‎‎‏‎‏‏‎‎‏‎‏‏‎‎‏‏‎‏‎‏‎‏‏‎‎‏‎‎‏‏‎Show‎‏‎‎‏‎"</string>
+    <string name="condition_expand_hide" msgid="948507739223760667">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‎‏‏‎‏‎‎‏‎‏‎‎‏‏‏‎‎‎‏‏‎‏‏‎‎‎‎‏‏‎‏‏‎‏‏‏‏‎‎‏‎‎‏‎‎‎‎‎‏‏‏‏‏‎‎‎‏‏‎‏‏‎Hide‎‏‎‎‏‎"</string>
+    <string name="condition_hotspot_title" msgid="7778958849468560027">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‏‎‏‏‏‏‏‏‎‏‎‎‎‏‏‎‏‎‎‏‏‏‎‏‏‎‏‏‏‏‏‎‎‎‎‎‏‏‏‏‎‏‎‎‎‏‏‏‎‎‏‎‏‎‎‏‏‎‏‏‎Hotspot is on‎‏‎‎‏‎"</string>
+    <string name="condition_hotspot_summary" msgid="3433182779269409683">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‏‏‏‏‏‎‏‎‎‏‎‏‎‎‎‏‏‏‎‏‏‎‎‎‏‏‎‎‎‏‎‎‎‏‏‏‎‏‎‏‎‏‏‏‎‏‏‎‏‎‏‏‏‎‎‏‎‎‏‏‎Portable Wi-Fi hotspot ‎‏‎‎‏‏‎<xliff:g id="ID_1">%1$s</xliff:g>‎‏‎‎‏‏‏‎ is active, Wi-Fi for this device is turned off.‎‏‎‎‏‎"</string>
+    <string name="condition_airplane_title" msgid="287356299107070503">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‎‏‎‏‏‏‏‏‏‏‏‎‎‏‏‏‎‎‏‎‏‎‎‎‎‏‎‎‎‎‎‎‏‎‏‎‎‎‎‏‏‏‏‏‏‎‏‏‏‎‎‏‎‎‎‏‎‎‏‏‏‎Airplane mode is on‎‏‎‎‏‎"</string>
+    <string name="condition_airplane_summary" msgid="5561586417832393666">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‏‏‎‏‎‎‏‎‏‏‏‎‏‎‏‏‏‎‎‏‎‏‏‎‎‎‎‏‎‏‏‎‎‏‏‎‏‎‎‎‏‎‎‏‎‏‏‏‏‎‏‏‏‏‎‎‎‎‏‎‎Wi-Fi, Bluetooth, and mobile network are turned off. You can\'t make phone calls or connect to the Internet.‎‏‎‎‏‎"</string>
+    <string name="condition_zen_title" msgid="2679168532600816392">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‎‏‎‏‎‎‏‎‏‏‏‎‎‏‎‏‎‎‎‏‏‎‎‏‎‏‎‏‏‏‏‎‎‏‏‏‎‎‎‏‎‎‏‏‏‎‎‎‎‎‏‏‎‎‎‎‏‎‎‎‎Do not disturb is on (‎‏‎‎‏‏‎<xliff:g id="ID_1">%1$s</xliff:g>‎‏‎‎‏‏‏‎)‎‏‎‎‏‎"</string>
+    <string name="condition_battery_title" msgid="3272131008388575349">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‏‏‎‏‎‏‏‎‏‎‎‎‏‏‏‏‎‎‎‏‏‏‎‏‎‎‎‎‏‏‎‎‏‏‎‏‏‎‎‎‏‎‏‎‏‎‏‏‎‎‎‎‎‏‏‏‎‏‎‏‎Battery Saver is on‎‏‎‎‏‎"</string>
+    <string name="condition_battery_summary" msgid="4418839236027977450">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‏‏‎‏‎‏‎‏‎‎‏‎‏‏‎‏‏‏‏‎‏‏‎‏‏‏‏‏‏‎‎‎‎‏‏‏‎‎‎‎‎‎‎‏‏‎‎‎‏‏‏‎‏‏‏‎‏‎‏‎‎Performance is reduced. Location services and background data are turned off.‎‏‎‎‏‎"</string>
+    <string name="condition_cellular_title" msgid="1327317003797575735">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‎‎‏‎‎‏‏‎‏‎‏‏‏‎‎‏‎‎‏‏‏‏‎‎‏‎‎‎‎‏‎‏‎‎‏‏‏‎‏‏‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‏‎‏‏‏‎Mobile data is off‎‏‎‎‏‎"</string>
+    <string name="condition_cellular_summary" msgid="1818046558419658463">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‏‎‎‏‎‎‏‏‏‎‏‎‏‏‏‏‏‏‏‏‏‎‏‏‎‏‏‎‎‏‏‎‎‎‏‏‏‎‏‏‏‎‎‏‏‎‏‎‎‏‏‎‏‏‎‏‏‏‏‏‎Internet is available only via Wi-Fi‎‏‎‎‏‎"</string>
+    <string name="condition_bg_data_title" msgid="2483860304802846542">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‎‎‏‎‎‏‏‏‏‎‎‎‎‏‏‏‎‎‎‏‏‏‎‎‏‎‎‏‏‎‎‎‎‎‏‏‎‏‏‏‎‏‏‏‏‎‎‏‎‏‏‏‎‏‎‎‏‏‏‎‎Data Saver is on‎‏‎‎‏‎"</string>
+    <string name="condition_bg_data_summary" msgid="656957852895282228">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‎‏‎‎‏‎‎‎‏‏‏‎‏‏‏‏‏‏‎‏‏‏‎‏‎‏‏‏‏‏‎‏‏‏‏‏‎‎‎‏‏‏‎‏‎‎‎‎‎‎‏‎‎‎‎‏‏‎‏‎‎‎Background data is only available via Wi-Fi. This may affect some apps or services when Wi-Fi is not available.‎‏‎‎‏‎"</string>
+    <string name="condition_work_title" msgid="7293722361184366648">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‎‏‎‏‎‎‏‏‏‎‎‎‏‎‎‎‎‎‎‏‏‏‎‏‎‏‏‏‏‏‏‏‏‏‎‎‏‎‏‏‎‏‏‏‏‎‏‏‎‎‎‎‎‎‏‏‏‎‎‎‎Work profile is off‎‏‎‎‏‎"</string>
+    <string name="condition_work_summary" msgid="7543202177571590378">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‏‎‎‎‏‎‏‎‏‏‏‎‏‏‎‏‎‏‏‎‎‏‏‎‏‎‏‎‎‎‏‏‎‏‏‏‎‎‎‏‏‎‏‏‏‎‎‏‎‎‎‎‏‏‏‎‏‎‏‎‎Apps, background sync, and other features related to your work profile are turned off.‎‏‎‎‏‎"</string>
+    <string name="night_display_suggestion_title" msgid="6602129097059325291">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‏‎‏‏‏‎‎‏‏‏‏‏‎‏‏‏‏‎‎‏‎‏‏‎‏‏‏‏‎‎‏‎‎‏‏‏‎‏‏‏‏‏‎‏‏‏‎‏‎‏‎‏‎‏‏‎‏‎‏‏‎Set Night Light schedule‎‏‎‎‏‎"</string>
+    <string name="night_display_suggestion_summary" msgid="1747638280833631187">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‏‎‎‎‎‏‎‎‎‎‎‎‏‏‎‏‏‎‏‏‏‏‎‎‎‎‎‏‏‏‎‎‏‏‎‎‏‏‏‏‎‏‏‎‏‎‎‎‎‎‏‏‏‏‎‏‎‎‏‏‎Tint screen amber to help you fall asleep‎‏‎‎‏‎"</string>
+    <string name="condition_night_display_title" msgid="5599814941976856183">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‏‏‎‏‏‎‏‏‎‏‏‎‏‎‎‎‏‎‏‎‎‎‎‎‎‏‎‏‎‏‎‎‏‎‎‎‎‏‏‏‎‏‎‎‏‎‎‎‎‏‏‎‎‏‏‏‎‏‏‏‎Night Light is on‎‏‎‎‏‎"</string>
+    <string name="condition_night_display_summary" msgid="5443722724310650381">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‏‎‏‏‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‎‏‏‏‏‏‎‎‏‏‏‎‎‎‏‏‎‎‏‎‎‎‎‏‎‎‎‎‎‏‏‏‎‎‎‎‎‏‏‎‏‎Screen is tinted amber. This may help you fall asleep.‎‏‎‎‏‎"</string>
+    <string name="suggestions_title" msgid="7280792342273268377">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‎‏‎‏‎‎‎‎‏‎‏‎‏‎‎‏‎‎‏‎‎‎‎‎‏‏‏‏‎‏‎‏‏‏‎‎‏‎‎‏‎‏‎‏‎‎‎‏‏‎‏‎‏‎‎‏‏‎‎‏‎Suggestions‎‏‎‎‏‎"</string>
+    <string name="suggestions_summary" msgid="2509040178581728056">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‎‎‏‎‏‏‎‏‎‎‎‏‏‏‏‎‎‏‏‎‏‎‏‏‏‏‏‏‏‎‏‏‏‎‏‏‏‎‎‎‏‎‏‏‏‏‏‎‏‎‏‏‎‎‏‏‏‎‎‎‎+‎‏‎‎‏‏‎<xliff:g id="ID_1">%1$d</xliff:g>‎‏‎‎‏‏‏‎‎‏‎‎‏‎"</string>
+    <string name="suggestions_more_title" msgid="8223690393059519879">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‎‎‏‎‎‎‏‎‎‎‎‎‎‏‏‎‏‎‏‎‏‏‎‏‎‏‏‏‎‏‏‎‏‏‎‏‎‎‎‏‏‎‏‎‏‏‏‎‏‏‎‏‏‎‎‎‎‏‏‏‎+‎‏‎‎‏‏‎<xliff:g id="ID_1">%1$d</xliff:g>‎‏‎‎‏‏‏‎ more‎‏‎‎‏‎"</string>
+    <plurals name="suggestions_collapsed_title" formatted="false" msgid="1857433444865249823">
+      <item quantity="other">‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‏‎‎‏‏‏‎‎‎‏‏‎‏‏‏‎‏‏‎‏‏‏‏‎‎‎‎‎‏‎‎‎‎‎‏‏‎‎‎‏‏‏‏‏‏‎‎‏‎‎‏‎‎‎‎‏‏‏‏‏‎‎‏‎‎‏‏‎<xliff:g id="COUNT">%1$d</xliff:g>‎‏‎‎‏‏‏‎ suggestions‎‏‎‎‏‎</item>
+      <item quantity="one">‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‏‎‎‏‏‏‎‎‎‏‏‎‏‏‏‎‏‏‎‏‏‏‏‎‎‎‎‎‏‎‎‎‎‎‏‏‎‎‎‏‏‏‏‏‏‎‎‏‎‎‏‎‎‎‎‏‏‏‏‏‎1 suggestion‎‏‎‎‏‎</item>
+    </plurals>
+    <plurals name="suggestions_collapsed_summary" formatted="false" msgid="7680263825371165461">
+      <item quantity="other">‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‏‎‏‎‏‎‎‏‎‏‎‏‏‏‎‎‎‏‏‏‎‏‎‎‎‎‎‏‏‏‏‎‎‏‎‎‏‎‎‎‎‏‏‏‏‏‏‏‎‎‏‏‎‎‎‏‎‏‎‏‎+‎‏‎‎‏‏‎<xliff:g id="COUNT">%1$d</xliff:g>‎‏‎‎‏‏‏‎ suggestions‎‏‎‎‏‎</item>
+      <item quantity="one">‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‏‎‏‎‏‎‎‏‎‏‎‏‏‏‎‎‎‏‏‏‎‏‎‎‎‎‎‏‏‏‏‎‎‏‎‎‏‎‎‎‎‏‏‏‏‏‏‏‎‎‏‏‎‎‎‏‎‏‎‏‎+1 suggestion‎‏‎‎‏‎</item>
+    </plurals>
+    <string name="suggestion_remove" msgid="904627293892092439">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‎‏‏‎‎‏‎‎‎‏‏‎‏‏‏‏‎‎‎‎‏‏‎‏‏‏‎‏‏‎‎‎‏‏‎‏‎‏‎‎‎‏‏‏‏‏‎‏‎‎‎‏‎‎‎‎‏‎‏‏‏‎Remove‎‏‎‎‏‎"</string>
+    <string name="color_temperature" msgid="2070126836910615605">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‏‏‎‎‏‎‏‏‏‎‏‎‏‎‎‏‎‎‎‏‎‏‏‎‎‎‏‏‏‏‏‎‎‎‏‎‎‎‎‎‏‏‏‏‎‏‏‎‏‏‎‎‎‎‏‏‎‏‎‏‎Cool color temperature‎‏‎‎‏‎"</string>
+    <string name="color_temperature_desc" msgid="4793729830226404052">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‎‎‏‎‏‎‎‎‎‏‏‎‏‎‏‏‏‏‏‏‏‏‏‎‎‎‎‏‏‏‎‏‏‏‏‏‏‏‎‏‎‏‏‎‏‎‏‎‎‎‏‎‏‏‎‏‎‏‎‎‎Use cooler display colors‎‏‎‎‏‎"</string>
+    <string name="color_temperature_toast" msgid="4974218172133854827">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‎‏‎‏‎‎‎‎‎‏‏‏‏‏‏‏‏‎‎‏‎‎‎‏‎‎‏‎‏‎‏‏‎‎‎‏‎‏‎‏‎‏‎‎‏‏‎‎‏‏‏‎‎‏‏‎‏‎‏‏‎To apply color change, turn off screen‎‏‎‎‏‎"</string>
+    <string name="connectivity_monitor_switch" msgid="9059759348648583421">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‏‏‎‏‏‎‏‏‏‎‏‎‏‎‏‏‏‎‏‏‎‎‏‎‎‎‎‎‎‏‏‏‏‏‏‎‏‎‏‏‏‎‎‏‎‎‏‎‎‎‎‎‏‏‏‏‏‏‎‏‎Connectivity Monitor‎‏‎‎‏‎"</string>
+    <string name="connectivity_monitor_switch_summary" msgid="2828658652378866401">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‎‏‏‏‎‏‎‎‎‎‎‏‎‏‏‎‏‎‏‎‎‎‎‎‏‏‏‎‏‎‏‏‎‏‎‏‏‏‏‎‎‎‎‎‏‎‏‎‎‎‏‎‏‏‏‎‎‎‎‏‎ConnectivityMonitor will collect logs when it detects a connectivity problem and prompt notification to user to file a bug‎‏‎‎‏‎"</string>
+    <string name="connectivity_monitor_toast" msgid="5551859612881173028">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‏‏‎‏‎‎‎‎‏‏‎‎‎‎‏‎‏‎‏‎‏‏‏‎‎‏‏‏‎‎‏‎‎‏‎‎‏‎‎‏‏‏‏‎‏‎‏‏‏‎‏‎‎‎‏‎‎‏‎‎‎To apply connectivity monitor change, reboot device‎‏‎‎‏‎"</string>
+    <string name="camera_hal_hdrplus_switch" msgid="8377365197105267466">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‎‏‎‎‎‏‎‎‎‎‏‎‎‏‏‎‎‎‎‏‎‏‎‎‎‎‏‎‏‏‏‏‎‏‏‏‎‎‏‎‏‏‏‎‎‎‎‎‎‎‏‏‎‎‎‎‏‎‏‎‎Camera HAL HDR+‎‏‎‎‏‎"</string>
+    <string name="camera_hal_hdrplus_toast" msgid="2063703797270055299">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‏‏‎‎‏‎‏‎‎‎‏‏‏‎‏‏‏‏‏‏‏‎‏‎‏‎‏‏‎‏‏‎‏‏‎‏‏‏‏‎‏‎‎‎‎‎‎‎‏‎‎‏‏‎‎‎‎‎‏‏‎To apply Camera HAL HDR+ change, reboot device‎‏‎‎‏‎"</string>
+    <string name="camera_laser_sensor_switch" msgid="8913588990743234440">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‏‎‏‏‏‎‏‏‎‎‏‏‎‏‏‎‏‏‎‏‏‏‏‏‎‏‎‏‏‏‏‏‏‎‏‏‎‎‎‏‎‏‎‏‎‏‎‎‎‏‏‏‏‎‎‎‏‎‎‎‎Camera Laser Sensor‎‏‎‎‏‎"</string>
+    <string name="ota_disable_automatic_update" msgid="2319639631655915050">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‎‎‎‎‎‎‏‏‎‎‎‏‎‎‎‎‎‎‏‏‏‏‏‏‎‏‎‎‎‏‏‏‏‎‏‏‏‏‎‎‎‏‎‎‏‏‎‎‏‏‏‎‎‎‏‎‏‎‏‎‎Automatic system updates‎‏‎‎‏‎"</string>
+    <string name="usage" msgid="2977875522080448986">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‏‎‎‏‎‏‎‏‎‎‏‏‏‎‎‎‏‎‏‎‎‎‎‎‎‎‏‎‏‎‎‎‎‏‏‎‏‏‏‎‏‏‏‏‏‎‏‎‎‎‎‏‏‏‎‏‏‎‏‎‎Usage‎‏‎‎‏‎"</string>
+    <string name="cellular_data_usage" msgid="2155683719898158203">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‏‏‎‏‏‏‏‎‏‎‏‎‏‎‎‎‎‏‏‎‏‏‏‎‏‏‎‎‎‎‎‎‎‏‎‎‏‎‎‏‏‏‏‏‎‏‎‏‎‏‎‎‎‏‏‏‏‎‏‏‎Mobile data usage‎‏‎‎‏‎"</string>
+    <string name="wifi_data_usage" msgid="686754111095324306">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‎‏‎‎‏‏‎‎‎‎‏‏‏‏‏‎‏‎‏‏‏‎‎‏‏‏‎‎‏‏‎‏‏‎‏‏‏‏‏‏‎‎‎‎‎‎‎‏‏‏‏‏‎‏‎‎‏‎‎‏‎‎Wi-Fi data usage‎‏‎‎‏‎"</string>
+    <string name="ethernet_data_usage" msgid="5108764537574354616">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‎‏‏‎‏‏‏‎‎‏‎‏‏‏‏‏‏‎‏‎‎‏‎‎‎‏‏‏‏‎‎‎‏‏‏‏‎‎‏‏‏‎‏‏‎‏‏‎‏‏‏‎‏‎‏‏‏‎‎‎‎Ethernet data usage‎‏‎‎‏‎"</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>‎‏‎‎‏‏‏‎ mobile data‎‏‎‎‏‎"</string>
+    <string name="wifi_data_template" msgid="6265570748799357386">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‎‏‏‎‏‏‏‏‎‎‏‏‏‏‎‎‎‏‏‏‎‏‏‎‎‏‏‎‎‏‎‎‏‏‎‏‎‏‎‎‎‎‏‏‏‎‎‏‎‎‎‏‏‏‎‎‏‎‏‎‎‎‏‎‎‏‏‎<xliff:g id="AMOUNT">^1</xliff:g>‎‏‎‎‏‏‏‎ Wi-Fi data‎‏‎‎‏‎"</string>
+    <string name="ethernet_data_template" msgid="5782476509881033590">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‎‎‎‎‎‎‏‏‏‏‏‏‎‏‏‏‏‎‏‏‏‎‏‏‏‏‏‏‏‎‏‏‎‏‎‏‎‏‏‏‏‏‏‏‏‏‏‎‎‎‏‏‎‏‏‏‎‏‏‎‎‎‏‎‎‏‏‎<xliff:g id="AMOUNT">^1</xliff:g>‎‏‎‎‏‏‏‎ ethernet data‎‏‎‎‏‎"</string>
+    <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_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>
+      <item quantity="one">‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‏‎‏‏‏‎‏‏‎‎‏‎‎‏‏‎‏‎‏‎‏‏‎‎‏‏‏‎‎‎‎‎‏‎‎‏‎‏‎‏‎‏‎‎‏‎‏‎‏‎‏‎‎‏‏‏‏‏‏‏‎1 restriction‎‏‎‎‏‎</item>
+    </plurals>
+    <string name="operator_warning" msgid="1862988028996859195">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‏‎‎‏‏‏‎‏‏‎‏‎‏‎‏‎‏‎‎‏‏‎‏‏‏‏‎‏‏‏‏‎‏‎‎‏‎‎‏‎‏‎‎‏‏‎‏‏‎‏‎‏‎‎‏‏‏‎‏‏‎Carrier data accounting may differ from device accounting‎‏‎‎‏‎"</string>
+    <string name="data_used_template" msgid="3245919669966296505">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‏‏‎‏‎‎‎‎‏‎‏‏‏‏‎‏‎‎‏‎‏‎‏‏‏‏‏‎‎‎‎‎‎‎‎‏‏‏‎‎‏‎‏‏‎‏‎‏‎‏‎‏‏‎‏‏‏‎‎‏‎‎‏‎‎‏‏‎<xliff:g id="ID_1">%1$s</xliff:g>‎‏‎‎‏‏‏‎ used‎‏‎‎‏‎"</string>
+    <string name="set_data_warning" msgid="6115364758236594593">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‎‏‎‎‏‏‎‏‏‏‏‎‎‎‏‎‎‎‏‏‏‏‎‏‏‎‎‎‏‏‎‏‎‏‏‎‏‎‏‎‎‎‏‎‏‎‎‎‎‎‎‏‏‎‏‎‎‎‎‏‎Set data warning‎‏‎‎‏‎"</string>
+    <string name="data_warning" msgid="209133958008062117">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‎‏‎‏‎‏‏‏‎‎‏‏‎‏‏‏‏‏‏‏‎‎‎‏‏‏‎‏‎‎‎‎‎‏‏‎‏‏‎‎‎‏‎‏‎‏‏‎‎‎‎‎‎‏‎‏‎‎‏‎‏‎Data warning‎‏‎‎‏‎"</string>
+    <string name="set_data_limit" msgid="2901526323210516923">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‏‎‎‎‎‏‎‎‎‏‎‎‎‏‎‎‏‎‏‎‏‏‎‏‎‎‎‏‎‏‏‎‏‎‎‏‎‏‏‎‏‎‎‎‎‏‏‏‏‎‎‏‏‎‏‏‏‎‏‏‎Set data limit‎‏‎‎‏‎"</string>
+    <string name="data_limit" msgid="1885406964934590552">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‏‎‏‎‎‎‏‎‏‎‏‎‎‏‎‎‏‏‏‏‏‎‏‎‎‏‎‏‎‎‏‏‎‎‎‏‏‏‏‏‏‎‎‏‎‏‎‎‎‎‎‎‎‏‎‏‏‎‎‎‎Data limit‎‏‎‎‏‎"</string>
+    <string name="data_usage_template" msgid="2923744765873163859">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‏‎‎‎‏‎‎‏‎‎‏‏‎‎‏‏‏‎‏‎‎‏‎‏‏‏‏‏‏‎‏‏‎‏‏‏‏‏‎‎‎‏‏‏‎‎‎‎‏‏‏‎‎‏‎‏‎‎‏‏‎‎‏‎‎‏‏‎<xliff:g id="ID_1">%1$s</xliff:g>‎‏‎‎‏‏‏‎ used ‎‏‎‎‏‏‎<xliff:g id="ID_2">%2$s</xliff:g>‎‏‎‎‏‏‏‎‎‏‎‎‏‎"</string>
+    <string name="configure" msgid="1029654422228677273">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‎‏‏‏‎‎‏‎‎‏‎‏‎‎‎‎‏‎‎‎‏‎‎‏‏‏‏‎‏‏‏‎‏‏‏‏‎‎‏‎‏‏‎‎‏‏‎‏‏‎‎‏‎‏‎‎‏‏‎‎‏‎Configure‎‏‎‎‏‎"</string>
+    <string name="data_usage_other_apps" msgid="3272872663517382050">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‏‏‎‏‎‏‏‎‏‎‏‏‏‎‎‏‎‏‎‎‎‏‎‏‏‎‎‎‏‏‎‏‏‎‎‎‎‎‎‎‏‎‏‎‎‏‎‎‎‏‎‏‏‎‏‎‎‎‏‎‎Other apps included in usage‎‏‎‎‏‎"</string>
+    <plurals name="data_saver_unrestricted_summary" formatted="false" msgid="2635267833484232703">
+      <item quantity="other">‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‎‏‎‎‏‎‎‏‎‎‏‎‎‏‎‏‏‎‏‎‎‎‏‎‎‎‎‏‏‏‎‏‏‏‏‎‏‏‎‏‎‏‏‏‎‏‎‎‎‏‏‏‏‏‏‏‏‏‏‏‎‎‏‎‎‏‏‎<xliff:g id="COUNT">%1$d</xliff:g>‎‏‎‎‏‏‏‎ apps allowed to use unrestricted data when Data Saver is on‎‏‎‎‏‎</item>
+      <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="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>
+    <string name="unrestricted_app_title" msgid="4465437191723332066">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‏‏‎‏‏‏‏‏‏‎‎‎‎‏‏‎‏‎‏‏‎‏‏‏‎‏‏‏‏‎‎‎‏‎‏‏‎‏‏‏‏‏‎‎‏‎‏‏‎‎‎‏‏‏‏‎‎‎‏‎‎Unrestricted data usage‎‏‎‎‏‎"</string>
+    <string name="unrestricted_app_summary" msgid="6458008993501723912">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‏‎‎‏‏‎‎‏‏‏‏‏‎‏‏‏‎‏‎‎‏‏‏‏‎‏‏‎‏‎‏‎‏‏‎‏‏‏‏‏‎‎‏‎‏‎‏‏‏‏‎‏‎‎‎‎‏‎‎‎‎Allow unrestricted data access when Data Saver is on‎‏‎‎‏‎"</string>
+    <string name="home_app" msgid="4066188520886810030">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‏‎‎‎‎‏‏‎‏‏‏‎‎‎‎‎‎‎‎‎‏‏‏‎‏‎‏‎‏‎‎‎‏‎‎‏‎‎‏‏‏‎‏‎‏‎‏‏‎‏‎‏‏‎‏‎‏‏‏‎‎Home app‎‏‎‎‏‎"</string>
+    <string name="no_default_home" msgid="7184117487704520238">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‎‎‏‏‏‎‏‏‎‎‏‏‎‎‎‏‏‏‎‎‏‏‎‎‏‎‏‎‏‎‏‏‏‏‏‏‎‏‎‎‏‏‎‎‏‎‏‏‎‏‏‎‎‎‏‎‏‏‏‎‎No default Home‎‏‎‎‏‎"</string>
+    <string name="lockpattern_settings_require_cred_before_startup" msgid="3832020101401318248">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‎‏‎‏‎‎‏‎‏‏‏‎‎‎‎‏‎‎‎‏‏‏‏‏‏‎‏‎‏‎‏‏‎‏‎‎‎‎‏‎‏‏‏‎‏‎‎‏‎‎‏‏‎‏‏‎‏‎‎‎‎Secure start-up‎‏‎‎‏‎"</string>
+    <string name="lockpattern_settings_require_pattern_before_startup_summary" msgid="7873036097628404476">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‏‏‎‏‎‏‎‎‎‎‏‎‏‎‏‎‎‏‎‎‏‎‎‏‏‏‏‎‎‎‎‏‏‏‏‎‏‏‏‏‎‏‏‏‏‏‏‏‏‎‏‎‏‏‏‏‏‏‎‎‎Require pattern to start up your device. While off, this device can\'t receive calls, messages, notifications, or alarms.‎‏‎‎‏‎"</string>
+    <string name="lockpattern_settings_require_pin_before_startup_summary" msgid="6022831284097476933">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‎‎‏‏‏‎‎‏‎‏‎‏‎‏‏‎‎‏‎‏‎‎‏‎‎‏‎‎‎‏‏‏‏‏‏‎‏‎‏‏‏‏‎‏‎‏‏‎‏‎‎‏‎‏‎‎‎‏‎‏‎Require PIN to start up your device. While off, this device can\'t receive calls, messages, notifications, or alarms.‎‏‎‎‏‎"</string>
+    <string name="lockpattern_settings_require_password_before_startup_summary" msgid="6818285221244966231">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‏‏‏‎‏‎‎‏‏‏‏‏‎‏‏‎‏‎‏‎‎‏‎‎‏‎‎‎‏‎‏‎‏‏‎‏‏‎‎‏‏‎‏‎‎‎‎‏‎‏‎‏‎‏‎‏‎‏‏‏‎Require password to start up your device. While off, this device can\'t receive calls, messages, notifications, or alarms.‎‏‎‎‏‎"</string>
+    <string name="suggestion_additional_fingerprints" msgid="2214281455363797037">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‏‏‏‎‏‎‏‏‏‎‏‎‏‎‏‏‎‏‎‏‎‏‎‎‎‎‎‎‎‏‏‏‏‎‏‏‏‎‏‏‎‎‎‏‏‎‏‏‎‎‎‎‎‎‏‎‏‏‎‏‎Add another fingerprint‎‏‎‎‏‎"</string>
+    <string name="suggestion_additional_fingerprints_summary" msgid="5471253233176471245">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‏‎‏‏‏‏‏‎‏‏‎‏‏‏‎‎‏‎‏‏‏‏‎‏‎‎‏‏‏‏‎‏‏‏‏‏‏‎‏‏‎‎‎‎‏‏‏‎‎‏‏‎‏‏‎‎‏‏‎‏‎Unlock with a different finger‎‏‎‎‏‎"</string>
+    <string name="battery_saver_on_summary" msgid="9072203872401530722">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‏‏‎‏‏‏‏‎‎‏‏‎‏‏‏‏‎‎‎‏‎‏‎‏‏‎‏‎‏‏‏‏‏‎‎‎‎‏‏‎‏‎‏‎‏‎‎‏‏‏‏‏‎‏‏‎‎‎‏‎‎On / ‎‏‎‎‏‏‎<xliff:g id="ID_1">%1$s</xliff:g>‎‏‎‎‏‏‏‎‎‏‎‎‏‎"</string>
+    <string name="battery_saver_off_summary" msgid="8309471955051162327">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‎‎‏‏‎‏‎‏‎‎‎‏‎‎‏‎‏‏‎‎‏‎‏‏‎‏‏‏‏‎‏‏‎‏‏‏‏‏‏‎‎‏‎‏‎‎‏‎‏‎‏‎‏‏‎‏‎‏‏‏‎Off / ‎‏‎‎‏‏‎<xliff:g id="ID_1">%1$s</xliff:g>‎‏‎‎‏‏‏‎‎‏‎‎‏‎"</string>
+    <string name="battery_saver_desc_turn_on_auto_never" msgid="6715896635178578813">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‏‏‎‏‎‎‏‏‎‎‏‏‏‎‏‎‏‎‎‎‎‏‏‎‏‎‎‎‎‏‎‎‏‎‎‎‎‎‎‎‏‏‏‏‎‏‏‏‎‎‏‏‎‏‏‏‏‏‎‏‎Never turn on automatically‎‏‎‎‏‎"</string>
+    <string name="battery_saver_desc_turn_on_auto_pct" msgid="7472323223085636533">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‎‏‏‏‏‎‏‏‎‎‏‏‎‎‎‎‎‏‏‎‎‏‏‎‎‎‎‏‏‎‎‏‏‏‏‎‏‏‏‎‏‎‏‏‏‏‎‏‏‎‏‏‏‎‏‏‎‏‎‏‎Turn on automatically at %1$s battery‎‏‎‎‏‎"</string>
+    <string name="not_battery_optimizing" msgid="5362861851864837617">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‏‎‏‎‎‏‏‎‏‏‎‎‏‎‏‏‎‏‏‎‎‏‏‏‎‎‎‎‏‏‎‎‏‎‏‏‏‏‏‎‎‏‎‏‏‎‏‎‏‏‎‏‏‏‏‏‎‎‎‏‎Not using battery optimization‎‏‎‎‏‎"</string>
+    <string name="lockscreen_remote_input" msgid="969871538778211843">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‎‏‏‎‏‎‏‏‏‎‏‎‏‏‎‏‎‏‏‎‏‎‎‎‎‎‏‏‎‏‎‏‎‎‎‏‎‏‎‏‎‎‎‏‏‎‎‎‎‎‏‏‎‎‎‎‎‎‎‏‏‎If device is locked, prevent typing replies or other text in notifications‎‏‎‎‏‎"</string>
+    <string name="default_spell_checker" msgid="8506899870026026660">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‎‏‏‎‎‎‎‎‏‏‏‎‏‎‎‏‎‏‎‎‎‏‎‏‏‏‎‎‎‎‏‏‏‏‎‎‏‎‏‏‎‏‏‏‏‏‎‎‏‏‏‎‏‎‏‎‎‏‎‎‎Default spell checker‎‏‎‎‏‎"</string>
+    <string name="choose_spell_checker" msgid="6596539862291699367">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‏‎‏‏‏‎‎‎‏‎‏‏‏‎‎‏‏‏‏‎‎‎‎‎‏‏‏‎‎‎‎‎‎‏‏‎‏‎‎‏‏‎‎‏‏‏‎‏‎‏‏‎‏‎‏‎‎‏‏‏‎Choose spell checker‎‏‎‎‏‎"</string>
+    <string name="spell_checker_not_selected" msgid="8871083796179200696">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‏‎‏‏‎‎‎‏‏‏‎‎‎‏‏‎‏‎‏‏‏‎‏‏‎‏‏‎‎‎‏‎‏‎‏‏‏‏‏‏‏‏‎‎‎‎‏‎‏‎‏‎‏‎‏‏‏‎‎‎‎Not selected‎‏‎‎‏‎"</string>
+    <string name="notification_log_no_title" msgid="5678029849672024215">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‏‏‏‎‏‏‎‎‏‏‎‎‎‏‏‎‏‎‏‎‎‎‎‏‎‎‎‎‏‎‎‏‎‏‎‏‏‏‎‎‎‏‎‎‎‎‎‎‎‎‎‎‏‎‎‏‎‏‏‏‎(none)‎‏‎‎‏‎"</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">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‏‎‎‏‏‎‎‏‎‎‏‏‎‎‏‏‎‎‎‎‏‏‏‎‎‏‎‎‏‏‏‏‎‏‏‎‎‏‏‎‎‎‏‎‏‏‎‏‏‏‎‏‏‎‏‏‏‎‎‎‎key‎‏‎‎‏‎"</string>
+    <string name="notification_log_details_group" msgid="2430467015200368698">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‎‎‎‏‏‎‏‏‏‎‏‎‏‏‎‎‎‎‎‎‏‏‎‏‏‏‏‏‏‎‎‎‎‏‏‏‎‏‎‏‎‎‏‎‎‏‏‎‏‎‎‎‎‎‏‏‏‎‏‎‎group‎‏‎‎‏‎"</string>
+    <string name="notification_log_details_group_summary" msgid="7945543958255585829">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‏‏‏‎‎‏‎‎‎‏‎‎‎‎‏‏‏‏‏‎‎‎‏‎‎‎‎‏‏‏‏‏‏‎‏‏‎‎‎‏‎‎‏‏‎‏‎‎‏‎‏‎‎‎‏‎‎‏‎‏‎(summary)‎‏‎‎‏‎"</string>
+    <string name="notification_log_details_visibility" msgid="2552873780715930971">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‎‎‏‏‎‏‏‎‏‏‎‏‏‎‏‎‎‎‎‏‎‎‏‎‏‏‎‏‏‎‎‎‎‏‏‏‏‏‏‏‏‎‏‏‎‏‎‎‎‏‎‏‎‏‎‏‏‎‏‏‎visibility‎‏‎‎‏‎"</string>
+    <string name="notification_log_details_public_version" msgid="4247242364605495240">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‏‎‏‎‏‏‏‏‎‎‎‏‎‎‏‏‏‏‎‎‎‏‏‎‏‏‎‏‏‎‎‎‎‎‎‏‎‏‎‎‏‏‎‎‏‏‏‏‎‏‏‏‏‏‎‎‏‎‎‎‎publicVersion‎‏‎‎‏‎"</string>
+    <string name="notification_log_details_priority" msgid="8371354971235991398">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‎‏‎‎‎‎‏‎‏‏‎‏‎‎‎‎‎‏‏‎‏‏‏‏‏‏‏‎‎‎‏‏‎‏‎‏‎‎‏‏‏‎‎‎‏‎‏‏‏‏‏‏‎‏‏‎‎‏‏‎‎priority‎‏‎‎‏‎"</string>
+    <string name="notification_log_details_importance" msgid="2153168790791683139">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‏‏‎‏‏‏‏‎‎‎‎‏‏‎‎‏‎‏‏‏‏‎‎‏‏‎‏‏‎‏‏‏‎‏‎‎‏‎‎‏‏‎‎‎‎‏‏‏‏‏‎‎‎‏‎‎‎‎‏‏‎importance‎‏‎‎‏‎"</string>
+    <string name="notification_log_details_explanation" msgid="1914295130775393551">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‏‎‏‎‏‎‎‏‎‎‎‎‏‏‏‏‎‎‎‏‎‏‎‎‎‏‏‏‎‏‏‏‎‎‎‏‎‎‏‎‎‎‎‎‏‎‎‏‎‏‎‏‎‎‎‎‏‏‏‏‎explanation‎‏‎‎‏‎"</string>
+    <string name="notification_log_details_badge" msgid="3258183328267662285">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‏‏‎‏‎‎‏‏‎‏‏‏‎‏‏‎‎‏‎‎‎‏‏‏‏‎‎‏‎‏‏‏‎‏‏‎‎‏‏‏‏‏‏‎‎‏‏‏‎‎‏‏‏‏‎‎‏‏‎‏‎can show badge‎‏‎‎‏‎"</string>
+    <string name="notification_log_details_content_intent" msgid="1113554570409128083">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‎‏‏‏‏‎‏‏‏‎‏‎‎‎‎‏‎‎‎‏‏‏‏‏‏‏‎‏‏‎‏‎‏‏‏‏‏‎‎‏‏‏‏‏‏‏‎‏‏‎‎‎‎‏‎‎‏‎‎‏‏‎intent‎‏‎‎‏‎"</string>
+    <string name="notification_log_details_delete_intent" msgid="905118520685297007">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‎‏‏‎‎‏‎‎‎‏‏‏‏‏‎‏‎‎‎‎‎‎‏‏‏‏‏‏‏‏‏‎‎‎‎‎‏‎‎‎‏‎‎‏‎‏‏‏‏‏‏‎‏‎‏‏‎‏‏‏‏‎delete intent‎‏‎‎‏‎"</string>
+    <string name="notification_log_details_full_screen_intent" msgid="7118560817013522978">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‎‎‏‎‏‏‎‎‏‎‏‎‎‎‏‏‎‏‎‏‎‏‎‏‏‎‎‎‏‏‏‎‏‎‏‎‎‎‎‏‏‎‏‏‎‎‎‎‎‎‏‎‎‎‏‎‎‎‏‎‎full screen intent‎‏‎‎‏‎"</string>
+    <string name="notification_log_details_actions" msgid="242523930165118066">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‎‏‎‏‏‎‏‎‏‏‏‎‏‏‎‎‏‏‏‏‎‎‎‏‏‏‎‏‎‏‏‎‎‎‎‏‏‎‎‎‎‎‏‏‎‎‎‎‎‎‏‎‎‎‏‏‏‎‎‏‎‎actions‎‏‎‎‏‎"</string>
+    <string name="notification_log_details_title" msgid="7177091647508863295">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‎‎‏‏‏‎‎‏‏‎‏‎‎‎‏‎‎‏‏‎‏‏‎‏‎‎‏‏‏‏‎‏‏‎‏‎‎‎‏‏‎‎‎‎‎‏‎‏‏‎‎‏‎‎‏‏‏‏‏‏‎title‎‏‎‎‏‎"</string>
+    <string name="notification_log_details_remoteinput" msgid="8328591329858827409">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‎‎‏‏‏‎‎‏‎‏‎‏‎‎‎‏‏‎‎‏‏‎‏‏‎‎‎‎‎‎‎‎‏‏‏‏‏‎‏‎‎‎‏‎‎‎‏‏‎‏‎‎‏‎‎‏‎‎‎‏‎remote inputs‎‏‎‎‏‎"</string>
+    <string name="notification_log_details_content_view" msgid="6638731378278561786">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‏‏‎‎‎‎‏‎‎‎‎‏‏‎‎‎‎‎‏‏‎‎‎‎‎‎‏‏‏‏‎‏‏‎‎‏‏‎‎‎‏‎‎‎‎‏‏‏‎‏‏‏‏‏‏‏‏‎‏‎‎custom view‎‏‎‎‏‎"</string>
+    <string name="notification_log_details_extras" msgid="4188418723779942047">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‏‎‏‎‎‎‏‎‎‎‎‎‎‏‎‎‎‎‎‎‏‎‏‎‎‎‏‏‎‏‎‏‏‎‎‏‎‏‏‏‏‏‏‏‏‎‎‏‎‏‏‎‏‎‎‏‏‏‏‏‎extras‎‏‎‎‏‎"</string>
+    <string name="notification_log_details_icon" msgid="8939114059726188218">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‏‏‎‎‎‎‎‎‏‏‏‎‎‎‎‏‏‏‎‎‏‏‏‎‎‎‎‎‎‎‏‏‏‎‎‎‏‎‏‎‏‏‎‏‏‏‏‎‏‏‏‎‏‎‏‏‏‎‏‎‎icon‎‏‎‎‏‎"</string>
+    <string name="notification_log_details_parcel" msgid="243148037601903212">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‎‏‎‏‏‎‏‎‏‏‏‏‏‏‏‎‏‎‏‎‏‏‏‎‏‏‎‏‎‎‎‎‏‏‎‎‏‎‎‎‏‏‎‎‎‎‏‎‎‎‎‏‎‎‏‏‎‏‏‎‎‎parcel size‎‏‎‎‏‎"</string>
+    <string name="notification_log_details_ashmem" msgid="7241814108477320636">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‎‏‎‎‏‎‎‎‎‎‎‎‎‎‎‏‎‏‏‏‏‎‎‏‎‎‎‎‎‎‎‏‏‎‎‏‎‎‏‏‎‎‏‏‏‏‏‎‏‏‎‏‏‎‏‏‏‏‎‎‎ashmem‎‏‎‎‏‎"</string>
+    <string name="notification_log_details_sound" msgid="5506232879598808099">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‏‏‎‎‎‏‏‎‏‎‏‎‎‎‎‏‎‎‎‏‏‎‏‎‎‎‎‏‎‏‏‏‎‏‏‏‎‎‎‏‎‎‎‎‎‎‏‎‏‏‎‎‎‎‏‎‎‎‏‏‎sound‎‏‎‎‏‎"</string>
+    <string name="notification_log_details_vibrate" msgid="6890065466625335940">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‏‏‏‏‏‎‎‏‏‏‏‎‎‏‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‏‏‎‏‎‎‏‎‏‏‎‎‎‏‏‏‎‏‎‎‎‏‎‏‎‎‎‎‏‎‎‎vibrate‎‏‎‎‏‎"</string>
+    <string name="notification_log_details_default" msgid="2345249399796730861">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‎‎‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‏‏‏‏‎‎‏‏‏‎‏‎‎‏‎‎‎‏‎‎‏‎‏‎‏‎‎‎‎‏‎‏‏‏‏‏‎‏‏‎‏‎default‎‏‎‎‏‎"</string>
+    <string name="notification_log_details_none" msgid="184131801230614059">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‎‏‎‏‎‏‎‎‎‏‏‏‎‎‎‏‎‏‎‏‎‏‏‏‎‎‏‎‏‏‏‎‎‏‏‎‎‎‎‏‏‎‏‎‎‎‎‎‏‏‏‏‎‎‎‏‎‏‎‏‏‎none‎‏‎‎‏‎"</string>
+    <string name="notification_log_details_ranking_null" msgid="244660392058720919">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‎‏‎‏‏‎‏‏‎‎‏‎‏‎‎‏‏‎‏‎‏‎‏‎‏‎‏‎‎‏‎‎‎‏‏‏‏‎‏‎‎‎‏‎‎‏‎‎‏‎‎‏‎‏‎‎‏‎‏‏‏‎Ranking object is missing.‎‏‎‎‏‎"</string>
+    <string name="notification_log_details_ranking_none" msgid="599607025882587844">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‎‏‎‎‎‎‏‎‏‎‎‏‎‎‎‏‏‏‎‏‏‎‏‏‎‏‎‎‏‏‏‎‎‎‏‏‎‏‎‎‎‏‏‏‏‎‏‏‎‎‎‏‎‏‏‎‎‎‏‎‎‎Ranking object doesn\'t contain this key.‎‏‎‎‏‎"</string>
+    <string name="special_access" msgid="3458780842491881155">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‎‎‎‎‎‎‎‎‎‎‎‎‎‎‎‎‏‏‏‎‏‏‎‏‏‎‎‏‏‏‎‏‎‎‎‎‏‎‏‎‎‏‏‏‏‎‏‎‎‏‏‎‏‏‎‎‎‎‏‏‎Special app access‎‏‎‎‏‎"</string>
+    <plurals name="special_access_summary" formatted="false" msgid="260765309935675867">
+      <item quantity="other">‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‎‏‎‏‏‏‎‎‏‏‏‏‎‎‏‏‎‏‏‎‎‏‎‏‎‏‎‏‎‏‏‏‏‎‏‎‎‎‏‏‏‎‏‎‏‏‏‏‎‏‎‎‏‏‏‎‏‏‎‏‏‎‎‏‎‎‏‏‎<xliff:g id="COUNT">%d</xliff:g>‎‏‎‎‏‏‏‎ apps can use unrestricted data‎‏‎‎‏‎</item>
+      <item quantity="one">‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‎‏‎‏‏‏‎‎‏‏‏‏‎‎‏‏‎‏‏‎‎‏‎‏‎‏‎‏‎‏‏‏‏‎‏‎‎‎‏‏‏‎‏‎‏‏‏‏‎‏‎‎‏‏‏‎‏‏‎‏‏‎1 app can use unrestricted data‎‏‎‎‏‎</item>
+    </plurals>
+    <string name="confirm_convert_to_fbe_warning" msgid="1487005506049137659">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‎‏‎‎‏‎‏‎‎‎‏‎‏‏‏‎‎‏‏‏‏‎‏‎‎‎‎‏‎‎‎‏‎‏‏‏‎‎‎‏‏‎‏‏‏‏‎‏‏‎‏‏‏‏‏‏‏‎‏‏‎Really wipe user data and convert to file encryption?‎‏‎‎‏‎"</string>
+    <string name="button_confirm_convert_fbe" msgid="7101855374850373091">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‎‎‏‎‏‎‎‎‏‏‏‎‏‏‎‏‏‎‏‏‏‏‎‏‎‏‏‎‎‎‎‏‎‎‎‎‎‎‏‎‎‏‏‏‏‎‏‏‎‏‎‏‏‏‏‎‎‎‏‏‎Wipe and convert‎‏‎‎‏‎"</string>
+    <string name="reset_shortcut_manager_throttling" msgid="6495066467198668994">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‏‎‏‎‎‎‏‎‎‎‏‏‎‎‎‏‏‏‎‎‏‎‎‎‏‎‏‎‎‎‏‎‎‎‎‏‏‏‏‎‏‏‎‏‏‎‎‏‎‎‎‎‏‏‎‎‎‎‏‎‎Reset ShortcutManager rate-limiting‎‏‎‎‏‎"</string>
+    <string name="reset_shortcut_manager_throttling_complete" msgid="1826770872063707900">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‏‎‎‏‎‏‎‏‏‎‎‏‏‏‏‏‏‏‏‎‎‏‏‎‏‏‎‏‏‏‏‏‎‎‏‏‎‏‏‎‎‎‏‏‎‏‎‎‏‎‏‎‏‏‏‏‏‏‎‎‎ShortcutManager rate-limiting has been reset‎‏‎‎‏‎"</string>
+    <string name="notification_suggestion_title" msgid="387052719462473500">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‎‏‏‏‎‏‎‏‎‏‏‏‏‏‎‎‎‏‎‏‏‎‎‏‏‎‎‏‎‏‏‏‎‎‏‏‎‎‏‏‏‎‏‎‎‎‏‏‎‏‏‏‏‏‎‎‎‏‏‏‎‎‎Control info on lock screen‎‏‎‎‏‎"</string>
+    <string name="notification_suggestion_summary" msgid="8521159741445416875">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‎‏‏‎‎‏‎‎‎‎‎‏‎‎‏‏‏‏‎‏‏‎‏‎‎‎‏‏‎‏‎‎‎‏‏‏‎‎‏‏‎‏‏‎‏‎‏‎‎‏‏‏‏‎‏‎‏‎‏‏‎Show or hide notification content‎‏‎‎‏‎"</string>
+    <string name="page_tab_title_summary" msgid="4070309266374993258">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‏‎‎‎‎‏‏‏‏‏‎‎‏‎‏‎‎‏‎‎‏‎‏‏‎‏‏‎‎‏‎‏‏‏‎‎‎‏‎‎‎‎‏‏‎‎‏‎‎‏‎‏‎‏‏‎‏‎‏‎‎All‎‏‎‎‏‎"</string>
+    <string name="page_tab_title_support" msgid="8483187649355540109">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‎‏‎‏‏‎‏‏‏‎‏‎‎‏‎‏‎‏‏‎‎‎‏‏‏‎‎‎‏‎‏‎‎‎‏‎‏‏‎‏‎‎‎‏‎‏‏‎‎‏‏‎‏‎‎‎‏‏‎‏‎Support &amp; tips‎‏‎‎‏‎"</string>
+    <string name="developer_smallest_width" msgid="7516950434587313360">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‏‎‎‎‎‏‎‏‎‎‎‏‏‎‎‏‎‎‏‎‏‎‎‏‎‏‏‏‏‏‏‏‏‏‏‏‏‏‎‎‏‎‏‏‏‎‎‎‎‏‎‎‏‏‎‏‎‎‎‎‎Smallest width‎‏‎‎‏‎"</string>
+    <string name="premium_sms_none" msgid="8268105565738040566">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‎‎‏‎‏‎‏‏‏‏‏‎‎‎‏‏‎‏‏‎‎‎‏‏‎‏‎‎‏‎‏‎‏‎‏‏‎‎‏‏‏‏‏‎‏‏‏‏‏‏‎‎‏‏‏‏‎‏‏‎‎No installed apps have requested Premium SMS access‎‏‎‎‏‎"</string>
+    <string name="premium_sms_warning" msgid="9086859595338944882">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‏‏‏‎‎‎‎‏‏‎‏‏‎‎‎‎‎‎‏‎‏‎‏‎‏‎‎‎‎‏‏‎‎‎‎‎‎‎‎‎‎‏‏‏‎‎‎‏‎‎‎‏‎‏‏‏‎‎‏‎‎Premium SMS may cost you money and will add up to your carrier bills. If you enable permission for an app, you will be able to send premium SMS using that app.‎‏‎‎‏‎"</string>
+    <string name="premium_sms_access" msgid="4660047004791638305">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‎‎‎‎‏‎‏‎‏‎‏‏‏‏‎‏‎‎‎‎‎‎‎‎‏‏‏‏‏‎‎‏‎‏‎‏‎‎‏‏‏‎‏‎‏‎‎‎‏‎‎‏‎‎‏‎‎‎‎‏‎Premium SMS access‎‏‎‎‏‎"</string>
+    <string name="bluetooth_disabled" msgid="6244000672828617410">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‎‏‏‎‏‎‏‎‎‏‏‏‎‎‏‎‎‏‎‏‏‎‎‎‎‏‏‏‏‎‏‎‎‎‎‏‎‎‏‏‏‏‏‏‏‏‏‏‎‎‏‎‏‏‎‎‎‎‏‎‎Off‎‏‎‎‏‎"</string>
+    <string name="bluetooth_connected_summary" msgid="7672528674593152862">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‏‎‏‎‎‏‏‏‏‎‏‎‎‏‎‎‏‏‎‎‎‎‏‎‏‏‎‏‏‏‎‎‎‎‏‎‎‎‎‏‏‏‏‏‏‎‎‏‏‏‏‏‎‏‎‏‏‏‏‎‎Connected to ‎‏‎‎‏‏‎<xliff:g id="ID_1">%1$s</xliff:g>‎‏‎‎‏‏‏‎‎‏‎‎‏‎"</string>
+    <string name="bluetooth_connected_multiple_devices_summary" msgid="9173661896296663932">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‏‏‏‏‎‏‎‎‏‏‏‏‎‏‏‎‎‏‎‎‏‏‏‎‎‎‏‏‏‏‏‏‏‎‏‎‎‏‎‎‏‏‎‎‏‎‎‎‏‎‏‏‎‏‏‏‏‏‎‎‎Connected to multiple devices‎‏‎‎‏‎"</string>
+    <string name="demo_mode" msgid="2798762752209330277">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‎‏‏‎‏‏‎‏‎‏‏‏‎‎‏‏‎‎‏‏‏‏‏‎‎‏‎‏‎‎‎‎‏‎‎‎‎‎‎‎‏‎‎‎‎‎‏‎‎‎‎‎‎‏‏‎‎‏‎‏‎System UI demo mode‎‏‎‎‏‎"</string>
+    <string name="quick_settings_developer_tiles" msgid="5947788063262762448">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‎‎‏‎‏‎‎‎‏‎‏‎‏‏‎‎‏‎‎‏‏‎‏‏‏‎‏‏‎‎‎‏‎‏‏‎‎‎‎‏‎‏‎‏‏‏‏‎‎‏‎‏‏‏‎‏‎‎‎‎‎Quick settings developer tiles‎‏‎‎‏‎"</string>
+    <string name="support_escalation_title" msgid="4111071371281023145">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‏‎‎‏‎‎‎‎‏‏‎‏‎‏‏‏‎‏‎‏‏‎‏‎‎‎‎‏‎‏‏‏‏‎‏‏‎‏‏‏‏‎‏‏‏‏‎‎‎‎‎‎‏‎‏‎‏‎‎‏‎We\'re here to help‎‏‎‎‏‎"</string>
+    <string name="support_escalation_24_7_title" msgid="8118369197749832074">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‎‎‎‎‏‎‏‎‏‎‏‎‎‎‏‏‏‏‎‏‏‏‎‎‎‏‎‏‏‎‏‏‏‎‏‏‎‏‎‏‏‎‏‎‎‎‎‎‏‎‎‏‏‎‎‎‏‎‏‎‎We\'re here for you 24/7‎‏‎‎‏‎"</string>
+    <string name="support_escalation_24_7_content_description" msgid="3772776213036994533">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‎‏‎‎‎‏‎‏‏‎‏‏‏‎‎‏‎‏‏‏‏‏‏‏‏‎‏‎‎‎‎‎‏‎‏‏‎‎‎‏‏‏‎‏‎‎‎‎‏‏‏‏‏‏‏‎‎‏‎‏‎We\'re here for you 24 7‎‏‎‎‏‎"</string>
+    <string name="support_escalation_summary" msgid="8473084168776014405">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‎‏‎‏‏‎‎‏‎‏‏‎‎‏‏‏‎‎‎‏‎‎‏‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‎‎‎‎‏‎‏‎‏‏‎‏‎‎‏‎‎‎‏‎‏‎Our support team is here to help address any issue‎‏‎‎‏‎"</string>
+    <string name="support_escalation_24_7_summary" msgid="2802773279262547187">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‎‏‏‎‏‏‏‎‎‏‎‏‎‏‏‏‎‎‏‏‎‏‏‏‎‎‏‎‏‎‏‎‎‎‎‎‎‏‏‎‎‏‏‎‏‎‎‏‏‏‎‎‏‏‏‏‎‎‏‏‎Our support team is available all day, every day‎‏‎‎‏‎"</string>
+    <string name="support_escalation_closed_summary" msgid="2240967274380168303">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‏‏‏‏‎‎‎‏‏‎‎‏‏‎‎‎‎‎‏‏‏‏‎‏‏‏‎‎‏‏‏‎‎‏‏‎‏‎‏‏‎‏‎‎‏‎‎‎‏‏‎‎‎‏‏‎‏‏‏‏‎Search help or come back during support hours (local time):&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">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‎‎‏‏‎‎‎‎‏‏‏‎‎‏‏‏‎‎‏‎‏‏‏‎‏‏‏‏‎‎‎‏‏‏‏‎‏‎‎‎‏‎‏‎‏‏‏‎‏‎‏‏‏‏‏‎‎‏‎‏‎Phone support hours (local time)&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">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‏‎‎‎‎‏‎‎‏‎‎‎‎‏‏‏‏‏‏‏‎‏‎‏‎‏‎‏‏‎‏‏‏‎‏‏‎‏‎‎‏‎‏‏‎‏‏‏‏‎‎‎‏‏‏‏‏‎‏‎‎Search help or explore tips &amp; tricks‎‏‎‎‏‎"</string>
+    <string name="support_country_list_title" msgid="823853371280534111">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‎‏‎‏‏‎‏‏‎‏‏‏‎‏‏‏‎‏‎‏‎‎‏‎‎‎‏‏‎‏‎‏‏‎‏‏‎‎‎‏‎‏‏‏‏‎‎‏‎‏‎‏‎‎‏‎‏‏‏‏‏‎Support for:‎‏‎‎‏‎"</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">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‎‎‏‎‎‎‏‎‏‎‎‎‎‎‏‎‎‎‏‎‏‏‎‏‏‎‏‎‏‎‏‎‎‎‎‎‎‏‎‎‏‏‎‎‏‎‎‏‏‎‎‎‏‏‏‏‎‏‏‏‎Traveling abroad?‎‏‎‎‏‎"</string>
+    <string name="support_international_phone_summary" msgid="208231793637026927">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‎‏‎‏‎‏‏‏‎‎‎‏‏‏‏‎‎‏‎‎‏‏‎‏‏‎‏‏‎‏‎‎‎‏‎‏‎‏‎‏‎‏‏‎‏‎‏‏‎‏‏‎‎‎‏‏‎‏‏‏‏‎International charges may apply‎‏‎‎‏‎"</string>
+    <string name="support_escalation_by_phone" msgid="4843223043487058711">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‎‎‏‏‎‎‏‏‎‏‏‎‏‎‎‏‎‏‎‏‏‎‏‏‎‎‏‎‏‎‎‏‎‎‏‏‎‎‎‎‏‎‎‎‎‏‎‎‏‎‏‏‎‎‎‏‎‏‏‏‎Phone‎‏‎‎‏‎"</string>
+    <string name="support_escalation_by_chat" msgid="977019859110763749">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‎‏‏‎‏‏‎‎‎‏‏‏‏‎‎‎‏‎‎‏‎‎‏‏‎‎‎‏‎‏‎‏‎‏‎‎‎‏‏‎‎‏‏‎‎‏‎‎‏‏‏‎‎‏‏‏‎‎‏‎‏‎Chat‎‏‎‎‏‎"</string>
+    <string name="support_tips_and_tricks_title" msgid="4153466795695447828">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‏‎‎‏‏‎‏‎‎‏‎‎‎‎‎‏‎‏‎‎‎‎‎‎‏‎‏‏‎‏‏‎‏‏‏‏‏‏‎‎‏‏‏‎‏‎‎‏‏‏‏‏‎‎‎‏‎‏‎‎‎Explore tips &amp; tricks‎‏‎‎‏‎"</string>
+    <string name="support_help_feedback_title" msgid="693440287222186718">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‎‏‎‎‏‏‎‎‏‏‏‏‏‏‎‎‏‏‎‎‎‎‏‎‎‎‏‎‎‎‏‏‎‏‎‎‎‏‏‎‏‎‎‏‎‏‏‎‎‎‎‏‎‏‏‎‏‏‏‏‎‎Search help &amp; send feedback‎‏‎‎‏‎"</string>
+    <string name="support_sign_in_required_title" msgid="1367187789121480440">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‎‎‏‎‏‏‏‏‏‎‎‏‎‎‏‏‏‎‏‎‎‎‎‎‏‏‎‎‏‏‏‎‏‏‏‏‏‏‎‏‎‏‏‎‎‏‏‎‎‏‏‎‏‏‏‏‏‎‎‎‎Contact support‎‏‎‎‏‎"</string>
+    <string name="support_sign_in_button_text" msgid="3054769428620671241">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‏‎‏‎‎‏‏‎‎‏‎‎‏‎‏‏‏‎‎‎‏‎‎‏‏‏‎‎‎‏‎‎‎‏‏‏‏‎‏‎‏‎‎‎‎‏‏‏‏‎‎‏‎‎‎‎‏‎‎‏‎Sign in‎‏‎‎‏‎"</string>
+    <string name="support_sign_in_required_help" msgid="5200654782405538114">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‏‎‎‎‎‎‏‎‏‏‎‎‎‏‏‎‏‏‏‏‏‏‏‏‏‎‎‎‎‏‏‎‏‎‎‎‏‎‏‏‎‏‏‏‏‏‏‏‎‎‎‏‎‏‎‎‎‎‏‎‎Can\'t sign in?‎‏‎‎‏‎"</string>
+    <string name="support_disclaimer_title" msgid="4825302018208770031">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‎‎‏‎‏‏‏‏‎‏‏‎‏‏‏‎‏‎‏‎‏‎‎‏‏‏‏‎‏‎‏‏‏‎‎‏‎‏‎‎‏‏‏‏‎‎‏‎‎‏‏‏‏‏‏‎‏‏‏‏‎Send system information‎‏‎‎‏‎"</string>
+    <string name="support_disclaimer_do_not_show" msgid="3378367075323727539">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‏‏‏‎‏‏‏‎‎‎‏‎‎‏‎‏‏‏‏‎‏‏‏‏‎‏‎‎‏‎‏‎‎‏‎‏‏‎‎‎‏‎‏‏‏‏‎‎‏‏‏‎‏‎‏‏‎‎‏‏‎Do not show again‎‏‎‎‏‎"</string>
+    <string name="support_account_request_prefix" msgid="6387847874661861650">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‏‎‎‎‏‎‏‎‎‏‏‎‎‎‏‏‎‎‎‏‏‏‎‎‏‏‎‎‎‎‏‏‏‎‎‎‎‏‏‏‎‏‎‎‎‏‎‎‏‎‎‏‎‎‎‏‎‎‏‎‎Requesting as‎‏‎‎‏‎"</string>
+    <string name="support_account_picker_add_account" msgid="5076277544846506214">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‎‏‏‎‎‏‏‏‎‎‏‎‏‎‎‎‏‏‏‏‏‎‎‎‏‎‎‎‎‎‏‎‎‎‎‏‏‏‎‏‏‏‏‎‎‎‏‏‏‎‎‎‏‏‏‎‎‏‏‎‎Add account‎‏‎‎‏‎"</string>
+    <string name="support_system_information_title" msgid="3439905790018934773">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‏‏‏‏‏‎‏‏‏‏‎‏‎‎‎‎‎‎‎‎‎‎‎‏‎‏‏‏‎‎‏‏‎‎‏‎‏‏‏‎‎‎‏‏‎‏‎‏‎‏‏‏‏‏‏‏‎‏‎‏‎System information‎‏‎‎‏‎"</string>
+    <string name="managed_profile_settings_title" msgid="2729481936758125054">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‎‏‎‏‏‏‏‎‎‎‎‏‎‎‎‏‎‎‎‏‎‏‎‏‏‏‎‎‎‎‏‎‏‏‎‏‎‏‎‏‎‎‎‎‎‎‏‏‎‎‎‏‏‏‏‏‏‏‏‎‎Work profile settings‎‏‎‎‏‎"</string>
+    <string name="managed_profile_contact_search_title" msgid="6034734926815544221">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‎‎‏‏‏‎‏‏‏‏‏‏‏‎‏‎‏‏‏‏‎‏‏‏‎‎‎‏‎‏‎‎‏‎‏‎‎‏‏‏‏‎‏‏‏‏‎‎‎‎‏‏‏‎‎‏‏‏‎‏‎Contact search‎‏‎‎‏‎"</string>
+    <string name="managed_profile_contact_search_summary" msgid="5431253552272970512">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‏‎‏‏‎‏‎‏‏‏‏‏‏‎‏‏‎‎‎‎‎‏‎‏‎‏‎‎‎‏‏‎‏‏‎‎‎‏‎‎‏‏‏‏‎‎‎‏‎‎‏‏‎‎‎‏‎‎‎‎‎Allow contact searches by your organization to identify callers and contacts‎‏‎‎‏‎"</string>
+    <plurals name="hours" formatted="false" msgid="7020844602875333472">
+      <item quantity="other">‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‎‎‎‏‎‏‏‎‏‏‏‏‎‎‎‎‏‏‎‎‏‏‏‏‎‏‏‏‏‏‏‎‎‎‎‏‏‎‎‏‏‎‏‎‎‏‎‎‏‎‏‏‎‏‏‎‎‎‎‎‎‎‏‎‎‏‏‎<xliff:g id="NUMBER">%s</xliff:g>‎‏‎‎‏‏‏‎ hours‎‏‎‎‏‎</item>
+      <item quantity="one">‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‎‎‎‏‎‏‏‎‏‏‏‏‎‎‎‎‏‏‎‎‏‏‏‏‎‏‏‏‏‏‏‎‎‎‎‏‏‎‎‏‏‎‏‎‎‏‎‎‏‎‏‏‎‏‏‎‎‎‎‎‎1 hour‎‏‎‎‏‎</item>
+    </plurals>
+    <plurals name="minutes" formatted="false" msgid="4666832442068789413">
+      <item quantity="other">‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‎‎‎‎‏‏‎‎‎‎‏‏‏‏‏‎‏‎‏‏‎‏‏‎‎‎‎‏‎‏‎‎‏‏‏‏‏‏‎‎‎‏‏‏‎‏‏‎‏‎‎‎‏‎‏‎‎‏‎‏‎‎‏‎‎‏‏‎<xliff:g id="NUMBER">%s</xliff:g>‎‏‎‎‏‏‏‎ minutes‎‏‎‎‏‎</item>
+      <item quantity="one">‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‎‎‎‎‏‏‎‎‎‎‏‏‏‏‏‎‏‎‏‏‎‏‏‎‎‎‎‏‎‏‎‎‏‏‏‏‏‏‎‎‎‏‏‏‎‏‏‎‏‎‎‎‏‎‏‎‎‏‎‏‎1 minute‎‏‎‎‏‎</item>
+    </plurals>
+    <plurals name="seconds" formatted="false" msgid="3876307354560025025">
+      <item quantity="other">‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‎‏‎‏‏‏‎‎‏‎‏‏‎‏‏‎‏‎‎‏‎‎‎‎‎‎‎‎‎‏‎‏‏‏‎‎‏‏‎‎‏‎‎‎‏‏‎‏‎‎‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‏‏‎<xliff:g id="NUMBER">%s</xliff:g>‎‏‎‎‏‏‏‎ seconds‎‏‎‎‏‎</item>
+      <item quantity="one">‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‎‏‎‏‏‏‎‎‏‎‏‏‎‏‏‎‏‎‎‏‎‎‎‎‎‎‎‎‎‏‎‏‏‏‎‎‏‏‎‎‏‎‎‎‏‏‎‏‎‎‎‏‏‏‎‎‎‎‎‏‎1 second‎‏‎‎‏‎</item>
+    </plurals>
+    <string name="support_estimated_wait_time" msgid="6523081420029378051">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‏‎‏‎‏‎‎‎‎‏‏‎‏‎‏‎‎‎‏‏‏‏‏‏‏‏‎‏‏‎‏‎‎‎‎‏‏‏‎‎‏‏‎‏‎‎‏‏‏‏‏‎‎‎‎‎‎‎‏‏‎~‎‏‎‎‏‏‎<xliff:g id="ESTIMATE">%1$s</xliff:g>‎‏‎‎‏‏‏‎ wait‎‏‎‎‏‎"</string>
+    <string name="bluetooth_talkback_computer" msgid="4875089335641234463">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‎‎‏‏‏‎‏‎‎‏‏‏‏‏‎‎‏‎‏‏‏‏‏‎‏‎‏‏‏‏‏‎‎‎‏‏‎‎‏‏‎‎‎‎‏‏‎‏‏‏‎‎‎‎‎‏‏‏‏‏‎Computer‎‏‎‎‏‎"</string>
+    <string name="bluetooth_talkback_headset" msgid="5140152177885220949">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‎‏‏‏‎‏‎‏‎‏‎‏‎‏‏‏‏‏‎‏‎‎‏‎‏‏‎‎‎‎‎‎‏‏‏‎‎‏‎‎‏‏‎‎‏‎‎‏‎‎‎‎‎‏‎‏‎‏‎‏‎Headset‎‏‎‎‏‎"</string>
+    <string name="bluetooth_talkback_phone" msgid="4260255181240622896">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‏‎‏‏‎‎‎‏‏‏‏‏‎‏‏‏‎‏‏‏‏‎‎‎‎‎‏‏‏‏‏‏‏‎‏‎‎‏‎‏‏‏‎‏‎‏‎‏‏‏‏‏‎‎‏‏‎‎‎‎‎Phone‎‏‎‎‏‎"</string>
+    <string name="bluetooth_talkback_imaging" msgid="551146170554589119">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‎‏‏‏‏‏‏‎‏‎‎‏‏‎‎‎‎‏‎‎‎‎‏‎‎‎‎‏‎‏‏‎‏‎‎‎‏‏‎‎‏‏‏‎‎‏‎‎‎‏‏‏‏‏‏‎‏‏‏‏‏‏‎Imaging‎‏‎‎‏‎"</string>
+    <string name="bluetooth_talkback_headphone" msgid="26580326066627664">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‎‏‏‏‏‎‏‏‏‏‎‎‏‏‎‏‏‏‎‏‎‏‎‏‎‏‎‎‏‏‎‏‏‎‏‎‎‏‏‎‏‏‏‎‎‏‎‎‏‎‎‎‏‎‏‎‎‎‎‎Headphone‎‏‎‎‏‎"</string>
+    <string name="bluetooth_talkback_input_peripheral" msgid="5165842622743212268">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‎‏‏‏‏‎‏‏‎‎‎‎‏‏‎‎‎‎‏‎‎‏‏‏‏‏‏‎‏‏‎‏‏‏‏‎‎‎‏‎‏‏‏‎‎‏‏‏‎‎‎‎‏‏‏‎‏‏‎‎‎Input Peripheral‎‏‎‎‏‎"</string>
+    <string name="bluetooth_talkback_bluetooth" msgid="5615463912185280812">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‏‏‎‏‏‏‏‎‏‏‏‎‎‎‏‎‎‎‏‎‏‎‏‎‏‏‎‏‎‎‎‏‎‏‏‎‏‏‎‏‎‏‎‎‎‎‏‏‏‎‎‏‎‎‏‎‏‏‎‎‎Bluetooth‎‏‎‎‏‎"</string>
+    <string name="automatic_storage_manager_settings" msgid="7819434542155181607">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‏‏‎‎‏‎‎‎‎‏‎‎‎‎‏‏‎‏‏‎‎‏‎‎‏‎‎‏‎‏‏‏‎‏‎‏‏‎‎‏‎‏‎‎‎‎‏‎‏‏‏‎‎‎‏‎‎‏‏‏‎Manage storage‎‏‎‎‏‎"</string>
+    <string name="automatic_storage_manager_text" msgid="4562950476680600604">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‏‏‏‏‎‏‎‏‎‎‏‎‏‏‎‏‏‎‏‏‎‏‎‎‏‎‎‎‎‏‏‏‎‎‏‎‎‎‏‏‏‏‏‏‎‎‎‏‏‏‎‎‎‎‎‏‏‏‎‎‎To help free up storage space, storage manager removes backed up photos and videos from your device.‎‏‎‎‏‎"</string>
+    <string name="automatic_storage_manager_days_title" msgid="2017913896160914647">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‏‏‎‎‎‎‎‎‎‎‎‏‎‎‎‏‎‎‎‏‏‏‏‏‏‏‏‏‎‏‎‎‎‏‏‏‏‏‏‏‏‏‏‎‏‏‏‎‏‏‎‎‏‏‎‏‎‏‏‏‎Remove photos &amp; videos‎‏‎‎‏‎"</string>
+    <string name="automatic_storage_manager_preference_title" msgid="5753702798151073383">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‏‏‏‏‏‏‎‏‏‎‎‏‎‏‎‎‎‎‏‎‎‎‏‏‎‏‎‏‏‏‏‎‎‎‏‎‏‏‏‏‎‏‏‏‎‎‏‏‏‏‏‎‎‏‏‎‎‏‏‏‎Storage manager‎‏‎‎‏‎"</string>
+    <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_summary" product="default" msgid="8627850388011956901">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‎‏‏‏‏‎‏‏‏‏‎‎‎‏‎‎‏‎‎‎‎‎‏‏‎‏‏‏‎‎‏‏‎‎‎‎‏‎‏‎‏‎‏‏‎‎‏‏‏‎‏‎‏‎‏‎‎‏‎‏‎Quick gestures to control your phone‎‏‎‎‏‎"</string>
+    <string name="gesture_preference_summary" product="tablet" msgid="4717535378272065510">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‎‎‎‏‎‏‏‏‏‎‎‎‎‎‎‎‏‏‎‏‎‏‏‎‏‏‏‎‏‎‎‏‎‏‎‏‎‎‏‏‏‏‏‎‏‎‎‏‎‏‏‏‏‏‏‎‎‏‏‎‎Quick gestures to control your tablet‎‏‎‎‏‎"</string>
+    <string name="gesture_preference_summary" product="device" msgid="4205941452664950852">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‏‎‏‎‎‏‎‏‏‏‏‎‏‎‎‎‎‎‎‏‎‏‏‏‎‏‏‏‏‎‎‏‏‎‎‎‎‎‏‎‏‏‏‏‎‏‎‏‎‎‎‎‎‏‎‎‎‏‎‎‎Quick gestures to control your device‎‏‎‎‏‎"</string>
+    <string name="double_tap_power_for_camera_title" msgid="64716226816032800">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‎‎‎‏‏‏‎‎‏‎‏‏‏‏‎‏‎‏‏‎‎‎‏‎‎‎‎‏‎‏‏‏‏‏‎‏‎‎‏‎‎‏‎‏‏‎‎‎‎‎‎‎‎‏‎‎‎‎‎‎Jump to camera‎‏‎‎‏‎"</string>
+    <string name="double_tap_power_for_camera_summary" msgid="242037150983277829">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‎‏‎‏‏‎‏‎‏‏‎‏‏‏‏‏‎‎‎‏‏‏‎‎‎‎‎‎‏‏‎‏‎‎‏‏‎‏‏‎‎‏‏‏‎‎‏‎‎‏‏‎‏‎‎‎‎‎‏‎‏‎To quickly open camera, press the power button twice. Works from any screen.‎‏‎‎‏‎"</string>
+    <string name="double_tap_power_for_camera_suggestion_title" msgid="6500405261202883589">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‏‎‏‎‎‎‏‏‎‏‏‎‎‎‎‏‎‏‎‎‎‎‏‎‎‏‎‎‏‏‏‏‏‎‏‎‎‎‎‏‎‏‎‎‎‎‎‎‎‏‎‎‎‎‎‎‎‏‎‏‎Open camera quickly‎‏‎‎‏‎"</string>
+    <string name="double_tap_power_for_camera_suggestion_summary" msgid="7010153544554016996">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‎‎‎‏‎‏‎‎‏‎‎‏‎‎‎‏‎‎‎‏‏‎‎‎‎‎‎‏‏‏‏‎‎‏‎‎‎‎‎‏‎‏‏‎‎‏‏‏‎‎‎‎‏‏‏‎‎‏‎‎‎Press power button twice to open camera‎‏‎‎‏‎"</string>
+    <string name="double_twist_for_camera_mode_title" msgid="4877834147983530479">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‎‎‏‏‏‎‏‏‎‎‎‏‏‎‎‎‏‏‎‎‎‏‎‏‎‎‎‎‎‏‎‎‏‏‏‏‏‏‎‏‎‏‎‎‎‎‎‏‏‎‎‏‏‏‏‎‏‏‏‏‎Flip camera‎‏‎‎‏‎"</string>
+    <string name="double_twist_for_camera_mode_summary" msgid="122977081337563340"></string>
+    <string name="double_twist_for_camera_suggestion_title" msgid="4689410222517954869">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‎‎‎‏‎‎‎‏‎‏‎‎‎‎‏‎‎‎‎‏‏‏‎‎‎‎‎‎‎‏‏‏‎‏‏‏‎‏‎‎‎‏‎‎‏‎‏‎‏‎‎‏‎‎‏‏‎‏‎‏‎Take selfies faster‎‏‎‎‏‎"</string>
+    <string name="double_twist_for_camera_suggestion_summary" product="default" msgid="447403641027147153">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‎‏‏‏‏‎‎‎‏‏‎‏‎‏‎‏‏‏‏‏‏‏‎‎‏‏‏‏‎‏‏‎‏‏‎‏‏‎‏‎‏‎‎‎‏‏‏‎‏‏‎‏‎‏‏‎‎‏‎‎‎‏‎Double-twist phone for selfie mode‎‏‎‎‏‎"</string>
+    <string name="double_twist_for_camera_suggestion_summary" product="tablet" msgid="1724660290703318739">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‎‏‏‏‏‏‏‎‏‏‏‏‎‎‏‏‏‎‎‏‎‏‏‎‎‏‎‏‏‎‎‏‎‎‎‏‏‎‎‏‎‏‏‏‏‏‎‏‏‏‏‎‏‏‎‏‎‎‏‏‎Double-twist tablet for selfie mode‎‏‎‎‏‎"</string>
+    <string name="double_twist_for_camera_suggestion_summary" product="device" msgid="5980398380988039489">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‎‎‏‎‏‏‏‏‏‏‏‎‏‎‏‎‎‏‎‎‏‎‏‎‎‏‎‎‎‏‎‏‏‎‏‎‎‎‎‏‏‏‎‏‎‎‎‎‎‎‎‏‎‏‎‎‎‎‎‏‎Double-twist device for selfie mode‎‏‎‎‏‎"</string>
+    <string name="ambient_display_title" product="default" msgid="5144814600610448504">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‎‏‏‏‎‏‏‎‎‏‏‎‎‎‎‎‏‏‎‏‏‎‎‏‏‏‏‎‏‏‏‏‎‎‎‎‏‎‏‎‎‎‎‏‎‎‎‎‎‏‎‎‎‏‏‏‏‎‎‎‎Double-tap to check phone‎‏‎‎‏‎"</string>
+    <string name="ambient_display_title" product="tablet" msgid="8688795028609563837">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‏‎‎‎‏‎‎‏‎‏‎‎‏‏‎‎‏‏‎‏‎‎‎‎‏‎‏‏‎‎‎‏‎‏‏‎‎‏‏‏‎‎‏‏‏‏‏‏‏‏‎‎‏‎‏‏‏‏‎‏‎Double-tap to check tablet‎‏‎‎‏‎"</string>
+    <string name="ambient_display_title" product="device" msgid="3423781975742145894">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‏‏‏‏‏‎‎‎‎‎‏‏‏‎‏‏‎‏‏‏‏‎‎‏‎‎‎‏‎‎‏‎‎‏‎‎‎‏‏‏‏‏‏‎‏‏‏‎‎‏‎‏‎‏‏‎‎‏‏‎‎Double-tap to check device‎‏‎‎‏‎"</string>
+    <string name="ambient_display_summary" msgid="525662960806416373">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‎‏‏‏‏‏‎‏‎‎‏‎‏‏‏‎‎‎‎‏‏‏‏‎‏‎‏‏‎‏‏‎‎‎‎‎‏‎‎‏‏‏‎‎‏‎‎‏‎‎‏‏‏‏‏‏‏‏‎‏‎‏‎To check time, notification icons, and other info, double-tap your screen.‎‏‎‎‏‎"</string>
+    <string name="ambient_display_suggestion_summary" msgid="5987443721392571847">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‎‎‏‏‎‎‎‏‎‏‏‏‏‎‏‎‏‏‎‎‎‏‎‏‎‏‏‏‎‏‏‏‏‏‏‎‎‎‏‏‏‏‏‏‎‏‎‎‎‏‎‏‏‏‎‎‎‏‏‏‎Check notifications when screen is off‎‏‎‎‏‎"</string>
+    <string name="ambient_display_pickup_title" product="default" msgid="818688002837687268">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‎‏‎‏‏‎‏‎‏‏‏‎‎‏‎‎‏‎‎‎‎‎‏‏‎‎‏‏‎‏‎‏‎‎‏‏‏‎‎‎‎‎‎‏‏‏‎‏‎‏‎‏‏‏‏‏‎‎‏‎‎‎Lift to check phone‎‏‎‎‏‎"</string>
+    <string name="ambient_display_pickup_title" product="tablet" msgid="4455864282995698097">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‏‏‎‏‏‏‎‏‎‏‏‎‎‏‏‎‏‎‎‎‏‏‏‏‎‏‎‏‎‎‎‎‏‎‏‏‎‏‎‎‏‏‏‏‎‎‏‎‏‎‎‏‏‎‏‏‎‎‎‏‎Lift to check tablet‎‏‎‎‏‎"</string>
+    <string name="ambient_display_pickup_title" product="device" msgid="5380534405773531175">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‏‎‏‎‏‎‏‎‏‎‏‏‎‏‏‏‏‏‏‏‏‎‎‎‏‎‎‎‏‏‏‎‎‏‎‏‏‏‏‎‎‏‏‎‎‎‎‏‏‎‎‎‎‎‏‎‎‏‏‏‎Lift to check device‎‏‎‎‏‎"</string>
+    <string name="ambient_display_pickup_summary" product="default" msgid="4567020486787561873">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‏‏‏‏‎‏‏‎‎‎‎‏‎‏‎‏‎‎‎‎‏‏‏‎‏‏‏‏‏‎‎‎‎‏‎‎‏‏‏‎‎‏‏‏‎‏‏‏‏‎‎‏‏‎‎‏‎‎‎‏‎To check time, notification icons, and other info, pick up your phone.‎‏‎‎‏‎"</string>
+    <string name="ambient_display_pickup_summary" product="tablet" msgid="5435283849947236648">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‏‎‏‏‎‏‏‎‏‏‏‎‎‎‎‎‎‎‎‏‏‏‎‏‏‏‎‏‎‎‏‏‏‎‎‏‏‎‎‎‎‏‎‏‏‏‎‎‏‎‎‏‎‎‏‎‏‎‎‎‎To check time, notification icons, and other info, pick up your tablet.‎‏‎‎‏‎"</string>
+    <string name="ambient_display_pickup_summary" product="device" msgid="8256669101643381568">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‎‎‏‎‏‎‎‏‎‏‎‏‏‎‎‏‎‏‎‎‏‏‎‎‏‏‎‏‎‏‎‏‏‏‏‏‎‏‏‎‎‏‎‏‏‎‏‏‏‎‏‏‎‏‎‎‎‎‎‎‎To check time, notification icons, and other info, pick up your device.‎‏‎‎‏‎"</string>
+    <string name="ambient_display_pickup_suggestion_summary" msgid="7014700589991761035">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‎‎‎‏‎‏‎‏‏‎‎‏‎‎‏‏‏‎‎‏‎‎‎‎‎‏‎‏‎‏‏‎‏‎‎‎‎‎‏‎‏‏‏‎‏‎‎‏‎‏‎‎‏‎‎‎‏‎‏‏‎Check notifications when screen is off‎‏‎‎‏‎"</string>
+    <string name="fingerprint_swipe_for_notifications_title" msgid="5816346492253270243">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‎‎‎‎‏‎‏‏‎‏‏‏‏‏‎‏‎‎‎‎‎‏‎‏‎‎‎‏‏‎‎‎‎‎‎‏‎‏‎‏‏‎‎‎‎‏‏‏‎‎‎‎‏‏‏‎‎‎‏‏‎Swipe fingerprint for notifications‎‏‎‎‏‎"</string>
+    <string name="fingerprint_swipe_for_notifications_summary" product="default" msgid="1770661868393713922">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‏‎‎‎‏‎‎‏‎‎‏‎‏‎‏‎‎‏‏‏‏‎‎‏‎‏‏‎‏‎‎‎‎‎‏‎‏‏‏‎‏‏‏‏‏‏‎‏‎‎‎‏‎‎‎‎‎‎‏‎‎To check your notifications, swipe down on the fingerprint sensor on the back of your phone.‎‏‎‎‏‎"</string>
+    <string name="fingerprint_swipe_for_notifications_summary" product="tablet" msgid="902719947767712895">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‎‏‏‎‎‏‎‎‎‎‏‏‏‎‎‎‏‏‎‏‏‎‎‎‎‎‎‏‎‎‏‏‏‏‎‏‎‎‏‎‏‏‎‏‎‏‎‎‎‏‏‎‎‎‏‏‏‏‏‏‏‎To check your notifications, swipe down on the fingerprint sensor on the back of your tablet.‎‏‎‎‏‎"</string>
+    <string name="fingerprint_swipe_for_notifications_summary" product="device" msgid="5372926094116306647">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‏‎‏‎‏‎‎‏‎‎‎‎‎‏‏‏‎‏‏‏‏‏‎‏‎‎‎‎‏‏‎‎‏‏‎‎‎‎‏‏‏‎‏‎‏‎‏‏‏‏‏‎‏‏‎‏‎‏‏‏‎To check your notifications, swipe down on the fingerprint sensor on the back of your device.‎‏‎‎‏‎"</string>
+    <string name="fingerprint_swipe_for_notifications_suggestion_title" msgid="1677291167470357802">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‎‏‏‏‎‏‎‎‎‏‏‎‏‏‏‎‏‏‏‏‎‏‏‎‏‏‏‎‎‎‎‏‏‏‎‏‏‏‏‏‏‎‎‎‏‎‎‎‏‏‎‏‎‎‏‎‏‎‏‎‎See notifications quickly‎‏‎‎‏‎"</string>
+    <string name="fingerprint_swipe_for_notifications_suggestion_summary" msgid="127592803294414082">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‎‎‏‏‏‏‎‎‎‏‎‏‎‏‎‎‏‏‎‎‏‏‏‏‏‎‏‎‏‎‎‎‎‏‎‎‎‏‎‎‎‎‏‎‏‎‎‎‎‏‎‏‎‎‎‎‎‎‏‎‎Swipe down on the fingerprint sensor‎‏‎‎‏‎"</string>
+    <string name="gesture_setting_on" msgid="3455094265233870280">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‏‏‏‏‏‏‏‏‎‎‏‎‏‏‏‏‎‏‎‏‏‏‏‎‏‏‎‏‏‎‏‎‏‎‎‎‏‏‎‎‎‎‎‏‎‎‎‎‏‏‎‏‏‏‎‎‏‎‎‎‎On‎‏‎‎‏‎"</string>
+    <string name="gesture_setting_off" msgid="5230169535435881894">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‏‎‎‎‏‎‎‏‎‏‎‏‎‏‎‎‏‎‏‏‎‏‏‏‏‎‏‏‎‏‎‏‏‎‏‎‏‎‏‏‏‎‎‏‏‎‏‏‏‏‎‏‏‎‏‎‎‏‏‎‎Off‎‏‎‎‏‎"</string>
+    <string name="oem_unlock_enable_disabled_summary_bootloader_unlocked" msgid="4265541229765635629">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‏‎‏‏‎‎‏‏‎‎‏‎‎‎‏‏‏‏‏‏‎‎‏‎‎‏‏‎‎‎‎‎‏‏‏‎‏‏‏‏‎‏‏‎‏‎‏‎‏‏‏‎‎‎‏‎‏‏‎‏‎Bootloader is already unlocked‎‏‎‎‏‎"</string>
+    <string name="oem_unlock_enable_disabled_summary_connectivity" msgid="415954951226204461">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‎‏‏‏‎‏‏‏‎‎‎‏‎‏‏‏‎‎‎‏‎‎‏‏‎‏‎‎‏‏‎‎‎‎‎‏‏‎‎‏‏‎‎‏‏‏‎‎‏‎‎‎‎‏‎‎‏‎‏‏‎‏‎Connect to the Internet first‎‏‎‎‏‎"</string>
+    <string name="oem_unlock_enable_disabled_summary_connectivity_or_locked" msgid="5884723935668892613">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‎‎‎‏‏‎‏‎‏‎‏‎‏‎‏‏‏‏‎‏‎‎‏‏‏‏‎‏‏‎‏‎‏‎‏‎‏‏‎‎‏‎‎‎‎‏‏‏‎‎‏‏‏‏‎‎‎‏‎‏‎Connect to the Internet or contact your carrier‎‏‎‎‏‎"</string>
+    <string name="oem_unlock_enable_disabled_summary_sim_locked_device" msgid="4149387448213399630">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‏‎‎‏‏‎‎‏‎‏‎‏‏‎‎‏‎‏‎‏‏‏‏‎‎‏‏‎‎‏‎‏‎‏‏‎‎‎‏‏‏‎‎‏‎‏‏‎‏‎‎‎‎‏‎‎‏‏‏‎‎Unavailable on carrier-locked devices‎‏‎‎‏‎"</string>
+    <string name="automatic_storage_manager_freed_bytes" msgid="7517560170441007788">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‏‎‎‎‎‏‎‏‎‎‏‏‏‎‏‏‏‏‎‏‎‎‏‎‎‏‎‏‎‎‏‏‎‎‎‎‏‏‎‎‎‎‏‎‏‏‏‎‎‎‏‎‏‎‏‎‏‏‎‎‎‎‏‎‎‏‏‎<xliff:g id="SIZE">%1$s</xliff:g>‎‏‎‎‏‏‏‎ total made available‎‏‎‎‏‏‎\n‎‏‎‎‏‏‏‎‎‏‎‎‏‏‎\n‎‏‎‎‏‏‏‎Last ran on ‎‏‎‎‏‏‎<xliff:g id="DATE">%2$s</xliff:g>‎‏‎‎‏‏‏‎‎‏‎‎‏‎"</string>
+    <string name="web_action_enable_title" msgid="4051513950976670853">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‏‎‎‎‎‎‏‏‏‎‎‏‏‏‎‏‏‏‏‎‎‏‏‏‏‎‎‎‏‏‏‏‏‎‏‎‏‎‎‎‎‎‎‎‏‏‏‏‏‏‎‎‏‎‎‎‎‏‎‏‎Instant apps‎‏‎‎‏‎"</string>
+    <string name="web_action_enable_summary" msgid="3108127559723396382">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‏‎‏‏‎‎‏‎‎‎‏‎‎‏‎‎‏‎‎‏‏‎‎‎‏‏‎‎‎‏‎‎‏‎‎‏‏‏‏‎‏‎‏‎‎‎‏‎‏‏‎‏‎‎‎‏‏‏‏‎‎Open links in apps, even if they’re not installed‎‏‎‎‏‎"</string>
+    <string name="web_action_section_title" msgid="7364647086538399136">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‎‏‏‎‎‎‏‏‎‏‎‎‎‏‏‏‏‎‏‏‏‎‎‎‎‎‎‏‎‏‏‏‎‎‎‏‎‎‏‏‏‏‎‎‏‎‎‏‏‏‎‏‏‎‏‎‎‎‎‎‎Instant apps‎‏‎‎‏‎"</string>
+    <string name="instant_apps_settings" msgid="8827777916518348213">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‏‎‏‎‏‎‎‎‎‎‏‎‏‎‎‏‎‎‎‏‎‎‏‏‏‏‏‎‎‏‎‏‎‏‏‎‎‎‎‏‏‏‎‏‎‎‏‏‎‏‎‏‏‎‏‏‎‏‎‏‎Instant Apps preferences‎‏‎‎‏‎"</string>
+    <string name="domain_url_section_title" msgid="7046835219056428883">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‎‎‎‏‏‏‎‎‏‎‏‏‎‏‏‎‎‎‏‏‎‏‎‎‏‎‏‏‏‏‎‎‎‏‏‎‏‎‎‏‎‎‏‎‎‎‎‎‎‏‏‏‎‏‎‏‎‎‏‏‎Installed apps‎‏‎‎‏‎"</string>
+    <string name="automatic_storage_manager_activation_warning" msgid="6353100011690933254">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‏‎‎‎‎‎‏‎‏‎‏‎‏‎‏‏‏‏‏‎‏‏‎‎‏‏‎‎‏‏‏‎‏‎‏‏‎‏‎‏‏‏‏‎‎‎‏‏‏‏‎‎‎‎‎‎‎‏‏‎‎Your storage is now being managed by the storage manager‎‏‎‎‏‎"</string>
+    <string name="account_for_section_header" msgid="5356566418548737121">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‏‎‏‎‎‏‎‏‎‏‏‎‎‏‎‏‏‎‎‎‏‏‎‎‎‏‏‏‎‎‎‎‎‎‎‏‎‏‏‎‎‎‏‎‎‏‎‎‎‏‎‎‎‏‏‎‎‎‎‏‎Accounts for ‎‏‎‎‏‏‎<xliff:g id="USER_NAME">%1$s</xliff:g>‎‏‎‎‏‏‏‎‎‏‎‎‏‎"</string>
+    <string name="configure_section_header" msgid="7391183586410814450">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‎‏‏‎‏‎‎‏‎‎‏‎‏‏‎‎‎‎‏‎‎‏‎‎‏‏‏‏‏‏‎‎‏‎‎‏‏‎‏‏‎‏‏‎‏‏‎‏‏‎‏‏‏‏‏‏‎‎‏‎‎Configure‎‏‎‎‏‎"</string>
+    <string name="auto_sync_account_title" msgid="898796354710116383">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‎‏‏‎‎‎‏‏‏‏‎‎‏‎‎‏‎‏‎‏‎‏‎‎‎‎‏‎‏‏‏‎‎‎‏‏‏‏‏‏‎‏‎‎‏‏‎‎‏‏‎‎‎‎‎‎‏‏‏‏‏‎Automatically sync data‎‏‎‎‏‎"</string>
+    <string name="auto_sync_personal_account_title" msgid="8496263182646100610">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‎‏‎‏‏‏‏‎‏‎‎‎‏‏‎‎‏‎‏‎‎‏‎‏‏‎‎‏‎‏‏‏‎‏‏‏‏‏‎‏‏‎‎‏‏‏‎‎‎‎‏‎‏‎‎‎‎‎‏‎‎Automatically sync personal data‎‏‎‎‏‎"</string>
+    <string name="auto_sync_work_account_title" msgid="4489172450037434152">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‏‏‏‎‎‏‎‎‏‏‎‎‏‎‏‏‏‏‏‎‏‎‎‎‏‏‏‏‎‎‎‎‎‎‏‏‏‏‏‏‎‎‏‏‏‎‎‎‎‏‏‏‎‎‏‎‏‎‎‎‎Automatically sync work data‎‏‎‎‏‎"</string>
+    <string name="auto_sync_account_summary" msgid="692499211629185107">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‎‏‎‎‏‏‎‎‏‏‏‎‎‎‏‎‎‎‎‎‎‎‏‎‏‏‏‎‏‎‎‏‎‏‏‎‎‎‏‏‎‎‏‎‏‎‏‎‎‏‎‎‎‎‏‎‏‎‎‏‏‎Let apps refresh data automatically‎‏‎‎‏‎"</string>
+    <string name="account_sync_title" msgid="7214747784136106491">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‎‏‎‎‎‎‎‏‏‏‏‏‏‏‏‎‏‏‏‎‏‏‏‎‎‎‏‎‎‏‏‎‎‎‎‏‎‏‏‏‏‎‎‎‎‎‏‎‎‎‎‏‏‏‏‏‏‎‏‏‎Account sync‎‏‎‎‏‎"</string>
+    <string name="account_sync_summary_some_on" msgid="3375930757891381175">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‏‏‏‎‏‏‎‏‏‎‎‏‏‎‏‏‎‏‏‏‎‎‏‎‎‎‏‏‎‏‎‎‏‎‏‎‎‏‏‎‏‏‏‎‎‏‎‏‎‏‏‏‏‎‏‏‎‏‏‏‎Sync on for ‎‏‎‎‏‏‎<xliff:g id="ID_1">%1$d</xliff:g>‎‏‎‎‏‏‏‎ of ‎‏‎‎‏‏‎<xliff:g id="ID_2">%2$d</xliff:g>‎‏‎‎‏‏‏‎ items‎‏‎‎‏‎"</string>
+    <string name="account_sync_summary_all_on" msgid="570431636622254156">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‎‏‏‏‏‏‏‏‏‎‏‎‏‎‏‎‎‏‎‏‎‎‏‎‎‎‏‏‎‏‎‎‎‏‏‏‎‏‏‎‎‎‎‎‏‏‏‎‏‎‎‎‎‎‎‏‎‎‏‏‎‎‎Sync on for all items‎‏‎‎‏‎"</string>
+    <string name="account_sync_summary_all_off" msgid="8782409931761182734">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‏‎‎‏‏‏‏‎‎‎‎‏‎‏‏‎‎‎‏‏‎‏‎‎‏‏‎‏‎‎‏‏‏‏‏‎‎‏‏‏‏‏‎‎‏‏‏‎‏‎‎‎‎‎‎‎‏‏‏‎‎Sync off for all items‎‏‎‎‏‎"</string>
+    <string name="enterprise_privacy_settings" msgid="1177106810374146496">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‎‎‎‎‎‏‎‏‎‏‎‏‏‏‏‎‏‏‎‎‎‏‏‎‏‎‎‎‎‏‎‎‏‏‏‏‎‎‎‎‏‎‏‏‎‏‎‎‏‎‎‏‏‏‎‎‎‎‎‎‎Managed device info‎‏‎‎‏‎"</string>
+    <string name="enterprise_privacy_settings_summary_generic" msgid="5853292305730761128">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‎‎‎‏‎‎‏‏‏‎‏‏‎‎‎‏‎‎‏‎‎‏‎‏‎‏‏‏‎‎‎‎‏‎‎‏‏‎‎‏‏‎‏‏‏‏‏‏‎‎‎‏‏‎‏‎‏‎‎‎‎Changes &amp; settings managed by your organization‎‏‎‎‏‎"</string>
+    <string name="enterprise_privacy_settings_summary_with_name" msgid="4266234968317996188">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‏‎‏‏‎‎‏‏‎‏‎‎‏‎‏‏‎‏‏‎‎‎‎‏‏‎‎‏‏‎‏‎‎‏‏‎‏‏‏‏‎‎‎‏‏‎‏‎‏‏‎‎‏‎‎‏‏‏‎‎‎Changes &amp; settings managed by ‎‏‎‎‏‏‎<xliff:g id="ORGANIZATION_NAME">%s</xliff:g>‎‏‎‎‏‏‏‎‎‏‎‎‏‎"</string>
+    <string name="enterprise_privacy_header" msgid="7402406406883832509">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‎‏‏‎‏‎‏‏‏‎‏‎‏‎‏‎‎‎‎‏‎‏‏‎‏‎‎‎‎‏‎‎‏‏‎‏‎‏‏‎‎‎‏‎‏‏‏‏‎‎‏‎‏‎‏‏‏‏‎‏‎To provide access to your work data, your organization may change settings and install software on your device.‎‏‎‎‏‏‎\n‎‏‎‎‏‏‏‎‎‏‎‎‏‏‎\n‎‏‎‎‏‏‏‎For more details, contact your organization\'s admin.‎‏‎‎‏‎"</string>
+    <string name="enterprise_privacy_exposure_category" msgid="7313392680107938517">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‎‏‎‏‎‏‏‏‏‏‏‎‎‏‏‎‎‎‏‏‏‏‏‎‎‏‎‏‎‎‎‎‎‎‎‎‏‏‎‎‎‏‏‎‏‎‎‏‎‎‏‎‏‏‎‏‎‏‎‏‎Types of information your organization can see‎‏‎‎‏‎"</string>
+    <string name="enterprise_privacy_exposure_changes_category" msgid="9079283547182933771">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‏‏‏‎‎‎‎‎‎‎‎‎‎‎‎‏‏‎‎‎‎‏‎‎‏‎‎‎‎‎‏‏‎‏‎‎‏‏‏‎‎‎‏‏‎‎‏‎‎‏‏‏‎‎‎‎‏‎‏‏‎Changes made by your organization\'s admin‎‏‎‎‏‎"</string>
+    <string name="enterprise_privacy_device_access_category" msgid="5423434164248819058">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‏‎‏‏‎‏‎‎‎‎‏‏‏‏‏‎‏‎‎‎‏‎‏‎‎‎‏‏‎‏‎‎‎‏‏‎‏‏‎‎‎‏‎‎‏‎‏‏‎‏‎‏‎‏‏‏‎‎‏‎‎Your access to this device‎‏‎‎‏‎"</string>
+    <string name="enterprise_privacy_enterprise_data" msgid="2773968662865848413">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‎‏‏‎‎‏‏‏‏‏‏‏‎‎‎‏‏‏‎‏‏‏‎‎‏‏‎‏‎‏‎‎‎‎‎‎‎‎‏‎‏‏‏‏‎‎‏‎‏‎‎‎‎‏‎‏‏‏‎‏‎Data associated with your work account, such as email and calendar‎‏‎‎‏‎"</string>
+    <string name="enterprise_privacy_installed_packages" msgid="2313698828178764590">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‎‎‎‎‎‎‎‏‏‎‏‏‏‏‏‎‏‎‎‎‏‏‎‏‎‎‏‏‎‏‏‎‎‎‏‎‏‏‎‏‎‏‎‏‎‎‏‏‎‎‏‏‎‎‏‎‏‏‏‎‎List of apps on your device‎‏‎‎‏‎"</string>
+    <string name="enterprise_privacy_usage_stats" msgid="4398411405572759370">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‏‏‎‏‎‎‎‎‏‎‏‎‎‏‎‎‏‎‏‏‏‏‎‏‏‏‏‎‏‎‎‏‏‏‎‏‎‎‏‏‎‎‎‎‏‏‎‏‏‏‏‏‎‏‎‎‏‎‏‎‎Amount of time and data spent in each app‎‏‎‎‏‎"</string>
+    <string name="enterprise_privacy_network_logs" msgid="161722817268849590">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‎‏‎‏‎‎‎‏‏‏‏‏‎‏‎‎‎‏‏‏‎‎‎‎‎‏‎‏‏‏‎‏‎‎‎‏‏‎‏‏‎‎‎‏‎‏‎‎‏‏‎‏‏‏‎‏‏‎‏‏‎‎Most recent network traffic log‎‏‎‎‏‎"</string>
+    <string name="enterprise_privacy_bug_reports" msgid="843225086779037863">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‎‏‎‏‏‏‎‏‏‎‎‏‏‏‎‏‏‏‏‎‎‏‎‏‏‏‏‏‏‏‎‏‏‎‎‏‏‎‎‏‎‏‎‎‏‏‎‎‏‏‎‎‎‏‎‏‎‎‏‏‏‎Most recent bug report‎‏‎‎‏‎"</string>
+    <string name="enterprise_privacy_security_logs" msgid="5377362481617301074">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‏‎‏‎‏‎‏‎‎‎‎‎‎‎‏‏‏‎‏‎‏‎‏‎‏‏‏‏‏‏‎‎‎‎‎‏‎‏‎‎‏‏‏‏‏‏‏‎‏‏‏‎‎‏‎‏‎‎‏‎‎Most recent security log‎‏‎‎‏‎"</string>
+    <string name="enterprise_privacy_none" msgid="7706621148858381189">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‏‎‏‎‏‏‏‏‎‎‏‏‎‏‏‎‏‎‏‏‎‎‎‏‏‎‏‎‎‏‏‏‏‏‎‎‎‎‏‏‎‏‏‏‎‏‏‏‎‎‏‏‏‎‎‎‎‏‎‏‎None‎‏‎‎‏‎"</string>
+    <string name="enterprise_privacy_enterprise_installed_packages" msgid="6353757812144878828">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‏‎‎‎‎‎‏‎‏‏‎‏‎‎‎‏‎‏‎‏‎‎‎‏‎‎‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‏‎‎‎‏‏‎‏‎‎‏‏‏‎‏‏‎‎‎Apps installed‎‏‎‎‏‎"</string>
+    <string name="enterprise_privacy_apps_count_estimation_info" msgid="7433213592572082606">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‎‏‏‏‎‎‏‎‏‎‎‎‎‎‎‏‎‏‎‎‎‏‏‎‎‎‎‏‎‎‏‎‏‏‎‎‏‏‎‏‏‏‎‏‎‎‏‏‏‎‎‏‏‎‏‎‏‏‏‎‎Number of apps is estimated. It may not include apps installed outside of the Play Store.‎‏‎‎‏‎"</string>
+    <plurals name="enterprise_privacy_number_packages_lower_bound" formatted="false" msgid="3005116533873542976">
+      <item quantity="other">‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‏‎‎‏‏‎‏‏‎‏‎‎‎‏‎‏‎‎‎‏‏‎‎‏‎‎‎‎‏‏‎‏‎‏‏‎‎‎‏‎‏‏‏‏‏‎‎‎‎‏‏‏‎‏‎‎‎‎‎‎‎Minimum ‎‏‎‎‏‏‎<xliff:g id="COUNT_1">%d</xliff:g>‎‏‎‎‏‏‏‎ apps‎‏‎‎‏‎</item>
+      <item quantity="one">‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‏‎‎‏‏‎‏‏‎‏‎‎‎‏‎‏‎‎‎‏‏‎‎‏‎‎‎‎‏‏‎‏‎‏‏‎‎‎‏‎‏‏‏‏‏‎‎‎‎‏‏‏‎‏‎‎‎‎‎‎‎Minimum ‎‏‎‎‏‏‎<xliff:g id="COUNT_0">%d</xliff:g>‎‏‎‎‏‏‏‎ app‎‏‎‎‏‎</item>
+    </plurals>
+    <string name="enterprise_privacy_location_access" msgid="4158197200885270634">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‏‎‎‏‏‎‏‏‎‏‎‎‏‏‏‎‎‎‏‎‎‏‎‏‎‎‏‎‏‎‏‏‏‎‎‎‏‏‎‎‏‎‏‎‎‏‎‎‏‎‎‎‎‏‏‎‏‎‏‎‎Location permissions‎‏‎‎‏‎"</string>
+    <string name="enterprise_privacy_microphone_access" msgid="5717375623568864441">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‏‏‏‏‎‏‎‏‏‎‎‎‎‎‏‏‎‎‏‎‏‏‎‏‎‏‏‎‎‏‏‏‎‎‏‎‎‏‎‎‏‏‎‎‏‎‏‏‎‏‎‎‏‎‏‏‏‎‎‏‎Microphone permissions‎‏‎‎‏‎"</string>
+    <string name="enterprise_privacy_camera_access" msgid="4858146118537519375">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‎‎‏‏‎‏‏‎‏‎‏‏‏‎‎‏‏‎‏‎‎‎‏‎‎‏‏‏‏‎‏‏‏‏‏‎‎‏‎‏‏‏‏‏‎‎‏‎‎‎‎‏‎‎‎‎‏‏‏‏‎Camera permissions‎‏‎‎‏‎"</string>
+    <string name="enterprise_privacy_enterprise_set_default_apps" msgid="3288495615791128724">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‏‏‎‏‏‎‏‎‎‎‏‏‎‎‎‏‎‏‎‏‎‏‎‏‎‏‏‎‏‏‏‎‎‎‎‎‏‎‏‎‏‎‎‎‏‏‏‎‎‎‎‎‏‎‎‏‎‏‎‎‎Default apps‎‏‎‎‏‎"</string>
+    <plurals name="enterprise_privacy_number_packages" formatted="false" msgid="2765037387436064893">
+      <item quantity="other">‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‎‏‏‎‎‏‎‏‏‏‏‏‎‏‏‎‎‎‏‎‏‏‎‏‏‎‏‎‏‎‏‎‎‏‎‎‏‏‎‎‏‏‎‏‎‎‎‎‎‎‎‎‎‏‏‏‏‏‎‏‎‎‏‎‎‏‏‎<xliff:g id="COUNT_1">%d</xliff:g>‎‏‎‎‏‏‏‎ apps‎‏‎‎‏‎</item>
+      <item quantity="one">‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‎‏‏‎‎‏‎‏‏‏‏‏‎‏‏‎‎‎‏‎‏‏‎‏‏‎‏‎‏‎‏‎‎‏‎‎‏‏‎‎‏‏‎‏‎‎‎‎‎‎‎‎‎‏‏‏‏‏‎‏‎‎‏‎‎‏‏‎<xliff:g id="COUNT_0">%d</xliff:g>‎‏‎‎‏‏‏‎ app‎‏‎‎‏‎</item>
+    </plurals>
+    <string name="enterprise_privacy_input_method" msgid="6531350246850814920">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‏‎‏‎‏‎‏‎‎‏‎‎‎‎‎‎‎‏‎‎‎‏‏‏‎‎‎‏‏‏‏‎‎‏‏‏‎‎‏‏‎‎‏‏‏‏‏‎‎‎‏‏‏‏‎‎‏‎‎‎‎Default keyboard‎‏‎‎‏‎"</string>
+    <string name="enterprise_privacy_input_method_name" msgid="4941106433683067953">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‎‏‎‎‏‎‎‏‎‎‏‎‎‏‎‏‎‏‏‎‎‎‎‏‏‏‏‏‎‏‎‏‎‎‎‏‎‎‎‏‎‎‏‏‏‎‎‏‎‏‎‎‎‎‏‏‎‎‎‏‎Set to ‎‏‎‎‏‏‎<xliff:g id="APP_LABEL">%s</xliff:g>‎‏‎‎‏‏‏‎‎‏‎‎‏‎"</string>
+    <string name="enterprise_privacy_always_on_vpn_device" msgid="4409098287763221215">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‏‏‎‏‎‎‏‏‎‎‎‎‎‏‎‎‎‎‏‏‏‎‎‎‏‎‎‎‎‏‎‎‎‏‎‏‏‏‏‎‏‎‎‎‏‏‏‎‏‎‏‎‏‏‎‏‏‏‏‏‎Always-on VPN turned on‎‏‎‎‏‎"</string>
+    <string name="enterprise_privacy_always_on_vpn_personal" msgid="9217774730260037434">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‏‏‏‏‏‏‏‎‏‏‎‎‎‎‎‏‏‏‎‏‎‏‎‎‎‏‏‏‏‎‎‎‎‎‎‎‏‎‏‏‏‎‎‎‏‎‏‏‏‏‏‏‎‎‏‏‏‎‏‎‎Always-on VPN turned on in your personal profile‎‏‎‎‏‎"</string>
+    <string name="enterprise_privacy_always_on_vpn_work" msgid="7244472958208315814">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‎‏‎‎‏‎‎‎‏‎‎‏‏‎‎‎‏‎‎‏‏‏‎‎‎‏‎‏‏‏‎‎‏‎‏‎‏‏‏‎‏‏‏‎‎‎‎‏‎‎‎‏‏‎‏‎‎‏‏‎‎Always-on VPN turned on in your work profile‎‏‎‎‏‎"</string>
+    <string name="enterprise_privacy_global_http_proxy" msgid="7936664553416257333">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‏‏‏‎‎‎‏‎‎‏‎‎‏‎‏‏‎‎‏‎‎‏‎‏‏‏‎‎‎‏‏‎‏‏‏‏‏‏‎‎‏‏‏‏‎‏‏‎‏‏‏‏‎‎‏‏‎‏‎‏‎Global HTTP proxy set‎‏‎‎‏‎"</string>
+    <string name="enterprise_privacy_ca_certs_device" msgid="2019652712782510262">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‏‏‎‎‎‎‎‎‎‏‏‏‎‎‏‏‏‏‏‏‎‏‏‏‎‎‎‏‎‎‎‏‎‎‏‏‎‎‎‎‏‏‏‎‎‎‏‏‏‎‎‎‏‎‏‏‎‏‏‎‎Trusted credentials‎‏‎‎‏‎"</string>
+    <string name="enterprise_privacy_ca_certs_personal" msgid="2279084820904076599">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‏‏‏‏‏‎‏‎‎‎‎‎‏‏‏‎‏‏‏‏‏‎‎‏‎‎‎‏‏‏‎‎‏‎‏‎‏‏‏‏‏‎‎‎‏‏‏‎‎‏‎‏‎‎‏‏‎‏‏‏‎Trusted credentials in your personal profile‎‏‎‎‏‎"</string>
+    <string name="enterprise_privacy_ca_certs_work" msgid="6187377647815301809">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‎‏‎‏‏‏‎‏‏‏‎‏‏‏‏‏‏‎‏‏‎‎‏‏‎‎‎‎‎‏‎‎‎‏‎‏‎‎‏‏‏‎‎‏‎‎‎‏‏‎‏‎‏‎‏‏‎‎‎‏‎Trusted credentials in your work profile‎‏‎‎‏‎"</string>
+    <plurals name="enterprise_privacy_number_ca_certs" formatted="false" msgid="526375234629534165">
+      <item quantity="other">‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‎‏‏‏‏‏‎‏‎‎‏‏‏‎‎‎‎‎‏‏‏‏‎‏‏‏‏‏‎‎‏‎‏‎‏‏‏‎‏‎‏‎‏‎‎‎‎‎‎‎‎‎‎‏‏‏‎‏‎‏‎‏‎Minimum ‎‏‎‎‏‏‎<xliff:g id="COUNT_1">%d</xliff:g>‎‏‎‎‏‏‏‎ CA certificates‎‏‎‎‏‎</item>
+      <item quantity="one">‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‎‏‏‏‏‏‎‏‎‎‏‏‏‎‎‎‎‎‏‏‏‏‎‏‏‏‏‏‎‎‏‎‏‎‏‏‏‎‏‎‏‎‏‎‎‎‎‎‎‎‎‎‎‏‏‏‎‏‎‏‎‏‎Minimum ‎‏‎‎‏‏‎<xliff:g id="COUNT_0">%d</xliff:g>‎‏‎‎‏‏‏‎ CA certificate‎‏‎‎‏‎</item>
+    </plurals>
+    <string name="enterprise_privacy_lock_device" msgid="8791656477097208540">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‏‎‏‎‎‎‎‎‎‎‏‎‎‎‏‏‏‏‎‎‏‏‏‏‏‏‎‎‎‏‎‏‏‎‎‎‏‎‏‎‎‏‎‎‎‎‏‎‏‎‏‎‏‏‎‏‏‏‎‎‎Admin can lock the device and reset password‎‏‎‎‏‎"</string>
+    <string name="enterprise_privacy_wipe_device" msgid="2821960015797241790">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‎‏‏‏‎‎‏‎‏‎‎‏‏‎‎‏‏‏‎‏‏‎‏‎‏‏‏‎‏‏‎‏‎‏‏‏‏‏‏‏‎‎‏‏‎‏‎‎‎‏‏‏‏‎‏‏‏‏‏‎‎Admin can delete all device data‎‏‎‎‏‎"</string>
+    <string name="enterprise_privacy_failed_password_wipe_device" msgid="1001255609345002878">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‎‏‏‎‏‏‏‏‎‎‏‎‏‎‎‏‎‏‏‎‎‏‎‏‎‏‎‏‏‏‏‏‏‏‏‎‎‎‏‏‎‎‎‎‎‎‏‎‎‏‏‎‏‎‏‏‏‏‏‏‎‎Failed password attempts before deleting all device data‎‏‎‎‏‎"</string>
+    <string name="enterprise_privacy_failed_password_wipe_work" msgid="4040565826652951057">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‏‏‏‏‏‎‎‏‎‎‏‏‎‏‏‎‎‎‏‎‎‏‎‏‎‎‏‏‏‎‏‏‎‏‎‏‎‎‏‎‎‎‎‏‎‎‎‏‎Failed password attempts before deleting work profile data‎‏‎‎‏‎"</string>
+    <plurals name="enterprise_privacy_number_failed_password_wipe" formatted="false" msgid="5279099270351036696">
+      <item quantity="other">‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‏‎‎‏‎‏‎‎‎‎‏‏‎‎‏‎‎‎‎‎‏‏‎‏‎‎‎‏‎‎‎‎‎‏‏‏‎‏‎‎‏‏‎‎‎‎‏‎‎‎‎‏‎‎‎‏‏‎‎‎‎‎‏‎‎‏‏‎<xliff:g id="COUNT_1">%d</xliff:g>‎‏‎‎‏‏‏‎ attempts‎‏‎‎‏‎</item>
+      <item quantity="one">‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‏‎‎‏‎‏‎‎‎‎‏‏‎‎‏‎‎‎‎‎‏‏‎‏‎‎‎‏‎‎‎‎‎‏‏‏‎‏‎‎‏‏‎‎‎‎‏‎‎‎‎‏‎‎‎‏‏‎‎‎‎‎‏‎‎‏‏‎<xliff:g id="COUNT_0">%d</xliff:g>‎‏‎‎‏‏‏‎ attempt‎‏‎‎‏‎</item>
+    </plurals>
+    <string name="do_disclosure_generic" msgid="8653670456990823307">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‏‎‎‎‎‎‎‏‏‎‎‎‎‎‎‎‎‎‏‏‎‏‏‎‏‏‏‎‎‏‏‏‏‎‎‎‎‎‏‏‏‎‏‎‏‏‏‏‎‎‏‏‏‎‎‎‏‎‏‏‎This device is managed by your organization.‎‏‎‎‏‎"</string>
+    <string name="do_disclosure_with_name" msgid="1141081465968481380">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‎‏‏‏‏‏‏‎‏‎‏‎‏‏‏‏‎‏‏‏‏‏‎‎‎‏‏‎‎‎‎‏‎‏‏‏‎‏‏‎‏‎‏‎‏‎‏‎‏‎‏‎‎‎‏‏‎‎‏‎‎‎This device is managed by ‎‏‎‎‏‏‎<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">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‎‎‎‏‏‎‎‎‏‎‏‎‎‎‎‏‎‏‎‎‎‎‎‏‎‏‏‏‎‏‎‏‏‎‏‏‎‎‎‎‎‏‎‏‎‎‏‎‏‎‏‎‏‎‏‏‎‎‎‏‎Learn more‎‏‎‎‏‎"</string>
+    <plurals name="default_camera_app_title" formatted="false" msgid="1134677050353971363">
+      <item quantity="other">‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‎‏‏‏‏‏‎‏‏‏‏‏‏‎‎‏‎‏‏‏‎‏‏‎‎‎‎‏‏‏‏‏‏‏‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‎‎‎‏‎‏‎‎‎‏‏‎Camera apps‎‏‎‎‏‎</item>
+      <item quantity="one">‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‎‏‏‏‏‏‎‏‏‏‏‏‏‎‎‏‎‏‏‏‎‏‏‎‎‎‎‏‏‏‏‏‏‏‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‎‎‎‏‎‏‎‎‎‏‏‎Camera app‎‏‎‎‏‎</item>
+    </plurals>
+    <string name="default_calendar_app_title" msgid="3545972964391065220">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‎‎‎‏‎‎‏‏‎‏‎‏‏‏‎‏‎‎‏‏‏‎‎‏‏‏‏‏‏‎‏‎‏‏‎‏‏‎‏‎‏‎‏‏‎‎‎‏‎‏‏‎‏‎‎‎‎‏‎‎‎Calendar app‎‏‎‎‏‎"</string>
+    <string name="default_contacts_app_title" msgid="3497370557378660098">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‎‎‎‎‏‎‎‎‏‎‎‏‎‎‏‎‎‏‏‏‏‏‏‏‏‏‎‏‏‏‏‏‏‎‎‎‎‏‏‏‎‏‏‏‎‎‎‎‎‏‏‏‎‎‎‎‎‎‏‎‎Contacts app‎‏‎‎‏‎"</string>
+    <plurals name="default_email_app_title" formatted="false" msgid="42826975161049245">
+      <item quantity="other">‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‎‎‎‏‎‎‏‏‎‎‎‎‎‏‎‎‏‏‎‏‏‏‎‏‎‎‎‎‎‏‏‎‎‎‏‎‏‎‎‎‏‏‏‎‏‏‎‎‎‎‎‏‎‎‏‏‏‎‏‎Email client apps‎‏‎‎‏‎</item>
+      <item quantity="one">‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‎‎‎‏‎‎‏‏‎‎‎‎‎‏‎‎‏‏‎‏‏‏‎‏‎‎‎‎‎‏‏‎‎‎‏‎‏‎‎‎‏‏‏‎‏‏‎‎‎‎‎‏‎‎‏‏‏‎‏‎Email client app‎‏‎‎‏‎</item>
+    </plurals>
+    <string name="default_map_app_title" msgid="7560143381633608567">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‏‎‎‎‏‏‏‎‏‎‏‏‎‎‎‎‎‏‏‎‎‏‎‏‏‎‎‏‏‎‏‎‏‎‎‏‎‏‎‎‏‎‏‎‏‎‏‎‏‎‏‏‎‏‏‏‎‏‏‏‎Map app‎‏‎‎‏‎"</string>
+    <plurals name="default_phone_app_title" formatted="false" msgid="6714041230953195024">
+      <item quantity="other">‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‏‏‎‏‎‎‏‎‏‏‎‏‎‎‎‏‎‎‎‎‏‏‏‎‏‏‎‏‎‏‎‏‎‎‏‎‎‏‎‎‏‎‏‎‏‎‏‎‎‏‏‎‎‎‎‏‎‎‎‎‎Phone apps‎‏‎‎‏‎</item>
+      <item quantity="one">‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‏‏‎‏‎‎‏‎‏‏‎‏‎‎‎‏‎‎‎‎‏‏‏‎‏‏‎‏‎‏‎‏‎‎‏‎‎‏‎‎‏‎‏‎‏‎‏‎‎‏‏‎‎‎‎‏‎‎‎‎‎Phone app‎‏‎‎‏‎</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">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‎‏‏‏‎‎‎‏‏‏‎‎‎‎‎‏‎‏‏‎‏‎‎‎‎‏‏‎‎‎‏‏‏‏‎‎‎‎‎‏‏‎‎‏‏‎‎‎‎‏‎‏‎‎‎‏‏‎‏‎‏‎‎Photos &amp; videos‎‏‎‎‏‎"</string>
+    <string name="storage_music_audio" msgid="789779084825206838">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‎‏‎‏‎‏‏‏‏‎‏‎‏‏‏‎‏‏‎‏‏‏‏‏‎‎‏‎‎‏‎‏‎‏‎‏‎‎‎‎‎‏‎‏‎‎‎‏‎‎‎‎‎‎‎‏‏‎‏‏‎‎Music &amp; audio‎‏‎‎‏‎"</string>
+    <string name="storage_games" msgid="7703159201697117621">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‏‎‏‎‏‏‏‎‎‏‏‏‎‎‎‏‏‏‏‎‎‏‏‏‏‎‏‏‎‎‎‏‏‎‎‏‎‏‏‏‎‎‎‎‎‎‏‏‎‏‎‏‏‎‏‏‎‏‎‏‎Games‎‏‎‎‏‎"</string>
+    <string name="storage_other_apps" msgid="5524321740031718083">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‏‏‎‎‏‎‏‎‏‎‏‎‎‏‎‏‎‏‎‏‎‏‎‏‏‎‏‎‎‏‏‏‏‎‏‏‏‎‎‎‏‏‏‎‏‏‏‏‎‎‏‎‏‏‎‎‎‎‏‏‎Other apps‎‏‎‎‏‎"</string>
+    <string name="storage_files" msgid="8581083146777364063">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‎‏‏‏‎‎‎‏‎‏‏‎‎‎‏‎‎‎‎‏‏‎‏‎‏‎‎‎‎‏‎‎‏‏‏‏‏‏‎‎‎‎‎‏‏‎‎‎‎‏‏‎‎‏‎‏‏‏‏‏‎Files‎‏‎‎‏‎"</string>
+    <string name="storage_size_large_alternate" msgid="3550744227788333060">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‎‎‎‏‎‏‎‎‎‏‏‎‏‏‎‎‎‏‏‏‎‎‎‏‎‎‎‎‎‎‎‎‎‎‎‏‏‎‎‏‎‏‏‏‏‎‏‎‎‎‎‎‎‎‎‎‎‏‎‎‎‎‏‎‎‏‏‎<xliff:g id="NUMBER">^1</xliff:g>‎‏‎‎‏‏‏‎‎‏‎‎‏‏‎"<small>"‎‏‎‎‏‏‏‎ ‎‏‎‎‏‏‎<xliff:g id="UNIT">^2</xliff:g>‎‏‎‎‏‏‏‎‎‏‎‎‏‏‎"</small>"‎‏‎‎‏‏‏‎‎‏‎‎‏‎"</string>
+    <string name="storage_volume_total" msgid="3499221850532701342">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‎‎‎‎‏‎‎‎‏‏‏‏‏‎‏‏‏‎‏‏‏‎‏‏‏‎‏‏‏‎‏‏‏‏‏‏‎‏‎‎‏‎‎‏‎‏‏‎‎‏‎‎‏‎‎‏‏‏‏‎‎Used of ‎‏‎‎‏‏‎<xliff:g id="TOTAL">%1$s</xliff:g>‎‏‎‎‏‏‏‎‎‏‎‎‏‎"</string>
+    <string name="storage_percent_full" msgid="6095012055875077036">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‎‏‎‎‏‎‎‏‎‏‎‏‏‏‎‏‎‏‎‏‎‎‏‎‏‏‎‎‎‎‎‎‏‏‎‎‎‎‏‎‏‎‎‎‎‏‎‎‎‎‏‏‏‎‏‎‏‏‎‎‎used‎‏‎‎‏‎"</string>
+    <string name="clear_instant_app_data" msgid="2004222610585890909">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‏‎‏‏‏‏‎‏‎‎‎‎‎‏‏‎‏‏‎‏‏‏‎‏‏‎‎‎‎‏‏‏‎‎‏‎‏‏‎‎‎‏‏‏‎‎‏‏‎‎‎‎‎‏‎‏‏‏‎‏‎Clear app‎‏‎‎‏‎"</string>
+    <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">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‎‏‎‏‏‏‎‏‎‏‏‏‎‎‏‏‎‎‎‎‎‏‎‏‎‎‎‎‎‎‎‏‎‏‏‏‏‏‎‎‎‏‏‎‏‎‎‎‎‎‎‎‎‎‎‎‎‏‏‎‎Autofill service‎‏‎‎‏‎"</string>
+    <string name="autofill_keywords" msgid="7485591824120812710">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‎‏‏‏‏‏‏‎‎‎‏‎‎‎‏‎‏‎‏‎‎‎‎‏‏‎‏‎‏‎‎‎‏‎‏‎‎‏‎‎‏‎‏‎‎‎‎‏‎‏‎‎‏‎‏‎‎‏‏‎‎auto, fill, autofill‎‏‎‎‏‎"</string>
+    <string name="autofill_confirmation_message" msgid="2784869528908005194">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‎‏‏‎‏‎‏‎‎‏‎‏‏‏‎‏‏‎‎‎‎‎‎‏‎‏‎‎‏‏‏‎‏‎‎‎‎‏‎‏‏‏‏‎‏‏‏‏‏‏‏‏‎‏‎‎‏‎‏‎‎&lt;b&gt;Make sure you trust this app&lt;/b&gt; &lt;br/&gt; &lt;br/&gt; &lt;xliff:g id=app_name example=Google Autofill&gt;%1$s&lt;/xliff:g&gt; uses what\'s on your screen to determine what can be autofilled.‎‏‎‎‏‎"</string>
+    <string name="device_theme" msgid="4571803018917608588">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‏‏‏‏‎‏‏‏‎‎‏‎‎‏‎‎‏‏‏‎‏‎‎‏‏‏‏‏‏‎‎‎‏‏‎‏‏‎‏‎‎‏‎‎‎‏‏‏‏‏‎‎‏‎‎‎‏‏‎‎‎Device theme‎‏‎‎‏‎"</string>
+    <string name="default_theme" msgid="7085644992078579076">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‎‎‏‎‎‏‎‏‎‏‎‏‎‏‎‎‎‏‎‎‏‎‎‏‎‏‎‎‎‎‏‏‎‏‎‏‎‏‎‏‏‏‏‎‏‎‎‎‎‏‎‏‏‎‎‎‎‏‎‎‎Default‎‏‎‎‏‎"</string>
+    <string name="storage_manager_indicator" msgid="1516810749625915020">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‎‏‎‏‎‎‎‎‏‏‎‎‏‏‎‎‏‎‏‏‎‏‎‏‎‏‏‏‎‎‏‎‎‎‏‎‏‏‏‏‎‎‏‎‎‏‎‏‎‏‏‎‏‎‎‎‏‏‎‎‎Storage Manager: ‎‏‎‎‏‏‎<xliff:g id="STATUS">^1</xliff:g>‎‏‎‎‏‏‏‎‎‏‎‎‏‎"</string>
+    <string name="storage_manager_indicator_off" msgid="7488057587180724388">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‎‏‏‏‏‏‏‎‏‎‏‎‏‏‏‎‏‏‎‎‏‎‏‏‎‎‏‏‏‎‏‏‏‏‎‏‏‎‎‏‎‎‏‏‎‏‏‎‎‎‎‎‏‎‏‎‎‏‎‎‎Off‎‏‎‎‏‎"</string>
+    <string name="storage_manager_indicator_on" msgid="8625551710194584733">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‎‏‏‏‏‎‏‏‎‏‎‎‎‎‎‏‏‏‎‏‏‎‎‏‎‏‎‎‏‎‎‎‏‏‎‏‏‏‏‎‏‎‎‏‎‏‎‎‏‏‎‎‏‎‎‏‏‏‎‏‎On‎‏‎‎‏‎"</string>
+    <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="carrier_provisioning" msgid="4398683675591893169">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‏‏‎‏‎‎‎‎‏‎‏‏‎‏‎‎‎‎‏‏‎‏‏‏‏‏‏‏‎‏‏‎‏‎‏‎‏‏‏‏‎‏‏‎‏‏‏‎‎‎‎‎‏‎‏‏‎‎‎‏‎Carrier Provisioning Info‎‏‎‎‏‎"</string>
+    <string name="trigger_carrier_provisioning" msgid="3434865918009286187">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‏‏‏‏‏‎‏‎‏‎‏‏‎‎‎‏‏‎‎‎‎‏‎‏‏‎‏‎‏‎‎‎‏‏‏‎‎‎‎‎‏‎‏‎‎‎‎‏‏‏‏‎‎‎‏‎‏‎‏‏‎Trigger Carrier Provisioning‎‏‎‎‏‎"</string>
+    <string name="new_device_suggestion_title" msgid="698847081680980774">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‎‏‎‎‏‏‎‏‏‎‎‏‎‏‏‎‎‏‏‎‏‏‎‏‏‎‏‏‏‏‏‎‏‎‏‏‏‏‏‏‎‏‎‎‏‏‏‎‎‏‎‏‏‎‎‏‎‎‏‏‎‎What\'s new and exciting?‎‏‎‎‏‎"</string>
+    <string name="new_device_suggestion_summary" product="default" msgid="206396571522515855">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‎‏‎‏‎‏‏‎‏‏‏‎‏‎‏‎‎‎‏‎‎‏‎‎‏‎‏‏‎‏‎‎‏‏‎‎‎‎‏‏‏‎‏‎‏‎‏‎‎‎‎‏‏‏‎‎‎‏‏‏‏‎Take a tour of your new phone‎‏‎‎‏‎"</string>
+    <string name="new_device_suggestion_summary" product="tablet" msgid="393751455688210956">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‎‏‏‏‎‏‎‏‏‏‎‏‏‎‏‏‏‎‎‎‏‎‏‏‎‏‏‏‎‎‏‏‎‏‏‏‏‎‎‎‎‏‎‏‏‎‏‎‏‏‏‎‏‎‎‎‎‎‏‏‎‎‎Take a tour of your new tablet‎‏‎‎‏‎"</string>
+    <string name="new_device_suggestion_summary" product="device" msgid="2939870049868336652">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‏‎‎‎‏‏‎‎‏‏‎‎‏‎‎‎‎‏‎‎‎‎‏‏‏‎‏‏‏‏‏‏‏‎‎‎‎‎‏‏‎‏‏‎‎‏‎‎‏‏‏‎‎‎‎‎‏‏‎‎‎Take a tour of your new device‎‏‎‎‏‎"</string>
+    <string name="disabled_low_ram_device" msgid="3751578499721173344">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‎‏‎‎‎‎‎‏‎‎‎‎‎‏‎‎‏‎‎‎‏‏‎‎‎‏‎‎‏‏‎‎‏‏‏‎‏‏‎‏‏‏‏‏‏‎‎‏‏‎‎‏‎‏‏‎‎‎‎‎‎This feature is not available on this device‎‏‎‎‏‎"</string>
+</resources>
diff --git a/res/values-es-rUS/arrays.xml b/res/values-es-rUS/arrays.xml
index a476f83..c80097f 100644
--- a/res/values-es-rUS/arrays.xml
+++ b/res/values-es-rUS/arrays.xml
@@ -100,8 +100,6 @@
     <!-- no translation found for wifi_security_no_eap:0 (2084555984818107151) -->
     <!-- no translation found for wifi_security_no_eap:1 (397579322683471524) -->
     <!-- no translation found for wifi_security_no_eap:2 (1968820975358150484) -->
-    <!-- no translation found for wifi_ap_security:0 (5251664683198623324) -->
-    <!-- no translation found for wifi_ap_security:1 (7989073072260294673) -->
   <string-array name="wifi_eap_method">
     <item msgid="1160193392455075561">"PEAP"</item>
     <item msgid="7981731051382306293">"TLS"</item>
diff --git a/res/values-es-rUS/strings.xml b/res/values-es-rUS/strings.xml
index 0339a45..58d5539 100644
--- a/res/values-es-rUS/strings.xml
+++ b/res/values-es-rUS/strings.xml
@@ -166,7 +166,7 @@
     <string name="bluetooth_map_acceptance_dialog_text" msgid="8712508202081143737">"%1$s quiere acceder a tus mensajes. ¿Quieres permitir el acceso a %2$s?"</string>
     <string name="bluetooth_sap_request" msgid="2669762224045354417">"Solicitud de acceso a SIM"</string>
     <string name="bluetooth_sap_acceptance_dialog_text" msgid="4414253873553608690">"El dispositivo <xliff:g id="DEVICE_NAME_0">%1$s</xliff:g> quiere acceder a tu tarjeta SIM. Al otorgar el acceso a la tarjeta SIM, inhabilitarás la conectividad de datos en el dispositivo por el tiempo que dure la conexión. Otorga el acceso al dispositivo <xliff:g id="DEVICE_NAME_1">%2$s?</xliff:g>."</string>
-    <string name="bluetooth_device_name_summary" msgid="4757990010751789977">"Visible como \"<xliff:g id="DEVICE_NAME">^1</xliff:g>\" para otros dispositivos"</string>
+    <string name="bluetooth_device_name_summary" msgid="522235742194965734">"Visible como \"<xliff:g id="DEVICE_NAME">^1</xliff:g>\" para otros dispositivos"</string>
     <string name="bluetooth_paired_device_title" msgid="8638994696317952019">"Tus dispositivos"</string>
     <string name="bluetooth_pairing_page_title" msgid="7712127387361962608">"Sincronizar dispositivo nuevo"</string>
     <string name="date_and_time" msgid="9062980487860757694">"Fecha y hora"</string>
@@ -307,11 +307,13 @@
     <string name="date_and_time_settings_title_setup_wizard" msgid="2391530758339384324">"Configurar fecha y hora"</string>
     <string name="date_and_time_settings_summary" msgid="7095318986757583584">"Establecer fecha, hora, zona horaria y formatos"</string>
     <string name="date_time_auto" msgid="7076906458515908345">"Fecha y hora automáticas"</string>
-    <string name="date_time_auto_summaryOn" msgid="4609619490075140381">"Usar hora proporcionada por la red"</string>
-    <string name="date_time_auto_summaryOff" msgid="8698762649061882791">"Usar hora proporcionada por la red"</string>
+    <string name="date_time_auto_summaryOn" msgid="4609619490075140381">"Usar la hora proporcionada por la red"</string>
+    <string name="date_time_auto_summaryOff" msgid="8698762649061882791">"Usar la hora proporcionada por la red"</string>
     <string name="zone_auto" msgid="334783869352026648">"Zona horaria automática"</string>
-    <string name="zone_auto_summaryOn" msgid="6142830927278458314">"Usar zona horaria proporcionada por la red"</string>
-    <string name="zone_auto_summaryOff" msgid="2597745783162041390">"Usar zona horaria proporcionada por la red"</string>
+    <string name="zone_auto_summaryOn" msgid="6142830927278458314">"Usar la zona horaria proporcionada por la red"</string>
+    <string name="zone_auto_summaryOff" msgid="2597745783162041390">"Usar la zona horaria proporcionada por la red"</string>
+    <string name="date_time_24hour_auto" msgid="2117383168985653422">"Formato automático de 24 horas"</string>
+    <string name="date_time_24hour_auto_summary" msgid="6351812925651480277">"Usar configuración regional predeterminada"</string>
     <string name="date_time_24hour_title" msgid="3203537578602803850">"Formato de 24 horas"</string>
     <string name="date_time_24hour" msgid="1193032284921000063">"Formato de 24 horas"</string>
     <string name="date_time_set_time_title" msgid="6296795651349047016">"Hora"</string>
@@ -372,6 +374,9 @@
     <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="1961957425135180242">"Siguiente"</string>
+    <string name="setup_fingerprint_enroll_skip_title" msgid="362050541117362034">"¿Omitir huella digital?"</string>
+    <string name="setup_fingerprint_enroll_skip_after_adding_lock_text" msgid="958990414356204763">"La configuración de la huella digital solo toma unos minutos. Si omites este paso, puedes agregarla más tarde en la configuración."</string>
+    <string name="lock_screen_intro_skip_title" msgid="4988210105913705679">"¿Omitir bloqueo de pantalla?"</string>
     <string name="lock_screen_intro_skip_dialog_text_frp" product="tablet" msgid="1581834104051243425">"No se activarán las funciones de protección del dispositivo. No podrás evitar que otras personas usen esta tablet si la pierdes, te la roban o se restablece."</string>
     <string name="lock_screen_intro_skip_dialog_text_frp" product="device" msgid="4629503416877189572">"No se activarán las funciones de protección del dispositivo. No podrás evitar que otras personas lo usen si lo pierdes, te lo roban o se restablece."</string>
     <string name="lock_screen_intro_skip_dialog_text_frp" product="default" msgid="2423428240245737909">"No se activarán las funciones de protección del dispositivo. No podrás evitar que otras personas usen este teléfono si lo pierdes, te lo roban o se restablece."</string>
@@ -389,7 +394,7 @@
     <string name="security_settings_fingerprint_enroll_start_title" msgid="2068961812439460133">"Toca el sensor"</string>
     <string name="security_settings_fingerprint_enroll_start_message" msgid="3909929328942564524">"Coloca el dedo en el sensor y levántalo cuando sientas una vibración."</string>
     <string name="security_settings_fingerprint_enroll_repeat_title" msgid="2819679722403209778">"Levanta el dedo y vuelve a tocar"</string>
-    <string name="security_settings_fingerprint_enroll_repeat_message" msgid="6158989350522518586">"Sigue levantando el dedo para agregar diferentes partes de tu huella digital"</string>
+    <string name="security_settings_fingerprint_enroll_repeat_message" msgid="6158989350522518586">"Sigue levantando el dedo para agregar diferentes partes de la huella digital."</string>
     <string name="security_settings_fingerprint_enroll_finish_title" msgid="7567276170287972230">"Se agregó la huella digital"</string>
     <string name="security_settings_fingerprint_enroll_finish_message" msgid="4796715961273420536">"Cuando veas este ícono, usa tu huella digital para identificarte o aprobar compras."</string>
     <string name="security_settings_fingerprint_enroll_enrolling_skip" msgid="3710211704052369752">"Hacerlo más tarde"</string>
@@ -457,7 +462,7 @@
     <string name="setup_lock_settings_picker_title" product="tablet" msgid="90329443364067215">"Protege tu tablet"</string>
     <string name="setup_lock_settings_picker_title" product="device" msgid="2399952075134938929">"Protege tu dispositivo"</string>
     <string name="setup_lock_settings_picker_title" product="default" msgid="1572244299605153324">"Protege el teléfono"</string>
-    <string name="setup_lock_settings_picker_fingerprint_message" msgid="5585650064305600578">"Para mayor seguridad, establece un bloqueo de pantalla secundario"</string>
+    <string name="lock_settings_picker_fingerprint_added_security_message" msgid="5768002109707648463">"Para mayor seguridad, establece un bloqueo de pantalla secundario."</string>
     <string name="setup_lock_settings_picker_message" product="tablet" msgid="8919671129189936210">"Activa las funciones de protección del dispositivo para impedir que terceros usen esta tablet sin tu permiso. Elige el bloqueo de pantalla que quieres usar."</string>
     <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>
@@ -588,6 +593,7 @@
     <string name="lockpassword_pin_no_sequential_digits" msgid="680765285206990584">"No se permiten secuencias de dígitos ascendentes, descendentes ni repetidas"</string>
     <string name="lockpassword_ok_label" msgid="313822574062553672">"Aceptar"</string>
     <string name="lockpassword_cancel_label" msgid="8818529276331121899">"Cancelar"</string>
+    <string name="lockpassword_clear_label" msgid="5724429464960458155">"Borrar"</string>
     <string name="lockpattern_tutorial_cancel_label" msgid="6431583477570493261">"Cancelar"</string>
     <string name="lockpattern_tutorial_continue_label" msgid="3559793618653400434">"Siguiente"</string>
     <string name="lock_setup" msgid="3355847066343753943">"Se completó la configuración."</string>
@@ -781,6 +787,7 @@
     <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>
@@ -817,6 +824,8 @@
     <string name="wifi_wps_available_first_item" msgid="4422547079984583502">"WSP disponible"</string>
     <string name="wifi_wps_available_second_item" msgid="8427520131718215301">" (WSP disponible)"</string>
     <string name="wifi_wps_nfc_enter_password" msgid="2288214226916117159">"Ingresa la contraseña de la red."</string>
+    <string name="wifi_carrier_connect" msgid="8174696557882299911">"Red Wi‑Fi del proveedor"</string>
+    <string name="wifi_carrier_content" msgid="4634077285415851933">"Conectarse mediante <xliff:g id="NAME">%1%s</xliff:g>"</string>
     <string name="wifi_scan_always_turnon_message" msgid="203123538572122989">"Para mejorar la precisión de la ubicación y para otros fines, <xliff:g id="APP_NAME">%1$s</xliff:g> quiere activar la búsqueda de redes, incluso cuando la conexión Wi-Fi esté desactivada.\n\n¿Quieres permitir esto para todas las aplicaciones que deseen buscar redes?"</string>
     <string name="wifi_scan_always_turnoff_message" msgid="5538901671131941043">"Para desactivar la opción, accede a la sección Avanzada del menú ampliado."</string>
     <string name="wifi_scan_always_confirm_allow" msgid="5355973075896817232">"Permitir"</string>
@@ -834,6 +843,7 @@
     <string name="wifi_connect" msgid="1076622875777072845">"Conectar"</string>
     <string name="wifi_failed_connect_message" msgid="8491902558970292871">"No se pudo establecer conexión con la red."</string>
     <string name="wifi_forget" msgid="8168174695608386644">"Olvidar"</string>
+    <string name="wifi_modify" msgid="6100248070440710782">"Modificar"</string>
     <string name="wifi_failed_forget_message" msgid="1348172929201654986">"No se pudo borrar la red."</string>
     <string name="wifi_save" msgid="3331121567988522826">"Guardar"</string>
     <string name="wifi_failed_save_message" msgid="6650004874143815692">"No se pudo guardar la red."</string>
@@ -846,6 +856,7 @@
     <string name="wifi_advanced_titlebar" msgid="4485841401774142908">"Config. avanzada de 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_title" msgid="3471132676909349382">"Información de la red"</string>
     <string name="wifi_details_subnet_mask" msgid="6720279144174924410">"Máscara de subred"</string>
     <string name="wifi_details_dns" msgid="8648826607751830768">"DNS"</string>
     <string name="wifi_details_ipv6_address_header" msgid="6734119149106422148">"Direcciones IPv6"</string>
@@ -878,16 +889,15 @@
     <string name="wifi_p2p_cancel_connect_title" msgid="255267538099324413">"¿Quieres cancelar la invitación?"</string>
     <string name="wifi_p2p_cancel_connect_message" msgid="7477756213423749402">"¿Quieres cancelar la invitación para conectarte con <xliff:g id="PEER_NAME">%1$s</xliff:g>?"</string>
     <string name="wifi_p2p_delete_group_message" msgid="834559380069647086">"¿Deseas borrar este grupo?"</string>
-    <string name="wifi_tether_checkbox_text" msgid="1847167643625779136">"Zona Wi-Fi portátil"</string>
     <string name="wifi_hotspot_checkbox_text" msgid="7763495093333664887">"Zona Wi-Fi"</string>
     <string name="wifi_hotspot_off_subtext" msgid="5466126533609394170">"No compartir Internet ni contenido con otros dispositivos"</string>
     <string name="wifi_hotspot_tethering_on_subtext" product="tablet" msgid="5752490509369962007">"Compartiendo la conexión a Internet de esta tablet por hotspot"</string>
     <string name="wifi_hotspot_tethering_on_subtext" product="default" msgid="6461075246164300670">"Compartiendo la conexión a Internet de este teléfono por hotspot"</string>
     <string name="wifi_hotspot_on_local_only_subtext" msgid="2068110388011294735">"La app está compartiendo contenido. Para compartir la conexión a Internet, desactiva el hotspot y vuelve a activarlo"</string>
-    <string name="wifi_hotspot_name_title" msgid="1341735529132128887">"Nombre de Wi-Fi"</string>
+    <string name="wifi_hotspot_name_title" msgid="8237000746618636778">"Nombre del hotspot"</string>
     <string name="wifi_hotspot_name_summary_connecting" msgid="3378299995508671967">"Activando <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>…"</string>
     <string name="wifi_hotspot_name_summary_connected" msgid="3888672084861445362">"Otros dispositivos pueden conectarse a <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>"</string>
-    <string name="wifi_hotspot_password_title" msgid="1955592302902091281">"Contraseña de Wi-Fi"</string>
+    <string name="wifi_hotspot_password_title" msgid="8676859981917573801">"Contraseña del hotspot"</string>
     <string name="wifi_hotspot_ap_band_title" msgid="1165801173359290681">"Banda AP"</string>
     <string name="wifi_hotspot_footer_info_regular" msgid="1203489406068036455">"Usa el hotspot para crear una red Wi‑Fi para otros dispositivos. El hotspot brinda acceso a Internet mediante tu conexión de datos móviles. Es posible que se apliquen cargos adicionales de datos móviles."</string>
     <string name="wifi_hotspot_footer_info_local_only" msgid="857988412470694109">"Las apps pueden crear un hotspot para compartir contenido con dispositivos cercanos."</string>
@@ -895,10 +905,9 @@
     <string name="wifi_tether_stopping" msgid="4835852171686388107">"Desactivando zona…"</string>
     <string name="wifi_tether_enabled_subtext" msgid="7842111748046063857">"<xliff:g id="NETWORK_SSID">%1$s</xliff:g> está activa"</string>
     <string name="wifi_tether_failed_subtext" msgid="1484941858530919002">"Error en la zona Wi-Fi portátil"</string>
-    <string name="wifi_tether_configure_ap_text" msgid="7974681394041609308">"Configurar la zona Wi-Fi"</string>
+    <string name="wifi_tether_configure_ap_text" msgid="7974681394041609308">"Configurar hotspot Wi-Fi"</string>
     <string name="wifi_hotspot_configure_ap_text" msgid="5478614731464220432">"Configuración de zona Wi-Fi"</string>
     <string name="wifi_hotspot_configure_ap_text_summary" msgid="5560680057727007011">"Hotspot WPA2 PSK de AndroidAP"</string>
-    <string name="wifi_tether_configure_subtext" msgid="2050196439900426456">"Hotspot: <xliff:g id="NETWORK_SSID">%1$s</xliff:g> <xliff:g id="NETWORK_SECURITY">%2$s</xliff:g>"</string>
     <string name="wifi_tether_configure_ssid_default" msgid="8467525402622138547">"Android Hotspot"</string>
     <string name="wifi_calling_settings_title" msgid="4102921303993404577">"Llamadas por Wi-Fi"</string>
     <string name="wifi_calling_suggestion_title" msgid="9008010480466359578">"Activar Llamada con Wi-Fi"</string>
@@ -939,7 +948,7 @@
     <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="emergency_address_summary" msgid="3266760199681945746">"Dirección que los servicios de emergencia usarán como tu ubicación si realizas una llamada de emergencia mediante Wi-Fi"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"Pantalla"</string>
     <string name="sound_settings" msgid="5534671337768745343">"Sonido"</string>
     <string name="all_volume_title" msgid="4296957391257836961">"Volumen"</string>
@@ -993,6 +1002,7 @@
     <string name="search_settings" msgid="1910951467596035063">"Buscar"</string>
     <string name="search_settings_summary" msgid="9205656546570654169">"Administrar la configuración y el historial de búsqueda"</string>
     <string name="search_settings_no_results" msgid="8799027492641230999">"Sin resultados"</string>
+    <string name="search_clear_history" msgid="4196658962573162457">"Borrar historial"</string>
     <string name="display_settings" msgid="7965901687241669598">"Pantalla"</string>
     <string name="accelerometer_title" msgid="7854608399547349157">"Rotar automáticamente la pantalla"</string>
     <string name="color_mode_title" msgid="3159275920408338215">"Colores intensos"</string>
@@ -1067,7 +1077,7 @@
     <string name="ambient_display_screen_summary_notifications" msgid="1449570742600868654">"Nuevas notificaciones"</string>
     <string name="ambient_display_category_triggers" msgid="4359289754456268573">"Cuándo mostrar"</string>
     <string name="doze_title" msgid="2375510714460456687">"Nuevas notificaciones"</string>
-    <string name="doze_summary" msgid="3846219936142814032">"Activar la pantalla al recibir notificaciones"</string>
+    <string name="doze_summary" msgid="3846219936142814032">"Activar la pantalla cuando haya notificaciones"</string>
     <string name="doze_always_on_title" msgid="1046222370442629646">"Siempre activada"</string>
     <string name="doze_always_on_summary" msgid="6978257596231155345">"Muestra la hora, los íconos de notificaciones y otra información. Aumenta el uso de la batería."</string>
     <string name="title_font_size" msgid="4405544325522105222">"Tamaño de fuente"</string>
@@ -1122,7 +1132,6 @@
     <string name="baseband_version" msgid="1848990160763524801">"Versión de banda base"</string>
     <string name="kernel_version" msgid="9192574954196167602">"Versión de núcleo"</string>
     <string name="build_number" msgid="3075795840572241758">"Número de compilación"</string>
-    <string name="selinux_status" msgid="6212165375172061672">"Estado de SELinux"</string>
     <string name="device_info_not_available" msgid="8062521887156825182">"No disponible"</string>
     <string name="device_status_activity_title" msgid="1411201799384697904">"Estado"</string>
     <string name="device_status" msgid="607405385799807324">"Estado"</string>
@@ -1150,7 +1159,6 @@
     <string name="status_wifi_mac_address" msgid="2202206684020765378">"Dirección MAC de Wi-Fi"</string>
     <string name="status_bt_address" msgid="4195174192087439720">"Dirección de Bluetooth"</string>
     <string name="status_serial_number" msgid="2257111183374628137">"Número de serie"</string>
-    <string name="status_unavailable" msgid="7862009036663793314">"No disponible"</string>
     <string name="status_up_time" msgid="7294859476816760399">"Tiempo de actividad"</string>
     <string name="status_awake_time" msgid="2393949909051183652">"Hora de actividad"</string>
     <string name="internal_memory" msgid="9129595691484260784">"Almacenamiento interno"</string>
@@ -1326,25 +1334,23 @@
     <string name="menu_restore" msgid="8260067415075573273">"Restablecer valores predeterminados"</string>
     <string name="restore_default_apn_completed" msgid="2824775307377604897">"Se restableció la configuración predeterminada de APN."</string>
     <string name="reset_dashboard_title" msgid="6254873816990678620">"Opciones de restablecimiento"</string>
+    <string name="reset_dashboard_summary" msgid="4851012632493522755">"Se pueden restablecer las redes, las apps y los dispositivos"</string>
     <string name="reset_network_title" msgid="6166025966016873843">"Restablecer configuración de Wi-Fi, datos móviles y Bluetooth"</string>
-    <string name="reset_network_desc" msgid="5547979398298881406">"Se restablecerán las opciones de configuración de todas las redes, incluidos:\n\n"<li>"Wi‑Fi"</li>\n<li>"datos móviles"</li>\n<li>"Bluetooth"</li></string>
+    <string name="reset_network_desc" msgid="5547979398298881406">"Se restablecerán las opciones de configuración de todas las redes, incluidos:\n\n"<li>"Wi‑Fi"</li>\n<li>"Datos móviles"</li>\n<li>"Bluetooth"</li></string>
     <string name="reset_network_button_text" msgid="2035676527471089853">"Restablecer configuración"</string>
     <string name="reset_network_final_desc" msgid="6388371121099245116">"¿Quieres restablecer la configuración de red? Esta acción no se puede deshacer."</string>
     <string name="reset_network_final_button_text" msgid="1797434793741744635">"Restablecer configuración"</string>
     <string name="reset_network_confirm_title" msgid="1759888886976962773">"¿Restablecer?"</string>
     <string name="network_reset_not_available" msgid="7188610385577164676">"El restablecimiento de la red no está disponible para este usuario."</string>
     <string name="reset_network_complete_toast" msgid="787829973559541880">"Se restableció la configuración de red."</string>
-    <string name="master_clear_title" msgid="6617679904229218425">"Borrar todos los datos (restablecimiento de la configuración de fábrica)"</string>
-    <plurals name="master_clear_with_account_summary" formatted="false" msgid="5911377203778818712">
-      <item quantity="other">Se restablecerán <xliff:g id="ACCOUNT_COUNT">%1$d</xliff:g> cuentas</item>
-      <item quantity="one">Se restablecerá 1 cuenta</item>
-    </plurals>
-    <string name="master_clear_summary" msgid="6902443944660426951">"Se restablecerán el almacenamiento interno y todos los datos"</string>
+    <string name="master_clear_title" msgid="3531267871084279512">"Borrar todos los datos (restablecer la configuración de fábrica)"</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_accounts" product="default" msgid="6412857499147999073">\n\n"Accediste a las siguientes cuentas:\n"</string>
     <string name="master_clear_other_users_present" product="default" msgid="5161423070702470742">\n\n"Hay otros usuarios presentes en este dispositivo.\n"</string>
     <string name="master_clear_desc_also_erases_external" msgid="1903185203791274237"><li>"Música"</li>\n<li>"Fotos"</li>\n<li>"Otros datos de usuario"</li></string>
+    <string name="master_clear_desc_also_erases_esim" msgid="312352697653096008"><li>"Proveedores de la eSIM"</li></string>
+    <string name="master_clear_desc_no_cancel_mobile_plan" msgid="5460926449093211144">\n\n"No se cancelará tu plan de servicio móvil."</string>
     <string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="7744115866662613411">\n\n"Para borrar la música, las imágenes y otros datos de usuario, debes borrar el "<b>"almacenamiento USB"</b>"."</string>
     <string name="master_clear_desc_erase_external_storage" product="default" msgid="4801026652617377093">\n\n"Para borrar música, imágenes y otros datos del usuario, debes borrar la "<b>"tarjeta SD"</b>"."</string>
     <string name="erase_external_storage" product="nosdcard" msgid="969364037450286809">"Eliminar almacenamiento USB"</string>
@@ -1373,7 +1379,7 @@
     <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 de 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 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_subtext" product="default" msgid="5991482890033484794">"Compartir la conexión a Internet del teléfono por USB"</string>
@@ -1388,7 +1394,7 @@
     <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">"Aplicación de SMS"</string>
+    <string name="sms_application_title" msgid="4903928270533250448">"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>
@@ -1461,15 +1467,16 @@
     <string name="settings_safetylegal_activity_title" msgid="6901214628496951727">"Información de seguridad"</string>
     <string name="settings_safetylegal_activity_unreachable" msgid="250674109915859456">"No tienes una conexión de datos. Para ver esta información ahora, visita %s desde cualquier computadora conectada a Internet."</string>
     <string name="settings_safetylegal_activity_loading" msgid="8059022597639516348">"Cargando…"</string>
-    <string name="lockpassword_choose_your_password_header" msgid="8624900666929394990">"Elige la contraseña"</string>
-    <string name="lockpassword_choose_your_password_header_for_fingerprint" msgid="6624409510609085450">"Configura tu contraseña"</string>
-    <string name="lockpassword_choose_your_pattern_header" msgid="6949761069941694050">"Elige un patrón"</string>
-    <string name="lockpassword_choose_your_pattern_header_for_fingerprint" msgid="5901096361617543819">"Configura el patrón"</string>
-    <string name="lockpassword_choose_your_pin_header" msgid="7598849519816138302">"Elige el PIN"</string>
-    <string name="lockpassword_choose_your_pin_header_for_fingerprint" msgid="765344692615917183">"Configura el PIN"</string>
-    <string name="lockpassword_confirm_your_password_header" msgid="6308478184889846633">"Confirma la contraseña."</string>
+    <string name="lockpassword_choose_your_screen_lock_header" msgid="3872462096767152394">"Establece un bloqueo de pantalla"</string>
+    <string name="lockpassword_choose_your_password_message" msgid="1197569283524841412">"Por motivos de seguridad, establece una contraseña"</string>
+    <string name="lockpassword_choose_your_password_header_for_fingerprint" msgid="2541818487015343503">"Crea una contraseña para usar la huella"</string>
+    <string name="lockpassword_choose_your_pattern_header_for_fingerprint" msgid="7709785406243556723">"Para usar la huella, configura un patrón"</string>
+    <string name="lockpassword_choose_your_pin_message" msgid="1875420718677275646">"Por motivos de seguridad, establece un PIN"</string>
+    <string name="lockpassword_choose_your_pin_header_for_fingerprint" msgid="1549639053195796674">"Para usar la huella, configura un PIN"</string>
+    <string name="lockpassword_choose_your_pattern_message" msgid="5986983400689720015">"Por razones de seguridad, configura un patrón"</string>
+    <string name="lockpassword_confirm_your_password_header" msgid="1266027268220850931">"Vuelve a ingresar 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 tu PIN."</string>
+    <string name="lockpassword_confirm_your_pin_header" msgid="7744513791910572550">"Vuelve a ingresar el PIN"</string>
     <string name="lockpassword_confirm_passwords_dont_match" msgid="5140892109439191415">"Las contraseñas no coinciden."</string>
     <string name="lockpassword_confirm_pins_dont_match" msgid="7226244811505606217">"Los PIN no coinciden."</string>
     <string name="lockpassword_choose_lock_generic_header" msgid="3811438094903786145">"Desbloquear la selección"</string>
@@ -1488,6 +1495,12 @@
     <string name="lockpassword_strong_auth_required_work_pattern" msgid="3003781907040522053">"Para mayor seguridad, usa el patrón de tu perfil de trabajo"</string>
     <string name="lockpassword_strong_auth_required_work_pin" msgid="3367491332598821552">"Para mayor seguridad, ingresa el PIN de tu perfil de trabajo"</string>
     <string name="lockpassword_strong_auth_required_work_password" msgid="8159775129968582940">"Para mayor seguridad, ingresa la contraseña de tu perfil de trabajo"</string>
+    <string name="lockpassword_confirm_your_pattern_details_frp" msgid="6757336656791723193">"Se restableció la configuración de fábrica del teléfono. Para usarlo, ingresa el patrón anterior."</string>
+    <string name="lockpassword_confirm_your_pin_details_frp" msgid="826520613445990470">"Se restableció la configuración de fábrica del teléfono. Para usarlo, ingresa el PIN anterior."</string>
+    <string name="lockpassword_confirm_your_password_details_frp" msgid="8944081074615739040">"Se restableció la configuración de fábrica del teléfono. Para usarlo, ingresa contraseña anterior."</string>
+    <string name="lockpassword_confirm_your_pattern_header_frp" msgid="2898036091609128286">"Verificar patrón"</string>
+    <string name="lockpassword_confirm_your_pin_header_frp" msgid="4141601774778898803">"Verificar PIN"</string>
+    <string name="lockpassword_confirm_your_password_header_frp" msgid="3762615419295360480">"Verificar contraseña"</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>
@@ -1537,7 +1550,6 @@
     <string name="install_applications_title" msgid="4987712352256508946">"Permitir todas las fuentes"</string>
     <string name="recent_app_category_title" msgid="6673071268966003928">"Apps abiertas recientemente"</string>
     <string name="see_all_apps_title" msgid="1317153498074308438">"Ver las <xliff:g id="COUNT">%1$d</xliff:g> apps"</string>
-    <string name="recent_app_summary" msgid="3366446669844932300">"hace <xliff:g id="TIME">^1</xliff:g>"</string>
     <string name="install_all_warning" product="tablet" msgid="8310489909586138165">"Tu tablet y tus datos personales son más vulnerables a los ataques de apps desconocidas. Si instalas apps de esta fuente, serás responsable de los daños que sufra tu tablet y la pérdida de datos debido al uso de estas apps."</string>
     <string name="install_all_warning" product="default" msgid="1952257127370115988">"Tu teléfono y tus datos personales son más vulnerables a los ataques de apps desconocidas. Si instalas apps de esta fuente, serás responsable de los daños que sufra tu teléfono y la pérdida de datos debido al uso de estas apps."</string>
     <string name="advanced_settings" msgid="1777249286757067969">"Configuración avanzada"</string>
@@ -1549,7 +1561,7 @@
     <string name="screen_compatibility_label" msgid="663250687205465394">"Compatibilidad de la pantalla"</string>
     <string name="permissions_label" msgid="2605296874922726203">"Permisos"</string>
     <string name="cache_header_label" msgid="1877197634162461830">"Memoria caché"</string>
-    <string name="clear_cache_btn_text" msgid="5756314834291116325">"Eliminar memoria caché"</string>
+    <string name="clear_cache_btn_text" msgid="5756314834291116325">"Borrar caché"</string>
     <string name="cache_size_label" msgid="7505481393108282913">"Memoria caché"</string>
     <plurals name="uri_permissions_text" formatted="false" msgid="3983110543017963732">
       <item quantity="other">%d elementos</item>
@@ -1574,7 +1586,7 @@
     <string name="auto_launch_enable_text" msgid="4275746249511874845">"Has elegido lanzar esta aplicación de manera predeterminada para algunas acciones."</string>
     <string name="always_allow_bind_appwidgets_text" msgid="566822577792032925">"Decidiste permitir que esta aplicación pueda crear widgets y acceder a sus datos."</string>
     <string name="auto_launch_disable_text" msgid="7800385822185540166">"No hay configuraciones predeterminadas establecidas."</string>
-    <string name="clear_activities" msgid="7408923511535174430">"Eliminar configuraciones predeterminadas"</string>
+    <string name="clear_activities" msgid="7408923511535174430">"Borrar valores predeterminados"</string>
     <string name="screen_compatibility_text" msgid="1616155457673106022">"Es posible que esta aplicación no se haya diseñado para tu pantalla. Aquí puedes controlar cómo se ajusta a la pantalla."</string>
     <string name="ask_compatibility" msgid="7225195569089607846">"Preguntar cuando se lanza"</string>
     <string name="enable_compatibility" msgid="5806819252068617811">"Aplicación en escala"</string>
@@ -1586,7 +1598,7 @@
     <string name="default_emergency_app" msgid="1951760659640369980">"Aplicación de emergencia"</string>
     <string name="reset_app_preferences" msgid="1321050641018356925">"Restablecer preferencias"</string>
     <string name="reset_app_preferences_title" msgid="6093179367325336662">"¿Restablecer?"</string>
-    <string name="reset_app_preferences_desc" msgid="4822447731869201512">"Se restablecerán todas las preferencias de:\n\n "<li>"Aplicaciones inhabilitadas"</li>\n" "<li>"Notificaciones de aplicaciones inhabilitadas"</li>\n" "<li>"Aplicaciones predeterminadas para realizar acciones"</li>\n" "<li>"Restricciones de datos en segundo plano para aplicaciones"</li>\n" "<li>"Restricciones de permisos"</li>\n\n" Los datos de las aplicaciones no se perderán."</string>
+    <string name="reset_app_preferences_desc" msgid="4822447731869201512">"Se restablecerán las preferencias de:\n\n "<li>"Apps inhabilitadas"</li>\n" "<li>"Notificaciones de apps inhabilitadas"</li>\n" "<li>"Apps predeterminadas para realizar acciones"</li>\n" "<li>"Restricciones de datos en segundo plano para apps"</li>\n" "<li>"Restricciones de permisos"</li>\n\n" No se perderán los datos de las apps."</string>
     <string name="reset_app_preferences_button" msgid="2559089511841281242">"Restablecer aplicaciones"</string>
     <string name="manage_space_text" msgid="8852711522447794676">"Administrar el espacio"</string>
     <string name="filter" msgid="2018011724373033887">"Filtro"</string>
@@ -1657,7 +1669,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">"La app se instaló desde <xliff:g id="APP_STORE">%1$s</xliff:g>"</string>
+    <string name="app_install_details_summary" msgid="6464796332049327547">"App instalada 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>
@@ -1678,9 +1690,9 @@
     <skip />
     <string name="running_process_item_user_label" msgid="3129887865552025943">"Usuario: <xliff:g id="USER_NAME">%1$s</xliff:g>"</string>
     <string name="running_process_item_removed_user_label" msgid="8250168004291472959">"Usuario eliminado"</string>
-    <string name="running_processes_item_description_s_s" msgid="5790575965282023145">"<xliff:g id="NUMPROCESS">%1$d</xliff:g> procesos y <xliff:g id="NUMSERVICES">%2$d</xliff:g> servicios"</string>
-    <string name="running_processes_item_description_s_p" msgid="8019860457123222953">"<xliff:g id="NUMPROCESS">%1$d</xliff:g> procesos y <xliff:g id="NUMSERVICES">%2$d</xliff:g> servicios"</string>
-    <string name="running_processes_item_description_p_s" msgid="744424668287252915">"<xliff:g id="NUMPROCESS">%1$d</xliff:g> procesos <xliff:g id="NUMSERVICES">%2$d</xliff:g> servicio"</string>
+    <string name="running_processes_item_description_s_s" msgid="5790575965282023145">"<xliff:g id="NUMPROCESS">%1$d</xliff:g> proceso y <xliff:g id="NUMSERVICES">%2$d</xliff:g> servicio"</string>
+    <string name="running_processes_item_description_s_p" msgid="8019860457123222953">"<xliff:g id="NUMPROCESS">%1$d</xliff:g> proceso y <xliff:g id="NUMSERVICES">%2$d</xliff:g> servicios"</string>
+    <string name="running_processes_item_description_p_s" msgid="744424668287252915">"<xliff:g id="NUMPROCESS">%1$d</xliff:g> procesos y <xliff:g id="NUMSERVICES">%2$d</xliff:g> servicio"</string>
     <string name="running_processes_item_description_p_p" msgid="1607384595790852782">"<xliff:g id="NUMPROCESS">%1$d</xliff:g> procesos y <xliff:g id="NUMSERVICES">%2$d</xliff:g> servicios"</string>
     <string name="running_processes_header_title" msgid="6588371727640789560">"Memoria del dispositivo"</string>
     <string name="running_processes_header_footer" msgid="723908176275428442">"RAM usada por las aplicaciones"</string>
@@ -1801,7 +1813,7 @@
     <string name="accessibility_settings_summary" msgid="981260486011624939">"Lectores de pantalla, pantalla, controles de interacción"</string>
     <string name="vision_settings_title" msgid="4204111425716868288">"Configuración de visión"</string>
     <string name="vision_settings_description" msgid="5679491180156408260">"Puedes personalizar este dispositivo para que se adapte a tus necesidades. Estas funciones de accesibilidad pueden cambiarse más tarde en Configuración."</string>
-    <string name="vision_settings_suggestion_title" msgid="917294957154878441">"Aumentar el tamaño de la fuente"</string>
+    <string name="vision_settings_suggestion_title" msgid="8058794060304707004">"Cambiar tamaño de fuente"</string>
     <string name="screen_reader_category_title" msgid="7739154903913400641">"Lectores de pantalla"</string>
     <string name="audio_and_captions_category_title" msgid="3420727114421447524">"Audio y texto en pantalla"</string>
     <string name="display_category_title" msgid="685461049938269166">"Pantalla"</string>
@@ -1838,7 +1850,6 @@
     <string name="accessibility_display_inversion_preference_subtitle" msgid="7052959202195368109">"Puede afectar el rendimiento"</string>
     <string name="accessibility_autoclick_preference_title" msgid="7014499339068449623">"Clic cuando deja de moverse el puntero"</string>
     <string name="accessibility_autoclick_delay_preference_title" msgid="3962261178385106006">"Tiempo de espera antes del clic"</string>
-    <string name="preference_summary_default_combination" msgid="8532964268242666060">"<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">"ACTIVADO"</string>
     <string name="accessibility_summary_state_disabled" msgid="2241315620132005595">"DESACTIVADO"</string>
     <string name="enable_quick_setting" msgid="2366999897816894536">"Mostrar en Configuración rápida"</string>
@@ -1957,12 +1968,14 @@
     <string name="background_activity_summary_on" msgid="649282072540085599">"La app puede ejecutarse en segundo plano cuando no está en uso"</string>
     <string name="background_activity_summary_off" msgid="7666330699090632040">"La actividad en segundo plano de la app está limitada cuando no está en uso"</string>
     <string name="background_activity_summary_disabled" msgid="3710669050484599847">"La app no puede ejecutarse en segundo plano"</string>
+    <string name="background_activity_summary_whitelisted" msgid="7375400051141016808">"No se puede optimizar la app para que consuma menos batería"</string>
+    <string name="background_activity_warning_dialog_title" msgid="2216249969149568871">"¿Limitar actividad en segundo plano?"</string>
+    <string name="background_activity_warning_dialog_text" msgid="7049624449246121981">"Si limitas la actividad en segundo plano de una app, es posible que no funcione correctamente"</string>
     <string name="device_screen_usage" msgid="3386088035570409683">"Uso de la pantalla desde carga completa"</string>
     <string name="device_screen_consumption" msgid="4607589286438986687">"Consumo de la pantalla"</string>
     <string name="device_cellular_network" msgid="4724773411762382950">"Escaneo 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 apps desde la última carga (hace <xliff:g id="TIME">^1</xliff:g>)"</string>
-    <string name="power_usage_list_summary_device" msgid="7036566616386864302">"Uso del dispositivo desde carga completa (hace <xliff:g id="TIME">^1</xliff:g>)"</string>
+    <string name="power_usage_list_summary" msgid="6393929085382334341">"Uso de la app desde la última carga completa (<xliff:g id="RELATIVE_TIME">^1</xliff:g>)"</string>
+    <string name="power_usage_list_summary_device" msgid="4461926045610455423">"Uso del dispositivo desde la última carga completa (<xliff:g id="RELATIVE_TIME">^1</xliff:g>)"</string>
     <string name="screen_usage_summary" msgid="6687403051423153550">"Tiempo que estuvo encendida la pantalla desde la última carga completa"</string>
     <string name="device_usage_list_summary" msgid="5623036661468763251">"Uso del dispositivo desde la última carga completa"</string>
     <string name="battery_since_unplugged" msgid="338073389740738437">"Uso de la batería desde que se desconectó"</string>
@@ -2208,14 +2221,14 @@
     <string name="credentials_unlock_hint" msgid="2301301378040499348">"Escribe la contraseña para el almacenamiento de credenciales."</string>
     <string name="credentials_old_password" msgid="7553393815538684028">"Contraseña actual:"</string>
     <string name="credentials_reset_hint" msgid="6297256880896133631">"¿Deseas eliminar todos los contenidos?"</string>
-    <string name="credentials_password_too_short" msgid="7502749986405522663">"La contraseña debe tener 8 caracteres como mínimo."</string>
     <string name="credentials_wrong_password" msgid="2541932597104054807">"Contraseña incorrecta."</string>
     <string name="credentials_reset_warning" msgid="5320653011511797600">"Contraseña incorrecta. Tienes una oportunidad más antes de que se borre el almacenamiento de credenciales."</string>
     <string name="credentials_reset_warning_plural" msgid="6514085665301095279">"Contraseña incorrecta. Tienes <xliff:g id="NUMBER">%1$d</xliff:g> oportunidades más antes de  que se borre el almacenamiento de credenciales."</string>
     <string name="credentials_erased" msgid="2907836028586342969">"Credenciales borradas"</string>
     <string name="credentials_not_erased" msgid="7685932772284216097">"Imposible borrar almac credenc"</string>
     <string name="credentials_enabled" msgid="7588607413349978930">"El almacenamiento de credenciales está activado."</string>
-    <string name="credentials_configure_lock_screen_hint" msgid="6757119179588664966">"Para usar el almacenamiento de credenciales, debes establecer un PIN o una contraseña para la pantalla de bloqueo."</string>
+    <string name="credentials_configure_lock_screen_hint" msgid="8058230497337529036">"Para poder usar el almacenamiento de claves, debes configurar una pantalla bloqueada segura en tu dispositivo"</string>
+    <string name="credentials_configure_lock_screen_button" msgid="253239765216055321">"CONFIGURAR BLOQUEO"</string>
     <string name="usage_access_title" msgid="332333405495457839">"Acceso a datos de uso"</string>
     <string name="emergency_tone_title" msgid="1055954530111587114">"Tono de emergencia"</string>
     <string name="emergency_tone_summary" msgid="722259232924572153">"Establecer el comportamiento cuando se establece una llamada de emergencia"</string>
@@ -2335,8 +2348,6 @@
     <skip />
     <string name="cant_sync_dialog_title" msgid="2777238588398046285">"No se puede sincronizar manualmente"</string>
     <string name="cant_sync_dialog_message" msgid="1938380442159016449">"La sincronización de este elemento actualmente está desactivada. Para cambiar tu configuración, activa momentáneamente los datos en segundo plano 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 de 4G"</string>
     <string name="enter_password" msgid="8035706727471334122">"Para iniciar el dispositivo Android, ingresa la contraseña."</string>
     <string name="enter_pin" msgid="5305333588093263790">"Para iniciar el dispositivo Android, ingresa el PIN."</string>
     <string name="enter_pattern" msgid="4187435713036808566">"Para iniciar el dispositivo Android, dibuja el patrón."</string>
@@ -2350,6 +2361,7 @@
     <string name="misc_files_selected_count" msgid="4647048020823912088">"Se seleccionaron <xliff:g id="NUMBER">%1$d</xliff:g> de entre <xliff:g id="TOTAL">%2$d</xliff:g>."</string>
     <string name="misc_files_selected_count_bytes" msgid="2876232009069114352">"<xliff:g id="NUMBER">%1$s</xliff:g> de <xliff:g id="TOTAL">%2$s</xliff:g>"</string>
     <string name="select_all" msgid="1562774643280376715">"Seleccionar todo"</string>
+    <string name="data_plan_usage_manage_plans_button_text" msgid="8997761990902708162">"Administrar planes"</string>
     <string name="data_usage_summary_title" msgid="3804110657238092929">"Uso de datos"</string>
     <string name="data_usage_app_summary_title" msgid="4147258989837459172">"Uso datos de aplicación"</string>
     <string name="data_usage_accounting" msgid="7170028915873577387">"La forma en que el proveedor contabiliza los datos puede variar en tu dispositivo."</string>
@@ -2435,6 +2447,9 @@
     <string name="data_usage_metered_mobile" msgid="5423305619126978393">"Redes móviles"</string>
     <string name="data_usage_metered_wifi" msgid="1761738002328299714">"Redes Wi‑Fi sin tarifa plana"</string>
     <string name="data_usage_metered_wifi_disabled" msgid="727808462375941567">"Para seleccionar redes sin tarifa plana, activa el Wi-Fi."</string>
+    <string name="data_usage_metered_auto" msgid="1262028400911918865">"Automático"</string>
+    <string name="data_usage_metered_yes" msgid="9217539611385225894">"Sin tarifa plana"</string>
+    <string name="data_usage_metered_no" msgid="4025232961929071789">"Con tarifa plana"</string>
     <string name="data_usage_disclaimer" msgid="6887858149980673444">"La forma en que el proveedor calcula los datos puede variar en tu dispositivo."</string>
     <string name="cryptkeeper_emergency_call" msgid="198578731586097145">"Llamada de emergencia"</string>
     <string name="cryptkeeper_return_to_call" msgid="5613717339452772491">"Regresar a llamada"</string>
@@ -2526,9 +2541,6 @@
     <string name="backup_pw_set_button_text" msgid="2387480910044648795">"Definir contraseña de copia de seguridad"</string>
     <string name="backup_pw_cancel_button_text" msgid="8845630125391744615">"Cancelar"</string>
     <string name="additional_system_update_settings_list_item_title" msgid="214987609894661992">"Actualizaciones del sistema adicionales"</string>
-    <string name="selinux_status_disabled" msgid="924551035552323327">"Desactivado"</string>
-    <string name="selinux_status_permissive" msgid="6004965534713398778">"Permisivo"</string>
-    <string name="selinux_status_enforcing" msgid="2252703756208463329">"Obligatorio"</string>
     <string name="ssl_ca_cert_warning" msgid="2045866713601984673">"Es posible que la red esté supervisada"</string>
     <string name="done_button" msgid="1991471253042622230">"Listo"</string>
     <plurals name="ssl_ca_cert_dialog_title" formatted="false" msgid="7145092748045794650">
@@ -2640,10 +2652,10 @@
     <string name="support_summary" msgid="2705726826263742491">"Artículos de ayuda, teléfono y chat, comenzar"</string>
     <string name="user_account_title" msgid="1127193807312271167">"Cuenta para contenido"</string>
     <string name="user_picture_title" msgid="7297782792000291692">"ID de foto"</string>
-    <string name="extreme_threats_title" msgid="6549541803542968699">"Amenazas serias"</string>
-    <string name="extreme_threats_summary" msgid="8777860706500920667">"Recibir alertas de amenazas serias para la vida y propiedad"</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="severe_threats_title" msgid="8362676353803170963">"Amenazas graves"</string>
-    <string name="severe_threats_summary" msgid="8848126509420177320">"Recibir alertas de amenazas graves a la vida y la propiedad"</string>
+    <string name="severe_threats_summary" msgid="8848126509420177320">"Recibir alertas de amenazas graves contra 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>
@@ -2871,13 +2883,15 @@
     <string name="notifications_title" msgid="8086372779371204971">"Notificaciones"</string>
     <string name="app_notifications_title" msgid="5810577805218003760">"Notificaciones de aplicaciones"</string>
     <string name="notification_channel_title" msgid="2260666541030178452">"Categoría de notificaciones"</string>
+    <string name="notification_group_title" msgid="7180506440133859601">"Categoría del grupo de notificaciones"</string>
     <string name="notification_importance_title" msgid="848692592679312666">"Importancia"</string>
-    <string name="notification_importance_unspecified" msgid="2196023702875112081">"Permitir que la app decida"</string>
+    <string name="notification_importance_unspecified" msgid="6622173510486113958">"Permitir sonido"</string>
     <string name="notification_importance_blocked" msgid="7938180808339386300">"No mostrar notificaciones"</string>
     <string name="notification_importance_min" msgid="5455049524984686275">"No emitir sonido ni mostrar"</string>
     <string name="notification_importance_low" msgid="8881468429453766553">"Sin sonido"</string>
     <string name="notification_importance_default" msgid="5958338024601957516">"Emitir sonido"</string>
     <string name="notification_importance_high" msgid="2082429479238228527">"Emitir sonido y mostrar en pantalla"</string>
+    <string name="notification_importance_high_silent" msgid="2667033773703765252">"Mostrar en la pantalla"</string>
     <string name="notification_importance_min_title" msgid="6974673091137544803">"Baja"</string>
     <string name="notification_importance_low_title" msgid="8131254047772814309">"Media"</string>
     <string name="notification_importance_default_title" msgid="9120383978536089489">"Alta"</string>
@@ -2918,8 +2932,13 @@
     <string name="loading_notification_apps" msgid="5031818677010335895">"Cargando aplicaciones…"</string>
     <string name="app_notifications_off_desc" msgid="4882445501376722969">"Android bloquea las notificaciones de esta app para que no aparezcan en el dispositivo"</string>
     <string name="channel_notifications_off_desc" msgid="5899225298718840635">"Android bloquea esta categoría de notificaciones para que no aparezca en el dispositivo"</string>
+    <string name="channel_group_notifications_off_desc" msgid="1620950416247316370">"Android bloquea este grupo de notificaciones para que no aparezca en el dispositivo"</string>
     <string name="notification_channels" msgid="5346841743182627500">"Categorías"</string>
     <string name="notification_channels_other" msgid="5645317113885788226">"Otros"</string>
+    <plurals name="notification_group_summary" formatted="false" msgid="3420621520561455358">
+      <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> categorías</item>
+      <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> categoría</item>
+    </plurals>
     <string name="no_channels" msgid="3077375508177744586">"Esta app no publicó ninguna notificación"</string>
     <string name="app_settings_link" msgid="8894946007543660906">"Opciones de configuración adicionales de la app"</string>
     <string name="app_notification_listing_summary_zero" msgid="6482582965081108108">"Activadas para todas las apps"</string>
@@ -2996,10 +3015,11 @@
     <string name="zen_mode_from_starred" msgid="2678345811950997027">"Solo de contactos destacados"</string>
     <string name="zen_mode_from_none" msgid="8219706639954614136">"Ninguno"</string>
     <string name="zen_mode_alarms" msgid="2165302777886552926">"Alarmas"</string>
+    <string name="zen_mode_alarms_summary" msgid="3774926045611788635">"Las alarmas son prioritarias y emiten sonido"</string>
     <string name="zen_mode_reminders" msgid="5458502056440485730">"Recordatorios"</string>
     <string name="zen_mode_events" msgid="7914446030988618264">"Eventos"</string>
     <string name="zen_mode_all_callers" msgid="584186167367236922">"Todos los emisores"</string>
-    <string name="zen_mode_selected_callers" msgid="3127598874060615742">"Emisores seleccionados"</string>
+    <string name="zen_mode_selected_callers" msgid="3127598874060615742">"Contactos 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>
@@ -3030,6 +3050,7 @@
     <string name="zen_mode_screen_off_visual_interruptions" msgid="4850792880144382633">"Cuando la pantalla está apagada"</string>
     <string name="zen_mode_no_visual_interruptions" msgid="8742776003822778472">"Cuando la pantalla está encendida o apagada"</string>
     <string name="notification_app_settings_button" msgid="6685640230371477485">"Configuración de notificaciones"</string>
+    <string name="suggestion_button_text" msgid="3275010948381252006">"Aceptar"</string>
     <string name="device_feedback" msgid="3238056036766293294">"Envía comentarios del dispositivo"</string>
     <string name="restr_pin_enter_admin_pin" msgid="1085834515677448072">"Ingresa el PIN de administrador"</string>
     <string name="switch_on_text" msgid="1124106706920572386">"Activado"</string>
@@ -3142,9 +3163,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">"Aplicación del navegador"</string>
+    <string name="default_browser_title" msgid="8101772675085814670">"Navegador"</string>
     <string name="default_browser_title_none" msgid="2124785489953628553">"No hay un navegador predeterminado."</string>
-    <string name="default_phone_title" msgid="282005908059637350">"Aplicación de teléfono"</string>
+    <string name="default_phone_title" msgid="282005908059637350">"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>
@@ -3214,6 +3235,7 @@
     <string name="usb_summary_file_transfers" msgid="6435943692610175111">"Transferir archivos"</string>
     <string name="usb_summary_photo_transfers" msgid="8440204169576585250">"Transferir fotos (PTP)"</string>
     <string name="usb_summary_MIDI" msgid="5687906612187885908">"Usar el dispositivo como MIDI"</string>
+    <string name="sms_mirroring_pref" msgid="6475043279147376031">"Duplicación de SMS"</string>
     <string name="background_check_pref" msgid="7550258400138010979">"Verificación en segundo plano"</string>
     <string name="background_check_title" msgid="4534254315824525593">"Acceso en segundo plano completo"</string>
     <string name="assist_access_context_title" msgid="2269032346698890257">"Utilizar el texto de la pantalla"</string>
@@ -3280,7 +3302,8 @@
     <string name="write_settings_title" msgid="4232152481902542284">"Puede modificar la configuración del sistema"</string>
     <string name="write_system_settings" msgid="3482913590601096763">"Modificar config. del sistema"</string>
     <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>
+    <!-- no translation found for permit_write_settings (658555006453212691) -->
+    <skip />
     <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>
@@ -3375,9 +3398,12 @@
     <string name="color_temperature" msgid="2070126836910615605">"Temperatura de colores fríos"</string>
     <string name="color_temperature_desc" msgid="4793729830226404052">"Usar colores de pantalla más fríos"</string>
     <string name="color_temperature_toast" msgid="4974218172133854827">"Para aplicar el cambio de color, apaga la pantalla"</string>
-    <string name="telephony_monitor_toast" msgid="7003764250271195384">"Para aplicar el cambio de Telephony Monitor, reinicia el dispositivo"</string>
+    <string name="connectivity_monitor_switch" msgid="9059759348648583421">"Monitor de conectividad"</string>
+    <string name="connectivity_monitor_switch_summary" msgid="2828658652378866401">"El monitor de conectividad recopilará los registros si detecta un problema de conexión y mostrará una notificación al usuario para registrar un error"</string>
+    <string name="connectivity_monitor_toast" msgid="5551859612881173028">"Para aplicar el cambio del monitor de conectividad, reinicia el dispositivo"</string>
     <string name="camera_hal_hdrplus_switch" msgid="8377365197105267466">"Cámara HAL HDR+"</string>
     <string name="camera_hal_hdrplus_toast" msgid="2063703797270055299">"Para aplicar el cambio a la cámara HAL HDR+, reinicia el dispositivo"</string>
+    <string name="camera_laser_sensor_switch" msgid="8913588990743234440">"Sensor láser de la cámara"</string>
     <string name="ota_disable_automatic_update" msgid="2319639631655915050">"Actualizaciones automáticas del sistema"</string>
     <string name="usage" msgid="2977875522080448986">"Uso"</string>
     <string name="cellular_data_usage" msgid="2155683719898158203">"Uso de datos móviles"</string>
@@ -3403,21 +3429,21 @@
     <string name="data_warning" msgid="209133958008062117">"Advertencia de datos"</string>
     <string name="set_data_limit" msgid="2901526323210516923">"Establecer límite de datos"</string>
     <string name="data_limit" msgid="1885406964934590552">"Límite de datos"</string>
-    <string name="data_usage_template" msgid="392191945602400904">"Datos usados entre <xliff:g id="ID_2">%2$s</xliff:g>: <xliff:g id="ID_1">%1$s</xliff:g>"</string>
+    <string name="data_usage_template" msgid="2923744765873163859">"Se usaron <xliff:g id="ID_1">%1$s</xliff:g> en el período: <xliff:g id="ID_2">%2$s</xliff:g>"</string>
     <string name="configure" msgid="1029654422228677273">"Configurar"</string>
     <string name="data_usage_other_apps" msgid="3272872663517382050">"Otras apps incluidas en el uso de datos"</string>
     <plurals name="data_saver_unrestricted_summary" formatted="false" msgid="2635267833484232703">
       <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">"Reducir datos"</string>
+    <string name="data_saver_title" msgid="398458827917495765">"Ahorro de 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">"App de la página principal"</string>
+    <string name="home_app" msgid="4066188520886810030">"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>
@@ -3472,7 +3498,7 @@
     <string name="button_confirm_convert_fbe" msgid="7101855374850373091">"Borrar y convertir"</string>
     <string name="reset_shortcut_manager_throttling" msgid="6495066467198668994">"Restablecer la limitación de frecuencia de ShortcutManager"</string>
     <string name="reset_shortcut_manager_throttling_complete" msgid="1826770872063707900">"Se restableció la limitación de frecuencia de ShortcutManager"</string>
-    <string name="notification_suggestion_title" msgid="4506524937307816475">"Controlar notific. en pantalla bloqueada"</string>
+    <string name="notification_suggestion_title" msgid="387052719462473500">"Controlar los datos que aparecen en la pantalla bloqueada"</string>
     <string name="notification_suggestion_summary" msgid="8521159741445416875">"Ocultar o mostrar el contenido de las notificaciones"</string>
     <string name="page_tab_title_summary" msgid="4070309266374993258">"Todas"</string>
     <string name="page_tab_title_support" msgid="8483187649355540109">"Asistencia"</string>
@@ -3480,7 +3506,7 @@
     <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>
     <string name="premium_sms_access" msgid="4660047004791638305">"Acceso a SMS premium"</string>
-    <string name="bluetooth_disabled" msgid="2456198532288640046">"No visible para otros dispositivos"</string>
+    <string name="bluetooth_disabled" msgid="6244000672828617410">"Inhabilitado"</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>
     <string name="demo_mode" msgid="2798762752209330277">"Modo demostración de la IU del sistema"</string>
@@ -3567,9 +3593,9 @@
     <string name="ambient_display_pickup_summary" product="device" msgid="8256669101643381568">"Para consultar la hora, los íconos de notificaciones y otros datos, levanta el dispositivo."</string>
     <string name="ambient_display_pickup_suggestion_summary" msgid="7014700589991761035">"Revisa las notificaciones cuando la pantalla está apagada"</string>
     <string name="fingerprint_swipe_for_notifications_title" msgid="5816346492253270243">"Desliza tu huella para ver notificaciones"</string>
-    <string name="fingerprint_swipe_for_notifications_summary" product="default" msgid="1770661868393713922">"Para ver las notificaciones, desliza el dedo hacia abajo en el sensor de huellas digitales que está en la parte posterior del teléfono."</string>
-    <string name="fingerprint_swipe_for_notifications_summary" product="tablet" msgid="902719947767712895">"Para ver las notificaciones, desliza el dedo hacia abajo en el sensor de huellas digitales que está en la parte posterior de la tablet."</string>
-    <string name="fingerprint_swipe_for_notifications_summary" product="device" msgid="5372926094116306647">"Para ver las notificaciones, desliza el dedo hacia abajo en el sensor de huellas digitales que está en la parte posterior del dispositivo."</string>
+    <string name="fingerprint_swipe_for_notifications_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_suggestion_title" msgid="1677291167470357802">"Consulta tus notificaciones rápidamente"</string>
     <string name="fingerprint_swipe_for_notifications_suggestion_summary" msgid="127592803294414082">"Desliza el dedo hacia abajo en sensor de huellas digitales"</string>
     <string name="gesture_setting_on" msgid="3455094265233870280">"Activado"</string>
@@ -3582,7 +3608,7 @@
     <string name="web_action_enable_title" msgid="4051513950976670853">"Apps instantáneas"</string>
     <string name="web_action_enable_summary" msgid="3108127559723396382">"Abre vínculos en apps, incluso aunque no estén instaladas"</string>
     <string name="web_action_section_title" msgid="7364647086538399136">"Apps instantáneas"</string>
-    <string name="instant_apps_account" msgid="1433620209791992528">"Cuenta para apps instantáneas"</string>
+    <string name="instant_apps_settings" msgid="8827777916518348213">"Preferencias de las Apps instantáneas"</string>
     <string name="domain_url_section_title" msgid="7046835219056428883">"Apps instaladas"</string>
     <string name="automatic_storage_manager_activation_warning" msgid="6353100011690933254">"Tu almacenamiento ahora está a cargo del administrador de almacenamiento"</string>
     <string name="account_for_section_header" msgid="5356566418548737121">"Cuentas de <xliff:g id="USER_NAME">%1$s</xliff:g>"</string>
@@ -3629,7 +3655,9 @@
     <string name="enterprise_privacy_always_on_vpn_personal" msgid="9217774730260037434">"Se activó la función \"VPN siempre activada\" en tu perfil personal"</string>
     <string name="enterprise_privacy_always_on_vpn_work" msgid="7244472958208315814">"Se activó la función \"VPN siempre activada\" en tu perfil de trabajo"</string>
     <string name="enterprise_privacy_global_http_proxy" msgid="7936664553416257333">"Se estableció el proxy HTTP global"</string>
-    <string name="enterprise_privacy_ca_certs" msgid="5885892204903688909">"Credenciales de confianza"</string>
+    <string name="enterprise_privacy_ca_certs_device" msgid="2019652712782510262">"Credenciales de confianza"</string>
+    <string name="enterprise_privacy_ca_certs_personal" msgid="2279084820904076599">"Credenciales de confianza en tu perfil personal"</string>
+    <string name="enterprise_privacy_ca_certs_work" msgid="6187377647815301809">"Credenciales de confianza en tu perfil de trabajo"</string>
     <plurals name="enterprise_privacy_number_ca_certs" formatted="false" msgid="526375234629534165">
       <item quantity="other">Al menos <xliff:g id="COUNT_1">%d</xliff:g> certificados de CA</item>
       <item quantity="one">Al menos <xliff:g id="COUNT_0">%d</xliff:g> certificado de CA</item>
@@ -3692,6 +3720,8 @@
     <string name="carrier_provisioning" msgid="4398683675591893169">"Información del aprovisionamiento del proveedor"</string>
     <string name="trigger_carrier_provisioning" msgid="3434865918009286187">"Activar aprovisionamiento del proveedor"</string>
     <string name="new_device_suggestion_title" msgid="698847081680980774">"¿Cuáles son las novedades y qué es lo más emocionante?"</string>
-    <string name="new_device_suggestion_summary" msgid="7172709269203435870">"Descubre las 5 características principales"</string>
+    <string name="new_device_suggestion_summary" product="default" msgid="206396571522515855">"Descubre tu nuevo teléfono"</string>
+    <string name="new_device_suggestion_summary" product="tablet" msgid="393751455688210956">"Descubre tu nueva tablet"</string>
+    <string name="new_device_suggestion_summary" product="device" msgid="2939870049868336652">"Descubre tu nuevo dispositivo"</string>
     <string name="disabled_low_ram_device" msgid="3751578499721173344">"La función no está disponible en este dispositivo"</string>
 </resources>
diff --git a/res/values-es/arrays.xml b/res/values-es/arrays.xml
index bd5e0d9..e23eaef 100644
--- a/res/values-es/arrays.xml
+++ b/res/values-es/arrays.xml
@@ -100,8 +100,6 @@
     <!-- no translation found for wifi_security_no_eap:0 (2084555984818107151) -->
     <!-- no translation found for wifi_security_no_eap:1 (397579322683471524) -->
     <!-- no translation found for wifi_security_no_eap:2 (1968820975358150484) -->
-    <!-- no translation found for wifi_ap_security:0 (5251664683198623324) -->
-    <!-- no translation found for wifi_ap_security:1 (7989073072260294673) -->
   <string-array name="wifi_eap_method">
     <item msgid="1160193392455075561">"PEAP"</item>
     <item msgid="7981731051382306293">"TLS"</item>
diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
index f40d08c..eecdcc1 100644
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@@ -74,8 +74,8 @@
     <string name="radioInfo_display_asu" msgid="1422248392727818082">"asu"</string>
     <string name="radioInfo_lac" msgid="8415219164758307156">"LAC"</string>
     <string name="radioInfo_cid" msgid="4362599198392643138">"CID"</string>
-    <string name="sdcard_unmount" product="nosdcard" msgid="6325292633327972272">"Desactivar USB"</string>
-    <string name="sdcard_unmount" product="default" msgid="3364184561355611897">"Desactivar tarjeta SD"</string>
+    <string name="sdcard_unmount" product="nosdcard" msgid="6325292633327972272">"Desconectar USB"</string>
+    <string name="sdcard_unmount" product="default" msgid="3364184561355611897">"Desconectar tarjeta SD"</string>
     <string name="sdcard_format" product="nosdcard" msgid="6285310523155166716">"Borrar almacenamiento USB"</string>
     <string name="sdcard_format" product="default" msgid="6713185532039187532">"Borrar tarjeta SD"</string>
     <string name="preview_pager_content_description" msgid="8926235999291761243">"Vista previa"</string>
@@ -166,7 +166,7 @@
     <string name="bluetooth_map_acceptance_dialog_text" msgid="8712508202081143737">"%1$s quiere acceder a tus mensajes. ¿Quieres permitir el acceso a %2$s?"</string>
     <string name="bluetooth_sap_request" msgid="2669762224045354417">"Solicitud de acceso de SIM"</string>
     <string name="bluetooth_sap_acceptance_dialog_text" msgid="4414253873553608690">"<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g> quiere acceder a tu tarjeta SIM. Si lo permites, se inhabilitará la conexión de datos del dispositivo durante la conexión. Conceder acceso a <xliff:g id="DEVICE_NAME_1">%2$s?</xliff:g>"</string>
-    <string name="bluetooth_device_name_summary" msgid="4757990010751789977">"Visible como \"<xliff:g id="DEVICE_NAME">^1</xliff:g>\" para otros dispositivos"</string>
+    <string name="bluetooth_device_name_summary" msgid="522235742194965734">"Visible como \"<xliff:g id="DEVICE_NAME">^1</xliff:g>\" para otros dispositivos"</string>
     <string name="bluetooth_paired_device_title" msgid="8638994696317952019">"Tus dispositivos"</string>
     <string name="bluetooth_pairing_page_title" msgid="7712127387361962608">"Vincular dispositivo nuevo"</string>
     <string name="date_and_time" msgid="9062980487860757694">"Fecha y hora"</string>
@@ -307,11 +307,13 @@
     <string name="date_and_time_settings_title_setup_wizard" msgid="2391530758339384324">"Establecer fecha y hora"</string>
     <string name="date_and_time_settings_summary" msgid="7095318986757583584">"Establecer fecha, hora, zona horaria y formatos"</string>
     <string name="date_time_auto" msgid="7076906458515908345">"Fecha y hora automáticas"</string>
-    <string name="date_time_auto_summaryOn" msgid="4609619490075140381">"Usar los datos proporcionados por la red"</string>
-    <string name="date_time_auto_summaryOff" msgid="8698762649061882791">"Usar los datos proporcionados por la red"</string>
+    <string name="date_time_auto_summaryOn" msgid="4609619490075140381">"Usa los datos proporcionados por la red"</string>
+    <string name="date_time_auto_summaryOff" msgid="8698762649061882791">"Usa los datos proporcionados por la red"</string>
     <string name="zone_auto" msgid="334783869352026648">"Zona horaria automática"</string>
-    <string name="zone_auto_summaryOn" msgid="6142830927278458314">"Usar zona horaria proporcionada por la red"</string>
-    <string name="zone_auto_summaryOff" msgid="2597745783162041390">"Usar zona horaria proporcionada por la red"</string>
+    <string name="zone_auto_summaryOn" msgid="6142830927278458314">"Usa zona horaria proporcionada por la red"</string>
+    <string name="zone_auto_summaryOff" msgid="2597745783162041390">"Usa zona horaria proporcionada por la red"</string>
+    <string name="date_time_24hour_auto" msgid="2117383168985653422">"Formato automático de 24 horas"</string>
+    <string name="date_time_24hour_auto_summary" msgid="6351812925651480277">"Usar la opción predeterminada del la configuración regional"</string>
     <string name="date_time_24hour_title" msgid="3203537578602803850">"Formato de 24 horas"</string>
     <string name="date_time_24hour" msgid="1193032284921000063">"Usar formato de 24 horas"</string>
     <string name="date_time_set_time_title" msgid="6296795651349047016">"Hora"</string>
@@ -372,6 +374,9 @@
     <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="1961957425135180242">"Siguiente"</string>
+    <string name="setup_fingerprint_enroll_skip_title" msgid="362050541117362034">"¿Saltar huella digital?"</string>
+    <string name="setup_fingerprint_enroll_skip_after_adding_lock_text" msgid="958990414356204763">"Solo tardarás un minuto o dos en configurar la huella digital. Si te saltas este paso, puedes añadir tu huella digital en otro momento desde los ajustes."</string>
+    <string name="lock_screen_intro_skip_title" msgid="4988210105913705679">"¿Saltar bloqueo de pantalla?"</string>
     <string name="lock_screen_intro_skip_dialog_text_frp" product="tablet" msgid="1581834104051243425">"No se activarán las funciones de protección del dispositivo. No podrás evitar que otros usuarios utilicen este tablet si lo pierdes, te lo roban o se restablecen sus datos de fábrica."</string>
     <string name="lock_screen_intro_skip_dialog_text_frp" product="device" msgid="4629503416877189572">"No se activarán las funciones de protección del dispositivo. No podrás evitar que otros usuarios lo utilicen si lo pierdes, te lo roban o se restablecen sus datos de fábrica."</string>
     <string name="lock_screen_intro_skip_dialog_text_frp" product="default" msgid="2423428240245737909">"No se activarán las funciones de protección del dispositivo. No podrás evitar que otros usuarios utilicen este teléfono si lo pierdes, te lo roban o se restablecen sus datos de fábrica."</string>
@@ -457,7 +462,7 @@
     <string name="setup_lock_settings_picker_title" product="tablet" msgid="90329443364067215">"Protege tu tablet"</string>
     <string name="setup_lock_settings_picker_title" product="device" msgid="2399952075134938929">"Protege tu dispositivo"</string>
     <string name="setup_lock_settings_picker_title" product="default" msgid="1572244299605153324">"Protege tu teléfono"</string>
-    <string name="setup_lock_settings_picker_fingerprint_message" msgid="5585650064305600578">"Para mayor seguridad, configura un bloqueo de pantalla para la copia de seguridad."</string>
+    <string name="lock_settings_picker_fingerprint_added_security_message" msgid="5768002109707648463">"Para mayor seguridad, establece un bloqueo de pantalla alternativo."</string>
     <string name="setup_lock_settings_picker_message" product="tablet" msgid="8919671129189936210">"Activa las funciones de protección del dispositivo para evitar que otros utilicen el tablet sin tu permiso. Elige el bloqueo de pantalla que quieras utilizar."</string>
     <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>
@@ -588,6 +593,7 @@
     <string name="lockpassword_pin_no_sequential_digits" msgid="680765285206990584">"No se permite utilizar una secuencia ascendente, descendente ni repetida de dígitos"</string>
     <string name="lockpassword_ok_label" msgid="313822574062553672">"Aceptar"</string>
     <string name="lockpassword_cancel_label" msgid="8818529276331121899">"Cancelar"</string>
+    <string name="lockpassword_clear_label" msgid="5724429464960458155">"Borrar"</string>
     <string name="lockpattern_tutorial_cancel_label" msgid="6431583477570493261">"Cancelar"</string>
     <string name="lockpattern_tutorial_continue_label" msgid="3559793618653400434">"Siguiente"</string>
     <string name="lock_setup" msgid="3355847066343753943">"Se ha completado la configuración."</string>
@@ -781,6 +787,7 @@
     <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>
@@ -817,6 +824,8 @@
     <string name="wifi_wps_available_first_item" msgid="4422547079984583502">"WPS disponible"</string>
     <string name="wifi_wps_available_second_item" msgid="8427520131718215301">" (WPS disponible)"</string>
     <string name="wifi_wps_nfc_enter_password" msgid="2288214226916117159">"Introduce la contraseña de tu red"</string>
+    <string name="wifi_carrier_connect" msgid="8174696557882299911">"Red Wi‑Fi del operador"</string>
+    <string name="wifi_carrier_content" msgid="4634077285415851933">"Conectar a través de <xliff:g id="NAME">%1%s</xliff:g>"</string>
     <string name="wifi_scan_always_turnon_message" msgid="203123538572122989">"Para mejorar la precisión de la ubicación y para otros fines, <xliff:g id="APP_NAME">%1$s</xliff:g> quiere activar la búsqueda de redes aunque la conexión Wi-Fi esté desactivada.\n\n¿Permitir para todas las aplicaciones que quieran buscar redes?"</string>
     <string name="wifi_scan_always_turnoff_message" msgid="5538901671131941043">"Para desactivar esta opción, accede a las opciones avanzadas del menú adicional."</string>
     <string name="wifi_scan_always_confirm_allow" msgid="5355973075896817232">"Permitir"</string>
@@ -834,6 +843,7 @@
     <string name="wifi_connect" msgid="1076622875777072845">"Conectar"</string>
     <string name="wifi_failed_connect_message" msgid="8491902558970292871">"Error al conectar a la red"</string>
     <string name="wifi_forget" msgid="8168174695608386644">"Olvidar"</string>
+    <string name="wifi_modify" msgid="6100248070440710782">"Modificar"</string>
     <string name="wifi_failed_forget_message" msgid="1348172929201654986">"Error al olvidar la red"</string>
     <string name="wifi_save" msgid="3331121567988522826">"Guardar"</string>
     <string name="wifi_failed_save_message" msgid="6650004874143815692">"Error al guardar la red"</string>
@@ -846,6 +856,7 @@
     <string name="wifi_advanced_titlebar" msgid="4485841401774142908">"Ajustes avanzados de 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_title" msgid="3471132676909349382">"Información de red"</string>
     <string name="wifi_details_subnet_mask" msgid="6720279144174924410">"Máscara de subred"</string>
     <string name="wifi_details_dns" msgid="8648826607751830768">"DNS"</string>
     <string name="wifi_details_ipv6_address_header" msgid="6734119149106422148">"Direcciones IPv6"</string>
@@ -878,16 +889,15 @@
     <string name="wifi_p2p_cancel_connect_title" msgid="255267538099324413">"¿Quieres cancelar la invitación?"</string>
     <string name="wifi_p2p_cancel_connect_message" msgid="7477756213423749402">"¿Quieres cancelar la invitación para conectar con <xliff:g id="PEER_NAME">%1$s</xliff:g>?"</string>
     <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_off_subtext" msgid="5466126533609394170">"No se está compartiendo la conexión a Internet ni el contenido con otros dispositivos"</string>
     <string name="wifi_hotspot_tethering_on_subtext" product="tablet" msgid="5752490509369962007">"Se está compartiendo la conexión a Internet de este tablet mediante un punto de acceso"</string>
     <string name="wifi_hotspot_tethering_on_subtext" product="default" msgid="6461075246164300670">"Se está compartiendo la conexión a Internet de este teléfono mediante un punto de acceso"</string>
     <string name="wifi_hotspot_on_local_only_subtext" msgid="2068110388011294735">"La aplicación está compartiendo contenido. Para compartir la conexión a Internet, desactiva el punto de acceso y vuelve a activarlo."</string>
-    <string name="wifi_hotspot_name_title" msgid="1341735529132128887">"Nombre de Wi‑Fi"</string>
+    <string name="wifi_hotspot_name_title" msgid="8237000746618636778">"Nombre del punto de acceso"</string>
     <string name="wifi_hotspot_name_summary_connecting" msgid="3378299995508671967">"Activando <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>..."</string>
     <string name="wifi_hotspot_name_summary_connected" msgid="3888672084861445362">"Otros dispositivos pueden conectarse a <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>"</string>
-    <string name="wifi_hotspot_password_title" msgid="1955592302902091281">"Contraseña de Wi-Fi"</string>
+    <string name="wifi_hotspot_password_title" msgid="8676859981917573801">"Contraseña del punto de acceso"</string>
     <string name="wifi_hotspot_ap_band_title" msgid="1165801173359290681">"Banda de punto de acceso"</string>
     <string name="wifi_hotspot_footer_info_regular" msgid="1203489406068036455">"Utiliza un punto de acceso con el fin de crear una red Wi-Fi para otros dispositivos. Los puntos de acceso ofrecen acceso a Internet mediante tu conexión de datos móviles. Es posible que se apliquen cargos adicionales por el uso de datos."</string>
     <string name="wifi_hotspot_footer_info_local_only" msgid="857988412470694109">"Las aplicaciones pueden crear un punto de acceso para compartir contenido con dispositivos cercanos."</string>
@@ -898,7 +908,6 @@
     <string name="wifi_tether_configure_ap_text" msgid="7974681394041609308">"Configurar punto de acceso Wi-Fi"</string>
     <string name="wifi_hotspot_configure_ap_text" msgid="5478614731464220432">"Configuración del punto de acceso Wi-Fi"</string>
     <string name="wifi_hotspot_configure_ap_text_summary" msgid="5560680057727007011">"Punto de acceso AndroidAP WPA2 PSK"</string>
-    <string name="wifi_tether_configure_subtext" msgid="2050196439900426456">"Punto de acceso: <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">"Llamadas Wi-Fi"</string>
     <string name="wifi_calling_suggestion_title" msgid="9008010480466359578">"Activa la Llamada por Wi-Fi"</string>
@@ -911,7 +920,7 @@
     <string name="wifi_calling_roaming_mode_dialog_title" msgid="7800926602662078576">"Preferencia de itinerancia"</string>
   <string-array name="wifi_calling_mode_choices">
     <item msgid="2124257075906188844">"Preferir Wi-Fi"</item>
-    <item msgid="1335127656328817518">"Preferida para móviles"</item>
+    <item msgid="1335127656328817518">"Preferir datos móviles"</item>
     <item msgid="3132912693346866895">"Solo conexión Wi-Fi"</item>
   </string-array>
   <string-array name="wifi_calling_mode_choices_v2">
@@ -926,7 +935,7 @@
   </string-array>
   <string-array name="wifi_calling_mode_choices_without_wifi_only">
     <item msgid="5782108782860004851">"Preferir Wi-Fi"</item>
-    <item msgid="5074515506087318555">"Preferida para móviles"</item>
+    <item msgid="5074515506087318555">"Preferir datos móviles"</item>
   </string-array>
   <string-array name="wifi_calling_mode_choices_v2_without_wifi_only">
     <item msgid="6132150507201243768">"Wi-Fi"</item>
@@ -939,7 +948,7 @@
     <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="emergency_address_summary" msgid="3266760199681945746">"Dirección que utilizan los servicios de emergencia como tu ubicación si hacer una llamada de emergencia por Wi‑Fi"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"Pantalla"</string>
     <string name="sound_settings" msgid="5534671337768745343">"Sonido"</string>
     <string name="all_volume_title" msgid="4296957391257836961">"Volumen"</string>
@@ -993,6 +1002,7 @@
     <string name="search_settings" msgid="1910951467596035063">"Búsqueda"</string>
     <string name="search_settings_summary" msgid="9205656546570654169">"Administrar historial y configuración de búsqueda"</string>
     <string name="search_settings_no_results" msgid="8799027492641230999">"Sin resultados"</string>
+    <string name="search_clear_history" msgid="4196658962573162457">"Borrar historial"</string>
     <string name="display_settings" msgid="7965901687241669598">"Pantalla"</string>
     <string name="accelerometer_title" msgid="7854608399547349157">"Girar pantalla automáticamente"</string>
     <string name="color_mode_title" msgid="3159275920408338215">"Colores intensos"</string>
@@ -1045,14 +1055,14 @@
     <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">"Cambia el fondo de pantalla"</string>
+    <string name="wallpaper_suggestion_title" msgid="8583988696513822528">"Cambiar 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 un dock"</string>
+    <string name="screensaver_settings_summary_dock" msgid="2072657401664633283">"Con el dispositivo en una base"</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>
@@ -1122,7 +1132,6 @@
     <string name="baseband_version" msgid="1848990160763524801">"Versión de la banda base"</string>
     <string name="kernel_version" msgid="9192574954196167602">"Versión del kernel"</string>
     <string name="build_number" msgid="3075795840572241758">"Número de compilación"</string>
-    <string name="selinux_status" msgid="6212165375172061672">"Estado de SELinux"</string>
     <string name="device_info_not_available" msgid="8062521887156825182">"No disponible"</string>
     <string name="device_status_activity_title" msgid="1411201799384697904">"Estado"</string>
     <string name="device_status" msgid="607405385799807324">"Estado"</string>
@@ -1131,8 +1140,8 @@
     <string name="storage_settings" msgid="4211799979832404953">"Almacenamiento"</string>
     <string name="storage_usb_settings" msgid="7293054033137078060">"Almacenamiento"</string>
     <string name="storage_settings_title" msgid="8746016738388094064">"Ajustes de almacenamiento"</string>
-    <string name="storage_settings_summary" product="nosdcard" msgid="3543813623294870759">"Desactivar almacenamiento USB, ver almacenamiento disponible"</string>
-    <string name="storage_settings_summary" product="default" msgid="9176693537325988610">"Desactivar tarjeta SD, ver almacenamiento disponible."</string>
+    <string name="storage_settings_summary" product="nosdcard" msgid="3543813623294870759">"Desconectar almacenamiento USB, ver almacenamiento disponible"</string>
+    <string name="storage_settings_summary" product="default" msgid="9176693537325988610">"Desconectar tarjeta SD, ver almacenamiento disponible."</string>
     <string name="status_number" product="tablet" msgid="1138837891091222272">"MDN"</string>
     <string name="status_number" product="default" msgid="5123197324870153205">"Mi número de teléfono"</string>
     <string name="status_min_number" msgid="3519504522179420597">"MIN"</string>
@@ -1150,7 +1159,6 @@
     <string name="status_wifi_mac_address" msgid="2202206684020765378">"Dirección MAC de la red Wi‑Fi"</string>
     <string name="status_bt_address" msgid="4195174192087439720">"Dirección de Bluetooth"</string>
     <string name="status_serial_number" msgid="2257111183374628137">"Número de serie"</string>
-    <string name="status_unavailable" msgid="7862009036663793314">"No disponible"</string>
     <string name="status_up_time" msgid="7294859476816760399">"Tiempo de actividad"</string>
     <string name="status_awake_time" msgid="2393949909051183652">"Tiempo de actividad"</string>
     <string name="internal_memory" msgid="9129595691484260784">"Almacenamiento interno"</string>
@@ -1167,10 +1175,10 @@
     <string name="memory_music_usage" msgid="1363785144783011606">"Audio (música, tonos, etc.)"</string>
     <string name="memory_media_misc_usage" msgid="6094866738586451683">"Otros archivos"</string>
     <string name="memory_media_cache_usage" msgid="6704293333141177910">"Datos almacenados en caché"</string>
-    <string name="sd_eject" product="nosdcard" msgid="4988563376492400073">"Desactivar almacenam comp"</string>
-    <string name="sd_eject" product="default" msgid="6915293408836853020">"Desactivar tarjeta SD"</string>
-    <string name="sd_eject_summary" product="nosdcard" msgid="5009296896648072891">"Desactivar almacenamiento USB interno"</string>
-    <string name="sd_eject_summary" product="default" msgid="3300599435073550246">"Desactivar la tarjeta SD para extraerla de forma segura"</string>
+    <string name="sd_eject" product="nosdcard" msgid="4988563376492400073">"Desconectar almacenamiento compartido"</string>
+    <string name="sd_eject" product="default" msgid="6915293408836853020">"Desconectar tarjeta SD"</string>
+    <string name="sd_eject_summary" product="nosdcard" msgid="5009296896648072891">"Desconectar almacenamiento USB interno"</string>
+    <string name="sd_eject_summary" product="default" msgid="3300599435073550246">"Desconectar la tarjeta SD para extraerla de forma segura"</string>
     <string name="sd_insert_summary" product="nosdcard" msgid="5264016886409577313">"Inserta USB para activar almacenamiento"</string>
     <string name="sd_insert_summary" product="default" msgid="2048640010381803841">"Insertar una tarjeta SD para el montaje"</string>
     <string name="sd_mount" product="nosdcard" msgid="8966695015677343116">"Activar almacenamiento USB"</string>
@@ -1184,18 +1192,18 @@
     <string name="memory_clear_cache_title" msgid="5423840272171286191">"¿Borrar datos almacenados en caché?"</string>
     <string name="memory_clear_cache_message" msgid="4550262490807415948">"Se borrarán los datos en caché de las aplicaciones."</string>
     <string name="mtp_ptp_mode_summary" msgid="3710436114807789270">"La función MTP o PTP está activa."</string>
-    <string name="dlg_confirm_unmount_title" product="nosdcard" msgid="3077285629197874055">"¿Desactivar almacenamiento USB?"</string>
-    <string name="dlg_confirm_unmount_title" product="default" msgid="3634502237262534381">"¿Desactivar tarjeta SD?"</string>
-    <string name="dlg_confirm_unmount_text" product="nosdcard" msgid="4322636662873269018">"Si desactivas el almacenamiento USB, se detendrán algunas aplicaciones que estás usando y no estarán disponibles hasta que vuelvas a activarlo."</string>
-    <string name="dlg_confirm_unmount_text" product="default" msgid="6998379994779187692">"Si desactivas la tarjeta SD, se detendrán algunas aplicaciones en ejecución y no estarán disponibles hasta que la vuelvas a activar."</string>
+    <string name="dlg_confirm_unmount_title" product="nosdcard" msgid="3077285629197874055">"¿Desconectar almacenamiento USB?"</string>
+    <string name="dlg_confirm_unmount_title" product="default" msgid="3634502237262534381">"¿Desconectar tarjeta SD?"</string>
+    <string name="dlg_confirm_unmount_text" product="nosdcard" msgid="4322636662873269018">"Si desconectas el almacenamiento USB, se detendrán algunas aplicaciones que estás usando y no estarán disponibles hasta que vuelvas a activarlo."</string>
+    <string name="dlg_confirm_unmount_text" product="default" msgid="6998379994779187692">"Si desconectas la tarjeta SD, se detendrán algunas aplicaciones en ejecución y no estarán disponibles hasta que la vuelvas a activar."</string>
     <string name="dlg_error_unmount_title" product="nosdcard" msgid="4642742385125426529"></string>
     <string name="dlg_error_unmount_title" product="default" msgid="4642742385125426529"></string>
-    <string name="dlg_error_unmount_text" product="nosdcard" msgid="9191518889746166147">"No se ha podido desactivar el almacenamiento USB. Inténtalo de nuevo más tarde."</string>
-    <string name="dlg_error_unmount_text" product="default" msgid="3500976899159848422">"No se ha podido desactivar la tarjeta SD. Inténtalo de nuevo más tarde."</string>
+    <string name="dlg_error_unmount_text" product="nosdcard" msgid="9191518889746166147">"No se ha podido desconectar el almacenamiento USB. Inténtalo de nuevo más tarde."</string>
+    <string name="dlg_error_unmount_text" product="default" msgid="3500976899159848422">"No se ha podido desconectar la tarjeta SD. Inténtalo de nuevo más tarde."</string>
     <string name="unmount_inform_text" product="nosdcard" msgid="7120241136790744265">"Se desactivará el almacenamiento USB."</string>
     <string name="unmount_inform_text" product="default" msgid="1904212716075458402">"Se desactivará la tarjeta SD."</string>
     <string name="sd_ejecting_title" msgid="8824572198034365468">"Desactivando"</string>
-    <string name="sd_ejecting_summary" msgid="2028753069184908491">"La tarjeta SD se está desactivando."</string>
+    <string name="sd_ejecting_summary" msgid="2028753069184908491">"La tarjeta SD se está desconectando."</string>
     <string name="storage_low_title" msgid="1388569749716225155">"No queda espacio de almacenamiento"</string>
     <string name="storage_low_summary" msgid="7737465774892563129">"Es posible que algunas funciones del sistema, como la sincronización, no funcionen correctamente. Prueba a eliminar o a desactivar elementos para liberar espacio (por ejemplo, aplicaciones o contenido multimedia)."</string>
     <string name="storage_menu_rename" msgid="7141058657592615390">"Cambiar nombre"</string>
@@ -1209,7 +1217,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">"Administrar almacenamiento"</string>
+    <string name="storage_menu_manage" msgid="5914482953856430780">"Gestionar 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>
@@ -1325,7 +1333,8 @@
     <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>
-    <string name="reset_dashboard_title" msgid="6254873816990678620">"Recuperar opciones"</string>
+    <string name="reset_dashboard_title" msgid="6254873816990678620">"Opciones de recuperación"</string>
+    <string name="reset_dashboard_summary" msgid="4851012632493522755">"Se puede recuperar la configuración de la red, de las aplicaciones o del dispositivo"</string>
     <string name="reset_network_title" msgid="6166025966016873843">"Recuperar ajustes de Wi-Fi, red móvil y Bluetooth"</string>
     <string name="reset_network_desc" msgid="5547979398298881406">"Se recuperarán todos los ajustes de red, como:\n\n"<li>"Wi‑Fi"</li>\n<li>"Datos móviles"</li>\n<li>"Bluetooth"</li></string>
     <string name="reset_network_button_text" msgid="2035676527471089853">"Restablecer ajustes"</string>
@@ -1334,17 +1343,14 @@
     <string name="reset_network_confirm_title" msgid="1759888886976962773">"¿Restablecer?"</string>
     <string name="network_reset_not_available" msgid="7188610385577164676">"Este usuario no puede restablecer la red"</string>
     <string name="reset_network_complete_toast" msgid="787829973559541880">"Se han restablecido los ajustes de red"</string>
-    <string name="master_clear_title" msgid="6617679904229218425">"Borrar todos los datos (recuperar datos de fábrica)"</string>
-    <plurals name="master_clear_with_account_summary" formatted="false" msgid="5911377203778818712">
-      <item quantity="other">Se recuperarán los ajustes de <xliff:g id="ACCOUNT_COUNT">%1$d</xliff:g> cuentas</item>
-      <item quantity="one">Se recuperarán los ajustes de 1 cuenta</item>
-    </plurals>
-    <string name="master_clear_summary" msgid="6902443944660426951">"Se restaurarán todos los datos y el almacenamiento interno"</string>
+    <string name="master_clear_title" msgid="3531267871084279512">"Borrar todos los datos (recuperar datos de fábrica)"</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_other_users_present" product="default" msgid="5161423070702470742">\n\n"Hay otros usuarios presentes en este dispositivo.\n"</string>
     <string name="master_clear_desc_also_erases_external" msgid="1903185203791274237"><li>"Música"</li>\n<li>"Fotos"</li>\n<li>"Otros datos de usuario"</li></string>
+    <string name="master_clear_desc_also_erases_esim" msgid="312352697653096008"><li>"Operadores de la eSIM"</li></string>
+    <string name="master_clear_desc_no_cancel_mobile_plan" msgid="5460926449093211144">\n\n"Tu plan de servicios móviles no se cancelará."</string>
     <string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="7744115866662613411">\n\n"Para eliminar la música, las imágenes y otros datos de usuario, debes borrar el "<b>"almacenamiento USB"</b>"."</string>
     <string name="master_clear_desc_erase_external_storage" product="default" msgid="4801026652617377093">\n\n"Para eliminar la música, las imágenes y otros datos de usuario, debes borrar la "<b>"tarjeta SD"</b>"."</string>
     <string name="erase_external_storage" product="nosdcard" msgid="969364037450286809">"Borrar almacenamiento USB"</string>
@@ -1461,15 +1467,16 @@
     <string name="settings_safetylegal_activity_title" msgid="6901214628496951727">"Información de seguridad"</string>
     <string name="settings_safetylegal_activity_unreachable" msgid="250674109915859456">"No tienes conexión de datos. Para ver esta información, accede a %s desde cualquier ordenador conectado a Internet."</string>
     <string name="settings_safetylegal_activity_loading" msgid="8059022597639516348">"Cargando…"</string>
-    <string name="lockpassword_choose_your_password_header" msgid="8624900666929394990">"Elige tu contraseña"</string>
-    <string name="lockpassword_choose_your_password_header_for_fingerprint" msgid="6624409510609085450">"Para usar huella, añade contraseña"</string>
-    <string name="lockpassword_choose_your_pattern_header" msgid="6949761069941694050">"Elige un patrón"</string>
-    <string name="lockpassword_choose_your_pattern_header_for_fingerprint" msgid="5901096361617543819">"Para usar huella, añade patrón"</string>
-    <string name="lockpassword_choose_your_pin_header" msgid="7598849519816138302">"Elige tu PIN"</string>
-    <string name="lockpassword_choose_your_pin_header_for_fingerprint" msgid="765344692615917183">"Para usar huella, añade PIN"</string>
-    <string name="lockpassword_confirm_your_password_header" msgid="6308478184889846633">"Confirma tu contraseña"</string>
+    <string name="lockpassword_choose_your_screen_lock_header" msgid="3872462096767152394">"Establece el bloqueo de pantalla"</string>
+    <string name="lockpassword_choose_your_password_message" msgid="1197569283524841412">"Por seguridad, establece una contraseña"</string>
+    <string name="lockpassword_choose_your_password_header_for_fingerprint" msgid="2541818487015343503">"Para usar la huella, añade contraseña"</string>
+    <string name="lockpassword_choose_your_pattern_header_for_fingerprint" msgid="7709785406243556723">"Para usar la huella, añade un patrón"</string>
+    <string name="lockpassword_choose_your_pin_message" msgid="1875420718677275646">"Por seguridad, establece un PIN"</string>
+    <string name="lockpassword_choose_your_pin_header_for_fingerprint" msgid="1549639053195796674">"Para utilizar la huella, añade un PIN"</string>
+    <string name="lockpassword_choose_your_pattern_message" msgid="5986983400689720015">"Por seguridad, establece un patrón"</string>
+    <string name="lockpassword_confirm_your_password_header" msgid="1266027268220850931">"Vuelve a introducir 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="7744513791910572550">"Vuelve a introducir tu 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>
@@ -1488,6 +1495,12 @@
     <string name="lockpassword_strong_auth_required_work_pattern" msgid="3003781907040522053">"Para mayor seguridad, utiliza el patrón del perfil de trabajo"</string>
     <string name="lockpassword_strong_auth_required_work_pin" msgid="3367491332598821552">"Para mayor seguridad, introduce el PIN del perfil de trabajo"</string>
     <string name="lockpassword_strong_auth_required_work_password" msgid="8159775129968582940">"Para mayor seguridad, introduce la contraseña del perfil de trabajo"</string>
+    <string name="lockpassword_confirm_your_pattern_details_frp" msgid="6757336656791723193">"Se han recuperado los ajustes de fábrica del teléfono. Para usarlo, introduce tu antiguo patrón."</string>
+    <string name="lockpassword_confirm_your_pin_details_frp" msgid="826520613445990470">"Se han recuperado los ajustes de fábrica del teléfono. Para usarlo, introduce tu antiguo PIN."</string>
+    <string name="lockpassword_confirm_your_password_details_frp" msgid="8944081074615739040">"Se han recuperado los ajustes de fábrica del teléfono. Para usarlo, introduce tu antigua contraseña."</string>
+    <string name="lockpassword_confirm_your_pattern_header_frp" msgid="2898036091609128286">"Verificar patrón"</string>
+    <string name="lockpassword_confirm_your_pin_header_frp" msgid="4141601774778898803">"Verificar PIN"</string>
+    <string name="lockpassword_confirm_your_password_header_frp" msgid="3762615419295360480">"Verificar contraseña"</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>
@@ -1533,11 +1546,10 @@
     <string name="applications_settings" msgid="5281808652705396152">"Información de las aplicaciones"</string>
     <string name="applications_settings_summary" msgid="6683465446264515367">"Administrar aplicaciones y configurar accesos directos de inicio rápido"</string>
     <string name="applications_settings_header" msgid="1014813055054356646">"Ajustes de aplicación"</string>
-    <string name="install_applications" msgid="4872012136210802181">"Orígenes desconocidos"</string>
+    <string name="install_applications" msgid="4872012136210802181">"Fuentes desconocidas"</string>
     <string name="install_applications_title" msgid="4987712352256508946">"Permitir todas las fuentes"</string>
     <string name="recent_app_category_title" msgid="6673071268966003928">"Aplicaciones abiertas recientemente"</string>
     <string name="see_all_apps_title" msgid="1317153498074308438">"Ver todas las aplicaciones (<xliff:g id="COUNT">%1$d</xliff:g>)"</string>
-    <string name="recent_app_summary" msgid="3366446669844932300">"Hace <xliff:g id="TIME">^1</xliff:g>"</string>
     <string name="install_all_warning" product="tablet" msgid="8310489909586138165">"Tu tablet y tus datos personales son más vulnerables a los ataques de aplicaciones desconocidas. Al instalar aplicaciones de esta fuente, aceptas ser responsable de cualquier daño que sufra tu tablet o la pérdida de datos que se pueda derivar de su uso."</string>
     <string name="install_all_warning" product="default" msgid="1952257127370115988">"Tu teléfono y tus datos personales son más vulnerables a los ataques de aplicaciones desconocidas. Al instalar aplicaciones de esta fuente, aceptas ser responsable de cualquier daño que sufra tu teléfono o la pérdida de datos que se pueda derivar de su uso."</string>
     <string name="advanced_settings" msgid="1777249286757067969">"Ajustes avanzados"</string>
@@ -1584,7 +1596,7 @@
     <string name="show_running_services" msgid="5736278767975544570">"Servicios en uso"</string>
     <string name="show_background_processes" msgid="2009840211972293429">"Procesos en caché"</string>
     <string name="default_emergency_app" msgid="1951760659640369980">"Aplicación Emergencia"</string>
-    <string name="reset_app_preferences" msgid="1321050641018356925">"Restablecer ajustes de aplicaciones"</string>
+    <string name="reset_app_preferences" msgid="1321050641018356925">"Recuperar ajustes de aplicaciones"</string>
     <string name="reset_app_preferences_title" msgid="6093179367325336662">"¿Restablecer preferencias de las aplicaciones?"</string>
     <string name="reset_app_preferences_desc" msgid="4822447731869201512">"Se restablecerán todas las preferencias de:\n\n "<li>"Aplicaciones inhabilitadas"</li>\n" "<li>"Notificaciones de aplicaciones inhabilitadas"</li>\n" "<li>"Aplicaciones predeterminadas"</li>\n" "<li>"Restricciones de datos móviles de aplicaciones"</li>\n" "<li>"Restricciones de permisos"</li>\n\n"No se perderán los datos de las aplicaciones."</string>
     <string name="reset_app_preferences_button" msgid="2559089511841281242">"Restablecer aplicaciones"</string>
@@ -1735,9 +1747,9 @@
     <string name="keyboard_assistance_category" msgid="5843634175231134014">"Ayuda del teclado"</string>
     <string name="physical_keyboard_title" msgid="8285149877925752042">"Teclado físico"</string>
     <string name="show_ime" msgid="2658582193437188227">"Mostrar teclado virtual"</string>
-    <string name="show_ime_summary" msgid="8164993045923240698">"Debe seguir en pantalla mientras el teclado físico esté activo"</string>
+    <string name="show_ime_summary" msgid="8164993045923240698">"Sigue en pantalla mientras el teclado físico está activo"</string>
     <string name="keyboard_shortcuts_helper" msgid="4839453720463798145">"Ayuda de accesos directos de teclado"</string>
-    <string name="keyboard_shortcuts_helper_summary" msgid="5871299901459743288">"Mostrar accesos directos de teclado disponibles"</string>
+    <string name="keyboard_shortcuts_helper_summary" msgid="5871299901459743288">"Muestra accesos directos de teclado disponibles"</string>
     <string name="default_keyboard_layout" msgid="4172606673510531271">"Predeterminado"</string>
     <string name="pointer_speed" msgid="1221342330217861616">"Velocidad del puntero"</string>
     <string name="game_controller_settings_category" msgid="8794508575329923718">"Mandos de videojuegos"</string>
@@ -1801,7 +1813,7 @@
     <string name="accessibility_settings_summary" msgid="981260486011624939">"Lectores de pantalla, pantalla, controles de interacción"</string>
     <string name="vision_settings_title" msgid="4204111425716868288">"Ajustes de visión"</string>
     <string name="vision_settings_description" msgid="5679491180156408260">"Personaliza este dispositivo para adaptarlo a tus necesidades. Puedes modificar las funciones de accesibilidad posteriormente en Ajustes."</string>
-    <string name="vision_settings_suggestion_title" msgid="917294957154878441">"Aumentar el tamaño de la fuente"</string>
+    <string name="vision_settings_suggestion_title" msgid="8058794060304707004">"Cambiar tamaño de la fuente"</string>
     <string name="screen_reader_category_title" msgid="7739154903913400641">"Lectores de pantalla"</string>
     <string name="audio_and_captions_category_title" msgid="3420727114421447524">"Audio y texto en pantalla"</string>
     <string name="display_category_title" msgid="685461049938269166">"Pantalla"</string>
@@ -1838,7 +1850,6 @@
     <string name="accessibility_display_inversion_preference_subtitle" msgid="7052959202195368109">"Puede afectar al rendimiento"</string>
     <string name="accessibility_autoclick_preference_title" msgid="7014499339068449623">"Clic después de que el puntero deje de moverse"</string>
     <string name="accessibility_autoclick_delay_preference_title" msgid="3962261178385106006">"Retraso antes del clic"</string>
-    <string name="preference_summary_default_combination" msgid="8532964268242666060">"<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">"ACTIVADO"</string>
     <string name="accessibility_summary_state_disabled" msgid="2241315620132005595">"DESACTIVADO"</string>
     <string name="enable_quick_setting" msgid="2366999897816894536">"Mostrar en ajustes rápidos"</string>
@@ -1957,12 +1968,14 @@
     <string name="background_activity_summary_on" msgid="649282072540085599">"La aplicación puede funcionar en segundo plano cuando no se está usando"</string>
     <string name="background_activity_summary_off" msgid="7666330699090632040">"La actividad de la aplicación en segundo plano es limitada cuando no se está utilizando"</string>
     <string name="background_activity_summary_disabled" msgid="3710669050484599847">"La aplicación no puede funcionar en segundo plano"</string>
+    <string name="background_activity_summary_whitelisted" msgid="7375400051141016808">"La aplicación no se puede optimizar para que consuma menos batería"</string>
+    <string name="background_activity_warning_dialog_title" msgid="2216249969149568871">"¿Limitar actividad en segundo plano?"</string>
+    <string name="background_activity_warning_dialog_text" msgid="7049624449246121981">"Si limitas la actividad en segundo plano de una aplicación, puede que no funcione correctamente"</string>
     <string name="device_screen_usage" msgid="3386088035570409683">"Uso de la pantalla desde la última carga completa"</string>
     <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 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="power_usage_list_summary" msgid="6393929085382334341">"Uso de la aplicación desde la última carga completa (<xliff:g id="RELATIVE_TIME">^1</xliff:g>)"</string>
+    <string name="power_usage_list_summary_device" msgid="4461926045610455423">"Uso del dispositivo desde la última carga completa (<xliff:g id="RELATIVE_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>
     <string name="battery_since_unplugged" msgid="338073389740738437">"Uso de la batería desde que se cargó"</string>
@@ -2208,14 +2221,14 @@
     <string name="credentials_unlock_hint" msgid="2301301378040499348">"Escribe la contraseña del almacenamiento de credenciales."</string>
     <string name="credentials_old_password" msgid="7553393815538684028">"Contraseña actual:"</string>
     <string name="credentials_reset_hint" msgid="6297256880896133631">"¿Seguro que quieres quitar todos los certificados?"</string>
-    <string name="credentials_password_too_short" msgid="7502749986405522663">"La contraseña debe tener al menos 8 caracteres."</string>
     <string name="credentials_wrong_password" msgid="2541932597104054807">"Contraseña incorrecta"</string>
     <string name="credentials_reset_warning" msgid="5320653011511797600">"Contraseña incorrecta. Tienes una oportunidad más antes de que se borre el almacenamiento de credenciales."</string>
     <string name="credentials_reset_warning_plural" msgid="6514085665301095279">"Contraseña incorrecta. Tienes <xliff:g id="NUMBER">%1$d</xliff:g> oportunidades más antes de que se borre el almacenamiento de credenciales."</string>
     <string name="credentials_erased" msgid="2907836028586342969">"Almacenamiento de credenciales borrado"</string>
     <string name="credentials_not_erased" msgid="7685932772284216097">"No se ha podido borrar el almacenamiento de credenciales."</string>
     <string name="credentials_enabled" msgid="7588607413349978930">"Almacenamiento de credenciales habilitado"</string>
-    <string name="credentials_configure_lock_screen_hint" msgid="6757119179588664966">"Debes establecer una contraseña o un PIN para la pantalla de bloqueo para usar el almacenamiento de credenciales."</string>
+    <string name="credentials_configure_lock_screen_hint" msgid="8058230497337529036">"Para poder utilizar el almacenamiento de credenciales, tu dispositivo debe tener una pantalla de bloqueo segura"</string>
+    <string name="credentials_configure_lock_screen_button" msgid="253239765216055321">"ESTABLECER BLOQUEO"</string>
     <string name="usage_access_title" msgid="332333405495457839">"Apps con acceso de uso"</string>
     <string name="emergency_tone_title" msgid="1055954530111587114">"Tono de emergencia"</string>
     <string name="emergency_tone_summary" msgid="722259232924572153">"Establecer comportamiento al realizar una llamada de emergencia"</string>
@@ -2335,8 +2348,6 @@
     <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="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>
     <string name="enter_pin" msgid="5305333588093263790">"Para iniciar tu dispositivo Android, introduce el PIN"</string>
     <string name="enter_pattern" msgid="4187435713036808566">"Para iniciar tu dispositivo Android, dibuja tu patrón"</string>
@@ -2350,6 +2361,7 @@
     <string name="misc_files_selected_count" msgid="4647048020823912088">"Has seleccionado <xliff:g id="NUMBER">%1$d</xliff:g> de <xliff:g id="TOTAL">%2$d</xliff:g>."</string>
     <string name="misc_files_selected_count_bytes" msgid="2876232009069114352">"<xliff:g id="NUMBER">%1$s</xliff:g> de <xliff:g id="TOTAL">%2$s</xliff:g>"</string>
     <string name="select_all" msgid="1562774643280376715">"Seleccionar todo"</string>
+    <string name="data_plan_usage_manage_plans_button_text" msgid="8997761990902708162">"Administrar planes"</string>
     <string name="data_usage_summary_title" msgid="3804110657238092929">"Uso de datos"</string>
     <string name="data_usage_app_summary_title" msgid="4147258989837459172">"Uso de datos de la aplicación"</string>
     <string name="data_usage_accounting" msgid="7170028915873577387">"El uso de datos del operador puede ser diferente al calculado por el dispositivo."</string>
@@ -2434,7 +2446,10 @@
     <string name="data_usage_metered_body" msgid="7655851702771342507">"Las redes sin tarifa plana se tratan como redes móviles cuando se restringe el uso de datos en segundo plano. Las aplicaciones pueden mostrar una advertencia antes de usar estas redes para descargar archivos grandes."</string>
     <string name="data_usage_metered_mobile" msgid="5423305619126978393">"Redes móviles"</string>
     <string name="data_usage_metered_wifi" msgid="1761738002328299714">"Redes Wi-Fi sin tarifa plana"</string>
-    <string name="data_usage_metered_wifi_disabled" msgid="727808462375941567">"Para seleccionar redes de uso medido, activa el Wi‑Fi."</string>
+    <string name="data_usage_metered_wifi_disabled" msgid="727808462375941567">"Para seleccionar redes sin tarifa plana, activa el Wi‑Fi."</string>
+    <string name="data_usage_metered_auto" msgid="1262028400911918865">"Automática"</string>
+    <string name="data_usage_metered_yes" msgid="9217539611385225894">"Sin tarifa plana"</string>
+    <string name="data_usage_metered_no" msgid="4025232961929071789">"Con tarifa plana"</string>
     <string name="data_usage_disclaimer" msgid="6887858149980673444">"El uso de datos del operador puede ser diferente al calculado por el dispositivo."</string>
     <string name="cryptkeeper_emergency_call" msgid="198578731586097145">"Llamada de emergencia"</string>
     <string name="cryptkeeper_return_to_call" msgid="5613717339452772491">"Volver a llamada"</string>
@@ -2526,9 +2541,6 @@
     <string name="backup_pw_set_button_text" msgid="2387480910044648795">"Establecer contraseña"</string>
     <string name="backup_pw_cancel_button_text" msgid="8845630125391744615">"Cancelar"</string>
     <string name="additional_system_update_settings_list_item_title" msgid="214987609894661992">"Otras actualizaciones del sistema"</string>
-    <string name="selinux_status_disabled" msgid="924551035552323327">"Inhabilitado"</string>
-    <string name="selinux_status_permissive" msgid="6004965534713398778">"Permisivo"</string>
-    <string name="selinux_status_enforcing" msgid="2252703756208463329">"Obligatorio"</string>
     <string name="ssl_ca_cert_warning" msgid="2045866713601984673">"Puede que la red esté supervisada"</string>
     <string name="done_button" msgid="1991471253042622230">"Listo"</string>
     <plurals name="ssl_ca_cert_dialog_title" formatted="false" msgid="7145092748045794650">
@@ -2571,7 +2583,7 @@
     <string name="user_add_user_message_long" msgid="8562152293752222985">"Puedes crear más usuarios para compartir este dispositivo con otras personas. Cada usuario tiene su propio espacio, que puede personalizar con aplicaciones, fondos de pantalla, etc., y puede modificar opciones de configuración del dispositivo que afectan a todos los usuarios, como la conexión Wi‑Fi.\n\nCuando se añade un usuario, este debe configurar su espacio.\n\nCualquier usuario puede actualizar las aplicaciones del resto de usuarios."</string>
     <string name="user_add_user_message_short" msgid="1511354412249044381">"Al añadir un usuario nuevo, este debe configurar su espacio.\n\nCualquier usuario puede actualizar las aplicaciones del resto de usuarios."</string>
     <string name="user_setup_dialog_title" msgid="1765794166801864563">"¿Configurar usuario ahora?"</string>
-    <string name="user_setup_dialog_message" msgid="1004068621380867148">"Asegúrate de que la persona pueda acceder al dispositivo y configurar su espacio"</string>
+    <string name="user_setup_dialog_message" msgid="1004068621380867148">"Asegúrate de que la persona pueda acceder al dispositivo y configurar su espacio."</string>
     <string name="user_setup_profile_dialog_message" msgid="3896568553327558731">"¿Quieres configurar un perfil ahora?"</string>
     <string name="user_setup_button_setup_now" msgid="3391388430158437629">"Configurar ahora"</string>
     <string name="user_setup_button_setup_later" msgid="3068729597269172401">"Ahora no"</string>
@@ -2726,6 +2738,7 @@
       <item quantity="other">Mostrar %d elementos ocultos</item>
       <item quantity="one">Mostrar %d elemento oculto</item>
     </plurals>
+    <string name="dashboard_suggestion_condition_footer_content_description" msgid="2898588191174845961">"Ocultar"</string>
     <string name="network_dashboard_title" msgid="4771589228992391573">"Red e Internet"</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>
@@ -2765,7 +2778,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">"cercano, ubicación, historial, informes"</string>
+    <string name="keywords_location" msgid="6615286961552714686">"nearby, 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>
@@ -2828,8 +2841,14 @@
       <item quantity="other"><xliff:g id="ON_COUNT">%d</xliff:g> reglas automáticas activadas</item>
       <item quantity="one">1 regla automática activada</item>
     </plurals>
-    <string name="zen_mode_settings_title" msgid="842308776768942600">"Preferencias de No molestar"</string>
-    <string name="zen_mode_priority_settings_title" msgid="2623117023031824309">"Prioridad solo permite"</string>
+    <string name="zen_mode_settings_title" msgid="1066226840983908121">"No molestar"</string>
+    <string name="zen_mode_behavior_settings_title" msgid="1463303933529313969">"Comportamiento"</string>
+    <string name="zen_mode_behavior_allow_title" msgid="3845615648136218141">"Permitir sonidos/vibraciones de"</string>
+    <string name="zen_mode_behavior_no_sound" msgid="1219626004723208056">"Sin sonido"</string>
+    <string name="zen_mode_behavior_total_silence" msgid="6716603819806610626">"Sin sonido (silencio total)"</string>
+    <string name="zen_mode_behavior_no_sound_except" msgid="4968477585788243114">"Sin sonido excepto <xliff:g id="CATEGORIES">%1$s</xliff:g>"</string>
+    <!-- no translation found for zen_mode_behavior_alarms_only (2423480992071472963) -->
+    <skip />
     <string name="zen_mode_automation_settings_title" msgid="4228995740594063774">"Reglas automáticas"</string>
     <string name="zen_mode_automation_suggestion_title" msgid="5105443455143476201">"Definir reglas de No molestar"</string>
     <string name="zen_mode_automation_suggestion_summary" msgid="4732808039946935657">"Limitar sonido y vibración en algunos momentos"</string>
@@ -2853,9 +2872,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">"Opciones avanzadas"</string>
+    <string name="advanced_section_header" msgid="8833934850242546903">"Ajustes avanzados"</string>
     <string name="profile_section_header" msgid="2320848161066912001">"Notificaciones de trabajo"</string>
-    <string name="notification_badging_title" msgid="5938709971403474078">"Permitir puntos notificación"</string>
+    <string name="notification_badging_title" msgid="5938709971403474078">"Permitir burbujas de 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>
@@ -2864,20 +2883,22 @@
     <string name="lock_screen_notifications_interstitial_message" msgid="6164532459432182244">"¿Cómo quieres que se muestren las notificaciones cuando el dispositivo esté bloqueado?"</string>
     <string name="lock_screen_notifications_interstitial_title" msgid="1416589393106326972">"Notificaciones"</string>
     <string name="lock_screen_notifications_summary_show_profile" msgid="835870815661120772">"Mostrar todo (notificaciones de trabajo)"</string>
-    <string name="lock_screen_notifications_summary_hide_profile" msgid="256116258285695645">"Ocultar confidencial (notificaciones de trabajo)"</string>
+    <string name="lock_screen_notifications_summary_hide_profile" msgid="256116258285695645">"Ocultar sensible (notificaciones de trabajo)"</string>
     <string name="lock_screen_notifications_summary_disable_profile" msgid="4080720698960233358">"No mostrar ninguna notificación de trabajo"</string>
     <string name="lock_screen_notifications_interstitial_message_profile" msgid="8307705621027472346">"¿Cómo quieres que se muestren las notificaciones del perfil cuando el dispositivo esté bloqueado?"</string>
     <string name="lock_screen_notifications_interstitial_title_profile" msgid="3169806586032521333">"Notificaciones del perfil"</string>
     <string name="notifications_title" msgid="8086372779371204971">"Notificaciones"</string>
     <string name="app_notifications_title" msgid="5810577805218003760">"Notificaciones de aplicaciones"</string>
     <string name="notification_channel_title" msgid="2260666541030178452">"Categoría de notificaciones"</string>
+    <string name="notification_group_title" msgid="7180506440133859601">"Grupo de categoría de notificaciones"</string>
     <string name="notification_importance_title" msgid="848692592679312666">"Importancia"</string>
-    <string name="notification_importance_unspecified" msgid="2196023702875112081">"Permite que la aplicación decida"</string>
+    <string name="notification_importance_unspecified" msgid="6622173510486113958">"Permitir sonido"</string>
     <string name="notification_importance_blocked" msgid="7938180808339386300">"No mostrar notificaciones nunca"</string>
     <string name="notification_importance_min" msgid="5455049524984686275">"Sin sonido ni interrupción visual"</string>
     <string name="notification_importance_low" msgid="8881468429453766553">"Sin sonido"</string>
     <string name="notification_importance_default" msgid="5958338024601957516">"Emitir sonido"</string>
     <string name="notification_importance_high" msgid="2082429479238228527">"Emitir sonido y mostrar en pantalla"</string>
+    <string name="notification_importance_high_silent" msgid="2667033773703765252">"Mostrar en pantalla"</string>
     <string name="notification_importance_min_title" msgid="6974673091137544803">"Baja"</string>
     <string name="notification_importance_low_title" msgid="8131254047772814309">"Media"</string>
     <string name="notification_importance_default_title" msgid="9120383978536089489">"Alta"</string>
@@ -2913,15 +2934,20 @@
     <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 imagen en imagen"</string>
+    <string name="picture_in_picture_app_detail_switch" msgid="1131910667023738296">"Permitir pantalla en pantalla"</string>
     <string name="picture_in_picture_app_detail_summary" msgid="1264019085827708920">"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="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>
     <string name="app_notifications_off_desc" msgid="4882445501376722969">"Android bloquea las notificaciones de esta aplicación para que no aparezcan en el dispositivo"</string>
     <string name="channel_notifications_off_desc" msgid="5899225298718840635">"Android bloquea esta categoría de notificaciones para que no aparezcan en el dispositivo"</string>
+    <string name="channel_group_notifications_off_desc" msgid="1620950416247316370">"Android bloquea este grupo de notificaciones para que no aparezcan en el dispositivo"</string>
     <string name="notification_channels" msgid="5346841743182627500">"Categorías"</string>
     <string name="notification_channels_other" msgid="5645317113885788226">"Otros"</string>
+    <plurals name="notification_group_summary" formatted="false" msgid="3420621520561455358">
+      <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> categorías</item>
+      <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> categoría</item>
+    </plurals>
     <string name="no_channels" msgid="3077375508177744586">"Esta aplicación no ha publicado ninguna notificación"</string>
     <string name="app_settings_link" msgid="8894946007543660906">"Ajustes adicionales de la aplicación"</string>
     <string name="app_notification_listing_summary_zero" msgid="6482582965081108108">"Activado para todas las aplicaciones"</string>
@@ -2998,12 +3024,14 @@
     <string name="zen_mode_from_starred" msgid="2678345811950997027">"Solo de contactos destacados"</string>
     <string name="zen_mode_from_none" msgid="8219706639954614136">"Ninguno"</string>
     <string name="zen_mode_alarms" msgid="2165302777886552926">"Alarmas"</string>
+    <!-- no translation found for zen_mode_media_system_other (8900209390529859777) -->
+    <skip />
     <string name="zen_mode_reminders" msgid="5458502056440485730">"Recordatorios"</string>
     <string name="zen_mode_events" msgid="7914446030988618264">"Eventos"</string>
     <string name="zen_mode_all_callers" msgid="584186167367236922">"Todas las llamadas"</string>
     <string name="zen_mode_selected_callers" msgid="3127598874060615742">"Contactos seleccionados"</string>
     <string name="zen_mode_repeat_callers" msgid="5019521886428322131">"Llamadas repetidas"</string>
-    <string name="zen_mode_repeat_callers_summary" msgid="7192713032364140137">"Permitir llamadas que procedan de la misma persona si no han pasado más de <xliff:g id="MINUTES">%d</xliff:g> minutos desde su primera llamada"</string>
+    <string name="zen_mode_repeat_callers_summary" msgid="239685342222975733">"Permitir llamadas que procedan de la misma persona si no han pasado más de <xliff:g id="MINUTES">%d</xliff:g> minutos desde su primera llamada"</string>
     <string name="zen_mode_when" msgid="2767193283311106373">"Activar automáticamente"</string>
     <string name="zen_mode_when_never" msgid="8809494351918405602">"Nunca"</string>
     <string name="zen_mode_when_every_night" msgid="3122486110091921009">"Todas las noches"</string>
@@ -3032,6 +3060,7 @@
     <string name="zen_mode_screen_off_visual_interruptions" msgid="4850792880144382633">"Con la pantalla desactivada"</string>
     <string name="zen_mode_no_visual_interruptions" msgid="8742776003822778472">"Con la pantalla activada o desactivada"</string>
     <string name="notification_app_settings_button" msgid="6685640230371477485">"Ajustes de notificaciones"</string>
+    <string name="suggestion_button_text" msgid="3275010948381252006">"Aceptar"</string>
     <string name="device_feedback" msgid="3238056036766293294">"Enviar sugerencias sobre el dispositivo"</string>
     <string name="restr_pin_enter_admin_pin" msgid="1085834515677448072">"Introducir el PIN del administrador"</string>
     <string name="switch_on_text" msgid="1124106706920572386">"Activado"</string>
@@ -3051,7 +3080,7 @@
     <string name="encryption_interstitial_message_pattern" msgid="7081249914068568570">"Para proteger aún más tu dispositivo, haz que solicite el patrón antes de iniciarse. El dispositivo no puede recibir llamadas, mensajes ni notificaciones (incluidas alarmas) hasta que no se inicia. \n\nEsto es útil para proteger tus datos si pierdes el dispositivo o te lo roban. ¿Pedir patrón al iniciar el dispositivo?"</string>
     <string name="encryption_interstitial_message_password" msgid="7796567133897436443">"Para proteger aún más tu dispositivo, haz que solicite la contraseña antes de iniciarse. El dispositivo no puede recibir llamadas, mensajes ni notificaciones (incluidas alarmas) hasta que no se inicia. \n\nEsto es útil para proteger tus datos si pierdes el dispositivo o te lo roban. ¿Pedir contraseña al iniciar el dispositivo?"</string>
     <string name="encryption_interstitial_message_pin_for_fingerprint" msgid="4550632760119547492">"Además de utilizar la huella digital para desbloquear el dispositivo, puedes protegerlo aún más si haces que solicite tu PIN antes de iniciarse. El dispositivo no puede recibir llamadas, mensajes ni notificaciones (incluidas alarmas) hasta que no se inicia.\n\nEsto es útil para proteger tus datos si pierdes el dispositivo o te lo roban. ¿Pedir PIN al iniciar el dispositivo?"</string>
-    <string name="encryption_interstitial_message_pattern_for_fingerprint" msgid="932184823193006087">"Además de utilizar la huella digital para desbloquear el dispositivo, puedes protegerlo aún más si haces que solicite el patrón antes de iniciarse. El dispositivo no puede recibir llamadas, mensajes ni notificaciones (incluidas alarmas) hasta que no se inicia.\n\nEsto es útil para proteger tus datos si pierdes el dispositivo o te lo roban. ¿Pedir patrón al iniciar el dispositivo?"</string>
+    <string name="encryption_interstitial_message_pattern_for_fingerprint" msgid="932184823193006087">"Además de utilizar la huella digital para desbloquear el dispositivo, puedes protegerlo aún más si haces que solicite el patrón antes de iniciarse. El dispositivo no puede recibir llamadas, mensajes ni notificaciones (incluidas alarmas) hasta que no se inicia.\n\nEsto es útil para proteger tus datos si pierdes el dispositivo o te lo roban. ¿Quieres que se te pida el patrón al iniciar el dispositivo?"</string>
     <string name="encryption_interstitial_message_password_for_fingerprint" msgid="5560954719370251702">"Además de utilizar tu huella digital para desbloquear el dispositivo, puedes protegerlo aún más configurándolo para que solicite una contraseña antes de que se inicie. Hasta entonces, no podrás recibir llamadas, mensajes ni notificaciones, incluidas las alarmas.\n\nEsto permite proteger los datos en dispositivos perdidos o robados. ¿Quieres que el dispositivo pida la contraseña para iniciarse?"</string>
     <string name="encryption_interstitial_yes" msgid="4439509435889513411">"Sí"</string>
     <string name="encryption_interstitial_no" msgid="8935031349097025137">"No"</string>
@@ -3115,7 +3144,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">"Opciones avanzadas"</string>
+    <string name="advanced_apps" msgid="4812975097124803873">"Ajustes avanzados"</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>
@@ -3182,12 +3211,12 @@
     <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 la batería no disponible"</string>
+    <string name="high_power_system" msgid="7362862974428225301">"Optimización de 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="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">"Ajustes de batería"</string>
+    <string name="battery_power_management" msgid="5571519699679107523">"Gestión de la 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>
@@ -3216,6 +3245,7 @@
     <string name="usb_summary_file_transfers" msgid="6435943692610175111">"Transferir archivos"</string>
     <string name="usb_summary_photo_transfers" msgid="8440204169576585250">"Transferir fotos (PTP)"</string>
     <string name="usb_summary_MIDI" msgid="5687906612187885908">"Utilizar el dispositivo como MIDI"</string>
+    <string name="sms_mirroring_pref" msgid="6475043279147376031">"Mirroring de SMS"</string>
     <string name="background_check_pref" msgid="7550258400138010979">"comprobación de uso en segundo plano"</string>
     <string name="background_check_title" msgid="4534254315824525593">"Acceso completo en segundo plano"</string>
     <string name="assist_access_context_title" msgid="2269032346698890257">"Usar texto de la pantalla"</string>
@@ -3272,7 +3302,7 @@
     <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="app_permission_summary_allowed" msgid="1505409933012886711">"Permitida"</string>
-    <string name="app_permission_summary_not_allowed" msgid="2592617058101882802">"No permitida"</string>
+    <string name="app_permission_summary_not_allowed" msgid="2592617058101882802">"No permitido"</string>
     <string name="keywords_install_other_apps" msgid="761078076051006558">"instalar aplicaciones fuentes desconocidas"</string>
     <string name="write_settings" msgid="4797457275727195681">"Modificar ajustes del sistema"</string>
     <string name="keywords_write_settings" msgid="6415597272561105138">"escribir, modificar, ajustes del sistema"</string>
@@ -3282,7 +3312,7 @@
     <string name="write_settings_title" msgid="4232152481902542284">"Puede modificar los ajustes del sistema"</string>
     <string name="write_system_settings" msgid="3482913590601096763">"Modificar ajustes del sistema"</string>
     <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="permit_write_settings" msgid="658555006453212691">"Permitir que se modifiquen ajustes del 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>
@@ -3317,8 +3347,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">"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="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="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>
@@ -3377,9 +3407,12 @@
     <string name="color_temperature" msgid="2070126836910615605">"Temperatura de colores fríos"</string>
     <string name="color_temperature_desc" msgid="4793729830226404052">"Utilizar colores de pantalla más fríos"</string>
     <string name="color_temperature_toast" msgid="4974218172133854827">"Para aplicar el cambio de color, apaga la pantalla"</string>
-    <string name="telephony_monitor_toast" msgid="7003764250271195384">"Para aplicar el cambio al monitor de telefonía, reinicia el dispositivo"</string>
+    <string name="connectivity_monitor_switch" msgid="9059759348648583421">"Monitor de conectividad"</string>
+    <string name="connectivity_monitor_switch_summary" msgid="2828658652378866401">"ConnectivityMonitor recopilará los registros al detectar un problema de conexión y mostrará una notificación al usuario para registrar un error"</string>
+    <string name="connectivity_monitor_toast" msgid="5551859612881173028">"Para aplicar el cambio al monitor de conectividad, reinicia el dispositivo"</string>
     <string name="camera_hal_hdrplus_switch" msgid="8377365197105267466">"Cámara HAL HDR+"</string>
     <string name="camera_hal_hdrplus_toast" msgid="2063703797270055299">"Para aplicar el cambio a la cámara HAL HDR+, reinicia el dispositivo"</string>
+    <string name="camera_laser_sensor_switch" msgid="8913588990743234440">"Sensor láser de la cámara"</string>
     <string name="ota_disable_automatic_update" msgid="2319639631655915050">"Actualizaciones del sistema automáticas"</string>
     <string name="usage" msgid="2977875522080448986">"Uso"</string>
     <string name="cellular_data_usage" msgid="2155683719898158203">"Uso de datos móviles"</string>
@@ -3405,7 +3438,7 @@
     <string name="data_warning" msgid="209133958008062117">"Advertencia de datos"</string>
     <string name="set_data_limit" msgid="2901526323210516923">"Establecer límite de datos"</string>
     <string name="data_limit" msgid="1885406964934590552">"Límite de datos"</string>
-    <string name="data_usage_template" msgid="392191945602400904">"<xliff:g id="ID_1">%1$s</xliff:g> usados entre el <xliff:g id="ID_2">%2$s</xliff:g>"</string>
+    <string name="data_usage_template" msgid="2923744765873163859">"Usados: <xliff:g id="ID_1">%1$s</xliff:g> (<xliff:g id="ID_2">%2$s</xliff:g>)"</string>
     <string name="configure" msgid="1029654422228677273">"Configurar"</string>
     <string name="data_usage_other_apps" msgid="3272872663517382050">"Otras aplicaciones incluidas en el uso"</string>
     <plurals name="data_saver_unrestricted_summary" formatted="false" msgid="2635267833484232703">
@@ -3417,15 +3450,15 @@
     <string name="restrict_background_blacklisted" msgid="3995443391711013068">"Las datos en segundo plano están desactivadas"</string>
     <string name="data_saver_on" msgid="6774217590237934709">"Activado"</string>
     <string name="data_saver_off" msgid="6892309031162738794">"Desactivado"</string>
-    <string name="unrestricted_app_title" msgid="4465437191723332066">"Uso de datos sin restricción"</string>
+    <string name="unrestricted_app_title" msgid="4465437191723332066">"Uso no restringido de datos"</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 inicio"</string>
+    <string name="home_app" msgid="4066188520886810030">"Aplicación de página principal"</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ñade otra huella digital"</string>
+    <string name="suggestion_additional_fingerprints" msgid="2214281455363797037">"Añadir 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>
@@ -3474,7 +3507,7 @@
     <string name="button_confirm_convert_fbe" msgid="7101855374850373091">"Borrar y convertir"</string>
     <string name="reset_shortcut_manager_throttling" msgid="6495066467198668994">"Restablecer límite de frecuencia de ShortcutManager"</string>
     <string name="reset_shortcut_manager_throttling_complete" msgid="1826770872063707900">"Se ha restablecido el límite de frecuencia de ShortcutManager"</string>
-    <string name="notification_suggestion_title" msgid="4506524937307816475">"Controlar notificac. en pantalla bloqueo"</string>
+    <string name="notification_suggestion_title" msgid="387052719462473500">"Controlar los datos que aparecen en la pantalla de bloqueo"</string>
     <string name="notification_suggestion_summary" msgid="8521159741445416875">"Mostrar u ocultar contenido de las notificaciones"</string>
     <string name="page_tab_title_summary" msgid="4070309266374993258">"Todo"</string>
     <string name="page_tab_title_support" msgid="8483187649355540109">"Ayuda y consejos"</string>
@@ -3482,7 +3515,7 @@
     <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>
     <string name="premium_sms_access" msgid="4660047004791638305">"Acceso a SMS premium"</string>
-    <string name="bluetooth_disabled" msgid="2456198532288640046">"Invisible para otros dispositivos"</string>
+    <string name="bluetooth_disabled" msgid="6244000672828617410">"Desactivado"</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>
     <string name="demo_mode" msgid="2798762752209330277">"Modo de demostración de IU del sistema"</string>
@@ -3535,7 +3568,7 @@
     <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">"Administrar almacenamiento"</string>
+    <string name="automatic_storage_manager_settings" msgid="7819434542155181607">"Gestionar 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>
@@ -3561,10 +3594,10 @@
     <string name="ambient_display_title" product="device" msgid="3423781975742145894">"Tocar el dispositivo dos veces para comprobar notificaciones"</string>
     <string name="ambient_display_summary" msgid="525662960806416373">"Toca la pantalla dos veces para ver la hora, los iconos de notificación y otra información."</string>
     <string name="ambient_display_suggestion_summary" msgid="5987443721392571847">"Consulta notificaciones cuando la pantalla esté apagada"</string>
-    <string name="ambient_display_pickup_title" product="default" msgid="818688002837687268">"Levantar el teléfono para comprobarlo"</string>
+    <string name="ambient_display_pickup_title" product="default" msgid="818688002837687268">"Levantar el teléfono para consultarlo"</string>
     <string name="ambient_display_pickup_title" product="tablet" msgid="4455864282995698097">"Levantar el tablet para comprobar las notificaciones"</string>
     <string name="ambient_display_pickup_title" product="device" msgid="5380534405773531175">"Levantar el dispositivo para comprobar las notificaciones"</string>
-    <string name="ambient_display_pickup_summary" product="default" msgid="4567020486787561873">"Coge el teléfono para ver la hora, los iconos de notificación y otra información."</string>
+    <string name="ambient_display_pickup_summary" product="default" msgid="4567020486787561873">"Coger el teléfono para ver la hora, los iconos de notificación y otra información"</string>
     <string name="ambient_display_pickup_summary" product="tablet" msgid="5435283849947236648">"Coge el tablet para ver la hora, los iconos de notificación y otra información."</string>
     <string name="ambient_display_pickup_summary" product="device" msgid="8256669101643381568">"Coge el dispositivo para consultar la hora, iconos de notificación y otra información."</string>
     <string name="ambient_display_pickup_suggestion_summary" msgid="7014700589991761035">"Consulta notificaciones cuando la pantalla esté apagada"</string>
@@ -3584,7 +3617,7 @@
     <string name="web_action_enable_title" msgid="4051513950976670853">"Aplicaciones instantáneas"</string>
     <string name="web_action_enable_summary" msgid="3108127559723396382">"Abre enlaces en aplicaciones aunque no estén instaladas"</string>
     <string name="web_action_section_title" msgid="7364647086538399136">"Aplicaciones instantáneas"</string>
-    <string name="instant_apps_account" msgid="1433620209791992528">"Cuenta de aplicaciones instantáneas"</string>
+    <string name="instant_apps_settings" msgid="8827777916518348213">"Preferencias de Aplicaciones Instantáneas"</string>
     <string name="domain_url_section_title" msgid="7046835219056428883">"Aplicaciones instaladas"</string>
     <string name="automatic_storage_manager_activation_warning" msgid="6353100011690933254">"El Administrador de Almacenamiento gestiona ahora el almacenamiento"</string>
     <string name="account_for_section_header" msgid="5356566418548737121">"Cuentas de <xliff:g id="USER_NAME">%1$s</xliff:g>"</string>
@@ -3631,7 +3664,9 @@
     <string name="enterprise_privacy_always_on_vpn_personal" msgid="9217774730260037434">"Se ha activado el modo de VPN siempre activada en tu perfil personal"</string>
     <string name="enterprise_privacy_always_on_vpn_work" msgid="7244472958208315814">"Se ha activado el modo de VPN siempre activada en tu perfil de trabajo"</string>
     <string name="enterprise_privacy_global_http_proxy" msgid="7936664553416257333">"Se ha definido el proxy HTTP global"</string>
-    <string name="enterprise_privacy_ca_certs" msgid="5885892204903688909">"Credenciales de confianza"</string>
+    <string name="enterprise_privacy_ca_certs_device" msgid="2019652712782510262">"Credenciales de confianza"</string>
+    <string name="enterprise_privacy_ca_certs_personal" msgid="2279084820904076599">"Credenciales de confianza en tu perfil personal"</string>
+    <string name="enterprise_privacy_ca_certs_work" msgid="6187377647815301809">"Credenciales de confianza en tu perfil de trabajo"</string>
     <plurals name="enterprise_privacy_number_ca_certs" formatted="false" msgid="526375234629534165">
       <item quantity="other">Como mínimo, <xliff:g id="COUNT_1">%d</xliff:g> certificados de CA</item>
       <item quantity="one">Como mínimo, <xliff:g id="COUNT_0">%d</xliff:g> certificado de CA</item>
@@ -3690,10 +3725,12 @@
     <string name="storage_manager_indicator_on" msgid="8625551710194584733">"Activado"</string>
     <string name="install_type_instant" msgid="3174425974536078647">"Aplicación instantánea"</string>
     <string name="automatic_storage_manager_deactivation_warning" msgid="5605210730828410482">"¿Desactivar el administrador de almacenamiento?"</string>
-    <string name="storage_movies_tv" msgid="5498394447562086890">"Aplicaciones de películas y TV"</string>
+    <string name="storage_movies_tv" msgid="5498394447562086890">"Apps de cine y TV"</string>
     <string name="carrier_provisioning" msgid="4398683675591893169">"Información de servicios del operador"</string>
     <string name="trigger_carrier_provisioning" msgid="3434865918009286187">"Activar servicios del operador"</string>
     <string name="new_device_suggestion_title" msgid="698847081680980774">"¿Cuáles son las fascinantes novedades?"</string>
-    <string name="new_device_suggestion_summary" msgid="7172709269203435870">"Consulta las 5 funciones principales"</string>
+    <string name="new_device_suggestion_summary" product="default" msgid="206396571522515855">"Descubre tu nuevo teléfono"</string>
+    <string name="new_device_suggestion_summary" product="tablet" msgid="393751455688210956">"Descubre tu nuevo tablet"</string>
+    <string name="new_device_suggestion_summary" product="device" msgid="2939870049868336652">"Descubre tu nuevo dispositivo"</string>
     <string name="disabled_low_ram_device" msgid="3751578499721173344">"Esta función no está disponible en este dispositivo"</string>
 </resources>
diff --git a/res/values-et/arrays.xml b/res/values-et/arrays.xml
index fdba453..e06cc3f 100644
--- a/res/values-et/arrays.xml
+++ b/res/values-et/arrays.xml
@@ -100,8 +100,6 @@
     <!-- no translation found for wifi_security_no_eap:0 (2084555984818107151) -->
     <!-- no translation found for wifi_security_no_eap:1 (397579322683471524) -->
     <!-- no translation found for wifi_security_no_eap:2 (1968820975358150484) -->
-    <!-- no translation found for wifi_ap_security:0 (5251664683198623324) -->
-    <!-- no translation found for wifi_ap_security:1 (7989073072260294673) -->
   <string-array name="wifi_eap_method">
     <item msgid="1160193392455075561">"PEAP"</item>
     <item msgid="7981731051382306293">"TLS"</item>
@@ -240,7 +238,7 @@
     <item msgid="4979188868761515915">"üldine asukoht"</item>
     <item msgid="5789673140227507995">"täpne asukoht"</item>
     <item msgid="1061584358377390581">"GPS"</item>
-    <item msgid="5387405117297558954">"vibratsioon"</item>
+    <item msgid="5387405117297558954">"vibreerimine"</item>
     <item msgid="3434165993711230924">"kontaktide lugemine"</item>
     <item msgid="616161687718081936">"kontaktide muutmine"</item>
     <item msgid="7638002295329050091">"kõnelogi lugemine"</item>
@@ -307,7 +305,7 @@
     <item msgid="6602854600289714121">"Asukoht"</item>
     <item msgid="8677040780775113033">"Asukoht"</item>
     <item msgid="1660743989948992916">"Asukoht"</item>
-    <item msgid="8791172739860195290">"Vibratsioon"</item>
+    <item msgid="8791172739860195290">"Vibreerimine"</item>
     <item msgid="383413555642128046">"Kontaktide lugemine"</item>
     <item msgid="3654594895269697313">"Kontaktide muutmine"</item>
     <item msgid="7928393476362362538">"Kõnelogi lugemine"</item>
@@ -341,7 +339,7 @@
     <item msgid="5660213838861789350">"Hääle helitugevus"</item>
     <item msgid="7983336752371254444">"Helina helitugevus"</item>
     <item msgid="7878027809189330917">"Meedia helitugevus"</item>
-    <item msgid="7260546305036218513">"Alarmi helitugevus"</item>
+    <item msgid="7260546305036218513">"Äratuse helitugevus"</item>
     <item msgid="9103719301075748925">"Märguande helitugevus"</item>
     <item msgid="7025966722295861512">"Bluetoothi helitugevus"</item>
     <item msgid="4665183401128289653">"Hoia ärkvel"</item>
@@ -476,6 +474,6 @@
   <string-array name="automatic_storage_management_days">
     <item msgid="687318592238852312">"Üle 30 päeva vana"</item>
     <item msgid="2900554746706302178">"Üle 60 päeva vana"</item>
-    <item msgid="5692284879054004388">"Üle 90 päeva vana"</item>
+    <item msgid="5692284879054004388">"Üle 90 päeva vanad"</item>
   </string-array>
 </resources>
diff --git a/res/values-et/strings.xml b/res/values-et/strings.xml
index 123dbda..7a364c9 100644
--- a/res/values-et/strings.xml
+++ b/res/values-et/strings.xml
@@ -166,7 +166,7 @@
     <string name="bluetooth_map_acceptance_dialog_text" msgid="8712508202081143737">"%1$s soovib saada juurdepääsu sõnumitele. Kas anda seadmele %2$s juurdepääs?"</string>
     <string name="bluetooth_sap_request" msgid="2669762224045354417">"Juurdepääsutaotlus SIM-kaardile"</string>
     <string name="bluetooth_sap_acceptance_dialog_text" msgid="4414253873553608690">"Seade <xliff:g id="DEVICE_NAME_0">%1$s</xliff:g> soovib juurdepääsu teie SIM-kaardile. Kui annate juurdepääsu SIM-kaardile, keelatakse seadmes ühenduse ajaks andmesideühendus. Juurdepääsu andmine seadmele <xliff:g id="DEVICE_NAME_1">%2$s?</xliff:g>"</string>
-    <string name="bluetooth_device_name_summary" msgid="4757990010751789977">"Teistele seadmetele nähtav seadmena „<xliff:g id="DEVICE_NAME">^1</xliff:g>”"</string>
+    <string name="bluetooth_device_name_summary" msgid="522235742194965734">"Teistele seadmetele nähtav seadmena „<xliff:g id="DEVICE_NAME">^1</xliff:g>”"</string>
     <string name="bluetooth_paired_device_title" msgid="8638994696317952019">"Teie seadmed"</string>
     <string name="bluetooth_pairing_page_title" msgid="7712127387361962608">"Uue seadme sidumine"</string>
     <string name="date_and_time" msgid="9062980487860757694">"Kuupäev ja kellaaeg"</string>
@@ -312,6 +312,8 @@
     <string name="zone_auto" msgid="334783869352026648">"Automaatne ajavöönd"</string>
     <string name="zone_auto_summaryOn" msgid="6142830927278458314">"Kasuta võrgu pakutud ajavööndit"</string>
     <string name="zone_auto_summaryOff" msgid="2597745783162041390">"Kasuta võrgu pakutud ajavööndit"</string>
+    <string name="date_time_24hour_auto" msgid="2117383168985653422">"Automaatne 24‑tunnine vorming"</string>
+    <string name="date_time_24hour_auto_summary" msgid="6351812925651480277">"Kasuta lokaadi vaikeseadet"</string>
     <string name="date_time_24hour_title" msgid="3203537578602803850">"24-tunnine vorming"</string>
     <string name="date_time_24hour" msgid="1193032284921000063">"24-tunnise vormingu kasutamine"</string>
     <string name="date_time_set_time_title" msgid="6296795651349047016">"Aeg"</string>
@@ -334,7 +336,7 @@
     <string name="security_enable_widgets_disabled_summary" msgid="6392489775303464905">"Administraatori keelatud"</string>
     <string name="owner_info_settings_summary" msgid="7472393443779227052">"Puudub"</string>
     <string name="owner_info_settings_status" msgid="120407527726476378">"<xliff:g id="COUNT_0">%1$d</xliff:g>/<xliff:g id="COUNT_1">%2$d</xliff:g>"</string>
-    <string name="owner_info_settings_edit_text_hint" msgid="7591869574491036360">"Nt Joe\' Android."</string>
+    <string name="owner_info_settings_edit_text_hint" msgid="7591869574491036360">"Nt Martini Android."</string>
     <string name="user_info_settings_title" msgid="1195015434996724736">"Kasutajateave"</string>
     <string name="show_profile_info_on_lockscreen_label" msgid="2741208907263877990">"Kuva lukustusekraanil profiili teave"</string>
     <string name="profile_info_settings_title" msgid="3518603215935346604">"Profiili teave"</string>
@@ -372,6 +374,9 @@
     <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="1961957425135180242">"Järgmine"</string>
+    <string name="setup_fingerprint_enroll_skip_title" msgid="362050541117362034">"Kas jätta sõrmejälg vahele?"</string>
+    <string name="setup_fingerprint_enroll_skip_after_adding_lock_text" msgid="958990414356204763">"Sõrmejälje seadistamiseks kulub vaid paar minutit. Kui selle vahele jätate, saab sõrmejälje hiljem lisada menüüs Seaded."</string>
+    <string name="lock_screen_intro_skip_title" msgid="4988210105913705679">"Kas jätta ekraanilukk vahele?"</string>
     <string name="lock_screen_intro_skip_dialog_text_frp" product="tablet" msgid="1581834104051243425">"Seadme kaitsefunktsioone ei lülitata sisse. Te ei saa tahvelarvuti kaotsimineku, varguse või lähtestamise puhul teistel selle kasutamist takistada."</string>
     <string name="lock_screen_intro_skip_dialog_text_frp" product="device" msgid="4629503416877189572">"Seadme kaitsefunktsioone ei lülitata sisse. Te ei saa seadme kaotsimineku, varguse või lähtestamise puhul teistel selle kasutamist takistada."</string>
     <string name="lock_screen_intro_skip_dialog_text_frp" product="default" msgid="2423428240245737909">"Seadme kaitsefunktsioone ei lülitata sisse. Te ei saa telefoni kaotsimineku, varguse või lähtestamise puhul teistel selle kasutamist takistada."</string>
@@ -387,8 +392,8 @@
     <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="2068961812439460133">"Puudutage andurit"</string>
-    <string name="security_settings_fingerprint_enroll_start_message" msgid="3909929328942564524">"Asetage oma sõrm andurile ja tõstke see üles, kui tunnete vibratsiooni"</string>
-    <string name="security_settings_fingerprint_enroll_repeat_title" msgid="2819679722403209778">"Tõstke, siis puudutage uuesti"</string>
+    <string name="security_settings_fingerprint_enroll_start_message" msgid="3909929328942564524">"Asetage oma sõrm andurile ja kui tunnete värinat, siis tõstke see üles"</string>
+    <string name="security_settings_fingerprint_enroll_repeat_title" msgid="2819679722403209778">"Tõstke, seejärel puudutage uuesti"</string>
     <string name="security_settings_fingerprint_enroll_repeat_message" msgid="6158989350522518586">"Tõstke sõrme, et lisada sõrmejälje eri osad"</string>
     <string name="security_settings_fingerprint_enroll_finish_title" msgid="7567276170287972230">"Sõrmejälg on lisatud"</string>
     <string name="security_settings_fingerprint_enroll_finish_message" msgid="4796715961273420536">"Kui näete seda ikooni, kasutage tuvastamiseks või ostude kinnitamiseks oma sõrmejälge."</string>
@@ -399,7 +404,7 @@
     <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="2989019978041986175">"Puud. telefoni tagaküljel asuvat andurit. Kasut. oma nimetissõrme."</string>
-    <string name="security_settings_fingerprint_enroll_error_dialog_title" msgid="3618021988442639280">"Registreerumist ei lõpetatud"</string>
+    <string name="security_settings_fingerprint_enroll_error_dialog_title" msgid="3618021988442639280">"Registreerimist ei lõpetatud"</string>
     <string name="security_settings_fingerprint_enroll_error_timeout_dialog_message" msgid="2942551158278899627">"Sõrmejälje registreerimisaeg lõppes. Proovige uuesti."</string>
     <string name="security_settings_fingerprint_enroll_error_generic_dialog_message" msgid="3624760637222239293">"Sõrmejälje registreerimine ei toiminud. Proovige uuesti või kasutage teist sõrme."</string>
     <string name="fingerprint_enroll_button_add" msgid="6317978977419045463">"Lisa veel üks"</string>
@@ -457,7 +462,7 @@
     <string name="setup_lock_settings_picker_title" product="tablet" msgid="90329443364067215">"Tahvelarvuti kaitsmine"</string>
     <string name="setup_lock_settings_picker_title" product="device" msgid="2399952075134938929">"Seadme kaitsmine"</string>
     <string name="setup_lock_settings_picker_title" product="default" msgid="1572244299605153324">"Telefoni kaitsmine"</string>
-    <string name="setup_lock_settings_picker_fingerprint_message" msgid="5585650064305600578">"Lisaturvalisuse jaoks seadistage varuekraanilukk."</string>
+    <string name="lock_settings_picker_fingerprint_added_security_message" msgid="5768002109707648463">"Lisaturvalisuse huvides seadistage varuekraanilukk."</string>
     <string name="setup_lock_settings_picker_message" product="tablet" msgid="8919671129189936210">"Aktiveerige seadme kaitsefunktsioonid, et teised ei saaks ilma teie loata tahvelarvutit kasutada. Valige kasutatav ekraanilukk."</string>
     <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>
@@ -588,6 +593,7 @@
     <string name="lockpassword_pin_no_sequential_digits" msgid="680765285206990584">"Kasvavad, kahanevad või korduvad numbrijadad on keelatud"</string>
     <string name="lockpassword_ok_label" msgid="313822574062553672">"OK"</string>
     <string name="lockpassword_cancel_label" msgid="8818529276331121899">"Tühista"</string>
+    <string name="lockpassword_clear_label" msgid="5724429464960458155">"Kustuta"</string>
     <string name="lockpattern_tutorial_cancel_label" msgid="6431583477570493261">"Tühista"</string>
     <string name="lockpattern_tutorial_continue_label" msgid="3559793618653400434">"Järgmine"</string>
     <string name="lock_setup" msgid="3355847066343753943">"Seadistamine on lõpetatud."</string>
@@ -751,7 +757,7 @@
     <string name="wifi_access_points" msgid="7053990007031968609">"WiFi-võrgud"</string>
     <string name="wifi_menu_wps_pbc" msgid="2668564692207863017">"WPS-nupp"</string>
     <string name="wifi_menu_more_options" msgid="2448097861752719396">"Rohkem valikuid"</string>
-    <string name="wifi_menu_wps_pin" msgid="6426448256268695933">"WPS-i PIN-koodi kirje"</string>
+    <string name="wifi_menu_wps_pin" msgid="6426448256268695933">"WPS-i PIN-koodi sisestus"</string>
     <string name="wifi_menu_p2p" msgid="7619851399250896797">"WiFi Direct"</string>
     <string name="wifi_menu_scan" msgid="1470911530412095868">"Skannimine"</string>
     <string name="wifi_menu_advanced" msgid="7522252991919573664">"Täpsemalt"</string>
@@ -781,6 +787,7 @@
     <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>
@@ -817,6 +824,8 @@
     <string name="wifi_wps_available_first_item" msgid="4422547079984583502">"WPS on saadaval"</string>
     <string name="wifi_wps_available_second_item" msgid="8427520131718215301">" WPS on saadaval"</string>
     <string name="wifi_wps_nfc_enter_password" msgid="2288214226916117159">"Sisestage võrgu parool"</string>
+    <string name="wifi_carrier_connect" msgid="8174696557882299911">"Operaatori WiFi-võrk"</string>
+    <string name="wifi_carrier_content" msgid="4634077285415851933">"Ühendage operaatori <xliff:g id="NAME">%1%s</xliff:g> kaudu"</string>
     <string name="wifi_scan_always_turnon_message" msgid="203123538572122989">"Täpsema asukoha ja muude toimingute jaoks tahab rakendus <xliff:g id="APP_NAME">%1$s</xliff:g> võrkude skannimise sisse lülitada, isegi kui WiFi on välja lülitatud.\n\nKas lubada see kõigi rakenduste jaoks, mis skannida tahavad?"</string>
     <string name="wifi_scan_always_turnoff_message" msgid="5538901671131941043">"Väljalülitamiseks avage ületäitemenüüs valik Täpsem."</string>
     <string name="wifi_scan_always_confirm_allow" msgid="5355973075896817232">"Luba"</string>
@@ -834,6 +843,7 @@
     <string name="wifi_connect" msgid="1076622875777072845">"Ühenda"</string>
     <string name="wifi_failed_connect_message" msgid="8491902558970292871">"Võrguga ühenduse loomine ebaõnnestus"</string>
     <string name="wifi_forget" msgid="8168174695608386644">"Unusta"</string>
+    <string name="wifi_modify" msgid="6100248070440710782">"Muuda"</string>
     <string name="wifi_failed_forget_message" msgid="1348172929201654986">"Võrgu unustamine ebaõnnestus"</string>
     <string name="wifi_save" msgid="3331121567988522826">"Salvesta"</string>
     <string name="wifi_failed_save_message" msgid="6650004874143815692">"Võrgu säilitamine ebaõnnestus"</string>
@@ -846,6 +856,7 @@
     <string name="wifi_advanced_titlebar" msgid="4485841401774142908">"Täpsemad WiFi-seaded"</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_title" msgid="3471132676909349382">"Võrguteave"</string>
     <string name="wifi_details_subnet_mask" msgid="6720279144174924410">"Alamvõrgu mask"</string>
     <string name="wifi_details_dns" msgid="8648826607751830768">"DNS"</string>
     <string name="wifi_details_ipv6_address_header" msgid="6734119149106422148">"IPv6-aadressid"</string>
@@ -878,27 +889,25 @@
     <string name="wifi_p2p_cancel_connect_title" msgid="255267538099324413">"Kas tühistada kutse?"</string>
     <string name="wifi_p2p_cancel_connect_message" msgid="7477756213423749402">"Kas soovite tühistada kutse kasutajaga <xliff:g id="PEER_NAME">%1$s</xliff:g> ühenduse loomiseks?"</string>
     <string name="wifi_p2p_delete_group_message" msgid="834559380069647086">"Kas unustada see rühm?"</string>
-    <string name="wifi_tether_checkbox_text" msgid="1847167643625779136">"Mobiilne WiFi-kuumkoht"</string>
-    <string name="wifi_hotspot_checkbox_text" msgid="7763495093333664887">"WiFi-leviala"</string>
+    <string name="wifi_hotspot_checkbox_text" msgid="7763495093333664887">"WiFi-kuumkoht"</string>
     <string name="wifi_hotspot_off_subtext" msgid="5466126533609394170">"Interneti-ühendust ega sisu teiste seadmetega ei jagata"</string>
-    <string name="wifi_hotspot_tethering_on_subtext" product="tablet" msgid="5752490509369962007">"Tahvelarvuti Interneti-ühendust jagatakse leviala kaudu"</string>
-    <string name="wifi_hotspot_tethering_on_subtext" product="default" msgid="6461075246164300670">"Telefoni Interneti-ühendust jagatakse leviala kaudu"</string>
+    <string name="wifi_hotspot_tethering_on_subtext" product="tablet" msgid="5752490509369962007">"Tahvelarvuti Interneti-ühendust jagatakse kuumkoha kaudu"</string>
+    <string name="wifi_hotspot_tethering_on_subtext" product="default" msgid="6461075246164300670">"Telefoni Interneti-ühendust jagatakse kuumkoha kaudu"</string>
     <string name="wifi_hotspot_on_local_only_subtext" msgid="2068110388011294735">"Rakendus jagab sisu. Interneti-ühenduse jagamiseks lülitage leviala välja ja seejärel uuesti sisse"</string>
-    <string name="wifi_hotspot_name_title" msgid="1341735529132128887">"WiFi-võrgu nimi"</string>
+    <string name="wifi_hotspot_name_title" msgid="8237000746618636778">"Kuumkoha nimi"</string>
     <string name="wifi_hotspot_name_summary_connecting" msgid="3378299995508671967">"Võrgu <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g> sisselülitamine …"</string>
     <string name="wifi_hotspot_name_summary_connected" msgid="3888672084861445362">"Teised seadmed saavad luua ühenduse võrguga <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>"</string>
-    <string name="wifi_hotspot_password_title" msgid="1955592302902091281">"WiFi-võrgu parool"</string>
+    <string name="wifi_hotspot_password_title" msgid="8676859981917573801">"Kuumkoha parool"</string>
     <string name="wifi_hotspot_ap_band_title" msgid="1165801173359290681">"AP-riba"</string>
-    <string name="wifi_hotspot_footer_info_regular" msgid="1203489406068036455">"WiFi-võrgu loomiseks teiste seadmete jaoks kasutage leviala. Leviala kasutab Interneti pakkumiseks mobiilset andmesideühendust. Rakenduda võivad mobiilse andmeside tasud."</string>
-    <string name="wifi_hotspot_footer_info_local_only" msgid="857988412470694109">"Rakendused saavad leviala luua, et läheduses olevate seadmetega sisu jagada."</string>
-    <string name="wifi_tether_starting" msgid="1322237938998639724">"Leviala sisselülitamine ..."</string>
-    <string name="wifi_tether_stopping" msgid="4835852171686388107">"Leviala väljalülitamine ..."</string>
+    <string name="wifi_hotspot_footer_info_regular" msgid="1203489406068036455">"WiFi-võrgu loomiseks teiste seadmete jaoks kasutage kuumkohta. Kuumkoht kasutab Interneti pakkumiseks mobiilset andmesideühendust. Rakenduda võivad mobiilse andmeside tasud."</string>
+    <string name="wifi_hotspot_footer_info_local_only" msgid="857988412470694109">"Rakendused saavad luua kuumkoha, et jagada läheduses olevate seadmetega sisu."</string>
+    <string name="wifi_tether_starting" msgid="1322237938998639724">"Kuumkoha sisselülitamine ..."</string>
+    <string name="wifi_tether_stopping" msgid="4835852171686388107">"Kuumkoha väljalülitamine ..."</string>
     <string name="wifi_tether_enabled_subtext" msgid="7842111748046063857">"<xliff:g id="NETWORK_SSID">%1$s</xliff:g> on aktiivne"</string>
-    <string name="wifi_tether_failed_subtext" msgid="1484941858530919002">"Kaasaskantava WiFi-tugijaama viga"</string>
+    <string name="wifi_tether_failed_subtext" msgid="1484941858530919002">"Mobiilse WiFi-kuumkoha viga"</string>
     <string name="wifi_tether_configure_ap_text" msgid="7974681394041609308">"WiFi-kuumkoha seadistamine"</string>
-    <string name="wifi_hotspot_configure_ap_text" msgid="5478614731464220432">"WiFi-leviala seadistamine"</string>
-    <string name="wifi_hotspot_configure_ap_text_summary" msgid="5560680057727007011">"AndroidAP WPA2 PSK leviala"</string>
-    <string name="wifi_tether_configure_subtext" msgid="2050196439900426456">"<xliff:g id="NETWORK_SSID">%1$s</xliff:g> <xliff:g id="NETWORK_SECURITY">%2$s</xliff:g> leviala"</string>
+    <string name="wifi_hotspot_configure_ap_text" msgid="5478614731464220432">"WiFi-kuumkoha seadistamine"</string>
+    <string name="wifi_hotspot_configure_ap_text_summary" msgid="5560680057727007011">"AndroidAP WPA2 PSK-kuumkoht"</string>
     <string name="wifi_tether_configure_ssid_default" msgid="8467525402622138547">"AndroidHotspot"</string>
     <string name="wifi_calling_settings_title" msgid="4102921303993404577">"WiFi-kõned"</string>
     <string name="wifi_calling_suggestion_title" msgid="9008010480466359578">"Lülitage sisse WiFi-kõned"</string>
@@ -939,7 +948,7 @@
     <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="emergency_address_summary" msgid="3266760199681945746">"Aadress, mida hädaabiteenused kasutavad teie asukohana, kui teete WiFi kaudu hädaabikõne"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"Ekraan"</string>
     <string name="sound_settings" msgid="5534671337768745343">"Heli"</string>
     <string name="all_volume_title" msgid="4296957391257836961">"Helitugevused"</string>
@@ -964,7 +973,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">"Alarmid"</string>
+    <string name="volume_alarm_description" msgid="8322615148532654841">"Äratused"</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>
@@ -993,6 +1002,7 @@
     <string name="search_settings" msgid="1910951467596035063">"Otsing"</string>
     <string name="search_settings_summary" msgid="9205656546570654169">"Otsinguseadete ja -ajaloo haldamine"</string>
     <string name="search_settings_no_results" msgid="8799027492641230999">"Tulemusi ei ole"</string>
+    <string name="search_clear_history" msgid="4196658962573162457">"Kustuta ajalugu"</string>
     <string name="display_settings" msgid="7965901687241669598">"Ekraan"</string>
     <string name="accelerometer_title" msgid="7854608399547349157">"Pööra ekraani automaatselt"</string>
     <string name="color_mode_title" msgid="3159275920408338215">"Erksad värvid"</string>
@@ -1122,7 +1132,6 @@
     <string name="baseband_version" msgid="1848990160763524801">"Põhiribaversioon"</string>
     <string name="kernel_version" msgid="9192574954196167602">"Tuuma versioon"</string>
     <string name="build_number" msgid="3075795840572241758">"Järgunumber"</string>
-    <string name="selinux_status" msgid="6212165375172061672">"SELinuxi olek"</string>
     <string name="device_info_not_available" msgid="8062521887156825182">"Pole saadaval"</string>
     <string name="device_status_activity_title" msgid="1411201799384697904">"Olek"</string>
     <string name="device_status" msgid="607405385799807324">"Olek"</string>
@@ -1150,7 +1159,6 @@
     <string name="status_wifi_mac_address" msgid="2202206684020765378">"WiFi MAC-aadress"</string>
     <string name="status_bt_address" msgid="4195174192087439720">"Bluetoothi aadress"</string>
     <string name="status_serial_number" msgid="2257111183374628137">"Seerianumber"</string>
-    <string name="status_unavailable" msgid="7862009036663793314">"Pole saadaval"</string>
     <string name="status_up_time" msgid="7294859476816760399">"Talitlusaeg"</string>
     <string name="status_awake_time" msgid="2393949909051183652">"Sisselülitusaeg"</string>
     <string name="internal_memory" msgid="9129595691484260784">"Sisemälu"</string>
@@ -1326,6 +1334,7 @@
     <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>
     <string name="reset_dashboard_title" msgid="6254873816990678620">"Valikute lähtestamine"</string>
+    <string name="reset_dashboard_summary" msgid="4851012632493522755">"Võrgu, rakendused või seadme saab lähtestada"</string>
     <string name="reset_network_title" msgid="6166025966016873843">"Lähtesta WiFi, mobiilne andmeside ja Bluetooth"</string>
     <string name="reset_network_desc" msgid="5547979398298881406">"See lähtestab kõik võrguseaded, sh:\n\n"<li>"WiFi"</li>\n<li>"Mobiilne andmeside"</li>\n<li>"Bluetooth"</li></string>
     <string name="reset_network_button_text" msgid="2035676527471089853">"Lähtesta seaded"</string>
@@ -1334,17 +1343,14 @@
     <string name="reset_network_confirm_title" msgid="1759888886976962773">"Kas lähtestada?"</string>
     <string name="network_reset_not_available" msgid="7188610385577164676">"Võrguseadete lähtestamine pole selle kasutaja puhul saadaval"</string>
     <string name="reset_network_complete_toast" msgid="787829973559541880">"Võrguseaded lähtestati"</string>
-    <string name="master_clear_title" msgid="6617679904229218425">"Kustuta kõik andmed (tehaseseadetele lähtestamine)"</string>
-    <plurals name="master_clear_with_account_summary" formatted="false" msgid="5911377203778818712">
-      <item quantity="other"><xliff:g id="ACCOUNT_COUNT">%1$d</xliff:g> kontot lähtestatakse</item>
-      <item quantity="one">1 konto lähtestatakse</item>
-    </plurals>
-    <string name="master_clear_summary" msgid="6902443944660426951">"Sisemine salvestusruum ja kõik andmed lähtestatakse"</string>
+    <string name="master_clear_title" msgid="3531267871084279512">"Kustuta kõik andmed (tehaseseadetele lähtestamine)"</string>
     <string name="master_clear_desc" product="tablet" msgid="9146059417023157222">"See kustutab kõik andmed teie tahvelarvuti "<b>"sisemälust"</b>", sh:\n\n"<li>"teie Google\'i konto"</li>\n<li>"süsteemi ja rakenduste andmed ning seaded"</li>\n<li>"Allalaaditud rakendused"</li></string>
     <string name="master_clear_desc" product="default" msgid="4800386183314202571">"See kustutab kõik andmed telefoni "<b>"sisemälust"</b>", sh:\n\n"<li>"Teie Google\'i konto"</li>\n<li>"Süsteemi- ja rakenduste andmed ning seaded"</li>\n<li>"Allalaaditud rakendused"</li></string>
     <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"Olete praegu sisse logitud järgmistele kontodele:\n"</string>
     <string name="master_clear_other_users_present" product="default" msgid="5161423070702470742">\n\n"Seadmes on teisi kasutajaid.\n"</string>
     <string name="master_clear_desc_also_erases_external" msgid="1903185203791274237"><li>"Muusika"</li>\n<li>"Fotod"</li>\n<li>"Muud kasutajaandmed"</li></string>
+    <string name="master_clear_desc_also_erases_esim" msgid="312352697653096008"><li>"eSIM-kaardi operaatorid"</li></string>
+    <string name="master_clear_desc_no_cancel_mobile_plan" msgid="5460926449093211144">\n\n"See ei tühista teie mobiilsideteenuse paketti."</string>
     <string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="7744115866662613411">\n\n"Muusika, piltide ja muu kasutajateabe kustutamiseks tuleb tühjendada ka "<b>"USB-mäluseade"</b>"."</string>
     <string name="master_clear_desc_erase_external_storage" product="default" msgid="4801026652617377093">\n\n"Muusika, piltide ja muude kasutajaandmete kustutamiseks tuleb tühjendada ka "<b>"SD-kaart"</b>"."</string>
     <string name="erase_external_storage" product="nosdcard" msgid="969364037450286809">"Kustuta USB-mäluseade"</string>
@@ -1366,12 +1372,12 @@
     <string name="call_settings_title" msgid="5188713413939232801">"Kõneseaded"</string>
     <string name="call_settings_summary" msgid="7291195704801002886">"Seadista kõnepost, kõne edastamine, ootel kõne, helistaja ID"</string>
     <string name="tether_settings_title_usb" msgid="6688416425801386511">"USB jagamine"</string>
-    <string name="tether_settings_title_wifi" msgid="3277144155960302049">"Kantav tööpunkt"</string>
+    <string name="tether_settings_title_wifi" msgid="3277144155960302049">"Mobiilne kuumkoht"</string>
     <string name="tether_settings_title_bluetooth" msgid="355855408317564420">"Jagamine Bluetoothiga"</string>
     <string name="tether_settings_title_usb_bluetooth" msgid="5355828977109785001">"Jagamine"</string>
     <string name="tether_settings_title_all" msgid="3058586928118801157">"Kuumkoht ja jagamine"</string>
-    <string name="tether_settings_summary_hotspot_on_tether_on" msgid="930464462687425777">"Leviala on sees, jagamine"</string>
-    <string name="tether_settings_summary_hotspot_on_tether_off" msgid="3473671453891735907">"Leviala on sees"</string>
+    <string name="tether_settings_summary_hotspot_on_tether_on" msgid="930464462687425777">"Kuumkoht on sees, jagamine"</string>
+    <string name="tether_settings_summary_hotspot_on_tether_off" msgid="3473671453891735907">"Kuumkoht on sees"</string>
     <string name="tether_settings_summary_hotspot_off_tether_on" msgid="1618256180720077354">"Jagamine"</string>
     <string name="tether_settings_disabled_on_data_saver" msgid="1576908608463904152">"Kui andmeside mahu säästja on sisse lülitatud, siis ei saa jagada ega kasutada teisaldatavat leviala"</string>
     <string name="usb_title" msgid="7483344855356312510">"USB"</string>
@@ -1384,7 +1390,7 @@
     <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_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="1308462275952345985">"Mobiilse andmesideühenduse kaudu teistele seadmetele Interneti-ühenduse pakkumiseks kasutage leviala ja jagamist. Rakendused saavad samuti leviala luua, et läheduses olevate seadmetega sisu jagada."</string>
+    <string name="tethering_footer_info" msgid="1308462275952345985">"Mobiilse andmesideühenduse kaudu teistele seadmetele Interneti-ühenduse pakkumiseks kasutage kuumkohta ja jagamist. Rakendused saavad samuti luua kuumkoha, et jagada läheduses olevate seadmetega sisu."</string>
     <string name="tethering_help_button_text" msgid="656117495547173630">"Abi"</string>
     <string name="network_settings_title" msgid="2876509814832830757">"Mobiilsidevõrk"</string>
     <string name="manage_mobile_plan_title" msgid="7630170375010107744">"Mobiilipakett"</string>
@@ -1461,15 +1467,16 @@
     <string name="settings_safetylegal_activity_title" msgid="6901214628496951727">"Ohutusteave"</string>
     <string name="settings_safetylegal_activity_unreachable" msgid="250674109915859456">"Teil ei ole andmesideühendust. Selle teabe vaatamiseks praegu minge Interneti-ühendusega arvutis aadressile %s."</string>
     <string name="settings_safetylegal_activity_loading" msgid="8059022597639516348">"Laadimine ..."</string>
-    <string name="lockpassword_choose_your_password_header" msgid="8624900666929394990">"Valige parool"</string>
-    <string name="lockpassword_choose_your_password_header_for_fingerprint" msgid="6624409510609085450">"Sõrmejälje kasutamiseks määrake parool"</string>
-    <string name="lockpassword_choose_your_pattern_header" msgid="6949761069941694050">"Mustri valimine"</string>
-    <string name="lockpassword_choose_your_pattern_header_for_fingerprint" msgid="5901096361617543819">"Sõrmejälje kasutamiseks määrake muster"</string>
-    <string name="lockpassword_choose_your_pin_header" msgid="7598849519816138302">"Valige PIN-kood"</string>
-    <string name="lockpassword_choose_your_pin_header_for_fingerprint" msgid="765344692615917183">"Sõrmejälje kasutamiseks määrake PIN-kood"</string>
-    <string name="lockpassword_confirm_your_password_header" msgid="6308478184889846633">"Kinnitage parool"</string>
+    <string name="lockpassword_choose_your_screen_lock_header" msgid="3872462096767152394">"Ekraaniluku seadistamine"</string>
+    <string name="lockpassword_choose_your_password_message" msgid="1197569283524841412">"Turvalisuse huvides määrake parool"</string>
+    <string name="lockpassword_choose_your_password_header_for_fingerprint" msgid="2541818487015343503">"Sõrmejälje kasutamiseks määrake parool"</string>
+    <string name="lockpassword_choose_your_pattern_header_for_fingerprint" msgid="7709785406243556723">"Sõrmejälje kasutamiseks määrake muster"</string>
+    <string name="lockpassword_choose_your_pin_message" msgid="1875420718677275646">"Turvalisuse huvides määrake PIN-kood"</string>
+    <string name="lockpassword_choose_your_pin_header_for_fingerprint" msgid="1549639053195796674">"Sõrmejälje kasutamiseks määrake PIN-kood"</string>
+    <string name="lockpassword_choose_your_pattern_message" msgid="5986983400689720015">"Turvalisuse huvides määrake muster"</string>
+    <string name="lockpassword_confirm_your_password_header" msgid="1266027268220850931">"Sisestage oma parool uuesti"</string>
     <string name="lockpassword_confirm_your_pattern_header" msgid="7543433733032330821">"Mustri kinnitamine"</string>
-    <string name="lockpassword_confirm_your_pin_header" msgid="49038294648213197">"Kinnitage PIN-kood"</string>
+    <string name="lockpassword_confirm_your_pin_header" msgid="7744513791910572550">"Sisestage oma PIN-kood uuesti"</string>
     <string name="lockpassword_confirm_passwords_dont_match" msgid="5140892109439191415">"Paroolid ei ühti"</string>
     <string name="lockpassword_confirm_pins_dont_match" msgid="7226244811505606217">"PIN-koodid ei ühti"</string>
     <string name="lockpassword_choose_lock_generic_header" msgid="3811438094903786145">"Lukust avamise meetod"</string>
@@ -1488,6 +1495,12 @@
     <string name="lockpassword_strong_auth_required_work_pattern" msgid="3003781907040522053">"Lisaturvalisuse jaoks kasutage oma tööprofiili mustrit"</string>
     <string name="lockpassword_strong_auth_required_work_pin" msgid="3367491332598821552">"Lisaturvalisuse jaoks sisestage oma tööprofiili PIN-kood"</string>
     <string name="lockpassword_strong_auth_required_work_password" msgid="8159775129968582940">"Lisaturvalisuse jaoks sisestage oma tööprofiili parool"</string>
+    <string name="lockpassword_confirm_your_pattern_details_frp" msgid="6757336656791723193">"Teie telefon lähtestati tehaseseadetele. Selle telefoni kasutamiseks sisestage oma eelmine muster."</string>
+    <string name="lockpassword_confirm_your_pin_details_frp" msgid="826520613445990470">"Teie telefon lähtestati tehaseseadetele. Selle telefoni kasutamiseks sisestage oma eelmine PIN-kood."</string>
+    <string name="lockpassword_confirm_your_password_details_frp" msgid="8944081074615739040">"Teie telefon lähtestati tehaseseadetele. Selle telefoni kasutamiseks sisestage oma eelmine parool."</string>
+    <string name="lockpassword_confirm_your_pattern_header_frp" msgid="2898036091609128286">"Mustri kinnitamine"</string>
+    <string name="lockpassword_confirm_your_pin_header_frp" msgid="4141601774778898803">"PIN-koodi kinnitamine"</string>
+    <string name="lockpassword_confirm_your_password_header_frp" msgid="3762615419295360480">"Parooli kinnitamine"</string>
     <string name="lockpassword_invalid_pin" msgid="15588049067548470">"Vale PIN-kood"</string>
     <string name="lockpassword_invalid_password" msgid="4038507398784975200">"Vale parool"</string>
     <string name="lockpattern_need_to_unlock_wrong" msgid="1745247595356012176">"Vale muster"</string>
@@ -1537,7 +1550,6 @@
     <string name="install_applications_title" msgid="4987712352256508946">"Luba kõik rakenduse allikad"</string>
     <string name="recent_app_category_title" msgid="6673071268966003928">"Hiljuti avatud rakendused"</string>
     <string name="see_all_apps_title" msgid="1317153498074308438">"Kuva kõik <xliff:g id="COUNT">%1$d</xliff:g> rakendust"</string>
-    <string name="recent_app_summary" msgid="3366446669844932300">"<xliff:g id="TIME">^1</xliff:g> tagasi"</string>
     <string name="install_all_warning" product="tablet" msgid="8310489909586138165">"Teie tahvelarvuti ja isiklikud andmed on tundmatute rakenduste rünnakute suhtes haavatavamad. Sellest allikast rakendusi installides nõustute, et vastutate tahvelarvuti kahjude ja andmekao eest, mis võib selliste rakenduste kasutamisest tuleneda."</string>
     <string name="install_all_warning" product="default" msgid="1952257127370115988">"Teie telefon ja isiklikud andmed on tundmatute rakenduste rünnakute suhtes haavatavamad. Sellest allikast rakendusi installides nõustute, et vastutate telefoni kahjude ja andmekao eest, mis võib selliste rakenduste kasutamisest tuleneda."</string>
     <string name="advanced_settings" msgid="1777249286757067969">"Täpsemad seaded"</string>
@@ -1584,8 +1596,8 @@
     <string name="show_running_services" msgid="5736278767975544570">"Kuva töötavad teenused"</string>
     <string name="show_background_processes" msgid="2009840211972293429">"Kuva vahemällu salvestatud protsessid"</string>
     <string name="default_emergency_app" msgid="1951760659640369980">"Hädaabirakendus"</string>
-    <string name="reset_app_preferences" msgid="1321050641018356925">"Läht. rakend. eelistused"</string>
-    <string name="reset_app_preferences_title" msgid="6093179367325336662">"Läht. rakend. eelistused?"</string>
+    <string name="reset_app_preferences" msgid="1321050641018356925">"Lähtesta rakenduste eelistused"</string>
+    <string name="reset_app_preferences_title" msgid="6093179367325336662">"Lähtestada rakenduste eelistused?"</string>
     <string name="reset_app_preferences_desc" msgid="4822447731869201512">"See lähtestab kõik järgmised eelistused:\n\n "<li>"Keelatud rakendused"</li>\n" "<li>"Keelatud rakenduse märguanded"</li>\n" "<li>"Toimingute vaikerakendused"</li>\n" "<li>"Rakenduste taustaandmete piirangud"</li>\n" "<li>"Igasugused lubade piirangud"</li>\n\n" Rakenduse andmed säilivad."</string>
     <string name="reset_app_preferences_button" msgid="2559089511841281242">"Lähtesta rakendused"</string>
     <string name="manage_space_text" msgid="8852711522447794676">"Halda ruumi"</string>
@@ -1724,7 +1736,7 @@
     <string name="hardkeyboard_category" msgid="5957168411305769899">"Füüsilise klaviatuuri seaded"</string>
     <string name="auto_punctuate_summary" msgid="4372126865670574837">"Vajutage kaks korda tühikuklahvi, et sisestada „.”"</string>
     <string name="show_password" msgid="4837897357002495384">"Kuva paroolid"</string>
-    <string name="show_password_summary" msgid="3365397574784829969">"Sisestamisel kuvatakse korraks tähemärgid"</string>
+    <string name="show_password_summary" msgid="3365397574784829969">"Sisestamisel kuvatakse hetkeks tähemärgid"</string>
     <string name="spellchecker_security_warning" msgid="9060897418527708922">"See õigekirjakontrollija võib koguda kogu sisestatava teksti, sh isiklikud andmed (nt paroolid ja krediitkaardinumbrid). See pärineb rakendusest <xliff:g id="SPELLCHECKER_APPLICATION_NAME">%1$s</xliff:g>. Kas soovite seda õigekirjakontrolli kasutada?"</string>
     <string name="spellchecker_quick_settings" msgid="246728645150092058">"Seaded"</string>
     <string name="spellchecker_language" msgid="6041050114690541437">"Keel"</string>
@@ -1801,7 +1813,7 @@
     <string name="accessibility_settings_summary" msgid="981260486011624939">"Ekraanilugejad, ekraan, interaktsiooni juhtnupud"</string>
     <string name="vision_settings_title" msgid="4204111425716868288">"Nähtavuse seaded"</string>
     <string name="vision_settings_description" msgid="5679491180156408260">"Seadet saab kohandada vastavalt oma vajadustele. Neid juurdepääsetavuse funktsioone saab hiljem muuta menüüs Seaded."</string>
-    <string name="vision_settings_suggestion_title" msgid="917294957154878441">"Suurendage fondi suurust"</string>
+    <string name="vision_settings_suggestion_title" msgid="8058794060304707004">"Fondi suuruse muutmine"</string>
     <string name="screen_reader_category_title" msgid="7739154903913400641">"Ekraanilugejad"</string>
     <string name="audio_and_captions_category_title" msgid="3420727114421447524">"Heli ja ekraanil kuvatud tekst"</string>
     <string name="display_category_title" msgid="685461049938269166">"Ekraan"</string>
@@ -1838,7 +1850,6 @@
     <string name="accessibility_display_inversion_preference_subtitle" msgid="7052959202195368109">"Võib mõjutada toimivust"</string>
     <string name="accessibility_autoclick_preference_title" msgid="7014499339068449623">"Klikk pärast kursori peatumist"</string>
     <string name="accessibility_autoclick_delay_preference_title" msgid="3962261178385106006">"Viide enne klikki"</string>
-    <string name="preference_summary_default_combination" msgid="8532964268242666060">"<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">"SEES"</string>
     <string name="accessibility_summary_state_disabled" msgid="2241315620132005595">"VÄLJAS"</string>
     <string name="enable_quick_setting" msgid="2366999897816894536">"Kuva kiirseadetes"</string>
@@ -1957,12 +1968,14 @@
     <string name="background_activity_summary_on" msgid="649282072540085599">"Kui rakendust ei kasutata, võib see taustal töötada"</string>
     <string name="background_activity_summary_off" msgid="7666330699090632040">"Kui rakendust ei kasutata, on selle tegevus taustal piiratud"</string>
     <string name="background_activity_summary_disabled" msgid="3710669050484599847">"Rakendusel ei ole lubatud taustal töötada"</string>
+    <string name="background_activity_summary_whitelisted" msgid="7375400051141016808">"Rakendust ei saa akukasutuseks optimeerida"</string>
+    <string name="background_activity_warning_dialog_title" msgid="2216249969149568871">"Kas piirata taustal tegevust?"</string>
+    <string name="background_activity_warning_dialog_text" msgid="7049624449246121981">"Kui piirate rakenduse tegevust taustal, võib rakendus valesti käituda."</string>
     <string name="device_screen_usage" msgid="3386088035570409683">"Ekraani kasutus alates täislaadimisest"</string>
     <string name="device_screen_consumption" msgid="4607589286438986687">"Ekraani energiatarve"</string>
     <string name="device_cellular_network" msgid="4724773411762382950">"Mobiilivõrgustiku skannimine"</string>
-    <string name="power_last_full_charge_summary" msgid="532845389094620657">"<xliff:g id="TIME">^1</xliff:g> tagasi"</string>
-    <string name="power_usage_list_summary" msgid="6775339745194635000">"Rakenduste kasutus alates täislaadimisest (<xliff:g id="TIME">^1</xliff:g> tagasi)"</string>
-    <string name="power_usage_list_summary_device" msgid="7036566616386864302">"Seadme kasutus alates täislaadimisest (<xliff:g id="TIME">^1</xliff:g> tagasi)"</string>
+    <string name="power_usage_list_summary" msgid="6393929085382334341">"Rakenduse kasutus alates täislaadimisest (<xliff:g id="RELATIVE_TIME">^1</xliff:g>)"</string>
+    <string name="power_usage_list_summary_device" msgid="4461926045610455423">"Seadme kasutus alates täislaadimisest (<xliff:g id="RELATIVE_TIME">^1</xliff:g>)"</string>
     <string name="screen_usage_summary" msgid="6687403051423153550">"Ekraani töötamise aeg alates viimasest täislaadimisest"</string>
     <string name="device_usage_list_summary" msgid="5623036661468763251">"Seadme kasutus alates viimasest täislaadimisest"</string>
     <string name="battery_since_unplugged" msgid="338073389740738437">"Akukasutus alates lahutamisest"</string>
@@ -2208,14 +2221,14 @@
     <string name="credentials_unlock_hint" msgid="2301301378040499348">"Sisestage mandaadi salvestamise parool."</string>
     <string name="credentials_old_password" msgid="7553393815538684028">"Kehtiv parool:"</string>
     <string name="credentials_reset_hint" msgid="6297256880896133631">"Kas eemaldada kogu sisu?"</string>
-    <string name="credentials_password_too_short" msgid="7502749986405522663">"Parool peab olema vähemalt 8 tähemärki."</string>
     <string name="credentials_wrong_password" msgid="2541932597104054807">"Vale parool."</string>
     <string name="credentials_reset_warning" msgid="5320653011511797600">"Vale parool. Teil on veel üks võimalus, enne kui mandaatide mälu kustutatakse."</string>
     <string name="credentials_reset_warning_plural" msgid="6514085665301095279">"Vale parool. Teil on veel <xliff:g id="NUMBER">%1$d</xliff:g> võimalus(t) enne, kui mandaatide mälu kustutatakse."</string>
     <string name="credentials_erased" msgid="2907836028586342969">"Mandaatide mälu kustutatakse."</string>
     <string name="credentials_not_erased" msgid="7685932772284216097">"Mand. mälu ei saanud kustut."</string>
     <string name="credentials_enabled" msgid="7588607413349978930">"Mandaadi mälu on lubatud."</string>
-    <string name="credentials_configure_lock_screen_hint" msgid="6757119179588664966">"Enne mandaatide salvestusruumi kasutamist peate määrama lukustusekraani PIN-koodi või parooli."</string>
+    <string name="credentials_configure_lock_screen_hint" msgid="8058230497337529036">"Enne kui saab kasutada mandaatide salvestusruumi, peab teie seadmel olema turvaline lukustuskuva"</string>
+    <string name="credentials_configure_lock_screen_button" msgid="253239765216055321">"LUKU MÄÄRAMINE"</string>
     <string name="usage_access_title" msgid="332333405495457839">"Kasutusjuurdepääsuga rakend."</string>
     <string name="emergency_tone_title" msgid="1055954530111587114">"Hädaabitoon"</string>
     <string name="emergency_tone_summary" msgid="722259232924572153">"Määra käitumine hädaabikõne korral"</string>
@@ -2256,7 +2269,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 vibratsioon"</string>
+    <string name="sound_category_call_ringtone_vibrate_title" msgid="1543777228646645163">"Kõne helin ja vibreerimine"</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>
@@ -2335,8 +2348,6 @@
     <skip />
     <string name="cant_sync_dialog_title" msgid="2777238588398046285">"Ei saa käsitsi sünkroonida"</string>
     <string name="cant_sync_dialog_message" msgid="1938380442159016449">"Selle üksuse sünkroonimine on praegu keelatud. Seade muutmiseks lülitage ajutiselt sisse taustaandmed ja automaatne sünkroonimine."</string>
-    <string name="wimax_settings" msgid="2655139497028469039">"4G"</string>
-    <string name="status_wimax_mac_address" msgid="8390791848661413416">"4G MAC-aadress"</string>
     <string name="enter_password" msgid="8035706727471334122">"Androidi käivitamiseks sisestage parool"</string>
     <string name="enter_pin" msgid="5305333588093263790">"Androidi käivitamiseks sisestage oma PIN-kood"</string>
     <string name="enter_pattern" msgid="4187435713036808566">"Androidi käivitamiseks joonistage muster"</string>
@@ -2350,6 +2361,7 @@
     <string name="misc_files_selected_count" msgid="4647048020823912088">"valitud <xliff:g id="NUMBER">%1$d</xliff:g>/<xliff:g id="TOTAL">%2$d</xliff:g>"</string>
     <string name="misc_files_selected_count_bytes" msgid="2876232009069114352">"<xliff:g id="NUMBER">%1$s</xliff:g>/<xliff:g id="TOTAL">%2$s</xliff:g>"</string>
     <string name="select_all" msgid="1562774643280376715">"Vali kõik"</string>
+    <string name="data_plan_usage_manage_plans_button_text" msgid="8997761990902708162">"Pakettide haldamine"</string>
     <string name="data_usage_summary_title" msgid="3804110657238092929">"Andmekasutus"</string>
     <string name="data_usage_app_summary_title" msgid="4147258989837459172">"Rakenduse andmekasutus"</string>
     <string name="data_usage_accounting" msgid="7170028915873577387">"Operaatori andmemahuarvestus võib erineda seadme omast"</string>
@@ -2435,6 +2447,9 @@
     <string name="data_usage_metered_mobile" msgid="5423305619126978393">"Mobiilsidevõrgud"</string>
     <string name="data_usage_metered_wifi" msgid="1761738002328299714">"Mahupõhised WiFi-võrgud"</string>
     <string name="data_usage_metered_wifi_disabled" msgid="727808462375941567">"Mahupõhiste võrkude valimiseks lülitage WiFi sisse."</string>
+    <string name="data_usage_metered_auto" msgid="1262028400911918865">"Automaatne"</string>
+    <string name="data_usage_metered_yes" msgid="9217539611385225894">"Mahupõhine"</string>
+    <string name="data_usage_metered_no" msgid="4025232961929071789">"Pole mahupõhine"</string>
     <string name="data_usage_disclaimer" msgid="6887858149980673444">"Operaatori andmemahuarvestus võib erineda seadme omast"</string>
     <string name="cryptkeeper_emergency_call" msgid="198578731586097145">"Hädaabikõne"</string>
     <string name="cryptkeeper_return_to_call" msgid="5613717339452772491">"Tagasi kõne juurde"</string>
@@ -2526,9 +2541,6 @@
     <string name="backup_pw_set_button_text" msgid="2387480910044648795">"Määra varundusparool"</string>
     <string name="backup_pw_cancel_button_text" msgid="8845630125391744615">"Tühista"</string>
     <string name="additional_system_update_settings_list_item_title" msgid="214987609894661992">"Süsteemi lisavärskendused"</string>
-    <string name="selinux_status_disabled" msgid="924551035552323327">"Keelatud"</string>
-    <string name="selinux_status_permissive" msgid="6004965534713398778">"Lubav"</string>
-    <string name="selinux_status_enforcing" msgid="2252703756208463329">"Jõustumisel"</string>
     <string name="ssl_ca_cert_warning" msgid="2045866713601984673">"Võrku võidakse jälgida"</string>
     <string name="done_button" msgid="1991471253042622230">"Valmis"</string>
     <plurals name="ssl_ca_cert_dialog_title" formatted="false" msgid="7145092748045794650">
@@ -2570,10 +2582,10 @@
     <string name="user_add_user_title" msgid="2108112641783146007">"Kas lisada uus kasutaja?"</string>
     <string name="user_add_user_message_long" msgid="8562152293752222985">"Võite jagada seadet teiste inimestega, luues uusi kasutajaid. Igal kasutajal on oma ruum, mida saab kohandada rakenduste, taustapildi ja muuga. Kasutajad saavad kohandada ka seadme seadeid, näiteks WiFi-valikuid, mis mõjutavad kõiki kasutajaid.\n\nKui lisate uue kasutaja, siis peab ta seadistama oma ruumi.\n\nIga kasutaja saab värskendada rakendusi kõigi kasutajate jaoks."</string>
     <string name="user_add_user_message_short" msgid="1511354412249044381">"Kui lisate uue kasutaja, siis peab ta seadistama oma ruumi.\n\nIga kasutaja saab värskendada rakendusi kõigi kasutajate jaoks."</string>
-    <string name="user_setup_dialog_title" msgid="1765794166801864563">"Kas seadistada nüüd kasutaja?"</string>
+    <string name="user_setup_dialog_title" msgid="1765794166801864563">"Kas seadistada kasutaja kohe?"</string>
     <string name="user_setup_dialog_message" msgid="1004068621380867148">"Veenduge, et isik saaks seadet kasutada ja oma ruumi seadistada"</string>
     <string name="user_setup_profile_dialog_message" msgid="3896568553327558731">"Kas soovite kohe profiili seadistada?"</string>
-    <string name="user_setup_button_setup_now" msgid="3391388430158437629">"Seadista nüüd"</string>
+    <string name="user_setup_button_setup_now" msgid="3391388430158437629">"Seadista kohe"</string>
     <string name="user_setup_button_setup_later" msgid="3068729597269172401">"Mitte praegu"</string>
     <string name="user_cannot_manage_message" product="tablet" msgid="7153048188252553320">"Ainult tahvelarvuti omanik saab hallata kasutajaid."</string>
     <string name="user_cannot_manage_message" product="default" msgid="959315813089950649">"Ainult telefoni omanik saab hallata kasutajaid."</string>
@@ -2726,10 +2738,11 @@
       <item quantity="other">Kuva %d peidetud üksust</item>
       <item quantity="one">Kuva %d peidetud üksus</item>
     </plurals>
+    <string name="dashboard_suggestion_condition_footer_content_description" msgid="2898588191174845961">"Ahenda"</string>
     <string name="network_dashboard_title" msgid="4771589228992391573">"Võrk ja Internet"</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="network_dashboard_summary_hotspot" msgid="8494210248613254574">"kuumkoht"</string>
     <string name="connected_devices_dashboard_title" msgid="2355264951438890709">"Ühendatud seadmed"</string>
     <string name="connected_devices_dashboard_summary" msgid="2390582103384791904">"Bluetooth, Cast, NFC"</string>
     <string name="connected_devices_dashboard_no_nfc_summary" msgid="9106040742715366495">"Bluetooth, Cast"</string>
@@ -2800,7 +2813,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">"Alarmi helitugevus"</string>
+    <string name="alarm_volume_option_title" msgid="8219324421222242421">"Äratuse 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>
@@ -2821,20 +2834,26 @@
     <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">"Vibratsioon"</string>
+    <string name="emergency_tone_vibrate" msgid="8281126443204950847">"Vibreerimine"</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">
       <item quantity="other"><xliff:g id="ON_COUNT">%d</xliff:g> automaatset reeglit on sisse lülitatud</item>
       <item quantity="one">1 automaatne reegel on sisse lülitatud</item>
     </plurals>
-    <string name="zen_mode_settings_title" msgid="842308776768942600">"Režiimi Mitte segada eelistused"</string>
-    <string name="zen_mode_priority_settings_title" msgid="2623117023031824309">"Prioriteetne lubab ainult"</string>
+    <string name="zen_mode_settings_title" msgid="1066226840983908121">"Mitte segada"</string>
+    <string name="zen_mode_behavior_settings_title" msgid="1463303933529313969">"Käitumine"</string>
+    <string name="zen_mode_behavior_allow_title" msgid="3845615648136218141">"Luba heli ja vibreerimine:"</string>
+    <string name="zen_mode_behavior_no_sound" msgid="1219626004723208056">"Heli puudub"</string>
+    <string name="zen_mode_behavior_total_silence" msgid="6716603819806610626">"Heli puudub (täielik vaikus)"</string>
+    <string name="zen_mode_behavior_no_sound_except" msgid="4968477585788243114">"Heli puudub, v.a <xliff:g id="CATEGORIES">%1$s</xliff:g>"</string>
+    <!-- no translation found for zen_mode_behavior_alarms_only (2423480992071472963) -->
+    <skip />
     <string name="zen_mode_automation_settings_title" msgid="4228995740594063774">"Automaatsed reeglid"</string>
     <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 alarmid"</string>
+    <string name="zen_mode_option_alarms" msgid="5785372117288803600">"Ainult äratused"</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>
@@ -2869,15 +2888,17 @@
     <string name="lock_screen_notifications_interstitial_message_profile" msgid="8307705621027472346">"Kuidas tuleks profiili märguanded kuvada siis, kui seade on lukus?"</string>
     <string name="lock_screen_notifications_interstitial_title_profile" msgid="3169806586032521333">"Profiili märguanded"</string>
     <string name="notifications_title" msgid="8086372779371204971">"Märguanded"</string>
-    <string name="app_notifications_title" msgid="5810577805218003760">"Rakenduse märguanded"</string>
+    <string name="app_notifications_title" msgid="5810577805218003760">"Rakenduste märguanded"</string>
     <string name="notification_channel_title" msgid="2260666541030178452">"Märguande kategooria"</string>
+    <string name="notification_group_title" msgid="7180506440133859601">"Märguande kategooria grupp"</string>
     <string name="notification_importance_title" msgid="848692592679312666">"Tähtsus"</string>
-    <string name="notification_importance_unspecified" msgid="2196023702875112081">"Lubage rakendusel otsustada"</string>
+    <string name="notification_importance_unspecified" msgid="6622173510486113958">"Heli lubamine"</string>
     <string name="notification_importance_blocked" msgid="7938180808339386300">"Ära kunagi kuva märguandeid"</string>
     <string name="notification_importance_min" msgid="5455049524984686275">"Heli ja visuaalne katkestus puudub"</string>
     <string name="notification_importance_low" msgid="8881468429453766553">"Heli puudub"</string>
     <string name="notification_importance_default" msgid="5958338024601957516">"Esita heli"</string>
     <string name="notification_importance_high" msgid="2082429479238228527">"Esita heli ja tõsta märguanne esile"</string>
+    <string name="notification_importance_high_silent" msgid="2667033773703765252">"Tõsta märguanne esile"</string>
     <string name="notification_importance_min_title" msgid="6974673091137544803">"Madal"</string>
     <string name="notification_importance_low_title" msgid="8131254047772814309">"Keskmine"</string>
     <string name="notification_importance_default_title" msgid="9120383978536089489">"Kõrge"</string>
@@ -2920,8 +2941,13 @@
     <string name="loading_notification_apps" msgid="5031818677010335895">"Rakenduste laadimine ..."</string>
     <string name="app_notifications_off_desc" msgid="4882445501376722969">"Android blokeerib selle rakenduse märguannete kuvamise selles seadmes"</string>
     <string name="channel_notifications_off_desc" msgid="5899225298718840635">"Android blokeerib selle märguandekategooria kuvamise selles seadmes"</string>
+    <string name="channel_group_notifications_off_desc" msgid="1620950416247316370">"Android blokeerib selles seadmes selle märguandegrupi kuvamise"</string>
     <string name="notification_channels" msgid="5346841743182627500">"Kategooriad"</string>
     <string name="notification_channels_other" msgid="5645317113885788226">"Muu"</string>
+    <plurals name="notification_group_summary" formatted="false" msgid="3420621520561455358">
+      <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> kategooriat</item>
+      <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> kategooria</item>
+    </plurals>
     <string name="no_channels" msgid="3077375508177744586">"See rakendus pole postitanud ühtegi märguannet"</string>
     <string name="app_settings_link" msgid="8894946007543660906">"Lisaseaded rakenduses"</string>
     <string name="app_notification_listing_summary_zero" msgid="6482582965081108108">"Kõigi rakenduste jaoks sisse lülitatud"</string>
@@ -2942,7 +2968,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">"Lubage nendel märguannetel teid jätkuvalt katkestada, kui funktsioon Mitte segada on määratud valikule Ainult prioriteetsed"</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_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>
@@ -2955,7 +2981,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">"Reegli nime sisestamine"</string>
+    <string name="zen_mode_rule_name_hint" msgid="3781174510556433384">"Sisestage reegli nimi"</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>
@@ -2985,7 +3011,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 sellest olenevalt, kumb varem saabub."</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="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>
@@ -2997,13 +3023,15 @@
     <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">"Alarmid"</string>
+    <string name="zen_mode_alarms" msgid="2165302777886552926">"Äratused"</string>
+    <!-- no translation found for zen_mode_media_system_other (8900209390529859777) -->
+    <skip />
     <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>
     <string name="zen_mode_selected_callers" msgid="3127598874060615742">"Valitud helistajad"</string>
     <string name="zen_mode_repeat_callers" msgid="5019521886428322131">"Korduvad helistajad"</string>
-    <string name="zen_mode_repeat_callers_summary" msgid="7192713032364140137">"Kui sama inimene helistab <xliff:g id="MINUTES">%d</xliff:g> minuti jooksul teist korda, siis see lubatakse"</string>
+    <string name="zen_mode_repeat_callers_summary" msgid="239685342222975733">"Kui sama inimene helistab teile <xliff:g id="MINUTES">%d</xliff:g> minuti jooksul teist korda"</string>
     <string name="zen_mode_when" msgid="2767193283311106373">"Autom. sisselülitus"</string>
     <string name="zen_mode_when_never" msgid="8809494351918405602">"Mitte kunagi"</string>
     <string name="zen_mode_when_every_night" msgid="3122486110091921009">"Igal õhtul"</string>
@@ -3032,6 +3060,7 @@
     <string name="zen_mode_screen_off_visual_interruptions" msgid="4850792880144382633">"Kui ekraan on väljas"</string>
     <string name="zen_mode_no_visual_interruptions" msgid="8742776003822778472">"Kui ekraan on sees või väljas"</string>
     <string name="notification_app_settings_button" msgid="6685640230371477485">"Märguandeseaded"</string>
+    <string name="suggestion_button_text" msgid="3275010948381252006">"OK"</string>
     <string name="device_feedback" msgid="3238056036766293294">"Seadme kohta tagasiside saatmine"</string>
     <string name="restr_pin_enter_admin_pin" msgid="1085834515677448072">"Sisestage administraatori PIN-kood"</string>
     <string name="switch_on_text" msgid="1124106706920572386">"Sees"</string>
@@ -3071,7 +3100,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">"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_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_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>
@@ -3079,7 +3108,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">"Rakenduse märguanded"</string>
+    <string name="notifications_label" msgid="8543457911148619898">"Rakenduste 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>
@@ -3119,7 +3148,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, millel on rakenduse <xliff:g id="APPS">%1$s</xliff:g> luba"</string>
+    <string name="app_permissions_summary" msgid="5163974162150406324">"Rakendused, mis kasutavad: <xliff:g id="APPS">%1$s</xliff:g>"</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>
@@ -3203,19 +3232,20 @@
     <string name="usb_use_charging_only_desc" msgid="3066256793008540627">"Selle seadme laadimine"</string>
     <string name="usb_use_power_only" msgid="6426550616883919530">"Toite andmine"</string>
     <string name="usb_use_power_only_desc" msgid="3461232831015575152">"Laadige ühendatud seadet. Töötab ainult seadmetes, mis toetavad USB kaudu laadimist."</string>
-    <string name="usb_use_file_transfers" msgid="7409600791007250137">"Failide teisaldamine"</string>
-    <string name="usb_use_file_transfers_desc" msgid="4235764784331804488">"Failide teisaldamine teise seadmesse"</string>
+    <string name="usb_use_file_transfers" msgid="7409600791007250137">"Failide edastamine"</string>
+    <string name="usb_use_file_transfers_desc" msgid="4235764784331804488">"Failide edastamine teise seadmesse"</string>
     <string name="usb_use_photo_transfers" msgid="7794775645350330454">"Fotode edastamine (PTP)"</string>
     <string name="usb_use_photo_transfers_desc" msgid="2963034811151325996">"Fotode või failide edastamine, kui MTP-d ei toetata (PTP)"</string>
     <string name="usb_use_MIDI" msgid="870922185938298263">"Seadme kasutamine MIDI-na"</string>
     <string name="usb_use_MIDI_desc" msgid="8473936990076693175">"Kasutage seda seadet MIDI-na"</string>
-    <string name="usb_use" msgid="3256040963685055320">"Kasutage USB-d järgmiseks."</string>
+    <string name="usb_use" msgid="3256040963685055320">"USB kasutusviisid"</string>
     <string name="usb_pref" msgid="1400617804525116158">"USB"</string>
     <string name="usb_summary_charging_only" msgid="7544327009143659751">"Seadme laadimine"</string>
     <string name="usb_summary_power_only" msgid="3629517713817003738">"Toiteallikas"</string>
     <string name="usb_summary_file_transfers" msgid="6435943692610175111">"Failide edastamine"</string>
     <string name="usb_summary_photo_transfers" msgid="8440204169576585250">"Fotode edastamine (PTP)"</string>
     <string name="usb_summary_MIDI" msgid="5687906612187885908">"Seadme kasutamine MIDI-režiimis"</string>
+    <string name="sms_mirroring_pref" msgid="6475043279147376031">"SMS-ide peegeldamine"</string>
     <string name="background_check_pref" msgid="7550258400138010979">"Taustakontroll"</string>
     <string name="background_check_title" msgid="4534254315824525593">"Täielik juurdepääs taustale"</string>
     <string name="assist_access_context_title" msgid="2269032346698890257">"Ekraanil oleva teksti kasutamine"</string>
@@ -3282,7 +3312,7 @@
     <string name="write_settings_title" msgid="4232152481902542284">"Saab muuta süsteemiseadeid"</string>
     <string name="write_system_settings" msgid="3482913590601096763">"Süsteemiseadete muutmine"</string>
     <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="permit_write_settings" msgid="658555006453212691">"Luba süsteemiseadete muutmine"</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>
@@ -3345,8 +3375,8 @@
     <string name="condition_turn_on" msgid="9089876276117874591">"Lülita sisse"</string>
     <string name="condition_expand_show" msgid="608202020023489939">"Kuva"</string>
     <string name="condition_expand_hide" msgid="948507739223760667">"Peida"</string>
-    <string name="condition_hotspot_title" msgid="7778958849468560027">"Leviala on sees"</string>
-    <string name="condition_hotspot_summary" msgid="3433182779269409683">"Teisaldatav WiFi-leviala <xliff:g id="ID_1">%1$s</xliff:g> on aktiivne, WiFi on selles seadmes välja lülitatud."</string>
+    <string name="condition_hotspot_title" msgid="7778958849468560027">"Kuumkoht on sees"</string>
+    <string name="condition_hotspot_summary" msgid="3433182779269409683">"Teisaldatav WiFi-kuumkoht <xliff:g id="ID_1">%1$s</xliff:g> on aktiivne, WiFi on selles seadmes välja lülitatud."</string>
     <string name="condition_airplane_title" msgid="287356299107070503">"Lennurežiim on sees"</string>
     <string name="condition_airplane_summary" msgid="5561586417832393666">"WiFi, Bluetooth ja mobiilne andmeside on välja lülitatud. Te ei saa helistada ega Internetiga ühendust luua."</string>
     <string name="condition_zen_title" msgid="2679168532600816392">"Režiim Mitte segada on sees (<xliff:g id="ID_1">%1$s</xliff:g>)"</string>
@@ -3377,13 +3407,16 @@
     <string name="color_temperature" msgid="2070126836910615605">"Külm värvitemperatuur"</string>
     <string name="color_temperature_desc" msgid="4793729830226404052">"Kasutatakse külmemaid ekraanivärve"</string>
     <string name="color_temperature_toast" msgid="4974218172133854827">"Värvi muutmise rakendamiseks lülitage ekraan välja"</string>
-    <string name="telephony_monitor_toast" msgid="7003764250271195384">"Teenuse Telephony Monitor muudatuse rakendamiseks taaskäivitage seade"</string>
+    <string name="connectivity_monitor_switch" msgid="9059759348648583421">"Ühenduvusmonitor"</string>
+    <string name="connectivity_monitor_switch_summary" msgid="2828658652378866401">"Ühenduvusmonitor kogub ühenduvusprobleemide korral logisid ja esitab kasutajale märguande veaaruande esitamiseks"</string>
+    <string name="connectivity_monitor_toast" msgid="5551859612881173028">"Ühenduvusmonitori muudatuse rakendamiseks taaskäivitage seade"</string>
     <string name="camera_hal_hdrplus_switch" msgid="8377365197105267466">"Kaamera HAL HDR+"</string>
     <string name="camera_hal_hdrplus_toast" msgid="2063703797270055299">"Kaamera HAL HDR+ muudatuse rakendamiseks taaskäivitage seade"</string>
+    <string name="camera_laser_sensor_switch" msgid="8913588990743234440">"Kaamera laserandur"</string>
     <string name="ota_disable_automatic_update" msgid="2319639631655915050">"Automaatsed süsteemivärskendused"</string>
     <string name="usage" msgid="2977875522080448986">"Kasutus"</string>
     <string name="cellular_data_usage" msgid="2155683719898158203">"Mobiilse andmeside kasutus"</string>
-    <string name="wifi_data_usage" msgid="686754111095324306">"WiFi andmekasutus"</string>
+    <string name="wifi_data_usage" msgid="686754111095324306">"WiFi-andmekasutus"</string>
     <string name="ethernet_data_usage" msgid="5108764537574354616">"Etherneti andmekasutus"</string>
     <string name="wifi" msgid="1081550856200013637">"WiFi"</string>
     <string name="ethernet" msgid="6600095783781389720">"Ethernet"</string>
@@ -3405,7 +3438,7 @@
     <string name="data_warning" msgid="209133958008062117">"Andmemahu hoiatus"</string>
     <string name="set_data_limit" msgid="2901526323210516923">"Andmemahupiirangu määramine"</string>
     <string name="data_limit" msgid="1885406964934590552">"Andmemahu piirang"</string>
-    <string name="data_usage_template" msgid="392191945602400904">"<xliff:g id="ID_1">%1$s</xliff:g> on kasutatud vahemikus <xliff:g id="ID_2">%2$s</xliff:g>"</string>
+    <string name="data_usage_template" msgid="2923744765873163859">"Vahemikus <xliff:g id="ID_2">%2$s</xliff:g> on kasutatud <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="configure" msgid="1029654422228677273">"Seadistamine"</string>
     <string name="data_usage_other_apps" msgid="3272872663517382050">"Muud kasutusandmetesse kaasatud rakendused"</string>
     <plurals name="data_saver_unrestricted_summary" formatted="false" msgid="2635267833484232703">
@@ -3413,7 +3446,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="952796077540228711">"Piiramata andmed"</string>
+    <string name="unrestricted_data_saver" msgid="952796077540228711">"Piiramata andmeside"</string>
     <string name="restrict_background_blacklisted" msgid="3995443391711013068">"Taustaandmed on välja lülitatud"</string>
     <string name="data_saver_on" msgid="6774217590237934709">"Sees"</string>
     <string name="data_saver_off" msgid="6892309031162738794">"Väljas"</string>
@@ -3460,7 +3493,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">"vibratsioon"</string>
+    <string name="notification_log_details_vibrate" msgid="6890065466625335940">"vibreerimine"</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>
@@ -3474,7 +3507,7 @@
     <string name="button_confirm_convert_fbe" msgid="7101855374850373091">"Kustuta ja teisenda"</string>
     <string name="reset_shortcut_manager_throttling" msgid="6495066467198668994">"Teenuse ShortcutManager sageduse piiramise lähtestamine"</string>
     <string name="reset_shortcut_manager_throttling_complete" msgid="1826770872063707900">"Teenuse ShortcutManager sageduse piiramine lähtestati"</string>
-    <string name="notification_suggestion_title" msgid="4506524937307816475">"Lukustuskuva märguannete juhtimine"</string>
+    <string name="notification_suggestion_title" msgid="387052719462473500">"Kontrollige lukustuskuva teavet"</string>
     <string name="notification_suggestion_summary" msgid="8521159741445416875">"Märguande sisu kuvamine või peitmine"</string>
     <string name="page_tab_title_summary" msgid="4070309266374993258">"Kõik"</string>
     <string name="page_tab_title_support" msgid="8483187649355540109">"Tugi ja nõuanded"</string>
@@ -3482,7 +3515,7 @@
     <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>
     <string name="premium_sms_access" msgid="4660047004791638305">"Juurdepääs tasuliste SMS-ide saatmiseks"</string>
-    <string name="bluetooth_disabled" msgid="2456198532288640046">"Ei ole teiste seadmete jaoks nähtav"</string>
+    <string name="bluetooth_disabled" msgid="6244000672828617410">"Väljas"</string>
     <string name="bluetooth_connected_summary" msgid="7672528674593152862">"Ühendatud seadmega <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="bluetooth_connected_multiple_devices_summary" msgid="9173661896296663932">"Ühendatud mitme seadmega"</string>
     <string name="demo_mode" msgid="2798762752209330277">"Süsteemi kasutajaliidese demorežiim"</string>
@@ -3547,7 +3580,7 @@
     <string name="gesture_preference_summary" product="tablet" msgid="4717535378272065510">"Kiirliigutused tahvelarvuti juhtimiseks"</string>
     <string name="gesture_preference_summary" product="device" msgid="4205941452664950852">"Kiirliigutused seadme juhtimiseks"</string>
     <string name="double_tap_power_for_camera_title" msgid="64716226816032800">"Kaamera avamine"</string>
-    <string name="double_tap_power_for_camera_summary" msgid="242037150983277829">"Kaamera kiireks avamiseks vajutage toitenuppu kaks korda. See töötab igal ekraanil."</string>
+    <string name="double_tap_power_for_camera_summary" msgid="242037150983277829">"Kaamera kiireks avamiseks vajutage toitenuppu kaks korda. See töötab igast kuvast."</string>
     <string name="double_tap_power_for_camera_suggestion_title" msgid="6500405261202883589">"Kaamera kiiresti avamine"</string>
     <string name="double_tap_power_for_camera_suggestion_summary" msgid="7010153544554016996">"Vajutage kaamera avamiseks kaks korda toitenuppu"</string>
     <string name="double_twist_for_camera_mode_title" msgid="4877834147983530479">"Kaamera vahetamine"</string>
@@ -3584,7 +3617,7 @@
     <string name="web_action_enable_title" msgid="4051513950976670853">"Installimata avatavad rakendused"</string>
     <string name="web_action_enable_summary" msgid="3108127559723396382">"Lingid avatakse rakendustes isegi siis, kui need pole installitud"</string>
     <string name="web_action_section_title" msgid="7364647086538399136">"Installimata avatavad rakendused"</string>
-    <string name="instant_apps_account" msgid="1433620209791992528">"Installimata avatavate rakenduste konto"</string>
+    <string name="instant_apps_settings" msgid="8827777916518348213">"Installimata avatavate rakenduste eelistused"</string>
     <string name="domain_url_section_title" msgid="7046835219056428883">"Installitud rakendused"</string>
     <string name="automatic_storage_manager_activation_warning" msgid="6353100011690933254">"Teie salvestusruumi haldab nüüd salvestusruumi haldur"</string>
     <string name="account_for_section_header" msgid="5356566418548737121">"Kasutaja <xliff:g id="USER_NAME">%1$s</xliff:g> kontod"</string>
@@ -3631,7 +3664,9 @@
     <string name="enterprise_privacy_always_on_vpn_personal" msgid="9217774730260037434">"Alati sees VPN on teie isiklikul profiilil sisse lülitatud"</string>
     <string name="enterprise_privacy_always_on_vpn_work" msgid="7244472958208315814">"Alati sees VPN on teie tööprofiilil sisse lülitatud"</string>
     <string name="enterprise_privacy_global_http_proxy" msgid="7936664553416257333">"Üldine HTTP-puhverserver on seadistatud"</string>
-    <string name="enterprise_privacy_ca_certs" msgid="5885892204903688909">"Usaldusväärsed mandaadid"</string>
+    <string name="enterprise_privacy_ca_certs_device" msgid="2019652712782510262">"Usaldusväärsed mandaadid"</string>
+    <string name="enterprise_privacy_ca_certs_personal" msgid="2279084820904076599">"Usaldusväärsed mandaadid teie isiklikul profiilil"</string>
+    <string name="enterprise_privacy_ca_certs_work" msgid="6187377647815301809">"Usaldusväärsed mandaadid teie tööprofiilil"</string>
     <plurals name="enterprise_privacy_number_ca_certs" formatted="false" msgid="526375234629534165">
       <item quantity="other">Vähemalt <xliff:g id="COUNT_1">%d</xliff:g> CA-sertifikaati</item>
       <item quantity="one">Vähemalt <xliff:g id="COUNT_0">%d</xliff:g> CA-sertifikaat</item>
@@ -3694,6 +3729,8 @@
     <string name="carrier_provisioning" msgid="4398683675591893169">"Operaatori ettevalmistamise teave"</string>
     <string name="trigger_carrier_provisioning" msgid="3434865918009286187">"Operaatori ettevalmistamise päästik"</string>
     <string name="new_device_suggestion_title" msgid="698847081680980774">"Mis on uut ja põnevat?"</string>
-    <string name="new_device_suggestion_summary" msgid="7172709269203435870">"Vaadake viit populaarseimat funktsiooni"</string>
+    <string name="new_device_suggestion_summary" product="default" msgid="206396571522515855">"Tutvuge oma uue telefoniga"</string>
+    <string name="new_device_suggestion_summary" product="tablet" msgid="393751455688210956">"Tutvuge oma uue tahvelarvutiga"</string>
+    <string name="new_device_suggestion_summary" product="device" msgid="2939870049868336652">"Tutvuge oma uue seadmega"</string>
     <string name="disabled_low_ram_device" msgid="3751578499721173344">"Sellel seadmel pole see funktsioon saadaval"</string>
 </resources>
diff --git a/res/values-eu/arrays.xml b/res/values-eu/arrays.xml
index 8cf4ae8..b89700f 100644
--- a/res/values-eu/arrays.xml
+++ b/res/values-eu/arrays.xml
@@ -100,8 +100,6 @@
     <!-- no translation found for wifi_security_no_eap:0 (2084555984818107151) -->
     <!-- no translation found for wifi_security_no_eap:1 (397579322683471524) -->
     <!-- no translation found for wifi_security_no_eap:2 (1968820975358150484) -->
-    <!-- no translation found for wifi_ap_security:0 (5251664683198623324) -->
-    <!-- no translation found for wifi_ap_security:1 (7989073072260294673) -->
   <string-array name="wifi_eap_method">
     <item msgid="1160193392455075561">"PEAP"</item>
     <item msgid="7981731051382306293">"TLS"</item>
diff --git a/res/values-eu/strings.xml b/res/values-eu/strings.xml
index 546dccb..7dbba91 100644
--- a/res/values-eu/strings.xml
+++ b/res/values-eu/strings.xml
@@ -166,7 +166,7 @@
     <string name="bluetooth_map_acceptance_dialog_text" msgid="8712508202081143737">"%1$s gailuak zure mezuak atzitu nahi ditu. %2$s gailuari sarbidea eman?"</string>
     <string name="bluetooth_sap_request" msgid="2669762224045354417">"SIM txartelerako sarbide-eskaera"</string>
     <string name="bluetooth_sap_acceptance_dialog_text" msgid="4414253873553608690">"<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g> gailuak SIM txartela atzitu nahi du. SIM txartelerako sarbidea ematen badiozu, gailuaren datu-konexioa desgaituko da, txartelerako konexioak dirauen bitartean. Eman sarbidea <xliff:g id="DEVICE_NAME_1">%2$s?</xliff:g> gailuari"</string>
-    <string name="bluetooth_device_name_summary" msgid="4757990010751789977">"\"<xliff:g id="DEVICE_NAME">^1</xliff:g>\" gisa dago ikusgai beste gailuentzat"</string>
+    <string name="bluetooth_device_name_summary" msgid="522235742194965734">"\"<xliff:g id="DEVICE_NAME">^1</xliff:g>\" gisa dago ikusgai beste gailuetan"</string>
     <string name="bluetooth_paired_device_title" msgid="8638994696317952019">"Zure gailuak"</string>
     <string name="bluetooth_pairing_page_title" msgid="7712127387361962608">"Parekatu gailu batekin"</string>
     <string name="date_and_time" msgid="9062980487860757694">"Data eta ordua"</string>
@@ -312,6 +312,8 @@
     <string name="zone_auto" msgid="334783869352026648">"Ordu-zona automatikoa"</string>
     <string name="zone_auto_summaryOn" msgid="6142830927278458314">"Erabili sareak emandako ordu-zona"</string>
     <string name="zone_auto_summaryOff" msgid="2597745783162041390">"Erabili sareak emandako ordu-zona"</string>
+    <string name="date_time_24hour_auto" msgid="2117383168985653422">"24 orduko formatu automatikoa"</string>
+    <string name="date_time_24hour_auto_summary" msgid="6351812925651480277">"Erabili eskualdeko ezarpen lehenetsia"</string>
     <string name="date_time_24hour_title" msgid="3203537578602803850">"24 orduko formatua"</string>
     <string name="date_time_24hour" msgid="1193032284921000063">"Erabili 24 orduko formatua"</string>
     <string name="date_time_set_time_title" msgid="6296795651349047016">"Ordua"</string>
@@ -341,8 +343,7 @@
     <string name="Accounts_settings_title" msgid="1643879107901699406">"Kontuak"</string>
     <string name="location_settings_title" msgid="1369675479310751735">"Kokapena"</string>
     <string name="account_settings_title" msgid="626177544686329806">"Kontuak"</string>
-    <!-- no translation found for security_settings_title (4918904614964215087) -->
-    <skip />
+    <string name="security_settings_title" msgid="4918904614964215087">"Segurtasuna eta kokapena"</string>
     <string name="encryption_and_credential_settings_title" msgid="6514904533438791561">"Enkriptatzea eta kredentzialak"</string>
     <string name="encryption_and_credential_settings_summary" product="default" msgid="8721883002237981248">"Enkriptatuta dago telefonoa"</string>
     <string name="encryption_and_credential_settings_summary" product="tablet" msgid="7200428573872395685">"Enkriptatuta dago gailua"</string>
@@ -373,6 +374,9 @@
     <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="1961957425135180242">"Hurrengoa"</string>
+    <string name="setup_fingerprint_enroll_skip_title" msgid="362050541117362034">"Saltatu hatz-marka?"</string>
+    <string name="setup_fingerprint_enroll_skip_after_adding_lock_text" msgid="958990414356204763">"Minutu bat edo bi baino ez dituzu beharko hatz-marka konfiguratzeko. Urrats hau saltatuz gero, geroago ere gehi dezakezu hatz-marka ezarpenetan."</string>
+    <string name="lock_screen_intro_skip_title" msgid="4988210105913705679">"Pantailaren blokeoa saltatu?"</string>
     <string name="lock_screen_intro_skip_dialog_text_frp" product="tablet" msgid="1581834104051243425">"Ez dira aktibatuko gailuaren babes-eginbideak. Tableta galtzen baduzu, lapurtzen badizute edo berrezarri egiten bada, ezin izango duzu ekidin beste pertsona batzuek erabiltzea."</string>
     <string name="lock_screen_intro_skip_dialog_text_frp" product="device" msgid="4629503416877189572">"Ez dira aktibatuko gailuaren babes-eginbideak. Gailua galtzen baduzu, lapurtzen badizute edo berrezarri egiten bada, ezin izango duzu ekidin beste pertsona batzuek erabiltzea."</string>
     <string name="lock_screen_intro_skip_dialog_text_frp" product="default" msgid="2423428240245737909">"Ez dira aktibatuko gailuaren babes-eginbideak. Telefonoa galtzen baduzu, lapurtzen badizute edo berrezarri egiten bada, ezin izango duzu ekidin beste pertsona batzuek erabiltzea."</string>
@@ -458,7 +462,7 @@
     <string name="setup_lock_settings_picker_title" product="tablet" msgid="90329443364067215">"Babestu tableta"</string>
     <string name="setup_lock_settings_picker_title" product="device" msgid="2399952075134938929">"Babestu gailua"</string>
     <string name="setup_lock_settings_picker_title" product="default" msgid="1572244299605153324">"Babestu telefonoa"</string>
-    <string name="setup_lock_settings_picker_fingerprint_message" msgid="5585650064305600578">"Babestuago egoteko, konfiguratu pantaila blokeatzeko ordezko metodo bat."</string>
+    <string name="lock_settings_picker_fingerprint_added_security_message" msgid="5768002109707648463">"Babestuago egoteko, konfiguratu pantaila blokeatzeko ordezko metodo bat."</string>
     <string name="setup_lock_settings_picker_message" product="tablet" msgid="8919671129189936210">"Galarazi inork tableta baimenik gabe erabiltzea gailuaren babes-eginbideak aktibatuta. Aukeratu nola blokeatu nahi duzun pantaila."</string>
     <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>
@@ -500,29 +504,37 @@
     <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>
-    <!-- no translation found for unlock_disable_frp_warning_content_pattern_fingerprint (2986105377420905314) -->
-    <skip />
+    <string name="unlock_disable_frp_warning_content_pattern_fingerprint" msgid="2986105377420905314">"Eredua behar da gailua babesteko eginbideek funtziona dezaten.<xliff:g id="EMPTY_LINE">
+
+</xliff:g>Gordetako hatz-markak ere kendu egingo dira gailutik eta, haiek gabe, ezin izango duzu 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>
-    <!-- no translation found for unlock_disable_frp_warning_content_pin_fingerprint (3370462835533123695) -->
-    <skip />
+    <string name="unlock_disable_frp_warning_content_pin_fingerprint" msgid="3370462835533123695">"PIN kodea behar da gailua babesteko eginbideek funtziona dezaten.<xliff:g id="EMPTY_LINE">
+
+</xliff:g>Gordetako hatz-markak ere kendu egingo dira gailutik eta, haiek gabe, ezin izango duzu 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>
-    <!-- no translation found for unlock_disable_frp_warning_content_password_fingerprint (3595476296430536798) -->
-    <skip />
+    <string name="unlock_disable_frp_warning_content_password_fingerprint" msgid="3595476296430536798">"<xliff:g id="EMPTY_LINE">
+
+</xliff:g>"</string>
     <string name="unlock_disable_frp_warning_content_unknown" msgid="1550718040483548220">"Pantailaren blokeoa kodea behar da gailuaren babes-eginbideek funtziona dezaten."</string>
-    <!-- no translation found for unlock_disable_frp_warning_content_unknown_fingerprint (3679351662094349506) -->
-    <skip />
+    <string name="unlock_disable_frp_warning_content_unknown_fingerprint" msgid="3679351662094349506">"Pantaila blokeatzeko aukera bat gaituta eduki behar da gailua babesteko eginbideek funtziona dezaten.<xliff:g id="EMPTY_LINE">
+
+</xliff:g>Gordetako hatz-markak ere kendu egingo dira gailutik eta, haiek gabe, ezin izango duzu 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>
-    <!-- no translation found for unlock_disable_frp_warning_content_pattern_fingerprint_profile (6718155854303231675) -->
-    <skip />
+    <string name="unlock_disable_frp_warning_content_pattern_fingerprint_profile" msgid="6718155854303231675">"<xliff:g id="EMPTY_LINE">
+
+</xliff:g>"</string>
     <string name="unlock_disable_frp_warning_content_pin_profile" msgid="7790688070593867767">"PIN kodea behar da profila babesteko eginbideek funtziona dezaten."</string>
-    <!-- no translation found for unlock_disable_frp_warning_content_pin_fingerprint_profile (4209564603132870532) -->
-    <skip />
+    <string name="unlock_disable_frp_warning_content_pin_fingerprint_profile" msgid="4209564603132870532">"<xliff:g id="EMPTY_LINE">
+
+</xliff:g>"</string>
     <string name="unlock_disable_frp_warning_content_password_profile" msgid="7569285520567674461">"Pasahitza behar da profila babesteko eginbideek funtziona dezaten."</string>
-    <!-- no translation found for unlock_disable_frp_warning_content_password_fingerprint_profile (2994300676764706047) -->
-    <skip />
+    <string name="unlock_disable_frp_warning_content_password_fingerprint_profile" msgid="2994300676764706047">"Pasahitza behar da profila babesteko eginbideek funtziona dezaten.<xliff:g id="EMPTY_LINE">
+
+</xliff:g>Gordetako hatz-markak ere kendu egingo dira profiletik eta, haiek gabe, ezin izango duzu telefonoa desblokeatu, erosketarik baimendu edo aplikazioetan saioa hasi."</string>
     <string name="unlock_disable_frp_warning_content_unknown_profile" msgid="6984215718701688202">"Pantaila blokeatzeko aukera bat gaituta eduki behar da gailua babesteko eginbideek funtziona dezaten."</string>
-    <!-- no translation found for unlock_disable_frp_warning_content_unknown_fingerprint_profile (4994062501123299418) -->
-    <skip />
+    <string name="unlock_disable_frp_warning_content_unknown_fingerprint_profile" msgid="4994062501123299418">"<xliff:g id="EMPTY_LINE">
+
+</xliff:g>"</string>
     <string name="unlock_disable_frp_warning_ok" msgid="7075138677177748705">"Bai, kendu"</string>
     <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>
@@ -581,6 +593,7 @@
     <string name="lockpassword_pin_no_sequential_digits" msgid="680765285206990584">"Ezin da erabili goranzko, beheranzko edo errepikatutako digitu-sekuentziarik"</string>
     <string name="lockpassword_ok_label" msgid="313822574062553672">"Ados"</string>
     <string name="lockpassword_cancel_label" msgid="8818529276331121899">"Utzi"</string>
+    <string name="lockpassword_clear_label" msgid="5724429464960458155">"Garbitu"</string>
     <string name="lockpattern_tutorial_cancel_label" msgid="6431583477570493261">"Utzi"</string>
     <string name="lockpattern_tutorial_continue_label" msgid="3559793618653400434">"Hurrengoa"</string>
     <string name="lock_setup" msgid="3355847066343753943">"Konfigurazioa osatu da."</string>
@@ -629,7 +642,7 @@
     <string name="bluetooth_pairing_dialog_sharing_phonebook_title" msgid="7664141669886358618">"Agenda partekatu nahi dituzu?"</string>
     <string name="bluetooth_pairing_dialog_contants_request" msgid="5531109163573611348">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> gailuak zure kontaktuak eta dei-historia atzitu nahi ditu."</string>
     <string name="bluetooth_pairing_dialog_paring_request" msgid="8451248193517851958">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> gailuak Bluetooth bidez parekatu nahi du. Konektatuta dagoenean, zure kontaktuak eta deien historia atzitu ahal izango ditu."</string>
-    <string name="bluetooth_preference_paired_devices" msgid="1970524193086791964">"Bikotetutako gailuak"</string>
+    <string name="bluetooth_preference_paired_devices" msgid="1970524193086791964">"Parekatutako gailuak"</string>
     <string name="bluetooth_preference_found_devices" msgid="1647983835063249680">"Gailu erabilgarriak"</string>
     <string name="bluetooth_preference_no_found_devices" msgid="7594339669961811591">"Ez dago gailurik erabilgarri"</string>
     <string name="bluetooth_device_context_connect" msgid="3997659895003244941">"Konektatu"</string>
@@ -640,7 +653,7 @@
     <string name="bluetooth_device_context_connect_advanced" msgid="2643129703569788771">"Aukerak…"</string>
     <string name="bluetooth_menu_advanced" msgid="8572178316357220524">"Ezarpen aurreratuak"</string>
     <string name="bluetooth_advanced_titlebar" msgid="2142159726881547669">"Bluetooth ezarpen aurreratuak"</string>
-    <string name="bluetooth_empty_list_bluetooth_off" msgid="6351930724051893423">"Bluetooth eginbidea gaituta badago, inguruko Bluetooth gailuekin komunika daiteke gailua."</string>
+    <string name="bluetooth_empty_list_bluetooth_off" msgid="6351930724051893423">"Bluetooth aktibatuta badago, inguruko Bluetooth gailuekin komunika daiteke gailua."</string>
     <string name="ble_scan_notify_text" msgid="1295915006005700650">"Kokapenaren zehaztasuna hobetzeko, sistemaren aplikazioek eta zerbitzuek Bluetooth gailuak hautematen jarraituko dute. Hori aldatzeko, zoaz <xliff:g id="LINK_BEGIN_0">LINK_BEGIN</xliff:g>gailuak bilatzeko ezarpenetara<xliff:g id="LINK_END_1">LINK_END</xliff:g>."</string>
     <string name="bluetooth_connect_failed" msgid="4500234659813241053">"Ezin izan da konektatu. Saiatu berriro."</string>
     <string name="device_details_title" msgid="6576953269221085300">"Gailuaren xehetasunak"</string>
@@ -697,7 +710,7 @@
     <string name="android_beam_off_summary" msgid="4663095428454779138">"Desaktibatuta"</string>
     <string name="android_beam_disabled_summary" msgid="1737782116894793393">"Ez dago erabilgarri NFC desaktibatuta dagoelako"</string>
     <string name="android_beam_label" msgid="6257036050366775040">"Android Beam"</string>
-    <string name="android_beam_explained" msgid="1810540319385192758">"Eginbide hau aktibatzen baduzu, NFC bidez parteka dezakezu aplikazioen edukia NFC erabiltzen duten beste gailu batzuekin, gailuak bata besteari hurbilduta. Besteak beste, web-orriak, YouTube bideoak, kontaktuak eta beste hainbat gauza parteka ditzakezu.\n\nHori egiteko, hurbildu gailuak bata bestearengana (atzealdeak elkartu behar izan ohi dira), eta sakatu pantaila. Aplikazioak zehaztuko du partekatu beharrekoa zer den."</string>
+    <string name="android_beam_explained" msgid="1810540319385192758">"Eginbide hau aktibatzen baduzu, NFC bidez parteka dezakezu aplikazioen edukia NFC gaitasuna duten beste gailu batzuekin, gailuak bata bestearengana hurbilduta. Besteak beste, web-orriak, YouTube bideoak, kontaktuak eta beste hainbat gauza parteka ditzakezu.\n\nHori egiteko, hurbildu gailuak bata bestearengana (atzealdeak elkartu behar izan ohi dira), eta sakatu zure pantaila. Aplikazioak zehaztuko du partekatu beharrekoa zer den."</string>
     <string name="wifi_quick_toggle_title" msgid="8850161330437693895">"Wi-Fi"</string>
     <string name="wifi_quick_toggle_summary" msgid="2696547080481267642">"Aktibatu Wi-Fia"</string>
     <string name="wifi_settings" msgid="29722149822540994">"Wi-Fi"</string>
@@ -774,6 +787,7 @@
     <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,6 +824,8 @@
     <string name="wifi_wps_available_first_item" msgid="4422547079984583502">"WPSa erabilgarri"</string>
     <string name="wifi_wps_available_second_item" msgid="8427520131718215301">" (WPSa erabilgarri)"</string>
     <string name="wifi_wps_nfc_enter_password" msgid="2288214226916117159">"Idatzi sarearen pasahitza"</string>
+    <string name="wifi_carrier_connect" msgid="8174696557882299911">"Operadorearen Wi‑Fi sarea"</string>
+    <string name="wifi_carrier_content" msgid="4634077285415851933">"Konektatu <xliff:g id="NAME">%1%s</xliff:g> bidez"</string>
     <string name="wifi_scan_always_turnon_message" msgid="203123538572122989">"Kokapenaren zehaztasuna hobetzeko eta beste helburu batzuetarako, <xliff:g id="APP_NAME">%1$s</xliff:g> aplikazioak sare-bilaketa aktibatu nahi du, Wi-Fia desaktibatuta egonda ere.\n\nBilaketa egin nahi duten beste aplikazio guztiei ere baimendu nahi diezu?"</string>
     <string name="wifi_scan_always_turnoff_message" msgid="5538901671131941043">"Desaktibatzeko, joan menuko \"Ezarpen aurreratuak\" aukerara."</string>
     <string name="wifi_scan_always_confirm_allow" msgid="5355973075896817232">"Baimendu"</string>
@@ -827,6 +843,7 @@
     <string name="wifi_connect" msgid="1076622875777072845">"Konektatu"</string>
     <string name="wifi_failed_connect_message" msgid="8491902558970292871">"Ezin izan da sarera konektatu"</string>
     <string name="wifi_forget" msgid="8168174695608386644">"Ahaztu"</string>
+    <string name="wifi_modify" msgid="6100248070440710782">"Aldatu"</string>
     <string name="wifi_failed_forget_message" msgid="1348172929201654986">"Ezin izan da sarea ahaztu"</string>
     <string name="wifi_save" msgid="3331121567988522826">"Gorde"</string>
     <string name="wifi_failed_save_message" msgid="6650004874143815692">"Ezin izan da sarea gorde"</string>
@@ -839,6 +856,7 @@
     <string name="wifi_advanced_titlebar" msgid="4485841401774142908">"Wi-Fi ezarpen aurreratuak"</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_title" msgid="3471132676909349382">"Sareari buruzko informazioa"</string>
     <string name="wifi_details_subnet_mask" msgid="6720279144174924410">"Azpisarearen maskara"</string>
     <string name="wifi_details_dns" msgid="8648826607751830768">"DNS"</string>
     <string name="wifi_details_ipv6_address_header" msgid="6734119149106422148">"IPv6 helbideak"</string>
@@ -871,16 +889,15 @@
     <string name="wifi_p2p_cancel_connect_title" msgid="255267538099324413">"Gonbidapena bertan behera utzi nahi duzu?"</string>
     <string name="wifi_p2p_cancel_connect_message" msgid="7477756213423749402">"<xliff:g id="PEER_NAME">%1$s</xliff:g> gailura konektatzeko gonbidapena bertan behera utzi nahi duzu?"</string>
     <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_off_subtext" msgid="5466126533609394170">"Ez zara ari partekatzen Interneteko konexiorik ez edukirik beste gailuekin"</string>
     <string name="wifi_hotspot_tethering_on_subtext" product="tablet" msgid="5752490509369962007">"Tabletaren Interneteko konexioa partekatzen ari zara sare publiko bidez"</string>
     <string name="wifi_hotspot_tethering_on_subtext" product="default" msgid="6461075246164300670">"Telefonoaren Interneteko konexioa partekatzen ari zara sare publiko bidez"</string>
     <string name="wifi_hotspot_on_local_only_subtext" msgid="2068110388011294735">"Edukia partekatzen ari da aplikazioa. Interneteko konexioa partekatzeko, desaktibatu eta aktibatu berriro sare publikoa."</string>
-    <string name="wifi_hotspot_name_title" msgid="1341735529132128887">"Wi‑Fi sarearen izena"</string>
+    <string name="wifi_hotspot_name_title" msgid="8237000746618636778">"Sare publikoaren izena"</string>
     <string name="wifi_hotspot_name_summary_connecting" msgid="3378299995508671967">"<xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g> aktibatzen…"</string>
     <string name="wifi_hotspot_name_summary_connected" msgid="3888672084861445362">"<xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g> sarera konekta daitezke beste gailuak"</string>
-    <string name="wifi_hotspot_password_title" msgid="1955592302902091281">"Wi-Fi pasahitza"</string>
+    <string name="wifi_hotspot_password_title" msgid="8676859981917573801">"Sare publikoaren pasahitza"</string>
     <string name="wifi_hotspot_ap_band_title" msgid="1165801173359290681">"Sarbide-puntuaren banda"</string>
     <string name="wifi_hotspot_footer_info_regular" msgid="1203489406068036455">"Erabili sare publikoa beste gailuentzako Wi-Fi sare bat sortzeko. Sare publikoen bidez, Interneteko konexioa ematen da datu mugikorrak erabilita. Agian datu mugikorrak erabiltzearen ondoriozko kostu gehigarriak izango dituzu."</string>
     <string name="wifi_hotspot_footer_info_local_only" msgid="857988412470694109">"Aplikazioek sare publikoak sor ditzakete edukia inguruko gailuekin partekatzeko."</string>
@@ -891,7 +908,6 @@
     <string name="wifi_tether_configure_ap_text" msgid="7974681394041609308">"Konfiguratu Wi-Fi sare publikoa"</string>
     <string name="wifi_hotspot_configure_ap_text" msgid="5478614731464220432">"Wi‑Fi publikoaren konfigurazioa"</string>
     <string name="wifi_hotspot_configure_ap_text_summary" msgid="5560680057727007011">"AndroidAP WPA2 PSK sare publikoa"</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> sare publikoa"</string>
     <string name="wifi_tether_configure_ssid_default" msgid="8467525402622138547">"AndroidSarePublikoa"</string>
     <string name="wifi_calling_settings_title" msgid="4102921303993404577">"Wi-Fi bidezko deiak"</string>
     <string name="wifi_calling_suggestion_title" msgid="9008010480466359578">"Aktibatu Wi-Fi bidezko deiak"</string>
@@ -932,7 +948,7 @@
     <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="emergency_address_summary" msgid="3266760199681945746">"Wi-Fi bidez larrialdi-zerbitzuetara deituz gero kokapen gisa erabiliko den helbidea"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"Bistaratzea"</string>
     <string name="sound_settings" msgid="5534671337768745343">"Soinua"</string>
     <string name="all_volume_title" msgid="4296957391257836961">"Bolumenak"</string>
@@ -958,7 +974,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 dei-tonuaren eta jakinarazpenen audioa"</string>
+    <string name="volume_ring_mute" msgid="3018992671608737202">"Desaktibatu 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>
@@ -986,6 +1002,7 @@
     <string name="search_settings" msgid="1910951467596035063">"Bilaketa"</string>
     <string name="search_settings_summary" msgid="9205656546570654169">"Kudeatu bilaketa-ezarpenak eta historia"</string>
     <string name="search_settings_no_results" msgid="8799027492641230999">"Ez dago emaitzarik"</string>
+    <string name="search_clear_history" msgid="4196658962573162457">"Garbitu historia"</string>
     <string name="display_settings" msgid="7965901687241669598">"Bistaratzea"</string>
     <string name="accelerometer_title" msgid="7854608399547349157">"Biratu pantaila automatikoki"</string>
     <string name="color_mode_title" msgid="3159275920408338215">"Kolore biziak"</string>
@@ -1044,27 +1061,25 @@
     <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">"Kargatu bitartean"</string>
+    <string name="screensaver_settings_summary_sleep" msgid="9086186698140423493">"Kargatzen ari denean"</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">"Erabili"</string>
+    <string name="screensaver_settings_dream_start" msgid="4998187847985120168">"Abiarazi"</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="ambient_display_screen_title" msgid="4252755516328775766">"Pantaila iluna"</string>
-    <!-- no translation found for ambient_display_screen_summary_always_on (7337555569694794132) -->
-    <skip />
+    <string name="ambient_display_screen_summary_always_on" msgid="7337555569694794132">"Beti aktibatuta. Bateria gehiago kontsumitzen du."</string>
     <string name="ambient_display_screen_summary_notifications" msgid="1449570742600868654">"Jakinarazpen berriak"</string>
     <string name="ambient_display_category_triggers" msgid="4359289754456268573">"Noiz erabili"</string>
     <string name="doze_title" msgid="2375510714460456687">"Jakinarazpen berriak"</string>
     <string name="doze_summary" msgid="3846219936142814032">"Argitu pantaila jakinarazpenak jasotzen dituzunean"</string>
     <string name="doze_always_on_title" msgid="1046222370442629646">"Beti aktibatuta"</string>
-    <!-- no translation found for doze_always_on_summary (6978257596231155345) -->
-    <skip />
+    <string name="doze_always_on_summary" msgid="6978257596231155345">"Erakutsi ordua, jakinarazpenen ikonoak eta bestelako informazioa. Bateria gehiago kontsumitzen du."</string>
     <string name="title_font_size" msgid="4405544325522105222">"Letra-tipoaren tamaina"</string>
     <string name="short_summary_font_size" msgid="6819778801232989076">"Handitu edo txikitu testua"</string>
     <string name="sim_lock_settings" msgid="3392331196873564292">"SIM txartelaren blokeo-ezarpenak"</string>
@@ -1117,7 +1132,6 @@
     <string name="baseband_version" msgid="1848990160763524801">"Oinarri-bandaren bertsioa"</string>
     <string name="kernel_version" msgid="9192574954196167602">"Kernel bertsioa"</string>
     <string name="build_number" msgid="3075795840572241758">"Konpilazio-zenbakia"</string>
-    <string name="selinux_status" msgid="6212165375172061672">"SELinux egoera"</string>
     <string name="device_info_not_available" msgid="8062521887156825182">"Ez dago erabilgarri"</string>
     <string name="device_status_activity_title" msgid="1411201799384697904">"Egoera"</string>
     <string name="device_status" msgid="607405385799807324">"Egoera"</string>
@@ -1145,7 +1159,6 @@
     <string name="status_wifi_mac_address" msgid="2202206684020765378">"Wi‑Fi MAC helbidea"</string>
     <string name="status_bt_address" msgid="4195174192087439720">"Bluetooth helbidea"</string>
     <string name="status_serial_number" msgid="2257111183374628137">"Serie-zenbakia"</string>
-    <string name="status_unavailable" msgid="7862009036663793314">"Ez dago erabilgarri"</string>
     <string name="status_up_time" msgid="7294859476816760399">"Berrabiarazi ondoren abian izandako denbora"</string>
     <string name="status_awake_time" msgid="2393949909051183652">"Aktibo egondako denbora"</string>
     <string name="internal_memory" msgid="9129595691484260784">"Barneko memoria"</string>
@@ -1321,25 +1334,23 @@
     <string name="menu_restore" msgid="8260067415075573273">"Berrezarri balio lehenetsiak"</string>
     <string name="restore_default_apn_completed" msgid="2824775307377604897">"APN ezarpen lehenetsiak berrezarri dira."</string>
     <string name="reset_dashboard_title" msgid="6254873816990678620">"Berrezartzeko aukerak"</string>
+    <string name="reset_dashboard_summary" msgid="4851012632493522755">"Sarea, aplikazioak edota gailua berrezar daitezke"</string>
     <string name="reset_network_title" msgid="6166025966016873843">"Berrezarri Wi-Fi, Bluetooth eta sare mugikorraren ezarpenak"</string>
-    <string name="reset_network_desc" msgid="5547979398298881406">"Hori eginez gero, berrezarri egingo zaizkie ezarpenak mota guztietako sareei, besteak beste: \n\n"<li>"Wi‑Fi"</li>\n<li>"Datu-konexioa"</li>\n<li>"Bluetooth"</li></string>
+    <string name="reset_network_desc" msgid="5547979398298881406">"Hori eginez gero, sare guztien ezarpenak berrezarri egingo dira, besteak beste: \n\n"<li>"Wi‑Fi"</li>\n<li>"Datu-konexioa"</li>\n<li>"Bluetooth"</li></string>
     <string name="reset_network_button_text" msgid="2035676527471089853">"Berrezarri ezarpenak"</string>
     <string name="reset_network_final_desc" msgid="6388371121099245116">"Sareko ezarpen guztiak berrezarri nahi dituzu? Ekintza hori ezin da desegin."</string>
     <string name="reset_network_final_button_text" msgid="1797434793741744635">"Berrezarri ezarpenak"</string>
     <string name="reset_network_confirm_title" msgid="1759888886976962773">"Berrezarri?"</string>
     <string name="network_reset_not_available" msgid="7188610385577164676">"Erabiltzaileak ez du sarea berrezartzeko baimenik"</string>
     <string name="reset_network_complete_toast" msgid="787829973559541880">"Berrezarri dira sareko ezarpenak"</string>
-    <string name="master_clear_title" msgid="6617679904229218425">"Ezabatu datu guztiak (leheneratu jatorrizko egoerara)"</string>
-    <plurals name="master_clear_with_account_summary" formatted="false" msgid="5911377203778818712">
-      <item quantity="other"><xliff:g id="ACCOUNT_COUNT">%1$d</xliff:g> kontu berrezarriko dira</item>
-      <item quantity="one">1 kontu berrezarriko da</item>
-    </plurals>
-    <string name="master_clear_summary" msgid="6902443944660426951">"Barneko memoria eta datu guztiak berrezarriko dira"</string>
+    <string name="master_clear_title" msgid="3531267871084279512">"Ezabatu datu guztiak (berrezarri fabrikako ezarpenak)"</string>
     <string name="master_clear_desc" product="tablet" msgid="9146059417023157222">"Tabletaren "<b>"barneko memoriako"</b>" datu guztiak ezabatuko dira, besteak beste:\n\n"<li>"Google kontua"</li>\n<li>"Sistema- eta aplikazioen datuak eta ezarpenak"</li>\n<li>"Deskargatutako aplikazioak"</li></string>
     <string name="master_clear_desc" product="default" msgid="4800386183314202571">"Telefonoaren "<b>"barneko memoriako"</b>" datu guztiak ezabatuko dira, besteak beste:\n\n"<li>"Google kontua"</li>\n<li>"Sistema- eta aplikazioen datuak nahiz ezarpenak"</li>\n<li>"Deskargatutako aplikazioak"</li></string>
     <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"Kontu hauetan hasi duzu saioa:\n"</string>
     <string name="master_clear_other_users_present" product="default" msgid="5161423070702470742">\n\n"Badaude erabiltzaile gehiago gailu honetan.\n"</string>
     <string name="master_clear_desc_also_erases_external" msgid="1903185203791274237"><li>"Musika"</li>\n<li>"Argazkiak"</li>\n<li>"Bestelako erabiltzaile-datuak"</li></string>
+    <string name="master_clear_desc_also_erases_esim" msgid="312352697653096008"><li>"eSIM txartela onartzen duten operadoreak"</li></string>
+    <string name="master_clear_desc_no_cancel_mobile_plan" msgid="5460926449093211144">\n\n"Horrek ez du utziko bertan behera operadorearekin kontratatuta duzun zerbitzu-plana."</string>
     <string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="7744115866662613411">\n\n"Musika, irudiak eta bestelako erabiltzaile-datuak garbitzeko, "<b>"USB memoria"</b>" ezabatu behar da."</string>
     <string name="master_clear_desc_erase_external_storage" product="default" msgid="4801026652617377093">\n\n"Musika, irudiak eta bestelako erabiltzaile-datuak garbitzeko, "<b>"SD txartela"</b>" ezabatu behar da."</string>
     <string name="erase_external_storage" product="nosdcard" msgid="969364037450286809">"Ezabatu USB memoria"</string>
@@ -1456,15 +1467,16 @@
     <string name="settings_safetylegal_activity_title" msgid="6901214628496951727">"Segurtasun-informazioa"</string>
     <string name="settings_safetylegal_activity_unreachable" msgid="250674109915859456">"Ez duzu datu-konexiorik. Informazioa orain ikusteko, joan %s gunera Internetera konektatutako ordenagailu batetik."</string>
     <string name="settings_safetylegal_activity_loading" msgid="8059022597639516348">"Kargatzen…"</string>
-    <string name="lockpassword_choose_your_password_header" msgid="8624900666929394990">"Aukeratu pasahitza"</string>
-    <string name="lockpassword_choose_your_password_header_for_fingerprint" msgid="6624409510609085450">"Hatz-marka erabiltzeko, ezarri pasahitza"</string>
-    <string name="lockpassword_choose_your_pattern_header" msgid="6949761069941694050">"Aukeratu eredua"</string>
-    <string name="lockpassword_choose_your_pattern_header_for_fingerprint" msgid="5901096361617543819">"Hatz-marka erabiltzeko, ezarri eredua"</string>
-    <string name="lockpassword_choose_your_pin_header" msgid="7598849519816138302">"Aukeratu PIN kodea"</string>
-    <string name="lockpassword_choose_your_pin_header_for_fingerprint" msgid="765344692615917183">"Hatz-marka erabiltzeko, ezarri PIN kodea"</string>
-    <string name="lockpassword_confirm_your_password_header" msgid="6308478184889846633">"Berretsi pasahitza"</string>
+    <string name="lockpassword_choose_your_screen_lock_header" msgid="3872462096767152394">"Ezarri pantailaren blokeo bat"</string>
+    <string name="lockpassword_choose_your_password_message" msgid="1197569283524841412">"Babestuta egoteko, ezarri pasahitz bat"</string>
+    <string name="lockpassword_choose_your_password_header_for_fingerprint" msgid="2541818487015343503">"Hatz-marka erabiltzeko, ezarri pasahitza"</string>
+    <string name="lockpassword_choose_your_pattern_header_for_fingerprint" msgid="7709785406243556723">"Hatz-marka erabiltzeko, ezarri eredua"</string>
+    <string name="lockpassword_choose_your_pin_message" msgid="1875420718677275646">"Babestuta egoteko, ezarri PIN bat"</string>
+    <string name="lockpassword_choose_your_pin_header_for_fingerprint" msgid="1549639053195796674">"Hatz-marka erabiltzeko, ezarri PIN kodea"</string>
+    <string name="lockpassword_choose_your_pattern_message" msgid="5986983400689720015">"Segurtasuna bermatzeko, zehaztu eredua"</string>
+    <string name="lockpassword_confirm_your_password_header" msgid="1266027268220850931">"Idatzi berriro pasahitza"</string>
     <string name="lockpassword_confirm_your_pattern_header" msgid="7543433733032330821">"Berretsi eredua"</string>
-    <string name="lockpassword_confirm_your_pin_header" msgid="49038294648213197">"Berretsi PIN kodea"</string>
+    <string name="lockpassword_confirm_your_pin_header" msgid="7744513791910572550">"Idatzi berriro PIN kodea"</string>
     <string name="lockpassword_confirm_passwords_dont_match" msgid="5140892109439191415">"Pasahitzak ez datoz bat"</string>
     <string name="lockpassword_confirm_pins_dont_match" msgid="7226244811505606217">"PIN kodeak ez datoz bat"</string>
     <string name="lockpassword_choose_lock_generic_header" msgid="3811438094903786145">"Desblokeatzeko metodoa"</string>
@@ -1477,18 +1489,18 @@
     <string name="lockpassword_confirm_your_pattern_generic_profile" msgid="4435638308193361861">"Aurrera egiteko, marraztu laneko eredua"</string>
     <string name="lockpassword_confirm_your_pin_generic_profile" msgid="3730141667547002246">"Aurrera egiteko, idatzi laneko PIN kodea"</string>
     <string name="lockpassword_confirm_your_password_generic_profile" msgid="4250642723467019894">"Aurrera egiteko, idatzi laneko pasahitza"</string>
-    <!-- no translation found for lockpassword_strong_auth_required_device_pattern (530802132223800623) -->
-    <skip />
-    <!-- no translation found for lockpassword_strong_auth_required_device_pin (7829294830078036417) -->
-    <skip />
-    <!-- no translation found for lockpassword_strong_auth_required_device_password (3552644641574796973) -->
-    <skip />
-    <!-- no translation found for lockpassword_strong_auth_required_work_pattern (3003781907040522053) -->
-    <skip />
-    <!-- no translation found for lockpassword_strong_auth_required_work_pin (3367491332598821552) -->
-    <skip />
-    <!-- no translation found for lockpassword_strong_auth_required_work_password (8159775129968582940) -->
-    <skip />
+    <string name="lockpassword_strong_auth_required_device_pattern" msgid="530802132223800623">"Segurtasuna bermatzeko, marraztu gailuaren eredua"</string>
+    <string name="lockpassword_strong_auth_required_device_pin" msgid="7829294830078036417">"Segurtasuna bermatzeko, idatzi gailuaren PIN kodea"</string>
+    <string name="lockpassword_strong_auth_required_device_password" msgid="3552644641574796973">"Segurtasuna bermatzeko, idatzi gailuaren pasahitza"</string>
+    <string name="lockpassword_strong_auth_required_work_pattern" msgid="3003781907040522053">"Segurtasuna bermatzeko, marraztu laneko eredua"</string>
+    <string name="lockpassword_strong_auth_required_work_pin" msgid="3367491332598821552">"Segurtasuna bermatzeko, idatzi laneko PIN kodea"</string>
+    <string name="lockpassword_strong_auth_required_work_password" msgid="8159775129968582940">"Segurtasuna bermatzeko, idatzi laneko pasahitza"</string>
+    <string name="lockpassword_confirm_your_pattern_details_frp" msgid="6757336656791723193">"Telefonoaren jatorrizko ezarpenak berrezarri dira. Erabiltzeko, marraztu aurreko eredua."</string>
+    <string name="lockpassword_confirm_your_pin_details_frp" msgid="826520613445990470">"Telefonoaren jatorrizko ezarpenak berrezarri dira. Erabiltzeko, marraztu aurreko PIN kodea."</string>
+    <string name="lockpassword_confirm_your_password_details_frp" msgid="8944081074615739040">"Telefonoaren jatorrizko ezarpenak berrezarri dira. Erabiltzeko, idatzi aurreko pasahitza."</string>
+    <string name="lockpassword_confirm_your_pattern_header_frp" msgid="2898036091609128286">"Egiaztatu eredua"</string>
+    <string name="lockpassword_confirm_your_pin_header_frp" msgid="4141601774778898803">"Egiaztatu PIN kodea"</string>
+    <string name="lockpassword_confirm_your_password_header_frp" msgid="3762615419295360480">"Egiaztatu pasahitza"</string>
     <string name="lockpassword_invalid_pin" msgid="15588049067548470">"PIN kodea ez da zuzena"</string>
     <string name="lockpassword_invalid_password" msgid="4038507398784975200">"Pasahitza ez da zuzena"</string>
     <string name="lockpattern_need_to_unlock_wrong" msgid="1745247595356012176">"Eredua ez da zuzena"</string>
@@ -1538,7 +1550,6 @@
     <string name="install_applications_title" msgid="4987712352256508946">"Onartu iturburu guztiak"</string>
     <string name="recent_app_category_title" msgid="6673071268966003928">"Azkenaldian irekitako aplikazioak"</string>
     <string name="see_all_apps_title" msgid="1317153498074308438">"Ikusi <xliff:g id="COUNT">%1$d</xliff:g> aplikazioak"</string>
-    <string name="recent_app_summary" msgid="3366446669844932300">"Duela <xliff:g id="TIME">^1</xliff:g>"</string>
     <string name="install_all_warning" product="tablet" msgid="8310489909586138165">"Tabletak eta datu pertsonalek aplikazio ezezagunen erasoak jaso ditzakete. Iturburu honetako aplikazioak instalatzen badituzu, onartzen duzu haiek erabiltzeagatik tabletari gerta dakizkiokeen kalteen edo datu-galeren erantzulea zeu zarela."</string>
     <string name="install_all_warning" product="default" msgid="1952257127370115988">"Telefonoak eta datu pertsonalek aplikazio ezezagunen erasoak jaso ditzakete. Iturburu honetako aplikazioak instalatzen badituzu, onartzen duzu haiek erabiltzeagatik telefonoari gerta dakizkiokeen kalteen edo datu-galeren erantzulea zeu zarela."</string>
     <string name="advanced_settings" msgid="1777249286757067969">"Ezarpen aurreratuak"</string>
@@ -1802,7 +1813,7 @@
     <string name="accessibility_settings_summary" msgid="981260486011624939">"Pantaila-irakurgailuak, pantaila, interakzioak kontrolatzeko aukerak"</string>
     <string name="vision_settings_title" msgid="4204111425716868288">"Ikusmen-ezarpenak"</string>
     <string name="vision_settings_description" msgid="5679491180156408260">"Zure beharretara doi dezakezu gailua. Erabilerraztasun-eginbideak edonoiz alda ditzakezu Ezarpenak atalean."</string>
-    <string name="vision_settings_suggestion_title" msgid="917294957154878441">"Handitu letra-tamaina"</string>
+    <string name="vision_settings_suggestion_title" msgid="8058794060304707004">"Aldatu letra-tipoaren tamaina"</string>
     <string name="screen_reader_category_title" msgid="7739154903913400641">"Pantaila-irakurgailuak"</string>
     <string name="audio_and_captions_category_title" msgid="3420727114421447524">"Audioa eta pantailako testua"</string>
     <string name="display_category_title" msgid="685461049938269166">"Pantaila"</string>
@@ -1830,7 +1841,7 @@
     <string name="accessibility_toggle_high_text_contrast_preference_title" msgid="2567402942683463779">"Kontraste handiko testua"</string>
     <string name="accessibility_toggle_screen_magnification_auto_update_preference_title" msgid="7218498768415430963">"Eguneratu auto. pantaila-handiagotzea"</string>
     <string name="accessibility_toggle_screen_magnification_auto_update_preference_summary" msgid="4392059334816220155">"Eguneratu handiagotzea aplik. batetik bestera pasatzean."</string>
-    <string name="accessibility_power_button_ends_call_prerefence_title" msgid="6673851944175874235">"Amaitu deiak pizteko botoiarekin"</string>
+    <string name="accessibility_power_button_ends_call_prerefence_title" msgid="6673851944175874235">"Amaitu deiak pizteko etengailuarekin"</string>
     <string name="accessibility_toggle_large_pointer_icon_title" msgid="535173100516295580">"Saguaren erakusle handia"</string>
     <string name="accessibility_toggle_master_mono_title" msgid="4363806997971905302">"Audio monofonikoa"</string>
     <string name="accessibility_toggle_master_mono_summary" msgid="5634277025251530927">"Konbinatu kanalak audioa erreproduzitzean"</string>
@@ -1839,7 +1850,6 @@
     <string name="accessibility_display_inversion_preference_subtitle" msgid="7052959202195368109">"Baliteke errendimenduan eragina izatea"</string>
     <string name="accessibility_autoclick_preference_title" msgid="7014499339068449623">"Egin klik erakusleak mugitzeari uztean"</string>
     <string name="accessibility_autoclick_delay_preference_title" msgid="3962261178385106006">"Klik egin aurretiko atzerapena"</string>
-    <string name="preference_summary_default_combination" msgid="8532964268242666060">"<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">"AKTIBATUTA"</string>
     <string name="accessibility_summary_state_disabled" msgid="2241315620132005595">"DESAKTIBATUTA"</string>
     <string name="enable_quick_setting" msgid="2366999897816894536">"Erakutsi Ezarpen bizkorretan"</string>
@@ -1958,12 +1968,14 @@
     <string name="background_activity_summary_on" msgid="649282072540085599">"Erabiltzen ari ez zarenean, atzeko planoan exekuta daiteke aplikazioa"</string>
     <string name="background_activity_summary_off" msgid="7666330699090632040">"Erabiltzen ari ez zarenean, aplikazioak murriztuta izaten ditu atzeko planoko jarduerak"</string>
     <string name="background_activity_summary_disabled" msgid="3710669050484599847">"Aplikazioak ez du baimenik atzeko planoan exekutatzeko"</string>
+    <string name="background_activity_summary_whitelisted" msgid="7375400051141016808">"Aplikazio hau ezin da optimizatu bateria gutxiago erabil dezan"</string>
+    <string name="background_activity_warning_dialog_title" msgid="2216249969149568871">"Atzeko planoko jarduerak mugatu nahi dituzu?"</string>
+    <string name="background_activity_warning_dialog_text" msgid="7049624449246121981">"Aplikazio baten atzeko planoko jarduerak mugatzen badituzu, baliteke aplikazioak behar bezala ez funtzionatzea"</string>
     <string name="device_screen_usage" msgid="3386088035570409683">"Pantailaren erabilera gailua guztiz kargatu zenetik"</string>
     <string name="device_screen_consumption" msgid="4607589286438986687">"Pantailaren kontsumoa"</string>
     <string name="device_cellular_network" msgid="4724773411762382950">"Sare mugikorra bilatzen"</string>
-    <string name="power_last_full_charge_summary" msgid="532845389094620657">"Duela <xliff:g id="TIME">^1</xliff:g>"</string>
-    <string name="power_usage_list_summary" msgid="6775339745194635000">"Aplikazioen erabilera gailua guztiz kargatu zenetik (duela <xliff:g id="TIME">^1</xliff:g>)"</string>
-    <string name="power_usage_list_summary_device" msgid="7036566616386864302">"Gailuaren erabilera gailua guztiz kargatu zenetik (duela <xliff:g id="TIME">^1</xliff:g>)"</string>
+    <string name="power_usage_list_summary" msgid="6393929085382334341">"Aplikazioen erabilera gailua guztiz kargatu zenetik (<xliff:g id="RELATIVE_TIME">^1</xliff:g>)"</string>
+    <string name="power_usage_list_summary_device" msgid="4461926045610455423">"Gailuaren erabilera guztiz kargatu zenetik (<xliff:g id="RELATIVE_TIME">^1</xliff:g>)"</string>
     <string name="screen_usage_summary" msgid="6687403051423153550">"Gailua guztiz kargatu zenetik pantaila piztuta egon den denbora"</string>
     <string name="device_usage_list_summary" msgid="5623036661468763251">"Gailuaren erabilera hura guztiz kargatu zenetik"</string>
     <string name="battery_since_unplugged" msgid="338073389740738437">"Bateriaren erabilera entxufea atera ondoren"</string>
@@ -2084,7 +2096,7 @@
     <string name="battery_overall_usage" msgid="2093409063297375436">"Bateria osoaren <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
     <string name="battery_detail_since_full_charge" msgid="7515347842046955855">"Guztiz kargatu zenetik emandako erabileraren datuak"</string>
     <string name="battery_last_full_charge" msgid="7151251641099019361">"Azkenekoz guztiz kargatu zenetik"</string>
-    <string name="battery_footer_summary" msgid="67169726550144016">"Bateriaren erabilerari buruzko datuak gutxi gorabeherakoak dira eta aldatu egin litezke erabileraren arabera"</string>
+    <string name="battery_footer_summary" msgid="67169726550144016">"Bateriaren erabilera-datuak gutxi gorabeherakoak dira eta aldatu egin litezke erabileraren arabera"</string>
     <string name="battery_detail_foreground" msgid="3350401514602032183">"Aktiboki erabili bitartean"</string>
     <string name="battery_detail_background" msgid="1929644393553768999">"Atzeko planoan dagoen bitartean"</string>
     <string name="battery_detail_power_usage" msgid="6485766868610469101">"Bateriaren erabilera"</string>
@@ -2151,9 +2163,9 @@
     <string name="voice_input_output_settings_title" msgid="2442850635048676991">"Ahots-sarreraren eta -irteeraren ezarpenak"</string>
     <string name="voice_search_settings_title" msgid="2775469246913196536">"Ahozko bilaketa"</string>
     <string name="keyboard_settings_title" msgid="5080115226780201234">"Android teklatua"</string>
-    <string name="voice_input_settings" msgid="1099937800539324567">"Ahots bidezko idazketaren ezarpenak"</string>
-    <string name="voice_input_settings_title" msgid="2676028028084981891">"Ahots bidezko idazketa"</string>
-    <string name="voice_service_preference_section_title" msgid="3778706644257601021">"Ahots bidezko idazketa-zerbitzuak"</string>
+    <string name="voice_input_settings" msgid="1099937800539324567">"Ahozko idazketaren ezarpenak"</string>
+    <string name="voice_input_settings_title" msgid="2676028028084981891">"Ahozko idazketa"</string>
+    <string name="voice_service_preference_section_title" msgid="3778706644257601021">"Ahozko idazketa-zerbitzuak"</string>
     <string name="voice_interactor_preference_summary" msgid="1801414022026937190">"Ahozko pasahitzak eta erabateko interakzioa"</string>
     <string name="voice_recognizer_preference_summary" msgid="669880813593690527">"Ahoz idazteko eginbide arrunta"</string>
     <string name="voice_interaction_security_warning" msgid="6378608263983737325">"Aginduak ahoz emateko zerbitzu honek uneoro kontrolatuko du ahotsa eta ahozko gaitasuna duten aplikazioak ere kontrolatu ahal izango ditu. <xliff:g id="VOICE_INPUT_SERVICE_APP_NAME">%s</xliff:g> aplikazioarena da. Zerbitzu hau erabiltzeko aukera gaitu nahi duzu?"</string>
@@ -2209,14 +2221,14 @@
     <string name="credentials_unlock_hint" msgid="2301301378040499348">"Idatzi kredentzialen biltegiaren pasahitza."</string>
     <string name="credentials_old_password" msgid="7553393815538684028">"Uneko pasahitza:"</string>
     <string name="credentials_reset_hint" msgid="6297256880896133631">"Eduki guztiak kendu?"</string>
-    <string name="credentials_password_too_short" msgid="7502749986405522663">"Pasahitzak gutxienez 8 karaktere izan behar ditu."</string>
     <string name="credentials_wrong_password" msgid="2541932597104054807">"Pasahitz okerra."</string>
     <string name="credentials_reset_warning" msgid="5320653011511797600">"Pasahitz okerra. Beste aukera bat duzu kredentzialen biltegia ezabatu aurretik."</string>
     <string name="credentials_reset_warning_plural" msgid="6514085665301095279">"Pasahitz okerra. Beste <xliff:g id="NUMBER">%1$d</xliff:g> aukera dituzu kredentzialen biltegia ezabatu aurretik."</string>
     <string name="credentials_erased" msgid="2907836028586342969">"Kredentz. biltegia ezabatu da."</string>
     <string name="credentials_not_erased" msgid="7685932772284216097">"Ezin izan da kredentzialen biltegia ezabatu."</string>
     <string name="credentials_enabled" msgid="7588607413349978930">"Kredentzialen biltegia gaitu da."</string>
-    <string name="credentials_configure_lock_screen_hint" msgid="6757119179588664966">"Kredentzialen biltegia erabili aurretik, pantaila blokeatzeko PIN kodea edo pasahitza ezarri behar duzu."</string>
+    <string name="credentials_configure_lock_screen_hint" msgid="8058230497337529036">"Zuk kredentzialen biltegia erabili ahal izateko, gailuak pantaila blokeatzeko modu seguru bat izan behar du"</string>
+    <string name="credentials_configure_lock_screen_button" msgid="253239765216055321">"EZARRI BLOKEOA"</string>
     <string name="usage_access_title" msgid="332333405495457839">"Erabilera-baimena dutenak"</string>
     <string name="emergency_tone_title" msgid="1055954530111587114">"Larrialdi-tonua"</string>
     <string name="emergency_tone_summary" msgid="722259232924572153">"Ezarri larrialdi-deiak egitean izan beharreko portaera."</string>
@@ -2243,7 +2255,7 @@
     <string name="select_device_admin_msg" msgid="7347389359013278077">"Gailua administratzeko aplikazioak"</string>
     <string name="no_device_admins" msgid="4846602835339095768">"Ez dago gailua administratzeko aplikaziorik"</string>
     <string name="personal_device_admin_title" msgid="2849617316347669861">"Pertsonala"</string>
-    <string name="managed_device_admin_title" msgid="7853955652864478435">"Lantokia"</string>
+    <string name="managed_device_admin_title" msgid="7853955652864478435">"Lanekoak"</string>
     <string name="no_trust_agents" msgid="7450273545568977523">"Ez dago agente fidagarririk erabilgarri"</string>
     <string name="add_device_admin_msg" msgid="1501847129819382149">"Gailua administratzeko aplikazioa aktibatu?"</string>
     <string name="add_device_admin" msgid="4192055385312215731">"Aktibatu gailua administratzeko aplikazioa"</string>
@@ -2257,7 +2269,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">"Dei-tonua eta dardara"</string>
+    <string name="sound_category_call_ringtone_vibrate_title" msgid="1543777228646645163">"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>
@@ -2336,8 +2348,6 @@
     <skip />
     <string name="cant_sync_dialog_title" msgid="2777238588398046285">"Ezin da eskuz sinkronizatu"</string>
     <string name="cant_sync_dialog_message" msgid="1938380442159016449">"Elementua ezin da unean desgaitu. Ezarpena aldatzeko, aktibatu atzeko planoko datuak eta sinkronizazio automatikoa aldi baterako."</string>
-    <string name="wimax_settings" msgid="2655139497028469039">"4G"</string>
-    <string name="status_wimax_mac_address" msgid="8390791848661413416">"4G MAC helbidea"</string>
     <string name="enter_password" msgid="8035706727471334122">"Android gailua abiarazteko, idatzi pasahitza"</string>
     <string name="enter_pin" msgid="5305333588093263790">"Android gailua abiarazteko, idatzi PIN kodea"</string>
     <string name="enter_pattern" msgid="4187435713036808566">"Android gailua abiarazteko, marraztu eredua"</string>
@@ -2351,6 +2361,7 @@
     <string name="misc_files_selected_count" msgid="4647048020823912088">"<xliff:g id="NUMBER">%1$d</xliff:g>/<xliff:g id="TOTAL">%2$d</xliff:g> hautatuta"</string>
     <string name="misc_files_selected_count_bytes" msgid="2876232009069114352">"<xliff:g id="NUMBER">%1$s</xliff:g>/<xliff:g id="TOTAL">%2$s</xliff:g>"</string>
     <string name="select_all" msgid="1562774643280376715">"Hautatu guztiak"</string>
+    <string name="data_plan_usage_manage_plans_button_text" msgid="8997761990902708162">"Kudeatu planak"</string>
     <string name="data_usage_summary_title" msgid="3804110657238092929">"Datuen erabilera"</string>
     <string name="data_usage_app_summary_title" msgid="4147258989837459172">"Aplik. datuen erabilera"</string>
     <string name="data_usage_accounting" msgid="7170028915873577387">"Beharbada operadoreak zenbatzen duen datu kopurua eta gailuak zenbatzen duena ez datoz bat."</string>
@@ -2358,7 +2369,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">"Datu-erabileraren zikloa"</string>
+    <string name="data_usage_cycle" msgid="5652529796195787949">"Datuen erabilera-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>
@@ -2377,7 +2388,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">"Datu-erabileraren zikloa berrezarri beharreko hilabeteko eguna:"</string>
+    <string name="data_usage_pick_cycle_day" msgid="4470796861757050966">"Datuen erabilera-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>
@@ -2389,10 +2400,10 @@
     <string name="data_usage_disable_wifi_limit" msgid="1394901415264660888">"Ezarri Wi-Fi datuen muga"</string>
     <string name="data_usage_tab_wifi" msgid="481146038146585749">"Wi‑Fi"</string>
     <string name="data_usage_tab_ethernet" msgid="7298064366282319911">"Ethernet"</string>
-    <string name="data_usage_tab_mobile" msgid="454140350007299045">"Datu mugikorrak"</string>
+    <string name="data_usage_tab_mobile" msgid="454140350007299045">"Datu-konexioa"</string>
     <string name="data_usage_tab_4g" msgid="1301978716067512235">"4G"</string>
     <string name="data_usage_tab_3g" msgid="6092169523081538718">"2G-3G"</string>
-    <string name="data_usage_list_mobile" msgid="5588685410495019866">"Mugikorra"</string>
+    <string name="data_usage_list_mobile" msgid="5588685410495019866">"Datu-konexioa"</string>
     <string name="data_usage_list_none" msgid="3933892774251050735">"Bat ere ez"</string>
     <string name="data_usage_enable_mobile" msgid="986782622560157977">"Datu mugikorrak"</string>
     <string name="data_usage_enable_3g" msgid="6304006671869578254">"2G-3G datuak"</string>
@@ -2414,8 +2425,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 datu-erabileraren abisua"</string>
-    <string name="data_usage_limit_editor_title" msgid="9153595142385030015">"Ezarri datu-erabileraren muga"</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_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>
@@ -2436,6 +2447,9 @@
     <string name="data_usage_metered_mobile" msgid="5423305619126978393">"Sare mugikorrak"</string>
     <string name="data_usage_metered_wifi" msgid="1761738002328299714">"Wi‑Fi sare mugatuak"</string>
     <string name="data_usage_metered_wifi_disabled" msgid="727808462375941567">"Sare mugatuak hautatzeko, aktibatu Wi‑Fi konexioa."</string>
+    <string name="data_usage_metered_auto" msgid="1262028400911918865">"Automatikoa"</string>
+    <string name="data_usage_metered_yes" msgid="9217539611385225894">"Datu-mugaduna"</string>
+    <string name="data_usage_metered_no" msgid="4025232961929071789">"Datu-mugarik gabekoa"</string>
     <string name="data_usage_disclaimer" msgid="6887858149980673444">"Operadoreak gailuak ez bezala zenbat litzake datuak."</string>
     <string name="cryptkeeper_emergency_call" msgid="198578731586097145">"Larrialdi-deia"</string>
     <string name="cryptkeeper_return_to_call" msgid="5613717339452772491">"Itzuli deira"</string>
@@ -2527,9 +2541,6 @@
     <string name="backup_pw_set_button_text" msgid="2387480910044648795">"Ezarri babeskopien pasahitza"</string>
     <string name="backup_pw_cancel_button_text" msgid="8845630125391744615">"Utzi"</string>
     <string name="additional_system_update_settings_list_item_title" msgid="214987609894661992">"Sistemaren eguneratze gehiago"</string>
-    <string name="selinux_status_disabled" msgid="924551035552323327">"Desgaituta"</string>
-    <string name="selinux_status_permissive" msgid="6004965534713398778">"Permisiboa"</string>
-    <string name="selinux_status_enforcing" msgid="2252703756208463329">"Betearazten"</string>
     <string name="ssl_ca_cert_warning" msgid="2045866713601984673">"Baliteke sarea kontrolatuta egotea"</string>
     <string name="done_button" msgid="1991471253042622230">"Eginda"</string>
     <plurals name="ssl_ca_cert_dialog_title" formatted="false" msgid="7145092748045794650">
@@ -2727,6 +2738,7 @@
       <item quantity="other">Erakutsi %d elementu ezkutu</item>
       <item quantity="one">Erakutsi %d elementu ezkutu</item>
     </plurals>
+    <string name="dashboard_suggestion_condition_footer_content_description" msgid="2898588191174845961">"Tolestu"</string>
     <string name="network_dashboard_title" msgid="4771589228992391573">"Sareak eta Internet"</string>
     <string name="network_dashboard_summary_mobile" msgid="3851083934739500429">"mugikorra"</string>
     <string name="network_dashboard_summary_data_usage" msgid="3843261364705042212">"datuen erabilera"</string>
@@ -2786,8 +2798,7 @@
     <string name="keywords_gesture" msgid="3526905012224714078">"keinuak"</string>
     <string name="keywords_payment_settings" msgid="5220104934130446416">"ordaindu, ukitu, ordainketak"</string>
     <string name="keywords_backup" msgid="470070289135403022">"babeskopia, segurtasun kopia"</string>
-    <!-- no translation found for keywords_assist_gesture_launch (813968759791342591) -->
-    <skip />
+    <string name="keywords_assist_gesture_launch" msgid="813968759791342591">"keinua"</string>
     <string name="setup_wifi_nfc_tag" msgid="9028353016222911016">"Konfiguratu Wi-Fi NFC etiketa"</string>
     <string name="write_tag" msgid="8571858602896222537">"Idatzi"</string>
     <string name="status_awaiting_tap" msgid="2130145523773160617">"Ukitu etiketa bat bertan idazteko…"</string>
@@ -2805,7 +2816,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 tonu-jotzailea"</string>
+    <string name="ringtone_title" msgid="5379026328015343686">"Telefonoaren tonua"</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>
@@ -2813,7 +2824,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 soinua"</string>
+    <string name="screen_locking_sounds_title" msgid="1340569241625989837">"Pantaila blokeatzearen soinuak"</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>
@@ -2822,7 +2833,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">"Alertak"</string>
+    <string name="emergency_tone_alert" msgid="8941852695428130667">"Abisua"</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>
@@ -2830,8 +2841,14 @@
       <item quantity="other"><xliff:g id="ON_COUNT">%d</xliff:g> arau automatiko aktibatuta</item>
       <item quantity="one">1 arau automatiko aktibatuta</item>
     </plurals>
-    <string name="zen_mode_settings_title" msgid="842308776768942600">"\"Ez molestatu\" moduaren hobespenak"</string>
-    <string name="zen_mode_priority_settings_title" msgid="2623117023031824309">"Lehentasunezkoak soilik"</string>
+    <string name="zen_mode_settings_title" msgid="1066226840983908121">"Ez molestatu"</string>
+    <string name="zen_mode_behavior_settings_title" msgid="1463303933529313969">"Jokabidea"</string>
+    <string name="zen_mode_behavior_allow_title" msgid="3845615648136218141">"Baimendu soinu eta dardara hauek:"</string>
+    <string name="zen_mode_behavior_no_sound" msgid="1219626004723208056">"Ez egin soinurik"</string>
+    <string name="zen_mode_behavior_total_silence" msgid="6716603819806610626">"Ez egin soinurik (isiltasun osoa)"</string>
+    <string name="zen_mode_behavior_no_sound_except" msgid="4968477585788243114">"Ez egin soinurik. Salbuespena: <xliff:g id="CATEGORIES">%1$s</xliff:g>."</string>
+    <!-- no translation found for zen_mode_behavior_alarms_only (2423480992071472963) -->
+    <skip />
     <string name="zen_mode_automation_settings_title" msgid="4228995740594063774">"Arau automatikoak"</string>
     <string name="zen_mode_automation_suggestion_title" msgid="5105443455143476201">"Ezarri \"Ez molestatu\" arauak"</string>
     <string name="zen_mode_automation_suggestion_summary" msgid="4732808039946935657">"Mugatu soinuak eta dardarak ordu jakinetara"</string>
@@ -2873,18 +2890,20 @@
     <string name="notifications_title" msgid="8086372779371204971">"Jakinarazpenak"</string>
     <string name="app_notifications_title" msgid="5810577805218003760">"Aplikazioen jakinarazpenak"</string>
     <string name="notification_channel_title" msgid="2260666541030178452">"Jakinarazpenaren kategoria"</string>
+    <string name="notification_group_title" msgid="7180506440133859601">"Jakinarazpenen kategoria-taldea"</string>
     <string name="notification_importance_title" msgid="848692592679312666">"Garrantzia"</string>
-    <string name="notification_importance_unspecified" msgid="2196023702875112081">"Aplikazioak erabaki dezala"</string>
+    <string name="notification_importance_unspecified" msgid="6622173510486113958">"Baimendu soinua egitea"</string>
     <string name="notification_importance_blocked" msgid="7938180808339386300">"Ez erakutsi jakinarazpenik inoiz"</string>
     <string name="notification_importance_min" msgid="5455049524984686275">"Ez egin soinurik eta ez erakutsi"</string>
     <string name="notification_importance_low" msgid="8881468429453766553">"Ez egin soinurik"</string>
     <string name="notification_importance_default" msgid="5958338024601957516">"Egin soinua"</string>
     <string name="notification_importance_high" msgid="2082429479238228527">"Egin soinua eta erakutsi pantailan"</string>
+    <string name="notification_importance_high_silent" msgid="2667033773703765252">"Erakutsi pantailan"</string>
     <string name="notification_importance_min_title" msgid="6974673091137544803">"Txikia"</string>
     <string name="notification_importance_low_title" msgid="8131254047772814309">"Arrunta"</string>
     <string name="notification_importance_default_title" msgid="9120383978536089489">"Handia"</string>
     <string name="notification_importance_high_title" msgid="3058778300264746473">"Premiazkoa"</string>
-    <string name="allow_interruption" msgid="7136150018111848721">"Baimendu etetea"</string>
+    <string name="allow_interruption" msgid="7136150018111848721">"Baimendu etenaldiak"</string>
     <string name="allow_interruption_summary" msgid="7870159391333957050">"Baimendu aplikazioari soinuak edo dardara egitea, edota pantailan jakinarazpenak erakustea"</string>
     <string name="notification_channel_summary_min" msgid="5401718014765921892">"Garrantzi txikikoa"</string>
     <string name="notification_channel_summary_low" msgid="322317684244981244">"Garrantzi ertainekoa"</string>
@@ -2916,15 +2935,19 @@
     <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>
-    <!-- no translation found for picture_in_picture_app_detail_summary (1264019085827708920) -->
-    <skip />
+    <string name="picture_in_picture_app_detail_summary" msgid="1264019085827708920">"Baimendu aplikazio honek pantaila txiki gainjarri bat sortzea aplikazioa irekita dagoenean edo handik irtetean (adibidez, bideoak ikusten jarraitzeko). Erabiltzen ari zaren beste aplikazioen gaienean erakutsiko 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>
     <string name="app_notifications_off_desc" msgid="4882445501376722969">"Aplikazio honen jakinarazpenak gailu honetan erakustea galarazten ari da Android"</string>
     <string name="channel_notifications_off_desc" msgid="5899225298718840635">"Kategoria honetako jakinarazpenak gailu honetan erakustea galarazten ari da Android"</string>
+    <string name="channel_group_notifications_off_desc" msgid="1620950416247316370">"Talde honetako jakinarazpenak gailu honetan erakustea galarazten ari da Android"</string>
     <string name="notification_channels" msgid="5346841743182627500">"Kategoriak"</string>
     <string name="notification_channels_other" msgid="5645317113885788226">"Beste batzuk"</string>
+    <plurals name="notification_group_summary" formatted="false" msgid="3420621520561455358">
+      <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> kategoria</item>
+      <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> kategoria</item>
+    </plurals>
     <string name="no_channels" msgid="3077375508177744586">"Aplikazioak ez du argitaratu jakinarazpenik"</string>
     <string name="app_settings_link" msgid="8894946007543660906">"Aplikazioko ezarpen gehiago"</string>
     <string name="app_notification_listing_summary_zero" msgid="6482582965081108108">"Aktibatuta aplikazio guztietan"</string>
@@ -2945,7 +2968,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 jakinarazpenek jarduera etenaraztea \"Ez molestatu\" aukera Lehentasunezkoak soilik gisa ezarrita dagoenean"</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_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>
@@ -2970,7 +2993,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">"Egoeraren araua"</string>
+    <string name="zen_event_rule_type_name" msgid="2645981990973086797">"Gertaeraren 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>
@@ -2997,16 +3020,18 @@
     <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">"Kontaktuetakoak soilik"</string>
-    <string name="zen_mode_from_starred" msgid="2678345811950997027">"Kontaktu izardunetakoak soilik"</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_none" msgid="8219706639954614136">"Bat ere ez"</string>
     <string name="zen_mode_alarms" msgid="2165302777886552926">"Alarmak"</string>
+    <!-- no translation found for zen_mode_media_system_other (8900209390529859777) -->
+    <skip />
     <string name="zen_mode_reminders" msgid="5458502056440485730">"Abisuak"</string>
     <string name="zen_mode_events" msgid="7914446030988618264">"Gertaerak"</string>
     <string name="zen_mode_all_callers" msgid="584186167367236922">"Deitzaile guztiak"</string>
     <string name="zen_mode_selected_callers" msgid="3127598874060615742">"Hautatutako deitzaileak"</string>
     <string name="zen_mode_repeat_callers" msgid="5019521886428322131">"Berriro deitu dutenak"</string>
-    <string name="zen_mode_repeat_callers_summary" msgid="7192713032364140137">"Pertsona berak berriro deitzen badu <xliff:g id="MINUTES">%d</xliff:g> minutuko epean, onartu deia"</string>
+    <string name="zen_mode_repeat_callers_summary" msgid="239685342222975733">"<xliff:g id="MINUTES">%d</xliff:g> minutuko epean pertsona berak berriz deitzen badu"</string>
     <string name="zen_mode_when" msgid="2767193283311106373">"Aktibatu automatikoki"</string>
     <string name="zen_mode_when_never" msgid="8809494351918405602">"Inoiz ez"</string>
     <string name="zen_mode_when_every_night" msgid="3122486110091921009">"Gauero"</string>
@@ -3035,6 +3060,7 @@
     <string name="zen_mode_screen_off_visual_interruptions" msgid="4850792880144382633">"Pantaila itzalita dagoenean"</string>
     <string name="zen_mode_no_visual_interruptions" msgid="8742776003822778472">"Pantaila piztuta nahiz itzalita dagoenean"</string>
     <string name="notification_app_settings_button" msgid="6685640230371477485">"Jakinarazpen-ezarpenak"</string>
+    <string name="suggestion_button_text" msgid="3275010948381252006">"Ados"</string>
     <string name="device_feedback" msgid="3238056036766293294">"Bidali gailu honi buruzko iritzia"</string>
     <string name="restr_pin_enter_admin_pin" msgid="1085834515677448072">"Idatzi administratzailearen PIN kodea"</string>
     <string name="switch_on_text" msgid="1124106706920572386">"Aktibatuta"</string>
@@ -3074,7 +3100,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">"Erabilitako lekua: <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> erabilita (<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>
@@ -3122,7 +3148,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">"Baimen hauek dituzten aplikazioak: <xliff:g id="APPS">%1$s</xliff:g>"</string>
+    <string name="app_permissions_summary" msgid="5163974162150406324">"<xliff:g id="APPS">%1$s</xliff:g> atzitzeko baimena duten aplikazioak"</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>
@@ -3147,7 +3173,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">"Arakatzailearen aplikazioa"</string>
+    <string name="default_browser_title" msgid="8101772675085814670">"Arakatzailea"</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>
@@ -3219,6 +3245,7 @@
     <string name="usb_summary_file_transfers" msgid="6435943692610175111">"Fitxategiak transferitzeko"</string>
     <string name="usb_summary_photo_transfers" msgid="8440204169576585250">"Argazkiak transferitzeko (PTP)"</string>
     <string name="usb_summary_MIDI" msgid="5687906612187885908">"Gailua MIDI gisa erabiltzeko"</string>
+    <string name="sms_mirroring_pref" msgid="6475043279147376031">"SMS mezuak islatzea"</string>
     <string name="background_check_pref" msgid="7550258400138010979">"Atzeko planoko egiaztapena"</string>
     <string name="background_check_title" msgid="4534254315824525593">"Atzeko planorako sarbide osoa"</string>
     <string name="assist_access_context_title" msgid="2269032346698890257">"Erabili pantailako testua"</string>
@@ -3285,7 +3312,7 @@
     <string name="write_settings_title" msgid="4232152481902542284">"Sistemaren ezarpenak alda ditzaketenak"</string>
     <string name="write_system_settings" msgid="3482913590601096763">"Aldatu sistemaren ezarpenak"</string>
     <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="permit_write_settings" msgid="658555006453212691">"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>
@@ -3380,9 +3407,12 @@
     <string name="color_temperature" msgid="2070126836910615605">"Kolore hotzak"</string>
     <string name="color_temperature_desc" msgid="4793729830226404052">"Erabili kolore hotzagoak pantailan"</string>
     <string name="color_temperature_toast" msgid="4974218172133854827">"Kolorea aldatzeko, itzal ezazu pantaila"</string>
-    <string name="telephony_monitor_toast" msgid="7003764250271195384">"Telefono-gainbegiratzailean egindako aldaketa aplikatzeko, berrabiarazi gailua"</string>
+    <string name="connectivity_monitor_switch" msgid="9059759348648583421">"Konexio-kontrolatzailea"</string>
+    <string name="connectivity_monitor_switch_summary" msgid="2828658652378866401">"Konexio-kontrolatzaileak hautematen dituen konexio-arazoak erregistratuko ditu eta jakinarazpenak erakutsio dizkio erabiltzaileari akatsen berri eman dezan"</string>
+    <string name="connectivity_monitor_toast" msgid="5551859612881173028">"Konexio-kontrolatzailean egindako aldaketa aplikatzeko, berrabiarazi gailua"</string>
     <string name="camera_hal_hdrplus_switch" msgid="8377365197105267466">"Kameraren HAL HDR+ modua"</string>
     <string name="camera_hal_hdrplus_toast" msgid="2063703797270055299">"Kamera HAL HDR+ modura aldatzeko, berrabiarazi gailua"</string>
+    <string name="camera_laser_sensor_switch" msgid="8913588990743234440">"Kameraren laser-sentsorea"</string>
     <string name="ota_disable_automatic_update" msgid="2319639631655915050">"Sistemaren eguneratze automatikoak"</string>
     <string name="usage" msgid="2977875522080448986">"Erabilera"</string>
     <string name="cellular_data_usage" msgid="2155683719898158203">"Datu-konexioaren erabilera"</string>
@@ -3390,7 +3420,7 @@
     <string name="ethernet_data_usage" msgid="5108764537574354616">"Ethernet datuen erabilera"</string>
     <string name="wifi" msgid="1081550856200013637">"Wi-Fi konexioa"</string>
     <string name="ethernet" msgid="6600095783781389720">"Ethernet"</string>
-    <string name="cell_data_template" msgid="405684854174361041">"<xliff:g id="AMOUNT">^1</xliff:g> datu-konexioaren bidez"</string>
+    <string name="cell_data_template" msgid="405684854174361041">"Datu mugikorren <xliff:g id="AMOUNT">^1</xliff:g>"</string>
     <string name="wifi_data_template" msgid="6265570748799357386">"<xliff:g id="AMOUNT">^1</xliff:g> Wi-Fi konexioaren bidez"</string>
     <string name="ethernet_data_template" msgid="5782476509881033590">"<xliff:g id="AMOUNT">^1</xliff:g> ethernet-konexioaren bidez"</string>
     <string name="cell_warning_only" msgid="763147658209027140">"Datuen erabileraren abisua: <xliff:g id="ID_1">%1$s</xliff:g>"</string>
@@ -3408,7 +3438,7 @@
     <string name="data_warning" msgid="209133958008062117">"Datuen erabileraren abisua"</string>
     <string name="set_data_limit" msgid="2901526323210516923">"Ezarri datuen muga"</string>
     <string name="data_limit" msgid="1885406964934590552">"Datuen muga"</string>
-    <string name="data_usage_template" msgid="392191945602400904">"<xliff:g id="ID_1">%1$s</xliff:g> erabili dira (<xliff:g id="ID_2">%2$s</xliff:g>)"</string>
+    <string name="data_usage_template" msgid="2923744765873163859">"<xliff:g id="ID_1">%1$s</xliff:g> erabili ziren <xliff:g id="ID_2">%2$s</xliff:g> tartean"</string>
     <string name="configure" msgid="1029654422228677273">"Konfiguratu"</string>
     <string name="data_usage_other_apps" msgid="3272872663517382050">"Erabileran eragina duten beste aplikazio batzuk"</string>
     <plurals name="data_saver_unrestricted_summary" formatted="false" msgid="2635267833484232703">
@@ -3468,7 +3498,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">"Aplikazioen baimen bereziak"</string>
+    <string name="special_access" msgid="3458780842491881155">"Aplikazio-baimen bereziak"</string>
     <plurals name="special_access_summary" formatted="false" msgid="260765309935675867">
       <item quantity="other"><xliff:g id="COUNT">%d</xliff:g> aplikaziok dute datuak mugarik gabe erabiltzeko aukera</item>
       <item quantity="one">1 aplikaziok du datuak mugarik gabe erabiltzeko aukera</item>
@@ -3477,7 +3507,7 @@
     <string name="button_confirm_convert_fbe" msgid="7101855374850373091">"Ezabatu eduki guztia eta enkriptatu"</string>
     <string name="reset_shortcut_manager_throttling" msgid="6495066467198668994">"Berrezarri lasterbide-kudeatzailearen mugak"</string>
     <string name="reset_shortcut_manager_throttling_complete" msgid="1826770872063707900">"Berrezarri dira lasterbide-kudeatzailearen mugak"</string>
-    <string name="notification_suggestion_title" msgid="4506524937307816475">"Pantaila blokeatuko jakinarazpenak"</string>
+    <string name="notification_suggestion_title" msgid="387052719462473500">"Pantaila blokeatuko kontrolari buruzko informazioa"</string>
     <string name="notification_suggestion_summary" msgid="8521159741445416875">"Erakutsi edo ezkutatu jakinarazpenaren edukia"</string>
     <string name="page_tab_title_summary" msgid="4070309266374993258">"Guztiak"</string>
     <string name="page_tab_title_support" msgid="8483187649355540109">"Laguntza eta aholkuak"</string>
@@ -3485,7 +3515,7 @@
     <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>
     <string name="premium_sms_access" msgid="4660047004791638305">"Premium SMSetarako sarbidea"</string>
-    <string name="bluetooth_disabled" msgid="2456198532288640046">"Ezin dute ikusi gainerako gailuek"</string>
+    <string name="bluetooth_disabled" msgid="6244000672828617410">"Desaktibatuta"</string>
     <string name="bluetooth_connected_summary" msgid="7672528674593152862">"<xliff:g id="ID_1">%1$s</xliff:g> gailura konektatuta"</string>
     <string name="bluetooth_connected_multiple_devices_summary" msgid="9173661896296663932">"Gailu batera baino gehiagotara konektatuta"</string>
     <string name="demo_mode" msgid="2798762752209330277">"Sistemaren erabiltzaile-interfazearen demo modua"</string>
@@ -3587,7 +3617,7 @@
     <string name="web_action_enable_title" msgid="4051513950976670853">"Zuzeneko aplikazioak"</string>
     <string name="web_action_enable_summary" msgid="3108127559723396382">"Ireki aplikazioetako estekak, nahiz eta aplikazio horiek instalatuta ez egon"</string>
     <string name="web_action_section_title" msgid="7364647086538399136">"Zuzeneko aplikazioak"</string>
-    <string name="instant_apps_account" msgid="1433620209791992528">"Zuzeneko aplikazioekin erabili beharreko kontua"</string>
+    <string name="instant_apps_settings" msgid="8827777916518348213">"Zuzeneko aplikazioen hobespenak"</string>
     <string name="domain_url_section_title" msgid="7046835219056428883">"Instalatutako aplikazioak"</string>
     <string name="automatic_storage_manager_activation_warning" msgid="6353100011690933254">"Biltegi-kudeatzailea ari da biltegia kudeatzen"</string>
     <string name="account_for_section_header" msgid="5356566418548737121">"<xliff:g id="USER_NAME">%1$s</xliff:g> erabiltzailearen kontuak"</string>
@@ -3634,7 +3664,9 @@
     <string name="enterprise_privacy_always_on_vpn_personal" msgid="9217774730260037434">"Beti aktibatuta egongo den VPN konexioa aktibatu da zure profil pertsonalean"</string>
     <string name="enterprise_privacy_always_on_vpn_work" msgid="7244472958208315814">"Beti aktibatuta egongo den VPN konexioa aktibatu da zure laneko profilean"</string>
     <string name="enterprise_privacy_global_http_proxy" msgid="7936664553416257333">"HTTP proxy orokorra ezarri da"</string>
-    <string name="enterprise_privacy_ca_certs" msgid="5885892204903688909">"Kredentzial fidagarriak"</string>
+    <string name="enterprise_privacy_ca_certs_device" msgid="2019652712782510262">"Kredentzial fidagarriak"</string>
+    <string name="enterprise_privacy_ca_certs_personal" msgid="2279084820904076599">"Profil pertsonaleko kredentzial fidagarriak"</string>
+    <string name="enterprise_privacy_ca_certs_work" msgid="6187377647815301809">"Laneko profileko kredentzial fidagarriak"</string>
     <plurals name="enterprise_privacy_number_ca_certs" formatted="false" msgid="526375234629534165">
       <item quantity="other">Gutxienez <xliff:g id="COUNT_1">%d</xliff:g> CA ziurtagiri</item>
       <item quantity="one">Gutxienez <xliff:g id="COUNT_0">%d</xliff:g> CA ziurtagiri</item>
@@ -3697,6 +3729,8 @@
     <string name="carrier_provisioning" msgid="4398683675591893169">"Operadorearen hornikuntza-informazioa"</string>
     <string name="trigger_carrier_provisioning" msgid="3434865918009286187">"Abiarazi operadorearen hornikuntza"</string>
     <string name="new_device_suggestion_title" msgid="698847081680980774">"Zer berri dago?"</string>
-    <string name="new_device_suggestion_summary" msgid="7172709269203435870">"Eman begiratu bat bost eginbide nagusiei"</string>
+    <string name="new_device_suggestion_summary" product="default" msgid="206396571522515855">"Eman txango bat telefono berrian barrena"</string>
+    <string name="new_device_suggestion_summary" product="tablet" msgid="393751455688210956">"Eman txango bat tableta berrian barrena"</string>
+    <string name="new_device_suggestion_summary" product="device" msgid="2939870049868336652">"Eman txango bat gailu berrian barrena"</string>
     <string name="disabled_low_ram_device" msgid="3751578499721173344">"Eginbidea ez dago erabilgarri gailu honetan"</string>
 </resources>
diff --git a/res/values-fa/arrays.xml b/res/values-fa/arrays.xml
index cd8b986..9eead62 100644
--- a/res/values-fa/arrays.xml
+++ b/res/values-fa/arrays.xml
@@ -100,8 +100,6 @@
     <!-- no translation found for wifi_security_no_eap:0 (2084555984818107151) -->
     <!-- no translation found for wifi_security_no_eap:1 (397579322683471524) -->
     <!-- no translation found for wifi_security_no_eap:2 (1968820975358150484) -->
-    <!-- no translation found for wifi_ap_security:0 (5251664683198623324) -->
-    <!-- no translation found for wifi_ap_security:1 (7989073072260294673) -->
   <string-array name="wifi_eap_method">
     <item msgid="1160193392455075561">"PEAP"</item>
     <item msgid="7981731051382306293">"TLS"</item>
diff --git a/res/values-fa/strings.xml b/res/values-fa/strings.xml
index 2822723..0ec20ad 100644
--- a/res/values-fa/strings.xml
+++ b/res/values-fa/strings.xml
@@ -166,7 +166,7 @@
     <string name="bluetooth_map_acceptance_dialog_text" msgid="8712508202081143737">"‏%1$s می‌خواهد به پیام‌های شما دسترسی یابد. اجازه دسترسی به %2$s داده شود؟"</string>
     <string name="bluetooth_sap_request" msgid="2669762224045354417">"درخواست دسترسی به سیم‌‌کارت"</string>
     <string name="bluetooth_sap_acceptance_dialog_text" msgid="4414253873553608690">"<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g> می‌خواهد به سیم‌کارت شما دسترسی پیدا کند. درصورتی‌که به دسترسی به سیم‌کارت اجازه دهید، اتصال داده در مدت اتصال در دستگاه شما غیرفعال می‌شود. به <xliff:g id="DEVICE_NAME_1">%2$s?</xliff:g> اجازه دسترسی دهید"</string>
-    <string name="bluetooth_device_name_summary" msgid="4757990010751789977">"به‌عنوان «<xliff:g id="DEVICE_NAME">^1</xliff:g>» برای سایر دستگاه‌ها قابل مشاهده است"</string>
+    <string name="bluetooth_device_name_summary" msgid="522235742194965734">"به‌عنوان «<xliff:g id="DEVICE_NAME">^1</xliff:g>» برای دستگاه‌های دیگر قابل مشاهده است"</string>
     <string name="bluetooth_paired_device_title" msgid="8638994696317952019">"دستگاه‌های شما"</string>
     <string name="bluetooth_pairing_page_title" msgid="7712127387361962608">"مرتبط‌سازی دستگاه جدید"</string>
     <string name="date_and_time" msgid="9062980487860757694">"تاریخ و زمان"</string>
@@ -312,6 +312,8 @@
     <string name="zone_auto" msgid="334783869352026648">"منطقهٔ زمانی خودکار"</string>
     <string name="zone_auto_summaryOn" msgid="6142830927278458314">"استفاده از منطقهٔ زمانی ارائه‌شده از شبکه"</string>
     <string name="zone_auto_summaryOff" msgid="2597745783162041390">"استفاده از منطقهٔ زمانی ارائه‌شده از شبکه"</string>
+    <string name="date_time_24hour_auto" msgid="2117383168985653422">"قالب خودکار ۲۴ ساعته"</string>
+    <string name="date_time_24hour_auto_summary" msgid="6351812925651480277">"استفاده از پیش‌فرض محلی"</string>
     <string name="date_time_24hour_title" msgid="3203537578602803850">"قالب ۲۴ ساعته"</string>
     <string name="date_time_24hour" msgid="1193032284921000063">"استفاده از قالب ۲۴ ساعته"</string>
     <string name="date_time_set_time_title" msgid="6296795651349047016">"زمان"</string>
@@ -372,6 +374,9 @@
     <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="1961957425135180242">"بعدی"</string>
+    <string name="setup_fingerprint_enroll_skip_title" msgid="362050541117362034">"از تنظیم اثر انگشت رد می‌شوید؟"</string>
+    <string name="setup_fingerprint_enroll_skip_after_adding_lock_text" msgid="958990414356204763">"تنظیم اثر انگشت تنها یک یا دو دقیقه طول می‌کشد. اکر از این تنظیم رد شوید، می‌توانید اثر انگشتتان را بعداً در تنظیمات اضافه کنید."</string>
+    <string name="lock_screen_intro_skip_title" msgid="4988210105913705679">"از تنظیم قفل صفحه رد می‌شوید؟"</string>
     <string name="lock_screen_intro_skip_dialog_text_frp" product="tablet" msgid="1581834104051243425">"قابلیت‌های محافظت از دستگاه روشن نمی‌شوند. اگر رایانه لوحی گم، دزدیده یا بازنشانی شود، نمی‌توانید مانع استفاده دیگران از آن شوید."</string>
     <string name="lock_screen_intro_skip_dialog_text_frp" product="device" msgid="4629503416877189572">"قابلیت‌های محافظت از دستگاه روشن نمی‌شوند. اگر دستگاه گم، دزدیده یا بازنشانی شود، نمی‌توانید مانع استفاده دیگران از آن شوید."</string>
     <string name="lock_screen_intro_skip_dialog_text_frp" product="default" msgid="2423428240245737909">"قابلیت‌های محافظت از دستگاه روشن نمی‌شوند. اگر تلفن گم، دزدیده یا بازنشانی شود، نمی‌توانید مانع استفاده دیگران از آن شوید."</string>
@@ -457,7 +462,7 @@
     <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="lock_settings_picker_fingerprint_added_security_message" msgid="5768002109707648463">"برای امنیت بیشتر، قفل صفحه پشتیبان تنظیم کنید."</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>
@@ -499,29 +504,37 @@
     <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>
-    <!-- no translation found for unlock_disable_frp_warning_content_pattern_fingerprint (2986105377420905314) -->
-    <skip />
+    <string name="unlock_disable_frp_warning_content_pattern_fingerprint" msgid="2986105377420905314">"قابلیت‌های محافظت از دستگاه، بدون الگوی شما کار نمی‌کنند.<xliff:g id="EMPTY_LINE">
+
+</xliff:g>اثرانگشت‌های ذخیره‌شده‌تان هم از این دستگاه پاک می‌شود و نمی‌توانید با آن‌ها قفل تلفنتان را باز کنید، خریدها را تأیید کنید یا به سیستم برنامه‌ها وارد شوید."</string>
     <string name="unlock_disable_frp_warning_content_pin" msgid="586996206210265131">"قابلیت‌های محافظ دستگاه بدون پین شما کار نمی‌کند."</string>
-    <!-- no translation found for unlock_disable_frp_warning_content_pin_fingerprint (3370462835533123695) -->
-    <skip />
+    <string name="unlock_disable_frp_warning_content_pin_fingerprint" msgid="3370462835533123695">"قابلیت‌های محافظت از دستگاه، بدون پین شما کار نمی‌کنند.<xliff:g id="EMPTY_LINE">
+
+</xliff:g>اثرانگشت‌های ذخیره‌شده‌تان هم از این دستگاه پاک می‌شود و نمی‌توانید با آن‌ها قفل تلفنتان را باز کنید، خریدها را تأیید کنید یا به سیستم برنامه‌ها وارد شوید."</string>
     <string name="unlock_disable_frp_warning_content_password" msgid="5420612686852555537">"قابلیت‌های محافظ دستگاه بدون گذرواژه شما کار نمی‌کند."</string>
-    <!-- no translation found for unlock_disable_frp_warning_content_password_fingerprint (3595476296430536798) -->
-    <skip />
+    <string name="unlock_disable_frp_warning_content_password_fingerprint" msgid="3595476296430536798">"قابلیت‌های محافظت از دستگاه، بدون گذرواژه شما کار نخواهند کرد.<xliff:g id="EMPTY_LINE">
+
+</xliff:g>اثرانگشت‌های ذخیره‌شده‌تان هم از این دستگاه پاک می‌شود و نمی‌توانید با آن‌ها قفل تلفنتان را باز کنید، خریدها را تأیید کنید یا به سیستم برنامه‌ها وارد شوید."</string>
     <string name="unlock_disable_frp_warning_content_unknown" msgid="1550718040483548220">"قابلیت‌های محافظ دستگاه بدون قفل صفحه شما کار نمی‌کند."</string>
-    <!-- no translation found for unlock_disable_frp_warning_content_unknown_fingerprint (3679351662094349506) -->
-    <skip />
+    <string name="unlock_disable_frp_warning_content_unknown_fingerprint" msgid="3679351662094349506">"قابلیت‌های محافظت از دستگاه، بدون قفل صفحه شما کار نمی‌کنند.<xliff:g id="EMPTY_LINE">
+
+</xliff:g>اثرانگشت‌های ذخیره‌شده‌تان هم از این دستگاه پاک می‌شود و نمی‌توانید با آن‌ها قفل تلفنتان را باز کنید، خریدها را تأیید کنید یا به سیستم برنامه‌ها وارد شوید."</string>
     <string name="unlock_disable_frp_warning_content_pattern_profile" msgid="8682200103576359918">"ویژگی‌های محافظت از نمایه بدون الگوی شما کار نمی‌کنند."</string>
-    <!-- no translation found for unlock_disable_frp_warning_content_pattern_fingerprint_profile (6718155854303231675) -->
-    <skip />
+    <string name="unlock_disable_frp_warning_content_pattern_fingerprint_profile" msgid="6718155854303231675">"قابلیت‌های محافظت از نمایه، بدون الگوی شما کار نمی‌کنند.<xliff:g id="EMPTY_LINE">
+
+</xliff:g>اثرانگشت‌های ذخیره‌شده‌تان هم از این دستگاه پاک می‌شود و نمی‌توانید با آن‌ها قفل نمایه‌تان را باز کنید، خریدها را تأیید کنید یا به سیستم برنامه‌ها وارد شوید."</string>
     <string name="unlock_disable_frp_warning_content_pin_profile" msgid="7790688070593867767">"ویژگی‌های محافظت از نمایه بدون پین شما کار نمی‌کنند."</string>
-    <!-- no translation found for unlock_disable_frp_warning_content_pin_fingerprint_profile (4209564603132870532) -->
-    <skip />
+    <string name="unlock_disable_frp_warning_content_pin_fingerprint_profile" msgid="4209564603132870532">"قابلیت‌های محافظت از نمایه، بدون پین شما کار نمی‌کنند.<xliff:g id="EMPTY_LINE">
+
+</xliff:g>اثرانگشت‌های ذخیره‌شده‌تان هم از این نمایه پاک می‌شوند و نمی‌توانید با آن‌ها قفل نمایه‌تان را باز کنید، خریدها را تأیید کنید یا به سیستم برنامه‌ها وارد شوید."</string>
     <string name="unlock_disable_frp_warning_content_password_profile" msgid="7569285520567674461">"ویژگی‌های محافظت از نمایه بدون گذرواژه شما کار نمی‌کنند."</string>
-    <!-- no translation found for unlock_disable_frp_warning_content_password_fingerprint_profile (2994300676764706047) -->
-    <skip />
+    <string name="unlock_disable_frp_warning_content_password_fingerprint_profile" msgid="2994300676764706047">"قابلیت‌های محافظت از نمایه، بدون گذرواژه شما کار نخواهند کرد.<xliff:g id="EMPTY_LINE">
+
+</xliff:g>اثرانگشت‌های ذخیره‌شده‌تان هم از این دستگاه پاک می‌شود و نمی‌توانید با آن‌ها قفل نمایه‌تان را باز کنید، خریدها را تأیید کنید یا به سیستم برنامه‌ها وارد شوید."</string>
     <string name="unlock_disable_frp_warning_content_unknown_profile" msgid="6984215718701688202">"ویژگی‌های محافظت از نمایه بدون قفل صفحه شما کار نمی‌کنند."</string>
-    <!-- no translation found for unlock_disable_frp_warning_content_unknown_fingerprint_profile (4994062501123299418) -->
-    <skip />
+    <string name="unlock_disable_frp_warning_content_unknown_fingerprint_profile" msgid="4994062501123299418">"قابلیت‌های محافظت از نمایه، بدون قفل صفحه شما کار نمی‌کنند.<xliff:g id="EMPTY_LINE">
+
+</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>
@@ -580,6 +593,7 @@
     <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="lockpassword_clear_label" msgid="5724429464960458155">"پاک کردن"</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>
@@ -763,16 +777,17 @@
     <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>
@@ -809,6 +824,8 @@
     <string name="wifi_wps_available_first_item" msgid="4422547079984583502">"‏WPS در دسترس است"</string>
     <string name="wifi_wps_available_second_item" msgid="8427520131718215301">" ‏ (WPS در دسترس است)"</string>
     <string name="wifi_wps_nfc_enter_password" msgid="2288214226916117159">"گذرواژه شبکه‌تان را وارد کنید"</string>
+    <string name="wifi_carrier_connect" msgid="8174696557882299911">"‏شبکه Wi‑Fi شرکت مخابراتی"</string>
+    <string name="wifi_carrier_content" msgid="4634077285415851933">"اتصال ازطریق <xliff:g id="NAME">%1%s</xliff:g>"</string>
     <string name="wifi_scan_always_turnon_message" msgid="203123538572122989">"‏برای بهبود دقت موقعیت مکانی و مقاصد دیگر، <xliff:g id="APP_NAME">%1$s</xliff:g> می‌خواهد اسکن کردن شبکه را فعال کند، حتی هنگامی که Wi-Fi خاموش است.\n\nاین مورد را برای همه برنامه‌هایی که می‌خواهند اسکن کنند مجاز می‌کنید؟"</string>
     <string name="wifi_scan_always_turnoff_message" msgid="5538901671131941043">"برای خاموش کردن این مورد، در منوی لبریزشده، به «پیشرفته» بروید."</string>
     <string name="wifi_scan_always_confirm_allow" msgid="5355973075896817232">"مجاز است"</string>
@@ -826,6 +843,7 @@
     <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_modify" msgid="6100248070440710782">"اصلاح"</string>
     <string name="wifi_failed_forget_message" msgid="1348172929201654986">"شبکه فراموش نشد"</string>
     <string name="wifi_save" msgid="3331121567988522826">"ذخیره"</string>
     <string name="wifi_failed_save_message" msgid="6650004874143815692">"شبکه ذخیره نشد"</string>
@@ -838,6 +856,7 @@
     <string name="wifi_advanced_titlebar" msgid="4485841401774142908">"‏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_title" msgid="3471132676909349382">"اطلاعات شبکه"</string>
     <string name="wifi_details_subnet_mask" msgid="6720279144174924410">"پوشش زیرشبکه"</string>
     <string name="wifi_details_dns" msgid="8648826607751830768">"DNS"</string>
     <string name="wifi_details_ipv6_address_header" msgid="6734119149106422148">"‏نشانی‌های IPv6"</string>
@@ -870,16 +889,15 @@
     <string name="wifi_p2p_cancel_connect_title" msgid="255267538099324413">"دعوتنامه لغو شود؟"</string>
     <string name="wifi_p2p_cancel_connect_message" msgid="7477756213423749402">"آیا می‌خواهید دعوت برای ارتباط با <xliff:g id="PEER_NAME">%1$s</xliff:g> را لغو کنید؟"</string>
     <string name="wifi_p2p_delete_group_message" msgid="834559380069647086">"این گروه فراموش شود؟"</string>
-    <string name="wifi_tether_checkbox_text" msgid="1847167643625779136">"‏نقطه اتصال قابل حمل Wi-Fi"</string>
     <string name="wifi_hotspot_checkbox_text" msgid="7763495093333664887">"‏نقطه اتصال Wi-Fi"</string>
     <string name="wifi_hotspot_off_subtext" msgid="5466126533609394170">"اینترنت یا محتوا با سایر دستگاه‌ها به اشتراک گذاشته نمی‌شود"</string>
     <string name="wifi_hotspot_tethering_on_subtext" product="tablet" msgid="5752490509369962007">"اتصال اینترنت این رایانه لوحی ازطریق نقطه اتصال اشتراک‌گذاری می‌شود"</string>
     <string name="wifi_hotspot_tethering_on_subtext" product="default" msgid="6461075246164300670">"اتصال اینترنت این تلفن ازطریق نقطه اتصال اشتراک‌گذاری می‌شود"</string>
     <string name="wifi_hotspot_on_local_only_subtext" msgid="2068110388011294735">"برنامه محتوا را به اشتراک می‌گذارد. برای اشتراک‌گذاری اتصال اینترنت، نقطه اتصال را خاموش و سپس روشن کنید"</string>
-    <string name="wifi_hotspot_name_title" msgid="1341735529132128887">"‏نام Wi‑Fi"</string>
+    <string name="wifi_hotspot_name_title" msgid="8237000746618636778">"نام نقطه اتصال"</string>
     <string name="wifi_hotspot_name_summary_connecting" msgid="3378299995508671967">"درحال روشن کردن <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>…"</string>
     <string name="wifi_hotspot_name_summary_connected" msgid="3888672084861445362">"سایر دستگاه‌ها می‌توانند به <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g> متصل شوند."</string>
-    <string name="wifi_hotspot_password_title" msgid="1955592302902091281">"‏گذرواژه Wi-Fi"</string>
+    <string name="wifi_hotspot_password_title" msgid="8676859981917573801">"گذرواژه نقطه اتصال"</string>
     <string name="wifi_hotspot_ap_band_title" msgid="1165801173359290681">"‏باند AP"</string>
     <string name="wifi_hotspot_footer_info_regular" msgid="1203489406068036455">"‏برای ایجاد یک شبکه Wi‑Fi برای سایر دستگاه‌ها، از نقطه اتصال استفاده کنید. نقطه اتصال با استفاده از اتصال داده تلفن همراه، اینترنت ارائه می‌دهد. ممکن است هزینه‌های داده تلفن همراه اضافه اعمال شوند."</string>
     <string name="wifi_hotspot_footer_info_local_only" msgid="857988412470694109">"برنامه‌ها می‌توانند نقطه اتصالی ایجاد کنند تا محتوا را با دستگاه‌های اطراف به اشتراک بگذارند."</string>
@@ -890,7 +908,6 @@
     <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">"‏تماس از طریق Wi-Fi"</string>
     <string name="wifi_calling_suggestion_title" msgid="9008010480466359578">"‏روشن کردن تماس ازطریق Wi-Fi"</string>
@@ -931,7 +948,7 @@
     <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="emergency_address_summary" msgid="3266760199681945746">"‏نشانی‌ای که اگر ازطریق Wi-Fi تماسی اضطراری برقرار کنید، خدمات اضطراری از آن به‌عنوان مکان شما استفاده می‌‌کند"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"صفحه‌نمایش"</string>
     <string name="sound_settings" msgid="5534671337768745343">"صدا"</string>
     <string name="all_volume_title" msgid="4296957391257836961">"میزان صدا"</string>
@@ -985,6 +1002,7 @@
     <string name="search_settings" msgid="1910951467596035063">"جستجو"</string>
     <string name="search_settings_summary" msgid="9205656546570654169">"مدیریت تنظیمات جستجو و سابقه"</string>
     <string name="search_settings_no_results" msgid="8799027492641230999">"نتیجه‌ای پیدا نشد"</string>
+    <string name="search_clear_history" msgid="4196658962573162457">"پاک کردن سابقه"</string>
     <string name="display_settings" msgid="7965901687241669598">"صفحه‌نمایش"</string>
     <string name="accelerometer_title" msgid="7854608399547349157">"چرخش خودکار صفحه"</string>
     <string name="color_mode_title" msgid="3159275920408338215">"رنگ‌های زنده"</string>
@@ -1055,15 +1073,13 @@
     <string name="automatic_brightness" msgid="5014143533884135461">"روشنایی خودکار"</string>
     <string name="lift_to_wake_title" msgid="4555378006856277635">"بیدار شدن با بالا بردن"</string>
     <string name="ambient_display_screen_title" msgid="4252755516328775766">"نمایشگر محیط"</string>
-    <!-- no translation found for ambient_display_screen_summary_always_on (7337555569694794132) -->
-    <skip />
+    <string name="ambient_display_screen_summary_always_on" msgid="7337555569694794132">"همیشه روشن / مصرف شارژ بالا"</string>
     <string name="ambient_display_screen_summary_notifications" msgid="1449570742600868654">"اعلان‌های جدید"</string>
     <string name="ambient_display_category_triggers" msgid="4359289754456268573">"زمان نمایش دادن"</string>
     <string name="doze_title" msgid="2375510714460456687">"اعلان‌های جدید"</string>
     <string name="doze_summary" msgid="3846219936142814032">"روشن شدن صفحه‌نمایش هنگامی که اعلانی دریافت می‌کنید"</string>
     <string name="doze_always_on_title" msgid="1046222370442629646">"همیشه روشن"</string>
-    <!-- no translation found for doze_always_on_summary (6978257596231155345) -->
-    <skip />
+    <string name="doze_always_on_summary" msgid="6978257596231155345">"نمایش زمان، نمادهای اعلان و سایر اطلاعات. مصرف شارژ بالا."</string>
     <string name="title_font_size" msgid="4405544325522105222">"اندازه قلم"</string>
     <string name="short_summary_font_size" msgid="6819778801232989076">"نوشتار را بزرگ‌تر یا کوچک‌تر کنید"</string>
     <string name="sim_lock_settings" msgid="3392331196873564292">"تنظیمات قفل سیم کارت"</string>
@@ -1116,7 +1132,6 @@
     <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>
     <string name="device_status_activity_title" msgid="1411201799384697904">"وضعیت"</string>
     <string name="device_status" msgid="607405385799807324">"وضعیت"</string>
@@ -1144,7 +1159,6 @@
     <string name="status_wifi_mac_address" msgid="2202206684020765378">"‏آدرس Wi-Fi MAC"</string>
     <string name="status_bt_address" msgid="4195174192087439720">"آدرس بلوتوث"</string>
     <string name="status_serial_number" msgid="2257111183374628137">"شمارهٔ سریال"</string>
-    <string name="status_unavailable" msgid="7862009036663793314">"در دسترس نیست"</string>
     <string name="status_up_time" msgid="7294859476816760399">"زمان فعالیت"</string>
     <string name="status_awake_time" msgid="2393949909051183652">"زمان بیداری"</string>
     <string name="internal_memory" msgid="9129595691484260784">"حافظهٔ داخلی"</string>
@@ -1320,6 +1334,7 @@
     <string name="menu_restore" msgid="8260067415075573273">"بازنشانی به موارد پیش‌فرض"</string>
     <string name="restore_default_apn_completed" msgid="2824775307377604897">"بازنشانی تنظیمات پیش‌فرض نام نقطه دستیابی انجام شد."</string>
     <string name="reset_dashboard_title" msgid="6254873816990678620">"بازنشانی گزینه‌ها"</string>
+    <string name="reset_dashboard_summary" msgid="4851012632493522755">"شبکه، برنامه‌ها یا دستگاه می‌توانند بازنشانی شوند"</string>
     <string name="reset_network_title" msgid="6166025966016873843">"‏بازنشانی Wi-Fi، داده شبکه همراه و بلوتوث"</string>
     <string name="reset_network_desc" msgid="5547979398298881406">"‏این کار همه تنظیمات شبکه را بازنشانی می‌کند، ازجمله:\n\n"<li>"Wi-Fi‏"</li>\n<li>"داده شبکه تلفن همراه"</li>\n<li>"بلوتوث"</li></string>
     <string name="reset_network_button_text" msgid="2035676527471089853">"بازنشانی تنظیمات"</string>
@@ -1328,17 +1343,14 @@
     <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="6617679904229218425">"پاک کردن همه داده‌ها (بازنشانی کارخانه‌ای)"</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>
-    </plurals>
-    <string name="master_clear_summary" msgid="6902443944660426951">"فضای ذخیره‌سازی داخلی و همه داده‌ها بازنشانی خواهند شد"</string>
+    <string name="master_clear_title" msgid="3531267871084279512">"پاک کردن همه داده‌ها (بازنشانی کارخانه‌ای)"</string>
     <string name="master_clear_desc" product="tablet" msgid="9146059417023157222">"‏با این کار همه داده‌های "<b>"حافظهٔ داخلی"</b>" رایانهٔ لوحی شما پاک می‌شود، از جمله:\n\n"<li>"حساب Google شما"<li>\n</li>"داده‌ها و تنظیمات برنامه و سیستم"<li>\n</li>"برنامه‌های بارگیری شده"</li></string>
     <string name="master_clear_desc" product="default" msgid="4800386183314202571">"‏با این کار همه داده‌های "<b>"حافظه داخلی"</b>" گوشی شما پاک می‌شود، از جمله:\n\n"<li>"حساب Google شما"</li>\n<li>"تنیمات و داده‌های برنامه و سیستم"</li>\n<li>"برنامه‌های بارگیری شده"</li></string>
     <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"شما در حال حاضر به حساب‌های زیر وارد شده‌اید:\n"</string>
     <string name="master_clear_other_users_present" product="default" msgid="5161423070702470742">\n\n"کاربران دیگری در این دستگاه وجود دارند.\n"</string>
     <string name="master_clear_desc_also_erases_external" msgid="1903185203791274237"><li>"موسیقی"</li>\n<li>"عکس ها"</li>\n<li>"سایر اطلاعات کاربر"</li></string>
+    <string name="master_clear_desc_also_erases_esim" msgid="312352697653096008">"‏"<li>"شرکت‌های مخابراتی در eSIM"</li></string>
+    <string name="master_clear_desc_no_cancel_mobile_plan" msgid="5460926449093211144">\n\n"با این کار طرح سرویس تلفن همراهتان لغو نخواهد شد."</string>
     <string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="7744115866662613411">"‏\n\nبرای پاک کردن موسیقی، عکس‌ها و سایر داده‌های کاربر، "<b>"حافظهٔ 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>
@@ -1455,15 +1467,16 @@
     <string name="settings_safetylegal_activity_title" msgid="6901214628496951727">"اطلاعات ایمنی"</string>
     <string name="settings_safetylegal_activity_unreachable" msgid="250674109915859456">"‏شما اتصال داده ندارید. برای اینکه هم‌اکنون این اطلاعات را مشاهده کنید، از هر رایانه متصل به اینترنت به %s بروید."</string>
     <string name="settings_safetylegal_activity_loading" msgid="8059022597639516348">"در حال بارگیری…"</string>
-    <string name="lockpassword_choose_your_password_header" msgid="8624900666929394990">"انتخاب گذرواژه"</string>
-    <string name="lockpassword_choose_your_password_header_for_fingerprint" msgid="6624409510609085450">"تنظیم گذرواژه برای استفاده از اثر انگشت"</string>
-    <string name="lockpassword_choose_your_pattern_header" msgid="6949761069941694050">"انتخاب الگو"</string>
-    <string name="lockpassword_choose_your_pattern_header_for_fingerprint" msgid="5901096361617543819">"تنظیم الگو برای استفاده از اثر انگشت"</string>
-    <string name="lockpassword_choose_your_pin_header" msgid="7598849519816138302">"انتخاب پین"</string>
-    <string name="lockpassword_choose_your_pin_header_for_fingerprint" msgid="765344692615917183">"تنظیم پین برای استفاده از اثر انگشت"</string>
-    <string name="lockpassword_confirm_your_password_header" msgid="6308478184889846633">"تأیید گذرواژه"</string>
+    <string name="lockpassword_choose_your_screen_lock_header" msgid="3872462096767152394">"قفل صفحه‌ای تنظیم کنید"</string>
+    <string name="lockpassword_choose_your_password_message" msgid="1197569283524841412">"برای حفظ امنیت، گذرواژه‌‌ای تنظیم کنید"</string>
+    <string name="lockpassword_choose_your_password_header_for_fingerprint" msgid="2541818487015343503">"برای استفاده از اثر انگشت، گذرواژه تنظیم کنید"</string>
+    <string name="lockpassword_choose_your_pattern_header_for_fingerprint" msgid="7709785406243556723">"برای استفاده از اثر انگشت، الگو تنظیم کنید"</string>
+    <string name="lockpassword_choose_your_pin_message" msgid="1875420718677275646">"برای حفظ امنیت، پین تنظیم کنید"</string>
+    <string name="lockpassword_choose_your_pin_header_for_fingerprint" msgid="1549639053195796674">"برای استفاده از اثر انگشت، پین تنظیم کنید"</string>
+    <string name="lockpassword_choose_your_pattern_message" msgid="5986983400689720015">"برای حفظ امنیت، الگو تنظیم کنید"</string>
+    <string name="lockpassword_confirm_your_password_header" msgid="1266027268220850931">"گذرواژه‌ خود را دوباره وارد کنید"</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="7744513791910572550">"پین خود را دوباره وارد کنید"</string>
     <string name="lockpassword_confirm_passwords_dont_match" msgid="5140892109439191415">"گذرواژه‌ها مطابقت ندارند"</string>
     <string name="lockpassword_confirm_pins_dont_match" msgid="7226244811505606217">"پین ها با یکدیگر مطابقت ندارند"</string>
     <string name="lockpassword_choose_lock_generic_header" msgid="3811438094903786145">"انتخاب روش بازکردن قفل"</string>
@@ -1476,18 +1489,18 @@
     <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>
-    <!-- no translation found for lockpassword_strong_auth_required_device_pattern (530802132223800623) -->
-    <skip />
-    <!-- no translation found for lockpassword_strong_auth_required_device_pin (7829294830078036417) -->
-    <skip />
-    <!-- no translation found for lockpassword_strong_auth_required_device_password (3552644641574796973) -->
-    <skip />
-    <!-- no translation found for lockpassword_strong_auth_required_work_pattern (3003781907040522053) -->
-    <skip />
-    <!-- no translation found for lockpassword_strong_auth_required_work_pin (3367491332598821552) -->
-    <skip />
-    <!-- no translation found for lockpassword_strong_auth_required_work_password (8159775129968582940) -->
-    <skip />
+    <string name="lockpassword_strong_auth_required_device_pattern" msgid="530802132223800623">"برای امنیت بیشتر، از الگوی دستگاهتان استفاده کنید"</string>
+    <string name="lockpassword_strong_auth_required_device_pin" msgid="7829294830078036417">"برای امنیت بیشتر، پین دستگاهتان را وارد کنید"</string>
+    <string name="lockpassword_strong_auth_required_device_password" msgid="3552644641574796973">"برای امنیت بیشتر، گذرواژه دستگاهتان را وارد کنید"</string>
+    <string name="lockpassword_strong_auth_required_work_pattern" msgid="3003781907040522053">"برای امنیت بیشتر، از الگوی کاری‌تان استفاده کنید"</string>
+    <string name="lockpassword_strong_auth_required_work_pin" msgid="3367491332598821552">"برای امنیت بیشتر، پین کاری‌تان را وارد کنید"</string>
+    <string name="lockpassword_strong_auth_required_work_password" msgid="8159775129968582940">"برای امنیت بیشتر، گذرواژه کاری‌تان را وارد کنید"</string>
+    <string name="lockpassword_confirm_your_pattern_details_frp" msgid="6757336656791723193">"تلفن شما به تنظیمات کارخانه بازنشانی شده است. برای استفاده از این تلفن، الگوی قبلی خود را وارد کنید."</string>
+    <string name="lockpassword_confirm_your_pin_details_frp" msgid="826520613445990470">"تلفن شما به تنظیمات کارخانه بازنشانی شده است. برای استفاده از این تلفن، پین قبلی خود را وارد کنید."</string>
+    <string name="lockpassword_confirm_your_password_details_frp" msgid="8944081074615739040">"تلفن شما به تنظیمات کارخانه بازنشانی شده است. برای استفاده از این تلفن، گذرواژه قبلی خود را وارد کنید."</string>
+    <string name="lockpassword_confirm_your_pattern_header_frp" msgid="2898036091609128286">"تأیید الگو"</string>
+    <string name="lockpassword_confirm_your_pin_header_frp" msgid="4141601774778898803">"تأیید پین"</string>
+    <string name="lockpassword_confirm_your_password_header_frp" msgid="3762615419295360480">"تأیید گذرواژه"</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>
@@ -1537,7 +1550,6 @@
     <string name="install_applications_title" msgid="4987712352256508946">"همه منابع برنامه مجاز است"</string>
     <string name="recent_app_category_title" msgid="6673071268966003928">"برنامه‌های اخیراً بازشده"</string>
     <string name="see_all_apps_title" msgid="1317153498074308438">"مشاهده همه <xliff:g id="COUNT">%1$d</xliff:g> برنامه"</string>
-    <string name="recent_app_summary" msgid="3366446669844932300">"<xliff:g id="TIME">^1</xliff:g> قبل"</string>
     <string name="install_all_warning" product="tablet" msgid="8310489909586138165">"رایانه لوحی و داده‌های شخصی شما بیشتر درمعرض خطر حمله برنامه‌های ناشناس هستند. با نصب برنامه از این منبع، موافقت می‌کنید که درقبال هرگونه آسیب وارده به رایانه لوحی یا از دست دادن داده‌هایتان که در نتیجه استفاده از این برنامه‌ها روی دهد، خودتان مسئول هستید."</string>
     <string name="install_all_warning" product="default" msgid="1952257127370115988">"تلفن و داده‌های شخصی شما بیشتر درمعرض خطر حمله برنامه‌های ناشناس هستند. با نصب برنامه از این منبع، موافقت می‌کنید که درقبال هرگونه آسیب وارده به تلفن یا از دست دادن داده‌هایتان که در نتیجه استفاده از این برنامه‌ها روی دهد، خودتان مسئول هستید."</string>
     <string name="advanced_settings" msgid="1777249286757067969">"تنظیمات پیشرفته"</string>
@@ -1801,7 +1813,7 @@
     <string name="accessibility_settings_summary" msgid="981260486011624939">"صفحه‌خوان‌ها، نمایشگر، کنترل‌های تعامل"</string>
     <string name="vision_settings_title" msgid="4204111425716868288">"تنظیمات بینایی"</string>
     <string name="vision_settings_description" msgid="5679491180156408260">"می‌توانید این دستگاه را متناسب با نیازهایتان سفارشی کنید. می‌توانید بعداً در «تنظیمات»، این قابلیت‌های دسترس‌پذیری را تغییر دهید."</string>
-    <string name="vision_settings_suggestion_title" msgid="917294957154878441">"افزایش اندازه قلم"</string>
+    <string name="vision_settings_suggestion_title" msgid="8058794060304707004">"تغییر اندازه قلم"</string>
     <string name="screen_reader_category_title" msgid="7739154903913400641">"صفحه‌خوان‌ها"</string>
     <string name="audio_and_captions_category_title" msgid="3420727114421447524">"صدا و نوشتار روی صفحه"</string>
     <string name="display_category_title" msgid="685461049938269166">"نمایشگر"</string>
@@ -1838,7 +1850,6 @@
     <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="preference_summary_default_combination" msgid="8532964268242666060">"<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>
@@ -1957,12 +1968,14 @@
     <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_whitelisted" msgid="7375400051141016808">"برنامه برای استفاده از باتری قابل بهینه‌سازی نیست"</string>
+    <string name="background_activity_warning_dialog_title" msgid="2216249969149568871">"فعالیت پس‌زمینه محدود شود؟"</string>
+    <string name="background_activity_warning_dialog_text" msgid="7049624449246121981">"محدود کردن فعالیت پس‌زمینه برای برنامه ممکن است باعث عملکرد نادرست آن شود."</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" msgid="6393929085382334341">"مصرف برنامه از زمان شارژ کامل (<xliff:g id="RELATIVE_TIME">^1</xliff:g>)"</string>
+    <string name="power_usage_list_summary_device" msgid="4461926045610455423">"مصرف دستگاه از زمان شارژ کامل (<xliff:g id="RELATIVE_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>
@@ -2208,14 +2221,14 @@
     <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">"گذرواژه باید حداقل ۸ نویسه داشته باشد."</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_configure_lock_screen_hint" msgid="8058230497337529036">"قبل از اینکه بتوانید از حافظه اطلاعات کاربری استفاده کنید، دستگاهتان باید قفل صفحه ایمنی داشته باشد."</string>
+    <string name="credentials_configure_lock_screen_button" msgid="253239765216055321">"تنظیم قفل"</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>
@@ -2335,8 +2348,6 @@
     <skip />
     <string name="cant_sync_dialog_title" msgid="2777238588398046285">"نمی‌توان به‌صورت دستی همگام‌سازی کرد"</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>
@@ -2350,6 +2361,7 @@
     <string name="misc_files_selected_count" msgid="4647048020823912088">"<xliff:g id="NUMBER">%1$d</xliff:g> مورد از <xliff:g id="TOTAL">%2$d</xliff:g> انتخاب شده"</string>
     <string name="misc_files_selected_count_bytes" msgid="2876232009069114352">"<xliff:g id="NUMBER">%1$s</xliff:g> از مجموع <xliff:g id="TOTAL">%2$s</xliff:g>"</string>
     <string name="select_all" msgid="1562774643280376715">"انتخاب همه"</string>
+    <string name="data_plan_usage_manage_plans_button_text" msgid="8997761990902708162">"مدیریت طرح‌ها"</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>
@@ -2435,6 +2447,9 @@
     <string name="data_usage_metered_mobile" msgid="5423305619126978393">"شبکه‌های تلفن همراه"</string>
     <string name="data_usage_metered_wifi" msgid="1761738002328299714">"‏شبکه‌های Wi-Fi اندازه‌گیری‌شده"</string>
     <string name="data_usage_metered_wifi_disabled" msgid="727808462375941567">"‏برای انتخاب شبکه‌های اندازه‌گیری‌شده، Wi‑Fi را روشن کنید."</string>
+    <string name="data_usage_metered_auto" msgid="1262028400911918865">"خودکار"</string>
+    <string name="data_usage_metered_yes" msgid="9217539611385225894">"پهنای باند محدود"</string>
+    <string name="data_usage_metered_no" msgid="4025232961929071789">"پهنای باند نامحدود"</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>
@@ -2526,9 +2541,6 @@
     <string name="backup_pw_set_button_text" msgid="2387480910044648795">"تنظیم گذرواژه پشتیبان‌گیری"</string>
     <string name="backup_pw_cancel_button_text" msgid="8845630125391744615">"لغو"</string>
     <string name="additional_system_update_settings_list_item_title" msgid="214987609894661992">"به‌روزرسانی‌های دیگر سیستم"</string>
-    <string name="selinux_status_disabled" msgid="924551035552323327">"غیرفعال"</string>
-    <string name="selinux_status_permissive" msgid="6004965534713398778">"مجاز"</string>
-    <string name="selinux_status_enforcing" msgid="2252703756208463329">"در حال اعمال"</string>
     <string name="ssl_ca_cert_warning" msgid="2045866713601984673">"ممکن است شبکه پایش شود"</string>
     <string name="done_button" msgid="1991471253042622230">"تمام"</string>
     <plurals name="ssl_ca_cert_dialog_title" formatted="false" msgid="7145092748045794650">
@@ -2642,8 +2654,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>
@@ -2785,8 +2797,7 @@
     <string name="keywords_gesture" msgid="3526905012224714078">"اشاره‌ها"</string>
     <string name="keywords_payment_settings" msgid="5220104934130446416">"پرداخت کردن، ضربه زدن، پرداخت‌ها"</string>
     <string name="keywords_backup" msgid="470070289135403022">"پشتیبان‌گیری، پشتیبان"</string>
-    <!-- no translation found for keywords_assist_gesture_launch (813968759791342591) -->
-    <skip />
+    <string name="keywords_assist_gesture_launch" msgid="813968759791342591">"اشاره"</string>
     <string name="setup_wifi_nfc_tag" msgid="9028353016222911016">"‏تنظیم برچسب NFC برای Wi-Fi"</string>
     <string name="write_tag" msgid="8571858602896222537">"نوشتن"</string>
     <string name="status_awaiting_tap" msgid="2130145523773160617">"ضربه زدن روی یک برچسب برای نوشتن..."</string>
@@ -2872,13 +2883,15 @@
     <string name="notifications_title" msgid="8086372779371204971">"اعلان‌ها"</string>
     <string name="app_notifications_title" msgid="5810577805218003760">"اعلان‌های برنامه"</string>
     <string name="notification_channel_title" msgid="2260666541030178452">"دسته اعلان"</string>
+    <string name="notification_group_title" msgid="7180506440133859601">"گروه دسته اعلان"</string>
     <string name="notification_importance_title" msgid="848692592679312666">"اهمیت"</string>
-    <string name="notification_importance_unspecified" msgid="2196023702875112081">"برنامه خودش تصمیم بگیرد"</string>
+    <string name="notification_importance_unspecified" msgid="6622173510486113958">"صدا مجاز است"</string>
     <string name="notification_importance_blocked" msgid="7938180808339386300">"هرگز اعلان‌ها نمایش داده نشوند"</string>
     <string name="notification_importance_min" msgid="5455049524984686275">"بدون وقفه صوتی و تصویری"</string>
     <string name="notification_importance_low" msgid="8881468429453766553">"بدون‌صدا"</string>
     <string name="notification_importance_default" msgid="5958338024601957516">"پخش صدا"</string>
     <string name="notification_importance_high" msgid="2082429479238228527">"پخش صدا و صفحه بازشو"</string>
+    <string name="notification_importance_high_silent" msgid="2667033773703765252">"صفحه بازشو"</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>
@@ -2915,15 +2928,19 @@
     <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>
-    <!-- no translation found for picture_in_picture_app_detail_summary (1264019085827708920) -->
-    <skip />
+    <string name="picture_in_picture_app_detail_summary" msgid="1264019085827708920">"به این برنامه امکان دهید زمانی‌که باز است یا پس از اینکه از آن خارج شدید (مثلاً برای ادامه تماشای یک ویدیو)، پنجره تصویر در تصویر ایجاد کند. این پنجره روی سایر برنامه‌هایی که درحال استفاده هستید نمایش داده می‌شود."</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="channel_group_notifications_off_desc" msgid="1620950416247316370">"‏Android نمایش این گروه از اعلان‌ها را در این دستگاه مسدود می‌کند"</string>
     <string name="notification_channels" msgid="5346841743182627500">"دسته‌ها"</string>
     <string name="notification_channels_other" msgid="5645317113885788226">"موارد دیگر"</string>
+    <plurals name="notification_group_summary" formatted="false" msgid="3420621520561455358">
+      <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="no_channels" msgid="3077375508177744586">"این برنامه هیچ اعلانی پست نکرده است"</string>
     <string name="app_settings_link" msgid="8894946007543660906">"تنظیمات بیشتر در برنامه"</string>
     <string name="app_notification_listing_summary_zero" msgid="6482582965081108108">"روشن برای همه برنامه‌ها"</string>
@@ -3000,6 +3017,7 @@
     <string name="zen_mode_from_starred" msgid="2678345811950997027">"تنها از مخاطین ستاره‌دار"</string>
     <string name="zen_mode_from_none" msgid="8219706639954614136">"هیچ‌کدام"</string>
     <string name="zen_mode_alarms" msgid="2165302777886552926">"هشدارها"</string>
+    <string name="zen_mode_alarms_summary" msgid="3774926045611788635">"هشدارها همیشه اولویت دارند و صدا ایجاد می‌کنند"</string>
     <string name="zen_mode_reminders" msgid="5458502056440485730">"یادآوری‌ها"</string>
     <string name="zen_mode_events" msgid="7914446030988618264">"رویدادها"</string>
     <string name="zen_mode_all_callers" msgid="584186167367236922">"همه تماس‌گیرندگان"</string>
@@ -3034,6 +3052,7 @@
     <string name="zen_mode_screen_off_visual_interruptions" msgid="4850792880144382633">"وقتی صفحه‌نمایش روشن است"</string>
     <string name="zen_mode_no_visual_interruptions" msgid="8742776003822778472">"وقتی صفحه‌نمایش روشن یا خاموش است"</string>
     <string name="notification_app_settings_button" msgid="6685640230371477485">"تنظیمات اعلان"</string>
+    <string name="suggestion_button_text" msgid="3275010948381252006">"تأیید"</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>
@@ -3139,7 +3158,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>
@@ -3218,6 +3237,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="sms_mirroring_pref" msgid="6475043279147376031">"نمایش پیامک در دستگاه دیگر"</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>
@@ -3284,7 +3304,8 @@
     <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>
+    <!-- no translation found for permit_write_settings (658555006453212691) -->
+    <skip />
     <string name="write_settings_description" msgid="6868293938839954623">"این مجوز به برنامه امکان می‌دهد تنظیمات سیستم را تغییر دهد."</string>
     <string name="write_settings_on" msgid="8230580416068832239">"بله"</string>
     <string name="write_settings_off" msgid="5156104383386336233">"نه"</string>
@@ -3379,9 +3400,12 @@
     <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">"‏برای اعمال تغییر Telephony Monitor، دستگاه را راه‌اندازی مجدد کنید"</string>
+    <string name="connectivity_monitor_switch" msgid="9059759348648583421">"پایشگر اتصال"</string>
+    <string name="connectivity_monitor_switch_summary" msgid="2828658652378866401">"‏وقتی ConnectivityMonitor مشکل اتصالی را تشخیص می‌دهد گزارش‌هایی جمع‌آوری می‌کند و ازطریق اعلان از کاربر می‌خواهد گزارش اشکال تهیه کند"</string>
+    <string name="connectivity_monitor_toast" msgid="5551859612881173028">"برای اعمال تغییر پایشگر اتصال، دستگاه را راه‌اندازی مجدد کنید"</string>
     <string name="camera_hal_hdrplus_switch" msgid="8377365197105267466">"‏دوربین HAL HDR+‎"</string>
     <string name="camera_hal_hdrplus_toast" msgid="2063703797270055299">"‏برای اعمال تغییر دوربین HAL HDR+‎، دستگاه را راه‌اندازی مجدد کنید"</string>
+    <string name="camera_laser_sensor_switch" msgid="8913588990743234440">"حسگر لیزری دوربین"</string>
     <string name="ota_disable_automatic_update" msgid="2319639631655915050">"به‌روزرسانی‌های خودکار سیستم"</string>
     <string name="usage" msgid="2977875522080448986">"میزان مصرف"</string>
     <string name="cellular_data_usage" msgid="2155683719898158203">"مصرف داده شبکه تلفن همراه"</string>
@@ -3407,7 +3431,7 @@
     <string name="data_warning" msgid="209133958008062117">"هشدار داده"</string>
     <string name="set_data_limit" msgid="2901526323210516923">"تنظیم محدودیت داده"</string>
     <string name="data_limit" msgid="1885406964934590552">"محدودیت داده"</string>
-    <string name="data_usage_template" msgid="392191945602400904">"بین <xliff:g id="ID_2">%2$s</xliff:g>، <xliff:g id="ID_1">%1$s</xliff:g> مصرف شده است"</string>
+    <string name="data_usage_template" msgid="2923744765873163859">"<xliff:g id="ID_1">%1$s</xliff:g> در <xliff:g id="ID_2">%2$s</xliff:g> مصرف شد"</string>
     <string name="configure" msgid="1029654422228677273">"پیکربندی"</string>
     <string name="data_usage_other_apps" msgid="3272872663517382050">"برنامه‌های دیگری که در استفاده گنجانده شده"</string>
     <plurals name="data_saver_unrestricted_summary" formatted="false" msgid="2635267833484232703">
@@ -3476,7 +3500,7 @@
     <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="387052719462473500">"کنترل اطلاعات روی صفحه درحالت قفل"</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="8483187649355540109">"پشتیبانی و نکته‌ها"</string>
@@ -3484,7 +3508,7 @@
     <string name="premium_sms_none" msgid="8268105565738040566">"هیچ برنامه نصب‌شده‌ای دسترسی به «پیامک ویژه» را درخواست نکرده است"</string>
     <string name="premium_sms_warning" msgid="9086859595338944882">"ممکن است استفاده از «پیامک ویژه» برای شما هزینه داشته باشد و مبلغ صورت‌حساب‌های شرکت مخابراتی‌تان را افزایش دهد. اگر مجوز را برای برنامه‌ای فعال کنید، می‌توانید با استفاده از آن برنامه پیامک ویژه ارسال کنید."</string>
     <string name="premium_sms_access" msgid="4660047004791638305">"دسترسی پیامک ویژه"</string>
-    <string name="bluetooth_disabled" msgid="2456198532288640046">"غیرقابل‌مشاهده برای سایر دستگاه‌ها"</string>
+    <string name="bluetooth_disabled" msgid="6244000672828617410">"خاموش"</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>
@@ -3586,7 +3610,7 @@
     <string name="web_action_enable_title" msgid="4051513950976670853">"برنامه‌های فوری"</string>
     <string name="web_action_enable_summary" msgid="3108127559723396382">"باز کردن پیوندها در برنامه‌ها، حتی اگر نصب نشده باشند"</string>
     <string name="web_action_section_title" msgid="7364647086538399136">"برنامه‌های فوری"</string>
-    <string name="instant_apps_account" msgid="1433620209791992528">"حساب برنامه‌های فوری"</string>
+    <string name="instant_apps_settings" msgid="8827777916518348213">"تنظیمات برگزیده برنامه‌های فوری"</string>
     <string name="domain_url_section_title" msgid="7046835219056428883">"برنامه‌های نصب‌شده"</string>
     <string name="automatic_storage_manager_activation_warning" msgid="6353100011690933254">"حافظه شما اکنون توسط مدیر حافظه مدیریت می‌شود"</string>
     <string name="account_for_section_header" msgid="5356566418548737121">"حساب‌های <xliff:g id="USER_NAME">%1$s</xliff:g>"</string>
@@ -3633,7 +3657,9 @@
     <string name="enterprise_privacy_always_on_vpn_personal" msgid="9217774730260037434">"‏«VPN همیشه روشن» در نمایه شخصی شما روشن شد"</string>
     <string name="enterprise_privacy_always_on_vpn_work" msgid="7244472958208315814">"‏«VPN همیشه روشن» در نمایه کاری شما روشن شد"</string>
     <string name="enterprise_privacy_global_http_proxy" msgid="7936664553416257333">"‏تنظیم پروکسی HTTP جهانی"</string>
-    <string name="enterprise_privacy_ca_certs" msgid="5885892204903688909">"اعتبارنامه‌های مطمئن"</string>
+    <string name="enterprise_privacy_ca_certs_device" msgid="2019652712782510262">"اعتبارنامه‌های مطمئن"</string>
+    <string name="enterprise_privacy_ca_certs_personal" msgid="2279084820904076599">"اعتبارنامه‌های مطمئن در نمایه شخصی شما"</string>
+    <string name="enterprise_privacy_ca_certs_work" msgid="6187377647815301809">"اعتبارنامه‌های مطمئن در نمایه کاری شما"</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="other">حداقل <xliff:g id="COUNT_1">%d</xliff:g> گواهینامه مرکز صدور گواهی</item>
@@ -3696,6 +3722,8 @@
     <string name="carrier_provisioning" msgid="4398683675591893169">"اطلاعات ارائه شرکت مخابراتی"</string>
     <string name="trigger_carrier_provisioning" msgid="3434865918009286187">"شروع ارائه شرکت مخابراتی"</string>
     <string name="new_device_suggestion_title" msgid="698847081680980774">"چه مواردی جدید و هیجان‌انگیز هستند؟"</string>
-    <string name="new_device_suggestion_summary" msgid="7172709269203435870">"بررسی ۵ قابلیت برتر"</string>
+    <string name="new_device_suggestion_summary" product="default" msgid="206396571522515855">"در تلفن جدیدتان گشتی بزنید"</string>
+    <string name="new_device_suggestion_summary" product="tablet" msgid="393751455688210956">"در رایانه لوحی جدیدتان گشتی بزنید"</string>
+    <string name="new_device_suggestion_summary" product="device" msgid="2939870049868336652">"در دستگاه جدیدتان گشتی بزنید"</string>
     <string name="disabled_low_ram_device" msgid="3751578499721173344">"این ویدیو در این دستگاه دردسترس نیست."</string>
 </resources>
diff --git a/res/values-fi/arrays.xml b/res/values-fi/arrays.xml
index 7ce271b..e30aa86 100644
--- a/res/values-fi/arrays.xml
+++ b/res/values-fi/arrays.xml
@@ -100,8 +100,6 @@
     <!-- no translation found for wifi_security_no_eap:0 (2084555984818107151) -->
     <!-- no translation found for wifi_security_no_eap:1 (397579322683471524) -->
     <!-- no translation found for wifi_security_no_eap:2 (1968820975358150484) -->
-    <!-- no translation found for wifi_ap_security:0 (5251664683198623324) -->
-    <!-- no translation found for wifi_ap_security:1 (7989073072260294673) -->
   <string-array name="wifi_eap_method">
     <item msgid="1160193392455075561">"PEAP"</item>
     <item msgid="7981731051382306293">"TLS"</item>
diff --git a/res/values-fi/strings.xml b/res/values-fi/strings.xml
index 105d115..9497ec6 100644
--- a/res/values-fi/strings.xml
+++ b/res/values-fi/strings.xml
@@ -166,7 +166,7 @@
     <string name="bluetooth_map_acceptance_dialog_text" msgid="8712508202081143737">"%1$s haluaa käyttää viestejäsi. Myönnetäänkö käyttöoikeus kohteeseen %2$s?"</string>
     <string name="bluetooth_sap_request" msgid="2669762224045354417">"SIM-kortin käyttöoikeuspyyntö"</string>
     <string name="bluetooth_sap_acceptance_dialog_text" msgid="4414253873553608690">"<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g> haluaa käyttää SIM-korttiasi. SIM-kortin käyttöoikeuden myöntäminen poistaa laitteesi datayhteyden käytöstä yhteyden ajaksi. Myönnä käyttöoikeus laitteelle <xliff:g id="DEVICE_NAME_1">%2$s?</xliff:g>?"</string>
-    <string name="bluetooth_device_name_summary" msgid="4757990010751789977">"Muille laitteille näkyvä nimi: <xliff:g id="DEVICE_NAME">^1</xliff:g>"</string>
+    <string name="bluetooth_device_name_summary" msgid="522235742194965734">"Muille laitteille näkyvä nimi: <xliff:g id="DEVICE_NAME">^1</xliff:g>"</string>
     <string name="bluetooth_paired_device_title" msgid="8638994696317952019">"Omat laitteet"</string>
     <string name="bluetooth_pairing_page_title" msgid="7712127387361962608">"Muodosta laitepari uuden laitteen kanssa"</string>
     <string name="date_and_time" msgid="9062980487860757694">"Päivämäärä ja aika"</string>
@@ -312,6 +312,8 @@
     <string name="zone_auto" msgid="334783869352026648">"Automaattinen aikavyöhyke"</string>
     <string name="zone_auto_summaryOn" msgid="6142830927278458314">"Käytä verkon määrittämää aikavyöhykettä"</string>
     <string name="zone_auto_summaryOff" msgid="2597745783162041390">"Käytä verkon määrittämää aikavyöhykettä"</string>
+    <string name="date_time_24hour_auto" msgid="2117383168985653422">"Automaattinen 24 tunnin kello"</string>
+    <string name="date_time_24hour_auto_summary" msgid="6351812925651480277">"Käytä paikallista oletusasetusta"</string>
     <string name="date_time_24hour_title" msgid="3203537578602803850">"24 tunnin kello"</string>
     <string name="date_time_24hour" msgid="1193032284921000063">"Käytä 24-tuntista kelloa"</string>
     <string name="date_time_set_time_title" msgid="6296795651349047016">"Aika"</string>
@@ -372,6 +374,9 @@
     <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="1961957425135180242">"Seuraava"</string>
+    <string name="setup_fingerprint_enroll_skip_title" msgid="362050541117362034">"Ohitetaanko sormenjälki?"</string>
+    <string name="setup_fingerprint_enroll_skip_after_adding_lock_text" msgid="958990414356204763">"Sormenjälkitunnistus kestää vain minuutin tai pari. Jos ohitat tämän, voit lisätä sormenjäljen myöhemmin asetuksissa."</string>
+    <string name="lock_screen_intro_skip_title" msgid="4988210105913705679">"Ohitetaanko näytön lukitus?"</string>
     <string name="lock_screen_intro_skip_dialog_text_frp" product="tablet" msgid="1581834104051243425">"Laitteen suojausominaisuuksia ei oteta käyttöön. Et voi estää tabletin käyttöä, jos se varastetaan, katoaa tai sen tiedot pyyhitään."</string>
     <string name="lock_screen_intro_skip_dialog_text_frp" product="device" msgid="4629503416877189572">"Laitteen suojausominaisuuksia ei oteta käyttöön. Et voi estää laitteen käyttöä, jos se varastetaan, katoaa tai sen tiedot pyyhitään."</string>
     <string name="lock_screen_intro_skip_dialog_text_frp" product="default" msgid="2423428240245737909">"Laitteen suojausominaisuuksia ei oteta käyttöön. Et voi estää puhelimen käyttöä, jos se varastetaan, katoaa tai sen tiedot pyyhitään."</string>
@@ -457,7 +462,7 @@
     <string name="setup_lock_settings_picker_title" product="tablet" msgid="90329443364067215">"Tabletin suojaaminen"</string>
     <string name="setup_lock_settings_picker_title" product="device" msgid="2399952075134938929">"Laitteen suojaaminen"</string>
     <string name="setup_lock_settings_picker_title" product="default" msgid="1572244299605153324">"Suojaa puhelintasi"</string>
-    <string name="setup_lock_settings_picker_fingerprint_message" msgid="5585650064305600578">"Paranna suojausta määrittämällä näytön varalukitustapa."</string>
+    <string name="lock_settings_picker_fingerprint_added_security_message" msgid="5768002109707648463">"Paranna suojausta määrittämällä näytön varalukitustapa."</string>
     <string name="setup_lock_settings_picker_message" product="tablet" msgid="8919671129189936210">"Estä tablettisi luvaton käyttö ottamalla laitteen suojausominaisuudet käyttöön. Valitse näytön lukitusmenetelmä."</string>
     <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>
@@ -588,6 +593,7 @@
     <string name="lockpassword_pin_no_sequential_digits" msgid="680765285206990584">"Nousevat, laskevat tai toistuvat numerosarjat on kielletty."</string>
     <string name="lockpassword_ok_label" msgid="313822574062553672">"OK"</string>
     <string name="lockpassword_cancel_label" msgid="8818529276331121899">"Peruuta"</string>
+    <string name="lockpassword_clear_label" msgid="5724429464960458155">"Tyhjennä"</string>
     <string name="lockpattern_tutorial_cancel_label" msgid="6431583477570493261">"Peruuta"</string>
     <string name="lockpattern_tutorial_continue_label" msgid="3559793618653400434">"Seuraava"</string>
     <string name="lock_setup" msgid="3355847066343753943">"Asennus on valmis."</string>
@@ -696,7 +702,7 @@
     <string name="wifi_ask_disable" msgid="728366570145493573">"<xliff:g id="REQUESTER">%s</xliff:g> haluaa poistaa Wi-Fin käytöstä."</string>
     <string name="nfc_quick_toggle_title" msgid="6769159366307299004">"NFC"</string>
     <string name="nfc_quick_toggle_summary" product="tablet" msgid="8302974395787498915">"Salli tiedonsiirto, kun tabletti koskettaa toista laitetta"</string>
-    <string name="nfc_quick_toggle_summary" product="default" msgid="5237208142892767592">"Salli tiedonsiirto, kun puhelin koskettaa toista laitetta"</string>
+    <string name="nfc_quick_toggle_summary" product="default" msgid="5237208142892767592">"Salli tiedonsiirto, kun puhelin koskettaa toista laitetta."</string>
     <string name="nfc_disclaimer_title" msgid="4364003873202264039">"NFC käyttöön"</string>
     <string name="nfc_disclaimer_content" msgid="5566907911915158075">"NFC vaihtaa tietoja tämän ja muiden lähellä olevien laitteiden tai kohteiden, esimerkiksi maksupäätteiden, syötteenlukijoiden tai interaktiivisten mainosten/tagien, kanssa."</string>
     <string name="android_beam_settings_title" msgid="7832812974600338649">"Android Beam"</string>
@@ -752,7 +758,7 @@
     <string name="wifi_menu_wps_pbc" msgid="2668564692207863017">"WPS-painike"</string>
     <string name="wifi_menu_more_options" msgid="2448097861752719396">"Lisää asetuksia"</string>
     <string name="wifi_menu_wps_pin" msgid="6426448256268695933">"WPS-PIN"</string>
-    <string name="wifi_menu_p2p" msgid="7619851399250896797">"Suora Wi-Fi-yhteys"</string>
+    <string name="wifi_menu_p2p" msgid="7619851399250896797">"Wi-Fi Direct"</string>
     <string name="wifi_menu_scan" msgid="1470911530412095868">"Etsi"</string>
     <string name="wifi_menu_advanced" msgid="7522252991919573664">"Lisäasetukset"</string>
     <string name="wifi_menu_configure" msgid="6150926852602171938">"Määritä"</string>
@@ -781,6 +787,7 @@
     <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>
@@ -817,6 +824,8 @@
     <string name="wifi_wps_available_first_item" msgid="4422547079984583502">"WPS käytettävissä"</string>
     <string name="wifi_wps_available_second_item" msgid="8427520131718215301">" (WPS käytettävissä)"</string>
     <string name="wifi_wps_nfc_enter_password" msgid="2288214226916117159">"Anna verkkosalasana"</string>
+    <string name="wifi_carrier_connect" msgid="8174696557882299911">"Operaattorin Wi‑Fi-verkko"</string>
+    <string name="wifi_carrier_content" msgid="4634077285415851933">"Muodosta yhteys: <xliff:g id="NAME">%1%s</xliff:g>"</string>
     <string name="wifi_scan_always_turnon_message" msgid="203123538572122989">"<xliff:g id="APP_NAME">%1$s</xliff:g> haluaa parantaa sijainnin tarkkuutta ja suorittaa muita toimintoja ottamalla verkon etsinnän käyttöön, vaikka Wi-Fi-yhteys ei ole käytössä.\n\nAnnetaanko tämä lupa kaikille sovelluksille, jotka haluavat etsiä verkkoja?"</string>
     <string name="wifi_scan_always_turnoff_message" msgid="5538901671131941043">"Poista asetus käytöstä ylivuotovalikon lisäasetuksista."</string>
     <string name="wifi_scan_always_confirm_allow" msgid="5355973075896817232">"Salli"</string>
@@ -834,6 +843,7 @@
     <string name="wifi_connect" msgid="1076622875777072845">"Yhdistä"</string>
     <string name="wifi_failed_connect_message" msgid="8491902558970292871">"Yhteyden muodostaminen verkkoon epäonnistui."</string>
     <string name="wifi_forget" msgid="8168174695608386644">"Unohda"</string>
+    <string name="wifi_modify" msgid="6100248070440710782">"Muokkaa"</string>
     <string name="wifi_failed_forget_message" msgid="1348172929201654986">"Verkon unohtaminen epäonnistui."</string>
     <string name="wifi_save" msgid="3331121567988522826">"Tallenna"</string>
     <string name="wifi_failed_save_message" msgid="6650004874143815692">"Verkon tallentaminen epäonnistui."</string>
@@ -846,6 +856,7 @@
     <string name="wifi_advanced_titlebar" msgid="4485841401774142908">"Wi-Fi-lisä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_title" msgid="3471132676909349382">"Verkon tiedot"</string>
     <string name="wifi_details_subnet_mask" msgid="6720279144174924410">"Aliverkon peite"</string>
     <string name="wifi_details_dns" msgid="8648826607751830768">"DNS"</string>
     <string name="wifi_details_ipv6_address_header" msgid="6734119149106422148">"IPv6-osoitteet"</string>
@@ -862,7 +873,7 @@
     <string name="wifi_dns2" msgid="1368601006824882659">"DNS 2"</string>
     <string name="wifi_gateway" msgid="163914742461092086">"Yhdyskäytävä"</string>
     <string name="wifi_network_prefix_length" msgid="3028785234245085998">"Verkon etuliitteen pituus"</string>
-    <string name="wifi_p2p_settings_title" msgid="5444461191435291082">"Suora Wi-Fi-yhteys"</string>
+    <string name="wifi_p2p_settings_title" msgid="5444461191435291082">"Wi-Fi Direct"</string>
     <string name="wifi_p2p_device_info" msgid="3191876744469364173">"Laitteen tiedot"</string>
     <string name="wifi_p2p_persist_network" msgid="1646424791818168590">"Muista tämä yhteys"</string>
     <string name="wifi_p2p_menu_search" msgid="3436429984738771974">"Etsi laitteita"</string>
@@ -878,16 +889,15 @@
     <string name="wifi_p2p_cancel_connect_title" msgid="255267538099324413">"Peruutetaanko kutsu?"</string>
     <string name="wifi_p2p_cancel_connect_message" msgid="7477756213423749402">"Haluatko peruuttaa laitteelle <xliff:g id="PEER_NAME">%1$s</xliff:g> lähetetyn yhteydenmuodostuskutsun?"</string>
     <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_off_subtext" msgid="5466126533609394170">"Internetyhteyttä tai sisältöä ei jaeta muiden laitteiden kanssa."</string>
     <string name="wifi_hotspot_tethering_on_subtext" product="tablet" msgid="5752490509369962007">"Tabletin internetyhteys jaetaan hotspotin kautta."</string>
     <string name="wifi_hotspot_tethering_on_subtext" product="default" msgid="6461075246164300670">"Puhelimen internetyhteys jaetaan hotspotin kautta."</string>
     <string name="wifi_hotspot_on_local_only_subtext" msgid="2068110388011294735">"Sovellus jakaa sisältöä. Jos haluat jakaa internetyhteyden, sammuta hotspot ja käynnistä se uudelleen."</string>
-    <string name="wifi_hotspot_name_title" msgid="1341735529132128887">"Wi-Fi-verkon nimi"</string>
+    <string name="wifi_hotspot_name_title" msgid="8237000746618636778">"Hotspotin nimi"</string>
     <string name="wifi_hotspot_name_summary_connecting" msgid="3378299995508671967">"Käynnistetään <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>…"</string>
     <string name="wifi_hotspot_name_summary_connected" msgid="3888672084861445362">"<xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g> on muiden laitteiden käytettävissä."</string>
-    <string name="wifi_hotspot_password_title" msgid="1955592302902091281">"Wi-Fi-verkon salasana"</string>
+    <string name="wifi_hotspot_password_title" msgid="8676859981917573801">"Hotspotin salasana"</string>
     <string name="wifi_hotspot_ap_band_title" msgid="1165801173359290681">"AP-taajuus"</string>
     <string name="wifi_hotspot_footer_info_regular" msgid="1203489406068036455">"Hotspot-ominaisuudella voit luoda muille laitteillesi Wi-Fi-verkon. Ominaisuus jakaa internetyhteyden muille laitteille mobiilidatayhteydellä. Lisämaksuja mobiilidatan käytöstä voidaan periä."</string>
     <string name="wifi_hotspot_footer_info_local_only" msgid="857988412470694109">"Sovellukset voivat luoda hotspotin ja jakaa sisältöä lähellä olevien laitteiden kanssa."</string>
@@ -898,7 +908,6 @@
     <string name="wifi_tether_configure_ap_text" msgid="7974681394041609308">"Luo Wi-Fi-hotspot"</string>
     <string name="wifi_hotspot_configure_ap_text" msgid="5478614731464220432">"Wi‑Fi-hotspotin määritys"</string>
     <string name="wifi_hotspot_configure_ap_text_summary" msgid="5560680057727007011">"Hotspot: AndroidAP WPA2 PSK"</string>
-    <string name="wifi_tether_configure_subtext" msgid="2050196439900426456">"Hotspot: <xliff:g id="NETWORK_SSID">%1$s</xliff:g> <xliff:g id="NETWORK_SECURITY">%2$s</xliff:g>"</string>
     <string name="wifi_tether_configure_ssid_default" msgid="8467525402622138547">"AndroidHotspot"</string>
     <string name="wifi_calling_settings_title" msgid="4102921303993404577">"Wi-Fi-puhelut"</string>
     <string name="wifi_calling_suggestion_title" msgid="9008010480466359578">"Ota Wi-Fi-puhelut käyttöön"</string>
@@ -939,7 +948,7 @@
     <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="emergency_address_summary" msgid="3266760199681945746">"Hätäpalveluiden käyttämä osoite, kun soitat hätäpuhelun Wi-Fillä"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"Näyttö"</string>
     <string name="sound_settings" msgid="5534671337768745343">"Ääni"</string>
     <string name="all_volume_title" msgid="4296957391257836961">"Äänenvoimakkuudet"</string>
@@ -993,6 +1002,7 @@
     <string name="search_settings" msgid="1910951467596035063">"Haku"</string>
     <string name="search_settings_summary" msgid="9205656546570654169">"Hallinnoi hakuasetuksia ja historiaa"</string>
     <string name="search_settings_no_results" msgid="8799027492641230999">"Ei tuloksia"</string>
+    <string name="search_clear_history" msgid="4196658962573162457">"Tyhjennä historia"</string>
     <string name="display_settings" msgid="7965901687241669598">"Näyttö"</string>
     <string name="accelerometer_title" msgid="7854608399547349157">"Näytön automaattinen kierto"</string>
     <string name="color_mode_title" msgid="3159275920408338215">"Kirkkaat värit"</string>
@@ -1122,7 +1132,6 @@
     <string name="baseband_version" msgid="1848990160763524801">"Baseband-versio"</string>
     <string name="kernel_version" msgid="9192574954196167602">"Kernel-versio"</string>
     <string name="build_number" msgid="3075795840572241758">"Ohjelmistoversion numero"</string>
-    <string name="selinux_status" msgid="6212165375172061672">"SELinux-tila"</string>
     <string name="device_info_not_available" msgid="8062521887156825182">"Ei käytettävissä"</string>
     <string name="device_status_activity_title" msgid="1411201799384697904">"Tila"</string>
     <string name="device_status" msgid="607405385799807324">"Tila"</string>
@@ -1150,7 +1159,6 @@
     <string name="status_wifi_mac_address" msgid="2202206684020765378">"Wi-Fi-yhteyden MAC-osoite"</string>
     <string name="status_bt_address" msgid="4195174192087439720">"Bluetooth-osoite"</string>
     <string name="status_serial_number" msgid="2257111183374628137">"Sarjanumero"</string>
-    <string name="status_unavailable" msgid="7862009036663793314">"Ei käytettävissä"</string>
     <string name="status_up_time" msgid="7294859476816760399">"Käynnissäoloaika"</string>
     <string name="status_awake_time" msgid="2393949909051183652">"Käytössäoloaika"</string>
     <string name="internal_memory" msgid="9129595691484260784">"Sisäinen tallennustila"</string>
@@ -1326,6 +1334,7 @@
     <string name="menu_restore" msgid="8260067415075573273">"Palauta oletukset"</string>
     <string name="restore_default_apn_completed" msgid="2824775307377604897">"APN-oletusasetukset on palautettu."</string>
     <string name="reset_dashboard_title" msgid="6254873816990678620">"Palautusvalinnat"</string>
+    <string name="reset_dashboard_summary" msgid="4851012632493522755">"Voit nollata verkon, sovellusten tai laitteen asetukset."</string>
     <string name="reset_network_title" msgid="6166025966016873843">"Nollaa Wi-Fin, mobiiliverkon ja Bluetoothin asetukset"</string>
     <string name="reset_network_desc" msgid="5547979398298881406">"Tämä nollaa kaikki verkkoasetukset, esimerkiksi seuraavat:\n\n"<li>"Wi‑Fi"</li>\n<li>"Mobiilidata"</li>\n<li>"Bluetooth"</li></string>
     <string name="reset_network_button_text" msgid="2035676527471089853">"Nollaa asetukset"</string>
@@ -1334,17 +1343,14 @@
     <string name="reset_network_confirm_title" msgid="1759888886976962773">"Nollataanko?"</string>
     <string name="network_reset_not_available" msgid="7188610385577164676">"Tämä käyttäjä ei voi palauttaa verkon asetuksia."</string>
     <string name="reset_network_complete_toast" msgid="787829973559541880">"Verkkoasetuksesi on nollattu."</string>
-    <string name="master_clear_title" msgid="6617679904229218425">"Poista kaikki tiedot (palauta tehdasasetukset)"</string>
-    <plurals name="master_clear_with_account_summary" formatted="false" msgid="5911377203778818712">
-      <item quantity="other"><xliff:g id="ACCOUNT_COUNT">%1$d</xliff:g> tilin asetukset palautetaan.</item>
-      <item quantity="one">1 tilin asetukset palautetaan.</item>
-    </plurals>
-    <string name="master_clear_summary" msgid="6902443944660426951">"Sisäinen tallennustila ja kaikki tiedot nollataan."</string>
+    <string name="master_clear_title" msgid="3531267871084279512">"Poista kaikki tiedot (palauta tehdasasetukset)"</string>
     <string name="master_clear_desc" product="tablet" msgid="9146059417023157222">"Tämä poistaa kaikki tablet-laitteesi "<b>"sisäisen tallennustilan"</b>" tiedot, kuten:\n\n"<li>"Google-tilisi"</li>\n<li>"Järjestelmä- ja sovellustiedot ja -asetukset"</li>\n<li>"Ladatut sovellukset"</li></string>
     <string name="master_clear_desc" product="default" msgid="4800386183314202571">"Tämä poistaa kaikki puhelimesi "<b>"sisäisen tallennustilan"</b>" tiedot, kuten:\n\n"<li>"Google-tilisi"</li>\n<li>"Järjestelmä- ja sovellustiedot ja -asetukset"</li>\n<li>"Ladatut sovellukset"</li></string>
     <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"Olet kirjautunut sisään seuraaviin tileihin:\n"</string>
     <string name="master_clear_other_users_present" product="default" msgid="5161423070702470742">\n\n"Tällä laitteella on muita paikalla olevia käyttäjiä.\n"</string>
     <string name="master_clear_desc_also_erases_external" msgid="1903185203791274237"><li>"Musiikki"</li>\n<li>"Valokuvat"</li>\n<li>"Muut käyttäjän tiedot"</li></string>
+    <string name="master_clear_desc_also_erases_esim" msgid="312352697653096008"><li>"eSIMiä käyttävät operaattorit"</li></string>
+    <string name="master_clear_desc_no_cancel_mobile_plan" msgid="5460926449093211144">\n\n"Tämä ei peruuta mobiilipalvelupakettiasi."</string>
     <string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="7744115866662613411">\n\n"Jos haluat poistaa musiikin, kuvat ja muut käyttäjän tiedot, "<b>"USB-tallennustila"</b>" tulee tyhjentää."</string>
     <string name="master_clear_desc_erase_external_storage" product="default" msgid="4801026652617377093">\n\n"Jos haluat poistaa musiikin, kuvat ja muut käyttäjän tiedot, "<b>"SD-kortti"</b>" tulee tyhjentää."</string>
     <string name="erase_external_storage" product="nosdcard" msgid="969364037450286809">"Tyhjennä USB-tallennustila"</string>
@@ -1376,11 +1382,11 @@
     <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_subtext" product="default" msgid="5991482890033484794">"Jaa puhelimen internetyhteys USB:llä"</string>
+    <string name="usb_tethering_subtext" product="default" msgid="5991482890033484794">"Jaa puhelimen internetyhteys USB:llä."</string>
     <string name="usb_tethering_subtext" product="tablet" msgid="5988796139573211318">"Jaa tabletin internetyhteys USB:llä"</string>
     <string name="bluetooth_tether_checkbox_text" msgid="2379175828878753652">"Jaettu Bluetooth-yhteys"</string>
     <string name="bluetooth_tethering_subtext" product="tablet" msgid="4558227863463153412">"Jaa tabletin internetyhteys Bluetoothilla"</string>
-    <string name="bluetooth_tethering_subtext" product="default" msgid="1055197887836203595">"Jaa puhelimen internetyhteys Bluetoothilla"</string>
+    <string name="bluetooth_tethering_subtext" product="default" msgid="1055197887836203595">"Jaa puhelimen internetyhteys Bluetoothilla."</string>
     <string name="bluetooth_tethering_off_subtext_config" msgid="6326877798974938021">"Laitteen <xliff:g id="DEVICE_NAME">%1$d</xliff:g> internetyhteys jaetaan Bluetoothilla"</string>
     <string name="bluetooth_tethering_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>
@@ -1461,15 +1467,16 @@
     <string name="settings_safetylegal_activity_title" msgid="6901214628496951727">"Suojaustiedot"</string>
     <string name="settings_safetylegal_activity_unreachable" msgid="250674109915859456">"Laite ei ole yhteydessä verkkoon. Voit tarkastella näitä tietoja osoitteessa %s tietokoneella, jolla on internetyhteys."</string>
     <string name="settings_safetylegal_activity_loading" msgid="8059022597639516348">"Ladataan…"</string>
-    <string name="lockpassword_choose_your_password_header" msgid="8624900666929394990">"Valitse salasana"</string>
-    <string name="lockpassword_choose_your_password_header_for_fingerprint" msgid="6624409510609085450">"Sormenjälki: aseta salasana"</string>
-    <string name="lockpassword_choose_your_pattern_header" msgid="6949761069941694050">"Valitse kuvio"</string>
-    <string name="lockpassword_choose_your_pattern_header_for_fingerprint" msgid="5901096361617543819">"Sormenjälki: aseta kuvio"</string>
-    <string name="lockpassword_choose_your_pin_header" msgid="7598849519816138302">"Valitse PIN-koodi"</string>
-    <string name="lockpassword_choose_your_pin_header_for_fingerprint" msgid="765344692615917183">"Sormenjälki: aseta PIN-koodi"</string>
-    <string name="lockpassword_confirm_your_password_header" msgid="6308478184889846633">"Vahvista salasana"</string>
+    <string name="lockpassword_choose_your_screen_lock_header" msgid="3872462096767152394">"Näytön lukituksen käyttöönotto"</string>
+    <string name="lockpassword_choose_your_password_message" msgid="1197569283524841412">"Aseta salasana suojauksen parantamiseksi."</string>
+    <string name="lockpassword_choose_your_password_header_for_fingerprint" msgid="2541818487015343503">"Aseta PIN-koodi sormenjälkeä varten"</string>
+    <string name="lockpassword_choose_your_pattern_header_for_fingerprint" msgid="7709785406243556723">"Aseta kuvio sormenjälkeä varten"</string>
+    <string name="lockpassword_choose_your_pin_message" msgid="1875420718677275646">"Aseta PIN-koodi suojauksen parantamiseksi."</string>
+    <string name="lockpassword_choose_your_pin_header_for_fingerprint" msgid="1549639053195796674">"Aseta PIN-koodi sormenjälkeä varten"</string>
+    <string name="lockpassword_choose_your_pattern_message" msgid="5986983400689720015">"Aseta kuvio suojauksen parantamiseksi."</string>
+    <string name="lockpassword_confirm_your_password_header" msgid="1266027268220850931">"Anna salasana uudelleen"</string>
     <string name="lockpassword_confirm_your_pattern_header" msgid="7543433733032330821">"Vahvista kuvio"</string>
-    <string name="lockpassword_confirm_your_pin_header" msgid="49038294648213197">"Vahvista PIN-koodi"</string>
+    <string name="lockpassword_confirm_your_pin_header" msgid="7744513791910572550">"Anna PIN-koodi uudelleen"</string>
     <string name="lockpassword_confirm_passwords_dont_match" msgid="5140892109439191415">"Salasanat eivät täsmää"</string>
     <string name="lockpassword_confirm_pins_dont_match" msgid="7226244811505606217">"PIN-koodit eivät täsmää"</string>
     <string name="lockpassword_choose_lock_generic_header" msgid="3811438094903786145">"Lukituksenpoistovalikko"</string>
@@ -1488,6 +1495,12 @@
     <string name="lockpassword_strong_auth_required_work_pattern" msgid="3003781907040522053">"Turvallisuussyistä pyydämme antamaan työprofiilin kuvion."</string>
     <string name="lockpassword_strong_auth_required_work_pin" msgid="3367491332598821552">"Turvallisuussyistä pyydämme antamaan työprofiilin PIN-koodin."</string>
     <string name="lockpassword_strong_auth_required_work_password" msgid="8159775129968582940">"Turvallisuussyistä pyydämme antamaan työprofiilin salasanan."</string>
+    <string name="lockpassword_confirm_your_pattern_details_frp" msgid="6757336656791723193">"Puhelimen laiteasetukset palautettiin. Jos haluat käyttää tätä puhelinta, anna edellinen kuvio."</string>
+    <string name="lockpassword_confirm_your_pin_details_frp" msgid="826520613445990470">"Puhelimen laiteasetukset palautettiin. Jos haluat käyttää tätä puhelinta, anna edellinen PIN-koodi."</string>
+    <string name="lockpassword_confirm_your_password_details_frp" msgid="8944081074615739040">"Puhelimen laiteasetukset palautettiin. Jos haluat käyttää tätä puhelinta, anna edellinen salasana."</string>
+    <string name="lockpassword_confirm_your_pattern_header_frp" msgid="2898036091609128286">"Vahvista kuvio"</string>
+    <string name="lockpassword_confirm_your_pin_header_frp" msgid="4141601774778898803">"Vahvista PIN-koodi"</string>
+    <string name="lockpassword_confirm_your_password_header_frp" msgid="3762615419295360480">"Vahvista salasana"</string>
     <string name="lockpassword_invalid_pin" msgid="15588049067548470">"Väärä PIN-koodi"</string>
     <string name="lockpassword_invalid_password" msgid="4038507398784975200">"Väärä salasana"</string>
     <string name="lockpattern_need_to_unlock_wrong" msgid="1745247595356012176">"Väärä kuvio"</string>
@@ -1537,7 +1550,6 @@
     <string name="install_applications_title" msgid="4987712352256508946">"Salli kaikki lähteet"</string>
     <string name="recent_app_category_title" msgid="6673071268966003928">"Viimeksi avatut sovellukset"</string>
     <string name="see_all_apps_title" msgid="1317153498074308438">"Näytä kaikki <xliff:g id="COUNT">%1$d</xliff:g> sovellusta"</string>
-    <string name="recent_app_summary" msgid="3366446669844932300">"<xliff:g id="TIME">^1</xliff:g> sitten"</string>
     <string name="install_all_warning" product="tablet" msgid="8310489909586138165">"Tuntemattomista lähteistä tulevat sovellukset voivat helpommin kaapata tablettisi ja henkilötietosi. Lataamalla sovelluksia tästä lähteestä hyväksyt, että olet itse vastuussa tabletillesi aiheutuvista vahingoista tai tietojen katoamisesta, joka saattaa johtua sovellusten käytöstä."</string>
     <string name="install_all_warning" product="default" msgid="1952257127370115988">"Tuntemattomista lähteistä tulevat sovellukset voivat helpommin kaapata puhelimesi ja henkilötietosi. Lataamalla sovelluksia tästä lähteestä hyväksyt, että olet itse vastuussa puhelimellesi aiheutuvista vahingoista tai tietojen katoamisesta, joka saattaa johtua sovellusten käytöstä."</string>
     <string name="advanced_settings" msgid="1777249286757067969">"Lisäasetukset"</string>
@@ -1801,7 +1813,7 @@
     <string name="accessibility_settings_summary" msgid="981260486011624939">"Näytönlukijat, näyttö, käytönhallinta"</string>
     <string name="vision_settings_title" msgid="4204111425716868288">"Näköasetukset"</string>
     <string name="vision_settings_description" msgid="5679491180156408260">"Voit muokata laitteen ominaisuuksia tarpeidesi mukaan. Käytettävyysvalintoja voi muuttaa myöhemmin asetuksissa."</string>
-    <string name="vision_settings_suggestion_title" msgid="917294957154878441">"Suurenna kirjasinkokoa"</string>
+    <string name="vision_settings_suggestion_title" msgid="8058794060304707004">"Muuta kirjasinkokoa"</string>
     <string name="screen_reader_category_title" msgid="7739154903913400641">"Näytönlukuohjelmat"</string>
     <string name="audio_and_captions_category_title" msgid="3420727114421447524">"Ääni ja näyttöteksti"</string>
     <string name="display_category_title" msgid="685461049938269166">"Näyttö"</string>
@@ -1838,7 +1850,6 @@
     <string name="accessibility_display_inversion_preference_subtitle" msgid="7052959202195368109">"Voi vaikuttaa suorituskykyyn"</string>
     <string name="accessibility_autoclick_preference_title" msgid="7014499339068449623">"Klikkaa, kun osoitin ei enää liiku"</string>
     <string name="accessibility_autoclick_delay_preference_title" msgid="3962261178385106006">"Viive ennen klikkausta"</string>
-    <string name="preference_summary_default_combination" msgid="8532964268242666060">"<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">"KÄYTÖSSÄ"</string>
     <string name="accessibility_summary_state_disabled" msgid="2241315620132005595">"POIS KÄYTÖSTÄ"</string>
     <string name="enable_quick_setting" msgid="2366999897816894536">"Näytä pika-asetuksissa"</string>
@@ -1957,12 +1968,14 @@
     <string name="background_activity_summary_on" msgid="649282072540085599">"Sovellus saa toimia taustalla myös silloin, kun se ei ole käytössä."</string>
     <string name="background_activity_summary_off" msgid="7666330699090632040">"Kun sovellus ei ole käytössä, sen taustatoimintaa rajoitetaan."</string>
     <string name="background_activity_summary_disabled" msgid="3710669050484599847">"Sovellus ei saa toimia taustalla."</string>
+    <string name="background_activity_summary_whitelisted" msgid="7375400051141016808">"Sovelluksen akunkäyttöä ei voi optimoida."</string>
+    <string name="background_activity_warning_dialog_title" msgid="2216249969149568871">"Rajoitetaanko toimintaa taustalla?"</string>
+    <string name="background_activity_warning_dialog_text" msgid="7049624449246121981">"Jos rajoitat sovelluksen toimintaa taustalla, se voi alkaa toimia virheellisesti."</string>
     <string name="device_screen_usage" msgid="3386088035570409683">"Näytön käyttö täyden latauksen jälkeen"</string>
     <string name="device_screen_consumption" msgid="4607589286438986687">"Näytön virrankulutus"</string>
     <string name="device_cellular_network" msgid="4724773411762382950">"Mobiiliverkkojen haku"</string>
-    <string name="power_last_full_charge_summary" msgid="532845389094620657">"<xliff:g id="TIME">^1</xliff:g> sitten"</string>
-    <string name="power_usage_list_summary" msgid="6775339745194635000">"Sovellusten virrankulutus edellisen täyden latauksen jälkeen (<xliff:g id="TIME">^1</xliff:g> sitten)"</string>
-    <string name="power_usage_list_summary_device" msgid="7036566616386864302">"Sovellusten virrankulutus edellisen täyden latauksen jälkeen (<xliff:g id="TIME">^1</xliff:g> sitten)"</string>
+    <string name="power_usage_list_summary" msgid="6393929085382334341">"Sovellusten virrankulutus edellisen täyden latauksen jälkeen (<xliff:g id="RELATIVE_TIME">^1</xliff:g>)"</string>
+    <string name="power_usage_list_summary_device" msgid="4461926045610455423">"Laitteen virrankulutus edellisen täyden latauksen jälkeen (<xliff:g id="RELATIVE_TIME">^1</xliff:g>)"</string>
     <string name="screen_usage_summary" msgid="6687403051423153550">"Näytön käyttöaika edellisen täyden latauksen jälkeen"</string>
     <string name="device_usage_list_summary" msgid="5623036661468763251">"Laitteen käyttö edellisen täyden latauksen jälkeen"</string>
     <string name="battery_since_unplugged" msgid="338073389740738437">"Akun käyttö laturin irrottamisen jälkeen"</string>
@@ -2208,14 +2221,14 @@
     <string name="credentials_unlock_hint" msgid="2301301378040499348">"Anna käyttöoikeustietojen tallennustilan salasana."</string>
     <string name="credentials_old_password" msgid="7553393815538684028">"Nykyinen salasana:"</string>
     <string name="credentials_reset_hint" msgid="6297256880896133631">"Poistetaanko kaikki sisältö?"</string>
-    <string name="credentials_password_too_short" msgid="7502749986405522663">"Salasanassa täytyy olla vähintään 8 merkkiä."</string>
     <string name="credentials_wrong_password" msgid="2541932597104054807">"Virheellinen salasana."</string>
     <string name="credentials_reset_warning" msgid="5320653011511797600">"Väärä salasana. Yksi yritys jäljellä, ennen kuin käyttöoikeustietojen tallennustila tyhjennetään."</string>
     <string name="credentials_reset_warning_plural" msgid="6514085665301095279">"Väärä salasana. Jäljellä <xliff:g id="NUMBER">%1$d</xliff:g> yritystä, ennen kuin käyttöoikeustietojen tallennustila tyhjennetään."</string>
     <string name="credentials_erased" msgid="2907836028586342969">"Käyttöoikeustietojen tallennustila on tyhjennetty."</string>
     <string name="credentials_not_erased" msgid="7685932772284216097">"Käyttöoik.tiet. ei poistettu."</string>
     <string name="credentials_enabled" msgid="7588607413349978930">"Käyttöoikeustietojen tallentaminen on käytössä."</string>
-    <string name="credentials_configure_lock_screen_hint" msgid="6757119179588664966">"Ruudunlukituksen PIN-koodi tai salasana on asetettava ennen kuin käyttöoikeustietojen tallennustilaa voi käyttää."</string>
+    <string name="credentials_configure_lock_screen_hint" msgid="8058230497337529036">"Näytön lukitustapa täytyy määrittää, ennen kuin voit käyttää kirjautumistietojen tallennustilaa."</string>
+    <string name="credentials_configure_lock_screen_button" msgid="253239765216055321">"ASETA LUKITUS"</string>
     <string name="usage_access_title" msgid="332333405495457839">"Sovellukset, joilla käyttölupa"</string>
     <string name="emergency_tone_title" msgid="1055954530111587114">"Hätäpuhelun ääni"</string>
     <string name="emergency_tone_summary" msgid="722259232924572153">"Aseta toiminta hätäpuhelun tapauksessa"</string>
@@ -2335,8 +2348,6 @@
     <skip />
     <string name="cant_sync_dialog_title" msgid="2777238588398046285">"Manuaalinen synkronointi epäonnistui"</string>
     <string name="cant_sync_dialog_message" msgid="1938380442159016449">"Tämän kohteen synkronointi on tällä hetkellä pois käytöstä. Voit muuttaa asetuksia ottamalla taustatiedonsiirron ja automaattisen synkronoinnin väliaikaisesti käyttöön."</string>
-    <string name="wimax_settings" msgid="2655139497028469039">"4G"</string>
-    <string name="status_wimax_mac_address" msgid="8390791848661413416">"4G MAC -osoite"</string>
     <string name="enter_password" msgid="8035706727471334122">"Käynnistä Android kirjoittamalla salasana"</string>
     <string name="enter_pin" msgid="5305333588093263790">"Käynnistä Android kirjoittamalla PIN-koodi"</string>
     <string name="enter_pattern" msgid="4187435713036808566">"Käynnistä Android piirtämällä kuvio"</string>
@@ -2350,6 +2361,7 @@
     <string name="misc_files_selected_count" msgid="4647048020823912088">"valittu <xliff:g id="NUMBER">%1$d</xliff:g>/<xliff:g id="TOTAL">%2$d</xliff:g>"</string>
     <string name="misc_files_selected_count_bytes" msgid="2876232009069114352">"<xliff:g id="NUMBER">%1$s</xliff:g> / <xliff:g id="TOTAL">%2$s</xliff:g>"</string>
     <string name="select_all" msgid="1562774643280376715">"Valitse kaikki"</string>
+    <string name="data_plan_usage_manage_plans_button_text" msgid="8997761990902708162">"Hallinnoi datapaketteja"</string>
     <string name="data_usage_summary_title" msgid="3804110657238092929">"Datan käyttö"</string>
     <string name="data_usage_app_summary_title" msgid="4147258989837459172">"Sovelluksen tiedonsiirto"</string>
     <string name="data_usage_accounting" msgid="7170028915873577387">"Operaattorin mittaustulos saattaa erota laitteesi mittaamasta."</string>
@@ -2435,6 +2447,9 @@
     <string name="data_usage_metered_mobile" msgid="5423305619126978393">"Mobiiliverkot"</string>
     <string name="data_usage_metered_wifi" msgid="1761738002328299714">"Käytön mukaan laskutettavat Wi-Fi-verkot"</string>
     <string name="data_usage_metered_wifi_disabled" msgid="727808462375941567">"Ota Wi-Fi käyttöön, niin voit valita käytön mukaan laskutettavat verkot."</string>
+    <string name="data_usage_metered_auto" msgid="1262028400911918865">"Automaattinen"</string>
+    <string name="data_usage_metered_yes" msgid="9217539611385225894">"Maksullinen"</string>
+    <string name="data_usage_metered_no" msgid="4025232961929071789">"Maksuton"</string>
     <string name="data_usage_disclaimer" msgid="6887858149980673444">"Operaattorin mittaustulos saattaa erota laitteesi mittaamasta."</string>
     <string name="cryptkeeper_emergency_call" msgid="198578731586097145">"Hätäpuhelu"</string>
     <string name="cryptkeeper_return_to_call" msgid="5613717339452772491">"Palaa puheluun"</string>
@@ -2526,9 +2541,6 @@
     <string name="backup_pw_set_button_text" msgid="2387480910044648795">"Aseta varmuuskopion salasana"</string>
     <string name="backup_pw_cancel_button_text" msgid="8845630125391744615">"Peruuta"</string>
     <string name="additional_system_update_settings_list_item_title" msgid="214987609894661992">"Järjestelmän lisäpäivitykset"</string>
-    <string name="selinux_status_disabled" msgid="924551035552323327">"Ei käytössä"</string>
-    <string name="selinux_status_permissive" msgid="6004965534713398778">"Salliva"</string>
-    <string name="selinux_status_enforcing" msgid="2252703756208463329">"Täytäntöönpano"</string>
     <string name="ssl_ca_cert_warning" msgid="2045866713601984673">"Verkkoa saatetaan valvoa"</string>
     <string name="done_button" msgid="1991471253042622230">"Valmis"</string>
     <plurals name="ssl_ca_cert_dialog_title" formatted="false" msgid="7145092748045794650">
@@ -2673,7 +2685,7 @@
     <string name="restriction_nfc_enable_title" msgid="5888100955212267941">"NFC"</string>
     <string name="restriction_nfc_enable_summary_config" msgid="3232480757215851738">"Salli tiedonsiirto, kun <xliff:g id="DEVICE_NAME">%1$s</xliff:g> koskettaa toista NFC-laitetta"</string>
     <string name="restriction_nfc_enable_summary" product="tablet" msgid="3891097373396149915">"Salli tiedonsiirto, kun tabletti koskettaa toista laitetta"</string>
-    <string name="restriction_nfc_enable_summary" product="default" msgid="825331120501418592">"Salli tiedonsiirto, kun puhelin koskettaa toista laitetta"</string>
+    <string name="restriction_nfc_enable_summary" product="default" msgid="825331120501418592">"Salli tiedonsiirto, kun puhelin koskettaa toista laitetta."</string>
     <string name="restriction_location_enable_title" msgid="5020268888245775164">"Sijainti"</string>
     <string name="restriction_location_enable_summary" msgid="3489765572281788755">"Anna sovellusten käyttää sijaintitietojasi"</string>
     <string name="wizard_back" msgid="5567007959434765743">"Edellinen"</string>
@@ -2726,6 +2738,7 @@
       <item quantity="other">Näytä %d piilotettua kohdetta</item>
       <item quantity="one">Näytä %d piilotettu kohde</item>
     </plurals>
+    <string name="dashboard_suggestion_condition_footer_content_description" msgid="2898588191174845961">"Tiivistä"</string>
     <string name="network_dashboard_title" msgid="4771589228992391573">"Verkko ja internet"</string>
     <string name="network_dashboard_summary_mobile" msgid="3851083934739500429">"mobiili"</string>
     <string name="network_dashboard_summary_data_usage" msgid="3843261364705042212">"datan käyttö"</string>
@@ -2811,7 +2824,7 @@
     <string name="vibrate_when_ringing_title" msgid="3806079144545849032">"Värinä myös puheluille"</string>
     <string name="other_sound_settings" msgid="3151004537006844718">"Muut äänet"</string>
     <string name="dial_pad_tones_title" msgid="1999293510400911558">"Näppäimistön näppäinäänet"</string>
-    <string name="screen_locking_sounds_title" msgid="1340569241625989837">"Ruudun lukitusäänet"</string>
+    <string name="screen_locking_sounds_title" msgid="1340569241625989837">"Näytön lukitusäänet"</string>
     <string name="charging_sounds_title" msgid="1132272552057504251">"Latausäänet"</string>
     <string name="docking_sounds_title" msgid="155236288949940607">"Telakointiäänet"</string>
     <string name="touch_sounds_title" msgid="5326587106892390176">"Kosketusäänet"</string>
@@ -2828,8 +2841,14 @@
       <item quantity="other"><xliff:g id="ON_COUNT">%d</xliff:g> automaattista sääntöä käytössä</item>
       <item quantity="one">1 automaattinen sääntö käytössä</item>
     </plurals>
-    <string name="zen_mode_settings_title" msgid="842308776768942600">"Älä häiritse ‑tilan asetukset"</string>
-    <string name="zen_mode_priority_settings_title" msgid="2623117023031824309">"Sallittavat tärkeät ilmoitukset"</string>
+    <string name="zen_mode_settings_title" msgid="1066226840983908121">"Älä häiritse"</string>
+    <string name="zen_mode_behavior_settings_title" msgid="1463303933529313969">"Käyttäytyminen"</string>
+    <string name="zen_mode_behavior_allow_title" msgid="3845615648136218141">"Salli äänet &amp; värinä kohteesta"</string>
+    <string name="zen_mode_behavior_no_sound" msgid="1219626004723208056">"Ei ääntä"</string>
+    <string name="zen_mode_behavior_total_silence" msgid="6716603819806610626">"Ei ääntä (Täysi hiljaisuus)"</string>
+    <string name="zen_mode_behavior_no_sound_except" msgid="4968477585788243114">"Ei ääntä, paitsi <xliff:g id="CATEGORIES">%1$s</xliff:g>"</string>
+    <!-- no translation found for zen_mode_behavior_alarms_only (2423480992071472963) -->
+    <skip />
     <string name="zen_mode_automation_settings_title" msgid="4228995740594063774">"Automaattiset säännöt"</string>
     <string name="zen_mode_automation_suggestion_title" msgid="5105443455143476201">"Määritä Älä häiritse ‑säännöt"</string>
     <string name="zen_mode_automation_suggestion_summary" msgid="4732808039946935657">"Rajoita ääniä ja värinää tiettyinä aikoina."</string>
@@ -2860,7 +2879,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>
@@ -2871,13 +2890,15 @@
     <string name="notifications_title" msgid="8086372779371204971">"Ilmoitukset"</string>
     <string name="app_notifications_title" msgid="5810577805218003760">"Sovellusilmoitukset"</string>
     <string name="notification_channel_title" msgid="2260666541030178452">"Ilmoituksen luokka"</string>
+    <string name="notification_group_title" msgid="7180506440133859601">"Ilmoitusluokka"</string>
     <string name="notification_importance_title" msgid="848692592679312666">"Tärkeys"</string>
-    <string name="notification_importance_unspecified" msgid="2196023702875112081">"Anna sovelluksen päättää"</string>
+    <string name="notification_importance_unspecified" msgid="6622173510486113958">"Salli ääni"</string>
     <string name="notification_importance_blocked" msgid="7938180808339386300">"Älä näytä ilmoituksia"</string>
     <string name="notification_importance_min" msgid="5455049524984686275">"Ei ääntä tai näkyvää ilmoitusta"</string>
     <string name="notification_importance_low" msgid="8881468429453766553">"Ei ääntä"</string>
     <string name="notification_importance_default" msgid="5958338024601957516">"Ääni"</string>
     <string name="notification_importance_high" msgid="2082429479238228527">"Ääni, ilmoitus näkyy näytöllä"</string>
+    <string name="notification_importance_high_silent" msgid="2667033773703765252">"Näkyy näytöllä"</string>
     <string name="notification_importance_min_title" msgid="6974673091137544803">"Matala"</string>
     <string name="notification_importance_low_title" msgid="8131254047772814309">"Keskitaso"</string>
     <string name="notification_importance_default_title" msgid="9120383978536089489">"Korkea"</string>
@@ -2920,8 +2941,13 @@
     <string name="loading_notification_apps" msgid="5031818677010335895">"Ladataan sovelluksia…"</string>
     <string name="app_notifications_off_desc" msgid="4882445501376722969">"Android estää tämän sovelluksen ilmoituksien näyttämisen tällä laitteella."</string>
     <string name="channel_notifications_off_desc" msgid="5899225298718840635">"Android estää tähän luokkaan kuuluvien ilmoituksien näyttämisen tällä laitteella."</string>
+    <string name="channel_group_notifications_off_desc" msgid="1620950416247316370">"Android estää tähän ryhmään kuuluvien ilmoituksien näyttämisen tällä laitteella."</string>
     <string name="notification_channels" msgid="5346841743182627500">"Luokat"</string>
     <string name="notification_channels_other" msgid="5645317113885788226">"Muut"</string>
+    <plurals name="notification_group_summary" formatted="false" msgid="3420621520561455358">
+      <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> luokkaa</item>
+      <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> luokka</item>
+    </plurals>
     <string name="no_channels" msgid="3077375508177744586">"Tämä sovellus ei ole lähettänyt ilmoituksia."</string>
     <string name="app_settings_link" msgid="8894946007543660906">"Lisäasetukset sovelluksessa"</string>
     <string name="app_notification_listing_summary_zero" msgid="6482582965081108108">"Käytössä kaikissa sovelluksissa"</string>
@@ -2955,7 +2981,7 @@
     <string name="zen_mode_rule_delete_button" msgid="903658142711011617">"Poista"</string>
     <string name="zen_mode_rule_rename_button" msgid="4642843370946599164">"Nimeä uudelleen"</string>
     <string name="zen_mode_rule_name" msgid="5149068059383837549">"Säännön nimi"</string>
-    <string name="zen_mode_rule_name_hint" msgid="3781174510556433384">"Nimeä sääntö."</string>
+    <string name="zen_mode_rule_name_hint" msgid="3781174510556433384">"Nimeä sääntö"</string>
     <string name="zen_mode_rule_name_warning" msgid="4517805381294494314">"Säännön nimi on jo käytössä."</string>
     <string name="zen_mode_add_rule" msgid="7459154136384467057">"Lisää"</string>
     <string name="zen_mode_delete_rule" msgid="2985902330199039533">"Poista sääntö"</string>
@@ -2998,12 +3024,14 @@
     <string name="zen_mode_from_starred" msgid="2678345811950997027">"Vain tähdellä merkityiltä kontakteilta"</string>
     <string name="zen_mode_from_none" msgid="8219706639954614136">"Ei keneltäkään"</string>
     <string name="zen_mode_alarms" msgid="2165302777886552926">"Herätykset"</string>
+    <!-- no translation found for zen_mode_media_system_other (8900209390529859777) -->
+    <skip />
     <string name="zen_mode_reminders" msgid="5458502056440485730">"Muistutukset"</string>
     <string name="zen_mode_events" msgid="7914446030988618264">"Tapahtumat"</string>
     <string name="zen_mode_all_callers" msgid="584186167367236922">"Kaikki soittajat"</string>
     <string name="zen_mode_selected_callers" msgid="3127598874060615742">"Valitut soittajat"</string>
     <string name="zen_mode_repeat_callers" msgid="5019521886428322131">"Toistuvat soitot"</string>
-    <string name="zen_mode_repeat_callers_summary" msgid="7192713032364140137">"Salli, jos sama henkilö soittaa uudelleen <xliff:g id="MINUTES">%d</xliff:g> minuutin kuluessa."</string>
+    <string name="zen_mode_repeat_callers_summary" msgid="239685342222975733">"Jos sama henkilö soittaa uudelleen <xliff:g id="MINUTES">%d</xliff:g> minuutin kuluessa"</string>
     <string name="zen_mode_when" msgid="2767193283311106373">"Ota autom. käyttöön"</string>
     <string name="zen_mode_when_never" msgid="8809494351918405602">"Ei koskaan"</string>
     <string name="zen_mode_when_every_night" msgid="3122486110091921009">"Joka yö"</string>
@@ -3022,9 +3050,9 @@
     </plurals>
     <string name="zen_mode_summary_alarms_only_by_time" msgid="7465525754879341907">"Ota vain herätykset käyttöön kello <xliff:g id="FORMATTEDTIME">%1$s</xliff:g> asti."</string>
     <string name="zen_mode_summary_always" msgid="6172985102689237703">"Salli keskeytykset aina."</string>
-    <string name="zen_mode_screen_on" msgid="7712038508173845101">"Estä, kun näyttö on päällä."</string>
+    <string name="zen_mode_screen_on" msgid="7712038508173845101">"Estä, kun näyttö on päällä"</string>
     <string name="zen_mode_screen_on_summary" msgid="6444425984146305149">"Estä Älä häiritse ‑tilan hiljentämiä ilmoituksia kurkistamasta tai näkymästä näytöllä."</string>
-    <string name="zen_mode_screen_off" msgid="5026854939192419879">"Estä, kun näyttö on pois päältä."</string>
+    <string name="zen_mode_screen_off" msgid="5026854939192419879">"Estä, kun näyttö on pois päältä"</string>
     <string name="zen_mode_screen_off_summary" msgid="6490932947651798094">"Estä Älä häiritse ‑tilan hiljentämiä ilmoituksia käynnistämästä näyttöä tai vilkuttamasta ilmoitusvaloa."</string>
     <string name="zen_mode_screen_off_summary_no_led" msgid="3758698381956461866">"Estä Älä häiritse ‑tilan hiljentämiä ilmoituksia käynnistämästä näyttöä."</string>
     <string name="zen_mode_all_visual_interruptions" msgid="2851308980832487411">"Pois käytöstä"</string>
@@ -3032,6 +3060,7 @@
     <string name="zen_mode_screen_off_visual_interruptions" msgid="4850792880144382633">"Kun näyttö on pois päältä"</string>
     <string name="zen_mode_no_visual_interruptions" msgid="8742776003822778472">"Kun näyttö on päällä tai pois päältä"</string>
     <string name="notification_app_settings_button" msgid="6685640230371477485">"Ilmoitusasetukset"</string>
+    <string name="suggestion_button_text" msgid="3275010948381252006">"OK"</string>
     <string name="device_feedback" msgid="3238056036766293294">"Lähetä palautetta tästä laitteesta"</string>
     <string name="restr_pin_enter_admin_pin" msgid="1085834515677448072">"Anna järjestelmänvalvojan PIN-koodi"</string>
     <string name="switch_on_text" msgid="1124106706920572386">"Käytössä"</string>
@@ -3118,8 +3147,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">"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="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="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>
@@ -3216,6 +3245,7 @@
     <string name="usb_summary_file_transfers" msgid="6435943692610175111">"Tiedostojen siirtäminen"</string>
     <string name="usb_summary_photo_transfers" msgid="8440204169576585250">"Kuvien siirtäminen (PTP)"</string>
     <string name="usb_summary_MIDI" msgid="5687906612187885908">"Laitteen käyttö MIDI-tilassa"</string>
+    <string name="sms_mirroring_pref" msgid="6475043279147376031">"Tekstiviestien peilaus"</string>
     <string name="background_check_pref" msgid="7550258400138010979">"Taustatarkistus"</string>
     <string name="background_check_title" msgid="4534254315824525593">"Täydet taustakäyttöoikeudet"</string>
     <string name="assist_access_context_title" msgid="2269032346698890257">"Käytä näytön tekstiä"</string>
@@ -3282,7 +3312,7 @@
     <string name="write_settings_title" msgid="4232152481902542284">"Voi muokata järjestelmäasetuksia"</string>
     <string name="write_system_settings" msgid="3482913590601096763">"Muokkaa järjestelmäasetuksia"</string>
     <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="permit_write_settings" msgid="658555006453212691">"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>
@@ -3377,9 +3407,12 @@
     <string name="color_temperature" msgid="2070126836910615605">"Viileä värilämpötila"</string>
     <string name="color_temperature_desc" msgid="4793729830226404052">"Käytä viileämpiä värilämpötiloja"</string>
     <string name="color_temperature_toast" msgid="4974218172133854827">"Ota värin muutos käyttöön sammuttamalla näyttö."</string>
-    <string name="telephony_monitor_toast" msgid="7003764250271195384">"Käynnistä laite uudelleen, niin puhelinpalvelujen seurannan muutokset astuvat voimaan."</string>
+    <string name="connectivity_monitor_switch" msgid="9059759348648583421">"Yhteysseuranta"</string>
+    <string name="connectivity_monitor_switch_summary" msgid="2828658652378866401">"Yhteysseuranta kerää lokitietoja yhteysvirheistä ja kehottaa käyttäjää tekemään virheilmoituksen."</string>
+    <string name="connectivity_monitor_toast" msgid="5551859612881173028">"Käynnistä laite uudelleen, jotta yhteysseurannan muutokset astuvat voimaan."</string>
     <string name="camera_hal_hdrplus_switch" msgid="8377365197105267466">"Kameran HAL HDR+"</string>
     <string name="camera_hal_hdrplus_toast" msgid="2063703797270055299">"Käynnistä laite uudelleen, niin kameran HAL HDR+ ‑muutos astuu voimaan."</string>
+    <string name="camera_laser_sensor_switch" msgid="8913588990743234440">"Kameran laseranturi"</string>
     <string name="ota_disable_automatic_update" msgid="2319639631655915050">"Automaattiset järjestelmäpäivitykset"</string>
     <string name="usage" msgid="2977875522080448986">"Käyttö"</string>
     <string name="cellular_data_usage" msgid="2155683719898158203">"Mobiilidatan käyttö"</string>
@@ -3405,7 +3438,7 @@
     <string name="data_warning" msgid="209133958008062117">"Datavaroitus"</string>
     <string name="set_data_limit" msgid="2901526323210516923">"Aseta tiedonsiirtoraja"</string>
     <string name="data_limit" msgid="1885406964934590552">"Datankäyttöraja"</string>
-    <string name="data_usage_template" msgid="392191945602400904">"<xliff:g id="ID_1">%1$s</xliff:g> käytetty välillä <xliff:g id="ID_2">%2$s</xliff:g>"</string>
+    <string name="data_usage_template" msgid="2923744765873163859">"<xliff:g id="ID_1">%1$s</xliff:g> käytetty <xliff:g id="ID_2">%2$s</xliff:g>"</string>
     <string name="configure" msgid="1029654422228677273">"Määritä"</string>
     <string name="data_usage_other_apps" msgid="3272872663517382050">"Muut datan käyttöön laskettavat sovellukset"</string>
     <plurals name="data_saver_unrestricted_summary" formatted="false" msgid="2635267833484232703">
@@ -3474,7 +3507,7 @@
     <string name="button_confirm_convert_fbe" msgid="7101855374850373091">"Poista ja salaa"</string>
     <string name="reset_shortcut_manager_throttling" msgid="6495066467198668994">"Nollaa ShortcutManagerin kutsurajoitus"</string>
     <string name="reset_shortcut_manager_throttling_complete" msgid="1826770872063707900">"ShortcutManagerin kutsurajoitus nollattiin."</string>
-    <string name="notification_suggestion_title" msgid="4506524937307816475">"Hallinnoi lukitusnäytön ilmoituksia"</string>
+    <string name="notification_suggestion_title" msgid="387052719462473500">"Hallinnoi lukitusnäytön tietoja"</string>
     <string name="notification_suggestion_summary" msgid="8521159741445416875">"Näytä tai piilota ilmoituksien sisältö."</string>
     <string name="page_tab_title_summary" msgid="4070309266374993258">"Kaikki"</string>
     <string name="page_tab_title_support" msgid="8483187649355540109">"Tuki ja vinkit"</string>
@@ -3482,7 +3515,7 @@
     <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>
     <string name="premium_sms_access" msgid="4660047004791638305">"Premium-tekstiviestien käyttö"</string>
-    <string name="bluetooth_disabled" msgid="2456198532288640046">"Ei näy muille laitteille"</string>
+    <string name="bluetooth_disabled" msgid="6244000672828617410">"Pois käytöstä"</string>
     <string name="bluetooth_connected_summary" msgid="7672528674593152862">"Yhdistetty laitteeseen <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="bluetooth_connected_multiple_devices_summary" msgid="9173661896296663932">"Yhdistetty useisiin laitteisiin"</string>
     <string name="demo_mode" msgid="2798762752209330277">"Käyttöliittymän esittelytila"</string>
@@ -3568,7 +3601,7 @@
     <string name="ambient_display_pickup_summary" product="tablet" msgid="5435283849947236648">"Ota tabletti käteesi, niin näet ajan, ilmoituskuvakkeet ja muita tietoja."</string>
     <string name="ambient_display_pickup_summary" product="device" msgid="8256669101643381568">"Ota laite käteesi, niin näet ajan, ilmoituskuvakkeet ja muita tietoja."</string>
     <string name="ambient_display_pickup_suggestion_summary" msgid="7014700589991761035">"Näytä ilmoitukset, vaikka näyttö on pois päältä."</string>
-    <string name="fingerprint_swipe_for_notifications_title" msgid="5816346492253270243">"Näytä ilmoitukset pyyhkäisemällä sormenjälkitunnistinta"</string>
+    <string name="fingerprint_swipe_for_notifications_title" msgid="5816346492253270243">"Pyyhkäise ilmoitukset esiin"</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="default" msgid="1770661868393713922">"Voit katsoa ilmoitukset pyyhkäisemällä puhelimen takaosassa olevasta sormenjälkitunnistimesta alaspäin."</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="tablet" msgid="902719947767712895">"Voit katsoa ilmoitukset pyyhkäisemällä tabletin takaosassa olevasta sormenjälkitunnistimesta alaspäin."</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="device" msgid="5372926094116306647">"Voit katsoa ilmoitukset pyyhkäisemällä laitteen takaosassa olevasta sormenjälkitunnistimesta alaspäin."</string>
@@ -3584,7 +3617,7 @@
     <string name="web_action_enable_title" msgid="4051513950976670853">"Pikasovellukset"</string>
     <string name="web_action_enable_summary" msgid="3108127559723396382">"Avaa linkkejä sovelluksessa, vaikka sitä ei ole asennettu."</string>
     <string name="web_action_section_title" msgid="7364647086538399136">"Pikasovellukset"</string>
-    <string name="instant_apps_account" msgid="1433620209791992528">"Pikasovellustili"</string>
+    <string name="instant_apps_settings" msgid="8827777916518348213">"Pikasovellusvalinnat"</string>
     <string name="domain_url_section_title" msgid="7046835219056428883">"Asennetut sovellukset"</string>
     <string name="automatic_storage_manager_activation_warning" msgid="6353100011690933254">"Tallennustilan hallinta hallitsee nyt tallennustilaasi."</string>
     <string name="account_for_section_header" msgid="5356566418548737121">"Tilit: <xliff:g id="USER_NAME">%1$s</xliff:g>"</string>
@@ -3631,7 +3664,9 @@
     <string name="enterprise_privacy_always_on_vpn_personal" msgid="9217774730260037434">"Aina käytössä oleva VPN päällä henkilökohtaisessa profiilissa"</string>
     <string name="enterprise_privacy_always_on_vpn_work" msgid="7244472958208315814">"Aina käytössä oleva VPN päällä työprofiilissa"</string>
     <string name="enterprise_privacy_global_http_proxy" msgid="7936664553416257333">"Yleinen HTTP-välityspalvelin asetettu"</string>
-    <string name="enterprise_privacy_ca_certs" msgid="5885892204903688909">"Luotetut todennustiedot"</string>
+    <string name="enterprise_privacy_ca_certs_device" msgid="2019652712782510262">"Luotetut kirjautumistiedot"</string>
+    <string name="enterprise_privacy_ca_certs_personal" msgid="2279084820904076599">"Henkilökohtaisen profiilin luotetut kirjautumistiedot"</string>
+    <string name="enterprise_privacy_ca_certs_work" msgid="6187377647815301809">"Työprofiilin luotetut kirjautumistiedot"</string>
     <plurals name="enterprise_privacy_number_ca_certs" formatted="false" msgid="526375234629534165">
       <item quantity="other">Vähintään <xliff:g id="COUNT_1">%d</xliff:g> CA-varmennetta</item>
       <item quantity="one">Vähintään <xliff:g id="COUNT_0">%d</xliff:g> CA-varmenne</item>
@@ -3694,6 +3729,8 @@
     <string name="carrier_provisioning" msgid="4398683675591893169">"Operaattorin hallintatiedot"</string>
     <string name="trigger_carrier_provisioning" msgid="3434865918009286187">"Ota operaattorin hallinta käyttöön"</string>
     <string name="new_device_suggestion_title" msgid="698847081680980774">"Uutta"</string>
-    <string name="new_device_suggestion_summary" msgid="7172709269203435870">"Katso viisi kätevää ominaisuutta"</string>
+    <string name="new_device_suggestion_summary" product="default" msgid="206396571522515855">"Tutustu uuteen puhelimeesi"</string>
+    <string name="new_device_suggestion_summary" product="tablet" msgid="393751455688210956">"Tutustu uuteen tablettiisi"</string>
+    <string name="new_device_suggestion_summary" product="device" msgid="2939870049868336652">"Tutustu uuteen laitteeseesi"</string>
     <string name="disabled_low_ram_device" msgid="3751578499721173344">"Ominaisuus ei ole käytettävissä tällä laitteella."</string>
 </resources>
diff --git a/res/values-fr-rCA/arrays.xml b/res/values-fr-rCA/arrays.xml
index c58e1f7..2b9a5a6 100644
--- a/res/values-fr-rCA/arrays.xml
+++ b/res/values-fr-rCA/arrays.xml
@@ -100,8 +100,6 @@
     <!-- no translation found for wifi_security_no_eap:0 (2084555984818107151) -->
     <!-- no translation found for wifi_security_no_eap:1 (397579322683471524) -->
     <!-- no translation found for wifi_security_no_eap:2 (1968820975358150484) -->
-    <!-- no translation found for wifi_ap_security:0 (5251664683198623324) -->
-    <!-- no translation found for wifi_ap_security:1 (7989073072260294673) -->
   <string-array name="wifi_eap_method">
     <item msgid="1160193392455075561">"PEAP"</item>
     <item msgid="7981731051382306293">"TLS"</item>
diff --git a/res/values-fr-rCA/strings.xml b/res/values-fr-rCA/strings.xml
index 6029524..3f725bf 100644
--- a/res/values-fr-rCA/strings.xml
+++ b/res/values-fr-rCA/strings.xml
@@ -166,7 +166,7 @@
     <string name="bluetooth_map_acceptance_dialog_text" msgid="8712508202081143737">"%1$s souhaite accéder à vos messages. Autoriser l\'accès à %2$s?"</string>
     <string name="bluetooth_sap_request" msgid="2669762224045354417">"Demande d\'accès à la carte SIM"</string>
     <string name="bluetooth_sap_acceptance_dialog_text" msgid="4414253873553608690">"<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g> souhaite accéder à votre carte SIM. Le fait d\'accorder l\'accès à la carte SIM désactive la connectivité de données sur votre appareil pendant la durée de la connexion. Accorder l\'accès à <xliff:g id="DEVICE_NAME_1">%2$s?</xliff:g>."</string>
-    <string name="bluetooth_device_name_summary" msgid="4757990010751789977">"Visible comme « <xliff:g id="DEVICE_NAME">^1</xliff:g> » aux autres appareils"</string>
+    <string name="bluetooth_device_name_summary" msgid="522235742194965734">"Visible comme « <xliff:g id="DEVICE_NAME">^1</xliff:g> » aux autres appareils"</string>
     <string name="bluetooth_paired_device_title" msgid="8638994696317952019">"Vos appareils"</string>
     <string name="bluetooth_pairing_page_title" msgid="7712127387361962608">"Associer un nouvel appareil"</string>
     <string name="date_and_time" msgid="9062980487860757694">"Date et heure"</string>
@@ -248,7 +248,7 @@
     <string name="sdcard_settings_read_only_status" product="nosdcard" msgid="3624143937437417788">"Mémoire USB en lecture seule"</string>
     <string name="sdcard_settings_read_only_status" product="default" msgid="4518291824764698112">"Carte SD installée en lecture seule"</string>
     <string name="skip_label" msgid="47510779345218297">"Passer"</string>
-    <string name="next_label" msgid="4693520878012668114">"SUIVANTE"</string>
+    <string name="next_label" msgid="4693520878012668114">"SUIVANT"</string>
     <string name="language_picker_title" msgid="3596315202551687690">"Langues"</string>
     <string name="pref_title_lang_selection" msgid="2014920136978776034">"Préférences linguistiques"</string>
     <string name="locale_remove_menu" msgid="7651301406723638854">"Supprimer"</string>
@@ -312,6 +312,8 @@
     <string name="zone_auto" msgid="334783869352026648">"Fuseau horaire automatique"</string>
     <string name="zone_auto_summaryOn" msgid="6142830927278458314">"Utiliser le fuseau horaire fourni par le réseau"</string>
     <string name="zone_auto_summaryOff" msgid="2597745783162041390">"Utiliser le fuseau horaire fourni par le réseau"</string>
+    <string name="date_time_24hour_auto" msgid="2117383168985653422">"Format 24 heures automatique"</string>
+    <string name="date_time_24hour_auto_summary" msgid="6351812925651480277">"Utiliser les paramètres régionaux par défaut"</string>
     <string name="date_time_24hour_title" msgid="3203537578602803850">"Format 24 heures"</string>
     <string name="date_time_24hour" msgid="1193032284921000063">"Utiliser le format 24 h"</string>
     <string name="date_time_set_time_title" msgid="6296795651349047016">"Heure"</string>
@@ -372,6 +374,9 @@
     <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="1961957425135180242">"Suivant"</string>
+    <string name="setup_fingerprint_enroll_skip_title" msgid="362050541117362034">"Ignorer l\'empreinte digitale?"</string>
+    <string name="setup_fingerprint_enroll_skip_after_adding_lock_text" msgid="958990414356204763">"La configuration des empreintes digitales ne prend qu\'une minute ou deux. Si vous ignorez cette étape, vous pouvez ajouter votre empreinte digitale plus tard dans les paramètres."</string>
+    <string name="lock_screen_intro_skip_title" msgid="4988210105913705679">"Ignorer verrouillage d\'écran?"</string>
     <string name="lock_screen_intro_skip_dialog_text_frp" product="tablet" msgid="1581834104051243425">"Les fonctionnalités de protection de l\'appareil ne seront pas activées. Vous ne pourrez pas empêcher d\'autres personnes d\'utiliser cette tablette en cas de perte, de vol ou de réinitialisation."</string>
     <string name="lock_screen_intro_skip_dialog_text_frp" product="device" msgid="4629503416877189572">"Les fonctionnalités de protection de l\'appareil ne seront pas activées. Vous ne pourrez pas empêcher d\'autres personnes d\'utiliser cet appareil en cas de perte, de vol ou de réinitialisation."</string>
     <string name="lock_screen_intro_skip_dialog_text_frp" product="default" msgid="2423428240245737909">"Les fonctionnalités de protection de l\'appareil ne seront pas activées. Vous ne pourrez pas empêcher d\'autres personnes d\'utiliser ce téléphone en cas de perte, de vol ou de réinitialisation."</string>
@@ -401,7 +406,7 @@
     <string name="security_settings_fingerprint_enroll_touch_dialog_message" msgid="2989019978041986175">"Touchez le capteur à l\'arrière de votre téléphone. Utilisez votre index."</string>
     <string name="security_settings_fingerprint_enroll_error_dialog_title" msgid="3618021988442639280">"L\'enregistrement n\'est pas terminé"</string>
     <string name="security_settings_fingerprint_enroll_error_timeout_dialog_message" msgid="2942551158278899627">"Le temps attribué pour l\'enregistrement des empreintes digitales est écoulé. Veuillez essayer de nouveau."</string>
-    <string name="security_settings_fingerprint_enroll_error_generic_dialog_message" msgid="3624760637222239293">"L\'enregistrement des empreintes digitales ne fonctionne pas. Essayez à nouveau ou utilisez un autre doigt."</string>
+    <string name="security_settings_fingerprint_enroll_error_generic_dialog_message" msgid="3624760637222239293">"L\'enregistrement de l\'empreinte digitale n\'a pas fonctionné. Réessayez ou utilisez un autre doigt."</string>
     <string name="fingerprint_enroll_button_add" msgid="6317978977419045463">"Ajouter une empreinte"</string>
     <string name="fingerprint_enroll_button_next" msgid="6247009337616342759">"Suivant"</string>
     <string name="security_settings_fingerprint_enroll_disclaimer" msgid="2624905914239271751">"Votre empreinte digitale vous permet non seulement de déverrouiller votre téléphone, mais également d\'autoriser des achats et l\'accès à l\'application. "<annotation id="url">"En savoir plus"</annotation></string>
@@ -457,7 +462,7 @@
     <string name="setup_lock_settings_picker_title" product="tablet" msgid="90329443364067215">"Protégez votre tablette"</string>
     <string name="setup_lock_settings_picker_title" product="device" msgid="2399952075134938929">"Protégez votre appareil"</string>
     <string name="setup_lock_settings_picker_title" product="default" msgid="1572244299605153324">"Protégez votre téléphone"</string>
-    <string name="setup_lock_settings_picker_fingerprint_message" msgid="5585650064305600578">"Pour plus de sécurité, configurez une méthode alternative pour verrouiller l\'écran."</string>
+    <string name="lock_settings_picker_fingerprint_added_security_message" msgid="5768002109707648463">"Pour plus de sécurité, configurez une méthode secondaire pour verrouiller l\'écran."</string>
     <string name="setup_lock_settings_picker_message" product="tablet" msgid="8919671129189936210">"Activez les fonctionnalités de protection de l\'appareil pour empêcher d\'autres personnes d\'utiliser cette tablette sans votre autorisation. Choisissez la méthode de verrouillage de l\'écran à utiliser."</string>
     <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>
@@ -501,35 +506,35 @@
     <string name="unlock_disable_frp_warning_content_pattern" msgid="8869767290771023461">"Les fonctions de protection de l\'appareil ne fonctionneront pas sans votre schéma."</string>
     <string name="unlock_disable_frp_warning_content_pattern_fingerprint" msgid="2986105377420905314">"Les fonctions de protection de l\'appareil ne fonctionneront pas sans votre schéma.<xliff:g id="EMPTY_LINE">
 
-</xliff:g>Vos empreintes digitales enregistrées seront également supprimées de cet appareil et vous ne pourrez pas déverrouiller votre téléphone, autoriser des achats ou vous connecter à des applications avec celles-ci."</string>
+</xliff:g>Vos empreintes digitales enregistrées seront également supprimées de cet appareil et vous ne pourrez pas déverrouiller votre téléphone, autoriser des achats ni vous connecter à des applications avec celles-ci."</string>
     <string name="unlock_disable_frp_warning_content_pin" msgid="586996206210265131">"Les fonctions de protection de l\'appareil ne fonctionneront pas sans votre NIP."</string>
     <string name="unlock_disable_frp_warning_content_pin_fingerprint" msgid="3370462835533123695">"Les fonctions de protection de l\'appareil ne fonctionneront pas sans votre NIP.<xliff:g id="EMPTY_LINE">
 
-</xliff:g>Vos empreintes digitales enregistrées seront également supprimées de cet appareil et vous ne pourrez pas déverrouiller votre téléphone, autoriser des achats ou vous connecter à des applications avec celles-ci."</string>
+</xliff:g>Vos empreintes digitales enregistrées seront également supprimées de cet appareil et vous ne pourrez pas déverrouiller votre téléphone, autoriser des achats ni vous connecter à des applications avec celles-ci."</string>
     <string name="unlock_disable_frp_warning_content_password" msgid="5420612686852555537">"Les fonctions de protection de l\'appareil ne fonctionneront pas sans votre mot de passe."</string>
     <string name="unlock_disable_frp_warning_content_password_fingerprint" msgid="3595476296430536798">"Les fonctions de protection de l\'appareil ne fonctionneront pas sans votre mot de passe. <xliff:g id="EMPTY_LINE">
 
-</xliff:g>Vos empreintes digitales enregistrées seront également supprimées de cet appareil et vous ne pourrez pas déverrouiller votre téléphone, autoriser des achats ou vous connecter à des applications avec celles-ci."</string>
+</xliff:g>Vos empreintes digitales enregistrées seront également supprimées de cet appareil et vous ne pourrez pas déverrouiller votre téléphone, autoriser des achats ni vous connecter à des applications avec celles-ci."</string>
     <string name="unlock_disable_frp_warning_content_unknown" msgid="1550718040483548220">"Les fonctions de protection de l\'appareil ne fonctionneront pas sans votre verrouillage d\'écran."</string>
     <string name="unlock_disable_frp_warning_content_unknown_fingerprint" msgid="3679351662094349506">"Les fonctions de protection de l\'appareil ne fonctionneront pas sans votre verrouillage d\'écran.<xliff:g id="EMPTY_LINE">
 
-</xliff:g>Vos empreintes digitales enregistrées seront également supprimées de cet appareil et vous ne pourrez pas déverrouiller votre téléphone, autoriser des achats ou vous connecter à des applications avec celles-ci."</string>
+</xliff:g>Vos empreintes digitales enregistrées seront également supprimées de cet appareil et vous ne pourrez pas déverrouiller votre téléphone, autoriser des achats ni vous connecter à des applications avec celles-ci."</string>
     <string name="unlock_disable_frp_warning_content_pattern_profile" msgid="8682200103576359918">"Les fonctions de protection du profil ne fonctionneront pas sans votre schéma."</string>
     <string name="unlock_disable_frp_warning_content_pattern_fingerprint_profile" msgid="6718155854303231675">"Les fonctions de protection du profil ne fonctionneront pas sans votre schéma.<xliff:g id="EMPTY_LINE">
 
-</xliff:g>Vos empreintes digitales enregistrées seront également supprimées de ce profil et vous ne pourrez pas déverrouiller votre profil, autoriser des achats ou vous connecter à des applications avec celles-ci."</string>
+</xliff:g>Vos empreintes digitales enregistrées seront également supprimées de ce profil et vous ne pourrez pas déverrouiller votre profil, autoriser des achats ni vous connecter à des applications avec celles-ci."</string>
     <string name="unlock_disable_frp_warning_content_pin_profile" msgid="7790688070593867767">"Les fonctions de protection du profil ne fonctionneront pas sans votre NIP."</string>
     <string name="unlock_disable_frp_warning_content_pin_fingerprint_profile" msgid="4209564603132870532">"Les fonctions de protection du profil ne fonctionneront pas sans votre NIP.<xliff:g id="EMPTY_LINE">
 
-</xliff:g>Vos empreintes digitales enregistrées seront également supprimées de ce profil et vous ne pourrez pas déverrouiller votre profil, autoriser des achats ou vous connecter à des applications avec celles-ci."</string>
+</xliff:g>Vos empreintes digitales enregistrées seront également supprimées de ce profil et vous ne pourrez pas déverrouiller votre profil, autoriser des achats ni vous connecter à des applications avec celles-ci."</string>
     <string name="unlock_disable_frp_warning_content_password_profile" msgid="7569285520567674461">"Les fonctions de protection du profil ne fonctionneront pas sans votre mot de passe."</string>
     <string name="unlock_disable_frp_warning_content_password_fingerprint_profile" msgid="2994300676764706047">"Les fonctions de protection de profil ne fonctionneront pas sans votre mot de passe. <xliff:g id="EMPTY_LINE">
 
-</xliff:g>Vos empreintes digitales enregistrées seront également supprimées de ce profil et vous ne pourrez pas déverrouiller votre profil, autoriser des achats ou vous connecter à des applications avec celles-ci."</string>
+</xliff:g>Vos empreintes digitales enregistrées seront également supprimées de ce profil et vous ne pourrez pas déverrouiller votre profil, autoriser des achats ni vous connecter à des applications avec celles-ci."</string>
     <string name="unlock_disable_frp_warning_content_unknown_profile" msgid="6984215718701688202">"Les fonctions de protection du profil ne fonctionneront pas sans votre verrouillage d\'écran."</string>
     <string name="unlock_disable_frp_warning_content_unknown_fingerprint_profile" msgid="4994062501123299418">"Les fonctions de protection du profil ne fonctionneront pas sans votre verrouillage d\'écran.<xliff:g id="EMPTY_LINE">
 
-</xliff:g>Vos empreintes digitales enregistrées seront également supprimées de ce profil et vous ne pourrez pas déverrouiller votre téléphone, autoriser des achats ou vous connecter à des applications avec celles-ci."</string>
+</xliff:g>Vos empreintes digitales enregistrées seront également supprimées de ce profil et vous ne pourrez pas déverrouiller votre téléphone, autoriser des achats ni vous connecter à des applications avec celles-ci."</string>
     <string name="unlock_disable_frp_warning_ok" msgid="7075138677177748705">"Oui, supprimer"</string>
     <string name="unlock_change_lock_pattern_title" msgid="2044092014872741130">"Modifier le schéma"</string>
     <string name="unlock_change_lock_pin_title" msgid="806629901095938484">"Modifier le NIP de déverrouillage"</string>
@@ -586,8 +591,9 @@
     </plurals>
     <string name="lockpassword_password_recently_used" msgid="942665351220525547">"L\'administrateur de l\'appareil ne permet pas l\'utilisation d\'un mot de passe récent"</string>
     <string name="lockpassword_pin_no_sequential_digits" msgid="680765285206990584">"Les suites croissantes, décroissantes ou répétitives de chiffres ne sont pas autorisées"</string>
-    <string name="lockpassword_ok_label" msgid="313822574062553672">"OK"</string>
+    <string name="lockpassword_confirm_label" msgid="8176726201389902380">"Confirmer"</string>
     <string name="lockpassword_cancel_label" msgid="8818529276331121899">"Annuler"</string>
+    <string name="lockpassword_clear_label" msgid="5724429464960458155">"Effacer"</string>
     <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>
@@ -662,16 +668,16 @@
     <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>
     <string name="bluetooth_disconnect_hid_profile" msgid="3282295189719352075">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> sera déconnecté du périphérique d\'entrée"</string>
     <string name="bluetooth_disconnect_pan_user_profile" msgid="8037627994382458698">"L\'accès à Internet via <xliff:g id="DEVICE_NAME">%1$s</xliff:g> va être interrompu."</string>
-    <string name="bluetooth_disconnect_pan_nap_profile" product="tablet" msgid="1262792320446274407">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> ne partagera plus la connexion Internet de la tablette."</string>
-    <string name="bluetooth_disconnect_pan_nap_profile" product="default" msgid="5700332050175684571">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> sera déconnecté et ne partagera plus la connexion Internet du téléphone."</string>
+    <string name="bluetooth_disconnect_pan_nap_profile" product="tablet" msgid="8355910926439312604">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> ne partagera plus la connexion Internet de la tablette."</string>
+    <string name="bluetooth_disconnect_pan_nap_profile" product="default" msgid="6251611115860359886">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> ne partagera plus la connexion Internet du téléphone."</string>
     <string name="bluetooth_device_advanced_title" msgid="6066342531927499308">"Appareil Bluetooth associé"</string>
     <string name="bluetooth_device_advanced_online_mode_title" msgid="3689050071425683114">"Connexion"</string>
     <string name="bluetooth_device_advanced_online_mode_summary" msgid="1204424107263248336">"Connecter à un appareil Bluetooth"</string>
     <string name="bluetooth_device_advanced_profile_header_title" msgid="102745381968579605">"Utiliser pour"</string>
     <string name="bluetooth_device_advanced_rename_device" msgid="5148578059584955791">"Renommer"</string>
     <string name="bluetooth_device_advanced_enable_opp_title" msgid="8222550640371627365">"Autoriser le transfert de fichiers entrants"</string>
-    <string name="bluetooth_pan_user_profile_summary_connected" msgid="4602294638909590612">"Connecté à l\'appareil pour accès Internet"</string>
-    <string name="bluetooth_pan_nap_profile_summary_connected" msgid="1561383706411975199">"Connexion Internet locale partagée"</string>
+    <string name="bluetooth_pan_user_profile_summary_connected" msgid="6436258151814414028">"Connecté à l\'appareil pour accès Internet"</string>
+    <string name="bluetooth_pan_nap_profile_summary_connected" msgid="1322694224800769308">"Connexion Internet locale partagée avec appareil"</string>
     <string name="bluetooth_dock_settings" msgid="3218335822716052885">"Paramètres station d\'accueil"</string>
     <string name="bluetooth_dock_settings_title" msgid="5543069893044375188">"Utiliser la station d’accueil pour l\'audio"</string>
     <string name="bluetooth_dock_settings_headset" msgid="1001821426078644650">"Comme téléphone à haut-parleur"</string>
@@ -704,7 +710,7 @@
     <string name="android_beam_off_summary" msgid="4663095428454779138">"Désactivé"</string>
     <string name="android_beam_disabled_summary" msgid="1737782116894793393">"Indisponible, car la NFC est désactivée"</string>
     <string name="android_beam_label" msgid="6257036050366775040">"Android Beam"</string>
-    <string name="android_beam_explained" msgid="1810540319385192758">"Lorsque cette fonctionnalité est activée, vous pouvez partager le contenu d\'une application avec un appareil compatible NFC en rapprochant les appareils. Vous pouvez, par exemple, partager des pages Web, des vidéos YouTube, des contacts et plus encore.\n\nIl vous suffit de rapprocher les appareils (en les plaçant dos à dos), puis de toucher votre écran. L\'application détermine le contenu à transférer."</string>
+    <string name="android_beam_explained" msgid="1810540319385192758">"Lorsque cette fonctionnalité est activée, vous pouvez partager le contenu d\'une application avec un appareil compatible NFC en rapprochant les appareils. Vous pouvez, par exemple, partager des pages Web, des vidéos YouTube, des contacts et plus encore.\n\nIl vous suffit de rapprocher les appareils (en les plaçant généralement dos à dos), puis de toucher votre écran. L\'application détermine le contenu à transférer."</string>
     <string name="wifi_quick_toggle_title" msgid="8850161330437693895">"Wi-Fi"</string>
     <string name="wifi_quick_toggle_summary" msgid="2696547080481267642">"Activer le Wi-Fi"</string>
     <string name="wifi_settings" msgid="29722149822540994">"Wi-Fi"</string>
@@ -724,14 +730,14 @@
     <string name="wifi_wakeup_summary_scanning_disabled" msgid="7247227922074840445">"Cette fonction n\'est pas accessible, car la recherche de réseaux Wi-Fi est désactivée"</string>
     <string name="wifi_wakeup_summary_scoring_disabled" msgid="108339002136866897">"Pour utiliser cette option, sélectionnez un fournisseur d\'avis sur le réseau"</string>
     <string name="wifi_poor_network_detection" msgid="4925789238170207169">"Éviter les connexions instables"</string>
-    <string name="wifi_poor_network_detection_summary" msgid="2784135142239546291">"Ne pas utiliser de réseau Wi-Fi, sauf en cas de connexion Internet de bonne qualité"</string>
-    <string name="wifi_avoid_poor_network_detection_summary" msgid="4674423884870027498">"N\'utiliser que réseaux dotés d\'une connexion Internet stable"</string>
+    <string name="wifi_poor_network_detection_summary" msgid="7016103106105907127">"Ne pas utiliser de réseau Wi-Fi, sauf en cas de connexion Internet de bonne qualité"</string>
+    <string name="wifi_avoid_poor_network_detection_summary" msgid="1644292503152790501">"N\'utiliser que réseaux offrant une connexion Internet stable"</string>
     <string name="use_open_wifi_automatically_title" msgid="6851951242903078588">"Se connecter auto. aux réseaux ouverts"</string>
     <string name="use_open_wifi_automatically_summary" msgid="2982091714252931713">"Se connecter auto. aux réseaux publics de haute qualité"</string>
     <string name="use_open_wifi_automatically_summary_scoring_disabled" msgid="593964217679325831">"Pour utiliser cette option, sélectionnez un fournisseur d\'avis sur le réseau"</string>
     <string name="use_open_wifi_automatically_summary_scorer_unsupported_disabled" msgid="8472122600853650258">"Pour utiliser cette option, sélectionnez un fournisseur d\'avis sur le réseau compatible"</string>
     <string name="wifi_install_credentials" msgid="3551143317298272860">"Installer les certificats"</string>
-    <string name="wifi_scan_notify_text" msgid="5593805423071186757">"Pour améliorer la précision de la localisation, les applications et les services système peuvent toujours rechercher les réseaux Wi-Fi. Vous pouvez modifier ce paramètre dans les <xliff:g id="LINK_BEGIN_0">LINK_BEGIN</xliff:g>paramètres de recherche<xliff:g id="LINK_END_1">LINK_END</xliff:g>."</string>
+    <string name="wifi_scan_notify_text" msgid="5593805423071186757">"Pour améliorer la précision de la localisation, les applications et les services système peuvent rechercher en permanence des réseaux Wi-Fi. Vous pouvez modifier ce paramètre dans les <xliff:g id="LINK_BEGIN_0">LINK_BEGIN</xliff:g>paramètres de recherche<xliff:g id="LINK_END_1">LINK_END</xliff:g>."</string>
     <string name="wifi_scan_notify_text_scanning_off" msgid="3426075479272242098">"Pour améliorer la précision de la localisation, activez la recherche Wi-Fi dans les <xliff:g id="LINK_BEGIN_0">LINK_BEGIN</xliff:g>paramètres de recherche<xliff:g id="LINK_END_1">LINK_END</xliff:g>."</string>
     <string name="wifi_scan_notify_remember_choice" msgid="7104867814641144485">"Ne plus afficher"</string>
     <string name="wifi_setting_sleep_policy_title" msgid="5149574280392680092">"Wi-Fi actif en veille"</string>
@@ -741,9 +747,9 @@
     <string name="wifi_suspend_optimizations" msgid="1220174276403689487">"Optimisation du Wi-Fi"</string>
     <string name="wifi_suspend_optimizations_summary" msgid="4151428966089116856">"Minimiser la consommation de la batterie lorsque le Wi-Fi est activé"</string>
     <string name="wifi_limit_optimizations_summary" msgid="9000801068363468950">"Limiter énergie util. par Wi‑Fi"</string>
-    <string name="wifi_switch_away_when_unvalidated" msgid="1707247692180853058">"Utiliser les données cellulaires si vous n\'avez plus accès à Internet par réseau Wi‑Fi."</string>
+    <string name="wifi_switch_away_when_unvalidated" msgid="8593144541347373394">"Utiliser les données cellulaires si vous n\'avez plus accès à Internet par réseau Wi‑Fi."</string>
     <string name="wifi_cellular_data_fallback_title" msgid="8753386877755616476">"Passer automatiquement au réseau cellulaire"</string>
-    <string name="wifi_cellular_data_fallback_summary" msgid="6375399280719867214">"Utiliser le réseau de données cellulaires lorsque le réseau Wi-Fi n\'a pas accès à Internet. Des frais d\'utilisation de données peuvent s\'appliquer."</string>
+    <string name="wifi_cellular_data_fallback_summary" msgid="1403505355490119307">"Utiliser le réseau de données cellulaires lorsque le réseau Wi-Fi n\'a pas accès à Internet. Des frais d\'utilisation de données peuvent s\'appliquer."</string>
     <string name="wifi_add_network" msgid="6234851776910938957">"Ajouter un réseau"</string>
     <string name="wifi_configure_settings_preference_title" msgid="2913345003906899146">"Préférences Wi-Fi"</string>
     <string name="wifi_configure_settings_preference_summary_wakeup_on" msgid="646393113104367290">"Le Wi-Fi se réactive automatiquement"</string>
@@ -781,6 +787,7 @@
     <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>
@@ -817,6 +824,8 @@
     <string name="wifi_wps_available_first_item" msgid="4422547079984583502">"WPS disponible"</string>
     <string name="wifi_wps_available_second_item" msgid="8427520131718215301">" (WPS disponible)"</string>
     <string name="wifi_wps_nfc_enter_password" msgid="2288214226916117159">"Entrez votre mot de passe réseau"</string>
+    <string name="wifi_carrier_connect" msgid="8174696557882299911">"Réseau Wi-Fi du fournisseur de services"</string>
+    <string name="wifi_carrier_content" msgid="4634077285415851933">"Se connecter au réseau de <xliff:g id="NAME">%1%s</xliff:g>"</string>
     <string name="wifi_scan_always_turnon_message" msgid="203123538572122989">"Pour améliorer la précision de la position et à d\'autres fins, <xliff:g id="APP_NAME">%1$s</xliff:g> souhaite activer la recherche de réseaux, même lorsque le Wi-Fi est désactivé.\n\nDonner cette autorisation à toutes les applications souhaitant activer la recherche de réseaux?"</string>
     <string name="wifi_scan_always_turnoff_message" msgid="5538901671131941043">"Pour désactiver cette option, sélectionnez « Paramètres avancés » dans le menu à développer."</string>
     <string name="wifi_scan_always_confirm_allow" msgid="5355973075896817232">"Autoriser"</string>
@@ -824,9 +833,9 @@
     <string name="wifi_hotspot_title" msgid="7726205804813286950">"Se connecter au point d\'accès pour la connexion?"</string>
     <string name="wifi_hotspot_message" msgid="3673833421453455747">"<xliff:g id="APP_NAME">%1$s</xliff:g> requiert connexion pour autoriser l\'accès réseau."</string>
     <string name="wifi_hotspot_connect" msgid="5065506390164939225">"CONNEXION"</string>
-    <string name="no_internet_access_text" msgid="7133561752896706392">"Ce réseau ne dispose d\'aucun accès à Internet. Voulez-vous quand même l\'utiliser?"</string>
+    <string name="no_internet_access_text" msgid="5926979351959279577">"Ce réseau ne dispose d\'aucun accès à Internet. Voulez-vous quand même l\'utiliser?"</string>
     <string name="no_internet_access_remember" msgid="4697314331614625075">"Ne plus me demander pour ce réseau"</string>
-    <string name="lost_internet_access_title" msgid="6228530645663584505">"Le réseau Wi‑Fi n\'est pas connecté à Internet"</string>
+    <string name="lost_internet_access_title" msgid="5779478650636392426">"Le Wi‑Fi n\'est pas connecté à Internet"</string>
     <string name="lost_internet_access_text" msgid="9029649339816197345">"Vous pouvez passer au réseau cellulaire lorsque la connexion Wi‑Fi est faible. Des frais de données peuvent s\'appliquer."</string>
     <string name="lost_internet_access_switch" msgid="2262459569601190039">"Passer au réseau cellulaire"</string>
     <string name="lost_internet_access_cancel" msgid="338273139419871110">"Rester connecté au Wi-Fi"</string>
@@ -834,6 +843,7 @@
     <string name="wifi_connect" msgid="1076622875777072845">"Connexion"</string>
     <string name="wifi_failed_connect_message" msgid="8491902558970292871">"Échec de la connexion au réseau."</string>
     <string name="wifi_forget" msgid="8168174695608386644">"Supprimer"</string>
+    <string name="wifi_modify" msgid="6100248070440710782">"Modifier"</string>
     <string name="wifi_failed_forget_message" msgid="1348172929201654986">"Échec de la suppression du réseau."</string>
     <string name="wifi_save" msgid="3331121567988522826">"Enregistrer"</string>
     <string name="wifi_failed_save_message" msgid="6650004874143815692">"Échec de l\'enregistrement du réseau."</string>
@@ -846,6 +856,7 @@
     <string name="wifi_advanced_titlebar" msgid="4485841401774142908">"Paramètres Wi-Fi avancés"</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_title" msgid="8954667664081737098">"Détails du réseau"</string>
     <string name="wifi_details_subnet_mask" msgid="6720279144174924410">"Masque de sous-réseau"</string>
     <string name="wifi_details_dns" msgid="8648826607751830768">"DNS"</string>
     <string name="wifi_details_ipv6_address_header" msgid="6734119149106422148">"Adresses IPv6"</string>
@@ -878,18 +889,17 @@
     <string name="wifi_p2p_cancel_connect_title" msgid="255267538099324413">"Annuler l\'invitation?"</string>
     <string name="wifi_p2p_cancel_connect_message" msgid="7477756213423749402">"Voulez-vous annuler l\'invitation à se connecter avec <xliff:g id="PEER_NAME">%1$s</xliff:g>?"</string>
     <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_off_subtext" msgid="5466126533609394170">"Connexion Internet ou contenu non partagés avec d\'autres appareils"</string>
-    <string name="wifi_hotspot_tethering_on_subtext" product="tablet" msgid="5752490509369962007">"La connexion Internet de la tablette est partagée par point d\'accès"</string>
-    <string name="wifi_hotspot_tethering_on_subtext" product="default" msgid="6461075246164300670">"La connexion Internet du téléphone est partagée par point d\'accès"</string>
-    <string name="wifi_hotspot_on_local_only_subtext" msgid="2068110388011294735">"L\'application partage du contenu. Pour partager la connexion Internet, désactivez puis réactivez le point d\'accès."</string>
-    <string name="wifi_hotspot_name_title" msgid="1341735529132128887">"Nom du réseau Wi-Fi"</string>
+    <string name="wifi_hotspot_off_subtext" msgid="2199911382555864644">"Connexion Internet ou contenu non partagés avec d\'autres appareils"</string>
+    <string name="wifi_hotspot_tethering_on_subtext" product="tablet" msgid="5936710887156133458">"La connexion Internet de la tablette est partagée à l\'aide d\'un point d\'accès"</string>
+    <string name="wifi_hotspot_tethering_on_subtext" product="default" msgid="5556202634866621632">"La connexion Internet du téléphone est partagée à l\'aide d\'un point d\'accès"</string>
+    <string name="wifi_hotspot_on_local_only_subtext" msgid="5017191966153008">"L\'application partage du contenu. Pour partager la connexion Internet, désactivez puis réactivez le point d\'accès."</string>
+    <string name="wifi_hotspot_name_title" msgid="8237000746618636778">"Nom du point d\'acces"</string>
     <string name="wifi_hotspot_name_summary_connecting" msgid="3378299995508671967">"Activation du point d\'accès <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g> en cours…"</string>
     <string name="wifi_hotspot_name_summary_connected" msgid="3888672084861445362">"D\'autres appareils peuvent se connecter à <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>"</string>
-    <string name="wifi_hotspot_password_title" msgid="1955592302902091281">"Mot de passe Wi-Fi"</string>
+    <string name="wifi_hotspot_password_title" msgid="8676859981917573801">"Mot de passe du point d\'accès"</string>
     <string name="wifi_hotspot_ap_band_title" msgid="1165801173359290681">"Bande du point d\'accès"</string>
-    <string name="wifi_hotspot_footer_info_regular" msgid="1203489406068036455">"Un point d\'accès vous permet de créer un réseau Wi-Fi pour vos autres appareils. Il les connecte à Internet en utilisant votre connexion de données cellulaires. Des frais cellulaires supplémentaires peuvent s\'appliquer."</string>
+    <string name="wifi_hotspot_footer_info_regular" msgid="4789553667374849566">"Un point d\'accès vous permet de créer un réseau Wi-Fi pour vos autres appareils. Il les connecte à Internet en utilisant votre connexion de données cellulaires. Des frais supplémentaires peuvent s\'appliquer."</string>
     <string name="wifi_hotspot_footer_info_local_only" msgid="857988412470694109">"Les applications peuvent créer un point d\'accès pour partager du contenu avec les appareils à proximité."</string>
     <string name="wifi_tether_starting" msgid="1322237938998639724">"Activation du point d\'accès Wi-Fi en cours…"</string>
     <string name="wifi_tether_stopping" msgid="4835852171686388107">"Désactivation du point d\'accès Wi-Fi en cours…"</string>
@@ -898,7 +908,6 @@
     <string name="wifi_tether_configure_ap_text" msgid="7974681394041609308">"Configurer le point d\'accès Wi-Fi"</string>
     <string name="wifi_hotspot_configure_ap_text" msgid="5478614731464220432">"Configuration point accès Wi‑Fi"</string>
     <string name="wifi_hotspot_configure_ap_text_summary" msgid="5560680057727007011">"Point d\'accès AndroidAP WPA2 PSK"</string>
-    <string name="wifi_tether_configure_subtext" msgid="2050196439900426456">"Point d\'accès <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">"Appels Wi-Fi"</string>
     <string name="wifi_calling_suggestion_title" msgid="9008010480466359578">"Activer les appels Wi-Fi"</string>
@@ -938,8 +947,8 @@
   </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="emergency_address_title" msgid="932729250447887545">"Adresse d\'urgence"</string>
+    <string name="emergency_address_summary" msgid="7751971156196115129">"Cette adresse sera définie comme votre position géographique lorsque vous effectuerez des appels d\'urgence par Wi-Fi"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"Affichage"</string>
     <string name="sound_settings" msgid="5534671337768745343">"Son"</string>
     <string name="all_volume_title" msgid="4296957391257836961">"Volume"</string>
@@ -993,9 +1002,13 @@
     <string name="search_settings" msgid="1910951467596035063">"Rechercher"</string>
     <string name="search_settings_summary" msgid="9205656546570654169">"Configurer les paramètres et l\'historique de recherche"</string>
     <string name="search_settings_no_results" msgid="8799027492641230999">"Aucun résultat"</string>
+    <string name="search_clear_history" msgid="4196658962573162457">"Effacer l\'historique"</string>
     <string name="display_settings" msgid="7965901687241669598">"Affichage"</string>
     <string name="accelerometer_title" msgid="7854608399547349157">"Rotation auto de l\'écran"</string>
-    <string name="color_mode_title" msgid="3159275920408338215">"Couleurs vives"</string>
+    <string name="color_mode_title" msgid="9186249332902370471">"Couleurs"</string>
+    <string name="color_mode_option_natural" msgid="5013837483986772758">"Naturelles"</string>
+    <string name="color_mode_option_boosted" msgid="8588223970257287524">"Intenses"</string>
+    <string name="color_mode_option_saturated" msgid="4569683960058798843">"Saturées"</string>
     <string name="accelerometer_summary_on" product="tablet" msgid="429982132339828942">"Changer automatiquement d\'orientation lors de la rotation de la tablette"</string>
     <string name="accelerometer_summary_on" product="default" msgid="1133737282813048021">"Changer automatiquement d\'orientation lors de la rotation"</string>
     <string name="accelerometer_summary_off" product="tablet" msgid="4781734213242521682">"Changer automatiquement d\'orientation lors de la rotation de la tablette"</string>
@@ -1045,13 +1058,13 @@
     <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">"Change le fond d\'écran"</string>
+    <string name="wallpaper_suggestion_title" msgid="8583988696513822528">"Changer 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">"En charge"</string>
+    <string name="screensaver_settings_summary_sleep" msgid="9086186698140423493">"Pendant la 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>
@@ -1065,7 +1078,7 @@
     <string name="ambient_display_screen_title" msgid="4252755516328775766">"Affichage en mode Veille"</string>
     <string name="ambient_display_screen_summary_always_on" msgid="7337555569694794132">"Toujours activé / Utilisation accrue de la pile"</string>
     <string name="ambient_display_screen_summary_notifications" msgid="1449570742600868654">"Nouvelles notifications"</string>
-    <string name="ambient_display_category_triggers" msgid="4359289754456268573">"Quand afficher"</string>
+    <string name="ambient_display_category_triggers" msgid="4359289754456268573">"Activation du mode Veille"</string>
     <string name="doze_title" msgid="2375510714460456687">"Nouvelles notifications"</string>
     <string name="doze_summary" msgid="3846219936142814032">"Activer l\'écran lorsque vous recevez des notifications"</string>
     <string name="doze_always_on_title" msgid="1046222370442629646">"Toujours activé"</string>
@@ -1114,15 +1127,16 @@
     <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="firmware_title" msgid="5203122368389157877">"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="model_summary" msgid="8306235877567782987">"Modèle : %1$s"</string>
     <string name="hardware_info" msgid="2605080746512527805">"Modèle et matériel"</string>
     <string name="hardware_revision" msgid="8893547686367095527">"Version du matériel"</string>
     <string name="fcc_equipment_id" msgid="149114368246356737">"Equipment ID"</string>
     <string name="baseband_version" msgid="1848990160763524801">"Version de bande de base"</string>
     <string name="kernel_version" msgid="9192574954196167602">"Version du noyau"</string>
     <string name="build_number" msgid="3075795840572241758">"Numéro de version"</string>
-    <string name="selinux_status" msgid="6212165375172061672">"État SELinux"</string>
     <string name="device_info_not_available" msgid="8062521887156825182">"Non disponible"</string>
     <string name="device_status_activity_title" msgid="1411201799384697904">"État"</string>
     <string name="device_status" msgid="607405385799807324">"État"</string>
@@ -1133,11 +1147,21 @@
     <string name="storage_settings_title" msgid="8746016738388094064">"Paramètres de stockage"</string>
     <string name="storage_settings_summary" product="nosdcard" msgid="3543813623294870759">"Désinstaller la mémoire de stockage USB, afficher l\'espace disponible"</string>
     <string name="storage_settings_summary" product="default" msgid="9176693537325988610">"Désinstaller la carte SD, afficher la mémoire disponible"</string>
+    <!-- no translation found for imei_multi_sim (6387012961838800539) -->
+    <skip />
     <string name="status_number" product="tablet" msgid="1138837891091222272">"MDN"</string>
-    <string name="status_number" product="default" msgid="5123197324870153205">"Mon numéro de téléphone"</string>
+    <string name="status_number" product="default" msgid="5948892105546651296">"Numéro de téléphone"</string>
+    <!-- no translation found for status_number_sim_slot (2755592991367858860) -->
+    <skip />
+    <!-- no translation found for status_number_sim_slot (1898212200138025729) -->
+    <skip />
+    <string name="status_number_sim_status" product="tablet" msgid="1367110147304523864">"NRM sur la carte SIM"</string>
+    <string name="status_number_sim_status" product="default" msgid="9123351360569466330">"N° de tél. sur la carte SIM"</string>
     <string name="status_min_number" msgid="3519504522179420597">"MIN"</string>
     <string name="status_msid_number" msgid="909010114445780530">"MSID"</string>
     <string name="status_prl_version" msgid="1007470446618081441">"Version de la liste d\'itinérance préférée"</string>
+    <!-- no translation found for meid_multi_sim (748999971744491771) -->
+    <skip />
     <string name="status_meid_number" msgid="1751442889111731088">"MEID"</string>
     <string name="status_icc_id" msgid="943368755577172747">"ICCID"</string>
     <string name="status_network_type" msgid="3279383550222116235">"Type de réseau mobile"</string>
@@ -1150,7 +1174,6 @@
     <string name="status_wifi_mac_address" msgid="2202206684020765378">"Adresse MAC Wi-Fi"</string>
     <string name="status_bt_address" msgid="4195174192087439720">"Adresse Bluetooth"</string>
     <string name="status_serial_number" msgid="2257111183374628137">"Numéro de série"</string>
-    <string name="status_unavailable" msgid="7862009036663793314">"Non accessible"</string>
     <string name="status_up_time" msgid="7294859476816760399">"Durée d\'activité"</string>
     <string name="status_awake_time" msgid="2393949909051183652">"Temps en activité"</string>
     <string name="internal_memory" msgid="9129595691484260784">"Mémoire de stockage interne"</string>
@@ -1248,7 +1271,7 @@
     <string name="storage_detail_other" msgid="8404938385075638238">"Autre"</string>
     <string name="storage_detail_system" msgid="4629506366064709687">"Système"</string>
     <string name="storage_detail_explore" msgid="7911344011431568294">"Explorer « <xliff:g id="NAME">^1</xliff:g> »"</string>
-    <string name="storage_detail_dialog_other" msgid="8907101974576694793">"Les autres fichiers comprennent les fichiers partagés enregistrés par les applications, les fichiers téléchargés d\'Internet ou par Bluetooth, les fichiers systèmes d\'Android et ainsi de suite.\n\nPour voir le contenu visible de cet appareil « <xliff:g id="NAME">^1</xliff:g> », touchez Explorer."</string>
+    <string name="storage_detail_dialog_other" msgid="8845766044697204852">"Les autres fichiers comprennent les fichiers partagés enregistrés par les applications, les fichiers téléchargés d\'Internet ou par Bluetooth, les fichiers systèmes d\'Android et ainsi de suite.\n\nPour voir le contenu visible de cet appareil <xliff:g id="NAME">^1</xliff:g>, touchez Explorer."</string>
     <string name="storage_detail_dialog_system" msgid="862835644848361569">"Le répertoire Système comprend des fichiers utilisés pour faire fonctionner Android version <xliff:g id="VERSION">%s</xliff:g>"</string>
     <string name="storage_detail_dialog_user" msgid="3267254783294197804">"L\'utilisateur « <xliff:g id="USER_0">^1</xliff:g> » a peut-être enregistré des photos, de la musique, des applications et d\'autres données qui occupent <xliff:g id="SIZE">^2</xliff:g> d\'espace. \n\nPour afficher des informations détaillées, utilisez le compte d\'utilisateur « <xliff:g id="USER_1">^1</xliff:g> »."</string>
     <string name="storage_wizard_init_title" msgid="5085400514028585772">"Configurer votre « <xliff:g id="NAME">^1</xliff:g> »"</string>
@@ -1282,7 +1305,7 @@
     <string name="storage_wizard_move_progress_cancel" msgid="542047237524588792">"Annuler le déplacement"</string>
     <string name="storage_wizard_slow_body" msgid="8010127667184768025">"Ce <xliff:g id="NAME_0">^1</xliff:g> ne semble pas rapide. \n\nVous pouvez continuer, mais les applications déplacées vers cet endroit risquent de se bloquer et les transferts de données pourront prendre du temps.\n\nVeuillez utiliser un <xliff:g id="NAME_1">^1</xliff:g> plus rapide pour obtenir de meilleures performances."</string>
     <string name="battery_status_title" msgid="9159414319574976203">"État de la batterie"</string>
-    <string name="battery_level_title" msgid="2965679202786873272">"Niveau de la batterie"</string>
+    <string name="battery_level_title" msgid="2965679202786873272">"Niveau de la pile"</string>
     <string name="apn_settings" msgid="3743170484827528406">"APN"</string>
     <string name="apn_edit" msgid="1354715499708424718">"Modifier le point d\'accès"</string>
     <string name="apn_not_set" msgid="4974192007399968164">"Non défini"</string>
@@ -1326,6 +1349,7 @@
     <string name="menu_restore" msgid="8260067415075573273">"Rétablir les valeurs par défaut"</string>
     <string name="restore_default_apn_completed" msgid="2824775307377604897">"La réinitialisation des paramètres APN par défaut est terminée."</string>
     <string name="reset_dashboard_title" msgid="6254873816990678620">"Options de réinitialisation"</string>
+    <string name="reset_dashboard_summary" msgid="4851012632493522755">"Impossible de réinitialiser le réseau, les applications ou l\'appareil"</string>
     <string name="reset_network_title" msgid="6166025966016873843">"Réinitialiser les paramètres Wi-Fi, cellulaires et Bluetooth"</string>
     <string name="reset_network_desc" msgid="5547979398298881406">"Cette opération entraîne la réinitialisation de tous les paramètres réseau, y compris :\n\n"<li>"Le Wi‑Fi"</li>\n<li>"Les données cellulaires"</li>\n<li>"Le Bluetooth"</li></string>
     <string name="reset_network_button_text" msgid="2035676527471089853">"Réinitialiser les paramètres"</string>
@@ -1334,17 +1358,14 @@
     <string name="reset_network_confirm_title" msgid="1759888886976962773">"Réinitialiser?"</string>
     <string name="network_reset_not_available" msgid="7188610385577164676">"La réinitialisation du réseau n\'est pas disponible pour cet utilisateur."</string>
     <string name="reset_network_complete_toast" msgid="787829973559541880">"Les paramètres réseau ont été réinitialisés"</string>
-    <string name="master_clear_title" msgid="6617679904229218425">"Effacer toutes les données (réinitialisation d\'usine)"</string>
-    <plurals name="master_clear_with_account_summary" formatted="false" msgid="5911377203778818712">
-      <item quantity="one"><xliff:g id="ACCOUNT_COUNT">%1$d</xliff:g> compte sera réinitialisé</item>
-      <item quantity="other"><xliff:g id="ACCOUNT_COUNT">%1$d</xliff:g> comptes seront réinitialisés</item>
-    </plurals>
-    <string name="master_clear_summary" msgid="6902443944660426951">"L\'espace de stockage interne et toutes les données seront réinitialisés"</string>
+    <string name="master_clear_title" msgid="3531267871084279512">"Effacer toutes les données (réinitialisation d\'usine)"</string>
     <string name="master_clear_desc" product="tablet" msgid="9146059417023157222">"Cette action effacera toutes les données de la "<b>"mémoire de stockage interne"</b>" de votre tablette, y compris :\n\n"<li>"Votre compte Google"</li>\n<li>"Les données et paramètres du système et de l\'application"</li>\n<li>"Les applications téléchargées"</li></string>
     <string name="master_clear_desc" product="default" msgid="4800386183314202571">"Cette action effacera toutes les données du "<b>"stockage interne"</b>" de votre téléphone, y compris :\n\n"<li>"Votre compte Google"</li>\n<li>"Les données et paramètres du système et de l\'application"</li>\n<li>"Les applications téléchargées"</li></string>
     <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"Vous êtes actuellement connecté aux comptes suivants :\n"</string>
     <string name="master_clear_other_users_present" product="default" msgid="5161423070702470742">\n\n"D\'autres personnes utilisent cet appareil.\n"</string>
     <string name="master_clear_desc_also_erases_external" msgid="1903185203791274237"><li>"Musique"</li>\n<li>"Photos"</li>\n<li>"Autres données utilisateur"</li></string>
+    <string name="master_clear_desc_also_erases_esim" msgid="312352697653096008"><li>"Fournisseurs de services sur la carte eSIM"</li></string>
+    <string name="master_clear_desc_no_cancel_mobile_plan" msgid="5460926449093211144">\n\n"Cela n\'annulera pas votre forfait de services cellulaires."</string>
     <string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="7744115866662613411">\n\n"Pour supprimer la musique, les photos et les autres données utilisateur, vous devez effacer la "<b>"mémoire de stockage USB"</b>"."</string>
     <string name="master_clear_desc_erase_external_storage" product="default" msgid="4801026652617377093">\n\n"Pour supprimer la musique, les photos et les autres données utilisateur, vous devez effacer la "<b>"carte SD"</b>"."</string>
     <string name="erase_external_storage" product="nosdcard" msgid="969364037450286809">"Effacer la mémoire de stockage USB"</string>
@@ -1367,7 +1388,7 @@
     <string name="call_settings_summary" msgid="7291195704801002886">"Configurer la messagerie vocale, le transfert d\'appel, la mise en attente d\'appels, le numéro de l\'appelant"</string>
     <string name="tether_settings_title_usb" msgid="6688416425801386511">"Partage de connexion par USB"</string>
     <string name="tether_settings_title_wifi" msgid="3277144155960302049">"Point d\'accès Wi-Fi mobile"</string>
-    <string name="tether_settings_title_bluetooth" msgid="355855408317564420">"Par Bluetooth"</string>
+    <string name="tether_settings_title_bluetooth" msgid="355855408317564420">"Partage connexion Bluetooth"</string>
     <string name="tether_settings_title_usb_bluetooth" msgid="5355828977109785001">"Partage de connexion"</string>
     <string name="tether_settings_title_all" msgid="3058586928118801157">"Partage de connexion"</string>
     <string name="tether_settings_summary_hotspot_on_tether_on" msgid="930464462687425777">"Point d\'accès activé, partage de connexion"</string>
@@ -1376,15 +1397,15 @@
     <string name="tether_settings_disabled_on_data_saver" msgid="1576908608463904152">"Impossible de partager la connexion ou d\'utiliser des points d\'accès mobiles lorsque la fonction Économiseur de données est activée"</string>
     <string name="usb_title" msgid="7483344855356312510">"USB"</string>
     <string name="usb_tethering_button_text" msgid="585829947108007917">"Partage de connexion par USB"</string>
-    <string name="usb_tethering_subtext" product="default" msgid="5991482890033484794">"Partager la connexion Internet du téléphone par connexion USB"</string>
-    <string name="usb_tethering_subtext" product="tablet" msgid="5988796139573211318">"Partager la connexion Internet de la tablette par connexion USB"</string>
+    <string name="usb_tethering_subtext" product="default" msgid="3711893746716442706">"Partager la connexion Internet du téléphone par connexion USB"</string>
+    <string name="usb_tethering_subtext" product="tablet" msgid="2292916486612255069">"Partager la connexion Internet de la tablette par connexion USB"</string>
     <string name="bluetooth_tether_checkbox_text" msgid="2379175828878753652">"Par Bluetooth"</string>
-    <string name="bluetooth_tethering_subtext" product="tablet" msgid="4558227863463153412">"Partager la connexion Internet de la tablette par Bluetooth"</string>
-    <string name="bluetooth_tethering_subtext" product="default" msgid="1055197887836203595">"Partager la connexion Internet du téléphone par Bluetooth"</string>
-    <string name="bluetooth_tethering_off_subtext_config" msgid="6326877798974938021">"Partager la connexion Internet de <xliff:g id="DEVICE_NAME">%1$d</xliff:g> par Bluetooth"</string>
+    <string name="bluetooth_tethering_subtext" product="tablet" msgid="8828883800511737077">"Partager la connexion Internet de la tablette par Bluetooth"</string>
+    <string name="bluetooth_tethering_subtext" product="default" msgid="1904667146601254812">"Partager la connexion Internet du téléphone par Bluetooth"</string>
+    <string name="bluetooth_tethering_off_subtext_config" msgid="376389105752995580">"Partager la connexion Internet de <xliff:g id="DEVICE_NAME">%1$d</xliff:g> par Bluetooth"</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="1308462275952345985">"Utilisez un point d\'accès et le partage de connexion pour fournir un accès Internet à d\'autres appareils par l\'intermédiaire de votre connexion cellulaire. Les applications peuvent aussi créer un point d\'accès pour partager du contenu avec d\'autres appareils à proximité."</string>
+    <string name="tethering_footer_info" msgid="7112228674056306147">"Utilisez un point d\'accès et le partage de connexion pour fournir un accès Internet à d\'autres appareils par l\'intermédiaire de votre connexion cellulaire. Les applications peuvent aussi créer un point d\'accès pour partager du contenu avec d\'autres appareils à proximité."</string>
     <string name="tethering_help_button_text" msgid="656117495547173630">"Aide"</string>
     <string name="network_settings_title" msgid="2876509814832830757">"Réseau cellulaire"</string>
     <string name="manage_mobile_plan_title" msgid="7630170375010107744">"Forfait de données cellulaires"</string>
@@ -1459,20 +1480,21 @@
     <string name="settings_license_activity_loading" msgid="3337535809093591740">"Chargement en cours..."</string>
     <string name="settings_safetylegal_title" msgid="1289483965535937431">"Informations de sécurité"</string>
     <string name="settings_safetylegal_activity_title" msgid="6901214628496951727">"Informations de sécurité"</string>
-    <string name="settings_safetylegal_activity_unreachable" msgid="250674109915859456">"Vous n\'avez pas de connexion Internet. Pour consulter ces informations maintenant, accédez à %s depuis un ordinateur connecté à Internet."</string>
+    <string name="settings_safetylegal_activity_unreachable" msgid="142307697309858185">"Vous n\'avez pas de connexion Internet. Pour consulter ces renseignements maintenant, accédez à %s sur un ordinateur connecté à Internet."</string>
     <string name="settings_safetylegal_activity_loading" msgid="8059022597639516348">"Chargement en cours..."</string>
-    <string name="lockpassword_choose_your_password_header" msgid="8624900666929394990">"Choisir votre mot de passe"</string>
-    <string name="lockpassword_choose_your_password_header_for_fingerprint" msgid="6624409510609085450">"Pour util. empr. digit., config. m. de passe"</string>
-    <string name="lockpassword_choose_your_pattern_header" msgid="6949761069941694050">"Choisir votre schéma"</string>
-    <string name="lockpassword_choose_your_pattern_header_for_fingerprint" msgid="5901096361617543819">"Pour util. empr. digit., config. schéma"</string>
-    <string name="lockpassword_choose_your_pin_header" msgid="7598849519816138302">"Choisir votre NIP"</string>
-    <string name="lockpassword_choose_your_pin_header_for_fingerprint" msgid="765344692615917183">"Pour util. empr. digit., config. NIP"</string>
-    <string name="lockpassword_confirm_your_password_header" msgid="6308478184889846633">"Confirmez le mot de passe."</string>
+    <string name="lockpassword_choose_your_screen_lock_header" msgid="3872462096767152394">"Configurer le verrouillage de l\'écran"</string>
+    <string name="lockpassword_choose_your_password_message" msgid="1197569283524841412">"Pour plus de sécurité, définissez un mot de passe"</string>
+    <string name="lockpassword_choose_your_password_header_for_fingerprint" msgid="2541818487015343503">"Pour util. empr. digit., défin. m. de p."</string>
+    <string name="lockpassword_choose_your_pattern_header_for_fingerprint" msgid="7709785406243556723">"Pour util. empr. digit., défin. un motif"</string>
+    <string name="lockpassword_choose_your_pin_message" msgid="1875420718677275646">"Pour plus de sécurité, définissez un NIP"</string>
+    <string name="lockpassword_choose_your_pin_header_for_fingerprint" msgid="1549639053195796674">"Pour util. empr. digit., config. un NIP"</string>
+    <string name="lockpassword_choose_your_pattern_message" msgid="5986983400689720015">"Pour plus de sécurité, définissez un schéma de verrouillage"</string>
+    <string name="lockpassword_confirm_your_password_header" msgid="1266027268220850931">"Entrez de nouveau votre 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="7744513791910572550">"Entrer de nouveau votre NIP"</string>
     <string name="lockpassword_confirm_passwords_dont_match" msgid="5140892109439191415">"Les mots de passe ne correspondent pas."</string>
     <string name="lockpassword_confirm_pins_dont_match" msgid="7226244811505606217">"Les NIP ne correspondent pas."</string>
-    <string name="lockpassword_choose_lock_generic_header" msgid="3811438094903786145">"Méthode de déverrouillage"</string>
+    <string name="lockpassword_choose_lock_generic_header" msgid="3811438094903786145">"Mode de déverrouillage"</string>
     <string name="lockpassword_password_set_toast" msgid="4875050283108629383">"Le mot de passe a été défini."</string>
     <string name="lockpassword_pin_set_toast" msgid="6011826444725291475">"Le NIP a été défini."</string>
     <string name="lockpassword_pattern_set_toast" msgid="6867259621331406236">"Le schéma a été défini."</string>
@@ -1488,6 +1510,12 @@
     <string name="lockpassword_strong_auth_required_work_pattern" msgid="3003781907040522053">"Pour plus de sécurité, tracez votre schéma professionnel"</string>
     <string name="lockpassword_strong_auth_required_work_pin" msgid="3367491332598821552">"Pour plus de sécurité, entrez votre NIP professionnel"</string>
     <string name="lockpassword_strong_auth_required_work_password" msgid="8159775129968582940">"Pour plus de sécurité, entrez votre mot de passe professionnel"</string>
+    <string name="lockpassword_confirm_your_pattern_details_frp" msgid="6757336656791723193">"La configuration d\'usine du téléphone a été rétablie. Pour l\'utiliser, entrez le schéma précédent."</string>
+    <string name="lockpassword_confirm_your_pin_details_frp" msgid="826520613445990470">"La configuration d\'usine du téléphone a été rétablie. Pour l\'utiliser, entrez le NIP précédent."</string>
+    <string name="lockpassword_confirm_your_password_details_frp" msgid="8944081074615739040">"La configuration d\'usine du téléphone a été rétablie. Pour l\'utiliser, entrez le mot passe précédent."</string>
+    <string name="lockpassword_confirm_your_pattern_header_frp" msgid="2898036091609128286">"Vérifier le schéma"</string>
+    <string name="lockpassword_confirm_your_pin_header_frp" msgid="4141601774778898803">"Vérifier le NIP"</string>
+    <string name="lockpassword_confirm_your_password_header_frp" msgid="3762615419295360480">"Vérifier le mot de passe"</string>
     <string name="lockpassword_invalid_pin" msgid="15588049067548470">"NIP erroné"</string>
     <string name="lockpassword_invalid_password" msgid="4038507398784975200">"Mot de passe incorrect"</string>
     <string name="lockpattern_need_to_unlock_wrong" msgid="1745247595356012176">"Schéma erroné"</string>
@@ -1511,7 +1539,7 @@
     <string name="lockpattern_settings_enable_visible_pattern_title" msgid="2615606088906120711">"Faire apparaître le schéma"</string>
     <string name="lockpattern_settings_enable_visible_pattern_title_profile" msgid="4864525074768391381">"Rendre visible le schéma du profil"</string>
     <string name="lockpattern_settings_enable_tactile_feedback_title" msgid="4389015658335522989">"Vibrer au toucher"</string>
-    <string name="lockpattern_settings_enable_power_button_instantly_locks" msgid="5735444062633666327">"Verr. auto MARCHE-ARRÊT"</string>
+    <string name="lockpattern_settings_enable_power_button_instantly_locks" msgid="5735444062633666327">"Verr. auto avec Marche/Arrêt"</string>
     <string name="lockpattern_settings_power_button_instantly_locks_summary" msgid="8196258755143711694">"Sauf lorsque l\'appareil est maintenu en activité par <xliff:g id="TRUST_AGENT_NAME">%1$s</xliff:g>"</string>
     <string name="lockpattern_settings_choose_lock_pattern" msgid="1652352830005653447">"Créer un schéma"</string>
     <string name="lockpattern_settings_change_lock_pattern" msgid="1123908306116495545">"Modifier le schéma"</string>
@@ -1536,8 +1564,7 @@
     <string name="install_applications" msgid="4872012136210802181">"Sources inconnues"</string>
     <string name="install_applications_title" msgid="4987712352256508946">"Autoriser toutes sources appli"</string>
     <string name="recent_app_category_title" msgid="6673071268966003928">"Applications récemment ouvertes"</string>
-    <string name="see_all_apps_title" msgid="1317153498074308438">"Afficher toutes les <xliff:g id="COUNT">%1$d</xliff:g> applications"</string>
-    <string name="recent_app_summary" msgid="3366446669844932300">"Il y a <xliff:g id="TIME">^1</xliff:g>"</string>
+    <string name="see_all_apps_title" msgid="1317153498074308438">"Afficher les <xliff:g id="COUNT">%1$d</xliff:g> applications"</string>
     <string name="install_all_warning" product="tablet" msgid="8310489909586138165">"Votre tablette et vos données personnelles sont plus vulnérables aux attaques provenant d\'applications inconnues. En installant des applications provenant de cette source, vous acceptez d\'être le seul responsable de tout dommage causé à votre tablette ou de toute perte de données pouvant découler de l\'utilisation de telles applications."</string>
     <string name="install_all_warning" product="default" msgid="1952257127370115988">"Votre téléphone et vos données personnelles sont plus vulnérables aux attaques provenant d\'applications inconnues. En installant des applications provenant de cette source, vous acceptez d\'être le seul responsable de tout dommage causé à votre téléphone ou de toute perte de données pouvant découler de l\'utilisation de telles applications."</string>
     <string name="advanced_settings" msgid="1777249286757067969">"Paramètres avancés"</string>
@@ -1547,7 +1574,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">"Permissions"</string>
+    <string name="permissions_label" msgid="2605296874922726203">"Autorisations"</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>
@@ -1585,7 +1612,7 @@
     <string name="show_background_processes" msgid="2009840211972293429">"Afficher processus en cache"</string>
     <string name="default_emergency_app" msgid="1951760659640369980">"Application d\'urgence"</string>
     <string name="reset_app_preferences" msgid="1321050641018356925">"Réinitialiser préférences applis"</string>
-    <string name="reset_app_preferences_title" msgid="6093179367325336662">"Réinitialiser préférences?"</string>
+    <string name="reset_app_preferences_title" msgid="6093179367325336662">"Réinitialiser préférences applis?"</string>
     <string name="reset_app_preferences_desc" msgid="4822447731869201512">"Cette opération a pour effet de réinitialiser toutes les préférences relatives aux éléments suivants :\n\n "<li>"Applications désactivées"</li>\n" "<li>"Notifications associées aux applications désactivées"</li>\n" "<li>"Applications par défaut pour les actions"</li>\n" "<li>"Restrictions de données en arrière-plan pour les applications"</li>\n" "<li>"Toutes les restrictions d\'autorisations"</li>\n\n"Vous ne perdrez aucune donnée liée aux applications."</string>
     <string name="reset_app_preferences_button" msgid="2559089511841281242">"Réinitialiser applis"</string>
     <string name="manage_space_text" msgid="8852711522447794676">"Gérer l\'espace"</string>
@@ -1659,7 +1686,6 @@
     <string name="app_install_details_title" msgid="6905279702654975207">"Détails de l\'application"</string>
     <string name="app_install_details_summary" msgid="6464796332049327547">"Source de l\'application : <xliff:g id="APP_STORE">%1$s</xliff:g>"</string>
     <string name="instant_app_details_summary" msgid="4529934403276907045">"Plus d\'information sur <xliff:g id="APP_STORE">%1$s</xliff:g>"</string>
-    <string name="app_ops_settings" msgid="5108481883575527511">"Fonctionnement des applications"</string>
     <string name="app_ops_running" msgid="7706949900637284122">"En cours d\'exécution"</string>
     <string name="app_ops_never_used" msgid="9114608022906887802">"(Jamais utilisé)"</string>
     <string name="no_default_apps" msgid="2915315663141025400">"Pas d\'applications par défaut."</string>
@@ -1711,6 +1737,7 @@
     <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_empty_list_user_restricted" msgid="5984015900102140696">"Vous n\'êtes pas autorisé à modifier la langue de l\'appareil."</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>
     <string name="keyboard_settings_category" msgid="8275523930352487827">"Clavier et modes de saisie"</string>
@@ -1728,7 +1755,7 @@
     <string name="spellchecker_security_warning" msgid="9060897418527708922">"Ce correcteur orthographique peut recueillir l\'ensemble du texte saisi, y compris des données personnelles comme des mots de passe et des numéros de carte de paiement. Il provient de l\'application <xliff:g id="SPELLCHECKER_APPLICATION_NAME">%1$s</xliff:g>. Utiliser ce correcteur orthographique?"</string>
     <string name="spellchecker_quick_settings" msgid="246728645150092058">"Paramètres"</string>
     <string name="spellchecker_language" msgid="6041050114690541437">"Langue"</string>
-    <string name="keyboard_and_input_methods_category" msgid="6035224122054465137">"Clavier et entrées"</string>
+    <string name="keyboard_and_input_methods_category" msgid="6035224122054465137">"Clavier et modes d\'entrée"</string>
     <string name="virtual_keyboard_category" msgid="1012830752318677119">"Clavier virtuel"</string>
     <string name="available_virtual_keyboard_category" msgid="7645766574969139819">"Claviers virtuels proposés"</string>
     <string name="add_virtual_keyboard" msgid="3302152381456516928">"Gérer les claviers"</string>
@@ -1801,7 +1828,7 @@
     <string name="accessibility_settings_summary" msgid="981260486011624939">"Lecteurs d\'écran, affichage, commandes interactives"</string>
     <string name="vision_settings_title" msgid="4204111425716868288">"Paramètres de visibilité"</string>
     <string name="vision_settings_description" msgid="5679491180156408260">"Vous pouvez personnaliser cet appareil en fonction de vos besoins. Il est possible de modifier ces fonctionnalités d\'accessibilité plus tard dans les paramètres."</string>
-    <string name="vision_settings_suggestion_title" msgid="917294957154878441">"Augmenter la taille de la police"</string>
+    <string name="vision_settings_suggestion_title" msgid="8058794060304707004">"Modifier la taille de la police"</string>
     <string name="screen_reader_category_title" msgid="7739154903913400641">"Lecteurs d\'écran"</string>
     <string name="audio_and_captions_category_title" msgid="3420727114421447524">"Audio et texte à l\'écran"</string>
     <string name="display_category_title" msgid="685461049938269166">"Affichage"</string>
@@ -1838,7 +1865,6 @@
     <string name="accessibility_display_inversion_preference_subtitle" msgid="7052959202195368109">"Pourrait nuire aux performances"</string>
     <string name="accessibility_autoclick_preference_title" msgid="7014499339068449623">"Cliquer lorsque curseur arrête"</string>
     <string name="accessibility_autoclick_delay_preference_title" msgid="3962261178385106006">"Délai précédant le clic"</string>
-    <string name="preference_summary_default_combination" msgid="8532964268242666060">"<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">"ACTIVÉ"</string>
     <string name="accessibility_summary_state_disabled" msgid="2241315620132005595">"DÉSACTIVÉ"</string>
     <string name="enable_quick_setting" msgid="2366999897816894536">"Afficher dans la fenêtre de configuration rapide"</string>
@@ -1936,7 +1962,7 @@
     <string name="print_service_disabled" msgid="7739452396114245222">"Service désactivé"</string>
     <string name="print_print_jobs" msgid="3582094777756968793">"Tâches d\'impression"</string>
     <string name="print_print_job" msgid="7563741676053287211">"Tâches d\'impression"</string>
-    <string name="print_restart" msgid="8373999687329384202">"Recommencer"</string>
+    <string name="print_restart" msgid="8373999687329384202">"Redémarrer"</string>
     <string name="print_cancel" msgid="3621199386568672235">"Annuler"</string>
     <string name="print_job_summary" msgid="8472427347192930694">"<xliff:g id="PRINTER">%1$s</xliff:g>\n<xliff:g id="TIME">%2$s</xliff:g>"</string>
     <string name="print_printing_state_title_template" msgid="5736107667714582025">"Impression de <xliff:g id="PRINT_JOB_NAME">%1$s</xliff:g> en cours…"</string>
@@ -1948,7 +1974,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 batterie indispo"</string>
+    <string name="power_usage_not_available" msgid="3109326074656512387">"Info d\'utilisation pile non dispo"</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>
@@ -1957,12 +1983,14 @@
     <string name="background_activity_summary_on" msgid="649282072540085599">"L\'application peut fonctionner en arrière-plan lorsqu\'elle n\'est pas utilisée"</string>
     <string name="background_activity_summary_off" msgid="7666330699090632040">"L\'activité en arrière-plan de l\'application est limitée quand elle n\'est pas utilisée"</string>
     <string name="background_activity_summary_disabled" msgid="3710669050484599847">"L\'application n\'est pas autorisée à fonctionner en arrière-plan"</string>
+    <string name="background_activity_summary_whitelisted" msgid="7375400051141016808">"L\'application ne peut pas être optimisée pour l\'utilisation de la pile"</string>
+    <string name="background_activity_warning_dialog_title" msgid="2216249969149568871">"Limiter l\'activité en arrière-plan?"</string>
+    <string name="background_activity_warning_dialog_text" msgid="7049624449246121981">"Si vous limitez l\'activité en arrière-plan d\'une application, cela peut provoquer un fonctionnement instable"</string>
     <string name="device_screen_usage" msgid="3386088035570409683">"Utilisation de l\'écran depuis la charge complète"</string>
     <string name="device_screen_consumption" msgid="4607589286438986687">"Consommation d\'énergie de l\'écran"</string>
     <string name="device_cellular_network" msgid="4724773411762382950">"Recherche de réseaux cellulaires"</string>
-    <string name="power_last_full_charge_summary" msgid="532845389094620657">"Il y a <xliff:g id="TIME">^1</xliff:g>"</string>
-    <string name="power_usage_list_summary" msgid="6775339745194635000">"Utilisation des applis depuis la charge complète (il y a <xliff:g id="TIME">^1</xliff:g>)"</string>
-    <string name="power_usage_list_summary_device" msgid="7036566616386864302">"Utilisation des applications depuis la charge complète (il y a <xliff:g id="TIME">^1</xliff:g>)"</string>
+    <string name="power_usage_list_summary" msgid="6393929085382334341">"Utilisation des applications depuis la charge complète (<xliff:g id="RELATIVE_TIME">^1</xliff:g>)"</string>
+    <string name="power_usage_list_summary_device" msgid="4461926045610455423">"Utilisation de l\'appareil depuis la charge complète (<xliff:g id="RELATIVE_TIME">^1</xliff:g>)"</string>
     <string name="screen_usage_summary" msgid="6687403051423153550">"Durée que l\'écran a été actif depuis la dernière charge complète"</string>
     <string name="device_usage_list_summary" msgid="5623036661468763251">"Utilisation de l\'appareil depuis la charge complète"</string>
     <string name="battery_since_unplugged" msgid="338073389740738437">"Utilisation de la batterie depuis le débranchement"</string>
@@ -2126,14 +2154,6 @@
     <string name="services_subtitle" msgid="4296402367067266425">"Services"</string>
     <string name="menu_proc_stats_duration" msgid="2323483592994720196">"Durée"</string>
     <string name="mem_details_title" msgid="6548392825497290498">"Détails de la mémoire"</string>
-    <string name="mem_state_subtitle" msgid="2407238869781011933">"États de la mémoire"</string>
-    <string name="mem_use_subtitle" msgid="7319468770222422412">"Utilisation de la mémoire"</string>
-    <string name="mem_use_kernel_type" msgid="8698327165935012484">"Noyau"</string>
-    <string name="mem_use_native_type" msgid="5976704902328347400">"Natif"</string>
-    <string name="mem_use_kernel_cache_type" msgid="6411475064463957513">"Caches du noyau"</string>
-    <string name="mem_use_zram_type" msgid="9087217476795358232">"Échange de zRAM"</string>
-    <string name="mem_use_free_type" msgid="717708548454880840">"Disponible"</string>
-    <string name="mem_use_total" msgid="6308786055749777934">"Total"</string>
     <string name="menu_duration_3h" msgid="4714866438374738385">"3 heures"</string>
     <string name="menu_duration_6h" msgid="1940846763432184132">"6 heures"</string>
     <string name="menu_duration_12h" msgid="7890465404584356294">"12 heures"</string>
@@ -2208,14 +2228,14 @@
     <string name="credentials_unlock_hint" msgid="2301301378040499348">"Saisir le mot de passe de stockage des identifiants"</string>
     <string name="credentials_old_password" msgid="7553393815538684028">"Mot de passe actuel :"</string>
     <string name="credentials_reset_hint" msgid="6297256880896133631">"Supprimer l\'intégralité du contenu?"</string>
-    <string name="credentials_password_too_short" msgid="7502749986405522663">"Le mot de passe doit comporter au moins 8 caractères."</string>
     <string name="credentials_wrong_password" msgid="2541932597104054807">"Mot de passe incorrect"</string>
     <string name="credentials_reset_warning" msgid="5320653011511797600">"Mot de passe incorrect. Vous disposez d\'une tentative supplémentaire avant la suppression des identifiants."</string>
     <string name="credentials_reset_warning_plural" msgid="6514085665301095279">"Mot de passe incorrect. Vous disposez de <xliff:g id="NUMBER">%1$d</xliff:g> tentatives supplémentaires avant la suppression des identifiants."</string>
     <string name="credentials_erased" msgid="2907836028586342969">"Les identifiants sont effacés."</string>
     <string name="credentials_not_erased" msgid="7685932772284216097">"Impossible eff. stockage identifiants."</string>
     <string name="credentials_enabled" msgid="7588607413349978930">"Stockage des identifiants activé."</string>
-    <string name="credentials_configure_lock_screen_hint" msgid="6757119179588664966">"Avant d\'utiliser le stockage d\'identifiants, vous devez définir un NIP ou un mot de passe pour le verrouillage d\'écran."</string>
+    <string name="credentials_configure_lock_screen_hint" msgid="8058230497337529036">"Avant de pouvoir utiliser le stockage des authentifiants, votre appareil doit avoir un verrouillage d\'écran sécuritaire"</string>
+    <string name="credentials_configure_lock_screen_button" msgid="253239765216055321">"DÉFINIR VERR D\'ÉCRAN"</string>
     <string name="usage_access_title" msgid="332333405495457839">"Applis avec accès données"</string>
     <string name="emergency_tone_title" msgid="1055954530111587114">"Sonnerie d\'urgence"</string>
     <string name="emergency_tone_summary" msgid="722259232924572153">"Définir le comportement en cas d\'appel d\'urgence"</string>
@@ -2267,7 +2287,7 @@
     <string name="wifi_setup_add_network" msgid="5939624680150051807">"Ajouter un réseau"</string>
     <string name="wifi_setup_refresh_list" msgid="3411615711486911064">"Actualiser la liste"</string>
     <string name="wifi_setup_skip" msgid="6661541841684895522">"Passer"</string>
-    <string name="wifi_setup_next" msgid="3388694784447820477">"SUIVANTE"</string>
+    <string name="wifi_setup_next" msgid="3388694784447820477">"SUIVANT"</string>
     <string name="wifi_setup_back" msgid="144777383739164044">"Précédent"</string>
     <string name="wifi_setup_detail" msgid="2336990478140503605">"Informations sur le réseau"</string>
     <string name="wifi_setup_connect" msgid="7954456989590237049">"Connexion"</string>
@@ -2335,8 +2355,6 @@
     <skip />
     <string name="cant_sync_dialog_title" msgid="2777238588398046285">"Impossible de procéder à la synchronisation manuelle."</string>
     <string name="cant_sync_dialog_message" msgid="1938380442159016449">"La synchronisation de cet élément est actuellement désactivée. Pour modifier ce paramètre, activez temporairement les données en arrière-plan et la synchronisation automatique."</string>
-    <string name="wimax_settings" msgid="2655139497028469039">"4G"</string>
-    <string name="status_wimax_mac_address" msgid="8390791848661413416">"Adresse MAC 4G"</string>
     <string name="enter_password" msgid="8035706727471334122">"Pour lancer Android, entrez votre mot de passe"</string>
     <string name="enter_pin" msgid="5305333588093263790">"Pour lancer Android, entrez votre NIP"</string>
     <string name="enter_pattern" msgid="4187435713036808566">"Pour lancer Android, dessinez votre schéma."</string>
@@ -2350,10 +2368,11 @@
     <string name="misc_files_selected_count" msgid="4647048020823912088">"<xliff:g id="NUMBER">%1$d</xliff:g> fichiers sélectionnés sur <xliff:g id="TOTAL">%2$d</xliff:g>"</string>
     <string name="misc_files_selected_count_bytes" msgid="2876232009069114352">"<xliff:g id="NUMBER">%1$s</xliff:g> sur <xliff:g id="TOTAL">%2$s</xliff:g>"</string>
     <string name="select_all" msgid="1562774643280376715">"Tout sélectionner"</string>
+    <string name="data_plan_usage_manage_plans_button_text" msgid="8997761990902708162">"Gérer les forfaits"</string>
     <string name="data_usage_summary_title" msgid="3804110657238092929">"Utilisation des données"</string>
     <string name="data_usage_app_summary_title" msgid="4147258989837459172">"Util. données aplication"</string>
     <string name="data_usage_accounting" msgid="7170028915873577387">"La manière dont le fournisseur de services effectue les calcul des données peut être différente."</string>
-    <string name="data_usage_app" msgid="4970478397515423303">"Utilisation de l\'application"</string>
+    <string name="data_usage_app" msgid="4970478397515423303">"Utilisation de l\'appli"</string>
     <string name="data_usage_app_info_label" msgid="3409931235687866706">"DÉTAILS DE L\'APPLICATION"</string>
     <string name="data_usage_cellular_data" msgid="9168928285122125137">"Données cellulaires"</string>
     <string name="data_usage_data_limit" msgid="1193930999713192703">"Définir limite consommation de données"</string>
@@ -2435,6 +2454,9 @@
     <string name="data_usage_metered_mobile" msgid="5423305619126978393">"Réseaux mobiles"</string>
     <string name="data_usage_metered_wifi" msgid="1761738002328299714">"Réseaux Wi-Fi mesurés"</string>
     <string name="data_usage_metered_wifi_disabled" msgid="727808462375941567">"Pour sélectionner les réseaux mesurés, activez le Wi‑Fi."</string>
+    <string name="data_usage_metered_auto" msgid="1262028400911918865">"Automatique"</string>
+    <string name="data_usage_metered_yes" msgid="9217539611385225894">"Mesuré"</string>
+    <string name="data_usage_metered_no" msgid="4025232961929071789">"Non mesuré"</string>
     <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>
@@ -2477,8 +2499,8 @@
     <string name="vpn_forget_long" msgid="2232239391189465752">"Oublier le profil RPV"</string>
     <string name="vpn_replace_vpn_title" msgid="2963898301277610248">"Remplacer le RPV existant?"</string>
     <string name="vpn_set_vpn_title" msgid="4009987321156037267">"Définir le RPV permanent?"</string>
-    <string name="vpn_first_always_on_vpn_message" msgid="3025322109743675467">"Si vous activez ce paramètre, vous ne disposerez d\'aucune connexion Internet jusqu\'à ce que le RPV parvienne à se connecter"</string>
-    <string name="vpn_replace_always_on_vpn_enable_message" msgid="2577928591361606641">"Votre RPV existant sera remplacé, et vous ne disposerez d\'aucune connexion Internet jusqu\'à ce que le RPV parvienne à se connecter"</string>
+    <string name="vpn_first_always_on_vpn_message" msgid="7144543717673197102">"Si vous activez ce paramètre, vous ne disposerez d\'aucune connexion Internet jusqu\'à ce que le RPV parvienne à se connecter"</string>
+    <string name="vpn_replace_always_on_vpn_enable_message" msgid="798121133114824006">"Votre RPV existant sera remplacé, et vous ne disposerez d\'aucune connexion Internet jusqu\'à ce que le RPV parvienne à se connecter"</string>
     <string name="vpn_replace_always_on_vpn_disable_message" msgid="3011818750025879902">"Vous êtes déjà connecté à un RPV permanent. Si vous vous connectez à un autre RPV, le RPV actuel sera remplacé et le mode permanent sera désactivé."</string>
     <string name="vpn_replace_vpn_message" msgid="5611635724578812860">"Vous êtes déjà connecté à un RPV. Si vous vous connectez à un RPV différent, votre RPV actuel sera remplacé."</string>
     <string name="vpn_turn_on" msgid="2363136869284273872">"Activer"</string>
@@ -2526,9 +2548,6 @@
     <string name="backup_pw_set_button_text" msgid="2387480910044648795">"Définir le mot de passe de sauvegarde"</string>
     <string name="backup_pw_cancel_button_text" msgid="8845630125391744615">"Annuler"</string>
     <string name="additional_system_update_settings_list_item_title" msgid="214987609894661992">"Mises à jour supplémentaires du système"</string>
-    <string name="selinux_status_disabled" msgid="924551035552323327">"Désactivé"</string>
-    <string name="selinux_status_permissive" msgid="6004965534713398778">"Permissif"</string>
-    <string name="selinux_status_enforcing" msgid="2252703756208463329">"Application"</string>
     <string name="ssl_ca_cert_warning" msgid="2045866713601984673">"Le réseau peut être surveillé"</string>
     <string name="done_button" msgid="1991471253042622230">"Terminé"</string>
     <plurals name="ssl_ca_cert_dialog_title" formatted="false" msgid="7145092748045794650">
@@ -2571,7 +2590,7 @@
     <string name="user_add_user_message_long" msgid="8562152293752222985">"Vous pouvez partager cet appareil avec d\'autres personnes en ajoutant des utilisateurs. Chaque utilisateur dispose de son propre espace, où il peut personnaliser, entre autres, ses applications et son fond d\'écran. Chacun peut également modifier les paramètres de l\'appareil, comme les réseaux Wi-Fi, qui touchent tous les utilisateurs.\n\nLorsque vous ajoutez un utilisateur, celui-ci doit configurer son espace.\n\nTout utilisateur peut mettre à jour les applications pour tous les autres utilisateurs."</string>
     <string name="user_add_user_message_short" msgid="1511354412249044381">"Lorsque vous ajoutez un utilisateur, celui-ci doit configurer son espace.\n\nTout utilisateur peut mettre à jour les applications pour tous les autres utilisateurs."</string>
     <string name="user_setup_dialog_title" msgid="1765794166801864563">"Configurer l\'utilisateur?"</string>
-    <string name="user_setup_dialog_message" msgid="1004068621380867148">"Assurez-vous que la personne est disponible, et qu\'elle peut utiliser l\'appareil pour configurer son espace."</string>
+    <string name="user_setup_dialog_message" msgid="1004068621380867148">"Assurez-vous que la personne est disponible et qu\'elle peut utiliser l\'appareil pour configurer son espace."</string>
     <string name="user_setup_profile_dialog_message" msgid="3896568553327558731">"Configurer le profil maintenant?"</string>
     <string name="user_setup_button_setup_now" msgid="3391388430158437629">"Configurer maintenant"</string>
     <string name="user_setup_button_setup_later" msgid="3068729597269172401">"Pas maintenant"</string>
@@ -2677,7 +2696,7 @@
     <string name="restriction_location_enable_title" msgid="5020268888245775164">"Position"</string>
     <string name="restriction_location_enable_summary" msgid="3489765572281788755">"Autoriser les applications à utiliser vos données de localisation"</string>
     <string name="wizard_back" msgid="5567007959434765743">"Précédent"</string>
-    <string name="wizard_next" msgid="3606212602795100640">"SUIVANTE"</string>
+    <string name="wizard_next" msgid="3606212602795100640">"SUIVANT"</string>
     <string name="wizard_finish" msgid="3286109692700083252">"Terminer"</string>
     <string name="user_image_take_photo" msgid="1280274310152803669">"Prendre une photo"</string>
     <string name="user_image_choose_photo" msgid="7940990613897477057">"Sélectionner une photo dans la galerie"</string>
@@ -2708,6 +2727,8 @@
     <string name="color_purple" msgid="3888532466427762504">"Mauve"</string>
     <string name="sim_no_inserted_msg" msgid="210316755353227087">"Aucune carte SIM insérée"</string>
     <string name="sim_status_title" msgid="6744870675182447160">"État de la carte SIM"</string>
+    <!-- no translation found for sim_status_title_sim_slot (5725659316463979194) -->
+    <skip />
     <string name="sim_call_back_title" msgid="5181549885999280334">"Rappeler avec la carte SIM par défaut"</string>
     <string name="sim_outgoing_call_title" msgid="1019763076116874255">"Carte SIM pour les appels sortants"</string>
     <string name="sim_other_call_settings" msgid="8247802316114482477">"Autres paramètres d\'appel"</string>
@@ -2721,12 +2742,15 @@
     <string name="sim_pref_divider" msgid="6778907671867621874">"Carte SIM préférée pour"</string>
     <string name="sim_calls_ask_first_prefs_title" msgid="7941299533514115976">"Toujours demander"</string>
     <string name="sim_selection_required_pref" msgid="3446721423206414652">"Veuillez indiquer votre préférence"</string>
+    <!-- no translation found for sim_selection_channel_title (2760909074892782589) -->
+    <skip />
     <string name="dashboard_title" msgid="5453710313046681820">"Paramètres"</string>
     <plurals name="settings_suggestion_header_summary_hidden_items" formatted="false" msgid="5597356221942118048">
       <item quantity="one">Afficher %d élément masqué</item>
       <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="dashboard_suggestion_condition_footer_content_description" msgid="2898588191174845961">"Réduire"</string>
+    <string name="network_dashboard_title" msgid="3135144174846753758">"Réseau et Internet"</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>
@@ -2786,6 +2810,14 @@
     <string name="keywords_payment_settings" msgid="5220104934130446416">"payer, toucher, paiements"</string>
     <string name="keywords_backup" msgid="470070289135403022">"sauvegarde, sauvegarder"</string>
     <string name="keywords_assist_gesture_launch" msgid="813968759791342591">"geste"</string>
+    <!-- no translation found for keywords_imei_info (7230982940217544527) -->
+    <skip />
+    <!-- no translation found for keywords_sim_status (1474422416860990564) -->
+    <skip />
+    <!-- no translation found for keywords_model_and_hardware (1459248377212829642) -->
+    <skip />
+    <!-- no translation found for keywords_android_version (5591055570309015111) -->
+    <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>
@@ -2823,21 +2855,43 @@
     <string name="emergency_tone_alert" msgid="8941852695428130667">"Alerte"</string>
     <string name="emergency_tone_vibrate" msgid="8281126443204950847">"Vibreur"</string>
     <string name="boot_sounds_title" msgid="567029107382343709">"Activation par les sons"</string>
-    <string name="zen_mode_settings_summary_off" msgid="1857165567766351925">"Aucune règle automatique activée"</string>
-    <plurals name="zen_mode_settings_summary_on" formatted="false" msgid="1216562765753405784">
-      <item quantity="one"><xliff:g id="ON_COUNT">%d</xliff:g> règle automatique activée</item>
-      <item quantity="other"><xliff:g id="ON_COUNT">%d</xliff:g> règles automatiques activées</item>
+    <string name="zen_mode_settings_summary_off" msgid="6119891445378113334">"Jamais"</string>
+    <plurals name="zen_mode_settings_summary_on" formatted="false" msgid="7346979080337117366">
+      <item quantity="one"><xliff:g id="ON_COUNT">%d</xliff:g> règle</item>
+      <item quantity="other"><xliff:g id="ON_COUNT">%d</xliff:g> règles</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">"Priorités seulement"</string>
-    <string name="zen_mode_automation_settings_title" msgid="4228995740594063774">"Règles automatiques"</string>
+    <string name="zen_mode_settings_title" msgid="1066226840983908121">"Ne pas déranger"</string>
+    <string name="zen_mode_behavior_settings_title" msgid="1463303933529313969">"Comportement"</string>
+    <string name="zen_mode_behavior_allow_title" msgid="3845615648136218141">"Autoriser sons et vibrations de"</string>
+    <string name="zen_mode_behavior_no_sound" msgid="1219626004723208056">"Aucun son"</string>
+    <string name="zen_mode_behavior_total_silence" msgid="6716603819806610626">"Aucun son (silence total)"</string>
+    <string name="zen_mode_behavior_no_sound_except" msgid="4968477585788243114">"Aucun son sauf <xliff:g id="CATEGORIES">%1$s</xliff:g>"</string>
+    <string name="zen_mode_behavior_alarms_only" msgid="2423480992071472963">"Aucun son, sauf pour les alarmes, les médias et les rétroactions système (alarmes seulement)"</string>
+    <string name="zen_mode_automation_settings_title" msgid="2517800938791944915">"Activer automatiquement"</string>
+    <string name="zen_mode_automation_settings_page_title" msgid="7069221762714457987">"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">"Priorités seulement"</string>
-    <string name="zen_mode_option_alarms" msgid="5785372117288803600">"Alarmes uniquement"</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_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>
+    <string name="zen_mode_visual_signals_settings_subtitle" msgid="6308824824208120508">"Autoriser les signaux visuels"</string>
+    <string name="zen_mode_add" msgid="90014394953272517">"Ajouter"</string>
+    <!-- no translation found for zen_mode_button_turn_on (5074744714613374902) -->
+    <skip />
+    <!-- no translation found for zen_mode_button_turn_off (1995551537320422792) -->
+    <skip />
+    <!-- no translation found for zen_mode_settings_dnd_manual_end_time_next_day (3090599225533484203) -->
+    <skip />
+    <!-- no translation found for zen_mode_settings_dnd_manual_indefinite (2746903915016850399) -->
+    <skip />
+    <!-- no translation found for zen_mode_settings_dnd_automatic_rule (3856133183910726786) -->
+    <skip />
+    <!-- no translation found for zen_mode_settings_dnd_automatic_rule_app (7112871101701453067) -->
+    <skip />
+    <!-- no translation found for zen_mode_settings_dnd_automatic_rule_multiple (5792308957602984360) -->
+    <skip />
     <string name="sound_work_settings" msgid="6774324553228566442">"Sons du profil professionnel"</string>
     <string name="work_use_personal_sounds_title" msgid="1148331221338458874">"Utiliser sons du profil perso"</string>
     <string name="work_use_personal_sounds_summary" msgid="6207040454949823153">"Les sons du profil professionnel sont les mêmes que ceux du profil personnel"</string>
@@ -2869,15 +2923,17 @@
     <string name="lock_screen_notifications_interstitial_message_profile" msgid="8307705621027472346">"Lorsque votre appareil est verrouillé, comment voulez-vous que les notifications de profil s\'affichent?"</string>
     <string name="lock_screen_notifications_interstitial_title_profile" msgid="3169806586032521333">"Notifications de profil"</string>
     <string name="notifications_title" msgid="8086372779371204971">"Notifications"</string>
-    <string name="app_notifications_title" msgid="5810577805218003760">"Notifications de l\'application"</string>
+    <string name="app_notifications_title" msgid="5810577805218003760">"Notifications de l\'appli"</string>
     <string name="notification_channel_title" msgid="2260666541030178452">"Catégorie de notifications"</string>
+    <string name="notification_group_title" msgid="7180506440133859601">"Groupe de notifications"</string>
     <string name="notification_importance_title" msgid="848692592679312666">"Importance"</string>
-    <string name="notification_importance_unspecified" msgid="2196023702875112081">"Laisser l\'application décider"</string>
+    <string name="notification_importance_unspecified" msgid="6622173510486113958">"Autoriser le son"</string>
     <string name="notification_importance_blocked" msgid="7938180808339386300">"Ne jamais afficher les notifications"</string>
     <string name="notification_importance_min" msgid="5455049524984686275">"Aucun son ni interruption visuelle"</string>
     <string name="notification_importance_low" msgid="8881468429453766553">"Aucun son"</string>
     <string name="notification_importance_default" msgid="5958338024601957516">"Émettre un son"</string>
     <string name="notification_importance_high" msgid="2082429479238228527">"Émettre un son et s\'afficher à l\'écran"</string>
+    <string name="notification_importance_high_silent" msgid="2667033773703765252">"Afficher sur l\'écran"</string>
     <string name="notification_importance_min_title" msgid="6974673091137544803">"Faible"</string>
     <string name="notification_importance_low_title" msgid="8131254047772814309">"Moyenne"</string>
     <string name="notification_importance_default_title" msgid="9120383978536089489">"Élevée"</string>
@@ -2920,8 +2976,13 @@
     <string name="loading_notification_apps" msgid="5031818677010335895">"Chargement des applications en cours..."</string>
     <string name="app_notifications_off_desc" msgid="4882445501376722969">"Android empêche les notifications de cette application de s\'afficher sur cet appareil"</string>
     <string name="channel_notifications_off_desc" msgid="5899225298718840635">"Android empêche cette catégorie de notifications de s\'afficher sur cet appareil"</string>
+    <string name="channel_group_notifications_off_desc" msgid="1620950416247316370">"Android empêche ce groupe de notifications de s\'afficher sur cet appareil"</string>
     <string name="notification_channels" msgid="5346841743182627500">"Catégories"</string>
     <string name="notification_channels_other" msgid="5645317113885788226">"Autre"</string>
+    <plurals name="notification_group_summary" formatted="false" msgid="3420621520561455358">
+      <item quantity="one"><xliff:g id="COUNT_1">%d</xliff:g> catégorie</item>
+      <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> catégories</item>
+    </plurals>
     <string name="no_channels" msgid="3077375508177744586">"Cette application n\'a publié aucune notification"</string>
     <string name="app_settings_link" msgid="8894946007543660906">"Paramètres supplémentaires dans l\'application"</string>
     <string name="app_notification_listing_summary_zero" msgid="6482582965081108108">"Activé pour toutes les applications"</string>
@@ -2942,7 +3003,7 @@
     <string name="notification_badge_title" msgid="6370122441168519809">"Autoriser la pastille 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_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>
@@ -2957,7 +3018,9 @@
     <string name="zen_mode_rule_name" msgid="5149068059383837549">"Nom de la règle"</string>
     <string name="zen_mode_rule_name_hint" msgid="3781174510556433384">"Entrez le nom de la règle"</string>
     <string name="zen_mode_rule_name_warning" msgid="4517805381294494314">"Ce nom de règle est déjà utilisé"</string>
-    <string name="zen_mode_add_rule" msgid="7459154136384467057">"Ajouter"</string>
+    <string name="zen_mode_add_rule" msgid="9100929184624317193">"Ajouter une règle"</string>
+    <string name="zen_mode_add_event_rule" msgid="3997335103633946552">"Ajouter une règle d\'événement"</string>
+    <string name="zen_mode_add_time_rule" msgid="5002080000597838703">"Ajouter une règle de temps"</string>
     <string name="zen_mode_delete_rule" msgid="2985902330199039533">"Supprimer la règle"</string>
     <string name="zen_mode_choose_rule_type" msgid="5423746638871953459">"Sélectionner le type de règle"</string>
     <string name="zen_mode_delete_rule_confirmation" msgid="6237882294348570283">"Supprimer la règle « <xliff:g id="RULE">%1$s</xliff:g> »?"</string>
@@ -2965,16 +3028,16 @@
     <string name="zen_mode_rule_type" msgid="2289413469580142888">"Type de règle"</string>
     <string name="zen_mode_rule_type_unknown" msgid="3049377282766700600">"Inconnue"</string>
     <string name="zen_mode_configure_rule" msgid="8865785428056490305">"Configurer la règle"</string>
-    <string name="zen_schedule_rule_type_name" msgid="142936744435271449">"Règle basée sur l\'heure"</string>
+    <string name="zen_schedule_rule_type_name" msgid="6163149826036287324">"Heure"</string>
     <string name="zen_schedule_rule_enabled_toast" msgid="3379499360390382259">"Règle automatique pour activer le mode « Ne pas déranger » à certaines heures"</string>
-    <string name="zen_event_rule_type_name" msgid="2645981990973086797">"Règle d\'événement"</string>
+    <string name="zen_event_rule_type_name" msgid="6503468472212606158">"Événement"</string>
     <string name="zen_event_rule_enabled_toast" msgid="6910577623330811480">"Règle automatique pour activer le mode « Ne pas déranger » pendant les événements indiqués"</string>
     <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">"Où se trouve la réponse : <xliff:g id="REPLY">%1$s</xliff:g>"</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_calendar_any" msgid="6485568415998569885">"Tout agenda"</string>
-    <string name="zen_mode_event_rule_reply" msgid="5166322024212403739">"Où se trouve la réponse"</string>
+    <string name="zen_mode_event_rule_reply" msgid="5166322024212403739">"Si la réponse est"</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>
@@ -2998,12 +3061,13 @@
     <string name="zen_mode_from_starred" msgid="2678345811950997027">"Des contacts favoris seulement"</string>
     <string name="zen_mode_from_none" msgid="8219706639954614136">"Aucun"</string>
     <string name="zen_mode_alarms" msgid="2165302777886552926">"Alarmes"</string>
+    <string name="zen_mode_media_system_other" msgid="8900209390529859777">"Médias et rétroactions système"</string>
     <string name="zen_mode_reminders" msgid="5458502056440485730">"Rappels"</string>
     <string name="zen_mode_events" msgid="7914446030988618264">"Événements"</string>
     <string name="zen_mode_all_callers" msgid="584186167367236922">"Tous les appelants"</string>
     <string name="zen_mode_selected_callers" msgid="3127598874060615742">"Appelants sélectionnés"</string>
     <string name="zen_mode_repeat_callers" msgid="5019521886428322131">"Appelants fréquents"</string>
-    <string name="zen_mode_repeat_callers_summary" msgid="7192713032364140137">"Si la même personne appelle deux fois en <xliff:g id="MINUTES">%d</xliff:g> minute(s), autoriser le deuxième appel"</string>
+    <string name="zen_mode_repeat_callers_summary" msgid="239685342222975733">"Si la même personne appelle deux fois en <xliff:g id="MINUTES">%d</xliff:g> minute(s), autoriser le deuxième appel"</string>
     <string name="zen_mode_when" msgid="2767193283311106373">"Activation auto"</string>
     <string name="zen_mode_when_never" msgid="8809494351918405602">"Jamais"</string>
     <string name="zen_mode_when_every_night" msgid="3122486110091921009">"Tous les soirs"</string>
@@ -3022,16 +3086,13 @@
     </plurals>
     <string name="zen_mode_summary_alarms_only_by_time" msgid="7465525754879341907">"Ne recevoir que les alarmes jusqu\'à <xliff:g id="FORMATTEDTIME">%1$s</xliff:g>"</string>
     <string name="zen_mode_summary_always" msgid="6172985102689237703">"Activer le mode Toujours interrompre"</string>
-    <string name="zen_mode_screen_on" msgid="7712038508173845101">"Bloquer lorsque l\'écran est allumé"</string>
-    <string name="zen_mode_screen_on_summary" msgid="6444425984146305149">"Empêcher les notifications désactivées par le mode Ne pas déranger de s\'afficher à l\'écran"</string>
-    <string name="zen_mode_screen_off" msgid="5026854939192419879">"Bloquer lorsque l\'écran est éteint"</string>
-    <string name="zen_mode_screen_off_summary" msgid="6490932947651798094">"Empêcher les notifications désactivées par le mode Ne pas déranger d\'activer l\'écran ou de faire clignoter le voyant de notification"</string>
-    <string name="zen_mode_screen_off_summary_no_led" msgid="3758698381956461866">"Empêcher les notifications désactivées par le mode Ne pas déranger d\'activer l\'écran"</string>
-    <string name="zen_mode_all_visual_interruptions" msgid="2851308980832487411">"Désactivé"</string>
-    <string name="zen_mode_screen_on_visual_interruptions" msgid="7373348148129140528">"Lorsque l\'écran est allumé"</string>
-    <string name="zen_mode_screen_off_visual_interruptions" msgid="4850792880144382633">"Lorsque l\'écran est éteint"</string>
-    <string name="zen_mode_no_visual_interruptions" msgid="8742776003822778472">"Quand l\'écran est allumé ou éteint"</string>
+    <string name="zen_mode_screen_on" msgid="8774571998575673502">"Lorsque l\'écran est activé"</string>
+    <string name="zen_mode_screen_on_summary" msgid="5385338884695802115">"Autoriser les notifications désactivées par le mode Ne pas déranger de s\'afficher à l\'écran"</string>
+    <string name="zen_mode_screen_off" msgid="3144446765110327937">"Lorsque l\'écran est éteint"</string>
+    <string name="zen_mode_screen_off_summary" msgid="7430034620565812258">"Autoriser les notifications désactivées par le mode Ne pas déranger d\'activer l\'écran et de faire clignoter le voyant"</string>
+    <string name="zen_mode_screen_off_summary_no_led" msgid="2826121465026642017">"Autoriser les notifications désactivées par le mode Ne pas déranger d\'activer l\'écran"</string>
     <string name="notification_app_settings_button" msgid="6685640230371477485">"Paramètres de notification"</string>
+    <string name="suggestion_button_text" msgid="3275010948381252006">"OK"</string>
     <string name="device_feedback" msgid="3238056036766293294">"Commentaires sur cet appareil"</string>
     <string name="restr_pin_enter_admin_pin" msgid="1085834515677448072">"Entrez le NIP d\'administrateur"</string>
     <string name="switch_on_text" msgid="1124106706920572386">"Activé"</string>
@@ -3075,7 +3136,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é 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és 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>
@@ -3110,7 +3171,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">"Applications : notif. bloquées"</string>
+    <string name="filter_notif_blocked_apps" msgid="3300375727887991342">"Applis : notifications 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>
@@ -3202,20 +3263,21 @@
     <string name="usb_use_charging_only" msgid="2180443097365214467">"Charger cet appareil"</string>
     <string name="usb_use_charging_only_desc" msgid="3066256793008540627">"Charger cet appareil seulement"</string>
     <string name="usb_use_power_only" msgid="6426550616883919530">"Fournir l\'alimentation"</string>
-    <string name="usb_use_power_only_desc" msgid="3461232831015575152">"Charger l\'appareil connecté. Ne fonctionne qu\'avec les appareils compatibles avec le rechargement USB."</string>
+    <string name="usb_use_power_only_desc" msgid="3461232831015575152">"Charger l\'appareil connecté. Ne fonctionne qu\'avec les appareils compatibles avec le chargement USB."</string>
     <string name="usb_use_file_transfers" msgid="7409600791007250137">"Transférer les fichiers"</string>
     <string name="usb_use_file_transfers_desc" msgid="4235764784331804488">"Transférer des fichiers vers un autre appareil"</string>
-    <string name="usb_use_photo_transfers" msgid="7794775645350330454">"Transfert de photos (PTP)"</string>
+    <string name="usb_use_photo_transfers" msgid="7794775645350330454">"Transférer des photos (PTP)"</string>
     <string name="usb_use_photo_transfers_desc" msgid="2963034811151325996">"Transferer des photos ou des fichiers si MTP n\'est pas pris en charge (PTP)"</string>
     <string name="usb_use_MIDI" msgid="870922185938298263">"Utiliser l\'appareil en tant que MIDI"</string>
     <string name="usb_use_MIDI_desc" msgid="8473936990076693175">"Utiliser cet appareil en tant que MIDI"</string>
     <string name="usb_use" msgid="3256040963685055320">"Utiliser la connexion USB pour"</string>
     <string name="usb_pref" msgid="1400617804525116158">"USB"</string>
-    <string name="usb_summary_charging_only" msgid="7544327009143659751">"Charger cet appareil"</string>
+    <string name="usb_summary_charging_only" msgid="7544327009143659751">"Chargement de l\'appareil"</string>
     <string name="usb_summary_power_only" msgid="3629517713817003738">"Fournir de l\'alimentation"</string>
     <string name="usb_summary_file_transfers" msgid="6435943692610175111">"Transfert de fichiers"</string>
     <string name="usb_summary_photo_transfers" msgid="8440204169576585250">"Transfert de photos (profil PTP)"</string>
     <string name="usb_summary_MIDI" msgid="5687906612187885908">"Utiliser l\'appareil comme dispositif MIDI"</string>
+    <string name="sms_mirroring_pref" msgid="6475043279147376031">"Duplication de messages texte"</string>
     <string name="background_check_pref" msgid="7550258400138010979">"Vérification en arrière-plan"</string>
     <string name="background_check_title" msgid="4534254315824525593">"Accès complet à l\'arrière-plan"</string>
     <string name="assist_access_context_title" msgid="2269032346698890257">"Utiliser le texte affiché à l\'écran"</string>
@@ -3282,7 +3344,7 @@
     <string name="write_settings_title" msgid="4232152481902542284">"Peut modifier les paramètres du système"</string>
     <string name="write_system_settings" msgid="3482913590601096763">"Modifier paramètres système"</string>
     <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="permit_write_settings" msgid="658555006453212691">"Autoriser la modification 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>
@@ -3317,7 +3379,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>
@@ -3348,7 +3410,7 @@
     <string name="condition_hotspot_title" msgid="7778958849468560027">"Le point d\'accès est activé"</string>
     <string name="condition_hotspot_summary" msgid="3433182779269409683">"Le point d\'accès Wi-Fi mobile « <xliff:g id="ID_1">%1$s</xliff:g> » est actif. Le Wi-Fi est désactivé pour cet appareil."</string>
     <string name="condition_airplane_title" msgid="287356299107070503">"Le mode Avion est activé"</string>
-    <string name="condition_airplane_summary" msgid="5561586417832393666">"Le Wi-Fi, le Bluetooth et le réseau cellulaire sont désactivés. Vous ne pouvez pas faire d\'appels téléphoniques ni vous connecter à Internet."</string>
+    <string name="condition_airplane_summary" msgid="3738805058182535606">"Le Wi-Fi, le Bluetooth et le réseau cellulaire sont désactivés. Vous ne pouvez pas faire d\'appels téléphoniques ni vous connecter à Internet."</string>
     <string name="condition_zen_title" msgid="2679168532600816392">"Mode « Ne pas déranger » activé (<xliff:g id="ID_1">%1$s</xliff:g>)"</string>
     <string name="condition_battery_title" msgid="3272131008388575349">"Économie d\'énergie activée"</string>
     <string name="condition_battery_summary" msgid="4418839236027977450">"Les performances sont réduites. Les services de localisation et les données en arrière-plan sont désactivés."</string>
@@ -3377,9 +3439,10 @@
     <string name="color_temperature" msgid="2070126836910615605">"Température des couleurs froides"</string>
     <string name="color_temperature_desc" msgid="4793729830226404052">"Utiliser des couleurs plus froides à l\'écran"</string>
     <string name="color_temperature_toast" msgid="4974218172133854827">"Pour appliquer la modification des couleurs, éteignez l\'écran"</string>
-    <string name="telephony_monitor_toast" msgid="7003764250271195384">"Pour appliquer les changements de TelephonyMonitor, redémarrez l\'appareil"</string>
-    <string name="camera_hal_hdrplus_switch" msgid="8377365197105267466">"Mode HAL HDR+ de l\'appareil photo"</string>
-    <string name="camera_hal_hdrplus_toast" msgid="2063703797270055299">"Pour appliquer les changements HAL HDR+ de l\'appareil photo, redémarrez l\'appareil"</string>
+    <string name="connectivity_monitor_switch" msgid="9059759348648583421">"ConnectivityMonitor"</string>
+    <string name="connectivity_monitor_switch_summary" msgid="2828658652378866401">"ConnectivityMonitor recueille des journaux lorsqu\'il détecte un problème lié à la connectivité, puis invite l\'utilisateur à soumettre un bogue."</string>
+    <string name="connectivity_monitor_toast" msgid="5551859612881173028">"Pour appliquer les changements de ConnectivityMonitor, redémarrez l\'appareil"</string>
+    <string name="camera_laser_sensor_switch" msgid="8913588990743234440">"Capteur laser de l\'appareil photo"</string>
     <string name="ota_disable_automatic_update" msgid="2319639631655915050">"Mises à jour automatiques du système"</string>
     <string name="usage" msgid="2977875522080448986">"Utilisation"</string>
     <string name="cellular_data_usage" msgid="2155683719898158203">"Utilisation de données cellulaires"</string>
@@ -3393,7 +3456,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_fragment_summary" msgid="8231066353654583106">"Mensuel (<xliff:g id="ID_1">%1$s</xliff:g> jour du mois)"</string>
+    <string name="billing_cycle_fragment_summary" msgid="8231066353654583106">"Mensuel (le <xliff:g id="ID_1">%1$s</xliff:g>)"</string>
     <string name="network_restrictions" msgid="8234695294536675380">"Restrictions réseau"</string>
     <plurals name="network_restrictions_summary" formatted="false" msgid="4301618027244595839">
       <item quantity="one"><xliff:g id="COUNT">%1$d</xliff:g> restriction</item>
@@ -3401,11 +3464,11 @@
     </plurals>
     <string name="operator_warning" msgid="1862988028996859195">"Le suivi de consommation de données du fournisseur de services peut différer de celui de l\'appareil."</string>
     <string name="data_used_template" msgid="3245919669966296505">"<xliff:g id="ID_1">%1$s</xliff:g> utilisés"</string>
-    <string name="set_data_warning" msgid="6115364758236594593">"Définir avertisseur util. données"</string>
-    <string name="data_warning" msgid="209133958008062117">"Avertissement consomm. données"</string>
+    <string name="set_data_warning" msgid="6115364758236594593">"Activer une alerte"</string>
+    <string name="data_warning" msgid="209133958008062117">"Seuil d\'alerte"</string>
     <string name="set_data_limit" msgid="2901526323210516923">"Définir limite consomm. données"</string>
     <string name="data_limit" msgid="1885406964934590552">"Limite de données"</string>
-    <string name="data_usage_template" msgid="392191945602400904">"<xliff:g id="ID_1">%1$s</xliff:g> utilisés entre <xliff:g id="ID_2">%2$s</xliff:g>"</string>
+    <string name="data_usage_template" msgid="2923744765873163859">"<xliff:g id="ID_1">%1$s</xliff:g> utilisés pour la période : <xliff:g id="ID_2">%2$s</xliff:g>"</string>
     <string name="configure" msgid="1029654422228677273">"Configurer"</string>
     <string name="data_usage_other_apps" msgid="3272872663517382050">"Autres applications incluses dans l\'utilisation"</string>
     <plurals name="data_saver_unrestricted_summary" formatted="false" msgid="2635267833484232703">
@@ -3416,7 +3479,7 @@
     <string name="unrestricted_data_saver" msgid="952796077540228711">"Données sans restrictions"</string>
     <string name="restrict_background_blacklisted" msgid="3995443391711013068">"Les données en arrière-plan sont désactivées"</string>
     <string name="data_saver_on" msgid="6774217590237934709">"Activée"</string>
-    <string name="data_saver_off" msgid="6892309031162738794">"Désactivée"</string>
+    <string name="data_saver_off" msgid="6892309031162738794">"Désactivé"</string>
     <string name="unrestricted_app_title" msgid="4465437191723332066">"Utilis. donn. sans restriction"</string>
     <string name="unrestricted_app_summary" msgid="6458008993501723912">"Ignorer restrict. données lorsque Écon. donn. act."</string>
     <string name="home_app" msgid="4066188520886810030">"Application d\'accueil"</string>
@@ -3434,7 +3497,7 @@
     <string name="not_battery_optimizing" msgid="5362861851864837617">"L\'optimisation de la pile n\'est pas utilisée"</string>
     <string name="lockscreen_remote_input" msgid="969871538778211843">"Si l\'appareil est verrouillé, empêcher l\'entrée de réponses ou de texte dans les notifications"</string>
     <string name="default_spell_checker" msgid="8506899870026026660">"Correcteur ortho par défaut"</string>
-    <string name="choose_spell_checker" msgid="6596539862291699367">"Sélectionnez correcteur ortho"</string>
+    <string name="choose_spell_checker" msgid="6596539862291699367">"Sélectionner correcteur ortho"</string>
     <string name="spell_checker_not_selected" msgid="8871083796179200696">"Non sélectionné"</string>
     <string name="notification_log_no_title" msgid="5678029849672024215">"(aucun)"</string>
     <string name="notification_log_details_delimiter" msgid="3116559361552416747">" : "</string>
@@ -3468,13 +3531,13 @@
     <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> application peuvent 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>
     </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>
     <string name="reset_shortcut_manager_throttling" msgid="6495066467198668994">"Réinitialiser la limitation de fréquence ShortcutManager"</string>
     <string name="reset_shortcut_manager_throttling_complete" msgid="1826770872063707900">"La limitation de fréquence ShortcutManager a été réinitialisée"</string>
-    <string name="notification_suggestion_title" msgid="4506524937307816475">"Gérer notifications écran verrouillage"</string>
+    <string name="notification_suggestion_title" msgid="387052719462473500">"Gérer les données sur l\'écran de verrouillage"</string>
     <string name="notification_suggestion_summary" msgid="8521159741445416875">"Afficher ou masquer le contenu des notifications"</string>
     <string name="page_tab_title_summary" msgid="4070309266374993258">"Tous"</string>
     <string name="page_tab_title_support" msgid="8483187649355540109">"Assistance et astuces"</string>
@@ -3482,7 +3545,7 @@
     <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>
     <string name="premium_sms_access" msgid="4660047004791638305">"Accès aux textos payants"</string>
-    <string name="bluetooth_disabled" msgid="2456198532288640046">"Non visible aux autres appareils"</string>
+    <string name="bluetooth_disabled" msgid="6244000672828617410">"Désactivé"</string>
     <string name="bluetooth_connected_summary" msgid="7672528674593152862">"Connecté à <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="bluetooth_connected_multiple_devices_summary" msgid="9173661896296663932">"Connecté à plusieurs appareils"</string>
     <string name="demo_mode" msgid="2798762752209330277">"Mode de démonstration de l\'interface système"</string>
@@ -3528,13 +3591,6 @@
       <item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> secondes</item>
     </plurals>
     <string name="support_estimated_wait_time" msgid="6523081420029378051">"Durée d\'attente : environ <xliff:g id="ESTIMATE">%1$s</xliff:g>"</string>
-    <string name="bluetooth_talkback_computer" msgid="4875089335641234463">"Ordinateur"</string>
-    <string name="bluetooth_talkback_headset" msgid="5140152177885220949">"Écouteurs"</string>
-    <string name="bluetooth_talkback_phone" msgid="4260255181240622896">"Téléphone"</string>
-    <string name="bluetooth_talkback_imaging" msgid="551146170554589119">"Imagerie"</string>
-    <string name="bluetooth_talkback_headphone" msgid="26580326066627664">"Écouteurs"</string>
-    <string name="bluetooth_talkback_input_peripheral" msgid="5165842622743212268">"Périphérique d\'entrée"</string>
-    <string name="bluetooth_talkback_bluetooth" msgid="5615463912185280812">"Bluetooth"</string>
     <string name="automatic_storage_manager_settings" msgid="7819434542155181607">"Gérer l\'espace de stockage"</string>
     <string name="automatic_storage_manager_text" msgid="4562950476680600604">"Pour vous aider à libérer de l\'espace, le Gestionnaire de stockage supprime les photos et les vidéos sauvegardées sur votre appareil."</string>
     <string name="automatic_storage_manager_days_title" msgid="2017913896160914647">"Supprimer les photos et les vidéos"</string>
@@ -3561,14 +3617,15 @@
     <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="525662960806416373">"Pour vérifier l\'heure, les icônes de notification et d\'autres renseignements, touchez deux fois l\'écran."</string>
     <string name="ambient_display_suggestion_summary" msgid="5987443721392571847">"Consulter les notifications lorsque l\'écran est éteint"</string>
-    <string name="ambient_display_pickup_title" product="default" msgid="818688002837687268">"Saisir le téléphone pour le consulter"</string>
+    <string name="ambient_display_pickup_title" product="default" msgid="818688002837687268">"Saisir pour consulter le téléphone"</string>
     <string name="ambient_display_pickup_title" product="tablet" msgid="4455864282995698097">"Saisissez la tablette pour consulter les notifications"</string>
     <string name="ambient_display_pickup_title" product="device" msgid="5380534405773531175">"Saisissez l\'appareil pour consulter les notifications"</string>
-    <string name="ambient_display_pickup_summary" product="default" msgid="4567020486787561873">"Pour vérifier l\'heure, les icônes de notification et d\'autres renseignements, saisissez votre téléphone."</string>
+    <string name="ambient_display_pickup_summary" product="default" msgid="4567020486787561873">"Pour vérifier l\'heure, les icônes de notification et d\'autres renseignements, saisir votre téléphone."</string>
     <string name="ambient_display_pickup_summary" product="tablet" msgid="5435283849947236648">"Pour vérifier l\'heure, les icônes de notification et d\'autres renseignements, saisissez votre tablette."</string>
     <string name="ambient_display_pickup_summary" product="device" msgid="8256669101643381568">"Pour vérifier l\'heure, les icônes de notification et d\'autres renseignements, saisissez votre appareil."</string>
     <string name="ambient_display_pickup_suggestion_summary" msgid="7014700589991761035">"Consulter les notifications lorsque l\'écran est éteint"</string>
     <string name="fingerprint_swipe_for_notifications_title" msgid="5816346492253270243">"Balayer lecteur d\'empreintes pour voir notif."</string>
+    <string name="fingerprint_gesture_screen_title" msgid="8562169633234041196">"Balayez empreinte digitale"</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>
@@ -3577,14 +3634,15 @@
     <string name="gesture_setting_on" msgid="3455094265233870280">"Activé"</string>
     <string name="gesture_setting_off" msgid="5230169535435881894">"Désactivé"</string>
     <string name="oem_unlock_enable_disabled_summary_bootloader_unlocked" msgid="4265541229765635629">"Le programme d\'amorçage est déjà déverrouillé"</string>
-    <string name="oem_unlock_enable_disabled_summary_connectivity" msgid="415954951226204461">"Connectez-vous d\'abord à Internet"</string>
-    <string name="oem_unlock_enable_disabled_summary_connectivity_or_locked" msgid="5884723935668892613">"Connect. à Internet ou contactez votre fournisseur de services"</string>
+    <string name="oem_unlock_enable_disabled_summary_connectivity" msgid="3361344735430813695">"Connectez-vous d\'abord à Internet"</string>
+    <string name="oem_unlock_enable_disabled_summary_connectivity_or_locked" msgid="2479038689567925511">"Connectez à Internet ou contactez votre fournisseur de services"</string>
     <string name="oem_unlock_enable_disabled_summary_sim_locked_device" msgid="4149387448213399630">"Non disp. sur les appareils verrouillés par un f. de services"</string>
+    <string name="oem_lock_info_message" msgid="9218313722236417510">"Veuillez redémarrer l\'appareil pour activer la fonction de protection d\'appareil."</string>
     <string name="automatic_storage_manager_freed_bytes" msgid="7517560170441007788">"<xliff:g id="SIZE">%1$s</xliff:g> libéré(s) au total\n\n Dernière exécution : <xliff:g id="DATE">%2$s</xliff:g>"</string>
     <string name="web_action_enable_title" msgid="4051513950976670853">"Applications instantanées"</string>
     <string name="web_action_enable_summary" msgid="3108127559723396382">"Ouvrir les liens dans les applications, même si elles ne sont pas installées"</string>
     <string name="web_action_section_title" msgid="7364647086538399136">"Applications instantanées"</string>
-    <string name="instant_apps_account" msgid="1433620209791992528">"Compte pour les applications instantanées"</string>
+    <string name="instant_apps_settings" msgid="8827777916518348213">"Préférences des applications instantanées"</string>
     <string name="domain_url_section_title" msgid="7046835219056428883">"Applications installées"</string>
     <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>
@@ -3631,7 +3689,9 @@
     <string name="enterprise_privacy_always_on_vpn_personal" msgid="9217774730260037434">"Le RPV permanent est activé dans votre profil personnel"</string>
     <string name="enterprise_privacy_always_on_vpn_work" msgid="7244472958208315814">"Le RPV permanent est activé dans votre profil professionnel"</string>
     <string name="enterprise_privacy_global_http_proxy" msgid="7936664553416257333">"Le serveur mandataire HTTP global a été défini"</string>
-    <string name="enterprise_privacy_ca_certs" msgid="5885892204903688909">"Certificats de confiance"</string>
+    <string name="enterprise_privacy_ca_certs_device" msgid="2019652712782510262">"Certificats de confiance"</string>
+    <string name="enterprise_privacy_ca_certs_personal" msgid="2279084820904076599">"Certificats de confiance installés dans votre profil personnel"</string>
+    <string name="enterprise_privacy_ca_certs_work" msgid="6187377647815301809">"Certificats de confiance installés dans votre profil professionnel"</string>
     <plurals name="enterprise_privacy_number_ca_certs" formatted="false" msgid="526375234629534165">
       <item quantity="one">Minimum de <xliff:g id="COUNT_1">%d</xliff:g> certificat CA</item>
       <item quantity="other">Minimum de <xliff:g id="COUNT_1">%d</xliff:g> certificats CA</item>
@@ -3680,20 +3740,24 @@
     <string name="app_info_storage_title" msgid="5554719444625611987">"Espace utilisé"</string>
     <string name="webview_uninstalled_for_user" msgid="1819903169194420983">"(désinst. pour l\'utilisateur <xliff:g id="USER">%s</xliff:g>)"</string>
     <string name="webview_disabled_for_user" msgid="1216426047631256825">"(désactivé pour l\'utilisateur <xliff:g id="USER">%s</xliff:g>)"</string>
-    <string name="autofill_app" msgid="7338387238377914374">"Service de remplissage automatique"</string>
+    <string name="autofill_app" msgid="7338387238377914374">"Service de remplissage auto"</string>
     <string name="autofill_keywords" msgid="7485591824120812710">"automatique, remplir, remplissage automatique"</string>
     <string name="autofill_confirmation_message" msgid="2784869528908005194">"&lt;b&gt;Assurez-vous de faire confiance à cette application&lt;/b&gt; &lt;br/&gt; &lt;br/&gt; &lt;xliff:g id=app_name example=Google Remplissage automatique&gt;%1$s&lt;/xliff:g&gt;utilise les éléments affichés à l\'écran pour déterminer les champs qui peuvent bénéficier de l\'entrée automatique."</string>
     <string name="device_theme" msgid="4571803018917608588">"Thème de l\'appareil"</string>
     <string name="default_theme" msgid="7085644992078579076">"Par défaut"</string>
+    <string name="show_operator_name_title" msgid="805135053530442951">"Nom du réseau"</string>
+    <string name="show_operator_name_summary" msgid="5962567590205757550">"Afficher le nom du réseau dans la barre d\'état"</string>
     <string name="storage_manager_indicator" msgid="1516810749625915020">"Gestionnaire de stockage : <xliff:g id="STATUS">^1</xliff:g>"</string>
     <string name="storage_manager_indicator_off" msgid="7488057587180724388">"Désactivé"</string>
     <string name="storage_manager_indicator_on" msgid="8625551710194584733">"Activé"</string>
     <string name="install_type_instant" msgid="3174425974536078647">"Application instantanée"</string>
     <string name="automatic_storage_manager_deactivation_warning" msgid="5605210730828410482">"Désactiver le gestionnaire de stockage?"</string>
-    <string name="storage_movies_tv" msgid="5498394447562086890">"Applications de films et d\'émissions de télévision"</string>
+    <string name="storage_movies_tv" msgid="5498394447562086890">"Applis de films et d\'émissions"</string>
     <string name="carrier_provisioning" msgid="4398683675591893169">"Données d\'approvisionnement du fournisseur de services"</string>
     <string name="trigger_carrier_provisioning" msgid="3434865918009286187">"Déclencher l\'approvisionnement du fournisseur de services"</string>
     <string name="new_device_suggestion_title" msgid="698847081680980774">"Quelles sont les nouveautés toutes chaudes?"</string>
-    <string name="new_device_suggestion_summary" msgid="7172709269203435870">"Découvrez les cinq principales fonctionnalités"</string>
+    <string name="new_device_suggestion_summary" product="default" msgid="206396571522515855">"Découvrez votre nouveau téléphone"</string>
+    <string name="new_device_suggestion_summary" product="tablet" msgid="393751455688210956">"Découvrez votre nouvelle tablette"</string>
+    <string name="new_device_suggestion_summary" product="device" msgid="2939870049868336652">"Découvrez votre nouvel appareil"</string>
     <string name="disabled_low_ram_device" msgid="3751578499721173344">"Cette fonctionnalité n\'est pas accessible sur cet appareil."</string>
 </resources>
diff --git a/res/values-fr/arrays.xml b/res/values-fr/arrays.xml
index e8d1cb4..1547fd6 100644
--- a/res/values-fr/arrays.xml
+++ b/res/values-fr/arrays.xml
@@ -100,8 +100,6 @@
     <!-- no translation found for wifi_security_no_eap:0 (2084555984818107151) -->
     <!-- no translation found for wifi_security_no_eap:1 (397579322683471524) -->
     <!-- no translation found for wifi_security_no_eap:2 (1968820975358150484) -->
-    <!-- no translation found for wifi_ap_security:0 (5251664683198623324) -->
-    <!-- no translation found for wifi_ap_security:1 (7989073072260294673) -->
   <string-array name="wifi_eap_method">
     <item msgid="1160193392455075561">"PEAP"</item>
     <item msgid="7981731051382306293">"TLS"</item>
diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
index cb26465..1bbcb65 100644
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml
@@ -166,7 +166,7 @@
     <string name="bluetooth_map_acceptance_dialog_text" msgid="8712508202081143737">"Une demande d\'accès à vos messages a été envoyée pour \"%1$s\". Accorder l\'accès à \"%2$s\" ?"</string>
     <string name="bluetooth_sap_request" msgid="2669762224045354417">"Demande d\'accès à la carte SIM"</string>
     <string name="bluetooth_sap_acceptance_dialog_text" msgid="4414253873553608690">"\"<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g>\" requiert l\'accès à votre carte SIM. Si vous l\'accordez, la connectivité des données sera désactivée sur votre appareil pour toute la durée de la connexion. Accorder l\'autorisation d\'accès à \"<xliff:g id="DEVICE_NAME_1">%2$s?</xliff:g>\""</string>
-    <string name="bluetooth_device_name_summary" msgid="4757990010751789977">"Visible avec le nom \"<xliff:g id="DEVICE_NAME">^1</xliff:g>\" pour les autres appareils"</string>
+    <string name="bluetooth_device_name_summary" msgid="522235742194965734">"Visible avec le nom \"<xliff:g id="DEVICE_NAME">^1</xliff:g>\" pour les autres appareils"</string>
     <string name="bluetooth_paired_device_title" msgid="8638994696317952019">"Vos appareils"</string>
     <string name="bluetooth_pairing_page_title" msgid="7712127387361962608">"Associer un nouvel appareil"</string>
     <string name="date_and_time" msgid="9062980487860757694">"Date et heure"</string>
@@ -312,6 +312,8 @@
     <string name="zone_auto" msgid="334783869352026648">"Fuseau horaire automatique"</string>
     <string name="zone_auto_summaryOn" msgid="6142830927278458314">"Utiliser le fuseau horaire fourni par le réseau"</string>
     <string name="zone_auto_summaryOff" msgid="2597745783162041390">"Utiliser le fuseau horaire fourni par le réseau"</string>
+    <string name="date_time_24hour_auto" msgid="2117383168985653422">"Format 24 heures automatique"</string>
+    <string name="date_time_24hour_auto_summary" msgid="6351812925651480277">"Utiliser les paramètres régionaux par défaut"</string>
     <string name="date_time_24hour_title" msgid="3203537578602803850">"Format 24 heures"</string>
     <string name="date_time_24hour" msgid="1193032284921000063">"Utiliser le format 24 h"</string>
     <string name="date_time_set_time_title" msgid="6296795651349047016">"Heure"</string>
@@ -334,7 +336,7 @@
     <string name="security_enable_widgets_disabled_summary" msgid="6392489775303464905">"Désactivé par l\'administrateur"</string>
     <string name="owner_info_settings_summary" msgid="7472393443779227052">"Aucun"</string>
     <string name="owner_info_settings_status" msgid="120407527726476378">"<xliff:g id="COUNT_0">%1$d</xliff:g>/<xliff:g id="COUNT_1">%2$d</xliff:g>"</string>
-    <string name="owner_info_settings_edit_text_hint" msgid="7591869574491036360">"Exemple : l\'Android de Jean"</string>
+    <string name="owner_info_settings_edit_text_hint" msgid="7591869574491036360">"Exemple : Android de Jean"</string>
     <string name="user_info_settings_title" msgid="1195015434996724736">"Infos utilisateur"</string>
     <string name="show_profile_info_on_lockscreen_label" msgid="2741208907263877990">"Afficher infos de profil sur écran de verrouillage"</string>
     <string name="profile_info_settings_title" msgid="3518603215935346604">"Infos de profil"</string>
@@ -372,6 +374,9 @@
     <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="1961957425135180242">"Suivant"</string>
+    <string name="setup_fingerprint_enroll_skip_title" msgid="362050541117362034">"Passer configuration empreinte ?"</string>
+    <string name="setup_fingerprint_enroll_skip_after_adding_lock_text" msgid="958990414356204763">"La configuration de l\'empreinte digitale ne prend qu\'une minute ou deux. Si vous passez cette étape, vous pouvez ajouter votre empreinte digitale plus tard dans les paramètres."</string>
+    <string name="lock_screen_intro_skip_title" msgid="4988210105913705679">"Passer verrouillage d\'écran ?"</string>
     <string name="lock_screen_intro_skip_dialog_text_frp" product="tablet" msgid="1581834104051243425">"Les fonctionnalités de protection de l\'appareil ne seront pas activées. Vous ne pourrez pas empêcher d\'autres personnes d\'utiliser cette tablette en cas de perte, de vol ou de réinitialisation."</string>
     <string name="lock_screen_intro_skip_dialog_text_frp" product="device" msgid="4629503416877189572">"Les fonctionnalités de protection de l\'appareil ne seront pas activées. Vous ne pourrez pas empêcher d\'autres personnes d\'utiliser cet appareil en cas de perte, de vol ou de réinitialisation."</string>
     <string name="lock_screen_intro_skip_dialog_text_frp" product="default" msgid="2423428240245737909">"Les fonctionnalités de protection de l\'appareil ne seront pas activées. Vous ne pourrez pas empêcher d\'autres personnes d\'utiliser ce téléphone en cas de perte, de vol ou de réinitialisation."</string>
@@ -380,15 +385,15 @@
     <string name="lock_screen_intro_skip_dialog_text" product="default" msgid="3008526710555416125">"Les fonctionnalités de protection de l\'appareil ne seront pas activées. Vous ne pourrez pas empêcher d\'autres personnes d\'utiliser ce téléphone en cas de perte ou de vol."</string>
     <string name="skip_anyway_button_label" msgid="2323522873558834513">"Ignorer quand même"</string>
     <string name="go_back_button_label" msgid="4745265266186209467">"Retour"</string>
-    <string name="security_settings_fingerprint_enroll_find_sensor_title" msgid="3051496861358227199">"Poser le doigt sur le lecteur"</string>
+    <string name="security_settings_fingerprint_enroll_find_sensor_title" msgid="3051496861358227199">"Posez le doigt sur le lecteur"</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_message" msgid="8793966374365960368">"Le capteur se trouve à l\'arrière du téléphone. Utilisez l\'index."</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_content_description" msgid="2058830032070449160">"Illustration présentant l\'appareil et la position du lecteur d\'empreintes digitales"</string>
     <string name="security_settings_fingerprint_enroll_dialog_name_label" msgid="7086763077909041106">"Nom"</string>
     <string name="security_settings_fingerprint_enroll_dialog_ok" msgid="4150384963879569750">"OK"</string>
     <string name="security_settings_fingerprint_enroll_dialog_delete" msgid="4114615413240707936">"Supprimer"</string>
-    <string name="security_settings_fingerprint_enroll_start_title" msgid="2068961812439460133">"Poser le doigt sur le lecteur"</string>
+    <string name="security_settings_fingerprint_enroll_start_title" msgid="2068961812439460133">"Posez le doigt sur le lecteur"</string>
     <string name="security_settings_fingerprint_enroll_start_message" msgid="3909929328942564524">"Placez votre doigt sur le lecteur, puis soulevez-le lorsque vous sentez une vibration."</string>
-    <string name="security_settings_fingerprint_enroll_repeat_title" msgid="2819679722403209778">"Lever le doigt, puis appuyer"</string>
+    <string name="security_settings_fingerprint_enroll_repeat_title" msgid="2819679722403209778">"Levez le doigt, puis appuyez de nouveau"</string>
     <string name="security_settings_fingerprint_enroll_repeat_message" msgid="6158989350522518586">"Maintenez le doigt relevé pour ajouter les différentes parties de votre empreinte digitale"</string>
     <string name="security_settings_fingerprint_enroll_finish_title" msgid="7567276170287972230">"Empreinte digitale ajoutée"</string>
     <string name="security_settings_fingerprint_enroll_finish_message" msgid="4796715961273420536">"Quand cette icône s\'affiche, utilisez votre empreinte digitale pour vous identifier ou pour approuver des achats."</string>
@@ -404,7 +409,7 @@
     <string name="security_settings_fingerprint_enroll_error_generic_dialog_message" msgid="3624760637222239293">"L\'enregistrement de l\'empreinte digitale n\'a pas fonctionné. Veuillez réessayer ou utiliser un autre doigt."</string>
     <string name="fingerprint_enroll_button_add" msgid="6317978977419045463">"Ajouter une empreinte"</string>
     <string name="fingerprint_enroll_button_next" msgid="6247009337616342759">"Suivant"</string>
-    <string name="security_settings_fingerprint_enroll_disclaimer" msgid="2624905914239271751">"Votre empreinte digitale vous permet non seulement de déverrouiller votre téléphone, mais également d\'autoriser des achats et l\'accès à l\'application. "<annotation id="url">"En savoir plus"</annotation></string>
+    <string name="security_settings_fingerprint_enroll_disclaimer" msgid="2624905914239271751">"Votre empreinte digitale vous permet non seulement de déverrouiller votre téléphone, mais également d\'autoriser des achats et d\'accéder à des applications. "<annotation id="url">"En savoir plus"</annotation></string>
     <string name="security_settings_fingerprint_enroll_disclaimer_lockscreen_disabled" msgid="7846871823167357942">" L\'option de verrouillage de l\'écran est désactivée. Pour en savoir plus, contactez l\'administrateur de votre entreprise. "<annotation id="admin_details">"Plus d\'informations"</annotation>\n\n"Vous pouvez toujours utiliser votre empreinte digitale pour autoriser des achats et l\'accès aux applications. "<annotation id="url">"En savoir plus"</annotation></string>
     <string name="security_settings_fingerprint_enroll_lift_touch_again" msgid="1888772560642539718">"Relevez le doigt, puis appuyez à nouveau sur le capteur."</string>
     <string name="fingerprint_add_max" msgid="1020927549936895822">"Vous pouvez ajouter jusqu\'à <xliff:g id="COUNT">%d</xliff:g> empreintes digitales."</string>
@@ -450,14 +455,14 @@
     <string name="crypt_keeper_switch_input_method" msgid="4168332125223483198">"Changer le mode de saisie"</string>
     <string name="suggested_lock_settings_title" msgid="8971630898700461034">"Définir le verrouillage de l\'écran"</string>
     <string name="suggested_lock_settings_summary" msgid="8778462376012231110">"Protégez votre appareil"</string>
-    <string name="suggested_fingerprint_lock_settings_title" msgid="3655973509619012084">"Utiliser le lecteur d\'empreinte digitale"</string>
+    <string name="suggested_fingerprint_lock_settings_title" msgid="3655973509619012084">"Utiliser votre empreinte digitale"</string>
     <string name="suggested_fingerprint_lock_settings_summary" msgid="2149569133725273864">"Déverrouiller un appareil avec votre empreinte digitale"</string>
     <string name="lock_settings_picker_title" msgid="1095755849152582712">"Verrouillage de l\'écran"</string>
     <string name="lock_settings_picker_title_profile" msgid="8822511284992306796">"Verrouill. profil pro"</string>
     <string name="setup_lock_settings_picker_title" product="tablet" msgid="90329443364067215">"Protéger la tablette"</string>
     <string name="setup_lock_settings_picker_title" product="device" msgid="2399952075134938929">"Protéger l\'appareil"</string>
     <string name="setup_lock_settings_picker_title" product="default" msgid="1572244299605153324">"Protégez votre téléphone"</string>
-    <string name="setup_lock_settings_picker_fingerprint_message" msgid="5585650064305600578">"Pour plus de sécurité, configurez un mode de verrouillage de l\'écran supplémentaire."</string>
+    <string name="lock_settings_picker_fingerprint_added_security_message" msgid="5768002109707648463">"Pour plus de sécurité, définissez un mode de verrouillage de l\'écran supplémentaire."</string>
     <string name="setup_lock_settings_picker_message" product="tablet" msgid="8919671129189936210">"Activez les fonctionnalités de protection de l\'appareil pour empêcher d\'autres personnes d\'utiliser cette tablette sans votre autorisation. Choisissez la méthode de verrouillage de l\'écran à utiliser."</string>
     <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>
@@ -588,10 +593,11 @@
     <string name="lockpassword_pin_no_sequential_digits" msgid="680765285206990584">"Les suites de chiffres croissantes, décroissantes ou répétitives ne sont pas autorisées"</string>
     <string name="lockpassword_ok_label" msgid="313822574062553672">"OK"</string>
     <string name="lockpassword_cancel_label" msgid="8818529276331121899">"Annuler"</string>
+    <string name="lockpassword_clear_label" msgid="5724429464960458155">"Effacer"</string>
     <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">"Applications d\'administration d\'appareils"</string>
+    <string name="manage_device_admin" msgid="537804979483211453">"Applis d\'administration des 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>
@@ -781,6 +787,7 @@
     <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>
@@ -817,6 +824,8 @@
     <string name="wifi_wps_available_first_item" msgid="4422547079984583502">"WPS disponible"</string>
     <string name="wifi_wps_available_second_item" msgid="8427520131718215301">" (WPS disponible)"</string>
     <string name="wifi_wps_nfc_enter_password" msgid="2288214226916117159">"Saisissez votre mot de passe réseau."</string>
+    <string name="wifi_carrier_connect" msgid="8174696557882299911">"Réseau Wi‑Fi de l\'opérateur"</string>
+    <string name="wifi_carrier_content" msgid="4634077285415851933">"Se connecter via <xliff:g id="NAME">%1%s</xliff:g>"</string>
     <string name="wifi_scan_always_turnon_message" msgid="203123538572122989">"Pour améliorer la précision de la localisation, entre autres, <xliff:g id="APP_NAME">%1$s</xliff:g> souhaite activer la recherche de réseaux même lorsque le Wi-Fi est désactivé.\n\nDonner cette autorisation à toutes les applications souhaitant activer la recherche de réseaux ?"</string>
     <string name="wifi_scan_always_turnoff_message" msgid="5538901671131941043">"Pour désactiver cette option, sélectionnez \"Paramètres avancés\" dans le menu à développer."</string>
     <string name="wifi_scan_always_confirm_allow" msgid="5355973075896817232">"Autoriser"</string>
@@ -834,6 +843,7 @@
     <string name="wifi_connect" msgid="1076622875777072845">"Se connecter"</string>
     <string name="wifi_failed_connect_message" msgid="8491902558970292871">"Échec de la connexion au réseau."</string>
     <string name="wifi_forget" msgid="8168174695608386644">"Retirer"</string>
+    <string name="wifi_modify" msgid="6100248070440710782">"Modifier"</string>
     <string name="wifi_failed_forget_message" msgid="1348172929201654986">"Échec de la suppression du réseau."</string>
     <string name="wifi_save" msgid="3331121567988522826">"Enregistrer"</string>
     <string name="wifi_failed_save_message" msgid="6650004874143815692">"Échec de l\'enregistrement du réseau."</string>
@@ -846,6 +856,7 @@
     <string name="wifi_advanced_titlebar" msgid="4485841401774142908">"Paramètres Wi-Fi avancés"</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_title" msgid="3471132676909349382">"Informations sur le réseau"</string>
     <string name="wifi_details_subnet_mask" msgid="6720279144174924410">"Masque de sous-réseau"</string>
     <string name="wifi_details_dns" msgid="8648826607751830768">"DNS"</string>
     <string name="wifi_details_ipv6_address_header" msgid="6734119149106422148">"Adresses IPv6"</string>
@@ -878,16 +889,15 @@
     <string name="wifi_p2p_cancel_connect_title" msgid="255267538099324413">"Annuler l\'invitation ?"</string>
     <string name="wifi_p2p_cancel_connect_message" msgid="7477756213423749402">"Voulez-vous annuler l\'invitation à se connecter avec <xliff:g id="PEER_NAME">%1$s</xliff:g> ?"</string>
     <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_off_subtext" msgid="5466126533609394170">"Connexion Internet ou contenu non partagés avec d\'autres appareils"</string>
+    <string name="wifi_hotspot_off_subtext" msgid="5466126533609394170">"Ne partager ni la connexion, ni aucun contenu, avec d\'autres appareils"</string>
     <string name="wifi_hotspot_tethering_on_subtext" product="tablet" msgid="5752490509369962007">"Connexion Internet de la tablette partagée via un point d\'accès"</string>
     <string name="wifi_hotspot_tethering_on_subtext" product="default" msgid="6461075246164300670">"Connexion Internet du téléphone partagée via un point d\'accès"</string>
     <string name="wifi_hotspot_on_local_only_subtext" msgid="2068110388011294735">"L\'application partage du contenu. Pour partager la connexion Internet, désactivez le point d\'accès, puis réactivez-le"</string>
-    <string name="wifi_hotspot_name_title" msgid="1341735529132128887">"Nom du point d\'accès Wi-Fi"</string>
+    <string name="wifi_hotspot_name_title" msgid="8237000746618636778">"Nom du point d\'accès"</string>
     <string name="wifi_hotspot_name_summary_connecting" msgid="3378299995508671967">"Activation du point d\'accès \"<xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>\"…"</string>
     <string name="wifi_hotspot_name_summary_connected" msgid="3888672084861445362">"D\'autres appareils peuvent se connecter au point d\'accès \"<xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>\""</string>
-    <string name="wifi_hotspot_password_title" msgid="1955592302902091281">"Mot de passe du point d\'accès Wi-Fi"</string>
+    <string name="wifi_hotspot_password_title" msgid="8676859981917573801">"Mot de passe du point d\'accès"</string>
     <string name="wifi_hotspot_ap_band_title" msgid="1165801173359290681">"Bande du point d\'accès"</string>
     <string name="wifi_hotspot_footer_info_regular" msgid="1203489406068036455">"Utilisez un point d\'accès afin de créer un réseau Wi‑Fi pour vos autres appareils. Un point d\'accès fournit un accès à Internet via votre connexion de données mobiles. Des frais supplémentaires peuvent s\'appliquer pour l\'utilisation des données mobiles."</string>
     <string name="wifi_hotspot_footer_info_local_only" msgid="857988412470694109">"Les applications peuvent créer un point d\'accès pour partager du contenu avec des appareils à proximité."</string>
@@ -898,7 +908,6 @@
     <string name="wifi_tether_configure_ap_text" msgid="7974681394041609308">"Configurer le point d\'accès Wi-Fi"</string>
     <string name="wifi_hotspot_configure_ap_text" msgid="5478614731464220432">"Configuration point accès Wi‑Fi"</string>
     <string name="wifi_hotspot_configure_ap_text_summary" msgid="5560680057727007011">"Point d\'accès AndroidAP WPA2 PSK"</string>
-    <string name="wifi_tether_configure_subtext" msgid="2050196439900426456">"Point d\'accès <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">"Appels Wi-Fi"</string>
     <string name="wifi_calling_suggestion_title" msgid="9008010480466359578">"Activer les appels Wi-Fi"</string>
@@ -939,7 +948,7 @@
     <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="emergency_address_summary" msgid="3266760199681945746">"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>
     <string name="sound_settings" msgid="5534671337768745343">"Son"</string>
     <string name="all_volume_title" msgid="4296957391257836961">"Volume"</string>
@@ -993,6 +1002,7 @@
     <string name="search_settings" msgid="1910951467596035063">"Recherche"</string>
     <string name="search_settings_summary" msgid="9205656546570654169">"Configurer les paramètres et l\'historique de recherche"</string>
     <string name="search_settings_no_results" msgid="8799027492641230999">"Aucun résultat"</string>
+    <string name="search_clear_history" msgid="4196658962573162457">"Effacer l\'historique"</string>
     <string name="display_settings" msgid="7965901687241669598">"Affichage"</string>
     <string name="accelerometer_title" msgid="7854608399547349157">"Rotation auto de l\'écran"</string>
     <string name="color_mode_title" msgid="3159275920408338215">"Couleurs vives"</string>
@@ -1122,7 +1132,6 @@
     <string name="baseband_version" msgid="1848990160763524801">"Version de bande de base"</string>
     <string name="kernel_version" msgid="9192574954196167602">"Version du noyau"</string>
     <string name="build_number" msgid="3075795840572241758">"Numéro de build"</string>
-    <string name="selinux_status" msgid="6212165375172061672">"État SELinux"</string>
     <string name="device_info_not_available" msgid="8062521887156825182">"Non disponible"</string>
     <string name="device_status_activity_title" msgid="1411201799384697904">"État"</string>
     <string name="device_status" msgid="607405385799807324">"État"</string>
@@ -1150,7 +1159,6 @@
     <string name="status_wifi_mac_address" msgid="2202206684020765378">"Adresse MAC Wi-Fi"</string>
     <string name="status_bt_address" msgid="4195174192087439720">"Adresse Bluetooth"</string>
     <string name="status_serial_number" msgid="2257111183374628137">"Numéro de série"</string>
-    <string name="status_unavailable" msgid="7862009036663793314">"Non disponible"</string>
     <string name="status_up_time" msgid="7294859476816760399">"Durée d\'activité"</string>
     <string name="status_awake_time" msgid="2393949909051183652">"Temps en activité"</string>
     <string name="internal_memory" msgid="9129595691484260784">"Mémoire de stockage interne"</string>
@@ -1326,6 +1334,7 @@
     <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>
     <string name="reset_dashboard_title" msgid="6254873816990678620">"Options de réinitialisation"</string>
+    <string name="reset_dashboard_summary" msgid="4851012632493522755">"Vous pouvez réinitialiser le réseau, les applications ou l\'appareil"</string>
     <string name="reset_network_title" msgid="6166025966016873843">"Réinitialiser le Wi-Fi, les données mobiles et le Bluetooth"</string>
     <string name="reset_network_desc" msgid="5547979398298881406">"Tous les paramètres réseau seront réinitialisés, y compris les suivants :\n\n"<li>"Wi‑Fi"</li>\n<li>"Données mobiles"</li>\n<li>"Bluetooth"</li></string>
     <string name="reset_network_button_text" msgid="2035676527471089853">"Réinitialiser les paramètres"</string>
@@ -1334,17 +1343,14 @@
     <string name="reset_network_confirm_title" msgid="1759888886976962773">"Réinitialiser ?"</string>
     <string name="network_reset_not_available" msgid="7188610385577164676">"La réinitialisation du réseau n\'est pas disponible pour cet utilisateur."</string>
     <string name="reset_network_complete_toast" msgid="787829973559541880">"Les paramètres des réseaux ont bien été réinitialisés."</string>
-    <string name="master_clear_title" msgid="6617679904229218425">"Effacer toutes les données (Rétablir la configuration d\'usine)"</string>
-    <plurals name="master_clear_with_account_summary" formatted="false" msgid="5911377203778818712">
-      <item quantity="one"><xliff:g id="ACCOUNT_COUNT">%1$d</xliff:g> compte sera réinitialisé</item>
-      <item quantity="other"><xliff:g id="ACCOUNT_COUNT">%1$d</xliff:g> comptes seront réinitialisés</item>
-    </plurals>
-    <string name="master_clear_summary" msgid="6902443944660426951">"La mémoire de stockage interne et toutes les données seront réinitialisées"</string>
+    <string name="master_clear_title" msgid="3531267871084279512">"Effacer toutes les données (rétablir la configuration d\'usine)"</string>
     <string name="master_clear_desc" product="tablet" msgid="9146059417023157222">"Cette action effacera toutes les données de la "<b>"mémoire de stockage interne"</b>" de votre tablette, y compris :\n\n"<li>"Votre compte Google"</li>\n<li>"Les données et paramètres du système et des applications"</li>\n<li>"Les applications téléchargées"</li></string>
     <string name="master_clear_desc" product="default" msgid="4800386183314202571">"Cette action effacera toutes les données du "<b>"stockage interne"</b>" de votre téléphone, y compris :\n\n"<li>"Votre compte Google"</li>\n<li>"Les données et paramètres du système et des applications"</li>\n<li>"Les applications téléchargées"</li></string>
     <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"Vous êtes actuellement connecté aux comptes suivants :\n"</string>
     <string name="master_clear_other_users_present" product="default" msgid="5161423070702470742">\n\n"D\'autres personnes utilisent cet appareil.\n"</string>
     <string name="master_clear_desc_also_erases_external" msgid="1903185203791274237"><li>"La musique"</li>\n<li>"Les photos"</li>\n<li>"Les autres données utilisateur"</li>"."</string>
+    <string name="master_clear_desc_also_erases_esim" msgid="312352697653096008"><li>"Opérateurs sur la carte eSIM"</li></string>
+    <string name="master_clear_desc_no_cancel_mobile_plan" msgid="5460926449093211144">\n\n"Cette opération n\'annulera pas votre forfait mobile."</string>
     <string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="7744115866662613411">\n\n"Pour supprimer la musique, les photos et les autres données utilisateur, vous devez effacer la "<b>"mémoire de stockage USB"</b>"."</string>
     <string name="master_clear_desc_erase_external_storage" product="default" msgid="4801026652617377093">\n\n"Pour supprimer la musique, les photos et les autres données utilisateur, vous devez formater la "<b>"carte SD"</b>"."</string>
     <string name="erase_external_storage" product="nosdcard" msgid="969364037450286809">"Effacer la mémoire USB"</string>
@@ -1461,15 +1467,16 @@
     <string name="settings_safetylegal_activity_title" msgid="6901214628496951727">"Informations de sécurité"</string>
     <string name="settings_safetylegal_activity_unreachable" msgid="250674109915859456">"Vous n\'avez pas de connexion Internet. Pour consulter ces informations maintenant, accédez à %s depuis un ordinateur connecté à Internet."</string>
     <string name="settings_safetylegal_activity_loading" msgid="8059022597639516348">"Chargement…"</string>
-    <string name="lockpassword_choose_your_password_header" msgid="8624900666929394990">"Choisir votre mot de passe"</string>
-    <string name="lockpassword_choose_your_password_header_for_fingerprint" msgid="6624409510609085450">"Pour utiliser votre empreinte, définissez un mot de passe"</string>
-    <string name="lockpassword_choose_your_pattern_header" msgid="6949761069941694050">"Choisir votre schéma"</string>
-    <string name="lockpassword_choose_your_pattern_header_for_fingerprint" msgid="5901096361617543819">"Pour utiliser votre empreinte, définissez un schéma"</string>
-    <string name="lockpassword_choose_your_pin_header" msgid="7598849519816138302">"Choisir votre code PIN"</string>
-    <string name="lockpassword_choose_your_pin_header_for_fingerprint" msgid="765344692615917183">"Pour utiliser votre empreinte, définissez un code PIN"</string>
-    <string name="lockpassword_confirm_your_password_header" msgid="6308478184889846633">"Confirmez le mot de passe."</string>
+    <string name="lockpassword_choose_your_screen_lock_header" msgid="3872462096767152394">"Configurer le verrouillage de l\'écran"</string>
+    <string name="lockpassword_choose_your_password_message" msgid="1197569283524841412">"Pour des raisons de sécurité, définissez un mot de passe"</string>
+    <string name="lockpassword_choose_your_password_header_for_fingerprint" msgid="2541818487015343503">"Pour utiliser empreinte, définissez mot de passe"</string>
+    <string name="lockpassword_choose_your_pattern_header_for_fingerprint" msgid="7709785406243556723">"Pour utiliser empreinte, définissez schéma"</string>
+    <string name="lockpassword_choose_your_pin_message" msgid="1875420718677275646">"Pour des raisons de sécurité, définissez un code"</string>
+    <string name="lockpassword_choose_your_pin_header_for_fingerprint" msgid="1549639053195796674">"Pour utiliser empreinte, définissez code"</string>
+    <string name="lockpassword_choose_your_pattern_message" msgid="5986983400689720015">"Pour des raisons de sécurité, définissez un schéma"</string>
+    <string name="lockpassword_confirm_your_password_header" msgid="1266027268220850931">"Saisissez de nouveau votre mot de passe"</string>
     <string name="lockpassword_confirm_your_pattern_header" msgid="7543433733032330821">"Confirmez votre schéma"</string>
-    <string name="lockpassword_confirm_your_pin_header" msgid="49038294648213197">"Confirmez votre code PIN."</string>
+    <string name="lockpassword_confirm_your_pin_header" msgid="7744513791910572550">"Saisissez de nouveau votre code"</string>
     <string name="lockpassword_confirm_passwords_dont_match" msgid="5140892109439191415">"Les mots de passe ne correspondent pas."</string>
     <string name="lockpassword_confirm_pins_dont_match" msgid="7226244811505606217">"Les codes PIN ne correspondent pas."</string>
     <string name="lockpassword_choose_lock_generic_header" msgid="3811438094903786145">"Méthode de déverrouillage"</string>
@@ -1488,6 +1495,12 @@
     <string name="lockpassword_strong_auth_required_work_pattern" msgid="3003781907040522053">"Pour plus de sécurité, utilisez le schéma du profil professionnel"</string>
     <string name="lockpassword_strong_auth_required_work_pin" msgid="3367491332598821552">"Pour plus de sécurité, saisissez le code du profil professionnel"</string>
     <string name="lockpassword_strong_auth_required_work_password" msgid="8159775129968582940">"Pour plus de sécurité, saisissez le mot de passe du profil professionnel"</string>
+    <string name="lockpassword_confirm_your_pattern_details_frp" msgid="6757336656791723193">"La configuration d\'usine du téléphone a été rétablie. Pour l\'utiliser, dessinez le schéma précédent."</string>
+    <string name="lockpassword_confirm_your_pin_details_frp" msgid="826520613445990470">"La configuration d\'usine du téléphone a été rétablie. Pour l\'utiliser, saisissez le code précédent."</string>
+    <string name="lockpassword_confirm_your_password_details_frp" msgid="8944081074615739040">"La configuration d\'usine du téléphone a été rétablie. Pour l\'utiliser, saisissez mot passe précédent."</string>
+    <string name="lockpassword_confirm_your_pattern_header_frp" msgid="2898036091609128286">"Valider le schéma"</string>
+    <string name="lockpassword_confirm_your_pin_header_frp" msgid="4141601774778898803">"Valider le code"</string>
+    <string name="lockpassword_confirm_your_password_header_frp" msgid="3762615419295360480">"Valider le mot de passe"</string>
     <string name="lockpassword_invalid_pin" msgid="15588049067548470">"Code d\'accès incorrect."</string>
     <string name="lockpassword_invalid_password" msgid="4038507398784975200">"Mot de passe incorrect."</string>
     <string name="lockpattern_need_to_unlock_wrong" msgid="1745247595356012176">"Schéma incorrect."</string>
@@ -1537,7 +1550,6 @@
     <string name="install_applications_title" msgid="4987712352256508946">"Autoriser toutes sources appli"</string>
     <string name="recent_app_category_title" msgid="6673071268966003928">"Applications ouvertes récemment"</string>
     <string name="see_all_apps_title" msgid="1317153498074308438">"Afficher les <xliff:g id="COUNT">%1$d</xliff:g> applications"</string>
-    <string name="recent_app_summary" msgid="3366446669844932300">"Il y a <xliff:g id="TIME">^1</xliff:g>"</string>
     <string name="install_all_warning" product="tablet" msgid="8310489909586138165">"Votre tablette et vos données personnelles sont très vulnérables aux attaques provenant d\'applications inconnues. En installant des applications provenant de cette source, vous acceptez d\'être le seul responsable de tout dommage causé à votre tablette ou de toute perte de données pouvant découler de l\'utilisation de telles applications."</string>
     <string name="install_all_warning" product="default" msgid="1952257127370115988">"Votre téléphone et vos données personnelles sont très vulnérables aux attaques provenant d\'applications inconnues. En installant des applications provenant de cette source, vous acceptez d\'être le seul responsable de tout dommage causé à votre téléphone ou de toute perte de données pouvant découler de l\'utilisation de telles applications."</string>
     <string name="advanced_settings" msgid="1777249286757067969">"Paramètres avancés"</string>
@@ -1561,7 +1573,7 @@
     <string name="total_size_label" msgid="1048676419552557254">"Total"</string>
     <string name="application_size_label" msgid="7376689739076506885">"Taille d\'application"</string>
     <string name="external_code_size_label" msgid="3459343140355961335">"Application sur USB"</string>
-    <string name="data_size_label" msgid="6117971066063850416">"Informations sur l\'utilisateur"</string>
+    <string name="data_size_label" msgid="6117971066063850416">"Données utilisateur"</string>
     <string name="external_data_size_label" product="nosdcard" msgid="7533821466482000453">"Données sur USB"</string>
     <string name="external_data_size_label" product="default" msgid="626414192825329708">"Carte SD"</string>
     <string name="uninstall_text" msgid="3644892466144802466">"Désinstaller"</string>
@@ -1801,7 +1813,7 @@
     <string name="accessibility_settings_summary" msgid="981260486011624939">"Lecteurs d\'écran, affichage, contrôles par interaction"</string>
     <string name="vision_settings_title" msgid="4204111425716868288">"Paramètres visuels"</string>
     <string name="vision_settings_description" msgid="5679491180156408260">"Vous pouvez personnaliser cet appareil en fonction de vos besoins et modifier ces fonctionnalités d\'accessibilité ultérieurement dans les paramètres."</string>
-    <string name="vision_settings_suggestion_title" msgid="917294957154878441">"Augmenter la taille de la police"</string>
+    <string name="vision_settings_suggestion_title" msgid="8058794060304707004">"Modifier la taille de la police"</string>
     <string name="screen_reader_category_title" msgid="7739154903913400641">"Lecteurs d\'écran"</string>
     <string name="audio_and_captions_category_title" msgid="3420727114421447524">"Audio et texte à l\'écran"</string>
     <string name="display_category_title" msgid="685461049938269166">"Écran"</string>
@@ -1838,7 +1850,6 @@
     <string name="accessibility_display_inversion_preference_subtitle" msgid="7052959202195368109">"Peut affecter les performances"</string>
     <string name="accessibility_autoclick_preference_title" msgid="7014499339068449623">"Clic après immobilisation du curseur"</string>
     <string name="accessibility_autoclick_delay_preference_title" msgid="3962261178385106006">"Délai précédant le clic"</string>
-    <string name="preference_summary_default_combination" msgid="8532964268242666060">"<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">"ACTIVÉ"</string>
     <string name="accessibility_summary_state_disabled" msgid="2241315620132005595">"DÉSACTIVÉ"</string>
     <string name="enable_quick_setting" msgid="2366999897816894536">"Afficher dans la fenêtre de configuration rapide"</string>
@@ -1957,12 +1968,14 @@
     <string name="background_activity_summary_on" msgid="649282072540085599">"L\'application peut s\'exécuter en arrière-plan lorsque l\'appareil est inactif"</string>
     <string name="background_activity_summary_off" msgid="7666330699090632040">"L\'activité en arrière-plan de l\'application est limitée lorsque l\'appareil est inactif"</string>
     <string name="background_activity_summary_disabled" msgid="3710669050484599847">"Application non autorisée à s\'exécuter en arrière-plan"</string>
+    <string name="background_activity_summary_whitelisted" msgid="7375400051141016808">"Impossible d\'optimiser l\'application pour l\'utilisation de la batterie"</string>
+    <string name="background_activity_warning_dialog_title" msgid="2216249969149568871">"Limiter l\'activité en arrière-plan ?"</string>
+    <string name="background_activity_warning_dialog_text" msgid="7049624449246121981">"Si vous limitez l\'activité en arrière-plan d\'une application, cela peut provoquer son dysfonctionnement"</string>
     <string name="device_screen_usage" msgid="3386088035570409683">"Utilisation de l\'écran depuis la dernière charge complète"</string>
     <string name="device_screen_consumption" msgid="4607589286438986687">"Consommation d\'énergie de l\'écran"</string>
     <string name="device_cellular_network" msgid="4724773411762382950">"Recherche de réseaux mobiles"</string>
-    <string name="power_last_full_charge_summary" msgid="532845389094620657">"Il y a <xliff:g id="TIME">^1</xliff:g>"</string>
-    <string name="power_usage_list_summary" msgid="6775339745194635000">"Utilisation des applications depuis la charge complète (il y a <xliff:g id="TIME">^1</xliff:g>)"</string>
-    <string name="power_usage_list_summary_device" msgid="7036566616386864302">"Utilisation de l\'appareil depuis la charge complète (il y a <xliff:g id="TIME">^1</xliff:g>)"</string>
+    <string name="power_usage_list_summary" msgid="6393929085382334341">"Utilisation par les applications depuis la charge complète (<xliff:g id="RELATIVE_TIME">^1</xliff:g>)"</string>
+    <string name="power_usage_list_summary_device" msgid="4461926045610455423">"Utilisation par l\'appareil depuis la charge complète (<xliff:g id="RELATIVE_TIME">^1</xliff:g>)"</string>
     <string name="screen_usage_summary" msgid="6687403051423153550">"Durée d\'activation de l\'écran depuis la charge complète"</string>
     <string name="device_usage_list_summary" msgid="5623036661468763251">"Utilisation de l\'appareil depuis la charge complète"</string>
     <string name="battery_since_unplugged" msgid="338073389740738437">"Utilisation de la batterie depuis le débranchement"</string>
@@ -2208,14 +2221,14 @@
     <string name="credentials_unlock_hint" msgid="2301301378040499348">"Saisir le mot de passe de stockage des identifiants"</string>
     <string name="credentials_old_password" msgid="7553393815538684028">"Mot de passe actuel :"</string>
     <string name="credentials_reset_hint" msgid="6297256880896133631">"Supprimer l\'intégralité du contenu ?"</string>
-    <string name="credentials_password_too_short" msgid="7502749986405522663">"Le mot de passe doit contenir au moins 8 caractères."</string>
     <string name="credentials_wrong_password" msgid="2541932597104054807">"Mot de passe incorrect"</string>
     <string name="credentials_reset_warning" msgid="5320653011511797600">"Mot de passe incorrect. Vous disposez d\'une tentative supplémentaire avant la suppression des identifiants."</string>
     <string name="credentials_reset_warning_plural" msgid="6514085665301095279">"Mot de passe incorrect. Vous disposez de <xliff:g id="NUMBER">%1$d</xliff:g> tentatives supplémentaires avant la suppression des identifiants."</string>
     <string name="credentials_erased" msgid="2907836028586342969">"Les identifiants sont effacés."</string>
     <string name="credentials_not_erased" msgid="7685932772284216097">"Impossible eff. stockage identifiants."</string>
     <string name="credentials_enabled" msgid="7588607413349978930">"Stockage des identifiants activé"</string>
-    <string name="credentials_configure_lock_screen_hint" msgid="6757119179588664966">"Avant d\'utiliser le stockage d\'identifiants, vous devez définir un code ou un mot de passe pour le verrouillage d\'écran."</string>
+    <string name="credentials_configure_lock_screen_hint" msgid="8058230497337529036">"Avant de pouvoir utiliser le stockage des identifiants, vous devez définir un écran de verrouillage sécurisé sur votre appareil"</string>
+    <string name="credentials_configure_lock_screen_button" msgid="253239765216055321">"DÉFINIR VERROUILLAGE"</string>
     <string name="usage_access_title" msgid="332333405495457839">"Applis accédant aux infos utilisation"</string>
     <string name="emergency_tone_title" msgid="1055954530111587114">"Sonnerie d\'urgence"</string>
     <string name="emergency_tone_summary" msgid="722259232924572153">"Définir le comportement en cas d\'appel d\'urgence"</string>
@@ -2335,8 +2348,6 @@
     <skip />
     <string name="cant_sync_dialog_title" msgid="2777238588398046285">"Impossible de procéder à la synchronisation manuelle."</string>
     <string name="cant_sync_dialog_message" msgid="1938380442159016449">"La synchronisation de cet élément est actuellement désactivée. Pour modifier ce paramètre, activez temporairement les données en arrière-plan et la synchronisation automatique."</string>
-    <string name="wimax_settings" msgid="2655139497028469039">"4G"</string>
-    <string name="status_wimax_mac_address" msgid="8390791848661413416">"Adresse MAC 4G"</string>
     <string name="enter_password" msgid="8035706727471334122">"Pour lancer Android, saisissez votre mot de passe."</string>
     <string name="enter_pin" msgid="5305333588093263790">"Pour lancer Android, saisissez votre code PIN."</string>
     <string name="enter_pattern" msgid="4187435713036808566">"Pour lancer Android, dessinez votre schéma."</string>
@@ -2350,6 +2361,7 @@
     <string name="misc_files_selected_count" msgid="4647048020823912088">"<xliff:g id="NUMBER">%1$d</xliff:g> fichiers sélectionnés sur <xliff:g id="TOTAL">%2$d</xliff:g>"</string>
     <string name="misc_files_selected_count_bytes" msgid="2876232009069114352">"<xliff:g id="NUMBER">%1$s</xliff:g> sur <xliff:g id="TOTAL">%2$s</xliff:g>"</string>
     <string name="select_all" msgid="1562774643280376715">"Tout sélectionner"</string>
+    <string name="data_plan_usage_manage_plans_button_text" msgid="8997761990902708162">"Gérer les forfaits"</string>
     <string name="data_usage_summary_title" msgid="3804110657238092929">"Consommation des données"</string>
     <string name="data_usage_app_summary_title" msgid="4147258989837459172">"Conso données"</string>
     <string name="data_usage_accounting" msgid="7170028915873577387">"Le suivi de la consommation effectué par votre opérateur peut différer de celui de votre appareil."</string>
@@ -2435,6 +2447,9 @@
     <string name="data_usage_metered_mobile" msgid="5423305619126978393">"Réseaux mobiles"</string>
     <string name="data_usage_metered_wifi" msgid="1761738002328299714">"Réseaux Wi-Fi facturés à l\'usage"</string>
     <string name="data_usage_metered_wifi_disabled" msgid="727808462375941567">"Activez le Wi‑Fi pour accéder à des réseaux facturés à l\'usage."</string>
+    <string name="data_usage_metered_auto" msgid="1262028400911918865">"Automatique"</string>
+    <string name="data_usage_metered_yes" msgid="9217539611385225894">"Facturé à l\'usage"</string>
+    <string name="data_usage_metered_no" msgid="4025232961929071789">"Non facturé à l\'usage"</string>
     <string name="data_usage_disclaimer" msgid="6887858149980673444">"Le suivi de conso effectué par l\'opérateur 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>
@@ -2526,9 +2541,6 @@
     <string name="backup_pw_set_button_text" msgid="2387480910044648795">"Définir le mot de passe de sauvegarde"</string>
     <string name="backup_pw_cancel_button_text" msgid="8845630125391744615">"Annuler"</string>
     <string name="additional_system_update_settings_list_item_title" msgid="214987609894661992">"Mises à jour supplémentaires du système"</string>
-    <string name="selinux_status_disabled" msgid="924551035552323327">"Désactivé"</string>
-    <string name="selinux_status_permissive" msgid="6004965534713398778">"Permissif"</string>
-    <string name="selinux_status_enforcing" msgid="2252703756208463329">"Application"</string>
     <string name="ssl_ca_cert_warning" msgid="2045866713601984673">"Il est possible que le réseau soit surveillé."</string>
     <string name="done_button" msgid="1991471253042622230">"OK"</string>
     <plurals name="ssl_ca_cert_dialog_title" formatted="false" msgid="7145092748045794650">
@@ -2571,7 +2583,7 @@
     <string name="user_add_user_message_long" msgid="8562152293752222985">"Vous pouvez partager cet appareil avec d\'autres personnes en ajoutant des utilisateurs. Chaque utilisateur dispose de son propre espace, où il peut personnaliser ses applications et son fond d\'écran, entre autres. Chacun des utilisateur peut également modifier les paramètres de l\'appareil qui s\'appliquent à tous les utilisateurs, tels que le Wi-Fi.\n\nLorsque vous ajoutez un utilisateur, celui-ci doit configurer son espace.\n\nN\'importe quel utilisateur peut mettre à jour les applications pour tous les autres utilisateurs."</string>
     <string name="user_add_user_message_short" msgid="1511354412249044381">"Lorsque vous ajoutez un utilisateur, celui-ci doit configurer son espace.\n\nN\'importe quel utilisateur peut mettre à jour les applications pour tous les autres utilisateurs."</string>
     <string name="user_setup_dialog_title" msgid="1765794166801864563">"Configurer l\'utilisateur ?"</string>
-    <string name="user_setup_dialog_message" msgid="1004068621380867148">"Assurez-vous que la personne est disponible, et qu\'elle peut utiliser l\'appareil pour configurer son espace."</string>
+    <string name="user_setup_dialog_message" msgid="1004068621380867148">"Assurez-vous que la personne est prête à utiliser l\'appareil et configurer son espace."</string>
     <string name="user_setup_profile_dialog_message" msgid="3896568553327558731">"Configurer le profil maintenant ?"</string>
     <string name="user_setup_button_setup_now" msgid="3391388430158437629">"Configurer"</string>
     <string name="user_setup_button_setup_later" msgid="3068729597269172401">"Pas maintenant"</string>
@@ -2580,7 +2592,7 @@
     <string name="user_cannot_add_accounts_message" msgid="5116692653439737050">"Les profils limités ne peuvent pas ajouter de compte."</string>
     <string name="user_remove_user_menu" msgid="6897150520686691355">"Supp. <xliff:g id="USER_NAME">%1$s</xliff:g> de l\'appareil"</string>
     <string name="user_lockscreen_settings" msgid="4965661345247084878">"Paramètres de l\'écran de verrouillage"</string>
-    <string name="user_add_on_lockscreen_menu" msgid="9072312646546364619">"Ajouter des utilisateurs depuis l\'écran de verrouillage"</string>
+    <string name="user_add_on_lockscreen_menu" msgid="9072312646546364619">"Ajouter utilisateurs depuis écran de verrouillage"</string>
     <string name="user_new_user_name" msgid="369856859816028856">"Nouvel utilisateur"</string>
     <string name="user_new_profile_name" msgid="2632088404952119900">"Nouveau profil"</string>
     <string name="user_confirm_remove_self_title" msgid="8432050170899479556">"Supprimer cet utilisateur ?"</string>
@@ -2640,10 +2652,10 @@
     <string name="support_summary" msgid="2705726826263742491">"Articles d\'aide, téléphone et chat, premiers pas"</string>
     <string name="user_account_title" msgid="1127193807312271167">"Compte pour contenu"</string>
     <string name="user_picture_title" msgid="7297782792000291692">"ID de photo"</string>
-    <string name="extreme_threats_title" msgid="6549541803542968699">"Menaces graves"</string>
-    <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="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="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>
@@ -2726,6 +2738,7 @@
       <item quantity="one">Afficher %d élément masqué</item>
       <item quantity="other">Afficher %d éléments masqués</item>
     </plurals>
+    <string name="dashboard_suggestion_condition_footer_content_description" msgid="2898588191174845961">"Réduire"</string>
     <string name="network_dashboard_title" msgid="4771589228992391573">"Réseau et Internet"</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>
@@ -2828,8 +2841,14 @@
       <item quantity="one"><xliff:g id="ON_COUNT">%d</xliff:g> règle automatique activée</item>
       <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 uniquement"</string>
+    <string name="zen_mode_settings_title" msgid="1066226840983908121">"Ne pas déranger"</string>
+    <string name="zen_mode_behavior_settings_title" msgid="1463303933529313969">"Comportement"</string>
+    <string name="zen_mode_behavior_allow_title" msgid="3845615648136218141">"Autoriser sons et vibrations de"</string>
+    <string name="zen_mode_behavior_no_sound" msgid="1219626004723208056">"Aucun son"</string>
+    <string name="zen_mode_behavior_total_silence" msgid="6716603819806610626">"Aucun son (silence total)"</string>
+    <string name="zen_mode_behavior_no_sound_except" msgid="4968477585788243114">"Aucun son, sauf <xliff:g id="CATEGORIES">%1$s</xliff:g>"</string>
+    <!-- no translation found for zen_mode_behavior_alarms_only (2423480992071472963) -->
+    <skip />
     <string name="zen_mode_automation_settings_title" msgid="4228995740594063774">"Règles automatiques"</string>
     <string name="zen_mode_automation_suggestion_title" msgid="5105443455143476201">"Définir règles Ne pas déranger"</string>
     <string name="zen_mode_automation_suggestion_summary" msgid="4732808039946935657">"Limiter les sons et le vibreur"</string>
@@ -2871,13 +2890,15 @@
     <string name="notifications_title" msgid="8086372779371204971">"Notifications"</string>
     <string name="app_notifications_title" msgid="5810577805218003760">"Notifications appli"</string>
     <string name="notification_channel_title" msgid="2260666541030178452">"Catégorie de la notification"</string>
+    <string name="notification_group_title" msgid="7180506440133859601">"Groupe de notifications"</string>
     <string name="notification_importance_title" msgid="848692592679312666">"Importance"</string>
-    <string name="notification_importance_unspecified" msgid="2196023702875112081">"Laisser l\'application décider"</string>
+    <string name="notification_importance_unspecified" msgid="6622173510486113958">"Émettre un signal sonore"</string>
     <string name="notification_importance_blocked" msgid="7938180808339386300">"Ne jamais afficher les notifications"</string>
     <string name="notification_importance_min" msgid="5455049524984686275">"Aucune interruption sonore ni visuelle"</string>
     <string name="notification_importance_low" msgid="8881468429453766553">"Pas de signal sonore"</string>
     <string name="notification_importance_default" msgid="5958338024601957516">"Alerte sonore"</string>
     <string name="notification_importance_high" msgid="2082429479238228527">"Alerte sonore et affichage à l\'écran"</string>
+    <string name="notification_importance_high_silent" msgid="2667033773703765252">"Afficher sur l\'écran"</string>
     <string name="notification_importance_min_title" msgid="6974673091137544803">"Faible"</string>
     <string name="notification_importance_low_title" msgid="8131254047772814309">"Moyenne"</string>
     <string name="notification_importance_default_title" msgid="9120383978536089489">"Élevée"</string>
@@ -2920,8 +2941,13 @@
     <string name="loading_notification_apps" msgid="5031818677010335895">"Chargement des applications en cours…"</string>
     <string name="app_notifications_off_desc" msgid="4882445501376722969">"Android bloque l\'affichage des notifications de cette application sur cet appareil"</string>
     <string name="channel_notifications_off_desc" msgid="5899225298718840635">"Android bloque l\'affichage de cette catégorie de notifications sur cet appareil"</string>
+    <string name="channel_group_notifications_off_desc" msgid="1620950416247316370">"Android bloque l\'affichage de ce groupe de notifications sur cet appareil"</string>
     <string name="notification_channels" msgid="5346841743182627500">"Catégories"</string>
     <string name="notification_channels_other" msgid="5645317113885788226">"Autres"</string>
+    <plurals name="notification_group_summary" formatted="false" msgid="3420621520561455358">
+      <item quantity="one"><xliff:g id="COUNT_1">%d</xliff:g> catégorie</item>
+      <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> catégories</item>
+    </plurals>
     <string name="no_channels" msgid="3077375508177744586">"Cette application n\'a publié aucune notification"</string>
     <string name="app_settings_link" msgid="8894946007543660906">"Paramètres supplémentaires dans l\'application"</string>
     <string name="app_notification_listing_summary_zero" msgid="6482582965081108108">"Activé pour toutes les applications"</string>
@@ -2998,12 +3024,14 @@
     <string name="zen_mode_from_starred" msgid="2678345811950997027">"Des contacts favoris uniquement"</string>
     <string name="zen_mode_from_none" msgid="8219706639954614136">"Aucun"</string>
     <string name="zen_mode_alarms" msgid="2165302777886552926">"Alarmes"</string>
+    <!-- no translation found for zen_mode_media_system_other (8900209390529859777) -->
+    <skip />
     <string name="zen_mode_reminders" msgid="5458502056440485730">"Rappels"</string>
     <string name="zen_mode_events" msgid="7914446030988618264">"Événements"</string>
     <string name="zen_mode_all_callers" msgid="584186167367236922">"Tous les appelants"</string>
     <string name="zen_mode_selected_callers" msgid="3127598874060615742">"Appelants sélectionnés"</string>
     <string name="zen_mode_repeat_callers" msgid="5019521886428322131">"Appels répétés"</string>
-    <string name="zen_mode_repeat_callers_summary" msgid="7192713032364140137">"Autoriser le second appel si la même personne appelle deux fois en <xliff:g id="MINUTES">%d</xliff:g> minute(s)"</string>
+    <string name="zen_mode_repeat_callers_summary" msgid="239685342222975733">"Si la même personne appelle deux fois en <xliff:g id="MINUTES">%d</xliff:g> minute(s)"</string>
     <string name="zen_mode_when" msgid="2767193283311106373">"Activation auto"</string>
     <string name="zen_mode_when_never" msgid="8809494351918405602">"Jamais"</string>
     <string name="zen_mode_when_every_night" msgid="3122486110091921009">"Tous les soirs"</string>
@@ -3032,6 +3060,7 @@
     <string name="zen_mode_screen_off_visual_interruptions" msgid="4850792880144382633">"Lorsque l\'écran est éteint"</string>
     <string name="zen_mode_no_visual_interruptions" msgid="8742776003822778472">"Lorsque l\'écran est allumé ou éteint"</string>
     <string name="notification_app_settings_button" msgid="6685640230371477485">"Paramètres de notification"</string>
+    <string name="suggestion_button_text" msgid="3275010948381252006">"OK"</string>
     <string name="device_feedback" msgid="3238056036766293294">"Envoyer commentaires sur appareil"</string>
     <string name="restr_pin_enter_admin_pin" msgid="1085834515677448072">"Saisir le code d\'accès administrateur"</string>
     <string name="switch_on_text" msgid="1124106706920572386">"Activé"</string>
@@ -3144,9 +3173,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">"Application de navigateur"</string>
+    <string name="default_browser_title" msgid="8101772675085814670">"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>
@@ -3201,8 +3230,8 @@
     <string name="decline_remote_bugreport_action" msgid="518720235407565134">"Refuser"</string>
     <string name="usb_use_charging_only" msgid="2180443097365214467">"Recharger cet appareil"</string>
     <string name="usb_use_charging_only_desc" msgid="3066256793008540627">"Uniquement pour charger cet appareil"</string>
-    <string name="usb_use_power_only" msgid="6426550616883919530">"Fournir l\'alimentation"</string>
-    <string name="usb_use_power_only_desc" msgid="3461232831015575152">"Charger l\'appareil connecté. Ne fonctionne qu\'avec les appareils compatibles avec le rechargement USB."</string>
+    <string name="usb_use_power_only" msgid="6426550616883919530">"Fournir du courant"</string>
+    <string name="usb_use_power_only_desc" msgid="3461232831015575152">"Permet de recharger les appareils connectés compatibles avec le rechargement USB."</string>
     <string name="usb_use_file_transfers" msgid="7409600791007250137">"Transférer des fichiers"</string>
     <string name="usb_use_file_transfers_desc" msgid="4235764784331804488">"Transférer des fichiers vers un autre appareil"</string>
     <string name="usb_use_photo_transfers" msgid="7794775645350330454">"Transférer des photos (PTP)"</string>
@@ -3216,6 +3245,7 @@
     <string name="usb_summary_file_transfers" msgid="6435943692610175111">"Transfert de fichiers"</string>
     <string name="usb_summary_photo_transfers" msgid="8440204169576585250">"Transfert de photos (PTP)"</string>
     <string name="usb_summary_MIDI" msgid="5687906612187885908">"Utilisation de l\'appareil en tant que MIDI"</string>
+    <string name="sms_mirroring_pref" msgid="6475043279147376031">"Duplication de SMS"</string>
     <string name="background_check_pref" msgid="7550258400138010979">"Vérification en arrière-plan"</string>
     <string name="background_check_title" msgid="4534254315824525593">"Accès complet à l\'arrière-plan"</string>
     <string name="assist_access_context_title" msgid="2269032346698890257">"Utiliser le texte affiché à l\'écran"</string>
@@ -3282,7 +3312,7 @@
     <string name="write_settings_title" msgid="4232152481902542284">"Peut modifier les paramètres système"</string>
     <string name="write_system_settings" msgid="3482913590601096763">"Modifier paramètres système"</string>
     <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="permit_write_settings" msgid="658555006453212691">"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>
@@ -3377,9 +3407,12 @@
     <string name="color_temperature" msgid="2070126836910615605">"Température des couleurs froides"</string>
     <string name="color_temperature_desc" msgid="4793729830226404052">"Utiliser des couleurs plus froides à l\'écran"</string>
     <string name="color_temperature_toast" msgid="4974218172133854827">"Pour appliquer la modification des couleurs, éteignez l\'écran."</string>
-    <string name="telephony_monitor_toast" msgid="7003764250271195384">"Pour appliquer la modification effectuée par Telephony Monitor, redémarrez l\'appareil"</string>
+    <string name="connectivity_monitor_switch" msgid="9059759348648583421">"ConnectivityMonitor"</string>
+    <string name="connectivity_monitor_switch_summary" msgid="2828658652378866401">"ConnectivityMonitor recueille des journaux lorsqu\'il détecte un problème de connectivité, puis invite l\'utilisateur à créer un bug"</string>
+    <string name="connectivity_monitor_toast" msgid="5551859612881173028">"Pour appliquer la modification effectuée par ConnectivityMonitor, redémarrez l\'appareil"</string>
     <string name="camera_hal_hdrplus_switch" msgid="8377365197105267466">"Fonction HDR+ HAL de la caméra"</string>
     <string name="camera_hal_hdrplus_toast" msgid="2063703797270055299">"Pour activer la fonction HDR+ dans l\'HAL de la caméra, redémarrez l\'appareil"</string>
+    <string name="camera_laser_sensor_switch" msgid="8913588990743234440">"Capteur du laser de l\'appareil photo"</string>
     <string name="ota_disable_automatic_update" msgid="2319639631655915050">"Mises à jour automatiques du système"</string>
     <string name="usage" msgid="2977875522080448986">"Consommation"</string>
     <string name="cellular_data_usage" msgid="2155683719898158203">"Consommation des données mobiles"</string>
@@ -3405,7 +3438,7 @@
     <string name="data_warning" msgid="209133958008062117">"Seuil d\'avertissement"</string>
     <string name="set_data_limit" msgid="2901526323210516923">"Définir une limite"</string>
     <string name="data_limit" msgid="1885406964934590552">"Limite de données"</string>
-    <string name="data_usage_template" msgid="392191945602400904">"<xliff:g id="ID_1">%1$s</xliff:g> utilisé(s) pendant la période : <xliff:g id="ID_2">%2$s</xliff:g>"</string>
+    <string name="data_usage_template" msgid="2923744765873163859">"<xliff:g id="ID_1">%1$s</xliff:g> utilisés pour la période : <xliff:g id="ID_2">%2$s</xliff:g>"</string>
     <string name="configure" msgid="1029654422228677273">"Configurer"</string>
     <string name="data_usage_other_apps" msgid="3272872663517382050">"Autres applications incluses dans la consommation"</string>
     <plurals name="data_saver_unrestricted_summary" formatted="false" msgid="2635267833484232703">
@@ -3429,7 +3462,7 @@
     <string name="suggestion_additional_fingerprints_summary" msgid="5471253233176471245">"Déverrouiller avec un autre doigt"</string>
     <string name="battery_saver_on_summary" msgid="9072203872401530722">"Activé/<xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="battery_saver_off_summary" msgid="8309471955051162327">"Désactivé/<xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="battery_saver_desc_turn_on_auto_never" msgid="6715896635178578813">"ne jamais activer automatiquement"</string>
+    <string name="battery_saver_desc_turn_on_auto_never" msgid="6715896635178578813">"Ne jamais activer automatiquement"</string>
     <string name="battery_saver_desc_turn_on_auto_pct" msgid="7472323223085636533">"Activer automatiquement lorsque la batterie atteint %1$s"</string>
     <string name="not_battery_optimizing" msgid="5362861851864837617">"Optimisation de la batterie non utilisée"</string>
     <string name="lockscreen_remote_input" msgid="969871538778211843">"Si l\'appareil est verrouillé, empêcher la saisie des réponses ou de texte dans les notifications"</string>
@@ -3474,7 +3507,7 @@
     <string name="button_confirm_convert_fbe" msgid="7101855374850373091">"Effacer et chiffrer"</string>
     <string name="reset_shortcut_manager_throttling" msgid="6495066467198668994">"Réinitialiser la limitation de fréquence ShortcutManager"</string>
     <string name="reset_shortcut_manager_throttling_complete" msgid="1826770872063707900">"La limitation de fréquence ShortcutManager a bien été réinitialisée."</string>
-    <string name="notification_suggestion_title" msgid="4506524937307816475">"Contrôler notifications écran verrouillage"</string>
+    <string name="notification_suggestion_title" msgid="387052719462473500">"Contrôler les informations sur l\'écran de verrouillage"</string>
     <string name="notification_suggestion_summary" msgid="8521159741445416875">"Afficher ou masquer le contenu des notifications"</string>
     <string name="page_tab_title_summary" msgid="4070309266374993258">"Tous"</string>
     <string name="page_tab_title_support" msgid="8483187649355540109">"Aide et conseils"</string>
@@ -3482,7 +3515,7 @@
     <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>
     <string name="premium_sms_access" msgid="4660047004791638305">"Accès aux SMS premium"</string>
-    <string name="bluetooth_disabled" msgid="2456198532288640046">"Non visible par d\'autres appareils"</string>
+    <string name="bluetooth_disabled" msgid="6244000672828617410">"Désactivé"</string>
     <string name="bluetooth_connected_summary" msgid="7672528674593152862">"Connecté à <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="bluetooth_connected_multiple_devices_summary" msgid="9173661896296663932">"Connecté à plusieurs appareils"</string>
     <string name="demo_mode" msgid="2798762752209330277">"Mode de démonstration de l\'interface du système"</string>
@@ -3564,11 +3597,11 @@
     <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="4567020486787561873">"Pour afficher l\'heure, les icônes de notification et d\'autres informations, soulevez votre téléphone."</string>
+    <string name="ambient_display_pickup_summary" product="default" msgid="4567020486787561873">"Pour afficher l\'heure, les icônes de notification et d\'autres informations, saisissez votre téléphone."</string>
     <string name="ambient_display_pickup_summary" product="tablet" msgid="5435283849947236648">"Pour afficher l\'heure, les icônes de notification et d\'autres informations, soulevez votre tablette."</string>
     <string name="ambient_display_pickup_summary" product="device" msgid="8256669101643381568">"Pour afficher l\'heure, les icônes de notification et d\'autres informations, soulevez votre appareil."</string>
     <string name="ambient_display_pickup_suggestion_summary" msgid="7014700589991761035">"Consulter les notifications lorsque l\'écran est éteint"</string>
-    <string name="fingerprint_swipe_for_notifications_title" msgid="5816346492253270243">"Utilisation du lecteur d\'empreinte pour voir les notifications"</string>
+    <string name="fingerprint_swipe_for_notifications_title" msgid="5816346492253270243">"Utiliser le lecteur d\'empreinte pour afficher les notifications"</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="default" msgid="1770661868393713922">"Pour consulter vos notifications, passez votre doigt de haut en bas sur le lecteur d\'empreinte digitale à l\'arrière du téléphone."</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="tablet" msgid="902719947767712895">"Pour consulter vos notifications, passez votre doigt de haut en bas sur le lecteur d\'empreinte digitale à l\'arrière de la tablette."</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="device" msgid="5372926094116306647">"Pour consulter vos notifications, passez votre doigt de haut en bas sur le lecteur d\'empreinte digitale à l\'arrière de l\'appareil."</string>
@@ -3584,7 +3617,7 @@
     <string name="web_action_enable_title" msgid="4051513950976670853">"Applis instantanées"</string>
     <string name="web_action_enable_summary" msgid="3108127559723396382">"Ouvrez des liens dans des applications, même si celles-ci ne sont pas installées"</string>
     <string name="web_action_section_title" msgid="7364647086538399136">"Applis instantanées"</string>
-    <string name="instant_apps_account" msgid="1433620209791992528">"Compte pour les applis instantanées"</string>
+    <string name="instant_apps_settings" msgid="8827777916518348213">"Préférences des applis instantanées"</string>
     <string name="domain_url_section_title" msgid="7046835219056428883">"Applications installées"</string>
     <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>
@@ -3631,7 +3664,9 @@
     <string name="enterprise_privacy_always_on_vpn_personal" msgid="9217774730260037434">"VPN permanent activé dans votre profil personnel"</string>
     <string name="enterprise_privacy_always_on_vpn_work" msgid="7244472958208315814">"VPN permanent activé dans votre profil professionnel"</string>
     <string name="enterprise_privacy_global_http_proxy" msgid="7936664553416257333">"Proxy HTTP global défini"</string>
-    <string name="enterprise_privacy_ca_certs" msgid="5885892204903688909">"Certificats de confiance"</string>
+    <string name="enterprise_privacy_ca_certs_device" msgid="2019652712782510262">"Certificats de confiance"</string>
+    <string name="enterprise_privacy_ca_certs_personal" msgid="2279084820904076599">"Certificats de confiance dans votre profil personnel"</string>
+    <string name="enterprise_privacy_ca_certs_work" msgid="6187377647815301809">"Certificats de confiance dans votre profil professionnel"</string>
     <plurals name="enterprise_privacy_number_ca_certs" formatted="false" msgid="526375234629534165">
       <item quantity="one">Au moins <xliff:g id="COUNT_1">%d</xliff:g> certificat CA</item>
       <item quantity="other">Au moins <xliff:g id="COUNT_1">%d</xliff:g> certificats CA</item>
@@ -3694,6 +3729,8 @@
     <string name="carrier_provisioning" msgid="4398683675591893169">"Informations de gestion des comptes opérateur"</string>
     <string name="trigger_carrier_provisioning" msgid="3434865918009286187">"Déclencher la gestion des comptes opérateur"</string>
     <string name="new_device_suggestion_title" msgid="698847081680980774">"Nouveautés à découvrir"</string>
-    <string name="new_device_suggestion_summary" msgid="7172709269203435870">"Découvrez les cinq fonctionnalités clés"</string>
+    <string name="new_device_suggestion_summary" product="default" msgid="206396571522515855">"Découvrez votre nouveau téléphone"</string>
+    <string name="new_device_suggestion_summary" product="tablet" msgid="393751455688210956">"Découvrez votre nouvelle tablette"</string>
+    <string name="new_device_suggestion_summary" product="device" msgid="2939870049868336652">"Découvrez votre nouvel appareil"</string>
     <string name="disabled_low_ram_device" msgid="3751578499721173344">"Cette fonctionnalité n\'est pas disponible sur cet appareil"</string>
 </resources>
diff --git a/res/values-gl/arrays.xml b/res/values-gl/arrays.xml
index 99d2d5a..b619da0 100644
--- a/res/values-gl/arrays.xml
+++ b/res/values-gl/arrays.xml
@@ -67,7 +67,7 @@
   </string-array>
   <string-array name="wifi_status">
     <item msgid="1922181315419294640"></item>
-    <item msgid="8934131797783724664">"Buscando..."</item>
+    <item msgid="8934131797783724664">"Explorando..."</item>
     <item msgid="8513729475867537913">"Conectando..."</item>
     <item msgid="515055375277271756">"Autenticando…"</item>
     <item msgid="1943354004029184381">"Obtendo enderezo IP..."</item>
@@ -81,7 +81,7 @@
   </string-array>
   <string-array name="wifi_status_with_ssid">
     <item msgid="7714855332363650812"></item>
-    <item msgid="8878186979715711006">"Buscando..."</item>
+    <item msgid="8878186979715711006">"Explorando..."</item>
     <item msgid="355508996603873860">"Conectando con <xliff:g id="NETWORK_NAME">%1$s</xliff:g>…"</item>
     <item msgid="554971459996405634">"Autenticando con <xliff:g id="NETWORK_NAME">%1$s</xliff:g>…"</item>
     <item msgid="7928343808033020343">"Obtendo enderezo IP de <xliff:g id="NETWORK_NAME">%1$s</xliff:g>…"</item>
@@ -100,8 +100,6 @@
     <!-- no translation found for wifi_security_no_eap:0 (2084555984818107151) -->
     <!-- no translation found for wifi_security_no_eap:1 (397579322683471524) -->
     <!-- no translation found for wifi_security_no_eap:2 (1968820975358150484) -->
-    <!-- no translation found for wifi_ap_security:0 (5251664683198623324) -->
-    <!-- no translation found for wifi_ap_security:1 (7989073072260294673) -->
   <string-array name="wifi_eap_method">
     <item msgid="1160193392455075561">"PEAP"</item>
     <item msgid="7981731051382306293">"TLS"</item>
@@ -254,7 +252,7 @@
     <item msgid="8181415497109310680">"ler SMS"</item>
     <item msgid="6816551144382117307">"escribir SMS"</item>
     <item msgid="4600463921908905030">"recibir SMS"</item>
-    <item msgid="5958926493289432745">"recibir SMS de emerxencia"</item>
+    <item msgid="5958926493289432745">"recibir SMS de urxencia"</item>
     <item msgid="4945269495221089540">"recibir MMS"</item>
     <item msgid="5570472453573929087">"recibir WAP push"</item>
     <item msgid="7125408150230860501">"enviar SMS"</item>
@@ -272,7 +270,7 @@
     <item msgid="4547883971364273343">"enfoque de audio"</item>
     <item msgid="2603878814882344450">"volume principal"</item>
     <item msgid="7136963238377062018">"volume da voz"</item>
-    <item msgid="4270236897655923007">"volume do timbre"</item>
+    <item msgid="4270236897655923007">"volume do ton"</item>
     <item msgid="6325739889222559394">"volume multimedia"</item>
     <item msgid="5762123934816216821">"volume da alarma"</item>
     <item msgid="785049718065337473">"volume das notificacións"</item>
@@ -339,7 +337,7 @@
     <item msgid="3265262911688671938">"Enfoque de audio"</item>
     <item msgid="2098976479485046797">"Volume principal"</item>
     <item msgid="5660213838861789350">"Volume da voz"</item>
-    <item msgid="7983336752371254444">"Volume do timbre"</item>
+    <item msgid="7983336752371254444">"Volume do ton"</item>
     <item msgid="7878027809189330917">"Volume multimedia"</item>
     <item msgid="7260546305036218513">"Volume da alarma"</item>
     <item msgid="9103719301075748925">"Volume das notificacións"</item>
diff --git a/res/values-gl/strings.xml b/res/values-gl/strings.xml
index 1cfb4e7..a1cfc48 100644
--- a/res/values-gl/strings.xml
+++ b/res/values-gl/strings.xml
@@ -56,7 +56,7 @@
     <string name="radio_info_ims_reg_status" msgid="7534612158445529715">"Rexistro de IMS: <xliff:g id="STATUS">%1$s</xliff:g>\nVoz por LTE: <xliff:g id="AVAILABILITY_0">%2$s</xliff:g>\nVoz por wifi: <xliff:g id="AVAILABILITY_1">%3$s</xliff:g>\nVideochamada: <xliff:g id="AVAILABILITY_2">%4$s</xliff:g>\nInterface de UT: <xliff:g id="AVAILABILITY_3">%5$s</xliff:g>"</string>
     <string name="radioInfo_service_in" msgid="1697703164394784618">"En servizo"</string>
     <string name="radioInfo_service_out" msgid="7999094221728929681">"Fóra de servizo"</string>
-    <string name="radioInfo_service_emergency" msgid="6274434235469661525">"Só chamadas de emerxencia"</string>
+    <string name="radioInfo_service_emergency" msgid="6274434235469661525">"Só chamadas de urxencia"</string>
     <string name="radioInfo_service_off" msgid="7536423790014501173">"Radio desactivada"</string>
     <string name="radioInfo_roaming_in" msgid="9045363884600341051">"Itinerancia"</string>
     <string name="radioInfo_roaming_not" msgid="4849214885629672819">"Non está en itinerancia"</string>
@@ -166,7 +166,7 @@
     <string name="bluetooth_map_acceptance_dialog_text" msgid="8712508202081143737">"%1$s quere acceder ás túas mensaxes. Queres conceder acceso a %2$s?"</string>
     <string name="bluetooth_sap_request" msgid="2669762224045354417">"Solicitude de acceso á SIM"</string>
     <string name="bluetooth_sap_acceptance_dialog_text" msgid="4414253873553608690">"<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g> quere acceder á túa tarxeta SIM. Ao outorgar acceso á tarxeta SIM desactivarase a conectividade de datos no teu dispositivo durante a conexión. Outorgar acceso a <xliff:g id="DEVICE_NAME_1">%2$s?</xliff:g>"</string>
-    <string name="bluetooth_device_name_summary" msgid="4757990010751789977">"Visible como \"<xliff:g id="DEVICE_NAME">^1</xliff:g>\" para os demais dispositivos"</string>
+    <string name="bluetooth_device_name_summary" msgid="522235742194965734">"Visible como \"<xliff:g id="DEVICE_NAME">^1</xliff:g>\" para outros dispositivos"</string>
     <string name="bluetooth_paired_device_title" msgid="8638994696317952019">"Os teus dispositivos"</string>
     <string name="bluetooth_pairing_page_title" msgid="7712127387361962608">"Sincronizar dispositivo novo"</string>
     <string name="date_and_time" msgid="9062980487860757694">"Data e hora"</string>
@@ -243,8 +243,8 @@
     <string name="sdcard_settings_bad_removal_status" product="nosdcard" msgid="7761390725880773697">"USB extraído durante uso."</string>
     <string name="sdcard_settings_bad_removal_status" product="default" msgid="5145797653495907970">"A tarxeta SD extraeuse mentres estaba en uso."</string>
     <string name="sdcard_settings_used_bytes_label" msgid="8820289486001170836">"Bytes utilizados:"</string>
-    <string name="sdcard_settings_scanning_status" product="nosdcard" msgid="7503429447676219564">"Buscando ficheiros no USB…"</string>
-    <string name="sdcard_settings_scanning_status" product="default" msgid="2763464949274455656">"Buscando multimedia na tarxeta SD…"</string>
+    <string name="sdcard_settings_scanning_status" product="nosdcard" msgid="7503429447676219564">"Explorando ficheiros no USB…"</string>
+    <string name="sdcard_settings_scanning_status" product="default" msgid="2763464949274455656">"Explorando ficheiros multimedia na tarxeta SD…"</string>
     <string name="sdcard_settings_read_only_status" product="nosdcard" msgid="3624143937437417788">"USB instalado é só lectura"</string>
     <string name="sdcard_settings_read_only_status" product="default" msgid="4518291824764698112">"A tarxeta SD instalada é de só lectura."</string>
     <string name="skip_label" msgid="47510779345218297">"Omitir"</string>
@@ -312,6 +312,8 @@
     <string name="zone_auto" msgid="334783869352026648">"Zona horaria automática"</string>
     <string name="zone_auto_summaryOn" msgid="6142830927278458314">"Usar a zona horaria fornecida pola rede"</string>
     <string name="zone_auto_summaryOff" msgid="2597745783162041390">"Usar a zona horaria fornecida pola rede"</string>
+    <string name="date_time_24hour_auto" msgid="2117383168985653422">"Formato de 24 horas automático"</string>
+    <string name="date_time_24hour_auto_summary" msgid="6351812925651480277">"Utilizar a opción predeterminada da túa rexión"</string>
     <string name="date_time_24hour_title" msgid="3203537578602803850">"Formato de 24 horas"</string>
     <string name="date_time_24hour" msgid="1193032284921000063">"Usar formato de 24 horas"</string>
     <string name="date_time_set_time_title" msgid="6296795651349047016">"Hora"</string>
@@ -334,15 +336,14 @@
     <string name="security_enable_widgets_disabled_summary" msgid="6392489775303464905">"Desactivado polo administrador"</string>
     <string name="owner_info_settings_summary" msgid="7472393443779227052">"Ningunha"</string>
     <string name="owner_info_settings_status" msgid="120407527726476378">"<xliff:g id="COUNT_0">%1$d</xliff:g>/<xliff:g id="COUNT_1">%2$d</xliff:g>"</string>
-    <string name="owner_info_settings_edit_text_hint" msgid="7591869574491036360">"Por exemplo, Android de Xan."</string>
+    <string name="owner_info_settings_edit_text_hint" msgid="7591869574491036360">"Por exemplo: Android de Xoán."</string>
     <string name="user_info_settings_title" msgid="1195015434996724736">"Información usuario"</string>
     <string name="show_profile_info_on_lockscreen_label" msgid="2741208907263877990">"Mostrar info do perfil na pantalla de bloqueo"</string>
     <string name="profile_info_settings_title" msgid="3518603215935346604">"Información do perfil"</string>
     <string name="Accounts_settings_title" msgid="1643879107901699406">"Contas"</string>
     <string name="location_settings_title" msgid="1369675479310751735">"Localización"</string>
     <string name="account_settings_title" msgid="626177544686329806">"Contas"</string>
-    <!-- no translation found for security_settings_title (4918904614964215087) -->
-    <skip />
+    <string name="security_settings_title" msgid="4918904614964215087">"Seguranza e localización"</string>
     <string name="encryption_and_credential_settings_title" msgid="6514904533438791561">"Encriptación e credenciais"</string>
     <string name="encryption_and_credential_settings_summary" product="default" msgid="8721883002237981248">"Teléfono encriptado"</string>
     <string name="encryption_and_credential_settings_summary" product="tablet" msgid="7200428573872395685">"O dispositivo está encriptado"</string>
@@ -351,14 +352,14 @@
     <string name="cdma_security_settings_summary" msgid="6068799952798901542">"Define A miña localización, o desbloqueo da pantalla e o bloqueo do almacenamento de credenciais"</string>
     <string name="security_passwords_title" msgid="2881269890053568809">"Privacidade"</string>
     <string name="disabled_by_administrator_summary" msgid="1601828700318996341">"Desactivado polo administrador"</string>
-    <string name="security_status_title" msgid="5848766673665944640">"Estado da seguranza"</string>
-    <string name="security_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_status_title" msgid="5848766673665944640">"Estado de seguranza"</string>
+    <string name="security_dashboard_summary" msgid="6757421634477554939">"Bloqueo de pantalla, impresión dixital"</string>
+    <string name="security_dashboard_summary_no_fingerprint" msgid="8129641548372335540">"Bloqueo de pantalla"</string>
     <string name="security_settings_fingerprint_preference_title" msgid="2488725232406204350">"Impresión dixital"</string>
     <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 da pantalla"</string>
+    <string name="fingerprint_enable_keyguard_toggle_title" msgid="5078060939636911795">"bloqueo de 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>
@@ -373,6 +374,9 @@
     <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="1961957425135180242">"Seguinte"</string>
+    <string name="setup_fingerprint_enroll_skip_title" msgid="362050541117362034">"Omitir a impresión dixital?"</string>
+    <string name="setup_fingerprint_enroll_skip_after_adding_lock_text" msgid="958990414356204763">"Configurar a impresión dixital só leva un ou dous minutos, pero tamén podes facelo más tarde en Configuración."</string>
+    <string name="lock_screen_intro_skip_title" msgid="4988210105913705679">"Omitir o bloqueo de pantalla?"</string>
     <string name="lock_screen_intro_skip_dialog_text_frp" product="tablet" msgid="1581834104051243425">"As funcións de protección do dispositivo non se activarán. Non poderás evitar que outros usuarios utilicen a tableta en caso de perda, roubo ou restablecemento"</string>
     <string name="lock_screen_intro_skip_dialog_text_frp" product="device" msgid="4629503416877189572">"As funcións de protección do dispositivo non se activarán. Non poderás evitar que outros usuarios o utilicen en caso de perda, roubo ou restablecemento."</string>
     <string name="lock_screen_intro_skip_dialog_text_frp" product="default" msgid="2423428240245737909">"As funcións de protección do dispositivo non se activarán. Non poderás evitar que outros usuarios utilicen este teléfono en caso de perda, roubo ou restablecemento."</string>
@@ -400,9 +404,9 @@
     <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="2989019978041986175">"Toca co dedo índice o sensor que está detrás do teléfono."</string>
-    <string name="security_settings_fingerprint_enroll_error_dialog_title" msgid="3618021988442639280">"Non se completou a inscrición"</string>
-    <string name="security_settings_fingerprint_enroll_error_timeout_dialog_message" msgid="2942551158278899627">"Esgotouse o tempo de espera da inscrición de impresión dixital. Téntao de novo."</string>
-    <string name="security_settings_fingerprint_enroll_error_generic_dialog_message" msgid="3624760637222239293">"A inscrición de impresión dixital non funcionou. Téntao de novo ou utiliza outro dedo."</string>
+    <string name="security_settings_fingerprint_enroll_error_dialog_title" msgid="3618021988442639280">"Non se completou o rexistro"</string>
+    <string name="security_settings_fingerprint_enroll_error_timeout_dialog_message" msgid="2942551158278899627">"Esgotouse o tempo de espera do rexistro da impresión dixital. Téntao de novo."</string>
+    <string name="security_settings_fingerprint_enroll_error_generic_dialog_message" msgid="3624760637222239293">"O rexistro da impresión dixital non funcionou. Téntao de novo ou utiliza outro dedo."</string>
     <string name="fingerprint_enroll_button_add" msgid="6317978977419045463">"Engadir outra"</string>
     <string name="fingerprint_enroll_button_next" msgid="6247009337616342759">"Seguinte"</string>
     <string name="security_settings_fingerprint_enroll_disclaimer" msgid="2624905914239271751">"Ademais de desbloquear o teu teléfono, tamén podes utilizar a túa impresión dixital para autorizar compras e o acceso a aplicacións. "<annotation id="url">"Máis información"</annotation></string>
@@ -448,7 +452,7 @@
     <string name="crypt_keeper_data_corrupt_title" msgid="8759119849089795751">"Erro no descifrado"</string>
     <string name="crypt_keeper_data_corrupt_summary" product="tablet" msgid="840107296925798402">"O contrasinal que introduciches é correcto, pero lamentablemente os teus datos están danados. \n\nPara continuar usando a túa tableta, necesitas realizar un restablecemento de fábrica. Cando configures a túa tableta despois do restablecemento, poderás restaurar os datos dos que se fixo unha copia de seguranza na túa conta de Google."</string>
     <string name="crypt_keeper_data_corrupt_summary" product="default" msgid="8843311420059663824">"O contrasinal que introduciches é correcto, pero lamentablemente os teus datos están danados. \n\nPara continuar usando o teu teléfono, necesitas realizar un restablecemento de fábrica. Cando configures o teu teléfono despois do restablecemento, poderás restaurar os datos dos que se fixo unha copia de seguranza na túa conta de Google."</string>
-    <string name="crypt_keeper_switch_input_method" msgid="4168332125223483198">"Cambiar o método de entrada"</string>
+    <string name="crypt_keeper_switch_input_method" msgid="4168332125223483198">"Cambiar de método de introdución"</string>
     <string name="suggested_lock_settings_title" msgid="8971630898700461034">"Definir bloqueo da pantalla"</string>
     <string name="suggested_lock_settings_summary" msgid="8778462376012231110">"Protexe o teu dispositivo"</string>
     <string name="suggested_fingerprint_lock_settings_title" msgid="3655973509619012084">"Utilizar impresión dixital"</string>
@@ -458,14 +462,14 @@
     <string name="setup_lock_settings_picker_title" product="tablet" msgid="90329443364067215">"Protexe a tableta"</string>
     <string name="setup_lock_settings_picker_title" product="device" msgid="2399952075134938929">"Protexe o dispositivo"</string>
     <string name="setup_lock_settings_picker_title" product="default" msgid="1572244299605153324">"Protexe o teu teléfono"</string>
-    <string name="setup_lock_settings_picker_fingerprint_message" msgid="5585650064305600578">"Configura un bloqueo da pantalla alternativo para conseguir unha maior seguranza."</string>
+    <string name="lock_settings_picker_fingerprint_added_security_message" msgid="5768002109707648463">"Configura un bloqueo de pantalla alternativo para conseguir unha maior seguranza."</string>
     <string name="setup_lock_settings_picker_message" product="tablet" msgid="8919671129189936210">"Activa as funcións de protección da tableta 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="device" msgid="3787276514406353777">"Activa as funcións de protección do dispositivo para evitar que outras persoas utilicen este dispositivo sen o teu permiso. Selecciona o bloqueo da pantalla que queiras utilizar."</string>
     <string name="setup_lock_settings_picker_message" product="default" msgid="3692856437543730446">"Activa as funcións de protección do teléfono para evitar que outras persoas utilicen este teléfono sen o teu permiso. Selecciona o bloqueo da pantalla que queiras utilizar."</string>
     <string name="lock_settings_picker_fingerprint_message" msgid="4755230324778371292">"Escolle o método de bloqueo da pantalla alternativo"</string>
     <string name="setup_lock_settings_options_button_label" msgid="8511153243629402929">"Opcións de bloqueo da pantalla"</string>
     <string name="setup_lock_settings_options_dialog_title" msgid="5058207955455973917">"Opcións de bloqueo da pantalla"</string>
-    <string name="unlock_set_unlock_launch_picker_title" msgid="2084576942666016993">"Bloqueo da pantalla"</string>
+    <string name="unlock_set_unlock_launch_picker_title" msgid="2084576942666016993">"Bloqueo de pantalla"</string>
     <string name="unlock_set_unlock_launch_picker_summary_lock_immediately" msgid="5967714169972542586">"<xliff:g id="UNLOCK_METHOD">%1$s</xliff:g> / inmediatamente despois de entrar en suspensión"</string>
     <string name="unlock_set_unlock_launch_picker_summary_lock_after_timeout" msgid="4696710373399258413">"<xliff:g id="UNLOCK_METHOD">%1$s</xliff:g>/<xliff:g id="TIMEOUT_STRING">%2$s</xliff:g> despois de entrar en suspensión"</string>
     <string name="unlock_set_unlock_launch_picker_title_profile" msgid="124176557311393483">"Bloqueo perf. traballo"</string>
@@ -475,13 +479,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 seguridade"</string>
+    <string name="unlock_set_unlock_none_summary" msgid="8914673583104628191">"Sen seguranza"</string>
     <string name="unlock_set_unlock_pattern_title" msgid="2912067603917311700">"Padrón"</string>
-    <string name="unlock_set_unlock_pattern_summary" msgid="7062696666227725593">"Seguridade media"</string>
+    <string name="unlock_set_unlock_pattern_summary" msgid="7062696666227725593">"Seguranza media"</string>
     <string name="unlock_set_unlock_pin_title" msgid="5846029709462329515">"PIN"</string>
-    <string name="unlock_set_unlock_pin_summary" msgid="907878650556383388">"Seguridade de media a alta"</string>
+    <string name="unlock_set_unlock_pin_summary" msgid="907878650556383388">"Seguranza 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 seguridade"</string>
+    <string name="unlock_set_unlock_password_summary" msgid="8856220848940929546">"Alta seguranza"</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>
@@ -589,6 +593,7 @@
     <string name="lockpassword_pin_no_sequential_digits" msgid="680765285206990584">"Non se permite unha secuencia de díxitos ascendente, descendente nin repetida"</string>
     <string name="lockpassword_ok_label" msgid="313822574062553672">"Aceptar"</string>
     <string name="lockpassword_cancel_label" msgid="8818529276331121899">"Cancelar"</string>
+    <string name="lockpassword_clear_label" msgid="5724429464960458155">"Borrar"</string>
     <string name="lockpattern_tutorial_cancel_label" msgid="6431583477570493261">"Cancelar"</string>
     <string name="lockpattern_tutorial_continue_label" msgid="3559793618653400434">"Seguinte"</string>
     <string name="lock_setup" msgid="3355847066343753943">"Configuración completada"</string>
@@ -649,7 +654,7 @@
     <string name="bluetooth_menu_advanced" msgid="8572178316357220524">"Config. avanzada"</string>
     <string name="bluetooth_advanced_titlebar" msgid="2142159726881547669">"Bluetooth avanzado"</string>
     <string name="bluetooth_empty_list_bluetooth_off" msgid="6351930724051893423">"Co Bluetooth activado, o dispositivo pode comunicarse con outros dispositivos Bluetooth próximos."</string>
-    <string name="ble_scan_notify_text" msgid="1295915006005700650">"Para mellorar a precisión da localización, as aplicacións do sistema e os servizos poden seguir detectando dispositivos Bluetooth. Podes cambiar esta opción na <xliff:g id="LINK_BEGIN_0">LINK_BEGIN</xliff:g>configuración de busca<xliff:g id="LINK_END_1">LINK_END</xliff:g>."</string>
+    <string name="ble_scan_notify_text" msgid="1295915006005700650">"Para mellorar a precisión da localización, as aplicacións do sistema e os servizos poden seguir detectando dispositivos Bluetooth. Podes cambiar esta opción na <xliff:g id="LINK_BEGIN_0">LINK_BEGIN</xliff:g>configuración de exploración<xliff:g id="LINK_END_1">LINK_END</xliff:g>."</string>
     <string name="bluetooth_connect_failed" msgid="4500234659813241053">"Non se puido conectar. Téntao de novo."</string>
     <string name="device_details_title" msgid="6576953269221085300">"Datos do dispositivo"</string>
     <string name="bluetooth_device_mac_address" msgid="2513724313558236181">"Enderezo Bluetooth do dispositivo: <xliff:g id="ADDRESS">%1$s</xliff:g>"</string>
@@ -703,7 +708,7 @@
     <string name="android_beam_settings_title" msgid="7832812974600338649">"Android Beam"</string>
     <string name="android_beam_on_summary" msgid="3618057099355636830">"Listo para transmitir o contido da aplicación a través de NFC"</string>
     <string name="android_beam_off_summary" msgid="4663095428454779138">"Desactivado"</string>
-    <string name="android_beam_disabled_summary" msgid="1737782116894793393">"Non dispoñible debido a que NFC está desactivada"</string>
+    <string name="android_beam_disabled_summary" msgid="1737782116894793393">"Non dispoñible debido a que a opción NFC está desactivada"</string>
     <string name="android_beam_label" msgid="6257036050366775040">"Android Beam"</string>
     <string name="android_beam_explained" msgid="1810540319385192758">"Cando esta función está activada, podes transferir contido de aplicacións a outros dispositivos compatibles con NFC achegando os dispositivos entre si. Por exemplo, podes transmitir páxinas web, vídeos de YouTube, contactos, etc.\n\nSimplemente achega os dispositivos entre si (normalmente as súas partes posteriores) e, a continuación, toca a pantalla. A aplicación determina o que se transfire."</string>
     <string name="wifi_quick_toggle_title" msgid="8850161330437693895">"Wifi"</string>
@@ -732,8 +737,8 @@
     <string name="use_open_wifi_automatically_summary_scoring_disabled" msgid="593964217679325831">"Para utilizar a función, selecciona un provedor de valoración de rede"</string>
     <string name="use_open_wifi_automatically_summary_scorer_unsupported_disabled" msgid="8472122600853650258">"Para utilizar a función, selecciona un provedor de valoración de rede que sexa compatible"</string>
     <string name="wifi_install_credentials" msgid="3551143317298272860">"Instalar certificados"</string>
-    <string name="wifi_scan_notify_text" msgid="5593805423071186757">"Para mellorar a precisión da localización, as aplicacións do sistema e os servizos aínda poden buscar redes wifi. Podes cambiar esta opción na <xliff:g id="LINK_BEGIN_0">LINK_BEGIN</xliff:g>configuración de busca<xliff:g id="LINK_END_1">LINK_END</xliff:g>."</string>
-    <string name="wifi_scan_notify_text_scanning_off" msgid="3426075479272242098">"Para mellorar a precisión de localización, activa a busca de redes wifi na <xliff:g id="LINK_BEGIN_0">LINK_BEGIN</xliff:g>configuración de busca<xliff:g id="LINK_END_1">LINK_END</xliff:g>."</string>
+    <string name="wifi_scan_notify_text" msgid="5593805423071186757">"Para mellorar a precisión da localización, as aplicacións do sistema e os servizos aínda poden explorar redes wifi. Podes cambiar esta opción na <xliff:g id="LINK_BEGIN_0">LINK_BEGIN</xliff:g>configuración de exploración<xliff:g id="LINK_END_1">LINK_END</xliff:g>."</string>
+    <string name="wifi_scan_notify_text_scanning_off" msgid="3426075479272242098">"Para mellorar a precisión de localización, activa a exploración de redes wifi na <xliff:g id="LINK_BEGIN_0">LINK_BEGIN</xliff:g>configuración de exploración<xliff:g id="LINK_END_1">LINK_END</xliff:g>."</string>
     <string name="wifi_scan_notify_remember_choice" msgid="7104867814641144485">"Non mostrar outra vez"</string>
     <string name="wifi_setting_sleep_policy_title" msgid="5149574280392680092">"Manter a wifi activada durante o modo de suspensión"</string>
     <string name="wifi_setting_on_during_sleep_title" msgid="8308975500029751565">"Wifi activada na suspensión"</string>
@@ -778,10 +783,11 @@
     <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 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_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_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>
@@ -818,7 +824,9 @@
     <string name="wifi_wps_available_first_item" msgid="4422547079984583502">"WPS dispoñible"</string>
     <string name="wifi_wps_available_second_item" msgid="8427520131718215301">" (WPS dispoñible)"</string>
     <string name="wifi_wps_nfc_enter_password" msgid="2288214226916117159">"Introduce o contrasinal da túa rede"</string>
-    <string name="wifi_scan_always_turnon_message" msgid="203123538572122989">"Para mellorar a precisión da localización e para outros fins, <xliff:g id="APP_NAME">%1$s</xliff:g> quere activar a busca de redes, aínda que a wifi estea desactivada.\n\nQueres permitilo para todas as aplicacións que queren buscar redes?"</string>
+    <string name="wifi_carrier_connect" msgid="8174696557882299911">"Rede wifi do operador"</string>
+    <string name="wifi_carrier_content" msgid="4634077285415851933">"Conectar a través de <xliff:g id="NAME">%1%s</xliff:g>"</string>
+    <string name="wifi_scan_always_turnon_message" msgid="203123538572122989">"Para mellorar a precisión da localización e para outros fins, <xliff:g id="APP_NAME">%1$s</xliff:g> quere activar a exploración de redes, aínda que a wifi estea desactivada.\n\nQueres permitilo para todas as aplicacións que queren buscar redes?"</string>
     <string name="wifi_scan_always_turnoff_message" msgid="5538901671131941043">"Para desactivar esta función, accede ás opcións avanzadas no menú adicional."</string>
     <string name="wifi_scan_always_confirm_allow" msgid="5355973075896817232">"Permitir"</string>
     <string name="wifi_scan_always_confirm_deny" msgid="4463982053823520710">"Rexeitar"</string>
@@ -835,6 +843,7 @@
     <string name="wifi_connect" msgid="1076622875777072845">"Conectar"</string>
     <string name="wifi_failed_connect_message" msgid="8491902558970292871">"Erro ao conectar á rede"</string>
     <string name="wifi_forget" msgid="8168174695608386644">"Borrar"</string>
+    <string name="wifi_modify" msgid="6100248070440710782">"Modificar"</string>
     <string name="wifi_failed_forget_message" msgid="1348172929201654986">"Erro ao esquecer a rede"</string>
     <string name="wifi_save" msgid="3331121567988522826">"Gardar"</string>
     <string name="wifi_failed_save_message" msgid="6650004874143815692">"Erro ao gardar a rede"</string>
@@ -847,6 +856,7 @@
     <string name="wifi_advanced_titlebar" msgid="4485841401774142908">"Wifi avanzada"</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_title" msgid="3471132676909349382">"Información sobre a rede"</string>
     <string name="wifi_details_subnet_mask" msgid="6720279144174924410">"Máscara de subrede"</string>
     <string name="wifi_details_dns" msgid="8648826607751830768">"DNS"</string>
     <string name="wifi_details_ipv6_address_header" msgid="6734119149106422148">"Enderezos IPv6"</string>
@@ -879,17 +889,16 @@
     <string name="wifi_p2p_cancel_connect_title" msgid="255267538099324413">"Cancelar invitación?"</string>
     <string name="wifi_p2p_cancel_connect_message" msgid="7477756213423749402">"Queres cancelar a invitación para conectar con <xliff:g id="PEER_NAME">%1$s</xliff:g>?"</string>
     <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_off_subtext" msgid="5466126533609394170">"Non se está compartindo a conexión a Internet nin contido con outros dispositivos"</string>
     <string name="wifi_hotspot_tethering_on_subtext" product="tablet" msgid="5752490509369962007">"Estase compartindo a conexión a Internet da tableta a través da zona wifi"</string>
     <string name="wifi_hotspot_tethering_on_subtext" product="default" msgid="6461075246164300670">"Estase compartindo a conexión a Internet do teléfono a través de zona wifi"</string>
     <string name="wifi_hotspot_on_local_only_subtext" msgid="2068110388011294735">"A aplicación está compartindo contido. Para compartir a conexión a Internet, desactiva a zona wifi e volve activala"</string>
-    <string name="wifi_hotspot_name_title" msgid="1341735529132128887">"Nome da wifi"</string>
+    <string name="wifi_hotspot_name_title" msgid="8237000746618636778">"Nome da zona wifi"</string>
     <string name="wifi_hotspot_name_summary_connecting" msgid="3378299995508671967">"Activando a zona wifi <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>..."</string>
     <string name="wifi_hotspot_name_summary_connected" msgid="3888672084861445362">"Outros dispositivos poden conectarse á zona wifi <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>"</string>
-    <string name="wifi_hotspot_password_title" msgid="1955592302902091281">"Contrasinal da wifi"</string>
-    <string name="wifi_hotspot_ap_band_title" msgid="1165801173359290681">"Banda AP"</string>
+    <string name="wifi_hotspot_password_title" msgid="8676859981917573801">"Contrasinal da zona wifi"</string>
+    <string name="wifi_hotspot_ap_band_title" msgid="1165801173359290681">"Banda do punto de acceso"</string>
     <string name="wifi_hotspot_footer_info_regular" msgid="1203489406068036455">"Utiliza a zona wifi para crear unha rede wifi para os teus outros dispositivos. A zona wifi fornece Internet a través da túa conexión de datos móbiles. É posible que se apliquen tarifas de datos móbiles adicionais."</string>
     <string name="wifi_hotspot_footer_info_local_only" msgid="857988412470694109">"As aplicacións poden crear unha zona wifi para compartir contido cos dispositivos que están cerca."</string>
     <string name="wifi_tether_starting" msgid="1322237938998639724">"Activando zona wifi..."</string>
@@ -899,7 +908,6 @@
     <string name="wifi_tether_configure_ap_text" msgid="7974681394041609308">"Configurar zona wifi"</string>
     <string name="wifi_hotspot_configure_ap_text" msgid="5478614731464220432">"Configuración da zona wifi"</string>
     <string name="wifi_hotspot_configure_ap_text_summary" msgid="5560680057727007011">"Zona wifi AndroidAP WPA2 PSK"</string>
-    <string name="wifi_tether_configure_subtext" msgid="2050196439900426456">"Zona wifi <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">"Chamadas por wifi"</string>
     <string name="wifi_calling_suggestion_title" msgid="9008010480466359578">"Activa as chamadas por wifi"</string>
@@ -939,13 +947,13 @@
   </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="emergency_address_title" msgid="3571902448699714454">"Actualizar enderezo de urxencia"</string>
+    <string name="emergency_address_summary" msgid="3266760199681945746">"Enderezo que utilizan os servizos de urxencia como a túa localización se fas unha chamada de urxencia 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 timbre"</string>
+    <string name="ring_volume_title" msgid="5592466070832128777">"Volume do ton"</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>
@@ -994,6 +1002,7 @@
     <string name="search_settings" msgid="1910951467596035063">"Buscar"</string>
     <string name="search_settings_summary" msgid="9205656546570654169">"Xestiona a configuración e o historial das buscas"</string>
     <string name="search_settings_no_results" msgid="8799027492641230999">"Non hai resultados"</string>
+    <string name="search_clear_history" msgid="4196658962573162457">"Borrar historial"</string>
     <string name="display_settings" msgid="7965901687241669598">"Pantalla"</string>
     <string name="accelerometer_title" msgid="7854608399547349157">"Xirar a pantalla automaticamente"</string>
     <string name="color_mode_title" msgid="3159275920408338215">"Cores vivas"</string>
@@ -1063,7 +1072,7 @@
     <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="ambient_display_screen_title" msgid="4252755516328775766">"Pantalla ambiente"</string>
+    <string name="ambient_display_screen_title" msgid="4252755516328775766">"Pantalla en suspensión"</string>
     <string name="ambient_display_screen_summary_always_on" msgid="7337555569694794132">"Activada continuamente (consómese máis batería)"</string>
     <string name="ambient_display_screen_summary_notifications" msgid="1449570742600868654">"Novas notificacións"</string>
     <string name="ambient_display_category_triggers" msgid="4359289754456268573">"Cando mostrar a pantalla"</string>
@@ -1123,7 +1132,6 @@
     <string name="baseband_version" msgid="1848990160763524801">"Versión de banda base"</string>
     <string name="kernel_version" msgid="9192574954196167602">"Versión de kernel"</string>
     <string name="build_number" msgid="3075795840572241758">"Número de compilación"</string>
-    <string name="selinux_status" msgid="6212165375172061672">"Estado de SELinux"</string>
     <string name="device_info_not_available" msgid="8062521887156825182">"Non dispoñible"</string>
     <string name="device_status_activity_title" msgid="1411201799384697904">"Estado"</string>
     <string name="device_status" msgid="607405385799807324">"Estado"</string>
@@ -1151,7 +1159,6 @@
     <string name="status_wifi_mac_address" msgid="2202206684020765378">"Enderezo MAC da wifi"</string>
     <string name="status_bt_address" msgid="4195174192087439720">"Enderezo Bluetooth"</string>
     <string name="status_serial_number" msgid="2257111183374628137">"Número de serie"</string>
-    <string name="status_unavailable" msgid="7862009036663793314">"Non dispoñible"</string>
     <string name="status_up_time" msgid="7294859476816760399">"Tempo activo"</string>
     <string name="status_awake_time" msgid="2393949909051183652">"Tempo de actividade"</string>
     <string name="internal_memory" msgid="9129595691484260784">"Almacenamento interno"</string>
@@ -1171,7 +1178,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 seguridade"</string>
+    <string name="sd_eject_summary" product="default" msgid="3300599435073550246">"Desactiva a tarxeta SD para poder extraela con seguranza"</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>
@@ -1228,8 +1235,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 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_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_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>
@@ -1327,7 +1334,8 @@
     <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>
     <string name="reset_dashboard_title" msgid="6254873816990678620">"Opcións de restablecemento"</string>
-    <string name="reset_network_title" msgid="6166025966016873843">"Restablecer wifi, datos móbiles e Bluetooth"</string>
+    <string name="reset_dashboard_summary" msgid="4851012632493522755">"Pódense restablecer a rede, as aplicacións ou o dispositivo"</string>
+    <string name="reset_network_title" msgid="6166025966016873843">"Restablecer wifi, rede móbil e Bluetooth"</string>
     <string name="reset_network_desc" msgid="5547979398298881406">"Con esta selección, restableceranse todas as opcións de configuración da rede, entre elas as referentes a:\n\n"<li>"Wifi"</li>\n<li>"Datos móbiles"</li>\n<li>"Bluetooth"</li></string>
     <string name="reset_network_button_text" msgid="2035676527471089853">"Restablecer configuración"</string>
     <string name="reset_network_final_desc" msgid="6388371121099245116">"Queres restablecer toda a configuración da rede? Esta acción non se pode desfacer."</string>
@@ -1335,17 +1343,14 @@
     <string name="reset_network_confirm_title" msgid="1759888886976962773">"Restablecer?"</string>
     <string name="network_reset_not_available" msgid="7188610385577164676">"O restablecemento de rede non está dispoñible para este usuario"</string>
     <string name="reset_network_complete_toast" msgid="787829973559541880">"Restableceuse a configuración da rede"</string>
-    <string name="master_clear_title" msgid="6617679904229218425">"Borrar todos os datos (restablecemento de fábrica)"</string>
-    <plurals name="master_clear_with_account_summary" formatted="false" msgid="5911377203778818712">
-      <item quantity="other">Restableceranse <xliff:g id="ACCOUNT_COUNT">%1$d</xliff:g> contas</item>
-      <item quantity="one">Restablecerase 1 conta</item>
-    </plurals>
-    <string name="master_clear_summary" msgid="6902443944660426951">"Restableceranse o almacenamento interno e todos os datos"</string>
+    <string name="master_clear_title" msgid="3531267871084279512">"Borrar todos os datos (restablecemento de fábrica)"</string>
     <string name="master_clear_desc" product="tablet" msgid="9146059417023157222">"Esta acción borrará todos os datos do "<b>"almacenamento interno"</b>" da túa tableta, como:\n\n"<li>"A túa conta de Google"</li>\n<li>"Os datos e a configuracións do sistema e das aplicacións"</li>\n<li>"Aplicacións descargadas"</li></string>
     <string name="master_clear_desc" product="default" msgid="4800386183314202571">"Esta acción borrará todos os datos do "<b>"almacenamento interno"</b>" do teléfono, como:\n\n"<li>"A túa conta de Google"</li>\n<li>"Datos e configuración do sistema e das aplicacións"</li>\n<li>"Aplicacións descargadas"</li></string>
     <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"Actualmente tes sesión iniciada nas seguintes contas:\n"</string>
     <string name="master_clear_other_users_present" product="default" msgid="5161423070702470742">\n\n"Hai outros usuarios presentes neste dispositivo.\n"</string>
     <string name="master_clear_desc_also_erases_external" msgid="1903185203791274237"><li>"Música"</li>\n<li>"Fotos"</li>\n<li>"Outros datos do usuario"</li></string>
+    <string name="master_clear_desc_also_erases_esim" msgid="312352697653096008"><li>"Operadores da eSIM"</li></string>
+    <string name="master_clear_desc_no_cancel_mobile_plan" msgid="5460926449093211144">\n\n"Con esta acción non se cancelará o teu plan de servizos móbiles."</string>
     <string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="7744115866662613411">\n\n"Para borrar música, imaxes e outros datos do usuario, é necesario borrar o "<b>"almacenamento USB"</b>"."</string>
     <string name="master_clear_desc_erase_external_storage" product="default" msgid="4801026652617377093">\n\n"Para borrar música, imaxes e outros datos de usuario, é necesario borrar a "<b>"tarxeta SD"</b>"."</string>
     <string name="erase_external_storage" product="nosdcard" msgid="969364037450286809">"Borrar almacenamento USB"</string>
@@ -1370,7 +1375,7 @@
     <string name="tether_settings_title_wifi" msgid="3277144155960302049">"Zona wifi portátil"</string>
     <string name="tether_settings_title_bluetooth" msgid="355855408317564420">"Conexión por Bluetooth"</string>
     <string name="tether_settings_title_usb_bluetooth" msgid="5355828977109785001">"Conexión compartida"</string>
-    <string name="tether_settings_title_all" msgid="3058586928118801157">"Zona wifi e conex. compartida"</string>
+    <string name="tether_settings_title_all" msgid="3058586928118801157">"Zona wifi/conexión compartida"</string>
     <string name="tether_settings_summary_hotspot_on_tether_on" msgid="930464462687425777">"Zona wifi e conexión compartida activadas"</string>
     <string name="tether_settings_summary_hotspot_on_tether_off" msgid="3473671453891735907">"Zona wifi activada"</string>
     <string name="tether_settings_summary_hotspot_off_tether_on" msgid="1618256180720077354">"Conexión compartida activada"</string>
@@ -1419,12 +1424,12 @@
     <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="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_screen_title" msgid="4408076862929611554">"Exploración de conexións"</string>
+    <string name="location_scanning_wifi_always_scanning_title" msgid="6216705505621183645">"Exploración de redes wifi"</string>
     <string name="location_scanning_wifi_always_scanning_description" msgid="8036382029606868081">"Mellora a localización permitindo que as aplicacións do sistema e os servizos detecten redes wifi en calquera momento."</string>
-    <string name="location_scanning_bluetooth_always_scanning_title" msgid="5444989508204520019">"Busca de dispositivos Bluetooth"</string>
+    <string name="location_scanning_bluetooth_always_scanning_title" msgid="5444989508204520019">"Exploración de dispositivos Bluetooth"</string>
     <string name="location_scanning_bluetooth_always_scanning_description" msgid="8602726521250591852">"Mellora a localización permitindo que as aplicacións do sistema e os servizos detecten dispositivos Bluetooth en calquera momento."</string>
-    <string name="location_network_based" msgid="9134175479520582215">"Situación rede móbil e wifi"</string>
+    <string name="location_network_based" msgid="9134175479520582215">"Situación por rede móbil/wifi"</string>
     <string name="location_neighborhood_level" msgid="5141318121229984788">"Permite usar o servizo de localización para calcular a localización rápido. Recompilaranse datos anónimos e enviaranse a Google."</string>
     <string name="location_neighborhood_level_wifi" msgid="4234820941954812210">"Localización determinada por wifi"</string>
     <string name="location_gps" msgid="8392461023569708478">"Satélites GPS"</string>
@@ -1458,19 +1463,20 @@
     <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 seguridade"</string>
-    <string name="settings_safetylegal_activity_title" msgid="6901214628496951727">"Información de seguridade"</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_activity_unreachable" msgid="250674109915859456">"Non tes conexión de datos. Para ver esta información agora, accede a %s desde calquera ordenador conectado a Internet."</string>
     <string name="settings_safetylegal_activity_loading" msgid="8059022597639516348">"Cargando..."</string>
-    <string name="lockpassword_choose_your_password_header" msgid="8624900666929394990">"Escolle o teu contrasinal"</string>
-    <string name="lockpassword_choose_your_password_header_for_fingerprint" msgid="6624409510609085450">"Impresión dixital: contrasinal"</string>
-    <string name="lockpassword_choose_your_pattern_header" msgid="6949761069941694050">"Selecciona o teu padrón"</string>
-    <string name="lockpassword_choose_your_pattern_header_for_fingerprint" msgid="5901096361617543819">"Impresión dixital: padrón"</string>
-    <string name="lockpassword_choose_your_pin_header" msgid="7598849519816138302">"Selecciona o teu PIN"</string>
-    <string name="lockpassword_choose_your_pin_header_for_fingerprint" msgid="765344692615917183">"Impresión dixital: PIN"</string>
-    <string name="lockpassword_confirm_your_password_header" msgid="6308478184889846633">"Confirma o teu contrasinal"</string>
+    <string name="lockpassword_choose_your_screen_lock_header" msgid="3872462096767152394">"Define un bloqueo de pantalla"</string>
+    <string name="lockpassword_choose_your_password_message" msgid="1197569283524841412">"Por cuestións de seguranza, configura un contrasinal"</string>
+    <string name="lockpassword_choose_your_password_header_for_fingerprint" msgid="2541818487015343503">"Impresión dixital: define un contrasinal"</string>
+    <string name="lockpassword_choose_your_pattern_header_for_fingerprint" msgid="7709785406243556723">"Impresión dixital: define un padrón"</string>
+    <string name="lockpassword_choose_your_pin_message" msgid="1875420718677275646">"Por cuestións de seguranza, configura un PIN"</string>
+    <string name="lockpassword_choose_your_pin_header_for_fingerprint" msgid="1549639053195796674">"Para usar a impr. dixital, define un PIN"</string>
+    <string name="lockpassword_choose_your_pattern_message" msgid="5986983400689720015">"Por cuestións de seguranza, define un padrón"</string>
+    <string name="lockpassword_confirm_your_password_header" msgid="1266027268220850931">"Volve introducir o teu contrasinal"</string>
     <string name="lockpassword_confirm_your_pattern_header" msgid="7543433733032330821">"Confirma o teu padrón"</string>
-    <string name="lockpassword_confirm_your_pin_header" msgid="49038294648213197">"Confirma o teu PIN"</string>
+    <string name="lockpassword_confirm_your_pin_header" msgid="7744513791910572550">"Volve introducir o teu PIN"</string>
     <string name="lockpassword_confirm_passwords_dont_match" msgid="5140892109439191415">"Os contrasinais non coinciden"</string>
     <string name="lockpassword_confirm_pins_dont_match" msgid="7226244811505606217">"Os PIN non coinciden"</string>
     <string name="lockpassword_choose_lock_generic_header" msgid="3811438094903786145">"Selección de desbloqueo"</string>
@@ -1489,6 +1495,12 @@
     <string name="lockpassword_strong_auth_required_work_pattern" msgid="3003781907040522053">"Utiliza o padrón do traballo para conseguir unha maior seguranza"</string>
     <string name="lockpassword_strong_auth_required_work_pin" msgid="3367491332598821552">"Introduce o PIN do traballo para conseguir unha maior seguranza"</string>
     <string name="lockpassword_strong_auth_required_work_password" msgid="8159775129968582940">"Introduce o contrasinal do traballo para conseguir unha maior seguranza"</string>
+    <string name="lockpassword_confirm_your_pattern_details_frp" msgid="6757336656791723193">"Restableceuse a configuración de fábrica do teléfono. Introduce o padrón anterior."</string>
+    <string name="lockpassword_confirm_your_pin_details_frp" msgid="826520613445990470">"Restableceuse a configuración de fábrica do teléfono. Introduce o PIN anterior."</string>
+    <string name="lockpassword_confirm_your_password_details_frp" msgid="8944081074615739040">"Restableceuse a configuración de fábrica do teléfono. Introduce o contrasinal anterior."</string>
+    <string name="lockpassword_confirm_your_pattern_header_frp" msgid="2898036091609128286">"Verifica o padrón"</string>
+    <string name="lockpassword_confirm_your_pin_header_frp" msgid="4141601774778898803">"Verifica o PIN"</string>
+    <string name="lockpassword_confirm_your_password_header_frp" msgid="3762615419295360480">"Verifica o contrasinal"</string>
     <string name="lockpassword_invalid_pin" msgid="15588049067548470">"PIN incorrecto"</string>
     <string name="lockpassword_invalid_password" msgid="4038507398784975200">"Contrasinal incorrecto"</string>
     <string name="lockpattern_need_to_unlock_wrong" msgid="1745247595356012176">"Padrón incorrecto"</string>
@@ -1512,7 +1524,7 @@
     <string name="lockpattern_settings_enable_visible_pattern_title" msgid="2615606088906120711">"Facer visible o padrón"</string>
     <string name="lockpattern_settings_enable_visible_pattern_title_profile" msgid="4864525074768391381">"Facer visible o padrón do perfil"</string>
     <string name="lockpattern_settings_enable_tactile_feedback_title" msgid="4389015658335522989">"Vibrar ao tocar"</string>
-    <string name="lockpattern_settings_enable_power_button_instantly_locks" msgid="5735444062633666327">"Bloquea ao acender"</string>
+    <string name="lockpattern_settings_enable_power_button_instantly_locks" msgid="5735444062633666327">"Bloquear ao acender"</string>
     <string name="lockpattern_settings_power_button_instantly_locks_summary" msgid="8196258755143711694">"Excepto se <xliff:g id="TRUST_AGENT_NAME">%1$s</xliff:g> mantén o dispositivo desbloqueado"</string>
     <string name="lockpattern_settings_choose_lock_pattern" msgid="1652352830005653447">"Definir padrón de desbloqueo"</string>
     <string name="lockpattern_settings_change_lock_pattern" msgid="1123908306116495545">"Cambiar deseño de desbloqueo"</string>
@@ -1520,7 +1532,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 da pantalla do perfil de traballo"</string>
+    <string name="lock_settings_profile_screen_lock_title" msgid="3334747927367115256">"Bloqueo de 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>
@@ -1531,19 +1543,18 @@
     <string name="lock_settings_profile_unified_summary" msgid="9008819078132993492">"O mesmo que o bloqueo da pantalla do dispositivo"</string>
     <string name="manageapplications_settings_title" msgid="7041951105633616745">"Xestionar aplicacións"</string>
     <string name="manageapplications_settings_summary" msgid="1794401500935451259">"Xestiona e elimina as aplicacións instaladas"</string>
-    <string name="applications_settings" msgid="5281808652705396152">"Información das aplicacións"</string>
+    <string name="applications_settings" msgid="5281808652705396152">"Información da aplicación"</string>
     <string name="applications_settings_summary" msgid="6683465446264515367">"Xestiona aplicacións e configura atallos de inicio rápido"</string>
     <string name="applications_settings_header" msgid="1014813055054356646">"Configuración da aplicación"</string>
     <string name="install_applications" msgid="4872012136210802181">"Fontes descoñecidas"</string>
     <string name="install_applications_title" msgid="4987712352256508946">"Permitir todas as fontes de aplicacións"</string>
     <string name="recent_app_category_title" msgid="6673071268966003928">"Aplicacións abertas recentemente"</string>
     <string name="see_all_apps_title" msgid="1317153498074308438">"Ver as <xliff:g id="COUNT">%1$d</xliff:g> aplicacións"</string>
-    <string name="recent_app_summary" msgid="3366446669844932300">"Hai <xliff:g id="TIME">^1</xliff:g>"</string>
     <string name="install_all_warning" product="tablet" msgid="8310489909586138165">"A tableta e os datos persoais son máis vulnerables aos ataques de aplicacións descoñecidas. Ao instalar aplicacións desta fonte, aceptas que es responsable dos danos ocasionados na tableta ou da perda dos datos que se poden derivar do seu uso."</string>
     <string name="install_all_warning" product="default" msgid="1952257127370115988">"O teléfono e os datos persoais son máis vulnerables aos ataques de aplicacións descoñecidas. Ao instalar aplicacións desta fonte, aceptas que es responsable dos danos ocasionados no teléfono ou da perda dos datos que se poden derivar do seu uso."</string>
     <string name="advanced_settings" msgid="1777249286757067969">"Configuración avanzada"</string>
     <string name="advanced_settings_summary" msgid="4016682978071086747">"Activa máis opcións de configuración"</string>
-    <string name="application_info_label" msgid="5736524913065714880">"Información da aplicación"</string>
+    <string name="application_info_label" msgid="5736524913065714880">"Info da app"</string>
     <string name="storage_label" msgid="8700867073480107253">"Almacenamento"</string>
     <string name="auto_launch_label" msgid="2669236885531442195">"Abrir de forma predeterminada"</string>
     <string name="auto_launch_label_generic" msgid="3230569852551968694">"Valores predeterminados"</string>
@@ -1584,8 +1595,8 @@
     <string name="sort_order_size" msgid="7024513286636502362">"Ordenar por tamaño"</string>
     <string name="show_running_services" msgid="5736278767975544570">"Mostrar servizos en curso"</string>
     <string name="show_background_processes" msgid="2009840211972293429">"Mostrar procesos na caché"</string>
-    <string name="default_emergency_app" msgid="1951760659640369980">"Aplicación de emerxencia"</string>
-    <string name="reset_app_preferences" msgid="1321050641018356925">"Restablecer as preferencias"</string>
+    <string name="default_emergency_app" msgid="1951760659640369980">"Aplicación de urxencia"</string>
+    <string name="reset_app_preferences" msgid="1321050641018356925">"Restablecer preferencias das aplicacións"</string>
     <string name="reset_app_preferences_title" msgid="6093179367325336662">"Restablecer as preferencias das aplicacións?"</string>
     <string name="reset_app_preferences_desc" msgid="4822447731869201512">"Con esta acción, restableceranse todas as preferencias de:\n\n "<li>"aplicacións desactivadas"</li>\n" "<li>"notificacións de aplicacións desactivadas"</li>\n" "<li>"aplicacións predeterminadas para accións"</li>\n" "<li>"restricións de datos en segundo plano para aplicacións"</li>\n" "<li>"calquera restrición de permisos"</li>\n\n" Non perderás datos de ningunha aplicación."</string>
     <string name="reset_app_preferences_button" msgid="2559089511841281242">"Restablecer aplicacións"</string>
@@ -1729,7 +1740,7 @@
     <string name="spellchecker_security_warning" msgid="9060897418527708922">"É posible que este corrector ortográfico recolla todo o texto que escribes, incluídos datos persoais como contrasinais e números de tarxetas de crédito. Provén da aplicación <xliff:g id="SPELLCHECKER_APPLICATION_NAME">%1$s</xliff:g>. Queres usar este corrector ortográfico?"</string>
     <string name="spellchecker_quick_settings" msgid="246728645150092058">"Configuración"</string>
     <string name="spellchecker_language" msgid="6041050114690541437">"Idioma"</string>
-    <string name="keyboard_and_input_methods_category" msgid="6035224122054465137">"Teclado e métodos de entrada"</string>
+    <string name="keyboard_and_input_methods_category" msgid="6035224122054465137">"Teclado e métodos de introdución"</string>
     <string name="virtual_keyboard_category" msgid="1012830752318677119">"Teclado virtual"</string>
     <string name="available_virtual_keyboard_category" msgid="7645766574969139819">"Teclado virtual dispoñible"</string>
     <string name="add_virtual_keyboard" msgid="3302152381456516928">"Xestionar teclados"</string>
@@ -1802,7 +1813,7 @@
     <string name="accessibility_settings_summary" msgid="981260486011624939">"Lectores de pantalla, pantalla, controis de interacción"</string>
     <string name="vision_settings_title" msgid="4204111425716868288">"Configuración de visualización"</string>
     <string name="vision_settings_description" msgid="5679491180156408260">"Podes personalizar este dispositivo segundo as túas necesidades. Podes cambiar estas funcións de accesibilidade máis tarde en Configuración."</string>
-    <string name="vision_settings_suggestion_title" msgid="917294957154878441">"Incrementar o tamaño do tipo de letra"</string>
+    <string name="vision_settings_suggestion_title" msgid="8058794060304707004">"Cambiar tamaño do tipo de letra"</string>
     <string name="screen_reader_category_title" msgid="7739154903913400641">"Lectores de pantalla"</string>
     <string name="audio_and_captions_category_title" msgid="3420727114421447524">"Audio e texto na pantalla"</string>
     <string name="display_category_title" msgid="685461049938269166">"Pantalla"</string>
@@ -1839,7 +1850,6 @@
     <string name="accessibility_display_inversion_preference_subtitle" msgid="7052959202195368109">"Pode afectar ao rendemento"</string>
     <string name="accessibility_autoclick_preference_title" msgid="7014499339068449623">"Clic cando o punteiro pare"</string>
     <string name="accessibility_autoclick_delay_preference_title" msgid="3962261178385106006">"Retardo antes de facer clic"</string>
-    <string name="preference_summary_default_combination" msgid="8532964268242666060">"<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">"ACTIVADO"</string>
     <string name="accessibility_summary_state_disabled" msgid="2241315620132005595">"DESACTIVADO"</string>
     <string name="enable_quick_setting" msgid="2366999897816894536">"Mostrar en Configuración rápida"</string>
@@ -1884,7 +1894,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">"Predeterminada"</string>
+    <string name="locale_default" msgid="2593883646136326969">"Predeterminado"</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>
@@ -1949,7 +1959,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 batería non dispoñibles"</string>
+    <string name="power_usage_not_available" msgid="3109326074656512387">"Datos de uso 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>
@@ -1958,12 +1968,14 @@
     <string name="background_activity_summary_on" msgid="649282072540085599">"É posible que a aplicación se execute en segundo plano cando non se estea utilizando"</string>
     <string name="background_activity_summary_off" msgid="7666330699090632040">"A actividade en segundo plano da aplicación é limitada cando non se está utilizando"</string>
     <string name="background_activity_summary_disabled" msgid="3710669050484599847">"Non se permite a execución da aplicación en segundo plano"</string>
+    <string name="background_activity_summary_whitelisted" msgid="7375400051141016808">"A aplicación non se pode optimizar en relación ao uso de batería"</string>
+    <string name="background_activity_warning_dialog_title" msgid="2216249969149568871">"Queres limitar a actividade en segundo plano?"</string>
+    <string name="background_activity_warning_dialog_text" msgid="7049624449246121981">"Si limitas a actividade en segundo plano para unha aplicación, é posible que non funcione correctamente"</string>
     <string name="device_screen_usage" msgid="3386088035570409683">"Uso da pantalla desde a carga completa"</string>
     <string name="device_screen_consumption" msgid="4607589286438986687">"Consumo da pantalla"</string>
-    <string name="device_cellular_network" msgid="4724773411762382950">"Busca da rede de telefonía móbil"</string>
-    <string name="power_last_full_charge_summary" msgid="532845389094620657">"Hai <xliff:g id="TIME">^1</xliff:g>"</string>
-    <string name="power_usage_list_summary" msgid="6775339745194635000">"Uso de apps desde a carga completa (hai <xliff:g id="TIME">^1</xliff:g>)"</string>
-    <string name="power_usage_list_summary_device" msgid="7036566616386864302">"Uso do dispositivo desde a carga completa (hai <xliff:g id="TIME">^1</xliff:g>)"</string>
+    <string name="device_cellular_network" msgid="4724773411762382950">"Exploración de redes móbiles"</string>
+    <string name="power_usage_list_summary" msgid="6393929085382334341">"Uso de aplicacións desde a carga completa (<xliff:g id="RELATIVE_TIME">^1</xliff:g>)"</string>
+    <string name="power_usage_list_summary_device" msgid="4461926045610455423">"Uso do dispositivo desde a carga completa (<xliff:g id="RELATIVE_TIME">^1</xliff:g>)"</string>
     <string name="screen_usage_summary" msgid="6687403051423153550">"Tempo durante o que a pantalla estivo activada desde a carga completa"</string>
     <string name="device_usage_list_summary" msgid="5623036661468763251">"Uso do dispositivo desde a carga completa"</string>
     <string name="battery_since_unplugged" msgid="338073389740738437">"Uso da batería desde que se desconectou"</string>
@@ -2017,7 +2029,7 @@
     <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">"A rede de telefonía móbil está en modo de espera"</string>
+    <string name="power_cell" msgid="3392999761958982492">"Rede de telefonía móbil 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>
@@ -2049,7 +2061,7 @@
     <string name="usage_type_computed_power" msgid="5862792259009981479">"Uso de enerxía computado"</string>
     <string name="usage_type_actual_power" msgid="7047814738685578335">"Uso de enerxía observado"</string>
     <string name="battery_action_stop" msgid="649958863744041872">"Forzar a parada"</string>
-    <string name="battery_action_app_details" msgid="7861051816778419018">"Información de aplicacións"</string>
+    <string name="battery_action_app_details" msgid="7861051816778419018">"Información da aplicación"</string>
     <string name="battery_action_app_settings" msgid="4570481408106287454">"Configuración da aplicación"</string>
     <string name="battery_action_display" msgid="7338551244519110831">"Configuración da pantalla"</string>
     <string name="battery_action_wifi" msgid="8181553479021841207">"Configuración da wifi"</string>
@@ -2209,17 +2221,17 @@
     <string name="credentials_unlock_hint" msgid="2301301378040499348">"Escribe o contrasinal do almacenamento de credenciais."</string>
     <string name="credentials_old_password" msgid="7553393815538684028">"Contrasinal actual:"</string>
     <string name="credentials_reset_hint" msgid="6297256880896133631">"Queres eliminar todos os contidos?"</string>
-    <string name="credentials_password_too_short" msgid="7502749986405522663">"O contrasinal debe conter polo menos 8 caracteres."</string>
     <string name="credentials_wrong_password" msgid="2541932597104054807">"Contrasinal incorrecto"</string>
     <string name="credentials_reset_warning" msgid="5320653011511797600">"Contrasinal incorrecto. Tes unha oportunidade máis antes de que se borre o almacenamento de credenciais."</string>
     <string name="credentials_reset_warning_plural" msgid="6514085665301095279">"Contrasinal incorrecto. Tes <xliff:g id="NUMBER">%1$d</xliff:g> oportunidades máis antes de que se borre o almacenamento de credenciais."</string>
     <string name="credentials_erased" msgid="2907836028586342969">"Almacenam. credenciais borrado"</string>
     <string name="credentials_not_erased" msgid="7685932772284216097">"Imposible borrar almacen. credenciais"</string>
     <string name="credentials_enabled" msgid="7588607413349978930">"Almacen. credenciais activado"</string>
-    <string name="credentials_configure_lock_screen_hint" msgid="6757119179588664966">"Tes que definir un PIN ou un contrasinal de pantalla de bloqueo para poder utilizar o almacenamento de credenciais."</string>
+    <string name="credentials_configure_lock_screen_hint" msgid="8058230497337529036">"Para poder usar as credenciais de almacenamento, o dispositivo debe ter unha pantalla de bloqueo segura"</string>
+    <string name="credentials_configure_lock_screen_button" msgid="253239765216055321">"ESTABLECER BLOQUEO"</string>
     <string name="usage_access_title" msgid="332333405495457839">"Apps con acceso de uso"</string>
-    <string name="emergency_tone_title" msgid="1055954530111587114">"Ton de emerxencia"</string>
-    <string name="emergency_tone_summary" msgid="722259232924572153">"Define o comportamento cando se realiza unha chamada de emerxencia"</string>
+    <string name="emergency_tone_title" msgid="1055954530111587114">"Ton de urxencia"</string>
+    <string name="emergency_tone_summary" msgid="722259232924572153">"Define o comportamento cando se realiza unha chamada de urxencia"</string>
     <string name="privacy_settings_title" msgid="2978878794187459190">"Copia de seguranza"</string>
     <string name="backup_section_title" msgid="7952232291452882740">"Copia de seguranza e restauración"</string>
     <string name="personal_data_section_title" msgid="7815209034443782061">"Datos persoais"</string>
@@ -2275,7 +2287,7 @@
     <string name="wifi_setup_forget" msgid="2562847595567347526">"Borrar"</string>
     <string name="wifi_setup_save" msgid="3659235094218508211">"Gardar"</string>
     <string name="wifi_setup_cancel" msgid="3185216020264410239">"Cancelar"</string>
-    <string name="wifi_setup_status_scanning" msgid="5317003416385428036">"Buscando redes…"</string>
+    <string name="wifi_setup_status_scanning" msgid="5317003416385428036">"Explorando redes…"</string>
     <string name="wifi_setup_status_select_network" msgid="3960480613544747397">"Toca unha rede para conectarte a ela"</string>
     <string name="wifi_setup_status_existing_network" msgid="6394925174802598186">"Conéctate a unha rede existente"</string>
     <string name="wifi_setup_status_unsecured_network" msgid="8143046977328718252">"Conéctate a unha rede non protexida"</string>
@@ -2336,8 +2348,6 @@
     <skip />
     <string name="cant_sync_dialog_title" msgid="2777238588398046285">"Non se pode sincronizar manualmente"</string>
     <string name="cant_sync_dialog_message" msgid="1938380442159016449">"A sincronización deste elemento está desactivada actualmente. Para cambiar esta configuración, activa temporalmente os datos en segundo plano e a sincronización automática."</string>
-    <string name="wimax_settings" msgid="2655139497028469039">"4G"</string>
-    <string name="status_wimax_mac_address" msgid="8390791848661413416">"Enderezo MAC 4G"</string>
     <string name="enter_password" msgid="8035706727471334122">"Para iniciar o dispositivo Android, introduce o teu contrasinal"</string>
     <string name="enter_pin" msgid="5305333588093263790">"Para iniciar o dispositivo Android, introduce o teu PIN"</string>
     <string name="enter_pattern" msgid="4187435713036808566">"Para iniciar o dispositivo Android, debuxa o teu padrón"</string>
@@ -2351,6 +2361,7 @@
     <string name="misc_files_selected_count" msgid="4647048020823912088">"seleccionáronse <xliff:g id="NUMBER">%1$d</xliff:g> de <xliff:g id="TOTAL">%2$d</xliff:g>"</string>
     <string name="misc_files_selected_count_bytes" msgid="2876232009069114352">"<xliff:g id="NUMBER">%1$s</xliff:g> de <xliff:g id="TOTAL">%2$s</xliff:g>"</string>
     <string name="select_all" msgid="1562774643280376715">"Seleccionar todo"</string>
+    <string name="data_plan_usage_manage_plans_button_text" msgid="8997761990902708162">"Xestionar plans de datos"</string>
     <string name="data_usage_summary_title" msgid="3804110657238092929">"Uso de datos"</string>
     <string name="data_usage_app_summary_title" msgid="4147258989837459172">"Uso datos da aplicación"</string>
     <string name="data_usage_accounting" msgid="7170028915873577387">"A contabilidade dos datos do operador pode ser diferente á do teu dispositivo."</string>
@@ -2407,8 +2418,8 @@
     <string name="data_usage_app_restrict_dialog" msgid="1466689968707308512">"É posible que esta función provoque que unha aplicación que dependa dos datos en segundo plano deixe de funcionar cando só estean dispoñibles redes móbiles.\n\nPodes atopar controis de uso de datos máis adecuados na configuración dispoñible na aplicación."</string>
     <string name="data_usage_restrict_denied_dialog" msgid="55012417305745608">"A restrición de datos en segundo plano só é posible se estableciches un límite de datos móbiles."</string>
     <string name="data_usage_auto_sync_on_dialog_title" msgid="2438617846762244389">"Activar autosincronización?"</string>
-    <string name="data_usage_auto_sync_on_dialog" product="tablet" msgid="8581983093524041669">"Todos os cambios que efectúes nas túas contas na web copiaranse automaticamente na túa tableta.\n\nÉ posible que algunhas contas tamén copien automaticamente na web os cambios que efectúas na tableta. As contas de Google funcionan desta forma."</string>
-    <string name="data_usage_auto_sync_on_dialog" product="default" msgid="8651376294887142858">"Todos os cambios que efectúes nas túas contas na web copiaranse automaticamente no teu teléfono.\n\nÉ posible que algunhas contas tamén copien automaticamente na web os cambios que efectúas no teléfono. As contas de Google funcionan desta forma."</string>
+    <string name="data_usage_auto_sync_on_dialog" product="tablet" msgid="8581983093524041669">"Todos os cambios que efectúes nas túas contas na web copiaranse automaticamente na túa tableta.\n\nAlgunhas contas tamén poden copiar automaticamente na web os cambios que efectúas na tableta. As contas de Google funcionan desta forma."</string>
+    <string name="data_usage_auto_sync_on_dialog" product="default" msgid="8651376294887142858">"Todos os cambios que efectúes nas túas contas na web copiaranse automaticamente no teu teléfono.\n\nAlgunhas contas tamén poden copiar automaticamente na web os cambios que efectúas no teléfono. As contas de Google funcionan desta forma."</string>
     <string name="data_usage_auto_sync_off_dialog_title" msgid="9013139130490125793">"Desactivar autosincronización?"</string>
     <string name="data_usage_auto_sync_off_dialog" msgid="4025938250775413864">"Isto aforrará datos e uso da batería, pero terás que sincronizar cada conta manualmente para recompilar a información recente e non recibirás notificacións cando se efectúen actualizacións."</string>
     <string name="data_usage_cycle_editor_title" msgid="1373797281540188533">"Data de restablecemento do ciclo de uso"</string>
@@ -2436,8 +2447,11 @@
     <string name="data_usage_metered_mobile" msgid="5423305619126978393">"Redes de telefonía móbil"</string>
     <string name="data_usage_metered_wifi" msgid="1761738002328299714">"Redes wifi de pago por consumo"</string>
     <string name="data_usage_metered_wifi_disabled" msgid="727808462375941567">"Para seleccionar redes de pago por consumo, activa a wifi."</string>
+    <string name="data_usage_metered_auto" msgid="1262028400911918865">"Automaticamente"</string>
+    <string name="data_usage_metered_yes" msgid="9217539611385225894">"De pago por consumo"</string>
+    <string name="data_usage_metered_no" msgid="4025232961929071789">"Con tarifa plana"</string>
     <string name="data_usage_disclaimer" msgid="6887858149980673444">"A contabilidade dos datos do operador pode ser diferente á do teu dispositivo."</string>
-    <string name="cryptkeeper_emergency_call" msgid="198578731586097145">"Chamada de emerxencia"</string>
+    <string name="cryptkeeper_emergency_call" msgid="198578731586097145">"Chamada de urxencia"</string>
     <string name="cryptkeeper_return_to_call" msgid="5613717339452772491">"Volver á chamada"</string>
     <string name="vpn_name" msgid="4689699885361002297">"Nome"</string>
     <string name="vpn_type" msgid="5435733139514388070">"Tipo"</string>
@@ -2527,9 +2541,6 @@
     <string name="backup_pw_set_button_text" msgid="2387480910044648795">"Definir contrasinal"</string>
     <string name="backup_pw_cancel_button_text" msgid="8845630125391744615">"Cancelar"</string>
     <string name="additional_system_update_settings_list_item_title" msgid="214987609894661992">"Actualizacións do sistema"</string>
-    <string name="selinux_status_disabled" msgid="924551035552323327">"Desactivado"</string>
-    <string name="selinux_status_permissive" msgid="6004965534713398778">"Permisivo"</string>
-    <string name="selinux_status_enforcing" msgid="2252703756208463329">"En aplicación"</string>
     <string name="ssl_ca_cert_warning" msgid="2045866713601984673">"É posible que se supervise a rede"</string>
     <string name="done_button" msgid="1991471253042622230">"Feito"</string>
     <plurals name="ssl_ca_cert_dialog_title" formatted="false" msgid="7145092748045794650">
@@ -2608,7 +2619,7 @@
     <string name="user_enable_calling_confirm_message" msgid="8061594235219352787">"O historial de chamadas compartirase con este usuario."</string>
     <string name="user_enable_calling_and_sms_confirm_title" msgid="7243308401401932681">"Activar chamadas telefónicas e SMS?"</string>
     <string name="user_enable_calling_and_sms_confirm_message" msgid="4025082715546544967">"O historial de chamadas e SMS compartirase con este usuario."</string>
-    <string name="emergency_info_title" msgid="208607506217060337">"Información de emerxencia"</string>
+    <string name="emergency_info_title" msgid="208607506217060337">"Información de urxencia"</string>
     <string name="emergency_info_summary" msgid="5062945162967838521">"Información e contactos para <xliff:g id="USER_NAME">%1$s</xliff:g>"</string>
     <string name="application_restrictions" msgid="8207332020898004394">"Permitir aplicacións e contido"</string>
     <string name="apps_with_restrictions_header" msgid="3660449891478534440">"Aplicacións con restricións"</string>
@@ -2653,7 +2664,7 @@
     <string name="call_manager_title" msgid="4479949569744516457">"Xestor de chamadas"</string>
     <!-- no translation found for call_manager_summary (5918261959486952674) -->
     <skip />
-    <string name="cell_broadcast_settings" msgid="4124461751977706019">"Alertas de emerxencia"</string>
+    <string name="cell_broadcast_settings" msgid="4124461751977706019">"Alertas de urxencia"</string>
     <string name="network_operators_settings" msgid="2583178259504630435">"Operadores de rede"</string>
     <string name="access_point_names" msgid="1381602020438634481">"Nomes dos puntos de acceso"</string>
     <string name="enhanced_4g_lte_mode_title" msgid="5808043757309522392">"Modo mellorado de LTE 4G"</string>
@@ -2727,6 +2738,7 @@
       <item quantity="other">Mostrar %d elementos ocultos</item>
       <item quantity="one">Mostrar %d elemento oculto</item>
     </plurals>
+    <string name="dashboard_suggestion_condition_footer_content_description" msgid="2898588191174845961">"Contraer"</string>
     <string name="network_dashboard_title" msgid="4771589228992391573">"Rede e Internet"</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>
@@ -2772,7 +2784,7 @@
     <string name="keywords_users" msgid="3434190133131387942">"restrición, restrinxir, restrinxido"</string>
     <string name="keywords_keyboard_and_ime" msgid="9143339015329957107">"corrección de texto, correcto, son, vibrar, automático, idioma, xesto, suxerir, suxestión, tema, ofensivo, palabra, escribir, emoji, internacional"</string>
     <string name="keywords_reset_apps" msgid="5293291209613191845">"restablecer, preferencias, predeterminadas"</string>
-    <string name="keywords_emergency_app" msgid="3143078441279044780">"emerxencia, en caso de emerxencia, aplicación, predeterminada"</string>
+    <string name="keywords_emergency_app" msgid="3143078441279044780">"urxencia, en caso de urxencia, aplicación, predeterminada"</string>
     <string name="keywords_default_phone_app" msgid="4213090563141778486">"teléfono, marcador, predeterminado"</string>
     <string name="keywords_all_apps" msgid="7814015440655563156">"aplicacións, descarga, aplicacións, sistema"</string>
     <string name="keywords_app_permissions" msgid="4229936435938011023">"aplicacións, permisos, seguranza"</string>
@@ -2795,14 +2807,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 timbre ao <xliff:g id="PERCENTAGE">%1$s</xliff:g>"</string>
+    <string name="sound_settings_summary" msgid="4100853606668287965">"Volume do ton 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 timbre ao 80 %"</string>
+    <string name="sound_settings_example_summary" msgid="2404914514266523165">"Volume do ton 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 timbre"</string>
+    <string name="ring_volume_option_title" msgid="6767101703671248309">"Volume do ton"</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>
@@ -2829,8 +2841,14 @@
       <item quantity="other"><xliff:g id="ON_COUNT">%d</xliff:g> normas automáticas activadas</item>
       <item quantity="one">1 norma automática activada</item>
     </plurals>
-    <string name="zen_mode_settings_title" msgid="842308776768942600">"Preferencias de Non molestar"</string>
-    <string name="zen_mode_priority_settings_title" msgid="2623117023031824309">"Prioridade: só se permite"</string>
+    <string name="zen_mode_settings_title" msgid="1066226840983908121">"Non molestar"</string>
+    <string name="zen_mode_behavior_settings_title" msgid="1463303933529313969">"Comportamento"</string>
+    <string name="zen_mode_behavior_allow_title" msgid="3845615648136218141">"Permitir sons e vibracións de"</string>
+    <string name="zen_mode_behavior_no_sound" msgid="1219626004723208056">"Ningún son"</string>
+    <string name="zen_mode_behavior_total_silence" msgid="6716603819806610626">"Ningún son (silencio total)"</string>
+    <string name="zen_mode_behavior_no_sound_except" msgid="4968477585788243114">"Ningún son agás <xliff:g id="CATEGORIES">%1$s</xliff:g>"</string>
+    <!-- no translation found for zen_mode_behavior_alarms_only (2423480992071472963) -->
+    <skip />
     <string name="zen_mode_automation_settings_title" msgid="4228995740594063774">"Normas automáticas"</string>
     <string name="zen_mode_automation_suggestion_title" msgid="5105443455143476201">"Definir normas de Non molestar"</string>
     <string name="zen_mode_automation_suggestion_summary" msgid="4732808039946935657">"Limita sons e vibracións en certos momentos"</string>
@@ -2856,7 +2874,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 punto de notificación"</string>
+    <string name="notification_badging_title" msgid="5938709971403474078">"Permitir puntos 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>
@@ -2872,13 +2890,15 @@
     <string name="notifications_title" msgid="8086372779371204971">"Notificacións"</string>
     <string name="app_notifications_title" msgid="5810577805218003760">"Notificacións de aplicacións"</string>
     <string name="notification_channel_title" msgid="2260666541030178452">"Categoría da notificación"</string>
+    <string name="notification_group_title" msgid="7180506440133859601">"Grupo de categoría de notificación"</string>
     <string name="notification_importance_title" msgid="848692592679312666">"Importancia"</string>
-    <string name="notification_importance_unspecified" msgid="2196023702875112081">"Deixa que a aplicación decida"</string>
+    <string name="notification_importance_unspecified" msgid="6622173510486113958">"Permitir son"</string>
     <string name="notification_importance_blocked" msgid="7938180808339386300">"Non mostra nunca as notificacións"</string>
     <string name="notification_importance_min" msgid="5455049524984686275">"Nin son nin interrupción visual"</string>
     <string name="notification_importance_low" msgid="8881468429453766553">"Ningún son"</string>
     <string name="notification_importance_default" msgid="5958338024601957516">"Emitir son"</string>
     <string name="notification_importance_high" msgid="2082429479238228527">"Emitir son e aparecer na pantalla"</string>
+    <string name="notification_importance_high_silent" msgid="2667033773703765252">"Mostrar na pantalla"</string>
     <string name="notification_importance_min_title" msgid="6974673091137544803">"Baixa"</string>
     <string name="notification_importance_low_title" msgid="8131254047772814309">"Media"</string>
     <string name="notification_importance_default_title" msgid="9120383978536089489">"Alta"</string>
@@ -2921,8 +2941,13 @@
     <string name="loading_notification_apps" msgid="5031818677010335895">"Cargando aplicacións..."</string>
     <string name="app_notifications_off_desc" msgid="4882445501376722969">"Android bloquea a visualización de notificacións desta aplicación neste dispositivo"</string>
     <string name="channel_notifications_off_desc" msgid="5899225298718840635">"Android bloquea a visualización de notificacións desta categoría neste dispositivo"</string>
+    <string name="channel_group_notifications_off_desc" msgid="1620950416247316370">"Android bloquea a visualización deste grupo de notificacións neste dispositivo"</string>
     <string name="notification_channels" msgid="5346841743182627500">"Categorías"</string>
     <string name="notification_channels_other" msgid="5645317113885788226">"Outro"</string>
+    <plurals name="notification_group_summary" formatted="false" msgid="3420621520561455358">
+      <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> categorías</item>
+      <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> categoría</item>
+    </plurals>
     <string name="no_channels" msgid="3077375508177744586">"Esta aplicación non emitiu notificacións"</string>
     <string name="app_settings_link" msgid="8894946007543660906">"Configuración adicional da aplicación"</string>
     <string name="app_notification_listing_summary_zero" msgid="6482582965081108108">"Activado para todas as aplicacións"</string>
@@ -2999,12 +3024,14 @@
     <string name="zen_mode_from_starred" msgid="2678345811950997027">"Só dos contactos marcados con estrela"</string>
     <string name="zen_mode_from_none" msgid="8219706639954614136">"Ningunha"</string>
     <string name="zen_mode_alarms" msgid="2165302777886552926">"Alarmas"</string>
+    <!-- no translation found for zen_mode_media_system_other (8900209390529859777) -->
+    <skip />
     <string name="zen_mode_reminders" msgid="5458502056440485730">"Recordatorios"</string>
     <string name="zen_mode_events" msgid="7914446030988618264">"Eventos"</string>
     <string name="zen_mode_all_callers" msgid="584186167367236922">"Todos os emisores de chamadas"</string>
     <string name="zen_mode_selected_callers" msgid="3127598874060615742">"Emisores da chamada seleccionados"</string>
     <string name="zen_mode_repeat_callers" msgid="5019521886428322131">"Repetir emisores da chamada"</string>
-    <string name="zen_mode_repeat_callers_summary" msgid="7192713032364140137">"Se a mesma persoa chama por segunda vez nun período de <xliff:g id="MINUTES">%d</xliff:g> minutos, permitir"</string>
+    <string name="zen_mode_repeat_callers_summary" msgid="239685342222975733">"Se a mesma persoa chama por segunda vez nun período de <xliff:g id="MINUTES">%d</xliff:g> minutos"</string>
     <string name="zen_mode_when" msgid="2767193283311106373">"Activar automaticam."</string>
     <string name="zen_mode_when_never" msgid="8809494351918405602">"Nunca"</string>
     <string name="zen_mode_when_every_night" msgid="3122486110091921009">"Todas as noites"</string>
@@ -3033,6 +3060,7 @@
     <string name="zen_mode_screen_off_visual_interruptions" msgid="4850792880144382633">"Coa pantalla desactivada"</string>
     <string name="zen_mode_no_visual_interruptions" msgid="8742776003822778472">"Coa pantalla activada ou desactivada"</string>
     <string name="notification_app_settings_button" msgid="6685640230371477485">"Configuración das notificacións"</string>
+    <string name="suggestion_button_text" msgid="3275010948381252006">"Aceptar"</string>
     <string name="device_feedback" msgid="3238056036766293294">"Enviar comentarios do dispositivo"</string>
     <string name="restr_pin_enter_admin_pin" msgid="1085834515677448072">"Introduce o PIN do administrador"</string>
     <string name="switch_on_text" msgid="1124106706920572386">"Activado"</string>
@@ -3063,8 +3091,8 @@
     <string name="encrypt_talkback_dialog_message_pattern" msgid="2020083142199612743">"Cando introduzas o teu padrón para iniciar este dispositivo, os servizos de accesibilidade como <xliff:g id="SERVICE">%1$s</xliff:g> aínda non estarán dispoñibles."</string>
     <string name="encrypt_talkback_dialog_message_password" msgid="4155875981789127796">"Cando introduzas o teu contrasinal para iniciar este dispositivo, os servizos de accesibilidade como <xliff:g id="SERVICE">%1$s</xliff:g> aínda non estarán dispoñibles."</string>
     <string name="direct_boot_unaware_dialog_message" msgid="7870273558547549125">"Nota: Tras un reinicio, non se pode iniciar esta aplicación ata que desbloquees o teléfono"</string>
-    <string name="imei_information_title" msgid="8499085421609752290">"Información de IMEI"</string>
-    <string name="imei_information_summary" msgid="2074095606556565233">"Información relativa de IMEI"</string>
+    <string name="imei_information_title" msgid="8499085421609752290">"Información do IMEI"</string>
+    <string name="imei_information_summary" msgid="2074095606556565233">"Información relativa ao IMEI"</string>
     <string name="slot_number" msgid="3762676044904653577">"(Rañura<xliff:g id="SLOT_NUM">%1$d</xliff:g>)"</string>
     <string name="launch_by_default" msgid="1840761193189009248">"Abrir de forma predeterminada"</string>
     <string name="app_launch_domain_links_title" msgid="1160925981363706090">"Apertura de ligazóns"</string>
@@ -3076,11 +3104,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 de aplicacións"</string>
+    <string name="notifications_label" msgid="8543457911148619898">"Notificacións da aplicación"</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>
@@ -3202,7 +3230,7 @@
     <string name="decline_remote_bugreport_action" msgid="518720235407565134">"Anular"</string>
     <string name="usb_use_charging_only" msgid="2180443097365214467">"Cargar este dispositivo"</string>
     <string name="usb_use_charging_only_desc" msgid="3066256793008540627">"Só carga o dispositivo"</string>
-    <string name="usb_use_power_only" msgid="6426550616883919530">"Cargar dispositivos"</string>
+    <string name="usb_use_power_only" msgid="6426550616883919530">"Subministrar corrente eléctrica"</string>
     <string name="usb_use_power_only_desc" msgid="3461232831015575152">"Carga o dispositivo conectado. Só funciona con dispositivos compatibles coa carga por USB."</string>
     <string name="usb_use_file_transfers" msgid="7409600791007250137">"Transferir ficheiros"</string>
     <string name="usb_use_file_transfers_desc" msgid="4235764784331804488">"Transferencia de ficheiros a outro dispositivo"</string>
@@ -3217,6 +3245,7 @@
     <string name="usb_summary_file_transfers" msgid="6435943692610175111">"Transferir ficheiros"</string>
     <string name="usb_summary_photo_transfers" msgid="8440204169576585250">"Transferir fotos (PTP)"</string>
     <string name="usb_summary_MIDI" msgid="5687906612187885908">"Usar o dispositivo como MIDI"</string>
+    <string name="sms_mirroring_pref" msgid="6475043279147376031">"Proxección de SMS"</string>
     <string name="background_check_pref" msgid="7550258400138010979">"Comprobación de uso en segundo plano"</string>
     <string name="background_check_title" msgid="4534254315824525593">"Acceso completo en segundo plano"</string>
     <string name="assist_access_context_title" msgid="2269032346698890257">"Usar o texto da pantalla"</string>
@@ -3283,7 +3312,7 @@
     <string name="write_settings_title" msgid="4232152481902542284">"Poden modificar a configuración do sistema"</string>
     <string name="write_system_settings" msgid="3482913590601096763">"Modificar configuración"</string>
     <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="permit_write_settings" msgid="658555006453212691">"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>
@@ -3318,7 +3347,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">"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" 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_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>
@@ -3378,9 +3407,12 @@
     <string name="color_temperature" msgid="2070126836910615605">"Temperatura de cor fría"</string>
     <string name="color_temperature_desc" msgid="4793729830226404052">"Utiliza cores de visualización máis frías"</string>
     <string name="color_temperature_toast" msgid="4974218172133854827">"Para aplicar o cambio de cor, apaga a pantalla"</string>
-    <string name="telephony_monitor_toast" msgid="7003764250271195384">"Para aplicar o cambio do monitor de telefonía, reinicia o dispositivo"</string>
+    <string name="connectivity_monitor_switch" msgid="9059759348648583421">"Monitor de conectividade"</string>
+    <string name="connectivity_monitor_switch_summary" msgid="2828658652378866401">"O monitor de conectividade recompilará rexistros cando detecte un problema e enviará unha notificación ao usuario para solicitarlle que informe dun erro"</string>
+    <string name="connectivity_monitor_toast" msgid="5551859612881173028">"Para aplicar o cambio do monitor de conectividade, reinicia o dispositivo"</string>
     <string name="camera_hal_hdrplus_switch" msgid="8377365197105267466">"Cámara HAL HDR+"</string>
     <string name="camera_hal_hdrplus_toast" msgid="2063703797270055299">"Para aplicar o cambio da cámara HAL HDR+, reinicia o dispositivo"</string>
+    <string name="camera_laser_sensor_switch" msgid="8913588990743234440">"Sensor láser da cámara"</string>
     <string name="ota_disable_automatic_update" msgid="2319639631655915050">"Actualizacións automáticas do sistema"</string>
     <string name="usage" msgid="2977875522080448986">"Uso"</string>
     <string name="cellular_data_usage" msgid="2155683719898158203">"Uso de datos móbiles"</string>
@@ -3406,7 +3438,7 @@
     <string name="data_warning" msgid="209133958008062117">"Aviso de datos"</string>
     <string name="set_data_limit" msgid="2901526323210516923">"Definir límite de datos"</string>
     <string name="data_limit" msgid="1885406964934590552">"Límite de datos"</string>
-    <string name="data_usage_template" msgid="392191945602400904">"Datos usados no período do <xliff:g id="ID_2">%2$s</xliff:g>: <xliff:g id="ID_1">%1$s</xliff:g>"</string>
+    <string name="data_usage_template" msgid="2923744765873163859">"Datos utilizados: <xliff:g id="ID_1">%1$s</xliff:g> (<xliff:g id="ID_2">%2$s</xliff:g>)"</string>
     <string name="configure" msgid="1029654422228677273">"Configurar"</string>
     <string name="data_usage_other_apps" msgid="3272872663517382050">"Outras aplicacións incluídas no uso"</string>
     <plurals name="data_saver_unrestricted_summary" formatted="false" msgid="2635267833484232703">
@@ -3420,7 +3452,7 @@
     <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>
@@ -3475,15 +3507,15 @@
     <string name="button_confirm_convert_fbe" msgid="7101855374850373091">"Limpar e converter"</string>
     <string name="reset_shortcut_manager_throttling" msgid="6495066467198668994">"Restablecer o límite de velocidade de ShortcutManager"</string>
     <string name="reset_shortcut_manager_throttling_complete" msgid="1826770872063707900">"Restableceuse o límite de velocidade de ShortcutManager"</string>
-    <string name="notification_suggestion_title" msgid="4506524937307816475">"Controlar notificacións pantalla bloqueo"</string>
+    <string name="notification_suggestion_title" msgid="387052719462473500">"Información de control sobre a pantalla de bloqueo"</string>
     <string name="notification_suggestion_summary" msgid="8521159741445416875">"Mostrar ou ocultar o contido das notificacións"</string>
     <string name="page_tab_title_summary" msgid="4070309266374993258">"Todo"</string>
     <string name="page_tab_title_support" msgid="8483187649355540109">"Asistencia e consellos"</string>
     <string name="developer_smallest_width" msgid="7516950434587313360">"Menor largura"</string>
     <string name="premium_sms_none" msgid="8268105565738040566">"Ningunha aplicación instalada solicitou acceso ás mensaxes premium"</string>
     <string name="premium_sms_warning" msgid="9086859595338944882">"É posible que teñas que pagar polas mensaxes premium, cuxos custos se engadirán ás facturas do teu operador. Se activas o permiso para unha aplicación, poderás enviar mensaxes premium a través desa aplicación."</string>
-    <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="premium_sms_access" msgid="4660047004791638305">"Acceso ás SMS premium"</string>
+    <string name="bluetooth_disabled" msgid="6244000672828617410">"Desactivado"</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>
     <string name="demo_mode" msgid="2798762752209330277">"Modo de demostración da IU do sistema"</string>
@@ -3585,7 +3617,7 @@
     <string name="web_action_enable_title" msgid="4051513950976670853">"Aplicacións instantáneas"</string>
     <string name="web_action_enable_summary" msgid="3108127559723396382">"Abre as ligazóns en aplicacións, mesmo se non están instaladas"</string>
     <string name="web_action_section_title" msgid="7364647086538399136">"Aplicacións instantáneas"</string>
-    <string name="instant_apps_account" msgid="1433620209791992528">"Reconto de aplicacións instantáneas"</string>
+    <string name="instant_apps_settings" msgid="8827777916518348213">"Preferencias de Aplicacións Instantáneas"</string>
     <string name="domain_url_section_title" msgid="7046835219056428883">"Aplicacións instaladas"</string>
     <string name="automatic_storage_manager_activation_warning" msgid="6353100011690933254">"Agora o xestor de almacenamento administra o teu espazo"</string>
     <string name="account_for_section_header" msgid="5356566418548737121">"Contas para <xliff:g id="USER_NAME">%1$s</xliff:g>"</string>
@@ -3632,7 +3664,9 @@
     <string name="enterprise_privacy_always_on_vpn_personal" msgid="9217774730260037434">"Activouse a VPN sempre activada no teu perfil persoal"</string>
     <string name="enterprise_privacy_always_on_vpn_work" msgid="7244472958208315814">"Activouse a VPN sempre activada no teu perfil de traballo"</string>
     <string name="enterprise_privacy_global_http_proxy" msgid="7936664553416257333">"Configurouse o proxy HTTP global"</string>
-    <string name="enterprise_privacy_ca_certs" msgid="5885892204903688909">"Credenciais de confianza"</string>
+    <string name="enterprise_privacy_ca_certs_device" msgid="2019652712782510262">"Credenciais de confianza"</string>
+    <string name="enterprise_privacy_ca_certs_personal" msgid="2279084820904076599">"Credencias de confianza no teu perfil persoal"</string>
+    <string name="enterprise_privacy_ca_certs_work" msgid="6187377647815301809">"Credencias de confianza no teu perfil de traballo"</string>
     <plurals name="enterprise_privacy_number_ca_certs" formatted="false" msgid="526375234629534165">
       <item quantity="other">Mínimo de <xliff:g id="COUNT_1">%d</xliff:g> certificados de CA</item>
       <item quantity="one">Mínimo de <xliff:g id="COUNT_0">%d</xliff:g> certificado de CA</item>
@@ -3672,7 +3706,7 @@
     <string name="storage_other_apps" msgid="5524321740031718083">"Outras aplicacións"</string>
     <string name="storage_files" msgid="8581083146777364063">"Ficheiros"</string>
     <string name="storage_size_large_alternate" msgid="3550744227788333060">"<xliff:g id="NUMBER">^1</xliff:g>"<small>" <xliff:g id="UNIT">^2</xliff:g>"</small>""</string>
-    <string name="storage_volume_total" msgid="3499221850532701342">"En uso de: <xliff:g id="TOTAL">%1$s</xliff:g>"</string>
+    <string name="storage_volume_total" msgid="3499221850532701342">"en uso de <xliff:g id="TOTAL">%1$s</xliff:g>"</string>
     <string name="storage_percent_full" msgid="6095012055875077036">"en uso"</string>
     <string name="clear_instant_app_data" msgid="2004222610585890909">"Borrar aplicación"</string>
     <string name="clear_instant_app_confirmation" msgid="7451671214898856857">"Queres eliminar esta aplicación instantánea?"</string>
@@ -3691,10 +3725,12 @@
     <string name="storage_manager_indicator_on" msgid="8625551710194584733">"activado"</string>
     <string name="install_type_instant" msgid="3174425974536078647">"Aplicación instantánea"</string>
     <string name="automatic_storage_manager_deactivation_warning" msgid="5605210730828410482">"Queres desactivar o xestor de almacenamento?"</string>
-    <string name="storage_movies_tv" msgid="5498394447562086890">"Aplicacións de películas e televisión"</string>
+    <string name="storage_movies_tv" msgid="5498394447562086890">"Apps de películas e TV"</string>
     <string name="carrier_provisioning" msgid="4398683675591893169">"Información de aprovisionamento do operador"</string>
     <string name="trigger_carrier_provisioning" msgid="3434865918009286187">"Aprovisionamento do operador do activador"</string>
     <string name="new_device_suggestion_title" msgid="698847081680980774">"Cales son as novidades fascinantes?"</string>
-    <string name="new_device_suggestion_summary" msgid="7172709269203435870">"Consulta as 5 funcións principais"</string>
+    <string name="new_device_suggestion_summary" product="default" msgid="206396571522515855">"Realiza unha visita guiada polo teu novo teléfono"</string>
+    <string name="new_device_suggestion_summary" product="tablet" msgid="393751455688210956">"Realiza unha visita guiada pola túa nova tableta"</string>
+    <string name="new_device_suggestion_summary" product="device" msgid="2939870049868336652">"Realiza unha visita guiada polo teu novo dispositivo"</string>
     <string name="disabled_low_ram_device" msgid="3751578499721173344">"Esta función non está dispoñible neste dispositivo"</string>
 </resources>
diff --git a/res/values-gu/arrays.xml b/res/values-gu/arrays.xml
index 525b5c4..e50afeb 100644
--- a/res/values-gu/arrays.xml
+++ b/res/values-gu/arrays.xml
@@ -30,7 +30,7 @@
     <item msgid="8392017019801393511">"તમામ"</item>
   </string-array>
   <string-array name="screen_timeout_entries">
-    <item msgid="3342301044271143016">"15 સેકંડ"</item>
+    <item msgid="3342301044271143016">"15 સેકન્ડ"</item>
     <item msgid="8881760709354815449">"30 સેકન્ડ"</item>
     <item msgid="7589406073232279088">"1 મિનિટ"</item>
     <item msgid="7001195990902244174">"2 મિનિટ"</item>
@@ -40,7 +40,7 @@
   </string-array>
   <string-array name="dream_timeout_entries">
     <item msgid="3149294732238283185">"ક્યારેય નહીં"</item>
-    <item msgid="2194151041885903260">"15 સેકંડ"</item>
+    <item msgid="2194151041885903260">"15 સેકન્ડ"</item>
     <item msgid="5892295237131074341">"30 સેકન્ડ"</item>
     <item msgid="3538441365970038213">"1 મિનિટ"</item>
     <item msgid="412343871668955639">"2 મિનિટ"</item>
@@ -50,8 +50,8 @@
   </string-array>
   <string-array name="lock_after_timeout_entries">
     <item msgid="8929270399652145290">"ત્વરિત"</item>
-    <item msgid="6736512735606834431">"5 સેકંડ"</item>
-    <item msgid="8044619388267891375">"15 સેકંડ"</item>
+    <item msgid="6736512735606834431">"5 સેકન્ડ"</item>
+    <item msgid="8044619388267891375">"15 સેકન્ડ"</item>
     <item msgid="1822002388249545488">"30 સેકન્ડ"</item>
     <item msgid="8538071621211916519">"1 મિનિટ"</item>
     <item msgid="5663439580228932882">"2 મિનિટ"</item>
@@ -100,14 +100,12 @@
     <!-- no translation found for wifi_security_no_eap:0 (2084555984818107151) -->
     <!-- no translation found for wifi_security_no_eap:1 (397579322683471524) -->
     <!-- no translation found for wifi_security_no_eap:2 (1968820975358150484) -->
-    <!-- no translation found for wifi_ap_security:0 (5251664683198623324) -->
-    <!-- no translation found for wifi_ap_security:1 (7989073072260294673) -->
   <string-array name="wifi_eap_method">
     <item msgid="1160193392455075561">"PEAP"</item>
     <item msgid="7981731051382306293">"TLS"</item>
     <item msgid="2892994535305020162">"TTLS"</item>
     <item msgid="435667726254379514">"PWD"</item>
-    <item msgid="8549485714107012129">"SIM"</item>
+    <item msgid="8549485714107012129">"સિમ"</item>
     <item msgid="1023893786681286517">"AKA"</item>
     <item msgid="3030483188676375009">"AKA\'"</item>
   </string-array>
@@ -122,8 +120,8 @@
     <!-- no translation found for wifi_ap_band_config_2G_only:0 (7006771583217001015) -->
   <string-array name="wifi_p2p_wps_setup">
     <item msgid="5085064298144493867">"પુશ બટન"</item>
-    <item msgid="1624323946324499595">"પીઅર ઉપકરણ પરથી PIN"</item>
-    <item msgid="5366790421523328066">"આ ઉપકરણ પરથી PIN"</item>
+    <item msgid="1624323946324499595">"પીઅર ઉપકરણ પરથી પિન"</item>
+    <item msgid="5366790421523328066">"આ ઉપકરણ પરથી પિન"</item>
   </string-array>
   <string-array name="wifi_p2p_status">
     <item msgid="1701505390737218306">"કનેક્ટ કર્યું"</item>
@@ -169,7 +167,7 @@
     <item msgid="5760470455461128892">"કોઈ નહીં"</item>
     <item msgid="7480272092408291086">"MSCHAPV2"</item>
     <item msgid="5881794903338319324">"GTC"</item>
-    <item msgid="5610607665198791980">"SIM"</item>
+    <item msgid="5610607665198791980">"સિમ"</item>
     <item msgid="2860798636241124128">"AKA"</item>
     <item msgid="8926455723452645935">"AKA\'"</item>
   </string-array>
@@ -248,7 +246,7 @@
     <item msgid="446877710771379667">"કૅલેન્ડર વાંચો"</item>
     <item msgid="7674458294386319722">"કૅલેન્ડર સંશોધિત કરો"</item>
     <item msgid="8281201165558093009">"wi-fi સ્કેન કરો"</item>
-    <item msgid="8694611243479480497">"સૂચના"</item>
+    <item msgid="8694611243479480497">"નોટિફિકેશન"</item>
     <item msgid="7776439107987345446">"સેલ સ્કેન"</item>
     <item msgid="514615766544675057">"કૉલ કરો"</item>
     <item msgid="8181415497109310680">"SMS વાંચો"</item>
@@ -270,14 +268,14 @@
     <item msgid="3045529469061083747">"ક્લિપબોર્ડ સંશોધિત કરો"</item>
     <item msgid="5124443975763747838">"મીડિયા બટન્સ"</item>
     <item msgid="4547883971364273343">"ઑડિઓ ફોકસ"</item>
-    <item msgid="2603878814882344450">"માસ્ટર વોલ્યુમ"</item>
-    <item msgid="7136963238377062018">"વૉઇસ વોલ્યુમ"</item>
-    <item msgid="4270236897655923007">"રિંગ વોલ્યુમ"</item>
+    <item msgid="2603878814882344450">"માસ્ટર વૉલ્યૂમ"</item>
+    <item msgid="7136963238377062018">"વૉઇસ વૉલ્યૂમ"</item>
+    <item msgid="4270236897655923007">"રિંગ વૉલ્યૂમ"</item>
     <item msgid="6325739889222559394">"મીડિયા વૉલ્યૂમ"</item>
-    <item msgid="5762123934816216821">"એલાર્મ વોલ્યુમ"</item>
-    <item msgid="785049718065337473">"સૂચના વૉલ્યૂમ"</item>
-    <item msgid="6700305533746877052">"Bluetooth વૉલ્યૂમ"</item>
-    <item msgid="2029227495214047094">"જાગૃત રહો"</item>
+    <item msgid="5762123934816216821">"એલાર્મ વૉલ્યૂમ"</item>
+    <item msgid="785049718065337473">"નોટિફિકેશન વૉલ્યૂમ"</item>
+    <item msgid="6700305533746877052">"બ્લૂટૂથ વૉલ્યૂમ"</item>
+    <item msgid="2029227495214047094">"સક્રિય રાખો"</item>
     <item msgid="26109888160231211">"સ્થાનને મૉનિટર કરો"</item>
     <item msgid="5753382310468855812">"હાઇ પાવર સ્થાન મૉનિટર કરો"</item>
     <item msgid="3356591542543137332">"વપરાશ આંકડા મેળવો"</item>
@@ -315,7 +313,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>
@@ -337,14 +335,14 @@
     <item msgid="5238692940326972503">"ક્લિપબોર્ડ સંશોધિત કરો"</item>
     <item msgid="5753789168376302997">"મીડિયા બટન્સ"</item>
     <item msgid="3265262911688671938">"ઑડિઓ ફોકસ"</item>
-    <item msgid="2098976479485046797">"માસ્ટર વોલ્યુમ"</item>
-    <item msgid="5660213838861789350">"વૉઇસ વોલ્યુમ"</item>
-    <item msgid="7983336752371254444">"રિંગ વોલ્યુમ"</item>
+    <item msgid="2098976479485046797">"માસ્ટર વૉલ્યૂમ"</item>
+    <item msgid="5660213838861789350">"વૉઇસ વૉલ્યૂમ"</item>
+    <item msgid="7983336752371254444">"રિંગ વૉલ્યૂમ"</item>
     <item msgid="7878027809189330917">"મીડિયા વૉલ્યૂમ"</item>
-    <item msgid="7260546305036218513">"એલાર્મ વોલ્યુમ"</item>
-    <item msgid="9103719301075748925">"સૂચના વૉલ્યૂમ"</item>
-    <item msgid="7025966722295861512">"Bluetooth વૉલ્યૂમ"</item>
-    <item msgid="4665183401128289653">"જાગૃત રહો"</item>
+    <item msgid="7260546305036218513">"એલાર્મ વૉલ્યૂમ"</item>
+    <item msgid="9103719301075748925">"નોટિફિકેશન વૉલ્યૂમ"</item>
+    <item msgid="7025966722295861512">"બ્લૂટૂથ વૉલ્યૂમ"</item>
+    <item msgid="4665183401128289653">"સક્રિય રાખો"</item>
     <item msgid="8584357129746649222">"સ્થાન"</item>
     <item msgid="7669257279311110599">"સ્થાન"</item>
     <item msgid="3459320345690097795">"ઉપયોગના આંકડા મેળવો"</item>
@@ -453,7 +451,7 @@
     <item msgid="5069825997142785829">"નિરંતર"</item>
     <item msgid="5779398140277006695">"ટોચની પ્રવૃત્તિ"</item>
     <item msgid="1439598363694578255">"મહત્વપૂર્ણ (અગ્રભૂમિ)"</item>
-    <item msgid="3396458970745718652">"મહત્વપૂર્ણ (પૃષ્ઠભૂમિ)"</item>
+    <item msgid="3396458970745718652">"મહત્વપૂર્ણ (બૅકગ્રાઉન્ડ)"</item>
     <item msgid="5214825238247511992">"બેકઅપ"</item>
     <item msgid="311372689168254967">"ભારે વજન"</item>
     <item msgid="7438189122367820362">"સેવા (ચાલે છે)"</item>
@@ -474,8 +472,8 @@
     <item msgid="6131821495505931173">"લાલ"</item>
   </string-array>
   <string-array name="automatic_storage_management_days">
-    <item msgid="687318592238852312">"30 દિવસથી વધુ જૂનું"</item>
-    <item msgid="2900554746706302178">"60 દિવસથી વધુ જૂનું"</item>
-    <item msgid="5692284879054004388">"90 દિવસથી વધુ જૂનું"</item>
+    <item msgid="687318592238852312">"30 દિવસથી વધુ જૂના"</item>
+    <item msgid="2900554746706302178">"60 દિવસથી વધુ જૂના"</item>
+    <item msgid="5692284879054004388">"90 દિવસથી વધુ જૂના"</item>
   </string-array>
 </resources>
diff --git a/res/values-gu/strings.xml b/res/values-gu/strings.xml
index 165748a..55df6fa 100644
--- a/res/values-gu/strings.xml
+++ b/res/values-gu/strings.xml
@@ -40,11 +40,11 @@
     <string name="radio_info_data_connection_enable" msgid="8656750679353982712">"ડેટા કનેક્શન સક્ષમ કરો"</string>
     <string name="radio_info_data_connection_disable" msgid="8541302390883231216">"ડેટા કનેક્શન અક્ષમ કરો"</string>
     <string name="volte_provisioned_switch_string" msgid="7979882929810283786">"VoLTE ની જોગવાઈ કરી"</string>
-    <string name="vt_provisioned_switch_string" msgid="7876998291744854759">"વિડિઓ કૉલિંગની જોગવાઈ કરી"</string>
+    <string name="vt_provisioned_switch_string" msgid="7876998291744854759">"વીડિઓ કૉલિંગની જોગવાઈ કરી"</string>
     <string name="wfc_provisioned_switch_string" msgid="3985406545172898078">"Wifi કૉલિંગની જોગવાઈ કરી"</string>
     <string name="eab_provisioned_switch_string" msgid="3482272907448592975">"EAB/ઉપસ્થિતિની જોગવાઈ કરી"</string>
     <string name="radio_info_radio_power" msgid="7187666084867419643">"મોબાઇલ રેડિયો પાવર"</string>
-    <string name="radioInfo_menu_viewADN" msgid="7069468158519465139">"SIM સરનામાં પુસ્તિકા જુઓ"</string>
+    <string name="radioInfo_menu_viewADN" msgid="7069468158519465139">"સિમ સરનામાં પુસ્તિકા જુઓ"</string>
     <string name="radioInfo_menu_viewFDN" msgid="7934301566925610318">"ફિક્સ્ડ ડાયલિંગ નંબર્સ જુઓ"</string>
     <string name="radioInfo_menu_viewSDN" msgid="7130280686244955669">"સેવા ડાયલિંગ નંબર્સ જુઓ"</string>
     <string name="radioInfo_menu_getIMS" msgid="185171476413967831">"IMS સેવા સ્થિતિ"</string>
@@ -53,7 +53,7 @@
     <string name="radio_info_ims_reg_status_not_registered" msgid="4438054067642750717">"નોંધણી કરેલ નથી"</string>
     <string name="radio_info_ims_feature_status_available" msgid="3687807290327566879">"ઉપલબ્ધ"</string>
     <string name="radio_info_ims_feature_status_unavailable" msgid="4606182208970114368">"અનુપલબ્ધ"</string>
-    <string name="radio_info_ims_reg_status" msgid="7534612158445529715">"IMS નોંધણી: <xliff:g id="STATUS">%1$s</xliff:g>\nLTE પર વૉઇસ: <xliff:g id="AVAILABILITY_0">%2$s</xliff:g>\nWiFi પર વૉઇસ: <xliff:g id="AVAILABILITY_1">%3$s</xliff:g>\nવિડિઓ કૉલિંગ: <xliff:g id="AVAILABILITY_2">%4$s</xliff:g>\nUT ઇન્ટરફેસ: <xliff:g id="AVAILABILITY_3">%5$s</xliff:g>"</string>
+    <string name="radio_info_ims_reg_status" msgid="7534612158445529715">"IMS નોંધણી: <xliff:g id="STATUS">%1$s</xliff:g>\nLTE પર વૉઇસ: <xliff:g id="AVAILABILITY_0">%2$s</xliff:g>\nWiFi પર વૉઇસ: <xliff:g id="AVAILABILITY_1">%3$s</xliff:g>\nવીડિઓ કૉલિંગ: <xliff:g id="AVAILABILITY_2">%4$s</xliff:g>\nUT ઇન્ટરફેસ: <xliff:g id="AVAILABILITY_3">%5$s</xliff:g>"</string>
     <string name="radioInfo_service_in" msgid="1697703164394784618">"સેવામાં"</string>
     <string name="radioInfo_service_out" msgid="7999094221728929681">"કાર્યરત્ નથી"</string>
     <string name="radioInfo_service_emergency" msgid="6274434235469661525">"ફક્ત કટોકટીના કૉલ્સ"</string>
@@ -74,9 +74,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>
@@ -90,17 +90,17 @@
     <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>
-    <string name="bluetooth_is_discoverable_always" msgid="2849387702249327748">"નજીકનાં તમામ Bluetooth ઉપકરણો પર દૃશ્યક્ષમ"</string>
-    <string name="bluetooth_not_visible_to_other_devices" msgid="9120274591523391910">"અન્ય Bluetooth ઉપકરણોને દૃશ્યક્ષમ નથી"</string>
+    <string name="bluetooth" msgid="5549625000628014477">"બ્લૂટૂથ"</string>
+    <string name="bluetooth_is_discoverable" msgid="8373421452106840526">"નજીકનાં તમામ બ્લૂટૂથ ઉપકરણો પર દૃશ્યક્ષમ (<xliff:g id="DISCOVERABLE_TIME_PERIOD">%1$s</xliff:g>)"</string>
+    <string name="bluetooth_is_discoverable_always" msgid="2849387702249327748">"નજીકનાં તમામ બ્લૂટૂથ ઉપકરણો પર દૃશ્યક્ષમ"</string>
+    <string name="bluetooth_not_visible_to_other_devices" msgid="9120274591523391910">"અન્ય બ્લૂટૂથ ઉપકરણોને દૃશ્યક્ષમ નથી"</string>
     <string name="bluetooth_only_visible_to_paired_devices" msgid="2049983392373296028">"ફક્ત જોડી કરેલ ઉપકરણો પર દૃશ્યક્ષમ છે"</string>
     <string name="bluetooth_visibility_timeout" msgid="8002247464357005429">"દૃશ્યતાની સમયસમાપ્તિ"</string>
     <string name="bluetooth_lock_voice_dialing" msgid="3139322992062086225">"વૉઇસ ડાયલિંગ લૉક કરો"</string>
-    <string name="bluetooth_lock_voice_dialing_summary" msgid="4741338867496787042">"જ્યારે સ્ક્રીન લૉક થયેલ હોય ત્યારે Bluetooth ડાયલરના ઉપયોગને અટકાવો"</string>
-    <string name="bluetooth_devices" msgid="1886018064039454227">"Bluetooth ઉપકરણો"</string>
+    <string name="bluetooth_lock_voice_dialing_summary" msgid="4741338867496787042">"જ્યારે સ્ક્રીન લૉક થયેલ હોય ત્યારે બ્લૂટૂથ ડાયલરના ઉપયોગને અટકાવો"</string>
+    <string name="bluetooth_devices" msgid="1886018064039454227">"બ્લૂટૂથ ઉપકરણો"</string>
     <string name="bluetooth_device_name" msgid="8415828355207423800">"ઉપકરણનું નામ"</string>
     <string name="bluetooth_device_details" msgid="4594773497930028085">"ઉપકરણ સેટિંગ્સ"</string>
     <string name="bluetooth_profile_details" msgid="6823621790324933337">"પ્રોફાઇલ સેટિંગ્સ"</string>
@@ -113,49 +113,49 @@
     <string name="bluetooth_disconnect_all_profiles" product="tablet" msgid="6611038575213485336">"તમારું ટૅબ્લેટ <xliff:g id="DEVICE_NAME">%1$s</xliff:g>થી ડિસ્કનેક્ટ થઈ જશે."</string>
     <string name="bluetooth_disconnect_all_profiles" product="device" msgid="3995834526315103965">"તમારું ઉપકરણ <xliff:g id="DEVICE_NAME">%1$s</xliff:g>થી ડિસ્કનેક્ટ થઈ જશે."</string>
     <string name="bluetooth_disconnect_dialog_ok" msgid="3308586619539119106">"ડિસ્કનેક્ટ"</string>
-    <string name="bluetooth_empty_list_user_restricted" msgid="603521233563983689">"તમારી પાસે Bluetooth સેટિંગ્સ બદલવાની પરવાનગી નથી."</string>
-    <string name="bluetooth_pairing_pref_title" msgid="7429413067477968637">"નવા ઉપકરણની જોડી કરો"</string>
-    <string name="bluetooth_is_visible_message" msgid="6222396240776971862">"જ્યારે Bluetooth  સેટિંગ્સ ખુલ્લી હોય ત્યારે <xliff:g id="DEVICE_NAME">%1$s</xliff:g> નજીકનાં ઉપકરણોને દૃશ્યક્ષમ છે."</string>
-    <string name="bluetooth_footer_mac_message" product="default" msgid="1109366350000220283">"ફોનનું Bluetooth સરનામું: <xliff:g id="BLUETOOTH_MAC_ADDRESS">%1$s</xliff:g>"</string>
-    <string name="bluetooth_footer_mac_message" product="tablet" msgid="6807634484499166486">"ટૅબ્લેટનું Bluetooth સરનામું: <xliff:g id="BLUETOOTH_MAC_ADDRESS">%1$s</xliff:g>"</string>
-    <string name="bluetooth_footer_mac_message" product="device" msgid="8413944740341742061">"ઉપકરણનું Bluetooth સરનામું: <xliff:g id="BLUETOOTH_MAC_ADDRESS">%1$s</xliff:g>"</string>
+    <string name="bluetooth_empty_list_user_restricted" msgid="603521233563983689">"તમારી પાસે બ્લૂટૂથ સેટિંગ્સ બદલવાની પરવાનગી નથી."</string>
+    <string name="bluetooth_pairing_pref_title" msgid="7429413067477968637">"નવા ઉપકરણ સાથે જોડાણ બનાવો"</string>
+    <string name="bluetooth_is_visible_message" msgid="6222396240776971862">"જ્યારે બ્લૂટૂથ  સેટિંગ્સ ખુલ્લી હોય ત્યારે <xliff:g id="DEVICE_NAME">%1$s</xliff:g> નજીકનાં ઉપકરણોને દૃશ્યક્ષમ છે."</string>
+    <string name="bluetooth_footer_mac_message" product="default" msgid="1109366350000220283">"ફોનનું બ્લૂટૂથ સરનામું: <xliff:g id="BLUETOOTH_MAC_ADDRESS">%1$s</xliff:g>"</string>
+    <string name="bluetooth_footer_mac_message" product="tablet" msgid="6807634484499166486">"ટૅબ્લેટનું બ્લૂટૂથ સરનામું: <xliff:g id="BLUETOOTH_MAC_ADDRESS">%1$s</xliff:g>"</string>
+    <string name="bluetooth_footer_mac_message" product="device" msgid="8413944740341742061">"ઉપકરણનું બ્લૂટૂથ સરનામું: <xliff:g id="BLUETOOTH_MAC_ADDRESS">%1$s</xliff:g>"</string>
     <string name="bluetooth_is_disconnect_question" msgid="5334933802445256306">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> ને ડિસ્કનેક્ટ કરીએ?"</string>
     <string name="bluetooth_broadcasting" msgid="16583128958125247">"બ્રૉડકાસ્ટ કરી રહ્યાં છે"</string>
     <string name="bluetooth_disable_profile_title" msgid="5916643979709342557">"પ્રોફાઇલ અક્ષમ કરીએ?"</string>
     <string name="bluetooth_disable_profile_message" msgid="2895844842011809904">"આને અક્ષમ કરવામાં આવશે:&lt;br&gt;&lt;b&gt;<xliff:g id="PROFILE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;દ્વારા:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%2$s</xliff:g>&lt;/b&gt;"</string>
     <string name="bluetooth_unknown" msgid="644716244548801421"></string>
-    <string name="bluetooth_device" msgid="5291950341750186887">"અનામાંકિત Bluetooth ઉપકરણ"</string>
+    <string name="bluetooth_device" msgid="5291950341750186887">"અનામાંકિત બ્લૂટૂથ ઉપકરણ"</string>
     <string name="progress_scanning" msgid="192587958424295789">"શોધી રહ્યું છે"</string>
-    <string name="bluetooth_no_devices_found" msgid="1085232930277181436">"કોઈ નજીકનાં Bluetooth ઉપકરણો મળ્યાં નહોતા."</string>
-    <string name="bluetooth_notif_ticker" msgid="4726721390078512173">"Bluetooth જોડી કરવાની વિનંતી"</string>
+    <string name="bluetooth_no_devices_found" msgid="1085232930277181436">"કોઈ નજીકનાં બ્લૂટૂથ ઉપકરણો મળ્યાં નહોતા."</string>
+    <string name="bluetooth_notif_ticker" msgid="4726721390078512173">"બ્લૂટૂથ જોડી કરવાની વિનંતી"</string>
     <string name="bluetooth_notif_title" msgid="2485175521845371514">"જોડી કરવાની વિનંતી"</string>
     <string name="bluetooth_notif_message" msgid="5057417127600942904">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> સાથે જોડી કરવા માટે ટૅપ કરો."</string>
     <string name="bluetooth_show_received_files" msgid="3144149432555230410">"પ્રાપ્ત થયેલી ફાઇલો"</string>
-    <string name="device_picker" msgid="4978696506172252813">"Bluetooth ઉપકરણ પસંદ કરો"</string>
-    <string name="bluetooth_ask_enablement" msgid="3387222809404177525">"<xliff:g id="APP_NAME">%1$s</xliff:g>, Bluetooth ચાલુ કરવા માગે છે"</string>
-    <string name="bluetooth_ask_disablement" msgid="5890386255790160573">"<xliff:g id="APP_NAME">%1$s</xliff:g>, Bluetooth બંધ કરવા માગે છે"</string>
-    <string name="bluetooth_ask_enablement_no_name" msgid="1644353686104482763">"કોઈ ઍપ્લિકેશન Bluetooth ચાલુ કરવા માગે છે"</string>
-    <string name="bluetooth_ask_disablement_no_name" msgid="9218830122674868548">"કોઈ ઍપ્લિકેશન Bluetooth બંધ કરવા માગે છે"</string>
-    <string name="bluetooth_ask_discovery" product="tablet" msgid="4791779658660357386">"<xliff:g id="APP_NAME">%1$s</xliff:g>, તમારા ટેબ્લેટને અન્ય Bluetooth ઉપકરણો પર <xliff:g id="TIMEOUT">%2$d</xliff:g> સેકંડ માટે દૃશ્યક્ષમ બનાવવા માગે છે."</string>
-    <string name="bluetooth_ask_discovery" product="default" msgid="1308225382575535366">"<xliff:g id="APP_NAME">%1$s</xliff:g>, <xliff:g id="TIMEOUT">%2$d</xliff:g> સેકંડ માટે તમારા ફોનને અન્ય Bluetooth ઉપકરણો પર દૃશ્યક્ષમ બનાવવા માગે છે."</string>
-    <string name="bluetooth_ask_discovery_no_name" product="tablet" msgid="225715443477752935">"કોઈ ઍપ્લિકેશન તમારા ટેબ્લેટને અન્ય Bluetooth ઉપકરણો પર <xliff:g id="TIMEOUT">%1$d</xliff:g> સેકંડ માટે દૃશ્યક્ષમ બનાવવા માગે છે."</string>
-    <string name="bluetooth_ask_discovery_no_name" product="default" msgid="4949152735544109994">"કોઈ ઍપ્લિકેશન તમારા ફોનને અન્ય Bluetooth ઉપકરણો પર <xliff:g id="TIMEOUT">%1$d</xliff:g> સેકંડ માટે દૃશ્યક્ષમ બનાવવા માગે છે."</string>
-    <string name="bluetooth_ask_lasting_discovery" product="tablet" msgid="8528329166577187961">"<xliff:g id="APP_NAME">%1$s</xliff:g>, તમારા ટેબ્લેટને અન્ય Bluetooth ઉપકરણો પર દૃશ્યક્ષમ બનાવવા માગે છે. તમે આને પછીથી Bluetooth સેટિંગ્સમાં બદલી શકો છો."</string>
-    <string name="bluetooth_ask_lasting_discovery" product="default" msgid="4398738575307583138">"<xliff:g id="APP_NAME">%1$s</xliff:g>, તમારા ફોનને અન્ય Bluetooth ઉપકરણો પર દૃશ્યક્ષમ બનાવવા માગે છે. તમે આને પછીથી Bluetooth સેટિંગ્સમાં બદલી શકો છો."</string>
-    <string name="bluetooth_ask_lasting_discovery_no_name" product="tablet" msgid="1702590641426207062">"કોઈ ઍપ્લિકેશન તમારા ટેબ્લેટને અન્ય Bluetooth ઉપકરણો પર દૃશ્યક્ષમ બનાવવા માગે છે. તમે આને પછીથી Bluetooth સેટિંગ્સમાં બદલી શકો છો."</string>
-    <string name="bluetooth_ask_lasting_discovery_no_name" product="default" msgid="8549952177383992238">"કોઈ ઍપ્લિકેશન તમારા ફોનને અન્ય Bluetooth ઉપકરણો પર દૃશ્યક્ષમ બનાવવા માગે છે. તમે આને પછીથી Bluetooth સેટિંગ્સમાં બદલી શકો છો."</string>
-    <string name="bluetooth_ask_enablement_and_discovery" product="tablet" msgid="1141843490422565755">"<xliff:g id="APP_NAME">%1$s</xliff:g>, Bluetooth ચાલુ કરવા અને તમારા ટેબ્લેટને અન્ય ઉપકરણો પર <xliff:g id="TIMEOUT">%2$d</xliff:g> સેકંડ માટે દૃશ્યક્ષમ બનાવવા માગે છે."</string>
-    <string name="bluetooth_ask_enablement_and_discovery" product="default" msgid="5195836980079191473">"<xliff:g id="APP_NAME">%1$s</xliff:g>, Bluetooth ચાલુ કરવા અને તમારા ફોનને અન્ય ઉપકરણો પર <xliff:g id="TIMEOUT">%2$d</xliff:g> સેકંડ માટે દૃશ્યક્ષમ બનાવવા માગે છે."</string>
-    <string name="bluetooth_ask_enablement_and_discovery_no_name" product="tablet" msgid="7009338445281693765">"કોઈ ઍપ્લિકેશન Bluetooth ચાલુ કરવા અને તમારા ટેબ્લેટને અન્ય ઉપકરણો પર <xliff:g id="TIMEOUT">%1$d</xliff:g> સેકંડ માટે દૃશ્યક્ષમ બનાવવા માગે છે."</string>
-    <string name="bluetooth_ask_enablement_and_discovery_no_name" product="default" msgid="8386904242279878734">"ઍપ્લિકેશન Bluetooth ચાલુ કરવા અને તમારા ફોનને અન્ય ઉપકરણો પર <xliff:g id="TIMEOUT">%1$d</xliff:g> સેકંડ માટે દૃશ્યક્ષમ બનાવવા માગે છે."</string>
-    <string name="bluetooth_ask_enablement_and_lasting_discovery" product="tablet" msgid="2279471426575892686">"<xliff:g id="APP_NAME">%1$s</xliff:g>, Bluetooth ચાલુ કરવા અને તમારા ટેબ્લેટને અન્ય ઉપકરણો પર દૃશ્યક્ષમ બનાવવા માગે છે. તમે આને પછીથી Bluetooth સેટિંગ્સમાં બદલી શકો છો."</string>
-    <string name="bluetooth_ask_enablement_and_lasting_discovery" product="default" msgid="6961969825475461450">"<xliff:g id="APP_NAME">%1$s</xliff:g>, Bluetooth ચાલુ કરવા અને તમારા ફોનને અન્ય ઉપકરણો પર દૃશ્યક્ષમ બનાવવા માગે છે. તમે આને પછીથી Bluetooth સેટિંગ્સમાં બદલી શકો છો."</string>
-    <string name="bluetooth_ask_enablement_and_lasting_discovery_no_name" product="tablet" msgid="692477613671555006">"કોઈ ઍપ્લિકેશન Bluetooth ચાલુ કરવા અને તમારા ટેબ્લેટને અન્ય ઉપકરણો પર દૃશ્યક્ષમ બનાવવા માગે છે. તમે આને પછીથી Bluetooth સેટિંગ્સમાં બદલી શકો છો."</string>
-    <string name="bluetooth_ask_enablement_and_lasting_discovery_no_name" product="default" msgid="6374480121751597648">"કોઈ ઍપ્લિકેશન Bluetooth ચાલુ કરવા અને તમારા ફોનને અન્ય ઉપકરણો પર દૃશ્યક્ષમ બનાવવા માગે છે. તમે આને પછીથી Bluetooth સેટિંગ્સમાં બદલી શકો છો."</string>
-    <string name="bluetooth_turning_on" msgid="4850574877288036646">"Bluetooth ચાલુ કરી રહ્યું છે…"</string>
-    <string name="bluetooth_turning_off" msgid="2337747302892025192">"Bluetooth બંધ થઈ રહ્યું છે…"</string>
+    <string name="device_picker" msgid="4978696506172252813">"બ્લૂટૂથ ઉપકરણ પસંદ કરો"</string>
+    <string name="bluetooth_ask_enablement" msgid="3387222809404177525">"<xliff:g id="APP_NAME">%1$s</xliff:g>, બ્લૂટૂથ ચાલુ કરવા માગે છે"</string>
+    <string name="bluetooth_ask_disablement" msgid="5890386255790160573">"<xliff:g id="APP_NAME">%1$s</xliff:g>, બ્લૂટૂથ બંધ કરવા માગે છે"</string>
+    <string name="bluetooth_ask_enablement_no_name" msgid="1644353686104482763">"કોઈ ઍપ્લિકેશન બ્લૂટૂથ ચાલુ કરવા માગે છે"</string>
+    <string name="bluetooth_ask_disablement_no_name" msgid="9218830122674868548">"કોઈ ઍપ્લિકેશન બ્લૂટૂથ બંધ કરવા માગે છે"</string>
+    <string name="bluetooth_ask_discovery" product="tablet" msgid="4791779658660357386">"<xliff:g id="APP_NAME">%1$s</xliff:g>, તમારા ટેબ્લેટને અન્ય બ્લૂટૂથ ઉપકરણો પર <xliff:g id="TIMEOUT">%2$d</xliff:g> સેકન્ડ માટે દૃશ્યક્ષમ બનાવવા માગે છે."</string>
+    <string name="bluetooth_ask_discovery" product="default" msgid="1308225382575535366">"<xliff:g id="APP_NAME">%1$s</xliff:g>, <xliff:g id="TIMEOUT">%2$d</xliff:g> સેકન્ડ માટે તમારા ફોનને અન્ય બ્લૂટૂથ ઉપકરણો પર દૃશ્યક્ષમ બનાવવા માગે છે."</string>
+    <string name="bluetooth_ask_discovery_no_name" product="tablet" msgid="225715443477752935">"કોઈ ઍપ્લિકેશન તમારા ટેબ્લેટને અન્ય બ્લૂટૂથ ઉપકરણો પર <xliff:g id="TIMEOUT">%1$d</xliff:g> સેકન્ડ માટે દૃશ્યક્ષમ બનાવવા માગે છે."</string>
+    <string name="bluetooth_ask_discovery_no_name" product="default" msgid="4949152735544109994">"કોઈ ઍપ્લિકેશન તમારા ફોનને અન્ય બ્લૂટૂથ ઉપકરણો પર <xliff:g id="TIMEOUT">%1$d</xliff:g> સેકન્ડ માટે દૃશ્યક્ષમ બનાવવા માગે છે."</string>
+    <string name="bluetooth_ask_lasting_discovery" product="tablet" msgid="8528329166577187961">"<xliff:g id="APP_NAME">%1$s</xliff:g>, તમારા ટેબ્લેટને અન્ય બ્લૂટૂથ ઉપકરણો પર દૃશ્યક્ષમ બનાવવા માગે છે. તમે આને પછીથી બ્લૂટૂથ સેટિંગ્સમાં બદલી શકો છો."</string>
+    <string name="bluetooth_ask_lasting_discovery" product="default" msgid="4398738575307583138">"<xliff:g id="APP_NAME">%1$s</xliff:g>, તમારા ફોનને અન્ય બ્લૂટૂથ ઉપકરણો પર દૃશ્યક્ષમ બનાવવા માગે છે. તમે આને પછીથી બ્લૂટૂથ સેટિંગ્સમાં બદલી શકો છો."</string>
+    <string name="bluetooth_ask_lasting_discovery_no_name" product="tablet" msgid="1702590641426207062">"કોઈ ઍપ્લિકેશન તમારા ટેબ્લેટને અન્ય બ્લૂટૂથ ઉપકરણો પર દૃશ્યક્ષમ બનાવવા માગે છે. તમે આને પછીથી બ્લૂટૂથ સેટિંગ્સમાં બદલી શકો છો."</string>
+    <string name="bluetooth_ask_lasting_discovery_no_name" product="default" msgid="8549952177383992238">"કોઈ ઍપ્લિકેશન તમારા ફોનને અન્ય બ્લૂટૂથ ઉપકરણો પર દૃશ્યક્ષમ બનાવવા માગે છે. તમે આને પછીથી બ્લૂટૂથ સેટિંગ્સમાં બદલી શકો છો."</string>
+    <string name="bluetooth_ask_enablement_and_discovery" product="tablet" msgid="1141843490422565755">"<xliff:g id="APP_NAME">%1$s</xliff:g>, બ્લૂટૂથ ચાલુ કરવા અને તમારા ટેબ્લેટને અન્ય ઉપકરણો પર <xliff:g id="TIMEOUT">%2$d</xliff:g> સેકન્ડ માટે દૃશ્યક્ષમ બનાવવા માગે છે."</string>
+    <string name="bluetooth_ask_enablement_and_discovery" product="default" msgid="5195836980079191473">"<xliff:g id="APP_NAME">%1$s</xliff:g>, બ્લૂટૂથ ચાલુ કરવા અને તમારા ફોનને અન્ય ઉપકરણો પર <xliff:g id="TIMEOUT">%2$d</xliff:g> સેકન્ડ માટે દૃશ્યક્ષમ બનાવવા માગે છે."</string>
+    <string name="bluetooth_ask_enablement_and_discovery_no_name" product="tablet" msgid="7009338445281693765">"કોઈ ઍપ્લિકેશન બ્લૂટૂથ ચાલુ કરવા અને તમારા ટેબ્લેટને અન્ય ઉપકરણો પર <xliff:g id="TIMEOUT">%1$d</xliff:g> સેકન્ડ માટે દૃશ્યક્ષમ બનાવવા માગે છે."</string>
+    <string name="bluetooth_ask_enablement_and_discovery_no_name" product="default" msgid="8386904242279878734">"ઍપ્લિકેશન બ્લૂટૂથ ચાલુ કરવા અને તમારા ફોનને અન્ય ઉપકરણો પર <xliff:g id="TIMEOUT">%1$d</xliff:g> સેકન્ડ માટે દૃશ્યક્ષમ બનાવવા માગે છે."</string>
+    <string name="bluetooth_ask_enablement_and_lasting_discovery" product="tablet" msgid="2279471426575892686">"<xliff:g id="APP_NAME">%1$s</xliff:g>, બ્લૂટૂથ ચાલુ કરવા અને તમારા ટેબ્લેટને અન્ય ઉપકરણો પર દૃશ્યક્ષમ બનાવવા માગે છે. તમે આને પછીથી બ્લૂટૂથ સેટિંગ્સમાં બદલી શકો છો."</string>
+    <string name="bluetooth_ask_enablement_and_lasting_discovery" product="default" msgid="6961969825475461450">"<xliff:g id="APP_NAME">%1$s</xliff:g>, બ્લૂટૂથ ચાલુ કરવા અને તમારા ફોનને અન્ય ઉપકરણો પર દૃશ્યક્ષમ બનાવવા માગે છે. તમે આને પછીથી બ્લૂટૂથ સેટિંગ્સમાં બદલી શકો છો."</string>
+    <string name="bluetooth_ask_enablement_and_lasting_discovery_no_name" product="tablet" msgid="692477613671555006">"કોઈ ઍપ્લિકેશન બ્લૂટૂથ ચાલુ કરવા અને તમારા ટેબ્લેટને અન્ય ઉપકરણો પર દૃશ્યક્ષમ બનાવવા માગે છે. તમે આને પછીથી બ્લૂટૂથ સેટિંગ્સમાં બદલી શકો છો."</string>
+    <string name="bluetooth_ask_enablement_and_lasting_discovery_no_name" product="default" msgid="6374480121751597648">"કોઈ ઍપ્લિકેશન બ્લૂટૂથ ચાલુ કરવા અને તમારા ફોનને અન્ય ઉપકરણો પર દૃશ્યક્ષમ બનાવવા માગે છે. તમે આને પછીથી બ્લૂટૂથ સેટિંગ્સમાં બદલી શકો છો."</string>
+    <string name="bluetooth_turning_on" msgid="4850574877288036646">"બ્લૂટૂથ ચાલુ કરી રહ્યું છે…"</string>
+    <string name="bluetooth_turning_off" msgid="2337747302892025192">"બ્લૂટૂથ બંધ થઈ રહ્યું છે…"</string>
     <string name="bluetooth_auto_connect" msgid="40711424456733571">"સ્વતઃ કનેક્ટ કરો"</string>
-    <string name="bluetooth_connection_permission_request" msgid="4747918249032890077">"Bluetooth કનેક્શન વિનંતી"</string>
+    <string name="bluetooth_connection_permission_request" msgid="4747918249032890077">"બ્લૂટૂથ કનેક્શન વિનંતી"</string>
     <string name="bluetooth_connection_notif_message" msgid="3603316575471431846">"\"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>\" સાથે કનેક્ટ કરવા માટે ટૅપ કરો."</string>
     <string name="bluetooth_connection_dialog_text" msgid="8455427559949998023">"શું તમે \"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>\" સાથે કનેક્ટ કરવા માંગો છો?"</string>
     <string name="bluetooth_phonebook_request" msgid="3951420080540915279">"ફોન પુસ્તિકા ઍક્સેસની વિનંતી"</string>
@@ -164,11 +164,11 @@
     <string name="bluetooth_pb_remember_choice" msgid="3622898084442402071">"ફરીથી પૂછશો નહીં"</string>
     <string name="bluetooth_map_request" msgid="4595727689513143902">"સંદેશ ઍક્સેસ વિનંતી"</string>
     <string name="bluetooth_map_acceptance_dialog_text" msgid="8712508202081143737">"%1$s તમારા સંદેશા અ‍ૅક્સેસ કરવા માંગે છે. %2$s ને અ‍ૅક્સેસ આપીએ?"</string>
-    <string name="bluetooth_sap_request" msgid="2669762224045354417">"SIM ઍક્સેસ વિનંતી"</string>
-    <string name="bluetooth_sap_acceptance_dialog_text" msgid="4414253873553608690">"<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g> તમારા SIM કાર્ડને અ‍ૅક્સેસ કરવા માગે છે. SIM કાર્ડની અ‍ૅક્સેસને મંજૂરી આપવું કનેક્શનના સમયગાળા માટે તમારા ઉપકરણ પર ડેટા કનેક્ટિવિટીને અક્ષમ કરશે. <xliff:g id="DEVICE_NAME_1">%2$s?</xliff:g> ને અ‍ૅક્સેસ આપો"</string>
-    <string name="bluetooth_device_name_summary" msgid="4757990010751789977">"અન્ય ઉપકરણોને \'<xliff:g id="DEVICE_NAME">^1</xliff:g>\' તરીકે દેખાય છે"</string>
+    <string name="bluetooth_sap_request" msgid="2669762224045354417">"સિમ ઍક્સેસ વિનંતી"</string>
+    <string name="bluetooth_sap_acceptance_dialog_text" msgid="4414253873553608690">"<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g> તમારા સિમ કાર્ડને અ‍ૅક્સેસ કરવા માગે છે. સિમ કાર્ડની અ‍ૅક્સેસને મંજૂરી આપવું કનેક્શનના સમયગાળા માટે તમારા ઉપકરણ પર ડેટા કનેક્ટિવિટીને અક્ષમ કરશે. <xliff:g id="DEVICE_NAME_1">%2$s?</xliff:g> ને અ‍ૅક્સેસ આપો"</string>
+    <string name="bluetooth_device_name_summary" msgid="522235742194965734">"તે અન્ય ઉપકરણોને \'<xliff:g id="DEVICE_NAME">^1</xliff:g>\' તરીકે દેખાય છે"</string>
     <string name="bluetooth_paired_device_title" msgid="8638994696317952019">"તમારા ઉપકરણો"</string>
-    <string name="bluetooth_pairing_page_title" msgid="7712127387361962608">"નવા ઉપકરણની જોડી કરો"</string>
+    <string name="bluetooth_pairing_page_title" msgid="7712127387361962608">"નવા ઉપકરણ સાથે જોડાણ બનાવો"</string>
     <string name="date_and_time" msgid="9062980487860757694">"તારીખ અને સમય"</string>
     <string name="choose_timezone" msgid="1362834506479536274">"સમય ઝોન પસંદ કરો"</string>
     <!-- no translation found for intent_sender_data_label (6332324780477289261) -->
@@ -233,19 +233,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>
@@ -271,7 +271,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>
@@ -286,7 +286,7 @@
     <string name="airplane_mode" msgid="8837269988154128601">"એરપ્લેન મોડ"</string>
     <string name="radio_controls_title" msgid="3447085191369779032">"વધુ"</string>
     <string name="wireless_networks_settings_title" msgid="3643009077742794212">"વાયરલેસ અને નેટવર્ક્સ"</string>
-    <string name="radio_controls_summary" msgid="1838624369870907268">"Wi‑Fi, Bluetooth, એરપ્લેન મોડ, મોબાઇલ નેટવર્ક્સ અને VPN સંચાલિત કરો"</string>
+    <string name="radio_controls_summary" msgid="1838624369870907268">"વાઇ-ફાઇ, બ્લૂટૂથ, એરપ્લેન મોડ, મોબાઇલ નેટવર્ક્સ અને VPN સંચાલિત કરો"</string>
     <string name="cellular_data_title" msgid="6835451574385496662">"મોબાઇલ ડેટા"</string>
     <string name="calls_title" msgid="3544471959217176768">"કૉલ્સ"</string>
     <string name="sms_messages_title" msgid="1778636286080572535">"SMS સંદેશા"</string>
@@ -309,9 +309,11 @@
     <string name="date_time_auto" msgid="7076906458515908345">"સ્વચાલિત તારીખ અને સમય"</string>
     <string name="date_time_auto_summaryOn" msgid="4609619490075140381">"નેટવર્ક દ્વારા પ્રદાન કરવામાં આવેલ સમયનો ઉપયોગ કરો"</string>
     <string name="date_time_auto_summaryOff" msgid="8698762649061882791">"નેટવર્ક દ્વારા પ્રદાન કરવામાં આવેલ સમયનો ઉપયોગ કરો"</string>
-    <string name="zone_auto" msgid="334783869352026648">"સ્વચલિત સમય ઝોન"</string>
+    <string name="zone_auto" msgid="334783869352026648">"સ્વચાલિત સમય ઝોન"</string>
     <string name="zone_auto_summaryOn" msgid="6142830927278458314">"નેટવર્ક દ્વારા પ્રદાન કરાયેલ સમય ઝોનનો ઉપયોગ કરો"</string>
     <string name="zone_auto_summaryOff" msgid="2597745783162041390">"નેટવર્ક દ્વારા પ્રદાન કરાયેલ સમય ઝોનનો ઉપયોગ કરો"</string>
+    <string name="date_time_24hour_auto" msgid="2117383168985653422">"24-કલાકનો આપમેળે ફોર્મેટ"</string>
+    <string name="date_time_24hour_auto_summary" msgid="6351812925651480277">"ડિફૉલ્ટ લોકેલનો ઉપયોગ કરો"</string>
     <string name="date_time_24hour_title" msgid="3203537578602803850">"24‑કલાકનું ફોર્મેટ"</string>
     <string name="date_time_24hour" msgid="1193032284921000063">"24-કલાક ફોર્મેટનો ઉપયોગ કરો"</string>
     <string name="date_time_set_time_title" msgid="6296795651349047016">"સમય"</string>
@@ -334,21 +336,20 @@
     <string name="security_enable_widgets_disabled_summary" msgid="6392489775303464905">"વ્યવસ્થાપકે અક્ષમ કરેલ"</string>
     <string name="owner_info_settings_summary" msgid="7472393443779227052">"કોઈ નહીં"</string>
     <string name="owner_info_settings_status" msgid="120407527726476378">"<xliff:g id="COUNT_0">%1$d</xliff:g> / <xliff:g id="COUNT_1">%2$d</xliff:g>"</string>
-    <string name="owner_info_settings_edit_text_hint" msgid="7591869574491036360">"દા.ત., જૉનું Android."</string>
+    <string name="owner_info_settings_edit_text_hint" msgid="7591869574491036360">"દા.ત., જો નું Android."</string>
     <string name="user_info_settings_title" msgid="1195015434996724736">"વપરાશકર્તા માહિતી"</string>
     <string name="show_profile_info_on_lockscreen_label" msgid="2741208907263877990">"લૉક સ્ક્રીન પર પ્રોફાઇલ માહિતી બતાવો"</string>
     <string name="profile_info_settings_title" msgid="3518603215935346604">"પ્રોફાઇલ માહિતી"</string>
     <string name="Accounts_settings_title" msgid="1643879107901699406">"એકાઉન્ટ્સ"</string>
     <string name="location_settings_title" msgid="1369675479310751735">"સ્થાન"</string>
     <string name="account_settings_title" msgid="626177544686329806">"એકાઉન્ટ્સ"</string>
-    <!-- no translation found for security_settings_title (4918904614964215087) -->
-    <skip />
+    <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_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>
@@ -366,13 +367,16 @@
     <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નોંધ: તમારી ફિંગરપ્રિન્ટ એક સશક્ત પેટર્ન અથવા PIN કરતાં ઓછી સુરક્ષિત હોઈ શકે છે."</string>
+    <string name="security_settings_fingerprint_enroll_introduction_message" msgid="3508870672887336095">"તમારા ફોનને અનલૉક કરવા, ખરીદીઓ અધિકૃત કરવા અથવા ઍપ્લિકેશનોમાં સાઇન ઇન કરવા માટે બસ ફિંગરપ્રિન્ટ સેન્સરને ટચ કરો. તમે કોની ફિંગરપ્રિન્ટ ઉમેરી છે તે બાબતે સાવચેત રહો. એક ઉમેરેલ ફિંગરપ્રિન્ટ પણ આમાંની કોઈપણ વસ્તુઓ કરી શકે છે.\n\nનોંધ: તમારી ફિંગરપ્રિન્ટ એક સશક્ત પૅટર્ન અથવા પિન કરતાં ઓછી સુરક્ષિત હોઈ શકે છે."</string>
     <string name="security_settings_fingerprint_enroll_introduction_message_unlock_disabled" msgid="1550756694054944874">"તમારા ફોનને અનલૉક કરવા અથવા ખરીદી મંજૂર કરવા માટે તમારી ફિંગરપ્રિન્ટનો ઉપયોગ કરો.\n\nનોંધ: આ ઉપકરણને અનલૉક કરવા માટે તમે તમારી ફિંગરપ્રિન્ટનો ઉપયોગ નહીં કરી શકો. વધુ માહિતી માટે, તમારી સંસ્થાના વ્યવસ્થાપકનો સંપર્ક કરો."</string>
-    <string name="security_settings_fingerprint_enroll_introduction_message_setup" msgid="6817326798834882531">"તમારા ફોનને અનલૉક કરવા અથવા ખરીદી મંજૂર કરવા માટે તમારી ફિંગરપ્રિન્ટનો ઉપયોગ કરો.\n\nનોંધ: સશક્ત પૅટર્ન અથવા PIN કરતાં તમારી ફિંગરપ્રિન્ટ ઓછી સુરક્ષિત હોઈ શકે છે."</string>
+    <string name="security_settings_fingerprint_enroll_introduction_message_setup" msgid="6817326798834882531">"તમારા ફોનને અનલૉક કરવા અથવા ખરીદી મંજૂર કરવા માટે તમારી ફિંગરપ્રિન્ટનો ઉપયોગ કરો.\n\nનોંધ: સશક્ત પૅટર્ન અથવા પિન કરતાં તમારી ફિંગરપ્રિન્ટ ઓછી સુરક્ષિત હોઈ શકે છે."</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel" msgid="3199351118385606526">"રદ કરો"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue" msgid="7472492858148162530">"ચાલુ રાખો"</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel_setup" msgid="5021369420474432665">"છોડો"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue_setup" msgid="1961957425135180242">"આગલી"</string>
+    <string name="setup_fingerprint_enroll_skip_title" msgid="362050541117362034">"ફિંગરપ્રિન્ટ છોડી દઈએ?"</string>
+    <string name="setup_fingerprint_enroll_skip_after_adding_lock_text" msgid="958990414356204763">"ફિંગરપ્રિન્ટ સેટઅપ કરવા માત્ર એકથી બે મિનિટ જરૂરી છે. જો તમે આ છોડી દો, તો તમે સેટિંગ્સમાં પછીથી તમારી ફિંગરપ્રિન્ટ ઉમેરી શકો છો."</string>
+    <string name="lock_screen_intro_skip_title" msgid="4988210105913705679">"સ્ક્રીન લૉક છોડી દઈએ?"</string>
     <string name="lock_screen_intro_skip_dialog_text_frp" product="tablet" msgid="1581834104051243425">"ઉપકરણની સુરક્ષાની સુવિધાઓ ચાલુ કરવામાં નહીં આવે. જો આ ટૅબ્લેટ ખોવાઈ જાય, ચોરાઈ જાય કે રીસેટ કરવામાં આવે, તો તમે અન્ય લોકોને તેનો ઉપયોગ કરતા અટકાવી નહીં શકો."</string>
     <string name="lock_screen_intro_skip_dialog_text_frp" product="device" msgid="4629503416877189572">"ઉપકરણની સુરક્ષાની સુવિધાઓ ચાલુ કરવામાં નહીં આવે. જો આ ઉપકરણ ખોવાઈ જાય, ચોરાઈ જાય કે રીસેટ કરવામાં આવે, તો તમે અન્ય લોકોને તેનો ઉપયોગ કરતા અટકાવી નહીં શકો."</string>
     <string name="lock_screen_intro_skip_dialog_text_frp" product="default" msgid="2423428240245737909">"ઉપકરણની સુરક્ષાની સુવિધાઓ ચાલુ કરવામાં નહીં આવે. જો આ ફોન ખોવાઈ જાય, ચોરાઈ જાય કે રીસેટ કરવામાં આવે, તો તમે અન્ય લોકોને તેનો ઉપયોગ કરતા અટકાવી નહીં શકો."</string>
@@ -381,15 +385,15 @@
     <string name="lock_screen_intro_skip_dialog_text" product="default" msgid="3008526710555416125">"ઉપકરણની સુરક્ષાની સુવિધાઓ ચાલુ કરવામાં નહીં આવે. જો આ ફોન ખોવાઈ કે ચોરાઈ જાય, તો તમે અન્ય લોકોને તેનો ઉપયોગ કરતા અટકાવી નહીં શકો."</string>
     <string name="skip_anyway_button_label" msgid="2323522873558834513">"કોઈપણ રીતે છોડો"</string>
     <string name="go_back_button_label" msgid="4745265266186209467">"પાછા જાઓ"</string>
-    <string name="security_settings_fingerprint_enroll_find_sensor_title" msgid="3051496861358227199">"સેન્સરને ટચ કરો"</string>
+    <string name="security_settings_fingerprint_enroll_find_sensor_title" msgid="3051496861358227199">"સેન્સરને સ્પર્શ કરો"</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_message" msgid="8793966374365960368">"તે તમારા ફોનના પાછળના ભાગ પર છે. તમારી પ્રથમ આંગળીનો ઉપયોગ કરો."</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_content_description" msgid="2058830032070449160">"ઉપકરણ અને ફિંગરપ્રિન્ટ સેન્સર સ્થાન સાથેનું ચિત્ર"</string>
     <string name="security_settings_fingerprint_enroll_dialog_name_label" msgid="7086763077909041106">"નામ"</string>
     <string name="security_settings_fingerprint_enroll_dialog_ok" msgid="4150384963879569750">"ઓકે"</string>
     <string name="security_settings_fingerprint_enroll_dialog_delete" msgid="4114615413240707936">"કાઢી નાખો"</string>
-    <string name="security_settings_fingerprint_enroll_start_title" msgid="2068961812439460133">"સેન્સરને ટચ કરો"</string>
+    <string name="security_settings_fingerprint_enroll_start_title" msgid="2068961812439460133">"સેન્સરને સ્પર્શ કરો"</string>
     <string name="security_settings_fingerprint_enroll_start_message" msgid="3909929328942564524">"સેન્સર પર તમારી આંગળી મૂકો અને વાઇબ્રેશનનો અનુભવ થવા પર ઉઠાવી લો"</string>
-    <string name="security_settings_fingerprint_enroll_repeat_title" msgid="2819679722403209778">"ઉપાડો, પછી ફરી ટચ કરો"</string>
+    <string name="security_settings_fingerprint_enroll_repeat_title" msgid="2819679722403209778">"ઉપાડો, પછી ફરી સ્પર્શ કરો"</string>
     <string name="security_settings_fingerprint_enroll_repeat_message" msgid="6158989350522518586">"તમારી ફિંગરપ્રિન્ટના વિવિધ ભાગ ઉમેરવા માટે તમારી આંગળી ઉપાડતા રહો"</string>
     <string name="security_settings_fingerprint_enroll_finish_title" msgid="7567276170287972230">"ફિંગરપ્રિન્ટ ઉમેરી"</string>
     <string name="security_settings_fingerprint_enroll_finish_message" msgid="4796715961273420536">"જ્યારે તમે આ આઇકન જુઓ, ત્યારે ઓળખ માટે અથવા ખરીદી મંજૂર કરવા માટે તમારી ફિંગરપ્રિન્ટનો ઉપયોગ કરો."</string>
@@ -407,7 +411,7 @@
     <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>
@@ -415,21 +419,21 @@
     <string name="fingerprint_delete_title" msgid="1368196182612202898">"\'<xliff:g id="FINGERPRINT_ID">%1$s</xliff:g>\'ને દૂર કરો"</string>
     <string name="fingerprint_delete_message" msgid="8597787803567398131">"શું તમે આ ફિંગરપ્રિન્ટ કાઢી નાખવા માગો છો?"</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">"તમે તમારા એકાઉન્ટ્સ, સેટિંગ્સ, ડાઉનલોડ કરેલ ઍપ્લિકેશનો અને તેમનો ડેટા, મીડિયા અને અન્ય ફાઇલોને એન્ક્રિપ્ટ કરી શકો છો. તમે તમારું ટેબ્લેટ એન્ક્રિપ્ટ કરી લો તે પછી, તમે એક સ્ક્રીન લૉક સેટ કરી લીધું છે તેમ ધારીને (તે છે કોઈ પેટર્ન અથવા સંખ્યાકીય 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">"તમે તમારા એકાઉન્ટ, સેટિંગ્સ, ડાઉનલોડ કરેલ ઍપ્લિકેશનો અને તેમનો ડેટા, મીડિયા અને અન્ય ફાઇલોને એન્ક્રિપ્ટ કરી શકો છો. તમે તમારું ટૅબ્લેટ એન્ક્રિપ્ટ કરી લો તે પછી, તમે એક સ્ક્રીન લૉક સેટ કરી લીધું છે તેમ ધારીને (તે છે કોઈ પૅટર્ન અથવા સંખ્યાકીય પિન અથવા પાસવર્ડ), તમે તેને ચાલુ કરો ત્યારે દર વખતે ટૅબ્લેટને ડિક્રિપ્ટ કરવા માટે સ્ક્રીનને અનલૉક કરવાની જરૂર પડશે. તમારો તમામ ડેટા ભૂસી નાખીને ડિક્રિપ્ટ કરવા માટેનો અન્ય બીજો રસ્તો માત્ર ફેક્ટરી ડેટા રીસેટ કરવાનો છે.\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">"તમે એન્ક્રિપ્શન પ્રારંભ કરી શકો છો તે પહેલાં તમારે લૉક સ્ક્રીન PIN કે પાસવર્ડ સેટ કરવો પડશે."</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>
@@ -458,7 +462,7 @@
     <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="lock_settings_picker_fingerprint_added_security_message" msgid="5768002109707648463">"વધારાની સુરક્ષા માટે, એક બૅકઅપ સ્ક્રીન લૉક સેટ કરો."</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>
@@ -468,15 +472,15 @@
     <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">"પેટર્ન, PIN અથવા પાસવર્ડ સુરક્ષા બદલો અથવા અક્ષમ કરો"</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>
@@ -484,66 +488,74 @@
     <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">"ફિંગરપ્રિન્ટ + PIN"</string>
+    <string name="fingerprint_unlock_set_unlock_pattern" msgid="4939057588092120368">"ફિંગરપ્રિન્ટ + પૅટર્ન"</string>
+    <string name="fingerprint_unlock_set_unlock_pin" msgid="8010746824051056986">"ફિંગરપ્રિન્ટ + પિન"</string>
     <string name="fingerprint_unlock_set_unlock_password" msgid="7351131075806338634">"ફિંગરપ્રિન્ટ + પાસવર્ડ"</string>
     <string name="fingerprint_unlock_skip_fingerprint" msgid="1441077909803666681">"ફિંગરપ્રિન્ટ વગર ચાલુ રાખો"</string>
     <string name="fingerprint_unlock_title" msgid="2826226740306003991">"તમે તમારા ફોનને તમારી ફિંગરપ્રિન્ટનો ઉપયોગ કરીને અનલૉક કરી શકો છો. સુરક્ષા માટે, આ વિકલ્પ હેતુ એક બેકઅપ સ્ક્રીન લૉક આવશ્યક છે."</string>
-    <string name="unlock_set_unlock_disabled_summary" msgid="2051593894736282302">"વ્યવસ્થાપક, એન્ક્રિપ્શન નીતિ અથવા ઓળખપત્ર સંગ્રહ દ્વારા અક્ષમ કરાયેલ"</string>
+    <string name="unlock_set_unlock_disabled_summary" msgid="2051593894736282302">"વ્યવસ્થાપક, એન્ક્રિપ્શન નીતિ અથવા ઓળખપત્ર સ્ટોરેજ દ્વારા અક્ષમ કરાયેલ"</string>
     <string name="unlock_set_unlock_mode_off" msgid="5881952274566013651">"કોઈ નહીં"</string>
     <string name="unlock_set_unlock_mode_none" msgid="8467360084676871617">"સ્વાઇપ કરો"</string>
-    <string name="unlock_set_unlock_mode_pattern" msgid="7837270780919299289">"પેટર્ન"</string>
+    <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>
-    <!-- no translation found for unlock_disable_frp_warning_content_pattern_fingerprint (2986105377420905314) -->
-    <skip />
-    <string name="unlock_disable_frp_warning_content_pin" msgid="586996206210265131">"તમારા PIN વગર ઉપકરણ સુરક્ષા સુવિધાઓ કામ કરશે નહીં."</string>
-    <!-- no translation found for unlock_disable_frp_warning_content_pin_fingerprint (3370462835533123695) -->
-    <skip />
+    <string name="unlock_disable_frp_warning_content_pattern" msgid="8869767290771023461">"તમારી પૅટર્ન વગર ઉપકરણ સુરક્ષા સુવિધાઓ કામ કરશે નહીં."</string>
+    <string name="unlock_disable_frp_warning_content_pattern_fingerprint" msgid="2986105377420905314">"ઉપકરણની સુરક્ષા સુવિધાઓ તમારી પૅટર્ન વગર કાર્ય કરશે નહીં.<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="3370462835533123695">"ઉપકરણની સુરક્ષા સુવિધાઓ તમારા પિન વગર કાર્ય કરશે નહીં.<xliff:g id="EMPTY_LINE">
+
+</xliff:g>આ ઉપકરણમાંથી તમારી સાચવેલ રેફરન્સ ફાઇલને પણ દૂર કરવામાં આવશે અને તમે તમારા ફોનને અનલૉક કરી શકશો નહીં, ખરીદીઓને અધિકૃત કરી શકશો નહીં અથવા તેના વડે ઍપ્લિકેશનો પર સાઇન ઇન કરી શકશો નહીં."</string>
     <string name="unlock_disable_frp_warning_content_password" msgid="5420612686852555537">"તમારા પાસવર્ડ વગર ઉપકરણ સુરક્ષા સુવિધાઓ કામ કરશે નહીં."</string>
-    <!-- no translation found for unlock_disable_frp_warning_content_password_fingerprint (3595476296430536798) -->
-    <skip />
+    <string name="unlock_disable_frp_warning_content_password_fingerprint" msgid="3595476296430536798">"ઉપકરણની સુરક્ષા સુવિધાઓ તમારા પાસવર્ડ વગર કાર્ય કરશે નહીં.<xliff:g id="EMPTY_LINE">
+
+</xliff:g>આ ઉપકરણમાંથી તમારી સાચવેલ રેફરન્સ ફાઇલને પણ દૂર કરવામાં આવશે અને તમે તમારા ફોનને અનલૉક કરી શકશો નહીં, ખરીદીઓને અધિકૃત કરી શકશો નહીં અથવા તેના વડે ઍપ્લિકેશનો પર સાઇન ઇન કરી શકશો નહીં."</string>
     <string name="unlock_disable_frp_warning_content_unknown" msgid="1550718040483548220">"તમારા સ્ક્રીન લૉક વગર ઉપકરણ સુરક્ષા સુવિધાઓ કામ કરશે નહીં."</string>
-    <!-- no translation found for unlock_disable_frp_warning_content_unknown_fingerprint (3679351662094349506) -->
-    <skip />
-    <string name="unlock_disable_frp_warning_content_pattern_profile" msgid="8682200103576359918">"તમારી પેટર્ન વગર પ્રોફાઇલ સુરક્ષા સુવિધાઓ કામ કરશે નહીં."</string>
-    <!-- no translation found for unlock_disable_frp_warning_content_pattern_fingerprint_profile (6718155854303231675) -->
-    <skip />
-    <string name="unlock_disable_frp_warning_content_pin_profile" msgid="7790688070593867767">"તમારા PIN વગર પ્રોફાઇલ સુરક્ષા સુવિધાઓ કામ કરશે નહીં."</string>
-    <!-- no translation found for unlock_disable_frp_warning_content_pin_fingerprint_profile (4209564603132870532) -->
-    <skip />
+    <string name="unlock_disable_frp_warning_content_unknown_fingerprint" msgid="3679351662094349506">"ઉપકરણની સુરક્ષા સુવિધાઓ તમારા સ્ક્રીન લૉક વગર કાર્ય કરશે નહીં.<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="6718155854303231675">"પ્રોફાઇલની સુરક્ષા સુવિધાઓ તમારી પૅટર્ન વગર કાર્ય કરશે નહીં.<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="4209564603132870532">"પ્રોફાઇલની સુરક્ષા સુવિધાઓ તમારા પિન વગર કાર્ય કરશે નહીં.<xliff:g id="EMPTY_LINE">
+
+</xliff:g>આ પ્રોફાઇલમાંથી તમારી સાચવેલ રેફરન્સ ફાઇલ પણ દૂર કરવામાં આવશે અને તમે તમારી પ્રોફાઇલને અનલૉક કરી શકશો નહીં, ખરીદીઓને અધિકૃત કરી શકશો નહીં અથવા તેના વડે ઍપ્લિકેશનો પર સાઇન ઇન કરી શકશો નહીં."</string>
     <string name="unlock_disable_frp_warning_content_password_profile" msgid="7569285520567674461">"તમારા પાસવર્ડ વગર પ્રોફાઇલ સુરક્ષા સુવિધાઓ કામ કરશે નહીં."</string>
-    <!-- no translation found for unlock_disable_frp_warning_content_password_fingerprint_profile (2994300676764706047) -->
-    <skip />
+    <string name="unlock_disable_frp_warning_content_password_fingerprint_profile" msgid="2994300676764706047">"પ્રોફાઇલની સુરક્ષા સુવિધાઓ તમારા પાસવર્ડ વગર કાર્ય કરશે નહીં.<xliff:g id="EMPTY_LINE">
+
+</xliff:g>આ પ્રોફાઇલમાંથી તમારી સાચવેલ રેફરન્સ ફાઇલને પણ દૂર કરવામાં આવશે અને તમે તમારી પ્રોફાઇલને અનલૉક કરી શકશો નહીં, ખરીદીઓને અધિકૃત કરી શકશો નહીં અથવા તેના વડે ઍપ્લિકેશનો પર સાઇન ઇન કરી શકશો નહીં."</string>
     <string name="unlock_disable_frp_warning_content_unknown_profile" msgid="6984215718701688202">"તમારા સ્ક્રીન લૉક વગર પ્રોફાઇલ સુરક્ષા સુવિધાઓ કામ કરશે નહીં."</string>
-    <!-- no translation found for unlock_disable_frp_warning_content_unknown_fingerprint_profile (4994062501123299418) -->
-    <skip />
+    <string name="unlock_disable_frp_warning_content_unknown_fingerprint_profile" msgid="4994062501123299418">"પ્રોફાઇલ સુરક્ષા સુવિધાઓ તમારા સ્ક્રીન લૉક વગર કાર્ય કરશે નહીં.<xliff:g id="EMPTY_LINE">
+
+</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">"અનલૉક PIN બદલો"</string>
+    <string name="unlock_change_lock_pattern_title" msgid="2044092014872741130">"અનલૉક પૅટર્ન બદલો"</string>
+    <string name="unlock_change_lock_pin_title" msgid="806629901095938484">"અનલૉક પિન બદલો"</string>
     <string name="unlock_change_lock_password_title" msgid="5606298470358768865">"અનલૉક પાસવર્ડ બદલો"</string>
     <string name="lock_failed_attempts_before_wipe" msgid="2219711062197089783">"ફરી પ્રયાસ કરો. <xliff:g id="TOTAL_ATTEMPTS">%2$d</xliff:g> માંથી <xliff:g id="CURRENT_ATTEMPTS">%1$d</xliff:g> પ્રયત્ન."</string>
     <string name="lock_last_attempt_before_wipe_warning_title" msgid="4277765862798876826">"તમારો ડેટા કાઢી નાખવામાં આવશે"</string>
-    <string name="lock_last_pattern_attempt_before_wipe_device" msgid="1688030823464420974">"જો તમે આગલા પ્રયત્નમાં ખોટી પેટર્ન દાખલ કરશો, તો આ ઉપકરણનો ડેટા કાઢી નાખવામાં આવશે"</string>
-    <string name="lock_last_pin_attempt_before_wipe_device" msgid="5350785938296254352">"જો તમે આગલા પ્રયત્નમાં ખોટો PIN દાખલ કરશો, તો આ ઉપકરણનો ડેટા કાઢી નાખવામાં આવશે"</string>
+    <string name="lock_last_pattern_attempt_before_wipe_device" msgid="1688030823464420974">"જો તમે આગલા પ્રયત્નમાં ખોટી પૅટર્ન દાખલ કરશો, તો આ ઉપકરણનો ડેટા કાઢી નાખવામાં આવશે"</string>
+    <string name="lock_last_pin_attempt_before_wipe_device" msgid="5350785938296254352">"જો તમે આગલા પ્રયત્નમાં ખોટો પિન દાખલ કરશો, તો આ ઉપકરણનો ડેટા કાઢી નાખવામાં આવશે"</string>
     <string name="lock_last_password_attempt_before_wipe_device" msgid="6208035114731421034">"જો તમે આગલા પ્રયત્નમાં ખોટો પાસવર્ડ દાખલ કરશો, તો આ ઉપકરણનો ડેટા કાઢી નાખવામાં આવશે"</string>
-    <string name="lock_last_pattern_attempt_before_wipe_user" msgid="7851504071368235547">"જો તમે આગલા પ્રયત્નમાં ખોટી પેટર્ન દાખલ કરશો, તો આ વપરાશકર્તાને કાઢી નાખવામાં આવશે"</string>
-    <string name="lock_last_pin_attempt_before_wipe_user" msgid="4049024921333961715">"જો તમે આગલા પ્રયત્નમાં ખોટો PIN દાખલ કરશો,તો આ વપરાશકર્તાને કાઢી નાખવામાં આવશે"</string>
+    <string name="lock_last_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">"જો તમે આગલા પ્રયત્નમાં ખોટો PIN દાખલ કરશો, તો તમારી કાર્ય પ્રોફાઇલ અને તેનો ડેટા કાઢી નાખવામાં આવશે"</string>
-    <string name="lock_last_password_attempt_before_wipe_profile" msgid="6786586046975042158">"જો તમે આગલા પ્રયત્નમાં ખોટો પાસવર્ડ દાખલ કરશો, તો તમારી કાર્ય પ્રોફાઇલ અને તેનો ડેટા કાઢી નાખવામાં આવશે"</string>
+    <string name="lock_last_pattern_attempt_before_wipe_profile" msgid="2437716252059050291">"જો તમે આગલા પ્રયત્નમાં ખોટી પૅટર્ન દાખલ કરશો, તો તમારી કાર્યાલયની પ્રોફાઇલ અને તેનો ડેટા કાઢી નાખવામાં આવશે"</string>
+    <string name="lock_last_pin_attempt_before_wipe_profile" msgid="5799931839127476913">"જો તમે આગલા પ્રયત્નમાં ખોટો પિન દાખલ કરશો, તો તમારી કાર્યાલયની પ્રોફાઇલ અને તેનો ડેટા કાઢી નાખવામાં આવશે"</string>
+    <string name="lock_last_password_attempt_before_wipe_profile" msgid="6786586046975042158">"જો તમે આગલા પ્રયત્નમાં ખોટો પાસવર્ડ દાખલ કરશો, તો તમારી કાર્યાલયની પ્રોફાઇલ અને તેનો ડેટા કાઢી નાખવામાં આવશે"</string>
     <string name="lock_failed_attempts_now_wiping_device" msgid="5047439819181833824">"ઘણા બધા ખોટા પ્રયત્નો. આ ઉપકરણોનો ડેટા કાઢી નાખવામાં આવશે."</string>
     <string name="lock_failed_attempts_now_wiping_user" msgid="6188180643494518001">"ઘણા બધા ખોટા પ્રયત્નો. આ વપરાશકર્તાને કાઢી નાખવામાં આવશે."</string>
-    <string name="lock_failed_attempts_now_wiping_profile" msgid="1745475043685915442">"ઘણા બધા ખોટા પ્રયત્નો. આ કાર્ય પ્રોફાઇલ અને તેનો ડેટા કાઢી નાખવામાં આવશે."</string>
+    <string name="lock_failed_attempts_now_wiping_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_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>
@@ -581,6 +593,7 @@
     <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="lockpassword_clear_label" msgid="5724429464960458155">"સાફ કરો"</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>
@@ -597,18 +610,18 @@
       <item quantity="one"><xliff:g id="COUNT">%d</xliff:g> સક્રિય ટ્રસ્ટ એજન્ટ</item>
       <item quantity="other"><xliff:g id="COUNT">%d</xliff:g> સક્રિય ટ્રસ્ટ એજન્ટ</item>
     </plurals>
-    <string name="bluetooth_quick_toggle_title" msgid="1037056952714061893">"Bluetooth"</string>
-    <string name="bluetooth_quick_toggle_summary" msgid="5293641680139873341">"Bluetooth ચાલુ કરો"</string>
-    <string name="bluetooth_settings" msgid="1810521656168174329">"Bluetooth"</string>
-    <string name="bluetooth_settings_title" msgid="1908745291161353016">"Bluetooth"</string>
+    <string name="bluetooth_quick_toggle_title" msgid="1037056952714061893">"બ્લૂટૂથ"</string>
+    <string name="bluetooth_quick_toggle_summary" msgid="5293641680139873341">"બ્લૂટૂથ ચાલુ કરો"</string>
+    <string name="bluetooth_settings" msgid="1810521656168174329">"બ્લૂટૂથ"</string>
+    <string name="bluetooth_settings_title" msgid="1908745291161353016">"બ્લૂટૂથ"</string>
     <string name="bluetooth_settings_summary" msgid="2091062709530570462">"કનેક્શન્સ સંચાલિત કરો, ઉપકરણનું નામ અને શોધક્ષમતા સેટ કરો"</string>
     <string name="bluetooth_pairing_request" msgid="2605098826364694673">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> સાથે જોડી કરીએ?"</string>
-    <string name="bluetooth_pairing_key_msg" msgid="418124944140102021">"Bluetooth નો જોડી બનાવવાનો કોડ"</string>
+    <string name="bluetooth_pairing_key_msg" msgid="418124944140102021">"બ્લૂટૂથ નો જોડી બનાવવાનો કોડ"</string>
     <string name="bluetooth_enter_passkey_msg" msgid="6813273136442138444">"જોડી બનાવવાનો કોડ લખો તે પછી Return અથવા Enter દબાવો"</string>
     <string name="bluetooth_enable_alphanumeric_pin" msgid="7222713483058171357">"પિન અક્ષરો અથવા સંજ્ઞાઓનો સમાવે છે"</string>
     <string name="bluetooth_pin_values_hint" msgid="3815897557875873646">"સામાન્ય રીતે 0000 અથવા 1234"</string>
     <string name="bluetooth_pin_values_hint_16_digits" msgid="7849359451584101077">"16 અંક હોવા આવશ્યક છે"</string>
-    <string name="bluetooth_enter_pin_other_device" msgid="4637977124526813470">"તમારે આ PIN ને અન્ય ઉપકરણ પર પણ લખવાની જરૂર પડી શકે છે."</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>
@@ -628,23 +641,23 @@
     <string name="bluetooth_pairing_dialog_title" msgid="1417255032435317301">"આ ઉપકરણ સાથે જોડી કરીએ?"</string>
     <string name="bluetooth_pairing_dialog_sharing_phonebook_title" msgid="7664141669886358618">"ફોન પુસ્તિકા શેર કરીએ?"</string>
     <string name="bluetooth_pairing_dialog_contants_request" msgid="5531109163573611348">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> તમારા સંપર્કો અને કૉલ ઇતિહાસને અ‍ૅક્સેસ કરવા માંગે છે."</string>
-    <string name="bluetooth_pairing_dialog_paring_request" msgid="8451248193517851958">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>, Bluetooth સાથે જોડી કરવા માંગે છે. જ્યારે કનેક્ટ થયેલ હોય, ત્યારે તેની પાસે તમારા સંપર્કો અને કૉલ ઇતિહાસની ઍક્સેસ હશે."</string>
+    <string name="bluetooth_pairing_dialog_paring_request" msgid="8451248193517851958">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>, બ્લૂટૂથ સાથે જોડી કરવા માંગે છે. જ્યારે કનેક્ટ થયેલ હોય, ત્યારે તેની પાસે તમારા સંપર્કો અને કૉલ ઇતિહાસની ઍક્સેસ હશે."</string>
     <string name="bluetooth_preference_paired_devices" msgid="1970524193086791964">"જોડી કરેલા ઉપકરણો"</string>
     <string name="bluetooth_preference_found_devices" msgid="1647983835063249680">"ઉપલબ્ધ ઉપકરણો"</string>
     <string name="bluetooth_preference_no_found_devices" msgid="7594339669961811591">"કોઈ ઉપકરણો ઉપલબ્ધ નથી"</string>
     <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>
+    <string name="bluetooth_advanced_titlebar" msgid="2142159726881547669">"વિગતવાર બ્લૂટૂથ"</string>
+    <string name="bluetooth_empty_list_bluetooth_off" msgid="6351930724051893423">"જ્યારે બ્લૂટૂથ ચાલુ હોય, ત્યારે તમારું ઉપકરણ નજીકનાં અન્ય બ્લૂટૂથ ઉપકરણો સાથે સંચાર કરી શકે છે."</string>
+    <string name="ble_scan_notify_text" msgid="1295915006005700650">"સ્થાન સચોટતા બહેતર બનાવવા માટે, સિસ્ટમ ઍપ્લિકેશનો અને સેવાઓ હજી પણ બ્લૂટૂથ ઉપકરણો શોધી શકે છે. તમે આને <xliff:g id="LINK_BEGIN_0">LINK_BEGIN</xliff:g>સ્કેનિંગ સેટિંગ્સ<xliff:g id="LINK_END_1">LINK_END</xliff:g>માં બદલી શકો છો."</string>
     <string name="bluetooth_connect_failed" msgid="4500234659813241053">"કનેક્ટ ન કરી શક્યાં. ફરી પ્રયાસ કરો."</string>
     <string name="device_details_title" msgid="6576953269221085300">"ઉપકરણની વિગતો"</string>
-    <string name="bluetooth_device_mac_address" msgid="2513724313558236181">"ઉપકરણનું Bluetooth સરનામું: <xliff:g id="ADDRESS">%1$s</xliff:g>"</string>
+    <string name="bluetooth_device_mac_address" msgid="2513724313558236181">"ઉપકરણનું બ્લૂટૂથ સરનામું: <xliff:g id="ADDRESS">%1$s</xliff:g>"</string>
     <string name="bluetooth_unpair_dialog_title" msgid="38467834196432400">"ઉપકરણને ભૂલી જઈએ?"</string>
     <string name="bluetooth_unpair_dialog_body" product="default" msgid="9087609557757135712">"હવેથી તમારા ફોનની <xliff:g id="DEVICE_NAME">%1$s</xliff:g>ની સાથે જોડી કરવામાં નહીં આવે"</string>
     <string name="bluetooth_unpair_dialog_body" product="tablet" msgid="7785695793007576501">"હવેથી તમારા ટૅબ્લેટની <xliff:g id="DEVICE_NAME">%1$s</xliff:g>ની સાથે જોડી કરવામાં નહીં આવે"</string>
@@ -652,14 +665,14 @@
     <string name="bluetooth_unpair_dialog_forget_confirm_button" msgid="3829370108973879006">"ઉપકરણને ભૂલી જાઓ"</string>
     <string name="bluetooth_connect_specific_profiles_title" msgid="6952214406025825164">"આની સાથે કનેક્ટ કરો..."</string>
     <string name="bluetooth_disconnect_a2dp_profile" msgid="3524648279150937177">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> મીડિયા ઑડિઓથી ડિસ્કનેક્ટ થઈ જશે."</string>
-    <string name="bluetooth_disconnect_headset_profile" msgid="8635908811168780720">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> ને હેન્ડ્સફ્રી ઑડિઓમાંથી ડિસ્કનેક્ટ કરવામાં આવશે."</string>
+    <string name="bluetooth_disconnect_headset_profile" msgid="8635908811168780720">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> ને હૅન્ડ્સફ્રી ઑડિઓમાંથી ડિસ્કનેક્ટ કરવામાં આવશે."</string>
     <string name="bluetooth_disconnect_hid_profile" msgid="3282295189719352075">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> ઇનપુટ ઉપકરણથી ડિસ્કનેક્ટ થઈ જશે."</string>
     <string name="bluetooth_disconnect_pan_user_profile" msgid="8037627994382458698">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> મારફતે ઇન્ટરનેટ ઍક્સેસને ડિસ્કનેક્ટ કરવામાં આવશે."</string>
     <string name="bluetooth_disconnect_pan_nap_profile" product="tablet" msgid="1262792320446274407">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> આ ટેબ્લેટના ઇન્ટરનેટ કનેક્શનને શેર કરવામાંથી ડિસ્કનેક્ટ કરશે."</string>
     <string name="bluetooth_disconnect_pan_nap_profile" product="default" msgid="5700332050175684571">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> આ ફોનના ઇન્ટરનેટ કનેક્શનને શેર કરવામાંથી ડિસ્કનેક્ટ કરશે."</string>
-    <string name="bluetooth_device_advanced_title" msgid="6066342531927499308">"જોડી કરેલ Bluetooth ઉપકરણ"</string>
+    <string name="bluetooth_device_advanced_title" msgid="6066342531927499308">"જોડી કરેલ બ્લૂટૂથ ઉપકરણ"</string>
     <string name="bluetooth_device_advanced_online_mode_title" msgid="3689050071425683114">"કનેક્ટ કરો"</string>
-    <string name="bluetooth_device_advanced_online_mode_summary" msgid="1204424107263248336">"Bluetooth ઉપકરણ સાથે કનેક્ટ કરો"</string>
+    <string name="bluetooth_device_advanced_online_mode_summary" msgid="1204424107263248336">"બ્લૂટૂથ ઉપકરણ સાથે કનેક્ટ કરો"</string>
     <string name="bluetooth_device_advanced_profile_header_title" msgid="102745381968579605">"આ માટે ઉપયોગ કરો"</string>
     <string name="bluetooth_device_advanced_rename_device" msgid="5148578059584955791">"નામ બદલો"</string>
     <string name="bluetooth_device_advanced_enable_opp_title" msgid="8222550640371627365">"આવનારા ફાઇલ સ્થાનાંતરોને મંજૂરી આપો"</string>
@@ -671,22 +684,22 @@
     <string name="bluetooth_dock_settings_a2dp" msgid="8791004998846630574">"સંગીત અને મીડિયા માટે"</string>
     <string name="bluetooth_dock_settings_remember" msgid="5551459057010609115">"સેટિંગ્સ યાદ રાખો"</string>
     <string name="wifi_display_settings_title" msgid="8740852850033480136">"કાસ્ટ કરો"</string>
-    <string name="wifi_display_enable_menu_item" msgid="4883036464138167674">"બિનતારી પ્રદર્શન સક્ષમ કરો"</string>
+    <string name="wifi_display_enable_menu_item" msgid="4883036464138167674">"વાયરલેસ ડિસ્પ્લે સક્ષમ કરો"</string>
     <string name="wifi_display_no_devices_found" msgid="1382012407154143453">"કોઇ નજીકના ઉપકરણો મળ્યાં નથી"</string>
     <string name="wifi_display_status_connecting" msgid="5688608834000748607">"કનેક્ટ થઈ રહ્યું છે"</string>
     <string name="wifi_display_status_connected" msgid="8364125226376985558">"કનેક્ટ કર્યું"</string>
     <string name="wifi_display_status_in_use" msgid="8556830875615434792">"ઉપયોગમાં છે"</string>
     <string name="wifi_display_status_not_available" msgid="5714978725794210102">"અનુપલબ્ધ"</string>
-    <string name="wifi_display_details" msgid="7791118209992162698">"પ્રદર્શન સેટિંગ્સ"</string>
-    <string name="wifi_display_options_title" msgid="5740656401635054838">"વાયરલેસ પ્રદર્શન વિકલ્પો"</string>
+    <string name="wifi_display_details" msgid="7791118209992162698">"ડિસ્પ્લે સેટિંગ્સ"</string>
+    <string name="wifi_display_options_title" msgid="5740656401635054838">"વાયરલેસ ડિસ્પ્લે વિકલ્પો"</string>
     <string name="wifi_display_options_forget" msgid="9119048225398894580">"ભૂલી જાઓ"</string>
     <string name="wifi_display_options_done" msgid="5703116500357822557">"થઈ ગયું"</string>
     <string name="wifi_display_options_name" msgid="4756080222307467898">"નામ"</string>
     <string name="wifi_band_24ghz" msgid="852929254171856911">"2.4 GHz"</string>
     <string name="wifi_band_5ghz" msgid="6433822023268515117">"5 GHz"</string>
     <string name="link_speed" msgid="8896664974117585555">"%1$d Mbps"</string>
-    <string name="wifi_ask_enable" msgid="2795469717302060104">"<xliff:g id="REQUESTER">%s</xliff:g>, Wi-Fi ચાલુ કરવા માગે છે"</string>
-    <string name="wifi_ask_disable" msgid="728366570145493573">"<xliff:g id="REQUESTER">%s</xliff:g>, Wi-Fi બંધ કરવા માગે છે"</string>
+    <string name="wifi_ask_enable" msgid="2795469717302060104">"<xliff:g id="REQUESTER">%s</xliff:g>, વાઇ-ફાઇ ચાલુ કરવા માગે છે"</string>
+    <string name="wifi_ask_disable" msgid="728366570145493573">"<xliff:g id="REQUESTER">%s</xliff:g>, વાઇ-ફાઇ બંધ કરવા માગે છે"</string>
     <string name="nfc_quick_toggle_title" msgid="6769159366307299004">"NFC"</string>
     <string name="nfc_quick_toggle_summary" product="tablet" msgid="8302974395787498915">"જ્યારે ટેબ્લેટ બીજા ઉપકરણને ટચ કરે ત્યારે ડેટા વિનિમયની મંજૂરી આપો"</string>
     <string name="nfc_quick_toggle_summary" product="default" msgid="5237208142892767592">"જ્યારે ફોન બીજા ઉપકરણને ટચ કરે ત્યારે ડેટા વિનિમયની મંજૂરી આપો"</string>
@@ -697,55 +710,55 @@
     <string name="android_beam_off_summary" msgid="4663095428454779138">"બંધ"</string>
     <string name="android_beam_disabled_summary" msgid="1737782116894793393">"NFC બંધ હોવાને કારણે અનુપલબ્ધ"</string>
     <string name="android_beam_label" msgid="6257036050366775040">"Android બીમ"</string>
-    <string name="android_beam_explained" msgid="1810540319385192758">"જ્યારે આ સુવિધા ચાલુ હોય, ત્યારે તમે ઉપકરણોને એકબીજાની નજીક રાખીને ઍપ્લિકેશનની સામગ્રીને બીજા NFC-સક્ષમ ઉપકરણ પર બીમ કરી શકો છો. ઉદાહરણ તરીકે, તમે વેબ પૃષ્ઠો, YouTube વિડિઓઝ, સંપર્કો અને વધુને બીમ કરી શકો છો.\n\nબસ ઉપકરણોને એકબીજાની નજીક લાવો (સામાન્ય રીતે એકબીજાની પાછળ) અને પછી તમારી સ્ક્રીનને ટૅપ કરો. શું બીમ થાય તે ઍપ્લિકેશન નક્કી કરે છે."</string>
-    <string name="wifi_quick_toggle_title" msgid="8850161330437693895">"Wi-Fi"</string>
-    <string name="wifi_quick_toggle_summary" msgid="2696547080481267642">"Wi‑Fi ચાલુ કરો"</string>
-    <string name="wifi_settings" msgid="29722149822540994">"Wi-Fi"</string>
-    <string name="wifi_settings_category" msgid="8719175790520448014">"Wi‑Fi સેટિંગ્સ"</string>
-    <string name="wifi_settings_title" msgid="3103415012485692233">"Wi-Fi"</string>
+    <string name="android_beam_explained" msgid="1810540319385192758">"જ્યારે આ સુવિધા ચાલુ હોય, ત્યારે તમે ઉપકરણોને એકબીજાની નજીક રાખીને ઍપ્લિકેશનના કન્ટેન્ટને બીજા NFC-સક્ષમ ઉપકરણ પર બીમ કરી શકો છો. ઉદાહરણ તરીકે, તમે વેબ પેજ, YouTube વીડિઓ, સંપર્કો અને વધુને બીમ કરી શકો છો.\n\nબસ ઉપકરણોને એકબીજાની નજીક લાવો (સામાન્ય રીતે એકબીજાની પાછળ) અને પછી તમારી સ્ક્રીનને ટૅપ કરો. શું બીમ થાય તે ઍપ્લિકેશન નક્કી કરે છે."</string>
+    <string name="wifi_quick_toggle_title" msgid="8850161330437693895">"વાઇ-ફાઇ"</string>
+    <string name="wifi_quick_toggle_summary" msgid="2696547080481267642">"વાઇ-ફાઇ ચાલુ કરો"</string>
+    <string name="wifi_settings" msgid="29722149822540994">"વાઇ-ફાઇ"</string>
+    <string name="wifi_settings_category" msgid="8719175790520448014">"વાઇ-ફાઇ સેટિંગ્સ"</string>
+    <string name="wifi_settings_title" msgid="3103415012485692233">"વાઇ-ફાઇ"</string>
     <string name="wifi_settings_summary" msgid="668767638556052820">"વાયરલેસ ઍક્સેસ બિંદુઓને સેટ અને સંચાલિત કરો"</string>
-    <string name="wifi_select_network" msgid="4210954938345463209">"Wi‑Fi પસંદ કરો"</string>
-    <string name="wifi_starting" msgid="6732377932749942954">"Wi-Fi ચાલુ કરી રહ્યું છે…"</string>
-    <string name="wifi_stopping" msgid="8952524572499500804">"Wi‑Fi બંધ થઈ રહ્યું છે…"</string>
+    <string name="wifi_select_network" msgid="4210954938345463209">"વાઇ-ફાઇ પસંદ કરો"</string>
+    <string name="wifi_starting" msgid="6732377932749942954">"વાઇ-ફાઇ ચાલુ કરી રહ્યું છે…"</string>
+    <string name="wifi_stopping" msgid="8952524572499500804">"વાઇ-ફાઇ બંધ થઈ રહ્યું છે…"</string>
     <string name="wifi_error" msgid="3207971103917128179">"ભૂલ"</string>
     <string name="wifi_sap_no_channel_error" msgid="3108445199311817111">"આ દેશમાં 5 GHz બેન્ડ ઉપલબ્ધ નથી"</string>
     <string name="wifi_in_airplane_mode" msgid="8652520421778203796">"એરપ્લેન મોડમાં"</string>
-    <string name="wifi_notify_open_networks" msgid="76298880708051981">"નેટવર્ક સૂચના ખોલો"</string>
-    <string name="wifi_notify_open_networks_summary" msgid="2761326999921366960">"જ્યારે ઉચ્ચ ગુણવત્તાવાળું સાર્વજનિક નેટવર્ક ઉપલબ્ધ હોય ત્યારે સૂચના આપો"</string>
-    <string name="wifi_wakeup" msgid="8815640989361538036">"Wi‑Fi આપમેળે ચાલુ કરો"</string>
-    <string name="wifi_wakeup_summary" msgid="2530814331062997163">"Wi‑Fi, તમારા હોમ નેટવર્ક જેવા, સાચવેલા ઉચ્ચ ગુણવત્તાવાળા નેટવર્કની નજીકમાં આપમેળે ફરી ચાલુ થશે"</string>
-    <string name="wifi_wakeup_summary_scanning_disabled" msgid="7247227922074840445">"અનુપલબ્ધ છે કારણ કે Wi-Fi સ્કેનિંગ બંધ છે"</string>
+    <string name="wifi_notify_open_networks" msgid="76298880708051981">"નેટવર્ક નોટિફિકેશન ખોલો"</string>
+    <string name="wifi_notify_open_networks_summary" msgid="2761326999921366960">"જ્યારે ઉચ્ચ ગુણવત્તાવાળું સાર્વજનિક નેટવર્ક ઉપલબ્ધ હોય ત્યારે નોટિફિકેશન આપો"</string>
+    <string name="wifi_wakeup" msgid="8815640989361538036">"વાઇ-ફાઇ આપમેળે ચાલુ કરો"</string>
+    <string name="wifi_wakeup_summary" msgid="2530814331062997163">"વાઇ-ફાઇ, તમારા હોમ નેટવર્ક જેવા, સાચવેલા ઉચ્ચ ગુણવત્તાવાળા નેટવર્કની નજીકમાં આપમેળે ફરી ચાલુ થશે"</string>
+    <string name="wifi_wakeup_summary_scanning_disabled" msgid="7247227922074840445">"અનુપલબ્ધ છે કારણ કે વાઇ-ફાઇ સ્કેનિંગ બંધ છે"</string>
     <string name="wifi_wakeup_summary_scoring_disabled" msgid="108339002136866897">"આ સુવિધાનો ઉપયોગ કરવા માટે, નેટવર્ક રેટિંગ પ્રદાતાને પસંદ કરો"</string>
     <string name="wifi_poor_network_detection" msgid="4925789238170207169">"નબળા જોડાણો ટાળો"</string>
-    <string name="wifi_poor_network_detection_summary" msgid="2784135142239546291">"જ્યાં સુધી સારું ઇન્ટરનેટ કનેક્શન ન ધરાવતું હોય ત્યાં સુધી Wi‑Fi નેટવર્કનો ઉપયોગ કરશો નહીં"</string>
+    <string name="wifi_poor_network_detection_summary" msgid="2784135142239546291">"જ્યાં સુધી સારું ઇન્ટરનેટ કનેક્શન ન ધરાવતું હોય ત્યાં સુધી વાઇ-ફાઇ નેટવર્કનો ઉપયોગ કરશો નહીં"</string>
     <string name="wifi_avoid_poor_network_detection_summary" msgid="4674423884870027498">"ફક્ત સારું ઇન્ટરનેટ કનેક્શન ધરાવતા નેટવર્ક્સનો જ ઉપયોગ કરો"</string>
     <string name="use_open_wifi_automatically_title" msgid="6851951242903078588">"ખુલ્લા નેટવર્કો સાથે કનેક્ટ કરો"</string>
     <string name="use_open_wifi_automatically_summary" msgid="2982091714252931713">"ઉચ્ચ ગુણવત્તાવાળા સાર્વજનિક નેટવર્ક સાથે આપમેળે કનેક્ટ કરો"</string>
     <string name="use_open_wifi_automatically_summary_scoring_disabled" msgid="593964217679325831">"આ સુવિધાનો ઉપયોગ કરવા માટે, નેટવર્ક રેટિંગ પ્રદાતાને પસંદ કરો"</string>
     <string name="use_open_wifi_automatically_summary_scorer_unsupported_disabled" msgid="8472122600853650258">"આ સુવિધાનો ઉપયોગ કરવા માટે, સુસંગત નેટવર્ક રેટિંગ પ્રદાતાને પસંદ કરો"</string>
     <string name="wifi_install_credentials" msgid="3551143317298272860">"પ્રમાણપત્રો ઇન્સ્ટોલ કરો"</string>
-    <string name="wifi_scan_notify_text" msgid="5593805423071186757">"સ્થાન સચોટતા બહેતર બનાવવા માટે, સિસ્ટમ ઍપ્લિકેશનો અને સેવાઓ હજી પણ Wi‑Fi નેટવર્ક્સને સ્કેન કરી શકે છે. તમે આને <xliff:g id="LINK_BEGIN_0">LINK_BEGIN</xliff:g>સ્કેનિંગ સેટિંગ્સ<xliff:g id="LINK_END_1">LINK_END</xliff:g>માં બદલી શકો છો."</string>
-    <string name="wifi_scan_notify_text_scanning_off" msgid="3426075479272242098">"સ્થાનની સચોટતા સુધારવા માટે, <xliff:g id="LINK_BEGIN_0">LINK_BEGIN</xliff:g>સ્કૅનીંગ સેટિંગ્સ<xliff:g id="LINK_END_1">LINK_END</xliff:g> માં જઈને Wi-Fi સ્કૅનીંગ ચાલુ કરો."</string>
+    <string name="wifi_scan_notify_text" msgid="5593805423071186757">"સ્થાન સચોટતા બહેતર બનાવવા માટે, સિસ્ટમ ઍપ્લિકેશનો અને સેવાઓ હજી પણ વાઇ-ફાઇ નેટવર્ક્સને સ્કેન કરી શકે છે. તમે આને <xliff:g id="LINK_BEGIN_0">LINK_BEGIN</xliff:g>સ્કેનિંગ સેટિંગ્સ<xliff:g id="LINK_END_1">LINK_END</xliff:g>માં બદલી શકો છો."</string>
+    <string name="wifi_scan_notify_text_scanning_off" msgid="3426075479272242098">"સ્થાનની સચોટતા સુધારવા માટે, <xliff:g id="LINK_BEGIN_0">LINK_BEGIN</xliff:g>સ્કૅનીંગ સેટિંગ્સ<xliff:g id="LINK_END_1">LINK_END</xliff:g> માં જઈને વાઇ-ફાઇ સ્કૅનીંગ ચાલુ કરો."</string>
     <string name="wifi_scan_notify_remember_choice" msgid="7104867814641144485">"ફરીથી બતાવશો નહીં"</string>
-    <string name="wifi_setting_sleep_policy_title" msgid="5149574280392680092">"નિષ્ક્રિય દરમ્યાન Wi‑Fi ચાલુ રાખો"</string>
-    <string name="wifi_setting_on_during_sleep_title" msgid="8308975500029751565">"નિષ્ક્રિય હોય તે દરમ્યાન Wi‑Fi ચાલુ"</string>
+    <string name="wifi_setting_sleep_policy_title" msgid="5149574280392680092">"નિષ્ક્રિય દરમ્યાન વાઇ-ફાઇ ચાલુ રાખો"</string>
+    <string name="wifi_setting_on_during_sleep_title" msgid="8308975500029751565">"નિષ્ક્રિય હોય તે દરમ્યાન વાઇ-ફાઇ ચાલુ"</string>
     <string name="wifi_setting_sleep_policy_error" msgid="8174902072673071961">"સેટિંગ બદલવામાં એક સમસ્યા હતી"</string>
     <string name="wifi_suspend_efficiency_title" msgid="2338325886934703895">"કાર્યક્ષમતા બહેતર બનાવો"</string>
-    <string name="wifi_suspend_optimizations" msgid="1220174276403689487">"Wi-Fi ઓપ્ટિમાઇઝેશન"</string>
-    <string name="wifi_suspend_optimizations_summary" msgid="4151428966089116856">"Wi‑Fi ચાલુ હોય ત્યારે બૅટરી વપરાશને ન્યૂનતમ કરો"</string>
-    <string name="wifi_limit_optimizations_summary" msgid="9000801068363468950">"Wi‑Fi દ્વારા વપરાતી બૅટરીને સીમિત કરો"</string>
-    <string name="wifi_switch_away_when_unvalidated" msgid="1707247692180853058">"જો Wi‑Fi ઇન્ટરનેટની ઍક્સેસ ગુમાવે, તો મોબાઇલ ડેટા પર સ્વિચ કરો."</string>
+    <string name="wifi_suspend_optimizations" msgid="1220174276403689487">"વાઇ-ફાઇ ઓપ્ટિમાઇઝેશન"</string>
+    <string name="wifi_suspend_optimizations_summary" msgid="4151428966089116856">"વાઇ-ફાઇ ચાલુ હોય ત્યારે બૅટરી વપરાશને ન્યૂનતમ કરો"</string>
+    <string name="wifi_limit_optimizations_summary" msgid="9000801068363468950">"વાઇ-ફાઇ દ્વારા વપરાતી બૅટરીને સીમિત કરો"</string>
+    <string name="wifi_switch_away_when_unvalidated" msgid="1707247692180853058">"જો વાઇ-ફાઇ ઇન્ટરનેટની ઍક્સેસ ગુમાવે, તો મોબાઇલ ડેટા પર સ્વિચ કરો."</string>
     <string name="wifi_cellular_data_fallback_title" msgid="8753386877755616476">"મોબાઇલ ડેટા પર સ્વત: સ્વિચ કરો"</string>
     <string name="wifi_cellular_data_fallback_summary" msgid="6375399280719867214">"જ્યારે Wi-Fiને ઇન્ટરનેટની ઍક્સેસ ન હોય, ત્યારે મોબાઇલ ડેટાનો ઉપયોગ કરો. ડેટા વપરાશ લાગુ થઈ શકે છે."</string>
     <string name="wifi_add_network" msgid="6234851776910938957">"નેટવર્ક ઉમેરો"</string>
-    <string name="wifi_configure_settings_preference_title" msgid="2913345003906899146">"Wi‑Fi પસંદગીઓ"</string>
-    <string name="wifi_configure_settings_preference_summary_wakeup_on" msgid="646393113104367290">"Wi‑Fi ફરી આપમેળે ચાલુ થાય છે"</string>
-    <string name="wifi_configure_settings_preference_summary_wakeup_off" msgid="2782566279864356713">"Wi‑Fi પાછું આપમેળે ચાલુ થતું નથી"</string>
-    <string name="wifi_access_points" msgid="7053990007031968609">"Wi‑Fi નેટવર્ક્સ"</string>
+    <string name="wifi_configure_settings_preference_title" msgid="2913345003906899146">"વાઇ-ફાઇ પસંદગીઓ"</string>
+    <string name="wifi_configure_settings_preference_summary_wakeup_on" msgid="646393113104367290">"વાઇ-ફાઇ ફરી આપમેળે ચાલુ થાય છે"</string>
+    <string name="wifi_configure_settings_preference_summary_wakeup_off" msgid="2782566279864356713">"વાઇ-ફાઇ પાછું આપમેળે ચાલુ થતું નથી"</string>
+    <string name="wifi_access_points" msgid="7053990007031968609">"વાઇ-ફાઇ નેટવર્ક્સ"</string>
     <string name="wifi_menu_wps_pbc" msgid="2668564692207863017">"WPS પુશ બટન"</string>
     <string name="wifi_menu_more_options" msgid="2448097861752719396">"વધુ વિકલ્પો"</string>
     <string name="wifi_menu_wps_pin" msgid="6426448256268695933">"WPS પિન એન્ટ્રી"</string>
-    <string name="wifi_menu_p2p" msgid="7619851399250896797">"Wi-Fi Direct"</string>
+    <string name="wifi_menu_p2p" msgid="7619851399250896797">"વાઇ-ફાઇ ડાઇરેક્ટ"</string>
     <string name="wifi_menu_scan" msgid="1470911530412095868">"સ્કેન"</string>
     <string name="wifi_menu_advanced" msgid="7522252991919573664">"વિગતવાર"</string>
     <string name="wifi_menu_configure" msgid="6150926852602171938">"ગોઠવો"</string>
@@ -753,27 +766,28 @@
     <string name="wifi_menu_remember" msgid="8814185749388713796">"નેટવર્ક યાદ રાખો"</string>
     <string name="wifi_menu_forget" msgid="8736964302477327114">"નેટવર્કને ભૂલી જાઓ"</string>
     <string name="wifi_menu_modify" msgid="2068554918652440105">"નેટવર્ક સંશોધિત કરો"</string>
-    <string name="wifi_menu_write_to_nfc" msgid="7692881642188240324">"NFC ટેગ પર લખો"</string>
-    <string name="wifi_empty_list_wifi_off" msgid="8056223875951079463">"ઉપલબ્ધ નેટવર્ક્સ જોવા માટે, Wi‑Fi ચાલુ કરો."</string>
-    <string name="wifi_empty_list_wifi_on" msgid="8746108031587976356">"Wi-Fi નેટવર્ક્સ માટે શોધી રહ્યું છે..."</string>
-    <string name="wifi_empty_list_user_restricted" msgid="7322372065475939129">"તમને Wi‑Fi નેટવર્ક બદલવાની પરવાનગી નથી."</string>
+    <string name="wifi_menu_write_to_nfc" msgid="7692881642188240324">"NFC ટૅગ પર લખો"</string>
+    <string name="wifi_empty_list_wifi_off" msgid="8056223875951079463">"ઉપલબ્ધ નેટવર્ક્સ જોવા માટે, વાઇ-ફાઇ ચાલુ કરો."</string>
+    <string name="wifi_empty_list_wifi_on" msgid="8746108031587976356">"વાઇ-ફાઇ નેટવર્ક્સ માટે શોધી રહ્યું છે..."</string>
+    <string name="wifi_empty_list_user_restricted" msgid="7322372065475939129">"તમને વાઇ-ફાઇ નેટવર્ક બદલવાની પરવાનગી નથી."</string>
     <string name="wifi_more" msgid="3195296805089107950">"વધુ"</string>
-    <string name="wifi_setup_wps" msgid="8128702488486283957">"સ્વયંચાલિત સેટઅપ (WPS)"</string>
+    <string name="wifi_setup_wps" msgid="8128702488486283957">"ઑટોમૅટિક સેટઅપ (WPS)"</string>
     <string name="wifi_show_advanced" msgid="3409422789616520979">"વિગતવાર વિકલ્પો"</string>
     <string name="wifi_advanced_toggle_description_expanded" msgid="2380600578544493084">"ડ્રોપ ડાઉન સૂચિ વિગતવાર વિકલ્પો. સંકુચિત કરવા માટે બે વાર ટૅપ કરો."</string>
     <string name="wifi_advanced_toggle_description_collapsed" msgid="1463812308429197263">"ડ્રોપ ડાઉન સૂચિ વિગતવાર વિકલ્પો. વિસ્તૃત કરવા માટે બે વાર ટૅપ કરો."</string>
-    <string name="wifi_wps_setup_title" msgid="8207552222481570175">"Wi-Fi સુરક્ષિત સેટઅપ"</string>
+    <string name="wifi_wps_setup_title" msgid="8207552222481570175">"વાઇ-ફાઇ સુરક્ષિત સેટઅપ"</string>
     <string name="wifi_wps_setup_msg" msgid="315174329121275092">"WPS પ્રારંભ કરી રહ્યું છે…"</string>
-    <string name="wifi_wps_onstart_pbc" msgid="817003360936932340">"તમારા રાઉટર પર Wi‑Fi સંરક્ષિત સેટઅપ બટન દબાવો. તેને \"WPS\" પણ કહેવામાં આવી શકે છે અથવા આ પ્રતીક વડે ચિહ્નિત કરવામાં આવેલું હોઇ શકે છે:"</string>
-    <string name="wifi_wps_onstart_pin" msgid="223344506445335358">"તમારા Wi‑Fi રાઉટર પર પિન <xliff:g id="NUMBER">%1$s</xliff:g> દાખલ કરો. સેટઅપને પૂર્ણ થવામાં બે મિનિટનો સમય લાગી શકે છે."</string>
+    <string name="wifi_wps_onstart_pbc" msgid="817003360936932340">"તમારા રાઉટર પર વાઇ-ફાઇ સંરક્ષિત સેટઅપ બટન દબાવો. તેને \"WPS\" પણ કહેવામાં આવી શકે છે અથવા આ પ્રતીક વડે ચિહ્નિત કરવામાં આવેલું હોઇ શકે છે:"</string>
+    <string name="wifi_wps_onstart_pin" msgid="223344506445335358">"તમારા વાઇ-ફાઇ રાઉટર પર પિન <xliff:g id="NUMBER">%1$s</xliff:g> દાખલ કરો. સેટઅપને પૂર્ણ થવામાં બે મિનિટનો સમય લાગી શકે છે."</string>
     <string name="wifi_wps_complete" msgid="2388138550456729134">"WPS સફળ થયું. નેટવર્ક સાથે કનેક્ટ કરી રહ્યું છે…"</string>
-    <string name="wifi_wps_connected" msgid="7153432445748931183">"Wi‑Fi નેટવર્ક  <xliff:g id="NETWORK_NAME">%s</xliff:g> સાથે કનેક્ટ કરેલ"</string>
+    <string name="wifi_wps_connected" msgid="7153432445748931183">"વાઇ-ફાઇ નેટવર્ક  <xliff:g id="NETWORK_NAME">%s</xliff:g> સાથે કનેક્ટ કરેલ"</string>
     <string name="wifi_wps_in_progress" msgid="3372311348221357944">"WPS પહેલાંથી જ પ્રગતિમાં છે અમે તેમે પૂર્ણ થવામાં બે મિનિટનો સમય લાગી શકે છે"</string>
     <string name="wifi_wps_failed_generic" msgid="5668775022238832527">"WPS નિષ્ફળ. કૃપા કરીને થોડીવારમાં ફરી પ્રયાસ કરો."</string>
     <string name="wifi_wps_failed_wep" msgid="2702820087105284461">"વાયરલેસ રાઉટર સુરક્ષા સેટિંગ (WEP) સમર્થિત નથી"</string>
     <string name="wifi_wps_failed_tkip" msgid="4282401586860713349">"વાયરલેસ રાઉટર સુરક્ષા સેટિંગ (TKIP) સમર્થિત નથી"</string>
     <string name="wifi_wps_failed_auth" msgid="1174614355181181958">"નિષ્ફળ થયું. કૃપા કરીને ફરીથી પ્રયાસ કરો."</string>
     <string name="wifi_wps_failed_overlap" msgid="5159533685596844778">"અન્ય એક WPS સત્ર મળ્યું હતું. કૃપા કરીને થોડી મિનિટ્સમાં ફરીથી પ્રયાસ કરશો."</string>
+    <string name="wifi_wps_failed_wifi_disconnected" msgid="3829472117754104164">"વાઇ-ફાઇ ડિસ્કનેક્ટ થયું. 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 +824,9 @@
     <string name="wifi_wps_available_first_item" msgid="4422547079984583502">"WPS ઉપલબ્ધ"</string>
     <string name="wifi_wps_available_second_item" msgid="8427520131718215301">" (WPS ઉપલબ્ધ)"</string>
     <string name="wifi_wps_nfc_enter_password" msgid="2288214226916117159">"તમારો નેટવર્ક પાસવર્ડ દાખલ કરો"</string>
-    <string name="wifi_scan_always_turnon_message" msgid="203123538572122989">"સ્થાન સચોટતા બહેતર બનાવવા માટે અને અન્ય હેતુઓ માટે, Wi-Fi બંધ હોય ત્યારે પણ <xliff:g id="APP_NAME">%1$s</xliff:g> નેટવર્ક સ્કેનિંગ ચાલુ કરવા માંગે છે.\n\nસ્કેન કરવા માંગે છે તે બધી ઍપ્લિકેશનો માટે આને મંજૂરી આપીએ?"</string>
+    <string name="wifi_carrier_connect" msgid="8174696557882299911">"કૅરિઅર વાઇ-ફાઇ નેટવર્ક"</string>
+    <string name="wifi_carrier_content" msgid="4634077285415851933">"<xliff:g id="NAME">%1%s</xliff:g> દ્વારા કનેક્ટ કરો"</string>
+    <string name="wifi_scan_always_turnon_message" msgid="203123538572122989">"સ્થાન સચોટતા બહેતર બનાવવા માટે અને અન્ય હેતુઓ માટે, વાઇ-ફાઇ બંધ હોય ત્યારે પણ <xliff:g id="APP_NAME">%1$s</xliff:g> નેટવર્ક સ્કેનિંગ ચાલુ કરવા માંગે છે.\n\nસ્કેન કરવા માંગે છે તે બધી ઍપ્લિકેશનો માટે આને મંજૂરી આપીએ?"</string>
     <string name="wifi_scan_always_turnoff_message" msgid="5538901671131941043">"આ બંધ કરવા માટે, ઓવરફ્લો મેનૂમાં વિગતવાર પર જાઓ."</string>
     <string name="wifi_scan_always_confirm_allow" msgid="5355973075896817232">"મંજૂરી આપો"</string>
     <string name="wifi_scan_always_confirm_deny" msgid="4463982053823520710">"નકારો"</string>
@@ -819,14 +835,15 @@
     <string name="wifi_hotspot_connect" msgid="5065506390164939225">"કનેક્ટ કરો"</string>
     <string name="no_internet_access_text" msgid="7133561752896706392">"આ નેટવર્કને ઇન્ટરનેટની ઍક્સેસ નથી. કનેક્ટ રહીએ?"</string>
     <string name="no_internet_access_remember" msgid="4697314331614625075">"આ નેટવર્ક વિશે મને ફરીથી પૂછશો નહીં"</string>
-    <string name="lost_internet_access_title" msgid="6228530645663584505">"Wi-Fi ઇન્ટરનેટ સાથે કનેક્ટ કરેલ નથી"</string>
-    <string name="lost_internet_access_text" msgid="9029649339816197345">"જ્યારે પણ Wi-Fi કનેક્શન ખરાબ હોય, ત્યારે તમે મોબાઇલ નેટવર્ક પર સ્વિચ કરી શકો છો. ડેટા વપરાશ માટે શુલ્ક લાગુ થઈ શકે છે."</string>
+    <string name="lost_internet_access_title" msgid="6228530645663584505">"વાઇ-ફાઇ ઇન્ટરનેટ સાથે કનેક્ટ કરેલ નથી"</string>
+    <string name="lost_internet_access_text" msgid="9029649339816197345">"જ્યારે પણ વાઇ-ફાઇ કનેક્શન ખરાબ હોય, ત્યારે તમે મોબાઇલ નેટવર્ક પર સ્વિચ કરી શકો છો. ડેટા વપરાશ માટે શુલ્ક લાગુ થઈ શકે છે."</string>
     <string name="lost_internet_access_switch" msgid="2262459569601190039">"મોબાઇલ પર સ્વિચ કરો"</string>
-    <string name="lost_internet_access_cancel" msgid="338273139419871110">"Wi-Fi પર રહો"</string>
+    <string name="lost_internet_access_cancel" msgid="338273139419871110">"વાઇ-ફાઇ પર રહો"</string>
     <string name="lost_internet_access_persist" msgid="7634876061262676255">"ફરી ક્યારેય બતાવશો નહીં"</string>
     <string name="wifi_connect" msgid="1076622875777072845">"કનેક્ટ કરો"</string>
     <string name="wifi_failed_connect_message" msgid="8491902558970292871">"નેટવર્ક સાથે કનેક્ટ કરવામાં નિષ્ફળ થયાં"</string>
     <string name="wifi_forget" msgid="8168174695608386644">"ભૂલી જાઓ"</string>
+    <string name="wifi_modify" msgid="6100248070440710782">"ફેરફાર કરો"</string>
     <string name="wifi_failed_forget_message" msgid="1348172929201654986">"નેટવર્ક ભૂલવામાં નિષ્ફળ થયાં"</string>
     <string name="wifi_save" msgid="3331121567988522826">"સાચવો"</string>
     <string name="wifi_failed_save_message" msgid="6650004874143815692">"નેટવર્ક સાચવવામાં નિષ્ફળ થયાં."</string>
@@ -836,15 +853,16 @@
       <item quantity="one">%d નેટવર્ક</item>
       <item quantity="other">%d નેટવર્ક</item>
     </plurals>
-    <string name="wifi_advanced_titlebar" msgid="4485841401774142908">"વિગતવાર Wi‑Fi"</string>
+    <string name="wifi_advanced_titlebar" msgid="4485841401774142908">"વિગતવાર વાઇ-ફાઇ"</string>
     <string name="wifi_advanced_mac_address_title" msgid="6571335466330978393">"MAC સરનામું"</string>
     <string name="wifi_advanced_ip_address_title" msgid="6215297094363164846">"IP સરનામું"</string>
+    <string name="wifi_details_title" msgid="3471132676909349382">"નેટવર્કની માહિતી"</string>
     <string name="wifi_details_subnet_mask" msgid="6720279144174924410">"સબનેટ માસ્ક"</string>
     <string name="wifi_details_dns" msgid="8648826607751830768">"DNS"</string>
     <string name="wifi_details_ipv6_address_header" msgid="6734119149106422148">"IPv6 સરનામા"</string>
     <string name="wifi_saved_access_points_label" msgid="2013409399392285262">"સાચવેલા નેટવર્ક્સ"</string>
     <string name="wifi_advanced_settings_label" msgid="3654366894867838338">"IP સેટિંગ્સ"</string>
-    <string name="wifi_advanced_not_available" msgid="5823045095444154586">"આ વપરાશકર્તા માટે Wi‑Fi વિગતવાર સેટિંગ્સ ઉપલબ્ધ નથી"</string>
+    <string name="wifi_advanced_not_available" msgid="5823045095444154586">"આ વપરાશકર્તા માટે વાઇ-ફાઇ વિગતવાર સેટિંગ્સ ઉપલબ્ધ નથી"</string>
     <string name="wifi_ip_settings_menu_save" msgid="7296724066102908366">"સાચવો"</string>
     <string name="wifi_ip_settings_menu_cancel" msgid="6582567330136502340">"રદ કરો"</string>
     <string name="wifi_ip_settings_invalid_ip_address" msgid="2513142355364274970">"એક માન્ય IP સરનામું લખો."</string>
@@ -855,7 +873,7 @@
     <string name="wifi_dns2" msgid="1368601006824882659">"DNS 2"</string>
     <string name="wifi_gateway" msgid="163914742461092086">"ગેટવે"</string>
     <string name="wifi_network_prefix_length" msgid="3028785234245085998">"નેટવર્ક પ્રીફિક્સ લંબાઈ"</string>
-    <string name="wifi_p2p_settings_title" msgid="5444461191435291082">"Wi-Fi Direct"</string>
+    <string name="wifi_p2p_settings_title" msgid="5444461191435291082">"વાઇ-ફાઇ ડાઇરેક્ટ"</string>
     <string name="wifi_p2p_device_info" msgid="3191876744469364173">"ઉપકરણ માહિતી"</string>
     <string name="wifi_p2p_persist_network" msgid="1646424791818168590">"આ કનેક્શન યાદ રાખો"</string>
     <string name="wifi_p2p_menu_search" msgid="3436429984738771974">"ઉપકરણો શોધો"</string>
@@ -871,46 +889,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">"પોર્ટેબલ Wi-Fi હોટસ્પોટ"</string>
-    <string name="wifi_hotspot_checkbox_text" msgid="7763495093333664887">"Wi-Fi હોટસ્પોટ"</string>
+    <string name="wifi_hotspot_checkbox_text" msgid="7763495093333664887">"વાઇ-ફાઇ હૉટસ્પૉટ"</string>
     <string name="wifi_hotspot_off_subtext" msgid="5466126533609394170">"અન્ય ઉપકરણો સાથે ઇન્ટરનેટ અથવા કન્ટેન્ટ શેર કરી રહ્યાં નથી"</string>
     <string name="wifi_hotspot_tethering_on_subtext" product="tablet" msgid="5752490509369962007">"આ ટૅબ્લેટનું ઇન્ટરનેટ કનેક્શન હૉટસ્પૉટ દ્વારા શેર થાય છે"</string>
     <string name="wifi_hotspot_tethering_on_subtext" product="default" msgid="6461075246164300670">"આ ફોનનું ઇન્ટરનેટ કનેક્શન હૉટસ્પૉટ દ્વારા શેર થાય છે"</string>
     <string name="wifi_hotspot_on_local_only_subtext" msgid="2068110388011294735">"ઍપ્લિકેશન કન્ટેન્ટ શેર કરી રહી છે. ઇન્ટરનેટ કનેક્શન શેર કરવા માટે હૉટસ્પૉટને બંધ કરો, પછી ચાલુ કરો"</string>
-    <string name="wifi_hotspot_name_title" msgid="1341735529132128887">"Wi‑Fiનું નામ"</string>
+    <string name="wifi_hotspot_name_title" msgid="8237000746618636778">"હૉટસ્પૉટનું નામ"</string>
     <string name="wifi_hotspot_name_summary_connecting" msgid="3378299995508671967">"<xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g> ચાલુ કરીએ છીએ..."</string>
     <string name="wifi_hotspot_name_summary_connected" msgid="3888672084861445362">"<xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g> સાથે અન્ય ઉપકરણો પણ કનેક્ટ કરી શકાય છે"</string>
-    <string name="wifi_hotspot_password_title" msgid="1955592302902091281">"Wi-Fi પાસવર્ડ"</string>
+    <string name="wifi_hotspot_password_title" msgid="8676859981917573801">"હૉટસ્પૉટનો પાસવર્ડ"</string>
     <string name="wifi_hotspot_ap_band_title" msgid="1165801173359290681">"AP બૅન્ડ"</string>
-    <string name="wifi_hotspot_footer_info_regular" msgid="1203489406068036455">"તમારા અન્ય ઉપકરણો માટે Wi‑Fi નેટવર્ક બનાવવા હૉટસ્પૉટનો ઉપયોગ કરો. હૉટસ્પૉટ તમારા મોબાઇલ ડેટા કનેક્શનનો ઉપયોગ કરીને ઇન્ટરનેટ પ્રદાન કરે છે. વધારાના મોબાઇલ ડેટા શુલ્ક લાગુ થઈ શકે છે."</string>
+    <string name="wifi_hotspot_footer_info_regular" msgid="1203489406068036455">"તમારા અન્ય ઉપકરણો માટે વાઇ-ફાઇ નેટવર્ક બનાવવા હૉટસ્પૉટનો ઉપયોગ કરો. હૉટસ્પૉટ તમારા મોબાઇલ ડેટા કનેક્શનનો ઉપયોગ કરીને ઇન્ટરનેટ પ્રદાન કરે છે. વધારાના મોબાઇલ ડેટા શુલ્ક લાગુ થઈ શકે છે."</string>
     <string name="wifi_hotspot_footer_info_local_only" msgid="857988412470694109">"ઍપ્લિકેશનો નજીકના ઉપકરણો સાથે કન્ટેન્ટ શેર કરવા માટે હૉટસ્પૉટ બનાવી શકે છે."</string>
-    <string name="wifi_tether_starting" msgid="1322237938998639724">"હોટસ્પોટ ચાલુ કરી રહ્યું છે…"</string>
-    <string name="wifi_tether_stopping" msgid="4835852171686388107">"હોટસ્પોટ બંધ કરી રહ્યું છે…"</string>
+    <string name="wifi_tether_starting" msgid="1322237938998639724">"હૉટસ્પૉટ ચાલુ કરી રહ્યું છે…"</string>
+    <string name="wifi_tether_stopping" msgid="4835852171686388107">"હૉટસ્પૉટ બંધ કરી રહ્યું છે…"</string>
     <string name="wifi_tether_enabled_subtext" msgid="7842111748046063857">"<xliff:g id="NETWORK_SSID">%1$s</xliff:g> સક્રિય છે"</string>
-    <string name="wifi_tether_failed_subtext" msgid="1484941858530919002">"પોર્ટેબલ Wi-Fi હોટસ્પોટ ભૂલ"</string>
-    <string name="wifi_tether_configure_ap_text" msgid="7974681394041609308">"Wi‑Fi હોટસ્પોટ સેટ કરો"</string>
-    <string name="wifi_hotspot_configure_ap_text" msgid="5478614731464220432">"Wi-Fi હોટસ્પોટ સેટઅપ"</string>
-    <string name="wifi_hotspot_configure_ap_text_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">"પોર્ટેબલ વાઇ-ફાઇ હૉટસ્પૉટ ભૂલ"</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_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>
-    <string name="wifi_calling_suggestion_summary" msgid="3765923249566552233">"મોબાઇલ નેટવર્કને બદલે Wi-Fi નો ઉપયોગ કરો"</string>
+    <string name="wifi_calling_settings_title" msgid="4102921303993404577">"વાઇ-ફાઇ કૉલિંગ"</string>
+    <string name="wifi_calling_suggestion_title" msgid="9008010480466359578">"વાઇ-ફાઇ કૉલિંગ ચાલુ કરો"</string>
+    <string name="wifi_calling_suggestion_summary" msgid="3765923249566552233">"મોબાઇલ નેટવર્કને બદલે વાઇ-ફાઇ નો ઉપયોગ કરો"</string>
     <string name="wifi_calling_mode_title" msgid="2164073796253284289">"કૉલિંગ પસંદગી"</string>
-    <string name="wifi_calling_mode_dialog_title" msgid="8149690312199253909">"Wi-Fi કૉલિંગ મોડ"</string>
+    <string name="wifi_calling_mode_dialog_title" msgid="8149690312199253909">"વાઇ-ફાઇ કૉલિંગ મોડ"</string>
     <string name="wifi_calling_roaming_mode_title" msgid="1565039047187685115">"રોમિંગ પસંદગી"</string>
     <!-- no translation found for wifi_calling_roaming_mode_summary (8642014873060687717) -->
     <skip />
     <string name="wifi_calling_roaming_mode_dialog_title" msgid="7800926602662078576">"રોમિંગ પસંદગી"</string>
   <string-array name="wifi_calling_mode_choices">
-    <item msgid="2124257075906188844">"Wi-Fi પસંદ કર્યું"</item>
+    <item msgid="2124257075906188844">"વાઇ-ફાઇ પસંદ કર્યું"</item>
     <item msgid="1335127656328817518">"મોબાઇલને પસંદગી"</item>
-    <item msgid="3132912693346866895">"ફક્ત Wi-Fi"</item>
+    <item msgid="3132912693346866895">"ફક્ત વાઇ-ફાઇ"</item>
   </string-array>
   <string-array name="wifi_calling_mode_choices_v2">
-    <item msgid="742988808283756263">"Wi-Fi"</item>
+    <item msgid="742988808283756263">"વાઇ-ફાઇ"</item>
     <item msgid="7715869266611010880">"મોબાઇલ"</item>
-    <item msgid="2838022395783120596">"ફક્ત Wi-Fi"</item>
+    <item msgid="2838022395783120596">"ફક્ત વાઇ-ફાઇ"</item>
   </string-array>
   <string-array name="wifi_calling_mode_values">
     <item msgid="4799585830102342375">"2"</item>
@@ -918,35 +934,35 @@
     <item msgid="3194458950573886239">"0"</item>
   </string-array>
   <string-array name="wifi_calling_mode_choices_without_wifi_only">
-    <item msgid="5782108782860004851">"Wi-Fi પસંદ કર્યું"</item>
+    <item msgid="5782108782860004851">"વાઇ-ફાઇ પસંદ કર્યું"</item>
     <item msgid="5074515506087318555">"મોબાઇલને પસંદગી"</item>
   </string-array>
   <string-array name="wifi_calling_mode_choices_v2_without_wifi_only">
-    <item msgid="6132150507201243768">"Wi-Fi"</item>
+    <item msgid="6132150507201243768">"વાઇ-ફાઇ"</item>
     <item msgid="1118703915148755405">"મોબાઇલ"</item>
   </string-array>
   <string-array name="wifi_calling_mode_values_without_wifi_only">
     <item msgid="2339246858001475047">"2"</item>
     <item msgid="6200207341126893791">"1"</item>
   </string-array>
-    <string name="wifi_calling_off_explanation" msgid="2597566001655908391">"જ્યારે Wi-Fi કૉલિંગ ચાલુ હોય, ત્યારે તમારી પસંદગી અને કયા સિગ્નલ મજબૂત છે તેને આધારે, તમારો ફોન Wi-Fi અથવા તમારા કેરીઅરના નેટવર્ક મારફતે કૉલ્સને રુટ કરી શકે છે. આ સુવિધાને ચાલુ કરતાં પહેલાં, ફી અને અન્ય વિગતો માટે તમારા કેરિઅર સાથે તપાસ કરો."</string>
+    <string name="wifi_calling_off_explanation" msgid="2597566001655908391">"જ્યારે વાઇ-ફાઇ કૉલિંગ ચાલુ હોય, ત્યારે તમારી પસંદગી અને કયા સિગ્નલ મજબૂત છે તેને આધારે, તમારો ફોન વાઇ-ફાઇ અથવા તમારા કૅરીઅરના નેટવર્ક મારફતે કૉલ્સને રુટ કરી શકે છે. આ સુવિધાને ચાલુ કરતાં પહેલાં, ફી અને અન્ય વિગતો માટે તમારા કૅરિઅર સાથે તપાસ કરો."</string>
     <string name="wifi_calling_off_explanation_2" msgid="2329334487851497223"></string>
     <string name="emergency_address_title" msgid="3571902448699714454">"કટોકટીના સરનામાંને અપડેટ કરો"</string>
-    <string name="emergency_address_summary" msgid="306028701568728126">"જો તમે WiFi નો ઉપયોગ કરીને 911 કૉલ કરો તો કટોકટીની સેવાઓ દ્વારા તમારા સ્થાનનો સરનામા તરીકે ઉપયોગ કરવામાં આવે છે"</string>
+    <string name="emergency_address_summary" msgid="3266760199681945746">"જો તમે વાઇ-ફાઇનો ઉપયોગ કરીને કોઈ કટોકટીનો કૉલ કર્યો હોય, તો કટોકટીની સેવાઓ દ્વારા જે સરનામાંનો ઉપયોગ કરાયો હોય તેને તમારા સ્થાન તરીકે ચિહ્નિત કરવામાં આવશે"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"ડિસ્પ્લે"</string>
     <string name="sound_settings" msgid="5534671337768745343">"ધ્વનિ"</string>
     <string name="all_volume_title" msgid="4296957391257836961">"વૉલ્યૂમ્સ"</string>
     <string name="musicfx_title" msgid="3415566786340790345">"સંગીત પ્રભાવો"</string>
     <string name="ring_volume_title" msgid="5592466070832128777">"રિંગ વૉલ્યુમ"</string>
     <string name="vibrate_in_silent_title" msgid="3897968069156767036">"શાંત હોય ત્યારે વાઇબ્રેટ કરો"</string>
-    <string name="notification_sound_title" msgid="5137483249425507572">"ડિફોલ્ટ સૂચના માટે ધ્વનિ"</string>
+    <string name="notification_sound_title" msgid="5137483249425507572">"નોટિફિકેશન માટે ડિફૉલ્ટ ધ્વનિ"</string>
     <string name="incoming_call_volume_title" msgid="8073714801365904099">"રિંગટોન"</string>
-    <string name="notification_volume_title" msgid="2012640760341080408">"સૂચના"</string>
+    <string name="notification_volume_title" msgid="2012640760341080408">"નોટિફિકેશન"</string>
     <string name="checkbox_notification_same_as_incoming_call" msgid="1073644356290338921">"સૂચનાઓ માટે ઇનકમિંગ કૉલ વોલ્યુમનો ઉપયોગ કરો"</string>
     <string name="home_work_profile_not_supported" msgid="1357721012342357037">"કાર્ય પ્રોફાઇલ્સનું સમર્થન કરતું નથી"</string>
-    <string name="notification_sound_dialog_title" msgid="3805140135741385667">"ડિફોલ્ટ સૂચના માટે ધ્વનિ"</string>
+    <string name="notification_sound_dialog_title" msgid="3805140135741385667">"નોટિફિકેશન માટે ડિફૉલ્ટ ધ્વનિ"</string>
     <string name="media_volume_title" msgid="3576565767317118106">"મીડિયા"</string>
-    <string name="media_volume_summary" msgid="5363248930648849974">"સંગીત અને વિડિઓ માટે વોલ્યૂમ સેટ કરો"</string>
+    <string name="media_volume_summary" msgid="5363248930648849974">"સંગીત અને વીડિઓ માટે વોલ્યૂમ સેટ કરો"</string>
     <string name="alarm_volume_title" msgid="2285597478377758706">"એલાર્મ"</string>
     <string name="dock_settings_summary" msgid="455802113668982481">"જોડેલ ડોક માટેની ઑડિઓ સેટિંગ્સ"</string>
     <string name="dtmf_tone_enable_title" msgid="8533399267725365088">"ડાયલ પેડ ટચ ટોન્સ"</string>
@@ -954,9 +970,9 @@
     <string name="lock_sounds_enable_title" msgid="450098505659399520">"સ્ક્રીન લૉક ધ્વનિ"</string>
     <string name="haptic_feedback_enable_title" msgid="7152163068278526530">"ટૅપ કરવા પર વાઇબ્રેટ કરો"</string>
     <string name="audio_record_proc_title" msgid="4271091199976457534">"અવાજ રદ્દીકરણ"</string>
-    <string name="volume_media_description" msgid="7949355934788807863">"સંગીત, વિડિઓ, રમતો, અને અને અન્ય મીડિયા"</string>
+    <string name="volume_media_description" msgid="7949355934788807863">"સંગીત, વીડિઓ, રમતો, અને અને અન્ય મીડિયા"</string>
     <string name="volume_ring_description" msgid="5936851631698298989">"રિંગટોન અને સૂચનાઓ"</string>
-    <string name="volume_notification_description" msgid="5810902320215328321">"સૂચનાઓ"</string>
+    <string name="volume_notification_description" msgid="5810902320215328321">"નોટિફિકેશનો"</string>
     <string name="volume_alarm_description" msgid="8322615148532654841">"એલાર્મ્સ"</string>
     <string name="volume_ring_mute" msgid="3018992671608737202">"રિંગટોન અને સૂચનાઓ મ્યૂટ કરો"</string>
     <string name="volume_media_mute" msgid="3399059928695998166">"સંગીત અને અન્ય મીડિયાને મ્યૂટ કરો"</string>
@@ -979,15 +995,16 @@
     <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>
     <string name="search_settings" msgid="1910951467596035063">"શોધો"</string>
     <string name="search_settings_summary" msgid="9205656546570654169">"શોધ સેટિંગ્સ અને ઇતિહાસ સંચાલિત કરો"</string>
     <string name="search_settings_no_results" msgid="8799027492641230999">"કોઈ પરિણામ નથી"</string>
-    <string name="display_settings" msgid="7965901687241669598">"પ્રદર્શન"</string>
-    <string name="accelerometer_title" msgid="7854608399547349157">"સ્ક્રીનને સ્વતઃ-ફેરવો"</string>
+    <string name="search_clear_history" msgid="4196658962573162457">"ઇતિહાસ સાફ કરો"</string>
+    <string name="display_settings" msgid="7965901687241669598">"ડિસ્પ્લે"</string>
+    <string name="accelerometer_title" msgid="7854608399547349157">"સ્ક્રીનને આપમેળે ફેરવો"</string>
     <string name="color_mode_title" msgid="3159275920408338215">"આબેહૂબ રંગ"</string>
     <string name="accelerometer_summary_on" product="tablet" msgid="429982132339828942">"ટેબ્લેટને ફેરવતી વખતે ઓરિએન્ટેશનને આપમેળે સ્વિચ કરો"</string>
     <string name="accelerometer_summary_on" product="default" msgid="1133737282813048021">"ફોનને ફેરવતી વખતે ઓરિએન્ટેશનને આપમેળે સ્વિચ કરો"</string>
@@ -1032,7 +1049,7 @@
     <string name="night_display_summary_on_auto_mode_never" msgid="9117830821363119835">"આપમેળે ક્યારેય બંધ નહીં થાય"</string>
     <string name="night_display_summary_on_auto_mode_custom" msgid="5510753572245577263">"<xliff:g id="ID_1">%1$s</xliff:g> વાગ્યે આપમેળે બંધ થઈ જશે"</string>
     <string name="night_display_summary_on_auto_mode_twilight" msgid="852270120144683507">"સૂર્યોદય સમયે આપમેળે બંધ થઈ જશે"</string>
-    <string name="screen_timeout" msgid="4351334843529712571">"નિષ્ક્રિય થાઓ"</string>
+    <string name="screen_timeout" 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>
@@ -1055,55 +1072,53 @@
     <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="ambient_display_screen_title" msgid="4252755516328775766">"ઍમ્બિઅન્ટ પ્રદર્શન"</string>
-    <!-- no translation found for ambient_display_screen_summary_always_on (7337555569694794132) -->
-    <skip />
-    <string name="ambient_display_screen_summary_notifications" msgid="1449570742600868654">"નવી સૂચનાઓ"</string>
+    <string name="ambient_display_screen_title" msgid="4252755516328775766">"ઍમ્બિઅન્ટ ડિસ્પ્લે"</string>
+    <string name="ambient_display_screen_summary_always_on" msgid="7337555569694794132">"હંમેશા ચાલુ / વધારેલ બૅટરી વપરાશ"</string>
+    <string name="ambient_display_screen_summary_notifications" msgid="1449570742600868654">"નવા નોટિફિકેશનો"</string>
     <string name="ambient_display_category_triggers" msgid="4359289754456268573">"ક્યારે બતાવવું"</string>
-    <string name="doze_title" msgid="2375510714460456687">"નવી સૂચનાઓ"</string>
-    <string name="doze_summary" msgid="3846219936142814032">"જ્યારે તમને સૂચનાઓ પ્રાપ્ત થાય ત્યારે સ્ક્રીન સક્રિય કરો"</string>
+    <string name="doze_title" msgid="2375510714460456687">"નવા નોટિફિકેશનો"</string>
+    <string name="doze_summary" msgid="3846219936142814032">"જ્યારે તમને નોટિફિકેશનો પ્રાપ્ત થાય ત્યારે સ્ક્રીન સક્રિય કરો"</string>
     <string name="doze_always_on_title" msgid="1046222370442629646">"હંમેશાં ચાલુ"</string>
-    <!-- no translation found for doze_always_on_summary (6978257596231155345) -->
-    <skip />
+    <string name="doze_always_on_summary" msgid="6978257596231155345">"સમય, નોટિફિકેશનના આઇકન અને અન્ય માહિતી બતાવો. વધારેલ બૅટરી વપરાશ."</string>
     <string name="title_font_size" msgid="4405544325522105222">"ફોન્ટનું કદ"</string>
     <string name="short_summary_font_size" msgid="6819778801232989076">"ટેક્સ્ટને નાની અથવા મોટી કરો"</string>
-    <string name="sim_lock_settings" msgid="3392331196873564292">"SIM કાર્ડ લૉક સેટિંગ્સ"</string>
-    <string name="sim_lock_settings_category" msgid="6242052161214271091">"SIM કાર્ડ લૉક"</string>
+    <string name="sim_lock_settings" msgid="3392331196873564292">"સિમ કાર્ડ લૉક સેટિંગ્સ"</string>
+    <string name="sim_lock_settings_category" msgid="6242052161214271091">"સિમ કાર્ડ લૉક"</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>
-    <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_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_reenter_new" msgid="6523819386793546888">"નવો પિન ફરીથી લખો"</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_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_ok" msgid="6475946836899218919">"ઓકે"</string>
     <string name="sim_enter_cancel" msgid="6240422158517208036">"રદ કરો"</string>
-    <string name="sim_multi_sims_title" msgid="9159427879911231239">"બહુવિધ SIM મળી"</string>
-    <string name="sim_multi_sims_summary" msgid="2698176447067691396">"મોબાઇલ ડેટા માટે તમારી પસંદગીનું SIM પસંદ કરો."</string>
-    <string name="sim_change_data_title" msgid="294357201685244532">"ડેટા SIM બદલીએ?"</string>
+    <string name="sim_multi_sims_title" msgid="9159427879911231239">"બહુવિધ સિમ મળી"</string>
+    <string name="sim_multi_sims_summary" msgid="2698176447067691396">"મોબાઇલ ડેટા માટે તમારી પસંદગીનું સિમ પસંદ કરો."</string>
+    <string name="sim_change_data_title" msgid="294357201685244532">"ડેટા સિમ બદલીએ?"</string>
     <string name="sim_change_data_message" msgid="5854582807996717811">"મોબાઇલ ડેટા માટે <xliff:g id="OLD_SIM">%2$s</xliff:g>ને બદલે <xliff:g id="NEW_SIM">%1$s</xliff:g>નો ઉપયોગ કરીએ?"</string>
-    <string name="sim_preferred_title" msgid="5567909634636045268">"મનપસંદ 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">"ખોટો SIM PIN કોડ, તમારે હવે તમારું ઉપકરણ અનલૉક કરવા માટે તમારા કેરીઅરનો સંપર્ક કરવો આવશ્યક છે."</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>
     <plurals name="wrong_pin_code" formatted="false" msgid="1582398808893048097">
-      <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>
+      <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">"SIM PIN ઑપરેશન નિષ્ફળ થયું!"</string>
+    <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>
@@ -1114,17 +1129,16 @@
     <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>
     <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="default" msgid="2599162787451519618">"ફોન નંબર, સિગ્નલ વગેરે"</string>
     <string name="storage_settings" msgid="4211799979832404953">"સ્ટોરેજ"</string>
-    <string name="storage_usb_settings" msgid="7293054033137078060">"સંગ્રહ"</string>
+    <string name="storage_usb_settings" msgid="7293054033137078060">"સ્ટોરેજ"</string>
     <string name="storage_settings_title" msgid="8746016738388094064">"સ્ટોરેજ સેટિંગ્સ"</string>
     <string name="storage_settings_summary" product="nosdcard" msgid="3543813623294870759">"USB સંગ્રહને અનમાઉન્ટ કરો, ઉપલબ્ધ સંગ્રહ જુઓ"</string>
     <string name="storage_settings_summary" product="default" msgid="9176693537325988610">"SD કાર્ડ અનમાઉન્ટ કરો, ઉપલબ્ધ સંગ્રહ જુઓ"</string>
@@ -1142,14 +1156,13 @@
     <string name="status_signal_strength" msgid="3732655254188304547">"સિગ્નલ પ્રબળતા"</string>
     <string name="status_roaming" msgid="2638800467430913403">"રોમિંગ"</string>
     <string name="status_operator" msgid="2274875196954742087">"નેટવર્ક"</string>
-    <string name="status_wifi_mac_address" msgid="2202206684020765378">"Wi‑Fi MAC સરનામું"</string>
-    <string name="status_bt_address" msgid="4195174192087439720">"Bluetooth સરનામું"</string>
+    <string name="status_wifi_mac_address" msgid="2202206684020765378">"વાઇ-ફાઇ MAC સરનામું"</string>
+    <string name="status_bt_address" msgid="4195174192087439720">"બ્લૂટૂથ સરનામું"</string>
     <string name="status_serial_number" msgid="2257111183374628137">"શૃંખલા ક્રમાંક"</string>
-    <string name="status_unavailable" msgid="7862009036663793314">"અનુપલબ્ધ"</string>
     <string name="status_up_time" msgid="7294859476816760399">"ચાલુ થયાનો સમય"</string>
     <string name="status_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>
@@ -1166,20 +1179,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="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>
@@ -1187,19 +1200,19 @@
     <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>
     <string name="storage_low_title" msgid="1388569749716225155">"સંગ્રહ સ્થાન સમાપ્ત થયું"</string>
-    <string name="storage_low_summary" msgid="7737465774892563129">"કેટલાક સિસ્ટમ કાર્યો, જેમ કે સમન્વયન, યોગ્ય રીતે કાર્ય કરશે નહીં. આઇટમ્સને કાઢી નાંખીને અથવા અનપિન કરીને સ્થાન ખાલી કરવાનો પ્રયાસ કરો, જેમ કે ઍપ્લિકેશનો અથવા મીડિયા સામગ્રી."</string>
+    <string name="storage_low_summary" msgid="7737465774892563129">"કેટલાક સિસ્ટમ કાર્યો, જેમ કે સમન્વયન, યોગ્ય રીતે કાર્ય કરશે નહીં. આઇટમ્સને કાઢી નાંખીને અથવા અનપિન કરીને સ્થાન ખાલી કરવાનો પ્રયાસ કરો, જેમ કે ઍપ્લિકેશનો અથવા મીડિયા કન્ટેન્ટ."</string>
     <string name="storage_menu_rename" msgid="7141058657592615390">"નામ બદલો"</string>
     <string name="storage_menu_mount" msgid="1014683672493425425">"માઉન્ટ કરો"</string>
     <string name="storage_menu_unmount" msgid="681485356885955898">"બહાર કાઢો"</string>
     <string name="storage_menu_format" msgid="7690626079653152152">"ફોર્મેટ"</string>
     <string name="storage_menu_format_public" msgid="7464714208010125682">"પોર્ટેબલ તરીકે ફોર્મેટ કરો"</string>
     <string name="storage_menu_format_private" msgid="546017531835902096">"આંતરિક તરીકે ફોર્મેટ કરો"</string>
-    <string name="storage_menu_migrate" msgid="3969621494238154294">"ડેટાને સ્થાનાંતરિત કરો"</string>
+    <string name="storage_menu_migrate" msgid="3969621494238154294">"ડેટાને ટ્રાન્સફર કરો"</string>
     <string name="storage_menu_forget" msgid="6305824238997983426">"ભૂલી જાઓ"</string>
     <string name="storage_menu_set_up" msgid="4263294929451685366">"સેટ કરો"</string>
     <string name="storage_menu_explore" msgid="4637496051816521560">"અન્વેષણ કરો"</string>
@@ -1208,9 +1221,9 @@
     <string name="storage_title_usb" msgid="679612779321689418">"USB કમ્પ્યુટર કનેક્શન"</string>
     <string name="usb_connection_category" msgid="7805945595165422882">"આ તરીકે કનેક્ટ કરો"</string>
     <string name="usb_mtp_title" msgid="3399663424394065964">"મીડિયા ઉપકરણ (MTP)"</string>
-    <string name="usb_mtp_summary" msgid="4617321473211391236">"તમને મીડિયા ફાઇલોને Windows પર સ્થાનાંતરિત કરવા દે છે અથવા Mac પર Android ફાઇલ સ્થાનાંતરનો ઉપયોગ કરવા દે છે (www.android.com/filetransfer જુઓ)"</string>
+    <string name="usb_mtp_summary" msgid="4617321473211391236">"તમને મીડિયા ફાઇલોને Windows પર ટ્રાન્સફર કરવા દે છે અથવા Mac પર Android ફાઇલ સ્થાનાંતરનો ઉપયોગ કરવા દે છે (www.android.com/filetransfer જુઓ)"</string>
     <string name="usb_ptp_title" msgid="3852760810622389620">"કૅમેરો (PTP)"</string>
-    <string name="usb_ptp_summary" msgid="7406889433172511530">"તમને કૅમેરા સૉફ્ટવેરની મદદથી ફોટા સ્થાનાંતરિત કરવા દે છે અને MTP નું સમર્થન કરતાં ન હોય તેવા કમ્પ્યુટર્સ પર કોઈપણ ફાઇલોને સ્થાનાંતરિત કરવા દે છે"</string>
+    <string name="usb_ptp_summary" msgid="7406889433172511530">"તમને કૅમેરા સૉફ્ટવેરની મદદથી ફોટો ટ્રાન્સફર કરવા દે છે અને MTP નું સમર્થન કરતાં ન હોય તેવા કમ્પ્યુટર્સ પર કોઈપણ ફાઇલોને ટ્રાન્સફર કરવા દે છે"</string>
     <string name="usb_midi_title" msgid="3069990264258413994">"MIDI"</string>
     <string name="usb_midi_summary" msgid="539169474810956358">"તમારા કમ્પ્યુટર પરના MIDI સોફ્ટવેર વડે MIDI સક્ષમ એપ્લિકેશન્સને USB પર કામ કરવા દે છે."</string>
     <string name="storage_other_users" msgid="808708845102611856">"અન્ય વપરાશકર્તાઓ"</string>
@@ -1230,11 +1243,11 @@
     <string name="storage_dialog_unmounted" msgid="6403320870103261477">"આ <xliff:g id="NAME_0">^1</xliff:g> સુરક્ષિતપણે બહાર કાઢવામાં આવ્યું છે, પરંતુ હજી પણ ઉપલબ્ધ છે. \n\nઆ <xliff:g id="NAME_1">^1</xliff:g> નો ઉપયોગ કરવા માટે, પહેલા તમારે તેને માઉન્ટ કરવું પડશે."</string>
     <string name="storage_dialog_unmountable" msgid="3732209361668282254">"આ <xliff:g id="NAME_0">^1</xliff:g> દૂષિત છે. \n\nઆ <xliff:g id="NAME_1">^1</xliff:g> નો ઉપયોગ કરવા માટે, પહેલા તમારે તેને સેટ કરવું પડશે."</string>
     <string name="storage_dialog_unsupported" msgid="4503128224360482228">"આ ઉપકરણ આ <xliff:g id="NAME_0">^1</xliff:g> નું સમર્થન કરતું નથી. \n\nઆ ઉપકરણ સાથે આ <xliff:g id="NAME_1">^1</xliff:g> નો ઉપયોગ કરવા માટે, પહેલા તમારે તેને સેટ અપ કરવું પડશે."</string>
-    <string name="storage_internal_format_details" msgid="4018647158382548820">"ફોર્મેટ કર્યા પછી, તમે અન્ય ઉપકરણોમાં આ <xliff:g id="NAME_0">^1</xliff:g> નો ઉપયોગ કરી શકો છો. \n\n<xliff:g id="NAME_1">^1</xliff:g> પરનો તમામ ડેટા કાઢી નાખવામાં આવશે. પહેલા બેક અપ લેવાનો વિચાર કરો. \n\n"<b>"ફોટા અને અન્ય મીડિયાનો બેક અપ લો"</b>" \nઆ ઉપકરણ પર વૈકલ્પિક સંગ્રહ પર તમારી મીડિયા ફાઇલોને ખસેડો અથવા તેમને USB કેબલની મદદથી કમ્પ્યુટરમાં સ્થાનાંતરિત કરો. \n\n"<b>"ઍપ્લિકેશનોનો બેક અપ લો"</b>" \nઆ <xliff:g id="NAME_6">^1</xliff:g> પર સંગ્રહિત તમામ ઍપ્લિકેશનો અનઇન્સ્ટોલ કરવામાં આવશે અને તેમનો ડેટા કાઢી નાખવામાં આવશે. આ ઍપ્લિકેશનો રાખવા માટે, તેમને આ ઉપકરણ પર વૈકલ્પિક સંગ્રહમાં ખસેડો."</string>
+    <string name="storage_internal_format_details" msgid="4018647158382548820">"ફોર્મેટ કર્યા પછી, તમે અન્ય ઉપકરણોમાં આ <xliff:g id="NAME_0">^1</xliff:g> નો ઉપયોગ કરી શકો છો. \n\n<xliff:g id="NAME_1">^1</xliff:g> પરનો તમામ ડેટા કાઢી નાખવામાં આવશે. પહેલા બેક અપ લેવાનો વિચાર કરો. \n\n"<b>"ફોટો અને અન્ય મીડિયાનો બેક અપ લો"</b>" \nઆ ઉપકરણ પર વૈકલ્પિક સંગ્રહ પર તમારી મીડિયા ફાઇલોને ખસેડો અથવા તેમને USB કેબલની મદદથી કમ્પ્યુટરમાં ટ્રાન્સફર કરો. \n\n"<b>"ઍપ્લિકેશનોનો બેક અપ લો"</b>" \nઆ <xliff:g id="NAME_6">^1</xliff:g> પર સંગ્રહિત તમામ ઍપ્લિકેશનો અનઇન્સ્ટોલ કરવામાં આવશે અને તેમનો ડેટા કાઢી નાખવામાં આવશે. આ ઍપ્લિકેશનો રાખવા માટે, તેમને આ ઉપકરણ પર વૈકલ્પિક સંગ્રહમાં ખસેડો."</string>
     <string name="storage_internal_unmount_details" msgid="3582802571684490057"><b>"જ્યારે તમે આ <xliff:g id="NAME_0">^1</xliff:g> ને બહાર કાઢો છો, ત્યારે તેના પર સંગ્રહિત ઍપ્લિકેશનો કાર્ય કરવાનું બંધ કરશે અને તેના પર સંગ્રહિત મીડિયા ફાઇલો તે ફરીથી શામેલ કરવામાં આવે ત્યાં સુધી ઉપલબ્ધ રહેશે નહીં."</b>\n\n"આ <xliff:g id="NAME_1">^1</xliff:g> ને તે આ ઉપકરણ પર જ કાર્ય કરે તે માટે ફોર્મેટ કર્યું છે. તે કોઈપણ અન્ય પર કાર્ય કરશે નહીં."</string>
-    <string name="storage_internal_forget_details" msgid="9028875424669047327">"આ <xliff:g id="NAME">^1</xliff:g> ધરાવે છે, તે ઍપ્લિકેશનો, ફોટા અથવા ડેટાનો ઉપયોગ કરવા માટે, તેને ફરીથી શામેલ કરો. \n\nવૈકલ્પિક રૂપે, જો તમે ઉપકરણ ઉપલબ્ધ ન હોય તો આ સંગ્રહને ભૂલી જવાનું પસંદ કરી શકો છો. \n\nજો તમે ભૂલી જવાનું પસંદ કરો છો, તો ઉપકરણમાં શામેલ તમામ ડેટા કાયમ માટે ગુમ થઈ જશે. \n\nતમે પછીથી ઍપ્લિકેશનોને ફરીથી ઇન્સ્ટોલ કરી શકો છો, પરંતુ આ ઉપકરણ પર સંગ્રહિત તેમનો ડેટા ગુમ થઈ જશે."</string>
+    <string name="storage_internal_forget_details" msgid="9028875424669047327">"આ <xliff:g id="NAME">^1</xliff:g> ધરાવે છે, તે ઍપ્લિકેશનો, ફોટો અથવા ડેટાનો ઉપયોગ કરવા માટે, તેને ફરીથી શામેલ કરો. \n\nવૈકલ્પિક રૂપે, જો તમે ઉપકરણ ઉપલબ્ધ ન હોય તો આ સંગ્રહને ભૂલી જવાનું પસંદ કરી શકો છો. \n\nજો તમે ભૂલી જવાનું પસંદ કરો છો, તો ઉપકરણમાં શામેલ તમામ ડેટા કાયમ માટે ગુમ થઈ જશે. \n\nતમે પછીથી ઍપ્લિકેશનોને ફરીથી ઇન્સ્ટોલ કરી શકો છો, પરંતુ આ ઉપકરણ પર સંગ્રહિત તેમનો ડેટા ગુમ થઈ જશે."</string>
     <string name="storage_internal_forget_confirm_title" msgid="1370847944388479245">"<xliff:g id="NAME">^1</xliff:g> ભૂલી ગયાં?"</string>
-    <string name="storage_internal_forget_confirm" msgid="1148446041396902905">"આ <xliff:g id="NAME">^1</xliff:g> પર સંગ્રહિત તમામ ઍપ્લિકેશનો, ફોટા અને ડેટા કાયમ માટે જતો રહેશે."</string>
+    <string name="storage_internal_forget_confirm" msgid="1148446041396902905">"આ <xliff:g id="NAME">^1</xliff:g> પર સંગ્રહિત તમામ ઍપ્લિકેશનો, ફોટો અને ડેટા કાયમ માટે જતો રહેશે."</string>
     <string name="storage_detail_apps" msgid="6141154016753507490">"ઍપ્લિકેશનો"</string>
     <string name="storage_detail_images" msgid="6950678857740634769">"છબીઓ"</string>
     <string name="storage_detail_videos" msgid="2919743464827110953">"વિડિઓઝ"</string>
@@ -1243,15 +1256,15 @@
     <string name="storage_detail_other" msgid="8404938385075638238">"અન્ય"</string>
     <string name="storage_detail_system" msgid="4629506366064709687">"સિસ્ટમ"</string>
     <string name="storage_detail_explore" msgid="7911344011431568294">"<xliff:g id="NAME">^1</xliff:g> નું અન્વેષણ કરો"</string>
-    <string name="storage_detail_dialog_other" msgid="8907101974576694793">"અન્યમાં ઍપ્લિકેશનો, ફાઇલો દ્વારા સાચવવામાં આવેલ શેર કરેલી ફાઇલો, ઇન્ટરનેટ અથવા Bluetooth માંથી ડાઉનલોડ કરેલી ફાઇલો, Android ફાઇલો અને આના જેવી વધુ શામેલ છે. \n\nઆ <xliff:g id="NAME">^1</xliff:g> ની દૃશ્યક્ષમ સામગ્રીઓ જોવા માટે, અન્વેષણ કરો ટૅપ કરો."</string>
+    <string name="storage_detail_dialog_other" msgid="8907101974576694793">"અન્યમાં ઍપ્લિકેશનો, ફાઇલો દ્વારા સાચવવામાં આવેલ શેર કરેલી ફાઇલો, ઇન્ટરનેટ અથવા બ્લૂટૂથ માંથી ડાઉનલોડ કરેલી ફાઇલો, Android ફાઇલો અને આના જેવી વધુ શામેલ છે. \n\nઆ <xliff:g id="NAME">^1</xliff:g> ની દૃશ્યક્ષમ સામગ્રીઓ જોવા માટે, અન્વેષણ કરો ટૅપ કરો."</string>
     <string name="storage_detail_dialog_system" msgid="862835644848361569">"સિસ્ટમમાં Android સંસ્કરણ <xliff:g id="VERSION">%s</xliff:g> ચલાવવા માટે ઉપયોગી ફાઇલોનો સમાવેશ છે"</string>
-    <string name="storage_detail_dialog_user" msgid="3267254783294197804">"<xliff:g id="USER_0">^1</xliff:g>એ <xliff:g id="SIZE">^2</xliff:g> સ્ટોરેજનો ઉપયોગ કરીને ફોટા, સંગીત, ઍપ્લિકેશનો અથવા અન્ય ડેટા સાચવ્યો હોઈ શકે છે.\n\nવિગતો જોવા માટે, <xliff:g id="USER_1">^1</xliff:g> પર સ્વિચ કરો."</string>
+    <string name="storage_detail_dialog_user" msgid="3267254783294197804">"<xliff:g id="USER_0">^1</xliff:g>એ <xliff:g id="SIZE">^2</xliff:g> સ્ટોરેજનો ઉપયોગ કરીને ફોટો, સંગીત, ઍપ્લિકેશનો અથવા અન્ય ડેટા સાચવ્યો હોઈ શકે છે.\n\nવિગતો જોવા માટે, <xliff:g id="USER_1">^1</xliff:g> પર સ્વિચ કરો."</string>
     <string name="storage_wizard_init_title" msgid="5085400514028585772">"તમારું <xliff:g id="NAME">^1</xliff:g> સેટ કરો"</string>
     <string name="storage_wizard_init_external_title" msgid="4867326438945303598">"પોર્ટેબલ સંગ્રહ તરીકે ઉપયોગ કરો"</string>
-    <string name="storage_wizard_init_external_summary" msgid="7476105886344565074">"ઉપકરણો વચ્ચે ફોટા અને અન્ય મીડિયા ખસેડવા માટે."</string>
-    <string name="storage_wizard_init_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_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_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>
@@ -1259,7 +1272,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>
@@ -1268,8 +1281,8 @@
     <string name="storage_wizard_migrate_progress_title" msgid="1665479429044202868">"ડેટાને ખસેડી રહ્યું છે…"</string>
     <string name="storage_wizard_migrate_details" msgid="3709728824651136227">"ખસેડવા દરમિયાન: \n• <xliff:g id="NAME">^1</xliff:g> ને દૂર કરશો નહીં. \n• કેટલીક ઍપ્લિકેશનો ઠીકથી કામ કરશે નહીં. \n• ઉપકરણને ચાર્જ થયેલ રાખો."</string>
     <string name="storage_wizard_ready_title" msgid="5381632402953258267">"<xliff:g id="NAME">^1</xliff:g> તૈયાર છે"</string>
-    <string name="storage_wizard_ready_external_body" msgid="2879508114260597474">"ફોટા અને અન્ય મીડિયા સાથે ઉપયોગ કરવા માટે તમારું <xliff:g id="NAME">^1</xliff:g> સેટ કરેલ છે."</string>
-    <string name="storage_wizard_ready_internal_body" msgid="122532674037860197">"તમારું નવું <xliff:g id="NAME">^1</xliff:g> કાર્ય કરી રહ્યું છે. \n\nઆ ઉપકરણ પર ફોટા, ફાઇલો અને ઍપ્લિકેશન ડેટા ખસેડવા માટે, સેટિંગ્સ &gt; સ્ટોરેજ પર જાઓ."</string>
+    <string name="storage_wizard_ready_external_body" msgid="2879508114260597474">"ફોટો અને અન્ય મીડિયા સાથે ઉપયોગ કરવા માટે તમારું <xliff:g id="NAME">^1</xliff:g> સેટ કરેલ છે."</string>
+    <string name="storage_wizard_ready_internal_body" msgid="122532674037860197">"તમારું નવું <xliff:g id="NAME">^1</xliff:g> કાર્ય કરી રહ્યું છે. \n\nઆ ઉપકરણ પર ફોટો, ફાઇલો અને ઍપ્લિકેશન ડેટા ખસેડવા માટે, સેટિંગ્સ &gt; સ્ટોરેજ પર જાઓ."</string>
     <string name="storage_wizard_move_confirm_title" msgid="292782012677890250">"<xliff:g id="APP">^1</xliff:g> ને ખસેડો"</string>
     <string name="storage_wizard_move_confirm_body" msgid="5176432115206478941">"<xliff:g id="APP">^1</xliff:g> ને તેના ડેટાને <xliff:g id="NAME_0">^2</xliff:g> પર ખસેડવામાં થોડો જ સમય લાગશે. જ્યાં સુધી ખસેડવાનું પૂર્ણ ન થાય ત્યાં સુધી તમે એપ્લિકેશનનો ઉપયોગ કરી શકશો નહીં. \n\nખસેડવા દરમિયાન <xliff:g id="NAME_1">^2</xliff:g> ને દૂર કરશો નહીં."</string>
     <string name="storage_wizard_move_progress_title" msgid="4443920302548035674">"<xliff:g id="APP">^1</xliff:g> ને ખસેડી રહ્યાં છે…"</string>
@@ -1320,8 +1333,9 @@
     <string name="restore_default_apn" msgid="8178010218751639581">"ડિફોલ્ટ APN સેટિંગ્સ પુનર્સ્થાપિત કરવી."</string>
     <string name="menu_restore" msgid="8260067415075573273">"ડીફોલ્ટ પર ફરીથી સેટ કરો"</string>
     <string name="restore_default_apn_completed" msgid="2824775307377604897">"ડિફોલ્ટ APN સેટિંગ્સ ફરીથી સેટ કરો પૂર્ણ થયું."</string>
-    <string name="reset_dashboard_title" msgid="6254873816990678620">"વિકલ્પો રીસેટ કરો"</string>
-    <string name="reset_network_title" msgid="6166025966016873843">"Wi-Fi, મોબાઇલ અને Bluetooth રીસેટ કરો"</string>
+    <string name="reset_dashboard_title" msgid="6254873816990678620">"રીસેટ માટેના વિકલ્પો"</string>
+    <string name="reset_dashboard_summary" msgid="4851012632493522755">"નેટવર્ક, ઍપ અથવા ઉપકરણ રીસેટ કરી શકાય છે"</string>
+    <string name="reset_network_title" msgid="6166025966016873843">"વાઇ-ફાઇ, મોબાઇલ અને બ્લૂટૂથ રીસેટ કરો"</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>
     <string name="reset_network_final_desc" msgid="6388371121099245116">"બધી નેટવર્ક સેટિંગ્સ ફરીથી સેટ કરીએ? તમે આ ક્રિયાને પૂર્વવત્‌ કરી શકતાં નથી!"</string>
@@ -1329,23 +1343,20 @@
     <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="6617679904229218425">"બધો ડેટા કાઢી નાખો (ફેક્ટરી રીસેટ)"</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>
-    </plurals>
-    <string name="master_clear_summary" msgid="6902443944660426951">"આંતરિક સ્ટૉરેજ અને બધો ડેટા રીસેટ કરવામાં આવશે"</string>
+    <string name="master_clear_title" msgid="3531267871084279512">"બધો ડેટા ભૂંસી નાખો (ફેક્ટરી રીસેટ)"</string>
     <string name="master_clear_desc" product="tablet" msgid="9146059417023157222">"આ તમારા ટેબ્લેટનાં "<b>"આંતરિક સંગ્રહ"</b>"માંથી તમામ ડેટા કાઢી નાંખશે, જેમાં આનો સમાવેશ થાય છે:\n\n"<li>"તમારું Google એકાઉન્ટ"</li>\n<li>"સિસ્ટમ અને ઍપ્લિકેશન ડેટા અને સેટિંગ્સ"</li>\n<li>"ડાઉનલોડ કરેલ ઍપ્લિકેશનો"</li></string>
     <string name="master_clear_desc" product="default" msgid="4800386183314202571">"આ તમારા ફોનનાં "<b>"આંતરિક સંગ્રહ"</b>"માંથી તમામ ડેટા કાઢી નાંખશે, જેમાં આનો સમાવેશ થાય છે:\n\n"<li>"તમારું Google એકાઉન્ટ"</li>\n<li>"સિસ્ટમ અને ઍપ્લિકેશન ડેટા અને સેટિંગ્સ"</li>\n<li>"ડાઉનલોડ કરેલ ઍપ્લિકેશનો"</li></string>
     <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"તમે હાલમાં નીચેના એકાઉન્ટ્સમાં સાઇન ઇન થયેલાં છો:\n"</string>
     <string name="master_clear_other_users_present" product="default" msgid="5161423070702470742">\n\n"આ ઉપકરણ પર અન્ય વપરાશકર્તા હાજર છે.\n"</string>
     <string name="master_clear_desc_also_erases_external" msgid="1903185203791274237"><li>"સંગીત"</li>\n<li>"ફોટા"</li>\n<li>"અન્ય વપરાશકર્તા ડેટા"</li></string>
+    <string name="master_clear_desc_also_erases_esim" msgid="312352697653096008"><li>"eSIM પરના કૅરિઅર"</li></string>
+    <string name="master_clear_desc_no_cancel_mobile_plan" msgid="5460926449093211144">\n\n"આનાથી તમારો મોબાઇલ સેવા પ્લાન રદ થશે"</string>
     <string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="7744115866662613411">\n\n"સંગીત, ચિત્રો અને અન્ય વપરાશકર્તા ડેટા સાફ કરવા માટે, "<b>"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_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>
@@ -1361,22 +1372,22 @@
     <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_bluetooth" msgid="355855408317564420">"Bluetooth ટિથરિંગ"</string>
+    <string name="tether_settings_title_wifi" msgid="3277144155960302049">"પોર્ટેબલ હૉટસ્પૉટ"</string>
+    <string name="tether_settings_title_bluetooth" msgid="355855408317564420">"બ્લૂટૂથ ટિથરિંગ"</string>
     <string name="tether_settings_title_usb_bluetooth" msgid="5355828977109785001">"ટિથરિંગ"</string>
-    <string name="tether_settings_title_all" msgid="3058586928118801157">"હોટસ્પોટ અને ટિથરિંગ"</string>
-    <string name="tether_settings_summary_hotspot_on_tether_on" msgid="930464462687425777">"હોટસ્પોટ ચાલુ છે, ટિથરિંગ"</string>
-    <string name="tether_settings_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_subtext" product="default" msgid="5991482890033484794">"USB મારફતે ફોનનું ઇન્ટરનેટ કનેક્શન શેર કરો"</string>
     <string name="usb_tethering_subtext" product="tablet" msgid="5988796139573211318">"USB મારફતે ટૅબ્લેટનું ઇન્ટરનેટ કનેક્શન શેર કરો"</string>
-    <string name="bluetooth_tether_checkbox_text" msgid="2379175828878753652">"Bluetooth ટિથરિંગ"</string>
-    <string name="bluetooth_tethering_subtext" product="tablet" msgid="4558227863463153412">"ટૅબ્લેટનું ઇન્ટરનેટ કનેક્શન Bluetooth દ્વારા શેર કરો"</string>
-    <string name="bluetooth_tethering_subtext" product="default" msgid="1055197887836203595">"ફોનનું ઇન્ટરનેટ કનેક્શન Bluetooth દ્વારા શેર કરો"</string>
-    <string name="bluetooth_tethering_off_subtext_config" msgid="6326877798974938021">"<xliff:g id="DEVICE_NAME">%1$d</xliff:g>નું ઇન્ટરનેટ Bluetooth દ્વારા શેર થાય છે"</string>
+    <string name="bluetooth_tether_checkbox_text" msgid="2379175828878753652">"બ્લૂટૂથ ટિથરિંગ"</string>
+    <string name="bluetooth_tethering_subtext" product="tablet" msgid="4558227863463153412">"ટૅબ્લેટનું ઇન્ટરનેટ કનેક્શન બ્લૂટૂથ દ્વારા શેર કરો"</string>
+    <string name="bluetooth_tethering_subtext" product="default" msgid="1055197887836203595">"ફોનનું ઇન્ટરનેટ કનેક્શન બ્લૂટૂથ દ્વારા શેર કરો"</string>
+    <string name="bluetooth_tethering_off_subtext_config" msgid="6326877798974938021">"<xliff:g id="DEVICE_NAME">%1$d</xliff:g>નું ઇન્ટરનેટ બ્લૂટૂથ દ્વારા શેર થાય છે"</string>
     <string name="bluetooth_tethering_overflow_error" msgid="2135590598511178690">"<xliff:g id="MAXCONNECTION">%1$d</xliff:g> થી વધુ ઉપકરણો સાથે ટિથર કરી શકતાં નથી."</string>
     <string name="bluetooth_untether_blank" msgid="2871192409329334813">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> અનટિથર થશે."</string>
     <string name="tethering_footer_info" msgid="1308462275952345985">"તમારા મોબાઇલ ડેટા કનેક્શન દ્વારા અન્ય ઉપકરણોને ઇન્ટરનેટ પ્રદાન કરવા માટે હૉટસ્પૉટ અને ટિથરિંગનો ઉપયોગ કરો. ઍપ્લિકેશનો પણ નજીકના ઉપકરણો સાથે કન્ટેન્ટ શેર કરવા માટે હૉટસ્પૉટ બનાવી શકે છે."</string>
@@ -1389,15 +1400,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">"Wi‑Fi સહાયક બદલીએ?"</string>
+    <string name="network_scorer_change_active_dialog_title" msgid="3776301550387574975">"વાઇ-ફાઇ અસિસ્ટન્ટ બદલીએ?"</string>
     <string name="network_scorer_change_active_dialog_text" msgid="8035173880322990715">"તમારા નેટવર્ક્સ કનેક્શન્સનું સંચાલન કરવા માટે <xliff:g id="CURRENT_APP">%2$s</xliff:g> ને બદલે <xliff:g id="NEW_APP">%1$s</xliff:g> નો ઉપયોગ કરીએ?"</string>
     <string name="network_scorer_change_active_no_previous_dialog_text" msgid="7444620909047611601">"તમારા નેટવર્ક કનેક્શન્સનું સંચાલન કરવા માટે <xliff:g id="NEW_APP">%s</xliff:g> નો ઉપયોગ કરો?"</string>
-    <string name="mobile_unknown_sim_operator" msgid="2156912373230276157">"અજાણ્યો SIM ઓપરેટર"</string>
+    <string name="mobile_unknown_sim_operator" msgid="2156912373230276157">"અજાણ્યો સિમ ઓપરેટર"</string>
     <string name="mobile_no_provisioning_url" msgid="9053814051811634125">"<xliff:g id="OPERATOR">%1$s</xliff:g> પાસે કોઈ જાણીતી જોગવાઈ કરતી વેબસાઇટ નથી"</string>
-    <string name="mobile_insert_sim_card" msgid="9052590985784056395">"કૃપા કરીને SIM કાર્ડ શામેલ કરો અને પુનઃપ્રારંભ કરો"</string>
+    <string name="mobile_insert_sim_card" msgid="9052590985784056395">"કૃપા કરીને સિમ કાર્ડ શામેલ કરો અને પુનઃપ્રારંભ કરો"</string>
     <string name="mobile_connect_to_internet" msgid="1733894125065249639">"કૃપા કરીને ઇન્ટરનેટ સાથે કનેક્ટ કરો"</string>
     <string name="location_title" msgid="1029961368397484576">"મારું સ્થાન"</string>
-    <string name="managed_profile_location_switch_title" msgid="6712332547063039683">"કાર્ય પ્રોફાઇલ માટે સ્થાન"</string>
+    <string name="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>
@@ -1410,17 +1421,17 @@
     <string name="location_high_battery_use" msgid="517199943258508020">"વધુ બૅટરી ઉપયોગ"</string>
     <string name="location_low_battery_use" msgid="8602232529541903596">"ઓછો બૅટરી ઉપયોગ"</string>
     <string name="location_mode_screen_title" msgid="4528716772270246542">"સ્થાન મોડ"</string>
-    <string name="location_mode_high_accuracy_description" msgid="3453010562265338113">"સ્થાન નક્કી કરવા માટે GPS, Wi-Fi, Bluetooth અથવા મોબાઇલ નેટવર્કોનો ઉપયોગ કરો"</string>
-    <string name="location_mode_battery_saving_description" msgid="2365298246603348985">"સ્થાન નક્કી કરવા માટે Wi‑Fi, Bluetooth અથવા મોબાઇલ નેટવર્કોનો ઉપયોગ કરો"</string>
+    <string name="location_mode_high_accuracy_description" msgid="3453010562265338113">"સ્થાન નક્કી કરવા માટે GPS, વાઇ-ફાઇ, બ્લૂટૂથ અથવા મોબાઇલ નેટવર્કોનો ઉપયોગ કરો"</string>
+    <string name="location_mode_battery_saving_description" msgid="2365298246603348985">"સ્થાન નક્કી કરવા માટે વાઇ-ફાઇ, બ્લૂટૂથ અથવા મોબાઇલ નેટવર્કોનો ઉપયોગ કરો"</string>
     <string name="location_mode_sensors_only_description" msgid="7247994752324805202">"સ્થાન નક્કી કરવા માટે GPS અને ઉપકરણ સેન્સરનો ઉપયોગ કરો"</string>
     <string name="location_scanning_screen_title" msgid="4408076862929611554">"સ્કેન કરી રહ્યું છે"</string>
-    <string name="location_scanning_wifi_always_scanning_title" msgid="6216705505621183645">"Wi‑Fi સ્કેનિંગ"</string>
-    <string name="location_scanning_wifi_always_scanning_description" msgid="8036382029606868081">"કોઈપણ સમયે Wi‑Fi નેટવર્ક્સને શોધવા માટે સિસ્ટમ ઍપ્લિકેશનો અને સેવાઓને મંજૂરી આપીને સ્થાન બહેતર બનાવો."</string>
-    <string name="location_scanning_bluetooth_always_scanning_title" msgid="5444989508204520019">"Bluetooth સ્કેનિંગ"</string>
-    <string name="location_scanning_bluetooth_always_scanning_description" msgid="8602726521250591852">"કોઈપણ સમયે Bluetooth ઉપકરણોને શોધવા માટે સિસ્ટમ ઍપ્લિકેશનો અને સેવાઓને મંજૂરી આપીને સ્થાન બહેતર બનાવો."</string>
-    <string name="location_network_based" msgid="9134175479520582215">"Wi-Fi અને મોબાઇલ નેટવર્ક સ્થાન"</string>
+    <string name="location_scanning_wifi_always_scanning_title" msgid="6216705505621183645">"વાઇ-ફાઇ સ્કેનિંગ"</string>
+    <string name="location_scanning_wifi_always_scanning_description" msgid="8036382029606868081">"કોઈપણ સમયે વાઇ-ફાઇ નેટવર્ક્સને શોધવા માટે સિસ્ટમ ઍપ્લિકેશનો અને સેવાઓને મંજૂરી આપીને સ્થાન બહેતર બનાવો."</string>
+    <string name="location_scanning_bluetooth_always_scanning_title" msgid="5444989508204520019">"બ્લૂટૂથ સ્કેનિંગ"</string>
+    <string name="location_scanning_bluetooth_always_scanning_description" msgid="8602726521250591852">"કોઈપણ સમયે બ્લૂટૂથ ઉપકરણોને શોધવા માટે સિસ્ટમ ઍપ્લિકેશનો અને સેવાઓને મંજૂરી આપીને સ્થાન બહેતર બનાવો."</string>
+    <string name="location_network_based" msgid="9134175479520582215">"વાઇ-ફાઇ અને મોબાઇલ નેટવર્ક સ્થાન"</string>
     <string name="location_neighborhood_level" msgid="5141318121229984788">"એપ્લિકેશન્સને તમારા સ્થાનનો વધુ ઝડપથી અંદાજ મેળવવા માટે Google ની સ્થાન સેવાનો ઉપયોગ કરવા દો. અનામી સ્થાન ડેટા એકત્રિત કરીને Google ને મોકલવામાં આવશે."</string>
-    <string name="location_neighborhood_level_wifi" msgid="4234820941954812210">"સ્થાન Wi‑Fi દ્વારા નિર્ધારિત થયું"</string>
+    <string name="location_neighborhood_level_wifi" msgid="4234820941954812210">"સ્થાન વાઇ-ફાઇ દ્વારા નિર્ધારિત થયું"</string>
     <string name="location_gps" msgid="8392461023569708478">"GPS સેટેલાઇટ્સ"</string>
     <string name="location_street_level" product="tablet" msgid="1669562198260860802">"તમારા સ્થાનનું નિર્દેશન કરવા માટે એપ્લિકેશન્સને તમારા ટેબ્લેટ પર GPS નો ઉપયોગ કરવા દો"</string>
     <string name="location_street_level" product="default" msgid="4617445745492014203">"તમારા સ્થાનનું નિર્દેશન કરવા માટે એપ્લિકેશન્સને તમારા ફોન પરના GPS નો ઉપયોગ કરવા દો"</string>
@@ -1456,76 +1467,77 @@
     <string name="settings_safetylegal_activity_title" msgid="6901214628496951727">"સલામતી માહિતી"</string>
     <string name="settings_safetylegal_activity_unreachable" msgid="250674109915859456">"તમારી પાસે ડેટા કનેક્શન નથી. આ માહિતી હમણાં જોવા માટે, ઇન્ટરનેટથી કનેક્ટ થયેલા કોઈપણ કમ્પ્યુટરથી %s પર જાઓ."</string>
     <string name="settings_safetylegal_activity_loading" msgid="8059022597639516348">"લોડ કરી રહ્યું છે..."</string>
-    <string name="lockpassword_choose_your_password_header" msgid="8624900666929394990">"તમારો પાસવર્ડ પસંદ કરો"</string>
-    <string name="lockpassword_choose_your_password_header_for_fingerprint" msgid="6624409510609085450">"ફિંગરપ્રિન્ટ વાપરવા પાસવર્ડ સેટ કરો"</string>
-    <string name="lockpassword_choose_your_pattern_header" msgid="6949761069941694050">"તમારી પેટર્ન પસંદ કરો"</string>
-    <string name="lockpassword_choose_your_pattern_header_for_fingerprint" msgid="5901096361617543819">"ફિંગરપ્રિન્ટ વાપરવા પેટર્ન સેટ કરો"</string>
-    <string name="lockpassword_choose_your_pin_header" msgid="7598849519816138302">"તમારો PIN પસંદ કરો"</string>
-    <string name="lockpassword_choose_your_pin_header_for_fingerprint" msgid="765344692615917183">"ફિંગરપ્રિન્ટ વાપરવા PIN સેટ કરો"</string>
-    <string name="lockpassword_confirm_your_password_header" msgid="6308478184889846633">"તમારા પાસવર્ડની પુષ્ટિ કરો"</string>
+    <string name="lockpassword_choose_your_screen_lock_header" msgid="3872462096767152394">"સ્ક્રીન લૉક સેટ કરો"</string>
+    <string name="lockpassword_choose_your_password_message" msgid="1197569283524841412">"સુરક્ષા માટે, પાસવર્ડ સેટ કરો"</string>
+    <string name="lockpassword_choose_your_password_header_for_fingerprint" msgid="2541818487015343503">"ફિંગરપ્રિન્ટ વાપરવા, પાસવર્ડ સેટ કરો"</string>
+    <string name="lockpassword_choose_your_pattern_header_for_fingerprint" msgid="7709785406243556723">"ફિંગરપ્રિન્ટ વાપરવા, પૅટર્ન સેટ કરો"</string>
+    <string name="lockpassword_choose_your_pin_message" msgid="1875420718677275646">"સુરક્ષા માટે, પિન સેટ કરો"</string>
+    <string name="lockpassword_choose_your_pin_header_for_fingerprint" msgid="1549639053195796674">"ફિંગરપ્રિન્ટનો ઉપયોગ કરવા, પિન સેટ કરો"</string>
+    <string name="lockpassword_choose_your_pattern_message" msgid="5986983400689720015">"સુરક્ષાના કારણસર, એક પૅટર્ન સેટ કરો"</string>
+    <string name="lockpassword_confirm_your_password_header" msgid="1266027268220850931">"તમારો પાસવર્ડ ફરી દાખલ કરો"</string>
     <string name="lockpassword_confirm_your_pattern_header" msgid="7543433733032330821">"તમારા પેટર્નની પુષ્ટિ કરો"</string>
-    <string name="lockpassword_confirm_your_pin_header" msgid="49038294648213197">"તમારા PIN ની પુષ્ટિ કરો"</string>
+    <string name="lockpassword_confirm_your_pin_header" msgid="7744513791910572550">"તમારો પિન ફરી દાખલ કરો"</string>
     <string name="lockpassword_confirm_passwords_dont_match" msgid="5140892109439191415">"પાસવર્ડ્સ મેળ ખાતા નથી"</string>
-    <string name="lockpassword_confirm_pins_dont_match" msgid="7226244811505606217">"PIN મેળ ખાતા નથી"</string>
+    <string name="lockpassword_confirm_pins_dont_match" msgid="7226244811505606217">"પિન મેળ ખાતા નથી"</string>
     <string name="lockpassword_choose_lock_generic_header" msgid="3811438094903786145">"અનલૉક પસંદગી"</string>
     <string name="lockpassword_password_set_toast" msgid="4875050283108629383">"પાસવર્ડ સેટ કરવામાં આવ્યો છે"</string>
-    <string name="lockpassword_pin_set_toast" msgid="6011826444725291475">"PIN સેટ કરવામાં આવ્યો છે"</string>
-    <string name="lockpassword_pattern_set_toast" msgid="6867259621331406236">"પેટર્ન સેટ કરવામાં આવી છે"</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">"ચાલુ રાખવા માટે તમારો ઉપકરણ PIN દાખલ કરો"</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">"ચાલુ રાખવા માટે તમારો કાર્ય PIN દાખલ કરો"</string>
+    <string name="lockpassword_confirm_your_pin_generic_profile" msgid="3730141667547002246">"ચાલુ રાખવા માટે તમારો કાર્ય પિન દાખલ કરો"</string>
     <string name="lockpassword_confirm_your_password_generic_profile" msgid="4250642723467019894">"ચાલુ રાખવા માટે તમારો કાર્ય પાસવર્ડ દાખલ કરો"</string>
-    <!-- no translation found for lockpassword_strong_auth_required_device_pattern (530802132223800623) -->
-    <skip />
-    <!-- no translation found for lockpassword_strong_auth_required_device_pin (7829294830078036417) -->
-    <skip />
-    <!-- no translation found for lockpassword_strong_auth_required_device_password (3552644641574796973) -->
-    <skip />
-    <!-- no translation found for lockpassword_strong_auth_required_work_pattern (3003781907040522053) -->
-    <skip />
-    <!-- no translation found for lockpassword_strong_auth_required_work_pin (3367491332598821552) -->
-    <skip />
-    <!-- no translation found for lockpassword_strong_auth_required_work_password (8159775129968582940) -->
-    <skip />
-    <string name="lockpassword_invalid_pin" msgid="15588049067548470">"ખોટો PIN"</string>
+    <string name="lockpassword_strong_auth_required_device_pattern" msgid="530802132223800623">"વધારાની સુરક્ષા માટે, તમારા ઉપકરણની પેટર્નનો ઉપયોગ કરો"</string>
+    <string name="lockpassword_strong_auth_required_device_pin" msgid="7829294830078036417">"વધારાની સુરક્ષા માટે, તમારા ઉપકરણનો પિન દાખલ કરો"</string>
+    <string name="lockpassword_strong_auth_required_device_password" msgid="3552644641574796973">"વધારાની સુરક્ષા માટે, તમારા ઉપકરણનો પાસવર્ડ દાખલ કરો"</string>
+    <string name="lockpassword_strong_auth_required_work_pattern" msgid="3003781907040522053">"વધારાની સુરક્ષા માટે, તમારા કાર્યની પેટર્નનો ઉપયોગ કરો"</string>
+    <string name="lockpassword_strong_auth_required_work_pin" msgid="3367491332598821552">"વધારાની સુરક્ષા માટે, તમારા કાર્ય પિન દાખલ કરો"</string>
+    <string name="lockpassword_strong_auth_required_work_password" msgid="8159775129968582940">"વધારાની સુરક્ષા માટે, તમારા કાર્યનો પાસવર્ડ દાખલ કરો"</string>
+    <string name="lockpassword_confirm_your_pattern_details_frp" msgid="6757336656791723193">"ફોન ફેક્ટરી સેટિંગ્સ પર રીસેટ કરવામાં આવ્યો છે. આ ફોનનો ઉપયોગ કરવા માટે તમારી આગલી પૅટર્ન દાખલ કરો."</string>
+    <string name="lockpassword_confirm_your_pin_details_frp" msgid="826520613445990470">"ફોન ફેક્ટરી સેટિંગ્સ પર રીસેટ કરવામાં આવ્યો છે. આ ફોનનો ઉપયોગ કરવા માટે તમારી આગલી પિન દાખલ કરો."</string>
+    <string name="lockpassword_confirm_your_password_details_frp" msgid="8944081074615739040">"ફોન ફેક્ટરી સેટિંગ્સ પર રીસેટ કરવામાં આવ્યો છે. આ ફોનનો ઉપયોગ કરવા માટે તમારો આગલો પાસવર્ડ દાખલ કરો."</string>
+    <string name="lockpassword_confirm_your_pattern_header_frp" msgid="2898036091609128286">"પૅટર્નની ચકાસણી કરો"</string>
+    <string name="lockpassword_confirm_your_pin_header_frp" msgid="4141601774778898803">"પિનની ચકાસણી કરો"</string>
+    <string name="lockpassword_confirm_your_password_header_frp" msgid="3762615419295360480">"પાસવર્ડની ચકાસણી કરો"</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">"અનલૉક PIN બદલો"</string>
-    <string name="lockpattern_recording_intro_header" msgid="308287052221942814">"એક અનલૉક પેટર્ન દોરો"</string>
+    <string name="lockpattern_change_lock_pattern_label" msgid="5679630792003440352">"અનલૉક પૅટર્ન બદલો"</string>
+    <string name="lockpattern_change_lock_pin_label" msgid="266707138486731661">"અનલૉક પિન બદલો"</string>
+    <string name="lockpattern_recording_intro_header" msgid="308287052221942814">"એક અનલૉક પૅટર્ન દોરો"</string>
     <string name="lockpattern_recording_intro_footer" msgid="1118579101409152113">"સહાય માટે મેનૂ દબાવો."</string>
     <string name="lockpattern_recording_inprogress" msgid="6667844062721656773">"પૂર્ણ થવા પર આંગળી છોડી દો"</string>
     <string name="lockpattern_recording_incorrect_too_short" msgid="1348234155120957561">"ઓછામાં ઓછા <xliff:g id="NUMBER">%d</xliff:g> ડોટ્સ કનેક્ટ કરો. ફરીથી પ્રયાસ કરો."</string>
-    <string name="lockpattern_pattern_entered_header" msgid="4316818983675591604">"પેટર્ન રેકોર્ડ કરી"</string>
-    <string name="lockpattern_need_to_confirm" msgid="8054853451639221265">"ખાતરી કરવા માટે ફરીથી પેટર્ન દોરો"</string>
-    <string name="lockpattern_pattern_confirmed_header" msgid="8455614172231880211">"તમારી નવી અનલૉક પેટર્ન"</string>
+    <string name="lockpattern_pattern_entered_header" msgid="4316818983675591604">"પૅટર્ન રેકોર્ડ કરી"</string>
+    <string name="lockpattern_need_to_confirm" msgid="8054853451639221265">"ખાતરી કરવા માટે ફરીથી પૅટર્ન દોરો"</string>
+    <string name="lockpattern_pattern_confirmed_header" msgid="8455614172231880211">"તમારી નવી અનલૉક પૅટર્ન"</string>
     <string name="lockpattern_confirm_button_text" msgid="1128204343957002841">"પુષ્ટિ કરો"</string>
     <string name="lockpattern_restart_button_text" msgid="3337574403350953926">"ફરીથી દોરો"</string>
     <string name="lockpattern_retry_button_text" msgid="3480423193273588166">"સાફ કરો"</string>
     <string name="lockpattern_continue_button_text" msgid="4723771754714471410">"ચાલુ રાખો"</string>
-    <string name="lockpattern_settings_title" msgid="3207750489460466680">"અનલૉક પેટર્ન"</string>
-    <string name="lockpattern_settings_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>
@@ -1538,7 +1550,6 @@
     <string name="install_applications_title" msgid="4987712352256508946">"બધા ઍપ્લિકેશન સ્રોતોને મંજૂરી આપો"</string>
     <string name="recent_app_category_title" msgid="6673071268966003928">"તાજેતરમાં ખોલેલી ઍપ્લિકેશનો"</string>
     <string name="see_all_apps_title" msgid="1317153498074308438">"બધી <xliff:g id="COUNT">%1$d</xliff:g> ઍપ્લિકેશન જુઓ"</string>
-    <string name="recent_app_summary" msgid="3366446669844932300">"<xliff:g id="TIME">^1</xliff:g> પહેલાં"</string>
     <string name="install_all_warning" product="tablet" msgid="8310489909586138165">"તમારું ટૅબ્લેટ અને વ્યક્તિગત ડેટા અજાણી ઍપ્લિકેશનોના હુમલા પ્રતિ વધુ સંવેદનશીલ છે. આ સ્રોત પરથી ઍપ્લિકેશનો ઇન્સ્ટૉલ કરીને તમે સંમત થાઓ છો કે તેમનો ઉપયોગ કરવાના પરિણામે તમારા ટૅબ્લેટને થતી કોઈ પણ ક્ષતિ કે ડેટાના નુકસાન માટે તમે જવાબદાર છો."</string>
     <string name="install_all_warning" product="default" msgid="1952257127370115988">"તમારો ફોન અને વ્યક્તિગત ડેટા અજાણી ઍપ્લિકેશનોના હુમલા પ્રતિ વધુ સંવેદનશીલ છે. આ સ્રોત પરથી ઍપ્લિકેશનો ઇન્સ્ટૉલ કરીને તમે સંમત થાઓ છો કે તેમનો ઉપયોગ કરવાના પરિણામે તમારા ફોનને થતી કોઈ પણ ક્ષતિ કે ડેટાના નુકસાન માટે તમે જવાબદાર છો."</string>
     <string name="advanced_settings" msgid="1777249286757067969">"વિગતવાર સેટિંગ્સ"</string>
@@ -1561,7 +1572,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>
@@ -1587,7 +1598,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>
@@ -1596,14 +1607,14 @@
     <string name="filter_apps_disabled" msgid="5862632369555319938">"અક્ષમ કરેલી ઍપ્લિકેશનો"</string>
     <string name="filter_apps_third_party" msgid="7786348047690140979">"ડાઉનલોડ કરેલા"</string>
     <string name="filter_apps_running" msgid="7767071454371350486">"ચાલે છે"</string>
-    <string name="filter_apps_onsdcard" product="nosdcard" msgid="4843063154701023349">"USB સંગ્રહ"</string>
+    <string name="filter_apps_onsdcard" product="nosdcard" msgid="4843063154701023349">"USB સ્ટોરેજ"</string>
     <string name="filter_apps_onsdcard" product="default" msgid="1477351142334784771">"SD કાર્ડ પર"</string>
     <string name="not_installed" msgid="2797554494953450291">"આ વપરાશકર્તા માટે ઇન્સ્ટોલ કરેલ નથી"</string>
     <string name="installed" msgid="3070865169422600098">"ઇન્સ્ટોલ કરેલી છે"</string>
     <string name="no_applications" msgid="7336588977497084921">"કોઈ ઍપ્લિકેશનો નથી."</string>
-    <string name="internal_storage" msgid="1584700623164275282">"આંતરિક સંગ્રહ"</string>
-    <string name="internal_storage_sentence" msgid="889098931914857143">"આંતરિક સંગ્રહ"</string>
-    <string name="sd_card_storage" product="nosdcard" msgid="2673203150465132465">"USB સંગ્રહ"</string>
+    <string name="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>
@@ -1667,7 +1678,7 @@
     <string name="storageuse_settings_title" msgid="5657014373502630403">"સંગ્રહનો ઉપયોગ"</string>
     <string name="storageuse_settings_summary" msgid="3748286507165697834">"ઍપ્લિકેશન દ્વારા વપરાયેલ સંગ્રહ જુઓ"</string>
     <string name="service_restarting" msgid="2242747937372354306">"પુનઃપ્રારંભ કરી રહ્યું છે"</string>
-    <string name="cached" msgid="1059590879740175019">"કેશ કરેલ પૃષ્ઠભૂમિ પ્રક્રિયા"</string>
+    <string name="cached" msgid="1059590879740175019">"કેશ કરેલ બૅકગ્રાઉન્ડ પ્રક્રિયા"</string>
     <string name="no_running_services" msgid="2059536495597645347">"કંઈ ચાલી રહ્યું નથી."</string>
     <string name="service_started_by_app" msgid="818675099014723551">"ઍપ્લિકેશન દ્વારા પ્રારંભ થયો."</string>
     <!-- no translation found for service_client_name (4037193625611815517) -->
@@ -1802,14 +1813,14 @@
     <string name="accessibility_settings_summary" msgid="981260486011624939">"સ્ક્રીન રીડર, પ્રદર્શન, ક્રિયાપ્રતિક્રિયા સંબંધી નિયંત્રણો"</string>
     <string name="vision_settings_title" msgid="4204111425716868288">"વિઝન સેટિંગ્સ"</string>
     <string name="vision_settings_description" msgid="5679491180156408260">"તમે તમારી જરૂરિયાતો મુજબ આ ઉપકરણને કસ્ટમાઇઝ કરી શકો છો. સેટિંગ્સમાં આ ઍક્સેસિબિલિટી સુવિધાઓ પછીથી બદલી શકાય છે."</string>
-    <string name="vision_settings_suggestion_title" msgid="917294957154878441">"ફૉન્ટનુ કદ વધારો"</string>
+    <string name="vision_settings_suggestion_title" msgid="8058794060304707004">"ફોન્ટનું કદ બદલો"</string>
     <string name="screen_reader_category_title" msgid="7739154903913400641">"સ્ક્રીન રીડર"</string>
     <string name="audio_and_captions_category_title" msgid="3420727114421447524">"ઑડિઓ અને સ્ક્રીન પરની ટેક્સ્ટ"</string>
-    <string name="display_category_title" msgid="685461049938269166">"પ્રદર્શન"</string>
+    <string name="display_category_title" msgid="685461049938269166">"ડિસ્પ્લે"</string>
     <string name="interaction_control_category_title" msgid="7836591031872839151">"ક્રિયાપ્રતિક્રિયાના નિયંત્રણો"</string>
     <string name="user_installed_services_category_title" msgid="6426376488922158647">"ડાઉનલોડ કરેલ સેવાઓ"</string>
     <string name="experimental_category_title" msgid="5272318666666893547">"પ્રાયોગિક"</string>
-    <string name="talkback_title" msgid="7912059827205988080">"TalkBack"</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="accessibility_captioning_title" msgid="7589266662024836291">"કૅપ્શન્સ"</string>
@@ -1826,7 +1837,7 @@
     <string name="accessibility_global_gesture_preference_title" msgid="2048884356166982714">"વૉલ્યૂમ કી શૉર્ટકટ"</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="1765853731190717372">"જ્યારે શૉર્ટકટ ચાલુ હોય, ત્યારે ઍક્સેસિબિલિટી સુવિધા શરૂ કરવા માટે તમે બન્ને વૉલ્યૂમ કીને 3 સેકંડ સુધી દબાવી રાખી શકો છો."</string>
+    <string name="accessibility_shortcut_description" msgid="1765853731190717372">"જ્યારે શૉર્ટકટ ચાલુ હોય, ત્યારે ઍક્સેસિબિલિટી સુવિધા શરૂ કરવા માટે તમે બન્ને વૉલ્યૂમ કીને 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>
@@ -1839,7 +1850,6 @@
     <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="preference_summary_default_combination" msgid="8532964268242666060">"<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>
@@ -1873,8 +1883,8 @@
     <string name="captioning_text_size" msgid="6737002449104466028">"ટેક્સ્ટ કદ"</string>
     <string name="captioning_preset" msgid="8939737196538429044">"કૅપ્શન શૈલી"</string>
     <string name="captioning_custom_options_title" msgid="5067500939930322405">"કસ્ટમ વિકલ્પો"</string>
-    <string name="captioning_background_color" msgid="9053011212948992570">"પૃષ્ઠભૂમિ રંગ"</string>
-    <string name="captioning_background_opacity" msgid="6029993616419971202">"પૃષ્ઠભૂમિ અસ્પષ્ટતા"</string>
+    <string name="captioning_background_color" msgid="9053011212948992570">"બૅકગ્રાઉન્ડ રંગ"</string>
+    <string name="captioning_background_opacity" msgid="6029993616419971202">"બૅકગ્રાઉન્ડ અસ્પષ્ટતા"</string>
     <string name="captioning_window_color" msgid="6902052743419717394">"કૅપ્શન વિંડો રંગ"</string>
     <string name="captioning_window_opacity" msgid="5041556024849862376">"કૅપ્શન વિંડો અપારદર્શકતા"</string>
     <string name="captioning_foreground_color" msgid="85623486537640059">"ટેક્સ્ટનો રંગ"</string>
@@ -1903,7 +1913,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> ને ચાલુ કરવું ડેટા ઇન્ક્રિપ્શન પર અસર કરતું હોવાને કારણે, તમારે તમારા PIN ની પુષ્ટિ કરવાની જરૂર છે."</string>
+    <string name="enable_service_pin_reason" msgid="7882035264853248228">"<xliff:g id="SERVICE">%1$s</xliff:g> ને ચાલુ કરવું ડેટા ઇન્ક્રિપ્શન પર અસર કરતું હોવાને કારણે, તમારે તમારા પિનની પુષ્ટિ કરવાની જરૂર છે."</string>
     <string name="enable_service_password_reason" msgid="1224075277603097951">"<xliff:g id="SERVICE">%1$s</xliff:g> ને ચાલુ કરવું ડેટા ઇન્ક્રિપ્શન પર અસર કરતું હોવાને કારણે, તમારે તમારા પાસવર્ડની પુષ્ટિ કરવાની જરૂર છે."</string>
     <string name="capability_title_receiveAccessibilityEvents" msgid="1869032063969970755">"તમારી ક્રિયાઓનું નિરીક્ષણ કરો"</string>
     <string name="capability_desc_receiveAccessibilityEvents" msgid="6640333613848713883">"એક ઍપ્લિકેશન સાથે ક્રિયા પ્રતિક્રિયા કરતી વખતે સૂચનાઓ પ્રાપ્ત કરો."</string>
@@ -1913,7 +1923,7 @@
     <string name="accessibility_no_service_selected" msgid="2840969718780083998">"કોઈ સેવા પસંદ કરેલી નથી"</string>
     <string name="accessibility_service_default_description" msgid="1072730037861494125">"કોઈ વર્ણન પ્રદાન કરવામાં આવેલ નથી."</string>
     <string name="settings_button" msgid="3006713718908152930">"સેટિંગ્સ"</string>
-    <string name="print_settings" msgid="4742428530112487843">"છાપવું"</string>
+    <string name="print_settings" msgid="4742428530112487843">"પ્રિન્ટિંગ"</string>
     <string name="print_settings_summary_no_service" msgid="6354322414246865875">"બંધ"</string>
     <plurals name="print_settings_summary" formatted="false" msgid="6005468025646083029">
       <item quantity="one"><xliff:g id="COUNT">%1$d</xliff:g> પ્રિન્ટ સેવા ચાલુ છે</item>
@@ -1937,7 +1947,7 @@
     <string name="print_service_disabled" msgid="7739452396114245222">"સેવા અક્ષમ કરેલ છે"</string>
     <string name="print_print_jobs" msgid="3582094777756968793">"પ્રિન્ટ જોબ્સ"</string>
     <string name="print_print_job" msgid="7563741676053287211">"છાપ કાર્ય"</string>
-    <string name="print_restart" msgid="8373999687329384202">"પુનઃપ્રારંભ કરો"</string>
+    <string name="print_restart" msgid="8373999687329384202">"રિસ્ટાર્ટ કરો"</string>
     <string name="print_cancel" msgid="3621199386568672235">"રદ કરો"</string>
     <string name="print_job_summary" msgid="8472427347192930694">"<xliff:g id="PRINTER">%1$s</xliff:g>\n<xliff:g id="TIME">%2$s</xliff:g>"</string>
     <string name="print_printing_state_title_template" msgid="5736107667714582025">"<xliff:g id="PRINT_JOB_NAME">%1$s</xliff:g> છાપી રહ્યાં છે"</string>
@@ -1956,14 +1966,16 @@
     <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="background_activity_summary_whitelisted" msgid="7375400051141016808">"ઍપને બૅટરી ઉપયોગ માટે ઑપ્ટિમાઇઝ કરી શકાતી નથી"</string>
+    <string name="background_activity_warning_dialog_title" msgid="2216249969149568871">"બૅકગ્રાઉન્ડ પ્રવૃત્તિને મર્યાદિત કરીએ?"</string>
+    <string name="background_activity_warning_dialog_text" msgid="7049624449246121981">"જો તમે બૅકગ્રાઉન્ડ પ્રવૃત્તિને એક ઍપ માટે મર્યાદિત કરો છો, તો તે અયોગ્ય વર્તન કરી શકે છે"</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" msgid="6393929085382334341">"સંપૂર્ણ ચાર્જ કર્યા પછી ઍપનો વપરાશ (<xliff:g id="RELATIVE_TIME">^1</xliff:g>)"</string>
+    <string name="power_usage_list_summary_device" msgid="4461926045610455423">"સંપૂર્ણ ચાર્જ કર્યા પછી ઉપકરણનો વપરાશ (<xliff:g id="RELATIVE_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>
@@ -1975,14 +1987,14 @@
     <string name="battery_stats_gps_on_label" msgid="1193657533641951256">"GPS ચાલુ"</string>
     <string name="battery_stats_camera_on_label" msgid="4935637383628414968">"કૅમેરો ચાલુ"</string>
     <string name="battery_stats_flashlight_on_label" msgid="4319637669889411307">"ફ્લેશલાઇટ ચાલુ"</string>
-    <string name="battery_stats_wifi_running_label" msgid="1845839195549226252">"Wi-Fi"</string>
+    <string name="battery_stats_wifi_running_label" msgid="1845839195549226252">"વાઇ-ફાઇ"</string>
     <string name="battery_stats_wake_lock_label" msgid="1908942681902324095">"જાગૃત"</string>
     <string name="battery_stats_phone_signal_label" msgid="4137799310329041341">"મોબાઇલ નેટવર્ક સિગ્નલ"</string>
     <!-- no translation found for battery_stats_last_duration (1535831453827905957) -->
     <skip />
     <string name="awake" msgid="387122265874485088">"ઉપકરણનો જાગૃત સમય"</string>
-    <string name="wifi_on_time" msgid="3208518458663637035">"Wi‑Fi ચાલુ સમય"</string>
-    <string name="bluetooth_on_time" msgid="3056108148042308690">"Wi‑Fi ચાલુ સમય"</string>
+    <string name="wifi_on_time" msgid="3208518458663637035">"વાઇ-ફાઇ ચાલુ સમય"</string>
+    <string name="bluetooth_on_time" msgid="3056108148042308690">"વાઇ-ફાઇ ચાલુ સમય"</string>
     <string name="advanced_battery_title" msgid="2068039111517508622">"બૅટરીનો વિગતવાર વપરાશ"</string>
     <string name="history_details_title" msgid="3608240585315506067">"ઇતિહાસ વિગતો"</string>
     <string name="battery_details_title" msgid="6101394441569858580">"બૅટરી વપરાશ"</string>
@@ -2015,8 +2027,8 @@
     <string name="power_screen" msgid="3023346080675904613">"સ્ક્રીન"</string>
     <string name="power_flashlight" msgid="7794409781003567614">"ફ્લેશલાઇટ"</string>
     <string name="power_camera" msgid="4976286950934622605">"કૅમેરો"</string>
-    <string name="power_wifi" msgid="1135085252964054957">"Wi-Fi"</string>
-    <string name="power_bluetooth" msgid="4373329044379008289">"Bluetooth"</string>
+    <string name="power_wifi" msgid="1135085252964054957">"વાઇ-ફાઇ"</string>
+    <string name="power_bluetooth" msgid="4373329044379008289">"બ્લૂટૂથ"</string>
     <string name="power_cell" msgid="3392999761958982492">"મોબાઇલ નેટવર્ક સ્ટૅન્ડબાય"</string>
     <string name="power_phone" msgid="5392641106474567277">"વૉઇસ કૉલ્સ"</string>
     <string name="power_idle" product="tablet" msgid="4612478572401640759">"ટેબ્લેટ નિષ્ક્રિય"</string>
@@ -2029,18 +2041,18 @@
     <string name="power_user" msgid="3706143225319881667">"અન્ય વપરાશકર્તાઓ"</string>
     <string name="usage_type_cpu" msgid="715162150698338714">"CPU કુલ"</string>
     <string name="usage_type_cpu_foreground" msgid="6500579611933211831">"CPU અગ્રભૂમિ"</string>
-    <string name="usage_type_wake_lock" msgid="5125438890233677880">"જાગૃત રહો"</string>
+    <string name="usage_type_wake_lock" msgid="5125438890233677880">"સક્રિય રાખો"</string>
     <string name="usage_type_gps" msgid="7989688715128160790">"GPS"</string>
-    <string name="usage_type_wifi_running" msgid="3134357198266380400">"Wi‑Fi ચાલુ છે"</string>
+    <string name="usage_type_wifi_running" msgid="3134357198266380400">"વાઇ-ફાઇ ચાલુ છે"</string>
     <string name="usage_type_phone" product="tablet" msgid="262638572890253393">"ટેબ્લેટ"</string>
     <string name="usage_type_phone" product="default" msgid="9108247984998041853">"ફોન"</string>
     <string name="usage_type_data_send" msgid="8971710128438365919">"મોબાઇલ પેકેટ્સ મોકલ્યાં"</string>
     <string name="usage_type_data_recv" msgid="5468564329333954445">"મોબાઇલ પૅકેટ્સ પ્રાપ્ત થયા"</string>
     <string name="usage_type_radio_active" msgid="1732647857619420121">"સેલ રેડિયો સક્રિય"</string>
-    <string name="usage_type_data_wifi_send" msgid="1847552143597396162">"Wi‑Fi પૅકેટ્સ મોકલ્યાં"</string>
-    <string name="usage_type_data_wifi_recv" msgid="5678475911549183829">"Wi‑Fi પૅકેટ્સ પ્રાપ્ત થયાં"</string>
+    <string name="usage_type_data_wifi_send" msgid="1847552143597396162">"વાઇ-ફાઇ પૅકેટ્સ મોકલ્યાં"</string>
+    <string name="usage_type_data_wifi_recv" msgid="5678475911549183829">"વાઇ-ફાઇ પૅકેટ્સ પ્રાપ્ત થયાં"</string>
     <string name="usage_type_audio" msgid="6957269406840886290">"ઑડિઓ"</string>
-    <string name="usage_type_video" msgid="4295357792078579944">"વિડિઓ"</string>
+    <string name="usage_type_video" msgid="4295357792078579944">"વીડિઓ"</string>
     <string name="usage_type_camera" msgid="8299433109956769757">"કૅમેરો"</string>
     <string name="usage_type_flashlight" msgid="1516392356962208230">"ફ્લેશલાઇટ"</string>
     <string name="usage_type_on_time" msgid="3351200096173733159">"સમય ચાલુ"</string>
@@ -2052,8 +2064,8 @@
     <string name="battery_action_app_details" msgid="7861051816778419018">"ઍપ્લિકેશન માહિતી"</string>
     <string name="battery_action_app_settings" msgid="4570481408106287454">"ઍપ્લિકેશન સેટિંગ્સ"</string>
     <string name="battery_action_display" msgid="7338551244519110831">"સ્ક્રીન સેટિંગ્સ"</string>
-    <string name="battery_action_wifi" msgid="8181553479021841207">"Wi-Fi સેટિંગ્સ"</string>
-    <string name="battery_action_bluetooth" msgid="8374789049507723142">"Bluetooth સેટિંગ્સ"</string>
+    <string name="battery_action_wifi" msgid="8181553479021841207">"વાઇ-ફાઇ સેટિંગ્સ"</string>
+    <string name="battery_action_bluetooth" msgid="8374789049507723142">"બ્લૂટૂથ સેટિંગ્સ"</string>
     <string name="battery_desc_voice" msgid="8980322055722959211">"વૉઇસ કૉલ્સ દ્વારા વપરાયેલ બૅટરી"</string>
     <string name="battery_desc_standby" product="tablet" msgid="6284747418668280364">"ટેબ્લેટ નિષ્ક્રિય હોય ત્યારે વપરાયેલ બૅટરી"</string>
     <string name="battery_desc_standby" product="default" msgid="3009080001948091424">"ફોન નિષ્ક્રિય હોય ત્યારે વપરાયેલ બૅટરી"</string>
@@ -2063,11 +2075,11 @@
     <string name="battery_desc_camera" msgid="7375389919760613499">"કૅમેરા દ્વારા વપરાયેલ બૅટરી"</string>
     <string name="battery_desc_display" msgid="5432795282958076557">"ડિસ્પ્લે અને બેકલાઇટ દ્વારા વપરાયેલ બૅટરી"</string>
     <string name="battery_sugg_display" msgid="3370202402045141760">"સ્ક્રીનનો ચળકાટ અને/અથવા સ્ક્રીન સમયસમાપ્તિ ઘટાડો"</string>
-    <string name="battery_desc_wifi" msgid="2375567464707394131">"Wi‑Fi દ્વારા વપરાયેલ બૅટરી"</string>
-    <string name="battery_sugg_wifi" msgid="7776093125855397043">"ઉપયોગ ન હોવા પર અથવા ઉપલબ્ધ ન હોય ત્યારે Wi‑Fi બંધ કરો"</string>
-    <string name="battery_desc_bluetooth" msgid="8069070756186680367">"Bluetooth દ્વારા વપરાયેલ બૅટરી"</string>
-    <string name="battery_sugg_bluetooth_basic" msgid="4565141162650835009">"તમે Bluetooth નો ઉપયોગ કરતા ન હોય ત્યારે તેને બંધ કરો"</string>
-    <string name="battery_sugg_bluetooth_headset" msgid="4071352514714259230">"એક અલગ Bluetooth ઉપકરણ સાથે કનેક્ટ કરવાનો પ્રયાસ કરો"</string>
+    <string name="battery_desc_wifi" msgid="2375567464707394131">"વાઇ-ફાઇ દ્વારા વપરાયેલ બૅટરી"</string>
+    <string name="battery_sugg_wifi" msgid="7776093125855397043">"ઉપયોગ ન હોવા પર અથવા ઉપલબ્ધ ન હોય ત્યારે વાઇ-ફાઇ બંધ કરો"</string>
+    <string name="battery_desc_bluetooth" msgid="8069070756186680367">"બ્લૂટૂથ દ્વારા વપરાયેલ બૅટરી"</string>
+    <string name="battery_sugg_bluetooth_basic" msgid="4565141162650835009">"તમે બ્લૂટૂથ નો ઉપયોગ કરતા ન હોય ત્યારે તેને બંધ કરો"</string>
+    <string name="battery_sugg_bluetooth_headset" msgid="4071352514714259230">"એક અલગ બ્લૂટૂથ ઉપકરણ સાથે કનેક્ટ કરવાનો પ્રયાસ કરો"</string>
     <string name="battery_desc_apps" msgid="8530418792605735226">"ઍપ્લિકેશન દ્વારા વપરાયેલ બૅટરી"</string>
     <string name="battery_sugg_apps_info" msgid="6907588126789841231">"એપ્લિકેશનને બંધ કરો અથવા અનઇન્સ્ટોલ કરો"</string>
     <string name="battery_sugg_apps_gps" msgid="5959067516281866135">"બૅટરી બચત મોડ પસંદ કરો"</string>
@@ -2112,7 +2124,7 @@
     <string name="app_memory_use" msgid="7849258480392171939">"મેમરીનો ઉપયોગ"</string>
     <string name="process_stats_total_duration" msgid="7417201400853728029">"પાછલા <xliff:g id="TIMEDURATION">%3$s</xliff:g> થી વધુમાં <xliff:g id="TOTALRAM">%2$s</xliff:g> માંથી <xliff:g id="USEDRAM">%1$s</xliff:g> ઉપયોગમાં લેવાયું"</string>
     <string name="process_stats_total_duration_percentage" msgid="6522457033380025618">"<xliff:g id="TIMEDURATION">%2$s</xliff:g> થી વધુમાં <xliff:g id="PERCENT">%1$s</xliff:g> RAM ઉપયોગમાં લેવાયું"</string>
-    <string name="process_stats_type_background" msgid="3934992858120683459">"પૃષ્ઠભૂમિ"</string>
+    <string name="process_stats_type_background" msgid="3934992858120683459">"બૅકગ્રાઉન્ડ"</string>
     <string name="process_stats_type_foreground" msgid="7713118254089580536">"અગ્રભૂમિ"</string>
     <string name="process_stats_type_cached" msgid="6314925846944806511">"કેશ્ડ"</string>
     <string name="process_stats_os_label" msgid="4813434110442733392">"Android OS"</string>
@@ -2121,7 +2133,7 @@
     <string name="process_stats_os_zram" msgid="677138324651671575">"Z-Ram"</string>
     <string name="process_stats_os_cache" msgid="6432533624875078233">"કૅશેસ"</string>
     <string name="process_stats_ram_use" msgid="976912589127397307">"RAM વપરાશ"</string>
-    <string name="process_stats_bg_ram_use" msgid="5398191511030462404">"RAM ઉપયોગ (પૃષ્ઠભૂમિ)"</string>
+    <string name="process_stats_bg_ram_use" msgid="5398191511030462404">"RAM ઉપયોગ (બૅકગ્રાઉન્ડ)"</string>
     <string name="process_stats_run_time" msgid="6520628955709369115">"રન ટાઇમ"</string>
     <string name="processes_subtitle" msgid="6827502409379462438">"પ્રક્રિયાઓ"</string>
     <string name="services_subtitle" msgid="4296402367067266425">"સેવાઓ"</string>
@@ -2144,7 +2156,7 @@
     <string name="menu_show_percentage" msgid="4717204046118199806">"ટકાવારી બતાવો"</string>
     <string name="menu_use_uss" msgid="467765290771543089">"Uss નો ઉપયોગ કરો"</string>
     <string name="menu_proc_stats_type" msgid="4700209061072120948">"આંકડાનો પ્રકાર"</string>
-    <string name="menu_proc_stats_type_background" msgid="2236161340134898852">"પૃષ્ઠભૂમિ"</string>
+    <string name="menu_proc_stats_type_background" msgid="2236161340134898852">"બૅકગ્રાઉન્ડ"</string>
     <string name="menu_proc_stats_type_foreground" msgid="2286182659954958586">"અગ્રભૂમિ"</string>
     <string name="menu_proc_stats_type_cached" msgid="5084272779786820693">"કેશ્ડ"</string>
     <string name="voice_input_output_settings" msgid="1336135218350444783">"વોઇસ ઇનપુટ અને આઉટપુટ"</string>
@@ -2170,15 +2182,15 @@
     <string name="tts_reset" msgid="2661752909256313270">"ફરીથી સેટ કરો"</string>
     <string name="tts_play" msgid="2628469503798633884">"ચલાવો"</string>
     <string name="gadget_title" msgid="5519037532720577836">"પાવર નિયંત્રણ"</string>
-    <string name="gadget_toggle_wifi" msgid="319262861956544493">"Wi‑Fi સેટિંગ અપડેટ કરી રહ્યાં છે"</string>
-    <string name="gadget_toggle_bluetooth" msgid="7538903239807020826">"Bluetooth સેટિંગ અપડેટ કરી રહ્યું છે"</string>
+    <string name="gadget_toggle_wifi" msgid="319262861956544493">"વાઇ-ફાઇ સેટિંગ અપડેટ કરી રહ્યાં છે"</string>
+    <string name="gadget_toggle_bluetooth" msgid="7538903239807020826">"બ્લૂટૂથ સેટિંગ અપડેટ કરી રહ્યું છે"</string>
     <string name="gadget_state_template" msgid="5156935629902649932">"<xliff:g id="ID_1">%1$s</xliff:g> <xliff:g id="ID_2">%2$s</xliff:g>"</string>
     <string name="gadget_state_on" msgid="6909119593004937688">"ચાલુ"</string>
     <string name="gadget_state_off" msgid="5220212352953066317">"બંધ"</string>
     <string name="gadget_state_turning_on" msgid="3395992057029439039">"ચાલુ કરી રહ્યું છે"</string>
     <string name="gadget_state_turning_off" msgid="2395546048102176157">"બંધ કરી રહ્યું છે"</string>
-    <string name="gadget_wifi" msgid="4712584536500629417">"Wi-Fi"</string>
-    <string name="gadget_bluetooth" msgid="8998572807378694410">"Bluetooth"</string>
+    <string name="gadget_wifi" msgid="4712584536500629417">"વાઇ-ફાઇ"</string>
+    <string name="gadget_bluetooth" msgid="8998572807378694410">"બ્લૂટૂથ"</string>
     <string name="gadget_location" msgid="2974757497945178165">"સ્થાન"</string>
     <string name="gadget_sync" msgid="858895763714222152">"સમન્વયન"</string>
     <string name="gadget_brightness_template" msgid="930541920933123603">"તેજ <xliff:g id="ID_1">%1$s</xliff:g>"</string>
@@ -2187,7 +2199,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>
@@ -2204,19 +2216,19 @@
     <string name="credential_storage_type_software" msgid="4403117271207715378">"ફક્ત સોફ્ટવેર"</string>
     <string name="credentials_settings_not_available" msgid="7968275634486624215">"આ વપરાશકર્તા માટે ઓળખપત્રો ઉપલબ્ધ નથી"</string>
     <string name="credential_for_vpn_and_apps" msgid="4168197158768443365">"VPN અને ઍપ્લિકેશનો માટે ઇન્સ્ટૉલ કરેલ"</string>
-    <string name="credential_for_wifi" msgid="6228425986551591864">"Wi-Fi માટે ઇન્સ્ટૉલ કરેલ"</string>
+    <string name="credential_for_wifi" msgid="6228425986551591864">"વાઇ-ફાઇ માટે ઇન્સ્ટૉલ કરેલ"</string>
     <string name="credentials_unlock" msgid="385427939577366499"></string>
-    <string name="credentials_unlock_hint" msgid="2301301378040499348">"ઓળખપત્ર સંગ્રહ માટે પાસવર્ડ લખો."</string>
+    <string name="credentials_unlock_hint" msgid="2301301378040499348">"ઓળખપત્ર સ્ટોરેજ માટે પાસવર્ડ લખો."</string>
     <string name="credentials_old_password" msgid="7553393815538684028">"હાલનો પાસવર્ડ:"</string>
     <string name="credentials_reset_hint" msgid="6297256880896133631">"તમામ સામગ્રીઓ દૂર કરીએ?"</string>
-    <string name="credentials_password_too_short" msgid="7502749986405522663">"પાસવર્ડમાં ઓછામાં ઓછા 8 અક્ષર હોવા આવશ્યક છે."</string>
     <string name="credentials_wrong_password" msgid="2541932597104054807">"ખોટો પાસવર્ડ"</string>
-    <string name="credentials_reset_warning" msgid="5320653011511797600">"ખોટો પાસવર્ડ. ઓળખપત્ર સંગ્રહ કાઢી નાખ્યા પહેલાં તમને વધુ એક તક મળે છે."</string>
-    <string name="credentials_reset_warning_plural" msgid="6514085665301095279">"ખોટો પાસવર્ડ. ઓળખપત્ર સંગ્રહ કાઢી નાખ્યા પછી તમને વધુ <xliff:g id="NUMBER">%1$d</xliff:g> તક મળે છે."</string>
-    <string name="credentials_erased" msgid="2907836028586342969">"ઓળખપત્ર સંગ્રહ કાઢી નાખ્યો છે."</string>
-    <string name="credentials_not_erased" msgid="7685932772284216097">"ઓળખપત્ર સંગ્રહ કાઢી નાખી શકાયો નથી."</string>
-    <string name="credentials_enabled" msgid="7588607413349978930">"ઓળખપત્ર સંગ્રહ સક્ષમ કરેલ છે."</string>
-    <string name="credentials_configure_lock_screen_hint" msgid="6757119179588664966">"તમે ઓળખપત્ર સંગ્રહનો ઉપયોગ કરી શકો છો તે પહેલાં તમારે લૉક સ્ક્રીન PIN કે પાસવર્ડ સેટ કરવો પડશે."</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="8058230497337529036">"તમે ક્રિડેન્શ્યલ સ્ટોરેજનો ઉપયોગ કરી શકો તે પહેલા, તમારા ઉપકરણમાં એક સુરક્ષિત લૉક સ્ક્રીન હોવું જરૂરી છે"</string>
+    <string name="credentials_configure_lock_screen_button" msgid="253239765216055321">"લૉક સેટ કરો"</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>
@@ -2224,17 +2236,17 @@
     <string name="backup_section_title" msgid="7952232291452882740">"બેકઅપ અને પુનર્સ્થાપન"</string>
     <string name="personal_data_section_title" msgid="7815209034443782061">"વ્યક્તિગત ડેટા"</string>
     <string name="backup_data_title" msgid="1239105919852668016">"મારા ડેટાનો બેક અપ લો"</string>
-    <string name="backup_data_summary" msgid="708773323451655666">"ઍપ્લિકેશન ડેટા, Wi-Fi પાસવર્ડ્સ અને અન્ય સેટિંગ્સનો Google સર્વર્સ પર બેક અપ લો"</string>
+    <string name="backup_data_summary" msgid="708773323451655666">"ઍપ્લિકેશન ડેટા, વાઇ-ફાઇ પાસવર્ડ્સ અને અન્ય સેટિંગ્સનો Google સર્વર્સ પર બેક અપ લો"</string>
     <string name="backup_configure_account_title" msgid="3790872965773196615">"બેકઅપ એકાઉન્ટ"</string>
     <string name="include_app_data_title" msgid="2829970132260278394">"ઍપ્લિકેશન માહિતી શામેલ કરો"</string>
-    <string name="auto_restore_title" msgid="5397528966329126506">"સ્વયંચાલિત પુનઃસ્થાપના"</string>
+    <string name="auto_restore_title" msgid="5397528966329126506">"ઑટોમૅટિક પુનઃસ્થાપના"</string>
     <string name="auto_restore_summary" msgid="4235615056371993807">"જ્યારે એક ઍપ્લિકેશન ઇન્સ્ટોલ કરી રહ્યાં હોય, ત્યારે બેકઅપ લીધેલ સેટિંગ્સ અને ડેટા પુનઃસ્થાપિત કરો"</string>
     <string name="backup_inactive_title" msgid="685838037986644604">"બૅકઅપ સેવા સક્રિય કરેલી નથી"</string>
     <string name="backup_configure_account_default_summary" msgid="2436933224764745553">"બેકઅપ લેવાયેલ ડેટા અત્યારે કોઇ એકાઉન્ટ સ્ટોર કરી રહ્યું નથી"</string>
     <string name="backup_erase_dialog_title" msgid="1027640829482174106"></string>
-    <string name="backup_erase_dialog_message" msgid="5221011285568343155">"Wi-Fi પાસવર્ડ્સ, બુકમાર્ક્સ, અન્ય સેટિંગ્સ અને ઍપ્લિકેશન ડેટાનો બેકઅપ લેવાનું રોકીએ, તેમજ Google સર્વર્સ પરની બધી કૉપિઝને કાઢી નાખીએ?"</string>
-    <string name="fullbackup_erase_dialog_message" msgid="694766389396659626">"ઉપકરણ ડેટા (જેમ કે Wi-Fi પાસવર્ડ્સ અને કૉલ ઇતિહાસ) અને ઍપ્લિકેશન ડેટા (જેમ કે સેટિંગ્સ અને ઍપ્લિકેશનો દ્વારા સંગ્રહિત ફાઇલો) નું બેકઅપ લેવાનું રોકીએ, ઉપરાંત રિમોટ સર્વર્સ પરની તમામ કૉપિઝ કાઢી નાખીએ?"</string>
-    <string name="fullbackup_data_summary" msgid="960850365007767734">"ઉપકરણ ડેટા (જેમ કે Wi-Fi પાસવર્ડ્સ અને કૉલ ઇતિહાસ) અને ઍપ્લિકેશન ડેટા (જેમ કે સેટિંગ્સ અને ઍપ્લિકેશનો દ્વારા સંગ્રહિત ફાઇલો)નો રિમોટલી આપમેળે બેક અપ લો.\n\nજ્યારે તમે સ્વચલિત બેકઅપ ચાલુ કરો છો, ત્યારે ઉપકરણ અને ઍપ્લિકેશન ડેટા સમયાંતરે રિમોટલી સચવાય છે. ઍપ્લિકેશન ડેટા એવો કોઈપણ ડેટા હોઈ શકે જેને કોઈ ઍપ્લિકેશને સાચવ્યો હોય (વિકાસકર્તા સેટિંગ્સનાં આધારે) જેમાં સંપર્કો, સંદેશા અને ફોટા જેવા સંભવિતપણે સંવેદનશીલ ડેટાનો સમાવેશ થાય છે."</string>
+    <string name="backup_erase_dialog_message" msgid="5221011285568343155">"વાઇ-ફાઇ પાસવર્ડ્સ, બુકમાર્ક્સ, અન્ય સેટિંગ્સ અને ઍપ્લિકેશન ડેટાનો બેકઅપ લેવાનું રોકીએ, તેમજ Google સર્વર્સ પરની બધી કૉપિઝને કાઢી નાખીએ?"</string>
+    <string name="fullbackup_erase_dialog_message" msgid="694766389396659626">"ઉપકરણ ડેટા (જેમ કે વાઇ-ફાઇ પાસવર્ડ્સ અને કૉલ ઇતિહાસ) અને ઍપ્લિકેશન ડેટા (જેમ કે સેટિંગ્સ અને ઍપ્લિકેશનો દ્વારા સંગ્રહિત ફાઇલો) નું બેકઅપ લેવાનું રોકીએ, ઉપરાંત રિમોટ સર્વર્સ પરની તમામ કૉપિઝ કાઢી નાખીએ?"</string>
+    <string name="fullbackup_data_summary" msgid="960850365007767734">"ઉપકરણ ડેટા (જેમ કે વાઇ-ફાઇ પાસવર્ડ્સ અને કૉલ ઇતિહાસ) અને ઍપ્લિકેશન ડેટા (જેમ કે સેટિંગ્સ અને ઍપ્લિકેશનો દ્વારા સંગ્રહિત ફાઇલો)નો રિમોટલી આપમેળે બેક અપ લો.\n\nજ્યારે તમે સ્વચલિત બેકઅપ ચાલુ કરો છો, ત્યારે ઉપકરણ અને ઍપ્લિકેશન ડેટા સમયાંતરે રિમોટલી સચવાય છે. ઍપ્લિકેશન ડેટા એવો કોઈપણ ડેટા હોઈ શકે જેને કોઈ ઍપ્લિકેશને સાચવ્યો હોય (વિકાસકર્તા સેટિંગ્સનાં આધારે) જેમાં સંપર્કો, સંદેશા અને ફોટો જેવા સંભવિતપણે સંવેદનશીલ ડેટાનો સમાવેશ થાય છે."</string>
     <string name="device_admin_settings_title" msgid="4960761799560705902">"ઉપકરણ વ્યવસ્થાપક સેટિંગ્સ"</string>
     <string name="active_device_admin_msg" msgid="578748451637360192">"ઉપકરણ વ્યવસ્થાપક ઍપ્લિકેશન"</string>
     <string name="remove_device_admin" msgid="9207368982033308173">"આ ઉપકરણ વ્યવસ્થાપક ઍપ્લિકેશનને નિષ્ક્રિય કરો"</string>
@@ -2256,13 +2268,13 @@
     <string name="admin_more_details" msgid="7901420667346456102">"વધુ વિગતો"</string>
     <string name="untitled_apn" msgid="1230060359198685513">"અનામાંકિત"</string>
     <string name="sound_category_sound_title" msgid="1488759370067953996">"સામાન્ય"</string>
-    <string name="notification_log_title" msgid="3766148588239398464">"સૂચના લૉગ"</string>
+    <string name="notification_log_title" msgid="3766148588239398464">"નોટિફિકેશન લૉગ"</string>
     <string name="sound_category_call_ringtone_vibrate_title" msgid="1543777228646645163">"કૉલ રિંગટોન અને વાઇબ્રેટ"</string>
     <string name="sound_category_system_title" msgid="1480844520622721141">"સિસ્ટમ"</string>
-    <string name="wifi_setup_title" msgid="2970260757780025029">"Wi‑Fi સેટઅપ"</string>
-    <string name="wifi_setup_title_editing_network" msgid="6020614644556717979">"Wi‑Fi નેટવર્ક <xliff:g id="NETWORK_NAME">%s</xliff:g> સાથે કનેક્ટ કરો"</string>
-    <string name="wifi_setup_title_connecting_network" msgid="5572226790101017822">"Wi‑Fi નેટવર્ક <xliff:g id="NETWORK_NAME">%s</xliff:g> સાથે કનેક્ટ કરી રહ્યું છે…"</string>
-    <string name="wifi_setup_title_connected_network" msgid="1608788657122010919">"Wi‑Fi નેટવર્ક <xliff:g id="NETWORK_NAME">%s</xliff:g> સાથે કનેક્ટ કર્યું"</string>
+    <string name="wifi_setup_title" msgid="2970260757780025029">"વાઇ-ફાઇ સેટઅપ"</string>
+    <string name="wifi_setup_title_editing_network" msgid="6020614644556717979">"વાઇ-ફાઇ નેટવર્ક <xliff:g id="NETWORK_NAME">%s</xliff:g> સાથે કનેક્ટ કરો"</string>
+    <string name="wifi_setup_title_connecting_network" msgid="5572226790101017822">"વાઇ-ફાઇ નેટવર્ક <xliff:g id="NETWORK_NAME">%s</xliff:g> સાથે કનેક્ટ કરી રહ્યું છે…"</string>
+    <string name="wifi_setup_title_connected_network" msgid="1608788657122010919">"વાઇ-ફાઇ નેટવર્ક <xliff:g id="NETWORK_NAME">%s</xliff:g> સાથે કનેક્ટ કર્યું"</string>
     <string name="wifi_setup_title_add_network" msgid="6932651000151032301">"એક નેટવર્ક ઉમેરો"</string>
     <string name="wifi_setup_not_connected" msgid="6997432604664057052">"કનેક્ટ થયેલ નથી"</string>
     <string name="wifi_setup_add_network" msgid="5939624680150051807">"નેટવર્ક ઉમેરો"</string>
@@ -2284,9 +2296,9 @@
     <string name="wifi_setup_status_connecting" msgid="4971421484401530740">"કનેક્ટ થઈ રહ્યું છે…"</string>
     <string name="wifi_setup_status_proceed_to_next" msgid="6708250000342940031">"આગલા પગલા પર જાઓ"</string>
     <string name="wifi_setup_status_eap_not_supported" msgid="6796317704783144190">"EAP સમર્થિત નથી."</string>
-    <string name="wifi_setup_eap_not_supported" msgid="6812710317883658843">"તમે સેટઅપ દરમિયાન EAP Wi‑Fi કનેક્શનને ગોઠવી શકતા નથી. સેટઅપ પછી, તમે તેને સેટિંગ્સ &gt; વાયરલેસ અને નેટવર્ક્સમાં તે કરી શકો છો."</string>
+    <string name="wifi_setup_eap_not_supported" msgid="6812710317883658843">"તમે સેટઅપ દરમિયાન EAP વાઇ-ફાઇ કનેક્શનને ગોઠવી શકતા નથી. સેટઅપ પછી, તમે તેને સેટિંગ્સ &gt; વાયરલેસ અને નેટવર્ક્સમાં તે કરી શકો છો."</string>
     <string name="wifi_setup_description_connecting" msgid="2793554932006756795">"કનેક્ટ કરવામાં થોડો સમય લાગી શકે છે…"</string>
-    <string name="wifi_setup_description_connected" msgid="6649168170073219153">"સેટઅપ સાથે ચાલુ રાખવા માટે "<b>"આગલું"</b>" ટૅપ કરો.\n\nએક ભિન્ન Wi‑Fi નેટવર્કથી કનેક્ટ થવા માટે "<b>"પાછળ"</b>" ટૅપ કરો."</string>
+    <string name="wifi_setup_description_connected" msgid="6649168170073219153">"સેટઅપ સાથે ચાલુ રાખવા માટે "<b>"આગલું"</b>" ટૅપ કરો.\n\nએક ભિન્ન વાઇ-ફાઇ નેટવર્કથી કનેક્ટ થવા માટે "<b>"પાછળ"</b>" ટૅપ કરો."</string>
     <string name="accessibility_sync_enabled" msgid="558480439730263116">"સમન્વયન સક્ષમ"</string>
     <string name="accessibility_sync_disabled" msgid="1741194106479011384">"સમન્વયન અક્ષમ"</string>
     <string name="accessibility_sync_in_progress" msgid="4501160520879902723">"હવે સમન્વયન કરી રહ્યું છે"</string>
@@ -2296,15 +2308,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="work_mode_summary" msgid="1620246003886940776">"કાર્ય પ્રોફાઇલને ઍપ્લિકેશનો, બૅકગ્રાઉન્ડ સમન્વયન અને સંબંધિત સુવિધાઓ સહિતનું કાર્ય કરવાની મંજૂરી આપો"</string>
+    <string name="remove_managed_profile_label" msgid="3856519337797285325">"કાર્યાલયની પ્રોફાઇલ દૂર કરો"</string>
+    <string name="background_data" msgid="5779592891375473817">"બૅકગ્રાઉન્ડ ડેટા"</string>
     <string name="background_data_summary" msgid="8328521479872763452">"ઍપ્લિકેશનો કોઈપણ સમયે ડેટાને સમન્વયિત, મોકલી અને પ્રાપ્ત કરી શકે છે"</string>
-    <string name="background_data_dialog_title" msgid="6059217698124786537">"પૃષ્ઠભૂમિ ડેટાને અક્ષમ કરીએ?"</string>
-    <string name="background_data_dialog_message" msgid="6981661606680941633">"પૃષ્ઠભૂમિ ડેટાને અક્ષમ કરવું બૅટરીની આવરદા વધારે છે અને ડેટા ઉપયોગને ઓછો કરે છે. કેટલીક ઍપ્લિકેશનો હજી પણ પૃષ્ઠભૂમિ ડેટા કનેક્શનનો ઉપયોગ કરતી હોઈ શકે છે."</string>
-    <string name="sync_automatically" msgid="1682730255435062059">"ઍપ્લિકેશન ડેટાને સ્વતઃ-સમન્વયિત કરો"</string>
+    <string name="background_data_dialog_title" msgid="6059217698124786537">"બૅકગ્રાઉન્ડ ડેટાને અક્ષમ કરીએ?"</string>
+    <string name="background_data_dialog_message" msgid="6981661606680941633">"બૅકગ્રાઉન્ડ ડેટાને અક્ષમ કરવું બૅટરીની આવરદા વધારે છે અને ડેટા ઉપયોગને ઓછો કરે છે. કેટલીક ઍપ્લિકેશનો હજી પણ બૅકગ્રાઉન્ડ ડેટા કનેક્શનનો ઉપયોગ કરતી હોઈ શકે છે."</string>
+    <string name="sync_automatically" msgid="1682730255435062059">"ઍપ્લિકેશન ડેટાને આપમેળે સિંક કરો"</string>
     <string name="sync_enabled" msgid="4551148952179416813">"સમન્વયન ચાલુ છે"</string>
     <string name="sync_disabled" msgid="8511659877596511991">"સમન્વયન બંધ છે"</string>
     <string name="sync_error" msgid="5060969083117872149">"સમન્વયન ભૂલ"</string>
@@ -2312,7 +2324,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>
@@ -2335,15 +2347,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="wimax_settings" msgid="2655139497028469039">"4G"</string>
-    <string name="status_wimax_mac_address" msgid="8390791848661413416">"4G MAC સરનામું"</string>
+    <string name="cant_sync_dialog_message" msgid="1938380442159016449">"આ આઇટમ માટે સિંક હાલમાં અક્ષમ કરેલું છે. આ સેટિંગ બદલવા માટે, બૅકગ્રાઉન્ડ ડેટા અને આપમેળે સિંકને અસ્થાયી ધોરણે ચાલુ કરો."</string>
     <string name="enter_password" msgid="8035706727471334122">"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="enter_pin" msgid="5305333588093263790">"Android પ્રારંભ કરવા માટે, તમારો પિન દાખલ કરો"</string>
+    <string name="enter_pattern" msgid="4187435713036808566">"Android પ્રારંભ કરવા માટે, તમારી પૅટર્ન દોરો"</string>
+    <string name="cryptkeeper_wrong_pattern" msgid="8423835922362956999">"ખોટી પૅટર્ન"</string>
     <string name="cryptkeeper_wrong_password" msgid="5200857195368904047">"ખોટો પાસવર્ડ"</string>
-    <string name="cryptkeeper_wrong_pin" msgid="755720788765259382">"ખોટો PIN"</string>
+    <string name="cryptkeeper_wrong_pin" msgid="755720788765259382">"ખોટો પિન"</string>
     <string name="checking_decryption" msgid="8287458611802609493">"તપાસી રહ્યું છે..."</string>
     <string name="starting_android" msgid="4001324195902252681">"Android પ્રારંભ કરી રહ્યાં છીએ…"</string>
     <string name="delete" msgid="4219243412325163003">"કાઢી નાખો"</string>
@@ -2351,6 +2361,7 @@
     <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_plan_usage_manage_plans_button_text" msgid="8997761990902708162">"પ્લાન સંચાલિત કરો"</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>
@@ -2361,33 +2372,33 @@
     <string name="data_usage_cycle" msgid="5652529796195787949">"ડેટા વપરાશ ચક્ર"</string>
     <string name="data_usage_app_items_header_text" msgid="5017850810459372828">"ઍપ્લિકેશન વપરાશ"</string>
     <string name="data_usage_menu_roaming" msgid="8042359966835203296">"ડેટા રોમિંગ"</string>
-    <string name="data_usage_menu_restrict_background" msgid="1989394568592253331">"પૃષ્ઠભૂમિ ડેટાને નિયંત્રિત કરો"</string>
-    <string name="data_usage_menu_allow_background" msgid="2694761978633359223">"પૃષ્ઠભૂમિ ડેટાને મંજૂરી આપો"</string>
+    <string name="data_usage_menu_restrict_background" msgid="1989394568592253331">"બૅકગ્રાઉન્ડ ડેટાને નિયંત્રિત કરો"</string>
+    <string name="data_usage_menu_allow_background" msgid="2694761978633359223">"બૅકગ્રાઉન્ડ ડેટાને મંજૂરી આપો"</string>
     <string name="data_usage_menu_split_4g" msgid="5322857680792601899">"4G વપરાશ અલગ કરો"</string>
-    <string name="data_usage_menu_show_wifi" msgid="2296217964873872571">"Wi‑Fi બતાવો"</string>
-    <string name="data_usage_menu_hide_wifi" msgid="7290056718050186769">"Wi‑Fi છુપાવો"</string>
+    <string name="data_usage_menu_show_wifi" msgid="2296217964873872571">"વાઇ-ફાઇ બતાવો"</string>
+    <string name="data_usage_menu_hide_wifi" msgid="7290056718050186769">"વાઇ-ફાઇ છુપાવો"</string>
     <string name="data_usage_menu_show_ethernet" msgid="5181361208532314097">"ઇથરનેટ વપરાશ બતાવો"</string>
     <string name="data_usage_menu_hide_ethernet" msgid="3326702187179943681">"ઇથરનેટ વપરાશ છુપાવો"</string>
-    <string name="data_usage_menu_metered" msgid="6235119991372755026">"નેટવર્ક નિયંત્રણો"</string>
-    <string name="data_usage_menu_auto_sync" msgid="8203999775948778560">"ડેટાને સ્વતઃ-સમન્વયિત કરો"</string>
-    <string name="data_usage_menu_sim_cards" msgid="6410498422797244073">"SIM કાર્ડ્સ"</string>
+    <string name="data_usage_menu_metered" msgid="6235119991372755026">"નેટવર્ક પ્રતિબંધ"</string>
+    <string name="data_usage_menu_auto_sync" msgid="8203999775948778560">"ડેટાને આપમેળે સિંક કરો"</string>
+    <string name="data_usage_menu_sim_cards" msgid="6410498422797244073">"સિમ કાર્ડ"</string>
     <string name="data_usage_menu_cellular_networks" msgid="8339835014751511300">"મોબાઇલ નેટવર્કો"</string>
     <string name="data_usage_cellular_data_summary" msgid="8413357481361268285">"થોભાવવાની મર્યાદા"</string>
-    <string name="account_settings_menu_auto_sync" msgid="6243013719753700377">"ડેટાને સ્વતઃ-સમન્વયિત કરો"</string>
-    <string name="account_settings_menu_auto_sync_personal" msgid="785541379617346438">"વ્યક્તિગત ડેટાને સ્વતઃ-સમન્વયિત કરો"</string>
-    <string name="account_settings_menu_auto_sync_work" msgid="329565580969147026">"કાર્યાલય ડેટાને સ્વતઃ-સમન્વયિત કરો"</string>
+    <string name="account_settings_menu_auto_sync" msgid="6243013719753700377">"ડેટાને આપમેળે સિંક કરો"</string>
+    <string name="account_settings_menu_auto_sync_personal" msgid="785541379617346438">"વ્યક્તિગત ડેટાને આપમેળે સિંક કરો"</string>
+    <string name="account_settings_menu_auto_sync_work" msgid="329565580969147026">"કાર્યાલયના ડેટાને આપમેળે સિંક કરો"</string>
     <string name="data_usage_change_cycle" msgid="7776556448920114866">"ચક્ર બદલો…"</string>
     <string name="data_usage_pick_cycle_day" msgid="4470796861757050966">"ડેટા વપરાશ ચક્ર ફરીથી સેટ કરવા માટે મહિનાનો દિવસ:"</string>
     <string name="data_usage_empty" msgid="8621855507876539282">"આ સમયગાળા દરમ્યાન કોઈ એપ્લિકેશને ડેટાનો ઉપયોગ કર્યો નથી."</string>
     <string name="data_usage_label_foreground" msgid="4938034231928628164">"અગ્રભૂમિ"</string>
-    <string name="data_usage_label_background" msgid="3225844085975764519">"પૃષ્ઠભૂમિ"</string>
+    <string name="data_usage_label_background" msgid="3225844085975764519">"બૅકગ્રાઉન્ડ"</string>
     <string name="data_usage_app_restricted" msgid="3568465218866589705">"પ્રતિબંધિત"</string>
     <string name="data_usage_disable_mobile" msgid="8656552431969276305">"મોબાઇલ ડેટા બંધ કરીએ?"</string>
     <string name="data_usage_disable_mobile_limit" msgid="4644364396844393848">"મોબાઇલ ડેટા મર્યાદા સેટ કરો"</string>
     <string name="data_usage_disable_4g_limit" msgid="6233554774946681175">"4G ડેટા મર્યાદા સેટ કરો"</string>
     <string name="data_usage_disable_3g_limit" msgid="2558557840444266906">"2G-3G ડેટા મર્યાદા સેટ કરો"</string>
-    <string name="data_usage_disable_wifi_limit" msgid="1394901415264660888">"Wi‑Fi ડેટા મર્યાદા સેટ કરો"</string>
-    <string name="data_usage_tab_wifi" msgid="481146038146585749">"Wi-Fi"</string>
+    <string name="data_usage_disable_wifi_limit" msgid="1394901415264660888">"વાઇ-ફાઇ ડેટા મર્યાદા સેટ કરો"</string>
+    <string name="data_usage_tab_wifi" msgid="481146038146585749">"વાઇ-ફાઇ"</string>
     <string name="data_usage_tab_ethernet" msgid="7298064366282319911">"ઇથરનેટ"</string>
     <string name="data_usage_tab_mobile" msgid="454140350007299045">"મોબાઇલ"</string>
     <string name="data_usage_tab_4g" msgid="1301978716067512235">"4G"</string>
@@ -2398,20 +2409,20 @@
     <string name="data_usage_enable_3g" msgid="6304006671869578254">"2G-3G ડેટા"</string>
     <string name="data_usage_enable_4g" msgid="3635854097335036738">"4G ડેટા"</string>
     <string name="data_usage_forground_label" msgid="7654319010655983591">"અગ્રભૂમિ:"</string>
-    <string name="data_usage_background_label" msgid="2722008379947694926">"પૃષ્ઠભૂમિ"</string>
+    <string name="data_usage_background_label" msgid="2722008379947694926">"બૅકગ્રાઉન્ડ"</string>
     <string name="data_usage_app_settings" msgid="2279171379771253165">"ઍપ્લિકેશન સેટિંગ્સ"</string>
-    <string name="data_usage_app_restrict_background" msgid="7359227831562303223">"પૃષ્ઠભૂમિ ડેટા"</string>
+    <string name="data_usage_app_restrict_background" msgid="7359227831562303223">"બૅકગ્રાઉન્ડ ડેટા"</string>
     <string name="data_usage_app_restrict_background_summary" msgid="5853552187570622572">"પૃષ્ઠભૂમિમાં મોબાઇલ ડેટાના વપરાશને સક્ષમ કરો"</string>
-    <string name="data_usage_app_restrict_background_summary_disabled" msgid="7401927377070755054">"આ ઍપ્લિકેશન માટે પૃષ્ઠભૂમિ ડેટા પ્રતિબંધિત કરવા માટે, પહેલા મોબાઇલ ડેટા મર્યાદા સેટ કરો."</string>
-    <string name="data_usage_app_restrict_dialog_title" msgid="1613108390242737923">"પૃષ્ઠભૂમિ ડેટાને નિયંત્રિત કરીએ?"</string>
-    <string name="data_usage_app_restrict_dialog" msgid="1466689968707308512">"આ સુવિધાને કારણે પૃષ્ઠભૂમિ ડેટા પર આધારિત હોય તે ઍપ્લિકેશન ફક્ત મોબાઇલ નેટવર્ક્સ ઉપલબ્ધ હોય ત્યારે કામ કરતી બંધ થઈ શકે છે.\n\nતમે ઍપ્લિકેશનમાં ઉપલબ્ધ સેટિગ્સમાં વધુ ઉચિત ડેટા વપરાશ નિયંત્રણો મેળવી શકો છો."</string>
-    <string name="data_usage_restrict_denied_dialog" msgid="55012417305745608">"તમે મોબાઇલ ડેટા મર્યાદા સેટ કરી હોય, માત્ર ત્યારે જ પૃષ્ઠભૂમિ ડેટાને મર્યાદિત કરવું સંભવ છે."</string>
+    <string name="data_usage_app_restrict_background_summary_disabled" msgid="7401927377070755054">"આ ઍપ્લિકેશન માટે બૅકગ્રાઉન્ડ ડેટા પ્રતિબંધિત કરવા માટે, પહેલા મોબાઇલ ડેટા મર્યાદા સેટ કરો."</string>
+    <string name="data_usage_app_restrict_dialog_title" msgid="1613108390242737923">"બૅકગ્રાઉન્ડ ડેટાને નિયંત્રિત કરીએ?"</string>
+    <string name="data_usage_app_restrict_dialog" msgid="1466689968707308512">"આ સુવિધાને કારણે બૅકગ્રાઉન્ડ ડેટા પર આધારિત હોય તે ઍપ્લિકેશન ફક્ત મોબાઇલ નેટવર્કો ઉપલબ્ધ હોય ત્યારે કામ કરતી બંધ થઈ શકે છે.\n\nતમે ઍપ્લિકેશનમાં ઉપલબ્ધ સેટિગ્સમાં વધુ ઉચિત ડેટા વપરાશ નિયંત્રણો મેળવી શકો છો."</string>
+    <string name="data_usage_restrict_denied_dialog" msgid="55012417305745608">"તમે મોબાઇલ ડેટા મર્યાદા સેટ કરી હોય, માત્ર ત્યારે જ બૅકગ્રાઉન્ડ ડેટાને મર્યાદિત કરવું સંભવ છે."</string>
     <string name="data_usage_auto_sync_on_dialog_title" msgid="2438617846762244389">"ડેટા સ્વતઃસમન્વયિત કરો ચાલુ કરીએ?"</string>
     <string name="data_usage_auto_sync_on_dialog" product="tablet" msgid="8581983093524041669">"તમે વેબ પર તમારા એકાઉન્ટ્સમાં કરો તે કોઈપણ ફેરફારોને આપમેળે તમારા ફોન પર કૉપિ કરાશે.\n\nકેટલાક એકાઉન્ટ્સ પણ તમે ટેબ્લેટ પર કરો તે ફેરફારોની વેબ પર આપમેળે કૉપિ કરશે. Google એકાઉન્ટ આ પ્રમાણે કાર્ય કરે છે."</string>
     <string name="data_usage_auto_sync_on_dialog" product="default" msgid="8651376294887142858">"તમે વેબ પર તમારા એકાઉન્ટ્સમાં કરો તે કોઈપણ ફેરફારોને આપમેળે તમારા ફોન પર કૉપિ કરાશે.\n\nકેટલાક એકાઉન્ટ્સ પણ તમે ફોન પર કરો તે ફેરફારોની વેબ પર આપમેળે કૉપિ કરશે. Google એકાઉન્ટ આ પ્રમાણે કાર્ય કરે છે."</string>
     <string name="data_usage_auto_sync_off_dialog_title" msgid="9013139130490125793">"ડેટા સ્વતઃસમન્વયિત કરો બંધ કરીએ?"</string>
     <string name="data_usage_auto_sync_off_dialog" msgid="4025938250775413864">"આ ડેટા અને બૅટરી વપરાશ બચાવશે, પરંતુ તમારે તાજેતરની માહિતી એકત્રિત કરવા માટે દરેક એકાઉન્ટને મેન્યુઅલી સમન્વયિત કરવાની જરૂર પડશે. અને જ્યારે અપડેટ્સ આવશે ત્યારે તમે સૂચનાઓ પ્રાપ્ત કરશો નહીં."</string>
-    <string name="data_usage_cycle_editor_title" msgid="1373797281540188533">"વપરાશ ચક્ર ફરીથી સેટ કરવાની તારીખ"</string>
+    <string name="data_usage_cycle_editor_title" msgid="1373797281540188533">"વપરાશ સાયકલ ફરીથી સેટ કરવાની તારીખ"</string>
     <string name="data_usage_cycle_editor_subtitle" msgid="5512903797979928416">"દર મહિનાની તારીખ:"</string>
     <string name="data_usage_cycle_editor_positive" msgid="8821760330497941117">"સેટ કરો"</string>
     <string name="data_usage_warning_editor_title" msgid="3704136912240060339">"ડેટા વપરાશ ચેતવણી સેટ કરો"</string>
@@ -2419,10 +2430,10 @@
     <string name="data_usage_limit_dialog_title" msgid="3023111643632996097">"ડેટા ઉપયોગને મર્યાદિત કરવો"</string>
     <string name="data_usage_limit_dialog_mobile" product="tablet" msgid="4983487893343645667">"એકવાર તમારો મોબાઇલ ડેટા તમે સેટ કરેલી મર્યાદા પર પહોંચી જાય, પછી તમારું ટૅબ્લેટ તેને બંધ કરી દેશે.\n\nડેટા ઉપયોગની ગણતરી તમારા ટૅબ્લેટ દ્વારા કરવામાં આવે છે અને તમારા કૅરિઅર ભિન્ન રીતે વપરાશની ગણતરી કરી શકે છે, તેથી અપરિવર્તનશીલ મર્યાદા સેટ કરવાનું વિચારો."</string>
     <string name="data_usage_limit_dialog_mobile" product="default" msgid="3926320594049434225">"એકવાર તમારો મોબાઇલ ડેટા તમે સેટ કરેલી મર્યાદા પર પહોંચી જાય, પછી તમારો ફોન તેને બંધ કરી દેશે.\n\nડેટા વપરાશની ગણતરી તમારા ફોન દ્વારા કરવામાં આવે છે અને તમારા કૅરિઅર ભિન્ન રીતે વપરાશની ગણતરી કરી શકે છે, તેથી અપરિવર્તનશીલ મર્યાદા સેટ કરવાનું વિચારો."</string>
-    <string name="data_usage_restrict_background_title" msgid="2201315502223035062">"પૃષ્ઠભૂમિ ડેટાને નિયંત્રિત કરીએ?"</string>
-    <string name="data_usage_restrict_background" msgid="434093644726734586">"જો તમે પૃષ્ઠભૂમિ મોબાઇલ ડેટાને મર્યાદિત કરશો, તો તમે જ્યાં સુધી Wi-Fi સાથે કનેક્ટ નહીં થાઓ, ત્યાં સુધી કેટલીક ઍપ્લિકેશનો અને સેવાઓ કાર્ય નહીં કરે."</string>
-    <string name="data_usage_restrict_background_multiuser" product="tablet" msgid="7096707497743363380">"જો તમે પૃષ્ઠભૂમિ મોબાઇલ ડેટા મર્યાદિત કરશો, તો તમે જ્યાં સુધી Wi‑Fi સાથે કનેક્ટ નહીં થાઓ, ત્યાં સુધી કેટલીક ઍપ્લિકેશન અને સેવાઓ કાર્ય નહીં કરે.\n\nઆ સેટિંગ આ ટૅબ્લેટ પરના બધા વપરાશકર્તાઓને અસર કરે છે."</string>
-    <string name="data_usage_restrict_background_multiuser" product="default" msgid="7910798414964288424">"જો તમે પૃષ્ઠભૂમિ મોબાઇલ ડેટાને મર્યાદિત કરશો, તો તમે જ્યાં સુધી Wi-Fi સાથે કનેક્ટ નહીં થાઓ, ત્યાં સુધી કેટલીક ઍપ્લિકેશનો અને સેવાઓ કાર્ય નહીં કરે.\n\nઆ સેટિંગ આ ફોન પરના બધા વપરાશકર્તાઓને અસર કરે છે."</string>
+    <string name="data_usage_restrict_background_title" msgid="2201315502223035062">"બૅકગ્રાઉન્ડ ડેટાને નિયંત્રિત કરીએ?"</string>
+    <string name="data_usage_restrict_background" msgid="434093644726734586">"જો તમે બૅકગ્રાઉન્ડ મોબાઇલ ડેટાને મર્યાદિત કરશો, તો તમે જ્યાં સુધી વાઇ-ફાઇ સાથે કનેક્ટ નહીં થાઓ, ત્યાં સુધી કેટલીક ઍપ્લિકેશનો અને સેવાઓ કાર્ય નહીં કરે."</string>
+    <string name="data_usage_restrict_background_multiuser" product="tablet" msgid="7096707497743363380">"જો તમે બૅકગ્રાઉન્ડ મોબાઇલ ડેટા મર્યાદિત કરશો, તો તમે જ્યાં સુધી વાઇ-ફાઇ સાથે કનેક્ટ નહીં થાઓ, ત્યાં સુધી કેટલીક ઍપ્લિકેશન અને સેવાઓ કાર્ય નહીં કરે.\n\nઆ સેટિંગ આ ટૅબ્લેટ પરના બધા વપરાશકર્તાઓને અસર કરે છે."</string>
+    <string name="data_usage_restrict_background_multiuser" product="default" msgid="7910798414964288424">"જો તમે બૅકગ્રાઉન્ડ મોબાઇલ ડેટાને મર્યાદિત કરશો, તો તમે જ્યાં સુધી વાઇ-ફાઇ સાથે કનેક્ટ નહીં થાઓ, ત્યાં સુધી કેટલીક ઍપ્લિકેશનો અને સેવાઓ કાર્ય નહીં કરે.\n\nઆ સેટિંગ આ ફોન પરના બધા વપરાશકર્તાઓને અસર કરે છે."</string>
     <string name="data_usage_sweep_warning" msgid="6387081852568846982"><font size="18">"<xliff:g id="NUMBER">^1</xliff:g>"</font>" "<font size="9">"<xliff:g id="UNIT">^2</xliff:g>"</font>\n<font size="12">"ચેતવણી"</font></string>
     <string name="data_usage_sweep_limit" msgid="860566507375933039"><font size="18">"<xliff:g id="NUMBER">^1</xliff:g>"</font>" "<font size="9">"<xliff:g id="UNIT">^2</xliff:g>"</font>\n<font size="12">"મર્યાદા"</font></string>
     <string name="data_usage_uninstalled_apps" msgid="614263770923231598">"દૂર કરેલી ઍપ્લિકેશનો"</string>
@@ -2431,11 +2442,14 @@
     <string name="data_usage_total_during_range" msgid="4091294280619255237">"<xliff:g id="RANGE">%2$s</xliff:g>: લગભગ <xliff:g id="TOTAL">%1$s</xliff:g> વપરાયો"</string>
     <string name="data_usage_total_during_range_mobile" product="tablet" msgid="1925687342154538972">"<xliff:g id="RANGE">%2$s</xliff:g>: લગભગ <xliff:g id="TOTAL">%1$s</xliff:g> વપરાયા, તમારા ટેબ્લેટ દ્વારા માપ્યાં અનુસાર. તમારા કેરિઅરની ડેટા વપરાશની ગણતરી અલગ હોઈ શકે છે."</string>
     <string name="data_usage_total_during_range_mobile" product="default" msgid="5063981061103812900">"<xliff:g id="RANGE">%2$s</xliff:g>: લગભગ <xliff:g id="TOTAL">%1$s</xliff:g> વપરાયા, તમારા ફોન દ્વારા માપ્યાં મુજબ. તમારા કેરિઅરની ડેટા વપરાશ ગણતરી અલગ હોઈ શકે છે."</string>
-    <string name="data_usage_metered_title" msgid="7383175371006596441">"નેટવર્ક નિયંત્રણો"</string>
-    <string name="data_usage_metered_body" msgid="7655851702771342507">"જ્યારે પૃષ્ઠભૂમિ ડેટા મર્યાદિત હોય, ત્યારે મીટર્ડ નેટવર્કોને મોબાઇલ નેટવર્કોની  જેમ ગણવામાં આવે છે. ઍપ્લિકેશનો મોટાં ડાઉનલોડ માટે આ નેટવર્કોનો ઉપયોગ કરતાં પહેલાં ચેતવણી આપી શકે છે."</string>
+    <string name="data_usage_metered_title" msgid="7383175371006596441">"નેટવર્ક પ્રતિબંધ"</string>
+    <string name="data_usage_metered_body" msgid="7655851702771342507">"જ્યારે બૅકગ્રાઉન્ડ ડેટા મર્યાદિત હોય, ત્યારે મીટર્ડ નેટવર્કોને મોબાઇલ નેટવર્કોની જેમ ગણવામાં આવે છે. ઍપ્લિકેશનો મોટાં ડાઉનલોડ માટે આ નેટવર્કોનો ઉપયોગ કરતાં પહેલાં ચેતવણી આપી શકે છે."</string>
     <string name="data_usage_metered_mobile" msgid="5423305619126978393">"મોબાઇલ નેટવર્ક્સ"</string>
-    <string name="data_usage_metered_wifi" msgid="1761738002328299714">"મીટર કરેલ Wi‑Fi નેટવર્ક્સ"</string>
-    <string name="data_usage_metered_wifi_disabled" msgid="727808462375941567">"મીટર કરેલ નેટવર્ક્સ પસંદ કરવા માટે, Wi‑Fi ચાલુ કરો."</string>
+    <string name="data_usage_metered_wifi" msgid="1761738002328299714">"મીટર કરેલ વાઇ-ફાઇ નેટવર્ક્સ"</string>
+    <string name="data_usage_metered_wifi_disabled" msgid="727808462375941567">"મીટર કરેલ નેટવર્ક્સ પસંદ કરવા માટે, વાઇ-ફાઇ ચાલુ કરો."</string>
+    <string name="data_usage_metered_auto" msgid="1262028400911918865">"આપમેળે"</string>
+    <string name="data_usage_metered_yes" msgid="9217539611385225894">"મીટર કરેલ"</string>
+    <string name="data_usage_metered_no" msgid="4025232961929071789">"મીટર કરેલ નથી"</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>
@@ -2494,7 +2508,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>
@@ -2527,9 +2541,6 @@
     <string name="backup_pw_set_button_text" msgid="2387480910044648795">"બેકઅપ પાસવર્ડ સેટ કરો"</string>
     <string name="backup_pw_cancel_button_text" msgid="8845630125391744615">"રદ કરો"</string>
     <string name="additional_system_update_settings_list_item_title" msgid="214987609894661992">"વધારાના સિસ્ટમ અપડેટ્સ"</string>
-    <string name="selinux_status_disabled" msgid="924551035552323327">"અક્ષમ કર્યો"</string>
-    <string name="selinux_status_permissive" msgid="6004965534713398778">"પરવાનગીવાળું"</string>
-    <string name="selinux_status_enforcing" msgid="2252703756208463329">"લાગુ કરી રહ્યું છે"</string>
     <string name="ssl_ca_cert_warning" msgid="2045866713601984673">"નેટવર્ક મૉનિટર કરી શકાય છે"</string>
     <string name="done_button" msgid="1991471253042622230">"થઈ ગયું"</string>
     <plurals name="ssl_ca_cert_dialog_title" formatted="false" msgid="7145092748045794650">
@@ -2541,8 +2552,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">
@@ -2558,18 +2569,18 @@
     <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>
     <string name="user_add_user_type_title" msgid="2146438670792322349">"ઉમેરો"</string>
     <string name="user_add_max_count" msgid="5405885348463433157">"તમે <xliff:g id="USER_COUNT">%1$d</xliff:g> જેટલા વપરાશકર્તાઓ ઉમેરી શકો છો"</string>
-    <string name="user_add_user_item_summary" msgid="4702776187132008661">"વપરાશકર્તાઓ પાસે તેઓની પોતાની ઍપ્લિકેશનો અને સામગ્રી છે"</string>
+    <string name="user_add_user_item_summary" msgid="4702776187132008661">"વપરાશકર્તાઓ પાસે તેઓની પોતાની ઍપ્લિકેશનો અને કન્ટેન્ટ છે"</string>
     <string name="user_add_profile_item_summary" msgid="5931663986889138941">"તમે તમારા એકાઉન્ટથી ઍપ્લિકેશનો અને સામગ્રીની અ‍ૅક્સેસને નિયંત્રિત કરી શકો છો"</string>
     <string name="user_add_user_item_title" msgid="8212199632466198969">"વપરાશકર્તા"</string>
     <string name="user_add_profile_item_title" msgid="8353515490730363621">"પ્રતિબંધિત પ્રોફાઇલ"</string>
     <string name="user_add_user_title" msgid="2108112641783146007">"નવા વપરાશકર્તાને ઉમેરીએ?"</string>
-    <string name="user_add_user_message_long" msgid="8562152293752222985">"તમે વધારાના વપરાશકર્તાઓ બનાવીને અન્ય લોકો સાથે આ ઉપકરણને શેર કરી શકો છો. દરેક વપરાશકર્તા પાસે તેનું પોતાનું સ્થાન છે, જેને તેઓ ઍપ્લિકેશનો, વૉલપેપર, વગેરે સાથે કસ્ટમાઇઝ કરી શકે છે. વપરાશકર્તાઓ દરેકને પ્રભાવિત કરતી હોય તેવી ઉપકરણ સેટિંગ્સ જેમ કે Wi‑Fi ને પણ સમાયોજિત કરી શકે છે.\n\nજ્યારે તમે કોઈ નવા વપરાશકર્તાને ઉમેરો છો, ત્યારે તે વ્યક્તિને તેમનું સ્થાન સેટ કરવાની જરૂર પડે છે.\n\nકોઈપણ વપરાશકર્તા અન્ય બધા વપરાશકર્તાઓ માટે ઍપ્લિકેશનોને અપડેટ કરી શકે છે."</string>
+    <string name="user_add_user_message_long" msgid="8562152293752222985">"તમે વધારાના વપરાશકર્તાઓ બનાવીને અન્ય લોકો સાથે આ ઉપકરણને શેર કરી શકો છો. દરેક વપરાશકર્તા પાસે તેનું પોતાનું સ્થાન છે, જેને તેઓ ઍપ્લિકેશનો, વૉલપેપર, વગેરે સાથે કસ્ટમાઇઝ કરી શકે છે. વપરાશકર્તાઓ દરેકને પ્રભાવિત કરતી હોય તેવી ઉપકરણ સેટિંગ્સ જેમ કે વાઇ-ફાઇ ને પણ સમાયોજિત કરી શકે છે.\n\nજ્યારે તમે કોઈ નવા વપરાશકર્તાને ઉમેરો છો, ત્યારે તે વ્યક્તિને તેમનું સ્થાન સેટ કરવાની જરૂર પડે છે.\n\nકોઈપણ વપરાશકર્તા અન્ય બધા વપરાશકર્તાઓ માટે ઍપ્લિકેશનોને અપડેટ કરી શકે છે."</string>
     <string name="user_add_user_message_short" msgid="1511354412249044381">"જ્યારે તમે કોઈ નવા વપરાશકર્તાને ઉમેરો છો, ત્યારે તે વ્યક્તિને તેમનું સ્થાન સેટ કરવાની જરૂર પડે છે.\n\nકોઈપણ વપરાશકર્તા બધા અન્ય વપરાશકર્તાઓ માટે એપ્લિકેશન્સને અપડેટ કરી શકે છે."</string>
     <string name="user_setup_dialog_title" msgid="1765794166801864563">"હવે વપરાશકર્તાને સેટ કરીએ?"</string>
     <string name="user_setup_dialog_message" msgid="1004068621380867148">"ખાતરી કરો કે વ્યક્તિ ઉપકરણ લેવા અને તેમનું સથાન સેટ કરવા માટે ઉપલબ્ધ છે"</string>
@@ -2587,7 +2598,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>
@@ -2635,11 +2646,11 @@
     <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">"PIN બદલો"</string>
+    <string name="restriction_menu_change_pin" msgid="740081584044302775">"પિન બદલો"</string>
     <string name="app_notifications_switch_label" msgid="9124072219553687583">"સૂચનાઓ બતાવો"</string>
     <string name="help_label" msgid="6886837949306318591">"સહાય અને પ્રતિસાદ"</string>
-    <string name="support_summary" msgid="2705726826263742491">"સહાય લેખ, ફોન અને ચૅટ, શરૂ થઈ રહ્યાં છે"</string>
-    <string name="user_account_title" msgid="1127193807312271167">"સામગ્રી માટે એકાઉન્ટ"</string>
+    <string name="support_summary" msgid="2705726826263742491">"સહાય લેખ, ફોન અને ચૅટ, પ્રારંભ કરવું"</string>
+    <string name="user_account_title" msgid="1127193807312271167">"કન્ટેન્ટ માટે એકાઉન્ટ"</string>
     <string name="user_picture_title" msgid="7297782792000291692">"ફોટો ID"</string>
     <string name="extreme_threats_title" msgid="6549541803542968699">"આત્યંતિક જોખમો"</string>
     <string name="extreme_threats_summary" msgid="8777860706500920667">"જીવન અને સંપત્તિના આત્યંતિક જોખમો માટેની ચેતવણીઓ પ્રાપ્ત કરો"</string>
@@ -2656,21 +2667,21 @@
     <string name="cell_broadcast_settings" msgid="4124461751977706019">"કટોકટીની ચેતવણીઓ"</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>
-    <string name="work_sim_title" msgid="4843322164662606891">"કાર્યાલય SIM"</string>
-    <string name="user_restrictions_title" msgid="5794473784343434273">"ઍપ્લિકેશન અને સામગ્રી ઍક્સેસ"</string>
+    <string name="work_sim_title" msgid="4843322164662606891">"કાર્યાલય સિમ"</string>
+    <string name="user_restrictions_title" msgid="5794473784343434273">"ઍપ્લિકેશન અને કન્ટેન્ટ ઍક્સેસ"</string>
     <string name="user_rename" msgid="8523499513614655279">"નામ બદલો"</string>
     <string name="app_restrictions_custom_label" msgid="6160672982086584261">"ઍપ્લિકેશન પ્રતિબંધો સેટ કરો"</string>
     <string name="user_restrictions_controlled_by" msgid="3164078767438313899">"<xliff:g id="APP">%1$s</xliff:g> દ્વારા નિયંત્રિત"</string>
     <string name="app_sees_restricted_accounts" msgid="7503264525057246240">"આ ઍપ્લિકેશન તમારા એકાઉન્ટ્સ નિયંત્રિત કરી શકે છે"</string>
     <string name="app_sees_restricted_accounts_and_controlled_by" msgid="6968697624437267294">"આ ઍપ્લિકેશન તમારા એકાઉન્ટ્સ ઍક્સેસ કરી શકે છે. <xliff:g id="APP">%1$s</xliff:g> દ્વારા નિયંત્રિત"</string>
-    <string name="restriction_wifi_config_title" msgid="8889556384136994814">"Wi‑Fi અને મોબાઇલ"</string>
-    <string name="restriction_wifi_config_summary" msgid="70888791513065244">"Wi‑Fi અને મોબાઇલ સેટિંગ્સનાં સંશોધનની મંજૂરી આપો"</string>
-    <string name="restriction_bluetooth_config_title" msgid="8871681580962503671">"Bluetooth"</string>
-    <string name="restriction_bluetooth_config_summary" msgid="8372319681287562506">"Bluetooth જોડીઓ અને સેટિંગ્સનાં સંશોધનની મંજૂરી આપો"</string>
+    <string name="restriction_wifi_config_title" msgid="8889556384136994814">"વાઇ-ફાઇ અને મોબાઇલ"</string>
+    <string name="restriction_wifi_config_summary" msgid="70888791513065244">"વાઇ-ફાઇ અને મોબાઇલ સેટિંગ્સનાં સંશોધનની મંજૂરી આપો"</string>
+    <string name="restriction_bluetooth_config_title" msgid="8871681580962503671">"બ્લૂટૂથ"</string>
+    <string name="restriction_bluetooth_config_summary" msgid="8372319681287562506">"બ્લૂટૂથ જોડીઓ અને સેટિંગ્સનાં સંશોધનની મંજૂરી આપો"</string>
     <string name="restriction_nfc_enable_title" msgid="5888100955212267941">"NFC"</string>
     <string name="restriction_nfc_enable_summary_config" msgid="3232480757215851738">"જ્યારે આ <xliff:g id="DEVICE_NAME">%1$s</xliff:g> બીજા NFC ઉપકરણને ટચ કરે ત્યારે ડેટા ફેરબદલીની મંજૂરી આપો"</string>
     <string name="restriction_nfc_enable_summary" product="tablet" msgid="3891097373396149915">"જ્યારે ટેબ્લેટ બીજા ઉપકરણને ટચ કરે ત્યારે ડેટા વિનિમયની મંજૂરી આપો"</string>
@@ -2681,45 +2692,45 @@
     <string name="wizard_next" msgid="3606212602795100640">"આગલું"</string>
     <string name="wizard_finish" msgid="3286109692700083252">"સમાપ્ત"</string>
     <string name="user_image_take_photo" msgid="1280274310152803669">"ફોટો લો"</string>
-    <string name="user_image_choose_photo" msgid="7940990613897477057">"ગૅલેરીમાંથી ફોટા પસંદ કરો"</string>
+    <string name="user_image_choose_photo" msgid="7940990613897477057">"ગૅલેરીમાંથી ફોટો પસંદ કરો"</string>
     <string name="user_image_photo_selector" msgid="5492565707299454873">"ફોટો પસંદ કરો"</string>
     <string name="regulatory_info_text" msgid="5623087902354026557"></string>
-    <string name="sim_setup_wizard_title" msgid="1732682852692274928">"SIM કાર્ડ્સ"</string>
-    <string name="sim_settings_title" msgid="6822745211458959756">"SIM કાર્ડ્સ"</string>
+    <string name="sim_setup_wizard_title" msgid="1732682852692274928">"સિમ કાર્ડ"</string>
+    <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">"SIM કાર્ડ્સ હવે બદલાયેલા છે"</string>
+    <string name="sim_cards_changed_message" msgid="7900721153345139783">"સિમ  કાર્ડ હવે બદલાઈ ગયા છે"</string>
     <string name="sim_cards_changed_message_summary" msgid="8258058274989383204">"પ્રવૃત્તિઓ સેટ કરવા માટે ટૅપ કરો"</string>
     <string name="sim_cellular_data_unavailable" msgid="9109302537004566098">"મોબાઇલ ડેટા અનુપલબ્ધ છે"</string>
-    <string name="sim_cellular_data_unavailable_summary" msgid="5416535001368135327">"ડેટા SIM પસંદ કરવા માટે ટૅપ કરો"</string>
+    <string name="sim_cellular_data_unavailable_summary" msgid="5416535001368135327">"ડેટા સિમ પસંદ કરવા માટે ટૅપ કરો"</string>
     <string name="sim_calls_always_use" msgid="7936774751250119715">"કૉલ્સ માટે આનો ઉપયોગ હંમેશાં કરો"</string>
-    <string name="select_sim_for_data" msgid="2366081042162853044">"ડેટા માટે એક SIM પસંદ કરો"</string>
-    <string name="data_switch_started" msgid="2040761479817166311">"ડેટા SIM પર સ્વિચ થઈ રહ્યો છે, આમાં એક મિનિટ લાગી શકે છે..."</string>
+    <string name="select_sim_for_data" msgid="2366081042162853044">"ડેટા માટે એક સિમ પસંદ કરો"</string>
+    <string name="data_switch_started" msgid="2040761479817166311">"ડેટા સિમ પર સ્વિચ થઈ રહ્યો છે, આમાં એક મિનિટ લાગી શકે છે..."</string>
     <string name="select_sim_for_calls" msgid="3503094771801109334">"આની સાથે કૉલ કરો"</string>
-    <string name="sim_select_card" msgid="211285163525563293">"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>
-    <string name="sim_name_hint" msgid="7038643345238968930">"SIM નું નામ દાખલ કરો"</string>
-    <string name="sim_editor_title" msgid="4034301817366627870">"SIM સ્લોટ %1$d"</string>
+    <string name="sim_select_card" msgid="211285163525563293">"સિમ કાર્ડ પસંદ કરો"</string>
+    <string name="sim_card_number_title" msgid="7845379943474336488">"સિમ <xliff:g id="CARD_NUMBER">%1$d</xliff:g>"</string>
+    <string name="sim_slot_empty" msgid="8964505511911854688">"સિમ ખાલી છે"</string>
+    <string name="sim_editor_name" msgid="1722945976676142029">"સિમ નું નામ"</string>
+    <string name="sim_name_hint" msgid="7038643345238968930">"સિમ નું નામ દાખલ કરો"</string>
+    <string name="sim_editor_title" msgid="4034301817366627870">"સિમ સ્લોટ %1$d"</string>
     <string name="sim_editor_carrier" msgid="5684523444677746573">"વાહક"</string>
     <string name="sim_editor_number" msgid="6705955651035440667">"નંબર"</string>
-    <string name="sim_editor_color" msgid="2542605938562414355">"SIM નો રંગ"</string>
-    <string name="sim_card_select_title" msgid="6668492557519243456">"SIM કાર્ડ પસંદ કરો"</string>
+    <string name="sim_editor_color" msgid="2542605938562414355">"સિમ નો રંગ"</string>
+    <string name="sim_card_select_title" msgid="6668492557519243456">"સિમ કાર્ડ પસંદ કરો"</string>
     <string name="color_orange" msgid="4417567658855022517">"નારંગી"</string>
     <string name="color_purple" msgid="3888532466427762504">"જાંબલી"</string>
-    <string name="sim_no_inserted_msg" msgid="210316755353227087">"કોઈ 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>
+    <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_other_call_settings" msgid="8247802316114482477">"અન્ય કૉલ સેટિંગ્સ"</string>
     <string name="preferred_network_offload_title" msgid="1605829724169550275">"મનપસંદ નેટવર્ક ઑફલોડ"</string>
     <string name="preferred_network_offload_header" msgid="2321173571529106767">"નેટવર્ક નામ બ્રોડકાસ્ટ અક્ષમ કરો"</string>
     <string name="preferred_network_offload_footer" msgid="5857279426054744020">"નેટવર્ક નામ બ્રોડકાસ્ટ અક્ષમ કરો એ તૃતીય પક્ષોને તમારી નેટવર્ક માહિતીને ઍક્સેસ કરવાથી અટકાવે છે."</string>
     <string name="preferred_network_offload_popup" msgid="2252915199889604600">"નેટવર્ક નામ બ્રોડકાસ્ટ અક્ષમ કરવાનું છુપાયેલ નેટવર્ક્સ પરના સ્વતઃ કનેક્શનને અટકાવશે."</string>
     <string name="sim_signal_strength" msgid="9144010043784767984">"<xliff:g id="DBM">%1$d</xliff:g> dBm <xliff:g id="ASU">%2$d</xliff:g> asu"</string>
-    <string name="sim_notification_title" msgid="6272913297433198340">"SIM કાર્ડ્સ બદલાયા છે."</string>
+    <string name="sim_notification_title" msgid="6272913297433198340">"સિમ કાર્ડ બદલાયા છે."</string>
     <string name="sim_notification_summary" msgid="8858043655706669772">"સેટ કરવા માટે ટૅપ કરો"</string>
-    <string name="sim_pref_divider" msgid="6778907671867621874">"આ માટે પસંદગીનું SIM"</string>
+    <string name="sim_pref_divider" msgid="6778907671867621874">"આ માટે પસંદગીનું સિમ"</string>
     <string name="sim_calls_ask_first_prefs_title" msgid="7941299533514115976">"દર વખતે પૂછો"</string>
     <string name="sim_selection_required_pref" msgid="3446721423206414652">"પસંદગી જરૂરી"</string>
     <string name="dashboard_title" msgid="5453710313046681820">"સેટિંગ્સ"</string>
@@ -2727,13 +2738,14 @@
       <item quantity="one">%d છુપાયેલ આઇટમ બતાવો</item>
       <item quantity="other">%d છુપાયેલ આઇટમ બતાવો</item>
     </plurals>
+    <string name="dashboard_suggestion_condition_footer_content_description" msgid="2898588191174845961">"સંકુચિત કરો"</string>
     <string name="network_dashboard_title" msgid="4771589228992391573">"નેટવર્ક અને ઇન્ટરનેટ"</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="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="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>
@@ -2746,18 +2758,18 @@
     <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>
     <string name="keywords_display_night_display" msgid="7630169927425425754">"મંદ સ્ક્રીન, રાત્રિ, રંગછટા"</string>
-    <string name="keywords_display_wallpaper" msgid="7362076351860131776">"પૃષ્ઠભૂમિ, વ્યક્તિગત, પ્રદર્શન કસ્ટમાઇઝ કરો"</string>
+    <string name="keywords_display_wallpaper" msgid="7362076351860131776">"બૅકગ્રાઉન્ડ, વ્યક્તિગત, પ્રદર્શન કસ્ટમાઇઝ કરો"</string>
     <string name="keywords_display_font_size" msgid="3404655440064726124">"ટેક્સ્ટ કદ"</string>
     <string name="keywords_display_cast_screen" msgid="7684618996741933067">"પ્રોજેક્ટ, કાસ્ટ કરો"</string>
     <string name="keywords_storage" msgid="3299217909546089225">"સ્થાન, ડિસ્ક, હાર્ડ ડ્રાઇવ, ઉપકરણ વપરાશ"</string>
     <string name="keywords_battery" msgid="1173830745699768388">"પાવર વપરાશ, ચાર્જ"</string>
     <string name="keywords_spell_checker" msgid="1399641226370605729">"જોડણી, શબ્દકોશ, જોડણી-તપાસ, સ્વતઃ-સુધારો"</string>
-    <string name="keywords_voice_input" msgid="769778245192531102">"ઓળખકર્તા, ઇનપુટ, વાણી, બોલો, ભાષા, હેન્ડ્સફ્રી, હેંડ ફ્રી, ઓળખાણ, અપમાનકારક, શબ્દ, ઑડિઓ, ઇતિહાસ, Bluetooth હેડસેટ"</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>
@@ -2773,28 +2785,27 @@
     <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">"અનલૉક કરવા માટે સ્લાઇડ કરો, પાસવર્ડ, પેટર્ન, PIN"</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_unification" msgid="1922900767659821025">"કાર્યાલયની પ્રોફાઇલ, સંચાલિત પ્રોફાઇલ, એકીકૃત કરો, એકીકરણ, કાર્ય, પ્રોફાઇલ"</string>
     <string name="keywords_gesture" msgid="3526905012224714078">"સંકેતો"</string>
     <string name="keywords_payment_settings" msgid="5220104934130446416">"ચુકવણી કરો, ટૅપ કરો, ચુકવણીઓ"</string>
     <string name="keywords_backup" msgid="470070289135403022">"બૅકઅપ, બૅક અપ"</string>
-    <!-- no translation found for keywords_assist_gesture_launch (813968759791342591) -->
-    <skip />
-    <string name="setup_wifi_nfc_tag" msgid="9028353016222911016">"Wi-Fi NFC ટેગ સેટ કરો"</string>
+    <string name="keywords_assist_gesture_launch" msgid="813968759791342591">"સંકેત"</string>
+    <string name="setup_wifi_nfc_tag" msgid="9028353016222911016">"વાઇ-ફાઇ NFC ટૅગ સેટ કરો"</string>
     <string name="write_tag" msgid="8571858602896222537">"લખો"</string>
     <string name="status_awaiting_tap" msgid="2130145523773160617">"લખવા માટે ટેગ પર ટેપ કરો..."</string>
     <string name="status_invalid_password" msgid="2575271864572897406">"અમાન્ય પાસવર્ડ, ફરીથી પ્રયાસ કરો."</string>
     <string name="status_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>
@@ -2802,17 +2813,17 @@
     <string name="sound_settings_summary_silent" msgid="5074529767435584948">"રિંગર શાંત પર સેટ કરેલ છે"</string>
     <string name="sound_settings_example_summary" msgid="2404914514266523165">"રિંગ વૉલ્યુમ 80% પર છે"</string>
     <string name="media_volume_option_title" msgid="2811531786073003825">"મીડિયા વૉલ્યૂમ"</string>
-    <string name="alarm_volume_option_title" msgid="8219324421222242421">"એલાર્મ વોલ્યુમ"</string>
-    <string name="ring_volume_option_title" msgid="6767101703671248309">"રિંગ વોલ્યુમ"</string>
-    <string name="notification_volume_option_title" msgid="6064656124416882130">"સૂચના વૉલ્યૂમ"</string>
+    <string name="alarm_volume_option_title" msgid="8219324421222242421">"એલાર્મ વૉલ્યૂમ"</string>
+    <string name="ring_volume_option_title" msgid="6767101703671248309">"રિંગ વૉલ્યૂમ"</string>
+    <string name="notification_volume_option_title" msgid="6064656124416882130">"નોટિફિકેશન વૉલ્યૂમ"</string>
     <string name="ringtone_title" msgid="5379026328015343686">"ફોન રિંગટોન"</string>
-    <string name="notification_ringtone_title" msgid="4468722874617061231">"ડિફૉલ્ટ સૂચના માટે ધ્વનિ"</string>
+    <string name="notification_ringtone_title" msgid="4468722874617061231">"નોટિફિકેશન માટે ડિફૉલ્ટ ધ્વનિ"</string>
     <string name="notification_unknown_sound_title" msgid="2535027767851838335">"ઍપ્લિકેશને અવાજ પૂરો પાડ્યો"</string>
-    <string name="notification_sound_default" msgid="565135733949733766">"ડિફૉલ્ટ સૂચનાનો ધ્વનિ"</string>
+    <string name="notification_sound_default" msgid="565135733949733766">"નોટિફિકેશન માટે ડિફૉલ્ટ ધ્વનિ"</string>
     <string name="alarm_ringtone_title" msgid="6344025478514311386">"ડિફૉલ્ટ એલાર્મ ધ્વનિ"</string>
     <string name="vibrate_when_ringing_title" msgid="3806079144545849032">"કૉલ્સ માટે પણ વાઇબ્રેટ કરો"</string>
     <string name="other_sound_settings" msgid="3151004537006844718">"અન્ય ધ્વનિઓ"</string>
-    <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>
@@ -2827,59 +2838,67 @@
     <string name="boot_sounds_title" msgid="567029107382343709">"ચાલુ થવા પર વાગનાર ધ્વનિ"</string>
     <string name="zen_mode_settings_summary_off" msgid="1857165567766351925">"કોઈ આપોઆપ નિયમો ચાલુ કરેલા નથી"</string>
     <plurals name="zen_mode_settings_summary_on" formatted="false" msgid="1216562765753405784">
-      <item quantity="one"><xliff:g id="ON_COUNT">%d</xliff:g> સ્વચાલિત નિયમ ચાલુ કર્યા છે</item>
+      <item quantity="one"><xliff:g id="ON_COUNT">%d</xliff:g> સ્વચાલિત નિયમ ચાલુ કર્યો છે</item>
       <item quantity="other"><xliff:g id="ON_COUNT">%d</xliff:g> સ્વચાલિત નિયમ ચાલુ કર્યા છે</item>
     </plurals>
-    <string name="zen_mode_settings_title" msgid="842308776768942600">"ખલેલ પાડશો નહીં પસંદગીઓ"</string>
-    <string name="zen_mode_priority_settings_title" msgid="2623117023031824309">"ફક્ત પ્રાધાન્યતાને મંજૂરી"</string>
-    <string name="zen_mode_automation_settings_title" msgid="4228995740594063774">"સ્વયંચાલિત નિયમો"</string>
+    <string name="zen_mode_settings_title" msgid="1066226840983908121">"ખલેલ પાડશો નહીં"</string>
+    <string name="zen_mode_behavior_settings_title" msgid="1463303933529313969">"વર્તણૂક"</string>
+    <string name="zen_mode_behavior_allow_title" msgid="3845615648136218141">"આના ધ્વનિ અને વાઇબ્રેશનની મંજૂરી આપો"</string>
+    <string name="zen_mode_behavior_no_sound" msgid="1219626004723208056">"કોઈ ધ્વનિ નહીં"</string>
+    <string name="zen_mode_behavior_total_silence" msgid="6716603819806610626">"કોઈ ધ્વનિ નહીં (બિલકુલ શાંત)"</string>
+    <string name="zen_mode_behavior_no_sound_except" msgid="4968477585788243114">"<xliff:g id="CATEGORIES">%1$s</xliff:g>ના સિવાય બીજો કોઈ ધ્વનિ નહીં"</string>
+    <!-- no translation found for zen_mode_behavior_alarms_only (2423480992071472963) -->
+    <skip />
+    <string name="zen_mode_automation_settings_title" msgid="4228995740594063774">"ઑટોમૅટિક નિયમો"</string>
     <string name="zen_mode_automation_suggestion_title" msgid="5105443455143476201">"ખલેલ પાડશો નહીં નિયમો સેટ કરો"</string>
     <string name="zen_mode_automation_suggestion_summary" msgid="4732808039946935657">"અમુક સમયે ધ્વનિ અને વાઇબ્રેશન મર્યાદિત કરો"</string>
     <string name="zen_mode_option_important_interruptions" msgid="3903928008177972500">"ફક્ત પ્રાધાન્યતા"</string>
     <string name="zen_mode_option_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>
-    <string name="work_notification_ringtone_title" msgid="6081247402404510004">"ડિફૉલ્ટ કાર્ય સૂચના માટે ધ્વનિ"</string>
+    <string name="work_notification_ringtone_title" msgid="6081247402404510004">"કાર્યાલયના નોટિફિકેશન માટે ડિફૉલ્ટ ધ્વનિ"</string>
     <string name="work_alarm_ringtone_title" msgid="1441926676833738891">"ડિફૉલ્ટ કાર્ય એલાર્મ માટે ધ્વનિ"</string>
     <string name="work_sound_same_as_personal" msgid="3123383644475266478">"વ્યક્તિગત પ્રોફાઇલની જેમ જ"</string>
     <string name="work_sync_dialog_title" msgid="7123973297187354813">"ધ્વનિ બદલીએ?"</string>
     <string name="work_sync_dialog_yes" msgid="7243884940551635717">"બદલો"</string>
-    <string name="work_sync_dialog_message" msgid="7841728953710863208">"તમારી વર્તમાન કાર્ય પ્રોફાઇલ માટે વ્યક્તિગત પ્રોફાઇલના ધ્વનિ ઉપયોગમાં લેવાશે"</string>
+    <string name="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="7616737397127242615">"સૂચનાઓ"</string>
+    <string name="configure_notification_settings" msgid="7616737397127242615">"નોટિફિકેશનો"</string>
     <string name="advanced_section_header" msgid="8833934850242546903">"વિગતવાર"</string>
     <string name="profile_section_header" msgid="2320848161066912001">"કાર્યની સૂચનાઓ"</string>
-    <string name="notification_badging_title" msgid="5938709971403474078">"સૂચના બિંદુઓને મંજૂરી આપો"</string>
+    <string name="notification_badging_title" msgid="5938709971403474078">"નોટિફિકેશનના ચિહ્નને મંજૂરી આપો"</string>
     <string name="notification_pulse_title" msgid="1905382958860387030">"લાઇટ ઝબકવી"</string>
     <string name="lock_screen_notifications_title" msgid="6173076173408887213">"લૉક સ્ક્રીન પર"</string>
-    <string name="lock_screen_notifications_summary_show" msgid="6407527697810672847">"તમામ સૂચના સામગ્રી બતાવો"</string>
-    <string name="lock_screen_notifications_summary_hide" msgid="7891552853357258782">"સંવેદનશીલ સૂચના સામગ્રી છુપાવો"</string>
-    <string name="lock_screen_notifications_summary_disable" msgid="859628910427886715">"સૂચનાઓ બિલકુલ દર્શાવશો નહીં"</string>
-    <string name="lock_screen_notifications_interstitial_message" msgid="6164532459432182244">"જ્યારે તમારું ઉપકરણ લૉક કરેલું હોય, ત્યારે તમે સૂચનાઓને કેવી રીતે દર્શાવવામાં આવે તેમ ઇચ્છો છો?"</string>
-    <string name="lock_screen_notifications_interstitial_title" msgid="1416589393106326972">"સૂચનાઓ"</string>
-    <string name="lock_screen_notifications_summary_show_profile" msgid="835870815661120772">"તમામ કાર્ય સૂચના સામગ્રી બતાવો"</string>
-    <string name="lock_screen_notifications_summary_hide_profile" msgid="256116258285695645">"સંવેદનશીલ કાર્ય સૂચના સામગ્રી છુપાવો"</string>
+    <string name="lock_screen_notifications_summary_show" msgid="6407527697810672847">"તમામ નોટિફિકેશન કન્ટેન્ટ બતાવો"</string>
+    <string name="lock_screen_notifications_summary_hide" msgid="7891552853357258782">"સંવેદનશીલ નોટિફિકેશન કન્ટેન્ટ છુપાવો"</string>
+    <string name="lock_screen_notifications_summary_disable" msgid="859628910427886715">"નોટિફિકેશનો બિલકુલ બતાવશો નહીં"</string>
+    <string name="lock_screen_notifications_interstitial_message" msgid="6164532459432182244">"જ્યારે તમારું ઉપકરણ લૉક કરેલું હોય, ત્યારે તમે નોટિફિકેશનો કેવી રીતે બતાવવા માગો છો?"</string>
+    <string name="lock_screen_notifications_interstitial_title" msgid="1416589393106326972">"નોટિફિકેશનો"</string>
+    <string name="lock_screen_notifications_summary_show_profile" msgid="835870815661120772">"કાર્યાલયનું તમામ નોટિફિકેશન કન્ટેન્ટ બતાવો"</string>
+    <string name="lock_screen_notifications_summary_hide_profile" msgid="256116258285695645">"સંવેદનશીલ કાર્ય નોટિફિકેશન કન્ટેન્ટ છુપાવો"</string>
     <string name="lock_screen_notifications_summary_disable_profile" msgid="4080720698960233358">"કાર્ય સૂચનાઓ બિલકુલ બતાવશો નહીં"</string>
-    <string name="lock_screen_notifications_interstitial_message_profile" msgid="8307705621027472346">"જ્યારે તમારું ઉપકરણ લૉક કરેલું હોય, ત્યારે તમે પ્રોફાઇલ સૂચનાઓ કેવી રીતે બતાવવા માગો છો?"</string>
+    <string name="lock_screen_notifications_interstitial_message_profile" msgid="8307705621027472346">"જ્યારે તમારું ઉપકરણ લૉક કરેલું હોય, ત્યારે તમે પ્રોફાઇલ નોટિફિકેશનો કેવી રીતે બતાવવા માગો છો?"</string>
     <string name="lock_screen_notifications_interstitial_title_profile" msgid="3169806586032521333">"પ્રોફાઇલ સૂચનાઓ"</string>
-    <string name="notifications_title" msgid="8086372779371204971">"સૂચનાઓ"</string>
+    <string name="notifications_title" msgid="8086372779371204971">"નોટિફિકેશનો"</string>
     <string name="app_notifications_title" msgid="5810577805218003760">"ઍપ્લિકેશન સૂચનાઓ"</string>
-    <string name="notification_channel_title" msgid="2260666541030178452">"સૂચના શ્રેણી"</string>
+    <string name="notification_channel_title" msgid="2260666541030178452">"નોટિફિકેશન શ્રેણી"</string>
+    <string name="notification_group_title" msgid="7180506440133859601">"નોટિફિકેશનની કૅટેગરીના જૂથો"</string>
     <string name="notification_importance_title" msgid="848692592679312666">"મહત્વ"</string>
-    <string name="notification_importance_unspecified" msgid="2196023702875112081">"ઍપ્લિકેશનને નક્કી કરવા દો"</string>
+    <string name="notification_importance_unspecified" msgid="6622173510486113958">"ધ્વનિની મંજૂરી આપો"</string>
     <string name="notification_importance_blocked" msgid="7938180808339386300">"સૂચનાઓ ક્યારેય બતાવશો નહીં"</string>
     <string name="notification_importance_min" msgid="5455049524984686275">"કોઈ અવાજ અથવા વિઝ્યુઅલ અવરોધ નહીં"</string>
     <string name="notification_importance_low" msgid="8881468429453766553">"કોઈ ધ્વનિ નથી"</string>
     <string name="notification_importance_default" msgid="5958338024601957516">"અવાજ કરો"</string>
     <string name="notification_importance_high" msgid="2082429479238228527">"અવાજ કરો અને સ્ક્રીન પર બતાવો"</string>
+    <string name="notification_importance_high_silent" msgid="2667033773703765252">"સ્ક્રીન પર પૉપ કરો"</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>
@@ -2890,18 +2909,18 @@
     <string name="notification_channel_summary_low" msgid="322317684244981244">"સામાન્ય મહત્ત્વની"</string>
     <string name="notification_channel_summary_default" msgid="1111749130423589931">"ખૂબ જ મહત્ત્વની"</string>
     <string name="notification_channel_summary_high" msgid="2085017556511003283">"તાત્કાલિક મહત્ત્વની"</string>
-    <string name="default_notification_assistant" msgid="7631945224761430146">"સૂચના સહાયક"</string>
-    <string name="manage_notification_access_title" msgid="7510080164564944891">"સૂચના ઍક્સેસ"</string>
-    <string name="work_profile_notification_access_blocked_summary" msgid="8748026238701253040">"કાર્ય પ્રોફાઇલ સૂચનાઓનો ઍક્સેસ અવરોધિત કરવામાં આવ્યો છે"</string>
+    <string name="default_notification_assistant" msgid="7631945224761430146">"નોટિફિકેશન સહાયક"</string>
+    <string name="manage_notification_access_title" msgid="7510080164564944891">"નોટિફિકેશન ઍક્સેસ"</string>
+    <string name="work_profile_notification_access_blocked_summary" msgid="8748026238701253040">"કાર્યાલયની પ્રોફાઇલની સૂચનાઓનો ઍક્સેસ બ્લૉક કરવામાં આવ્યો છે"</string>
     <string name="manage_notification_access_summary_zero" msgid="2409912785614953348">"ઍપ્લિકેશનો સૂચનાઓ વાંચી શકતી નથી"</string>
     <plurals name="manage_notification_access_summary_nonzero" formatted="false" msgid="7930130030691218387">
       <item quantity="one">%d ઍપ્લિકેશનો સૂચનાઓ વાંચી શકે છે</item>
       <item quantity="other">%d ઍપ્લિકેશનો સૂચનાઓ વાંચી શકે છે</item>
     </plurals>
-    <string name="no_notification_listeners" msgid="3487091564454192821">"કોઈ ઇન્સ્ટોલ કરેલ એપ્લિકેશન્સે સૂચના ઍક્સેસની વિનંતી કરી નથી."</string>
-    <string name="notification_listener_security_warning_title" msgid="5522924135145843279">"<xliff:g id="SERVICE">%1$s</xliff:g> માટે સૂચના ઍક્સેસની મંજૂરી આપીએ?"</string>
+    <string name="no_notification_listeners" msgid="3487091564454192821">"કોઈ ઇન્સ્ટોલ કરેલ એપ્લિકેશન્સે નોટિફિકેશન ઍક્સેસની વિનંતી કરી નથી."</string>
+    <string name="notification_listener_security_warning_title" msgid="5522924135145843279">"<xliff:g id="SERVICE">%1$s</xliff:g> માટે નોટિફિકેશન ઍક્સેસની મંજૂરી આપીએ?"</string>
     <string name="notification_listener_security_warning_summary" msgid="119203147791040151">"<xliff:g id="NOTIFICATION_LISTENER_NAME">%1$s</xliff:g>, સંપર્ક નામ અને તમને મળતા સંદેશાની ટેક્સ્ટ જેવી વ્યક્તિગત માહિતી સહિત તમામ સૂચનાઓ વાંચવામાં સમર્થ હશે. તે આ સૂચનાઓને છોડી દેવા અથવા તેમાં રહેલા ક્રિયા બટનોને શરૂ કરવામાં પણ સમર્થ હશે. \n\nઆ ઍપ્લિકેશનને ખલેલ પાડશો નહીંને ચાલુ કે બંધ કરવાની તથા સંબંધિત સેટિંગ્સ બદલવાની ક્ષમતા પણ આપશે."</string>
-    <string name="notification_listener_disable_warning_summary" msgid="6738915379642948000">"જો તમે <xliff:g id="NOTIFICATION_LISTENER_NAME">%1$s</xliff:g> માટે સૂચના ઍક્સેસને બંધ કરો છો, તો ખલેલ પાડશો નહીં ઍક્સેસ પણ બંધ કરવામાં આવી શકે છે."</string>
+    <string name="notification_listener_disable_warning_summary" msgid="6738915379642948000">"જો તમે <xliff:g id="NOTIFICATION_LISTENER_NAME">%1$s</xliff:g> માટે નોટિફિકેશન ઍક્સેસને બંધ કરો છો, તો ખલેલ પાડશો નહીં ઍક્સેસ પણ બંધ કરવામાં આવી શકે છે."</string>
     <string name="notification_listener_disable_warning_confirm" msgid="8333442186428083057">"બંધ કરો"</string>
     <string name="notification_listener_disable_warning_cancel" msgid="8586417377104211584">"રદ કરો"</string>
     <string name="vr_listeners_title" msgid="1318901577754715777">"VR સહાયક સેવાઓ"</string>
@@ -2916,15 +2935,19 @@
     <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>
-    <!-- no translation found for picture_in_picture_app_detail_summary (1264019085827708920) -->
-    <skip />
-    <string name="manage_zen_access_title" msgid="2611116122628520522">"ખલેલ પાડશો નહીં ઍક્સેસ કરો"</string>
+    <string name="picture_in_picture_app_detail_summary" msgid="1264019085827708920">"જ્યારે ઍપ્લિકેશન ખુલ્લી હોય અથવા તમે તેમાંથી બહાર આવી ગયા હો (ઉદાહરણ તરીકે, વીડિઓ જોવાનું ચાલુ રાખવા માટે), ત્યારે આ ઍપ્લિકેશનને ચિત્રમાં-ચિત્ર વિંડો બનાવવાની મંજૂરી આપો. આ વિંડો તમે ઉપયોગ કરતાં હોય તે અન્ય ઍપ્લિકેશનોની સૌથી ઉપર પ્રદર્શિત થાય છે."</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="channel_group_notifications_off_desc" msgid="1620950416247316370">"Android આ નોટિફિકેશનના જૂથોને આ ઉપકરણ પર પ્રદર્શિત થતા બ્લૉક કરી રહ્યું છે"</string>
     <string name="notification_channels" msgid="5346841743182627500">"કૅટેગરીઓ"</string>
     <string name="notification_channels_other" msgid="5645317113885788226">"અન્ય"</string>
+    <plurals name="notification_group_summary" formatted="false" msgid="3420621520561455358">
+      <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="no_channels" msgid="3077375508177744586">"આ ઍપ્લિએક્શને કોઈ સૂચનાઓ પોસ્ટ કરી નથી"</string>
     <string name="app_settings_link" msgid="8894946007543660906">"ઍપ્લિકેશનમાંની વધારાની સેટિંગ્સ"</string>
     <string name="app_notification_listing_summary_zero" msgid="6482582965081108108">"બધી ઍપ્લિકેશનો માટે ચાલુ કરી"</string>
@@ -2938,11 +2961,11 @@
     </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_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>
@@ -3001,12 +3024,14 @@
     <string name="zen_mode_from_starred" msgid="2678345811950997027">"ફક્ત તારાંકિત સંપર્કોના"</string>
     <string name="zen_mode_from_none" msgid="8219706639954614136">"કોઈ નહીં"</string>
     <string name="zen_mode_alarms" msgid="2165302777886552926">"એલાર્મ્સ"</string>
-    <string name="zen_mode_reminders" msgid="5458502056440485730">"સ્મૃતિપત્રો"</string>
+    <!-- no translation found for zen_mode_media_system_other (8900209390529859777) -->
+    <skip />
+    <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="239685342222975733">"જો <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>
@@ -3025,44 +3050,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="suggestion_button_text" msgid="3275010948381252006">"ઓકે"</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_unlock_pin" msgid="8757588350454795286">"અનપિન કરતાં પહેલાં PIN માટે પૂછો"</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="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="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_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_pin" msgid="8299960550048989807">"પિનની જરૂર છે?"</string>
+    <string name="encrypt_talkback_dialog_require_pattern" msgid="1499790256154146639">"પૅટર્ન જરૂરી છે?"</string>
     <string name="encrypt_talkback_dialog_require_password" msgid="8841994614218049215">"પાસવર્ડ આવશ્યક છે?"</string>
     <string name="encrypt_talkback_dialog_message_pin" msgid="7582096542997635316">"જ્યારે તમે આ ઉપકરણને પ્રારંભ કરવા માટે તમારો પિન દાખલ કરો છો, ત્યારે અ‍ૅક્સેસિબિલિટી સેવાઓ જેમ કે <xliff:g id="SERVICE">%1$s</xliff:g>, હજી પણ ઉપલબ્ધ રહેશે નહીં."</string>
-    <string name="encrypt_talkback_dialog_message_pattern" msgid="2020083142199612743">"જ્યારે તમે આ ઉપકરણને પ્રારંભ કરવા માટે તમારી પેટર્ન દાખલ કરો છો, ત્યારે અ‍ૅક્સેસિબિલિટી સેવાઓ જેમ કે <xliff:g id="SERVICE">%1$s</xliff:g>, હજી પણ ઉપલબ્ધ રહેશે નહીં."</string>
+    <string name="encrypt_talkback_dialog_message_pattern" msgid="2020083142199612743">"જ્યારે તમે આ ઉપકરણને પ્રારંભ કરવા માટે તમારી પૅટર્ન દાખલ કરો છો, ત્યારે અ‍ૅક્સેસિબિલિટી સેવાઓ જેમ કે <xliff:g id="SERVICE">%1$s</xliff:g>, હજી પણ ઉપલબ્ધ રહેશે નહીં."</string>
     <string name="encrypt_talkback_dialog_message_password" msgid="4155875981789127796">"જ્યારે તમે આ ઉપકરણને પ્રારંભ કરવા માટે તમારો પાસવર્ડ દાખલ કરો છો, ત્યારે અ‍ૅક્સેસિબિલિટી સેવાઓ જેમ કે <xliff:g id="SERVICE">%1$s</xliff:g>, હજી પણ ઉપલબ્ધ રહેશે નહીં."</string>
     <string name="direct_boot_unaware_dialog_message" msgid="7870273558547549125">"નોંધ: રીબૂટ કર્યાં પછી, જ્યાં સુધી તમે તમારો ફોન અનલૉક કરશો નહીં ત્યાં સુધી આ ઍપ્લિકેશન શરૂ થઈ શકશે નહીં"</string>
     <string name="imei_information_title" msgid="8499085421609752290">"IMEI માહિતી"</string>
@@ -3075,7 +3101,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>
@@ -3087,7 +3113,7 @@
     <string name="notifications_disabled" msgid="334416731283131597">"બધી બંધ કરી"</string>
     <string name="notifications_partly_blocked" msgid="592071133950126656">"<xliff:g id="COUNT_1">%2$d</xliff:g>માંથી <xliff:g id="COUNT_0">%1$d</xliff:g> કૅટેગરી બંધ કરી"</string>
     <string name="notifications_silenced" msgid="4728603513072110381">"શાંત કરી"</string>
-    <string name="notifications_redacted" msgid="4493588975742803160">"સંવેદનશીલ સામગ્રી લોક સ્ક્રીન પર નથી"</string>
+    <string name="notifications_redacted" msgid="4493588975742803160">"સંવેદનશીલ કન્ટેન્ટ લોક સ્ક્રીન પર નથી"</string>
     <string name="notifications_hidden" msgid="3619610536038757468">"લૉક સ્ક્રીન પર નથી"</string>
     <string name="notifications_priority" msgid="1066342037602085552">"ખલેલ પાડશો નહીં ઓવરરાઇડ કર્યું"</string>
     <string name="notifications_summary_divider" msgid="9013807608804041387">" / "</string>
@@ -3153,7 +3179,7 @@
     <string name="default_app" msgid="6864503001385843060">"(ડિફોલ્ટ)"</string>
     <string name="system_app" msgid="9068313769550747372">"(સિસ્ટમ)"</string>
     <string name="system_default_app" msgid="3091113402349739037">"(સિસ્ટમ ડિફોલ્ટ)"</string>
-    <string name="apps_storage" msgid="4353308027210435513">"ઍપ્લિકેશનો સ્ટોરેજ"</string>
+    <string name="apps_storage" msgid="4353308027210435513">"ઍપ સ્ટોરેજ"</string>
     <string name="usage_access" msgid="5479504953931038165">"વપરાશ ઍક્સેસ"</string>
     <string name="permit_usage_access" msgid="4012876269445832300">"વપરાશ અ‍ૅક્સેસની મંજૂરી આપો"</string>
     <string name="app_usage_preference" msgid="7065701732733134991">"ઍપ્લિકેશન વપરાશ પસંદગીઓ"</string>
@@ -3206,28 +3232,29 @@
     <string name="usb_use_charging_only_desc" msgid="3066256793008540627">"બસ આ ઉપકરણને ચાર્જ કરો"</string>
     <string name="usb_use_power_only" msgid="6426550616883919530">"પાવર સપ્લાય"</string>
     <string name="usb_use_power_only_desc" msgid="3461232831015575152">"કનેક્ટ કરેલ ઉપકરણને ચાર્જ કરો. USB ચાર્જિંગનું સમર્થન કરતાં ઉપકરણો સાથે જ કાર્ય કરે છે."</string>
-    <string name="usb_use_file_transfers" msgid="7409600791007250137">"ફાઇલો સ્થાનાંતરિત કરો"</string>
-    <string name="usb_use_file_transfers_desc" msgid="4235764784331804488">"ફાઇલોને બીજા ઉપકરણ પર સ્થાનાંતરિત કરો"</string>
-    <string name="usb_use_photo_transfers" msgid="7794775645350330454">"ફોટા ટ્રાન્સફર કરો (PTP)"</string>
-    <string name="usb_use_photo_transfers_desc" msgid="2963034811151325996">"જો MTP સમર્થિત ન હોય તો ફોટા અથવા ફાઇલો સ્થાનાંતરિત કરો (PTP)"</string>
+    <string name="usb_use_file_transfers" msgid="7409600791007250137">"ફાઇલો ટ્રાન્સફર કરો"</string>
+    <string name="usb_use_file_transfers_desc" msgid="4235764784331804488">"ફાઇલોને બીજા ઉપકરણ પર ટ્રાન્સફર કરો"</string>
+    <string name="usb_use_photo_transfers" msgid="7794775645350330454">"ફોટો ટ્રાન્સફર કરો (PTP)"</string>
+    <string name="usb_use_photo_transfers_desc" msgid="2963034811151325996">"જો MTP સમર્થિત ન હોય તો ફોટો અથવા ફાઇલો ટ્રાન્સફર કરો (PTP)"</string>
     <string name="usb_use_MIDI" msgid="870922185938298263">"MIDI તરીકે ઉપકરણનો ઉપયોગ કરો"</string>
     <string name="usb_use_MIDI_desc" msgid="8473936990076693175">"MIDI તરીકે આ ઉપકરણનો ઉપયોગ કરો"</string>
     <string name="usb_use" msgid="3256040963685055320">"આના માટે USB નો ઉપયોગ કરો"</string>
     <string name="usb_pref" msgid="1400617804525116158">"USB"</string>
     <string name="usb_summary_charging_only" msgid="7544327009143659751">"આ ઉપકરણને ચાર્જ કરવું"</string>
     <string name="usb_summary_power_only" msgid="3629517713817003738">"પાવર પૂરો પાડવો"</string>
-    <string name="usb_summary_file_transfers" msgid="6435943692610175111">"ફાઇલો સ્થાનાંતરિત કરવી"</string>
-    <string name="usb_summary_photo_transfers" msgid="8440204169576585250">"ફોટા સ્થાનાંતરિત કરવા (PTP)"</string>
+    <string name="usb_summary_file_transfers" msgid="6435943692610175111">"ફાઇલો ટ્રાન્સફર કરવી"</string>
+    <string name="usb_summary_photo_transfers" msgid="8440204169576585250">"ફોટો ટ્રાન્સફર કરવા (PTP)"</string>
     <string name="usb_summary_MIDI" msgid="5687906612187885908">"ઉપકરણનો MIDI તરીકે ઉપયોગ કરવો"</string>
-    <string name="background_check_pref" msgid="7550258400138010979">"પૃષ્ઠભૂમિ તપાસ"</string>
-    <string name="background_check_title" msgid="4534254315824525593">"પૂર્ણ પૃષ્ઠભૂમિ ઍક્સેસ"</string>
+    <string name="sms_mirroring_pref" msgid="6475043279147376031">"SMS મિરરિંગ"</string>
+    <string name="background_check_pref" msgid="7550258400138010979">"બૅૅકગ્રાઉન્ડ ચેક"</string>
+    <string name="background_check_title" msgid="4534254315824525593">"પૂર્ણ બૅકગ્રાઉન્ડ ઍક્સેસ"</string>
     <string name="assist_access_context_title" msgid="2269032346698890257">"સ્ક્રીન પરની ટેક્સ્ટનો ઉપયોગ કરો"</string>
     <string name="assist_access_context_summary" msgid="1991421283142279560">"સ્ક્રીન સામગ્રીઓને ટેક્સ્ટ તરીકે ઍક્સેસ કરવા માટે મદદ એપ્લિકેશનને મંજૂરી આપો"</string>
     <string name="assist_access_screenshot_title" msgid="4034721336291215819">"સ્ક્રીનશોટનો ઉપયોગ કરો"</string>
     <string name="assist_access_screenshot_summary" msgid="6761636689013259901">"સ્ક્રીનની છબીને ઍક્સેસ કરવા માટે મદદ એપ્લિકેશનને મંજૂરી આપો"</string>
     <string name="assist_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>
@@ -3251,7 +3278,7 @@
     <string name="no_data_usage" msgid="9131454024293628063">"કોઈ ડેટાનો ઉપયોગ કર્યો નથી"</string>
     <string name="zen_access_warning_dialog_title" msgid="1198189958031157142">"<xliff:g id="APP">%1$s</xliff:g> માટે ખલેલ પાડશો નહીં ઍક્સેસની મંજૂરી આપીએ?"</string>
     <string name="zen_access_warning_dialog_summary" msgid="4015885767653010873">"ઍપ્લિકેશન ખલેલ પાડશો નહીં ચાલુ/બંધ કરી શકશે અને સંબંધિત સેટિંગ્સમાં ફેરફારો કરી શકશે."</string>
-    <string name="zen_access_disabled_package_warning" msgid="302820100078584431">"ચાલુ રહેવું આવશ્યક છે કારણ કે સૂચના ઍક્સેસ ચાલુ છે"</string>
+    <string name="zen_access_disabled_package_warning" msgid="302820100078584431">"ચાલુ રહેવું આવશ્યક છે કારણ કે નોટિફિકેશન ઍક્સેસ ચાલુ છે"</string>
     <string name="zen_access_revoke_warning_dialog_title" msgid="558779234015793950">"<xliff:g id="APP">%1$s</xliff:g> માટે ખલેલ પહોંચાડશો નહિ ની એક્સેસ રદબાતલ કરીએ?"</string>
     <string name="zen_access_revoke_warning_dialog_summary" msgid="5518216907304930148">"આ ઍપ્લિકેશન દ્વારા બનાવાયેલ તમામ ખલેલ પહોંચાડશો નહિ નિયમો દૂર કરવામાં આવશે."</string>
     <string name="ignore_optimizations_on" msgid="6915689518016285116">"ઓપ્ટિમાઇઝ કરશો નહીં"</string>
@@ -3285,7 +3312,7 @@
     <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="permit_write_settings" msgid="658555006453212691">"સિસ્ટમ સેટિંગને સંશોધિત કરવાની મંજૂરી આપો"</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>
@@ -3294,7 +3321,7 @@
     <string name="camera_gesture_desc" msgid="1831390075255870960">"તમારા કાંડાને બે વાર મરડીને કૅમેરા ઍપ્લિકેશન ખોલો"</string>
     <string name="camera_double_tap_power_gesture_title" msgid="1651873760405034645">"કૅમેરા માટે બે વખત પાવર બટન દબાવો"</string>
     <string name="camera_double_tap_power_gesture_desc" msgid="7355664631775680376">"તમારી સ્ક્રીન અનલૉક કર્યાં વગર ઝડપથી કૅમેરો ખોલો"</string>
-    <string name="screen_zoom_title" msgid="5233515303733473927">"પ્રદર્શન કદ"</string>
+    <string name="screen_zoom_title" msgid="5233515303733473927">"ડિસ્પ્લે કદ"</string>
     <string name="screen_zoom_short_summary" msgid="7291960817349834688">"સ્ક્રીન પરની આઇટમ્સને મોટી અથવા નાની કરો"</string>
     <string name="screen_zoom_keywords" msgid="9176477565403352552">"પ્રદર્શન ઘનતા, સ્ક્રીન ઝૂમ, સ્કેલ, સ્કેલિંગ"</string>
     <string name="screen_zoom_summary" msgid="6445488991799015407">"તમારી સ્ક્રીન પરની આઇટમ્સને નાની અથવા મોટી કરો. તમારી સ્ક્રીન પરની કેટલીક ઍપ્લિકેશનો સ્થિતિ બદલી શકે છે."</string>
@@ -3341,26 +3368,26 @@
     <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">"પોર્ટેબલ Wi-Fi હોટસ્પોટ <xliff:g id="ID_1">%1$s</xliff:g> સક્રિય છે, આ ઉપકરણ માટે Wi-Fi બંધ કરેલ છે."</string>
+    <string name="condition_hotspot_title" msgid="7778958849468560027">"હૉટસ્પૉટ ચાલુ છે"</string>
+    <string name="condition_hotspot_summary" msgid="3433182779269409683">"પોર્ટેબલ વાઇ-ફાઇ હૉટસ્પૉટ <xliff:g id="ID_1">%1$s</xliff:g> સક્રિય છે, આ ઉપકરણ માટે વાઇ-ફાઇ બંધ કરેલ છે."</string>
     <string name="condition_airplane_title" msgid="287356299107070503">"એરપ્લેન મોડ ચાલુ છે"</string>
-    <string name="condition_airplane_summary" msgid="5561586417832393666">"Wi-Fi, Bluetooth અને મોબાઇલ નેટવર્ક બંધ કરેલ છે. તમે ફોન કૉલ કે ઇન્ટરનેટ સાથે કનેક્ટ કરી શકતા નથી."</string>
+    <string name="condition_airplane_summary" msgid="5561586417832393666">"વાઇ-ફાઇ, બ્લૂટૂથ અને મોબાઇલ નેટવર્ક બંધ કરેલ છે. તમે ફોન કૉલ કે ઇન્ટરનેટ સાથે કનેક્ટ કરી શકતા નથી."</string>
     <string name="condition_zen_title" msgid="2679168532600816392">"ખલેલ પાડશો નહીં ચાલુ છે (<xliff:g id="ID_1">%1$s</xliff:g>)"</string>
-    <string name="condition_battery_title" msgid="3272131008388575349">"બૅટરી બચતકર્તા ચાલુ છે"</string>
-    <string name="condition_battery_summary" msgid="4418839236027977450">"પ્રદર્શનમાં ઘટાડો થયો છે. સ્થાન સેવાઓ અને પૃષ્ઠભૂમિ ડેટા બંધ કરેલા છે."</string>
+    <string name="condition_battery_title" msgid="3272131008388575349">"બૅટરી સેવર ચાલુ છે"</string>
+    <string name="condition_battery_summary" msgid="4418839236027977450">"પ્રદર્શનમાં ઘટાડો થયો છે. સ્થાન સેવાઓ અને બૅકગ્રાઉન્ડ ડેટા બંધ કરેલા છે."</string>
     <string name="condition_cellular_title" msgid="1327317003797575735">"મોબાઇલ ડેટા બંધ છે"</string>
-    <string name="condition_cellular_summary" msgid="1818046558419658463">"ઇન્ટરનેટ માત્ર Wi-Fi મારફતે ઉપલબ્ધ છે"</string>
+    <string name="condition_cellular_summary" msgid="1818046558419658463">"ઇન્ટરનેટ માત્ર વાઇ-ફાઇ મારફતે ઉપલબ્ધ છે"</string>
     <string name="condition_bg_data_title" msgid="2483860304802846542">"ડેટા સેવર ચાલુ છે"</string>
-    <string name="condition_bg_data_summary" msgid="656957852895282228">"પૃષ્ઠભૂમિ ડેટા માત્ર Wi-Fi મારફતે ઉપલબ્ધ છે. જ્યારે Wi-Fi ઉપલબ્ધ ન હોય ત્યારે આ કેટલીક ઍપ્લિકેશનો અથવા સેવાઓને પ્રભાવિત કરી શકે છે."</string>
-    <string name="condition_work_title" msgid="7293722361184366648">"કાર્ય પ્રોફાઇલ બંધ છે"</string>
-    <string name="condition_work_summary" msgid="7543202177571590378">"તમારી કાર્ય પ્રોફાઇલને સંબંધિત ઍપ્લિકેશનો, પૃષ્ઠભૂમિ સમન્વયન અને અન્ય સુવિધાઓ બંધ છે."</string>
+    <string name="condition_bg_data_summary" msgid="656957852895282228">"બૅકગ્રાઉન્ડ ડેટા માત્ર વાઇ-ફાઇ મારફતે ઉપલબ્ધ છે. જ્યારે વાઇ-ફાઇ ઉપલબ્ધ ન હોય ત્યારે આ થોડી ઍપ્લિકેશનો અથવા સેવાઓને પ્રભાવિત કરી શકે છે."</string>
+    <string name="condition_work_title" msgid="7293722361184366648">"કાર્યાલયની પ્રોફાઇલ બંધ છે"</string>
+    <string name="condition_work_summary" msgid="7543202177571590378">"તમારી કાર્ય પ્રોફાઇલને સંબંધિત ઍપ્લિકેશનો, બૅકગ્રાઉન્ડ સમન્વયન અને અન્ય સુવિધાઓ બંધ છે."</string>
     <string name="night_display_suggestion_title" msgid="6602129097059325291">"રાત્રિ પ્રકાશ માટે શેડ્યૂલ સેટ કરો"</string>
     <string name="night_display_suggestion_summary" msgid="1747638280833631187">"ઊંઘવામાં સહાય માટે સ્ક્રીન અમ્બર રંગછટા બનાવો"</string>
     <string name="condition_night_display_title" msgid="5599814941976856183">"રાત્રિ પ્રકાશ ચાલુ છે"</string>
@@ -3380,24 +3407,27 @@
     <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">"Telephony Monitor ના ફેરફારો લાગુ કરવા, ઉપકરણને રીબૂટ કરો"</string>
+    <string name="connectivity_monitor_switch" msgid="9059759348648583421">"ConnectivityMonitor"</string>
+    <string name="connectivity_monitor_switch_summary" msgid="2828658652378866401">"ConnectivityMonitorને કનેક્ટિવિટીમાં કોઈ સમસ્યા મળશે ત્યારે તે લૉગ એકત્રિત કરશે અને વપરાશકર્તાને ખામીની જાણ કરવાની નોટિફિકેશનનો સંકેત આપશે"</string>
+    <string name="connectivity_monitor_toast" msgid="5551859612881173028">"કનેક્ટિવિટી મોનિટરના ફેરફારો લાગુ કરવા માટે, ઉપકરણને રીબૂટ કરો"</string>
     <string name="camera_hal_hdrplus_switch" msgid="8377365197105267466">"કૅમેરા HAL HDR+"</string>
     <string name="camera_hal_hdrplus_toast" msgid="2063703797270055299">"કૅમેરા HAL HDR+ ફેરફાર લાગુ કરવા માટે, ઉપકરણને રીબૂટ કરો."</string>
+    <string name="camera_laser_sensor_switch" msgid="8913588990743234440">"કૅમેરાનું લેસર સેન્સર"</string>
     <string name="ota_disable_automatic_update" msgid="2319639631655915050">"સ્વચાલિત સિસ્ટમ અપડેટ્સ"</string>
     <string name="usage" msgid="2977875522080448986">"વપરાશ"</string>
     <string name="cellular_data_usage" msgid="2155683719898158203">"મોબાઇલ ડેટા વપરાશ"</string>
-    <string name="wifi_data_usage" msgid="686754111095324306">"Wi-Fi ડેટા વપરાશ"</string>
+    <string name="wifi_data_usage" msgid="686754111095324306">"વાઇ-ફાઇ ડેટા વપરાશ"</string>
     <string name="ethernet_data_usage" msgid="5108764537574354616">"ઇથરનેટ ડેટા વપરાશ"</string>
-    <string name="wifi" msgid="1081550856200013637">"Wi-Fi"</string>
+    <string name="wifi" msgid="1081550856200013637">"વાઇ-ફાઇ"</string>
     <string name="ethernet" msgid="6600095783781389720">"ઇથરનેટ"</string>
     <string name="cell_data_template" msgid="405684854174361041">"<xliff:g id="AMOUNT">^1</xliff:g> મોબાઇલ ડેટા"</string>
-    <string name="wifi_data_template" msgid="6265570748799357386">"<xliff:g id="AMOUNT">^1</xliff:g> Wi-Fi ડેટા"</string>
+    <string name="wifi_data_template" msgid="6265570748799357386">"<xliff:g id="AMOUNT">^1</xliff:g> વાઇ-ફાઇ ડેટા"</string>
     <string name="ethernet_data_template" msgid="5782476509881033590">"<xliff:g id="AMOUNT">^1</xliff:g> ઇથરનેટ ડેટા"</string>
     <string name="cell_warning_only" msgid="763147658209027140">"<xliff:g id="ID_1">%1$s</xliff:g> ડેટા ચેતવણી"</string>
     <string name="cell_warning_and_limit" msgid="2273413629267437470">"<xliff:g id="ID_1">%1$s</xliff:g> ડેટા ચેતવણી / <xliff:g id="ID_2">%2$s</xliff:g> ડેટા મર્યાદા"</string>
     <string name="billing_cycle" msgid="5169909190811133499">"બિલિંગ સાયકલ"</string>
     <string name="billing_cycle_fragment_summary" msgid="8231066353654583106">"દર મહિને <xliff:g id="ID_1">%1$s</xliff:g> તારીખે"</string>
-    <string name="network_restrictions" msgid="8234695294536675380">"નેટવર્ક નિયંત્રણો"</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>
@@ -3408,7 +3438,7 @@
     <string name="data_warning" msgid="209133958008062117">"ડેટા ચેતવણી"</string>
     <string name="set_data_limit" msgid="2901526323210516923">"ડેટા મર્યાદા સેટ કરો"</string>
     <string name="data_limit" msgid="1885406964934590552">"ડેટા મર્યાદા"</string>
-    <string name="data_usage_template" msgid="392191945602400904">"<xliff:g id="ID_1">%1$s</xliff:g> ડેટા <xliff:g id="ID_2">%2$s</xliff:g> ની વચ્ચે ઉપયોગ થયો"</string>
+    <string name="data_usage_template" msgid="2923744765873163859">"<xliff:g id="ID_2">%2$s</xliff:g> ના રોજ <xliff:g id="ID_1">%1$s</xliff:g>નો ઉપયોગ કર્યો"</string>
     <string name="configure" msgid="1029654422228677273">"ગોઠવો"</string>
     <string name="data_usage_other_apps" msgid="3272872663517382050">"વપરાશમાં અન્ય ઍપ્લિકેશનોનો સમાવેશ થાય છે"</string>
     <plurals name="data_saver_unrestricted_summary" formatted="false" msgid="2635267833484232703">
@@ -3417,7 +3447,7 @@
     </plurals>
     <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="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>
@@ -3425,8 +3455,8 @@
     <string name="home_app" msgid="4066188520886810030">"હોમ ઍપ્લિકેશન"</string>
     <string name="no_default_home" msgid="7184117487704520238">"કોઈ ડિફોલ્ટ હોમ નથી"</string>
     <string name="lockpattern_settings_require_cred_before_startup" msgid="3832020101401318248">"સુરક્ષિત પ્રારંભ"</string>
-    <string name="lockpattern_settings_require_pattern_before_startup_summary" msgid="7873036097628404476">"તમારા ઉપકરણને પ્રારંભ કરવા માટે પેટર્ન આવશ્યક. જ્યારે બંધ હોય તે વખતે, આ ઉપકરણ કૉલ્સ, સંદેશા, સૂચનાઓ અથવા એલાર્મ્સ પ્રાપ્ત કરી શકતું નથી."</string>
-    <string name="lockpattern_settings_require_pin_before_startup_summary" msgid="6022831284097476933">"તમારા ઉપકરણને પ્રારંભ કરવા માટે PIN આવશ્યક. જ્યારે બંધ હોય તે વખતે, આ ઉપકરણ કૉલ્સ, સંદેશા, સૂચનાઓ અથવા એલાર્મ્સ પ્રાપ્ત કરી શકતું નથી."</string>
+    <string name="lockpattern_settings_require_pattern_before_startup_summary" msgid="7873036097628404476">"તમારા ઉપકરણને પ્રારંભ કરવા માટે પૅટર્ન આવશ્યક. જ્યારે બંધ હોય તે વખતે, આ ઉપકરણ કૉલ, સંદેશા, સૂચનાઓ અથવા એલાર્મ પ્રાપ્ત કરી શકતું નથી."</string>
+    <string name="lockpattern_settings_require_pin_before_startup_summary" msgid="6022831284097476933">"તમારા ઉપકરણને પ્રારંભ કરવા માટે પિન આવશ્યક. જ્યારે બંધ હોય તે વખતે, આ ઉપકરણ કૉલ, સંદેશા, સૂચનાઓ અથવા એલાર્મ પ્રાપ્ત કરી શકતું નથી."</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>
@@ -3477,15 +3507,15 @@
     <string name="button_confirm_convert_fbe" msgid="7101855374850373091">"સાફ અને રૂપાંતરિત કરો"</string>
     <string name="reset_shortcut_manager_throttling" msgid="6495066467198668994">"ShortcutManager દરને મર્યાદિત કરવાનું ફરીથી સેટ કરો"</string>
     <string name="reset_shortcut_manager_throttling_complete" msgid="1826770872063707900">"ShortcutManager દરને મર્યાદિત કરવાનું ફરીથી સેટ કરવામાં આવ્યું"</string>
-    <string name="notification_suggestion_title" msgid="4506524937307816475">"લૉક સ્ક્રીન સૂચનાઓ નિયંત્રિત કરો"</string>
-    <string name="notification_suggestion_summary" msgid="8521159741445416875">"સૂચના સામગ્રી બતાવો અથવા છુપાવો"</string>
+    <string name="notification_suggestion_title" msgid="387052719462473500">"લૉક સ્ક્રીન પરની માહિતી નિયંત્રિત કરો"</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="8483187649355540109">"સમર્થન અને ટિપ"</string>
     <string name="developer_smallest_width" msgid="7516950434587313360">"સૌથી નાની પહોળાઈ"</string>
     <string name="premium_sms_none" msgid="8268105565738040566">"કોઈ ઇન્સ્ટૉલ કરેલ ઍપ્લિકેશનોએ પ્રીમિયમ SMS ઍક્સેસની વિનંતી કરી નથી"</string>
     <string name="premium_sms_warning" msgid="9086859595338944882">"તમને પ્રીમિયમ SMS નો શુલ્ક લાગી શકે છે અને તમારા કૅરિઅર બિલ્સમાં ઉમેરવામાં આવશે. જો તમે કોઇ ઍપ્લિકેશન માટે પરવાનગી સક્ષમ કરો, તો તમે તે ઍપ્લિકેશનનો ઉપયોગ કરીને પ્રીમિયમ SMS મોકલવા માટે સમર્થ હશો."</string>
     <string name="premium_sms_access" msgid="4660047004791638305">"પ્રીમિયમ SMS ઍક્સેસ"</string>
-    <string name="bluetooth_disabled" msgid="2456198532288640046">"અન્ય ઉપકરણો માટે દૃશ્યક્ષમ નથી"</string>
+    <string name="bluetooth_disabled" msgid="6244000672828617410">"બંધ"</string>
     <string name="bluetooth_connected_summary" msgid="7672528674593152862">"<xliff:g id="ID_1">%1$s</xliff:g> સાથે કનેક્ટ કરેલું છે"</string>
     <string name="bluetooth_connected_multiple_devices_summary" msgid="9173661896296663932">"બહુવિધ ઉપકરણો સાથે કનેક્ટ કરેલું છે"</string>
     <string name="demo_mode" msgid="2798762752209330277">"સિસ્ટમ UI ડેમો મોડ"</string>
@@ -3515,7 +3545,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">
@@ -3527,20 +3557,20 @@
       <item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> મિનિટ</item>
     </plurals>
     <plurals name="seconds" formatted="false" msgid="3876307354560025025">
-      <item quantity="one"><xliff:g id="NUMBER">%s</xliff:g> સેકંડ</item>
-      <item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> સેકંડ</item>
+      <item quantity="one"><xliff:g id="NUMBER">%s</xliff:g> સેકન્ડ</item>
+      <item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> સેકન્ડ</item>
     </plurals>
     <string name="support_estimated_wait_time" msgid="6523081420029378051">"~<xliff:g id="ESTIMATE">%1$s</xliff:g> રાહ જુઓ"</string>
     <string name="bluetooth_talkback_computer" msgid="4875089335641234463">"કમ્પ્યુટર"</string>
-    <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>
     <string name="bluetooth_talkback_input_peripheral" msgid="5165842622743212268">"ઇનપુટ પેરિફેરલ"</string>
-    <string name="bluetooth_talkback_bluetooth" msgid="5615463912185280812">"Bluetooth"</string>
+    <string name="bluetooth_talkback_bluetooth" msgid="5615463912185280812">"બ્લૂટૂથ"</string>
     <string name="automatic_storage_manager_settings" msgid="7819434542155181607">"સ્ટોરેજનું સંચાલન કરો"</string>
-    <string name="automatic_storage_manager_text" msgid="4562950476680600604">"સ્ટોરેજ સ્થાન ખાલી કરવામાં સહાય માટે, સ્ટોરેજ સંંચાલક તમારા ઉપકરણમાંથી બેક અપ લીધેલા ફોટા અને વિડિઓઝને દૂર કરો."</string>
-    <string name="automatic_storage_manager_days_title" msgid="2017913896160914647">"ફોટા અને વિડિઓઝ દૂર કરો"</string>
+    <string name="automatic_storage_manager_text" msgid="4562950476680600604">"સ્ટોરેજ સ્થાન ખાલી કરવામાં સહાય માટે, સ્ટોરેજ સંંચાલક તમારા ઉપકરણમાંથી બેક અપ લીધેલા ફોટો અને વિડિઓઝને દૂર કરો."</string>
+    <string name="automatic_storage_manager_days_title" msgid="2017913896160914647">"ફોટો અને વિડિઓઝ દૂર કરો"</string>
     <string name="automatic_storage_manager_preference_title" msgid="5753702798151073383">"સ્ટોરેજ સંચાલક"</string>
     <string name="deletion_helper_automatic_title" msgid="6605660435498272520">"સ્વચાલિત"</string>
     <string name="deletion_helper_manual_title" msgid="7947432164411214029">"મેન્યુઅલ"</string>
@@ -3571,7 +3601,7 @@
     <string name="ambient_display_pickup_summary" product="tablet" msgid="5435283849947236648">"સમય, સૂચનાના આઇકનો અને અન્ય માહિતી તપાસવા માટે તમારું ટૅબ્લેટ ઉપાડો."</string>
     <string name="ambient_display_pickup_summary" product="device" msgid="8256669101643381568">"સમય, સૂચનાના આઇકનો અને અન્ય માહિતી તપાસવા માટે તમારું ઉપકરણ ઉપાડો."</string>
     <string name="ambient_display_pickup_suggestion_summary" msgid="7014700589991761035">"જ્યારે સ્ક્રીન બંધ હોય, ત્યારે સૂચનાઓ તપાસો"</string>
-    <string name="fingerprint_swipe_for_notifications_title" msgid="5816346492253270243">"સૂચનાઓ માટે સંદર્ભ ફાઇલને સ્વાઇપ કરો"</string>
+    <string name="fingerprint_swipe_for_notifications_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>
@@ -3587,7 +3617,7 @@
     <string name="web_action_enable_title" msgid="4051513950976670853">"ઝટપટ ઍપ્લિકેશનો"</string>
     <string name="web_action_enable_summary" msgid="3108127559723396382">"લિંકને ઍપ્લિકેશનમાં ખોલો, જો તે ઇન્સ્ટૉલ ન કરેલ હોય તો પણ"</string>
     <string name="web_action_section_title" msgid="7364647086538399136">"ઝટપટ ઍપ્લિકેશનો"</string>
-    <string name="instant_apps_account" msgid="1433620209791992528">"ઝટપટ ઍપ્લિકેશનોનું એકાઉન્ટ"</string>
+    <string name="instant_apps_settings" msgid="8827777916518348213">"ઝટપટ ઍપ પસંદગીઓ"</string>
     <string name="domain_url_section_title" msgid="7046835219056428883">"ઇન્સ્ટૉલ કરેલ ઍપ્લિકેશનો"</string>
     <string name="automatic_storage_manager_activation_warning" msgid="6353100011690933254">"તમારું સ્ટોરેજ, હવે સ્ટોરેજ સંચાલક દ્વારા સંચાલિત કરવામાં આવી રહ્યું છે"</string>
     <string name="account_for_section_header" msgid="5356566418548737121">"<xliff:g id="USER_NAME">%1$s</xliff:g> માટેના એકાઉન્ટ"</string>
@@ -3595,7 +3625,7 @@
     <string name="auto_sync_account_title" msgid="898796354710116383">"ડેટાનું આપમેળે સમન્વયન કરો"</string>
     <string name="auto_sync_personal_account_title" msgid="8496263182646100610">"વ્યક્તિગત ડેટાનું આપમેળે સમન્વયન કરો"</string>
     <string name="auto_sync_work_account_title" msgid="4489172450037434152">"કાર્ય ડેટાનું આપમેળે સમન્વયન કરો"</string>
-    <string name="auto_sync_account_summary" msgid="692499211629185107">"ઍપ્લિકેશનોને ડેટા આપમેળે તાજો કરવા દો"</string>
+    <string name="auto_sync_account_summary" msgid="692499211629185107">"ઍપને આપમેળે ડેટાને રિફ્રેશ કરવા દો"</string>
     <string name="account_sync_title" msgid="7214747784136106491">"એકાઉન્ટ સમન્વયન"</string>
     <string name="account_sync_summary_some_on" msgid="3375930757891381175">"<xliff:g id="ID_2">%2$d</xliff:g> માંથી <xliff:g id="ID_1">%1$d</xliff:g> આઇટમ માટે સમન્વયન ચાલુ છે"</string>
     <string name="account_sync_summary_all_on" msgid="570431636622254156">"બધી આઇટમ માટે સમન્વયન ચાલુ છે"</string>
@@ -3634,7 +3664,9 @@
     <string name="enterprise_privacy_always_on_vpn_personal" msgid="9217774730260037434">"તમારી વ્યક્તિગત પ્રોફાઇલમાં હંમેશાં ચાલુ VPN ચાલુ કર્યું"</string>
     <string name="enterprise_privacy_always_on_vpn_work" msgid="7244472958208315814">"તમારી કાર્ય પ્રોફાઇલમાં હંમેશાં ચાલુ VPN ચાલુ કર્યું"</string>
     <string name="enterprise_privacy_global_http_proxy" msgid="7936664553416257333">"વૈશ્વિક HTTP પ્રોક્સી સેટ કરી"</string>
-    <string name="enterprise_privacy_ca_certs" msgid="5885892204903688909">"વિશ્વસનીય ઓળખપત્રો"</string>
+    <string name="enterprise_privacy_ca_certs_device" msgid="2019652712782510262">"વિશ્વસનીય ઓળખપત્રો"</string>
+    <string name="enterprise_privacy_ca_certs_personal" msgid="2279084820904076599">"તમારી વ્યક્તિગત પ્રોફાઇલમાંનાં વિશ્વસનીય ઓળખપત્રો"</string>
+    <string name="enterprise_privacy_ca_certs_work" msgid="6187377647815301809">"તમારા કાર્યાલયની પ્રોફાઇલમાંનાં વિશ્વસનીય ઓળખપત્રો"</string>
     <plurals name="enterprise_privacy_number_ca_certs" formatted="false" msgid="526375234629534165">
       <item quantity="one">ન્યૂનતમ <xliff:g id="COUNT_1">%d</xliff:g> CA પ્રમાણપત્ર</item>
       <item quantity="other">ન્યૂનતમ <xliff:g id="COUNT_1">%d</xliff:g> CA પ્રમાણપત્ર</item>
@@ -3668,7 +3700,7 @@
     </plurals>
     <string name="app_names_concatenation_template_2" msgid="4309216198909946380">"<xliff:g id="FIRST_APP_NAME">%1$s</xliff:g>, <xliff:g id="SECOND_APP_NAME">%2$s</xliff:g>"</string>
     <string name="app_names_concatenation_template_3" msgid="8949045544491604376">"<xliff:g id="FIRST_APP_NAME">%1$s</xliff:g>, <xliff:g id="SECOND_APP_NAME">%2$s</xliff:g>, <xliff:g id="THIRD_APP_NAME">%3$s</xliff:g>"</string>
-    <string name="storage_photos_videos" msgid="319854636702241898">"ફોટા અને વિડિઓ"</string>
+    <string name="storage_photos_videos" msgid="319854636702241898">"ફોટો અને વીડિઓ"</string>
     <string name="storage_music_audio" msgid="789779084825206838">"સંગીત અને ઑડિઓ"</string>
     <string name="storage_games" msgid="7703159201697117621">"રમતો"</string>
     <string name="storage_other_apps" msgid="5524321740031718083">"અન્ય ઍપ્લિકેશનો"</string>
@@ -3693,10 +3725,12 @@
     <string name="storage_manager_indicator_on" msgid="8625551710194584733">"ચાલુ"</string>
     <string name="install_type_instant" msgid="3174425974536078647">"ઝટપટ ઍપ્લિકેશન"</string>
     <string name="automatic_storage_manager_deactivation_warning" msgid="5605210730828410482">"સ્ટોરેજ સંચાલકને બંધ કરીએ?"</string>
-    <string name="storage_movies_tv" msgid="5498394447562086890">"મૂવી અને TV ઍપ્લિકેશનો"</string>
+    <string name="storage_movies_tv" msgid="5498394447562086890">"મૂવી અને ટીવી ઍપ્લિકેશનો"</string>
     <string name="carrier_provisioning" msgid="4398683675591893169">"કૅરિઅર જોગવાઈ માહિતી"</string>
     <string name="trigger_carrier_provisioning" msgid="3434865918009286187">"કૅરિઅર જોગવાઈ ટ્રિગર કરો"</string>
     <string name="new_device_suggestion_title" msgid="698847081680980774">"નવું અને રોમાંચક શું છે?"</string>
-    <string name="new_device_suggestion_summary" msgid="7172709269203435870">"ટોચની 5 સુવિધાઓ તપાસો"</string>
+    <string name="new_device_suggestion_summary" product="default" msgid="206396571522515855">"તમારા નવા ફોનની ઓળખ મેળવો"</string>
+    <string name="new_device_suggestion_summary" product="tablet" msgid="393751455688210956">"તમારા નવા ટેબ્લેટની ઓળખ મેળવો"</string>
+    <string name="new_device_suggestion_summary" product="device" msgid="2939870049868336652">"તમારા નવા ઉપકરણની ઓળખ મેળવો"</string>
     <string name="disabled_low_ram_device" msgid="3751578499721173344">"આ ઉપકરણ પર આ સુવિધા ઉપલબ્ધ નથી"</string>
 </resources>
diff --git a/res/values-hi/arrays.xml b/res/values-hi/arrays.xml
index 8a2f33c..93b3ebe 100644
--- a/res/values-hi/arrays.xml
+++ b/res/values-hi/arrays.xml
@@ -70,7 +70,7 @@
     <item msgid="8934131797783724664">"स्‍कैन कर रहा है…"</item>
     <item msgid="8513729475867537913">"कनेक्ट हो रहा है..."</item>
     <item msgid="515055375277271756">"प्रमाणीकरण कर रहा है…"</item>
-    <item msgid="1943354004029184381">"IP पता प्राप्त कर रहा है…"</item>
+    <item msgid="1943354004029184381">"आईपी पता ले रहा है…"</item>
     <item msgid="4221763391123233270">"कनेक्ट किया गया"</item>
     <item msgid="624838831631122137">"निलंबित"</item>
     <item msgid="7979680559596111948">"डिस्‍कनेक्‍ट हो रहा है..."</item>
@@ -84,7 +84,7 @@
     <item msgid="8878186979715711006">"स्‍कैन कर रहा है…"</item>
     <item msgid="355508996603873860">"<xliff:g id="NETWORK_NAME">%1$s</xliff:g> से कनेक्‍ट कर रहा है…"</item>
     <item msgid="554971459996405634">"<xliff:g id="NETWORK_NAME">%1$s</xliff:g> के साथ प्रमाणीकरण कर रहा है…"</item>
-    <item msgid="7928343808033020343">"<xliff:g id="NETWORK_NAME">%1$s</xliff:g> से IP पता प्राप्त कर रहा है…"</item>
+    <item msgid="7928343808033020343">"<xliff:g id="NETWORK_NAME">%1$s</xliff:g> से आईपी पता ले रहा है..."</item>
     <item msgid="8937994881315223448">"<xliff:g id="NETWORK_NAME">%1$s</xliff:g> से कनेक्‍ट किया गया"</item>
     <item msgid="1330262655415760617">"निलंबित"</item>
     <item msgid="7698638434317271902">"<xliff:g id="NETWORK_NAME">%1$s</xliff:g> से डिस्‍कनेक्‍ट कर रहा है…"</item>
@@ -100,8 +100,6 @@
     <!-- no translation found for wifi_security_no_eap:0 (2084555984818107151) -->
     <!-- no translation found for wifi_security_no_eap:1 (397579322683471524) -->
     <!-- no translation found for wifi_security_no_eap:2 (1968820975358150484) -->
-    <!-- no translation found for wifi_ap_security:0 (5251664683198623324) -->
-    <!-- no translation found for wifi_ap_security:1 (7989073072260294673) -->
   <string-array name="wifi_eap_method">
     <item msgid="1160193392455075561">"PEAP"</item>
     <item msgid="7981731051382306293">"TLS"</item>
@@ -136,7 +134,7 @@
     <item msgid="8151962652413645395">"2 मिनट"</item>
     <item msgid="8675215713017289017">"5 मिनट"</item>
     <item msgid="477015974247590543">"1 घंटा"</item>
-    <item msgid="5198271470953124739">"कभी समयबाह्य नहीं"</item>
+    <item msgid="5198271470953124739">"कभी टाइम आउट नहीं होगा"</item>
   </string-array>
   <string-array name="wifi_signal">
     <item msgid="2245412278046491293">"कमज़ोर"</item>
@@ -230,17 +228,17 @@
     <item msgid="4498124044785815005">"सिस्‍टम को निर्धारित करने दें"</item>
   </string-array>
   <string-array name="app_ops_categories">
-    <item msgid="6358963769537892925">"स्थान"</item>
+    <item msgid="6358963769537892925">"जगह"</item>
     <item msgid="255608127647030286">"व्यक्तिगत"</item>
     <item msgid="4588829735729884491">"संदेश सेवा"</item>
     <item msgid="886742181977884584">"मीडिया"</item>
     <item msgid="7924928667052300589">"डिवाइस"</item>
   </string-array>
   <string-array name="app_ops_summaries">
-    <item msgid="4979188868761515915">"अस्पष्ट स्थान"</item>
-    <item msgid="5789673140227507995">"सटीक स्थान"</item>
+    <item msgid="4979188868761515915">"अस्पष्ट जगह"</item>
+    <item msgid="5789673140227507995">"सटीक जगह"</item>
     <item msgid="1061584358377390581">"GPS"</item>
-    <item msgid="5387405117297558954">"कंपन"</item>
+    <item msgid="5387405117297558954">"कंपन (वाइब्रेशन)"</item>
     <item msgid="3434165993711230924">"संपर्क पढ़ें"</item>
     <item msgid="616161687718081936">"संपर्कों को बदलें"</item>
     <item msgid="7638002295329050091">"कॉल लॉग पढ़ें"</item>
@@ -248,21 +246,21 @@
     <item msgid="446877710771379667">"कैलेंडर पढ़ें"</item>
     <item msgid="7674458294386319722">"कैलेंडर बदलें"</item>
     <item msgid="8281201165558093009">"वाई-फ़ाई स्कैन"</item>
-    <item msgid="8694611243479480497">"नोटिफिकेशन"</item>
+    <item msgid="8694611243479480497">"सूचना"</item>
     <item msgid="7776439107987345446">"सेल स्कैन"</item>
     <item msgid="514615766544675057">"फ़ोन पर कॉल करें"</item>
-    <item msgid="8181415497109310680">"SMS पढ़ें"</item>
-    <item msgid="6816551144382117307">"SMS लिखें"</item>
-    <item msgid="4600463921908905030">"SMS प्राप्त करें"</item>
-    <item msgid="5958926493289432745">"आपातकालीन SMS प्राप्त करें"</item>
-    <item msgid="4945269495221089540">"MMS प्राप्त करें"</item>
+    <item msgid="8181415497109310680">"मैसेज (एसएमएस) पढ़ें"</item>
+    <item msgid="6816551144382117307">"मैसेज (एसएमएस) लिखें"</item>
+    <item msgid="4600463921908905030">"मैसेज (एसएमएस) पाएं"</item>
+    <item msgid="5958926493289432745">"आपातकालीन मैसेज (एसएमएस) पाएं"</item>
+    <item msgid="4945269495221089540">"मल्टीमीडिया मैसेज (एमएमएस) पाएं"</item>
     <item msgid="5570472453573929087">"WAP पुश प्राप्त करें"</item>
-    <item msgid="7125408150230860501">"SMS भेजें"</item>
-    <item msgid="7080337936612188061">"ICC SMS पढ़ें"</item>
-    <item msgid="587124103118495063">"ICC SMS लिखें"</item>
+    <item msgid="7125408150230860501">"मैसेज (एसएमएस) भेजें"</item>
+    <item msgid="7080337936612188061">"ICC मैसेज (एसएमएस) पढ़ें"</item>
+    <item msgid="587124103118495063">"ICC मैसेज (एसएमएस) लिखें"</item>
     <item msgid="2320577158869025503">"सेटिंग बदलें"</item>
     <item msgid="1545733463471924009">"ऊपर बनाएं"</item>
-    <item msgid="3609046903962454582">"नोटिफिकेशन को एक्सेस करें"</item>
+    <item msgid="3609046903962454582">"सूचना पाएं"</item>
     <item msgid="4671646036128214513">"कैमरा"</item>
     <item msgid="1097324338692486211">"ऑडियो रिकॉर्ड करें"</item>
     <item msgid="5031552983987798163">"ऑडियो चलाएं"</item>
@@ -275,11 +273,11 @@
     <item msgid="4270236897655923007">"रिंग आवाज़"</item>
     <item msgid="6325739889222559394">"मीडिया वॉल्‍यूम"</item>
     <item msgid="5762123934816216821">"अलार्म वॉल्‍यूम"</item>
-    <item msgid="785049718065337473">"नोटिफिकेशन वॉल्‍यूम"</item>
+    <item msgid="785049718065337473">"सूचना की आवाज़"</item>
     <item msgid="6700305533746877052">"bluetooth आवाज़"</item>
     <item msgid="2029227495214047094">"सचेत रखें"</item>
-    <item msgid="26109888160231211">"मॉनिटर का स्थान"</item>
-    <item msgid="5753382310468855812">"उच्च पावर वाले स्थान की निगरानी करें"</item>
+    <item msgid="26109888160231211">"जगह की निगरानी करें"</item>
+    <item msgid="5753382310468855812">"उच्च पावर वाली जगह की निगरानी करें"</item>
     <item msgid="3356591542543137332">"उपयोग के आंकड़े प्राप्त करें"</item>
     <item msgid="3073734345226842233">"माइक्रोफ़ोन म्यूट/अनम्यूट करें"</item>
     <item msgid="2111767435887685265">"टोस्ट दिखाएं"</item>
@@ -291,45 +289,45 @@
     <item msgid="8582699692765917557">"फ़ोन स्‍थिति पढ़ें"</item>
     <item msgid="1474039653814954902">"वॉइसमेल जोड़ें"</item>
     <item msgid="7222837656938871633">"सिप का उपयोग करें"</item>
-    <item msgid="6108267038969274380">"आउटगोइंग कॉल संसाधित करें"</item>
+    <item msgid="6108267038969274380">"कॉल करें"</item>
     <item msgid="4823402479973873358">"फ़िंगरप्रिंट"</item>
     <item msgid="5895843015407713543">"शरीर संवेदक"</item>
-    <item msgid="1436446526955010826">"सेल प्रसारण पढ़ें"</item>
-    <item msgid="884172201575690484">"कृत्रिम स्थान"</item>
+    <item msgid="1436446526955010826">"सेल ब्रॉडकास्ट (CBC) पढ़ें"</item>
+    <item msgid="884172201575690484">"नकली जगह"</item>
     <item msgid="3591971310048485247">"मेमोरी पढ़ें"</item>
     <item msgid="4041187808621866119">"मेमोरी लिखें"</item>
     <item msgid="6628873315024166197">"स्क्रीन चालू करें"</item>
     <item msgid="3253368931113490863">"खाते प्राप्त करें"</item>
     <item msgid="780392378084812901">"पृष्ठभूमि में चलाएं"</item>
-    <item msgid="2629748510881309577">"एक्सेस-योग्यता वॉल्यूम"</item>
+    <item msgid="2629748510881309577">"सुलभता सुविधाओं के लिए वॉल्यूम"</item>
   </string-array>
   <string-array name="app_ops_labels">
-    <item msgid="6602854600289714121">"स्थान"</item>
-    <item msgid="8677040780775113033">"स्थान"</item>
-    <item msgid="1660743989948992916">"स्थान"</item>
-    <item msgid="8791172739860195290">"कंपन"</item>
+    <item msgid="6602854600289714121">"जगह"</item>
+    <item msgid="8677040780775113033">"जगह"</item>
+    <item msgid="1660743989948992916">"जगह"</item>
+    <item msgid="8791172739860195290">"कंपन (वाइब्रेशन)"</item>
     <item msgid="383413555642128046">"संपर्क पढ़ें"</item>
     <item msgid="3654594895269697313">"संपर्कों को बदलें"</item>
     <item msgid="7928393476362362538">"कॉल लॉग पढ़ें"</item>
     <item msgid="6248591205254641116">"कॉल लॉग बदलें"</item>
     <item msgid="6093344633066170692">"कैलेंडर पढ़ें"</item>
     <item msgid="1334886368750347692">"कैलेंडर बदलें"</item>
-    <item msgid="1638204101698708656">"स्थान"</item>
-    <item msgid="2154671955760380322">"नोटिफिकेशन पोस्ट करें"</item>
-    <item msgid="4282477730595931828">"स्थान"</item>
+    <item msgid="1638204101698708656">"जगह"</item>
+    <item msgid="2154671955760380322">"सूचना पोस्ट करें"</item>
+    <item msgid="4282477730595931828">"जगह"</item>
     <item msgid="4891423912898525905">"फ़ोन पर कॉल करें"</item>
-    <item msgid="2623604824935968113">"SMS/MMS पढ़ें"</item>
-    <item msgid="4420177125221176306">"SMS/MMS लिखें"</item>
-    <item msgid="3986142739951490025">"SMS/MMS प्राप्त करें"</item>
-    <item msgid="3984213795861739778">"SMS/MMS प्राप्त करें"</item>
-    <item msgid="3656243523752472788">"SMS/MMS प्राप्त करें"</item>
-    <item msgid="8105802370238551510">"SMS/MMS प्राप्त करें"</item>
-    <item msgid="1407766984645388488">"SMS/MMS भेजें"</item>
-    <item msgid="3527273606643794973">"SMS/MMS पढ़ें"</item>
-    <item msgid="4370895547001583812">"SMS/MMS लिखें"</item>
+    <item msgid="2623604824935968113">"मैसेज (एसएमएस)/मल्टीमीडिया मैसेज (एमएमएस) पढ़ें"</item>
+    <item msgid="4420177125221176306">"मैसेज (एसएमएस)/मल्टीमीडिया मैसेज (एमएमएस) लिखें"</item>
+    <item msgid="3986142739951490025">"मैसेज (एसएमएस)/मल्टीमीडिया मैसेज (एमएमएस) पाएं"</item>
+    <item msgid="3984213795861739778">"मैसेज (एसएमएस)/मल्टीमीडिया मैसेज (एमएमएस) पाएं"</item>
+    <item msgid="3656243523752472788">"मैसेज (एसएमएस)/मल्टीमीडिया मैसेज (एमएमएस) पाएं"</item>
+    <item msgid="8105802370238551510">"मैसेज (एसएमएस)/मल्टीमीडिया मैसेज (एमएमएस) पाएं"</item>
+    <item msgid="1407766984645388488">"मैसेज (एसएमएस)/मल्टीमीडिया मैसेज (एमएमएस) भेजें"</item>
+    <item msgid="3527273606643794973">"मैसेज (एसएमएस)/मल्टीमीडिया मैसेज (एमएमएस) पढ़ें"</item>
+    <item msgid="4370895547001583812">"मैसेज (एसएमएस)/मल्टीमीडिया मैसेज (एमएमएस) लिखें"</item>
     <item msgid="4218544235221631789">"सेटिंग बदलें"</item>
     <item msgid="736541391767350377">"ऊपर बनाएं"</item>
-    <item msgid="5530815681721654194">"नोटिफिकेशन को एक्सेस करें"</item>
+    <item msgid="5530815681721654194">"सूचना पाएं"</item>
     <item msgid="781213371706962767">"कैमरा"</item>
     <item msgid="1720492593061838172">"ऑडियो रिकॉर्ड करें"</item>
     <item msgid="3493046322001257041">"ऑडियो चलाएं"</item>
@@ -342,11 +340,11 @@
     <item msgid="7983336752371254444">"रिंग आवाज़"</item>
     <item msgid="7878027809189330917">"मीडिया वॉल्‍यूम"</item>
     <item msgid="7260546305036218513">"अलार्म वॉल्‍यूम"</item>
-    <item msgid="9103719301075748925">"नोटिफिकेशन वॉल्‍यूम"</item>
+    <item msgid="9103719301075748925">"सूचना की आवाज़"</item>
     <item msgid="7025966722295861512">"ब्लूटूथ वॉल्‍यूम"</item>
     <item msgid="4665183401128289653">"सचेत रखें"</item>
-    <item msgid="8584357129746649222">"स्थान"</item>
-    <item msgid="7669257279311110599">"स्थान"</item>
+    <item msgid="8584357129746649222">"जगह"</item>
+    <item msgid="7669257279311110599">"जगह"</item>
     <item msgid="3459320345690097795">"उपयोग के आंकड़े प्राप्त करें"</item>
     <item msgid="1312534577834048535">"माइक्रोफ़ोन म्यूट/अनम्यूट करें"</item>
     <item msgid="427580389823724225">"टोस्ट दिखाएं"</item>
@@ -358,17 +356,17 @@
     <item msgid="8571369610363539266">"फ़ोन स्‍थिति पढ़ें"</item>
     <item msgid="4542463358215230845">"वॉइसमेल जोड़ें"</item>
     <item msgid="864565065016166003">"सिप का उपयोग करें"</item>
-    <item msgid="1958009349883195116">"आउटगोइंग कॉल संसाधित करें"</item>
+    <item msgid="1958009349883195116">"कॉल करें"</item>
     <item msgid="8526563410140613458">"फ़िंगरप्रिंट"</item>
     <item msgid="7864822459293570891">"शरीर संवेदक"</item>
-    <item msgid="6798698496904810960">"सेल प्रसारण पढ़ें"</item>
-    <item msgid="5242052845700875820">"कृत्रिम स्थान"</item>
+    <item msgid="6798698496904810960">"सेल ब्रॉडकास्ट (CBC) पढ़ें"</item>
+    <item msgid="5242052845700875820">"नकली जगह"</item>
     <item msgid="1246296877820358565">"मेमोरी पढ़ें"</item>
     <item msgid="2404067308793740341">"मेमोरी लिखें"</item>
     <item msgid="5832543806893763620">"स्क्रीन चालू करें"</item>
     <item msgid="5258373962467495905">"खाते प्राप्त करें"</item>
     <item msgid="334625385979270703">"पृष्ठभूमि में चलाएं"</item>
-    <item msgid="9039213578110332702">"एक्सेस-योग्यता वॉल्यूम"</item>
+    <item msgid="9039213578110332702">"सुलभता सुविधाओं के लिए वॉल्यूम"</item>
   </string-array>
   <string-array name="long_press_timeout_selector_titles">
     <item msgid="3511504869290423954">"कम"</item>
@@ -428,7 +426,7 @@
     <item msgid="6692305604213080515">"आरंभ हो रहा है..."</item>
     <item msgid="8001704909356800092">"कनेक्ट हो रहा है..."</item>
     <item msgid="4039737283841672166">"कनेक्ट किया गया"</item>
-    <item msgid="4042143101664725090">"समयबाह्य"</item>
+    <item msgid="4042143101664725090">"कोई काम खत्म होने से पहले का समय अंतर (टाइम आउट)"</item>
     <item msgid="7664124146786465092">"विफल"</item>
   </string-array>
   <string-array name="security_settings_premium_sms_values">
diff --git a/res/values-hi/strings.xml b/res/values-hi/strings.xml
index eb5aa0b..7504796 100644
--- a/res/values-hi/strings.xml
+++ b/res/values-hi/strings.xml
@@ -30,14 +30,14 @@
     </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="dev_settings_disabled_warning" msgid="4909448907673974370">"कृपया पहले डेवलपर के लिए सेटिंग और टूल चालू करें."</string>
     <string name="header_category_wireless_networks" msgid="5110914332313954940">"वायरलेस और नेटवर्क"</string>
     <string name="header_category_connections" msgid="6471513040815680662">"कनेक्शन"</string>
     <string name="header_category_device" msgid="4544026001618307754">"डिवाइस"</string>
     <string name="header_category_personal" msgid="3310195187905720823">"व्यक्तिगत"</string>
     <string name="header_category_access" msgid="7580499097416970962">"एक्सेस करें"</string>
     <string name="header_category_system" msgid="2816866961183068977">"सिस्‍टम"</string>
-    <string name="radio_info_data_connection_enable" msgid="8656750679353982712">"डेटा कनेक्शन सक्षम करें"</string>
+    <string name="radio_info_data_connection_enable" msgid="8656750679353982712">"डेटा कनेक्शन चालू करें"</string>
     <string name="radio_info_data_connection_disable" msgid="8541302390883231216">"डेटा कनेक्शन अक्षम करें"</string>
     <string name="volte_provisioned_switch_string" msgid="7979882929810283786">"VoLTE प्रावधान किया गया"</string>
     <string name="vt_provisioned_switch_string" msgid="7876998291744854759">"वीडियो कॉल का प्रावधान किया गया"</string>
@@ -78,8 +78,8 @@
     <string name="sdcard_unmount" product="default" msgid="3364184561355611897">"SD कार्ड अनमाउंट करें"</string>
     <string name="sdcard_format" product="nosdcard" msgid="6285310523155166716">"USB मेमोरी मिटाएं"</string>
     <string name="sdcard_format" product="default" msgid="6713185532039187532">"SD कार्ड मिटाएं"</string>
-    <string name="preview_pager_content_description" msgid="8926235999291761243">"पूर्वावलोकन"</string>
-    <string name="preview_page_indicator_content_description" msgid="4821343428913401264">"पूर्वावलोकन, पेज <xliff:g id="NUM_PAGES">%2$d</xliff:g> में से <xliff:g id="CURRENT_PAGE">%1$d</xliff:g>"</string>
+    <string name="preview_pager_content_description" msgid="8926235999291761243">"झलक"</string>
+    <string name="preview_page_indicator_content_description" msgid="4821343428913401264">"पेज <xliff:g id="NUM_PAGES">%2$d</xliff:g> में से <xliff:g id="CURRENT_PAGE">%1$d</xliff:g> की झलक"</string>
     <string name="font_size_summary" msgid="1690992332887488183">"स्क्रीन पर स्थित लेख को छोटा या बड़ा करें."</string>
     <string name="font_size_make_smaller_desc" msgid="7919995133365371569">"छोटा करें"</string>
     <string name="font_size_make_larger_desc" msgid="4316986572233686061">"बड़ा करें"</string>
@@ -97,7 +97,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>
@@ -114,7 +114,7 @@
     <string name="bluetooth_disconnect_all_profiles" product="device" msgid="3995834526315103965">"आपका डिवाइस <xliff:g id="DEVICE_NAME">%1$s</xliff:g> से डिसकनेक्ट हो जाएगा."</string>
     <string name="bluetooth_disconnect_dialog_ok" msgid="3308586619539119106">"डिसकनेक्ट करें"</string>
     <string name="bluetooth_empty_list_user_restricted" msgid="603521233563983689">"आपको ब्लूटूथ सेटिंग में बदलाव करने की अनुमति नहीं है."</string>
-    <string name="bluetooth_pairing_pref_title" msgid="7429413067477968637">"नया डिवाइस युग्मित करें"</string>
+    <string name="bluetooth_pairing_pref_title" msgid="7429413067477968637">"नए डिवाइस जोड़ें"</string>
     <string name="bluetooth_is_visible_message" msgid="6222396240776971862">"ब्लूटूथ सेटिंग खुली होने पर <xliff:g id="DEVICE_NAME">%1$s</xliff:g> आस-पास के डिवाइसों को दिखाई देता है."</string>
     <string name="bluetooth_footer_mac_message" product="default" msgid="1109366350000220283">"फ़ोन का ब्लूटूथ पता: <xliff:g id="BLUETOOTH_MAC_ADDRESS">%1$s</xliff:g>"</string>
     <string name="bluetooth_footer_mac_message" product="tablet" msgid="6807634484499166486">"टैबलेट का ब्लूटूथ पता: <xliff:g id="BLUETOOTH_MAC_ADDRESS">%1$s</xliff:g>"</string>
@@ -127,10 +127,10 @@
     <string name="bluetooth_device" msgid="5291950341750186887">"अनामित ब्लूटूथ डिवाइस"</string>
     <string name="progress_scanning" msgid="192587958424295789">"खोजना"</string>
     <string name="bluetooth_no_devices_found" msgid="1085232930277181436">"आस-पास कोई ब्लूटूथ डिवाइस नहीं मिला."</string>
-    <string name="bluetooth_notif_ticker" msgid="4726721390078512173">"ब्लूटूथ युग्‍मन अनुरोध"</string>
-    <string name="bluetooth_notif_title" msgid="2485175521845371514">"युग्‍मन अनुरोध"</string>
+    <string name="bluetooth_notif_ticker" msgid="4726721390078512173">"ब्लूटूथ से जोड़ने का अनुरोध किया गया है"</string>
+    <string name="bluetooth_notif_title" msgid="2485175521845371514">"दूसरे डिवाइस से जोड़ने का अनुरोध किया गया है"</string>
     <string name="bluetooth_notif_message" msgid="5057417127600942904">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> से युग्मित करने के लिए टैप करें."</string>
-    <string name="bluetooth_show_received_files" msgid="3144149432555230410">"मिली फ़ाइलें"</string>
+    <string name="bluetooth_show_received_files" msgid="3144149432555230410">"मिलने वाली फ़ाइलें"</string>
     <string name="device_picker" msgid="4978696506172252813">"ब्लूटूथ डिवाइस चुनें"</string>
     <string name="bluetooth_ask_enablement" msgid="3387222809404177525">"<xliff:g id="APP_NAME">%1$s</xliff:g> ब्लूटूथ को चालू करना चाहता है"</string>
     <string name="bluetooth_ask_disablement" msgid="5890386255790160573">"<xliff:g id="APP_NAME">%1$s</xliff:g> ब्लूटूथ को बंद करना चाहता है"</string>
@@ -158,24 +158,24 @@
     <string name="bluetooth_connection_permission_request" msgid="4747918249032890077">"ब्लूटूथ कनेक्शन अनुरोध"</string>
     <string name="bluetooth_connection_notif_message" msgid="3603316575471431846">"\"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>\" से कनेक्ट करने के लिए टैप करें."</string>
     <string name="bluetooth_connection_dialog_text" msgid="8455427559949998023">"क्या आप \"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>\" से कनेक्ट करना चाहते हैं?"</string>
-    <string name="bluetooth_phonebook_request" msgid="3951420080540915279">"फ़ोन बुक एक्सेस अनुरोध"</string>
-    <string name="bluetooth_pb_acceptance_dialog_text" msgid="8930347091018455505">"<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g> आपके संपर्क और कॉल इतिहास एक्सेस करना चाहता है. <xliff:g id="DEVICE_NAME_1">%2$s</xliff:g> को एक्सेस दें?"</string>
+    <string name="bluetooth_phonebook_request" msgid="3951420080540915279">"फ़ोन बुक का इस्तेमाल करने का अनुरोध"</string>
+    <string name="bluetooth_pb_acceptance_dialog_text" msgid="8930347091018455505">"<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g> आपके संपर्क और कॉल इतिहास तक पहुंचना चाहता है. <xliff:g id="DEVICE_NAME_1">%2$s</xliff:g> को पहुंचने दें?"</string>
     <string name="bluetooth_remember_choice" msgid="6919682671787049800">"फिर से न पूछें"</string>
     <string name="bluetooth_pb_remember_choice" msgid="3622898084442402071">"फिर से न पूछें"</string>
-    <string name="bluetooth_map_request" msgid="4595727689513143902">"संदेश एक्सेस अनुरोध"</string>
-    <string name="bluetooth_map_acceptance_dialog_text" msgid="8712508202081143737">"%1$s आपके संदेशों को एक्सेस करना चाहता है. %2$s पर एक्सेस दें?"</string>
-    <string name="bluetooth_sap_request" msgid="2669762224045354417">"SIM ऐक्सेस के लिए अनुरोध"</string>
+    <string name="bluetooth_map_request" msgid="4595727689513143902">"मैसेज तक पहुंच पाने का अनुरोध किया गया"</string>
+    <string name="bluetooth_map_acceptance_dialog_text" msgid="8712508202081143737">"%1$s आपके मैसेज तक पहुंचना चाहता है. %2$s को पहुंचने दें?"</string>
+    <string name="bluetooth_sap_request" msgid="2669762224045354417">"सिम का इस्तेमाल करने के लिए अनुरोध"</string>
     <string name="bluetooth_sap_acceptance_dialog_text" msgid="4414253873553608690">"<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g> आपके SIM कार्ड को ऐक्सेस करना चाहता है. SIM कार्ड की ऐक्सेस देने से कनेक्शन की अवधि तक आपके डिवाइस पर डेटा कनेक्टिविटी अक्षम हो जाएगी. <xliff:g id="DEVICE_NAME_1">%2$s?</xliff:g> को ऐक्सेस दें"</string>
-    <string name="bluetooth_device_name_summary" msgid="4757990010751789977">"दूसरे डिवाइस को \'<xliff:g id="DEVICE_NAME">^1</xliff:g>\' के रूप में दिखाई देता है"</string>
+    <string name="bluetooth_device_name_summary" msgid="522235742194965734">"दूसरे डिवाइस को \'<xliff:g id="DEVICE_NAME">^1</xliff:g>\' के रूप में दिखाई देता है"</string>
     <string name="bluetooth_paired_device_title" msgid="8638994696317952019">"आपके डिवाइस"</string>
-    <string name="bluetooth_pairing_page_title" msgid="7712127387361962608">"नया डिवाइस युग्मित करें"</string>
-    <string name="date_and_time" msgid="9062980487860757694">"दिनांक और समय"</string>
+    <string name="bluetooth_pairing_page_title" msgid="7712127387361962608">"नया डिवाइस जोड़ें"</string>
+    <string name="date_and_time" msgid="9062980487860757694">"तारीख और समय"</string>
     <string name="choose_timezone" msgid="1362834506479536274">"समय क्षेत्र चुनें"</string>
     <!-- no translation found for intent_sender_data_label (6332324780477289261) -->
     <skip />
     <string name="intent_sender_sendbroadcast_text" msgid="1415735148895872715">"<xliff:g id="BROADCAST">broadcast</xliff:g> भेजें"</string>
     <string name="intent_sender_action_label" msgid="616458370005452389">"<xliff:g id="ACTION">Action</xliff:g>:"</string>
-    <string name="intent_sender_startactivity_text" msgid="5080516029580421895">"<xliff:g id="ACTIVITY">activity</xliff:g> प्रारंभ करें"</string>
+    <string name="intent_sender_startactivity_text" msgid="5080516029580421895">"<xliff:g id="ACTIVITY">activity</xliff:g> शुरू करें"</string>
     <string name="intent_sender_resource_label" msgid="6963659726895482829">"<xliff:g id="RESOURCE">Resource</xliff:g>:"</string>
     <string name="intent_sender_account_label" msgid="465210404475603404">"खाता:"</string>
     <string name="proxy_settings_title" msgid="9049437837600320881">"प्रॉक्सी"</string>
@@ -183,22 +183,22 @@
     <string name="proxy_port_label" msgid="5655276502233453400">"प्रॉक्सी पोर्ट"</string>
     <string name="proxy_exclusionlist_label" msgid="7700491504623418701">"इसके लिए प्रॉक्‍सी का उपयोग न करें"</string>
     <string name="proxy_defaultView_text" msgid="6387985519141433291">"डिफ़ॉल्ट पुनर्स्थापित करें"</string>
-    <string name="proxy_action_text" msgid="2957063145357903951">"पूर्ण"</string>
+    <string name="proxy_action_text" msgid="2957063145357903951">"हो गया"</string>
     <string name="proxy_hostname_label" msgid="8490171412999373362">"प्रॉक्सी होस्‍टनाम"</string>
     <string name="proxy_error" msgid="8926675299638611451">"ध्यान दें"</string>
     <string name="proxy_error_dismiss" msgid="4993171795485460060">"ठीक है"</string>
     <string name="proxy_error_invalid_host" msgid="6865850167802455230">"आपके द्वारा लिखा गया होस्‍टनाम मान्‍य नहीं है."</string>
-    <string name="proxy_error_invalid_exclusion_list" msgid="678527645450894773">"आपके द्वारा लिखी गई बहिष्करण सूची ठीक से प्रारूपित नहीं है. बहिष्‍कृत डोमेन की अल्‍पविराम द्वारा पृथक सूची लिखें."</string>
+    <string name="proxy_error_invalid_exclusion_list" msgid="678527645450894773">"अलग किये गए डोमेन (वो डोमेन जिन्हें सर्च में शामिल नहीं किया जाएगा) की जो सूची आपने टाइप की है वो सही फ़ॉर्मेट में नहीं है. डोमेन की बीच में कॉमा लगाकर बनाई गई सूची टाइप करें।"</string>
     <string name="proxy_error_empty_port" msgid="5539106187558215246">"आपको पोर्ट फ़ील्‍ड पूर्ण करना होगा."</string>
     <string name="proxy_error_empty_host_set_port" msgid="2451694104858226781">"यदि होस्‍ट फ़ील्‍ड खाली है तो पोर्ट फ़ील्‍ड को खाली होना ही चाहिए."</string>
     <string name="proxy_error_invalid_port" msgid="5988270202074492710">"आपके द्वारा लिखा गया पोर्ट मान्‍य नहीं है."</string>
     <string name="proxy_warning_limited_support" msgid="7229337138062837422">"HTTP प्रॉक्सी का उपयोग ब्राउज़र द्वारा किया जाता है लेकिन अन्य ऐप्स द्वारा उपयोग नहीं किया जा सकता."</string>
-    <string name="proxy_url_title" msgid="7185282894936042359">"PAC URL: "</string>
-    <string name="radio_info_signal_location_label" msgid="3242990404410530456">"सेल स्थान की जानकारी (बहिष्कृत):"</string>
+    <string name="proxy_url_title" msgid="7185282894936042359">"PAC यूआरएल: "</string>
+    <string name="radio_info_signal_location_label" msgid="3242990404410530456">"मोबाइल की जगह की जानकारी (रोकी गयी है):"</string>
     <string name="radio_info_neighboring_location_label" msgid="5766020323342985397">"आस-पास के सेल की जानकारी (बहिष्कृत):"</string>
     <string name="radio_info_cell_info_refresh_rate" msgid="7062777594049622128">"सेल जानकारी रीफ्रेश दर:"</string>
     <string name="radio_info_cellinfo_label" msgid="6213223844927623098">"सेल माप की सभी जानकारी:"</string>
-    <string name="radio_info_dcrtinfo_label" msgid="4062076024399431876">"डेटा कनेक्शन की रीयल-टाइम जानकारी:"</string>
+    <string name="radio_info_dcrtinfo_label" msgid="4062076024399431876">"डेटा कनेक्शन की मौजूदा जानकारी:"</string>
     <string name="radio_info_gprs_service_label" msgid="4209624131644060517">"डेटा सेवा:"</string>
     <string name="radio_info_roaming_label" msgid="6141505430275138647">"रोमिंग:"</string>
     <string name="radio_info_imei_label" msgid="1220524224732944192">"IMEI:"</string>
@@ -221,17 +221,17 @@
     <string name="radio_info_http_client_test" msgid="2382286093023138339">"HTTP क्लाइंट परीक्षण:"</string>
     <string name="ping_test_label" msgid="579228584343892613">"पिंग परीक्षण चलाएं"</string>
     <string name="radio_info_smsc_label" msgid="6399460520126501354">"SMSC:"</string>
-    <string name="radio_info_smsc_update_label" msgid="7258686760358791539">"नई जानकारी"</string>
+    <string name="radio_info_smsc_update_label" msgid="7258686760358791539">"अपडेट करें"</string>
     <string name="radio_info_smsc_refresh_label" msgid="6902302130315125102">"रीफ़्रेश करें"</string>
-    <string name="radio_info_toggle_dns_check_label" msgid="6625185764803245075">"DNS जांच टॉगल करें"</string>
-    <string name="oem_radio_info_label" msgid="6163141792477958941">"OEM-विशिष्ट जानकारी/सेटिंग"</string>
+    <string name="radio_info_toggle_dns_check_label" msgid="6625185764803245075">"DNS जाँच टॉगल करें"</string>
+    <string name="oem_radio_info_label" msgid="6163141792477958941">"OEM-खास जानकारी/सेटिंग"</string>
     <string name="band_mode_title" msgid="4071411679019296568">"रेडियो बैंड मोड सेट करें"</string>
     <string name="band_mode_loading" msgid="3555063585133586152">"बैंड सूची लोड कर रहा है..."</string>
     <string name="band_mode_set" msgid="5730560180249458484">"सेट करें"</string>
     <string name="band_mode_failed" msgid="1495968863884716379">"असफल"</string>
     <string name="band_mode_succeeded" msgid="2701016190055887575">"सफल"</string>
     <string name="sdcard_changes_instructions" msgid="4482324130377280131">"USB केबल पुन: कनेक्‍ट किए जाने पर परिवर्तन लागू हो जाते हैं."</string>
-    <string name="sdcard_settings_screen_mass_storage_text" msgid="3741220147296482474">"USB विशाल मेमोरी सक्षम करें"</string>
+    <string name="sdcard_settings_screen_mass_storage_text" msgid="3741220147296482474">"USB अतिरिक्त मेमोरी चालू करें"</string>
     <string name="sdcard_settings_total_bytes_label" msgid="9184160745785062144">"कुल बाइट:"</string>
     <string name="sdcard_settings_not_present_status" product="nosdcard" msgid="1636218515775929394">"USB मेमोरी माउंट नहीं है."</string>
     <string name="sdcard_settings_not_present_status" product="default" msgid="2048419626134861599">"कोई SD कार्ड नहीं."</string>
@@ -269,15 +269,15 @@
     <string name="activity_picker_label" msgid="6295660302548177109">"गतिविधि चुनें"</string>
     <string name="device_info_label" msgid="6551553813651711205">"डिवाइस जानकारी"</string>
     <string name="display_label" msgid="8074070940506840792">"स्क्रीन"</string>
-    <string name="phone_info_label" product="tablet" msgid="7820855350955963628">"टेबलेट जानकारी"</string>
-    <string name="phone_info_label" product="default" msgid="2127552523124277664">"फ़ोन जानकारी"</string>
+    <string name="phone_info_label" product="tablet" msgid="7820855350955963628">"टैबलेट की जानकारी देखें"</string>
+    <string name="phone_info_label" product="default" msgid="2127552523124277664">"फ़ोन की जानकारी देखें"</string>
     <string name="sd_card_settings_label" product="nosdcard" msgid="8101475181301178428">"USB मेमोरी"</string>
     <string name="sd_card_settings_label" product="default" msgid="5743100901106177102">"SD कार्ड"</string>
     <string name="proxy_settings_label" msgid="3271174136184391743">"प्रॉक्सी सेटिंग"</string>
-    <string name="cancel" msgid="6859253417269739139">"अभी नहीं"</string>
-    <string name="okay" msgid="1997666393121016642">"ठीक"</string>
+    <string name="cancel" msgid="6859253417269739139">"रद्द करें"</string>
+    <string name="okay" msgid="1997666393121016642">"ठीक है"</string>
     <string name="forget" msgid="1400428660472591263">"भूल जाएं"</string>
-    <string name="save" msgid="879993180139353333">"सहेजें"</string>
+    <string name="save" msgid="879993180139353333">"सेव करें"</string>
     <string name="done" msgid="6942539184162713160">"हो गया"</string>
     <string name="settings_label" msgid="1626402585530130914">"सेटिंग"</string>
     <string name="settings_label_launcher" msgid="8344735489639482340">"सेटिंग"</string>
@@ -289,65 +289,67 @@
     <string name="radio_controls_summary" msgid="1838624369870907268">"वाई-फ़ाई , ब्लूटूथ, हवाई जहाज़ मोड, मोबाइल नेटवर्क और VPN प्रबंधित करें"</string>
     <string name="cellular_data_title" msgid="6835451574385496662">"मोबाइल डेटा"</string>
     <string name="calls_title" msgid="3544471959217176768">"कॉल"</string>
-    <string name="sms_messages_title" msgid="1778636286080572535">"SMS संदेश"</string>
-    <string name="cellular_data_summary" msgid="4660351864416939504">"मोबाइल नेटवर्क पर डेटा उपयोग की अनुमति दें"</string>
-    <string name="allow_data_usage_title" msgid="2238205944729213062">"रोमिंग में डेटा उपयोग करने दें"</string>
+    <string name="sms_messages_title" msgid="1778636286080572535">"मैसेज (एसएमएस)"</string>
+    <string name="cellular_data_summary" msgid="4660351864416939504">"मोबाइल नेटवर्क पर डेटा खर्च की अनुमति"</string>
+    <string name="allow_data_usage_title" msgid="2238205944729213062">"रोमिंग में डेटा खर्च करने की अनुमति दें"</string>
     <string name="roaming" msgid="3596055926335478572">"रोमिंग डेटा"</string>
     <string name="roaming_enable" msgid="3737380951525303961">"रोमिंग के समय डेटा सेवाएं कनेक्ट करें"</string>
     <string name="roaming_disable" msgid="1295279574370898378">"रोमिंग के समय डेटा सेवाएं कनेक्ट करें"</string>
     <string name="roaming_reenable_message" msgid="9141007271031717369">"आपने डेटा कनेक्टिविटी खो दी है क्योंकि आपने डेटा रोमिंग बंद रखकर अपना होम नेटवर्क छोड़ दिया."</string>
     <string name="roaming_turn_it_on_button" msgid="4387601818162120589">"इसे चालू करें"</string>
-    <string name="roaming_warning" msgid="4275443317524544705">"आपको बहुत अधिक शुल्‍क देना पड़ सकता है."</string>
-    <string name="roaming_warning_multiuser" product="tablet" msgid="6458990250829214777">"जब आप डेटा रोमिंग की अनुमति देते हैं, तो हो सकता है कि आपको अधिक रोमिंग शुल्क लगे!\n\nयह सेटिंग इस टेबलेट के सभी उपयोगकर्ताओं को प्रभावित करती है."</string>
+    <string name="roaming_warning" msgid="4275443317524544705">"आपको बहुत ज़्यादा शुल्‍क देना पड़ सकता है."</string>
+    <string name="roaming_warning_multiuser" product="tablet" msgid="6458990250829214777">"जब आप डेटा रोमिंग की अनुमति देते हैं, तो हो सकता है कि आपको अधिक रोमिंग शुल्क लगे!\n\nयह सेटिंग इस टैबलेट के सभी उपयोगकर्ताओं को प्रभावित करती है."</string>
     <string name="roaming_warning_multiuser" product="default" msgid="6368421100292355440">"जब आप डेटा रोमिंग की अनुमति देते हैं, तो हो सकता है कि आपको अधिक रोमिंग शुल्क लगे!\n\nयह सेटिंग इस फ़ोन के सभी उपयोगकर्ताओं को प्रभावित करती है."</string>
     <string name="roaming_reenable_title" msgid="6068100976707316772">"डेटा रोमिंग की अनुमति दें?"</string>
     <string name="networks" msgid="6333316876545927039">"ऑपरेटर चयन"</string>
     <string name="sum_carrier_select" msgid="3616956422251879163">"कोई नेटवर्क ऑपरेटर चुनें"</string>
-    <string name="date_and_time_settings_title" msgid="3350640463596716780">"दिनांक और समय"</string>
+    <string name="date_and_time_settings_title" msgid="3350640463596716780">"तारीख और समय"</string>
     <string name="date_and_time_settings_title_setup_wizard" msgid="2391530758339384324">"दिनांक और समय सेट करें"</string>
-    <string name="date_and_time_settings_summary" msgid="7095318986757583584">"दिनांक, समय, समय क्षेत्र और प्रारूप सेट करें"</string>
-    <string name="date_time_auto" msgid="7076906458515908345">"ऑटोमैटिक दिनांक और समय"</string>
+    <string name="date_and_time_settings_summary" msgid="7095318986757583584">"तारीख, समय, समय क्षेत्र और प्रारूप सेट करें"</string>
+    <string name="date_time_auto" msgid="7076906458515908345">"ऑटोमैटिक तारीख और समय"</string>
     <string name="date_time_auto_summaryOn" msgid="4609619490075140381">"नेटवर्क-प्रदत्त समय का उपयोग करें"</string>
     <string name="date_time_auto_summaryOff" msgid="8698762649061882791">"नेटवर्क-प्रदत्त समय का उपयोग करें"</string>
     <string name="zone_auto" msgid="334783869352026648">"ऑटोमैटिक समय क्षेत्र"</string>
     <string name="zone_auto_summaryOn" msgid="6142830927278458314">"नेटवर्क के समय क्षेत्र का उपयोग करें"</string>
     <string name="zone_auto_summaryOff" msgid="2597745783162041390">"नेटवर्क के समय क्षेत्र का उपयोग करें"</string>
+    <string name="date_time_24hour_auto" msgid="2117383168985653422">"24-घंटे का प्रारूप अपने आप चलने दें"</string>
+    <string name="date_time_24hour_auto_summary" msgid="6351812925651480277">"डिफ़ॉल्ट जगह का इस्तेमाल करें"</string>
     <string name="date_time_24hour_title" msgid="3203537578602803850">"24‑घंटा प्रारूप"</string>
     <string name="date_time_24hour" msgid="1193032284921000063">"24-घंटे के प्रारूप का उपयोग करें"</string>
     <string name="date_time_set_time_title" msgid="6296795651349047016">"समय"</string>
     <string name="date_time_set_time" msgid="5716856602742530696">"समय सेट करें"</string>
     <string name="date_time_set_timezone_title" msgid="3047322337368233197">"समय क्षेत्र"</string>
     <string name="date_time_set_timezone" msgid="5045627174274377814">"समय क्षेत्र को चुनें"</string>
-    <string name="date_time_set_date_title" msgid="6928286765325608604">"दिनांक"</string>
+    <string name="date_time_set_date_title" msgid="6928286765325608604">"तारीख"</string>
     <string name="date_time_set_date" msgid="7021491668550232105">"दिनांक सेट करें"</string>
     <string name="zone_list_menu_sort_alphabetically" msgid="5683377702671088588">"वर्णानुक्रम में क्रमित करें"</string>
     <string name="zone_list_menu_sort_by_timezone" msgid="2720190443744884114">"समय क्षेत्र द्वारा क्रमित करें"</string>
-    <string name="date_picker_title" msgid="1338210036394128512">"तिथि"</string>
+    <string name="date_picker_title" msgid="1338210036394128512">"तारीख"</string>
     <string name="time_picker_title" msgid="483460752287255019">"समय"</string>
     <string name="lock_after_timeout" msgid="4590337686681194648">"अपने आप लॉक करें"</string>
     <string name="lock_after_timeout_summary" msgid="6128431871360905631">"<xliff:g id="TIMEOUT_STRING">%1$s</xliff:g> निष्क्रियता के बाद"</string>
     <string name="lock_immediately_summary_with_exception" msgid="9119632173886172690">"सो जाने के तुरंत बाद, <xliff:g id="TRUST_AGENT_NAME">%1$s</xliff:g> के द्वारा अनलॉक रखे जाने को छोड़कर"</string>
-    <string name="lock_after_timeout_summary_with_exception" msgid="5579064842797188409">"निष्क्रिय होने के बाद <xliff:g id="TIMEOUT_STRING">%1$s</xliff:g>, तब को छोड़कर जब <xliff:g id="TRUST_AGENT_NAME">%2$s</xliff:g> के द्वारा अनलॉक रखा गया हो"</string>
+    <string name="lock_after_timeout_summary_with_exception" msgid="5579064842797188409">"<xliff:g id="TRUST_AGENT_NAME">%2$s</xliff:g> के अनलॉक रखे जाने के अलावा, कम बैटरी मोड में होने के बाद <xliff:g id="TIMEOUT_STRING">%1$s</xliff:g>"</string>
     <string name="show_owner_info_on_lockscreen_label" msgid="5074906168357568434">"लॉक स्‍क्रीन पर अपनी जानकारी दिखाएं"</string>
     <string name="owner_info_settings_title" msgid="5530285568897386122">"लॉक स्‍क्रीन संदेश"</string>
-    <string name="security_enable_widgets_title" msgid="2754833397070967846">"शॉर्टकट सक्षम करें"</string>
+    <string name="security_enable_widgets_title" msgid="2754833397070967846">"शॉर्टकट चालू करें"</string>
     <string name="security_enable_widgets_disabled_summary" msgid="6392489775303464905">"व्यवस्थापक ने अक्षम किया है"</string>
     <string name="owner_info_settings_summary" msgid="7472393443779227052">"कोई नहीं"</string>
     <string name="owner_info_settings_status" msgid="120407527726476378">"<xliff:g id="COUNT_0">%1$d</xliff:g> / <xliff:g id="COUNT_1">%2$d</xliff:g>"</string>
-    <string name="owner_info_settings_edit_text_hint" msgid="7591869574491036360">"उदा., जो का Android."</string>
-    <string name="user_info_settings_title" msgid="1195015434996724736">"उपयोगकर्ता जानकारी"</string>
+    <string name="owner_info_settings_edit_text_hint" msgid="7591869574491036360">"उदाहरण, जो का Android."</string>
+    <string name="user_info_settings_title" msgid="1195015434996724736">"उपयोगकर्ता की जानकारी"</string>
     <string name="show_profile_info_on_lockscreen_label" msgid="2741208907263877990">"लॉक स्क्रीन पर प्रोफ़ाइल की जानकारी दिखाएं"</string>
     <string name="profile_info_settings_title" msgid="3518603215935346604">"प्रोफ़ाइल की जानकारी"</string>
     <string name="Accounts_settings_title" msgid="1643879107901699406">"खाते"</string>
-    <string name="location_settings_title" msgid="1369675479310751735">"स्थान"</string>
+    <string name="location_settings_title" msgid="1369675479310751735">"जगह"</string>
     <string name="account_settings_title" msgid="626177544686329806">"खाते"</string>
-    <string name="security_settings_title" msgid="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="security_settings_title" msgid="4918904614964215087">"सुरक्षा और जगह"</string>
+    <string name="encryption_and_credential_settings_title" msgid="6514904533438791561">"सुरक्षित करना और क्रेडेंशियल"</string>
+    <string name="encryption_and_credential_settings_summary" product="default" msgid="8721883002237981248">"फ़ोन सुरक्षित किया गया है"</string>
+    <string name="encryption_and_credential_settings_summary" product="tablet" msgid="7200428573872395685">"सुरक्षित किया गया डिवाइस"</string>
     <string name="lockscreen_settings_title" msgid="3922976395527087455">"लॉक स्क्रीन प्राथमिकताएं"</string>
-    <string name="security_settings_summary" msgid="967393342537986570">"मेरा स्‍थान, स्‍क्रीन अनलॉक, सिम कार्ड लॉक, प्रमाणिकता मेमोरी लॉक सेट करें"</string>
-    <string name="cdma_security_settings_summary" msgid="6068799952798901542">"मेरा स्‍थान, स्‍क्रीन अनलॉक, प्रमाणिकता मेमोरी लॉक सेट करें"</string>
+    <string name="security_settings_summary" msgid="967393342537986570">"मेरी जगह, स्‍क्रीन का लॉक खोलना, सिम कार्ड लॉक, क्रेडेंशियल स्टोरेज लॉक सेट करें"</string>
+    <string name="cdma_security_settings_summary" msgid="6068799952798901542">"मेरा स्‍थान, स्‍क्रीन अनलॉक, क्रेडेंशियल स्टोरेज लॉक सेट करें"</string>
     <string name="security_passwords_title" msgid="2881269890053568809">"निजता"</string>
     <string name="disabled_by_administrator_summary" msgid="1601828700318996341">"व्यवस्थापक ने अक्षम किया है"</string>
     <string name="security_status_title" msgid="5848766673665944640">"सुरक्षा स्थिति"</string>
@@ -366,12 +368,15 @@
     <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="1550756694054944874">"अपना फ़ोन अनलॉक करने या खरीदारियों को स्वीकृति देने के लिए अपने फ़िंगरप्रिंट का उपयोग करें.\n\nनोट: आप इस डिवाइस को अनलॉक करने के लिए अपने फ़िंगरप्रिंट का उपयोग नहीं कर सकते हैं. अधिक जानकारी के लिए, अपने संगठन के व्यवस्थापक से संपर्क करें."</string>
+    <string name="security_settings_fingerprint_enroll_introduction_message_unlock_disabled" msgid="1550756694054944874">"अपने फ़ोन का लॉक खोलने के लिए या खरीदारियों को स्वीकृति देने के लिए अपने फ़िंगरप्रिंट का इस्तेमाल करें.\n\nनोट: आप इस डिवाइस का लॉक खोलने के लिए अपने फ़िंगरप्रिंट का इस्तेमाल नहीं कर सकते हैं. और जानकारी के लिए, अपने संगठन के एडमिन से संपर्क करें."</string>
     <string name="security_settings_fingerprint_enroll_introduction_message_setup" msgid="6817326798834882531">"अपना फ़ोन अनलॉक करने या खरीदारियों को स्वीकृति देने के लिए अपने फ़िंगरप्रिंट का उपयोग करें.\n\nनोट: आपका फ़िंगरप्रिंट किसी मज़बूत पैटर्न या पिन से कम सुरक्षित हो सकता है."</string>
-    <string name="security_settings_fingerprint_enroll_introduction_cancel" msgid="3199351118385606526">"अभी नहीं"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_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="1961957425135180242">"अगला"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_continue_setup" msgid="1961957425135180242">"आगे बढ़ें"</string>
+    <string name="setup_fingerprint_enroll_skip_title" msgid="362050541117362034">"फिंगरप्रिंट छोड़ें?"</string>
+    <string name="setup_fingerprint_enroll_skip_after_adding_lock_text" msgid="958990414356204763">"फ़िंगरप्रिंट सेटअप में सिर्फ़ एक या दो मिनट लगते हैं. अगर आप इसे छोड़ते हैं, तो आप बाद में सेटिंग में अपना फ़िंगरप्रिंट जोड़ सकते हैं."</string>
+    <string name="lock_screen_intro_skip_title" msgid="4988210105913705679">"स्क्रीन लॉक छोड़ें?"</string>
     <string name="lock_screen_intro_skip_dialog_text_frp" product="tablet" msgid="1581834104051243425">"डिवाइस सुरक्षा सुविधाओं को चालू नहीं किया जाएगा. अगर आपका टैबलेट खो जाता है, चोरी हो जाता है या उसे रीसेट कर दिया जाता है, तो आप दूसरों को इसका उपयोग करने से रोक नहीं पाएंगे."</string>
     <string name="lock_screen_intro_skip_dialog_text_frp" product="device" msgid="4629503416877189572">"डिवाइस सुरक्षा सुविधाओं को चालू नहीं किया जाएगा. अगर आपका डिवाइस खो जाता है, चोरी हो जाता है या उसे रीसेट कर दिया जाता है, तो आप दूसरों को इसका उपयोग करने से रोक नहीं पाएंगे."</string>
     <string name="lock_screen_intro_skip_dialog_text_frp" product="default" msgid="2423428240245737909">"डिवाइस सुरक्षा सुविधाओं को चालू नहीं किया जाएगा. अगर आपका फ़ोन खो जाता है, चोरी हो जाता है या उसे रीसेट कर दिया जाता है, तो आप दूसरों को इसका उपयोग करने से रोक नहीं पाएंगे."</string>
@@ -380,32 +385,32 @@
     <string name="lock_screen_intro_skip_dialog_text" product="default" msgid="3008526710555416125">"डिवाइस सुरक्षा सुविधाओं को चालू नहीं किया जाएगा. अगर आपका फ़ोन खो जाता है या चोरी हो जाता है, तो आप दूसरों को इसका उपयोग करने से रोक नहीं पाएंगे."</string>
     <string name="skip_anyway_button_label" msgid="2323522873558834513">"फिर भी आगे बढ़ें"</string>
     <string name="go_back_button_label" msgid="4745265266186209467">"वापस जाएं"</string>
-    <string name="security_settings_fingerprint_enroll_find_sensor_title" msgid="3051496861358227199">"सेंसर को स्पर्श करें"</string>
+    <string name="security_settings_fingerprint_enroll_find_sensor_title" msgid="3051496861358227199">"सेंसर को छुएं"</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_message" msgid="8793966374365960368">"यह आपके फ़ोन के पीछे दिया गया है. अपने अंगूठे के पास की अंगुली का उपयोग करें."</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_content_description" msgid="2058830032070449160">"डिवाइस और उस पर फ़िंगरप्रिंट सेंसर की जगह बताने वाला चित्रण"</string>
     <string name="security_settings_fingerprint_enroll_dialog_name_label" msgid="7086763077909041106">"नाम"</string>
-    <string name="security_settings_fingerprint_enroll_dialog_ok" msgid="4150384963879569750">"ठीक"</string>
-    <string name="security_settings_fingerprint_enroll_dialog_delete" msgid="4114615413240707936">"हटाएं"</string>
-    <string name="security_settings_fingerprint_enroll_start_title" msgid="2068961812439460133">"सेंसर को स्पर्श करें"</string>
-    <string name="security_settings_fingerprint_enroll_start_message" msgid="3909929328942564524">"अपनी उंगली सेंसर पर रखें और कंपन का अनुभव होने पर उठा लें"</string>
-    <string name="security_settings_fingerprint_enroll_repeat_title" msgid="2819679722403209778">"उठाएं, फिर दोबारा स्पर्श करें"</string>
+    <string name="security_settings_fingerprint_enroll_dialog_ok" msgid="4150384963879569750">"ठीक है"</string>
+    <string name="security_settings_fingerprint_enroll_dialog_delete" msgid="4114615413240707936">"मिटाएं"</string>
+    <string name="security_settings_fingerprint_enroll_start_title" msgid="2068961812439460133">"सेंसर को छुएं"</string>
+    <string name="security_settings_fingerprint_enroll_start_message" msgid="3909929328942564524">"अपनी उंगली सेंसर पर रखें और कंपन (वाइब्रेशन) महसूस होने पर उठा लें"</string>
+    <string name="security_settings_fingerprint_enroll_repeat_title" msgid="2819679722403209778">"उठाएं, फिर दोबारा छुएं"</string>
     <string name="security_settings_fingerprint_enroll_repeat_message" msgid="6158989350522518586">"अपने फ़िंगरप्रिंट के अलग-अलग भागों को जोड़ने के लिए अपनी अंगुली को उठाते रहें"</string>
     <string name="security_settings_fingerprint_enroll_finish_title" msgid="7567276170287972230">"फ़िंगरप्रिंट जोड़ा गया"</string>
-    <string name="security_settings_fingerprint_enroll_finish_message" msgid="4796715961273420536">"जब आपको यह आइकन दिखाई दे, तब पहचान के लिए या खरीदारियों की स्वीकृति देने के लिए अपने फ़िंगरप्रिंट का उपयोग करें."</string>
+    <string name="security_settings_fingerprint_enroll_finish_message" msgid="4796715961273420536">"जब आपको यह आइकॉन दिखाई दे, तब पहचान के लिए या खरीदारियों की स्वीकृति देने के लिए अपने फ़िंगरप्रिंट का इस्तेमाल करें."</string>
     <string name="security_settings_fingerprint_enroll_enrolling_skip" msgid="3710211704052369752">"इसे बाद में करें"</string>
     <string name="setup_fingerprint_enroll_enrolling_skip_title" msgid="6808422329107426923">"फ़िंगरप्रिंट सेटअप छोड़ें?"</string>
     <string name="setup_fingerprint_enroll_enrolling_skip_message" msgid="274849306857859783">"आपने अपने फ़ोन को अनलॉक करने के एक तरीके के रूप में अपने फ़िंगरप्रिंट का उपयोग करने का चयन किया है. यदि आप इसे अभी छोड़ते हैं, तो आपको इसे बाद में सेट करना होगा. सेटअप में लगभग एक मिनट लगता है."</string>
     <string name="security_settings_fingerprint_enroll_setup_screen_lock" msgid="1195743489835505376">"स्‍क्रीन लॉक सेट करें"</string>
     <string name="security_settings_fingerprint_enroll_done" msgid="4014607378328187567">"हो गया"</string>
-    <string name="security_settings_fingerprint_enroll_touch_dialog_title" msgid="1863561601428695160">"ओह, वह सेंसर नहीं है"</string>
-    <string name="security_settings_fingerprint_enroll_touch_dialog_message" msgid="2989019978041986175">"अपने फ़ोन के पीछे लगे सेंसर को स्पर्श करें. अपने अंगूठे के पास की अंगुली का उपयोग करें."</string>
+    <string name="security_settings_fingerprint_enroll_touch_dialog_title" msgid="1863561601428695160">"ओह हो, वह सेंसर नहीं है"</string>
+    <string name="security_settings_fingerprint_enroll_touch_dialog_message" msgid="2989019978041986175">"अपने फ़ोन के पीछे लगे सेंसर को छुएं. अपनी तर्जनी (अंगूठे के बगल वाली) अंगुली का इस्तेमाल करें."</string>
     <string name="security_settings_fingerprint_enroll_error_dialog_title" msgid="3618021988442639280">"नामांकन पूर्ण नहीं हुआ था"</string>
     <string name="security_settings_fingerprint_enroll_error_timeout_dialog_message" msgid="2942551158278899627">"फ़िंगरप्रिंट नामांकन समय की सीमा पार हो गई है. फिर से प्रयास करें."</string>
     <string name="security_settings_fingerprint_enroll_error_generic_dialog_message" msgid="3624760637222239293">"फ़िंगरप्रिंट नामांकन ने काम नहीं किया. फिर से प्रयास करें या किसी दूसरी अंगुली का उपयोग करें."</string>
-    <string name="fingerprint_enroll_button_add" msgid="6317978977419045463">"कोई अन्‍य जोड़ें"</string>
+    <string name="fingerprint_enroll_button_add" msgid="6317978977419045463">"कोई और जोड़ें"</string>
     <string name="fingerprint_enroll_button_next" msgid="6247009337616342759">"आगे"</string>
-    <string name="security_settings_fingerprint_enroll_disclaimer" msgid="2624905914239271751">"अपना फ़ोन अनलॉक करने के साथ ही, खरीदी और ऐप ऐक्‍सेस को अधिकृत करने के लिए आप अपनी फ़िंगरप्रिंट का भी उपयोग कर सकते हैं. "<annotation id="url">"और जानें"</annotation></string>
-    <string name="security_settings_fingerprint_enroll_disclaimer_lockscreen_disabled" msgid="7846871823167357942">" स्क्रीन लॉक विकल्प अक्षम है. अधिक जानने के लिए, अपने संगठन के व्यवस्थापक से संपर्क करें. "<annotation id="admin_details">"अधिक विवरण"</annotation>\n\n"आप खरीदारी और ऐप्लिकेशन एक्सेस अधिकृत करने के लिए अभी भी अपने फ़िंगरप्रिंट का उपयोग कर सकते हैं. "<annotation id="url">"अधिक जानें"</annotation></string>
+    <string name="security_settings_fingerprint_enroll_disclaimer" msgid="2624905914239271751">"अपना फ़ोन अनलॉक करने के साथ-साथ, खरीदारी और ऐप ऐक्‍सेस को अधिकृत करने के लिए आप अपनी फ़िंगरप्रिंट का भी उपयोग कर सकते हैं. "<annotation id="url">"ज़्यादा जानें"</annotation></string>
+    <string name="security_settings_fingerprint_enroll_disclaimer_lockscreen_disabled" msgid="7846871823167357942">" स्क्रीन लॉक विकल्प बंद है. ज़्यादा जानने के लिए, अपने संगठन के एडमिन से संपर्क करें. "<annotation id="admin_details">"ज़्यादा जानकारी{"</annotation>\n\n"आप खरीदारी और ऐप एक्सेस की अनुमति देने के लिए अभी भी अपने फ़िंगरप्रिंट का इस्तेमाल कर सकते हैं. "<annotation id="url">"ज़्यादा जानें"</annotation></string>
     <string name="security_settings_fingerprint_enroll_lift_touch_again" msgid="1888772560642539718">"उंगली उठाएं और सेंसर को फिर छूएं"</string>
     <string name="fingerprint_add_max" msgid="1020927549936895822">"आप <xliff:g id="COUNT">%d</xliff:g> फ़िंगरप्रिंट तक जोड़ सकते हैं"</string>
     <string name="fingerprint_intro_error_max" msgid="6864066984678078441">"आप अधिकतम संख्या में फ़िंगरप्रिंट जोड़ चुके हैं"</string>
@@ -417,37 +422,37 @@
     <string name="fingerprint_last_delete_message_profile_challenge" msgid="6521520787746771912">"आप अपनी कार्य प्रोफ़ाइल अनलॉक करने, खरीदारी अधिकृत करने या अपने कार्य ऐप्लिकेशन में प्रवेश करने के लिए अपने फ़िंगरप्रिंट का उपयोग नहीं कर सकेंगे."</string>
     <string name="fingerprint_last_delete_confirm" msgid="2634726361059274289">"हां, निकालें"</string>
     <string name="confirm_fingerprint_icon_content_description" msgid="5255544532157079096">"जारी रखने के लिए अपने फ़िंगरप्रिंट का उपयोग करें."</string>
-    <string name="crypt_keeper_settings_title" msgid="4219233835490520414">"एन्‍क्रिप्‍शन"</string>
-    <string name="crypt_keeper_encrypt_title" product="tablet" msgid="1060273569887301457">"टेबलेट एन्‍क्रिप्‍ट करें"</string>
-    <string name="crypt_keeper_encrypt_title" product="default" msgid="1878996487755806122">"फ़ोन एन्‍क्रिप्‍ट करें"</string>
+    <string name="crypt_keeper_settings_title" msgid="4219233835490520414">"सुरक्षित करना"</string>
+    <string name="crypt_keeper_encrypt_title" product="tablet" msgid="1060273569887301457">"टैबलेट सुरक्षित करें"</string>
+    <string name="crypt_keeper_encrypt_title" product="default" msgid="1878996487755806122">"फ़ोन सुरक्षित करें"</string>
     <string name="crypt_keeper_encrypted_summary" msgid="1868233637888132906">"एन्‍िक्रप्ट किया गया"</string>
-    <string name="crypt_keeper_desc" product="tablet" msgid="503014594435731275">"आप अपने खाते, सेटिंग, डाउनलोड किए गए ऐप्स और उनका डेटा, मीडिया, तथा अन्य फ़ाइलें एन्क्रिप्ट कर सकते हैं. अपना टेबलेट एन्क्रिप्ट करने के बाद, यह मानते हुए कि आपने स्क्रीन लॉक (अर्थात्, प्रतिमान या संख्यात्मक पिन या पासवर्ड) सेट कर लिया है, आपको प्रत्येक बार अपना टेबलेट चालू करते समय इसे डीक्रिप्ट करने के लिए स्क्रीन को अनलॉक करना होगा. डीक्रिप्ट करने का एकमात्र अन्य तरीका अपना सभी डेटा मिटाते हुए, फ़ैक्टरी डेटा रीसेट करना है.\n\nएन्क्रिप्शन में एक घंटा या इससे अधिक समय लगता है. आपको चार्ज की गई बैटरी से प्रारंभ करना चाहिए और पूरी प्रक्रिया के दौरान अपने टेबलेट को प्लग इन करके रखना चाहिए. यदि आप इसमें बाधा डालते हैं, तो आप अपना कुछ या सभी डेटा खो देंगे"</string>
-    <string name="crypt_keeper_desc" product="default" msgid="2579929266645543631">"आप अपने खाते, सेटिंग, डाउनलोड किए गए ऐप्स और उनका डेटा, मीडिया, तथा अन्य फ़ाइलें एन्क्रिप्ट कर सकते हैं. अपना फ़ोन एन्क्रिप्ट करने के बाद, यह मानते हुए कि आपने स्क्रीन लॉक (अर्थात्, प्रतिमान या संख्यात्मक पिन या पासवर्ड) सेट कर लिया है, आपको प्रत्येक बार अपना फ़ोन चालू करते समय इसे डीक्रिप्ट करने के लिए स्क्रीन को अनलॉक करना होगा. डीक्रिप्ट करने का एकमात्र अन्य तरीका अपना सभी डेटा मिटाते हुए, फ़ैक्टरी डेटा रीसेट करना है.\n\nएन्क्रिप्शन में एक घंटा या इससे अधिक समय लगता है. आपको चार्ज की गई बैटरी से प्रारंभ करना चाहिए और पूरी प्रक्रिया के दौरान अपने फ़ोन को प्लग इन करके रखना चाहिए. यदि आप इसमें बाधा डालते हैं, तो आप अपना कुछ या सभी डेटा खो देंगे."</string>
-    <string name="crypt_keeper_button_text" product="tablet" msgid="1189623490604750854">"टेबलेट एन्‍क्रिप्‍ट करें"</string>
-    <string name="crypt_keeper_button_text" product="default" msgid="2008346408473255519">"फ़ोन एन्‍क्रिप्‍ट करें"</string>
+    <string name="crypt_keeper_desc" product="tablet" msgid="503014594435731275">"आप अपने खाते, सेटिंग, डाउनलोड किए गए ऐप और उनका डेटा, मीडिया और अन्य फ़ाइलें सुरक्षित कर सकते हैं. अपना टैबलेट सुरक्षित करने के बाद, यह मानते हुए कि आपने स्क्रीन लॉक (जैसे पैटर्न या पिन या पासवर्ड) सेट कर लिया है, आपको हर बार अपना टैबलेट चालू करते समय इसे सबकी पहुंच में लाने के लिए स्क्रीन के लॉक को खोलना होगा. आप फ़ैक्ट्री डेटा रीसेट करके भी टैबलेट को सबकी पहुंच में ला सकते हैं. \n\nसुरक्षित करने में एक घंटा या इससे ज़्यादा समय लग सकता है. आप जब सुरक्षित करना शुरू करें तो बैटरी को पूरी तरह चार्ज रखें और पूरी प्रक्रिया के दौरान अपने टैबलेट को चार्जिंग पर रखें. अगर सुरक्षित करने के दौरान कोई रुकावट आती है, तो आपका थोड़ा या सारा डेटा खो सकता है."</string>
+    <string name="crypt_keeper_desc" product="default" msgid="2579929266645543631">"आप अपने खाते, सेटिंग, डाउनलोड किए गए ऐप और उनका डेटा, मीडिया और अन्य फ़ाइलें सुरक्षित कर सकते हैं. अपना फ़ोन सुरक्षित करने के बाद, यह मानते हुए कि आपने स्क्रीन लॉक (जैसे पैटर्न या पिन या पासवर्ड) सेट कर लिया है, आपको हर बार अपना फ़ोन चालू करते समय इसे सबकी पहुंच में लाने के लिए स्क्रीन के लॉक को खोलना होगा. आप फ़ैक्ट्री डेटा रीसेट करके भी फ़ोन को सबकी पहुंच में ला सकते हैं. \n\nसुरक्षित करने में एक घंटा या इससे ज़्यादा समय लग सकता है. आप जब सुरक्षित करना शुरू करें तो बैटरी को पूरी तरह चार्ज रखें और पूरी प्रक्रिया के दौरान अपने फ़ोन को चार्जिंग पर रखें. अगर सुरक्षित करने के दौरान कोई रुकावट आती है, तो आपका थोड़ा या सारा डेटा खो सकता है."</string>
+    <string name="crypt_keeper_button_text" product="tablet" msgid="1189623490604750854">"टैबलेट सुरक्षित करें"</string>
+    <string name="crypt_keeper_button_text" product="default" msgid="2008346408473255519">"फ़ोन सुरक्षित करें"</string>
     <string name="crypt_keeper_low_charge_text" msgid="2029407131227814893">"अपनी बैटरी चार्ज करें और पुन: प्रयास करें."</string>
     <string name="crypt_keeper_unplugged_text" msgid="4785376766063053901">"अपना चार्जर प्लग में लगाएं और पुन: प्रयास करें."</string>
     <string name="crypt_keeper_dialog_need_password_title" msgid="4058971800557767">"कोई लॉक स्‍क्रीन पिन या पासवर्ड नहीं"</string>
-    <string name="crypt_keeper_dialog_need_password_message" msgid="4071395977297369642">"एन्‍क्रिप्‍शन प्रारंभ करने से पहले आपको लॉक स्‍क्रीन पिन या पासवर्ड सेट करना होगा."</string>
-    <string name="crypt_keeper_confirm_title" msgid="5100339496381875522">"एन्‍क्रिप्‍ट करें?"</string>
-    <string name="crypt_keeper_final_desc" product="tablet" msgid="517662068757620756">"एन्‍क्रिप्शन कार्यवाही पूर्ववत नहीं की जा सकती है और यदि आप इसमें बाधा डालते हैं, तो आप डेटा खो देंगे. एन्‍क्रिप्‍शन में एक घंटा या अधिक लग सकता है, इस दौरान टेबलेट कई बार पुन: प्रारंभ होगा."</string>
-    <string name="crypt_keeper_final_desc" product="default" msgid="287503113671320916">"सुरक्षित करने का कार्यवाही पूर्ववत नहीं की जा सकती है और यदि आप इसमें बाधा डालते हैं, तो आप डेटा खो देंगे. एन्‍क्रिप्‍शन में एक घंटा या अधिक लग सकता है, इस दौरान फ़ोन कई बार पुन: प्रारंभ होगा."</string>
+    <string name="crypt_keeper_dialog_need_password_message" msgid="4071395977297369642">"सुरक्षित करने से पहले आपको लॉक स्‍क्रीन पिन या पासवर्ड सेट करना होगा."</string>
+    <string name="crypt_keeper_confirm_title" msgid="5100339496381875522">"सुरक्षित करें?"</string>
+    <string name="crypt_keeper_final_desc" product="tablet" msgid="517662068757620756">"सुरक्षित करने का काम एक बार शुरू करने के बाद इसे वापस बदला नहीं जा सकता और अगर आप इसे बीच में रोकते हैं, तो आप डेटा खो देंगे. सुरक्षित करने में एक घंटा या उससे ज़्यादा समय लग सकता है, इस दौरान टैबलेट कई बार रिस्टार्ट होगा."</string>
+    <string name="crypt_keeper_final_desc" product="default" msgid="287503113671320916">"सुरक्षित करने का काम एक बार शुरू करने के बाद इसे वापस बदला नहीं जा सकता और अगर आप इसे बीच में रोकते हैं, तो आप डेटा खो देंगे. सुरक्षित करने में एक घंटा या उससे ज़्यादा समय लग सकता है, इस दौरान फ़ोन कई बार रिस्टार्ट होगा."</string>
     <string name="crypt_keeper_setup_title" msgid="1783951453124244969">"एन्‍क्रिप्‍ट करना"</string>
-    <string name="crypt_keeper_setup_description" product="tablet" msgid="6689952371032099350">"अपना टेबलेट एन्‍क्रिप्‍ट होने तक प्रतीक्षा करें. <xliff:g id="PERCENT">^1</xliff:g>% पूर्ण."</string>
+    <string name="crypt_keeper_setup_description" product="tablet" msgid="6689952371032099350">"अपना टैबलेट एन्‍क्रिप्‍ट होने तक प्रतीक्षा करें. <xliff:g id="PERCENT">^1</xliff:g>% पूर्ण."</string>
     <string name="crypt_keeper_setup_description" product="default" msgid="951918761585534875">"अपना फ़ोन एन्‍क्रिप्‍ट होने तक प्रतीक्षा करें. <xliff:g id="PERCENT">^1</xliff:g>% पूर्ण."</string>
-    <string name="crypt_keeper_setup_time_remaining" product="tablet" msgid="1655047311546745695">"जब तक आपका टेबलेट एन्क्रिप्ट किया जा रहा है तब तक प्रतीक्षा करें. शेष समय: <xliff:g id="DURATION">^1</xliff:g>"</string>
+    <string name="crypt_keeper_setup_time_remaining" product="tablet" msgid="1655047311546745695">"जब तक आपका टैबलेट एन्क्रिप्ट किया जा रहा है तब तक प्रतीक्षा करें. शेष समय: <xliff:g id="DURATION">^1</xliff:g>"</string>
     <string name="crypt_keeper_setup_time_remaining" product="default" msgid="1862964662304683072">"जब तक आपका फ़ोन एन्क्रिप्ट किया जा रहा है तब तक प्रतीक्षा करें. शेष समय: <xliff:g id="DURATION">^1</xliff:g>"</string>
     <string name="crypt_keeper_force_power_cycle" product="tablet" msgid="556504311511212648">"अपना टैबलेट अनलॉक करने के लिए, उसे बंद करें फिर चालू करें."</string>
     <string name="crypt_keeper_force_power_cycle" product="default" msgid="1794353635603020327">"अपना फ़ोन अनलॉक करने के लिए, उसे बंद करें फिर चालू करें."</string>
     <string name="crypt_keeper_warn_wipe" msgid="2738374897337991667">"चेतावनी: अनलॉक किए जाने के <xliff:g id="COUNT">^1</xliff:g> और विफल प्रयासों के बाद आपका डिवाइस हटा दिया जाएगा!"</string>
     <string name="crypt_keeper_enter_password" msgid="2223340178473871064">"अपना पासवर्ड लिखें"</string>
-    <string name="crypt_keeper_failed_title" msgid="7133499413023075961">"एन्क्रिप्‍शन विफल"</string>
-    <string name="crypt_keeper_failed_summary" product="tablet" msgid="8219375738445017266">"एन्‍क्रिप्‍शन बाधित किया था और पूर्ण नहीं हो सकता. परिणामस्‍वरूप, आपके टेबलेट का डेटा अब पहुंच योग्‍य नहीं है. \n\n अपने टेबलेट का उपयोग फिर से शुरू करने के लिए, आपको फ़ैक्‍टरी रीसेट करना होगा. जब आप रीसेट करने के बाद अपना टेबलेट सेट करते हैं, तो आप अपने Google खाते पर बैकअप लिए गए किसी भी डेटा को पुनर्स्थापित कर सकेंगे."</string>
-    <string name="crypt_keeper_failed_summary" product="default" msgid="3270131542549577953">"एन्‍क्रिप्‍शन बाधित था और पूर्ण नहीं हो सकता. इसके परिणामस्‍वरूप, आपके फ़ोन का डेटा अब पहुंच योग्‍य नहीं है. \n\nअपने फ़ोन का उपयोग फिर से शुरू करने के लिए, आपको फ़ैक्‍टरी रीसेट करना होगा. जब आप रीसेट करने के बाद अपना फ़ोन सेट करते हैं, तो आप अपने Google खाते पर बैकअप लिए गए किसी भी डेटा को पुनर्स्थापित कर सकेंगे."</string>
+    <string name="crypt_keeper_failed_title" msgid="7133499413023075961">"सुरक्षित नहीं किया जा सका"</string>
+    <string name="crypt_keeper_failed_summary" product="tablet" msgid="8219375738445017266">"सुरक्षित करने में रुकावट हुई और यह काम पूरा नहीं किया जा सका. इसलिए अब आपके टैबलेट के डेटा तक नहीं पहुंचा जा सकता. \n\nअपने टैबलेट का इस्तेमाल फिर से शुरू करने के लिए, आपको फ़ैक्‍ट्री रीसेट करना होगा. जब आप रीसेट करने के बाद अपना टैबलेट सेट करेंगे, तो आप अपने Google खाते पर बैकअप लिए गए किसी भी डेटा को बहाल कर सकेंगे."</string>
+    <string name="crypt_keeper_failed_summary" product="default" msgid="3270131542549577953">"सुरक्षित करने में रुकावट हुई और यह काम पूरा नहीं किया जा सका. इसलिए अब आपके फ़ोन के डेटा तक नहीं पहुंचा जा सकता. \n\nअपने फ़ोन का इस्तेमाल फिर से शुरू करने के लिए, आपको फ़ैक्‍ट्री रीसेट करना होगा. जब आप रीसेट करने के बाद अपना फ़ोन सेट करेंगे, तो आप अपने Google खाते पर बैकअप लिए गए किसी भी डेटा को बहाल कर सकेंगे."</string>
     <string name="crypt_keeper_data_corrupt_title" msgid="8759119849089795751">"डीक्रिप्‍शन असफल"</string>
     <string name="crypt_keeper_data_corrupt_summary" product="tablet" msgid="840107296925798402">"आपके द्वारा डाला गया पासवर्ड सही है, लेकिन दुर्भाग्‍य से आपका डेटा दूषित है. \n\nअपने टैबलेट का उपयोग फिर से शुरू करने के लिए आपको फ़ैक्टरी रीसेट करना होगा. जब आप रीसेट के बाद अपना टैबलेट रीसेट करते हैं, तो आपके पास अपने Google खाते में बैकअप लिए गए किसी भी डेटा को पुन: स्‍थापित करने का अवसर होगा."</string>
     <string name="crypt_keeper_data_corrupt_summary" product="default" msgid="8843311420059663824">"आपके द्वारा डाला गया पासवर्ड सही है, लेकिन दुर्भाग्‍य से आपका डेटा दूषित है. \n\nअपने फ़ोन का उपयोग फिर से शुरू करने के लिए आपको फ़ैक्टरी रीसेट करना होगा. जब आप रीसेट के बाद अपना फ़ोन सेट करते हैं, तो आपके पास अपने Google खाते में बैकअप किए गए किसी भी डेटा को पुन: स्‍थापित करने का अवसर होगा."</string>
-    <string name="crypt_keeper_switch_input_method" msgid="4168332125223483198">"इनपुट पद्धति‍ स्विच करें"</string>
+    <string name="crypt_keeper_switch_input_method" msgid="4168332125223483198">"इनपुट का तरीका बदलें"</string>
     <string name="suggested_lock_settings_title" msgid="8971630898700461034">"स्‍क्रीन लॉक सेट करना"</string>
     <string name="suggested_lock_settings_summary" msgid="8778462376012231110">"अपने डिवाइस की सुरक्षा करें"</string>
     <string name="suggested_fingerprint_lock_settings_title" msgid="3655973509619012084">"फ़िंगरप्रिंट का उपयोग करना"</string>
@@ -457,7 +462,7 @@
     <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="lock_settings_picker_fingerprint_added_security_message" msgid="5768002109707648463">"ज़्यादा सुरक्षा के लिए, एक बैकअप स्क्रीन लॉक सेट करें."</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>
@@ -465,8 +470,8 @@
     <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>
@@ -481,14 +486,14 @@
     <string name="unlock_set_unlock_pin_summary" msgid="907878650556383388">"मध्‍यम से उच्‍च सुरक्षा"</string>
     <string name="unlock_set_unlock_password_title" msgid="8775603825675090937">"पासवर्ड"</string>
     <string name="unlock_set_unlock_password_summary" msgid="8856220848940929546">"उच्च सुरक्षा"</string>
-    <string name="unlock_set_do_later_title" msgid="4894767558414979243">"अभी नहीं"</string>
+    <string name="unlock_set_do_later_title" msgid="4894767558414979243">"रद्द करें"</string>
     <string name="current_screen_lock" msgid="4104091715420072219">"वर्तमान स्क्रीन लॉक"</string>
     <string name="fingerprint_unlock_set_unlock_pattern" msgid="4939057588092120368">"फ़िंगरप्रिंट + पैटर्न"</string>
     <string name="fingerprint_unlock_set_unlock_pin" msgid="8010746824051056986">"फ़िंगरप्रिंट + पिन"</string>
     <string name="fingerprint_unlock_set_unlock_password" msgid="7351131075806338634">"फ़िंगरप्रिंट + पासवर्ड"</string>
     <string name="fingerprint_unlock_skip_fingerprint" msgid="1441077909803666681">"फ़िंगरप्रिंट के बिना जारी रखें"</string>
     <string name="fingerprint_unlock_title" msgid="2826226740306003991">"आप अपने फ़िंगरप्रिंट का उपयोग करके अपना फ़ोन अनलॉक कर सकते हैं. सुरक्षा के लिए, इस विकल्प के लिए बैकअप स्क्रीन लॉक आवश्यक है."</string>
-    <string name="unlock_set_unlock_disabled_summary" msgid="2051593894736282302">"व्यवस्थापक, एन्क्रिप्शन नीति या क्रेडेंशियल संग्रहण ने अक्षम किया है"</string>
+    <string name="unlock_set_unlock_disabled_summary" msgid="2051593894736282302">"एडमिन, सुरक्षित करने की नीति या क्रेडेंशियल स्टोरेज ने बंद किया है"</string>
     <string name="unlock_set_unlock_mode_off" msgid="5881952274566013651">"कोई नहीं"</string>
     <string name="unlock_set_unlock_mode_none" msgid="8467360084676871617">"स्वाइप करें"</string>
     <string name="unlock_set_unlock_mode_pattern" msgid="7837270780919299289">"आकार"</string>
@@ -539,14 +544,14 @@
     <string name="lock_last_pattern_attempt_before_wipe_device" msgid="1688030823464420974">"अगर आप अगली कोशिश में गलत पैटर्न डालते हैं, तो इस डिवाइस का डेटा हटा दिया जाएगा"</string>
     <string name="lock_last_pin_attempt_before_wipe_device" msgid="5350785938296254352">"अगर आप अगली कोशिश में गलत पिन डालते हैं, तो इस डिवाइस का डेटा हटा दिया जाएगा"</string>
     <string name="lock_last_password_attempt_before_wipe_device" msgid="6208035114731421034">"अगर आप अगली कोशिश में गलत पासवर्ड डालते हैं, तो इस डिवाइस का डेटा हटा दिया जाएगा"</string>
-    <string name="lock_last_pattern_attempt_before_wipe_user" msgid="7851504071368235547">"अगर आप अगली कोशिश में गलत पैटर्न डालते हैं, तो इस उपयोगकर्ता को हटा दिया जाएगा"</string>
-    <string name="lock_last_pin_attempt_before_wipe_user" msgid="4049024921333961715">"अगर आप अगली कोशिश में गलत पिन डालते हैं, तो इस उपयोगकर्ता को हटा दिया जाएगा"</string>
-    <string name="lock_last_password_attempt_before_wipe_user" msgid="4660886542496781672">"अगर आप अगली कोशिश में गलत पासवर्ड डालते हैं, तो इस उपयोगकर्ता को हटा दिया जाएगा"</string>
+    <string name="lock_last_pattern_attempt_before_wipe_user" msgid="7851504071368235547">"अगर आप अगली कोशिश में गलत पैटर्न डालते हैं, तो इस उपयोगकर्ता को मिटा दिया जाएगा"</string>
+    <string name="lock_last_pin_attempt_before_wipe_user" msgid="4049024921333961715">"अगर आप अगली कोशिश में गलत पिन डालते हैं, तो इस उपयोगकर्ता को मिटा दिया जाएगा"</string>
+    <string name="lock_last_password_attempt_before_wipe_user" msgid="4660886542496781672">"अगर आप अगली कोशिश में गलत पासवर्ड डालते हैं, तो इस उपयोगकर्ता को मिटा दिया जाएगा"</string>
     <string name="lock_last_pattern_attempt_before_wipe_profile" msgid="2437716252059050291">"अगर आप अगली कोशिश में गलत पैटर्न डालते हैं, तो आपकी कार्य प्रोफ़ाइल और उसके डेटा को हटा दिया जाएगा"</string>
     <string name="lock_last_pin_attempt_before_wipe_profile" msgid="5799931839127476913">"अगर आप अगली कोशिश में गलत पिन डालते हैं, तो आपकी कार्य प्रोफ़ाइल और उसके डेटा को हटा दिया जाएगा"</string>
     <string name="lock_last_password_attempt_before_wipe_profile" msgid="6786586046975042158">"अगर आप अगली कोशिश में गलत पासवर्ड डालते हैं, तो आपकी कार्य प्रोफ़ाइल और उसके डेटा को हटा दिया जाएगा"</string>
     <string name="lock_failed_attempts_now_wiping_device" msgid="5047439819181833824">"बहुत सारी गलत कोशिशें की गई हैं. इस डिवाइस का डेटा हटा दिया जाएगा."</string>
-    <string name="lock_failed_attempts_now_wiping_user" msgid="6188180643494518001">"बहुत सारी गलत कोशिशें की गई हैं. इस उपयोगकर्ता को हटा दिया जाएगा."</string>
+    <string name="lock_failed_attempts_now_wiping_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>
@@ -586,69 +591,70 @@
     </plurals>
     <string name="lockpassword_password_recently_used" msgid="942665351220525547">"डिवाइस व्यवस्थापक हाल ही के पासवर्ड का उपयोग करने की अनुमति नहीं देता"</string>
     <string name="lockpassword_pin_no_sequential_digits" msgid="680765285206990584">"अंकों के बढ़ते, घटते या दोहराए जाने वाले क्रम की अनुमति नहीं है"</string>
-    <string name="lockpassword_ok_label" msgid="313822574062553672">"ठीक है"</string>
-    <string name="lockpassword_cancel_label" msgid="8818529276331121899">"अभी नहीं"</string>
-    <string name="lockpattern_tutorial_cancel_label" msgid="6431583477570493261">"अभी नहीं"</string>
+    <string name="lockpassword_confirm_label" msgid="8176726201389902380">"पुष्टि करें"</string>
+    <string name="lockpassword_cancel_label" msgid="8818529276331121899">"रद्द करें"</string>
+    <string name="lockpassword_clear_label" msgid="5724429464960458155">"साफ़ करें"</string>
+    <string name="lockpattern_tutorial_cancel_label" msgid="6431583477570493261">"रद्द करें"</string>
     <string name="lockpattern_tutorial_continue_label" msgid="3559793618653400434">"आगे"</string>
     <string name="lock_setup" msgid="3355847066343753943">"सेटअप पूरा हुआ."</string>
-    <string name="manage_device_admin" msgid="537804979483211453">"डिवाइस व्यवस्थापक ऐप्लिकेशन"</string>
+    <string name="manage_device_admin" msgid="537804979483211453">"डिवाइस एडमिन ऐप"</string>
     <string name="number_of_device_admins_none" msgid="7185056721919496069">"कोई भी सक्रिय ऐप्लिकेशन नहीं है"</string>
     <plurals name="number_of_device_admins" formatted="false" msgid="3361891840111523393">
-      <item quantity="one"><xliff:g id="COUNT_1">%d</xliff:g> सक्रिय ऐप्लिकेशन</item>
-      <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> सक्रिय ऐप्लिकेशन</item>
+      <item quantity="one"><xliff:g id="COUNT_1">%d</xliff:g> सक्रिय ऐप</item>
+      <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> सक्रिय ऐप</item>
     </plurals>
     <string name="manage_trust_agents" msgid="4629279457536987768">"ट्रस्ट एजेंट"</string>
     <string name="disabled_because_no_backup_security" msgid="6877660253409580377">"उपयोग करने के लिए, सबसे पहले स्क्रीन लॉक सेट करें"</string>
     <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_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_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>
     <string name="bluetooth_connecting_error_message" msgid="1397388344342081090">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> से कनेक्‍ट नहीं किया जा सका."</string>
     <string name="bluetooth_preference_scan_title" msgid="2277464653118896016">"डिवाइस के लिए स्‍कैन"</string>
     <string name="bluetooth_search_for_devices" msgid="2754007356491461674">"रीफ्रेश करें"</string>
-    <string name="bluetooth_searching_for_devices" msgid="9203739709307871727">"खोज रहा है…"</string>
+    <string name="bluetooth_searching_for_devices" msgid="9203739709307871727">"सर्च कर रहा है…"</string>
     <string name="bluetooth_preference_device_settings" msgid="907776049862799122">"डिवाइस सेटिंग"</string>
     <string name="bluetooth_preference_paired_dialog_title" msgid="8875124878198774180">"युग्मित डिवाइस"</string>
     <string name="bluetooth_preference_paired_dialog_name_label" msgid="8111146086595617285">"नाम"</string>
     <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>
-    <string name="bluetooth_preference_paired_devices" msgid="1970524193086791964">"युग्‍मित डिवाइस"</string>
+    <string name="bluetooth_pairing_dialog_contants_request" msgid="5531109163573611348">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> आपके संपर्कों और कॉल इतिहास तक पहुंचना चाहता है."</string>
+    <string name="bluetooth_pairing_dialog_paring_request" msgid="8451248193517851958">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> Bluetooth से जुड़ना चाहता है. कनेक्ट होने पर, वो आपके संपर्कों और कॉल इतिहास को देख सकेगा."</string>
+    <string name="bluetooth_preference_paired_devices" msgid="1970524193086791964">"जोड़े गए डिवाइस"</string>
     <string name="bluetooth_preference_found_devices" msgid="1647983835063249680">"उपलब्ध डिवाइस"</string>
     <string name="bluetooth_preference_no_found_devices" msgid="7594339669961811591">"कोई डिवाइस उपलब्ध नहीं"</string>
     <string name="bluetooth_device_context_connect" msgid="3997659895003244941">"जोड़ दें"</string>
     <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_advanced_titlebar" msgid="2142159726881547669">"उन्नत ब्लूटूथ"</string>
-    <string name="bluetooth_empty_list_bluetooth_off" msgid="6351930724051893423">"ब्लूटूथ के चालू होने पर, आपका डिवाइस आसपास के अन्य ब्लूटूथ डिवाइसों से संचार कर सकता है."</string>
-    <string name="ble_scan_notify_text" msgid="1295915006005700650">"स्‍थान सटीकता को बेहतर बनाने के लिए, सिस्‍टम ऐप्‍स और सेवाएं अभी भी ब्‍लूटूथ डिवाइसों का पता लगा सकती हैं. आप इसे <xliff:g id="LINK_BEGIN_0">LINK_BEGIN</xliff:g>स्‍कैन करने की सेटिंग<xliff:g id="LINK_END_1">LINK_END</xliff:g> में बदल सकते हैं."</string>
+    <string name="bluetooth_menu_advanced" msgid="8572178316357220524">"बेहतर सेटिंग"</string>
+    <string name="bluetooth_advanced_titlebar" msgid="2142159726881547669">"बेहतर ब्लूटूथ"</string>
+    <string name="bluetooth_empty_list_bluetooth_off" msgid="6351930724051893423">"ब्लूटूथ के चालू होने पर, आपका डिवाइस आस-पास के और ब्लूटूथ डिवाइस से संचार कर सकता है."</string>
+    <string name="ble_scan_notify_text" msgid="1295915006005700650">"जगह की सटीकता को बेहतर बनाने के लिए, सिस्‍टम ऐप और सेवाएं अभी भी ब्‍लूटूथ डिवाइसों का पता लगा सकती हैं. आप इसे <xliff:g id="LINK_BEGIN_0">LINK_BEGIN</xliff:g>स्‍कैन करने की सेटिंग<xliff:g id="LINK_END_1">LINK_END</xliff:g> में बदल सकते हैं."</string>
     <string name="bluetooth_connect_failed" msgid="4500234659813241053">"कनेक्ट नहीं हो सका. फिर से कोशिश करें."</string>
     <string name="device_details_title" msgid="6576953269221085300">"डिवाइस विवरण"</string>
     <string name="bluetooth_device_mac_address" msgid="2513724313558236181">"डिवाइस का ब्लूटूथ पता: <xliff:g id="ADDRESS">%1$s</xliff:g>"</string>
@@ -662,23 +668,23 @@
     <string name="bluetooth_disconnect_headset_profile" msgid="8635908811168780720">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> को हैंड्सफ़्री ऑडियो से डिस्‍कनेक्‍ट कर दिया जाएगा."</string>
     <string name="bluetooth_disconnect_hid_profile" msgid="3282295189719352075">"इनपुट डिवाइस से <xliff:g id="DEVICE_NAME">%1$s</xliff:g> को डिस्‍कनेक्‍ट कर दिया जाएगा."</string>
     <string name="bluetooth_disconnect_pan_user_profile" msgid="8037627994382458698">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> द्वारा इंटरनेट पहुंच को डिस्‍कनेक्‍ट कर दिया जाएगा."</string>
-    <string name="bluetooth_disconnect_pan_nap_profile" product="tablet" msgid="1262792320446274407">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> को इस टेबलेट का इंटरनेट कनेक्‍शन शेयर करने से डिस्‍कनेक्‍ट कर दिया जाएगा."</string>
-    <string name="bluetooth_disconnect_pan_nap_profile" product="default" msgid="5700332050175684571">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> को इस फ़ोन का इंटरनेट कनेक्‍शन शेयर करने से डिस्‍कनेक्‍ट कर दिया जाएगा."</string>
+    <string name="bluetooth_disconnect_pan_nap_profile" product="tablet" msgid="8355910926439312604">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> को इस टैबलेट का इंटरनेट कनेक्‍शन शेयर करने से रोक दिया जाएगा."</string>
+    <string name="bluetooth_disconnect_pan_nap_profile" product="default" msgid="6251611115860359886">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> को इस फ़ोन का इंटरनेट कनेक्‍शन शेयर करने से रोक दिया जाएगा."</string>
     <string name="bluetooth_device_advanced_title" msgid="6066342531927499308">"युग्‍मि‍त ब्लूटूथ डिवाइस"</string>
     <string name="bluetooth_device_advanced_online_mode_title" msgid="3689050071425683114">"जोड़ दें"</string>
     <string name="bluetooth_device_advanced_online_mode_summary" msgid="1204424107263248336">"ब्लूटूथ डिवाइस से कनेक्‍ट करें"</string>
     <string name="bluetooth_device_advanced_profile_header_title" msgid="102745381968579605">"इसके लिए उपयोग करें"</string>
     <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="6436258151814414028">"इंटरनेट के लिए डिवाइस से कनेक्ट है"</string>
+    <string name="bluetooth_pan_nap_profile_summary_connected" msgid="1322694224800769308">"डिवाइस से इंटरनेट शेयर हो रहा है"</string>
     <string name="bluetooth_dock_settings" msgid="3218335822716052885">"डॉक सेटिंग"</string>
     <string name="bluetooth_dock_settings_title" msgid="5543069893044375188">"ऑडियो के लिए डॉक का उपयोग करें"</string>
     <string name="bluetooth_dock_settings_headset" msgid="1001821426078644650">"स्‍पीकर फ़ोन के रूप में"</string>
     <string name="bluetooth_dock_settings_a2dp" msgid="8791004998846630574">"संगीत और मीडिया के लिए"</string>
     <string name="bluetooth_dock_settings_remember" msgid="5551459057010609115">"सेटिंग याद रखें"</string>
     <string name="wifi_display_settings_title" msgid="8740852850033480136">"कास्ट करें"</string>
-    <string name="wifi_display_enable_menu_item" msgid="4883036464138167674">"वायरलेस डिस्प्ले सक्षम करें"</string>
+    <string name="wifi_display_enable_menu_item" msgid="4883036464138167674">"बिना वायर के स्क्रीन दिखाना (वायरलेस डिसप्ले) चालू करें"</string>
     <string name="wifi_display_no_devices_found" msgid="1382012407154143453">"आस-पास कोई भी डिवाइस नहीं मिला."</string>
     <string name="wifi_display_status_connecting" msgid="5688608834000748607">"कनेक्ट कर रहा है"</string>
     <string name="wifi_display_status_connected" msgid="8364125226376985558">"कनेक्ट किया गया"</string>
@@ -695,16 +701,16 @@
     <string name="wifi_ask_enable" msgid="2795469717302060104">"<xliff:g id="REQUESTER">%s</xliff:g> वाई-फ़ाई को चालू करना चाहता है"</string>
     <string name="wifi_ask_disable" msgid="728366570145493573">"<xliff:g id="REQUESTER">%s</xliff:g> वाई-फ़ाई को बंद करना चाहता है"</string>
     <string name="nfc_quick_toggle_title" msgid="6769159366307299004">"आस-पास के उपकरणों से संपर्क (एन एफ सी)"</string>
-    <string name="nfc_quick_toggle_summary" product="tablet" msgid="8302974395787498915">"जब टेबलेट अन्य डिवाइस को स्पर्श करे तो डेटा ट्रांसफर करने दें"</string>
+    <string name="nfc_quick_toggle_summary" product="tablet" msgid="8302974395787498915">"जब टैबलेट अन्य डिवाइस को स्पर्श करे तो डेटा ट्रांसफर करने दें"</string>
     <string name="nfc_quick_toggle_summary" product="default" msgid="5237208142892767592">"जब फ़ोन अन्य डिवाइस को स्पर्श करे तो डेटा ट्रांसफर करने दें"</string>
     <string name="nfc_disclaimer_title" msgid="4364003873202264039">"NFC चालू करें"</string>
     <string name="nfc_disclaimer_content" msgid="5566907911915158075">"NFC इस डिवाइस और आस-पास के अन्य डिवाइस या लक्ष्यों के बीच डेटा का आदान-प्रदान करता है, जैसे कि भुगतान टर्मिनल, एक्सेस रीडर और सहभागी विज्ञापन या टैग."</string>
-    <string name="android_beam_settings_title" msgid="7832812974600338649">"Android Beam"</string>
-    <string name="android_beam_on_summary" msgid="3618057099355636830">"NFC के माध्यम से ऐप्स सामग्री प्रसारित करने के लिए तैयार"</string>
+    <string name="android_beam_settings_title" msgid="7832812974600338649">"Android बीम"</string>
+    <string name="android_beam_on_summary" msgid="3618057099355636830">"NFC के माध्यम से ऐप सामग्री प्रसारित करने के लिए तैयार"</string>
     <string name="android_beam_off_summary" msgid="4663095428454779138">"बंद"</string>
     <string name="android_beam_disabled_summary" msgid="1737782116894793393">"अनुपलब्‍ध है क्‍योंकि NFC बंद है"</string>
-    <string name="android_beam_label" msgid="6257036050366775040">"Android Beam"</string>
-    <string name="android_beam_explained" msgid="1810540319385192758">"इस सुविधा के चालू होने पर, आप ऐप्लिकेशन की सामग्री को किसी दूसरे NFC-सक्षम डिवाइस पर बीम कर सकते हैं, जिसके लिए आपको दोनों डिवाइस पास-पास पकड़कर रखने होंगे. उदाहरण के लिए, आप वेब पेज, YouTube वीडियो, संपर्कों आदि को बीम कर सकते हैं.\n\nबस दोनों डिवाइस साथ लाएं (आमतौर एक के पीछे एक) और फिर अपनी स्क्रीन टैप करें. ऐप्लिकेशन पता लगा लेता है कि कौन सी चीज़ बीम हो रही है."</string>
+    <string name="android_beam_label" msgid="6257036050366775040">"Android बीम"</string>
+    <string name="android_beam_explained" msgid="1810540319385192758">"इस सुविधा के चालू होने पर, आप ऐप्लिकेशन की सामग्री को किसी ऐसे दूसरे डिवाइस पर बीम कर सकते हैं जिपर NFC की तकनीक काम करती हो. इसके लिए आपको दोनों डिवाइस पास-पास पकड़कर रखने होंगे. जैसे, आप वेब पेज, YouTube वीडियो, संपर्कों आदि को बीम कर सकते हैं.\n\nबस दोनों डिवाइस साथ लाएं (आमतौर एक के पीछे एक) और फिर अपनी स्क्रीन टैप करें. ऐप पता लगा लेता है कि कौन सी चीज़ बीम हो रही है."</string>
     <string name="wifi_quick_toggle_title" msgid="8850161330437693895">"वाई-फ़ाई"</string>
     <string name="wifi_quick_toggle_summary" msgid="2696547080481267642">"वाई-फ़ाई  चालू करें"</string>
     <string name="wifi_settings" msgid="29722149822540994">"वाई-फ़ाई"</string>
@@ -717,44 +723,44 @@
     <string name="wifi_error" msgid="3207971103917128179">"गड़बड़ी"</string>
     <string name="wifi_sap_no_channel_error" msgid="3108445199311817111">"5 GHz बैंड इस देश में उपलब्‍ध नहीं है"</string>
     <string name="wifi_in_airplane_mode" msgid="8652520421778203796">"हवाई जहाज़ मोड में"</string>
-    <string name="wifi_notify_open_networks" msgid="76298880708051981">"खुले नेटवर्क का नोटिफ़िकेशन"</string>
+    <string name="wifi_notify_open_networks" msgid="76298880708051981">"ओपन नेटवर्क की सूचना"</string>
     <string name="wifi_notify_open_networks_summary" msgid="2761326999921366960">"बढ़िया इंटरनेट देने वाला सार्वजनिक नेटवर्क मिलने पर बताएं"</string>
     <string name="wifi_wakeup" msgid="8815640989361538036">"वाई-फ़ाई अपने आप चालू करें"</string>
     <string name="wifi_wakeup_summary" msgid="2530814331062997163">"वाई-फ़ाई बढ़िया इंटरनेट देने वाले सहेजे गए नेटवर्क के पास होने पर अपने आप चालू  हो जाएगा, जैसे कि आपके घर का नेटवर्क"</string>
     <string name="wifi_wakeup_summary_scanning_disabled" msgid="7247227922074840445">"अनुपलब्ध है क्योंकि वाई-फ़ाई स्कैनिंग बंद कर दी गई है"</string>
     <string name="wifi_wakeup_summary_scoring_disabled" msgid="108339002136866897">"उपयोग करने के लिए, कोई नेटवर्क रेटिंग प्रदाता चुनें"</string>
     <string name="wifi_poor_network_detection" msgid="4925789238170207169">"खराब कनेक्‍शन से बचें"</string>
-    <string name="wifi_poor_network_detection_summary" msgid="2784135142239546291">"जब तक वाई-फ़ाई  नेटवर्क में अच्छा इंटरनेट कनेक्‍शन न हो, तब तक उसका उपयोग न करें"</string>
-    <string name="wifi_avoid_poor_network_detection_summary" msgid="4674423884870027498">"उन्हीं नेटवर्क का उपयोग करें जिनमें अच्छा इंटरनेट कनेक्शन है"</string>
+    <string name="wifi_poor_network_detection_summary" msgid="7016103106105907127">"जब तक इंटरनेट कनेक्‍शन अच्छा न हो, वाई-फ़ाई नेटवर्क का इस्तेमाल न करें"</string>
+    <string name="wifi_avoid_poor_network_detection_summary" msgid="1644292503152790501">"उन्हीं नेटवर्क का इस्तेमाल करें, जिनमें अच्छा इंटरनेट कनेक्शन है"</string>
     <string name="use_open_wifi_automatically_title" msgid="6851951242903078588">"खुले नेटवर्क से कनेक्ट करें"</string>
     <string name="use_open_wifi_automatically_summary" msgid="2982091714252931713">"अच्छा इंटरनेट देने वाले सार्वजनिक नेटवर्क से अपने आप कनेक्ट करें"</string>
     <string name="use_open_wifi_automatically_summary_scoring_disabled" msgid="593964217679325831">"उपयोग करने के लिए, कोई नेटवर्क रेटिंग प्रदाता चुनें"</string>
     <string name="use_open_wifi_automatically_summary_scorer_unsupported_disabled" msgid="8472122600853650258">"उपयोग करने के लिए, कोई संगत नेटवर्क रेटिंग प्रदाता चुनें"</string>
     <string name="wifi_install_credentials" msgid="3551143317298272860">"प्रमाणपत्र इंस्टाल करें"</string>
-    <string name="wifi_scan_notify_text" msgid="5593805423071186757">"स्‍थान सटीकता को बेहतर बनाने के लिए, सिस्‍टम ऐप्‍स और सेवाएं अभी भी वाई-फ़ाई नेटवर्कों का पता लगा सकती हैं. आप इसे <xliff:g id="LINK_BEGIN_0">LINK_BEGIN</xliff:g>स्‍कैन करने की सेटिंग<xliff:g id="LINK_END_1">LINK_END</xliff:g> में बदल सकते हैं."</string>
-    <string name="wifi_scan_notify_text_scanning_off" msgid="3426075479272242098">"स्थान सटीकता को बेहतर बनाने के लिए, <xliff:g id="LINK_BEGIN_0">LINK_BEGIN</xliff:g>स्कैनिंग सेटिंग<xliff:g id="LINK_END_1">LINK_END</xliff:g> में वाई-फ़ाई स्कैनिंग चालू करें."</string>
+    <string name="wifi_scan_notify_text" msgid="5593805423071186757">"जगह की और सटीक जानकारी देने के लिए, सिस्‍टम ऐप और सेवाएं अभी भी वाई-फ़ाई नेटवर्क का पता लगा सकती हैं. आप इसे <xliff:g id="LINK_BEGIN_0">LINK_BEGIN</xliff:g>स्‍कैन करने की सेटिंग<xliff:g id="LINK_END_1">LINK_END</xliff:g> में बदल सकते हैं."</string>
+    <string name="wifi_scan_notify_text_scanning_off" msgid="3426075479272242098">"जगह की सटीकता को बेहतर बनाने के लिए, <xliff:g id="LINK_BEGIN_0">LINK_BEGIN</xliff:g>स्कैनिंग सेटिंग<xliff:g id="LINK_END_1">LINK_END</xliff:g> में वाई-फ़ाई स्कैनिंग चालू करें."</string>
     <string name="wifi_scan_notify_remember_choice" msgid="7104867814641144485">"फिर से न दिखाएं"</string>
     <string name="wifi_setting_sleep_policy_title" msgid="5149574280392680092">"प्रयोग में नहीं रहने के दौरान वाई-फ़ाई चालू रखें"</string>
-    <string name="wifi_setting_on_during_sleep_title" msgid="8308975500029751565">"निष्क्रिय रहने पर वाई-फ़ाई चालू"</string>
+    <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>
     <string name="wifi_suspend_optimizations_summary" msgid="4151428966089116856">"वाई-फ़ाई  के चालू रहने पर बैटरी उपयोग को न्यूनतम करें"</string>
     <string name="wifi_limit_optimizations_summary" msgid="9000801068363468950">"वाई-फ़ाई का बैटरी उपयोग कम करें"</string>
-    <string name="wifi_switch_away_when_unvalidated" msgid="1707247692180853058">"अगर वाई-फ़ाई, इंटरनेट एक्सेस खो देता है, तो मोबाइल डेटा पर स्विच करें."</string>
+    <string name="wifi_switch_away_when_unvalidated" msgid="8593144541347373394">"अगर वाई-फ़ाई नहीं चल रहा हो, तो मोबाइल डेटा पर स्विच करें."</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="1403505355490119307">"जब वाई-फ़ाई के ज़रिए इंटरनेट न उपलब्ध हो, तो मोबाइल डेटा इस्तेमाल करें. डेटा के लिए भुगतान करना पड़ सकता है."</string>
     <string name="wifi_add_network" msgid="6234851776910938957">"नेटवर्क जोड़ें"</string>
     <string name="wifi_configure_settings_preference_title" msgid="2913345003906899146">"वाई-फ़ाई संबंधी प्राथमिकताएं"</string>
     <string name="wifi_configure_settings_preference_summary_wakeup_on" msgid="646393113104367290">"वाई-फ़ाई अपने आप वापस चालू हो जाता है"</string>
     <string name="wifi_configure_settings_preference_summary_wakeup_off" msgid="2782566279864356713">"वाई-फ़ाई अपने आप वापस चालू नहीं होता"</string>
     <string name="wifi_access_points" msgid="7053990007031968609">"वाई-फ़ाई  नेटवर्क"</string>
     <string name="wifi_menu_wps_pbc" msgid="2668564692207863017">"WPS पुश बटन"</string>
-    <string name="wifi_menu_more_options" msgid="2448097861752719396">"अधिक विकल्प"</string>
-    <string name="wifi_menu_wps_pin" msgid="6426448256268695933">"WPS पिन प्रविष्टि"</string>
+    <string name="wifi_menu_more_options" msgid="2448097861752719396">"ज़्यादा विकल्प"</string>
+    <string name="wifi_menu_wps_pin" msgid="6426448256268695933">"WPS पिन एंट्री"</string>
     <string name="wifi_menu_p2p" msgid="7619851399250896797">"वाई-फ़ाई डायरेक्ट"</string>
     <string name="wifi_menu_scan" msgid="1470911530412095868">"स्कैन करें"</string>
-    <string name="wifi_menu_advanced" msgid="7522252991919573664">"अतिरिक्त सेटिंग"</string>
+    <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>
@@ -762,13 +768,13 @@
     <string name="wifi_menu_modify" msgid="2068554918652440105">"नेटवर्क बदलें"</string>
     <string name="wifi_menu_write_to_nfc" msgid="7692881642188240324">"NFC टैग पर लिखें"</string>
     <string name="wifi_empty_list_wifi_off" msgid="8056223875951079463">"उपलब्‍ध नेटवर्क देखने के लिए, वाई-फ़ाई  चालू करें."</string>
-    <string name="wifi_empty_list_wifi_on" msgid="8746108031587976356">"वाई-फ़ाई  नेटवर्क की खोज जारी है…"</string>
+    <string name="wifi_empty_list_wifi_on" msgid="8746108031587976356">"वाई-फ़ाई नेटवर्क की सर्च जारी है…"</string>
     <string name="wifi_empty_list_user_restricted" msgid="7322372065475939129">"आपको वाई-फ़ाई नेटवर्क बदलने की अनुमति नहीं है."</string>
     <string name="wifi_more" msgid="3195296805089107950">"अधिक"</string>
     <string name="wifi_setup_wps" msgid="8128702488486283957">"स्‍वचालित सेटअप (WPS)"</string>
-    <string name="wifi_show_advanced" msgid="3409422789616520979">"अतिरिक्त सेटिंग"</string>
-    <string name="wifi_advanced_toggle_description_expanded" msgid="2380600578544493084">"ड्रॉप डाउन सूची उन्नत विकल्प. संक्षिप्त करने के लिए डबल टैप करें."</string>
-    <string name="wifi_advanced_toggle_description_collapsed" msgid="1463812308429197263">"ड्रॉप डाउन सूची उन्नत विकल्प. विस्तृत करने के लिए डबल टैप करें."</string>
+    <string name="wifi_show_advanced" msgid="3409422789616520979">"बेहतर विकल्प"</string>
+    <string name="wifi_advanced_toggle_description_expanded" msgid="2380600578544493084">"ड्रॉप डाउन सूची के बेहतर विकल्प. छोटा करने के लिए दो बार छूएं."</string>
+    <string name="wifi_advanced_toggle_description_collapsed" msgid="1463812308429197263">"ड्रॉप डाउन सूची के बेहतर विकल्प. बड़ा करने के लिए दो बार छूएं."</string>
     <string name="wifi_wps_setup_title" msgid="8207552222481570175">"वाई-फ़ाई  सुरक्षित सेटअप"</string>
     <string name="wifi_wps_setup_msg" msgid="315174329121275092">"WPS प्रारंभ हो रहा है…"</string>
     <string name="wifi_wps_onstart_pbc" msgid="817003360936932340">"अपने राउटर पर वाई-फ़ाई सुरक्षित सेटअप बटन दबाएं. इसे \"WPS\" कहा जा सकता है या इस प्रतीक से चिह्नित हो सकता है:"</string>
@@ -781,6 +787,7 @@
     <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>
@@ -788,7 +795,7 @@
     <string name="wifi_status" msgid="4824568012414605414">"स्थिति"</string>
     <string name="wifi_speed" msgid="3526198708812322037">"लिंक गति"</string>
     <string name="wifi_frequency" msgid="7791090119577812214">"आवृत्ति"</string>
-    <string name="wifi_ip_address" msgid="1440054061044402918">"IP पता"</string>
+    <string name="wifi_ip_address" msgid="1440054061044402918">"आईपी पता"</string>
     <string name="passpoint_label" msgid="6381371313076009926">"के द्वारा सहेजा गया"</string>
     <string name="passpoint_content" msgid="8447207162397870483">"<xliff:g id="NAME">%1$s</xliff:g> प्रमाणिकता"</string>
     <string name="wifi_eap_method" msgid="8529436133640730382">"EAP विधि"</string>
@@ -817,44 +824,48 @@
     <string name="wifi_wps_available_first_item" msgid="4422547079984583502">"WPS उपलब्‍ध"</string>
     <string name="wifi_wps_available_second_item" msgid="8427520131718215301">" (WPS उपलब्‍ध)"</string>
     <string name="wifi_wps_nfc_enter_password" msgid="2288214226916117159">"अपना नेटवर्क पासवर्ड डालें"</string>
-    <string name="wifi_scan_always_turnon_message" msgid="203123538572122989">"स्थान की सटीकता को बेहतर बनाने और अन्य प्रयोजनों के लिए, वाई-फ़ाई  बंद होने पर भी <xliff:g id="APP_NAME">%1$s</xliff:g> नेटवर्क स्कैनिंग को चालू करना चाहता है.\n\nइसकी अनुमति उन सभी ऐप्स  के लिए दें जो स्कैन करना चाहते हैं?"</string>
-    <string name="wifi_scan_always_turnoff_message" msgid="5538901671131941043">"इसे बंद करने के लिए, ओवरफ़्लो मेनू में उन्नत पर जाएं."</string>
+    <string name="wifi_carrier_connect" msgid="8174696557882299911">"मोबाइल और इंटरनेट सेवा देने वाली कंपनी वाई-फ़ाई नेटवर्क"</string>
+    <string name="wifi_carrier_content" msgid="4634077285415851933">"<xliff:g id="NAME">%1%s</xliff:g> से कनेक्ट करें"</string>
+    <string name="wifi_scan_always_turnon_message" msgid="203123538572122989">"जगह की सटीकता को बेहतर बनाने और दुसरे कामों के लिए, Wi-Fi बंद होने पर भी <xliff:g id="APP_NAME">%1$s</xliff:g> नेटवर्क को स्कैन करना चालू करना चाहता है.\n\nउन सभी ऐप को इसकी अनुमति दें जो स्कैन करना चाहते हैं?"</string>
+    <string name="wifi_scan_always_turnoff_message" msgid="5538901671131941043">"इसे बंद करने के लिए, ओवरफ़्लो मेन्यू में बेहतर पर जाएं."</string>
     <string name="wifi_scan_always_confirm_allow" msgid="5355973075896817232">"अनुमति दें"</string>
     <string name="wifi_scan_always_confirm_deny" msgid="4463982053823520710">"अस्वीकार करें"</string>
-    <string name="wifi_hotspot_title" msgid="7726205804813286950">"कनेक्ट करने के लिए प्रवेश करें?"</string>
-    <string name="wifi_hotspot_message" msgid="3673833421453455747">"<xliff:g id="APP_NAME">%1$s</xliff:g> के लिए आवश्यक है कि नेटवर्क से कनेक्ट करने से पहले ऑनलाइन प्रवेश करें."</string>
+    <string name="wifi_hotspot_title" msgid="7726205804813286950">"कनेक्ट करने के लिए साइन इन करें?"</string>
+    <string name="wifi_hotspot_message" msgid="3673833421453455747">"<xliff:g id="APP_NAME">%1$s</xliff:g> के लिए नेटवर्क से कनेक्ट करने से पहले साइन करें."</string>
     <string name="wifi_hotspot_connect" msgid="5065506390164939225">"कनेक्ट करें"</string>
-    <string name="no_internet_access_text" msgid="7133561752896706392">"इस नेटवर्क में कोई इंटरनेट ऐक्‍सेस नहीं है. कनेक्‍ट रहें?"</string>
+    <string name="no_internet_access_text" msgid="5926979351959279577">"इस नेटवर्क में कोई इंटरनेट एक्सेस नहीं है. जुड़े रहें?"</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_title" msgid="5779478650636392426">"वाई-फ़ाई इंटरनेट से नहीं जुड़ा है"</string>
+    <string name="lost_internet_access_text" msgid="9029649339816197345">"जब भी वाई-फ़ाई कनेक्शन खराब हो तब आप मोबाइल नेटवर्क का इस्तेमाल कर सकते हैं. डेटा खर्च शुल्क लागू किया जा सकता है."</string>
     <string name="lost_internet_access_switch" msgid="2262459569601190039">"मोबाइल पर स्विच करें"</string>
     <string name="lost_internet_access_cancel" msgid="338273139419871110">"वाई-फ़ाई पर रहें"</string>
     <string name="lost_internet_access_persist" msgid="7634876061262676255">"फिर कभी ना दिखाएं"</string>
     <string name="wifi_connect" msgid="1076622875777072845">"जोड़ दें"</string>
     <string name="wifi_failed_connect_message" msgid="8491902558970292871">"नेटवर्क से कनेक्ट करने में विफल रहा"</string>
     <string name="wifi_forget" msgid="8168174695608386644">"भूलें"</string>
+    <string name="wifi_modify" msgid="6100248070440710782">"बदलें"</string>
     <string name="wifi_failed_forget_message" msgid="1348172929201654986">"नेटवर्क भूलने में विफल रहा"</string>
     <string name="wifi_save" msgid="3331121567988522826">"जोड़ें"</string>
     <string name="wifi_failed_save_message" msgid="6650004874143815692">"नेटवर्क सहेजने में विफल रहा"</string>
-    <string name="wifi_cancel" msgid="6763568902542968964">"अभी नहीं"</string>
+    <string name="wifi_cancel" msgid="6763568902542968964">"रद्द करें"</string>
     <string name="wifi_saved_access_points_titlebar" msgid="2996149477240134064">"सहेजे गए नेटवर्क"</string>
     <plurals name="wifi_saved_access_points_summary" formatted="false" msgid="6094679048871529675">
       <item quantity="one">%d नेटवर्क</item>
       <item quantity="other">%d नेटवर्क</item>
     </plurals>
-    <string name="wifi_advanced_titlebar" msgid="4485841401774142908">"अतिरिक्त सेटिंग"</string>
+    <string name="wifi_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_advanced_ip_address_title" msgid="6215297094363164846">"आईपी पता"</string>
+    <string name="wifi_details_title" msgid="8954667664081737098">"नेटवर्क के बारे में जानकारी"</string>
     <string name="wifi_details_subnet_mask" msgid="6720279144174924410">"सबनेट मास्क"</string>
     <string name="wifi_details_dns" msgid="8648826607751830768">"DNS"</string>
     <string name="wifi_details_ipv6_address_header" msgid="6734119149106422148">"IPv6 पते"</string>
     <string name="wifi_saved_access_points_label" msgid="2013409399392285262">"सहेजे गए नेटवर्क"</string>
     <string name="wifi_advanced_settings_label" msgid="3654366894867838338">"IP सेटिंग"</string>
-    <string name="wifi_advanced_not_available" msgid="5823045095444154586">"वाई-फ़ाई की उन्नत सेटिंग इस उपयोगकर्ता के लिए उपलब्ध नहीं हैं"</string>
+    <string name="wifi_advanced_not_available" msgid="5823045095444154586">"वाई-फ़ाई की बेहतर सेटिंग इस उपयोगकर्ता के लिए मौजूद नहीं हैं"</string>
     <string name="wifi_ip_settings_menu_save" msgid="7296724066102908366">"जोड़ें"</string>
-    <string name="wifi_ip_settings_menu_cancel" msgid="6582567330136502340">"अभी नहीं"</string>
-    <string name="wifi_ip_settings_invalid_ip_address" msgid="2513142355364274970">"मान्‍य IP पता लिखें."</string>
+    <string name="wifi_ip_settings_menu_cancel" msgid="6582567330136502340">"रद्द करें"</string>
+    <string name="wifi_ip_settings_invalid_ip_address" msgid="2513142355364274970">"सही आईपी पता लिखें."</string>
     <string name="wifi_ip_settings_invalid_gateway" msgid="8164264988361096450">"कोई मान्‍य गेटवे पता लिखें."</string>
     <string name="wifi_ip_settings_invalid_dns" msgid="8744583948328391047">"कोई मान्‍य DNS पता लिखें."</string>
     <string name="wifi_ip_settings_invalid_network_prefix_length" msgid="40470058023181052">"0 और 32 के बीच की लंबाई का नेटवर्क उपसर्ग लिखें."</string>
@@ -863,10 +874,10 @@
     <string name="wifi_gateway" msgid="163914742461092086">"गेटवे"</string>
     <string name="wifi_network_prefix_length" msgid="3028785234245085998">"नेटवर्क उपसर्ग लंबाई"</string>
     <string name="wifi_p2p_settings_title" msgid="5444461191435291082">"वाई-फ़ाई डायरेक्ट"</string>
-    <string name="wifi_p2p_device_info" msgid="3191876744469364173">"डिवाइस जानकारी"</string>
+    <string name="wifi_p2p_device_info" msgid="3191876744469364173">"डिवाइस की जानकारी"</string>
     <string name="wifi_p2p_persist_network" msgid="1646424791818168590">"यह कनेक्‍शन याद रखें"</string>
-    <string name="wifi_p2p_menu_search" msgid="3436429984738771974">"डिवाइस खोजें"</string>
-    <string name="wifi_p2p_menu_searching" msgid="2396704492143633876">"खोज रहा है…"</string>
+    <string name="wifi_p2p_menu_search" msgid="3436429984738771974">"डिवाइस सर्च करें"</string>
+    <string name="wifi_p2p_menu_searching" msgid="2396704492143633876">"खोज रहा है..."</string>
     <string name="wifi_p2p_menu_rename" msgid="8448896306960060415">"डिवाइस का नाम बदलें"</string>
     <string name="wifi_p2p_peer_devices" msgid="299526878463303432">"पीयर डिवाइस"</string>
     <string name="wifi_p2p_remembered_groups" msgid="3847022927914068230">"याद रखे गए समूह"</string>
@@ -878,18 +889,17 @@
     <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_off_subtext" msgid="5466126533609394170">"दूसरे डिवाइस से इंटरनेट या सामग्री को साझा नहीं किया जा रहा है"</string>
-    <string name="wifi_hotspot_tethering_on_subtext" product="tablet" msgid="5752490509369962007">"हॉटस्पॉट के ज़रिए इस टैबलेट का इंटरनेट कनेक्शन साझा किया जा रहा है"</string>
-    <string name="wifi_hotspot_tethering_on_subtext" product="default" msgid="6461075246164300670">"हॉटस्पॉट के ज़रिए इस फ़ोन का इंटरनेट कनेक्शन साझा किया जा रहा है"</string>
-    <string name="wifi_hotspot_on_local_only_subtext" msgid="2068110388011294735">"ऐप्लिकेशन सामग्री साझा कर रहा है. इंटरनेट कनेक्शन साझा करने के लिए, हॉटस्पॉट बंद करें, फिर उसे चालू करें"</string>
-    <string name="wifi_hotspot_name_title" msgid="1341735529132128887">"वाई-फ़ाई का नाम"</string>
+    <string name="wifi_hotspot_off_subtext" msgid="2199911382555864644">"दूसरे डिवाइस से इंटरनेट या सामग्री को शेयर नहीं किया जा रहा है"</string>
+    <string name="wifi_hotspot_tethering_on_subtext" product="tablet" msgid="5936710887156133458">"हॉटस्पॉट के ज़रिए इस टैबलेट का इंटरनेट कनेक्शन शेयर किया जा रहा है"</string>
+    <string name="wifi_hotspot_tethering_on_subtext" product="default" msgid="5556202634866621632">"हॉटस्पॉट के ज़रिए इस फ़ोन का इंटरनेट कनेक्शन शेयर किया जा रहा है"</string>
+    <string name="wifi_hotspot_on_local_only_subtext" msgid="5017191966153008">"ऐप सामग्री शेयर कर रहा है. इंटरनेट कनेक्शन शेयर करने के लिए, हॉटस्पॉट बंद करके फिर उसे चालू करें"</string>
+    <string name="wifi_hotspot_name_title" msgid="8237000746618636778">"हॉटस्पॉट का नाम"</string>
     <string name="wifi_hotspot_name_summary_connecting" msgid="3378299995508671967">"<xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g> चालू किया जा रहा है..."</string>
     <string name="wifi_hotspot_name_summary_connected" msgid="3888672084861445362">"दूसरे डिवाइस <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g> से कनेक्ट हो सकते हैं"</string>
-    <string name="wifi_hotspot_password_title" msgid="1955592302902091281">"वाई-फ़ाई पासवर्ड"</string>
+    <string name="wifi_hotspot_password_title" msgid="8676859981917573801">"हॉटस्पॉट का पासवर्ड"</string>
     <string name="wifi_hotspot_ap_band_title" msgid="1165801173359290681">"AP बैंड"</string>
-    <string name="wifi_hotspot_footer_info_regular" msgid="1203489406068036455">"हॉटस्पॉट का उपयोग करके अपने दूसरे डिवाइस के लिए वाई-फ़ाई नेटवर्क बनाएं. हॉटस्पॉट आपके मोबाइल डेटा कनेक्शन का उपयोग करके इंटरनेट देता है. अतिरिक्त मोबाइल डेटा शुल्क लागू हो सकते हैं."</string>
+    <string name="wifi_hotspot_footer_info_regular" msgid="4789553667374849566">"अपने दूसरे डिवाइस के लिए हॉटस्पॉट का इस्तेमाल करके वाई-फ़ाई नेटवर्क बनाएं. हॉटस्पॉट आपके मोबाइल डेटा कनेक्शन के ज़रिए इंटरनेट की सुविधा देता है. मोबाइल डेटा के लिए अतिरिक्त भुगतान करना पड़ सकता है."</string>
     <string name="wifi_hotspot_footer_info_local_only" msgid="857988412470694109">"ऐप्लिकेशन आस-पास के डिवाइस से सामग्री साझा करने के लिए कोई हॉटस्पॉट बना सकते हैं."</string>
     <string name="wifi_tether_starting" msgid="1322237938998639724">"हॉटस्‍पॉट को चालू किया जा रहा है…"</string>
     <string name="wifi_tether_stopping" msgid="4835852171686388107">"हॉटस्‍पॉट को बंद किया जा रहा है…"</string>
@@ -898,7 +908,6 @@
     <string name="wifi_tether_configure_ap_text" msgid="7974681394041609308">"वाई-फ़ाई  हॉटस्‍पॉट सेट करें"</string>
     <string name="wifi_hotspot_configure_ap_text" msgid="5478614731464220432">"वाई-फ़ाई हॉटस्पॉट सेटअप"</string>
     <string name="wifi_hotspot_configure_ap_text_summary" msgid="5560680057727007011">"AndroidAP WPA2 PSK हॉटस्पॉट"</string>
-    <string name="wifi_tether_configure_subtext" msgid="2050196439900426456">"<xliff:g id="NETWORK_SSID">%1$s</xliff:g> <xliff:g id="NETWORK_SECURITY">%2$s</xliff:g> हॉटस्पॉट"</string>
     <string name="wifi_tether_configure_ssid_default" msgid="8467525402622138547">"AndroidHotspot"</string>
     <string name="wifi_calling_settings_title" msgid="4102921303993404577">"वाई-फ़ाई कॉलिंग"</string>
     <string name="wifi_calling_suggestion_title" msgid="9008010480466359578">"वाई-फ़ाई कॉलिंग चालू करें"</string>
@@ -936,22 +945,22 @@
     <item msgid="2339246858001475047">"2"</item>
     <item msgid="6200207341126893791">"1"</item>
   </string-array>
-    <string name="wifi_calling_off_explanation" msgid="2597566001655908391">"वाई-फ़ाई कॉलिंग चालू होने पर, आपका फ़ोन आपकी प्राथमिकता और अधिक सशक्त सिग्‍नल के आधार पर वाई-फ़ाई नेटवर्क या आपके वाहक के नेटवर्क के द्वारा कॉल को रूट कर सकता है. इस सुविधा को चालू करने से पहले, शुल्‍क और अन्‍य विवरणों के बारे में अपने वाहक से बात करें."</string>
+    <string name="wifi_calling_off_explanation" msgid="2597566001655908391">"वाई-फ़ाई कॉलिंग चालू होने पर, आपका फ़ोन वाई-फ़ाई या मोबाइल और इंटरनेट सेवा देने वाली कंपनी के नेटवर्क के ज़रिए कॉल कर सकता है. यह इस बात पर निर्भर करेगा कि आप क्या चाहते हैं और इनमें से कौन सा सिग्नल बेहतर काम कर रहा है. इस सुविधा को चालू करने से पहले, शुल्‍क और अन्‍य जानकारी के बारे में अपनी मोबाइल और इंटरनेट सेवा देने वाली कंपनी से बात करें."</string>
     <string name="wifi_calling_off_explanation_2" msgid="2329334487851497223"></string>
-    <string name="emergency_address_title" msgid="3571902448699714454">"आपातकालीन पता अपडेट करें"</string>
-    <string name="emergency_address_summary" msgid="306028701568728126">"जब आप वाई-फ़ाई का उपयोग करके 911 पर कॉल करते है तब आपातकालीन सेवाओं द्वारा आपके स्थान के रूप में उपयोग किया जाने वाला पता"</string>
+    <string name="emergency_address_title" msgid="932729250447887545">"आपातकालीन पता"</string>
+    <string name="emergency_address_summary" msgid="7751971156196115129">"जब आप वाई-फ़ाई पर आपातकालीन कॉल करते हैं, तब आपकी मौजूदा जगह को आपके पते के तौर पर इस्तेमाल किया जाता है"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"स्क्रीन सेटिंग देखें"</string>
-    <string name="sound_settings" msgid="5534671337768745343">"ध्वनि"</string>
+    <string name="sound_settings" msgid="5534671337768745343">"आवाज़"</string>
     <string name="all_volume_title" msgid="4296957391257836961">"आवाज़"</string>
     <string name="musicfx_title" msgid="3415566786340790345">"संगीत प्रभाव"</string>
     <string name="ring_volume_title" msgid="5592466070832128777">"रिंग वॉल्यूम"</string>
-    <string name="vibrate_in_silent_title" msgid="3897968069156767036">"मौन होने पर कंपन करें"</string>
-    <string name="notification_sound_title" msgid="5137483249425507572">"साधारण नोटिफिकेशन ध्वनी"</string>
+    <string name="vibrate_in_silent_title" msgid="3897968069156767036">"शांत होने पर कंपन (वाइब्रेशन) करे"</string>
+    <string name="notification_sound_title" msgid="5137483249425507572">"सूचना की डिफ़ॉल्ट आवाज़"</string>
     <string name="incoming_call_volume_title" msgid="8073714801365904099">"रिंगटोन"</string>
-    <string name="notification_volume_title" msgid="2012640760341080408">"नोटिफ़िकेशन"</string>
-    <string name="checkbox_notification_same_as_incoming_call" msgid="1073644356290338921">"नोटिफिकेशन के लिए इनकमिंग कॉल वॉल्‍यूम का उपयोग करें"</string>
+    <string name="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>
@@ -959,47 +968,51 @@
     <string name="dtmf_tone_enable_title" msgid="8533399267725365088">"कॉल करते समय ध्वनी सुने"</string>
     <string name="sound_effects_enable_title" msgid="4429690369187229592">"ध्वनियां टैप करें"</string>
     <string name="lock_sounds_enable_title" msgid="450098505659399520">"स्‍क्रीन लॉक ध्‍वनि"</string>
-    <string name="haptic_feedback_enable_title" msgid="7152163068278526530">"टैप करने पर कंपन करें"</string>
+    <string name="haptic_feedback_enable_title" msgid="7152163068278526530">"छूने पर कंपन (वाइब्रेशन) करें"</string>
     <string name="audio_record_proc_title" msgid="4271091199976457534">"शोर रद्दीकरण"</string>
     <string name="volume_media_description" msgid="7949355934788807863">"संगीत, वीडियो,गेमऔर अन्‍य मीडिया"</string>
-    <string name="volume_ring_description" msgid="5936851631698298989">"रिंगटोन और नोटिफिकेशन"</string>
-    <string name="volume_notification_description" msgid="5810902320215328321">"नोटिफ़िकेशन"</string>
+    <string name="volume_ring_description" msgid="5936851631698298989">"रिंगटोन और सूचनाएं"</string>
+    <string name="volume_notification_description" msgid="5810902320215328321">"सूचनाएं"</string>
     <string name="volume_alarm_description" msgid="8322615148532654841">"अलार्म"</string>
-    <string name="volume_ring_mute" msgid="3018992671608737202">"रिंगटोन और नोटिफिकेशन म्‍यूट करें"</string>
+    <string name="volume_ring_mute" msgid="3018992671608737202">"रिंगटोन और सूचनाएं म्‍यूट करें"</string>
     <string name="volume_media_mute" msgid="3399059928695998166">"संगीत और अन्‍य मीडिया म्‍यूट करें"</string>
-    <string name="volume_notification_mute" msgid="7955193480006444159">"नोटिफिकेशन म्‍यूट करें"</string>
+    <string name="volume_notification_mute" msgid="7955193480006444159">"सूचनाओं को म्‍यूट करें"</string>
     <string name="volume_alarm_mute" msgid="4452239420351035936">"अलार्म म्‍यूट करें"</string>
     <string name="dock_settings" msgid="1820107306693002541">"डॉक"</string>
     <string name="dock_settings_title" msgid="9161438664257429372">"डॉक सेटिंग"</string>
     <string name="dock_audio_settings_title" msgid="3324750259959570305">"ऑडियो"</string>
     <string name="dock_audio_summary_desk" msgid="6487784412371139335">"संलग्‍न डेस्‍कटॉप डॉक के लिए सेटिंग"</string>
     <string name="dock_audio_summary_car" msgid="6740897586006248450">"संलग्‍न कार डॉक के लिए सेटिंग"</string>
-    <string name="dock_audio_summary_none" product="tablet" msgid="8215337394914283607">"टेबलेट डॉक नहीं किया गया"</string>
+    <string name="dock_audio_summary_none" product="tablet" msgid="8215337394914283607">"टैबलेट डॉक नहीं किया गया"</string>
     <string name="dock_audio_summary_none" product="default" msgid="289909253741048784">"फ़ोन डॉक नहीं किया गया"</string>
     <string name="dock_audio_summary_unknown" msgid="4465059868974255693">"संलग्‍न किए गए डॉक के लिए सेटिंग"</string>
     <string name="dock_not_found_title" msgid="3290961741828952424">"डॉक नहीं मिला"</string>
-    <string name="dock_not_found_text" product="tablet" msgid="8405432495282299143">"डॉक ऑडियो सेट करने से पहले आपको टेबलेट को डॉक करना होगा."</string>
+    <string name="dock_not_found_text" product="tablet" msgid="8405432495282299143">"डॉक ऑडियो सेट करने से पहले आपको टैबलेट को डॉक करना होगा."</string>
     <string name="dock_not_found_text" product="default" msgid="1460497923342627801">"डॉक ऑडियो सेट करने से पहले आपको फ़ोन को डॉक करना होगा."</string>
     <string name="dock_sounds_enable_title" msgid="885839627097024110">"डॉक इंसर्ट ध्‍वनि"</string>
-    <string name="dock_sounds_enable_summary_on" product="tablet" msgid="838102386448981339">"डॉक में टेबलेट सम्‍मिलित करते समय या निकालते समय ध्‍वनि चलाएं"</string>
+    <string name="dock_sounds_enable_summary_on" product="tablet" msgid="838102386448981339">"डॉक में टैबलेट सम्‍मिलित करते समय या निकालते समय ध्‍वनि चलाएं"</string>
     <string name="dock_sounds_enable_summary_on" product="default" msgid="8491180514199743771">"डॉक में फ़ोन लगाते या निकालते समय ध्‍वनि चलाएं"</string>
-    <string name="dock_sounds_enable_summary_off" product="tablet" msgid="4308252722466813560">"डॉक में टेबलेट सम्‍मिलित करते या निकालते समय ध्‍वनि न चलाएं"</string>
+    <string name="dock_sounds_enable_summary_off" product="tablet" msgid="4308252722466813560">"डॉक में टैबलेट सम्‍मिलित करते या निकालते समय ध्‍वनि न चलाएं"</string>
     <string name="dock_sounds_enable_summary_off" product="default" msgid="2034927992716667672">"डॉक में फ़ोन सम्‍मिलित करते या निकालते समय ध्‍वनि न चलाएं"</string>
     <string name="account_settings" msgid="6403589284618783461">"खाते"</string>
     <string name="accessibility_category_work" msgid="4339262969083355720">"कार्य प्रोफ़ाइल खाते - <xliff:g id="MANAGED_BY">%s</xliff:g>"</string>
     <string name="accessibility_category_personal" msgid="1263518850905945594">"व्‍यक्‍तिगत प्रोफ़ाइल खाते"</string>
     <string name="accessibility_work_account_title" msgid="1231830766637939527">"कार्यस्‍थल खाता - <xliff:g id="MANAGED_BY">%s</xliff:g>"</string>
     <string name="accessibility_personal_account_title" msgid="2169071663029067826">"व्‍यक्‍तिगत खाता - <xliff:g id="MANAGED_BY">%s</xliff:g>"</string>
-    <string name="search_settings" msgid="1910951467596035063">"खोज"</string>
-    <string name="search_settings_summary" msgid="9205656546570654169">"खोज सेटिंग और इतिहास प्रबंधित करें"</string>
+    <string name="search_settings" msgid="1910951467596035063">"सर्च"</string>
+    <string name="search_settings_summary" msgid="9205656546570654169">"सर्च सेटिंग और इतिहास प्रबंधित करें"</string>
     <string name="search_settings_no_results" msgid="8799027492641230999">"कोई परिणाम नहीं"</string>
+    <string name="search_clear_history" msgid="4196658962573162457">"इतिहास साफ़ करें"</string>
     <string name="display_settings" msgid="7965901687241669598">"स्क्रीन सेटिंग"</string>
-    <string name="accelerometer_title" msgid="7854608399547349157">"स्‍क्रीन अपनेआप घुमाएं"</string>
-    <string name="color_mode_title" msgid="3159275920408338215">"चमकीले रंग"</string>
-    <string name="accelerometer_summary_on" product="tablet" msgid="429982132339828942">"टेबलेट घुमाने पर स्‍वचालित रूप से अभिविन्‍यास स्‍विच करें"</string>
-    <string name="accelerometer_summary_on" product="default" msgid="1133737282813048021">"फ़ोन घुमाने पर अभिविन्‍यास स्‍वचालित रूप से स्‍विच करें"</string>
-    <string name="accelerometer_summary_off" product="tablet" msgid="4781734213242521682">"टेबलेट घुमाने पर स्‍वचालित रूप से अभिविन्‍यास स्‍विच करें"</string>
-    <string name="accelerometer_summary_off" product="default" msgid="5485489363715740761">"फ़ोन घुमाने पर अभिविन्‍यास स्‍वचालित रूप से स्‍विच करें"</string>
+    <string name="accelerometer_title" msgid="7854608399547349157">"स्‍क्रीन अपने आप घुमाएं"</string>
+    <string name="color_mode_title" msgid="9186249332902370471">"रंग"</string>
+    <string name="color_mode_option_natural" msgid="5013837483986772758">"बिना किसी बदलाव के"</string>
+    <string name="color_mode_option_boosted" msgid="8588223970257287524">"बढ़ाया गया"</string>
+    <string name="color_mode_option_saturated" msgid="4569683960058798843">"सैचुरेट किया गया"</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>
@@ -1025,10 +1038,10 @@
     <string name="night_display_text" msgid="1837277457033025056">"नाइट लाइट आपकी स्क्रीन को हल्का एम्बर कर देती है. इससे मंद रोशनी में अपनी स्क्रीन देखना या पढ़ना आसान हो जाता है और आपको आसानी से नींद आने में सहायता मिल सकती है."</string>
     <string name="night_display_auto_mode_title" msgid="6574111412154833409">"शेड्यूल करें"</string>
     <string name="night_display_auto_mode_never" msgid="2483761922928753400">"कोई नहीं"</string>
-    <string name="night_display_auto_mode_custom" msgid="2379394568898721765">"कस्टम समय पर चालू हो जाता है"</string>
+    <string name="night_display_auto_mode_custom" msgid="2379394568898721765">"अपने मुताबिक तय समय पर चालू करें"</string>
     <string name="night_display_auto_mode_twilight" msgid="589042813708244059">"सूर्यास्त से सूर्योदय तक चालू रहता है"</string>
-    <string name="night_display_start_time_title" msgid="8918016772613689584">"प्रारंभ समय"</string>
-    <string name="night_display_end_time_title" msgid="8286061578083519350">"समाप्ति समय"</string>
+    <string name="night_display_start_time_title" msgid="8918016772613689584">"शुरू करने का समय"</string>
+    <string name="night_display_end_time_title" msgid="8286061578083519350">"खत्म होने का समय"</string>
     <string name="night_display_status_title" msgid="1784041143360286267">"स्थिति"</string>
     <string name="night_display_temperature_title" msgid="1435292789272017136">"तीव्रता"</string>
     <string name="night_display_summary_off" msgid="1792750041697946539">"बंद / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
@@ -1039,14 +1052,14 @@
     <string name="night_display_summary_on_auto_mode_never" msgid="9117830821363119835">"कभी भी अपने आप बंद नहीं होगा"</string>
     <string name="night_display_summary_on_auto_mode_custom" msgid="5510753572245577263">"<xliff:g id="ID_1">%1$s</xliff:g> बजे अपने आप बंद हो जाएगा"</string>
     <string name="night_display_summary_on_auto_mode_twilight" msgid="852270120144683507">"सूर्योदय होने पर अपने आप बंद हो जाएगा"</string>
-    <string name="screen_timeout" msgid="4351334843529712571">"उपयोग में नहीं"</string>
+    <string name="screen_timeout" msgid="4351334843529712571">"सुलाएं (कम बैटरी मोड)"</string>
     <string name="screen_timeout_title" msgid="5130038655092628247">"स्क्रीन बंद हो जाती है"</string>
     <string name="screen_timeout_summary" msgid="327761329263064327">"नि‍ष्‍क्रि‍यता के <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> के बाद"</string>
     <string name="wallpaper_settings_title" msgid="5449180116365824625">"वॉलपेपर"</string>
     <string name="wallpaper_settings_summary_default" msgid="3395741565658711416">"डिफ़ॉल्ट"</string>
     <string name="wallpaper_settings_summary_custom" msgid="515035303981687172">"कस्टम"</string>
     <string name="wallpaper_suggestion_title" msgid="8583988696513822528">"वॉलपेपर बदलें"</string>
-    <string name="wallpaper_suggestion_summary" msgid="1579144009898110491">"अपनी स्क्रीन को वैयक्तिकृत करें"</string>
+    <string name="wallpaper_suggestion_summary" msgid="1579144009898110491">"अपनी स्क्रीन को अपने मुताबिक बनाएं"</string>
     <string name="wallpaper_settings_fragment_title" msgid="519078346877860129">"यहां से वॉलपेपर चुनें:"</string>
     <string name="screensaver_settings_title" msgid="1770575686476851778">"स्क्रीन सेवर"</string>
     <string name="screensaver_settings_summary_either_long" msgid="7302740999250873332">"चार्ज होते समय या डॉक किए होने पर"</string>
@@ -1062,14 +1075,14 @@
     <string name="screensaver_settings_button" msgid="7292214707625717013">"सेटिंग"</string>
     <string name="automatic_brightness" msgid="5014143533884135461">"अपनेआप स्क्रीन की रोशनी"</string>
     <string name="lift_to_wake_title" msgid="4555378006856277635">"सक्रिय करने के लिए उठाएं"</string>
-    <string name="ambient_display_screen_title" msgid="4252755516328775766">"व्यापक प्रदर्शन"</string>
+    <string name="ambient_display_screen_title" msgid="4252755516328775766">"हमेशा चालू स्क्रीन दिखाएं"</string>
     <string name="ambient_display_screen_summary_always_on" msgid="7337555569694794132">"हमेशा चालू / बढ़ा हुआ बैटरी उपयोग"</string>
-    <string name="ambient_display_screen_summary_notifications" msgid="1449570742600868654">"नए नोटिफ़िकेशन"</string>
+    <string name="ambient_display_screen_summary_notifications" msgid="1449570742600868654">"नई सूचनाएं"</string>
     <string name="ambient_display_category_triggers" msgid="4359289754456268573">"कब दिखाना है"</string>
-    <string name="doze_title" msgid="2375510714460456687">"नए नोटिफ़िकेशन"</string>
-    <string name="doze_summary" msgid="3846219936142814032">"आपको नोटिफ़िकेशन मिलने पर स्‍क्रीन सक्रिय करें"</string>
+    <string name="doze_title" msgid="2375510714460456687">"नई सूचनाएं"</string>
+    <string name="doze_summary" msgid="3846219936142814032">"आपको सूचना मिलने पर स्‍क्रीन चालू करें"</string>
     <string name="doze_always_on_title" msgid="1046222370442629646">"हमेशा चालू"</string>
-    <string name="doze_always_on_summary" msgid="6978257596231155345">"समय, नोटिफ़िकेशन आइकन और अन्य जानकारी दिखाएं. बढ़ा हुआ बैटरी उपयोग."</string>
+    <string name="doze_always_on_summary" msgid="6978257596231155345">"समय, नोटिफ़िकेशन आइकॉन और अन्य जानकारी दिखाएं. इसमें ज़्यादा बैटरी का इस्तेमाल होगा."</string>
     <string name="title_font_size" msgid="4405544325522105222">"अक्षरों का आकार"</string>
     <string name="short_summary_font_size" msgid="6819778801232989076">"लेख को छोटा या बड़ा करें"</string>
     <string name="sim_lock_settings" msgid="3392331196873564292">"सिम कार्ड लॉक सेटिंग"</string>
@@ -1078,51 +1091,52 @@
     <string name="sim_lock_settings_summary_on" msgid="39103355956342985">"लॉक है"</string>
     <string name="sim_lock_settings_title" msgid="9018585580955414596">"सिम कार्ड लॉक"</string>
     <string name="sim_pin_toggle" msgid="1742123478029451888">"सिम कार्ड लॉक करें"</string>
-    <string name="sim_lock_on" product="tablet" msgid="5058355081270397764">"टेबलेट के उपयोग के लिए पिन आवश्‍यक"</string>
+    <string name="sim_lock_on" product="tablet" msgid="5058355081270397764">"टैबलेट के उपयोग के लिए पिन आवश्‍यक"</string>
     <string name="sim_lock_on" product="default" msgid="2503536505568814324">"फ़ोन का उपयोग करने के लिए पिन आवश्‍यक"</string>
-    <string name="sim_lock_off" product="tablet" msgid="2813800553917012356">"टेबलेट के उपयोग के लिए पिन आवश्‍यक"</string>
+    <string name="sim_lock_off" product="tablet" msgid="2813800553917012356">"टैबलेट के उपयोग के लिए पिन आवश्‍यक"</string>
     <string name="sim_lock_off" product="default" msgid="258981978215428916">"फ़ोन का उपयोग करने के लिए पिन आवश्‍यक"</string>
     <string name="sim_pin_change" msgid="6311414184279932368">"सिम पिन बदलें"</string>
     <string name="sim_enter_pin" msgid="6608715137008508432">"सिम पिन"</string>
     <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>
     <string name="sim_change_pin" msgid="7328607264898359112">"सिम पिन"</string>
     <string name="sim_bad_pin" msgid="2345230873496357977">"गलत पिन"</string>
-    <string name="sim_pins_dont_match" msgid="1695021563878890574">"पिनों का मिलान नहीं होता"</string>
+    <string name="sim_pins_dont_match" msgid="1695021563878890574">"पिन मेल नहीं खाते"</string>
     <string name="sim_change_failed" msgid="3602072380172511475">"पिन नहीं बदल सकता.\nसंभवत: गलत पिन."</string>
     <string name="sim_change_succeeded" msgid="8556135413096489627">"सिम पिन सफलतापूर्वक बदला गया"</string>
     <string name="sim_lock_failed" msgid="2489611099235575984">"सिम कार्ड लॉक स्‍थिति नहीं बदल सकता.\nसंभवत: गलत पिन."</string>
     <string name="sim_enter_ok" msgid="6475946836899218919">"ठीक है"</string>
-    <string name="sim_enter_cancel" msgid="6240422158517208036">"अभी नहीं"</string>
+    <string name="sim_enter_cancel" msgid="6240422158517208036">"रद्द करें"</string>
     <string name="sim_multi_sims_title" msgid="9159427879911231239">"एकाधिक सिम मिलीं"</string>
     <string name="sim_multi_sims_summary" msgid="2698176447067691396">"मोबाइल डेटा के लिए अपना पसंदीदा सिम चुनें."</string>
     <string name="sim_change_data_title" msgid="294357201685244532">"डेटा सिम बदलें?"</string>
     <string name="sim_change_data_message" msgid="5854582807996717811">"मोबाइल डेटा के लिए <xliff:g id="OLD_SIM">%2$s</xliff:g> के बजाय <xliff:g id="NEW_SIM">%1$s</xliff:g> का उपयोग करना चाहते हैं?"</string>
     <string name="sim_preferred_title" msgid="5567909634636045268">"पसंदीदा सिम कार्ड अपडेट करें?"</string>
-    <string name="sim_preferred_message" msgid="8466930554330635780">"<xliff:g id="NEW_SIM">%1$s</xliff:g> आपके डिवाइस में मौजूद अकेला SIM है. क्या आप इस SIM का उपयोग मोबाइल डेटा, कॉल और SMS संदेशों के लिए करना चाहते हैं?"</string>
-    <string name="wrong_pin_code_pukked" msgid="4003655226832658066">"गलत सिम पिन कोड अपने डिवाइस को अनलॉक करने के लिए अब आपको अपने वाहक से संपर्क करना होगा."</string>
+    <string name="sim_preferred_message" msgid="8466930554330635780">"<xliff:g id="NEW_SIM">%1$s</xliff:g> आपके डिवाइस में मौजूद अकेला सिम है. क्या आप मोबाइल डेटा, कॉल और मैसेज (एसएमएस) के लिए इस सिम का इस्तेमाल करना चाहते हैं?"</string>
+    <string name="wrong_pin_code_pukked" msgid="4003655226832658066">"गलत सिम पिन कोड, अपने डिवाइस को अनलॉक करने के लिए अब आपको अपनी मोबाइल और इंटरनेट सेवा देने वाली कंपनी से संपर्क करना होगा."</string>
     <plurals name="wrong_pin_code" formatted="false" msgid="1582398808893048097">
-      <item quantity="one">गलत सिम PIN कोड, आपके पास <xliff:g id="NUMBER_1">%d</xliff:g> प्रयास शेष हैं.</item>
-      <item quantity="other">गलत सिम PIN कोड, आपके पास <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">"सिम PIN की कार्यवाही विफल रही!"</string>
-    <string name="device_info_settings" product="tablet" msgid="1119755927536987178">"टेबलेट स्‍थिति"</string>
+    <string name="device_info_settings" product="tablet" msgid="1119755927536987178">"टैबलेट स्‍थिति"</string>
     <string name="device_info_settings" product="default" msgid="475872867864762157">"फ़ोन स्‍थिति"</string>
     <string name="system_update_settings_list_item_title" msgid="3342887311059985961">"सिस्‍टम के बारे में नई जानकारी"</string>
     <string name="system_update_settings_list_item_summary" msgid="3853057315907710747"></string>
     <string name="firmware_version" msgid="4801135784886859972">"Android वर्शन"</string>
+    <string name="firmware_title" msgid="5203122368389157877">"Android"</string>
     <string name="security_patch" msgid="8438384045870296634">"Android सुरक्षा पैच का स्‍तर"</string>
     <string name="model_info" msgid="1952009518045740889">"मॉडल"</string>
+    <string name="model_summary" msgid="8306235877567782987">"मॉडल: %1$s"</string>
     <string name="hardware_info" msgid="2605080746512527805">"मॉडल और हार्डवेयर"</string>
     <string name="hardware_revision" msgid="8893547686367095527">"हार्डवेयर वर्शन"</string>
     <string name="fcc_equipment_id" msgid="149114368246356737">"डिवाइस आईडी"</string>
     <string name="baseband_version" msgid="1848990160763524801">"बेसबैंड वर्ज़न"</string>
     <string name="kernel_version" msgid="9192574954196167602">"कर्नेल वर्ज़न"</string>
     <string name="build_number" msgid="3075795840572241758">"बिल्‍ड नबंर"</string>
-    <string name="selinux_status" msgid="6212165375172061672">"SELinux स्‍थिति"</string>
     <string name="device_info_not_available" msgid="8062521887156825182">"उपलब्ध नहीं"</string>
     <string name="device_status_activity_title" msgid="1411201799384697904">"स्थिति"</string>
     <string name="device_status" msgid="607405385799807324">"स्थिति"</string>
@@ -1133,15 +1147,25 @@
     <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>
+    <!-- no translation found for imei_multi_sim (6387012961838800539) -->
+    <skip />
     <string name="status_number" product="tablet" msgid="1138837891091222272">"MDN"</string>
-    <string name="status_number" product="default" msgid="5123197324870153205">"मेरा फ़ोन नंबर"</string>
+    <string name="status_number" product="default" msgid="5948892105546651296">"फ़ोन नंबर"</string>
+    <!-- no translation found for status_number_sim_slot (2755592991367858860) -->
+    <skip />
+    <!-- no translation found for status_number_sim_slot (1898212200138025729) -->
+    <skip />
+    <string name="status_number_sim_status" product="tablet" msgid="1367110147304523864">"सिम का MDN"</string>
+    <string name="status_number_sim_status" product="default" msgid="9123351360569466330">"सिम का फ़ोन नंबर"</string>
     <string name="status_min_number" msgid="3519504522179420597">"MIN"</string>
     <string name="status_msid_number" msgid="909010114445780530">"MSID"</string>
     <string name="status_prl_version" msgid="1007470446618081441">"PRL वर्शन"</string>
+    <!-- no translation found for meid_multi_sim (748999971744491771) -->
+    <skip />
     <string name="status_meid_number" msgid="1751442889111731088">"MEID"</string>
     <string name="status_icc_id" msgid="943368755577172747">"ICCID"</string>
     <string name="status_network_type" msgid="3279383550222116235">"मोबाइल नेटवर्क प्रकार"</string>
-    <string name="status_latest_area_info" msgid="7222470836568238054">"ऑपरेटर जानकारी"</string>
+    <string name="status_latest_area_info" msgid="7222470836568238054">"ऑपरेटर की जानकारी"</string>
     <string name="status_data_state" msgid="5503181397066522950">"मोबाइल नेटवर्क की स्‍थिति"</string>
     <string name="status_service_state" msgid="2323931627519429503">"सेवा स्‍थिति"</string>
     <string name="status_signal_strength" msgid="3732655254188304547">"सिग्‍नल शक्ति"</string>
@@ -1150,7 +1174,6 @@
     <string name="status_wifi_mac_address" msgid="2202206684020765378">"वाई-फ़ाई  MAC पता"</string>
     <string name="status_bt_address" msgid="4195174192087439720">"ब्लूटूथ पता"</string>
     <string name="status_serial_number" msgid="2257111183374628137">"सीरियल नंबर"</string>
-    <string name="status_unavailable" msgid="7862009036663793314">"अनुपलब्ध"</string>
     <string name="status_up_time" msgid="7294859476816760399">"चालू रहने का समय"</string>
     <string name="status_awake_time" msgid="2393949909051183652">"सचेत समय"</string>
     <string name="internal_memory" msgid="9129595691484260784">"मोबाइल मेमोरी"</string>
@@ -1196,8 +1219,8 @@
     <string name="unmount_inform_text" product="default" msgid="1904212716075458402">"SD कार्ड अनमाउंट कर दिया जाएगा."</string>
     <string name="sd_ejecting_title" msgid="8824572198034365468">"अनमाउंट कर रहा है"</string>
     <string name="sd_ejecting_summary" msgid="2028753069184908491">"अनमाउंट प्रगति में है"</string>
-    <string name="storage_low_title" msgid="1388569749716225155">"मेमोरी स्‍थान समाप्‍त हो रहा है"</string>
-    <string name="storage_low_summary" msgid="7737465774892563129">"हो सकता है कुछ सिस्‍टम फ़ंक्‍शन, जैसे समन्‍वयन, ठीक से कार्य न करें. ऐप्स  या मीडिया सामग्री जैसे आइटम को हटाकर या अनपिन करके स्थान खाली करके देखें."</string>
+    <string name="storage_low_title" msgid="1388569749716225155">"मेमोरी में जगह खत्म हो रही है"</string>
+    <string name="storage_low_summary" msgid="7737465774892563129">"हो सकता है कुछ सिस्टम के कुछ फ़ंक्‍शन, जैसे सिंक करना, ठीक से काम न करें. ऐप या मीडिया सामग्री जैसे आइटम को हटाकर या अनपिन करके जगह खाली करने की कोशिश करें."</string>
     <string name="storage_menu_rename" msgid="7141058657592615390">"नाम बदलें"</string>
     <string name="storage_menu_mount" msgid="1014683672493425425">"माउंट करें"</string>
     <string name="storage_menu_unmount" msgid="681485356885955898">"निकालें"</string>
@@ -1208,7 +1231,7 @@
     <string name="storage_menu_forget" msgid="6305824238997983426">"भूल जाएं"</string>
     <string name="storage_menu_set_up" msgid="4263294929451685366">"सेट करें"</string>
     <string name="storage_menu_explore" msgid="4637496051816521560">"एक्सप्लोर करें"</string>
-    <string name="storage_menu_free" msgid="6386070442027135427">"स्थान खाली करें"</string>
+    <string name="storage_menu_free" msgid="6386070442027135427">"जगह खाली करें"</string>
     <string name="storage_menu_manage" msgid="5914482953856430780">"मेमोरी प्रबंधित करें"</string>
     <string name="storage_title_usb" msgid="679612779321689418">"USB कंप्‍यूटर कनेक्‍शन"</string>
     <string name="usb_connection_category" msgid="7805945595165422882">"इस रूप में कनेक्ट करें"</string>
@@ -1240,7 +1263,7 @@
     <string name="storage_internal_forget_details" msgid="9028875424669047327">"इस <xliff:g id="NAME">^1</xliff:g> में मौजूद ऐप्‍स, फ़ोटो या डेटा का उपयोग करने के लिए, उसे पुन: लगाएं. \n\nवैकल्‍पिक रूप से, यदि डिवाइस उपलब्‍ध नहीं हो तो आप इस मेमोरी को भूल जाना चुन सकते हैं. \n\nयदि आप भूल जाना चुनते हैं, तो डिवाइस में मौजूद सभी डेटा हमेशा के लिए खो जाएगा. \n\nआप बाद में ऐप्‍स पुन: इंस्‍टॉल कर सकते हैं, लेकिन इस डिवाइस पर संग्रहित किया गया उनका डेटा खो जाएगा."</string>
     <string name="storage_internal_forget_confirm_title" msgid="1370847944388479245">"<xliff:g id="NAME">^1</xliff:g> को भूल जाएं?"</string>
     <string name="storage_internal_forget_confirm" msgid="1148446041396902905">"इस <xliff:g id="NAME">^1</xliff:g> पर संग्रहित सभी ऐप्‍स, फ़ोटो और डेटा हमेशा के लिए खो जाएंगे."</string>
-    <string name="storage_detail_apps" msgid="6141154016753507490">"ऐप्स"</string>
+    <string name="storage_detail_apps" msgid="6141154016753507490">"ऐप"</string>
     <string name="storage_detail_images" msgid="6950678857740634769">"चित्र"</string>
     <string name="storage_detail_videos" msgid="2919743464827110953">"वीडियो"</string>
     <string name="storage_detail_audio" msgid="1197685141676483213">"ऑडियो"</string>
@@ -1248,7 +1271,7 @@
     <string name="storage_detail_other" msgid="8404938385075638238">"अन्य"</string>
     <string name="storage_detail_system" msgid="4629506366064709687">"सिस्टम"</string>
     <string name="storage_detail_explore" msgid="7911344011431568294">"<xliff:g id="NAME">^1</xliff:g> एक्‍सप्‍लोर करें"</string>
-    <string name="storage_detail_dialog_other" msgid="8907101974576694793">"अन्य में, ऐप्लिकेशन द्वारा सहेजी गई साझा फ़ाइलें, इंटरनेट या ब्लूटूथ से डाउनलोड की गई फ़ाइलें, Android फ़ाइलें आदि शामिल होती हैं. \n\nइस <xliff:g id="NAME">^1</xliff:g> की दृश्यमान सामग्री देखने के लिए, एक्सप्लोर करें पर टैप करें."</string>
+    <string name="storage_detail_dialog_other" msgid="8845766044697204852">"अन्य चीज़ों में ऐप के ज़रिए सेव की गई, इंटरनेट या ब्लूटूथ से डाउनलोड की गई और Android की फ़ाइलों के साथ ही अन्य फ़ाइलें शामिल हैं. \n\nइस <xliff:g id="NAME">^1</xliff:g> पर उपलब्ध सामग्री देखने के लिए \'बेहतर जानें\' पर टैप करें."</string>
     <string name="storage_detail_dialog_system" msgid="862835644848361569">"सिस्टम में ऐसी फ़ाइलें शामिल हैं जिनका उपयोग Android वर्शन <xliff:g id="VERSION">%s</xliff:g> को चलाने के लिए किया जाता है"</string>
     <string name="storage_detail_dialog_user" msgid="3267254783294197804">"हो सकता है कि <xliff:g id="USER_0">^1</xliff:g> ने <xliff:g id="SIZE">^2</xliff:g> जगह का उपयोग करके फ़ोटो, संगीत, ऐप्लिकेशन या अन्य डेटा सहेजा हो. \n\nविवरण देखने के लिए, <xliff:g id="USER_1">^1</xliff:g> पर स्विच करें."</string>
     <string name="storage_wizard_init_title" msgid="5085400514028585772">"अपना <xliff:g id="NAME">^1</xliff:g> सेट करें"</string>
@@ -1264,11 +1287,11 @@
     <string name="storage_wizard_format_progress_title" msgid="6487352396450582292">"<xliff:g id="NAME">^1</xliff:g> को फ़ॉर्मेट किया जा रहा है…"</string>
     <string name="storage_wizard_format_progress_body" msgid="4445041233802828430">"<xliff:g id="NAME">^1</xliff:g> को फ़ॉर्मेट करते समय ना निकालें."</string>
     <string name="storage_wizard_migrate_title" msgid="1363078147938160407">"डेटा को नई मेमोरी में ले जाएं"</string>
-    <string name="storage_wizard_migrate_body" msgid="890751699549542345">"आप अपनी फ़ोटो, फ़ाइलें और कुछ ऐप्‍स इस नए <xliff:g id="NAME">^1</xliff:g> पर ले जा सकते हैं. \n\nले जाने में लगभग <xliff:g id="TIME">^2</xliff:g> का समय लगता है और इससे आंतरिक मेमोरी पर <xliff:g id="SIZE">^3</xliff:g> स्‍थान खाली हो जाएगा. इस प्रक्रिया के दौरान कुछ ऐप्‍स काम नहीं करेंगे."</string>
+    <string name="storage_wizard_migrate_body" msgid="890751699549542345">"आप अपनी फ़ोटो, फ़ाइलें और कुछ ऐप इस नए <xliff:g id="NAME">^1</xliff:g> पर ले जा सकते हैं. \n\nले जाने में लगभग <xliff:g id="TIME">^2</xliff:g>का समय लगता है और इससे डिवाइस की मेमोरी पर <xliff:g id="SIZE">^3</xliff:g> जगह खाली हो जाएगी. इस दौरान कुछ ऐप काम नहीं करेंगे."</string>
     <string name="storage_wizard_migrate_now" msgid="4523444323744239143">"अभी ले जाएं"</string>
     <string name="storage_wizard_migrate_later" msgid="3173482328116026253">"बाद में ले जाएं"</string>
     <string name="storage_wizard_migrate_confirm_title" msgid="8564833529613286965">"अभी डेटा ले जाएं"</string>
-    <string name="storage_wizard_migrate_confirm_body" msgid="4212060581792135962"><b>"ले जाने में लगभग <xliff:g id="TIME">^1</xliff:g> का समय लगता है. इससे <xliff:g id="NAME">^3</xliff:g> पर <xliff:g id="SIZE">^2</xliff:g> स्‍थान खाली हो जाएगा."</b></string>
+    <string name="storage_wizard_migrate_confirm_body" msgid="4212060581792135962"><b>"ले जाने में लगभग <xliff:g id="TIME">^1</xliff:g> का समय लगता है. इससे <xliff:g id="NAME">^3</xliff:g> पर <xliff:g id="SIZE">^2</xliff:g> जगह खाली हो जाएगी."</b></string>
     <string name="storage_wizard_migrate_confirm_next" msgid="5509475628423823202">"ले जाएं"</string>
     <string name="storage_wizard_migrate_progress_title" msgid="1665479429044202868">"डेटा ले जाया जा रहा है…"</string>
     <string name="storage_wizard_migrate_details" msgid="3709728824651136227">"ले जाने के दौरान: \n• <xliff:g id="NAME">^1</xliff:g> को ना निकालें. \n• कुछ ऐप्स सही ढंग से काम नहीं करेंगे. \n• डिवाइस को चार्ज करके रखें."</string>
@@ -1280,11 +1303,11 @@
     <string name="storage_wizard_move_progress_title" msgid="4443920302548035674">"<xliff:g id="APP">^1</xliff:g> को ले जाया जा रहा है…"</string>
     <string name="storage_wizard_move_progress_body" msgid="7802577486578105609">"ले जाने के दौरान <xliff:g id="NAME">^1</xliff:g> को ना निकालें. \n\nइस डिवाइस में मौजूद <xliff:g id="APP">^2</xliff:g> ले जाने का काम पूर्ण होने तक ऐप उपलब्ध नहीं रहेगा."</string>
     <string name="storage_wizard_move_progress_cancel" msgid="542047237524588792">"ले जाना रोकें"</string>
-    <string name="storage_wizard_slow_body" msgid="8010127667184768025">"यह <xliff:g id="NAME_0">^1</xliff:g> धीमा प्रतीत हो रहा है. \n\nआप जारी रख सकते हैं, लेकिन इस स्थान पर लाए गए ऐप्स अटक सकते हैं और डेटा ट्रांसफर में अधिक समय लग सकता है. \n\nबेहतर प्रदर्शन के लिए अधिक तेज़ <xliff:g id="NAME_1">^1</xliff:g> का उपयोग करने का विचार करें."</string>
+    <string name="storage_wizard_slow_body" msgid="8010127667184768025">"यह <xliff:g id="NAME_0">^1</xliff:g> ज़्यादा वक्त ले रहा है. \n\nआप जारी रख सकते हैं, लेकिन इस जगह पर लाए गए ऐप अटक सकते हैं और डेटा ट्रांसफर में ज़्यादा समय लग सकता है. \n\nबेहतर प्रदर्शन के लिए आप और तेज़ <xliff:g id="NAME_1">^1</xliff:g> का इस्तेमाल कर सकते हैं."</string>
     <string name="battery_status_title" msgid="9159414319574976203">"बैटरी स्‍थिति"</string>
     <string name="battery_level_title" msgid="2965679202786873272">"बैटरी स्‍तर"</string>
     <string name="apn_settings" msgid="3743170484827528406">"APN"</string>
-    <string name="apn_edit" msgid="1354715499708424718">"पहुंच बिंदु संपादित करें"</string>
+    <string name="apn_edit" msgid="1354715499708424718">"एक्सेस बिंदु में बदलाव करें"</string>
     <string name="apn_not_set" msgid="4974192007399968164">"सेट नहीं है"</string>
     <string name="apn_name" msgid="4115580098369824123">"नाम"</string>
     <string name="apn_apn" msgid="2479425126733513353">"APN"</string>
@@ -1294,8 +1317,8 @@
     <string name="apn_password" msgid="5412301994998250968">"पासवर्ड"</string>
     <string name="apn_server" msgid="2436185314756372858">"सर्वर"</string>
     <string name="apn_mmsc" msgid="3670124402105585737">"MMSC"</string>
-    <string name="apn_mms_proxy" msgid="5374082621073999275">"MMS प्रॉक्‍सी"</string>
-    <string name="apn_mms_port" msgid="4074188088199243040">"MMS पोर्ट"</string>
+    <string name="apn_mms_proxy" msgid="5374082621073999275">"मल्टीमीडिया मैसेज (एमएमएस) प्रॉक्‍सी"</string>
+    <string name="apn_mms_port" msgid="4074188088199243040">"मल्टीमीडिया मैसेज (एमएमएस) पोर्ट"</string>
     <string name="apn_mcc" msgid="4258628382260674636">"MCC"</string>
     <string name="apn_mnc" msgid="8629374076888809874">"MNC"</string>
     <string name="apn_auth_type" msgid="6167205395676037015">"प्रमाणीकरण प्रकार"</string>
@@ -1306,138 +1329,136 @@
     <string name="apn_type" msgid="469613123902220544">"APN प्रकार"</string>
     <string name="apn_protocol" msgid="3272222921649348640">"APN प्रोटोकॉल"</string>
     <string name="apn_roaming_protocol" msgid="3386954381510788422">"APN रोमिंग प्रोटोकॉल"</string>
-    <string name="carrier_enabled" msgid="407655861175280806">"APN सक्षम/अक्षम करें"</string>
+    <string name="carrier_enabled" msgid="407655861175280806">"APN चालू/बंद करें"</string>
     <string name="carrier_enabled_summaryOn" msgid="6338915271908057531">"APN सक्षम"</string>
     <string name="carrier_enabled_summaryOff" msgid="4300790190221203756">"APN अक्षम"</string>
     <string name="bearer" msgid="594270280031923558">"धारक"</string>
     <string name="mvno_type" msgid="2543253857818336421">"MVNO प्रकार"</string>
     <string name="mvno_match_data" msgid="4560671695220540466">"MVNO मान"</string>
-    <string name="menu_delete" msgid="6981294422841124659">"APN हटाएं"</string>
+    <string name="menu_delete" msgid="6981294422841124659">"APN मिटाएं"</string>
     <string name="menu_new" msgid="3014205883303921729">"नया APN"</string>
     <string name="menu_save" msgid="8109345640668285399">"सुरक्षित करें"</string>
-    <string name="menu_cancel" msgid="2194502410474697474">"अभी नहीं"</string>
+    <string name="menu_cancel" msgid="2194502410474697474">"रद्द करें"</string>
     <string name="error_title" msgid="7631322303341024692"></string>
     <string name="error_name_empty" msgid="5508155943840201232">"नाम फ़ील्‍ड खाली मत छोड़िए."</string>
     <string name="error_apn_empty" msgid="4932211013600863642">"APN खाली नहीं हो सकता."</string>
     <string name="error_mcc_not3" msgid="4560171714156251661">"MCC फ़ील्‍ड में 3 अंक होने चाहिए."</string>
     <string name="error_mnc_not23" msgid="8418177072458379439">"MCC फ़ील्‍ड में 2 या 3 अंक होने चाहिए."</string>
-    <string name="error_adding_apn_type" msgid="4181334016628549645">"वाहक %s प्रकार के APN जोड़ने की अनुमति नहीं देता."</string>
+    <string name="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>
     <string name="reset_dashboard_title" msgid="6254873816990678620">"रीसेट विकल्प"</string>
+    <string name="reset_dashboard_summary" msgid="4851012632493522755">"नेटवर्क, ऐप्लिकेशन या डिवाइस रीसेट किए जा सकते हैं"</string>
     <string name="reset_network_title" msgid="6166025966016873843">"वाई-फ़ाई, मोबाइल और ब्लूटूथ रीसेट करें"</string>
     <string name="reset_network_desc" msgid="5547979398298881406">"इससे सभी नेटवर्क सेटिंग रीसेट हो जाएंगी, जिनमें ये भी शामिल हैं:\n\n"<li>"वाई-फ़ाई"</li>\n<li>"मोबाइल डेटा"</li>\n<li>"ब्लूटूथ"</li></string>
     <string name="reset_network_button_text" msgid="2035676527471089853">"सेटिंग रीसेट करें"</string>
     <string name="reset_network_final_desc" msgid="6388371121099245116">"सभी नेटवर्क सेटिंग रीसेट करें? आप इस कार्रवाई को वापस नहीं ला सकते!"</string>
     <string name="reset_network_final_button_text" msgid="1797434793741744635">"सेटिंग रीसेट करें"</string>
     <string name="reset_network_confirm_title" msgid="1759888886976962773">"रीसेट करें?"</string>
-    <string name="network_reset_not_available" msgid="7188610385577164676">"इस उपयोगकर्ता के लिए नेटवर्क रीसेट उपलब्ध नहीं है"</string>
+    <string name="network_reset_not_available" msgid="7188610385577164676">"इस उपयोगकर्ता के लिए नेटवर्क रीसेट मौजूद नहीं है"</string>
     <string name="reset_network_complete_toast" msgid="787829973559541880">"नेटवर्क सेटिंग रीसेट कर दी गई हैं"</string>
-    <string name="master_clear_title" msgid="6617679904229218425">"सभी डेटा मिटाएं (फ़ैक्टरी रीसेट)"</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>
-    </plurals>
-    <string name="master_clear_summary" msgid="6902443944660426951">"आंतरिक संग्रहण और सभी डेटा रीसेट कर दिया जाएगा"</string>
-    <string name="master_clear_desc" product="tablet" msgid="9146059417023157222">"इससे आपके टेबलेट के "<b>"मोबाइल मेमोरी"</b>" से सभी डेटा मिट जाएगा, जिसमें शामिल है:\n\n"<li>"आपका Google खाता"</li>\n<li>"सिस्‍टम और ऐप्स डेटा और सेटिंग"</li>\n<li>"डाउनलोड किए गए ऐप्स"</li></string>
+    <string name="master_clear_title" msgid="3531267871084279512">"सभी डेटा मिटाएं (फ़ैक्टरी रीसेट)"</string>
+    <string name="master_clear_desc" product="tablet" msgid="9146059417023157222">"इससे आपके टैबलेट के "<b>"मोबाइल मेमोरी"</b>" से सभी डेटा मिट जाएगा, जिसमें शामिल है:\n\n"<li>"आपका Google खाता"</li>\n<li>"सिस्‍टम और ऐप्स डेटा और सेटिंग"</li>\n<li>"डाउनलोड किए गए ऐप्स"</li></string>
     <string name="master_clear_desc" product="default" msgid="4800386183314202571">"इससे आपके फ़ोन के "<b>"मोबाइल मेमोरी"</b>" से सभी डेटा मिट जाएगा, जिसमें शामिल है:\n\n"<li>"आपका Google खाता"</li>\n<li>"सिस्‍टम और ऐप्स डेटा और सेटिंग"</li>\n<li>"डाउनलोड किए गए ऐप्स"</li></string>
     <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"आप वर्तमान में निम्‍न खातों में प्रवेश किए हुए हैं:\n"</string>
     <string name="master_clear_other_users_present" product="default" msgid="5161423070702470742">\n\n"इस डिवाइस पर अन्‍य उपयोगकर्ता मौजूद हैं.\n"</string>
-    <string name="master_clear_desc_also_erases_external" msgid="1903185203791274237"><li>"संगीत"</li>\n<li>"फ़ोटो"</li>\n<li>"अन्‍य उपयोगकर्ता डेटा"</li></string>
-    <string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="7744115866662613411">\n\n"संगीत, चित्र और अन्‍य उपयोगकर्ता डेटा साफ़ करने के लिए "<b>" USB मेमोरी"</b>" मिटाना होगा."</string>
-    <string name="master_clear_desc_erase_external_storage" product="default" msgid="4801026652617377093">\n\n"संगीत, चित्र और अन्‍य उपयोगकर्ता डेटा साफ़ करने के लिए "<b>"SD कार्ड"</b>" को साफ़ करना होगा."</string>
+    <string name="master_clear_desc_also_erases_external" msgid="1903185203791274237"><li>"संगीत"</li>\n<li>"फ़ोटो"</li>\n<li>"अन्य उपयोगकर्ता डेटा"</li></string>
+    <string name="master_clear_desc_also_erases_esim" msgid="312352697653096008"><li>"eSIM पर मौजूद मोबाइल और इंटरनेट सेवा देने वाली कंपनियां"</li></string>
+    <string name="master_clear_desc_no_cancel_mobile_plan" msgid="5460926449093211144">\n\n"इससे आपकी मोबाइल सेवा योजना रद्द नहीं होगी."</string>
+    <string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="7744115866662613411">\n\n"संगीत, तस्वीर और अन्‍य उपयोगकर्ता डेटा साफ़ करने के लिए "<b>" USB मैमोरी"</b>" मिटाना होगा."</string>
+    <string name="master_clear_desc_erase_external_storage" product="default" msgid="4801026652617377093">\n\n"संगीत, तस्वीर और अन्‍य उपयोगकर्ता डेटा साफ़ करने के लिए "<b>"SD कार्ड"</b>" को साफ़ करना होगा."</string>
     <string name="erase_external_storage" product="nosdcard" msgid="969364037450286809">"USB मेमोरी मिटाएं"</string>
     <string name="erase_external_storage" product="default" msgid="1397239046334307625">"SD कार्ड मिटाएं"</string>
     <string name="erase_external_storage_description" product="nosdcard" msgid="4728558173931599429">"आंतरिक USB मेमोरी का सभी डेटा, जैसे संगीत या फ़ोटो, मिटाएं"</string>
     <string name="erase_external_storage_description" product="default" msgid="1737638779582964966">"SD कार्ड पर मौजूद सभी डेटा, जैसे संगीत या फ़ोटो, मिटाएं"</string>
     <string name="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="erase_esim_storage_description" product="default" msgid="708691303677321598">"फ़ोन पर सभी eSIM मिटाएं. इससे आपकी मोबाइल सेवा योजना रद्द नहीं होगी."</string>
+    <string name="erase_esim_storage_description" product="tablet" msgid="1780953956941209107">"टैबलेट पर सभी eSIM मिटाएं. इससे आपकी मोबाइल सेवा योजना रद्द नहीं होगी."</string>
+    <string name="master_clear_button_text" product="tablet" msgid="3130786116528304116">"टैबलेट रीसेट करें"</string>
     <string name="master_clear_button_text" product="default" msgid="7550632653343157971">"फ़ोन रीसेट करें"</string>
-    <string name="master_clear_final_desc" msgid="7318683914280403086">"आपकी सभी व्यक्तिगत जानकारी और डाउनलोड किए गए ऐप्स मिटाएं? आप इस कार्रवाई को वापस नहीं ला सकते!"</string>
+    <string name="master_clear_final_desc" msgid="7318683914280403086">"आपकी सभी निजी जानकारी और डाउनलोड किए गए ऐप मिटाएं? आप इस कार्रवाई को पहले जैसा नहीं कर सकते!"</string>
     <string name="master_clear_final_button_text" msgid="5390908019019242910">"सब कुछ मिटाएं"</string>
     <string name="master_clear_failed" msgid="2503230016394586353">"सिस्‍टम साफ़ करें सेवा उपलब्‍ध न होने के कारण कोई रीसेट निष्‍पादित नहीं किया गया था."</string>
     <string name="master_clear_confirm_title" msgid="7572642091599403668">"रीसेट करें?"</string>
-    <string name="master_clear_not_available" msgid="1000370707967468909">"इस उपयोगकर्ता के लिए फ़ैक्टरी रीसेट उपलब्ध नहीं है"</string>
+    <string name="master_clear_not_available" msgid="1000370707967468909">"इस उपयोगकर्ता के लिए फ़ैक्ट्री रीसेट उपलब्ध नहीं है"</string>
     <string name="master_clear_progress_title" msgid="5194793778701994634">"मिटाया जा रहा है"</string>
     <string name="master_clear_progress_text" msgid="6559096229480527510">"कृपया प्रतीक्षा करें..."</string>
     <string name="call_settings_title" msgid="5188713413939232801">"कॉल सेटिंग"</string>
-    <string name="call_settings_summary" msgid="7291195704801002886">"वॉयस मेल, कॉल अग्रेषण, कॉल प्रतीक्षा, कॉलर आईडी सेट करें"</string>
-    <string name="tether_settings_title_usb" msgid="6688416425801386511">"USB टेदरिंग"</string>
+    <string name="call_settings_summary" msgid="7291195704801002886">"वॉइसमेल, कॉल को दूसरे नंबर पर भेजना, कॉल वेटिंग (कॉल के दौरान आ रहा दूसरा कॉल), कॉलर आईडी सेट करें"</string>
+    <string name="tether_settings_title_usb" msgid="6688416425801386511">"USB से इंटरनेट पर शेयर करें"</string>
     <string name="tether_settings_title_wifi" msgid="3277144155960302049">"पोर्टेबल हॉटस्‍पॉट"</string>
-    <string name="tether_settings_title_bluetooth" msgid="355855408317564420">"ब्लूटूथ टेदरिंग"</string>
+    <string name="tether_settings_title_bluetooth" msgid="355855408317564420">"ब्लूटूथ से इंटरनेट पर शेयर करें."</string>
     <string name="tether_settings_title_usb_bluetooth" msgid="5355828977109785001">"टेदरिंग"</string>
-    <string name="tether_settings_title_all" msgid="3058586928118801157">"हॉटस्पॉट और टेदरिंग"</string>
+    <string name="tether_settings_title_all" msgid="3058586928118801157">"हॉटस्पॉट और इंटरनेट पर शेयर करें"</string>
     <string name="tether_settings_summary_hotspot_on_tether_on" msgid="930464462687425777">"हॉटस्पॉट चालू है, टेदर हो रहा है"</string>
     <string name="tether_settings_summary_hotspot_on_tether_off" msgid="3473671453891735907">"हॉटस्पॉट चालू है"</string>
     <string name="tether_settings_summary_hotspot_off_tether_on" msgid="1618256180720077354">"टेदर हो रहा है"</string>
-    <string name="tether_settings_disabled_on_data_saver" msgid="1576908608463904152">"डेटा बचतकर्ता चालू होने के दौरान टेदर नहीं किया जा सकता या पोर्टेबल हॉटस्पॉट का उपयोग नहीं किया जा सकता"</string>
+    <string name="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_subtext" product="default" msgid="5991482890033484794">"USB के ज़रिए फ़ोन का इंटरनेट कनेक्‍शन साझा करें"</string>
-    <string name="usb_tethering_subtext" product="tablet" msgid="5988796139573211318">"USB के ज़रिए टैबलेट का इंटरनेट कनेक्‍शन साझा करें"</string>
-    <string name="bluetooth_tether_checkbox_text" msgid="2379175828878753652">"ब्लूटूथ टेदरिंग"</string>
-    <string name="bluetooth_tethering_subtext" product="tablet" msgid="4558227863463153412">"ब्लूटूथ के ज़रिए टैबलेट का इंटरनेट कनेक्शन साझा करें"</string>
-    <string name="bluetooth_tethering_subtext" product="default" msgid="1055197887836203595">"ब्लूटूथ के ज़रिए फ़ोन का इंटरनेट कनेक्शन साझा करें"</string>
-    <string name="bluetooth_tethering_off_subtext_config" msgid="6326877798974938021">"<xliff:g id="DEVICE_NAME">%1$d</xliff:g> का इंटरनेट कनेक्शन ब्लूटूथ से साझा हो रहा है"</string>
+    <string name="usb_tethering_button_text" msgid="585829947108007917">"USB से इंटरनेट पर शेयर करें"</string>
+    <string name="usb_tethering_subtext" product="default" msgid="3711893746716442706">"यूएसबी के ज़रिए फ़ोन का इंटरनेट कनेक्‍शन शेयर करें"</string>
+    <string name="usb_tethering_subtext" product="tablet" msgid="2292916486612255069">"यूएसबी के ज़रिए टैबलेट का इंटरनेट कनेक्‍शन शेयर करें"</string>
+    <string name="bluetooth_tether_checkbox_text" msgid="2379175828878753652">"ब्लूटूथ से इंटरनेट पर शेयर करें."</string>
+    <string name="bluetooth_tethering_subtext" product="tablet" msgid="8828883800511737077">"ब्लूटूथ के ज़रिए टैबलेट का इंटरनेट कनेक्शन शेयर करें"</string>
+    <string name="bluetooth_tethering_subtext" product="default" msgid="1904667146601254812">"ब्लूटूथ के ज़रिए फ़ोन का इंटरनेट कनेक्शन शेयर करें"</string>
+    <string name="bluetooth_tethering_off_subtext_config" msgid="376389105752995580">"<xliff:g id="DEVICE_NAME">%1$d</xliff:g> का इंटरनेट कनेक्शन ब्लूटूथ से शेयर हो रहा है"</string>
     <string name="bluetooth_tethering_overflow_error" msgid="2135590598511178690">"<xliff:g id="MAXCONNECTION">%1$d</xliff:g> डिवाइस से अधिक को टेदर नहीं कर सकता."</string>
     <string name="bluetooth_untether_blank" msgid="2871192409329334813">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> को अनटेदर किया जाएगा."</string>
-    <string name="tethering_footer_info" msgid="1308462275952345985">"अपने मोबाइल डेटा कनेक्शन के ज़रिए दूसरे डिवाइसों को इंटरनेट देने के लिए हॉटस्पॉट और टेदरिंग का उपयोग करें. ऐप्लिकेशन आस-पास के डिवाइस से सामग्री साझा करने के लिए हॉटस्पॉट भी बना सकते हैं."</string>
+    <string name="tethering_footer_info" msgid="7112228674056306147">"अपने मोबाइल डेटा कनेक्शन के ज़रिए दूसरे डिवाइस को इंटरनेट देने के लिए हॉटस्पॉट और इंटरनेट पर शेयर करने का इस्तेमाल करें. ऐप आस-पास के डिवाइस से सामग्री शेयर करने के लिए हॉटस्पॉट भी बना सकते हैं."</string>
     <string name="tethering_help_button_text" msgid="656117495547173630">"सहायता"</string>
     <string name="network_settings_title" msgid="2876509814832830757">"मोबाइल नेटवर्क"</string>
     <string name="manage_mobile_plan_title" msgid="7630170375010107744">"मोबाइल प्लान"</string>
-    <string name="sms_application_title" msgid="4903928270533250448">"SMS ऐप"</string>
-    <string name="sms_change_default_dialog_title" msgid="1958688831875804286">"SMS ऐप्लिकेशन बदलें?"</string>
-    <string name="sms_change_default_dialog_text" msgid="1522783933230274787">"क्या आप <xliff:g id="CURRENT_APP">%2$s</xliff:g> के बजाय SMS ऐप्स के रूप में <xliff:g id="NEW_APP">%1$s</xliff:g> का उपयोग करना चाहेंगे?"</string>
-    <string name="sms_change_default_no_previous_dialog_text" msgid="602683880284921998">"आपके SMS ऐप्स के रूप में <xliff:g id="NEW_APP">%s</xliff:g> का उपयोग करें?"</string>
-    <string name="network_scorer_picker_title" msgid="6383879578279046456">"नेटवर्क रेटिंग प्रदाता"</string>
+    <string name="sms_application_title" msgid="4903928270533250448">"मैसेज (एसएमएस) ऐप"</string>
+    <string name="sms_change_default_dialog_title" msgid="1958688831875804286">"मैसेज (एसएमएस) ऐप बदलें?"</string>
+    <string name="sms_change_default_dialog_text" msgid="1522783933230274787">"<xliff:g id="CURRENT_APP">%2$s</xliff:g> के बजाय <xliff:g id="NEW_APP">%1$s</xliff:g> को अपने मैसेज (एसएमएस) ऐप के तौर पर इस्तेमाल करें?"</string>
+    <string name="sms_change_default_no_previous_dialog_text" msgid="602683880284921998">"<xliff:g id="NEW_APP">%s</xliff:g> को अपने मैसेज (एसएमएस) ऐप के तौर पर इस्तेमाल करें?"</string>
+    <string name="network_scorer_picker_title" msgid="6383879578279046456">"नेटवर्क रेटिंग देने वाला"</string>
     <string name="network_scorer_picker_none_preference" msgid="9028375117241790936">"कोई नहीं"</string>
     <string name="network_scorer_change_active_dialog_title" msgid="3776301550387574975">"वाई-फ़ाई सहायक बदलें?"</string>
     <string name="network_scorer_change_active_dialog_text" msgid="8035173880322990715">"आपके नेटवर्क कनेक्शन प्रबंधित करने के लिए <xliff:g id="CURRENT_APP">%2$s</xliff:g> के बजाय <xliff:g id="NEW_APP">%1$s</xliff:g> का उपयोग करें?"</string>
     <string name="network_scorer_change_active_no_previous_dialog_text" msgid="7444620909047611601">"आपके नेटवर्क कनेक्शन प्रबंधित करने के लिए <xliff:g id="NEW_APP">%s</xliff:g> का उपयोग करें?"</string>
     <string name="mobile_unknown_sim_operator" msgid="2156912373230276157">"अज्ञात सिम ऑपरेटर"</string>
     <string name="mobile_no_provisioning_url" msgid="9053814051811634125">"<xliff:g id="OPERATOR">%1$s</xliff:g> की कोई भी ज्ञात प्रावधान वेबसाइट नहीं है"</string>
-    <string name="mobile_insert_sim_card" msgid="9052590985784056395">"कृपया सिम कार्ड डालें और पुन: प्रारंभ करें"</string>
+    <string name="mobile_insert_sim_card" msgid="9052590985784056395">"कृपया सिम कार्ड डालें और फिर से शुरू करें"</string>
     <string name="mobile_connect_to_internet" msgid="1733894125065249639">"कृपया इंटरनेट से कनेक्ट करें"</string>
-    <string name="location_title" msgid="1029961368397484576">"मेरा स्थान"</string>
-    <string name="managed_profile_location_switch_title" msgid="6712332547063039683">"कार्य प्रोफ़ाइल का स्‍थान"</string>
+    <string name="location_title" msgid="1029961368397484576">"मेरी जगह"</string>
+    <string name="managed_profile_location_switch_title" msgid="6712332547063039683">"वर्क प्रोफ़ाइल की जगह"</string>
     <string name="location_mode_title" msgid="3982009713118421689">"मोड"</string>
-    <string name="location_mode_high_accuracy_title" msgid="8241802585110932849">"उच्च सटीकता"</string>
+    <string name="location_mode_high_accuracy_title" msgid="8241802585110932849">"बहुत ज़्यादा सही"</string>
     <string name="location_mode_battery_saving_title" msgid="711273645208158637">"बैटरी की बचत"</string>
     <string name="location_mode_sensors_only_title" msgid="3040366132175435160">"केवल डिवाइस"</string>
-    <string name="location_mode_location_off_title" msgid="2829713015012529465">"स्थान बंद"</string>
+    <string name="location_mode_location_off_title" msgid="2829713015012529465">"जगह की जानकारी बंद"</string>
     <string name="location_app_level_permissions" msgid="1825588230817081339">"ऐप्लिकेशन-स्तरीय अनुमतियां"</string>
-    <string name="location_category_recent_location_requests" msgid="1938721350424447421">"हाल ही के स्थान अनुरोध"</string>
-    <string name="location_no_recent_apps" msgid="2800907699722178041">"किसी भी ऐप्स  ने हाल ही में स्थान का अनुरोध नहीं किया है"</string>
-    <string name="location_category_location_services" msgid="7437150886946685979">"स्‍थान सेवा"</string>
+    <string name="location_category_recent_location_requests" msgid="1938721350424447421">"हाल में किये गए जगह (लोकेशन) के अनुरोध"</string>
+    <string name="location_no_recent_apps" msgid="2800907699722178041">"किसी भी ऐप ने हाल में जगह का अनुरोध नहीं किया है"</string>
+    <string name="location_category_location_services" msgid="7437150886946685979">"जगह की जानकारी"</string>
     <string name="location_high_battery_use" msgid="517199943258508020">"अधिक बैटरी उपयोग"</string>
     <string name="location_low_battery_use" msgid="8602232529541903596">"कम बैटरी उपयोग"</string>
-    <string name="location_mode_screen_title" msgid="4528716772270246542">"स्थान मोड"</string>
-    <string name="location_mode_high_accuracy_description" msgid="3453010562265338113">"स्थान पता करने के लिए GPS, वाई-फ़ाई, ब्‍लूटूथ या मोबाइल नेटवर्क का उपयोग करें"</string>
-    <string name="location_mode_battery_saving_description" msgid="2365298246603348985">"स्थान पता करने के लिए वाई-फ़ाई, ब्‍लूटूथ या मोबाइल नेटवर्क का उपयोग करें"</string>
-    <string name="location_mode_sensors_only_description" msgid="7247994752324805202">"स्थान पता करने के लिए GPS और डिवाइस के सेंसर का उपयोग करें"</string>
+    <string name="location_mode_screen_title" msgid="4528716772270246542">"जगह मोड"</string>
+    <string name="location_mode_high_accuracy_description" msgid="3453010562265338113">"जगह का पता करने के लिए जीपीएस, वाई-फ़ाई, ब्‍लूटूथ या मोबाइल नेटवर्क का इस्तेमाल करें"</string>
+    <string name="location_mode_battery_saving_description" msgid="2365298246603348985">"जगह का पता करने के लिए वाई-फ़ाई, ब्‍लूटूथ या मोबाइल नेटवर्क का इस्तेमाल करें"</string>
+    <string name="location_mode_sensors_only_description" msgid="7247994752324805202">"जगह का पता करने के लिए जीपीएस और डिवाइस के सेंसर का इस्तेमाल करें"</string>
     <string name="location_scanning_screen_title" msgid="4408076862929611554">"स्‍कैन करना"</string>
     <string name="location_scanning_wifi_always_scanning_title" msgid="6216705505621183645">"वाई-फ़ाई स्‍कैन करना"</string>
-    <string name="location_scanning_wifi_always_scanning_description" msgid="8036382029606868081">"सिस्‍टम ऐप्‍स और सेवाओं को किसी भी समय वाई-फ़ाई नेटवर्कों का पता लगाने देकर स्‍थान सेवा को बेहतर बनाएं."</string>
+    <string name="location_scanning_wifi_always_scanning_description" msgid="8036382029606868081">"सिस्‍टम ऐप और सेवाओं को किसी भी समय वाई-फ़ाई नेटवर्कों का पता लगाने की अनुमति देकर जगह की बेहतर जानकारी पाएं."</string>
     <string name="location_scanning_bluetooth_always_scanning_title" msgid="5444989508204520019">"ब्‍लूटूथ स्‍कैन करना"</string>
-    <string name="location_scanning_bluetooth_always_scanning_description" msgid="8602726521250591852">"सिस्‍टम ऐप्‍स और सेवाओं को किसी भी समय ब्‍लूटूथ डिवाइसों का पता लगाने देकर स्‍थान को बेहतर बनाएं."</string>
-    <string name="location_network_based" msgid="9134175479520582215">"वाई-फ़ाई  और मोबाइल नेटवर्क स्थान"</string>
-    <string name="location_neighborhood_level" msgid="5141318121229984788">"आपके स्थान का तेज़ अनुमान लगाने के लिए, ऐप्स को Google की स्थानीय सेवा का उपयोग करने दें. अज्ञात स्थानीय डेटा एकत्रित करके Google को भेजा जाएगा."</string>
-    <string name="location_neighborhood_level_wifi" msgid="4234820941954812210">"वाई-फ़ाई  द्वारा निर्धारित किया गया स्‍थान"</string>
+    <string name="location_scanning_bluetooth_always_scanning_description" msgid="8602726521250591852">"सिस्‍टम ऐप और सेवाओं को किसी भी समय ब्‍लूटूथ डिवाइसों का पता लगाने की अनुमति देकर जगह की बेहतर जानकारी पाएं."</string>
+    <string name="location_network_based" msgid="9134175479520582215">"वाई-फ़ाई और मोबाइल नेटवर्क जगह"</string>
+    <string name="location_neighborhood_level" msgid="5141318121229984788">"आपकी जगह का तेज़ी से अनुमान लगाने के लिए, ऐप को Google की जगह की जानकारी का इस्तेमाल करने दें. अनजान जगह का डेटा इकट्ठा करके Google को भेजा जाएगा."</string>
+    <string name="location_neighborhood_level_wifi" msgid="4234820941954812210">"यह जगह वाई-फ़ाई ने तय की है"</string>
     <string name="location_gps" msgid="8392461023569708478">"GPS उपग्रह"</string>
-    <string name="location_street_level" product="tablet" msgid="1669562198260860802">"आपके स्थान का पता लगाने के लिए, ऐप्स  को आपके टेबलेट पर GPS का उपयोग करने दें"</string>
-    <string name="location_street_level" product="default" msgid="4617445745492014203">"आपके स्थान का पता लगाने के लिए, ऐप्स  को आपके फ़ोन पर GPS का उपयोग करने दें"</string>
+    <string name="location_street_level" product="tablet" msgid="1669562198260860802">"आपकी जगह का पता लगाने के लिए, ऐप को आपके टैबलेट पर जीपीएस का इस्तेमाल करने दें"</string>
+    <string name="location_street_level" product="default" msgid="4617445745492014203">"आपकी जगह का पता लगाने के लिए, ऐप को आपके फ़ोन पर जीपीएस का इस्तेमाल करने दें"</string>
     <string name="assisted_gps" msgid="4649317129586736885">"सहायता प्राप्त GPS का उपयोग करें"</string>
     <string name="assisted_gps_enabled" msgid="8751899609589792803">"GPS की सहायता के लिए सर्वर का उपयोग करें (नेटवर्क उपयोग कम करने के लिए अनचेक करें)"</string>
     <string name="assisted_gps_disabled" msgid="6982698333968010748">"GPS की सहायता के लिए सर्वर का उपयोग करें (GPS निष्‍पादन बेहतर बनाने के लिए अनचेक करें)"</string>
-    <string name="use_location_title" msgid="5206937465504979977">"स्‍थान और Google खोज"</string>
-    <string name="use_location_summary" msgid="3978805802386162520">"खोज परिणामों और अन्‍य सेवाओं में सुधार के लिए Google को आपके स्‍थान का उपयोग करने दें"</string>
-    <string name="location_access_title" msgid="7064108942964081243">"मेरे स्थान पर एक्सेस"</string>
-    <string name="location_access_summary" msgid="69031404093194341">"आप अपनी उन ऐप्स  को स्थान जानकारी का उपयोग करने दें, जिन्होंने आपकी अनुमति मांगी है."</string>
+    <string name="use_location_title" msgid="5206937465504979977">"जगह और Google सर्च"</string>
+    <string name="use_location_summary" msgid="3978805802386162520">"सर्च नतीजों और अन्‍य सेवाओं में सुधार के लिए Google को आपकी जगह का इस्तेमाल करने दें"</string>
+    <string name="location_access_title" msgid="7064108942964081243">"मेरी जगह को एक्सेस करें"</string>
+    <string name="location_access_summary" msgid="69031404093194341">"जिन ऐप ने आपसे अनुमति मांगी है उन्हें अपने जगह की जानकारी का इस्तेमाल करने दें"</string>
     <string name="location_sources_heading" msgid="1278732419851088319">"स्‍थानीय स्रोत"</string>
-    <string name="about_settings" product="tablet" msgid="593457295516533765">"टेबलेट के बारे में"</string>
+    <string name="about_settings" product="tablet" msgid="593457295516533765">"टैबलेट के बारे में"</string>
     <string name="about_settings" product="default" msgid="1743378368185371685">"फ़ोन के बारे में"</string>
     <string name="about_settings" product="emulator" msgid="221313099578564438">"एम्युलेट किए गए डिवाइस के बारे में"</string>
     <string name="about_settings_summary" msgid="3371517697156165959">"क़ानूनी जानकारी, स्‍थिति, सॉफ़्टवेयर वर्शन देखें"</string>
@@ -1449,7 +1470,7 @@
     <string name="copyright_title" msgid="865906688917260647">"कॉपीराइट"</string>
     <string name="license_title" msgid="1990487604356037871">"लाइसेंस"</string>
     <string name="terms_title" msgid="7697580845616764642">"नियम और शर्तें"</string>
-    <string name="webview_license_title" msgid="2813507464175738967">"सिस्टम WebView लाइसेंस"</string>
+    <string name="webview_license_title" msgid="2813507464175738967">"सिस्टम वेबव्यू लाइसेंस"</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>
@@ -1457,22 +1478,23 @@
     <string name="settings_license_activity_title" msgid="8525014571806471216">"तृतीय-पक्ष लाइसेंस"</string>
     <string name="settings_license_activity_unavailable" msgid="4210539215951487627">"लाइसेंस लोड करने में एक समस्‍या है."</string>
     <string name="settings_license_activity_loading" msgid="3337535809093591740">"लोड हो रहा है..."</string>
-    <string name="settings_safetylegal_title" msgid="1289483965535937431">"सुरक्षा जानकारी"</string>
-    <string name="settings_safetylegal_activity_title" msgid="6901214628496951727">"सुरक्षा जानकारी"</string>
-    <string name="settings_safetylegal_activity_unreachable" msgid="250674109915859456">"आपके पास डेटा कनेक्‍शन नहीं है. इस जानकारी को अभी देखने के लिए, इंटरनेट से कनेक्‍ट किसी भी कंप्‍यूटर से %s पर जाएं."</string>
+    <string name="settings_safetylegal_title" msgid="1289483965535937431">"सुरक्षा की जानकारी"</string>
+    <string name="settings_safetylegal_activity_title" msgid="6901214628496951727">"सुरक्षा की जानकारी"</string>
+    <string name="settings_safetylegal_activity_unreachable" msgid="142307697309858185">"आपके पास डेटा कनेक्‍शन नहीं है. इस जानकारी को अभी देखने के लिए, इंटरनेट से जुड़े किसी भी कंप्‍यूटर से %s पर जाएं."</string>
     <string name="settings_safetylegal_activity_loading" msgid="8059022597639516348">"लोड हो रहा है..."</string>
-    <string name="lockpassword_choose_your_password_header" msgid="8624900666929394990">"अपना पासवर्ड चुनें"</string>
-    <string name="lockpassword_choose_your_password_header_for_fingerprint" msgid="6624409510609085450">"फ़िंगरप्रिंट का उपयोग करने के लिए, पासवर्ड सेट करें"</string>
-    <string name="lockpassword_choose_your_pattern_header" msgid="6949761069941694050">"अपना आकार चुनें"</string>
-    <string name="lockpassword_choose_your_pattern_header_for_fingerprint" msgid="5901096361617543819">"फ़िंगरप्रिंट का उपयोग करने के लिए, पैटर्न सेट करें"</string>
-    <string name="lockpassword_choose_your_pin_header" msgid="7598849519816138302">"अपना पिन चुनें"</string>
-    <string name="lockpassword_choose_your_pin_header_for_fingerprint" msgid="765344692615917183">"फ़िंगरप्रिंट का उपयोग करने के लिए, पिन सेट करें"</string>
-    <string name="lockpassword_confirm_your_password_header" msgid="6308478184889846633">"अपने पासवर्ड की पुष्टि करें"</string>
+    <string name="lockpassword_choose_your_screen_lock_header" msgid="3872462096767152394">"स्क्रीन लॉक सेट करें"</string>
+    <string name="lockpassword_choose_your_password_message" msgid="1197569283524841412">"सुरक्षा के लिए, पासवर्ड सेट करें"</string>
+    <string name="lockpassword_choose_your_password_header_for_fingerprint" msgid="2541818487015343503">"फ़िंगरप्रिंट इस्तेमाल के लिए पासवर्ड डालें"</string>
+    <string name="lockpassword_choose_your_pattern_header_for_fingerprint" msgid="7709785406243556723">"फ़िंगरप्रिंट इस्तेमाल के लिए पैटर्न डालें"</string>
+    <string name="lockpassword_choose_your_pin_message" msgid="1875420718677275646">"सुरक्षा के लिए, पिन सेट करें"</string>
+    <string name="lockpassword_choose_your_pin_header_for_fingerprint" msgid="1549639053195796674">"फ़िंगरप्रिंट के बैकअप के लिए पिन सेट करें"</string>
+    <string name="lockpassword_choose_your_pattern_message" msgid="5986983400689720015">"सुरक्षा के लिए कोई पैटर्न सेट करें"</string>
+    <string name="lockpassword_confirm_your_password_header" msgid="1266027268220850931">"पासवर्ड फिर से दर्ज करें"</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="7744513791910572550">"पिन फिर से दर्ज करें"</string>
     <string name="lockpassword_confirm_passwords_dont_match" msgid="5140892109439191415">"पासवर्ड मेल नहीं खाते"</string>
     <string name="lockpassword_confirm_pins_dont_match" msgid="7226244811505606217">"पिन मेल नहीं खाते"</string>
-    <string name="lockpassword_choose_lock_generic_header" msgid="3811438094903786145">"अनलॉक चयन"</string>
+    <string name="lockpassword_choose_lock_generic_header" msgid="3811438094903786145">"अनलॉक करने के लिए चुनें"</string>
     <string name="lockpassword_password_set_toast" msgid="4875050283108629383">"पासवर्ड सेट कर दिया गया है"</string>
     <string name="lockpassword_pin_set_toast" msgid="6011826444725291475">"पिन सेट कर दिया गया है"</string>
     <string name="lockpassword_pattern_set_toast" msgid="6867259621331406236">"आकार सेट कर दिया गया है"</string>
@@ -1482,24 +1504,30 @@
     <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_device_pattern" msgid="530802132223800623">"अतिरिक्त सुरक्षा के लिए, अपने डिवाइस पैटर्न का उपयोग करें"</string>
-    <string name="lockpassword_strong_auth_required_device_pin" msgid="7829294830078036417">"अतिरिक्त सुरक्षा के लिए, अपना डिवाइस पिन डालें"</string>
-    <string name="lockpassword_strong_auth_required_device_password" msgid="3552644641574796973">"अतिरिक्त सुरक्षा के लिए, अपना डिवाइस पासवर्ड डालें"</string>
-    <string name="lockpassword_strong_auth_required_work_pattern" msgid="3003781907040522053">"अतिरिक्त सुरक्षा के लिए, अपने कार्यस्थल पैटर्न का उपयोग करें"</string>
-    <string name="lockpassword_strong_auth_required_work_pin" msgid="3367491332598821552">"अतिरिक्त सुरक्षा के लिए, अपना कार्यस्थल पिन डालें"</string>
-    <string name="lockpassword_strong_auth_required_work_password" msgid="8159775129968582940">"अतिरिक्त सुरक्षा के लिए, अपना कार्यस्थल पासवर्ड डालें"</string>
+    <string name="lockpassword_strong_auth_required_device_pattern" msgid="530802132223800623">"अतिरिक्त सुरक्षा के लिए, अपने पैटर्न का इस्तेमाल करें"</string>
+    <string name="lockpassword_strong_auth_required_device_pin" msgid="7829294830078036417">"अतिरिक्त सुरक्षा के लिए, अपना पिन डालें"</string>
+    <string name="lockpassword_strong_auth_required_device_password" msgid="3552644641574796973">"अतिरिक्त सुरक्षा के लिए, अपना पासवर्ड डालें"</string>
+    <string name="lockpassword_strong_auth_required_work_pattern" msgid="3003781907040522053">"अतिरिक्त सुरक्षा के लिए, अपने वर्क पैटर्न का इस्तेमाल करें"</string>
+    <string name="lockpassword_strong_auth_required_work_pin" msgid="3367491332598821552">"अतिरिक्त सुरक्षा के लिए, अपना वर्क पिन डालें"</string>
+    <string name="lockpassword_strong_auth_required_work_password" msgid="8159775129968582940">"अतिरिक्त सुरक्षा के लिए, अपना वर्क पासवर्ड डालें"</string>
+    <string name="lockpassword_confirm_your_pattern_details_frp" msgid="6757336656791723193">"आपके फ़ोन को फ़ैक्टरी सेटिंग पर रीसेट किया गया था. इस फ़ोन का उपयोग करने के लिए, अपना पिछला पैटर्न डालें."</string>
+    <string name="lockpassword_confirm_your_pin_details_frp" msgid="826520613445990470">"आपके फ़ोन को फ़ैक्ट्री सेटिंग पर रीसेट किया गया था. इस फ़ोन का इस्तेमाल करने के लिए, अपना पिछला पिन डालें."</string>
+    <string name="lockpassword_confirm_your_password_details_frp" msgid="8944081074615739040">"आपके फ़ोन को फ़ैक्ट्री सेटिंग पर रीसेट किया गया था. इस फ़ोन का इस्तेमाल करने के लिए, अपना पिछला पासवर्ड डालें."</string>
+    <string name="lockpassword_confirm_your_pattern_header_frp" msgid="2898036091609128286">"पैटर्न की पुष्टि करें"</string>
+    <string name="lockpassword_confirm_your_pin_header_frp" msgid="4141601774778898803">"पिन की पुष्टि करें"</string>
+    <string name="lockpassword_confirm_your_password_header_frp" msgid="3762615419295360480">"पासवर्ड की पुष्टि करें"</string>
     <string name="lockpassword_invalid_pin" msgid="15588049067548470">"गलत पिन"</string>
     <string name="lockpassword_invalid_password" msgid="4038507398784975200">"गलत पासवर्ड"</string>
     <string name="lockpattern_need_to_unlock_wrong" msgid="1745247595356012176">"गलत पैटर्न"</string>
     <string name="lock_settings_title" msgid="4213839087748988686">"डिवाइस सुरक्षा"</string>
     <string name="lockpattern_change_lock_pattern_label" msgid="5679630792003440352">"अनलॉक आकार बदलें"</string>
     <string name="lockpattern_change_lock_pin_label" msgid="266707138486731661">"अनलॉक पिन बदलें"</string>
-    <string name="lockpattern_recording_intro_header" msgid="308287052221942814">"अनलॉक आकार आरेखित करें"</string>
-    <string name="lockpattern_recording_intro_footer" msgid="1118579101409152113">"सहायता के लिए मेनू दबाएं."</string>
-    <string name="lockpattern_recording_inprogress" msgid="6667844062721656773">"पूर्ण होने पर अंगुली हटा लें"</string>
+    <string name="lockpattern_recording_intro_header" msgid="308287052221942814">"अनलॉक आकार बनाएं"</string>
+    <string name="lockpattern_recording_intro_footer" msgid="1118579101409152113">"सहायता के लिए मेन्यू दबाएं."</string>
+    <string name="lockpattern_recording_inprogress" msgid="6667844062721656773">"पूरा होने पर अंगुली हटा लें"</string>
     <string name="lockpattern_recording_incorrect_too_short" msgid="1348234155120957561">"कम से कम <xliff:g id="NUMBER">%d</xliff:g> बिंदुओं को कनेक्‍ट करें. पुन: प्रयास करें:"</string>
     <string name="lockpattern_pattern_entered_header" msgid="4316818983675591604">"आकार रिकॉर्ड किया गया"</string>
-    <string name="lockpattern_need_to_confirm" msgid="8054853451639221265">"पुष्टि के लिए आकार को पुन: बनाएं"</string>
+    <string name="lockpattern_need_to_confirm" msgid="8054853451639221265">"पुष्टि के लिए आकार को फिर से बनाएं"</string>
     <string name="lockpattern_pattern_confirmed_header" msgid="8455614172231880211">"आपका नया अनलॉक आकार"</string>
     <string name="lockpattern_confirm_button_text" msgid="1128204343957002841">"दोबारा पूछें"</string>
     <string name="lockpattern_restart_button_text" msgid="3337574403350953926">"पुन: आरेखित करें"</string>
@@ -1510,9 +1538,9 @@
     <string name="lockpattern_settings_enable_summary" msgid="1165707416664252167">"अनलॉक करने के लिए आकार आरेखित करना होगा"</string>
     <string name="lockpattern_settings_enable_visible_pattern_title" msgid="2615606088906120711">"पैटर्न दिखाई दे"</string>
     <string name="lockpattern_settings_enable_visible_pattern_title_profile" msgid="4864525074768391381">"प्रोफ़ाइल पैटर्न को दृश्यमान बनाएं"</string>
-    <string name="lockpattern_settings_enable_tactile_feedback_title" msgid="4389015658335522989">"टैप करने पर कंपन करें"</string>
+    <string name="lockpattern_settings_enable_tactile_feedback_title" msgid="4389015658335522989">"छूने पर कंपन (वाइब्रेशन) करें"</string>
     <string name="lockpattern_settings_enable_power_button_instantly_locks" msgid="5735444062633666327">"पॉवर बटन तुरंत लॉक होता है"</string>
-    <string name="lockpattern_settings_power_button_instantly_locks_summary" msgid="8196258755143711694">"<xliff:g id="TRUST_AGENT_NAME">%1$s</xliff:g> के द्वारा अनलॉक रखे जाने पर छोड़कर"</string>
+    <string name="lockpattern_settings_power_button_instantly_locks_summary" msgid="8196258755143711694">"<xliff:g id="TRUST_AGENT_NAME">%1$s</xliff:g> के ज़रिए अनलॉक रखे जाने पर छोड़कर"</string>
     <string name="lockpattern_settings_choose_lock_pattern" msgid="1652352830005653447">"अनलॉक आकार सेट करें"</string>
     <string name="lockpattern_settings_change_lock_pattern" msgid="1123908306116495545">"अनलॉक आकार बदलें"</string>
     <string name="lockpattern_settings_help_how_to_record" msgid="2614673439060830433">"अनलॉक आकार कैसे आरेखित करें"</string>
@@ -1533,16 +1561,15 @@
     <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>
-    <string name="recent_app_category_title" msgid="6673071268966003928">"हाल ही में खोले गए ऐप्लिकेशन"</string>
-    <string name="see_all_apps_title" msgid="1317153498074308438">"सभी <xliff:g id="COUNT">%1$d</xliff:g> ऐप्लिकेशन देखें"</string>
-    <string name="recent_app_summary" msgid="3366446669844932300">"<xliff:g id="TIME">^1</xliff:g> पहले"</string>
+    <string name="recent_app_category_title" msgid="6673071268966003928">"हाल ही में खोले गए ऐप"</string>
+    <string name="see_all_apps_title" msgid="1317153498074308438">"सभी <xliff:g id="COUNT">%1$d</xliff:g> ऐप देखें"</string>
     <string name="install_all_warning" product="tablet" msgid="8310489909586138165">"आपके टैबलेट और व्यक्तिगत डेटा पर अनजान ऐप्लिकेशन की ओर से हमला किए जाने का जोखिम ज़्यादा है. इस स्रोत से आने वाले ऐप्लिकेशन इंस्टॉल करके, आप सहमति देते हैं कि उनके उपयोग के कारण आपके टैबलेट को होने वाले किसी भी नुकसान या डेटा की हानि के लिए आप ही ज़िम्मेदार हैं."</string>
     <string name="install_all_warning" product="default" msgid="1952257127370115988">"आपके फ़ोन और व्यक्तिगत डेटा पर अनजान ऐप्लिकेशन की ओर से हमला किए जाने का जोखिम ज़्यादा है. इस स्रोत से आने वाले ऐप्लिकेशन इंस्टॉल करके, आप सहमति देते हैं कि उनके उपयोग के कारण आपके फ़ोन को होने वाले किसी भी नुकसान या डेटा की हानि के लिए आप ही ज़िम्मेदार हैं."</string>
-    <string name="advanced_settings" msgid="1777249286757067969">"अतिरिक्त सेटिंग"</string>
-    <string name="advanced_settings_summary" msgid="4016682978071086747">"अधिक सेटिंग विकल्‍प सक्षम करें"</string>
-    <string name="application_info_label" msgid="5736524913065714880">"ऐप्स की जानकारी"</string>
+    <string name="advanced_settings" 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_generic" msgid="3230569852551968694">"डिफ़ॉल्‍ट"</string>
@@ -1557,7 +1584,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>
@@ -1568,9 +1595,9 @@
     <string name="uninstall_all_users_text" msgid="851857393177950340">"सभी उपयोगकर्ताओं के लिए अनइंस्टॉल करें"</string>
     <string name="install_text" msgid="884360662922471113">"इंस्टॉल करें"</string>
     <string name="disable_text" msgid="6544054052049395202">"अक्षम करें"</string>
-    <string name="enable_text" msgid="9217362512327828987">"सक्षम करें"</string>
+    <string name="enable_text" msgid="9217362512327828987">"चालू करें"</string>
     <string name="clear_user_data_text" msgid="5597622864770098388">"डेटा साफ़ करें"</string>
-    <string name="app_factory_reset" msgid="6635744722502563022">"नई जानकारी हटाएं"</string>
+    <string name="app_factory_reset" msgid="6635744722502563022">"अपडेट अनइंस्टॉल करें"</string>
     <string name="auto_launch_enable_text" msgid="4275746249511874845">"आपने कुछ क्रियाओं के लिए इस ऐप्स को डिफ़ॉल्‍ट रूप से लॉन्‍च करना चुना है."</string>
     <string name="always_allow_bind_appwidgets_text" msgid="566822577792032925">"आपने इस ऐप्स को शॉर्टकट बनाने और उनके डेटा पर पहुंचने की अनुमति देना चुना है."</string>
     <string name="auto_launch_disable_text" msgid="7800385822185540166">"कोई डिफ़ॉल्‍ट सेट नहीं है."</string>
@@ -1584,11 +1611,11 @@
     <string name="show_running_services" msgid="5736278767975544570">"चल रही सेवाएं दिखाएं"</string>
     <string name="show_background_processes" msgid="2009840211972293429">"कैश की गई प्रक्रियाएं दिखाएं"</string>
     <string name="default_emergency_app" msgid="1951760659640369980">"आपातकालीन ऐप"</string>
-    <string name="reset_app_preferences" msgid="1321050641018356925">"ऐप्स प्राथमिकताएं रीसेट करें"</string>
-    <string name="reset_app_preferences_title" msgid="6093179367325336662">"ऐप्स प्राथमिकताएं रीसेट करें?"</string>
-    <string name="reset_app_preferences_desc" msgid="4822447731869201512">"इससे निम्न की सभी प्राथमिकताएं रीसेट हो जाएंगी:\n\n "<li>"अक्षम ऐप्स "</li>\n" "<li>"अक्षम ऐप्स  नोटिफिकेशन"</li>\n" "<li>"कार्यवाहियों के लिए डिफ़ॉल्ट ऐप्स "</li>\n" "<li>"ऐप्स  के लिए पृष्ठभूमि डेटा प्रतिबंध"</li>\n" "<li>"अनुमति के कोई भी प्रतिबंध"</li>\n\n" आपका सभी ऐप्स  डेटा बना रहेगा."</string>
+    <string name="reset_app_preferences" msgid="1321050641018356925">"ऐप प्राथमिकताएं रीसेट करें"</string>
+    <string name="reset_app_preferences_title" msgid="6093179367325336662">"ऐप प्राथमिकताएं रीसेट करें?"</string>
+    <string name="reset_app_preferences_desc" msgid="4822447731869201512">"इससे इन सबकी प्राथमिकताएं रीसेट हो जाएंगी:\n\n "<li>"बंद की गई ऐप "</li>\n" "<li>"बंद की गई ऐप सूचनाएं"</li>\n" "<li>"कार्रवाइयों के लिए डिफ़ॉल्ट एप"</li>\n" "<li>"एप के लिए बैकग्राउंड डेटा पर रोक"</li>\n" "<li>" किसी भी अनुमति पर रोक"</li>\n\n" आपका सभी ऐप डेटा बना रहेगा."</string>
     <string name="reset_app_preferences_button" msgid="2559089511841281242">"ऐप्स  रीसेट करें"</string>
-    <string name="manage_space_text" msgid="8852711522447794676">"स्‍थान प्रबंधित करें"</string>
+    <string name="manage_space_text" msgid="8852711522447794676">"जगह प्रबंधित करें"</string>
     <string name="filter" msgid="2018011724373033887">"फ़िल्टर"</string>
     <string name="filter_dlg_title" msgid="8693024463731076091">"फ़िल्‍टर विकल्‍प चुनें"</string>
     <string name="filter_apps_all" msgid="8899612398848280352">"सभी ऐप"</string>
@@ -1605,18 +1632,18 @@
     <string name="sd_card_storage" product="nosdcard" msgid="2673203150465132465">"USB मेमोरी"</string>
     <string name="sd_card_storage" product="default" msgid="7623513618171928235">"SD कार्ड मेमोरी"</string>
     <string name="recompute_size" msgid="7722567982831691718">"आकार पुन: परिकलित कर रहा है…"</string>
-    <string name="clear_data_dlg_title" msgid="5605258400134511197">"ऐप्स डेटा हटाएं?"</string>
+    <string name="clear_data_dlg_title" msgid="5605258400134511197">"एप्‍लिकेशन डेटा हटाएं?"</string>
     <string name="clear_data_dlg_text" msgid="3951297329833822490">"इस ऐप्स का सभी डेटा स्‍थायी रूप से हटा दिया जाएगा. इसमें सभी फ़ाइलें, सेटिंग, खाते, डेटाबेस आदि शामिल हैं."</string>
     <string name="dlg_ok" msgid="2402639055725653590">"ठीक है"</string>
-    <string name="dlg_cancel" msgid="1674753358972975911">"अभी नहीं"</string>
+    <string name="dlg_cancel" msgid="1674753358972975911">"रद्द करें"</string>
     <string name="app_not_found_dlg_title" msgid="3127123411738434964"></string>
     <string name="app_not_found_dlg_text" msgid="4893589904687340011">"इंस्‍टॉल किए गए ऐप्स की सूची में ऐप्स नहीं मिला."</string>
     <string name="clear_data_failed" msgid="7214074331627422248">"ऐप्स डेटा साफ़ नहीं कर सका."</string>
     <string name="clear_failed_dlg_title" msgid="2387060805294783175">"डेटा साफ़ करें"</string>
     <string name="clear_failed_dlg_text" msgid="5464475937929941008">"ऐप्स के लिए डेटा साफ़ नहीं कर सका."</string>
-    <string name="security_settings_desc" product="tablet" msgid="1292421279262430109">"यह ऐप्स आपके टेबलेट पर निम्‍न में पहुंच सकता है:"</string>
+    <string name="security_settings_desc" product="tablet" msgid="1292421279262430109">"यह ऐप्स आपके टैबलेट पर निम्‍न में पहुंच सकता है:"</string>
     <string name="security_settings_desc" product="default" msgid="61749028818785244">"यह ऐप्स आपके फ़ोन पर निम्‍न पर पहुंच सकता है:"</string>
-    <string name="security_settings_desc_multi" product="tablet" msgid="7300932212437084403">"यह ऐप्स आपके टेबलेट पर इन पर पहुंच सकता है. निष्‍पादन को बेहतर बनाने और स्‍मृति उपयोग को कम करने के लिए, इनमें से कुछ अनुमतियां <xliff:g id="BASE_APP_NAME">%1$s</xliff:g> को उपलब्‍ध हैं क्‍योंकि यह <xliff:g id="ADDITIONAL_APPS_LIST">%2$s</xliff:g> के समान प्रक्रिया में चलता है:"</string>
+    <string name="security_settings_desc_multi" product="tablet" msgid="7300932212437084403">"यह ऐप्स आपके टैबलेट पर इन पर पहुंच सकता है. निष्‍पादन को बेहतर बनाने और स्‍मृति उपयोग को कम करने के लिए, इनमें से कुछ अनुमतियां <xliff:g id="BASE_APP_NAME">%1$s</xliff:g> को उपलब्‍ध हैं क्‍योंकि यह <xliff:g id="ADDITIONAL_APPS_LIST">%2$s</xliff:g> के समान प्रक्रिया में चलता है:"</string>
     <string name="security_settings_desc_multi" product="default" msgid="6610268420793984752">"यह ऐप्स आपके फ़ोन पर इन पर पहुंच सकता है. निष्‍पादन को बेहतर बनाने और स्‍मृति उपयोग को कम करने के लिए, इनमें से कुछ अनुमतियां <xliff:g id="BASE_APP_NAME">%1$s</xliff:g> को उपलब्‍ध हैं क्‍योंकि यह <xliff:g id="ADDITIONAL_APPS_LIST">%2$s</xliff:g> के समान प्रक्रिया में चलता है:"</string>
     <string name="join_two_items" msgid="1336880355987539064">"<xliff:g id="FIRST_ITEM">%1$s</xliff:g> और <xliff:g id="SECOND_ITEM">%2$s</xliff:g>"</string>
     <string name="join_two_unrelated_items" msgid="1873827777191260824">"<xliff:g id="FIRST_ITEM">%1$s</xliff:g>, <xliff:g id="SECOND_ITEM">%2$s</xliff:g>"</string>
@@ -1624,42 +1651,41 @@
     <string name="join_many_items_first" msgid="4333907712038448660">"<xliff:g id="FIRST_ITEM">%1$s</xliff:g>, <xliff:g id="ALL_BUT_FIRST_AND_LAST_ITEM">%2$s</xliff:g>"</string>
     <string name="join_many_items_middle" msgid="7556692394478220814">"<xliff:g id="ADDED_ITEM">%1$s</xliff:g>, <xliff:g id="REST_OF_ITEMS">%2$s</xliff:g>"</string>
     <string name="security_settings_billing_desc" msgid="8061019011821282358">"यह ऐप्स  आपसे शुल्क ले सकता है:"</string>
-    <string name="security_settings_premium_sms_desc" msgid="8734171334263713717">"प्रीमियम SMS भेजें?"</string>
+    <string name="security_settings_premium_sms_desc" msgid="8734171334263713717">"प्रीमियम मैसेज (एसएमएस) भेजें"</string>
     <string name="computing_size" msgid="1599186977475211186">"गणना कर रहा है…"</string>
     <string name="invalid_size_value" msgid="1582744272718752951">"पैकेज आकार की गणना नहीं की जा सकी."</string>
     <string name="empty_list_msg" msgid="3552095537348807772">"आपके पास कोई भी तृतीय-पक्ष ऐप्स इंस्‍टॉल नहीं है."</string>
     <string name="version_text" msgid="9189073826278676425">"वर्शन <xliff:g id="VERSION_NUM">%1$s</xliff:g>"</string>
     <string name="move_app" msgid="5042838441401731346">"ले जाएं"</string>
-    <string name="move_app_to_internal" product="tablet" msgid="2299714147283854957">"टेबलेट पर ले जाएं"</string>
+    <string name="move_app_to_internal" product="tablet" msgid="2299714147283854957">"टैबलेट पर ले जाएं"</string>
     <string name="move_app_to_internal" product="default" msgid="3895430471913858185">"फ़ोन पर ले जाएं"</string>
     <string name="move_app_to_sdcard" product="nosdcard" msgid="4350451696315265420">"USB मेमोरी में ले जाएं"</string>
     <string name="move_app_to_sdcard" product="default" msgid="1143379049903056407">"SD कार्ड में ले जाएं"</string>
     <string name="moving" msgid="6431016143218876491">"ले जा रहा है"</string>
-    <string name="another_migration_already_in_progress" msgid="7817354268848365487">"एक अन्य माइग्रेशन पहले से चल रहा है."</string>
-    <string name="insufficient_storage" msgid="481763122991093080">"पर्याप्त मेमोरी स्‍थान नहीं."</string>
+    <string name="another_migration_already_in_progress" msgid="7817354268848365487">"कोई और डेटा दूसरी जगह भेजा जा रहा है."</string>
+    <string name="insufficient_storage" msgid="481763122991093080">"मेमोरी में ज़रुरत के मोताबिक जगह नहीं बची है"</string>
     <string name="does_not_exist" msgid="1501243985586067053">"ऐप्स मौजूद नहीं है."</string>
     <string name="app_forward_locked" msgid="6331564656683790866">"ऐप्स की प्रति नहीं बनाई जा सकती."</string>
-    <string name="invalid_location" msgid="4354595459063675191">"इंस्‍टॉल स्‍थान मान्‍य नहीं है."</string>
-    <string name="system_package" msgid="1352722848400644991">"सिस्‍टम के बारे में नई जानकारी बाहरी मीडिया से नहीं हटाया जा सकता."</string>
+    <string name="invalid_location" msgid="4354595459063675191">"इंस्‍टॉल करने की जगह गलत है."</string>
+    <string name="system_package" msgid="1352722848400644991">"सिस्‍टम अपडेट बाहरी मीडिया में इंस्टॉल नहीं किये जा सकते"</string>
     <string name="move_error_device_admin" msgid="8673026002690505763">"डिवाइस व्यवस्थापक ऐप्लिकेशन को बाहरी मीडिया पर इंस्टॉल नहीं किया जा सकता"</string>
-    <string name="force_stop_dlg_title" msgid="977530651470711366">"बलपूर्वक रोकें?"</string>
+    <string name="force_stop_dlg_title" msgid="977530651470711366">"ज़बरदस्ती रोकें?"</string>
     <string name="force_stop_dlg_text" msgid="7208364204467835578">"अगर आप किसी ऐप को बलपूर्वक रोकते हैं, तो यह गलत व्यवहार कर सकता है."</string>
     <string name="move_app_failed_dlg_title" msgid="1282561064082384192"></string>
     <string name="move_app_failed_dlg_text" msgid="187885379493011720">"ऐप्स  नहीं ले जाया जा सका. <xliff:g id="REASON">%1$s</xliff:g>"</string>
-    <string name="app_install_location_title" msgid="2068975150026852168">"पसंदीदा इंस्‍टॉल स्‍थान"</string>
-    <string name="app_install_location_summary" msgid="5155453752692959098">"नए ऐप्स के लिए पसंदीदा इंस्‍टॉलेशन स्‍थान बदलें"</string>
+    <string name="app_install_location_title" msgid="2068975150026852168">"इंस्टॉल करने की पसंदीदा जगह"</string>
+    <string name="app_install_location_summary" msgid="5155453752692959098">"नए ऐप के लिए इंस्टॉल करने की पसंदीदा जगह बदलें"</string>
     <string name="app_disable_dlg_title" msgid="3916469657537695436">"अंतर्निहित ऐप्स अक्षम करें?"</string>
     <string name="app_disable_dlg_positive" msgid="7375627244201714263">"ऐप को अक्षम करें"</string>
     <string name="app_disable_dlg_text" msgid="5632072173181990531">"अगर आप इस ऐप्लिकेशन को अक्षम करते हैं, तो हो सकता है कि Android और दूसरे ऐप्लिकेशन अपेक्षित रूप से काम ना कर पाएं."</string>
-    <string name="app_special_disable_dlg_title" msgid="2690148680327142674">"डेटा हटाएं और ऐप्स  को अक्षम करें?"</string>
+    <string name="app_special_disable_dlg_title" msgid="2690148680327142674">"डेटा मिटाएं और ऐप को बंद करें?"</string>
     <string name="app_special_disable_dlg_text" msgid="5832078825810635913">"यदि आप इस ऐप्लिकेशन को अक्षम करते हैं, तो हो सकता है कि दूसरे ऐप्लिकेशन अपेक्षित रूप से काम ना कर पाएं. आपका डेटा भी हटा दिया जाएगा."</string>
-    <string name="app_disable_notifications_dlg_title" msgid="7669264654851761857">"नोटिफिकेशन बंद करें?"</string>
-    <string name="app_disable_notifications_dlg_text" msgid="5088484670924769845">"यदि आप इस ऐप्स के लिए नोटिफिकेशन बंद करते हैं, तो आप महत्‍वपूर्ण अलर्ट और नई जानकारी खो देंगे."</string>
+    <string name="app_disable_notifications_dlg_title" msgid="7669264654851761857">"सूचनाएं मिलनी बंद करें?"</string>
+    <string name="app_disable_notifications_dlg_text" msgid="5088484670924769845">"अगर आप इस ऐप के लिए सूचना बंद करते हैं, तो आपको ज़रूरी अलर्ट और अपडेट नहीं मिल पाएंगी."</string>
     <string name="app_install_details_group_title" msgid="7084623031296083574">"स्टोर"</string>
-    <string name="app_install_details_title" msgid="6905279702654975207">"ऐप्लिकेशन का विवरण"</string>
+    <string name="app_install_details_title" msgid="6905279702654975207">"ऐप का विवरण"</string>
     <string name="app_install_details_summary" msgid="6464796332049327547">"<xliff:g id="APP_STORE">%1$s</xliff:g> से इंस्टॉल किया गया ऐप्लिकेशन"</string>
-    <string name="instant_app_details_summary" msgid="4529934403276907045">"<xliff:g id="APP_STORE">%1$s</xliff:g> के बारे में अधिक जानकारी"</string>
-    <string name="app_ops_settings" msgid="5108481883575527511">"ऐप्स  संचालन"</string>
+    <string name="instant_app_details_summary" msgid="4529934403276907045">"<xliff:g id="APP_STORE">%1$s</xliff:g> के बारे में और जानकारी"</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>
@@ -1685,7 +1711,7 @@
     <string name="running_processes_header_title" msgid="6588371727640789560">"डिवाइस की मेमोरी"</string>
     <string name="running_processes_header_footer" msgid="723908176275428442">"ऐप्स RAM उपयोग"</string>
     <string name="running_processes_header_system_prefix" msgid="6104153299581682047">"सिस्‍टम"</string>
-    <string name="running_processes_header_apps_prefix" msgid="5787594452716832727">"ऐप्स"</string>
+    <string name="running_processes_header_apps_prefix" msgid="5787594452716832727">"ऐप"</string>
     <string name="running_processes_header_free_prefix" msgid="4620613031737078415">"खाली"</string>
     <string name="running_processes_header_used_prefix" msgid="5924288703085123978">"उपयोग की गई"</string>
     <string name="running_processes_header_cached_prefix" msgid="7950853188089434987">"संचित"</string>
@@ -1704,16 +1730,17 @@
     <string name="process_service_in_use_description" msgid="8993335064403217080">"सेवा <xliff:g id="COMP_NAME">%1$s</xliff:g> उपयोग में हैं."</string>
     <string name="process_provider_in_use_description" msgid="5586603325677678940">"प्रदाता <xliff:g id="COMP_NAME">%1$s</xliff:g> उपयोग में है."</string>
     <string name="runningservicedetails_stop_dlg_title" msgid="4253292537154337233">"सिस्‍टम सेवा बंद करें?"</string>
-    <string name="runningservicedetails_stop_dlg_text" product="tablet" msgid="3371302398335665793">"यदि आप यह सेवा रोकते हैं, तो हो सकता है कि आपके टेबलेट की कुछ सुविधाएं ठीक से कार्य करना बंद कर दें जब तक कि आप उसे बंद करके फिर से चालू  न कर लें."</string>
+    <string name="runningservicedetails_stop_dlg_text" product="tablet" msgid="3371302398335665793">"यदि आप यह सेवा रोकते हैं, तो हो सकता है कि आपके टैबलेट की कुछ सुविधाएं ठीक से कार्य करना बंद कर दें जब तक कि आप उसे बंद करके फिर से चालू  न कर लें."</string>
     <string name="runningservicedetails_stop_dlg_text" product="default" msgid="3920243762189484756">"यदि आप यह सेवा रोकते हैं, तो हो सकता है कि आपके फ़ोन की कुछ सुविधाएं ठीक से कार्य करना बंद कर दें जब तक कि आप उसे बंद करके फिर से चालू  न कर लें."</string>
-    <string name="language_input_gesture_title" msgid="8749227808244881255">"भाषाएं, इनपुट और हावभाव"</string>
+    <string name="language_input_gesture_title" msgid="8749227808244881255">"भाषाएं, इनपुट और जेस्चर"</string>
     <string name="language_input_gesture_summary_on_with_assist" msgid="7219895055450633449"></string>
     <string name="language_input_gesture_summary_on_non_assist" msgid="756147879200943161"></string>
     <string name="language_input_gesture_summary_off" msgid="4617198819416948217"></string>
     <string name="language_settings" msgid="8758655933029560944">"भाषाएं और इनपुट"</string>
+    <string name="language_empty_list_user_restricted" msgid="5984015900102140696">"आप डिवाइस की भाषा नहीं बदल सकते."</string>
     <string name="language_keyboard_settings_title" msgid="3709159207482544398">"भाषाएं और इनपुट"</string>
     <string name="input_assistance" msgid="7577795275222555487">"इनपुट सहायता"</string>
-    <string name="keyboard_settings_category" msgid="8275523930352487827">"कीबोर्ड और इनपुट पद्धति"</string>
+    <string name="keyboard_settings_category" msgid="8275523930352487827">"कीबोर्ड और इनपुट के तरीके"</string>
     <string name="phone_language" msgid="7116581601133118044">"भाषाएं"</string>
     <string name="phone_language_summary" msgid="3871309445655554211"></string>
     <string name="auto_replace" msgid="6199184757891937822">"स्‍वत: प्रतिस्‍थापन"</string>
@@ -1724,8 +1751,8 @@
     <string name="hardkeyboard_category" msgid="5957168411305769899">"भौतिक कीबोर्ड सेटिंग"</string>
     <string name="auto_punctuate_summary" msgid="4372126865670574837">"\".\" सम्‍मिलित करने के लिए Space कुंजी दो बार दबाएं"</string>
     <string name="show_password" msgid="4837897357002495384">"पासवर्ड दिखाएं"</string>
-    <string name="show_password_summary" msgid="3365397574784829969">"आपके लिखने के दौरान वर्ण प्रदर्शित करें"</string>
-    <string name="spellchecker_security_warning" msgid="9060897418527708922">"यह वर्तनी परीक्षण व्‍यक्तिगत डेटा, जैसे पासवर्ड और क्रेडिट कार्ड नंबर सहित आपके द्वारा लिखे जाने वाले सभी लेख एकत्रित कर सकता है. यह ऐप्स <xliff:g id="SPELLCHECKER_APPLICATION_NAME">%1$s</xliff:g> से आता है. इस वर्तनी परीक्षण का उपयोग करें?"</string>
+    <string name="show_password_summary" msgid="3365397574784829969">"लिखते समय वर्ण दिखाएं"</string>
+    <string name="spellchecker_security_warning" msgid="9060897418527708922">"यह स्पेलिंग जाँचने वाला निजी डेटा, जैसे पासवर्ड और क्रेडिट कार्ड नंबर के साथ आपके लिखे सभी लेख इकट्ठा कर सकता है. यह एप्‍लिकेशन <xliff:g id="SPELLCHECKER_APPLICATION_NAME">%1$s</xliff:g> से आता है. इस स्पेलिंग जाँचने वाले का इस्तेमाल करें?"</string>
     <string name="spellchecker_quick_settings" msgid="246728645150092058">"सेटिंग"</string>
     <string name="spellchecker_language" msgid="6041050114690541437">"भाषा"</string>
     <string name="keyboard_and_input_methods_category" msgid="6035224122054465137">"कीबोर्ड और इनपुट"</string>
@@ -1742,7 +1769,7 @@
     <string name="pointer_speed" msgid="1221342330217861616">"सूचक गति"</string>
     <string name="game_controller_settings_category" msgid="8794508575329923718">"गेमनियंत्रक"</string>
     <string name="vibrate_input_devices" msgid="2599591466928793082">"कंपनकर्ता का उपयोग करें"</string>
-    <string name="vibrate_input_devices_summary" msgid="4595570516865299153">"कनेक्ट होने पर कंपनकर्ता कोगेमनियंत्रक पर रीडायरेक्ट करें."</string>
+    <string name="vibrate_input_devices_summary" msgid="4595570516865299153">"कनेक्ट होने पर कम्पन करने वाले (वाइब्रेटर) को गेम कंट्रोलर के वेबलिंक पर भेजें."</string>
     <string name="keyboard_layout_dialog_title" msgid="8030087214949381372">"कीबोर्ड लेआउट चुनें"</string>
     <string name="keyboard_layout_dialog_setup_button" msgid="8514583747236476384">"कीबोर्ड लेआउट सेट करें"</string>
     <string name="keyboard_layout_dialog_switch_hint" msgid="3889961090676293795">"स्‍विच करने के लिए, Control-Spacebar दबाएं"</string>
@@ -1753,7 +1780,7 @@
     <string name="user_dict_settings_add_menu_title" msgid="4056762757149923551">"जोड़ें"</string>
     <string name="user_dict_settings_add_dialog_title" msgid="4702613990174126482">"शब्‍दकोश में जोड़ें"</string>
     <string name="user_dict_settings_add_screen_title" msgid="742580720124344291">"वाक्यांश"</string>
-    <string name="user_dict_settings_add_dialog_more_options" msgid="8848798370746019825">"अधिक विकल्प"</string>
+    <string name="user_dict_settings_add_dialog_more_options" msgid="8848798370746019825">"ज़्यादा विकल्प"</string>
     <string name="user_dict_settings_add_dialog_less_options" msgid="2441785268726036101">"कम विकल्‍प"</string>
     <string name="user_dict_settings_add_dialog_confirm" msgid="6225823625332416144">"ठीक है"</string>
     <string name="user_dict_settings_add_word_option_name" msgid="7868879174905963135">"शब्द:"</string>
@@ -1761,23 +1788,23 @@
     <string name="user_dict_settings_add_locale_option_name" msgid="5696358317061318532">"भाषा:"</string>
     <string name="user_dict_settings_add_word_hint" msgid="5725254076556821247">"कोई शब्द लिखें"</string>
     <string name="user_dict_settings_add_shortcut_hint" msgid="7333763456561873445">"वैकल्पिक शॉर्टकट"</string>
-    <string name="user_dict_settings_edit_dialog_title" msgid="8967476444840548674">"शब्‍द संपादित करें"</string>
-    <string name="user_dict_settings_context_menu_edit_title" msgid="2210564879320004837">"संपादित करें"</string>
-    <string name="user_dict_settings_context_menu_delete_title" msgid="9140703913776549054">"हटाएं"</string>
-    <string name="user_dict_settings_empty_text" msgid="1971969756133074922">"आपके पास उपयोगकर्ता शब्दकोश में कोई भी शब्द नहीं है. कोई शब्द जोड़ने के लिए, जोड़ें (+) बटन टैप करें."</string>
+    <string name="user_dict_settings_edit_dialog_title" msgid="8967476444840548674">"शब्‍द बदलें"</string>
+    <string name="user_dict_settings_context_menu_edit_title" msgid="2210564879320004837">"बदलाव करें"</string>
+    <string name="user_dict_settings_context_menu_delete_title" msgid="9140703913776549054">"मिटाएं"</string>
+    <string name="user_dict_settings_empty_text" msgid="1971969756133074922">"आपके पास उपयोगकर्ता डिक्शनरी में कोई भी शब्द नहीं है. कोई शब्द जोड़ने के लिए, जोड़ें (+) बटन छूएं."</string>
     <string name="user_dict_settings_all_languages" msgid="6742000040975959247">"सभी भाषाओं के लिए"</string>
     <string name="user_dict_settings_more_languages" msgid="7316375944684977910">"अधिक भाषाएं…"</string>
     <string name="testing" msgid="6584352735303604146">"परीक्षण"</string>
-    <string name="testing_phone_info" product="tablet" msgid="193561832258534798">"टेबलेट जानकारी"</string>
-    <string name="testing_phone_info" product="default" msgid="8656693364332840056">"फ़ोन जानकारी"</string>
+    <string name="testing_phone_info" product="tablet" msgid="193561832258534798">"टैबलेट से जुड़ी जानकारी"</string>
+    <string name="testing_phone_info" product="default" msgid="8656693364332840056">"फ़ोन से जुड़ी जानकारी"</string>
     <string name="input_methods_settings_title" msgid="6800066636850553887">"लेख इनपुट"</string>
     <string name="input_method" msgid="5434026103176856164">"इनपुट विधि"</string>
     <string name="current_input_method" msgid="2636466029213488159">"वर्तमान कीबोर्ड"</string>
-    <string name="input_method_selector" msgid="4311213129681430709">"इनपुट पद्धति चयनकर्ता"</string>
+    <string name="input_method_selector" msgid="4311213129681430709">"इनपुट का तरीका चुनने वाला"</string>
     <string name="input_method_selector_show_automatically_title" msgid="1001612945471546158">"स्वचालित"</string>
     <string name="input_method_selector_always_show_title" msgid="3891824124222371634">"हमेशा दिखाएं"</string>
     <string name="input_method_selector_always_hide_title" msgid="7699647095118680424">"हमेशा छुपाएं"</string>
-    <string name="configure_input_method" msgid="1317429869771850228">"इनपुट पद्धति सेट करें"</string>
+    <string name="configure_input_method" msgid="1317429869771850228">"इनपुट का तरीका सेट करें"</string>
     <string name="input_method_settings" msgid="5801295625486269553">"सेटिंग"</string>
     <string name="input_method_settings_button" msgid="6778344383871619368">"सेटिंग"</string>
     <string name="input_methods_settings_label_format" msgid="6002887604815693322">"<xliff:g id="IME_NAME">%1$s</xliff:g> सेटिंग"</string>
@@ -1798,47 +1825,46 @@
     <string name="usage_time_label" msgid="295954901452833058">"उपयोग समय"</string>
     <string name="accessibility_settings" msgid="3975902491934816215">"सरल उपयोग"</string>
     <string name="accessibility_settings_title" msgid="2130492524656204459">"सरल उपयोग सेटिंग"</string>
-    <string name="accessibility_settings_summary" msgid="981260486011624939">"स्क्रीन रीडर, प्रदर्शन, इंटरैक्शन नियंत्रण"</string>
+    <string name="accessibility_settings_summary" msgid="981260486011624939">"स्क्रीन रीडर, डिसप्ले, इंटरैक्शन नियंत्रण"</string>
     <string name="vision_settings_title" msgid="4204111425716868288">"दृश्य संबंधी सेटिंग"</string>
-    <string name="vision_settings_description" msgid="5679491180156408260">"आप अपनी आवश्यकताओं के अनुरूप इस डिवाइस को कस्टमाइज़ कर सकते हैं. ये एक्सेस-योग्यता सुविधाएं बाद में सेटिंग में बदली जा सकती हैं."</string>
-    <string name="vision_settings_suggestion_title" msgid="917294957154878441">"फ़ॉन्ट का आकार बढ़ाएं"</string>
+    <string name="vision_settings_description" msgid="5679491180156408260">"आप इस डिवाइस में अपनी जरूरतों के हिसाब से बदलाव ला सकते हैं. ये सुलभता सुविधाएं बाद में सेटिंग में बदली जा सकती हैं."</string>
+    <string name="vision_settings_suggestion_title" msgid="8058794060304707004">"फ़ॉन्ट का आकार बदलें"</string>
     <string name="screen_reader_category_title" msgid="7739154903913400641">"स्क्रीन रीडर"</string>
     <string name="audio_and_captions_category_title" msgid="3420727114421447524">"ऑडियो और ऑन-स्क्रीन लेख"</string>
-    <string name="display_category_title" msgid="685461049938269166">"प्रदर्शन"</string>
+    <string name="display_category_title" msgid="685461049938269166">"डिसप्ले"</string>
     <string name="interaction_control_category_title" msgid="7836591031872839151">"इंटरैक्शन नियंत्रण"</string>
     <string name="user_installed_services_category_title" msgid="6426376488922158647">"डाउनलोड की गई सेवाएं"</string>
     <string name="experimental_category_title" msgid="5272318666666893547">"प्रयोगात्मक"</string>
-    <string name="talkback_title" msgid="7912059827205988080">"Talkback"</string>
-    <string name="talkback_summary" msgid="8331244650729024963">"स्क्रीन रीडर प्राथमिक रूप से दृष्टिहीन और कमज़ोर दृष्टि वाले लोगों के लिए है"</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="accessibility_captioning_title" msgid="7589266662024836291">"कैप्शन"</string>
-    <string name="accessibility_screen_magnification_title" msgid="6001128808776506021">"आवर्धन"</string>
+    <string name="accessibility_screen_magnification_title" msgid="6001128808776506021">"बड़ा करें"</string>
     <string name="accessibility_screen_magnification_gestures_title" msgid="3719929521571489913">"ट्रिपल-टैप के ज़रिए आवर्धित करें"</string>
     <string name="accessibility_screen_magnification_navbar_title" msgid="7141753038957538230">"बटन के ज़रिए आवर्धित करें"</string>
     <string name="accessibility_screen_magnification_state_navbar_gesture" msgid="2760906043221923793">"बटन और ट्रिपल-टैप के ज़रिए आवर्धित करें"</string>
     <string name="accessibility_preference_magnification_summary" msgid="5867883657521404509">"स्क्रीन पर ज़ूम इन करें"</string>
     <string name="accessibility_screen_magnification_short_summary" msgid="3411979839172752057">"ज़ूम करने के लिए 3 बार टैप करें"</string>
     <string name="accessibility_screen_magnification_navbar_short_summary" msgid="3693116360267980492">"ज़ूम करने के लिए किसी बटन पर टैप करें"</string>
-    <string name="accessibility_screen_magnification_summary" msgid="5258868553337478505"><b>"ज़ूम करने के लिए"</b>", स्क्रीन पर 3 बार जल्दी-जल्दी टैप करें.\n"<ul><li>"स्क्रॉल करने के लिए 2 या उससे ज़्यादा अंगुलियां खींचें"</li>\n<li>"ज़ूम एडजस्ट करने के लिए 2 या उससे ज़्यादा अंगुलियों से पिंच करें"</li></ul>\n\n<b>"थोड़ी देर तक ज़ूम करने के लिए"</b>", स्क्रीन पर 3 बार जल्दी-जल्दी टैप करें और तीसरे टैप पर अपनी अंगुली दबाए रखें.\n"<ul><li>"स्क्रीन पर यहां-वहां ले जाने के लिए खींचें"</li>\n<li>"ज़ूम आउट करने के लिए अपनी अंगुली उठा लें"</li></ul>\n\n"आप कीबोर्ड या नेविगेशन बार पर ज़ूम इन नहीं कर सकते हैं."</string>
-    <string name="accessibility_screen_magnification_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_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="2048884356166982714">"वॉल्यूम कुंजी शॉर्टकट"</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="1765853731190717372">"शॉर्टकट चालू होने पर, आप किसी एक्सेस-योग्यता सेवा को शुरू करने के लिए दोनों वॉल्यूम कुंजियों को 3 सेकंड तक दबाए रख सकते हैं."</string>
+    <string name="accessibility_shortcut_description" msgid="1765853731190717372">"शॉर्टकट चालू होने पर, आप किसी सुलभता सेवा को शुरू करने के लिए दोनों वॉल्यूम कुंजियों को 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_title" msgid="7218498768415430963">"स्क्रीन को बड़ा करने की सुविधा को अपने आप अपडेट करें"</string>
+    <string name="accessibility_toggle_screen_magnification_auto_update_preference_summary" msgid="4392059334816220155">"एेप ट्रांज़िशन पर स्क्रीन को बड़ा दिखाना अपडेट करें"</string>
     <string name="accessibility_power_button_ends_call_prerefence_title" msgid="6673851944175874235">"पावर बटन कॉल बंद करता है"</string>
     <string name="accessibility_toggle_large_pointer_icon_title" msgid="535173100516295580">"बड़ा माउस सूचक"</string>
     <string name="accessibility_toggle_master_mono_title" msgid="4363806997971905302">"मोनो ऑडियो"</string>
     <string name="accessibility_toggle_master_mono_summary" msgid="5634277025251530927">"ऑडियो चलाते समय चैनल संयोजित करें"</string>
     <string name="accessibility_long_press_timeout_preference_title" msgid="6708467774619266508">"स्‍पर्श करके रखने पर विलंब"</string>
     <string name="accessibility_display_inversion_preference_title" msgid="2119647786141420802">"रंग को पलटें"</string>
-    <string name="accessibility_display_inversion_preference_subtitle" msgid="7052959202195368109">"प्रदर्शन प्रभावित हो सकता है"</string>
-    <string name="accessibility_autoclick_preference_title" msgid="7014499339068449623">"पॉइंटर रुकने के बाद क्लिक करें"</string>
+    <string name="accessibility_display_inversion_preference_subtitle" msgid="7052959202195368109">"डिसप्ले पर असर पड़ सकता है"</string>
+    <string name="accessibility_autoclick_preference_title" msgid="7014499339068449623">"पॉइंटर के रुकने के बाद क्लिक करें"</string>
     <string name="accessibility_autoclick_delay_preference_title" msgid="3962261178385106006">"क्लिक करने से पहले का विलंब"</string>
-    <string name="preference_summary_default_combination" msgid="8532964268242666060">"<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>
@@ -1866,12 +1892,12 @@
     <string name="accessibility_menu_item_settings" msgid="3344942964710773365">"सेटिंग"</string>
     <string name="accessibility_feature_state_on" msgid="2864292320042673806">"चालू"</string>
     <string name="accessibility_feature_state_off" msgid="4172584906487070211">"बंद"</string>
-    <string name="captioning_preview_title" msgid="1234015253497016890">"पूर्वावलोकन"</string>
+    <string name="captioning_preview_title" msgid="1234015253497016890">"झलक"</string>
     <string name="captioning_standard_options_title" msgid="3284211791180335844">"मानक विकल्प"</string>
     <string name="captioning_locale" msgid="4559155661018823503">"भाषा"</string>
     <string name="captioning_text_size" msgid="6737002449104466028">"लेख का आकार"</string>
     <string name="captioning_preset" msgid="8939737196538429044">"कैप्शन की शैली"</string>
-    <string name="captioning_custom_options_title" msgid="5067500939930322405">"कस्‍टम विकल्प"</string>
+    <string name="captioning_custom_options_title" msgid="5067500939930322405">"आपके मुताबिक विकल्प"</string>
     <string name="captioning_background_color" msgid="9053011212948992570">"पृष्ठभूमि का रंग"</string>
     <string name="captioning_background_opacity" msgid="6029993616419971202">"पृष्ठभूमि पारदर्शिता"</string>
     <string name="captioning_window_color" msgid="6902052743419717394">"कैप्शन विंडो का रंग"</string>
@@ -1880,7 +1906,7 @@
     <string name="captioning_foreground_opacity" msgid="4370967856995419788">"लेख पारदर्शिता"</string>
     <string name="captioning_edge_color" msgid="3670094753735263238">"किनारे का रंग"</string>
     <string name="captioning_edge_type" msgid="5997247394951682154">"किनारे का प्रकार"</string>
-    <string name="captioning_typeface" msgid="1826169240566563259">"फ़ॉन्ट परिवार"</string>
+    <string name="captioning_typeface" msgid="1826169240566563259">"फ़ॉन्ट फ़ैमिली"</string>
     <string name="captioning_preview_text" msgid="4067935959797375065">"कैप्‍शन इस तरह दिखाई देंगे"</string>
     <string name="captioning_preview_characters" msgid="7105909138497851769">"Aa"</string>
     <string name="locale_default" msgid="2593883646136326969">"सामान्य"</string>
@@ -1898,14 +1924,14 @@
     <string name="color_magenta" msgid="5059212823607815549">"मैजेंटा"</string>
     <string name="enable_service_title" msgid="3061307612673835592">"<xliff:g id="SERVICE">%1$s</xliff:g> का उपयोग करें?"</string>
     <string name="capabilities_list_title" msgid="86713361724771971">"<xliff:g id="SERVICE">%1$s</xliff:g> के लिए यह आवश्यक है:"</string>
-    <string name="touch_filtered_warning" msgid="8644034725268915030">"चूंकि एक ऐप अनुमति के अनुरोध को अस्पष्ट बना रहा है, इसलिए सेटिंग आपके प्रतिसाद को सत्यापित नहीं कर पा रही हैं."</string>
-    <string name="enable_service_encryption_warning" msgid="3064686622453974606">"यदि आप <xliff:g id="SERVICE">%1$s</xliff:g> को चालू करते हैं, तो आपका डिवाइस डेटा एन्क्रिप्शन को एन्हांस करने के लिए आपके स्क्रीन लॉक का उपयोग नहीं करेगा."</string>
-    <string name="secure_lock_encryption_warning" msgid="460911459695077779">"क्योंकि आपने सरल उपयोग सेवा चालू की हुई है इसलिए आपका डिवाइस डेटा एन्क्रिप्शन को एन्हांस करने के लिए आपके स्क्रीन लॉक का उपयोग नहीं करेगा."</string>
+    <string name="touch_filtered_warning" msgid="8644034725268915030">"क्यूंकि ऐप की वजह से अनुमति के अनुरोध को समझने में दिक्कत हो रही है, इसलिए सेटिंग से आपके जवाब की पुष्टि नहीं हो पा रही हैं."</string>
+    <string name="enable_service_encryption_warning" msgid="3064686622453974606">"अगर आप <xliff:g id="SERVICE">%1$s</xliff:g> को चालू करते हैं, तो आपका डिवाइस डेटा सुरक्षित करने के काम को बेहतर करने के लिए आपके स्क्रीन लॉक का इस्तेमाल नहीं करेगा."</string>
+    <string name="secure_lock_encryption_warning" msgid="460911459695077779">"क्योंकि आपने सुलभता सेवा चालू की हुई है इसलिए आपका डिवाइस डेटा सुरक्षित करने के बेहतर करने के लिए आपके स्क्रीन लॉक का इस्तेमाल नहीं करेगा."</string>
     <string name="enable_service_pattern_reason" msgid="777577618063306751">"क्‍योंकि <xliff:g id="SERVICE">%1$s</xliff:g> को चालू करने से डेटा एेन्‍क्रिप्‍शन प्रभावित होता है, इसलिए आपको अपने पैटर्न की पुष्‍टि करनी होगी."</string>
     <string name="enable_service_pin_reason" msgid="7882035264853248228">"क्‍योंकि <xliff:g id="SERVICE">%1$s</xliff:g> को चालू करने से डेटा एेन्‍क्रिप्‍शन प्रभावित होता है, इसलिए आपको अपने पिन की पुष्‍टि करनी होगी"</string>
     <string name="enable_service_password_reason" msgid="1224075277603097951">"क्‍योंकि <xliff:g id="SERVICE">%1$s</xliff:g> को चालू करने से डेटा एेन्‍क्रिप्‍शन प्रभावित होता है, इसलिए आपको अपने पासवर्ड की पुष्‍टि करनी होगी."</string>
     <string name="capability_title_receiveAccessibilityEvents" msgid="1869032063969970755">"अपनी कार्यवाही ध्यान से देखें"</string>
-    <string name="capability_desc_receiveAccessibilityEvents" msgid="6640333613848713883">"किसी ऐप्स  से सहभागिता करते समय नोटिफिकेशन प्राप्त करें."</string>
+    <string name="capability_desc_receiveAccessibilityEvents" msgid="6640333613848713883">"किसी ऐप का इस्तेमाल करते समय सूचना पाएं."</string>
     <string name="disable_service_title" msgid="3624005212728512896">"<xliff:g id="SERVICE">%1$s</xliff:g> को रोकें?"</string>
     <string name="disable_service_message" msgid="2247101878627941561">"ठीक टैप करने से <xliff:g id="SERVICE">%1$s</xliff:g> बंद हो जाएगी."</string>
     <string name="accessibility_no_services_installed" msgid="7200948194639038807">"कोई सेवा इंस्‍टॉल नहीं है"</string>
@@ -1931,21 +1957,21 @@
     <string name="print_feature_state_off" msgid="7294876968403966040">"बंद"</string>
     <string name="print_menu_item_add_service" msgid="3811645167869797802">"सेवा जोड़ें"</string>
     <string name="print_menu_item_add_printer" msgid="8251218970577291032">"प्रिंटर जोड़ें"</string>
-    <string name="print_menu_item_search" msgid="7025589328240514553">"खोजें"</string>
-    <string name="print_searching_for_printers" msgid="4680248496457576358">"प्रिंटर खोज रहा है"</string>
+    <string name="print_menu_item_search" msgid="7025589328240514553">"सर्च करें"</string>
+    <string name="print_searching_for_printers" msgid="4680248496457576358">"प्रिंटर को सर्च कर रहा है"</string>
     <string name="print_service_disabled" msgid="7739452396114245222">"सेवा अक्षम है"</string>
     <string name="print_print_jobs" msgid="3582094777756968793">"प्रिंट कार्य"</string>
     <string name="print_print_job" msgid="7563741676053287211">"प्रिंट कार्य"</string>
-    <string name="print_restart" msgid="8373999687329384202">"पुन: प्रारंभ करें"</string>
-    <string name="print_cancel" msgid="3621199386568672235">"अभी नहीं"</string>
+    <string name="print_restart" msgid="8373999687329384202">"फिर से शुरू करें"</string>
+    <string name="print_cancel" msgid="3621199386568672235">"रद्द करें"</string>
     <string name="print_job_summary" msgid="8472427347192930694">"<xliff:g id="PRINTER">%1$s</xliff:g>\n<xliff:g id="TIME">%2$s</xliff:g>"</string>
     <string name="print_printing_state_title_template" msgid="5736107667714582025">"<xliff:g id="PRINT_JOB_NAME">%1$s</xliff:g> प्रिंट हो रहा है"</string>
     <string name="print_cancelling_state_title_template" msgid="7102968925358219875">"<xliff:g id="PRINT_JOB_NAME">%1$s</xliff:g> रद्द हो रहा है"</string>
     <string name="print_failed_state_title_template" msgid="1436099128973357969">"प्रिंटर गड़बड़ी <xliff:g id="PRINT_JOB_NAME">%1$s</xliff:g>"</string>
     <string name="print_blocked_state_title_template" msgid="9065391617425962424">"प्रिंटर अवरोधित <xliff:g id="PRINT_JOB_NAME">%1$s</xliff:g>"</string>
-    <string name="print_search_box_shown_utterance" msgid="7730361832020726951">"खोज बॉक्स प्रदर्शित है"</string>
-    <string name="print_search_box_hidden_utterance" msgid="7980832833405818400">"खोज बॉक्स छुपा हुआ है"</string>
-    <string name="printer_info_desc" msgid="5824995108703060003">"इस प्रिंटर के बारे में अधिक जानकारी"</string>
+    <string name="print_search_box_shown_utterance" msgid="7730361832020726951">"सर्च बॉक्स दिखाई दे रहा है"</string>
+    <string name="print_search_box_hidden_utterance" msgid="7980832833405818400">"सर्च बॉक्स छिपा हुआ है"</string>
+    <string name="printer_info_desc" msgid="5824995108703060003">"इस प्रिंटर के बारे में और जानकारी"</string>
     <string name="power_usage_summary_title" msgid="7190304207330319919">"बैटरी"</string>
     <string name="power_usage_summary" msgid="7237084831082848168">"बैटरी का उपयोग कौन कर रहा है"</string>
     <string name="power_usage_not_available" msgid="3109326074656512387">"बैटरी उपयोग डेटा उपलब्ध नहीं है."</string>
@@ -1957,12 +1983,14 @@
     <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_whitelisted" msgid="7375400051141016808">"ऐप को, बेहतर तरीके से काम करने के लिए बैटरी के इस्तेमाल के हिसाब से नहीं ढाला जा सकता"</string>
+    <string name="background_activity_warning_dialog_title" msgid="2216249969149568871">"ऐप की बैकग्राउंड गतिविधि को सीमित करें?"</string>
+    <string name="background_activity_warning_dialog_text" msgid="7049624449246121981">"अगर आप ऐप की बैकग्राउंड गतिविधि को सीमित करते हैं, तो हो सकता है यह ठीक ढंग से काम न करे"</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" msgid="6393929085382334341">"(<xliff:g id="RELATIVE_TIME">^1</xliff:g>) बजे पूरी तरह चार्ज होने के बाद से अब तक ऐप का इस्तेमाल"</string>
+    <string name="power_usage_list_summary_device" msgid="4461926045610455423">"(<xliff:g id="RELATIVE_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>
@@ -1982,7 +2010,7 @@
     <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>
@@ -1991,25 +2019,25 @@
     <string name="battery_abnormal_details_title" msgid="5469019021857291216">"ज़्यादा बैटरी खर्च कर रहे ऐप्लिकेशन"</string>
     <string name="battery_abnormal_wakelock_summary" msgid="4326186999058828831">"डिवाइस को सक्रिय रखना"</string>
     <string name="battery_abnormal_wakeup_alarm_summary" msgid="644657277875785240">"डिवाइस को बैकग्राउंड में सक्रिय करना"</string>
-    <string name="battery_abnormal_location_summary" msgid="6552797246798806002">"बार-बार स्थान का अनुरोध कर रहा है"</string>
+    <string name="battery_abnormal_location_summary" msgid="6552797246798806002">"बार-बार जगह का अनुरोध कर रहा है"</string>
     <string name="battery_abnormal_apps_summary" msgid="792553273248686972">"<xliff:g id="NUMBER">%1$d</xliff:g> ऐप्लिकेशन ठीक से काम नहीं कर रहे हैं"</string>
     <string name="dialog_stop_title" msgid="6395127715596746479">"ऐप्लिकेशन रोकना चाहते हैं?"</string>
-    <string name="dialog_stop_message" product="default" msgid="4006631636646776488">"आपका फ़ोन बैटरी को सामान्य रूप से प्रबंधित नहीं कर पा रहा है क्योंकि <xliff:g id="APP">%1$s</xliff:g> उसे चालू रख रहा है.\n\nइस समस्या को ठीक करने के लिए, आप ऐप्लिकेशन को बंद कर सकते हैं.\n\nअगर ऐसा बार-बार हो रहा है, तो बैटरी का प्रदर्शन बेहतर करने के लिए आपको ऐप्लिकेशन अनइंस्टॉल करने की ज़रूरत हो सकती है."</string>
-    <string name="dialog_stop_message" product="tablet" msgid="2369957934555162428">"आपका टैबलेट बैटरी को सामान्य रूप से प्रबंधित नहीं कर पा रहा है क्योंकि <xliff:g id="APP">%1$s</xliff:g> उसे चालू रख रहा है.\n\nइस समस्या को ठीक करने के लिए, आप ऐप्लिकेशन को बंद कर सकते हैं.\n\nअगर ऐसा बार-बार हो रहा है, तो बैटरी का प्रदर्शन बेहतर करने के लिए आपको ऐप्लिकेशन अनइंस्टॉल करने की ज़रूरत हो सकती है."</string>
-    <string name="dialog_stop_message" product="device" msgid="6195430620406365292">"आपका डिवाइस बैटरी को सामान्य रूप से प्रबंधित नहीं कर पा रहा है क्योंकि <xliff:g id="APP">%1$s</xliff:g> उसे चालू रख रहा है.\n\nइस समस्या को ठीक करने के लिए, आप ऐप्लिकेशन को बंद कर सकते हैं.\n\nअगर ऐसा बार-बार हो रहा है, तो बैटरी का प्रदर्शन बेहतर करने के लिए आपको ऐप्लिकेशन अनइंस्टॉल करने की ज़रूरत हो सकती है."</string>
-    <string name="dialog_stop_message_wakeup_alarm" product="default" msgid="1638726742782558262">"आपका फ़ोन बैटरी को सामान्य रूप से प्रबंधित नहीं कर पा रहा है क्योंकि <xliff:g id="APP_0">%1$s</xliff:g> उसे बार-बार चालू कर रहा है.\n\nइस समस्या को ठीक करने के लिए, आप <xliff:g id="APP_1">%1$s</xliff:g> को बंद कर सकते हैं.\n\nअगर ऐसा बार-बार हो रहा है, तो बैटरी का प्रदर्शन बेहतर करने के लिए आपको ऐप्लिकेशन अनइंस्टॉल करने की ज़रूरत हो सकती है."</string>
+    <string name="dialog_stop_message" product="default" msgid="4006631636646776488">"आपका फ़ोन बैटरी को सामान्य सामान्य तौर पर प्रबंधित नहीं कर पा रहा है क्योंकि <xliff:g id="APP">%1$s</xliff:g> उसे चालू रख रहा है.\n\nइस समस्या को ठीक करने के लिए, आप ऐप्लिकेशन को रोक सकते हैं.\n\nअगर ऐसा बार-बार हो रहा है, तो बैटरी का प्रदर्शन बेहतर करने के लिए आपको ऐप अनइंस्टॉल करना पड़ सकता है."</string>
+    <string name="dialog_stop_message" product="tablet" msgid="2369957934555162428">"आपका टैबलेट बैटरी को सामान्य सामान्य तौर पर प्रबंधित नहीं कर पा रहा है क्योंकि <xliff:g id="APP">%1$s</xliff:g> उसे चालू रख रहा है.\n\nइस समस्या को ठीक करने के लिए, आप ऐप को रोक सकते हैं.\n\nअगर ऐसा बार-बार हो रहा है, तो बैटरी का प्रदर्शन बेहतर करने के लिए आपको ऐप अनइंस्टॉल करना पड़ सकता है."</string>
+    <string name="dialog_stop_message" product="device" msgid="6195430620406365292">"आपका डिवाइस बैटरी को सामान्य तौर पर प्रबंधित नहीं कर पा रहा है क्योंकि <xliff:g id="APP">%1$s</xliff:g> उसे चालू रख रहा है.\n\nइस समस्या को ठीक करने के लिए, आप ऐप्लिकेशन को रोक सकते हैं.\n\nअगर ऐसा बार-बार हो रहा है, तो बैटरी का प्रदर्शन बेहतर करने के लिए आपको ऐप अनइंस्टॉल करना पड़ सकता है."</string>
+    <string name="dialog_stop_message_wakeup_alarm" product="default" msgid="1638726742782558262">"आपका फ़ोन बैटरी को सामान्य रूप से प्रबंधित नहीं कर पा रहा है क्योंकि <xliff:g id="APP_0">%1$s</xliff:g> उसे बार-बार चालू कर रहा है.\n\nइस समस्या को ठीक करने के लिए, आप <xliff:g id="APP_1">%1$s</xliff:g> को बंद कर सकते हैं.\n\nअगर ऐसा बार-बार हो रहा है, तो बैटरी का प्रदर्शन बेहतर करने के लिए आपको ऐप को अनइंस्टॉल करना पड़ सकता है."</string>
     <string name="dialog_stop_message_wakeup_alarm" product="tablet" msgid="8771690983566539742">"आपका टैबलेट बैटरी को सामान्य रूप से प्रबंधित नहीं कर पा रहा है क्योंकि <xliff:g id="APP_0">%1$s</xliff:g> उसे बार-बार चालू कर रहा है.\n\nइस समस्या को ठीक करने के लिए, आप <xliff:g id="APP_1">%1$s</xliff:g> को बंद कर सकते हैं.\n\nअगर ऐसा बार-बार हो रहा है, तो बैटरी का प्रदर्शन बेहतर करने के लिए आपको ऐप्लिकेशन अनइंस्टॉल करने की ज़रूरत हो सकती है."</string>
-    <string name="dialog_stop_message_wakeup_alarm" product="device" msgid="2854944538238649520">"आपका डिवाइस बैटरी को सामान्य रूप से प्रबंधित नहीं कर पा रहा है क्योंकि <xliff:g id="APP_0">%1$s</xliff:g> उसे बार-बार चालू कर रहा है.\n\nइस समस्या को ठीक करने के लिए, आप <xliff:g id="APP_1">%1$s</xliff:g> को बंद कर सकते हैं.\n\nअगर ऐसा बार-बार हो रहा है, तो बैटरी का प्रदर्शन बेहतर करने के लिए आपको ऐप्लिकेशन अनइंस्टॉल करने की ज़रूरत हो सकती है."</string>
+    <string name="dialog_stop_message_wakeup_alarm" product="device" msgid="2854944538238649520">"आपका डिवाइस बैटरी को सामान्य सामान्य तौर पर प्रबंधित नहीं कर पा रहा है क्योंकि <xliff:g id="APP_0">%1$s</xliff:g> उसे बार-बार चालू कर रहा है.\n\nइस समस्या को ठीक करने के लिए, आप <xliff:g id="APP_1">%1$s</xliff:g> को बंद कर सकते हैं.\n\nअगर ऐसा बार-बार हो रहा है, तो बैटरी का प्रदर्शन बेहतर करने के लिए आपको ऐप अनइंस्टॉल करना पड़ सकता है."</string>
     <string name="dialog_stop_ok" msgid="2319777211264004900">"ऐप्लिकेशन रोकें"</string>
     <string name="dialog_background_check_title" msgid="6936542136153283692">"बैकग्राउंड उपयोग बंद करें और ऐप्लिकेशन बंद करें?"</string>
     <string name="dialog_background_check_message" product="default" msgid="4045827746349279563">"आपका फ़ोन बैटरी को सामान्य रूप से प्रबंधित नहीं कर पा रहा है क्योंकि <xliff:g id="APP_0">%1$s</xliff:g> आपके डिवाइस को बार-बार चालू कर रहा है.\n\nइस समस्या को ठीक करने के लिए, आप <xliff:g id="APP_1">%1$s</xliff:g> को बंद कर सकते हैं और उसे बैकग्राउंड में चलने से रोक सकते हैं."</string>
     <string name="dialog_background_check_message" product="tablet" msgid="8348214419901788270">"आपका टैबलेट बैटरी को सामान्य रूप से प्रबंधित नहीं कर पा रहा है क्योंकि <xliff:g id="APP_0">%1$s</xliff:g> आपके डिवाइस को बार-बार चालू कर रहा है.\n\nइस समस्या को ठीक करने के लिए, आप <xliff:g id="APP_1">%1$s</xliff:g> को बंद कर सकते हैं और उसे बैकग्राउंड में चलने से रोक सकते हैं."</string>
     <string name="dialog_background_check_message" product="device" msgid="5847977433118915863">"आपका डिवाइस बैटरी को सामान्य रूप से प्रबंधित नहीं कर पा रहा है क्योंकि <xliff:g id="APP_0">%1$s</xliff:g> आपके डिवाइस को बार-बार चालू कर रहा है.\n\nइस समस्या को ठीक करने के लिए, आप <xliff:g id="APP_1">%1$s</xliff:g> को बंद कर सकते हैं और उसे बैकग्राउंड में चलने से रोक सकते हैं."</string>
     <string name="dialog_background_check_ok" msgid="412876934682899659">"बंद करें"</string>
-    <string name="dialog_location_title" msgid="5888917530725874727">"स्थान बंद करना चाहते हैं?"</string>
-    <string name="dialog_location_message" product="default" msgid="7774807745601479888">"आपका फ़ोन बैटरी को सामान्य रूप से प्रबंधित नहीं कर पा रहा है क्योंकि जब आप ऐप्लिकेशन का उपयोग नहीं कर रहे होते हैं तब <xliff:g id="APP">%1$s</xliff:g> बार-बार आपके स्थान का अनुरोध करता है.\n\nइस समस्या को ठीक करने के लिए, आप इस ऐप्लिकेशन के लिए स्थान सेवा बंद कर सकते हैं."</string>
-    <string name="dialog_location_message" product="tablet" msgid="118745801732181618">"आपका टैबलेट बैटरी को सामान्य रूप से प्रबंधित नहीं कर पा रहा है क्योंकि जब आप ऐप्लिकेशन का उपयोग नहीं कर रहे होते हैं तब <xliff:g id="APP">%1$s</xliff:g> बार-बार आपके स्थान का अनुरोध करता है.\n\nइस समस्या को ठीक करने के लिए, आप इस ऐप्लिकेशन के लिए स्थान सेवा बंद कर सकते हैं."</string>
-    <string name="dialog_location_message" product="device" msgid="6783678153382298295">"आपका डिवाइस बैटरी को सामान्य रूप से प्रबंधित नहीं कर पा रहा है क्योंकि जब आप ऐप्लिकेशन का उपयोग नहीं कर रहे होते हैं तब <xliff:g id="APP">%1$s</xliff:g> बार-बार आपके स्थान का अनुरोध करता है.\n\nइस समस्या को ठीक करने के लिए, आप इस ऐप्लिकेशन के लिए स्थान सेवा बंद कर सकते हैं."</string>
+    <string name="dialog_location_title" msgid="5888917530725874727">"जगह की जानकारी को बंद करना चाहते हैं?"</string>
+    <string name="dialog_location_message" product="default" msgid="7774807745601479888">"आपका फ़ोन बैटरी को सामान्य रूप से प्रबंधित नहीं कर पा रहा है क्योंकि जब आप ऐप्लिकेशन का इस्तेमाल नहीं कर रहे होते हैं तब <xliff:g id="APP">%1$s</xliff:g> बार-बार आपके जगह का अनुरोध करता है.\n\nइस समस्या का हल करने के लिए, आप इस ऐप्लिकेशन के लिए जगह सेवा बंद कर सकते हैं."</string>
+    <string name="dialog_location_message" product="tablet" msgid="118745801732181618">"आपका टैबलेट बैटरी को सामान्य रूप से प्रबंधित नहीं कर पा रहा है क्योंकि जब आप ऐप्लिकेशन का इस्तेमाल नहीं कर रहे होते हैं तब <xliff:g id="APP">%1$s</xliff:g> बार-बार आपके जगह का अनुरोध करता है.\n\nइस समस्या का हल करने के लिए, आप इस ऐप्लिकेशन के लिए जगह की जानकारी को बंद कर सकते हैं."</string>
+    <string name="dialog_location_message" product="device" msgid="6783678153382298295">"आपका डिवाइस बैटरी को सामान्य रूप से प्रबंधित नहीं कर पा रहा है क्योंकि जब आप ऐप्लिकेशन का इस्तेमाल नहीं कर रहे होते हैं तब <xliff:g id="APP">%1$s</xliff:g> बार-बार आपकी जगह का अनुरोध करता है.\n\nइस समस्या का हल करने के लिए, आप इस ऐप्लिकेशन के लिए जगह की जानकारी को बंद कर सकते हैं."</string>
     <string name="dialog_location_ok" msgid="4572391197601313986">"बंद करें"</string>
     <string name="power_screen" msgid="3023346080675904613">"स्क्रीन"</string>
     <string name="power_flashlight" msgid="7794409781003567614">"फ़्लैशलाइट"</string>
@@ -2018,20 +2046,20 @@
     <string name="power_bluetooth" msgid="4373329044379008289">"ब्लूटूथ"</string>
     <string name="power_cell" msgid="3392999761958982492">"मोबाइल नेटवर्क स्टैंडबाय"</string>
     <string name="power_phone" msgid="5392641106474567277">"ध्‍वनि कॉल"</string>
-    <string name="power_idle" product="tablet" msgid="4612478572401640759">"टेबलेट निष्‍क्रिय"</string>
-    <string name="power_idle" product="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="3706143225319881667">"अन्य उपयोगकर्ता"</string>
-    <string name="usage_type_cpu" msgid="715162150698338714">"कुल CPU"</string>
-    <string name="usage_type_cpu_foreground" msgid="6500579611933211831">"CPU अग्रभाग"</string>
+    <string name="usage_type_cpu" msgid="715162150698338714">"सीपीयू (CPU) का कुल इस्तेमाल"</string>
+    <string name="usage_type_cpu_foreground" msgid="6500579611933211831">"सीपीयू (CPU) के आगे वाला हिस्सा"</string>
     <string name="usage_type_wake_lock" msgid="5125438890233677880">"सचेत रखें"</string>
     <string name="usage_type_gps" msgid="7989688715128160790">"GPS"</string>
     <string name="usage_type_wifi_running" msgid="3134357198266380400">"वाई-फ़ाई  चल रहा है"</string>
-    <string name="usage_type_phone" product="tablet" msgid="262638572890253393">"टेबलेट"</string>
+    <string name="usage_type_phone" product="tablet" msgid="262638572890253393">"टैबलेट"</string>
     <string name="usage_type_phone" product="default" msgid="9108247984998041853">"फ़ोन"</string>
     <string name="usage_type_data_send" msgid="8971710128438365919">"मोबाइल पैकेट भेजे गए"</string>
     <string name="usage_type_data_recv" msgid="5468564329333954445">"मोबाइल पैकेट प्राप्त हुए"</string>
@@ -2047,21 +2075,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_app_details" msgid="7861051816778419018">"ऐप्स की जानकारी"</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>
@@ -2071,7 +2099,7 @@
     <string name="battery_sugg_apps_info" msgid="6907588126789841231">"ऐप्स रोकें या अनइंस्‍टॉल करें"</string>
     <string name="battery_sugg_apps_gps" msgid="5959067516281866135">"बैटरी की बचत मोड चुनें"</string>
     <string name="battery_sugg_apps_settings" msgid="3974902365643634514">"बैटरी के उपयोग में कमी लाने के लिए ऐप्स, सेटिंग ऑफ़र कर सकता है"</string>
-    <string name="battery_desc_users" msgid="7682989161885027823">"उपयोगकर्ता के द्वारा उपयोग की गई बैटरी"</string>
+    <string name="battery_desc_users" msgid="7682989161885027823">"उपयोगकर्ता के ज़रिये इस्तेमाल की गई बैटरी"</string>
     <string name="battery_desc_unaccounted" msgid="7404256448541818019">"पावर के विविध उपयोग"</string>
     <string name="battery_msg_unaccounted" msgid="1963583522633067961">"बैटरी का उपयोग पावर का अनुमानित उपयोग है और इसमें बैटरी की खपत करने वाला प्रत्येक स्रोत शामिल नहीं है. विविध, पावर के परिकलित अनुमानित उपयोग और बैटरी पर देखी गई वास्तविक खपत के बीच का अंतर है."</string>
     <string name="battery_desc_overcounted" msgid="5481865509489228603">"पावर का अत्यधिक उपयोग"</string>
@@ -2105,7 +2133,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>
@@ -2118,7 +2146,7 @@
     <string name="process_stats_os_native" msgid="5322428494231768472">"स्थानीय"</string>
     <string name="process_stats_os_kernel" msgid="1938523592369780924">"कर्नेल"</string>
     <string name="process_stats_os_zram" msgid="677138324651671575">"Z-Ram"</string>
-    <string name="process_stats_os_cache" msgid="6432533624875078233">"संचय"</string>
+    <string name="process_stats_os_cache" msgid="6432533624875078233">"कैश मेमोरी"</string>
     <string name="process_stats_ram_use" msgid="976912589127397307">"RAM का उपयोग"</string>
     <string name="process_stats_bg_ram_use" msgid="5398191511030462404">"RAM का उपयोग (पृष्‍ठभूमि)"</string>
     <string name="process_stats_run_time" msgid="6520628955709369115">"रन टाइम"</string>
@@ -2126,14 +2154,6 @@
     <string name="services_subtitle" msgid="4296402367067266425">"सेवाएं"</string>
     <string name="menu_proc_stats_duration" msgid="2323483592994720196">"अवधि"</string>
     <string name="mem_details_title" msgid="6548392825497290498">"मेमोरी का विवरण"</string>
-    <string name="mem_state_subtitle" msgid="2407238869781011933">"मेमोरी की स्थितियां"</string>
-    <string name="mem_use_subtitle" msgid="7319468770222422412">"मेमोरी उपयोग"</string>
-    <string name="mem_use_kernel_type" msgid="8698327165935012484">"कर्नल"</string>
-    <string name="mem_use_native_type" msgid="5976704902328347400">"स्थानीय"</string>
-    <string name="mem_use_kernel_cache_type" msgid="6411475064463957513">"कर्नल संचय"</string>
-    <string name="mem_use_zram_type" msgid="9087217476795358232">"ZRam स्वैप"</string>
-    <string name="mem_use_free_type" msgid="717708548454880840">"नि:शुल्क"</string>
-    <string name="mem_use_total" msgid="6308786055749777934">"कुल"</string>
     <string name="menu_duration_3h" msgid="4714866438374738385">"3 घंटे"</string>
     <string name="menu_duration_6h" msgid="1940846763432184132">"6 घंटे"</string>
     <string name="menu_duration_12h" msgid="7890465404584356294">"12 घंटे"</string>
@@ -2146,16 +2166,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_search_settings_title" msgid="2775469246913196536">"बोलकर खोजें"</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>
@@ -2169,8 +2189,8 @@
     <string name="tts_reset" msgid="2661752909256313270">"रीसेट करें"</string>
     <string name="tts_play" msgid="2628469503798633884">"चलाएं"</string>
     <string name="gadget_title" msgid="5519037532720577836">"पावर नियंत्रण"</string>
-    <string name="gadget_toggle_wifi" msgid="319262861956544493">"वाई-फ़ाई  सेटिंग के बारे में नई जानकारी मिलना"</string>
-    <string name="gadget_toggle_bluetooth" msgid="7538903239807020826">"ब्लूटूथ सेटिंग में नई जानकारी मिल रही है"</string>
+    <string name="gadget_toggle_wifi" msgid="319262861956544493">"वाई-फ़ाई सेटिंग अपडेट हो रही है"</string>
+    <string name="gadget_toggle_bluetooth" msgid="7538903239807020826">"ब्लूटूथ सेटिंग अपडेट हो रही है"</string>
     <string name="gadget_state_template" msgid="5156935629902649932">"<xliff:g id="ID_1">%1$s</xliff:g> <xliff:g id="ID_2">%2$s</xliff:g>"</string>
     <string name="gadget_state_on" msgid="6909119593004937688">"चालू"</string>
     <string name="gadget_state_off" msgid="5220212352953066317">"बंद"</string>
@@ -2178,7 +2198,7 @@
     <string name="gadget_state_turning_off" msgid="2395546048102176157">"बंद हो रहा है"</string>
     <string name="gadget_wifi" msgid="4712584536500629417">"वाई-फ़ाई"</string>
     <string name="gadget_bluetooth" msgid="8998572807378694410">"ब्लूटूथ"</string>
-    <string name="gadget_location" msgid="2974757497945178165">"स्थान"</string>
+    <string name="gadget_location" msgid="2974757497945178165">"जगह"</string>
     <string name="gadget_sync" msgid="858895763714222152">"समन्वयन करें"</string>
     <string name="gadget_brightness_template" msgid="930541920933123603">"स्क्रीन की रोशनी <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="gadget_brightness_state_auto" msgid="6667967252426515446">"स्वचालित"</string>
@@ -2195,28 +2215,28 @@
     <string name="credentials_reset_summary" msgid="3369361230171260282">"सभी प्रमाणपत्र निकालें"</string>
     <string name="trusted_credentials" msgid="4266945289534242402">"विश्वसनीय प्रमाणिकता"</string>
     <string name="trusted_credentials_summary" msgid="6735221351155686632">"विश्वस्त CA प्रमाणपत्र दिखाएं"</string>
-    <string name="user_credentials" msgid="3719013347787187083">"उपयोगकर्ता प्रमाणिकता"</string>
+    <string name="user_credentials" msgid="3719013347787187083">"यूज़र क्रेडेंशियल"</string>
     <string name="user_credentials_summary" msgid="7271228342106080167">"संग्रहित प्रमाणिकता देखें और बदलाव करें"</string>
-    <string name="advanced_security_title" msgid="2434776238010578865">"अतिरिक्त सेटिंग"</string>
+    <string name="advanced_security_title" msgid="2434776238010578865">"बेहतर सेटिंग"</string>
     <string name="credential_storage_type" msgid="8629968543494001364">"मेमोरी का प्रकार"</string>
     <string name="credential_storage_type_hardware" msgid="6077193544333904427">"हार्डवेयर-समर्थित"</string>
     <string name="credential_storage_type_software" msgid="4403117271207715378">"केवल सॉफ़्टवेयर"</string>
-    <string name="credentials_settings_not_available" msgid="7968275634486624215">"इस उपयोगकर्ता के लिए प्रमाणिकता उपलब्ध नहीं हैं"</string>
+    <string name="credentials_settings_not_available" msgid="7968275634486624215">"इस उपयोगकर्ता के लिए क्रेडेंशियल मौजूद नहीं हैं"</string>
     <string name="credential_for_vpn_and_apps" msgid="4168197158768443365">"VPN और ऐप्लिकेशन के लिए इंस्टॉल किया गया"</string>
     <string name="credential_for_wifi" msgid="6228425986551591864">"वाई-फ़ाई के लिए इंस्टॉल किया गया"</string>
     <string name="credentials_unlock" msgid="385427939577366499"></string>
     <string name="credentials_unlock_hint" msgid="2301301378040499348">"प्रमाणिकता मेमोरी के लिए पासवर्ड लिखें."</string>
     <string name="credentials_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="usage_access_title" msgid="332333405495457839">"उपयोग एक्सेस वाले ऐप्स"</string>
+    <string name="credentials_configure_lock_screen_hint" msgid="8058230497337529036">"क्रेडेंशियल स्टोरेज का इस्तेमाल करने से पहले, आपके डिवाइस पर सुरक्षित लॉक स्क्रीन होना ज़रूरी है"</string>
+    <string name="credentials_configure_lock_screen_button" msgid="253239765216055321">"लॉक सेट करें"</string>
+    <string name="usage_access_title" msgid="332333405495457839">"उपयोग एक्सेस वाले ऐप"</string>
     <string name="emergency_tone_title" msgid="1055954530111587114">"आपातकालीन टोन"</string>
     <string name="emergency_tone_summary" msgid="722259232924572153">"आपातकालीन कॉल करने के दौरान व्‍यवहार सेट करें"</string>
     <string name="privacy_settings_title" msgid="2978878794187459190">"बैकअप लें"</string>
@@ -2236,27 +2256,27 @@
     <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="select_device_admin_msg" msgid="7347389359013278077">"डिवाइस व्यवस्थापक ऐप्लिकेशन"</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="add_device_admin_msg" msgid="1501847129819382149">"इस डिवाइस एडमिन ऐप को सक्रिय करें?"</string>
+    <string name="add_device_admin" msgid="4192055385312215731">"इस डिवाइस एडमिन ऐप को सक्रिय करें"</string>
     <string name="device_admin_add_title" msgid="3140663753671809044">"डिवाइस व्यवस्थापक"</string>
     <string name="device_admin_warning" msgid="7482834776510188134">"इस व्यवस्थापक ऐप्लिकेशन को सक्रिय करने से <xliff:g id="APP_NAME">%1$s</xliff:g> ऐप्लिकेशन को ये काम करने की अनुमति मिल जाएगी:"</string>
     <string name="device_admin_status" msgid="7234814785374977990">"यह व्यवस्थापक ऐप्लिकेशन सक्रिय है और <xliff:g id="APP_NAME">%1$s</xliff:g> ऐप्लिकेशन को आगे दिए गए काम करने देता है:"</string>
-    <string name="profile_owner_add_title" msgid="6249331160676175009">"प्रोफाइल प्रबंधक सक्रिय करें?"</string>
-    <string name="adding_profile_owner_warning" msgid="1354474524852805802">"आगे बढ़ने से, आपके उपयोगकर्ता का प्रबंधन आपका व्यवस्थापक करेगा जो आपके व्यक्तिगत डेटा के अलावा, जुड़ा हुआ डेटा भी संग्रहित कर सकेगा.\n\nआपका व्यवस्थापक इस उपयोगकर्ता की सेटिंग, एक्सेस, ऐप्लिकेशन और इससे जुड़े डेटा की निगरानी और उनका प्रबंधन कर सकता है, जिसमें नेटवर्क गतिविधि और आपके डिवाइस के स्थान की जानकारी शामिल है."</string>
+    <string name="profile_owner_add_title" msgid="6249331160676175009">"प्रोफाइल प्रबंधक को सक्रिय करें?"</string>
+    <string name="adding_profile_owner_warning" msgid="1354474524852805802">"अगर आप आगे बढ़ते हैं, तो आपके उपयोगकर्ता का प्रबंधन आपका एडमिन करेगा जो आपके निजी डेटा के अलावा, उससे जुड़ा हुआ डेटा भी इकट्ठा कर सकता है.\n\nआपका एडमिन इस उपयोगकर्ता की सेटिंग, पहुंच, ऐप्लिकेशन और इससे जुड़े डेटा की निगरानी और उनका प्रबंधन कर सकता है, जिसमें नेटवर्क गतिविधि और आपके डिवाइस के जगह की जानकारी शामिल है."</string>
     <string name="admin_disabled_other_options" msgid="7712694507069054530">"आपके व्यवस्थापक ने दूसरे विकल्पों को अक्षम किया हुआ है"</string>
     <string name="admin_more_details" msgid="7901420667346456102">"अधिक विवरण"</string>
     <string name="untitled_apn" msgid="1230060359198685513">"शीर्षक-रहित"</string>
     <string name="sound_category_sound_title" msgid="1488759370067953996">"सामान्य"</string>
-    <string name="notification_log_title" msgid="3766148588239398464">"नोटिफिकेशन लॉग"</string>
-    <string name="sound_category_call_ringtone_vibrate_title" msgid="1543777228646645163">"कॉल की रिंगटोन और कंपन"</string>
+    <string name="notification_log_title" msgid="3766148588239398464">"सूचना लॉग"</string>
+    <string name="sound_category_call_ringtone_vibrate_title" msgid="1543777228646645163">"रिंगटोन और कंपन (वाइब्रेशन)"</string>
     <string name="sound_category_system_title" msgid="1480844520622721141">"सिस्टम"</string>
     <string name="wifi_setup_title" msgid="2970260757780025029">"वाई-फ़ाई  सेटअप"</string>
     <string name="wifi_setup_title_editing_network" msgid="6020614644556717979">"वाई-फ़ाई नेटवर्क <xliff:g id="NETWORK_NAME">%s</xliff:g> से कनेक्ट करें"</string>
@@ -2273,7 +2293,7 @@
     <string name="wifi_setup_connect" msgid="7954456989590237049">"जोड़ दें"</string>
     <string name="wifi_setup_forget" msgid="2562847595567347526">"भूलें"</string>
     <string name="wifi_setup_save" msgid="3659235094218508211">"जोड़ें"</string>
-    <string name="wifi_setup_cancel" msgid="3185216020264410239">"अभी नहीं"</string>
+    <string name="wifi_setup_cancel" msgid="3185216020264410239">"रद्द करें"</string>
     <string name="wifi_setup_status_scanning" msgid="5317003416385428036">"नेटवर्क स्‍कैन कर रहा है..."</string>
     <string name="wifi_setup_status_select_network" msgid="3960480613544747397">"किसी नेटवर्क से कनेक्ट करने के लिए उस पर टैप करें"</string>
     <string name="wifi_setup_status_existing_network" msgid="6394925174802598186">"मौजूदा नेटवर्क से कनेक्‍ट करें"</string>
@@ -2285,14 +2305,14 @@
     <string name="wifi_setup_status_eap_not_supported" msgid="6796317704783144190">"EAP समर्थित नहीं है."</string>
     <string name="wifi_setup_eap_not_supported" msgid="6812710317883658843">"आप सेटअप के दौरान किसी EAP वाई-फ़ाई  कनेक्‍शन को कॉन्‍िफ़गर नहीं कर सकते. सेटअप करने के बाद, आप उसे सेटिंग &gt; वायरलेस और नेटवर्क में कॉन्फ़िगर कर सकते हैं."</string>
     <string name="wifi_setup_description_connecting" msgid="2793554932006756795">"कनेक्‍ट होने में कुछ मिनट लग सकते हैं..."</string>
-    <string name="wifi_setup_description_connected" msgid="6649168170073219153">"सेटअप जारी रखने के लिए "<b>"अगला"</b>" टैप करें.\n\nकिसी भिन्न वाई-फ़ाई नेटवर्क से कनेक्ट करने के लिए "<b>"वापस जाएं"</b>" टैप करें."</string>
+    <string name="wifi_setup_description_connected" msgid="6649168170073219153">"सेटअप जारी रखने के लिए "<b>"अगला"</b>" पर टैप करें.\n\nकिसी दूसरे वाई-फ़ाई नेटवर्क से कनेक्ट करने के लिए "<b>"वापस जाएं"</b>" पर टैप करें."</string>
     <string name="accessibility_sync_enabled" msgid="558480439730263116">"समन्वयन सक्षम"</string>
     <string name="accessibility_sync_disabled" msgid="1741194106479011384">"समन्वयन अक्षम"</string>
     <string name="accessibility_sync_in_progress" msgid="4501160520879902723">"अब समन्वयित हो रहा है"</string>
     <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>
@@ -2302,8 +2322,8 @@
     <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>
@@ -2312,7 +2332,7 @@
     <string name="settings_backup" msgid="2274732978260797031">"बैक अप सेटिंग"</string>
     <string name="settings_backup_summary" msgid="7916877705938054035">"मेरी सेटिंग का बैक अप लें"</string>
     <string name="sync_menu_sync_now" msgid="6154608350395805683">"अभी समन्वयन करें"</string>
-    <string name="sync_menu_sync_cancel" msgid="8292379009626966949">"समन्वयन ना करें"</string>
+    <string name="sync_menu_sync_cancel" msgid="8292379009626966949">"लिंक करना रद्द करें"</string>
     <string name="sync_one_time_sync" msgid="3733796114909082260">"अभी समन्वयित करने के लिए टैप करें<xliff:g id="LAST_SYNC_TIME">
 %1$s</xliff:g>"</string>
     <string name="sync_gmail" msgid="714886122098006477">"Gmail"</string>
@@ -2323,11 +2343,11 @@
     <string name="header_data_and_synchronization" msgid="5165024023936509896">"डेटा और सिंक्रनाइज़ेशन"</string>
     <string name="preference_change_password_title" msgid="8955581790270130056">"पासवर्ड बदलें"</string>
     <string name="header_account_settings" msgid="5382475087121880626">"खाता सेटिंग"</string>
-    <string name="remove_account_label" msgid="5921986026504804119">"खाता हटाएं"</string>
+    <string name="remove_account_label" msgid="5921986026504804119">"खाता मिटाएं"</string>
     <string name="header_add_an_account" msgid="756108499532023798">"कोई खाता जोड़ें"</string>
     <string name="finish_button_label" msgid="481587707657751116">"समाप्त"</string>
-    <string name="really_remove_account_title" msgid="8800653398717172460">"खाता हटाएं?"</string>
-    <string name="really_remove_account_message" product="tablet" msgid="1936147502815641161">"यह खाता निकालने से, टेबलेट से खाते के सभी संदेश, संपर्क और अन्‍य डेटा हट जाएंगे!"</string>
+    <string name="really_remove_account_title" msgid="8800653398717172460">"खाता मिटाएं?"</string>
+    <string name="really_remove_account_message" product="tablet" msgid="1936147502815641161">"यह खाता निकालने से, टैबलेट से खाते के सभी संदेश, संपर्क और अन्‍य डेटा हट जाएंगे!"</string>
     <string name="really_remove_account_message" product="default" msgid="3483528757922948356">"यह खाता निकालने से, फ़ोन से इसके सभी संदेश, संपर्क और अन्‍य डेटा हट जाएंगे!"</string>
     <string name="remove_account_failed" msgid="3901397272647112455">"आपका व्यवस्थापक इस बदलाव की अनुमति नहीं देता"</string>
     <string name="provider_label" msgid="7724593781904508866">"पुश सदस्यता"</string>
@@ -2335,29 +2355,28 @@
     <skip />
     <string name="cant_sync_dialog_title" msgid="2777238588398046285">"मैन्युअल रूप से समन्वयित नहीं कर सकता"</string>
     <string name="cant_sync_dialog_message" msgid="1938380442159016449">"इस आइटम के लिए समन्वयन वर्तमान में अक्षम है. यह सेटिंग बदलने के लिए, पृष्ठभूमि डेटा और स्वचालित समन्वयन को अस्थायी रूप से चालू करें."</string>
-    <string name="wimax_settings" msgid="2655139497028469039">"4G"</string>
-    <string name="status_wimax_mac_address" msgid="8390791848661413416">"4G MAC पता"</string>
     <string name="enter_password" msgid="8035706727471334122">"Android प्रारंभ करने के लिए, अपना पासवर्ड डालें"</string>
     <string name="enter_pin" msgid="5305333588093263790">"Android प्रारंभ करने के लिए, अपना पिन डालें"</string>
     <string name="enter_pattern" msgid="4187435713036808566">"Android प्रारंभ करने के लिए, अपना प्रतिमान लिखें"</string>
     <string name="cryptkeeper_wrong_pattern" msgid="8423835922362956999">"गलत पैटर्न"</string>
     <string name="cryptkeeper_wrong_password" msgid="5200857195368904047">"गलत पासवर्ड"</string>
     <string name="cryptkeeper_wrong_pin" msgid="755720788765259382">"गलत पिन"</string>
-    <string name="checking_decryption" msgid="8287458611802609493">"जांच की जा रही है..."</string>
+    <string name="checking_decryption" msgid="8287458611802609493">"जाँच की जा रही है..."</string>
     <string name="starting_android" msgid="4001324195902252681">"Android प्रारंभ किया जा रहा है..."</string>
-    <string name="delete" msgid="4219243412325163003">"हटाएं"</string>
+    <string name="delete" msgid="4219243412325163003">"मिटाएं"</string>
     <string name="misc_files" msgid="6720680815969643497">"विविध फ़ाइलें"</string>
     <string name="misc_files_selected_count" msgid="4647048020823912088">"<xliff:g id="TOTAL">%2$d</xliff:g> में से <xliff:g id="NUMBER">%1$d</xliff:g> चयनित"</string>
     <string name="misc_files_selected_count_bytes" msgid="2876232009069114352">"<xliff:g id="TOTAL">%2$s</xliff:g> में से <xliff:g id="NUMBER">%1$s</xliff:g>"</string>
     <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_plan_usage_manage_plans_button_text" msgid="8997761990902708162">"योजनाएं प्रबंधित करें"</string>
+    <string name="data_usage_summary_title" msgid="3804110657238092929">"डेटा खर्च"</string>
+    <string name="data_usage_app_summary_title" msgid="4147258989837459172">"डेटा खर्च एेप"</string>
+    <string name="data_usage_accounting" msgid="7170028915873577387">"डेटा खर्च को लेकर मोबाइल और इंटरनेट सेवा देने वाली कंपनी का हिसाब आपके डिवाइस के हिसाब से अलग हो सकता है."</string>
     <string name="data_usage_app" msgid="4970478397515423303">"ऐप्स का उपयोग"</string>
-    <string name="data_usage_app_info_label" msgid="3409931235687866706">"ऐप्स की जानकारी"</string>
+    <string name="data_usage_app_info_label" msgid="3409931235687866706">"ऐप की जानकारी"</string>
     <string name="data_usage_cellular_data" msgid="9168928285122125137">"मोबाइल डेटा"</string>
     <string name="data_usage_data_limit" msgid="1193930999713192703">"डेटा की सीमा सेट करें"</string>
-    <string name="data_usage_cycle" msgid="5652529796195787949">"डेटा उपयोग चक्र"</string>
+    <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>
@@ -2373,10 +2392,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>
@@ -2400,61 +2419,64 @@
     <string name="data_usage_background_label" msgid="2722008379947694926">"पृष्ठभूमि:"</string>
     <string name="data_usage_app_settings" msgid="2279171379771253165">"ऐप्स सेटिंग"</string>
     <string name="data_usage_app_restrict_background" msgid="7359227831562303223">"पृष्‍ठभूमि डेटा"</string>
-    <string name="data_usage_app_restrict_background_summary" msgid="5853552187570622572">"बैकग्राउंड में मोबाइल डेटा का उपयोग करना सक्षम करें"</string>
+    <string name="data_usage_app_restrict_background_summary" msgid="5853552187570622572">"बैकग्राउंड में मोबाइल डेटा का इस्तेमाल करना चालू करें"</string>
     <string name="data_usage_app_restrict_background_summary_disabled" msgid="7401927377070755054">"इस एप्‍लि. के लिए पृष्ठभूमि डेटा प्रतिबंधित करने के लिए, पहले मो. डेटा सीमा सेट करें."</string>
     <string name="data_usage_app_restrict_dialog_title" msgid="1613108390242737923">"पृष्ठभूमि डेटा प्रतिबंधित करें?"</string>
-    <string name="data_usage_app_restrict_dialog" msgid="1466689968707308512">"यह सुविधा केवल मोबाइल नेटवर्क उपलब्ध होने पर उस एप्ल‍िकेशन को कार्य करने से रोक सकती है जो पृष्ठभूमि डेटा पर निर्भर है.\n\nआपको एप्ल‍िकेशन में उपलब्ध सेटिंग में अधिक उपयुक्त डेटा उपयोग नियंत्रण मिल सकते हैं."</string>
+    <string name="data_usage_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_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>
-    <string name="data_usage_restrict_background_multiuser" product="default" msgid="7910798414964288424">"अगर आप बैकग्राउंड मोबाइल डेटा प्रतिबंधित करते हैं, तो जब तक आप वाई-फ़ाई से कनेक्ट नहीं हो जाते, तब तक कुछ ऐप्लिकेशन और सेवाएं काम नहीं करेंगी.\n\nइस सेटिंग से इस फ़ोन पर मौजूद सभी उपयोगकर्ता प्रभावित होते हैं."</string>
+    <string name="data_usage_restrict_background_multiuser" product="tablet" msgid="7096707497743363380">"अगर आप बैकग्राउंड मोबाइल डेटा प्रतिबंधित करते हैं, तो जब तक आप वाई-फ़ाई से कनेक्ट नहीं हो जाते, तब तक कुछ ऐप्लिकेशन और सेवाएं काम नहीं करेंगी.\n\nइस सेटिंग का इस टैबलेट पर मौजूद सभी उपयोगकर्ताओं पर असर पड़ेगा ."</string>
+    <string name="data_usage_restrict_background_multiuser" product="default" msgid="7910798414964288424">"अगर आप बैकग्राउंड मोबाइल डेटा प्रतिबंधित करते हैं, तो जब तक आप वाई-फ़ाई से कनेक्ट नहीं हो जाते, तब तक कुछ ऐप्लिकेशन और सेवाएं काम नहीं करेंगी.\n\nइस सेटिंग का इस फ़ोन पर मौजूद सभी उपयोगकर्ताओं पर असर पड़ता है."</string>
     <string name="data_usage_sweep_warning" msgid="6387081852568846982"><font size="18">"<xliff:g id="NUMBER">^1</xliff:g>"</font>" "<font size="9">"<xliff:g id="UNIT">^2</xliff:g>"</font>\n<font size="12">"चेतावनी"</font></string>
     <string name="data_usage_sweep_limit" msgid="860566507375933039"><font size="18">"<xliff:g id="NUMBER">^1</xliff:g>"</font>" "<font size="9">"<xliff:g id="UNIT">^2</xliff:g>"</font>\n<font size="12">"सीमा"</font></string>
     <string name="data_usage_uninstalled_apps" msgid="614263770923231598">"निकाले गए ऐप्स"</string>
     <string name="data_usage_uninstalled_apps_users" msgid="7986294489899813194">"ऐप्स  और उपयोगकर्ताओं को निकालें"</string>
     <string name="data_usage_received_sent" msgid="5039699009276621757">"<xliff:g id="RECEIVED">%1$s</xliff:g> प्राप्त, <xliff:g id="SENT">%2$s</xliff:g> भेजा"</string>
     <string name="data_usage_total_during_range" msgid="4091294280619255237">"<xliff:g id="RANGE">%2$s</xliff:g>: लगभग <xliff:g id="TOTAL">%1$s</xliff:g> का उपयोग किया गया."</string>
-    <string name="data_usage_total_during_range_mobile" product="tablet" msgid="1925687342154538972">"<xliff:g id="RANGE">%2$s</xliff:g>: आपके टेबलेट के द्वारा मापे जाने के अनुसार, लगभग <xliff:g id="TOTAL">%1$s</xliff:g> का उपयोग किया गया. आपके कैरियर की डेटा गणना अलग हो सकती है."</string>
+    <string name="data_usage_total_during_range_mobile" product="tablet" msgid="1925687342154538972">"<xliff:g id="RANGE">%2$s</xliff:g>: आपके टैबलेट के द्वारा मापे जाने के अनुसार, लगभग <xliff:g id="TOTAL">%1$s</xliff:g> का उपयोग किया गया. आपके कैरियर की डेटा गणना अलग हो सकती है."</string>
     <string name="data_usage_total_during_range_mobile" product="default" msgid="5063981061103812900">"<xliff:g id="RANGE">%2$s</xliff:g>: आपके फ़ोन के द्वारा मापे जाने के अनुसार, लगभग <xliff:g id="TOTAL">%1$s</xliff:g> का उपयोग किया गया. आपके कैरियर की डेटा गणना अलग हो सकती है."</string>
     <string name="data_usage_metered_title" msgid="7383175371006596441">"नेटवर्क प्रतिबंध"</string>
-    <string name="data_usage_metered_body" msgid="7655851702771342507">"बैकग्राउंड डेटा प्रतिबंधित होने पर मापे जाने वाले नेटवर्क मोबाइल नेटवर्क की तरह माने जाते हैं. बड़े डाउनलोड के लिए इन नेटवर्क का उपयोग करने से पहले ऐप्लिकेशन चेतावनी दे सकते हैं."</string>
+    <string name="data_usage_metered_body" msgid="7655851702771342507">"बैकग्राउंड डेटा प्रतिबंधित होने पर बिल किए जाने वाले नेटवर्क मोबाइल नेटवर्क की तरह माने जाते हैं. बड़े डाउनलोड के लिए इन नेटवर्क का उपयोग करने से पहले ऐप चेतावनी दे सकते हैं."</string>
     <string name="data_usage_metered_mobile" msgid="5423305619126978393">"मोबाइल नेटवर्क"</string>
-    <string name="data_usage_metered_wifi" msgid="1761738002328299714">"मीटर किए गए वाई-फ़ाई नेटवर्क"</string>
-    <string name="data_usage_metered_wifi_disabled" msgid="727808462375941567">"मापे जाने वाले नेटवर्क चुनने के लिए, वाई-फ़ाई चालू करें."</string>
-    <string name="data_usage_disclaimer" msgid="6887858149980673444">"वाहक की डेटा गणना आपके डिवाइस से भिन्न हो सकती है."</string>
+    <string name="data_usage_metered_wifi" msgid="1761738002328299714">"बिल किए गए वाई-फ़ाई नेटवर्क"</string>
+    <string name="data_usage_metered_wifi_disabled" msgid="727808462375941567">"बिल किए जाने वाले नेटवर्क चुनने के लिए, वाई-फ़ाई चालू करें."</string>
+    <string name="data_usage_metered_auto" msgid="1262028400911918865">"ऑटोमैटिक"</string>
+    <string name="data_usage_metered_yes" msgid="9217539611385225894">"बिल किया गया"</string>
+    <string name="data_usage_metered_no" msgid="4025232961929071789">"बिल नहीं किया गया"</string>
+    <string name="data_usage_disclaimer" msgid="6887858149980673444">"डेटा खर्च को लेकर मोबाइल और इंटरनेट सेवा देने वाली कंपनी का हिसाब आपके डिवाइस के हिसाब से अलग हो सकता है."</string>
     <string name="cryptkeeper_emergency_call" msgid="198578731586097145">"आपातकालीन कॉल"</string>
     <string name="cryptkeeper_return_to_call" msgid="5613717339452772491">"कॉल पर वापस लौटें"</string>
     <string name="vpn_name" msgid="4689699885361002297">"नाम"</string>
     <string name="vpn_type" msgid="5435733139514388070">"प्रकार"</string>
     <string name="vpn_server" msgid="2123096727287421913">"सर्वर पता"</string>
-    <string name="vpn_mppe" msgid="6639001940500288972">"PPP एन्‍क्रिप्‍शन (MPPE)"</string>
+    <string name="vpn_mppe" msgid="6639001940500288972">"पीपीपी सुरक्षा (MPPE) चालू करें"</string>
     <string name="vpn_l2tp_secret" msgid="529359749677142076">"L2TP सीक्रेट"</string>
     <string name="vpn_ipsec_identifier" msgid="4098175859460006296">"IPSec पहचानकर्ता"</string>
     <string name="vpn_ipsec_secret" msgid="4526453255704888704">"IPSec पहले से शेयर की गई कुंजी"</string>
     <string name="vpn_ipsec_user_cert" msgid="6880651510020187230">"IPSec उपयोगकर्ता प्रमाणपत्र"</string>
     <string name="vpn_ipsec_ca_cert" msgid="91338213449148229">"IPSec CA प्रमाणपत्र"</string>
     <string name="vpn_ipsec_server_cert" msgid="6599276718456935010">"IPSec सर्वर प्रमाणपत्र"</string>
-    <string name="vpn_show_options" msgid="7182688955890457003">"अतिरिक्त सेटिंग दिखाएं"</string>
-    <string name="vpn_search_domains" msgid="5391995501541199624">"DNS खोज डोमेन"</string>
-    <string name="vpn_dns_servers" msgid="5570715561245741829">"DNS सर्वर (उदा. 8.8.8.8)"</string>
-    <string name="vpn_routes" msgid="3818655448226312232">"अग्रेषण मार्ग (उदा. 10.0.0.0/8)"</string>
-    <string name="vpn_username" msgid="1863901629860867849">"उपयोगकर्ता नाम"</string>
+    <string name="vpn_show_options" msgid="7182688955890457003">"बेहतर विकल्प दिखाएं"</string>
+    <string name="vpn_search_domains" msgid="5391995501541199624">"DNS सर्च डोमेन"</string>
+    <string name="vpn_dns_servers" msgid="5570715561245741829">"DNS सर्वर (उदाहरण 8.8.8.8)"</string>
+    <string name="vpn_routes" msgid="3818655448226312232">"फ़ॉरवर्डिंग रूट्स (उदाहरण 10.0.0.0/8)"</string>
+    <string name="vpn_username" msgid="1863901629860867849">"उपयोगकर्ता का नाम"</string>
     <string name="vpn_password" msgid="6756043647233596772">"पासवर्ड"</string>
-    <string name="vpn_save_login" msgid="6350322456427484881">"खाता जानकारी रखें"</string>
+    <string name="vpn_save_login" msgid="6350322456427484881">"खाते की जानकारी सेव करें"</string>
     <string name="vpn_not_used" msgid="9094191054524660891">"(उपयोग नहीं किया)"</string>
     <string name="vpn_no_ca_cert" msgid="8776029412793353361">"(सर्वर सत्‍यापित न करें)"</string>
     <string name="vpn_no_server_cert" msgid="2167487440231913330">"(सर्वर से प्राप्त)"</string>
@@ -2462,13 +2484,13 @@
     <string name="vpn_always_on_invalid_reason_server" msgid="477304620899799383">"हमेशा-चालू VPN सिर्फ़ संख्या वाले सर्वर पतों का समर्थन करता है"</string>
     <string name="vpn_always_on_invalid_reason_no_dns" msgid="2226648961940273294">"हमेशा-चालू VPN के लिए एक DNS सर्वर तय किया जाना चाहिए"</string>
     <string name="vpn_always_on_invalid_reason_dns" msgid="3551394495620249972">"DNS सर्वर के पते हमेशा-चालू VPN के लिए संख्या रूप में होने चाहिए"</string>
-    <string name="vpn_always_on_invalid_reason_other" msgid="5959352052515258208">"जो जानकारी डाली गई है वह हमेशा-चालू VPN का समर्थन नहीं करती"</string>
-    <string name="vpn_cancel" msgid="1979937976123659332">"अभी नहीं"</string>
+    <string name="vpn_always_on_invalid_reason_other" msgid="5959352052515258208">"डाली गई जानकारी VPN हमेशा चालू रखें से मेल नहीं खाती"</string>
+    <string name="vpn_cancel" msgid="1979937976123659332">"रद्द करें"</string>
     <string name="vpn_done" msgid="8678655203910995914">"ख़ारिज करें"</string>
     <string name="vpn_save" msgid="4233484051644764510">"जोड़ें"</string>
     <string name="vpn_connect" msgid="8469608541746132301">"जोड़ दें"</string>
     <string name="vpn_replace" msgid="5442836256121957861">"बदलें"</string>
-    <string name="vpn_edit" msgid="8647191407179996943">"VPN प्रोफ़ाइल संपादित करें"</string>
+    <string name="vpn_edit" msgid="8647191407179996943">"VPN प्रोफ़ाइल में बदलाव करें"</string>
     <string name="vpn_forget" msgid="3684651372749415446">"भूल जाएं"</string>
     <string name="vpn_connect_to" msgid="5965299358485793260">" <xliff:g id="PROFILE">%s</xliff:g> से कनेक्ट करें"</string>
     <string name="vpn_disconnect_confirm" msgid="3743970132487505659">"इस VPN को डिसकनेक्ट करना चाहते हैं?"</string>
@@ -2477,8 +2499,8 @@
     <string name="vpn_forget_long" msgid="2232239391189465752">"VPN भूल जाएं"</string>
     <string name="vpn_replace_vpn_title" msgid="2963898301277610248">"मौजूदा VPN को बदलें?"</string>
     <string name="vpn_set_vpn_title" msgid="4009987321156037267">"हमेशा-चालू VPN सेट करें?"</string>
-    <string name="vpn_first_always_on_vpn_message" msgid="3025322109743675467">"यह सेटिंग चालू करने से, आपके पास तब तक इंटरनेट कनेक्शन नहीं होगा जब तक कि VPN सफलतापूर्वक कनेक्ट नहीं हो जाता"</string>
-    <string name="vpn_replace_always_on_vpn_enable_message" msgid="2577928591361606641">"आपका मौजूदा VPN बदल दिया जाएगा और आपके पास तब तक इंटरनेट कनेक्शन नहीं होगा जब तक कि VPN सफलतापूर्वक कनेक्ट नहीं हो जाता"</string>
+    <string name="vpn_first_always_on_vpn_message" msgid="7144543717673197102">"यह सेटिंग चालू होने पर, आपके पास तब तक इंटरनेट कनेक्शन नहीं होगा, जब तक कि VPN अच्छी तरह कनेक्ट नहीं हो जाता"</string>
+    <string name="vpn_replace_always_on_vpn_enable_message" msgid="798121133114824006">"आपका मौजूदा VPN बदल दिया जाएगा. आपके पास तब तक इंटरनेट कनेक्शन नहीं होगा, जब तक कि VPN कनेक्ट नहीं हो जाता"</string>
     <string name="vpn_replace_always_on_vpn_disable_message" msgid="3011818750025879902">"आप हमेशा चालू रहने वाले किसी VPN से पहले से कनेक्ट हैं. यदि आप किसी दूसरे से कनेक्ट करते हैं तो मौजूदा VPN बदल दिया जाएगा और हमेशा-चालू मोड बंद हो जाएगा."</string>
     <string name="vpn_replace_vpn_message" msgid="5611635724578812860">"आप पहले से ही किसी VPN से कनेक्ट हैं. यदि आप किसी दूसरे से कनेक्ट करते हैं, तो आपका माैजूदा VPN बदल दिया जाएगा."</string>
     <string name="vpn_turn_on" msgid="2363136869284273872">"चालू करें"</string>
@@ -2486,8 +2508,8 @@
     <string name="vpn_cant_connect_message" msgid="1352832123114214283">"यह ऐप्लिकेशन हमेशा-चालू VPN का समर्थन नहीं करता"</string>
     <string name="vpn_title" msgid="6317731879966640551">"VPN"</string>
     <string name="vpn_create" msgid="5628219087569761496">" VPN प्रोफ़ाइल जोड़ें"</string>
-    <string name="vpn_menu_edit" msgid="408275284159243490">"प्रोफ़ाइल संपादित करें"</string>
-    <string name="vpn_menu_delete" msgid="8098021690546891414">"प्रोफ़ाइल हटाएं"</string>
+    <string name="vpn_menu_edit" msgid="408275284159243490">"प्रोफ़ाइल में बदलाव करें"</string>
+    <string name="vpn_menu_delete" msgid="8098021690546891414">"प्रोफ़ाइल मिटाएं"</string>
     <string name="vpn_menu_lockdown" msgid="7863024538064268139">"हमेशा-चालू VPN"</string>
     <string name="vpn_no_vpns_added" msgid="5002741367858707244">"कोई VPN नहीं जोड़ा गया"</string>
     <string name="vpn_always_on_summary" msgid="2821344524094363617">"VPN से हमेशा कनेक्ट रहें"</string>
@@ -2497,7 +2519,7 @@
     <string name="vpn_require_connection_title" msgid="159053539340576331">"VPN कनेक्शन ज़रूरी है?"</string>
     <string name="vpn_lockdown_summary" msgid="2200032066376720339">"वह VPN प्रोफ़ाइल चुनें जिससे हमेशा कनेक्ट रहना है. नेटवर्क ट्रैफ़िक की अनुमति केवल इस VPN से कनेक्ट रहने पर ही दी जाएगी."</string>
     <string name="vpn_lockdown_none" msgid="9214462857336483711">"कोई नहीं"</string>
-    <string name="vpn_lockdown_config_error" msgid="3898576754914217248">"हमेशा-चालू VPN के लिए, सर्वर और DNS दोनों के लिए IP पता होना आवश्यक है."</string>
+    <string name="vpn_lockdown_config_error" msgid="3898576754914217248">"हमेशा-चालू VPN के लिए, सर्वर और DNS दोनों के लिए आईपी पता होना ज़रूरी है."</string>
     <string name="vpn_no_network" msgid="3050233675132726155">"कोई नेटवर्क कनेक्शन नहीं है. कृपया बाद में पुन: प्रयास करें."</string>
     <string name="vpn_disconnected" msgid="280531508768927471">"VPN से डिसकनेक्ट किया गया"</string>
     <string name="vpn_disconnected_summary" msgid="3082851661207900606">"कोई नहीं"</string>
@@ -2505,7 +2527,7 @@
     <string name="trusted_credentials_system_tab" msgid="3984284264816924534">"सिस्‍टम"</string>
     <string name="trusted_credentials_user_tab" msgid="2244732111398939475">"उपयोगकर्ता"</string>
     <string name="trusted_credentials_disable_label" msgid="3864493185845818506">"अक्षम करें"</string>
-    <string name="trusted_credentials_enable_label" msgid="2498444573635146913">"सक्षम करें"</string>
+    <string name="trusted_credentials_enable_label" msgid="2498444573635146913">"चालू करें"</string>
     <string name="trusted_credentials_remove_label" msgid="3633691709300260836">"निकालें"</string>
     <string name="trusted_credentials_trust_label" msgid="8003264222650785429">"भरोसा"</string>
     <string name="trusted_credentials_enable_confirmation" msgid="83215982842660869">"सिस्‍टम CA प्रमाणपत्र सक्षम करना है?"</string>
@@ -2516,37 +2538,34 @@
     <string name="one_usercrt" msgid="2150319011101639509">"एक उपयोगकर्ता प्रमाणपत्र"</string>
     <string name="one_cacrt" msgid="6844397037970164809">"एक CA प्रमाणपत्र"</string>
     <string name="n_cacrts" msgid="5979300323482053820">"%d CA प्रमाणपत्र"</string>
-    <string name="user_credential_title" msgid="1954061209643070652">"क्रेडेंशियल का विवरण"</string>
+    <string name="user_credential_title" msgid="1954061209643070652">"क्रेडेंशियल की पूरी जानकारी"</string>
     <string name="user_credential_removed" msgid="6514189495799401838">"क्रेडेंशियल निकाला गया: <xliff:g id="CREDENTIAL_NAME">%s</xliff:g>"</string>
-    <string name="user_credential_none_installed" msgid="3729607560420971841">"कोई उपयोगकर्ता क्रेडेंशियल इंस्टॉल नहीं है"</string>
-    <string name="spellcheckers_settings_title" msgid="399981228588011501">"शब्द जांच"</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="selinux_status_disabled" msgid="924551035552323327">"अक्षम"</string>
-    <string name="selinux_status_permissive" msgid="6004965534713398778">"अनुमति देने वाला"</string>
-    <string name="selinux_status_enforcing" msgid="2252703756208463329">"लागू किया जा रहा है"</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="ssl_ca_cert_warning" msgid="2045866713601984673">"नेटवर्क को मॉनीटर किया जा सकता है"</string>
-    <string name="done_button" msgid="1991471253042622230">"पूर्ण"</string>
+    <string name="done_button" msgid="1991471253042622230">"हो गया"</string>
     <plurals name="ssl_ca_cert_dialog_title" formatted="false" msgid="7145092748045794650">
       <item quantity="one">प्रमाणपत्रों पर विश्वास करें या निकालें</item>
       <item quantity="other">प्रमाणपत्रों पर विश्वास करें या निकालें</item>
     </plurals>
     <plurals name="ssl_ca_cert_info_message_device_owner" formatted="false" msgid="1489335297837656666">
-      <item quantity="one"><xliff:g id="MANAGING_DOMAIN_1">%s</xliff:g> ने आपके डिवाइस पर प्रमाणपत्र प्राधिकार इंस्टॉल किए हैं, जिससे उसे ईमेल, ऐप्लिकेशन और सुरक्षित वेबसाइटों के साथ ही आपकी डिवाइस नेटवर्क गतिविधि की निगरानी करने की अनुमति मिल सकती है.\n\nइन प्रमाणपत्रों के बारे में अधिक जानकारी के लिए, अपने व्यवस्थापक से संपर्क करें.</item>
-      <item quantity="other"><xliff:g id="MANAGING_DOMAIN_1">%s</xliff:g> ने आपके डिवाइस पर प्रमाणपत्र प्राधिकार इंस्टॉल किए हैं, जिससे उसे ईमेल, ऐप्लिकेशन और सुरक्षित वेबसाइटों के साथ ही आपकी डिवाइस नेटवर्क गतिविधि की निगरानी करने की अनुमति मिल सकती है.\n\nइन प्रमाणपत्रों के बारे में अधिक जानकारी के लिए, अपने व्यवस्थापक से संपर्क करें.</item>
+      <item quantity="one"><xliff:g id="MANAGING_DOMAIN_1">%s</xliff:g> ने आपके डिवाइस पर एक सर्टिफ़िकेट अथॉरिटी को इंस्टॉल किया है, जिससे उसे ईमेल, ऐप्लिकेशन और सुरक्षित वेबसाइटों के साथ ही आपकी डिवाइस नेटवर्क गतिविधि की निगरानी करने की अनुमति मिल सकती है.\n\nइन प्रमाणपत्रों के बारे में और जानकारी के लिए, अपने एडमिन से संपर्क करें.</item>
+      <item quantity="other"><xliff:g id="MANAGING_DOMAIN_1">%s</xliff:g> ने आपके डिवाइस पर एक सर्टिफ़िकेट अथॉरिटी को इंस्टॉल किया है, जिससे उसे ईमेल, ऐप्लिकेशन और सुरक्षित वेबसाइटों के साथ ही आपकी डिवाइस नेटवर्क गतिविधि की निगरानी करने की अनुमति मिल सकती है.\n\nइन प्रमाणपत्रों के बारे में और जानकारी के लिए, अपने व्यवस्थापक से संपर्क करें.</item>
     </plurals>
     <plurals name="ssl_ca_cert_info_message" formatted="false" msgid="30645643499556573">
-      <item quantity="one"><xliff:g id="MANAGING_DOMAIN_1">%s</xliff:g> ने आपकी कार्य प्रोफ़ाइल के लिए प्रमाणपत्र प्राधिकरण इंस्टॉल किए हैं, जिससे उसे ईमेल, ऐप्लिकेशन और सुरक्षित वेबसाइटों के साथ ही कार्यस्थल की नेटवर्क की गतिविधि की निगरानी करने की अनुमति मिल सकती है.\n\nइन प्रमाणपत्रों के बारे में अधिक जानकारी के लिए, अपने व्यवस्थापक से संपर्क करें.</item>
-      <item quantity="other"><xliff:g id="MANAGING_DOMAIN_1">%s</xliff:g> ने आपकी कार्य प्रोफ़ाइल के लिए प्रमाणपत्र प्राधिकरण इंस्टॉल किए हैं, जिससे उसे ईमेल, ऐप्लिकेशन और सुरक्षित वेबसाइटों के साथ ही कार्यस्थल की नेटवर्क की गतिविधि की निगरानी करने की अनुमति मिल सकती है.\n\nइन प्रमाणपत्रों के बारे में अधिक जानकारी के लिए, अपने व्यवस्थापक से संपर्क करें.</item>
+      <item quantity="one"><xliff:g id="MANAGING_DOMAIN_1">%s</xliff:g> ने आपकी वर्क प्रोफ़ाइल के लिए प्रमाणपत्र अनुमतियां इंस्टॉल की हैं, जिससे उसे ईमेल, ऐप्लिकेशन और सुरक्षित वेबसाइटों के साथ ही वर्क नेटवर्क की गतिविधि की निगरानी करने की अनुमति मिल सकती है.\n\nइन प्रमाणपत्रों के बारे में और जानकारी के लिए, अपने एडमिन से संपर्क करें.</item>
+      <item quantity="other"><xliff:g id="MANAGING_DOMAIN_1">%s</xliff:g> ने आपकी वर्क प्रोफ़ाइल के लिए प्रमाणपत्र अनुमतियां इंस्टॉल की हैं, जो उन्हें ईमेल, ऐप्लिकेशन और सुरक्षित वेबसाइट सहित, वर्क नेटवर्क गतिविधि की निगरानी करने की अनुमति दे सकते हैं.\n\nइन प्रमाणपत्रों के बारे में और जानकारी के लिए, अपने एडमिन से संपर्क करें.</item>
     </plurals>
     <string name="ssl_ca_cert_warning_message" msgid="8216218659139190498">"एक तृतीय पक्ष ईमेल, ऐप्स और सुरक्षित वेबसाइटों सहित आपकी नेटवर्क गतिविधि को मॉनीटर करने में सक्षम है.\n\nआपके डिवाइस पर इंस्टॉल किए गए एक विश्वसनीय क्रेंडेशियल के कारण ऐसा संभव हो रहा है."</string>
     <plurals name="ssl_ca_cert_settings_button" formatted="false" msgid="2426799352517325228">
-      <item quantity="one">प्रमाणपत्रों की जांच करें</item>
-      <item quantity="other">प्रमाणपत्रों की जांच करें</item>
+      <item quantity="one">प्रमाणपत्रों की जाँच करें</item>
+      <item quantity="other">प्रमाणपत्रों की जाँच करें</item>
     </plurals>
     <string name="user_settings_title" msgid="6151874007858148344">"उपयोगकर्ता"</string>
     <string name="user_list_title" msgid="7937158411137563543">"उपयोगकर्ता और प्रोफ़ाइल"</string>
@@ -2558,64 +2577,64 @@
     <string name="user_summary_not_set_up" msgid="8778205026866794909">"सेट नहीं है"</string>
     <string name="user_summary_restricted_not_set_up" msgid="1628116001964325544">"सेट नहीं की गई - प्रतिबंधित प्रोफ़ाइल"</string>
     <string name="user_summary_managed_profile_not_set_up" msgid="1659125858619760573">"सेट नहीं की गई - कार्य प्रोफ़ाइल"</string>
-    <string name="user_admin" msgid="993402590002400782">"नियंत्रक"</string>
+    <string name="user_admin" msgid="993402590002400782">"एडमिन"</string>
     <string name="user_you" msgid="1639158809315025986">"आप (<xliff:g id="NAME">%s</xliff:g>)"</string>
     <string name="user_nickname" msgid="5148818000228994488">"प्रचलित नाम"</string>
     <string name="user_add_user_type_title" msgid="2146438670792322349">"जोड़ें"</string>
     <string name="user_add_max_count" msgid="5405885348463433157">"आप <xliff:g id="USER_COUNT">%1$d</xliff:g> उपयोगकर्ता तक जोड़ सकते हैं"</string>
     <string name="user_add_user_item_summary" msgid="4702776187132008661">"उपयोगकर्ताओं के उनके स्वयं के ऐप्स  और सामग्री होती है"</string>
-    <string name="user_add_profile_item_summary" msgid="5931663986889138941">"आप अपने खाते से ऐप्स  और सामग्री पर एक्सेस को प्रतिबंधित कर सकते हैं"</string>
+    <string name="user_add_profile_item_summary" msgid="5931663986889138941">"आप अपने खाते से ऐप और सामग्री की पहुंच को रोक सकते हैं"</string>
     <string name="user_add_user_item_title" msgid="8212199632466198969">"उपयोगकर्ता"</string>
     <string name="user_add_profile_item_title" msgid="8353515490730363621">"प्रतिबंधित प्रोफ़ाइल"</string>
     <string name="user_add_user_title" msgid="2108112641783146007">"नया उपयोगकर्ता जोड़ें?"</string>
-    <string name="user_add_user_message_long" msgid="8562152293752222985">"आप अतिरिक्त उपयोगकर्ता बनाकर इस डिवाइस को अन्य लोगों से साझा कर सकते हैं. प्रत्येक उपयोगकर्ता के पास अपना स्वयं का स्थान होता है, जिसे वह अपने स्वयं के ऐप्स, वॉलपेपर आदि से कस्टमाइज़ कर सकता है. उपयोगकर्ता वाई-फ़ाई जैसी डिवाइस सेटिंग भी एडजस्‍ट कर सकते हैं जिनसे हर कोई प्रभावित होता है.\n\nजब आप नया उपयोगकर्ता जोड़ते हैं, तो उस व्यक्ति को अपना स्थान सेट करना होता है.\n\nकोई भी उपयोगकर्ता अन्य सभी उपयोगकर्ताओं के लिए ऐप्स अपडेट कर सकता है."</string>
-    <string name="user_add_user_message_short" msgid="1511354412249044381">"जब आप कोई नया उपयोगकर्ता जोड़ते हैं तो उस व्यक्ति को अपना स्थान सेट करना होता है.\n\nकोई भी उपयोगकर्ता अन्य सभी उपयोगकर्ताओं के लिए ऐप्स अपडेट कर सकता है."</string>
+    <string name="user_add_user_message_long" msgid="8562152293752222985">"आप और ज़्यादा उपयोगकर्ता बनाकर इस डिवाइस को अन्य लोगों से शेयर कर सकते हैं. हर उपयोगकर्ता ऐप, वॉलपेपर जैसी चीज़ों से अपनी जगह में मनपसंद तरीके से बदलाव कर सकते हैं. उपयोगकर्ता वाई-फ़ाई जैसी डिवाइस सेटिंग को भी बदल कर, हर किसी पर असर डाल सकते हैं.\n\nजब आप एक नया उपयोगकर्ता जोड़ते हैं, तो उसे अपनी जगह सेट करनी पड़ती है.\n\nकोई भी उपयोगकर्ता बाकी सभी उपयोगकर्ताओं के लिए ऐप अपडेट कर सकता है."</string>
+    <string name="user_add_user_message_short" msgid="1511354412249044381">"जब आप कोई नया उपयोगकर्ता जोड़ते हैं तो उसे अपनी जगह सेट करनी होती है.\n\nकोई भी उपयोगकर्ता बाकी सभी उपयोगकर्ताओं के लिए ऐप अपडेट कर सकता है."</string>
     <string name="user_setup_dialog_title" msgid="1765794166801864563">"उपयोगकर्ता को अभी सेट करें?"</string>
-    <string name="user_setup_dialog_message" msgid="1004068621380867148">"सुनिश्चित करें कि व्यक्ति डिवाइस लेने और अपना स्थान सेट करने के लिए उपलब्ध है"</string>
+    <string name="user_setup_dialog_message" msgid="1004068621380867148">"पक्का करें कि व्यक्ति डिवाइस का इस्तेमाल करने और अपनी जगह सेट करने के लिए मौजूद है"</string>
     <string name="user_setup_profile_dialog_message" msgid="3896568553327558731">"प्रोफ़ाइल अभी सेट करें?"</string>
     <string name="user_setup_button_setup_now" msgid="3391388430158437629">"अभी सेट करें"</string>
-    <string name="user_setup_button_setup_later" msgid="3068729597269172401">"अभी नहीं"</string>
-    <string name="user_cannot_manage_message" product="tablet" msgid="7153048188252553320">"केवल टेबलेट का स्वामी उपयोगकर्ताओं को प्रबंधित कर सकता है."</string>
+    <string name="user_setup_button_setup_later" msgid="3068729597269172401">"रद्द करें"</string>
+    <string name="user_cannot_manage_message" product="tablet" msgid="7153048188252553320">"केवल टैबलेट का स्वामी उपयोगकर्ताओं को प्रबंधित कर सकता है."</string>
     <string name="user_cannot_manage_message" product="default" msgid="959315813089950649">"केवल फ़ोन का स्वामी उपयोगकर्ताओं को प्रबंधित कर सकता है."</string>
     <string name="user_cannot_add_accounts_message" msgid="5116692653439737050">"प्रतिबंधित प्रोफ़ाइल खाते नहीं जोड़ सकती हैं"</string>
-    <string name="user_remove_user_menu" msgid="6897150520686691355">"इस डिवाइस से <xliff:g id="USER_NAME">%1$s</xliff:g> को हटाएं"</string>
+    <string name="user_remove_user_menu" msgid="6897150520686691355">"इस उपकरण से <xliff:g id="USER_NAME">%1$s</xliff:g> को मिटाएं"</string>
     <string name="user_lockscreen_settings" msgid="4965661345247084878">"लॉक स्‍क्रीन सेटिंग"</string>
     <string name="user_add_on_lockscreen_menu" msgid="9072312646546364619">"लॉक स्क्रीन से उपयोगकर्ताओं को जोड़ें"</string>
     <string name="user_new_user_name" msgid="369856859816028856">"नया उपयोगकर्ता"</string>
     <string name="user_new_profile_name" msgid="2632088404952119900">"नई प्रोफ़ाइल"</string>
-    <string name="user_confirm_remove_self_title" msgid="8432050170899479556">"स्वयं को हटाएं?"</string>
+    <string name="user_confirm_remove_self_title" msgid="8432050170899479556">"खुद को मिटाएं?"</string>
     <string name="user_confirm_remove_title" msgid="1163721647646152032">"इस उपयोगकर्ता को निकालें?"</string>
     <string name="user_profile_confirm_remove_title" msgid="5573161550669867342">"इस प्रोफ़ाइल को निकालें?"</string>
     <string name="work_profile_confirm_remove_title" msgid="2017323555783522213">"कार्य प्रोफ़ाइल निकालें?"</string>
-    <string name="user_confirm_remove_self_message" product="tablet" msgid="2391372805233812410">"आप इस टेबलेट पर अपने स्थान और डेटा को खो देंगे. आप इस कार्यवाही को पूर्ववत नहीं कर सकते."</string>
-    <string name="user_confirm_remove_self_message" product="default" msgid="7943645442479360048">"आप इस फ़ोन पर अपने स्थान और डेटा को खो देंगे. आप इस कार्यवाही को पूर्ववत नहीं कर सकते."</string>
+    <string name="user_confirm_remove_self_message" product="tablet" msgid="2391372805233812410">"आप इस टैबलेट पर जगह और डेटा को खो देंगे. आप इस कार्रवाई को पहले जैसा नहीं कर सकते."</string>
+    <string name="user_confirm_remove_self_message" product="default" msgid="7943645442479360048">"आप इस फ़ोन पर अपनी जगह और डेटा को खो देंगे. आप इस कार्रवाई को पहले जैसा नहीं कर सकते."</string>
     <string name="user_confirm_remove_message" msgid="1020629390993095037">"सभी ऐप्स और डेटा हटा दिए जाएंगे."</string>
     <string name="work_profile_confirm_remove_message" msgid="323856589749078140">"यदि आप जारी रखते हैं तो इस प्रोफ़ाइल के सभी ऐप्‍स और डेटा को हटा दिया जाएगा."</string>
     <string name="user_profile_confirm_remove_message" msgid="7373754145959298522">"सभी ऐप्स और डेटा हटा दिए जाएंगे."</string>
-    <string name="user_adding_new_user" msgid="1521674650874241407">"नया उपयोगकर्ता जोड़ रहा है…"</string>
-    <string name="user_delete_user_description" msgid="3158592592118767056">"उपयोगकर्ता हटाएं"</string>
-    <string name="user_delete_button" msgid="5131259553799403201">"हटाएं"</string>
+    <string name="user_adding_new_user" msgid="1521674650874241407">"नया उपयोगकर्ता जोड़ा जा रहा है…"</string>
+    <string name="user_delete_user_description" msgid="3158592592118767056">"उपयोगकर्ता मिटाएं"</string>
+    <string name="user_delete_button" msgid="5131259553799403201">"मिटाएं"</string>
     <string name="user_guest" msgid="8475274842845401871">"अतिथि"</string>
     <string name="user_exit_guest_title" msgid="5613997155527410675">"अतिथि को निकालें"</string>
     <string name="user_exit_guest_confirm_title" msgid="3405527634738147409">"अतिथि को निकालें?"</string>
     <string name="user_exit_guest_confirm_message" msgid="2194459201944413257">"इस सत्र के सभी ऐप्स और डेटा को हटा दिया जाएगा."</string>
     <string name="user_exit_guest_dialog_remove" msgid="6351370829952745350">"निकालें"</string>
     <string name="user_enable_calling" msgid="5128605672081602348">"फ़ोन कॉल चालू करें"</string>
-    <string name="user_enable_calling_sms" msgid="9172507088023097063">"फ़ोन कॉल और SMS चालू करें"</string>
+    <string name="user_enable_calling_sms" msgid="9172507088023097063">"फ़ोन कॉल और मैसेज (एसएमएस) चालू करें"</string>
     <string name="user_remove_user" msgid="6490483480937295389">"उपयोगकर्ता निकालें"</string>
     <string name="user_enable_calling_confirm_title" msgid="4315789475268695378">"फ़ोन कॉल चालू करें?"</string>
-    <string name="user_enable_calling_confirm_message" msgid="8061594235219352787">"कॉल इतिहास इस उपयोगकर्ता के साथ साझा किया जाएगा."</string>
-    <string name="user_enable_calling_and_sms_confirm_title" msgid="7243308401401932681">"फ़ोन कॉल और SMS चालू करें?"</string>
-    <string name="user_enable_calling_and_sms_confirm_message" msgid="4025082715546544967">"कॉल और SMS इतिहास इस उपयोगकर्ता के साथ साझा किया जाएगा."</string>
+    <string name="user_enable_calling_confirm_message" msgid="8061594235219352787">"कॉल इतिहास इस उपयोगकर्ता के साथ शेयर किया जाएगा."</string>
+    <string name="user_enable_calling_and_sms_confirm_title" msgid="7243308401401932681">"फ़ोन कॉल और मैसेज (एसएमएस) चालू करें?"</string>
+    <string name="user_enable_calling_and_sms_confirm_message" msgid="4025082715546544967">"कॉल और मैसेज (एसएमएस) का इतिहास इस उपयोगकर्ता के साथ शेयर किया जाएगा."</string>
     <string name="emergency_info_title" msgid="208607506217060337">"आपातकालीन जानकारी"</string>
     <string name="emergency_info_summary" msgid="5062945162967838521">"<xliff:g id="USER_NAME">%1$s</xliff:g> की जानकारी और संपर्क"</string>
     <string name="application_restrictions" msgid="8207332020898004394">"ऐप्स  और सामग्री की अनुमति दें"</string>
     <string name="apps_with_restrictions_header" msgid="3660449891478534440">"प्रतिबंधों वाले ऐप्स"</string>
-    <string name="apps_with_restrictions_settings_button" msgid="3841347287916635821">"ऐप्स  सेटिंग विस्तृत करें"</string>
-    <string name="global_change_warning" product="tablet" msgid="8045013389464294039">"यह सेटिंग इस टेबलेट के सभी उपयोगकर्ताओं को प्रभावित करती है."</string>
+    <string name="apps_with_restrictions_settings_button" msgid="3841347287916635821">"ऐप के लिए सेटिंग का विस्तार करें"</string>
+    <string name="global_change_warning" product="tablet" msgid="8045013389464294039">"यह सेटिंग इस टैबलेट के सभी उपयोगकर्ताओं को प्रभावित करती है."</string>
     <string name="global_change_warning" product="default" msgid="2461264421590324675">"यह सेटिंग इस फ़ोन के सभी उपयोगकर्ताओं को प्रभावित करती है."</string>
     <string name="global_locale_change_title" msgid="5956281361384221451">"भाषा बदलें"</string>
-    <string name="nfc_payment_settings_title" msgid="1807298287380821613">"टैप करें और पेमेंट करें"</string>
+    <string name="nfc_payment_settings_title" msgid="1807298287380821613">"टैप करें और भुगतान करें"</string>
     <string name="nfc_payment_how_it_works" msgid="3028822263837896720">"यह कैसे काम करता है"</string>
     <string name="nfc_payment_no_apps" msgid="5477904979148086424">"स्टोर में अपने फ़ोन से भुगतान करें"</string>
     <string name="nfc_payment_default" msgid="8648420259219150395">"भुगतान डिफ़ॉल्‍ट"</string>
@@ -2624,10 +2643,10 @@
     <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">"एक टैप करके और AMP के ज़रिये; भुगतान टर्मिनल पर, इससे भुगतान करें:"</string>
     <string name="nfc_how_it_works_title" msgid="1984068457698797207">"टर्मिनल पर भुगतान करना"</string>
     <string name="nfc_how_it_works_content" msgid="4749007806393224934">"भुगतान ऐप सेट करें. फिर बस अपने फ़ोन के पिछले भाग को संपर्क-रहित प्रतीक वाले किसी टर्मिनल की ओर रखकर पकड़ें."</string>
-    <string name="nfc_how_it_works_got_it" msgid="259653300203217402">"समझ लिया"</string>
+    <string name="nfc_how_it_works_got_it" msgid="259653300203217402">"ठीक है"</string>
     <string name="nfc_more_title" msgid="815910943655133280">"अधिक..."</string>
     <string name="nfc_payment_set_default_label" msgid="7315817259485674542">"अपनी प्राथमिकता के रूप में सेट करें?"</string>
     <string name="nfc_payment_set_default" msgid="8532426406310833489">"टैप करके भुगतान करते समय हमेशा <xliff:g id="APP">%1$s</xliff:g> का उपयोग करें?"</string>
@@ -2635,47 +2654,47 @@
     <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="2705726826263742491">"सहायता लेख, फ़ोन और चैट, शुरू करना"</string>
     <string name="user_account_title" msgid="1127193807312271167">"सामग्री के लिए खाता"</string>
     <string name="user_picture_title" msgid="7297782792000291692">"फ़ोटो आईडी"</string>
     <string name="extreme_threats_title" msgid="6549541803542968699">"गंभीर धमकियां"</string>
-    <string name="extreme_threats_summary" msgid="8777860706500920667">"जान और माल की गंभीर धमकियों की नोटिफिकेशन प्राप्त करें"</string>
+    <string name="extreme_threats_summary" msgid="8777860706500920667">"जान और माल की गंभीर खतरों के अलर्ट पाएं"</string>
     <string name="severe_threats_title" msgid="8362676353803170963">"गंभीर धमकियां"</string>
-    <string name="severe_threats_summary" msgid="8848126509420177320">"जान और माल की गंभीर धमकियों के लिए नोटिफिकेशन प्राप्त करें"</string>
-    <string name="amber_alerts_title" msgid="2772220337031146529">"AMBER नोटिफिकेशन"</string>
+    <string name="severe_threats_summary" msgid="8848126509420177320">"जान और माल के गंभीर खतरों के लिए अलर्ट पाएं"</string>
+    <string name="amber_alerts_title" msgid="2772220337031146529">"AMBER अलर्ट"</string>
     <string name="amber_alerts_summary" msgid="4312984614037904489">"बाल अपहरणों के बारे में बुलेटिन प्राप्त करें"</string>
     <string name="repeat_title" msgid="6473587828597786996">"दोहराएं"</string>
-    <string name="call_manager_enable_title" msgid="7718226115535784017">"कॉल प्रबंधक सक्षम करें"</string>
+    <string name="call_manager_enable_title" msgid="7718226115535784017">"कॉल प्रबंधक चालू करें"</string>
     <string name="call_manager_enable_summary" msgid="8458447798019519240">"इस सेवा को कॉल करने का आपका तरीका प्रबंधित करने दें."</string>
     <string name="call_manager_title" msgid="4479949569744516457">"कॉल प्रबंधक"</string>
     <!-- no translation found for call_manager_summary (5918261959486952674) -->
     <skip />
     <string name="cell_broadcast_settings" msgid="4124461751977706019">"आपातकालीन सूचनाएं"</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="access_point_names" msgid="1381602020438634481">"एक्सेस पॉइंट का नाम"</string>
+    <string name="enhanced_4g_lte_mode_title" msgid="5808043757309522392">"बेहतर 4G LTE मोड"</string>
     <string name="enhanced_4g_lte_mode_summary" msgid="1376589643017218924">"ध्वनि और संचारों को उन्नत बनाने के लिए LTE डेटा का उपयोग करें (सुझाए गए)"</string>
     <string name="preferred_network_type_title" msgid="3431041717309776341">"पसंदीदा नेटवर्क प्रकार"</string>
     <string name="preferred_network_type_summary" msgid="6564884693884755019">"LTE (सुझाया गया)"</string>
     <string name="work_sim_title" msgid="4843322164662606891">"कार्यस्थल सिम"</string>
-    <string name="user_restrictions_title" msgid="5794473784343434273">"ऐप्स और सामग्री की एक्सेस"</string>
+    <string name="user_restrictions_title" msgid="5794473784343434273">"ऐप और सामग्री तक पहुंच"</string>
     <string name="user_rename" msgid="8523499513614655279">"नाम बदलें"</string>
     <string name="app_restrictions_custom_label" msgid="6160672982086584261">"ऐप्स  प्रतिबंधों को सेट करें"</string>
     <string name="user_restrictions_controlled_by" msgid="3164078767438313899">"<xliff:g id="APP">%1$s</xliff:g> द्वारा नियंत्रित"</string>
-    <string name="app_sees_restricted_accounts" msgid="7503264525057246240">"यह ऐप्स  आपके खातों को एक्सेस कर सकता है"</string>
+    <string name="app_sees_restricted_accounts" msgid="7503264525057246240">"यह ऐप आपके खातों तक पहुंच सकता है"</string>
     <string name="app_sees_restricted_accounts_and_controlled_by" msgid="6968697624437267294">"यह ऐप आपके खातों को ऐक्‍सेस कर सकता है. <xliff:g id="APP">%1$s</xliff:g> के द्वारा नियंत्रित है"</string>
     <string name="restriction_wifi_config_title" msgid="8889556384136994814">"वाई-फ़ाई और मोबाइल"</string>
     <string name="restriction_wifi_config_summary" msgid="70888791513065244">"वाई-फ़ाई और मोबाइल सेटिंग में बदलाव की अनुमति दें"</string>
     <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>
+    <string name="restriction_nfc_enable_summary" product="tablet" msgid="3891097373396149915">"जब टैबलेट अन्य डिवाइस को स्पर्श करे तो डेटा ट्रांसफर करने दें"</string>
     <string name="restriction_nfc_enable_summary" product="default" msgid="825331120501418592">"जब फ़ोन अन्य डिवाइस को स्पर्श करे तो डेटा ट्रांसफर करने दें"</string>
-    <string name="restriction_location_enable_title" msgid="5020268888245775164">"स्थान"</string>
-    <string name="restriction_location_enable_summary" msgid="3489765572281788755">"ऐप्स  को आपके स्थान की जानकारी का उपयोग करने दें"</string>
+    <string name="restriction_location_enable_title" msgid="5020268888245775164">"जगह"</string>
+    <string name="restriction_location_enable_summary" msgid="3489765572281788755">"ऐप को आपकी जगह की जानकारी का इस्तेमाल करने दें"</string>
     <string name="wizard_back" msgid="5567007959434765743">"वापस जाएं"</string>
     <string name="wizard_next" msgid="3606212602795100640">"आगे"</string>
     <string name="wizard_finish" msgid="3286109692700083252">"समाप्त करें"</string>
@@ -2692,7 +2711,7 @@
     <string name="sim_cellular_data_unavailable_summary" msgid="5416535001368135327">"कोई डेटा SIM चुनने के लिए टैप करें"</string>
     <string name="sim_calls_always_use" msgid="7936774751250119715">"कॉल के लिए हमेशा इसका उपयोग करें"</string>
     <string name="select_sim_for_data" msgid="2366081042162853044">"डेटा के लिए सिम चुनें"</string>
-    <string name="data_switch_started" msgid="2040761479817166311">"डेटा सिम स्‍विच की जा रही है, इसमें एक मिनट तक लग सकता है..."</string>
+    <string name="data_switch_started" msgid="2040761479817166311">"डेटा सिम स्‍विच किया जा रहा है, इसमें एक मिनट तक लग सकता है..."</string>
     <string name="select_sim_for_calls" msgid="3503094771801109334">"इस सिम से कॉल करें"</string>
     <string name="sim_select_card" msgid="211285163525563293">"सिम कार्ड चुनें"</string>
     <string name="sim_card_number_title" msgid="7845379943474336488">"सिम <xliff:g id="CARD_NUMBER">%1$d</xliff:g>"</string>
@@ -2700,7 +2719,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>
@@ -2708,12 +2727,14 @@
     <string name="color_purple" msgid="3888532466427762504">"बैंगनी"</string>
     <string name="sim_no_inserted_msg" msgid="210316755353227087">"कोई सिम कार्ड नहीं डाला गया"</string>
     <string name="sim_status_title" msgid="6744870675182447160">"सिम स्थिति"</string>
+    <!-- no translation found for sim_status_title_sim_slot (5725659316463979194) -->
+    <skip />
     <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>
-    <string name="preferred_network_offload_footer" msgid="5857279426054744020">"नेटवर्क नाम प्रसारण अक्षम करने से तृतीय पक्षों को आपकी नेटवर्क जानकारी की एक्सेस नहीं मिल पाती."</string>
+    <string name="preferred_network_offload_footer" msgid="5857279426054744020">"नेटवर्क नाम प्रसारण को बंद करने से तीसरे पक्षों को आपकी नेटवर्क की जानकारी की पहुंच नहीं मिल पाती."</string>
     <string name="preferred_network_offload_popup" msgid="2252915199889604600">"नेटवर्क नाम प्रसारण को अक्षम करने से छिपे हुए नेटवर्क से स्वचालित कनेक्शन नहीं होगा."</string>
     <string name="sim_signal_strength" msgid="9144010043784767984">"<xliff:g id="DBM">%1$d</xliff:g> dBm <xliff:g id="ASU">%2$d</xliff:g> asu"</string>
     <string name="sim_notification_title" msgid="6272913297433198340">"SIM कार्ड बदला गया."</string>
@@ -2721,71 +2742,82 @@
     <string name="sim_pref_divider" msgid="6778907671867621874">"इसके लिए पसंदीदा सिम"</string>
     <string name="sim_calls_ask_first_prefs_title" msgid="7941299533514115976">"हर बार पूछें"</string>
     <string name="sim_selection_required_pref" msgid="3446721423206414652">"चयन आवश्यक है"</string>
+    <!-- no translation found for sim_selection_channel_title (2760909074892782589) -->
+    <skip />
     <string name="dashboard_title" msgid="5453710313046681820">"सेटिंग"</string>
     <plurals name="settings_suggestion_header_summary_hidden_items" formatted="false" msgid="5597356221942118048">
       <item quantity="one">छिपे हुए %d आइटम दिखाएं</item>
       <item quantity="other">छिपे हुए %d आइटम दिखाएं</item>
     </plurals>
-    <string name="network_dashboard_title" msgid="4771589228992391573">"नेटवर्क और इंटरनेट"</string>
+    <string name="dashboard_suggestion_condition_footer_content_description" msgid="2898588191174845961">"छोटा करें"</string>
+    <string name="network_dashboard_title" msgid="3135144174846753758">"नेटवर्क और इंटरनेट"</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_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_title" msgid="7838365599185397539">"ऐप और सूचनाएं"</string>
     <string name="app_and_notification_dashboard_summary" msgid="2363314178802548682">"अनुमतियां, डिफ़ॉल्ट ऐप"</string>
     <string name="account_dashboard_title" msgid="4936890821712178853">"उपयोगकर्ता और खाते"</string>
-    <string name="app_default_dashboard_title" msgid="7342549305933047317">"डिफ़ॉल्‍ट ऐप्लिकेशन"</string>
+    <string name="app_default_dashboard_title" msgid="7342549305933047317">"डिफ़ॉल्‍ट ऐप"</string>
     <string name="system_dashboard_summary" msgid="5797743225249766685">"भाषाएं, समय, बैकअप, अपडेट"</string>
     <string name="search_results_title" msgid="1796252422574886932">"सेटिंग"</string>
-    <string name="search_menu" msgid="6283419262313758339">"सेटिंग में खोजें"</string>
-    <string name="query_hint_text" msgid="3350700807437473939">"सेटिंग में खोजें"</string>
+    <string name="search_menu" msgid="6283419262313758339">"सेटिंग में सर्च करें"</string>
+    <string name="query_hint_text" msgid="3350700807437473939">"सेटिंग में सर्च करें"</string>
     <string name="keywords_wifi" msgid="1395786161993828719">"वाईफ़ाई, वाई-फ़ाई नेटवर्क कनेक्शन"</string>
-    <string name="keywords_more_default_sms_app" msgid="2265154063220360784">"पाठ संदेश पाठ संदेश भेजना मेसेज सेवा"</string>
-    <string name="keywords_more_mobile_networks" msgid="8995946622054642367">"सेल्युलर, मोबाइल, सेल वाहक, वायरलेस, डेटा, 4g,3g, 2g, lte"</string>
+    <string name="keywords_more_default_sms_app" msgid="2265154063220360784">"मैसेज, मैसेज करना, मैसेज, मैसेज भेजना"</string>
+    <string name="keywords_more_mobile_networks" msgid="8995946622054642367">"सेल्युलर, मोबाइल, मोबाइल और इंटरनेट सेवा देने वाली कंपनी, वायरलेस, डेटा, 4g,3g, 2g, lte"</string>
     <string name="keywords_wifi_calling" msgid="1784064367330122679">"वाईफ़ाई, वाई-फ़ाई, कॉल, कॉलिंग"</string>
     <string name="keywords_home" msgid="3626170808219458848">"लॉन्चर"</string>
     <string name="keywords_display" msgid="8910345814565493016">"स्क्रीन, टचस्क्रीन"</string>
     <string name="keywords_display_brightness_level" msgid="3891383826236015854">"हल्की रोशनी, टचस्‍क्रीन, बैटरी"</string>
     <string name="keywords_display_auto_brightness" msgid="3325150824507953765">"हल्की रोशनी, टचस्‍क्रीन, बैटरी"</string>
     <string name="keywords_display_night_display" msgid="7630169927425425754">"मद्धम स्क्रीन, रात, टिंट"</string>
-    <string name="keywords_display_wallpaper" msgid="7362076351860131776">"पृष्ठभूमि, वैयक्तिकृत करें, स्क्रीन कस्टमाइज़ करें"</string>
+    <string name="keywords_display_wallpaper" msgid="7362076351860131776">"बैकग्राउंड, अपने हिसाब से ढालें, स्क्रीन को अपनी पसंद के मुताबिक बनाएं"</string>
     <string name="keywords_display_font_size" msgid="3404655440064726124">"लेख का आकार"</string>
     <string name="keywords_display_cast_screen" msgid="7684618996741933067">"प्रोजेक्ट, कास्ट करें"</string>
-    <string name="keywords_storage" msgid="3299217909546089225">"स्थान डिस्क हार्ड डिस्क डिवाइस उपयोग"</string>
+    <string name="keywords_storage" msgid="3299217909546089225">"जगह, डिस्क, हार्ड डिस्क, डिवाइस का इस्तेमाल"</string>
     <string name="keywords_battery" msgid="1173830745699768388">"पावर उपयोग, शुल्क"</string>
     <string name="keywords_spell_checker" msgid="1399641226370605729">"वर्तनी शब्दकोश वर्तनीजांच स्‍वत: सुधार"</string>
-    <string name="keywords_voice_input" msgid="769778245192531102">"पहचानकर्ता, इनपुट, बोली, बोलें, भाषा, हैंड्सफ़्री, हैंड फ़्री, पहचान, आपत्तिजनक, शब्द, ऑडियो, इतिहास, ब्लूटूथ, हैडसेट"</string>
-    <string name="keywords_text_to_speech_output" msgid="5150660047085754699">"रेट करें, भाषा, डिफ़ॉल्ट, बोलें, बोलना, tts, एक्सेस-योग्यता स्क्रीन रीडर, नेत्रहीन"</string>
+    <string name="keywords_voice_input" msgid="769778245192531102">"पहचानकर्ता, इनपुट, बोली, बोलें, भाषा, हैंड्सफ़्री, हैंड फ़्री, पहचान, आपत्तिजनक, शब्द, ऑडियो, इतिहास, ब्लूटूथ, हेडसेट"</string>
+    <string name="keywords_text_to_speech_output" msgid="5150660047085754699">"रेट करें, भाषा, डिफ़ॉल्ट, बोलें, बोलना, tts, सुलभता स्क्रीन रीडर, नेत्रहीन"</string>
     <string name="keywords_date_and_time" msgid="758325881602648204">"घड़ी, सेना"</string>
     <string name="keywords_network_reset" msgid="6024276007080940820">"रीसेट करें, पुन: स्‍थापित करें, फ़ैक्टरी"</string>
-    <string name="keywords_factory_data_reset" msgid="5894970373671252165">"वाइप करें, हटाएं, पुनः स्थापित करें, साफ़ करें, निकालें"</string>
+    <string name="keywords_factory_data_reset" msgid="5894970373671252165">"वाइप करें, मिटाएं, रीस्टोर करें, साफ़ करें, निकालें"</string>
     <string name="keywords_printing" msgid="1701778563617114846">"प्रिंटर"</string>
     <string name="keywords_sounds" msgid="7146245090127541167">"स्पीकर बीप"</string>
     <string name="keywords_sounds_and_notifications_interruptions" msgid="5426093074031208917">"न करें, परेशान न करें, बाधा डालें, बाधा, विराम"</string>
     <string name="keywords_app" msgid="6334757056536837791">"RAM"</string>
-    <string name="keywords_location" msgid="6615286961552714686">"आस-पास, स्थान, इतिहास, रिपोर्टिंग"</string>
+    <string name="keywords_location" msgid="6615286961552714686">"आस-पास की जगह, जगह, इतिहास, रिपोर्ट करना"</string>
     <string name="keywords_location_mode" msgid="8584992704568356084">"सटीकता"</string>
     <string name="keywords_accounts" msgid="1957925565953357627">"खाता"</string>
     <string name="keywords_users" msgid="3434190133131387942">"प्रतिबंध, प्रतिबंधित करें, प्रतिबंधित"</string>
-    <string name="keywords_keyboard_and_ime" msgid="9143339015329957107">"लेख सुधार सही ध्वनि कंपन स्वतः भाषा हावभाव सुझाव दें सुझाव थीम आपत्तिजनक शब्द प्रकार इमोजी अंतर्राष्ट्रीय"</string>
+    <string name="keywords_keyboard_and_ime" msgid="9143339015329957107">"लिखी हुई सामग्री में सुधार, सही आवाज़, वाइब्रेशन (कंपन), अपने आप आने वाले भाषा के सुझाव, हाथ के जेस्चर(स्पर्श) के सुझाव, थीम, आपत्तिजनक शब्द, लिखना, इमोजी, अंतर्राष्ट्रीय"</string>
     <string name="keywords_reset_apps" msgid="5293291209613191845">"रीसेट करें, प्राथमिकताएं, डिफ़ॉल्‍ट"</string>
     <string name="keywords_emergency_app" msgid="3143078441279044780">"आपातकालीन, बर्फ़, ऐप, डिफ़ॉल्‍ट"</string>
     <string name="keywords_default_phone_app" msgid="4213090563141778486">"फ़ोन, डायलर, डिफ़ॉल्ट"</string>
     <string name="keywords_all_apps" msgid="7814015440655563156">"ऐप्स, डाउनलोड करें, ऐप्‍लिकेशन, सिस्‍टम"</string>
     <string name="keywords_app_permissions" msgid="4229936435938011023">"ऐप्स, अनुमतियां, सुरक्षा"</string>
-    <string name="keywords_default_apps" msgid="223872637509160136">"ऐप्स, डिफ़ॉल्ट"</string>
-    <string name="keywords_ignore_optimizations" msgid="6102579291119055029">"ऑप्टिमाइज़ेशन अनदेखा करें, बचत, ऐप स्टैंडबाय"</string>
+    <string name="keywords_default_apps" msgid="223872637509160136">"ऐप, डिफ़ॉल्ट"</string>
+    <string name="keywords_ignore_optimizations" msgid="6102579291119055029">"ऑप्टिमाइज़ेशन, बैटरी बचाएं (डोज़), ऐप स्टैंडबाय पर ध्यान न दें"</string>
     <string name="keywords_color_mode" msgid="6362744316886077510">"चमकीला, RGB, sRGB, रंग, प्राकृतिक, मानक"</string>
     <string name="keywords_color_temperature" msgid="2688947724153266364">"रंग तापमान D65 D73 सफ़ेद पीला नीला वॉर्म कूल"</string>
     <string name="keywords_lockscreen" msgid="5746561909668570047">"अनलॉक करने के लिए स्लाइड करें, पासवर्ड, पैटर्न, पिन"</string>
     <string name="keywords_profile_challenge" msgid="789611397846512845">"कार्य चुनौती, कार्य, प्रोफ़ाइल"</string>
     <string name="keywords_unification" msgid="1922900767659821025">"कार्य प्रोफ़ाइल, प्रबंधित प्रोफ़ाइल, एक करना, एकीकरण, कार्य, प्रोफ़ाइल"</string>
-    <string name="keywords_gesture" msgid="3526905012224714078">"हावभाव"</string>
+    <string name="keywords_gesture" msgid="3526905012224714078">"जेस्चर"</string>
     <string name="keywords_payment_settings" msgid="5220104934130446416">"भुगतान करें, टैप करें, भुगतान"</string>
     <string name="keywords_backup" msgid="470070289135403022">"बैकअप, बैक अप"</string>
-    <string name="keywords_assist_gesture_launch" msgid="813968759791342591">"हावभाव"</string>
+    <string name="keywords_assist_gesture_launch" msgid="813968759791342591">"जेस्चर"</string>
+    <!-- no translation found for keywords_imei_info (7230982940217544527) -->
+    <skip />
+    <!-- no translation found for keywords_sim_status (1474422416860990564) -->
+    <skip />
+    <!-- no translation found for keywords_model_and_hardware (1459248377212829642) -->
+    <skip />
+    <!-- no translation found for keywords_android_version (5591055570309015111) -->
+    <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,136 +2827,165 @@
     <string name="status_tag_not_writable" msgid="2511611539977682175">"NFC टैग लिखने योग्य नहीं है. कृपया किसी भिन्न टैग का उपयोग करें."</string>
     <string name="default_sound" msgid="8821684447333687810">"डिफ़ॉल्‍ट ध्‍वनि"</string>
     <string name="sound_settings_summary" msgid="4100853606668287965">"रिंग वॉल्यूम <xliff:g id="PERCENTAGE">%1$s</xliff:g> पर है"</string>
-    <string name="sound_dashboard_summary" msgid="3402435125958012986">"वॉल्यूम, कंपन, परेशान न करें"</string>
-    <string name="sound_settings_summary_vibrate" msgid="1869282574422220096">"रिंगर कंपन पर सेट है"</string>
+    <string name="sound_dashboard_summary" msgid="3402435125958012986">"आवाज़, कंपन (वाइब्रेशन), परेशान न करें"</string>
+    <string name="sound_settings_summary_vibrate" msgid="1869282574422220096">"रिंगर, कंपन (वाइब्रेशन) पर सेट है"</string>
     <string name="sound_settings_summary_silent" msgid="5074529767435584948">"रिंगर मौन पर सेट है"</string>
     <string name="sound_settings_example_summary" msgid="2404914514266523165">"रिंग वॉल्यूम 80% पर है"</string>
     <string name="media_volume_option_title" msgid="2811531786073003825">"मीडिया वॉल्‍यूम"</string>
     <string name="alarm_volume_option_title" msgid="8219324421222242421">"अलार्म वॉल्‍यूम"</string>
     <string name="ring_volume_option_title" msgid="6767101703671248309">"रिंग का वॉल्यूम"</string>
-    <string name="notification_volume_option_title" msgid="6064656124416882130">"नोटिफिकेशन वॉल्‍यूम"</string>
+    <string name="notification_volume_option_title" msgid="6064656124416882130">"सूचना की आवाज़"</string>
     <string name="ringtone_title" msgid="5379026328015343686">"फ़ोन रिंगटोन"</string>
-    <string name="notification_ringtone_title" msgid="4468722874617061231">"डिफ़ॉल्ट नोटिफ़िकेशन ध्वनि"</string>
+    <string name="notification_ringtone_title" msgid="4468722874617061231">"सूचना की डिफ़ॉल्ट आवाज़"</string>
     <string name="notification_unknown_sound_title" msgid="2535027767851838335">"ऐप की ओर से दी जाने वाली ध्वनि"</string>
-    <string name="notification_sound_default" msgid="565135733949733766">"डिफ़ॉल्ट नोटिफ़िकेशन ध्वनि"</string>
+    <string name="notification_sound_default" msgid="565135733949733766">"सूचना की डिफ़ॉल्ट आवाज़"</string>
     <string name="alarm_ringtone_title" msgid="6344025478514311386">"डिफ़ॉल्ट अलार्म ध्वनि"</string>
-    <string name="vibrate_when_ringing_title" msgid="3806079144545849032">"कॉल के लिए भी कंपन"</string>
-    <string name="other_sound_settings" msgid="3151004537006844718">"अन्य ध्वनियां"</string>
+    <string name="vibrate_when_ringing_title" msgid="3806079144545849032">"कॉल के लिए भी कंपन (वाइब्रेशन) करें"</string>
+    <string name="other_sound_settings" msgid="3151004537006844718">"अन्य आवाज़ें"</string>
     <string name="dial_pad_tones_title" msgid="1999293510400911558">"डायल पैड टोन"</string>
-    <string name="screen_locking_sounds_title" msgid="1340569241625989837">"स्क्रीन लॉक करने की ध्वनियां"</string>
+    <string name="screen_locking_sounds_title" msgid="1340569241625989837">"स्क्रीन लॉक करने की आवाज़ें"</string>
     <string name="charging_sounds_title" msgid="1132272552057504251">"चार्जिंग ध्‍वनियां"</string>
     <string name="docking_sounds_title" msgid="155236288949940607">"डॉक करने की ध्वनियां"</string>
-    <string name="touch_sounds_title" msgid="5326587106892390176">"स्‍पर्श ध्‍वनियां"</string>
-    <string name="vibrate_on_touch_title" msgid="5388579924689395023">"टैप करने पर कंपन करें"</string>
+    <string name="touch_sounds_title" msgid="5326587106892390176">"स्‍पर्श आवाज़ें"</string>
+    <string name="vibrate_on_touch_title" msgid="5388579924689395023">"छूने पर कंपन (वाइब्रेशन) करे"</string>
     <string name="dock_audio_media_title" msgid="1346838179626123900">"डॉक स्पीकर चलेगा"</string>
     <string name="dock_audio_media_disabled" msgid="3430953622491538080">"सभी ऑडियो"</string>
     <string name="dock_audio_media_enabled" msgid="667849382924908673">"केवल मीडिया ऑडियो"</string>
     <string name="emergency_tone_silent" msgid="1067515631635824291">"मौन"</string>
-    <string name="emergency_tone_alert" msgid="8941852695428130667">"नोटिफिकेशन"</string>
-    <string name="emergency_tone_vibrate" msgid="8281126443204950847">"कंपन"</string>
+    <string name="emergency_tone_alert" msgid="8941852695428130667">"अलर्ट"</string>
+    <string name="emergency_tone_vibrate" msgid="8281126443204950847">"कंपन (वाइब्रेशन)"</string>
     <string name="boot_sounds_title" msgid="567029107382343709">"चालू होने की ध्वनि"</string>
-    <string name="zen_mode_settings_summary_off" msgid="1857165567766351925">"कोई भी ऑटोमैटिक नियम चालू नहीं है"</string>
-    <plurals name="zen_mode_settings_summary_on" formatted="false" msgid="1216562765753405784">
-      <item quantity="one"><xliff:g id="ON_COUNT">%d</xliff:g> ऑटोमैटिक नियम चालू किए गए</item>
-      <item quantity="other"><xliff:g id="ON_COUNT">%d</xliff:g> ऑटोमैटिक नियम चालू किए गए</item>
+    <string name="zen_mode_settings_summary_off" msgid="6119891445378113334">"कभी नहीं"</string>
+    <plurals name="zen_mode_settings_summary_on" formatted="false" msgid="7346979080337117366">
+      <item quantity="one"><xliff:g id="ON_COUNT">%d</xliff:g> नियम</item>
+      <item quantity="other"><xliff:g id="ON_COUNT">%d</xliff:g> नियम</item>
     </plurals>
-    <string name="zen_mode_settings_title" msgid="842308776768942600">"परेशान न करें की प्राथमिकताएं"</string>
-    <string name="zen_mode_priority_settings_title" msgid="2623117023031824309">"प्राथमिकता इनकी अनुमति देती है"</string>
-    <string name="zen_mode_automation_settings_title" msgid="4228995740594063774">"स्वचालित नियम"</string>
+    <string name="zen_mode_settings_title" msgid="1066226840983908121">"परेशान न करें"</string>
+    <string name="zen_mode_behavior_settings_title" msgid="1463303933529313969">"व्यवहार"</string>
+    <string name="zen_mode_behavior_allow_title" msgid="3845615648136218141">"आवाज़ और वाइब्रेशन की अनुमति दें"</string>
+    <string name="zen_mode_behavior_no_sound" msgid="1219626004723208056">"कोई आवाज़ नहीं"</string>
+    <string name="zen_mode_behavior_total_silence" msgid="6716603819806610626">"कोई आवाज़ नहीं (एकदम मौन)"</string>
+    <string name="zen_mode_behavior_no_sound_except" msgid="4968477585788243114">"<xliff:g id="CATEGORIES">%1$s</xliff:g> के अलावा कोई आवाज़ नहीं"</string>
+    <string name="zen_mode_behavior_alarms_only" msgid="2423480992071472963">"अलार्म, मीडिया और सिस्टम वाले सुझाव के अलावा कोई आवाज़ नहीं (सिर्फ़ अलार्म)"</string>
+    <string name="zen_mode_automation_settings_title" msgid="2517800938791944915">"अपने आप चालू करें"</string>
+    <string name="zen_mode_automation_settings_page_title" msgid="7069221762714457987">"अपने आप लागू होने वाले नियम"</string>
     <string name="zen_mode_automation_suggestion_title" msgid="5105443455143476201">"परेशान न करें के नियम सेट करें"</string>
     <string name="zen_mode_automation_suggestion_summary" msgid="4732808039946935657">"निश्चित समय पर ध्वनियों और कंपनों को सीमित करें"</string>
-    <string name="zen_mode_option_important_interruptions" msgid="3903928008177972500">"केवल प्राथमिकता"</string>
+    <string name="zen_mode_option_important_interruptions" msgid="3903928008177972500">"सिर्फ़ प्राथमिकता"</string>
     <string name="zen_mode_option_alarms" msgid="5785372117288803600">"केवल अलार्म"</string>
     <string name="zen_mode_option_no_interruptions" msgid="8107126344850276878">"पूरी तरह शांत"</string>
     <string name="zen_mode_summary_combination" msgid="8715563402849273459">"<xliff:g id="MODE">%1$s</xliff:g>: <xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string>
-    <string name="zen_mode_visual_interruptions_settings_title" msgid="6751708745442997940">"दृश्य संबंधी गड़बड़ी अवरुद्ध करें"</string>
+    <string name="zen_mode_visual_interruptions_settings_title" msgid="6751708745442997940">"मैसेज पर स्क्रीन चमकने से रोकें"</string>
+    <string name="zen_mode_visual_signals_settings_subtitle" msgid="6308824824208120508">"संकेत दिखाए जाने की अनुमति दें"</string>
+    <string name="zen_mode_add" msgid="90014394953272517">"जोड़ें"</string>
+    <!-- no translation found for zen_mode_button_turn_on (5074744714613374902) -->
+    <skip />
+    <!-- no translation found for zen_mode_button_turn_off (1995551537320422792) -->
+    <skip />
+    <!-- no translation found for zen_mode_settings_dnd_manual_end_time_next_day (3090599225533484203) -->
+    <skip />
+    <!-- no translation found for zen_mode_settings_dnd_manual_indefinite (2746903915016850399) -->
+    <skip />
+    <!-- no translation found for zen_mode_settings_dnd_automatic_rule (3856133183910726786) -->
+    <skip />
+    <!-- no translation found for zen_mode_settings_dnd_automatic_rule_app (7112871101701453067) -->
+    <skip />
+    <!-- no translation found for zen_mode_settings_dnd_automatic_rule_multiple (5792308957602984360) -->
+    <skip />
     <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>
-    <string name="work_notification_ringtone_title" msgid="6081247402404510004">"डिफ़ॉल्ट कार्य नोटिफ़िकेशन ध्वनि"</string>
+    <string name="work_notification_ringtone_title" msgid="6081247402404510004">"कार्य सूचना की डिफ़ॉल्ट आवाज़"</string>
     <string name="work_alarm_ringtone_title" msgid="1441926676833738891">"डिफ़ॉल्ट कार्य अलाम ध्वनि"</string>
     <string name="work_sound_same_as_personal" msgid="3123383644475266478">"व्यक्तिगत प्रोफ़ाइल के समान"</string>
     <string name="work_sync_dialog_title" msgid="7123973297187354813">"ध्वनियां बदलें?"</string>
     <string name="work_sync_dialog_yes" msgid="7243884940551635717">"बदलें"</string>
     <string name="work_sync_dialog_message" msgid="7841728953710863208">"आपकी व्यक्तिगत प्रोफ़ाइल की ध्वनियों का उपयोग आपकी कार्य प्रोफ़ाइल के लिए किया जाएगा"</string>
-    <string name="ringtones_install_custom_sound_title" msgid="5948792721161302255">"कस्टम ध्वनि जोड़ना चाहते हैं?"</string>
+    <string name="ringtones_install_custom_sound_title" msgid="5948792721161302255">"अपने मुताबिक आवाज़ जोड़ना चाहते हैं?"</string>
     <string name="ringtones_install_custom_sound_content" msgid="2195581481608512786">"इस फ़ाइल को <xliff:g id="FOLDER_NAME">%s</xliff:g> फ़ोल्डर में कॉपी किया जाएगा"</string>
     <string name="ringtones_category_preference_title" msgid="5675912303120102366">"रिंगटोन"</string>
-    <string name="other_sound_category_preference_title" msgid="2521096636124314015">"अन्य ध्‍वनियां और कंपन"</string>
-    <string name="configure_notification_settings" msgid="7616737397127242615">"नोटिफ़िकेशन"</string>
-    <string name="advanced_section_header" msgid="8833934850242546903">"उन्नत"</string>
-    <string name="profile_section_header" msgid="2320848161066912001">"कार्य नोटिफ़िकेशन"</string>
-    <string name="notification_badging_title" msgid="5938709971403474078">"नोटिफ़िकेशन बिंदुओं की अनुमति दें"</string>
+    <string name="other_sound_category_preference_title" msgid="2521096636124314015">"और आवाज़ें और कंपन (वाइब्रेशन)"</string>
+    <string name="configure_notification_settings" msgid="7616737397127242615">"सूचनाएं"</string>
+    <string name="advanced_section_header" msgid="8833934850242546903">"बेहतर"</string>
+    <string name="profile_section_header" msgid="2320848161066912001">"वर्क प्रोफ़ाइल सूचनाएं"</string>
+    <string name="notification_badging_title" msgid="5938709971403474078">"सूचना बिंदुओं की अनुमति दें"</string>
     <string name="notification_pulse_title" msgid="1905382958860387030">"ब्लिंक लाइट"</string>
     <string name="lock_screen_notifications_title" msgid="6173076173408887213">"लॉक स्क्रीन पर"</string>
-    <string name="lock_screen_notifications_summary_show" msgid="6407527697810672847">"सभी नोटिफ़िकेशन सामग्री दिखाएं"</string>
-    <string name="lock_screen_notifications_summary_hide" msgid="7891552853357258782">"संवेदनशील नोटिफिकेशन सामग्री छिपाएं"</string>
-    <string name="lock_screen_notifications_summary_disable" msgid="859628910427886715">"नोटिफ़िकेशन बिल्कुल ना दिखाएं"</string>
-    <string name="lock_screen_notifications_interstitial_message" msgid="6164532459432182244">"जब आपका डिवाइस लॉक हो, तो आप नोटिफिकेशन को किस प्रकार दिखाया जाना चाहेंगे?"</string>
-    <string name="lock_screen_notifications_interstitial_title" msgid="1416589393106326972">"नोटिफिकेशन"</string>
-    <string name="lock_screen_notifications_summary_show_profile" msgid="835870815661120772">"सभी कार्य नोटिफ़िकेशन सामग्री दिखाएं"</string>
-    <string name="lock_screen_notifications_summary_hide_profile" msgid="256116258285695645">"संवेदनशील कार्य नोटिफ़िकेशन सामग्री छिपाएं"</string>
-    <string name="lock_screen_notifications_summary_disable_profile" msgid="4080720698960233358">"प्रोफ़ाइल नोटिफ़िकेशन बिल्कुल ना दिखाएं"</string>
-    <string name="lock_screen_notifications_interstitial_message_profile" msgid="8307705621027472346">"जब आपका डिवाइस लॉक हो, तो आप प्रोफ़ाइल नोटिफिकेशन को किस प्रकार दिखाया जाना चाहेंगे?"</string>
-    <string name="lock_screen_notifications_interstitial_title_profile" msgid="3169806586032521333">"प्रोफ़ाइल नोटिफिकेशन"</string>
-    <string name="notifications_title" msgid="8086372779371204971">"नोटिफ़िकेशन"</string>
-    <string name="app_notifications_title" msgid="5810577805218003760">"ऐप्स नोटिफिकेशन"</string>
-    <string name="notification_channel_title" msgid="2260666541030178452">"नोटिफ़िकेशन की श्रेणी"</string>
+    <string name="lock_screen_notifications_summary_show" msgid="6407527697810672847">"सभी सूचना सामग्री दिखाएं"</string>
+    <string name="lock_screen_notifications_summary_hide" msgid="7891552853357258782">"संवेदनशील सूचना सामग्री छिपाएं"</string>
+    <string name="lock_screen_notifications_summary_disable" msgid="859628910427886715">"सूचनाएं बिल्कुल न दिखाएं"</string>
+    <string name="lock_screen_notifications_interstitial_message" msgid="6164532459432182244">"जब आपका डिवाइस लॉक हो, तो आप सूचना को किस तरह दिखाया जाना चाहेंगे?"</string>
+    <string name="lock_screen_notifications_interstitial_title" msgid="1416589393106326972">"सूचना"</string>
+    <string name="lock_screen_notifications_summary_show_profile" msgid="835870815661120772">"सभी कार्य सूचना सामग्री दिखाएं"</string>
+    <string name="lock_screen_notifications_summary_hide_profile" msgid="256116258285695645">"संवेदनशील कार्य सूचना सामग्री छिपाएं"</string>
+    <string name="lock_screen_notifications_summary_disable_profile" msgid="4080720698960233358">"काम से जुड़ी सूचनाएं बिल्कुल न दिखाएं"</string>
+    <string name="lock_screen_notifications_interstitial_message_profile" msgid="8307705621027472346">"जब आपका डिवाइस लॉक हो, तो आप प्रोफ़ाइल सूचना को किस तरह दिखाया जाना चाहेंगे?"</string>
+    <string name="lock_screen_notifications_interstitial_title_profile" msgid="3169806586032521333">"प्रोफ़ाइल सूचना"</string>
+    <string name="notifications_title" msgid="8086372779371204971">"सूचनाएं"</string>
+    <string name="app_notifications_title" msgid="5810577805218003760">"ऐप सूचनाएं"</string>
+    <string name="notification_channel_title" msgid="2260666541030178452">"सूचना की श्रेणी"</string>
+    <string name="notification_group_title" msgid="7180506440133859601">"सूचना की श्रेणी"</string>
     <string name="notification_importance_title" msgid="848692592679312666">"महत्‍व"</string>
-    <string name="notification_importance_unspecified" msgid="2196023702875112081">"ऐप्लिकेशन को तय करने दें"</string>
-    <string name="notification_importance_blocked" msgid="7938180808339386300">"नोटिफ़िकेशन कभी ना दिखाएं"</string>
+    <string name="notification_importance_unspecified" msgid="6622173510486113958">"आवाज़ की अनुमति दें"</string>
+    <string name="notification_importance_blocked" msgid="7938180808339386300">"सूचनाएं कभी न दिखाएं"</string>
     <string name="notification_importance_min" msgid="5455049524984686275">"ध्वनि या दृश्य संबंधी कोई रुकावट नहीं"</string>
     <string name="notification_importance_low" msgid="8881468429453766553">"कोई ध्वनि नहीं"</string>
     <string name="notification_importance_default" msgid="5958338024601957516">"ध्वनि करें"</string>
     <string name="notification_importance_high" msgid="2082429479238228527">"ध्वनि करें और स्क्रीन पर दिखाएं"</string>
+    <string name="notification_importance_high_silent" msgid="2667033773703765252">"स्क्रीन पर दिखाएं"</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_interruption" msgid="7136150018111848721">"रुकावटों की अनुमति दें"</string>
-    <string name="allow_interruption_summary" msgid="7870159391333957050">"ऐप्लिकेशन को आवाज़, कंपन करने दें और/या स्क्रीन पर नोटिफ़िकेशन पॉप करने दें"</string>
+    <string name="allow_interruption_summary" msgid="7870159391333957050">"ऐप को आवाज़, थरथराहट (वाइब्रेशन) करने दें और/या स्क्रीन पर सूचना नई विंडो में खुलने दें"</string>
     <string name="notification_channel_summary_min" msgid="5401718014765921892">"कम महत्व"</string>
     <string name="notification_channel_summary_low" msgid="322317684244981244">"मध्यम महत्व"</string>
     <string name="notification_channel_summary_default" msgid="1111749130423589931">"बहुत अधिक महत्व"</string>
     <string name="notification_channel_summary_high" msgid="2085017556511003283">"तत्काल महत्व"</string>
-    <string name="default_notification_assistant" msgid="7631945224761430146">"नोटिफिकेशन सहायक"</string>
-    <string name="manage_notification_access_title" msgid="7510080164564944891">"एक्सेस नोटिफ़िकेशन"</string>
-    <string name="work_profile_notification_access_blocked_summary" msgid="8748026238701253040">"कार्य प्रोफ़ाइल नोटिफ़िकेशन का एक्सेस अवरोधित है"</string>
-    <string name="manage_notification_access_summary_zero" msgid="2409912785614953348">"ऐप्स  नोटिफिकेशन नहीं पढ़ सकते"</string>
+    <string name="default_notification_assistant" msgid="7631945224761430146">"सूचना सहायक"</string>
+    <string name="manage_notification_access_title" msgid="7510080164564944891">"सूचना का एक्सेस"</string>
+    <string name="work_profile_notification_access_blocked_summary" msgid="8748026238701253040">"कार्य प्रोफ़ाइल सूचना की पहुंच रोक दी गई है"</string>
+    <string name="manage_notification_access_summary_zero" msgid="2409912785614953348">"ऐप सूचनाएं नहीं पढ़ सकते"</string>
     <plurals name="manage_notification_access_summary_nonzero" formatted="false" msgid="7930130030691218387">
-      <item quantity="one">%d ऐप्‍स नोटिफिकेशन पढ़ सकते हैं</item>
-      <item quantity="other">%d ऐप्‍स नोटिफिकेशन पढ़ सकते हैं</item>
+      <item quantity="one">%d ऐप सूचनाएं पढ़ सकते हैं</item>
+      <item quantity="other">%d ऐप सूचनाएं पढ़ सकते हैं</item>
     </plurals>
-    <string name="no_notification_listeners" msgid="3487091564454192821">"इंस्टॉल किए गए किसी भी ऐप द्वारा नोटिफिकेशन ऐक्सेस का अनुरोध नहीं किया गया."</string>
-    <string name="notification_listener_security_warning_title" msgid="5522924135145843279">"<xliff:g id="SERVICE">%1$s</xliff:g> के लिए नोटिफिकेशन ऐक्सेस की अनुमति दें?"</string>
-    <string name="notification_listener_security_warning_summary" msgid="119203147791040151">"<xliff:g id="NOTIFICATION_LISTENER_NAME">%1$s</xliff:g> संपर्क नामों तथा आपको प्राप्त होने वाले संदेशों के लेख जैसी व्यक्तिगत जानकारी सहित, सभी नोटिफ़िकेशन पढ़ सकता है. वह नोटिफ़िकेशन खारिज कर सकेगा और उनमें शामिल कार्रवाई बटनों को ट्रिगर भी कर सकेगा. \n\nइससे ऐप्लिकेशन को परेशान न करें सेवा को चालू या बंद करने और संबंधित सेटिंग को बदलने की क्षमता भी मिल जाएगी."</string>
-    <string name="notification_listener_disable_warning_summary" msgid="6738915379642948000">"यदि आप <xliff:g id="NOTIFICATION_LISTENER_NAME">%1$s</xliff:g> के लिए नोटिफ़िकेशन का एक्सेस बंद करते हैं, तो परेशान न करें सेवा का एक्सेस भी बंद हो सकता है."</string>
+    <string name="no_notification_listeners" msgid="3487091564454192821">"इंस्टॉल किए गए किसी भी ऐप ने सूचना के एक्सेस का अनुरोध नहीं किया है."</string>
+    <string name="notification_listener_security_warning_title" msgid="5522924135145843279">"<xliff:g id="SERVICE">%1$s</xliff:g> के लिए सूचना को एक्सेस करने की अनुमति दें?"</string>
+    <string name="notification_listener_security_warning_summary" msgid="119203147791040151">"<xliff:g id="NOTIFICATION_LISTENER_NAME">%1$s</xliff:g> संपर्क नामों और आपको मिलने वाले मैसेज जैसी निजी जानकारी सहित, सभी सूचना पढ़ सकता है. वह सूचना खारिज कर सकेगा और उनमें शामिल कार्रवाई बटनों को ट्रिगर भी कर सकेगा. \n\nइससे ऐप परेशान न करें सेवा को चालू या बंद कर सकता है और उससे जुड़ी सेटिंग को भी बदल सकता है"</string>
+    <string name="notification_listener_disable_warning_summary" msgid="6738915379642948000">"अगर आप <xliff:g id="NOTIFICATION_LISTENER_NAME">%1$s</xliff:g> के लिए सूचना का एक्सेस बंद करते हैं, तो \'परेशान न करें\' सेवा का एक्सेस भी बंद हो सकता है."</string>
     <string name="notification_listener_disable_warning_confirm" msgid="8333442186428083057">"बंद करें"</string>
-    <string name="notification_listener_disable_warning_cancel" msgid="8586417377104211584">"अभी नहीं"</string>
+    <string name="notification_listener_disable_warning_cancel" msgid="8586417377104211584">"रद्द करें"</string>
     <string name="vr_listeners_title" msgid="1318901577754715777">"VR सहायक सेवाएं"</string>
-    <string name="no_vr_listeners" msgid="2689382881717507390">"इंस्टॉल किए गए किसी भी ऐप ने VR सहायक सेवाओं के रूप में चलाए जाने के लिए अनुरोध नहीं किया है."</string>
-    <string name="vr_listener_security_warning_title" msgid="8309673749124927122">"<xliff:g id="SERVICE">%1$s</xliff:g> के लिए VR सेवा के एक्सेस की अनुमति दें?"</string>
+    <string name="no_vr_listeners" msgid="2689382881717507390">"इंस्टॉल किए गए किसी भी ऐप ने VR सहायक सेवाओं के तौर पर चलाए जाने के लिए अनुरोध नहीं किया है."</string>
+    <string name="vr_listener_security_warning_title" msgid="8309673749124927122">"<xliff:g id="SERVICE">%1$s</xliff:g> के लिए VR सेवा के इस्तेमाल की अनुमति दें?"</string>
     <string name="vr_listener_security_warning_summary" msgid="6931541068825094653">"जब आप आभासी वास्तविकता मोड में ऐप्लिकेशन का उपयोग कर रहे होते हैं, तब <xliff:g id="VR_LISTENER_NAME">%1$s</xliff:g> चला पाएगा."</string>
     <string name="display_vr_pref_title" msgid="8104485269504335481">"जब डिवाइस VR मोड में हो"</string>
     <string name="display_vr_pref_low_persistence" msgid="5707494209944718537">"धुंधलापन कम करें (अनुशंसित)"</string>
     <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="1264019085827708920">"इस ऐप्लिकेशन के खुले होने पर या जब आप उसे छोड़ दें, उसके बाद (उदाहरण के लिए, कोई वीडियो देखते रहने के लिए), उसे एक स्क्रीन में स्क्रीन विंडो बनाने दें. यह विंडो उन दूसरे ऐप्लिकेशन के ऊपर दिखाई देती है जिनका आप उपयोग कर रहे हैं."</string>
-    <string name="manage_zen_access_title" msgid="2611116122628520522">"परेशान ना करें एक्सेस"</string>
-    <string name="zen_access_empty_text" msgid="8772967285742259540">"इंस्टॉल किए गए किसी भी ऐप द्वारा परेशान ना करें ऐक्सेस का अनुरोध नहीं किया है"</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="1264019085827708920">"ऐप के खुले होने पर या आपके उसे छोड़ देने के बाद, उस ऐप को पिक्चर में पिक्चर बनाने की अनुमति दें (उदाहरण के लिए, कोई वीडियो देखते रहने के लिए). यह विंडो उन दूसरे ऐप्लिकेशन के ऊपर दिखाई देती है जिनका आप उपयोग कर रहे हैं."</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="channel_group_notifications_off_desc" msgid="1620950416247316370">"Android इस तरह की सूचनाओं को इस डिवाइस पर दिखाई देने से रोक रहा है"</string>
     <string name="notification_channels" msgid="5346841743182627500">"श्रेणियां"</string>
     <string name="notification_channels_other" msgid="5645317113885788226">"अन्य"</string>
-    <string name="no_channels" msgid="3077375508177744586">"इस ऐप्लिकेशन ने कोई भी नोटिफ़िकेशन पोस्ट नहीं किया है"</string>
+    <plurals name="notification_group_summary" formatted="false" msgid="3420621520561455358">
+      <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="no_channels" msgid="3077375508177744586">"इस ऐप ने कोई भी सूचना पोस्ट नहीं की है"</string>
     <string name="app_settings_link" msgid="8894946007543660906">"ऐप्लिकेशन में मौजूद दूसरी सेटिंग"</string>
-    <string name="app_notification_listing_summary_zero" msgid="6482582965081108108">"सभी ऐप्लिकेशन के लिए चालू किया गया"</string>
+    <string name="app_notification_listing_summary_zero" msgid="6482582965081108108">"सभी ऐप के लिए चालू किया गया"</string>
     <plurals name="app_notification_listing_summary_others" formatted="false" msgid="5668835155965827890">
       <item quantity="one"><xliff:g id="COUNT_1">%d</xliff:g> ऐप्लिकेशन के लिए बंद किया गया</item>
       <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> ऐप्लिकेशन के लिए बंद किया गया</item>
@@ -2936,38 +2997,40 @@
     <string name="notification_toggle_on" msgid="650145396718191048">"चालू"</string>
     <string name="notification_toggle_off" msgid="2142010737190671762">"बंद"</string>
     <string name="app_notification_block_title" msgid="4069351066849087649">"सभी रोक दें"</string>
-    <string name="app_notification_block_summary" msgid="4744020456943215352">"ये नोटिफिकेशन कभी ना दिखाएं"</string>
-    <string name="notification_content_block_title" msgid="5854232570963006360">"नोटिफ़िकेशन दिखाएं"</string>
-    <string name="notification_content_block_summary" msgid="7746185794438882389">"नोटिफ़िकेशन कभी भी शेड में या पेरिफ़ेरल डिवाइस पर ना दिखाएं"</string>
-    <string name="notification_badge_title" msgid="6370122441168519809">"सूचना बिंदुु की अनुमति दें"</string>
+    <string name="app_notification_block_summary" msgid="4744020456943215352">"ये सूचनाएं कभी न दिखाएं"</string>
+    <string name="notification_content_block_title" msgid="5854232570963006360">"सूचना दिखाएं"</string>
+    <string name="notification_content_block_summary" msgid="7746185794438882389">"सूचना कभी भी शेड में या पेरिफ़ेरल डिवाइस पर ना दिखाएं"</string>
+    <string name="notification_badge_title" msgid="6370122441168519809">"नए नोटिफ़िकेशन बताने वाले गोल निशान की अनुमति दें"</string>
     <string name="notification_channel_badge_title" msgid="2240827899882847087">"सूचना बिंदु दिखाएं"</string>
-    <string name="app_notification_override_dnd_title" msgid="7867458246395884830">"परेशान ना करें को ओवरराइड करें"</string>
-    <string name="app_notification_override_dnd_summary" msgid="3516007157020189746">"जब परेशान ना करें को केवल प्राथमिकता पर सेट किया गया हो, तब इन नोटिफिकेशन को बाधित करते रहने दें"</string>
+    <string name="app_notification_override_dnd_title" msgid="7867458246395884830">"परेशान न करें को बदलें"</string>
+    <string name="app_notification_override_dnd_summary" msgid="3516007157020189746">"जब \'परेशान न करें\' को सिर्फ़ प्राथमिकता पर सेट किया गया हो, तब इन सूचनाओं को आने से न रोकें"</string>
     <string name="app_notification_visibility_override_title" msgid="2187232730902430718">"लॉक स्क्रीन पर"</string>
     <string name="app_notification_row_banned" msgid="5983655258784814773">"अवरोधित"</string>
     <string name="app_notification_row_priority" msgid="7723839972982746568">"प्राथमिकता"</string>
     <string name="app_notification_row_sensitive" msgid="1809610030432329940">"संवेदनशील"</string>
-    <string name="app_notifications_dialog_done" msgid="3484067728568791014">"पूर्ण"</string>
+    <string name="app_notifications_dialog_done" msgid="3484067728568791014">"हो गया"</string>
     <string name="app_notification_importance_title" msgid="8002263131149345584">"महत्‍व"</string>
     <string name="notification_show_lights_title" msgid="7671781299688190532">"ब्लिंक लाइट"</string>
-    <string name="notification_vibrate_title" msgid="1646667807969755957">"कंपन"</string>
-    <string name="notification_channel_sound_title" msgid="3899212238513507941">"ध्वनि"</string>
-    <string name="zen_mode_rule_delete_button" msgid="903658142711011617">"हटाएं"</string>
+    <string name="notification_vibrate_title" msgid="1646667807969755957">"कंपन (वाइब्रेशन)"</string>
+    <string name="notification_channel_sound_title" msgid="3899212238513507941">"आवाज़"</string>
+    <string name="zen_mode_rule_delete_button" msgid="903658142711011617">"मिटाएं"</string>
     <string name="zen_mode_rule_rename_button" msgid="4642843370946599164">"नाम बदलें"</string>
     <string name="zen_mode_rule_name" msgid="5149068059383837549">"नियम का नाम"</string>
     <string name="zen_mode_rule_name_hint" msgid="3781174510556433384">"नियम का नाम डालें"</string>
     <string name="zen_mode_rule_name_warning" msgid="4517805381294494314">"नियम नाम पहले से उपयोग में है"</string>
-    <string name="zen_mode_add_rule" msgid="7459154136384467057">"अधिक जोड़ें"</string>
-    <string name="zen_mode_delete_rule" msgid="2985902330199039533">"नियम हटाएं"</string>
+    <string name="zen_mode_add_rule" msgid="9100929184624317193">"नियम जोड़ें"</string>
+    <string name="zen_mode_add_event_rule" msgid="3997335103633946552">"इवेंट से जुड़े नियम जोड़ें"</string>
+    <string name="zen_mode_add_time_rule" msgid="5002080000597838703">"समय से जुड़े नियम जोड़ें"</string>
+    <string name="zen_mode_delete_rule" msgid="2985902330199039533">"नियम मिटाएं"</string>
     <string name="zen_mode_choose_rule_type" msgid="5423746638871953459">"नियम का प्रकार चुनें"</string>
-    <string name="zen_mode_delete_rule_confirmation" msgid="6237882294348570283">"\"<xliff:g id="RULE">%1$s</xliff:g>\" नियम हटाएं?"</string>
-    <string name="zen_mode_delete_rule_button" msgid="4248741120307752294">"हटाएं"</string>
+    <string name="zen_mode_delete_rule_confirmation" msgid="6237882294348570283">"<xliff:g id="RULE">%1$s</xliff:g> नियम मिटाएं?"</string>
+    <string name="zen_mode_delete_rule_button" msgid="4248741120307752294">"मिटाएं"</string>
     <string name="zen_mode_rule_type" msgid="2289413469580142888">"नियम का प्रकार"</string>
     <string name="zen_mode_rule_type_unknown" msgid="3049377282766700600">"अज्ञात"</string>
     <string name="zen_mode_configure_rule" msgid="8865785428056490305">"नियम कॉन्‍फ़िगर करें"</string>
-    <string name="zen_schedule_rule_type_name" msgid="142936744435271449">"समय का नियम"</string>
+    <string name="zen_schedule_rule_type_name" msgid="6163149826036287324">"समय"</string>
     <string name="zen_schedule_rule_enabled_toast" msgid="3379499360390382259">"विशिष्‍ट समय के दौरान स्‍वचालित नियम को परेशान ना करें को चालू करने पर सेट किया गया है"</string>
-    <string name="zen_event_rule_type_name" msgid="2645981990973086797">"इवेंट का नियम"</string>
+    <string name="zen_event_rule_type_name" msgid="6503468472212606158">"इवेंट"</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>
@@ -2984,8 +3047,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>
@@ -2994,22 +3057,23 @@
     <string name="zen_mode_all_messages" msgid="6449223378976743208">"सभी संदेश"</string>
     <string name="zen_mode_selected_messages" msgid="8245990149599142281">"चयनित संदेश"</string>
     <string name="zen_mode_from_anyone" msgid="2638322015361252161">"किसी से भी"</string>
-    <string name="zen_mode_from_contacts" msgid="2232335406106711637">"केवल संपर्कों से"</string>
-    <string name="zen_mode_from_starred" msgid="2678345811950997027">"केवल तारांकित संपर्कों से"</string>
+    <string name="zen_mode_from_contacts" msgid="2232335406106711637">"सिर्फ़ संपर्कों से"</string>
+    <string name="zen_mode_from_starred" msgid="2678345811950997027">"सिर्फ़ तारांकित संपर्कों से"</string>
     <string name="zen_mode_from_none" msgid="8219706639954614136">"कोई नहीं"</string>
     <string name="zen_mode_alarms" msgid="2165302777886552926">"अलार्म"</string>
-    <string name="zen_mode_reminders" msgid="5458502056440485730">"रिमाइंडर्स"</string>
+    <string name="zen_mode_media_system_other" msgid="8900209390529859777">"मीडिया और सिस्टम वाले सुझाव"</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_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="239685342222975733">"अगर कोई व्यक्ति <xliff:g id="MINUTES">%d</xliff:g> मिनट के अंदर दोबारा कॉल करे"</string>
     <string name="zen_mode_when" msgid="2767193283311106373">"स्वचालित रूप से चालू"</string>
     <string name="zen_mode_when_never" msgid="8809494351918405602">"कभी नहीं"</string>
     <string name="zen_mode_when_every_night" msgid="3122486110091921009">"हर रात"</string>
     <string name="zen_mode_when_weeknights" msgid="8354070633893273783">"प्रति सोम-शुक्र रात"</string>
-    <string name="zen_mode_start_time" msgid="8102602297273744441">"प्रारंभ समय"</string>
-    <string name="zen_mode_end_time" msgid="8774327885892705505">"समाप्ति समय"</string>
+    <string name="zen_mode_start_time" msgid="8102602297273744441">"शुरू करने का समय"</string>
+    <string name="zen_mode_end_time" msgid="8774327885892705505">"खत्म होने का समय"</string>
     <string name="zen_mode_end_time_next_day_summary_format" msgid="4201521691238728701">"<xliff:g id="FORMATTED_TIME">%s</xliff:g> अगले दिन"</string>
     <string name="zen_mode_summary_alarms_only_indefinite" msgid="2061973221027570123">"अनिश्‍चित काल के लिए केवल अलार्म को बदलें"</string>
     <plurals name="zen_mode_summary_alarms_only_by_minute" formatted="false" msgid="6122003583875424601">
@@ -3022,23 +3086,20 @@
     </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_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="zen_mode_screen_on" msgid="8774571998575673502">"जब स्क्रीन चालू हो"</string>
+    <string name="zen_mode_screen_on_summary" msgid="5385338884695802115">"\'परेशान न करें\' के ज़रिये म्यूट हुई सूचनाओं को स्क्रीन पर दिखने दें"</string>
+    <string name="zen_mode_screen_off" msgid="3144446765110327937">"जब स्क्रीन बंद हो"</string>
+    <string name="zen_mode_screen_off_summary" msgid="7430034620565812258">"\'परेशान न करें\' के ज़रिए म्यूट हुई सूचनाओं को स्क्रीन चालू करने दें और लाइट चालू/बंद करने दें"</string>
+    <string name="zen_mode_screen_off_summary_no_led" msgid="2826121465026642017">"\'परेशान न करें\' के ज़रिये म्यूट हुई सूचनाओं को स्क्रीन चालू करने दें"</string>
+    <string name="notification_app_settings_button" msgid="6685640230371477485">"सूचना सेटिंग"</string>
+    <string name="suggestion_button_text" msgid="3275010948381252006">"ठीक है"</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>
@@ -3047,12 +3108,12 @@
     <string name="experimental_preference" msgid="7083015446690681376">"(प्रायोगिक)"</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="5560954719370251702">"अपने डिवाइस को अनलॉक करने के लिए अपने फ़िंगरप्रिंट का उपयोग करने के अलावा, आप इस डिवाइस के चालू होने से पहले अपना पासवर्ड डालना ज़रूरी बनाकर इसे और भी सुरक्षित कर सकते हैं. डिवाइस के चालू होने तक, उस पर कॉल संदेश या नोटिफ़िकेशन नहीं मिलेंगे और अलार्म भी काम नहीं करेगा.\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>
@@ -3062,8 +3123,8 @@
     <string name="encrypt_talkback_dialog_message_pattern" msgid="2020083142199612743">"जब आप इस डिवाइस को प्रारंभ करने के लिए अपना पैटर्न डालते हैं, तो <xliff:g id="SERVICE">%1$s</xliff:g> जैसी सरल उपयोग सेवाएं अभी भी उपलब्ध नहीं होंगी."</string>
     <string name="encrypt_talkback_dialog_message_password" msgid="4155875981789127796">"जब आप इस डिवाइस को प्रारंभ करने के लिए अपना पासवर्ड डालते हैं, तो <xliff:g id="SERVICE">%1$s</xliff:g> जैसी सरल उपयोग सेवाएं अभी भी उपलब्ध नहीं होंगी."</string>
     <string name="direct_boot_unaware_dialog_message" msgid="7870273558547549125">"नोट: पुनः बूट करने के बाद, यह ऐप्लिकेशन तब तक शुरू नहीं हो सकता है जब तक कि आप अपना फ़ोन अनलॉक ना कर लें"</string>
-    <string name="imei_information_title" msgid="8499085421609752290">"IMEI जानकारी"</string>
-    <string name="imei_information_summary" msgid="2074095606556565233">"IMEI संबंधी जानकारी"</string>
+    <string name="imei_information_title" msgid="8499085421609752290">"IMEI की जानकारी"</string>
+    <string name="imei_information_summary" msgid="2074095606556565233">"IMEI से जुड़ी जानकारी"</string>
     <string name="slot_number" msgid="3762676044904653577">"(स्लॉट<xliff:g id="SLOT_NUM">%1$d</xliff:g>)"</string>
     <string name="launch_by_default" msgid="1840761193189009248">"डिफ़ॉल्ट रूप से खोलें"</string>
     <string name="app_launch_domain_links_title" msgid="1160925981363706090">"खुलने वाले लिंक"</string>
@@ -3074,19 +3135,19 @@
     <string name="storage_summary_format" msgid="5419902362347539755">"<xliff:g id="STORAGE_TYPE">%2$s</xliff:g> में <xliff:g id="SIZE">%1$s</xliff:g> का उपयोग किया गया"</string>
     <string name="storage_type_internal" msgid="6042049833565674948">"मोबाइल मेमोरी"</string>
     <string name="storage_type_external" msgid="7738894330670001898">"बाहरी मेमोरी"</string>
-    <string name="app_data_usage" msgid="7942375313697452803">"ऐप्स डेटा उपयोग"</string>
+    <string name="app_data_usage" msgid="7942375313697452803">"डेटा खर्च एेप"</string>
     <string name="data_summary_format" msgid="6213211533341068366">"<xliff:g id="DATE">%2$s</xliff:g> से <xliff:g id="SIZE">%1$s</xliff:g> उपयोग हुआ"</string>
     <string name="storage_used" msgid="7128074132917008743">"उपयोग की गई मेमोरी"</string>
     <string name="change" msgid="6657848623929839991">"बदलें"</string>
     <string name="change_storage" msgid="600475265207060436">"मेमोरी बदलें"</string>
-    <string name="notifications_label" msgid="8543457911148619898">"ऐप्लिकेशन नोटिफ़िकेशन"</string>
+    <string name="notifications_label" msgid="8543457911148619898">"ऐप सूचनाएं"</string>
     <string name="notifications_enabled" msgid="6983396130566021385">"चालू"</string>
     <string name="notifications_disabled" msgid="334416731283131597">"सब कुछ बंद कर दिया गया है"</string>
     <string name="notifications_partly_blocked" msgid="592071133950126656">"<xliff:g id="COUNT_1">%2$d</xliff:g> में से <xliff:g id="COUNT_0">%1$d</xliff:g> श्रेणियां बंद हैं"</string>
     <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>
@@ -3099,33 +3160,33 @@
       <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>
-    <string name="filter_all_apps" msgid="1988403195820688644">"सभी ऐप्स"</string>
+    <string name="filter_all_apps" msgid="1988403195820688644">"सभी ऐप"</string>
     <string name="filter_enabled_apps" msgid="5395727306799456250">"इंस्‍टॉल किए गए ऐप"</string>
     <string name="filter_instant_apps" msgid="574277769963965565">"झटपट ऐप"</string>
     <string name="filter_personal_apps" msgid="3277727374174355971">"व्यक्तिगत"</string>
     <string name="filter_work_apps" msgid="24519936790795574">"कार्यस्‍थल"</string>
     <string name="filter_notif_all_apps" msgid="2299049859443680242">"ऐप्लिकेशन: सभी"</string>
-    <string name="filter_notif_blocked_apps" msgid="3300375727887991342">"ऐप्लिकेशन: बंद हैं"</string>
+    <string name="filter_notif_blocked_apps" msgid="3300375727887991342">"ऐप: बंद हैं"</string>
     <string name="filter_notif_urgent_channels" msgid="3972473613117159653">"श्रेणियां: अत्यंत महत्वपूर्ण"</string>
     <string name="filter_notif_low_channels" msgid="4128487387390004604">"श्रेणियां: कम महत्व के"</string>
     <string name="filter_notif_blocked_channels" msgid="5880190882221644289">"श्रेणियां: बंद हैं"</string>
-    <string name="filter_notif_dnd_channels" msgid="1817930848881696728">"श्रेणियां: परेशान न करें ओवरराइड करती हैं"</string>
-    <string name="advanced_apps" msgid="4812975097124803873">"अतिरिक्‍त सेटिंग"</string>
+    <string name="filter_notif_dnd_channels" msgid="1817930848881696728">"श्रेणियां: परेशान न करें को बदलती हैं"</string>
+    <string name="advanced_apps" msgid="4812975097124803873">"बेहतर सेटिंग"</string>
     <string name="configure_apps" msgid="6685680790825882528">"ऐप्स कॉन्‍फ़िगर करें"</string>
     <string name="unknown_app" msgid="5275921288718717656">"अज्ञात ऐप"</string>
     <string name="app_permissions" msgid="4148222031991883874">"ऐप अनुमतियां"</string>
     <string name="app_permissions_summary" msgid="5163974162150406324">"<xliff:g id="APPS">%1$s</xliff:g> का उपयोग करने वाले ऐप्लिकेशन"</string>
     <string name="tap_to_wake" msgid="7211944147196888807">"वेक करने के लिए टैप करें"</string>
-    <string name="tap_to_wake_summary" msgid="4341387904987585616">"डिवाइस को वेक करने के लिए स्क्रीन पर कहीं भी डबल-टैप करें"</string>
+    <string name="tap_to_wake_summary" msgid="4341387904987585616">"डिवाइस की स्क्रीन को चालू करने के लिए, स्क्रीन पर कहीं भी दो बार छूएं"</string>
     <string name="domain_urls_title" msgid="3132983644568821250">"खुलने वाले लिंक"</string>
     <string name="domain_urls_summary_none" msgid="2639588015479657864">"समर्थित लिंक ना खोलें"</string>
     <string name="domain_urls_summary_one" msgid="3704934031930978405">"<xliff:g id="DOMAIN">%s</xliff:g> खोलें"</string>
-    <string name="domain_urls_summary_some" msgid="3950089361819428455">"<xliff:g id="DOMAIN">%s</xliff:g> और अन्य URL खोलें"</string>
+    <string name="domain_urls_summary_some" msgid="3950089361819428455">"<xliff:g id="DOMAIN">%s</xliff:g> और अन्य यूआरएल खोलें"</string>
     <string name="domain_urls_apps_summary_off" msgid="1833056772600031220">"कोई भी ऐप्लिकेशन समर्थित लिंक नहीं खोल रहा है"</string>
     <plurals name="domain_urls_apps_summary_on" formatted="false" msgid="240214361240709399">
       <item quantity="one"><xliff:g id="COUNT">%d</xliff:g> ऐप्लिकेशन समर्थित लिंक खोल रहे हैं</item>
@@ -3140,7 +3201,7 @@
     <string name="assist_and_voice_input_title" msgid="1733165754793221197">"सहायक और वॉइस इनपुट"</string>
     <string name="default_assist_title" msgid="8868488975409247921">"सहायक ऐप"</string>
     <string name="assistant_security_warning_title" msgid="8673079231955467177">"<xliff:g id="ASSISTANT_APP_NAME">%s</xliff:g> को आपका सहायक बनाएं?"</string>
-    <string name="assistant_security_warning" msgid="8498726261327239136">"सहायक, आपके सिस्‍टम पर उपयोग किए जा रहे ऐप्‍स के बारे में जानकारी पढ़ सकेगा, जिसमें आपके स्‍क्रीन पर दृश्‍यमान जानकारी या ऐप्‍स में ऐक्‍सेस करने योग्‍य जानकारी शामिल होगी."</string>
+    <string name="assistant_security_warning" msgid="8498726261327239136">"Assistant , आपके सिस्‍टम पर इस्तेमाल किए जा रहे ऐप के बारे में जानकारी पढ़ सकेगा, जिसमें आपके स्‍क्रीन पर दिखाई देने वाली जानकारी या ऐप में मौजूद जानकारी शामिल है."</string>
     <string name="assistant_security_warning_agree" msgid="7710290206928033908">"सहमत"</string>
     <string name="assistant_security_warning_disagree" msgid="877419950830205913">"असहमत"</string>
     <string name="choose_voice_input_title" msgid="975471367067718019">"वॉइस इनपुट चुनें"</string>
@@ -3151,10 +3212,10 @@
     <string name="system_app" msgid="9068313769550747372">"(सिस्टम)"</string>
     <string name="system_default_app" msgid="3091113402349739037">"(सिस्टम डिफ़ॉल्ट)"</string>
     <string name="apps_storage" msgid="4353308027210435513">"ऐप मेमोरी"</string>
-    <string name="usage_access" msgid="5479504953931038165">"उपयोग एक्‍सेस"</string>
+    <string name="usage_access" msgid="5479504953931038165">"उपयोग की एक्‍सेस"</string>
     <string name="permit_usage_access" msgid="4012876269445832300">"उपयोग की ऐक्‍सेस की अनुमति दें"</string>
     <string name="app_usage_preference" msgid="7065701732733134991">"ऐप उपयोग की प्राथमिकताएं"</string>
-    <string name="usage_access_description" msgid="1352111094596416795">"उपयोग की ऐक्‍सेस किसी ऐप को यह ट्रैक करने देती है कि आप कौन से अन्‍य ऐप्‍स का उपयोग कर रहे हैं और आप उनका उपयोग कितनी बार करते हैं, साथ ही आपके वाहक, भाषा सेटिंग और अन्‍य विवरण भी ट्रैक करने देती है."</string>
+    <string name="usage_access_description" msgid="1352111094596416795">"इस्तेमाल की पहुंच (यूसेज एक्सेस), किसी ऐप को यह ट्रैक करने देता है कि आप कौन-कौन से एेप इस्तेमाल कर रहे हैं और उन्हें कितनी बार इस्तेमाल करते हैं. साथ ही आपकी मोबाइल और इंटरनेट सेवा देने वाली कंपनी, भाषा सेटिंग और अन्‍य जानकारी भी ट्रैक करने देती है."</string>
     <string name="memory_settings_title" msgid="7490541005204254222">"मेमोरी"</string>
     <string name="memory_details_title" msgid="8542565326053693320">"मेमोरी का विवरण"</string>
     <string name="always_running" msgid="6042448320077429656">"हमेशा चलने वाला (<xliff:g id="PERCENTAGE">%s</xliff:g>)"</string>
@@ -3185,7 +3246,7 @@
     <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>
@@ -3193,10 +3254,10 @@
     <string name="system_ui_settings" msgid="579824306467081123">"SystemUI ट्यूनर दिखाएं"</string>
     <string name="additional_permissions" msgid="6463784193877056080">"अतिरिक्त अनुमतियां"</string>
     <string name="additional_permissions_more" msgid="3538612272673191451">"<xliff:g id="COUNT">%1$d</xliff:g> और"</string>
-    <string name="share_remote_bugreport_dialog_title" msgid="1124840737776588602">"बग रिपोर्ट साझा करें?"</string>
-    <string name="share_remote_bugreport_dialog_message_finished" msgid="4973886976504823801">"आपके आईटी व्यवस्थापक ने इस डिवाइस के समस्या निवारण में सहायता के लिए एक बग रिपोर्ट का अनुरोध किया है. ऐप्लिकेशन और डेटा को साझा किया जा सकता है."</string>
-    <string name="share_remote_bugreport_dialog_message" msgid="3495929560689435496">"आपके आईटी व्यवस्थापक ने इस डिवाइस के समस्या निवारण में सहायता के लिए एक बग रिपोर्ट का अनुरोध किया है. ऐप्लिकेशन और डेटा को साझा किया जा सकता है और आपका डिवाइस अस्थायी रूप से धीमा हो सकता है."</string>
-    <string name="sharing_remote_bugreport_dialog_message" msgid="5859287696666024466">"यह बग रिपोर्ट आपके आईटी व्यवस्थापक से साझा की जा रही है. अधिक विवरण के लिए उनसे संपर्क करें."</string>
+    <string name="share_remote_bugreport_dialog_title" msgid="1124840737776588602">"गड़बड़ी की रिपोर्ट शेयर करें?"</string>
+    <string name="share_remote_bugreport_dialog_message_finished" msgid="4973886976504823801">"आपके आईटी एडमिन ने इस डिवाइस की समस्या हल करने में मदद के लिए एक गड़बड़ी की रिपोर्ट का अनुरोध किया है. ऐप्लिकेशन और डेटा को शेयर किया जा सकता है."</string>
+    <string name="share_remote_bugreport_dialog_message" msgid="3495929560689435496">"आपके आईटी एडमिन ने इस डिवाइस की समस्या को हल करने में सहायता के लिए एक गड़बड़ी की रिपोर्ट का अनुरोध किया है. ऐप्लिकेशन और डेटा को शेयर किया जा सकता है और आपका डिवाइस कुछ देर के लिए धीमा हो सकता है."</string>
+    <string name="sharing_remote_bugreport_dialog_message" msgid="5859287696666024466">"यह गड़बड़ी की रिपोर्ट आपके आईटी एडमिन से शेयर की जा रही है. और जानकारी के लिए उनसे संपर्क करें."</string>
     <string name="share_remote_bugreport_action" msgid="532226159318779397">"साझा करें"</string>
     <string name="decline_remote_bugreport_action" msgid="518720235407565134">"अस्वीकार करें"</string>
     <string name="usb_use_charging_only" msgid="2180443097365214467">"इस डिवाइस को चार्ज करें"</string>
@@ -3205,7 +3266,7 @@
     <string name="usb_use_power_only_desc" msgid="3461232831015575152">"कनेक्ट किए गए डिवाइस को चार्ज करें. यह सिर्फ़ उन डिवाइस पर काम करता है जिनमें USB चार्जिंग होती है."</string>
     <string name="usb_use_file_transfers" msgid="7409600791007250137">"फ़ाइलें स्थानान्तरित करें"</string>
     <string name="usb_use_file_transfers_desc" msgid="4235764784331804488">"किसी अन्य डिवाइस पर फ़ाइलें स्थानान्तरित करें"</string>
-    <string name="usb_use_photo_transfers" msgid="7794775645350330454">"फ़ोटो का स्थानांतरण (PTP)"</string>
+    <string name="usb_use_photo_transfers" msgid="7794775645350330454">"फ़ोटो का ट्रांसफ़र (PTP)"</string>
     <string name="usb_use_photo_transfers_desc" msgid="2963034811151325996">"MTP समर्थित नहीं होने पर फ़ोटो या फ़ाइलें ट्रांसफर करें (PTP)"</string>
     <string name="usb_use_MIDI" msgid="870922185938298263">"डिवाइस का उपयोग MIDI के रूप में करें"</string>
     <string name="usb_use_MIDI_desc" msgid="8473936990076693175">"इस डिवाइस का उपयोग MIDI के रूप में करें"</string>
@@ -3216,15 +3277,16 @@
     <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="sms_mirroring_pref" msgid="6475043279147376031">"मैसेज (एसएमएस) नकल"</string>
+    <string name="background_check_pref" msgid="7550258400138010979">"बैकग्राउंड चैक"</string>
+    <string name="background_check_title" msgid="4534254315824525593">"पूरे बैकग्राउंड की एक्सेस"</string>
     <string name="assist_access_context_title" msgid="2269032346698890257">"स्क्रीन के लेख का उपयोग करना"</string>
     <string name="assist_access_context_summary" msgid="1991421283142279560">"सहायक ऐप को स्क्रीन की सामग्रियों को लेख के रूप में ऐक्सेस करने दें"</string>
     <string name="assist_access_screenshot_title" msgid="4034721336291215819">"स्क्रीनशॉट का उपयोग करना"</string>
-    <string name="assist_access_screenshot_summary" msgid="6761636689013259901">"सहायक ऐप को स्क्रीन की छवि को ऐक्सेस करने दें"</string>
+    <string name="assist_access_screenshot_summary" msgid="6761636689013259901">"सहायक ऐप को स्क्रीन की तस्वीर तक पहुंचने दें"</string>
     <string name="assist_flash_title" msgid="506661221230034891">"स्क्रीन फ़्लैश करें"</string>
-    <string name="assist_flash_summary" msgid="9160668468824099262">"सहायक ऐप्लिकेशन द्वारा स्क्रीन या स्क्रीनशॉट से लेख एक्सेस करने पर स्क्रीन के किनारे फ़्लैश करें"</string>
-    <string name="assist_footer" msgid="1982791172085896864">"आप जो स्क्रीन देख रहे हैं, उसकी जानकारी के आधार पर सहायक ऐप्स आपकी सहायता कर सकते हैं. कुछ ऐप्स आपको एकीकृत सहायता देने के लिए लॉन्चर और ध्‍वनि इनपुट सेवाएं दोनों का समर्थन करते हैं."</string>
+    <string name="assist_flash_summary" msgid="9160668468824099262">"जब सहायक ऐप स्क्रीन पर मौजूद लेख या स्क्रीनशॉट को एक्सेस करे तो स्क्रीन के किनारों पर रोशनी चमकाएं"</string>
+    <string name="assist_footer" msgid="1982791172085896864">"आप जो स्क्रीन देख रहे हैं, उसकी जानकारी के आधार पर सहायक ऐप आपकी मदद कर सकते हैं. कुछ ऐप पर आपकी पूरी तरह से मदद करने के लिए लॉन्चर और बोलकर फ़ोन को निर्देश देना, ये दोनों सेवाएं काम करती हैं."</string>
     <string name="average_memory_use" msgid="829566450150198512">"औसत मेमोरी उपयोग"</string>
     <string name="maximum_memory_use" msgid="7493720799710132496">"अधिकतम मेमोरी उपयोग"</string>
     <string name="memory_usage" msgid="1781358557214390033">"मेमोरी का उपयोग"</string>
@@ -3232,8 +3294,8 @@
     <string name="memory_details" msgid="5943436005716991782">"विवरण"</string>
     <string name="memory_use_summary" msgid="5608257211903075754">"पिछले 3 घंटों में <xliff:g id="SIZE">%1$s</xliff:g> औसत मेमोरी का उपयोग किया गया"</string>
     <string name="no_memory_use_summary" msgid="2016900536806235588">"पिछले 3 घंटों में किसी मेमोरी का उपयोग नहीं किया गया"</string>
-    <string name="sort_avg_use" msgid="3998036180505143129">"औसत उपयोग के अनुसार क्रमबद्ध करें"</string>
-    <string name="sort_max_use" msgid="4629247978290075124">"अधिकतम उपयोग के अनुसार क्रमबद्ध करें"</string>
+    <string name="sort_avg_use" msgid="3998036180505143129">"औसत इस्तेमाल के हिसाब से क्रम से लगाएं"</string>
+    <string name="sort_max_use" msgid="4629247978290075124">"सबसे ज़्यादा इस्तेमाल के हिसाब से क्रम से लगाएं"</string>
     <string name="memory_performance" msgid="5661005192284103281">"प्रदर्शन"</string>
     <string name="total_memory" msgid="2017287600738630165">"कुल मेमोरी"</string>
     <string name="average_used" msgid="5338339266517245782">"औसत उपयोग (%)"</string>
@@ -3248,8 +3310,8 @@
     <string name="no_data_usage" msgid="9131454024293628063">"किसी डेटा का उपयोग नहीं किया गया"</string>
     <string name="zen_access_warning_dialog_title" msgid="1198189958031157142">"<xliff:g id="APP">%1$s</xliff:g> के लिए परेशान न करें की ऐक्सेस की अनुमति दें?"</string>
     <string name="zen_access_warning_dialog_summary" msgid="4015885767653010873">"यह ऐप, परेशान न करें को चालू/बंद कर सकेगा और संबंधित सेटिंग में बदलाव कर सकेगा."</string>
-    <string name="zen_access_disabled_package_warning" msgid="302820100078584431">"इसे चालू रहना चाहिए, क्योंकि नोटिफ़िकेशन एक्सेस चालू है"</string>
-    <string name="zen_access_revoke_warning_dialog_title" msgid="558779234015793950">"<xliff:g id="APP">%1$s</xliff:g> के लिए परेशान न करें की एक्‍सेस निरस्‍त करें?"</string>
+    <string name="zen_access_disabled_package_warning" msgid="302820100078584431">"इसे चालू रखें क्योंकि सूचना का एक्सेस चालू है"</string>
+    <string name="zen_access_revoke_warning_dialog_title" msgid="558779234015793950">"<xliff:g id="APP">%1$s</xliff:g> के लिए परेशान न करें की पहुंच रद्द करें?"</string>
     <string name="zen_access_revoke_warning_dialog_summary" msgid="5518216907304930148">"इस ऐप के द्वारा, परेशान न करें के लिए बनाए गए सभी नियम निकाल दिए जाएंगे."</string>
     <string name="ignore_optimizations_on" msgid="6915689518016285116">"ऑप्‍टिमाइज़ ना करें"</string>
     <string name="ignore_optimizations_off" msgid="6153196256410296835">"ऑप्‍टिमाइज़ करें"</string>
@@ -3257,19 +3319,19 @@
     <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>
-    <string name="system_alert_window_apps_title" msgid="7005760279028569491">"ऐप्स"</string>
-    <string name="system_alert_window_access_title" msgid="6297115362542361241">"दूसरे ऐप्स पर प्रदर्शित करें"</string>
-    <string name="permit_draw_overlay" msgid="7456536798718633432">"हमेशा दूसरे ऐप्लिकेशन के ऊपर प्रदर्शित करें"</string>
+    <string name="draw_overlay" msgid="6564116025404257047">"दूसरे ऐप के ऊपर दिखाएं"</string>
+    <string name="system_alert_window_settings" msgid="8466613169103527868">"दूसरे ऐप के ऊपर दिखाएं"</string>
+    <string name="system_alert_window_apps_title" msgid="7005760279028569491">"ऐप"</string>
+    <string name="system_alert_window_access_title" msgid="6297115362542361241">"दूसरे ऐप के ऊपर दिखाएं"</string>
+    <string name="permit_draw_overlay" msgid="7456536798718633432">"हमेशा दूसरे ऐप के ऊपर दिखाएं"</string>
     <string name="app_overlay_permission_preference" msgid="9039432222453006038">"ऊपर दिखाई देने वाले ऐप्लिकेशन की अनुमति"</string>
     <string name="allow_overlay_description" msgid="8961670023925421358">"इस ऐप्लिकेशन को अपने उपयोग किए जा रहे दूसरे सभी ऐप्लिकेशन के ऊपर प्रदर्शित होने दें. यह उन ऐप्लिकेशन के आपके उपयोग में दखल दे सकता है या उनके दिखाई देने या व्यवहार करने के तरीके में बदलाव कर सकता है."</string>
     <string name="keywords_vr_listener" msgid="7441221822576384680">"vr आभासी वास्तविकता श्रोता स्टीरियो सहायक सेवा"</string>
-    <string name="keywords_system_alert_window" msgid="5049498015597864850">"सिस्टम अलर्ट विंडो संवाद को दूसरे ऐप्लिकेशन के ऊपर प्रदर्शित करें"</string>
-    <string name="overlay_settings" msgid="6930854109449524280">"दूसरे ऐप्स पर प्रदर्शित करें"</string>
-    <string name="system_alert_window_summary" msgid="602892301318324492">"<xliff:g id="COUNT_1">%2$d</xliff:g> में से <xliff:g id="COUNT_0">%1$d</xliff:g> ऐप्स को दूसरे ऐप्स पर प्रदर्शित होने की अनुमति है"</string>
+    <string name="keywords_system_alert_window" msgid="5049498015597864850">"सिस्टम अलर्ट विंडो संवाद को दूसरे ऐप के ऊपर दिखाएं"</string>
+    <string name="overlay_settings" msgid="6930854109449524280">"दूसरे ऐप के ऊपर दिखाएं"</string>
+    <string name="system_alert_window_summary" msgid="602892301318324492">"<xliff:g id="COUNT_1">%2$d</xliff:g> में से <xliff:g id="COUNT_0">%1$d</xliff:g> ऐप को दूसरे ऐप के ऊपर दिखाने की अनुमति है"</string>
     <string name="filter_overlay_apps" msgid="6965969283342557573">"अनुमति वाले ऐप्‍स"</string>
     <string name="app_permission_summary_allowed" msgid="1505409933012886711">"अनुमति है"</string>
     <string name="app_permission_summary_not_allowed" msgid="2592617058101882802">"अनुमति नहीं है"</string>
@@ -3282,7 +3344,7 @@
     <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="permit_write_settings" msgid="658555006453212691">"सेटिंग में बदलाव करने की अनुमति दें"</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>
@@ -3291,11 +3353,11 @@
     <string name="camera_gesture_desc" msgid="1831390075255870960">"अपनी कलाई को दो बार मोड़कर कैमरा ऐप खोलें"</string>
     <string name="camera_double_tap_power_gesture_title" msgid="1651873760405034645">"कैमरे के लिए पावर बटन दो बार दबाएं"</string>
     <string name="camera_double_tap_power_gesture_desc" msgid="7355664631775680376">"अपनी स्‍क्रीन को अनलाॅक किए बिना अपना कैमरा तुरंत खोलें"</string>
-    <string name="screen_zoom_title" msgid="5233515303733473927">"प्रदर्शन आकार"</string>
+    <string name="screen_zoom_title" msgid="5233515303733473927">"डिसप्ले का आकार"</string>
     <string name="screen_zoom_short_summary" msgid="7291960817349834688">"स्क्रीन पर स्थित आइटम बड़े या छोटे करें"</string>
-    <string name="screen_zoom_keywords" msgid="9176477565403352552">"प्रदर्शन सघनता, स्‍क्रीन ज़ूम, पैमाना, स्‍केलिंग"</string>
-    <string name="screen_zoom_summary" msgid="6445488991799015407">"अपने स्क्रीन पर स्थित आइटम बड़े या छोटे करें. आपकी स्क्रीन पर स्थित कुछ ऐप्स स्थान बदल सकते हैं."</string>
-    <string name="screen_zoom_preview_title" msgid="4680671508172336572">"पूर्वावलोकन"</string>
+    <string name="screen_zoom_keywords" msgid="9176477565403352552">"डिस्प्ले डेंसिटी (स्क्रीन के हर इंच में पिक्सेल की संख्या), स्‍क्रीन को ज़ूम करना, स्केल, स्‍केलिंग"</string>
+    <string name="screen_zoom_summary" msgid="6445488991799015407">"अपने स्क्रीन पर मौजूद आइटम बड़े या छोटे करें. आपकी स्क्रीन पर मौजूद कुछ ऐप जगह बदल सकते हैं."</string>
+    <string name="screen_zoom_preview_title" msgid="4680671508172336572">"झलक"</string>
     <string name="screen_zoom_make_smaller_desc" msgid="4622359904253364742">"छोटा करें"</string>
     <string name="screen_zoom_make_larger_desc" msgid="2236171043607896594">"बड़ा करें"</string>
     <string name="screen_zoom_conversation_icon_alex" msgid="8443032489384985820">"A"</string>
@@ -3314,16 +3376,16 @@
       <item quantity="one"><xliff:g id="COUNT">%d</xliff:g> ऐप्लिकेशन के लिए बंद है</item>
       <item quantity="other"><xliff:g id="COUNT">%d</xliff:g> ऐप्लिकेशन के लिए बंद है</item>
     </plurals>
-    <string name="notification_summary_none" msgid="4586376436702610">"सभी ऐप्लिकेशन के लिए चालू"</string>
+    <string name="notification_summary_none" msgid="4586376436702610">"सभी ऐप के लिए चालू"</string>
     <string name="apps_summary" msgid="193158055537070092">"<xliff:g id="COUNT">%1$d</xliff:g> ऐप्‍स इंस्‍टॉल किए गए हैं"</string>
     <string name="apps_summary_example" msgid="2118896966712746139">"24 ऐप्स इंस्टॉल किए गए"</string>
     <string name="storage_summary" msgid="3801281635351732202">"<xliff:g id="PERCENTAGE">%1$s</xliff:g> उपयोग किया गया - <xliff:g id="FREE_SPACE">%2$s</xliff:g> खाली है"</string>
-    <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_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>
@@ -3333,14 +3395,14 @@
     <string name="disabled_by_policy_title" msgid="627023216027648534">"कार्रवाई की अनुमति नहीं"</string>
     <string name="disabled_by_policy_title_adjust_volume" msgid="7399450998356045023">"वॉल्यूम बदला नहीं जा सकता"</string>
     <string name="disabled_by_policy_title_outgoing_calls" msgid="7919816644946067058">"कॉल करने की अनुमति नहीं है"</string>
-    <string name="disabled_by_policy_title_sms" msgid="5733307423899610340">"SMS की अनुमति नहीं है"</string>
+    <string name="disabled_by_policy_title_sms" msgid="5733307423899610340">"मैसेज (एसएमएस) की अनुमति नहीं है"</string>
     <string name="disabled_by_policy_title_camera" msgid="6225008536855644874">"कैमरा की अनुमति नहीं है"</string>
     <string name="disabled_by_policy_title_screen_capture" msgid="4066913623298047094">"स्क्रीनशॉट की अनुमति नहीं है"</string>
-    <string name="default_admin_support_msg" msgid="2853684309779513863">"यह कार्रवाई अक्षम है. अधिक जानने के लिए, अपने संगठन के व्यवस्थापक से संपर्क करें."</string>
+    <string name="default_admin_support_msg" msgid="2853684309779513863">"यह कार्रवाई बंद है. और जानने के लिए, अपने संगठन के एडमिन से संपर्क करें."</string>
     <string name="admin_support_more_info" msgid="8901377038510512654">"अधिक विवरण"</string>
-    <string name="admin_profile_owner_message" msgid="5860816886981109626">"आपका व्यवस्थापक आपकी कार्य प्रोफ़ाइल से जुड़े ऐप्लिकेशन और डेटा की निगरानी कर सकता है और उनका प्रबंधन कर सकता है, जिनमें सेटिंग, अनुमतियां, कॉर्पोरेट एक्सेस, नेटवर्क गतिविधि और डिवाइस के स्थान की जानकारी शामिल हैं."</string>
-    <string name="admin_profile_owner_user_message" msgid="3842630535450382172">"आपका व्यवस्थापक इस उपयोगकर्ता से जुड़े ऐप्लिकेशन और डेटा की निगरानी कर सकता है और उनका प्रबंधन कर सकता है, जिनमें सेटिंग, अनुमतियां, कॉर्पोरेट एक्सेस, नेटवर्क गतिविधि और डिवाइस के स्थान की जानकारी शामिल है."</string>
-    <string name="admin_device_owner_message" msgid="6232893638259790789">"आपका व्यवस्थापक इस डिवाइस से जुड़े ऐप्लिकेशन और डेटा की निगरानी और उनका प्रबंधन कर सकता है, जिनमें सेटिंग, अनुमतियां, कॉर्पोरेट एक्सेस, नेटवर्क गतिविधि और डिवाइस के स्थान की जानकारी शामिल है."</string>
+    <string name="admin_profile_owner_message" msgid="5860816886981109626">"आपका एडमिन आपकी वर्क प्रोफ़ाइल से जुड़े ऐप और डेटा की निगरानी और उनका प्रबंधन कर सकता है, जिनमें सेटिंग, अनुमतियां, कॉर्पोरेट पहुंच, नेटवर्क गतिविधि और डिवाइस के जगह की जानकारी शामिल हैं."</string>
+    <string name="admin_profile_owner_user_message" msgid="3842630535450382172">"आपका एडमिन इस उपयोगकर्ता से जुड़े ऐप्लिकेशन और डेटा की निगरानी और उनका प्रबंधन कर सकता है, जिनमें सेटिंग, अनुमतियां, कॉर्पोरेट पहुंच, नेटवर्क गतिविधि और डिवाइस के जगह की जानकारी शामिल है."</string>
+    <string name="admin_device_owner_message" msgid="6232893638259790789">"आपका एडमिन इस उपयोगकर्ता से जुड़े ऐप्लिकेशन और डेटा की निगरानी और उनका प्रबंधन कर सकता है, जिनमें सेटिंग, अनुमतियां, कॉर्पोरेट पहुंच, नेटवर्क गतिविधि और डिवाइस के जगह की जानकारी शामिल है."</string>
     <string name="condition_turn_off" msgid="1960945836880080298">"बंद करें"</string>
     <string name="condition_turn_on" msgid="9089876276117874591">"चालू करें"</string>
     <string name="condition_expand_show" msgid="608202020023489939">"दिखाएं"</string>
@@ -3348,13 +3410,13 @@
     <string name="condition_hotspot_title" msgid="7778958849468560027">"हॉटस्पॉट चालू है"</string>
     <string name="condition_hotspot_summary" msgid="3433182779269409683">"पोर्टेबल वाई-फ़ाई हॉटस्पॉट <xliff:g id="ID_1">%1$s</xliff:g> सक्रिय है, इस डिवाइस के लिए वाई-फ़ाई बंद है."</string>
     <string name="condition_airplane_title" msgid="287356299107070503">"हवाई जहाज़ मोड चालू है"</string>
-    <string name="condition_airplane_summary" msgid="5561586417832393666">"वाई-फ़ाई, ब्लूटूथ और मोबाइल नेटवर्क बंद हैं. आप फ़ोन कॉल नहीं कर सकते या इंटरनेट से कनेक्ट नहीं कर सकते."</string>
+    <string name="condition_airplane_summary" msgid="3738805058182535606">"वाई-फ़ाई, ब्लूटूथ और मोबाइल नेटवर्क बंद हैं. आप कॉल नहीं कर सकते और इंटरनेट से भी कनेक्ट नहीं कर सकते."</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_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>
@@ -3375,16 +3437,17 @@
     </plurals>
     <string name="suggestion_remove" msgid="904627293892092439">"निकालें"</string>
     <string name="color_temperature" msgid="2070126836910615605">"शीतल रंग तापमान"</string>
-    <string name="color_temperature_desc" msgid="4793729830226404052">"अधिक शीतल प्रदर्शन रंगों का उपयोग करें"</string>
+    <string name="color_temperature_desc" msgid="4793729830226404052">"डिसप्ले में हलके रंगों का इस्तेमाल करें"</string>
     <string name="color_temperature_toast" msgid="4974218172133854827">"रंग बदलाव लागू करने के लिए, स्‍क्रीन बंद करें"</string>
-    <string name="telephony_monitor_toast" msgid="7003764250271195384">"टेलीफ़ोनी मॉनिटर बदलाव लागू करने के लिए, डिवाइस को रीबूट करें"</string>
-    <string name="camera_hal_hdrplus_switch" msgid="8377365197105267466">"कैमरा HAL HDR+"</string>
-    <string name="camera_hal_hdrplus_toast" msgid="2063703797270055299">"कैमरा HAL HDR+ बदलाव लागू करने के लिए, डिवाइस को पुन: बूट करें"</string>
+    <string name="connectivity_monitor_switch" msgid="9059759348648583421">"कनेक्टिविटी मॉनीटर"</string>
+    <string name="connectivity_monitor_switch_summary" msgid="2828658652378866401">"कनेक्टिविटी से जुड़ी किसी समस्या का पता चलने पर, कनेक्टिविटी मॉनीटर लॉग इकट्ठा करता है और उपयोगकर्ता को गड़बड़ी की जानकारी दर्ज करने के लिए सूचना देता है"</string>
+    <string name="connectivity_monitor_toast" msgid="5551859612881173028">"कनेक्टिविटी मॉनीटर वाले बदलाव लागू करने के लिए, डिवाइस फिर से चालू करें"</string>
+    <string name="camera_laser_sensor_switch" msgid="8913588990743234440">"कैमरा लेज़र सेंसर"</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>
@@ -3392,49 +3455,49 @@
     <string name="ethernet_data_template" msgid="5782476509881033590">"<xliff:g id="AMOUNT">^1</xliff:g> ईथरनेट डेटा"</string>
     <string name="cell_warning_only" msgid="763147658209027140">"<xliff:g id="ID_1">%1$s</xliff:g> डेटा चेतावनी"</string>
     <string name="cell_warning_and_limit" msgid="2273413629267437470">"<xliff:g id="ID_1">%1$s</xliff:g> डेटा चेतावनी / <xliff:g id="ID_2">%2$s</xliff:g> डेटा सीमा"</string>
-    <string name="billing_cycle" msgid="5169909190811133499">"बिलिंग चक्र"</string>
-    <string name="billing_cycle_fragment_summary" msgid="8231066353654583106">"<xliff:g id="ID_1">%1$s</xliff:g> को मासिक"</string>
+    <string name="billing_cycle" msgid="5169909190811133499">"बिलिंग की अवधि"</string>
+    <string name="billing_cycle_fragment_summary" msgid="8231066353654583106">"हर महीने की <xliff:g id="ID_1">%1$s</xliff:g> तारीख को"</string>
     <string name="network_restrictions" msgid="8234695294536675380">"नेटवर्क प्रतिबंध"</string>
     <plurals name="network_restrictions_summary" formatted="false" msgid="4301618027244595839">
       <item quantity="one"><xliff:g id="COUNT">%1$d</xliff:g> प्रतिबंध</item>
       <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>
     <string name="set_data_limit" msgid="2901526323210516923">"डेटा की सीमा सेट करें"</string>
     <string name="data_limit" msgid="1885406964934590552">"डेटा सीमा"</string>
-    <string name="data_usage_template" msgid="392191945602400904">"<xliff:g id="ID_2">%2$s</xliff:g> के बीच <xliff:g id="ID_1">%1$s</xliff:g> का उपयोग किया गया"</string>
+    <string name="data_usage_template" msgid="2923744765873163859">"<xliff:g id="ID_2">%2$s</xliff:g> तक <xliff:g id="ID_1">%1$s</xliff:g> का उपयोग किया गया"</string>
     <string name="configure" msgid="1029654422228677273">"कॉन्फ़िगर करें"</string>
     <string name="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="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="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="default_spell_checker" msgid="8506899870026026660">"डिफ़ॉल्ट वर्तनी-जांचकर्ता"</string>
-    <string name="choose_spell_checker" msgid="6596539862291699367">"वर्तनी-जांचकर्ता चुनें"</string>
+    <string name="lockscreen_remote_input" msgid="969871538778211843">"अगर डिवाइस लॉक है, तो सूचनाओं का जवाब या अन्य लेख लिखने से रोकें"</string>
+    <string name="default_spell_checker" msgid="8506899870026026660">"डिफ़ॉल्ट वर्तनी-जाँचकर्ता"</string>
+    <string name="choose_spell_checker" msgid="6596539862291699367">"वर्तनी-जाँचकर्ता चुनें"</string>
     <string name="spell_checker_not_selected" msgid="8871083796179200696">"नहीं चुना गया"</string>
     <string name="notification_log_no_title" msgid="5678029849672024215">"(कुछ नहीं)"</string>
     <string name="notification_log_details_delimiter" msgid="3116559361552416747">": "</string>
@@ -3449,52 +3512,52 @@
     <string name="notification_log_details_explanation" msgid="1914295130775393551">"स्पष्टीकरण"</string>
     <string name="notification_log_details_badge" msgid="3258183328267662285">"बैज दिखा सकता है"</string>
     <string name="notification_log_details_content_intent" msgid="1113554570409128083">"इंटेंट"</string>
-    <string name="notification_log_details_delete_intent" msgid="905118520685297007">"इंटेंट हटाएं"</string>
+    <string name="notification_log_details_delete_intent" msgid="905118520685297007">"इंटेंट मिटाएं"</string>
     <string name="notification_log_details_full_screen_intent" msgid="7118560817013522978">"पूर्ण स्क्रीन इंटेंट"</string>
     <string name="notification_log_details_actions" msgid="242523930165118066">"कार्रवाइयां"</string>
     <string name="notification_log_details_title" msgid="7177091647508863295">"शीर्षक"</string>
     <string name="notification_log_details_remoteinput" msgid="8328591329858827409">"रिमोट इनपुट"</string>
-    <string name="notification_log_details_content_view" msgid="6638731378278561786">"कस्टम दृश्य"</string>
-    <string name="notification_log_details_extras" msgid="4188418723779942047">"अतिरिक्त"</string>
-    <string name="notification_log_details_icon" msgid="8939114059726188218">"आइकन"</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>
     <string name="notification_log_details_ashmem" msgid="7241814108477320636">"ashmem"</string>
-    <string name="notification_log_details_sound" msgid="5506232879598808099">"ध्वनि"</string>
-    <string name="notification_log_details_vibrate" msgid="6890065466625335940">"कंपन"</string>
+    <string name="notification_log_details_sound" msgid="5506232879598808099">"आवाज़"</string>
+    <string name="notification_log_details_vibrate" msgid="6890065466625335940">"कंपन (वाइब्रेशन)"</string>
     <string name="notification_log_details_default" msgid="2345249399796730861">"डिफ़ॉल्ट"</string>
     <string name="notification_log_details_none" msgid="184131801230614059">"कोई नहीं"</string>
     <string name="notification_log_details_ranking_null" msgid="244660392058720919">"रैंकिंग ऑब्जेक्ट अनुपलब्ध है."</string>
     <string name="notification_log_details_ranking_none" msgid="599607025882587844">"रैंकिंग ऑब्जेक्ट में यह कुंजी शामिल नहीं है."</string>
-    <string name="special_access" msgid="3458780842491881155">"विशेष ऐप्लिकेशन एक्सेस"</string>
+    <string name="special_access" msgid="3458780842491881155">"ख़ास ऐप की एक्सेस"</string>
     <plurals name="special_access_summary" formatted="false" msgid="260765309935675867">
-      <item quantity="one"><xliff:g id="COUNT">%d</xliff:g> ऐप्लिकेशन अप्रतिबंधित डेटा का उपयोग कर सकते हैं</item>
-      <item quantity="other"><xliff:g id="COUNT">%d</xliff:g> ऐप्लिकेशन अप्रतिबंधित डेटा का उपयोग कर सकते हैं</item>
+      <item quantity="one"><xliff:g id="COUNT">%d</xliff:g> ऐप अप्रतिबंधित डेटा का उपयोग कर सकते हैं</item>
+      <item quantity="other"><xliff:g id="COUNT">%d</xliff:g> ऐप अप्रतिबंधित डेटा का उपयोग कर सकते हैं</item>
     </plurals>
-    <string name="confirm_convert_to_fbe_warning" msgid="1487005506049137659">"वाकई उपयोगकर्ता डेटा को वाइप करें और उसे फ़ाइल एन्क्रिप्शन में रूपांतरित करें?"</string>
+    <string name="confirm_convert_to_fbe_warning" msgid="1487005506049137659">"उपयोगकर्ता डेटा को मिटाना और फ़ाइल सुरक्षित करने के तरीके में बदलना चाहते हैं?"</string>
     <string name="button_confirm_convert_fbe" msgid="7101855374850373091">"वाइप करें और रूपांतरित करें"</string>
     <string name="reset_shortcut_manager_throttling" msgid="6495066467198668994">"ShortcutManager दर सीमित करना रीसेट करें"</string>
     <string name="reset_shortcut_manager_throttling_complete" msgid="1826770872063707900">"ShortcutManager दर सीमित करना रीसेट कर दिया गया है"</string>
-    <string name="notification_suggestion_title" msgid="4506524937307816475">"लॉक स्क्रीन नोटिफ़िकेशन नियंत्रित करें"</string>
-    <string name="notification_suggestion_summary" msgid="8521159741445416875">"नोटिफ़िकेशन की सामग्री दिखाएं या छिपाएं"</string>
+    <string name="notification_suggestion_title" msgid="387052719462473500">"लॉक स्क्रीन पर मौजूद जानकारी नियंत्रित करें"</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="8483187649355540109">"सहायता और टिप्स"</string>
+    <string name="page_tab_title_support" msgid="8483187649355540109">"सहायता और सलाह"</string>
     <string name="developer_smallest_width" msgid="7516950434587313360">"न्यूनतम चौड़ाई"</string>
-    <string name="premium_sms_none" msgid="8268105565738040566">"इंस्टॉल किए गए किसी भी ऐप्लिकेशन ने प्रीमियम SMS एक्सेस का अनुरोध नहीं किया गया"</string>
-    <string name="premium_sms_warning" msgid="9086859595338944882">"प्रीमियम SMS से शुल्क लग सकता है और इससे आपके वाहक बिल में बढ़ोतरी हो जाएगी. यदि आप किसी ऐप्लिकेशन के लिए अनुमति सक्षम करते हैं, तो आप उस ऐप्लिकेशन का उपयोग करके प्रीमियम SMS भेज सकेंगे."</string>
-    <string name="premium_sms_access" msgid="4660047004791638305">"प्रीमियम SMS एक्सेस"</string>
-    <string name="bluetooth_disabled" msgid="2456198532288640046">"दूसरे डिवाइसों को दिखाई नहीं देता"</string>
+    <string name="premium_sms_none" msgid="8268105565738040566">"इंस्टॉल किए गए किसी भी ऐप ने प्रीमियम मैसेज (एसएमएस) की पहुंच का अनुरोध नहीं किया है"</string>
+    <string name="premium_sms_warning" msgid="9086859595338944882">"प्रीमियम मैसेज (एसएमएस) के लिए आपको पैसे देने पड़ सकते हैं और इससे आपकी मोबाइल और इंटरनेट सेवा देने वाली कंपनी का बिल बढ़ जाएगा. अगर आप किसी ऐप के लिए अनुमति देते हैं, तो आप उस ऐप का इस्तेमाल करके प्रीमियम मैसेज (एसएमएस) भेज सकते हैं."</string>
+    <string name="premium_sms_access" msgid="4660047004791638305">"प्रीमियम मैसेज (एसएमएस) की पहुंच"</string>
+    <string name="bluetooth_disabled" msgid="6244000672828617410">"बंद"</string>
     <string name="bluetooth_connected_summary" msgid="7672528674593152862">"<xliff:g id="ID_1">%1$s</xliff:g> से कनेक्‍ट है"</string>
     <string name="bluetooth_connected_multiple_devices_summary" msgid="9173661896296663932">"कई डिवाइस से कनेक्ट है"</string>
-    <string name="demo_mode" msgid="2798762752209330277">"सिस्टम UI डेमो मोड"</string>
+    <string name="demo_mode" msgid="2798762752209330277">"सिस्टम यूज़र इंटरफ़ेस (यूआई) डेमो मोड"</string>
     <string name="quick_settings_developer_tiles" msgid="5947788063262762448">"त्वरित सेटिंग डेवलपर टाइल"</string>
     <string name="support_escalation_title" msgid="4111071371281023145">"सहायता के लिए हम यहां हैं"</string>
     <string name="support_escalation_24_7_title" msgid="8118369197749832074">"हम आपके लिए पूरे सप्ताह, हर समय यहां उपलब्ध हैं"</string>
     <string name="support_escalation_24_7_content_description" msgid="3772776213036994533">"हम आपके लिए पूरे सप्ताह, हर समय यहां उपलब्ध हैं"</string>
     <string name="support_escalation_summary" msgid="8473084168776014405">"हमारी सहायता टीम किसी भी समस्या को हल करने के लिए यहां उपलब्ध है"</string>
     <string name="support_escalation_24_7_summary" msgid="2802773279262547187">"हमारी सहायता टीम हर दिन, हर समय उपलब्ध रहती है"</string>
-    <string name="support_escalation_closed_summary" msgid="2240967274380168303">"सहायता खोजें या सहायता अवधि (स्थानीय समय) के दौरान वापस आएं:&lt;br&gt;&lt;b&gt;<xliff:g id="OPERATION_HOURS">%s</xliff:g>&lt;/b&gt;"</string>
+    <string name="support_escalation_closed_summary" msgid="2240967274380168303">"मदद ढूंढें या सहायता की अवधि (स्थानीय समय) के दौरान वापस आएं:&lt;br&gt;&lt;b&gt;<xliff:g id="OPERATION_HOURS">%s</xliff:g>&lt;/b&gt;"</string>
     <string name="support_escalation_no_internet_summary" msgid="2526082812336597989">"फ़ोन सहायता अवधि का समय (स्थानीय समय)&lt;br&gt;&lt;b&gt;<xliff:g id="OPERATION_HOURS">%s</xliff:g>&lt;/b&gt;"</string>
-    <string name="support_escalation_unavailable_summary" msgid="5208552975245211898">"सहायता खोजें या टिप्स और सुझाव एक्सप्लोर करें"</string>
+    <string name="support_escalation_unavailable_summary" msgid="5208552975245211898">"मदद ढूंढें या सलाह और सुझाव तलाशें"</string>
     <string name="support_country_list_title" msgid="823853371280534111">"इसके लिए समर्थन:"</string>
     <string name="support_country_format" msgid="4502523713489559595">"<xliff:g id="COUNTRY">%1$s</xliff:g> - <xliff:g id="LANGUAGE">%2$s</xliff:g>"</string>
     <string name="support_phone_international_format" msgid="2143528744844720829">"<xliff:g id="LANGUAGE">%1$s</xliff:g> (<xliff:g id="PHONE">%2$s</xliff:g>)"</string>
@@ -3502,19 +3565,19 @@
     <string name="support_international_phone_summary" msgid="208231793637026927">"अंतर्राष्‍ट्रीय शुल्क लागू हो सकते हैं"</string>
     <string name="support_escalation_by_phone" msgid="4843223043487058711">"फ़ोन"</string>
     <string name="support_escalation_by_chat" msgid="977019859110763749">"चैट करें"</string>
-    <string name="support_tips_and_tricks_title" msgid="4153466795695447828">"टिप्स और सुझाव एक्सप्लोर करें"</string>
-    <string name="support_help_feedback_title" msgid="693440287222186718">"सहायता खोजें और फ़ीडबैक भेजें"</string>
+    <string name="support_tips_and_tricks_title" msgid="4153466795695447828">"सलाह और सुझाव के बारे में और जानें"</string>
+    <string name="support_help_feedback_title" msgid="693440287222186718">"मदद ढूंढें और सुझाव भेजें"</string>
     <string name="support_sign_in_required_title" msgid="1367187789121480440">"सहायता से संपर्क करें"</string>
-    <string name="support_sign_in_button_text" msgid="3054769428620671241">"प्रवेश करें"</string>
+    <string name="support_sign_in_button_text" msgid="3054769428620671241">"साइन इन करें"</string>
     <string name="support_sign_in_required_help" msgid="5200654782405538114">"प्रवेश नहीं कर पा रहे हैं?"</string>
-    <string name="support_disclaimer_title" msgid="4825302018208770031">"सिस्टम जानकारी भेजें"</string>
+    <string name="support_disclaimer_title" msgid="4825302018208770031">"सिस्टम की जानकारी भेजें"</string>
     <string name="support_disclaimer_do_not_show" msgid="3378367075323727539">"दोबारा ना दिखाएं"</string>
-    <string name="support_account_request_prefix" msgid="6387847874661861650">"इस रूप में अनुरोध किया जा रहा है"</string>
+    <string name="support_account_request_prefix" msgid="6387847874661861650">"के तौर पर अनुरोध किया जा रहा है"</string>
     <string name="support_account_picker_add_account" msgid="5076277544846506214">"खाता जोड़ें"</string>
-    <string name="support_system_information_title" msgid="3439905790018934773">"सिस्टम जानकारी"</string>
+    <string name="support_system_information_title" msgid="3439905790018934773">"सिस्टम की जानकारी"</string>
     <string name="managed_profile_settings_title" msgid="2729481936758125054">"कार्य प्रोफ़ाइल सेटिंग"</string>
-    <string name="managed_profile_contact_search_title" msgid="6034734926815544221">"संपर्क खोज"</string>
-    <string name="managed_profile_contact_search_summary" msgid="5431253552272970512">"कॉलर और संपर्कों की पहचान करने के लिए अपने संगठन में संपर्क खोज करने दें"</string>
+    <string name="managed_profile_contact_search_title" msgid="6034734926815544221">"संपर्क सर्च"</string>
+    <string name="managed_profile_contact_search_summary" msgid="5431253552272970512">"कॉल करने वालों (कॉलर) और संपर्कों की पहचान करने के लिए अपने संगठन को संपर्क खोजने दें"</string>
     <plurals name="hours" formatted="false" msgid="7020844602875333472">
       <item quantity="one"><xliff:g id="NUMBER">%s</xliff:g> घंटे</item>
       <item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> घंटे</item>
@@ -3528,24 +3591,17 @@
       <item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> सेकंड</item>
     </plurals>
     <string name="support_estimated_wait_time" msgid="6523081420029378051">"~<xliff:g id="ESTIMATE">%1$s</xliff:g> प्रतीक्षा करें"</string>
-    <string name="bluetooth_talkback_computer" msgid="4875089335641234463">"कंप्यूटर"</string>
-    <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>
-    <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_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="5280023307132819052">"हाथ के जेस्चर (स्पर्श)"</string>
+    <string name="gesture_preference_summary" product="default" msgid="8627850388011956901">"अपना फ़ोन नियंत्रित करने के लिए फटाफट किए जाने वाले जेस्चर"</string>
+    <string name="gesture_preference_summary" product="tablet" msgid="4717535378272065510">"अपना टैबलेट नियंत्रित करने के लिए फटाफट किए जाने वाले जेस्चर"</string>
+    <string name="gesture_preference_summary" product="device" msgid="4205941452664950852">"अपना डिवाइस नियंत्रित करने के लिए फटाफट किए जाने वाले जेस्चर"</string>
     <string name="double_tap_power_for_camera_title" msgid="64716226816032800">"सीधे कैमरे पर जाएं"</string>
     <string name="double_tap_power_for_camera_summary" msgid="242037150983277829">"कैमरा तुरंत खोलने के लिए, पावर बटन दो बार दबाएं. ऐसा किसी भी स्क्रीन से किया जा सकता है."</string>
     <string name="double_tap_power_for_camera_suggestion_title" msgid="6500405261202883589">"झटपट कैमरा खोलें"</string>
@@ -3556,35 +3612,37 @@
     <string name="double_twist_for_camera_suggestion_summary" product="default" msgid="447403641027147153">"खुद ली गई स्वयं की फ़ोटो मोड के लिए फ़ोन को दो बार घुमाएं"</string>
     <string name="double_twist_for_camera_suggestion_summary" product="tablet" msgid="1724660290703318739">"खुद ली गई स्वयं की फ़ोटो मोड के लिए टैबलेट को दो बार घुमाएं"</string>
     <string name="double_twist_for_camera_suggestion_summary" product="device" msgid="5980398380988039489">"खुद ली गई स्वयं की फ़ोटो मोड के लिए डिवाइस को दो बार घुमाएं"</string>
-    <string name="ambient_display_title" product="default" msgid="5144814600610448504">"फ़ोन देखने के लिए डबल टैप करें"</string>
-    <string name="ambient_display_title" product="tablet" msgid="8688795028609563837">"टैबलेट देखने के लिए डबल टैप करें"</string>
-    <string name="ambient_display_title" product="device" msgid="3423781975742145894">"डिवाइस देखने के लिए डबल टैप करें"</string>
-    <string name="ambient_display_summary" msgid="525662960806416373">"समय, नोटिफ़िकेशन आइकन और अन्य जानकारी देखने के लिए, अपनी स्क्रीन पर डबल-टैप करें."</string>
-    <string name="ambient_display_suggestion_summary" msgid="5987443721392571847">"स्क्रीन बंद होने पर नोटिफ़िकेशन देखें"</string>
+    <string name="ambient_display_title" product="default" msgid="5144814600610448504">"फ़ोन देखने के लिए दो बार छूएं"</string>
+    <string name="ambient_display_title" product="tablet" msgid="8688795028609563837">"टैबलेट देखने के लिए दो बार छूएं"</string>
+    <string name="ambient_display_title" product="device" msgid="3423781975742145894">"डिवाइस देखने के लिए दो बार छूएं"</string>
+    <string name="ambient_display_summary" msgid="525662960806416373">"समय, सूचना आइकॉन और अन्य जानकारी देखने के लिए, अपनी स्क्रीन को दो बार छूएं."</string>
+    <string name="ambient_display_suggestion_summary" msgid="5987443721392571847">"स्क्रीन बंद होने पर सूचनाएं देखें"</string>
     <string name="ambient_display_pickup_title" product="default" msgid="818688002837687268">"फ़ोन देखने के लिए लिफ़्ट करें"</string>
     <string name="ambient_display_pickup_title" product="tablet" msgid="4455864282995698097">"टैबलेट देखने के लिए लिफ़्ट करें"</string>
     <string name="ambient_display_pickup_title" product="device" msgid="5380534405773531175">"डिवाइस देखने के लिए लिफ़्ट करें"</string>
-    <string name="ambient_display_pickup_summary" product="default" msgid="4567020486787561873">"समय, नोटिफ़िकेशन आइकन और अन्य जानकारी देखने के लिए, अपना फ़ोन उठाएं."</string>
-    <string name="ambient_display_pickup_summary" product="tablet" msgid="5435283849947236648">"समय, नोटिफ़िकेशन आइकन और अन्य जानकारी देखने के लिए, अपना टैबलेट उठाएं."</string>
-    <string name="ambient_display_pickup_summary" product="device" msgid="8256669101643381568">"समय, नोटिफ़िकेशन आइकन और अन्य जानकारी देखने के लिए, अपना डिवाइस उठाएं."</string>
-    <string name="ambient_display_pickup_suggestion_summary" msgid="7014700589991761035">"स्क्रीन बंद होने पर नोटिफ़िकेशन देखें"</string>
-    <string name="fingerprint_swipe_for_notifications_title" msgid="5816346492253270243">"नोटिफ़िकेशन के लिए फ़िंगरप्रिंट स्वाइप करें"</string>
-    <string name="fingerprint_swipe_for_notifications_summary" product="default" msgid="1770661868393713922">"अपने नोटिफ़िकेशन देखने के लिए, अपने फ़ोन के पीछे फ़िंगरप्रिंट सेंसर पर नीचे स्वाइप करें."</string>
-    <string name="fingerprint_swipe_for_notifications_summary" product="tablet" msgid="902719947767712895">"अपने नोटिफ़िकेशन देखने के लिए, अपने टैबलेट के पीछे फ़िंगरप्रिंट सेंसर पर नीचे स्वाइप करें."</string>
-    <string name="fingerprint_swipe_for_notifications_summary" product="device" msgid="5372926094116306647">"अपने नोटिफ़िकेशन देखने के लिए, अपने डिवाइस के पीछे फ़िंगरप्रिंट सेंसर पर नीचे स्वाइप करें."</string>
-    <string name="fingerprint_swipe_for_notifications_suggestion_title" msgid="1677291167470357802">"झटपट नोटिफ़िकेशन देखें"</string>
+    <string name="ambient_display_pickup_summary" product="default" msgid="4567020486787561873">"समय, नोटिफ़िकेशन आइकॉन और अन्य जानकारी देखने के लिए, अपने फ़ोन का इस्तेमाल करें."</string>
+    <string name="ambient_display_pickup_summary" product="tablet" msgid="5435283849947236648">"समय, नोटिफ़िकेशन आइकॉन और अन्य जानकारी देखने के लिए, अपना टैबलेट का इस्तेमाल करें."</string>
+    <string name="ambient_display_pickup_summary" product="device" msgid="8256669101643381568">"समय, नोटिफ़िकेशन आइकॉन और अन्य जानकारी देखने के लिए, अपने डिवाइस का इस्तेमाल करें."</string>
+    <string name="ambient_display_pickup_suggestion_summary" msgid="7014700589991761035">"स्क्रीन बंद होने पर सूचनाएं देखें"</string>
+    <string name="fingerprint_swipe_for_notifications_title" msgid="5816346492253270243">"सूचनाओं के लिए फ़िंगरप्रिंट स्वाइप करें"</string>
+    <string name="fingerprint_gesture_screen_title" msgid="8562169633234041196">"फ़िंगरप्रिंट स्वाइप करें"</string>
+    <string name="fingerprint_swipe_for_notifications_summary" product="default" msgid="1770661868393713922">"अपने सूचना देखने के लिए, अपने फ़ोन के पीछे फ़िंगरप्रिंट सेंसर पर नीचे की तरफ़ स्वाइप करें."</string>
+    <string name="fingerprint_swipe_for_notifications_summary" product="tablet" msgid="902719947767712895">"अपने सूचना देखने के लिए, अपने टैबलेट के पीछे फ़िंगरप्रिंट सेंसर पर नीचे की तरफ़ स्वाइप करें."</string>
+    <string name="fingerprint_swipe_for_notifications_summary" product="device" msgid="5372926094116306647">"अपनी सूचनाएं देखने के लिए, अपने डिवाइस के पीछे फ़िंगरप्रिंट सेंसर पर नीचे की तरफ़ स्वाइप करें."</string>
+    <string name="fingerprint_swipe_for_notifications_suggestion_title" msgid="1677291167470357802">"झटपट सूचनाएं देखें"</string>
     <string name="fingerprint_swipe_for_notifications_suggestion_summary" msgid="127592803294414082">"फ़िंगरप्रिंट सेंसर पर नीचे स्वाइप करें"</string>
     <string name="gesture_setting_on" msgid="3455094265233870280">"चालू"</string>
     <string name="gesture_setting_off" msgid="5230169535435881894">"बंद"</string>
     <string name="oem_unlock_enable_disabled_summary_bootloader_unlocked" msgid="4265541229765635629">"बूटलोडर पहले से ही अनलाॅक किया हुआ है"</string>
-    <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" msgid="3361344735430813695">"पहले इंटरनेट से कनेक्ट करें"</string>
+    <string name="oem_unlock_enable_disabled_summary_connectivity_or_locked" msgid="2479038689567925511">"इंटरनेट से जोड़ें या मोबाइल सेवा देने वाली कंपनी से संपर्क करें"</string>
+    <string name="oem_unlock_enable_disabled_summary_sim_locked_device" msgid="4149387448213399630">"मोबाइल और इंटरनेट सेवा देने वाली कंपनी के लॉक किए गए डिवाइस पर नहीं पाया जा सकता"</string>
+    <string name="oem_lock_info_message" msgid="9218313722236417510">"डिवाइस सुरक्षा सुविधा चालू करने के लिए कृपया डिवाइस रीस्टार्ट करें."</string>
     <string name="automatic_storage_manager_freed_bytes" msgid="7517560170441007788">"<xliff:g id="SIZE">%1$s</xliff:g> कुल उपलब्ध कराया गया\n\nपिछली बार <xliff:g id="DATE">%2$s</xliff:g> को चलाया गया"</string>
     <string name="web_action_enable_title" msgid="4051513950976670853">"झटपट ऐप्स"</string>
     <string name="web_action_enable_summary" msgid="3108127559723396382">"सभी लिंक एप्लिकेशन में खोलें, भले ही वे इंस्टॉल न हों"</string>
     <string name="web_action_section_title" msgid="7364647086538399136">"झटपट ऐप्स"</string>
-    <string name="instant_apps_account" msgid="1433620209791992528">"झटपट ऐप्स खाता"</string>
+    <string name="instant_apps_settings" msgid="8827777916518348213">"झटपट ऐप प्राथमिकताएं"</string>
     <string name="domain_url_section_title" msgid="7046835219056428883">"इंस्‍टॉल किए गए ऐप्‍लिकेशन"</string>
     <string name="automatic_storage_manager_activation_warning" msgid="6353100011690933254">"आपकी जगह का प्रबंधन अब जगह प्रबंधक द्वारा किया जा रहा है"</string>
     <string name="account_for_section_header" msgid="5356566418548737121">"<xliff:g id="USER_NAME">%1$s</xliff:g> के खाते"</string>
@@ -3592,7 +3650,7 @@
     <string name="auto_sync_account_title" msgid="898796354710116383">"डेटा को अपने आप सिंक करें"</string>
     <string name="auto_sync_personal_account_title" msgid="8496263182646100610">"व्यक्तिगत डेटा अपने आप सिंक करें"</string>
     <string name="auto_sync_work_account_title" msgid="4489172450037434152">"कार्यस्थल डेटा अपने आप सिंक करें"</string>
-    <string name="auto_sync_account_summary" msgid="692499211629185107">"ऐप्लिकेशन को डेटा अपने आप रीफ्रेश करने दें"</string>
+    <string name="auto_sync_account_summary" msgid="692499211629185107">"ऐप को डेटा अपने आप रीफ्रे़श करने दें"</string>
     <string name="account_sync_title" msgid="7214747784136106491">"खाता सिंक"</string>
     <string name="account_sync_summary_some_on" msgid="3375930757891381175">"<xliff:g id="ID_2">%2$d</xliff:g> में से <xliff:g id="ID_1">%1$d</xliff:g> आइटम के लिए सिंक करना चालू है"</string>
     <string name="account_sync_summary_all_on" msgid="570431636622254156">"सभी आइटम के लिए सिंक करना चालू है"</string>
@@ -3600,15 +3658,15 @@
     <string name="enterprise_privacy_settings" msgid="1177106810374146496">"प्रबंधित डिवाइस की जानकारी"</string>
     <string name="enterprise_privacy_settings_summary_generic" msgid="5853292305730761128">"आपके संगठन की ओर से प्रबंधित किए जाने वाले बदलाव और सेटिंग"</string>
     <string name="enterprise_privacy_settings_summary_with_name" msgid="4266234968317996188">"<xliff:g id="ORGANIZATION_NAME">%s</xliff:g> की ओर से प्रबंधित किए जाने वाले बदलाव और सेटिंग"</string>
-    <string name="enterprise_privacy_header" msgid="7402406406883832509">"आपके कार्य डेटा का एक्सेस देने के लिए, आपका संगठन सेटिंग में बदलाव कर सकता है और आपके डिवाइस पर सॉफ़्टवेयर इंस्टॉल कर सकता है.\n\nअधिक जानकारी के लिए, अपने संगठन के व्यवस्थापक से संपर्क करें."</string>
-    <string name="enterprise_privacy_exposure_category" msgid="7313392680107938517">"जानकारी के वे प्रकार जिन्हें आपका संगठन देख सकता है"</string>
+    <string name="enterprise_privacy_header" msgid="7402406406883832509">"आपके वर्क डेटा तक पहुंच देने के लिए, आपका संगठन सेटिंग में बदलाव कर सकता है और आपके डिवाइस पर सॉफ़्टवेयर इंस्टॉल कर सकता है.\n\nऔर जानकारी के लिए, अपने संगठन के एडमिन से संपर्क करें."</string>
+    <string name="enterprise_privacy_exposure_category" msgid="7313392680107938517">"वह जानकारियां जिन्हें आपका संगठन देख सकता है"</string>
     <string name="enterprise_privacy_exposure_changes_category" msgid="9079283547182933771">"वे बदलाव जो आपके संगठन के व्यवस्थापक ने किए हैं"</string>
-    <string name="enterprise_privacy_device_access_category" msgid="5423434164248819058">"इस डिवाइस पर आपका एक्सेस"</string>
+    <string name="enterprise_privacy_device_access_category" msgid="5423434164248819058">"इस डिवाइस पर आपकी पहुंच"</string>
     <string name="enterprise_privacy_enterprise_data" msgid="2773968662865848413">"आपके कार्य खाते से संबद्ध डेटा, जैसे कि ईमेल और कैलेंडर"</string>
     <string name="enterprise_privacy_installed_packages" msgid="2313698828178764590">"आपके डिवाइस पर मौजूद ऐप्लिकेशन की सूची"</string>
     <string name="enterprise_privacy_usage_stats" msgid="4398411405572759370">"हर एक ऐप्लिकेशन में खर्च होने वाले समय और डेटा की मात्रा"</string>
     <string name="enterprise_privacy_network_logs" msgid="161722817268849590">"हाल ही का नेटवर्क ट्रैफ़िक लॉग"</string>
-    <string name="enterprise_privacy_bug_reports" msgid="843225086779037863">"सबसे हाल ही की बग रिपोर्ट"</string>
+    <string name="enterprise_privacy_bug_reports" msgid="843225086779037863">"सबसे हाल ही की गड़बड़ी की रिपोर्ट"</string>
     <string name="enterprise_privacy_security_logs" msgid="5377362481617301074">"हाल ही का सुरक्षा लॉग"</string>
     <string name="enterprise_privacy_none" msgid="7706621148858381189">"कोई नहीं"</string>
     <string name="enterprise_privacy_enterprise_installed_packages" msgid="6353757812144878828">"इंस्टॉल किए गए ऐप्लिकेशन"</string>
@@ -3617,10 +3675,10 @@
       <item quantity="one">कम से कम <xliff:g id="COUNT_1">%d</xliff:g> ऐप्लिकेशन</item>
       <item quantity="other">कम से कम <xliff:g id="COUNT_1">%d</xliff:g> ऐप्लिकेशन</item>
     </plurals>
-    <string name="enterprise_privacy_location_access" msgid="4158197200885270634">"स्थान अनुमतियां"</string>
+    <string name="enterprise_privacy_location_access" msgid="4158197200885270634">"जगह की अनुमतियां"</string>
     <string name="enterprise_privacy_microphone_access" msgid="5717375623568864441">"माइक्रोफ़ोन अनुमतियां"</string>
     <string name="enterprise_privacy_camera_access" msgid="4858146118537519375">"कैमरा अनुमतियां"</string>
-    <string name="enterprise_privacy_enterprise_set_default_apps" msgid="3288495615791128724">"डिफ़ॉल्‍ट ऐप्लिकेशन"</string>
+    <string name="enterprise_privacy_enterprise_set_default_apps" msgid="3288495615791128724">"डिफ़ॉल्‍ट ऐप"</string>
     <plurals name="enterprise_privacy_number_packages" formatted="false" msgid="2765037387436064893">
       <item quantity="one"><xliff:g id="COUNT_1">%d</xliff:g> ऐप्लिकेशन</item>
       <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> ऐप्लिकेशन</item>
@@ -3631,12 +3689,14 @@
     <string name="enterprise_privacy_always_on_vpn_personal" msgid="9217774730260037434">"आपकी व्यक्तिगत प्रोफ़ाइल में हमेशा-चालू VPN चालू है"</string>
     <string name="enterprise_privacy_always_on_vpn_work" msgid="7244472958208315814">"आपकी कार्य प्रोफ़ाइल में हमेशा-चालू VPN चालू है"</string>
     <string name="enterprise_privacy_global_http_proxy" msgid="7936664553416257333">"वैश्विक HTTP प्रॉक्सी सेट है"</string>
-    <string name="enterprise_privacy_ca_certs" msgid="5885892204903688909">"विश्वसनीय क्रेडेंशियल"</string>
+    <string name="enterprise_privacy_ca_certs_device" msgid="2019652712782510262">"भरोसेमंद क्रेडेंशियल"</string>
+    <string name="enterprise_privacy_ca_certs_personal" msgid="2279084820904076599">"आपकी निजी प्रोफ़ाइल में मौजूद भरोसेमंद क्रेडेंशियल"</string>
+    <string name="enterprise_privacy_ca_certs_work" msgid="6187377647815301809">"आपकी कार्य प्रोफ़ाइल में मौजूद भरोसेमंद क्रेडेंशियल"</string>
     <plurals name="enterprise_privacy_number_ca_certs" formatted="false" msgid="526375234629534165">
       <item quantity="one">कम से कम <xliff:g id="COUNT_1">%d</xliff:g> CA प्रमाणपत्र</item>
       <item quantity="other">कम से कम <xliff:g id="COUNT_1">%d</xliff:g> CA प्रमाणपत्र</item>
     </plurals>
-    <string name="enterprise_privacy_lock_device" msgid="8791656477097208540">"व्यवस्थापक डिवाइस को लॉक कर सकता है और पासवर्ड रीसेट कर सकता है"</string>
+    <string name="enterprise_privacy_lock_device" msgid="8791656477097208540">"एडमिन डिवाइस को लॉक कर सकते हैं और पासवर्ड फिर से कर सकते हैं"</string>
     <string name="enterprise_privacy_wipe_device" msgid="2821960015797241790">"व्यवस्थापक डिवाइस का सभी डेटा हटा सकता है"</string>
     <string name="enterprise_privacy_failed_password_wipe_device" msgid="1001255609345002878">"डिवाइस का सभी डेटा हटाने से पहले विफल रही पासवर्ड की कोशिशें"</string>
     <string name="enterprise_privacy_failed_password_wipe_work" msgid="4040565826652951057">"कार्य प्रोफ़ाइल डेटा हटाने से पहले विफल रही पासवर्ड की कोशिशें"</string>
@@ -3647,7 +3707,7 @@
     <string name="do_disclosure_generic" msgid="8653670456990823307">"इस डिवाइस का प्रबंधन आपका संगठन करता है."</string>
     <string name="do_disclosure_with_name" msgid="1141081465968481380">"<xliff:g id="ORGANIZATION_NAME">%s</xliff:g> इस डिवाइस को प्रबंधित करता है."</string>
     <string name="do_disclosure_learn_more_separator" msgid="3558079393757238670">" "</string>
-    <string name="do_disclosure_learn_more" msgid="2416766240581561009">"अधिक जानें"</string>
+    <string name="do_disclosure_learn_more" msgid="2416766240581561009">"ज़्यादा जानें"</string>
     <plurals name="default_camera_app_title" formatted="false" msgid="1134677050353971363">
       <item quantity="one">कैमरा ऐप्लिकेशन</item>
       <item quantity="other">कैमरा ऐप्लिकेशन</item>
@@ -3668,7 +3728,7 @@
     <string name="storage_photos_videos" msgid="319854636702241898">"फ़ोटो और वीडियो"</string>
     <string name="storage_music_audio" msgid="789779084825206838">"संगीत और ऑडियो"</string>
     <string name="storage_games" msgid="7703159201697117621">"गेम"</string>
-    <string name="storage_other_apps" msgid="5524321740031718083">"अन्य ऐप्लिकेशन"</string>
+    <string name="storage_other_apps" msgid="5524321740031718083">"और ऐप"</string>
     <string name="storage_files" msgid="8581083146777364063">"फ़ाइलें"</string>
     <string name="storage_size_large_alternate" msgid="3550744227788333060">"<xliff:g id="NUMBER">^1</xliff:g>"<small>" <xliff:g id="UNIT">^2</xliff:g>"</small>""</string>
     <string name="storage_volume_total" msgid="3499221850532701342">"<xliff:g id="TOTAL">%1$s</xliff:g> में से उपयोग किया गया"</string>
@@ -3679,21 +3739,25 @@
     <string name="audio_files_title" msgid="4777048870657911307">"ऑडियो फ़ाइलें"</string>
     <string name="app_info_storage_title" msgid="5554719444625611987">"उपयोग की गई जगह"</string>
     <string name="webview_uninstalled_for_user" msgid="1819903169194420983">"(उपयोगकर्ता <xliff:g id="USER">%s</xliff:g> के लिए अनइंस्टॉल है)"</string>
-    <string name="webview_disabled_for_user" msgid="1216426047631256825">"(उपयोगकर्ता <xliff:g id="USER">%s</xliff:g> के लिए अक्षम है)"</string>
+    <string name="webview_disabled_for_user" msgid="1216426047631256825">"(उपयोगकर्ता <xliff:g id="USER">%s</xliff:g> के लिए बंद है)"</string>
     <string name="autofill_app" msgid="7338387238377914374">"ऑटोमैटिक भरने की सेवा"</string>
     <string name="autofill_keywords" msgid="7485591824120812710">"ऑटो, भरना, ऑटोमैटिक भरना"</string>
     <string name="autofill_confirmation_message" msgid="2784869528908005194">"&lt;b&gt;सुनिश्चित करें कि आप इस ऐप्लिकेशन पर भरोसा करते हैं&lt;/b&gt; &lt;br/&gt; &lt;br/&gt; &lt;xliff:g id=app_name example=Google ऑटोमैटिक भरना&gt;%1$s&lt;/xliff:g&gt; ऑटोमैटिक भरी जा सकने वाली चीज़ें निर्धारित करने के लिए आपकी स्क्रीन पर मौजूद चीज़ों का उपयोग करता है."</string>
     <string name="device_theme" msgid="4571803018917608588">"डिवाइस की थीम"</string>
     <string name="default_theme" msgid="7085644992078579076">"डिफ़ॉल्ट"</string>
+    <string name="show_operator_name_title" msgid="805135053530442951">"नेटवर्क का नाम"</string>
+    <string name="show_operator_name_summary" msgid="5962567590205757550">"स्टेटस बार में नेटवर्क का नाम दिखाएं"</string>
     <string name="storage_manager_indicator" msgid="1516810749625915020">"जगह प्रबंधक: <xliff:g id="STATUS">^1</xliff:g>"</string>
     <string name="storage_manager_indicator_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="carrier_provisioning" msgid="4398683675591893169">"वाहक प्रावधान जानकारी"</string>
-    <string name="trigger_carrier_provisioning" msgid="3434865918009286187">"वाहक प्रावधान ट्रिगर करें"</string>
+    <string name="storage_movies_tv" msgid="5498394447562086890">"फ़िल्में और टीवी ऐप"</string>
+    <string name="carrier_provisioning" msgid="4398683675591893169">"मोबाइल और इंटरनेट सेवा देने वाली कंपनी की नेटवर्क से जुड़ी जानकारी"</string>
+    <string name="trigger_carrier_provisioning" msgid="3434865918009286187">"मोबाइल और इंटरनेट सेवा देने वाली कंपनी का नेटवर्क ट्रिगर करें"</string>
     <string name="new_device_suggestion_title" msgid="698847081680980774">"नया और रोमांचक क्या है?"</string>
-    <string name="new_device_suggestion_summary" msgid="7172709269203435870">"प्रमुख 5 सुविधाएं देखें"</string>
+    <string name="new_device_suggestion_summary" product="default" msgid="206396571522515855">"अपने नए फ़ोन के बारे में अच्छी तरह जानें"</string>
+    <string name="new_device_suggestion_summary" product="tablet" msgid="393751455688210956">"अपने नए टैबलेट के बारे में अच्छी तरह जानें"</string>
+    <string name="new_device_suggestion_summary" product="device" msgid="2939870049868336652">"अपने नए डिवाइस के बारे में अच्छी तरह जानें"</string>
     <string name="disabled_low_ram_device" msgid="3751578499721173344">"यह सुविधा इस डिवाइस पर उपलब्ध नहीं है"</string>
 </resources>
diff --git a/res/values-hr/arrays.xml b/res/values-hr/arrays.xml
index bcb125d..4a38b51 100644
--- a/res/values-hr/arrays.xml
+++ b/res/values-hr/arrays.xml
@@ -100,8 +100,6 @@
     <!-- no translation found for wifi_security_no_eap:0 (2084555984818107151) -->
     <!-- no translation found for wifi_security_no_eap:1 (397579322683471524) -->
     <!-- no translation found for wifi_security_no_eap:2 (1968820975358150484) -->
-    <!-- no translation found for wifi_ap_security:0 (5251664683198623324) -->
-    <!-- no translation found for wifi_ap_security:1 (7989073072260294673) -->
   <string-array name="wifi_eap_method">
     <item msgid="1160193392455075561">"PEAP"</item>
     <item msgid="7981731051382306293">"TLS"</item>
diff --git a/res/values-hr/strings.xml b/res/values-hr/strings.xml
index 49a460c..56c8b16 100644
--- a/res/values-hr/strings.xml
+++ b/res/values-hr/strings.xml
@@ -167,7 +167,7 @@
     <string name="bluetooth_map_acceptance_dialog_text" msgid="8712508202081143737">"%1$s želi pristupiti vašim porukama. Želite li dati pristup korisniku %2$s?"</string>
     <string name="bluetooth_sap_request" msgid="2669762224045354417">"Zahtjev za pristup SIM-u"</string>
     <string name="bluetooth_sap_acceptance_dialog_text" msgid="4414253873553608690">"<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g> želi pristupiti SIM kartici. Dopuštanjem pristupa SIM kartici onemogućit će se podatkovna veza na uređaju za vrijeme povezanosti. Dopustite pristup uređaju <xliff:g id="DEVICE_NAME_1">%2$s?</xliff:g>"</string>
-    <string name="bluetooth_device_name_summary" msgid="4757990010751789977">"Drugim uređajima vidljiv kao \"<xliff:g id="DEVICE_NAME">^1</xliff:g>\""</string>
+    <string name="bluetooth_device_name_summary" msgid="522235742194965734">"Drugim uređajima vidljiv kao \"<xliff:g id="DEVICE_NAME">^1</xliff:g>\""</string>
     <string name="bluetooth_paired_device_title" msgid="8638994696317952019">"Vaši uređaji"</string>
     <string name="bluetooth_pairing_page_title" msgid="7712127387361962608">"Uparivanje novog uređaja"</string>
     <string name="date_and_time" msgid="9062980487860757694">"Datum i vrijeme"</string>
@@ -295,11 +295,11 @@
     <string name="cellular_data_summary" msgid="4660351864416939504">"Dopusti prijenos pod. putem mobilne mreže"</string>
     <string name="allow_data_usage_title" msgid="2238205944729213062">"Podatkovni promet u roamingu"</string>
     <string name="roaming" msgid="3596055926335478572">"Roaming podataka"</string>
-    <string name="roaming_enable" msgid="3737380951525303961">"Poveži se s podatkovnim uslugama u roamingu"</string>
-    <string name="roaming_disable" msgid="1295279574370898378">"Poveži se s podatkovnim uslugama u roamingu"</string>
+    <string name="roaming_enable" msgid="3737380951525303961">"Povezivanje s podatkovnim uslugama u roamingu"</string>
+    <string name="roaming_disable" msgid="1295279574370898378">"Povezivanje s podatkovnim uslugama u roamingu"</string>
     <string name="roaming_reenable_message" msgid="9141007271031717369">"Izgubili ste podatkovnu vezu jer ste isključili mrežni roaming podataka."</string>
     <string name="roaming_turn_it_on_button" msgid="4387601818162120589">"Uključi"</string>
-    <string name="roaming_warning" msgid="4275443317524544705">"To se može skupo naplaćivati."</string>
+    <string name="roaming_warning" msgid="4275443317524544705">"To može biti dosta skupo."</string>
     <string name="roaming_warning_multiuser" product="tablet" msgid="6458990250829214777">"Kada dopustite podatkovni roaming, mogu nastati značajni troškovi roaminga!\n\nOva postavka utječe na sve korisnike na ovom tabletu."</string>
     <string name="roaming_warning_multiuser" product="default" msgid="6368421100292355440">"Kada dopustite podatkovni roaming, mogu nastati značajni troškovi roaminga!\n\nOva postavka utječe na sve korisnike na ovom telefonu."</string>
     <string name="roaming_reenable_title" msgid="6068100976707316772">"Dopusti roaming podataka?"</string>
@@ -314,6 +314,8 @@
     <string name="zone_auto" msgid="334783869352026648">"Automatska vremenska zona"</string>
     <string name="zone_auto_summaryOn" msgid="6142830927278458314">"Upotrijebi vremensku zonu mreže"</string>
     <string name="zone_auto_summaryOff" msgid="2597745783162041390">"Upotrijebi vremensku zonu mreže"</string>
+    <string name="date_time_24hour_auto" msgid="2117383168985653422">"Automatski 24‑satni format"</string>
+    <string name="date_time_24hour_auto_summary" msgid="6351812925651480277">"Upotrijebi lokalnu zadanu postavku"</string>
     <string name="date_time_24hour_title" msgid="3203537578602803850">"24-satni oblik"</string>
     <string name="date_time_24hour" msgid="1193032284921000063">"Koristi 24-satni format"</string>
     <string name="date_time_set_time_title" msgid="6296795651349047016">"Vrijeme"</string>
@@ -375,6 +377,9 @@
     <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="1961957425135180242">"Dalje"</string>
+    <string name="setup_fingerprint_enroll_skip_title" msgid="362050541117362034">"Želite li preskočiti otisak prsta?"</string>
+    <string name="setup_fingerprint_enroll_skip_after_adding_lock_text" msgid="958990414356204763">"Postavljanje otisaka prstiju traje samo jednu ili dvije minute. Ako to preskočite, otiske prstiju možete dodati kasnije u postavkama."</string>
+    <string name="lock_screen_intro_skip_title" msgid="4988210105913705679">"Želite li preskočiti zaključavanje zaslona?"</string>
     <string name="lock_screen_intro_skip_dialog_text_frp" product="tablet" msgid="1581834104051243425">"Značajke za zaštitu uređaja neće se uključiti. Nećete moći spriječiti druge da upotrebljavaju ovaj tablet u slučaju gubitka, krađe ili vraćanja na zadano."</string>
     <string name="lock_screen_intro_skip_dialog_text_frp" product="device" msgid="4629503416877189572">"Značajke za zaštitu uređaja neće se uključiti. Nećete moći spriječiti druge da upotrebljavaju ovaj uređaj u slučaju gubitka, krađe ili vraćanja na zadano."</string>
     <string name="lock_screen_intro_skip_dialog_text_frp" product="default" msgid="2423428240245737909">"Značajke za zaštitu uređaja neće se uključiti. Nećete moći spriječiti druge da upotrebljavaju ovaj telefon u slučaju gubitka, krađe ili vraćanja na zadano."</string>
@@ -460,7 +465,7 @@
     <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>
     <string name="setup_lock_settings_picker_title" product="default" msgid="1572244299605153324">"Zaštitite telefon"</string>
-    <string name="setup_lock_settings_picker_fingerprint_message" msgid="5585650064305600578">"Za dodatnu sigurnost postavite pričuvno zaključavanje zaslona."</string>
+    <string name="lock_settings_picker_fingerprint_added_security_message" msgid="5768002109707648463">"Za dodatnu sigurnost postavite pričuvno zaključavanje zaslona."</string>
     <string name="setup_lock_settings_picker_message" product="tablet" msgid="8919671129189936210">"Aktivirajte značajke zaštite uređaja kako biste onemogućili drugima da upotrebljavaju ovaj tablet bez vašeg dopuštenja. Odaberite zaključavanje zaslona koje želite upotrebljavati."</string>
     <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>
@@ -597,6 +602,7 @@
     <string name="lockpassword_pin_no_sequential_digits" msgid="680765285206990584">"Uzastopno rastući ili padajući slijed brojeva ili ponavljanje brojeva nije dopušteno"</string>
     <string name="lockpassword_ok_label" msgid="313822574062553672">"U redu"</string>
     <string name="lockpassword_cancel_label" msgid="8818529276331121899">"Odustani"</string>
+    <string name="lockpassword_clear_label" msgid="5724429464960458155">"Izbriši"</string>
     <string name="lockpattern_tutorial_cancel_label" msgid="6431583477570493261">"Odustani"</string>
     <string name="lockpattern_tutorial_continue_label" msgid="3559793618653400434">"Dalje"</string>
     <string name="lock_setup" msgid="3355847066343753943">"Postavljanje je završeno."</string>
@@ -715,7 +721,7 @@
     <string name="android_beam_off_summary" msgid="4663095428454779138">"Isključeno"</string>
     <string name="android_beam_disabled_summary" msgid="1737782116894793393">"Nije dostupno jer je NFC isključen"</string>
     <string name="android_beam_label" msgid="6257036050366775040">"Android Beam"</string>
-    <string name="android_beam_explained" msgid="1810540319385192758">"Kada je ta značajka uključena, možete prenijeti sadržaj aplikacije na drugi uređaj na kojem je omogućen NFC tako da uređaje postavite jedan uz drugi. Na primjer, možete prenositi web-stranice, videozapise s YouTubea, kontakte i još mnogo toga.\n\nJednostavno uređaje postavite jedan uz drugi (prislonite im poleđine), pa dodirnite zaslon. Aplikacija određuje što će se prenijeti."</string>
+    <string name="android_beam_explained" msgid="1810540319385192758">"Kada je ta značajka uključena, sadržaj aplikacije možete prenijeti na drugi uređaj na kojem je omogućen NFC tako da uređaje postavite jedan uz drugi. Na primjer, možete prenositi web-stranice, videozapise s YouTubea, kontakte i još mnogo toga.\n\nUređaje samo postavite jedan uz drugi (prislonite im poleđine), pa dodirnite zaslon. Aplikacija određuje što će se prenijeti."</string>
     <string name="wifi_quick_toggle_title" msgid="8850161330437693895">"Wi-Fi"</string>
     <string name="wifi_quick_toggle_summary" msgid="2696547080481267642">"Uključite Wi-Fi"</string>
     <string name="wifi_settings" msgid="29722149822540994">"Wi-Fi"</string>
@@ -792,6 +798,7 @@
     <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>
@@ -828,6 +835,8 @@
     <string name="wifi_wps_available_first_item" msgid="4422547079984583502">"WPS dostupan"</string>
     <string name="wifi_wps_available_second_item" msgid="8427520131718215301">" (WPS dostupan)"</string>
     <string name="wifi_wps_nfc_enter_password" msgid="2288214226916117159">"Unesite mrežnu zaporku"</string>
+    <string name="wifi_carrier_connect" msgid="8174696557882299911">"Wi‑Fi mreža mobilnog operatera"</string>
+    <string name="wifi_carrier_content" msgid="4634077285415851933">"Povežite se putem mreže <xliff:g id="NAME">%1%s</xliff:g>"</string>
     <string name="wifi_scan_always_turnon_message" msgid="203123538572122989">"Radi poboljšanja preciznosti lokacije kao i u druge svrhe aplikacija <xliff:g id="APP_NAME">%1$s</xliff:g> želi uključiti pregledavanje mreže, čak i kada je Wi-Fi isključen.\n\nŽelite li to dozvoliti za sve aplikacije koje žele izvoditi pregledavanje?"</string>
     <string name="wifi_scan_always_turnoff_message" msgid="5538901671131941043">"Isključite putem opcije Napredno na dodatnom izborniku."</string>
     <string name="wifi_scan_always_confirm_allow" msgid="5355973075896817232">"Dopusti"</string>
@@ -845,6 +854,7 @@
     <string name="wifi_connect" msgid="1076622875777072845">"Poveži"</string>
     <string name="wifi_failed_connect_message" msgid="8491902558970292871">"Povezivanje s mrežom nije uspjelo"</string>
     <string name="wifi_forget" msgid="8168174695608386644">"Zaboravi"</string>
+    <string name="wifi_modify" msgid="6100248070440710782">"Izmijeni"</string>
     <string name="wifi_failed_forget_message" msgid="1348172929201654986">"Zaboravljanje mreže nije uspjelo"</string>
     <string name="wifi_save" msgid="3331121567988522826">"Spremi"</string>
     <string name="wifi_failed_save_message" msgid="6650004874143815692">"Spremanje mreže nije uspjelo"</string>
@@ -858,6 +868,7 @@
     <string name="wifi_advanced_titlebar" msgid="4485841401774142908">"Napredni 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_title" msgid="3471132676909349382">"Informacije o mreži"</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="6734119149106422148">"IPv6 adrese"</string>
@@ -890,16 +901,15 @@
     <string name="wifi_p2p_cancel_connect_title" msgid="255267538099324413">"Otkazati pozivnicu?"</string>
     <string name="wifi_p2p_cancel_connect_message" msgid="7477756213423749402">"Želite li otkazati pozivnicu za povezivanje s korisnikom <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">"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_off_subtext" msgid="5466126533609394170">"Internetska veza i sadržaj ne dijele se s drugim uređajima"</string>
     <string name="wifi_hotspot_tethering_on_subtext" product="tablet" msgid="5752490509369962007">"Internetska veza ovog tableta dijeli se putem žarišne točke"</string>
     <string name="wifi_hotspot_tethering_on_subtext" product="default" msgid="6461075246164300670">"Internetska veza ovog telefona dijeli se putem žarišne točke"</string>
     <string name="wifi_hotspot_on_local_only_subtext" msgid="2068110388011294735">"Aplikacija dijeli sadržaj. Da biste dijelili internetsku vezu, isključite žarišnu točku, a zatim je ponovo uključite"</string>
-    <string name="wifi_hotspot_name_title" msgid="1341735529132128887">"Naziv Wi‑Fi-ja"</string>
+    <string name="wifi_hotspot_name_title" msgid="8237000746618636778">"Naziv žarišne točke"</string>
     <string name="wifi_hotspot_name_summary_connecting" msgid="3378299995508671967">"Uključivanje žarišne točke <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>..."</string>
     <string name="wifi_hotspot_name_summary_connected" msgid="3888672084861445362">"Drugi uređaji mogu se povezati sa žarišnom točkom <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>"</string>
-    <string name="wifi_hotspot_password_title" msgid="1955592302902091281">"Zaporka za Wi-Fi"</string>
+    <string name="wifi_hotspot_password_title" msgid="8676859981917573801">"Zaporka žarišne točke"</string>
     <string name="wifi_hotspot_ap_band_title" msgid="1165801173359290681">"Frekvencija pristupne točke"</string>
     <string name="wifi_hotspot_footer_info_regular" msgid="1203489406068036455">"Upotrijebite žarišnu točku da biste izradili Wi‑Fi mrežu za ostale uređaje. Žarišna točka omogućuje povezivanje s internetom putem podatkovne veze vašeg mobilnog uređaja. Mogući su dodatni troškovi za prijenos podataka na mobilnom uređaju."</string>
     <string name="wifi_hotspot_footer_info_local_only" msgid="857988412470694109">"Aplikacije mogu izraditi žarišnu točku radi dijeljenja sadržaja s uređajima u blizini."</string>
@@ -910,7 +920,6 @@
     <string name="wifi_tether_configure_ap_text" msgid="7974681394041609308">"Postavljanje Wi-Fi žarišne točke"</string>
     <string name="wifi_hotspot_configure_ap_text" msgid="5478614731464220432">"Postavljanje Wi‑Fi žar. točke"</string>
     <string name="wifi_hotspot_configure_ap_text_summary" msgid="5560680057727007011">"AndroidAP WPA2 PSK žarišna toč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> žarišna točka"</string>
     <string name="wifi_tether_configure_ssid_default" msgid="8467525402622138547">"AndroidHotspot"</string>
     <string name="wifi_calling_settings_title" msgid="4102921303993404577">"Wi-Fi pozivi"</string>
     <string name="wifi_calling_suggestion_title" msgid="9008010480466359578">"Uključite Wi-Fi pozive"</string>
@@ -951,7 +960,7 @@
     <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="emergency_address_summary" msgid="3266760199681945746">"Adresa koju hitne službe upotrebljavaju kao vašu lokaciju ako uputite hitni poziv putem Wi‑Fi-ja"</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">"Glasnoća"</string>
@@ -1005,6 +1014,7 @@
     <string name="search_settings" msgid="1910951467596035063">"Pretraži"</string>
     <string name="search_settings_summary" msgid="9205656546570654169">"Upravljajte postavkama pretraživanja i poviješću"</string>
     <string name="search_settings_no_results" msgid="8799027492641230999">"Nema rezultata"</string>
+    <string name="search_clear_history" msgid="4196658962573162457">"Izbriši povijest"</string>
     <string name="display_settings" msgid="7965901687241669598">"Prikaz"</string>
     <string name="accelerometer_title" msgid="7854608399547349157">"Automatski zakreni zaslon"</string>
     <string name="color_mode_title" msgid="3159275920408338215">"Žive boje"</string>
@@ -1070,7 +1080,7 @@
     <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">"Započni sad"</string>
+    <string name="screensaver_settings_dream_start" msgid="4998187847985120168">"Pokreni 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>
@@ -1135,7 +1145,6 @@
     <string name="baseband_version" msgid="1848990160763524801">"Osnovna verzija"</string>
     <string name="kernel_version" msgid="9192574954196167602">"Verzija jezgre"</string>
     <string name="build_number" msgid="3075795840572241758">"Broj međuverzije"</string>
-    <string name="selinux_status" msgid="6212165375172061672">"Status SELinuxa"</string>
     <string name="device_info_not_available" msgid="8062521887156825182">"Nije dostupno"</string>
     <string name="device_status_activity_title" msgid="1411201799384697904">"Status"</string>
     <string name="device_status" msgid="607405385799807324">"Status"</string>
@@ -1163,7 +1172,6 @@
     <string name="status_wifi_mac_address" msgid="2202206684020765378">"MAC adresa Wi-Fi-ja"</string>
     <string name="status_bt_address" msgid="4195174192087439720">"Bluetooth adresa"</string>
     <string name="status_serial_number" msgid="2257111183374628137">"Serijski broj"</string>
-    <string name="status_unavailable" msgid="7862009036663793314">"Nije dostupno"</string>
     <string name="status_up_time" msgid="7294859476816760399">"Vrijeme aktivnosti"</string>
     <string name="status_awake_time" msgid="2393949909051183652">"Vrijeme bez mirovanja"</string>
     <string name="internal_memory" msgid="9129595691484260784">"Unutarnja pohrana"</string>
@@ -1339,6 +1347,7 @@
     <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>
     <string name="reset_dashboard_title" msgid="6254873816990678620">"Poništavanje opcija"</string>
+    <string name="reset_dashboard_summary" msgid="4851012632493522755">"Mreža, aplikacije ili uređaj mogu se poništiti"</string>
     <string name="reset_network_title" msgid="6166025966016873843">"Poništi Wi-Fi, mobilnu mrežu i Bluetooth"</string>
     <string name="reset_network_desc" msgid="5547979398298881406">"Ovime će se poništiti sve postavke 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">"Poništi postavke"</string>
@@ -1347,18 +1356,14 @@
     <string name="reset_network_confirm_title" msgid="1759888886976962773">"Poništiti?"</string>
     <string name="network_reset_not_available" msgid="7188610385577164676">"Vraćanje mreže na zadano nije dostupno za ovog korisnika"</string>
     <string name="reset_network_complete_toast" msgid="787829973559541880">"Postavke mreže vraćene su na zadano."</string>
-    <string name="master_clear_title" msgid="6617679904229218425">"Izbriši sve podatke (vraćanje na tvornič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 vratit će se na zadano</item>
-      <item quantity="few"><xliff:g id="ACCOUNT_COUNT">%1$d</xliff:g> računa vratit će se na zadano</item>
-      <item quantity="other"><xliff:g id="ACCOUNT_COUNT">%1$d</xliff:g> računa vratit će se na zadano</item>
-    </plurals>
-    <string name="master_clear_summary" msgid="6902443944660426951">"Interna pohrana i svi podaci vratit će se na zadano"</string>
+    <string name="master_clear_title" msgid="3531267871084279512">"Izbriši sve podatke (vraćanje na tvorničke postavke)"</string>
     <string name="master_clear_desc" product="tablet" msgid="9146059417023157222">"To će izbrisati sve podatke s "<b>"unutarnje pohrane"</b>" tabletnog računala, uključujući:\n\n"<li>"vaš Google račun"</li>\n<li>"podatke i postavke sustava i aplikacija"</li>\n<li>"preuzete aplikacije"</li></string>
     <string name="master_clear_desc" product="default" msgid="4800386183314202571">"To će izbrisati sve podatke s "<b>"unutarnje pohrane"</b>" telefona, uključujući:\n\n"<li>"vaš Google račun"</li>\n<li>"podatke i postavke sustava i aplikacija"</li>\n<li>"preuzete aplikacije"</li></string>
     <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"Trenutačno ste prijavljeni na sljedeće račune:\n"</string>
     <string name="master_clear_other_users_present" product="default" msgid="5161423070702470742">\n\n"Na ovom uređaju postoje i drugi korisnici.\n"</string>
     <string name="master_clear_desc_also_erases_external" msgid="1903185203791274237"><li>"Glazba"</li>\n<li>"Fotografije"</li>\n<li>"Ostali korisnički podaci"</li></string>
+    <string name="master_clear_desc_also_erases_esim" msgid="312352697653096008"><li>"Mobilni operateri na eSIM-u"</li></string>
+    <string name="master_clear_desc_no_cancel_mobile_plan" msgid="5460926449093211144">\n\n"Time se neće otkazati vaš plan mobilne usluge."</string>
     <string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="7744115866662613411">\n\n"Da biste izbrisali glazbu, slike i ostale korisničke podatke, "<b>"USB pohrana"</b>" treba biti izbrisana."</string>
     <string name="master_clear_desc_erase_external_storage" product="default" msgid="4801026652617377093">\n\n"Da biste izbrisali glazbu, slike i ostale korisničke podatke, trebate izbrisati "<b>"SD karticu"</b>"."</string>
     <string name="erase_external_storage" product="nosdcard" msgid="969364037450286809">"Izbriši USB memoriju"</string>
@@ -1387,14 +1392,14 @@
     <string name="tether_settings_summary_hotspot_on_tether_on" msgid="930464462687425777">"Žarišna točka uključena, modemsko povezivanje"</string>
     <string name="tether_settings_summary_hotspot_on_tether_off" msgid="3473671453891735907">"Žarišna točka uključena"</string>
     <string name="tether_settings_summary_hotspot_off_tether_on" msgid="1618256180720077354">"Modemsko povezivanje"</string>
-    <string name="tether_settings_disabled_on_data_saver" msgid="1576908608463904152">"Dok je Ušteda podataka uključena, ne možete upotrebljavati modemsko povezivanje ni prijenosne žarišne točke"</string>
+    <string name="tether_settings_disabled_on_data_saver" msgid="1576908608463904152">"Dok je Štednja podatkovnog prometa uključena, ne možete upotrebljavati modemsko povezivanje ni prijenosne žarišne točke"</string>
     <string name="usb_title" msgid="7483344855356312510">"USB"</string>
     <string name="usb_tethering_button_text" msgid="585829947108007917">"Dijeljenje USB-om"</string>
     <string name="usb_tethering_subtext" product="default" msgid="5991482890033484794">"Dijeljenje internetske veze telefona putem USB-a"</string>
     <string name="usb_tethering_subtext" product="tablet" msgid="5988796139573211318">"Dijeljenje internetske veze tableta putem USB-a"</string>
     <string name="bluetooth_tether_checkbox_text" msgid="2379175828878753652">"Dijeljenje veze Bluetoothom"</string>
     <string name="bluetooth_tethering_subtext" product="tablet" msgid="4558227863463153412">"Dijelite internetsku vezu tableta pomoću Bluetootha"</string>
-    <string name="bluetooth_tethering_subtext" product="default" msgid="1055197887836203595">"Dijelite internetsku vezu telefona pomoću Bluetootha"</string>
+    <string name="bluetooth_tethering_subtext" product="default" msgid="1055197887836203595">"Dijeljenje internetske veze telefona pomoću Bluetootha"</string>
     <string name="bluetooth_tethering_off_subtext_config" msgid="6326877798974938021">"Dijeljenje int. veze uređaja <xliff:g id="DEVICE_NAME">%1$d</xliff:g> putem Bluetootha"</string>
     <string name="bluetooth_tethering_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>
@@ -1475,15 +1480,16 @@
     <string name="settings_safetylegal_activity_title" msgid="6901214628496951727">"Sigurnosne informacije"</string>
     <string name="settings_safetylegal_activity_unreachable" msgid="250674109915859456">"Nemate podatkovnu vezu. Da biste tu informaciju vidjeli sada, idite na stranicu %s s bilo kojeg računala povezanog s internetom."</string>
     <string name="settings_safetylegal_activity_loading" msgid="8059022597639516348">"Učitavanje…"</string>
-    <string name="lockpassword_choose_your_password_header" msgid="8624900666929394990">"Odaberite zaporku"</string>
-    <string name="lockpassword_choose_your_password_header_for_fingerprint" msgid="6624409510609085450">"Otisak prsta zahtijeva zaporku"</string>
-    <string name="lockpassword_choose_your_pattern_header" msgid="6949761069941694050">"Odaberite uzorak"</string>
-    <string name="lockpassword_choose_your_pattern_header_for_fingerprint" msgid="5901096361617543819">"Otisak prsta zahtijeva uzorak"</string>
-    <string name="lockpassword_choose_your_pin_header" msgid="7598849519816138302">"Odaberite PIN"</string>
-    <string name="lockpassword_choose_your_pin_header_for_fingerprint" msgid="765344692615917183">"Otisak prsta zahtijeva PIN"</string>
-    <string name="lockpassword_confirm_your_password_header" msgid="6308478184889846633">"Potvrdite zaporku"</string>
+    <string name="lockpassword_choose_your_screen_lock_header" msgid="3872462096767152394">"Postavljanje zaključavanja zaslona"</string>
+    <string name="lockpassword_choose_your_password_message" msgid="1197569283524841412">"Radi sigurnosti postavite zaporku"</string>
+    <string name="lockpassword_choose_your_password_header_for_fingerprint" msgid="2541818487015343503">"Otisak prsta zahtijeva zaporku"</string>
+    <string name="lockpassword_choose_your_pattern_header_for_fingerprint" msgid="7709785406243556723">"Otisak prsta zahtijeva uzorak"</string>
+    <string name="lockpassword_choose_your_pin_message" msgid="1875420718677275646">"Radi sigurnosti postavite PIN"</string>
+    <string name="lockpassword_choose_your_pin_header_for_fingerprint" msgid="1549639053195796674">"Za upotrebu otiska prsta postavite PIN"</string>
+    <string name="lockpassword_choose_your_pattern_message" msgid="5986983400689720015">"Radi sigurnosti postavite uzorak"</string>
+    <string name="lockpassword_confirm_your_password_header" msgid="1266027268220850931">"Ponovni unos zaporke"</string>
     <string name="lockpassword_confirm_your_pattern_header" msgid="7543433733032330821">"Potvrdite uzorak"</string>
-    <string name="lockpassword_confirm_your_pin_header" msgid="49038294648213197">"Potvrdite svoj PIN"</string>
+    <string name="lockpassword_confirm_your_pin_header" msgid="7744513791910572550">"Ponovni unos PIN-a"</string>
     <string name="lockpassword_confirm_passwords_dont_match" msgid="5140892109439191415">"Zaporke se ne podudaraju"</string>
     <string name="lockpassword_confirm_pins_dont_match" msgid="7226244811505606217">"PIN-ovi se ne podudaraju"</string>
     <string name="lockpassword_choose_lock_generic_header" msgid="3811438094903786145">"Odabir načina otključavanja"</string>
@@ -1502,6 +1508,12 @@
     <string name="lockpassword_strong_auth_required_work_pattern" msgid="3003781907040522053">"Za dodatnu sigurnost upotrijebite uzorak radnog profila"</string>
     <string name="lockpassword_strong_auth_required_work_pin" msgid="3367491332598821552">"Za dodatnu sigurnost unesite PIN radnog profila"</string>
     <string name="lockpassword_strong_auth_required_work_password" msgid="8159775129968582940">"Za dodatnu sigurnost unesite zaporku radnog profila"</string>
+    <string name="lockpassword_confirm_your_pattern_details_frp" msgid="6757336656791723193">"Vaš je telefon vraćen na tvorničke postavke. Da biste ga upotrebljavali, unesite prethodni uzorak."</string>
+    <string name="lockpassword_confirm_your_pin_details_frp" msgid="826520613445990470">"Vaš je telefon vraćen na tvorničke postavke. Da biste ga upotrebljavali, unesite prethodni PIN."</string>
+    <string name="lockpassword_confirm_your_password_details_frp" msgid="8944081074615739040">"Vaš je telefon vraćen na tvorničke postavke. Da biste ga upotrebljavali, unesite prethodnu zaporku."</string>
+    <string name="lockpassword_confirm_your_pattern_header_frp" msgid="2898036091609128286">"Potvrdite uzorak"</string>
+    <string name="lockpassword_confirm_your_pin_header_frp" msgid="4141601774778898803">"Potvrdite PIN"</string>
+    <string name="lockpassword_confirm_your_password_header_frp" msgid="3762615419295360480">"Potvrdite zaporku"</string>
     <string name="lockpassword_invalid_pin" msgid="15588049067548470">"Pogrešan PIN"</string>
     <string name="lockpassword_invalid_password" msgid="4038507398784975200">"Pogrešna zaporka"</string>
     <string name="lockpattern_need_to_unlock_wrong" msgid="1745247595356012176">"Pogrešan uzorak"</string>
@@ -1551,7 +1563,6 @@
     <string name="install_applications_title" msgid="4987712352256508946">"Dopusti sve izvore aplikacija"</string>
     <string name="recent_app_category_title" msgid="6673071268966003928">"Nedavno otvorene aplikacije"</string>
     <string name="see_all_apps_title" msgid="1317153498074308438">"Pogledajte sve aplikacije (<xliff:g id="COUNT">%1$d</xliff:g>)"</string>
-    <string name="recent_app_summary" msgid="3366446669844932300">"prije <xliff:g id="TIME">^1</xliff:g>"</string>
     <string name="install_all_warning" product="tablet" msgid="8310489909586138165">"Vaš tablet i osobni podaci izloženiji su napadima nepoznatih aplikacija. Instaliranjem aplikacija iz takvog izvora prihvaćate odgovornost za svu štetu nastalu na tabletu  ili gubitak podataka uzrokovan upotrebom tih aplikacija."</string>
     <string name="install_all_warning" product="default" msgid="1952257127370115988">"Vaš telefon i osobni podaci izloženiji su napadima nepoznatih aplikacija. Instaliranjem aplikacija iz takvog izvora prihvaćate odgovornost za svu štetu nastalu na telefonu ili gubitak podataka uzrokovan upotrebom tih aplikacija."</string>
     <string name="advanced_settings" msgid="1777249286757067969">"Napredne postavke"</string>
@@ -1672,7 +1683,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>
@@ -1816,7 +1827,7 @@
     <string name="accessibility_settings_summary" msgid="981260486011624939">"Čitači zaslona, zaslon, kontrole interakcije"</string>
     <string name="vision_settings_title" msgid="4204111425716868288">"Postavke za vid"</string>
     <string name="vision_settings_description" msgid="5679491180156408260">"Ovaj uređaj možete prilagoditi svojim potrebama. Značajke pristupačnosti možete promijeniti kasnije u postavkama."</string>
-    <string name="vision_settings_suggestion_title" msgid="917294957154878441">"Povećaj veličinu fonta"</string>
+    <string name="vision_settings_suggestion_title" msgid="8058794060304707004">"Promjena veličine fonta"</string>
     <string name="screen_reader_category_title" msgid="7739154903913400641">"Čitači zaslona"</string>
     <string name="audio_and_captions_category_title" msgid="3420727114421447524">"Audio i tekst na zaslonu"</string>
     <string name="display_category_title" msgid="685461049938269166">"Zaslon"</string>
@@ -1853,7 +1864,6 @@
     <string name="accessibility_display_inversion_preference_subtitle" msgid="7052959202195368109">"Može utjecati na izvedbu"</string>
     <string name="accessibility_autoclick_preference_title" msgid="7014499339068449623">"Klik kad se pokazivač zaustavi"</string>
     <string name="accessibility_autoclick_delay_preference_title" msgid="3962261178385106006">"Odgoda prije klika"</string>
-    <string name="preference_summary_default_combination" msgid="8532964268242666060">"<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>
@@ -1979,12 +1989,14 @@
     <string name="background_activity_summary_on" msgid="649282072540085599">"Aplikacija može raditi u pozadini kad se ne upotrebljava"</string>
     <string name="background_activity_summary_off" msgid="7666330699090632040">"Aktivnost aplikacije u pozadini ograničena je kad se ne upotrebljava"</string>
     <string name="background_activity_summary_disabled" msgid="3710669050484599847">"Aplikaciji nije dopušten rad u pozadini"</string>
+    <string name="background_activity_summary_whitelisted" msgid="7375400051141016808">"Aplikacija se ne može optimizirati za potrošnju baterije"</string>
+    <string name="background_activity_warning_dialog_title" msgid="2216249969149568871">"Želite li ograničiti pozadinsku aktivnost?"</string>
+    <string name="background_activity_warning_dialog_text" msgid="7049624449246121981">"Ako ograničite pozadinsku aktivnost za aplikaciju, možda će se ponašati nepredviđeno"</string>
     <string name="device_screen_usage" msgid="3386088035570409683">"Upotreba zaslona od potpunog punjenja"</string>
     <string name="device_screen_consumption" msgid="4607589286438986687">"Potrošnja za zaslon"</string>
     <string name="device_cellular_network" msgid="4724773411762382950">"Pretraživanje mobilnih mreža"</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">"Upotreba aplikacija od pune baterije (prije <xliff:g id="TIME">^1</xliff:g>)"</string>
-    <string name="power_usage_list_summary_device" msgid="7036566616386864302">"Upotreba uređaja od potpunog punjenja (prije <xliff:g id="TIME">^1</xliff:g>)"</string>
+    <string name="power_usage_list_summary" msgid="6393929085382334341">"Upotreba aplikacija od potpunog punjenja (<xliff:g id="RELATIVE_TIME">^1</xliff:g>)"</string>
+    <string name="power_usage_list_summary_device" msgid="4461926045610455423">"Upotreba uređaja od potpunog punjenja (<xliff:g id="RELATIVE_TIME">^1</xliff:g>)"</string>
     <string name="screen_usage_summary" msgid="6687403051423153550">"Količina vremena dok je zaslon bio uključen od posljednjeg punjenja"</string>
     <string name="device_usage_list_summary" msgid="5623036661468763251">"Upotreba uređaja od potpunog punjenja"</string>
     <string name="battery_since_unplugged" msgid="338073389740738437">"Upotreba baterije nakon isključivanja"</string>
@@ -2230,14 +2242,14 @@
     <string name="credentials_unlock_hint" msgid="2301301378040499348">"Upišite zaporku za pohranu vjerodajnica."</string>
     <string name="credentials_old_password" msgid="7553393815538684028">"Trenutačna zaporka:"</string>
     <string name="credentials_reset_hint" msgid="6297256880896133631">"Ukloniti sve sadržaje?"</string>
-    <string name="credentials_password_too_short" msgid="7502749986405522663">"Zaporka treba imati barem 8 znakova."</string>
     <string name="credentials_wrong_password" msgid="2541932597104054807">"Pogrešna zaporka."</string>
     <string name="credentials_reset_warning" msgid="5320653011511797600">"Pogrešna zaporka. Imate još jedan pokušaj prije brisanja pohrane vjerodajnica."</string>
     <string name="credentials_reset_warning_plural" msgid="6514085665301095279">"Pogrešna zaporka. Još imate ovoliko pokušaja prije brisanja pohrane vjerodajnica: <xliff:g id="NUMBER">%1$d</xliff:g>."</string>
     <string name="credentials_erased" msgid="2907836028586342969">"Pohrana vjerodajnica izbrisana je."</string>
     <string name="credentials_not_erased" msgid="7685932772284216097">"Pohrana vjer. nije izbrisana."</string>
     <string name="credentials_enabled" msgid="7588607413349978930">"Pohranjivanje vjerodajnica je omogućeno."</string>
-    <string name="credentials_configure_lock_screen_hint" msgid="6757119179588664966">"Da biste mogli koristiti pohranu vjerodajnica, trebate najprije postaviti PIN ili zaporku za zaključavanje zaslona."</string>
+    <string name="credentials_configure_lock_screen_hint" msgid="8058230497337529036">"Prije nego što možete koristiti pohranu vjerodajnica, vaš uređaj mora imati siguran zaključan zaslon"</string>
+    <string name="credentials_configure_lock_screen_button" msgid="253239765216055321">"POSTAVI ZAKLJUČAV."</string>
     <string name="usage_access_title" msgid="332333405495457839">"Apl. s pristupom pod. o upot."</string>
     <string name="emergency_tone_title" msgid="1055954530111587114">"Ton hitnog poziva"</string>
     <string name="emergency_tone_summary" msgid="722259232924572153">"Postavite način ponašanja za hitni poziv"</string>
@@ -2357,8 +2369,6 @@
     <skip />
     <string name="cant_sync_dialog_title" msgid="2777238588398046285">"Nije moguća ručna sinkronizacija"</string>
     <string name="cant_sync_dialog_message" msgid="1938380442159016449">"Sinkronizacija za tu stavku trenutačno je onemogućena. Da biste promijenili tu postavku, privremeno uključite pozadinske podatke i automatsku sinkronizaciju."</string>
-    <string name="wimax_settings" msgid="2655139497028469039">"4G"</string>
-    <string name="status_wimax_mac_address" msgid="8390791848661413416">"4G MAC adresa"</string>
     <string name="enter_password" msgid="8035706727471334122">"Da biste pokrenuli Android, unesite zaporku"</string>
     <string name="enter_pin" msgid="5305333588093263790">"Da biste pokrenuli Android, unesite svoj PIN"</string>
     <string name="enter_pattern" msgid="4187435713036808566">"Da biste pokrenuli Android, nacrtajte svoj obrazac"</string>
@@ -2372,13 +2382,14 @@
     <string name="misc_files_selected_count" msgid="4647048020823912088">"odabrano <xliff:g id="NUMBER">%1$d</xliff:g> od <xliff:g id="TOTAL">%2$d</xliff:g>"</string>
     <string name="misc_files_selected_count_bytes" msgid="2876232009069114352">"<xliff:g id="NUMBER">%1$s</xliff:g> od <xliff:g id="TOTAL">%2$s</xliff:g>"</string>
     <string name="select_all" msgid="1562774643280376715">"Odaberi sve"</string>
+    <string name="data_plan_usage_manage_plans_button_text" msgid="8997761990902708162">"Upravljaj planovima"</string>
     <string name="data_usage_summary_title" msgid="3804110657238092929">"Potrošnja podataka"</string>
     <string name="data_usage_app_summary_title" msgid="4147258989837459172">"Upotreba podataka za apl."</string>
     <string name="data_usage_accounting" msgid="7170028915873577387">"Mobilni operater može obračunavati podatke na drugačiji način od uređaja."</string>
     <string name="data_usage_app" msgid="4970478397515423303">"Potrošnja aplikacije"</string>
     <string name="data_usage_app_info_label" msgid="3409931235687866706">"INFORMACIJE O APLIKACIJAMA"</string>
     <string name="data_usage_cellular_data" msgid="9168928285122125137">"Mobilni podaci"</string>
-    <string name="data_usage_data_limit" msgid="1193930999713192703">"Postavljanje ograničenja podataka"</string>
+    <string name="data_usage_data_limit" msgid="1193930999713192703">"Postavljanje ograničenja potrošnje"</string>
     <string name="data_usage_cycle" msgid="5652529796195787949">"Ciklus upotrebe podataka"</string>
     <string name="data_usage_app_items_header_text" msgid="5017850810459372828">"Potrošnja aplikacije"</string>
     <string name="data_usage_menu_roaming" msgid="8042359966835203296">"Roaming podataka"</string>
@@ -2435,7 +2446,7 @@
     <string name="data_usage_cycle_editor_title" msgid="1373797281540188533">"Datum poništavanja ciklusa upotrebe"</string>
     <string name="data_usage_cycle_editor_subtitle" msgid="5512903797979928416">"Datum u mjesecu:"</string>
     <string name="data_usage_cycle_editor_positive" msgid="8821760330497941117">"Postavi"</string>
-    <string name="data_usage_warning_editor_title" msgid="3704136912240060339">"Postavite upozorenje o upotrebi podataka"</string>
+    <string name="data_usage_warning_editor_title" msgid="3704136912240060339">"Postavite upozorenje o potrošnji podataka"</string>
     <string name="data_usage_limit_editor_title" msgid="9153595142385030015">"Postavite ograničenje upotrebe podataka"</string>
     <string name="data_usage_limit_dialog_title" msgid="3023111643632996097">"Ograničavanje upotrebe podataka"</string>
     <string name="data_usage_limit_dialog_mobile" product="tablet" msgid="4983487893343645667">"Tablet će isključiti mobilne podatke kada dosegne ograničenje koje ste postavili.\n\nBudući da potrošnju podataka mjeri tablet i da se obračun mobilnog operatera može razlikovati, možda biste trebali postaviti strože ograničenje."</string>
@@ -2444,7 +2455,7 @@
     <string name="data_usage_restrict_background" msgid="434093644726734586">"Ako ograničite pozadinske mobilne podatke, neke aplikacije i usluge funkcionirat će samo ako se povežete s Wi‑Fi mrežom."</string>
     <string name="data_usage_restrict_background_multiuser" product="tablet" msgid="7096707497743363380">"Ako ograničite pozadinske mobilne podatke, neke aplikacije i usluge funkcionirat će samo ako se povežete s Wi‑Fi mrežom.\n\nTa postavka utječe na sve korisnike tableta."</string>
     <string name="data_usage_restrict_background_multiuser" product="default" msgid="7910798414964288424">"Ako ograničite pozadinske mobilne podatke, neke aplikacije i usluge funkcionirat će samo ako se povežete s Wi‑Fi mrežom.\n\nTa postavka utječe na sve korisnike telefona."</string>
-    <string name="data_usage_sweep_warning" msgid="6387081852568846982"><font size="18">"Upozori na <xliff:g id="NUMBER">^1</xliff:g>"</font>" "<font size="9">"<xliff:g id="UNIT">^2</xliff:g>"</font>\n<font size="12"></font></string>
+    <string name="data_usage_sweep_warning" msgid="6387081852568846982"><font size="12">"Upozori na"</font>\n<font size="18">"<xliff:g id="NUMBER">^1</xliff:g>"</font>" "<font size="9">"<xliff:g id="UNIT">^2</xliff:g>"</font></string>
     <string name="data_usage_sweep_limit" msgid="860566507375933039"><font size="18">"<xliff:g id="NUMBER">^1</xliff:g>"</font>" "<font size="9">"<xliff:g id="UNIT">^2</xliff:g>"</font>\n<font size="12">"ograničenje"</font></string>
     <string name="data_usage_uninstalled_apps" msgid="614263770923231598">"Uklonjene aplikacije"</string>
     <string name="data_usage_uninstalled_apps_users" msgid="7986294489899813194">"Uklonjene aplikacije i korisnici"</string>
@@ -2457,6 +2468,9 @@
     <string name="data_usage_metered_mobile" msgid="5423305619126978393">"Mobilne mreže"</string>
     <string name="data_usage_metered_wifi" msgid="1761738002328299714">"Wi-Fi mreže s naplatom"</string>
     <string name="data_usage_metered_wifi_disabled" msgid="727808462375941567">"Da biste odabrali mreže s naplatom, uključite Wi‑Fi."</string>
+    <string name="data_usage_metered_auto" msgid="1262028400911918865">"Automatski"</string>
+    <string name="data_usage_metered_yes" msgid="9217539611385225894">"S naplatom prijenosa"</string>
+    <string name="data_usage_metered_no" msgid="4025232961929071789">"Bez naplate prijenosa"</string>
     <string name="data_usage_disclaimer" msgid="6887858149980673444">"Mobilni operater može obračunavati podatke na drugačiji način od uređaja."</string>
     <string name="cryptkeeper_emergency_call" msgid="198578731586097145">"Hitni poziv"</string>
     <string name="cryptkeeper_return_to_call" msgid="5613717339452772491">"Vrati se na poziv"</string>
@@ -2548,9 +2562,6 @@
     <string name="backup_pw_set_button_text" msgid="2387480910044648795">"Postavi zaporku za sigurnosnu kopiju"</string>
     <string name="backup_pw_cancel_button_text" msgid="8845630125391744615">"Odustani"</string>
     <string name="additional_system_update_settings_list_item_title" msgid="214987609894661992">"Dodatna ažuriranja sustava"</string>
-    <string name="selinux_status_disabled" msgid="924551035552323327">"Onemogućeno"</string>
-    <string name="selinux_status_permissive" msgid="6004965534713398778">"Omogućeno"</string>
-    <string name="selinux_status_enforcing" msgid="2252703756208463329">"Provođenje"</string>
     <string name="ssl_ca_cert_warning" msgid="2045866713601984673">"Mreža se možda nadzire"</string>
     <string name="done_button" msgid="1991471253042622230">"Završeno"</string>
     <plurals name="ssl_ca_cert_dialog_title" formatted="false" msgid="7145092748045794650">
@@ -2822,7 +2833,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 uznemiravaj"</string>
+    <string name="sound_dashboard_summary" msgid="3402435125958012986">"Glasnoća, vibracija, Ne ometaj"</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>
@@ -2856,10 +2867,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 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_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_automation_settings_title" msgid="4228995740594063774">"Automatska pravila"</string>
-    <string name="zen_mode_automation_suggestion_title" msgid="5105443455143476201">"Pravila za \"Ne uznemiravaj\""</string>
+    <string name="zen_mode_automation_suggestion_title" msgid="5105443455143476201">"Pravila za \"Ne ometaj\""</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>
@@ -2899,13 +2910,15 @@
     <string name="notifications_title" msgid="8086372779371204971">"Obavijesti"</string>
     <string name="app_notifications_title" msgid="5810577805218003760">"Obavijesti aplikacije"</string>
     <string name="notification_channel_title" msgid="2260666541030178452">"Kategorija obavijesti"</string>
+    <string name="notification_group_title" msgid="7180506440133859601">"Grupa kategorija obavijesti"</string>
     <string name="notification_importance_title" msgid="848692592679312666">"Važnost"</string>
-    <string name="notification_importance_unspecified" msgid="2196023702875112081">"Neka odluči aplikacija"</string>
+    <string name="notification_importance_unspecified" msgid="6622173510486113958">"Dopusti zvuk"</string>
     <string name="notification_importance_blocked" msgid="7938180808339386300">"Nikad ne prikazuj obavijesti"</string>
     <string name="notification_importance_min" msgid="5455049524984686275">"Bez zvučnog ili vizualnog ometanja"</string>
     <string name="notification_importance_low" msgid="8881468429453766553">"Bez zvuka"</string>
     <string name="notification_importance_default" msgid="5958338024601957516">"Reproduciraj zvuk"</string>
     <string name="notification_importance_high" msgid="2082429479238228527">"Reproduciraj zvuk i prikaži na zaslonu"</string>
+    <string name="notification_importance_high_silent" msgid="2667033773703765252">"Skočni zaslon"</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>
@@ -2949,8 +2962,14 @@
     <string name="loading_notification_apps" msgid="5031818677010335895">"Učitavanje aplikacija..."</string>
     <string name="app_notifications_off_desc" msgid="4882445501376722969">"Android blokira prikazivanje obavijesti te aplikacije na ovom uređaju"</string>
     <string name="channel_notifications_off_desc" msgid="5899225298718840635">"Android blokira prikazivanje te kategorije obavijesti na ovom uređaju"</string>
+    <string name="channel_group_notifications_off_desc" msgid="1620950416247316370">"Android blokira prikazivanje te grupe obavijesti na ovom uređaju"</string>
     <string name="notification_channels" msgid="5346841743182627500">"Kategorije"</string>
     <string name="notification_channels_other" msgid="5645317113885788226">"Drugo"</string>
+    <plurals name="notification_group_summary" formatted="false" msgid="3420621520561455358">
+      <item quantity="one"><xliff:g id="COUNT_1">%d</xliff:g> kategorija</item>
+      <item quantity="few"><xliff:g id="COUNT_1">%d</xliff:g> kategorije</item>
+      <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> kategorija</item>
+    </plurals>
     <string name="no_channels" msgid="3077375508177744586">"Ova aplikacija nije objavila nijednu obavijest"</string>
     <string name="app_settings_link" msgid="8894946007543660906">"Dodatne postavke u aplikaciji"</string>
     <string name="app_notification_listing_summary_zero" msgid="6482582965081108108">"Uključene za sve aplikacije"</string>
@@ -2973,7 +2992,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">"Neka te obavijesti nastave prekidati kada je način Ne ometaj postavljen na Samo prioritetno"</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_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>
@@ -3029,6 +3048,7 @@
     <string name="zen_mode_from_starred" msgid="2678345811950997027">"Samo od kontakata sa zvjezdicom"</string>
     <string name="zen_mode_from_none" msgid="8219706639954614136">"Ništa"</string>
     <string name="zen_mode_alarms" msgid="2165302777886552926">"Alarmi"</string>
+    <string name="zen_mode_alarms_summary" msgid="3774926045611788635">"Alarmi su uvijek prioritetni i emitiraju zvuk"</string>
     <string name="zen_mode_reminders" msgid="5458502056440485730">"Podsjetnici"</string>
     <string name="zen_mode_events" msgid="7914446030988618264">"Događaji"</string>
     <string name="zen_mode_all_callers" msgid="584186167367236922">"Svi pozivatelji"</string>
@@ -3065,6 +3085,7 @@
     <string name="zen_mode_screen_off_visual_interruptions" msgid="4850792880144382633">"Kada je zaslon isključen"</string>
     <string name="zen_mode_no_visual_interruptions" msgid="8742776003822778472">"Kada je zaslon uključen ili isključen"</string>
     <string name="notification_app_settings_button" msgid="6685640230371477485">"Postavke obavijesti"</string>
+    <string name="suggestion_button_text" msgid="3275010948381252006">"U redu"</string>
     <string name="device_feedback" msgid="3238056036766293294">"Pošalji povr. informacije o uređaju"</string>
     <string name="restr_pin_enter_admin_pin" msgid="1085834515677448072">"Unesite PIN administratora"</string>
     <string name="switch_on_text" msgid="1124106706920572386">"Uključeno"</string>
@@ -3155,7 +3176,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">"Applikacije koje upotrebljavaju <xliff:g id="APPS">%1$s</xliff:g>"</string>
+    <string name="app_permissions_summary" msgid="5163974162150406324">"Aplikacije koje koriste značajke <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>
@@ -3255,6 +3276,7 @@
     <string name="usb_summary_file_transfers" msgid="6435943692610175111">"Prijenos datoteka"</string>
     <string name="usb_summary_photo_transfers" msgid="8440204169576585250">"Prijenos fotografija (PTP)"</string>
     <string name="usb_summary_MIDI" msgid="5687906612187885908">"Upotreba uređaja kao MIDI-ja"</string>
+    <string name="sms_mirroring_pref" msgid="6475043279147376031">"Zrcaljenje SMS-ova"</string>
     <string name="background_check_pref" msgid="7550258400138010979">"Provjera u pozadini"</string>
     <string name="background_check_title" msgid="4534254315824525593">"Potpuni pristup u pozadini"</string>
     <string name="assist_access_context_title" msgid="2269032346698890257">"Koristi tekst sa zaslona"</string>
@@ -3322,7 +3344,8 @@
     <string name="write_settings_title" msgid="4232152481902542284">"S dopuštenjem za izmjenu postavki sustava"</string>
     <string name="write_system_settings" msgid="3482913590601096763">"Izmjena postavki sustava"</string>
     <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>
+    <!-- no translation found for permit_write_settings (658555006453212691) -->
+    <skip />
     <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>
@@ -3349,7 +3372,7 @@
     <string name="screen_zoom_conversation_timestamp_3" msgid="3785674344762707688">"Uto, 18:02"</string>
     <string name="screen_zoom_conversation_timestamp_4" msgid="2511469395448561259">"Uto, 18:03"</string>
     <string name="disconnected" msgid="4836600637485526329">"Nije povezan"</string>
-    <string name="data_usage_summary_format" msgid="7507047900192160585">"Količina iskorištenih podataka: <xliff:g id="AMOUNT">%1$s</xliff:g>"</string>
+    <string name="data_usage_summary_format" msgid="7507047900192160585">"Iskorišten podatkovni promet: <xliff:g id="AMOUNT">%1$s</xliff:g>"</string>
     <plurals name="notification_summary" formatted="false" msgid="3941492005316143599">
       <item quantity="one">Isključene za <xliff:g id="COUNT">%d</xliff:g> aplikaciju</item>
       <item quantity="few">Isključene za <xliff:g id="COUNT">%d</xliff:g> aplikacije</item>
@@ -3390,12 +3413,12 @@
     <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 uznemiravaj\" uključeno (<xliff:g id="ID_1">%1$s</xliff:g>)"</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_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>
     <string name="condition_cellular_summary" msgid="1818046558419658463">"Internet je dostupan samo putem Wi-Fi-ja"</string>
-    <string name="condition_bg_data_title" msgid="2483860304802846542">"Ušteda podataka je uključena"</string>
+    <string name="condition_bg_data_title" msgid="2483860304802846542">"Štednja podat. prometa uključ."</string>
     <string name="condition_bg_data_summary" msgid="656957852895282228">"Pozadinski podaci dostupni su samo putem Wi-Fi-ja. To može utjecati na neke aplikacije ili usluge kada Wi-Fi nije dostupan."</string>
     <string name="condition_work_title" msgid="7293722361184366648">"Radni je profil isključen"</string>
     <string name="condition_work_summary" msgid="7543202177571590378">"Isključene su aplikacije, sinkronizacija u pozadini i ostale značajke povezane s vašim radnim profilom."</string>
@@ -3420,9 +3443,12 @@
     <string name="color_temperature" msgid="2070126836910615605">"Hladna temperatura boje"</string>
     <string name="color_temperature_desc" msgid="4793729830226404052">"Upotrebljavaj hladnije boje prikaza"</string>
     <string name="color_temperature_toast" msgid="4974218172133854827">"Da biste primijenili promjenu boje, isključite zaslon"</string>
-    <string name="telephony_monitor_toast" msgid="7003764250271195384">"Da biste primijenili promjenu koju je izvršio TelephonyMonitor, ponovo pokrenite uređaj."</string>
+    <string name="connectivity_monitor_switch" msgid="9059759348648583421">"Monitor povezivanja"</string>
+    <string name="connectivity_monitor_switch_summary" msgid="2828658652378866401">"Monitor povezivanja prikupljat će zapisnike kada otkrije problem s povezivanjem i obavijestiti korisnika da prijavi programsku pogrešku"</string>
+    <string name="connectivity_monitor_toast" msgid="5551859612881173028">"Da biste primijenili promjenu koju je izvršio monitor povezivanja, ponovo pokrenite uređaj."</string>
     <string name="camera_hal_hdrplus_switch" msgid="8377365197105267466">"HAL HDR+ fotoaparata"</string>
     <string name="camera_hal_hdrplus_toast" msgid="2063703797270055299">"Da biste primijenili promjenu HAL HDR+ fotoaparata, ponovo pokrenite uređaj"</string>
+    <string name="camera_laser_sensor_switch" msgid="8913588990743234440">"Laserski senzor fotoaparata"</string>
     <string name="ota_disable_automatic_update" msgid="2319639631655915050">"Automatska ažuriranja sustava"</string>
     <string name="usage" msgid="2977875522080448986">"Potrošnja"</string>
     <string name="cellular_data_usage" msgid="2155683719898158203">"Potrošnja mobilnih podataka"</string>
@@ -3445,32 +3471,32 @@
     </plurals>
     <string name="operator_warning" msgid="1862988028996859195">"Mobilni operater može obračunavati podatke na drugačiji način od uređaja"</string>
     <string name="data_used_template" msgid="3245919669966296505">"Potrošili ste <xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="set_data_warning" msgid="6115364758236594593">"Postavi upozorenje o podacima"</string>
-    <string name="data_warning" msgid="209133958008062117">"Upozorenje o podacima"</string>
-    <string name="set_data_limit" msgid="2901526323210516923">"Postavi ograničenje podataka"</string>
+    <string name="set_data_warning" msgid="6115364758236594593">"Postavi upozorenje o potrošnji"</string>
+    <string name="data_warning" msgid="209133958008062117">"Upozorenje o potrošnji"</string>
+    <string name="set_data_limit" msgid="2901526323210516923">"Postavi ograničenje potrošnje"</string>
     <string name="data_limit" msgid="1885406964934590552">"Ograničenje podataka"</string>
-    <string name="data_usage_template" msgid="392191945602400904">"U razdoblju <xliff:g id="ID_2">%2$s</xliff:g> potrošili ste <xliff:g id="ID_1">%1$s</xliff:g>"</string>
+    <string name="data_usage_template" msgid="2923744765873163859">"<xliff:g id="ID_1">%1$s</xliff:g> iskorišteno <xliff:g id="ID_2">%2$s</xliff:g>"</string>
     <string name="configure" msgid="1029654422228677273">"Konfiguriraj"</string>
     <string name="data_usage_other_apps" msgid="3272872663517382050">"Ostale aplikacije uključene u upotrebu"</string>
     <plurals name="data_saver_unrestricted_summary" formatted="false" msgid="2635267833484232703">
-      <item quantity="one"><xliff:g id="COUNT">%1$d</xliff:g> aplikacija smije upotrebljavati neograničene podatke kada je Ušteda podataka uključena</item>
-      <item quantity="few"><xliff:g id="COUNT">%1$d</xliff:g> aplikacije smiju upotrebljavati neograničene podatke kada je Ušteda podataka uključena</item>
-      <item quantity="other"><xliff:g id="COUNT">%1$d</xliff:g> aplikacija smije upotrebljavati neograničene podatke kada je Ušteda podataka uključena</item>
+      <item quantity="one"><xliff:g id="COUNT">%1$d</xliff:g> aplikacija smije neograničeno upotrebljavati podatkovni promet kad je uključena štednja podatakovnog prometa</item>
+      <item quantity="few"><xliff:g id="COUNT">%1$d</xliff:g> aplikacije smiju neograničeno upotrebljavati podatkovni promet kad je uključena Štednja podatakovnog prometa</item>
+      <item quantity="other"><xliff:g id="COUNT">%1$d</xliff:g> aplikacija smije neograničeno upotrebljavati podatkovni promet kad je uključena Štednja podatakovnog prometa</item>
     </plurals>
-    <string name="data_saver_title" msgid="398458827917495765">"Ušteda podataka"</string>
+    <string name="data_saver_title" msgid="398458827917495765">"Štednja podatkovnog prometa"</string>
     <string name="unrestricted_data_saver" msgid="952796077540228711">"Neograničeni podaci"</string>
     <string name="restrict_background_blacklisted" msgid="3995443391711013068">"Pozadinski su podaci isključeni"</string>
     <string name="data_saver_on" msgid="6774217590237934709">"Uključeno"</string>
     <string name="data_saver_off" msgid="6892309031162738794">"Isključeno"</string>
     <string name="unrestricted_app_title" msgid="4465437191723332066">"Neograničena potroš. podataka"</string>
-    <string name="unrestricted_app_summary" msgid="6458008993501723912">"Dopusti neograničen pristup podacima kada je Ušteda podataka uključena"</string>
+    <string name="unrestricted_app_summary" msgid="6458008993501723912">"Dopusti neograničen pristup podacima kada je Štednja podatkovnog prometa uključena"</string>
     <string name="home_app" msgid="4066188520886810030">"Početna aplikacija"</string>
     <string name="no_default_home" msgid="7184117487704520238">"Nema zadane početne"</string>
     <string name="lockpattern_settings_require_cred_before_startup" msgid="3832020101401318248">"Sigurno pokretanje"</string>
     <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">"Dodaj još jedan otisak prsta"</string>
+    <string name="suggestion_additional_fingerprints" msgid="2214281455363797037">"Dodajte 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>
@@ -3520,7 +3546,7 @@
     <string name="button_confirm_convert_fbe" msgid="7101855374850373091">"Izbriši i pretvori"</string>
     <string name="reset_shortcut_manager_throttling" msgid="6495066467198668994">"Poništi ograničavanje brzine ShortcutManagera"</string>
     <string name="reset_shortcut_manager_throttling_complete" msgid="1826770872063707900">"Ograničavanje brzine ShortcutManagera poništeno je"</string>
-    <string name="notification_suggestion_title" msgid="4506524937307816475">"Kontrola obavijesti zaključanog zaslona"</string>
+    <string name="notification_suggestion_title" msgid="387052719462473500">"Upravljanje informacijama na zaključanom zaslonu"</string>
     <string name="notification_suggestion_summary" msgid="8521159741445416875">"Prikazivanje ili sakrivanje sadržaja obavijesti"</string>
     <string name="page_tab_title_summary" msgid="4070309266374993258">"Sve"</string>
     <string name="page_tab_title_support" msgid="8483187649355540109">"Podrška i savjeti"</string>
@@ -3528,7 +3554,7 @@
     <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>
     <string name="premium_sms_access" msgid="4660047004791638305">"Pristup premium SMS-ovima"</string>
-    <string name="bluetooth_disabled" msgid="2456198532288640046">"Nije vidljiv drugim uređajima"</string>
+    <string name="bluetooth_disabled" msgid="6244000672828617410">"Isključeno"</string>
     <string name="bluetooth_connected_summary" msgid="7672528674593152862">"Povezano s uređajem <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="bluetooth_connected_multiple_devices_summary" msgid="9173661896296663932">"Povezano s više uređaja"</string>
     <string name="demo_mode" msgid="2798762752209330277">"Demo način korisničkog sučelja sustava"</string>
@@ -3610,14 +3636,14 @@
     <string name="ambient_display_title" product="device" msgid="3423781975742145894">"Dvaput dodirnite da biste provjerili uređaj"</string>
     <string name="ambient_display_summary" msgid="525662960806416373">"Da biste pogledali vrijeme, ikone obavijesti i druge informacije, dvaput dodirnite zaslon."</string>
     <string name="ambient_display_suggestion_summary" msgid="5987443721392571847">"Pročitajte obavijesti kada je zaslon isključen"</string>
-    <string name="ambient_display_pickup_title" product="default" msgid="818688002837687268">"Podignite za provjeru telefona"</string>
+    <string name="ambient_display_pickup_title" product="default" msgid="818688002837687268">"Podizanje telefona za provjeru"</string>
     <string name="ambient_display_pickup_title" product="tablet" msgid="4455864282995698097">"Podignite da biste provjerili tablet"</string>
     <string name="ambient_display_pickup_title" product="device" msgid="5380534405773531175">"Podignite da biste provjerili uređaj"</string>
     <string name="ambient_display_pickup_summary" product="default" msgid="4567020486787561873">"Da biste pogledali vrijeme, ikone obavijesti i druge informacije, podignite telefon."</string>
     <string name="ambient_display_pickup_summary" product="tablet" msgid="5435283849947236648">"Da biste pogledali vrijeme, ikone obavijesti i druge informacije, podignite tablet."</string>
     <string name="ambient_display_pickup_summary" product="device" msgid="8256669101643381568">"Da biste pogledali vrijeme, ikone obavijesti i druge informacije, podignite uređaj."</string>
     <string name="ambient_display_pickup_suggestion_summary" msgid="7014700589991761035">"Pročitajte obavijesti kada je zaslon isključen"</string>
-    <string name="fingerprint_swipe_for_notifications_title" msgid="5816346492253270243">"Povlačenje prstom za obavijesti"</string>
+    <string name="fingerprint_swipe_for_notifications_title" msgid="5816346492253270243">"Otisak prsta za obavijesti"</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="default" msgid="1770661868393713922">"Da biste pogledali obavijesti, prijeđite prstom prema dolje po senzoru otiska prsta na stražnjoj strani telefona."</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="tablet" msgid="902719947767712895">"Da biste pogledali obavijesti, prijeđite prstom prema dolje po senzoru otiska prsta na stražnjoj strani tableta."</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="device" msgid="5372926094116306647">"Da biste pogledali obavijesti, prijeđite prstom prema dolje po senzoru otiska prsta na stražnjoj strani uređaja."</string>
@@ -3633,7 +3659,7 @@
     <string name="web_action_enable_title" msgid="4051513950976670853">"Instant aplikacije"</string>
     <string name="web_action_enable_summary" msgid="3108127559723396382">"Veze će se otvarati u aplikacijama čak i ako te aplikacije 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="instant_apps_settings" msgid="8827777916518348213">"Postavke 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>
@@ -3682,7 +3708,9 @@
     <string name="enterprise_privacy_always_on_vpn_personal" msgid="9217774730260037434">"Uvijek uključeni VPN aktiviran je u osobnom profilu"</string>
     <string name="enterprise_privacy_always_on_vpn_work" msgid="7244472958208315814">"Uvijek uključeni VPN aktiviran je u radnom profilu"</string>
     <string name="enterprise_privacy_global_http_proxy" msgid="7936664553416257333">"Postavljen je globalni HTTP proxy"</string>
-    <string name="enterprise_privacy_ca_certs" msgid="5885892204903688909">"Pouzdane vjerodajnice"</string>
+    <string name="enterprise_privacy_ca_certs_device" msgid="2019652712782510262">"Pouzdane vjerodajnice"</string>
+    <string name="enterprise_privacy_ca_certs_personal" msgid="2279084820904076599">"Pouzdane vjerodajnice na vašem osobnom profilu"</string>
+    <string name="enterprise_privacy_ca_certs_work" msgid="6187377647815301809">"Pouzdane vjerodajnice na vašem radnom profilu"</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>
@@ -3750,6 +3778,8 @@
     <string name="carrier_provisioning" msgid="4398683675591893169">"Informacije o uslugama mobilnog operatera"</string>
     <string name="trigger_carrier_provisioning" msgid="3434865918009286187">"Pokretanje usluga mobilnog operatera"</string>
     <string name="new_device_suggestion_title" msgid="698847081680980774">"Što je novo i uzbudljivo?"</string>
-    <string name="new_device_suggestion_summary" msgid="7172709269203435870">"Pogledajte pet najboljih značajki"</string>
+    <string name="new_device_suggestion_summary" product="default" msgid="206396571522515855">"Upoznajte svoj novi telefon"</string>
+    <string name="new_device_suggestion_summary" product="tablet" msgid="393751455688210956">"Upoznajte svoj novi tablet"</string>
+    <string name="new_device_suggestion_summary" product="device" msgid="2939870049868336652">"Upoznajte svoj novi uređaj"</string>
     <string name="disabled_low_ram_device" msgid="3751578499721173344">"Ova značajka nije dostupna na ovom uređaju"</string>
 </resources>
diff --git a/res/values-hu/arrays.xml b/res/values-hu/arrays.xml
index 6034bac..b2e2595 100644
--- a/res/values-hu/arrays.xml
+++ b/res/values-hu/arrays.xml
@@ -100,8 +100,6 @@
     <!-- no translation found for wifi_security_no_eap:0 (2084555984818107151) -->
     <!-- no translation found for wifi_security_no_eap:1 (397579322683471524) -->
     <!-- no translation found for wifi_security_no_eap:2 (1968820975358150484) -->
-    <!-- no translation found for wifi_ap_security:0 (5251664683198623324) -->
-    <!-- no translation found for wifi_ap_security:1 (7989073072260294673) -->
   <string-array name="wifi_eap_method">
     <item msgid="1160193392455075561">"PEAP"</item>
     <item msgid="7981731051382306293">"TLS"</item>
diff --git a/res/values-hu/strings.xml b/res/values-hu/strings.xml
index 738309e..9a1bf65 100644
--- a/res/values-hu/strings.xml
+++ b/res/values-hu/strings.xml
@@ -166,7 +166,7 @@
     <string name="bluetooth_map_acceptance_dialog_text" msgid="8712508202081143737">"A(z) %1$s hozzáférést kér üzeneteihez. Biztosítja a(z) %2$s számára a hozzáférést?"</string>
     <string name="bluetooth_sap_request" msgid="2669762224045354417">"SIM-hozzáférési kérelem"</string>
     <string name="bluetooth_sap_acceptance_dialog_text" msgid="4414253873553608690">"A következő eszköz szeretne hozzáférni az Ön SIM kártyájához: <xliff:g id="DEVICE_NAME_0">%1$s</xliff:g>. A hozzáférés megadásával letiltja eszközén az adatkapcsolatot a csatlakozás idejére. Hozzáférés megadása a következőnek: <xliff:g id="DEVICE_NAME_1">%2$s?</xliff:g>"</string>
-    <string name="bluetooth_device_name_summary" msgid="4757990010751789977">"A többi eszköz számára „<xliff:g id="DEVICE_NAME">^1</xliff:g>” néven jelenik meg"</string>
+    <string name="bluetooth_device_name_summary" msgid="522235742194965734">"A többi eszköz számára „<xliff:g id="DEVICE_NAME">^1</xliff:g>” néven jelenik meg"</string>
     <string name="bluetooth_paired_device_title" msgid="8638994696317952019">"Eszközei"</string>
     <string name="bluetooth_pairing_page_title" msgid="7712127387361962608">"Új eszköz párosítása"</string>
     <string name="date_and_time" msgid="9062980487860757694">"Dátum és idő"</string>
@@ -312,6 +312,8 @@
     <string name="zone_auto" msgid="334783869352026648">"Automatikus időzóna"</string>
     <string name="zone_auto_summaryOn" msgid="6142830927278458314">"Hálózat által megadott időzóna használata"</string>
     <string name="zone_auto_summaryOff" msgid="2597745783162041390">"Hálózat által megadott időzóna használata"</string>
+    <string name="date_time_24hour_auto" msgid="2117383168985653422">"Automatikus 24 órás formátum"</string>
+    <string name="date_time_24hour_auto_summary" msgid="6351812925651480277">"Helyi alapértelmezés használata"</string>
     <string name="date_time_24hour_title" msgid="3203537578602803850">"24 órás formátum"</string>
     <string name="date_time_24hour" msgid="1193032284921000063">"24 órás formátum használata"</string>
     <string name="date_time_set_time_title" msgid="6296795651349047016">"Idő"</string>
@@ -359,8 +361,8 @@
     <string name="fingerprint_add_title" msgid="1926752654454033904">"Ujjlenyomat hozzáadása"</string>
     <string name="fingerprint_enable_keyguard_toggle_title" msgid="5078060939636911795">"képernyőzár"</string>
     <plurals name="security_settings_fingerprint_preference_summary" formatted="false" msgid="624961700033979880">
-      <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> ujjlenyomat beállítása</item>
-      <item quantity="one"><xliff:g id="COUNT_0">%1$d</xliff:g> ujjlenyomat beállítása</item>
+      <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> ujjlenyomat beállítva</item>
+      <item quantity="one"><xliff:g id="COUNT_0">%1$d</xliff:g> ujjlenyomat beállítva</item>
     </plurals>
     <string name="security_settings_fingerprint_preference_summary_none" msgid="1507739327565151923"></string>
     <string name="security_settings_fingerprint_enroll_introduction_title" msgid="3201556857492526098">"Feloldás ujjlenyomattal"</string>
@@ -372,6 +374,9 @@
     <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="1961957425135180242">"Következő"</string>
+    <string name="setup_fingerprint_enroll_skip_title" msgid="362050541117362034">"Kihagyja az ujjlenyomatot?"</string>
+    <string name="setup_fingerprint_enroll_skip_after_adding_lock_text" msgid="958990414356204763">"Az ujjlenyomat beállítása csupán 1-2 percet vesz igénybe. Ha kihagyja ezt a lépést, később a beállításokban megadhatja ujjlenyomatát."</string>
+    <string name="lock_screen_intro_skip_title" msgid="4988210105913705679">"Kihagyja a lezárási képernyőt?"</string>
     <string name="lock_screen_intro_skip_dialog_text_frp" product="tablet" msgid="1581834104051243425">"Az eszköz védelmi funkcióit nem lehet bekapcsolni. Nem fogja tudni megakadályozni, hogy mások használják a táblagépet, ha elveszett, ellopták vagy visszaállították."</string>
     <string name="lock_screen_intro_skip_dialog_text_frp" product="device" msgid="4629503416877189572">"Az eszköz védelmi funkcióit nem lehet bekapcsolni. Nem fogja tudni megakadályozni, hogy mások használják az eszközt, ha elveszett, ellopták vagy visszaállították."</string>
     <string name="lock_screen_intro_skip_dialog_text_frp" product="default" msgid="2423428240245737909">"Az eszköz védelmi funkcióit nem lehet bekapcsolni. Nem fogja tudni megakadályozni, hogy mások használják a telefont ha elveszett, ellopták vagy visszaállították."</string>
@@ -389,7 +394,7 @@
     <string name="security_settings_fingerprint_enroll_start_title" msgid="2068961812439460133">"Érintse meg az érzékelőt"</string>
     <string name="security_settings_fingerprint_enroll_start_message" msgid="3909929328942564524">"Helyezze az ujját az érzékelőre, és emelje fel a rezgést követően"</string>
     <string name="security_settings_fingerprint_enroll_repeat_title" msgid="2819679722403209778">"Emelje fel, majd érintse újra"</string>
-    <string name="security_settings_fingerprint_enroll_repeat_message" msgid="6158989350522518586">"Tartsa ujját felemelve az ujjlenyomat részleteinek hozzáadásához"</string>
+    <string name="security_settings_fingerprint_enroll_repeat_message" msgid="6158989350522518586">"Emelgesse az ujját az ujjlenyomat részleteinek hozzáadásához"</string>
     <string name="security_settings_fingerprint_enroll_finish_title" msgid="7567276170287972230">"Ujjlenyomat hozzáadva"</string>
     <string name="security_settings_fingerprint_enroll_finish_message" msgid="4796715961273420536">"Ha ezt az ikont látja, akkor ujjlenyomata használatával azonosítsa magát vagy engedélyezze a vásárlást."</string>
     <string name="security_settings_fingerprint_enroll_enrolling_skip" msgid="3710211704052369752">"Később"</string>
@@ -457,7 +462,7 @@
     <string name="setup_lock_settings_picker_title" product="tablet" msgid="90329443364067215">"Óvja meg táblagépét"</string>
     <string name="setup_lock_settings_picker_title" product="device" msgid="2399952075134938929">"Óvja meg eszközét"</string>
     <string name="setup_lock_settings_picker_title" product="default" msgid="1572244299605153324">"Óvja meg telefonját"</string>
-    <string name="setup_lock_settings_picker_fingerprint_message" msgid="5585650064305600578">"A nagyobb biztonság érdekében állítson be másodlagos képernyőzárat."</string>
+    <string name="lock_settings_picker_fingerprint_added_security_message" msgid="5768002109707648463">"A nagyobb biztonság érdekében állítson be másodlagos képernyőzárat."</string>
     <string name="setup_lock_settings_picker_message" product="tablet" msgid="8919671129189936210">"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 táblagépet. 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="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>
@@ -588,6 +593,7 @@
     <string name="lockpassword_pin_no_sequential_digits" msgid="680765285206990584">"Növekvő, csökkenő vagy ismétlődő számsor megadása nem engedélyezett"</string>
     <string name="lockpassword_ok_label" msgid="313822574062553672">"OK"</string>
     <string name="lockpassword_cancel_label" msgid="8818529276331121899">"Mégse"</string>
+    <string name="lockpassword_clear_label" msgid="5724429464960458155">"Törlés"</string>
     <string name="lockpattern_tutorial_cancel_label" msgid="6431583477570493261">"Mégse"</string>
     <string name="lockpattern_tutorial_continue_label" msgid="3559793618653400434">"Tovább"</string>
     <string name="lock_setup" msgid="3355847066343753943">"A beállítás megtörtént."</string>
@@ -781,6 +787,7 @@
     <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>
@@ -817,6 +824,8 @@
     <string name="wifi_wps_available_first_item" msgid="4422547079984583502">"WPS elérhető"</string>
     <string name="wifi_wps_available_second_item" msgid="8427520131718215301">" (WPS elérhető)"</string>
     <string name="wifi_wps_nfc_enter_password" msgid="2288214226916117159">"Adja meg hálózati jelszavát"</string>
+    <string name="wifi_carrier_connect" msgid="8174696557882299911">"Szolgáltatói Wi‑Fi-hálózat"</string>
+    <string name="wifi_carrier_content" msgid="4634077285415851933">"Csatlakozás a következőn keresztül: <xliff:g id="NAME">%1%s</xliff:g>"</string>
     <string name="wifi_scan_always_turnon_message" msgid="203123538572122989">"A helymeghatározás pontosságának javítása és egyéb célok érdekében a(z) <xliff:g id="APP_NAME">%1$s</xliff:g> szeretné engedélyezni a hálózatkeresést még kikapcsolt Wi-Fi mellett is.\n\nEngedélyezi ezt az összes olyan alkalmazásnál, amely keresést akar végezni?"</string>
     <string name="wifi_scan_always_turnoff_message" msgid="5538901671131941043">"A kikapcsoláshoz menjen a további elemeket tartalmazó menü Speciális pontjához."</string>
     <string name="wifi_scan_always_confirm_allow" msgid="5355973075896817232">"Engedélyezés"</string>
@@ -834,6 +843,7 @@
     <string name="wifi_connect" msgid="1076622875777072845">"Kapcsolódás"</string>
     <string name="wifi_failed_connect_message" msgid="8491902558970292871">"Nem sikerült hálózathoz csatlakozni."</string>
     <string name="wifi_forget" msgid="8168174695608386644">"Elfelejt"</string>
+    <string name="wifi_modify" msgid="6100248070440710782">"Módosítás"</string>
     <string name="wifi_failed_forget_message" msgid="1348172929201654986">"Nem sikerült elfelejteni a hálózatot."</string>
     <string name="wifi_save" msgid="3331121567988522826">"Mentés"</string>
     <string name="wifi_failed_save_message" msgid="6650004874143815692">"Nem sikerült menteni a hálózatot."</string>
@@ -846,6 +856,7 @@
     <string name="wifi_advanced_titlebar" msgid="4485841401774142908">"Speciális Wi-Fi-beállítások"</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_title" msgid="3471132676909349382">"Hálózati információ"</string>
     <string name="wifi_details_subnet_mask" msgid="6720279144174924410">"Alhálózati maszk"</string>
     <string name="wifi_details_dns" msgid="8648826607751830768">"DNS"</string>
     <string name="wifi_details_ipv6_address_header" msgid="6734119149106422148">"IPv6-címek"</string>
@@ -878,16 +889,15 @@
     <string name="wifi_p2p_cancel_connect_title" msgid="255267538099324413">"Törli a meghívást?"</string>
     <string name="wifi_p2p_cancel_connect_message" msgid="7477756213423749402">"Szeretné törölni a(z) <xliff:g id="PEER_NAME">%1$s</xliff:g> eszközhöz való csatlakozásra vonatkozó meghívást?"</string>
     <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_off_subtext" msgid="5466126533609394170">"Nincs internet- és tartalommegosztás más eszközökkel"</string>
     <string name="wifi_hotspot_tethering_on_subtext" product="tablet" msgid="5752490509369962007">"Táblagép internetkapcsolatának megosztása hotspoton keresztül"</string>
     <string name="wifi_hotspot_tethering_on_subtext" product="default" msgid="6461075246164300670">"Telefon internetkapcsolatának megosztása hotspoton keresztül"</string>
     <string name="wifi_hotspot_on_local_only_subtext" msgid="2068110388011294735">"Az alkalmazás tartalmat oszt meg. Internetkapcsolat megosztásához kapcsolja ki, majd újra be a hotspotot."</string>
-    <string name="wifi_hotspot_name_title" msgid="1341735529132128887">"Wi-Fi-név"</string>
+    <string name="wifi_hotspot_name_title" msgid="8237000746618636778">"Hotspot neve"</string>
     <string name="wifi_hotspot_name_summary_connecting" msgid="3378299995508671967">"<xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g> bekapcsolása…"</string>
     <string name="wifi_hotspot_name_summary_connected" msgid="3888672084861445362">"Más eszközök is csatlakozhatnak a(z) <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g> hotspothoz"</string>
-    <string name="wifi_hotspot_password_title" msgid="1955592302902091281">"Wi-Fi-jelszó"</string>
+    <string name="wifi_hotspot_password_title" msgid="8676859981917573801">"Hotspot jelszava"</string>
     <string name="wifi_hotspot_ap_band_title" msgid="1165801173359290681">"AP-sáv"</string>
     <string name="wifi_hotspot_footer_info_regular" msgid="1203489406068036455">"Hotspot használatával hozzon létre Wi‑Fi-hálózatot további eszközei számára. A hotspot internetet biztosít mobiladat-kapcsolata használatával. A szolgáltató további díjat számíthat fel."</string>
     <string name="wifi_hotspot_footer_info_local_only" msgid="857988412470694109">"Az alkalmazások létrehozhatnak hotspotokat tartalom megosztására a közeli eszközökkel."</string>
@@ -898,7 +908,6 @@
     <string name="wifi_tether_configure_ap_text" msgid="7974681394041609308">"Wifi-hotspot beállítása"</string>
     <string name="wifi_hotspot_configure_ap_text" msgid="5478614731464220432">"Wifi-hotspot beállítása"</string>
     <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">"Wi-Fi-hívás"</string>
     <string name="wifi_calling_suggestion_title" msgid="9008010480466359578">"A Wi-Fi-hívások bekapcsolása"</string>
@@ -939,7 +948,7 @@
     <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="emergency_address_summary" msgid="3266760199681945746">"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>
     <string name="sound_settings" msgid="5534671337768745343">"Hang"</string>
     <string name="all_volume_title" msgid="4296957391257836961">"Hangerő"</string>
@@ -993,6 +1002,7 @@
     <string name="search_settings" msgid="1910951467596035063">"Keresés"</string>
     <string name="search_settings_summary" msgid="9205656546570654169">"Keresési beállítások és előzmények kezelése"</string>
     <string name="search_settings_no_results" msgid="8799027492641230999">"Nincs találat"</string>
+    <string name="search_clear_history" msgid="4196658962573162457">"Előzmények törlése"</string>
     <string name="display_settings" msgid="7965901687241669598">"Megjelenítés"</string>
     <string name="accelerometer_title" msgid="7854608399547349157">"Automatikus képernyőforgatás"</string>
     <string name="color_mode_title" msgid="3159275920408338215">"Élénk színek"</string>
@@ -1065,7 +1075,7 @@
     <string name="ambient_display_screen_title" msgid="4252755516328775766">"Környezeti kijelző"</string>
     <string name="ambient_display_screen_summary_always_on" msgid="7337555569694794132">"Mindig be/Megnövekedett akkumulátorhasználat"</string>
     <string name="ambient_display_screen_summary_notifications" msgid="1449570742600868654">"Új értesítések"</string>
-    <string name="ambient_display_category_triggers" msgid="4359289754456268573">"Mikor jelenjen meg"</string>
+    <string name="ambient_display_category_triggers" msgid="4359289754456268573">"Mikor jelenjen meg?"</string>
     <string name="doze_title" msgid="2375510714460456687">"Új értesítések"</string>
     <string name="doze_summary" msgid="3846219936142814032">"Képernyő felébresztése értesítés érkezésekor"</string>
     <string name="doze_always_on_title" msgid="1046222370442629646">"Mindig bekapcsolva"</string>
@@ -1122,14 +1132,13 @@
     <string name="baseband_version" msgid="1848990160763524801">"Alapsáv verziója"</string>
     <string name="kernel_version" msgid="9192574954196167602">"Kernel verziója"</string>
     <string name="build_number" msgid="3075795840572241758">"Build-szám"</string>
-    <string name="selinux_status" msgid="6212165375172061672">"SELinux állapota"</string>
     <string name="device_info_not_available" msgid="8062521887156825182">"Nem érhető el"</string>
     <string name="device_status_activity_title" msgid="1411201799384697904">"Állapot"</string>
     <string name="device_status" msgid="607405385799807324">"Állapot"</string>
     <string name="device_status_summary" product="tablet" msgid="3292717754497039686">"Az eszköz akkumulátorának és a hálózatnak az állapota, valamint egyéb információk"</string>
     <string name="device_status_summary" product="default" msgid="2599162787451519618">"Telefonszám, jel stb."</string>
     <string name="storage_settings" msgid="4211799979832404953">"Tárhely"</string>
-    <string name="storage_usb_settings" msgid="7293054033137078060">"Tárolás"</string>
+    <string name="storage_usb_settings" msgid="7293054033137078060">"Tárhely"</string>
     <string name="storage_settings_title" msgid="8746016738388094064">"Tárolóhely beállításai"</string>
     <string name="storage_settings_summary" product="nosdcard" msgid="3543813623294870759">"USB-tár leválasztása, és az elérhető tárhely megtekintése"</string>
     <string name="storage_settings_summary" product="default" msgid="9176693537325988610">"SD-kártya leválasztása, a rendelkezésre álló tárhely megtekintése"</string>
@@ -1150,7 +1159,6 @@
     <string name="status_wifi_mac_address" msgid="2202206684020765378">"Wi-Fi eszköz MAC-címe"</string>
     <string name="status_bt_address" msgid="4195174192087439720">"Bluetooth-cím"</string>
     <string name="status_serial_number" msgid="2257111183374628137">"Sorozatszám"</string>
-    <string name="status_unavailable" msgid="7862009036663793314">"Nem érhető el"</string>
     <string name="status_up_time" msgid="7294859476816760399">"Futásidő"</string>
     <string name="status_awake_time" msgid="2393949909051183652">"Készenléti idő"</string>
     <string name="internal_memory" msgid="9129595691484260784">"Belső tárhely"</string>
@@ -1326,6 +1334,7 @@
     <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>
     <string name="reset_dashboard_title" msgid="6254873816990678620">"Beállítások visszaállítása"</string>
+    <string name="reset_dashboard_summary" msgid="4851012632493522755">"Visszaállítható a hálózat, az alkalmazások és az eszköz"</string>
     <string name="reset_network_title" msgid="6166025966016873843">"A Wi-Fi, a mobiladatok és a Bluetooth beállításainak visszaállítása"</string>
     <string name="reset_network_desc" msgid="5547979398298881406">"Az összes hálózati beállítást visszaállítja, például a következőket:\n\n"<li>"Wi‑Fi"</li>\n<li>"Mobiladat"</li>\n<li>"Bluetooth"</li></string>
     <string name="reset_network_button_text" msgid="2035676527471089853">"Beállítások visszaállítása"</string>
@@ -1334,17 +1343,14 @@
     <string name="reset_network_confirm_title" msgid="1759888886976962773">"Visszaállítja?"</string>
     <string name="network_reset_not_available" msgid="7188610385577164676">"A hálózati beállítások visszaállítása nem hajtható végre ennél a felhasználónál"</string>
     <string name="reset_network_complete_toast" msgid="787829973559541880">"A hálózati beállítások vissza lettek állítva."</string>
-    <string name="master_clear_title" msgid="6617679904229218425">"Összes adat törlése (gyári beállítások visszaállítása)"</string>
-    <plurals name="master_clear_with_account_summary" formatted="false" msgid="5911377203778818712">
-      <item quantity="other"><xliff:g id="ACCOUNT_COUNT">%1$d</xliff:g> fiók lesz visszaállítva</item>
-      <item quantity="one">1 fiók lesz visszaállítva</item>
-    </plurals>
-    <string name="master_clear_summary" msgid="6902443944660426951">"A belső tárhely és minden adat visszaállításra kerül"</string>
-    <string name="master_clear_desc" product="tablet" msgid="9146059417023157222">"Ez minden adatot töröl a táblagép "<b>"belső tárolójáról"</b>", többek között: \n \n"<li>"Google Fiókját"</li>\n<li>"A rendszer- és alkalmazásadatokat és beállításokat"</li>" \n "<li>"A letöltött alkalmazásokat"</li></string>
-    <string name="master_clear_desc" product="default" msgid="4800386183314202571">"Ez minden adatot töröl a telefon "<b>"belső tárolójáról"</b>", többek között: \n \n"<li>"Google-fiókját;"</li>\n<li>"a rendszer- és alkalmazásadatokat és beállításokat;"</li>" \n"<li>"a letöltött alkalmazásokat."</li></string>
+    <string name="master_clear_title" msgid="3531267871084279512">"Összes adat törlése (gyári beállítások visszaállítása)"</string>
+    <string name="master_clear_desc" product="tablet" msgid="9146059417023157222">"Ez minden adatot töröl a táblagép "<b>"belső tárhelyéről"</b>", többek között: \n \n"<li>"Google-fiókját"</li>\n<li>"A rendszer- és alkalmazásadatokat és beállításokat"</li>" \n "<li>"A letöltött alkalmazásokat"</li></string>
+    <string name="master_clear_desc" product="default" msgid="4800386183314202571">"Ez minden adatot töröl a telefon "<b>"belső tárhelyéről"</b>", többek között: \n \n"<li>"Google-fiókja"</li>\n<li>"a rendszer- és alkalmazásadatok és beállítások"</li>" \n"<li>"a letöltött alkalmazások"</li></string>
     <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"Jelenleg a következő fiókokba van bejelentkezve:\n"</string>
     <string name="master_clear_other_users_present" product="default" msgid="5161423070702470742">\n\n"Más felhasználók is vannak ezen az eszközön.\n"</string>
     <string name="master_clear_desc_also_erases_external" msgid="1903185203791274237"><li>"Zene"</li>\n<li>"Fotók"</li>\n<li>"Más felhasználói adatok"</li></string>
+    <string name="master_clear_desc_also_erases_esim" msgid="312352697653096008"><li>"Szolgáltatók az eSIM-en"</li></string>
+    <string name="master_clear_desc_no_cancel_mobile_plan" msgid="5460926449093211144">\n\n"Ezzel nem szünteti meg mobil-előfizetését."</string>
     <string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="7744115866662613411">\n\n"A zenék, képek és más felhasználói adatok törléséhez az "<b>"USB-tárat"</b>" is törölnie kell."</string>
     <string name="master_clear_desc_erase_external_storage" product="default" msgid="4801026652617377093">\n\n"A zenék, képek és más felhasználói adatok törléséhez az "<b>"SD-kártyát"</b>" is törölnie kell."</string>
     <string name="erase_external_storage" product="nosdcard" msgid="969364037450286809">"USB-tár törlése"</string>
@@ -1384,7 +1390,7 @@
     <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_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="1308462275952345985">"Hotspot és internetmegosztás használata annak érdekében, hogy internetet biztosítson más eszközöknek mobiladat-kapcsolat segítségével. Az alkalmazások is létrehozhatnak hotspotokat tartalom megosztására a közeli eszközökkel."</string>
+    <string name="tethering_footer_info" msgid="1308462275952345985">"Hotspot és internetmegosztást használhat annak érdekében, hogy internetet biztosítson más eszközöknek mobiladat-kapcsolat segítségével. Az alkalmazások is létrehozhatnak hotspotokat tartalom megosztására a közeli eszközökkel."</string>
     <string name="tethering_help_button_text" msgid="656117495547173630">"Súgó"</string>
     <string name="network_settings_title" msgid="2876509814832830757">"Mobilhálózat"</string>
     <string name="manage_mobile_plan_title" msgid="7630170375010107744">"Mobil-előfizetés"</string>
@@ -1461,15 +1467,16 @@
     <string name="settings_safetylegal_activity_title" msgid="6901214628496951727">"Biztonsági információk"</string>
     <string name="settings_safetylegal_activity_unreachable" msgid="250674109915859456">"Nincs adatkapcsolat. Az információ azonnali megtekintéséhez keresse fel a következő helyet bármelyik számítógépről, amely csatlakozik az internethez: %s."</string>
     <string name="settings_safetylegal_activity_loading" msgid="8059022597639516348">"Betöltés…"</string>
-    <string name="lockpassword_choose_your_password_header" msgid="8624900666929394990">"Adjon meg egy jelszót"</string>
-    <string name="lockpassword_choose_your_password_header_for_fingerprint" msgid="6624409510609085450">"Jelszó az ujjlenyomathoz"</string>
-    <string name="lockpassword_choose_your_pattern_header" msgid="6949761069941694050">"Válassza ki a mintát"</string>
-    <string name="lockpassword_choose_your_pattern_header_for_fingerprint" msgid="5901096361617543819">"Minta az ujjlenyomathoz"</string>
-    <string name="lockpassword_choose_your_pin_header" msgid="7598849519816138302">"Adja meg PIN-kódját"</string>
-    <string name="lockpassword_choose_your_pin_header_for_fingerprint" msgid="765344692615917183">"PIN-kód az ujjlenyomathoz"</string>
-    <string name="lockpassword_confirm_your_password_header" msgid="6308478184889846633">"Jelszó megerősítése"</string>
+    <string name="lockpassword_choose_your_screen_lock_header" msgid="3872462096767152394">"Képernyőzár beállítása"</string>
+    <string name="lockpassword_choose_your_password_message" msgid="1197569283524841412">"A biztonság érdekében állítson be jelszót"</string>
+    <string name="lockpassword_choose_your_password_header_for_fingerprint" msgid="2541818487015343503">"Az ujjlenyomathoz állítson be jelszót"</string>
+    <string name="lockpassword_choose_your_pattern_header_for_fingerprint" msgid="7709785406243556723">"Az ujjlenyomathoz állítson be mintát"</string>
+    <string name="lockpassword_choose_your_pin_message" msgid="1875420718677275646">"A biztonság érdekében állítson be PIN-kódot"</string>
+    <string name="lockpassword_choose_your_pin_header_for_fingerprint" msgid="1549639053195796674">"Ujjlenyomathoz állítsa be a PIN-kódot"</string>
+    <string name="lockpassword_choose_your_pattern_message" msgid="5986983400689720015">"A biztonság érdekében állítson be mintát"</string>
+    <string name="lockpassword_confirm_your_password_header" msgid="1266027268220850931">"Adja meg újra a jelszót"</string>
     <string name="lockpassword_confirm_your_pattern_header" msgid="7543433733032330821">"Erősítse meg a mintát"</string>
-    <string name="lockpassword_confirm_your_pin_header" msgid="49038294648213197">"PIN-kód megerősítése"</string>
+    <string name="lockpassword_confirm_your_pin_header" msgid="7744513791910572550">"Adja meg újra a PIN-kódot"</string>
     <string name="lockpassword_confirm_passwords_dont_match" msgid="5140892109439191415">"A jelszavak nem egyeznek"</string>
     <string name="lockpassword_confirm_pins_dont_match" msgid="7226244811505606217">"A PIN-kódok nem egyeznek"</string>
     <string name="lockpassword_choose_lock_generic_header" msgid="3811438094903786145">"Feloldás kiválasztása"</string>
@@ -1488,6 +1495,12 @@
     <string name="lockpassword_strong_auth_required_work_pattern" msgid="3003781907040522053">"A nagyobb biztonság érdekében használja munkaprofil-feloldási mintáját"</string>
     <string name="lockpassword_strong_auth_required_work_pin" msgid="3367491332598821552">"A nagyobb biztonság érdekében adja meg munkaprofilja PIN-kódját"</string>
     <string name="lockpassword_strong_auth_required_work_password" msgid="8159775129968582940">"A nagyobb biztonság érdekében adja meg munkaprofilja jelszavát"</string>
+    <string name="lockpassword_confirm_your_pattern_details_frp" msgid="6757336656791723193">"Visszaállítottuk az eszköz gyári beállításait. A telefon használatához adja meg az előző mintáját."</string>
+    <string name="lockpassword_confirm_your_pin_details_frp" msgid="826520613445990470">"Visszaállítottuk az eszköz gyári beállításait. A telefon használatához adja meg az előző PIN-kódját."</string>
+    <string name="lockpassword_confirm_your_password_details_frp" msgid="8944081074615739040">"Visszaállítottuk az eszköz gyári beállításait. A telefon használatához adja meg az előző jelszavát."</string>
+    <string name="lockpassword_confirm_your_pattern_header_frp" msgid="2898036091609128286">"Minta ellenőrzése"</string>
+    <string name="lockpassword_confirm_your_pin_header_frp" msgid="4141601774778898803">"PIN-kód ellenőrzése"</string>
+    <string name="lockpassword_confirm_your_password_header_frp" msgid="3762615419295360480">"Jelszó ellenőrzése"</string>
     <string name="lockpassword_invalid_pin" msgid="15588049067548470">"Helytelen PIN-kód"</string>
     <string name="lockpassword_invalid_password" msgid="4038507398784975200">"Helytelen jelszó"</string>
     <string name="lockpattern_need_to_unlock_wrong" msgid="1745247595356012176">"Helytelen minta"</string>
@@ -1537,7 +1550,6 @@
     <string name="install_applications_title" msgid="4987712352256508946">"Összes forrás engedélyezése"</string>
     <string name="recent_app_category_title" msgid="6673071268966003928">"Az utoljára megnyitott alkalmazások"</string>
     <string name="see_all_apps_title" msgid="1317153498074308438">"Mind a(z) <xliff:g id="COUNT">%1$d</xliff:g> alkalmazás megjelenítése"</string>
-    <string name="recent_app_summary" msgid="3366446669844932300">"Ennyi ideje: <xliff:g id="TIME">^1</xliff:g>"</string>
     <string name="install_all_warning" product="tablet" msgid="8310489909586138165">"Az ismeretlen alkalmazások nagyobb eséllyel támadják meg táblagépét és személyes adatait. Az ebből a forrásból származó alkalmazások telepítésével egyidejűleg kijelenti, hogy Ön viseli a felelősséget az alkalmazások használatából eredő, táblagépét vagy személyes adatait ért bármilyen kár vagy bármilyen adatvesztés esetén."</string>
     <string name="install_all_warning" product="default" msgid="1952257127370115988">"Az ismeretlen alkalmazások nagyobb eséllyel támadják meg telefonját és személyes adatait. Az ebből a forrásból származó alkalmazások telepítésével egyidejűleg kijelenti, hogy Ön viseli a felelősséget az alkalmazások használatából eredő, telefonját vagy személyes adatait ért bármilyen kár vagy adatvesztés esetén."</string>
     <string name="advanced_settings" msgid="1777249286757067969">"Speciális beállítások"</string>
@@ -1587,7 +1599,7 @@
     <string name="reset_app_preferences" msgid="1321050641018356925">"Alapbeállítások"</string>
     <string name="reset_app_preferences_title" msgid="6093179367325336662">"Visszaállítja a beállításokat?"</string>
     <string name="reset_app_preferences_desc" msgid="4822447731869201512">"Ez visszaállítja a következőkre vonatkozó összes beállítást:\n\n "<li>"Letiltott alkalmazások"</li>\n" "<li>"Letiltott alkalmazásértesítések"</li>\n" "<li>"Alapértelmezett alkalmazások adott műveletekhez"</li>\n" "<li>"Alkalmazások háttéradat-korlátozása"</li>\n" "<li>"Minden engedélykorlátozás"</li>\n\n" Az alkalmazásadatok nem vesznek el."</string>
-    <string name="reset_app_preferences_button" msgid="2559089511841281242">"Alapbeállítások"</string>
+    <string name="reset_app_preferences_button" msgid="2559089511841281242">"Visszaállítás"</string>
     <string name="manage_space_text" msgid="8852711522447794676">"Tárhely kezelése"</string>
     <string name="filter" msgid="2018011724373033887">"Szűrő"</string>
     <string name="filter_dlg_title" msgid="8693024463731076091">"Válasszon szűrési lehetőségeket"</string>
@@ -1801,7 +1813,7 @@
     <string name="accessibility_settings_summary" msgid="981260486011624939">"Képernyőolvasók, megjelenítés, interakcióvezérlők"</string>
     <string name="vision_settings_title" msgid="4204111425716868288">"Látási beállítások"</string>
     <string name="vision_settings_description" msgid="5679491180156408260">"Eszközét saját igényeinek megfelelően testre szabhatja. Ezeket a kisegítő lehetőségeket később a Beállítások menüben módosíthatja."</string>
-    <string name="vision_settings_suggestion_title" msgid="917294957154878441">"Betűméret növelése"</string>
+    <string name="vision_settings_suggestion_title" msgid="8058794060304707004">"Betűméret módosítása"</string>
     <string name="screen_reader_category_title" msgid="7739154903913400641">"Képernyőolvasók"</string>
     <string name="audio_and_captions_category_title" msgid="3420727114421447524">"Hang és képernyőn megjelenő szöveg"</string>
     <string name="display_category_title" msgid="685461049938269166">"Megjelenítés"</string>
@@ -1838,7 +1850,6 @@
     <string name="accessibility_display_inversion_preference_subtitle" msgid="7052959202195368109">"Ennek hatása lehet a teljesítményre"</string>
     <string name="accessibility_autoclick_preference_title" msgid="7014499339068449623">"Kattintás a mutató megállítását követően"</string>
     <string name="accessibility_autoclick_delay_preference_title" msgid="3962261178385106006">"Késleltetés kattintás előtt"</string>
-    <string name="preference_summary_default_combination" msgid="8532964268242666060">"<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">"BE"</string>
     <string name="accessibility_summary_state_disabled" msgid="2241315620132005595">"KI"</string>
     <string name="enable_quick_setting" msgid="2366999897816894536">"Megjelenítés a Gyorsbeállítások között"</string>
@@ -1957,12 +1968,14 @@
     <string name="background_activity_summary_on" msgid="649282072540085599">"Az alkalmazás futhat a háttérben, amikor nem használja"</string>
     <string name="background_activity_summary_off" msgid="7666330699090632040">"Az alkalmazás háttértevékenységei korlátozva vannak, amikor nem használja"</string>
     <string name="background_activity_summary_disabled" msgid="3710669050484599847">"Az alkalmazás háttérben futása le van tiltva"</string>
+    <string name="background_activity_summary_whitelisted" msgid="7375400051141016808">"Az alkalmazás nem optimalizálható jobb akkumulátorhasználatra"</string>
+    <string name="background_activity_warning_dialog_title" msgid="2216249969149568871">"Korlátozza a háttértevékenységet?"</string>
+    <string name="background_activity_warning_dialog_text" msgid="7049624449246121981">"Ha korlátozza az alkalmazások háttértevékenységét, lehetséges, hogy hibásan fognak működni"</string>
     <string name="device_screen_usage" msgid="3386088035570409683">"Képernyőhasználat teljes feltöltés óta"</string>
     <string name="device_screen_consumption" msgid="4607589286438986687">"A képernyő energiafogyasztása"</string>
     <string name="device_cellular_network" msgid="4724773411762382950">"Mobilhálózat keresése"</string>
-    <string name="power_last_full_charge_summary" msgid="532845389094620657">"Ennyi ideje: <xliff:g id="TIME">^1</xliff:g>"</string>
-    <string name="power_usage_list_summary" msgid="6775339745194635000">"Használat teljes töltés óta (ennyi ideje: <xliff:g id="TIME">^1</xliff:g>)"</string>
-    <string name="power_usage_list_summary_device" msgid="7036566616386864302">"Eszközhasználat a teljes töltés óta (ennyi ideje: <xliff:g id="TIME">^1</xliff:g>)"</string>
+    <string name="power_usage_list_summary" msgid="6393929085382334341">"Alkalmazáshasználat a teljes töltés óta (<xliff:g id="RELATIVE_TIME">^1</xliff:g>)"</string>
+    <string name="power_usage_list_summary_device" msgid="4461926045610455423">"Eszközhasználat a teljes töltés óta (<xliff:g id="RELATIVE_TIME">^1</xliff:g>)"</string>
     <string name="screen_usage_summary" msgid="6687403051423153550">"Képernyőidő teljes töltés óta"</string>
     <string name="device_usage_list_summary" msgid="5623036661468763251">"Eszközhasználat teljes feltöltés óta"</string>
     <string name="battery_since_unplugged" msgid="338073389740738437">"Akkumulátorhasználat a legutolsó töltés óta"</string>
@@ -2210,14 +2223,14 @@
     <string name="credentials_unlock_hint" msgid="2301301378040499348">"Írja be az azonosítótároló jelszavát."</string>
     <string name="credentials_old_password" msgid="7553393815538684028">"Jelenlegi jelszó:"</string>
     <string name="credentials_reset_hint" msgid="6297256880896133631">"Eltávolítja az összes tartalmat?"</string>
-    <string name="credentials_password_too_short" msgid="7502749986405522663">"A jelszónak legalább 8 karakter hosszúnak kell lennie."</string>
     <string name="credentials_wrong_password" msgid="2541932597104054807">"Helytelen jelszó."</string>
     <string name="credentials_reset_warning" msgid="5320653011511797600">"Helytelen jelszó. Már csak egy lehetősége van, mielőtt a hitelesítési adatok tárolója törlődik."</string>
     <string name="credentials_reset_warning_plural" msgid="6514085665301095279">"Helytelen jelszó. <xliff:g id="NUMBER">%1$d</xliff:g> további lehetősége van, mielőtt a hitelesítési adatok tárolóját töröljük."</string>
     <string name="credentials_erased" msgid="2907836028586342969">"Hit. adatok tárolója üres."</string>
     <string name="credentials_not_erased" msgid="7685932772284216097">"Az azonosítótárolót nem lehet törölni."</string>
     <string name="credentials_enabled" msgid="7588607413349978930">"A hitelesítési adatok tárolója engedélyezve van."</string>
-    <string name="credentials_configure_lock_screen_hint" msgid="6757119179588664966">"Az azonosítók tárolásához be kell állítania a zárolási képernyő PIN-kódját vagy jelszavát."</string>
+    <string name="credentials_configure_lock_screen_hint" msgid="8058230497337529036">"A hitelesítésiadat-tároló használatba vétele előtt az eszköznek biztonságos lezárási képernyővel kell rendelkeznie."</string>
+    <string name="credentials_configure_lock_screen_button" msgid="253239765216055321">"KÉPERNYŐZÁR-BEÁLLÍTÁS"</string>
     <string name="usage_access_title" msgid="332333405495457839">"Alkalmazások hozzáféréssel"</string>
     <string name="emergency_tone_title" msgid="1055954530111587114">"Segélyhívás hangja"</string>
     <string name="emergency_tone_summary" msgid="722259232924572153">"Viselkedés beállítása segélyhívás kezdeményezésekor"</string>
@@ -2337,8 +2350,6 @@
     <skip />
     <string name="cant_sync_dialog_title" msgid="2777238588398046285">"Nem lehet manuálisan szinkronizálni"</string>
     <string name="cant_sync_dialog_message" msgid="1938380442159016449">"Az elem szinkronizálása jelenleg le van tiltva. A beállítás módosításához ideiglenesen kapcsolja be a háttéradatokat és az automatikus szinkronizálást."</string>
-    <string name="wimax_settings" msgid="2655139497028469039">"4G"</string>
-    <string name="status_wimax_mac_address" msgid="8390791848661413416">"4G MAC-cím"</string>
     <string name="enter_password" msgid="8035706727471334122">"Az Android indításához írja be jelszavát"</string>
     <string name="enter_pin" msgid="5305333588093263790">"Az Android indításához írja be PIN-kódját"</string>
     <string name="enter_pattern" msgid="4187435713036808566">"Az Android indításához rajzolja le mintáját"</string>
@@ -2352,6 +2363,7 @@
     <string name="misc_files_selected_count" msgid="4647048020823912088">"<xliff:g id="TOTAL">%2$d</xliff:g>/<xliff:g id="NUMBER">%1$d</xliff:g> kiválasztva"</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">"Az összes kijelölése"</string>
+    <string name="data_plan_usage_manage_plans_button_text" msgid="8997761990902708162">"Előfizetések kezelése"</string>
     <string name="data_usage_summary_title" msgid="3804110657238092929">"Adathasználat"</string>
     <string name="data_usage_app_summary_title" msgid="4147258989837459172">"Alkalmazás adathasználata"</string>
     <string name="data_usage_accounting" msgid="7170028915873577387">"A szolgáltató adatszámlálási módja eltérhet az eszközétől."</string>
@@ -2437,6 +2449,9 @@
     <string name="data_usage_metered_mobile" msgid="5423305619126978393">"Mobilhálózatok"</string>
     <string name="data_usage_metered_wifi" msgid="1761738002328299714">"Forgalomkorlátos Wi-Fi-hálózatok"</string>
     <string name="data_usage_metered_wifi_disabled" msgid="727808462375941567">"Forgalomkorlátos hálózat kiválasztásához kapcsolja be a Wi-Fit."</string>
+    <string name="data_usage_metered_auto" msgid="1262028400911918865">"Automatikus"</string>
+    <string name="data_usage_metered_yes" msgid="9217539611385225894">"Mért"</string>
+    <string name="data_usage_metered_no" msgid="4025232961929071789">"Nem mért"</string>
     <string name="data_usage_disclaimer" msgid="6887858149980673444">"A szolgáltató adatszámlálási módja eltérhet az eszközétől."</string>
     <string name="cryptkeeper_emergency_call" msgid="198578731586097145">"Segélyhívás"</string>
     <string name="cryptkeeper_return_to_call" msgid="5613717339452772491">"Hívás folytatása"</string>
@@ -2528,9 +2543,6 @@
     <string name="backup_pw_set_button_text" msgid="2387480910044648795">"Mentési jelszó beállítása"</string>
     <string name="backup_pw_cancel_button_text" msgid="8845630125391744615">"Mégse"</string>
     <string name="additional_system_update_settings_list_item_title" msgid="214987609894661992">"További rendszerfrissítések"</string>
-    <string name="selinux_status_disabled" msgid="924551035552323327">"Letiltva"</string>
-    <string name="selinux_status_permissive" msgid="6004965534713398778">"Engedélyezve"</string>
-    <string name="selinux_status_enforcing" msgid="2252703756208463329">"Kényszerítve"</string>
     <string name="ssl_ca_cert_warning" msgid="2045866713601984673">"Lehet, hogy a hálózat felügyelt"</string>
     <string name="done_button" msgid="1991471253042622230">"Kész"</string>
     <plurals name="ssl_ca_cert_dialog_title" formatted="false" msgid="7145092748045794650">
@@ -2728,6 +2740,7 @@
       <item quantity="other">%d rejtett elem megjelenítése</item>
       <item quantity="one">%d rejtett elem megjelenítése</item>
     </plurals>
+    <string name="dashboard_suggestion_condition_footer_content_description" msgid="2898588191174845961">"Összecsukás"</string>
     <string name="network_dashboard_title" msgid="4771589228992391573">"Hálózat és internet"</string>
     <string name="network_dashboard_summary_mobile" msgid="3851083934739500429">"mobil"</string>
     <string name="network_dashboard_summary_data_usage" msgid="3843261364705042212">"adathasználat"</string>
@@ -2830,8 +2843,14 @@
       <item quantity="other"><xliff:g id="ON_COUNT">%d</xliff:g> automatikus szabály van bekapcsolva</item>
       <item quantity="one">1 automatikus szabály van bekapcsolva</item>
     </plurals>
-    <string name="zen_mode_settings_title" msgid="842308776768942600">"A Ne zavarjanak funkció beállításai"</string>
-    <string name="zen_mode_priority_settings_title" msgid="2623117023031824309">"Csak a prioritást élvezők"</string>
+    <string name="zen_mode_settings_title" msgid="1066226840983908121">"Ne zavarjanak"</string>
+    <string name="zen_mode_behavior_settings_title" msgid="1463303933529313969">"Viselkedés"</string>
+    <string name="zen_mode_behavior_allow_title" msgid="3845615648136218141">"Hangok és rezgések:"</string>
+    <string name="zen_mode_behavior_no_sound" msgid="1219626004723208056">"Hang nélkül"</string>
+    <string name="zen_mode_behavior_total_silence" msgid="6716603819806610626">"Hang nélkül (teljes némítás)"</string>
+    <string name="zen_mode_behavior_no_sound_except" msgid="4968477585788243114">"Hang nélkül, kivéve: <xliff:g id="CATEGORIES">%1$s</xliff:g>"</string>
+    <!-- no translation found for zen_mode_behavior_alarms_only (2423480992071472963) -->
+    <skip />
     <string name="zen_mode_automation_settings_title" msgid="4228995740594063774">"Automatikus szabályok"</string>
     <string name="zen_mode_automation_suggestion_title" msgid="5105443455143476201">"A Ne zavarjanak szabályai"</string>
     <string name="zen_mode_automation_suggestion_summary" msgid="4732808039946935657">"Hangok és rezgések korlátozása"</string>
@@ -2873,13 +2892,15 @@
     <string name="notifications_title" msgid="8086372779371204971">"Értesítések"</string>
     <string name="app_notifications_title" msgid="5810577805218003760">"Alkalmazásértesítések"</string>
     <string name="notification_channel_title" msgid="2260666541030178452">"Értesítés kategóriája"</string>
+    <string name="notification_group_title" msgid="7180506440133859601">"Értesítési kategória csoportja"</string>
     <string name="notification_importance_title" msgid="848692592679312666">"Fontosság"</string>
-    <string name="notification_importance_unspecified" msgid="2196023702875112081">"Döntsön az alkalmazás"</string>
+    <string name="notification_importance_unspecified" msgid="6622173510486113958">"Hang engedélyezése"</string>
     <string name="notification_importance_blocked" msgid="7938180808339386300">"Soha ne jelenjen meg értesítés"</string>
     <string name="notification_importance_min" msgid="5455049524984686275">"Hangjelzés és vizuális megszakítás nélkül"</string>
     <string name="notification_importance_low" msgid="8881468429453766553">"Hang nélkül"</string>
     <string name="notification_importance_default" msgid="5958338024601957516">"Hangjelzés"</string>
     <string name="notification_importance_high" msgid="2082429479238228527">"Hangjelzés és felugró értesítés a képernyőn"</string>
+    <string name="notification_importance_high_silent" msgid="2667033773703765252">"Felugró értesítés a képernyőn"</string>
     <string name="notification_importance_min_title" msgid="6974673091137544803">"Alacsony"</string>
     <string name="notification_importance_low_title" msgid="8131254047772814309">"Közepes"</string>
     <string name="notification_importance_default_title" msgid="9120383978536089489">"Magas"</string>
@@ -2922,8 +2943,13 @@
     <string name="loading_notification_apps" msgid="5031818677010335895">"Alkalmazások betöltése…"</string>
     <string name="app_notifications_off_desc" msgid="4882445501376722969">"Az Android letiltotta a jelen alkalmazás értesítéseinek megjelenését ezen az eszközön"</string>
     <string name="channel_notifications_off_desc" msgid="5899225298718840635">"Az Android letiltotta a jelen értesítési kategória megjelenését ezen az eszközön"</string>
+    <string name="channel_group_notifications_off_desc" msgid="1620950416247316370">"Az Android letiltotta az értesítések jelen csoportjának megjelenését ezen az eszközön"</string>
     <string name="notification_channels" msgid="5346841743182627500">"Kategóriák"</string>
     <string name="notification_channels_other" msgid="5645317113885788226">"Egyéb"</string>
+    <plurals name="notification_group_summary" formatted="false" msgid="3420621520561455358">
+      <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> kategória</item>
+      <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> kategória</item>
+    </plurals>
     <string name="no_channels" msgid="3077375508177744586">"Ez az alkalmazás nem küldött semmilyen értesítést"</string>
     <string name="app_settings_link" msgid="8894946007543660906">"Az alkalmazás további beállításai"</string>
     <string name="app_notification_listing_summary_zero" msgid="6482582965081108108">"Minden alkalmazásnál bekapcsolva"</string>
@@ -3000,12 +3026,14 @@
     <string name="zen_mode_from_starred" msgid="2678345811950997027">"Csak a megcsillagozott névjegyektől"</string>
     <string name="zen_mode_from_none" msgid="8219706639954614136">"Senkitől"</string>
     <string name="zen_mode_alarms" msgid="2165302777886552926">"Riasztások"</string>
+    <!-- no translation found for zen_mode_media_system_other (8900209390529859777) -->
+    <skip />
     <string name="zen_mode_reminders" msgid="5458502056440485730">"Emlékeztetők"</string>
     <string name="zen_mode_events" msgid="7914446030988618264">"Események"</string>
     <string name="zen_mode_all_callers" msgid="584186167367236922">"Minden hívó"</string>
     <string name="zen_mode_selected_callers" msgid="3127598874060615742">"Kijelölt hívók"</string>
     <string name="zen_mode_repeat_callers" msgid="5019521886428322131">"Többször hívó személyek"</string>
-    <string name="zen_mode_repeat_callers_summary" msgid="7192713032364140137">"Ha <xliff:g id="MINUTES">%d</xliff:g> percen belül másodjára is hív valaki, akkor engedélyezze"</string>
+    <string name="zen_mode_repeat_callers_summary" msgid="239685342222975733">"Ha <xliff:g id="MINUTES">%d</xliff:g> percen belül másodjára hív ugyanaz a személy"</string>
     <string name="zen_mode_when" msgid="2767193283311106373">"Auto. bekapcsolás"</string>
     <string name="zen_mode_when_never" msgid="8809494351918405602">"Soha"</string>
     <string name="zen_mode_when_every_night" msgid="3122486110091921009">"Minden este"</string>
@@ -3034,6 +3062,7 @@
     <string name="zen_mode_screen_off_visual_interruptions" msgid="4850792880144382633">"Ha a képernyő ki van kapcsolva"</string>
     <string name="zen_mode_no_visual_interruptions" msgid="8742776003822778472">"Amikor a képernyő be vagy ki van kapcsolva"</string>
     <string name="notification_app_settings_button" msgid="6685640230371477485">"Értesítési beállítások"</string>
+    <string name="suggestion_button_text" msgid="3275010948381252006">"OK"</string>
     <string name="device_feedback" msgid="3238056036766293294">"Visszajelzés küldése az eszközről"</string>
     <string name="restr_pin_enter_admin_pin" msgid="1085834515677448072">"Adja meg a rendszergazdai PIN-kódot"</string>
     <string name="switch_on_text" msgid="1124106706920572386">"Be"</string>
@@ -3218,6 +3247,7 @@
     <string name="usb_summary_file_transfers" msgid="6435943692610175111">"Fájlátvitel"</string>
     <string name="usb_summary_photo_transfers" msgid="8440204169576585250">"Fotók átvitele (PTP)"</string>
     <string name="usb_summary_MIDI" msgid="5687906612187885908">"Eszköz használata MIDI-eszközként"</string>
+    <string name="sms_mirroring_pref" msgid="6475043279147376031">"SMS-tükrözés"</string>
     <string name="background_check_pref" msgid="7550258400138010979">"Háttérellenőrzés"</string>
     <string name="background_check_title" msgid="4534254315824525593">"Teljes hozzáférés a háttérhez"</string>
     <string name="assist_access_context_title" msgid="2269032346698890257">"Képernyő szövegének használata"</string>
@@ -3284,7 +3314,7 @@
     <string name="write_settings_title" msgid="4232152481902542284">"Módosíthatja a rendszerbeállításokat"</string>
     <string name="write_system_settings" msgid="3482913590601096763">"Rendszerbeállítások módosítása"</string>
     <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="permit_write_settings" msgid="658555006453212691">"Rendszerbeállítás-módosítások 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>
@@ -3379,9 +3409,12 @@
     <string name="color_temperature" msgid="2070126836910615605">"Hideg színhőmérséklet"</string>
     <string name="color_temperature_desc" msgid="4793729830226404052">"Hidegebb színhőmérséklet használata a kijelzőn"</string>
     <string name="color_temperature_toast" msgid="4974218172133854827">"A színmódosítások alkalmazásához kapcsolja ki a képernyőt"</string>
-    <string name="telephony_monitor_toast" msgid="7003764250271195384">"A telefonos szolgáltatások figyelésének módosításához indítsa újra az eszközt"</string>
+    <string name="connectivity_monitor_switch" msgid="9059759348648583421">"Kapcsolódásfigyelő"</string>
+    <string name="connectivity_monitor_switch_summary" msgid="2828658652378866401">"A Kapcsolódásfigyelő begyűjti a naplókat, amikor kapcsolódási problémát észlel, és értesítésben javasolja a felhasználónak a hiba jelentését"</string>
+    <string name="connectivity_monitor_toast" msgid="5551859612881173028">"A kapcsolódásfigyelő módosításának engedélyezéséhez indítsa újra az eszközt"</string>
     <string name="camera_hal_hdrplus_switch" msgid="8377365197105267466">"Kamera HAL HDR+"</string>
     <string name="camera_hal_hdrplus_toast" msgid="2063703797270055299">"A Kamera HAL HDR+ módosításához indítsa újra az eszközt"</string>
+    <string name="camera_laser_sensor_switch" msgid="8913588990743234440">"A kamera lézeres érzékelője"</string>
     <string name="ota_disable_automatic_update" msgid="2319639631655915050">"Automatikus rendszerfrissítések"</string>
     <string name="usage" msgid="2977875522080448986">"Használat"</string>
     <string name="cellular_data_usage" msgid="2155683719898158203">"Mobiladat-forgalom"</string>
@@ -3407,7 +3440,7 @@
     <string name="data_warning" msgid="209133958008062117">"Adatforgalmi figyelmeztetés"</string>
     <string name="set_data_limit" msgid="2901526323210516923">"Adatkorlát beállítása"</string>
     <string name="data_limit" msgid="1885406964934590552">"Adatforgalmi korlátozás"</string>
-    <string name="data_usage_template" msgid="392191945602400904">"<xliff:g id="ID_1">%1$s</xliff:g> felhasználva a következő időszakban: <xliff:g id="ID_2">%2$s</xliff:g>"</string>
+    <string name="data_usage_template" msgid="2923744765873163859">"<xliff:g id="ID_1">%1$s</xliff:g> felhasználva (<xliff:g id="ID_2">%2$s</xliff:g>)"</string>
     <string name="configure" msgid="1029654422228677273">"Beállítás"</string>
     <string name="data_usage_other_apps" msgid="3272872663517382050">"Adathasználat – egyéb alkalmazások"</string>
     <plurals name="data_saver_unrestricted_summary" formatted="false" msgid="2635267833484232703">
@@ -3476,7 +3509,7 @@
     <string name="button_confirm_convert_fbe" msgid="7101855374850373091">"Törlés és konvertálás"</string>
     <string name="reset_shortcut_manager_throttling" msgid="6495066467198668994">"Visszaállítja a ShortcutManager gyakoriságkorlátozását"</string>
     <string name="reset_shortcut_manager_throttling_complete" msgid="1826770872063707900">"A ShortcutManager gyakoriságkorlátozása visszaállítva"</string>
-    <string name="notification_suggestion_title" msgid="4506524937307816475">"Lezárási képernyő értesítéseinek kezelése"</string>
+    <string name="notification_suggestion_title" msgid="387052719462473500">"A lezárási képernyő adatainak kezelése"</string>
     <string name="notification_suggestion_summary" msgid="8521159741445416875">"Értesítéstartalom megjelenítése vagy elrejtése"</string>
     <string name="page_tab_title_summary" msgid="4070309266374993258">"Összes"</string>
     <string name="page_tab_title_support" msgid="8483187649355540109">"Súgó és tippek"</string>
@@ -3484,7 +3517,7 @@
     <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>
     <string name="premium_sms_access" msgid="4660047004791638305">"Prémium sms-hozzáférés"</string>
-    <string name="bluetooth_disabled" msgid="2456198532288640046">"Nem látható más eszközök számára"</string>
+    <string name="bluetooth_disabled" msgid="6244000672828617410">"Kikapcsolva"</string>
     <string name="bluetooth_connected_summary" msgid="7672528674593152862">"A(z) <xliff:g id="ID_1">%1$s</xliff:g> eszközhöz csatlakozik"</string>
     <string name="bluetooth_connected_multiple_devices_summary" msgid="9173661896296663932">"Több eszközhöz csatlakozik"</string>
     <string name="demo_mode" msgid="2798762752209330277">"A rendszer kezelőfelületének demómódja"</string>
@@ -3563,7 +3596,7 @@
     <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="525662960806416373">"Az idő, az értesítési ikonok és egyéb információk megjelenítéséhez koppintson kétszer a képernyőre."</string>
     <string name="ambient_display_suggestion_summary" msgid="5987443721392571847">"Ellenőrizze az értesítéseket, ha a képernyő ki van kapcsolva"</string>
-    <string name="ambient_display_pickup_title" product="default" msgid="818688002837687268">"Ellenőrzés a telefon felemelésével"</string>
+    <string name="ambient_display_pickup_title" product="default" msgid="818688002837687268">"Ellenőrzés felemeléssel"</string>
     <string name="ambient_display_pickup_title" product="tablet" msgid="4455864282995698097">"Ellenőrzés a táblagép felemelésével"</string>
     <string name="ambient_display_pickup_title" product="device" msgid="5380534405773531175">"Ellenőrzés az eszköz felemelésével"</string>
     <string name="ambient_display_pickup_summary" product="default" msgid="4567020486787561873">"Az idő, az értesítési ikonok és egyéb információk megjelenítéséhez vegye a kezébe telefonját."</string>
@@ -3586,7 +3619,7 @@
     <string name="web_action_enable_title" msgid="4051513950976670853">"Azonnali alkalmazások"</string>
     <string name="web_action_enable_summary" msgid="3108127559723396382">"Linkek megnyitása alkalmazásokban, akkor is, ha nincsenek telepítve"</string>
     <string name="web_action_section_title" msgid="7364647086538399136">"Azonnali alkalmazások"</string>
-    <string name="instant_apps_account" msgid="1433620209791992528">"Az azonnali alkalmazásokhoz tartozó fiók"</string>
+    <string name="instant_apps_settings" msgid="8827777916518348213">"Instant Apps-beállítások"</string>
     <string name="domain_url_section_title" msgid="7046835219056428883">"Telepített alkalmazások"</string>
     <string name="automatic_storage_manager_activation_warning" msgid="6353100011690933254">"Tárhelyét mostantól a tárhelykezelő kezeli"</string>
     <string name="account_for_section_header" msgid="5356566418548737121">"<xliff:g id="USER_NAME">%1$s</xliff:g> fiókjai"</string>
@@ -3633,7 +3666,9 @@
     <string name="enterprise_privacy_always_on_vpn_personal" msgid="9217774730260037434">"A „mindig bekapcsolt VPN” lehetőség be van kapcsolva az Ön személyes profiljában"</string>
     <string name="enterprise_privacy_always_on_vpn_work" msgid="7244472958208315814">"A „mindig bekapcsolt VPN” lehetőség be van kapcsolva az Ön munkaprofiljában"</string>
     <string name="enterprise_privacy_global_http_proxy" msgid="7936664553416257333">"Globális HTTP proxy beállítva"</string>
-    <string name="enterprise_privacy_ca_certs" msgid="5885892204903688909">"Megbízható hitelesítési adatok"</string>
+    <string name="enterprise_privacy_ca_certs_device" msgid="2019652712782510262">"Megbízható hitelesítési adatok"</string>
+    <string name="enterprise_privacy_ca_certs_personal" msgid="2279084820904076599">"Megbízható hitelesítési adatok a személyes profilban"</string>
+    <string name="enterprise_privacy_ca_certs_work" msgid="6187377647815301809">"Megbízható hitelesítési adatok a munkaprofilban"</string>
     <plurals name="enterprise_privacy_number_ca_certs" formatted="false" msgid="526375234629534165">
       <item quantity="other">Legalább <xliff:g id="COUNT_1">%d</xliff:g> CA tanúsítvány</item>
       <item quantity="one">Legalább <xliff:g id="COUNT_0">%d</xliff:g> CA tanúsítvány</item>
@@ -3696,6 +3731,8 @@
     <string name="carrier_provisioning" msgid="4398683675591893169">"Információ a szolgáltatói hozzáférésről"</string>
     <string name="trigger_carrier_provisioning" msgid="3434865918009286187">"Szolgáltatói ellátás aktiválása"</string>
     <string name="new_device_suggestion_title" msgid="698847081680980774">"Mi új és említésre méltó?"</string>
-    <string name="new_device_suggestion_summary" msgid="7172709269203435870">"Tekintse meg az 5 legnépszerűbb funkciót"</string>
+    <string name="new_device_suggestion_summary" product="default" msgid="206396571522515855">"Az új telefon bemutatójának megtekintése"</string>
+    <string name="new_device_suggestion_summary" product="tablet" msgid="393751455688210956">"Az új táblagép bemutatójának megtekintése"</string>
+    <string name="new_device_suggestion_summary" product="device" msgid="2939870049868336652">"Az új eszköz bemutatójának megtekintése"</string>
     <string name="disabled_low_ram_device" msgid="3751578499721173344">"Ez a funkció nem áll rendelkezésre ezen az eszközön"</string>
 </resources>
diff --git a/res/values-hy/arrays.xml b/res/values-hy/arrays.xml
index a09f5d5..516d688 100644
--- a/res/values-hy/arrays.xml
+++ b/res/values-hy/arrays.xml
@@ -100,8 +100,6 @@
     <!-- no translation found for wifi_security_no_eap:0 (2084555984818107151) -->
     <!-- no translation found for wifi_security_no_eap:1 (397579322683471524) -->
     <!-- no translation found for wifi_security_no_eap:2 (1968820975358150484) -->
-    <!-- no translation found for wifi_ap_security:0 (5251664683198623324) -->
-    <!-- no translation found for wifi_ap_security:1 (7989073072260294673) -->
   <string-array name="wifi_eap_method">
     <item msgid="1160193392455075561">"PEAP"</item>
     <item msgid="7981731051382306293">"TLS"</item>
@@ -340,7 +338,7 @@
     <item msgid="2098976479485046797">"Ձայնի հիմնական բարձրություն"</item>
     <item msgid="5660213838861789350">"Ձայնի բարձրություն"</item>
     <item msgid="7983336752371254444">"Զանգի բարձրություն"</item>
-    <item msgid="7878027809189330917">"Մեդիանյութերի ձայնի բարձրություն"</item>
+    <item msgid="7878027809189330917">"Մուլտիմեդիայի ձայնը"</item>
     <item msgid="7260546305036218513">"Զարթուցիչի ձայնի բարձրություն"</item>
     <item msgid="9103719301075748925">"Ծանուցման ձայնի բարձրություն"</item>
     <item msgid="7025966722295861512">"Bluetooth-ի ձայնի բարձրություն"</item>
diff --git a/res/values-hy/strings.xml b/res/values-hy/strings.xml
index dff856e..7465421 100644
--- a/res/values-hy/strings.xml
+++ b/res/values-hy/strings.xml
@@ -166,7 +166,7 @@
     <string name="bluetooth_map_acceptance_dialog_text" msgid="8712508202081143737">"%1$s-ը ցանկանում է մատչել ձեր հաղորդագրությունները: Մուտք տա՞լ %2$s-ին:"</string>
     <string name="bluetooth_sap_request" msgid="2669762224045354417">"SIM քարտից օգտվելու հարցում"</string>
     <string name="bluetooth_sap_acceptance_dialog_text" msgid="4414253873553608690">"<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g> սարքը ցանկանում է օգտվել ձեր SIM քարտի տվյալներից: Եթե թույլ տաք օգտվել SIM քարտից, տվյալների կապակցելիությունը կանջատվի սարքի վրա կապակցման ընթացքում: Թույլատրել <xliff:g id="DEVICE_NAME_1">%2$s?</xliff:g> սարքին"</string>
-    <string name="bluetooth_device_name_summary" msgid="4757990010751789977">"Այլ սարքերին տեսանելի է որպես «<xliff:g id="DEVICE_NAME">^1</xliff:g>»"</string>
+    <string name="bluetooth_device_name_summary" msgid="522235742194965734">"Մյուս սարքերին տեսանելի է որպես «<xliff:g id="DEVICE_NAME">^1</xliff:g>»"</string>
     <string name="bluetooth_paired_device_title" msgid="8638994696317952019">"Ձեր սարքերը"</string>
     <string name="bluetooth_pairing_page_title" msgid="7712127387361962608">"Նոր սարքի զուգակցում"</string>
     <string name="date_and_time" msgid="9062980487860757694">"Ամսաթիվ և ժամ"</string>
@@ -297,10 +297,10 @@
     <string name="roaming_disable" msgid="1295279574370898378">"Միանալ տվյալների փոխանցման ծառայություններին ռոումինգում"</string>
     <string name="roaming_reenable_message" msgid="9141007271031717369">"Դուք կորցրել եք տվյալների կապը, քանի որ անջատված եք թողել ձեր գլխավոր ցանցի տվյալների ռոումինգը:"</string>
     <string name="roaming_turn_it_on_button" msgid="4387601818162120589">"Միացնել"</string>
-    <string name="roaming_warning" msgid="4275443317524544705">"Դրա համար ձեզանից կարող են զգալի վճարներ գանձվել:"</string>
+    <string name="roaming_warning" msgid="4275443317524544705">"Դրա համար ձեզանից կարող են խոշոր վճարներ գանձվել:"</string>
     <string name="roaming_warning_multiuser" product="tablet" msgid="6458990250829214777">"Երբ դուք թույլատրում եք տվյալների ռոումինգը, հնարավոր է` ձեզնից գանձվեն զգալի գումարային վճարներ:\n\nԱյս կարգավորումը վերաբերում է պլանշետի բոլոր օգտատերերին:"</string>
     <string name="roaming_warning_multiuser" product="default" msgid="6368421100292355440">"Երբ դուք թույլատրում եք ռոումինգային տվյալները, հնարավոր է` ձեզնից գանձվեն զգալի գումարային վճարներ:\n\nԱյս կարգավորումը վերաբերում է հեռախոսի բոլոր օգտատերերին:"</string>
-    <string name="roaming_reenable_title" msgid="6068100976707316772">"Թույլատրե՞լ տվյալների ռոումինգը:"</string>
+    <string name="roaming_reenable_title" msgid="6068100976707316772">"Թույլատրե՞լ տվյալների ռոումինգը"</string>
     <string name="networks" msgid="6333316876545927039">"Օպերատորի ընտրություն"</string>
     <string name="sum_carrier_select" msgid="3616956422251879163">"Ընտրել ցանցի օպերատորին"</string>
     <string name="date_and_time_settings_title" msgid="3350640463596716780">"Ամսաթիվ և ժամ"</string>
@@ -312,6 +312,8 @@
     <string name="zone_auto" msgid="334783869352026648">"Ցանցի ժամային գոտի"</string>
     <string name="zone_auto_summaryOn" msgid="6142830927278458314">"Օգտագործել ցանցի ժամային գոտին"</string>
     <string name="zone_auto_summaryOff" msgid="2597745783162041390">"Օգտագործել ցանցի ժամային գոտին"</string>
+    <string name="date_time_24hour_auto" msgid="2117383168985653422">"Ավտոմատ 24-ժամյա ձևաչափ"</string>
+    <string name="date_time_24hour_auto_summary" msgid="6351812925651480277">"Օգտագործել տեղույթի կանխադրված կարգավորումը"</string>
     <string name="date_time_24hour_title" msgid="3203537578602803850">"24-ժամյա ձևաչափ"</string>
     <string name="date_time_24hour" msgid="1193032284921000063">"Օգտագործել 24-ժամյա ձևաչափը"</string>
     <string name="date_time_set_time_title" msgid="6296795651349047016">"Ժամը"</string>
@@ -342,7 +344,7 @@
     <string name="location_settings_title" msgid="1369675479310751735">"Տեղադրություն"</string>
     <string name="account_settings_title" msgid="626177544686329806">"Հաշիվներ"</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_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>
@@ -372,6 +374,9 @@
     <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="1961957425135180242">"Հաջորդը"</string>
+    <string name="setup_fingerprint_enroll_skip_title" msgid="362050541117362034">"Բա՞ց թողնել"</string>
+    <string name="setup_fingerprint_enroll_skip_after_adding_lock_text" msgid="958990414356204763">"Մատնահետքի կարգավորումն ընդամենը մեկ-երկու րոպե է տևում: Եթե բաց թողնեք, ավելի ուշ կարող եք անցնել կարգավորումներ և ավելացնել ձեր մատնահետքը:"</string>
+    <string name="lock_screen_intro_skip_title" msgid="4988210105913705679">"Բա՞ց թողնել"</string>
     <string name="lock_screen_intro_skip_dialog_text_frp" product="tablet" msgid="1581834104051243425">"Սարքի պաշտպանության գործառույթները չեն միացվելու: Դուք չեք կարողանա կանխել այլ անձանց կողմից այս պլանշետի օգտագործումը՝ այն կորցնելու, գողանալու կամ վերակայելու դեպքում:"</string>
     <string name="lock_screen_intro_skip_dialog_text_frp" product="device" msgid="4629503416877189572">"Սարքի պաշտպանության գործառույթները չեն միացվելու: Դուք չեք կարողանա կանխել այլ անձանց կողմից այս սարքի օգտագործումը՝ այն կորցնելու, գողանալու կամ վերակայելու դեպքում:"</string>
     <string name="lock_screen_intro_skip_dialog_text_frp" product="default" msgid="2423428240245737909">"Սարքի պաշտպանության գործառույթները չեն միացվելու: Դուք չեք կարողանա կանխել այլ անձանց կողմից այս հեռախոսի օգտագործումը՝ այն կորցնելու, գողանալու կամ վերակայելու դեպքում:"</string>
@@ -401,7 +406,7 @@
     <string name="security_settings_fingerprint_enroll_touch_dialog_message" msgid="2989019978041986175">"Ցուցամատով հպեք հեռախոսի հետևում գտնվող սկաներին:"</string>
     <string name="security_settings_fingerprint_enroll_error_dialog_title" msgid="3618021988442639280">"Գրանցումը չի ավարտվել"</string>
     <string name="security_settings_fingerprint_enroll_error_timeout_dialog_message" msgid="2942551158278899627">"Մատնահետքի գրանցման ժամանակը սպառվել է: Փորձեք նորից:"</string>
-    <string name="security_settings_fingerprint_enroll_error_generic_dialog_message" msgid="3624760637222239293">"Մատնահետքը չգրանցվեց: Փորձեք նորից կամ փորձեք այլ մատ:"</string>
+    <string name="security_settings_fingerprint_enroll_error_generic_dialog_message" msgid="3624760637222239293">"Մատնահետքը չգրանցվեց: Փորձեք նորից կամ ուրիշ մատով:"</string>
     <string name="fingerprint_enroll_button_add" msgid="6317978977419045463">"Նոր մատնահետք"</string>
     <string name="fingerprint_enroll_button_next" msgid="6247009337616342759">"Հաջորդը"</string>
     <string name="security_settings_fingerprint_enroll_disclaimer" msgid="2624905914239271751">"Բացի հեռախոսը ապակողպելուց՝ մատնահետքը կարող եք նաև օգտագործել գնումները հաստատելու և հավելվածներից օգտվելու համար: "<annotation id="url">"Մանրամասն"</annotation></string>
@@ -457,7 +462,7 @@
     <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="lock_settings_picker_fingerprint_added_security_message" msgid="5768002109707648463">"Ապահովության համար սահմանեք էկրանի կողպման լրացուցիչ եղանակ:"</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>
@@ -496,7 +501,7 @@
     <string name="unlock_set_unlock_mode_password" msgid="1203938057264146610">"Գաղտնաբառ"</string>
     <string name="unlock_setup_wizard_fingerprint_details" msgid="7893457665921363009">"Էկրանի կողպումը կարգավորելուց հետո կարող եք ավելացնել ձեր մատնահետքը Կարգավորումներ &gt; Անվտանգություն ընտրացանկում:"</string>
     <string name="unlock_disable_lock_title" msgid="1427036227416979120">"Անջատել էկրանի կողպումը"</string>
-    <string name="unlock_disable_frp_warning_title" msgid="264008934468492550">"Հեռացնե՞լ սարքի պաշտպանությունը:"</string>
+    <string name="unlock_disable_frp_warning_title" msgid="264008934468492550">"Անջատե՞լ սարքի պաշտպանությունը"</string>
     <string name="unlock_disable_frp_warning_title_profile" msgid="5507136301904313583">"Հեռացնե՞լ պրոֆիլի պաշտպանությունը:"</string>
     <string name="unlock_disable_frp_warning_content_pattern" msgid="8869767290771023461">"Առանց ապակողպման նախշի սարքի պաշտպանության գործառույթները չեն աշխատի։"</string>
     <string name="unlock_disable_frp_warning_content_pattern_fingerprint" msgid="2986105377420905314">"Սարքի պաշտպանության գործառույթները չեն աշխատի առանց ձեր ապակողպման նախշի:<xliff:g id="EMPTY_LINE">
@@ -588,16 +593,17 @@
     <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="lockpassword_clear_label" msgid="5724429464960458155">"Մաքրել"</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="number_of_device_admins_none" msgid="7185056721919496069">"Ակտիվ հավելվածներ չկան"</string>
     <plurals name="number_of_device_admins" formatted="false" msgid="3361891840111523393">
-      <item quantity="one"><xliff:g id="COUNT_1">%d</xliff:g> active apps</item>
+      <item quantity="one"><xliff:g id="COUNT_1">%d</xliff:g> ակտիվ հավելված</item>
       <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> ակտիվ հավելված</item>
     </plurals>
-    <string name="manage_trust_agents" msgid="4629279457536987768">"Trust agents"</string>
+    <string name="manage_trust_agents" msgid="4629279457536987768">"Վստահության գործակալներ"</string>
     <string name="disabled_because_no_backup_security" msgid="6877660253409580377">"Օգտագործելու համար նախ սահմանեք էկրանի կողպման եղանակը"</string>
     <string name="manage_trust_agents_summary" msgid="1475819820389620546">"Ոչ մի"</string>
     <plurals name="manage_trust_agents_summary_on" formatted="false" msgid="3935182396726101824">
@@ -781,6 +787,7 @@
     <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,6 +824,8 @@
     <string name="wifi_wps_available_first_item" msgid="4422547079984583502">"WPS-ը հասանելի է"</string>
     <string name="wifi_wps_available_second_item" msgid="8427520131718215301">" (WPS-ը հասանելի է)"</string>
     <string name="wifi_wps_nfc_enter_password" msgid="2288214226916117159">"Մուտքագրեք ձեր ցանցի գաղտնաբառը"</string>
+    <string name="wifi_carrier_connect" msgid="8174696557882299911">"Օպերատորի Wi‑Fi ցանց"</string>
+    <string name="wifi_carrier_content" msgid="4634077285415851933">"Միանալ <xliff:g id="NAME">%1%s</xliff:g>-ի միջոցով"</string>
     <string name="wifi_scan_always_turnon_message" msgid="203123538572122989">"Տեղադրության ճշգրտությունը կատարելագործելու կամ այլ նպատակների համար` <xliff:g id="APP_NAME">%1$s</xliff:g>-ը ցանկանում է միացնել ցանցի սկանավորումը, նույնիսկ եթե Wi-Fi-ը անջատված է:\n\nԹույլատրե՞լ բոլոր սկանավորում ցանկացող ծրագրերին:"</string>
     <string name="wifi_scan_always_turnoff_message" msgid="5538901671131941043">"Սա անջատելու համար գերբեռնված ցանկում անցեք Ընդլայնված:"</string>
     <string name="wifi_scan_always_confirm_allow" msgid="5355973075896817232">"Թույլատրել"</string>
@@ -834,18 +843,20 @@
     <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_modify" msgid="6100248070440710782">"Փոփոխել"</string>
     <string name="wifi_failed_forget_message" msgid="1348172929201654986">"Ցանցը մոռանալ չհաջողվեց"</string>
     <string name="wifi_save" msgid="3331121567988522826">"Պահել"</string>
     <string name="wifi_failed_save_message" msgid="6650004874143815692">"Չհաջողվեց պահել ցանցը"</string>
     <string name="wifi_cancel" msgid="6763568902542968964">"Չեղարկել"</string>
     <string name="wifi_saved_access_points_titlebar" msgid="2996149477240134064">"Պահված ցանցեր"</string>
     <plurals name="wifi_saved_access_points_summary" formatted="false" msgid="6094679048871529675">
-      <item quantity="one">%d networks</item>
+      <item quantity="one">%d ցանց</item>
       <item quantity="other">%d ցանց</item>
     </plurals>
     <string name="wifi_advanced_titlebar" msgid="4485841401774142908">"Ընդլայնված Wi‑Fi"</string>
     <string name="wifi_advanced_mac_address_title" msgid="6571335466330978393">"MAC հասցե"</string>
     <string name="wifi_advanced_ip_address_title" msgid="6215297094363164846">"IP հասցե"</string>
+    <string name="wifi_details_title" msgid="3471132676909349382">"Ցանցի տեղեկություններ"</string>
     <string name="wifi_details_subnet_mask" msgid="6720279144174924410">"Ենթացանցի դիմակ"</string>
     <string name="wifi_details_dns" msgid="8648826607751830768">"DNS"</string>
     <string name="wifi_details_ipv6_address_header" msgid="6734119149106422148">"IPv6 հասցեներ"</string>
@@ -878,16 +889,15 @@
     <string name="wifi_p2p_cancel_connect_title" msgid="255267538099324413">"Չեղարկե՞լ հրավերը:"</string>
     <string name="wifi_p2p_cancel_connect_message" msgid="7477756213423749402">"Ցանկանու՞մ եք չեղարկել <xliff:g id="PEER_NAME">%1$s</xliff:g>-ին միացման հրավերը:"</string>
     <string name="wifi_p2p_delete_group_message" msgid="834559380069647086">"Մոռանա՞լ այս խումբը:"</string>
-    <string name="wifi_tether_checkbox_text" msgid="1847167643625779136">"Դյուրակիր Wi‑Fi թեժ կետ"</string>
     <string name="wifi_hotspot_checkbox_text" msgid="7763495093333664887">"Wi-Fi թեժ կետ"</string>
-    <string name="wifi_hotspot_off_subtext" msgid="5466126533609394170">"Ինտերնետ կապը կամ բովանդակությունը այլ սարքերին չի տրամադրում"</string>
+    <string name="wifi_hotspot_off_subtext" msgid="5466126533609394170">"Ինտերնետն ու բովանդակությունը հասանելի չեն ուրիշ սարքերի"</string>
     <string name="wifi_hotspot_tethering_on_subtext" product="tablet" msgid="5752490509369962007">"Այս պլանշետն ինտերնետ կապը տրամադրվում է թեժ կետի միջոցով"</string>
     <string name="wifi_hotspot_tethering_on_subtext" product="default" msgid="6461075246164300670">"Այս հեռախոսն ինտերնետ կապը տրամադրվում է թեժ կետի միջոցով"</string>
     <string name="wifi_hotspot_on_local_only_subtext" msgid="2068110388011294735">"Հավելվածը տրամադրում է բովանդակություն: Ինտերնետ կապ տրամադրելու համար անջատեք, ապա կրկին միացրեք թեժ կետը"</string>
-    <string name="wifi_hotspot_name_title" msgid="1341735529132128887">"Wi‑Fi-ի անվանումը"</string>
+    <string name="wifi_hotspot_name_title" msgid="8237000746618636778">"Թեժ կետի անվանումը"</string>
     <string name="wifi_hotspot_name_summary_connecting" msgid="3378299995508671967">"<xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>-ը միանում է…"</string>
     <string name="wifi_hotspot_name_summary_connected" msgid="3888672084861445362">"Այլ սարքերը կարող են միանալ <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>-ին"</string>
-    <string name="wifi_hotspot_password_title" msgid="1955592302902091281">"Wi-Fi-ի գաղտնաբառը"</string>
+    <string name="wifi_hotspot_password_title" msgid="8676859981917573801">"Թեժ կետի գաղտնաբառը"</string>
     <string name="wifi_hotspot_ap_band_title" msgid="1165801173359290681">"Հաճախականությունների դիապազոն"</string>
     <string name="wifi_hotspot_footer_info_regular" msgid="1203489406068036455">"Թեժ կետն օգտագործեք ձեր այլ սարքերի համար Wi‑Fi ցանց ստեղծելու համար: Թեժ կետը տրամադրում է ինտերնետ կապ բջջային ցանցի միջոցով: Բջջային ինտերնետի համար կարող են լրացուցիչ վճարներ գանձվել:"</string>
     <string name="wifi_hotspot_footer_info_local_only" msgid="857988412470694109">"Հավելվածները կարող են ստեղծել թեժ կետ՝ բովանդակությունը մոտակա սարքերին փոխանցելու համար:"</string>
@@ -898,7 +908,6 @@
     <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">"Android թեժ կետ"</string>
     <string name="wifi_calling_settings_title" msgid="4102921303993404577">"Զանգեր Wi-Fi-ի միջոցով"</string>
     <string name="wifi_calling_suggestion_title" msgid="9008010480466359578">"Միացրեք Wi-Fi զանգերը"</string>
@@ -939,7 +948,7 @@
     <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="emergency_address_summary" msgid="3266760199681945746">"Հասցե, որն արտակարգ իրավիճակների ծառայության կողմից օգտագործվում է որպես ձեր տեղորոշում Wi‑Fi-ի միջոցով շտապ կանչ կատարելու դեպքում"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"Էկրան"</string>
     <string name="sound_settings" msgid="5534671337768745343">"Ձայն"</string>
     <string name="all_volume_title" msgid="4296957391257836961">"Հնչողությունը"</string>
@@ -974,8 +983,8 @@
     <string name="dock_audio_settings_title" msgid="3324750259959570305">"Աուդիո"</string>
     <string name="dock_audio_summary_desk" msgid="6487784412371139335">"Կցված աշխատասեղանի համակցման կարգավորումներ"</string>
     <string name="dock_audio_summary_car" msgid="6740897586006248450">"Կցված մեքենայի միակցիչի կարգավորումներ"</string>
-    <string name="dock_audio_summary_none" product="tablet" msgid="8215337394914283607">"Գրասալիկը հարակցված չէ"</string>
-    <string name="dock_audio_summary_none" product="default" msgid="289909253741048784">"Հեռախոսը հարակցված չէ"</string>
+    <string name="dock_audio_summary_none" product="tablet" msgid="8215337394914283607">"Պլանշետը միացված չէ դոկ-կայանին"</string>
+    <string name="dock_audio_summary_none" product="default" msgid="289909253741048784">"Հեռախոսը միացված չէ դոկ-կայանին"</string>
     <string name="dock_audio_summary_unknown" msgid="4465059868974255693">"Կցված հարակցման համար կարգավորումներ"</string>
     <string name="dock_not_found_title" msgid="3290961741828952424">"Միակցումը չգտնվեց"</string>
     <string name="dock_not_found_text" product="tablet" msgid="8405432495282299143">"Պետք է հարակցեք պլանշետը հարակցման աուդիոն կարգավորելուց առաջ:"</string>
@@ -993,6 +1002,7 @@
     <string name="search_settings" msgid="1910951467596035063">"Որոնել"</string>
     <string name="search_settings_summary" msgid="9205656546570654169">"Կառավարել որոնման կարգավորումները և պատմությունը"</string>
     <string name="search_settings_no_results" msgid="8799027492641230999">"Արդյունքներ չկան"</string>
+    <string name="search_clear_history" msgid="4196658962573162457">"Մաքրել պատմությունը"</string>
     <string name="display_settings" msgid="7965901687241669598">"Էկրան"</string>
     <string name="accelerometer_title" msgid="7854608399547349157">"Ավտոմատ պտտել էկրանը"</string>
     <string name="color_mode_title" msgid="3159275920408338215">"Վառ գույներ"</string>
@@ -1027,8 +1037,8 @@
     <string name="night_display_auto_mode_never" msgid="2483761922928753400">"Չկա"</string>
     <string name="night_display_auto_mode_custom" msgid="2379394568898721765">"Միանում է սահմանված ժամին"</string>
     <string name="night_display_auto_mode_twilight" msgid="589042813708244059">"Միանում է մայրամուտից մինչև արևածագ"</string>
-    <string name="night_display_start_time_title" msgid="8918016772613689584">"Մեկնարկի ժամը"</string>
-    <string name="night_display_end_time_title" msgid="8286061578083519350">"Ավարտի ժամը"</string>
+    <string name="night_display_start_time_title" msgid="8918016772613689584">"Սկիզբ"</string>
+    <string name="night_display_end_time_title" msgid="8286061578083519350">"Ավարտ"</string>
     <string name="night_display_status_title" msgid="1784041143360286267">"Կարգավիճակ"</string>
     <string name="night_display_temperature_title" msgid="1435292789272017136">"Ինտենսիվություն"</string>
     <string name="night_display_summary_off" msgid="1792750041697946539">"Անջատած է / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
@@ -1049,16 +1059,16 @@
     <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_dock" msgid="2072657401664633283">"Dock-կայանում"</string>
     <string name="screensaver_settings_summary_never" msgid="5165622985174349585">"Երբեք"</string>
     <string name="screensaver_settings_summary_off" msgid="2481581696365146473">"Անջատված է"</string>
-    <string name="screensaver_settings_disabled_prompt" msgid="1239088321034437608">"Միացրեք էկրանի խնայարարը և վերահսկեք հեռախոսի գործողությունները, երբ այն միակցված է կամ գտնվում է քնի ռեժիմում:"</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>
@@ -1121,15 +1131,14 @@
     <string name="fcc_equipment_id" msgid="149114368246356737">"Սարքավորման ID-ն"</string>
     <string name="baseband_version" msgid="1848990160763524801">"Baseband-ի տարբերակը"</string>
     <string name="kernel_version" msgid="9192574954196167602">"Միջուկի տարբերակը"</string>
-    <string name="build_number" msgid="3075795840572241758">"Պատրաստման համարը"</string>
-    <string name="selinux_status" msgid="6212165375172061672">"SELinux կարգավիճակը"</string>
+    <string name="build_number" msgid="3075795840572241758">"Կառուցման համարը"</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>
     <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>
@@ -1150,7 +1159,6 @@
     <string name="status_wifi_mac_address" msgid="2202206684020765378">"Wi‑Fi MAC հասցե"</string>
     <string name="status_bt_address" msgid="4195174192087439720">"Bluetooth-ի հասցեն"</string>
     <string name="status_serial_number" msgid="2257111183374628137">"Հերթական համարը"</string>
-    <string name="status_unavailable" msgid="7862009036663793314">"Անհասանելի"</string>
     <string name="status_up_time" msgid="7294859476816760399">"Աշխատած ժամանակը"</string>
     <string name="status_awake_time" msgid="2393949909051183652">"Արթուն մնալու տևողությունը"</string>
     <string name="internal_memory" msgid="9129595691484260784">"Ներքին պահոց"</string>
@@ -1274,7 +1282,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>
@@ -1326,6 +1334,7 @@
     <string name="menu_restore" msgid="8260067415075573273">"Վերականգնել լռելյայնը"</string>
     <string name="restore_default_apn_completed" msgid="2824775307377604897">"Սկզբնական APN կարգավորումների վերակարգավորումն ավարտված է:"</string>
     <string name="reset_dashboard_title" msgid="6254873816990678620">"Վերակայել ընտրանքները"</string>
+    <string name="reset_dashboard_summary" msgid="4851012632493522755">"Ցանցը, հավելվածները և սարքը հնարավոր է վերակայել"</string>
     <string name="reset_network_title" msgid="6166025966016873843">"Վերակայել Wi-Fi-ը, բջջային տվյալների կարգավորումները և Bluetooth-ը"</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>
@@ -1334,17 +1343,14 @@
     <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="6617679904229218425">"Ջնջել բոլոր տվյալները (Գործարանային վերակայում)"</string>
-    <plurals name="master_clear_with_account_summary" formatted="false" msgid="5911377203778818712">
-      <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> հաշիվ կվերակայվի</item>
-    </plurals>
-    <string name="master_clear_summary" msgid="6902443944660426951">"Ներքին հիշողությունը և բոլոր տվյալները կվերակայվեն"</string>
+    <string name="master_clear_title" msgid="3531267871084279512">"Ջնջել բոլոր տվյալները (գործարանային վերակայում)"</string>
     <string name="master_clear_desc" product="tablet" msgid="9146059417023157222">"Սա կջնջի բոլոր տվյալները ձեր պլանշետի "<b>" ներքին պահոցից"</b>", այդ թվում՝\n\n"<li>"Ձեր Google հաշիվը"</li>\n<li>"Համակարգի և հավելվածների տվյալներն ու կարգավորումները"</li>\n<li>"Ներբեռնված հավելվածները"</li></string>
     <string name="master_clear_desc" product="default" msgid="4800386183314202571">"Կջնջվեն բոլոր տվյալները ձեր սարքի "<b>"ներքին հիշողությունից"</b>", ներառյալ`\n\n"<li>"ձեր Google հաշիվը"</li>\n<li>"համակարգի և հավելվածների տվյալներն ու կարգավորումները"</li>\n<li>"ներբեռնված հավելվածները"</li></string>
     <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"Հաշիվներն այս սարքում՝\n"</string>
     <string name="master_clear_other_users_present" product="default" msgid="5161423070702470742">\n\n"Այս սարքում այլ օգտատերերի հաշիվներ կան:\n"</string>
     <string name="master_clear_desc_also_erases_external" msgid="1903185203791274237"><li>"Երաժշտություն"</li>\n<li>"Լուսանկարներ"</li>\n<li>"Օգտվողի այլ տվյալներ"</li></string>
+    <string name="master_clear_desc_also_erases_esim" msgid="312352697653096008"><li>"eSIM-ի օպերատորներ"</li></string>
+    <string name="master_clear_desc_no_cancel_mobile_plan" msgid="5460926449093211144">\n\n"Բջջային ծառայությունների ձեր փաթեթը չի չեղարկվի:"</string>
     <string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="7744115866662613411">\n\n"Երաժշտությունը, նկարները և այլ տվյալները ջնջելու համար "<b>"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>
@@ -1380,11 +1386,11 @@
     <string name="usb_tethering_subtext" product="tablet" msgid="5988796139573211318">"Տրամադրել պլանշետի ինտերնետ կապը USB-ի միջոցով"</string>
     <string name="bluetooth_tether_checkbox_text" msgid="2379175828878753652">"Bluetooth մոդեմ"</string>
     <string name="bluetooth_tethering_subtext" product="tablet" msgid="4558227863463153412">"Տարածել պլանշետի Ինտերնետ կապը Bluetooth-ի միջոցով"</string>
-    <string name="bluetooth_tethering_subtext" product="default" msgid="1055197887836203595">"Տարածել հեռախոսի Ինտերնետ կապը Bluetooth-ի միջոցով"</string>
+    <string name="bluetooth_tethering_subtext" product="default" msgid="1055197887836203595">"Տարածել հեռախոսի ինտերնետ կապը Bluetooth-ի միջոցով"</string>
     <string name="bluetooth_tethering_off_subtext_config" msgid="6326877798974938021">"Այս <xliff:g id="DEVICE_NAME">%1$d</xliff:g> սարքի ինտերնետ կապը տարածվում է Bluetooth-ով"</string>
     <string name="bluetooth_tethering_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="1308462275952345985">"Օգտագործեք թեժ կետն ու մոդեմի ռեժիմը՝ բջջային ցանցի միջոցով այլ սարքերին ինտերնետ կապ տրամադրելու համար: Հավելվածները կարող են ստեղծել թեժ կետ նաև բովանդակությունը մոտակա սարքերին փոխանցելու համար:"</string>
+    <string name="tethering_footer_info" msgid="1308462275952345985">"Օգտագործեք թեժ կետն ու մոդեմի ռեժիմը՝ բջջային ցանցի միջոցով մյուս սարքերին ինտերնետ կապ տրամադրելու համար: Հավելվածները կարող են ստեղծել թեժ կետ նաև բովանդակությունը մոտակա սարքերին փոխանցելու համար:"</string>
     <string name="tethering_help_button_text" msgid="656117495547173630">"Օգնություն"</string>
     <string name="network_settings_title" msgid="2876509814832830757">"Բջջային ցանց"</string>
     <string name="manage_mobile_plan_title" msgid="7630170375010107744">"Բջջային փաթեթ"</string>
@@ -1461,15 +1467,16 @@
     <string name="settings_safetylegal_activity_title" msgid="6901214628496951727">"Անվտանգության տեղեկատվություն"</string>
     <string name="settings_safetylegal_activity_unreachable" msgid="250674109915859456">"Դուք չունեք տվյալների կապ: Այս տեղեկատվությունը հիմա դիտելու համար անցեք %s` ցանկացած ինտերնետ կապ ունեցող համակարգչով:"</string>
     <string name="settings_safetylegal_activity_loading" msgid="8059022597639516348">"Բեռնում..."</string>
-    <string name="lockpassword_choose_your_password_header" msgid="8624900666929394990">"Ընտրեք ձեր գաղտնաբառը"</string>
-    <string name="lockpassword_choose_your_password_header_for_fingerprint" msgid="6624409510609085450">"Մատնահետքն օգտագործելու համար տեղադրեք գաղտնաբառ"</string>
-    <string name="lockpassword_choose_your_pattern_header" msgid="6949761069941694050">"Ընտրեք ձեր կաղապարը"</string>
-    <string name="lockpassword_choose_your_pattern_header_for_fingerprint" msgid="5901096361617543819">"Մատնահետքն օգտագործելու համար տեղադրեք նախշ"</string>
-    <string name="lockpassword_choose_your_pin_header" msgid="7598849519816138302">"Ընտրեք ձեր PIN-ը"</string>
-    <string name="lockpassword_choose_your_pin_header_for_fingerprint" msgid="765344692615917183">"Մատնահետքն օգտագործելու համար տեղադրեք PIN կոդ"</string>
-    <string name="lockpassword_confirm_your_password_header" msgid="6308478184889846633">"Հաստատեք ձեր գաղտնաբառը"</string>
+    <string name="lockpassword_choose_your_screen_lock_header" msgid="3872462096767152394">"Էկրանի կողպման կարգավորում"</string>
+    <string name="lockpassword_choose_your_password_message" msgid="1197569283524841412">"Անվտանգության նկատառումներից ելնելով՝ ավելացրեք գաղտնաբառ"</string>
+    <string name="lockpassword_choose_your_password_header_for_fingerprint" msgid="2541818487015343503">"Մատնահետքի համար անհրաժեշտ է գաղտնաբառ"</string>
+    <string name="lockpassword_choose_your_pattern_header_for_fingerprint" msgid="7709785406243556723">"Մատնահետքի համար անհրաժեշտ է նախշ"</string>
+    <string name="lockpassword_choose_your_pin_message" msgid="1875420718677275646">"Անվտանգության նկատառումներից ելնելով՝ ավելացրեք PIN կոդ"</string>
+    <string name="lockpassword_choose_your_pin_header_for_fingerprint" msgid="1549639053195796674">"Մատնահետքն օգտագործելու համար ընտրեք PIN"</string>
+    <string name="lockpassword_choose_your_pattern_message" msgid="5986983400689720015">"Անվտանգության նկատառումներից ելնելով՝ ավելացրեք նախշ"</string>
+    <string name="lockpassword_confirm_your_password_header" msgid="1266027268220850931">"Նորից մուտքագրեք գաղտնաբառը"</string>
     <string name="lockpassword_confirm_your_pattern_header" msgid="7543433733032330821">"Հաստատեք ձեր կաղապարը"</string>
-    <string name="lockpassword_confirm_your_pin_header" msgid="49038294648213197">"Հաստատեք ձեր PIN-ը"</string>
+    <string name="lockpassword_confirm_your_pin_header" msgid="7744513791910572550">"Նորից մուտքագրեք PIN կոդը"</string>
     <string name="lockpassword_confirm_passwords_dont_match" msgid="5140892109439191415">"Գաղտնաբառերը չեն համընկնում"</string>
     <string name="lockpassword_confirm_pins_dont_match" msgid="7226244811505606217">"PIN-երը չեն համընկնում"</string>
     <string name="lockpassword_choose_lock_generic_header" msgid="3811438094903786145">"Ապակողպման եղանակը"</string>
@@ -1488,6 +1495,12 @@
     <string name="lockpassword_strong_auth_required_work_pattern" msgid="3003781907040522053">"Լրացուցիչ ապահովության համար օգտագործեք ձեր աշխատանքային նախշը"</string>
     <string name="lockpassword_strong_auth_required_work_pin" msgid="3367491332598821552">"Լրացուցիչ ապահովության համար մուտաքագրեք ձեր աշխատանքային PIN կոդը"</string>
     <string name="lockpassword_strong_auth_required_work_password" msgid="8159775129968582940">"Լրացուցիչ ապահովության համար մուտքագրեք ձեր աշխատանքային գաղտնաբառը"</string>
+    <string name="lockpassword_confirm_your_pattern_details_frp" msgid="6757336656791723193">"Ձեր սարքը վերակայվել է: Այս հեռախոսն օգտագործելու համար մուտքագրեք ձեր նախորդ նախշը:"</string>
+    <string name="lockpassword_confirm_your_pin_details_frp" msgid="826520613445990470">"Ձեր սարքը վերակայվել է: Այս հեռախոսն օգտագործելու համար մուտքագրեք ձեր նախորդ PIN կոդը:"</string>
+    <string name="lockpassword_confirm_your_password_details_frp" msgid="8944081074615739040">"Ձեր սարքը վերակայվել է: Այս հեռախոսն օգտագործելու համար մուտքագրեք ձեր նախորդ գաղտնաբառը:"</string>
+    <string name="lockpassword_confirm_your_pattern_header_frp" msgid="2898036091609128286">"Հաստատեք նախշը"</string>
+    <string name="lockpassword_confirm_your_pin_header_frp" msgid="4141601774778898803">"Հաստատեք PIN կոդը"</string>
+    <string name="lockpassword_confirm_your_password_header_frp" msgid="3762615419295360480">"Հաստատեք գաղտնաբառը"</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>
@@ -1498,9 +1511,9 @@
     <string name="lockpattern_recording_intro_footer" msgid="1118579101409152113">"Սեղմեք Ցանկ` օգնության համար:"</string>
     <string name="lockpattern_recording_inprogress" msgid="6667844062721656773">"Հեռացրեք մատը ավարտելուց հետո"</string>
     <string name="lockpattern_recording_incorrect_too_short" msgid="1348234155120957561">"Միացրեք առնվազն <xliff:g id="NUMBER">%d</xliff:g> կետ: Փորձեք կրկին:"</string>
-    <string name="lockpattern_pattern_entered_header" msgid="4316818983675591604">"Կաղապարն ընդունված է"</string>
-    <string name="lockpattern_need_to_confirm" msgid="8054853451639221265">"Պատկերեք կաղապարը նորից` հաստատելու համար"</string>
-    <string name="lockpattern_pattern_confirmed_header" msgid="8455614172231880211">"Ձեր ապակողպման նոր կաղապարը"</string>
+    <string name="lockpattern_pattern_entered_header" msgid="4316818983675591604">"Նախշն ընդունված է"</string>
+    <string name="lockpattern_need_to_confirm" msgid="8054853451639221265">"Նկարեք նախշը նորից` հաստատելու համար"</string>
+    <string name="lockpattern_pattern_confirmed_header" msgid="8455614172231880211">"Նոր նախշ"</string>
     <string name="lockpattern_confirm_button_text" msgid="1128204343957002841">"Հաստատել"</string>
     <string name="lockpattern_restart_button_text" msgid="3337574403350953926">"Վերամուտքագրել"</string>
     <string name="lockpattern_retry_button_text" msgid="3480423193273588166">"Մաքրել"</string>
@@ -1537,14 +1550,13 @@
     <string name="install_applications_title" msgid="4987712352256508946">"Թույլ է տալիս ծրագրերի բոլոր աղբյուրները"</string>
     <string name="recent_app_category_title" msgid="6673071268966003928">"Վերջին օգտագործված հավելվածները"</string>
     <string name="see_all_apps_title" msgid="1317153498074308438">"Տեսնել բոլոր <xliff:g id="COUNT">%1$d</xliff:g> հավելվածները"</string>
-    <string name="recent_app_summary" msgid="3366446669844932300">"<xliff:g id="TIME">^1</xliff:g> առաջ"</string>
     <string name="install_all_warning" product="tablet" msgid="8310489909586138165">"Ձեր պլանշետն ու անձնական տվյալներն առավել խոցելի են անհայտ հավելվածների գրոհների նկատմամբ: Տեղադրելով հավելվածներ այս աղբյուրից՝ դուք ընդունում եք, որ պատասխանատվություն եք կրում ձեր պլանշետին պատճառած ցանկացած վնասի կամ տվյալների կորստի համար, որը կարող է տեղի ունենալ դրանք օգտագործելու արդյունքում:"</string>
     <string name="install_all_warning" product="default" msgid="1952257127370115988">"Ձեր սարքն ու անձնական տվյալներն առավել խոցելի են անհայտ հավելվածների գրոհների նկատմամբ: Տեղադրելով հավելվածներ այս աղբյուրից՝ դուք ընդունում եք, որ պատասխանատվություն եք կրում ձեր սարքին պատճառած ցանկացած վնասի կամ տվյալների կորստի համար, որը կարող է տեղի ունենալ դրանք օգտագործելու արդյունքում:"</string>
     <string name="advanced_settings" msgid="1777249286757067969">"Ընդլայնված կարգավորումներ"</string>
     <string name="advanced_settings_summary" msgid="4016682978071086747">"Միացնել այլ կարգավորման ընտրանքներ"</string>
     <string name="application_info_label" msgid="5736524913065714880">"Հավելվածի մասին"</string>
-    <string name="storage_label" msgid="8700867073480107253">"Հիշողություն"</string>
-    <string name="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>
@@ -1657,7 +1669,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>
@@ -1676,7 +1688,7 @@
     <string name="memory" msgid="6609961111091483458">"RAM"</string>
     <!-- no translation found for service_process_name (4098932168654826656) -->
     <skip />
-    <string name="running_process_item_user_label" msgid="3129887865552025943">"Օտատեր՝ <xliff:g id="USER_NAME">%1$s</xliff:g>"</string>
+    <string name="running_process_item_user_label" msgid="3129887865552025943">"Օգտատեր՝ <xliff:g id="USER_NAME">%1$s</xliff:g>"</string>
     <string name="running_process_item_removed_user_label" msgid="8250168004291472959">"Հեռացված օգտատեր"</string>
     <string name="running_processes_item_description_s_s" msgid="5790575965282023145">"<xliff:g id="NUMPROCESS">%1$d</xliff:g> գործընթաց և <xliff:g id="NUMSERVICES">%2$d</xliff:g> ծառայություն"</string>
     <string name="running_processes_item_description_s_p" msgid="8019860457123222953">"<xliff:g id="NUMPROCESS">%1$d</xliff:g> գործընթաց և <xliff:g id="NUMSERVICES">%2$d</xliff:g> ծառայություն"</string>
@@ -1801,7 +1813,7 @@
     <string name="accessibility_settings_summary" msgid="981260486011624939">"Էկրանի ընթերցիչներ, էկրան, փոխազդման կառավարման տարրեր"</string>
     <string name="vision_settings_title" msgid="4204111425716868288">"Տեսողության կարգավորումներ"</string>
     <string name="vision_settings_description" msgid="5679491180156408260">"Օգտվեք հատուկ հնարավորություններից՝ հարմար աշխատանքի համար։ Այս գործառույթները կարող եք փոփոխել սարքի կարգավորումներում։"</string>
-    <string name="vision_settings_suggestion_title" msgid="917294957154878441">"Մեծացնել տառաչափը"</string>
+    <string name="vision_settings_suggestion_title" msgid="8058794060304707004">"Փոխել տառաչափը"</string>
     <string name="screen_reader_category_title" msgid="7739154903913400641">"Էկրանի ընթերցիչներ"</string>
     <string name="audio_and_captions_category_title" msgid="3420727114421447524">"Աուդիո և էկրանի տեքստ"</string>
     <string name="display_category_title" msgid="685461049938269166">"Էկրան"</string>
@@ -1832,13 +1844,12 @@
     <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>
     <string name="accessibility_autoclick_preference_title" msgid="7014499339068449623">"Սեղմում նշորդը կանգնելուց հետո"</string>
     <string name="accessibility_autoclick_delay_preference_title" msgid="3962261178385106006">"Հապաղումը սեղմելուց առաջ"</string>
-    <string name="preference_summary_default_combination" msgid="8532964268242666060">"<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>
@@ -1957,12 +1968,14 @@
     <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_whitelisted" msgid="7375400051141016808">"Այս հավելվածի համար մարտկոցի օգտագործումը չի կարող օպտիմալացվել"</string>
+    <string name="background_activity_warning_dialog_title" msgid="2216249969149568871">"Սահմանափակե՞լ ֆոնային գործողությունները"</string>
+    <string name="background_activity_warning_dialog_text" msgid="7049624449246121981">"Հավելվածի ֆոնային գործողությունների սահմանափակումը կարող է ազդել վերջինիս աշխատանքի վրա"</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" msgid="6393929085382334341">"Հավելվածների կողմից մարտկոցի օգտագործումը վերջինիս լրիվ լիցքավորումից հետո (<xliff:g id="RELATIVE_TIME">^1</xliff:g>)"</string>
+    <string name="power_usage_list_summary_device" msgid="4461926045610455423">"Սարքի բաղադրիչների կողմից կողմից մարտկոցի օգտագործումը վերջինիս լրիվ լիցքավորումից հետո (<xliff:g id="RELATIVE_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>
@@ -2079,7 +2092,7 @@
     <string name="battery_used_for" msgid="2690821851327075443">"Օգտագործվել է <xliff:g id="TIME">^1</xliff:g>"</string>
     <string name="battery_active_for" msgid="2964359540508103032">"Ակտիվ է <xliff:g id="TIME">^1</xliff:g>"</string>
     <string name="battery_screen_usage" msgid="6537658662149713585">"էկրանի օգտագործում՝ <xliff:g id="TIME">^1</xliff:g>"</string>
-    <string name="battery_used_by" msgid="1135316757755282999">"<xliff:g id="PERCENT">%1$s</xliff:g> օգտագործվել է <xliff:g id="APP">%2$s</xliff:g> հավելվածի կողմից"</string>
+    <string name="battery_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>
@@ -2100,7 +2113,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>
@@ -2208,14 +2221,14 @@
     <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">"Վկայականների պահոցն օգտագործելու համար անհրաժեշտ է, որ էկրանը կողպող PIN կամ գաղտնաբառ կիրառեք:"</string>
+    <string name="credentials_configure_lock_screen_hint" msgid="8058230497337529036">"Որպեսզի կարողանաք օգտագործել մուտքի տվյալների պահեստը, ձեր սարքը պետք է ապահով կողպէկրան ունենա"</string>
+    <string name="credentials_configure_lock_screen_button" msgid="253239765216055321">"ԿԱՐԳԱՎՈՐԵԼ ԿՈՂՊՈՒՄԸ"</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>
@@ -2335,8 +2348,6 @@
     <skip />
     <string name="cant_sync_dialog_title" msgid="2777238588398046285">"Հնարավոր չէ ձեռքով համաժամեցնել"</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-ի մեկնարկի համար մուտքագրեք ձեր PIN-ը"</string>
     <string name="enter_pattern" msgid="4187435713036808566">"Android-ի մեկնարկի համար մուտքագրեք ձեր նախշը"</string>
@@ -2350,6 +2361,7 @@
     <string name="misc_files_selected_count" msgid="4647048020823912088">"Ընտրված է <xliff:g id="NUMBER">%1$d</xliff:g>-ը <xliff:g id="TOTAL">%2$d</xliff:g>-ից"</string>
     <string name="misc_files_selected_count_bytes" msgid="2876232009069114352">"<xliff:g id="NUMBER">%1$s</xliff:g>-ը <xliff:g id="TOTAL">%2$s</xliff:g>-ից"</string>
     <string name="select_all" msgid="1562774643280376715">"Ընտրել բոլորը"</string>
+    <string name="data_plan_usage_manage_plans_button_text" msgid="8997761990902708162">"Կառավարել փաթեթները"</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>
@@ -2393,7 +2405,7 @@
     <string name="data_usage_tab_3g" msgid="6092169523081538718">"2G-3G"</string>
     <string name="data_usage_list_mobile" msgid="5588685410495019866">"Շարժական"</string>
     <string name="data_usage_list_none" msgid="3933892774251050735">"Ոչ մեկը"</string>
-    <string name="data_usage_enable_mobile" msgid="986782622560157977">"Շարժական տվյալներ"</string>
+    <string name="data_usage_enable_mobile" msgid="986782622560157977">"Բջջային ինտերնետ"</string>
     <string name="data_usage_enable_3g" msgid="6304006671869578254">"2G-3G տվյալներ"</string>
     <string name="data_usage_enable_4g" msgid="3635854097335036738">"4G տվյալներ"</string>
     <string name="data_usage_forground_label" msgid="7654319010655983591">"Առաջին պլանում՝"</string>
@@ -2405,9 +2417,9 @@
     <string name="data_usage_app_restrict_dialog_title" msgid="1613108390242737923">"Սահմանափակե՞լ հետնաշերտի տվյալները:"</string>
     <string name="data_usage_app_restrict_dialog" msgid="1466689968707308512">"Այս հատկությունը կարող է պատճառ հանդիսանալ հետնաշերտի տվյալներից կախված ծրագրի աշխատանքի դադարեցմանը, երբ միայն շարժական ցանցեր են հասանելի:\n\nԴուք ծրագրի հասանելի կարգավորումների մեջ կարող եք գտնել ավելի համապատասխան տվյալների օգտագործման կառավարներ:"</string>
     <string name="data_usage_restrict_denied_dialog" msgid="55012417305745608">"Ֆոնային տվյալների սահմանափակումը հնարավոր է միայն բջջային ինտերնետի սահմանաչափ նշելու դեպքում։"</string>
-    <string name="data_usage_auto_sync_on_dialog_title" msgid="2438617846762244389">"Միացնե՞լ տվյալների ինքնահամաժամեցումը:"</string>
-    <string name="data_usage_auto_sync_on_dialog" product="tablet" msgid="8581983093524041669">"Ոստայնում ձեր հաշվի մեջ կատարած ցանկացած փոփոխություն ավտոմատ կպատճենվի ձեր պլանշետում:\n\nՈրոշ հաշիվներ կարող են պլանշետով կատարած փոփոխություններն ավտոմատ պատճենել ոստայնում: Google հաշիվն աշխատում է հենց այդպես:"</string>
-    <string name="data_usage_auto_sync_on_dialog" product="default" msgid="8651376294887142858">"Ոստայնում ձեր հաշվի մեջ կատարած ցանկացած փոփոխություն ավտոմատ կպատճենվի ձեր հեռախոսում:\n\nՈրոշ հաշիվներ կարող են հեռախոսով կատարած փոփոխություններն ավտոմատ պատճենել ոստայնում: Google հաշիվն աշխատում է հենց այդպես:"</string>
+    <string name="data_usage_auto_sync_on_dialog_title" msgid="2438617846762244389">"Միացնե՞լ ինքնահամաժամեցումը"</string>
+    <string name="data_usage_auto_sync_on_dialog" product="tablet" msgid="8581983093524041669">"Համացանցում կատարած ցանկացած փոփոխություն ավտոմատ կպատճենվի ձեր պլանշետում:\n\nՈրոշ հաշիվներ կարող են պլանշետով կատարած փոփոխություններն ավտոմատ պատճենել համացանցում: Google հաշիվն աշխատում է հենց այդպես:"</string>
+    <string name="data_usage_auto_sync_on_dialog" product="default" msgid="8651376294887142858">"Համացանցում կատարած ցանկացած փոփոխություն ավտոմատ կպատճենվի ձեր պլանշետում:\n\nՈրոշ հաշիվներ կարող են պլանշետով կատարած փոփոխություններն ավտոմատ պատճենել համացանցում: Google հաշիվն աշխատում է հենց այդպես:"</string>
     <string name="data_usage_auto_sync_off_dialog_title" msgid="9013139130490125793">"Անջատե՞լ ինքնահամաժամեցումը"</string>
     <string name="data_usage_auto_sync_off_dialog" msgid="4025938250775413864">"Դա կկրճատի թրաֆիկն ու մարտկոցի օգտագործման չափը, սակայն նոր տվյալներ ստանալու համար անհրաժեշտ կլինի ձեռքով համաժամեցնել յուրաքանչյուր հաշիվ։ Թարմացումների մասին ծանուցումներ չեն ցուցադրվի։"</string>
     <string name="data_usage_cycle_editor_title" msgid="1373797281540188533">"Վիճակագրության վերակայում"</string>
@@ -2435,6 +2447,9 @@
     <string name="data_usage_metered_mobile" msgid="5423305619126978393">"Շարժական ցանցեր"</string>
     <string name="data_usage_metered_wifi" msgid="1761738002328299714">"Սահմանափակ Wi-Fi ցանցեր"</string>
     <string name="data_usage_metered_wifi_disabled" msgid="727808462375941567">"Սահմանափակումով ցանցեր ընտրելու համար միացրեք Wi‑Fi-ը:"</string>
+    <string name="data_usage_metered_auto" msgid="1262028400911918865">"Ինքնաշխատ"</string>
+    <string name="data_usage_metered_yes" msgid="9217539611385225894">"Սահմանափակ"</string>
+    <string name="data_usage_metered_no" msgid="4025232961929071789">"Անսահմանափակ"</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>
@@ -2503,7 +2518,7 @@
     <string name="vpn_disconnected_summary" msgid="3082851661207900606">"Չկա"</string>
     <string name="vpn_missing_cert" msgid="5357192202207234745">"Հավաստագիր չկա: Փորձեք խմբագրել պրոֆիլը:"</string>
     <string name="trusted_credentials_system_tab" msgid="3984284264816924534">"Համակարգ"</string>
-    <string name="trusted_credentials_user_tab" msgid="2244732111398939475">"Օտատեր"</string>
+    <string name="trusted_credentials_user_tab" msgid="2244732111398939475">"Օգտատեր"</string>
     <string name="trusted_credentials_disable_label" msgid="3864493185845818506">"Կասեցնել"</string>
     <string name="trusted_credentials_enable_label" msgid="2498444573635146913">"Միացնել"</string>
     <string name="trusted_credentials_remove_label" msgid="3633691709300260836">"Հեռացնել"</string>
@@ -2526,9 +2541,6 @@
     <string name="backup_pw_set_button_text" msgid="2387480910044648795">"Պահել նոր գաղտնաբառը"</string>
     <string name="backup_pw_cancel_button_text" msgid="8845630125391744615">"Չեղարկել"</string>
     <string name="additional_system_update_settings_list_item_title" msgid="214987609894661992">"Հավելյալ համակարգի թարմացումներ"</string>
-    <string name="selinux_status_disabled" msgid="924551035552323327">"Անջատված"</string>
-    <string name="selinux_status_permissive" msgid="6004965534713398778">"Թույլատրելի"</string>
-    <string name="selinux_status_enforcing" msgid="2252703756208463329">"Պարտադրում"</string>
     <string name="ssl_ca_cert_warning" msgid="2045866713601984673">"Ցանցը կարող է վերահսկվել"</string>
     <string name="done_button" msgid="1991471253042622230">"Պատրաստ է"</string>
     <plurals name="ssl_ca_cert_dialog_title" formatted="false" msgid="7145092748045794650">
@@ -2565,12 +2577,12 @@
     <string name="user_add_max_count" msgid="5405885348463433157">"Մինչև <xliff:g id="USER_COUNT">%1$d</xliff:g> օգտատիրոջ ավելացում"</string>
     <string name="user_add_user_item_summary" msgid="4702776187132008661">"Օգտվողներն իրենց անձնական հավելվածներն ու բովանդակությունն ունեն"</string>
     <string name="user_add_profile_item_summary" msgid="5931663986889138941">"Դուք կարող եք սահմանափակել մուտքի իրավունքը ծրագրեր և ձեր հաշվի բովանդակություն:"</string>
-    <string name="user_add_user_item_title" msgid="8212199632466198969">"Օտատեր"</string>
+    <string name="user_add_user_item_title" msgid="8212199632466198969">"Օգտատեր"</string>
     <string name="user_add_profile_item_title" msgid="8353515490730363621">"Սահմանափակված պրոֆիլ"</string>
     <string name="user_add_user_title" msgid="2108112641783146007">"Ավելացնե՞լ նոր օգտատեր"</string>
     <string name="user_add_user_message_long" msgid="8562152293752222985">"Ավելացնելով հավելյալ օգտատերներ՝ սարքը կարող եք համօգտագործել այլ մարդկանց հետ: Ամեն մի օգտատեր կունենա իր սեփական տարածքը, որը կարող է հարմարեցնել իր հավելվածներով, պաստառով և այլ բաներով: Օգտատերերը կարող են նաև կարգաբերել Wi‑Fi-ի և սարքի այլ կարգավորումները, որոնք առնչվում են բոլորին:\n\nԵրբ նոր օգտատեր եք ավելացնում, նա պետք է կարգավորի իր տարածքը:\n\nՑանկացած օգտատեր կարող է թարմացնել բոլոր օգտատերների հավելվածները:"</string>
     <string name="user_add_user_message_short" msgid="1511354412249044381">"Երբ նոր օգտատեր եք ավելացնում, նա պետք է կարգավորի իր պրոֆիլը:\n\nՑանկացած օգտատեր կարող է թարմացնել հավելվածները մյուս բոլոր հաշիվների համար:"</string>
-    <string name="user_setup_dialog_title" msgid="1765794166801864563">"Ստեղծե՞լ օգտատեր հիմա:"</string>
+    <string name="user_setup_dialog_title" msgid="1765794166801864563">"Կարգավորե՞լ պրոֆիլը"</string>
     <string name="user_setup_dialog_message" msgid="1004068621380867148">"Համոզվեք, որ անձը կարող է վերցնել սարքը և կարգավորել իր տարածքը"</string>
     <string name="user_setup_profile_dialog_message" msgid="3896568553327558731">"Կարգավորե՞լ պրոֆիլը հիմա:"</string>
     <string name="user_setup_button_setup_now" msgid="3391388430158437629">"Կարգավորել հիմա"</string>
@@ -2607,7 +2619,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>
@@ -2726,6 +2738,7 @@
       <item quantity="one">Show %d hidden items</item>
       <item quantity="other">Ցույց տալ %d թաքնված տարրեր</item>
     </plurals>
+    <string name="dashboard_suggestion_condition_footer_content_description" msgid="2898588191174845961">"Կոծկել"</string>
     <string name="network_dashboard_title" msgid="4771589228992391573">"Ցանց և ինտերնետ"</string>
     <string name="network_dashboard_summary_mobile" msgid="3851083934739500429">"բջջային"</string>
     <string name="network_dashboard_summary_data_usage" msgid="3843261364705042212">"տվյալների օգտագործում"</string>
@@ -2799,9 +2812,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>
@@ -2828,8 +2841,14 @@
       <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> ավտոմատ կանոն միացված է</item>
     </plurals>
-    <string name="zen_mode_settings_title" msgid="842308776768942600">"«Չանհանգստացնել» ռեժիմի կարգավորումներ"</string>
-    <string name="zen_mode_priority_settings_title" msgid="2623117023031824309">"Միայն կարևորները"</string>
+    <string name="zen_mode_settings_title" msgid="1066226840983908121">"Չանհանգստացնել"</string>
+    <string name="zen_mode_behavior_settings_title" msgid="1463303933529313969">"Տարբերակներ"</string>
+    <string name="zen_mode_behavior_allow_title" msgid="3845615648136218141">"Թույլատրել ձայներ և թրթռոցներ`"</string>
+    <string name="zen_mode_behavior_no_sound" msgid="1219626004723208056">"Առանց ձայնի"</string>
+    <string name="zen_mode_behavior_total_silence" msgid="6716603819806610626">"Առանց ձայնի (կատարյալ լուռ)"</string>
+    <string name="zen_mode_behavior_no_sound_except" msgid="4968477585788243114">"Առանց ձայնի (միայն <xliff:g id="CATEGORIES">%1$s</xliff:g>)"</string>
+    <!-- no translation found for zen_mode_behavior_alarms_only (2423480992071472963) -->
+    <skip />
     <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>
@@ -2855,7 +2874,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>
@@ -2869,15 +2888,17 @@
     <string name="lock_screen_notifications_interstitial_message_profile" msgid="8307705621027472346">"Ինչպե՞ս ցուցադրել պրոֆիլի ծանուցումները, երբ սարքը կողպված է:"</string>
     <string name="lock_screen_notifications_interstitial_title_profile" msgid="3169806586032521333">"Պրոֆիլի ծանուցումները"</string>
     <string name="notifications_title" msgid="8086372779371204971">"Ծանուցումներ"</string>
-    <string name="app_notifications_title" msgid="5810577805218003760">"Ծրագրերի ծանուցումներ"</string>
+    <string name="app_notifications_title" msgid="5810577805218003760">"Հավելվածների ծանուցումներ"</string>
     <string name="notification_channel_title" msgid="2260666541030178452">"Ծանուցման կատեգորիա"</string>
+    <string name="notification_group_title" msgid="7180506440133859601">"Ծանուցումների կատեգորիաների խումբ"</string>
     <string name="notification_importance_title" msgid="848692592679312666">"Կարևորություն"</string>
-    <string name="notification_importance_unspecified" msgid="2196023702875112081">"Թույլ տալ, որ սարքը որոշի"</string>
+    <string name="notification_importance_unspecified" msgid="6622173510486113958">"Թույլատրել ձայնը"</string>
     <string name="notification_importance_blocked" msgid="7938180808339386300">"Երբեք չցուցադրել ծանուցումները"</string>
     <string name="notification_importance_min" msgid="5455049524984686275">"Առանց ձայնի և տեսողական ընդհատումների"</string>
     <string name="notification_importance_low" msgid="8881468429453766553">"Առանց ձայնի"</string>
     <string name="notification_importance_default" msgid="5958338024601957516">"Ձայն հանել"</string>
     <string name="notification_importance_high" msgid="2082429479238228527">"Ձայն հանել և ցուցադրել էկրանին"</string>
+    <string name="notification_importance_high_silent" msgid="2667033773703765252">"Ցուցադրել էկրանին"</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>
@@ -2918,10 +2939,15 @@
     <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="channel_group_notifications_off_desc" msgid="1620950416247316370">"Android-ն արգելափակում է ծանուցումների տվյալ խմբի ցուցադրումը"</string>
     <string name="notification_channels" msgid="5346841743182627500">"Կարգեր"</string>
     <string name="notification_channels_other" msgid="5645317113885788226">"Այլ"</string>
+    <plurals name="notification_group_summary" formatted="false" msgid="3420621520561455358">
+      <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="no_channels" msgid="3077375508177744586">"Այս հավելվածը ծանուցումներ չի փակցրել"</string>
     <string name="app_settings_link" msgid="8894946007543660906">"Հավելվածի լրացուցիչ կարգավորումները"</string>
     <string name="app_notification_listing_summary_zero" msgid="6482582965081108108">"Միացված է բոլոր հավելվածների համար"</string>
@@ -2969,13 +2995,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>
@@ -2998,18 +3024,20 @@
     <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>
+    <!-- no translation found for zen_mode_media_system_other (8900209390529859777) -->
+    <skip />
     <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="239685342222975733">"Եթե նույն անձը <xliff:g id="MINUTES">%d</xliff:g> րոպեի ընթացքում նորից է զանգում"</string>
     <string name="zen_mode_when" msgid="2767193283311106373">"Ավտոմատ միացնել"</string>
     <string name="zen_mode_when_never" msgid="8809494351918405602">"Երբեք"</string>
     <string name="zen_mode_when_every_night" msgid="3122486110091921009">"Ամեն գիշեր"</string>
     <string name="zen_mode_when_weeknights" msgid="8354070633893273783">"Երեկոյան աշխ. օրերին"</string>
-    <string name="zen_mode_start_time" msgid="8102602297273744441">"Մեկնարկի ժամը"</string>
-    <string name="zen_mode_end_time" msgid="8774327885892705505">"Ավարտի ժամը"</string>
+    <string name="zen_mode_start_time" msgid="8102602297273744441">"Սկիզբ"</string>
+    <string name="zen_mode_end_time" msgid="8774327885892705505">"Ավարտ"</string>
     <string name="zen_mode_end_time_next_day_summary_format" msgid="4201521691238728701">"Հաջորդ օրը <xliff:g id="FORMATTED_TIME">%s</xliff:g>-ին"</string>
     <string name="zen_mode_summary_alarms_only_indefinite" msgid="2061973221027570123">"Անորոշ ժամանակով ակտիվացնել «Միայն զարթուցիչը» ռեժիմը"</string>
     <plurals name="zen_mode_summary_alarms_only_by_minute" formatted="false" msgid="6122003583875424601">
@@ -3032,6 +3060,7 @@
     <string name="zen_mode_screen_off_visual_interruptions" msgid="4850792880144382633">"Երբ էկրանն անջատված է"</string>
     <string name="zen_mode_no_visual_interruptions" msgid="8742776003822778472">"Երբ էկրանը միացված կամ անջատված է"</string>
     <string name="notification_app_settings_button" msgid="6685640230371477485">"Ծանուցման կարգավորումներ"</string>
+    <string name="suggestion_button_text" msgid="3275010948381252006">"Լավ"</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>
@@ -3065,7 +3094,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>
@@ -3075,11 +3104,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="DATE">%2$s</xliff:g>՝ <xliff:g id="SIZE">%1$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_1">%2$d</xliff:g> կատեգորիաներից <xliff:g id="COUNT_0">%1$d</xliff:g>-ը անջատված են"</string>
@@ -3144,7 +3173,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>
@@ -3168,7 +3197,7 @@
     <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">
@@ -3179,7 +3208,7 @@
       <item quantity="one">Apps draining battery</item>
       <item quantity="other">Մարտկոցի լիցքն արագ սպառող հավելվածներ</item>
     </plurals>
-    <string name="high_power_filter_on" msgid="3222265297576680099">"Չեն տնտեսում լիցքը"</string>
+    <string name="high_power_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>
@@ -3202,10 +3231,10 @@
     <string name="usb_use_charging_only" msgid="2180443097365214467">"Այս սարքի լիցքավորում"</string>
     <string name="usb_use_charging_only_desc" msgid="3066256793008540627">"Պարզապես այս սարքի լիցքավորում"</string>
     <string name="usb_use_power_only" msgid="6426550616883919530">"Հոսանքի մատակարարում"</string>
-    <string name="usb_use_power_only_desc" msgid="3461232831015575152">"Լիցքավորեք կապակցված սարքը։ Աշխատում է միայն USB-ով լիցքավորումն աջակցող սարքերի հետ։"</string>
+    <string name="usb_use_power_only_desc" msgid="3461232831015575152">"Միացված սարքի լիքավորում։ Աշխատում է միայն USB-ով լիցքավորումն աջակցող սարքերի հետ։"</string>
     <string name="usb_use_file_transfers" msgid="7409600791007250137">"Ֆայլերի փոխանցում"</string>
     <string name="usb_use_file_transfers_desc" msgid="4235764784331804488">"Փոխանցել ֆայլեր մեկ այլ սարքին"</string>
-    <string name="usb_use_photo_transfers" msgid="7794775645350330454">"Լուսանկարների փոխանցման (PTP)"</string>
+    <string name="usb_use_photo_transfers" msgid="7794775645350330454">"Լուսանկարների փոխանցում (PTP)"</string>
     <string name="usb_use_photo_transfers_desc" msgid="2963034811151325996">"Լուսանկարների կամ ֆայլերի փոխանցում, եթե MTP-ն չի աջակցվում (PTP)"</string>
     <string name="usb_use_MIDI" msgid="870922185938298263">"Սարքի օգտագործում որպես MIDI"</string>
     <string name="usb_use_MIDI_desc" msgid="8473936990076693175">"Այս սարքի օգտագործում որպես MIDI"</string>
@@ -3216,11 +3245,12 @@
     <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="sms_mirroring_pref" msgid="6475043279147376031">"SMS-ների հեռարձակում"</string>
     <string name="background_check_pref" msgid="7550258400138010979">"Ֆոնային ստուգում"</string>
     <string name="background_check_title" msgid="4534254315824525593">"Լիակատար ֆոնային մուտք"</string>
     <string name="assist_access_context_title" msgid="2269032346698890257">"Օգտվել էկրանի տեքստային բովանդակությունից"</string>
     <string name="assist_access_context_summary" msgid="1991421283142279560">"Թույլ տալ օգնական հավելվածին օգտվել էկրանի տեքստային բովանդակությունից"</string>
-    <string name="assist_access_screenshot_title" msgid="4034721336291215819">"Օգտագործել էկրանի հանույթը"</string>
+    <string name="assist_access_screenshot_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>
@@ -3259,16 +3289,16 @@
     <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">"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="app_permission_summary_allowed" msgid="1505409933012886711">"Թույլատրված է"</string>
@@ -3282,7 +3312,7 @@
     <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="permit_write_settings" msgid="658555006453212691">"Թույլատրել կարգավորումների փոփոխումը"</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>
@@ -3326,7 +3356,7 @@
     <string name="users_and_accounts_summary" msgid="245282689646897882">"Ընթացիկ օգտատերը՝ <xliff:g id="USER_NAME">%1$s</xliff:g>"</string>
     <string name="users_summary" msgid="1674864467098487328">"Մուտք եք գործել որպես <xliff:g id="USER_NAME">%1$s</xliff:g>"</string>
     <string name="payment_summary" msgid="3472482669588561110">"<xliff:g id="APP_NAME">%1$s</xliff:g>-ը կանխադրված հավելվածն է"</string>
-    <string name="location_on_summary" msgid="5127631544018313587">"ՄԻԱՑՐԱԾ / <xliff:g id="LOCATION_MODE">%1$s</xliff:g>"</string>
+    <string name="location_on_summary" msgid="5127631544018313587">"ՄԻԱՑ/<xliff:g id="LOCATION_MODE">%1$s</xliff:g>"</string>
     <string name="location_off_summary" msgid="6474350053215707957">"ԱՆՋԱՏԱԾ"</string>
     <string name="backup_disabled" msgid="485189128759595412">"Պահուստավորումն անջատված է"</string>
     <string name="about_summary" msgid="924181828102801010">"Տեղադրվել է Android <xliff:g id="VERSION">%1$s</xliff:g> տարբերակը"</string>
@@ -3377,9 +3407,12 @@
     <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">"Telephony Monitor-ի փոփոխությունը կիրառելու համար վերագործարկեք սարքը"</string>
+    <string name="connectivity_monitor_switch" msgid="9059759348648583421">"Connectivity Monitor"</string>
+    <string name="connectivity_monitor_switch_summary" msgid="2828658652378866401">"Կապի հետ կապված խնդիրներ հայտնաբերելու դեպքում ConnectivityMonitor-ը կհավաքի մատյանները և օգտվողին կհուշի վրիպակ գրանցելու անհրաժեշտության մասին"</string>
+    <string name="connectivity_monitor_toast" msgid="5551859612881173028">"ConnectivityMonitor-ի փոփոխությունը կիրառելու համար վերագործարկեք սարքը"</string>
     <string name="camera_hal_hdrplus_switch" msgid="8377365197105267466">"Ֆոտոխցիկի HAL HDR+"</string>
     <string name="camera_hal_hdrplus_toast" msgid="2063703797270055299">"Ֆոտոխցիկի HAL HDR+ կիրառելու համար վերաբեռնեք սարքը"</string>
+    <string name="camera_laser_sensor_switch" msgid="8913588990743234440">"Տեսախցիկի լազերային սենսոր"</string>
     <string name="ota_disable_automatic_update" msgid="2319639631655915050">"Ավտոմատ համակարգային թարմացումներ"</string>
     <string name="usage" msgid="2977875522080448986">"Օգտագործում"</string>
     <string name="cellular_data_usage" msgid="2155683719898158203">"Բջջային թրաֆիկ"</string>
@@ -3396,7 +3429,7 @@
     <string name="billing_cycle_fragment_summary" msgid="8231066353654583106">"Ամեն ամիս, ամսի <xliff:g id="ID_1">%1$s</xliff:g>-ին"</string>
     <string name="network_restrictions" msgid="8234695294536675380">"Ցանցային սահմանափակումներ"</string>
     <plurals name="network_restrictions_summary" formatted="false" msgid="4301618027244595839">
-      <item quantity="one"><xliff:g id="COUNT">%1$d</xliff:g> restrictions</item>
+      <item quantity="one"><xliff:g id="COUNT">%1$d</xliff:g> սահմանափակում</item>
       <item quantity="other"><xliff:g id="COUNT">%1$d</xliff:g> սահմանափակում</item>
     </plurals>
     <string name="operator_warning" msgid="1862988028996859195">"Օպերատորի վիճակագրությունը կարող է տարբերվել սարքի տվյալներից։"</string>
@@ -3405,7 +3438,7 @@
     <string name="data_warning" msgid="209133958008062117">"Նախազգուշացում"</string>
     <string name="set_data_limit" msgid="2901526323210516923">"Սահմանել թրաֆիկի սահմանաչափը"</string>
     <string name="data_limit" msgid="1885406964934590552">"Թրաֆիկի սահմանաչափը"</string>
-    <string name="data_usage_template" msgid="392191945602400904">"<xliff:g id="ID_2">%2$s</xliff:g> ժամանակահատվածում օգտագործվել է <xliff:g id="ID_1">%1$s</xliff:g>"</string>
+    <string name="data_usage_template" msgid="2923744765873163859">"<xliff:g id="ID_1">%1$s</xliff:g> օգտագործված <xliff:g id="ID_2">%2$s</xliff:g> ժամանակահատվածում"</string>
     <string name="configure" msgid="1029654422228677273">"Կարգավորել"</string>
     <string name="data_usage_other_apps" msgid="3272872663517382050">"Օգտագործման մեջ ներառված այլ հավելվածներ"</string>
     <plurals name="data_saver_unrestricted_summary" formatted="false" msgid="2635267833484232703">
@@ -3425,7 +3458,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>
@@ -3474,15 +3507,15 @@
     <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="387052719462473500">"Կառավարեք կողպէկրանին հայտնվող տեղեկությունները"</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="8483187649355540109">"Աջակցություն և խորհուրդներ"</string>
+    <string name="page_tab_title_support" msgid="8483187649355540109">"Օգնություն և խորհուրդներ"</string>
     <string name="developer_smallest_width" msgid="7516950434587313360">"Ամենափոքր լայնությունը"</string>
     <string name="premium_sms_none" msgid="8268105565738040566">"Տեղադրված հավելվածներից ոչ մեկը վճարովի SMS-ների օգտագործման հարցում չի կատարել"</string>
     <string name="premium_sms_warning" msgid="9086859595338944882">"Վճարովի SMS-ները կարող են լրացուցիչ ծախսեր առաջացնել: Հավելվածին թույտվություն տալու դեպքում կկարողանաք դրա միջոցով վճարովի SMS-ներ ուղարկել։"</string>
     <string name="premium_sms_access" msgid="4660047004791638305">"Վճարովի SMS"</string>
-    <string name="bluetooth_disabled" msgid="2456198532288640046">"Տեսանելի չէ ուրիշ սարքերի համար"</string>
+    <string name="bluetooth_disabled" msgid="6244000672828617410">"Անջատված է"</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>
@@ -3564,7 +3597,7 @@
     <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="4567020486787561873">"Ժամանակը, ծանուցումների պատկերակները և այլ տեղեկությունները տեսնելու համար բարձրացրեք ձեր հեռախոսը:"</string>
+    <string name="ambient_display_pickup_summary" product="default" msgid="4567020486787561873">"Ժամանակը, ծանուցումների պատկերակները և այլ տեղեկություններ տեսնելու համար վերցրեք հեռախոսը:"</string>
     <string name="ambient_display_pickup_summary" product="tablet" msgid="5435283849947236648">"Ժամանակը, ծանուցումների պատկերակները և այլ տեղեկությունները տեսնելու համար բարձրացրեք ձեր պլանշետը:"</string>
     <string name="ambient_display_pickup_summary" product="device" msgid="8256669101643381568">"Ժամանակը, ծանուցումների պատկերակները և այլ տեղեկությունները տեսնելու համար բարձրացրեք ձեր սարքը:"</string>
     <string name="ambient_display_pickup_suggestion_summary" msgid="7014700589991761035">"Տեսեք ծանուցումները երբ էկրանն անջատված է"</string>
@@ -3584,7 +3617,7 @@
     <string name="web_action_enable_title" msgid="4051513950976670853">"Ակնթարթորեն գործարկվող հավելվածներ"</string>
     <string name="web_action_enable_summary" msgid="3108127559723396382">"Բացել հղումները հավելվածներում՝ նույնիսկ եթե դրանք տեղադրված չեն"</string>
     <string name="web_action_section_title" msgid="7364647086538399136">"Ակնթարթորեն գործարկվող հավելվածներ"</string>
-    <string name="instant_apps_account" msgid="1433620209791992528">"Ակնթարթորեն գործարկվող հավելվածների հաշիվ"</string>
+    <string name="instant_apps_settings" msgid="8827777916518348213">"Ակնթարթորեն գործարկվող հավելվածների կարգավորումներ"</string>
     <string name="domain_url_section_title" msgid="7046835219056428883">"Տեղադրված հավելվածներ"</string>
     <string name="automatic_storage_manager_activation_warning" msgid="6353100011690933254">"Ձեր սարքի հիշողությունն այժմ կառավարվում է հիշողության կառավարիչի կողմից"</string>
     <string name="account_for_section_header" msgid="5356566418548737121">"Հաշիվներ <xliff:g id="USER_NAME">%1$s</xliff:g> օգտատիրոջ համար"</string>
@@ -3631,7 +3664,9 @@
     <string name="enterprise_privacy_always_on_vpn_personal" msgid="9217774730260037434">"«Միշտ միացված VPN» կարգավորումը միացված է ձեր անձնական պրոֆիլում"</string>
     <string name="enterprise_privacy_always_on_vpn_work" msgid="7244472958208315814">"«Միշտ միացված VPN» կարգավորումը միացված է ձեր աշխատանքային պրոֆիլում"</string>
     <string name="enterprise_privacy_global_http_proxy" msgid="7936664553416257333">"Ընդհանուր HTTP պրոքսին կարգավորված է"</string>
-    <string name="enterprise_privacy_ca_certs" msgid="5885892204903688909">"Վստահելի հավատարմագրեր"</string>
+    <string name="enterprise_privacy_ca_certs_device" msgid="2019652712782510262">"Վստահելի ՀԿ հավաստագրեր"</string>
+    <string name="enterprise_privacy_ca_certs_personal" msgid="2279084820904076599">"Վստահելի ՀԿ հավաստագրեր ձեր անձնական պրոֆիլում"</string>
+    <string name="enterprise_privacy_ca_certs_work" msgid="6187377647815301809">"Վստահելի ՀԿ հավաստագրեր ձեր աշխատանքային պրոֆիլում"</string>
     <plurals name="enterprise_privacy_number_ca_certs" formatted="false" msgid="526375234629534165">
       <item quantity="one">Minimum <xliff:g id="COUNT_1">%d</xliff:g> CA certificates</item>
       <item quantity="other">Նվազագույնը <xliff:g id="COUNT_1">%d</xliff:g> ՎԿ հավաստագիր</item>
@@ -3676,7 +3711,7 @@
     <string name="clear_instant_app_data" msgid="2004222610585890909">"Մաքրել հավելվածի տվյալները"</string>
     <string name="clear_instant_app_confirmation" msgid="7451671214898856857">"Հեռացնե՞լ այս ակնթարթորեն գործարկվող հավելվածը։"</string>
     <string name="game_storage_settings" msgid="3410689937046696557">"Խաղեր"</string>
-    <string name="audio_files_title" msgid="4777048870657911307">"Ձայնային ֆայլեր"</string>
+    <string name="audio_files_title" msgid="4777048870657911307">"Աուդիո ֆայլեր"</string>
     <string name="app_info_storage_title" msgid="5554719444625611987">"Օգտագործած տարածքը"</string>
     <string name="webview_uninstalled_for_user" msgid="1819903169194420983">"(հեռացված է <xliff:g id="USER">%s</xliff:g> օգտատիրոջ համար)"</string>
     <string name="webview_disabled_for_user" msgid="1216426047631256825">"(անջատված է <xliff:g id="USER">%s</xliff:g> օգտատիրոջ համար)"</string>
@@ -3694,6 +3729,8 @@
     <string name="carrier_provisioning" msgid="4398683675591893169">"Օպերատորի նախապատրաստման տվյալներ"</string>
     <string name="trigger_carrier_provisioning" msgid="3434865918009286187">"Գործարկել օպերատորի նախապատրաստումը"</string>
     <string name="new_device_suggestion_title" msgid="698847081680980774">"Ի՞նչ նորույթներ կան:"</string>
-    <string name="new_device_suggestion_summary" msgid="7172709269203435870">"Փորձեք լավագույն 5 գործառույթները"</string>
+    <string name="new_device_suggestion_summary" product="default" msgid="206396571522515855">"Ծանոթացեք ձեր նոր հեռախոսին"</string>
+    <string name="new_device_suggestion_summary" product="tablet" msgid="393751455688210956">"Ծանոթացեք ձեր նոր պլանշետին"</string>
+    <string name="new_device_suggestion_summary" product="device" msgid="2939870049868336652">"Ծանոթացեք ձեր նոր սարքին"</string>
     <string name="disabled_low_ram_device" msgid="3751578499721173344">"Տվյալ գործառույթը հասանելի չէ այս սարքի վրա"</string>
 </resources>
diff --git a/res/values-in/arrays.xml b/res/values-in/arrays.xml
index b6c0aab..d317a9a 100644
--- a/res/values-in/arrays.xml
+++ b/res/values-in/arrays.xml
@@ -100,8 +100,6 @@
     <!-- no translation found for wifi_security_no_eap:0 (2084555984818107151) -->
     <!-- no translation found for wifi_security_no_eap:1 (397579322683471524) -->
     <!-- no translation found for wifi_security_no_eap:2 (1968820975358150484) -->
-    <!-- no translation found for wifi_ap_security:0 (5251664683198623324) -->
-    <!-- no translation found for wifi_ap_security:1 (7989073072260294673) -->
   <string-array name="wifi_eap_method">
     <item msgid="1160193392455075561">"PEAP"</item>
     <item msgid="7981731051382306293">"TLS"</item>
diff --git a/res/values-in/strings.xml b/res/values-in/strings.xml
index dbeb19e..c98c4df 100644
--- a/res/values-in/strings.xml
+++ b/res/values-in/strings.xml
@@ -166,7 +166,7 @@
     <string name="bluetooth_map_acceptance_dialog_text" msgid="8712508202081143737">"%1$s ingin mengakses pesan Anda. Berikan akses pada %2$s?"</string>
     <string name="bluetooth_sap_request" msgid="2669762224045354417">"Permintaan akses SIM"</string>
     <string name="bluetooth_sap_acceptance_dialog_text" msgid="4414253873553608690">"<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g> ingin mengakses kartu SIM. Memberi akses ke kartu SIM akan menonaktifkan konektivitas data di perangkat selama tersambung. Berikan akses ke <xliff:g id="DEVICE_NAME_1">%2$s?</xliff:g>"</string>
-    <string name="bluetooth_device_name_summary" msgid="4757990010751789977">"Terlihat sebagai \'<xliff:g id="DEVICE_NAME">^1</xliff:g>\' oleh perangkat lain"</string>
+    <string name="bluetooth_device_name_summary" msgid="522235742194965734">"Terlihat sebagai “<xliff:g id="DEVICE_NAME">^1</xliff:g>” oleh perangkat lain"</string>
     <string name="bluetooth_paired_device_title" msgid="8638994696317952019">"Perangkat Anda"</string>
     <string name="bluetooth_pairing_page_title" msgid="7712127387361962608">"Sambungkan perangkat baru"</string>
     <string name="date_and_time" msgid="9062980487860757694">"Tanggal &amp; waktu"</string>
@@ -312,6 +312,8 @@
     <string name="zone_auto" msgid="334783869352026648">"Zona waktu otomatis"</string>
     <string name="zone_auto_summaryOn" msgid="6142830927278458314">"Gunakan zona waktu yang disediakan jaringan"</string>
     <string name="zone_auto_summaryOff" msgid="2597745783162041390">"Gunakan zona waktu yang disediakan jaringan"</string>
+    <string name="date_time_24hour_auto" msgid="2117383168985653422">"Otomatis gunakan format 24 jam"</string>
+    <string name="date_time_24hour_auto_summary" msgid="6351812925651480277">"Gunakan default lokal"</string>
     <string name="date_time_24hour_title" msgid="3203537578602803850">"Format 24 jam"</string>
     <string name="date_time_24hour" msgid="1193032284921000063">"Gunakan format 24 jam"</string>
     <string name="date_time_set_time_title" msgid="6296795651349047016">"Waktu"</string>
@@ -324,7 +326,7 @@
     <string name="zone_list_menu_sort_by_timezone" msgid="2720190443744884114">"Urutkan menurut zona waktu"</string>
     <string name="date_picker_title" msgid="1338210036394128512">"Tanggal"</string>
     <string name="time_picker_title" msgid="483460752287255019">"Waktu"</string>
-    <string name="lock_after_timeout" msgid="4590337686681194648">"Menggembok secara otomatis"</string>
+    <string name="lock_after_timeout" msgid="4590337686681194648">"Mengunci secara otomatis"</string>
     <string name="lock_after_timeout_summary" msgid="6128431871360905631">"<xliff:g id="TIMEOUT_STRING">%1$s</xliff:g> setelah tidur"</string>
     <string name="lock_immediately_summary_with_exception" msgid="9119632173886172690">"Segera setelah tidur, kecuali kuncinya tetap dibuka oleh <xliff:g id="TRUST_AGENT_NAME">%1$s</xliff:g>"</string>
     <string name="lock_after_timeout_summary_with_exception" msgid="5579064842797188409">"<xliff:g id="TIMEOUT_STRING">%1$s</xliff:g> setelah tidur, kecuali jika tetap dikunci oleh <xliff:g id="TRUST_AGENT_NAME">%2$s</xliff:g>"</string>
@@ -372,6 +374,9 @@
     <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="1961957425135180242">"Berikutnya"</string>
+    <string name="setup_fingerprint_enroll_skip_title" msgid="362050541117362034">"Lewati sidik jari?"</string>
+    <string name="setup_fingerprint_enroll_skip_after_adding_lock_text" msgid="958990414356204763">"Penyiapan sidik jari hanya memerlukan waktu 1 atau 2 menit. Jika langkah ini dilewati, selanjutnya Anda dapat menambahkan sidik jari di setelan."</string>
+    <string name="lock_screen_intro_skip_title" msgid="4988210105913705679">"Lewati kunci layar?"</string>
     <string name="lock_screen_intro_skip_dialog_text_frp" product="tablet" msgid="1581834104051243425">"Fitur perlindungan perangkat tidak akan diaktifkan. Anda tidak akan dapat mencegah orang lain menggunakan tablet ini jika hilang, dicuri, atau disetel ulang."</string>
     <string name="lock_screen_intro_skip_dialog_text_frp" product="device" msgid="4629503416877189572">"Fitur perlindungan perangkat tidak akan diaktifkan. Anda tidak akan dapat mencegah orang lain menggunakan perangkat ini jika hilang, dicuri, atau disetel ulang."</string>
     <string name="lock_screen_intro_skip_dialog_text_frp" product="default" msgid="2423428240245737909">"Fitur perlindungan perangkat tidak akan diaktifkan. Anda tidak akan dapat mencegah orang lain ponsel perangkat ini jika hilang, dicuri, atau disetel ulang."</string>
@@ -457,7 +462,7 @@
     <string name="setup_lock_settings_picker_title" product="tablet" msgid="90329443364067215">"Lindungi tablet"</string>
     <string name="setup_lock_settings_picker_title" product="device" msgid="2399952075134938929">"Lindungi perangkat"</string>
     <string name="setup_lock_settings_picker_title" product="default" msgid="1572244299605153324">"Lindungi ponsel"</string>
-    <string name="setup_lock_settings_picker_fingerprint_message" msgid="5585650064305600578">"Untuk tambahan keamanan, siapkan kunci layar cadangan."</string>
+    <string name="lock_settings_picker_fingerprint_added_security_message" msgid="5768002109707648463">"Untuk tambahan keamanan, setel kunci layar backup."</string>
     <string name="setup_lock_settings_picker_message" product="tablet" msgid="8919671129189936210">"Cegah orang lain menggunakan tablet 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="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>
@@ -468,7 +473,7 @@
     <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 gembok"</string>
+    <string name="unlock_set_unlock_launch_picker_change_title" msgid="5045866882028324941">"Ubah layar kunci"</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>
@@ -588,6 +593,7 @@
     <string name="lockpassword_pin_no_sequential_digits" msgid="680765285206990584">"Urutan digit naik, turun, atau berulang tidak diizinkan"</string>
     <string name="lockpassword_ok_label" msgid="313822574062553672">"Oke"</string>
     <string name="lockpassword_cancel_label" msgid="8818529276331121899">"Batal"</string>
+    <string name="lockpassword_clear_label" msgid="5724429464960458155">"Hapus"</string>
     <string name="lockpattern_tutorial_cancel_label" msgid="6431583477570493261">"Batal"</string>
     <string name="lockpattern_tutorial_continue_label" msgid="3559793618653400434">"Selanjutnya"</string>
     <string name="lock_setup" msgid="3355847066343753943">"Penyiapan selesai."</string>
@@ -636,7 +642,7 @@
     <string name="bluetooth_pairing_dialog_sharing_phonebook_title" msgid="7664141669886358618">"Bagikan buku telepon?"</string>
     <string name="bluetooth_pairing_dialog_contants_request" msgid="5531109163573611348">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> ingin mengakses kontak dan riwayat panggilan Anda."</string>
     <string name="bluetooth_pairing_dialog_paring_request" msgid="8451248193517851958">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> ingin menyandingkan dengan Bluetooth. Saat tersambung, perangkat dapat mengakses kontak &amp; riwayat panggilan Anda."</string>
-    <string name="bluetooth_preference_paired_devices" msgid="1970524193086791964">"Perangkat disandingkan"</string>
+    <string name="bluetooth_preference_paired_devices" msgid="1970524193086791964">"Perangkat disambungkan"</string>
     <string name="bluetooth_preference_found_devices" msgid="1647983835063249680">"Perangkat yang tersedia"</string>
     <string name="bluetooth_preference_no_found_devices" msgid="7594339669961811591">"Perangkat tak tersedia"</string>
     <string name="bluetooth_device_context_connect" msgid="3997659895003244941">"Sambungkan"</string>
@@ -761,7 +767,7 @@
     <string name="wifi_menu_forget" msgid="8736964302477327114">"Lupakan jaringan"</string>
     <string name="wifi_menu_modify" msgid="2068554918652440105">"Ubah jaringan"</string>
     <string name="wifi_menu_write_to_nfc" msgid="7692881642188240324">"Tulis ke tag NFC"</string>
-    <string name="wifi_empty_list_wifi_off" msgid="8056223875951079463">"Lihat jaringan yang ada dengan menyalakan Wi-Fi."</string>
+    <string name="wifi_empty_list_wifi_off" msgid="8056223875951079463">"Aktifkan Wi-Fi untuk melihat jaringan yang ada."</string>
     <string name="wifi_empty_list_wifi_on" msgid="8746108031587976356">"Menelusuri jaringan Wi-Fi..."</string>
     <string name="wifi_empty_list_user_restricted" msgid="7322372065475939129">"Anda tidak memiliki izin untuk mengubah jaringan Wi‑Fi."</string>
     <string name="wifi_more" msgid="3195296805089107950">"Lainnya"</string>
@@ -781,6 +787,7 @@
     <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>
@@ -817,6 +824,8 @@
     <string name="wifi_wps_available_first_item" msgid="4422547079984583502">"WPS tersedia"</string>
     <string name="wifi_wps_available_second_item" msgid="8427520131718215301">" (WPS tersedia)"</string>
     <string name="wifi_wps_nfc_enter_password" msgid="2288214226916117159">"Masukkan sandi jaringan Anda"</string>
+    <string name="wifi_carrier_connect" msgid="8174696557882299911">"Jaringan Wi‑Fi operator"</string>
+    <string name="wifi_carrier_content" msgid="4634077285415851933">"Sambungkan melalui <xliff:g id="NAME">%1%s</xliff:g>"</string>
     <string name="wifi_scan_always_turnon_message" msgid="203123538572122989">"Untuk meningkatkan ketepatan lokasi dan untuk tujuan lainnya, <xliff:g id="APP_NAME">%1$s</xliff:g> ingin mengaktifkan pemindaian jaringan, bahkan saat Wi-Fi sedang tidak aktif.\n\nIzinkan ini untuk semua aplikasi yang ingin memindai?"</string>
     <string name="wifi_scan_always_turnoff_message" msgid="5538901671131941043">"Untuk menonaktifkannya, buka Lanjutan di menu luapan."</string>
     <string name="wifi_scan_always_confirm_allow" msgid="5355973075896817232">"Izinkan"</string>
@@ -834,6 +843,7 @@
     <string name="wifi_connect" msgid="1076622875777072845">"Sambungkan"</string>
     <string name="wifi_failed_connect_message" msgid="8491902558970292871">"Gagal menyambung ke jaringan"</string>
     <string name="wifi_forget" msgid="8168174695608386644">"Lupakan"</string>
+    <string name="wifi_modify" msgid="6100248070440710782">"Ubah"</string>
     <string name="wifi_failed_forget_message" msgid="1348172929201654986">"Gagal melupakan jaringan"</string>
     <string name="wifi_save" msgid="3331121567988522826">"Simpan"</string>
     <string name="wifi_failed_save_message" msgid="6650004874143815692">"Gagal menyimpan jaringan"</string>
@@ -846,6 +856,7 @@
     <string name="wifi_advanced_titlebar" msgid="4485841401774142908">"Wi-Fi Lanjutan"</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_title" msgid="3471132676909349382">"Info jaringan"</string>
     <string name="wifi_details_subnet_mask" msgid="6720279144174924410">"Subnet mask"</string>
     <string name="wifi_details_dns" msgid="8648826607751830768">"DNS"</string>
     <string name="wifi_details_ipv6_address_header" msgid="6734119149106422148">"Alamat IPv6"</string>
@@ -878,16 +889,15 @@
     <string name="wifi_p2p_cancel_connect_title" msgid="255267538099324413">"Batalkan undangan?"</string>
     <string name="wifi_p2p_cancel_connect_message" msgid="7477756213423749402">"Apakah Anda ingin membatalkan undangan untuk tersambung dengan <xliff:g id="PEER_NAME">%1$s</xliff:g>?"</string>
     <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_off_subtext" msgid="5466126533609394170">"Tidak berbagi sambungan Internet atau konten dengan perangkat lainnya"</string>
     <string name="wifi_hotspot_tethering_on_subtext" product="tablet" msgid="5752490509369962007">"Membagikan sambungan internet tablet ini melalui hotspot"</string>
     <string name="wifi_hotspot_tethering_on_subtext" product="default" msgid="6461075246164300670">"Membagikan sambungan Internet ponsel ini melalui hotspot"</string>
     <string name="wifi_hotspot_on_local_only_subtext" msgid="2068110388011294735">"Aplikasi membagikan konten. Untuk membagikan sambungan Internet, nonaktifkan hotspot, kemudian aktifkan kembali"</string>
-    <string name="wifi_hotspot_name_title" msgid="1341735529132128887">"Nama Wi‑Fi"</string>
+    <string name="wifi_hotspot_name_title" msgid="8237000746618636778">"Nama hotspot"</string>
     <string name="wifi_hotspot_name_summary_connecting" msgid="3378299995508671967">"Mengaktifkan <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>..."</string>
     <string name="wifi_hotspot_name_summary_connected" msgid="3888672084861445362">"Perangkat lainnya dapat terhubung ke <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>"</string>
-    <string name="wifi_hotspot_password_title" msgid="1955592302902091281">"Sandi Wi-Fi"</string>
+    <string name="wifi_hotspot_password_title" msgid="8676859981917573801">"Sandi hotspot"</string>
     <string name="wifi_hotspot_ap_band_title" msgid="1165801173359290681">"Pita AP"</string>
     <string name="wifi_hotspot_footer_info_regular" msgid="1203489406068036455">"Gunakan hotspot guna membuat jaringan Wi‑Fi untuk perangkat Anda lainnya. Hotspot menyediakan sambungan Internet menggunakan sambungan data seluler Anda. Biaya data tambahan mungkin berlaku."</string>
     <string name="wifi_hotspot_footer_info_local_only" msgid="857988412470694109">"Aplikasi dapat membuat hotspot untuk berbagi konten dengan perangkat di sekitar."</string>
@@ -898,7 +908,6 @@
     <string name="wifi_tether_configure_ap_text" msgid="7974681394041609308">"Siapkan hotspot Wi-Fi"</string>
     <string name="wifi_hotspot_configure_ap_text" msgid="5478614731464220432">"Penyiapan hotspot Wi‑Fi"</string>
     <string name="wifi_hotspot_configure_ap_text_summary" msgid="5560680057727007011">"Hotspot AndroidAP WPA2 PSK"</string>
-    <string name="wifi_tether_configure_subtext" msgid="2050196439900426456">"Hotspot <xliff:g id="NETWORK_SSID">%1$s</xliff:g> <xliff:g id="NETWORK_SECURITY">%2$s</xliff:g>"</string>
     <string name="wifi_tether_configure_ssid_default" msgid="8467525402622138547">"AndroidHotspot"</string>
     <string name="wifi_calling_settings_title" msgid="4102921303993404577">"Panggilan Wi-Fi"</string>
     <string name="wifi_calling_suggestion_title" msgid="9008010480466359578">"Mengaktifkan Panggilan Wi-Fi"</string>
@@ -939,7 +948,7 @@
     <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="emergency_address_summary" msgid="3266760199681945746">"Alamat yang digunakan oleh layanan darurat sebagai lokasi Anda jika Anda melakukan panggilan darurat melalui Wi-Fi"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"Tampilan"</string>
     <string name="sound_settings" msgid="5534671337768745343">"Suara"</string>
     <string name="all_volume_title" msgid="4296957391257836961">"Volume"</string>
@@ -959,7 +968,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 diketuk"</string>
+    <string name="haptic_feedback_enable_title" msgid="7152163068278526530">"Bergetar saat di-tap"</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>
@@ -993,6 +1002,7 @@
     <string name="search_settings" msgid="1910951467596035063">"Telusuri"</string>
     <string name="search_settings_summary" msgid="9205656546570654169">"Kelola setelan dan riwayat penelusuran"</string>
     <string name="search_settings_no_results" msgid="8799027492641230999">"Tidak ada hasil"</string>
+    <string name="search_clear_history" msgid="4196658962573162457">"Hapus histori"</string>
     <string name="display_settings" msgid="7965901687241669598">"Tampilan"</string>
     <string name="accelerometer_title" msgid="7854608399547349157">"Rotasi layar otomatis"</string>
     <string name="color_mode_title" msgid="3159275920408338215">"Warna jernih"</string>
@@ -1049,14 +1059,14 @@
     <string name="wallpaper_suggestion_summary" msgid="1579144009898110491">"Personalisasi layar Anda"</string>
     <string name="wallpaper_settings_fragment_title" msgid="519078346877860129">"Pilih wallpaper dari"</string>
     <string name="screensaver_settings_title" msgid="1770575686476851778">"Screen saver"</string>
-    <string name="screensaver_settings_summary_either_long" msgid="7302740999250873332">"Saat mengisi daya atau dipasang ke dok"</string>
+    <string name="screensaver_settings_summary_either_long" msgid="7302740999250873332">"Saat mengisi baterai atau dipasang ke dok"</string>
     <string name="screensaver_settings_summary_either_short" msgid="6140527286137331478">"Keduanya"</string>
-    <string name="screensaver_settings_summary_sleep" msgid="9086186698140423493">"Saat mengisi daya"</string>
+    <string name="screensaver_settings_summary_sleep" msgid="9086186698140423493">"Saat mengisi baterai"</string>
     <string name="screensaver_settings_summary_dock" msgid="2072657401664633283">"Selagi di dok"</string>
     <string name="screensaver_settings_summary_never" msgid="5165622985174349585">"Tidak pernah"</string>
     <string name="screensaver_settings_summary_off" msgid="2481581696365146473">"Mati"</string>
     <string name="screensaver_settings_disabled_prompt" msgid="1239088321034437608">"Untuk mengontrol yang terjadi saat ponsel dipasang ke dok dan/atau sedang tidur, aktifkan screen saver."</string>
-    <string name="screensaver_settings_when_to_dream" msgid="7262410541382890146">"Ketika memulai"</string>
+    <string name="screensaver_settings_when_to_dream" msgid="7262410541382890146">"Waktu mulai"</string>
     <string name="screensaver_settings_current" msgid="4663846038247130023">"Screensaver saat ini"</string>
     <string name="screensaver_settings_dream_start" msgid="4998187847985120168">"Mulai sekarang"</string>
     <string name="screensaver_settings_button" msgid="7292214707625717013">"Setelan"</string>
@@ -1067,7 +1077,7 @@
     <string name="ambient_display_screen_summary_notifications" msgid="1449570742600868654">"Notifikasi baru"</string>
     <string name="ambient_display_category_triggers" msgid="4359289754456268573">"Waktu ditampilkan"</string>
     <string name="doze_title" msgid="2375510714460456687">"Notifikasi baru"</string>
-    <string name="doze_summary" msgid="3846219936142814032">"Membangunkan layar saat Anda menerima notifikasi"</string>
+    <string name="doze_summary" msgid="3846219936142814032">"Mengaktifkan layar saat Anda menerima notifikasi"</string>
     <string name="doze_always_on_title" msgid="1046222370442629646">"Selalu aktif"</string>
     <string name="doze_always_on_summary" msgid="6978257596231155345">"Menampilkan waktu, ikon notifikasi, dan info lainnya. Penggunaan baterai meningkat."</string>
     <string name="title_font_size" msgid="4405544325522105222">"Ukuran font"</string>
@@ -1111,7 +1121,7 @@
     <string name="pin_failed" msgid="1848423634948587645">"Operasi PIN SIM gagal!"</string>
     <string name="device_info_settings" product="tablet" msgid="1119755927536987178">"Status tablet"</string>
     <string name="device_info_settings" product="default" msgid="475872867864762157">"Status ponsel"</string>
-    <string name="system_update_settings_list_item_title" msgid="3342887311059985961">"Pembaruan sistem"</string>
+    <string name="system_update_settings_list_item_title" msgid="3342887311059985961">"Update sistem"</string>
     <string name="system_update_settings_list_item_summary" msgid="3853057315907710747"></string>
     <string name="firmware_version" msgid="4801135784886859972">"Versi Android"</string>
     <string name="security_patch" msgid="8438384045870296634">"Tingkat patch keamanan Android"</string>
@@ -1122,7 +1132,6 @@
     <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="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>
     <string name="device_status" msgid="607405385799807324">"Status"</string>
@@ -1150,7 +1159,6 @@
     <string name="status_wifi_mac_address" msgid="2202206684020765378">"Alamat MAC Wi-Fi"</string>
     <string name="status_bt_address" msgid="4195174192087439720">"Alamat bluetooth"</string>
     <string name="status_serial_number" msgid="2257111183374628137">"Nomor seri"</string>
-    <string name="status_unavailable" msgid="7862009036663793314">"Tidak Tersedia"</string>
     <string name="status_up_time" msgid="7294859476816760399">"Waktu aktif"</string>
     <string name="status_awake_time" msgid="2393949909051183652">"Waktu bangun"</string>
     <string name="internal_memory" msgid="9129595691484260784">"Penyimpanan internal"</string>
@@ -1326,6 +1334,7 @@
     <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>
     <string name="reset_dashboard_title" msgid="6254873816990678620">"Opsi setel ulang"</string>
+    <string name="reset_dashboard_summary" msgid="4851012632493522755">"Jaringan, aplikasi, atau perangkat dapat disetel ulang"</string>
     <string name="reset_network_title" msgid="6166025966016873843">"Setel ulang Wi-Fi, data seluler &amp; Bluetooth"</string>
     <string name="reset_network_desc" msgid="5547979398298881406">"Tindakan ini akan menyetel ulang semua setelan jaringan, termasuk:\n\n"<li>"Wi‑Fi"</li>\n<li>"Data seluler"</li>\n<li>"Bluetooth"</li></string>
     <string name="reset_network_button_text" msgid="2035676527471089853">"Setel ulang setelan"</string>
@@ -1334,17 +1343,14 @@
     <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="6617679904229218425">"Hapus semua data (Reset 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>
-    </plurals>
-    <string name="master_clear_summary" msgid="6902443944660426951">"Penyimpanan internal &amp; semua data akan disetel ulang"</string>
+    <string name="master_clear_title" msgid="3531267871084279512">"Hapus semua data (reset ke setelan pabrik)"</string>
     <string name="master_clear_desc" product="tablet" msgid="9146059417023157222">"Ini akan menghapus semua data dari "<b>"penyimpanan internal"</b>" tablet Anda, termasuk:\n\n"<li>"Akun Google Anda"</li>\n<li>"Data sistem dan apl serta setelan"</li>\n<li>"Apl download"</li></string>
     <string name="master_clear_desc" product="default" msgid="4800386183314202571">"Ini akan menghapus semua data dari "<b>"penyimpanan internal"</b>" ponsel Anda, termasuk:\n\n"<li>"Akun Google Anda"</li>\n<li>"Data sistem dan apl serta setelan"</li>\n<li>"Apl download"</li></string>
-    <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"Saat ini Anda telah masuk ke akun berikut ini:\n"</string>
+    <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"Saat ini Anda telah login ke akun berikut:\n"</string>
     <string name="master_clear_other_users_present" product="default" msgid="5161423070702470742">\n\n"Ada pengguna lain yang aktif di perangkat ini.\n"</string>
     <string name="master_clear_desc_also_erases_external" msgid="1903185203791274237"><li>"Musik"</li>\n<li>"Foto"</li>\n<li>"Data pengguna lainnya"</li></string>
+    <string name="master_clear_desc_also_erases_esim" msgid="312352697653096008"><li>"Operator di eSIM"</li></string>
+    <string name="master_clear_desc_no_cancel_mobile_plan" msgid="5460926449093211144">\n\n"Tindakan ini tidak akan membatalkan paket layanan seluler."</string>
     <string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="7744115866662613411">\n\n"Untuk menghapus gambar, musik, dan data pengguna lainnya, "<b>"penyimpanan USB"</b>" perlu dihapus."</string>
     <string name="master_clear_desc_erase_external_storage" product="default" msgid="4801026652617377093">\n\n"Untuk menghapus musik, gambar, dan data pengguna lainnya, "<b>"kartu SD"</b>" perlu dihapus."</string>
     <string name="erase_external_storage" product="nosdcard" msgid="969364037450286809">"Hapus penyimpanan USB"</string>
@@ -1461,15 +1467,16 @@
     <string name="settings_safetylegal_activity_title" msgid="6901214628496951727">"Informasi keselamatan"</string>
     <string name="settings_safetylegal_activity_unreachable" msgid="250674109915859456">"Anda tidak memiliki koneksi data. Untuk menampilkan informasi ini sekarang, buka %s dari komputer mana pun yang tersambung ke internet."</string>
     <string name="settings_safetylegal_activity_loading" msgid="8059022597639516348">"Memuat…"</string>
-    <string name="lockpassword_choose_your_password_header" msgid="8624900666929394990">"Pilih sandi Anda"</string>
-    <string name="lockpassword_choose_your_password_header_for_fingerprint" msgid="6624409510609085450">"Setel sandi guna memakai sidik jari"</string>
-    <string name="lockpassword_choose_your_pattern_header" msgid="6949761069941694050">"Pilih pola Anda"</string>
-    <string name="lockpassword_choose_your_pattern_header_for_fingerprint" msgid="5901096361617543819">"Setel pola guna memakai sidik jari"</string>
-    <string name="lockpassword_choose_your_pin_header" msgid="7598849519816138302">"Pilih PIN Anda"</string>
-    <string name="lockpassword_choose_your_pin_header_for_fingerprint" msgid="765344692615917183">"Setel PIN guna memakai sidik jari"</string>
-    <string name="lockpassword_confirm_your_password_header" msgid="6308478184889846633">"Konfirmasi sandi Anda"</string>
+    <string name="lockpassword_choose_your_screen_lock_header" msgid="3872462096767152394">"Setel kunci layar"</string>
+    <string name="lockpassword_choose_your_password_message" msgid="1197569283524841412">"Untuk keamanan, setel sandi"</string>
+    <string name="lockpassword_choose_your_password_header_for_fingerprint" msgid="2541818487015343503">"Setel sandi untuk menggunakan sidik jari"</string>
+    <string name="lockpassword_choose_your_pattern_header_for_fingerprint" msgid="7709785406243556723">"Setel pola untuk menggunakan sidik jari"</string>
+    <string name="lockpassword_choose_your_pin_message" msgid="1875420718677275646">"Untuk keamanan, setel PIN"</string>
+    <string name="lockpassword_choose_your_pin_header_for_fingerprint" msgid="1549639053195796674">"Setel PIN untuk memakai sidik jari"</string>
+    <string name="lockpassword_choose_your_pattern_message" msgid="5986983400689720015">"Untuk keamanan, setel pola"</string>
+    <string name="lockpassword_confirm_your_password_header" msgid="1266027268220850931">"Masukkan ulang sandi"</string>
     <string name="lockpassword_confirm_your_pattern_header" msgid="7543433733032330821">"Konfirmasi pola Anda"</string>
-    <string name="lockpassword_confirm_your_pin_header" msgid="49038294648213197">"Konfirmasi PIN Anda"</string>
+    <string name="lockpassword_confirm_your_pin_header" msgid="7744513791910572550">"Masukkan ulang PIN"</string>
     <string name="lockpassword_confirm_passwords_dont_match" msgid="5140892109439191415">"Sandi tidak cocok"</string>
     <string name="lockpassword_confirm_pins_dont_match" msgid="7226244811505606217">"PIN tidak cocok"</string>
     <string name="lockpassword_choose_lock_generic_header" msgid="3811438094903786145">"Buka pilihan"</string>
@@ -1488,6 +1495,12 @@
     <string name="lockpassword_strong_auth_required_work_pattern" msgid="3003781907040522053">"Untuk tambahan keamanan, gunakan pola profil kerja"</string>
     <string name="lockpassword_strong_auth_required_work_pin" msgid="3367491332598821552">"Untuk tambahan keamanan, masukkan PIN profil kerja"</string>
     <string name="lockpassword_strong_auth_required_work_password" msgid="8159775129968582940">"Untuk tambahan keamanan, masukkan sandi profil kerja"</string>
+    <string name="lockpassword_confirm_your_pattern_details_frp" msgid="6757336656791723193">"Ponsel telah disetel ulang ke setelan pabrik. Masukkan pola sebelumnya untuk menggunakan ponsel."</string>
+    <string name="lockpassword_confirm_your_pin_details_frp" msgid="826520613445990470">"Ponsel telah disetel ulang ke setelan pabrik. Masukkan PIN sebelumnya untuk menggunakan ponsel."</string>
+    <string name="lockpassword_confirm_your_password_details_frp" msgid="8944081074615739040">"Ponsel telah disetel ulang ke setelan pabrik. Masukkan sandi sebelumnya untuk menggunakan ponsel."</string>
+    <string name="lockpassword_confirm_your_pattern_header_frp" msgid="2898036091609128286">"Verifikasi pola"</string>
+    <string name="lockpassword_confirm_your_pin_header_frp" msgid="4141601774778898803">"Verifikasi PIN"</string>
+    <string name="lockpassword_confirm_your_password_header_frp" msgid="3762615419295360480">"Verifikasi sandi"</string>
     <string name="lockpassword_invalid_pin" msgid="15588049067548470">"PIN Salah"</string>
     <string name="lockpassword_invalid_password" msgid="4038507398784975200">"Sandi salah"</string>
     <string name="lockpattern_need_to_unlock_wrong" msgid="1745247595356012176">"Pola salah"</string>
@@ -1510,8 +1523,8 @@
     <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 diketuk"</string>
-    <string name="lockpattern_settings_enable_power_button_instantly_locks" msgid="5735444062633666327">"Tombol daya langsung kunci"</string>
+    <string name="lockpattern_settings_enable_tactile_feedback_title" msgid="4389015658335522989">"Bergetar saat di-tap"</string>
+    <string name="lockpattern_settings_enable_power_button_instantly_locks" msgid="5735444062633666327">"Tombol power langsung kunci"</string>
     <string name="lockpattern_settings_power_button_instantly_locks_summary" msgid="8196258755143711694">"Kecuali jika tetap dikunci oleh <xliff:g id="TRUST_AGENT_NAME">%1$s</xliff:g>"</string>
     <string name="lockpattern_settings_choose_lock_pattern" msgid="1652352830005653447">"Setel pola pembuka kunci"</string>
     <string name="lockpattern_settings_change_lock_pattern" msgid="1123908306116495545">"Ubah pola pembuka kunci"</string>
@@ -1537,7 +1550,6 @@
     <string name="install_applications_title" msgid="4987712352256508946">"Izinkan semua sumber aplikasi"</string>
     <string name="recent_app_category_title" msgid="6673071268966003928">"Aplikasi yang baru dibuka"</string>
     <string name="see_all_apps_title" msgid="1317153498074308438">"Lihat <xliff:g id="COUNT">%1$d</xliff:g> aplikasi semuanya"</string>
-    <string name="recent_app_summary" msgid="3366446669844932300">"<xliff:g id="TIME">^1</xliff:g> yang lalu"</string>
     <string name="install_all_warning" product="tablet" msgid="8310489909586138165">"Tablet dan data pribadi lebih rentan terhadap serangan oleh aplikasi yang tidak dikenal. Dengan menginstal aplikasi dari sumber ini, Anda setuju bahwa Anda bertanggung jawab atas kerusakan tablet atau kehilangan data yang mungkin terjadi akibat penggunaannya."</string>
     <string name="install_all_warning" product="default" msgid="1952257127370115988">"Ponsel dan data pribadi lebih rentan terhadap serangan oleh aplikasi yang tidak dikenal. Dengan menginstal aplikasi dari sumber ini, Anda setuju bahwa Anda bertanggung jawab atas kerusakan ponsel atau kehilangan data yang mungkin terjadi akibat penggunaannya."</string>
     <string name="advanced_settings" msgid="1777249286757067969">"Setelan lanjutan"</string>
@@ -1648,7 +1660,7 @@
     <string name="move_app_failed_dlg_text" msgid="187885379493011720">"Tidak dapat memindahkan apl. <xliff:g id="REASON">%1$s</xliff:g>"</string>
     <string name="app_install_location_title" msgid="2068975150026852168">"Lokasi pemasangan yang disukai"</string>
     <string name="app_install_location_summary" msgid="5155453752692959098">"Ubah lokasi pemasangan yang diinginkan untuk apl baru."</string>
-    <string name="app_disable_dlg_title" msgid="3916469657537695436">"Nonaktifkan aplikasi bawaan?"</string>
+    <string name="app_disable_dlg_title" msgid="3916469657537695436">"Nonaktifkan aplikasi built-in?"</string>
     <string name="app_disable_dlg_positive" msgid="7375627244201714263">"Menonaktifkan aplikasi"</string>
     <string name="app_disable_dlg_text" msgid="5632072173181990531">"Jika Anda menonaktifkan aplikasi ini, Android dan aplikasi lain mungkin tidak berfungsi lagi sesuai harapan."</string>
     <string name="app_special_disable_dlg_title" msgid="2690148680327142674">"Hapus data dan nonaktifkan aplikasi?"</string>
@@ -1657,7 +1669,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 dipasang dari <xliff:g id="APP_STORE">%1$s</xliff:g>"</string>
+    <string name="app_install_details_summary" msgid="6464796332049327547">"Aplikasi diinstal 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>
@@ -1736,7 +1748,7 @@
     <string name="physical_keyboard_title" msgid="8285149877925752042">"Keyboard fisik"</string>
     <string name="show_ime" msgid="2658582193437188227">"Tampilkan keyboard virtual"</string>
     <string name="show_ime_summary" msgid="8164993045923240698">"Pertahankan di layar jika keyboard fisik masih aktif"</string>
-    <string name="keyboard_shortcuts_helper" msgid="4839453720463798145">"Pembantu pintasan keyboard"</string>
+    <string name="keyboard_shortcuts_helper" msgid="4839453720463798145">"Bantuan pintasan keyboard"</string>
     <string name="keyboard_shortcuts_helper_summary" msgid="5871299901459743288">"Tampilkan pintasan yang tersedia"</string>
     <string name="default_keyboard_layout" msgid="4172606673510531271">"Default"</string>
     <string name="pointer_speed" msgid="1221342330217861616">"Kecepatan penunjuk"</string>
@@ -1801,7 +1813,7 @@
     <string name="accessibility_settings_summary" msgid="981260486011624939">"Pembaca layar, tampilan, kontrol interaksi"</string>
     <string name="vision_settings_title" msgid="4204111425716868288">"Setelan Pandangan"</string>
     <string name="vision_settings_description" msgid="5679491180156408260">"Anda dapat menyesuaikan perangkat ini sesuai kebutuhan. Fitur aksesibilitas ini dapat diubah nanti di Setelan."</string>
-    <string name="vision_settings_suggestion_title" msgid="917294957154878441">"Tambahkan ukuran font"</string>
+    <string name="vision_settings_suggestion_title" msgid="8058794060304707004">"Ubah ukuran font"</string>
     <string name="screen_reader_category_title" msgid="7739154903913400641">"Pembaca layar"</string>
     <string name="audio_and_captions_category_title" msgid="3420727114421447524">"Audio &amp; teks di layar"</string>
     <string name="display_category_title" msgid="685461049938269166">"Tampilan"</string>
@@ -1838,7 +1850,6 @@
     <string name="accessibility_display_inversion_preference_subtitle" msgid="7052959202195368109">"Mungkin memengaruhi performa"</string>
     <string name="accessibility_autoclick_preference_title" msgid="7014499339068449623">"Klik setelah penunjuk mouse berhenti bergerak"</string>
     <string name="accessibility_autoclick_delay_preference_title" msgid="3962261178385106006">"Keterlambatan sebelum klik"</string>
-    <string name="preference_summary_default_combination" msgid="8532964268242666060">"<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">"AKTIF"</string>
     <string name="accessibility_summary_state_disabled" msgid="2241315620132005595">"NONAKTIF"</string>
     <string name="enable_quick_setting" msgid="2366999897816894536">"Tampilkan di Setelan Cepat"</string>
@@ -1957,12 +1968,14 @@
     <string name="background_activity_summary_on" msgid="649282072540085599">"Aplikasi dapat berjalan di background ketika tidak digunakan"</string>
     <string name="background_activity_summary_off" msgid="7666330699090632040">"Aktivitas background aplikasi dibatasi ketika tidak digunakan"</string>
     <string name="background_activity_summary_disabled" msgid="3710669050484599847">"Aplikasi tidak diizinkan berjalan di background"</string>
+    <string name="background_activity_summary_whitelisted" msgid="7375400051141016808">"Aplikasi tidak dapat dioptimalkan untuk penggunaan baterai"</string>
+    <string name="background_activity_warning_dialog_title" msgid="2216249969149568871">"Batasi aktivitas background?"</string>
+    <string name="background_activity_warning_dialog_text" msgid="7049624449246121981">"Jika aktivitas background aplikasi dibatasi, mungkin fungsinya terganggu."</string>
     <string name="device_screen_usage" msgid="3386088035570409683">"Penggunaan layar sejak pengisian baterai penuh terakhir"</string>
     <string name="device_screen_consumption" msgid="4607589286438986687">"Konsumsi layar"</string>
     <string name="device_cellular_network" msgid="4724773411762382950">"Pemindaian jaringan seluler"</string>
-    <string name="power_last_full_charge_summary" msgid="532845389094620657">"<xliff:g id="TIME">^1</xliff:g> yang lalu"</string>
-    <string name="power_usage_list_summary" msgid="6775339745194635000">"Penggunaan aplikasi sejak pengisian baterai terakhir hingga penuh (<xliff:g id="TIME">^1</xliff:g> yang lalu)"</string>
-    <string name="power_usage_list_summary_device" msgid="7036566616386864302">"Penggunaan perangkat sejak baterai diisi penuh (<xliff:g id="TIME">^1</xliff:g> lalu)"</string>
+    <string name="power_usage_list_summary" msgid="6393929085382334341">"Penggunaan aplikasi sejak baterai diisi penuh (<xliff:g id="RELATIVE_TIME">^1</xliff:g>)"</string>
+    <string name="power_usage_list_summary_device" msgid="4461926045610455423">"Penggunaan perangkat sejak baterai diisi penuh (<xliff:g id="RELATIVE_TIME">^1</xliff:g>)"</string>
     <string name="screen_usage_summary" msgid="6687403051423153550">"Jumlah waktu layar diaktifkan sejak pengisian daya terakhir hingga penuh"</string>
     <string name="device_usage_list_summary" msgid="5623036661468763251">"Penggunaan perangkat sejak pengisian baterai penuh terakhir"</string>
     <string name="battery_since_unplugged" msgid="338073389740738437">"Penggunaan baterai sejak dicabut"</string>
@@ -2208,14 +2221,14 @@
     <string name="credentials_unlock_hint" msgid="2301301378040499348">"Ketik sandi untuk penyimpanan kredensial."</string>
     <string name="credentials_old_password" msgid="7553393815538684028">"Sandi saat ini:"</string>
     <string name="credentials_reset_hint" msgid="6297256880896133631">"Hapus semua konten?"</string>
-    <string name="credentials_password_too_short" msgid="7502749986405522663">"Sandi minimal terdiri dari 8 karakter."</string>
     <string name="credentials_wrong_password" msgid="2541932597104054807">"Sandi salah."</string>
     <string name="credentials_reset_warning" msgid="5320653011511797600">"Sandi salah. Anda memiliki satu kesempatan lagi sebelum penyimpanan kredensial dihapus."</string>
     <string name="credentials_reset_warning_plural" msgid="6514085665301095279">"Sandi salah. Anda memiliki <xliff:g id="NUMBER">%1$d</xliff:g> kesempatan lagi sebelum penyimpanan kredensial dihapus."</string>
     <string name="credentials_erased" msgid="2907836028586342969">"Penyimpanan kredensial dihapus."</string>
     <string name="credentials_not_erased" msgid="7685932772284216097">"Penyimpanan kredensial tidak dapat dihapus."</string>
     <string name="credentials_enabled" msgid="7588607413349978930">"Penyimpanan kredensial diaktifkan."</string>
-    <string name="credentials_configure_lock_screen_hint" msgid="6757119179588664966">"Anda perlu menyetel PIN atau sandi pengunci layar sebelum dapat menggunakan penyimpanan kredensial."</string>
+    <string name="credentials_configure_lock_screen_hint" msgid="8058230497337529036">"Agar dapat menggunakan penyimpanan kredensial, perangkat harus memiliki layar kunci yang aman"</string>
+    <string name="credentials_configure_lock_screen_button" msgid="253239765216055321">"SETEL KUNCI"</string>
     <string name="usage_access_title" msgid="332333405495457839">"Aplikasi dengan akses penggunaan"</string>
     <string name="emergency_tone_title" msgid="1055954530111587114">"Nada darurat"</string>
     <string name="emergency_tone_summary" msgid="722259232924572153">"Setel perilaku ketika panggilan darurat dilakukan"</string>
@@ -2335,8 +2348,6 @@
     <skip />
     <string name="cant_sync_dialog_title" msgid="2777238588398046285">"Tidak dapat menyinkronkan secara manual"</string>
     <string name="cant_sync_dialog_message" msgid="1938380442159016449">"Saat ini, sinkronisasi untuk item ini dinonaktifkan. Untuk mengubah setelan ini, aktifkan data latar belakang dan sinkronisasi otomatis untuk sementara."</string>
-    <string name="wimax_settings" msgid="2655139497028469039">"4G"</string>
-    <string name="status_wimax_mac_address" msgid="8390791848661413416">"Alamat MAC 4G"</string>
     <string name="enter_password" msgid="8035706727471334122">"Untuk memulai Android, masukkan sandi"</string>
     <string name="enter_pin" msgid="5305333588093263790">"Untuk memulai Android, masukkan PIN"</string>
     <string name="enter_pattern" msgid="4187435713036808566">"Untuk memulai Android, gambar pola Anda"</string>
@@ -2350,6 +2361,7 @@
     <string name="misc_files_selected_count" msgid="4647048020823912088">"Terpilih <xliff:g id="NUMBER">%1$d</xliff:g> dari <xliff:g id="TOTAL">%2$d</xliff:g>"</string>
     <string name="misc_files_selected_count_bytes" msgid="2876232009069114352">"<xliff:g id="NUMBER">%1$s</xliff:g> dari <xliff:g id="TOTAL">%2$s</xliff:g>"</string>
     <string name="select_all" msgid="1562774643280376715">"Pilih semua"</string>
+    <string name="data_plan_usage_manage_plans_button_text" msgid="8997761990902708162">"Kelola paket"</string>
     <string name="data_usage_summary_title" msgid="3804110657238092929">"Penggunaan data"</string>
     <string name="data_usage_app_summary_title" msgid="4147258989837459172">"Penggunaan data aplikasi"</string>
     <string name="data_usage_accounting" msgid="7170028915873577387">"Penghitungan data operator mungkin berbeda dengan perangkat Anda."</string>
@@ -2406,11 +2418,11 @@
     <string name="data_usage_app_restrict_dialog" msgid="1466689968707308512">"Fitur ini dapat menghentikan aplikasi yang bergantung pada data latar saat hanya ada jaringan seluler.\n\nAnda dapat menemukan kontrol penggunaan data yang lebih sesuai dalam setelan yang tersedia dalam aplikasi."</string>
     <string name="data_usage_restrict_denied_dialog" msgid="55012417305745608">"Pembatasan data latar belakang hanya dimungkinkan jika Anda telah menyetel batas data seluler."</string>
     <string name="data_usage_auto_sync_on_dialog_title" msgid="2438617846762244389">"Aktifkan sinkronisasi data otomatis?"</string>
-    <string name="data_usage_auto_sync_on_dialog" product="tablet" msgid="8581983093524041669">"Perubahan apa pun yang dilakukan pada akun Anda di web akan disalin ke tablet secara otomatis.\n\nBeberapa akun juga dapat otomatis menyalin perubahan apa pun yang dilakukan di tablet ke web. Beginilah cara kerja Akun Google."</string>
-    <string name="data_usage_auto_sync_on_dialog" product="default" msgid="8651376294887142858">"Perubahan apa pun yang dilakukan pada akun Anda di web akan disalin ke ponsel secara otomatis.\n\nBeberapa akun juga dapat otomatis menyalin perubahan apa pun yang dilakukan di ponsel ke web. Beginilah cara kerja Akun Google."</string>
+    <string name="data_usage_auto_sync_on_dialog" product="tablet" msgid="8581983093524041669">"Perubahan apa pun yang dilakukan pada akun Anda di web akan disalin ke tablet secara otomatis.\n\nBeberapa akun juga dapat otomatis menyalin setiap perubahan yang dilakukan di tablet ke web. Akun Google mengikuti cara kerja tersebut."</string>
+    <string name="data_usage_auto_sync_on_dialog" product="default" msgid="8651376294887142858">"Perubahan apa pun yang dilakukan pada akun Anda di web akan disalin ke ponsel secara otomatis.\n\nBeberapa akun juga dapat otomatis menyalin setiap perubahan yang dilakukan di ponsel ke web. Akun Google mengikuti cara kerja tersebut."</string>
     <string name="data_usage_auto_sync_off_dialog_title" msgid="9013139130490125793">"Nonaktifkan sinkronisasi data otomatis?"</string>
-    <string name="data_usage_auto_sync_off_dialog" msgid="4025938250775413864">"Hal ini akan menghemat penggunaan baterai dan data, tapi Anda perlu menyinkronkan setiap akun secara manual untuk mengumpulkan informasi terkini. Anda juga tidak akan menerima pemberitahuan ketika ada pembaruan."</string>
-    <string name="data_usage_cycle_editor_title" msgid="1373797281540188533">"Tanggal penyetelan ulang daur penggunaan"</string>
+    <string name="data_usage_auto_sync_off_dialog" msgid="4025938250775413864">"Hal ini akan menghemat penggunaan baterai dan data, tapi Anda perlu menyinkronkan setiap akun secara manual untuk mengumpulkan informasi terkini. Anda juga tidak akan menerima pemberitahuan ketika ada update."</string>
+    <string name="data_usage_cycle_editor_title" msgid="1373797281540188533">"Tanggal penyetelan ulang siklus penggunaan"</string>
     <string name="data_usage_cycle_editor_subtitle" msgid="5512903797979928416">"Tanggal setiap bulannya:"</string>
     <string name="data_usage_cycle_editor_positive" msgid="8821760330497941117">"Setel"</string>
     <string name="data_usage_warning_editor_title" msgid="3704136912240060339">"Setel peringatan penggunaan data"</string>
@@ -2431,10 +2443,13 @@
     <string name="data_usage_total_during_range_mobile" product="tablet" msgid="1925687342154538972">"<xliff:g id="RANGE">%2$s</xliff:g>: sekitar <xliff:g id="TOTAL">%1$s</xliff:g> yang digunakan menurut tablet. Hitungan data operator dapat berbeda."</string>
     <string name="data_usage_total_during_range_mobile" product="default" msgid="5063981061103812900">"<xliff:g id="RANGE">%2$s</xliff:g>: sekitar <xliff:g id="TOTAL">%1$s</xliff:g> yang digunakan menurut ponsel. Hitungan data operator dapat berbeda."</string>
     <string name="data_usage_metered_title" msgid="7383175371006596441">"Batasan jaringan"</string>
-    <string name="data_usage_metered_body" msgid="7655851702771342507">"Jaringan terukur diperlakukan seperti jaringan seluler jika data latar belakang dibatasi. Saat hendak melakukan download file berukuran besar menggunakan jaringan ini, aplikasi mungkin memberikan peringatan."</string>
+    <string name="data_usage_metered_body" msgid="7655851702771342507">"Jaringan berbayar yang dikenakan biaya sesuai besarnya penggunaan (metered) diperlakukan seperti jaringan seluler jika data latar belakang dibatasi. Saat hendak melakukan download file berukuran besar menggunakan jaringan ini, aplikasi mungkin memberikan peringatan."</string>
     <string name="data_usage_metered_mobile" msgid="5423305619126978393">"Jaringan seluler"</string>
-    <string name="data_usage_metered_wifi" msgid="1761738002328299714">"Jaringan Wi‑Fi terukur"</string>
-    <string name="data_usage_metered_wifi_disabled" msgid="727808462375941567">"Untuk memilih jaringan terukur, aktifkan Wi‑Fi."</string>
+    <string name="data_usage_metered_wifi" msgid="1761738002328299714">"Jaringan Wi‑Fi berbayar"</string>
+    <string name="data_usage_metered_wifi_disabled" msgid="727808462375941567">"Untuk memilih jaringan berbayar, aktifkan Wi‑Fi."</string>
+    <string name="data_usage_metered_auto" msgid="1262028400911918865">"Otomatis"</string>
+    <string name="data_usage_metered_yes" msgid="9217539611385225894">"Berbayar"</string>
+    <string name="data_usage_metered_no" msgid="4025232961929071789">"Tidak berbayar"</string>
     <string name="data_usage_disclaimer" msgid="6887858149980673444">"Penghitungan data operator mungkin berbeda dengan perangkat Anda."</string>
     <string name="cryptkeeper_emergency_call" msgid="198578731586097145">"Panggilan darurat"</string>
     <string name="cryptkeeper_return_to_call" msgid="5613717339452772491">"Kembali ke panggilan"</string>
@@ -2525,10 +2540,7 @@
     <string name="confirm_new_backup_pw_prompt" msgid="3238728882512787864">"Ketik ulang sandi baru cadangan penuh Anda di sini"</string>
     <string name="backup_pw_set_button_text" msgid="2387480910044648795">"Setel sandi cadangan"</string>
     <string name="backup_pw_cancel_button_text" msgid="8845630125391744615">"Batal"</string>
-    <string name="additional_system_update_settings_list_item_title" msgid="214987609894661992">"Pembaruan sistem tambahan"</string>
-    <string name="selinux_status_disabled" msgid="924551035552323327">"Nonaktif"</string>
-    <string name="selinux_status_permissive" msgid="6004965534713398778">"Tidak Wajib"</string>
-    <string name="selinux_status_enforcing" msgid="2252703756208463329">"Wajib"</string>
+    <string name="additional_system_update_settings_list_item_title" msgid="214987609894661992">"Update sistem tambahan"</string>
     <string name="ssl_ca_cert_warning" msgid="2045866713601984673">"Jaringan mungkin dipantau"</string>
     <string name="done_button" msgid="1991471253042622230">"Selesai"</string>
     <plurals name="ssl_ca_cert_dialog_title" formatted="false" msgid="7145092748045794650">
@@ -2615,7 +2627,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">"Ketuk &amp; bayar"</string>
+    <string name="nfc_payment_settings_title" msgid="1807298287380821613">"Tap &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>
@@ -2654,7 +2666,7 @@
     <skip />
     <string name="cell_broadcast_settings" msgid="4124461751977706019">"Notifikasi darurat"</string>
     <string name="network_operators_settings" msgid="2583178259504630435">"Operator jaringan"</string>
-    <string name="access_point_names" msgid="1381602020438634481">"Nama titik akses"</string>
+    <string name="access_point_names" msgid="1381602020438634481">"Nama poin akses"</string>
     <string name="enhanced_4g_lte_mode_title" msgid="5808043757309522392">"Mode LTE 4G yang Ditingkatkan"</string>
     <string name="enhanced_4g_lte_mode_summary" msgid="1376589643017218924">"Gunakan data LTE untuk meningkatkan suara dan komunikasi (Disarankan)"</string>
     <string name="preferred_network_type_title" msgid="3431041717309776341">"Jenis jaringan yang dipilih"</string>
@@ -2726,6 +2738,7 @@
       <item quantity="other">Tampilkan %d item tersembunyi</item>
       <item quantity="one">Tampilkan %d item tersembunyi</item>
     </plurals>
+    <string name="dashboard_suggestion_condition_footer_content_description" msgid="2898588191174845961">"Ciutkan"</string>
     <string name="network_dashboard_title" msgid="4771589228992391573">"Jaringan &amp; Internet"</string>
     <string name="network_dashboard_summary_mobile" msgid="3851083934739500429">"seluler"</string>
     <string name="network_dashboard_summary_data_usage" msgid="3843261364705042212">"penggunaan data"</string>
@@ -2737,7 +2750,7 @@
     <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">"Bahawa, waktu, backup, update"</string>
+    <string name="system_dashboard_summary" msgid="5797743225249766685">"Bahasa, 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>
@@ -2812,15 +2825,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 daya"</string>
+    <string name="charging_sounds_title" msgid="1132272552057504251">"Suara pengisian baterai"</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 diketuk"</string>
+    <string name="vibrate_on_touch_title" msgid="5388579924689395023">"Bergetar saat di-tap"</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">"Lansiran"</string>
+    <string name="emergency_tone_alert" msgid="8941852695428130667">"Suara peringatan"</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>
@@ -2828,8 +2841,14 @@
       <item quantity="other"><xliff:g id="ON_COUNT">%d</xliff:g> aturan otomatis diaktifkan</item>
       <item quantity="one">1 aturan otomatis diaktifkan</item>
     </plurals>
-    <string name="zen_mode_settings_title" msgid="842308776768942600">"Preferensi Jangan Ganggu"</string>
-    <string name="zen_mode_priority_settings_title" msgid="2623117023031824309">"Hanya izinkan prioritas"</string>
+    <string name="zen_mode_settings_title" msgid="1066226840983908121">"Jangan Ganggu"</string>
+    <string name="zen_mode_behavior_settings_title" msgid="1463303933529313969">"Perilaku"</string>
+    <string name="zen_mode_behavior_allow_title" msgid="3845615648136218141">"Izinkan suara dan getaran dari"</string>
+    <string name="zen_mode_behavior_no_sound" msgid="1219626004723208056">"Tanpa suara"</string>
+    <string name="zen_mode_behavior_total_silence" msgid="6716603819806610626">"Tanpa suara (Senyap Total)"</string>
+    <string name="zen_mode_behavior_no_sound_except" msgid="4968477585788243114">"Tanpa suara, kecuali <xliff:g id="CATEGORIES">%1$s</xliff:g>"</string>
+    <!-- no translation found for zen_mode_behavior_alarms_only (2423480992071472963) -->
+    <skip />
     <string name="zen_mode_automation_settings_title" msgid="4228995740594063774">"Aturan otomatis"</string>
     <string name="zen_mode_automation_suggestion_title" msgid="5105443455143476201">"Setel aturan Jangan Ganggu"</string>
     <string name="zen_mode_automation_suggestion_summary" msgid="4732808039946935657">"Batasi suara &amp; getaran pada waktu tertentu"</string>
@@ -2858,26 +2877,28 @@
     <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">"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 menampilkan notifikasi sama sekali"</string>
+    <string name="lock_screen_notifications_summary_show" msgid="6407527697810672847">"Tampilkan semua konten notifikasi"</string>
+    <string name="lock_screen_notifications_summary_hide" msgid="7891552853357258782">"Sembunyikan konten notifikasi yang sensitif"</string>
+    <string name="lock_screen_notifications_summary_disable" msgid="859628910427886715">"Jangan tampilkan notifikasi sama sekali"</string>
     <string name="lock_screen_notifications_interstitial_message" msgid="6164532459432182244">"Saat perangkat dikunci, Anda ingin notifikasi ditampilkan seperti apa?"</string>
     <string name="lock_screen_notifications_interstitial_title" msgid="1416589393106326972">"Notifikasi"</string>
     <string name="lock_screen_notifications_summary_show_profile" msgid="835870815661120772">"Tampilkan semua konten notifikasi kerja"</string>
     <string name="lock_screen_notifications_summary_hide_profile" msgid="256116258285695645">"Sembunyikan konten notifikasi kerja yang sensitif"</string>
-    <string name="lock_screen_notifications_summary_disable_profile" msgid="4080720698960233358">"Jangan menampilkan notifikasi kerja sama sekali"</string>
+    <string name="lock_screen_notifications_summary_disable_profile" msgid="4080720698960233358">"Jangan tampilkan notifikasi kerja sama sekali"</string>
     <string name="lock_screen_notifications_interstitial_message_profile" msgid="8307705621027472346">"Saat perangkat dikunci, Anda ingin notifikasi ditampilkan seperti apa?"</string>
     <string name="lock_screen_notifications_interstitial_title_profile" msgid="3169806586032521333">"Notifikasi profil"</string>
     <string name="notifications_title" msgid="8086372779371204971">"Notifikasi"</string>
     <string name="app_notifications_title" msgid="5810577805218003760">"Notifikasi apl"</string>
     <string name="notification_channel_title" msgid="2260666541030178452">"Kategori notifikasi"</string>
+    <string name="notification_group_title" msgid="7180506440133859601">"Grup kategori notifikasi"</string>
     <string name="notification_importance_title" msgid="848692592679312666">"Tingkat Kepentingan"</string>
-    <string name="notification_importance_unspecified" msgid="2196023702875112081">"Biarkan aplikasi memutuskan"</string>
+    <string name="notification_importance_unspecified" msgid="6622173510486113958">"Izinkan suara"</string>
     <string name="notification_importance_blocked" msgid="7938180808339386300">"Jangan pernah tampilkan notifikasi"</string>
     <string name="notification_importance_min" msgid="5455049524984686275">"Tidak ada gangguan suara atau visual"</string>
     <string name="notification_importance_low" msgid="8881468429453766553">"Tanpa suara"</string>
     <string name="notification_importance_default" msgid="5958338024601957516">"Buat suara"</string>
     <string name="notification_importance_high" msgid="2082429479238228527">"Buat suara dan munculkan di layar"</string>
+    <string name="notification_importance_high_silent" msgid="2667033773703765252">"Munculkan di layar"</string>
     <string name="notification_importance_min_title" msgid="6974673091137544803">"Rendah"</string>
     <string name="notification_importance_low_title" msgid="8131254047772814309">"Sedang"</string>
     <string name="notification_importance_default_title" msgid="9120383978536089489">"Tinggi"</string>
@@ -2920,8 +2941,13 @@
     <string name="loading_notification_apps" msgid="5031818677010335895">"Memuat aplikasi..."</string>
     <string name="app_notifications_off_desc" msgid="4882445501376722969">"Android memblokir notifikasi aplikasi ini agar tidak muncul di perangkat ini"</string>
     <string name="channel_notifications_off_desc" msgid="5899225298718840635">"Android memblokir kategori notifikasi ini agar tidak muncul di perangkat ini"</string>
+    <string name="channel_group_notifications_off_desc" msgid="1620950416247316370">"Android memblokir grup notifikasi ini agar tidak muncul di perangkat ini"</string>
     <string name="notification_channels" msgid="5346841743182627500">"Kategori"</string>
     <string name="notification_channels_other" msgid="5645317113885788226">"Lainnya"</string>
+    <plurals name="notification_group_summary" formatted="false" msgid="3420621520561455358">
+      <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> kategori</item>
+      <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> kategori</item>
+    </plurals>
     <string name="no_channels" msgid="3077375508177744586">"Aplikasi ini belum memposting notifikasi"</string>
     <string name="app_settings_link" msgid="8894946007543660906">"Setelan tambahan di aplikasi"</string>
     <string name="app_notification_listing_summary_zero" msgid="6482582965081108108">"Diaktifkan untuk semua aplikasi"</string>
@@ -2942,7 +2968,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 terus mengganggu jika mode Jangan Ganggu disetel ke Hanya Prioritas"</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_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>
@@ -2971,9 +2997,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"</string>
+    <string name="zen_mode_event_rule_summary_any_calendar" msgid="4936646399126636358">"kalender mana saja"</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"</string>
+    <string name="zen_mode_event_rule_calendar_any" msgid="6485568415998569885">"Kalender mana saja"</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>
@@ -2998,12 +3024,14 @@
     <string name="zen_mode_from_starred" msgid="2678345811950997027">"Hanya dari kontak berbintang"</string>
     <string name="zen_mode_from_none" msgid="8219706639954614136">"Tidak ada"</string>
     <string name="zen_mode_alarms" msgid="2165302777886552926">"Alarm"</string>
+    <!-- no translation found for zen_mode_media_system_other (8900209390529859777) -->
+    <skip />
     <string name="zen_mode_reminders" msgid="5458502056440485730">"Pengingat"</string>
     <string name="zen_mode_events" msgid="7914446030988618264">"Acara"</string>
     <string name="zen_mode_all_callers" msgid="584186167367236922">"Semua penelepon"</string>
     <string name="zen_mode_selected_callers" msgid="3127598874060615742">"Penelepon yang dipilih"</string>
     <string name="zen_mode_repeat_callers" msgid="5019521886428322131">"Penelepon berulang"</string>
-    <string name="zen_mode_repeat_callers_summary" msgid="7192713032364140137">"Izinkan jika ada orang yang sama menelepon untuk kedua kalinya dalam waktu <xliff:g id="MINUTES">%d</xliff:g> menit"</string>
+    <string name="zen_mode_repeat_callers_summary" msgid="239685342222975733">"Jika orang yang sama menelepon untuk kedua kalinya dalam waktu <xliff:g id="MINUTES">%d</xliff:g> menit"</string>
     <string name="zen_mode_when" msgid="2767193283311106373">"Otomatis aktif"</string>
     <string name="zen_mode_when_never" msgid="8809494351918405602">"Tidak pernah"</string>
     <string name="zen_mode_when_every_night" msgid="3122486110091921009">"Setiap malam"</string>
@@ -3023,15 +3051,16 @@
     <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 dibisukan oleh mode Jangan Ganggu agar tidak diintip atau muncul di layar"</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_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 dibisukan oleh mode Jangan Ganggu agar tidak mengaktifkan layar"</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_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>
     <string name="zen_mode_no_visual_interruptions" msgid="8742776003822778472">"Saat layar aktif atau nonaktif"</string>
     <string name="notification_app_settings_button" msgid="6685640230371477485">"Setelan notifikasi"</string>
+    <string name="suggestion_button_text" msgid="3275010948381252006">"Oke"</string>
     <string name="device_feedback" msgid="3238056036766293294">"Kirim masukan tentang perangkat ini"</string>
     <string name="restr_pin_enter_admin_pin" msgid="1085834515677448072">"Masukkan PIN admin"</string>
     <string name="switch_on_text" msgid="1124106706920572386">"Aktif"</string>
@@ -3066,7 +3095,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 tautan"</string>
+    <string name="app_launch_domain_links_title" msgid="1160925981363706090">"Membuka link"</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>
@@ -3122,7 +3151,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 tautan"</string>
+    <string name="domain_urls_title" msgid="3132983644568821250">"Membuka link"</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>
@@ -3168,7 +3197,7 @@
     <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 penggunaan perangkat penuh"</string>
+    <string name="show_all_apps" msgid="1512506948197818534">"Tampilkan semua penggunaan"</string>
     <string name="hide_extra_apps" msgid="5016497281322459633">"Tampilkan penggunaan aplikasi"</string>
     <string name="power_high_usage_title" msgid="6027369425057347826">"Sering dipakai"</string>
     <plurals name="power_high_usage_summary" formatted="false" msgid="467347882627862744">
@@ -3199,7 +3228,7 @@
     <string name="sharing_remote_bugreport_dialog_message" msgid="5859287696666024466">"Laporan bug ini sedang dibagikan kepada admin IT. Hubungi mereka untuk detail selengkapnya."</string>
     <string name="share_remote_bugreport_action" msgid="532226159318779397">"Bagikan"</string>
     <string name="decline_remote_bugreport_action" msgid="518720235407565134">"Tolak"</string>
-    <string name="usb_use_charging_only" msgid="2180443097365214467">"Isi daya perangkat ini"</string>
+    <string name="usb_use_charging_only" msgid="2180443097365214467">"Mengisi baterai perangkat ini"</string>
     <string name="usb_use_charging_only_desc" msgid="3066256793008540627">"Mengisi daya perangkat ini saja"</string>
     <string name="usb_use_power_only" msgid="6426550616883919530">"Suplai daya"</string>
     <string name="usb_use_power_only_desc" msgid="3461232831015575152">"Isi daya baterai perangkat yang tersambung. Tindakan ini hanya berfungsi pada perangkat yang mendukung pengisian daya baterai melalui USB."</string>
@@ -3211,11 +3240,12 @@
     <string name="usb_use_MIDI_desc" msgid="8473936990076693175">"Menggunakan perangkat ini sebagai MIDI"</string>
     <string name="usb_use" msgid="3256040963685055320">"Gunakan USB untuk"</string>
     <string name="usb_pref" msgid="1400617804525116158">"USB"</string>
-    <string name="usb_summary_charging_only" msgid="7544327009143659751">"Mengisi daya perangkat ini"</string>
+    <string name="usb_summary_charging_only" msgid="7544327009143659751">"Mengisi baterai perangkat ini"</string>
     <string name="usb_summary_power_only" msgid="3629517713817003738">"Menyuplai daya"</string>
     <string name="usb_summary_file_transfers" msgid="6435943692610175111">"Mentransfer file"</string>
     <string name="usb_summary_photo_transfers" msgid="8440204169576585250">"Mentransfer foto (PTP)"</string>
     <string name="usb_summary_MIDI" msgid="5687906612187885908">"Menggunakan perangkat sebagai MIDI"</string>
+    <string name="sms_mirroring_pref" msgid="6475043279147376031">"Pencerminan SMS"</string>
     <string name="background_check_pref" msgid="7550258400138010979">"Pemeriksaan latar belakang"</string>
     <string name="background_check_title" msgid="4534254315824525593">"Akses penuh latar belakang"</string>
     <string name="assist_access_context_title" msgid="2269032346698890257">"Gunakan teks dari layar"</string>
@@ -3282,7 +3312,7 @@
     <string name="write_settings_title" msgid="4232152481902542284">"Dapat mengubah setelan sistem"</string>
     <string name="write_system_settings" msgid="3482913590601096763">"Ubah setelan sistem"</string>
     <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="permit_write_settings" msgid="658555006453212691">"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>
@@ -3377,9 +3407,12 @@
     <string name="color_temperature" msgid="2070126836910615605">"Suhu foto sejuk"</string>
     <string name="color_temperature_desc" msgid="4793729830226404052">"Gunakan suhu tampilan yang lebih sejuk"</string>
     <string name="color_temperature_toast" msgid="4974218172133854827">"Untuk menerapkan perubahan warna, nonaktifkan layar"</string>
-    <string name="telephony_monitor_toast" msgid="7003764250271195384">"Untuk menerapkah perubahan monitor telefoni, reboot perangkat"</string>
+    <string name="connectivity_monitor_switch" msgid="9059759348648583421">"Monitor Konektivitas"</string>
+    <string name="connectivity_monitor_switch_summary" msgid="2828658652378866401">"MonitorKonektivitas akan mengumpulkan log jika mendeteksi masalah konektivitas, dan mengirimkan notifikasi kepada pengguna untuk melaporkan bug"</string>
+    <string name="connectivity_monitor_toast" msgid="5551859612881173028">"Untuk menerapkan perubahan monitor konektivitas, reboot perangkat"</string>
     <string name="camera_hal_hdrplus_switch" msgid="8377365197105267466">"Kamera HAL HDR+"</string>
     <string name="camera_hal_hdrplus_toast" msgid="2063703797270055299">"Untuk menerapkan perubahan Kamera HAL HDR+, reboot perangkat"</string>
+    <string name="camera_laser_sensor_switch" msgid="8913588990743234440">"Sensor Laser Kamera"</string>
     <string name="ota_disable_automatic_update" msgid="2319639631655915050">"Pemutakhiran sistem otomatis"</string>
     <string name="usage" msgid="2977875522080448986">"Penggunaan"</string>
     <string name="cellular_data_usage" msgid="2155683719898158203">"Penggunaan data seluler"</string>
@@ -3405,7 +3438,7 @@
     <string name="data_warning" msgid="209133958008062117">"Peringatan data"</string>
     <string name="set_data_limit" msgid="2901526323210516923">"Setel batas data"</string>
     <string name="data_limit" msgid="1885406964934590552">"Batas data"</string>
-    <string name="data_usage_template" msgid="392191945602400904">"<xliff:g id="ID_1">%1$s</xliff:g> digunakan antara <xliff:g id="ID_2">%2$s</xliff:g>"</string>
+    <string name="data_usage_template" msgid="2923744765873163859">"<xliff:g id="ID_1">%1$s</xliff:g> digunakan <xliff:g id="ID_2">%2$s</xliff:g>"</string>
     <string name="configure" msgid="1029654422228677273">"Konfigurasi"</string>
     <string name="data_usage_other_apps" msgid="3272872663517382050">"Aplikasi lain yang disertakan dalam penggunaan"</string>
     <plurals name="data_saver_unrestricted_summary" formatted="false" msgid="2635267833484232703">
@@ -3474,7 +3507,7 @@
     <string name="button_confirm_convert_fbe" msgid="7101855374850373091">"Hapus dan konversikan"</string>
     <string name="reset_shortcut_manager_throttling" msgid="6495066467198668994">"Setel ulang pembatasan kecepatan PengelolaPintasan"</string>
     <string name="reset_shortcut_manager_throttling_complete" msgid="1826770872063707900">"Pembatasan kecepatan PengelolaPintasan telah disetel ulang"</string>
-    <string name="notification_suggestion_title" msgid="4506524937307816475">"Mengontrol notifikasi layar kunci"</string>
+    <string name="notification_suggestion_title" msgid="387052719462473500">"Kontrol info di layar kunci"</string>
     <string name="notification_suggestion_summary" msgid="8521159741445416875">"Menampilkan atau menyembunyikan konten notifikasi"</string>
     <string name="page_tab_title_summary" msgid="4070309266374993258">"Semua"</string>
     <string name="page_tab_title_support" msgid="8483187649355540109">"Dukungan &amp; tips"</string>
@@ -3482,7 +3515,7 @@
     <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>
     <string name="premium_sms_access" msgid="4660047004791638305">"Akses SMS Premium"</string>
-    <string name="bluetooth_disabled" msgid="2456198532288640046">"Tidak terlihat oleh perangkat lain"</string>
+    <string name="bluetooth_disabled" msgid="6244000672828617410">"Nonaktif"</string>
     <string name="bluetooth_connected_summary" msgid="7672528674593152862">"Terhubung ke <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="bluetooth_connected_multiple_devices_summary" msgid="9173661896296663932">"Terhubung ke beberapa perangkat"</string>
     <string name="demo_mode" msgid="2798762752209330277">"Mode demo UI sistem"</string>
@@ -3542,15 +3575,15 @@
     <string name="deletion_helper_automatic_title" msgid="6605660435498272520">"Otomatis"</string>
     <string name="deletion_helper_manual_title" msgid="7947432164411214029">"Manual"</string>
     <string name="deletion_helper_preference_title" msgid="5271510052022285884">"Kosongkan ruang sekarang"</string>
-    <string name="gesture_preference_title" msgid="5280023307132819052">"Isyarat"</string>
+    <string name="gesture_preference_title" msgid="5280023307132819052">"Gestur"</string>
     <string name="gesture_preference_summary" product="default" msgid="8627850388011956901">"Isyarat cepat untuk mengontrol ponsel"</string>
     <string name="gesture_preference_summary" product="tablet" msgid="4717535378272065510">"Isyarat cepat untuk mengontrol tablet"</string>
     <string name="gesture_preference_summary" product="device" msgid="4205941452664950852">"Isyarat cepat untuk mengontrol perangkat"</string>
     <string name="double_tap_power_for_camera_title" msgid="64716226816032800">"Beralih ke kamera"</string>
-    <string name="double_tap_power_for_camera_summary" msgid="242037150983277829">"Untuk membuka kamera dengan cepat, tekan tombol daya dua kali. Berfungsi di layar mana pun."</string>
+    <string name="double_tap_power_for_camera_summary" msgid="242037150983277829">"Untuk membuka kamera dengan cepat, tekan tombol power 2 kali. Berfungsi di layar mana pun."</string>
     <string name="double_tap_power_for_camera_suggestion_title" msgid="6500405261202883589">"Buka kamera dengan cepat"</string>
     <string name="double_tap_power_for_camera_suggestion_summary" msgid="7010153544554016996">"Tekan tombol power dua kali untuk membuka kamera"</string>
-    <string name="double_twist_for_camera_mode_title" msgid="4877834147983530479">"Balikkan kamera"</string>
+    <string name="double_twist_for_camera_mode_title" msgid="4877834147983530479">"Balik kamera"</string>
     <string name="double_twist_for_camera_mode_summary" msgid="122977081337563340"></string>
     <string name="double_twist_for_camera_suggestion_title" msgid="4689410222517954869">"Mengambil foto selfie dengan lebih cepat"</string>
     <string name="double_twist_for_camera_suggestion_summary" product="default" msgid="447403641027147153">"Putar ponsel dua kali untuk mode selfie"</string>
@@ -3568,10 +3601,10 @@
     <string name="ambient_display_pickup_summary" product="tablet" msgid="5435283849947236648">"Untuk memeriksa waktu, ikon notifikasi, dan info lainnya, ambil tablet."</string>
     <string name="ambient_display_pickup_summary" product="device" msgid="8256669101643381568">"Untuk memeriksa waktu, ikon notifikasi, dan info lainnya, ambil perangkat."</string>
     <string name="ambient_display_pickup_suggestion_summary" msgid="7014700589991761035">"Periksa notifikasi saat layar nonaktif"</string>
-    <string name="fingerprint_swipe_for_notifications_title" msgid="5816346492253270243">"Gesek sidik jari untuk melihat notifikasi"</string>
-    <string name="fingerprint_swipe_for_notifications_summary" product="default" msgid="1770661868393713922">"Untuk memeriksa notifikasi, gesek ke bawah pada sensor sidik jari di bagian belakang ponsel."</string>
-    <string name="fingerprint_swipe_for_notifications_summary" product="tablet" msgid="902719947767712895">"Untuk memeriksa notifikasi, gesek ke bawah pada sensor sidik jari di bagian belakang tablet."</string>
-    <string name="fingerprint_swipe_for_notifications_summary" product="device" msgid="5372926094116306647">"Untuk memeriksa notifikasi, gesek ke bawah pada sensor sidik jari di bagian belakang perangkat."</string>
+    <string name="fingerprint_swipe_for_notifications_title" msgid="5816346492253270243">"Geserkan sidik jari untuk melihat notifikasi"</string>
+    <string name="fingerprint_swipe_for_notifications_summary" product="default" msgid="1770661868393713922">"Untuk memeriksa notifikasi, geserkan jari ke bawah pada sensor sidik jari di bagian belakang ponsel."</string>
+    <string name="fingerprint_swipe_for_notifications_summary" product="tablet" msgid="902719947767712895">"Untuk memeriksa notifikasi, geserkan jari ke bawah pada sensor sidik jari di bagian belakang tablet."</string>
+    <string name="fingerprint_swipe_for_notifications_summary" product="device" msgid="5372926094116306647">"Untuk memeriksa notifikasi, geserkan jari ke bawah pada sensor sidik jari di bagian belakang perangkat."</string>
     <string name="fingerprint_swipe_for_notifications_suggestion_title" msgid="1677291167470357802">"Melihat notifikasi dengan lebih cepat"</string>
     <string name="fingerprint_swipe_for_notifications_suggestion_summary" msgid="127592803294414082">"Geser ke bawah pada sensor sidik jari"</string>
     <string name="gesture_setting_on" msgid="3455094265233870280">"Aktif"</string>
@@ -3584,7 +3617,7 @@
     <string name="web_action_enable_title" msgid="4051513950976670853">"Aplikasi instan"</string>
     <string name="web_action_enable_summary" msgid="3108127559723396382">"Buka link di aplikasi, walaupun tidak diinstal"</string>
     <string name="web_action_section_title" msgid="7364647086538399136">"Aplikasi instan"</string>
-    <string name="instant_apps_account" msgid="1433620209791992528">"Akun aplikasi instan"</string>
+    <string name="instant_apps_settings" msgid="8827777916518348213">"Preferensi Aplikasi Instan"</string>
     <string name="domain_url_section_title" msgid="7046835219056428883">"Aplikasi terpasang"</string>
     <string name="automatic_storage_manager_activation_warning" msgid="6353100011690933254">"Penyimpanan kini dikelola oleh pengelola penyimpanan"</string>
     <string name="account_for_section_header" msgid="5356566418548737121">"Akun untuk <xliff:g id="USER_NAME">%1$s</xliff:g>"</string>
@@ -3631,7 +3664,9 @@
     <string name="enterprise_privacy_always_on_vpn_personal" msgid="9217774730260037434">"VPN yang selalu aktif telah diaktifkan di profil pribadi"</string>
     <string name="enterprise_privacy_always_on_vpn_work" msgid="7244472958208315814">"VPN yang selalu aktif telah diaktifkan di profil kerja"</string>
     <string name="enterprise_privacy_global_http_proxy" msgid="7936664553416257333">"Proxy HTTP global disetel"</string>
-    <string name="enterprise_privacy_ca_certs" msgid="5885892204903688909">"Kredensial tepercaya"</string>
+    <string name="enterprise_privacy_ca_certs_device" msgid="2019652712782510262">"Kredensial tepercaya"</string>
+    <string name="enterprise_privacy_ca_certs_personal" msgid="2279084820904076599">"Kredensial tepercaya di profil pribadi Anda"</string>
+    <string name="enterprise_privacy_ca_certs_work" msgid="6187377647815301809">"Kredensial tepercaya di profil kerja Anda"</string>
     <plurals name="enterprise_privacy_number_ca_certs" formatted="false" msgid="526375234629534165">
       <item quantity="other">Minimum <xliff:g id="COUNT_1">%d</xliff:g> sertifikat CA</item>
       <item quantity="one">Minimum <xliff:g id="COUNT_0">%d</xliff:g> sertifikat CA</item>
@@ -3694,6 +3729,8 @@
     <string name="carrier_provisioning" msgid="4398683675591893169">"Info Provisioning Operator"</string>
     <string name="trigger_carrier_provisioning" msgid="3434865918009286187">"Memicu Provisioning Operator"</string>
     <string name="new_device_suggestion_title" msgid="698847081680980774">"Apa yang baru dan menarik?"</string>
-    <string name="new_device_suggestion_summary" msgid="7172709269203435870">"Lihat 5 fitur teratas"</string>
+    <string name="new_device_suggestion_summary" product="default" msgid="206396571522515855">"Ikuti tur tentang ponsel baru Anda"</string>
+    <string name="new_device_suggestion_summary" product="tablet" msgid="393751455688210956">"Ikuti tur tentang tablet baru Anda"</string>
+    <string name="new_device_suggestion_summary" product="device" msgid="2939870049868336652">"Ikuti tur tentang perangkat baru Anda"</string>
     <string name="disabled_low_ram_device" msgid="3751578499721173344">"Fitur ini tidak tersedia di perangkat"</string>
 </resources>
diff --git a/res/values-is/arrays.xml b/res/values-is/arrays.xml
index 5f69299..3e97588 100644
--- a/res/values-is/arrays.xml
+++ b/res/values-is/arrays.xml
@@ -100,8 +100,6 @@
     <!-- no translation found for wifi_security_no_eap:0 (2084555984818107151) -->
     <!-- no translation found for wifi_security_no_eap:1 (397579322683471524) -->
     <!-- no translation found for wifi_security_no_eap:2 (1968820975358150484) -->
-    <!-- no translation found for wifi_ap_security:0 (5251664683198623324) -->
-    <!-- no translation found for wifi_ap_security:1 (7989073072260294673) -->
   <string-array name="wifi_eap_method">
     <item msgid="1160193392455075561">"PEAP"</item>
     <item msgid="7981731051382306293">"TLS"</item>
diff --git a/res/values-is/strings.xml b/res/values-is/strings.xml
index 6a529c1..8783a6e 100644
--- a/res/values-is/strings.xml
+++ b/res/values-is/strings.xml
@@ -166,7 +166,7 @@
     <string name="bluetooth_map_acceptance_dialog_text" msgid="8712508202081143737">"%1$s vill fá aðgang að skilaboðunum þínum. Viltu gefa %2$s aðgang?"</string>
     <string name="bluetooth_sap_request" msgid="2669762224045354417">"Beiðni um aðgang að SIM-korti"</string>
     <string name="bluetooth_sap_acceptance_dialog_text" msgid="4414253873553608690">"<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g> vill fá aðgang að SIM-kortinu þínu. Ef þú veitir aðgang að SIM-kortinu er slökkt á gagnatengingu tækisins á meðan tengingin varir. Veita <xliff:g id="DEVICE_NAME_1">%2$s?</xliff:g> aðgang"</string>
-    <string name="bluetooth_device_name_summary" msgid="4757990010751789977">"Sýnilegt öðrum tækjum sem „<xliff:g id="DEVICE_NAME">^1</xliff:g>“"</string>
+    <string name="bluetooth_device_name_summary" msgid="522235742194965734">"Sýnilegt öðrum tækjum sem „<xliff:g id="DEVICE_NAME">^1</xliff:g>“"</string>
     <string name="bluetooth_paired_device_title" msgid="8638994696317952019">"Tækin þín"</string>
     <string name="bluetooth_pairing_page_title" msgid="7712127387361962608">"Para nýtt tæki"</string>
     <string name="date_and_time" msgid="9062980487860757694">"Dagsetning og tími"</string>
@@ -312,6 +312,8 @@
     <string name="zone_auto" msgid="334783869352026648">"Sjálfvirkt tímabelti"</string>
     <string name="zone_auto_summaryOn" msgid="6142830927278458314">"Nota tímabelti frá símkerfi"</string>
     <string name="zone_auto_summaryOff" msgid="2597745783162041390">"Nota tímabelti frá símkerfi"</string>
+    <string name="date_time_24hour_auto" msgid="2117383168985653422">"Sjálfkrafa 24 klst. snið"</string>
+    <string name="date_time_24hour_auto_summary" msgid="6351812925651480277">"Nota sjálfgefið snið staðar"</string>
     <string name="date_time_24hour_title" msgid="3203537578602803850">"24 tíma snið"</string>
     <string name="date_time_24hour" msgid="1193032284921000063">"Nota 24 tíma snið"</string>
     <string name="date_time_set_time_title" msgid="6296795651349047016">"Tími"</string>
@@ -341,8 +343,7 @@
     <string name="Accounts_settings_title" msgid="1643879107901699406">"Reikningar"</string>
     <string name="location_settings_title" msgid="1369675479310751735">"Staðsetning"</string>
     <string name="account_settings_title" msgid="626177544686329806">"Reikningar"</string>
-    <!-- no translation found for security_settings_title (4918904614964215087) -->
-    <skip />
+    <string name="security_settings_title" msgid="4918904614964215087">"Öryggi og staðsetning"</string>
     <string name="encryption_and_credential_settings_title" msgid="6514904533438791561">"Dulkóðun og skilríki"</string>
     <string name="encryption_and_credential_settings_summary" product="default" msgid="8721883002237981248">"Sími dulkóðaður"</string>
     <string name="encryption_and_credential_settings_summary" product="tablet" msgid="7200428573872395685">"Tæki dulkóðað"</string>
@@ -373,6 +374,9 @@
     <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="1961957425135180242">"Áfram"</string>
+    <string name="setup_fingerprint_enroll_skip_title" msgid="362050541117362034">"Viltu sleppa fingrafari?"</string>
+    <string name="setup_fingerprint_enroll_skip_after_adding_lock_text" msgid="958990414356204763">"Uppsetning fingrafars tekur bara mínútu eða tvær. Ef þú sleppir þessu skrefi geturðu bætt fingrafarinu við seinna í stillingunum."</string>
+    <string name="lock_screen_intro_skip_title" msgid="4988210105913705679">"Viltu sleppa skjálás?"</string>
     <string name="lock_screen_intro_skip_dialog_text_frp" product="tablet" msgid="1581834104051243425">"Öryggiseiginleikar til að vernda tækið verða ekki gerðir virkir. Þú munt ekki geta komið í veg fyrir að aðrir noti spjaldtölvuna ef hún týnist, er stolið eða endurstillt."</string>
     <string name="lock_screen_intro_skip_dialog_text_frp" product="device" msgid="4629503416877189572">"Öryggiseiginleikar til að vernda tækið verða ekki gerðir virkir. Þú munt ekki geta komið í veg fyrir að aðrir noti tækið ef það týnist, er stolið eða endurstillt."</string>
     <string name="lock_screen_intro_skip_dialog_text_frp" product="default" msgid="2423428240245737909">"Öryggiseiginleikar til að vernda tækið verða ekki gerðir virkir. Þú munt ekki geta komið í veg fyrir að aðrir noti símann ef hann týnist, er stolið eða endurstilltur."</string>
@@ -458,7 +462,7 @@
     <string name="setup_lock_settings_picker_title" product="tablet" msgid="90329443364067215">"Auktu öryggi spjaldtölvunnar"</string>
     <string name="setup_lock_settings_picker_title" product="device" msgid="2399952075134938929">"Auktu öryggi tækisins"</string>
     <string name="setup_lock_settings_picker_title" product="default" msgid="1572244299605153324">"Auktu öryggi símans"</string>
-    <string name="setup_lock_settings_picker_fingerprint_message" msgid="5585650064305600578">"Settu upp skjálás til vara til að gæta fyllsta öryggis."</string>
+    <string name="lock_settings_picker_fingerprint_added_security_message" msgid="5768002109707648463">"Settu upp skjálás til vara til að gæta fyllsta öryggis."</string>
     <string name="setup_lock_settings_picker_message" product="tablet" msgid="8919671129189936210">"Komdu í veg fyrir að aðrir noti þessa spjaldtölvu í heimildarleysi með því að virkja varnareiginleika spjaldtölvunnar. Veldu þann skjálás sem þú vilt nota."</string>
     <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>
@@ -500,29 +504,37 @@
     <string name="unlock_disable_frp_warning_title" msgid="264008934468492550">"Viltu fjarlægja eiginleika til að vernda tækið?"</string>
     <string name="unlock_disable_frp_warning_title_profile" msgid="5507136301904313583">"Fjarlægja vernd fyrir sniðið?"</string>
     <string name="unlock_disable_frp_warning_content_pattern" msgid="8869767290771023461">"Öryggiseiginleikar til að vernda tækið virka ekki án mynsturs."</string>
-    <!-- no translation found for unlock_disable_frp_warning_content_pattern_fingerprint (2986105377420905314) -->
-    <skip />
+    <string name="unlock_disable_frp_warning_content_pattern_fingerprint" msgid="2986105377420905314">"Öryggiseiginleikar til að vernda tækið virka ekki án mynsturs.<xliff:g id="EMPTY_LINE">
+
+</xliff:g>Vistuðu fingraförin þín verða einnig fjarlægð úr þessu tæki og þú getur ekki tekið símann úr lás, staðfest kaup eða skráð þig inn í forrit með þeim."</string>
     <string name="unlock_disable_frp_warning_content_pin" msgid="586996206210265131">"Öryggiseiginleikar til að vernda tækið virka ekki án PIN-númers."</string>
-    <!-- no translation found for unlock_disable_frp_warning_content_pin_fingerprint (3370462835533123695) -->
-    <skip />
+    <string name="unlock_disable_frp_warning_content_pin_fingerprint" msgid="3370462835533123695">"Öryggiseiginleikar til að vernda tækið virka ekki án PIN-númers.<xliff:g id="EMPTY_LINE">
+
+</xliff:g>Vistuðu fingraförin þín verða einnig fjarlægð úr þessu tæki og þú getur ekki tekið símann úr lás, staðfest kaup eða skráð þig inn í forrit með þeim."</string>
     <string name="unlock_disable_frp_warning_content_password" msgid="5420612686852555537">"Öryggiseiginleikar til að vernda tækið virka ekki án aðgangsorðs."</string>
-    <!-- no translation found for unlock_disable_frp_warning_content_password_fingerprint (3595476296430536798) -->
-    <skip />
+    <string name="unlock_disable_frp_warning_content_password_fingerprint" msgid="3595476296430536798">"Öryggiseiginleikar til að vernda tækið virka ekki án aðgangsorðs.<xliff:g id="EMPTY_LINE">
+
+</xliff:g>Vistuðu fingraförin þín verða einnig fjarlægð úr þessu tæki og þú getur ekki tekið símann úr lás, staðfest kaup eða skráð þig inn í forrit með þeim."</string>
     <string name="unlock_disable_frp_warning_content_unknown" msgid="1550718040483548220">"Öryggiseiginleikar til að vernda tækið virka ekki án skjáláss."</string>
-    <!-- no translation found for unlock_disable_frp_warning_content_unknown_fingerprint (3679351662094349506) -->
-    <skip />
+    <string name="unlock_disable_frp_warning_content_unknown_fingerprint" msgid="3679351662094349506">"Öryggiseiginleikar til að vernda tækið virka ekki án skjáláss.<xliff:g id="EMPTY_LINE">
+
+</xliff:g>Vistuðu fingraförin þín verða einnig fjarlægð úr þessu tæki og þú getur ekki tekið símann úr lás, staðfest kaup eða skráð þig inn í forrit með þeim."</string>
     <string name="unlock_disable_frp_warning_content_pattern_profile" msgid="8682200103576359918">"Öryggiseiginleikar til að vernda sniðið virka ekki án mynsturs."</string>
-    <!-- no translation found for unlock_disable_frp_warning_content_pattern_fingerprint_profile (6718155854303231675) -->
-    <skip />
+    <string name="unlock_disable_frp_warning_content_pattern_fingerprint_profile" msgid="6718155854303231675">"Öryggiseiginleikar til að vernda sniðið virka ekki án mynsturs.<xliff:g id="EMPTY_LINE">
+
+</xliff:g>Vistuðu fingraförin þín verða einnig fjarlægð af þessu sniði og þú getur ekki tekið sniðið úr lás, staðfest kaup eða skráð þig inn í forrit með þeim."</string>
     <string name="unlock_disable_frp_warning_content_pin_profile" msgid="7790688070593867767">"Öryggiseiginleikar til að vernda sniðið virka ekki án PIN-númers."</string>
-    <!-- no translation found for unlock_disable_frp_warning_content_pin_fingerprint_profile (4209564603132870532) -->
-    <skip />
+    <string name="unlock_disable_frp_warning_content_pin_fingerprint_profile" msgid="4209564603132870532">"Öryggiseiginleikar til að vernda sniðið virka ekki án PIN-númers.<xliff:g id="EMPTY_LINE">
+
+</xliff:g>Vistuðu fingraförin þín verða einnig fjarlægð af þessu sniði og þú getur ekki tekið sniðið úr lás, staðfest kaup eða skráð þig inn í forrit með þeim."</string>
     <string name="unlock_disable_frp_warning_content_password_profile" msgid="7569285520567674461">"Öryggiseiginleikar til að vernda sniðið virka ekki án aðgangsorðs."</string>
-    <!-- no translation found for unlock_disable_frp_warning_content_password_fingerprint_profile (2994300676764706047) -->
-    <skip />
+    <string name="unlock_disable_frp_warning_content_password_fingerprint_profile" msgid="2994300676764706047">"Öryggiseiginleikar til að vernda sniðið virka ekki án aðgangsorðs.<xliff:g id="EMPTY_LINE">
+
+</xliff:g>Vistuðu fingraförin þín verða einnig fjarlægð af þessu sniði og þú getur ekki tekið sniðið úr lás, staðfest kaup eða skráð þig inn í forrit með þeim."</string>
     <string name="unlock_disable_frp_warning_content_unknown_profile" msgid="6984215718701688202">"Öryggiseiginleikar til að vernda sniðið virka ekki án skjáláss."</string>
-    <!-- no translation found for unlock_disable_frp_warning_content_unknown_fingerprint_profile (4994062501123299418) -->
-    <skip />
+    <string name="unlock_disable_frp_warning_content_unknown_fingerprint_profile" msgid="4994062501123299418">"Öryggiseiginleikar til að vernda sniðið virka ekki án skjáláss.<xliff:g id="EMPTY_LINE">
+
+</xliff:g>Vistuðu fingraförin þín verða einnig fjarlægð af þessu sniði og þú getur ekki tekið sniðið úr lás, staðfest kaup eða skráð þig inn í forrit með þeim."</string>
     <string name="unlock_disable_frp_warning_ok" msgid="7075138677177748705">"Já, fjarlægja"</string>
     <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>
@@ -581,6 +593,7 @@
     <string name="lockpassword_pin_no_sequential_digits" msgid="680765285206990584">"Hækkandi, lækkandi eða endurtekin röð tölustafa er óheimil"</string>
     <string name="lockpassword_ok_label" msgid="313822574062553672">"Í lagi"</string>
     <string name="lockpassword_cancel_label" msgid="8818529276331121899">"Hætta við"</string>
+    <string name="lockpassword_clear_label" msgid="5724429464960458155">"Hreinsa"</string>
     <string name="lockpattern_tutorial_cancel_label" msgid="6431583477570493261">"Hætta við"</string>
     <string name="lockpattern_tutorial_continue_label" msgid="3559793618653400434">"Áfram"</string>
     <string name="lock_setup" msgid="3355847066343753943">"Uppsetningu er lokið."</string>
@@ -724,7 +737,7 @@
     <string name="use_open_wifi_automatically_summary_scoring_disabled" msgid="593964217679325831">"Til að nota þetta skaltu velja einkunnagjöf fyrir netkerfi"</string>
     <string name="use_open_wifi_automatically_summary_scorer_unsupported_disabled" msgid="8472122600853650258">"Til að nota þetta skaltu velja samhæfa einkunnagjöf fyrir netkerfi"</string>
     <string name="wifi_install_credentials" msgid="3551143317298272860">"Setja upp vottorð"</string>
-    <string name="wifi_scan_notify_text" msgid="5593805423071186757">"Til þess að auka staðsetningarnákvæmni geta kerfisforrit og þjónusta áfram fundið Wi-Fi net. Hægt er að breyta þessu í <xliff:g id="LINK_BEGIN_0">LINK_BEGIN</xliff:g>0leitarstillingum<xliff:g id="LINK_END_1">LINK_END</xliff:g>."</string>
+    <string name="wifi_scan_notify_text" msgid="5593805423071186757">"Til þess að auka staðsetningarnákvæmni geta kerfisforrit og þjónusta áfram fundið Wi-Fi net. Hægt er að breyta þessu í <xliff:g id="LINK_BEGIN_0">LINK_BEGIN</xliff:g>leitarstillingum<xliff:g id="LINK_END_1">LINK_END</xliff:g>."</string>
     <string name="wifi_scan_notify_text_scanning_off" msgid="3426075479272242098">"Til að auka nákvæmni staðsetninga skaltu kveikja á Wi-Fi leit í <xliff:g id="LINK_BEGIN_0">LINK_BEGIN</xliff:g>leitarstillingum<xliff:g id="LINK_END_1">LINK_END</xliff:g>."</string>
     <string name="wifi_scan_notify_remember_choice" msgid="7104867814641144485">"Ekki sýna þetta aftur"</string>
     <string name="wifi_setting_sleep_policy_title" msgid="5149574280392680092">"Hafa kveikt á Wi-Fi í biðstöðu"</string>
@@ -774,6 +787,7 @@
     <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,6 +824,8 @@
     <string name="wifi_wps_available_first_item" msgid="4422547079984583502">"WPS tiltækt"</string>
     <string name="wifi_wps_available_second_item" msgid="8427520131718215301">" (WPS tiltækt)"</string>
     <string name="wifi_wps_nfc_enter_password" msgid="2288214226916117159">"Sláðu inn aðgangsorð netsins"</string>
+    <string name="wifi_carrier_connect" msgid="8174696557882299911">"Wi-Fi kerfi símafyrirtækis"</string>
+    <string name="wifi_carrier_content" msgid="4634077285415851933">"Tengjast gegnum <xliff:g id="NAME">%1%s</xliff:g>"</string>
     <string name="wifi_scan_always_turnon_message" msgid="203123538572122989">"<xliff:g id="APP_NAME">%1$s</xliff:g> vill geta leitað að neti, jafnvel þegar slökkt er á Wi-Fi, m.a. til að gera ákvörðun staðsetningar nákvæmari.\n\nLeyfa þetta fyrir öll forrit sem vilja leita að neti?"</string>
     <string name="wifi_scan_always_turnoff_message" msgid="5538901671131941043">"Slökkt er á þessu í „Ítarlegt“ í umframvalmyndinni."</string>
     <string name="wifi_scan_always_confirm_allow" msgid="5355973075896817232">"Leyfa"</string>
@@ -827,6 +843,7 @@
     <string name="wifi_connect" msgid="1076622875777072845">"Tengjast"</string>
     <string name="wifi_failed_connect_message" msgid="8491902558970292871">"Ekk tókst að tengjast neti"</string>
     <string name="wifi_forget" msgid="8168174695608386644">"Gleyma"</string>
+    <string name="wifi_modify" msgid="6100248070440710782">"Breyta"</string>
     <string name="wifi_failed_forget_message" msgid="1348172929201654986">"Ekki tókst að gleyma neti"</string>
     <string name="wifi_save" msgid="3331121567988522826">"Vista"</string>
     <string name="wifi_failed_save_message" msgid="6650004874143815692">"Ekki tókst að vista net"</string>
@@ -839,6 +856,7 @@
     <string name="wifi_advanced_titlebar" msgid="4485841401774142908">"Ítarlegar Wi-Fi stillingar"</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_title" msgid="3471132676909349382">"Upplýsingar um kerfi"</string>
     <string name="wifi_details_subnet_mask" msgid="6720279144174924410">"Undirnetssía"</string>
     <string name="wifi_details_dns" msgid="8648826607751830768">"DNS"</string>
     <string name="wifi_details_ipv6_address_header" msgid="6734119149106422148">"IPv6-tölur"</string>
@@ -871,16 +889,15 @@
     <string name="wifi_p2p_cancel_connect_title" msgid="255267538099324413">"Hætta við boð?"</string>
     <string name="wifi_p2p_cancel_connect_message" msgid="7477756213423749402">"Viltu hætta við boð um að tengjast <xliff:g id="PEER_NAME">%1$s</xliff:g>?"</string>
     <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_off_subtext" msgid="5466126533609394170">"Deilir ekki nettengingu eða efni með öðrum tækjum"</string>
     <string name="wifi_hotspot_tethering_on_subtext" product="tablet" msgid="5752490509369962007">"Internettengingu þessarar spjaldtölvu er deilt um heitan reit"</string>
     <string name="wifi_hotspot_tethering_on_subtext" product="default" msgid="6461075246164300670">"Internettengingu þessa síma er deilt um heitan reit"</string>
     <string name="wifi_hotspot_on_local_only_subtext" msgid="2068110388011294735">"Forrit deilir efni. Til að deila nettengingu skaltu slökkva á heita reitnum og kveikja á honum aftur."</string>
-    <string name="wifi_hotspot_name_title" msgid="1341735529132128887">"Heiti Wi‑Fi reits"</string>
+    <string name="wifi_hotspot_name_title" msgid="8237000746618636778">"Heiti á heitum reit"</string>
     <string name="wifi_hotspot_name_summary_connecting" msgid="3378299995508671967">"Kveikir á <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>..."</string>
     <string name="wifi_hotspot_name_summary_connected" msgid="3888672084861445362">"Önnur tæki geta tengst <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>"</string>
-    <string name="wifi_hotspot_password_title" msgid="1955592302902091281">"Wi-Fi aðgangsorð"</string>
+    <string name="wifi_hotspot_password_title" msgid="8676859981917573801">"Aðgangsorð fyrir heitan reit"</string>
     <string name="wifi_hotspot_ap_band_title" msgid="1165801173359290681">"Tíðnisvið"</string>
     <string name="wifi_hotspot_footer_info_regular" msgid="1203489406068036455">"Notaðu heitan reit til að búa til Wi-Fi net fyrir önnur tæki. Heitir reitir bjóða upp á internetaðgang með því að nota farsímagagnatenginguna þína. Viðbótargjöld vegna farsímagagna kunna að eiga við."</string>
     <string name="wifi_hotspot_footer_info_local_only" msgid="857988412470694109">"Forrit geta búið til heitan reit til að deila efni með nálægum tækjum."</string>
@@ -891,7 +908,6 @@
     <string name="wifi_tether_configure_ap_text" msgid="7974681394041609308">"Setja upp heitan Wi-Fi reit"</string>
     <string name="wifi_hotspot_configure_ap_text" msgid="5478614731464220432">"Uppsetning heits Wi-Fi reits"</string>
     <string name="wifi_hotspot_configure_ap_text_summary" msgid="5560680057727007011">"Heitur AndroidAP WPA2 PSK-reitur"</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> heitur reitur"</string>
     <string name="wifi_tether_configure_ssid_default" msgid="8467525402622138547">"AndroidHotspot"</string>
     <string name="wifi_calling_settings_title" msgid="4102921303993404577">"Wi-Fi símtöl"</string>
     <string name="wifi_calling_suggestion_title" msgid="9008010480466359578">"Kveikja á Wi-Fi símtölum"</string>
@@ -932,7 +948,7 @@
     <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="emergency_address_summary" msgid="3266760199681945746">"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>
     <string name="sound_settings" msgid="5534671337768745343">"Hljóð"</string>
     <string name="all_volume_title" msgid="4296957391257836961">"Hljóðstyrkur"</string>
@@ -986,6 +1002,7 @@
     <string name="search_settings" msgid="1910951467596035063">"Leit"</string>
     <string name="search_settings_summary" msgid="9205656546570654169">"Stjórna leitarstillingum og ferli"</string>
     <string name="search_settings_no_results" msgid="8799027492641230999">"Engar niðurstöður"</string>
+    <string name="search_clear_history" msgid="4196658962573162457">"Hreinsa feril"</string>
     <string name="display_settings" msgid="7965901687241669598">"Skjár"</string>
     <string name="accelerometer_title" msgid="7854608399547349157">"Snúa skjá sjálfkrafa"</string>
     <string name="color_mode_title" msgid="3159275920408338215">"Skærir litir"</string>
@@ -1056,15 +1073,13 @@
     <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="ambient_display_screen_title" msgid="4252755516328775766">"Umhverfisskjár"</string>
-    <!-- no translation found for ambient_display_screen_summary_always_on (7337555569694794132) -->
-    <skip />
+    <string name="ambient_display_screen_summary_always_on" msgid="7337555569694794132">"Alltaf kveikt / aukin rafhlöðunotkun"</string>
     <string name="ambient_display_screen_summary_notifications" msgid="1449570742600868654">"Nýjar tilkynningar"</string>
     <string name="ambient_display_category_triggers" msgid="4359289754456268573">"Sýnt hvenær"</string>
     <string name="doze_title" msgid="2375510714460456687">"Nýjar tilkynningar"</string>
     <string name="doze_summary" msgid="3846219936142814032">"Vekja skjáinn þegar þú færð tilkynningar"</string>
     <string name="doze_always_on_title" msgid="1046222370442629646">"Alltaf kveikt"</string>
-    <!-- no translation found for doze_always_on_summary (6978257596231155345) -->
-    <skip />
+    <string name="doze_always_on_summary" msgid="6978257596231155345">"Sýna tíma, tilkynningartákn og aðrar upplýsingar. Aukin rafhlöðunotkun."</string>
     <string name="title_font_size" msgid="4405544325522105222">"Leturstærð"</string>
     <string name="short_summary_font_size" msgid="6819778801232989076">"Gera texta stærri eða minni"</string>
     <string name="sim_lock_settings" msgid="3392331196873564292">"Stillingar SIM-kortaláss"</string>
@@ -1117,7 +1132,6 @@
     <string name="baseband_version" msgid="1848990160763524801">"Grunnbandsútgáfa"</string>
     <string name="kernel_version" msgid="9192574954196167602">"Kjarnaútgáfa"</string>
     <string name="build_number" msgid="3075795840572241758">"Útgáfunúmer smíðar"</string>
-    <string name="selinux_status" msgid="6212165375172061672">"SELinux-staða"</string>
     <string name="device_info_not_available" msgid="8062521887156825182">"Ekki tiltækt"</string>
     <string name="device_status_activity_title" msgid="1411201799384697904">"Staða"</string>
     <string name="device_status" msgid="607405385799807324">"Staða"</string>
@@ -1145,7 +1159,6 @@
     <string name="status_wifi_mac_address" msgid="2202206684020765378">"MAC-vistfang Wi-Fi"</string>
     <string name="status_bt_address" msgid="4195174192087439720">"Bluetooth-vistfang"</string>
     <string name="status_serial_number" msgid="2257111183374628137">"Raðnúmer"</string>
-    <string name="status_unavailable" msgid="7862009036663793314">"Ekki tiltækt"</string>
     <string name="status_up_time" msgid="7294859476816760399">"Uppitími"</string>
     <string name="status_awake_time" msgid="2393949909051183652">"Vökutími"</string>
     <string name="internal_memory" msgid="9129595691484260784">"Innbyggð geymsla"</string>
@@ -1321,6 +1334,7 @@
     <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>
     <string name="reset_dashboard_title" msgid="6254873816990678620">"Valkostir endurstillingar"</string>
+    <string name="reset_dashboard_summary" msgid="4851012632493522755">"Hægt er að endurstilla netkerfi, forrit eða tæki"</string>
     <string name="reset_network_title" msgid="6166025966016873843">"Endurstilla Wi-Fi, farsímagögn og Bluetooth"</string>
     <string name="reset_network_desc" msgid="5547979398298881406">"Þetta mun endurstilla allar netkerfisstillingar, þar á meðal:\n\n"<li>"Wi‑Fi"</li>\n<li>"Farsímagögn"</li>\n<li>"Bluetooth"</li></string>
     <string name="reset_network_button_text" msgid="2035676527471089853">"Endurstilla"</string>
@@ -1329,17 +1343,14 @@
     <string name="reset_network_confirm_title" msgid="1759888886976962773">"Endurstilla?"</string>
     <string name="network_reset_not_available" msgid="7188610385577164676">"Núllstilling nets er ekki í boði fyrir þennan notanda"</string>
     <string name="reset_network_complete_toast" msgid="787829973559541880">"Netstillingar voru endurstilltar"</string>
-    <string name="master_clear_title" msgid="6617679904229218425">"Eyða öllum gögnum (núllstilla)"</string>
-    <plurals name="master_clear_with_account_summary" formatted="false" msgid="5911377203778818712">
-      <item quantity="one"><xliff:g id="ACCOUNT_COUNT">%1$d</xliff:g> reikningur verður endurstilltur</item>
-      <item quantity="other"><xliff:g id="ACCOUNT_COUNT">%1$d</xliff:g> reikningar verða endurstilltir</item>
-    </plurals>
-    <string name="master_clear_summary" msgid="6902443944660426951">"Innra geymslurými og öll gögn verða endurstillt"</string>
+    <string name="master_clear_title" msgid="3531267871084279512">"Eyða öllum gögnum (núllstilla)"</string>
     <string name="master_clear_desc" product="tablet" msgid="9146059417023157222">"Þessi aðgerð eyðir öllum gögnum úr "<b>"innbyggðri geymslu"</b>" spjaldtölvunnar, þar á meðal:\n\n"<li>"Google reikningnum þínum"</li>\n<li>"Gögnum og stillingum forrita og kerfis"</li>\n<li>"Forritum sem hafa verið sótt"</li></string>
     <string name="master_clear_desc" product="default" msgid="4800386183314202571">"Þessi aðgerð eyðir öllum gögnum úr "<b>"innbyggðri geymslu"</b>" símans, þar á meðal:\n\n"<li>"Google reikningnum þínum"</li>\n<li>"Gögnum og stillingum forrita og kerfis"</li>\n<li>"Forritum sem hafa verið sótt"</li></string>
     <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"Þú ert skráð(ur) inn á eftirfarandi reikninga:\n"</string>
     <string name="master_clear_other_users_present" product="default" msgid="5161423070702470742">\n\n"Aðrir notendur eru til staðar í þessu tæki.\n"</string>
     <string name="master_clear_desc_also_erases_external" msgid="1903185203791274237"><li>"Tónlist"</li>\n<li>"Myndir"</li>\n<li>"Önnur notandagögn"</li></string>
+    <string name="master_clear_desc_also_erases_esim" msgid="312352697653096008"><li>"Símafyrirtæki á eSIM"</li></string>
+    <string name="master_clear_desc_no_cancel_mobile_plan" msgid="5460926449093211144">\n\n"Þetta mun ekki segja upp farsímaáskrift þinni."</string>
     <string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="7744115866662613411">\n\n"Til að hreinsa tónlist, myndir og önnur notandagögn þarf að hreinsa allt út af "<b>"USB-geymslunni"</b>"."</string>
     <string name="master_clear_desc_erase_external_storage" product="default" msgid="4801026652617377093">\n\n"Til að hreinsa tónlist, myndir og önnur notandagögn þarf að hreinsa allt út af "<b>"SD-kortinu"</b>"."</string>
     <string name="erase_external_storage" product="nosdcard" msgid="969364037450286809">"Hreinsa út af USB-geymslu"</string>
@@ -1456,15 +1467,16 @@
     <string name="settings_safetylegal_activity_title" msgid="6901214628496951727">"Öryggisupplýsingar"</string>
     <string name="settings_safetylegal_activity_unreachable" msgid="250674109915859456">"Engin gagnatenging er fyrir hendi. Til að skoða þessar upplýsingar núna skaltu fara á %s úr nettengdri tölvu."</string>
     <string name="settings_safetylegal_activity_loading" msgid="8059022597639516348">"Hleður…"</string>
-    <string name="lockpassword_choose_your_password_header" msgid="8624900666929394990">"Veldu aðgangsorð"</string>
-    <string name="lockpassword_choose_your_password_header_for_fingerprint" msgid="6624409510609085450">"Aðgangsorð þarf fyrir fingrafar"</string>
-    <string name="lockpassword_choose_your_pattern_header" msgid="6949761069941694050">"Veldu þér mynstur"</string>
-    <string name="lockpassword_choose_your_pattern_header_for_fingerprint" msgid="5901096361617543819">"Mynstur þarf fyrir fingrafar"</string>
-    <string name="lockpassword_choose_your_pin_header" msgid="7598849519816138302">"Veldu þér PIN-númer"</string>
-    <string name="lockpassword_choose_your_pin_header_for_fingerprint" msgid="765344692615917183">"PIN-númer þarf fyrir fingrafar"</string>
-    <string name="lockpassword_confirm_your_password_header" msgid="6308478184889846633">"Staðfestu aðgangsorðið"</string>
+    <string name="lockpassword_choose_your_screen_lock_header" msgid="3872462096767152394">"Setja upp skjálás"</string>
+    <string name="lockpassword_choose_your_password_message" msgid="1197569283524841412">"Settu upp aðgangsorð til að gæta fyllsta öryggis"</string>
+    <string name="lockpassword_choose_your_password_header_for_fingerprint" msgid="2541818487015343503">"Stilltu aðgangsorð til að nota fingrafar"</string>
+    <string name="lockpassword_choose_your_pattern_header_for_fingerprint" msgid="7709785406243556723">"Stilltu mynstur til að nota fingrafar"</string>
+    <string name="lockpassword_choose_your_pin_message" msgid="1875420718677275646">"Settu upp PIN-númer til að gæta fyllsta öryggis"</string>
+    <string name="lockpassword_choose_your_pin_header_for_fingerprint" msgid="1549639053195796674">"Stilltu PIN-númer til að nota fingrafar"</string>
+    <string name="lockpassword_choose_your_pattern_message" msgid="5986983400689720015">"Settu upp mynstur til að gæta fyllsta öryggis"</string>
+    <string name="lockpassword_confirm_your_password_header" msgid="1266027268220850931">"Sláðu aðgangsorðið inn aftur"</string>
     <string name="lockpassword_confirm_your_pattern_header" msgid="7543433733032330821">"Staðfestu mynstrið"</string>
-    <string name="lockpassword_confirm_your_pin_header" msgid="49038294648213197">"Staðfestu PIN-númerið"</string>
+    <string name="lockpassword_confirm_your_pin_header" msgid="7744513791910572550">"Sláðu PIN-númerið inn aftur"</string>
     <string name="lockpassword_confirm_passwords_dont_match" msgid="5140892109439191415">"Aðgangsorðin stemma ekki."</string>
     <string name="lockpassword_confirm_pins_dont_match" msgid="7226244811505606217">"PIN-númerin stemma ekki"</string>
     <string name="lockpassword_choose_lock_generic_header" msgid="3811438094903786145">"Veldu skjálás"</string>
@@ -1477,18 +1489,18 @@
     <string name="lockpassword_confirm_your_pattern_generic_profile" msgid="4435638308193361861">"Notaðu vinnumynstrið þitt til að halda áfram"</string>
     <string name="lockpassword_confirm_your_pin_generic_profile" msgid="3730141667547002246">"Sláðu inn PIN-númerið þitt fyrir vinnuna til að halda áfram"</string>
     <string name="lockpassword_confirm_your_password_generic_profile" msgid="4250642723467019894">"Sláðu inn vinnuaðgangsorðið þitt til að halda áfram"</string>
-    <!-- no translation found for lockpassword_strong_auth_required_device_pattern (530802132223800623) -->
-    <skip />
-    <!-- no translation found for lockpassword_strong_auth_required_device_pin (7829294830078036417) -->
-    <skip />
-    <!-- no translation found for lockpassword_strong_auth_required_device_password (3552644641574796973) -->
-    <skip />
-    <!-- no translation found for lockpassword_strong_auth_required_work_pattern (3003781907040522053) -->
-    <skip />
-    <!-- no translation found for lockpassword_strong_auth_required_work_pin (3367491332598821552) -->
-    <skip />
-    <!-- no translation found for lockpassword_strong_auth_required_work_password (8159775129968582940) -->
-    <skip />
+    <string name="lockpassword_strong_auth_required_device_pattern" msgid="530802132223800623">"Notaðu mynstur tækisins til að gæta fyllsta öryggis"</string>
+    <string name="lockpassword_strong_auth_required_device_pin" msgid="7829294830078036417">"Færðu inn PIN-númer tækisins til að gæta fyllsta öryggis"</string>
+    <string name="lockpassword_strong_auth_required_device_password" msgid="3552644641574796973">"Settu upp aðgangsorð tækisins til að gæta fyllsta öryggis"</string>
+    <string name="lockpassword_strong_auth_required_work_pattern" msgid="3003781907040522053">"Notaðu vinnumynstur til að gæta fyllsta öryggis"</string>
+    <string name="lockpassword_strong_auth_required_work_pin" msgid="3367491332598821552">"Færðu inn PIN-númer vinnu til að gæta fyllsta öryggis"</string>
+    <string name="lockpassword_strong_auth_required_work_password" msgid="8159775129968582940">"Settu upp vinnuaðgangsorð til að gæta fyllsta öryggis"</string>
+    <string name="lockpassword_confirm_your_pattern_details_frp" msgid="6757336656791723193">"Síminn var stilltur á verksmiðjustillingar. Til að nota hann skaltu slá inn eldra opnunarmynstur."</string>
+    <string name="lockpassword_confirm_your_pin_details_frp" msgid="826520613445990470">"Síminn var endurstilltur á verksmiðjustillingar. Til að nota símann skaltu slá inn eldra PIN-númer."</string>
+    <string name="lockpassword_confirm_your_password_details_frp" msgid="8944081074615739040">"Síminn var endurstilltur á verksmiðjustillingar. Til að nota símann skaltu slá inn eldra aðgangsorð."</string>
+    <string name="lockpassword_confirm_your_pattern_header_frp" msgid="2898036091609128286">"Staðfestu mynstur"</string>
+    <string name="lockpassword_confirm_your_pin_header_frp" msgid="4141601774778898803">"Staðfestu PIN-númer"</string>
+    <string name="lockpassword_confirm_your_password_header_frp" msgid="3762615419295360480">"Staðfestu aðgangsorð"</string>
     <string name="lockpassword_invalid_pin" msgid="15588049067548470">"Rangt PIN-númer"</string>
     <string name="lockpassword_invalid_password" msgid="4038507398784975200">"Rangt aðgangsorð"</string>
     <string name="lockpattern_need_to_unlock_wrong" msgid="1745247595356012176">"Rangt mynstur"</string>
@@ -1538,7 +1550,6 @@
     <string name="install_applications_title" msgid="4987712352256508946">"Leyfa forrit frá öllum"</string>
     <string name="recent_app_category_title" msgid="6673071268966003928">"Nýlega opnuð forrit"</string>
     <string name="see_all_apps_title" msgid="1317153498074308438">"Sjá öll <xliff:g id="COUNT">%1$d</xliff:g> forritin"</string>
-    <string name="recent_app_summary" msgid="3366446669844932300">"fyrir <xliff:g id="TIME">^1</xliff:g>"</string>
     <string name="install_all_warning" product="tablet" msgid="8310489909586138165">"Spjaldtölvan þín og persónuleg gögn eru berskjaldaðri fyrir árásum forrita af óþekktum uppruna. Þú samþykkir að bera fulla ábyrgð á hverju því tjóni sem verða kann á spjaldtölvunni eða gagnatapi sem leiða kann af uppsetningu forrita frá þessari veitu."</string>
     <string name="install_all_warning" product="default" msgid="1952257127370115988">"Síminn þinn og persónuleg gögn eru berskjaldaðri fyrir árásum forrita af óþekktum uppruna. Þú samþykkir að bera fulla ábyrgð á hverju því tjóni sem verða kann á símanum eða gagnatapi sem leiða kann af uppsetningu forrita frá þessari veitu."</string>
     <string name="advanced_settings" msgid="1777249286757067969">"Ítarlegar stillingar"</string>
@@ -1802,7 +1813,7 @@
     <string name="accessibility_settings_summary" msgid="981260486011624939">"Skjálesarar, skjár, gagnvirknistýringar"</string>
     <string name="vision_settings_title" msgid="4204111425716868288">"Útlitsstillingar"</string>
     <string name="vision_settings_description" msgid="5679491180156408260">"Þú getur sérsniðið þetta tæki eftir þínum þörfum. Þessum aðgengiseiginleikum má breyta síðar í stillingunum."</string>
-    <string name="vision_settings_suggestion_title" msgid="917294957154878441">"Stækka letur"</string>
+    <string name="vision_settings_suggestion_title" msgid="8058794060304707004">"Breyta leturstærð"</string>
     <string name="screen_reader_category_title" msgid="7739154903913400641">"Skjálesarar"</string>
     <string name="audio_and_captions_category_title" msgid="3420727114421447524">"Hljóð og skjátexti"</string>
     <string name="display_category_title" msgid="685461049938269166">"Skjár"</string>
@@ -1839,7 +1850,6 @@
     <string name="accessibility_display_inversion_preference_subtitle" msgid="7052959202195368109">"Getur haft áhrif á afköst"</string>
     <string name="accessibility_autoclick_preference_title" msgid="7014499339068449623">"Smella þegar bendill stöðvast"</string>
     <string name="accessibility_autoclick_delay_preference_title" msgid="3962261178385106006">"Bíða áður en smellt er"</string>
-    <string name="preference_summary_default_combination" msgid="8532964268242666060">"<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">"KVEIKT"</string>
     <string name="accessibility_summary_state_disabled" msgid="2241315620132005595">"SLÖKKT"</string>
     <string name="enable_quick_setting" msgid="2366999897816894536">"Sýna í flýtistillingum"</string>
@@ -1958,12 +1968,14 @@
     <string name="background_activity_summary_on" msgid="649282072540085599">"Hægt er að keyra forrit í bakgrunni þegar það er ekki í notkun"</string>
     <string name="background_activity_summary_off" msgid="7666330699090632040">"Bakgrunnsvirkni forrits er takmörkuð þegar það er ekki í notkun"</string>
     <string name="background_activity_summary_disabled" msgid="3710669050484599847">"Forrit má ekki keyra í bakgrunni"</string>
+    <string name="background_activity_summary_whitelisted" msgid="7375400051141016808">"Ekki er hægt að fínstilla rafhlöðunotkun forrits"</string>
+    <string name="background_activity_warning_dialog_title" msgid="2216249969149568871">"Viltu takmarka bakgrunnsvirkni?"</string>
+    <string name="background_activity_warning_dialog_text" msgid="7049624449246121981">"Ef þú takmarkar bakgrunnsvirkni forrits gæti það látið illa"</string>
     <string name="device_screen_usage" msgid="3386088035570409683">"Skjánotkun frá síðustu fullu hleðslu"</string>
     <string name="device_screen_consumption" msgid="4607589286438986687">"Orkunotkun skjásins"</string>
     <string name="device_cellular_network" msgid="4724773411762382950">"Leit að farsímaneti"</string>
-    <string name="power_last_full_charge_summary" msgid="532845389094620657">"fyrir <xliff:g id="TIME">^1</xliff:g>"</string>
-    <string name="power_usage_list_summary" msgid="6775339745194635000">"Notkun forrita frá fullri hleðslu (fyrir <xliff:g id="TIME">^1</xliff:g>)"</string>
-    <string name="power_usage_list_summary_device" msgid="7036566616386864302">"Notkun tækis frá fullri hleðslu (fyrir <xliff:g id="TIME">^1</xliff:g>)"</string>
+    <string name="power_usage_list_summary" msgid="6393929085382334341">"Notkun forrita frá fullri hleðslu (<xliff:g id="RELATIVE_TIME">^1</xliff:g>)"</string>
+    <string name="power_usage_list_summary_device" msgid="4461926045610455423">"Notkun tækis frá fullri hleðslu (<xliff:g id="RELATIVE_TIME">^1</xliff:g>)"</string>
     <string name="screen_usage_summary" msgid="6687403051423153550">"Liðinn tími frá síðustu fullu hleðslu"</string>
     <string name="device_usage_list_summary" msgid="5623036661468763251">"Tækjanotkun frá síðustu fullu hleðslu"</string>
     <string name="battery_since_unplugged" msgid="338073389740738437">"Rafhlöðunotkun frá síðustu hleðslu"</string>
@@ -2209,14 +2221,14 @@
     <string name="credentials_unlock_hint" msgid="2301301378040499348">"Sláðu inn aðgangsorðið fyrir skilríkjageymsluna."</string>
     <string name="credentials_old_password" msgid="7553393815538684028">"Núverandi aðgangsorð:"</string>
     <string name="credentials_reset_hint" msgid="6297256880896133631">"Fjarlægja allt innihaldið?"</string>
-    <string name="credentials_password_too_short" msgid="7502749986405522663">"Aðgangsorðið verður að vera minnst 8 stafir."</string>
     <string name="credentials_wrong_password" msgid="2541932597104054807">"Rangt aðgangsorð."</string>
     <string name="credentials_reset_warning" msgid="5320653011511797600">"Rangt aðgangsorð. Þú átt eina tilraun eftir áður en skilríkjageymslu verður eytt."</string>
     <string name="credentials_reset_warning_plural" msgid="6514085665301095279">"Rangt aðgangsorð. Þú átt <xliff:g id="NUMBER">%1$d</xliff:g> tilraunir eftir áður en skilríkjageymslu verður eytt."</string>
     <string name="credentials_erased" msgid="2907836028586342969">"Hreinsað úr skilríkjageymslu."</string>
     <string name="credentials_not_erased" msgid="7685932772284216097">"Ekki tókst að eyða skilríkjageymslu."</string>
     <string name="credentials_enabled" msgid="7588607413349978930">"Skilríkjageymsla er virk."</string>
-    <string name="credentials_configure_lock_screen_hint" msgid="6757119179588664966">"Þú þarft að velja PIN-númer eða aðgangsorð lásskjás til að geta notað skilríkjageymsluna."</string>
+    <string name="credentials_configure_lock_screen_hint" msgid="8058230497337529036">"Áður en þú getur notað skilríkjageymslu þarf tækið þitt að vera með öruggan skjálás"</string>
+    <string name="credentials_configure_lock_screen_button" msgid="253239765216055321">"STILLA LÁS"</string>
     <string name="usage_access_title" msgid="332333405495457839">"Forrit með notkunaraðgang"</string>
     <string name="emergency_tone_title" msgid="1055954530111587114">"Neyðartónn"</string>
     <string name="emergency_tone_summary" msgid="722259232924572153">"Velja hvað gerist þegar neyðarsímtal er hringt"</string>
@@ -2336,8 +2348,6 @@
     <skip />
     <string name="cant_sync_dialog_title" msgid="2777238588398046285">"Ekki er hægt að samstilla handvirkt"</string>
     <string name="cant_sync_dialog_message" msgid="1938380442159016449">"Samstilling fyrir þetta atriði er óvirk sem stendur. Til að breyta þeirri stillingu skaltu kveikja tímabundið á bakgrunnsgögnum og sjálfvirkri samstillingu."</string>
-    <string name="wimax_settings" msgid="2655139497028469039">"4G"</string>
-    <string name="status_wimax_mac_address" msgid="8390791848661413416">"MAC-vistfang 4G"</string>
     <string name="enter_password" msgid="8035706727471334122">"Sláðu inn aðgangsorðið þitt til að ræsa Android"</string>
     <string name="enter_pin" msgid="5305333588093263790">"Sláðu inn PIN-númerið þitt til að ræsa Android"</string>
     <string name="enter_pattern" msgid="4187435713036808566">"Teiknaðu opnunarmynstrið til að ræsa Android"</string>
@@ -2351,6 +2361,7 @@
     <string name="misc_files_selected_count" msgid="4647048020823912088">"<xliff:g id="NUMBER">%1$d</xliff:g> valdar af <xliff:g id="TOTAL">%2$d</xliff:g>"</string>
     <string name="misc_files_selected_count_bytes" msgid="2876232009069114352">"<xliff:g id="NUMBER">%1$s</xliff:g> af <xliff:g id="TOTAL">%2$s</xliff:g>"</string>
     <string name="select_all" msgid="1562774643280376715">"Velja allt"</string>
+    <string name="data_plan_usage_manage_plans_button_text" msgid="8997761990902708162">"Stjórna áskriftum"</string>
     <string name="data_usage_summary_title" msgid="3804110657238092929">"Gagnanotkun"</string>
     <string name="data_usage_app_summary_title" msgid="4147258989837459172">"Gagnanotkun forrits"</string>
     <string name="data_usage_accounting" msgid="7170028915873577387">"Gagnaútreikningur símafyrirtækisins kann að sýna aðra niðurstöðu en tækið þitt."</string>
@@ -2436,6 +2447,9 @@
     <string name="data_usage_metered_mobile" msgid="5423305619126978393">"Farsímakerfi"</string>
     <string name="data_usage_metered_wifi" msgid="1761738002328299714">"Wi-Fi net með mælda notkun"</string>
     <string name="data_usage_metered_wifi_disabled" msgid="727808462375941567">"Kveiktu á Wi-Fi til að velja net með mældri notkun."</string>
+    <string name="data_usage_metered_auto" msgid="1262028400911918865">"Sjálfvirkt"</string>
+    <string name="data_usage_metered_yes" msgid="9217539611385225894">"Mæld notkun"</string>
+    <string name="data_usage_metered_no" msgid="4025232961929071789">"Ekki með mældri notkun"</string>
     <string name="data_usage_disclaimer" msgid="6887858149980673444">"Gagnaútreikningur símafyrirtækisins kann að sýna aðra niðurstöðu en tækið þitt."</string>
     <string name="cryptkeeper_emergency_call" msgid="198578731586097145">"Neyðarsímtal"</string>
     <string name="cryptkeeper_return_to_call" msgid="5613717339452772491">"Aftur í símtal"</string>
@@ -2527,9 +2541,6 @@
     <string name="backup_pw_set_button_text" msgid="2387480910044648795">"Velja aðgangsorð fyrir afritun"</string>
     <string name="backup_pw_cancel_button_text" msgid="8845630125391744615">"Hætta við"</string>
     <string name="additional_system_update_settings_list_item_title" msgid="214987609894661992">"Viðbótaruppf. fyrir kerfi"</string>
-    <string name="selinux_status_disabled" msgid="924551035552323327">"Óvirkt"</string>
-    <string name="selinux_status_permissive" msgid="6004965534713398778">"Frávíkjanlegt"</string>
-    <string name="selinux_status_enforcing" msgid="2252703756208463329">"Framfylgt"</string>
     <string name="ssl_ca_cert_warning" msgid="2045866713601984673">"Hugsanlega er fylgst með netinu"</string>
     <string name="done_button" msgid="1991471253042622230">"Lokið"</string>
     <plurals name="ssl_ca_cert_dialog_title" formatted="false" msgid="7145092748045794650">
@@ -2727,6 +2738,7 @@
       <item quantity="one">Sýna %d falið atriði</item>
       <item quantity="other">Sýna %d falin atriði</item>
     </plurals>
+    <string name="dashboard_suggestion_condition_footer_content_description" msgid="2898588191174845961">"Draga saman"</string>
     <string name="network_dashboard_title" msgid="4771589228992391573">"Netkerfi og internet"</string>
     <string name="network_dashboard_summary_mobile" msgid="3851083934739500429">"farsími"</string>
     <string name="network_dashboard_summary_data_usage" msgid="3843261364705042212">"gagnanotkun"</string>
@@ -2786,8 +2798,7 @@
     <string name="keywords_gesture" msgid="3526905012224714078">"bendingar"</string>
     <string name="keywords_payment_settings" msgid="5220104934130446416">"borga, ýta, greiðslur"</string>
     <string name="keywords_backup" msgid="470070289135403022">"afrita, afritun"</string>
-    <!-- no translation found for keywords_assist_gesture_launch (813968759791342591) -->
-    <skip />
+    <string name="keywords_assist_gesture_launch" msgid="813968759791342591">"bendingar"</string>
     <string name="setup_wifi_nfc_tag" msgid="9028353016222911016">"Setja upp Wi-Fi NFC-merki"</string>
     <string name="write_tag" msgid="8571858602896222537">"Skrifa"</string>
     <string name="status_awaiting_tap" msgid="2130145523773160617">"Snertu merki til að skrifa..."</string>
@@ -2830,8 +2841,14 @@
       <item quantity="one">Kveikt á <xliff:g id="ON_COUNT">%d</xliff:g> sjálfvirkri reglu</item>
       <item quantity="other">Kveikt á <xliff:g id="ON_COUNT">%d</xliff:g> sjálfvirkum reglum</item>
     </plurals>
-    <string name="zen_mode_settings_title" msgid="842308776768942600">"Stillingar fyrir „Ónáðið ekki“"</string>
-    <string name="zen_mode_priority_settings_title" msgid="2623117023031824309">"Aðeins forgangsheimildir"</string>
+    <string name="zen_mode_settings_title" msgid="1066226840983908121">"Ónáðið ekki"</string>
+    <string name="zen_mode_behavior_settings_title" msgid="1463303933529313969">"Hegðun"</string>
+    <string name="zen_mode_behavior_allow_title" msgid="3845615648136218141">"Leyfa hljóð og titring frá"</string>
+    <string name="zen_mode_behavior_no_sound" msgid="1219626004723208056">"Ekkert hljóð"</string>
+    <string name="zen_mode_behavior_total_silence" msgid="6716603819806610626">"Ekkert hljóð (algjör þögn)"</string>
+    <string name="zen_mode_behavior_no_sound_except" msgid="4968477585788243114">"Ekkert hljóð nema <xliff:g id="CATEGORIES">%1$s</xliff:g>"</string>
+    <!-- no translation found for zen_mode_behavior_alarms_only (2423480992071472963) -->
+    <skip />
     <string name="zen_mode_automation_settings_title" msgid="4228995740594063774">"Sjálfvirkar reglur"</string>
     <string name="zen_mode_automation_suggestion_title" msgid="5105443455143476201">"Stilla reglur „Ónáðið ekki“"</string>
     <string name="zen_mode_automation_suggestion_summary" msgid="4732808039946935657">"Takmarka hljóð og titring á vissum tíma"</string>
@@ -2873,13 +2890,15 @@
     <string name="notifications_title" msgid="8086372779371204971">"Tilkynningar"</string>
     <string name="app_notifications_title" msgid="5810577805218003760">"Forritatilkynningar"</string>
     <string name="notification_channel_title" msgid="2260666541030178452">"Tilkynningaflokkur"</string>
+    <string name="notification_group_title" msgid="7180506440133859601">"Hópur tilkynningaflokks"</string>
     <string name="notification_importance_title" msgid="848692592679312666">"Mikilvægi"</string>
-    <string name="notification_importance_unspecified" msgid="2196023702875112081">"Leyfa forritinu að ákveða"</string>
+    <string name="notification_importance_unspecified" msgid="6622173510486113958">"Leyfa hljóð"</string>
     <string name="notification_importance_blocked" msgid="7938180808339386300">"Aldrei sýna tilkynningar"</string>
     <string name="notification_importance_min" msgid="5455049524984686275">"Ekkert hljóð eða sjónræn truflun"</string>
     <string name="notification_importance_low" msgid="8881468429453766553">"Ekkert hljóð"</string>
     <string name="notification_importance_default" msgid="5958338024601957516">"Spila hljóð"</string>
     <string name="notification_importance_high" msgid="2082429479238228527">"Spila hljóð og birta sprettitilkynningu"</string>
+    <string name="notification_importance_high_silent" msgid="2667033773703765252">"Opnast á skjánum"</string>
     <string name="notification_importance_min_title" msgid="6974673091137544803">"Lítið"</string>
     <string name="notification_importance_low_title" msgid="8131254047772814309">"Í meðallagi"</string>
     <string name="notification_importance_default_title" msgid="9120383978536089489">"Mikið"</string>
@@ -2916,15 +2935,19 @@
     <string name="picture_in_picture_keywords" msgid="8361318686701764690">"mynd í mynd"</string>
     <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>
-    <!-- no translation found for picture_in_picture_app_detail_summary (1264019085827708920) -->
-    <skip />
+    <string name="picture_in_picture_app_detail_summary" msgid="1264019085827708920">"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="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>
     <string name="app_notifications_off_desc" msgid="4882445501376722969">"Android kemur í veg fyrir að tilkynningar þessa forrits birtist í þessu tæki"</string>
     <string name="channel_notifications_off_desc" msgid="5899225298718840635">"Android kemur í veg fyrir að tilkynningar birtist í þessu tæki"</string>
+    <string name="channel_group_notifications_off_desc" msgid="1620950416247316370">"Android kemur í veg fyrir að þessi tilkynningaflokkur birtist í þessu tæki"</string>
     <string name="notification_channels" msgid="5346841743182627500">"Flokkar"</string>
     <string name="notification_channels_other" msgid="5645317113885788226">"Annað"</string>
+    <plurals name="notification_group_summary" formatted="false" msgid="3420621520561455358">
+      <item quantity="one"><xliff:g id="COUNT_1">%d</xliff:g> flokkur</item>
+      <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> flokkar</item>
+    </plurals>
     <string name="no_channels" msgid="3077375508177744586">"Þetta forrit hefur ekki birt neinar tilkynningar"</string>
     <string name="app_settings_link" msgid="8894946007543660906">"Fleiri stillingar í forritinu"</string>
     <string name="app_notification_listing_summary_zero" msgid="6482582965081108108">"Virkt í öllum forritum"</string>
@@ -3001,12 +3024,14 @@
     <string name="zen_mode_from_starred" msgid="2678345811950997027">"Aðeins frá stjörnumerktum tengiliðum"</string>
     <string name="zen_mode_from_none" msgid="8219706639954614136">"Ekkert"</string>
     <string name="zen_mode_alarms" msgid="2165302777886552926">"Vekjarar"</string>
+    <!-- no translation found for zen_mode_media_system_other (8900209390529859777) -->
+    <skip />
     <string name="zen_mode_reminders" msgid="5458502056440485730">"Áminningar"</string>
     <string name="zen_mode_events" msgid="7914446030988618264">"Viðburðir"</string>
     <string name="zen_mode_all_callers" msgid="584186167367236922">"Allir hringjendur"</string>
     <string name="zen_mode_selected_callers" msgid="3127598874060615742">"Valdir hringjendur"</string>
     <string name="zen_mode_repeat_callers" msgid="5019521886428322131">"Hringt endurtekið"</string>
-    <string name="zen_mode_repeat_callers_summary" msgid="7192713032364140137">"Leyfa símtal ef sami aðili hringir aftur innan <xliff:g id="MINUTES">%d</xliff:g> mínútna"</string>
+    <string name="zen_mode_repeat_callers_summary" msgid="239685342222975733">"Ef sami aðili hringir aftur innan <xliff:g id="MINUTES">%d</xliff:g> mínútna"</string>
     <string name="zen_mode_when" msgid="2767193283311106373">"Kveikja sjálfkrafa"</string>
     <string name="zen_mode_when_never" msgid="8809494351918405602">"Aldrei"</string>
     <string name="zen_mode_when_every_night" msgid="3122486110091921009">"Á hverju kvöldi"</string>
@@ -3035,6 +3060,7 @@
     <string name="zen_mode_screen_off_visual_interruptions" msgid="4850792880144382633">"Þegar slökkt er á skjánum"</string>
     <string name="zen_mode_no_visual_interruptions" msgid="8742776003822778472">"Þegar kveikt eða slökkt er á skjánum"</string>
     <string name="notification_app_settings_button" msgid="6685640230371477485">"Tilkynningastillingar"</string>
+    <string name="suggestion_button_text" msgid="3275010948381252006">"Í lagi"</string>
     <string name="device_feedback" msgid="3238056036766293294">"Senda ábendingar um þetta tæki"</string>
     <string name="restr_pin_enter_admin_pin" msgid="1085834515677448072">"Færðu inn PIN-númer kerfisstjóra"</string>
     <string name="switch_on_text" msgid="1124106706920572386">"Kveikt"</string>
@@ -3219,6 +3245,7 @@
     <string name="usb_summary_file_transfers" msgid="6435943692610175111">"Flytur skrár"</string>
     <string name="usb_summary_photo_transfers" msgid="8440204169576585250">"Flytur myndir (PTP)"</string>
     <string name="usb_summary_MIDI" msgid="5687906612187885908">"Notar tæki sem MIDI"</string>
+    <string name="sms_mirroring_pref" msgid="6475043279147376031">"SMS-speglun"</string>
     <string name="background_check_pref" msgid="7550258400138010979">"Bakgrunnsathugun"</string>
     <string name="background_check_title" msgid="4534254315824525593">"Fullur bakgrunnsaðgangur"</string>
     <string name="assist_access_context_title" msgid="2269032346698890257">"Nota texta af skjánum"</string>
@@ -3285,7 +3312,7 @@
     <string name="write_settings_title" msgid="4232152481902542284">"Geta breytt kerfisstillingum"</string>
     <string name="write_system_settings" msgid="3482913590601096763">"Breyta kerfisstillingum"</string>
     <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="permit_write_settings" msgid="658555006453212691">"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>
@@ -3380,9 +3407,12 @@
     <string name="color_temperature" msgid="2070126836910615605">"Svalur litblær skjás"</string>
     <string name="color_temperature_desc" msgid="4793729830226404052">"Nota svalari skjáliti"</string>
     <string name="color_temperature_toast" msgid="4974218172133854827">"Slökktu á skjánum til að virkja litbreytinguna"</string>
-    <string name="telephony_monitor_toast" msgid="7003764250271195384">"Til að breyta fjarskiptaumsjón skaltu endurræsa tækið"</string>
+    <string name="connectivity_monitor_switch" msgid="9059759348648583421">"Umsjón tenginga"</string>
+    <string name="connectivity_monitor_switch_summary" msgid="2828658652378866401">"Umsjón tenginga safnar annálum þegar hún greinir vandamál með tengingu og birtir notandanum tilkynningu um að senda inn villutilkynningu"</string>
+    <string name="connectivity_monitor_toast" msgid="5551859612881173028">"Endurræstu tækið til að breyta umsjón tenginga"</string>
     <string name="camera_hal_hdrplus_switch" msgid="8377365197105267466">"Myndavél HAL HDR+"</string>
     <string name="camera_hal_hdrplus_toast" msgid="2063703797270055299">"Endurræstu tækið til að virkja breytingu á myndavél HAL HDR+"</string>
+    <string name="camera_laser_sensor_switch" msgid="8913588990743234440">"Leysigeislaskynjari myndavélar"</string>
     <string name="ota_disable_automatic_update" msgid="2319639631655915050">"Sjálfvirkar kerfisuppfærslur"</string>
     <string name="usage" msgid="2977875522080448986">"Notkun"</string>
     <string name="cellular_data_usage" msgid="2155683719898158203">"Notkun farsímagagna"</string>
@@ -3408,7 +3438,7 @@
     <string name="data_warning" msgid="209133958008062117">"Gagnaviðvörun"</string>
     <string name="set_data_limit" msgid="2901526323210516923">"Velja gagnatakmörk"</string>
     <string name="data_limit" msgid="1885406964934590552">"Gagnamörk"</string>
-    <string name="data_usage_template" msgid="392191945602400904">"<xliff:g id="ID_1">%1$s</xliff:g> notuð milli <xliff:g id="ID_2">%2$s</xliff:g>"</string>
+    <string name="data_usage_template" msgid="2923744765873163859">"<xliff:g id="ID_1">%1$s</xliff:g> notuð <xliff:g id="ID_2">%2$s</xliff:g>"</string>
     <string name="configure" msgid="1029654422228677273">"Stilla"</string>
     <string name="data_usage_other_apps" msgid="3272872663517382050">"Önnur forrit talin með í notkun"</string>
     <plurals name="data_saver_unrestricted_summary" formatted="false" msgid="2635267833484232703">
@@ -3477,7 +3507,7 @@
     <string name="button_confirm_convert_fbe" msgid="7101855374850373091">"Þurrka út og umbreyta"</string>
     <string name="reset_shortcut_manager_throttling" msgid="6495066467198668994">"Endurstilla ShortcutManager hraðatakmörkun"</string>
     <string name="reset_shortcut_manager_throttling_complete" msgid="1826770872063707900">"Hraðatakmörkun ShortcutManager hefur verið endurstillt"</string>
-    <string name="notification_suggestion_title" msgid="4506524937307816475">"Stjórna skjálásstilkynningum"</string>
+    <string name="notification_suggestion_title" msgid="387052719462473500">"Stjórna upplýsingum á lásskjá"</string>
     <string name="notification_suggestion_summary" msgid="8521159741445416875">"Sýna eða fela efni tilkynninga"</string>
     <string name="page_tab_title_summary" msgid="4070309266374993258">"Allar"</string>
     <string name="page_tab_title_support" msgid="8483187649355540109">"Aðstoð og ábendingar"</string>
@@ -3485,7 +3515,7 @@
     <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>
     <string name="premium_sms_access" msgid="4660047004791638305">"Sérstakur SMS-aðgangur"</string>
-    <string name="bluetooth_disabled" msgid="2456198532288640046">"Ekki sýnilegt öðrum tækjum"</string>
+    <string name="bluetooth_disabled" msgid="6244000672828617410">"Slökkt"</string>
     <string name="bluetooth_connected_summary" msgid="7672528674593152862">"Tengt við <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="bluetooth_connected_multiple_devices_summary" msgid="9173661896296663932">"Tengt við mörg tæki"</string>
     <string name="demo_mode" msgid="2798762752209330277">"Prufustilling kerfisviðmóts"</string>
@@ -3587,7 +3617,7 @@
     <string name="web_action_enable_title" msgid="4051513950976670853">"Skyndiforrit"</string>
     <string name="web_action_enable_summary" msgid="3108127559723396382">"Opna tengla í forritum, jafnvel þótt þau séu ekki uppsett"</string>
     <string name="web_action_section_title" msgid="7364647086538399136">"Skyndiforrit"</string>
-    <string name="instant_apps_account" msgid="1433620209791992528">"Reikningur skyndiforrita"</string>
+    <string name="instant_apps_settings" msgid="8827777916518348213">"Kjörstillingar skyndiforrita"</string>
     <string name="domain_url_section_title" msgid="7046835219056428883">"Uppsett forrit"</string>
     <string name="automatic_storage_manager_activation_warning" msgid="6353100011690933254">"Geymslurýminu þínu er nú stjórnað af geymslustjórnun"</string>
     <string name="account_for_section_header" msgid="5356566418548737121">"Reikningar fyrir <xliff:g id="USER_NAME">%1$s</xliff:g>"</string>
@@ -3634,7 +3664,9 @@
     <string name="enterprise_privacy_always_on_vpn_personal" msgid="9217774730260037434">"Kveikt á sívirku VPN á þínu eigin sniði"</string>
     <string name="enterprise_privacy_always_on_vpn_work" msgid="7244472958208315814">"Kveikt á sívirku VPN á vinnusniði"</string>
     <string name="enterprise_privacy_global_http_proxy" msgid="7936664553416257333">"Altækur HTTP-staðgengilsþjónn stilltur"</string>
-    <string name="enterprise_privacy_ca_certs" msgid="5885892204903688909">"Traust skilríki"</string>
+    <string name="enterprise_privacy_ca_certs_device" msgid="2019652712782510262">"Traust skilríki"</string>
+    <string name="enterprise_privacy_ca_certs_personal" msgid="2279084820904076599">"Traust skilríki á eigin sniði"</string>
+    <string name="enterprise_privacy_ca_certs_work" msgid="6187377647815301809">"Traust skilríki á vinnusniði"</string>
     <plurals name="enterprise_privacy_number_ca_certs" formatted="false" msgid="526375234629534165">
       <item quantity="one">Að lágmarki <xliff:g id="COUNT_1">%d</xliff:g> CA-vottorð</item>
       <item quantity="other">Að lágmarki <xliff:g id="COUNT_1">%d</xliff:g> CA-vottorð</item>
@@ -3697,6 +3729,8 @@
     <string name="carrier_provisioning" msgid="4398683675591893169">"Úthlutunarupplýsingar símafyrirtækis"</string>
     <string name="trigger_carrier_provisioning" msgid="3434865918009286187">"Kveikja á úthlutun símafyrirtækis"</string>
     <string name="new_device_suggestion_title" msgid="698847081680980774">"Hvað er nýtt og spennandi?"</string>
-    <string name="new_device_suggestion_summary" msgid="7172709269203435870">"Skoðaðu fimm helstu eiginleikana"</string>
+    <string name="new_device_suggestion_summary" product="default" msgid="206396571522515855">"Skoðaðu kynningu á nýja símanum þínum"</string>
+    <string name="new_device_suggestion_summary" product="tablet" msgid="393751455688210956">"Skoðaðu kynningu á nýju spjaldtölvunni þinni"</string>
+    <string name="new_device_suggestion_summary" product="device" msgid="2939870049868336652">"Skoðaðu kynningu á nýja tækinu þínu"</string>
     <string name="disabled_low_ram_device" msgid="3751578499721173344">"Þessi eiginleiki er ekki í boði í þessu tæki"</string>
 </resources>
diff --git a/res/values-it/arrays.xml b/res/values-it/arrays.xml
index 33a6e9f..1d912d4 100644
--- a/res/values-it/arrays.xml
+++ b/res/values-it/arrays.xml
@@ -100,8 +100,6 @@
     <!-- no translation found for wifi_security_no_eap:0 (2084555984818107151) -->
     <!-- no translation found for wifi_security_no_eap:1 (397579322683471524) -->
     <!-- no translation found for wifi_security_no_eap:2 (1968820975358150484) -->
-    <!-- no translation found for wifi_ap_security:0 (5251664683198623324) -->
-    <!-- no translation found for wifi_ap_security:1 (7989073072260294673) -->
   <string-array name="wifi_eap_method">
     <item msgid="1160193392455075561">"PEAP"</item>
     <item msgid="7981731051382306293">"TLS"</item>
diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml
index 941b0ce..52d743f 100644
--- a/res/values-it/strings.xml
+++ b/res/values-it/strings.xml
@@ -166,7 +166,7 @@
     <string name="bluetooth_map_acceptance_dialog_text" msgid="8712508202081143737">"%1$s desidera accedere ai tuoi messaggi. Dare accesso a %2$s?"</string>
     <string name="bluetooth_sap_request" msgid="2669762224045354417">"Richiesta di accesso alla SIM"</string>
     <string name="bluetooth_sap_acceptance_dialog_text" msgid="4414253873553608690">"<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g> desidera accedere alla tua scheda SIM. Se consenti l\'accesso, la connettività dati sul dispositivo sarà disattivata per tutta la durata della connessione. Consentire l\'accesso a <xliff:g id="DEVICE_NAME_1">%2$s?</xliff:g>?"</string>
-    <string name="bluetooth_device_name_summary" msgid="4757990010751789977">"Visibile come <xliff:g id="DEVICE_NAME">^1</xliff:g> agli altri dispositivi"</string>
+    <string name="bluetooth_device_name_summary" msgid="522235742194965734">"Visibile come <xliff:g id="DEVICE_NAME">^1</xliff:g> agli altri dispositivi"</string>
     <string name="bluetooth_paired_device_title" msgid="8638994696317952019">"I tuoi dispositivi"</string>
     <string name="bluetooth_pairing_page_title" msgid="7712127387361962608">"Accoppia nuovo dispositivo"</string>
     <string name="date_and_time" msgid="9062980487860757694">"Data e ora"</string>
@@ -312,6 +312,8 @@
     <string name="zone_auto" msgid="334783869352026648">"Fuso orario automatico"</string>
     <string name="zone_auto_summaryOn" msgid="6142830927278458314">"Utilizza il fuso orario fornito dalla rete"</string>
     <string name="zone_auto_summaryOff" msgid="2597745783162041390">"Utilizza il fuso orario fornito dalla rete"</string>
+    <string name="date_time_24hour_auto" msgid="2117383168985653422">"Formato 24 ore automatico"</string>
+    <string name="date_time_24hour_auto_summary" msgid="6351812925651480277">"Utilizza impostazioni locali predefinite"</string>
     <string name="date_time_24hour_title" msgid="3203537578602803850">"Formato 24 ore"</string>
     <string name="date_time_24hour" msgid="1193032284921000063">"Usa formato 24 ore"</string>
     <string name="date_time_set_time_title" msgid="6296795651349047016">"Ora"</string>
@@ -329,7 +331,7 @@
     <string name="lock_immediately_summary_with_exception" msgid="9119632173886172690">"Subito dopo la sospensione, tranne quando tenuto sbloccato da <xliff:g id="TRUST_AGENT_NAME">%1$s</xliff:g>"</string>
     <string name="lock_after_timeout_summary_with_exception" msgid="5579064842797188409">"<xliff:g id="TIMEOUT_STRING">%1$s</xliff:g> dopo la sospensione, tranne quando tenuto sbloccato da <xliff:g id="TRUST_AGENT_NAME">%2$s</xliff:g>"</string>
     <string name="show_owner_info_on_lockscreen_label" msgid="5074906168357568434">"Mostra info proprietario su blocco schermo"</string>
-    <string name="owner_info_settings_title" msgid="5530285568897386122">"Msg schermata blocco"</string>
+    <string name="owner_info_settings_title" msgid="5530285568897386122">"Messaggio schermata blocco"</string>
     <string name="security_enable_widgets_title" msgid="2754833397070967846">"Abilita widget"</string>
     <string name="security_enable_widgets_disabled_summary" msgid="6392489775303464905">"Disattivati dall\'amministratore"</string>
     <string name="owner_info_settings_summary" msgid="7472393443779227052">"Nessuno"</string>
@@ -365,13 +367,16 @@
     <string name="security_settings_fingerprint_preference_summary_none" msgid="1507739327565151923"></string>
     <string name="security_settings_fingerprint_enroll_introduction_title" msgid="3201556857492526098">"Sblocca con l\'impronta"</string>
     <string name="security_settings_fingerprint_enroll_introduction_title_unlock_disabled" msgid="7066417934622827305">"Usa la tua impronta digitale"</string>
-    <string name="security_settings_fingerprint_enroll_introduction_message" msgid="3508870672887336095">"Tocca il sensore delle impronte digitali per sbloccare il telefono, autorizzare gli acquisti o accedere alle app desiderate. Scegli con attenzione chi aggiungere: le operazioni sopra elencate possono essere svolte con qualsiasi impronta digitale aggiunta.\n\nNota. La tua impronta digitale potrebbe essere meno sicura di una sequenza o un PIN complesso."</string>
+    <string name="security_settings_fingerprint_enroll_introduction_message" msgid="3508870672887336095">"Tocca il sensore delle impronte digitali per sbloccare il telefono, autorizzare gli acquisti o accedere alle app. Scegli con attenzione chi aggiungere: le operazioni sopra elencate possono essere svolte con qualsiasi impronta digitale aggiunta.\n\nNota: la tua impronta digitale potrebbe essere meno sicura di una sequenza o un PIN complesso."</string>
     <string name="security_settings_fingerprint_enroll_introduction_message_unlock_disabled" msgid="1550756694054944874">"Utilizza la tua impronta digitale per sbloccare il telefono o approvare un acquisto.\n\nNota: non puoi utilizzare la tua impronta digitale per sbloccare questo dispositivo. Per ulteriori informazioni, contatta l\'amministratore dell\'organizzazione."</string>
     <string name="security_settings_fingerprint_enroll_introduction_message_setup" msgid="6817326798834882531">"Utilizza la tua impronta digitale per sbloccare il telefono o approvare un acquisto.\n\nNota: la tua impronta digitale potrebbe essere meno sicura di una sequenza o un codice PIN complessi."</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel" msgid="3199351118385606526">"Annulla"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue" msgid="7472492858148162530">"Continua"</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel_setup" msgid="5021369420474432665">"Ignora"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue_setup" msgid="1961957425135180242">"Avanti"</string>
+    <string name="setup_fingerprint_enroll_skip_title" msgid="362050541117362034">"Saltare conf. impr. digitale?"</string>
+    <string name="setup_fingerprint_enroll_skip_after_adding_lock_text" msgid="958990414356204763">"La configurazione dell\'impronta digitale richiede solo un paio di minuti. Se salti questo passaggio, potrai aggiungere l\'impronta digitale in seguito nelle impostazioni."</string>
+    <string name="lock_screen_intro_skip_title" msgid="4988210105913705679">"Ignorare il blocco schermo?"</string>
     <string name="lock_screen_intro_skip_dialog_text_frp" product="tablet" msgid="1581834104051243425">"Le funzioni di protezione del dispositivo non verranno attivate. Non potrai impedire ad altre persone di utilizzare questo tablet se viene smarrito, rubato o reimpostato."</string>
     <string name="lock_screen_intro_skip_dialog_text_frp" product="device" msgid="4629503416877189572">"Le funzioni di protezione del dispositivo non verranno attivate. Non potrai impedire ad altre persone di utilizzare questo dispositivo se viene smarrito, rubato o reimpostato."</string>
     <string name="lock_screen_intro_skip_dialog_text_frp" product="default" msgid="2423428240245737909">"Le funzioni di protezione del dispositivo non verranno attivate. Non potrai impedire ad altre persone di utilizzare questo telefono se viene smarrito, rubato o reimpostato."</string>
@@ -399,9 +404,9 @@
     <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="2989019978041986175">"Tocca il sensore sulla parte posteriore del telefono. Utilizza il dito indice."</string>
-    <string name="security_settings_fingerprint_enroll_error_dialog_title" msgid="3618021988442639280">"L\'iscrizione non è stata completata"</string>
-    <string name="security_settings_fingerprint_enroll_error_timeout_dialog_message" msgid="2942551158278899627">"Timeout iscrizione mediante impronta digitale. Riprova."</string>
-    <string name="security_settings_fingerprint_enroll_error_generic_dialog_message" msgid="3624760637222239293">"Iscrizione mediante impronta digitale non riuscita. Riprova o utilizza un dito diverso."</string>
+    <string name="security_settings_fingerprint_enroll_error_dialog_title" msgid="3618021988442639280">"Registrazione non completata"</string>
+    <string name="security_settings_fingerprint_enroll_error_timeout_dialog_message" msgid="2942551158278899627">"Raggiunto tempo limite per la registrazione dell\'impronta digitale. Riprova."</string>
+    <string name="security_settings_fingerprint_enroll_error_generic_dialog_message" msgid="3624760637222239293">"Registrazione dell\'impronta digitale non riuscita. Riprova o utilizza un dito diverso."</string>
     <string name="fingerprint_enroll_button_add" msgid="6317978977419045463">"Aggiungine un\'altra"</string>
     <string name="fingerprint_enroll_button_next" msgid="6247009337616342759">"Avanti"</string>
     <string name="security_settings_fingerprint_enroll_disclaimer" msgid="2624905914239271751">"Oltre che per sbloccare il telefono, puoi utilizzare la tua impronta digitale per autorizzare acquisti e accessi alle app. "<annotation id="url">"Ulteriori informazioni"</annotation></string>
@@ -457,7 +462,7 @@
     <string name="setup_lock_settings_picker_title" product="tablet" msgid="90329443364067215">"Proteggi il tuo tablet"</string>
     <string name="setup_lock_settings_picker_title" product="device" msgid="2399952075134938929">"Proteggi dispositivo"</string>
     <string name="setup_lock_settings_picker_title" product="default" msgid="1572244299605153324">"Proteggi il telefono"</string>
-    <string name="setup_lock_settings_picker_fingerprint_message" msgid="5585650064305600578">"Per maggiore sicurezza, imposta un blocco schermo di backup."</string>
+    <string name="lock_settings_picker_fingerprint_added_security_message" msgid="5768002109707648463">"Per maggiore sicurezza, imposta un blocco schermo alternativo."</string>
     <string name="setup_lock_settings_picker_message" product="tablet" msgid="8919671129189936210">"Impedisci ad altri di utilizzare il tablet senza la tua autorizzazione attivando le funzioni di protezione del dispositivo. Scegli il blocco schermo che desideri utilizzare."</string>
     <string name="setup_lock_settings_picker_message" product="device" msgid="3787276514406353777">"Impedisci ad altri di utilizzare il dispositivo senza la tua autorizzazione attivando le funzioni di protezione del dispositivo. Scegli il blocco schermo che desideri utilizzare."</string>
     <string name="setup_lock_settings_picker_message" product="default" msgid="3692856437543730446">"Impedisci ad altri di utilizzare il telefono senza la tua autorizzazione attivando le funzioni di protezione del dispositivo. Scegli il blocco schermo che desideri utilizzare."</string>
@@ -588,6 +593,7 @@
     <string name="lockpassword_pin_no_sequential_digits" msgid="680765285206990584">"Non sono consentite sequenze di cifre in ordine ascendente o discendente oppure ripetute"</string>
     <string name="lockpassword_ok_label" msgid="313822574062553672">"OK"</string>
     <string name="lockpassword_cancel_label" msgid="8818529276331121899">"Annulla"</string>
+    <string name="lockpassword_clear_label" msgid="5724429464960458155">"Cancella"</string>
     <string name="lockpattern_tutorial_cancel_label" msgid="6431583477570493261">"Annulla"</string>
     <string name="lockpattern_tutorial_continue_label" msgid="3559793618653400434">"Avanti"</string>
     <string name="lock_setup" msgid="3355847066343753943">"Impostazione completata."</string>
@@ -781,6 +787,7 @@
     <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>
@@ -817,6 +824,8 @@
     <string name="wifi_wps_available_first_item" msgid="4422547079984583502">"WPS disponibile"</string>
     <string name="wifi_wps_available_second_item" msgid="8427520131718215301">" (WPS disponibile)"</string>
     <string name="wifi_wps_nfc_enter_password" msgid="2288214226916117159">"Inserisci la password di rete"</string>
+    <string name="wifi_carrier_connect" msgid="8174696557882299911">"Rete Wi‑Fi dell\'operatore"</string>
+    <string name="wifi_carrier_content" msgid="4634077285415851933">"Connettiti tramite <xliff:g id="NAME">%1%s</xliff:g>"</string>
     <string name="wifi_scan_always_turnon_message" msgid="203123538572122989">"Per migliorare la precisione della posizione e per altri scopi, <xliff:g id="APP_NAME">%1$s</xliff:g> chiede di attivare la ricerca della rete, anche quando il Wi-Fi è disattivato.\n\nConsetirlo a tutte le app che vogliono eseguire la ricerca?"</string>
     <string name="wifi_scan_always_turnoff_message" msgid="5538901671131941043">"Per disattivare questa impostazione, vai alla sezione Avanzate nel menu extra."</string>
     <string name="wifi_scan_always_confirm_allow" msgid="5355973075896817232">"Consenti"</string>
@@ -834,6 +843,7 @@
     <string name="wifi_connect" msgid="1076622875777072845">"Connetti"</string>
     <string name="wifi_failed_connect_message" msgid="8491902558970292871">"Impossibile connettersi alla rete"</string>
     <string name="wifi_forget" msgid="8168174695608386644">"Elimina"</string>
+    <string name="wifi_modify" msgid="6100248070440710782">"Modifica"</string>
     <string name="wifi_failed_forget_message" msgid="1348172929201654986">"Impossibile eliminare la rete"</string>
     <string name="wifi_save" msgid="3331121567988522826">"Salva"</string>
     <string name="wifi_failed_save_message" msgid="6650004874143815692">"Impossibile salvare la rete"</string>
@@ -846,6 +856,7 @@
     <string name="wifi_advanced_titlebar" msgid="4485841401774142908">"Wi‑Fi avanzate"</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_title" msgid="3471132676909349382">"Info rete"</string>
     <string name="wifi_details_subnet_mask" msgid="6720279144174924410">"Subnet mask"</string>
     <string name="wifi_details_dns" msgid="8648826607751830768">"DNS"</string>
     <string name="wifi_details_ipv6_address_header" msgid="6734119149106422148">"Indirizzi IPv6"</string>
@@ -878,16 +889,15 @@
     <string name="wifi_p2p_cancel_connect_title" msgid="255267538099324413">"Annullare l\'invito?"</string>
     <string name="wifi_p2p_cancel_connect_message" msgid="7477756213423749402">"Vuoi annullare l\'invito a connettersi con <xliff:g id="PEER_NAME">%1$s</xliff:g>?"</string>
     <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_off_subtext" msgid="5466126533609394170">"Connessione Internet o contenuti non condivisi con altri dispositivi"</string>
     <string name="wifi_hotspot_tethering_on_subtext" product="tablet" msgid="5752490509369962007">"Connessione Internet del tablet condivisa tramite hotspot"</string>
     <string name="wifi_hotspot_tethering_on_subtext" product="default" msgid="6461075246164300670">"Connessione Internet del telefono condivisa tramite hotspot"</string>
     <string name="wifi_hotspot_on_local_only_subtext" msgid="2068110388011294735">"L\'app sta condividendo contenuti. Per condividere la connessione Internet, disattiva e riattiva l\'hotspot"</string>
-    <string name="wifi_hotspot_name_title" msgid="1341735529132128887">"Nome Wi-Fi"</string>
+    <string name="wifi_hotspot_name_title" msgid="8237000746618636778">"Nome hotspot"</string>
     <string name="wifi_hotspot_name_summary_connecting" msgid="3378299995508671967">"Attivazione di <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>..."</string>
     <string name="wifi_hotspot_name_summary_connected" msgid="3888672084861445362">"Gli altri dispositivi possono collegarsi a <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>"</string>
-    <string name="wifi_hotspot_password_title" msgid="1955592302902091281">"Password Wi-Fi"</string>
+    <string name="wifi_hotspot_password_title" msgid="8676859981917573801">"Password hotspot"</string>
     <string name="wifi_hotspot_ap_band_title" msgid="1165801173359290681">"Banda AP"</string>
     <string name="wifi_hotspot_footer_info_regular" msgid="1203489406068036455">"Utilizza un hotspot per creare una rete Wi-Fi per altri dispositivi. Gli hotspot forniscono l\'accesso a Internet utilizzando la connessione dati mobili. Potrebbero essere applicate tariffe aggiuntive per i dati mobili."</string>
     <string name="wifi_hotspot_footer_info_local_only" msgid="857988412470694109">"Le app possono creare un hotspot per condividere contenuti con i dispositivi vicini."</string>
@@ -898,7 +908,6 @@
     <string name="wifi_tether_configure_ap_text" msgid="7974681394041609308">"Configura hotspot Wi‑Fi"</string>
     <string name="wifi_hotspot_configure_ap_text" msgid="5478614731464220432">"Configurazione hotspot Wi-Fi"</string>
     <string name="wifi_hotspot_configure_ap_text_summary" msgid="5560680057727007011">"Hotspot WPA2 PSK AndroidAP"</string>
-    <string name="wifi_tether_configure_subtext" msgid="2050196439900426456">"Hotspot <xliff:g id="NETWORK_SSID">%1$s</xliff:g> <xliff:g id="NETWORK_SECURITY">%2$s</xliff:g>"</string>
     <string name="wifi_tether_configure_ssid_default" msgid="8467525402622138547">"HotspotAndroid"</string>
     <string name="wifi_calling_settings_title" msgid="4102921303993404577">"Chiamate Wi-Fi"</string>
     <string name="wifi_calling_suggestion_title" msgid="9008010480466359578">"Attiva chiamate Wi-Fi"</string>
@@ -939,7 +948,7 @@
     <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="emergency_address_summary" msgid="3266760199681945746">"L\'indirizzo utilizzato dai servizi di emergenza per fornire la tua posizione se effettui una chiamata di emergenza tramite Wi-Fi"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"Display"</string>
     <string name="sound_settings" msgid="5534671337768745343">"Audio"</string>
     <string name="all_volume_title" msgid="4296957391257836961">"Volumi"</string>
@@ -993,6 +1002,7 @@
     <string name="search_settings" msgid="1910951467596035063">"Ricerca"</string>
     <string name="search_settings_summary" msgid="9205656546570654169">"Gestisci le impostazioni e la cronologia delle ricerche"</string>
     <string name="search_settings_no_results" msgid="8799027492641230999">"Nessun risultato"</string>
+    <string name="search_clear_history" msgid="4196658962573162457">"Cancella cronologia"</string>
     <string name="display_settings" msgid="7965901687241669598">"Display"</string>
     <string name="accelerometer_title" msgid="7854608399547349157">"Rotazione automatica"</string>
     <string name="color_mode_title" msgid="3159275920408338215">"Colori vivaci"</string>
@@ -1049,16 +1059,16 @@
     <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 l\'inserimento nel dock"</string>
+    <string name="screensaver_settings_summary_either_long" msgid="7302740999250873332">"Durante la ricarica o quando inserito nel dock"</string>
     <string name="screensaver_settings_summary_either_short" msgid="6140527286137331478">"Entrambi i casi"</string>
     <string name="screensaver_settings_summary_sleep" msgid="9086186698140423493">"Durante la ricarica"</string>
     <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 iniziare"</string>
+    <string name="screensaver_settings_when_to_dream" msgid="7262410541382890146">"Quando avviare"</string>
     <string name="screensaver_settings_current" msgid="4663846038247130023">"Screensaver corrente"</string>
-    <string name="screensaver_settings_dream_start" msgid="4998187847985120168">"Inizia subito"</string>
+    <string name="screensaver_settings_dream_start" msgid="4998187847985120168">"Avvia adesso"</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>
@@ -1122,7 +1132,6 @@
     <string name="baseband_version" msgid="1848990160763524801">"Versione banda di base"</string>
     <string name="kernel_version" msgid="9192574954196167602">"Versione kernel"</string>
     <string name="build_number" msgid="3075795840572241758">"Numero build"</string>
-    <string name="selinux_status" msgid="6212165375172061672">"Stato di SELinux"</string>
     <string name="device_info_not_available" msgid="8062521887156825182">"Non disponibile"</string>
     <string name="device_status_activity_title" msgid="1411201799384697904">"Stato"</string>
     <string name="device_status" msgid="607405385799807324">"Stato"</string>
@@ -1150,7 +1159,6 @@
     <string name="status_wifi_mac_address" msgid="2202206684020765378">"Indirizzo MAC Wi‑Fi"</string>
     <string name="status_bt_address" msgid="4195174192087439720">"Indirizzo Bluetooth"</string>
     <string name="status_serial_number" msgid="2257111183374628137">"Numero di serie"</string>
-    <string name="status_unavailable" msgid="7862009036663793314">"Non disponibile"</string>
     <string name="status_up_time" msgid="7294859476816760399">"Tempo di attività"</string>
     <string name="status_awake_time" msgid="2393949909051183652">"Tempo di attività"</string>
     <string name="internal_memory" msgid="9129595691484260784">"Memoria interna"</string>
@@ -1249,7 +1257,7 @@
     <string name="storage_detail_system" msgid="4629506366064709687">"Sistema"</string>
     <string name="storage_detail_explore" msgid="7911344011431568294">"Esplora <xliff:g id="NAME">^1</xliff:g>"</string>
     <string name="storage_detail_dialog_other" msgid="8907101974576694793">"In Altro sono inclusi file condivisi salvati dalle app, file scaricati da Internet o tramite Bluetooth, file Android e così via. \n\nPer vedere i contenuti visibili di <xliff:g id="NAME">^1</xliff:g>, tocca Esplora."</string>
-    <string name="storage_detail_dialog_system" msgid="862835644848361569">"Il sistema include i file utilizzati per eseguire la versione di Android <xliff:g id="VERSION">%s</xliff:g>"</string>
+    <string name="storage_detail_dialog_system" msgid="862835644848361569">"Il sistema include i file utilizzati per eseguire Android versione <xliff:g id="VERSION">%s</xliff:g>"</string>
     <string name="storage_detail_dialog_user" msgid="3267254783294197804">"<xliff:g id="USER_0">^1</xliff:g> potrebbe aver salvato foto, musica, film, app o altri dati che occupano <xliff:g id="SIZE">^2</xliff:g> di spazio di archiviazione. \n\nPer i dettagli, passa a <xliff:g id="USER_1">^1</xliff:g>."</string>
     <string name="storage_wizard_init_title" msgid="5085400514028585772">"Configura la tua <xliff:g id="NAME">^1</xliff:g>"</string>
     <string name="storage_wizard_init_external_title" msgid="4867326438945303598">"Utilizza come memoria portatile"</string>
@@ -1325,7 +1333,8 @@
     <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="6254873816990678620">"Reimposta opzioni"</string>
+    <string name="reset_dashboard_title" msgid="6254873816990678620">"Opzioni di reimpostazione"</string>
+    <string name="reset_dashboard_summary" msgid="4851012632493522755">"È possibile reimpostare la rete, le app o il dispositivo"</string>
     <string name="reset_network_title" msgid="6166025966016873843">"Reimposta Wi-Fi, dati mobili e Bluetooth"</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>
@@ -1334,17 +1343,14 @@
     <string name="reset_network_confirm_title" msgid="1759888886976962773">"Reimpostare?"</string>
     <string name="network_reset_not_available" msgid="7188610385577164676">"La reimpostazione della rete non è disponibile per questo utente"</string>
     <string name="reset_network_complete_toast" msgid="787829973559541880">"Le impostazioni di rete sono state reimpostate"</string>
-    <string name="master_clear_title" msgid="6617679904229218425">"Cancella tutti i dati (ripristino dati fabbrica)"</string>
-    <plurals name="master_clear_with_account_summary" formatted="false" msgid="5911377203778818712">
-      <item quantity="other"><xliff:g id="ACCOUNT_COUNT">%1$d</xliff:g> account verranno reimpostati</item>
-      <item quantity="one">1 account verrà reimpostato</item>
-    </plurals>
-    <string name="master_clear_summary" msgid="6902443944660426951">"La memoria interna e tutti i dati verranno reimpostati"</string>
+    <string name="master_clear_title" msgid="3531267871084279512">"Cancella tutti i dati (ripristino dati fabbrica)"</string>
     <string name="master_clear_desc" product="tablet" msgid="9146059417023157222">"Questa operazione cancellerà tutti i dati dalla "<b>"memoria interna"</b>" del tablet, compresi:\n\n"<li>"Il tuo account Google"</li>\n<li>"Dati e impostazioni del sistema e delle app"</li>\n<li>"App scaricate"</li></string>
     <string name="master_clear_desc" product="default" msgid="4800386183314202571">"Questa operazione cancellerà tutti i dati dalla "<b>"memoria interna"</b>" del telefono, compresi:\n\n"<li>"Il tuo account Google"</li>\n<li>"Dati e impostazioni del sistema e delle app"</li>\n<li>"App scaricate"</li></string>
     <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"Al momento sei collegato ai seguenti account:\n"</string>
     <string name="master_clear_other_users_present" product="default" msgid="5161423070702470742">\n\n"Sono presenti altri utenti su questo dispositivo.\n"</string>
     <string name="master_clear_desc_also_erases_external" msgid="1903185203791274237"><li>"Musica"</li>\n<li>"Foto"</li>\n<li>"Altri dati utente"</li></string>
+    <string name="master_clear_desc_also_erases_esim" msgid="312352697653096008"><li>"Operatori su eSIM"</li></string>
+    <string name="master_clear_desc_no_cancel_mobile_plan" msgid="5460926449093211144">\n\n"Il tuo piano di servizio dati mobile non verrà annullato."</string>
     <string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="7744115866662613411">\n\n"Per cancellare musica, foto e altri dati dell\'utente, è necessario cancellare i dati dell\'"<b>"archivio USB"</b>"."</string>
     <string name="master_clear_desc_erase_external_storage" product="default" msgid="4801026652617377093">\n\n"Per cancellare musica, foto e altri dati dell\'utente, è necessario cancellare i dati della "<b>"scheda SD"</b>"."</string>
     <string name="erase_external_storage" product="nosdcard" msgid="969364037450286809">"Cancella archivio USB"</string>
@@ -1461,15 +1467,16 @@
     <string name="settings_safetylegal_activity_title" msgid="6901214628496951727">"Informazioni sulla sicurezza"</string>
     <string name="settings_safetylegal_activity_unreachable" msgid="250674109915859456">"Nessuna connessione dati disponibile. Per visualizzare ora le informazioni, visita il sito %s da qualsiasi computer collegato a Internet."</string>
     <string name="settings_safetylegal_activity_loading" msgid="8059022597639516348">"Caricamento..."</string>
-    <string name="lockpassword_choose_your_password_header" msgid="8624900666929394990">"Scegli la tua password"</string>
-    <string name="lockpassword_choose_your_password_header_for_fingerprint" msgid="6624409510609085450">"Per usare l\'impronta digitale, imposta la password"</string>
-    <string name="lockpassword_choose_your_pattern_header" msgid="6949761069941694050">"Scegli la tua sequenza"</string>
-    <string name="lockpassword_choose_your_pattern_header_for_fingerprint" msgid="5901096361617543819">"Per usare l\'impronta digitale, imposta la sequenza"</string>
-    <string name="lockpassword_choose_your_pin_header" msgid="7598849519816138302">"Scegli il tuo PIN"</string>
-    <string name="lockpassword_choose_your_pin_header_for_fingerprint" msgid="765344692615917183">"Per usare l\'impronta digitale, imposta il PIN"</string>
-    <string name="lockpassword_confirm_your_password_header" msgid="6308478184889846633">"Conferma la tua password"</string>
+    <string name="lockpassword_choose_your_screen_lock_header" msgid="3872462096767152394">"Imposta il blocco schermo"</string>
+    <string name="lockpassword_choose_your_password_message" msgid="1197569283524841412">"Per motivi di sicurezza, imposta una password"</string>
+    <string name="lockpassword_choose_your_password_header_for_fingerprint" msgid="2541818487015343503">"Per usare l\'impronta imposta la password"</string>
+    <string name="lockpassword_choose_your_pattern_header_for_fingerprint" msgid="7709785406243556723">"Per usare l\'impronta imposta la sequenza"</string>
+    <string name="lockpassword_choose_your_pin_message" msgid="1875420718677275646">"Per motivi di sicurezza, imposta un PIN"</string>
+    <string name="lockpassword_choose_your_pin_header_for_fingerprint" msgid="1549639053195796674">"Per usare l\'impronta, imposta il PIN"</string>
+    <string name="lockpassword_choose_your_pattern_message" msgid="5986983400689720015">"Per sicurezza, imposta una sequenza"</string>
+    <string name="lockpassword_confirm_your_password_header" msgid="1266027268220850931">"Inserisci di nuovo la password"</string>
     <string name="lockpassword_confirm_your_pattern_header" msgid="7543433733032330821">"Conferma la tua sequenza"</string>
-    <string name="lockpassword_confirm_your_pin_header" msgid="49038294648213197">"Conferma il tuo PIN"</string>
+    <string name="lockpassword_confirm_your_pin_header" msgid="7744513791910572550">"Inserisci di nuovo il PIN"</string>
     <string name="lockpassword_confirm_passwords_dont_match" msgid="5140892109439191415">"Le password non corrispondono"</string>
     <string name="lockpassword_confirm_pins_dont_match" msgid="7226244811505606217">"I PIN non corrispondono"</string>
     <string name="lockpassword_choose_lock_generic_header" msgid="3811438094903786145">"Selezione metodo di sblocco"</string>
@@ -1488,6 +1495,12 @@
     <string name="lockpassword_strong_auth_required_work_pattern" msgid="3003781907040522053">"Per maggiore sicurezza, usa la sequenza del tuo profilo di lavoro"</string>
     <string name="lockpassword_strong_auth_required_work_pin" msgid="3367491332598821552">"Per maggiore sicurezza, inserisci il PIN del tuo profilo di lavoro"</string>
     <string name="lockpassword_strong_auth_required_work_password" msgid="8159775129968582940">"Per maggiore sicurezza, inserisci la password del tuo profilo di lavoro"</string>
+    <string name="lockpassword_confirm_your_pattern_details_frp" msgid="6757336656791723193">"I dati fabbrica del dispositivo sono stati ripristinati: puoi sbloccarlo con la sequenza precedente."</string>
+    <string name="lockpassword_confirm_your_pin_details_frp" msgid="826520613445990470">"I dati fabbrica del dispositivo sono stati ripristinati: puoi sbloccarlo con il PIN precedente."</string>
+    <string name="lockpassword_confirm_your_password_details_frp" msgid="8944081074615739040">"I dati fabbrica del dispositivo sono stati ripristinati: puoi sbloccarlo con la password precedente."</string>
+    <string name="lockpassword_confirm_your_pattern_header_frp" msgid="2898036091609128286">"Verifica sequenza"</string>
+    <string name="lockpassword_confirm_your_pin_header_frp" msgid="4141601774778898803">"Verifica PIN"</string>
+    <string name="lockpassword_confirm_your_password_header_frp" msgid="3762615419295360480">"Verifica password"</string>
     <string name="lockpassword_invalid_pin" msgid="15588049067548470">"PIN errato"</string>
     <string name="lockpassword_invalid_password" msgid="4038507398784975200">"Password errata"</string>
     <string name="lockpattern_need_to_unlock_wrong" msgid="1745247595356012176">"Sequenza errata"</string>
@@ -1536,8 +1549,7 @@
     <string name="install_applications" msgid="4872012136210802181">"Origini sconosciute"</string>
     <string name="install_applications_title" msgid="4987712352256508946">"Consenti tutte le fonti di app"</string>
     <string name="recent_app_category_title" msgid="6673071268966003928">"App aperte di recente"</string>
-    <string name="see_all_apps_title" msgid="1317153498074308438">"Mostra tutte le <xliff:g id="COUNT">%1$d</xliff:g> app"</string>
-    <string name="recent_app_summary" msgid="3366446669844932300">"<xliff:g id="TIME">^1</xliff:g> fa"</string>
+    <string name="see_all_apps_title" msgid="1317153498074308438">"Mostra tutte le app (<xliff:g id="COUNT">%1$d</xliff:g>)"</string>
     <string name="install_all_warning" product="tablet" msgid="8310489909586138165">"Il tablet e i dati personali sono più vulnerabili agli attacchi provenienti da app sconosciute. Installando le app provenienti da questa origine, accetti di essere responsabile degli eventuali danni al tablet o della perdita di dati che potrebbero derivare dall\'utilizzo di queste app."</string>
     <string name="install_all_warning" product="default" msgid="1952257127370115988">"Il telefono e i dati personali sono più vulnerabili agli attacchi provenienti da app sconosciute. Installando le app provenienti da questa origine, accetti di essere responsabile degli eventuali danni al telefono o della perdita di dati che potrebbero derivare dall\'utilizzo di queste app."</string>
     <string name="advanced_settings" msgid="1777249286757067969">"Impostazioni avanzate"</string>
@@ -1801,7 +1813,7 @@
     <string name="accessibility_settings_summary" msgid="981260486011624939">"Screen reader, display, controlli di interazione"</string>
     <string name="vision_settings_title" msgid="4204111425716868288">"Impostazioni vista"</string>
     <string name="vision_settings_description" msgid="5679491180156408260">"Puoi personalizzare questo dispositivo in base alle tue esigenze. Queste funzioni di accessibilità possono essere modificate in un secondo momento nelle Impostazioni."</string>
-    <string name="vision_settings_suggestion_title" msgid="917294957154878441">"Aumenta dimensioni carattere"</string>
+    <string name="vision_settings_suggestion_title" msgid="8058794060304707004">"Cambia dimensioni carattere"</string>
     <string name="screen_reader_category_title" msgid="7739154903913400641">"Screen reader"</string>
     <string name="audio_and_captions_category_title" msgid="3420727114421447524">"Audio e testo su schermo"</string>
     <string name="display_category_title" msgid="685461049938269166">"Visualizzazione"</string>
@@ -1838,7 +1850,6 @@
     <string name="accessibility_display_inversion_preference_subtitle" msgid="7052959202195368109">"Potrebbe influire sulle prestazioni"</string>
     <string name="accessibility_autoclick_preference_title" msgid="7014499339068449623">"Clic quando puntatore si ferma"</string>
     <string name="accessibility_autoclick_delay_preference_title" msgid="3962261178385106006">"Ritardo prima del clic"</string>
-    <string name="preference_summary_default_combination" msgid="8532964268242666060">"<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">"ATTIVO"</string>
     <string name="accessibility_summary_state_disabled" msgid="2241315620132005595">"DISATTIVATO"</string>
     <string name="enable_quick_setting" msgid="2366999897816894536">"Mostra in Impostazioni rapide"</string>
@@ -1864,7 +1875,7 @@
       <item quantity="one">Ritardo molto lungo (<xliff:g id="CLICK_DELAY_LABEL_0">%1$d</xliff:g> ms)</item>
     </plurals>
     <string name="accessibility_menu_item_settings" msgid="3344942964710773365">"Impostazioni"</string>
-    <string name="accessibility_feature_state_on" msgid="2864292320042673806">"ON"</string>
+    <string name="accessibility_feature_state_on" msgid="2864292320042673806">"On"</string>
     <string name="accessibility_feature_state_off" msgid="4172584906487070211">"OFF"</string>
     <string name="captioning_preview_title" msgid="1234015253497016890">"Anteprima"</string>
     <string name="captioning_standard_options_title" msgid="3284211791180335844">"Opzioni standard"</string>
@@ -1927,7 +1938,7 @@
     <string name="print_no_printers_found" msgid="989018646884973683">"Nessuna stampante trovata"</string>
     <string name="print_menu_item_settings" msgid="6591330373682227082">"Impostazioni"</string>
     <string name="print_menu_item_add_printers" msgid="2890738028215834012">"Aggiungi stampanti"</string>
-    <string name="print_feature_state_on" msgid="8098901852502441048">"ON"</string>
+    <string name="print_feature_state_on" msgid="8098901852502441048">"On"</string>
     <string name="print_feature_state_off" msgid="7294876968403966040">"OFF"</string>
     <string name="print_menu_item_add_service" msgid="3811645167869797802">"Aggiungi servizio"</string>
     <string name="print_menu_item_add_printer" msgid="8251218970577291032">"Aggiungi stampante"</string>
@@ -1957,12 +1968,14 @@
     <string name="background_activity_summary_on" msgid="649282072540085599">"Esecuzione in background consentita quando l\'app non è in uso"</string>
     <string name="background_activity_summary_off" msgid="7666330699090632040">"Attività in background limitata quando l\'app non è in uso"</string>
     <string name="background_activity_summary_disabled" msgid="3710669050484599847">"Esecuzione in background dell\'app non consentita"</string>
+    <string name="background_activity_summary_whitelisted" msgid="7375400051141016808">"Impossibile ottimizzare il consumo della batteria per l\'app"</string>
+    <string name="background_activity_warning_dialog_title" msgid="2216249969149568871">"Limitare l\'attività in background?"</string>
+    <string name="background_activity_warning_dialog_text" msgid="7049624449246121981">"Se limiti l\'attività in background per un\'app, tale app potrebbe funzionare in modo anomalo"</string>
     <string name="device_screen_usage" msgid="3386088035570409683">"Utilizzo dello schermo dall\'ultima ricarica completa"</string>
     <string name="device_screen_consumption" msgid="4607589286438986687">"Consumo dello schermo"</string>
     <string name="device_cellular_network" msgid="4724773411762382950">"Scansione rete mobile"</string>
-    <string name="power_last_full_charge_summary" msgid="532845389094620657">"<xliff:g id="TIME">^1</xliff:g> fa"</string>
-    <string name="power_usage_list_summary" msgid="6775339745194635000">"Utilizzo dell\'app dall\'ultima ricarica (<xliff:g id="TIME">^1</xliff:g> fa)"</string>
-    <string name="power_usage_list_summary_device" msgid="7036566616386864302">"Utilizzo del dispositivo dall\'ultima ricarica completa (<xliff:g id="TIME">^1</xliff:g> fa)"</string>
+    <string name="power_usage_list_summary" msgid="6393929085382334341">"Utilizzo delle app dall\'ultima ricarica completa (<xliff:g id="RELATIVE_TIME">^1</xliff:g>)"</string>
+    <string name="power_usage_list_summary_device" msgid="4461926045610455423">"Utilizzo del dispositivo dall\'ultima ricarica completa (<xliff:g id="RELATIVE_TIME">^1</xliff:g>)"</string>
     <string name="screen_usage_summary" msgid="6687403051423153550">"Tempo per cui la schermata è rimasta attiva dalla ricarica completa"</string>
     <string name="device_usage_list_summary" msgid="5623036661468763251">"Utilizzo del dispositivo dall\'ultima ricarica completa"</string>
     <string name="battery_since_unplugged" msgid="338073389740738437">"Utilizzo batteria dallo scollegamento"</string>
@@ -2208,14 +2221,14 @@
     <string name="credentials_unlock_hint" msgid="2301301378040499348">"Digita la password per l\'archivio credenziali."</string>
     <string name="credentials_old_password" msgid="7553393815538684028">"Password attuale:"</string>
     <string name="credentials_reset_hint" msgid="6297256880896133631">"Rimuovere tutti i contenuti?"</string>
-    <string name="credentials_password_too_short" msgid="7502749986405522663">"La password deve includere almeno 8 caratteri."</string>
     <string name="credentials_wrong_password" msgid="2541932597104054807">"Password errata."</string>
     <string name="credentials_reset_warning" msgid="5320653011511797600">"Password non corretta. Hai un\'altra possibilità prima che l\'archivio credenziali venga cancellato."</string>
     <string name="credentials_reset_warning_plural" msgid="6514085665301095279">"Password non corretta. Hai altre <xliff:g id="NUMBER">%1$d</xliff:g> possibilità prima che l\'archivio credenziali venga cancellato."</string>
     <string name="credentials_erased" msgid="2907836028586342969">"Archivio credenziali cancellato"</string>
     <string name="credentials_not_erased" msgid="7685932772284216097">"Impossibile cancellare archivio credenz."</string>
     <string name="credentials_enabled" msgid="7588607413349978930">"L\'archivio di credenziali è attivo."</string>
-    <string name="credentials_configure_lock_screen_hint" msgid="6757119179588664966">"Devi impostare un PIN o una password di blocco dello schermo per poter utilizzare l\'archivio credenziali."</string>
+    <string name="credentials_configure_lock_screen_hint" msgid="8058230497337529036">"Per poter utilizzare l\'archivio credenziali, sul tuo dispositivo deve essere impostata una schermata di blocco sicura."</string>
+    <string name="credentials_configure_lock_screen_button" msgid="253239765216055321">"IMPOSTA BLOCCO"</string>
     <string name="usage_access_title" msgid="332333405495457839">"App con accesso a dati utilizzo"</string>
     <string name="emergency_tone_title" msgid="1055954530111587114">"Tono chiamate emergenza"</string>
     <string name="emergency_tone_summary" msgid="722259232924572153">"Imposta il comportamento in caso di chiamata di emergenza"</string>
@@ -2335,8 +2348,6 @@
     <skip />
     <string name="cant_sync_dialog_title" msgid="2777238588398046285">"Impossibile sincronizzare manualmente"</string>
     <string name="cant_sync_dialog_message" msgid="1938380442159016449">"Al momento la sincronizzazione di questo elemento non è attiva. Per modificare questa impostazione, attiva temporaneamente i dati in background e la sincronizzazione automatica."</string>
-    <string name="wimax_settings" msgid="2655139497028469039">"4G"</string>
-    <string name="status_wimax_mac_address" msgid="8390791848661413416">"Indirizzo MAC 4G"</string>
     <string name="enter_password" msgid="8035706727471334122">"Per avviare Android, inserisci la password"</string>
     <string name="enter_pin" msgid="5305333588093263790">"Per avviare Android, inserisci il PIN"</string>
     <string name="enter_pattern" msgid="4187435713036808566">"Per avviare Android, traccia la tua sequenza"</string>
@@ -2350,6 +2361,7 @@
     <string name="misc_files_selected_count" msgid="4647048020823912088">"selezionati <xliff:g id="NUMBER">%1$d</xliff:g> di <xliff:g id="TOTAL">%2$d</xliff:g>"</string>
     <string name="misc_files_selected_count_bytes" msgid="2876232009069114352">"<xliff:g id="NUMBER">%1$s</xliff:g> su <xliff:g id="TOTAL">%2$s</xliff:g>"</string>
     <string name="select_all" msgid="1562774643280376715">"Seleziona tutti"</string>
+    <string name="data_plan_usage_manage_plans_button_text" msgid="8997761990902708162">"Gestisci piani"</string>
     <string name="data_usage_summary_title" msgid="3804110657238092929">"Utilizzo dati"</string>
     <string name="data_usage_app_summary_title" msgid="4147258989837459172">"Utilizzo dati dell\'app"</string>
     <string name="data_usage_accounting" msgid="7170028915873577387">"I dati dell\'operatore potrebbero differire da quelli del dispositivo."</string>
@@ -2435,6 +2447,9 @@
     <string name="data_usage_metered_mobile" msgid="5423305619126978393">"Reti mobili"</string>
     <string name="data_usage_metered_wifi" msgid="1761738002328299714">"Reti Wi‑Fi a consumo"</string>
     <string name="data_usage_metered_wifi_disabled" msgid="727808462375941567">"Per selezionare le reti a consumo, attiva il Wi‑Fi."</string>
+    <string name="data_usage_metered_auto" msgid="1262028400911918865">"Automatica"</string>
+    <string name="data_usage_metered_yes" msgid="9217539611385225894">"A consumo"</string>
+    <string name="data_usage_metered_no" msgid="4025232961929071789">"Non a consumo"</string>
     <string name="data_usage_disclaimer" msgid="6887858149980673444">"I dati dell\'operatore potrebbero differire da quelli del dispositivo."</string>
     <string name="cryptkeeper_emergency_call" msgid="198578731586097145">"Chiamata di emergenza"</string>
     <string name="cryptkeeper_return_to_call" msgid="5613717339452772491">"Torna a chiamata"</string>
@@ -2526,9 +2541,6 @@
     <string name="backup_pw_set_button_text" msgid="2387480910044648795">"Imposta password di backup"</string>
     <string name="backup_pw_cancel_button_text" msgid="8845630125391744615">"Annulla"</string>
     <string name="additional_system_update_settings_list_item_title" msgid="214987609894661992">"Aggiornamenti di sistema aggiuntivi"</string>
-    <string name="selinux_status_disabled" msgid="924551035552323327">"Disattivato"</string>
-    <string name="selinux_status_permissive" msgid="6004965534713398778">"Permissivo"</string>
-    <string name="selinux_status_enforcing" msgid="2252703756208463329">"Applicazione"</string>
     <string name="ssl_ca_cert_warning" msgid="2045866713601984673">"La rete potrebbe essere monitorata"</string>
     <string name="done_button" msgid="1991471253042622230">"Fine"</string>
     <plurals name="ssl_ca_cert_dialog_title" formatted="false" msgid="7145092748045794650">
@@ -2726,6 +2738,7 @@
       <item quantity="other">Mostra %d elementi nascosti</item>
       <item quantity="one">Mostra %d elemento nascosto</item>
     </plurals>
+    <string name="dashboard_suggestion_condition_footer_content_description" msgid="2898588191174845961">"Comprimi"</string>
     <string name="network_dashboard_title" msgid="4771589228992391573">"Rete e Internet"</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>
@@ -2811,7 +2824,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">"Toni di blocco schermo"</string>
+    <string name="screen_locking_sounds_title" msgid="1340569241625989837">"Suoni 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>
@@ -2828,8 +2841,14 @@
       <item quantity="other"><xliff:g id="ON_COUNT">%d</xliff:g> regole automatiche attivate</item>
       <item quantity="one">1 regola automatica attivata</item>
     </plurals>
-    <string name="zen_mode_settings_title" msgid="842308776768942600">"Preferenze Non disturbare"</string>
-    <string name="zen_mode_priority_settings_title" msgid="2623117023031824309">"La priorità consente solo"</string>
+    <string name="zen_mode_settings_title" msgid="1066226840983908121">"Non disturbare"</string>
+    <string name="zen_mode_behavior_settings_title" msgid="1463303933529313969">"Comportamento"</string>
+    <string name="zen_mode_behavior_allow_title" msgid="3845615648136218141">"Consenti suoni/vibrazioni per"</string>
+    <string name="zen_mode_behavior_no_sound" msgid="1219626004723208056">"Nessun suono"</string>
+    <string name="zen_mode_behavior_total_silence" msgid="6716603819806610626">"Nessun suono (silenzio totale)"</string>
+    <string name="zen_mode_behavior_no_sound_except" msgid="4968477585788243114">"Nessun suono, tranne per <xliff:g id="CATEGORIES">%1$s</xliff:g>"</string>
+    <!-- no translation found for zen_mode_behavior_alarms_only (2423480992071472963) -->
+    <skip />
     <string name="zen_mode_automation_settings_title" msgid="4228995740594063774">"Regole automatiche"</string>
     <string name="zen_mode_automation_suggestion_title" msgid="5105443455143476201">"Imposta regole Non disturbare"</string>
     <string name="zen_mode_automation_suggestion_summary" msgid="4732808039946935657">"Limita suoni e vibrazioni in determinate ore"</string>
@@ -2871,13 +2890,15 @@
     <string name="notifications_title" msgid="8086372779371204971">"Notifiche"</string>
     <string name="app_notifications_title" msgid="5810577805218003760">"Notifiche app"</string>
     <string name="notification_channel_title" msgid="2260666541030178452">"Categoria della notifica"</string>
+    <string name="notification_group_title" msgid="7180506440133859601">"Gruppo di categorie di notifica"</string>
     <string name="notification_importance_title" msgid="848692592679312666">"Importanza"</string>
-    <string name="notification_importance_unspecified" msgid="2196023702875112081">"Lascia decidere all\'app"</string>
+    <string name="notification_importance_unspecified" msgid="6622173510486113958">"Attiva audio"</string>
     <string name="notification_importance_blocked" msgid="7938180808339386300">"Non mostrare mai notifiche"</string>
     <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_silent" msgid="2667033773703765252">"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>
@@ -2920,8 +2941,13 @@
     <string name="loading_notification_apps" msgid="5031818677010335895">"Caricamento app..."</string>
     <string name="app_notifications_off_desc" msgid="4882445501376722969">"Android sta bloccando la visualizzazione sul dispositivo delle notifiche dell\'app"</string>
     <string name="channel_notifications_off_desc" msgid="5899225298718840635">"Android sta bloccando la visualizzazione sul dispositivo di questa categoria di notifiche"</string>
+    <string name="channel_group_notifications_off_desc" msgid="1620950416247316370">"Android sta bloccando la visualizzazione di questo gruppo di notifiche sul dispositivo in uso"</string>
     <string name="notification_channels" msgid="5346841743182627500">"Categorie"</string>
     <string name="notification_channels_other" msgid="5645317113885788226">"Altro"</string>
+    <plurals name="notification_group_summary" formatted="false" msgid="3420621520561455358">
+      <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> categorie</item>
+      <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> categoria</item>
+    </plurals>
     <string name="no_channels" msgid="3077375508177744586">"L\'app non ha pubblicato alcuna notifica"</string>
     <string name="app_settings_link" msgid="8894946007543660906">"Altre impostazioni nell\'app"</string>
     <string name="app_notification_listing_summary_zero" msgid="6482582965081108108">"Attivato per tutte le app"</string>
@@ -2957,7 +2983,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 altri"</string>
+    <string name="zen_mode_add_rule" msgid="7459154136384467057">"Aggiungi altre"</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>
@@ -2998,12 +3024,14 @@
     <string name="zen_mode_from_starred" msgid="2678345811950997027">"Solo da contatti Speciali"</string>
     <string name="zen_mode_from_none" msgid="8219706639954614136">"Nessuno"</string>
     <string name="zen_mode_alarms" msgid="2165302777886552926">"Sveglie"</string>
+    <!-- no translation found for zen_mode_media_system_other (8900209390529859777) -->
+    <skip />
     <string name="zen_mode_reminders" msgid="5458502056440485730">"Promemoria"</string>
     <string name="zen_mode_events" msgid="7914446030988618264">"Eventi"</string>
     <string name="zen_mode_all_callers" msgid="584186167367236922">"Tutti i chiamanti"</string>
     <string name="zen_mode_selected_callers" msgid="3127598874060615742">"Chiamate da utenti selezionati"</string>
     <string name="zen_mode_repeat_callers" msgid="5019521886428322131">"Chiamate ripetute"</string>
-    <string name="zen_mode_repeat_callers_summary" msgid="7192713032364140137">"Consenti se la stessa persona chiama una seconda volta entro <xliff:g id="MINUTES">%d</xliff:g> minuti"</string>
+    <string name="zen_mode_repeat_callers_summary" msgid="239685342222975733">"Se la stessa persona chiama una seconda volta entro <xliff:g id="MINUTES">%d</xliff:g> minuti"</string>
     <string name="zen_mode_when" msgid="2767193283311106373">"Attiva automaticam."</string>
     <string name="zen_mode_when_never" msgid="8809494351918405602">"Mai"</string>
     <string name="zen_mode_when_every_night" msgid="3122486110091921009">"Ogni notte"</string>
@@ -3032,6 +3060,7 @@
     <string name="zen_mode_screen_off_visual_interruptions" msgid="4850792880144382633">"Quando lo schermo è spento"</string>
     <string name="zen_mode_no_visual_interruptions" msgid="8742776003822778472">"Quando lo schermo è acceso o spento"</string>
     <string name="notification_app_settings_button" msgid="6685640230371477485">"Impostazioni di notifica"</string>
+    <string name="suggestion_button_text" msgid="3275010948381252006">"OK"</string>
     <string name="device_feedback" msgid="3238056036766293294">"Invia feedback sul dispositivo"</string>
     <string name="restr_pin_enter_admin_pin" msgid="1085834515677448072">"Inserisci PIN amministratore"</string>
     <string name="switch_on_text" msgid="1124106706920572386">"On"</string>
@@ -3110,7 +3139,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>
@@ -3150,7 +3179,7 @@
     <string name="default_app" msgid="6864503001385843060">"(Predefinita)"</string>
     <string name="system_app" msgid="9068313769550747372">"(Sistema)"</string>
     <string name="system_default_app" msgid="3091113402349739037">"(Predefinito)"</string>
-    <string name="apps_storage" msgid="4353308027210435513">"Quota di archiviaz. per app"</string>
+    <string name="apps_storage" msgid="4353308027210435513">"Spazio archiviazione per app"</string>
     <string name="usage_access" msgid="5479504953931038165">"Accesso ai dati di utilizzo"</string>
     <string name="permit_usage_access" msgid="4012876269445832300">"Consenti accesso ai dati di utilizzo"</string>
     <string name="app_usage_preference" msgid="7065701732733134991">"Preferenze di utilizzo delle app"</string>
@@ -3205,9 +3234,9 @@
     <string name="usb_use_power_only_desc" msgid="3461232831015575152">"Ricarica del dispositivo collegato. Funziona soltanto con dispositivi che supportano la ricarica tramite USB."</string>
     <string name="usb_use_file_transfers" msgid="7409600791007250137">"Trasferire file"</string>
     <string name="usb_use_file_transfers_desc" msgid="4235764784331804488">"Trasferisci i file su un altro dispositivo"</string>
-    <string name="usb_use_photo_transfers" msgid="7794775645350330454">"Trasferisci foto (PTP)"</string>
+    <string name="usb_use_photo_transfers" msgid="7794775645350330454">"Trasferire foto (PTP)"</string>
     <string name="usb_use_photo_transfers_desc" msgid="2963034811151325996">"Trasferisci foto o file se la modalità MTP non è supportata (PTP)"</string>
-    <string name="usb_use_MIDI" msgid="870922185938298263">"Utilizzare il dispositivo per la modalità MIDI"</string>
+    <string name="usb_use_MIDI" msgid="870922185938298263">"Usare il dispositivo come MIDI"</string>
     <string name="usb_use_MIDI_desc" msgid="8473936990076693175">"Utilizzare questo dispositivo per la modalità MIDI"</string>
     <string name="usb_use" msgid="3256040963685055320">"Utilizza USB per"</string>
     <string name="usb_pref" msgid="1400617804525116158">"USB"</string>
@@ -3216,6 +3245,7 @@
     <string name="usb_summary_file_transfers" msgid="6435943692610175111">"Trasferimento di file"</string>
     <string name="usb_summary_photo_transfers" msgid="8440204169576585250">"Trasferimento di foto (PTP)"</string>
     <string name="usb_summary_MIDI" msgid="5687906612187885908">"Utilizzo del dispositivo in modalità MIDI"</string>
+    <string name="sms_mirroring_pref" msgid="6475043279147376031">"Mirroring SMS"</string>
     <string name="background_check_pref" msgid="7550258400138010979">"Controllo background"</string>
     <string name="background_check_title" msgid="4534254315824525593">"Accesso completo in background"</string>
     <string name="assist_access_context_title" msgid="2269032346698890257">"Utilizza testo sullo schermo"</string>
@@ -3282,7 +3312,7 @@
     <string name="write_settings_title" msgid="4232152481902542284">"Possono modificare le impostazioni di sistema"</string>
     <string name="write_system_settings" msgid="3482913590601096763">"Modifica impostazioni sistema"</string>
     <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="permit_write_settings" msgid="658555006453212691">"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>
@@ -3377,9 +3407,12 @@
     <string name="color_temperature" msgid="2070126836910615605">"Temperatura di colore fredda"</string>
     <string name="color_temperature_desc" msgid="4793729830226404052">"Utilizza colori del display più freddi"</string>
     <string name="color_temperature_toast" msgid="4974218172133854827">"Per applicare la modifica ai colori, disattiva lo schermo"</string>
-    <string name="telephony_monitor_toast" msgid="7003764250271195384">"Per applicare la modifica a TelephonyMonitor, riavvia il dispositivo"</string>
+    <string name="connectivity_monitor_switch" msgid="9059759348648583421">"ConnectivityMonitor"</string>
+    <string name="connectivity_monitor_switch_summary" msgid="2828658652378866401">"ConnectivityMonitor raccoglierà log quando rileverà un problema di connettività e invierà una notifica all\'utente per segnalare il bug"</string>
+    <string name="connectivity_monitor_toast" msgid="5551859612881173028">"Riavvia il dispositivo per applicare la modifica a ConnectivityMonitor"</string>
     <string name="camera_hal_hdrplus_switch" msgid="8377365197105267466">"Fotocamera HAL HDR+"</string>
     <string name="camera_hal_hdrplus_toast" msgid="2063703797270055299">"Per applicare la modifica relativa alla Fotocamera HAL HDR+, riavvia il dispositivo"</string>
+    <string name="camera_laser_sensor_switch" msgid="8913588990743234440">"Sensore laser della fotocamera"</string>
     <string name="ota_disable_automatic_update" msgid="2319639631655915050">"Aggiornamenti di sistema automatici"</string>
     <string name="usage" msgid="2977875522080448986">"Utilizzo"</string>
     <string name="cellular_data_usage" msgid="2155683719898158203">"Utilizzo dati mobili"</string>
@@ -3405,7 +3438,7 @@
     <string name="data_warning" msgid="209133958008062117">"Avviso sui dati"</string>
     <string name="set_data_limit" msgid="2901526323210516923">"Imposta limite dati"</string>
     <string name="data_limit" msgid="1885406964934590552">"Limite dati"</string>
-    <string name="data_usage_template" msgid="392191945602400904">"<xliff:g id="ID_1">%1$s</xliff:g> nel periodo <xliff:g id="ID_2">%2$s</xliff:g>"</string>
+    <string name="data_usage_template" msgid="2923744765873163859">"<xliff:g id="ID_1">%1$s</xliff:g> utilizzati nell\'intervallo <xliff:g id="ID_2">%2$s</xliff:g>"</string>
     <string name="configure" msgid="1029654422228677273">"Configura"</string>
     <string name="data_usage_other_apps" msgid="3272872663517382050">"Altre app incluse nell\'utilizzo"</string>
     <plurals name="data_saver_unrestricted_summary" formatted="false" msgid="2635267833484232703">
@@ -3474,7 +3507,7 @@
     <string name="button_confirm_convert_fbe" msgid="7101855374850373091">"Cancella e converti"</string>
     <string name="reset_shortcut_manager_throttling" msgid="6495066467198668994">"Reimposta il limite di frequenza in ShortcutManager"</string>
     <string name="reset_shortcut_manager_throttling_complete" msgid="1826770872063707900">"Il limite di frequenza di ShortcutManager è stato reimpostato"</string>
-    <string name="notification_suggestion_title" msgid="4506524937307816475">"Controlla notifiche in schermata blocco"</string>
+    <string name="notification_suggestion_title" msgid="387052719462473500">"Gestisci le informazioni nella schermata di blocco"</string>
     <string name="notification_suggestion_summary" msgid="8521159741445416875">"Mostra o nascondi i contenuti delle notifiche"</string>
     <string name="page_tab_title_summary" msgid="4070309266374993258">"Tutte"</string>
     <string name="page_tab_title_support" msgid="8483187649355540109">"Assistenza e suggerimenti"</string>
@@ -3482,7 +3515,7 @@
     <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>
     <string name="premium_sms_access" msgid="4660047004791638305">"Accesso a SMS premium"</string>
-    <string name="bluetooth_disabled" msgid="2456198532288640046">"Non visibile agli altri dispositivi"</string>
+    <string name="bluetooth_disabled" msgid="6244000672828617410">"Disattivato"</string>
     <string name="bluetooth_connected_summary" msgid="7672528674593152862">"Connesso a <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="bluetooth_connected_multiple_devices_summary" msgid="9173661896296663932">"Connesso a più dispositivi"</string>
     <string name="demo_mode" msgid="2798762752209330277">"Modalità demo dell\'interfaccia utente di sistema"</string>
@@ -3575,7 +3608,7 @@
     <string name="fingerprint_swipe_for_notifications_suggestion_title" msgid="1677291167470357802">"Visualizza rapidamente le notifiche"</string>
     <string name="fingerprint_swipe_for_notifications_suggestion_summary" msgid="127592803294414082">"Scorri verso il basso sul sensore di impronte digitali"</string>
     <string name="gesture_setting_on" msgid="3455094265233870280">"On"</string>
-    <string name="gesture_setting_off" msgid="5230169535435881894">"Disattivato"</string>
+    <string name="gesture_setting_off" msgid="5230169535435881894">"Off"</string>
     <string name="oem_unlock_enable_disabled_summary_bootloader_unlocked" msgid="4265541229765635629">"Il bootloader è già sbloccato"</string>
     <string name="oem_unlock_enable_disabled_summary_connectivity" msgid="415954951226204461">"Devi prima connetterti a Internet"</string>
     <string name="oem_unlock_enable_disabled_summary_connectivity_or_locked" msgid="5884723935668892613">"Connettiti a Internet o contatta il tuo operatore"</string>
@@ -3584,7 +3617,7 @@
     <string name="web_action_enable_title" msgid="4051513950976670853">"App istantanee"</string>
     <string name="web_action_enable_summary" msgid="3108127559723396382">"Apri i link nelle app, anche se non sono installate"</string>
     <string name="web_action_section_title" msgid="7364647086538399136">"App istantanee"</string>
-    <string name="instant_apps_account" msgid="1433620209791992528">"Account per le app istantanee"</string>
+    <string name="instant_apps_settings" msgid="8827777916518348213">"Preferenze per le app istantanee"</string>
     <string name="domain_url_section_title" msgid="7046835219056428883">"App installate"</string>
     <string name="automatic_storage_manager_activation_warning" msgid="6353100011690933254">"Il tuo spazio di archiviazione è ora gestito dalla Gestione memoria"</string>
     <string name="account_for_section_header" msgid="5356566418548737121">"Account di <xliff:g id="USER_NAME">%1$s</xliff:g>"</string>
@@ -3631,7 +3664,9 @@
     <string name="enterprise_privacy_always_on_vpn_personal" msgid="9217774730260037434">"Opzione VPN sempre attiva attivata nel tuo profilo personale"</string>
     <string name="enterprise_privacy_always_on_vpn_work" msgid="7244472958208315814">"Opzione VPN sempre attiva attivata nel tuo profilo di lavoro"</string>
     <string name="enterprise_privacy_global_http_proxy" msgid="7936664553416257333">"Proxy HTTP globale impostato"</string>
-    <string name="enterprise_privacy_ca_certs" msgid="5885892204903688909">"Credenziali attendibili"</string>
+    <string name="enterprise_privacy_ca_certs_device" msgid="2019652712782510262">"Credenziali attendibili"</string>
+    <string name="enterprise_privacy_ca_certs_personal" msgid="2279084820904076599">"Credenziali attendibili nel profilo personale"</string>
+    <string name="enterprise_privacy_ca_certs_work" msgid="6187377647815301809">"Credenziali attendibili nel profilo di lavoro"</string>
     <plurals name="enterprise_privacy_number_ca_certs" formatted="false" msgid="526375234629534165">
       <item quantity="other">Minimo <xliff:g id="COUNT_1">%d</xliff:g> certificati CA</item>
       <item quantity="one">Minimo <xliff:g id="COUNT_0">%d</xliff:g> certificato CA</item>
@@ -3680,7 +3715,7 @@
     <string name="app_info_storage_title" msgid="5554719444625611987">"Spazio occupato"</string>
     <string name="webview_uninstalled_for_user" msgid="1819903169194420983">"(disinstallato per l\'utente <xliff:g id="USER">%s</xliff:g>)"</string>
     <string name="webview_disabled_for_user" msgid="1216426047631256825">"(disattivato per l\'utente <xliff:g id="USER">%s</xliff:g>)"</string>
-    <string name="autofill_app" msgid="7338387238377914374">"Servizio di compilazione automatica"</string>
+    <string name="autofill_app" msgid="7338387238377914374">"Compilazione automatica"</string>
     <string name="autofill_keywords" msgid="7485591824120812710">"automatico, compilazione, compilazione automatica"</string>
     <string name="autofill_confirmation_message" msgid="2784869528908005194">"&lt;b&gt;Verifica che questa app sia attendibile&lt;/b&gt; &lt;br/&gt; &lt;br/&gt; &lt;xliff:g id=app_name example=La Compilazione Automatica di Google&gt;%1$s&lt;/xliff:g&gt; usa ciò che è presente nella schermata per stabilire quali contenuti possono essere compilati automaticamente."</string>
     <string name="device_theme" msgid="4571803018917608588">"Tema del dispositivo"</string>
@@ -3694,6 +3729,8 @@
     <string name="carrier_provisioning" msgid="4398683675591893169">"Informazioni sul provisioning operatore"</string>
     <string name="trigger_carrier_provisioning" msgid="3434865918009286187">"Attiva provisioning operatore"</string>
     <string name="new_device_suggestion_title" msgid="698847081680980774">"Quali entusiasmanti novità ti attendono?"</string>
-    <string name="new_device_suggestion_summary" msgid="7172709269203435870">"Scopri le 5 funzioni principali"</string>
+    <string name="new_device_suggestion_summary" product="default" msgid="206396571522515855">"Scopri il tuo nuovo telefono"</string>
+    <string name="new_device_suggestion_summary" product="tablet" msgid="393751455688210956">"Scopri il tuo nuovo tablet"</string>
+    <string name="new_device_suggestion_summary" product="device" msgid="2939870049868336652">"Scopri il tuo nuovo dispositivo"</string>
     <string name="disabled_low_ram_device" msgid="3751578499721173344">"Questa funzione non è disponibile su questo dispositivo"</string>
 </resources>
diff --git a/res/values-iw/arrays.xml b/res/values-iw/arrays.xml
index b80b91f..0589a57 100644
--- a/res/values-iw/arrays.xml
+++ b/res/values-iw/arrays.xml
@@ -100,8 +100,6 @@
     <!-- no translation found for wifi_security_no_eap:0 (2084555984818107151) -->
     <!-- no translation found for wifi_security_no_eap:1 (397579322683471524) -->
     <!-- no translation found for wifi_security_no_eap:2 (1968820975358150484) -->
-    <!-- no translation found for wifi_ap_security:0 (5251664683198623324) -->
-    <!-- no translation found for wifi_ap_security:1 (7989073072260294673) -->
   <string-array name="wifi_eap_method">
     <item msgid="1160193392455075561">"PEAP"</item>
     <item msgid="7981731051382306293">"TLS"</item>
diff --git a/res/values-iw/strings.xml b/res/values-iw/strings.xml
index a7a3c69..8e91b11 100644
--- a/res/values-iw/strings.xml
+++ b/res/values-iw/strings.xml
@@ -108,8 +108,8 @@
     <string name="bluetooth_profile_details" msgid="6823621790324933337">"הגדרות פרופיל"</string>
     <string name="bluetooth_name_not_set" msgid="2653752006416027426">"לא הוגדר שם, משתמש בשם החשבון"</string>
     <string name="bluetooth_scan_for_devices" msgid="9214184305566815727">"סרוק אחר מכשירים"</string>
-    <string name="bluetooth_rename_device" msgid="4352483834491958740">"שנה את שם המכשיר"</string>
-    <string name="bluetooth_rename_button" msgid="1648028693822994566">"שנה שם"</string>
+    <string name="bluetooth_rename_device" msgid="4352483834491958740">"שינוי שם המכשיר"</string>
+    <string name="bluetooth_rename_button" msgid="1648028693822994566">"שינוי שם"</string>
     <string name="bluetooth_disconnect_title" msgid="7830252930348734303">"לנתק את המכשיר?"</string>
     <string name="bluetooth_disconnect_all_profiles" product="default" msgid="8208712728668714199">"הטלפון שלך יתנתק מהמכשיר <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
     <string name="bluetooth_disconnect_all_profiles" product="tablet" msgid="6611038575213485336">"הטאבלט שלך יתנתק מהמכשיר <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
@@ -168,7 +168,7 @@
     <string name="bluetooth_map_acceptance_dialog_text" msgid="8712508202081143737">"‏%1$s רוצה לגשת להודעות שלך. להעניק גישה ל-%2$s?"</string>
     <string name="bluetooth_sap_request" msgid="2669762224045354417">"‏בקשת גישה אל כרטיס SIM"</string>
     <string name="bluetooth_sap_acceptance_dialog_text" msgid="4414253873553608690">"‏<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g> רוצה לגשת אל כרטיס ה-SIM. הענקת גישה אל כרטיס ה-SIM תשבית את קישוריות הנתונים במכשיר לכל משך החיבור. הענק גישה ל-<xliff:g id="DEVICE_NAME_1">%2$s?</xliff:g>"</string>
-    <string name="bluetooth_device_name_summary" msgid="4757990010751789977">"גלוי למכשירים אחרים. מופיע בשם \'<xliff:g id="DEVICE_NAME">^1</xliff:g>\'"</string>
+    <string name="bluetooth_device_name_summary" msgid="522235742194965734">"משתמשים אחרים יכולים לראות את המכשיר שלך בתור \'<xliff:g id="DEVICE_NAME">^1</xliff:g>\'"</string>
     <string name="bluetooth_paired_device_title" msgid="8638994696317952019">"המכשירים שלך"</string>
     <string name="bluetooth_pairing_page_title" msgid="7712127387361962608">"התאמה של מכשיר חדש"</string>
     <string name="date_and_time" msgid="9062980487860757694">"תאריך ושעה"</string>
@@ -181,7 +181,7 @@
     <string name="intent_sender_resource_label" msgid="6963659726895482829">"<xliff:g id="RESOURCE">Resource</xliff:g>:"</string>
     <string name="intent_sender_account_label" msgid="465210404475603404">"חשבון:"</string>
     <string name="proxy_settings_title" msgid="9049437837600320881">"‏שרת Proxy"</string>
-    <string name="proxy_clear_text" msgid="5555400754952012657">"נקה"</string>
+    <string name="proxy_clear_text" msgid="5555400754952012657">"ניקוי"</string>
     <string name="proxy_port_label" msgid="5655276502233453400">"‏יציאת שרת Proxy"</string>
     <string name="proxy_exclusionlist_label" msgid="7700491504623418701">"‏עקוף שרת Proxy עבור"</string>
     <string name="proxy_defaultView_text" msgid="6387985519141433291">"שחזר ברירות מחדל"</string>
@@ -254,7 +254,7 @@
     <string name="language_picker_title" msgid="3596315202551687690">"שפות"</string>
     <string name="pref_title_lang_selection" msgid="2014920136978776034">"העדפות שפה"</string>
     <string name="locale_remove_menu" msgid="7651301406723638854">"הסר"</string>
-    <string name="add_a_language" msgid="2330538812283783022">"הוסף שפה"</string>
+    <string name="add_a_language" msgid="2330538812283783022">"הוספת שפה"</string>
     <plurals name="dlg_remove_locales_title" formatted="false" msgid="4276642359346122396">
       <item quantity="two">האם להסיר את השפות שנבחרו?</item>
       <item quantity="many">האם להסיר את השפות שנבחרו?</item>
@@ -281,7 +281,7 @@
     <string name="cancel" msgid="6859253417269739139">"ביטול"</string>
     <string name="okay" msgid="1997666393121016642">"אישור"</string>
     <string name="forget" msgid="1400428660472591263">"שכח"</string>
-    <string name="save" msgid="879993180139353333">"שמור"</string>
+    <string name="save" msgid="879993180139353333">"שמירה"</string>
     <string name="done" msgid="6942539184162713160">"סיום"</string>
     <string name="settings_label" msgid="1626402585530130914">"הגדרות"</string>
     <string name="settings_label_launcher" msgid="8344735489639482340">"הגדרות"</string>
@@ -316,6 +316,8 @@
     <string name="zone_auto" msgid="334783869352026648">"אזור זמן אוטומטי"</string>
     <string name="zone_auto_summaryOn" msgid="6142830927278458314">"לפי אזור הזמן שמספקת הרשת"</string>
     <string name="zone_auto_summaryOff" msgid="2597745783162041390">"לפי אזור הזמן שמספקת הרשת"</string>
+    <string name="date_time_24hour_auto" msgid="2117383168985653422">"מעבר אוטומטי לפורמט 24 שעות"</string>
+    <string name="date_time_24hour_auto_summary" msgid="6351812925651480277">"השתמש בברירת המחדל למיקום שלי"</string>
     <string name="date_time_24hour_title" msgid="3203537578602803850">"פורמט 24 שעות"</string>
     <string name="date_time_24hour" msgid="1193032284921000063">"פורמט 24 שעות"</string>
     <string name="date_time_set_time_title" msgid="6296795651349047016">"שעה"</string>
@@ -360,13 +362,13 @@
     <string name="security_settings_fingerprint_preference_title" msgid="2488725232406204350">"טביעת אצבע"</string>
     <string name="fingerprint_manage_category_title" msgid="8293801041700001681">"נהל טביעות אצבע"</string>
     <string name="fingerprint_usage_category_title" msgid="8438526918999536619">"השתמש בטביעות אצבע ל-"</string>
-    <string name="fingerprint_add_title" msgid="1926752654454033904">"הוסף טביעת אצבע"</string>
+    <string name="fingerprint_add_title" msgid="1926752654454033904">"הוספת טביעת אצבע"</string>
     <string name="fingerprint_enable_keyguard_toggle_title" msgid="5078060939636911795">"נעילת מסך"</string>
     <plurals name="security_settings_fingerprint_preference_summary" formatted="false" msgid="624961700033979880">
       <item quantity="two"><xliff:g id="COUNT_1">%1$d</xliff:g> טביעות אצבע הוגדרו</item>
       <item quantity="many"><xliff:g id="COUNT_1">%1$d</xliff:g> טביעות אצבע הוגדרו</item>
       <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> טביעות אצבע הוגדרו</item>
-      <item quantity="one">טביעת אצבע <xliff:g id="COUNT_0">%1$d</xliff:g> הוגדרה</item>
+      <item quantity="one">טביעת אצבע אחת (<xliff:g id="COUNT_0">%1$d</xliff:g>) הוגדרה</item>
     </plurals>
     <string name="security_settings_fingerprint_preference_summary_none" msgid="1507739327565151923"></string>
     <string name="security_settings_fingerprint_enroll_introduction_title" msgid="3201556857492526098">"פתיחה עם טביעת אצבע"</string>
@@ -378,6 +380,9 @@
     <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="1961957425135180242">"הבא"</string>
+    <string name="setup_fingerprint_enroll_skip_title" msgid="362050541117362034">"לא להגדיר טביעת אצבע עכשיו?"</string>
+    <string name="setup_fingerprint_enroll_skip_after_adding_lock_text" msgid="958990414356204763">"ההגדרה של טביעת האצבע אורכת דקה או שתיים. אם מדלגים עליה, אפשר להוסיף את טביעת האצבע מאוחר יותר בהגדרות."</string>
+    <string name="lock_screen_intro_skip_title" msgid="4988210105913705679">"לדגל על נעילת המסך?"</string>
     <string name="lock_screen_intro_skip_dialog_text_frp" product="tablet" msgid="1581834104051243425">"תכונות ההגנה על המכשיר לא יופעלו. לא תהיה לך אפשרות למנוע מאנשים אחרים להשתמש בטאבלט אם הוא יאבד, ייגנב או יאופס."</string>
     <string name="lock_screen_intro_skip_dialog_text_frp" product="device" msgid="4629503416877189572">"תכונות ההגנה על המכשיר לא יופעלו. לא תהיה לך אפשרות למנוע מאנשים אחרים להשתמש במכשיר אם הוא יאבד, ייגנב או יאופס."</string>
     <string name="lock_screen_intro_skip_dialog_text_frp" product="default" msgid="2423428240245737909">"תכונות ההגנה על המכשיר לא יופעלו. לא תהיה לך אפשרות למנוע מאנשים אחרים להשתמש בטלפון אם הוא יאבד, ייגנב או יאופס."</string>
@@ -393,9 +398,9 @@
     <string name="security_settings_fingerprint_enroll_dialog_ok" msgid="4150384963879569750">"אישור"</string>
     <string name="security_settings_fingerprint_enroll_dialog_delete" msgid="4114615413240707936">"מחיקה"</string>
     <string name="security_settings_fingerprint_enroll_start_title" msgid="2068961812439460133">"נגיעה בחיישן"</string>
-    <string name="security_settings_fingerprint_enroll_start_message" msgid="3909929328942564524">"הנח את האצבע על החיישן והרם אותה לאחר שתרגיש רטט"</string>
+    <string name="security_settings_fingerprint_enroll_start_message" msgid="3909929328942564524">"יש להניח את האצבע על החיישן ולהרים אותה לאחר שמרגישים רטט"</string>
     <string name="security_settings_fingerprint_enroll_repeat_title" msgid="2819679722403209778">"להרים ולגעת בחיישן שוב"</string>
-    <string name="security_settings_fingerprint_enroll_repeat_message" msgid="6158989350522518586">"יש להרים את האצבע ולגעת בחיישן בחלקים שונים שלה כדי להוסיף טביעת אצבע מלאה"</string>
+    <string name="security_settings_fingerprint_enroll_repeat_message" msgid="6158989350522518586">"יש להרים את האצבע ולגעת בחיישן עם חלקים שונים של האצבע כדי להוסיף טביעת אצבע מלאה"</string>
     <string name="security_settings_fingerprint_enroll_finish_title" msgid="7567276170287972230">"טביעת האצבע שלך נקלטה"</string>
     <string name="security_settings_fingerprint_enroll_finish_message" msgid="4796715961273420536">"כשיוצג לך הסמל הזה, משמעות הדבר היא שאפשר להשתמש בטביעת אצבע לצורכי זיהוי או לאישור רכישה."</string>
     <string name="security_settings_fingerprint_enroll_enrolling_skip" msgid="3710211704052369752">"מאוחר יותר"</string>
@@ -407,12 +412,12 @@
     <string name="security_settings_fingerprint_enroll_touch_dialog_message" msgid="2989019978041986175">"יש לגעת בחיישן שבגב הטלפון באצבע המורה."</string>
     <string name="security_settings_fingerprint_enroll_error_dialog_title" msgid="3618021988442639280">"ההרשמה לא הושלמה"</string>
     <string name="security_settings_fingerprint_enroll_error_timeout_dialog_message" msgid="2942551158278899627">"חלף הזמן הקצוב להרשמה באמצעות טביעת אצבע. נסה שוב."</string>
-    <string name="security_settings_fingerprint_enroll_error_generic_dialog_message" msgid="3624760637222239293">"ההרשמה באמצעות טביעת אצבע נכשלה. נסה שוב או השתמש באצבע אחרת."</string>
+    <string name="security_settings_fingerprint_enroll_error_generic_dialog_message" msgid="3624760637222239293">"ההרשמה באמצעות טביעת אצבע נכשלה. כדאי לנסות שוב או להשתמש באצבע אחרת."</string>
     <string name="fingerprint_enroll_button_add" msgid="6317978977419045463">"עוד אחד"</string>
     <string name="fingerprint_enroll_button_next" msgid="6247009337616342759">"הבא"</string>
-    <string name="security_settings_fingerprint_enroll_disclaimer" msgid="2624905914239271751">"בנוסף לביטול הנעילה של הטלפון, תוכל להשתמש בטביעת האצבע כדי לאשר רכישות וגישה לאפליקציות. "<annotation id="url">"למידע נוסף"</annotation></string>
+    <string name="security_settings_fingerprint_enroll_disclaimer" msgid="2624905914239271751">"בנוסף לביטול הנעילה של הטלפון, אפשר להשתמש בטביעת האצבע כדי לאשר רכישות וגישה לאפליקציות. "<annotation id="url">"למידע נוסף"</annotation></string>
     <string name="security_settings_fingerprint_enroll_disclaimer_lockscreen_disabled" msgid="7846871823167357942">" אפשרות נעילת המסך מושבתת. למידע נוסף ניתן לפנות למנהל המכשיר בארגון. "<annotation id="admin_details">"למידע נוסף"</annotation>\n\n"עדיין ניתן להשתמש בטביעת האצבע שלך כדי לאשר רכישות ולגשת לאפליקציות. "<annotation id="url">"למידע נוסף"</annotation></string>
-    <string name="security_settings_fingerprint_enroll_lift_touch_again" msgid="1888772560642539718">"הרם את האצבע ואז גע שוב בחיישן"</string>
+    <string name="security_settings_fingerprint_enroll_lift_touch_again" msgid="1888772560642539718">"יש להרים את האצבע ולגעת שוב בחיישן"</string>
     <string name="fingerprint_add_max" msgid="1020927549936895822">"תוכל להוסיף עד <xliff:g id="COUNT">%d</xliff:g> טביעות אצבע"</string>
     <string name="fingerprint_intro_error_max" msgid="6864066984678078441">"הוספת את המספר המרבי של טביעות אצבע."</string>
     <string name="fingerprint_intro_error_unknown" msgid="1905692132326523040">"לא ניתן להוסיף עוד טביעות אצבע"</string>
@@ -463,7 +468,7 @@
     <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="lock_settings_picker_fingerprint_added_security_message" msgid="5768002109707648463">"לשיפור האבטחה, מומלץ להגדיר נעילת מסך נוספת לגיבוי."</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>
@@ -505,29 +510,37 @@
     <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>
-    <!-- no translation found for unlock_disable_frp_warning_content_pattern_fingerprint (2986105377420905314) -->
-    <skip />
+    <string name="unlock_disable_frp_warning_content_pattern_fingerprint" msgid="2986105377420905314">"התכונות להגנה על המכשיר לא יפעלו בלי קו ביטול הנעילה.<xliff:g id="EMPTY_LINE">
+
+</xliff:g>גם טביעות האצבע ששמרת יוסרו מהמכשיר ולא ניתן יהיה לבטל את נעילת הטלפון, לאשר רכישות או להיכנס לאפליקציות בעזרתן."</string>
     <string name="unlock_disable_frp_warning_content_pin" msgid="586996206210265131">"התכונות להגנת המכשיר לא יפעלו בלי קוד הגישה."</string>
-    <!-- no translation found for unlock_disable_frp_warning_content_pin_fingerprint (3370462835533123695) -->
-    <skip />
+    <string name="unlock_disable_frp_warning_content_pin_fingerprint" msgid="3370462835533123695">"התכונות להגנה על המכשיר לא יפעלו בלי קוד הגישה.<xliff:g id="EMPTY_LINE">
+
+</xliff:g>גם טביעות האצבע ששמרת יוסרו מהמכשיר ולא ניתן יהיה לבטל את נעילת הטלפון, לאשר רכישות או להיכנס לאפליקציות בעזרתן."</string>
     <string name="unlock_disable_frp_warning_content_password" msgid="5420612686852555537">"התכונות להגנת המכשיר לא יפעלו בלי הסיסמה."</string>
-    <!-- no translation found for unlock_disable_frp_warning_content_password_fingerprint (3595476296430536798) -->
-    <skip />
+    <string name="unlock_disable_frp_warning_content_password_fingerprint" msgid="3595476296430536798">"התכונות להגנה על המכשיר לא יפעלו בלי הסיסמה.<xliff:g id="EMPTY_LINE">
+
+</xliff:g>גם טביעות האצבע ששמרת יוסרו מהמכשיר ולא ניתן יהיה לבטל את נעילת הטלפון, לאשר רכישות או להיכנס לאפליקציות בעזרתן."</string>
     <string name="unlock_disable_frp_warning_content_unknown" msgid="1550718040483548220">"התכונות להגנת המכשיר לא יפעלו בלי נעילת המסך."</string>
-    <!-- no translation found for unlock_disable_frp_warning_content_unknown_fingerprint (3679351662094349506) -->
-    <skip />
+    <string name="unlock_disable_frp_warning_content_unknown_fingerprint" msgid="3679351662094349506">"התכונות להגנה על המכשיר לא יפעלו בלי נעילת המסך.<xliff:g id="EMPTY_LINE">
+
+</xliff:g>גם טביעות האצבע ששמרת יוסרו מהמכשיר ולא ניתן יהיה לבטל את נעילת הטלפון, לאשר רכישות או להיכנס לאפליקציות בעזרתן."</string>
     <string name="unlock_disable_frp_warning_content_pattern_profile" msgid="8682200103576359918">"התכונות של הגנת הפרופיל לא יפעלו בלי קו ביטול הנעילה."</string>
-    <!-- no translation found for unlock_disable_frp_warning_content_pattern_fingerprint_profile (6718155854303231675) -->
-    <skip />
+    <string name="unlock_disable_frp_warning_content_pattern_fingerprint_profile" msgid="6718155854303231675">"התכונות להגנה על הפרופיל לא יפעלו בלי קו ביטול הנעילה.<xliff:g id="EMPTY_LINE">
+
+</xliff:g>גם טביעות האצבע ששמרת יוסרו מהפרופיל ולא ניתן יהיה לבטל את נעילת הפרופיל, לאשר רכישות או להיכנס לאפליקציות בעזרתן."</string>
     <string name="unlock_disable_frp_warning_content_pin_profile" msgid="7790688070593867767">"התכונות של הגנת הפרופיל לא יפעלו בלי קוד הגישה שלך."</string>
-    <!-- no translation found for unlock_disable_frp_warning_content_pin_fingerprint_profile (4209564603132870532) -->
-    <skip />
+    <string name="unlock_disable_frp_warning_content_pin_fingerprint_profile" msgid="4209564603132870532">"התכונות להגנה על הפרופיל לא יפעלו בלי קוד הגישה.<xliff:g id="EMPTY_LINE">
+
+</xliff:g>גם טביעות האצבע ששמרת יוסרו מהפרופיל ולא ניתן יהיה לבטל את נעילת הפרופיל, לאשר רכישות או להיכנס לאפליקציות בעזרתן."</string>
     <string name="unlock_disable_frp_warning_content_password_profile" msgid="7569285520567674461">"התכונות של הגנת הפרופיל לא יפעלו בלי הסיסמה שלך."</string>
-    <!-- no translation found for unlock_disable_frp_warning_content_password_fingerprint_profile (2994300676764706047) -->
-    <skip />
+    <string name="unlock_disable_frp_warning_content_password_fingerprint_profile" msgid="2994300676764706047">"התכונות להגנה על הפרופיל לא יפעלו בלי הסיסמה.<xliff:g id="EMPTY_LINE">
+
+</xliff:g>גם טביעות האצבע ששמרת יוסרו מהפרופיל ולא ניתן יהיה לבטל את נעילת הפרופיל, לאשר רכישות או להיכנס לאפליקציות בעזרתן."</string>
     <string name="unlock_disable_frp_warning_content_unknown_profile" msgid="6984215718701688202">"התכונות של הגנת הפרופיל לא יפעלו בלי נעילת המסך."</string>
-    <!-- no translation found for unlock_disable_frp_warning_content_unknown_fingerprint_profile (4994062501123299418) -->
-    <skip />
+    <string name="unlock_disable_frp_warning_content_unknown_fingerprint_profile" msgid="4994062501123299418">"התכונות להגנה על הפרופיל לא יפעלו בלי נעילת המסך.<xliff:g id="EMPTY_LINE">
+
+</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>
@@ -598,6 +611,7 @@
     <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="lockpassword_clear_label" msgid="5724429464960458155">"ניקוי"</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>
@@ -682,7 +696,7 @@
     <string name="bluetooth_device_advanced_online_mode_title" msgid="3689050071425683114">"התחברות"</string>
     <string name="bluetooth_device_advanced_online_mode_summary" msgid="1204424107263248336">"‏התחבר למכשיר Bluetooth"</string>
     <string name="bluetooth_device_advanced_profile_header_title" msgid="102745381968579605">"השתמש עבור"</string>
-    <string name="bluetooth_device_advanced_rename_device" msgid="5148578059584955791">"שנה שם"</string>
+    <string name="bluetooth_device_advanced_rename_device" msgid="5148578059584955791">"שינוי שם"</string>
     <string name="bluetooth_device_advanced_enable_opp_title" msgid="8222550640371627365">"אפשר העברות קבצים נכנסות"</string>
     <string name="bluetooth_pan_user_profile_summary_connected" msgid="4602294638909590612">"מחובר למכשיר לצורך גישה לאינטרנט"</string>
     <string name="bluetooth_pan_nap_profile_summary_connected" msgid="1561383706411975199">"משתף חיבור אינטרנט מקומי עם מכשיר"</string>
@@ -740,8 +754,8 @@
     <string name="wifi_poor_network_detection" msgid="4925789238170207169">"הימנע מחיבורים באיכות ירודה"</string>
     <string name="wifi_poor_network_detection_summary" msgid="2784135142239546291">"‏אל תשתמש ברשת Wi-Fi, אלא אם יש לה חיבור אינטרנט באיכות טובה"</string>
     <string name="wifi_avoid_poor_network_detection_summary" msgid="4674423884870027498">"השתמש רק ברשתות בעלות חיבור אינטרנט איכותי"</string>
-    <string name="use_open_wifi_automatically_title" msgid="6851951242903078588">"התחבר לרשתות פתוחות"</string>
-    <string name="use_open_wifi_automatically_summary" msgid="2982091714252931713">"חיבור אוטומטית לרשתות ציבוריות באיכות גבוהה"</string>
+    <string name="use_open_wifi_automatically_title" msgid="6851951242903078588">"חיבור לרשתות פתוחות"</string>
+    <string name="use_open_wifi_automatically_summary" msgid="2982091714252931713">"חיבור אוטומטי לרשתות ציבוריות באיכות גבוהה"</string>
     <string name="use_open_wifi_automatically_summary_scoring_disabled" msgid="593964217679325831">"כדי להשתמש בתכונה, יש לבחור ספק של דירוג רשת"</string>
     <string name="use_open_wifi_automatically_summary_scorer_unsupported_disabled" msgid="8472122600853650258">"כדי להשתמש בתכונה, יש לבחור ספק תואם של דירוג רשת"</string>
     <string name="wifi_install_credentials" msgid="3551143317298272860">"התקנת אישורים"</string>
@@ -795,6 +809,7 @@
     <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>
@@ -831,6 +846,8 @@
     <string name="wifi_wps_available_first_item" msgid="4422547079984583502">"‏WPS זמין"</string>
     <string name="wifi_wps_available_second_item" msgid="8427520131718215301">" ‏ (WPS זמין)"</string>
     <string name="wifi_wps_nfc_enter_password" msgid="2288214226916117159">"הזן את סיסמת הרשת שלך"</string>
+    <string name="wifi_carrier_connect" msgid="8174696557882299911">"‏רשת Wi-Fi של ספק"</string>
+    <string name="wifi_carrier_content" msgid="4634077285415851933">"חיבור לרשת של <xliff:g id="NAME">%1%s</xliff:g>"</string>
     <string name="wifi_scan_always_turnon_message" msgid="203123538572122989">"‏לשיפור דיוק המיקום ולמטרות אחרות, <xliff:g id="APP_NAME">%1$s</xliff:g> רוצה להפעיל את סריקת הרשתות, גם כאשר ה-Wi-Fi כבוי.\n\nהאם להתיר זאת עבור כל האפליקציות שרוצות לסרוק?"</string>
     <string name="wifi_scan_always_turnoff_message" msgid="5538901671131941043">"כדי לכבות, עבור אל \'מתקדם\' באפשרויות הנוספות."</string>
     <string name="wifi_scan_always_confirm_allow" msgid="5355973075896817232">"כן, זה בסדר"</string>
@@ -848,8 +865,9 @@
     <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_modify" msgid="6100248070440710782">"שנה"</string>
     <string name="wifi_failed_forget_message" msgid="1348172929201654986">"נכשל הניסיון לשכוח את הרשת"</string>
-    <string name="wifi_save" msgid="3331121567988522826">"שמור"</string>
+    <string name="wifi_save" msgid="3331121567988522826">"שמירה"</string>
     <string name="wifi_failed_save_message" msgid="6650004874143815692">"נכשל הניסיון לשמור את הרשת"</string>
     <string name="wifi_cancel" msgid="6763568902542968964">"ביטול"</string>
     <string name="wifi_saved_access_points_titlebar" msgid="2996149477240134064">"רשתות שנשמרו"</string>
@@ -862,13 +880,14 @@
     <string name="wifi_advanced_titlebar" msgid="4485841401774142908">"‏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_title" msgid="3471132676909349382">"פרטי הרשת"</string>
     <string name="wifi_details_subnet_mask" msgid="6720279144174924410">"מסכת רשת משנה"</string>
     <string name="wifi_details_dns" msgid="8648826607751830768">"DNS"</string>
     <string name="wifi_details_ipv6_address_header" msgid="6734119149106422148">"‏כתובות IPv6"</string>
     <string name="wifi_saved_access_points_label" msgid="2013409399392285262">"רשתות שנשמרו"</string>
     <string name="wifi_advanced_settings_label" msgid="3654366894867838338">"‏הגדרות IP"</string>
     <string name="wifi_advanced_not_available" msgid="5823045095444154586">"‏הגדרות Wi-Fi מתקדמות אינן זמינות למשתמש הזה"</string>
-    <string name="wifi_ip_settings_menu_save" msgid="7296724066102908366">"שמור"</string>
+    <string name="wifi_ip_settings_menu_save" msgid="7296724066102908366">"שמירה"</string>
     <string name="wifi_ip_settings_menu_cancel" msgid="6582567330136502340">"ביטול"</string>
     <string name="wifi_ip_settings_invalid_ip_address" msgid="2513142355364274970">"‏הקלד כתובת IP חוקית."</string>
     <string name="wifi_ip_settings_invalid_gateway" msgid="8164264988361096450">"הקלד כתובת שער חוקית."</string>
@@ -883,7 +902,7 @@
     <string name="wifi_p2p_persist_network" msgid="1646424791818168590">"זכור חיבור זה"</string>
     <string name="wifi_p2p_menu_search" msgid="3436429984738771974">"חיפוש מכשירים"</string>
     <string name="wifi_p2p_menu_searching" msgid="2396704492143633876">"מחפש…"</string>
-    <string name="wifi_p2p_menu_rename" msgid="8448896306960060415">"שנה את שם המכשיר"</string>
+    <string name="wifi_p2p_menu_rename" msgid="8448896306960060415">"שינוי שם המכשיר"</string>
     <string name="wifi_p2p_peer_devices" msgid="299526878463303432">"‏מכשירי p2p"</string>
     <string name="wifi_p2p_remembered_groups" msgid="3847022927914068230">"קבוצות שמורות בזיכרון"</string>
     <string name="wifi_p2p_failed_connect_message" msgid="8491862096448192157">"לא ניתן להתחבר."</string>
@@ -894,16 +913,15 @@
     <string name="wifi_p2p_cancel_connect_title" msgid="255267538099324413">"האם לבטל את ההזמנה?"</string>
     <string name="wifi_p2p_cancel_connect_message" msgid="7477756213423749402">"האם ברצונך לבטל את ההזמנה ליצירת קשר עם <xliff:g id="PEER_NAME">%1$s</xliff:g>?"</string>
     <string name="wifi_p2p_delete_group_message" msgid="834559380069647086">"לשכוח קבוצה זו?"</string>
-    <string name="wifi_tether_checkbox_text" msgid="1847167643625779136">"‏נקודה ניידת לשיתוף אינטרנט ב-Wi-Fi"</string>
     <string name="wifi_hotspot_checkbox_text" msgid="7763495093333664887">"‏נקודת Wi‑Fi לשיתוף אינטרנט"</string>
     <string name="wifi_hotspot_off_subtext" msgid="5466126533609394170">"לא יתבצע שיתוף של חיבור לאינטרנט או של תכנים עם מכשירים אחרים"</string>
     <string name="wifi_hotspot_tethering_on_subtext" product="tablet" msgid="5752490509369962007">"המערכת משתפת את החיבור לאינטרנט של הטאבלט דרך נקודה לשיתוף אינטרנט"</string>
     <string name="wifi_hotspot_tethering_on_subtext" product="default" msgid="6461075246164300670">"המערכת משתפת את החיבור לאינטרנט של הטלפון דרך נקודה לשיתוף אינטרנט"</string>
     <string name="wifi_hotspot_on_local_only_subtext" msgid="2068110388011294735">"מתבצע שיתוף תכנים באחת האפליקציות. כדי לשתף חיבור לאינטרנט, יש להשבית את הנקודה לשיתוף אינטרנט ולהפעיל אותה מחדש"</string>
-    <string name="wifi_hotspot_name_title" msgid="1341735529132128887">"‏שם הנקודה לשיתוף Wi‑Fi"</string>
+    <string name="wifi_hotspot_name_title" msgid="8237000746618636778">"שם הנקודה לשיתוף אינטרנט"</string>
     <string name="wifi_hotspot_name_summary_connecting" msgid="3378299995508671967">"המערכת מפעילה את <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>…"</string>
     <string name="wifi_hotspot_name_summary_connected" msgid="3888672084861445362">"אפשר לחבר מכשירים נוספים לנקודה <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>"</string>
-    <string name="wifi_hotspot_password_title" msgid="1955592302902091281">"‏סיסמה לנקודה לשיתוף Wi-Fi"</string>
+    <string name="wifi_hotspot_password_title" msgid="8676859981917573801">"הסיסמה לנקודה לשיתוף אינטרנט"</string>
     <string name="wifi_hotspot_ap_band_title" msgid="1165801173359290681">"‏תדר AP"</string>
     <string name="wifi_hotspot_footer_info_regular" msgid="1203489406068036455">"‏יש לך אפשרות להשתמש בנקודה לשיתוף אינטרנט כדי ליצור רשת Wi‑Fi ולחבר אליה את המכשירים האחרים שלך. נקודות לשיתוף אינטרנט מספקות חיבור לאינטרנט דרך חבילת הגלישה שלך. ייתכן שהשימוש יהיה כרוך בתשלום נוסף על חבילת הגלישה."</string>
     <string name="wifi_hotspot_footer_info_local_only" msgid="857988412470694109">"אפשר להשתמש באפליקציות כדי ליצור נקודה לשיתוף אינטרנט ולשתף תכנים בין מכשירים שנמצאים בקרבת מקום."</string>
@@ -914,7 +932,6 @@
     <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">"‏שיחות ב-Wi-Fi"</string>
     <string name="wifi_calling_suggestion_title" msgid="9008010480466359578">"‏הפעלה של שיחות Wi-Fi"</string>
@@ -955,7 +972,7 @@
     <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="emergency_address_summary" msgid="3266760199681945746">"‏הכתובת ששירותי החירום ישתמשו בה כדי להגיע אליך, אם תתקשר למוקד החירום באמצעות רשת Wi-Fi"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"תצוגה"</string>
     <string name="sound_settings" msgid="5534671337768745343">"צלילים"</string>
     <string name="all_volume_title" msgid="4296957391257836961">"עוצמות קול"</string>
@@ -1009,6 +1026,7 @@
     <string name="search_settings" msgid="1910951467596035063">"חיפוש"</string>
     <string name="search_settings_summary" msgid="9205656546570654169">"ניהול הגדרות והיסטוריה של חיפוש"</string>
     <string name="search_settings_no_results" msgid="8799027492641230999">"אין תוצאות"</string>
+    <string name="search_clear_history" msgid="4196658962573162457">"נקה את ההיסטוריה"</string>
     <string name="display_settings" msgid="7965901687241669598">"תצוגה"</string>
     <string name="accelerometer_title" msgid="7854608399547349157">"סיבוב אוטומטי של המסך"</string>
     <string name="color_mode_title" msgid="3159275920408338215">"צבעים עזים"</string>
@@ -1055,7 +1073,7 @@
     <string name="night_display_summary_on_auto_mode_never" msgid="9117830821363119835">"ללא כיבוי אוטומטי"</string>
     <string name="night_display_summary_on_auto_mode_custom" msgid="5510753572245577263">"כיבוי אוטומטית בשעה <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="night_display_summary_on_auto_mode_twilight" msgid="852270120144683507">"כיבוי אוטומטי בזריחה"</string>
-    <string name="screen_timeout" msgid="4351334843529712571">"שינה"</string>
+    <string name="screen_timeout" 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>
@@ -1063,7 +1081,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>
@@ -1074,20 +1092,18 @@
     <string name="screensaver_settings_disabled_prompt" msgid="1239088321034437608">"כדי לשלוט במה שקורה כאשר הטלפון בעגינה ו/או במצב שינה, הפעל את שומר המסך."</string>
     <string name="screensaver_settings_when_to_dream" msgid="7262410541382890146">"מתי להפעיל"</string>
     <string name="screensaver_settings_current" msgid="4663846038247130023">"שומר המסך הנוכחי"</string>
-    <string name="screensaver_settings_dream_start" msgid="4998187847985120168">"התחל כעת"</string>
+    <string name="screensaver_settings_dream_start" msgid="4998187847985120168">"נתחיל מעכשיו"</string>
     <string name="screensaver_settings_button" msgid="7292214707625717013">"הגדרות"</string>
     <string name="automatic_brightness" msgid="5014143533884135461">"בהירות אוטומטית"</string>
     <string name="lift_to_wake_title" msgid="4555378006856277635">"הרם כדי להוציא ממצב שינה"</string>
-    <string name="ambient_display_screen_title" msgid="4252755516328775766">"תצוגה סביבתית"</string>
-    <!-- no translation found for ambient_display_screen_summary_always_on (7337555569694794132) -->
-    <skip />
+    <string name="ambient_display_screen_title" msgid="4252755516328775766">"תצוגה כשהמכשיר במצב שינה"</string>
+    <string name="ambient_display_screen_summary_always_on" msgid="7337555569694794132">"פועל תמיד / צריכה מוגברת של הסוללה"</string>
     <string name="ambient_display_screen_summary_notifications" msgid="1449570742600868654">"הודעות חדשות"</string>
     <string name="ambient_display_category_triggers" msgid="4359289754456268573">"מתי להציג"</string>
     <string name="doze_title" msgid="2375510714460456687">"הודעות חדשות"</string>
     <string name="doze_summary" msgid="3846219936142814032">"המסך יתעורר כשמתקבלות הודעות"</string>
     <string name="doze_always_on_title" msgid="1046222370442629646">"פועל תמיד"</string>
-    <!-- no translation found for doze_always_on_summary (6978257596231155345) -->
-    <skip />
+    <string name="doze_always_on_summary" msgid="6978257596231155345">"הצגה של השעה, סמלי ההודעות ופרטים אחרים. צריכה מוגברת של הסוללה."</string>
     <string name="title_font_size" msgid="4405544325522105222">"גודל גופן"</string>
     <string name="short_summary_font_size" msgid="6819778801232989076">"הגדלה או הקטנה של גודל הטקסט"</string>
     <string name="sim_lock_settings" msgid="3392331196873564292">"‏הגדרות נעילת כרטיס SIM"</string>
@@ -1142,7 +1158,6 @@
     <string name="baseband_version" msgid="1848990160763524801">"גרסת פס בסיס"</string>
     <string name="kernel_version" msgid="9192574954196167602">"גרסת ליבה"</string>
     <string name="build_number" msgid="3075795840572241758">"‏מספר Build"</string>
-    <string name="selinux_status" msgid="6212165375172061672">"‏סטטוס SELinux"</string>
     <string name="device_info_not_available" msgid="8062521887156825182">"לא זמין"</string>
     <string name="device_status_activity_title" msgid="1411201799384697904">"סטטוס"</string>
     <string name="device_status" msgid="607405385799807324">"סטטוס"</string>
@@ -1170,7 +1185,6 @@
     <string name="status_wifi_mac_address" msgid="2202206684020765378">"‏כתובת MAC של Wi-Fi"</string>
     <string name="status_bt_address" msgid="4195174192087439720">"‏כתובת Bluetooth"</string>
     <string name="status_serial_number" msgid="2257111183374628137">"מספר סידורי"</string>
-    <string name="status_unavailable" msgid="7862009036663793314">"לא זמין"</string>
     <string name="status_up_time" msgid="7294859476816760399">"זמן פעולה"</string>
     <string name="status_awake_time" msgid="2393949909051183652">"משך פעילות"</string>
     <string name="internal_memory" msgid="9129595691484260784">"אחסון פנימי"</string>
@@ -1218,7 +1232,7 @@
     <string name="sd_ejecting_summary" msgid="2028753069184908491">"ביטול טעינה מתבצע"</string>
     <string name="storage_low_title" msgid="1388569749716225155">"שטח האחסון הולך ואוזל"</string>
     <string name="storage_low_summary" msgid="7737465774892563129">"ייתכן שפונקציות מסוימות של המערכת, כמו סנכרון, לא יפעלו כראוי. נסה לפנות מקום על ידי מחיקה או ביטול הצמדה של פריטים, כגון אפליקציות או תוכן מדיה."</string>
-    <string name="storage_menu_rename" msgid="7141058657592615390">"שנה שם"</string>
+    <string name="storage_menu_rename" msgid="7141058657592615390">"שינוי שם"</string>
     <string name="storage_menu_mount" msgid="1014683672493425425">"טען"</string>
     <string name="storage_menu_unmount" msgid="681485356885955898">"הוצא"</string>
     <string name="storage_menu_format" msgid="7690626079653152152">"פרמט"</string>
@@ -1259,7 +1273,7 @@
     <string name="storage_internal_unmount_details" msgid="3582802571684490057"><b>"כשתוציא את ה-<xliff:g id="NAME_0">^1</xliff:g> הזה, האפליקציות המאוחסנות בו יפסיקו לפעול, וקובצי המדיה המאוחסנים בו לא יהיו זמינים עד שתכניס אותו שוב."</b>\n\n"ה-<xliff:g id="NAME_1">^1</xliff:g> הזה הוגדר באמצעות פרמוט לפעול במכשיר הזה בלבד. הוא לא יפעל במכשירים אחרים."</string>
     <string name="storage_internal_forget_details" msgid="9028875424669047327">"כדי להשתמש באפליקציות, בתמונות או בנתונים המאוחסנים ב-<xliff:g id="NAME">^1</xliff:g> הזה, הכנס אותו שוב. \n\nלחלופין, תוכל לבחור לשכוח את האחסון הזה אם ההתקן אינו זמין. \n\nאם תבחר לשכוח, כל הנתונים שבהתקן יאבדו לצמיתות. \n\nתוכל להתקין מחדש את האפליקציות מאוחר יותר, אך הנתונים שלהן שהיו מאוחסנים בהתקן הזה יאבדו."</string>
     <string name="storage_internal_forget_confirm_title" msgid="1370847944388479245">"האם לשכוח את <xliff:g id="NAME">^1</xliff:g>?"</string>
-    <string name="storage_internal_forget_confirm" msgid="1148446041396902905">"כל האפליקציות, התמונות והנתונים המאוחסנים ב-<xliff:g id="NAME">^1</xliff:g> הזה יימחקו לצמיתות."</string>
+    <string name="storage_internal_forget_confirm" msgid="1148446041396902905">"כל האפליקציות, התמונות והנתונים המאוחסנים ב-<xliff:g id="NAME">^1</xliff:g> הזה יימחקו לתמיד."</string>
     <string name="storage_detail_apps" msgid="6141154016753507490">"אפליקציות"</string>
     <string name="storage_detail_images" msgid="6950678857740634769">"תמונות"</string>
     <string name="storage_detail_videos" msgid="2919743464827110953">"סרטונים"</string>
@@ -1334,7 +1348,7 @@
     <string name="mvno_match_data" msgid="4560671695220540466">"‏ערך MVNO"</string>
     <string name="menu_delete" msgid="6981294422841124659">"‏מחק APN"</string>
     <string name="menu_new" msgid="3014205883303921729">"‏צור APN חדש"</string>
-    <string name="menu_save" msgid="8109345640668285399">"שמור"</string>
+    <string name="menu_save" msgid="8109345640668285399">"שמירה"</string>
     <string name="menu_cancel" msgid="2194502410474697474">"מחיקה"</string>
     <string name="error_title" msgid="7631322303341024692"></string>
     <string name="error_name_empty" msgid="5508155943840201232">"השדה \'שם\' לא יכול להיות ריק."</string>
@@ -1346,7 +1360,8 @@
     <string name="menu_restore" msgid="8260067415075573273">"אפס לברירת המחדל"</string>
     <string name="restore_default_apn_completed" msgid="2824775307377604897">"‏איפוס הגדרות ברירת המחדל של APN הושלם."</string>
     <string name="reset_dashboard_title" msgid="6254873816990678620">"אפשרויות איפוס"</string>
-    <string name="reset_network_title" msgid="6166025966016873843">"‏אפס את ה-Wi-Fi וה-Bluetooth"</string>
+    <string name="reset_dashboard_summary" msgid="4851012632493522755">"ניתן לאפס את הרשת, את האפליקציות או את המכשיר"</string>
+    <string name="reset_network_title" msgid="6166025966016873843">"‏איפוס ה-Wi-Fi וה-Bluetooth"</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>
     <string name="reset_network_final_desc" msgid="6388371121099245116">"האם לאפס את כל הגדרות הרשת? לא ניתן לבטל את הפעולה!"</string>
@@ -1354,25 +1369,20 @@
     <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="6617679904229218425">"מחק את כל הנתונים (איפוס להגדרות היצרן)"</string>
-    <plurals name="master_clear_with_account_summary" formatted="false" msgid="5911377203778818712">
-      <item quantity="two"><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>
-      <item quantity="one">חשבון אחד יאופס</item>
-    </plurals>
-    <string name="master_clear_summary" msgid="6902443944660426951">"האחסון הפנימי וכל הנתונים יאופסו"</string>
+    <string name="master_clear_title" msgid="3531267871084279512">"מחיקת כל הנתונים (איפוס להגדרות היצרן)"</string>
     <string name="master_clear_desc" product="tablet" msgid="9146059417023157222">"‏פעולה זו תמחק את כל הנתונים מ"<b>"האחסון הפנימי"</b>" של הטאבלט שלך, כולל:\n\n"<li>"חשבון Google שלך"</li>\n<li>"הנתונים וההגדרות של המערכת והאפליקציות שלך"</li>\n<li>"האפליקציות שהורדת"</li></string>
     <string name="master_clear_desc" product="default" msgid="4800386183314202571">"‏פעולה זו תמחק את כל הנתונים מ"<b>"האחסון הפנימי"</b>" של הטלפון שלך, כולל:\n\n"<li>"חשבון Google שלך"</li>\n<li>"הנתונים וההגדרות של המערכת והאפליקציות שלך"</li>\n<li>"האפליקציות שהורדת"</li></string>
-    <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"אתה מחובר כעת לחשבונות הבאים:\n"</string>
+    <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"החשבונות הבאים שלך פעילים כעת:\n"</string>
     <string name="master_clear_other_users_present" product="default" msgid="5161423070702470742">\n\n"קיימים משתמשים אחרים במכשיר זה.\n"</string>
     <string name="master_clear_desc_also_erases_external" msgid="1903185203791274237"><li>"מוסיקה"</li>\n<li>"תמונות"</li>\n<li>"נתוני משתמש אחרים"</li></string>
+    <string name="master_clear_desc_also_erases_esim" msgid="312352697653096008">"‏"<li>"הספקים ב-eSIM"</li></string>
+    <string name="master_clear_desc_no_cancel_mobile_plan" msgid="5460926449093211144">\n\n"מחיקת הנתונים לא תבטל את תוכנית השירות הסלולרי שלך."</string>
     <string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="7744115866662613411">"‏\n\nכדי למחוק פריטי מוזיקה, תמונות ונתוני משתמש אחרים, יש למחוק את "<b>"אחסון ה-USB"</b>"."</string>
     <string name="master_clear_desc_erase_external_storage" product="default" msgid="4801026652617377093">"‏\n\nכדי למחוק פריטי מוזיקה, תמונות ונתוני משתמש אחרים, יש למחוק את "<b>"כרטיס ה-SD"</b>"."</string>
     <string name="erase_external_storage" product="nosdcard" msgid="969364037450286809">"‏מחק אחסון USB"</string>
     <string name="erase_external_storage" product="default" msgid="1397239046334307625">"‏מחק כרטיס SD"</string>
-    <string name="erase_external_storage_description" product="nosdcard" msgid="4728558173931599429">"‏מחק את כל הנתונים באחסון ה-USB הפנימי, כגון פריטי מוזיקה או תמונות"</string>
-    <string name="erase_external_storage_description" product="default" msgid="1737638779582964966">"‏מחק את כל הנתונים שבכרטיס ה-SD, כגון מוזיקה או תמונות"</string>
+    <string name="erase_external_storage_description" product="nosdcard" msgid="4728558173931599429">"‏מחיקת כל הנתונים באחסון ה-USB הפנימי, כגון פריטי מוזיקה או תמונות"</string>
+    <string name="erase_external_storage_description" product="default" msgid="1737638779582964966">"‏מחיקת כל הנתונים שבכרטיס ה-SD, כגון מוזיקה או תמונות"</string>
     <string name="erase_esim_storage" msgid="1886761972867390123">"‏מחק את כרטיסי ה-eSIM"</string>
     <string name="erase_esim_storage_description" product="default" msgid="708691303677321598">"‏מחיקה של כל כרטיסי ה-eSIM בטלפון. פעולה זו לא תבטל את תוכנית השירות הסלולרי שלך."</string>
     <string name="erase_esim_storage_description" product="tablet" msgid="1780953956941209107">"‏מחיקה של כל כרטיסי ה-eSIM בטאבלט. פעולה זו לא תבטל את תוכנית השירות הסלולרי שלך."</string>
@@ -1398,8 +1408,8 @@
     <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_subtext" product="default" msgid="5991482890033484794">"‏שתף בחיבור לאינטרנט של הטלפון דרך USB"</string>
-    <string name="usb_tethering_subtext" product="tablet" msgid="5988796139573211318">"‏שתף בחיבור לאינטרנט של הטאבלט דרך USB"</string>
+    <string name="usb_tethering_subtext" product="default" msgid="5991482890033484794">"‏שיתוף בחיבור לאינטרנט של הטלפון דרך USB"</string>
+    <string name="usb_tethering_subtext" product="tablet" msgid="5988796139573211318">"‏שיתוף בחיבור לאינטרנט של הטאבלט דרך USB"</string>
     <string name="bluetooth_tether_checkbox_text" msgid="2379175828878753652">"‏שיתוף אינטרנט דרך Bluetooth"</string>
     <string name="bluetooth_tethering_subtext" product="tablet" msgid="4558227863463153412">"‏שיתוף החיבור לאינטרנט של הטאבלט דרך Bluetooth"</string>
     <string name="bluetooth_tethering_subtext" product="default" msgid="1055197887836203595">"‏שיתוף החיבור לאינטרנט של הטלפון דרך Bluetooth"</string>
@@ -1483,15 +1493,16 @@
     <string name="settings_safetylegal_activity_title" msgid="6901214628496951727">"מידע על בטיחות"</string>
     <string name="settings_safetylegal_activity_unreachable" msgid="250674109915859456">"‏אין לך חיבור נתונים. כדי להציג מידע זה כעת, עבור אל %s ממחשב כלשהו המחובר לאינטרנט."</string>
     <string name="settings_safetylegal_activity_loading" msgid="8059022597639516348">"טוען..."</string>
-    <string name="lockpassword_choose_your_password_header" msgid="8624900666929394990">"בחר סיסמה"</string>
-    <string name="lockpassword_choose_your_password_header_for_fingerprint" msgid="6624409510609085450">"כדי להשתמש בטביעת אצבע, הגדר סיסמה"</string>
-    <string name="lockpassword_choose_your_pattern_header" msgid="6949761069941694050">"הגדרת הקו לביטול נעילה"</string>
-    <string name="lockpassword_choose_your_pattern_header_for_fingerprint" msgid="5901096361617543819">"לשימוש בטביעת אצבע, הגדר קו ביטול נעילה"</string>
-    <string name="lockpassword_choose_your_pin_header" msgid="7598849519816138302">"בחר את קוד הגישה"</string>
-    <string name="lockpassword_choose_your_pin_header_for_fingerprint" msgid="765344692615917183">"כאמצעי גיבוי, הגדר קוד גישה"</string>
-    <string name="lockpassword_confirm_your_password_header" msgid="6308478184889846633">"אשר את הסיסמה"</string>
+    <string name="lockpassword_choose_your_screen_lock_header" msgid="3872462096767152394">"הגדרה של נעילת מסך"</string>
+    <string name="lockpassword_choose_your_password_message" msgid="1197569283524841412">"לשיפור האבטחה, מומלץ להגדיר סיסמה"</string>
+    <string name="lockpassword_choose_your_password_header_for_fingerprint" msgid="2541818487015343503">"לטביעת אצבע, יש להגדיר סיסמה"</string>
+    <string name="lockpassword_choose_your_pattern_header_for_fingerprint" msgid="7709785406243556723">"לטביעת אצבע, יש להגדיר קו ביטול נעילה"</string>
+    <string name="lockpassword_choose_your_pin_message" msgid="1875420718677275646">"לשיפור האבטחה, מומלץ להגדיר קוד גישה"</string>
+    <string name="lockpassword_choose_your_pin_header_for_fingerprint" msgid="1549639053195796674">"לשימוש בטביעת אצבע, יש להגדיר קוד גישה"</string>
+    <string name="lockpassword_choose_your_pattern_message" msgid="5986983400689720015">"מטעמי אבטחה, יש להגדיר קו ביטול נעילה"</string>
+    <string name="lockpassword_confirm_your_password_header" msgid="1266027268220850931">"יש להזין את הסיסמה שוב"</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="7744513791910572550">"יש להזין שוב את קוד הגישה"</string>
     <string name="lockpassword_confirm_passwords_dont_match" msgid="5140892109439191415">"הסיסמאות לא תואמות"</string>
     <string name="lockpassword_confirm_pins_dont_match" msgid="7226244811505606217">"קודי הגישה אינם תואמים"</string>
     <string name="lockpassword_choose_lock_generic_header" msgid="3811438094903786145">"בחירה בשיטת \'ביטול נעילה\'"</string>
@@ -1504,34 +1515,34 @@
     <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>
-    <!-- no translation found for lockpassword_strong_auth_required_device_pattern (530802132223800623) -->
-    <skip />
-    <!-- no translation found for lockpassword_strong_auth_required_device_pin (7829294830078036417) -->
-    <skip />
-    <!-- no translation found for lockpassword_strong_auth_required_device_password (3552644641574796973) -->
-    <skip />
-    <!-- no translation found for lockpassword_strong_auth_required_work_pattern (3003781907040522053) -->
-    <skip />
-    <!-- no translation found for lockpassword_strong_auth_required_work_pin (3367491332598821552) -->
-    <skip />
-    <!-- no translation found for lockpassword_strong_auth_required_work_password (8159775129968582940) -->
-    <skip />
+    <string name="lockpassword_strong_auth_required_device_pattern" msgid="530802132223800623">"מטעמי אבטחה, עליך להזין את קו ביטול הנעילה"</string>
+    <string name="lockpassword_strong_auth_required_device_pin" msgid="7829294830078036417">"מטעמי אבטחה, עליך להזין את קוד הגישה"</string>
+    <string name="lockpassword_strong_auth_required_device_password" msgid="3552644641574796973">"מטעמי אבטחה, עליך להזין את הסיסמה למכשיר"</string>
+    <string name="lockpassword_strong_auth_required_work_pattern" msgid="3003781907040522053">"מטעמי אבטחה, עליך להזין את קו ביטול הנעילה של פרופיל העבודה"</string>
+    <string name="lockpassword_strong_auth_required_work_pin" msgid="3367491332598821552">"מטעמי אבטחה, עליך להזין את קוד הגישה לפרופיל העבודה"</string>
+    <string name="lockpassword_strong_auth_required_work_password" msgid="8159775129968582940">"מטעמי אבטחה, עליך להזין את הסיסמה לפרופיל העבודה"</string>
+    <string name="lockpassword_confirm_your_pattern_details_frp" msgid="6757336656791723193">"הטלפון שלך עבר איפוס להגדרות היצרן. כדי להשתמש בטלפון, יש להזין את קו ביטול הנעילה הקודם."</string>
+    <string name="lockpassword_confirm_your_pin_details_frp" msgid="826520613445990470">"הטלפון שלך עבר איפוס להגדרות היצרן. כדי להשתמש בטלפון, יש להזין את קוד הגישה הקודם."</string>
+    <string name="lockpassword_confirm_your_password_details_frp" msgid="8944081074615739040">"הטלפון שלך עבר איפוס להגדרות היצרן. כדי להשתמש בטלפון, יש להזין את הסיסמה הקודמת."</string>
+    <string name="lockpassword_confirm_your_pattern_header_frp" msgid="2898036091609128286">"אימות של קו ביטול נעילה"</string>
+    <string name="lockpassword_confirm_your_pin_header_frp" msgid="4141601774778898803">"אימות של קוד הגישה"</string>
+    <string name="lockpassword_confirm_your_password_header_frp" msgid="3762615419295360480">"אימות סיסמה"</string>
     <string name="lockpassword_invalid_pin" msgid="15588049067548470">"קוד גישה שגוי"</string>
     <string name="lockpassword_invalid_password" msgid="4038507398784975200">"סיסמה שגויה"</string>
     <string name="lockpattern_need_to_unlock_wrong" msgid="1745247595356012176">"קו ביטול נעילה שגוי"</string>
     <string name="lock_settings_title" msgid="4213839087748988686">"אבטחת המכשיר"</string>
     <string name="lockpattern_change_lock_pattern_label" msgid="5679630792003440352">"שנה את קו ביטול הנעילה"</string>
     <string name="lockpattern_change_lock_pin_label" msgid="266707138486731661">"שנה קוד גישה לביטול נעילה"</string>
-    <string name="lockpattern_recording_intro_header" msgid="308287052221942814">"שרטט קו ביטול נעילה"</string>
+    <string name="lockpattern_recording_intro_header" msgid="308287052221942814">"מהו קו ביטול הנעילה שלך?"</string>
     <string name="lockpattern_recording_intro_footer" msgid="1118579101409152113">"לחץ על \'תפריט\' לקבלת עזרה."</string>
-    <string name="lockpattern_recording_inprogress" msgid="6667844062721656773">"שחרר את האצבע כאשר תסיים"</string>
+    <string name="lockpattern_recording_inprogress" msgid="6667844062721656773">"לסיום הפעולה פשוט צריך להרים את האצבע"</string>
     <string name="lockpattern_recording_incorrect_too_short" msgid="1348234155120957561">"חבר לפחות <xliff:g id="NUMBER">%d</xliff:g> נקודות. נסה שוב."</string>
     <string name="lockpattern_pattern_entered_header" msgid="4316818983675591604">"קו ביטול הנעילה נרשם"</string>
-    <string name="lockpattern_need_to_confirm" msgid="8054853451639221265">"צייר שוב קו ביטול נעילה כדי לאשר"</string>
+    <string name="lockpattern_need_to_confirm" msgid="8054853451639221265">"יש לצייר שוב את קו ביטול הנעילה כדי לאשר"</string>
     <string name="lockpattern_pattern_confirmed_header" msgid="8455614172231880211">"קו ביטול הנעילה החדש שלך"</string>
-    <string name="lockpattern_confirm_button_text" msgid="1128204343957002841">"אשר"</string>
+    <string name="lockpattern_confirm_button_text" msgid="1128204343957002841">"אישור"</string>
     <string name="lockpattern_restart_button_text" msgid="3337574403350953926">"צייר שוב"</string>
-    <string name="lockpattern_retry_button_text" msgid="3480423193273588166">"נקה"</string>
+    <string name="lockpattern_retry_button_text" msgid="3480423193273588166">"ניקוי"</string>
     <string name="lockpattern_continue_button_text" msgid="4723771754714471410">"המשך"</string>
     <string name="lockpattern_settings_title" msgid="3207750489460466680">"קו ביטול נעילה"</string>
     <string name="lockpattern_settings_enable_title" msgid="6920616873671115281">"יש צורך בקו לביטול הנעילה"</string>
@@ -1565,14 +1576,13 @@
     <string name="install_applications_title" msgid="4987712352256508946">"אפליקציות ממקורות שונים"</string>
     <string name="recent_app_category_title" msgid="6673071268966003928">"אפליקציות שפתחת לאחרונה"</string>
     <string name="see_all_apps_title" msgid="1317153498074308438">"הצגת כל <xliff:g id="COUNT">%1$d</xliff:g> האפליקציות"</string>
-    <string name="recent_app_summary" msgid="3366446669844932300">"לפני <xliff:g id="TIME">^1</xliff:g>"</string>
     <string name="install_all_warning" product="tablet" msgid="8310489909586138165">"הטאבלט והנתונים האישיים שלך פגיעים יותר להתקפות של אפליקציות לא מוכרות. על ידי התקנת אפליקציות ממקור זה, אתה מסכים לכך שאתה האחראי לכל נזק לטאבלט או לכל אובדן של נתונים שעשויים להיגרם כתוצאה מהשימוש באפליקציות אלה."</string>
     <string name="install_all_warning" product="default" msgid="1952257127370115988">"הטלפון והנתונים האישיים שלך פגיעים יותר להתקפות של אפליקציות לא מוכרות. על ידי התקנת אפליקציות ממקור זה, אתה מסכים לכך שאתה האחראי לכל נזק לטלפון או לכל אובדן של נתונים שעשויים להיגרם כתוצאה מהשימוש באפליקציות אלה."</string>
     <string name="advanced_settings" msgid="1777249286757067969">"הגדרות מתקדמות"</string>
     <string name="advanced_settings_summary" msgid="4016682978071086747">"אפשר עוד אפשרויות הגדרה."</string>
     <string name="application_info_label" msgid="5736524913065714880">"פרטי אפליקציות"</string>
     <string name="storage_label" msgid="8700867073480107253">"אחסון"</string>
-    <string name="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>
@@ -1587,17 +1597,17 @@
     </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="data_size_label" msgid="6117971066063850416">"נתוני משתמש"</string>
     <string name="external_data_size_label" product="nosdcard" msgid="7533821466482000453">"‏נתוני אחסון USB"</string>
     <string name="external_data_size_label" product="default" msgid="626414192825329708">"‏כרטיס SD"</string>
-    <string name="uninstall_text" msgid="3644892466144802466">"הסר התקנה"</string>
+    <string name="uninstall_text" msgid="3644892466144802466">"הסרת התקנה"</string>
     <string name="uninstall_all_users_text" msgid="851857393177950340">"הסר התקנה עבור כל המשתמשים"</string>
     <string name="install_text" msgid="884360662922471113">"התקן"</string>
-    <string name="disable_text" msgid="6544054052049395202">"השבת"</string>
+    <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>
@@ -1609,7 +1619,7 @@
     <string name="ask_compatibility" msgid="7225195569089607846">"שאל בעת הפעלה"</string>
     <string name="enable_compatibility" msgid="5806819252068617811">"שנה קנה מידה של אפליקציה"</string>
     <string name="unknown" msgid="1592123443519355854">"לא ידוע"</string>
-    <string name="sort_order_alpha" msgid="1410278099123670628">"מיין לפי שם"</string>
+    <string name="sort_order_alpha" msgid="1410278099123670628">"מיון לפי שם"</string>
     <string name="sort_order_size" msgid="7024513286636502362">"מיין לפי גודל"</string>
     <string name="show_running_services" msgid="5736278767975544570">"הצג שירותים פועלים"</string>
     <string name="show_background_processes" msgid="2009840211972293429">"הצג תהליכים המאוחסנים בקובץ שמור"</string>
@@ -1636,7 +1646,7 @@
     <string name="sd_card_storage" product="default" msgid="7623513618171928235">"‏אחסון בכרטיס SD"</string>
     <string name="recompute_size" msgid="7722567982831691718">"מחשב גודל מחדש..."</string>
     <string name="clear_data_dlg_title" msgid="5605258400134511197">"למחוק את נתוני האפליקציות?"</string>
-    <string name="clear_data_dlg_text" msgid="3951297329833822490">"כל נתוני האפליקציה יימחקו לצמיתות. נתונים אלה כוללים את כל הקבצים, ההגדרות, החשבונות, מסדי הנתונים וכדומה."</string>
+    <string name="clear_data_dlg_text" msgid="3951297329833822490">"כל נתוני האפליקציה יימחקו לתמיד. נתונים אלה כוללים את כל הקבצים, ההגדרות, החשבונות, מסדי הנתונים וכדומה."</string>
     <string name="dlg_ok" msgid="2402639055725653590">"אישור"</string>
     <string name="dlg_cancel" msgid="1674753358972975911">"ביטול"</string>
     <string name="app_not_found_dlg_title" msgid="3127123411738434964"></string>
@@ -1684,7 +1694,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>
@@ -1753,8 +1763,8 @@
     <string name="auto_punctuate" msgid="4595367243950425833">"פיסוק אוטומטי"</string>
     <string name="hardkeyboard_category" msgid="5957168411305769899">"הגדרות מקלדת פיזית"</string>
     <string name="auto_punctuate_summary" msgid="4372126865670574837">"לחץ על מקש הרווח פעמיים כדי להוסיף \'.\'"</string>
-    <string name="show_password" msgid="4837897357002495384">"הצג סיסמאות"</string>
-    <string name="show_password_summary" msgid="3365397574784829969">"הצג את התווים לפרקי זמן קצרים בזמן ההקלדה"</string>
+    <string name="show_password" msgid="4837897357002495384">"הצגת סיסמאות"</string>
+    <string name="show_password_summary" msgid="3365397574784829969">"התווים יופיעו לפרקי זמן קצרים בזמן ההקלדה"</string>
     <string name="spellchecker_security_warning" msgid="9060897418527708922">"ייתכן שבודק איות זה יוכל לאסוף את כל הטקסט שאתה מקליד, כולל נתונים אישיים כגון סיסמאות ומספרי כרטיס אשראי. הוא מגיע מהאפליקציה <xliff:g id="SPELLCHECKER_APPLICATION_NAME">%1$s</xliff:g>. להשתמש בבודק איות זה?"</string>
     <string name="spellchecker_quick_settings" msgid="246728645150092058">"הגדרות"</string>
     <string name="spellchecker_language" msgid="6041050114690541437">"שפה"</string>
@@ -1792,7 +1802,7 @@
     <string name="user_dict_settings_add_word_hint" msgid="5725254076556821247">"הקלד מילה"</string>
     <string name="user_dict_settings_add_shortcut_hint" msgid="7333763456561873445">"קיצור אופציונלי"</string>
     <string name="user_dict_settings_edit_dialog_title" msgid="8967476444840548674">"ערוך מילה"</string>
-    <string name="user_dict_settings_context_menu_edit_title" msgid="2210564879320004837">"ערוך"</string>
+    <string name="user_dict_settings_context_menu_edit_title" msgid="2210564879320004837">"עריכה"</string>
     <string name="user_dict_settings_context_menu_delete_title" msgid="9140703913776549054">"מחיקה"</string>
     <string name="user_dict_settings_empty_text" msgid="1971969756133074922">"אין לך מילים במילון המשתמש. כדי להוסיף מילה יש להקיש על לחצן \'הוספה\' (+)."</string>
     <string name="user_dict_settings_all_languages" msgid="6742000040975959247">"לכל השפות"</string>
@@ -1831,7 +1841,7 @@
     <string name="accessibility_settings_summary" msgid="981260486011624939">"קוראי מסך, פקדי אינטראקציה, תצוגה"</string>
     <string name="vision_settings_title" msgid="4204111425716868288">"הגדרות תצוגה"</string>
     <string name="vision_settings_description" msgid="5679491180156408260">"ניתן להתאים אישית את המכשיר הזה כדי שיתאים לצרכיך. ניתן לשנות את תכונות הנגישות מאוחר יותר ב\'הגדרות\'."</string>
-    <string name="vision_settings_suggestion_title" msgid="917294957154878441">"הגדלת גודל הגופן"</string>
+    <string name="vision_settings_suggestion_title" msgid="8058794060304707004">"שינוי גודל הגופן"</string>
     <string name="screen_reader_category_title" msgid="7739154903913400641">"קוראי מסך"</string>
     <string name="audio_and_captions_category_title" msgid="3420727114421447524">"הקראת טקסט שמופיע במסך"</string>
     <string name="display_category_title" msgid="685461049938269166">"תצוגה"</string>
@@ -1868,7 +1878,6 @@
     <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="preference_summary_default_combination" msgid="8532964268242666060">"<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>
@@ -1973,14 +1982,14 @@
     <string name="print_menu_item_add_printers" msgid="2890738028215834012">"הוסף מדפסות"</string>
     <string name="print_feature_state_on" msgid="8098901852502441048">"פועל"</string>
     <string name="print_feature_state_off" msgid="7294876968403966040">"כבוי"</string>
-    <string name="print_menu_item_add_service" msgid="3811645167869797802">"הוסף שירות"</string>
+    <string name="print_menu_item_add_service" msgid="3811645167869797802">"הוספת שירות"</string>
     <string name="print_menu_item_add_printer" msgid="8251218970577291032">"הוסף מדפסת"</string>
     <string name="print_menu_item_search" msgid="7025589328240514553">"חיפוש"</string>
     <string name="print_searching_for_printers" msgid="4680248496457576358">"מחפש מדפסות"</string>
     <string name="print_service_disabled" msgid="7739452396114245222">"השירות הושבת"</string>
     <string name="print_print_jobs" msgid="3582094777756968793">"עבודות הדפסה"</string>
     <string name="print_print_job" msgid="7563741676053287211">"עבודת הדפסה"</string>
-    <string name="print_restart" msgid="8373999687329384202">"הפעל מחדש"</string>
+    <string name="print_restart" msgid="8373999687329384202">"הפעלה מחדש"</string>
     <string name="print_cancel" msgid="3621199386568672235">"ביטול"</string>
     <string name="print_job_summary" msgid="8472427347192930694">"<xliff:g id="PRINTER">%1$s</xliff:g>\n<xliff:g id="TIME">%2$s</xliff:g>"</string>
     <string name="print_printing_state_title_template" msgid="5736107667714582025">"מדפיס את <xliff:g id="PRINT_JOB_NAME">%1$s</xliff:g>"</string>
@@ -2001,12 +2010,14 @@
     <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_whitelisted" msgid="7375400051141016808">"לא ניתן לבצע אופטימיזציה לצריכת סוללה יעילה באפליקציה הזו"</string>
+    <string name="background_activity_warning_dialog_title" msgid="2216249969149568871">"להגביל את הפעילות ברקע?"</string>
+    <string name="background_activity_warning_dialog_text" msgid="7049624449246121981">"הגבלת הפעילות של אפליקציה ברקע עלולה לשבש את פעולתה"</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" msgid="6393929085382334341">"משך השימוש באפליקציה מאז הטעינה המלאה האחרונה (<xliff:g id="RELATIVE_TIME">^1</xliff:g>)"</string>
+    <string name="power_usage_list_summary_device" msgid="4461926045610455423">"משך השימוש במכשיר מאז הטעינה המלאה האחרונה (<xliff:g id="RELATIVE_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>
@@ -2049,12 +2060,12 @@
     <string name="dialog_background_check_message" product="default" msgid="4045827746349279563">"הניהול של צריכת הסוללה בטלפון לא תקין, כי האפליקציה <xliff:g id="APP_0">%1$s</xliff:g> מוציאה את הטלפון ממצב שינה.\n\nכדי לפתור את הבעיה, אפשר לעצור את <xliff:g id="APP_1">%1$s</xliff:g> כדי למנוע ממנה לפעול ברקע."</string>
     <string name="dialog_background_check_message" product="tablet" msgid="8348214419901788270">"הניהול של צריכת הסוללה בטאבלט לא תקין, כי האפליקציה <xliff:g id="APP_0">%1$s</xliff:g> מוציאה את הטאבלט ממצב שינה.\n\nכדי לפתור את הבעיה, אפשר לעצור את <xliff:g id="APP_1">%1$s</xliff:g> כדי למנוע ממנה לפעול ברקע."</string>
     <string name="dialog_background_check_message" product="device" msgid="5847977433118915863">"הניהול של צריכת הסוללה במכשיר לא תקין, כי האפליקציה <xliff:g id="APP_0">%1$s</xliff:g> מוציאה את המכשיר ממצב שינה.\n\nכדי לפתור את הבעיה, אפשר לעצור את <xliff:g id="APP_1">%1$s</xliff:g> ולמנוע ממנה לפעול ברקע."</string>
-    <string name="dialog_background_check_ok" msgid="412876934682899659">"השבת"</string>
+    <string name="dialog_background_check_ok" msgid="412876934682899659">"השבתה"</string>
     <string name="dialog_location_title" msgid="5888917530725874727">"להשבית העברה של נתוני מיקום?"</string>
     <string name="dialog_location_message" product="default" msgid="7774807745601479888">"הניהול של צריכת הסוללה בטלפון לא תקין, כי האפליקציה <xliff:g id="APP">%1$s</xliff:g> מבקשת את נתוני המיקום שלך כשהיא לא בשימוש.\n\nכדי לפתור את הבעיה, אפשר להשבית העברה של נתוני מיקום לאפליקציה הזו."</string>
     <string name="dialog_location_message" product="tablet" msgid="118745801732181618">"הניהול של צריכת הסוללה בטאבלט לא תקין, כי האפליקציה <xliff:g id="APP">%1$s</xliff:g> מבקשת את נתוני המיקום שלך כשהיא לא בשימוש.\n\nכדי לפתור את הבעיה, אפשר להשבית העברה של נתוני מיקום לאפליקציה הזו."</string>
     <string name="dialog_location_message" product="device" msgid="6783678153382298295">"הניהול של צריכת הסוללה במכשיר לא תקין, כי האפליקציה <xliff:g id="APP">%1$s</xliff:g> מבקשת את נתוני המיקום שלך כשהיא לא בשימוש.\n\nכדי לפתור את הבעיה, אפשר להשבית העברה של נתוני מיקום לאפליקציה הזו."</string>
-    <string name="dialog_location_ok" msgid="4572391197601313986">"השבת"</string>
+    <string name="dialog_location_ok" msgid="4572391197601313986">"השבתה"</string>
     <string name="power_screen" msgid="3023346080675904613">"מסך"</string>
     <string name="power_flashlight" msgid="7794409781003567614">"פנס"</string>
     <string name="power_camera" msgid="4976286950934622605">"מצלמה"</string>
@@ -2091,7 +2102,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>
@@ -2252,14 +2263,14 @@
     <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_configure_lock_screen_hint" msgid="8058230497337529036">"כדי להשתמש באחסון פרטי כניסה, עליך להגדיר מסך נעילה מאובטח במכשיר"</string>
+    <string name="credentials_configure_lock_screen_button" msgid="253239765216055321">"הגדרת נעילה"</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>
@@ -2316,7 +2327,7 @@
     <string name="wifi_setup_detail" msgid="2336990478140503605">"פרטי רשת"</string>
     <string name="wifi_setup_connect" msgid="7954456989590237049">"התחבר"</string>
     <string name="wifi_setup_forget" msgid="2562847595567347526">"שכח"</string>
-    <string name="wifi_setup_save" msgid="3659235094218508211">"שמור"</string>
+    <string name="wifi_setup_save" msgid="3659235094218508211">"שמירה"</string>
     <string name="wifi_setup_cancel" msgid="3185216020264410239">"ביטול"</string>
     <string name="wifi_setup_status_scanning" msgid="5317003416385428036">"סורק רשתות..."</string>
     <string name="wifi_setup_status_select_network" msgid="3960480613544747397">"הקש על רשת כדי להתחבר אליה"</string>
@@ -2379,8 +2390,6 @@
     <skip />
     <string name="cant_sync_dialog_title" msgid="2777238588398046285">"לא ניתן לסנכרן באופן ידני"</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>
@@ -2394,6 +2403,7 @@
     <string name="misc_files_selected_count" msgid="4647048020823912088">"נבחרו <xliff:g id="NUMBER">%1$d</xliff:g> מתוך <xliff:g id="TOTAL">%2$d</xliff:g>"</string>
     <string name="misc_files_selected_count_bytes" msgid="2876232009069114352">"<xliff:g id="NUMBER">%1$s</xliff:g> מתוך <xliff:g id="TOTAL">%2$s</xliff:g>"</string>
     <string name="select_all" msgid="1562774643280376715">"בחר הכל"</string>
+    <string name="data_plan_usage_manage_plans_button_text" msgid="8997761990902708162">"ניהול חבילות גלישה"</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>
@@ -2453,7 +2463,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>
@@ -2479,6 +2489,9 @@
     <string name="data_usage_metered_mobile" msgid="5423305619126978393">"רשתות לנייד"</string>
     <string name="data_usage_metered_wifi" msgid="1761738002328299714">"‏רשתות Wi‑Fi לפי שימוש"</string>
     <string name="data_usage_metered_wifi_disabled" msgid="727808462375941567">"‏כדי לבחור רשתות לפי שימוש יש להפעיל את ה-Wi‑Fi."</string>
+    <string name="data_usage_metered_auto" msgid="1262028400911918865">"באופן אוטומטי"</string>
+    <string name="data_usage_metered_yes" msgid="9217539611385225894">"נמדדת"</string>
+    <string name="data_usage_metered_no" msgid="4025232961929071789">"לא נמדדת"</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>
@@ -2509,7 +2522,7 @@
     <string name="vpn_always_on_invalid_reason_other" msgid="5959352052515258208">"‏המידע שהוזן לא תומך ב VPN בחיבור תמידי"</string>
     <string name="vpn_cancel" msgid="1979937976123659332">"ביטול"</string>
     <string name="vpn_done" msgid="8678655203910995914">"סגור"</string>
-    <string name="vpn_save" msgid="4233484051644764510">"שמור"</string>
+    <string name="vpn_save" msgid="4233484051644764510">"שמירה"</string>
     <string name="vpn_connect" msgid="8469608541746132301">"התחבר"</string>
     <string name="vpn_replace" msgid="5442836256121957861">"החלף"</string>
     <string name="vpn_edit" msgid="8647191407179996943">"‏עריכת פרופיל VPN"</string>
@@ -2548,7 +2561,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>
@@ -2572,9 +2585,6 @@
     <string name="backup_pw_set_button_text" msgid="2387480910044648795">"הגדר סיסמת גיבוי"</string>
     <string name="backup_pw_cancel_button_text" msgid="8845630125391744615">"ביטול"</string>
     <string name="additional_system_update_settings_list_item_title" msgid="214987609894661992">"עדכוני מערכת נוספים"</string>
-    <string name="selinux_status_disabled" msgid="924551035552323327">"מושבת"</string>
-    <string name="selinux_status_permissive" msgid="6004965534713398778">"מתירני"</string>
-    <string name="selinux_status_enforcing" msgid="2252703756208463329">"אכיפה"</string>
     <string name="ssl_ca_cert_warning" msgid="2045866713601984673">"ייתכן שהרשת מנוטרת"</string>
     <string name="done_button" msgid="1991471253042622230">"בוצע"</string>
     <plurals name="ssl_ca_cert_dialog_title" formatted="false" msgid="7145092748045794650">
@@ -2625,9 +2635,9 @@
     <string name="user_add_user_message_long" msgid="8562152293752222985">"‏תוכל לשתף מכשיר זה עם אנשים אחרים על ידי יצירת משתמשים נוספים. לכל משתמש יש שטח משלו, שהוא יכול להתאים אישית בעזרת אפליקציות, טפט ופריטים נוספים משלו. המשתמשים יכולים גם להתאים הגדרות של המכשיר כגון Wi‑Fi, שיכולות להשפיע על כל אחד.\n\nבעת הוספת משתמש חדש, על משתמש זה להגדיר את השטח שלו.\n\nכל משתמש יכול לעדכן אפליקציות עבור כל המשתמשים האחרים."</string>
     <string name="user_add_user_message_short" msgid="1511354412249044381">"בעת הוספת משתמש חדש, על משתמש זה להגדיר את השטח שלו.\n\nכל משתמש יכול לעדכן אפליקציות עבור כל המשתמשים האחרים."</string>
     <string name="user_setup_dialog_title" msgid="1765794166801864563">"האם להגדיר משתמש עכשיו?"</string>
-    <string name="user_setup_dialog_message" msgid="1004068621380867148">"ודא שהמשתמש זמין לקחת את המכשיר ולהגדיר את המרחב שלו"</string>
+    <string name="user_setup_dialog_message" msgid="1004068621380867148">"כדאי לוודא שהמשתמש זמין ויכול לקחת את המכשיר ולהגדיר את המרחב שלו"</string>
     <string name="user_setup_profile_dialog_message" msgid="3896568553327558731">"האם להגדיר פרופיל עכשיו?"</string>
-    <string name="user_setup_button_setup_now" msgid="3391388430158437629">"הגדר עכשיו"</string>
+    <string name="user_setup_button_setup_now" msgid="3391388430158437629">"הגדרה"</string>
     <string name="user_setup_button_setup_later" msgid="3068729597269172401">"לא עכשיו"</string>
     <string name="user_cannot_manage_message" product="tablet" msgid="7153048188252553320">"רק הבעלים של הטאבלט יכול לנהל משתמשים."</string>
     <string name="user_cannot_manage_message" product="default" msgid="959315813089950649">"רק הבעלים של הטלפון יכול לנהל משתמשים."</string>
@@ -2695,10 +2705,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>
@@ -2706,7 +2716,7 @@
     <string name="call_manager_title" msgid="4479949569744516457">"Call Manager"</string>
     <!-- no translation found for call_manager_summary (5918261959486952674) -->
     <skip />
-    <string name="cell_broadcast_settings" msgid="4124461751977706019">"התראות חירום"</string>
+    <string name="cell_broadcast_settings" msgid="4124461751977706019">"התרעות חירום"</string>
     <string name="network_operators_settings" msgid="2583178259504630435">"ספקי רשתות"</string>
     <string name="access_point_names" msgid="1381602020438634481">"‏שמות של נקודות גישה (APN)"</string>
     <string name="enhanced_4g_lte_mode_title" msgid="5808043757309522392">"‏מצב 4G LTE משופר"</string>
@@ -2715,7 +2725,7 @@
     <string name="preferred_network_type_summary" msgid="6564884693884755019">"‏LTE (מומלץ)"</string>
     <string name="work_sim_title" msgid="4843322164662606891">"‏SIM עבודה"</string>
     <string name="user_restrictions_title" msgid="5794473784343434273">"גישה לאפליקציות ולתוכן"</string>
-    <string name="user_rename" msgid="8523499513614655279">"שנה שם"</string>
+    <string name="user_rename" msgid="8523499513614655279">"שינוי שם"</string>
     <string name="app_restrictions_custom_label" msgid="6160672982086584261">"הגדר הגבלות אפליקציה"</string>
     <string name="user_restrictions_controlled_by" msgid="3164078767438313899">"בשליטת <xliff:g id="APP">%1$s</xliff:g>"</string>
     <string name="app_sees_restricted_accounts" msgid="7503264525057246240">"האפליקציה הזו יכולה לגשת לחשבונות שלך"</string>
@@ -2735,7 +2745,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>
@@ -2782,6 +2792,7 @@
       <item quantity="other">‏הצג %d פריטים מוסתרים</item>
       <item quantity="one">‏הצג פריט %d מוסתר</item>
     </plurals>
+    <string name="dashboard_suggestion_condition_footer_content_description" msgid="2898588191174845961">"כיווץ"</string>
     <string name="network_dashboard_title" msgid="4771589228992391573">"רשת ואינטרנט"</string>
     <string name="network_dashboard_summary_mobile" msgid="3851083934739500429">"סלולרית"</string>
     <string name="network_dashboard_summary_data_usage" msgid="3843261364705042212">"שימוש בנתונים"</string>
@@ -2841,8 +2852,7 @@
     <string name="keywords_gesture" msgid="3526905012224714078">"תנועות"</string>
     <string name="keywords_payment_settings" msgid="5220104934130446416">"שלם, הקש, תשלומים"</string>
     <string name="keywords_backup" msgid="470070289135403022">"‏גיבוי, לגבות, backup, back up"</string>
-    <!-- no translation found for keywords_assist_gesture_launch (813968759791342591) -->
-    <skip />
+    <string name="keywords_assist_gesture_launch" msgid="813968759791342591">"תנועה"</string>
     <string name="setup_wifi_nfc_tag" msgid="9028353016222911016">"‏הגדר תג NFC של Wi-Fi"</string>
     <string name="write_tag" msgid="8571858602896222537">"כתוב"</string>
     <string name="status_awaiting_tap" msgid="2130145523773160617">"הקש על תג כדי לכתוב..."</string>
@@ -2887,8 +2897,14 @@
       <item quantity="other"><xliff:g id="ON_COUNT">%d</xliff:g> כללים אוטומטיים מופעלים</item>
       <item quantity="one">כלל אוטומטי אחד מופעל</item>
     </plurals>
-    <string name="zen_mode_settings_title" msgid="842308776768942600">"העדפות של מצב \'נא לא להפריע\'"</string>
-    <string name="zen_mode_priority_settings_title" msgid="2623117023031824309">"רק התראות בעדיפות"</string>
+    <string name="zen_mode_settings_title" msgid="1066226840983908121">"נא לא להפריע"</string>
+    <string name="zen_mode_behavior_settings_title" msgid="1463303933529313969">"התנהגות"</string>
+    <string name="zen_mode_behavior_allow_title" msgid="3845615648136218141">"אפשר להשמיע צלילים ורטט מ-"</string>
+    <string name="zen_mode_behavior_no_sound" msgid="1219626004723208056">"ללא צלילים"</string>
+    <string name="zen_mode_behavior_total_silence" msgid="6716603819806610626">"ללא צלילים (שקט מוחלט)"</string>
+    <string name="zen_mode_behavior_no_sound_except" msgid="4968477585788243114">"ללא צלילים, למעט <xliff:g id="CATEGORIES">%1$s</xliff:g>"</string>
+    <!-- no translation found for zen_mode_behavior_alarms_only (2423480992071472963) -->
+    <skip />
     <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>
@@ -2930,18 +2946,20 @@
     <string name="notifications_title" msgid="8086372779371204971">"הודעות"</string>
     <string name="app_notifications_title" msgid="5810577805218003760">"הודעות אפליקציה"</string>
     <string name="notification_channel_title" msgid="2260666541030178452">"קטגוריית הודעות"</string>
+    <string name="notification_group_title" msgid="7180506440133859601">"קבוצת קטגוריות של הודעות"</string>
     <string name="notification_importance_title" msgid="848692592679312666">"חשיבות"</string>
-    <string name="notification_importance_unspecified" msgid="2196023702875112081">"תן לאפליקציה להחליט"</string>
+    <string name="notification_importance_unspecified" msgid="6622173510486113958">"הפעלת צליל"</string>
     <string name="notification_importance_blocked" msgid="7938180808339386300">"לעולם אל תציג הודעות"</string>
     <string name="notification_importance_min" msgid="5455049524984686275">"ללא צליל וללא הפרעה ויזואלית"</string>
     <string name="notification_importance_low" msgid="8881468429453766553">"ללא צליל"</string>
     <string name="notification_importance_default" msgid="5958338024601957516">"השמע צליל"</string>
     <string name="notification_importance_high" msgid="2082429479238228527">"השמע צליל והצג במסך"</string>
+    <string name="notification_importance_high_silent" msgid="2667033773703765252">"הצג במסך"</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_interruption" msgid="7136150018111848721">"הפרעות מותרות"</string>
+    <string name="allow_interruption" msgid="7136150018111848721">"סוגי הפרעות שאפשר להפעיל"</string>
     <string name="allow_interruption_summary" msgid="7870159391333957050">"האפליקציה יכולה להפעיל צלילים ורטט ו/או להציג הודעות קופצות במסך"</string>
     <string name="notification_channel_summary_min" msgid="5401718014765921892">"חשיבות נמוכה"</string>
     <string name="notification_channel_summary_low" msgid="322317684244981244">"חשיבות בינונית"</string>
@@ -2975,15 +2993,21 @@
     <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>
-    <!-- no translation found for picture_in_picture_app_detail_summary (1264019085827708920) -->
-    <skip />
+    <string name="picture_in_picture_app_detail_summary" msgid="1264019085827708920">"אפליקציה זו תוכל ליצור חלון מסוג תמונה-בתוך-תמונה בזמן שהיא תהיה פתוחה או לאחר היציאה ממנה (למשל, כדי להמשיך לצפות בסרטון). חלון זה מוצג מעל אפליקציות אחרות שנמצאות בשימוש."</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="channel_group_notifications_off_desc" msgid="1620950416247316370">"‏מערכת Android לא מאפשרת להודעות מהקבוצה הזאת להופיע במכשיר הזה"</string>
     <string name="notification_channels" msgid="5346841743182627500">"קטגוריות"</string>
     <string name="notification_channels_other" msgid="5645317113885788226">"אחר"</string>
+    <plurals name="notification_group_summary" formatted="false" msgid="3420621520561455358">
+      <item quantity="two"><xliff:g id="COUNT_1">%d</xliff:g> קטגוריות</item>
+      <item quantity="many"><xliff:g id="COUNT_1">%d</xliff:g> קטגוריות</item>
+      <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> קטגוריות</item>
+      <item quantity="one">קטגוריה אחת (<xliff:g id="COUNT_0">%d</xliff:g>)</item>
+    </plurals>
     <string name="no_channels" msgid="3077375508177744586">"האפליקציה הזו לא שלחה התראות"</string>
     <string name="app_settings_link" msgid="8894946007543660906">"הגדרות נוספות באפליקציה"</string>
     <string name="app_notification_listing_summary_zero" msgid="6482582965081108108">"מופעל עבור כל האפליקציות"</string>
@@ -3008,7 +3032,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>
@@ -3019,9 +3043,9 @@
     <string name="notification_vibrate_title" msgid="1646667807969755957">"רטט"</string>
     <string name="notification_channel_sound_title" msgid="3899212238513507941">"צליל"</string>
     <string name="zen_mode_rule_delete_button" msgid="903658142711011617">"מחיקה"</string>
-    <string name="zen_mode_rule_rename_button" msgid="4642843370946599164">"שנה שם"</string>
+    <string name="zen_mode_rule_rename_button" msgid="4642843370946599164">"שינוי שם"</string>
     <string name="zen_mode_rule_name" msgid="5149068059383837549">"שם הכלל"</string>
-    <string name="zen_mode_rule_name_hint" msgid="3781174510556433384">"תן שם לכלל"</string>
+    <string name="zen_mode_rule_name_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>
@@ -3051,7 +3075,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>
@@ -3062,14 +3086,16 @@
     <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>
+    <!-- no translation found for zen_mode_media_system_other (8900209390529859777) -->
+    <skip />
     <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="239685342222975733">"אם מגיעה שיחה ממישהו בפעם השנייה תוך <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>
@@ -3092,17 +3118,18 @@
     </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="device_feedback" msgid="3238056036766293294">"שלח משוב על המכשיר הזה"</string>
+    <string name="suggestion_button_text" msgid="3275010948381252006">"אישור"</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>
@@ -3135,7 +3162,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>
@@ -3291,13 +3318,14 @@
     <string name="usb_use_photo_transfers_desc" msgid="2963034811151325996">"‏העברת תמונות או קבצים אם MTP אינו נתמך (PTP)"</string>
     <string name="usb_use_MIDI" msgid="870922185938298263">"‏להשתמש במכשיר כהתקן MIDI"</string>
     <string name="usb_use_MIDI_desc" msgid="8473936990076693175">"‏שימוש במכשיר זה כהתקן MIDI"</string>
-    <string name="usb_use" msgid="3256040963685055320">"‏השתמש ב-USB כדי"</string>
+    <string name="usb_use" msgid="3256040963685055320">"‏שימוש ב-USB כדי"</string>
     <string name="usb_pref" msgid="1400617804525116158">"USB"</string>
     <string name="usb_summary_charging_only" msgid="7544327009143659751">"הטענת המכשיר"</string>
     <string name="usb_summary_power_only" msgid="3629517713817003738">"אספקת מתח"</string>
     <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="sms_mirroring_pref" msgid="6475043279147376031">"‏שיקוף SMS"</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>
@@ -3366,7 +3394,7 @@
     <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="permit_write_settings" msgid="658555006453212691">"הרשאה לשנות את הגדרות המערכת"</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>
@@ -3467,9 +3495,12 @@
     <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">"‏כדי להחיל את השינוי ב-Telephony Monitor, הפעל מחדש את המכשיר"</string>
+    <string name="connectivity_monitor_switch" msgid="9059759348648583421">"Connectivity Monitor"</string>
+    <string name="connectivity_monitor_switch_summary" msgid="2828658652378866401">"‏ConnectivityMonitor יאסוף מידע ביומנים כשיזהה בעית קישוריות וישלח הודעה למשתמש כדי שיוכל להגיש דוח על באג"</string>
+    <string name="connectivity_monitor_toast" msgid="5551859612881173028">"‏כדי להחיל את השינוי ב-Connectivity Monitor, יש להפעיל מחדש את המכשיר"</string>
     <string name="camera_hal_hdrplus_switch" msgid="8377365197105267466">"‏צילום באיכות +HDR עם HAL"</string>
     <string name="camera_hal_hdrplus_toast" msgid="2063703797270055299">"‏כדי להפעיל צילום באיכות +HDR עם HAL, עליך להפעיל את המכשיר מחדש"</string>
+    <string name="camera_laser_sensor_switch" msgid="8913588990743234440">"חיישן הלייזר של המצלמה"</string>
     <string name="ota_disable_automatic_update" msgid="2319639631655915050">"עדכוני מערכת אוטומטיים"</string>
     <string name="usage" msgid="2977875522080448986">"שימוש"</string>
     <string name="cellular_data_usage" msgid="2155683719898158203">"שימוש בחבילת הגלישה"</string>
@@ -3497,7 +3528,7 @@
     <string name="data_warning" msgid="209133958008062117">"אזהרה לגבי שימוש בנתונים"</string>
     <string name="set_data_limit" msgid="2901526323210516923">"הגדרה של הגבלת נתונים"</string>
     <string name="data_limit" msgid="1885406964934590552">"מגבלת נתונים"</string>
-    <string name="data_usage_template" msgid="392191945602400904">"בתקופה <xliff:g id="ID_2">%2$s</xliff:g> נעשה שימוש ב-<xliff:g id="ID_1">%1$s</xliff:g>"</string>
+    <string name="data_usage_template" msgid="2923744765873163859">"השתמשת ב-<xliff:g id="ID_1">%1$s</xliff:g> בתאריכים <xliff:g id="ID_2">%2$s</xliff:g>"</string>
     <string name="configure" msgid="1029654422228677273">"הגדר"</string>
     <string name="data_usage_other_apps" msgid="3272872663517382050">"אפליקציות אחרות שנכללות בנתוני השימוש"</string>
     <plurals name="data_saver_unrestricted_summary" formatted="false" msgid="2635267833484232703">
@@ -3570,7 +3601,7 @@
     <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="387052719462473500">"בחירת הפרטים שמופיעים במסך הנעילה"</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="8483187649355540109">"תמיכה וטיפים"</string>
@@ -3578,7 +3609,7 @@
     <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>
+    <string name="bluetooth_disabled" msgid="6244000672828617410">"כבוי"</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>
@@ -3671,9 +3702,9 @@
     <string name="ambient_display_pickup_summary" product="device" msgid="8256669101643381568">"כדי לבדוק מה השעה, לבדוק אם יש סמלי הודעות ולראות מידע נוסף, פשוט צריך להרים את המכשיר."</string>
     <string name="ambient_display_pickup_suggestion_summary" msgid="7014700589991761035">"בדיקת התראות כשהמסך כבוי"</string>
     <string name="fingerprint_swipe_for_notifications_title" msgid="5816346492253270243">"החלקה לקריאת הודעות"</string>
-    <string name="fingerprint_swipe_for_notifications_summary" product="default" msgid="1770661868393713922">"כדי לבדוק הודעות, החלק כלפי מטה בחיישן טביעות האצבע שבחלק האחורי של הטלפון."</string>
-    <string name="fingerprint_swipe_for_notifications_summary" product="tablet" msgid="902719947767712895">"כדי לבדוק הודעות, החלק כלפי מטה בחיישן טביעות האצבע שבחלק האחורי של הטאבלט."</string>
-    <string name="fingerprint_swipe_for_notifications_summary" product="device" msgid="5372926094116306647">"כדי לבדוק הודעות, החלק כלפי מטה בחיישן טביעות האצבע שבחלק האחורי של המכשיר."</string>
+    <string name="fingerprint_swipe_for_notifications_summary" product="default" msgid="1770661868393713922">"כדי לבדוק הודעות יש להחליק כלפי מטה בחיישן טביעות האצבע שבחלק האחורי של הטלפון."</string>
+    <string name="fingerprint_swipe_for_notifications_summary" product="tablet" msgid="902719947767712895">"כדי לבדוק הודעות יש להחליק כלפי מטה בחיישן טביעות האצבע שבחלק האחורי של הטאבלט."</string>
+    <string name="fingerprint_swipe_for_notifications_summary" product="device" msgid="5372926094116306647">"כדי לבדוק הודעות יש להחליק כלפי מטה בחיישן טביעות האצבע שבחלק האחורי של המכשיר."</string>
     <string name="fingerprint_swipe_for_notifications_suggestion_title" msgid="1677291167470357802">"הצגת התראות במהירות"</string>
     <string name="fingerprint_swipe_for_notifications_suggestion_summary" msgid="127592803294414082">"החלקה למטה על חיישן טביעות האצבע"</string>
     <string name="gesture_setting_on" msgid="3455094265233870280">"פועל"</string>
@@ -3686,7 +3717,7 @@
     <string name="web_action_enable_title" msgid="4051513950976670853">"אפליקציות אינסטנט"</string>
     <string name="web_action_enable_summary" msgid="3108127559723396382">"פתיחת קישורים באפליקציות, גם אם הן לא מותקנות"</string>
     <string name="web_action_section_title" msgid="7364647086538399136">"אפליקציות אינסטנט"</string>
-    <string name="instant_apps_account" msgid="1433620209791992528">"חשבון אפליקציות אינסטנט"</string>
+    <string name="instant_apps_settings" msgid="8827777916518348213">"העדפות של אפליקציות אינסטנט"</string>
     <string name="domain_url_section_title" msgid="7046835219056428883">"אפליקציות מותקנות"</string>
     <string name="automatic_storage_manager_activation_warning" msgid="6353100011690933254">"האחסון שלך מנוהל כעת על ידי מנהל האחסון"</string>
     <string name="account_for_section_header" msgid="5356566418548737121">"חשבונות עבור <xliff:g id="USER_NAME">%1$s</xliff:g>"</string>
@@ -3737,7 +3768,9 @@
     <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">"‏הוגדר שרת proxy גלובלי של HTTP"</string>
-    <string name="enterprise_privacy_ca_certs" msgid="5885892204903688909">"פרטי כניסה מהימנים"</string>
+    <string name="enterprise_privacy_ca_certs_device" msgid="2019652712782510262">"פרטי כניסה מהימנים"</string>
+    <string name="enterprise_privacy_ca_certs_personal" msgid="2279084820904076599">"פרטי כניסה מהימנים בפרופיל האישי שלך"</string>
+    <string name="enterprise_privacy_ca_certs_work" msgid="6187377647815301809">"פרטי כניסה מהימנים בפרופיל העבודה שלך"</string>
     <plurals name="enterprise_privacy_number_ca_certs" formatted="false" msgid="526375234629534165">
       <item quantity="two">‏מינימום <xliff:g id="COUNT_1">%d</xliff:g> אישורי CA</item>
       <item quantity="many">‏מינימום <xliff:g id="COUNT_1">%d</xliff:g> אישורי CA</item>
@@ -3810,6 +3843,8 @@
     <string name="carrier_provisioning" msgid="4398683675591893169">"פרטי ניהול תצורה של ספק סלולרי"</string>
     <string name="trigger_carrier_provisioning" msgid="3434865918009286187">"הפעל ניהול תצורה של ספק סלולרי"</string>
     <string name="new_device_suggestion_title" msgid="698847081680980774">"מה חדש ומעניין?"</string>
-    <string name="new_device_suggestion_summary" msgid="7172709269203435870">"אנחנו מזמינים אותך לנסות את חמש התכונות המובילות"</string>
+    <string name="new_device_suggestion_summary" product="default" msgid="206396571522515855">"סיור היכרות עם הטלפון החדש"</string>
+    <string name="new_device_suggestion_summary" product="tablet" msgid="393751455688210956">"סיור היכרות עם הטאבלט החדש"</string>
+    <string name="new_device_suggestion_summary" product="device" msgid="2939870049868336652">"סיור היכרות עם המכשיר החדש"</string>
     <string name="disabled_low_ram_device" msgid="3751578499721173344">"התכונה לא זמינה במכשיר הזה"</string>
 </resources>
diff --git a/res/values-ja/arrays.xml b/res/values-ja/arrays.xml
index 9076344..fecbc33 100644
--- a/res/values-ja/arrays.xml
+++ b/res/values-ja/arrays.xml
@@ -68,7 +68,7 @@
   <string-array name="wifi_status">
     <item msgid="1922181315419294640"></item>
     <item msgid="8934131797783724664">"スキャン中..."</item>
-    <item msgid="8513729475867537913">"接続中..."</item>
+    <item msgid="8513729475867537913">"接続処理中..."</item>
     <item msgid="515055375277271756">"認証中..."</item>
     <item msgid="1943354004029184381">"IPアドレスを取得中..."</item>
     <item msgid="4221763391123233270">"接続済み"</item>
@@ -100,8 +100,6 @@
     <!-- no translation found for wifi_security_no_eap:0 (2084555984818107151) -->
     <!-- no translation found for wifi_security_no_eap:1 (397579322683471524) -->
     <!-- no translation found for wifi_security_no_eap:2 (1968820975358150484) -->
-    <!-- no translation found for wifi_ap_security:0 (5251664683198623324) -->
-    <!-- no translation found for wifi_ap_security:1 (7989073072260294673) -->
   <string-array name="wifi_eap_method">
     <item msgid="1160193392455075561">"PEAP"</item>
     <item msgid="7981731051382306293">"TLS"</item>
@@ -426,7 +424,7 @@
   <string-array name="vpn_states">
     <item msgid="8621078286418985762">"切断されました"</item>
     <item msgid="6692305604213080515">"初期化中..."</item>
-    <item msgid="8001704909356800092">"接続中..."</item>
+    <item msgid="8001704909356800092">"接続処理中..."</item>
     <item msgid="4039737283841672166">"接続されました"</item>
     <item msgid="4042143101664725090">"タイムアウト"</item>
     <item msgid="7664124146786465092">"失敗しました"</item>
diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml
index 4420b02..279ab44 100644
--- a/res/values-ja/strings.xml
+++ b/res/values-ja/strings.xml
@@ -114,7 +114,7 @@
     <string name="bluetooth_disconnect_all_profiles" product="device" msgid="3995834526315103965">"この端末と <xliff:g id="DEVICE_NAME">%1$s</xliff:g> との接続を解除します。"</string>
     <string name="bluetooth_disconnect_dialog_ok" msgid="3308586619539119106">"接続を解除"</string>
     <string name="bluetooth_empty_list_user_restricted" msgid="603521233563983689">"Bluetooth設定を変更する権限がありません。"</string>
-    <string name="bluetooth_pairing_pref_title" msgid="7429413067477968637">"新しいデバイスとペア設定"</string>
+    <string name="bluetooth_pairing_pref_title" msgid="7429413067477968637">"新しいデバイスとペア設定する"</string>
     <string name="bluetooth_is_visible_message" msgid="6222396240776971862">"Bluetooth設定を開いている間は、<xliff:g id="DEVICE_NAME">%1$s</xliff:g>は付近のデバイスに表示されています。"</string>
     <string name="bluetooth_footer_mac_message" product="default" msgid="1109366350000220283">"スマートフォンの Bluetooth アドレス: <xliff:g id="BLUETOOTH_MAC_ADDRESS">%1$s</xliff:g>"</string>
     <string name="bluetooth_footer_mac_message" product="tablet" msgid="6807634484499166486">"タブレットの Bluetooth アドレス: <xliff:g id="BLUETOOTH_MAC_ADDRESS">%1$s</xliff:g>"</string>
@@ -166,7 +166,7 @@
     <string name="bluetooth_map_acceptance_dialog_text" msgid="8712508202081143737">"%1$sがメッセージにアクセスしようとしています。%2$sにアクセスを許可しますか？"</string>
     <string name="bluetooth_sap_request" msgid="2669762224045354417">"SIMアクセスリクエスト"</string>
     <string name="bluetooth_sap_acceptance_dialog_text" msgid="4414253873553608690">"<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g>がSIMカードにアクセスしようとしています。SIMカードへのアクセスを許可すると、接続を処理している間、端末上のデータ接続は無効になります。<xliff:g id="DEVICE_NAME_1">%2$s?</xliff:g>にアクセスを許可します"</string>
-    <string name="bluetooth_device_name_summary" msgid="4757990010751789977">"他の端末には「<xliff:g id="DEVICE_NAME">^1</xliff:g>」として表示されます"</string>
+    <string name="bluetooth_device_name_summary" msgid="522235742194965734">"他の端末には「<xliff:g id="DEVICE_NAME">^1</xliff:g>」として表示されます"</string>
     <string name="bluetooth_paired_device_title" msgid="8638994696317952019">"端末"</string>
     <string name="bluetooth_pairing_page_title" msgid="7712127387361962608">"新しいデバイスとペア設定"</string>
     <string name="date_and_time" msgid="9062980487860757694">"日付と時刻"</string>
@@ -312,6 +312,8 @@
     <string name="zone_auto" msgid="334783869352026648">"タイムゾーンの自動設定"</string>
     <string name="zone_auto_summaryOn" msgid="6142830927278458314">"ネットワークから提供されたタイムゾーンを使用する"</string>
     <string name="zone_auto_summaryOff" msgid="2597745783162041390">"ネットワークから提供されたタイムゾーンを使用する"</string>
+    <string name="date_time_24hour_auto" msgid="2117383168985653422">"24 時間表示を自動設定"</string>
+    <string name="date_time_24hour_auto_summary" msgid="6351812925651480277">"ユーザーの言語 / 地域のデフォルトを使用"</string>
     <string name="date_time_24hour_title" msgid="3203537578602803850">"24時間表示"</string>
     <string name="date_time_24hour" msgid="1193032284921000063">"24時間表示"</string>
     <string name="date_time_set_time_title" msgid="6296795651349047016">"時刻"</string>
@@ -372,6 +374,9 @@
     <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="1961957425135180242">"次へ"</string>
+    <string name="setup_fingerprint_enroll_skip_title" msgid="362050541117362034">"指紋の設定をスキップしますか？"</string>
+    <string name="setup_fingerprint_enroll_skip_after_adding_lock_text" msgid="958990414356204763">"指紋の設定にかかる時間は 1～2 分です。スキップした場合は、後で設定から指紋を追加できます。"</string>
+    <string name="lock_screen_intro_skip_title" msgid="4988210105913705679">"画面ロックをスキップしますか？"</string>
     <string name="lock_screen_intro_skip_dialog_text_frp" product="tablet" msgid="1581834104051243425">"端末保護機能は ON になりません。このタブレットの紛失、盗難、リセット時に、他人に使用されるのを阻止することはできません。"</string>
     <string name="lock_screen_intro_skip_dialog_text_frp" product="device" msgid="4629503416877189572">"端末保護機能は ON になりません。この端末の紛失、盗難、リセット時に、他人に使用されるのを阻止することはできません。"</string>
     <string name="lock_screen_intro_skip_dialog_text_frp" product="default" msgid="2423428240245737909">"端末保護機能は ON になりません。このスマートフォンの紛失、盗難、リセット時に、他人に使用されるのを阻止することはできません。"</string>
@@ -389,7 +394,7 @@
     <string name="security_settings_fingerprint_enroll_start_title" msgid="2068961812439460133">"センサーに触れる"</string>
     <string name="security_settings_fingerprint_enroll_start_message" msgid="3909929328942564524">"指をセンサーに当て、振動したら離します。"</string>
     <string name="security_settings_fingerprint_enroll_repeat_title" msgid="2819679722403209778">"指を離してからもう一度触れる"</string>
-    <string name="security_settings_fingerprint_enroll_repeat_message" msgid="6158989350522518586">"指を何度か離して、あらゆる角度から指紋を登録します"</string>
+    <string name="security_settings_fingerprint_enroll_repeat_message" msgid="6158989350522518586">"指を何度か離して、あらゆる角度から指紋を登録します。"</string>
     <string name="security_settings_fingerprint_enroll_finish_title" msgid="7567276170287972230">"指紋の登録完了"</string>
     <string name="security_settings_fingerprint_enroll_finish_message" msgid="4796715961273420536">"このアイコンが表示されているときは、本人確認や購入の承認に指紋認証を使用します。"</string>
     <string name="security_settings_fingerprint_enroll_enrolling_skip" msgid="3710211704052369752">"後で行う"</string>
@@ -457,7 +462,7 @@
     <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="lock_settings_picker_fingerprint_added_security_message" msgid="5768002109707648463">"セキュリティを強化するには、予備の画面ロックを設定してください。"</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>
@@ -530,7 +535,7 @@
     <string name="unlock_disable_frp_warning_content_unknown_fingerprint_profile" msgid="4994062501123299418">"画面ロックがないと、プロファイル保護機能は利用できません。<xliff:g id="EMPTY_LINE">
 
 </xliff:g>保存してある指紋もこのプロファイルから削除されるため、指紋を使用してプロファイルのロック解除、購入の承認、アプリへのログインを行うことはできなくなります。"</string>
-    <string name="unlock_disable_frp_warning_ok" msgid="7075138677177748705">"削除する"</string>
+    <string name="unlock_disable_frp_warning_ok" msgid="7075138677177748705">"無効にする"</string>
     <string name="unlock_change_lock_pattern_title" msgid="2044092014872741130">"ロック解除パターンの変更"</string>
     <string name="unlock_change_lock_pin_title" msgid="806629901095938484">"ロック解除PINの変更"</string>
     <string name="unlock_change_lock_password_title" msgid="5606298470358768865">"ロック解除パスワードの変更"</string>
@@ -586,8 +591,9 @@
     </plurals>
     <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">"OK"</string>
+    <string name="lockpassword_confirm_label" msgid="8176726201389902380">"確認"</string>
     <string name="lockpassword_cancel_label" msgid="8818529276331121899">"キャンセル"</string>
+    <string name="lockpassword_clear_label" msgid="5724429464960458155">"消去"</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>
@@ -636,7 +642,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>
@@ -647,8 +653,8 @@
     <string name="bluetooth_device_context_connect_advanced" msgid="2643129703569788771">"オプション..."</string>
     <string name="bluetooth_menu_advanced" msgid="8572178316357220524">"詳細設定"</string>
     <string name="bluetooth_advanced_titlebar" msgid="2142159726881547669">"Bluetooth詳細設定"</string>
-    <string name="bluetooth_empty_list_bluetooth_off" msgid="6351930724051893423">"BluetoothをONにすると、お使いの端末は近くにある他のBluetoothデバイスと通信できます。"</string>
-    <string name="ble_scan_notify_text" msgid="1295915006005700650">"位置情報の精度を向上させるため、BluetoothがOFFの場合でもシステムのアプリやサービスはBluetoothデバイスを検出できます。この設定は、<xliff:g id="LINK_BEGIN_0">LINK_BEGIN</xliff:g>スキャンの設定<xliff:g id="LINK_END_1">LINK_END</xliff:g>で変更できます。"</string>
+    <string name="bluetooth_empty_list_bluetooth_off" msgid="6351930724051893423">"Bluetooth を ON にすると、お使いの端末は近くにある他の Bluetooth デバイスと通信できます。"</string>
+    <string name="ble_scan_notify_text" msgid="1295915006005700650">"位置情報の精度を向上させるため、Bluetooth が OFF の場合でもシステムのアプリやサービスは Bluetooth デバイスを検出できます。この設定は、<xliff:g id="LINK_BEGIN_0">LINK_BEGIN</xliff:g>スキャンの設定<xliff:g id="LINK_END_1">LINK_END</xliff:g>で変更できます。"</string>
     <string name="bluetooth_connect_failed" msgid="4500234659813241053">"接続できませんでした。もう一度お試しください。"</string>
     <string name="device_details_title" msgid="6576953269221085300">"端末の詳細"</string>
     <string name="bluetooth_device_mac_address" msgid="2513724313558236181">"端末の Bluetooth アドレス: <xliff:g id="ADDRESS">%1$s</xliff:g>"</string>
@@ -662,16 +668,16 @@
     <string name="bluetooth_disconnect_headset_profile" msgid="8635908811168780720">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>はハンズフリー音声デバイスから切断されます。"</string>
     <string name="bluetooth_disconnect_hid_profile" msgid="3282295189719352075">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>は入力デバイスから切断されます。"</string>
     <string name="bluetooth_disconnect_pan_user_profile" msgid="8037627994382458698">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>経由のインターネットアクセスを切断します。"</string>
-    <string name="bluetooth_disconnect_pan_nap_profile" product="tablet" msgid="1262792320446274407">"このタブレットのインターネット接続の共有から<xliff:g id="DEVICE_NAME">%1$s</xliff:g>を切断します。"</string>
-    <string name="bluetooth_disconnect_pan_nap_profile" product="default" msgid="5700332050175684571">"このモバイル端末のインターネット接続の共有から<xliff:g id="DEVICE_NAME">%1$s</xliff:g>を切断します。"</string>
+    <string name="bluetooth_disconnect_pan_nap_profile" product="tablet" msgid="8355910926439312604">"このタブレットのインターネット接続の共有から <xliff:g id="DEVICE_NAME">%1$s</xliff:g> を切断します。"</string>
+    <string name="bluetooth_disconnect_pan_nap_profile" product="default" msgid="6251611115860359886">"このスマートフォンのインターネット接続の共有から <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_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="6436258151814414028">"インターネット アクセス用にデバイスに接続"</string>
+    <string name="bluetooth_pan_nap_profile_summary_connected" msgid="1322694224800769308">"ローカル インターネット接続をデバイスと共有"</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>
@@ -724,14 +730,14 @@
     <string name="wifi_wakeup_summary_scanning_disabled" msgid="7247227922074840445">"Wi‑Fi のスキャンが OFF になっているため利用できません"</string>
     <string name="wifi_wakeup_summary_scoring_disabled" msgid="108339002136866897">"この機能を使用するには、ネットワーク評価プロバイダを選択してください"</string>
     <string name="wifi_poor_network_detection" msgid="4925789238170207169">"接続不良のとき無効にする"</string>
-    <string name="wifi_poor_network_detection_summary" msgid="2784135142239546291">"安定したインターネット接続があるときのみWi-Fiネットワークを使用する"</string>
-    <string name="wifi_avoid_poor_network_detection_summary" msgid="4674423884870027498">"インターネット接続が安定したネットワークのみ使用する"</string>
+    <string name="wifi_poor_network_detection_summary" msgid="7016103106105907127">"安定したインターネット接続があるときのみ Wi-Fi ネットワークを使用する"</string>
+    <string name="wifi_avoid_poor_network_detection_summary" msgid="1644292503152790501">"インターネット接続が安定したネットワークのみ使用する"</string>
     <string name="use_open_wifi_automatically_title" msgid="6851951242903078588">"オープン ネットワークに接続する"</string>
     <string name="use_open_wifi_automatically_summary" msgid="2982091714252931713">"高品質の公共ネットワークに自動的に接続する"</string>
     <string name="use_open_wifi_automatically_summary_scoring_disabled" msgid="593964217679325831">"この機能を使用するには、ネットワーク評価プロバイダを選択してください"</string>
     <string name="use_open_wifi_automatically_summary_scorer_unsupported_disabled" msgid="8472122600853650258">"この機能を使用するには、対応するネットワーク評価プロバイダを選択してください"</string>
     <string name="wifi_install_credentials" msgid="3551143317298272860">"証明書のインストール"</string>
-    <string name="wifi_scan_notify_text" msgid="5593805423071186757">"位置情報の精度を向上させるため、Wi-FiがOFFの場合でもシステムのアプリやサービスはWi‑Fiネットワークをスキャンできます。この設定は、<xliff:g id="LINK_BEGIN_0">LINK_BEGIN</xliff:g>スキャンの設定<xliff:g id="LINK_END_1">LINK_END</xliff:g>で変更できます。"</string>
+    <string name="wifi_scan_notify_text" msgid="5593805423071186757">"位置情報の精度を向上させるため、Wi-Fi が OFF の場合でもシステムのアプリやサービスは Wi‑Fi ネットワークをスキャンできます。この設定は、<xliff:g id="LINK_BEGIN_0">LINK_BEGIN</xliff:g>スキャンの設定<xliff:g id="LINK_END_1">LINK_END</xliff:g>で変更できます。"</string>
     <string name="wifi_scan_notify_text_scanning_off" msgid="3426075479272242098">"位置情報の精度を上げるには、<xliff:g id="LINK_BEGIN_0">LINK_BEGIN</xliff:g>スキャンの設定<xliff:g id="LINK_END_1">LINK_END</xliff:g>で Wi-Fi のスキャンをオンにしてください。"</string>
     <string name="wifi_scan_notify_remember_choice" msgid="7104867814641144485">"次回から表示しない"</string>
     <string name="wifi_setting_sleep_policy_title" msgid="5149574280392680092">"スリープ時にWi-Fi接続を維持"</string>
@@ -741,9 +747,9 @@
     <string name="wifi_suspend_optimizations" msgid="1220174276403689487">"Wi-Fi最適化"</string>
     <string name="wifi_suspend_optimizations_summary" msgid="4151428966089116856">"Wi-FiがONのときに電池使用を節約する"</string>
     <string name="wifi_limit_optimizations_summary" msgid="9000801068363468950">"Wi-Fiの電池使用量を制限する"</string>
-    <string name="wifi_switch_away_when_unvalidated" msgid="1707247692180853058">"Wi-Fi でインターネットにアクセスできない場合にモバイルデータに切り替える"</string>
+    <string name="wifi_switch_away_when_unvalidated" msgid="8593144541347373394">"Wi-Fi でインターネットにアクセスできない場合にモバイルデータに切り替える"</string>
     <string name="wifi_cellular_data_fallback_title" msgid="8753386877755616476">"モバイルデータへの自動切り替え"</string>
-    <string name="wifi_cellular_data_fallback_summary" msgid="6375399280719867214">"Wi-Fi でインターネットにアクセスできない場合にモバイルデータを使用します。データ使用量が加算されることがあります。"</string>
+    <string name="wifi_cellular_data_fallback_summary" msgid="1403505355490119307">"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 は自動的に ON になります"</string>
@@ -766,7 +772,7 @@
     <string name="wifi_empty_list_user_restricted" msgid="7322372065475939129">"Wi-Fiネットワークを変更する権限がありません。"</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">"Wi-Fi保護設定"</string>
@@ -781,6 +787,7 @@
     <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,6 +824,8 @@
     <string name="wifi_wps_available_first_item" msgid="4422547079984583502">"WPS利用可"</string>
     <string name="wifi_wps_available_second_item" msgid="8427520131718215301">" （WPS利用可）"</string>
     <string name="wifi_wps_nfc_enter_password" msgid="2288214226916117159">"ネットワークパスワードを入力してください"</string>
+    <string name="wifi_carrier_connect" msgid="8174696557882299911">"携帯通信会社の Wi‑Fi ネットワーク"</string>
+    <string name="wifi_carrier_content" msgid="4634077285415851933">"<xliff:g id="NAME">%1%s</xliff:g> 経由で接続"</string>
     <string name="wifi_scan_always_turnon_message" msgid="203123538572122989">"現在地情報の精度向上やその他の目的で、<xliff:g id="APP_NAME">%1$s</xliff:g>ではWi-FiがOFFのときでもネットワークスキャンをオンにすることを要求しています。\n\nスキャンを必要とするすべてのアプリでスキャンを許可しますか？"</string>
     <string name="wifi_scan_always_turnoff_message" msgid="5538901671131941043">"この機能をOFFにするには、オーバーフローメニューの[詳細設定]にアクセスします。"</string>
     <string name="wifi_scan_always_confirm_allow" msgid="5355973075896817232">"許可する"</string>
@@ -824,9 +833,9 @@
     <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="5926979351959279577">"このネットワークはインターネットに接続していません。接続を維持しますか？"</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_title" msgid="5779478650636392426">"Wi-Fi はインターネットに接続していません"</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>
@@ -834,6 +843,7 @@
     <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_modify" msgid="6100248070440710782">"変更"</string>
     <string name="wifi_failed_forget_message" msgid="1348172929201654986">"ネットワークを削除できませんでした"</string>
     <string name="wifi_save" msgid="3331121567988522826">"保存"</string>
     <string name="wifi_failed_save_message" msgid="6650004874143815692">"ネットワークを保存できませんでした"</string>
@@ -846,6 +856,7 @@
     <string name="wifi_advanced_titlebar" msgid="4485841401774142908">"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_title" msgid="8954667664081737098">"ネットワークの詳細"</string>
     <string name="wifi_details_subnet_mask" msgid="6720279144174924410">"サブネット マスク"</string>
     <string name="wifi_details_dns" msgid="8648826607751830768">"DNS"</string>
     <string name="wifi_details_ipv6_address_header" msgid="6734119149106422148">"IPv6 アドレス"</string>
@@ -878,18 +889,17 @@
     <string name="wifi_p2p_cancel_connect_title" msgid="255267538099324413">"招待状のキャンセル"</string>
     <string name="wifi_p2p_cancel_connect_message" msgid="7477756213423749402">"<xliff:g id="PEER_NAME">%1$s</xliff:g>との接続への招待をキャンセルしますか？"</string>
     <string name="wifi_p2p_delete_group_message" msgid="834559380069647086">"このグループを削除しますか？"</string>
-    <string name="wifi_tether_checkbox_text" msgid="1847167643625779136">"ポータブルWi-Fiアクセスポイント"</string>
-    <string name="wifi_hotspot_checkbox_text" msgid="7763495093333664887">"Wi-Fiアクセスポイント"</string>
-    <string name="wifi_hotspot_off_subtext" msgid="5466126533609394170">"インターネット接続やコンテンツを他の端末と共有しません"</string>
-    <string name="wifi_hotspot_tethering_on_subtext" product="tablet" msgid="5752490509369962007">"このタブレットのインターネット接続をアクセス ポイント経由で共有"</string>
-    <string name="wifi_hotspot_tethering_on_subtext" product="default" msgid="6461075246164300670">"このスマートフォンのインターネット接続をアクセス ポイント経由で共有"</string>
-    <string name="wifi_hotspot_on_local_only_subtext" msgid="2068110388011294735">"アプリがコンテンツを共有しています。インターネット接続を共有するには、アクセス ポイントをオフにしてから再度オンにします"</string>
-    <string name="wifi_hotspot_name_title" msgid="1341735529132128887">"Wi‑Fi 名"</string>
+    <string name="wifi_hotspot_checkbox_text" msgid="7763495093333664887">"Wi-Fi アクセス ポイント"</string>
+    <string name="wifi_hotspot_off_subtext" msgid="2199911382555864644">"インターネット接続やコンテンツを他の端末と共有しない"</string>
+    <string name="wifi_hotspot_tethering_on_subtext" product="tablet" msgid="5936710887156133458">"このタブレットのインターネット接続をアクセス ポイント経由で共有"</string>
+    <string name="wifi_hotspot_tethering_on_subtext" product="default" msgid="5556202634866621632">"このスマートフォンのインターネット接続をアクセス ポイント経由で共有"</string>
+    <string name="wifi_hotspot_on_local_only_subtext" msgid="5017191966153008">"アプリがコンテンツを共有しています。インターネット接続を共有するには、アクセス ポイントを OFF にしてから再度 ON にします"</string>
+    <string name="wifi_hotspot_name_title" msgid="8237000746618636778">"アクセス ポイント名"</string>
     <string name="wifi_hotspot_name_summary_connecting" msgid="3378299995508671967">"<xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g> を ON にしています..."</string>
     <string name="wifi_hotspot_name_summary_connected" msgid="3888672084861445362">"他の端末が <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g> に接続できます"</string>
-    <string name="wifi_hotspot_password_title" msgid="1955592302902091281">"Wi-Fi パスワード"</string>
+    <string name="wifi_hotspot_password_title" msgid="8676859981917573801">"アクセス ポイントのパスワード"</string>
     <string name="wifi_hotspot_ap_band_title" msgid="1165801173359290681">"AP 帯域幅"</string>
-    <string name="wifi_hotspot_footer_info_regular" msgid="1203489406068036455">"アクセス ポイントを使って他の端末との Wi‑Fi ネットワークを作成します。アクセス ポイントはモバイルデータ接続によるインターネット接続を提供します。モバイルデータ通信料が追加で発生する可能性があります。"</string>
+    <string name="wifi_hotspot_footer_info_regular" msgid="4789553667374849566">"アクセス ポイントを使って他の端末との Wi‑Fi ネットワークを作成します。アクセス ポイントはモバイルデータ通信によるインターネット接続を提供します。モバイルデータ通信料が追加で発生する可能性があります。"</string>
     <string name="wifi_hotspot_footer_info_local_only" msgid="857988412470694109">"アプリを使ってアクセス ポイントを作成し、コンテンツを近くの端末と共有できます。"</string>
     <string name="wifi_tether_starting" msgid="1322237938998639724">"アクセスポイントをONにしています…"</string>
     <string name="wifi_tether_stopping" msgid="4835852171686388107">"アクセスポイントをOFFにしています…"</string>
@@ -898,7 +908,6 @@
     <string name="wifi_tether_configure_ap_text" msgid="7974681394041609308">"Wi-Fiアクセスポイントをセットアップ"</string>
     <string name="wifi_hotspot_configure_ap_text" msgid="5478614731464220432">"アクセスポイントのセットアップ"</string>
     <string name="wifi_hotspot_configure_ap_text_summary" msgid="5560680057727007011">"AndroidAP WPA2 PSK アクセス ポイント"</string>
-    <string name="wifi_tether_configure_subtext" msgid="2050196439900426456">"<xliff:g id="NETWORK_SSID">%1$s</xliff:g> <xliff:g id="NETWORK_SECURITY">%2$s</xliff:g> アクセス ポイント"</string>
     <string name="wifi_tether_configure_ssid_default" msgid="8467525402622138547">"AndroidHotspot"</string>
     <string name="wifi_calling_settings_title" msgid="4102921303993404577">"Wi-Fi通話"</string>
     <string name="wifi_calling_suggestion_title" msgid="9008010480466359578">"Wi-Fi 通話の有効化"</string>
@@ -938,8 +947,8 @@
   </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="emergency_address_title" msgid="932729250447887545">"緊急対応の住所"</string>
+    <string name="emergency_address_summary" msgid="7751971156196115129">"Wi‑Fi を使用して緊急通報を行った場合に、現在地として使用されます"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"表示"</string>
     <string name="sound_settings" msgid="5534671337768745343">"音"</string>
     <string name="all_volume_title" msgid="4296957391257836961">"音量"</string>
@@ -993,9 +1002,13 @@
     <string name="search_settings" msgid="1910951467596035063">"検索"</string>
     <string name="search_settings_summary" msgid="9205656546570654169">"検索設定と履歴の管理"</string>
     <string name="search_settings_no_results" msgid="8799027492641230999">"一致する結果はありません"</string>
+    <string name="search_clear_history" msgid="4196658962573162457">"履歴を削除"</string>
     <string name="display_settings" msgid="7965901687241669598">"ディスプレイ"</string>
     <string name="accelerometer_title" msgid="7854608399547349157">"画面の自動回転"</string>
-    <string name="color_mode_title" msgid="3159275920408338215">"鮮明な色"</string>
+    <string name="color_mode_title" msgid="9186249332902370471">"カラー"</string>
+    <string name="color_mode_option_natural" msgid="5013837483986772758">"ナチュラル"</string>
+    <string name="color_mode_option_boosted" msgid="8588223970257287524">"ブースト"</string>
+    <string name="color_mode_option_saturated" msgid="4569683960058798843">"彩度調整"</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>
@@ -1056,13 +1069,13 @@
     <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="ambient_display_screen_title" msgid="4252755516328775766">"常に画面表示"</string>
+    <string name="ambient_display_screen_title" msgid="4252755516328775766">"アンビエント表示"</string>
     <string name="ambient_display_screen_summary_always_on" msgid="7337555569694794132">"常に ON / 電池使用量が増えます"</string>
     <string name="ambient_display_screen_summary_notifications" msgid="1449570742600868654">"新しい通知"</string>
     <string name="ambient_display_category_triggers" msgid="4359289754456268573">"表示するタイミング"</string>
@@ -1114,15 +1127,16 @@
     <string name="system_update_settings_list_item_title" msgid="3342887311059985961">"システムアップデート"</string>
     <string name="system_update_settings_list_item_summary" msgid="3853057315907710747"></string>
     <string name="firmware_version" msgid="4801135784886859972">"Androidバージョン"</string>
+    <string name="firmware_title" msgid="5203122368389157877">"Android"</string>
     <string name="security_patch" msgid="8438384045870296634">"Androidセキュリティパッチレベル"</string>
     <string name="model_info" msgid="1952009518045740889">"モデル"</string>
+    <string name="model_summary" msgid="8306235877567782987">"モデル: %1$s"</string>
     <string name="hardware_info" msgid="2605080746512527805">"モデルとハードウェア"</string>
     <string name="hardware_revision" msgid="8893547686367095527">"ハードウェア バージョン"</string>
     <string name="fcc_equipment_id" msgid="149114368246356737">"装置ID"</string>
     <string name="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>
     <string name="device_status_activity_title" msgid="1411201799384697904">"端末の状態"</string>
     <string name="device_status" msgid="607405385799807324">"端末の状態"</string>
@@ -1133,11 +1147,21 @@
     <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>
+    <!-- no translation found for imei_multi_sim (6387012961838800539) -->
+    <skip />
     <string name="status_number" product="tablet" msgid="1138837891091222272">"MDN"</string>
-    <string name="status_number" product="default" msgid="5123197324870153205">"電話番号"</string>
+    <string name="status_number" product="default" msgid="5948892105546651296">"電話番号"</string>
+    <!-- no translation found for status_number_sim_slot (2755592991367858860) -->
+    <skip />
+    <!-- no translation found for status_number_sim_slot (1898212200138025729) -->
+    <skip />
+    <string name="status_number_sim_status" product="tablet" msgid="1367110147304523864">"SIM の MDN"</string>
+    <string name="status_number_sim_status" product="default" msgid="9123351360569466330">"SIM の電話番号"</string>
     <string name="status_min_number" msgid="3519504522179420597">"MIN"</string>
     <string name="status_msid_number" msgid="909010114445780530">"MSID"</string>
     <string name="status_prl_version" msgid="1007470446618081441">"PRLバージョン:"</string>
+    <!-- no translation found for meid_multi_sim (748999971744491771) -->
+    <skip />
     <string name="status_meid_number" msgid="1751442889111731088">"MEID"</string>
     <string name="status_icc_id" msgid="943368755577172747">"ICCID"</string>
     <string name="status_network_type" msgid="3279383550222116235">"モバイルネットワークの種類"</string>
@@ -1150,7 +1174,6 @@
     <string name="status_wifi_mac_address" msgid="2202206684020765378">"Wi-Fi MACアドレス"</string>
     <string name="status_bt_address" msgid="4195174192087439720">"Bluetoothアドレス"</string>
     <string name="status_serial_number" msgid="2257111183374628137">"シリアル番号"</string>
-    <string name="status_unavailable" msgid="7862009036663793314">"不明"</string>
     <string name="status_up_time" msgid="7294859476816760399">"稼働時間"</string>
     <string name="status_awake_time" msgid="2393949909051183652">"端末使用時間"</string>
     <string name="internal_memory" msgid="9129595691484260784">"内部ストレージ"</string>
@@ -1248,7 +1271,7 @@
     <string name="storage_detail_other" msgid="8404938385075638238">"その他"</string>
     <string name="storage_detail_system" msgid="4629506366064709687">"システム"</string>
     <string name="storage_detail_explore" msgid="7911344011431568294">"<xliff:g id="NAME">^1</xliff:g>の内容を見る"</string>
-    <string name="storage_detail_dialog_other" msgid="8907101974576694793">"その他のファイルには、アプリが保存した共有ファイル、インターネットや Bluetooth 経由でダウンロードしたファイル、Android ファイルなどが含まれます。\n\nこの <xliff:g id="NAME">^1</xliff:g>の表示可能な内容を確認するには、[外部メディア] をタップします。"</string>
+    <string name="storage_detail_dialog_other" msgid="8845766044697204852">"その他のファイルには、アプリが保存した共有ファイル、インターネットや Bluetooth 経由でダウンロードしたファイル、Android ファイルなどが含まれます。\n\nこの <xliff:g id="NAME">^1</xliff:g>の表示可能な内容を確認するには、[外部メディア] をタップします。"</string>
     <string name="storage_detail_dialog_system" msgid="862835644848361569">"システムには、Android バージョン <xliff:g id="VERSION">%s</xliff:g> の実行に使用されるファイルが含まれています"</string>
     <string name="storage_detail_dialog_user" msgid="3267254783294197804">"<xliff:g id="USER_0">^1</xliff:g>が保存した写真、音楽、アプリなどのデータはストレージの <xliff:g id="SIZE">^2</xliff:g> を使用しています。\n\n詳細を表示するには、<xliff:g id="USER_1">^1</xliff:g>に切り替えてください。"</string>
     <string name="storage_wizard_init_title" msgid="5085400514028585772">"<xliff:g id="NAME">^1</xliff:g>のセットアップ"</string>
@@ -1326,6 +1349,7 @@
     <string name="menu_restore" msgid="8260067415075573273">"初期設定にリセット"</string>
     <string name="restore_default_apn_completed" msgid="2824775307377604897">"APN設定をリセットしました。"</string>
     <string name="reset_dashboard_title" msgid="6254873816990678620">"リセット オプション"</string>
+    <string name="reset_dashboard_summary" msgid="4851012632493522755">"ネットワーク、アプリ、または端末をリセットできます"</string>
     <string name="reset_network_title" msgid="6166025966016873843">"Wi-Fi、モバイル、Bluetooth をリセット"</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>
@@ -1334,17 +1358,14 @@
     <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="6617679904229218425">"すべてのデータを消去（初期状態にリセット）"</string>
-    <plurals name="master_clear_with_account_summary" formatted="false" msgid="5911377203778818712">
-      <item quantity="other"><xliff:g id="ACCOUNT_COUNT">%1$d</xliff:g> 件のアカウントをリセットします</item>
-      <item quantity="one">1 件のアカウントをリセットします</item>
-    </plurals>
-    <string name="master_clear_summary" msgid="6902443944660426951">"内部ストレージとすべてのデータをリセットします"</string>
+    <string name="master_clear_title" msgid="3531267871084279512">"すべてのデータを消去（初期状態にリセット）"</string>
     <string name="master_clear_desc" product="tablet" msgid="9146059417023157222">"この操作を行うと、タブレットの以下のデータを含む"<b>"内部ストレージ"</b>"の全データが消去されます。\n\n"<li>"Googleアカウント"</li>\n<li>"システムやアプリのデータと設定"</li>\n<li>"ダウンロードしたアプリ"</li></string>
     <string name="master_clear_desc" product="default" msgid="4800386183314202571">"この操作を行うと、モバイル端末の以下のデータを含む"<b>"内部ストレージ"</b>"の全データが消去されます。\n\n"<li>"Googleアカウント"</li>\n<li>"システムやアプリのデータと設定"</li>\n<li>"ダウンロードしたアプリ"</li></string>
     <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"以下のアカウントにログインしています:\n"</string>
     <string name="master_clear_other_users_present" product="default" msgid="5161423070702470742">\n\n"この端末には他にもユーザーがいます。\n"</string>
     <string name="master_clear_desc_also_erases_external" msgid="1903185203791274237"><li>"音楽"</li>\n<li>"画像"</li>\n<li>"他のユーザーデータ"</li></string>
+    <string name="master_clear_desc_also_erases_esim" msgid="312352697653096008"><li>"eSIM の携帯通信会社"</li></string>
+    <string name="master_clear_desc_no_cancel_mobile_plan" msgid="5460926449093211144">\n\n"この操作を行っても、ご利用のモバイル サービス プランはキャンセルされません。"</string>
     <string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="7744115866662613411">\n\n"音楽、画像、その他のユーザーデータを消去する場合は"<b>"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>
@@ -1365,7 +1386,7 @@
     <string name="master_clear_progress_text" msgid="6559096229480527510">"お待ちください..."</string>
     <string name="call_settings_title" msgid="5188713413939232801">"通話設定"</string>
     <string name="call_settings_summary" msgid="7291195704801002886">"ボイスメール、着信転送、発信者番号など"</string>
-    <string name="tether_settings_title_usb" msgid="6688416425801386511">"USBテザリング"</string>
+    <string name="tether_settings_title_usb" msgid="6688416425801386511">"USB テザリング"</string>
     <string name="tether_settings_title_wifi" msgid="3277144155960302049">"ポータブルアクセスポイント"</string>
     <string name="tether_settings_title_bluetooth" msgid="355855408317564420">"Bluetoothテザリング"</string>
     <string name="tether_settings_title_usb_bluetooth" msgid="5355828977109785001">"テザリング"</string>
@@ -1375,16 +1396,16 @@
     <string name="tether_settings_summary_hotspot_off_tether_on" msgid="1618256180720077354">"テザリング"</string>
     <string name="tether_settings_disabled_on_data_saver" msgid="1576908608463904152">"データセーバーが ON のときは、テザリングやポータブル アクセス ポイントを使用できません"</string>
     <string name="usb_title" msgid="7483344855356312510">"USB"</string>
-    <string name="usb_tethering_button_text" msgid="585829947108007917">"USBテザリング"</string>
-    <string name="usb_tethering_subtext" product="default" msgid="5991482890033484794">"スマートフォンのインターネット接続を USB 経由で共有する"</string>
-    <string name="usb_tethering_subtext" product="tablet" msgid="5988796139573211318">"タブレットのインターネット接続を USB 経由で共有する"</string>
+    <string name="usb_tethering_button_text" msgid="585829947108007917">"USB テザリング"</string>
+    <string name="usb_tethering_subtext" product="default" msgid="3711893746716442706">"スマートフォンのインターネット接続を USB 経由で共有"</string>
+    <string name="usb_tethering_subtext" product="tablet" msgid="2292916486612255069">"タブレットのインターネット接続を USB 経由で共有"</string>
     <string name="bluetooth_tether_checkbox_text" msgid="2379175828878753652">"Bluetoothテザリング"</string>
-    <string name="bluetooth_tethering_subtext" product="tablet" msgid="4558227863463153412">"タブレットのインターネット接続を Bluetooth で共有"</string>
-    <string name="bluetooth_tethering_subtext" product="default" msgid="1055197887836203595">"スマートフォンのインターネット接続を Bluetooth で共有"</string>
-    <string name="bluetooth_tethering_off_subtext_config" msgid="6326877798974938021">"この <xliff:g id="DEVICE_NAME">%1$d</xliff:g> のインターネット接続を Bluetooth で共有"</string>
+    <string name="bluetooth_tethering_subtext" product="tablet" msgid="8828883800511737077">"タブレットのインターネット接続を Bluetooth で共有"</string>
+    <string name="bluetooth_tethering_subtext" product="default" msgid="1904667146601254812">"スマートフォンのインターネット接続を Bluetooth で共有"</string>
+    <string name="bluetooth_tethering_off_subtext_config" msgid="376389105752995580">"この <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>
-    <string name="tethering_footer_info" msgid="1308462275952345985">"アクセス ポイントとテザリングを使用して、モバイルデータ通信により他の端末にインターネット接続を提供します。アプリを使ってアクセス ポイントを作成し、コンテンツを近くの端末と共有することもできます。"</string>
+    <string name="tethering_footer_info" msgid="7112228674056306147">"アクセス ポイントとテザリングを使用して、モバイルデータ通信により他の端末にインターネット接続を提供します。アプリを使ってアクセス ポイントを作成し、コンテンツを近くの端末と共有することもできます。"</string>
     <string name="tethering_help_button_text" msgid="656117495547173630">"ヘルプ"</string>
     <string name="network_settings_title" msgid="2876509814832830757">"モバイル ネットワーク"</string>
     <string name="manage_mobile_plan_title" msgid="7630170375010107744">"モバイルプラン"</string>
@@ -1459,17 +1480,18 @@
     <string name="settings_license_activity_loading" msgid="3337535809093591740">"読み込み中..."</string>
     <string name="settings_safetylegal_title" msgid="1289483965535937431">"安全に関する情報"</string>
     <string name="settings_safetylegal_activity_title" msgid="6901214628496951727">"安全に関する情報"</string>
-    <string name="settings_safetylegal_activity_unreachable" msgid="250674109915859456">"データ接続されていません。この情報を表示するにはインターネットに接続されているパソコンから%sにアクセスしてください。"</string>
+    <string name="settings_safetylegal_activity_unreachable" msgid="142307697309858185">"データ接続されていません。この情報を表示するにはインターネットに接続されているパソコンから %s にアクセスしてください。"</string>
     <string name="settings_safetylegal_activity_loading" msgid="8059022597639516348">"読み込み中..."</string>
-    <string name="lockpassword_choose_your_password_header" msgid="8624900666929394990">"パスワードを選択"</string>
-    <string name="lockpassword_choose_your_password_header_for_fingerprint" msgid="6624409510609085450">"指紋認証にはパスワードが必要です"</string>
-    <string name="lockpassword_choose_your_pattern_header" msgid="6949761069941694050">"パターンの選択"</string>
-    <string name="lockpassword_choose_your_pattern_header_for_fingerprint" msgid="5901096361617543819">"指紋認証にはパターンが必要です"</string>
-    <string name="lockpassword_choose_your_pin_header" msgid="7598849519816138302">"PINを選択"</string>
-    <string name="lockpassword_choose_your_pin_header_for_fingerprint" msgid="765344692615917183">"指紋認証には PIN が必要です"</string>
-    <string name="lockpassword_confirm_your_password_header" msgid="6308478184889846633">"パスワードを確認"</string>
+    <string name="lockpassword_choose_your_screen_lock_header" msgid="3872462096767152394">"画面ロックの設定"</string>
+    <string name="lockpassword_choose_your_password_message" msgid="1197569283524841412">"セキュリティを強化するには、パスワードを設定してください"</string>
+    <string name="lockpassword_choose_your_password_header_for_fingerprint" msgid="2541818487015343503">"指紋認証にはパスワードが必要です"</string>
+    <string name="lockpassword_choose_your_pattern_header_for_fingerprint" msgid="7709785406243556723">"指紋認証にはパターンが必要です"</string>
+    <string name="lockpassword_choose_your_pin_message" msgid="1875420718677275646">"セキュリティを強化するには、PIN を設定してください"</string>
+    <string name="lockpassword_choose_your_pin_header_for_fingerprint" msgid="1549639053195796674">"指紋認証には PIN が必要です"</string>
+    <string name="lockpassword_choose_your_pattern_message" msgid="5986983400689720015">"セキュリティを強化するために、パターンを設定してください"</string>
+    <string name="lockpassword_confirm_your_password_header" msgid="1266027268220850931">"パスワードの再入力"</string>
     <string name="lockpassword_confirm_your_pattern_header" msgid="7543433733032330821">"パターンの確認"</string>
-    <string name="lockpassword_confirm_your_pin_header" msgid="49038294648213197">"PINの確認"</string>
+    <string name="lockpassword_confirm_your_pin_header" msgid="7744513791910572550">"PIN の再入力"</string>
     <string name="lockpassword_confirm_passwords_dont_match" msgid="5140892109439191415">"パスワードが一致しません"</string>
     <string name="lockpassword_confirm_pins_dont_match" msgid="7226244811505606217">"PINが一致しません"</string>
     <string name="lockpassword_choose_lock_generic_header" msgid="3811438094903786145">"ロック解除方法の選択"</string>
@@ -1488,6 +1510,12 @@
     <string name="lockpassword_strong_auth_required_work_pattern" msgid="3003781907040522053">"セキュリティ強化のため、仕事用のパターンを入力してください"</string>
     <string name="lockpassword_strong_auth_required_work_pin" msgid="3367491332598821552">"セキュリティ強化のため、仕事用の PIN を入力してください"</string>
     <string name="lockpassword_strong_auth_required_work_password" msgid="8159775129968582940">"セキュリティ強化のため、仕事用のパスワードを入力してください"</string>
+    <string name="lockpassword_confirm_your_pattern_details_frp" msgid="6757336656791723193">"スマートフォンは出荷時の設定にリセットされました。使用するには、以前のパターンを入力してください。"</string>
+    <string name="lockpassword_confirm_your_pin_details_frp" msgid="826520613445990470">"スマートフォンは出荷時の設定にリセットされました。使用するには、以前の PIN を入力してください。"</string>
+    <string name="lockpassword_confirm_your_password_details_frp" msgid="8944081074615739040">"スマートフォンは出荷時の設定にリセットされました。使用するには、以前のパスワードを入力してください。"</string>
+    <string name="lockpassword_confirm_your_pattern_header_frp" msgid="2898036091609128286">"パターンの確認"</string>
+    <string name="lockpassword_confirm_your_pin_header_frp" msgid="4141601774778898803">"PIN の確認"</string>
+    <string name="lockpassword_confirm_your_password_header_frp" msgid="3762615419295360480">"パスワードの確認"</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>
@@ -1537,14 +1565,13 @@
     <string name="install_applications_title" msgid="4987712352256508946">"アプリの提供元をすべて許可する"</string>
     <string name="recent_app_category_title" msgid="6673071268966003928">"最近開いたアプリ"</string>
     <string name="see_all_apps_title" msgid="1317153498074308438">"<xliff:g id="COUNT">%1$d</xliff:g> 個のアプリをすべて表示"</string>
-    <string name="recent_app_summary" msgid="3366446669844932300">"<xliff:g id="TIME">^1</xliff:g>前"</string>
     <string name="install_all_warning" product="tablet" msgid="8310489909586138165">"不明なアプリをインストールするとタブレットや個人データが攻撃を受ける可能性が高くなります。この提供元からアプリをインストールすることにより、アプリの使用により生じる可能性があるタブレットへの損害やデータの損失について、ユーザーご自身が単独で責任を負うことに同意するものとします。"</string>
     <string name="install_all_warning" product="default" msgid="1952257127370115988">"不明なアプリをインストールするとスマートフォンや個人データが攻撃を受ける可能性が高くなります。この提供元からアプリをインストールすることにより、アプリの使用により生じる可能性があるスマートフォンへの損害やデータの損失について、ユーザーご自身が単独で責任を負うことに同意するものとします。"</string>
     <string name="advanced_settings" msgid="1777249286757067969">"詳細設定"</string>
     <string name="advanced_settings_summary" msgid="4016682978071086747">"詳細設定オプションを有効にする"</string>
     <string name="application_info_label" msgid="5736524913065714880">"アプリ情報"</string>
     <string name="storage_label" msgid="8700867073480107253">"メモリ"</string>
-    <string name="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>
@@ -1659,7 +1686,6 @@
     <string name="app_install_details_title" msgid="6905279702654975207">"アプリの詳細"</string>
     <string name="app_install_details_summary" msgid="6464796332049327547">"<xliff:g id="APP_STORE">%1$s</xliff:g> からインストールしたアプリ"</string>
     <string name="instant_app_details_summary" msgid="4529934403276907045">"<xliff:g id="APP_STORE">%1$s</xliff:g>上の詳細情報"</string>
-    <string name="app_ops_settings" msgid="5108481883575527511">"アプリの操作状況"</string>
     <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>
@@ -1711,6 +1737,7 @@
     <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_empty_list_user_restricted" msgid="5984015900102140696">"端末の言語を変更する権限がありません。"</string>
     <string name="language_keyboard_settings_title" msgid="3709159207482544398">"言語と入力"</string>
     <string name="input_assistance" msgid="7577795275222555487">"入力アシスタント"</string>
     <string name="keyboard_settings_category" msgid="8275523930352487827">"キーボードと入力方法"</string>
@@ -1737,7 +1764,7 @@
     <string name="show_ime" msgid="2658582193437188227">"仮想キーボードの表示"</string>
     <string name="show_ime_summary" msgid="8164993045923240698">"物理キーボードが有効になっていても画面に表示されます"</string>
     <string name="keyboard_shortcuts_helper" msgid="4839453720463798145">"キーボード ショートカット ヘルパー"</string>
-    <string name="keyboard_shortcuts_helper_summary" msgid="5871299901459743288">"使用可能なショートカットを表示"</string>
+    <string name="keyboard_shortcuts_helper_summary" msgid="5871299901459743288">"使用可能なショートカットを表示します"</string>
     <string name="default_keyboard_layout" msgid="4172606673510531271">"デフォルト"</string>
     <string name="pointer_speed" msgid="1221342330217861616">"ポインタの速度"</string>
     <string name="game_controller_settings_category" msgid="8794508575329923718">"ゲーム用コントローラ"</string>
@@ -1801,7 +1828,7 @@
     <string name="accessibility_settings_summary" msgid="981260486011624939">"スクリーン リーダー、表示、操作のコントロール"</string>
     <string name="vision_settings_title" msgid="4204111425716868288">"視覚補助"</string>
     <string name="vision_settings_description" msgid="5679491180156408260">"この端末を必要に応じてカスタマイズできます。このユーザー補助機能は後から [設定] で変更できます。"</string>
-    <string name="vision_settings_suggestion_title" msgid="917294957154878441">"フォントサイズを拡大"</string>
+    <string name="vision_settings_suggestion_title" msgid="8058794060304707004">"フォントサイズの変更"</string>
     <string name="screen_reader_category_title" msgid="7739154903913400641">"スクリーン リーダー"</string>
     <string name="audio_and_captions_category_title" msgid="3420727114421447524">"音声と画面上のテキスト"</string>
     <string name="display_category_title" msgid="685461049938269166">"表示"</string>
@@ -1838,7 +1865,6 @@
     <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="preference_summary_default_combination" msgid="8532964268242666060">"<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">"ON"</string>
     <string name="accessibility_summary_state_disabled" msgid="2241315620132005595">"OFF"</string>
     <string name="enable_quick_setting" msgid="2366999897816894536">"クイック設定に表示"</string>
@@ -1957,12 +1983,14 @@
     <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_whitelisted" msgid="7375400051141016808">"このアプリでは、電池の最適化を使用できません"</string>
+    <string name="background_activity_warning_dialog_title" msgid="2216249969149568871">"バックグラウンド アクティビティの制限"</string>
+    <string name="background_activity_warning_dialog_text" msgid="7049624449246121981">"アプリのバックグラウンド アクティビティを制限すると、アプリが正常に機能しないことがあります"</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" msgid="6393929085382334341">"フル充電以降のアプリの電池使用状況（<xliff:g id="RELATIVE_TIME">^1</xliff:g>）"</string>
+    <string name="power_usage_list_summary_device" msgid="4461926045610455423">"フル充電以降の端末の電池使用状況（<xliff:g id="RELATIVE_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>
@@ -2126,14 +2154,6 @@
     <string name="services_subtitle" msgid="4296402367067266425">"サービス"</string>
     <string name="menu_proc_stats_duration" msgid="2323483592994720196">"期間"</string>
     <string name="mem_details_title" msgid="6548392825497290498">"メモリ情報"</string>
-    <string name="mem_state_subtitle" msgid="2407238869781011933">"メモリのステータス"</string>
-    <string name="mem_use_subtitle" msgid="7319468770222422412">"メモリ使用"</string>
-    <string name="mem_use_kernel_type" msgid="8698327165935012484">"カーネル"</string>
-    <string name="mem_use_native_type" msgid="5976704902328347400">"ネイティブ"</string>
-    <string name="mem_use_kernel_cache_type" msgid="6411475064463957513">"カーネルキャッシュ"</string>
-    <string name="mem_use_zram_type" msgid="9087217476795358232">"zramスワップ"</string>
-    <string name="mem_use_free_type" msgid="717708548454880840">"未使用"</string>
-    <string name="mem_use_total" msgid="6308786055749777934">"合計"</string>
     <string name="menu_duration_3h" msgid="4714866438374738385">"3時間"</string>
     <string name="menu_duration_6h" msgid="1940846763432184132">"6時間"</string>
     <string name="menu_duration_12h" msgid="7890465404584356294">"12時間"</string>
@@ -2153,7 +2173,7 @@
     <string name="voice_input_settings" msgid="1099937800539324567">"音声入力の設定"</string>
     <string name="voice_input_settings_title" msgid="2676028028084981891">"音声入力"</string>
     <string name="voice_service_preference_section_title" msgid="3778706644257601021">"音声入力サービス"</string>
-    <string name="voice_interactor_preference_summary" msgid="1801414022026937190">"完全な注目ワードと対話"</string>
+    <string name="voice_interactor_preference_summary" msgid="1801414022026937190">"完全な起動ワードと対話"</string>
     <string name="voice_recognizer_preference_summary" msgid="669880813593690527">"シンプルな音声認識"</string>
     <string name="voice_interaction_security_warning" msgid="6378608263983737325">"この音声入力サービスを使用すると、常時音声監視を実行し、音声対応アプリの管理をユーザーに代わって行えるようになります。これは<xliff:g id="VOICE_INPUT_SERVICE_APP_NAME">%s</xliff:g>の一部です。このサービスの使用を有効にしますか？"</string>
     <string name="tts_engine_preference_title" msgid="1578826947311494239">"優先するエンジン"</string>
@@ -2212,14 +2232,14 @@
     <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">"パスワードが正しくありません。あと1回失敗すると、認証情報ストレージが消去されます。"</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="credentials_configure_lock_screen_hint" msgid="8058230497337529036">"認証情報ストレージを使用するには、端末を画面ロックで保護しておく必要があります"</string>
+    <string name="credentials_configure_lock_screen_button" msgid="253239765216055321">"ロックを設定"</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>
@@ -2339,8 +2359,6 @@
     <skip />
     <string name="cant_sync_dialog_title" msgid="2777238588398046285">"手動では同期できません"</string>
     <string name="cant_sync_dialog_message" msgid="1938380442159016449">"このアイテムの同期は現在無効になっています。この設定を変更するには、バックグラウンドデータと自動同期を一時的にONにします。"</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を起動するには、PINを入力します"</string>
     <string name="enter_pattern" msgid="4187435713036808566">"Androidを起動するには、パターンを入力します"</string>
@@ -2354,6 +2372,7 @@
     <string name="misc_files_selected_count" msgid="4647048020823912088">"選択済み: <xliff:g id="NUMBER">%1$d</xliff:g>/<xliff:g id="TOTAL">%2$d</xliff:g>件"</string>
     <string name="misc_files_selected_count_bytes" msgid="2876232009069114352">"<xliff:g id="NUMBER">%1$s</xliff:g>/<xliff:g id="TOTAL">%2$s</xliff:g>"</string>
     <string name="select_all" msgid="1562774643280376715">"すべて選択"</string>
+    <string name="data_plan_usage_manage_plans_button_text" msgid="8997761990902708162">"プランを管理"</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>
@@ -2437,8 +2456,11 @@
     <string name="data_usage_metered_title" msgid="7383175371006596441">"ネットワーク制限"</string>
     <string name="data_usage_metered_body" msgid="7655851702771342507">"バックグラウンド データが制限されている場合、従量制のネットワークはモバイル ネットワークと同様に扱われます。これらのネットワークを使用して大量のダウンロードが行われる前に、アプリが警告を表示することがあります。"</string>
     <string name="data_usage_metered_mobile" msgid="5423305619126978393">"モバイルネットワーク"</string>
-    <string name="data_usage_metered_wifi" msgid="1761738002328299714">"従量制のWi‑Fiネットワーク"</string>
-    <string name="data_usage_metered_wifi_disabled" msgid="727808462375941567">"従量制のネットワークを選択するにはWi‑FiをONにします。"</string>
+    <string name="data_usage_metered_wifi" msgid="1761738002328299714">"従量制の Wi‑Fi ネットワーク"</string>
+    <string name="data_usage_metered_wifi_disabled" msgid="727808462375941567">"従量制のネットワークを選択するには Wi‑Fi を ON にします。"</string>
+    <string name="data_usage_metered_auto" msgid="1262028400911918865">"自動"</string>
+    <string name="data_usage_metered_yes" msgid="9217539611385225894">"従量制"</string>
+    <string name="data_usage_metered_no" msgid="4025232961929071789">"定額制"</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>
@@ -2481,8 +2503,8 @@
     <string name="vpn_forget_long" msgid="2232239391189465752">"VPN を削除"</string>
     <string name="vpn_replace_vpn_title" msgid="2963898301277610248">"既存の VPN を置き換えますか？"</string>
     <string name="vpn_set_vpn_title" msgid="4009987321156037267">"常時接続 VPN を設定しますか？"</string>
-    <string name="vpn_first_always_on_vpn_message" msgid="3025322109743675467">"この設定を有効にすると、VPN に接続するまではインターネットに接続できなくなります"</string>
-    <string name="vpn_replace_always_on_vpn_enable_message" msgid="2577928591361606641">"既存の VPN が置き換えられ、VPN に接続するまではインターネットに接続できなくなります"</string>
+    <string name="vpn_first_always_on_vpn_message" msgid="7144543717673197102">"この設定を ON にすると、VPN に接続するまではインターネットに接続できなくなります"</string>
+    <string name="vpn_replace_always_on_vpn_enable_message" msgid="798121133114824006">"既存の VPN が置き換えられ、VPN に接続するまではインターネットに接続できなくなります"</string>
     <string name="vpn_replace_always_on_vpn_disable_message" msgid="3011818750025879902">"すでに常時接続 VPN に接続しています。別の VPN に接続する場合は、既存の VPN が置き換えられ、常時接続モードは無効になります。"</string>
     <string name="vpn_replace_vpn_message" msgid="5611635724578812860">"すでに VPN に接続しています。別の VPN に接続する場合は、既存の VPN が置き換えられます。"</string>
     <string name="vpn_turn_on" msgid="2363136869284273872">"有効にする"</string>
@@ -2530,9 +2552,6 @@
     <string name="backup_pw_set_button_text" msgid="2387480910044648795">"バックアップパスワードを設定"</string>
     <string name="backup_pw_cancel_button_text" msgid="8845630125391744615">"キャンセル"</string>
     <string name="additional_system_update_settings_list_item_title" msgid="214987609894661992">"その他のシステムアップデート"</string>
-    <string name="selinux_status_disabled" msgid="924551035552323327">"Disabled"</string>
-    <string name="selinux_status_permissive" msgid="6004965534713398778">"Permissive"</string>
-    <string name="selinux_status_enforcing" msgid="2252703756208463329">"Enforcing"</string>
     <string name="ssl_ca_cert_warning" msgid="2045866713601984673">"ネットワークが監視されている可能性があります"</string>
     <string name="done_button" msgid="1991471253042622230">"完了"</string>
     <plurals name="ssl_ca_cert_dialog_title" formatted="false" msgid="7145092748045794650">
@@ -2562,7 +2581,7 @@
     <string name="user_summary_not_set_up" msgid="8778205026866794909">"セットアップしていません"</string>
     <string name="user_summary_restricted_not_set_up" msgid="1628116001964325544">"セットアップしていません - 制限付きプロファイル"</string>
     <string name="user_summary_managed_profile_not_set_up" msgid="1659125858619760573">"セットアップしていません - 仕事用プロファイル"</string>
-    <string name="user_admin" msgid="993402590002400782">"管理"</string>
+    <string name="user_admin" msgid="993402590002400782">"管理者"</string>
     <string name="user_you" msgid="1639158809315025986">"自分（<xliff:g id="NAME">%s</xliff:g>）"</string>
     <string name="user_nickname" msgid="5148818000228994488">"ニックネーム"</string>
     <string name="user_add_user_type_title" msgid="2146438670792322349">"追加"</string>
@@ -2575,7 +2594,7 @@
     <string name="user_add_user_message_long" msgid="8562152293752222985">"追加ユーザーを作成して、この端末を他のユーザーと共有できます。各ユーザーは各自のスペースを所有でき、アプリや壁紙などを使用してカスタマイズできます。Wi-Fiなど、すべてのユーザーに影響する端末設定を変更することもできます。\n\n新しいユーザーを追加したら、そのユーザーは自分のスペースをセットアップする必要があります。\n\nすべてのユーザーは他のユーザーに代わってアプリを更新できます。"</string>
     <string name="user_add_user_message_short" msgid="1511354412249044381">"新しいユーザーを追加したら、そのユーザーは自分のスペースをセットアップする必要があります。\n\nすべてのユーザーは他のユーザーに代わってアプリを更新できます。"</string>
     <string name="user_setup_dialog_title" msgid="1765794166801864563">"ユーザーを今すぐセットアップ"</string>
-    <string name="user_setup_dialog_message" msgid="1004068621380867148">"ユーザーが端末を使って各自のスペースをセットアップできるよう確認してください"</string>
+    <string name="user_setup_dialog_message" msgid="1004068621380867148">"ユーザーが端末を使って各自のスペースをセットアップできるようにします"</string>
     <string name="user_setup_profile_dialog_message" msgid="3896568553327558731">"プロファイルを今すぐセットアップしますか？"</string>
     <string name="user_setup_button_setup_now" msgid="3391388430158437629">"今すぐセットアップ"</string>
     <string name="user_setup_button_setup_later" msgid="3068729597269172401">"後で行う"</string>
@@ -2712,6 +2731,8 @@
     <string name="color_purple" msgid="3888532466427762504">"パープル"</string>
     <string name="sim_no_inserted_msg" msgid="210316755353227087">"SIMカードが挿入されていません"</string>
     <string name="sim_status_title" msgid="6744870675182447160">"SIMのステータス"</string>
+    <!-- no translation found for sim_status_title_sim_slot (5725659316463979194) -->
+    <skip />
     <string name="sim_call_back_title" msgid="5181549885999280334">"デフォルトのSIMからコールバック"</string>
     <string name="sim_outgoing_call_title" msgid="1019763076116874255">"発信用のSIM"</string>
     <string name="sim_other_call_settings" msgid="8247802316114482477">"その他の通話設定"</string>
@@ -2725,12 +2746,15 @@
     <string name="sim_pref_divider" msgid="6778907671867621874">"優先SIM:"</string>
     <string name="sim_calls_ask_first_prefs_title" msgid="7941299533514115976">"その都度確認"</string>
     <string name="sim_selection_required_pref" msgid="3446721423206414652">"選択してください"</string>
+    <!-- no translation found for sim_selection_channel_title (2760909074892782589) -->
+    <skip />
     <string name="dashboard_title" msgid="5453710313046681820">"設定"</string>
     <plurals name="settings_suggestion_header_summary_hidden_items" formatted="false" msgid="5597356221942118048">
       <item quantity="other">%d 件の非表示のアイテムを表示</item>
       <item quantity="one">%d 件の非表示のアイテムを表示</item>
     </plurals>
-    <string name="network_dashboard_title" msgid="4771589228992391573">"ネットワークとインターネット"</string>
+    <string name="dashboard_suggestion_condition_footer_content_description" msgid="2898588191174845961">"折りたたむ"</string>
+    <string name="network_dashboard_title" msgid="3135144174846753758">"ネットワークとインターネット"</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>
@@ -2790,6 +2814,14 @@
     <string name="keywords_payment_settings" msgid="5220104934130446416">"支払い, タップ, ペイメント"</string>
     <string name="keywords_backup" msgid="470070289135403022">"バックアップ, バック アップ"</string>
     <string name="keywords_assist_gesture_launch" msgid="813968759791342591">"操作"</string>
+    <!-- no translation found for keywords_imei_info (7230982940217544527) -->
+    <skip />
+    <!-- no translation found for keywords_sim_status (1474422416860990564) -->
+    <skip />
+    <!-- no translation found for keywords_model_and_hardware (1459248377212829642) -->
+    <skip />
+    <!-- no translation found for keywords_android_version (5591055570309015111) -->
+    <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>
@@ -2816,7 +2848,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>
@@ -2827,14 +2859,20 @@
     <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">"ON になっている自動ルールはありません"</string>
-    <plurals name="zen_mode_settings_summary_on" formatted="false" msgid="1216562765753405784">
-      <item quantity="other">ON になっている自動ルールが <xliff:g id="ON_COUNT">%d</xliff:g> 件あります</item>
-      <item quantity="one">ON になっている自動ルールが 1 件あります</item>
+    <string name="zen_mode_settings_summary_off" msgid="6119891445378113334">"なし"</string>
+    <plurals name="zen_mode_settings_summary_on" formatted="false" msgid="7346979080337117366">
+      <item quantity="other"><xliff:g id="ON_COUNT">%d</xliff:g> 件のルール</item>
+      <item quantity="one">1 件のルール</item>
     </plurals>
-    <string name="zen_mode_settings_title" msgid="842308776768942600">"マナーモードの設定"</string>
-    <string name="zen_mode_priority_settings_title" msgid="2623117023031824309">"優先する通知のみを許可"</string>
-    <string name="zen_mode_automation_settings_title" msgid="4228995740594063774">"自動ルール"</string>
+    <string name="zen_mode_settings_title" msgid="1066226840983908121">"マナーモード"</string>
+    <string name="zen_mode_behavior_settings_title" msgid="1463303933529313969">"動作"</string>
+    <string name="zen_mode_behavior_allow_title" msgid="3845615648136218141">"次の音やバイブレーションを許可"</string>
+    <string name="zen_mode_behavior_no_sound" msgid="1219626004723208056">"無音"</string>
+    <string name="zen_mode_behavior_total_silence" msgid="6716603819806610626">"無音（サイレント）"</string>
+    <string name="zen_mode_behavior_no_sound_except" msgid="4968477585788243114">"<xliff:g id="CATEGORIES">%1$s</xliff:g>以外は無音"</string>
+    <string name="zen_mode_behavior_alarms_only" msgid="2423480992071472963">"アラーム、メディア、システム フィードバック以外は無音（アラームのみ）"</string>
+    <string name="zen_mode_automation_settings_title" msgid="2517800938791944915">"自動的に ON"</string>
+    <string name="zen_mode_automation_settings_page_title" msgid="7069221762714457987">"自動ルール"</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>
@@ -2842,6 +2880,22 @@
     <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_signals_settings_subtitle" msgid="6308824824208120508">"視覚的な割り込みを許可"</string>
+    <string name="zen_mode_add" msgid="90014394953272517">"追加"</string>
+    <!-- no translation found for zen_mode_button_turn_on (5074744714613374902) -->
+    <skip />
+    <!-- no translation found for zen_mode_button_turn_off (1995551537320422792) -->
+    <skip />
+    <!-- no translation found for zen_mode_settings_dnd_manual_end_time_next_day (3090599225533484203) -->
+    <skip />
+    <!-- no translation found for zen_mode_settings_dnd_manual_indefinite (2746903915016850399) -->
+    <skip />
+    <!-- no translation found for zen_mode_settings_dnd_automatic_rule (3856133183910726786) -->
+    <skip />
+    <!-- no translation found for zen_mode_settings_dnd_automatic_rule_app (7112871101701453067) -->
+    <skip />
+    <!-- no translation found for zen_mode_settings_dnd_automatic_rule_multiple (5792308957602984360) -->
+    <skip />
     <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>
@@ -2875,13 +2929,15 @@
     <string name="notifications_title" msgid="8086372779371204971">"通知"</string>
     <string name="app_notifications_title" msgid="5810577805218003760">"アプリの通知"</string>
     <string name="notification_channel_title" msgid="2260666541030178452">"通知のカテゴリ"</string>
+    <string name="notification_group_title" msgid="7180506440133859601">"通知のカテゴリ グループ"</string>
     <string name="notification_importance_title" msgid="848692592679312666">"重要度"</string>
-    <string name="notification_importance_unspecified" msgid="2196023702875112081">"アプリに判断させる"</string>
+    <string name="notification_importance_unspecified" msgid="6622173510486113958">"音の許可"</string>
     <string name="notification_importance_blocked" msgid="7938180808339386300">"通知を表示しない"</string>
     <string name="notification_importance_min" msgid="5455049524984686275">"音声や画面表示を使用しない"</string>
     <string name="notification_importance_low" msgid="8881468429453766553">"音声なし"</string>
     <string name="notification_importance_default" msgid="5958338024601957516">"音声で知らせる"</string>
     <string name="notification_importance_high" msgid="2082429479238228527">"音声とポップアップで知らせる"</string>
+    <string name="notification_importance_high_silent" msgid="2667033773703765252">"ポップアップ"</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>
@@ -2924,8 +2980,13 @@
     <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="channel_group_notifications_off_desc" msgid="1620950416247316370">"Android により、このグループの通知はこの端末には表示されません"</string>
     <string name="notification_channels" msgid="5346841743182627500">"カテゴリ"</string>
     <string name="notification_channels_other" msgid="5645317113885788226">"その他"</string>
+    <plurals name="notification_group_summary" formatted="false" msgid="3420621520561455358">
+      <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="no_channels" msgid="3077375508177744586">"このアプリの通知はありません"</string>
     <string name="app_settings_link" msgid="8894946007543660906">"アプリ内のその他の設定"</string>
     <string name="app_notification_listing_summary_zero" msgid="6482582965081108108">"すべてのアプリで ON になっています"</string>
@@ -2945,8 +3006,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>
@@ -2961,7 +3022,9 @@
     <string name="zen_mode_rule_name" msgid="5149068059383837549">"ルール名"</string>
     <string name="zen_mode_rule_name_hint" msgid="3781174510556433384">"ルール名を入力"</string>
     <string name="zen_mode_rule_name_warning" msgid="4517805381294494314">"ルール名は既に使用されています"</string>
-    <string name="zen_mode_add_rule" msgid="7459154136384467057">"追加"</string>
+    <string name="zen_mode_add_rule" msgid="9100929184624317193">"ルールを追加"</string>
+    <string name="zen_mode_add_event_rule" msgid="3997335103633946552">"予定ルールの追加"</string>
+    <string name="zen_mode_add_time_rule" msgid="5002080000597838703">"時間ルールの追加"</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>
@@ -2969,9 +3032,9 @@
     <string name="zen_mode_rule_type" msgid="2289413469580142888">"ルールの種類"</string>
     <string name="zen_mode_rule_type_unknown" msgid="3049377282766700600">"不明"</string>
     <string name="zen_mode_configure_rule" msgid="8865785428056490305">"ルールを設定"</string>
-    <string name="zen_schedule_rule_type_name" msgid="142936744435271449">"時間ルール"</string>
+    <string name="zen_schedule_rule_type_name" msgid="6163149826036287324">"時間"</string>
     <string name="zen_schedule_rule_enabled_toast" msgid="3379499360390382259">"自動ルールでは指定時間内はマナーモードを ON に設定します"</string>
-    <string name="zen_event_rule_type_name" msgid="2645981990973086797">"予定ルール"</string>
+    <string name="zen_event_rule_type_name" msgid="6503468472212606158">"予定"</string>
     <string name="zen_event_rule_enabled_toast" msgid="6910577623330811480">"自動ルールでは指定した予定の間はマナーモードを ON に設定します"</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>
@@ -2988,7 +3051,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>
@@ -3002,12 +3065,13 @@
     <string name="zen_mode_from_starred" msgid="2678345811950997027">"スター付きの連絡先のみ"</string>
     <string name="zen_mode_from_none" msgid="8219706639954614136">"なし"</string>
     <string name="zen_mode_alarms" msgid="2165302777886552926">"アラーム"</string>
+    <string name="zen_mode_media_system_other" msgid="8900209390529859777">"メディア、システム フィードバック"</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="239685342222975733">"同じ人から <xliff:g id="MINUTES">%d</xliff:g> 分以内に再度発信があった場合"</string>
     <string name="zen_mode_when" msgid="2767193283311106373">"自動的にON"</string>
     <string name="zen_mode_when_never" msgid="8809494351918405602">"設定しない"</string>
     <string name="zen_mode_when_every_night" msgid="3122486110091921009">"毎日の夜間"</string>
@@ -3026,16 +3090,13 @@
     </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">"画面が ON のときにブロックする"</string>
-    <string name="zen_mode_screen_on_summary" msgid="6444425984146305149">"マナーモードでサイレントに設定した通知を受信したときに、画面上にポップアップ表示されなくなります"</string>
-    <string name="zen_mode_screen_off" msgid="5026854939192419879">"画面が OFF のときにブロックする"</string>
-    <string name="zen_mode_screen_off_summary" msgid="6490932947651798094">"マナーモードでサイレントに設定した通知を受信したときに、画面が ON になったり光が点滅したりしなくなります"</string>
-    <string name="zen_mode_screen_off_summary_no_led" msgid="3758698381956461866">"マナーモードでサイレントに設定した通知を受信したときに画面が ON にならなくなります"</string>
-    <string name="zen_mode_all_visual_interruptions" msgid="2851308980832487411">"OFF"</string>
-    <string name="zen_mode_screen_on_visual_interruptions" msgid="7373348148129140528">"画面が ON のとき"</string>
-    <string name="zen_mode_screen_off_visual_interruptions" msgid="4850792880144382633">"画面が OFF のとき"</string>
-    <string name="zen_mode_no_visual_interruptions" msgid="8742776003822778472">"画面が ON または OFF のとき"</string>
+    <string name="zen_mode_screen_on" msgid="8774571998575673502">"画面が ON のとき"</string>
+    <string name="zen_mode_screen_on_summary" msgid="5385338884695802115">"マナーモードでサイレントに設定した通知を受信したときに、画面にポップアップ表示されます"</string>
+    <string name="zen_mode_screen_off" msgid="3144446765110327937">"画面が OFF のとき"</string>
+    <string name="zen_mode_screen_off_summary" msgid="7430034620565812258">"マナーモードでサイレントに設定した通知を受信したときに、画面が ON になり、光が点滅します"</string>
+    <string name="zen_mode_screen_off_summary_no_led" msgid="2826121465026642017">"マナーモードでサイレントに設定した通知を受信したときに、画面が ON になります"</string>
     <string name="notification_app_settings_button" msgid="6685640230371477485">"通知設定"</string>
+    <string name="suggestion_button_text" msgid="3275010948381252006">"OK"</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">"ON"</string>
@@ -3055,7 +3116,7 @@
     <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_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>
@@ -3069,7 +3130,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>
@@ -3172,7 +3233,7 @@
     <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">
@@ -3209,7 +3270,7 @@
     <string name="usb_use_power_only_desc" msgid="3461232831015575152">"接続されている端末を充電します。USB 充電に対応している端末でのみ選択できます。"</string>
     <string name="usb_use_file_transfers" msgid="7409600791007250137">"ファイルを転送する"</string>
     <string name="usb_use_file_transfers_desc" msgid="4235764784331804488">"ファイルを別の端末に転送します"</string>
-    <string name="usb_use_photo_transfers" msgid="7794775645350330454">"写真の転送（PTP）"</string>
+    <string name="usb_use_photo_transfers" msgid="7794775645350330454">"写真を転送する（PTP）"</string>
     <string name="usb_use_photo_transfers_desc" msgid="2963034811151325996">"写真を転送またはMTPがサポートされない場合にファイルを転送する（PTP）"</string>
     <string name="usb_use_MIDI" msgid="870922185938298263">"この端末を MIDI として利用する"</string>
     <string name="usb_use_MIDI_desc" msgid="8473936990076693175">"この端末を MIDI として利用する際に使用します"</string>
@@ -3220,6 +3281,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="sms_mirroring_pref" msgid="6475043279147376031">"SMS ミラーリング"</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>
@@ -3276,7 +3338,7 @@
     <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="app_permission_summary_allowed" msgid="1505409933012886711">"許可"</string>
-    <string name="app_permission_summary_not_allowed" msgid="2592617058101882802">"不許可"</string>
+    <string name="app_permission_summary_not_allowed" msgid="2592617058101882802">"許可しない"</string>
     <string name="keywords_install_other_apps" msgid="761078076051006558">"インストール アプリ 不明 提供元"</string>
     <string name="write_settings" msgid="4797457275727195681">"システム設定の変更"</string>
     <string name="keywords_write_settings" msgid="6415597272561105138">"書き込み 変更 システム設定"</string>
@@ -3286,7 +3348,7 @@
     <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="permit_write_settings" msgid="658555006453212691">"システム設定の変更の許可"</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>
@@ -3352,7 +3414,7 @@
     <string name="condition_hotspot_title" msgid="7778958849468560027">"アクセス ポイントが ON"</string>
     <string name="condition_hotspot_summary" msgid="3433182779269409683">"ポータブル Wi-Fi アクセス ポイント（<xliff:g id="ID_1">%1$s</xliff:g>）が有効です。この端末では Wi-Fi が OFF になっています。"</string>
     <string name="condition_airplane_title" msgid="287356299107070503">"機内モードが ON"</string>
-    <string name="condition_airplane_summary" msgid="5561586417832393666">"Wi-Fi、Bluetooth、モバイル ネットワークが OFF になっています。電話の発信やインターネットへの接続はできません。"</string>
+    <string name="condition_airplane_summary" msgid="3738805058182535606">"Wi-Fi、Bluetooth、モバイル ネットワークが OFF になっています。電話の発信やインターネットへの接続はできません。"</string>
     <string name="condition_zen_title" msgid="2679168532600816392">"マナーモードが ON（<xliff:g id="ID_1">%1$s</xliff:g>）"</string>
     <string name="condition_battery_title" msgid="3272131008388575349">"バッテリー セーバー ON"</string>
     <string name="condition_battery_summary" msgid="4418839236027977450">"パフォーマンスが制限されています。位置情報サービスとバックグラウンド データは OFF です。"</string>
@@ -3381,9 +3443,10 @@
     <string name="color_temperature" msgid="2070126836910615605">"寒色の色温度"</string>
     <string name="color_temperature_desc" msgid="4793729830226404052">"寒色の表示色を使用します"</string>
     <string name="color_temperature_toast" msgid="4974218172133854827">"色の変更を適用するには、画面を OFF にしてください"</string>
-    <string name="telephony_monitor_toast" msgid="7003764250271195384">"Telephony Monitor の変更を適用するには、端末を再起動してください"</string>
-    <string name="camera_hal_hdrplus_switch" msgid="8377365197105267466">"カメラ HAL HDR+"</string>
-    <string name="camera_hal_hdrplus_toast" msgid="2063703797270055299">"カメラ HAL HDR+ の変更を適用するには、端末を再起動してください"</string>
+    <string name="connectivity_monitor_switch" msgid="9059759348648583421">"ConnectivityMonitor"</string>
+    <string name="connectivity_monitor_switch_summary" msgid="2828658652378866401">"ConnectivityMonitor は、接続の問題が検出されたときにログを収集し、バグを報告するようユーザーに通知を表示します"</string>
+    <string name="connectivity_monitor_toast" msgid="5551859612881173028">"ConnectivityMonitor の変更を適用するには、端末を再起動してください"</string>
+    <string name="camera_laser_sensor_switch" msgid="8913588990743234440">"カメラのレーザー センサー"</string>
     <string name="ota_disable_automatic_update" msgid="2319639631655915050">"自動システム アップデート"</string>
     <string name="usage" msgid="2977875522080448986">"使用量"</string>
     <string name="cellular_data_usage" msgid="2155683719898158203">"モバイルデータ使用"</string>
@@ -3409,7 +3472,7 @@
     <string name="data_warning" msgid="209133958008062117">"データ警告"</string>
     <string name="set_data_limit" msgid="2901526323210516923">"データ上限の設定"</string>
     <string name="data_limit" msgid="1885406964934590552">"データ上限"</string>
-    <string name="data_usage_template" msgid="392191945602400904">"<xliff:g id="ID_1">%1$s</xliff:g> 使用（<xliff:g id="ID_2">%2$s</xliff:g>）"</string>
+    <string name="data_usage_template" msgid="2923744765873163859">"<xliff:g id="ID_1">%1$s</xliff:g> 使用（<xliff:g id="ID_2">%2$s</xliff:g>）"</string>
     <string name="configure" msgid="1029654422228677273">"設定"</string>
     <string name="data_usage_other_apps" msgid="3272872663517382050">"データ使用量に含まれている他のアプリ"</string>
     <plurals name="data_saver_unrestricted_summary" formatted="false" msgid="2635267833484232703">
@@ -3478,7 +3541,7 @@
     <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="387052719462473500">"ロック画面に表示される情報の管理"</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="8483187649355540109">"サポートとヒント"</string>
@@ -3486,7 +3549,7 @@
     <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>
+    <string name="bluetooth_disabled" msgid="6244000672828617410">"OFF"</string>
     <string name="bluetooth_connected_summary" msgid="7672528674593152862">"<xliff:g id="ID_1">%1$s</xliff:g> に接続しました"</string>
     <string name="bluetooth_connected_multiple_devices_summary" msgid="9173661896296663932">"複数のデバイスに接続しました"</string>
     <string name="demo_mode" msgid="2798762752209330277">"システム UI デモモード"</string>
@@ -3532,13 +3595,6 @@
       <item quantity="one">1秒</item>
     </plurals>
     <string name="support_estimated_wait_time" msgid="6523081420029378051">"～<xliff:g id="ESTIMATE">%1$s</xliff:g>（予想待ち時間）"</string>
-    <string name="bluetooth_talkback_computer" msgid="4875089335641234463">"コンピュータ"</string>
-    <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>
-    <string name="bluetooth_talkback_input_peripheral" msgid="5165842622743212268">"入力用周辺機器"</string>
-    <string name="bluetooth_talkback_bluetooth" msgid="5615463912185280812">"Bluetooth"</string>
     <string name="automatic_storage_manager_settings" msgid="7819434542155181607">"ストレージの管理"</string>
     <string name="automatic_storage_manager_text" msgid="4562950476680600604">"ストレージの空き容量を増やすため、ストレージ マネージャはバックアップした写真や動画をお使いの端末から削除します。"</string>
     <string name="automatic_storage_manager_days_title" msgid="2017913896160914647">"写真と動画を削除"</string>
@@ -3573,6 +3629,7 @@
     <string name="ambient_display_pickup_summary" product="device" msgid="8256669101643381568">"時刻、通知アイコンなどの情報を確認するには、端末を持ち上げます。"</string>
     <string name="ambient_display_pickup_suggestion_summary" msgid="7014700589991761035">"画面が OFF のときも通知を確認します"</string>
     <string name="fingerprint_swipe_for_notifications_title" msgid="5816346492253270243">"指紋センサーをスワイプして通知を表示"</string>
+    <string name="fingerprint_gesture_screen_title" msgid="8562169633234041196">"指紋センサーのスワイプ"</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>
@@ -3581,14 +3638,15 @@
     <string name="gesture_setting_on" msgid="3455094265233870280">"ON"</string>
     <string name="gesture_setting_off" msgid="5230169535435881894">"OFF"</string>
     <string name="oem_unlock_enable_disabled_summary_bootloader_unlocked" msgid="4265541229765635629">"ブートローダーは既にロック解除されています"</string>
-    <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" msgid="3361344735430813695">"最初にインターネットに接続してください"</string>
+    <string name="oem_unlock_enable_disabled_summary_connectivity_or_locked" msgid="2479038689567925511">"インターネットに接続するか携帯通信会社にお問い合わせください"</string>
     <string name="oem_unlock_enable_disabled_summary_sim_locked_device" msgid="4149387448213399630">"携帯通信会社によってロックされている端末では利用できません"</string>
+    <string name="oem_lock_info_message" msgid="9218313722236417510">"端末保護機能を有効にするには、端末を再起動してください。"</string>
     <string name="automatic_storage_manager_freed_bytes" msgid="7517560170441007788">"計 <xliff:g id="SIZE">%1$s</xliff:g> が利用可能になりました\n\n最終実行: <xliff:g id="DATE">%2$s</xliff:g>"</string>
     <string name="web_action_enable_title" msgid="4051513950976670853">"Instant Apps"</string>
     <string name="web_action_enable_summary" msgid="3108127559723396382">"アプリがインストールされていなくても、アプリ内のリンクを開くことができます"</string>
     <string name="web_action_section_title" msgid="7364647086538399136">"Instant Apps"</string>
-    <string name="instant_apps_account" msgid="1433620209791992528">"Instant Apps アカウント"</string>
+    <string name="instant_apps_settings" msgid="8827777916518348213">"Instant Apps の設定"</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>
@@ -3635,7 +3693,9 @@
     <string name="enterprise_privacy_always_on_vpn_personal" msgid="9217774730260037434">"個人プロフィールで常時接続 VPN は ON です"</string>
     <string name="enterprise_privacy_always_on_vpn_work" msgid="7244472958208315814">"仕事用プロファイルで常時接続 VPN は ON です"</string>
     <string name="enterprise_privacy_global_http_proxy" msgid="7936664553416257333">"グローバル HTTP プロキシが設定されています"</string>
-    <string name="enterprise_privacy_ca_certs" msgid="5885892204903688909">"信頼できる認証情報"</string>
+    <string name="enterprise_privacy_ca_certs_device" msgid="2019652712782510262">"信頼できる認証情報"</string>
+    <string name="enterprise_privacy_ca_certs_personal" msgid="2279084820904076599">"個人用プロファイル内の信頼できる認証情報"</string>
+    <string name="enterprise_privacy_ca_certs_work" msgid="6187377647815301809">"仕事用プロファイル内の信頼できる認証情報"</string>
     <plurals name="enterprise_privacy_number_ca_certs" formatted="false" msgid="526375234629534165">
       <item quantity="other">CA 証明書: <xliff:g id="COUNT_1">%d</xliff:g> 件以上</item>
       <item quantity="one">CA 証明書: <xliff:g id="COUNT_0">%d</xliff:g> 件以上</item>
@@ -3689,6 +3749,8 @@
     <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="show_operator_name_title" msgid="805135053530442951">"ネットワーク名"</string>
+    <string name="show_operator_name_summary" msgid="5962567590205757550">"ステータスバーにネットワーク名を表示する"</string>
     <string name="storage_manager_indicator" msgid="1516810749625915020">"ストレージ マネージャ: <xliff:g id="STATUS">^1</xliff:g>"</string>
     <string name="storage_manager_indicator_off" msgid="7488057587180724388">"OFF"</string>
     <string name="storage_manager_indicator_on" msgid="8625551710194584733">"ON"</string>
@@ -3698,6 +3760,8 @@
     <string name="carrier_provisioning" msgid="4398683675591893169">"携帯通信会社のプロビジョニング情報"</string>
     <string name="trigger_carrier_provisioning" msgid="3434865918009286187">"携帯通信会社のプロビジョニングをトリガー"</string>
     <string name="new_device_suggestion_title" msgid="698847081680980774">"注目の新機能"</string>
-    <string name="new_device_suggestion_summary" msgid="7172709269203435870">"5 つの優れた機能をご覧ください"</string>
+    <string name="new_device_suggestion_summary" product="default" msgid="206396571522515855">"新しいスマートフォンの使い方をご紹介します"</string>
+    <string name="new_device_suggestion_summary" product="tablet" msgid="393751455688210956">"新しいタブレットの使い方をご紹介します"</string>
+    <string name="new_device_suggestion_summary" product="device" msgid="2939870049868336652">"新しい端末の使い方をご紹介します"</string>
     <string name="disabled_low_ram_device" msgid="3751578499721173344">"この機能は、お使いの端末ではご利用いただけません"</string>
 </resources>
diff --git a/res/values-ka/arrays.xml b/res/values-ka/arrays.xml
index 1cc501a..d107178 100644
--- a/res/values-ka/arrays.xml
+++ b/res/values-ka/arrays.xml
@@ -100,8 +100,6 @@
     <!-- no translation found for wifi_security_no_eap:0 (2084555984818107151) -->
     <!-- no translation found for wifi_security_no_eap:1 (397579322683471524) -->
     <!-- no translation found for wifi_security_no_eap:2 (1968820975358150484) -->
-    <!-- no translation found for wifi_ap_security:0 (5251664683198623324) -->
-    <!-- no translation found for wifi_ap_security:1 (7989073072260294673) -->
   <string-array name="wifi_eap_method">
     <item msgid="1160193392455075561">"PEAP"</item>
     <item msgid="7981731051382306293">"TLS"</item>
@@ -174,7 +172,7 @@
     <item msgid="8926455723452645935">"AKA\'"</item>
   </string-array>
   <string-array name="wifi_phase2_entries">
-    <item msgid="1818786254010764570">"არც ერთი"</item>
+    <item msgid="1818786254010764570">"არცერთი"</item>
     <item msgid="6189918678874123056">"PAP"</item>
     <item msgid="1524112260493662517">"MSCHAP"</item>
     <item msgid="5923246669412752932">"MSCHAPV2"</item>
diff --git a/res/values-ka/strings.xml b/res/values-ka/strings.xml
index c09506b..da28507 100644
--- a/res/values-ka/strings.xml
+++ b/res/values-ka/strings.xml
@@ -166,7 +166,7 @@
     <string name="bluetooth_map_acceptance_dialog_text" msgid="8712508202081143737">"%1$s-ს უნდა თქვენს შეტყობინებებზე წვდომა. მისცემთ %2$s-ს წვდომას?"</string>
     <string name="bluetooth_sap_request" msgid="2669762224045354417">"SIM-ზე წვდომის მოთხოვნა"</string>
     <string name="bluetooth_sap_acceptance_dialog_text" msgid="4414253873553608690">"<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g>-ს სურს თქვენს SIM ბარათზე წვდომა. SIM ბარათზე წვდომის დაშვება კავშირის განმავლობაში გათიშავს მონაცემთა გადაცემას მოწყობილობაზე. <xliff:g id="DEVICE_NAME_1">%2$s?</xliff:g>-ისთვის წვდომის მიცემა"</string>
-    <string name="bluetooth_device_name_summary" msgid="4757990010751789977">"სხვა მოწყობილობებისთვის ჩანს, როგორც <xliff:g id="DEVICE_NAME">^1</xliff:g>"</string>
+    <string name="bluetooth_device_name_summary" msgid="522235742194965734">"სხვა მოწყობილობებისთვის ჩანს, როგორც „<xliff:g id="DEVICE_NAME">^1</xliff:g>“"</string>
     <string name="bluetooth_paired_device_title" msgid="8638994696317952019">"თქვენი მოწყობილობები"</string>
     <string name="bluetooth_pairing_page_title" msgid="7712127387361962608">"ახალი მოწყობილობის დაწყვილება"</string>
     <string name="date_and_time" msgid="9062980487860757694">"თარიღი და დრო"</string>
@@ -312,6 +312,8 @@
     <string name="zone_auto" msgid="334783869352026648">"ავტომატური დროის ზონა"</string>
     <string name="zone_auto_summaryOn" msgid="6142830927278458314">"ქსელის მოწოდებული დროის სარტყელის გამოყენება"</string>
     <string name="zone_auto_summaryOff" msgid="2597745783162041390">"ქსელით მოწოდებული დროის სარტყელის გამოყენება"</string>
+    <string name="date_time_24hour_auto" msgid="2117383168985653422">"ავტომატური 24-საათიანი ფორმატი"</string>
+    <string name="date_time_24hour_auto_summary" msgid="6351812925651480277">"ლოკალის ნაგულისხმევი პარამეტრის გამოყენება"</string>
     <string name="date_time_24hour_title" msgid="3203537578602803850">"24-საათიანი ფორმატი"</string>
     <string name="date_time_24hour" msgid="1193032284921000063">"24-საათიანი ფორმატი"</string>
     <string name="date_time_set_time_title" msgid="6296795651349047016">"დრო"</string>
@@ -372,6 +374,9 @@
     <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="1961957425135180242">"შემდეგი"</string>
+    <string name="setup_fingerprint_enroll_skip_title" msgid="362050541117362034">"გსურთ თითის ანაბეჭდის დაყენების გამოტოვება?"</string>
+    <string name="setup_fingerprint_enroll_skip_after_adding_lock_text" msgid="958990414356204763">"თითის ანაბეჭდის დაყენებას მხოლოდ რამდენიმე წუთი სჭირდება. თუ ამ ეტაპს გამოტოვებთ, თითის ანაბეჭდის მოგვიანებით დამატებას პარამეტრებში შეძლებთ."</string>
+    <string name="lock_screen_intro_skip_title" msgid="4988210105913705679">"ეკრანის დაბლოკვის გამოტოვება გსურთ?"</string>
     <string name="lock_screen_intro_skip_dialog_text_frp" product="tablet" msgid="1581834104051243425">"მოწყობილობის დაცვის ფუნქციები არ ჩაირთვება. ამ ტაბლეტის დაკარგვის, მოპარვის ან მისი ქარხნული პარამეტრების დაბრუნების შემთხვევაში, თქვენ ვერ შეძლებთ ხელი შეუშალოთ სხვას მის გამოყენებაში."</string>
     <string name="lock_screen_intro_skip_dialog_text_frp" product="device" msgid="4629503416877189572">"მოწყობილობის დაცვის ფუნქციები არ ჩაირთვება. ამ მოწყობილობის დაკარგვის, მოპარვის ან მისი ქარხნული პარამეტრების დაბრუნების შემთხვევაში, თქვენ ვერ შეძლებთ ხელი შეუშალოთ სხვას მის გამოყენებაში."</string>
     <string name="lock_screen_intro_skip_dialog_text_frp" product="default" msgid="2423428240245737909">"მოწყობილობის დაცვის ფუნქციები არ ჩაირთვება. ამ ტელეფონის დაკარგვის, მოპარვის ან მისი ქარხნული პარამეტრების დაბრუნების შემთხვევაში, თქვენ ვერ შეძლებთ ხელი შეუშალოთ სხვას მის გამოყენებაში."</string>
@@ -421,11 +426,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>
@@ -457,7 +462,7 @@
     <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="lock_settings_picker_fingerprint_added_security_message" msgid="5768002109707648463">"დამატებითი უსაფრთხოებისთვის, დააყენეთ ეკრანის დაბლოკვის სარეზერვო მეთოდი."</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>
@@ -588,6 +593,7 @@
     <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="lockpassword_clear_label" msgid="5724429464960458155">"გასუფთავება"</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>
@@ -740,7 +746,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>
@@ -781,6 +787,7 @@
     <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,6 +824,8 @@
     <string name="wifi_wps_available_first_item" msgid="4422547079984583502">"ხელმისაწვდომია WPS"</string>
     <string name="wifi_wps_available_second_item" msgid="8427520131718215301">" (WPS ხელმისაწვდომია)"</string>
     <string name="wifi_wps_nfc_enter_password" msgid="2288214226916117159">"შეიყვანეთ თქვენი ქსელის პაროლი"</string>
+    <string name="wifi_carrier_connect" msgid="8174696557882299911">"ოპერატორის Wi‑Fi ქსელი"</string>
+    <string name="wifi_carrier_content" msgid="4634077285415851933">"<xliff:g id="NAME">%1%s</xliff:g>-ით დაკავშირება"</string>
     <string name="wifi_scan_always_turnon_message" msgid="203123538572122989">"მდებარეობის ზუსტი განსაზღვრის და სხვა ფუნქციების გასაუმჯობესებლად <xliff:g id="APP_NAME">%1$s</xliff:g>-ს სურს, გააქტიურდეს ქსელების მოძიება, მაშინაც კი, როცა გამორთულია Wi-Fi.\n\nმიეცეს ამის უფლება ყველა აპს?"</string>
     <string name="wifi_scan_always_turnoff_message" msgid="5538901671131941043">"ამის გამოსართავად, მოინახულეთ გაფართოებული სექცია გადავსების მენიუში."</string>
     <string name="wifi_scan_always_confirm_allow" msgid="5355973075896817232">"ნებართვა"</string>
@@ -834,6 +843,7 @@
     <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_modify" msgid="6100248070440710782">"შეცვლა"</string>
     <string name="wifi_failed_forget_message" msgid="1348172929201654986">"ქსელის დავიწყება ვერ მოხერხდა"</string>
     <string name="wifi_save" msgid="3331121567988522826">"შენახვა"</string>
     <string name="wifi_failed_save_message" msgid="6650004874143815692">"ქსელის შენახვა ვერ მოხერხდა"</string>
@@ -846,6 +856,7 @@
     <string name="wifi_advanced_titlebar" msgid="4485841401774142908">"გაუმჯობესებული 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_title" msgid="3471132676909349382">"ქსელის ინფორმაცია"</string>
     <string name="wifi_details_subnet_mask" msgid="6720279144174924410">"ქვექსელის ნიღაბი"</string>
     <string name="wifi_details_dns" msgid="8648826607751830768">"DNS"</string>
     <string name="wifi_details_ipv6_address_header" msgid="6734119149106422148">"IPv6 მისამართები"</string>
@@ -878,16 +889,15 @@
     <string name="wifi_p2p_cancel_connect_title" msgid="255267538099324413">"გსურთ მოწვევის გაუქმება?"</string>
     <string name="wifi_p2p_cancel_connect_message" msgid="7477756213423749402">"ნამდვილად გსურთ <xliff:g id="PEER_NAME">%1$s</xliff:g>-თან დაკავშირების მიწვევის გაუქმება?"</string>
     <string name="wifi_p2p_delete_group_message" msgid="834559380069647086">"გსურთ, ამ ჯგუფის დავიწყება?"</string>
-    <string name="wifi_tether_checkbox_text" msgid="1847167643625779136">"პორტატული Wi‑Fi-ს უსადენო ქსელი"</string>
     <string name="wifi_hotspot_checkbox_text" msgid="7763495093333664887">"Wi‑Fi უსადენო ქსელი"</string>
     <string name="wifi_hotspot_off_subtext" msgid="5466126533609394170">"არ მოხდეს ინტერნეტის ან კონტენტის სხვა მოწყობილობებთან გაზიარება"</string>
     <string name="wifi_hotspot_tethering_on_subtext" product="tablet" msgid="5752490509369962007">"ამ ტაბლეტის ინტერნეტ-კავშირი უსადენო ქსელით ზიარდება"</string>
     <string name="wifi_hotspot_tethering_on_subtext" product="default" msgid="6461075246164300670">"ამ ტელეფონის ინტერნეტ-კავშირი უსადენო ქსელით ზიარდება"</string>
     <string name="wifi_hotspot_on_local_only_subtext" msgid="2068110388011294735">"აპი კონტენტს აზიარებს. ინტერნეტ-კავშირის გასაზიარებლად, ჯერ გამორთეთ, შემდეგ კი ხელახლა ჩართეთ უსადენო ქსელი"</string>
-    <string name="wifi_hotspot_name_title" msgid="1341735529132128887">"Wi‑Fi-ს სახელი"</string>
+    <string name="wifi_hotspot_name_title" msgid="8237000746618636778">"უსადენო ქსელის სახელი"</string>
     <string name="wifi_hotspot_name_summary_connecting" msgid="3378299995508671967">"მიმდინარეობს <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>-ის ჩართვა…"</string>
     <string name="wifi_hotspot_name_summary_connected" msgid="3888672084861445362">"სხვა მოწყობილობებს შეუძლია <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>-თან დაკავშირება"</string>
-    <string name="wifi_hotspot_password_title" msgid="1955592302902091281">"Wi-Fi-ს პაროლი"</string>
+    <string name="wifi_hotspot_password_title" msgid="8676859981917573801">"უსადენო ქსელის პაროლი"</string>
     <string name="wifi_hotspot_ap_band_title" msgid="1165801173359290681">"AP Band"</string>
     <string name="wifi_hotspot_footer_info_regular" msgid="1203489406068036455">"გამოიყენეთ უსადენო ქსელი თქვენი სხვა მოწყობილობებისთვის Wi‑Fi ქსელის შესაქმნელად. უსადენო ქსელი ინტერნეტზე წვდომას უზრუნველყოფს თქვენი მობილური ინტერნეტ-კავშირის მეშვეობით. შედეგად, შესაძლოა დაგეკისროთ მობილური ინტერნეტის შესაბამისი გადასახადები."</string>
     <string name="wifi_hotspot_footer_info_local_only" msgid="857988412470694109">"აპებს შეუძლიათ უსადენო ქსელის შექმნა, რათა გაუზიარონ კონტენტი ახლომდებარე მოწყობილობებს."</string>
@@ -898,7 +908,6 @@
     <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">"დარეკვა Wi-Fi-ს მეშვეობით"</string>
     <string name="wifi_calling_suggestion_title" msgid="9008010480466359578">"Wi-Fi დარეკვის ჩართვა"</string>
@@ -939,7 +948,7 @@
     <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="emergency_address_summary" msgid="3266760199681945746">"მისამართი, რომელსაც გადაუდებელი ზარის Wi-Fi-ს მეშვეობით განხორციელებისას, საგანგებო სამსახურები თქვენი მდებარეობის დასადგენად გამოიყენებს"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"ეკრანი"</string>
     <string name="sound_settings" msgid="5534671337768745343">"ხმა"</string>
     <string name="all_volume_title" msgid="4296957391257836961">"ხმის კონტროლი"</string>
@@ -993,6 +1002,7 @@
     <string name="search_settings" msgid="1910951467596035063">"ძიება"</string>
     <string name="search_settings_summary" msgid="9205656546570654169">"ძიების პარამეტრებისა და ისტორიის მართვა"</string>
     <string name="search_settings_no_results" msgid="8799027492641230999">"შედეგები არ არის"</string>
+    <string name="search_clear_history" msgid="4196658962573162457">"ისტორიის გასუფთავება"</string>
     <string name="display_settings" msgid="7965901687241669598">"ეკრანი"</string>
     <string name="accelerometer_title" msgid="7854608399547349157">"ავტოროტაციის ეკრანი"</string>
     <string name="color_mode_title" msgid="3159275920408338215">"მკვეთრი ფერები"</string>
@@ -1041,7 +1051,7 @@
     <string name="night_display_summary_on_auto_mode_twilight" msgid="852270120144683507">"ავტომატურად გამოირთვება მზის ამოსვლისას"</string>
     <string name="screen_timeout" msgid="4351334843529712571">"ძილი"</string>
     <string name="screen_timeout_title" msgid="5130038655092628247">"ეკრანი გამოირთვება"</string>
-    <string name="screen_timeout_summary" msgid="327761329263064327">"<xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> განმავლობაში უმოქმედობის შემდეგ"</string>
+    <string name="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>
@@ -1049,9 +1059,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>
@@ -1065,7 +1075,7 @@
     <string name="ambient_display_screen_title" msgid="4252755516328775766">"ემბიენტური ეკრანი"</string>
     <string name="ambient_display_screen_summary_always_on" msgid="7337555569694794132">"ყოველთვის ჩართული / ბატარეის მოხმარება გაიზრდება"</string>
     <string name="ambient_display_screen_summary_notifications" msgid="1449570742600868654">"ახალი შეტყობინებები"</string>
-    <string name="ambient_display_category_triggers" msgid="4359289754456268573">"ჩვენების წესები"</string>
+    <string name="ambient_display_category_triggers" msgid="4359289754456268573">"ჩვენების დრო"</string>
     <string name="doze_title" msgid="2375510714460456687">"ახალი შეტყობინებები"</string>
     <string name="doze_summary" msgid="3846219936142814032">"ეკრანის გამოღვიძება შეტყობინებების მიღებისას"</string>
     <string name="doze_always_on_title" msgid="1046222370442629646">"ყოველთვის ჩართული"</string>
@@ -1122,11 +1132,10 @@
     <string name="baseband_version" msgid="1848990160763524801">"Baseband-ის ვერსია"</string>
     <string name="kernel_version" msgid="9192574954196167602">"kernel-ის ვერსია"</string>
     <string name="build_number" msgid="3075795840572241758">"ანაწყობის ნომერი"</string>
-    <string name="selinux_status" msgid="6212165375172061672">"SELinux სტატუსი"</string>
     <string name="device_info_not_available" msgid="8062521887156825182">"მიუწვდომელი"</string>
     <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>
@@ -1150,7 +1159,6 @@
     <string name="status_wifi_mac_address" msgid="2202206684020765378">"Wi‑Fi MAC მისამართი"</string>
     <string name="status_bt_address" msgid="4195174192087439720">"Bluetooth მისამართი"</string>
     <string name="status_serial_number" msgid="2257111183374628137">"სერიული ნომერი"</string>
-    <string name="status_unavailable" msgid="7862009036663793314">"მიუწვდომელია"</string>
     <string name="status_up_time" msgid="7294859476816760399">"მუშაობის დრო"</string>
     <string name="status_awake_time" msgid="2393949909051183652">"მუშაობის დრო"</string>
     <string name="internal_memory" msgid="9129595691484260784">"შიდა მეხსიერება"</string>
@@ -1326,6 +1334,7 @@
     <string name="menu_restore" msgid="8260067415075573273">"საწყის პარამეტრებზე ჩამოყრა"</string>
     <string name="restore_default_apn_completed" msgid="2824775307377604897">"ნაგულისხმევი APN პარამეტრების  აღდგენა დასრულებულია"</string>
     <string name="reset_dashboard_title" msgid="6254873816990678620">"გადაყენების ვარიანტები"</string>
+    <string name="reset_dashboard_summary" msgid="4851012632493522755">"შესაძლებელია ქსელის, აპების ან მოწყობილობის გადაყენება"</string>
     <string name="reset_network_title" msgid="6166025966016873843">"Wi-Fi-ს, მობილური ინტერნეტის და Bluetooth კავშირის გადაყენება"</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>
@@ -1334,17 +1343,14 @@
     <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="6617679904229218425">"ყველა მონაცემის ამოშლა (ქარხნული პარამეტრების დაბრუნება)"</string>
-    <plurals name="master_clear_with_account_summary" formatted="false" msgid="5911377203778818712">
-      <item quantity="other"><xliff:g id="ACCOUNT_COUNT">%1$d</xliff:g> ანგარიში გადაყენდება</item>
-      <item quantity="one">1 ანგარიში გადაყენდება</item>
-    </plurals>
-    <string name="master_clear_summary" msgid="6902443944660426951">"შიდა მეხსიერება და ყველა მონაცემი გადაყენდება"</string>
+    <string name="master_clear_title" msgid="3531267871084279512">"ყველა მონაცემის ამოშლა (ქარხნული პარამეტრების დაბრუნება)"</string>
     <string name="master_clear_desc" product="tablet" msgid="9146059417023157222">"ეს მოქმედება წაშლის ყველა მონაცემებს თქვენი ტაბლეტის "<b>"შიდა მეხსიერებიდან"</b>", მათ შორის:\n\n"<li>"თქვენს Google-ის ანგარიშს"</li>\n<li>"სისტემისა და აპების მონაცემებს და პარამეტრებს"</li>\n<li>"ჩამოტვირთულ აპებს"</li></string>
     <string name="master_clear_desc" product="default" msgid="4800386183314202571">"ეს მოქმედება წაშლის ყველა მონაცემებს თქვენი ტელეფონის "<b>"შიდა მეხსიერებიდან"</b>", მათ შორის:\n\n"<li>"თქვენს Google-ის ანგარიშს"</li>\n<li>"სისტემისა და აპების მონაცემებს და პარამეტრებს"</li>\n<li>"ჩამოტვირთულ აპებს"</li></string>
     <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"ამჟამად შესული ხართ შემდეგ ანგარიშებში:\n"</string>
     <string name="master_clear_other_users_present" product="default" msgid="5161423070702470742">\n\n" ამ მოწყობილობაზე წარმოდგენილია სხვა მომხმარებლები. \n"</string>
     <string name="master_clear_desc_also_erases_external" msgid="1903185203791274237"><li>"მუსიკა"</li>\n<li>"ფოტოები"</li>\n<li>"მომხმარებლის სხვა მონაცემები"</li></string>
+    <string name="master_clear_desc_also_erases_esim" msgid="312352697653096008"><li>"ოპერატორები eSIM-ზე"</li></string>
+    <string name="master_clear_desc_no_cancel_mobile_plan" msgid="5460926449093211144">\n\n"ეს არ გააუქმებს თქვენს მობილურ სერვისთა პაკეტს."</string>
     <string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="7744115866662613411">\n\n"მუსიკის, ფოტოების და მომხმარებლის სხვა მონაცემების წასაშლელად საჭიროა "<b>"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>
@@ -1365,20 +1371,20 @@
     <string name="master_clear_progress_text" msgid="6559096229480527510">"გთხოვთ, დაელოდოთ..."</string>
     <string name="call_settings_title" msgid="5188713413939232801">"დარეკვის პარამეტრები"</string>
     <string name="call_settings_summary" msgid="7291195704801002886">"ხმოვანი ფოსტის, ზარის გადამისამართების, ზარის დალოდების, დამრეკავის ID-ის დაყენება"</string>
-    <string name="tether_settings_title_usb" msgid="6688416425801386511">"USB მოდემი"</string>
+    <string name="tether_settings_title_usb" msgid="6688416425801386511">"USB ტეტერინგი"</string>
     <string name="tether_settings_title_wifi" msgid="3277144155960302049">"პორტატული უსადენო ქსელი"</string>
-    <string name="tether_settings_title_bluetooth" msgid="355855408317564420">"Bluetooth-მოდემი"</string>
-    <string name="tether_settings_title_usb_bluetooth" msgid="5355828977109785001">"მოდემის რეჟიმი"</string>
+    <string name="tether_settings_title_bluetooth" msgid="355855408317564420">"Bluetooth ტეტერინგი"</string>
+    <string name="tether_settings_title_usb_bluetooth" msgid="5355828977109785001">"ტეტერინგი"</string>
     <string name="tether_settings_title_all" msgid="3058586928118801157">"უსადენო ქსელი და ტეტერინგი"</string>
     <string name="tether_settings_summary_hotspot_on_tether_on" msgid="930464462687425777">"უსადენო ქსელი ჩართულია, ტეტერინგი"</string>
     <string name="tether_settings_summary_hotspot_on_tether_off" msgid="3473671453891735907">"უსადენო ქსელი ჩართულია"</string>
     <string name="tether_settings_summary_hotspot_off_tether_on" msgid="1618256180720077354">"ტეტერინგი"</string>
     <string name="tether_settings_disabled_on_data_saver" msgid="1576908608463904152">"ტეტერინგის ან პორტატული უსადენო ქსელის გამოყენება ვერ მოხერხდება, როცა მონაცემთა დამზოგველი ჩართულია"</string>
     <string name="usb_title" msgid="7483344855356312510">"USB"</string>
-    <string name="usb_tethering_button_text" msgid="585829947108007917">"USB მოდემი"</string>
+    <string name="usb_tethering_button_text" msgid="585829947108007917">"USB ტეტერინგი"</string>
     <string name="usb_tethering_subtext" product="default" msgid="5991482890033484794">"ტელეფონის ინტერნეტ-კავშირის USB-ის მეშვეობით გაზიარება"</string>
     <string name="usb_tethering_subtext" product="tablet" msgid="5988796139573211318">"ტაბლეტის ინტერნეტ-კავშირის USB-ის მეშვეობით გაზიარება"</string>
-    <string name="bluetooth_tether_checkbox_text" msgid="2379175828878753652">"Bluetooth-მოდემი"</string>
+    <string name="bluetooth_tether_checkbox_text" msgid="2379175828878753652">"Bluetooth ტეტერინგი"</string>
     <string name="bluetooth_tethering_subtext" product="tablet" msgid="4558227863463153412">"ტაბლეტის ინტერნეტ-კავშირის Bluetooth-ით გაზიარება"</string>
     <string name="bluetooth_tethering_subtext" product="default" msgid="1055197887836203595">"ტელეფონის ინტერნეტ-კავშირის Bluetooth-ით გაზიარება"</string>
     <string name="bluetooth_tethering_off_subtext_config" msgid="6326877798974938021">"ეს <xliff:g id="DEVICE_NAME">%1$d</xliff:g> ინტერნეტ-კავშირს Bluetooth-ით აზიარებს"</string>
@@ -1461,15 +1467,16 @@
     <string name="settings_safetylegal_activity_title" msgid="6901214628496951727">"ინფორმაცია უსაფრთხოების შესახებ"</string>
     <string name="settings_safetylegal_activity_unreachable" msgid="250674109915859456">"თქვენ არ გაქვთ ინტერნეტ კავშირი. ამ ინფორმაციის სანახავად ახლავე, გადადით %s-ზე ინტერნეტში ჩართული ნებისმიერი კომპიუტერიდან."</string>
     <string name="settings_safetylegal_activity_loading" msgid="8059022597639516348">"იტვირთება…"</string>
-    <string name="lockpassword_choose_your_password_header" msgid="8624900666929394990">"აირჩიეთ პაროლი"</string>
-    <string name="lockpassword_choose_your_password_header_for_fingerprint" msgid="6624409510609085450">"თითის ანაბეჭდის გამოსაყენებლად დააყენეთ პაროლი"</string>
-    <string name="lockpassword_choose_your_pattern_header" msgid="6949761069941694050">"აირჩიეთ გრაფიკული გასაღები"</string>
-    <string name="lockpassword_choose_your_pattern_header_for_fingerprint" msgid="5901096361617543819">"თითის ანაბეჭდის გამოსაყენებლად დააყენეთ ნიმუში"</string>
-    <string name="lockpassword_choose_your_pin_header" msgid="7598849519816138302">"თქვენი PIN-ის არჩევა"</string>
-    <string name="lockpassword_choose_your_pin_header_for_fingerprint" msgid="765344692615917183">"თითის ანაბეჭდის გამოსაყენებლად დააყენეთ PIN-კოდი"</string>
-    <string name="lockpassword_confirm_your_password_header" msgid="6308478184889846633">"დაადასტურეთ პაროლი"</string>
+    <string name="lockpassword_choose_your_screen_lock_header" msgid="3872462096767152394">"ეკრანის დაბლოკვის მეთოდის დაყენება"</string>
+    <string name="lockpassword_choose_your_password_message" msgid="1197569283524841412">"უსაფრთხოებისთვის, დააყენეთ პაროლი"</string>
+    <string name="lockpassword_choose_your_password_header_for_fingerprint" msgid="2541818487015343503">"თითის ანაბეჭდისთვის დააყენეთ პაროლი"</string>
+    <string name="lockpassword_choose_your_pattern_header_for_fingerprint" msgid="7709785406243556723">"თითის ანაბეჭდისთვის დააყენეთ ნიმუში"</string>
+    <string name="lockpassword_choose_your_pin_message" msgid="1875420718677275646">"უსაფრთხოებისთვის, დააყენეთ PIN-კოდი"</string>
+    <string name="lockpassword_choose_your_pin_header_for_fingerprint" msgid="1549639053195796674">"თითის ანაბეჭდის გამოსაყენებლად, დააყენეთ PIN-კოდი"</string>
+    <string name="lockpassword_choose_your_pattern_message" msgid="5986983400689720015">"უსაფრთხოებისთვის, დააყენეთ განსაბლოკი ნიმუში"</string>
+    <string name="lockpassword_confirm_your_password_header" msgid="1266027268220850931">"ხელახლა შეიყვანეთ თქვენი პაროლი"</string>
     <string name="lockpassword_confirm_your_pattern_header" msgid="7543433733032330821">"დაადასტურეთ ნიმუში"</string>
-    <string name="lockpassword_confirm_your_pin_header" msgid="49038294648213197">"დაადასტურეთ PIN-კოდი"</string>
+    <string name="lockpassword_confirm_your_pin_header" msgid="7744513791910572550">"ხელახლა შეიყვანეთ თქვენი PIN-კოდი"</string>
     <string name="lockpassword_confirm_passwords_dont_match" msgid="5140892109439191415">"პაროლები არ ემთხვევა"</string>
     <string name="lockpassword_confirm_pins_dont_match" msgid="7226244811505606217">"PIN-კოდები არ ემთხვევა"</string>
     <string name="lockpassword_choose_lock_generic_header" msgid="3811438094903786145">"განბლოკვის მეთოდები"</string>
@@ -1488,6 +1495,12 @@
     <string name="lockpassword_strong_auth_required_work_pattern" msgid="3003781907040522053">"დამატებითი უსაფრთხოებისთვის, გამოიყენეთ სამსახურის განმბლოკავი ნიმუში"</string>
     <string name="lockpassword_strong_auth_required_work_pin" msgid="3367491332598821552">"დამატებითი უსაფრთხოებისთვის, შეიყვანეთ სამსახურის PIN-კოდი"</string>
     <string name="lockpassword_strong_auth_required_work_password" msgid="8159775129968582940">"დამატებითი უსაფრთხოებისთვის, შეიყვანეთ სამსახურის პაროლი"</string>
+    <string name="lockpassword_confirm_your_pattern_details_frp" msgid="6757336656791723193">"თქვენი ტელეფონი ქარხნულ პარამეტრებზე დაბრუნდა. ამ ტელეფონის გამოსაყენებლად, შეიყვანეთ თქვენი წინა განმბლოკავი ნიმუში."</string>
+    <string name="lockpassword_confirm_your_pin_details_frp" msgid="826520613445990470">"თქვენი ტელეფონი ქარხნულ პარამეტრებზე დაბრუნდა. ამ ტელეფონის გამოსაყენებლად, შეიყვანეთ თქვენი წინა PIN-კოდი."</string>
+    <string name="lockpassword_confirm_your_password_details_frp" msgid="8944081074615739040">"თქვენი ტელეფონი ქარხნულ პარამეტრებზე დაბრუნდა. ამ ტელეფონის გამოსაყენებლად, შეიყვანეთ თქვენი წინა პაროლი."</string>
+    <string name="lockpassword_confirm_your_pattern_header_frp" msgid="2898036091609128286">"განმბლოკავი ნიმუშის დადასტურება"</string>
+    <string name="lockpassword_confirm_your_pin_header_frp" msgid="4141601774778898803">"PIN-კოდის დადასტურება"</string>
+    <string name="lockpassword_confirm_your_password_header_frp" msgid="3762615419295360480">"პაროლის დადასტურება"</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>
@@ -1537,7 +1550,6 @@
     <string name="install_applications_title" msgid="4987712352256508946">"აპის ყველა წყაროს დაშვება"</string>
     <string name="recent_app_category_title" msgid="6673071268966003928">"ახლახან გახსნილი აპები"</string>
     <string name="see_all_apps_title" msgid="1317153498074308438">"<xliff:g id="COUNT">%1$d</xliff:g>-ვე აპის ნახვა"</string>
-    <string name="recent_app_summary" msgid="3366446669844932300">"<xliff:g id="TIME">^1</xliff:g>-ის წინ"</string>
     <string name="install_all_warning" product="tablet" msgid="8310489909586138165">"თქვენი ტაბლეტი და პირადი მონაცემები უცნობი აპების შემოტევების წინაშე მეტად დაუცველია. აპების ამ წყაროდან ინსტალაციის შემთხვევაში, თქვენ თანახმა ხართ, პასუხისმგებელი იყოთ ამ აპების გამოყენების შედეგად ტაბლეტისთვის მიყენებულ ზიანსა და მონაცემების დაკარგვაზე."</string>
     <string name="install_all_warning" product="default" msgid="1952257127370115988">"თქვენი ტელეფონი და პირადი მონაცემები უცნობი აპების შემოტევების წინაშე მეტად დაუცველია. აპების ამ წყაროდან ინსტალაციის შემთხვევაში, თქვენ თანახმა ხართ, პასუხისმგებელი იყოთ ამ აპების გამოყენების შედეგად ტელეფონისთვის მიყენებულ ზიანსა და მონაცემების დაკარგვაზე."</string>
     <string name="advanced_settings" msgid="1777249286757067969">"დამატებითი პარამეტრები"</string>
@@ -1801,7 +1813,7 @@
     <string name="accessibility_settings_summary" msgid="981260486011624939">"ეკრანის წამკითხველები, ჩვენება, ინტერაქციის მართვის საშუალებები"</string>
     <string name="vision_settings_title" msgid="4204111425716868288">"მხედველობის პარამეტრები"</string>
     <string name="vision_settings_description" msgid="5679491180156408260">"ამ მოწყობილობის მორგება თქვენი საჭიროებების შესაბამისად შეგიძლიათ. მარტივი წვდომის ამ პარამეტრების მოგვიანებით შეცვლა პარამეტრებიდან არის შესაძლებელი."</string>
-    <string name="vision_settings_suggestion_title" msgid="917294957154878441">"შრიფტის ზომის გაზრდა"</string>
+    <string name="vision_settings_suggestion_title" msgid="8058794060304707004">"შრიფტის ზომის შეცვლა"</string>
     <string name="screen_reader_category_title" msgid="7739154903913400641">"ეკრანის წამკითხველები"</string>
     <string name="audio_and_captions_category_title" msgid="3420727114421447524">"აუდიო და ეკრანზე გამოტანილი ტექსტი"</string>
     <string name="display_category_title" msgid="685461049938269166">"ეკრანი"</string>
@@ -1838,7 +1850,6 @@
     <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="preference_summary_default_combination" msgid="8532964268242666060">"<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>
@@ -1948,7 +1959,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>
@@ -1957,16 +1968,18 @@
     <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_whitelisted" msgid="7375400051141016808">"ამ აპისთვის ბატარეის მოხმარების ოპტიმიზაცია ვერ მოხერხდება"</string>
+    <string name="background_activity_warning_dialog_title" msgid="2216249969149568871">"გსურთ ფონური აქტივობის შეზღუდვა?"</string>
+    <string name="background_activity_warning_dialog_text" msgid="7049624449246121981">"აპისთვის ფონური აქტივობის შეზღუდვის შემთხვევაში, მან შეიძლება არასათანადოდ იმუშაოს"</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" msgid="6393929085382334341">"აპების მიერ მოხმარება ბოლო სრული დატენიდან (<xliff:g id="RELATIVE_TIME">^1</xliff:g>)"</string>
+    <string name="power_usage_list_summary_device" msgid="4461926045610455423">"მოწყობილობის მიერ მოხმარება ბოლო სრული დატენიდან (<xliff:g id="RELATIVE_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_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>
@@ -2062,7 +2075,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>
@@ -2208,14 +2221,14 @@
     <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">"ავტორიზაციის მონაცემების საცავის გამოყენებამდე, საჭიროა, რომ დააყენოთ ეკრანის დასაბლოკი PIN ან პაროლი."</string>
+    <string name="credentials_configure_lock_screen_hint" msgid="8058230497337529036">"სამომხმარებლო მონაცემების საცავის გამოყენებამდე თქვენს მოწყობილობას უნდა ჰქონდეს ეკრანის ჩაკეტვის უსაფრთხო მეთოდი"</string>
+    <string name="credentials_configure_lock_screen_button" msgid="253239765216055321">"საკეტის დაყენება"</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>
@@ -2302,7 +2315,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>
@@ -2335,8 +2348,6 @@
     <skip />
     <string name="cant_sync_dialog_title" msgid="2777238588398046285">"შეუძლებელია ერთობლივი სინქრონიზაცია"</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-ის ჩასართავად, შეიყვანეთ თქვენი PIN."</string>
     <string name="enter_pattern" msgid="4187435713036808566">"Android-ის ჩასართავად, მოხაზეთ თქვენი ნიმუში."</string>
@@ -2350,6 +2361,7 @@
     <string name="misc_files_selected_count" msgid="4647048020823912088">"არჩეულია <xliff:g id="NUMBER">%1$d</xliff:g> სულ <xliff:g id="TOTAL">%2$d</xliff:g>-დან"</string>
     <string name="misc_files_selected_count_bytes" msgid="2876232009069114352">"<xliff:g id="NUMBER">%1$s</xliff:g> სულ <xliff:g id="TOTAL">%2$s</xliff:g>"</string>
     <string name="select_all" msgid="1562774643280376715">"ყველას არჩევა"</string>
+    <string name="data_plan_usage_manage_plans_button_text" msgid="8997761990902708162">"პაკეტების მართვა"</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>
@@ -2406,11 +2418,11 @@
     <string name="data_usage_app_restrict_dialog" msgid="1466689968707308512">"იმ შემთხვევაში, თუ ხელმისაწვდომი იქნება მხოლოდ მობილური ინტერნეტი, ამ პარამეტრმა შეიძლება გამოიწვიოს მონაცემთა ფონურ გადაცემაზე დამოკიდებული აპლიკაციების მუშაობის შეწყვეტა.\n\nმონაცემთა გადაცემის შესაფერისი პარამეტრების პოვნა შესაძლებელია ამ აპლიკაციების პარამეტრებში."</string>
     <string name="data_usage_restrict_denied_dialog" msgid="55012417305745608">"ფონური მონაცემების შეზღუდვა შესაძლებელია მხოლოდ მაშინ, როდესაც თქვენ დააყენებთ მობილური ინტერნეტის ლიმიტს."</string>
     <string name="data_usage_auto_sync_on_dialog_title" msgid="2438617846762244389">"ჩაირთოს მონაცემთა ავტომატური სინქრონიზაცია?"</string>
-    <string name="data_usage_auto_sync_on_dialog" product="tablet" msgid="8581983093524041669">"ვებზე თქვენს ანგარიშებში განხორციელებული ყველა ცვლილება ავტომატურად დაკოპირდება თქვენს ტაბლეტში.\n\nზოგიერთი ანგარიში ასევე ვებზე ავტომატურად დააკოპირებს თქვენ მიერ ტაბლეტში განხორციელებულ ცვლილებებს. Google-ის ანგარიში ასე ფუნქციონირებს."</string>
-    <string name="data_usage_auto_sync_on_dialog" product="default" msgid="8651376294887142858">"ვებზე თქვენს ანგარიშებში განხორციელებული ყველა ცვლილება ავტომატურად დაკოპირდება თქვენს ტელეფონში.\n\nზოგიერთი ანგარიში ასევე ვებზე ავტომატურად დააკოპირებს თქვენ მიერ ტელეფონში განხორციელებულ ცვლილებებს. Google-ის ანგარიში ასე ფუნქციონირებს."</string>
+    <string name="data_usage_auto_sync_on_dialog" product="tablet" msgid="8581983093524041669">"ვებზე თქვენს ანგარიშებში განხორციელებული ყველა ცვლილება ავტომატურად დაკოპირდება თქვენს ტაბლეტში.\n\nზოგიერთი ანგარიში ასევე ვებზე ავტომატურად დააკოპირებს თქვენ მიერ ტაბლეტში განხორციელებულ ცვლილებებს. Google ანგარიში ასე ფუნქციონირებს."</string>
+    <string name="data_usage_auto_sync_on_dialog" product="default" msgid="8651376294887142858">"ვებზე თქვენს ანგარიშებში განხორციელებული ყველა ცვლილება ავტომატურად დაკოპირდება თქვენს ტელეფონში.\n\nზოგიერთი ანგარიში ასევე ვებზე ავტომატურად დააკოპირებს თქვენ მიერ ტელეფონში განხორციელებულ ცვლილებებს. Google ანგარიში ასე ფუნქციონირებს."</string>
     <string name="data_usage_auto_sync_off_dialog_title" msgid="9013139130490125793">"გამოირთოს მონაცემთა ავტომატური სინქრონიზაცია?"</string>
-    <string name="data_usage_auto_sync_off_dialog" msgid="4025938250775413864">"ეს გამოიწვევს მონაცემებისა და ელემენტის გამოყენების დაზოგვას, მაგრამ თქვენ ბოლო ინფორმაციის შესაგროვებლად, დაგჭირდებათ თითოეულ ანგარიშთან მექანიკურად სინქრონიზაცია. განახლებების შესახებ შეტყობინებებს არ მიიღებთ."</string>
-    <string name="data_usage_cycle_editor_title" msgid="1373797281540188533">"გამოყენების ციკლის აღდგენის თარიღი"</string>
+    <string name="data_usage_auto_sync_off_dialog" msgid="4025938250775413864">"ეს გამოიწვევს მონაცემებისა და ბატარეის გამოყენების დაზოგვას, მაგრამ თქვენ ბოლო ინფორმაციის შესაგროვებლად დაგჭირდებათ თითოეულ ანგარიშთან მექანიკურად სინქრონიზაცია. განახლებების შესახებ შეტყობინებებს არ მიიღებთ."</string>
+    <string name="data_usage_cycle_editor_title" msgid="1373797281540188533">"გამოყენების ციკლის ჩამოყრის თარიღი"</string>
     <string name="data_usage_cycle_editor_subtitle" msgid="5512903797979928416">"თითოეული თვის თარიღი:"</string>
     <string name="data_usage_cycle_editor_positive" msgid="8821760330497941117">"შენახვა"</string>
     <string name="data_usage_warning_editor_title" msgid="3704136912240060339">"გაფრთხილების დაყენება"</string>
@@ -2435,6 +2447,9 @@
     <string name="data_usage_metered_mobile" msgid="5423305619126978393">"მობილური ქსელები"</string>
     <string name="data_usage_metered_wifi" msgid="1761738002328299714">"ლიმიტირებული Wi‑Fi ქსელები"</string>
     <string name="data_usage_metered_wifi_disabled" msgid="727808462375941567">"ლიმიტირებული ქსელის ასარჩევად, ჩართეთ Wi‑Fi."</string>
+    <string name="data_usage_metered_auto" msgid="1262028400911918865">"ავტომატური"</string>
+    <string name="data_usage_metered_yes" msgid="9217539611385225894">"ლიმიტირებული"</string>
+    <string name="data_usage_metered_no" msgid="4025232961929071789">"ულიმიტო"</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>
@@ -2526,9 +2541,6 @@
     <string name="backup_pw_set_button_text" msgid="2387480910044648795">"მარქაფის პაროლის დაყენება"</string>
     <string name="backup_pw_cancel_button_text" msgid="8845630125391744615">"გაუქმება"</string>
     <string name="additional_system_update_settings_list_item_title" msgid="214987609894661992">"სისტემის დამატებითი განახლებები"</string>
-    <string name="selinux_status_disabled" msgid="924551035552323327">"გამორთულია"</string>
-    <string name="selinux_status_permissive" msgid="6004965534713398778">"მხოლოდ გაფრთხილება"</string>
-    <string name="selinux_status_enforcing" msgid="2252703756208463329">"სრულდება"</string>
     <string name="ssl_ca_cert_warning" msgid="2045866713601984673">"შესაძლოა ქსელზე ხორციელდება მონიტორინგი"</string>
     <string name="done_button" msgid="1991471253042622230">"დასრულება"</string>
     <plurals name="ssl_ca_cert_dialog_title" formatted="false" msgid="7145092748045794650">
@@ -2570,8 +2582,8 @@
     <string name="user_add_user_title" msgid="2108112641783146007">"დაემატოს ახალი მომხმარებელი?"</string>
     <string name="user_add_user_message_long" msgid="8562152293752222985">"დამატებითი მომხმარებლების შექმნით, შეგიძლიათ ეს მოწყობილობა სხვებს გაუზიაროთ. თითოეულ მომხმარებელს თავისი სივრცე აქვს, რომლის პერსონალიზება მას შეუძლია საკუთარი აპებით, ფონით და ა.შ. მომხმარებლებს აგრეთვე შეუძლიათ მოწყობილობის ისეთი პარამეტრების მორგება, როგორიცაა Wi‑Fi, რაც ყველაზე გავრცელდება.\n\nახალი მომხმარებლის დამატების შემდეგ, აღნიშნულმა მომხმარებელმა საკუთარი სივრცის დაყენების პროცესი უნდა გაიაროს.\n\nნებისმიერი მომხმარებელი შეძლებს აპების ყველა სხვა დანარჩენი მომხმარებლისთვის განახლებას."</string>
     <string name="user_add_user_message_short" msgid="1511354412249044381">"ახალი მომხმარებლის დამატებისას, ამ მომხმარებელს საკუთარი სივრცის შექმნა მოუწევს.\n\nნებისმიერ მომხმარებელს შეუძლია აპები ყველა სხვა მომხმარებლისათვის განაახლოს."</string>
-    <string name="user_setup_dialog_title" msgid="1765794166801864563">"დავაყენო მომხმარებლის პარამეტრები?"</string>
-    <string name="user_setup_dialog_message" msgid="1004068621380867148">"დარწმუნდით, რომ პირს შეუძლია მოწყობილობის აღება და საკუთარი სივრცის და დაყენება"</string>
+    <string name="user_setup_dialog_title" msgid="1765794166801864563">"გსურთ მომხმარებლის პარამეტრების დაყენება?"</string>
+    <string name="user_setup_dialog_message" msgid="1004068621380867148">"დარწმუნდით, რომ პირს შეუძლია მოწყობილობის აღება და საკუთარი სივრცის დაყენება"</string>
     <string name="user_setup_profile_dialog_message" msgid="3896568553327558731">"გსურთ დავაყენო პროფილი ახლა?"</string>
     <string name="user_setup_button_setup_now" msgid="3391388430158437629">"დაყენება ახლა"</string>
     <string name="user_setup_button_setup_later" msgid="3068729597269172401">"ახლა არა"</string>
@@ -2726,6 +2738,7 @@
       <item quantity="other">%d დამალული ერთეულის ჩვენება</item>
       <item quantity="one">%d დამალული ერთეულის ჩვენება</item>
     </plurals>
+    <string name="dashboard_suggestion_condition_footer_content_description" msgid="2898588191174845961">"ჩაკეცვა"</string>
     <string name="network_dashboard_title" msgid="4771589228992391573">"ქსელი და ინტერნეტი"</string>
     <string name="network_dashboard_summary_mobile" msgid="3851083934739500429">"მობილური"</string>
     <string name="network_dashboard_summary_data_usage" msgid="3843261364705042212">"მონაცემთა მოხმარება"</string>
@@ -2828,8 +2841,14 @@
       <item quantity="other">ჩართულია <xliff:g id="ON_COUNT">%d</xliff:g> ავტომატური წესი</item>
       <item quantity="one">ჩართულია 1 ავტომატური წესი</item>
     </plurals>
-    <string name="zen_mode_settings_title" msgid="842308776768942600">"„არ შემაწუხოთ“ რეჟიმის პარამეტრები"</string>
-    <string name="zen_mode_priority_settings_title" msgid="2623117023031824309">"დაუშვას მხოლოდ პრიორიტეტულები"</string>
+    <string name="zen_mode_settings_title" msgid="1066226840983908121">"არ შემაწუხოთ"</string>
+    <string name="zen_mode_behavior_settings_title" msgid="1463303933529313969">"ქცევა"</string>
+    <string name="zen_mode_behavior_allow_title" msgid="3845615648136218141">"ხმებისა და ვიბრაციის დაშვება"</string>
+    <string name="zen_mode_behavior_no_sound" msgid="1219626004723208056">"ხმის გარეშე"</string>
+    <string name="zen_mode_behavior_total_silence" msgid="6716603819806610626">"ხმის გარეშე (სრული სიჩუმე)"</string>
+    <string name="zen_mode_behavior_no_sound_except" msgid="4968477585788243114">"ხმის გარეშე, გარდა შემდეგისა: <xliff:g id="CATEGORIES">%1$s</xliff:g>"</string>
+    <!-- no translation found for zen_mode_behavior_alarms_only (2423480992071472963) -->
+    <skip />
     <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>
@@ -2871,13 +2890,15 @@
     <string name="notifications_title" msgid="8086372779371204971">"შეტყობინებები"</string>
     <string name="app_notifications_title" msgid="5810577805218003760">"აპის შეტყობინებები"</string>
     <string name="notification_channel_title" msgid="2260666541030178452">"შეტყობინების კატეგორია"</string>
+    <string name="notification_group_title" msgid="7180506440133859601">"შეტყობინებების კატეგორიების ჯგუფი"</string>
     <string name="notification_importance_title" msgid="848692592679312666">"მნიშვნელობის დონე"</string>
-    <string name="notification_importance_unspecified" msgid="2196023702875112081">"არჩევანის აპისთვის მინდობა"</string>
+    <string name="notification_importance_unspecified" msgid="6622173510486113958">"ხმის გამოყენების დაშვება"</string>
     <string name="notification_importance_blocked" msgid="7938180808339386300">"შეტყობინებების ჩვენების აღკვეთა"</string>
     <string name="notification_importance_min" msgid="5455049524984686275">"ხმოვანი ან ვიზუალური შეფერხების გარეშე"</string>
     <string name="notification_importance_low" msgid="8881468429453766553">"ხმის გარეშე"</string>
     <string name="notification_importance_default" msgid="5958338024601957516">"ხმის გამოცემა"</string>
     <string name="notification_importance_high" msgid="2082429479238228527">"ხმის გამოცემა და ეკრანზე გამოჩენა"</string>
+    <string name="notification_importance_high_silent" msgid="2667033773703765252">"ეკრანზე გამოჩენა"</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>
@@ -2918,10 +2939,15 @@
     <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="channel_group_notifications_off_desc" msgid="1620950416247316370">"Android ბლოკავს შეტყობინებების ამ ჯგუფის გამოჩენას მოწყობილობაზე"</string>
     <string name="notification_channels" msgid="5346841743182627500">"კატეგორიები"</string>
     <string name="notification_channels_other" msgid="5645317113885788226">"სხვა"</string>
+    <plurals name="notification_group_summary" formatted="false" msgid="3420621520561455358">
+      <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="no_channels" msgid="3077375508177744586">"ამ აპს შეტყობინებები არ გამოუქვეყნებია"</string>
     <string name="app_settings_link" msgid="8894946007543660906">"დამატებითი პარამეტრები აპში"</string>
     <string name="app_notification_listing_summary_zero" msgid="6482582965081108108">"გამორთულია ყველა აპისთვის"</string>
@@ -2998,12 +3024,14 @@
     <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>
+    <!-- no translation found for zen_mode_media_system_other (8900209390529859777) -->
+    <skip />
     <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="239685342222975733">"თუ პიროვნება <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>
@@ -3032,6 +3060,7 @@
     <string name="zen_mode_screen_off_visual_interruptions" msgid="4850792880144382633">"გამორთული ეკრანისას"</string>
     <string name="zen_mode_no_visual_interruptions" msgid="8742776003822778472">"ჩართული ან გამორთული ეკრანისას"</string>
     <string name="notification_app_settings_button" msgid="6685640230371477485">"შეტყობინების პარამეტრები"</string>
+    <string name="suggestion_button_text" msgid="3275010948381252006">"კარგი"</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>
@@ -3071,7 +3100,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>
@@ -3168,7 +3197,7 @@
     <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">
@@ -3182,7 +3211,7 @@
     <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>
@@ -3216,6 +3245,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="sms_mirroring_pref" msgid="6475043279147376031">"SMS-ების სინქრონიზაცია"</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>
@@ -3282,7 +3312,7 @@
     <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="permit_write_settings" msgid="658555006453212691">"სისტემის პარამეტრების შეცვლის ნების დართვა"</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>
@@ -3377,9 +3407,12 @@
     <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="connectivity_monitor_switch" msgid="9059759348648583421">"კავშირის მონიტორინგი"</string>
+    <string name="connectivity_monitor_switch_summary" msgid="2828658652378866401">"კავშირის გამართულ მუშაობასთან მიმართებით პრობლემის გამოვლენისას, კავშირის მონიტორინგი შეაგროვებს ჟურნალების ჩანაწერებს, ხოლო მომხმარებელს დაუყოვნებლივ აცნობებს და შეცდომის შესახებ მოხსენებას შეთავაზებს"</string>
+    <string name="connectivity_monitor_toast" msgid="5551859612881173028">"კავშირის მონიტორინგთან მიმართებით ცვლილებების მისასადაგებლად, გადატვირთეთ მოწყობილობა"</string>
     <string name="camera_hal_hdrplus_switch" msgid="8377365197105267466">"კამერის HAL HDR+"</string>
     <string name="camera_hal_hdrplus_toast" msgid="2063703797270055299">"კამერის HAL HDR+ ცვლილების მისასადაგებლად გადატვირთეთ მოწყობილობა"</string>
+    <string name="camera_laser_sensor_switch" msgid="8913588990743234440">"კამერის ლაზერული სენსორი"</string>
     <string name="ota_disable_automatic_update" msgid="2319639631655915050">"სისტემის ავტომატური განახლება"</string>
     <string name="usage" msgid="2977875522080448986">"მოხმარება"</string>
     <string name="cellular_data_usage" msgid="2155683719898158203">"მობილური ინტერნეტის მოხმარება"</string>
@@ -3405,7 +3438,7 @@
     <string name="data_warning" msgid="209133958008062117">"მოხმარების შესახებ გაფრთხილება"</string>
     <string name="set_data_limit" msgid="2901526323210516923">"მონაცემთა ლიმიტის დაყენება"</string>
     <string name="data_limit" msgid="1885406964934590552">"მონაცემთა ლიმიტი"</string>
-    <string name="data_usage_template" msgid="392191945602400904">"გამოყენებულია: <xliff:g id="ID_1">%1$s</xliff:g> (<xliff:g id="ID_2">%2$s</xliff:g>)"</string>
+    <string name="data_usage_template" msgid="2923744765873163859">"<xliff:g id="ID_2">%2$s</xliff:g>-ის განმავლობაში გამოყენებულია <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="configure" msgid="1029654422228677273">"კონფიგურაცია"</string>
     <string name="data_usage_other_apps" msgid="3272872663517382050">"მოხმარების გამოთვლისას გათვალისწინებული სხვა აპები"</string>
     <plurals name="data_saver_unrestricted_summary" formatted="false" msgid="2635267833484232703">
@@ -3474,7 +3507,7 @@
     <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="387052719462473500">"გააკონტროლეთ ჩაკეტილ ეკრანზე ნაჩვენები ინფორმაცია"</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="8483187649355540109">"მხარდაჭერა და მინიშნებები"</string>
@@ -3482,7 +3515,7 @@
     <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>
+    <string name="bluetooth_disabled" msgid="6244000672828617410">"გამორთული"</string>
     <string name="bluetooth_connected_summary" msgid="7672528674593152862">"დაკავშირებულია <xliff:g id="ID_1">%1$s</xliff:g>-თან"</string>
     <string name="bluetooth_connected_multiple_devices_summary" msgid="9173661896296663932">"დაკავშირებულია რამდენიმე მოწყობილობასთან"</string>
     <string name="demo_mode" msgid="2798762752209330277">"სისტემის UI-ს დემო-რეჟიმი"</string>
@@ -3584,7 +3617,7 @@
     <string name="web_action_enable_title" msgid="4051513950976670853">"მყისიერი აპები"</string>
     <string name="web_action_enable_summary" msgid="3108127559723396382">"ბმულების აპებში გახსნა, მაშინაც კი, თუ ისინი დაინსტალირებული არ არის"</string>
     <string name="web_action_section_title" msgid="7364647086538399136">"მყისიერი აპები"</string>
-    <string name="instant_apps_account" msgid="1433620209791992528">"მყისიერი აპების ანგარიში"</string>
+    <string name="instant_apps_settings" msgid="8827777916518348213">"მყისიერი აპების პარამეტრები"</string>
     <string name="domain_url_section_title" msgid="7046835219056428883">"დაინსტალირებული აპები"</string>
     <string name="automatic_storage_manager_activation_warning" msgid="6353100011690933254">"თქვენს მეხსიერებას ახლა მეხსიერების მენეჯერი მართავს"</string>
     <string name="account_for_section_header" msgid="5356566418548737121">"<xliff:g id="USER_NAME">%1$s</xliff:g>-ის ანგარიშები"</string>
@@ -3631,7 +3664,9 @@
     <string name="enterprise_privacy_always_on_vpn_personal" msgid="9217774730260037434">"მუდმივად ჩართული VPN ჩაირთო თქვენს პირად პროფილში"</string>
     <string name="enterprise_privacy_always_on_vpn_work" msgid="7244472958208315814">"მუდმივად ჩართული VPN ჩაირთო თქვენს სამსახურის პროფილში"</string>
     <string name="enterprise_privacy_global_http_proxy" msgid="7936664553416257333">"გლობალური HTTP-პროქსი დაყენებულია"</string>
-    <string name="enterprise_privacy_ca_certs" msgid="5885892204903688909">"სანდო სერტიფიკატები"</string>
+    <string name="enterprise_privacy_ca_certs_device" msgid="2019652712782510262">"სანდო სერტიფიკატები"</string>
+    <string name="enterprise_privacy_ca_certs_personal" msgid="2279084820904076599">"სანდო სერტიფიკატები თქვენს პირად პროფილში"</string>
+    <string name="enterprise_privacy_ca_certs_work" msgid="6187377647815301809">"სანდო სერტიფიკატები თქვენს სამსახურის პროფილში"</string>
     <plurals name="enterprise_privacy_number_ca_certs" formatted="false" msgid="526375234629534165">
       <item quantity="other">მინიმუმ <xliff:g id="COUNT_1">%d</xliff:g> CA სერტიფიკატი</item>
       <item quantity="one">მინიმუმ <xliff:g id="COUNT_0">%d</xliff:g> CA სერტიფიკატი</item>
@@ -3690,10 +3725,12 @@
     <string name="storage_manager_indicator_on" msgid="8625551710194584733">"ჩართული"</string>
     <string name="install_type_instant" msgid="3174425974536078647">"მყისიერი აპი"</string>
     <string name="automatic_storage_manager_deactivation_warning" msgid="5605210730828410482">"გსურთ მეხსიერების მენეჯერის გამორთვა?"</string>
-    <string name="storage_movies_tv" msgid="5498394447562086890">"ფილმების და ტელევიზიის აპები"</string>
+    <string name="storage_movies_tv" msgid="5498394447562086890">"ფილმების და TV აპები"</string>
     <string name="carrier_provisioning" msgid="4398683675591893169">"ოპერატორის უზრუნველყოფის ინფორმაცია"</string>
     <string name="trigger_carrier_provisioning" msgid="3434865918009286187">"ოპერატორის უზრუნველყოფის გაშვება"</string>
     <string name="new_device_suggestion_title" msgid="698847081680980774">"რა არის ახალი და გამორჩეული?"</string>
-    <string name="new_device_suggestion_summary" msgid="7172709269203435870">"გაეცანით ყველაზე პოპულარულ 5 ფუნქციას"</string>
+    <string name="new_device_suggestion_summary" product="default" msgid="206396571522515855">"ისარგებლეთ თქვენი ახალი ტელეფონის გაცნობითი ტურით"</string>
+    <string name="new_device_suggestion_summary" product="tablet" msgid="393751455688210956">"ისარგებლეთ თქვენი ახალი ტაბლეტის გაცნობითი ტურით"</string>
+    <string name="new_device_suggestion_summary" product="device" msgid="2939870049868336652">"ისარგებლეთ თქვენი ახალი მოწყობილობის გაცნობითი ტურით"</string>
     <string name="disabled_low_ram_device" msgid="3751578499721173344">"ამ მოწყობილობაზე ეს ფუნქცია მიუწვდომელია"</string>
 </resources>
diff --git a/res/values-kk/arrays.xml b/res/values-kk/arrays.xml
index d75b606..b5707f2 100644
--- a/res/values-kk/arrays.xml
+++ b/res/values-kk/arrays.xml
@@ -100,8 +100,6 @@
     <!-- no translation found for wifi_security_no_eap:0 (2084555984818107151) -->
     <!-- no translation found for wifi_security_no_eap:1 (397579322683471524) -->
     <!-- no translation found for wifi_security_no_eap:2 (1968820975358150484) -->
-    <!-- no translation found for wifi_ap_security:0 (5251664683198623324) -->
-    <!-- no translation found for wifi_ap_security:1 (7989073072260294673) -->
   <string-array name="wifi_eap_method">
     <item msgid="1160193392455075561">"PEAP"</item>
     <item msgid="7981731051382306293">"TLS"</item>
diff --git a/res/values-kk/strings.xml b/res/values-kk/strings.xml
index 686c9cd..468cece 100644
--- a/res/values-kk/strings.xml
+++ b/res/values-kk/strings.xml
@@ -114,7 +114,7 @@
     <string name="bluetooth_disconnect_all_profiles" product="device" msgid="3995834526315103965">"Бұл құрылғы <xliff:g id="DEVICE_NAME">%1$s</xliff:g> құрылғысынан ажыратылды."</string>
     <string name="bluetooth_disconnect_dialog_ok" msgid="3308586619539119106">"Ажырату"</string>
     <string name="bluetooth_empty_list_user_restricted" msgid="603521233563983689">"Сізде Bluetooth параметрлерін өзгерту рұқсаты жоқ."</string>
-    <string name="bluetooth_pairing_pref_title" msgid="7429413067477968637">"Жаңа құрылғыны жұптау"</string>
+    <string name="bluetooth_pairing_pref_title" msgid="7429413067477968637">"Жаңа құрылғымен жұптастыру"</string>
     <string name="bluetooth_is_visible_message" msgid="6222396240776971862">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> Bluetooth параметрлері ашық болғанда маңайдағы құрылғыларға көрінеді."</string>
     <string name="bluetooth_footer_mac_message" product="default" msgid="1109366350000220283">"Телефонның Bluetooth мекенжайы: <xliff:g id="BLUETOOTH_MAC_ADDRESS">%1$s</xliff:g>"</string>
     <string name="bluetooth_footer_mac_message" product="tablet" msgid="6807634484499166486">"Планшеттің Bluetooth мекенжайы: <xliff:g id="BLUETOOTH_MAC_ADDRESS">%1$s</xliff:g>"</string>
@@ -166,9 +166,9 @@
     <string name="bluetooth_map_acceptance_dialog_text" msgid="8712508202081143737">"%1$s хабарларыңызға кіруді қалайды. %2$s кірсін бе?"</string>
     <string name="bluetooth_sap_request" msgid="2669762224045354417">"SIM картасына кіру сұрауы"</string>
     <string name="bluetooth_sap_acceptance_dialog_text" msgid="4414253873553608690">"<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g> сіздің SIM картаңызға кіруге рұқсат сұрайды. Ондай рұқсатты берсеңіз, байланыс барысында дерек тасымалы өшіріледі. <xliff:g id="DEVICE_NAME_1">%2$s?</xliff:g> құрылғысына рұқсат беру"</string>
-    <string name="bluetooth_device_name_summary" msgid="4757990010751789977">"Басқа құрылғыларға <xliff:g id="DEVICE_NAME">^1</xliff:g> болып көрінеді"</string>
+    <string name="bluetooth_device_name_summary" msgid="522235742194965734">"Басқа құрылғыларға «<xliff:g id="DEVICE_NAME">^1</xliff:g>» ретінде көрінеді"</string>
     <string name="bluetooth_paired_device_title" msgid="8638994696317952019">"Құрылғыларыңыз"</string>
-    <string name="bluetooth_pairing_page_title" msgid="7712127387361962608">"Жаңа құрылғыны жұптау"</string>
+    <string name="bluetooth_pairing_page_title" msgid="7712127387361962608">"Жаңа құрылғымен жұптастыру"</string>
     <string name="date_and_time" msgid="9062980487860757694">"Күн және уақыт"</string>
     <string name="choose_timezone" msgid="1362834506479536274">"Уақыт аймағын таңдау"</string>
     <!-- no translation found for intent_sender_data_label (6332324780477289261) -->
@@ -247,7 +247,7 @@
     <string name="sdcard_settings_scanning_status" product="default" msgid="2763464949274455656">"SD картасын медиа үшін тексеруде…"</string>
     <string name="sdcard_settings_read_only_status" product="nosdcard" msgid="3624143937437417788">"USB жады оқу үшін ғана енгізілген."</string>
     <string name="sdcard_settings_read_only_status" product="default" msgid="4518291824764698112">"SD картасы оқу үшін ғана енгізілген."</string>
-    <string name="skip_label" msgid="47510779345218297">"Аттап өту"</string>
+    <string name="skip_label" msgid="47510779345218297">"Өткізіп жіберу"</string>
     <string name="next_label" msgid="4693520878012668114">"Келесі"</string>
     <string name="language_picker_title" msgid="3596315202551687690">"Тілдер"</string>
     <string name="pref_title_lang_selection" msgid="2014920136978776034">"Тіл параметрлері"</string>
@@ -297,7 +297,7 @@
     <string name="roaming_disable" msgid="1295279574370898378">"Роуминг кезінде дерекқор қызметіне жалғау"</string>
     <string name="roaming_reenable_message" msgid="9141007271031717369">"Дерекқор байланысын жоғалттыңыз, себебі үй желісінің дерекқор роуминг қызметін өшірулі күйінде қалдырғансыз."</string>
     <string name="roaming_turn_it_on_button" msgid="4387601818162120589">"Оны қосыңыз"</string>
-    <string name="roaming_warning" msgid="4275443317524544705">"Сізден елеулі ақылар алынуы мүмкін."</string>
+    <string name="roaming_warning" msgid="4275443317524544705">"Қомақты ақы алынуы мүмкін."</string>
     <string name="roaming_warning_multiuser" product="tablet" msgid="6458990250829214777">"Дерекқор роумингіне рұқсат берілгенде сізден біршама роуминг төлемі талап етілуі мүмкін!\n\nБұл параметр осы планшеттегі барлық пайдаланушыларға әсер етеді."</string>
     <string name="roaming_warning_multiuser" product="default" msgid="6368421100292355440">"Дерекқор роумингіне рұқсат берілгенде сізден біршама роуминг төлемі талап етілуі мүмкін!\n\nБұл параметр осы телефондағы барлық пайдаланушыларға әсер етеді."</string>
     <string name="roaming_reenable_title" msgid="6068100976707316772">"Дерекқор роумингіне рұқсат берілсін бе?"</string>
@@ -312,6 +312,8 @@
     <string name="zone_auto" msgid="334783869352026648">"Aвтоматты уақыт белдеуі"</string>
     <string name="zone_auto_summaryOn" msgid="6142830927278458314">"Желідегі уақыт белдеуін қолдану"</string>
     <string name="zone_auto_summaryOff" msgid="2597745783162041390">"Желідегі уақыт белдеуін қолдану"</string>
+    <string name="date_time_24hour_auto" msgid="2117383168985653422">"Автоматты 24 сағаттық формат"</string>
+    <string name="date_time_24hour_auto_summary" msgid="6351812925651480277">"Жергілікті әдепкі параметрді пайдалану"</string>
     <string name="date_time_24hour_title" msgid="3203537578602803850">"24 сағаттық пішім"</string>
     <string name="date_time_24hour" msgid="1193032284921000063">"24 сағаттық форматты қолдану"</string>
     <string name="date_time_set_time_title" msgid="6296795651349047016">"Уақыт"</string>
@@ -341,8 +343,7 @@
     <string name="Accounts_settings_title" msgid="1643879107901699406">"Есептік жазбалар"</string>
     <string name="location_settings_title" msgid="1369675479310751735">"Орын"</string>
     <string name="account_settings_title" msgid="626177544686329806">"Есептік жазбалар"</string>
-    <!-- no translation found for security_settings_title (4918904614964215087) -->
-    <skip />
+    <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>
@@ -373,6 +374,9 @@
     <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="1961957425135180242">"Келесі"</string>
+    <string name="setup_fingerprint_enroll_skip_title" msgid="362050541117362034">"Саусақ ізі өткізіп жіберілсін бе?"</string>
+    <string name="setup_fingerprint_enroll_skip_after_adding_lock_text" msgid="958990414356204763">"Саусақ ізін реттеу бір не екі минутты ғана алады. Егер мұны өткізіп жіберсеңіз, саусақ ізін параметрлерде кейінірек реттеуіңізге болады."</string>
+    <string name="lock_screen_intro_skip_title" msgid="4988210105913705679">"Экран құлпы өткізіп жіберілсін бе?"</string>
     <string name="lock_screen_intro_skip_dialog_text_frp" product="tablet" msgid="1581834104051243425">"Құрылғыны қорғау функциялары қосылмайды. Планшет жоғалса, ұрланса не бастапқы күйіне қайтарылса, оны басқалардың пайдалануына тыйым сала алмайсыз."</string>
     <string name="lock_screen_intro_skip_dialog_text_frp" product="device" msgid="4629503416877189572">"Құрылғыны қорғау функциялары қосылмайды. Құрылғы жоғалса, ұрланса не бастапқы күйіне қайтарылса, оны басқалардың пайдалануына тыйым сала алмайсыз."</string>
     <string name="lock_screen_intro_skip_dialog_text_frp" product="default" msgid="2423428240245737909">"Құрылғыны қорғау функциялары қосылмайды. Телефон жоғалса, ұрланса не бастапқы күйіне қайтарылса, оны басқалардың пайдалануына тыйым сала алмайсыз."</string>
@@ -381,18 +385,18 @@
     <string name="lock_screen_intro_skip_dialog_text" product="default" msgid="3008526710555416125">"Құрылғыны қорғау функциялары қосылмайды. Телефон жоғалса не ұрланса, оны басқалардың пайдалануына тыйым сала алмайсыз."</string>
     <string name="skip_anyway_button_label" msgid="2323522873558834513">"Бәрібір өткізіп жіберу"</string>
     <string name="go_back_button_label" msgid="4745265266186209467">"Оралу"</string>
-    <string name="security_settings_fingerprint_enroll_find_sensor_title" msgid="3051496861358227199">"Датчикті түрту"</string>
+    <string name="security_settings_fingerprint_enroll_find_sensor_title" msgid="3051496861358227199">"Сенсорды түртіңіз"</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_message" msgid="8793966374365960368">"Ол телефонның артында. Сұқ саусағыңызды пайдаланыңыз."</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_content_description" msgid="2058830032070449160">"Құрылғы мен саусақ таңбасы сенсорының орны бар сурет"</string>
     <string name="security_settings_fingerprint_enroll_dialog_name_label" msgid="7086763077909041106">"Аты"</string>
     <string name="security_settings_fingerprint_enroll_dialog_ok" msgid="4150384963879569750">"Жарайды"</string>
     <string name="security_settings_fingerprint_enroll_dialog_delete" msgid="4114615413240707936">"Жою"</string>
-    <string name="security_settings_fingerprint_enroll_start_title" msgid="2068961812439460133">"Датчикті түрту"</string>
+    <string name="security_settings_fingerprint_enroll_start_title" msgid="2068961812439460133">"Сенсорды түртіңіз"</string>
     <string name="security_settings_fingerprint_enroll_start_message" msgid="3909929328942564524">"Саусақты сенсорға қойып, дірілді сезгеннен кейін көтеріңіз"</string>
     <string name="security_settings_fingerprint_enroll_repeat_title" msgid="2819679722403209778">"Саусағыңызды алып, қайта түртіңіз"</string>
-    <string name="security_settings_fingerprint_enroll_repeat_message" msgid="6158989350522518586">"Саусақ ізінің түрлі бөліктерін енгізу үшін саусағыңызды көтеріп тұрыңыз"</string>
+    <string name="security_settings_fingerprint_enroll_repeat_message" msgid="6158989350522518586">"Саусақ ізінің басқа бөліктерін енгізу үшін саусағыңызды көтеріп тұрыңыз"</string>
     <string name="security_settings_fingerprint_enroll_finish_title" msgid="7567276170287972230">"Саусақ ізі енгізілді"</string>
-    <string name="security_settings_fingerprint_enroll_finish_message" msgid="4796715961273420536">"Бұл белгіше шыққан кезде, саусақ ізімен жеке басыңызды растаңыз не сатып алған нәрсені мақұлдаңыз."</string>
+    <string name="security_settings_fingerprint_enroll_finish_message" msgid="4796715961273420536">"Бұл белгіше шыққан кезде, саусақ ізімен тұлғаңызды растаңыз не сатып алған нәрсені мақұлдаңыз."</string>
     <string name="security_settings_fingerprint_enroll_enrolling_skip" msgid="3710211704052369752">"Кейінірек"</string>
     <string name="setup_fingerprint_enroll_enrolling_skip_title" msgid="6808422329107426923">"Саусақ ізін орнатуды өткізіп жіберу керек пе?"</string>
     <string name="setup_fingerprint_enroll_enrolling_skip_message" msgid="274849306857859783">"Саусақ ізін пайдалануды телефон құлпын ашудың бір жолы ретінде таңдадыңыз. Қазір өткізіп жіберсеңіз, мұны кейінірек орнату керек. Орнату бір минутқа жақын уақыт алады."</string>
@@ -458,7 +462,7 @@
     <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="lock_settings_picker_fingerprint_added_security_message" msgid="5768002109707648463">"Қауіпсіздік деңгейін арттыру үшін резервтік экран құлпын орнатыңыз."</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>
@@ -486,7 +490,7 @@
     <string name="current_screen_lock" msgid="4104091715420072219">"Ағымдағы экран құлпы"</string>
     <string name="fingerprint_unlock_set_unlock_pattern" msgid="4939057588092120368">"Саусақ ізі + өрнек"</string>
     <string name="fingerprint_unlock_set_unlock_pin" msgid="8010746824051056986">"Саусақ ізі + PIN"</string>
-    <string name="fingerprint_unlock_set_unlock_password" msgid="7351131075806338634">"Саусақ ізі + кілтсөз"</string>
+    <string name="fingerprint_unlock_set_unlock_password" msgid="7351131075806338634">"Саусақ ізі + құпия сөз"</string>
     <string name="fingerprint_unlock_skip_fingerprint" msgid="1441077909803666681">"Саусақ ізін пайдаланбау"</string>
     <string name="fingerprint_unlock_title" msgid="2826226740306003991">"Телефон құлпын саусақ ізімен ашуға болады. Бұл опция қауіпсіздік мақсатында қосымша экран құлпын қажет етеді."</string>
     <string name="unlock_set_unlock_disabled_summary" msgid="2051593894736282302">"Әкімші, шифрлау саясаты немесе тіркелкі деректерінің жады өшірген"</string>
@@ -506,7 +510,7 @@
     <string name="unlock_disable_frp_warning_content_pin" msgid="586996206210265131">"Құрылғыны қорғау мүмкіндіктері PIN кодынсыз жұмыс істемейді."</string>
     <string name="unlock_disable_frp_warning_content_pin_fingerprint" msgid="3370462835533123695">"Құрылғыны қорғау мүмкіндіктері 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="3595476296430536798">"Құрылғыны қорғау мүмкіндіктері құпия сөзсіз жұмыс істемейді.<xliff:g id="EMPTY_LINE">
 
@@ -589,6 +593,7 @@
     <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="lockpassword_clear_label" msgid="5724429464960458155">"Тазалау"</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>
@@ -638,7 +643,7 @@
     <string name="bluetooth_pairing_dialog_contants_request" msgid="5531109163573611348">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> контактілерге және қоңыраулар тарихына қатынасқысы келеді."</string>
     <string name="bluetooth_pairing_dialog_paring_request" msgid="8451248193517851958">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> Bluetooth көмегімен жұптағысы келеді. Қосылған кезде бұл құрылғыда контактілеріңізге және қоңыраулар тарихына қатынас болады."</string>
     <string name="bluetooth_preference_paired_devices" msgid="1970524193086791964">"Жұптасқан құрылғылар"</string>
-    <string name="bluetooth_preference_found_devices" msgid="1647983835063249680">"Қол жетімді құрылғылар"</string>
+    <string name="bluetooth_preference_found_devices" msgid="1647983835063249680">"Қолжетімді құрылғылар"</string>
     <string name="bluetooth_preference_no_found_devices" msgid="7594339669961811591">"Құрылғылар қол жетімді емес"</string>
     <string name="bluetooth_device_context_connect" msgid="3997659895003244941">"Жалғау"</string>
     <string name="bluetooth_device_context_disconnect" msgid="8220072022970148683">"Ажырату"</string>
@@ -678,7 +683,7 @@
     <string name="bluetooth_dock_settings_headset" msgid="1001821426078644650">"Үндеткіш телефоны ретінде"</string>
     <string name="bluetooth_dock_settings_a2dp" msgid="8791004998846630574">"Музыка және медиа үшін"</string>
     <string name="bluetooth_dock_settings_remember" msgid="5551459057010609115">"Параметрлерді есте сақтау"</string>
-    <string name="wifi_display_settings_title" msgid="8740852850033480136">"Трансляциялау"</string>
+    <string name="wifi_display_settings_title" msgid="8740852850033480136">"Трансляция"</string>
     <string name="wifi_display_enable_menu_item" msgid="4883036464138167674">"Сымсыз дисплейді қосу"</string>
     <string name="wifi_display_no_devices_found" msgid="1382012407154143453">"Маңайдан құрылғылар табылмады"</string>
     <string name="wifi_display_status_connecting" msgid="5688608834000748607">"Қосылуда"</string>
@@ -695,16 +700,16 @@
     <string name="link_speed" msgid="8896664974117585555">"%1$d Мб/с"</string>
     <string name="wifi_ask_enable" msgid="2795469717302060104">"<xliff:g id="REQUESTER">%s</xliff:g> Wi-Fi желісінің қосылуын сұрайды"</string>
     <string name="wifi_ask_disable" msgid="728366570145493573">"<xliff:g id="REQUESTER">%s</xliff:g> Wi-Fi желісінің өшірілуін сұрайды"</string>
-    <string name="nfc_quick_toggle_title" msgid="6769159366307299004">"ЖӨБ"</string>
+    <string name="nfc_quick_toggle_title" msgid="6769159366307299004">"NFC"</string>
     <string name="nfc_quick_toggle_summary" product="tablet" msgid="8302974395787498915">"Планшет басқа құрылғымен қатынасқанда дерек алмастыруға рұқсат беру"</string>
-    <string name="nfc_quick_toggle_summary" product="default" msgid="5237208142892767592">"Телефон басқа құрылғымен қатынасқанда дерек алмастыру мүмкіндігін береді"</string>
+    <string name="nfc_quick_toggle_summary" product="default" msgid="5237208142892767592">"Телефон басқа құрылғымен байланысқанда, дерек алмасуға рұқсат беру"</string>
     <string name="nfc_disclaimer_title" msgid="4364003873202264039">"NFC желісін қосу"</string>
     <string name="nfc_disclaimer_content" msgid="5566907911915158075">"NFC арқылы бұл құрылғы басқа маңайдағы құрылғылармен не нысандармен, соның ішінде төлем терминалдарымен, кіру деректерін оқу құралдармен және интеративті жарнамалармен немесе тэгтермен деректер алмасады."</string>
-    <string name="android_beam_settings_title" msgid="7832812974600338649">"Android тарату функциясы"</string>
-    <string name="android_beam_on_summary" msgid="3618057099355636830">"Қолданба мазмұнын ЖӨБ арқылы жіберуге әзір"</string>
+    <string name="android_beam_settings_title" msgid="7832812974600338649">"Android Beam"</string>
+    <string name="android_beam_on_summary" msgid="3618057099355636830">"Қолданба мазмұнын NFC арқылы жіберуге әзір"</string>
     <string name="android_beam_off_summary" msgid="4663095428454779138">"Өшірулі"</string>
-    <string name="android_beam_disabled_summary" msgid="1737782116894793393">"Қол жетімсіз себебі ЖӨБ өшірілген"</string>
-    <string name="android_beam_label" msgid="6257036050366775040">"Android тарату функциясы"</string>
+    <string name="android_beam_disabled_summary" msgid="1737782116894793393">"Қолжетімсіз, себебі NFC өшірілген"</string>
+    <string name="android_beam_label" msgid="6257036050366775040">"Android Beam"</string>
     <string name="android_beam_explained" msgid="1810540319385192758">"Бұл функция қосылғанда, құрылғыларды бір-біріне жақын орналастырып, қолданба мазмұнын басқа NFC орнатылған құрылғыға жіберуге болады. Мысалы, беттерді, YouTube бейнелерін, контактілерді және басқаларды жібере аласыз.\n\nҚұрылғыларды бірге қойып (артқы жақтарын түйістіріп), экранды түртіңіз. Қолданба жіберілетін мазмұндарды анықтайды."</string>
     <string name="wifi_quick_toggle_title" msgid="8850161330437693895">"Wi‑Fi"</string>
     <string name="wifi_quick_toggle_summary" msgid="2696547080481267642">"Wi‑Fi қосу"</string>
@@ -762,7 +767,7 @@
     <string name="wifi_menu_forget" msgid="8736964302477327114">"Желіні ұмыту"</string>
     <string name="wifi_menu_modify" msgid="2068554918652440105">"Желіні өзгерту"</string>
     <string name="wifi_menu_write_to_nfc" msgid="7692881642188240324">"NFC белгісіне жазу"</string>
-    <string name="wifi_empty_list_wifi_off" msgid="8056223875951079463">"Қол жетімді желілерді көру үшін Wi‑Fi байланысын қосыңыз."</string>
+    <string name="wifi_empty_list_wifi_off" msgid="8056223875951079463">"Қолжетімді желілерді көру үшін Wi‑Fi байланысын қосыңыз."</string>
     <string name="wifi_empty_list_wifi_on" msgid="8746108031587976356">"Wi‑Fi желілерін іздеуде…"</string>
     <string name="wifi_empty_list_user_restricted" msgid="7322372065475939129">"Wi‑Fi желісін өзгертуге рұқсатыңыз жоқ."</string>
     <string name="wifi_more" msgid="3195296805089107950">"Басқа"</string>
@@ -782,6 +787,7 @@
     <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>
@@ -818,6 +824,8 @@
     <string name="wifi_wps_available_first_item" msgid="4422547079984583502">"WPS қол жетімді"</string>
     <string name="wifi_wps_available_second_item" msgid="8427520131718215301">" (WPS қол жетімді)"</string>
     <string name="wifi_wps_nfc_enter_password" msgid="2288214226916117159">"Желі құпия сөзін енгізіңіз"</string>
+    <string name="wifi_carrier_connect" msgid="8174696557882299911">"Оператордың Wi‑Fi желісі"</string>
+    <string name="wifi_carrier_content" msgid="4634077285415851933">"<xliff:g id="NAME">%1%s</xliff:g> арқылы қосу"</string>
     <string name="wifi_scan_always_turnon_message" msgid="203123538572122989">"Аймақ нақтылығын жақсарту және басқа мақсаттар үшін, <xliff:g id="APP_NAME">%1$s</xliff:g> қолданбасы желі тексеруді қосуды қалайды, Wi-Fi өшіріліп тұрса да.\n\nЖелі тексергісі келетеін барлық қолданбаларға рұқсат берілсін бе?"</string>
     <string name="wifi_scan_always_turnoff_message" msgid="5538901671131941043">"Мұны өшіру үшін артылған мазмұндар мәзірінде «Кеңейтілген» тармағына өтіңіз."</string>
     <string name="wifi_scan_always_confirm_allow" msgid="5355973075896817232">"Рұқсат беру"</string>
@@ -835,6 +843,7 @@
     <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_modify" msgid="6100248070440710782">"Өзгерту"</string>
     <string name="wifi_failed_forget_message" msgid="1348172929201654986">"Желіні жою орындалмады"</string>
     <string name="wifi_save" msgid="3331121567988522826">"Сақтау"</string>
     <string name="wifi_failed_save_message" msgid="6650004874143815692">"Желіні сақтау орындалмады"</string>
@@ -847,6 +856,7 @@
     <string name="wifi_advanced_titlebar" msgid="4485841401774142908">"Жетілдірілген 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_title" msgid="3471132676909349382">"Желі ақпараты"</string>
     <string name="wifi_details_subnet_mask" msgid="6720279144174924410">"Қосалқы желі маскасы"</string>
     <string name="wifi_details_dns" msgid="8648826607751830768">"DNS"</string>
     <string name="wifi_details_ipv6_address_header" msgid="6734119149106422148">"IPv6 мекенжайлары"</string>
@@ -879,16 +889,15 @@
     <string name="wifi_p2p_cancel_connect_title" msgid="255267538099324413">"Шақыру өшірілсін бе?"</string>
     <string name="wifi_p2p_cancel_connect_message" msgid="7477756213423749402">"<xliff:g id="PEER_NAME">%1$s</xliff:g> қосылу шақыруынан бас тартуды қалайсыз ба?"</string>
     <string name="wifi_p2p_delete_group_message" msgid="834559380069647086">"Бұл топ ұмытылсын ба?"</string>
-    <string name="wifi_tether_checkbox_text" msgid="1847167643625779136">"Жиналмалы Wi‑Fi хотспот"</string>
     <string name="wifi_hotspot_checkbox_text" msgid="7763495093333664887">"Wi‑Fi хотспоты"</string>
     <string name="wifi_hotspot_off_subtext" msgid="5466126533609394170">"Басқа құрылғылармен интернет не мазмұн бөлісіліп жатқан жоқ"</string>
     <string name="wifi_hotspot_tethering_on_subtext" product="tablet" msgid="5752490509369962007">"Планшеттің интернет байланысы хотспот арқылы бөлісілуде"</string>
     <string name="wifi_hotspot_tethering_on_subtext" product="default" msgid="6461075246164300670">"Телефонның интернет байланысы хотспот арқылы бөлісілуде"</string>
     <string name="wifi_hotspot_on_local_only_subtext" msgid="2068110388011294735">"Қолданба мазмұнды бөлісуде. Интернет байланысын бөлісу үшін хотспотты өшіріп, қайта қосыңыз"</string>
-    <string name="wifi_hotspot_name_title" msgid="1341735529132128887">"Wi‑Fi хотспотының атауы"</string>
+    <string name="wifi_hotspot_name_title" msgid="8237000746618636778">"Хоспот атауы"</string>
     <string name="wifi_hotspot_name_summary_connecting" msgid="3378299995508671967">"<xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g> қосылуда…"</string>
     <string name="wifi_hotspot_name_summary_connected" msgid="3888672084861445362">"Басқа құрылғылар <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g> хотспотына қосыла алады"</string>
-    <string name="wifi_hotspot_password_title" msgid="1955592302902091281">"Wi-Fi құпия сөзі"</string>
+    <string name="wifi_hotspot_password_title" msgid="8676859981917573801">"Хотспот құпия сөзі"</string>
     <string name="wifi_hotspot_ap_band_title" msgid="1165801173359290681">"AP диапазоны"</string>
     <string name="wifi_hotspot_footer_info_regular" msgid="1203489406068036455">"Басқа құрылғыларға Wi‑Fi желісін жасау үшін хотспотты пайдаланыңыз. Хотспот мобильдік деректер байланысы арқылы интернетпен қамтамасыз етеді. Қосымша мобильдік деректер ақысы алынуы мүмкін."</string>
     <string name="wifi_hotspot_footer_info_local_only" msgid="857988412470694109">"Қолданбалар мазмұнды маңайдағы құрылғылармен бөлісу үшін хоспот жасай алады."</string>
@@ -899,7 +908,6 @@
     <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">"Android хот-споты"</string>
     <string name="wifi_calling_settings_title" msgid="4102921303993404577">"Wi-Fi қоңыраулары"</string>
     <string name="wifi_calling_suggestion_title" msgid="9008010480466359578">"Wi-Fi қоңырауларын қосу"</string>
@@ -940,7 +948,7 @@
     <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="emergency_address_summary" msgid="3266760199681945746">"Wi-Fi көмегімен жедел қызметке қоңырау шалсаңыз, төтенше жағдай қызметтері орналасқан орныңыз ретінде пайдаланатын мекенжай"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"Дисплей"</string>
     <string name="sound_settings" msgid="5534671337768745343">"Дыбыс"</string>
     <string name="all_volume_title" msgid="4296957391257836961">"Дыбыс қаттылығы"</string>
@@ -994,6 +1002,7 @@
     <string name="search_settings" msgid="1910951467596035063">"Іздеу"</string>
     <string name="search_settings_summary" msgid="9205656546570654169">"Іздеу параметрлері және тарих"</string>
     <string name="search_settings_no_results" msgid="8799027492641230999">"Нәтижелер жоқ"</string>
+    <string name="search_clear_history" msgid="4196658962573162457">"Тарихты өшіру"</string>
     <string name="display_settings" msgid="7965901687241669598">"Дисплей"</string>
     <string name="accelerometer_title" msgid="7854608399547349157">"Экранды автоматты бұру"</string>
     <string name="color_mode_title" msgid="3159275920408338215">"Жанды түстер"</string>
@@ -1048,7 +1057,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>
@@ -1057,13 +1066,13 @@
     <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="ambient_display_screen_title" msgid="4252755516328775766">"Айналаны көрсету"</string>
+    <string name="ambient_display_screen_title" msgid="4252755516328775766">"Экранды автоматты қосу"</string>
     <string name="ambient_display_screen_summary_always_on" msgid="7337555569694794132">"Әрдайым қосулы / Батарея заряды тезірек таусылады"</string>
     <string name="ambient_display_screen_summary_notifications" msgid="1449570742600868654">"Жаңа хабарландырулар"</string>
     <string name="ambient_display_category_triggers" msgid="4359289754456268573">"Көрсетілетін уақыты"</string>
@@ -1071,7 +1080,7 @@
     <string name="doze_summary" msgid="3846219936142814032">"Хабарландырулар келгенде, экранды ұйқы режимінен шығару"</string>
     <string name="doze_always_on_title" msgid="1046222370442629646">"Әрқашан қосулы"</string>
     <string name="doze_always_on_summary" msgid="6978257596231155345">"Уақытты, хабарландыру белгішелерін және басқа ақпараттарды көрсету. Батарея заряды тезірек таусылады."</string>
-    <string name="title_font_size" msgid="4405544325522105222">"Шрифт өлшемі"</string>
+    <string name="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>
@@ -1123,7 +1132,6 @@
     <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>
     <string name="device_status_activity_title" msgid="1411201799384697904">"Күйі"</string>
     <string name="device_status" msgid="607405385799807324">"Күйі"</string>
@@ -1151,7 +1159,6 @@
     <string name="status_wifi_mac_address" msgid="2202206684020765378">"Wi‑Fi MAC мекенжайы"</string>
     <string name="status_bt_address" msgid="4195174192087439720">"Bluetooth мекенжайы"</string>
     <string name="status_serial_number" msgid="2257111183374628137">"Сериялық нөмірі"</string>
-    <string name="status_unavailable" msgid="7862009036663793314">"Қол жетімсіз"</string>
     <string name="status_up_time" msgid="7294859476816760399">"Қосылғаннан бергі жұмыс уақыты"</string>
     <string name="status_awake_time" msgid="2393949909051183652">"Ояну уақыты"</string>
     <string name="internal_memory" msgid="9129595691484260784">"Ішкі жад"</string>
@@ -1327,6 +1334,7 @@
     <string name="menu_restore" msgid="8260067415075573273">"Бастапқы параметрлеріне қайтару"</string>
     <string name="restore_default_apn_completed" msgid="2824775307377604897">"Бастапқы қол жетімділік нүктесі атауының параметрлерін қайта орнату аяқталды."</string>
     <string name="reset_dashboard_title" msgid="6254873816990678620">"Опцияларды бастапқы күйіне қайтару"</string>
+    <string name="reset_dashboard_summary" msgid="4851012632493522755">"Желіні, қолданбаны не құрылғыны бастапқы күйіне қайтаруға болады"</string>
     <string name="reset_network_title" msgid="6166025966016873843">"Wi-Fi, мобильдік деректер және Bluetooth параметрлерін бастапқы күйіне қайтару"</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>
@@ -1335,17 +1343,14 @@
     <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="6617679904229218425">"Барлық деректерді өшіру (зауыттық параметрлерді қайтару)"</string>
-    <plurals name="master_clear_with_account_summary" formatted="false" msgid="5911377203778818712">
-      <item quantity="other"><xliff:g id="ACCOUNT_COUNT">%1$d</xliff:g> есептік жазба бастапқы күйге қайтарылады</item>
-      <item quantity="one">1 есептік жазба бастапқы күйге қайтарылады</item>
-    </plurals>
-    <string name="master_clear_summary" msgid="6902443944660426951">"Ішкі жад және барлық деректер бастапқы күйге қайтарылады"</string>
+    <string name="master_clear_title" msgid="3531267871084279512">"Барлық деректерді өшіру (зауыттық параметрлерді қайтару)"</string>
     <string name="master_clear_desc" product="tablet" msgid="9146059417023157222">"Бұл сіздің планшетіңіздің "<b>"ішкі жадынан"</b>" барлық дерекқорды өшіреді, келесі деректерді қоса:\n\n"<li>"Google есептік жазбаңыз"</li>\n<li>"Жүйе және қолданба дерекқоры және параметрлері"</li>\n<li>"Жүктелген қолданбалар"</li></string>
     <string name="master_clear_desc" product="default" msgid="4800386183314202571">"Бұл телефонның "<b>"ішкі жадынан"</b>" барлық деректерді өшіреді:\n\n"<li>" Google есептік жазбаңызды"</li>\n<li>"Жүйе және қолданба дерекқоры мен параметрлерін"</li>\n<li>"Жүктелген қолданбаларды"</li></string>
     <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"Сіз келесі есептік жазбаларға кірдіңіз:\n"</string>
     <string name="master_clear_other_users_present" product="default" msgid="5161423070702470742">\n\n"Осы құрылғыда басқа пайдаланушылар бар.\n"</string>
     <string name="master_clear_desc_also_erases_external" msgid="1903185203791274237"><li>"Mузыка"</li>\n<li>"Фотосуреттер"</li>\n<li>"Басқа пайдаланушы деректері"</li></string>
+    <string name="master_clear_desc_also_erases_esim" msgid="312352697653096008"><li>"eSIM картасының операторлары"</li></string>
+    <string name="master_clear_desc_no_cancel_mobile_plan" msgid="5460926449093211144">\n\n"Мұның нәтижесінде мобильдік қызмет жоспарыңыздан бас тартылмайды."</string>
     <string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="7744115866662613411">\n\n"Музыка, фотосуреттер және басқа деректерді өшіру үшін, "<b>"USB жадын"</b>" өшіру қажет."</string>
     <string name="master_clear_desc_erase_external_storage" product="default" msgid="4801026652617377093">\n\n"Музыка, фотосуреттер және басқа пайдаланушы деректерін тазалау үшін "<b>"SD картасы"</b>" өшірілуі тиіс."</string>
     <string name="erase_external_storage" product="nosdcard" msgid="969364037450286809">"USB жадын өшіру"</string>
@@ -1462,15 +1467,16 @@
     <string name="settings_safetylegal_activity_title" msgid="6901214628496951727">"Қауіпсіздік ақпараты"</string>
     <string name="settings_safetylegal_activity_unreachable" msgid="250674109915859456">"Сіздің дерекқор байланысыңыз жоқ. Бұл ақпаратты қазір көру үшін, интернетке қосылған кез келген компьютерден %s тармағына кіріңіз."</string>
     <string name="settings_safetylegal_activity_loading" msgid="8059022597639516348">"Жүктелуде..."</string>
-    <string name="lockpassword_choose_your_password_header" msgid="8624900666929394990">"Құпия сөзді таңдау"</string>
-    <string name="lockpassword_choose_your_password_header_for_fingerprint" msgid="6624409510609085450">"Саусақ ізін пайдалану үшін құпия сөз орнатыңыз"</string>
-    <string name="lockpassword_choose_your_pattern_header" msgid="6949761069941694050">"Өрнек салу"</string>
-    <string name="lockpassword_choose_your_pattern_header_for_fingerprint" msgid="5901096361617543819">"Саусақ ізін пайдалану үшін өрнекті орнатыңыз"</string>
-    <string name="lockpassword_choose_your_pin_header" msgid="7598849519816138302">"PIN таңдау"</string>
-    <string name="lockpassword_choose_your_pin_header_for_fingerprint" msgid="765344692615917183">"Саусақ ізін пайдалану үшін PIN кодын пайдаланыңыз"</string>
-    <string name="lockpassword_confirm_your_password_header" msgid="6308478184889846633">"Құпия сөзді растаңыз"</string>
+    <string name="lockpassword_choose_your_screen_lock_header" msgid="3872462096767152394">"Экранды құлыптауды орнатыңыз"</string>
+    <string name="lockpassword_choose_your_password_message" msgid="1197569283524841412">"Қауіпсіздік үшін құпия сөз орнатыңыз"</string>
+    <string name="lockpassword_choose_your_password_header_for_fingerprint" msgid="2541818487015343503">"Саусақ ізін пайдалану үшін құпия сөз орнатыңыз"</string>
+    <string name="lockpassword_choose_your_pattern_header_for_fingerprint" msgid="7709785406243556723">"Саусақ ізін пайдалану үшін өрнекті орнатыңыз"</string>
+    <string name="lockpassword_choose_your_pin_message" msgid="1875420718677275646">"Қауіпсіздік үшін PIN кодын орнатыңыз"</string>
+    <string name="lockpassword_choose_your_pin_header_for_fingerprint" msgid="1549639053195796674">"Саусақ ізін пайдалану үшін PIN кодын орнатыңыз"</string>
+    <string name="lockpassword_choose_your_pattern_message" msgid="5986983400689720015">"Қауіпсіздік үшін өрнекті орнатыңыз"</string>
+    <string name="lockpassword_confirm_your_password_header" msgid="1266027268220850931">"Құпия сөзді қайта енгізіңіз"</string>
     <string name="lockpassword_confirm_your_pattern_header" msgid="7543433733032330821">"Өрнекті растаңыз"</string>
-    <string name="lockpassword_confirm_your_pin_header" msgid="49038294648213197">"PIN кодын растаңыз"</string>
+    <string name="lockpassword_confirm_your_pin_header" msgid="7744513791910572550">"PIN кодын қайта енгізіңіз"</string>
     <string name="lockpassword_confirm_passwords_dont_match" msgid="5140892109439191415">"Құпия сөздер сәйкес емес"</string>
     <string name="lockpassword_confirm_pins_dont_match" msgid="7226244811505606217">"PIN кодтары сәйкес емес"</string>
     <string name="lockpassword_choose_lock_generic_header" msgid="3811438094903786145">"Құлыпты ашу жолын таңдау"</string>
@@ -1489,6 +1495,12 @@
     <string name="lockpassword_strong_auth_required_work_pattern" msgid="3003781907040522053">"Қосымша қауіпсіздік үшін жұмыс профилінің өрнегін пайдаланыңыз"</string>
     <string name="lockpassword_strong_auth_required_work_pin" msgid="3367491332598821552">"Қосымша қауіпсіздік үшін жұмыс профилінің PIN кодын енгізіңіз"</string>
     <string name="lockpassword_strong_auth_required_work_password" msgid="8159775129968582940">"Қосымша қауіпсіздік үшін жұмыс профилінің құпия сөзін енгізіңіз"</string>
+    <string name="lockpassword_confirm_your_pattern_details_frp" msgid="6757336656791723193">"Телефоныңыз зауыттық параметрлерге қайтарылды. Бұл телефонды пайдалану үшін алдыңғы өрнекті пайдалыныңыз."</string>
+    <string name="lockpassword_confirm_your_pin_details_frp" msgid="826520613445990470">"Телефоныңыз зауыттық параметрлерге қайтарылды. Бұл телефонды пайдалану үшін алдыңғы PIN кодын пайдалыныңыз."</string>
+    <string name="lockpassword_confirm_your_password_details_frp" msgid="8944081074615739040">"Телефоныңыз зауыттық параметрлерге қайтарылды. Бұл телефонды пайдалану үшін алдыңғы құпия сөзді пайдалыныңыз."</string>
+    <string name="lockpassword_confirm_your_pattern_header_frp" msgid="2898036091609128286">"Өрнекті растау"</string>
+    <string name="lockpassword_confirm_your_pin_header_frp" msgid="4141601774778898803">"PIN кодын растау"</string>
+    <string name="lockpassword_confirm_your_password_header_frp" msgid="3762615419295360480">"Құпия сөзді растау"</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>
@@ -1512,7 +1524,7 @@
     <string name="lockpattern_settings_enable_visible_pattern_title" msgid="2615606088906120711">"Өрнек көрінетін болсын"</string>
     <string name="lockpattern_settings_enable_visible_pattern_title_profile" msgid="4864525074768391381">"Профиль өрнегін көрінетін ету"</string>
     <string name="lockpattern_settings_enable_tactile_feedback_title" msgid="4389015658335522989">"Түрткенде дірілдету"</string>
-    <string name="lockpattern_settings_enable_power_button_instantly_locks" msgid="5735444062633666327">"Қуат түймесі бірден бекітіледі"</string>
+    <string name="lockpattern_settings_enable_power_button_instantly_locks" msgid="5735444062633666327">"Қуат түймесімен құлыпталады"</string>
     <string name="lockpattern_settings_power_button_instantly_locks_summary" msgid="8196258755143711694">"<xliff:g id="TRUST_AGENT_NAME">%1$s</xliff:g> ашық күйінде ұстап тұрмаса"</string>
     <string name="lockpattern_settings_choose_lock_pattern" msgid="1652352830005653447">"Бекітпе кескінін реттеу"</string>
     <string name="lockpattern_settings_change_lock_pattern" msgid="1123908306116495545">"Бекітпені ашу кескінін өзгерту"</string>
@@ -1538,7 +1550,6 @@
     <string name="install_applications_title" msgid="4987712352256508946">"Барлық қолд. көз-не рұқсат ету"</string>
     <string name="recent_app_category_title" msgid="6673071268966003928">"Жақында ашылған қолданбалар"</string>
     <string name="see_all_apps_title" msgid="1317153498074308438">"Барлық <xliff:g id="COUNT">%1$d</xliff:g> қолданбаны көру"</string>
-    <string name="recent_app_summary" msgid="3366446669844932300">"<xliff:g id="TIME">^1</xliff:g> бұрын"</string>
     <string name="install_all_warning" product="tablet" msgid="8310489909586138165">"Планшет және жеке деректер белгісіз қолданбалар шабуылына ұшырауы мүмкін. Бұл қолданбаларды пайдалану нәтижесінде телефонға келетін залалға немесе деректердің жоғалуына өзіңіз ғана жауапты боласыз."</string>
     <string name="install_all_warning" product="default" msgid="1952257127370115988">"Телефон және жеке деректер белгісіз қолданбалар шабуылына ұшырауы мүмкін. Бұл қолданбаларды пайдалану нәтижесінде телефонға келетін залалға немесе деректердің жоғалуына өзіңіз ғана жауапты боласыз."</string>
     <string name="advanced_settings" msgid="1777249286757067969">"Қосымша параметрлер"</string>
@@ -1802,7 +1813,7 @@
     <string name="accessibility_settings_summary" msgid="981260486011624939">"Экранды оқу құралдары, дисплей, интерактивті пайдалануды басқару элементтері"</string>
     <string name="vision_settings_title" msgid="4204111425716868288">"Көру параметрлері"</string>
     <string name="vision_settings_description" msgid="5679491180156408260">"Бұл құрылғыны қажеттіліктерге сай реттей аласыз. Бұл арнайы мүмкіндіктерді кейінірек \"Параметрлер\" тармағында өзгертуге болады."</string>
-    <string name="vision_settings_suggestion_title" msgid="917294957154878441">"Қаріп өлшемін үлкейту"</string>
+    <string name="vision_settings_suggestion_title" msgid="8058794060304707004">"Қаріп өлшемін өзгерту"</string>
     <string name="screen_reader_category_title" msgid="7739154903913400641">"Экранды оқу құралдары"</string>
     <string name="audio_and_captions_category_title" msgid="3420727114421447524">"Аудиомазмұн және экранға шығатын мәтін"</string>
     <string name="display_category_title" msgid="685461049938269166">"Дисплей"</string>
@@ -1839,7 +1850,6 @@
     <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="preference_summary_default_combination" msgid="8532964268242666060">"<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>
@@ -1949,7 +1959,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>
@@ -1958,12 +1968,14 @@
     <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_whitelisted" msgid="7375400051141016808">"Қолданба батарея пайдаланысына оңтайландырылмайды"</string>
+    <string name="background_activity_warning_dialog_title" msgid="2216249969149568871">"Фондық режимдегі әрекет шектелсін бе?"</string>
+    <string name="background_activity_warning_dialog_text" msgid="7049624449246121981">"Қолданбаның фондық режимдегі әрекетін шектесеңіз, күтпеген әрекет көрсетуі мүмкін."</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" msgid="6393929085382334341">"Толық зарядталғаннан бері қолданбаның пайдаланылуы (<xliff:g id="RELATIVE_TIME">^1</xliff:g>)"</string>
+    <string name="power_usage_list_summary_device" msgid="4461926045610455423">"Толық зарядталғаннан бері құрылғының пайдаланылуы (<xliff:g id="RELATIVE_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>
@@ -2084,7 +2096,7 @@
     <string name="battery_overall_usage" msgid="2093409063297375436">"Жалпы батарея зарядының <xliff:g id="PERCENT">%1$s</xliff:g>-ы"</string>
     <string name="battery_detail_since_full_charge" msgid="7515347842046955855">"Толық зарядталғаннан кейін пайдаланылғаны"</string>
     <string name="battery_last_full_charge" msgid="7151251641099019361">"Соңғы толық зарядталуы"</string>
-    <string name="battery_footer_summary" msgid="67169726550144016">"Батарея пайдалану ақпараты уақыты шамамен берілген және пайдалануға байланысты өзгеруі мүмкін"</string>
+    <string name="battery_footer_summary" msgid="67169726550144016">"Батарея қолданысы туралы ақпарат шамамен берілген және пайдалануға байланысты өзгеруі мүмкін"</string>
     <string name="battery_detail_foreground" msgid="3350401514602032183">"Белсенді пайдаланылатын кезде"</string>
     <string name="battery_detail_background" msgid="1929644393553768999">"Фондық режимде болғанда"</string>
     <string name="battery_detail_power_usage" msgid="6485766868610469101">"Батарея зарядының тұтынылуы"</string>
@@ -2209,16 +2221,16 @@
     <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">"Тіркелу деректерінің қорын пайдалану үшін экранды құлыптау PIN кодын немесе құпия сөзін орнату қажет."</string>
+    <string name="credentials_configure_lock_screen_hint" msgid="8058230497337529036">"Маңызды деректер жадын пайдаланбас бұрын құрылғыда қауіпсіз құлып экраны болуы керек."</string>
+    <string name="credentials_configure_lock_screen_button" msgid="253239765216055321">"ҚҰЛЫПТАУДЫ РЕТТЕУ"</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>
@@ -2336,8 +2348,6 @@
     <skip />
     <string name="cant_sync_dialog_title" msgid="2777238588398046285">"Қолмен синхрондау мүмкін болмады"</string>
     <string name="cant_sync_dialog_message" msgid="1938380442159016449">"Бұл нысан үшін синхрондау уақытша өшірілген. Бұл параметрді өзгерту үшін артқы шеп деректері мен автоматты сихнрондауды уақытша қосыңыз."</string>
-    <string name="wimax_settings" msgid="2655139497028469039">"4Г"</string>
-    <string name="status_wimax_mac_address" msgid="8390791848661413416">"4Г MAC мекенжайы"</string>
     <string name="enter_password" msgid="8035706727471334122">"Android құрылғысын іске қосу үшін құпия сөзіңізді енгізіңіз"</string>
     <string name="enter_pin" msgid="5305333588093263790">"Android құрылғысын іске қосу үшін PIN кодын енгізіңіз"</string>
     <string name="enter_pattern" msgid="4187435713036808566">"Android құрылғысын іске қосу үшін өрнекті енгізіңіз"</string>
@@ -2351,6 +2361,7 @@
     <string name="misc_files_selected_count" msgid="4647048020823912088">"<xliff:g id="NUMBER">%1$d</xliff:g> таңдалды, барлығы <xliff:g id="TOTAL">%2$d</xliff:g>"</string>
     <string name="misc_files_selected_count_bytes" msgid="2876232009069114352">"<xliff:g id="NUMBER">%1$s</xliff:g>, барлығы <xliff:g id="TOTAL">%2$s</xliff:g>"</string>
     <string name="select_all" msgid="1562774643280376715">"Барлығын таңдау"</string>
+    <string name="data_plan_usage_manage_plans_button_text" msgid="8997761990902708162">"Жоспарларды басқару"</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>
@@ -2389,12 +2400,12 @@
     <string name="data_usage_disable_wifi_limit" msgid="1394901415264660888">"Wi‑Fi дерекқор шектеуін реттеу"</string>
     <string name="data_usage_tab_wifi" msgid="481146038146585749">"Wi‑Fi"</string>
     <string name="data_usage_tab_ethernet" msgid="7298064366282319911">"Этернет"</string>
-    <string name="data_usage_tab_mobile" msgid="454140350007299045">"Ұялы"</string>
+    <string name="data_usage_tab_mobile" msgid="454140350007299045">"Мобильдік"</string>
     <string name="data_usage_tab_4g" msgid="1301978716067512235">"4Г"</string>
     <string name="data_usage_tab_3g" msgid="6092169523081538718">"2Г-3Г"</string>
-    <string name="data_usage_list_mobile" msgid="5588685410495019866">"Ұялы"</string>
+    <string name="data_usage_list_mobile" msgid="5588685410495019866">"Мобильдік"</string>
     <string name="data_usage_list_none" msgid="3933892774251050735">"Ешқандай"</string>
-    <string name="data_usage_enable_mobile" msgid="986782622560157977">"Ұялы дерекқор"</string>
+    <string name="data_usage_enable_mobile" msgid="986782622560157977">"Мобильдік дерек"</string>
     <string name="data_usage_enable_3g" msgid="6304006671869578254">"2Г-3Г дерекқор"</string>
     <string name="data_usage_enable_4g" msgid="3635854097335036738">"4Г дерекқор"</string>
     <string name="data_usage_forground_label" msgid="7654319010655983591">"Алдыңғы фон:"</string>
@@ -2411,11 +2422,11 @@
     <string name="data_usage_auto_sync_on_dialog" product="default" msgid="8651376294887142858">"Cіз интернетте есептік жазбаларыңызға енгізген кез келген өзгертулер телефоныңызға автоматты түрде көшіріледі.\n\nСондай-ақ, кейбір есептік жазбалар сіз телефонда енгізген кез келген өзгертулерді интернетке көшіре алады. Google есептік жазбасы осылай жұмыс істейді."</string>
     <string name="data_usage_auto_sync_off_dialog_title" msgid="9013139130490125793">"Автосинхрондау өшірілсін бе?"</string>
     <string name="data_usage_auto_sync_off_dialog" msgid="4025938250775413864">"Бұл трафик пен батарея зарядын үнемдейді, бірақ соңғы ақпаратты жинау үшін әр есептік жазбаны қолмен синхрондау қажет болады. Сондай-ақ жаңартулар шыққанда, хабарландыру жіберілмейді."</string>
-    <string name="data_usage_cycle_editor_title" msgid="1373797281540188533">"Қолданыс айналымын қайта реттеу күні"</string>
+    <string name="data_usage_cycle_editor_title" msgid="1373797281540188533">"Статистиканы жаңадан бастау күні"</string>
     <string name="data_usage_cycle_editor_subtitle" msgid="5512903797979928416">"Әр айдың күні:"</string>
-    <string name="data_usage_cycle_editor_positive" msgid="8821760330497941117">"Параметрлер"</string>
-    <string name="data_usage_warning_editor_title" msgid="3704136912240060339">"Дерекқор қолдану ескертуін орнату"</string>
-    <string name="data_usage_limit_editor_title" msgid="9153595142385030015">"Дерекқор қолдану шектеуін анықтау"</string>
+    <string name="data_usage_cycle_editor_positive" msgid="8821760330497941117">"Орнату"</string>
+    <string name="data_usage_warning_editor_title" msgid="3704136912240060339">"Дерек қолдану ескертуін орнату"</string>
+    <string name="data_usage_limit_editor_title" msgid="9153595142385030015">"Дерек шектеуін анықтау"</string>
     <string name="data_usage_limit_dialog_title" msgid="3023111643632996097">"Деректер тасымалы шектеулі"</string>
     <string name="data_usage_limit_dialog_mobile" product="tablet" msgid="4983487893343645667">"Орнатқан шекке жеткеннен кейін, планшет мобильдік деректерді өшіреді.\n\nПланшет деректерді пайдалану шегін белгілейтіндіктен және оператор трафикті басқаша есептеуі мүмкін болғандықтан, консервативті шекті қарастырыңыз."</string>
     <string name="data_usage_limit_dialog_mobile" product="default" msgid="3926320594049434225">"Орнатқан шекке жеткеннен кейін, телефон мобильдік деректерді өшіреді.\n\nТелефон деректерді пайдалану шегін белгілейтіндіктен және оператор трафикті басқаша есептеуі мүмкін болғандықтан, консервативті шекті қарастырыңыз."</string>
@@ -2436,6 +2447,9 @@
     <string name="data_usage_metered_mobile" msgid="5423305619126978393">"Ұялы желілер"</string>
     <string name="data_usage_metered_wifi" msgid="1761738002328299714">"Өлшенетін Wi‑Fi желілері"</string>
     <string name="data_usage_metered_wifi_disabled" msgid="727808462375941567">"Өлшенетін желілерді таңдау үшін Wi‑Fi функциясын қосыңыз."</string>
+    <string name="data_usage_metered_auto" msgid="1262028400911918865">"Aвтоматты"</string>
+    <string name="data_usage_metered_yes" msgid="9217539611385225894">"Өлшенетін"</string>
+    <string name="data_usage_metered_no" msgid="4025232961929071789">"Өлшенбейтін"</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>
@@ -2527,9 +2541,6 @@
     <string name="backup_pw_set_button_text" msgid="2387480910044648795">"Сақтық кілтсөз тағайындау"</string>
     <string name="backup_pw_cancel_button_text" msgid="8845630125391744615">"Бас тарту"</string>
     <string name="additional_system_update_settings_list_item_title" msgid="214987609894661992">"Қосымша жүйе жаңартулары"</string>
-    <string name="selinux_status_disabled" msgid="924551035552323327">"Өшірілген"</string>
-    <string name="selinux_status_permissive" msgid="6004965534713398778">"Рұқсат беретін"</string>
-    <string name="selinux_status_enforcing" msgid="2252703756208463329">"Күштеуде"</string>
     <string name="ssl_ca_cert_warning" msgid="2045866713601984673">"Желі бақылауда болуы мүмкін"</string>
     <string name="done_button" msgid="1991471253042622230">"Дайын"</string>
     <plurals name="ssl_ca_cert_dialog_title" formatted="false" msgid="7145092748045794650">
@@ -2645,7 +2656,7 @@
     <string name="extreme_threats_summary" msgid="8777860706500920667">"Өмірге және мүлікке төнген үлкен қауіптер туралы дабылдар алу"</string>
     <string name="severe_threats_title" msgid="8362676353803170963">"Ауыр қауіптер"</string>
     <string name="severe_threats_summary" msgid="8848126509420177320">"Өмірге және мүлікке төнген ауыр қауіптер туралы дабылдар алу"</string>
-    <string name="amber_alerts_title" msgid="2772220337031146529">"САРЫ дабылдар"</string>
+    <string name="amber_alerts_title" msgid="2772220337031146529">"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>
@@ -2671,10 +2682,10 @@
     <string name="restriction_wifi_config_summary" msgid="70888791513065244">"Wi‑Fi және ұялы желілерді өзгертуге рұқсат беру"</string>
     <string name="restriction_bluetooth_config_title" msgid="8871681580962503671">"Bluetooth"</string>
     <string name="restriction_bluetooth_config_summary" msgid="8372319681287562506">"Bluetooth жұптаулары және параметрлерін өзгерту"</string>
-    <string name="restriction_nfc_enable_title" msgid="5888100955212267941">"ЖӨБ"</string>
+    <string name="restriction_nfc_enable_title" msgid="5888100955212267941">"NFC"</string>
     <string name="restriction_nfc_enable_summary_config" msgid="3232480757215851738">"Осы <xliff:g id="DEVICE_NAME">%1$s</xliff:g> басқа NFC құрылғысына тигенде деректер алмасуға рұқсат ету"</string>
     <string name="restriction_nfc_enable_summary" product="tablet" msgid="3891097373396149915">"Планшет басқа құрылғымен қатынасқанда дерек алмастыруға рұқсат беру"</string>
-    <string name="restriction_nfc_enable_summary" product="default" msgid="825331120501418592">"Телефон басқа құрылғымен қатынасқанда дерек алмастыруға рұқсат беру"</string>
+    <string name="restriction_nfc_enable_summary" product="default" msgid="825331120501418592">"Телефон басқа құрылғымен байланысқанда, дерек алмасуға рұқсат беру"</string>
     <string name="restriction_location_enable_title" msgid="5020268888245775164">"Орын"</string>
     <string name="restriction_location_enable_summary" msgid="3489765572281788755">"Қолданбаға аймағыңызға қатысты ақпаратты қолдануға рұқсат беру"</string>
     <string name="wizard_back" msgid="5567007959434765743">"Артқа"</string>
@@ -2727,6 +2738,7 @@
       <item quantity="other">%d жасырын элементті көрсету</item>
       <item quantity="one">%d жасырын элементті көрсету</item>
     </plurals>
+    <string name="dashboard_suggestion_condition_footer_content_description" msgid="2898588191174845961">"Жию"</string>
     <string name="network_dashboard_title" msgid="4771589228992391573">"Желі және интернет"</string>
     <string name="network_dashboard_summary_mobile" msgid="3851083934739500429">"мобильдік желі"</string>
     <string name="network_dashboard_summary_data_usage" msgid="3843261364705042212">"деректерді пайдалану"</string>
@@ -2812,7 +2824,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>
@@ -2829,8 +2841,14 @@
       <item quantity="other"><xliff:g id="ON_COUNT">%d</xliff:g> автоматты ереже қосулы</item>
       <item quantity="one">1 автоматты ереже қосулы</item>
     </plurals>
-    <string name="zen_mode_settings_title" msgid="842308776768942600">"\"Мазаламау\" режимі параметрлері"</string>
-    <string name="zen_mode_priority_settings_title" msgid="2623117023031824309">"Маңыздыларына ғана рұқсат"</string>
+    <string name="zen_mode_settings_title" msgid="1066226840983908121">"Мазаламау"</string>
+    <string name="zen_mode_behavior_settings_title" msgid="1463303933529313969">"Мінез-құлық"</string>
+    <string name="zen_mode_behavior_allow_title" msgid="3845615648136218141">"Келесіден шыққан дыбыстар мен дірілдерге рұқсат беру"</string>
+    <string name="zen_mode_behavior_no_sound" msgid="1219626004723208056">"Дыбыссыз"</string>
+    <string name="zen_mode_behavior_total_silence" msgid="6716603819806610626">"Дыбыстар қосылмасын (толықтай үнсіз)"</string>
+    <string name="zen_mode_behavior_no_sound_except" msgid="4968477585788243114">"<xliff:g id="CATEGORIES">%1$s</xliff:g> санатынан басқа дыбыстар қосылмасын"</string>
+    <!-- no translation found for zen_mode_behavior_alarms_only (2423480992071472963) -->
+    <skip />
     <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>
@@ -2872,13 +2890,15 @@
     <string name="notifications_title" msgid="8086372779371204971">"Хабарландырулар"</string>
     <string name="app_notifications_title" msgid="5810577805218003760">"Қолданба хабар-лары"</string>
     <string name="notification_channel_title" msgid="2260666541030178452">"Хабарландыру санаты"</string>
+    <string name="notification_group_title" msgid="7180506440133859601">"Хабарландыру санатының тобы"</string>
     <string name="notification_importance_title" msgid="848692592679312666">"Маңыздылық"</string>
-    <string name="notification_importance_unspecified" msgid="2196023702875112081">"Қолданба өзі шешеді"</string>
+    <string name="notification_importance_unspecified" msgid="6622173510486113958">"Дыбысқа рұқсат ету"</string>
     <string name="notification_importance_blocked" msgid="7938180808339386300">"Хабарландыруларды ешқашан көрсетпеу"</string>
     <string name="notification_importance_min" msgid="5455049524984686275">"Дыбыссыз және визуалдық кедергісіз"</string>
     <string name="notification_importance_low" msgid="8881468429453766553">"Дыбыссыз"</string>
     <string name="notification_importance_default" msgid="5958338024601957516">"Дыбыстық сигнал беру"</string>
     <string name="notification_importance_high" msgid="2082429479238228527">"Дыбыстық сигнал беру және экранға шығару"</string>
+    <string name="notification_importance_high_silent" msgid="2667033773703765252">"Қалқымалы терезе"</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>
@@ -2921,8 +2941,13 @@
     <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="channel_group_notifications_off_desc" msgid="1620950416247316370">"Android хабарландырулардың осы тобының құрылғыда шығуын бөгейді"</string>
     <string name="notification_channels" msgid="5346841743182627500">"Санаттар"</string>
     <string name="notification_channels_other" msgid="5645317113885788226">"Басқа"</string>
+    <plurals name="notification_group_summary" formatted="false" msgid="3420621520561455358">
+      <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="no_channels" msgid="3077375508177744586">"Бұл қолданба ешқандай хабарландыруды жарияламады"</string>
     <string name="app_settings_link" msgid="8894946007543660906">"Қолданбадағы қосымша параметрлер"</string>
     <string name="app_notification_listing_summary_zero" msgid="6482582965081108108">"Барлық қолданбалар үшін қосулы"</string>
@@ -2999,12 +3024,14 @@
     <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>
+    <!-- no translation found for zen_mode_media_system_other (8900209390529859777) -->
+    <skip />
     <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="239685342222975733">"Бір адам <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>
@@ -3023,9 +3050,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>
@@ -3033,6 +3060,7 @@
     <string name="zen_mode_screen_off_visual_interruptions" msgid="4850792880144382633">"Экран өшірулі кезде"</string>
     <string name="zen_mode_no_visual_interruptions" msgid="8742776003822778472">"Экран қосулы немесе өшірулі кезде"</string>
     <string name="notification_app_settings_button" msgid="6685640230371477485">"Хабарландыру параметрлері"</string>
+    <string name="suggestion_button_text" msgid="3275010948381252006">"ОК"</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>
@@ -3147,12 +3175,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>
@@ -3169,7 +3197,7 @@
     <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">
@@ -3183,7 +3211,7 @@
     <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>
@@ -3212,11 +3240,12 @@
     <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="sms_mirroring_pref" msgid="6475043279147376031">"SMS көшірмесін көрсету"</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>
@@ -3283,7 +3312,7 @@
     <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="permit_write_settings" msgid="658555006453212691">"Жүйелік параметрлерді өзгертуге рұқсат ету"</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>
@@ -3378,9 +3407,12 @@
     <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">"Telephony Monitor функциясындағы өзгеріс күшіне енуі үшін, құрылғыны қайта жүктеңіз"</string>
+    <string name="connectivity_monitor_switch" msgid="9059759348648583421">"Connectivity Monitor"</string>
+    <string name="connectivity_monitor_switch_summary" msgid="2828658652378866401">"ConnectivityMonitor функциясы байланыс ақауын анықтаған кезде журналдарды жинайды және пайдаланушыға қате туралы есеп жіберуді ұсынады"</string>
+    <string name="connectivity_monitor_toast" msgid="5551859612881173028">"Connectivity Monitor функциясындағы өзгеріс күшіне енуі үшін, құрылғыны қайта жүктеңіз"</string>
     <string name="camera_hal_hdrplus_switch" msgid="8377365197105267466">"HAL HDR+ камера режимі"</string>
     <string name="camera_hal_hdrplus_toast" msgid="2063703797270055299">"HAL HDR+ камера режимінің өзгерісі күшіне енуі үшін құрылғыны қайта жүктеңіз"</string>
+    <string name="camera_laser_sensor_switch" msgid="8913588990743234440">"Камераның лазер сенсоры"</string>
     <string name="ota_disable_automatic_update" msgid="2319639631655915050">"Автоматты жүйе жаңартулары"</string>
     <string name="usage" msgid="2977875522080448986">"Трафик"</string>
     <string name="cellular_data_usage" msgid="2155683719898158203">"Мобильдік деректер трафигі"</string>
@@ -3406,7 +3438,7 @@
     <string name="data_warning" msgid="209133958008062117">"Деректер туралы ескерту"</string>
     <string name="set_data_limit" msgid="2901526323210516923">"Деректер шегін орнату"</string>
     <string name="data_limit" msgid="1885406964934590552">"Деректер шегі"</string>
-    <string name="data_usage_template" msgid="392191945602400904">"<xliff:g id="ID_1">%1$s</xliff:g> <xliff:g id="ID_2">%2$s</xliff:g> арасында пайдаланылған"</string>
+    <string name="data_usage_template" msgid="2923744765873163859">"<xliff:g id="ID_2">%2$s</xliff:g> <xliff:g id="ID_1">%1$s</xliff:g> пайдаланылды"</string>
     <string name="configure" msgid="1029654422228677273">"Конфигурациялау"</string>
     <string name="data_usage_other_apps" msgid="3272872663517382050">"Басқа қолданбалар трафикке қосылды"</string>
     <plurals name="data_saver_unrestricted_summary" formatted="false" msgid="2635267833484232703">
@@ -3475,7 +3507,7 @@
     <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="387052719462473500">"Құлып экранында ақпаратты басқарыңыз"</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="8483187649355540109">"Қолдау және кеңестер"</string>
@@ -3483,7 +3515,7 @@
     <string name="premium_sms_none" msgid="8268105565738040566">"Орнатылған қолданбалардың ешбірі Premium SMS мүмкіндігін пайдалануға рұқсат сұрамады."</string>
     <string name="premium_sms_warning" msgid="9086859595338944882">"Premium SMS мүмкіндігі үшін оператор тарифтеріне сәйкес ақы алынуы мүмкін. Егер қолданбаға рұқсат берсеңіз, сол қолданба арқылы премиум SMS жібере аласыз.Premium SMS мүмкіндігі үшін ақша алынуы мүмкін және операторыңыз арқылы жасалған төлем бойынша қосылады. Егер қолданбаға рұқсат берсеңіз, сол қолданба арқылы премиум SMS жібере аласыз."</string>
     <string name="premium_sms_access" msgid="4660047004791638305">"Premium SMS пайдалану"</string>
-    <string name="bluetooth_disabled" msgid="2456198532288640046">"Басқа құрылғыларға көрінбейді"</string>
+    <string name="bluetooth_disabled" msgid="6244000672828617410">"Өшірулі"</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>
@@ -3562,14 +3594,14 @@
     <string name="ambient_display_title" product="device" msgid="3423781975742145894">"Құрылғыны тексеру үшін екі рет түртіңіз"</string>
     <string name="ambient_display_summary" msgid="525662960806416373">"Уақытты, хабарландыру белгішелерін және басқа ақпаратты тексеру үшін экранды екі рет түртіңіз."</string>
     <string name="ambient_display_suggestion_summary" msgid="5987443721392571847">"Экран өшірулі кезде хабарландыруларды тексеру"</string>
-    <string name="ambient_display_pickup_title" product="default" msgid="818688002837687268">"Телефонды тексеру үшін оны көтеріңіз"</string>
+    <string name="ambient_display_pickup_title" product="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="4567020486787561873">"Уақытты, хабарландыру белгішелерін және басқа ақпаратты тексеру үшін телефонды көтеріңіз."</string>
     <string name="ambient_display_pickup_summary" product="tablet" msgid="5435283849947236648">"Уақытты, хабарландыру белгішелерін және басқа ақпаратты тексеру үшін планшетті көтеріңіз."</string>
     <string name="ambient_display_pickup_summary" product="device" msgid="8256669101643381568">"Уақытты, хабарландыру белгішелерін және басқа ақпаратты тексеру үшін құрылғыны көтеріңіз."</string>
     <string name="ambient_display_pickup_suggestion_summary" msgid="7014700589991761035">"Экран өшірулі кезде хабарландыруларды тексеру"</string>
-    <string name="fingerprint_swipe_for_notifications_title" msgid="5816346492253270243">"Саусақпен сипап өтіп, хабарландыруларды қараңыз"</string>
+    <string name="fingerprint_swipe_for_notifications_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>
@@ -3585,7 +3617,7 @@
     <string name="web_action_enable_title" msgid="4051513950976670853">"Instant apps"</string>
     <string name="web_action_enable_summary" msgid="3108127559723396382">"Сілтемелерді қолданбалардан (олар орнатылмаған болса да) ашу"</string>
     <string name="web_action_section_title" msgid="7364647086538399136">"Instant apps"</string>
-    <string name="instant_apps_account" msgid="1433620209791992528">"Instant apps есептік жазбасы"</string>
+    <string name="instant_apps_settings" msgid="8827777916518348213">"Instant Apps параметрлері"</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>
@@ -3632,7 +3664,9 @@
     <string name="enterprise_privacy_always_on_vpn_personal" msgid="9217774730260037434">"Әрқашан қосулы VPN жеке профильде қосылды"</string>
     <string name="enterprise_privacy_always_on_vpn_work" msgid="7244472958208315814">"Әрқашан қосулы VPN жұмыс профилінде қосылды"</string>
     <string name="enterprise_privacy_global_http_proxy" msgid="7936664553416257333">"Ғаламдық HTTP прокси-серверлер жиыны"</string>
-    <string name="enterprise_privacy_ca_certs" msgid="5885892204903688909">"Сенімді растау деректері"</string>
+    <string name="enterprise_privacy_ca_certs_device" msgid="2019652712782510262">"Сенімді тіркелу деректері"</string>
+    <string name="enterprise_privacy_ca_certs_personal" msgid="2279084820904076599">"Жеке профильдегі сенімді тіркелу деректері"</string>
+    <string name="enterprise_privacy_ca_certs_work" msgid="6187377647815301809">"Жұмыс профиліндегі сенімді тіркелу деректері"</string>
     <plurals name="enterprise_privacy_number_ca_certs" formatted="false" msgid="526375234629534165">
       <item quantity="other">Ең кемі <xliff:g id="COUNT_1">%d</xliff:g> CA сертификаты</item>
       <item quantity="one">Ең кемі <xliff:g id="COUNT_0">%d</xliff:g> CA сертификаты</item>
@@ -3695,6 +3729,8 @@
     <string name="carrier_provisioning" msgid="4398683675591893169">"Операторды инициализациялау туралы ақпарат"</string>
     <string name="trigger_carrier_provisioning" msgid="3434865918009286187">"Операторды инциализациялауды іске қосу"</string>
     <string name="new_device_suggestion_title" msgid="698847081680980774">"Қандай қызық жаңа мүмкіндік бар?"</string>
-    <string name="new_device_suggestion_summary" msgid="7172709269203435870">"Үздік 5 функцияны қараңыз"</string>
+    <string name="new_device_suggestion_summary" product="default" msgid="206396571522515855">"Жаңа телефонның ішін аралаңыз"</string>
+    <string name="new_device_suggestion_summary" product="tablet" msgid="393751455688210956">"Жаңа планшеттің ішін аралаңыз"</string>
+    <string name="new_device_suggestion_summary" product="device" msgid="2939870049868336652">"Жаңа құрылғының ішін аралаңыз"</string>
     <string name="disabled_low_ram_device" msgid="3751578499721173344">"Бұл мүмкіндік құрылғыда жоқ"</string>
 </resources>
diff --git a/res/values-km/arrays.xml b/res/values-km/arrays.xml
index dcdd510..5b0a171 100644
--- a/res/values-km/arrays.xml
+++ b/res/values-km/arrays.xml
@@ -100,8 +100,6 @@
     <!-- no translation found for wifi_security_no_eap:0 (2084555984818107151) -->
     <!-- no translation found for wifi_security_no_eap:1 (397579322683471524) -->
     <!-- no translation found for wifi_security_no_eap:2 (1968820975358150484) -->
-    <!-- no translation found for wifi_ap_security:0 (5251664683198623324) -->
-    <!-- no translation found for wifi_ap_security:1 (7989073072260294673) -->
   <string-array name="wifi_eap_method">
     <item msgid="1160193392455075561">"PEAP"</item>
     <item msgid="7981731051382306293">"TLS"</item>
@@ -274,7 +272,7 @@
     <item msgid="7136963238377062018">"កម្រិត​សំឡេង​​"</item>
     <item msgid="4270236897655923007">"កម្រិត​សំឡេង​រោទ៍"</item>
     <item msgid="6325739889222559394">"កម្រិត​សំឡេង​មេឌៀ"</item>
-    <item msgid="5762123934816216821">"កម្រិត​សំឡេង​រោទ៍"</item>
+    <item msgid="5762123934816216821">"កម្រិត​សំឡេងម៉ោង​រោទ៍"</item>
     <item msgid="785049718065337473">"កម្រិត​សំឡេង​ការ​ជូន​ដំណឹង"</item>
     <item msgid="6700305533746877052">"កម្រិត​សំឡេង​ប៊្លូធូស"</item>
     <item msgid="2029227495214047094">"មិន​ដេក"</item>
@@ -341,7 +339,7 @@
     <item msgid="5660213838861789350">"កម្រិត​សំឡេង"</item>
     <item msgid="7983336752371254444">"កម្រិត​សំឡេង​រោទ៍"</item>
     <item msgid="7878027809189330917">"កម្រិត​សំឡេង​មេឌៀ"</item>
-    <item msgid="7260546305036218513">"កម្រិត​សំឡេង​រោទ៍"</item>
+    <item msgid="7260546305036218513">"កម្រិត​សំឡេងម៉ោង​រោទ៍"</item>
     <item msgid="9103719301075748925">"កម្រិត​សំឡេង​ការ​ជូន​ដំណឹង"</item>
     <item msgid="7025966722295861512">"កម្រិត​សំឡេង​ប៊្លូធូស"</item>
     <item msgid="4665183401128289653">"មិន​ដេក"</item>
diff --git a/res/values-km/strings.xml b/res/values-km/strings.xml
index 56f651b..96666f4 100644
--- a/res/values-km/strings.xml
+++ b/res/values-km/strings.xml
@@ -166,7 +166,7 @@
     <string name="bluetooth_map_acceptance_dialog_text" msgid="8712508202081143737">"%1$s ចង់​ចូល​ដំណើរការ​សារ​របស់​អ្នក។ សូម​ផ្ដល់​ការ​ចូល​ដំណើរការ​ទៅ​កាន់​%2$s?"</string>
     <string name="bluetooth_sap_request" msgid="2669762224045354417">"សំណើចូលដំណើរការស៊ីម"</string>
     <string name="bluetooth_sap_acceptance_dialog_text" msgid="4414253873553608690">"<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g> ចង់ចូលដំណើរការស៊ីមកាតរបស់អ្នក។ ការផ្តល់ការអនុញ្ញាតចូលដំណើរការស៊ីមកាតនឹងបិទដំណើរការតភ្ជាប់ទិន្នន័យនៅលើឧបករណ៍របស់អ្នកក្នុងអំឡុងពេលធ្វើការតភ្ជាប់។ អនុញ្ញាតឲ្យចូលដំណើរការ <xliff:g id="DEVICE_NAME_1">%2$s?</xliff:g>"</string>
-    <string name="bluetooth_device_name_summary" msgid="4757990010751789977">"អាច​មើល​ឃើញ​ជា <xliff:g id="DEVICE_NAME">^1</xliff:g> ចំពោះ​ឧបករណ៍ផ្សេង"</string>
+    <string name="bluetooth_device_name_summary" msgid="522235742194965734">"អាច​មើលឃើញជា <xliff:g id="DEVICE_NAME">^1</xliff:g> ចំពោះ​ឧបករណ៍ផ្សេងទៀត"</string>
     <string name="bluetooth_paired_device_title" msgid="8638994696317952019">"ឧបករណ៍របស់អ្នក"</string>
     <string name="bluetooth_pairing_page_title" msgid="7712127387361962608">"ផ្គូផ្គង​ឧបករណ៍ថ្មី"</string>
     <string name="date_and_time" msgid="9062980487860757694">"កាលបរិច្ឆេទ និង ម៉ោង"</string>
@@ -307,11 +307,13 @@
     <string name="date_and_time_settings_title_setup_wizard" msgid="2391530758339384324">"កំណត់​កាលបរិច្ឆេទ និង​ពេលវេលា"</string>
     <string name="date_and_time_settings_summary" msgid="7095318986757583584">"កំណត់​កាលបរិច្ឆេទ ពេលវេលា តំបន់​ពេលវេលា &amp; ទ្រង់ទ្រាយ"</string>
     <string name="date_time_auto" msgid="7076906458515908345">"កាលបរិច្ឆេទ និង ម៉ោង​ស្វ័យ​ប្រវត្តិ"</string>
-    <string name="date_time_auto_summaryOn" msgid="4609619490075140381">"ប្រើ​ពេលវេលា​បាន​ផ្ដល់​ដោយ​បណ្ដាញ"</string>
-    <string name="date_time_auto_summaryOff" msgid="8698762649061882791">"ប្រើ​ពេលវេលា​បាន​ផ្ដល់​ដោយ​បណ្ដាញ"</string>
+    <string name="date_time_auto_summaryOn" msgid="4609619490075140381">"ប្រើ​ពេលវេលា​ដែល​ផ្ដល់​ដោយ​បណ្ដាញ"</string>
+    <string name="date_time_auto_summaryOff" msgid="8698762649061882791">"ប្រើ​ពេលវេលា​ដែល​ផ្ដល់​ដោយ​បណ្ដាញ"</string>
     <string name="zone_auto" msgid="334783869352026648">"តំបន់​ម៉ោង​ស្វ័យ​ប្រវត្តិ"</string>
     <string name="zone_auto_summaryOn" msgid="6142830927278458314">"ប្រើ​តំបន់ម៉ោងដែល​​ផ្ដល់​ដោយ​បណ្ដាញ"</string>
     <string name="zone_auto_summaryOff" msgid="2597745783162041390">"ប្រើ​តំបន់​ម៉ោងដែល​ផ្ដល់​ដោយ​បណ្ដាញ"</string>
+    <string name="date_time_24hour_auto" msgid="2117383168985653422">"ទម្រង់ 24 ម៉ោងស្វ័យប្រវត្តិ"</string>
+    <string name="date_time_24hour_auto_summary" msgid="6351812925651480277">"ប្រើភាសា​លំនាំដើម"</string>
     <string name="date_time_24hour_title" msgid="3203537578602803850">"ប្រព័ន្ធ 24 ម៉ោង"</string>
     <string name="date_time_24hour" msgid="1193032284921000063">"ប្រើ​ប្រព័ន្ធ ២៤ ម៉ោង"</string>
     <string name="date_time_set_time_title" msgid="6296795651349047016">"ពេលវេលា"</string>
@@ -334,15 +336,15 @@
     <string name="security_enable_widgets_disabled_summary" msgid="6392489775303464905">"បិទដោយអ្នកគ្រប់គ្រង"</string>
     <string name="owner_info_settings_summary" msgid="7472393443779227052">"គ្មាន"</string>
     <string name="owner_info_settings_status" msgid="120407527726476378">"<xliff:g id="COUNT_0">%1$d</xliff:g> / <xliff:g id="COUNT_1">%2$d</xliff:g>"</string>
-    <string name="owner_info_settings_edit_text_hint" msgid="7591869574491036360">"ឧ. ទូរស័ព្ទ Android របស់ពិសិដ្ឋ។"</string>
+    <string name="owner_info_settings_edit_text_hint" msgid="7591869574491036360">"ឧ. ទូរសព្ទ Android របស់ Joe ។"</string>
     <string name="user_info_settings_title" msgid="1195015434996724736">"ព័ត៌មាន​អ្នកប្រើ"</string>
     <string name="show_profile_info_on_lockscreen_label" msgid="2741208907263877990">"បង្ហាញ​ព័ត៌មាន​​ប្រវត្តិរូប​លើ​អេក្រង់ចាក់សោ"</string>
     <string name="profile_info_settings_title" msgid="3518603215935346604">"ព័ត៌មាន​ប្រវត្តិរូប"</string>
     <string name="Accounts_settings_title" msgid="1643879107901699406">"គណនី"</string>
     <string name="location_settings_title" msgid="1369675479310751735">"ទី​តាំង​"</string>
     <string name="account_settings_title" msgid="626177544686329806">"គណនី"</string>
-    <string name="security_settings_title" msgid="4918904614964215087">"សុវត្ថិភាព &amp; ទីតាំង"</string>
-    <string name="encryption_and_credential_settings_title" msgid="6514904533438791561">"ការ​អ៊ិនគ្រីប និងលិខិត​សម្គាល់"</string>
+    <string name="security_settings_title" msgid="4918904614964215087">"សុវត្ថិភាព និងទីតាំង"</string>
+    <string name="encryption_and_credential_settings_title" msgid="6514904533438791561">"ការ​អ៊ិនគ្រីប និងព័ត៌មានសម្គាល់ខ្លួន"</string>
     <string name="encryption_and_credential_settings_summary" product="default" msgid="8721883002237981248">"បានអ៊ិនគ្រីបទូរសព្ទ"</string>
     <string name="encryption_and_credential_settings_summary" product="tablet" msgid="7200428573872395685">"ឧបករណ៍​ត្រូវបានអ៊ិនគ្រីប"</string>
     <string name="lockscreen_settings_title" msgid="3922976395527087455">"ចំណូលចិត្ត​អេក្រង់​ចាក់​សោ"</string>
@@ -372,6 +374,9 @@
     <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="1961957425135180242">"បន្ទាប់"</string>
+    <string name="setup_fingerprint_enroll_skip_title" msgid="362050541117362034">"រំលង​ស្នាមមេដៃឬ?"</string>
+    <string name="setup_fingerprint_enroll_skip_after_adding_lock_text" msgid="958990414356204763">"ការរៀបចំស្នាមម្រាមដៃ​ចំណាយពេលត្រឹមតែមួយទៅពីរនាទីប៉ុណ្ណោះ។ ប្រសិនបើ​អ្នករំលងវា អ្នកអាច​បញ្ចូលស្នាមម្រាមដៃ​របស់អ្នក​ក្នុងការកំណត់​នៅពេលក្រោយបាន។"</string>
+    <string name="lock_screen_intro_skip_title" msgid="4988210105913705679">"រំលង​ការចាក់សោអេក្រង់ឬ?"</string>
     <string name="lock_screen_intro_skip_dialog_text_frp" product="tablet" msgid="1581834104051243425">"មុខងារការពារឧបករណ៍នឹងមិនត្រូវបានបើកទេ។ អ្នកនឹងមិនអាច​រារាំង​អ្នកផ្សេង​មិនឲ្យប្រើប្រាស់ថេប្លេតនេះបានទេ ប្រសិនបើវាបាត់ ត្រូវបានគេលួច ឬកំណត់ឡើងវិញ។"</string>
     <string name="lock_screen_intro_skip_dialog_text_frp" product="device" msgid="4629503416877189572">"មុខងារការពារឧបករណ៍នឹងមិនត្រូវបានបើកទេ។ អ្នកនឹងមិនអាច​រារាំង​អ្នកផ្សេង​មិនឲ្យប្រើប្រាស់ឧបករណ៍នេះបានទេ ប្រសិនបើវាបាត់ ត្រូវបានគេលួច ឬកំណត់ឡើងវិញ។"</string>
     <string name="lock_screen_intro_skip_dialog_text_frp" product="default" msgid="2423428240245737909">"មុខងារការពារឧបករណ៍នឹងមិនត្រូវបានបើកទេ។ អ្នកនឹងមិនអាច​រារាំង​អ្នកផ្សេង​មិនឲ្យប្រើប្រាស់ទូរសព្ទនេះបានទេ ប្រសិនបើវាបាត់ ត្រូវបានគេលួច ឬកំណត់ឡើងវិញ។"</string>
@@ -399,7 +404,7 @@
     <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="2989019978041986175">"ប៉ះឧបករណ៍ចាប់ស្នាមម្រាមដៃនៅផ្នែកខាងក្រោយនៃទូរសព្ទរបស់អ្នក។ សូមប្រើម្រាមដៃចង្អុលរបស់អ្នក។"</string>
-    <string name="security_settings_fingerprint_enroll_error_dialog_title" msgid="3618021988442639280">"ការចុះឈ្មោះមិនបានបញ្ចប់នោះទេ"</string>
+    <string name="security_settings_fingerprint_enroll_error_dialog_title" msgid="3618021988442639280">"ការបញ្ចូលស្នាមម្រាមដៃមិនបានចប់សព្វគ្រប់ទេ"</string>
     <string name="security_settings_fingerprint_enroll_error_timeout_dialog_message" msgid="2942551158278899627">"រយៈពេលបញ្ចូលស្នាមម្រាមដៃបានអស់ពេលហើយ សូមព្យាយាមម្តងទៀត។"</string>
     <string name="security_settings_fingerprint_enroll_error_generic_dialog_message" msgid="3624760637222239293">"ការបញ្ចូលស្នាមម្រាមដៃមិនដំណើរការទេ សូមព្យាយាមម្តងទៀត ឬប្រើម្រាមដៃផ្សេងពីនេះ។"</string>
     <string name="fingerprint_enroll_button_add" msgid="6317978977419045463">"បន្ថែមផ្សេងទៀត"</string>
@@ -457,7 +462,7 @@
     <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="lock_settings_picker_fingerprint_added_security_message" msgid="5768002109707648463">"ដើម្បី​ទទួលបាន​សុវត្ថិភាព​បន្ថែម សូម​កំណត់​ការចាក់​សោអេក្រង់​បម្រុង។"</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>
@@ -499,29 +504,37 @@
     <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>
-    <!-- no translation found for unlock_disable_frp_warning_content_pattern_fingerprint (2986105377420905314) -->
-    <skip />
+    <string name="unlock_disable_frp_warning_content_pattern_fingerprint" msgid="2986105377420905314">"មុខងារ​ការពារ​ឧបករណ៍​នឹងមិនដំណើរការ​ដោយគ្មាន​លំនាំ​របស់អ្នក​ទេ។<xliff:g id="EMPTY_LINE">
+
+</xliff:g>ស្នាមម្រាមដៃ​របស់អ្នក​ដែលបាន​រក្សាទុក​ក៏នឹង​ត្រូវលុបចេញ​ពី​ឧបករណ៍​នេះដែរ ហើយ​អ្នកនឹង​មិនអាច​ដោះសោ​ទូរសព្ទ​របស់អ្នក ផ្តល់សិទ្ធិ​សម្រាប់​ការទិញ ឬ​ចូលកម្មវិធី​ដោយប្រើ​ស្នាមម្រាមដៃ​ទាំងនេះ​បានទេ។"</string>
     <string name="unlock_disable_frp_warning_content_pin" msgid="586996206210265131">"លក្ខណៈពិសេសការពារឧបករណ៍នឹងមិនដំណើរការទេបើគ្មានកូដ PIN របស់អ្នក។"</string>
-    <!-- no translation found for unlock_disable_frp_warning_content_pin_fingerprint (3370462835533123695) -->
-    <skip />
+    <string name="unlock_disable_frp_warning_content_pin_fingerprint" msgid="3370462835533123695">"មុខងារ​ការពារ​ឧបករណ៍​នឹងមិន​ដំណើរការ​ដោយគ្មាន​កូដ PIN របស់អ្នក​ទេ។<xliff:g id="EMPTY_LINE">
+
+</xliff:g>ស្នាមម្រាមដៃ​របស់អ្នក​ដែលបាន​រក្សាទុក​ក៏នឹង​ត្រូវលុបចេញ​ពីឧបករណ៍​នេះដែរ ហើយអ្នក​នឹងមិន​អាចដោះសោ​ទូរសព្ទ​របស់អ្នក ផ្តល់សិទ្ធិ​សម្រាប់ការ​ទិញ ឬចូល​កម្មវិធី​ដោយប្រើ​ស្នាមម្រាមដៃ​ទាំងនេះ​បានទេ។"</string>
     <string name="unlock_disable_frp_warning_content_password" msgid="5420612686852555537">"មុខងារការពារឧបករណ៍នឹងមិនមានប្រយោជន៍ទេបើគ្មានពាក្យសម្ងាត់របស់អ្នក។"</string>
-    <!-- no translation found for unlock_disable_frp_warning_content_password_fingerprint (3595476296430536798) -->
-    <skip />
+    <string name="unlock_disable_frp_warning_content_password_fingerprint" msgid="3595476296430536798">"មុខងារ​ការពារ​ឧបករណ៍​នឹងមិន​ដំណើរការ​ដោយគ្មាន​ពាក្យសម្ងាត់​របស់អ្នកទេ។<xliff:g id="EMPTY_LINE">
+
+</xliff:g>ស្នាមម្រាមដៃ​របស់អ្នក​ដែលបាន​រក្សាទុកក៏​នឹងត្រូវ​លុបចេញ​ពីឧបករណ៍​នេះដែរ ហើយអ្នក​នឹងមិន​អាចដោះសោ​ទូរសព្ទ​របស់អ្នក ផ្តល់សិទ្ធិ​សម្រាប់ការ​ទិញ ឬ​ចូលកម្មវិធី​ដោយ​ប្រើស្នាម​ម្រាមដៃ​ទាំងនេះ​បានទេ។"</string>
     <string name="unlock_disable_frp_warning_content_unknown" msgid="1550718040483548220">"មុខងារការពារឧបករណ៍នឹងមិនដំណើរការទេបើគ្មានការចាក់សោអេក្រង់របស់អ្នក។"</string>
-    <!-- no translation found for unlock_disable_frp_warning_content_unknown_fingerprint (3679351662094349506) -->
-    <skip />
+    <string name="unlock_disable_frp_warning_content_unknown_fingerprint" msgid="3679351662094349506">"មុខងារ​ការពារ​ឧបករណ៍​នឹងមិន​ដំណើរការ​ដោយគ្មាន​ការចាក់សោ​អេក្រង់របស់​អ្នកទេ។<xliff:g id="EMPTY_LINE">
+
+</xliff:g>ស្នាមម្រាមដៃ​របស់អ្នក​ដែលបាន​រក្សាទុក​ក៏នឹង​ត្រូវលុប​ចេញពី​ឧបករណ៍​នេះដែរ ហើយអ្នក​នឹងមិនអាច​ដោះសោ​ទូរសព្ទ​របស់អ្នក ផ្តល់សិទ្ធិ​សម្រាប់​ការទិញ ឬចូល​កម្មវិធី​ដោយប្រើ​ស្នាមម្រាមដៃ​ទាំងនេះ​បានទេ។"</string>
     <string name="unlock_disable_frp_warning_content_pattern_profile" msgid="8682200103576359918">"លក្ខណៈពិសេសការពារប្រវត្តិរូបនឹងមិនដំណើរការទេបើគ្មានលំនាំរបស់អ្នក។"</string>
-    <!-- no translation found for unlock_disable_frp_warning_content_pattern_fingerprint_profile (6718155854303231675) -->
-    <skip />
+    <string name="unlock_disable_frp_warning_content_pattern_fingerprint_profile" msgid="6718155854303231675">"មុខងារ​ការពារ​កម្រងព័ត៌មាន​នឹងមិន​ដំណើរការ​ដោយគ្មាន​លំនាំ​របស់អ្នកទេ។<xliff:g id="EMPTY_LINE">
+
+</xliff:g>ស្នាមម្រាមដៃ​របស់អ្នក​ដែលបាន​រក្សាទុក​ក៏នឹង​ត្រូវលុបចេញ​ពីកម្រងព័ត៌មាន​នេះដែរ ហើយអ្នក​នឹង​មិនអាច​ដោះសោ​កម្រងព័ត៌មាន​របស់អ្នក ផ្តល់សិទ្ធិ​សម្រាប់​ការ​ទិញ ឬចូល​កម្មវិធី​ដោយប្រើ​ស្នាមម្រាមដៃ​ទាំងនេះ​បានទេ។"</string>
     <string name="unlock_disable_frp_warning_content_pin_profile" msgid="7790688070593867767">"លក្ខណៈពិសេសការពារប្រវត្តិរូបនឹងមិនដំណើរការទេបើគ្មានកូដ PIN របស់អ្នក។"</string>
-    <!-- no translation found for unlock_disable_frp_warning_content_pin_fingerprint_profile (4209564603132870532) -->
-    <skip />
+    <string name="unlock_disable_frp_warning_content_pin_fingerprint_profile" msgid="4209564603132870532">"មុខងារ​ការពារ​កម្រងព័ត៌មាន​នឹងមិន​ដំណើរការ​ដោយគ្មាន​កូដ PIN របស់អ្នកទេ។<xliff:g id="EMPTY_LINE">
+
+</xliff:g>ស្នាមម្រាមដៃ​របស់អ្នក​ដែលបាន​រក្សាទុក​ក៏នឹងត្រូវ​លុបចេញ​ពីកម្រង​ព័ត៌មាន​នេះដែរ ហើយអ្នក​នឹងមិនអាច​ដោះសោ​កម្រងព័ត៌មាន​របស់អ្នក ផ្តល់សិទ្ធិ​សម្រាប់ការ​ទិញ ឬចូល​កម្មវិធី​ដោយប្រើ​ស្នាមម្រាមដៃ​ទាំងនេះ​បានទេ។"</string>
     <string name="unlock_disable_frp_warning_content_password_profile" msgid="7569285520567674461">"លក្ខណៈពិសេសការពារប្រវត្តិរូបនឹងមិនដំណើរការទេបើគ្មានពាក្យសម្ងាត់របស់អ្នក។"</string>
-    <!-- no translation found for unlock_disable_frp_warning_content_password_fingerprint_profile (2994300676764706047) -->
-    <skip />
+    <string name="unlock_disable_frp_warning_content_password_fingerprint_profile" msgid="2994300676764706047">"មុខងារ​ការពារ​កម្រងព័ត៌មាន​នឹងមិន​ដំណើរការ​ដោយគ្មាន​ពាក្យសម្ងាត់​របស់អ្នក​ទេ។<xliff:g id="EMPTY_LINE">
+
+</xliff:g>ស្នាមម្រាមដៃ​របស់អ្នក​ដែលបាន​រក្សាទុក​ក៏នឹង​ត្រូវលុបចេញពី​កម្រងព័ត៌មាន​នេះដែរ ហើយអ្នក​នឹងមិន​អាចដោះសោ​កម្រងព័ត៌មានរបស់អ្នក ផ្តល់សិទ្ធិ​សម្រាប់ការ​ទិញ ឬ​ចូលកម្មវិធី​ដោយប្រើ​ស្នាមម្រាមដៃ​ទាំងនេះ​បានទេ។"</string>
     <string name="unlock_disable_frp_warning_content_unknown_profile" msgid="6984215718701688202">"លក្ខណៈពិសេសការពារប្រវត្តិរូបនឹងមិនដំណើរការទេបើគ្មានការចាក់សោអេក្រង់របស់អ្នក។"</string>
-    <!-- no translation found for unlock_disable_frp_warning_content_unknown_fingerprint_profile (4994062501123299418) -->
-    <skip />
+    <string name="unlock_disable_frp_warning_content_unknown_fingerprint_profile" msgid="4994062501123299418">"មុខងារ​ការពារ​កម្រងព័ត៌មាន​នឹងមិន​ដំណើរការ​ដោយគ្មាន​ការចាក់​សោអេក្រង់​របស់អ្នក​ទេ។<xliff:g id="EMPTY_LINE">
+
+</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">"ប្ដូរ​កូដ​ PIN ដោះ​សោ"</string>
@@ -580,6 +593,7 @@
     <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="lockpassword_clear_label" msgid="5724429464960458155">"លុប"</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>
@@ -723,7 +737,7 @@
     <string name="use_open_wifi_automatically_summary_scoring_disabled" msgid="593964217679325831">"ដើម្បី​ប្រើ សូម​ជ្រើសរើស​ក្រុមហ៊ុនផ្តល់ការវាយតម្លៃបណ្តាញ​"</string>
     <string name="use_open_wifi_automatically_summary_scorer_unsupported_disabled" msgid="8472122600853650258">"ដើម្បី​ប្រើ សូម​ជ្រើសរើស​ក្រុមហ៊ុនផ្តល់ការវាយតម្លៃបណ្តាញ​ដែលត្រូវគ្នា"</string>
     <string name="wifi_install_credentials" msgid="3551143317298272860">"ដំឡើង​វិញ្ញាបនបត្រ"</string>
-    <string name="wifi_scan_notify_text" msgid="5593805423071186757">"ដើម្បីធ្វើឲ្យភាពសុក្រិតនៃទីតាំងមានភាពប្រសើរឡើង កម្មវិធី និងសេវាកម្មប្រព័ន្ធនៅតែអាចស្កេនរកបណ្តាញ Wi-Fi ដដែល។ អ្នកអាចប្តូរវានៅក្នុង <xliff:g id="LINK_BEGIN_0">LINK_BEGIN</xliff:g>ការកំណត់ការស្កេន<xliff:g id="LINK_END_1">LINK_END</xliff:g>។"</string>
+    <string name="wifi_scan_notify_text" msgid="5593805423071186757">"ដើម្បីបង្កើនសុក្រឹតភាពនៃទីតាំង កម្មវិធី និងសេវាកម្មប្រព័ន្ធនៅតែអាចស្កេនរកបណ្តាញ Wi-Fi ដដែល។ អ្នកអាចប្តូរវានៅក្នុង <xliff:g id="LINK_BEGIN_0">LINK_BEGIN</xliff:g>ការកំណត់ការស្កេន<xliff:g id="LINK_END_1">LINK_END</xliff:g>។"</string>
     <string name="wifi_scan_notify_text_scanning_off" msgid="3426075479272242098">"ដើម្បី​ធ្វើឲ្យ​សុក្រឹតភាព​នៃទីកន្លែង​មានភាព​ប្រសើរ​ឡើង សូម​បើកការ​ស្កេន Wi-Fi នៅក្នុង <xliff:g id="LINK_BEGIN_0">LINK_BEGIN</xliff:g>ការកំណត់​ការស្កេន<xliff:g id="LINK_END_1">LINK_END</xliff:g>។"</string>
     <string name="wifi_scan_notify_remember_choice" msgid="7104867814641144485">"កុំ​បង្ហាញ​ម្ដង​ទៀត"</string>
     <string name="wifi_setting_sleep_policy_title" msgid="5149574280392680092">"បើក Wi-Fi ​​អំឡុង​ពេល​ដេក"</string>
@@ -753,7 +767,7 @@
     <string name="wifi_menu_forget" msgid="8736964302477327114">"បំភ្លេច​បណ្ដាញ"</string>
     <string name="wifi_menu_modify" msgid="2068554918652440105">"កែ​បណ្ដាញ"</string>
     <string name="wifi_menu_write_to_nfc" msgid="7692881642188240324">"សរសេរ​ទៅ​ស្លាក​អិនអេហ្វស៊ី"</string>
-    <string name="wifi_empty_list_wifi_off" msgid="8056223875951079463">"ដើម្បី​មើល​បណ្ដាញ​ដែល​មាន​ បើក​វ៉ាយហ្វាយ។"</string>
+    <string name="wifi_empty_list_wifi_off" msgid="8056223875951079463">"ដើម្បី​មើល​បណ្ដាញ​ដែល​មាន​ សូមបើក Wi-Fi ។"</string>
     <string name="wifi_empty_list_wifi_on" msgid="8746108031587976356">"កំពុង​ស្វែងរក​បណ្ដាញ​វ៉ាយហ្វាយ…"</string>
     <string name="wifi_empty_list_user_restricted" msgid="7322372065475939129">"អ្នក​មិន​មាន​សិទ្ធិ​ដើម្បី​ប្ដូរ​បណ្ដាញ​វ៉ាយហ្វាយ​ទេ។"</string>
     <string name="wifi_more" msgid="3195296805089107950">"ច្រើន​ទៀត"</string>
@@ -773,6 +787,7 @@
     <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,6 +824,8 @@
     <string name="wifi_wps_available_first_item" msgid="4422547079984583502">"WPS អាច​ប្រើ​បាន"</string>
     <string name="wifi_wps_available_second_item" msgid="8427520131718215301">" (មាន WPS)"</string>
     <string name="wifi_wps_nfc_enter_password" msgid="2288214226916117159">"បញ្ចូល​ពាក្យ​សម្ងាត់​បណ្ដាញ​របស់​អ្នក"</string>
+    <string name="wifi_carrier_connect" msgid="8174696557882299911">"បណ្ដាញ Wi‑Fi នៃក្រុមហ៊ុន​បម្រើសេវាទូរសព្ទ"</string>
+    <string name="wifi_carrier_content" msgid="4634077285415851933">"ភ្ជាប់តាមរយៈ <xliff:g id="NAME">%1%s</xliff:g>"</string>
     <string name="wifi_scan_always_turnon_message" msgid="203123538572122989">"ដើម្បី​បង្កើន​ភាព​ត្រឹមត្រូវ​ទីតាំង និង​សម្រាប់​គោល​បំណង​ផ្សេងៗ <xliff:g id="APP_NAME">%1$s</xliff:g> ចង់​បើក​ការ​វិភាគ រក​បណ្ដាញ ទោះ​បី​ជា​បិទ វ៉ាយហ្វាយ ក៏​ដោយ។\n\nអនុញ្ញាត​សម្រាប់​កម្មវិធី​ទាំងអស់​ដែល​អ្នក​ចង់​វិភាគ​រក?"</string>
     <string name="wifi_scan_always_turnoff_message" msgid="5538901671131941043">"ដើម្បី​បិទ, ចូល​ទៅ​កាន់​កម្រិត​ខ្ពស់​នៅ​ក្នុង​ម៉ឺនុយ​លើស​ចំណុះ។"</string>
     <string name="wifi_scan_always_confirm_allow" msgid="5355973075896817232">"អនុញ្ញាត"</string>
@@ -826,6 +843,7 @@
     <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_modify" msgid="6100248070440710782">"កែសម្រួល"</string>
     <string name="wifi_failed_forget_message" msgid="1348172929201654986">"បាន​បរាជ័យ​ក្នុង​បំភ្លេច​បណ្ដាញ"</string>
     <string name="wifi_save" msgid="3331121567988522826">"រក្សាទុក"</string>
     <string name="wifi_failed_save_message" msgid="6650004874143815692">"បាន​បរាជ័យ​ក្នុង​ការ​រក្សាទុក​បណ្ដាញ"</string>
@@ -838,6 +856,7 @@
     <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_title" msgid="3471132676909349382">"ព័ត៌មាន​អំពី​បណ្ដាញ"</string>
     <string name="wifi_details_subnet_mask" msgid="6720279144174924410">"របាំងបណ្តាញរង"</string>
     <string name="wifi_details_dns" msgid="8648826607751830768">"DNS"</string>
     <string name="wifi_details_ipv6_address_header" msgid="6734119149106422148">"អាសយដ្ឋាន IPv6"</string>
@@ -870,16 +889,15 @@
     <string name="wifi_p2p_cancel_connect_title" msgid="255267538099324413">"បោះបង់​ការ​អញ្ជើញ?"</string>
     <string name="wifi_p2p_cancel_connect_message" msgid="7477756213423749402">"តើ​អ្នក​ចង់​បោះបង់​ការ​អញ្ជើញ​ឲ្យ​តភ្ជាប់​ជា​មួយ <xliff:g id="PEER_NAME">%1$s</xliff:g>?"</string>
     <string name="wifi_p2p_delete_group_message" msgid="834559380069647086">"បំភ្លេច​ក្រុម​នេះ?"</string>
-    <string name="wifi_tether_checkbox_text" msgid="1847167643625779136">"Wi-Fi ហតស្ប៉ត​ចល័ត"</string>
-    <string name="wifi_hotspot_checkbox_text" msgid="7763495093333664887">"ហតស្ប៉ត​វ៉ាយហ្វាយ"</string>
+    <string name="wifi_hotspot_checkbox_text" msgid="7763495093333664887">"ហតស្ប៉ត Wi-Fi"</string>
     <string name="wifi_hotspot_off_subtext" msgid="5466126533609394170">"មិនកំពុងចែករំលែកអ៊ីនធឺណិត ឬមាតិកាជាមួយឧបករណ៍ផ្សេងទៀតទេ"</string>
     <string name="wifi_hotspot_tethering_on_subtext" product="tablet" msgid="5752490509369962007">"កំពុងចែករំលែកការតភ្ជាប់អ៊ីនធឺណិតរបស់ថេប្លេតនេះតាមរយៈហតស្ប៉ត"</string>
     <string name="wifi_hotspot_tethering_on_subtext" product="default" msgid="6461075246164300670">"កំពុងចែករំលែកការតភ្ជាប់អ៊ីនធឺណិតរបស់ទូរសព្ទនេះតាមរយៈហតស្ប៉ត"</string>
     <string name="wifi_hotspot_on_local_only_subtext" msgid="2068110388011294735">"កម្មវិធីកំពុងចែករំលែកមាតិកា។ ដើម្បីចែករំលែកការតភ្ជាប់អ៊ីនធឺណិត សូមបិទហតស្ប៉ត បន្ទាប់មកបើកវាវិញ"</string>
-    <string name="wifi_hotspot_name_title" msgid="1341735529132128887">"ឈ្មោះ Wi‑Fi"</string>
+    <string name="wifi_hotspot_name_title" msgid="8237000746618636778">"ឈ្មោះ​ហតស្ប៉ត"</string>
     <string name="wifi_hotspot_name_summary_connecting" msgid="3378299995508671967">"កំពុងបើក <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>..."</string>
     <string name="wifi_hotspot_name_summary_connected" msgid="3888672084861445362">"ឧបករណ៍​ផ្សេងទៀត​អាចភ្ជាប់​ជាមួយ <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>"</string>
-    <string name="wifi_hotspot_password_title" msgid="1955592302902091281">"ពាក្យសម្ងាត់ Wi-Fi"</string>
+    <string name="wifi_hotspot_password_title" msgid="8676859981917573801">"ពាក្យសម្ងាត់​ហតស្ប៉ត"</string>
     <string name="wifi_hotspot_ap_band_title" msgid="1165801173359290681">"AP Band"</string>
     <string name="wifi_hotspot_footer_info_regular" msgid="1203489406068036455">"ប្រើហតស្ប៉តដើម្បីបង្កើតបណ្តាញ Wi‑Fi សម្រាប់ឧបករណ៍ផ្សេងទៀតរបស់អ្នក។ ហតស្ប៉តផ្តល់ជូនអ៊ីនធឺណិតដោយប្រើការ​តភ្ជាប់​ទិន្នន័យ​ចល័តរបស់អ្នក។ អាចនឹងគិតប្រាក់លើទិន្នន័យទូរសព្ទចល័តបន្ថែម។"</string>
     <string name="wifi_hotspot_footer_info_local_only" msgid="857988412470694109">"កម្មវិធីអាចបង្កើតហតស្ប៉ត ដើម្បីចែករំលែកមាតិកាជាមួយឧបករណ៍ដែលនៅជិត។"</string>
@@ -890,7 +908,6 @@
     <string name="wifi_tether_configure_ap_text" msgid="7974681394041609308">"រៀបចំ Wi-Fi ហតស្ប៉ត"</string>
     <string name="wifi_hotspot_configure_ap_text" msgid="5478614731464220432">"រៀបចំ​ហតស្ប៉តវ៉ាយហ្វាយ"</string>
     <string name="wifi_hotspot_configure_ap_text_summary" msgid="5560680057727007011">"ហតស្ប៉ត AndroidAP WPA2 PSK"</string>
-    <string name="wifi_tether_configure_subtext" msgid="2050196439900426456">"<xliff:g id="NETWORK_SSID">%1$s</xliff:g> ហតស្ប៉ត <xliff:g id="NETWORK_SECURITY">%2$s</xliff:g>"</string>
     <string name="wifi_tether_configure_ssid_default" msgid="8467525402622138547">"AndroidHotspot"</string>
     <string name="wifi_calling_settings_title" msgid="4102921303993404577">"ការហៅតាម Wi-Fi"</string>
     <string name="wifi_calling_suggestion_title" msgid="9008010480466359578">"បើកការហៅតាម Wi-Fi"</string>
@@ -931,7 +948,7 @@
     <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="emergency_address_summary" msgid="3266760199681945746">"ប្រសិនបើអ្នកហៅទូរសព្ទ​សង្គ្រោះបន្ទាន់ដោយប្រើ Wi‑Fi នោះអាសយដ្ឋានដែលប្រើដោយសេវាកម្មសង្រោ្គះបន្ទាន់​គឺជាទីតាំងរបស់អ្នក"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"បង្ហាញ"</string>
     <string name="sound_settings" msgid="5534671337768745343">"សំឡេង"</string>
     <string name="all_volume_title" msgid="4296957391257836961">"កម្រិត​សំឡេង"</string>
@@ -985,6 +1002,7 @@
     <string name="search_settings" msgid="1910951467596035063">"ស្វែងរក"</string>
     <string name="search_settings_summary" msgid="9205656546570654169">"គ្រប់គ្រង​ប្រវត្តិ និង​ការ​កំណត់​ស្វែងរក"</string>
     <string name="search_settings_no_results" msgid="8799027492641230999">"មិនមានលទ្ធផលទេ"</string>
+    <string name="search_clear_history" msgid="4196658962573162457">"សម្អាត​ប្រវត្តិ"</string>
     <string name="display_settings" msgid="7965901687241669598">"បង្ហាញ"</string>
     <string name="accelerometer_title" msgid="7854608399547349157">"បង្វិល​អេក្រង់​ស្វ័យប្រវត្តិ"</string>
     <string name="color_mode_title" msgid="3159275920408338215">"ពណ៌ស្រស់"</string>
@@ -1041,7 +1059,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>
@@ -1055,15 +1073,13 @@
     <string name="automatic_brightness" msgid="5014143533884135461">"ពន្លឺ​ស្វ័យ​ប្រវត្តិ"</string>
     <string name="lift_to_wake_title" msgid="4555378006856277635">"លើក​ដៃ​ដើម្បី​ឲ្យ​ភ្ញាក់"</string>
     <string name="ambient_display_screen_title" msgid="4252755516328775766">"មុខងារអេក្រង់សម្ងំ"</string>
-    <!-- no translation found for ambient_display_screen_summary_always_on (7337555569694794132) -->
-    <skip />
+    <string name="ambient_display_screen_summary_always_on" msgid="7337555569694794132">"បើក​ជានិច្ច / ប្រើ​ថាមពលថ្ម​ច្រើន​ជាងមុន"</string>
     <string name="ambient_display_screen_summary_notifications" msgid="1449570742600868654">"ការជូនដំណឹងថ្មីៗ"</string>
     <string name="ambient_display_category_triggers" msgid="4359289754456268573">"ពេលដែលត្រូវ​បង្ហាញ"</string>
     <string name="doze_title" msgid="2375510714460456687">"ការជូនដំណឹងថ្មីៗ"</string>
     <string name="doze_summary" msgid="3846219936142814032">"ដាស់អេក្រង់នៅពេលដែលអ្នកទទួលបានការជូនដំណឹង"</string>
     <string name="doze_always_on_title" msgid="1046222370442629646">"បើក​ជា​និច្ច"</string>
-    <!-- no translation found for doze_always_on_summary (6978257596231155345) -->
-    <skip />
+    <string name="doze_always_on_summary" msgid="6978257596231155345">"បង្ហាញ​ម៉ោង រូប​តំណាង​ការជូន​ដំណឹង និង​ព័ត៌មាន​ផ្សេងទៀត។ ប្រើ​ថាមពលថ្ម​ច្រើន​ជាងមុន។"</string>
     <string name="title_font_size" msgid="4405544325522105222">"ទំហំពុម្ពអក្សរ"</string>
     <string name="short_summary_font_size" msgid="6819778801232989076">"ធ្វើឲ្យអក្សរធំជាងមុន ឬតូចជាងមុន"</string>
     <string name="sim_lock_settings" msgid="3392331196873564292">"កំណត់​ការ​ចាក់សោ​ស៊ីម​កាត"</string>
@@ -1116,13 +1132,12 @@
     <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>
     <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="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>
@@ -1141,10 +1156,9 @@
     <string name="status_signal_strength" msgid="3732655254188304547">"កម្លាំង​សញ្ញា"</string>
     <string name="status_roaming" msgid="2638800467430913403">"រ៉ូមីង"</string>
     <string name="status_operator" msgid="2274875196954742087">"បណ្ដាញ"</string>
-    <string name="status_wifi_mac_address" msgid="2202206684020765378">"អាសយដ្ឋាន​ MAC វ៉ាយហ្វាយ"</string>
+    <string name="status_wifi_mac_address" msgid="2202206684020765378">"អាសយដ្ឋាន​ MAC Wi-Fi"</string>
     <string name="status_bt_address" msgid="4195174192087439720">"អាសយដ្ឋាន​ប៊្លូធូស"</string>
     <string name="status_serial_number" msgid="2257111183374628137">"លេខ​ស៊េរី"</string>
-    <string name="status_unavailable" msgid="7862009036663793314">"មិន​មាន"</string>
     <string name="status_up_time" msgid="7294859476816760399">"រយៈ​ពេល​បើក"</string>
     <string name="status_awake_time" msgid="2393949909051183652">"ពេលវេលា​ភ្ញាក់"</string>
     <string name="internal_memory" msgid="9129595691484260784">"ទំហំ​​ផ្ទុក​ខាង​ក្នុង"</string>
@@ -1320,6 +1334,7 @@
     <string name="menu_restore" msgid="8260067415075573273">"កំណត់​ទៅ​លំនាំដើម​ឡើងវិញ"</string>
     <string name="restore_default_apn_completed" msgid="2824775307377604897">"បាន​បញ្ចប់​ការ​កំណត់​នៃ​ការកំណត់​ APN លំនាំដើម។"</string>
     <string name="reset_dashboard_title" msgid="6254873816990678620">"ជម្រើសដែលបានកំណត់ឡើងវិញ"</string>
+    <string name="reset_dashboard_summary" msgid="4851012632493522755">"បណ្ដាញ កម្មវិធី ឬ​ឧបករណ៍ដែលអាច​កំណត់​ឡើងវិញបាន"</string>
     <string name="reset_network_title" msgid="6166025966016873843">"កំណត់ Wi-Fi ឧបករណ៍ចល័ត និងប៊្លូធូសឡើងវិញ"</string>
     <string name="reset_network_desc" msgid="5547979398298881406">"វា​នឹង​កំណត់​ការកំណត់​បណ្តាញ​ទាំងអស់​ឡើងវិញ រួម​មាន៖\n\n"<li>"Wi‑Fi"</li>\n<li>"ទិន្នន័យ​ចល័ត"</li>\n<li>"ប៊្លូធូស"</li></string>
     <string name="reset_network_button_text" msgid="2035676527471089853">"កំណត់ការកំណត់ឡើងវិញ"</string>
@@ -1328,17 +1343,14 @@
     <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="6617679904229218425">"លុបទិន្នន័យទាំងអស់ (កំណត់ឡើងវិញដូចថ្មី)"</string>
-    <plurals name="master_clear_with_account_summary" formatted="false" msgid="5911377203778818712">
-      <item quantity="other">គណនី <xliff:g id="ACCOUNT_COUNT">%1$d</xliff:g> នឹងត្រូវបានកំណត់ឡើងវិញ</item>
-      <item quantity="one">គណនី 1 នឹងត្រូវបានកំណត់ឡើងវិញ</item>
-    </plurals>
-    <string name="master_clear_summary" msgid="6902443944660426951">"ទំហំផ្ទុកផ្នែកខាងក្នុង និងទិន្នន័យទាំងអស់នឹងត្រូវបានកំណត់ឡើងវិញ"</string>
+    <string name="master_clear_title" msgid="3531267871084279512">"លុបទិន្នន័យទាំងអស់ (កំណត់ឡើងវិញដូចថ្មី)"</string>
     <string name="master_clear_desc" product="tablet" msgid="9146059417023157222">"វា​នឹង​លុប​ទិន្នន័យ​ពី​ "<b>"ឧបករណ៍​ផ្ទុក​ខាង​ក្នុង"</b>"នៃ​កុំព្យូទ័រ​បន្ទះ​របស់​អ្នក រួម​មាន៖\n\n"<li>"គណនី Google របស់​អ្នក"</li>\n<li>"ការកំណត់ និង​ទិន្នន័យ​កម្មវិធី និង​ប្រព័ន្ធ"</li>\n<li>"កម្មវិធី​បាន​ទាញ​យក"</li></string>
     <string name="master_clear_desc" product="default" msgid="4800386183314202571">"វា​នឹង​លុប​ទិន្នន័យ​ទាំងអស់​ពី​ "<b>"ទំហំផ្ទុក​ខាង​ក្នុង"</b>"នៃ​ទូរសព្ទ​របស់​អ្នក​ រួមមាន៖\n\n"<li>"គណនី Google របស់​អ្នក"</li>\n<li>"ការ​កំណត់​ និង​ទិន្នន័យ​ប្រព័ន្ធ ព្រម​ទាំង​កម្មវិធី"</li>\n<li>"កម្មវិធី​បាន​ទាញ​យក"</li></string>
     <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"បច្ចុប្បន្ន​ អ្នក​បាន​ចូល​គណនី​ដូច​ខាង​ក្រោម៖ \n"</string>
     <string name="master_clear_other_users_present" product="default" msgid="5161423070702470742">\n\n"មានអ្នកផ្សេងច្រើនទៀតមានវត្តមាននៅលើឧបករណ៍នេះ។\n"</string>
     <string name="master_clear_desc_also_erases_external" msgid="1903185203791274237"><li>"តន្ត្រី"</li>\n<li>"រូបថត"</li>\n<li>"ទិន្នន័យ​អ្នក​ប្រើ​ផ្សេង​ទៀត"</li></string>
+    <string name="master_clear_desc_also_erases_esim" msgid="312352697653096008"><li>"ក្រុមហ៊ុនបម្រើ​សេវាទូរសព្ទដែលប្រើ eSIM"</li></string>
+    <string name="master_clear_desc_no_cancel_mobile_plan" msgid="5460926449093211144">\n\n"វានឹងមិនបោះបង់គម្រោងសេវាកម្មទូរសព្ទរបស់អ្នកទេ។"</string>
     <string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="7744115866662613411">\n\n"ដើម្បី​សម្អាត​តន្ត្រី រូបថត និង​ទិន្នន័យ​អ្នក​ប្រើ​ផ្សេងៗ តម្រូវ​ឲ្យ​លុប"<b>"ឧបករណ៍​ផ្ទុក​យូអេសប៊ី"</b>" ។"</string>
     <string name="master_clear_desc_erase_external_storage" product="default" msgid="4801026652617377093">\n\n"ដើម្បី​សម្អាត​តន្ត្រី, រូបភាព និង​ទិន្នន័យ​អ្នកប្រើ​ផ្សេងទៀត "<b>"ចាំបាច់​ត្រូវ"</b>" លុប​កាត​អេសឌី។"</string>
     <string name="erase_external_storage" product="nosdcard" msgid="969364037450286809">"លុប​ឧបករណ៍​ផ្ទុក​យូអេសប៊ី"</string>
@@ -1349,7 +1361,7 @@
     <string name="erase_esim_storage_description" product="default" msgid="708691303677321598">"លុប eSIM ទាំងអស់នៅលើទូរសព្ទនេះ។ វានឹងមិនលុបគម្រោងសេវាកម្មទិន្នន័យចល័តរបស់អ្នកទេ។"</string>
     <string name="erase_esim_storage_description" product="tablet" msgid="1780953956941209107">"លុប eSIM ទាំងអស់នៅលើថេប្លេតនេះ។ វានឹងមិនលុបគម្រោងសេវាកម្មទិន្នន័យចល័តរបស់អ្នកទេ។"</string>
     <string name="master_clear_button_text" product="tablet" msgid="3130786116528304116">"កំណត់​កុំព្យូទ័រ​បន្ទះ​ឡើងវិញ"</string>
-    <string name="master_clear_button_text" product="default" msgid="7550632653343157971">"កំណត់​ទូរស័ព្ទ​ឡើងវិញ"</string>
+    <string name="master_clear_button_text" product="default" msgid="7550632653343157971">"កំណត់​ទូរសព្ទ​ឡើងវិញ"</string>
     <string name="master_clear_final_desc" msgid="7318683914280403086">"លុបព័ត៌មានផ្ទាល់ខ្លួន និងកម្មវិធីដែលបានទាញយករបស់អ្នកទាំងអស់? អ្នកមិនអាចធ្វើសកម្មភាពនេះវិញបានទេ!"</string>
     <string name="master_clear_final_button_text" msgid="5390908019019242910">"លុប​អ្វីៗ​ទាំងអស់"</string>
     <string name="master_clear_failed" msgid="2503230016394586353">"គ្មាន​ការ​កំណត់​ឡើងវិញ​ត្រូវ​បាន​អនុវត្ត ព្រោះ​សេវាកម្ម​សម្អាត​ប្រព័ន្ធ​មិន​អាច​ប្រើ​បាន។"</string>
@@ -1378,7 +1390,7 @@
     <string name="bluetooth_tethering_off_subtext_config" msgid="6326877798974938021">"កំពុងចែករំលែកការតភ្ជាប់អ៊ីនធឺណិតរបស់ <xliff:g id="DEVICE_NAME">%1$d</xliff:g> នេះតាមរយៈប្ល៊ូធូស"</string>
     <string name="bluetooth_tethering_overflow_error" msgid="2135590598511178690">"មិន​អាច​ភ្ជាប់​ទៅ​ឧបករណ៍​ច្រើន​ជាង <xliff:g id="MAXCONNECTION">%1$d</xliff:g> ។"</string>
     <string name="bluetooth_untether_blank" msgid="2871192409329334813">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> នឹង​ត្រូវ​បាន​ផ្ដាច់។"</string>
-    <string name="tethering_footer_info" msgid="1308462275952345985">"ប្រើហតស្ប៉ត និងការភ្ជាប់ ដើម្បីផ្តល់ជូនអ៊ីនធឺណិតដល់ឧបករណ៍ផ្សេងទៀតតាមរយៈការតភ្ជាប់ទិន្នន័យទចល័តរបស់អ្នក។ កម្មវិធីអាចបង្កើតហតស្ប៉ត ដើម្បីចែករំលែកមាតិកាជាមួយឧបករណ៍ដែលនៅជិត។"</string>
+    <string name="tethering_footer_info" msgid="1308462275952345985">"ប្រើហតស្ប៉ត និងការភ្ជាប់ ដើម្បីផ្តល់អ៊ីនធឺណិតដល់ឧបករណ៍ផ្សេងទៀតតាមរយៈការតភ្ជាប់ទិន្នន័យទូរសព្ទចល័តរបស់អ្នក។ កម្មវិធីអាចបង្កើតហតស្ប៉ត ដើម្បីចែករំលែកខ្លឹមសារជាមួយឧបករណ៍ដែលនៅជិត។"</string>
     <string name="tethering_help_button_text" msgid="656117495547173630">"ជំនួយ"</string>
     <string name="network_settings_title" msgid="2876509814832830757">"បណ្ដាញទូរសព្ទចល័ត"</string>
     <string name="manage_mobile_plan_title" msgid="7630170375010107744">"ផែនការ​ទិន្នន័យ​ចល័ត"</string>
@@ -1448,22 +1460,23 @@
     <string name="wallpaper_attributions_values" msgid="2996183537914690469">"កម្មវិធី​ផ្ដល់​សេវា​រូបភាព​ផ្កាយ​រណប​៖\n©2014 CNES / Astrium, DigitalGlobe, Bluesky"</string>
     <string name="settings_manual_activity_title" msgid="8133150693616006051">"ឯកសារណែនាំ"</string>
     <string name="settings_manual_activity_unavailable" msgid="4752403782883814898">"មានបញ្ហាក្នុងការបើកឯកសារណែនាំ"</string>
-    <string name="settings_license_activity_title" msgid="8525014571806471216">"អាជ្ញាប័ណ្ណភាគីទីបី"</string>
+    <string name="settings_license_activity_title" msgid="8525014571806471216">"អាជ្ញាបណ្ណភាគីទីបី"</string>
     <string name="settings_license_activity_unavailable" msgid="4210539215951487627">"មាន​បញ្ហា​ក្នុង​ការ​ផ្ទុក​អាជ្ញាប័ណ្ណ។"</string>
     <string name="settings_license_activity_loading" msgid="3337535809093591740">"កំពុង​ផ្ទុក..."</string>
     <string name="settings_safetylegal_title" msgid="1289483965535937431">"ព័ត៌មាន​សុវត្ថិភាព"</string>
     <string name="settings_safetylegal_activity_title" msgid="6901214628496951727">"ព័ត៌មាន​សុវត្ថិភាព"</string>
     <string name="settings_safetylegal_activity_unreachable" msgid="250674109915859456">"អ្នក​មិន​មាន​ការ​តភ្ជាប់​ទិន្នន័យ។ ដើម្បី​មើល​ព័ត៌មាន​នេះ​ឥឡូវ ចូល​ទៅ %s ពី​កុំព្យូទ័រ​ដែល​បាន​ភ្ជាប់​អ៊ីនធឺណិត​ណា​មួយ។"</string>
     <string name="settings_safetylegal_activity_loading" msgid="8059022597639516348">"កំពុង​ផ្ទុក..."</string>
-    <string name="lockpassword_choose_your_password_header" msgid="8624900666929394990">"ជ្រើសរើស​ពាក្យ​សម្ងាត់​របស់​អ្នក"</string>
-    <string name="lockpassword_choose_your_password_header_for_fingerprint" msgid="6624409510609085450">"ដើម្បី​ប្រើប្រាស់​ស្នាម​ម្រាមដៃ សូម​កំណត់​ពាក្យសម្ងាត់"</string>
-    <string name="lockpassword_choose_your_pattern_header" msgid="6949761069941694050">"ជ្រើស​លំនាំ​របស់​អ្នក"</string>
-    <string name="lockpassword_choose_your_pattern_header_for_fingerprint" msgid="5901096361617543819">"ដើម្បី​ប្រើប្រាស់​ស្នាម​ម្រាមដៃ សូម​កំណត់​លំនាំ"</string>
-    <string name="lockpassword_choose_your_pin_header" msgid="7598849519816138302">"ជ្រើសរើស​​​កូដ PIN"</string>
-    <string name="lockpassword_choose_your_pin_header_for_fingerprint" msgid="765344692615917183">"ដើម្បី​ប្រើប្រាស់​ស្នាម​ម្រាមដៃ សូម​កំណត់​កូដ PIN"</string>
-    <string name="lockpassword_confirm_your_password_header" msgid="6308478184889846633">"បញ្ជក់​ពាក្យ​សម្ងាត់​របស់​អ្នក"</string>
+    <string name="lockpassword_choose_your_screen_lock_header" msgid="3872462096767152394">"កំណត់​ការចាក់​សោអេក្រង់"</string>
+    <string name="lockpassword_choose_your_password_message" msgid="1197569283524841412">"ដើម្បី​ទទួលបាន​សុវត្ថិភាព សូម​កំណត់​ពាក្យសម្ងាត់"</string>
+    <string name="lockpassword_choose_your_password_header_for_fingerprint" msgid="2541818487015343503">"ដើម្បីប្រើស្នាមម្រាមដៃ សូម​កំណត់ពាក្យសម្ងាត់"</string>
+    <string name="lockpassword_choose_your_pattern_header_for_fingerprint" msgid="7709785406243556723">"ដើម្បីប្រើស្នាមម្រាមដៃ សូម​កំណត់លំនាំ"</string>
+    <string name="lockpassword_choose_your_pin_message" msgid="1875420718677275646">"ដើម្បី​ទទួលបាន​សុវត្ថិភាព សូម​កំណត់​កូដ PIN"</string>
+    <string name="lockpassword_choose_your_pin_header_for_fingerprint" msgid="1549639053195796674">"ដើម្បីប្រើស្នាម​ម្រាមដៃ សូម​កំណត់កូដ PIN"</string>
+    <string name="lockpassword_choose_your_pattern_message" msgid="5986983400689720015">"ដើម្បីសុវត្ថិភាព សូមកំណត់លំនាំ"</string>
+    <string name="lockpassword_confirm_your_password_header" msgid="1266027268220850931">"បញ្ចូល​ពាក្យ​សម្ងាត់​របស់​អ្នក​ម្តងទៀត"</string>
     <string name="lockpassword_confirm_your_pattern_header" msgid="7543433733032330821">"បញ្ជាក់​លំនាំដើម​របស់​អ្នក"</string>
-    <string name="lockpassword_confirm_your_pin_header" msgid="49038294648213197">"បញ្ជាក់​កូដ PIN របស់​អ្នក"</string>
+    <string name="lockpassword_confirm_your_pin_header" msgid="7744513791910572550">"បញ្ចូល​កូដ PIN របស់អ្នក​ម្តងទៀត"</string>
     <string name="lockpassword_confirm_passwords_dont_match" msgid="5140892109439191415">"ពាក្យសម្ងាត់​មិន​ដូចគ្នា"</string>
     <string name="lockpassword_confirm_pins_dont_match" msgid="7226244811505606217">"កូដ PINs មិន​ដូច​គ្នា"</string>
     <string name="lockpassword_choose_lock_generic_header" msgid="3811438094903786145">"ជម្រើស​ដោះ​សោ"</string>
@@ -1476,18 +1489,18 @@
     <string name="lockpassword_confirm_your_pattern_generic_profile" msgid="4435638308193361861">"ប្រើលំនាំការងាររបស់អ្នកដើម្បីបន្ត"</string>
     <string name="lockpassword_confirm_your_pin_generic_profile" msgid="3730141667547002246">"បញ្ចូលកូដ PIN ការងាររបស់អ្នកដើម្បីបន្ត"</string>
     <string name="lockpassword_confirm_your_password_generic_profile" msgid="4250642723467019894">"បញ្ចូលពាក្យសម្ងាត់ការងាររបស់អ្នកដើម្បីបន្ត"</string>
-    <!-- no translation found for lockpassword_strong_auth_required_device_pattern (530802132223800623) -->
-    <skip />
-    <!-- no translation found for lockpassword_strong_auth_required_device_pin (7829294830078036417) -->
-    <skip />
-    <!-- no translation found for lockpassword_strong_auth_required_device_password (3552644641574796973) -->
-    <skip />
-    <!-- no translation found for lockpassword_strong_auth_required_work_pattern (3003781907040522053) -->
-    <skip />
-    <!-- no translation found for lockpassword_strong_auth_required_work_pin (3367491332598821552) -->
-    <skip />
-    <!-- no translation found for lockpassword_strong_auth_required_work_password (8159775129968582940) -->
-    <skip />
+    <string name="lockpassword_strong_auth_required_device_pattern" msgid="530802132223800623">"ដើម្បី​ទទួលបាន​សុវត្ថិភាព​បន្ថែម សូម​ប្រើប្រាស់​លំនាំ​ឧបករណ៍​របស់អ្នក"</string>
+    <string name="lockpassword_strong_auth_required_device_pin" msgid="7829294830078036417">"ដើម្បី​ទទួលបាន​សុវត្ថិភាព​បន្ថែម សូម​បញ្ចូល​កូដ PIN ឧបករណ៍​របស់អ្នក"</string>
+    <string name="lockpassword_strong_auth_required_device_password" msgid="3552644641574796973">"ដើម្បី​ទទួលបាន​សុវត្ថិភាព​បន្ថែម សូម​បញ្ចូល​ពាក្យសម្ងាត់​ឧបករណ៍​របស់អ្នក"</string>
+    <string name="lockpassword_strong_auth_required_work_pattern" msgid="3003781907040522053">"ដើម្បី​ទទួលបាន​សុវត្ថិភាព​បន្ថែម សូម​ប្រើប្រាស់​លំនាំកម្រង​ព័ត៌មាន​ការងារ​របស់អ្នក"</string>
+    <string name="lockpassword_strong_auth_required_work_pin" msgid="3367491332598821552">"ដើម្បី​ទទួលបាន​សុវត្ថិភាព​បន្ថែម សូម​បញ្ចូលកូដ PIN កម្រង​ព័ត៌មាន​ការងារ​របស់អ្នក"</string>
+    <string name="lockpassword_strong_auth_required_work_password" msgid="8159775129968582940">"ដើម្បី​ទទួលបាន​សុវត្ថិភាព​បន្ថែម សូមបញ្ចូល​ពាក្យសម្ងាត់​កម្រង​ព័ត៌មានការងារ​របស់អ្នក"</string>
+    <string name="lockpassword_confirm_your_pattern_details_frp" msgid="6757336656791723193">"ទូរសព្ទរបស់អ្នក​ត្រូវបានកំណត់ឡើងវិញ​ដូចចេញពីរោងចក្រ។ ដើម្បីប្រើ​ទូរសព្ទនេះ សូមបញ្ចូលលំនាំមុន​របស់អ្នក។"</string>
+    <string name="lockpassword_confirm_your_pin_details_frp" msgid="826520613445990470">"ទូរសព្ទរបស់អ្នក​ត្រូវបានកំណត់ឡើងវិញ​ដូចចេញ​ពីរោងចក្រ។ ដើម្បី​ប្រើទូរសព្ទនេះ សូមបញ្ចូលកូដ PIN មុនរបស់អ្នក។"</string>
+    <string name="lockpassword_confirm_your_password_details_frp" msgid="8944081074615739040">"ទូរសព្ទរបស់អ្នក​ត្រូវបានកំណត់ឡើងវិញ​ដូចចេញពីរោងចក្រ។ ដើម្បីប្រើទូរសព្ទនេះ សូមបញ្ចូល​ពាក្យសម្ងាត់មុន​របស់អ្នក។"</string>
+    <string name="lockpassword_confirm_your_pattern_header_frp" msgid="2898036091609128286">"ផ្ទៀងផ្ទាត់​លំនាំ"</string>
+    <string name="lockpassword_confirm_your_pin_header_frp" msgid="4141601774778898803">"ផ្ទៀងផ្ទាត់កូដ​PIN"</string>
+    <string name="lockpassword_confirm_your_password_header_frp" msgid="3762615419295360480">"ផ្ទៀងផ្ទាត់​ពាក្យសម្ងាត់"</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>
@@ -1499,8 +1512,8 @@
     <string name="lockpattern_recording_inprogress" msgid="6667844062721656773">"ដក​ម្រាមដៃ​​ពេល​រួចរាល់។"</string>
     <string name="lockpattern_recording_incorrect_too_short" msgid="1348234155120957561">"ភ្ជាប់​ចំណុច​យ៉ាង​ហោច​ណាស់ <xliff:g id="NUMBER">%d</xliff:g> ។ ព្យាយាម​ម្ដង​ទៀត។"</string>
     <string name="lockpattern_pattern_entered_header" msgid="4316818983675591604">"បាន​កត់ត្រា​លំនាំ។"</string>
-    <string name="lockpattern_need_to_confirm" msgid="8054853451639221265">"គូរ​លំនាំ​ម្ដង​ទៀត ដើម្បី​បញ្ជាក់៖"</string>
-    <string name="lockpattern_pattern_confirmed_header" msgid="8455614172231880211">"លំនាំ​ដោះ​សោ​ថ្មី​របស់​អ្នក៖"</string>
+    <string name="lockpattern_need_to_confirm" msgid="8054853451639221265">"គូរ​លំនាំ​ម្ដង​ទៀត ដើម្បី​បញ្ជាក់"</string>
+    <string name="lockpattern_pattern_confirmed_header" msgid="8455614172231880211">"លំនាំ​ដោះ​សោ​ថ្មី​របស់​អ្នក"</string>
     <string name="lockpattern_confirm_button_text" msgid="1128204343957002841">"បញ្ជាក់"</string>
     <string name="lockpattern_restart_button_text" msgid="3337574403350953926">"គូរ​ឡើងវិញ"</string>
     <string name="lockpattern_retry_button_text" msgid="3480423193273588166">"សម្អាត"</string>
@@ -1537,17 +1550,16 @@
     <string name="install_applications_title" msgid="4987712352256508946">"អនុញ្ញាតប្រភពកម្មវិធីទាំងអស់"</string>
     <string name="recent_app_category_title" msgid="6673071268966003928">"កម្មវិធីដែលទើបបើកថ្មីៗ"</string>
     <string name="see_all_apps_title" msgid="1317153498074308438">"មើលកម្មវិធី​ទាំង <xliff:g id="COUNT">%1$d</xliff:g>"</string>
-    <string name="recent_app_summary" msgid="3366446669844932300">"<xliff:g id="TIME">^1</xliff:g> មុន"</string>
     <string name="install_all_warning" product="tablet" msgid="8310489909586138165">"ថេប្លេត និងទិន្នន័យផ្ទាល់ខ្លួនរបស់អ្នកងាយនឹងរងគ្រោះពីការវាយប្រហារពីកម្មវិធីដែលមិនស្គាល់។ ប្រសិនបើដំឡើងកម្មវិធីពីប្រភពនេះ មានន័យថាអ្នកទទួលខុសត្រូវលើការខូចខាតណាមួយចំពោះទូរសព្ទ ឬការបាត់បង់ទិន្នន័យ ដែលអាចបណ្តាលមកពីការប្រើប្រាស់កម្មវិធីទាំងនោះ។"</string>
     <string name="install_all_warning" product="default" msgid="1952257127370115988">"ទូរសព្ទ និងទិន្នន័យផ្ទាល់ខ្លួនរបស់អ្នកងាយនឹងរងគ្រោះពីការវាយប្រហារពីកម្មវិធីដែលមិនស្គាល់។ ប្រសិនបើដំឡើងកម្មវិធីពីប្រភពនេះ មានន័យថាអ្នកនឹងទទួលខុសត្រូវលើការខូចខាតណាមួយចំពោះទូរសព្ទ ឬការបាត់បង់ទិន្នន័យរបស់អ្នក ដែលអាចបណ្តាលមកពីការប្រើប្រាស់កម្មវិធីទាំងនោះ។"</string>
     <string name="advanced_settings" msgid="1777249286757067969">"ការ​កំណត់​កម្រិត​ខ្ពស់"</string>
     <string name="advanced_settings_summary" msgid="4016682978071086747">"បើក​ជម្រើស​កំណត់​ច្រើន​ទៀត"</string>
     <string name="application_info_label" msgid="5736524913065714880">"ព័ត៌មាន​កម្មវិធី"</string>
-    <string name="storage_label" msgid="8700867073480107253">"ការ​ផ្ទុក"</string>
+    <string name="storage_label" msgid="8700867073480107253">"ទំហំផ្ទុក"</string>
     <string name="auto_launch_label" msgid="2669236885531442195">"បើកតាមលំនាំដើម"</string>
     <string name="auto_launch_label_generic" msgid="3230569852551968694">"លំនាំដើម"</string>
     <string name="screen_compatibility_label" msgid="663250687205465394">"ភាព​ត្រូវ​គ្នា​នៃ​អេក្រង់"</string>
-    <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>
@@ -1728,7 +1740,7 @@
     <string name="spellchecker_security_warning" msgid="9060897418527708922">"កម្មវិធី​ពិនិត្យ​អក្ខរាវិរុទ្ធ​នេះ​អាច​ប្រមូល​អត្ថបទ​​ទាំងអស់​ដែល​អ្នក​វាយ រួមមាន ទិន្នន័យ​​ផ្ទាល់​ខ្លួន​ ដូច​ជា​ពាក្យ​សម្ងាត់ និង​លេខ​កាត​ឥណទាន។ វា​បាន​មក​ពី​កម្មវិធី <xliff:g id="SPELLCHECKER_APPLICATION_NAME">%1$s</xliff:g> ។ ប្រើ​កម្មវិធី​ពិនិត្យ​អក្ខរាវិរុទ្ធ​នេះ?"</string>
     <string name="spellchecker_quick_settings" msgid="246728645150092058">"ការ​កំណត់"</string>
     <string name="spellchecker_language" msgid="6041050114690541437">"ភាសា"</string>
-    <string name="keyboard_and_input_methods_category" msgid="6035224122054465137">"ក្តារចុច និងការបញ្ចូល"</string>
+    <string name="keyboard_and_input_methods_category" msgid="6035224122054465137">"ក្តារចុច និងធាតុចូល"</string>
     <string name="virtual_keyboard_category" msgid="1012830752318677119">"ក្ដារ​ចុច​និម្មិត"</string>
     <string name="available_virtual_keyboard_category" msgid="7645766574969139819">"ក្តារចុចនិម្មិតអាចប្រើបាន"</string>
     <string name="add_virtual_keyboard" msgid="3302152381456516928">"គ្រប់គ្រងក្តារចុច"</string>
@@ -1801,7 +1813,7 @@
     <string name="accessibility_settings_summary" msgid="981260486011624939">"កម្មវិធីអានអេក្រង់ ការបង្ហាញ ការគ្រប់គ្រងអន្តរកម្ម"</string>
     <string name="vision_settings_title" msgid="4204111425716868288">"ការកំណត់គំហើញ"</string>
     <string name="vision_settings_description" msgid="5679491180156408260">"អ្នកអាចកែសម្រួលឧបករណ៍នេះឲ្យសមតាម​តម្រូវការរបស់អ្នក។ មុខងារនៃភាព​ងាយស្រួលទាំងនេះអាចផ្លាស់​ប្តូរពេលក្រោយបាននៅក្នុងការកំណត់។"</string>
-    <string name="vision_settings_suggestion_title" msgid="917294957154878441">"បង្កើន​ទំហំ​ពុម្ព​អក្សរ"</string>
+    <string name="vision_settings_suggestion_title" msgid="8058794060304707004">"ប្ដូរ​ទំហំពុម្ពអក្សរ"</string>
     <string name="screen_reader_category_title" msgid="7739154903913400641">"កម្មវិធី​អានអេក្រង់"</string>
     <string name="audio_and_captions_category_title" msgid="3420727114421447524">"សំឡេង និងអក្សរ​នៅលើអេក្រង់"</string>
     <string name="display_category_title" msgid="685461049938269166">"បង្ហាញ"</string>
@@ -1838,7 +1850,6 @@
     <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="preference_summary_default_combination" msgid="8532964268242666060">"<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>
@@ -1948,7 +1959,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>
@@ -1957,12 +1968,14 @@
     <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_whitelisted" msgid="7375400051141016808">"មិនអាចបង្កើនប្រសិទ្ធភាពនៃការប្រើប្រាស់ថ្មសម្រាប់កម្មវិធីបានទេ"</string>
+    <string name="background_activity_warning_dialog_title" msgid="2216249969149568871">"ដាក់កម្រិតលើសកម្មភាពផ្ទៃខាងក្រោយ?"</string>
+    <string name="background_activity_warning_dialog_text" msgid="7049624449246121981">"ប្រសិនបើអ្នកដាក់កម្រិតលើសកម្មភាពផ្ទៃខាងក្រោយសម្រាប់កម្មវិធី វាអាចនឹងដំណើរការខុសប្រក្រតី"</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" msgid="6393929085382334341">"ការប្រើប្រាស់​កម្មវិធីចាប់តាំងពី​សាកថ្មពេញ (<xliff:g id="RELATIVE_TIME">^1</xliff:g>)"</string>
+    <string name="power_usage_list_summary_device" msgid="4461926045610455423">"ការប្រើប្រាស់​ឧបករណ៍​ចាប់តាំងពី​សាកថ្មពេញ (<xliff:g id="RELATIVE_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>
@@ -1982,7 +1995,7 @@
     <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>
@@ -2019,7 +2032,7 @@
     <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>
@@ -2083,7 +2096,7 @@
     <string name="battery_overall_usage" msgid="2093409063297375436">"<xliff:g id="PERCENT">%1$s</xliff:g> នៃ​ថ្ម​ទាំងអស់"</string>
     <string name="battery_detail_since_full_charge" msgid="7515347842046955855">"ព័ត៌មានលម្អិតចាប់​តាំងពី​សាកថ្ម​ពេញ​លើកចុងក្រោយ"</string>
     <string name="battery_last_full_charge" msgid="7151251641099019361">"សាកថ្មពេញលើកចុងក្រោយ"</string>
-    <string name="battery_footer_summary" msgid="67169726550144016">"ទិន្នន័យ​ប្រើប្រាស់​ថ្មគឺជា​ចំនួន​ប្រហាក់ប្រហែល និងអាច​មានការផ្លាស់ប្តូរទៅតាមការប្រើប្រាស់"</string>
+    <string name="battery_footer_summary" msgid="67169726550144016">"ទិន្នន័យ​ប្រើប្រាស់​ថ្មគឺជា​ចំនួន​ប្រហាក់ប្រហែល និងអាច​មានការប្រែប្រួលទៅតាមការប្រើប្រាស់"</string>
     <string name="battery_detail_foreground" msgid="3350401514602032183">"ពេល​កំពុងប្រើប្រាស់​"</string>
     <string name="battery_detail_background" msgid="1929644393553768999">"ខណៈពេលនៅផ្ទៃខាងក្រោយ"</string>
     <string name="battery_detail_power_usage" msgid="6485766868610469101">"ការប្រើប្រាស់ថ្ម"</string>
@@ -2176,7 +2189,7 @@
     <string name="gadget_state_off" msgid="5220212352953066317">"បិទ"</string>
     <string name="gadget_state_turning_on" msgid="3395992057029439039">"បើក"</string>
     <string name="gadget_state_turning_off" msgid="2395546048102176157">"បិទ"</string>
-    <string name="gadget_wifi" msgid="4712584536500629417">"វ៉ាយហ្វាយ"</string>
+    <string name="gadget_wifi" msgid="4712584536500629417">"Wi-Fi"</string>
     <string name="gadget_bluetooth" msgid="8998572807378694410">"ប៊្លូធូស"</string>
     <string name="gadget_location" msgid="2974757497945178165">"ទី​តាំង​"</string>
     <string name="gadget_sync" msgid="858895763714222152">"ធ្វើ​សម​កាល​កម្ម"</string>
@@ -2208,14 +2221,14 @@
     <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">"ពាក្យ​សម្ងាត់​ត្រូវ​តែ​មាន​យ៉ាង​ហោច​ណាស់​ ៨ តួអក្សរ។"</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">"អ្នក​ត្រូវ​​កំណត់​ពាក្យសម្ងាត់ ឬ​កូដ​ PIN ចាក់​សោ​អេក្រង់ មុន​នឹង​អ្នក​អាច​ប្រើ​ការ​ផ្ទុក​​​ព័ត៌មាន​សម្គាល់ខ្លួន។"</string>
+    <string name="credentials_configure_lock_screen_hint" msgid="8058230497337529036">"មុនពេលដែលអ្នកអាចប្រើកន្លែងផ្ទុកព័ត៌មានសម្ងាត់ ឧបករណ៍របស់អ្នកត្រូវតែមានអេក្រង់ចាក់សោដែលមានសុវត្ថិភាព"</string>
+    <string name="credentials_configure_lock_screen_button" msgid="253239765216055321">"កំណត់​ការ​ចាក់​សោ"</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>
@@ -2335,8 +2348,6 @@
     <skip />
     <string name="cant_sync_dialog_title" msgid="2777238588398046285">"មិន​អាច​ធ្វើ​សម​កាល​កម្ម​ដោយ​ដៃ"</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 បញ្ចូល​កូដ PIN របស់​អ្នក"</string>
     <string name="enter_pattern" msgid="4187435713036808566">"ដើម្បី​ចាប់ផ្ដើម Android គូរ​លំនាំ​របស់​អ្នក"</string>
@@ -2350,6 +2361,7 @@
     <string name="misc_files_selected_count" msgid="4647048020823912088">"បាន​ជ្រើស <xliff:g id="NUMBER">%1$d</xliff:g> នៃ <xliff:g id="TOTAL">%2$d</xliff:g>"</string>
     <string name="misc_files_selected_count_bytes" msgid="2876232009069114352">"<xliff:g id="NUMBER">%1$s</xliff:g> នៃ <xliff:g id="TOTAL">%2$s</xliff:g>"</string>
     <string name="select_all" msgid="1562774643280376715">"ជ្រើស​ទាំងអស់"</string>
+    <string name="data_plan_usage_manage_plans_button_text" msgid="8997761990902708162">"គ្រប់គ្រង​គម្រោង"</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>
@@ -2407,13 +2419,13 @@
     <string name="data_usage_restrict_denied_dialog" msgid="55012417305745608">"ការ​ដាក់​កំហិតលើ​ទិន្នន័យ​ផ្ទៃ​ខាង​ក្រោយ​អាច​ធ្វើ​បាន​ លុះត្រាតែ​អ្នក​បាន​កំណត់​កម្រិត​ទិន្នន័យចល័ត​ហើយប៉ុណ្ណោះ។"</string>
     <string name="data_usage_auto_sync_on_dialog_title" msgid="2438617846762244389">"បើក​ការ​ធ្វើ​សម​កាល​កម្ម​ទិន្នន័យ​ស្វ័យ​ប្រវត្តិ?"</string>
     <string name="data_usage_auto_sync_on_dialog" product="tablet" msgid="8581983093524041669">"ការ​ផ្លាស់ប្ដូរ​ណា​មួយ​​ដែល​អ្នក​ធ្វើ​ចំពោះ​គណនី​របស់​អ្នក​នៅ​លើ​បណ្ដាញ​នឹង​ត្រូវ​បាន​ចម្លង​ដោយ​ស្វ័យ​ប្រវត្តិ​​កុំព្យូទ័រ​បន្ទះ​​របស់​អ្នក។​\n\nគណនី​មួយ​ចំនួន​ក៏​អាច​ចម្លង​ការ​ផ្លាស់ប្ដូរ​ដោយ​ស្វ័យ​ប្រវត្តិ​ផង​ដែរ ពេល​អ្នក​ធ្វើ​លើ​​កុំព្យូទ័រ​បន្ទះ​ទៅ​បណ្ដាញ។ គណនី Google ធ្វើការ​តាម​វិធី​នេះ។"</string>
-    <string name="data_usage_auto_sync_on_dialog" product="default" msgid="8651376294887142858">"ការ​ផ្លាស់ប្ដូរ​ណា​មួយ​ដែល​អ្នក​ធ្វើ​ចំពោះ​គណនី​របស់​អ្នក​នៅ​លើ​បណ្ដាញ នឹង​ត្រូវ​បាន​ចម្លង​ដោយ​ស្វ័យ​ប្រវត្តិ​ទៅ​ទូរស័ព្ទ​របស់​អ្នក។​\n\nគណនី​មួយ​ចំនួន​ក៏​អាច​ចម្លង​ការ​ផ្លាស់ប្ដូរ​ដោយ​ស្វ័យ​ប្រវត្តិ​ផង​ដែរ ពេល​អ្នក​ធ្វើ​លើ​ទូរស័ព្ទ​ទៅ​បណ្ដាញ។ គណនី Google ធ្វើការ​តាម​វិធី​នេះ។"</string>
+    <string name="data_usage_auto_sync_on_dialog" product="default" msgid="8651376294887142858">"ការ​ផ្លាស់ប្ដូរ​ណា​មួយ​ដែល​អ្នក​ធ្វើ​ឡើងចំពោះ​គណនី​របស់​អ្នក​នៅ​លើ​បណ្ដាញ នឹង​ត្រូវ​បាន​ចម្លង​ដោយ​ស្វ័យ​ប្រវត្តិ​ទៅ​ទូរសព្ទ​របស់​អ្នក។​\n\nគណនី​មួយ​ចំនួន​ក៏​អាច​ចម្លង​ការ​ផ្លាស់ប្ដូរ​របស់អ្នក​នៅលើ​ទូរសព្ទ​ទៅ​បណ្ដាញដោយ​ស្វ័យ​ប្រវត្តិផងដែរ។ គណនី Google ដំណើរការ​តាម​វិធី​នេះ។"</string>
     <string name="data_usage_auto_sync_off_dialog_title" msgid="9013139130490125793">"បិទ​ការ​ធ្វើ​សម​កាល​កម្ម​ទិន្នន័យ​ស្វ័យ​ប្រវត្តិ?"</string>
     <string name="data_usage_auto_sync_off_dialog" msgid="4025938250775413864">"វា​នឹង​សន្សំ​ការ​ប្រើ​ទិន្នន័យ និង​ថ្ម ប៉ុន្តែ​អ្នក​ត្រូវ​តែ​ធ្វើ​សម​កាល​កម្ម​គណនី​នីមួយៗ​ដោយ​ខ្លួនឯង ដើម្បី​ប្រមូល​​ព័ត៌មាន​ថ្មីៗ។ អ្នក​នឹង​មិន​ទទួល​ការ​ជូន​ដំណឹង​ពេល​មាន​បច្ចុប្បន្នភាព​​ទេ។"</string>
     <string name="data_usage_cycle_editor_title" msgid="1373797281540188533">"កាលបរិច្ឆេទ​កំណត់​ខួប​​ប្រើ​ឡើង​វិញ"</string>
     <string name="data_usage_cycle_editor_subtitle" msgid="5512903797979928416">"កាលបរិច្ឆេទ​នៃ​ខែ​នីមួយៗ៖"</string>
     <string name="data_usage_cycle_editor_positive" msgid="8821760330497941117">"កំណត់"</string>
-    <string name="data_usage_warning_editor_title" msgid="3704136912240060339">"កំណត់​ការ​ព្រមាន​ការ​ប្រើ​ទិន្នន័យ"</string>
+    <string name="data_usage_warning_editor_title" msgid="3704136912240060339">"កំណត់​ការ​ព្រមានពី​ការ​ប្រើ​ទិន្នន័យ"</string>
     <string name="data_usage_limit_editor_title" msgid="9153595142385030015">"កំណត់​ដែន​កំណត់​ប្រើទិន្នន័យ"</string>
     <string name="data_usage_limit_dialog_title" msgid="3023111643632996097">"កម្រិត​ការ​ប្រើ​ទិន្នន័យ"</string>
     <string name="data_usage_limit_dialog_mobile" product="tablet" msgid="4983487893343645667">"ថេប្លេត​របស់​អ្នក​នឹង​បិទ​ទិន្នន័យ​ចល័ត ​នៅ​ពេល​ដែល​វា​ឈាន​ដល់កម្រិតដែល​អ្នក​បាន​កំណត់។\n\nដោយសារ​តែ​ការ​ប្រើ​ប្រាស់​ទិន្នន័យ​ត្រូវ​បាន​វាស់​ស្ទង់ដោយ​ថេប្លេតរបស់អ្នក ​ហើយក្រុមហ៊ុនបម្រើសេវាទូរសព្ទរបស់​អ្នកអាចគណនាលើការប្រើប្រាស់​ខុសពីនោះ សូមពិចារណា​លើការកំណត់កម្រិត​ដែលមានស្រាប់។"</string>
@@ -2435,6 +2447,9 @@
     <string name="data_usage_metered_mobile" msgid="5423305619126978393">"បណ្ដាញ​ចល័ត"</string>
     <string name="data_usage_metered_wifi" msgid="1761738002328299714">"បណ្ដាញ​ Wi-Fi ​ដែល​វាស់ទិន្នន័យ"</string>
     <string name="data_usage_metered_wifi_disabled" msgid="727808462375941567">"ដើម្បី​ជ្រើសរើស​បណ្ដាញ​ដែលមានការកំណត់ សូមបើក Wi-Fi ។"</string>
+    <string name="data_usage_metered_auto" msgid="1262028400911918865">"ស្វ័យប្រវត្តិ"</string>
+    <string name="data_usage_metered_yes" msgid="9217539611385225894">"ថ្លៃ"</string>
+    <string name="data_usage_metered_no" msgid="4025232961929071789">"ធូរថ្លៃ"</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>
@@ -2526,9 +2541,6 @@
     <string name="backup_pw_set_button_text" msgid="2387480910044648795">"កំណត់​ពាក្យ​សម្ងាត់​បម្រុងទុក"</string>
     <string name="backup_pw_cancel_button_text" msgid="8845630125391744615">"បោះ​បង់​"</string>
     <string name="additional_system_update_settings_list_item_title" msgid="214987609894661992">"បច្ចុប្បន្នភាព​ប្រព័ន្ធ​បន្ថែម"</string>
-    <string name="selinux_status_disabled" msgid="924551035552323327">"បិទ"</string>
-    <string name="selinux_status_permissive" msgid="6004965534713398778">"អនុញ្ញាត"</string>
-    <string name="selinux_status_enforcing" msgid="2252703756208463329">"បង្ខំ"</string>
     <string name="ssl_ca_cert_warning" msgid="2045866713601984673">"បណ្ដាញ​អាច​ត្រូវ​បាន​តាមដាន"</string>
     <string name="done_button" msgid="1991471253042622230">"រួចរាល់"</string>
     <plurals name="ssl_ca_cert_dialog_title" formatted="false" msgid="7145092748045794650">
@@ -2571,7 +2583,7 @@
     <string name="user_add_user_message_long" msgid="8562152293752222985">"អ្នកអាចចែករំលែកឧបករណ៍នេះជាមួយមនុស្សផ្សេងទៀតដោយការបង្កើតអ្នកប្រើបន្ថែម។ អ្នកប្រើនីមួយៗមានចន្លោះប្រើផ្ទាល់ខ្លួន ដែលពួកគេអាចប្តូរតាមបំណងជាមួយកម្មវិធី ផ្ទាំងរូបភាព និងរបស់ផ្សេងទៀត។ អ្នកប្រើក៏អាចកែតម្រូវការកំណត់ឧបករណ៍ដូចជា Wi-Fi ផងដែរ ដែលវាប៉ះពាល់ដល់អ្នកប្រើផ្សេងទៀត។\n\nនៅពេលដែលអ្នកបន្ថែមអ្នកប្រើថ្មី បុគ្គលនោះត្រូវដំឡើងចន្លោះប្រើផ្ទាល់ខ្លួនរបស់គេ។\n\nអ្នកប្រើទាំងអស់អាចធ្វើបច្ចុប្បន្នភាពកម្មវិធីសម្រាប់អ្នកប្រើប្រាស់ផ្សេងទៀត។"</string>
     <string name="user_add_user_message_short" msgid="1511354412249044381">"ពេល​អ្នក​បញ្ចូល​​អ្នកប្រើប្រាស់​​ថ្មី អ្នកប្រើ​ប្រាស់​នោះ​ត្រូវ​កំណត់​ទំហំ​ផ្ទាល់​របស់​គេ។\n\nអ្នកប្រើ​ប្រាស់​ណាក៏​​​អាច​ដំឡើងជំនាន់​​កម្មវិធី​សម្រាប់​អ្នកប្រើប្រាស់​​ផ្សេង​ទាំងអស់បានដែរ។"</string>
     <string name="user_setup_dialog_title" msgid="1765794166801864563">"រៀបចំ​អ្នក​ប្រើ​ឥឡូវ?"</string>
-    <string name="user_setup_dialog_message" msgid="1004068621380867148">"សូម​ប្រាកដ​ថា​​អ្នក​ប្រើ​នេះ​អាច​យក​​ឧបករណ៍ ​និង​រៀបចំ​​ទំហំ​របស់​គេ"</string>
+    <string name="user_setup_dialog_message" msgid="1004068621380867148">"សូម​ប្រាកដ​ថា​​អ្នក​ប្រើ​នេះ​អាច​យក​​ឧបករណ៍ ​និង​រៀបចំ​​ទំហំ​របស់​គេបាន"</string>
     <string name="user_setup_profile_dialog_message" msgid="3896568553327558731">"រៀបចំ​ប្រវត្តិរូប​ឥឡូវ?"</string>
     <string name="user_setup_button_setup_now" msgid="3391388430158437629">"រៀបចំ​ឥឡូវ"</string>
     <string name="user_setup_button_setup_later" msgid="3068729597269172401">"កុំអាល"</string>
@@ -2607,7 +2619,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>
@@ -2726,6 +2738,7 @@
       <item quantity="other">បង្ហាញធាតុ %d ដែលបានលាក់</item>
       <item quantity="one">បង្ហាញធាតុ %d ដែលបានលាក់</item>
     </plurals>
+    <string name="dashboard_suggestion_condition_footer_content_description" msgid="2898588191174845961">"បង្រួម"</string>
     <string name="network_dashboard_title" msgid="4771589228992391573">"បណ្តាញ និងអ៊ីនធឺណិត"</string>
     <string name="network_dashboard_summary_mobile" msgid="3851083934739500429">"ឧបករណ៍​ចល័ត"</string>
     <string name="network_dashboard_summary_data_usage" msgid="3843261364705042212">"ការប្រើទិន្នន័យ"</string>
@@ -2785,8 +2798,7 @@
     <string name="keywords_gesture" msgid="3526905012224714078">"ចលនា"</string>
     <string name="keywords_payment_settings" msgid="5220104934130446416">"បង់​ប្រាក់, ចុច, ការ​បង់​ប្រាក់"</string>
     <string name="keywords_backup" msgid="470070289135403022">"ការបម្រុងទុក បម្រុងទុក"</string>
-    <!-- no translation found for keywords_assist_gesture_launch (813968759791342591) -->
-    <skip />
+    <string name="keywords_assist_gesture_launch" msgid="813968759791342591">"ចលនា"</string>
     <string name="setup_wifi_nfc_tag" msgid="9028353016222911016">"រៀបចំ​ស្លាក​អិនអេហ្វ​ស៊ី​វ៉ាយហ្វាយ"</string>
     <string name="write_tag" msgid="8571858602896222537">"សរសេរ"</string>
     <string name="status_awaiting_tap" msgid="2130145523773160617">"ប៉ះ​ស្លាក​ដើម្បី​សរសេរ..."</string>
@@ -2801,7 +2813,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>
@@ -2829,13 +2841,19 @@
       <item quantity="other">ច្បាប់ស្វ័យប្រវត្តិ <xliff:g id="ON_COUNT">%d</xliff:g> បានបើក</item>
       <item quantity="one">ច្បាប់ស្វ័យប្រវត្តិ 1 បានបើក</item>
     </plurals>
-    <string name="zen_mode_settings_title" msgid="842308776768942600">"ចំណូល​ចិត្ត​មុខងារ​កុំ​រំខាន"</string>
-    <string name="zen_mode_priority_settings_title" msgid="2623117023031824309">"អនុញ្ញាតអាទិភាពប៉ុណ្ណោះ"</string>
+    <string name="zen_mode_settings_title" msgid="1066226840983908121">"កុំ​រំខាន"</string>
+    <string name="zen_mode_behavior_settings_title" msgid="1463303933529313969">"សកម្មភាព"</string>
+    <string name="zen_mode_behavior_allow_title" msgid="3845615648136218141">"អនុញ្ញាតឱ្យឮសំឡេង និងញ័រពី"</string>
+    <string name="zen_mode_behavior_no_sound" msgid="1219626004723208056">"គ្មានសំឡេង"</string>
+    <string name="zen_mode_behavior_total_silence" msgid="6716603819806610626">"គ្មានសំឡេង (បិទសំឡេងទាំងស្រុង)"</string>
+    <string name="zen_mode_behavior_no_sound_except" msgid="4968477585788243114">"គ្មានសំឡេង លើកលែងតែ <xliff:g id="CATEGORIES">%1$s</xliff:g>"</string>
+    <!-- no translation found for zen_mode_behavior_alarms_only (2423480992071472963) -->
+    <skip />
     <string name="zen_mode_automation_settings_title" msgid="4228995740594063774">"ច្បាប់ស្វ័យប្រវត្តិ"</string>
     <string name="zen_mode_automation_suggestion_title" msgid="5105443455143476201">"កំណត់ច្បាប់សម្រាប់មុខងារកុំរំខាន"</string>
     <string name="zen_mode_automation_suggestion_summary" msgid="4732808039946935657">"ដាក់កម្រិតលើសំឡេង និងការញ័រក្នុងពេលណាមួយ"</string>
     <string name="zen_mode_option_important_interruptions" msgid="3903928008177972500">"អាទិភាពប៉ុណ្ណោះ"</string>
-    <string name="zen_mode_option_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>
@@ -2861,7 +2879,7 @@
     <string name="lock_screen_notifications_title" msgid="6173076173408887213">"នៅលើអេក្រង់ជាប់សោ"</string>
     <string name="lock_screen_notifications_summary_show" msgid="6407527697810672847">"បង្ហាញ​ខ្លឹមសារនៃការ​ជូនដំណឹង​ទាំងអស់"</string>
     <string name="lock_screen_notifications_summary_hide" msgid="7891552853357258782">"លាក់​ខ្លឹមសារ​​ជូនដំណឹង​​ដែលមានលក្ខណៈរសើប"</string>
-    <string name="lock_screen_notifications_summary_disable" msgid="859628910427886715">"កុំ​បង្ហាញ​ការ​ជូនដំណឹង​"</string>
+    <string name="lock_screen_notifications_summary_disable" msgid="859628910427886715">"កុំ​បង្ហាញ​ការ​ជូនដំណឹង​ឱ្យសោះ"</string>
     <string name="lock_screen_notifications_interstitial_message" msgid="6164532459432182244">"នៅ​ពេល​ឧបករណ៍​របស់​អ្នក​ជាប់​សោ តើ​អ្នក​ចង់​ឲ្យ​ការ​ជូន​ដំណឹង​បង្ហាញ​ដោយ​របៀប​ណា?"</string>
     <string name="lock_screen_notifications_interstitial_title" msgid="1416589393106326972">"ការជូនដំណឹង"</string>
     <string name="lock_screen_notifications_summary_show_profile" msgid="835870815661120772">"បង្ហាញមាតិកាការជូនដំណឹងការងារទាំងអស់"</string>
@@ -2872,13 +2890,15 @@
     <string name="notifications_title" msgid="8086372779371204971">"ការ​ជូនដំណឹង"</string>
     <string name="app_notifications_title" msgid="5810577805218003760">"ការ​ជូន​ដំណឹង​កម្មវិធី"</string>
     <string name="notification_channel_title" msgid="2260666541030178452">"ប្រភេទ​នៃ​ការជូនដំណឹង"</string>
+    <string name="notification_group_title" msgid="7180506440133859601">"ក្រុមប្រភេទ​នៃការជូនដំណឹង"</string>
     <string name="notification_importance_title" msgid="848692592679312666">"សារៈសំខាន់"</string>
-    <string name="notification_importance_unspecified" msgid="2196023702875112081">"ទុក​ឲ្យ​កម្មវិធី​នេះ​សម្រេច"</string>
+    <string name="notification_importance_unspecified" msgid="6622173510486113958">"អនុញ្ញាត​ឱ្យមាន​សំឡេង"</string>
     <string name="notification_importance_blocked" msgid="7938180808339386300">"កុំ​បង្ហាញ​ការ​ជូនដំណឹង"</string>
     <string name="notification_importance_min" msgid="5455049524984686275">"គ្មាន​សំឡេង ឬ​ការ​រំខាន​ដល់​ការ​មើល​ឡើយ"</string>
     <string name="notification_importance_low" msgid="8881468429453766553">"គ្មានសំឡេង"</string>
     <string name="notification_importance_default" msgid="5958338024601957516">"បន្លឺ​សំឡេង"</string>
     <string name="notification_importance_high" msgid="2082429479238228527">"បន្លឺ​សំឡេង និង​លេច​ឡើង​នៅលើ​អេក្រង់"</string>
+    <string name="notification_importance_high_silent" msgid="2667033773703765252">"លោតបង្ហាញ​នៅលើអេក្រង់"</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>
@@ -2915,15 +2935,19 @@
     <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>
-    <!-- no translation found for picture_in_picture_app_detail_summary (1264019085827708920) -->
-    <skip />
+    <string name="picture_in_picture_app_detail_summary" msgid="1264019085827708920">"អនុញ្ញាតឲ្យ​កម្មវិធីនេះ​បង្កើតវិនដូ​រូបក្នុងរូប ខណៈពេល​ដែល​កម្មវិធី​នេះកំពុងបើក ឬ​បន្ទាប់ពី​អ្នកចាកចេញ​ពីវា (ឧទាហរណ៍៖ ដើម្បី​បន្តមើល​វីដេអូ)។ វិនដូនេះ​បង្ហាញ​នៅផ្នែក​ខាងលើ​កម្មវិធី​ផ្សេងទៀត​ដែលអ្នក​កំពុង​ប្រើប្រាស់។"</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="channel_group_notifications_off_desc" msgid="1620950416247316370">"Android កំពុងទប់ស្កាត់​ក្រុមការជូនដំណឹងនេះ​មិនឱ្យបង្ហាញនៅលើ​ឧបករណ៍នេះទេ"</string>
     <string name="notification_channels" msgid="5346841743182627500">"ប្រភេទ"</string>
     <string name="notification_channels_other" msgid="5645317113885788226">"ផ្សេងៗ"</string>
+    <plurals name="notification_group_summary" formatted="false" msgid="3420621520561455358">
+      <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="no_channels" msgid="3077375508177744586">"កម្មវិធី​នេះ​មិន​បាន​បង្ហោះ​ការជូនដំណឹង​ណាមួយ​ឡើយ"</string>
     <string name="app_settings_link" msgid="8894946007543660906">"ការកំណត់បន្ថែមនៅក្នុងកម្មវិធីនេះ"</string>
     <string name="app_notification_listing_summary_zero" msgid="6482582965081108108">"បានបើក​សម្រាប់កម្មវិធី​ទាំង​អស់"</string>
@@ -2943,8 +2967,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>
@@ -2986,8 +3010,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>
@@ -2999,13 +3023,15 @@
     <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>
+    <!-- no translation found for zen_mode_media_system_other (8900209390529859777) -->
+    <skip />
     <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="239685342222975733">"ប្រសិនបើមនុស្សតែមួយហៅទូរសព្ទជាលើកទីពីរក្នុងរយៈពេល <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>
@@ -3034,6 +3060,7 @@
     <string name="zen_mode_screen_off_visual_interruptions" msgid="4850792880144382633">"នៅពេលអេក្រង់បិទ"</string>
     <string name="zen_mode_no_visual_interruptions" msgid="8742776003822778472">"នៅពេលអេក្រង់បើក ឬបិទ"</string>
     <string name="notification_app_settings_button" msgid="6685640230371477485">"​កំណត់​ការ​ជូនដំណឹង"</string>
+    <string name="suggestion_button_text" msgid="3275010948381252006">"យល់ព្រម"</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>
@@ -3218,6 +3245,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="sms_mirroring_pref" msgid="6475043279147376031">"ការបញ្ចាំងសារ SMS"</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>
@@ -3284,7 +3312,7 @@
     <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="permit_write_settings" msgid="658555006453212691">"អនុញ្ញាតឱ្យកែសម្រួលការកំណត់ប្រព័ន្ធ"</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>
@@ -3379,9 +3407,12 @@
     <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">"ដើម្បី​អនុវត្ត​ការ​ផ្លាស់ប្តូរ telephony monitor សូម​ចាប់ផ្តើម​ឧបករណ៍​ឡើងវិញ"</string>
+    <string name="connectivity_monitor_switch" msgid="9059759348648583421">"កម្មវិធីតាមដានការភ្ជាប់"</string>
+    <string name="connectivity_monitor_switch_summary" msgid="2828658652378866401">"កម្មវិធីតាមដានការភ្ជាប់ នឹងប្រមូលកំណត់ហេតុ នៅពេលវារកឃើញបញ្ហាក្នុងការភ្ជាប់ និងបញ្ជូនការ​ជូន​ដំណឹង​ទៅកាន់​អ្នក​ប្រើប្រាស់​ដើម្បី​រាយការណ៍​ពី​បញ្ហា"</string>
+    <string name="connectivity_monitor_toast" msgid="5551859612881173028">"ដើម្បី​អនុវត្ត​ការ​ផ្លាស់ប្តូរលើកម្មវិធីតាមដានការភ្ជាប់ សូម​ចាប់ផ្តើម​ឧបករណ៍​ឡើងវិញ"</string>
     <string name="camera_hal_hdrplus_switch" msgid="8377365197105267466">"កាមេរ៉ា HAL HDR+"</string>
     <string name="camera_hal_hdrplus_toast" msgid="2063703797270055299">"ដើម្បី​អនុវត្ត​ការ​ផ្លាស់ប្តូរ​លើកាមេរ៉ា HAL HDR+ សូមចាប់ផ្តើម​ឧបករណ៍​ឡើងវិញ"</string>
+    <string name="camera_laser_sensor_switch" msgid="8913588990743234440">"ឧបករណ៍ចាប់សញ្ញារបស់កាមេរ៉ាដែលការពារពន្លឺឡាស៊ែរ"</string>
     <string name="ota_disable_automatic_update" msgid="2319639631655915050">"ការអាប់ដេតប្រព័ន្ធដោយស្វ័យប្រវត្តិ"</string>
     <string name="usage" msgid="2977875522080448986">"ការប្រើប្រាស់"</string>
     <string name="cellular_data_usage" msgid="2155683719898158203">"ការប្រើប្រាស់​ទិន្នន័យ​ទូរសព្ទចល័ត"</string>
@@ -3389,7 +3420,7 @@
     <string name="ethernet_data_usage" msgid="5108764537574354616">"ការប្រើប្រាស់ទិន្នន័យអ៊ីសឺរណិត"</string>
     <string name="wifi" msgid="1081550856200013637">"Wi-Fi"</string>
     <string name="ethernet" msgid="6600095783781389720">"អ៊ីសឺរណិត"</string>
-    <string name="cell_data_template" msgid="405684854174361041">"ទិន្នន័យ​ចល័ត <xliff:g id="AMOUNT">^1</xliff:g>"</string>
+    <string name="cell_data_template" msgid="405684854174361041">"ទិន្នន័យទូរសព្ទ​ចល័ត <xliff:g id="AMOUNT">^1</xliff:g>"</string>
     <string name="wifi_data_template" msgid="6265570748799357386">"ទិន្នន័យ Wi-Fi <xliff:g id="AMOUNT">^1</xliff:g>"</string>
     <string name="ethernet_data_template" msgid="5782476509881033590">"ទិន្នន័យអ៊ីសឺរណិត <xliff:g id="AMOUNT">^1</xliff:g>"</string>
     <string name="cell_warning_only" msgid="763147658209027140">"ការព្រមានពីការប្រើទិន្នន័យ <xliff:g id="ID_1">%1$s</xliff:g>"</string>
@@ -3403,11 +3434,11 @@
     </plurals>
     <string name="operator_warning" msgid="1862988028996859195">"ការគណនាទិន្នន័យរបស់ក្រុមហ៊ុនបម្រើសេវាទូរសព្ទអាចនឹងខុសគ្នាពីការគណនាទិន្នន័យរបស់ឧបករណ៍"</string>
     <string name="data_used_template" msgid="3245919669966296505">"បានប្រើ <xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="set_data_warning" msgid="6115364758236594593">"កំណត់ការព្រមានពីការប្រើប្រាស់ទិន្នន័យ"</string>
+    <string name="set_data_warning" msgid="6115364758236594593">"កំណត់ការព្រមានពីការប្រើទិន្នន័យ"</string>
     <string name="data_warning" msgid="209133958008062117">"ការព្រមានពីការប្រើទិន្នន័យ"</string>
     <string name="set_data_limit" msgid="2901526323210516923">"កំណត់ដែនកំណត់ទិន្នន័យ"</string>
     <string name="data_limit" msgid="1885406964934590552">"ដែនកំណត់ទិន្នន័យ"</string>
-    <string name="data_usage_template" msgid="392191945602400904">"<xliff:g id="ID_1">%1$s</xliff:g> បានប្រើនៅចន្លោះ <xliff:g id="ID_2">%2$s</xliff:g>"</string>
+    <string name="data_usage_template" msgid="2923744765873163859">"បានប្រើអស់ <xliff:g id="ID_1">%1$s</xliff:g> នៅថ្ងៃទី <xliff:g id="ID_2">%2$s</xliff:g>"</string>
     <string name="configure" msgid="1029654422228677273">"កំណត់រចនាសម្ព័ន្ធ"</string>
     <string name="data_usage_other_apps" msgid="3272872663517382050">"កម្មវិធីផ្សេងទៀតដែលរួមបញ្ចូលទៅក្នុងការប្រើប្រាស់"</string>
     <plurals name="data_saver_unrestricted_summary" formatted="false" msgid="2635267833484232703">
@@ -3415,7 +3446,7 @@
       <item quantity="one">អនុញ្ញាតឲ្យកម្មវិធី 1 ប្រើទិន្នន័យគ្មានកំណត់ នៅពេលកម្មវិធីសន្សំសំចៃទិន្នន័យបានបើក</item>
     </plurals>
     <string name="data_saver_title" msgid="398458827917495765">"កម្មវិធីសន្សំសំចៃទិន្នន័យ"</string>
-    <string name="unrestricted_data_saver" msgid="952796077540228711">"ទិន្នន័យ​ដែល​លែង​មាន​ការដាក់​កំហិត"</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>
@@ -3436,7 +3467,7 @@
     <string name="not_battery_optimizing" msgid="5362861851864837617">"មិនប្រើការបង្កើនប្រសិទ្ធភាពថ្មទេ"</string>
     <string name="lockscreen_remote_input" msgid="969871538778211843">"ពេលឧបករណ៍ជាប់សោ ទប់ស្កាត់ការវាយអក្សរឆ្លើយតប ឬអត្ថបទផ្សេងទៀតនៅក្នុងការជូនដំណឹង"</string>
     <string name="default_spell_checker" msgid="8506899870026026660">"កម្មវិធីពិនិត្យអក្ខរាវិរុទ្ធលំនាំដើម"</string>
-    <string name="choose_spell_checker" msgid="6596539862291699367">"ជ្រើសកម្មវិធីពិនិត្យអក្ខរាវិរុទ្ធ"</string>
+    <string name="choose_spell_checker" msgid="6596539862291699367">"ជ្រើសរើសកម្មវិធីពិនិត្យអក្ខរាវិរុទ្ធ"</string>
     <string name="spell_checker_not_selected" msgid="8871083796179200696">"មិនបានជ្រើស"</string>
     <string name="notification_log_no_title" msgid="5678029849672024215">"(គ្មាន)"</string>
     <string name="notification_log_details_delimiter" msgid="3116559361552416747">"៖ "</string>
@@ -3476,7 +3507,7 @@
     <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="387052719462473500">"គ្រប់គ្រង​ព័ត៌មាន​លើអេក្រង់ចាក់សោ"</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="8483187649355540109">"ជំនួយ និងគន្លឹះ"</string>
@@ -3484,7 +3515,7 @@
     <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>
+    <string name="bluetooth_disabled" msgid="6244000672828617410">"បិទ"</string>
     <string name="bluetooth_connected_summary" msgid="7672528674593152862">"បាន​ភ្ជាប់ទៅ <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="bluetooth_connected_multiple_devices_summary" msgid="9173661896296663932">"បានភ្ជាប់​ទៅ​ឧបករណ៍​ច្រើន"</string>
     <string name="demo_mode" msgid="2798762752209330277">"មុខងារ​សាកល្បង​ UI ​ប្រព័ន្ធ"</string>
@@ -3549,7 +3580,7 @@
     <string name="gesture_preference_summary" product="tablet" msgid="4717535378272065510">"ធ្វើកាយវិការរហ័សដើម្បីគ្រប់គ្រងថេប្លេតរបស់អ្នក"</string>
     <string name="gesture_preference_summary" product="device" msgid="4205941452664950852">"ធ្វើកាយវិការរហ័សដើម្បីគ្រប់គ្រងឧបករណ៍របស់អ្នក"</string>
     <string name="double_tap_power_for_camera_title" msgid="64716226816032800">"លោតទៅកាមេរ៉ា"</string>
-    <string name="double_tap_power_for_camera_summary" msgid="242037150983277829">"ដើម្បីបើកកាមេរ៉ាឲ្យបានរហ័ស សូមចុចប៊ូតុងថាមពលពីរដង។ ដំណើរការនៅលើអេក្រង់ទាំងអស់។"</string>
+    <string name="double_tap_power_for_camera_summary" msgid="242037150983277829">"ដើម្បីបើកកាមេរ៉ាឲ្យបានរហ័ស សូមចុចប៊ូតុងថាមពលពីរដង។ ដំណើរការនៅលើអេក្រង់ណាមួយក៏បាន។"</string>
     <string name="double_tap_power_for_camera_suggestion_title" msgid="6500405261202883589">"បើក​កាមេរ៉ា​យ៉ាង​រហ័ស"</string>
     <string name="double_tap_power_for_camera_suggestion_summary" msgid="7010153544554016996">"ចុច​ប៊ូតុង​ថាមពល​ពីរដង​ដើម្បី​បើក​កាមេរ៉ា"</string>
     <string name="double_twist_for_camera_mode_title" msgid="4877834147983530479">"ត្រឡប់កាមេរ៉ា"</string>
@@ -3566,7 +3597,7 @@
     <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="4567020486787561873">"ដើម្បី​ពិនិត្យមើល​ម៉ោង រូបជូនដំណឹង និង​ព័ត៌មាន​ផ្សេងទៀត សូមជ្រើសរើស​ទូរសព្ទ​របស់អ្នក។"</string>
+    <string name="ambient_display_pickup_summary" product="default" msgid="4567020486787561873">"ដើម្បី​ពិនិត្យមើល​ម៉ោង រូបជូនដំណឹង និង​ព័ត៌មាន​ផ្សេងទៀត សូមលើកទូរសព្ទ​របស់អ្នក។"</string>
     <string name="ambient_display_pickup_summary" product="tablet" msgid="5435283849947236648">"ដើម្បី​ពិនិត្យមើល​ម៉ោង រូបជូនដំណឹង និង​ព័ត៌មាន​ផ្សេងទៀត សូមជ្រើសរើស​ថេប្លេត​របស់អ្នក។"</string>
     <string name="ambient_display_pickup_summary" product="device" msgid="8256669101643381568">"ដើម្បី​ពិនិត្យមើល​ម៉ោង រូបជូនដំណឹង និង​ព័ត៌មាន​ផ្សេងទៀត សូមជ្រើសរើស​ឧបករណ៍​របស់អ្នក។"</string>
     <string name="ambient_display_pickup_suggestion_summary" msgid="7014700589991761035">"ពិនិត្យមើល​ការជូនដំណឹង​នៅ​ពេល​ដែល​អេក្រង់បិទ"</string>
@@ -3586,7 +3617,7 @@
     <string name="web_action_enable_title" msgid="4051513950976670853">"កម្មវិធី​ប្រើ​ភ្លាមៗ"</string>
     <string name="web_action_enable_summary" msgid="3108127559723396382">"បើកតំណ​នៅក្នុង​កម្មវិធី​បើទោះ​បីជា​ពួកវា​មិនត្រូវ​បាន​ដំឡើង​ក៏ដោយ"</string>
     <string name="web_action_section_title" msgid="7364647086538399136">"កម្មវិធី​ប្រើ​ភ្លាមៗ"</string>
-    <string name="instant_apps_account" msgid="1433620209791992528">"គណនី​កម្មវិធី​ប្រើភ្លាមៗ"</string>
+    <string name="instant_apps_settings" msgid="8827777916518348213">"ចំណូលចិត្ត​កម្មវិធី​ប្រើភ្លាមៗ"</string>
     <string name="domain_url_section_title" msgid="7046835219056428883">"កម្មវិធី​បាន​ដំឡើង"</string>
     <string name="automatic_storage_manager_activation_warning" msgid="6353100011690933254">"នៅពេលនេះទំហំផ្ទុករបស់អ្នកត្រូវបានគ្រប់គ្រងដោយកម្មវិធីគ្រប់គ្រងទំហំផ្ទុក"</string>
     <string name="account_for_section_header" msgid="5356566418548737121">"គណនី​សម្រាប់ <xliff:g id="USER_NAME">%1$s</xliff:g>"</string>
@@ -3633,7 +3664,9 @@
     <string name="enterprise_privacy_always_on_vpn_personal" msgid="9217774730260037434">"VPN ដែល​បើក​ជានិច្ច ត្រូវបាន​បើកក្នុង​កម្រងព័ត៌មាន​ផ្ទាល់ខ្លួន​របស់អ្នក"</string>
     <string name="enterprise_privacy_always_on_vpn_work" msgid="7244472958208315814">"VPN ដែល​បើក​ជានិច្ច ត្រូវបាន​បើកក្នុង​កម្រងព័ត៌មានការងារ​របស់អ្នក"</string>
     <string name="enterprise_privacy_global_http_proxy" msgid="7936664553416257333">"បាន​កំណត់​ប្រូកស៊ី HTTP សកល"</string>
-    <string name="enterprise_privacy_ca_certs" msgid="5885892204903688909">"ព័ត៌មាន​សម្គាល់ខ្លួន​ដែល​ទុក​ចិត្ត"</string>
+    <string name="enterprise_privacy_ca_certs_device" msgid="2019652712782510262">"ព័ត៌មាន​ផ្ទៀងផ្ទាត់​ដែល​ទុកចិត្ត"</string>
+    <string name="enterprise_privacy_ca_certs_personal" msgid="2279084820904076599">"ព័ត៌មាន​ផ្ទៀងផ្ទាត់​ដែល​ទុកចិត្ត​នៅក្នុងកម្រងព័ត៌មាន​ផ្ទាល់ខ្លួន​របស់អ្នក"</string>
+    <string name="enterprise_privacy_ca_certs_work" msgid="6187377647815301809">"ព័ត៌មាន​ផ្ទៀងផ្ទាត់​ដែល​ទុកចិត្ត​នៅក្នុងកម្រងព័ត៌មាន​ការងារ​របស់អ្នក"</string>
     <plurals name="enterprise_privacy_number_ca_certs" formatted="false" msgid="526375234629534165">
       <item quantity="other">មានវិញ្ញាបនបត្រ CA ចំនួនអប្បរមា <xliff:g id="COUNT_1">%d</xliff:g></item>
       <item quantity="one">មានវិញ្ញាបនបត្រ CA ចំនួនអប្បរមា <xliff:g id="COUNT_0">%d</xliff:g></item>
@@ -3696,6 +3729,8 @@
     <string name="carrier_provisioning" msgid="4398683675591893169">"ព័ត៌មាន​អំពី​ការ​ផ្តល់​ទិន្នន័យ​របស់​ក្រុមហ៊ុន​បម្រើ​សេវា​ទូរសព្ទ"</string>
     <string name="trigger_carrier_provisioning" msgid="3434865918009286187">"ជំរុញ​ការ​ផ្តល់​ទិន្នន័យ​របស់​ក្រុមហ៊ុន​បម្រើ​សេវា​ទូរសព្ទ"</string>
     <string name="new_device_suggestion_title" msgid="698847081680980774">"តើមានអ្វីដែលថ្មី និងគួរឲ្យចាប់អារម្មណ៍ដែរទេ?"</string>
-    <string name="new_device_suggestion_summary" msgid="7172709269203435870">"សូមពិនិត្យមើលមុខងារពេញនិយមទាំង 5"</string>
+    <string name="new_device_suggestion_summary" product="default" msgid="206396571522515855">"មើលការណែនាំ​ទូរសព្ទថ្មី​របស់អ្នក"</string>
+    <string name="new_device_suggestion_summary" product="tablet" msgid="393751455688210956">"មើលការណែនាំ​ថេប្លេតថ្មីរបស់អ្នក"</string>
+    <string name="new_device_suggestion_summary" product="device" msgid="2939870049868336652">"មើលការណែនាំ​ឧបករណ៍ថ្មី​របស់អ្នក"</string>
     <string name="disabled_low_ram_device" msgid="3751578499721173344">"មុខងារនេះ​មិនមាន​នៅលើ​ឧបករណ៍​នេះទេ"</string>
 </resources>
diff --git a/res/values-kn/arrays.xml b/res/values-kn/arrays.xml
index 9b5a56c..bc7967f 100644
--- a/res/values-kn/arrays.xml
+++ b/res/values-kn/arrays.xml
@@ -21,7 +21,7 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <string-array name="timezone_filters">
-    <item msgid="5296756001147094692">"ಅಮೆರಿಕಾ"</item>
+    <item msgid="5296756001147094692">"ಅಮೆರಿಕ"</item>
     <item msgid="3005562397632768392">"ಯೂರೋಪ್"</item>
     <item msgid="5696915123093701218">"ಆಫ್ರಿಕಾ"</item>
     <item msgid="4439789052790868249">"ಏಷ್ಯಾ"</item>
@@ -100,8 +100,6 @@
     <!-- no translation found for wifi_security_no_eap:0 (2084555984818107151) -->
     <!-- no translation found for wifi_security_no_eap:1 (397579322683471524) -->
     <!-- no translation found for wifi_security_no_eap:2 (1968820975358150484) -->
-    <!-- no translation found for wifi_ap_security:0 (5251664683198623324) -->
-    <!-- no translation found for wifi_ap_security:1 (7989073072260294673) -->
   <string-array name="wifi_eap_method">
     <item msgid="1160193392455075561">"PEAP"</item>
     <item msgid="7981731051382306293">"TLS"</item>
diff --git a/res/values-kn/strings.xml b/res/values-kn/strings.xml
index bfff915..a8a41d5 100644
--- a/res/values-kn/strings.xml
+++ b/res/values-kn/strings.xml
@@ -88,12 +88,12 @@
     <string name="font_size_preview_text_headline" msgid="7955317408475392247">"ಮಾದರಿ ಪಠ್ಯ"</string>
     <string name="font_size_preview_text_title" msgid="1310536233106975546">"Oz ನ ಅದ್ಭುತವಾದ ವಿಜಾರ್ಡ್‌"</string>
     <string name="font_size_preview_text_subtitle" msgid="4231671528173110093">"ಅಧ್ಯಾಯ 11: Oz ನ ಅದ್ಭುತವಾದ ಎಮೆರಾಲ್ಡ್ ಸಿಟಿ"</string>
-    <string name="font_size_preview_text_body" msgid="2846183528684496723">"ಹಸಿರು ಕನ್ನಡಕಗಳ ಮೂಲಕ ಕಣ್ಣುಗಳನ್ನು ರಕ್ಷಿಸಿಕೊಳ್ಳುತ್ತಲೇ ಡರೋಥಿ ಹಾಗೂ ಅವರ  ಸ್ನೇಹಿತರು ಮೊದಲ ಬಾರಿಗೆ ಅದ್ಭುತ ನಗರದ ವೈಭವ ಕಂಡು ವಿಸ್ಮಯಗೊಂಡರು. ಬೀದಿಗಳ ಅಕ್ಕಪಕ್ಕ ಸುಂದರವಾದ ಮನೆಗಳಿದ್ದವು. ಎಲ್ಲವನ್ನೂ ಹಸಿರು ಅಮೃತ ಶಿಲೆಯಿಂದ ಕಟ್ಟಲಾಗಿತ್ತು ಹಾಗೂ ಹೊಳೆಯುವ ಪಚ್ಚೆಗಳಿಂದ ಎಲ್ಲೆಡೆ ಅಲಂಕರಿಸಲಾಗಿತ್ತು. ಅವರು ಅದೇ ಹಸಿರು ಅಮೃತ ಶಿಲೆ ಮತ್ತು ಪಚ್ಚೆಗಳ ಸಾಲುಗಳಿಂದ ಒಟ್ಟಿಗೆ ಕೂಡಿರುವ ರಸ್ತೆಗಳು, ಹತ್ತಿರ-ಹತ್ತಿರವಾಗಿ ಹೊಂದಿಸಲಾದ ಮತ್ತು ಸೂರ್ಯನ ಪ್ರಕಾಶತೆಯಲ್ಲಿ ಹೊಳೆಯುತ್ತಿರುವ ಕಾಲುಹಾದಿಯಲ್ಲಿ ನಡೆದರು. ಕಿಟಕಿಯ ಫಲಕಗಳನ್ನು ಹಸಿರು ಗಾಜಿನಿಂದ ಮಾಡಲಾಗಿತ್ತು; ಅಲ್ಲದೆ ನಗರದ ಆಕಾಶವೂ ಹಸಿರು ಛಾಯೆಯಿಂದ ಕೂಡಿತ್ತು ಮತ್ತು ಸೂರ್ಯನ ಕಿರಣಗಳು ಹಸಿರಿನಿಂದ ಕಂಗೊಳಿಸುತ್ತಿದ್ದವು. \n\nಅನೇಕ ಜನರು, ಪುರುಷರು, ಮಹಿಳೆಯರು ಮತ್ತು ಮಕ್ಕಳು ಬಂದಿದ್ದರು, ನಡೆದಾಡುತ್ತಿದ್ದರು ಹಾಗೂ ಈ ಎಲ್ಲರೂ ಹಸಿರು ಬಟ್ಟೆಯನ್ನು ಧರಿಸಿದ್ದರು ಜೊತೆಗೆ ಹಸಿರು ಚರ್ಮ ಹೊಂದಿದ್ದರು. ಅವರು ಡರೊಥಿಯನ್ನು ನೋಡಿದರು ಮತ್ತು ಅವರು ತಮ್ಮ ಚಕಿತಗೊಳ್ಳುವ ಕಣ್ಣುಗಳಿಂದ ಕಂಪನಿಯನ್ನು ಆಶ್ಚರ್ಯದಿಂದ ನೋಡುತ್ತಿದ್ದರು ಮತ್ತು ಎಲ್ಲಾ ಮಕ್ಕಳು ಸಿಂಹವನ್ನು ನೋಡಿದ ರೀತಿಯಲ್ಲಿ ತಮ್ಮ ತಾಯಿ ಹಿಂದೆ ಅಡಗಿಕೊಂಡವು; ಆದರೆ ಯಾರೊಬ್ಬರೂ ಇವರೊಂದಿಗೆ ಮಾತನಾಡಲಿಲ್ಲ. ಅನೇಕ ಅಂಗಡಿಗಳು ಬೀದಿಯಲ್ಲಿದ್ದವು, ಡರೊಥಿ ಮೂಲಕ ನೋಡಿದಾಗ ಅವುಗಳಲ್ಲಿ ಎಲ್ಲವೂ ಹಸಿರಾಗಿ ಕಂಡಿತು. ಮಾರಾಟಕ್ಕಿಡಲಾದ ಹಸಿರು ಕ್ಯಾಂಡಿ ಮತ್ತು ಹಸಿರು ಪಾಪ್‌-ಕಾರ್ನ್‌, ಜೊತೆಗೆ ಹಸಿರು ಶೂ, ಹಸಿರು ಟೋಪಿಗಳು ಮತ್ತು ಎಲ್ಲ ವಿಂಗಡನೆಗಳ ಹಸಿರು ಬಟ್ಟೆಗಳು ಮತ್ತು ಒಂದು ಸ್ಥಳದಲ್ಲಿ ಒಬ್ಬ ವ್ಯಕ್ತಿ ಹಸಿರು ನಿಂಬೆ ಪಾನಕ ಮಾರಾಟ ಮಾಡುತ್ತಿದ್ದನು ಮತ್ತು ಇದನ್ನು ಮಕ್ಕಳು ಖರೀದಿಸಿದಾಗ ಅವರು ಹಸಿರು ನಾಣ್ಯಗಳನ್ನು ಕೊಟ್ಟು ಖರೀದಿಸುತ್ತಿರುವುದನ್ನು ನೋಡಲಾಯಿತು. \n\nಯಾವುದೇ ಕುದುರೆಗಳು ಅಥವಾ ಯಾವುದೇ ರೀತಿಯ ಪ್ರಾಣಿಗಳು ಅಲ್ಲಿ ಕಾಣುತ್ತಿರಲಿಲ್ಲ; ಮಕ್ಕಳು ಬಂಡಿಯನ್ನು ತಳ್ಳುವುದಕ್ಕೂ ಮೊದಲು, ಒಬ್ಬ ವ್ಯಕ್ತಿಯು ಸಣ್ಣ ಹಸಿರು ಬಂಡಿಗಳಲ್ಲಿ ಸುತ್ತಮುತ್ತಲಿನ ವಸ್ತುಗಳನ್ನು ಸಾಗಿಸುತ್ತಿರುವುದು ಕಂಡುಬಂದಿತು. ಎಲ್ಲರೂ ಸಂತೋಷ ಮತ್ತು ತೃಪ್ತಿ ಹಾಗೂ ಸಮೃಧ್ಧ ಭಾವನೆಯಿಂದ ಇರುವಂತೆ ತೋರುತ್ತಿತ್ತು."</string>
+    <string name="font_size_preview_text_body" msgid="2846183528684496723">"ಹಸಿರು ಕನ್ನಡಕಗಳ ಮೂಲಕ ಕಣ್ಣುಗಳನ್ನು ರಕ್ಷಿಸಿಕೊಳ್ಳುತ್ತಲೇ ಡರೋಥಿ ಹಾಗೂ ಅವರ ಸ್ನೇಹಿತರು ಮೊದಲ ಬಾರಿಗೆ ಅದ್ಭುತ ನಗರದ ವೈಭವ ಕಂಡು ವಿಸ್ಮಯಗೊಂಡರು. ಬೀದಿಗಳ ಅಕ್ಕಪಕ್ಕ ಸುಂದರವಾದ ಮನೆಗಳಿದ್ದವು. ಎಲ್ಲವನ್ನೂ ಹಸಿರು ಅಮೃತ ಶಿಲೆಯಿಂದ ಕಟ್ಟಲಾಗಿತ್ತು ಹಾಗೂ ಹೊಳೆಯುವ ಪಚ್ಚೆಗಳಿಂದ ಎಲ್ಲೆಡೆ ಅಲಂಕರಿಸಲಾಗಿತ್ತು. ಅವರು ಅದೇ ಹಸಿರು ಅಮೃತ ಶಿಲೆ ಮತ್ತು ಪಚ್ಚೆಗಳ ಸಾಲುಗಳಿಂದ ಒಟ್ಟಿಗೆ ಕೂಡಿರುವ ರಸ್ತೆಗಳು, ಹತ್ತಿರ-ಹತ್ತಿರವಾಗಿ ಹೊಂದಿಸಲಾದ ಮತ್ತು ಸೂರ್ಯನ ಪ್ರಕಾಶತೆಯಲ್ಲಿ ಹೊಳೆಯುತ್ತಿರುವ ಕಾಲುಹಾದಿಯಲ್ಲಿ ನಡೆದರು. ಕಿಟಕಿಯ ಫಲಕಗಳನ್ನು ಹಸಿರು ಗಾಜಿನಿಂದ ಮಾಡಲಾಗಿತ್ತು; ಅಲ್ಲದೆ ನಗರದ ಆಕಾಶವೂ ಹಸಿರು ಛಾಯೆಯಿಂದ ಕೂಡಿತ್ತು ಮತ್ತು ಸೂರ್ಯನ ಕಿರಣಗಳು ಹಸಿರಿನಿಂದ ಕಂಗೊಳಿಸುತ್ತಿದ್ದವು. \n\nಅನೇಕ ಜನರು, ಪುರುಷರು, ಮಹಿಳೆಯರು ಮತ್ತು ಮಕ್ಕಳು ಬಂದಿದ್ದರು, ನಡೆದಾಡುತ್ತಿದ್ದರು ಹಾಗೂ ಈ ಎಲ್ಲರೂ ಹಸಿರು ಬಟ್ಟೆಯನ್ನು ಧರಿಸಿದ್ದರು ಜೊತೆಗೆ ಹಸಿರು ಚರ್ಮ ಹೊಂದಿದ್ದರು. ಅವರು ಡರೊಥಿಯನ್ನು ನೋಡಿದರು ಮತ್ತು ಅವರು ತಮ್ಮ ಚಕಿತಗೊಳ್ಳುವ ಕಣ್ಣುಗಳಿಂದ ಕಂಪನಿಯನ್ನು ಆಶ್ಚರ್ಯದಿಂದ ನೋಡುತ್ತಿದ್ದರು ಮತ್ತು ಎಲ್ಲಾ ಮಕ್ಕಳು ಸಿಂಹವನ್ನು ನೋಡಿದ ರೀತಿಯಲ್ಲಿ ತಮ್ಮ ತಾಯಿ ಹಿಂದೆ ಅಡಗಿಕೊಂಡವು; ಆದರೆ ಯಾರೊಬ್ಬರೂ ಇವರೊಂದಿಗೆ ಮಾತನಾಡಲಿಲ್ಲ. ಅನೇಕ ಅಂಗಡಿಗಳು ಬೀದಿಯಲ್ಲಿದ್ದವು, ಡರೊಥಿ ಮೂಲಕ ನೋಡಿದಾಗ ಅವುಗಳಲ್ಲಿ ಎಲ್ಲವೂ ಹಸಿರಾಗಿ ಕಂಡಿತು. ಮಾರಾಟಕ್ಕಿಡಲಾದ ಹಸಿರು ಕ್ಯಾಂಡಿ ಮತ್ತು ಹಸಿರು ಪಾಪ್‌-ಕಾರ್ನ್‌, ಜೊತೆಗೆ ಹಸಿರು ಶೂ, ಹಸಿರು ಟೋಪಿಗಳು ಮತ್ತು ಎಲ್ಲ ವಿಂಗಡನೆಗಳ ಹಸಿರು ಬಟ್ಟೆಗಳು ಮತ್ತು ಒಂದು ಸ್ಥಳದಲ್ಲಿ ಒಬ್ಬ ವ್ಯಕ್ತಿ ಹಸಿರು ನಿಂಬೆ ಪಾನಕ ಮಾರಾಟ ಮಾಡುತ್ತಿದ್ದನು ಮತ್ತು ಇದನ್ನು ಮಕ್ಕಳು ಖರೀದಿಸಿದಾಗ ಅವರು ಹಸಿರು ನಾಣ್ಯಗಳನ್ನು ಕೊಟ್ಟು ಖರೀದಿಸುತ್ತಿರುವುದನ್ನು ನೋಡಲಾಯಿತು. \n\nಯಾವುದೇ ಕುದುರೆಗಳು ಅಥವಾ ಯಾವುದೇ ರೀತಿಯ ಪ್ರಾಣಿಗಳು ಅಲ್ಲಿ ಕಾಣುತ್ತಿರಲಿಲ್ಲ; ಮಕ್ಕಳು ಬಂಡಿಯನ್ನು ತಳ್ಳುವುದಕ್ಕೂ ಮೊದಲು, ಒಬ್ಬ ವ್ಯಕ್ತಿಯು ಸಣ್ಣ ಹಸಿರು ಬಂಡಿಗಳಲ್ಲಿ ಸುತ್ತಮುತ್ತಲಿನ ವಸ್ತುಗಳನ್ನು ಸಾಗಿಸುತ್ತಿರುವುದು ಕಂಡುಬಂದಿತು. ಎಲ್ಲರೂ ಸಂತೋಷ ಮತ್ತು ತೃಪ್ತಿ ಹಾಗೂ ಸಮೃಧ್ಧ ಭಾವನೆಯಿಂದ ಇರುವಂತೆ ತೋರುತ್ತಿತ್ತು."</string>
     <string name="font_size_save" msgid="3450855718056759095">"ಸರಿ"</string>
     <string name="sdcard_setting" product="nosdcard" msgid="8281011784066476192">"USB ಸಂಗ್ರಹಣೆ"</string>
     <string name="sdcard_setting" product="default" msgid="5922637503871474866">"SD ಕಾರ್ಡ್"</string>
     <string name="bluetooth" msgid="5549625000628014477">"ಬ್ಲೂಟೂತ್‌‌"</string>
-    <string name="bluetooth_is_discoverable" msgid="8373421452106840526">"ಹತ್ತಿರದ ಎಲ್ಲ ಬ್ಲೂಟೂತ್‌‌ ಸಾಧನಗಳಿಗೆ ಗೋಚರಿಸುತ್ತದೆ (<xliff:g id="DISCOVERABLE_TIME_PERIOD">%1$s</xliff:g>)"</string>
+    <string name="bluetooth_is_discoverable" msgid="8373421452106840526">"ಹತ್ತಿರದ ಎಲ್ಲ ಬ್ಲೂಟೂತ್ ಸಾಧನಗಳಿಗೆ ಗೋಚರಿಸುತ್ತದೆ (<xliff:g id="DISCOVERABLE_TIME_PERIOD">%1$s</xliff:g>)"</string>
     <string name="bluetooth_is_discoverable_always" msgid="2849387702249327748">"ಹತ್ತಿರದ ಎಲ್ಲ ಬ್ಲೂಟೂತ್‌‌ ಸಾಧನಗಳಿಗೆ ಗೋಚರಿಸುತ್ತದೆ"</string>
     <string name="bluetooth_not_visible_to_other_devices" msgid="9120274591523391910">"ಇತರೆ ಬ್ಲೂಟೂತ್‌‌ ಸಾಧನಗಳಿಗೆ ಗೋಚರಿಸುವುದಿಲ್ಲ"</string>
     <string name="bluetooth_only_visible_to_paired_devices" msgid="2049983392373296028">"ಜೋಡಣೆಗೊಂಡ ಸಾಧನಗಳಿಗೆ ಮಾತ್ರ ಗೋಚರಿಸುತ್ತದೆ"</string>
@@ -106,7 +106,7 @@
     <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="7830252930348734303">"ಸಾಧನದ ಸಂಪರ್ಕ ಕಡಿತಗೊಳಿಸುವುದೇ?"</string>
     <string name="bluetooth_disconnect_all_profiles" product="default" msgid="8208712728668714199">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>ನಿಂದ ನಿಮ್ಮ ಫೋನ್‌ನ ಸಂಪರ್ಕ ಕಡಿತಗೊಳ್ಳುತ್ತದೆ."</string>
@@ -166,7 +166,7 @@
     <string name="bluetooth_map_acceptance_dialog_text" msgid="8712508202081143737">"%1$s ನಿಮ್ಮ ಸಂದೇಶಗಳನ್ನು ಪ್ರವೇಶಿಸಲು ಬಯಸುತ್ತದೆ. %2$s ಗೆ ಪ್ರವೇಶವನ್ನು ನೀಡುವುದೇ?"</string>
     <string name="bluetooth_sap_request" msgid="2669762224045354417">"ಸಿಮ್ ಪ್ರವೇಶ ವಿನಂತಿ"</string>
     <string name="bluetooth_sap_acceptance_dialog_text" msgid="4414253873553608690">"<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g> ನಿಮ್ಮ ಸಿಮ್ ಕಾರ್ಡ್ ಪ್ರವೇಶಿಸಲು ಬಯಸುತ್ತದೆ. ಸಿಮ್ ಕಾರ್ಡ್‌ಗೆ ಪ್ರವೇಶವನ್ನು ನೀಡಿದರೆ, ಸಂಪರ್ಕಪಡಿಸುವ ಸಂದರ್ಭದಲ್ಲಿ ನಿಮ್ಮ ಸಾಧನದಲ್ಲಿ ಡೇಟಾ ಸಂಪರ್ಕಪಡಿಸುವಿಕೆಯನ್ನು ನಿಷ್ಕ್ರಿಯಗೊಳಿಸುತ್ತದೆ. <xliff:g id="DEVICE_NAME_1">%2$s?</xliff:g> ಗೆ ಪ್ರವೇಶ ನೀಡಿ"</string>
-    <string name="bluetooth_device_name_summary" msgid="4757990010751789977">"ಇತರ ಸಾಧನಗಳಿಗೆ \'<xliff:g id="DEVICE_NAME">^1</xliff:g>\' ಎಂದು ಗೋಚರಿಸುತ್ತದೆ"</string>
+    <string name="bluetooth_device_name_summary" msgid="522235742194965734">"ಇತರ ಸಾಧನಗಳಿಗೆ “<xliff:g id="DEVICE_NAME">^1</xliff:g>” ಎಂದು ಗೋಚರಿಸುತ್ತದೆ"</string>
     <string name="bluetooth_paired_device_title" msgid="8638994696317952019">"ನಿಮ್ಮ ಸಾಧನಗಳು"</string>
     <string name="bluetooth_pairing_page_title" msgid="7712127387361962608">"ಹೊಸ ಸಾಧನವನ್ನು ಜೋಡಿಸಿ"</string>
     <string name="date_and_time" msgid="9062980487860757694">"ದಿನಾಂಕ &amp; ಸಮಯ"</string>
@@ -222,7 +222,7 @@
     <string name="ping_test_label" msgid="579228584343892613">"ಪಿಂಗ್ ಪರೀಕ್ಷೆ ರನ್ ಮಾಡಿ"</string>
     <string name="radio_info_smsc_label" msgid="6399460520126501354">"SMSC:"</string>
     <string name="radio_info_smsc_update_label" msgid="7258686760358791539">"ಅಪ್‌ಡೇಟ್‌ ಮಾಡು"</string>
-    <string name="radio_info_smsc_refresh_label" msgid="6902302130315125102">"ರೀಫ್ರೆಶ್ ಮಾಡಿ"</string>
+    <string name="radio_info_smsc_refresh_label" msgid="6902302130315125102">"ರಿಫ್ರೆಶ್ ಮಾಡಿ"</string>
     <string name="radio_info_toggle_dns_check_label" msgid="6625185764803245075">"DNS ಪರಿಶೀಲನೆ ಟಾಗಲ್ ಮಾಡಿ"</string>
     <string name="oem_radio_info_label" msgid="6163141792477958941">"OEM-ನಿರ್ದಿಷ್ಟ ಮಾಹಿತಿ/ಸೆಟ್ಟಿಂಗ್‌ಗಳು"</string>
     <string name="band_mode_title" msgid="4071411679019296568">"ರೇಡಿಯೋ ಬ್ಯಾಂಡ್ ಮೋಡ್ ಹೊಂದಿಸಿ"</string>
@@ -286,7 +286,7 @@
     <string name="airplane_mode" msgid="8837269988154128601">"ಏರ್‌ಪ್ಲೇನ್ ಮೋಡ್"</string>
     <string name="radio_controls_title" msgid="3447085191369779032">"ಇನ್ನಷ್ಟು"</string>
     <string name="wireless_networks_settings_title" msgid="3643009077742794212">"ವಯರ್‌ಲೆಸ್ &amp; ನೆಟ್‌ವರ್ಕ್‌ಗಳು"</string>
-    <string name="radio_controls_summary" msgid="1838624369870907268">"Wi‑Fi, ಬ್ಲೂಟೂತ್‌‌, ಏರೋಪ್ಲೇನ್ ಮೋಡ್, ಮೊಬೈಲ್‌ ನೆಟ್‌ವರ್ಕ್‌ಗಳು, &amp; VPN ಗಳನ್ನು ನಿರ್ವಹಿಸಿ"</string>
+    <string name="radio_controls_summary" msgid="1838624369870907268">"ವೈ-ಫೈ, ಬ್ಲೂಟೂತ್, ಏರೋಪ್ಲೇನ್ ಮೋಡ್, ಮೊಬೈಲ್‌ ನೆಟ್‌ವರ್ಕ್‌ಗಳು, &amp; VPN ಗಳನ್ನು ನಿರ್ವಹಿಸಿ"</string>
     <string name="cellular_data_title" msgid="6835451574385496662">"ಮೊಬೈಲ್ ಡೇಟಾ"</string>
     <string name="calls_title" msgid="3544471959217176768">"ಕರೆಗಳು"</string>
     <string name="sms_messages_title" msgid="1778636286080572535">"SMS ಸಂದೇಶಗಳು"</string>
@@ -312,6 +312,8 @@
     <string name="zone_auto" msgid="334783869352026648">"ಸ್ವಯಂಚಾಲಿತ ಸಮಯ ವಲಯ"</string>
     <string name="zone_auto_summaryOn" msgid="6142830927278458314">"ನೆಟ್‌ವರ್ಕ್‌ ಒದಗಿಸಿದ ಸಮಯ ವಲಯವನ್ನು ಬಳಸು"</string>
     <string name="zone_auto_summaryOff" msgid="2597745783162041390">"ನೆಟ್‌ವರ್ಕ್‌ ಒದಗಿಸಿದ ಸಮಯ ವಲಯವನ್ನು ಬಳಸು"</string>
+    <string name="date_time_24hour_auto" msgid="2117383168985653422">"ಸ್ವಯಂಚಾಲಿತ 24-ಗಂಟೆ ಫಾರ್ಮ್ಯಾಟ್‌‌"</string>
+    <string name="date_time_24hour_auto_summary" msgid="6351812925651480277">"ಸ್ಥಳೀಯ ಡೀಫಾಲ್ಟ್ ಬಳಸಿ"</string>
     <string name="date_time_24hour_title" msgid="3203537578602803850">"24‑ಗಂಟೆಯ ಸ್ವರೂಪ"</string>
     <string name="date_time_24hour" msgid="1193032284921000063">"24-ಗಂಟೆ ಫಾರ್ಮ್ಯಾಟ್‌‌ ಬಳಸು"</string>
     <string name="date_time_set_time_title" msgid="6296795651349047016">"ಸಮಯ"</string>
@@ -341,8 +343,7 @@
     <string name="Accounts_settings_title" msgid="1643879107901699406">"ಖಾತೆಗಳು"</string>
     <string name="location_settings_title" msgid="1369675479310751735">"ಸ್ಥಳ"</string>
     <string name="account_settings_title" msgid="626177544686329806">"ಖಾತೆಗಳು"</string>
-    <!-- no translation found for security_settings_title (4918904614964215087) -->
-    <skip />
+    <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>
@@ -373,6 +374,9 @@
     <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="1961957425135180242">"ಮುಂದೆ"</string>
+    <string name="setup_fingerprint_enroll_skip_title" msgid="362050541117362034">"ಫಿಂಗರ್‌ಪ್ರಿಂಟ್‌ ಸ್ಕಿಪ್ ಮಾಡುವುದೇ?"</string>
+    <string name="setup_fingerprint_enroll_skip_after_adding_lock_text" msgid="958990414356204763">"ಫಿಂಗರ್‌ಪ್ರಿಂಟ್‌ ಸೆಟಪ್‌ ಮಾಡಲು ಒಂದು ಅಥವಾ ಎರಡು ನಿಮಿಷ ತೆಗೆದುಕೊಳ್ಳುತ್ತದೆ. ನೀವು ಇದನ್ನು ಸ್ಕಿಪ್‌ ಮಾಡಿದರೆ, ನೀವು ಸೆಟ್ಟಿಂಗ್‌ಗಳಲ್ಲಿ ನಂತರ ನಿಮ್ಮ ಫಿಂಗರ್‌ಪ್ರಿಂಟ್‌ ಸೇರಿಸಬಹುದು."</string>
+    <string name="lock_screen_intro_skip_title" msgid="4988210105913705679">"ಪರದೆಯ ಲಾಕ್ ಸ್ಕಿಪ್ ಮಾಡುವುದೇ?"</string>
     <string name="lock_screen_intro_skip_dialog_text_frp" product="tablet" msgid="1581834104051243425">"ಸಾಧನದ ರಕ್ಷಣೆ ವೈಶಿಷ್ಟ್ಯಗಳನ್ನು ಆನ್‌ ಮಾಡಲು ಸಾಧ್ಯವಾಗುವುದಿಲ್ಲ. ಈ ಸಾಧನವು ಕಳೆದು ಹೋದರೆ ಅಥವಾ ಕಳವಾದರೆ ಇತರರು ಇದನ್ನು ಬಳಸುವುದನ್ನು ನಿಮಗೆ ತಡೆಯಲು ಸಾಧ್ಯವಾಗದೆ ಇರಬಹುದು."</string>
     <string name="lock_screen_intro_skip_dialog_text_frp" product="device" msgid="4629503416877189572">"ಸಾಧನದ ರಕ್ಷಣೆ ವೈಶಿಷ್ಟ್ಯಗಳನ್ನು ಆನ್‌ ಮಾಡಲು ಸಾಧ್ಯವಾಗುವುದಿಲ್ಲ. ಈ ಸಾಧನವು ಕಳೆದು ಹೋದರೆ ಅಥವಾ ಕಳವಾದರೆ ಇತರರು ಇದನ್ನು ಬಳಸುವುದನ್ನು ನಿಮಗೆ ತಡೆಯಲು ಸಾಧ್ಯವಾಗದೆ ಇರಬಹುದು."</string>
     <string name="lock_screen_intro_skip_dialog_text_frp" product="default" msgid="2423428240245737909">"ಸಾಧನದ ರಕ್ಷಣೆ ವೈಶಿಷ್ಟ್ಯಗಳನ್ನು ಆನ್‌ ಮಾಡಲು ಸಾಧ್ಯವಾಗುವುದಿಲ್ಲ. ಈ ಫೋನ್‌ ಕಳೆದು ಹೋದರೆ ಅಥವಾ ಕಳವಾದರೆ ಇತರರು ಇದನ್ನು ಬಳಸುವುದನ್ನು ನಿಮಗೆ ತಡೆಯಲು ಸಾಧ್ಯವಾಗದೆ ಇರಬಹುದು."</string>
@@ -382,7 +386,7 @@
     <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="3051496861358227199">"ಸೆನ್ಸಾರ್ ಸ್ಪರ್ಶಿಸಿ"</string>
-    <string name="security_settings_fingerprint_enroll_find_sensor_message" msgid="8793966374365960368">"ನಿಮ್ಮ ಫೋನ್‌ನ ಹಿಂಬದಿಯಲ್ಲಿದೆ. ನಿಮ್ಮ ಸೂಚಿಕ ಬೆರಳನ್ನು ಬಳಸಿ."</string>
+    <string name="security_settings_fingerprint_enroll_find_sensor_message" msgid="8793966374365960368">"ನಿಮ್ಮ ಫೋನ್‌ನ ಹಿಂಬದಿಯಲ್ಲಿದೆ. ನಿಮ್ಮ ತೋರು ಬೆರಳನ್ನು ಬಳಸಿ."</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_content_description" msgid="2058830032070449160">"ಸಾಧನ ಮತ್ತು ಬೆರಳಚ್ಚು ಸೆನ್ಸಾರ್ ಸ್ಥಳದೊಂದಿಗೆ ವಿವರಣೆ"</string>
     <string name="security_settings_fingerprint_enroll_dialog_name_label" msgid="7086763077909041106">"ಹೆಸರು"</string>
     <string name="security_settings_fingerprint_enroll_dialog_ok" msgid="4150384963879569750">"ಸರಿ"</string>
@@ -399,7 +403,7 @@
     <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="2989019978041986175">"ನಿಮ್ಮ ಫೋನ್ ಹಿಂಬದಿಯಲ್ಲಿರುವ ಸೆನ್ಸಾರ್ ಸ್ಪರ್ಶಿಸಿ. ನಿಮ್ಮ ಸೂಚಿಕ ಬೆರಳನ್ನು ಬಳಸಿ."</string>
+    <string name="security_settings_fingerprint_enroll_touch_dialog_message" msgid="2989019978041986175">"ನಿಮ್ಮ ಫೋನ್ ಹಿಂಬದಿಯಲ್ಲಿರುವ ಸೆನ್ಸಾರ್ ಸ್ಪರ್ಶಿಸಿ. ನಿಮ್ಮ ತೋರು ಬೆರಳನ್ನು ಬಳಸಿ."</string>
     <string name="security_settings_fingerprint_enroll_error_dialog_title" msgid="3618021988442639280">"ನೋಂದಣಿ ಪೂರ್ಣಗೊಂಡಿಲ್ಲ"</string>
     <string name="security_settings_fingerprint_enroll_error_timeout_dialog_message" msgid="2942551158278899627">"ಬೆರಳಚ್ಚು ನೋಂದಣಿ ಸಮಯದ ಮಿತಿಯನ್ನು ಮೀರಿದೆ. ಮತ್ತೆ ಪ್ರಯತ್ನಿಸಿ."</string>
     <string name="security_settings_fingerprint_enroll_error_generic_dialog_message" msgid="3624760637222239293">"ಬೆರಳಚ್ಚು ನೋಂದಣಿ ಕೆಲಸ ಮಾಡುತ್ತಿಲ್ಲ. ಮತ್ತೆ ಪ್ರಯತ್ನಿಸಿ ಅಥವಾ ಬೇರೊಂದು ಬೆರಳನ್ನು ಬಳಸಿ."</string>
@@ -458,7 +462,7 @@
     <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="lock_settings_picker_fingerprint_added_security_message" msgid="5768002109707648463">"ಹೆಚ್ಚಿನ ಸುರಕ್ಷತೆಗಾಗಿ, ಬ್ಯಾಕಪ್‌ ಸ್ಕ್ರೀನ್ ಲಾಕ್ ಅನ್ನು ಹೊಂದಿಸಿ."</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>
@@ -500,29 +504,37 @@
     <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>
-    <!-- no translation found for unlock_disable_frp_warning_content_pattern_fingerprint (2986105377420905314) -->
-    <skip />
+    <string name="unlock_disable_frp_warning_content_pattern_fingerprint" msgid="2986105377420905314">"ನಿಮ್ಮ ಪ್ಯಾಟರ್ನ್ ಇಲ್ಲದೆಯೇ ಸಾಧನ ರಕ್ಷಣೆ ವೈಶಿಷ್ಟ್ಯಗಳು ಕಾರ್ಯನಿರ್ವಹಿಸುವುದಿಲ್ಲ.<xliff:g id="EMPTY_LINE">
+
+</xliff:g>ಈ ಸಾಧನದಿಂದ ನಿಮ್ಮ ಉಳಿಸಲಾದ ಫಿಂಗರ್‌ಪ್ರಿಂಟ್‌ಗಳನ್ನು ಸಹ ತೆಗೆದುಹಾಕಲಾಗುವುದು ಮತ್ತು ನಿಮ್ಮ ಫೋನ್ ಅನ್‌ಲಾಕ್ ಮಾಡಲು, ಖರೀದಿಗಳನ್ನು ದೃಢೀಕರಿಸಲು ಅಥವಾ ಅವುಗಳ ಮೂಲಕ ಅಪ್ಲಿಕೇಶನ್‌ಗಳಿಗೆ ಸೈನ್ ಇನ್ ಮಾಡಲು ನಿಮಗೆ ಸಾಧ್ಯವಾಗುವುದಿಲ್ಲ."</string>
     <string name="unlock_disable_frp_warning_content_pin" msgid="586996206210265131">"ನಿಮ್ಮ ಪಿನ್ ಇಲ್ಲದೆಯೇ ಸಾಧನ ರಕ್ಷಣೆ ವೈಶಿಷ್ಟ್ಯಗಳು ಕಾರ್ಯನಿರ್ವಹಿಸುವುದಿಲ್ಲ."</string>
-    <!-- no translation found for unlock_disable_frp_warning_content_pin_fingerprint (3370462835533123695) -->
-    <skip />
+    <string name="unlock_disable_frp_warning_content_pin_fingerprint" msgid="3370462835533123695">"ನಿಮ್ಮ ಪಿನ್ ಇಲ್ಲದೆಯೇ ಸಾಧನ ರಕ್ಷಣೆ ವೈಶಿಷ್ಟ್ಯಗಳು ಕಾರ್ಯನಿರ್ವಹಿಸುವುದಿಲ್ಲ.<xliff:g id="EMPTY_LINE">
+
+</xliff:g>ಈ ಸಾಧನದಿಂದ ನಿಮ್ಮ ಉಳಿಸಲಾದ ಫಿಂಗರ್‌ಪ್ರಿಂಟ್‌ಗಳನ್ನು ಸಹ ತೆಗೆದುಹಾಕಲಾಗುವುದು ಮತ್ತು ನಿಮ್ಮ ಫೋನ್ ಅನ್‌ಲಾಕ್ ಮಾಡಲು, ಖರೀದಿಗಳನ್ನು ದೃಢೀಕರಿಸಲು ಅಥವಾ ಅವುಗಳ ಮೂಲಕ ಅಪ್ಲಿಕೇಶನ್‌ಗಳಿಗೆ ಸೈನ್ ಇನ್ ಮಾಡಲು ನಿಮಗೆ ಸಾಧ್ಯವಾಗುವುದಿಲ್ಲ."</string>
     <string name="unlock_disable_frp_warning_content_password" msgid="5420612686852555537">"ನಿಮ್ಮ ಪಾಸ್‌ವರ್ಡ್ ಇಲ್ಲದೆ ಸಾಧನ ರಕ್ಷಣೆ ವೈಶಿಷ್ಟ್ಯಗಳು ಕಾರ್ಯನಿರ್ವಹಿಸುವುದಿಲ್ಲ."</string>
-    <!-- no translation found for unlock_disable_frp_warning_content_password_fingerprint (3595476296430536798) -->
-    <skip />
+    <string name="unlock_disable_frp_warning_content_password_fingerprint" msgid="3595476296430536798">"ನಿಮ್ಮ ಪಾಸ್‌ವರ್ಡ್ ಇಲ್ಲದೆ ಸಾಧನ ರಕ್ಷಣೆ ವೈಶಿಷ್ಟ್ಯಗಳು ಕಾರ್ಯನಿರ್ವಹಿಸುವುದಿಲ್ಲ.<xliff:g id="EMPTY_LINE">
+
+</xliff:g>ಈ ಸಾಧನದಿಂದ ನಿಮ್ಮ ಉಳಿಸಲಾದ ಫಿಂಗರ್‌ಪ್ರಿಂಟ್‌ಗಳನ್ನು ಸಹ ತೆಗೆದುಹಾಕಲಾಗುವುದು ಮತ್ತು ನಿಮ್ಮ ಫೋನ್ ಅನ್‌ಲಾಕ್ ಮಾಡಲು, ಖರೀದಿಗಳನ್ನು ದೃಢೀಕರಿಸಲು ಅಥವಾ ಅವುಗಳ ಮೂಲಕ ಅಪ್ಲಿಕೇಶನ್‌ಗಳಿಗೆ ಸೈನ್ ಇನ್ ಮಾಡಲು ನಿಮಗೆ ಸಾಧ್ಯವಾಗುವುದಿಲ್ಲ."</string>
     <string name="unlock_disable_frp_warning_content_unknown" msgid="1550718040483548220">"ನಿಮ್ಮ ಸ್ಕ್ರೀನ್ ಲಾಕ್ ಇಲ್ಲದೆ ಸಾಧನ ರಕ್ಷಣೆ ವೈಶಿಷ್ಟ್ಯಗಳು ಕಾರ್ಯನಿರ್ವಹಿಸುವುದಿಲ್ಲ."</string>
-    <!-- no translation found for unlock_disable_frp_warning_content_unknown_fingerprint (3679351662094349506) -->
-    <skip />
+    <string name="unlock_disable_frp_warning_content_unknown_fingerprint" msgid="3679351662094349506">"ನಿಮ್ಮ ಸ್ಕ್ರೀನ್ ಲಾಕ್ ಇಲ್ಲದೆ ಸಾಧನ ರಕ್ಷಣೆ ವೈಶಿಷ್ಟ್ಯಗಳು ಕಾರ್ಯನಿರ್ವಹಿಸುವುದಿಲ್ಲ.<xliff:g id="EMPTY_LINE">
+
+</xliff:g>ಈ ಸಾಧನದಿಂದ ನಿಮ್ಮ ಉಳಿಸಲಾದ ಫಿಂಗರ್‌ಪ್ರಿಂಟ್‌ಗಳನ್ನು ಸಹ ತೆಗೆದುಹಾಕಲಾಗುವುದು ಮತ್ತು ನಿಮ್ಮ ಫೋನ್ ಅನ್‌ಲಾಕ್ ಮಾಡಲು, ಖರೀದಿಗಳನ್ನು ದೃಢೀಕರಿಸಲು ಅಥವಾ ಅವುಗಳ ಮೂಲಕ ಅಪ್ಲಿಕೇಶನ್‌ಗಳಿಗೆ ಸೈನ್ ಇನ್ ಮಾಡಲು ನಿಮಗೆ ಸಾಧ್ಯವಾಗುವುದಿಲ್ಲ."</string>
     <string name="unlock_disable_frp_warning_content_pattern_profile" msgid="8682200103576359918">"ನಿಮ್ಮ ಪ್ಯಾಟರ್ನ್ ಇಲ್ಲದೆ ಸಾಧನ ರಕ್ಷಣೆ ವೈಶಿಷ್ಟ್ಯಗಳು ಕಾರ್ಯನಿರ್ವಹಿಸುವುದಿಲ್ಲ."</string>
-    <!-- no translation found for unlock_disable_frp_warning_content_pattern_fingerprint_profile (6718155854303231675) -->
-    <skip />
+    <string name="unlock_disable_frp_warning_content_pattern_fingerprint_profile" msgid="6718155854303231675">"ನಿಮ್ಮ ಪ್ಯಾಟರ್ನ್ ಇಲ್ಲದೆ ಪ್ರೊಫೈಲ್ ರಕ್ಷಣೆ ವೈಶಿಷ್ಟ್ಯಗಳು ಕಾರ್ಯನಿರ್ವಹಿಸುವುದಿಲ್ಲ.<xliff:g id="EMPTY_LINE">
+
+</xliff:g>ಈ ಪ್ರೊಫೈಲ್‌ನಿಂದ ನಿಮ್ಮ ಉಳಿಸಲಾದ ಫಿಂಗರ್‌ಪ್ರಿಂಟ್‌ಗಳನ್ನು ಸಹ ತೆಗೆದುಹಾಕಲಾಗುವುದು ಮತ್ತು ನಿಮ್ಮ ಫೋನ್ ಅನ್‌ಲಾಕ್ ಮಾಡಲು, ಖರೀದಿಗಳನ್ನು ದೃಢೀಕರಿಸಲು ಅಥವಾ ಅವುಗಳ ಮೂಲಕ ಅಪ್ಲಿಕೇಶನ್‌ಗಳಿಗೆ ಸೈನ್ ಇನ್ ಮಾಡಲು ನಿಮಗೆ ಸಾಧ್ಯವಾಗುವುದಿಲ್ಲ."</string>
     <string name="unlock_disable_frp_warning_content_pin_profile" msgid="7790688070593867767">"ನಿಮ್ಮ ಪಿನ್ ಇಲ್ಲದೆ ಪ್ರೊಫೈಲ್ ರಕ್ಷಣೆ ವೈಶಿಷ್ಟ್ಯಗಳು ಕಾರ್ಯನಿರ್ವಹಿಸುವುದಿಲ್ಲ."</string>
-    <!-- no translation found for unlock_disable_frp_warning_content_pin_fingerprint_profile (4209564603132870532) -->
-    <skip />
+    <string name="unlock_disable_frp_warning_content_pin_fingerprint_profile" msgid="4209564603132870532">"ನಿಮ್ಮ ಪಿನ್ ಇಲ್ಲದೆ ಪ್ರೊಫೈಲ್ ರಕ್ಷಣೆ ವೈಶಿಷ್ಟ್ಯಗಳು ಕಾರ್ಯನಿರ್ವಹಿಸುವುದಿಲ್ಲ.<xliff:g id="EMPTY_LINE">
+
+</xliff:g>ಈ ಪ್ರೊಫೈಲ್‌ನಿಂದ ನಿಮ್ಮ ಉಳಿಸಲಾದ ಫಿಂಗರ್‌ಪ್ರಿಂಟ್‌ಗಳನ್ನು ಸಹ ತೆಗೆದುಹಾಕಲಾಗುವುದು ಮತ್ತು ನಿಮ್ಮ ಫೋನ್ ಅನ್‌ಲಾಕ್ ಮಾಡಲು, ಖರೀದಿಗಳನ್ನು ದೃಢೀಕರಿಸಲು ಅಥವಾ ಅವುಗಳ ಮೂಲಕ ಅಪ್ಲಿಕೇಶನ್‌ಗಳಿಗೆ ಸೈನ್ ಇನ್ ಮಾಡಲು ನಿಮಗೆ ಸಾಧ್ಯವಾಗುವುದಿಲ್ಲ."</string>
     <string name="unlock_disable_frp_warning_content_password_profile" msgid="7569285520567674461">"ನಿಮ್ಮ ಪಾಸ್‌ವರ್ಡ್ ಇಲ್ಲದೆ ಪ್ರೊಫೈಲ್ ರಕ್ಷಣೆ ವೈಶಿಷ್ಟ್ಯಗಳು ಕಾರ್ಯನಿರ್ವಹಿಸುವುದಿಲ್ಲ."</string>
-    <!-- no translation found for unlock_disable_frp_warning_content_password_fingerprint_profile (2994300676764706047) -->
-    <skip />
+    <string name="unlock_disable_frp_warning_content_password_fingerprint_profile" msgid="2994300676764706047">"ನಿಮ್ಮ ಪಾಸ್‌ವರ್ಡ್ ಇಲ್ಲದೆ ಪ್ರೊಫೈಲ್ ರಕ್ಷಣೆ ವೈಶಿಷ್ಟ್ಯಗಳು ಕಾರ್ಯನಿರ್ವಹಿಸುವುದಿಲ್ಲ.<xliff:g id="EMPTY_LINE">
+
+</xliff:g>ಈ ಪ್ರೊಫೈಲ್‌ನಿಂದ ನಿಮ್ಮ ಉಳಿಸಲಾದ ಫಿಂಗರ್‌ಪ್ರಿಂಟ್‌ಗಳನ್ನು ಸಹ ತೆಗೆದುಹಾಕಲಾಗುವುದು ಮತ್ತು ನಿಮ್ಮ ಫೋನ್ ಅನ್‌ಲಾಕ್ ಮಾಡಲು, ಖರೀದಿಗಳನ್ನು ದೃಢೀಕರಿಸಲು ಅಥವಾ ಅವುಗಳ ಮೂಲಕ ಅಪ್ಲಿಕೇಶನ್‌ಗಳಿಗೆ ಸೈನ್ ಇನ್ ಮಾಡಲು ನಿಮಗೆ ಸಾಧ್ಯವಾಗುವುದಿಲ್ಲ."</string>
     <string name="unlock_disable_frp_warning_content_unknown_profile" msgid="6984215718701688202">"ನಿಮ್ಮ ಸ್ಕ್ರೀನ್ ಲಾಕ್ ಇಲ್ಲದೆ ಪ್ರೊಫೈಲ್ ರಕ್ಷಣೆ ವೈಶಿಷ್ಟ್ಯಗಳು ಕಾರ್ಯನಿರ್ವಹಿಸುವುದಿಲ್ಲ."</string>
-    <!-- no translation found for unlock_disable_frp_warning_content_unknown_fingerprint_profile (4994062501123299418) -->
-    <skip />
+    <string name="unlock_disable_frp_warning_content_unknown_fingerprint_profile" msgid="4994062501123299418">"ನಿಮ್ಮ ಸ್ಕ್ರೀನ್ ಲಾಕ್ ಇಲ್ಲದೆ ಪ್ರೊಫೈಲ್ ರಕ್ಷಣೆ ವೈಶಿಷ್ಟ್ಯಗಳು ಕಾರ್ಯನಿರ್ವಹಿಸುವುದಿಲ್ಲ.<xliff:g id="EMPTY_LINE">
+
+</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>
@@ -581,6 +593,7 @@
     <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="lockpassword_clear_label" msgid="5724429464960458155">"ತೆರವುಗೊಳಿಸಿ"</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>
@@ -628,13 +641,13 @@
     <string name="bluetooth_pairing_dialog_title" msgid="1417255032435317301">"ಈ ಸಾಧನದ ಜೊತೆಗೆ ಜೋಡಿ ಮಾಡುವುದೇ?"</string>
     <string name="bluetooth_pairing_dialog_sharing_phonebook_title" msgid="7664141669886358618">"ಫೋನ್ ಪುಸ್ತಕವನ್ನು ಹಂಚಿಕೊಳ್ಳುವುದೇ?"</string>
     <string name="bluetooth_pairing_dialog_contants_request" msgid="5531109163573611348">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> ನಿಮ್ಮ ಸಂಪರ್ಕಗಳು ಮತ್ತು ಕರೆಯ ಇತಿಹಾಸವನ್ನು ಪ್ರವೇಶಿಸಲು ಬಯಸುತ್ತದೆ."</string>
-    <string name="bluetooth_pairing_dialog_paring_request" msgid="8451248193517851958">"ಬ್ಲೂಟೂತ್ ಜೊತೆಗೆ ಜೋಡಿಸಲು <xliff:g id="DEVICE_NAME">%1$s</xliff:g> ಬಯಸುತ್ತದೆ. ಸಂಪರ್ಕಪಡಿಸಿದಾಗ, ಅದು ನಿಮ್ಮ ಸಂಪರ್ಕಗಳು ಮತ್ತು ಕರೆ ಇತಿಹಾಸಕ್ಕೆ ಪ್ರವೇಶವನ್ನು ಪಡೆಯುತ್ತದೆ."</string>
+    <string name="bluetooth_pairing_dialog_paring_request" msgid="8451248193517851958">"ಬ್ಲೂಟೂತ್ ಜೊತೆಗೆ ಜೋಡಿಸಲು <xliff:g id="DEVICE_NAME">%1$s</xliff:g> ಬಯಸುತ್ತದೆ. ಸಂಪರ್ಕಗೊಳಿಸಿದಾಗ, ಅದು ನಿಮ್ಮ ಸಂಪರ್ಕಗಳು ಮತ್ತು ಕರೆ ಇತಿಹಾಸಕ್ಕೆ ಪ್ರವೇಶವನ್ನು ಪಡೆಯುತ್ತದೆ."</string>
     <string name="bluetooth_preference_paired_devices" msgid="1970524193086791964">"ಜೋಡಿ ಮಾಡಲಾದ ಸಾಧನಗಳು"</string>
     <string name="bluetooth_preference_found_devices" msgid="1647983835063249680">"ಲಭ್ಯವಿರುವ ಸಾಧನಗಳು"</string>
     <string name="bluetooth_preference_no_found_devices" msgid="7594339669961811591">"ಯಾವುದೇ ಸಾಧನಗಳು ಲಭ್ಯವಿಲ್ಲ"</string>
     <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_pair_connect" msgid="7611522504813927727">"ಜೋಡಿಸು ಮತ್ತು ಸಂಪರ್ಕಪಡಿಸು"</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>
@@ -723,7 +736,7 @@
     <string name="use_open_wifi_automatically_summary" msgid="2982091714252931713">"ಅಧಿಕ-ಗುಣಮಟ್ಟದ ಸಾರ್ವಜನಿಕ ನೆಟ್‌ವರ್ಕ್‌ಗಳಿಗೆ ಸ್ವಯಂಚಾಲಿತವಾಗಿ ಸಂಪರ್ಕಿಸಿ"</string>
     <string name="use_open_wifi_automatically_summary_scoring_disabled" msgid="593964217679325831">"ಬಳಸಲು, ನೆಟ್‌ವರ್ಕ್ ರೇಟಿಂಗ್ ಒದಗಿಸುವವರನ್ನು ಆಯ್ಕೆಮಾಡಿ"</string>
     <string name="use_open_wifi_automatically_summary_scorer_unsupported_disabled" msgid="8472122600853650258">"ಬಳಸಲು, ಹೊಂದಾಣಿಕೆಯ ನೆಟ್‌ವರ್ಕ್ ರೇಟಿಂಗ್ ಒದಗಿಸುವವರನ್ನು ಆಯ್ಕೆಮಾಡಿ"</string>
-    <string name="wifi_install_credentials" msgid="3551143317298272860">"ಪ್ರಮಾಣಪತ್ರಗಳನ್ನು ಸ್ಥಾಪಿಸು"</string>
+    <string name="wifi_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>
@@ -774,6 +787,7 @@
     <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,6 +824,8 @@
     <string name="wifi_wps_available_first_item" msgid="4422547079984583502">"WPS ಲಭ್ಯವಿದೆ"</string>
     <string name="wifi_wps_available_second_item" msgid="8427520131718215301">" (WPS ಲಭ್ಯವಿದೆ)"</string>
     <string name="wifi_wps_nfc_enter_password" msgid="2288214226916117159">"ನಿಮ್ಮ ನೆಟ್‌ವರ್ಕ್‌ ಪಾಸ್‌ವರ್ಡ್‌ ನಮೂದಿಸಿ"</string>
+    <string name="wifi_carrier_connect" msgid="8174696557882299911">"ವೈ-ಫೈ ನೆಟ್‌ವರ್ಕ್‌ ವಾಹಕ"</string>
+    <string name="wifi_carrier_content" msgid="4634077285415851933">"<xliff:g id="NAME">%1%s</xliff:g> ಮೂಲಕ ಸಂಪರ್ಕಿಸಿ"</string>
     <string name="wifi_scan_always_turnon_message" msgid="203123538572122989">"ಸ್ಥಳ ನಿಖರತೆಯನ್ನು ಸುಧಾರಿಸಲು ಮತ್ತು ಇತರ ಉದ್ದೇಶಗಳಿಗಾಗಿ, ವೈ-ಫೈ ಆಫ್‌ ಇದ್ದಾಗಲೂ ಸಹ <xliff:g id="APP_NAME">%1$s</xliff:g> ನೆಟ್‌ವರ್ಕ್‌ ಸ್ಕ್ಯಾನಿಂಗ್‌ ಆನ್‌ ಮಾಡಲು ಬಯಸುತ್ತದೆ.\n\nಸ್ಕ್ಯಾನ್ ಮಾಡಲು ಬಯಸುವ ಎಲ್ಲಾ ಅಪ್ಲಿಕೇಶನ್‌ಗಳನ್ನು ಇದಕ್ಕೆ ಅನುಮತಿಸುವುದೇ?"</string>
     <string name="wifi_scan_always_turnoff_message" msgid="5538901671131941043">"ಇದನ್ನು ಆಫ್ ಮಾಡಲು, ಓವರ್‌ಫ್ಲೋ ಮೆನುವಿನಲ್ಲಿನ ಸುಧಾರಿತ ಗೆ ಹೋಗಿ."</string>
     <string name="wifi_scan_always_confirm_allow" msgid="5355973075896817232">"ಅನುಮತಿಸಿ"</string>
@@ -827,6 +843,7 @@
     <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_modify" msgid="6100248070440710782">"ಮಾರ್ಪಡಿಸಿ"</string>
     <string name="wifi_failed_forget_message" msgid="1348172929201654986">"ನೆಟ್‌ವರ್ಕ್‌ ಮರೆಯಲು ವಿಫಲವಾಗಿದೆ"</string>
     <string name="wifi_save" msgid="3331121567988522826">"ಉಳಿಸು"</string>
     <string name="wifi_failed_save_message" msgid="6650004874143815692">"ನೆಟ್‌ವರ್ಕ್‌ ಉಳಿಸಲು ವಿಫಲವಾಗಿದೆ"</string>
@@ -839,6 +856,7 @@
     <string name="wifi_advanced_titlebar" msgid="4485841401774142908">"ಸುಧಾರಿತ 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_title" msgid="3471132676909349382">"ನೆಟ್‌ವರ್ಕ್‌ ಮಾಹಿತಿ"</string>
     <string name="wifi_details_subnet_mask" msgid="6720279144174924410">"ಸಬ್‌ನೆಟ್‌ ಮಾಸ್ಕ್‌"</string>
     <string name="wifi_details_dns" msgid="8648826607751830768">"DNS"</string>
     <string name="wifi_details_ipv6_address_header" msgid="6734119149106422148">"IPv6 ವಿಳಾಸಗಳು"</string>
@@ -871,27 +889,25 @@
     <string name="wifi_p2p_cancel_connect_title" msgid="255267538099324413">"ಆಹ್ವಾನವನ್ನು ರದ್ದುಪಡಿಸುವುದೇ?"</string>
     <string name="wifi_p2p_cancel_connect_message" msgid="7477756213423749402">"<xliff:g id="PEER_NAME">%1$s</xliff:g> ಜೊತೆಗೆ ಸಂಪರ್ಕಪಡಿಸಲು ಆಹ್ವಾನವನ್ನು ರದ್ದುಪಡಿಸಲು ನೀವು ಬಯಸುತ್ತೀರಾ?"</string>
     <string name="wifi_p2p_delete_group_message" msgid="834559380069647086">"ಈ ಗುಂಪನ್ನು ಮರೆಯುವುದೇ?"</string>
-    <string name="wifi_tether_checkbox_text" msgid="1847167643625779136">"ಪೋರ್ಟಬಲ್ Wi‑Fi ಹಾಟ್‌ಸ್ಪಾಟ್‌"</string>
-    <string name="wifi_hotspot_checkbox_text" msgid="7763495093333664887">"Wi‑Fi ಹಾಟ್‌ಸ್ಪಾಟ್‌"</string>
+    <string name="wifi_hotspot_checkbox_text" msgid="7763495093333664887">"ವೈ-ಫೈ ಹಾಟ್‌ಸ್ಪಾಟ್"</string>
     <string name="wifi_hotspot_off_subtext" msgid="5466126533609394170">"ಇತರ ಸಾಧನಗಳೊಂದಿಗೆ ಇಂಟರ್ನೆಟ್ ಅಥವಾ ವಿಷಯವನ್ನು ಹಂಚಿಕೊಳ್ಳುತ್ತಿಲ್ಲ"</string>
     <string name="wifi_hotspot_tethering_on_subtext" product="tablet" msgid="5752490509369962007">"ಈ ಟ್ಯಾಬ್ಲೆಟ್‌ನ ಇಂಟರ್ನೆಟ್ ಸಂಪರ್ಕವನ್ನು ಹಾಟ್‌ಸ್ಪಾಟ್ ಮೂಲಕ ಹಂಚಿಕೊಳ್ಳಲಾಗುತ್ತಿದೆ"</string>
     <string name="wifi_hotspot_tethering_on_subtext" product="default" msgid="6461075246164300670">"ಈ ಫೋನ್‌ನ ಇಂಟರ್ನೆಟ್ ಸಂಪರ್ಕವನ್ನು ಹಾಟ್‌ಸ್ಪಾಟ್ ಮೂಲಕ ಹಂಚಿಕೊಳ್ಳಲಾಗುತ್ತಿದೆ"</string>
     <string name="wifi_hotspot_on_local_only_subtext" msgid="2068110388011294735">"ಅಪ್ಲಿಕೇಶನ್‌ ವಿಷಯವನ್ನು ಹಂಚಿಕೊಳ್ಳುತ್ತಿದೆ. ಇಂಟರ್ನೆಟ್‌ ಸಂಪರ್ಕವನ್ನು ಹಂಚಿಕೊಳ್ಳಲು, ಹಾಟ್‌ಸ್ಪಾಟ್‌ ಆಫ್‌ ಮಾಡಿ ನಂತರ ಆನ್‌ ಮಾಡಿ"</string>
-    <string name="wifi_hotspot_name_title" msgid="1341735529132128887">"ವೈ-ಫೈ ಹೆಸರು"</string>
+    <string name="wifi_hotspot_name_title" msgid="8237000746618636778">"ಹಾಟ್‌ಸ್ಪಾಟ್ ಹೆಸರು"</string>
     <string name="wifi_hotspot_name_summary_connecting" msgid="3378299995508671967">"<xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g> ಅನ್ನು ಆನ್ ಮಾಡಲಾಗುತ್ತಿದೆ..."</string>
     <string name="wifi_hotspot_name_summary_connected" msgid="3888672084861445362">"ಇತರೆ ಸಾಧನಗಳು <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g> ಗೆ ಸಂಪರ್ಕವನ್ನು ಪಡೆದುಕೊಳ್ಳಬಹುದು"</string>
-    <string name="wifi_hotspot_password_title" msgid="1955592302902091281">"ವೈ-ಫೈ ಪಾಸ್‌ವರ್ಡ್‌"</string>
+    <string name="wifi_hotspot_password_title" msgid="8676859981917573801">"ಹಾಟ್‌ಸ್ಪಾಟ್ ಪಾಸ್‌ವರ್ಡ್"</string>
     <string name="wifi_hotspot_ap_band_title" msgid="1165801173359290681">"AP ಬ್ಯಾಂಡ್"</string>
     <string name="wifi_hotspot_footer_info_regular" msgid="1203489406068036455">"ನಿಮ್ಮ ಇತರ ಸಾಧನಗಳಿಗೆ ವೈ-ಫೈ ನೆಟ್‌ವರ್ಕ್‌ ರಚಿಸಲು ಹಾಟ್‌ಸ್ಪಾಟ್‌ ಬಳಸಿ. ನಿಮ್ಮ ಮೊಬೈಲ್‌ ಡೇಟಾ ಸಂಪರ್ಕವನ್ನು ಬಳಸಿಕೊಂಡು ಹಾಟ್‌ಸ್ಪಾಟ್‌ ಇಂಟರ್ನೆಟ್‌ ಅನ್ನು ಒದಗಿಸುತ್ತದೆ. ಹೆಚ್ಚುವರಿ ಮೊಬೈಲ್‌ ಡೇಟಾ ಶುಲ್ಕಗಳು ಅನ್ವಯವಾಗಬಹುದು."</string>
     <string name="wifi_hotspot_footer_info_local_only" msgid="857988412470694109">"ಹತ್ತಿರದ ಸಾಧನಗಳೊಂದಿಗೆ ವಿಷಯವನ್ನು ಹಂಚಿಕೊಳ್ಳಲು ಅಪ್ಲಿಕೇಶನ್‌ಗಳು ಹಾಟ್‌ಸ್ಪಾಟ್ ಅನ್ನು ಸಹ ರಚಿಸಬಹುದು."</string>
     <string name="wifi_tether_starting" msgid="1322237938998639724">"ಹಾಟ್‌ಸ್ಪಾಟ್ ಆನ್‌ ಮಾಡಲಾಗುತ್ತಿದೆ…"</string>
     <string name="wifi_tether_stopping" msgid="4835852171686388107">"ಹಾಟ್‌ಸ್ಪಾಟ್ ಆಫ್‌ ಮಾಡಲಾಗುತ್ತಿದೆ…"</string>
     <string name="wifi_tether_enabled_subtext" msgid="7842111748046063857">"<xliff:g id="NETWORK_SSID">%1$s</xliff:g> ಸಕ್ರಿಯವಾಗಿದೆ"</string>
-    <string name="wifi_tether_failed_subtext" msgid="1484941858530919002">"ಪೋರ್ಟಬಲ್ Wi‑Fi ಹಾಟ್‌ಸ್ಪಾಟ್‌ ದೋಷ ಎದುರಾಗಿದೆ"</string>
-    <string name="wifi_tether_configure_ap_text" msgid="7974681394041609308">"Wi‑Fi ಹಾಟ್‌ಸ್ಪಾಟ್‌‌ ಹೊಂದಿಸಿ"</string>
-    <string name="wifi_hotspot_configure_ap_text" msgid="5478614731464220432">"Wi‑Fi ಹಾಟ್‌ಸ್ಪಾಟ್‌ ಸೆಟಪ್"</string>
+    <string name="wifi_tether_failed_subtext" msgid="1484941858530919002">"ಪೋರ್ಟಬಲ್ ವೈ-ಫೈ ಹಾಟ್‌ಸ್ಪಾಟ್ ದೋಷ ಎದುರಾಗಿದೆ"</string>
+    <string name="wifi_tether_configure_ap_text" msgid="7974681394041609308">"ವೈ-ಫೈ ಹಾಟ್‌ಸ್ಪಾಟ್‌ ಹೊಂದಿಸಿ"</string>
+    <string name="wifi_hotspot_configure_ap_text" msgid="5478614731464220432">"ವೈ-ಫೈ ಹಾಟ್‌ಸ್ಪಾಟ್ ಸೆಟಪ್"</string>
     <string name="wifi_hotspot_configure_ap_text_summary" msgid="5560680057727007011">"AndroidAP WPA2 PSK ಹಾಟ್‌ಸ್ಪಾಟ್"</string>
-    <string name="wifi_tether_configure_subtext" msgid="2050196439900426456">"<xliff:g id="NETWORK_SSID">%1$s</xliff:g> <xliff:g id="NETWORK_SECURITY">%2$s</xliff:g> ಹಾಟ್‌ಸ್ಪಾಟ್"</string>
     <string name="wifi_tether_configure_ssid_default" msgid="8467525402622138547">"AndroidHotspot"</string>
     <string name="wifi_calling_settings_title" msgid="4102921303993404577">"ವೈ-ಫೈ ಕರೆ ಮಾಡುವಿಕೆ"</string>
     <string name="wifi_calling_suggestion_title" msgid="9008010480466359578">"ವೈ-ಫೈ ಕರೆ ಮಾಡುವಿಕೆ ಆನ್‌ ಮಾಡಿ"</string>
@@ -932,7 +948,7 @@
     <string name="wifi_calling_off_explanation" msgid="2597566001655908391">"ವೈ-ಫೈ ಕರೆ ಮಾಡುವಿಕೆ ಆನ್‌ ಆದಾಗ, ನಿಮ್ಮ ಫೋನ್‌ ನಿಮ್ಮ ಆದ್ಯತೆ ಮತ್ತು ಯಾವ ಸಿಗ್ನಲ್ ಬಲವಾಗಿದೆ ಎಂಬುದರ ಅನುಗುಣವಾಗಿ, ಕರೆಗಳನ್ನು ವೈ-ಫೈ ನೆಟ್‌ವರ್ಕ್‌ಗಳು ಅಥವಾ ನಿಮ್ಮ ವಾಹಕದ ನೆಟ್‌ವರ್ಕ್ ಮೂಲಕ ರವಾನಿಸುತ್ತದೆ. ಈ ವೈಶಿಷ್ಟ್ಯವನ್ನು ಆನ್‌ ಮಾಡವ ಮೊದಲು, ಶುಲ್ಕಗಳು  ಮತ್ತು ಇತರ ವಿವರಗಳಿಗೆ ಸಂಬಂಧಿಸಿದಂತೆ ನಿಮ್ಮ ವಾಹಕವನ್ನು ಸಂಪರ್ಕಿಸಿ."</string>
     <string name="wifi_calling_off_explanation_2" msgid="2329334487851497223"></string>
     <string name="emergency_address_title" msgid="3571902448699714454">"ತುರ್ತು ವಿಳಾಸವನ್ನು ಅಪ್‌ಡೇಟ್‌ ಮಾಡಿ"</string>
-    <string name="emergency_address_summary" msgid="306028701568728126">"ವೈ-ಫೈ ಬಳಸಿಕೊಂಡು ನೀವು 911 ಕರೆ ಮಾಡಿದಾಗ ನಿಮ್ಮ ಸ್ಥಳದ ವಿಳಾಸವನ್ನು ತುರ್ತು ಸೇವೆಗಳಿಗೆ ಬಳಸಲಾಗುತ್ತದೆ"</string>
+    <string name="emergency_address_summary" msgid="3266760199681945746">"ವೈ-ಫೈ ಬಳಸಿಕೊಂಡು ನೀವು ತುರ್ತು ಕರೆ ಮಾಡಿದಾಗ ನಿಮ್ಮ ಸ್ಥಳದ ವಿಳಾಸವನ್ನು ತುರ್ತು ಸೇವೆಗಳಿಗೆ ಬಳಸಲಾಗುತ್ತದೆ"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"ಪ್ರದರ್ಶನ"</string>
     <string name="sound_settings" msgid="5534671337768745343">"ಧ್ವನಿ"</string>
     <string name="all_volume_title" msgid="4296957391257836961">"ವಾಲ್ಯುಮ್‌ಗಳು"</string>
@@ -947,7 +963,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>
@@ -986,6 +1002,7 @@
     <string name="search_settings" msgid="1910951467596035063">"ಹುಡುಕಿ"</string>
     <string name="search_settings_summary" msgid="9205656546570654169">"ಹುಟುಕಾಟ ಸೆಟ್ಟಿಂಗ್‌ಗಳು ಮತ್ತು ಇತಿಹಾಸವನ್ನು ನಿರ್ವಹಿಸಿ"</string>
     <string name="search_settings_no_results" msgid="8799027492641230999">"ಯಾವುದೇ ಫಲಿತಾಂಶಗಳಿಲ್ಲ"</string>
+    <string name="search_clear_history" msgid="4196658962573162457">"ಇತಿಹಾಸ ತೆರವುಗೊಳಿಸಿ"</string>
     <string name="display_settings" msgid="7965901687241669598">"ಪ್ರದರ್ಶನ"</string>
     <string name="accelerometer_title" msgid="7854608399547349157">"ಪರದೆಯನ್ನು ಸ್ವಯಂ-ತಿರುಗಿಸು"</string>
     <string name="color_mode_title" msgid="3159275920408338215">"ಹೊಳೆಯುವ ಬಣ್ಣಗಳು"</string>
@@ -1056,15 +1073,13 @@
     <string name="automatic_brightness" msgid="5014143533884135461">"ಸ್ವಯಂಚಾಲಿತ ಪ್ರಖರತೆ"</string>
     <string name="lift_to_wake_title" msgid="4555378006856277635">"ಎಬ್ಬಿಸಲು ಎತ್ತಿರಿ"</string>
     <string name="ambient_display_screen_title" msgid="4252755516328775766">"ಆಂಬಿಯೆಂಟ್ ಡಿಸ್‌ಪ್ಲೇ"</string>
-    <!-- no translation found for ambient_display_screen_summary_always_on (7337555569694794132) -->
-    <skip />
+    <string name="ambient_display_screen_summary_always_on" msgid="7337555569694794132">"ಯಾವಾಗಲೂ ಆನ್ / ಅಧಿಕ ಬ್ಯಾಟರಿ ಬಳಕೆ"</string>
     <string name="ambient_display_screen_summary_notifications" msgid="1449570742600868654">"ಹೊಸ ಅಧಿಸೂಚನೆಗಳು"</string>
     <string name="ambient_display_category_triggers" msgid="4359289754456268573">"ಯಾವಾಗ ತೋರಿಸಬೇಕು"</string>
     <string name="doze_title" msgid="2375510714460456687">"ಹೊಸ ಅಧಿಸೂಚನೆಗಳು"</string>
     <string name="doze_summary" msgid="3846219936142814032">"ಅಧಿಸೂಚನೆಗಳನ್ನು ನೀವು ಸ್ವೀಕರಿಸಿದಾಗ ಪರದೆಯನ್ನು ಎಚ್ಚರಗೊಳಿಸಿ"</string>
     <string name="doze_always_on_title" msgid="1046222370442629646">"ಯಾವಾಗಲೂ ಆನ್"</string>
-    <!-- no translation found for doze_always_on_summary (6978257596231155345) -->
-    <skip />
+    <string name="doze_always_on_summary" msgid="6978257596231155345">"ಸಮಯ, ಅಧಿಸೂಚನೆ ಐಕಾನ್‌ಗಳು ಮತ್ತು ಇತರ ಮಾಹಿತಿಯನ್ನು ತೋರಿಸಿ. ಅಧಿಕ ಬ್ಯಾಟರಿ ಬಳಕೆ."</string>
     <string name="title_font_size" msgid="4405544325522105222">"ಫಾಂಟ್ ಗಾತ್ರ"</string>
     <string name="short_summary_font_size" msgid="6819778801232989076">"ಪಠ್ಯವನ್ನು ಸಣ್ಣದು ಅಥವಾ ದೊಡ್ಡದು ಮಾಡಿ"</string>
     <string name="sim_lock_settings" msgid="3392331196873564292">"ಸಿಮ್‌ ಕಾರ್ಡ್ ಲಾಕ್ ಸೆಟ್ಟಿಂಗ್‌ಗಳು"</string>
@@ -1117,7 +1132,6 @@
     <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>
     <string name="device_status_activity_title" msgid="1411201799384697904">"ಸ್ಥಿತಿ"</string>
     <string name="device_status" msgid="607405385799807324">"ಸ್ಥಿತಿ"</string>
@@ -1145,7 +1159,6 @@
     <string name="status_wifi_mac_address" msgid="2202206684020765378">"Wi‑Fi MAC ವಿಳಾಸ"</string>
     <string name="status_bt_address" msgid="4195174192087439720">"ಬ್ಲೂಟೂತ್‌‌ ವಿಳಾಸ"</string>
     <string name="status_serial_number" msgid="2257111183374628137">"ಕ್ರಮ ಸಂಖ್ಯೆ"</string>
-    <string name="status_unavailable" msgid="7862009036663793314">"ಲಭ್ಯವಿಲ್ಲ"</string>
     <string name="status_up_time" msgid="7294859476816760399">"ಕಾರ್ಯನಿರತ ಸಮಯ"</string>
     <string name="status_awake_time" msgid="2393949909051183652">"ಎಚ್ಚರಗೊಂಡ ಸಮಯ"</string>
     <string name="internal_memory" msgid="9129595691484260784">"ಆಂತರಿಕ ಸಂಗ್ರಹಣೆ"</string>
@@ -1195,7 +1208,7 @@
     <string name="storage_low_summary" msgid="7737465774892563129">"ಸಿಂಕ್‌ ಮಾಡುವುದರಂತಹ ಕೆಲವು ಸಿಸ್ಟಂ ಕ್ರಿಯೆಗಳು ಸೂಕ್ತ ರೀತಿಯಲ್ಲಿ ಕಾರ್ಯನಿರ್ವಹಿಸದೇ ಇರಬಹುದು. ಅಪ್ಲಿಕೇಶನ್‌ ಅಥವಾ ಮಾಧ್ಯಮ ವಿಷಯದಂತಹ ಐಟಂಗಳನ್ನು ಅಳಿಸಿಹಾಕಿ ಅಥವಾ ಅನ್‌ಪಿನ್‌ ಮಾಡುವ ಮೂಲಕ ಸ್ಥಳವನ್ನು ಖಾಲಿಯಾಗಿರಿಸುವಂತೆ ಮಾಡಲು ಪ್ರಯತ್ನಿಸಿ."</string>
     <string name="storage_menu_rename" msgid="7141058657592615390">"ಮರುಹೆಸರಿಸು"</string>
     <string name="storage_menu_mount" msgid="1014683672493425425">"ಅಳವಡಿಸಿ"</string>
-    <string name="storage_menu_unmount" msgid="681485356885955898">"ಎಜೆಕ್ಟ್‌‌"</string>
+    <string name="storage_menu_unmount" msgid="681485356885955898">"ಇಜೆಕ್ಟ್‌‌"</string>
     <string name="storage_menu_format" msgid="7690626079653152152">"ಫಾರ್ಮ್ಯಾಟ್‌"</string>
     <string name="storage_menu_format_public" msgid="7464714208010125682">"ಪೋರ್ಟಬಲ್‌ನಂತೆ ಫಾರ್ಮ್ಯಾಟ್ ಮಾಡಿ"</string>
     <string name="storage_menu_format_private" msgid="546017531835902096">"ಆಂತರಿಕವಾಗಿ ಫಾರ್ಮ್ಯಾಟ್ ಮಾಡಿ"</string>
@@ -1223,15 +1236,15 @@
     <string name="storage_mount_success" msgid="687641090137253647">"<xliff:g id="NAME">%1$s</xliff:g> ಅಳವಡಿಸಲಾಗಿದೆ"</string>
     <string name="storage_mount_failure" msgid="1042621107954547316">"<xliff:g id="NAME">%1$s</xliff:g> ಅಳವಡಿಸಲು ಸಾಧ್ಯವಾಗಲಿಲ್ಲ"</string>
     <string name="storage_unmount_success" msgid="5737203344673441677">"<xliff:g id="NAME">%1$s</xliff:g> ಸುರಕ್ಷಿತವಾಗಿ ತೆಗೆದುಹಾಕಲಾಗಿದೆ"</string>
-    <string name="storage_unmount_failure" msgid="5758387106579519489">"<xliff:g id="NAME">%1$s</xliff:g> ಸುರಕ್ಷಿತವಾಗಿ ಎಜೆಕ್ಟ್‌ ಮಾಡಲು ಸಾಧ್ಯವಾಗಲಿಲ್ಲ"</string>
+    <string name="storage_unmount_failure" msgid="5758387106579519489">"<xliff:g id="NAME">%1$s</xliff:g> ಸುರಕ್ಷಿತವಾಗಿ ಇಜೆಕ್ಟ್‌ ಮಾಡಲು ಸಾಧ್ಯವಾಗಲಿಲ್ಲ"</string>
     <string name="storage_format_success" msgid="3023144070597190555">"<xliff:g id="NAME">%1$s</xliff:g> ಅನ್ನು ಫಾರ್ಮ್ಯಾಟ್ ಮಾಡಲಾಗಿದೆ"</string>
     <string name="storage_format_failure" msgid="6032640952779735766">"<xliff:g id="NAME">%1$s</xliff:g> ಅನ್ನು ಫಾರ್ಮ್ಯಾಟ್ ಮಾಡಲು ಸಾಧ್ಯವಾಗಲಿಲ್ಲ"</string>
     <string name="storage_rename_title" msgid="8242663969839491485">"ಸಂಗ್ರಹಣೆಯನ್ನು ಮರುಹೆಸರಿಸಿ"</string>
-    <string name="storage_dialog_unmounted" msgid="6403320870103261477">"<xliff:g id="NAME_0">^1</xliff:g> ಅನ್ನು ಸುರಕ್ಷಿತವಾಗಿ ಎಜೆಕ್ಟ್ ಮಾಡಲಾಗಿದೆ, ಆದರೆ ಇನ್ನೂ ಲಭ್ಯವಿದೆ. \n\n <xliff:g id="NAME_1">^1</xliff:g> ಅನ್ನು ಬಳಸಲು, ನೀವು ಮೊದಲಿಗೆ ಅದನ್ನು ಅಳವಡಿಸಬೇಕು."</string>
+    <string name="storage_dialog_unmounted" msgid="6403320870103261477">"<xliff:g id="NAME_0">^1</xliff:g> ಅನ್ನು ಸುರಕ್ಷಿತವಾಗಿ ಇಜೆಕ್ಟ್ ಮಾಡಲಾಗಿದೆ, ಆದರೆ ಇನ್ನೂ ಲಭ್ಯವಿದೆ. \n\n <xliff:g id="NAME_1">^1</xliff:g> ಅನ್ನು ಬಳಸಲು, ನೀವು ಮೊದಲಿಗೆ ಅದನ್ನು ಅಳವಡಿಸಬೇಕು."</string>
     <string name="storage_dialog_unmountable" msgid="3732209361668282254">"ಇದು <xliff:g id="NAME_0">^1</xliff:g> ದೋಷಪೂರಿತವಾಗಿದೆ. \n\nಇದನ್ನು ಬಳಸಲು <xliff:g id="NAME_1">^1</xliff:g>, ಮೊದಲಿಗೆ ನೀವು ಅದನ್ನು ಹೊಂದಿಸಬೇಕು."</string>
     <string name="storage_dialog_unsupported" msgid="4503128224360482228">"ಈ ಸಾಧನವು <xliff:g id="NAME_0">^1</xliff:g> ಅನ್ನು ಬೆಂಬಲಿಸುವುದಿಲ್ಲ. \n\nಈ ಸಾಧನದೊಂದಿಗೆ <xliff:g id="NAME_1">^1</xliff:g> ಅನ್ನು ಬಳಸಲು, ಮೊದಲಿಗೆ ನೀವು ಇದನ್ನು ಹೊಂದಿಸಬೇಕು."</string>
     <string name="storage_internal_format_details" msgid="4018647158382548820">"ಫಾರ್ಮ್ಯಾಟ್ ಮಾಡಿದ ನಂತರ, ನೀವು ಈ <xliff:g id="NAME_0">^1</xliff:g> ಅನ್ನು ಇತರ ಸಾಧನಗಳಲ್ಲಿ ಬಳಸಬಹುದು. \n\n<xliff:g id="NAME_1">^1</xliff:g> ರಲ್ಲಿನ ಎಲ್ಲಾ ಡೇಟಾವನ್ನು ಅಳಿಸಲಾಗುವುದು. ಮೊದಲು ಬ್ಯಾಕಪ್ ಮಾಡುವುದನ್ನು ಪರಿಗಣಿಸಿ. \n\n"<b>"ಫೋಟೋಗಳು &amp; ಇತರ ಮಾಧ್ಯಮವನ್ನು ಬ್ಯಾಕಪ್ ಮಾಡಿ"</b>" \nನಿಮ್ಮ ಮಾಧ್ಯಮ ಫೈಲ್‌ಗಳನ್ನು ಈ ಸಾಧನದಲ್ಲಿ ಪರ್ಯಾಯ ಸಂಗ್ರಹಣೆಗೆ ಸರಿಸಿ ಅಥವಾ USB ಕೇಬಲ್ ಬಳಸುವ ಮೂಲಕ ಅವುಗಳನ್ನು ಕಂಪ್ಯೂಟರ್‌ಗೆ ವರ್ಗಾಯಿಸಿ. \n\n"<b>"ಅಪ್ಲಿಕೇಶನ್‌ಗಳನ್ನು ಬ್ಯಾಕಪ್ ಮಾಡಿ"</b>" \nಈ <xliff:g id="NAME_6">^1</xliff:g> ರಲ್ಲಿ ಸಂಗ್ರಹಿಸಲಾಗಿರುವ ಎಲ್ಲಾ ಅಪ್ಲಿಕೇಶನ್‌ಗಳನ್ನು ಅಸ್ಥಾಪಿಸಲಾಗುವುದು ಮತ್ತು ಅವುಗಳ ಡೇಟಾವನ್ನು ಅಳಿಸಲಾಗುವುದು. ಈ ಅಪ್ಲಿಕೇಶನ್‌ಗಳನ್ನು ಇರಿಸಿಕೊಳ್ಳಲು, ಅವುಗಳನ್ನು ಈ ಸಾಧನದಲ್ಲಿ ಪರ್ಯಾಯ ಸಂಗ್ರಹಣೆಗೆ ಸರಿಸಿ."</string>
-    <string name="storage_internal_unmount_details" msgid="3582802571684490057"><b>"ನೀವು <xliff:g id="NAME_0">^1</xliff:g> ಅನ್ನು ಎಜೆಕ್ಟ್ ಮಾಡಿದಾಗ, ಅದರಲ್ಲಿ ಸಂಗ್ರಹವಾಗಿರುವ ಅಪ್ಲಿಕೇಶನ್‌ಗಳು ಕಾರ್ಯನಿರ್ವಹಿಸುವುದನ್ನು ನಿಲ್ಲಿಸುತ್ತವೆ ಮತ್ತು ಅದರಲ್ಲಿ ಸಂಗ್ರಹಿಸಲಾಗಿರುವ ಮಾಧ್ಯಮ ಫೈಲ್‌ಗಳು ಅದನ್ನು ಮರು ಸೇರಿಸುವವರಗೆ ಲಭ್ಯವಿರುವುದಿಲ್ಲ."</b>" \n\n <xliff:g id="NAME_1">^1</xliff:g> ಇದನ್ನು ಈ ಸಾಧನದಲ್ಲಿ ಮಾತ್ರ ಕಾರ್ಯನಿರ್ವಹಿಸಲು ಫಾರ್ಮ್ಯಾಟ್ ಮಾಡಲಾಗಿದೆ. ಇದು ಯಾವುದೇ ಇತರ ಸಾಧನಗಳಲ್ಲಿ ಕಾರ್ಯನಿರ್ವಹಿಸುವುದಿಲ್ಲ."</string>
+    <string name="storage_internal_unmount_details" msgid="3582802571684490057"><b>"ನೀವು <xliff:g id="NAME_0">^1</xliff:g> ಅನ್ನು ಇಜೆಕ್ಟ್ ಮಾಡಿದಾಗ, ಅದರಲ್ಲಿ ಸಂಗ್ರಹವಾಗಿರುವ ಅಪ್ಲಿಕೇಶನ್‌ಗಳು ಕಾರ್ಯನಿರ್ವಹಿಸುವುದನ್ನು ನಿಲ್ಲಿಸುತ್ತವೆ ಮತ್ತು ಅದರಲ್ಲಿ ಸಂಗ್ರಹಿಸಲಾಗಿರುವ ಮಾಧ್ಯಮ ಫೈಲ್‌ಗಳು ಅದನ್ನು ಮರು ಸೇರಿಸುವವರಗೆ ಲಭ್ಯವಿರುವುದಿಲ್ಲ."</b>" \n\n <xliff:g id="NAME_1">^1</xliff:g> ಇದನ್ನು ಈ ಸಾಧನದಲ್ಲಿ ಮಾತ್ರ ಕಾರ್ಯನಿರ್ವಹಿಸಲು ಫಾರ್ಮ್ಯಾಟ್ ಮಾಡಲಾಗಿದೆ. ಇದು ಯಾವುದೇ ಇತರ ಸಾಧನಗಳಲ್ಲಿ ಕಾರ್ಯನಿರ್ವಹಿಸುವುದಿಲ್ಲ."</string>
     <string name="storage_internal_forget_details" msgid="9028875424669047327">"ಅಪ್ಲಿಕೇಶನ್‌ಗಳು, ಫೋಟೋಗಳು ಅಥವಾ ಡೇಟಾ ಬಳಸಲು ಇದು <xliff:g id="NAME">^1</xliff:g> ಹೊಂದಿರುತ್ತದೆ, ಅದನ್ನು ಮರುಸೇರಿಸಿ. \n\nಪರ್ಯಾಯವಾಗಿ, ಸಾಧನವು ಲಭ್ಯವಿಲ್ಲದಿದ್ದರೆ ಸಂಗ್ರಹಣೆಯನ್ನು ಮರೆತುಬಿಡು ಅನ್ನು ನೀವು ಆಯ್ಕೆ ಮಾಡಬಹುದು. \n\nನೀವು ಮರೆತುಬಿಡು ಆಯ್ಕೆಮಾಡಿದರೆ, ಸಾಧನ ಹೊಂದಿರುವ ಎಲ್ಲ ಡೇಟಾವನ್ನು ಶಾಶ್ವತವಾಗಿ ಅಳಿಸಲಾಗುತ್ತದೆ. \n\nನೀವು ನಂತರದಲ್ಲಿ ಅಪ್ಲಿಕೇಶನ್‌ಗಳನ್ನು ಸ್ಥಾಪಿಸಬಹುದು, ಆದರೆ ಈ ಸಾಧನದಲ್ಲಿ ಸಂಗ್ರಹಿಸಲಾದ ಅದರ ಡೇಟಾ ಕಳೆದು ಹೋಗುತ್ತದೆ."</string>
     <string name="storage_internal_forget_confirm_title" msgid="1370847944388479245">"<xliff:g id="NAME">^1</xliff:g> ಮರೆತುಹೋಯಿತೇ?"</string>
     <string name="storage_internal_forget_confirm" msgid="1148446041396902905">"ಎಲ್ಲಾ ಅಪ್ಲಿಕೇಶನ್‌ಗಳು, ಫೋಟೋಗಳು ಮತ್ತು ಡೇಟಾವನ್ನು ಈ <xliff:g id="NAME">^1</xliff:g> ನಲ್ಲಿ ಸಂಗ್ರಹಿಸಿದರೆ ಶಾಶ್ವತವಾಗಿ ಕಳೆದುಹೋಗುತ್ತದೆ."</string>
@@ -1243,7 +1256,7 @@
     <string name="storage_detail_other" msgid="8404938385075638238">"ಇತರೆ"</string>
     <string name="storage_detail_system" msgid="4629506366064709687">"ಸಿಸ್ಟಂ"</string>
     <string name="storage_detail_explore" msgid="7911344011431568294">"<xliff:g id="NAME">^1</xliff:g> ಅನ್ನು ಎಕ್ಸ್‌ಪ್ಲೋರ್ ಮಾಡಿ"</string>
-    <string name="storage_detail_dialog_other" msgid="8907101974576694793">"ಅಪ್ಲಿಕೇಶನ್‌ಗಳು ಉಳಿಸಿರುವ ಹಂಚಿದ ಫೈಲ್‌ಗಳು, ಇಂಟರ್ನೆಟ್ ಅಥವಾ ಬ್ಲೂಟೂತ್ ಮೂಲಕ ಡೌನ್‌ಲೋಡ್ ಮಾಡಿರುವ ಫೈಲ್‌ಗಳು, Android ಫೈಲ್‌ಗಳು ಹಾಗೂ ಇನ್ನಷ್ಟು ಇತರವುಗಳು ಒಳಗೊಂಡಿರುತ್ತವೆ. \n\n<xliff:g id="NAME">^1</xliff:g> ಇದರ ಗೋಚರಿಸುವ ವಿಷಯಗಳನ್ನು ವೀಕ್ಷಿಸಲು, ಎಕ್ಸ್‌ಪ್ಲೋರ್ ಟ್ಯಾಪ್ ಮಾಡಿ."</string>
+    <string name="storage_detail_dialog_other" msgid="8907101974576694793">"ಅಪ್ಲಿಕೇಶನ್‌ಗಳು ಉಳಿಸಿರುವ ಹಂಚಿದ ಫೈಲ್‌ಗಳು, ಇಂಟರ್ನೆಟ್ ಅಥವಾ ಬ್ಲೂಟೂತ್ ಮೂಲಕ ಡೌನ್‌ಲೋಡ್ ಮಾಡಿರುವ ಫೈಲ್‌ಗಳು, Android ಫೈಲ್‌ಗಳು ಹಾಗೂ ಇನ್ನಷ್ಟು ಇತರವುಗಳು ಒಳಗೊಂಡಿರುತ್ತವೆ. \n\n ಇದರ ಗೋಚರಿಸುವ ವಿಷಯಗಳನ್ನು ವೀಕ್ಷಿಸಲು <xliff:g id="NAME">^1</xliff:g>, ಎಕ್ಸ್‌ಪ್ಲೋರ್ ಟ್ಯಾಪ್ ಮಾಡಿ."</string>
     <string name="storage_detail_dialog_system" msgid="862835644848361569">"Android ಆವೃತ್ತಿ <xliff:g id="VERSION">%s</xliff:g> ರನ್ ಮಾಡಲು ಬಳಸುವ ಫೈಲ್‌ಗಳನ್ನು ಸಿಸ್ಟಂ ಒಳಗೊಂಡಿದೆ"</string>
     <string name="storage_detail_dialog_user" msgid="3267254783294197804">"<xliff:g id="USER_0">^1</xliff:g> ಅವರು <xliff:g id="SIZE">^2</xliff:g> ಸಂಗ್ರಹಣೆ ಬಳಸಿ ಫೋಟೋಗಳು, ಸಂಗೀತ, ಅಪ್ಲಿಕೇಶನ್‌ಗಳು ಅಥವಾ ಇತರ ಡೇಟಾವನ್ನು ಉಳಿಸಿರಬಹುದು. \n\nವಿವರಗಳನ್ನು ವೀಕ್ಷಿಸಲು <xliff:g id="USER_1">^1</xliff:g> ಗೆ ಬದಲಾಯಿಸಿ."</string>
     <string name="storage_wizard_init_title" msgid="5085400514028585772">"ನಿಮ್ಮ <xliff:g id="NAME">^1</xliff:g> ಅನ್ನು ಹೊಂದಿಸಿ"</string>
@@ -1285,7 +1298,7 @@
     <string name="apn_apn" msgid="2479425126733513353">"APN"</string>
     <string name="apn_http_proxy" msgid="1826885957243696354">"ಪ್ರಾಕ್ಸಿ"</string>
     <string name="apn_http_port" msgid="3763259523984976226">"ಪೋರ್ಟ್"</string>
-    <string name="apn_user" msgid="455637547356117761">"ಬಳಕೆದಾರಹೆಸರು"</string>
+    <string name="apn_user" msgid="455637547356117761">"ಬಳಕೆದಾರರಹೆಸರು"</string>
     <string name="apn_password" msgid="5412301994998250968">"ಪಾಸ್‌ವರ್ಡ್"</string>
     <string name="apn_server" msgid="2436185314756372858">"ಸರ್ವರ್"</string>
     <string name="apn_mmsc" msgid="3670124402105585737">"MMSC"</string>
@@ -1321,6 +1334,7 @@
     <string name="menu_restore" msgid="8260067415075573273">"ಡೀಫಾಲ್ಟ್‌ಗೆ  ಮರುಹೊಂದಿಸು"</string>
     <string name="restore_default_apn_completed" msgid="2824775307377604897">"ಡಿಫಾಲ್ಟ್ APN ಸೆಟ್ಟಿಂಗ್‌ಗಳ ಮರುಹೊಂದಿಕೆಯು ಪೂರ್ಣಗೊಂಡಿದೆ."</string>
     <string name="reset_dashboard_title" msgid="6254873816990678620">"ಮರುಹೊಂದಿಸುವ ಆಯ್ಕೆಗಳು"</string>
+    <string name="reset_dashboard_summary" msgid="4851012632493522755">"ನೆಟ್‌ವರ್ಕ್, ಅಪ್ಲಿಕೇಶನ್‌ಗಳು ಅಥವಾ ಸಾಧನವನ್ನು ಮರುಹೊಂದಿಸಬಹುದಾಗಿದೆ"</string>
     <string name="reset_network_title" msgid="6166025966016873843">"ವೈ-ಫೈ, ಮೊಬೈಲ್ ಮತ್ತು ಬ್ಲೂಟೂತ್ ಮರುಹೊಂದಿಸಿ"</string>
     <string name="reset_network_desc" msgid="5547979398298881406">"ಕೆಳಗಿನವುಗಳನ್ನು ಒಳಗೊಂಡಂತೆ ಇದು ಎಲ್ಲಾ ನೆಟ್‌ವರ್ಕ್ ಸೆಟ್ಟಿಂಗ್‌ಗಳನ್ನು ಮರುಹೊಂದಿಸುತ್ತದೆ:\n\n"<li>"ವೈ-ಫೈ"</li>\n<li>"ಮೊಬೈಲ್ ಡೇಟಾ"</li>\n<li>"ಬ್ಲೂಟೂತ್‌"</li></string>
     <string name="reset_network_button_text" msgid="2035676527471089853">"ಸೆಟ್ಟಿಂಗ್‌ಗಳನ್ನು ಮರುಹೊಂದಿಸು"</string>
@@ -1329,17 +1343,14 @@
     <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="6617679904229218425">"ಎಲ್ಲಾ ಡೇಟಾ ಅಳಿಸಿ (ಫ್ಯಾಕ್ಟರಿ ಮರುಹೊಂದಿಸಿ)"</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>
-    </plurals>
-    <string name="master_clear_summary" msgid="6902443944660426951">"ಆಂತರಿಕ ಸಂಗ್ರಹಣೆ ಹಾಗೂ ಎಲ್ಲ ಡೇಟಾವನ್ನು ಮರುಹೊಂದಿಸಲಾಗುವುದು"</string>
+    <string name="master_clear_title" msgid="3531267871084279512">"ಎಲ್ಲಾ ಡೇಟಾ ಅಳಿಸಿ (ಫ್ಯಾಕ್ಟರಿ ಮರುಹೊಂದಿಸಿ)"</string>
     <string name="master_clear_desc" product="tablet" msgid="9146059417023157222">"ಇದು ನಿಮ್ಮ ಟ್ಯಾಬ್ಲೆಟ್‌ನ "<b>"ಆಂತರಿಕ ಸಂಗ್ರಹಣೆಯ"</b>" ಎಲ್ಲ ಡೇಟಾವನ್ನು ಅಳಿಸುತ್ತದೆ, ಅವುಗಳೆಂದರೆ:\n\n"<li>"ನಿಮ್ಮ Google ಖಾತೆ"</li>\n<li>"ಸಿಸ್ಟಂ ಮತ್ತು ಅಪ್ಲಿಕೇಶನ್ ಡೇಟಾ ಹಾಗೂ ಸೆಟ್ಟಿಂಗ್‌ಗಳು"</li>\n<li>"ಡೌನ್‌ಲೋಡ್ ಮಾಡಿರುವ ಅಪ್ಲಿಕೇಶನ್‌ಗಳು"</li></string>
     <string name="master_clear_desc" product="default" msgid="4800386183314202571">"ಇದು ನಿಮ್ಮ ಫೋನ್‌ನ "<b>"ಆಂತರಿಕ ಸಂಗ್ರಹಣೆಯಲ್ಲಿರುವ"</b>"ಎಲ್ಲ ಡೇಟಾವನ್ನು ಅಳಿಸಿ ಹಾಕುತ್ತದೆ. ಡೇಟಾ ಇವುಗಳನ್ನೂ ಒಳಗೊಂಡಿರಬಹುದು:\n\n"<li>"ನಿಮ್ಮ Google ಖಾತೆ"</li>\n<li>"ಸಿಸ್ಟಂ ಮತ್ತು ಅಪ್ಲಿಕೇಶನ್ ಡೇಟಾ ಹಾಗೂ ಸೆಟ್ಟಿಂಗ್‌ಗಳು"</li>\n<li>"ಡೌನ್‌ಲೋಡ್ ಮಾಡಲಾದ ಅಪ್ಲಿಕೇಶನ್‌ಗಳು"</li></string>
     <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"ನೀವು ಪ್ರಸ್ತುತ ಕೆಳಗಿನ ಖಾತೆಗಳಿಗೆ ಸೈನ್ ಇನ್ ಆಗಿರುವಿರಿ:\n"</string>
     <string name="master_clear_other_users_present" product="default" msgid="5161423070702470742">\n\n"ಈ ಸಾಧನದಲ್ಲಿ ಪ್ರಸ್ತುತ ಇತರ ಬಳಕೆದಾರರಿದ್ದಾರೆ.\n"</string>
     <string name="master_clear_desc_also_erases_external" msgid="1903185203791274237"><li>"ಸಂಗೀತ"</li>\n<li>"ಫೋಟೋಗಳು"</li>\n<li>"ಇತರ ಬಳಕೆದಾರರ ಡೇಟಾ"</li></string>
+    <string name="master_clear_desc_also_erases_esim" msgid="312352697653096008"><li>"eSIM ನಲ್ಲಿನ ವಾಹಕಗಳು"</li></string>
+    <string name="master_clear_desc_no_cancel_mobile_plan" msgid="5460926449093211144">\n\n"ಇದು ನಿಮ್ಮ ಮೊಬೈಲ್ ಸೇವಾ ಯೋಜನೆಯನ್ನು ರದ್ದುಗೊಳಿಸುವುದಿಲ್ಲ."</string>
     <string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="7744115866662613411">\n\n"ಸಂಗೀತ, ಚಿತ್ರಗಳು, ಮತ್ತು ಇತರ ಬಳಕೆದಾರರ ಡೇಟಾವನ್ನು ತೆರವುಗೊಳಿಸಲು, "<b>"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>
@@ -1415,19 +1426,19 @@
     <string name="location_mode_sensors_only_description" msgid="7247994752324805202">"ಸ್ಥಳವನ್ನು ನಿರ್ಧರಿಸಲು, GPS ಹಾಗೂ ಸಾಧನದ ಸೆನ್ಸರ್‌ಗಳನ್ನು ಬಳಸಿ"</string>
     <string name="location_scanning_screen_title" msgid="4408076862929611554">"ಸ್ಕ್ಯಾನ್ ಮಾಡುವಿಕೆ"</string>
     <string name="location_scanning_wifi_always_scanning_title" msgid="6216705505621183645">"ವೈ-ಫೈ ಸ್ಕ್ಯಾನಿಂಗ್"</string>
-    <string name="location_scanning_wifi_always_scanning_description" msgid="8036382029606868081">"ಯಾವುದೇ ಸಮಯದಲ್ಲಿ ವೈ-ಫೈ  ನೆಟ್‌ವರ್ಕ್‌ಗಳನ್ನು ಪತ್ತೆಹಚ್ಚಲು ಸಿಸ್ಟಂ ಸೇವೆಗಳು ಮತ್ತು ಅಪ್ಲಿಕೇಶನ್‌ಗಳಿಗೆ ಅನುಮತಿಸುವುದರ ಮೂಲಕ ಸ್ಥಳ ಸುಧಾರಣೆ ಮಾಡಿ."</string>
+    <string name="location_scanning_wifi_always_scanning_description" msgid="8036382029606868081">"ಯಾವುದೇ ಸಮಯದಲ್ಲಿ ವೈ-ಫೈ ನೆಟ್‌ವರ್ಕ್‌ಗಳನ್ನು ಪತ್ತೆಹಚ್ಚಲು ಸಿಸ್ಟಂ ಸೇವೆಗಳು ಮತ್ತು ಅಪ್ಲಿಕೇಶನ್‌ಗಳಿಗೆ ಅನುಮತಿಸುವುದರ ಮೂಲಕ ಸ್ಥಳ ಸುಧಾರಣೆ ಮಾಡಿ."</string>
     <string name="location_scanning_bluetooth_always_scanning_title" msgid="5444989508204520019">"ಬ್ಲೂಟೂತ್ ಸ್ಕ್ಯಾನಿಂಗ್"</string>
     <string name="location_scanning_bluetooth_always_scanning_description" msgid="8602726521250591852">"ಯಾವುದೇ ಸಮಯದಲ್ಲಿ ಬ್ಲೂಟೂತ್ ಸಾಧನಗಳನ್ನು ಪತ್ತೆಹಚ್ಚಲು ಸಿಸ್ಟಂ ಸೇವೆಗಳು ಮತ್ತು ಅಪ್ಲಿಕೇಶನ್‌ಗಳಿಗೆ ಅನುಮತಿಸುವುದರ ಮೂಲಕ ಸ್ಥಳ ಸುಧಾರಣೆ ಮಾಡಿ."</string>
-    <string name="location_network_based" msgid="9134175479520582215">"Wi‑Fi &amp; ಮೊಬೈಲ್‌ ನೆಟ್‌ವರ್ಕ್‌ ಸ್ಥಳ"</string>
+    <string name="location_network_based" msgid="9134175479520582215">"ವೈ-ಫೈ,ಮೊಬೈಲ್‌ ನೆಟ್‌ವರ್ಕ್‌ ಸ್ಥಳ"</string>
     <string name="location_neighborhood_level" msgid="5141318121229984788">"ನಿಮ್ಮ ಸ್ಥಳವನ್ನು ಅತಿ ವೇಗವಾಗಿ ಅಂದಾಜು ಮಾಡಲು Google ನ ಸ್ಥಳ ಸೇವೆ ಅಪ್ಲಿಕೇಶನ್‌ಗಳನ್ನು ಬಳಸಿ. ಅನಾಮಧೇಯ ಸ್ಥಳದ ಡೇಟಾವನ್ನು ಸಂಗ್ರಹಿಸಲಾಗುವುದು ಮತ್ತು Google ಗೆ ಕಳುಹಿಸಲಾಗುವುದು."</string>
-    <string name="location_neighborhood_level_wifi" msgid="4234820941954812210">"Wi‑Fi ಮೂಲಕ ನಿರ್ಧರಿಸಲಾಗಿರುವ ಸ್ಥಳ"</string>
+    <string name="location_neighborhood_level_wifi" msgid="4234820941954812210">"ವೈ-ಫೈ ಮೂಲಕ ನಿರ್ಧರಿಸಲಾಗಿರುವ ಸ್ಥಳ"</string>
     <string name="location_gps" msgid="8392461023569708478">"GPS ಉಪಗ್ರಹಗಳು"</string>
     <string name="location_street_level" product="tablet" msgid="1669562198260860802">"ನಿಮ್ಮ ಸ್ಥಳವನ್ನು ಗುರುತಿಸುವ ಸಲುವಾಗಿ ನಿಮ್ಮ ಟ್ಯಾಬ್ಲೆಟ್‌‌ನಲ್ಲಿ ಅಪ್ಲಿಕೇಶನ್‌ಗಳು GPS ಬಳಸಲು ಅನುಮತಿಸಿ"</string>
     <string name="location_street_level" product="default" msgid="4617445745492014203">"ನಿಮ್ಮ ಸ್ಥಳವನ್ನು ಗುರುತಿಸುವ ಸಲುವಾಗಿ ನಿಮ್ಮ ಫೋನ್‌ನಲ್ಲಿ ಅಪ್ಲಿಕೇಶನ್‌ಗಳು GPS ಬಳಸಲು ಅನುಮತಿಸಿ"</string>
     <string name="assisted_gps" msgid="4649317129586736885">"ಸಹಾಯಕ GPS ಬಳಸು"</string>
     <string name="assisted_gps_enabled" msgid="8751899609589792803">"GPS ಗೆ ನೆರವಾಗಲು ಸರ್ವರ್‌ ಅನ್ನು ಬಳಸಿ (ನೆಟ್‌ವರ್ಕ್‌ ಬಳಕೆಯನ್ನು ಕಡಿಮೆ ಮಾಡಲು ಗುರುತು ತೆಗೆಯಿರಿ)"</string>
     <string name="assisted_gps_disabled" msgid="6982698333968010748">"GPS ಗೆ ನೆರವಾಗಲು ಸರ್ವರ್‌ ಬಳಸಿ (GPS ಕೆಲಸ ನಿರ್ವಹಣೆಯನ್ನು ಸುಧಾರಿಸಲು ಗುರುತು ತೆಗೆಯಿರಿ)"</string>
-    <string name="use_location_title" msgid="5206937465504979977">"ಸ್ಥಳ &amp; Google ಹುಡುಕಾಟ"</string>
+    <string name="use_location_title" msgid="5206937465504979977">"ಸ್ಥಾನ &amp; Google ಹುಡುಕಾಟ"</string>
     <string name="use_location_summary" msgid="3978805802386162520">"ಹುಡುಕಾಟ ಫಲಿತಾಂಶಗಳು ಮತ್ತು ಇತರೆ ಸೇವೆಗಳನ್ನು ಸುಧಾರಿಸುವುದಕ್ಕಾಗಿ ನಿಮ್ಮ ಸ್ಥಾನವನ್ನು ಬಳಸಲು Google ಗೆ ಅವಕಾಶ ಮಾಡಿಕೊಡಿ"</string>
     <string name="location_access_title" msgid="7064108942964081243">"ನನ್ನ ಸ್ಥಳಕ್ಕೆ ಪ್ರವೇಶ"</string>
     <string name="location_access_summary" msgid="69031404093194341">"ನಿಮ್ಮ ಅನುಮತಿಯನ್ನು ಕೇಳುವ ಅಪ್ಲಿಕೇಶನ್‌‌ಗೆ ನಿಮ್ಮ ಸ್ಥಳ ಮಾಹಿತಿಯನ್ನು ಬಳಸಲು ಅನುಮತಿಸಿ"</string>
@@ -1456,15 +1467,16 @@
     <string name="settings_safetylegal_activity_title" msgid="6901214628496951727">"ಸುರಕ್ಷತೆ ಮಾಹಿತಿ"</string>
     <string name="settings_safetylegal_activity_unreachable" msgid="250674109915859456">"ನೀವು ಡೇಟಾ ಸಂಪರ್ಕವನ್ನು ಹೊಂದಿಲ್ಲ. ಇದೀಗ ಈ ಮಾಹಿತಿಯನ್ನು ವೀಕ್ಷಿಸಲು, ಇಂಟರ್ನೆಟ್‌ಗೆ ಸಂಪರ್ಕಪಡಿಸಿದ ಯಾವುದೇ ಕಂಪ್ಯೂಟರ್‌ನಿಂದ %s ಗೆ ಹೋಗಿ."</string>
     <string name="settings_safetylegal_activity_loading" msgid="8059022597639516348">"ಲೋಡ್ ಆಗುತ್ತಿದೆ..."</string>
-    <string name="lockpassword_choose_your_password_header" msgid="8624900666929394990">"ನಿಮ್ಮ ಪಾಸ್‌ವರ್ಡ್‌ ಆರಿಸಿಕೊಳ್ಳಿ"</string>
-    <string name="lockpassword_choose_your_password_header_for_fingerprint" msgid="6624409510609085450">"ಫಿಂಗರ್ ಪ್ರಿಂಟ್ ಬಳಸಲು, ಪಾಸ್‌ವರ್ಡ್‌ ಹೊಂದಿಸಿ"</string>
-    <string name="lockpassword_choose_your_pattern_header" msgid="6949761069941694050">"ಪ್ಯಾಟರ್ನ್ ಆಯ್ಕೆ ಮಾಡಿ"</string>
-    <string name="lockpassword_choose_your_pattern_header_for_fingerprint" msgid="5901096361617543819">"ಬೆರಳಚ್ಚು ಬಳಸಲು, ಪ್ಯಾಟರ್ನ್ ಹೊಂದಿಸಿ"</string>
-    <string name="lockpassword_choose_your_pin_header" msgid="7598849519816138302">"ನಿಮ್ಮ ಪಿನ್‌ ಅನ್ನು ಆರಿಸಿ"</string>
-    <string name="lockpassword_choose_your_pin_header_for_fingerprint" msgid="765344692615917183">"ಬೆರಳಚ್ಚು ಬಳಸಲು, ಪಿನ್ ಹೊಂದಿಸಿ"</string>
-    <string name="lockpassword_confirm_your_password_header" msgid="6308478184889846633">"ನಿಮ್ಮ ಪಾಸ್‌ವರ್ಡ್‌ ದೃಢೀಕರಿಸಿ"</string>
+    <string name="lockpassword_choose_your_screen_lock_header" msgid="3872462096767152394">"ಪರದೆ ಲಾಕ್ ಹೊಂದಿಸಿ"</string>
+    <string name="lockpassword_choose_your_password_message" msgid="1197569283524841412">"ಸುರಕ್ಷತೆಗಾಗಿ, ಪಾಸ್‌ವರ್ಡ್‌ ಹೊಂದಿಸಿ"</string>
+    <string name="lockpassword_choose_your_password_header_for_fingerprint" msgid="2541818487015343503">"ಫಿಂಗರ್‌ ಫ್ರಿಂಟ್‌ ಬಳಸಲು, ಪಾಸ್‌ವರ್ಡ್‌ ಹೊಂದಿಸಿ"</string>
+    <string name="lockpassword_choose_your_pattern_header_for_fingerprint" msgid="7709785406243556723">"ಫಿಂಗರ್‌ ಫ್ರಿಂಟ್‌ ಬಳಸಲು, ಪ್ಯಾಟರ್ನ್‌ ಹೊಂದಿಸಿ"</string>
+    <string name="lockpassword_choose_your_pin_message" msgid="1875420718677275646">"ಸುರಕ್ಷತೆಗಾಗಿ, ಪಿನ್ ಅನ್ನು ಹೊಂದಿಸಿ"</string>
+    <string name="lockpassword_choose_your_pin_header_for_fingerprint" msgid="1549639053195796674">"ಫಿಂಗರ್‌ ಫ್ರಿಂಟ್‌ ಬಳಸಲು, ಪಿನ್ ಹೊಂದಿಸಿ"</string>
+    <string name="lockpassword_choose_your_pattern_message" msgid="5986983400689720015">"ಸುರಕ್ಷತೆಗಾಗಿ, ಪ್ಯಾಟ್ರನ್ ಹೊಂದಿಸಿ"</string>
+    <string name="lockpassword_confirm_your_password_header" msgid="1266027268220850931">"ನಿಮ್ಮ ಪಾಸ್‌ವರ್ಡ್ ಮರು ನಮೂದಿಸಿ"</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="7744513791910572550">"ನಿಮ್ಮ ಪಿನ್‌ ಅನ್ನು ಮರು ನಮೂದಿಸಿ"</string>
     <string name="lockpassword_confirm_passwords_dont_match" msgid="5140892109439191415">"ಪಾಸ್‌ವರ್ಡ್‌ ಹೊಂದಿಕೆಯಾಗುತ್ತಿಲ್ಲ"</string>
     <string name="lockpassword_confirm_pins_dont_match" msgid="7226244811505606217">"ಪಿನ್‌ಗಳು ಹೊಂದಾಣಿಕೆಯಾಗುತ್ತಿಲ್ಲ"</string>
     <string name="lockpassword_choose_lock_generic_header" msgid="3811438094903786145">"ಅನ್‌ಲಾಕ್ ಆಯ್ಕೆ"</string>
@@ -1477,18 +1489,18 @@
     <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>
-    <!-- no translation found for lockpassword_strong_auth_required_device_pattern (530802132223800623) -->
-    <skip />
-    <!-- no translation found for lockpassword_strong_auth_required_device_pin (7829294830078036417) -->
-    <skip />
-    <!-- no translation found for lockpassword_strong_auth_required_device_password (3552644641574796973) -->
-    <skip />
-    <!-- no translation found for lockpassword_strong_auth_required_work_pattern (3003781907040522053) -->
-    <skip />
-    <!-- no translation found for lockpassword_strong_auth_required_work_pin (3367491332598821552) -->
-    <skip />
-    <!-- no translation found for lockpassword_strong_auth_required_work_password (8159775129968582940) -->
-    <skip />
+    <string name="lockpassword_strong_auth_required_device_pattern" msgid="530802132223800623">"ಹೆಚ್ಚಿನ ಸುರಕ್ಷತೆಗಾಗಿ, ನಿಮ್ಮ ಸಾಧನದ ಪ್ಯಾಟರ್ನ್‌ ಬಳಸಿ"</string>
+    <string name="lockpassword_strong_auth_required_device_pin" msgid="7829294830078036417">"ಹೆಚ್ಚಿನ ಸುರಕ್ಷತೆಗಾಗಿ, ನಿಮ್ಮ ಸಾಧನದ ಪಿನ್‌ ನಮೂದಿಸಿ"</string>
+    <string name="lockpassword_strong_auth_required_device_password" msgid="3552644641574796973">"ಹೆಚ್ಚಿನ ಸುರಕ್ಷತೆಗಾಗಿ, ನಿಮ್ಮ ಸಾಧನದ ಪಾಸ್‌ವರ್ಡ್‌ ನಮೂದಿಸಿ"</string>
+    <string name="lockpassword_strong_auth_required_work_pattern" msgid="3003781907040522053">"ಹೆಚ್ಚಿನ ಸುರಕ್ಷತೆಗಾಗಿ, ನಿಮ್ಮ ಕೆಲಸದ ಪಾಸ್‌ವರ್ಡ್‌ ಬಳಸಿ"</string>
+    <string name="lockpassword_strong_auth_required_work_pin" msgid="3367491332598821552">"ಹೆಚ್ಚಿನ ಸುರಕ್ಷತೆಗಾಗಿ, ನಿಮ್ಮ ಕೆಲಸದ ಪಿನ್‌ ನಮೂದಿಸಿ"</string>
+    <string name="lockpassword_strong_auth_required_work_password" msgid="8159775129968582940">"ಹೆಚ್ಚಿನ ಸುರಕ್ಷತೆಗಾಗಿ, ನಿಮ್ಮ ಕೆಲಸದ ಪಾಸ್‌ವರ್ಡ್‌ ನಮೂದಿಸಿ"</string>
+    <string name="lockpassword_confirm_your_pattern_details_frp" msgid="6757336656791723193">"ನಿಮ್ಮ ಫೋನ್‌ ಅನ್ನು ಫ್ಯಾಕ್ಟರಿ ಸೆಟ್ಟಿಂಗ್‌ಗಳಿಗೆ ಮರುಹೊಂದಿಸಲಾಗಿದೆ. ಈ ಫೋನ್‌ ಬಳಸಲು, ನಿಮ್ಮ ಹಿಂದಿನ ಪ್ಯಾಟರ್ನ್‌ ನಮೂದಿಸಿ."</string>
+    <string name="lockpassword_confirm_your_pin_details_frp" msgid="826520613445990470">"ನಿಮ್ಮ ಫೋನ್‌ ಅನ್ನು ಫ್ಯಾಕ್ಟರಿ ಸೆಟ್ಟಿಂಗ್‌ಗಳಿಗೆ ಮರುಹೊಂದಿಸಲಾಗಿದೆ. ಈ ಫೋನ್‌ ಬಳಸಲು, ನಿಮ್ಮ ಹಿಂದಿನ ಪಿನ್‌ ನಮೂದಿಸಿ."</string>
+    <string name="lockpassword_confirm_your_password_details_frp" msgid="8944081074615739040">"ನಿಮ್ಮ ಫೋನ್‌ ಅನ್ನು ಫ್ಯಾಕ್ಟರಿ ಸೆಟ್ಟಿಂಗ್‌ಗಳಿಗೆ ಮರುಹೊಂದಿಸಲಾಗಿದೆ. ಈ ಫೋನ್‌ ಬಳಸಲು, ನಿಮ್ಮ ಹಿಂದಿನ ಪಾಸ್‌ವರ್ಡ್‌ ನಮೂದಿಸಿ."</string>
+    <string name="lockpassword_confirm_your_pattern_header_frp" msgid="2898036091609128286">"ಪ್ಯಾಟರ್ನ್‌ ಪರಿಶೀಲಿಸಿ"</string>
+    <string name="lockpassword_confirm_your_pin_header_frp" msgid="4141601774778898803">"ಪಿನ್‌ ಪರಿಶೀಲಿಸಿ"</string>
+    <string name="lockpassword_confirm_your_password_header_frp" msgid="3762615419295360480">"ಪಾಸ್‌ವರ್ಡ್‌ ಪರಿಶೀಲಿಸಿ"</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>
@@ -1498,7 +1510,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>
@@ -1512,7 +1524,7 @@
     <string name="lockpattern_settings_enable_visible_pattern_title" msgid="2615606088906120711">"ಪ್ಯಾಟರ್ನ್ ಕಾಣಿಸುವಂತೆ ಮಾಡು"</string>
     <string name="lockpattern_settings_enable_visible_pattern_title_profile" msgid="4864525074768391381">"ಪ್ರೊಫೈಲ್ ಪ್ಯಾಟರ್ನ್ ಕಾಣಿಸುವಂತೆ ಮಾಡಿ"</string>
     <string name="lockpattern_settings_enable_tactile_feedback_title" msgid="4389015658335522989">"ಟ್ಯಾಪ್ ಮಾಡಿದಾಗ ವೈಬ್ರೇಟ್‌ ಆಗು"</string>
-    <string name="lockpattern_settings_enable_power_button_instantly_locks" msgid="5735444062633666327">"ಪವರ್ ಬಟನ್ ಲಾಕ್ ಆಗು"</string>
+    <string name="lockpattern_settings_enable_power_button_instantly_locks" msgid="5735444062633666327">"ಪವರ್ ಬಟನ್ ಲಾಕ್ ಆಗುತ್ತದೆ"</string>
     <string name="lockpattern_settings_power_button_instantly_locks_summary" msgid="8196258755143711694">"<xliff:g id="TRUST_AGENT_NAME">%1$s</xliff:g> ಮೂಲಕ ಅನ್‌ಲಾಕ್ ಮಾಡಿದ ಸ್ಥಿತಿಯನ್ನು ಹೊರತುಪಡಿಸಿ"</string>
     <string name="lockpattern_settings_choose_lock_pattern" msgid="1652352830005653447">"ಅನ್‌ಲಾಕ್ ನಮೂನೆಯನ್ನು ಹೊಂದಿಸಿ"</string>
     <string name="lockpattern_settings_change_lock_pattern" msgid="1123908306116495545">"ಅನ್‌ಲಾಕ್ ನಮೂನೆಯನ್ನು ಬದಲಾಯಿಸಿ"</string>
@@ -1538,7 +1550,6 @@
     <string name="install_applications_title" msgid="4987712352256508946">"ಎಲ್ಲಾ ಅಪ್ಲಿಕೇಶನ್ ಮೂಲಗಳನ್ನು ಅನುಮತಿಸಿ"</string>
     <string name="recent_app_category_title" msgid="6673071268966003928">"ಇತ್ತೀಚೆಗಷ್ಟೇ ತೆರೆಯಲಾಗಿರುವ ಅಪ್ಲಿಕೇಶನ್‌ಗಳು"</string>
     <string name="see_all_apps_title" msgid="1317153498074308438">"ಎಲ್ಲಾ <xliff:g id="COUNT">%1$d</xliff:g> ಅಪ್ಲಿಕೇಶನ್‌ಗಳನ್ನು ವೀಕ್ಷಿಸಿ"</string>
-    <string name="recent_app_summary" msgid="3366446669844932300">"<xliff:g id="TIME">^1</xliff:g> ನಿಮಿಷಗಳ ಹಿಂದೆ"</string>
     <string name="install_all_warning" product="tablet" msgid="8310489909586138165">"ನಿಮ್ಮ ಟ್ಯಾಬ್ಲೆಟ್ ಹಾಗೂ ವೈಯಕ್ತಿಕ ಡೇಟಾ, ಅಪರಿಚಿತ ಅಪ್ಲಿಕೇಶನ್‌ಗಳ ದಾಳಿಗೆ ತುತ್ತಾಗುವ ಸಾಧ್ಯತೆ ಹೆಚ್ಚಾಗಿದೆ. ಈ ಮೂಲದ ಅಪ್ಲಿಕೇಶನ್‌ಗಳನ್ನು ಸ್ಥಾಪಿಸುವ ಮೂಲಕ, ನಿಮ್ಮ ಫೋನ್‌ಗೆ ಯಾವುದೇ ಹಾನಿ ಉಂಟಾದರೆ ಅಥವಾ ಅವುಗಳ ಬಳಕೆಯಿಂದ ಡೇಟಾ ನಷ್ಟವಾದರೆ, ಅದಕ್ಕೆ ನೀವೇ ಜವಾಬ್ದಾರರು ಎನ್ನುವುದನ್ನು ಒಪ್ಪಿಕೊಳ್ಳುತ್ತೀರಿ."</string>
     <string name="install_all_warning" product="default" msgid="1952257127370115988">"ನಿಮ್ಮ ಫೋನ್ ಹಾಗೂ ವೈಯಕ್ತಿಕ ಡೇಟಾ, ಅಪರಿಚಿತ ಅಪ್ಲಿಕೇಶನ್‌ಗಳ ದಾಳಿಗೆ ತುತ್ತಾಗುವ ಸಾಧ್ಯತೆ ಹೆಚ್ಚಾಗಿದೆ. ಈ ಮೂಲದ ಅಪ್ಲಿಕೇಶನ್‌ಗಳನ್ನು ಸ್ಥಾಪಿಸುವ ಮೂಲಕ, ನಿಮ್ಮ ಫೋನ್‌ಗೆ ಯಾವುದೇ ಹಾನಿ ಉಂಟಾದರೆ ಅಥವಾ ಅವುಗಳ ಬಳಕೆಯಿಂದ ಡೇಟಾ ನಷ್ಟವಾದರೆ, ಅದಕ್ಕೆ ನೀವೇ ಜವಾಬ್ದಾರರು ಎನ್ನುವುದನ್ನು ಒಪ್ಪಿಕೊಳ್ಳುತ್ತೀರಿ."</string>
     <string name="advanced_settings" msgid="1777249286757067969">"ಸುಧಾರಿತ ಸೆಟ್ಟಿಂಗ್‌ಗಳು"</string>
@@ -1549,9 +1560,9 @@
     <string name="auto_launch_label_generic" msgid="3230569852551968694">"ಡೀಫಾಲ್ಟ್‌ಗಳು"</string>
     <string name="screen_compatibility_label" msgid="663250687205465394">"ಪರದೆಯ ಹೊಂದಾಣಿಕೆ"</string>
     <string name="permissions_label" msgid="2605296874922726203">"ಅನುಮತಿಗಳು"</string>
-    <string name="cache_header_label" msgid="1877197634162461830">"ಸಂಗ್ರಹ"</string>
-    <string name="clear_cache_btn_text" msgid="5756314834291116325">"ಸಂಗ್ರಹ ಅಳಿಸಿ"</string>
-    <string name="cache_size_label" msgid="7505481393108282913">"ಸಂಗ್ರಹ"</string>
+    <string name="cache_header_label" msgid="1877197634162461830">"ಕ್ಯಾಷ್"</string>
+    <string name="clear_cache_btn_text" msgid="5756314834291116325">"ಕ್ಯಾಷ್ ಅಳಿಸಿ"</string>
+    <string name="cache_size_label" msgid="7505481393108282913">"ಕ್ಯಾಷ್"</string>
     <plurals name="uri_permissions_text" formatted="false" msgid="3983110543017963732">
       <item quantity="one">%d ಐಟಂಗಳು</item>
       <item quantity="other">%d ಐಟಂಗಳು</item>
@@ -1565,13 +1576,13 @@
     <string name="data_size_label" msgid="6117971066063850416">"ಬಳಕೆದಾರರ ಡೇಟಾ"</string>
     <string name="external_data_size_label" product="nosdcard" msgid="7533821466482000453">"USB ಸಂಗ್ರಹಣೆ ಡೇಟಾ"</string>
     <string name="external_data_size_label" product="default" msgid="626414192825329708">"SD ಕಾರ್ಡ್"</string>
-    <string name="uninstall_text" msgid="3644892466144802466">"ಅಸ್ಥಾಪಿಸು"</string>
-    <string name="uninstall_all_users_text" msgid="851857393177950340">"ಎಲ್ಲ ಬಳಕೆದಾರರಿಗಾಗಿ ಅಸ್ಥಾಪಿಸು"</string>
-    <string name="install_text" msgid="884360662922471113">"ಸ್ಥಾಪಿಸು"</string>
+    <string name="uninstall_text" msgid="3644892466144802466">"ಅನ್‌ಇನ್‌ಸ್ಟಾಲ್ ಮಾಡಿ"</string>
+    <string name="uninstall_all_users_text" msgid="851857393177950340">"ಎಲ್ಲ ಬಳಕೆದಾರರಿಗಾಗಿ ಅನ್‌ಇನ್‌ಸ್ಟಾಲ್ ಮಾಡಿ"</string>
+    <string name="install_text" msgid="884360662922471113">"ಇನ್‌ಸ್ಟಾಲ್ ಮಾಡಿ"</string>
     <string name="disable_text" msgid="6544054052049395202">"ನಿಷ್ಕ್ರಿಯಗೊಳಿಸು"</string>
     <string name="enable_text" msgid="9217362512327828987">"ಸಕ್ರಿಯಗೊಳಿಸು"</string>
     <string name="clear_user_data_text" msgid="5597622864770098388">"ಡೇಟಾ ಅಳಿಸಿ"</string>
-    <string name="app_factory_reset" msgid="6635744722502563022">"ನವೀಕರಣಗಳನ್ನು ಅಸ್ಥಾಪಿಸಿ"</string>
+    <string name="app_factory_reset" msgid="6635744722502563022">"ನವೀಕರಣಗಳನ್ನು ಅನ್‌ಇನ್‌ಸ್ಟಾಲ್ ಮಾಡಿ"</string>
     <string name="auto_launch_enable_text" msgid="4275746249511874845">"ಕೆಲವು ಕ್ರಮಗಳಿಗಾಗಿ ಈ ಅಪ್ಲಿಕೇಶನ್‌ ಅನ್ನು ಡಿಫಾಲ್ಟ್ ಆಗಿ ಪ್ರಾರಂಭಿಸಲು ನೀವು ಆಯ್ಕೆ ಮಾಡಿರುವಿರಿ."</string>
     <string name="always_allow_bind_appwidgets_text" msgid="566822577792032925">"ಈ ಅಪ್ಲಿಕೇಶನ್‌ ಅನ್ನು ಅನುಮತಿಸಲು ನೀವು ವಿಜೆಟ್‌ಗಳನ್ನು ರಚಿಸಲು ಮತ್ತು ಅವುಗಳ ಡೇಟಾವನ್ನು ಪ್ರವೇಶಿಸಲು ಆಯ್ಕೆಮಾಡಿಕೊಂಡಿರುವಿರಿ."</string>
     <string name="auto_launch_disable_text" msgid="7800385822185540166">"ಡೀಫಾಲ್ಟ್‌ಗಳನ್ನು ಹೊಂದಿಸಲಾಗಿಲ್ಲ."</string>
@@ -1802,7 +1813,7 @@
     <string name="accessibility_settings_summary" msgid="981260486011624939">"ಪರದೆ ರೀಡರ್‌ಗಳು, ಡಿಸ್‌ಪ್ಲೇ, ಸಂವಾದ ನಿಯಂತ್ರಕಗಳು"</string>
     <string name="vision_settings_title" msgid="4204111425716868288">"ವಿಷನ್ ಸೆಟ್ಟಿಂಗ್‌ಗಳು"</string>
     <string name="vision_settings_description" msgid="5679491180156408260">"ನಿಮ್ಮ ಅಗತ್ಯಗಳಿಗೆ ಸರಿಹೊಂದುವಂತೆ ಈ ಸಾಧನವನ್ನು ನೀವು ಕಸ್ಟಮೈಸ್ ಮಾಡಬಹುದು. ಈ ಪ್ರವೇಶಿಸುವಿಕೆ ವೈಶಿಷ್ಟ್ಯಗಳನ್ನು ನಂತರ ಸೆಟ್ಟಿಂಗ್‌ಗಳಲ್ಲಿ ಬದಲಾಯಿಸಬಹುದು."</string>
-    <string name="vision_settings_suggestion_title" msgid="917294957154878441">"ಫಾಂಟ್ ಗಾತ್ರವನ್ನು ಹೆಚ್ಚಿಸಿ"</string>
+    <string name="vision_settings_suggestion_title" msgid="8058794060304707004">"ಫಾಂಟ್ ಗಾತ್ರ ಬದಲಿಸಿ"</string>
     <string name="screen_reader_category_title" msgid="7739154903913400641">"ಪರದೆ ರೀಡರ್‌ಗಳು"</string>
     <string name="audio_and_captions_category_title" msgid="3420727114421447524">"ಆಡಿಯೋ ಮತ್ತು ಪರದೆಯ ಮೇಲಿನ ಪಠ್ಯ"</string>
     <string name="display_category_title" msgid="685461049938269166">"ಪ್ರದರ್ಶನ"</string>
@@ -1839,7 +1850,6 @@
     <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="preference_summary_default_combination" msgid="8532964268242666060">"<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>
@@ -1958,12 +1968,14 @@
     <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_whitelisted" msgid="7375400051141016808">"ಅಪ್ಲಿಕೇಶನ್ ಅನ್ನು ಬ್ಯಾಟರಿ ಬಳಕೆಗೆ ಆಪ್ಟಿಮೈಸ್ ಮಾಡಲು ಸಾಧ್ಯವಿಲ್ಲ"</string>
+    <string name="background_activity_warning_dialog_title" msgid="2216249969149568871">"ಹಿನ್ನೆಲೆ ಚಟುವಟಿಕೆಯನ್ನು ಸೀಮಿತಗೊಳಿಸುವುದೇ?"</string>
+    <string name="background_activity_warning_dialog_text" msgid="7049624449246121981">"ಒಂದು ಅಪ್ಲಿಕೇಶನ್‌ನ ಹಿನ್ನೆಲೆ ಚಟುವಟಿಕೆಯನ್ನು ನೀವು ಸೀಮಿತಗೊಳಿಸಿದರೆ, ಅದು ಸರಿಯಾಗಿ ಕಾರ್ಯನಿರ್ವಹಿಸದಿರಬಹುದು"</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" msgid="6393929085382334341">"ಸಂಪೂರ್ಣ ಚಾರ್ಜ್ ಆದ ಬಳಿಕ ಅಪ್ಲಿಕೇಶನ್ ಬಳಕೆ (<xliff:g id="RELATIVE_TIME">^1</xliff:g>)"</string>
+    <string name="power_usage_list_summary_device" msgid="4461926045610455423">"ಸಂಪೂರ್ಣ ಚಾರ್ಜ್ ಆದ ಬಳಿಕ ಸಾಧನದ ಬಳಕೆ (<xliff:g id="RELATIVE_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>
@@ -2069,7 +2081,7 @@
     <string name="battery_sugg_bluetooth_basic" msgid="4565141162650835009">"ನೀವು ಬ್ಲೂಟೂತ್‌‌ ಅನ್ನು ಬಳಸದಿರುವಾಗ ಅದನ್ನು ಆಫ್ ಮಾಡಿ"</string>
     <string name="battery_sugg_bluetooth_headset" msgid="4071352514714259230">"ಬೇರೆ ಬ್ಲೂಟೂತ್‌‌ ಸಾಧನಕ್ಕೆ ಸಂಪರ್ಕಗೊಳಿಸಲು ಪ್ರಯತ್ನಿಸಿ"</string>
     <string name="battery_desc_apps" msgid="8530418792605735226">"ಅಪ್ಲಿಕೇಶನ್‌ ಬಳಸಿದ ಬ್ಯಾಟರಿ"</string>
-    <string name="battery_sugg_apps_info" msgid="6907588126789841231">"ಅಪ್ಲಿಕೇಶನ್ ಅನ್ನು ನಿಲ್ಲಿಸಿ ಅಥವಾ ಅಸ್ಥಾಪಿಸಿ"</string>
+    <string name="battery_sugg_apps_info" msgid="6907588126789841231">"ಅಪ್ಲಿಕೇಶನ್ ಅನ್ನು ನಿಲ್ಲಿಸಿ ಅಥವಾ ಅನ್‌ಇನ್‌ಸ್ಟಾಲ್ ಮಾಡಿ"</string>
     <string name="battery_sugg_apps_gps" msgid="5959067516281866135">"ಬ್ಯಾಟರಿ ಉಳಿಸುವ ಮೋಡ್‌‌ ಆಯ್ಕೆಮಾಡಿ"</string>
     <string name="battery_sugg_apps_settings" msgid="3974902365643634514">"ಬ್ಯಾಟರಿಯ ಬಳಕೆ ಕಡಿಮೆಗೊಳಿಸಲು ಸೆಟ್ಟಿಂಗ್‌ಗಳಿಗೆ ಅಪ್ಲಿಕೇಶನ್ ಅವಕಾಶ ಮಾಡಿಕೊಡಬಹುದು"</string>
     <string name="battery_desc_users" msgid="7682989161885027823">"ಬಳಕೆದಾರ ಬಳಸಿದ ಬ್ಯಾಟರಿ"</string>
@@ -2097,7 +2109,7 @@
     <string name="menu_stats_unplugged" msgid="8296577130840261624">"<xliff:g id="UNPLUGGED">%1$s</xliff:g> ಅನ್‌ಪ್ಲಗ್ ಮಾಡಿದಾಗಿನಿಂದ"</string>
     <string name="menu_stats_last_unplugged" msgid="5922246077592434526">"<xliff:g id="UNPLUGGED">%1$s</xliff:g> ಗೆ ಕಳೆದ ಬಾರಿ ಅನ್‌ಪ್ಲಗ್ ಮಾಡಿದಾಗ"</string>
     <string name="menu_stats_total" msgid="8973377864854807854">"ಬಳಕೆಯ ಮೊತ್ತ"</string>
-    <string name="menu_stats_refresh" msgid="1676215433344981075">"ರೀಫ್ರೆಶ್ ಮಾಡಿ"</string>
+    <string name="menu_stats_refresh" msgid="1676215433344981075">"ರಿಫ್ರೆಶ್ ಮಾಡಿ"</string>
     <string name="process_kernel_label" msgid="3916858646836739323">"Android OS"</string>
     <string name="process_mediaserver_label" msgid="6500382062945689285">"ಮಾಧ್ಯಮಸರ್ವರ್"</string>
     <string name="process_dex2oat_label" msgid="2592408651060518226">"ಅಪ್ಲಿಕೇಶನ್ ಆಪ್ಟಿಮೈಸೇಷನ್‌"</string>
@@ -2188,10 +2200,10 @@
     <string name="gadget_brightness_state_off" msgid="946382262872753084">"ಆಫ್"</string>
     <string name="vpn_settings_title" msgid="5662579425832406705">"VPN"</string>
     <string name="credentials_title" msgid="4446234003860769883">"ರುಜುವಾತು ಸಂಗ್ರಹಣೆ"</string>
-    <string name="credentials_install" product="nosdcard" msgid="466093273825150847">"ಸಂಗ್ರಹಣೆಯಿಂದ ಸ್ಥಾಪಿಸು"</string>
-    <string name="credentials_install" product="default" msgid="953914549998062317">"SD ಕಾರ್ಡ್‌ನಿಂದ ಸ್ಥಾಪಿಸು"</string>
+    <string name="credentials_install" product="nosdcard" msgid="466093273825150847">"ಸಂಗ್ರಹಣೆಯಿಂದ ಇನ್‌ಸ್ಟಾಲ್ ಮಾಡಿ"</string>
+    <string name="credentials_install" product="default" msgid="953914549998062317">"SD ಕಾರ್ಡ್‌ನಿಂದ ಇನ್‌ಸ್ಟಾಲ್ ಮಾಡಿ"</string>
     <string name="credentials_install_summary" product="nosdcard" msgid="4220422806818210676">"ಸಂಗ್ರಹಣೆಯಿಂದ ಪ್ರಮಾಣಪತ್ರಗಳನ್ನು ಸ್ಥಾಪಿಸಿ"</string>
-    <string name="credentials_install_summary" product="default" msgid="5737658257407822713">"SD ಕಾರ್ಡ್‌ನಿಂದ ಪ್ರಮಾಣಪತ್ರಗಳನ್ನು ಸ್ಥಾಪಿಸು"</string>
+    <string name="credentials_install_summary" product="default" msgid="5737658257407822713">"SD ಕಾರ್ಡ್‌ನಿಂದ ಪ್ರಮಾಣಪತ್ರಗಳನ್ನು ಇನ್‌ಸ್ಟಾಲ್ ಮಾಡಿ"</string>
     <string name="credentials_reset" msgid="3239382277144980418">"ರುಜುವಾತುಗಳನ್ನು ತೆರವುಗೊಳಿಸು"</string>
     <string name="credentials_reset_summary" msgid="3369361230171260282">"ಎಲ್ಲ ಪ್ರಮಾಣಪತ್ರಗಳನ್ನು ತೆಗೆದುಹಾಕು"</string>
     <string name="trusted_credentials" msgid="4266945289534242402">"ವಿಶ್ವಾಸಾರ್ಹ ರುಜುವಾತುಗಳು"</string>
@@ -2209,18 +2221,18 @@
     <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_configure_lock_screen_hint" msgid="8058230497337529036">"ನೀವು ರುಜುವಾತು ಸಂಗ್ರಹಣೆಯನ್ನು ಬಳಸುವ ಮೊದಲು, ನಿಮ್ಮ ಸಾಧನವು ಸುರಕ್ಷಿತ ಲಾಕ್ ಸ್ಕ್ರೀನ್ ಅನ್ನು ಹೊಂದುವುದು ಅಗತ್ಯವಿದೆ"</string>
+    <string name="credentials_configure_lock_screen_button" msgid="253239765216055321">"ಲಾಕ್ ಸೆಟ್‌"</string>
     <string name="usage_access_title" msgid="332333405495457839">"ಬಳಕೆಯ ಪ್ರವೇಶದ ಆಪ್‌‌"</string>
     <string name="emergency_tone_title" msgid="1055954530111587114">"ತುರ್ತು ಟೋನ್"</string>
     <string name="emergency_tone_summary" msgid="722259232924572153">"ತುರ್ತು ಕರೆ ಮಾಡಿದಾಗ ಕಾರ್ಯ ರೀತಿಯನ್ನು ಹೊಂದಿಸಿ"</string>
-    <string name="privacy_settings_title" msgid="2978878794187459190">"ಬ್ಯಾಕ್ ಅಪ್"</string>
+    <string name="privacy_settings_title" msgid="2978878794187459190">"ಬ್ಯಾಕಪ್"</string>
     <string name="backup_section_title" msgid="7952232291452882740">"ಬ್ಯಾಕಪ್ &amp; ಮರುಸ್ಥಾಪನೆ"</string>
     <string name="personal_data_section_title" msgid="7815209034443782061">"ವೈಯಕ್ತಿಕ ಡೇಟಾ"</string>
     <string name="backup_data_title" msgid="1239105919852668016">"ನನ್ನ ಡೇಟಾ ಬ್ಯಾಕಪ್ ಮಾಡು"</string>
@@ -2238,8 +2250,8 @@
     <string name="device_admin_settings_title" msgid="4960761799560705902">"ಸಾಧನದ ನಿರ್ವಾಹಕರ ಸೆಟ್ಟಿಂಗ್‌ಗಳು"</string>
     <string name="active_device_admin_msg" msgid="578748451637360192">"ಸಾಧನ ನಿರ್ವಹಣೆ ಅಪ್ಲಿಕೇಶನ್"</string>
     <string name="remove_device_admin" msgid="9207368982033308173">"ಈ ಸಾಧನ ನಿರ್ವಹಣಾ ಅಪ್ಲಿಕೇಶನ್ ಅನ್ನು ನಿಷ್ಕ್ರಿಯಗೊಳಿಸಿ"</string>
-    <string name="uninstall_device_admin" msgid="271120195128542165">"ಅಪ್ಲಿಕೇಶನ್ ಅಸ್ಥಾಪಿಸಿ"</string>
-    <string name="remove_and_uninstall_device_admin" msgid="3837625952436169878">"ನಿಷ್ಕ್ರಿಯಗೊಳಿಸಿ ಮತ್ತು ಅಸ್ಥಾಪಿಸಿ"</string>
+    <string name="uninstall_device_admin" msgid="271120195128542165">"ಅಪ್ಲಿಕೇಶನ್ ಅನ್‌ಇನ್‌ಸ್ಟಾಲ್ ಮಾಡಿ"</string>
+    <string name="remove_and_uninstall_device_admin" msgid="3837625952436169878">"ನಿಷ್ಕ್ರಿಯಗೊಳಿಸಿ ಮತ್ತು ಅನ್‌ಇನ್‌ಸ್ಟಾಲ್ ಮಾಡಿ"</string>
     <string name="select_device_admin_msg" msgid="7347389359013278077">"ಸಾಧನ ನಿರ್ವಹಣೆ ಅಪ್ಲಿಕೇಶನ್‌ಗಳು"</string>
     <string name="no_device_admins" msgid="4846602835339095768">"ಸಾಧನ ನಿರ್ವಹಣಾ ಅಪ್ಲಿಕೇಶನ್‌ಗಳು ಲಭ್ಯವಿಲ್ಲ"</string>
     <string name="personal_device_admin_title" msgid="2849617316347669861">"ವೈಯಕ್ತಿಕ"</string>
@@ -2251,7 +2263,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>
@@ -2266,7 +2278,7 @@
     <string name="wifi_setup_title_add_network" msgid="6932651000151032301">"ನೆಟ್‌ವರ್ಕ್‌ವೊಂದನ್ನು ಸೇರಿಸಿ"</string>
     <string name="wifi_setup_not_connected" msgid="6997432604664057052">"ಸಂಪರ್ಕಗೊಂಡಿಲ್ಲ"</string>
     <string name="wifi_setup_add_network" msgid="5939624680150051807">"ನೆಟ್‌ವರ್ಕ್‌ ಸೇರಿಸಿ"</string>
-    <string name="wifi_setup_refresh_list" msgid="3411615711486911064">"ಪಟ್ಟಿ ರೀಫ್ರೆಶ್ ಮಾಡಿ"</string>
+    <string name="wifi_setup_refresh_list" msgid="3411615711486911064">"ಪಟ್ಟಿ ರಿಫ್ರೆಶ್ ಮಾಡಿ"</string>
     <string name="wifi_setup_skip" msgid="6661541841684895522">"ಸ್ಕಿಪ್‌"</string>
     <string name="wifi_setup_next" msgid="3388694784447820477">"ಮುಂದೆ"</string>
     <string name="wifi_setup_back" msgid="144777383739164044">"ಹಿಂದೆ"</string>
@@ -2336,8 +2348,6 @@
     <skip />
     <string name="cant_sync_dialog_title" msgid="2777238588398046285">"ಹಸ್ತಚಾಲಿತವಾಗಿ ಸಿಂಕ್‌ ಮಾಡಲು ಸಾಧ್ಯವಿಲ್ಲ"</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>
@@ -2351,6 +2361,7 @@
     <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_plan_usage_manage_plans_button_text" msgid="8997761990902708162">"ಯೋಜನೆಗಳನ್ನು ನಿರ್ವಹಿಸಿ"</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>
@@ -2436,6 +2447,9 @@
     <string name="data_usage_metered_mobile" msgid="5423305619126978393">"ಮೊಬೈಲ್‌ ನೆಟ್‌ವರ್ಕ್‌ಗಳು"</string>
     <string name="data_usage_metered_wifi" msgid="1761738002328299714">"ಮಾಪನಯುಕ್ತ ವೈ-ಫೈ ನೆಟ್‌ವರ್ಕ್‌ಗಳು"</string>
     <string name="data_usage_metered_wifi_disabled" msgid="727808462375941567">"ಮಾಪನಯುಕ್ತ ನೆಟ್‌ವರ್ಕ್‌ಗಳನ್ನು ಆಯ್ಕೆ ಮಾಡಲು, ವೈ-ಫೈ ಆನ್ ಮಾಡಿ."</string>
+    <string name="data_usage_metered_auto" msgid="1262028400911918865">"ಸ್ವಯಂಚಾಲಿತ"</string>
+    <string name="data_usage_metered_yes" msgid="9217539611385225894">"ಮೀಟರ್ ಮಾಡಲಾಗಿದೆ"</string>
+    <string name="data_usage_metered_no" msgid="4025232961929071789">"ಮೀಟರ್ ಮಾಡಲಾಗಿಲ್ಲ"</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>
@@ -2453,7 +2467,7 @@
     <string name="vpn_search_domains" msgid="5391995501541199624">"DNS ಹುಡುಕಾಟ ಡೊಮೇನ್‌ಗಳು"</string>
     <string name="vpn_dns_servers" msgid="5570715561245741829">"DNS ಸರ್ವರ್‌ಗಳು (ಉದಾ. 8.8.8.8)"</string>
     <string name="vpn_routes" msgid="3818655448226312232">"ಫಾರ್ವರ್ಡಿಂಗ್ ಮಾರ್ಗಗಳು (ಉದಾ. 10.0.0.0/8)"</string>
-    <string name="vpn_username" msgid="1863901629860867849">"ಬಳಕೆದಾರಹೆಸರು"</string>
+    <string name="vpn_username" msgid="1863901629860867849">"ಬಳಕೆದಾರರಹೆಸರು"</string>
     <string name="vpn_password" msgid="6756043647233596772">"ಪಾಸ್‌ವರ್ಡ್"</string>
     <string name="vpn_save_login" msgid="6350322456427484881">"ಖಾತೆಯ ಮಾಹಿತಿಯನ್ನು ಉಳಿಸು"</string>
     <string name="vpn_not_used" msgid="9094191054524660891">"(ಬಳಸಲಾಗಿಲ್ಲ)"</string>
@@ -2527,9 +2541,6 @@
     <string name="backup_pw_set_button_text" msgid="2387480910044648795">"ಬ್ಯಾಕಪ್ ಪಾಸ್‌ವರ್ಡ್‌ ಹೊಂದಿಸಿ"</string>
     <string name="backup_pw_cancel_button_text" msgid="8845630125391744615">"ರದ್ದುಮಾಡಿ"</string>
     <string name="additional_system_update_settings_list_item_title" msgid="214987609894661992">"ಹೆಚ್ಚುವರಿ ಸಿಸ್ಟಂ ಅಪ್‌ಡೇಟ್‌ಗಳು"</string>
-    <string name="selinux_status_disabled" msgid="924551035552323327">"ನಿಷ್ಕ್ರಿಯಗೊಳಿಸಲಾಗಿದೆ"</string>
-    <string name="selinux_status_permissive" msgid="6004965534713398778">"ಅನುಮೋದನೆ"</string>
-    <string name="selinux_status_enforcing" msgid="2252703756208463329">"ಒತ್ತಾಯ"</string>
     <string name="ssl_ca_cert_warning" msgid="2045866713601984673">"ನೆಟ್‌ವರ್ಕ್‌ ಪರಿವೀಕ್ಷಿಸಬಹುದಾಗಿದೆ"</string>
     <string name="done_button" msgid="1991471253042622230">"ಮುಗಿದಿದೆ"</string>
     <plurals name="ssl_ca_cert_dialog_title" formatted="false" msgid="7145092748045794650">
@@ -2569,7 +2580,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>
@@ -2638,7 +2649,7 @@
     <string name="restriction_menu_change_pin" msgid="740081584044302775">"ಪಿನ್‌ ಬದಲಾಯಿಸಿ"</string>
     <string name="app_notifications_switch_label" msgid="9124072219553687583">"ಅಧಿಸೂಚನೆಗಳನ್ನು ತೋರಿಸು"</string>
     <string name="help_label" msgid="6886837949306318591">"ಸಹಾಯ,ಪ್ರತಿಕ್ರಿಯೆ"</string>
-    <string name="support_summary" msgid="2705726826263742491">"ಸಹಾಯ ಲೇಖನಗಳು, ಫೋನ್ ಮತ್ತು ಚಾಟ್‌ ಪ್ರಾರಂಭಿಸಲಾಗುತ್ತಿದೆ"</string>
+    <string name="support_summary" msgid="2705726826263742491">"ಸಹಾಯ ಲೇಖನಗಳು, ಫೋನ್, ಚಾಟ್‌ ಪ್ರಾರಂಭಿಸಲಾಗುತ್ತಿದೆ"</string>
     <string name="user_account_title" msgid="1127193807312271167">"ವಿಷಯಕ್ಕಾಗಿ ಖಾತೆ"</string>
     <string name="user_picture_title" msgid="7297782792000291692">"ಫೋಟೋ ID"</string>
     <string name="extreme_threats_title" msgid="6549541803542968699">"ತೀವ್ರ ಬೆದರಿಕೆಗಳು"</string>
@@ -2727,6 +2738,7 @@
       <item quantity="one">%d ಮರೆಮಾಡಲಾದ ಐಟಂಗಳನ್ನು ತೋರಿಸಿ</item>
       <item quantity="other">%d ಮರೆಮಾಡಲಾದ ಐಟಂಗಳನ್ನು ತೋರಿಸಿ</item>
     </plurals>
+    <string name="dashboard_suggestion_condition_footer_content_description" msgid="2898588191174845961">"ಕುಗ್ಗಿಸಿ"</string>
     <string name="network_dashboard_title" msgid="4771589228992391573">"ನೆಟ್‌ವರ್ಕ್ ಮತ್ತು ಇಂಟರ್ನೆಟ್"</string>
     <string name="network_dashboard_summary_mobile" msgid="3851083934739500429">"ಮೊಬೈಲ್‌‌"</string>
     <string name="network_dashboard_summary_data_usage" msgid="3843261364705042212">"ಡೇಟಾ ಬಳಕೆ"</string>
@@ -2757,7 +2769,7 @@
     <string name="keywords_storage" msgid="3299217909546089225">"ಸ್ಥಳ, ಡಿಸ್ಕ್, ಹಾರ್ಡ್ ಡ್ರೈವ್, ಸಾಧನ, ಬಳಕೆ"</string>
     <string name="keywords_battery" msgid="1173830745699768388">"ವಿದ್ಯುತ್ ಬಳಕೆ, ಶುಲ್ಕ"</string>
     <string name="keywords_spell_checker" msgid="1399641226370605729">"ಕಾಗುಣಿತ, ನಿಘಂಟು, ಕಾಗುಣಿತ ಪರಿಶೀಲನೆ, ಸ್ವಯಂ-ಸರಿಪಡಿಸುವಿಕೆ"</string>
-    <string name="keywords_voice_input" msgid="769778245192531102">"ಗುರುತಿಸುವಿಕೆ, ಇನ್‌ಪುಟ್‌, ಧ್ವನಿ, ಮಾತನಾಡಿ, ಭಾಷೆ, ಹ್ಯಾಂಡ್ಸ್‌-ಫ್ರೀ, ಹ್ಯಾಂಡ್‌ ಫ್ರೀ, ಗುರುತಿಸುವಿಕೆ, ಆಕ್ಷೇಪಾರ್ಹ, ಪದ, ಆಡಿಯೊ, ಇರಿಹಾಸ, ಬ್ಲೂಟೂತ್ ಹೆಡ್‌ಸೆಟ್‌"</string>
+    <string name="keywords_voice_input" msgid="769778245192531102">"ಗುರುತಿಸುವಿಕೆ, ಇನ್‌ಪುಟ್‌, ಧ್ವನಿ, ಮಾತನಾಡಿ, ಭಾಷೆ, ಹ್ಯಾಂಡ್ಸ್‌-ಫ್ರೀ, ಹ್ಯಾಂಡ್‌ ಫ್ರೀ, ಗುರುತಿಸುವಿಕೆ, ಆಕ್ಷೇಪಾರ್ಹ, ಪದ, ಆಡಿಯೊ, ಇತಿಹಾಸ, ಬ್ಲೂಟೂತ್ ಹೆಡ್‌ಸೆಟ್‌"</string>
     <string name="keywords_text_to_speech_output" msgid="5150660047085754699">"ರೇಟ್ ಮಾಡು, ಭಾಷೆ, ಡಿಫಾಲ್ಟ್, ಮಾತನಾಡಿ, ಮಾತನಾಡುವಿಕೆ, ಟಿಟಿಎಸ್, ಪ್ರವೇಶಿಸುವಿಕೆ, ಪರದೆ ರೀಡರ್, ಕುರುಡು"</string>
     <string name="keywords_date_and_time" msgid="758325881602648204">"ಕ್ಲಾಕ್‌, ಮಿಲಿಟರಿ"</string>
     <string name="keywords_network_reset" msgid="6024276007080940820">"ಮರುಹೊಂದಿಸಿ, ಮರುಸ್ಥಾಪಿಸಿ, ಫ್ಯಾಕ್ಟರಿ"</string>
@@ -2786,8 +2798,7 @@
     <string name="keywords_gesture" msgid="3526905012224714078">"ಗೆಸ್ಚರ್‌ಗಳು"</string>
     <string name="keywords_payment_settings" msgid="5220104934130446416">"ಪಾವತಿಸಿ, ಟ್ಯಾಪ್ ಮಾಡಿ, ಪಾವತಿಗಳು"</string>
     <string name="keywords_backup" msgid="470070289135403022">"ಬ್ಯಾಕಪ್, ಬ್ಯಾಕ್ ಅಪ್"</string>
-    <!-- no translation found for keywords_assist_gesture_launch (813968759791342591) -->
-    <skip />
+    <string name="keywords_assist_gesture_launch" msgid="813968759791342591">"ಗೆಸ್ಚರ್"</string>
     <string name="setup_wifi_nfc_tag" msgid="9028353016222911016">"ವೈ-ಫೈ NFC ಟ್ಯಾಗ್‌ ಹೊಂದಿಸಿ"</string>
     <string name="write_tag" msgid="8571858602896222537">"ಬರೆಯಿರಿ"</string>
     <string name="status_awaiting_tap" msgid="2130145523773160617">"ಬರೆಯಲು ಟ್ಯಾಗ್‌ ಅನ್ನು ಟ್ಯಾಪ್‌ ಮಾಡಿ..."</string>
@@ -2830,8 +2841,14 @@
       <item quantity="one"><xliff:g id="ON_COUNT">%d</xliff:g> ಸ್ವಯಂಚಾಲಿತ ನಿಯಮಗಳು ಆನ್ ಆಗಿವೆ</item>
       <item quantity="other"><xliff:g id="ON_COUNT">%d</xliff:g> ಸ್ವಯಂಚಾಲಿತ ನಿಯಮಗಳು ಆನ್ ಆಗಿವೆ</item>
     </plurals>
-    <string name="zen_mode_settings_title" msgid="842308776768942600">"ಅಡಚಣೆ ಮಾಡಬೇಡಿ ಆದ್ಯತೆಗಳು"</string>
-    <string name="zen_mode_priority_settings_title" msgid="2623117023031824309">"ಆದ್ಯತೆಯು ಕೆಳಗಿನವುಗಳಿಗೆ ಅನುಮತಿಸುತ್ತದೆ"</string>
+    <string name="zen_mode_settings_title" msgid="1066226840983908121">"ಅಡಚಣೆ ಮಾಡಬೇಡಿ"</string>
+    <string name="zen_mode_behavior_settings_title" msgid="1463303933529313969">"ವರ್ತನೆ"</string>
+    <string name="zen_mode_behavior_allow_title" msgid="3845615648136218141">"ಧ್ವನಿ, ವೈಬ್ರೇಷನ್‌ಗೆ ಅನುಮತಿಸಿ"</string>
+    <string name="zen_mode_behavior_no_sound" msgid="1219626004723208056">"ಧ್ವನಿ ಇಲ್ಲ"</string>
+    <string name="zen_mode_behavior_total_silence" msgid="6716603819806610626">"ಧ್ವನಿ ಇಲ್ಲ (ಸಂಪೂರ್ಣ ನಿಶ್ಯಬ್ಧ)"</string>
+    <string name="zen_mode_behavior_no_sound_except" msgid="4968477585788243114">"<xliff:g id="CATEGORIES">%1$s</xliff:g> ಹೊರತುಪಡಿಸಿ ಧ್ವನಿ ಇಲ್ಲ"</string>
+    <!-- no translation found for zen_mode_behavior_alarms_only (2423480992071472963) -->
+    <skip />
     <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>
@@ -2873,19 +2890,21 @@
     <string name="notifications_title" msgid="8086372779371204971">"ಅಧಿಸೂಚನೆಗಳು"</string>
     <string name="app_notifications_title" msgid="5810577805218003760">"ಅಪ್ಲಿಕೇಶನ್‌ ಅಧಿಸೂಚನೆಗಳು"</string>
     <string name="notification_channel_title" msgid="2260666541030178452">"ಅಧಿಸೂಚನೆ ವರ್ಗ"</string>
+    <string name="notification_group_title" msgid="7180506440133859601">"ಅಧಿಸೂಚನೆ ವರ್ಗ ಗುಂಪು"</string>
     <string name="notification_importance_title" msgid="848692592679312666">"ಪ್ರಾಮುಖ್ಯತೆ"</string>
-    <string name="notification_importance_unspecified" msgid="2196023702875112081">"ಅಪ್ಲಿಕೇಶನ್‌ ನಿರ್ಧರಿಸಲು ಬಿಡಿ"</string>
+    <string name="notification_importance_unspecified" msgid="6622173510486113958">"ಧ್ವನಿಗೆ ಅನುಮತಿ ನೀಡಿ"</string>
     <string name="notification_importance_blocked" msgid="7938180808339386300">"ಎಂದಿಗೂ ಅಧಿಸೂಚನೆಗಳನ್ನು ತೋರಿಸಬೇಡಿ"</string>
     <string name="notification_importance_min" msgid="5455049524984686275">"ಯಾವುದೇ ಧ್ವನಿ ಅಥವಾ ದೃಶ್ಯ ಅಡಚಣೆಗಳಿಲ್ಲ"</string>
     <string name="notification_importance_low" msgid="8881468429453766553">"ಧ್ವನಿ ಇಲ್ಲ"</string>
     <string name="notification_importance_default" msgid="5958338024601957516">"ಧ್ವನಿ ಮಾಡಿ"</string>
     <string name="notification_importance_high" msgid="2082429479238228527">"ಪರದೆಯ ಮೇಲೆ ಧ್ವನಿಮಾಡಿ ಮತ್ತು ಪಾಪ್ ಮಾಡಿ"</string>
+    <string name="notification_importance_high_silent" msgid="2667033773703765252">"ಪರದೆಯಲ್ಲಿ ಪಾಪ್ ಮಾಡಿ"</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_interruption" msgid="7136150018111848721">"ತಡೆಗಳನ್ನು ಅನುಮತಿಸಿ"</string>
-    <string name="allow_interruption_summary" msgid="7870159391333957050">"ಅಪ್ಲಿಕೇಶನ್‌ ಧ್ವನಿ, ವೈಬ್ರೇಷನ್ ಮಾಡಲು ಮತ್ತು /ಅಥವಾ ಪರದೆ ಮೇಲೆ ಇಣುಕು ನೋಟದ ಅಧಿಸೂಚನೆಗಳು ಕಾಣಿಸಲು ಅವಕಾಶಿಸಿ"</string>
+    <string name="allow_interruption_summary" msgid="7870159391333957050">"ಅಪ್ಲಿಕೇಶನ್‌ ಧ್ವನಿ, ವೈಬ್ರೇಷನ್ ಮಾಡಲು ಮತ್ತು /ಅಥವಾ ಪರದೆ ಮೇಲೆ ಇಣುಕು ನೋಟದ ಅಧಿಸೂಚನೆಗಳು ಕಾಣಿಸಲು ಅವಕಾಶ ಮಾಡಿಕೊಡಿ."</string>
     <string name="notification_channel_summary_min" msgid="5401718014765921892">"ಕಡಿಮೆ ಪ್ರಾಮುಖ್ಯತೆ"</string>
     <string name="notification_channel_summary_low" msgid="322317684244981244">"ಮಧ್ಯಮ ಪ್ರಾಮುಖ್ಯತೆ"</string>
     <string name="notification_channel_summary_default" msgid="1111749130423589931">"ಉನ್ನತ ಪ್ರಾಮುಖ್ಯತೆ"</string>
@@ -2901,7 +2920,7 @@
     <string name="no_notification_listeners" msgid="3487091564454192821">"ಯಾವುದೇ ಸ್ಥಾಪಿಸಿದ ಅಪ್ಲಿಕೇಶನ್‌ಗಳು ಅಧಿಸೂಚನೆ ಪ್ರವೇಶವನ್ನು ವಿನಂತಿಸಿಲ್ಲ."</string>
     <string name="notification_listener_security_warning_title" msgid="5522924135145843279">"<xliff:g id="SERVICE">%1$s</xliff:g> ಗೆ ಅಧಿಸೂಚನೆ ಪ್ರವೇಶವನ್ನು ಅನುಮತಿಸುವುದೇ?"</string>
     <string name="notification_listener_security_warning_summary" msgid="119203147791040151">"ಸಂಪರ್ಕ ಹೆಸರುಗಳು ಮತ್ತು ನೀವು ಸ್ವೀಕರಿಸುವ ಸಂದೇಶಗಳ ಪಠ್ಯದಂತಹ ವೈಯಕ್ತಿಕ ಮಾಹಿತಿ ಸೇರಿದಂತೆ <xliff:g id="NOTIFICATION_LISTENER_NAME">%1$s</xliff:g> ಗೆ ಎಲ್ಲ ಅಧಿಸೂಚನೆಗಳನ್ನು ಓದಲು ಸಾಧ್ಯವಾಗುತ್ತದೆ. ಇದಕ್ಕೆ ಅಧಿಸೂಚನೆಗಳನ್ನು ವಜಾ ಮಾಡಲು ಅಥವಾ ಅವುಗಳು ಹೊಂದಿರುವಂತಹ ಕ್ರಿಯೆ ಬಟನ್‌ಗಳನ್ನು ಟ್ರಿಗ್ಗರ್ ಮಾಡಲು ಸಾಧ್ಯವಾಗುತ್ತದೆ. \n\nಈ ಅಪ್ಲಿಕೇಶನ್ ಸಂಬಂಧಿಸಿದ ಸೆಟ್ಟಿಂಗ್‌ಗಳನ್ನು ಬದಲಾಯಿಸಲು ಮತ್ತು ಅಡಚಣೆ ಮಾಡಬೇಡ ಆನ್ ಅಥವಾ ಆಫ್ ಮಾಡುವ ಸಾಮರ್ಥ್ಯವನ್ನು ಈ ಅಪ್ಲಿಕೇಶನ್‌ಗಳು ನೀಡುತ್ತದೆ."</string>
-    <string name="notification_listener_disable_warning_summary" msgid="6738915379642948000">"<xliff:g id="NOTIFICATION_LISTENER_NAME">%1$s</xliff:g> ಗೆ ನೀವು ಅಧಿಸೂಚನೆ ಪ್ರವೇಶಿಸುವಿಕೆಯನ್ನು ಆಫ್ ಮಾಡಿದರೆ, ಅಡಚಣೆ ಮಾಡಬೇಡಿ ಪ್ರವೇಶವು ಸಹ ಆಫ್ ಆಗಬಹುದು."</string>
+    <string name="notification_listener_disable_warning_summary" msgid="6738915379642948000">"<xliff:g id="NOTIFICATION_LISTENER_NAME">%1$s</xliff:g> ಗೆ ನೀವು ಅಧಿಸೂಚನೆ ಪ್ರವೇಶಿಸುವಿಕೆಯನ್ನು ಆಫ್ ಮಾಡಿದರೆ, ಅಡಚಣೆ ಮಾಡಬೇಡಿ ಪ್ರವೇಶಿಸುವಿಕೆ ಸಹ ಆಫ್ ಆಗಬಹುದು."</string>
     <string name="notification_listener_disable_warning_confirm" msgid="8333442186428083057">"ಆಫ್ ಮಾಡು"</string>
     <string name="notification_listener_disable_warning_cancel" msgid="8586417377104211584">"ರದ್ದು ಮಾಡಿ"</string>
     <string name="vr_listeners_title" msgid="1318901577754715777">"VR ಸಹಾಯ ಸೇವೆಗಳು"</string>
@@ -2916,15 +2935,19 @@
     <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>
-    <!-- no translation found for picture_in_picture_app_detail_summary (1264019085827708920) -->
-    <skip />
-    <string name="manage_zen_access_title" msgid="2611116122628520522">"ಅಡಚಣೆ ಮಾಡಬೇಡಿ ಪ್ರವೇಶ"</string>
-    <string name="zen_access_empty_text" msgid="8772967285742259540">"ಸ್ಥಾಪಿಸಲಾದ ಅಪ್ಲಿಕೇಶನ್‌ಗಳು ಯಾವುದೇ ಅಡಚಣೆ ಮಾಡಬೇಡಿಗೆ ಪ್ರವೇಶ ವಿನಂತಿಸಿಲ್ಲ"</string>
+    <string name="picture_in_picture_app_detail_summary" msgid="1264019085827708920">"ನೀವು ಈ ಅಪ್ಲಿಕೇಶನ್ ತೊರೆದ ಬಳಿಕ (ಉದಾಹರಣೆಗೆ, ವೀಡಿಯೊ ನೋಡಲು), ಅಪ್ಲಿಕೇಶನ್ ತೆರೆದೇ ಇರುವಾಗ ಚಿತ್ರದಲ್ಲಿ ಚಿತ್ರ ವಿಂಡೋ ರಚಿಸಲು ಈ ಅಪ್ಲಿಕೇಶನ್‌ಗೆ ಅನುಮತಿ ನೀಡಿ. ನೀವು ಬಳಸುವ ಇತರ ಅಪ್ಲಿಕೇಶನ್‌ಗಳ ಮೇಲೆ ಈ ವಿಂಡೋ ಡಿಸ್‌ಪ್ಲೇ ಆಗುತ್ತದೆ."</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="channel_group_notifications_off_desc" msgid="1620950416247316370">"ಈ ಸಾಧನದಲ್ಲಿ ಗೋಚರವಾಗುವ ಈ ಅಧಿಸೂಚನೆಗಳ ಗುಂಪನ್ನು Android ನಿರ್ಬಂಧಿಸುತ್ತದೆ"</string>
     <string name="notification_channels" msgid="5346841743182627500">"ವಿಭಾಗಗಳು"</string>
     <string name="notification_channels_other" msgid="5645317113885788226">"ಇತರೆ"</string>
+    <plurals name="notification_group_summary" formatted="false" msgid="3420621520561455358">
+      <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="no_channels" msgid="3077375508177744586">"ಯಾವುದೇ ಅಧಿಸೂಚನೆಗಳನ್ನು ಈ ಅಪ್ಲಿಕೇಶನ್‌ ಪೋಸ್ಟ್‌ ಮಾಡಿಲ್ಲ"</string>
     <string name="app_settings_link" msgid="8894946007543660906">"ಅಪ್ಲಿಕೇಶನ್‌ನಲ್ಲಿ ಹೆಚ್ಚುವರಿ ಸೆಟ್ಟಿಂಗ್‌ಗಳು"</string>
     <string name="app_notification_listing_summary_zero" msgid="6482582965081108108">"ಎಲ್ಲ ಅಪ್ಲಿಕೇಶನ್‌ಗಳಿಗೆ ಆನ್ ಮಾಡಲಾಗಿದೆ"</string>
@@ -3001,12 +3024,14 @@
     <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>
+    <!-- no translation found for zen_mode_media_system_other (8900209390529859777) -->
+    <skip />
     <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="239685342222975733">"ಒಂದು ವೇಳೆ ಒಬ್ಬನೇ ವ್ಯಕ್ತಿ <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>
@@ -3035,6 +3060,7 @@
     <string name="zen_mode_screen_off_visual_interruptions" msgid="4850792880144382633">"ಪರದೆ ಆಫ್ ಆಗಿರುವಾಗ"</string>
     <string name="zen_mode_no_visual_interruptions" msgid="8742776003822778472">"ಪರದೆ ಆನ್ ಅಥವಾ ಆಫ್ ಆಗಿರುವಾಗ"</string>
     <string name="notification_app_settings_button" msgid="6685640230371477485">"ಅಧಿಸೂಚನೆ ಸೆಟ್ಟಿಂಗ್‌ಗಳು"</string>
+    <string name="suggestion_button_text" msgid="3275010948381252006">"ಸರಿ"</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>
@@ -3050,12 +3076,12 @@
     <string name="experimental_preference" msgid="7083015446690681376">"(ಪ್ರಾಯೋಗಿಕ)"</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="5560954719370251702">"ನಿಮ್ಮ ಸಾಧನವನ್ನು ಅನ್‌ಲಾಕ್ ಮಾಡಲು ನಿಮ್ಮ ಫಿಂಗರ್ ಪ್ರಿಂಟ್ ಬಳಸುವುದರ ಜೊತೆಗೆ, ಸಾಧನ ಪ್ರಾರಂಭವಾಗಲು ನಿಮ್ಮ ಪಾಸ್‌ವರ್ಡ್ ನಮೂದಿಸುವುದನ್ನು ಆವಶ್ಯಕಗೊಳಿಸುವ ಮೂಲಕ, ಈ ಸಾಧನಕ್ಕೆ ನೀವು ಹೆಚ್ಚಿನ ಸುರಕ್ಷೆ ಒದಗಿಸಬಹುದು. ಸಾಧನ ಪ್ರಾರಂಭಗೊಳ್ಳುವವರೆಗೆ ನೀವು ಅಲಾರ್ಮ್‌ಗಳೂ ಸೇರಿದಂತೆ ಯಾವುದೇ ಕರೆಗಳು, ಸಂದೇಶಗಳು, ಅಥವಾ ಅಧಿಸೂಚನೆಗಳನ್ನು ಸ್ವೀಕರಿಸಲು ಸಾಧ್ಯವಾಗುವುದಿಲ್ಲ. \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">"PIN ಅಗತ್ಯವಿದೆಯೇ?"</string>
@@ -3113,7 +3139,7 @@
     <string name="filter_personal_apps" msgid="3277727374174355971">"ವೈಯಕ್ತಿಕ"</string>
     <string name="filter_work_apps" msgid="24519936790795574">"ಕೆಲಸ"</string>
     <string name="filter_notif_all_apps" msgid="2299049859443680242">"ಅಪ್ಲಿಕೇಶನ್‌ಗಳು: ಎಲ್ಲ"</string>
-    <string name="filter_notif_blocked_apps" msgid="3300375727887991342">"ಆಪ್‌ಗಳು: ಆಫ್ ಮಾಡಿದೆ"</string>
+    <string name="filter_notif_blocked_apps" msgid="3300375727887991342">"ಆಪ್‌ಗಳು: ಆಫ್ ಮಾಡಿರುವವು"</string>
     <string name="filter_notif_urgent_channels" msgid="3972473613117159653">"ವರ್ಗಗಳು: ತುರ್ತು ಪ್ರಾಮುಖ್ಯತೆ"</string>
     <string name="filter_notif_low_channels" msgid="4128487387390004604">"ವರ್ಗಗಳು: ಕಡಿಮೆ ಪ್ರಾಮುಖ್ಯತೆ"</string>
     <string name="filter_notif_blocked_channels" msgid="5880190882221644289">"ವರ್ಗಗಳು: ಆಫ್ ಮಾಡಲಾಗಿದೆ"</string>
@@ -3219,6 +3245,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="sms_mirroring_pref" msgid="6475043279147376031">"ಎಸ್‌ಎಂಎಸ್ ಪ್ರತಿಬಿಂಬಿಸುವಿಕೆ"</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>
@@ -3285,7 +3312,7 @@
     <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="permit_write_settings" msgid="658555006453212691">"ಮಾರ್ಪಡಿಸುವ ಸಿಸ್ಟಮ್ ಸೆಟ್ಟಿಂಗ್‌ಗಳನ್ನು ಅನುಮತಿಸಿ"</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>
@@ -3380,9 +3407,12 @@
     <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="connectivity_monitor_switch" msgid="9059759348648583421">"ಸಂಪರ್ಕ ಕಲ್ಪಿಸುವಿಕೆಯ ಪರಿವೀಕ್ಷಣೆ"</string>
+    <string name="connectivity_monitor_switch_summary" msgid="2828658652378866401">"ಸಂಪರ್ಕ ಕಲ್ಪಿಸುವಿಕೆಯಲ್ಲಿ ಸಮಸ್ಯೆಯನ್ನು ಪತ್ತೆಹಚ್ಚಿದಾಗ ಸಂಪರ್ಕ ಕಲ್ಪಿಸುವಿಕೆ ಮಾನಿಟರ್ ಲಾಗ್‌ಗಳನ್ನು ಸಂಗ್ರಹಿಸುತ್ತದೆ ಮತ್ತು ಪ್ರಾಂಪ್ಟ್ ಅಧಿಸೂಚನೆಯನ್ನು ದೋಷದ ಕುರಿತು ವರದಿ ಸಲ್ಲಿಸಲು ಬಳಕೆದಾರನಿಗೆ ಸೂಚನೆ ನೀಡುತ್ತದೆ"</string>
+    <string name="connectivity_monitor_toast" msgid="5551859612881173028">"ಸಂಪರ್ಕ ಕಲ್ಪಿಸುವಿಕೆ ಮಾನಿಟರ್ ಬದಲಾವಣೆಯನ್ನು ಅನ್ವಯಿಸಲು, ಸಾಧನವನ್ನು ರೀಬೂಟ್ ಮಾಡಿ"</string>
     <string name="camera_hal_hdrplus_switch" msgid="8377365197105267466">"HAL HDR+ ಕ್ಯಾಮೆರಾ"</string>
     <string name="camera_hal_hdrplus_toast" msgid="2063703797270055299">"HAL HDR+ ಕ್ಯಾಮೆರಾ ಬದಲಾವಣೆಯನ್ನು ಅನ್ವಯಿಸಲು, ಸಾಧನವನ್ನು ರೀಬೂಟ್ ಮಾಡಿ"</string>
+    <string name="camera_laser_sensor_switch" msgid="8913588990743234440">"ಕ್ಯಾಮೆರಾ ಲೇಸರ್ ಸೆನ್ಸಾರ್"</string>
     <string name="ota_disable_automatic_update" msgid="2319639631655915050">"ಸ್ವಯಂಚಾಲಿತ ಸಿಸ್ಟಂ ಅಪ್‌ಡೇಟ್‌ಗಳು"</string>
     <string name="usage" msgid="2977875522080448986">"ಬಳಕೆ"</string>
     <string name="cellular_data_usage" msgid="2155683719898158203">"ಮೊಬೈಲ್ ಡೇಟಾ ಬಳಕೆ"</string>
@@ -3408,7 +3438,7 @@
     <string name="data_warning" msgid="209133958008062117">"ಡೇಟಾ ಎಚ್ಚರಿಕೆ"</string>
     <string name="set_data_limit" msgid="2901526323210516923">"ಡೇಟಾ ಮಿತಿ ಹೊಂದಿಸಿ"</string>
     <string name="data_limit" msgid="1885406964934590552">"ಡೇಟಾ ಮಿತಿ"</string>
-    <string name="data_usage_template" msgid="392191945602400904">"<xliff:g id="ID_1">%1$s</xliff:g>ಯಷ್ಟನ್ನು <xliff:g id="ID_2">%2$s</xliff:g> ನಡುವೆ ಬಳಸಲಾಗಿದೆ"</string>
+    <string name="data_usage_template" msgid="2923744765873163859">"<xliff:g id="ID_1">%1$s</xliff:g> ಬಳಸಲಾಗಿದೆ <xliff:g id="ID_2">%2$s</xliff:g>"</string>
     <string name="configure" msgid="1029654422228677273">"ಕಾನ್ಫಿಗರ್ ಮಾಡು"</string>
     <string name="data_usage_other_apps" msgid="3272872663517382050">"ಇತರ ಅಪ್ಲಿಕೇಶನ್‌ಗಳನ್ನು ಬಳಕೆಯಲ್ಲಿ ಸೇರಿಸಲಾಗಿದೆ"</string>
     <plurals name="data_saver_unrestricted_summary" formatted="false" msgid="2635267833484232703">
@@ -3477,7 +3507,7 @@
     <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="387052719462473500">"ಲಾಕ್ ಪರದೆಯ ಮೇಲೆ ನಿಯಂತ್ರಣದ ಮಾಹಿತಿ"</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="8483187649355540109">"ಬೆಂಬಲ ಮತ್ತು ಸಲಹೆಗಳು"</string>
@@ -3485,7 +3515,7 @@
     <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>
+    <string name="bluetooth_disabled" msgid="6244000672828617410">"ಆಫ್"</string>
     <string name="bluetooth_connected_summary" msgid="7672528674593152862">"<xliff:g id="ID_1">%1$s</xliff:g> ಗೆ ಸಂಪರ್ಕಿಸಲಾಗಿದೆ"</string>
     <string name="bluetooth_connected_multiple_devices_summary" msgid="9173661896296663932">"ಹಲವು ಸಾಧನಗಳಿಗೆ ಸಂಪರ್ಕಿಸಲಾಗಿದೆ"</string>
     <string name="demo_mode" msgid="2798762752209330277">"ಸಿಸ್ಟಂ UI ಡೆಮೋ ಮೋಡ್"</string>
@@ -3587,7 +3617,7 @@
     <string name="web_action_enable_title" msgid="4051513950976670853">"ತತ್‌ಕ್ಷಣ ಅಪ್ಲಿಕೇಶನ್‌ಗಳು"</string>
     <string name="web_action_enable_summary" msgid="3108127559723396382">"ಅಪ್ಲಿಕೇಶನ್‌ಗಳನ್ನು ಸ್ಥಾಪಿಸಿರದಿದ್ದರೂ, ಲಿಂಕ್‌ಗಳನ್ನು ಅಪ್ಲಿಕೇಶನ್‌ಗಳಲ್ಲಿ ತೆರೆಯಿರಿ"</string>
     <string name="web_action_section_title" msgid="7364647086538399136">"ತತ್‌ಕ್ಷಣ ಅಪ್ಲಿಕೇಶನ್‌ಗಳು"</string>
-    <string name="instant_apps_account" msgid="1433620209791992528">"ತತ್‌ಕ್ಷಣ ಅಪ್ಲಿಕೇಶನ್‌ಗಳ ಖಾತೆ"</string>
+    <string name="instant_apps_settings" msgid="8827777916518348213">"ತ್ವರಿತ ಅಪ್ಲಿಕೇಶನ್‌ಗಳ ಆದ್ಯತೆಗಳು"</string>
     <string name="domain_url_section_title" msgid="7046835219056428883">"ಸ್ಥಾಪಿಸಲಾದ ಅಪ್ಲಿಕೇಶನ್‌ಗಳು"</string>
     <string name="automatic_storage_manager_activation_warning" msgid="6353100011690933254">"ನಿಮ್ಮ ಸಂಗ್ರಹಣೆಯು ಈಗ ಸಂಗ್ರಹಣೆ ನಿರ್ವಾಹಕರಿಂದ ನಿರ್ವಹಿಸಿಲಾಗುತ್ತಿದೆ"</string>
     <string name="account_for_section_header" msgid="5356566418548737121">"<xliff:g id="USER_NAME">%1$s</xliff:g> ಅವರಿಗಾಗಿ ಖಾತೆಗಳು"</string>
@@ -3634,7 +3664,9 @@
     <string name="enterprise_privacy_always_on_vpn_personal" msgid="9217774730260037434">"ನಿಮ್ಮ ವೈಯಕ್ತಿಕ ಪ್ರೊಫೈಲ್‌ನಲ್ಲಿ VPN ನಲ್ಲಿ ಯಾವಾಗಲೂ ಆನ್‌ ಆಗಿರಿ ಎಂಬುದನ್ನು ಆನ್ ಮಾಡಿ"</string>
     <string name="enterprise_privacy_always_on_vpn_work" msgid="7244472958208315814">"ನಿಮ್ಮ ಕೆಲಸದ ಪ್ರೊಫೈಲ್‌ನಲ್ಲಿ VPN ನಲ್ಲಿ ಯಾವಾಗಲೂ ಆನ್‌ ಆಗಿರಿ ಎಂಬುದನ್ನು ಆನ್ ಮಾಡಿ"</string>
     <string name="enterprise_privacy_global_http_proxy" msgid="7936664553416257333">"ಜಾಗತಿಕ HTTP ಪ್ರಾಕ್ಸಿ ಸೆಟ್"</string>
-    <string name="enterprise_privacy_ca_certs" msgid="5885892204903688909">"ವಿಶ್ವಾಸಾರ್ಹ ರುಜುವಾತುಗಳು"</string>
+    <string name="enterprise_privacy_ca_certs_device" msgid="2019652712782510262">"ವಿಶ್ವಾಸಾರ್ಹ ರುಜುವಾತುಗಳು"</string>
+    <string name="enterprise_privacy_ca_certs_personal" msgid="2279084820904076599">"ನಿಮ್ಮ ವೈಯಕ್ತಿಕ ಪ್ರೊಫೈಲ್‌ನಲ್ಲಿರುವ ವಿಶ್ವಾಸಾರ್ಹ ರುಜುವಾತುಗಳು"</string>
+    <string name="enterprise_privacy_ca_certs_work" msgid="6187377647815301809">"ನಿಮ್ಮ ಕಚೇರಿ ಪ್ರೊಫೈಲ್‌ನಲ್ಲಿರುವ ವಿಶ್ವಾಸಾರ್ಹ ರುಜುವಾತುಗಳು"</string>
     <plurals name="enterprise_privacy_number_ca_certs" formatted="false" msgid="526375234629534165">
       <item quantity="one">ಕನಿಷ್ಠ <xliff:g id="COUNT_1">%d</xliff:g> CA ಪ್ರಮಾಣಪತ್ರಗಳು</item>
       <item quantity="other">ಕನಿಷ್ಠ <xliff:g id="COUNT_1">%d</xliff:g> CA ಪ್ರಮಾಣಪತ್ರಗಳು</item>
@@ -3697,6 +3729,8 @@
     <string name="carrier_provisioning" msgid="4398683675591893169">"ವಾಹಕ ಪೂರೈಕೆಯ ಮಾಹಿತಿ"</string>
     <string name="trigger_carrier_provisioning" msgid="3434865918009286187">"ಟ್ರಿಗ್ಗರ್ ವಾಹಕ ಪೂರೈಕೆ"</string>
     <string name="new_device_suggestion_title" msgid="698847081680980774">"ಆಕರ್ಷಕವಾಗಿ ಮತ್ತು ಹೊಸದಾಗಿ ಏನಿದೆ?"</string>
-    <string name="new_device_suggestion_summary" msgid="7172709269203435870">"ಟಾಪ್ 5 ವೈಶಿಷ್ಟ್ಯಗಳನ್ನು ಪರಿಶೀಲಿಸಿ"</string>
+    <string name="new_device_suggestion_summary" product="default" msgid="206396571522515855">"ನಿಮ್ಮ ಹೊಸ ಫೋನ್‌ನ ಬಳಕೆಯನ್ನು ಪ್ರಾರಂಭಿಸಿ"</string>
+    <string name="new_device_suggestion_summary" product="tablet" msgid="393751455688210956">"ನಿಮ್ಮ ಹೊಸ ಟ್ಯಾಬ್ಲೆಟ್‌ನ ಬಳಕೆ ಪ್ರಾರಂಭಿಸಿ"</string>
+    <string name="new_device_suggestion_summary" product="device" msgid="2939870049868336652">"ನಿಮ್ಮ ಹೊಸ ಸಾಧನದ ಬಳಕೆಯನ್ನು ಪ್ರಾರಂಭಿಸಿ"</string>
     <string name="disabled_low_ram_device" msgid="3751578499721173344">"ಈ ಸಾಧನದಲ್ಲಿ ಈ ವೀಡಿಯೊ ಲಭ್ಯವಿಲ್ಲ"</string>
 </resources>
diff --git a/res/values-ko/arrays.xml b/res/values-ko/arrays.xml
index f59cdf7..efdf573 100644
--- a/res/values-ko/arrays.xml
+++ b/res/values-ko/arrays.xml
@@ -100,8 +100,6 @@
     <!-- no translation found for wifi_security_no_eap:0 (2084555984818107151) -->
     <!-- no translation found for wifi_security_no_eap:1 (397579322683471524) -->
     <!-- no translation found for wifi_security_no_eap:2 (1968820975358150484) -->
-    <!-- no translation found for wifi_ap_security:0 (5251664683198623324) -->
-    <!-- no translation found for wifi_ap_security:1 (7989073072260294673) -->
   <string-array name="wifi_eap_method">
     <item msgid="1160193392455075561">"PEAP"</item>
     <item msgid="7981731051382306293">"TLS"</item>
diff --git a/res/values-ko/strings.xml b/res/values-ko/strings.xml
index ef1f324..c96fe1c 100644
--- a/res/values-ko/strings.xml
+++ b/res/values-ko/strings.xml
@@ -166,7 +166,7 @@
     <string name="bluetooth_map_acceptance_dialog_text" msgid="8712508202081143737">"%1$s이(가) 메시지에 액세스하려고 합니다. %2$s에 액세스 권한을 제공하시겠습니까?"</string>
     <string name="bluetooth_sap_request" msgid="2669762224045354417">"SIM 액세스 요청"</string>
     <string name="bluetooth_sap_acceptance_dialog_text" msgid="4414253873553608690">"<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g>이(가) SIM 카드에 액세스하려고 합니다. SIM 카드에 대한 액세스를 허용하면 연결되어 있는 동안 기기의 데이터 연결이 비활성화됩니다. <xliff:g id="DEVICE_NAME_1">%2$s?</xliff:g>에 액세스 권한을 부여하세요."</string>
-    <string name="bluetooth_device_name_summary" msgid="4757990010751789977">"다른 기기에 \'<xliff:g id="DEVICE_NAME">^1</xliff:g>\'(으)로 표시"</string>
+    <string name="bluetooth_device_name_summary" msgid="522235742194965734">"다른 기기에 \'<xliff:g id="DEVICE_NAME">^1</xliff:g>\'(으)로 표시됩니다."</string>
     <string name="bluetooth_paired_device_title" msgid="8638994696317952019">"내 기기"</string>
     <string name="bluetooth_pairing_page_title" msgid="7712127387361962608">"새 기기와 페어링"</string>
     <string name="date_and_time" msgid="9062980487860757694">"날짜 및 시간"</string>
@@ -312,6 +312,8 @@
     <string name="zone_auto" msgid="334783869352026648">"시간대 자동설정"</string>
     <string name="zone_auto_summaryOn" msgid="6142830927278458314">"네트워크 시간대 사용"</string>
     <string name="zone_auto_summaryOff" msgid="2597745783162041390">"네트워크 시간대 사용"</string>
+    <string name="date_time_24hour_auto" msgid="2117383168985653422">"자동 24시간 형식"</string>
+    <string name="date_time_24hour_auto_summary" msgid="6351812925651480277">"언어 기본값 사용"</string>
     <string name="date_time_24hour_title" msgid="3203537578602803850">"24시간 형식"</string>
     <string name="date_time_24hour" msgid="1193032284921000063">"24시간 형식 사용"</string>
     <string name="date_time_set_time_title" msgid="6296795651349047016">"시간"</string>
@@ -372,6 +374,9 @@
     <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="1961957425135180242">"다음"</string>
+    <string name="setup_fingerprint_enroll_skip_title" msgid="362050541117362034">"지문 설정을 건너뛰시겠습니까?"</string>
+    <string name="setup_fingerprint_enroll_skip_after_adding_lock_text" msgid="958990414356204763">"지문 설정에는 1~2분 정도밖에 걸리지 않습니다. 이 과정을 건너뛰면 나중에 설정에서 지문을 추가할 수 있습니다."</string>
+    <string name="lock_screen_intro_skip_title" msgid="4988210105913705679">"화면 잠금 설정을 건너뛰시겠습니까?"</string>
     <string name="lock_screen_intro_skip_dialog_text_frp" product="tablet" msgid="1581834104051243425">"기기 보호 기능이 사용 설정되지 않습니다. 분실, 도난 또는 재설정되었을 때 다른 사람이 이 태블릿을 사용하는 것을 방지할 수 없습니다."</string>
     <string name="lock_screen_intro_skip_dialog_text_frp" product="device" msgid="4629503416877189572">"기기 보호 기능이 사용 설정되지 않습니다. 분실, 도난 또는 재설정되었을 때 다른 사람이 이 기기를 사용하는 것을 방지할 수 없습니다."</string>
     <string name="lock_screen_intro_skip_dialog_text_frp" product="default" msgid="2423428240245737909">"기기 보호 기능이 사용 설정되지 않습니다. 분실, 도난 또는 재설정되었을 때 다른 사람이 이 휴대전화를 사용하는 것을 방지할 수 없습니다."</string>
@@ -388,10 +393,10 @@
     <string name="security_settings_fingerprint_enroll_dialog_delete" msgid="4114615413240707936">"삭제"</string>
     <string name="security_settings_fingerprint_enroll_start_title" msgid="2068961812439460133">"센서 터치"</string>
     <string name="security_settings_fingerprint_enroll_start_message" msgid="3909929328942564524">"센서에 손가락을 올리고 진동이 느껴지면 떼세요."</string>
-    <string name="security_settings_fingerprint_enroll_repeat_title" msgid="2819679722403209778">"손가락을 들어 올린 후 다시 터치"</string>
-    <string name="security_settings_fingerprint_enroll_repeat_message" msgid="6158989350522518586">"손가락을 들어 지문의 다른 부분을 추가하세요."</string>
+    <string name="security_settings_fingerprint_enroll_repeat_title" msgid="2819679722403209778">"손가락을 뗀 후 다시 터치"</string>
+    <string name="security_settings_fingerprint_enroll_repeat_message" msgid="6158989350522518586">"손가락을 떼면 지문의 다른 부분이 추가됩니다."</string>
     <string name="security_settings_fingerprint_enroll_finish_title" msgid="7567276170287972230">"지문 추가됨"</string>
-    <string name="security_settings_fingerprint_enroll_finish_message" msgid="4796715961273420536">"이 아이콘이 표시되면 지문을 사용하여 사용자 본인임을 인증하거나 구매를 승인하세요."</string>
+    <string name="security_settings_fingerprint_enroll_finish_message" msgid="4796715961273420536">"이 아이콘이 표시되면 지문을 사용하여 사용자 본인임을 인증하거나 구매를 승인할 수 있습니다."</string>
     <string name="security_settings_fingerprint_enroll_enrolling_skip" msgid="3710211704052369752">"나중에"</string>
     <string name="setup_fingerprint_enroll_enrolling_skip_title" msgid="6808422329107426923">"지문 설정을 건너뛰시겠습니까?"</string>
     <string name="setup_fingerprint_enroll_enrolling_skip_message" msgid="274849306857859783">"지문으로 휴대전화를 잠금 해제하도록 설정했습니다. 지금 건너뛰면 나중에 설정해야 하며 설정에는 약 1분 정도 소요됩니다."</string>
@@ -457,7 +462,7 @@
     <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="lock_settings_picker_fingerprint_added_security_message" msgid="5768002109707648463">"보안을 강화하려면 백업 화면 잠금을 설정하세요."</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>
@@ -502,8 +507,8 @@
     <string name="unlock_disable_frp_warning_content_pattern_fingerprint" msgid="2986105377420905314">"기기 보호 기능은 패턴 없이 작동하지 않습니다.<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="3370462835533123695">"기기 보호 기능은 PIN 없이 작동하지 않습니다.<xliff:g id="EMPTY_LINE">
+    <string name="unlock_disable_frp_warning_content_pin" msgid="586996206210265131">"기기 보호 기능은 PIN이 있어야만 작동합니다."</string>
+    <string name="unlock_disable_frp_warning_content_pin_fingerprint" msgid="3370462835533123695">"기기 보호 기능은 PIN이 있어야만 작동합니다.<xliff:g id="EMPTY_LINE">
 
 </xliff:g>저장된 지문 파일이 이 기기에서 삭제되며 지문을 이용해 휴대전화의 잠금을 해제하거나, 구매를 승인하거나, 앱에 로그인할 수 없게 됩니다."</string>
     <string name="unlock_disable_frp_warning_content_password" msgid="5420612686852555537">"기기 보호 기능은 비밀번호 없이 작동하지 않습니다."</string>
@@ -586,8 +591,9 @@
     </plurals>
     <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_confirm_label" msgid="8176726201389902380">"확인"</string>
     <string name="lockpassword_cancel_label" msgid="8818529276331121899">"취소"</string>
+    <string name="lockpassword_clear_label" msgid="5724429464960458155">"지우기"</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>
@@ -662,16 +668,16 @@
     <string name="bluetooth_disconnect_headset_profile" msgid="8635908811168780720">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>와(과) 핸즈프리 오디오의 연결이 끊어집니다."</string>
     <string name="bluetooth_disconnect_hid_profile" msgid="3282295189719352075">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>와(과) 입력 장치의 연결이 끊어집니다."</string>
     <string name="bluetooth_disconnect_pan_user_profile" msgid="8037627994382458698">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>을(를) 통한 인터넷 액세스 연결이 해제됩니다."</string>
-    <string name="bluetooth_disconnect_pan_nap_profile" product="tablet" msgid="1262792320446274407">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>이(가) 이 태블릿의 인터넷 연결 공유에서 해제됩니다."</string>
-    <string name="bluetooth_disconnect_pan_nap_profile" product="default" msgid="5700332050175684571">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>이(가) 이 휴대전화의 인터넷 연결 공유에서 해제됩니다."</string>
+    <string name="bluetooth_disconnect_pan_nap_profile" product="tablet" msgid="8355910926439312604">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>이(가) 이 태블릿의 인터넷 연결 공유에서 해제됩니다."</string>
+    <string name="bluetooth_disconnect_pan_nap_profile" product="default" msgid="6251611115860359886">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>이(가) 이 휴대전화의 인터넷 연결 공유에서 해제됩니다."</string>
     <string name="bluetooth_device_advanced_title" msgid="6066342531927499308">"페어링된 블루투스 기기"</string>
     <string name="bluetooth_device_advanced_online_mode_title" msgid="3689050071425683114">"연결"</string>
     <string name="bluetooth_device_advanced_online_mode_summary" msgid="1204424107263248336">"블루투스 장치에 연결"</string>
     <string name="bluetooth_device_advanced_profile_header_title" msgid="102745381968579605">"용도"</string>
     <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="6436258151814414028">"인터넷 액세스를 위해 기기에 연결됨"</string>
+    <string name="bluetooth_pan_nap_profile_summary_connected" msgid="1322694224800769308">"로컬 인터넷 연결을 기기와 공유 중"</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>
@@ -724,14 +730,14 @@
     <string name="wifi_wakeup_summary_scanning_disabled" msgid="7247227922074840445">"Wi‑Fi 검색이 사용 중지되어 사용할 수 없습니다."</string>
     <string name="wifi_wakeup_summary_scoring_disabled" msgid="108339002136866897">"사용하려면 네트워크 평가 제공업체를 선택하세요."</string>
     <string name="wifi_poor_network_detection" msgid="4925789238170207169">"불량 네트워크 방지"</string>
-    <string name="wifi_poor_network_detection_summary" msgid="2784135142239546291">"인터넷 연결이 원활하지 않은 경우 Wi-Fi 네트워크를 사용하지 않음"</string>
-    <string name="wifi_avoid_poor_network_detection_summary" msgid="4674423884870027498">"인터넷 연결이 안정적인 네트워크만 사용합니다."</string>
+    <string name="wifi_poor_network_detection_summary" msgid="7016103106105907127">"인터넷 연결이 원활하지 않은 경우 Wi-Fi 네트워크를 사용하지 않습니다"</string>
+    <string name="wifi_avoid_poor_network_detection_summary" msgid="1644292503152790501">"인터넷 연결이 안정적인 네트워크만 사용합니다"</string>
     <string name="use_open_wifi_automatically_title" msgid="6851951242903078588">"개방형 네트워크에 연결"</string>
     <string name="use_open_wifi_automatically_summary" msgid="2982091714252931713">"고품질 공용 네트워크에 자동으로 연결"</string>
     <string name="use_open_wifi_automatically_summary_scoring_disabled" msgid="593964217679325831">"사용하려면 네트워크 평가 제공업체를 선택하세요."</string>
     <string name="use_open_wifi_automatically_summary_scorer_unsupported_disabled" msgid="8472122600853650258">"사용하려면 호환되는 네트워크 평가 제공업체를 선택하세요."</string>
     <string name="wifi_install_credentials" msgid="3551143317298272860">"인증서 설치"</string>
-    <string name="wifi_scan_notify_text" msgid="5593805423071186757">"위치 정확도를 개선하기 위해 시스템 앱과 서비스에서 Wi‑Fi 네트워크를 계속 검색할 수 있습니다. <xliff:g id="LINK_BEGIN_0">LINK_BEGIN</xliff:g>검색 설정<xliff:g id="LINK_END_1">LINK_END</xliff:g>에서 설정을 변경할 수 있습니다."</string>
+    <string name="wifi_scan_notify_text" msgid="5593805423071186757">"위치 정확도를 개선하기 위해 시스템 앱과 서비스에서 Wi‑Fi 네트워크를 계속 검색할 수 있습니다. 설정은 <xliff:g id="LINK_BEGIN_0">LINK_BEGIN</xliff:g>검색 설정<xliff:g id="LINK_END_1">LINK_END</xliff:g>에서 변경할 수 있습니다."</string>
     <string name="wifi_scan_notify_text_scanning_off" msgid="3426075479272242098">"위치 정확도를 높이려면 <xliff:g id="LINK_BEGIN_0">LINK_BEGIN</xliff:g>검색 설정<xliff:g id="LINK_END_1">LINK_END</xliff:g>에서 Wi-Fi 검색을 사용 설정하세요."</string>
     <string name="wifi_scan_notify_remember_choice" msgid="7104867814641144485">"다시 표시 안함"</string>
     <string name="wifi_setting_sleep_policy_title" msgid="5149574280392680092">"절전 모드 동안 Wi-Fi 연결 유지"</string>
@@ -741,9 +747,9 @@
     <string name="wifi_suspend_optimizations" msgid="1220174276403689487">"Wi-Fi 최적화"</string>
     <string name="wifi_suspend_optimizations_summary" msgid="4151428966089116856">"Wi-Fi가 사용 중일 때 배터리 사용량 최소화"</string>
     <string name="wifi_limit_optimizations_summary" msgid="9000801068363468950">"Wi‑Fi에 사용되는 배터리 제한"</string>
-    <string name="wifi_switch_away_when_unvalidated" msgid="1707247692180853058">"Wi‑Fi 인터넷 액세스가 끊기면 모바일 데이터로 전환합니다."</string>
+    <string name="wifi_switch_away_when_unvalidated" msgid="8593144541347373394">"Wi‑Fi 인터넷 액세스가 끊기면 모바일 데이터로 전환"</string>
     <string name="wifi_cellular_data_fallback_title" msgid="8753386877755616476">"모바일 데이터로 자동 전환"</string>
-    <string name="wifi_cellular_data_fallback_summary" msgid="6375399280719867214">"Wi‑Fi 인터넷 액세스가 끊기면 모바일 데이터를 사용합니다. 데이터 사용 요금이 부과될 수 있습니다."</string>
+    <string name="wifi_cellular_data_fallback_summary" msgid="1403505355490119307">"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>
@@ -781,6 +787,7 @@
     <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,6 +824,8 @@
     <string name="wifi_wps_available_first_item" msgid="4422547079984583502">"WPS 사용 가능"</string>
     <string name="wifi_wps_available_second_item" msgid="8427520131718215301">" (WPS 사용 가능)"</string>
     <string name="wifi_wps_nfc_enter_password" msgid="2288214226916117159">"네트워크 비밀번호 입력"</string>
+    <string name="wifi_carrier_connect" msgid="8174696557882299911">"이동통신사 Wi‑Fi 네트워크"</string>
+    <string name="wifi_carrier_content" msgid="4634077285415851933">"<xliff:g id="NAME">%1%s</xliff:g>(을)를 통해 연결"</string>
     <string name="wifi_scan_always_turnon_message" msgid="203123538572122989">"위치 정확성 개선 등의 목적으로 <xliff:g id="APP_NAME">%1$s</xliff:g>에서 Wi-Fi가 꺼져 있을 때에도 네트워크 검색을 사용하도록 설정하려 합니다.\n\n검색하려는 모든 앱에 대해 이를 허용하시겠습니까?"</string>
     <string name="wifi_scan_always_turnoff_message" msgid="5538901671131941043">"이 기능을 사용 중지하려면 더보기 메뉴에서 고급으로 이동하세요."</string>
     <string name="wifi_scan_always_confirm_allow" msgid="5355973075896817232">"허용"</string>
@@ -824,9 +833,9 @@
     <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="5926979351959279577">"이 네트워크에는 인터넷이 연결되어 있지 않습니다. 연결 상태를 유지하시겠습니까?"</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_title" msgid="5779478650636392426">"Wi‑Fi가 인터넷에 연결되어 있지 않음"</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>
@@ -834,6 +843,7 @@
     <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_modify" msgid="6100248070440710782">"수정"</string>
     <string name="wifi_failed_forget_message" msgid="1348172929201654986">"네트워크 기록 삭제 실패"</string>
     <string name="wifi_save" msgid="3331121567988522826">"저장"</string>
     <string name="wifi_failed_save_message" msgid="6650004874143815692">"네트워크 저장 실패"</string>
@@ -846,6 +856,7 @@
     <string name="wifi_advanced_titlebar" msgid="4485841401774142908">"고급 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_title" msgid="8954667664081737098">"네트워크 세부정보"</string>
     <string name="wifi_details_subnet_mask" msgid="6720279144174924410">"서브넷 마스크"</string>
     <string name="wifi_details_dns" msgid="8648826607751830768">"DNS"</string>
     <string name="wifi_details_ipv6_address_header" msgid="6734119149106422148">"IPv6 주소"</string>
@@ -878,18 +889,17 @@
     <string name="wifi_p2p_cancel_connect_title" msgid="255267538099324413">"초대를 취소하시겠습니까?"</string>
     <string name="wifi_p2p_cancel_connect_message" msgid="7477756213423749402">"<xliff:g id="PEER_NAME">%1$s</xliff:g>와(과) 연결하려는 초대를 취소하시겠습니까?"</string>
     <string name="wifi_p2p_delete_group_message" msgid="834559380069647086">"이 그룹을 삭제할까요?"</string>
-    <string name="wifi_tether_checkbox_text" msgid="1847167643625779136">"휴대용 Wi-Fi 핫스팟"</string>
     <string name="wifi_hotspot_checkbox_text" msgid="7763495093333664887">"Wi‑Fi 핫스팟"</string>
-    <string name="wifi_hotspot_off_subtext" msgid="5466126533609394170">"다른 기기와 인터넷 또는 콘텐츠를 공유하지 않음"</string>
-    <string name="wifi_hotspot_tethering_on_subtext" product="tablet" msgid="5752490509369962007">"핫스팟을 통해 태블릿의 인터넷 연결 공유 중"</string>
-    <string name="wifi_hotspot_tethering_on_subtext" product="default" msgid="6461075246164300670">"핫스팟을 통해 휴대전화의 인터넷 연결 공유 중"</string>
-    <string name="wifi_hotspot_on_local_only_subtext" msgid="2068110388011294735">"앱에서 콘텐츠를 공유하지 않습니다. 인터넷 연결을 공유하려면 핫스팟을 껐다가 켜세요."</string>
-    <string name="wifi_hotspot_name_title" msgid="1341735529132128887">"Wi‑Fi 이름"</string>
+    <string name="wifi_hotspot_off_subtext" msgid="2199911382555864644">"다른 기기와 인터넷 또는 콘텐츠를 공유하지 않습니다"</string>
+    <string name="wifi_hotspot_tethering_on_subtext" product="tablet" msgid="5936710887156133458">"핫스팟을 통해 태블릿의 인터넷 연결 공유 중"</string>
+    <string name="wifi_hotspot_tethering_on_subtext" product="default" msgid="5556202634866621632">"핫스팟을 통해 휴대전화의 인터넷 연결 공유 중"</string>
+    <string name="wifi_hotspot_on_local_only_subtext" msgid="5017191966153008">"앱에서 콘텐츠를 공유하지 않습니다. 인터넷 연결을 공유하려면 핫스팟을 껐다가 켜세요"</string>
+    <string name="wifi_hotspot_name_title" msgid="8237000746618636778">"핫스팟 이름"</string>
     <string name="wifi_hotspot_name_summary_connecting" msgid="3378299995508671967">"<xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g> 켜는 중..."</string>
     <string name="wifi_hotspot_name_summary_connected" msgid="3888672084861445362">"다른 기기에서 <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>에 연결할 수 있습니다."</string>
-    <string name="wifi_hotspot_password_title" msgid="1955592302902091281">"Wi-Fi 비밀번호"</string>
+    <string name="wifi_hotspot_password_title" msgid="8676859981917573801">"핫스팟 비밀번호"</string>
     <string name="wifi_hotspot_ap_band_title" msgid="1165801173359290681">"AP 대역"</string>
-    <string name="wifi_hotspot_footer_info_regular" msgid="1203489406068036455">"핫스팟을 사용하여 다른 기기에서 사용할 수 있는 Wi‑Fi 네트워크를 만드세요. 핫스팟은 내 모바일 데이터 연결을 사용하여 인터넷을 제공합니다. 추가 모바일 데이터 요금이 부과될 수 있습니다."</string>
+    <string name="wifi_hotspot_footer_info_regular" msgid="4789553667374849566">"핫스팟을 사용하여 다른 기기에서 사용할 수 있는 Wi‑Fi 네트워크를 만드세요. 핫스팟은 내 모바일 데이터 연결을 사용하여 인터넷을 제공합니다. 추가 모바일 데이터 요금이 부과될 수 있습니다."</string>
     <string name="wifi_hotspot_footer_info_local_only" msgid="857988412470694109">"앱에서 핫스팟을 만들어 주변 기기와 콘텐츠를 공유할 수 있습니다."</string>
     <string name="wifi_tether_starting" msgid="1322237938998639724">"핫스팟 켜는 중…"</string>
     <string name="wifi_tether_stopping" msgid="4835852171686388107">"핫스팟 끄는 중…"</string>
@@ -898,7 +908,6 @@
     <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">"Wi-Fi 통화"</string>
     <string name="wifi_calling_suggestion_title" msgid="9008010480466359578">"Wi-Fi 통화 사용 설정"</string>
@@ -938,8 +947,8 @@
   </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="emergency_address_title" msgid="932729250447887545">"긴급 주소"</string>
+    <string name="emergency_address_summary" msgid="7751971156196115129">"Wi‑Fi를 통해 긴급 전화를 걸 때 내 위치로 사용됨"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"디스플레이"</string>
     <string name="sound_settings" msgid="5534671337768745343">"소리"</string>
     <string name="all_volume_title" msgid="4296957391257836961">"볼륨"</string>
@@ -993,9 +1002,13 @@
     <string name="search_settings" msgid="1910951467596035063">"검색"</string>
     <string name="search_settings_summary" msgid="9205656546570654169">"검색 설정 및 기록 관리"</string>
     <string name="search_settings_no_results" msgid="8799027492641230999">"검색결과 없음"</string>
+    <string name="search_clear_history" msgid="4196658962573162457">"기록 삭제"</string>
     <string name="display_settings" msgid="7965901687241669598">"디스플레이"</string>
     <string name="accelerometer_title" msgid="7854608399547349157">"자동 화면 회전"</string>
-    <string name="color_mode_title" msgid="3159275920408338215">"선명한 색상"</string>
+    <string name="color_mode_title" msgid="9186249332902370471">"색상"</string>
+    <string name="color_mode_option_natural" msgid="5013837483986772758">"자연스럽게"</string>
+    <string name="color_mode_option_boosted" msgid="8588223970257287524">"부스트"</string>
+    <string name="color_mode_option_saturated" msgid="4569683960058798843">"선명하게"</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>
@@ -1058,7 +1071,7 @@
     <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>
@@ -1114,15 +1127,16 @@
     <string name="system_update_settings_list_item_title" msgid="3342887311059985961">"시스템 업데이트"</string>
     <string name="system_update_settings_list_item_summary" msgid="3853057315907710747"></string>
     <string name="firmware_version" msgid="4801135784886859972">"Android 버전"</string>
+    <string name="firmware_title" msgid="5203122368389157877">"Android"</string>
     <string name="security_patch" msgid="8438384045870296634">"Android 보안 패치 수준"</string>
     <string name="model_info" msgid="1952009518045740889">"모델"</string>
+    <string name="model_summary" msgid="8306235877567782987">"모델: %1$s"</string>
     <string name="hardware_info" msgid="2605080746512527805">"모델 및 하드웨어"</string>
     <string name="hardware_revision" msgid="8893547686367095527">"하드웨어 버전"</string>
     <string name="fcc_equipment_id" msgid="149114368246356737">"장비 ID"</string>
     <string name="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>
     <string name="device_status_activity_title" msgid="1411201799384697904">"상태"</string>
     <string name="device_status" msgid="607405385799807324">"상태"</string>
@@ -1133,11 +1147,21 @@
     <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>
+    <!-- no translation found for imei_multi_sim (6387012961838800539) -->
+    <skip />
     <string name="status_number" product="tablet" msgid="1138837891091222272">"MDN"</string>
-    <string name="status_number" product="default" msgid="5123197324870153205">"내 휴대전화 번호"</string>
+    <string name="status_number" product="default" msgid="5948892105546651296">"전화번호"</string>
+    <!-- no translation found for status_number_sim_slot (2755592991367858860) -->
+    <skip />
+    <!-- no translation found for status_number_sim_slot (1898212200138025729) -->
+    <skip />
+    <string name="status_number_sim_status" product="tablet" msgid="1367110147304523864">"SIM의 MDN"</string>
+    <string name="status_number_sim_status" product="default" msgid="9123351360569466330">"SIM의 전화번호"</string>
     <string name="status_min_number" msgid="3519504522179420597">"MIN"</string>
     <string name="status_msid_number" msgid="909010114445780530">"MSID"</string>
     <string name="status_prl_version" msgid="1007470446618081441">"PRL 버전"</string>
+    <!-- no translation found for meid_multi_sim (748999971744491771) -->
+    <skip />
     <string name="status_meid_number" msgid="1751442889111731088">"MEID"</string>
     <string name="status_icc_id" msgid="943368755577172747">"ICCID"</string>
     <string name="status_network_type" msgid="3279383550222116235">"모바일 네트워크 유형"</string>
@@ -1150,7 +1174,6 @@
     <string name="status_wifi_mac_address" msgid="2202206684020765378">"Wi-Fi MAC 주소"</string>
     <string name="status_bt_address" msgid="4195174192087439720">"블루투스 주소"</string>
     <string name="status_serial_number" msgid="2257111183374628137">"일련번호"</string>
-    <string name="status_unavailable" msgid="7862009036663793314">"사용할 수 없음"</string>
     <string name="status_up_time" msgid="7294859476816760399">"가동 시간"</string>
     <string name="status_awake_time" msgid="2393949909051183652">"무중단 가동 시간"</string>
     <string name="internal_memory" msgid="9129595691484260784">"내부 저장소"</string>
@@ -1248,7 +1271,7 @@
     <string name="storage_detail_other" msgid="8404938385075638238">"기타"</string>
     <string name="storage_detail_system" msgid="4629506366064709687">"시스템"</string>
     <string name="storage_detail_explore" msgid="7911344011431568294">"<xliff:g id="NAME">^1</xliff:g> 탐색"</string>
-    <string name="storage_detail_dialog_other" msgid="8907101974576694793">"기타 포함되는 항목으로는 앱에서 저장한 공유 파일, 인터넷이나 블루투스에서 다운로드한 파일, Android 파일 등이 있습니다. \n\n<xliff:g id="NAME">^1</xliff:g>의 표시되는 콘텐츠를 보려면 탐색을 탭하세요."</string>
+    <string name="storage_detail_dialog_other" msgid="8845766044697204852">"기타 포함되는 항목으로는 앱에서 저장한 공유 파일, 인터넷이나 블루투스에서 다운로드한 파일, Android 파일 등이 있습니다. \n\n<xliff:g id="NAME">^1</xliff:g>의 표시되는 콘텐츠를 보려면 탐색을 탭하세요."</string>
     <string name="storage_detail_dialog_system" msgid="862835644848361569">"시스템에는 Android 버전 <xliff:g id="VERSION">%s</xliff:g> 실행에 사용되는 파일이 포함되어 있습니다."</string>
     <string name="storage_detail_dialog_user" msgid="3267254783294197804">"<xliff:g id="USER_0">^1</xliff:g>님이 사진, 음악, 앱, 기타 데이터를 저장했을 수도 있으며, 전체 저장용량의 <xliff:g id="SIZE">^2</xliff:g>을(를) 사용 중입니다. \n\n자세한 내용을 확인하려면 <xliff:g id="USER_1">^1</xliff:g>님으로 전환하세요."</string>
     <string name="storage_wizard_init_title" msgid="5085400514028585772">"<xliff:g id="NAME">^1</xliff:g> 설정"</string>
@@ -1326,6 +1349,7 @@
     <string name="menu_restore" msgid="8260067415075573273">"초기화"</string>
     <string name="restore_default_apn_completed" msgid="2824775307377604897">"기본 APN 설정을 초기화했습니다."</string>
     <string name="reset_dashboard_title" msgid="6254873816990678620">"옵션 재설정"</string>
+    <string name="reset_dashboard_summary" msgid="4851012632493522755">"네트워크, 앱, 기기가 재설정될 수 있습니다."</string>
     <string name="reset_network_title" msgid="6166025966016873843">"Wi-Fi, 모바일, 블루투스 재설정"</string>
     <string name="reset_network_desc" msgid="5547979398298881406">"이렇게 하면 다음을 포함한 모든 네트워크 설정이 재설정됩니다.\n\n"<li>"Wi‑Fi"</li>\n<li>"모바일 데이터"</li>\n<li>"블루투스"</li></string>
     <string name="reset_network_button_text" msgid="2035676527471089853">"설정 초기화"</string>
@@ -1334,17 +1358,14 @@
     <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="6617679904229218425">"모든 데이터 삭제(초기화)"</string>
-    <plurals name="master_clear_with_account_summary" formatted="false" msgid="5911377203778818712">
-      <item quantity="other">계정 <xliff:g id="ACCOUNT_COUNT">%1$d</xliff:g>개가 재설정됨</item>
-      <item quantity="one">계정 1개가 재설정됨</item>
-    </plurals>
-    <string name="master_clear_summary" msgid="6902443944660426951">"내부 저장소 및 모든 데이터가 재설정됩니다."</string>
+    <string name="master_clear_title" msgid="3531267871084279512">"모든 데이터 삭제(초기화)"</string>
     <string name="master_clear_desc" product="tablet" msgid="9146059417023157222">"공장 초기화하면 태블릿의 "<b>"내부 저장소의 모든 데이터가 삭제됩니다."</b>\n\n<li>"Google 계정"</li>\n<li>"시스템과 앱 데이터 및 설정"</li>\n<li>"다운로드된 앱"</li></string>
     <string name="master_clear_desc" product="default" msgid="4800386183314202571">"공장 초기화하면 다음을 포함한 휴대전화 "<b>"내부 저장소"</b>"의 모든 데이터가 삭제됩니다.\n\n"<li>"Google 계정"</li>\n<li>"시스템과 앱 데이터 및 설정"</li>\n<li>"다운로드된 앱"</li></string>
     <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"현재 로그인한 계정:\n"</string>
     <string name="master_clear_other_users_present" product="default" msgid="5161423070702470742">\n\n"이 기기에 다른 사용자가 있습니다.\n"</string>
     <string name="master_clear_desc_also_erases_external" msgid="1903185203791274237"><li>"음악"</li>\n<li>"사진"</li>\n<li>"기타 사용자 데이터"</li></string>
+    <string name="master_clear_desc_also_erases_esim" msgid="312352697653096008"><li>"eSIM에 등록된 이동통신사"</li></string>
+    <string name="master_clear_desc_no_cancel_mobile_plan" msgid="5460926449093211144">\n\n"모바일 서비스 요금제는 취소되지 않습니다."</string>
     <string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="7744115866662613411">\n\n"음악이나 사진, 기타 사용자 데이터를 지우려면 "<b>"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>
@@ -1376,15 +1397,15 @@
     <string name="tether_settings_disabled_on_data_saver" msgid="1576908608463904152">"데이터 절약 모드가 켜져 있으면 테더링하거나 휴대용 핫스팟을 사용할 수 없습니다."</string>
     <string name="usb_title" msgid="7483344855356312510">"USB"</string>
     <string name="usb_tethering_button_text" msgid="585829947108007917">"USB 테더링"</string>
-    <string name="usb_tethering_subtext" product="default" msgid="5991482890033484794">"USB를 통해 휴대전화의 인터넷 연결 공유"</string>
-    <string name="usb_tethering_subtext" product="tablet" msgid="5988796139573211318">"USB를 통해 태블릿의 인터넷 연결 공유"</string>
+    <string name="usb_tethering_subtext" product="default" msgid="3711893746716442706">"USB를 통해 휴대전화의 인터넷 연결 공유"</string>
+    <string name="usb_tethering_subtext" product="tablet" msgid="2292916486612255069">"USB를 통해 태블릿의 인터넷 연결 공유"</string>
     <string name="bluetooth_tether_checkbox_text" msgid="2379175828878753652">"블루투스 테더링"</string>
-    <string name="bluetooth_tethering_subtext" product="tablet" msgid="4558227863463153412">"블루투스를 통해 태블릿의 인터넷 연결 공유"</string>
-    <string name="bluetooth_tethering_subtext" product="default" msgid="1055197887836203595">"블루투스를 통해 휴대전화의 인터넷 연결 공유"</string>
-    <string name="bluetooth_tethering_off_subtext_config" msgid="6326877798974938021">"<xliff:g id="DEVICE_NAME">%1$d</xliff:g>의 인터넷 연결을 블루투스를 통해 공유 중"</string>
+    <string name="bluetooth_tethering_subtext" product="tablet" msgid="8828883800511737077">"블루투스를 통해 태블릿의 인터넷 연결 공유"</string>
+    <string name="bluetooth_tethering_subtext" product="default" msgid="1904667146601254812">"블루투스를 통해 휴대전화의 인터넷 연결 공유"</string>
+    <string name="bluetooth_tethering_off_subtext_config" msgid="376389105752995580">"<xliff:g id="DEVICE_NAME">%1$d</xliff:g>의 인터넷 연결을 블루투스를 통해 공유 중"</string>
     <string name="bluetooth_tethering_overflow_error" msgid="2135590598511178690">"<xliff:g id="MAXCONNECTION">%1$d</xliff:g>개의 기기까지만 테더링 사용 가능"</string>
     <string name="bluetooth_untether_blank" msgid="2871192409329334813">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> 기기의 테더링이 끊깁니다."</string>
-    <string name="tethering_footer_info" msgid="1308462275952345985">"핫스팟 및 테더링을 사용하여 다른 기기에서 내 모바일 데이터 연결을 통해 인터넷을 사용할 수 있도록 합니다. 앱에서도 핫스팟을 만들어 주변 기기와 콘텐츠를 공유할 수 있습니다."</string>
+    <string name="tethering_footer_info" msgid="7112228674056306147">"핫스팟 및 테더링을 사용하여 다른 기기에서 내 모바일 데이터 연결을 통해 인터넷을 사용할 수 있도록 합니다. 앱에서도 핫스팟을 만들어 주변 기기와 콘텐츠를 공유할 수 있습니다."</string>
     <string name="tethering_help_button_text" msgid="656117495547173630">"고객센터"</string>
     <string name="network_settings_title" msgid="2876509814832830757">"모바일 네트워크"</string>
     <string name="manage_mobile_plan_title" msgid="7630170375010107744">"모바일 요금제"</string>
@@ -1459,17 +1480,18 @@
     <string name="settings_license_activity_loading" msgid="3337535809093591740">"로드 중..."</string>
     <string name="settings_safetylegal_title" msgid="1289483965535937431">"안전 정보"</string>
     <string name="settings_safetylegal_activity_title" msgid="6901214628496951727">"안전 정보"</string>
-    <string name="settings_safetylegal_activity_unreachable" msgid="250674109915859456">"데이터 서비스에 연결되어 있지 않습니다. 지금 정보를 보려면 인터넷에 연결된 컴퓨터에서 %s(으)로 이동하세요."</string>
+    <string name="settings_safetylegal_activity_unreachable" msgid="142307697309858185">"데이터에 연결되어 있지 않습니다. 지금 이 정보를 보려면 인터넷에 연결된 컴퓨터에서 %s(으)로 이동하세요."</string>
     <string name="settings_safetylegal_activity_loading" msgid="8059022597639516348">"로드 중..."</string>
-    <string name="lockpassword_choose_your_password_header" msgid="8624900666929394990">"비밀번호 선택"</string>
-    <string name="lockpassword_choose_your_password_header_for_fingerprint" msgid="6624409510609085450">"비밀번호를 설정하여 지문 사용"</string>
-    <string name="lockpassword_choose_your_pattern_header" msgid="6949761069941694050">"패턴 선택"</string>
-    <string name="lockpassword_choose_your_pattern_header_for_fingerprint" msgid="5901096361617543819">"패턴을 설정하여 지문 사용"</string>
-    <string name="lockpassword_choose_your_pin_header" msgid="7598849519816138302">"PIN 선택"</string>
-    <string name="lockpassword_choose_your_pin_header_for_fingerprint" msgid="765344692615917183">"PIN을 설정하여 지문 사용"</string>
-    <string name="lockpassword_confirm_your_password_header" msgid="6308478184889846633">"비밀번호 확인"</string>
+    <string name="lockpassword_choose_your_screen_lock_header" msgid="3872462096767152394">"화면 잠금 설정"</string>
+    <string name="lockpassword_choose_your_password_message" msgid="1197569283524841412">"보안을 위해 비밀번호를 설정하세요."</string>
+    <string name="lockpassword_choose_your_password_header_for_fingerprint" msgid="2541818487015343503">"지문을 사용하려면 비밀번호를 설정하세요"</string>
+    <string name="lockpassword_choose_your_pattern_header_for_fingerprint" msgid="7709785406243556723">"지문을 사용하려면 패턴을 설정하세요"</string>
+    <string name="lockpassword_choose_your_pin_message" msgid="1875420718677275646">"보안을 위해 PIN을 설정하세요."</string>
+    <string name="lockpassword_choose_your_pin_header_for_fingerprint" msgid="1549639053195796674">"지문을 사용하려면 PIN을 설정하세요"</string>
+    <string name="lockpassword_choose_your_pattern_message" msgid="5986983400689720015">"보안을 위해 패턴을 설정하세요."</string>
+    <string name="lockpassword_confirm_your_password_header" msgid="1266027268220850931">"비밀번호 다시 입력"</string>
     <string name="lockpassword_confirm_your_pattern_header" msgid="7543433733032330821">"패턴 확인"</string>
-    <string name="lockpassword_confirm_your_pin_header" msgid="49038294648213197">"PIN 확인"</string>
+    <string name="lockpassword_confirm_your_pin_header" msgid="7744513791910572550">"PIN 다시 입력"</string>
     <string name="lockpassword_confirm_passwords_dont_match" msgid="5140892109439191415">"비밀번호가 일치하지 않음"</string>
     <string name="lockpassword_confirm_pins_dont_match" msgid="7226244811505606217">"PIN이 일치하지 않음"</string>
     <string name="lockpassword_choose_lock_generic_header" msgid="3811438094903786145">"잠금해제 선택"</string>
@@ -1488,19 +1510,25 @@
     <string name="lockpassword_strong_auth_required_work_pattern" msgid="3003781907040522053">"보안을 강화하려면 직장 패턴을 사용하세요."</string>
     <string name="lockpassword_strong_auth_required_work_pin" msgid="3367491332598821552">"보안을 강화하려면 직장 PIN을 사용하세요."</string>
     <string name="lockpassword_strong_auth_required_work_password" msgid="8159775129968582940">"보안을 강화하려면 직장 비밀번호를 입력하세요."</string>
+    <string name="lockpassword_confirm_your_pattern_details_frp" msgid="6757336656791723193">"휴대전화가 초기화되었습니다. 이 기기를 사용하려면 이전 패턴을 입력하세요."</string>
+    <string name="lockpassword_confirm_your_pin_details_frp" msgid="826520613445990470">"휴대전화가 초기화되었습니다. 이 기기를 사용하려면 이전 PIN을 입력하세요."</string>
+    <string name="lockpassword_confirm_your_password_details_frp" msgid="8944081074615739040">"휴대전화가 초기화되었습니다. 이 기기를 사용하려면 이전 비밀번호를 입력하세요."</string>
+    <string name="lockpassword_confirm_your_pattern_header_frp" msgid="2898036091609128286">"패턴 확인"</string>
+    <string name="lockpassword_confirm_your_pin_header_frp" msgid="4141601774778898803">"PIN 확인"</string>
+    <string name="lockpassword_confirm_your_password_header_frp" msgid="3762615419295360480">"비밀번호 확인"</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">"잠금해제 PIN 변경"</string>
-    <string name="lockpattern_recording_intro_header" msgid="308287052221942814">"잠금해제 패턴 그리기"</string>
+    <string name="lockpattern_recording_intro_header" msgid="308287052221942814">"잠금해제 패턴을 그리세요."</string>
     <string name="lockpattern_recording_intro_footer" msgid="1118579101409152113">"도움말을 보려면 메뉴를 누르세요."</string>
     <string name="lockpattern_recording_inprogress" msgid="6667844062721656773">"완료되면 손가락을 뗍니다."</string>
     <string name="lockpattern_recording_incorrect_too_short" msgid="1348234155120957561">"<xliff:g id="NUMBER">%d</xliff:g>개 이상의 점을 연결해야 합니다. 다시 시도하세요."</string>
     <string name="lockpattern_pattern_entered_header" msgid="4316818983675591604">"패턴이 기록되었습니다."</string>
     <string name="lockpattern_need_to_confirm" msgid="8054853451639221265">"확인을 위해 패턴을 다시 그리세요."</string>
-    <string name="lockpattern_pattern_confirmed_header" msgid="8455614172231880211">"새 잠금해제 패턴"</string>
+    <string name="lockpattern_pattern_confirmed_header" msgid="8455614172231880211">"새 잠금해제 패턴입니다."</string>
     <string name="lockpattern_confirm_button_text" msgid="1128204343957002841">"확인"</string>
     <string name="lockpattern_restart_button_text" msgid="3337574403350953926">"다시 그리기"</string>
     <string name="lockpattern_retry_button_text" msgid="3480423193273588166">"지우기"</string>
@@ -1537,7 +1565,6 @@
     <string name="install_applications_title" msgid="4987712352256508946">"모든 앱 소스 허용"</string>
     <string name="recent_app_category_title" msgid="6673071268966003928">"최근 실행한 앱"</string>
     <string name="see_all_apps_title" msgid="1317153498074308438">"앱 <xliff:g id="COUNT">%1$d</xliff:g>개 모두 보기"</string>
-    <string name="recent_app_summary" msgid="3366446669844932300">"<xliff:g id="TIME">^1</xliff:g> 전"</string>
     <string name="install_all_warning" product="tablet" msgid="8310489909586138165">"태블릿과 개인 데이터는 알 수 없는 앱의 공격에 더욱 취약합니다. 이 소스에서 가져온 앱을 설치하면 앱 사용으로 인해 발생할 수 있는 태블릿의 손상 및 데이터 손실에 책임을 진다는 데 동의하게 됩니다."</string>
     <string name="install_all_warning" product="default" msgid="1952257127370115988">"휴대전화와 개인 데이터는 알 수 없는 앱의 공격에 더욱 취약합니다. 이 소스에서 가져온 앱을 설치하면 앱 사용으로 인해 발생할 수 있는 휴대전화의 손상 및 데이터 손실에 책임을 진다는 데 동의하게 됩니다."</string>
     <string name="advanced_settings" msgid="1777249286757067969">"고급 설정"</string>
@@ -1659,7 +1686,6 @@
     <string name="app_install_details_title" msgid="6905279702654975207">"앱 세부정보"</string>
     <string name="app_install_details_summary" msgid="6464796332049327547">"<xliff:g id="APP_STORE">%1$s</xliff:g>에서 다운로드한 앱"</string>
     <string name="instant_app_details_summary" msgid="4529934403276907045">"<xliff:g id="APP_STORE">%1$s</xliff:g>에서 자세히 알아보기"</string>
-    <string name="app_ops_settings" msgid="5108481883575527511">"앱 운영"</string>
     <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>
@@ -1711,6 +1737,7 @@
     <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_empty_list_user_restricted" msgid="5984015900102140696">"기기 언어를 변경할 수 있는 권한이 없습니다."</string>
     <string name="language_keyboard_settings_title" msgid="3709159207482544398">"언어 및 입력"</string>
     <string name="input_assistance" msgid="7577795275222555487">"입력 지원"</string>
     <string name="keyboard_settings_category" msgid="8275523930352487827">"키보드 및 입력 방법"</string>
@@ -1801,7 +1828,7 @@
     <string name="accessibility_settings_summary" msgid="981260486011624939">"스크린 리더, 디스플레이, 상호작용 컨트롤"</string>
     <string name="vision_settings_title" msgid="4204111425716868288">"보기 설정"</string>
     <string name="vision_settings_description" msgid="5679491180156408260">"필요에 따라 기기를 맞춤설정할 수 있습니다. 다음 접근성 기능은 언제든지 설정에서 변경할 수 있습니다."</string>
-    <string name="vision_settings_suggestion_title" msgid="917294957154878441">"글꼴 크기 확대"</string>
+    <string name="vision_settings_suggestion_title" msgid="8058794060304707004">"글꼴 크기 변경"</string>
     <string name="screen_reader_category_title" msgid="7739154903913400641">"스크린 리더"</string>
     <string name="audio_and_captions_category_title" msgid="3420727114421447524">"오디오 및 화면에 있는 텍스트"</string>
     <string name="display_category_title" msgid="685461049938269166">"디스플레이"</string>
@@ -1838,7 +1865,6 @@
     <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="preference_summary_default_combination" msgid="8532964268242666060">"<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>
@@ -1922,7 +1948,7 @@
       <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_settings_title" msgid="3685449667822217816">"인쇄 서비스"</string>
     <string name="print_no_services_installed" msgid="8443039625463872294">"설치된 서비스 없음"</string>
     <string name="print_no_printers_found" msgid="989018646884973683">"프린터 없음"</string>
     <string name="print_menu_item_settings" msgid="6591330373682227082">"설정"</string>
@@ -1957,12 +1983,14 @@
     <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_whitelisted" msgid="7375400051141016808">"앱을 배터리 사용에 최적화할 수 없습니다."</string>
+    <string name="background_activity_warning_dialog_title" msgid="2216249969149568871">"백그라운드 활동을 제한하시겠습니까?"</string>
+    <string name="background_activity_warning_dialog_text" msgid="7049624449246121981">"앱의 백그라운드 활동을 제한하면 앱이 정상적으로 작동하지 않을 수도 있습니다."</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" msgid="6393929085382334341">"충전 완료(<xliff:g id="RELATIVE_TIME">^1</xliff:g>) 후 앱 사용량"</string>
+    <string name="power_usage_list_summary_device" msgid="4461926045610455423">"충전 완료(<xliff:g id="RELATIVE_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>
@@ -2126,14 +2154,6 @@
     <string name="services_subtitle" msgid="4296402367067266425">"서비스"</string>
     <string name="menu_proc_stats_duration" msgid="2323483592994720196">"기간"</string>
     <string name="mem_details_title" msgid="6548392825497290498">"메모리 세부정보"</string>
-    <string name="mem_state_subtitle" msgid="2407238869781011933">"메모리 상태"</string>
-    <string name="mem_use_subtitle" msgid="7319468770222422412">"메모리 사용량"</string>
-    <string name="mem_use_kernel_type" msgid="8698327165935012484">"커널"</string>
-    <string name="mem_use_native_type" msgid="5976704902328347400">"기본"</string>
-    <string name="mem_use_kernel_cache_type" msgid="6411475064463957513">"커널 캐시"</string>
-    <string name="mem_use_zram_type" msgid="9087217476795358232">"ZRam 교환"</string>
-    <string name="mem_use_free_type" msgid="717708548454880840">"사용 가능"</string>
-    <string name="mem_use_total" msgid="6308786055749777934">"총 사용량"</string>
     <string name="menu_duration_3h" msgid="4714866438374738385">"3시간"</string>
     <string name="menu_duration_6h" msgid="1940846763432184132">"6시간"</string>
     <string name="menu_duration_12h" msgid="7890465404584356294">"12시간"</string>
@@ -2208,14 +2228,14 @@
     <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">"자격증명 저장소를 사용하려면 먼저 화면 잠금 PIN 또는 비밀번호를 설정해야 합니다."</string>
+    <string name="credentials_configure_lock_screen_hint" msgid="8058230497337529036">"자격증명 저장소를 사용하려면 기기에 보안 잠금 화면을 설정해야 합니다."</string>
+    <string name="credentials_configure_lock_screen_button" msgid="253239765216055321">"잠금 설정"</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>
@@ -2335,8 +2355,6 @@
     <skip />
     <string name="cant_sync_dialog_title" msgid="2777238588398046285">"수동으로 동기화할 수 없음"</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를 시작하려면 PIN을 입력하세요."</string>
     <string name="enter_pattern" msgid="4187435713036808566">"Android를 시작하려면 패턴을 그리세요."</string>
@@ -2350,6 +2368,7 @@
     <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="NUMBER">%1$s</xliff:g>/<xliff:g id="TOTAL">%2$s</xliff:g>"</string>
     <string name="select_all" msgid="1562774643280376715">"모두 선택"</string>
+    <string name="data_plan_usage_manage_plans_button_text" msgid="8997761990902708162">"요금제 관리"</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>
@@ -2435,6 +2454,9 @@
     <string name="data_usage_metered_mobile" msgid="5423305619126978393">"모바일 네트워크"</string>
     <string name="data_usage_metered_wifi" msgid="1761738002328299714">"종량제 Wi‑Fi 네트워크"</string>
     <string name="data_usage_metered_wifi_disabled" msgid="727808462375941567">"종량제 네트워크를 선택하려면 Wi-Fi를 사용 설정합니다."</string>
+    <string name="data_usage_metered_auto" msgid="1262028400911918865">"자동"</string>
+    <string name="data_usage_metered_yes" msgid="9217539611385225894">"데이터 전송량 제한 있음"</string>
+    <string name="data_usage_metered_no" msgid="4025232961929071789">"데이터 전송량 제한 없음"</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>
@@ -2477,8 +2499,8 @@
     <string name="vpn_forget_long" msgid="2232239391189465752">"VPN 삭제"</string>
     <string name="vpn_replace_vpn_title" msgid="2963898301277610248">"기존 VPN을 교체하시겠습니까?"</string>
     <string name="vpn_set_vpn_title" msgid="4009987321156037267">"연결 유지 VPN을 설정하시겠습니까?"</string>
-    <string name="vpn_first_always_on_vpn_message" msgid="3025322109743675467">"이 설정을 사용하면 VPN이 연결될 때까지 인터넷에 연결되지 않습니다."</string>
-    <string name="vpn_replace_always_on_vpn_enable_message" msgid="2577928591361606641">"기존 VPN이 교체되며 VPN에 연결될 때까지 인터넷에 연결되지 않습니다."</string>
+    <string name="vpn_first_always_on_vpn_message" msgid="7144543717673197102">"이 설정을 사용하면 VPN이 연결될 때까지 인터넷에 연결되지 않습니다"</string>
+    <string name="vpn_replace_always_on_vpn_enable_message" msgid="798121133114824006">"기존 VPN이 교체되며 VPN에 연결될 때까지 인터넷에 연결되지 않습니다"</string>
     <string name="vpn_replace_always_on_vpn_disable_message" msgid="3011818750025879902">"이미 연결 유지 VPN에 연결되어 있습니다. 다른 VPN에 연결하면 기존 VPN은 교체되며 연결 유지 모드가 사용 중지됩니다."</string>
     <string name="vpn_replace_vpn_message" msgid="5611635724578812860">"이미 VPN에 연결되어 있습니다. 다른 VPN에 연결하면 기존 VPN은 교체됩니다."</string>
     <string name="vpn_turn_on" msgid="2363136869284273872">"사용"</string>
@@ -2526,9 +2548,6 @@
     <string name="backup_pw_set_button_text" msgid="2387480910044648795">"백업 비밀번호 설정"</string>
     <string name="backup_pw_cancel_button_text" msgid="8845630125391744615">"취소"</string>
     <string name="additional_system_update_settings_list_item_title" msgid="214987609894661992">"추가 시스템 업데이트"</string>
-    <string name="selinux_status_disabled" msgid="924551035552323327">"사용 안함"</string>
-    <string name="selinux_status_permissive" msgid="6004965534713398778">"허가"</string>
-    <string name="selinux_status_enforcing" msgid="2252703756208463329">"시행"</string>
     <string name="ssl_ca_cert_warning" msgid="2045866713601984673">"네트워크가 모니터링될 수 있음"</string>
     <string name="done_button" msgid="1991471253042622230">"완료"</string>
     <plurals name="ssl_ca_cert_dialog_title" formatted="false" msgid="7145092748045794650">
@@ -2571,7 +2590,7 @@
     <string name="user_add_user_message_long" msgid="8562152293752222985">"추가 사용자 프로필을 만들어 다른 사용자와 기기를 공유할 수 있습니다. 각 사용자는 앱, 배경화면 등으로 맞춤설정할 수 있는 자신만의 공간을 갖게 됩니다. 또한 사용자는 모든 사용자에게 적용되는 Wi‑Fi와 같은 기기 설정도 조정할 수 있습니다.\n\n추가된 새 사용자는 자신의 공간을 설정해야 합니다.\n\n누구나 다른 모든 사용자를 위해 앱을 업데이트할 수 있습니다."</string>
     <string name="user_add_user_message_short" msgid="1511354412249044381">"추가된 새로운 사용자는 자신의 공간을 설정해야 합니다.\n\n모든 사용자는 다른 사용자들을 위하여 앱을 업데이트할 수 있습니다."</string>
     <string name="user_setup_dialog_title" msgid="1765794166801864563">"지금 사용자를 설정하시겠습니까?"</string>
-    <string name="user_setup_dialog_message" msgid="1004068621380867148">"사용자가 기기를 사용하여 자신의 공간을 설정할 수 있는지 확인하세요."</string>
+    <string name="user_setup_dialog_message" msgid="1004068621380867148">"사용자가 기기를 사용하여 자신의 공간을 설정할 수 있도록 하세요."</string>
     <string name="user_setup_profile_dialog_message" msgid="3896568553327558731">"지금 프로필을 설정하시겠습니까?"</string>
     <string name="user_setup_button_setup_now" msgid="3391388430158437629">"지금 설정"</string>
     <string name="user_setup_button_setup_later" msgid="3068729597269172401">"나중에"</string>
@@ -2637,7 +2656,7 @@
     <string name="restriction_menu_change_pin" msgid="740081584044302775">"PIN 변경"</string>
     <string name="app_notifications_switch_label" msgid="9124072219553687583">"알림 표시"</string>
     <string name="help_label" msgid="6886837949306318591">"고객센터"</string>
-    <string name="support_summary" msgid="2705726826263742491">"도움말, 전화 &amp; 채팅, 시작하기"</string>
+    <string name="support_summary" msgid="2705726826263742491">"도움말, 전화 및 채팅, 시작하기"</string>
     <string name="user_account_title" msgid="1127193807312271167">"콘텐츠용 계정"</string>
     <string name="user_picture_title" msgid="7297782792000291692">"사진 ID"</string>
     <string name="extreme_threats_title" msgid="6549541803542968699">"긴급한 위협"</string>
@@ -2652,7 +2671,7 @@
     <string name="call_manager_title" msgid="4479949569744516457">"통화 관리자"</string>
     <!-- no translation found for call_manager_summary (5918261959486952674) -->
     <skip />
-    <string name="cell_broadcast_settings" msgid="4124461751977706019">"긴급 알림"</string>
+    <string name="cell_broadcast_settings" msgid="4124461751977706019">"긴급 경보"</string>
     <string name="network_operators_settings" msgid="2583178259504630435">"네트워크 이동통신사"</string>
     <string name="access_point_names" msgid="1381602020438634481">"액세스포인트 네임(APN)"</string>
     <string name="enhanced_4g_lte_mode_title" msgid="5808043757309522392">"향상된 4G LTE 모드"</string>
@@ -2708,6 +2727,8 @@
     <string name="color_purple" msgid="3888532466427762504">"보라색"</string>
     <string name="sim_no_inserted_msg" msgid="210316755353227087">"SIM 카드가 장착되지 않음"</string>
     <string name="sim_status_title" msgid="6744870675182447160">"SIM 상태"</string>
+    <!-- no translation found for sim_status_title_sim_slot (5725659316463979194) -->
+    <skip />
     <string name="sim_call_back_title" msgid="5181549885999280334">"기본 SIM에서 다시 전화하기"</string>
     <string name="sim_outgoing_call_title" msgid="1019763076116874255">"발신 전화용 SIM"</string>
     <string name="sim_other_call_settings" msgid="8247802316114482477">"기타 통화 설정"</string>
@@ -2721,12 +2742,15 @@
     <string name="sim_pref_divider" msgid="6778907671867621874">"다음 작업에 대하여 선호하는 SIM"</string>
     <string name="sim_calls_ask_first_prefs_title" msgid="7941299533514115976">"항상 확인"</string>
     <string name="sim_selection_required_pref" msgid="3446721423206414652">"선택 필요"</string>
+    <!-- no translation found for sim_selection_channel_title (2760909074892782589) -->
+    <skip />
     <string name="dashboard_title" msgid="5453710313046681820">"설정"</string>
     <plurals name="settings_suggestion_header_summary_hidden_items" formatted="false" msgid="5597356221942118048">
       <item quantity="other">%d개의 숨겨진 항목 표시</item>
       <item quantity="one">%d개의 숨겨진 항목 표시</item>
     </plurals>
-    <string name="network_dashboard_title" msgid="4771589228992391573">"네트워크 및 인터넷"</string>
+    <string name="dashboard_suggestion_condition_footer_content_description" msgid="2898588191174845961">"접기"</string>
+    <string name="network_dashboard_title" msgid="3135144174846753758">"네트워크 및 인터넷"</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>
@@ -2786,6 +2810,14 @@
     <string name="keywords_payment_settings" msgid="5220104934130446416">"결제, 탭, 결제"</string>
     <string name="keywords_backup" msgid="470070289135403022">"백업, 백 업"</string>
     <string name="keywords_assist_gesture_launch" msgid="813968759791342591">"동작"</string>
+    <!-- no translation found for keywords_imei_info (7230982940217544527) -->
+    <skip />
+    <!-- no translation found for keywords_sim_status (1474422416860990564) -->
+    <skip />
+    <!-- no translation found for keywords_model_and_hardware (1459248377212829642) -->
+    <skip />
+    <!-- no translation found for keywords_android_version (5591055570309015111) -->
+    <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>
@@ -2823,14 +2855,20 @@
     <string name="emergency_tone_alert" msgid="8941852695428130667">"알림"</string>
     <string name="emergency_tone_vibrate" msgid="8281126443204950847">"진동"</string>
     <string name="boot_sounds_title" msgid="567029107382343709">"부팅 소리"</string>
-    <string name="zen_mode_settings_summary_off" msgid="1857165567766351925">"사용 설정된 자동 규칙이 없음"</string>
-    <plurals name="zen_mode_settings_summary_on" formatted="false" msgid="1216562765753405784">
-      <item quantity="other">자동 규칙 <xliff:g id="ON_COUNT">%d</xliff:g>개 사용 설정됨</item>
-      <item quantity="one">자동 규칙 1개 사용 설정됨</item>
+    <string name="zen_mode_settings_summary_off" msgid="6119891445378113334">"사용 안함"</string>
+    <plurals name="zen_mode_settings_summary_on" formatted="false" msgid="7346979080337117366">
+      <item quantity="other">규칙 <xliff:g id="ON_COUNT">%d</xliff:g>개</item>
+      <item quantity="one">규칙 1개</item>
     </plurals>
-    <string name="zen_mode_settings_title" msgid="842308776768942600">"알림 일시중지 환경설정"</string>
-    <string name="zen_mode_priority_settings_title" msgid="2623117023031824309">"중요 알림만 허용"</string>
-    <string name="zen_mode_automation_settings_title" msgid="4228995740594063774">"자동 규칙"</string>
+    <string name="zen_mode_settings_title" msgid="1066226840983908121">"알림 일시중지"</string>
+    <string name="zen_mode_behavior_settings_title" msgid="1463303933529313969">"동작"</string>
+    <string name="zen_mode_behavior_allow_title" msgid="3845615648136218141">"다음의 소리 및 진동 허용"</string>
+    <string name="zen_mode_behavior_no_sound" msgid="1219626004723208056">"음소거"</string>
+    <string name="zen_mode_behavior_total_silence" msgid="6716603819806610626">"음소거(모두 차단)"</string>
+    <string name="zen_mode_behavior_no_sound_except" msgid="4968477585788243114">"<xliff:g id="CATEGORIES">%1$s</xliff:g>을(를) 제외한 모든 소리 음소거"</string>
+    <string name="zen_mode_behavior_alarms_only" msgid="2423480992071472963">"알람, 미디어, 시스템을 제외한 모든 소리 음소거(알람만 듣기)"</string>
+    <string name="zen_mode_automation_settings_title" msgid="2517800938791944915">"자동으로 사용 설정"</string>
+    <string name="zen_mode_automation_settings_page_title" msgid="7069221762714457987">"자동 규칙"</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>
@@ -2838,6 +2876,22 @@
     <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_signals_settings_subtitle" msgid="6308824824208120508">"시각적 신호 허용"</string>
+    <string name="zen_mode_add" msgid="90014394953272517">"추가"</string>
+    <!-- no translation found for zen_mode_button_turn_on (5074744714613374902) -->
+    <skip />
+    <!-- no translation found for zen_mode_button_turn_off (1995551537320422792) -->
+    <skip />
+    <!-- no translation found for zen_mode_settings_dnd_manual_end_time_next_day (3090599225533484203) -->
+    <skip />
+    <!-- no translation found for zen_mode_settings_dnd_manual_indefinite (2746903915016850399) -->
+    <skip />
+    <!-- no translation found for zen_mode_settings_dnd_automatic_rule (3856133183910726786) -->
+    <skip />
+    <!-- no translation found for zen_mode_settings_dnd_automatic_rule_app (7112871101701453067) -->
+    <skip />
+    <!-- no translation found for zen_mode_settings_dnd_automatic_rule_multiple (5792308957602984360) -->
+    <skip />
     <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>
@@ -2871,13 +2925,15 @@
     <string name="notifications_title" msgid="8086372779371204971">"알림"</string>
     <string name="app_notifications_title" msgid="5810577805218003760">"앱 알림"</string>
     <string name="notification_channel_title" msgid="2260666541030178452">"알림 카테고리"</string>
+    <string name="notification_group_title" msgid="7180506440133859601">"알림 카테고리 그룹"</string>
     <string name="notification_importance_title" msgid="848692592679312666">"중요도"</string>
-    <string name="notification_importance_unspecified" msgid="2196023702875112081">"앱에서 결정"</string>
+    <string name="notification_importance_unspecified" msgid="6622173510486113958">"소리 허용"</string>
     <string name="notification_importance_blocked" msgid="7938180808339386300">"알림 표시 안함"</string>
     <string name="notification_importance_min" msgid="5455049524984686275">"소리나 시각적인 방해 없음"</string>
     <string name="notification_importance_low" msgid="8881468429453766553">"소리 안 남"</string>
     <string name="notification_importance_default" msgid="5958338024601957516">"소리로 알림"</string>
     <string name="notification_importance_high" msgid="2082429479238228527">"소리 및 화면 표시로 알림"</string>
+    <string name="notification_importance_high_silent" msgid="2667033773703765252">"화면 표시로 알림"</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>
@@ -2920,8 +2976,13 @@
     <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="channel_group_notifications_off_desc" msgid="1620950416247316370">"Android에서 기기에 이 그룹의 알림이 표시되지 않도록 차단하고 있습니다."</string>
     <string name="notification_channels" msgid="5346841743182627500">"카테고리"</string>
     <string name="notification_channels_other" msgid="5645317113885788226">"기타"</string>
+    <plurals name="notification_group_summary" formatted="false" msgid="3420621520561455358">
+      <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="no_channels" msgid="3077375508177744586">"이 앱에서 게시한 알림이 없음"</string>
     <string name="app_settings_link" msgid="8894946007543660906">"앱 내 추가 설정"</string>
     <string name="app_notification_listing_summary_zero" msgid="6482582965081108108">"모든 앱에서 사용 설정됨"</string>
@@ -2957,7 +3018,9 @@
     <string name="zen_mode_rule_name" msgid="5149068059383837549">"규칙 이름"</string>
     <string name="zen_mode_rule_name_hint" msgid="3781174510556433384">"규칙 이름 입력"</string>
     <string name="zen_mode_rule_name_warning" msgid="4517805381294494314">"이미 사용 중인 규칙 이름입니다."</string>
-    <string name="zen_mode_add_rule" msgid="7459154136384467057">"추가"</string>
+    <string name="zen_mode_add_rule" msgid="9100929184624317193">"규칙 추가"</string>
+    <string name="zen_mode_add_event_rule" msgid="3997335103633946552">"이벤트 규칙 추가"</string>
+    <string name="zen_mode_add_time_rule" msgid="5002080000597838703">"시간 규칙 추가"</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>
@@ -2965,9 +3028,9 @@
     <string name="zen_mode_rule_type" msgid="2289413469580142888">"규칙 유형"</string>
     <string name="zen_mode_rule_type_unknown" msgid="3049377282766700600">"알 수 없음"</string>
     <string name="zen_mode_configure_rule" msgid="8865785428056490305">"규칙 설정"</string>
-    <string name="zen_schedule_rule_type_name" msgid="142936744435271449">"시간 규칙"</string>
+    <string name="zen_schedule_rule_type_name" msgid="6163149826036287324">"시간"</string>
     <string name="zen_schedule_rule_enabled_toast" msgid="3379499360390382259">"지정된 시간 동안 알림 일시중지를 사용하도록 자동 규칙 설정"</string>
-    <string name="zen_event_rule_type_name" msgid="2645981990973086797">"이벤트 규칙"</string>
+    <string name="zen_event_rule_type_name" msgid="6503468472212606158">"이벤트"</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>
@@ -2998,12 +3061,13 @@
     <string name="zen_mode_from_starred" msgid="2678345811950997027">"별표 표시한 연락처만"</string>
     <string name="zen_mode_from_none" msgid="8219706639954614136">"없음"</string>
     <string name="zen_mode_alarms" msgid="2165302777886552926">"알람"</string>
+    <string name="zen_mode_media_system_other" msgid="8900209390529859777">"미디어 및 시스템 의견"</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="239685342222975733">"<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>
@@ -3022,16 +3086,13 @@
     </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_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="zen_mode_screen_on" msgid="8774571998575673502">"화면이 켜져 있을 때"</string>
+    <string name="zen_mode_screen_on_summary" msgid="5385338884695802115">"알림 일시중지로 음소거된 알림이 화면에 표시되도록 허용"</string>
+    <string name="zen_mode_screen_off" msgid="3144446765110327937">"화면이 꺼져 있을 때"</string>
+    <string name="zen_mode_screen_off_summary" msgid="7430034620565812258">"알림 일시중지로 음소거된 알림이 화면을 켜고 불빛을 깜박이도록 허용"</string>
+    <string name="zen_mode_screen_off_summary_no_led" msgid="2826121465026642017">"알림 일시중지로 음소거된 알림이 화면을 켜도록 허용"</string>
     <string name="notification_app_settings_button" msgid="6685640230371477485">"알림 설정"</string>
+    <string name="suggestion_button_text" msgid="3275010948381252006">"확인"</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>
@@ -3150,7 +3211,7 @@
     <string name="default_app" msgid="6864503001385843060">"(기본)"</string>
     <string name="system_app" msgid="9068313769550747372">"(시스템)"</string>
     <string name="system_default_app" msgid="3091113402349739037">"(시스템 기본값)"</string>
-    <string name="apps_storage" msgid="4353308027210435513">"앱 저장소"</string>
+    <string name="apps_storage" msgid="4353308027210435513">"앱 저장용량"</string>
     <string name="usage_access" msgid="5479504953931038165">"사용 기록에 액세스"</string>
     <string name="permit_usage_access" msgid="4012876269445832300">"사용 기록에 액세스 허용"</string>
     <string name="app_usage_preference" msgid="7065701732733134991">"앱 사용 환경설정"</string>
@@ -3199,7 +3260,7 @@
     <string name="sharing_remote_bugreport_dialog_message" msgid="5859287696666024466">"이 버그 보고서는 IT 관리자와 공유됩니다. 자세한 내용은 IT 관리자에게 문의하세요."</string>
     <string name="share_remote_bugreport_action" msgid="532226159318779397">"공유"</string>
     <string name="decline_remote_bugreport_action" msgid="518720235407565134">"거부"</string>
-    <string name="usb_use_charging_only" msgid="2180443097365214467">"이 기기 충전하기"</string>
+    <string name="usb_use_charging_only" msgid="2180443097365214467">"이 기기 충전"</string>
     <string name="usb_use_charging_only_desc" msgid="3066256793008540627">"이 기기만 충전"</string>
     <string name="usb_use_power_only" msgid="6426550616883919530">"전원 공급"</string>
     <string name="usb_use_power_only_desc" msgid="3461232831015575152">"연결된 기기를 충전합니다. USB 충전을 지원하는 기기에서만 이용할 수 있습니다."</string>
@@ -3209,13 +3270,14 @@
     <string name="usb_use_photo_transfers_desc" msgid="2963034811151325996">"MTP가 지원되지 않는 경우 사진 또는 파일 전송(PTP)"</string>
     <string name="usb_use_MIDI" msgid="870922185938298263">"기기를 MIDI로 사용"</string>
     <string name="usb_use_MIDI_desc" msgid="8473936990076693175">"이 기기를 MIDI로 사용"</string>
-    <string name="usb_use" msgid="3256040963685055320">"다음에 USB 사용"</string>
+    <string name="usb_use" msgid="3256040963685055320">"다음 용도로 USB 사용"</string>
     <string name="usb_pref" msgid="1400617804525116158">"USB"</string>
     <string name="usb_summary_charging_only" msgid="7544327009143659751">"기기 충전 중"</string>
     <string name="usb_summary_power_only" msgid="3629517713817003738">"전원 공급 중"</string>
     <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="sms_mirroring_pref" msgid="6475043279147376031">"SMS 미러링"</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>
@@ -3282,7 +3344,7 @@
     <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="permit_write_settings" msgid="658555006453212691">"시스템 설정 수정 허용"</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>
@@ -3348,7 +3410,7 @@
     <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, 블루투스 및 모바일 네트워크가 사용 중지되었습니다. 전화를 걸거나 인터넷에 연결할 수 없습니다."</string>
+    <string name="condition_airplane_summary" msgid="3738805058182535606">"Wi-Fi, 블루투스 및 모바일 네트워크가 사용 중지되었습니다. 전화를 걸거나 인터넷에 연결할 수 없습니다."</string>
     <string name="condition_zen_title" msgid="2679168532600816392">"알림 일시중지 사용 중(<xliff:g id="ID_1">%1$s</xliff:g>)"</string>
     <string name="condition_battery_title" msgid="3272131008388575349">"배터리 세이버 사용 중"</string>
     <string name="condition_battery_summary" msgid="4418839236027977450">"성능이 감소됩니다. 위치 서비스와 백그라운드 데이터가 사용 중지되었습니다."</string>
@@ -3377,9 +3439,10 @@
     <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="camera_hal_hdrplus_switch" msgid="8377365197105267466">"카메라 HAL HDR+"</string>
-    <string name="camera_hal_hdrplus_toast" msgid="2063703797270055299">"카메라 HAL HDR+의 변경사항을 적용하려면 기기를 재부팅하세요."</string>
+    <string name="connectivity_monitor_switch" msgid="9059759348648583421">"연결 모니터"</string>
+    <string name="connectivity_monitor_switch_summary" msgid="2828658652378866401">"연결 모니터에서 연결 문제가 감지될 경우 로그를 수집하며 버그를 신고하라는 알림을 표시합니다."</string>
+    <string name="connectivity_monitor_toast" msgid="5551859612881173028">"연결 모니터의 변경사항을 적용하려면 기기를 재부팅하세요."</string>
+    <string name="camera_laser_sensor_switch" msgid="8913588990743234440">"카메라 레이저 센서"</string>
     <string name="ota_disable_automatic_update" msgid="2319639631655915050">"자동 시스템 업데이트"</string>
     <string name="usage" msgid="2977875522080448986">"사용량"</string>
     <string name="cellular_data_usage" msgid="2155683719898158203">"모바일 데이터 사용량"</string>
@@ -3405,7 +3468,7 @@
     <string name="data_warning" msgid="209133958008062117">"데이터 경고"</string>
     <string name="set_data_limit" msgid="2901526323210516923">"데이터 한도 설정"</string>
     <string name="data_limit" msgid="1885406964934590552">"데이터 한도"</string>
-    <string name="data_usage_template" msgid="392191945602400904">"<xliff:g id="ID_2">%2$s</xliff:g>에 <xliff:g id="ID_1">%1$s</xliff:g> 사용함"</string>
+    <string name="data_usage_template" msgid="2923744765873163859">"<xliff:g id="ID_2">%2$s</xliff:g>에 <xliff:g id="ID_1">%1$s</xliff:g> 사용함"</string>
     <string name="configure" msgid="1029654422228677273">"설정"</string>
     <string name="data_usage_other_apps" msgid="3272872663517382050">"사용량이 집계된 기타 앱"</string>
     <plurals name="data_saver_unrestricted_summary" formatted="false" msgid="2635267833484232703">
@@ -3474,15 +3537,15 @@
     <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="387052719462473500">"잠금 화면에서 정보 제어"</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="8483187649355540109">"지원 &amp; 도움말"</string>
+    <string name="page_tab_title_support" msgid="8483187649355540109">"지원 및 도움말"</string>
     <string name="developer_smallest_width" msgid="7516950434587313360">"최소 폭"</string>
     <string name="premium_sms_none" msgid="8268105565738040566">"설치된 앱 중에서 프리미엄 SMS 액세스를 요청한 앱이 없습니다."</string>
     <string name="premium_sms_warning" msgid="9086859595338944882">"프리미엄 SMS는 요금이 부과될 수 있으며 이는 이동통신사 요금에 추가됩니다. 앱에 권한을 부여하면 해당 앱을 사용하여 프리미엄 SMS를 사용할 수 있게 됩니다."</string>
     <string name="premium_sms_access" msgid="4660047004791638305">"프리미엄 SMS 액세스"</string>
-    <string name="bluetooth_disabled" msgid="2456198532288640046">"다른 기기에서 보이지 않음"</string>
+    <string name="bluetooth_disabled" msgid="6244000672828617410">"사용 안함"</string>
     <string name="bluetooth_connected_summary" msgid="7672528674593152862">"<xliff:g id="ID_1">%1$s</xliff:g>에 연결됨"</string>
     <string name="bluetooth_connected_multiple_devices_summary" msgid="9173661896296663932">"여러 기기에 연결됨"</string>
     <string name="demo_mode" msgid="2798762752209330277">"시스템 UI 데모 모드"</string>
@@ -3528,13 +3591,6 @@
       <item quantity="one">1초</item>
     </plurals>
     <string name="support_estimated_wait_time" msgid="6523081420029378051">"~<xliff:g id="ESTIMATE">%1$s</xliff:g> 대기"</string>
-    <string name="bluetooth_talkback_computer" msgid="4875089335641234463">"컴퓨터"</string>
-    <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>
-    <string name="bluetooth_talkback_input_peripheral" msgid="5165842622743212268">"입력 주변기기"</string>
-    <string name="bluetooth_talkback_bluetooth" msgid="5615463912185280812">"블루투스"</string>
     <string name="automatic_storage_manager_settings" msgid="7819434542155181607">"저장용량 관리"</string>
     <string name="automatic_storage_manager_text" msgid="4562950476680600604">"저장용량 관리자가 저장 공간을 확보하기 위해 백업된 사진과 동영상을 기기에서 삭제합니다."</string>
     <string name="automatic_storage_manager_days_title" msgid="2017913896160914647">"사진 및 동영상 삭제"</string>
@@ -3556,12 +3612,12 @@
     <string name="double_twist_for_camera_suggestion_summary" product="default" msgid="447403641027147153">"휴대전화를 두 번 돌려 셀카 모드를 실행합니다."</string>
     <string name="double_twist_for_camera_suggestion_summary" product="tablet" msgid="1724660290703318739">"태블릿을 두 번 돌려 셀카 모드를 실행합니다."</string>
     <string name="double_twist_for_camera_suggestion_summary" product="device" msgid="5980398380988039489">"기기를 두 번 돌려 셀카 모드를 실행합니다."</string>
-    <string name="ambient_display_title" product="default" msgid="5144814600610448504">"두 번 탭하여 스마트폰 확인"</string>
+    <string name="ambient_display_title" product="default" msgid="5144814600610448504">"두 번 탭하여 휴대전화 확인"</string>
     <string name="ambient_display_title" product="tablet" msgid="8688795028609563837">"두 번 탭하여 태블릿 확인"</string>
     <string name="ambient_display_title" product="device" msgid="3423781975742145894">"두 번 탭하여 기기 확인"</string>
     <string name="ambient_display_summary" msgid="525662960806416373">"시간, 알림 아이콘, 기타 정보를 확인하려면 화면을 두 번 탭하세요."</string>
     <string name="ambient_display_suggestion_summary" msgid="5987443721392571847">"화면이 꺼져 있을 때도 알림을 확인할 수 있습니다."</string>
-    <string name="ambient_display_pickup_title" product="default" msgid="818688002837687268">"들어서 스마트폰 확인"</string>
+    <string name="ambient_display_pickup_title" product="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="4567020486787561873">"시간, 알림 아이콘 등의 정보를 확인하려면 휴대전화를 들어 올리세요."</string>
@@ -3569,6 +3625,7 @@
     <string name="ambient_display_pickup_summary" product="device" msgid="8256669101643381568">"시간, 알림 아이콘 등의 정보를 확인하려면 기기를 들어 올리세요."</string>
     <string name="ambient_display_pickup_suggestion_summary" msgid="7014700589991761035">"화면이 꺼져 있을 때도 알림을 확인할 수 있습니다."</string>
     <string name="fingerprint_swipe_for_notifications_title" msgid="5816346492253270243">"지문을 스와이프하여 알림 보기"</string>
+    <string name="fingerprint_gesture_screen_title" msgid="8562169633234041196">"지문 스와이프"</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>
@@ -3577,14 +3634,15 @@
     <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_connectivity" msgid="3361344735430813695">"먼저 인터넷에 연결하세요"</string>
+    <string name="oem_unlock_enable_disabled_summary_connectivity_or_locked" msgid="2479038689567925511">"인터넷에 연결하거나 이동통신사에 문의하세요"</string>
     <string name="oem_unlock_enable_disabled_summary_sim_locked_device" msgid="4149387448213399630">"특정 이동통신사만 사용하도록 잠긴 기기에서 사용할 수 없음"</string>
+    <string name="oem_lock_info_message" msgid="9218313722236417510">"기기 보호 기능을 사용 설정하려면 기기를 다시 시작하세요."</string>
     <string name="automatic_storage_manager_freed_bytes" msgid="7517560170441007788">"사용 가능한 전체 크기: <xliff:g id="SIZE">%1$s</xliff:g>\n\n마지막 실행일: <xliff:g id="DATE">%2$s</xliff:g>"</string>
     <string name="web_action_enable_title" msgid="4051513950976670853">"인스턴트 앱"</string>
     <string name="web_action_enable_summary" msgid="3108127559723396382">"앱이 설치되어 있지 않아도 앱에서 링크 열기"</string>
     <string name="web_action_section_title" msgid="7364647086538399136">"인스턴트 앱"</string>
-    <string name="instant_apps_account" msgid="1433620209791992528">"인스턴트 앱 계정"</string>
+    <string name="instant_apps_settings" msgid="8827777916518348213">"인스턴트 앱 환경설정"</string>
     <string name="domain_url_section_title" msgid="7046835219056428883">"설치된 앱"</string>
     <string name="automatic_storage_manager_activation_warning" msgid="6353100011690933254">"현재 저장용량 관리자가 저장용량을 관리하고 있습니다."</string>
     <string name="account_for_section_header" msgid="5356566418548737121">"<xliff:g id="USER_NAME">%1$s</xliff:g>님의 계정"</string>
@@ -3631,7 +3689,9 @@
     <string name="enterprise_privacy_always_on_vpn_personal" msgid="9217774730260037434">"개인 프로필에 연결 유지 VPN 사용 설정됨"</string>
     <string name="enterprise_privacy_always_on_vpn_work" msgid="7244472958208315814">"직장 프로필에 연결 유지 VPN 사용 설정됨"</string>
     <string name="enterprise_privacy_global_http_proxy" msgid="7936664553416257333">"전체 HTTP 프록시 설정됨"</string>
-    <string name="enterprise_privacy_ca_certs" msgid="5885892204903688909">"신뢰할 수 있는 사용자 인증 정보"</string>
+    <string name="enterprise_privacy_ca_certs_device" msgid="2019652712782510262">"신뢰할 수 있는 사용자 인증 정보"</string>
+    <string name="enterprise_privacy_ca_certs_personal" msgid="2279084820904076599">"개인 프로필에서 신뢰할 수 있는 사용자 인증 정보"</string>
+    <string name="enterprise_privacy_ca_certs_work" msgid="6187377647815301809">"직장 프로필에서 신뢰할 수 있는 사용자 인증 정보"</string>
     <plurals name="enterprise_privacy_number_ca_certs" formatted="false" msgid="526375234629534165">
       <item quantity="other">CA 인증서 최소 <xliff:g id="COUNT_1">%d</xliff:g>개</item>
       <item quantity="one">CA 인증서 최소 <xliff:g id="COUNT_0">%d</xliff:g>개</item>
@@ -3685,6 +3745,8 @@
     <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="show_operator_name_title" msgid="805135053530442951">"네트워크 이름"</string>
+    <string name="show_operator_name_summary" msgid="5962567590205757550">"상태 표시줄에 네트워크 이름 표시"</string>
     <string name="storage_manager_indicator" msgid="1516810749625915020">"저장용량 관리자: <xliff:g id="STATUS">^1</xliff:g>"</string>
     <string name="storage_manager_indicator_off" msgid="7488057587180724388">"사용 안함"</string>
     <string name="storage_manager_indicator_on" msgid="8625551710194584733">"사용"</string>
@@ -3694,6 +3756,8 @@
     <string name="carrier_provisioning" msgid="4398683675591893169">"Carrier Provisioning Info"</string>
     <string name="trigger_carrier_provisioning" msgid="3434865918009286187">"Trigger Carrier Provisioning"</string>
     <string name="new_device_suggestion_title" msgid="698847081680980774">"흥미로운 새 기능 살펴보기"</string>
-    <string name="new_device_suggestion_summary" msgid="7172709269203435870">"5가지 주요 기능 확인하기"</string>
+    <string name="new_device_suggestion_summary" product="default" msgid="206396571522515855">"새 휴대전화 둘러보기"</string>
+    <string name="new_device_suggestion_summary" product="tablet" msgid="393751455688210956">"새 태블릿 둘러보기"</string>
+    <string name="new_device_suggestion_summary" product="device" msgid="2939870049868336652">"새 기기 둘러보기"</string>
     <string name="disabled_low_ram_device" msgid="3751578499721173344">"이 기기에서 지원하지 않는 기능입니다."</string>
 </resources>
diff --git a/res/values-ky/arrays.xml b/res/values-ky/arrays.xml
index ac99cad..cd61471 100644
--- a/res/values-ky/arrays.xml
+++ b/res/values-ky/arrays.xml
@@ -100,8 +100,6 @@
     <!-- no translation found for wifi_security_no_eap:0 (2084555984818107151) -->
     <!-- no translation found for wifi_security_no_eap:1 (397579322683471524) -->
     <!-- no translation found for wifi_security_no_eap:2 (1968820975358150484) -->
-    <!-- no translation found for wifi_ap_security:0 (5251664683198623324) -->
-    <!-- no translation found for wifi_ap_security:1 (7989073072260294673) -->
   <string-array name="wifi_eap_method">
     <item msgid="1160193392455075561">"PEAP"</item>
     <item msgid="7981731051382306293">"TLS"</item>
@@ -273,7 +271,7 @@
     <item msgid="2603878814882344450">"үн башкаргыч"</item>
     <item msgid="7136963238377062018">"үн деңгээли"</item>
     <item msgid="4270236897655923007">"шыңгырактын үнү"</item>
-    <item msgid="6325739889222559394">"медианын үнү"</item>
+    <item msgid="6325739889222559394">"мультимедианын үнү"</item>
     <item msgid="5762123934816216821">"ойготкучтун үнү"</item>
     <item msgid="785049718065337473">"эскерткичтин үнү"</item>
     <item msgid="6700305533746877052">"bluetooth үнү"</item>
@@ -340,7 +338,7 @@
     <item msgid="2098976479485046797">"Үн башкаргыч"</item>
     <item msgid="5660213838861789350">"Үндүн деңгээли"</item>
     <item msgid="7983336752371254444">"Шыңгырактын үнү"</item>
-    <item msgid="7878027809189330917">"Медианын үнү"</item>
+    <item msgid="7878027809189330917">"Мультимедианын үнү"</item>
     <item msgid="7260546305036218513">"Ойготкучтун үнү"</item>
     <item msgid="9103719301075748925">"Эскерткичтин үнү"</item>
     <item msgid="7025966722295861512">"Bluetooth үнү"</item>
diff --git a/res/values-ky/strings.xml b/res/values-ky/strings.xml
index 6a2d595..e6064dc 100644
--- a/res/values-ky/strings.xml
+++ b/res/values-ky/strings.xml
@@ -165,7 +165,7 @@
     <string name="bluetooth_map_acceptance_dialog_text" msgid="8712508202081143737">"%1$s сиздин баарлашуу билдирүүлөрүңүзгө жеткиси келет. %2$s уруксат берилсинби?"</string>
     <string name="bluetooth_sap_request" msgid="2669762224045354417">"SIM карта пайдалануу мүмкүнчүлүгүн суроо"</string>
     <string name="bluetooth_sap_acceptance_dialog_text" msgid="4414253873553608690">"<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g> SIM картаңызды пайдалануу мүмкүнчүлүгүнө ээ болгусу келет. SIM картаны пайдалануу укугу берилсе, түзмөк SIM картага туташып жатканда дайындарды мобилдик тармак аркылуу өткөрүү кызматтары убактылуу иштебей калат. <xliff:g id="DEVICE_NAME_1">%2$s?</xliff:g> түзмөгүнө SIM картаны пайдалануу мүмкүнчүлүгүн берүү"</string>
-    <string name="bluetooth_device_name_summary" msgid="4757990010751789977">"Башка түзмөктөргө <xliff:g id="DEVICE_NAME">^1</xliff:g> катары көрүнөт"</string>
+    <string name="bluetooth_device_name_summary" msgid="522235742194965734">"Башка түзмөктөргө \"<xliff:g id="DEVICE_NAME">^1</xliff:g>\" деп көрүнөт"</string>
     <string name="bluetooth_paired_device_title" msgid="8638994696317952019">"Түзмөктөрүңүз"</string>
     <string name="bluetooth_pairing_page_title" msgid="7712127387361962608">"Жаңы түзмөктү жупташтыруу"</string>
     <string name="date_and_time" msgid="9062980487860757694">"Күн жана убакыт"</string>
@@ -297,9 +297,9 @@
     <string name="roaming_reenable_message" msgid="9141007271031717369">"Жергиликтүү тармагыңыздан интернет-роуминг өчүрүлгөн абалда кеткендиктен Интернет туташуусун жоготтуңуз."</string>
     <string name="roaming_turn_it_on_button" msgid="4387601818162120589">"Аны күйгүзүү"</string>
     <string name="roaming_warning" msgid="4275443317524544705">"Бир топ чыгымдарга дуушар болуп калышыңыз мүмкүн."</string>
-    <string name="roaming_warning_multiuser" product="tablet" msgid="6458990250829214777">"Интернет-роумингге жол бергенде, сиз роуминг үчүн чоң төлөмгө кирептер болушуңуз мүмкүн!\n\nБул тууралоо планшеттин бардык колдонуучуларына таратылат."</string>
-    <string name="roaming_warning_multiuser" product="default" msgid="6368421100292355440">"Интернет-роумингге жол бергенде, сиз роуминг үчүн чоң төлөмгө кирептер болушуңуз мүмкүн!\n\nБул тууралоо телефондун бардык колдонуучуларына таратылат."</string>
-    <string name="roaming_reenable_title" msgid="6068100976707316772">"Интернет-роумингге жол берилсинби?"</string>
+    <string name="roaming_warning_multiuser" product="tablet" msgid="6458990250829214777">"Интернет-роумингди иштетсеңиз, чоң чыгым тартып калышыңыз мүмкүн!\n\nБардык колдонуучулардын жөндөөлөрү өзгөрүлөт."</string>
+    <string name="roaming_warning_multiuser" product="default" msgid="6368421100292355440">"Интернет-роумингди иштетсеңиз, чоң чыгым тартып калышыңыз мүмкүн!\n\nБардык колдонуучулардын жөндөөлөрү өзгөрүлөт."</string>
+    <string name="roaming_reenable_title" msgid="6068100976707316772">"Интернет-роумингди иштетесизби?"</string>
     <string name="networks" msgid="6333316876545927039">"Оператор тандоо"</string>
     <string name="sum_carrier_select" msgid="3616956422251879163">"Оператор тандоо"</string>
     <string name="date_and_time_settings_title" msgid="3350640463596716780">"Күн жана убакыт"</string>
@@ -311,6 +311,8 @@
     <string name="zone_auto" msgid="334783869352026648">"Убакыт алкагын авто-аныктоо"</string>
     <string name="zone_auto_summaryOn" msgid="6142830927278458314">"Тармактын убакыт алкагы колдонулат"</string>
     <string name="zone_auto_summaryOff" msgid="2597745783162041390">"Тармактын убакыт алкагы колдонулат"</string>
+    <string name="date_time_24hour_auto" msgid="2117383168985653422">"Демейки 24 сааттык формат"</string>
+    <string name="date_time_24hour_auto_summary" msgid="6351812925651480277">"Демейки жергиликтүү формат колдонулсун"</string>
     <string name="date_time_24hour_title" msgid="3203537578602803850">"24 сааттык формат"</string>
     <string name="date_time_24hour" msgid="1193032284921000063">"24 сааттык форматты колдонуу"</string>
     <string name="date_time_set_time_title" msgid="6296795651349047016">"Убакыт"</string>
@@ -326,7 +328,7 @@
     <string name="lock_after_timeout" msgid="4590337686681194648">"Автокулпу"</string>
     <string name="lock_after_timeout_summary" msgid="6128431871360905631">"<xliff:g id="TIMEOUT_STRING">%1$s</xliff:g> уктагандан кийин"</string>
     <string name="lock_immediately_summary_with_exception" msgid="9119632173886172690">"<xliff:g id="TRUST_AGENT_NAME">%1$s</xliff:g> тарабынан кулпусу ачык калтырылгандан башка убакта, уктагандан кийин дароо"</string>
-    <string name="lock_after_timeout_summary_with_exception" msgid="5579064842797188409">"<xliff:g id="TRUST_AGENT_NAME">%2$s</xliff:g> кулптабаган учурду кошпогондо, <xliff:g id="TIMEOUT_STRING">%1$s</xliff:g> көшүгөндөн кийин"</string>
+    <string name="lock_after_timeout_summary_with_exception" msgid="5579064842797188409">"<xliff:g id="TRUST_AGENT_NAME">%2$s</xliff:g> кызматы экранды кулпуланбаган учурда колдоого албаса, <xliff:g id="TIMEOUT_STRING">%1$s</xliff:g> көшүү режимине өткөндө"</string>
     <string name="show_owner_info_on_lockscreen_label" msgid="5074906168357568434">"Кулпуланган экрандан ээсинин маалыматы көрсөтүлсүн"</string>
     <string name="owner_info_settings_title" msgid="5530285568897386122">"Кулпу экрндгы текст"</string>
     <string name="security_enable_widgets_title" msgid="2754833397070967846">"Виджеттерди жандыруу"</string>
@@ -340,8 +342,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>
-    <!-- no translation found for security_settings_title (4918904614964215087) -->
-    <skip />
+    <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>
@@ -372,6 +373,9 @@
     <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="1961957425135180242">"Кийинки"</string>
+    <string name="setup_fingerprint_enroll_skip_title" msgid="362050541117362034">"Манжа изин жөндөбөйсүзбү?"</string>
+    <string name="setup_fingerprint_enroll_skip_after_adding_lock_text" msgid="958990414356204763">"Манжа изин жөндөө бир-эки эле мүнөткө созулат. Азыр өткөрүп жиберсеңиз, манжа изиңизди кийинчерээк кошсоңуз болот."</string>
+    <string name="lock_screen_intro_skip_title" msgid="4988210105913705679">"Экран кулпусун жөндөбөйсүзбү?"</string>
     <string name="lock_screen_intro_skip_dialog_text_frp" product="tablet" msgid="1581834104051243425">"Түзмөктү коргоо мүмкүнчүлүктөрү жандырылбайт. Эгер планшет жоголуп же уурдалып кетсе, же баштапкы абалга келтирилсе, башкалар аны пайдалана беришет."</string>
     <string name="lock_screen_intro_skip_dialog_text_frp" product="device" msgid="4629503416877189572">"Түзмөктү коргоо мүмкүнчүлүктөрү жандырылбайт. Эгер түзмөк жоголуп же уурдалып кетсе, же баштапкы абалга келтирилсе, башкалар аны пайдалана беришет."</string>
     <string name="lock_screen_intro_skip_dialog_text_frp" product="default" msgid="2423428240245737909">"Түзмөктү коргоо мүмкүнчүлүктөрү жандырылбайт. Эгер телефон жоголуп же уурдалып кетсе, же баштапкы абалга келтирилсе, башкалар аны пайдалана беришет."</string>
@@ -392,16 +396,16 @@
     <string name="security_settings_fingerprint_enroll_repeat_message" msgid="6158989350522518586">"Манжа изиңиздин ар кайсы бөлүгүн кошуу үчүн манжаңызды кичинеден өйдө жылдырыңыз"</string>
     <string name="security_settings_fingerprint_enroll_finish_title" msgid="7567276170287972230">"Манжа изи кошулду"</string>
     <string name="security_settings_fingerprint_enroll_finish_message" msgid="4796715961273420536">"Бул сүрөтчөнү көргөндө, өздүгүңүздү же сатып алууларды ырастоо үчүн манжа изиңизди пайдаланыңыз."</string>
-    <string name="security_settings_fingerprint_enroll_enrolling_skip" msgid="3710211704052369752">"Кийин аткарылсын"</string>
+    <string name="security_settings_fingerprint_enroll_enrolling_skip" msgid="3710211704052369752">"Азыр эмес"</string>
     <string name="setup_fingerprint_enroll_enrolling_skip_title" msgid="6808422329107426923">"Манжа изин жөндөө өткөрүлсүнбү?"</string>
     <string name="setup_fingerprint_enroll_enrolling_skip_message" msgid="274849306857859783">"Телефонуңуздун кулпусун манжа изи менен ачуу ыкмасын тандадыңыз. Эгер азыр өткөрүп жиберсеңиз, аны кийинчерээк жөндөшүңүз керек болот. Жөндөөгө бир мүнөтчө эле убакыт кетет."</string>
     <string name="security_settings_fingerprint_enroll_setup_screen_lock" msgid="1195743489835505376">"Экранды кулпулоо ыкмасын коюу"</string>
     <string name="security_settings_fingerprint_enroll_done" msgid="4014607378328187567">"Даяр"</string>
     <string name="security_settings_fingerprint_enroll_touch_dialog_title" msgid="1863561601428695160">"Ой, ал сенсор эмес"</string>
     <string name="security_settings_fingerprint_enroll_touch_dialog_message" msgid="2989019978041986175">"Телефонуңуздун аркасындагы сенсорго сөөмөйүңүз менен тийиңиз."</string>
-    <string name="security_settings_fingerprint_enroll_error_dialog_title" msgid="3618021988442639280">"Каттоо аягына чыгарылган жок"</string>
+    <string name="security_settings_fingerprint_enroll_error_dialog_title" msgid="3618021988442639280">"Манжа изи кошулган жок"</string>
     <string name="security_settings_fingerprint_enroll_error_timeout_dialog_message" msgid="2942551158278899627">"Манжа изин каттоо боюнча убакыт чегине жетти. Кайра аракет кылыңыз."</string>
-    <string name="security_settings_fingerprint_enroll_error_generic_dialog_message" msgid="3624760637222239293">"Манжа изин каттоо иштеген жок. Кайра аракет кылыңыз же башка манжаңызды колдонуңуз."</string>
+    <string name="security_settings_fingerprint_enroll_error_generic_dialog_message" msgid="3624760637222239293">"Манжа изи кошулбай калды. Кайра кайталап көрүңүз же башка манжаңыздын изин сактаңыз."</string>
     <string name="fingerprint_enroll_button_add" msgid="6317978977419045463">"Дагы бирди кошуу"</string>
     <string name="fingerprint_enroll_button_next" msgid="6247009337616342759">"Кийинки"</string>
     <string name="security_settings_fingerprint_enroll_disclaimer" msgid="2624905914239271751">"Телефонуңуздун кулпусун ачуу, ар кандай нерселерди сатып алуу жана колдонмолорду ачуу үчүн, манжа изиңизди кошуп коюңуз. "<annotation id="url">"Көбүрөөк билүү"</annotation></string>
@@ -457,7 +461,7 @@
     <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="lock_settings_picker_fingerprint_added_security_message" msgid="5768002109707648463">"Кошумча коопсуздук үчүн көмөкчү экран кулпусун коюп алыңыз."</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>
@@ -588,6 +592,7 @@
     <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="lockpassword_clear_label" msgid="5724429464960458155">"Тазалоо"</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>
@@ -726,11 +731,11 @@
     <string name="wifi_poor_network_detection" msgid="4925789238170207169">"Начар байланыштарга кошулбоо"</string>
     <string name="wifi_poor_network_detection_summary" msgid="2784135142239546291">"Жакшы интернет байланыш болмоюнча Wi‑Fi түйүнүн колдонбоо"</string>
     <string name="wifi_avoid_poor_network_detection_summary" msgid="4674423884870027498">"Туруктуу Интернет туташуусу менен камсыз кылган тармактар гана колдонулсун"</string>
-    <string name="use_open_wifi_automatically_title" msgid="6851951242903078588">"Ачык тармактарга туташсын"</string>
+    <string name="use_open_wifi_automatically_title" msgid="6851951242903078588">"Ачык тармактарга туташуу"</string>
     <string name="use_open_wifi_automatically_summary" msgid="2982091714252931713">"Байланыш сигналы жакшы болгон жалпыга ачык тармактарга автоматтык түрдө туташат"</string>
     <string name="use_open_wifi_automatically_summary_scoring_disabled" msgid="593964217679325831">"Пайдалануу үчүн тармактын рейтингин камсыздоочуну тандаңыз"</string>
     <string name="use_open_wifi_automatically_summary_scorer_unsupported_disabled" msgid="8472122600853650258">"Пайдалануу үчүн шайкеш келген тармактын рейтингин камсыздоочуну тандаңыз"</string>
-    <string name="wifi_install_credentials" msgid="3551143317298272860">"Сертификаттарды орнотуу"</string>
+    <string name="wifi_install_credentials" msgid="3551143317298272860">"Тастыктамаларды орнотуу"</string>
     <string name="wifi_scan_notify_text" msgid="5593805423071186757">"Кандайдыр бир жерди тагыраак аныктоо үчүн, тутум колдонмолору жана кызматтар жакын арадагы Bluetooth тармактарын издей берет. Бул функцияны <xliff:g id="LINK_BEGIN_0">LINK_BEGIN</xliff:g>издөө жөндөөлөрүнөн<xliff:g id="LINK_END_1">LINK_END</xliff:g> өзгөртсөңүз болот."</string>
     <string name="wifi_scan_notify_text_scanning_off" msgid="3426075479272242098">"Кандайдыр бир жерди тагыраак аныктоо үчүн <xliff:g id="LINK_BEGIN_0">LINK_BEGIN</xliff:g>издөө жөндөөлөрүнөн<xliff:g id="LINK_END_1">LINK_END</xliff:g> Wi-Fi тармактарын издөө дегенди күйгүзүңүз."</string>
     <string name="wifi_scan_notify_remember_choice" msgid="7104867814641144485">"Экинчи көргөзбө"</string>
@@ -761,7 +766,7 @@
     <string name="wifi_menu_forget" msgid="8736964302477327114">"Тармак унутулсун"</string>
     <string name="wifi_menu_modify" msgid="2068554918652440105">"Тармакты өзгөртүү"</string>
     <string name="wifi_menu_write_to_nfc" msgid="7692881642188240324">"NFC тегине жазуу"</string>
-    <string name="wifi_empty_list_wifi_off" msgid="8056223875951079463">"Жеткиликтүү түйүндөрдү көрүш үчүн Wi‑Fi жандырыңыз."</string>
+    <string name="wifi_empty_list_wifi_off" msgid="8056223875951079463">"Жеткиликтүү тармактарды көрүү үчүн Wi‑Fi\'ды иштетиңиз."</string>
     <string name="wifi_empty_list_wifi_on" msgid="8746108031587976356">"Wi‑Fi түйүндөрү изделүүдө…"</string>
     <string name="wifi_empty_list_user_restricted" msgid="7322372065475939129">"Wi‑Fi түйүнүн алмаштырууга урукатыңыз жок."</string>
     <string name="wifi_more" msgid="3195296805089107950">"Дагы"</string>
@@ -781,6 +786,7 @@
     <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,6 +823,8 @@
     <string name="wifi_wps_available_first_item" msgid="4422547079984583502">"WPS жеткиликтүү"</string>
     <string name="wifi_wps_available_second_item" msgid="8427520131718215301">" (WPS жеткиликтүү)"</string>
     <string name="wifi_wps_nfc_enter_password" msgid="2288214226916117159">"Тармактагы сырсөзүңүздү киргизиңиз"</string>
+    <string name="wifi_carrier_connect" msgid="8174696557882299911">"Оператордун Wi‑Fi тармагы"</string>
+    <string name="wifi_carrier_content" msgid="4634077285415851933">"<xliff:g id="NAME">%1%s</xliff:g> аркылуу туташуу"</string>
     <string name="wifi_scan_always_turnon_message" msgid="203123538572122989">"Жайгаштыруунун тактыгын жогорулатуу жана башка максаттарда, Wi-Fi өчүк болсо да, <xliff:g id="APP_NAME">%1$s</xliff:g> желелерди скандагысы келет.\n\nБардык скандоону кааалаган колдонмолорго уруксат берелсинби?"</string>
     <string name="wifi_scan_always_turnoff_message" msgid="5538901671131941043">"Муну өчүрүү үчүн, жөндөөлөр менюсунан Өркүндөтүлгөндөргө өтүңүз."</string>
     <string name="wifi_scan_always_confirm_allow" msgid="5355973075896817232">"Уруксат"</string>
@@ -834,6 +842,7 @@
     <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_modify" msgid="6100248070440710782">"Өзгөртүү"</string>
     <string name="wifi_failed_forget_message" msgid="1348172929201654986">"Түйүн унутулган жок"</string>
     <string name="wifi_save" msgid="3331121567988522826">"Сактоо"</string>
     <string name="wifi_failed_save_message" msgid="6650004874143815692">"Түйүн сакталган жок"</string>
@@ -846,6 +855,7 @@
     <string name="wifi_advanced_titlebar" msgid="4485841401774142908">"Илгерилетилген 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_title" msgid="3471132676909349382">"Тармак жөнүндө маалымат"</string>
     <string name="wifi_details_subnet_mask" msgid="6720279144174924410">"Тармак бөлүктөрүнүн маскасы"</string>
     <string name="wifi_details_dns" msgid="8648826607751830768">"DNS"</string>
     <string name="wifi_details_ipv6_address_header" msgid="6734119149106422148">"IPv6 даректери"</string>
@@ -878,16 +888,15 @@
     <string name="wifi_p2p_cancel_connect_title" msgid="255267538099324413">"Чакыруу жокко чыгарылсынбы?"</string>
     <string name="wifi_p2p_cancel_connect_message" msgid="7477756213423749402">"<xliff:g id="PEER_NAME">%1$s</xliff:g> менен байланышууга чакырууну жокко чыгарууну каалайсызбы?"</string>
     <string name="wifi_p2p_delete_group_message" msgid="834559380069647086">"Бул топ унутулсунбу?"</string>
-    <string name="wifi_tether_checkbox_text" msgid="1847167643625779136">"Көчмө Wi‑Fi туташуу түйүнү"</string>
     <string name="wifi_hotspot_checkbox_text" msgid="7763495093333664887">"Wi‑Fi туташуу түйүнү"</string>
     <string name="wifi_hotspot_off_subtext" msgid="5466126533609394170">"Интернет же мазмун башка түзмөктөр менен бөлүшүлгөн жок"</string>
     <string name="wifi_hotspot_tethering_on_subtext" product="tablet" msgid="5752490509369962007">"Планшеттин Интернети хотспот аркылуу бөлүшүлүүдө"</string>
     <string name="wifi_hotspot_tethering_on_subtext" product="default" msgid="6461075246164300670">"Телефондун Интернети хотспот аркылуу бөлүшүлүүдө"</string>
     <string name="wifi_hotspot_on_local_only_subtext" msgid="2068110388011294735">"Колдонмо мазмун менен бөлүшүүдө. Интернет байланышы менен бөлүшүү үчүн хотспотту өчүрүп, кайра күйгүзүңүз"</string>
-    <string name="wifi_hotspot_name_title" msgid="1341735529132128887">"Wi‑Fi\'дын аталышы"</string>
+    <string name="wifi_hotspot_name_title" msgid="8237000746618636778">"Туташуу түйүнүнүн аталышы"</string>
     <string name="wifi_hotspot_name_summary_connecting" msgid="3378299995508671967">"<xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g> күйгүзүлүүдө…"</string>
     <string name="wifi_hotspot_name_summary_connected" msgid="3888672084861445362">"Башка түзмөктөр <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g> тармагына туташа алышат"</string>
-    <string name="wifi_hotspot_password_title" msgid="1955592302902091281">"Wi-Fi\'дын сырсөзү"</string>
+    <string name="wifi_hotspot_password_title" msgid="8676859981917573801">"Туташуу түйүнүнүн сырсөзү"</string>
     <string name="wifi_hotspot_ap_band_title" msgid="1165801173359290681">"AP жыштыгы"</string>
     <string name="wifi_hotspot_footer_info_regular" msgid="1203489406068036455">"Башка түзмөктөрүңүз үчүн Wi‑Fi таратуу үчүн хотспот режимин пайдаланыңыз. Хотспот аркылуу башка түзмөктөр сиздин мобилдик Интернетти колдонот. Мобилдик Интернет үчүн кошумча акы алынышы мүмкүн."</string>
     <string name="wifi_hotspot_footer_info_local_only" msgid="857988412470694109">"Жакын жердеги түзмөктөр менен мазмунду бөлүшүү үчүн колдонмолор хотспот болуп бере алышат."</string>
@@ -898,7 +907,6 @@
     <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">"Wi-Fi чалуу"</string>
     <string name="wifi_calling_suggestion_title" msgid="9008010480466359578">"Wi-Fi чалууну күйгүзүү"</string>
@@ -939,12 +947,12 @@
     <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="emergency_address_summary" msgid="3266760199681945746">"WiFi аркылуу өзгөчө кырдаалдар кызматынын номерине чалганыңызда куткаруучуларга жайгашкан жериңиз катары көрсөтүлө турган дарек"</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>
@@ -993,8 +1001,9 @@
     <string name="search_settings" msgid="1910951467596035063">"Издөө"</string>
     <string name="search_settings_summary" msgid="9205656546570654169">"Издөөнүн жөндөөлөрүн жана таржымалын башкаруу"</string>
     <string name="search_settings_no_results" msgid="8799027492641230999">"Бир да натыйжа жок"</string>
+    <string name="search_clear_history" msgid="4196658962573162457">"Таржымалды тазалоо"</string>
     <string name="display_settings" msgid="7965901687241669598">"Дисплей"</string>
-    <string name="accelerometer_title" msgid="7854608399547349157">"Экранды авто-тегеретүү"</string>
+    <string name="accelerometer_title" msgid="7854608399547349157">"Экранды авто-буруу"</string>
     <string name="color_mode_title" msgid="3159275920408338215">"Ачык түстөр"</string>
     <string name="accelerometer_summary_on" product="tablet" msgid="429982132339828942">"Планшет тегеренип жатканда багытын автоматтык түрдө которуштуруу"</string>
     <string name="accelerometer_summary_on" product="default" msgid="1133737282813048021">"Телефон тегеренип жатканда багытын автоматтык түрдө которуштуруу"</string>
@@ -1122,7 +1131,6 @@
     <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>
     <string name="device_status_activity_title" msgid="1411201799384697904">"Абалы"</string>
     <string name="device_status" msgid="607405385799807324">"Абалы"</string>
@@ -1150,7 +1158,6 @@
     <string name="status_wifi_mac_address" msgid="2202206684020765378">"Wi‑Fi MAC дареги"</string>
     <string name="status_bt_address" msgid="4195174192087439720">"Bluetooth дареги"</string>
     <string name="status_serial_number" msgid="2257111183374628137">"Сериялык номери"</string>
-    <string name="status_unavailable" msgid="7862009036663793314">"Жеткиликсиз"</string>
     <string name="status_up_time" msgid="7294859476816760399">"Иштеген убакыты"</string>
     <string name="status_awake_time" msgid="2393949909051183652">"Ойгоо турган убакыт"</string>
     <string name="internal_memory" msgid="9129595691484260784">"Ички эстутум"</string>
@@ -1326,6 +1333,7 @@
     <string name="menu_restore" msgid="8260067415075573273">"Баштапкы абалга келтирүү"</string>
     <string name="restore_default_apn_completed" msgid="2824775307377604897">"Абалкы APN тууралоолорун кайтаруу аяктады."</string>
     <string name="reset_dashboard_title" msgid="6254873816990678620">"Баштапкы абалга келтирүү опциялары"</string>
+    <string name="reset_dashboard_summary" msgid="4851012632493522755">"Тармактын, колдонмолордун же түзмөктүн жөндөөлөрүн баштапкы абалга келтирсеңиз болот"</string>
     <string name="reset_network_title" msgid="6166025966016873843">"Wi-Fi\'ды, мобилдик түзмөктү жана Bluetooth\'ду баштапкы абалга келтирүү"</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>
@@ -1334,17 +1342,14 @@
     <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="6617679904229218425">"Бардык дайындарды тазалоо (Заводдук абалына келтирүү)"</string>
-    <plurals name="master_clear_with_account_summary" formatted="false" msgid="5911377203778818712">
-      <item quantity="other"><xliff:g id="ACCOUNT_COUNT">%1$d</xliff:g> каттоо эсеби баштапкы абалга келтирилет</item>
-      <item quantity="one">1 каттоо эсеби баштапкы абалга келтирилет</item>
-    </plurals>
-    <string name="master_clear_summary" msgid="6902443944660426951">"Ички сактагыч жана бардык дайындар баштапкы абалына келтирилет"</string>
+    <string name="master_clear_title" msgid="3531267871084279512">"Бардык дайындарды тазалоо (заводдук абалына келтирүү)"</string>
     <string name="master_clear_desc" product="tablet" msgid="9146059417023157222">"Планшетиңиздин "<b>"ички сактагычындагы"</b>" бардык дайындар өчүрүлөт, ошону менен катар:\n\n"<li>"Google каттоо эсебиңиз"</li>\n<li>"Тутумдун жана колдонмолордун жөндөөлөрү жана дайындары"</li>\n<li>"Жүктөлүп алынган колдонмолор"</li></string>
     <string name="master_clear_desc" product="default" msgid="4800386183314202571">"Телефонуңуздун "<b>"ички сактагычындагы"</b>" бардык дайындар өчүрүлөт, ошону менен катар:\n\n"<li>"Google каттоо эсебиңиз"</li>\n<li>"Тутумдун жана колдонмолордун жөндөөлөрү жана дайындары"</li>\n<li>"Жүктөлүп алынган колдонмолор"</li></string>
     <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"Ушул түзмөктөгү каттоо эсептер:\n"</string>
     <string name="master_clear_other_users_present" product="default" msgid="5161423070702470742">\n\n"Бул түзмөктө башка колдонуучулар бар.\n"</string>
     <string name="master_clear_desc_also_erases_external" msgid="1903185203791274237"><li>"Музыка"</li>\n<li>"Сүрөттөр"</li>\n<li>"Башка колдонуучу дайындары"</li></string>
+    <string name="master_clear_desc_also_erases_esim" msgid="312352697653096008"><li>"eSIM-карта менен иштеген операторлор"</li></string>
+    <string name="master_clear_desc_no_cancel_mobile_plan" msgid="5460926449093211144">\n\n"Ушуну менен байланыш операторуңуздун тарифтик планы жокко чыгарылбайт."</string>
     <string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="7744115866662613411">\n\n"Музыканы, сүрөттөрдү, жана башка колдонуучу берилиштерин өчүрүш үчүн, "<b>"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>
@@ -1449,7 +1454,7 @@
     <string name="copyright_title" msgid="865906688917260647">"Автордук укук"</string>
     <string name="license_title" msgid="1990487604356037871">"Уруксаттама"</string>
     <string name="terms_title" msgid="7697580845616764642">"Шарттар жана жоболор"</string>
-    <string name="webview_license_title" msgid="2813507464175738967">"Систем WebView Уруксаттамасы"</string>
+    <string name="webview_license_title" msgid="2813507464175738967">"WebView тутум уруксаттамасы"</string>
     <string name="wallpaper_attributions" msgid="3645880512943433928">"Тушкагаздар"</string>
     <string name="wallpaper_attributions_values" msgid="2996183537914690469">"Спутник сүрөттөрү:\n©2014 CNES/Astrium, DigitalGlobe, Bluesky"</string>
     <string name="settings_manual_activity_title" msgid="8133150693616006051">"Нускама"</string>
@@ -1461,15 +1466,16 @@
     <string name="settings_safetylegal_activity_title" msgid="6901214628496951727">"Коопсуздук маалыматы"</string>
     <string name="settings_safetylegal_activity_unreachable" msgid="250674109915859456">"Сизде азыр интернет-байланыш жок. Бул маалыматтарды азыр көрүш үчүн, интернет байланышы бар компүтерден  %s кирсеңиз болот:"</string>
     <string name="settings_safetylegal_activity_loading" msgid="8059022597639516348">"Жүктөлүүдө…"</string>
-    <string name="lockpassword_choose_your_password_header" msgid="8624900666929394990">"Сырсөзүңүздү тандаңыз"</string>
-    <string name="lockpassword_choose_your_password_header_for_fingerprint" msgid="6624409510609085450">"Манжа изин колдонуу үчүн сырсөздү жөндөңүз"</string>
-    <string name="lockpassword_choose_your_pattern_header" msgid="6949761069941694050">"Графикалык ачкычты тандаңыз"</string>
-    <string name="lockpassword_choose_your_pattern_header_for_fingerprint" msgid="5901096361617543819">"Манжа изин колдонуу үчүн графикалык ачкычты жөндөңүз"</string>
-    <string name="lockpassword_choose_your_pin_header" msgid="7598849519816138302">"PIN кодуңузду тандаңыз"</string>
-    <string name="lockpassword_choose_your_pin_header_for_fingerprint" msgid="765344692615917183">"Манжа изин колдонуу үчүн PIN кодду жөндөңүз"</string>
-    <string name="lockpassword_confirm_your_password_header" msgid="6308478184889846633">"Сырсөзүңүздү ырастаңыз"</string>
+    <string name="lockpassword_choose_your_screen_lock_header" msgid="3872462096767152394">"Экран кулпусун коюп алыңыз"</string>
+    <string name="lockpassword_choose_your_password_message" msgid="1197569283524841412">"Коопсуздук үчүн сырсөз коюп алыңыз"</string>
+    <string name="lockpassword_choose_your_password_header_for_fingerprint" msgid="2541818487015343503">"Манжа изин колдонуу үчүн сырсөздү жөндөңүз"</string>
+    <string name="lockpassword_choose_your_pattern_header_for_fingerprint" msgid="7709785406243556723">"Манжа изинин резервдик ыкмасын жөндөңүз"</string>
+    <string name="lockpassword_choose_your_pin_message" msgid="1875420718677275646">"Коопсуздук үчүн PIN код коюп алыңыз"</string>
+    <string name="lockpassword_choose_your_pin_header_for_fingerprint" msgid="1549639053195796674">"Манжа изин колдонуу үчүн PIN кодду жөндөңүз"</string>
+    <string name="lockpassword_choose_your_pattern_message" msgid="5986983400689720015">"Коопсуздук үчүн графикалык ачкыч коюп алыңыз"</string>
+    <string name="lockpassword_confirm_your_password_header" msgid="1266027268220850931">"Сырсөзүңүздү кайра киргизиңиз"</string>
     <string name="lockpassword_confirm_your_pattern_header" msgid="7543433733032330821">"Графикалык ачкычыңызды ырастаңыз"</string>
-    <string name="lockpassword_confirm_your_pin_header" msgid="49038294648213197">"PIN кодуңузду ырастаңыз"</string>
+    <string name="lockpassword_confirm_your_pin_header" msgid="7744513791910572550">"PIN кодуңузду кайра киргизиңиз"</string>
     <string name="lockpassword_confirm_passwords_dont_match" msgid="5140892109439191415">"Сырсөздөр дал келген жок"</string>
     <string name="lockpassword_confirm_pins_dont_match" msgid="7226244811505606217">"PIN коддор дал келген жок"</string>
     <string name="lockpassword_choose_lock_generic_header" msgid="3811438094903786145">"Кулпуну ачуу ыкмасын тандоо"</string>
@@ -1488,6 +1494,12 @@
     <string name="lockpassword_strong_auth_required_work_pattern" msgid="3003781907040522053">"Кошумча коопсуздук үчүн жумуш профилиңиздин графикалык ачкычын колдонуңуз"</string>
     <string name="lockpassword_strong_auth_required_work_pin" msgid="3367491332598821552">"Кошумча коопсуздук үчүн жумуш профилиңиздин PIN кодун киргизиңиз"</string>
     <string name="lockpassword_strong_auth_required_work_password" msgid="8159775129968582940">"Кошумча коопсуздук үчүн жумуш профилиңиздин сырсөзүн киргизиңиз"</string>
+    <string name="lockpassword_confirm_your_pattern_details_frp" msgid="6757336656791723193">"Телефонуңуз заводдук жөндөөлөрүнө кайтарылды. Аны колдонуу үчүн мурунку граф. ачкычты киргизиңиз."</string>
+    <string name="lockpassword_confirm_your_pin_details_frp" msgid="826520613445990470">"Телефонуңуз заводдук жөндөөлөрүнө кайтарылды. Аны колдонуу үчүн мурунку PIN кодуңузду киргизиңиз."</string>
+    <string name="lockpassword_confirm_your_password_details_frp" msgid="8944081074615739040">"Телефонуңуз заводдук жөндөөлөрүнө кайтарылды. Аны колдонуу үчүн мурунку сырсөзүңүздү киргизиңиз."</string>
+    <string name="lockpassword_confirm_your_pattern_header_frp" msgid="2898036091609128286">"Графикалык ачкычты ырастоо"</string>
+    <string name="lockpassword_confirm_your_pin_header_frp" msgid="4141601774778898803">"PIN кодду ырастоо"</string>
+    <string name="lockpassword_confirm_your_password_header_frp" msgid="3762615419295360480">"Сырсөздү ырастоо"</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>
@@ -1512,7 +1524,7 @@
     <string name="lockpattern_settings_enable_visible_pattern_title_profile" msgid="4864525074768391381">"Профилдин графикалык ачкычы көрсөтүлсүн"</string>
     <string name="lockpattern_settings_enable_tactile_feedback_title" msgid="4389015658335522989">"Таптаганда дирилдесин"</string>
     <string name="lockpattern_settings_enable_power_button_instantly_locks" msgid="5735444062633666327">"Кубат баскычы дароо кулпулайт"</string>
-    <string name="lockpattern_settings_power_button_instantly_locks_summary" msgid="8196258755143711694">"<xliff:g id="TRUST_AGENT_NAME">%1$s</xliff:g> кулптабаган учурду кошпогондо"</string>
+    <string name="lockpattern_settings_power_button_instantly_locks_summary" msgid="8196258755143711694">"<xliff:g id="TRUST_AGENT_NAME">%1$s</xliff:g> кызматы экранды кулпулабаган учурду кошпогондо"</string>
     <string name="lockpattern_settings_choose_lock_pattern" msgid="1652352830005653447">"Кулпуну ачуу үлгүсүн коюу"</string>
     <string name="lockpattern_settings_change_lock_pattern" msgid="1123908306116495545">"Кулпуну ачуу үлгүсүн өзгөртүү"</string>
     <string name="lockpattern_settings_help_how_to_record" msgid="2614673439060830433">"Кулпуну ачуу үлгүсүн кантип тартыш керек"</string>
@@ -1537,7 +1549,6 @@
     <string name="install_applications_title" msgid="4987712352256508946">"Бардк колднмо булактрна урукст"</string>
     <string name="recent_app_category_title" msgid="6673071268966003928">"Акыркы ачылган колдонмолор"</string>
     <string name="see_all_apps_title" msgid="1317153498074308438">"<xliff:g id="COUNT">%1$d</xliff:g> колдонмонун баарын көрүү"</string>
-    <string name="recent_app_summary" msgid="3366446669844932300">"<xliff:g id="TIME">^1</xliff:g> мурун"</string>
     <string name="install_all_warning" product="tablet" msgid="8310489909586138165">"Планшетиңиз жана жеке дайындарыңыз белгисиз колдонмолордон зыян тартып калышы мүмкүн. Бул булактан келген колдонмолорду орнотуу менен, аларды пайдалануудан улам планшетиңизге кандайдыр бир зыян келтирилсе же дайындарыңызды жоготуп алсаңыз, өзүңүз жооптуу болосуз."</string>
     <string name="install_all_warning" product="default" msgid="1952257127370115988">"Телефонуңуз жана жеке дайындарыңыз белгисиз колдонмолордон зыян тартып калышы мүмкүн. Бул булактан келген колдонмолорду орнотуу менен, аларды пайдалануудан улам телефонуңузга кандайдыр бир зыян келтирилсе же дайындарыңызды жоготуп алсаңыз, өзүңүз жооптуу болосуз."</string>
     <string name="advanced_settings" msgid="1777249286757067969">"Өркүндөтүлгөн жөндөөлөр"</string>
@@ -1586,8 +1597,8 @@
     <string name="default_emergency_app" msgid="1951760659640369980">"Өзгөчө кырдаал колдонмосу"</string>
     <string name="reset_app_preferences" msgid="1321050641018356925">"Колдонмонун жөндөөлөрүн кайра коюу"</string>
     <string name="reset_app_preferences_title" msgid="6093179367325336662">"Колдонмо кайра баштан жөндөлсүнбү?"</string>
-    <string name="reset_app_preferences_desc" msgid="4822447731869201512">"Ушуну менен төмөнкү жөндөөлөр жоюлат:\n\n "<li>"Токтотулган колдонмолор"</li>\n" "<li>"Токтотулган колдонмолордун эскертмелери"</li>\n" "<li>"Демейки колдонмолор"</li>\n" "<li>"Фондук дайындарга коюлган чектөөлөр"</li>\n" "<li>"Бардык уруксат чектөөлөрү"</li>\n\n" Колдонмолордун дайындары жоголбойт."</string>
-    <string name="reset_app_preferences_button" msgid="2559089511841281242">"Колдонмолорду тазалоо"</string>
+    <string name="reset_app_preferences_desc" msgid="4822447731869201512">"Ушуну менен төмөнкү жөндөөлөр жоюлат:\n\n "<li>"Токтотулган колдонмолор"</li>\n" "<li>"Токтотулган колдонмолордун эскертмелери"</li>\n" "<li>"Демейки колдонмолор"</li>\n" "<li>"Фондук дайындарга коюлган чектөөлөр"</li>\n" "<li>"Бардык уруксат чектөөлөрү"</li>\n\n"Колдонмолордун дайындары жоголбойт."</string>
+    <string name="reset_app_preferences_button" msgid="2559089511841281242">"Баштапкы абалга келтирүү"</string>
     <string name="manage_space_text" msgid="8852711522447794676">"Бош орунду башкаруу"</string>
     <string name="filter" msgid="2018011724373033887">"Чыпка"</string>
     <string name="filter_dlg_title" msgid="8693024463731076091">"Электөө опцияларын тандаңыз"</string>
@@ -1712,7 +1723,7 @@
     <string name="language_input_gesture_summary_off" msgid="4617198819416948217"></string>
     <string name="language_settings" msgid="8758655933029560944">"Тилдер жана киргизүү ыкмасы"</string>
     <string name="language_keyboard_settings_title" msgid="3709159207482544398">"Тилдер жана киргизүү ыкмасы"</string>
-    <string name="input_assistance" msgid="7577795275222555487">"Текст киргизүүгө жардам"</string>
+    <string name="input_assistance" msgid="7577795275222555487">"Текст киргизүүдө жардам"</string>
     <string name="keyboard_settings_category" msgid="8275523930352487827">"Тергич жана киргизүү ыкмалары"</string>
     <string name="phone_language" msgid="7116581601133118044">"Тилдер"</string>
     <string name="phone_language_summary" msgid="3871309445655554211"></string>
@@ -1798,10 +1809,10 @@
     <string name="usage_time_label" msgid="295954901452833058">"Колдонулган убакыт"</string>
     <string name="accessibility_settings" msgid="3975902491934816215">"Атайын мүмкүнчүлүктөр"</string>
     <string name="accessibility_settings_title" msgid="2130492524656204459">"Атайын мүмкүнчүлүктөрдүн жөндөөлөрү"</string>
-    <string name="accessibility_settings_summary" msgid="981260486011624939">"Экрандагыны окугучтар, дисплей, карым-катнашты көзөмөлдөө"</string>
+    <string name="accessibility_settings_summary" msgid="981260486011624939">"Экрандагыны окугучтар, экран, башкаруу элементтери"</string>
     <string name="vision_settings_title" msgid="4204111425716868288">"Атайн мүмкүнчлктрдн жөндлр"</string>
     <string name="vision_settings_description" msgid="5679491180156408260">"Түзмөктү өзүңүзгө карап ыңгайлаштырып алыңыз. Бул атайын мүмкүнчүлүктөрдүн параметрлерин кийинчерээк өзгөртсөңүз болот."</string>
-    <string name="vision_settings_suggestion_title" msgid="917294957154878441">"Арип өлчөмүн чоңойтуу"</string>
+    <string name="vision_settings_suggestion_title" msgid="8058794060304707004">"Арип өлчөмүн өзгөртүү"</string>
     <string name="screen_reader_category_title" msgid="7739154903913400641">"Экрандагыны окугучтар"</string>
     <string name="audio_and_captions_category_title" msgid="3420727114421447524">"Аудио жана текстти окуп берүү"</string>
     <string name="display_category_title" msgid="685461049938269166">"Дисплей"</string>
@@ -1838,7 +1849,6 @@
     <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="preference_summary_default_combination" msgid="8532964268242666060">"<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>
@@ -1948,7 +1958,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>
@@ -1957,12 +1967,14 @@
     <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_whitelisted" msgid="7375400051141016808">"Колдонмону батареянын сарпталышына оптималдаштыруу мүмкүн эмес"</string>
+    <string name="background_activity_warning_dialog_title" msgid="2216249969149568871">"Фондогу аракеттери чектелсинби?"</string>
+    <string name="background_activity_warning_dialog_text" msgid="7049624449246121981">"Колдонмонун фондогу аракеттери чектелсе, ал туура эмес иштеп калышы мүмкүн"</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" msgid="6393929085382334341">"Толук кубатталгандан бери иштетилген колдонмолор (<xliff:g id="RELATIVE_TIME">^1</xliff:g>)"</string>
+    <string name="power_usage_list_summary_device" msgid="4461926045610455423">"Толук кубатталгандан бери түзмөктүн колдонулушу (<xliff:g id="RELATIVE_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>
@@ -2212,14 +2224,14 @@
     <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">"Эсептик дайындардын сактагычын пайдаланаардан мурун кулпуланган экранды ачуучу PIN кодду же сырсөздү коюшуңуз керек."</string>
+    <string name="credentials_configure_lock_screen_hint" msgid="8058230497337529036">"Эсептик дайындар сакталчу жерди колдонуудан мурда түзмөгүңүзгө коопсуз экран кулпусу коюлушу керек"</string>
+    <string name="credentials_configure_lock_screen_button" msgid="253239765216055321">"КУЛПУ КОЮУ"</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>
@@ -2339,8 +2351,6 @@
     <skip />
     <string name="cant_sync_dialog_title" msgid="2777238588398046285">"Кол менен синхрондоштуруу мүмкүн эмес"</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\'ду иштетүү үчүн, PIN\'иңизди киргизиңиз"</string>
     <string name="enter_pattern" msgid="4187435713036808566">"Android\'ду иштетүү үчүн, үлгүңүздү чийиңиз"</string>
@@ -2354,6 +2364,7 @@
     <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_plan_usage_manage_plans_button_text" msgid="8997761990902708162">"Тарифтик план-ы башкаруу"</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>
@@ -2417,7 +2428,7 @@
     <string name="data_usage_cycle_editor_title" msgid="1373797281540188533">"Статистика качан жаңырат"</string>
     <string name="data_usage_cycle_editor_subtitle" msgid="5512903797979928416">"Ар бир айдын күнү:"</string>
     <string name="data_usage_cycle_editor_positive" msgid="8821760330497941117">"Коюу"</string>
-    <string name="data_usage_warning_editor_title" msgid="3704136912240060339">"Трафик колдонууга эскертме коюу"</string>
+    <string name="data_usage_warning_editor_title" msgid="3704136912240060339">"Эскертүү жөндөөлөрү"</string>
     <string name="data_usage_limit_editor_title" msgid="9153595142385030015">"Трафикти чектөө"</string>
     <string name="data_usage_limit_dialog_title" msgid="3023111643632996097">"Трафикти чектөө"</string>
     <string name="data_usage_limit_dialog_mobile" product="tablet" msgid="4983487893343645667">"Белгиленген чекке жеткенде, планшетиңиз мобилдик Интернетти өчүрөт.\n\nПланшетиңиздин статистикасы менен байланыш операторунун статистикасы аздыр-көптүр айырмалангандыктан, чекти кабелтең коюңуз."</string>
@@ -2439,6 +2450,9 @@
     <string name="data_usage_metered_mobile" msgid="5423305619126978393">"Мобилдик түйүндөр"</string>
     <string name="data_usage_metered_wifi" msgid="1761738002328299714">"Тарифтелген Wi‑Fi тармактары"</string>
     <string name="data_usage_metered_wifi_disabled" msgid="727808462375941567">"Тарифтелген тармактарды тандоо үчүн, Wi‑Fi күйгүзүңүз."</string>
+    <string name="data_usage_metered_auto" msgid="1262028400911918865">"Автоматтык"</string>
+    <string name="data_usage_metered_yes" msgid="9217539611385225894">"Трафик ченелет"</string>
+    <string name="data_usage_metered_no" msgid="4025232961929071789">"Трафик ченелбейт"</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>
@@ -2523,16 +2537,13 @@
     <string name="user_credential_title" msgid="1954061209643070652">"Эсептик дайындардын чоо-жайы"</string>
     <string name="user_credential_removed" msgid="6514189495799401838">"Эсептик дайындар алынып салынды: <xliff:g id="CREDENTIAL_NAME">%s</xliff:g>"</string>
     <string name="user_credential_none_installed" msgid="3729607560420971841">"Бир да колдонуучунун эсептик дайындары орнотулган эмес"</string>
-    <string name="spellcheckers_settings_title" msgid="399981228588011501">"Ката текшергич"</string>
+    <string name="spellcheckers_settings_title" msgid="399981228588011501">"Орфографияны текшергич"</string>
     <string name="current_backup_pw_prompt" msgid="7735254412051914576">"Учурдагы сырсөздү териңиз"</string>
     <string name="new_backup_pw_prompt" msgid="8755501377391998428">"Жаңы сырсөздү териңиз"</string>
     <string name="confirm_new_backup_pw_prompt" msgid="3238728882512787864">"Жаңы сырсөздү бул жерге кайра киргизиңиз"</string>
     <string name="backup_pw_set_button_text" msgid="2387480910044648795">"Сырсөздү сактап коюу"</string>
     <string name="backup_pw_cancel_button_text" msgid="8845630125391744615">"Баш тартуу"</string>
     <string name="additional_system_update_settings_list_item_title" msgid="214987609894661992">"Кошумча тутум жаңртлары"</string>
-    <string name="selinux_status_disabled" msgid="924551035552323327">"Токтотулган"</string>
-    <string name="selinux_status_permissive" msgid="6004965534713398778">"Жол берүүчү"</string>
-    <string name="selinux_status_enforcing" msgid="2252703756208463329">"Мажбурлоо"</string>
     <string name="ssl_ca_cert_warning" msgid="2045866713601984673">"Желе көзөмөлдөнүшү мүмкүн"</string>
     <string name="done_button" msgid="1991471253042622230">"Даяр"</string>
     <plurals name="ssl_ca_cert_dialog_title" formatted="false" msgid="7145092748045794650">
@@ -2574,8 +2585,8 @@
     <string name="user_add_user_title" msgid="2108112641783146007">"Жаңы колдонуучу кошосузбу?"</string>
     <string name="user_add_user_message_long" msgid="8562152293752222985">"Кошумча колдонуучуларды түзүү менен, бул түзмөктү башкалар менен бөлүшө аласыз. Ар бир колдонуучунун өз мейкиндиги болуп, аны алар өз колдонмолору, тушкагазы ж.б.у.с. нерселер менен ыңгайлаштырып алышат. Колдонуучулар Wi‑Fi сыяктуу, ар кимге таасирин тийгизүүчү, түзмөк жөндөөлөрүн да тууралай алышат.\n\nЖаңы колдонуучу кошулганда, ал өз мейкиндигин түзүп алышы керек.\n\nКолдонмолорду бир колдонуучу калган бардык колдонуучулар үчүн да жаңырта алат."</string>
     <string name="user_add_user_message_short" msgid="1511354412249044381">"Жаңы колдонуучу кошулганда, ал өз мейкиндигин түзүп алышы керек.\n\nКолдонмолорду бир колдонуучу жаңыртканда, ал калган бардык колдонуучулар үчүн да жаңырат."</string>
-    <string name="user_setup_dialog_title" msgid="1765794166801864563">"Колдонуучуну азыр түзөлүбү?"</string>
-    <string name="user_setup_dialog_message" msgid="1004068621380867148">"Түзмөктү алып, өз мейкиндигин негиздей ала турган адамдын бар экенин текшериңиз"</string>
+    <string name="user_setup_dialog_title" msgid="1765794166801864563">"Профилди жөндөө керекпи?"</string>
+    <string name="user_setup_dialog_message" msgid="1004068621380867148">"Өз мейкиндигин жөндөп алышы үчүн түзмөктү колдонуучуга беришиңиз керек."</string>
     <string name="user_setup_profile_dialog_message" msgid="3896568553327558731">"Профайл азыр түзүлсүнбү?"</string>
     <string name="user_setup_button_setup_now" msgid="3391388430158437629">"Азыр түзүү"</string>
     <string name="user_setup_button_setup_later" msgid="3068729597269172401">"Азыр эмес"</string>
@@ -2641,7 +2652,7 @@
     <string name="restriction_menu_change_pin" msgid="740081584044302775">"PIN алмаштыруу"</string>
     <string name="app_notifications_switch_label" msgid="9124072219553687583">"Эскертүүнү көргөзүү"</string>
     <string name="help_label" msgid="6886837949306318591">"Жардам/пикир билдирүү"</string>
-    <string name="support_summary" msgid="2705726826263742491">"Жардам макалалары, телефон жана чат, баштадык"</string>
+    <string name="support_summary" msgid="2705726826263742491">"Жардам макалалары, телефон жана чат аркылуу колдоо көрсөтүү"</string>
     <string name="user_account_title" msgid="1127193807312271167">"Мазмун үчүн эсеп"</string>
     <string name="user_picture_title" msgid="7297782792000291692">"Сүрөттүн ID\'си"</string>
     <string name="extreme_threats_title" msgid="6549541803542968699">"Олуттуу коркунучтар"</string>
@@ -2730,6 +2741,7 @@
       <item quantity="other">Жашырылган %d нерсе көрсөтүлсүн</item>
       <item quantity="one">Жашырылган %d нерсе көрсөтүлсүн</item>
     </plurals>
+    <string name="dashboard_suggestion_condition_footer_content_description" msgid="2898588191174845961">"Жыйыштыруу"</string>
     <string name="network_dashboard_title" msgid="4771589228992391573">"Тармак жана Интернет"</string>
     <string name="network_dashboard_summary_mobile" msgid="3851083934739500429">"мобилдик"</string>
     <string name="network_dashboard_summary_data_usage" msgid="3843261364705042212">"дайындардын колдонулушу"</string>
@@ -2803,9 +2815,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>
@@ -2832,8 +2844,14 @@
       <item quantity="other"><xliff:g id="ON_COUNT">%d</xliff:g> эреже автоматтык түрдө иштейт</item>
       <item quantity="one">1 эреже автоматтык түрдө иштейт</item>
     </plurals>
-    <string name="zen_mode_settings_title" msgid="842308776768942600">"\"Тынчымды алба\" жөндөөлөрү"</string>
-    <string name="zen_mode_priority_settings_title" msgid="2623117023031824309">"Шашылыш эскертмелер гана"</string>
+    <string name="zen_mode_settings_title" msgid="1066226840983908121">"Тынчымды алба"</string>
+    <string name="zen_mode_behavior_settings_title" msgid="1463303933529313969">"Аракеттери"</string>
+    <string name="zen_mode_behavior_allow_title" msgid="3845615648136218141">"Үндөр жана дирилдөөгө уруксат"</string>
+    <string name="zen_mode_behavior_no_sound" msgid="1219626004723208056">"Добушу жок"</string>
+    <string name="zen_mode_behavior_total_silence" msgid="6716603819806610626">"Добушу жок (Тымтырс)"</string>
+    <string name="zen_mode_behavior_no_sound_except" msgid="4968477585788243114">"<xliff:g id="CATEGORIES">%1$s</xliff:g> катег-н башка добуш чыкпасын"</string>
+    <!-- no translation found for zen_mode_behavior_alarms_only (2423480992071472963) -->
+    <skip />
     <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>
@@ -2875,13 +2893,15 @@
     <string name="notifications_title" msgid="8086372779371204971">"Эскертмелер"</string>
     <string name="app_notifications_title" msgid="5810577805218003760">"Колдонмо эскертмелери"</string>
     <string name="notification_channel_title" msgid="2260666541030178452">"Эскертменин категориясы"</string>
+    <string name="notification_group_title" msgid="7180506440133859601">"Эскертменин категория тобу"</string>
     <string name="notification_importance_title" msgid="848692592679312666">"Маанилүүлүгү"</string>
-    <string name="notification_importance_unspecified" msgid="2196023702875112081">"Колдонмо өзү чечим чыгарсын"</string>
+    <string name="notification_importance_unspecified" msgid="6622173510486113958">"Добуш чыгарууга уруксат берүү"</string>
     <string name="notification_importance_blocked" msgid="7938180808339386300">"Эскертмелер эч качан көрсөтүлбөсүн"</string>
     <string name="notification_importance_min" msgid="5455049524984686275">"Добуш да чыгарбасын, экранда да көрсөтүлбөсүн"</string>
     <string name="notification_importance_low" msgid="8881468429453766553">"Добушу жок"</string>
     <string name="notification_importance_default" msgid="5958338024601957516">"Добуш чыгарсын"</string>
     <string name="notification_importance_high" msgid="2082429479238228527">"Добуш менен экранга калкып чыксын"</string>
+    <string name="notification_importance_high_silent" msgid="2667033773703765252">"Экранга калкып чыксын"</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>
@@ -2893,7 +2913,7 @@
     <string name="notification_channel_summary_default" msgid="1111749130423589931">"Маанилүү"</string>
     <string name="notification_channel_summary_high" msgid="2085017556511003283">"Өтө маанилүү"</string>
     <string name="default_notification_assistant" msgid="7631945224761430146">"Эскертме жардамчысы"</string>
-    <string name="manage_notification_access_title" msgid="7510080164564944891">"Эскертмелерди ишт мүмкүнчлгү"</string>
+    <string name="manage_notification_access_title" msgid="7510080164564944891">"Эскертмелерди иштетүү"</string>
     <string name="work_profile_notification_access_blocked_summary" msgid="8748026238701253040">"Жумуш профилинин эскертмелерине кирүү бөгөттөлгөн"</string>
     <string name="manage_notification_access_summary_zero" msgid="2409912785614953348">"Колдонмолор эскертмелерди окуй алышпайт"</string>
     <plurals name="manage_notification_access_summary_nonzero" formatted="false" msgid="7930130030691218387">
@@ -2924,8 +2944,13 @@
     <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="channel_group_notifications_off_desc" msgid="1620950416247316370">"Android тутуму ушул топтогу эскертмелерди бул түзмөктөн көрсөтпөй, бөгөттөп жатат"</string>
     <string name="notification_channels" msgid="5346841743182627500">"Категориялар"</string>
     <string name="notification_channels_other" msgid="5645317113885788226">"Башка"</string>
+    <plurals name="notification_group_summary" formatted="false" msgid="3420621520561455358">
+      <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="no_channels" msgid="3077375508177744586">"Бул колдонмо эч кандай эскертме берген жок"</string>
     <string name="app_settings_link" msgid="8894946007543660906">"Колдонмонун кошумча жөндөөлөрү"</string>
     <string name="app_notification_listing_summary_zero" msgid="6482582965081108108">"Бардык колдонмолор үчүн күйгүзүлгөн"</string>
@@ -2946,7 +2971,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>
@@ -2989,7 +3014,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>
@@ -3002,12 +3027,14 @@
     <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>
+    <!-- no translation found for zen_mode_media_system_other (8900209390529859777) -->
+    <skip />
     <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="239685342222975733">"Эгер бир эле адам <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>
@@ -3036,9 +3063,10 @@
     <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="suggestion_button_text" msgid="3275010948381252006">"Жарайт"</string>
     <string name="device_feedback" msgid="3238056036766293294">"Бул түзмөк жөнүндө пикир жөнөтүү"</string>
     <string name="restr_pin_enter_admin_pin" msgid="1085834515677448072">"Администратордун PIN кодун киргизиңиз"</string>
-    <string name="switch_on_text" msgid="1124106706920572386">"Күйгүзүлгөн"</string>
+    <string name="switch_on_text" msgid="1124106706920572386">"Күйүк"</string>
     <string name="switch_off_text" msgid="1139356348100829659">"Өчүк"</string>
     <string name="screen_pinning_title" msgid="2292573232264116542">"Колдонмону кадоо"</string>
     <string name="screen_pinning_description" msgid="3360904523688769289">"Бул жөндөө аркылуу бир колдонмодон экинчисине өтүү мүмкүнчүлүгүн өчүрүп койсо болот.\n\nАл үчүн:\n\n1. Колдонмону кадоо функциясын иштетиңиз.\n\n2. Керектүү экранды ачыңыз.\n\n3. Көз жүгүртүүнү таптаңыз.\n\n4. Экранды жогору сүрүп, төөнөгүч сөлөкөтүнө тийип коюңуз."</string>
@@ -3220,6 +3248,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="sms_mirroring_pref" msgid="6475043279147376031">"SMS билдирүүлөрдү чагылдыруу"</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>
@@ -3286,7 +3315,7 @@
     <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="permit_write_settings" msgid="658555006453212691">"Тутум жөндөөлөрүн өзгөртүүгө уруксат берүү"</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>
@@ -3381,9 +3410,12 @@
     <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">"Telephony Monitor функциясын колдонуу үчүн түзмөктү өчүрүп-күйгүзүү керек"</string>
+    <string name="connectivity_monitor_switch" msgid="9059759348648583421">"Connectivity Monitor"</string>
+    <string name="connectivity_monitor_switch_summary" msgid="2828658652378866401">"ConnectivityMonitor туташуу функцияларында көйгөй тапса, анын таржымалын аныктайт жана мүчүлүштүк тууралуу кабарлоо үчүн колдонуучуга эскертме жөнөтөт"</string>
+    <string name="connectivity_monitor_toast" msgid="5551859612881173028">"Connectivity Monitor функциясын колдонуу үчүн түзмөктү өчүрүп-күйгүзүү керек"</string>
     <string name="camera_hal_hdrplus_switch" msgid="8377365197105267466">"HAL HDR+ камера режими"</string>
     <string name="camera_hal_hdrplus_toast" msgid="2063703797270055299">"HAL HDR+ камера режимин колдонуу үчүн түзмөктү өчүрүп-күйгүзүңүз"</string>
+    <string name="camera_laser_sensor_switch" msgid="8913588990743234440">"Камеранын лазердик сенсору"</string>
     <string name="ota_disable_automatic_update" msgid="2319639631655915050">"Автоматтык тутум жаңыртуулары"</string>
     <string name="usage" msgid="2977875522080448986">"Дайындардын өткөрүлүшү"</string>
     <string name="cellular_data_usage" msgid="2155683719898158203">"Мобилдик трафик"</string>
@@ -3409,7 +3441,7 @@
     <string name="data_warning" msgid="209133958008062117">"Эскертүүлөр"</string>
     <string name="set_data_limit" msgid="2901526323210516923">"Трафикти чектөө"</string>
     <string name="data_limit" msgid="1885406964934590552">"Чектелген трафик"</string>
-    <string name="data_usage_template" msgid="392191945602400904">"<xliff:g id="ID_2">%2$s</xliff:g> аралыгында <xliff:g id="ID_1">%1$s</xliff:g> колдонулду"</string>
+    <string name="data_usage_template" msgid="2923744765873163859">"<xliff:g id="ID_2">%2$s</xliff:g> аралыгында <xliff:g id="ID_1">%1$s</xliff:g> колдонулду"</string>
     <string name="configure" msgid="1029654422228677273">"Конфигурациялоо"</string>
     <string name="data_usage_other_apps" msgid="3272872663517382050">"Трафикти колдонуучу башка колдонмолор"</string>
     <plurals name="data_saver_unrestricted_summary" formatted="false" msgid="2635267833484232703">
@@ -3438,7 +3470,7 @@
     <string name="not_battery_optimizing" msgid="5362861851864837617">"Батареянын кубатын үнөмдөө функциясы колдонулбай эле"</string>
     <string name="lockscreen_remote_input" msgid="969871538778211843">"Түзмөк кулпуланып турса, эскертмелерде жооптор жана башка тексттер жазылбасын"</string>
     <string name="default_spell_checker" msgid="8506899870026026660">"Демейки орфография текшергич"</string>
-    <string name="choose_spell_checker" msgid="6596539862291699367">"Орфография текшергич тандаңыз"</string>
+    <string name="choose_spell_checker" msgid="6596539862291699367">"Орфографияны текшергич тандаңыз"</string>
     <string name="spell_checker_not_selected" msgid="8871083796179200696">"Тандалган жок"</string>
     <string name="notification_log_no_title" msgid="5678029849672024215">"(эч бири)"</string>
     <string name="notification_log_details_delimiter" msgid="3116559361552416747">": "</string>
@@ -3478,7 +3510,7 @@
     <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="387052719462473500">"Кулпуланган экрандагы маалыматты көзөмөлдөө"</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="8483187649355540109">"Колдоо жана кеңештер"</string>
@@ -3486,7 +3518,7 @@
     <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>
+    <string name="bluetooth_disabled" msgid="6244000672828617410">"Өчүк"</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>
@@ -3565,17 +3597,17 @@
     <string name="ambient_display_title" product="device" msgid="3423781975742145894">"Түзмөктү текшерүү үчүн эки жолу таптаңыз"</string>
     <string name="ambient_display_summary" msgid="525662960806416373">"Убакытты, эскертме сүрөтчөлөрүн жана башка маалыматты көрүү үчүн экраныңызды эки жолу таптаңыз."</string>
     <string name="ambient_display_suggestion_summary" msgid="5987443721392571847">"Эскертмелерди экран өчүп турганда көрүү"</string>
-    <string name="ambient_display_pickup_title" product="default" msgid="818688002837687268">"Эскертмелерди текшерүү үчүн телефонду көтөрүңүз"</string>
+    <string name="ambient_display_pickup_title" product="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="4567020486787561873">"Убакытты, эскертме сүрөтчөлөрүн жана башка маалыматты көрүү үчүн телефонуңузду колуңузга алыңыз."</string>
     <string name="ambient_display_pickup_summary" product="tablet" msgid="5435283849947236648">"Убакытты, эскертме сүрөтчөлөрүн жана башка маалыматты көрүү үчүн планшетиңизди колуңузга алыңыз."</string>
     <string name="ambient_display_pickup_summary" product="device" msgid="8256669101643381568">"Убакытты, эскертме сүрөтчөлөрүн жана башка маалыматты көрүү үчүн түзмөгүңүздү колуңузга алыңыз."</string>
     <string name="ambient_display_pickup_suggestion_summary" msgid="7014700589991761035">"Эскертмелерди экран өчүп турганда көрүү"</string>
-    <string name="fingerprint_swipe_for_notifications_title" msgid="5816346492253270243">"Эскертмелерди көрүү үчүн экранды манжаңыз менен серпип коюңуз"</string>
-    <string name="fingerprint_swipe_for_notifications_summary" product="default" msgid="1770661868393713922">"Эскертмелериңизди текшерүү үчүн телефонуңуздун арткы бетиндеги манжа изинин сенсорун төмөн карай серпип коюңуз."</string>
-    <string name="fingerprint_swipe_for_notifications_summary" product="tablet" msgid="902719947767712895">"Эскертмелериңизди текшерүү үчүн планшетиңиздин арткы бетиндеги манжа изинин сенсорун төмөн карай серпип коюңуз."</string>
-    <string name="fingerprint_swipe_for_notifications_summary" product="device" msgid="5372926094116306647">"Эскертмелериңизди текшерүү үчүн түзмөгүңүздүн арткы бетиндеги манжа изинин сенсорун төмөн карай серпип коюңуз."</string>
+    <string name="fingerprint_swipe_for_notifications_title" msgid="5816346492253270243">"Эскертмелерди көрүү үчүн манжа изинин сенсорун колдонуу"</string>
+    <string name="fingerprint_swipe_for_notifications_summary" product="default" msgid="1770661868393713922">"Эскертмелериңизди текшерүү үчүн телефондун аркасындагы манжа изинин сенсорун ылдый сүртүп коюңуз"</string>
+    <string name="fingerprint_swipe_for_notifications_summary" product="tablet" msgid="902719947767712895">"Эскертмелериңизди текшерүү үчүн планшеттин аркасындагы манжа изинин сенсорун ылдый сүртүп коюңуз."</string>
+    <string name="fingerprint_swipe_for_notifications_summary" product="device" msgid="5372926094116306647">"Эскертмелериңизди текшерүү үчүн түзмөктүн аркасындагы манжа изинин сенсорун ылдый сүртүп коюңуз."</string>
     <string name="fingerprint_swipe_for_notifications_suggestion_title" msgid="1677291167470357802">"Эскертмелерди тез көрүү"</string>
     <string name="fingerprint_swipe_for_notifications_suggestion_summary" msgid="127592803294414082">"Манжа изинин сенсорун ылдый серпиңиз"</string>
     <string name="gesture_setting_on" msgid="3455094265233870280">"Күйүк"</string>
@@ -3588,7 +3620,7 @@
     <string name="web_action_enable_title" msgid="4051513950976670853">"Ыкчам ачылуучу колдонмолор"</string>
     <string name="web_action_enable_summary" msgid="3108127559723396382">"Орнотулган эмес болсо да, колдонмолордогу шилтемелерди ачыңыз"</string>
     <string name="web_action_section_title" msgid="7364647086538399136">"Ыкчам ачылуучу колдонмолор"</string>
-    <string name="instant_apps_account" msgid="1433620209791992528">"Ыкчам ачылуучу колдонмолордун каттоо эсеби"</string>
+    <string name="instant_apps_settings" msgid="8827777916518348213">"Ыкчам ачылуучу колдонмолордун параметрлери"</string>
     <string name="domain_url_section_title" msgid="7046835219056428883">"Орнотулган колдонмолор"</string>
     <string name="automatic_storage_manager_activation_warning" msgid="6353100011690933254">"Учурда сактагычыңыз сактагычты көзөмөлдөгүч тарабынан башкарылууда"</string>
     <string name="account_for_section_header" msgid="5356566418548737121">"<xliff:g id="USER_NAME">%1$s</xliff:g> каттоо эсептери"</string>
@@ -3635,7 +3667,9 @@
     <string name="enterprise_privacy_always_on_vpn_personal" msgid="9217774730260037434">"Дайым иштеген VPN жеке профилиңизде күйгүзүлдү"</string>
     <string name="enterprise_privacy_always_on_vpn_work" msgid="7244472958208315814">"Дайым иштеген VPN жумуш профилиңизде күйгүзүлдү"</string>
     <string name="enterprise_privacy_global_http_proxy" msgid="7936664553416257333">"Глобалдык HTTP проксиси орнотулду"</string>
-    <string name="enterprise_privacy_ca_certs" msgid="5885892204903688909">"Ишенимдүү эсептик дайындар"</string>
+    <string name="enterprise_privacy_ca_certs_device" msgid="2019652712782510262">"Ишенимдүү эсептик дайындар"</string>
+    <string name="enterprise_privacy_ca_certs_personal" msgid="2279084820904076599">"Жеке профилиңиздеги ишенимдүү эсептик дайындар"</string>
+    <string name="enterprise_privacy_ca_certs_work" msgid="6187377647815301809">"Жумуш профилиңиздеги ишенимдүү эсептик дайындар"</string>
     <plurals name="enterprise_privacy_number_ca_certs" formatted="false" msgid="526375234629534165">
       <item quantity="other">Кеминде <xliff:g id="COUNT_1">%d</xliff:g> ТБ тастыктамасы</item>
       <item quantity="one">Кеминде <xliff:g id="COUNT_0">%d</xliff:g> ТБ тастыктамасы</item>
@@ -3698,6 +3732,8 @@
     <string name="carrier_provisioning" msgid="4398683675591893169">"Байланыш оператору жөнүндө маалымат"</string>
     <string name="trigger_carrier_provisioning" msgid="3434865918009286187">"Байланыш операторун өзгөртүү"</string>
     <string name="new_device_suggestion_title" msgid="698847081680980774">"Эмне жаңылык бар?"</string>
-    <string name="new_device_suggestion_summary" msgid="7172709269203435870">"Мыкты 5 функцияны карап чыгыңыз"</string>
+    <string name="new_device_suggestion_summary" product="default" msgid="206396571522515855">"Жаңы телефонуңузду карап чыгыңыз"</string>
+    <string name="new_device_suggestion_summary" product="tablet" msgid="393751455688210956">"Жаңы планшетиңизди карап чыгыңыз"</string>
+    <string name="new_device_suggestion_summary" product="device" msgid="2939870049868336652">"Жаңы түзмөгүңүзду карап чыгыңыз"</string>
     <string name="disabled_low_ram_device" msgid="3751578499721173344">"Бул функция бул түзмөктө иштебейт"</string>
 </resources>
diff --git a/res/values-lo/arrays.xml b/res/values-lo/arrays.xml
index fbc8104..546db87 100644
--- a/res/values-lo/arrays.xml
+++ b/res/values-lo/arrays.xml
@@ -100,8 +100,6 @@
     <!-- no translation found for wifi_security_no_eap:0 (2084555984818107151) -->
     <!-- no translation found for wifi_security_no_eap:1 (397579322683471524) -->
     <!-- no translation found for wifi_security_no_eap:2 (1968820975358150484) -->
-    <!-- no translation found for wifi_ap_security:0 (5251664683198623324) -->
-    <!-- no translation found for wifi_ap_security:1 (7989073072260294673) -->
   <string-array name="wifi_eap_method">
     <item msgid="1160193392455075561">"PEAP"</item>
     <item msgid="7981731051382306293">"TLS"</item>
diff --git a/res/values-lo/strings.xml b/res/values-lo/strings.xml
index dd90086..0c00b65 100644
--- a/res/values-lo/strings.xml
+++ b/res/values-lo/strings.xml
@@ -166,7 +166,7 @@
     <string name="bluetooth_map_acceptance_dialog_text" msgid="8712508202081143737">"%1$s ຕ້ອງການສິດເພື່ອເຂົ້າໄປຂໍ້ຄວາມຂອງທ່ານ. ໃຫ້ສິດແກ່ %2$s ຫຼືບໍ່?"</string>
     <string name="bluetooth_sap_request" msgid="2669762224045354417">"ການ​ຂໍ​ເຂົ້າ​ຫາ SIM"</string>
     <string name="bluetooth_sap_acceptance_dialog_text" msgid="4414253873553608690">"<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g> ຕ້ອງ​ການ​ເຂົ້າ​ຫາ​ແຜ່ນ SIM ຂອງ​ທ່ານ. ການ​ໃຫ້​ການ​ເຂົ້າ​ເຖິງ​ແຜ່ນ SIM ຈະ​ປິດ​ໃຊ້​ງານ​ການ​ເຊື່ອມ​ຕໍ່​ຂໍ້​ມູນ​ຢູ່​ໃນ​ອຸ​ປະ​ກອນ​ຂອງ​ທ່ານ​ສຳ​ລັບ​ໄລ​ຍະ​ເວ​ລາ​ຂອງ​ການ​ເຊື່ອມ​ຕໍ່. ໃຫ້​ການ​ເຂົ້າ​ຫາ <xliff:g id="DEVICE_NAME_1">%2$s?</xliff:g>"</string>
-    <string name="bluetooth_device_name_summary" msgid="4757990010751789977">"ສະແດງເປັນ \'<xliff:g id="DEVICE_NAME">^1</xliff:g>\' ໃຫ້ອຸປະກອນອື່ນເຫັນ"</string>
+    <string name="bluetooth_device_name_summary" msgid="522235742194965734">"ສະແດງເປັນ \'<xliff:g id="DEVICE_NAME">^1</xliff:g>\' ໃຫ້ອຸປະກອນອື່ນເຫັນ"</string>
     <string name="bluetooth_paired_device_title" msgid="8638994696317952019">"ອຸປະກອນຂອງທ່ານ"</string>
     <string name="bluetooth_pairing_page_title" msgid="7712127387361962608">"ຈັບຄູ່ອຸປະກອນໃໝ່"</string>
     <string name="date_and_time" msgid="9062980487860757694">"ວັນ​ທີ &amp; ເວ​ລາ"</string>
@@ -312,6 +312,8 @@
     <string name="zone_auto" msgid="334783869352026648">"ຕັ້ງເຂດເວລາອັດຕະໂນມັດ"</string>
     <string name="zone_auto_summaryOn" msgid="6142830927278458314">"ໃຊ້ເຂດເວລາທີ່ລະບຸໂດຍເຄືອຂ່າຍ"</string>
     <string name="zone_auto_summaryOff" msgid="2597745783162041390">"ໃຊ້ເຂດເວລາທີ່ລະບຸໂດຍເຄືອຂ່າຍ"</string>
+    <string name="date_time_24hour_auto" msgid="2117383168985653422">"ຮູບແບບ 24 ຊົ່ວໂມງອັດຕະໂນມັດ"</string>
+    <string name="date_time_24hour_auto_summary" msgid="6351812925651480277">"ໃຊ້ຄ່າເລີ່ມຕົ້ນຂອງຂົງເຂດ"</string>
     <string name="date_time_24hour_title" msgid="3203537578602803850">"ຮູບ​ແບບ​ເວ​ລາ 24 ຊົ່ວ​ໂມງ"</string>
     <string name="date_time_24hour" msgid="1193032284921000063">"ໃຊ້ຮູບແບບ 24 ຊົ່ວໂມງ"</string>
     <string name="date_time_set_time_title" msgid="6296795651349047016">"ເວລາ"</string>
@@ -372,6 +374,9 @@
     <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="1961957425135180242">"ຕໍ່ໄປ"</string>
+    <string name="setup_fingerprint_enroll_skip_title" msgid="362050541117362034">"ຂ້າມລາຍນິ້ວມືບໍ?"</string>
+    <string name="setup_fingerprint_enroll_skip_after_adding_lock_text" msgid="958990414356204763">"ການຕັ້ງຄ່າລາຍນິ້ວມືຈະໃຊ້ເວລາພຽງໜຶ່ງ ຫຼື ສອງນາທີເທົ່ານັ້ນ. ຫາກທ່ານຂ້າມຂັ້ນຕອນນີ້, ທ່ານຈະສາມາດເພີ່ມລາຍນິ້ວມືໄດ້ໃນພາຍຫຼັງໂດຍການໄປທີ່ການຕັ້ງຄ່າ."</string>
+    <string name="lock_screen_intro_skip_title" msgid="4988210105913705679">"ຂ້າມໜ້າຈໍລັອກບໍ?"</string>
     <string name="lock_screen_intro_skip_dialog_text_frp" product="tablet" msgid="1581834104051243425">"ບໍ່ສາມາດເປີດຄຸນສົມບັດການປ້ອງກັນອຸປະກອນໄດ້. ທ່ານຈະບໍ່ສາມາດປ້ອງກັນບໍ່ໃຫ້ຄົນອື່ນໃຊ້ແທັບເລັດນີ້ໄດ້ຫາກມັນເສຍ, ຖືກລັກ ຫຼື ຖືກຣີເຊັດ."</string>
     <string name="lock_screen_intro_skip_dialog_text_frp" product="device" msgid="4629503416877189572">"ບໍ່ສາມາດເປີດຄຸນສົມບັດການປ້ອງກັນອຸປະກອນໄດ້. ທ່ານຈະບໍ່ສາມາດປ້ອງກັນບໍ່ໃຫ້ຄົນອື່ນໃຊ້ອຸປະກອນນີ້ໄດ້ຫາກມັນເສຍ, ຖືກລັກ ຫຼື ຖືກຣີເຊັດ."</string>
     <string name="lock_screen_intro_skip_dialog_text_frp" product="default" msgid="2423428240245737909">"ບໍ່ສາມາດເປີດຄຸນສົມບັດການປ້ອງກັນອຸປະກອນໄດ້. ທ່ານຈະບໍ່ສາມາດປ້ອງກັນບໍ່ໃຫ້ຄົນອື່ນໃຊ້ໂທລະສັບນີ້ໄດ້ຫາກມັນເສຍ, ຖືກລັກ ຫຼື ຖືກຣີເຊັດ."</string>
@@ -457,7 +462,7 @@
     <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="lock_settings_picker_fingerprint_added_security_message" msgid="5768002109707648463">"ເພື່ອຄວາມປອດໄພທີ່ເພີ່ມຂຶ້ນ, ໃຫ້ຕັ້ງໜ້າຈໍລັອກແບບສຳຮອງໄວ້."</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>
@@ -499,29 +504,37 @@
     <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>
-    <!-- no translation found for unlock_disable_frp_warning_content_pattern_fingerprint (2986105377420905314) -->
-    <skip />
+    <string name="unlock_disable_frp_warning_content_pattern_fingerprint" msgid="2986105377420905314">"ຄຸນສົມບັດການປ້ອງກັນອຸປະກອນຈະບໍ່ເຮັດວຽກຫາກບໍ່ລະບຸຮູບແບບປົດລັອກຂອງທ່ານ.<xliff:g id="EMPTY_LINE">
+
+</xliff:g>ລາຍນິ້ວມືທີ່ທ່ານບັນທຶກໄວ້ຈະຖືກລຶບອອກຈາກອຸປະກອນນີ້ນຳ ແລະ ທ່ານຈະບໍ່ສາມາດປົດລັອກໂທລະສັບຂອງທ່ານ, ອະນຸມັດການສັ່ງຊື້ ຫຼື ເຂົ້າສູ່ລະບົບແອັບໄດ້."</string>
     <string name="unlock_disable_frp_warning_content_pin" msgid="586996206210265131">"ຄຸນສົມບັດການປົກປ້ອງອຸປະກອນຈະໃຊ້ບໍ່ໄດ້ຫາກບໍ່ມີລະຫັດ PIN ຂອງທ່ານ."</string>
-    <!-- no translation found for unlock_disable_frp_warning_content_pin_fingerprint (3370462835533123695) -->
-    <skip />
+    <string name="unlock_disable_frp_warning_content_pin_fingerprint" msgid="3370462835533123695">"ຄຸນສົມບັດການປ້ອງກັນອຸປະກອນຈະບໍ່ເຮັດວຽກຫາກບໍ່ລະບຸລະຫັດ PIN ຂອງທ່ານ.<xliff:g id="EMPTY_LINE">
+
+</xliff:g>ລາຍນິ້ວມືທີ່ທ່ານບັນທຶກໄວ້ຈະຖືກລຶບອອກຈາກອຸປະກອນນີ້ນຳ ແລະ ທ່ານຈະບໍ່ສາມາດປົດລັອກອຸປະກອນຂອງທ່ານ, ອະນຸມັດການສັ່ງຊື້ ຫຼື ເຂົ້າສູ່ລະບົບແອັບໄດ້."</string>
     <string name="unlock_disable_frp_warning_content_password" msgid="5420612686852555537">"ຄຸນສົມບັດການປົກປ້ອງອຸປະກອນຈະໃຊ້ງານບໍ່ໄດ້ ໂດຍບໍ່ມີລະຫັດຜ່ານຂອງທ່ານ."</string>
-    <!-- no translation found for unlock_disable_frp_warning_content_password_fingerprint (3595476296430536798) -->
-    <skip />
+    <string name="unlock_disable_frp_warning_content_password_fingerprint" msgid="3595476296430536798">"ຄຸນສົມບັດການປ້ອງກັນອຸປະກອນຈະບໍ່ເຮັດວຽກຫາກບໍ່ລະບຸລະຫັດຜ່ານຂອງທ່ານ.<xliff:g id="EMPTY_LINE">
+
+</xliff:g>ລາຍນິ້ວມືທີ່ທ່ານບັນທຶກໄວ້ຈະຖືກລຶບອອກຈາກອຸປະກອນນີ້ນຳ ແລະ ທ່ານຈະບໍ່ສາມາດປົດລັອກໂທລະສັບຂອງທ່ານ, ອະນຸມັດການສັ່ງຊື້ ຫຼື ເຂົ້າສູ່ລະບົບແອັບໄດ້."</string>
     <string name="unlock_disable_frp_warning_content_unknown" msgid="1550718040483548220">"ຄຸນສົມບັດການປົກປ້ອງອຸປະກອນຈະໃຊ້ງານບໍ່ໄດ້ໂດຍບໍ່ມີການລັອກໜ້າຈໍຂອງທ່ານ."</string>
-    <!-- no translation found for unlock_disable_frp_warning_content_unknown_fingerprint (3679351662094349506) -->
-    <skip />
+    <string name="unlock_disable_frp_warning_content_unknown_fingerprint" msgid="3679351662094349506">"ຄຸນສົມບັດການປ້ອງກັນອຸປະກອນຈະບໍ່ເຮັດວຽກຫາກບໍ່ລະບຸໜ້າຈໍລັອກຂອງທ່ານ.<xliff:g id="EMPTY_LINE">
+
+</xliff:g>ລາຍນິ້ວມືທີ່ທ່ານບັນທຶກໄວ້ຈະຖືກລຶບອອກຈາກອຸປະກອນນີ້ນຳ ແລະ ທ່ານຈະບໍ່ສາມາດປົດລັອກອຸປະກອນຂອງທ່ານ, ອະນຸມັດການສັ່ງຊື້ ຫຼື ເຂົ້າສູ່ລະບົບແອັບໄດ້."</string>
     <string name="unlock_disable_frp_warning_content_pattern_profile" msgid="8682200103576359918">"ຄຸນສົມບັດການປົກປ້ອງໂປຣໄຟລ໌ຈະໃຊ້ບໍ່ໄດ້ໂດຍບໍ່ມີແບບຮູບຂອງທ່ານ."</string>
-    <!-- no translation found for unlock_disable_frp_warning_content_pattern_fingerprint_profile (6718155854303231675) -->
-    <skip />
+    <string name="unlock_disable_frp_warning_content_pattern_fingerprint_profile" msgid="6718155854303231675">"ຄຸນສົມບັດການປ້ອງກັນໂປຣໄຟລ໌ຈະບໍ່ເຮັດວຽກຫາກບໍ່ລະບຸຮູບແບບປົດລັອກຂອງທ່ານ.<xliff:g id="EMPTY_LINE">
+
+</xliff:g>ລາຍນິ້ວມືທີ່ທ່ານບັນທຶກໄວ້ຈະຖືກລຶບອອກຈາກອຸປະກອນນີ້ນຳ ແລະ ທ່ານຈະບໍ່ສາມາດປົດລັອກໂປຣໄຟລ໌ຂອງທ່ານ, ອະນຸມັດການສັ່ງຊື້ ຫຼື ເຂົ້າສູ່ລະບົບແອັບໄດ້."</string>
     <string name="unlock_disable_frp_warning_content_pin_profile" msgid="7790688070593867767">"ຄຸນສົມບັດການປົກປ້ອງໂປຣໄຟລ໌ຈະໃຊ້ບໍ່ໄດ້ຫາກບໍ່ມີ PIN ຂອງທ່ານ."</string>
-    <!-- no translation found for unlock_disable_frp_warning_content_pin_fingerprint_profile (4209564603132870532) -->
-    <skip />
+    <string name="unlock_disable_frp_warning_content_pin_fingerprint_profile" msgid="4209564603132870532">"ຄຸນສົມບັດການປ້ອງກັນໂປຣໄຟລ໌ຈະບໍ່ເຮັດວຽກຫາກບໍ່ລະບຸລະຫັດ PIN ຂອງທ່ານ.<xliff:g id="EMPTY_LINE">
+
+</xliff:g>ລາຍນິ້ວມືທີ່ທ່ານບັນທຶກໄວ້ຈະຖືກລຶບອອກຈາກອຸປະກອນນີ້ນຳ ແລະ ທ່ານຈະບໍ່ສາມາດປົດລັອກໂປຣໄຟລ໌ຂອງທ່ານ, ອະນຸມັດການສັ່ງຊື້ ຫຼື ເຂົ້າສູ່ລະບົບແອັບໄດ້."</string>
     <string name="unlock_disable_frp_warning_content_password_profile" msgid="7569285520567674461">"ຄຸນສົມບັດການປົກປ້ອງໂປຣໄຟລ໌ຈະໃຊ້ບໍ່ໄດ້ຫາກບໍ່ມີລະຫັດຜ່ານຂອງທ່ານ."</string>
-    <!-- no translation found for unlock_disable_frp_warning_content_password_fingerprint_profile (2994300676764706047) -->
-    <skip />
+    <string name="unlock_disable_frp_warning_content_password_fingerprint_profile" msgid="2994300676764706047">"ຄຸນສົມບັດການປ້ອງກັນໂປຣໄຟລ໌ຈະບໍ່ເຮັດວຽກຫາກບໍ່ລະບຸລະຫັດຜ່ານຂອງທ່ານ.<xliff:g id="EMPTY_LINE">
+
+</xliff:g>ລາຍນິ້ວມືທີ່ທ່ານບັນທຶກໄວ້ຈະຖືກລຶບອອກຈາກອຸປະກອນນີ້ນຳ ແລະ ທ່ານຈະບໍ່ສາມາດປົດລັອກໂປຣໄຟລ໌ຂອງທ່ານ, ອະນຸມັດການສັ່ງຊື້ ຫຼື ເຂົ້າສູ່ລະບົບແອັບໄດ້."</string>
     <string name="unlock_disable_frp_warning_content_unknown_profile" msgid="6984215718701688202">"ຄຸນສົມບັດການປົກປ້ອງໂປຣໄຟລ໌ຈະໃຊ້ບໍ່ໄດ້ຫາກບໍ່ມີການລັອກໜ້າຈໍຂອງທ່ານ."</string>
-    <!-- no translation found for unlock_disable_frp_warning_content_unknown_fingerprint_profile (4994062501123299418) -->
-    <skip />
+    <string name="unlock_disable_frp_warning_content_unknown_fingerprint_profile" msgid="4994062501123299418">"ຄຸນສົມບັດການປ້ອງກັນໂປຣໄຟລ໌ຈະບໍ່ເຮັດວຽກຫາກບໍ່ລະບຸໜ້າຈໍລັອກຂອງທ່ານ.<xliff:g id="EMPTY_LINE">
+
+</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">"ປ່ຽນລະຫັດປົດລັອກ PIN"</string>
@@ -580,6 +593,7 @@
     <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="lockpassword_clear_label" msgid="5724429464960458155">"ລຶບ"</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>
@@ -773,6 +787,7 @@
     <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,6 +824,8 @@
     <string name="wifi_wps_available_first_item" msgid="4422547079984583502">"ສາມາດໃຊ້ WPS ໄດ້"</string>
     <string name="wifi_wps_available_second_item" msgid="8427520131718215301">" (ສາມາດໃຊ້ WPS ໄດ້)"</string>
     <string name="wifi_wps_nfc_enter_password" msgid="2288214226916117159">"ໃສ່​ລະຫັດ​ເຄືອ​ຂ່າຍ​ຂອງ​ທ່ານ"</string>
+    <string name="wifi_carrier_connect" msgid="8174696557882299911">"ເຄືອຂ່າຍ Wi‑Fi ຜູ້ໃຫ້ບໍລິການ"</string>
+    <string name="wifi_carrier_content" msgid="4634077285415851933">"ເຊື່ອມຕໍ່ຜ່ານ <xliff:g id="NAME">%1%s</xliff:g>"</string>
     <string name="wifi_scan_always_turnon_message" msgid="203123538572122989">"ເພື່ອປັບປຸງຄວາມຖືກຕ້ອງຂອງສະຖານທີ່ ແລະເພື່ອຈຸດປະສົງອື່ນໆ, <xliff:g id="APP_NAME">%1$s</xliff:g> ຕ້ອງການເປີດນຳໃຊ້ການສະແກນເຄືອຂ່າຍ ເຖິງແມ່ນວ່າ Wi-Fi ຈະປິດກໍຕາມ.\n\nອະນຸຍາດການດຳເນີນການນີ້ ໃຫ້ກັບທຸກແອັບຯທີ່ຕ້ອງການສະແກນບໍ່?"</string>
     <string name="wifi_scan_always_turnoff_message" msgid="5538901671131941043">"ເພື່ອ​ປິດ, ໃຫ້​ໄປ​ທີ່​ຫົວ​ຂໍ້​ຂັ້ນ​ສູງ ໃນ​ເມ​ນູ​ໂອ​ເວີ​ໂຟລ."</string>
     <string name="wifi_scan_always_confirm_allow" msgid="5355973075896817232">"ອະ​ນຸ​ຍາດ​"</string>
@@ -826,6 +843,7 @@
     <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_modify" msgid="6100248070440710782">"ແກ້ໄຂ"</string>
     <string name="wifi_failed_forget_message" msgid="1348172929201654986">"ລົ້ມເຫລວໃນການລືມເຄືອຂ່າຍ"</string>
     <string name="wifi_save" msgid="3331121567988522826">"ບັນທຶກ"</string>
     <string name="wifi_failed_save_message" msgid="6650004874143815692">"ລົ້ມເຫລວໃນການບັນທຶກເຄືອຂ່າຍ"</string>
@@ -838,6 +856,7 @@
     <string name="wifi_advanced_titlebar" msgid="4485841401774142908">"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_title" msgid="3471132676909349382">"ຂໍ້ມູນເຄືອຂ່າຍ"</string>
     <string name="wifi_details_subnet_mask" msgid="6720279144174924410">"Subnet Mask"</string>
     <string name="wifi_details_dns" msgid="8648826607751830768">"DNS"</string>
     <string name="wifi_details_ipv6_address_header" msgid="6734119149106422148">"ທີ່ຢູ່ IPv6"</string>
@@ -870,16 +889,15 @@
     <string name="wifi_p2p_cancel_connect_title" msgid="255267538099324413">"ຍົກເລີກການເຊີນ?"</string>
     <string name="wifi_p2p_cancel_connect_message" msgid="7477756213423749402">"ທ່ານຕ້ອງການຍົກເລີກການເຊີນເພື່ອເຊື່ອມຕໍ່ກັບ <xliff:g id="PEER_NAME">%1$s</xliff:g> ບໍ່?"</string>
     <string name="wifi_p2p_delete_group_message" msgid="834559380069647086">"ລືມກຸ່ມນີ້?"</string>
-    <string name="wifi_tether_checkbox_text" msgid="1847167643625779136">"Wi-Fi ຮັອດສະປອດເຄື່ອນທີ່"</string>
     <string name="wifi_hotspot_checkbox_text" msgid="7763495093333664887">"Wi‑Fi ຮັອດ​ສະ​ປອດ"</string>
     <string name="wifi_hotspot_off_subtext" msgid="5466126533609394170">"ບໍ່ໄດ້ແບ່ງປັນອິນເຕີເນັດ ຫຼື ເນື້ອຫາກັບອຸປະກອນອື່ນ"</string>
     <string name="wifi_hotspot_tethering_on_subtext" product="tablet" msgid="5752490509369962007">"ກຳລັງແບ່ງປັນການເຊື່ອມຕໍ່ອິນເຕີເນັດຂອງແທັບເລັດຜ່ານທາງຮັອດສະປອດ"</string>
     <string name="wifi_hotspot_tethering_on_subtext" product="default" msgid="6461075246164300670">"ກຳລັງແບ່ງປັນການເຊື່ອມຕໍ່ອິນເຕີເນັດຂອງໂທລະສັບຜ່ານທາງຮັອດສະປອດ"</string>
     <string name="wifi_hotspot_on_local_only_subtext" msgid="2068110388011294735">"ແອັບກຳລັງແບ່ງປັນເນື້ອຫາ. ເພື່ອແບ່ງປັນອິນເຕີເນັດ, ໃຫ້ປິດຮັອດສະປອດໄວ້ກ່ອນ ຈາກນັ້ນເປີດຄືນໃໝ່"</string>
-    <string name="wifi_hotspot_name_title" msgid="1341735529132128887">"ຊື່ Wi‑Fi"</string>
+    <string name="wifi_hotspot_name_title" msgid="8237000746618636778">"ຊື່ຮັອດສະປອດ"</string>
     <string name="wifi_hotspot_name_summary_connecting" msgid="3378299995508671967">"ກຳລັງເປີດໃຊ້ <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>..."</string>
     <string name="wifi_hotspot_name_summary_connected" msgid="3888672084861445362">"ອຸປະກອນອື່ນສາມາດເຊື່ອມຕໍ່ຫາ <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g> ໄດ້"</string>
-    <string name="wifi_hotspot_password_title" msgid="1955592302902091281">"ລະຫັດຜ່ານ Wi-Fi"</string>
+    <string name="wifi_hotspot_password_title" msgid="8676859981917573801">"ລະຫັດຜ່ານຮັອດສະປອດ"</string>
     <string name="wifi_hotspot_ap_band_title" msgid="1165801173359290681">"ຄື້ນ AP"</string>
     <string name="wifi_hotspot_footer_info_regular" msgid="1203489406068036455">"ໃຊ້ຮັອດສະປອດເພື່ອສ້າງເຄືອຂ່າຍ Wi-Fi ສຳລັບອຸປະກອນອື່ນຂອງທ່ານ. ຮັອດສະປອດຈະສະໜອງອິນເຕີເນັດໂດຍໃຊ້ການເຊື່ອມຕໍ່ອິນເຕີເນັດມືຖືຂອງທ່ານ. ອາດມີການຮຽກເກັບຄ່າອິນເຕີເນັດມືຖືເພີ່ມເຕີມໄດ້."</string>
     <string name="wifi_hotspot_footer_info_local_only" msgid="857988412470694109">"ແອັບຕ່າງໆສາມາດສ້າງຮັອດສະປອດເພື່ອແບ່ງປັນເນື້ອຫາກັບອຸປະກອນທີ່ຢູ່ໃກ້ຄຽງໄດ້."</string>
@@ -890,7 +908,6 @@
     <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">"ການ​ໂທ Wi-Fi"</string>
     <string name="wifi_calling_suggestion_title" msgid="9008010480466359578">"ເປີດໃຊ້ການໂທ Wi-Fi"</string>
@@ -931,7 +948,7 @@
     <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="emergency_address_summary" msgid="3266760199681945746">"ທີ່ຢູ່ທີ່ໃຊ້ໂດຍບໍລິການສຸກເສີນເປັນສະຖານທີ່ຂອງທ່ານຫາກທ່ານໂທສຸກເສີນໂດຍໃຊ້ Wi‑Fi"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"ການສະແດງຜົນ"</string>
     <string name="sound_settings" msgid="5534671337768745343">"ສຽງ"</string>
     <string name="all_volume_title" msgid="4296957391257836961">"ລະດັບສຽງ"</string>
@@ -985,6 +1002,7 @@
     <string name="search_settings" msgid="1910951467596035063">"ຊອກຫາ"</string>
     <string name="search_settings_summary" msgid="9205656546570654169">"ຈັດການການຕັ້ງຄ່າຊອກຫາ ແລະປະຫວັດ"</string>
     <string name="search_settings_no_results" msgid="8799027492641230999">"ບໍ່ມີຜົນການຊອກຫາ"</string>
+    <string name="search_clear_history" msgid="4196658962573162457">"ລຶບປະຫວັດ"</string>
     <string name="display_settings" msgid="7965901687241669598">"ການສະແດງຜົນ"</string>
     <string name="accelerometer_title" msgid="7854608399547349157">"ໝຸນໜ້າຈໍອັດຕະໂນມັດ"</string>
     <string name="color_mode_title" msgid="3159275920408338215">"ສີສົດໃສ"</string>
@@ -1055,15 +1073,13 @@
     <string name="automatic_brightness" msgid="5014143533884135461">"ປັບຄວາມແຈ້ງອັດຕະໂນມັດ"</string>
     <string name="lift_to_wake_title" msgid="4555378006856277635">"ຍົກ​ເພື່ອ​ເປີດ​ໜ້າ​ຈໍ"</string>
     <string name="ambient_display_screen_title" msgid="4252755516328775766">"ການສະແດງຜົນສະພາບແວດລ້ອມ"</string>
-    <!-- no translation found for ambient_display_screen_summary_always_on (7337555569694794132) -->
-    <skip />
+    <string name="ambient_display_screen_summary_always_on" msgid="7337555569694794132">"ເປີດຕະຫຼອດເວລາ / ໃຊ້ແບັດເຕີຣີຫຼາຍຂຶ້ນ"</string>
     <string name="ambient_display_screen_summary_notifications" msgid="1449570742600868654">"ການແຈ້ງເຕືອນໃໝ່"</string>
     <string name="ambient_display_category_triggers" msgid="4359289754456268573">"ສະແດງຕອນໃດ"</string>
     <string name="doze_title" msgid="2375510714460456687">"ການແຈ້ງເຕືອນໃໝ່"</string>
     <string name="doze_summary" msgid="3846219936142814032">"ເປີດໜ້າຈໍເມື່ອທ່ານໄດ້ຮັບການແຈ້ງເຕືອນ"</string>
     <string name="doze_always_on_title" msgid="1046222370442629646">"ເປີດຕະຫຼອດ"</string>
-    <!-- no translation found for doze_always_on_summary (6978257596231155345) -->
-    <skip />
+    <string name="doze_always_on_summary" msgid="6978257596231155345">"ສະແດງເວລາ, ໄອຄອນການແຈ້ງເຕືອນ ແລະ ຂໍ້ມູນອື່ນໆ. ເພີ່ມການໃຊ້ແບັດເຕີຣີ."</string>
     <string name="title_font_size" msgid="4405544325522105222">"ຂະໜາດຕົວອັກສອນ"</string>
     <string name="short_summary_font_size" msgid="6819778801232989076">"ເຮັດໃຫ້ຂໍ້ຄວາມໃຫຍ່ຂຶ້ນ ຫຼື ນ້ອຍລົງ"</string>
     <string name="sim_lock_settings" msgid="3392331196873564292">"ການຕັ້ງຄ່າການລັອກ SIM card"</string>
@@ -1116,7 +1132,6 @@
     <string name="baseband_version" msgid="1848990160763524801">"ເວີຊັນເບສແບນ"</string>
     <string name="kernel_version" msgid="9192574954196167602">"ເວີຊັນຂອງເຄີນເນວ"</string>
     <string name="build_number" msgid="3075795840572241758">"ໝາຍເລກ Build"</string>
-    <string name="selinux_status" msgid="6212165375172061672">"ສະຖານະ SELinux"</string>
     <string name="device_info_not_available" msgid="8062521887156825182">"ຍັງບໍ່ສາມາດໃຊ້ໄດ້"</string>
     <string name="device_status_activity_title" msgid="1411201799384697904">"ສະຖານະ"</string>
     <string name="device_status" msgid="607405385799807324">"ສະຖານະ"</string>
@@ -1144,7 +1159,6 @@
     <string name="status_wifi_mac_address" msgid="2202206684020765378">"ທີ່ຢູ່ Wi-Fi MAC"</string>
     <string name="status_bt_address" msgid="4195174192087439720">"ທີ່ຢູ່ Bluetooth"</string>
     <string name="status_serial_number" msgid="2257111183374628137">"ໝາຍເລກຊີຣຽວ"</string>
-    <string name="status_unavailable" msgid="7862009036663793314">"ບໍ່ມີຂໍ້ມູນ"</string>
     <string name="status_up_time" msgid="7294859476816760399">"ເວລາເປີດນຳໃຊ້"</string>
     <string name="status_awake_time" msgid="2393949909051183652">"ເວລາການເຮັດວຽກ"</string>
     <string name="internal_memory" msgid="9129595691484260784">"ບ່ອນຈັດເກັບຂໍ້ມູນພາຍໃນ"</string>
@@ -1320,6 +1334,7 @@
     <string name="menu_restore" msgid="8260067415075573273">"ຕັ້ງກັບຄືນໄປໃຊ້ຄ່າເລີ່ມຕົ້ນ"</string>
     <string name="restore_default_apn_completed" msgid="2824775307377604897">"ການຕັ້ງຄ່າ APN ເລີ່ມຕົ້ນຄືນໃໝ່ສຳເລັດແລ້ວ."</string>
     <string name="reset_dashboard_title" msgid="6254873816990678620">"ຕົວເລືອກການຣີເຊັດ"</string>
+    <string name="reset_dashboard_summary" msgid="4851012632493522755">"ເຄືອຂ່າຍ, ແອັບ ຫຼື ອຸປະກອນທີ່ສາມາດຣີເຊັດໄດ້"</string>
     <string name="reset_network_title" msgid="6166025966016873843">"ຣີເຊັດ Wi-Fi, ມືຖື ແລະ Bluetooth"</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>
@@ -1328,17 +1343,14 @@
     <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="6617679904229218425">"ລຶບຂໍ້ມູນທັງໝົດ (ຣີເຊັດເປັນຄ່າຈາກໂຮງງານ)"</string>
-    <plurals name="master_clear_with_account_summary" formatted="false" msgid="5911377203778818712">
-      <item quantity="other">ຈະຣີເຊັດ <xliff:g id="ACCOUNT_COUNT">%1$d</xliff:g> ບັນຊີ</item>
-      <item quantity="one">ຈະຣີເຊັດ 1 ບັນຊີ</item>
-    </plurals>
-    <string name="master_clear_summary" msgid="6902443944660426951">"ບ່ອນຈັດເກັບຂໍ້ມູນພາຍໃນ ແລະ ຂໍ້ມູນທັງໝົດຈະຖືກຣີເຊັດ"</string>
+    <string name="master_clear_title" msgid="3531267871084279512">"ລຶບຂໍ້ມູນທັງໝົດ (ຣີເຊັດເປັນຄ່າຈາກໂຮງງານ)"</string>
     <string name="master_clear_desc" product="tablet" msgid="9146059417023157222">"ນີ້ຈະເປັນການລຶບຂໍ້ມູນທັງໝົດຈາກ "<b>"ໜ່ວຍຄວາມຈຳພາຍໃນ"</b>" ຂອງແທັບເລັດທ່ານ, ຮວມເຖິງ:\n\n"<li>"ບັນຊີ Google ຂອງທ່ານ"</li>\n<li>"ຂໍ້ມູນລະບົບ ແລະແອັບພລິເຄຊັນ ແລະການຕັ້ງຄ່າ"</li>\n<li>"ແອັບຯທີ່ດາວໂຫລດມາ"</li></string>
     <string name="master_clear_desc" product="default" msgid="4800386183314202571">"ນີ້ຈະເປັນການລຶບຂໍ້ມູນທັງໝົດໃນ "<b>"ໜ່ວຍຄວາມຈຳພາຍໃນ"</b>" ຂອງໂທລະສັບທ່ານ ຮວມເຖິງ:\n\n"<li>"ບັນຊີ Google ຂອງທ່ານ"</li>\n<li>"ຂໍ້ມູນລະບົບ ແລະແອັບພລິເຄຊັນ ຮວມທັງການຕັ້ງຄ່າຕ່າງໆ"</li>\n<li>"ແອັບພລິເຄຊັນທີ່ດາວໂຫລດມາ"</li></string>
     <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"ປັດຈຸບັນທ່ານກຳລັງເຂົ້າສູ່ລະບົບບັນຊີຕໍ່ໄປນີ້:\n"</string>
     <string name="master_clear_other_users_present" product="default" msgid="5161423070702470742">\n\n"ມີ​ຜູ້​ໃຊ້​ອື່ນ​ຢູ່​ເທິງ​ອຸ​ປະ​ກອນ​ນີ້.\n"</string>
     <string name="master_clear_desc_also_erases_external" msgid="1903185203791274237"><li>"ເພງ"</li>\n<li>"ຮູບພາບ"</li>\n<li>"ຂໍ້ມູນຜູ່ໃຊ້ອື່ນໆ"</li></string>
+    <string name="master_clear_desc_also_erases_esim" msgid="312352697653096008"><li>"ຜູ້ໃຫ້ບໍລິການຢູ່ eSIM"</li></string>
+    <string name="master_clear_desc_no_cancel_mobile_plan" msgid="5460926449093211144">\n\n"ນີ້ຈະບໍ່ແມ່ນການຍົກເລີກແພັກເກດບໍລິການມືຖືຂອງທ່ານ."</string>
     <string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="7744115866662613411">\n\n"ເພື່ອລຶບເພງ, ຮູບພາບ ແລະຂໍ້ມູນຜູ່ໃຊ້ອື່ນໆ, ຈະຕ້ອງລຶບ "<b>"ບ່ອນຈັດເກັບຂໍ້ມູນ USB"</b>" ອອກນຳ."</string>
     <string name="master_clear_desc_erase_external_storage" product="default" msgid="4801026652617377093">\n\n"ເພື່ອລຶບເພງ, ຮູບພາບ ແລະຂໍ້ມູນຜູ່ໃຊ້ອື່ນໆ, ຈະຕ້ອງລຶບ "<b>"SD card"</b>" ອອກນຳ."</string>
     <string name="erase_external_storage" product="nosdcard" msgid="969364037450286809">"ລຶບພື້ນທີ່ຈັດເກັບຂໍ້ມູນ USB"</string>
@@ -1445,25 +1457,26 @@
     <string name="terms_title" msgid="7697580845616764642">"ຂໍ້ກຳນົດ ແລະເງື່ອນໄຂ"</string>
     <string name="webview_license_title" msgid="2813507464175738967">"ໃບ​ອະ​ນຸ​ຍາດ WebView ຂອງ​ລະ​ບົບ"</string>
     <string name="wallpaper_attributions" msgid="3645880512943433928">"ພາບພື້ນຫຼັງ"</string>
-    <string name="wallpaper_attributions_values" msgid="2996183537914690469">"ຜູ່​ສະ​ໜອງ​ພາບ​ຖ່າຍ​ດາວ​ທຽມ:\n©2014 CNES / Astrium, DigitalGlobe, Bluesky"</string>
+    <string name="wallpaper_attributions_values" msgid="2996183537914690469">"ຜູ້ສະໜອງພາບຖ່າຍດາວທຽມ:\n©2014 CNES / Astrium, DigitalGlobe, Bluesky"</string>
     <string name="settings_manual_activity_title" msgid="8133150693616006051">"ຕັ້ງຄ່າເອງ"</string>
     <string name="settings_manual_activity_unavailable" msgid="4752403782883814898">"ເກີດບັນຫາໃນການໂຫລດຄູ່​ມື."</string>
-    <string name="settings_license_activity_title" msgid="8525014571806471216">"Third-party licenses"</string>
+    <string name="settings_license_activity_title" msgid="8525014571806471216">"ໃບອະນຸຍາດພາກສ່ວນທີສາມ"</string>
     <string name="settings_license_activity_unavailable" msgid="4210539215951487627">"ເກີດບັນຫາໃນການໂຫຼດຂໍ້ມູນລິຂະສິດ."</string>
     <string name="settings_license_activity_loading" msgid="3337535809093591740">"ກຳລັງໂຫລດ..."</string>
     <string name="settings_safetylegal_title" msgid="1289483965535937431">"ຂໍ້ມູນດ້ານຄວາມປອດໄພ"</string>
     <string name="settings_safetylegal_activity_title" msgid="6901214628496951727">"ຂໍ້ມູນດ້ານຄວາມປອດໄພ"</string>
     <string name="settings_safetylegal_activity_unreachable" msgid="250674109915859456">"ທ່ານບໍ່ໄດ້ເຊື່ອມຕໍ່ຂໍ້ມູນອິນເຕີເນັດ. ເພື່ອເບິ່ງຂໍ້ມູນນີ້ໃນເວລານີ້, ກະລຸນາໄປທີ່ %s ຈາກຄອມພິວເຕີເຄື່ອງໃດກໍໄດ້ທີ່ເຊື່ອມຕໍ່ກັບອິນເຕີເນັດຢູ່."</string>
     <string name="settings_safetylegal_activity_loading" msgid="8059022597639516348">"ກຳລັງໂຫລດ..."</string>
-    <string name="lockpassword_choose_your_password_header" msgid="8624900666929394990">"ເລືອກລະຫັດຜ່ານຂອງທ່ານ"</string>
-    <string name="lockpassword_choose_your_password_header_for_fingerprint" msgid="6624409510609085450">"ເພື່ອໃຊ້ລາຍນິ້ວມື, ໃຫ້ຕັ້ງລະຫັດຜ່ານກ່ອນ"</string>
-    <string name="lockpassword_choose_your_pattern_header" msgid="6949761069941694050">"ເລືອກຮູບແບບຂອງທ່ານ"</string>
-    <string name="lockpassword_choose_your_pattern_header_for_fingerprint" msgid="5901096361617543819">"ເພື່ອໃຊ້ລາຍນິ້ວມື, ໃຫ້ຕັ້ງຮູບແບບປົດລັອກກ່ອນ"</string>
-    <string name="lockpassword_choose_your_pin_header" msgid="7598849519816138302">"ເລືອກລະຫັດ PIN ຂອງທ່ານ"</string>
-    <string name="lockpassword_choose_your_pin_header_for_fingerprint" msgid="765344692615917183">"ເພື່ອໃຊ້ລາຍນິ້ວມື, ໃຫ້ຕັ້ງລະຫັດ PIN ກ່ອນ"</string>
-    <string name="lockpassword_confirm_your_password_header" msgid="6308478184889846633">"ຢືນຢັນລະຫັດຜ່ານຂອງທ່ານ"</string>
+    <string name="lockpassword_choose_your_screen_lock_header" msgid="3872462096767152394">"ຕັ້ງໜ້າຈໍລັອກ"</string>
+    <string name="lockpassword_choose_your_password_message" msgid="1197569283524841412">"ເພື່ອຄວາມປອດໄພ, ໃຫ້ຕັ້ງລະຫັດຜ່ານໄວ້"</string>
+    <string name="lockpassword_choose_your_password_header_for_fingerprint" msgid="2541818487015343503">"ເພື່ອໃຊ້ລາຍນິ້ວມື, ໃຫ້ຕັ້ງລະຫັດຜ່ານກ່ອນ"</string>
+    <string name="lockpassword_choose_your_pattern_header_for_fingerprint" msgid="7709785406243556723">"ເພື່ອໃຊ້ລາຍນິ້ວມື, ໃຫ້ຮູບແບບປົດລັອກກ່ອນ"</string>
+    <string name="lockpassword_choose_your_pin_message" msgid="1875420718677275646">"ເພື່ອຄວາມປອດໄພ, ໃຫ້ຕັ້ງລະຫັດ PIN ໄວ້"</string>
+    <string name="lockpassword_choose_your_pin_header_for_fingerprint" msgid="1549639053195796674">"ເພື່ອໃຊ້ລາຍນິ້ວມື, ໃຫ້ຕັ້ງລະຫັດ PIN ກ່ອນ"</string>
+    <string name="lockpassword_choose_your_pattern_message" msgid="5986983400689720015">"ກະລຸນາຕັ້ງຮູບແບບປົດລັອກເພື່ອຄວາມປອດໄພ"</string>
+    <string name="lockpassword_confirm_your_password_header" msgid="1266027268220850931">"ໃສ່ລະຫັດຜ່ານຂອງທ່ານອີກຄັ້ງ"</string>
     <string name="lockpassword_confirm_your_pattern_header" msgid="7543433733032330821">"ຢືນຢັນຮູບແບບຂອງທ່ານ"</string>
-    <string name="lockpassword_confirm_your_pin_header" msgid="49038294648213197">"ຢືນຢັນລະຫັດ PIN ຂອງທ່ານ"</string>
+    <string name="lockpassword_confirm_your_pin_header" msgid="7744513791910572550">"ໃສ່ລະຫັດ PIN ຂອງທ່ານອີກຄັ້ງ"</string>
     <string name="lockpassword_confirm_passwords_dont_match" msgid="5140892109439191415">"ລະຫັດຜ່ານບໍ່ກົງກັນ"</string>
     <string name="lockpassword_confirm_pins_dont_match" msgid="7226244811505606217">"ລະຫັດ PIN ບໍ່ກົງກັນ"</string>
     <string name="lockpassword_choose_lock_generic_header" msgid="3811438094903786145">"ປົດລັອກສ່ວນທີ່ເລືອກ"</string>
@@ -1476,18 +1489,18 @@
     <string name="lockpassword_confirm_your_pattern_generic_profile" msgid="4435638308193361861">"ໃຊ້ຮູບແບບປົດລັອກບ່ອນເຮັດວຽກຂອງທ່ານເພື່ອດຳເນີນການຕໍ່."</string>
     <string name="lockpassword_confirm_your_pin_generic_profile" msgid="3730141667547002246">"ປ້ອນ PIN ບ່ອນເຮັດວຽກຂອງທ່ານເພື່ອດຳເນີນການຕໍ່."</string>
     <string name="lockpassword_confirm_your_password_generic_profile" msgid="4250642723467019894">"ປ້ອນລະຫັດຜ່ານບ່ອນເຮັດວຽກຂອງທ່ານເພື່ອດຳເນີນການຕໍ່."</string>
-    <!-- no translation found for lockpassword_strong_auth_required_device_pattern (530802132223800623) -->
-    <skip />
-    <!-- no translation found for lockpassword_strong_auth_required_device_pin (7829294830078036417) -->
-    <skip />
-    <!-- no translation found for lockpassword_strong_auth_required_device_password (3552644641574796973) -->
-    <skip />
-    <!-- no translation found for lockpassword_strong_auth_required_work_pattern (3003781907040522053) -->
-    <skip />
-    <!-- no translation found for lockpassword_strong_auth_required_work_pin (3367491332598821552) -->
-    <skip />
-    <!-- no translation found for lockpassword_strong_auth_required_work_password (8159775129968582940) -->
-    <skip />
+    <string name="lockpassword_strong_auth_required_device_pattern" msgid="530802132223800623">"ເພື່ອເພີ່ມຄວາມປອດໄພ, ໃຫ້ໃຊ້ຮູບແບບປົດລັອກອຸປະກອນຂອງທ່ານ"</string>
+    <string name="lockpassword_strong_auth_required_device_pin" msgid="7829294830078036417">"ເພື່ອເພີ່ມຄວາມປອດໄພ, ໃຫ້ລະບຸລະຫັດ PIN ອຸປະກອນຂອງທ່ານ"</string>
+    <string name="lockpassword_strong_auth_required_device_password" msgid="3552644641574796973">"ເພື່ອເພີ່ມຄວາມປອດໄພ, ໃຫ້ລະບຸລະຫັດຜ່ານອຸປະກອນຂອງທ່ານ"</string>
+    <string name="lockpassword_strong_auth_required_work_pattern" msgid="3003781907040522053">"ເພື່ອເພີ່ມຄວາມປອດໄພ, ໃຫ້ໃຊ້ຮູບແບບປົດລັອກບ່ອນເຮັດວຽກຂອງທ່ານ"</string>
+    <string name="lockpassword_strong_auth_required_work_pin" msgid="3367491332598821552">"ເພື່ອເພີ່ມຄວາມປອດໄພ, ໃຫ້ລະບຸລະຫັດ PIN ບ່ອນເຮັດວຽກຂອງທ່ານ"</string>
+    <string name="lockpassword_strong_auth_required_work_password" msgid="8159775129968582940">"ເພື່ອເພີ່ມຄວາມປອດໄພ, ໃຫ້ລະບຸລະຫັດຜ່ານບ່ອນເຮັດວຽກຂອງທ່ານ"</string>
+    <string name="lockpassword_confirm_your_pattern_details_frp" msgid="6757336656791723193">"ໂທລະສັບຂອງທ່ານຖືກຣີເຊັດເປັນຄ່າຈາກໂຮງງານແລ້ວ. ເພື່ອໃຊ້ໂທລະສັບໜ່ວຍນີ້, ໃຫ້ໃສ່ຮູບແບບປົດລັອກກ່ອນໜ້ານີ້ຂອງທ່ານ."</string>
+    <string name="lockpassword_confirm_your_pin_details_frp" msgid="826520613445990470">"ໂທລະສັບຂອງທ່ານຖືກຣີເຊັດເປັນຄ່າຈາກໂຮງງານແລ້ວ. ເພື່ອໃຊ້ໂທລະສັບໜ່ວຍນີ້, ໃຫ້ໃສ່ລະຫັດ PIN ກ່ອນໜ້ານີ້ຂອງທ່ານ."</string>
+    <string name="lockpassword_confirm_your_password_details_frp" msgid="8944081074615739040">"ໂທລະສັບຂອງທ່ານຖືກຣີເຊັດເປັນຄ່າຈາກໂຮງງານແລ້ວ. ເພື່ອໃຊ້ໂທລະສັບໜ່ວຍນີ້, ໃຫ້ໃສ່ລະຫັດກ່ອນໜ້ານີ້ຂອງທ່ານ."</string>
+    <string name="lockpassword_confirm_your_pattern_header_frp" msgid="2898036091609128286">"ຢັ້ງຢືນຮູບແບບປົດລັອກ"</string>
+    <string name="lockpassword_confirm_your_pin_header_frp" msgid="4141601774778898803">"ຢັ້ງຢືນລະຫັດ PIN"</string>
+    <string name="lockpassword_confirm_your_password_header_frp" msgid="3762615419295360480">"ຢັ້ງຢືນລະຫັດຜ່ານ"</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>
@@ -1537,7 +1550,6 @@
     <string name="install_applications_title" msgid="4987712352256508946">"​ອະ​ນຸ​ຍາດ​ແຫລ່ງ​ຂໍ້​ມູນ​ແອັບຯ​ທັງ​ໝົດ"</string>
     <string name="recent_app_category_title" msgid="6673071268966003928">"ແອັບທີ່ຫາກໍເປີດຫຼ້າສຸດ"</string>
     <string name="see_all_apps_title" msgid="1317153498074308438">"ເບິ່ງທັງໝົດ <xliff:g id="COUNT">%1$d</xliff:g> ແອັບ"</string>
-    <string name="recent_app_summary" msgid="3366446669844932300">"<xliff:g id="TIME">^1</xliff:g> ກ່ອນ"</string>
     <string name="install_all_warning" product="tablet" msgid="8310489909586138165">"ແທັບເລັດ ແລະ ຂໍ້ມູນສ່ວນຕົວຂອງທ່ານຈະສາມາດຖືກແອັບທີ່ບໍ່ຮູ້ຈັກໂຈມຕີໄດ້ງ່າຍຂຶ້ນ. ໂດຍການຕິດຕັ້ງແອັບຕ່າງໆຈາກແຫລ່ງຂໍ້ມູນເຫຼົ່ານີ້, ແມ່ນທ່ານຍອມຮັບວ່າຈະຮັບຜິດຊອບຕໍ່ຄວາມເສຍຫາຍທີ່ເກີດຂຶ້ນກັບໂທລະສັບຂອງທ່ານ ຫຼື ການສູນເສຍຂໍ້ມູນທີ່ອາດເກີດຂຶ້ນຈາກການນຳໃຊ້ແອັບເຫຼົ່ານັ້ນ."</string>
     <string name="install_all_warning" product="default" msgid="1952257127370115988">"ໂທລະສັບ ແລະ ຂໍ້ມູນສ່ວນຕົວຂອງທ່ານຈະສາມາດຖືກແອັບທີ່ບໍ່ຮູ້ຈັກໂຈມຕີໄດ້ງ່າຍຂຶ້ນ. ໂດຍການຕິດຕັ້ງແອັບຕ່າງໆຈາກແຫລ່ງຂໍ້ມູນເຫຼົ່ານີ້, ແມ່ນທ່ານຍອມຮັບວ່າຈະຮັບຜິດຊອບຕໍ່ຄວາມເສຍຫາຍທີ່ເກີດຂຶ້ນກັບໂທລະສັບຂອງທ່ານ ຫຼື ການສູນເສຍຂໍ້ມູນທີ່ອາດເກີດຂຶ້ນຈາກການນຳໃຊ້ແອັບເຫຼົ່ານັ້ນ."</string>
     <string name="advanced_settings" msgid="1777249286757067969">"ການຕັ້ງຄ່າຂັ້ນສູງ"</string>
@@ -1801,7 +1813,7 @@
     <string name="accessibility_settings_summary" msgid="981260486011624939">"ຕົວອ່ານໜ້າຈໍ, ການສະແດງຜົນ, ການຄວບຄຸມແບບໂຕ້ຕອບໄດ້"</string>
     <string name="vision_settings_title" msgid="4204111425716868288">"ການຕັ້ງຄ່າການເບິ່ງເຫັນ"</string>
     <string name="vision_settings_description" msgid="5679491180156408260">"ທ່ານສາມາດປັບແຕ່ງອຸປະກອນນີ້ໃຫ້ເໝາະສົມກັບຄວາມຕ້ອງການຂອງທ່ານ. ຄຸນສົມຊ່ວຍເຂົ້າເຖິງເຫຼົ່ານີ້ສາມາດຖືກປ່ຽນແປງໄດ້ໃນພາຍຫຼັງໃນການຕັ້ງຄ່າ."</string>
-    <string name="vision_settings_suggestion_title" msgid="917294957154878441">"ເພີ່ມຂະໜາດຟອນ"</string>
+    <string name="vision_settings_suggestion_title" msgid="8058794060304707004">"ປ່ຽນຂະໜາດຟອນ"</string>
     <string name="screen_reader_category_title" msgid="7739154903913400641">"ຕົວອ່ານໜ້າຈໍ"</string>
     <string name="audio_and_captions_category_title" msgid="3420727114421447524">"ສຽງ ແລະ ຂໍ້ຄວາມໜ້າຈໍ"</string>
     <string name="display_category_title" msgid="685461049938269166">"ການສະແດງຜົນ"</string>
@@ -1838,7 +1850,6 @@
     <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="preference_summary_default_combination" msgid="8532964268242666060">"<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>
@@ -1957,12 +1968,14 @@
     <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_whitelisted" msgid="7375400051141016808">"ບໍ່ສາມາດປັບແຕ່ງແອັບໃຫ້ໃຊ້ແບັດເຕີຣີຢ່າງເໝາະສົມໄດ້"</string>
+    <string name="background_activity_warning_dialog_title" msgid="2216249969149568871">"ຈຳກັດການເຄື່ອນໄຫວໃນພື້ນຫຼັງບໍ?"</string>
+    <string name="background_activity_warning_dialog_text" msgid="7049624449246121981">"ຫາກທ່ານຈຳກັດການເຄື່ອນໄຫວໃນພື້ນຫຼັງສຳລັບແອັບໃດໜຶ່ງ, ມັນຈະເຮັດວຽກຜິດປົກກະຕິ"</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" msgid="6393929085382334341">"ການນຳໃຊ້ແອັບນັບຕັ້ງແຕ່ສາກເຕັມຫຼ້າສຸດ (<xliff:g id="RELATIVE_TIME">^1</xliff:g>)"</string>
+    <string name="power_usage_list_summary_device" msgid="4461926045610455423">"ການນຳໃຊ້ອຸປະກອນນັບຕັ້ງແຕ່ສາກເຕັມຫຼ້າສຸດ (<xliff:g id="RELATIVE_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>
@@ -2208,14 +2221,14 @@
     <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">"ທ່ານຕ້ອງຕັ້ງ PIN ລັອກໜ້າຈໍ ຫຼືລະຫັດຜ່ານ ກ່ອນທີ່ຈະສາມາດໃຊ້ບ່ອນຈັດເກັບຂໍ້ມູນຮັບຮອງໄດ້."</string>
+    <string name="credentials_configure_lock_screen_hint" msgid="8058230497337529036">"ກ່ອນທ່ານຈະໃຊ້ບ່ອນຈັດເກັບຂໍ້ມູນຮອງຮັບ, ອຸປະກອນຂອງທ່ານຕ້ອງມີໜ້າຈໍລັອກທີ່ປອດໄພກ່ອນ"</string>
+    <string name="credentials_configure_lock_screen_button" msgid="253239765216055321">"ຕັ້ງການລັອກ"</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>
@@ -2335,8 +2348,6 @@
     <skip />
     <string name="cant_sync_dialog_title" msgid="2777238588398046285">"ບໍ່ສາມາດຊິ້ງຂໍ້ມູນເອງໄດ້"</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 address"</string>
     <string name="enter_password" msgid="8035706727471334122">"ເພີ່ມ​ເລີ່ມ​ຕົ້ນ​ໃຊ້ Android, ໃຫ້​ໃສ່​ລະ​ຫັດ​ຜ່ານ​ຂອງ​ທ່ານ"</string>
     <string name="enter_pin" msgid="5305333588093263790">"ເພີ່ມ​ເລີ່ມ​ຕົ້ນ​ໃຊ້ Android, ໃຫ້​​ໃສ່​ລະ​ຫັດ PIN ຂອງ​ທ່ານ"</string>
     <string name="enter_pattern" msgid="4187435713036808566">"ເພີ່ມ​ເລີ່ມ​ຕົ້ນ​ໃຊ້ Android, ໃຫ້​ແຕ້ມ​ຮູບ​ແບບ​ປົດ​ລອກ​ຂອງ​ທ່ານ"</string>
@@ -2350,6 +2361,7 @@
     <string name="misc_files_selected_count" msgid="4647048020823912088">"ເລືອກແລ້ວ <xliff:g id="NUMBER">%1$d</xliff:g> ຈາກທັງໝົດ <xliff:g id="TOTAL">%2$d</xliff:g>"</string>
     <string name="misc_files_selected_count_bytes" msgid="2876232009069114352">"<xliff:g id="NUMBER">%1$s</xliff:g> ຈາກທັງໝົດ <xliff:g id="TOTAL">%2$s</xliff:g>"</string>
     <string name="select_all" msgid="1562774643280376715">"ເລືອກທັງໝົດ"</string>
+    <string name="data_plan_usage_manage_plans_button_text" msgid="8997761990902708162">"ຈັດການແພັກເກດ"</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>
@@ -2435,6 +2447,9 @@
     <string name="data_usage_metered_mobile" msgid="5423305619126978393">"ເຄືອຂ່າຍມືຖື"</string>
     <string name="data_usage_metered_wifi" msgid="1761738002328299714">"​ເຄືອ​ຂ່າຍ​ Wi-Fi ທີ່​ຖືກ​ນັບ​ຂໍ້​ມູນ​"</string>
     <string name="data_usage_metered_wifi_disabled" msgid="727808462375941567">"ເພື່ອ​ເລືອກ​ເຄືອ​ຂ່າຍ​ທີ່​ຖືກ​ນັບ​ຂໍ້​ມູນ​, ໃຫ້​ເປີດ​ໃຊ້ Wi‑Fi ກ່ອນ."</string>
+    <string name="data_usage_metered_auto" msgid="1262028400911918865">"ອັດຕະໂນມັດ"</string>
+    <string name="data_usage_metered_yes" msgid="9217539611385225894">"ມີການວັດແທກ"</string>
+    <string name="data_usage_metered_no" msgid="4025232961929071789">"ບໍ່ມີການວັດແທກ"</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>
@@ -2526,9 +2541,6 @@
     <string name="backup_pw_set_button_text" msgid="2387480910044648795">"ຕັ້ງລະຫັດສຳຮອງຂໍ້ມູນ"</string>
     <string name="backup_pw_cancel_button_text" msgid="8845630125391744615">"ຍົກເລີກ"</string>
     <string name="additional_system_update_settings_list_item_title" msgid="214987609894661992">"ການອັບເດດລະບົບເພີ່ມເຕີມ"</string>
-    <string name="selinux_status_disabled" msgid="924551035552323327">"ປິດການນຳໃຊ້"</string>
-    <string name="selinux_status_permissive" msgid="6004965534713398778">"​ອະ​ນຸ​ຍາດ"</string>
-    <string name="selinux_status_enforcing" msgid="2252703756208463329">"ການ​ບັງ​ຄັບ​ໃຊ້"</string>
     <string name="ssl_ca_cert_warning" msgid="2045866713601984673">"ການນຳໃຊ້ເຄືອຂ່າຍອາດມີການກວດສອບຕິດຕາມ"</string>
     <string name="done_button" msgid="1991471253042622230">"ແລ້ວໆ"</string>
     <plurals name="ssl_ca_cert_dialog_title" formatted="false" msgid="7145092748045794650">
@@ -2570,7 +2582,7 @@
     <string name="user_add_user_title" msgid="2108112641783146007">"ເພີ່ມຜູ້ໃຊ້ໃໝ່ບໍ?"</string>
     <string name="user_add_user_message_long" msgid="8562152293752222985">"ທ່ານ​ສາ​ມາດ​ແບ່ງ​ປັນ​ອຸ​ປະ​ກອນ​ນີ້​ໃຫ້​ຄົນ​ອື່ນ​ໃຊ້​ໄດ້​ໂດຍ​ການ​ສ້າງ​ຜູ້​ໃຊ້​ເພີ່ມ​ເຕີມ. ແຕ່​ລະ​ຜູ້​ໃຊ້​ຈະ​ມີ​ພື້ນ​ທີ່​ເກັບ​ຂໍ້​ມູນ​ຂອງ​ເຂົາ​ເຈົ້າ​ເອງ​ ເຊິ່ງ​ພວກ​ເຂົາ​ຈະ​ສາ​ມາດ​ຈັດ​ລະ​ບຽບ​ແອັບ, ຮູບ​ພາບ​ພື້ນຫຼັງ ແລະ​ອື່ນໆ​ຂອງ​ເຂົາ​ເຈົ້າ​ໄດ້. ຜູ້​ໃຊ້​ຕ່າງໆ​ຍັງ​ຈະ​ສາ​ມາດ​ປັບ​ແຕ່ງ​ການ​ຕັ້ງ​ຄ່າ​ຂອງ​ອຸ​ປະ​ກອນ​ໄດ້​ ເຊັ່ນ: Wi‑Fi ເຊິ່ງ​ຈະ​ມີ​ຜົນ​ກັບ​ຜູ້​ໃຊ້​ທຸກ​ຄົນ.\n\nເມື່ອ​ທ່ານ​ເພີ່ມ​ຜູ້ໃຊ້​ໃໝ່, ຜູ້​ໃຊ້​ນັ້ນ​ຈະ​ຕ້ອງ​ຕັ້ງ​ຄ່າ​ພື້ນ​ທີ່​ບ່ອນ​ຈັດ​ເກັບ​ຂໍ້​ມູນ​ຂອງ​ລາວ.\nຜູ້\n​ໃຊ້​ທຸກ​ຄົນ​ສາ​ມາດ​ອັບ​ເດດ​ແອັບສຳ​ລັບ​ຜູ້​ໃຊ້​ຄົນ​ອື່ນ​ທັງ​ໝົດ​ໄດ້."</string>
     <string name="user_add_user_message_short" msgid="1511354412249044381">"ເມື່ອ​ທ່ານ​ເພີ່ມ​ຜູ້​ໃຊ້​ໃໝ່, ຜູ້​ໃຊ້​ນັ້ນ​ຈະ​ຕ້ອງ​ຕັ້ງ​ຄ່າ​ພື້ນ​ທີ່​ບ່ອນ​ຈັດ​ເກັບ​ຂໍ້​ມູນ​ຂອງ​ລາວ.\n\nຜູ້​ໃຊ້​ທຸກ​ຄົນ​ສາ​ມາດ​ອັບ​ເດດ​ແອັບຯສຳ​ລັບ​ຜູ້​ໃຊ້​ຄົນ​ອື່ນ​ທັງ​ໝົດ​ໄດ້."</string>
-    <string name="user_setup_dialog_title" msgid="1765794166801864563">"ຕັ້ງຄ່າຜູ່ໃຊ້ດຽວນີ້?"</string>
+    <string name="user_setup_dialog_title" msgid="1765794166801864563">"ຕັ້ງຄ່າຜູ້ໃຊ້ຕອນນີ້ບໍ?"</string>
     <string name="user_setup_dialog_message" msgid="1004068621380867148">"ກວດ​ສອບ​ໃຫ້​ແນ່​ໃຈ​ວ່າ​ບຸກ​ຄົນ​ດັ່ງ​ກ່າວ​ສາ​ມາດ​ຮັບ​ອຸ​ປະ​ກອນ​ແລະ​ຕັ້ງ​ຄ່າ​ພື້ນ​ທີ່​ຂອງ​ພວກ​ເຂົາ​ໄດ້"</string>
     <string name="user_setup_profile_dialog_message" msgid="3896568553327558731">"ຕັ້ງຄ່າໂປຣໄຟລ໌ດຽວນີ້?"</string>
     <string name="user_setup_button_setup_now" msgid="3391388430158437629">"ຕັ້ງຄ່າດຽວນີ້"</string>
@@ -2726,6 +2738,7 @@
       <item quantity="other">ສະແດງ %d ລາຍການທີ່ເຊື່ອງໄວ້</item>
       <item quantity="one">ສະແດງ %d ລາຍການທີ່ເຊື່ອງໄວ້</item>
     </plurals>
+    <string name="dashboard_suggestion_condition_footer_content_description" msgid="2898588191174845961">"ຫຍໍ້ເຂົ້າ"</string>
     <string name="network_dashboard_title" msgid="4771589228992391573">"ເຄືອຂ່າຍ ແລະ ອິນເຕີເນັດ"</string>
     <string name="network_dashboard_summary_mobile" msgid="3851083934739500429">"ມືຖື"</string>
     <string name="network_dashboard_summary_data_usage" msgid="3843261364705042212">"ການນຳໃຊ້ຂໍ້ມູນ"</string>
@@ -2734,7 +2747,7 @@
     <string name="connected_devices_dashboard_summary" msgid="2390582103384791904">"Bluetooth, Cast, NFC"</string>
     <string name="connected_devices_dashboard_no_nfc_summary" msgid="9106040742715366495">"Bluetooth, ສົ່ງສັນຍານ"</string>
     <string name="app_and_notification_dashboard_title" msgid="7838365599185397539">"ແອັບ ແລະ ການແຈ້ງເຕືອນ"</string>
-    <string name="app_and_notification_dashboard_summary" msgid="2363314178802548682">"Permissions, default apps"</string>
+    <string name="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>
@@ -2785,8 +2798,7 @@
     <string name="keywords_gesture" msgid="3526905012224714078">"ທ່າທາງ"</string>
     <string name="keywords_payment_settings" msgid="5220104934130446416">"pay, tap, payments"</string>
     <string name="keywords_backup" msgid="470070289135403022">"ສຳຮອງຂໍ້ມູນ, ສຳຮອງ ຂໍ້ມູນ"</string>
-    <!-- no translation found for keywords_assist_gesture_launch (813968759791342591) -->
-    <skip />
+    <string name="keywords_assist_gesture_launch" msgid="813968759791342591">"ທ່າທາງ"</string>
     <string name="setup_wifi_nfc_tag" msgid="9028353016222911016">"ຕັ້ງ​ຄ່າ​ແທັກ Wi-Fi NFC"</string>
     <string name="write_tag" msgid="8571858602896222537">"ຂຽນ"</string>
     <string name="status_awaiting_tap" msgid="2130145523773160617">"​ແ​ຕະ​ທີ່​ແທັກ​ເພື່ອ​ຂຽນ..."</string>
@@ -2829,8 +2841,14 @@
       <item quantity="other">ເປີດໃຊ້ <xliff:g id="ON_COUNT">%d</xliff:g> ກົດອັດຕະໂນມັດແລ້ວ</item>
       <item quantity="one">ເປີດໃຊ້ 1 ກົດອັດຕະໂນມັດແລ້ວ</item>
     </plurals>
-    <string name="zen_mode_settings_title" msgid="842308776768942600">"ການຕັ້ງຄ່າຫ້າມລົບກວນ"</string>
-    <string name="zen_mode_priority_settings_title" msgid="2623117023031824309">"ບຸ​ລິ​ມະ​ສິດ​ເທົ່າ​ນັ້ນ​ທີ່​ອະ​ນຸ​ຍາດ"</string>
+    <string name="zen_mode_settings_title" msgid="1066226840983908121">"ຫ້າມລົບກວນ"</string>
+    <string name="zen_mode_behavior_settings_title" msgid="1463303933529313969">"ພຶດຕິກຳ"</string>
+    <string name="zen_mode_behavior_allow_title" msgid="3845615648136218141">"ອະນຸຍາດສຽງ ແລະ ການສັ່ນເຕືອນຈາກ"</string>
+    <string name="zen_mode_behavior_no_sound" msgid="1219626004723208056">"ບໍ່ມີສຽງ"</string>
+    <string name="zen_mode_behavior_total_silence" msgid="6716603819806610626">"ບໍ່ມີສຽງ (ງຽບໝົດ)"</string>
+    <string name="zen_mode_behavior_no_sound_except" msgid="4968477585788243114">"ບໍ່ມີສຽງ ຍົກເວັ້ນ <xliff:g id="CATEGORIES">%1$s</xliff:g>"</string>
+    <!-- no translation found for zen_mode_behavior_alarms_only (2423480992071472963) -->
+    <skip />
     <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>
@@ -2872,13 +2890,15 @@
     <string name="notifications_title" msgid="8086372779371204971">"ການແຈ້ງເຕືອນ"</string>
     <string name="app_notifications_title" msgid="5810577805218003760">"​ການ​ແຈ້ງ​ເຕືອນ​ແອັບຯ"</string>
     <string name="notification_channel_title" msgid="2260666541030178452">"ໝວດໝູ່ການແຈ້ງເຕືອນ"</string>
+    <string name="notification_group_title" msgid="7180506440133859601">"ກຸ່ມໝວດໝູ່ການແຈ້ງເຕືອນ"</string>
     <string name="notification_importance_title" msgid="848692592679312666">"ຄວາມສໍາຄັນ"</string>
-    <string name="notification_importance_unspecified" msgid="2196023702875112081">"ໃຫ້ແອັບຕັດສິນໃຈ"</string>
+    <string name="notification_importance_unspecified" msgid="6622173510486113958">"ອະນຸຍາດສຽງ"</string>
     <string name="notification_importance_blocked" msgid="7938180808339386300">"ຢ່າສະແດງການແຈ້ງເຕືອນອີກ"</string>
     <string name="notification_importance_min" msgid="5455049524984686275">"ບໍ່ມີສຽງ ຫຼື ການລົບກວນໃນໜ້າຈໍ"</string>
     <string name="notification_importance_low" msgid="8881468429453766553">"ບໍ່ມີສຽງ"</string>
     <string name="notification_importance_default" msgid="5958338024601957516">"ເຮັດສຽງ"</string>
     <string name="notification_importance_high" msgid="2082429479238228527">"ເຮັດສຽງດັງ ແລະ ສະແດງຂຶ້ນໃນໜ້າຈໍ"</string>
+    <string name="notification_importance_high_silent" msgid="2667033773703765252">"ເປີດໜ້າຈໍ"</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>
@@ -2915,15 +2935,19 @@
     <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>
-    <!-- no translation found for picture_in_picture_app_detail_summary (1264019085827708920) -->
-    <skip />
+    <string name="picture_in_picture_app_detail_summary" msgid="1264019085827708920">"ອະນຸຍາດໃຫ້ແອັບນີ້ສ້າງໜ້າຈໍທີ່ຊ້ອນຂຶ້ນມາໃນເວລາເປີດແອັບອື່ນ ຫຼື ຫຼັງຈາກທ່ານອອກຈາກມັນ (ເຊັ່ນ: ເພື່ອສືບຕໍ່ການເບິ່ງວິດີໂອ). ໜ້າຈໍນີ້ຈະສະແດງບັງແອັບອື່ນທີ່ທ່ານກຳລັງໃຊ້ຢູ່."</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="channel_group_notifications_off_desc" msgid="1620950416247316370">"Android ກຳລັງບລັອກກຸ່ມການແຈ້ງເຕືອນນີ້ບໍ່ໃຫ້ສະແດງຢູ່ອຸປະກອນ"</string>
     <string name="notification_channels" msgid="5346841743182627500">"ໝວດໝູ່"</string>
     <string name="notification_channels_other" msgid="5645317113885788226">"ອື່ນໆ"</string>
+    <plurals name="notification_group_summary" formatted="false" msgid="3420621520561455358">
+      <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="no_channels" msgid="3077375508177744586">"This app has not posted any notifications"</string>
     <string name="app_settings_link" msgid="8894946007543660906">"ການຕັ້ງຄ່າເພີ່ມເຕີມໃນແອັບ"</string>
     <string name="app_notification_listing_summary_zero" msgid="6482582965081108108">"ປິດໄວ້ສຳລັບທຸກແອັບ"</string>
@@ -3000,12 +3024,14 @@
     <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>
+    <!-- no translation found for zen_mode_media_system_other (8900209390529859777) -->
+    <skip />
     <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="239685342222975733">"ຫາກຄົນດຽວກັນໂທເທື່ອທີສອງພາຍໃນໄລຍະເວລາ <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>
@@ -3034,6 +3060,7 @@
     <string name="zen_mode_screen_off_visual_interruptions" msgid="4850792880144382633">"ເມື່ອໜ້າຈໍປິດຢູ່"</string>
     <string name="zen_mode_no_visual_interruptions" msgid="8742776003822778472">"ເມື່ອໜ້າຈໍເປີດ ຫຼື ປິດຢູ່"</string>
     <string name="notification_app_settings_button" msgid="6685640230371477485">"​ການ​ຕັ້ງ​ຄ່າ​ການ​ແຈ້ງ​ເຕືອນ"</string>
+    <string name="suggestion_button_text" msgid="3275010948381252006">"ຕົກລົງ"</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>
@@ -3139,14 +3166,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">"ການຊ່ວຍເຫຼືອ &amp; ການປ້ອນຂໍ້ມູນດ້ວຍສຽງ"</string>
+    <string name="assist_and_voice_input_title" msgid="1733165754793221197">"ການຊ່ວຍເຫຼືອ ແລະ ການປ້ອນຂໍ້ມູນດ້ວຍສຽງ"</string>
     <string name="default_assist_title" msgid="8868488975409247921">"ແອັບຜູ້ຊ່ວຍ"</string>
     <string name="assistant_security_warning_title" msgid="8673079231955467177">"ເຮັດ​ໃຫ້ <xliff:g id="ASSISTANT_APP_NAME">%s</xliff:g> ເປັນຜູ້ຊ່ວຍຂອງທ່ານບໍ​?"</string>
     <string name="assistant_security_warning" msgid="8498726261327239136">"ຕົວ​ຊ່ວຍ​ຈະ​ສາ​ມາດ​ອ່ານ​ຂໍ້​ມູນ​ກ່ຽວ​ກັບ​ແອັບ​ໃຊ້​ງານ​ຢູ່​ໃນ​ລະ​ບົບ​ຂອງ​ທ່ານ, ລວມ​ທັງ​ຂໍ້​ມູນ​ທີ່​ເຫັນ​ໄດ້​ຢູ່​ເທິງ​ໜ້າ​ຈໍ​ຂອງ​ທ່ານ ຫຼື ສາ​ມາດ​ເຂົ້າ​ຫາ​ໄດ້​ຢູ່​ພາຍ​ໃນ​ແອັບ."</string>
     <string name="assistant_security_warning_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>
@@ -3218,6 +3245,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="sms_mirroring_pref" msgid="6475043279147376031">"SMS Mirroring"</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>
@@ -3284,7 +3312,7 @@
     <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="permit_write_settings" msgid="658555006453212691">"ອະນຸຍາດໃຫ້ແກ້ໄຂການຕັ້ງຄ່າລະບົບໄດ້"</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>
@@ -3322,7 +3350,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">"Wallpaper, sleep, font size"</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>
     <string name="users_and_accounts_summary" msgid="245282689646897882">"ຜູ້ໃຊ້ປັດຈຸບັນ: <xliff:g id="USER_NAME">%1$s</xliff:g>"</string>
@@ -3379,9 +3407,12 @@
     <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">"ເພື່ອນຳໃຊ້ການປ່ຽນແປງ Telephony Monitor, ໃຫ້ປິດແລ້ວເປີດອຸປະກອນຄືນໃໝ່"</string>
+    <string name="connectivity_monitor_switch" msgid="9059759348648583421">"Connectivity Monitor"</string>
+    <string name="connectivity_monitor_switch_summary" msgid="2828658652378866401">"ConnectivityMonitor ຈະເກັບກຳບັນທຶກການເຮັດວຽກຕ່າງໆ ເມື່ອມັນກວດພົບບັນຫາການເຊື່ອມຕໍ່ ແລະ ຈະແຈ້ງເຕືອນໄປໃຫ້ຜູ້ໃຊ້ເພື່ອລາຍງານຂໍ້ຜິດພາດ"</string>
+    <string name="connectivity_monitor_toast" msgid="5551859612881173028">"ເພື່ອນຳໃຊ້ການປ່ຽນແປງ connectivity change, ໃຫ້ປິດແລ້ວເປີດອຸປະກອນຄືນໃໝ່"</string>
     <string name="camera_hal_hdrplus_switch" msgid="8377365197105267466">"ກ້ອງຖ່າຍຮູບ HAL HDR+"</string>
     <string name="camera_hal_hdrplus_toast" msgid="2063703797270055299">"ເພື່ອນຳໃຊ້ການປ່ຽນແປງກ້ອງຖ່າຍຮູບ HAL HDR+, ໃກ້ປິດເປີດອຸປະກອນຄືນໃໝ່"</string>
+    <string name="camera_laser_sensor_switch" msgid="8913588990743234440">"ເຊັນເຊີເລເຊີກ້ອງ"</string>
     <string name="ota_disable_automatic_update" msgid="2319639631655915050">"ການອັບເດດລະບົບອັດຕະໂນມັດ"</string>
     <string name="usage" msgid="2977875522080448986">"ການໃຊ້"</string>
     <string name="cellular_data_usage" msgid="2155683719898158203">"ການນຳໃຊ້ອິນເຕີເນັດມືຖື"</string>
@@ -3407,7 +3438,7 @@
     <string name="data_warning" msgid="209133958008062117">"ຄຳເຕືອນຂໍ້ມູນ"</string>
     <string name="set_data_limit" msgid="2901526323210516923">"​ຕັ້ງຂີດຈຳກັດຂໍ້ມູນ"</string>
     <string name="data_limit" msgid="1885406964934590552">"ຂີດຈຳກັດຂໍ້ມູນ"</string>
-    <string name="data_usage_template" msgid="392191945602400904">"ໃຊ້ໄປແລ້ວ <xliff:g id="ID_1">%1$s</xliff:g> ໃນລະຫວ່າງ <xliff:g id="ID_2">%2$s</xliff:g>"</string>
+    <string name="data_usage_template" msgid="2923744765873163859">"ໃຊ້ໄປແລ້ວ <xliff:g id="ID_1">%1$s</xliff:g> <xliff:g id="ID_2">%2$s</xliff:g>"</string>
     <string name="configure" msgid="1029654422228677273">"ກຳນົດຄ່າ"</string>
     <string name="data_usage_other_apps" msgid="3272872663517382050">"ແອັບອື່ນໆແມ່ນຮວມໃນການນຳໃຊ້"</string>
     <plurals name="data_saver_unrestricted_summary" formatted="false" msgid="2635267833484232703">
@@ -3476,7 +3507,7 @@
     <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="387052719462473500">"ຂໍ້ມູນການຄວບຄຸມໃນໜ້າຈໍລັອກ"</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="8483187649355540109">"ຊ່ວຍເຫຼືອ ແລະ ເຄັດລັບ"</string>
@@ -3484,7 +3515,7 @@
     <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>
+    <string name="bluetooth_disabled" msgid="6244000672828617410">"ປິດ"</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>
@@ -3586,7 +3617,7 @@
     <string name="web_action_enable_title" msgid="4051513950976670853">"ອິນສະແຕນແອັບ"</string>
     <string name="web_action_enable_summary" msgid="3108127559723396382">"ເປີດລິ້ງໃນແອັບ, ເຖິງແມ່ນວ່າບໍ່ໄດ້ຕິດຕັ້ງກໍຕາມ"</string>
     <string name="web_action_section_title" msgid="7364647086538399136">"ອິນສະແຕນແອັບ"</string>
-    <string name="instant_apps_account" msgid="1433620209791992528">"ບັນຊີອິນສະແຕນແອັບ"</string>
+    <string name="instant_apps_settings" msgid="8827777916518348213">"ການຕັ້ງຄ່າອິນສະແຕນແອັບ"</string>
     <string name="domain_url_section_title" msgid="7046835219056428883">"ແອັບຯທີ່ຕິດຕັ້ງແລ້ວ"</string>
     <string name="automatic_storage_manager_activation_warning" msgid="6353100011690933254">"ຕອນນີ້ອຸປະກອນຂອງທ່ານຖືກຈັດການໂດຍຕົວຈັດການບ່ອນຈັດເກັບຂໍ້ມູນແລ້ວ."</string>
     <string name="account_for_section_header" msgid="5356566418548737121">"ບັນຊີສຳລັບ <xliff:g id="USER_NAME">%1$s</xliff:g>"</string>
@@ -3633,7 +3664,9 @@
     <string name="enterprise_privacy_always_on_vpn_personal" msgid="9217774730260037434">"Always-on VPN turned on in your personal profile"</string>
     <string name="enterprise_privacy_always_on_vpn_work" msgid="7244472958208315814">"Always-on VPN turned on in your work profile"</string>
     <string name="enterprise_privacy_global_http_proxy" msgid="7936664553416257333">"Global HTTP proxy set"</string>
-    <string name="enterprise_privacy_ca_certs" msgid="5885892204903688909">"ຂໍ້ມູນລັບທີ່ເຊື່ອຖື"</string>
+    <string name="enterprise_privacy_ca_certs_device" msgid="2019652712782510262">"ຂໍ້ມູນລັບທີ່ເຊື່ອຖື"</string>
+    <string name="enterprise_privacy_ca_certs_personal" msgid="2279084820904076599">"ຂໍ້ມູນລັບທີ່ເຊື່ອຖືໃນໂປຣໄຟລ໌ສ່ວນຕົວຂອງທ່ານ"</string>
+    <string name="enterprise_privacy_ca_certs_work" msgid="6187377647815301809">"ຂໍ້ມູນລັບທີ່ເຊື່ອຖືໃນໂປຣໄຟລ໌ບ່ອນເຮັດວຽກຂອງທ່ານ"</string>
     <plurals name="enterprise_privacy_number_ca_certs" formatted="false" msgid="526375234629534165">
       <item quantity="other">ຂັ້ນຕ່ຳ <xliff:g id="COUNT_1">%d</xliff:g> ໃບຮັບຮອງ CA</item>
       <item quantity="one">ຂັ້ນຕ່ຳ <xliff:g id="COUNT_0">%d</xliff:g> ໃບຮັບຮອງ CA</item>
@@ -3696,6 +3729,8 @@
     <string name="carrier_provisioning" msgid="4398683675591893169">"ຂໍ້ມູນການເປີດນຳໃຊ້ເຄືອຂ່າຍ"</string>
     <string name="trigger_carrier_provisioning" msgid="3434865918009286187">"Trigger Carrier Provisioning"</string>
     <string name="new_device_suggestion_title" msgid="698847081680980774">"ມີຫຍັງໃໝ່ ແລະ ໜ້າຕື່ນເຕັ້ນ?"</string>
-    <string name="new_device_suggestion_summary" msgid="7172709269203435870">"ກວດເບິ່ງຄຸນສົມບັດຍອດນິຍົມ 5 ອັນດັບ"</string>
+    <string name="new_device_suggestion_summary" product="default" msgid="206396571522515855">"ລອງເບິ່ງໂທລະສັບໃໝ່ຂອງທ່ານ"</string>
+    <string name="new_device_suggestion_summary" product="tablet" msgid="393751455688210956">"ລອງເບິ່ງແທັບເລັດໃໝ່ຂອງທ່ານ"</string>
+    <string name="new_device_suggestion_summary" product="device" msgid="2939870049868336652">"ລອງເບິ່ງອຸປະກອນໃໝ່ຂອງທ່ານ"</string>
     <string name="disabled_low_ram_device" msgid="3751578499721173344">"ຄຸນສົມບັດນີ້ບໍ່ສາມາດໃຊ້ໄດ້ໃນອຸປະກອນນີ້ໄດ້"</string>
 </resources>
diff --git a/res/values-lt/arrays.xml b/res/values-lt/arrays.xml
index 1c7be20..61c3ddb 100644
--- a/res/values-lt/arrays.xml
+++ b/res/values-lt/arrays.xml
@@ -100,8 +100,6 @@
     <!-- no translation found for wifi_security_no_eap:0 (2084555984818107151) -->
     <!-- no translation found for wifi_security_no_eap:1 (397579322683471524) -->
     <!-- no translation found for wifi_security_no_eap:2 (1968820975358150484) -->
-    <!-- no translation found for wifi_ap_security:0 (5251664683198623324) -->
-    <!-- no translation found for wifi_ap_security:1 (7989073072260294673) -->
   <string-array name="wifi_eap_method">
     <item msgid="1160193392455075561">"PEAP"</item>
     <item msgid="7981731051382306293">"TLS"</item>
diff --git a/res/values-lt/strings.xml b/res/values-lt/strings.xml
index 1d196f3..13d34a1 100644
--- a/res/values-lt/strings.xml
+++ b/res/values-lt/strings.xml
@@ -168,7 +168,7 @@
     <string name="bluetooth_map_acceptance_dialog_text" msgid="8712508202081143737">"%1$s nori pasiekti jūsų pranešimus. Suteikti prieigą %2$s?"</string>
     <string name="bluetooth_sap_request" msgid="2669762224045354417">"SIM prieigos užklausa"</string>
     <string name="bluetooth_sap_acceptance_dialog_text" msgid="4414253873553608690">"„<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g>“ nori pasiekti jūsų SIM kortelę. Suteikus prieigą prie SIM kortelės bus išjungtas duomenų ryšys įrenginyje, kol veiks šis ryšys. Leiskite pasiekti „<xliff:g id="DEVICE_NAME_1">%2$s?</xliff:g>“"</string>
-    <string name="bluetooth_device_name_summary" msgid="4757990010751789977">"Kitiems įrenginiams matomas kaip „<xliff:g id="DEVICE_NAME">^1</xliff:g>“"</string>
+    <string name="bluetooth_device_name_summary" msgid="522235742194965734">"Kitiems įrenginiams matomas kaip „<xliff:g id="DEVICE_NAME">^1</xliff:g>“ įrenginys"</string>
     <string name="bluetooth_paired_device_title" msgid="8638994696317952019">"Jūsų įrenginiai"</string>
     <string name="bluetooth_pairing_page_title" msgid="7712127387361962608">"Susieti naują įrenginį"</string>
     <string name="date_and_time" msgid="9062980487860757694">"Data ir laikas"</string>
@@ -316,6 +316,8 @@
     <string name="zone_auto" msgid="334783869352026648">"Automatinė laiko juosta"</string>
     <string name="zone_auto_summaryOn" msgid="6142830927278458314">"Naudoti tinklo pateiktą laiko juostą"</string>
     <string name="zone_auto_summaryOff" msgid="2597745783162041390">"Naudoti tinklo pateiktą laiko juostą"</string>
+    <string name="date_time_24hour_auto" msgid="2117383168985653422">"Autom. 24 valandų formatas"</string>
+    <string name="date_time_24hour_auto_summary" msgid="6351812925651480277">"Naudoti numatytuosius lokalės nustatymus"</string>
     <string name="date_time_24hour_title" msgid="3203537578602803850">"24 val. formatas"</string>
     <string name="date_time_24hour" msgid="1193032284921000063">"Naudoti 24 val. formatą"</string>
     <string name="date_time_set_time_title" msgid="6296795651349047016">"Laikas"</string>
@@ -378,6 +380,9 @@
     <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="1961957425135180242">"Kitas"</string>
+    <string name="setup_fingerprint_enroll_skip_title" msgid="362050541117362034">"Praleisti kontrolinį kodą?"</string>
+    <string name="setup_fingerprint_enroll_skip_after_adding_lock_text" msgid="958990414356204763">"Kontrolinio kodo sąranka užtrunka tik minutę ar dvi. Jei praleisite šį veiksmą, vėliau kontrolinį kodą galėsite pridėti nustatymuose."</string>
+    <string name="lock_screen_intro_skip_title" msgid="4988210105913705679">"Praleisti ekrano užraktą?"</string>
     <string name="lock_screen_intro_skip_dialog_text_frp" product="tablet" msgid="1581834104051243425">"Įrenginio apsaugos funkcijos nebus įjungtos. Negalėsite užtikrinti, kad kiti asmenys negalėtų pasinaudoti planšetiniu kompiuteriu, jei jis bus pavogtas ar nustatytas iš naujo arba jį pamesite."</string>
     <string name="lock_screen_intro_skip_dialog_text_frp" product="device" msgid="4629503416877189572">"Įrenginio apsaugos funkcijos nebus įjungtos. Negalėsite užtikrinti, kad kiti asmenys negalėtų pasinaudoti įrenginiu, jei jis bus pavogtas ar nustatytas iš naujo arba jį pamesite."</string>
     <string name="lock_screen_intro_skip_dialog_text_frp" product="default" msgid="2423428240245737909">"Įrenginio apsaugos funkcijos nebus įjungtos. Negalėsite užtikrinti, kad kiti asmenys negalėtų pasinaudoti telefonu, jei jis bus pavogtas ar nustatytas iš naujo arba jį pamesite."</string>
@@ -463,7 +468,7 @@
     <string name="setup_lock_settings_picker_title" product="tablet" msgid="90329443364067215">"Apsaugok. planš. komp."</string>
     <string name="setup_lock_settings_picker_title" product="device" msgid="2399952075134938929">"Apsaugokite įrenginį"</string>
     <string name="setup_lock_settings_picker_title" product="default" msgid="1572244299605153324">"Apsaugokite savo telefoną"</string>
-    <string name="setup_lock_settings_picker_fingerprint_message" msgid="5585650064305600578">"Kad dar labiau apsaugotumėte įrenginį, nustatykite atsarginį ekrano užraktą."</string>
+    <string name="lock_settings_picker_fingerprint_added_security_message" msgid="5768002109707648463">"Kad dar labiau apsaugotumėte įrenginį, nustatykite atsarginį ekrano užraktą."</string>
     <string name="setup_lock_settings_picker_message" product="tablet" msgid="8919671129189936210">"Neleiskite kitiems asmenims naudoti šio planšetinio kompiuterio be leidimo, suaktyvinę įrenginio apsaugos funkcijas. Pasirinkite norimą naudoti užrakinimo ekraną."</string>
     <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>
@@ -505,29 +510,37 @@
     <string name="unlock_disable_frp_warning_title" msgid="264008934468492550">"Pašalinti įrenginio apsaugą?"</string>
     <string name="unlock_disable_frp_warning_title_profile" msgid="5507136301904313583">"Pašalinti profilio apsaugą?"</string>
     <string name="unlock_disable_frp_warning_content_pattern" msgid="8869767290771023461">"Įrenginio apsaugos funkcijos neveiks be atrakinimo piešinio."</string>
-    <!-- no translation found for unlock_disable_frp_warning_content_pattern_fingerprint (2986105377420905314) -->
-    <skip />
+    <string name="unlock_disable_frp_warning_content_pattern_fingerprint" msgid="2986105377420905314">"Įrenginio apsaugos funkcijos neveiks be atrakinimo piešinio.<xliff:g id="EMPTY_LINE">
+
+</xliff:g>Išsaugoti kontroliniai kodai taip pat bus pašalinti iš šio įrenginio ir jūs negalėsite atrakinti telefono, įgalioti pirkimo veiksmų ar prisijungti prie programų juos naudodami."</string>
     <string name="unlock_disable_frp_warning_content_pin" msgid="586996206210265131">"Įrenginio apsaugos funkcijos neveiks be PIN kodo."</string>
-    <!-- no translation found for unlock_disable_frp_warning_content_pin_fingerprint (3370462835533123695) -->
-    <skip />
+    <string name="unlock_disable_frp_warning_content_pin_fingerprint" msgid="3370462835533123695">"Įrenginio apsaugos funkcijos neveiks be PIN kodo.<xliff:g id="EMPTY_LINE">
+
+</xliff:g>Išsaugoti kontroliniai kodai taip pat bus pašalinti iš šio įrenginio ir jūs negalėsite atrakinti telefono, įgalioti pirkimo veiksmų ar prisijungti prie programų juos naudodami."</string>
     <string name="unlock_disable_frp_warning_content_password" msgid="5420612686852555537">"Įrenginio apsaugos funkcijos neveiks be slaptažodžio."</string>
-    <!-- no translation found for unlock_disable_frp_warning_content_password_fingerprint (3595476296430536798) -->
-    <skip />
+    <string name="unlock_disable_frp_warning_content_password_fingerprint" msgid="3595476296430536798">"Įrenginio apsaugos funkcijos neveiks be slaptažodžio.<xliff:g id="EMPTY_LINE">
+
+</xliff:g>Išsaugoti kontroliniai kodai taip pat bus pašalinti iš šio įrenginio ir jūs negalėsite atrakinti telefono, įgalioti pirkimo veiksmų ar prisijungti prie programų juos naudodami."</string>
     <string name="unlock_disable_frp_warning_content_unknown" msgid="1550718040483548220">"Įrenginio apsaugos funkcijos neveiks be ekrano užrakto."</string>
-    <!-- no translation found for unlock_disable_frp_warning_content_unknown_fingerprint (3679351662094349506) -->
-    <skip />
+    <string name="unlock_disable_frp_warning_content_unknown_fingerprint" msgid="3679351662094349506">"Įrenginio apsaugos funkcijos neveiks be ekrano užrakto.<xliff:g id="EMPTY_LINE">
+
+</xliff:g>Išsaugoti kontroliniai kodai taip pat bus pašalinti iš šio įrenginio ir jūs negalėsite atrakinti telefono, įgalioti pirkimo veiksmų ar prisijungti prie programų juos naudodami."</string>
     <string name="unlock_disable_frp_warning_content_pattern_profile" msgid="8682200103576359918">"Profilio apsaugos funkcijos neveiks be atrakinimo piešinio."</string>
-    <!-- no translation found for unlock_disable_frp_warning_content_pattern_fingerprint_profile (6718155854303231675) -->
-    <skip />
+    <string name="unlock_disable_frp_warning_content_pattern_fingerprint_profile" msgid="6718155854303231675">"Profilio apsaugos funkcijos neveiks be atrakinimo piešinio.<xliff:g id="EMPTY_LINE">
+
+</xliff:g>Išsaugoti kontroliniai kodai taip pat bus pašalinti iš šio profilio ir jūs negalėsite atrakinti profilio, įgalioti pirkimo veiksmų ar prisijungti prie programų juos naudodami."</string>
     <string name="unlock_disable_frp_warning_content_pin_profile" msgid="7790688070593867767">"Profilio apsaugos funkcijos neveiks be PIN kodo."</string>
-    <!-- no translation found for unlock_disable_frp_warning_content_pin_fingerprint_profile (4209564603132870532) -->
-    <skip />
+    <string name="unlock_disable_frp_warning_content_pin_fingerprint_profile" msgid="4209564603132870532">"Profilio apsaugos funkcijos neveiks be PIN kodo.<xliff:g id="EMPTY_LINE">
+
+</xliff:g>Išsaugoti kontroliniai kodai taip pat bus pašalinti iš šio profilio ir jūs negalėsite atrakinti profilio, įgalioti pirkimo veiksmų ar prisijungti prie programų juos naudodami."</string>
     <string name="unlock_disable_frp_warning_content_password_profile" msgid="7569285520567674461">"Profilio apsaugos funkcijos neveiks be slaptažodžio."</string>
-    <!-- no translation found for unlock_disable_frp_warning_content_password_fingerprint_profile (2994300676764706047) -->
-    <skip />
+    <string name="unlock_disable_frp_warning_content_password_fingerprint_profile" msgid="2994300676764706047">"Profilio apsaugos funkcijos neveiks be slaptažodžio.<xliff:g id="EMPTY_LINE">
+
+</xliff:g>Išsaugoti kontroliniai kodai taip pat bus pašalinti iš šio profilio ir jūs negalėsite atrakinti profilio, įgalioti pirkimo veiksmų ar prisijungti prie programų juos naudodami."</string>
     <string name="unlock_disable_frp_warning_content_unknown_profile" msgid="6984215718701688202">"Profilio apsaugos funkcijos neveiks be ekrano užrakto."</string>
-    <!-- no translation found for unlock_disable_frp_warning_content_unknown_fingerprint_profile (4994062501123299418) -->
-    <skip />
+    <string name="unlock_disable_frp_warning_content_unknown_fingerprint_profile" msgid="4994062501123299418">"Profilio apsaugos funkcijos neveiks be ekrano užrakto.<xliff:g id="EMPTY_LINE">
+
+</xliff:g>Išsaugoti kontroliniai kodai taip pat bus pašalinti iš šio profilio ir jūs negalėsite atrakinti profilio, įgalioti pirkimo veiksmų ar prisijungti prie programų juos naudodami."</string>
     <string name="unlock_disable_frp_warning_ok" msgid="7075138677177748705">"Taip, pašalinti"</string>
     <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>
@@ -598,6 +611,7 @@
     <string name="lockpassword_pin_no_sequential_digits" msgid="680765285206990584">"Didėjanti, mažėjanti ar pasikartojanti skaitmenų seka neleidžiama"</string>
     <string name="lockpassword_ok_label" msgid="313822574062553672">"Gerai"</string>
     <string name="lockpassword_cancel_label" msgid="8818529276331121899">"Atšaukti"</string>
+    <string name="lockpassword_clear_label" msgid="5724429464960458155">"Išvalyti"</string>
     <string name="lockpattern_tutorial_cancel_label" msgid="6431583477570493261">"Atšaukti"</string>
     <string name="lockpattern_tutorial_continue_label" msgid="3559793618653400434">"Kitas"</string>
     <string name="lock_setup" msgid="3355847066343753943">"Sąranka baigta."</string>
@@ -731,7 +745,7 @@
     <string name="wifi_error" msgid="3207971103917128179">"Klaida"</string>
     <string name="wifi_sap_no_channel_error" msgid="3108445199311817111">"5 GHz juosta neprieinama šioje šalyje"</string>
     <string name="wifi_in_airplane_mode" msgid="8652520421778203796">"Veikia lėktuvo režimu"</string>
-    <string name="wifi_notify_open_networks" msgid="76298880708051981">"Pranešimas apie atvirą tinklą"</string>
+    <string name="wifi_notify_open_networks" msgid="76298880708051981">"Pranešimas apie atvirąjį tinklą"</string>
     <string name="wifi_notify_open_networks_summary" msgid="2761326999921366960">"Pranešti, kai pasiekiamas aukštos kokybės viešas tinklas"</string>
     <string name="wifi_wakeup" msgid="8815640989361538036">"Automatiškai įjungti „Wi‑Fi“"</string>
     <string name="wifi_wakeup_summary" msgid="2530814331062997163">"„Wi‑Fi“ bus vėl įjungtas esant šalia išsaugotų aukštos kokybės tinklų, pvz., jūsų namų tinklo"</string>
@@ -741,7 +755,7 @@
     <string name="wifi_poor_network_detection_summary" msgid="2784135142239546291">"Nenaudoti „Wi-Fi“ tinklo, jei jo interneto ryšys nėra geras"</string>
     <string name="wifi_avoid_poor_network_detection_summary" msgid="4674423884870027498">"Naudoti tik tuos tinklus, kurių stiprus interneto ryšys"</string>
     <string name="use_open_wifi_automatically_title" msgid="6851951242903078588">"Prisijungti prie atvirųjų tinklų"</string>
-    <string name="use_open_wifi_automatically_summary" msgid="2982091714252931713">"Automatiškai prisijungti prie aukštos kokybės viešų tinklų"</string>
+    <string name="use_open_wifi_automatically_summary" msgid="2982091714252931713">"Automatiškai prisijungti prie aukštos kokybės viešųjų tinklų"</string>
     <string name="use_open_wifi_automatically_summary_scoring_disabled" msgid="593964217679325831">"Jei norite naudoti, pasirinkite tinklo įvertinimo paslaugos teikėją"</string>
     <string name="use_open_wifi_automatically_summary_scorer_unsupported_disabled" msgid="8472122600853650258">"Jei norite naudoti, pasirinkite suderinamą tinklo įvertinimo paslaugos teikėją"</string>
     <string name="wifi_install_credentials" msgid="3551143317298272860">"Įdiegti sertifikatus"</string>
@@ -795,6 +809,7 @@
     <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>
@@ -831,6 +846,8 @@
     <string name="wifi_wps_available_first_item" msgid="4422547079984583502">"Galima WPS"</string>
     <string name="wifi_wps_available_second_item" msgid="8427520131718215301">" (galima WPS)"</string>
     <string name="wifi_wps_nfc_enter_password" msgid="2288214226916117159">"Įveskite tinklo slaptažodį"</string>
+    <string name="wifi_carrier_connect" msgid="8174696557882299911">"Operatoriaus „Wi‑Fi“ ryšio tinklas"</string>
+    <string name="wifi_carrier_content" msgid="4634077285415851933">"Prisijunkite per „<xliff:g id="NAME">%1%s</xliff:g>“"</string>
     <string name="wifi_scan_always_turnon_message" msgid="203123538572122989">"Siekiant tiksliau nustatyti vietą ir dėl kitų priežasčių, „<xliff:g id="APP_NAME">%1$s</xliff:g>“ prašo leidimo nuskaityti tinklus, net kai „Wi-Fi“ yra išjungtas.\n\nAr norite suteikti leidimą nuskaityti visoms to prašančioms programoms?"</string>
     <string name="wifi_scan_always_turnoff_message" msgid="5538901671131941043">"Kad išjungtumėte, perpildymo meniu eikite į skiltį „Išplėstiniai“"</string>
     <string name="wifi_scan_always_confirm_allow" msgid="5355973075896817232">"Leisti"</string>
@@ -848,6 +865,7 @@
     <string name="wifi_connect" msgid="1076622875777072845">"Prijungti"</string>
     <string name="wifi_failed_connect_message" msgid="8491902558970292871">"Jungiantis prie tinklo įvyko klaida."</string>
     <string name="wifi_forget" msgid="8168174695608386644">"Pamiršti"</string>
+    <string name="wifi_modify" msgid="6100248070440710782">"Keisti"</string>
     <string name="wifi_failed_forget_message" msgid="1348172929201654986">"Ištrinant tinklą įvyko klaida."</string>
     <string name="wifi_save" msgid="3331121567988522826">"Išsaugoti"</string>
     <string name="wifi_failed_save_message" msgid="6650004874143815692">"Išsaugant tinklą įvyko klaida."</string>
@@ -862,6 +880,7 @@
     <string name="wifi_advanced_titlebar" msgid="4485841401774142908">"Išplėstinis „Wi-Fi“"</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_title" msgid="3471132676909349382">"Tinklo informacija"</string>
     <string name="wifi_details_subnet_mask" msgid="6720279144174924410">"Potinklio kaukė"</string>
     <string name="wifi_details_dns" msgid="8648826607751830768">"DNS"</string>
     <string name="wifi_details_ipv6_address_header" msgid="6734119149106422148">"„IPv6“ adresai"</string>
@@ -894,16 +913,15 @@
     <string name="wifi_p2p_cancel_connect_title" msgid="255267538099324413">"Atšaukti kvietimą?"</string>
     <string name="wifi_p2p_cancel_connect_message" msgid="7477756213423749402">"Ar norite atšaukti kvietimą prisijungti prie <xliff:g id="PEER_NAME">%1$s</xliff:g>?"</string>
     <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_off_subtext" msgid="5466126533609394170">"Internetas ar turinys nebendrinamas su kitais įrenginiais"</string>
     <string name="wifi_hotspot_tethering_on_subtext" product="tablet" msgid="5752490509369962007">"Šio planšetinio kompiuterio interneto ryšys bendrinamas per viešosios interneto prieigos tašką"</string>
     <string name="wifi_hotspot_tethering_on_subtext" product="default" msgid="6461075246164300670">"Šio telefono interneto ryšys bendrinamas per viešosios interneto prieigos tašką"</string>
     <string name="wifi_hotspot_on_local_only_subtext" msgid="2068110388011294735">"Programa bendrina turinį. Norėdami bendrinti interneto ryšį, išjunkite viešosios interneto prieigos tašką ir vėl jį įjunkite."</string>
-    <string name="wifi_hotspot_name_title" msgid="1341735529132128887">"„Wi‑Fi“ pavadinimas"</string>
+    <string name="wifi_hotspot_name_title" msgid="8237000746618636778">"Viešosios interneto prieigos taško pavadinimas"</string>
     <string name="wifi_hotspot_name_summary_connecting" msgid="3378299995508671967">"Įjungiamas „<xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>“..."</string>
     <string name="wifi_hotspot_name_summary_connected" msgid="3888672084861445362">"Kiti įrenginiai gali prisijungti prie „<xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>“"</string>
-    <string name="wifi_hotspot_password_title" msgid="1955592302902091281">"„Wi-Fi“ slaptažodis"</string>
+    <string name="wifi_hotspot_password_title" msgid="8676859981917573801">"Viešosios interneto prieigos taško slaptažodis"</string>
     <string name="wifi_hotspot_ap_band_title" msgid="1165801173359290681">"Prieigos taško juosta"</string>
     <string name="wifi_hotspot_footer_info_regular" msgid="1203489406068036455">"Naudodami viešosios interneto prieigos tašką, galite sukurti „Wi‑Fi“ tinklą kitiems įrenginiams. Internetas teikiamas per viešosios interneto prieigos tašką naudojant mobiliųjų duomenų ryšį. Gali būti taikomi papildomi mobiliojo ryšio duomenų mokesčiai."</string>
     <string name="wifi_hotspot_footer_info_local_only" msgid="857988412470694109">"Programos gali sukurti viešosios interneto prieigos tašką ir bendrinti turinį su netoliese esančiais įrenginiais."</string>
@@ -914,7 +932,6 @@
     <string name="wifi_tether_configure_ap_text" msgid="7974681394041609308">"Nustatyti „Wi-Fi“ viešosios interneto prieigos tašką"</string>
     <string name="wifi_hotspot_configure_ap_text" msgid="5478614731464220432">"„Wi‑Fi“ vieš. int. pr. t. sąr."</string>
     <string name="wifi_hotspot_configure_ap_text_summary" msgid="5560680057727007011">"„AndroidAP“ WPA2 PSK viešosios interneto prieigos taškas"</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> viešosios interneto prieigos taškas"</string>
     <string name="wifi_tether_configure_ssid_default" msgid="8467525402622138547">"„AndroidHotspot“"</string>
     <string name="wifi_calling_settings_title" msgid="4102921303993404577">"„Wi-Fi“ skambinimas"</string>
     <string name="wifi_calling_suggestion_title" msgid="9008010480466359578">"Įjunkite „Wi-Fi“ skambinimą"</string>
@@ -955,7 +972,7 @@
     <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="emergency_address_summary" msgid="3266760199681945746">"Adresas, kurį kaip jūsų vietovę naudoja pagalbos tarnybos, jei skambinate pagalbos numeriu naudodami „Wi-Fi“"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"Ekranas"</string>
     <string name="sound_settings" msgid="5534671337768745343">"Garsas"</string>
     <string name="all_volume_title" msgid="4296957391257836961">"Garsumas"</string>
@@ -1009,6 +1026,7 @@
     <string name="search_settings" msgid="1910951467596035063">"Ieškoti"</string>
     <string name="search_settings_summary" msgid="9205656546570654169">"Valdyti paieškos nustatymus ir istoriją"</string>
     <string name="search_settings_no_results" msgid="8799027492641230999">"Nėra jokių rezultatų"</string>
+    <string name="search_clear_history" msgid="4196658962573162457">"Išvalyti istoriją"</string>
     <string name="display_settings" msgid="7965901687241669598">"Ekranas"</string>
     <string name="accelerometer_title" msgid="7854608399547349157">"Automatiškai sukti ekraną"</string>
     <string name="color_mode_title" msgid="3159275920408338215">"Ryškios spalvos"</string>
@@ -1079,15 +1097,13 @@
     <string name="automatic_brightness" msgid="5014143533884135461">"Automatinis šviesumas"</string>
     <string name="lift_to_wake_title" msgid="4555378006856277635">"Pakelti ir pažadinti"</string>
     <string name="ambient_display_screen_title" msgid="4252755516328775766">"Adaptyvusis vaizdas"</string>
-    <!-- no translation found for ambient_display_screen_summary_always_on (7337555569694794132) -->
-    <skip />
+    <string name="ambient_display_screen_summary_always_on" msgid="7337555569694794132">"Visada įjungta / eikvojama daugiau akum. energijos"</string>
     <string name="ambient_display_screen_summary_notifications" msgid="1449570742600868654">"Nauji pranešimai"</string>
     <string name="ambient_display_category_triggers" msgid="4359289754456268573">"Kada rodyti"</string>
     <string name="doze_title" msgid="2375510714460456687">"Nauji pranešimai"</string>
     <string name="doze_summary" msgid="3846219936142814032">"Pažadinti ekraną, kai gaunamas pranešimas"</string>
     <string name="doze_always_on_title" msgid="1046222370442629646">"Visada įjungta"</string>
-    <!-- no translation found for doze_always_on_summary (6978257596231155345) -->
-    <skip />
+    <string name="doze_always_on_summary" msgid="6978257596231155345">"Rodomas laikas, pranešimų piktogramos ir kita informacija. Eikvojama daugiau akumuliatoriaus energijos."</string>
     <string name="title_font_size" msgid="4405544325522105222">"Šrifto dydis"</string>
     <string name="short_summary_font_size" msgid="6819778801232989076">"Padidinkite arba sumažinkite tekstą"</string>
     <string name="sim_lock_settings" msgid="3392331196873564292">"SIM kortelės užrakto nustatymai"</string>
@@ -1142,7 +1158,6 @@
     <string name="baseband_version" msgid="1848990160763524801">"Nemoduliuojamo perdavimo versija"</string>
     <string name="kernel_version" msgid="9192574954196167602">"„Kernel“ versija"</string>
     <string name="build_number" msgid="3075795840572241758">"Versijos numeris"</string>
-    <string name="selinux_status" msgid="6212165375172061672">"„SELinux“ būsena"</string>
     <string name="device_info_not_available" msgid="8062521887156825182">"Negalima"</string>
     <string name="device_status_activity_title" msgid="1411201799384697904">"Būsena"</string>
     <string name="device_status" msgid="607405385799807324">"Būsena"</string>
@@ -1170,7 +1185,6 @@
     <string name="status_wifi_mac_address" msgid="2202206684020765378">"„Wi-Fi“ MAC adresas"</string>
     <string name="status_bt_address" msgid="4195174192087439720">"„Bluetooth“ adresas"</string>
     <string name="status_serial_number" msgid="2257111183374628137">"Serijos numeris"</string>
-    <string name="status_unavailable" msgid="7862009036663793314">"Užimta"</string>
     <string name="status_up_time" msgid="7294859476816760399">"Veikimo laikas"</string>
     <string name="status_awake_time" msgid="2393949909051183652">"Veikimo laikas"</string>
     <string name="internal_memory" msgid="9129595691484260784">"Vidinė atmint."</string>
@@ -1346,6 +1360,7 @@
     <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>
     <string name="reset_dashboard_title" msgid="6254873816990678620">"Nustatyti parinktis iš naujo"</string>
+    <string name="reset_dashboard_summary" msgid="4851012632493522755">"Tinklą, programas arba įrenginį galima nustatyti iš naujo"</string>
     <string name="reset_network_title" msgid="6166025966016873843">"Iš naujo nustatyti „Wi-Fi“, mobiliųjų duomenų ir „Bluetooth“ nustatymus"</string>
     <string name="reset_network_desc" msgid="5547979398298881406">"Bus iš naujo nustatyti visi tinklo nustatymai, įskaitant:\n\n"<li>"„Wi‑Fi“;"</li>\n<li>"mobiliojo ryšio duomenis;"</li>\n<li>"„Bluetooth“."</li></string>
     <string name="reset_network_button_text" msgid="2035676527471089853">"Nustatyti iš naujo"</string>
@@ -1354,19 +1369,14 @@
     <string name="reset_network_confirm_title" msgid="1759888886976962773">"Nustatyti iš naujo?"</string>
     <string name="network_reset_not_available" msgid="7188610385577164676">"Šis naudotojas negali iš naujo nustatyti tinklo"</string>
     <string name="reset_network_complete_toast" msgid="787829973559541880">"Tinklo nustatymai nustatyti iš naujo"</string>
-    <string name="master_clear_title" msgid="6617679904229218425">"Ištrinti visus duomenis (iš naujo nustatyti gamyklinius duomenis)"</string>
-    <plurals name="master_clear_with_account_summary" formatted="false" msgid="5911377203778818712">
-      <item quantity="one"><xliff:g id="ACCOUNT_COUNT">%1$d</xliff:g> paskyra bus nustatyta iš naujo</item>
-      <item quantity="few"><xliff:g id="ACCOUNT_COUNT">%1$d</xliff:g> paskyros bus nustatytos iš naujo</item>
-      <item quantity="many"><xliff:g id="ACCOUNT_COUNT">%1$d</xliff:g> paskyros bus nustatyta iš naujo</item>
-      <item quantity="other"><xliff:g id="ACCOUNT_COUNT">%1$d</xliff:g> paskyrų bus nustatyta iš naujo</item>
-    </plurals>
-    <string name="master_clear_summary" msgid="6902443944660426951">"Vidinė saugykla ir visi duomenys bus nustatyti iš naujo"</string>
+    <string name="master_clear_title" msgid="3531267871084279512">"Ištrinti visus duomenis (atkurti gamyklinius duomenis)"</string>
     <string name="master_clear_desc" product="tablet" msgid="9146059417023157222">"Taip bus ištrinti visi duomenys iš planšetinio kompiuterio "<b>"vidinės atminties"</b>", įskaitant:\n\n"<li>"„Google“ paskyrą"</li>\n<li>"Sistemos ir programų duomenis bei nustatymus"</li>\n<li>"Atsisiųstas programas"</li></string>
     <string name="master_clear_desc" product="default" msgid="4800386183314202571">"Taip bus ištrinti visi toliau nurodyti duomenys iš telefono "<b>"vidinės atminties"</b>".\n\n"<li>"„Google“ paskyra"</li>\n<li>"Sistemos ir programų duomenys bei nustatymai"</li>\n<li>"Atsisiųstos programos"</li></string>
     <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"Šiuo metu esate prisijungę prie šių paskyrų:\n"</string>
     <string name="master_clear_other_users_present" product="default" msgid="5161423070702470742">\n\n"Yra kitų šio įrenginio naudotojų.\n"</string>
     <string name="master_clear_desc_also_erases_external" msgid="1903185203791274237"><li>"Muzika"</li>\n<li>"Nuotraukos"</li>\n<li>"Kiti naudotojo duomenys"</li></string>
+    <string name="master_clear_desc_also_erases_esim" msgid="312352697653096008"><li>"Operatoriai naudojant „eSIM“ kortelę"</li></string>
+    <string name="master_clear_desc_no_cancel_mobile_plan" msgid="5460926449093211144">\n\n"Tai atlikus mobiliojo ryšio paslaugos planas nebus atšauktas."</string>
     <string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="7744115866662613411">\n\n"Norint išvalyti muzikos failus, paveikslėlius bei kitus naudotojo duomenis, reikia ištrinti "<b>"USB atmintį"</b>"."</string>
     <string name="master_clear_desc_erase_external_storage" product="default" msgid="4801026652617377093">\n\n"Norint išvalyti muzikos failus, paveikslėlius ir kitus naudotojo duomenis, reikia ištrinti "<b>"SD kortelę"</b>"."</string>
     <string name="erase_external_storage" product="nosdcard" msgid="969364037450286809">"Ištrinti USB atmintinę"</string>
@@ -1483,15 +1493,16 @@
     <string name="settings_safetylegal_activity_title" msgid="6901214628496951727">"Saugos informacija"</string>
     <string name="settings_safetylegal_activity_unreachable" msgid="250674109915859456">"Nėra duomenų ryšio. Jei norite dabar peržiūrėti šią informaciją, bet kuriuo prie interneto prijungtu kompiuteriu eikite į %s."</string>
     <string name="settings_safetylegal_activity_loading" msgid="8059022597639516348">"Įkeliama…"</string>
-    <string name="lockpassword_choose_your_password_header" msgid="8624900666929394990">"Pasirinkite slaptažodį"</string>
-    <string name="lockpassword_choose_your_password_header_for_fingerprint" msgid="6624409510609085450">"Nust. slapt., kad gal. naud. kont. kodą"</string>
-    <string name="lockpassword_choose_your_pattern_header" msgid="6949761069941694050">"Pasirinkite piešinį"</string>
-    <string name="lockpassword_choose_your_pattern_header_for_fingerprint" msgid="5901096361617543819">"Nust. atrak. pieš., kad gal. naud. kont. kodą"</string>
-    <string name="lockpassword_choose_your_pin_header" msgid="7598849519816138302">"Pasirinkite PIN kodą"</string>
-    <string name="lockpassword_choose_your_pin_header_for_fingerprint" msgid="765344692615917183">"Nus. PIN kodą, kad gal. naud. kon. kodą"</string>
-    <string name="lockpassword_confirm_your_password_header" msgid="6308478184889846633">"Patvirtinkite slaptažodį"</string>
+    <string name="lockpassword_choose_your_screen_lock_header" msgid="3872462096767152394">"Ekrano užrakto nustatymas"</string>
+    <string name="lockpassword_choose_your_password_message" msgid="1197569283524841412">"Kad užtikrintumėte saugumą, nustatykite slaptažodį"</string>
+    <string name="lockpassword_choose_your_password_header_for_fingerprint" msgid="2541818487015343503">"Nust. slapt., kad gal. naud. kont. kodą"</string>
+    <string name="lockpassword_choose_your_pattern_header_for_fingerprint" msgid="7709785406243556723">"Nust. atr. pieš., kad gal. naud. k. kodą"</string>
+    <string name="lockpassword_choose_your_pin_message" msgid="1875420718677275646">"Kad užtikrintumėte saugumą, nustatykite PIN kodą"</string>
+    <string name="lockpassword_choose_your_pin_header_for_fingerprint" msgid="1549639053195796674">"Nus. PIN kodą, kad gal. naud. kon. kodą"</string>
+    <string name="lockpassword_choose_your_pattern_message" msgid="5986983400689720015">"Kad užtikrintumėte saugumą, nubrėžkite atrakinimo piešinį"</string>
+    <string name="lockpassword_confirm_your_password_header" msgid="1266027268220850931">"Įveskite slaptažodį iš naujo"</string>
     <string name="lockpassword_confirm_your_pattern_header" msgid="7543433733032330821">"Patvirtinkite piešinį"</string>
-    <string name="lockpassword_confirm_your_pin_header" msgid="49038294648213197">"Patvirtinkite savo PIN kodą"</string>
+    <string name="lockpassword_confirm_your_pin_header" msgid="7744513791910572550">"Įveskite PIN kodą iš naujo"</string>
     <string name="lockpassword_confirm_passwords_dont_match" msgid="5140892109439191415">"Slaptažodžiai neatitinka"</string>
     <string name="lockpassword_confirm_pins_dont_match" msgid="7226244811505606217">"PIN kodai neatitinka"</string>
     <string name="lockpassword_choose_lock_generic_header" msgid="3811438094903786145">"Atrakinimo pasirinkimas"</string>
@@ -1504,18 +1515,18 @@
     <string name="lockpassword_confirm_your_pattern_generic_profile" msgid="4435638308193361861">"Jei norite tęsti, naudokite darbo atrakinimo piešinį"</string>
     <string name="lockpassword_confirm_your_pin_generic_profile" msgid="3730141667547002246">"Jei norite tęsti, įveskite darbo PIN kodą"</string>
     <string name="lockpassword_confirm_your_password_generic_profile" msgid="4250642723467019894">"Jei norite tęsti, įveskite darbo slaptažodį"</string>
-    <!-- no translation found for lockpassword_strong_auth_required_device_pattern (530802132223800623) -->
-    <skip />
-    <!-- no translation found for lockpassword_strong_auth_required_device_pin (7829294830078036417) -->
-    <skip />
-    <!-- no translation found for lockpassword_strong_auth_required_device_password (3552644641574796973) -->
-    <skip />
-    <!-- no translation found for lockpassword_strong_auth_required_work_pattern (3003781907040522053) -->
-    <skip />
-    <!-- no translation found for lockpassword_strong_auth_required_work_pin (3367491332598821552) -->
-    <skip />
-    <!-- no translation found for lockpassword_strong_auth_required_work_password (8159775129968582940) -->
-    <skip />
+    <string name="lockpassword_strong_auth_required_device_pattern" msgid="530802132223800623">"Kad dar labiau apsaugotumėte įrenginį, naudokite įrenginio atrakinimo piešinį"</string>
+    <string name="lockpassword_strong_auth_required_device_pin" msgid="7829294830078036417">"Kad dar labiau apsaugotumėte įrenginį, įveskite įrenginio PIN kodą"</string>
+    <string name="lockpassword_strong_auth_required_device_password" msgid="3552644641574796973">"Kad dar labiau apsaugotumėte įrenginį, įveskite įrenginio slaptažodį"</string>
+    <string name="lockpassword_strong_auth_required_work_pattern" msgid="3003781907040522053">"Kad dar labiau apsaugotumėte įrenginį, naudokite darbo profilio atrakinimo piešinį"</string>
+    <string name="lockpassword_strong_auth_required_work_pin" msgid="3367491332598821552">"Kad dar labiau apsaugotumėte įrenginį, įveskite darbo profilio PIN kodą"</string>
+    <string name="lockpassword_strong_auth_required_work_password" msgid="8159775129968582940">"Kad dar labiau apsaugotumėte įrenginį, įveskite darbo profilio slaptažodį"</string>
+    <string name="lockpassword_confirm_your_pattern_details_frp" msgid="6757336656791723193">"Atkurti telefono gamykl. nust. Jei norite naudoti šį telef., įveskite ankstesnį atrakinimo piešinį."</string>
+    <string name="lockpassword_confirm_your_pin_details_frp" msgid="826520613445990470">"Atkurti telefono gamykl. nustatymai. Jei norite naudoti šį telefoną, įveskite ankstesnį PIN kodą."</string>
+    <string name="lockpassword_confirm_your_password_details_frp" msgid="8944081074615739040">"Atkurti telefono gamykl. nustatymai. Jei norite naudoti šį telefoną, įveskite ankstesnį slaptažodį."</string>
+    <string name="lockpassword_confirm_your_pattern_header_frp" msgid="2898036091609128286">"Patvirtinkite atrakinimo piešinį"</string>
+    <string name="lockpassword_confirm_your_pin_header_frp" msgid="4141601774778898803">"Patvirtinkite PIN kodą"</string>
+    <string name="lockpassword_confirm_your_password_header_frp" msgid="3762615419295360480">"Patvirtinkite slaptažodį"</string>
     <string name="lockpassword_invalid_pin" msgid="15588049067548470">"Netinkamas PIN kodas"</string>
     <string name="lockpassword_invalid_password" msgid="4038507398784975200">"Netinkamas slaptažodis"</string>
     <string name="lockpattern_need_to_unlock_wrong" msgid="1745247595356012176">"Netinkamas piešinys"</string>
@@ -1565,7 +1576,6 @@
     <string name="install_applications_title" msgid="4987712352256508946">"Leisti visus progr. šaltinius"</string>
     <string name="recent_app_category_title" msgid="6673071268966003928">"Neseniai atidarytos programos"</string>
     <string name="see_all_apps_title" msgid="1317153498074308438">"Žr. visas programas (<xliff:g id="COUNT">%1$d</xliff:g>)"</string>
-    <string name="recent_app_summary" msgid="3366446669844932300">"Prieš <xliff:g id="TIME">^1</xliff:g>"</string>
     <string name="install_all_warning" product="tablet" msgid="8310489909586138165">"Įdiegus nežinomų programų didėja planšetinio kompiuterio ir asmeninių duomenų pažeidimo rizika. Diegdami programas iš šio šaltinio sutinkate, kad esate patys atsakingi už žalą planšetiniam kompiuteriui arba duomenų praradimą dėl jų naudojimo."</string>
     <string name="install_all_warning" product="default" msgid="1952257127370115988">"Įdiegus nežinomų programų didėja telefono ir asmeninių duomenų pažeidimo rizika. Diegdami programas iš šio šaltinio sutinkate, kad esate patys atsakingi už žalą telefonui arba duomenų praradimą dėl jų naudojimo."</string>
     <string name="advanced_settings" msgid="1777249286757067969">"Išplėstiniai nustatymai"</string>
@@ -1831,7 +1841,7 @@
     <string name="accessibility_settings_summary" msgid="981260486011624939">"Ekrano skaitytuvai, vaizdo, sąveikos valdikliai"</string>
     <string name="vision_settings_title" msgid="4204111425716868288">"Matomumo nustatymai"</string>
     <string name="vision_settings_description" msgid="5679491180156408260">"Galite tinkinti šį įrenginį pagal savo poreikius. Vėliau šias pritaikymo neįgaliesiems funkcijas galite pakeisti nustatymuose."</string>
-    <string name="vision_settings_suggestion_title" msgid="917294957154878441">"Padidinti šrifto dydį"</string>
+    <string name="vision_settings_suggestion_title" msgid="8058794060304707004">"Pakeisti šrifto dydį"</string>
     <string name="screen_reader_category_title" msgid="7739154903913400641">"Ekrano skaitytuvai"</string>
     <string name="audio_and_captions_category_title" msgid="3420727114421447524">"Garsas ir tekstas ekrane"</string>
     <string name="display_category_title" msgid="685461049938269166">"Ekranas"</string>
@@ -1868,7 +1878,6 @@
     <string name="accessibility_display_inversion_preference_subtitle" msgid="7052959202195368109">"Gali paveikti našumą"</string>
     <string name="accessibility_autoclick_preference_title" msgid="7014499339068449623">"Spustelėkite, kai žymeklis nustos judėti"</string>
     <string name="accessibility_autoclick_delay_preference_title" msgid="3962261178385106006">"Delsa prieš paspaudimą"</string>
-    <string name="preference_summary_default_combination" msgid="8532964268242666060">"<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">"ĮJUNGTI"</string>
     <string name="accessibility_summary_state_disabled" msgid="2241315620132005595">"IŠJUNGTA"</string>
     <string name="enable_quick_setting" msgid="2366999897816894536">"Rodyti sparčiuosiuose nustatymuose"</string>
@@ -2001,12 +2010,14 @@
     <string name="background_activity_summary_on" msgid="649282072540085599">"Programa gali būti vykdoma fone, kai ji nenaudojama"</string>
     <string name="background_activity_summary_off" msgid="7666330699090632040">"Programos fono veikla ribojama, kai ji nenaudojama"</string>
     <string name="background_activity_summary_disabled" msgid="3710669050484599847">"Neleidžiama vykdyti programos fone"</string>
+    <string name="background_activity_summary_whitelisted" msgid="7375400051141016808">"Negalima optimizuoti programos akumuliatoriaus naudojimo"</string>
+    <string name="background_activity_warning_dialog_title" msgid="2216249969149568871">"Apriboti veiklą fone?"</string>
+    <string name="background_activity_warning_dialog_text" msgid="7049624449246121981">"Jei apribosite programos veiklą fone, ji gali netinkamai veikti"</string>
     <string name="device_screen_usage" msgid="3386088035570409683">"Ekrano naudojimas po paskutinio visiško įkrovimo"</string>
     <string name="device_screen_consumption" msgid="4607589286438986687">"Ekrano suvartojama energija"</string>
     <string name="device_cellular_network" msgid="4724773411762382950">"Mobiliojo ryšio tinklo nuskaitymas"</string>
-    <string name="power_last_full_charge_summary" msgid="532845389094620657">"prieš <xliff:g id="TIME">^1</xliff:g>"</string>
-    <string name="power_usage_list_summary" msgid="6775339745194635000">"Programų naud. po visiško įkrovimo (prieš <xliff:g id="TIME">^1</xliff:g>)"</string>
-    <string name="power_usage_list_summary_device" msgid="7036566616386864302">"Įrenginio naudojimas po visiško įkrovimo (prieš <xliff:g id="TIME">^1</xliff:g>)"</string>
+    <string name="power_usage_list_summary" msgid="6393929085382334341">"Programų naudojimas po visiško įkrovimo (<xliff:g id="RELATIVE_TIME">^1</xliff:g>)"</string>
+    <string name="power_usage_list_summary_device" msgid="4461926045610455423">"Įrenginio naudojimas po visiško įkrovimo (<xliff:g id="RELATIVE_TIME">^1</xliff:g>)"</string>
     <string name="screen_usage_summary" msgid="6687403051423153550">"Kiek laiko ekranas buvo įjungtas po visiško įkrovimo"</string>
     <string name="device_usage_list_summary" msgid="5623036661468763251">"Įrenginio naudojimas po visiško įkrovimo"</string>
     <string name="battery_since_unplugged" msgid="338073389740738437">"Akumuliatoriaus naudojimas po to, kai buvo ištrauktas iš lizdo"</string>
@@ -2144,7 +2155,7 @@
     <string name="process_kernel_label" msgid="3916858646836739323">"„Android“ OS"</string>
     <string name="process_mediaserver_label" msgid="6500382062945689285">"Medijos serveris"</string>
     <string name="process_dex2oat_label" msgid="2592408651060518226">"Programų optimizavimas"</string>
-    <string name="battery_saver" msgid="1426682272004907982">"Akumuliatoriaus tausojimo priemonė"</string>
+    <string name="battery_saver" msgid="1426682272004907982">"Akumuliatoriaus tausojimo pr."</string>
     <string name="battery_saver_turn_on_automatically_title" msgid="9023847300114669426">"Įjungti automatiškai"</string>
     <string name="battery_saver_turn_on_automatically_never" msgid="6610846456314373">"Niekada"</string>
     <string name="battery_saver_turn_on_automatically_pct" msgid="8665950426992057191">"kai akumuliatoriaus įkrovos lygis yra <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
@@ -2252,14 +2263,14 @@
     <string name="credentials_unlock_hint" msgid="2301301378040499348">"Įveskite kredencialų atmintinės slaptažodį."</string>
     <string name="credentials_old_password" msgid="7553393815538684028">"Dabartinis slaptažodis:"</string>
     <string name="credentials_reset_hint" msgid="6297256880896133631">"Pašalinti visą turinį?"</string>
-    <string name="credentials_password_too_short" msgid="7502749986405522663">"Slaptažodį turi sudaryti mažiausiai 8 simboliai."</string>
     <string name="credentials_wrong_password" msgid="2541932597104054807">"Neteisingas slaptažodis."</string>
     <string name="credentials_reset_warning" msgid="5320653011511797600">"Neteisingas slaptažodis. Dar galite bandyti vieną kartą, paskui įgaliojimų atmintinė bus ištrinta."</string>
     <string name="credentials_reset_warning_plural" msgid="6514085665301095279">"Neteisingas slaptažodis. Dar galite bandyti <xliff:g id="NUMBER">%1$d</xliff:g> k., paskui įgaliojimų atmintinė bus ištrinta."</string>
     <string name="credentials_erased" msgid="2907836028586342969">"Kredencialų atmintinė ištrinta."</string>
     <string name="credentials_not_erased" msgid="7685932772284216097">"Nepavyko ištr. kreden. atmint."</string>
     <string name="credentials_enabled" msgid="7588607413349978930">"Įgaliojimų saugykla įgalinta."</string>
-    <string name="credentials_configure_lock_screen_hint" msgid="6757119179588664966">"Jei norite naudoti kredencialų atmintinę, pirmiausia turite nustatyti ekrano užrakto PIN kodą arba slaptažodį."</string>
+    <string name="credentials_configure_lock_screen_hint" msgid="8058230497337529036">"Kad galėtumėte naudoti prisijungimo duomenų atmintinę, įrenginyje turi būti nustatytas saugus užrakinimo ekranas"</string>
+    <string name="credentials_configure_lock_screen_button" msgid="253239765216055321">"NUSTATYTI UŽRAKTĄ"</string>
     <string name="usage_access_title" msgid="332333405495457839">"Progr., gal. pasiekti duom."</string>
     <string name="emergency_tone_title" msgid="1055954530111587114">"Pagalbos tonas"</string>
     <string name="emergency_tone_summary" msgid="722259232924572153">"Nustatyti elgesį, kai skambinama pagalbos numeriu"</string>
@@ -2379,8 +2390,6 @@
     <skip />
     <string name="cant_sync_dialog_title" msgid="2777238588398046285">"Negalima sinchronizuoti neautomatiškai"</string>
     <string name="cant_sync_dialog_message" msgid="1938380442159016449">"Šiuo metu šio elemento sinchronizavimas neleidžiamas. Jei norite pakeisti šį nustatymą, laikinai įjunkite foninius duomenis ir automatinį sinchronizavimą."</string>
-    <string name="wimax_settings" msgid="2655139497028469039">"4G"</string>
-    <string name="status_wimax_mac_address" msgid="8390791848661413416">"4G MAC adresas"</string>
     <string name="enter_password" msgid="8035706727471334122">"Jei norite paleisti „Android“, įveskite slaptažodį"</string>
     <string name="enter_pin" msgid="5305333588093263790">"Jei norite paleisti „Android“, įveskite PIN kodą"</string>
     <string name="enter_pattern" msgid="4187435713036808566">"Jei norite paleisti „Android“, nupieškite savo šabloną"</string>
@@ -2394,6 +2403,7 @@
     <string name="misc_files_selected_count" msgid="4647048020823912088">"pasirinkti (-a) <xliff:g id="NUMBER">%1$d</xliff:g> iš <xliff:g id="TOTAL">%2$d</xliff:g>"</string>
     <string name="misc_files_selected_count_bytes" msgid="2876232009069114352">"<xliff:g id="NUMBER">%1$s</xliff:g> iš <xliff:g id="TOTAL">%2$s</xliff:g>"</string>
     <string name="select_all" msgid="1562774643280376715">"Pasirinkti viską"</string>
+    <string name="data_plan_usage_manage_plans_button_text" msgid="8997761990902708162">"Tvarkyti planus"</string>
     <string name="data_usage_summary_title" msgid="3804110657238092929">"Duomenų naudojimas"</string>
     <string name="data_usage_app_summary_title" msgid="4147258989837459172">"Programos duomenų naud."</string>
     <string name="data_usage_accounting" msgid="7170028915873577387">"Operatoriaus duomenų apskaita gali skirtis nuo jūsų įrenginio apskaitos."</string>
@@ -2479,6 +2489,9 @@
     <string name="data_usage_metered_mobile" msgid="5423305619126978393">"Mobiliojo ryšio tinklai"</string>
     <string name="data_usage_metered_wifi" msgid="1761738002328299714">"Matuojami „Wi-Fi“ tinklai"</string>
     <string name="data_usage_metered_wifi_disabled" msgid="727808462375941567">"Kad galėtumėte pasirinkti matuojamus tinklus, įjunkite „Wi-Fi“."</string>
+    <string name="data_usage_metered_auto" msgid="1262028400911918865">"Automatinis"</string>
+    <string name="data_usage_metered_yes" msgid="9217539611385225894">"Matuojamas"</string>
+    <string name="data_usage_metered_no" msgid="4025232961929071789">"Nematuojamas"</string>
     <string name="data_usage_disclaimer" msgid="6887858149980673444">"Operatoriaus duomenų apskaita gali skirtis nuo informacijos įrenginyje."</string>
     <string name="cryptkeeper_emergency_call" msgid="198578731586097145">"Skambutis pagalbos numeriu"</string>
     <string name="cryptkeeper_return_to_call" msgid="5613717339452772491">"Grįžti prie skambučio"</string>
@@ -2570,9 +2583,6 @@
     <string name="backup_pw_set_button_text" msgid="2387480910044648795">"Nustatyti atsarginės kopijos slaptažodį"</string>
     <string name="backup_pw_cancel_button_text" msgid="8845630125391744615">"Atšaukti"</string>
     <string name="additional_system_update_settings_list_item_title" msgid="214987609894661992">"Papildomi sistemos naujiniai"</string>
-    <string name="selinux_status_disabled" msgid="924551035552323327">"Neleidžiama"</string>
-    <string name="selinux_status_permissive" msgid="6004965534713398778">"Negriežta"</string>
-    <string name="selinux_status_enforcing" msgid="2252703756208463329">"Vykdoma"</string>
     <string name="ssl_ca_cert_warning" msgid="2045866713601984673">"Tinklas gali būti stebimas"</string>
     <string name="done_button" msgid="1991471253042622230">"Atlikta"</string>
     <plurals name="ssl_ca_cert_dialog_title" formatted="false" msgid="7145092748045794650">
@@ -2689,7 +2699,7 @@
     <string name="restriction_menu_change_pin" msgid="740081584044302775">"Keisti PIN kodą"</string>
     <string name="app_notifications_switch_label" msgid="9124072219553687583">"Rodyti pranešimus"</string>
     <string name="help_label" msgid="6886837949306318591">"Pagalba ir atsiliep."</string>
-    <string name="support_summary" msgid="2705726826263742491">"Pagalbos straipsniai, palaikymas telefonu ir dalyvaujant pokalbyje, darbo pradžia"</string>
+    <string name="support_summary" msgid="2705726826263742491">"Pagalb. str., palaikym. tel. ir pokalb., darbo pr."</string>
     <string name="user_account_title" msgid="1127193807312271167">"Turiniui skirta paskyra"</string>
     <string name="user_picture_title" msgid="7297782792000291692">"Nuotraukos ID"</string>
     <string name="extreme_threats_title" msgid="6549541803542968699">"Didelė grėsmė"</string>
@@ -2780,7 +2790,8 @@
       <item quantity="many">Rodyti %d paslėpto elemento</item>
       <item quantity="other">Rodyti %d paslėptų elementų</item>
     </plurals>
-    <string name="network_dashboard_title" msgid="4771589228992391573">"Tinkas ir internetas"</string>
+    <string name="dashboard_suggestion_condition_footer_content_description" msgid="2898588191174845961">"Sutraukti"</string>
+    <string name="network_dashboard_title" msgid="4771589228992391573">"Tinklas ir internetas"</string>
     <string name="network_dashboard_summary_mobile" msgid="3851083934739500429">"mobilusis"</string>
     <string name="network_dashboard_summary_data_usage" msgid="3843261364705042212">"duomenų naudojimas"</string>
     <string name="network_dashboard_summary_hotspot" msgid="8494210248613254574">"viešosios interneto prieigos taškas"</string>
@@ -2839,8 +2850,7 @@
     <string name="keywords_gesture" msgid="3526905012224714078">"gestai"</string>
     <string name="keywords_payment_settings" msgid="5220104934130446416">"mokėti, paliesti, mokėjimai"</string>
     <string name="keywords_backup" msgid="470070289135403022">"atsarginė kopija, kurti atsarginę kopiją"</string>
-    <!-- no translation found for keywords_assist_gesture_launch (813968759791342591) -->
-    <skip />
+    <string name="keywords_assist_gesture_launch" msgid="813968759791342591">"gestas"</string>
     <string name="setup_wifi_nfc_tag" msgid="9028353016222911016">"Nustatyti „Wi-Fi“ ALR žymą"</string>
     <string name="write_tag" msgid="8571858602896222537">"Rašyti"</string>
     <string name="status_awaiting_tap" msgid="2130145523773160617">"Palieskite žymą, kad galėtumėte rašyti..."</string>
@@ -2885,8 +2895,14 @@
       <item quantity="many"><xliff:g id="ON_COUNT">%d</xliff:g> automatinės taisyklės įjungta</item>
       <item quantity="other"><xliff:g id="ON_COUNT">%d</xliff:g> automatinių taisyklių įjungta</item>
     </plurals>
-    <string name="zen_mode_settings_title" msgid="842308776768942600">"Netrukdymo režimo nuostatos"</string>
-    <string name="zen_mode_priority_settings_title" msgid="2623117023031824309">"Tik pagal prioritetą"</string>
+    <string name="zen_mode_settings_title" msgid="1066226840983908121">"Netrukdymo režimas"</string>
+    <string name="zen_mode_behavior_settings_title" msgid="1463303933529313969">"Elgsena"</string>
+    <string name="zen_mode_behavior_allow_title" msgid="3845615648136218141">"Leisti garsus ir vibravimą iš"</string>
+    <string name="zen_mode_behavior_no_sound" msgid="1219626004723208056">"Nėra garso"</string>
+    <string name="zen_mode_behavior_total_silence" msgid="6716603819806610626">"Nėra garso (visiška tyla)"</string>
+    <string name="zen_mode_behavior_no_sound_except" msgid="4968477585788243114">"Nėra garso, išskyrus <xliff:g id="CATEGORIES">%1$s</xliff:g>"</string>
+    <!-- no translation found for zen_mode_behavior_alarms_only (2423480992071472963) -->
+    <skip />
     <string name="zen_mode_automation_settings_title" msgid="4228995740594063774">"Automatinės taisyklės"</string>
     <string name="zen_mode_automation_suggestion_title" msgid="5105443455143476201">"Nustatyti netrukdymo režimo taisykles"</string>
     <string name="zen_mode_automation_suggestion_summary" msgid="4732808039946935657">"Apriboti garsus ir vibravimą tam tikru metu"</string>
@@ -2928,13 +2944,15 @@
     <string name="notifications_title" msgid="8086372779371204971">"Pranešimai"</string>
     <string name="app_notifications_title" msgid="5810577805218003760">"Programų pranešimai"</string>
     <string name="notification_channel_title" msgid="2260666541030178452">"Pranešimo kategorija"</string>
+    <string name="notification_group_title" msgid="7180506440133859601">"Pranešimų kategorijos grupė"</string>
     <string name="notification_importance_title" msgid="848692592679312666">"Svarba"</string>
-    <string name="notification_importance_unspecified" msgid="2196023702875112081">"Leisti programai nuspręsti"</string>
+    <string name="notification_importance_unspecified" msgid="6622173510486113958">"Leisti garsą"</string>
     <string name="notification_importance_blocked" msgid="7938180808339386300">"Niekada nerodyti pranešimų"</string>
     <string name="notification_importance_min" msgid="5455049524984686275">"Neskambėti ir nepertraukti vaizdo"</string>
     <string name="notification_importance_low" msgid="8881468429453766553">"Nėra garso"</string>
     <string name="notification_importance_default" msgid="5958338024601957516">"Skambėti"</string>
     <string name="notification_importance_high" msgid="2082429479238228527">"Skambėti ir iššokti ekrane"</string>
+    <string name="notification_importance_high_silent" msgid="2667033773703765252">"Iššokantysis langas ekrane"</string>
     <string name="notification_importance_min_title" msgid="6974673091137544803">"Žemas"</string>
     <string name="notification_importance_low_title" msgid="8131254047772814309">"Vidutinis"</string>
     <string name="notification_importance_default_title" msgid="9120383978536089489">"Aukštas"</string>
@@ -2973,15 +2991,21 @@
     <string name="picture_in_picture_keywords" msgid="8361318686701764690">"vaizdas vaizde"</string>
     <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>
-    <!-- no translation found for picture_in_picture_app_detail_summary (1264019085827708920) -->
-    <skip />
+    <string name="picture_in_picture_app_detail_summary" msgid="1264019085827708920">"Leisti šiai programai kurti vaizdo vaizde langą, kol programa yra atidaryta arba ją uždarius (pvz., kad galėtumėte ir toliau žiūrėti vaizdo įrašą). Šis langas rodomas virš kitų naudojamų programų."</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>
     <string name="app_notifications_off_desc" msgid="4882445501376722969">"„Android“ blokuoja šios programos pranešimus, kad jie nebūtų rodomi šiame įrenginyje"</string>
     <string name="channel_notifications_off_desc" msgid="5899225298718840635">"„Android“ blokuoja šios kategorijos pranešimus, kad jie nebūtų rodomi šiame įrenginyje"</string>
+    <string name="channel_group_notifications_off_desc" msgid="1620950416247316370">"„Android“ blokuoja šios grupės pranešimus, kad jie nebūtų rodomi šiame įrenginyje"</string>
     <string name="notification_channels" msgid="5346841743182627500">"Kategorijos"</string>
     <string name="notification_channels_other" msgid="5645317113885788226">"Kita"</string>
+    <plurals name="notification_group_summary" formatted="false" msgid="3420621520561455358">
+      <item quantity="one"><xliff:g id="COUNT_1">%d</xliff:g> kategorija</item>
+      <item quantity="few"><xliff:g id="COUNT_1">%d</xliff:g> kategorijos</item>
+      <item quantity="many"><xliff:g id="COUNT_1">%d</xliff:g> kategorijos</item>
+      <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> kategorijų</item>
+    </plurals>
     <string name="no_channels" msgid="3077375508177744586">"Ši programa nepaskelbė jokių pranešimų"</string>
     <string name="app_settings_link" msgid="8894946007543660906">"Papildomi programos nustatymai"</string>
     <string name="app_notification_listing_summary_zero" msgid="6482582965081108108">"Įjungta visoms programoms"</string>
@@ -3062,12 +3086,14 @@
     <string name="zen_mode_from_starred" msgid="2678345811950997027">"Tik iš žvaigždutėmis pažymėtų kontaktų"</string>
     <string name="zen_mode_from_none" msgid="8219706639954614136">"Nėra"</string>
     <string name="zen_mode_alarms" msgid="2165302777886552926">"Signalai"</string>
+    <!-- no translation found for zen_mode_media_system_other (8900209390529859777) -->
+    <skip />
     <string name="zen_mode_reminders" msgid="5458502056440485730">"Priminimai"</string>
     <string name="zen_mode_events" msgid="7914446030988618264">"Įvykiai"</string>
     <string name="zen_mode_all_callers" msgid="584186167367236922">"Visi skambintojai"</string>
     <string name="zen_mode_selected_callers" msgid="3127598874060615742">"Pasirinkti skambintojai"</string>
     <string name="zen_mode_repeat_callers" msgid="5019521886428322131">"Pakartotinai skambinantys"</string>
-    <string name="zen_mode_repeat_callers_summary" msgid="7192713032364140137">"Jei asmuo skambina antrą kartą per <xliff:g id="MINUTES">%d</xliff:g> min. laikotarpį, leisti skambutį"</string>
+    <string name="zen_mode_repeat_callers_summary" msgid="239685342222975733">"Jei asmuo skambina antrą kartą per <xliff:g id="MINUTES">%d</xliff:g> min. laikotarpį"</string>
     <string name="zen_mode_when" msgid="2767193283311106373">"Automatiškai įjungti"</string>
     <string name="zen_mode_when_never" msgid="8809494351918405602">"Niekada"</string>
     <string name="zen_mode_when_every_night" msgid="3122486110091921009">"Kiekvieną naktį"</string>
@@ -3100,6 +3126,7 @@
     <string name="zen_mode_screen_off_visual_interruptions" msgid="4850792880144382633">"Kai ekranas išjungtas"</string>
     <string name="zen_mode_no_visual_interruptions" msgid="8742776003822778472">"Kai ekranas įjungtas arba išjungtas"</string>
     <string name="notification_app_settings_button" msgid="6685640230371477485">"Įspėjimų nustatymai"</string>
+    <string name="suggestion_button_text" msgid="3275010948381252006">"Gerai"</string>
     <string name="device_feedback" msgid="3238056036766293294">"Siųsti atsiliepimą apie šį įrenginį"</string>
     <string name="restr_pin_enter_admin_pin" msgid="1085834515677448072">"Įveskite administratoriaus PIN kodą"</string>
     <string name="switch_on_text" msgid="1124106706920572386">"Įjungta"</string>
@@ -3193,7 +3220,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>
@@ -3244,7 +3271,7 @@
     <string name="process_format" msgid="77905604092541454">"„<xliff:g id="APP_NAME">%1$s</xliff:g>“ (<xliff:g id="COUNT">%2$d</xliff:g>)"</string>
     <string name="high_power_apps" msgid="3459065925679828230">"Akumuliatoriaus optimiz."</string>
     <string name="additional_battery_info" msgid="4754099329165411970">"Naudojimo įspėjimai"</string>
-    <string name="show_all_apps" msgid="1512506948197818534">"Rodyti visą įrenginio naudojimo informaciją"</string>
+    <string name="show_all_apps" msgid="1512506948197818534">"Rodyti visą įrenginio naudojimo info."</string>
     <string name="hide_extra_apps" msgid="5016497281322459633">"Rodyti progr. naud. inform."</string>
     <string name="power_high_usage_title" msgid="6027369425057347826">"Intensyvus naudojimas"</string>
     <plurals name="power_high_usage_summary" formatted="false" msgid="467347882627862744">
@@ -3296,6 +3323,7 @@
     <string name="usb_summary_file_transfers" msgid="6435943692610175111">"Failų perdavimas"</string>
     <string name="usb_summary_photo_transfers" msgid="8440204169576585250">"Nuotraukų perdavimas (PTP)"</string>
     <string name="usb_summary_MIDI" msgid="5687906612187885908">"Įrenginio naudojimas kaip MIDI"</string>
+    <string name="sms_mirroring_pref" msgid="6475043279147376031">"SMS ekrano vaizdo bendrinimas"</string>
     <string name="background_check_pref" msgid="7550258400138010979">"Fono tikrinimas"</string>
     <string name="background_check_title" msgid="4534254315824525593">"Visateisė prieiga prie fono"</string>
     <string name="assist_access_context_title" msgid="2269032346698890257">"Naudoti tekstą iš ekrano"</string>
@@ -3364,7 +3392,7 @@
     <string name="write_settings_title" msgid="4232152481902542284">"Gali keisti sistemos nustatymus"</string>
     <string name="write_system_settings" msgid="3482913590601096763">"Keisti sistemos nustatymus"</string>
     <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="permit_write_settings" msgid="658555006453212691">"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>
@@ -3465,9 +3493,12 @@
     <string name="color_temperature" msgid="2070126836910615605">"Šaltų spalvų temperatūra"</string>
     <string name="color_temperature_desc" msgid="4793729830226404052">"Naudoti šaltesnes ekrano spalvas"</string>
     <string name="color_temperature_toast" msgid="4974218172133854827">"Kad pritaikytumėte spalvos pakeitimą, išjunkite ekraną"</string>
-    <string name="telephony_monitor_toast" msgid="7003764250271195384">"Kad pritaikytumėte telefonijos stebėjimo priemonės pakeitimą, paleiskite įrenginį iš naujo"</string>
+    <string name="connectivity_monitor_switch" msgid="9059759348648583421">"Connectivity Monitor"</string>
+    <string name="connectivity_monitor_switch_summary" msgid="2828658652378866401">"„ConnectivityMonitor“ rinks žurnalus, kai aptiks ryšio problemą, ir naudotojui pateiks raginimą pranešti apie riktą"</string>
+    <string name="connectivity_monitor_toast" msgid="5551859612881173028">"Kad pritaikytumėte ryšio stebėjimo priemonės pakeitimą, paleiskite įrenginį iš naujo"</string>
     <string name="camera_hal_hdrplus_switch" msgid="8377365197105267466">"Fotoaparatas HAL HDR+"</string>
     <string name="camera_hal_hdrplus_toast" msgid="2063703797270055299">"Kad pritaikytumėte fotoaparato HAL HDR+ pakeitimą, paleiskite įrenginį iš naujo"</string>
+    <string name="camera_laser_sensor_switch" msgid="8913588990743234440">"Fotoaparato lazerio jutiklis"</string>
     <string name="ota_disable_automatic_update" msgid="2319639631655915050">"Automatiniai sistemos naujiniai"</string>
     <string name="usage" msgid="2977875522080448986">"Naudojimas"</string>
     <string name="cellular_data_usage" msgid="2155683719898158203">"Mobiliojo ryšio duom. naud."</string>
@@ -3495,7 +3526,7 @@
     <string name="data_warning" msgid="209133958008062117">"Duomenų įspėjimas"</string>
     <string name="set_data_limit" msgid="2901526323210516923">"Nustatyti duomenų apribojimą"</string>
     <string name="data_limit" msgid="1885406964934590552">"Duomenų apribojimas"</string>
-    <string name="data_usage_template" msgid="392191945602400904">"<xliff:g id="ID_2">%2$s</xliff:g> išnaudota <xliff:g id="ID_1">%1$s</xliff:g>"</string>
+    <string name="data_usage_template" msgid="2923744765873163859">"<xliff:g id="ID_2">%2$s</xliff:g> sunaudota: <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="configure" msgid="1029654422228677273">"Konfigūruoti"</string>
     <string name="data_usage_other_apps" msgid="3272872663517382050">"Kitos įtrauktos naudojamos programos"</string>
     <plurals name="data_saver_unrestricted_summary" formatted="false" msgid="2635267833484232703">
@@ -3568,7 +3599,7 @@
     <string name="button_confirm_convert_fbe" msgid="7101855374850373091">"Išvalyti ir konvertuoti"</string>
     <string name="reset_shortcut_manager_throttling" msgid="6495066467198668994">"Iš naujo nustatyti „ShortcutManager“ įkainių ribojimą"</string>
     <string name="reset_shortcut_manager_throttling_complete" msgid="1826770872063707900">"„ShortcutManager“ įkainių ribojimas nustatytas iš naujo"</string>
-    <string name="notification_suggestion_title" msgid="4506524937307816475">"Užrakinimo ekrano pranešimų valdymas"</string>
+    <string name="notification_suggestion_title" msgid="387052719462473500">"Valdykite informaciją užrakinimo ekrane"</string>
     <string name="notification_suggestion_summary" msgid="8521159741445416875">"Rodykite arba slėpkite pranešimo turinį"</string>
     <string name="page_tab_title_summary" msgid="4070309266374993258">"Viskas"</string>
     <string name="page_tab_title_support" msgid="8483187649355540109">"Palaik. ir patarimai"</string>
@@ -3576,7 +3607,7 @@
     <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>
     <string name="premium_sms_access" msgid="4660047004791638305">"Išskirtinių SMS prieiga"</string>
-    <string name="bluetooth_disabled" msgid="2456198532288640046">"Nematoma kitiems įrenginiams"</string>
+    <string name="bluetooth_disabled" msgid="6244000672828617410">"Išjungta"</string>
     <string name="bluetooth_connected_summary" msgid="7672528674593152862">"Prisijungta prie „<xliff:g id="ID_1">%1$s</xliff:g>“"</string>
     <string name="bluetooth_connected_multiple_devices_summary" msgid="9173661896296663932">"Prisijungta prie kelių įrenginių"</string>
     <string name="demo_mode" msgid="2798762752209330277">"Sistemos NS demonstracinis režimas"</string>
@@ -3684,7 +3715,7 @@
     <string name="web_action_enable_title" msgid="4051513950976670853">"Akimirksniu įkeliamos programėlės"</string>
     <string name="web_action_enable_summary" msgid="3108127559723396382">"Atidaryti nuorodas programose, net jei jos neįdiegtos"</string>
     <string name="web_action_section_title" msgid="7364647086538399136">"Akimirksniu įkeliamos programėlės"</string>
-    <string name="instant_apps_account" msgid="1433620209791992528">"Akimirksniu įkeliamų programėlių paskyra"</string>
+    <string name="instant_apps_settings" msgid="8827777916518348213">"„Android“ akimirksniu įkeliamų programėlių nuostatos"</string>
     <string name="domain_url_section_title" msgid="7046835219056428883">"Įdiegtos programos"</string>
     <string name="automatic_storage_manager_activation_warning" msgid="6353100011690933254">"Saugyklą dabar tvarko saugyklos valdytojas"</string>
     <string name="account_for_section_header" msgid="5356566418548737121">"<xliff:g id="USER_NAME">%1$s</xliff:g> paskyros"</string>
@@ -3735,7 +3766,9 @@
     <string name="enterprise_privacy_always_on_vpn_personal" msgid="9217774730260037434">"Visada įjungto VPN funkcija įjungta jūsų asmeniniame profilyje"</string>
     <string name="enterprise_privacy_always_on_vpn_work" msgid="7244472958208315814">"Visada įjungto VPN funkcija įjungta jūsų darbo profilyje"</string>
     <string name="enterprise_privacy_global_http_proxy" msgid="7936664553416257333">"Nustatytas visuotinis HTTP tarpinis serveris"</string>
-    <string name="enterprise_privacy_ca_certs" msgid="5885892204903688909">"Patikimi prisijungimo duomenys"</string>
+    <string name="enterprise_privacy_ca_certs_device" msgid="2019652712782510262">"Patikimi prisijungimo duomenys"</string>
+    <string name="enterprise_privacy_ca_certs_personal" msgid="2279084820904076599">"Patikimi prisijungimo duomenys asmeniniame profilyje"</string>
+    <string name="enterprise_privacy_ca_certs_work" msgid="6187377647815301809">"Patikimi prisijungimo duomenys darbo profilyje"</string>
     <plurals name="enterprise_privacy_number_ca_certs" formatted="false" msgid="526375234629534165">
       <item quantity="one">Mažiausiai <xliff:g id="COUNT_1">%d</xliff:g> CA sertifikatas</item>
       <item quantity="few">Mažiausiai <xliff:g id="COUNT_1">%d</xliff:g> CA sertifikatai</item>
@@ -3808,6 +3841,8 @@
     <string name="carrier_provisioning" msgid="4398683675591893169">"Operatoriaus aprūpinimo informacija"</string>
     <string name="trigger_carrier_provisioning" msgid="3434865918009286187">"Aktyviklio operatoriaus aprūpinimas"</string>
     <string name="new_device_suggestion_title" msgid="698847081680980774">"Kas nauja ir verta dėmesio?"</string>
-    <string name="new_device_suggestion_summary" msgid="7172709269203435870">"Sužinokite 5 geriausias funkcijas"</string>
+    <string name="new_device_suggestion_summary" product="default" msgid="206396571522515855">"Peržiūrėkite naujo telefono apžvalgą"</string>
+    <string name="new_device_suggestion_summary" product="tablet" msgid="393751455688210956">"Peržiūrėkite naujo planšetinio kompiuterio apžvalgą"</string>
+    <string name="new_device_suggestion_summary" product="device" msgid="2939870049868336652">"Peržiūrėkite naujo įrenginio apžvalgą"</string>
     <string name="disabled_low_ram_device" msgid="3751578499721173344">"Ši funkcija nepasiekiama šiame įrenginyje"</string>
 </resources>
diff --git a/res/values-lv/arrays.xml b/res/values-lv/arrays.xml
index 4d26a15..d3393ff 100644
--- a/res/values-lv/arrays.xml
+++ b/res/values-lv/arrays.xml
@@ -100,8 +100,6 @@
     <!-- no translation found for wifi_security_no_eap:0 (2084555984818107151) -->
     <!-- no translation found for wifi_security_no_eap:1 (397579322683471524) -->
     <!-- no translation found for wifi_security_no_eap:2 (1968820975358150484) -->
-    <!-- no translation found for wifi_ap_security:0 (5251664683198623324) -->
-    <!-- no translation found for wifi_ap_security:1 (7989073072260294673) -->
   <string-array name="wifi_eap_method">
     <item msgid="1160193392455075561">"PEAP"</item>
     <item msgid="7981731051382306293">"TLS"</item>
diff --git a/res/values-lv/strings.xml b/res/values-lv/strings.xml
index abc536c..8dd08a1 100644
--- a/res/values-lv/strings.xml
+++ b/res/values-lv/strings.xml
@@ -167,7 +167,7 @@
     <string name="bluetooth_map_acceptance_dialog_text" msgid="8712508202081143737">"Ierīce “%1$s” vēlas piekļūt jūsu ziņojumiem. Vai sniegt piekļuvi ierīcei “%2$s”?"</string>
     <string name="bluetooth_sap_request" msgid="2669762224045354417">"Pieprasījums piekļūt SIM kartei"</string>
     <string name="bluetooth_sap_acceptance_dialog_text" msgid="4414253873553608690">"<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g> pieprasa piekļuvi SIM kartei. Piešķirot piekļuvi SIM kartei, savienojuma laikā ierīcē tiks atspējota datu savienojamība. Piešķirt piekļuvi ierīcei <xliff:g id="DEVICE_NAME_1">%2$s?</xliff:g>"</string>
-    <string name="bluetooth_device_name_summary" msgid="4757990010751789977">"Citām ierīcēm redzama kā “<xliff:g id="DEVICE_NAME">^1</xliff:g>”"</string>
+    <string name="bluetooth_device_name_summary" msgid="522235742194965734">"Citām ierīcēm redzama kā “<xliff:g id="DEVICE_NAME">^1</xliff:g>”"</string>
     <string name="bluetooth_paired_device_title" msgid="8638994696317952019">"Jūsu ierīces"</string>
     <string name="bluetooth_pairing_page_title" msgid="7712127387361962608">"Savienošana pārī ar jaunu ierīci"</string>
     <string name="date_and_time" msgid="9062980487860757694">"Datums un laiks"</string>
@@ -314,6 +314,8 @@
     <string name="zone_auto" msgid="334783869352026648">"Automātiskā laika josla"</string>
     <string name="zone_auto_summaryOn" msgid="6142830927278458314">"Izmantot tīkla nodrošināto laika joslu"</string>
     <string name="zone_auto_summaryOff" msgid="2597745783162041390">"Izmantot tīkla nodrošināto laika joslu"</string>
+    <string name="date_time_24hour_auto" msgid="2117383168985653422">"Automātisks 24 stundu formāts"</string>
+    <string name="date_time_24hour_auto_summary" msgid="6351812925651480277">"Izmantot lokalizācijas noklusējuma vērtību"</string>
     <string name="date_time_24hour_title" msgid="3203537578602803850">"24 stundu formāts"</string>
     <string name="date_time_24hour" msgid="1193032284921000063">"Izmantot 24 stundu formātu"</string>
     <string name="date_time_set_time_title" msgid="6296795651349047016">"Laiks"</string>
@@ -375,6 +377,9 @@
     <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="1961957425135180242">"Tālāk"</string>
+    <string name="setup_fingerprint_enroll_skip_title" msgid="362050541117362034">"Izlaist pirksta nospiedumu?"</string>
+    <string name="setup_fingerprint_enroll_skip_after_adding_lock_text" msgid="958990414356204763">"Pirksta nospieduma iestatīšana ilgst tikai pāris minūtes. Ja to izlaidīsiet, varēsiet pirksta nospiedumu pievienot vēlāk iestatījumos."</string>
+    <string name="lock_screen_intro_skip_title" msgid="4988210105913705679">"Vai izlaist ekrāna bloķēšanu?"</string>
     <string name="lock_screen_intro_skip_dialog_text_frp" product="tablet" msgid="1581834104051243425">"Ierīces aizsardzības funkcijas netiks ieslēgtas. Jūs nevarēsiet nodrošināt, ka šo planšetdatoru neizmantos citas personas, ja tas tiks pazaudēts, nozagts vai atiestatīts."</string>
     <string name="lock_screen_intro_skip_dialog_text_frp" product="device" msgid="4629503416877189572">"Ierīces aizsardzības funkcijas netiks ieslēgtas. Jūs nevarēsiet nodrošināt, ka šo ierīci neizmantos citas personas, ja tā tiks pazaudēta, nozagta vai atiestatīta."</string>
     <string name="lock_screen_intro_skip_dialog_text_frp" product="default" msgid="2423428240245737909">"Ierīces aizsardzības funkcijas netiks ieslēgtas. Jūs nevarēsiet nodrošināt, ka šo tālruni neizmantos citas personas, ja tas tiks pazaudēts, nozagts vai atiestatīts."</string>
@@ -460,7 +465,7 @@
     <string name="setup_lock_settings_picker_title" product="tablet" msgid="90329443364067215">"Aizsargājiet planšetd."</string>
     <string name="setup_lock_settings_picker_title" product="device" msgid="2399952075134938929">"Aizsargājiet ierīci"</string>
     <string name="setup_lock_settings_picker_title" product="default" msgid="1572244299605153324">"Aizsargājiet tālruni"</string>
-    <string name="setup_lock_settings_picker_fingerprint_message" msgid="5585650064305600578">"Papildu drošībai iestatiet rezerves ekrāna bloķēšanu."</string>
+    <string name="lock_settings_picker_fingerprint_added_security_message" msgid="5768002109707648463">"Papildu drošībai iestatiet rezerves ekrāna bloķēšanu."</string>
     <string name="setup_lock_settings_picker_message" product="tablet" msgid="8919671129189936210">"Aktivizējiet ierīces aizsardzības funkcijas, lai neļautu citiem lietot šo planšetdatoru bez jūsu atļaujas. Izvēlieties bloķēšanas ekrānu, kuru vēlaties izmantot."</string>
     <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>
@@ -597,6 +602,7 @@
     <string name="lockpassword_pin_no_sequential_digits" msgid="680765285206990584">"Augoša, dilstoša vai atkārtota ciparu secība nav atļauta."</string>
     <string name="lockpassword_ok_label" msgid="313822574062553672">"Labi"</string>
     <string name="lockpassword_cancel_label" msgid="8818529276331121899">"Atcelt"</string>
+    <string name="lockpassword_clear_label" msgid="5724429464960458155">"Labi"</string>
     <string name="lockpattern_tutorial_cancel_label" msgid="6431583477570493261">"Atcelt"</string>
     <string name="lockpattern_tutorial_continue_label" msgid="3559793618653400434">"Tālāk"</string>
     <string name="lock_setup" msgid="3355847066343753943">"Iestatīšana ir pabeigta."</string>
@@ -792,6 +798,7 @@
     <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>
@@ -828,6 +835,8 @@
     <string name="wifi_wps_available_first_item" msgid="4422547079984583502">"WPS ir pieejams"</string>
     <string name="wifi_wps_available_second_item" msgid="8427520131718215301">" (WPS ir pieejams)"</string>
     <string name="wifi_wps_nfc_enter_password" msgid="2288214226916117159">"Ievadiet tīkla paroli"</string>
+    <string name="wifi_carrier_connect" msgid="8174696557882299911">"Mobilo sakaru operatora Wi‑Fi tīkls"</string>
+    <string name="wifi_carrier_content" msgid="4634077285415851933">"Izveidojiet savienojumu, izmantojot <xliff:g id="NAME">%1%s</xliff:g>"</string>
     <string name="wifi_scan_always_turnon_message" msgid="203123538572122989">"Lai uzlabotu atrašanās vietu noteikšanas precizitāti, kā arī citas funkcijas, lietotnē <xliff:g id="APP_NAME">%1$s</xliff:g> tiek pieprasīts ieslēgt tīkla skenēšanu, pat ja Wi-Fi savienojums ir izslēgts.\n\nVai atļaut šo darbību visām lietotnēm, kurās tiek pieprasīta skenēšana?"</string>
     <string name="wifi_scan_always_turnoff_message" msgid="5538901671131941043">"Lai to izslēgtu, pārpildes izvēlnē pārejiet uz sadaļu Papildu."</string>
     <string name="wifi_scan_always_confirm_allow" msgid="5355973075896817232">"Atļaut"</string>
@@ -845,6 +854,7 @@
     <string name="wifi_connect" msgid="1076622875777072845">"Izveidot savienojumu"</string>
     <string name="wifi_failed_connect_message" msgid="8491902558970292871">"Neizdevās izveidot savienojumu ar tīklu."</string>
     <string name="wifi_forget" msgid="8168174695608386644">"Neiegaumēt"</string>
+    <string name="wifi_modify" msgid="6100248070440710782">"Mainīt"</string>
     <string name="wifi_failed_forget_message" msgid="1348172929201654986">"Neizdevās aizmirst tīklu."</string>
     <string name="wifi_save" msgid="3331121567988522826">"Saglabāt"</string>
     <string name="wifi_failed_save_message" msgid="6650004874143815692">"Neizdevās saglabāt tīklu."</string>
@@ -858,6 +868,7 @@
     <string name="wifi_advanced_titlebar" msgid="4485841401774142908">"Papildu Wi-Fi"</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_title" msgid="3471132676909349382">"Tīkla informācija"</string>
     <string name="wifi_details_subnet_mask" msgid="6720279144174924410">"Apakštīkla maska"</string>
     <string name="wifi_details_dns" msgid="8648826607751830768">"DNS"</string>
     <string name="wifi_details_ipv6_address_header" msgid="6734119149106422148">"IPv6 adreses"</string>
@@ -890,16 +901,15 @@
     <string name="wifi_p2p_cancel_connect_title" msgid="255267538099324413">"Vai atcelt uzaicinājumu?"</string>
     <string name="wifi_p2p_cancel_connect_message" msgid="7477756213423749402">"Vai vēlaties atcelt uzaicinājumu izveidot savienojumu ar ierīci <xliff:g id="PEER_NAME">%1$s</xliff:g>?"</string>
     <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_off_subtext" msgid="5466126533609394170">"Nenotiek interneta vai satura kopīgošana ar citām ierīcēm"</string>
     <string name="wifi_hotspot_tethering_on_subtext" product="tablet" msgid="5752490509369962007">"Šī planšetdatora interneta savienojums tiek kopīgots, izmantojot tīklāju"</string>
     <string name="wifi_hotspot_tethering_on_subtext" product="default" msgid="6461075246164300670">"Šī tālruņa interneta savienojums tiek kopīgots, izmantojot tīklāju"</string>
     <string name="wifi_hotspot_on_local_only_subtext" msgid="2068110388011294735">"Lietotne kopīgo saturu. Lai kopīgotu interneta savienojumu, izslēdziet un ieslēdziet tīklāju"</string>
-    <string name="wifi_hotspot_name_title" msgid="1341735529132128887">"Wi‑Fi nosaukums"</string>
+    <string name="wifi_hotspot_name_title" msgid="8237000746618636778">"Tīklāja nosaukums"</string>
     <string name="wifi_hotspot_name_summary_connecting" msgid="3378299995508671967">"Notiek tīklāja <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g> ieslēgšana..."</string>
     <string name="wifi_hotspot_name_summary_connected" msgid="3888672084861445362">"Citas ierīces var savienot ar tīklāju <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>"</string>
-    <string name="wifi_hotspot_password_title" msgid="1955592302902091281">"Wi-Fi parole"</string>
+    <string name="wifi_hotspot_password_title" msgid="8676859981917573801">"Tīklāja parole"</string>
     <string name="wifi_hotspot_ap_band_title" msgid="1165801173359290681">"Piekļuves punkta josla"</string>
     <string name="wifi_hotspot_footer_info_regular" msgid="1203489406068036455">"Izmantojiet tīklāju, lai izveidotu Wi‑Fi tīklu citām savām ierīcēm. Tīklājs nodrošina internetu, izmantojot mobilo datu savienojumu. Var tikt piemērota papildu maksa par mobilo datu pārraidi."</string>
     <string name="wifi_hotspot_footer_info_local_only" msgid="857988412470694109">"Lietotnes var izveidot tīklāju satura kopīgošanai ar tuvumā esošajām ierīcēm."</string>
@@ -910,7 +920,6 @@
     <string name="wifi_tether_configure_ap_text" msgid="7974681394041609308">"Iestatīt Wi-Fi tīklāju"</string>
     <string name="wifi_hotspot_configure_ap_text" msgid="5478614731464220432">"Wi-Fi tīklāja iestatīšana"</string>
     <string name="wifi_hotspot_configure_ap_text_summary" msgid="5560680057727007011">"AndroidAP WPA2 PSK tīklājs"</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> tīklājs"</string>
     <string name="wifi_tether_configure_ssid_default" msgid="8467525402622138547">"AndroidHotspot"</string>
     <string name="wifi_calling_settings_title" msgid="4102921303993404577">"Wi-Fi zvani"</string>
     <string name="wifi_calling_suggestion_title" msgid="9008010480466359578">"Ieslēdziet Wi-Fi zvanus"</string>
@@ -951,7 +960,7 @@
     <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="emergency_address_summary" msgid="3266760199681945746">"Adrese, ko izmantos ārkārtas palīdzības dienesti kā jūsu atrašanās vietu, ja zvanīsiet uz ārkārtas numuru, lietojot Wi-Fi."</string>
     <string name="display_settings_title" msgid="1708697328627382561">"Displejs"</string>
     <string name="sound_settings" msgid="5534671337768745343">"Skaņa"</string>
     <string name="all_volume_title" msgid="4296957391257836961">"Skaļumi"</string>
@@ -1005,6 +1014,7 @@
     <string name="search_settings" msgid="1910951467596035063">"Meklēt"</string>
     <string name="search_settings_summary" msgid="9205656546570654169">"Meklēšanas iestatījumu un vēstures pārvaldība"</string>
     <string name="search_settings_no_results" msgid="8799027492641230999">"Nav rezultātu"</string>
+    <string name="search_clear_history" msgid="4196658962573162457">"Dzēst vēsturi"</string>
     <string name="display_settings" msgid="7965901687241669598">"Attēls"</string>
     <string name="accelerometer_title" msgid="7854608399547349157">"Automātiska ekrāna pagriešana"</string>
     <string name="color_mode_title" msgid="3159275920408338215">"Izteiksmīgas krāsas"</string>
@@ -1057,7 +1067,7 @@
     <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">"Fona tapetes mainīšana"</string>
+    <string name="wallpaper_suggestion_title" msgid="8583988696513822528">"Mainīt fona tapeti"</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>
@@ -1135,7 +1145,6 @@
     <string name="baseband_version" msgid="1848990160763524801">"Pamatjoslas versija"</string>
     <string name="kernel_version" msgid="9192574954196167602">"Kernel versija"</string>
     <string name="build_number" msgid="3075795840572241758">"Būvējuma numurs"</string>
-    <string name="selinux_status" msgid="6212165375172061672">"SELinux statuss"</string>
     <string name="device_info_not_available" msgid="8062521887156825182">"Nav pieejams"</string>
     <string name="device_status_activity_title" msgid="1411201799384697904">"Statuss"</string>
     <string name="device_status" msgid="607405385799807324">"Statuss"</string>
@@ -1163,7 +1172,6 @@
     <string name="status_wifi_mac_address" msgid="2202206684020765378">"Wi-Fi MAC adrese"</string>
     <string name="status_bt_address" msgid="4195174192087439720">"Bluetooth adrese"</string>
     <string name="status_serial_number" msgid="2257111183374628137">"Sērijas numurs"</string>
-    <string name="status_unavailable" msgid="7862009036663793314">"Nepieejams"</string>
     <string name="status_up_time" msgid="7294859476816760399">"Darbības laiks"</string>
     <string name="status_awake_time" msgid="2393949909051183652">"Nomoda laiks"</string>
     <string name="internal_memory" msgid="9129595691484260784">"Iekšējā krātuve"</string>
@@ -1339,6 +1347,7 @@
     <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>
     <string name="reset_dashboard_title" msgid="6254873816990678620">"Atiestatīšanas opcijas"</string>
+    <string name="reset_dashboard_summary" msgid="4851012632493522755">"Var atiestatīt tīklu, lietotnes vai ierīci"</string>
     <string name="reset_network_title" msgid="6166025966016873843">"Atiestatīt Wi-Fi, mobilo datu un Bluetooth iestatījumus"</string>
     <string name="reset_network_desc" msgid="5547979398298881406">"Tādējādi tiks atiestatīti visi tīkla iestatījumi, tostarp:\n\n"<li>"Wi‑Fi;"</li>\n<li>"mobilie dati;"</li>\n<li>"Bluetooth."</li></string>
     <string name="reset_network_button_text" msgid="2035676527471089853">"Atiestatīt iestatījumus"</string>
@@ -1347,18 +1356,14 @@
     <string name="reset_network_confirm_title" msgid="1759888886976962773">"Vai atiestatīt?"</string>
     <string name="network_reset_not_available" msgid="7188610385577164676">"Šim lietotājam nav pieejama tīkla atiestatīšana."</string>
     <string name="reset_network_complete_toast" msgid="787829973559541880">"Tīklu iestatījumi ir atiestatīti."</string>
-    <string name="master_clear_title" msgid="6617679904229218425">"Notīrīt visus datus (atiestatīt rūpnīcas datus)"</string>
-    <plurals name="master_clear_with_account_summary" formatted="false" msgid="5911377203778818712">
-      <item quantity="zero"><xliff:g id="ACCOUNT_COUNT">%1$d</xliff:g> konti tiks atiestatīti</item>
-      <item quantity="one"><xliff:g id="ACCOUNT_COUNT">%1$d</xliff:g> konts tiks atiestatīts</item>
-      <item quantity="other"><xliff:g id="ACCOUNT_COUNT">%1$d</xliff:g> konti tiks atiestatīti</item>
-    </plurals>
-    <string name="master_clear_summary" msgid="6902443944660426951">"Iekšējā krātuve un visi dati tiks atiestatīti"</string>
+    <string name="master_clear_title" msgid="3531267871084279512">"Notīrīt visus datus (atiestatīt rūpnīcas datus)"</string>
     <string name="master_clear_desc" product="tablet" msgid="9146059417023157222">"Tādējādi tiks izdzēsti visi planšetdatora "<b>"iekšējā atmiņā"</b>" esošie dati, tostarp:\n\n"<li>"Google konta dati;"</li>\n<li>"sistēmas un lietotņu dati un iestatījumi;"</li>\n<li>"lejupielādētās lietotnes."</li></string>
     <string name="master_clear_desc" product="default" msgid="4800386183314202571">"Tiks dzēsti visi tālruņa "<b>"iekšējā atmiņā"</b>" esošie dati, tostarp:\n\n"<li>"Google konta dati;"</li>\n<li>"sistēmas un lietotņu dati un iestatījumi;"</li>\n<li>"lejupielādētās lietotnes."</li></string>
     <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"Pašlaik esat pierakstījies šādos kontos:\n"</string>
     <string name="master_clear_other_users_present" product="default" msgid="5161423070702470742">\n\n"Šo ierīci izmanto vēl citi lietotāji.\n"</string>
     <string name="master_clear_desc_also_erases_external" msgid="1903185203791274237"><li>"Mūzika"</li>\n<li>"Fotoattēli"</li>\n<li>"Citi lietotāja dati"</li></string>
+    <string name="master_clear_desc_also_erases_esim" msgid="312352697653096008"><li>"Mobilo sakaru operatori iegultajā SIM kartē"</li></string>
+    <string name="master_clear_desc_no_cancel_mobile_plan" msgid="5460926449093211144">\n\n"Veicot šo darbību, netiks atcelts jūsu mobilo pakalpojumu plāns."</string>
     <string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="7744115866662613411">\n\n"Lai dzēstu mūziku, attēlus un citus lietotāja datus, ir jāizdzēš "<b>"USB atmiņas"</b>" saturs."</string>
     <string name="master_clear_desc_erase_external_storage" product="default" msgid="4801026652617377093">\n\n"Lai dzēstu mūziku, attēlus un citus lietotāja datus, ir jādzēš "<b>"SD kartes"</b>" saturs."</string>
     <string name="erase_external_storage" product="nosdcard" msgid="969364037450286809">"Dzēst USB krātuvi"</string>
@@ -1475,15 +1480,16 @@
     <string name="settings_safetylegal_activity_title" msgid="6901214628496951727">"Informācija par drošību"</string>
     <string name="settings_safetylegal_activity_unreachable" msgid="250674109915859456">"Nav izveidots datu pārraides savienojums. Lai skatītu šo informāciju tūlīt, jebkurā datorā ar interneta savienojumu apmeklējiet vietni %s."</string>
     <string name="settings_safetylegal_activity_loading" msgid="8059022597639516348">"Notiek ielāde…"</string>
-    <string name="lockpassword_choose_your_password_header" msgid="8624900666929394990">"Izvēlieties paroli"</string>
-    <string name="lockpassword_choose_your_password_header_for_fingerprint" msgid="6624409510609085450">"Parole pirksta nosp. lietošanai"</string>
-    <string name="lockpassword_choose_your_pattern_header" msgid="6949761069941694050">"Izvēlieties kombināciju"</string>
-    <string name="lockpassword_choose_your_pattern_header_for_fingerprint" msgid="5901096361617543819">"Komb. pirksta nosp. lietošanai"</string>
-    <string name="lockpassword_choose_your_pin_header" msgid="7598849519816138302">"Izvēlieties PIN kodu"</string>
-    <string name="lockpassword_choose_your_pin_header_for_fingerprint" msgid="765344692615917183">"PIN pirksta nosp. lietošanai"</string>
-    <string name="lockpassword_confirm_your_password_header" msgid="6308478184889846633">"Apstipriniet paroli"</string>
+    <string name="lockpassword_choose_your_screen_lock_header" msgid="3872462096767152394">"Ekrāna bloķēšanas iestatīšana"</string>
+    <string name="lockpassword_choose_your_password_message" msgid="1197569283524841412">"Drošības nolūkos iestatiet paroli."</string>
+    <string name="lockpassword_choose_your_password_header_for_fingerprint" msgid="2541818487015343503">"Parole pirksta nospieduma lietošanai"</string>
+    <string name="lockpassword_choose_your_pattern_header_for_fingerprint" msgid="7709785406243556723">"Kombinācija pirksta nospied. lietošanai"</string>
+    <string name="lockpassword_choose_your_pin_message" msgid="1875420718677275646">"Drošības nolūkos iestatiet PIN."</string>
+    <string name="lockpassword_choose_your_pin_header_for_fingerprint" msgid="1549639053195796674">"PIN iestatīšana pirksta nosp. lietošanai"</string>
+    <string name="lockpassword_choose_your_pattern_message" msgid="5986983400689720015">"Drošības nolūkos iestatiet kombināciju."</string>
+    <string name="lockpassword_confirm_your_password_header" msgid="1266027268220850931">"Atkārtota paroles ievade"</string>
     <string name="lockpassword_confirm_your_pattern_header" msgid="7543433733032330821">"Apstipriniet kombināciju"</string>
-    <string name="lockpassword_confirm_your_pin_header" msgid="49038294648213197">"Apstipriniet savu PIN kodu"</string>
+    <string name="lockpassword_confirm_your_pin_header" msgid="7744513791910572550">"Atkārtota PIN ievade"</string>
     <string name="lockpassword_confirm_passwords_dont_match" msgid="5140892109439191415">"Paroles nav vienādas"</string>
     <string name="lockpassword_confirm_pins_dont_match" msgid="7226244811505606217">"PIN kodi ir atšķirīgi"</string>
     <string name="lockpassword_choose_lock_generic_header" msgid="3811438094903786145">"Atbloķēšanas atlase"</string>
@@ -1502,6 +1508,12 @@
     <string name="lockpassword_strong_auth_required_work_pattern" msgid="3003781907040522053">"Papildu drošībai izmantojiet darba profila kombināciju."</string>
     <string name="lockpassword_strong_auth_required_work_pin" msgid="3367491332598821552">"Papildu drošībai ievadiet darba profila PIN."</string>
     <string name="lockpassword_strong_auth_required_work_password" msgid="8159775129968582940">"Papildu drošībai ievadiet darba profila paroli."</string>
+    <string name="lockpassword_confirm_your_pattern_details_frp" msgid="6757336656791723193">"Tālrunī atiestatīti rūpnīcas iestatījumi. Lai izmantotu tālruni, ievadiet iepriekšējo kombināciju."</string>
+    <string name="lockpassword_confirm_your_pin_details_frp" msgid="826520613445990470">"Tālrunī atiestatīti rūpnīcas iestatījumi. Lai izmantotu tālruni, ievadiet iepriekšējo PIN."</string>
+    <string name="lockpassword_confirm_your_password_details_frp" msgid="8944081074615739040">"Tālrunī atiestatīti rūpnīcas iestatījumi. Lai izmantotu tālruni, ievadiet iepriekšējo paroli."</string>
+    <string name="lockpassword_confirm_your_pattern_header_frp" msgid="2898036091609128286">"Verificējiet kombināciju"</string>
+    <string name="lockpassword_confirm_your_pin_header_frp" msgid="4141601774778898803">"Verificējiet PIN"</string>
+    <string name="lockpassword_confirm_your_password_header_frp" msgid="3762615419295360480">"Verificējiet paroli"</string>
     <string name="lockpassword_invalid_pin" msgid="15588049067548470">"Nepareizs PIN kods"</string>
     <string name="lockpassword_invalid_password" msgid="4038507398784975200">"Nepareiza parole"</string>
     <string name="lockpattern_need_to_unlock_wrong" msgid="1745247595356012176">"Nepareiza kombinācija"</string>
@@ -1551,7 +1563,6 @@
     <string name="install_applications_title" msgid="4987712352256508946">"Atļaut visus lietotņu avotus"</string>
     <string name="recent_app_category_title" msgid="6673071268966003928">"Nesen atvērtās lietotnes"</string>
     <string name="see_all_apps_title" msgid="1317153498074308438">"Visu lietotņu (<xliff:g id="COUNT">%1$d</xliff:g>) skatīšana"</string>
-    <string name="recent_app_summary" msgid="3366446669844932300">"Pirms <xliff:g id="TIME">^1</xliff:g>"</string>
     <string name="install_all_warning" product="tablet" msgid="8310489909586138165">"Jūsu planšetdators un personīgie dati ir neaizsargātāki pret nezināmu lietotņu uzbrukumiem. Instalējot no šī avota iegūtas lietotnes, jūs piekrītat, ka esat atbildīgs par jebkādiem planšetdatora bojājumiem vai datu zudumu, kas varētu rasties šo lietotņu izmantošanas dēļ."</string>
     <string name="install_all_warning" product="default" msgid="1952257127370115988">"Jūsu tālrunis un personīgie dati ir neaizsargātāki pret nezināmu lietotņu uzbrukumiem. Instalējot no šī avota iegūtas lietotnes, jūs piekrītat, ka esat atbildīgs par jebkādiem tālruņa bojājumiem vai datu zudumu, kas varētu rasties šo lietotņu izmantošanas dēļ."</string>
     <string name="advanced_settings" msgid="1777249286757067969">"Papildu iestatījumi"</string>
@@ -1816,7 +1827,7 @@
     <string name="accessibility_settings_summary" msgid="981260486011624939">"Ekrāna lasītāji, attēlojums, mijiedarbības vadīklas"</string>
     <string name="vision_settings_title" msgid="4204111425716868288">"Redzes iestatījumi"</string>
     <string name="vision_settings_description" msgid="5679491180156408260">"Varat pielāgot šo ierīci savām vajadzībām. Šīs pieejamības funkcijas var mainīt vēlāk sadaļā Iestatījumi."</string>
-    <string name="vision_settings_suggestion_title" msgid="917294957154878441">"Fonta palielināšana"</string>
+    <string name="vision_settings_suggestion_title" msgid="8058794060304707004">"Mainīt fonta lielumu"</string>
     <string name="screen_reader_category_title" msgid="7739154903913400641">"Ekrāna lasītāji"</string>
     <string name="audio_and_captions_category_title" msgid="3420727114421447524">"Audio un ekrānā redzamais teksts"</string>
     <string name="display_category_title" msgid="685461049938269166">"Attēlojums"</string>
@@ -1853,7 +1864,6 @@
     <string name="accessibility_display_inversion_preference_subtitle" msgid="7052959202195368109">"Var ietekmēt veiktspēju"</string>
     <string name="accessibility_autoclick_preference_title" msgid="7014499339068449623">"Klikšķis pēc kursora apstāšanās"</string>
     <string name="accessibility_autoclick_delay_preference_title" msgid="3962261178385106006">"Aizkave pirms klikšķa"</string>
-    <string name="preference_summary_default_combination" msgid="8532964268242666060">"<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">"IESLĒGTS"</string>
     <string name="accessibility_summary_state_disabled" msgid="2241315620132005595">"IZSLĒGTS"</string>
     <string name="enable_quick_setting" msgid="2366999897816894536">"Rādīt ātrajos iestatījumos"</string>
@@ -1979,12 +1989,14 @@
     <string name="background_activity_summary_on" msgid="649282072540085599">"Lietotne var darboties fonā, kad netiek izmantota."</string>
     <string name="background_activity_summary_off" msgid="7666330699090632040">"Lietotnes darbība fonā ir ierobežota."</string>
     <string name="background_activity_summary_disabled" msgid="3710669050484599847">"Lietotnes darbība fonā nav atļauta."</string>
+    <string name="background_activity_summary_whitelisted" msgid="7375400051141016808">"Lietotni nevar optimizēt akumulatora izmantojumam"</string>
+    <string name="background_activity_warning_dialog_title" msgid="2216249969149568871">"Vai ierobežot darbību fonā?"</string>
+    <string name="background_activity_warning_dialog_text" msgid="7049624449246121981">"Ierobežojot lietotnes darbību fonā, var rasties šīs lietotnes darbības traucējumi."</string>
     <string name="device_screen_usage" msgid="3386088035570409683">"Ekrāna lietojums kopš pilnas uzlādes"</string>
     <string name="device_screen_consumption" msgid="4607589286438986687">"Ekrāna lietojuma patēriņš"</string>
     <string name="device_cellular_network" msgid="4724773411762382950">"Mobilo tīklu meklēšana"</string>
-    <string name="power_last_full_charge_summary" msgid="532845389094620657">"Pirms <xliff:g id="TIME">^1</xliff:g>"</string>
-    <string name="power_usage_list_summary" msgid="6775339745194635000">"Jaudas patēriņš lietotnēs kopš pilnas uzlādes (pirms <xliff:g id="TIME">^1</xliff:g>)"</string>
-    <string name="power_usage_list_summary_device" msgid="7036566616386864302">"Ierīces lietojums kopš pilnas uzlādes (pirms šāda laika: <xliff:g id="TIME">^1</xliff:g>)"</string>
+    <string name="power_usage_list_summary" msgid="6393929085382334341">"Lietotnes izmantojums kopš pilnas uzlādes (<xliff:g id="RELATIVE_TIME">^1</xliff:g>)"</string>
+    <string name="power_usage_list_summary_device" msgid="4461926045610455423">"Ierīces izmantojums kopš pilnas uzlādes (<xliff:g id="RELATIVE_TIME">^1</xliff:g>)"</string>
     <string name="screen_usage_summary" msgid="6687403051423153550">"Cik ilgi ekrāns ir ieslēgts kopš pilnas uzlādes"</string>
     <string name="device_usage_list_summary" msgid="5623036661468763251">"Ierīces lietojums kopš pilnas uzlādes"</string>
     <string name="battery_since_unplugged" msgid="338073389740738437">"Akumulatora lietojums kopš atslēgšanas"</string>
@@ -2230,14 +2242,14 @@
     <string name="credentials_unlock_hint" msgid="2301301378040499348">"Ierakstiet akreditācijas datu krātuves paroli."</string>
     <string name="credentials_old_password" msgid="7553393815538684028">"Pašreizējā parole:"</string>
     <string name="credentials_reset_hint" msgid="6297256880896133631">"Vai noņemt visu saturu?"</string>
-    <string name="credentials_password_too_short" msgid="7502749986405522663">"Parolē jābūt vismaz astoņām rakstzīmēm."</string>
     <string name="credentials_wrong_password" msgid="2541932597104054807">"Nepareiza parole."</string>
     <string name="credentials_reset_warning" msgid="5320653011511797600">"Nepareiza parole. Varat vēl mēģināt vienu reizi, pirms tiek izdzēsta akreditācijas datu krātuve."</string>
     <string name="credentials_reset_warning_plural" msgid="6514085665301095279">"Nepareiza parole. Varat vēl mēģināt <xliff:g id="NUMBER">%1$d</xliff:g> reizes, pirms tiek izdzēsta akreditācijas datu krātuve."</string>
     <string name="credentials_erased" msgid="2907836028586342969">"Akreditācijas datu krātuve ir izdzēsta."</string>
     <string name="credentials_not_erased" msgid="7685932772284216097">"Akred. datus nevarēja izdzēst"</string>
     <string name="credentials_enabled" msgid="7588607413349978930">"Akreditācijas datu krātuve ir iespējota."</string>
-    <string name="credentials_configure_lock_screen_hint" msgid="6757119179588664966">"Lai varētu izmantot akreditācijas datu atmiņu, ir jāiestata bloķēšanas ekrāna PIN vai parole."</string>
+    <string name="credentials_configure_lock_screen_hint" msgid="8058230497337529036">"Lai varētu izmantot akreditācijas datu atmiņu, vispirms ierīcei jāiestata droša ekrāna bloķēšana."</string>
+    <string name="credentials_configure_lock_screen_button" msgid="253239765216055321">"IESTATĪT BLOĶĒŠANU"</string>
     <string name="usage_access_title" msgid="332333405495457839">"Piekļuve lietojuma datiem"</string>
     <string name="emergency_tone_title" msgid="1055954530111587114">"Ārkārtas signāls"</string>
     <string name="emergency_tone_summary" msgid="722259232924572153">"Iestatīt uzvedību, kad tiek veikts ārkārtas zvans"</string>
@@ -2357,8 +2369,6 @@
     <skip />
     <string name="cant_sync_dialog_title" msgid="2777238588398046285">"Nevar sinhronizēt manuāli"</string>
     <string name="cant_sync_dialog_message" msgid="1938380442159016449">"Pašlaik ir atspējota šī vienuma sinhronizācija. Lai mainītu šo iestatījumu, īslaicīgi ieslēdziet fona datu lietojumu un automātisko sinhronizāciju."</string>
-    <string name="wimax_settings" msgid="2655139497028469039">"4G"</string>
-    <string name="status_wimax_mac_address" msgid="8390791848661413416">"4G MAC adrese"</string>
     <string name="enter_password" msgid="8035706727471334122">"Lai startētu Android ierīci, ievadiet savu paroli"</string>
     <string name="enter_pin" msgid="5305333588093263790">"Lai startētu Android ierīci, ievadiet savu PIN kodu"</string>
     <string name="enter_pattern" msgid="4187435713036808566">"Lai startētu Android ierīci, uzzīmējiet savu kombināciju"</string>
@@ -2372,6 +2382,7 @@
     <string name="misc_files_selected_count" msgid="4647048020823912088">"Atlasīti <xliff:g id="NUMBER">%1$d</xliff:g> no <xliff:g id="TOTAL">%2$d</xliff:g>"</string>
     <string name="misc_files_selected_count_bytes" msgid="2876232009069114352">"<xliff:g id="NUMBER">%1$s</xliff:g> no <xliff:g id="TOTAL">%2$s</xliff:g>"</string>
     <string name="select_all" msgid="1562774643280376715">"Atlasīt visu"</string>
+    <string name="data_plan_usage_manage_plans_button_text" msgid="8997761990902708162">"Pārvaldīt plānus"</string>
     <string name="data_usage_summary_title" msgid="3804110657238092929">"Datu lietojums"</string>
     <string name="data_usage_app_summary_title" msgid="4147258989837459172">"Lietotnes datu lietojums"</string>
     <string name="data_usage_accounting" msgid="7170028915873577387">"Mobilo sakaru operatora datu uzskaite var atšķirties no datu uzskaites ierīcē."</string>
@@ -2457,6 +2468,9 @@
     <string name="data_usage_metered_mobile" msgid="5423305619126978393">"Mobilie tīkli"</string>
     <string name="data_usage_metered_wifi" msgid="1761738002328299714">"Wi-Fi maksas tīkli"</string>
     <string name="data_usage_metered_wifi_disabled" msgid="727808462375941567">"Lai atlasītu maksas tīklus, ieslēdziet Wi-Fi."</string>
+    <string name="data_usage_metered_auto" msgid="1262028400911918865">"Automātiski"</string>
+    <string name="data_usage_metered_yes" msgid="9217539611385225894">"Maksas"</string>
+    <string name="data_usage_metered_no" msgid="4025232961929071789">"Nav maksas"</string>
     <string name="data_usage_disclaimer" msgid="6887858149980673444">"Mobilo sakaru operatora datu uzskaite var atšķirties no datu uzskaites ierīcē."</string>
     <string name="cryptkeeper_emergency_call" msgid="198578731586097145">"Ārkārtas zvans"</string>
     <string name="cryptkeeper_return_to_call" msgid="5613717339452772491">"Atgriezties pie zvana"</string>
@@ -2548,9 +2562,6 @@
     <string name="backup_pw_set_button_text" msgid="2387480910044648795">"Iestatīt dublējuma paroli"</string>
     <string name="backup_pw_cancel_button_text" msgid="8845630125391744615">"Atcelt"</string>
     <string name="additional_system_update_settings_list_item_title" msgid="214987609894661992">"Papildu sistēmas atjauninājumi"</string>
-    <string name="selinux_status_disabled" msgid="924551035552323327">"Atspējots"</string>
-    <string name="selinux_status_permissive" msgid="6004965534713398778">"Atļaujošs"</string>
-    <string name="selinux_status_enforcing" msgid="2252703756208463329">"Īstenots"</string>
     <string name="ssl_ca_cert_warning" msgid="2045866713601984673">"Iespējams, tīklā veiktās darbības tiek pārraudzītas."</string>
     <string name="done_button" msgid="1991471253042622230">"Gatavs"</string>
     <plurals name="ssl_ca_cert_dialog_title" formatted="false" msgid="7145092748045794650">
@@ -2753,6 +2764,7 @@
       <item quantity="one">Rādīt %d slēptu vienumu</item>
       <item quantity="other">Rādīt %d slēptus vienumus</item>
     </plurals>
+    <string name="dashboard_suggestion_condition_footer_content_description" msgid="2898588191174845961">"Sakļaut"</string>
     <string name="network_dashboard_title" msgid="4771589228992391573">"Tīkls un internets"</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>
@@ -2856,8 +2868,14 @@
       <item quantity="one">Ieslēgta <xliff:g id="ON_COUNT">%d</xliff:g> automātiskā kārtula</item>
       <item quantity="other">Ieslēgtas <xliff:g id="ON_COUNT">%d</xliff:g> automātiskās kārtulas</item>
     </plurals>
-    <string name="zen_mode_settings_title" msgid="842308776768942600">"“Netraucēt” preferences"</string>
-    <string name="zen_mode_priority_settings_title" msgid="2623117023031824309">"Tikai prioritārie"</string>
+    <string name="zen_mode_settings_title" msgid="1066226840983908121">"Netraucēt"</string>
+    <string name="zen_mode_behavior_settings_title" msgid="1463303933529313969">"Rīcība"</string>
+    <string name="zen_mode_behavior_allow_title" msgid="3845615648136218141">"Atļaut skaņas un vibrāciju no"</string>
+    <string name="zen_mode_behavior_no_sound" msgid="1219626004723208056">"Bez skaņas"</string>
+    <string name="zen_mode_behavior_total_silence" msgid="6716603819806610626">"Bez skaņas (pilnīgs klusums)"</string>
+    <string name="zen_mode_behavior_no_sound_except" msgid="4968477585788243114">"Bez skaņas, izņemot <xliff:g id="CATEGORIES">%1$s</xliff:g>"</string>
+    <!-- no translation found for zen_mode_behavior_alarms_only (2423480992071472963) -->
+    <skip />
     <string name="zen_mode_automation_settings_title" msgid="4228995740594063774">"Autom. kārtulas"</string>
     <string name="zen_mode_automation_suggestion_title" msgid="5105443455143476201">"“Netraucēt” kārtulu iestatīšana"</string>
     <string name="zen_mode_automation_suggestion_summary" msgid="4732808039946935657">"Ierobežot skaņu un vibrāciju noteiktā laikā"</string>
@@ -2899,13 +2917,15 @@
     <string name="notifications_title" msgid="8086372779371204971">"Paziņojumi"</string>
     <string name="app_notifications_title" msgid="5810577805218003760">"Lietotņu paziņojumi"</string>
     <string name="notification_channel_title" msgid="2260666541030178452">"Paziņojuma kategorija"</string>
+    <string name="notification_group_title" msgid="7180506440133859601">"Paziņojumu kategorijas grupa"</string>
     <string name="notification_importance_title" msgid="848692592679312666">"Svarīgums"</string>
-    <string name="notification_importance_unspecified" msgid="2196023702875112081">"Atkarībā no lietotnes iestatījumiem"</string>
+    <string name="notification_importance_unspecified" msgid="6622173510486113958">"Atļaujiet skaņu"</string>
     <string name="notification_importance_blocked" msgid="7938180808339386300">"Nekad nerādīt paziņojumus"</string>
     <string name="notification_importance_min" msgid="5455049524984686275">"Bez skaņas signāla vai vizuāla paziņojuma"</string>
     <string name="notification_importance_low" msgid="8881468429453766553">"Bez skaņas"</string>
     <string name="notification_importance_default" msgid="5958338024601957516">"Atskaņot skaņas signālu"</string>
     <string name="notification_importance_high" msgid="2082429479238228527">"Atskaņot skaņas signālu un īslaicīgi parādīt ekrānā"</string>
+    <string name="notification_importance_high_silent" msgid="2667033773703765252">"Uznirst ekrānā"</string>
     <string name="notification_importance_min_title" msgid="6974673091137544803">"Mazsvarīgs"</string>
     <string name="notification_importance_low_title" msgid="8131254047772814309">"Vidēji svarīgs"</string>
     <string name="notification_importance_default_title" msgid="9120383978536089489">"Svarīgs"</string>
@@ -2949,8 +2969,14 @@
     <string name="loading_notification_apps" msgid="5031818677010335895">"Notiek lietotņu ielāde..."</string>
     <string name="app_notifications_off_desc" msgid="4882445501376722969">"Android neatļauj šīs lietotnes paziņojumu rādīšanu šajā ierīcē"</string>
     <string name="channel_notifications_off_desc" msgid="5899225298718840635">"Android neatļauj šīs kategorijas paziņojumu rādīšanu šajā ierīcē"</string>
+    <string name="channel_group_notifications_off_desc" msgid="1620950416247316370">"Android neatļauj šīs grupas paziņojumu rādīšanu šajā ierīcē"</string>
     <string name="notification_channels" msgid="5346841743182627500">"Kategorijas"</string>
     <string name="notification_channels_other" msgid="5645317113885788226">"Cits"</string>
+    <plurals name="notification_group_summary" formatted="false" msgid="3420621520561455358">
+      <item quantity="zero"><xliff:g id="COUNT_1">%d</xliff:g> kategoriju</item>
+      <item quantity="one"><xliff:g id="COUNT_1">%d</xliff:g> kategorija</item>
+      <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> kategorijas</item>
+    </plurals>
     <string name="no_channels" msgid="3077375508177744586">"Šai lietotnei nav neviena paziņojuma."</string>
     <string name="app_settings_link" msgid="8894946007543660906">"Lietotnes papildu iestatījumi"</string>
     <string name="app_notification_listing_summary_zero" msgid="6482582965081108108">"Izslēgti visām lietotnēm"</string>
@@ -3029,12 +3055,14 @@
     <string name="zen_mode_from_starred" msgid="2678345811950997027">"Tikai no kontaktpersonām ar zvaigznīti"</string>
     <string name="zen_mode_from_none" msgid="8219706639954614136">"Nav"</string>
     <string name="zen_mode_alarms" msgid="2165302777886552926">"Signāli"</string>
+    <!-- no translation found for zen_mode_media_system_other (8900209390529859777) -->
+    <skip />
     <string name="zen_mode_reminders" msgid="5458502056440485730">"Atgādinājumi"</string>
     <string name="zen_mode_events" msgid="7914446030988618264">"Notikumi"</string>
     <string name="zen_mode_all_callers" msgid="584186167367236922">"Visi zvanītāji"</string>
     <string name="zen_mode_selected_callers" msgid="3127598874060615742">"Atlasīti zvanītāji"</string>
     <string name="zen_mode_repeat_callers" msgid="5019521886428322131">"Atkārtoti zvani"</string>
-    <string name="zen_mode_repeat_callers_summary" msgid="7192713032364140137">"Atļaut, ja viena un tā pati persona zvana <xliff:g id="MINUTES">%d</xliff:g> minūšu periodā"</string>
+    <string name="zen_mode_repeat_callers_summary" msgid="239685342222975733">"Ja tā pati persona <xliff:g id="MINUTES">%d</xliff:g> minūšu laikā zvana vēlreiz"</string>
     <string name="zen_mode_when" msgid="2767193283311106373">"Automātiski ieslēgt"</string>
     <string name="zen_mode_when_never" msgid="8809494351918405602">"Nekad"</string>
     <string name="zen_mode_when_every_night" msgid="3122486110091921009">"Katru nakti"</string>
@@ -3065,6 +3093,7 @@
     <string name="zen_mode_screen_off_visual_interruptions" msgid="4850792880144382633">"Kad ekrāns ir izslēgts"</string>
     <string name="zen_mode_no_visual_interruptions" msgid="8742776003822778472">"Kad ekrāns ir ieslēgts vai izslēgts"</string>
     <string name="notification_app_settings_button" msgid="6685640230371477485">"Paziņojumu iestatījumi"</string>
+    <string name="suggestion_button_text" msgid="3275010948381252006">"Labi"</string>
     <string name="device_feedback" msgid="3238056036766293294">"Sūtīt atsauksmes par šo ierīci"</string>
     <string name="restr_pin_enter_admin_pin" msgid="1085834515677448072">"Ievadiet administratora PIN"</string>
     <string name="switch_on_text" msgid="1124106706920572386">"Ieslēgts"</string>
@@ -3255,6 +3284,7 @@
     <string name="usb_summary_file_transfers" msgid="6435943692610175111">"Failu pārsūtīšana"</string>
     <string name="usb_summary_photo_transfers" msgid="8440204169576585250">"Fotoattēlu pārsūtīšana (PTP)"</string>
     <string name="usb_summary_MIDI" msgid="5687906612187885908">"Ierīces izmantošana MIDI režīmā"</string>
+    <string name="sms_mirroring_pref" msgid="6475043279147376031">"Īsziņu spoguļošana"</string>
     <string name="background_check_pref" msgid="7550258400138010979">"Fona pārbaude"</string>
     <string name="background_check_title" msgid="4534254315824525593">"Pilna piekļuve fonam"</string>
     <string name="assist_access_context_title" msgid="2269032346698890257">"Izmantot ekrānā redzamo tekstu"</string>
@@ -3322,7 +3352,7 @@
     <string name="write_settings_title" msgid="4232152481902542284">"Var pārveidot sistēmas iestatījumus"</string>
     <string name="write_system_settings" msgid="3482913590601096763">"Iestatījumu pārveidošana"</string>
     <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="permit_write_settings" msgid="658555006453212691">"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>
@@ -3420,9 +3450,12 @@
     <string name="color_temperature" msgid="2070126836910615605">"Vēsu krāsu temperatūra"</string>
     <string name="color_temperature_desc" msgid="4793729830226404052">"Izmantot vēsākas krāsas"</string>
     <string name="color_temperature_toast" msgid="4974218172133854827">"Lai mainītu krāsas, izslēdziet ekrānu"</string>
-    <string name="telephony_monitor_toast" msgid="7003764250271195384">"Lai lietotu telefonijas pārrauga izmaiņas, atkārtoti palaidiet ierīci."</string>
+    <string name="connectivity_monitor_switch" msgid="9059759348648583421">"Savienojamības pārraugs"</string>
+    <string name="connectivity_monitor_switch_summary" msgid="2828658652378866401">"Ja tiks konstatēta savienojuma problēma, savienojamības pārraugs apkopos žurnālus un paziņojumā aicinās lietotāju reģistrēt kļūdu."</string>
+    <string name="connectivity_monitor_toast" msgid="5551859612881173028">"Lai lietotu savienojamības pārrauga izmaiņas, atkārtoti palaidiet ierīci."</string>
     <string name="camera_hal_hdrplus_switch" msgid="8377365197105267466">"Kameras HAL HDR+"</string>
     <string name="camera_hal_hdrplus_toast" msgid="2063703797270055299">"Lai piemērotu kameras HAL HDR+ izmaiņas, restartējiet ierīci."</string>
+    <string name="camera_laser_sensor_switch" msgid="8913588990743234440">"Kameras lāzera sensors"</string>
     <string name="ota_disable_automatic_update" msgid="2319639631655915050">"Automātiski sistēmas atjauninājumi"</string>
     <string name="usage" msgid="2977875522080448986">"Lietojums"</string>
     <string name="cellular_data_usage" msgid="2155683719898158203">"Mobilo datu lietojums"</string>
@@ -3449,7 +3482,7 @@
     <string name="data_warning" msgid="209133958008062117">"Datu brīdinājums"</string>
     <string name="set_data_limit" msgid="2901526323210516923">"Iestatīt datu ierobežojumu"</string>
     <string name="data_limit" msgid="1885406964934590552">"Datu ierobežojums"</string>
-    <string name="data_usage_template" msgid="392191945602400904">"<xliff:g id="ID_1">%1$s</xliff:g> izmantoti šādā laika periodā: <xliff:g id="ID_2">%2$s</xliff:g>"</string>
+    <string name="data_usage_template" msgid="2923744765873163859">"Izmantotais datu apjoms: <xliff:g id="ID_1">%1$s</xliff:g> (šādā periodā: <xliff:g id="ID_2">%2$s</xliff:g>)"</string>
     <string name="configure" msgid="1029654422228677273">"Konfigurēt"</string>
     <string name="data_usage_other_apps" msgid="3272872663517382050">"Citas lietojuma datos iekļautās lietotnes"</string>
     <plurals name="data_saver_unrestricted_summary" formatted="false" msgid="2635267833484232703">
@@ -3520,7 +3553,7 @@
     <string name="button_confirm_convert_fbe" msgid="7101855374850373091">"Dzēst un pārvērst"</string>
     <string name="reset_shortcut_manager_throttling" msgid="6495066467198668994">"Vai atiestatīt ShortcutManager ātruma ierobežošanu?"</string>
     <string name="reset_shortcut_manager_throttling_complete" msgid="1826770872063707900">"ShortcutManager ātruma ierobežošana ir atiestatīta."</string>
-    <string name="notification_suggestion_title" msgid="4506524937307816475">"Bloķēšanas ekrāna paziņojumu kontrole"</string>
+    <string name="notification_suggestion_title" msgid="387052719462473500">"Kontrolējiet informāciju bloķēšanas ekrānā"</string>
     <string name="notification_suggestion_summary" msgid="8521159741445416875">"Rādīt vai slēpt paziņojumu saturu"</string>
     <string name="page_tab_title_summary" msgid="4070309266374993258">"Visas"</string>
     <string name="page_tab_title_support" msgid="8483187649355540109">"Atbalsts un padomi"</string>
@@ -3528,7 +3561,7 @@
     <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>
     <string name="premium_sms_access" msgid="4660047004791638305">"Piekļuve maksas īsziņām"</string>
-    <string name="bluetooth_disabled" msgid="2456198532288640046">"Nav redzams citām ierīcēm"</string>
+    <string name="bluetooth_disabled" msgid="6244000672828617410">"Izslēgts"</string>
     <string name="bluetooth_connected_summary" msgid="7672528674593152862">"Izveidots savienojums ar ierīci <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="bluetooth_connected_multiple_devices_summary" msgid="9173661896296663932">"Izveidots savienojums ar vairākām ierīcēm"</string>
     <string name="demo_mode" msgid="2798762752209330277">"Sistēmas lietotāja saskarnes demonstrācijas režīms"</string>
@@ -3633,7 +3666,7 @@
     <string name="web_action_enable_title" msgid="4051513950976670853">"Tūlītējās lietotnes"</string>
     <string name="web_action_enable_summary" msgid="3108127559723396382">"Atveriet saites lietotnēs, pat ja tās nav instalētas."</string>
     <string name="web_action_section_title" msgid="7364647086538399136">"Tūlītējās lietotnes"</string>
-    <string name="instant_apps_account" msgid="1433620209791992528">"Tūlītējo lietotņu konts"</string>
+    <string name="instant_apps_settings" msgid="8827777916518348213">"Tūlītējo lietotņu preferences"</string>
     <string name="domain_url_section_title" msgid="7046835219056428883">"Instalētās lietotnes"</string>
     <string name="automatic_storage_manager_activation_warning" msgid="6353100011690933254">"Tagad jūsu krātuvi pārvalda krātuves pārvaldnieks"</string>
     <string name="account_for_section_header" msgid="5356566418548737121">"Lietotāja <xliff:g id="USER_NAME">%1$s</xliff:g> konti"</string>
@@ -3682,7 +3715,9 @@
     <string name="enterprise_privacy_always_on_vpn_personal" msgid="9217774730260037434">"Iestatījums “Vienmēr ieslēgts VPN” ir ieslēgts jūsu personiskajā profilā"</string>
     <string name="enterprise_privacy_always_on_vpn_work" msgid="7244472958208315814">"Iestatījums “Vienmēr ieslēgts VPN” ir ieslēgts jūsu darba profilā"</string>
     <string name="enterprise_privacy_global_http_proxy" msgid="7936664553416257333">"Ir iestatīts globālais HTTP starpniekserveris"</string>
-    <string name="enterprise_privacy_ca_certs" msgid="5885892204903688909">"Uzticami akreditācijas dati"</string>
+    <string name="enterprise_privacy_ca_certs_device" msgid="2019652712782510262">"Uzticami akreditācijas dati"</string>
+    <string name="enterprise_privacy_ca_certs_personal" msgid="2279084820904076599">"Jūsu personiskajā profilā instalēti uzticami akreditācijas dati"</string>
+    <string name="enterprise_privacy_ca_certs_work" msgid="6187377647815301809">"Jūsu darba profilā instalēti uzticami akreditācijas dati"</string>
     <plurals name="enterprise_privacy_number_ca_certs" formatted="false" msgid="526375234629534165">
       <item quantity="zero">Vismaz <xliff:g id="COUNT_1">%d</xliff:g> CA sertifikāti</item>
       <item quantity="one">Vismaz <xliff:g id="COUNT_1">%d</xliff:g> CA sertifikāts</item>
@@ -3746,10 +3781,12 @@
     <string name="storage_manager_indicator_on" msgid="8625551710194584733">"Ieslēgts"</string>
     <string name="install_type_instant" msgid="3174425974536078647">"Tūlītējā lietotne"</string>
     <string name="automatic_storage_manager_deactivation_warning" msgid="5605210730828410482">"Vai izslēgt krātuves pārvaldnieku?"</string>
-    <string name="storage_movies_tv" msgid="5498394447562086890">"Filmu un TV pārraižu lietotnes"</string>
+    <string name="storage_movies_tv" msgid="5498394447562086890">"Filmu un TV lietotnes"</string>
     <string name="carrier_provisioning" msgid="4398683675591893169">"Informācija par operatora nodrošināšanu"</string>
     <string name="trigger_carrier_provisioning" msgid="3434865918009286187">"Aktivizēt operatora nodrošināšanu"</string>
     <string name="new_device_suggestion_title" msgid="698847081680980774">"Kādi ir jaunumi?"</string>
-    <string name="new_device_suggestion_summary" msgid="7172709269203435870">"Skatiet 5 jaunākās funkcijas"</string>
+    <string name="new_device_suggestion_summary" product="default" msgid="206396571522515855">"Apskatiet savu jauno tālruni"</string>
+    <string name="new_device_suggestion_summary" product="tablet" msgid="393751455688210956">"Apskatiet savu jauno planšetdatoru"</string>
+    <string name="new_device_suggestion_summary" product="device" msgid="2939870049868336652">"Apskatiet savu jauno ierīci"</string>
     <string name="disabled_low_ram_device" msgid="3751578499721173344">"Šī funkcija šajā ierīcē nav pieejama."</string>
 </resources>
diff --git a/res/values-mcc262-mnc02-bn/strings.xml b/res/values-mcc262-mnc02-bn/strings.xml
index 1b66ebf..3ed6c9fa 100644
--- a/res/values-mcc262-mnc02-bn/strings.xml
+++ b/res/values-mcc262-mnc02-bn/strings.xml
@@ -16,5 +16,5 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="wifi_calling_off_explanation_2" msgid="741028819102506783">\n\n"ওয়াই-ফাই এর মাধ্যমে জরুরী কল করা যাবে না। জরুরী কল করার চেষ্টা করলে আপনার ডিভাইস নিজে থেকেই মোবাইল নেটওয়ার্ক ব্যবহার করতে শুরু করবে। যেখানে মোবাইল নেটওয়ার্ক কভারেজ আছে, শুধুমাত্র সেখানেই জরুরী কল করা যাবে।"</string>
+    <string name="wifi_calling_off_explanation_2" msgid="741028819102506783">\n\n"ওয়াই-ফাই এর মাধ্যমে জরুরি কল করা যাবে না। জরুরি কল করার চেষ্টা করলে আপনার ডিভাইস নিজে থেকেই মোবাইল নেটওয়ার্ক ব্যবহার করতে শুরু করবে। যেখানে মোবাইল নেটওয়ার্ক কভারেজ আছে, শুধুমাত্র সেখানেই জরুরি কল করা যাবে।"</string>
 </resources>
diff --git a/res/values-mcc262-mnc02-en-rCA/strings.xml b/res/values-mcc262-mnc02-en-rCA/strings.xml
new file mode 100644
index 0000000..45cff38
--- /dev/null
+++ b/res/values-mcc262-mnc02-en-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"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-rXC/strings.xml b/res/values-mcc262-mnc02-en-rXC/strings.xml
new file mode 100644
index 0000000..f3a15a2
--- /dev/null
+++ b/res/values-mcc262-mnc02-en-rXC/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-gl/strings.xml b/res/values-mcc262-mnc02-gl/strings.xml
index 2c70218..d67c86f 100644
--- a/res/values-mcc262-mnc02-gl/strings.xml
+++ b/res/values-mcc262-mnc02-gl/strings.xml
@@ -16,5 +16,5 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="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>
+    <string name="wifi_calling_off_explanation_2" msgid="741028819102506783">\n\n"Non podes facer chamadas de urxencia mediante as chamadas por wifi. Se tentas realizar unha chamada de urxencia, o dispositivo utilizará automaticamente a rede móbil. As chamadas de urxencia só se poden facer en zonas con cobertura de rede de telefonía móbil."</string>
 </resources>
diff --git a/res/values-mcc262-mnc02-gu/strings.xml b/res/values-mcc262-mnc02-gu/strings.xml
index ac24429..f91f467 100644
--- a/res/values-mcc262-mnc02-gu/strings.xml
+++ b/res/values-mcc262-mnc02-gu/strings.xml
@@ -16,5 +16,5 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="wifi_calling_off_explanation_2" msgid="741028819102506783">\n\n"તમે Wi-Fi કૉલિંગ મારફતે કટોકટીનો કૉલ કરી શકતા નથી. જો તમે કોઈ કટોકટીનો કૉલ કરવાનો પ્રયાસ કરો છો, તો તમારું ઉપકરણ આપમેળે મોબાઇલ નેટવર્કનો ઉપયોગ કરશે. માત્ર મોબાઇલ નેટવર્ક કવરેજવાળા વિસ્તારમાં જ કટોકટીનો કૉલ કરી શકાય છે."</string>
+    <string name="wifi_calling_off_explanation_2" msgid="741028819102506783">\n\n"તમે વાઇ-ફાઇ કૉલિંગ મારફતે કટોકટીનો કૉલ કરી શકતા નથી. જો તમે કોઈ કટોકટીનો કૉલ કરવાનો પ્રયાસ કરો છો, તો તમારું ઉપકરણ આપમેળે મોબાઇલ નેટવર્કનો ઉપયોગ કરશે. માત્ર મોબાઇલ નેટવર્ક કવરેજવાળા વિસ્તારમાં જ કટોકટીનો કૉલ કરી શકાય છે."</string>
 </resources>
diff --git a/res/values-mcc262-mnc02-pa/strings.xml b/res/values-mcc262-mnc02-pa/strings.xml
index 39b1080..8c7b2c8 100644
--- a/res/values-mcc262-mnc02-pa/strings.xml
+++ b/res/values-mcc262-mnc02-pa/strings.xml
@@ -16,5 +16,5 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="wifi_calling_off_explanation_2" msgid="741028819102506783">\n\n"ਤੁਸੀਂ Wi-Fi ਕਾਲਿੰਗ ਰਾਹੀਂ ਸੰਕਟਕਾਲੀਨ ਕਾਲਾਂ ਨਹੀਂ ਕਰ ਸਕਦੇ ਹੋ। ਜੇਕਰ ਤੁਸੀਂ ਕੋਈ ਸੰਕਟਕਾਲੀਨ ਕਾਲ ਕਰਨ ਦੀ ਕੋਸ਼ਿਸ਼ ਕਰਦੇ ਹੋ, ਤਾਂ ਤੁਹਾਡੀ ਡੀਵਾਈਸ ਸਵੈਚਲਿਤ ਤੌਰ \'ਤੇ ਮੋਬਾਈਲ ਨੈੱਟਵਰਕ ਦੀ ਵਰਤੋਂ ਕਰੇਗੀ। ਸੰਕਟਕਾਲੀਨ ਕਾਲਾਂ ਸਿਰਫ਼ ਮੋਬਾਈਲ ਨੈੱਟਵਰਕ ਕਵਰੇਜ ਵਾਲੇ ਖੇਤਰਾਂ ਵਿੱਚ ਕੀਤੀਆਂ ਜਾ ਸਕਦੀਆਂ ਹਨ।"</string>
+    <string name="wifi_calling_off_explanation_2" msgid="741028819102506783">\n\n"ਤੁਸੀਂ ਵਾਈ-ਫਾਈ ਕਾਲਿੰਗ ਰਾਹੀਂ ਸੰਕਟਕਾਲੀਨ ਕਾਲਾਂ ਨਹੀਂ ਕਰ ਸਕਦੇ ਹੋ। ਜੇਕਰ ਤੁਸੀਂ ਕੋਈ ਸੰਕਟਕਾਲੀਨ ਕਾਲ ਕਰਨ ਦੀ ਕੋਸ਼ਿਸ਼ ਕਰਦੇ ਹੋ, ਤਾਂ ਤੁਹਾਡਾ ਡੀਵਾਈਸ ਸਵੈਚਲਿਤ ਤੌਰ \'ਤੇ ਮੋਬਾਈਲ ਨੈੱਟਵਰਕ ਦੀ ਵਰਤੋਂ ਕਰੇਗਾ। ਸੰਕਟਕਾਲੀਨ ਕਾਲਾਂ ਸਿਰਫ਼ ਮੋਬਾਈਲ ਨੈੱਟਵਰਕ ਕਵਰੇਜ ਵਾਲੇ ਖੇਤਰਾਂ ਵਿੱਚ ਕੀਤੀਆਂ ਜਾ ਸਕਦੀਆਂ ਹਨ।"</string>
 </resources>
diff --git a/res/values-mcc262-mnc02-sk/strings.xml b/res/values-mcc262-mnc02-sk/strings.xml
index c951070..48abf40 100644
--- a/res/values-mcc262-mnc02-sk/strings.xml
+++ b/res/values-mcc262-mnc02-sk/strings.xml
@@ -16,5 +16,5 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="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>
+    <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-mk/arrays.xml b/res/values-mk/arrays.xml
index 1f76012..39fbcb2 100644
--- a/res/values-mk/arrays.xml
+++ b/res/values-mk/arrays.xml
@@ -100,8 +100,6 @@
     <!-- no translation found for wifi_security_no_eap:0 (2084555984818107151) -->
     <!-- no translation found for wifi_security_no_eap:1 (397579322683471524) -->
     <!-- no translation found for wifi_security_no_eap:2 (1968820975358150484) -->
-    <!-- no translation found for wifi_ap_security:0 (5251664683198623324) -->
-    <!-- no translation found for wifi_ap_security:1 (7989073072260294673) -->
   <string-array name="wifi_eap_method">
     <item msgid="1160193392455075561">"PEAP"</item>
     <item msgid="7981731051382306293">"TLS"</item>
@@ -225,7 +223,7 @@
     <item msgid="2681427309183221543">"GID"</item>
   </string-array>
   <string-array name="app_install_location_entries">
-    <item msgid="8151497958991952759">"Внатрешна меморија"</item>
+    <item msgid="8151497958991952759">"Внатрешен капацитет"</item>
     <item msgid="3738430123799803530">"Пренослива СД картичка"</item>
     <item msgid="4498124044785815005">"Дозволи системот да одлучи"</item>
   </string-array>
@@ -260,7 +258,7 @@
     <item msgid="7125408150230860501">"испрати SMS порака"</item>
     <item msgid="7080337936612188061">"прочитај SMS порака на ICC"</item>
     <item msgid="587124103118495063">"напиши SMS порака на ICC"</item>
-    <item msgid="2320577158869025503">"измени подесувања"</item>
+    <item msgid="2320577158869025503">"измени поставки"</item>
     <item msgid="1545733463471924009">"цртај на врвот"</item>
     <item msgid="3609046903962454582">"пристапи кон известувања"</item>
     <item msgid="4671646036128214513">"фотоапарат"</item>
@@ -327,7 +325,7 @@
     <item msgid="1407766984645388488">"Испрати SMS/MMS порака"</item>
     <item msgid="3527273606643794973">"Прочитај SMS/MMS порака"</item>
     <item msgid="4370895547001583812">"Напиши SMS/MMS порака"</item>
-    <item msgid="4218544235221631789">"Измени подесувања"</item>
+    <item msgid="4218544235221631789">"Измени поставки"</item>
     <item msgid="736541391767350377">"Цртај на врвот"</item>
     <item msgid="5530815681721654194">"Пристапи кон известувања"</item>
     <item msgid="781213371706962767">"Камера"</item>
diff --git a/res/values-mk/strings.xml b/res/values-mk/strings.xml
index 9d9f53e..04943fe 100644
--- a/res/values-mk/strings.xml
+++ b/res/values-mk/strings.xml
@@ -166,7 +166,7 @@
     <string name="bluetooth_map_acceptance_dialog_text" msgid="8712508202081143737">"%1$s сака да пристапи кон вашите пораки. Дозволи пристап на %2$s?"</string>
     <string name="bluetooth_sap_request" msgid="2669762224045354417">"Побаран е пристап до SIM"</string>
     <string name="bluetooth_sap_acceptance_dialog_text" msgid="4414253873553608690">"<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g> сака да пристапи до вашата SIM-картичка. Доколку дозволите пристап до SIM-картичката, ќе се исклучи поврзувањето со податоци на уредот сѐ додека трае поврзувањето. Дозволете пристап до <xliff:g id="DEVICE_NAME_1">%2$s?</xliff:g>"</string>
-    <string name="bluetooth_device_name_summary" msgid="4757990010751789977">"Другите уреди го гледаат како „<xliff:g id="DEVICE_NAME">^1</xliff:g>“"</string>
+    <string name="bluetooth_device_name_summary" msgid="522235742194965734">"Другите уреди го гледаат како „<xliff:g id="DEVICE_NAME">^1</xliff:g>“"</string>
     <string name="bluetooth_paired_device_title" msgid="8638994696317952019">"Ваши уреди"</string>
     <string name="bluetooth_pairing_page_title" msgid="7712127387361962608">"Спарување нов уред"</string>
     <string name="date_and_time" msgid="9062980487860757694">"Датум и време"</string>
@@ -281,7 +281,7 @@
     <string name="done" msgid="6942539184162713160">"Готово"</string>
     <string name="settings_label" msgid="1626402585530130914">"Поставки"</string>
     <string name="settings_label_launcher" msgid="8344735489639482340">"Поставки"</string>
-    <string name="settings_shortcut" msgid="3936651951364030415">"Кратенка за подесувања"</string>
+    <string name="settings_shortcut" msgid="3936651951364030415">"Кратенка за поставки"</string>
     <string name="activity_list_empty" msgid="6428823323471264836">"Не се пронајдени активности што се соовпаѓаат."</string>
     <string name="airplane_mode" msgid="8837269988154128601">"Режим на работа во авион"</string>
     <string name="radio_controls_title" msgid="3447085191369779032">"Повеќе"</string>
@@ -300,7 +300,7 @@
     <string name="roaming_warning" msgid="4275443317524544705">"Може да направите големи трошоци."</string>
     <string name="roaming_warning_multiuser" product="tablet" msgid="6458990250829214777">"Кога ќе овозможите роаминг на податоци, може да направите големи трошоци за роаминг!\n\nОва подесување влијае на сите корисници на овој таблет."</string>
     <string name="roaming_warning_multiuser" product="default" msgid="6368421100292355440">"Кога ќе овозможите роаминг на податоци, може да направите големи трошоци за роаминг!\n\nОва подесување влијае на сите корисници на овој телефон."</string>
-    <string name="roaming_reenable_title" msgid="6068100976707316772">"Дозволи роаминг на податоци?"</string>
+    <string name="roaming_reenable_title" msgid="6068100976707316772">"Дозволи интернет-роаминг?"</string>
     <string name="networks" msgid="6333316876545927039">"Избор на оператор"</string>
     <string name="sum_carrier_select" msgid="3616956422251879163">"Избери оператор на мрежа"</string>
     <string name="date_and_time_settings_title" msgid="3350640463596716780">"Датум и време"</string>
@@ -312,6 +312,8 @@
     <string name="zone_auto" msgid="334783869352026648">"Автоматска временска зона"</string>
     <string name="zone_auto_summaryOn" msgid="6142830927278458314">"Користи временска зона обезбедена од мрежа"</string>
     <string name="zone_auto_summaryOff" msgid="2597745783162041390">"Користи временска зона обезбедена од мрежа"</string>
+    <string name="date_time_24hour_auto" msgid="2117383168985653422">"Автоматски 24-часовен формат"</string>
+    <string name="date_time_24hour_auto_summary" msgid="6351812925651480277">"Користи локален стандард"</string>
     <string name="date_time_24hour_title" msgid="3203537578602803850">"Формат од 24 часа"</string>
     <string name="date_time_24hour" msgid="1193032284921000063">"Користи 24-часовен формат"</string>
     <string name="date_time_set_time_title" msgid="6296795651349047016">"Време"</string>
@@ -341,8 +343,7 @@
     <string name="Accounts_settings_title" msgid="1643879107901699406">"Сметки"</string>
     <string name="location_settings_title" msgid="1369675479310751735">"Локација"</string>
     <string name="account_settings_title" msgid="626177544686329806">"Сметки"</string>
-    <!-- no translation found for security_settings_title (4918904614964215087) -->
-    <skip />
+    <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>
@@ -373,6 +374,9 @@
     <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="1961957425135180242">"Следно"</string>
+    <string name="setup_fingerprint_enroll_skip_title" msgid="362050541117362034">"Да се прескокне отпечаток?"</string>
+    <string name="setup_fingerprint_enroll_skip_after_adding_lock_text" msgid="958990414356204763">"Поставувањето отпечаток трае само една или две минути. Ако го прескокнете ова, може да го додадете вашиот отпечаток подоцна во поставките."</string>
+    <string name="lock_screen_intro_skip_title" msgid="4988210105913705679">"Прескокни заклучување екран?"</string>
     <string name="lock_screen_intro_skip_dialog_text_frp" product="tablet" msgid="1581834104051243425">"Функциите за заштита на уредот нема да се вклучат. Нема да може да ги спречите другите да го користат таблетов ако го изгубите, ви го украдат или се ресетира."</string>
     <string name="lock_screen_intro_skip_dialog_text_frp" product="device" msgid="4629503416877189572">"Функциите за заштита на уредот нема да се вклучат. Нема да може да ги спречите другите да го користат уредов ако го изгубите, ви го украдат или се ресетира."</string>
     <string name="lock_screen_intro_skip_dialog_text_frp" product="default" msgid="2423428240245737909">"Функциите за заштита на уредот нема да се вклучат. Нема да може да ги спречите другите да го користат телефонов ако го изгубите, ви го украдат или се ресетира."</string>
@@ -402,7 +406,7 @@
     <string name="security_settings_fingerprint_enroll_touch_dialog_message" msgid="2989019978041986175">"Допрете го сензорот одзади со показалецот."</string>
     <string name="security_settings_fingerprint_enroll_error_dialog_title" msgid="3618021988442639280">"Запишувањето не е завршено"</string>
     <string name="security_settings_fingerprint_enroll_error_timeout_dialog_message" msgid="2942551158278899627">"Се достигна временското ограничување на запишувањето со отпечаток од прст. Обидете се повторно."</string>
-    <string name="security_settings_fingerprint_enroll_error_generic_dialog_message" msgid="3624760637222239293">"Запишувањето со отпечаток од прст не работеше. Обидете се повторно или користете друг прст."</string>
+    <string name="security_settings_fingerprint_enroll_error_generic_dialog_message" msgid="3624760637222239293">"Запишувањето со отпечаток од прст не успеа. Обидете се повторно или користете друг прст."</string>
     <string name="fingerprint_enroll_button_add" msgid="6317978977419045463">"Додај друг"</string>
     <string name="fingerprint_enroll_button_next" msgid="6247009337616342759">"Следно"</string>
     <string name="security_settings_fingerprint_enroll_disclaimer" msgid="2624905914239271751">"Освен за отклучување на телефонот, отпечатокот може да го користите и за да авторизирате купувања и да пристапувате до апликации. "<annotation id="url">"Дознајте повеќе"</annotation></string>
@@ -416,7 +420,7 @@
     <string name="fingerprint_delete_message" msgid="8597787803567398131">"Дали сакате да го избришете отпечатоков?"</string>
     <string name="fingerprint_last_delete_message" msgid="7852321001254275878">"Нема да може да ги користите отпечатоците за да го отклучите телефонот, да одобрувате купувања или да се најавувате на апликации со нив"</string>
     <string name="fingerprint_last_delete_message_profile_challenge" msgid="6521520787746771912">"Нема да може да ги користите отпечатоците за да го отклучите работниот профил, да одобрувате купувања или да се најавувате на апликациите за работа"</string>
-    <string name="fingerprint_last_delete_confirm" msgid="2634726361059274289">"Да, отстрани"</string>
+    <string name="fingerprint_last_delete_confirm" msgid="2634726361059274289">"Отстрани го"</string>
     <string name="confirm_fingerprint_icon_content_description" msgid="5255544532157079096">"Користете го отпечатокот на прст за да продолжите."</string>
     <string name="crypt_keeper_settings_title" msgid="4219233835490520414">"Шифрирање"</string>
     <string name="crypt_keeper_encrypt_title" product="tablet" msgid="1060273569887301457">"Шифрирај таблет"</string>
@@ -443,7 +447,7 @@
     <string name="crypt_keeper_warn_wipe" msgid="2738374897337991667">"Предупредување: уредот ќе се избрише по уште <xliff:g id="COUNT">^1</xliff:g> неуспешни обиди да се отклучи!"</string>
     <string name="crypt_keeper_enter_password" msgid="2223340178473871064">"Напиши ја лозинката"</string>
     <string name="crypt_keeper_failed_title" msgid="7133499413023075961">"Шифрирањето е неуспешно"</string>
-    <string name="crypt_keeper_failed_summary" product="tablet" msgid="8219375738445017266">"Шифрирањето се прекина и не може да се заврши. Како резултат на тоа, податоците од вашиот таблет веќе не се достапни. \n \n За да продолжите да го користите таблетот, треба да се изврши ресетирање на фабричките подесувања. Кога ќе го подесите таблетот по ресетирањето, ќе имате можност да ги обновите сите податоци за кои имате резервна копија на вашата сметка на Google."</string>
+    <string name="crypt_keeper_failed_summary" product="tablet" msgid="8219375738445017266">"Шифрирањето се прекина и не може да се заврши. Како резултат на тоа, податоците од вашиот таблет веќе не се достапни. \n \n За да продолжите да го користите таблетот, треба да се изврши ресетирање на фабричките поставки. Кога ќе го подесите таблетот по ресетирањето, ќе имате можност да ги обновите сите податоци за кои имате резервна копија на вашата сметка на Google."</string>
     <string name="crypt_keeper_failed_summary" product="default" msgid="3270131542549577953">"Шифрирањето се прекина и не може да се заврши. Како резултат на тоа, податоците од вашиот телефон веќе не се достапни. \n \nЗа да продолжите да го користите телефонот, треба да се изврши ресетирање на фабричките поставувања. Кога ќе го подесите телефонот по ресетирањето, ќе имате можност да ги обновите сите податоци за кои имате резервна копија на вашата сметка на Google."</string>
     <string name="crypt_keeper_data_corrupt_title" msgid="8759119849089795751">"Дешифрирањето е неуспешно"</string>
     <string name="crypt_keeper_data_corrupt_summary" product="tablet" msgid="840107296925798402">"Лозинката што ја внесовте е правилна, но, за жал, податоците се оштетени. \n\nЗа да продолжите да го користите таблетот, треба да извршите фабричко ресетирање. Кога ќе го поставувате таблетот по ресетирањето, ќе имате можност да ги обновите сите податоци што имаат резервни копии на вашата сметка на Google."</string>
@@ -458,7 +462,7 @@
     <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="lock_settings_picker_fingerprint_added_security_message" msgid="5768002109707648463">"За дополнителна безбедност, поставете резервно заклучување екран."</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>
@@ -531,7 +535,7 @@
     <string name="unlock_disable_frp_warning_content_unknown_fingerprint_profile" msgid="4994062501123299418">"Функциите за заштита на профилот нема да работат без заклучувањето на екранот.<xliff:g id="EMPTY_LINE">
 
 </xliff:g>И зачуваните отпечатоци ќе се отстранат од профилов, така што нема да може да го отклучувате профилот, да овластувате купувања или да се најавувате на апликации со нив."</string>
-    <string name="unlock_disable_frp_warning_ok" msgid="7075138677177748705">"Да, отстрани"</string>
+    <string name="unlock_disable_frp_warning_ok" msgid="7075138677177748705">"Отстрани ја"</string>
     <string name="unlock_change_lock_pattern_title" msgid="2044092014872741130">"Смени шема на отклуч."</string>
     <string name="unlock_change_lock_pin_title" msgid="806629901095938484">"Промени PIN за отклучување"</string>
     <string name="unlock_change_lock_password_title" msgid="5606298470358768865">"Смени лозинка за откл."</string>
@@ -589,6 +593,7 @@
     <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="lockpassword_clear_label" msgid="5724429464960458155">"Исчисти"</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>
@@ -782,6 +787,7 @@
     <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>
@@ -789,7 +795,7 @@
     <string name="wifi_status" msgid="4824568012414605414">"Статус"</string>
     <string name="wifi_speed" msgid="3526198708812322037">"Брзина на врска"</string>
     <string name="wifi_frequency" msgid="7791090119577812214">"Фреквенција"</string>
-    <string name="wifi_ip_address" msgid="1440054061044402918">"ИП адреса"</string>
+    <string name="wifi_ip_address" msgid="1440054061044402918">"IP-адреса"</string>
     <string name="passpoint_label" msgid="6381371313076009926">"Зачувано преку"</string>
     <string name="passpoint_content" msgid="8447207162397870483">"Акредитиви на <xliff:g id="NAME">%1$s</xliff:g>"</string>
     <string name="wifi_eap_method" msgid="8529436133640730382">"EAP метод"</string>
@@ -818,6 +824,8 @@
     <string name="wifi_wps_available_first_item" msgid="4422547079984583502">"Достапен WPS"</string>
     <string name="wifi_wps_available_second_item" msgid="8427520131718215301">" (Достапен WPS)"</string>
     <string name="wifi_wps_nfc_enter_password" msgid="2288214226916117159">"Внесете ја вашата мрежна лозинка"</string>
+    <string name="wifi_carrier_connect" msgid="8174696557882299911">"Wi‑Fi мрежа на операторот"</string>
+    <string name="wifi_carrier_content" msgid="4634077285415851933">"Поврзете се преку <xliff:g id="NAME">%1%s</xliff:g>"</string>
     <string name="wifi_scan_always_turnon_message" msgid="203123538572122989">"За да се подобри точноста на локација и за други цели, <xliff:g id="APP_NAME">%1$s</xliff:g> сака да се вклучи скенирање за мрежи  дури и кога Wi-Fi е исклучена.\n\nДозволи го ова за сите апликации кои сакаат да се скенира?"</string>
     <string name="wifi_scan_always_turnoff_message" msgid="5538901671131941043">"За да го исклучите ова, одете на Напредни во менито на прелевање."</string>
     <string name="wifi_scan_always_confirm_allow" msgid="5355973075896817232">"Дозволи"</string>
@@ -835,6 +843,7 @@
     <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_modify" msgid="6100248070440710782">"Измени"</string>
     <string name="wifi_failed_forget_message" msgid="1348172929201654986">"Не успеа да се заборави мрежата"</string>
     <string name="wifi_save" msgid="3331121567988522826">"Зачувај"</string>
     <string name="wifi_failed_save_message" msgid="6650004874143815692">"Не успеа да се зачува мрежата"</string>
@@ -846,7 +855,8 @@
     </plurals>
     <string name="wifi_advanced_titlebar" msgid="4485841401774142908">"Напредна Wi-Fi"</string>
     <string name="wifi_advanced_mac_address_title" msgid="6571335466330978393">"MAC адреса"</string>
-    <string name="wifi_advanced_ip_address_title" msgid="6215297094363164846">"ИП адреса"</string>
+    <string name="wifi_advanced_ip_address_title" msgid="6215297094363164846">"IP-адреса"</string>
+    <string name="wifi_details_title" msgid="3471132676909349382">"Информации за мрежата"</string>
     <string name="wifi_details_subnet_mask" msgid="6720279144174924410">"Маска на подмрежа"</string>
     <string name="wifi_details_dns" msgid="8648826607751830768">"DNS"</string>
     <string name="wifi_details_ipv6_address_header" msgid="6734119149106422148">"IPv6 адреси"</string>
@@ -879,16 +889,15 @@
     <string name="wifi_p2p_cancel_connect_title" msgid="255267538099324413">"Откажи покана?"</string>
     <string name="wifi_p2p_cancel_connect_message" msgid="7477756213423749402">"Дали сакате да ја откажете поканата да се поврзете со <xliff:g id="PEER_NAME">%1$s</xliff:g>?"</string>
     <string name="wifi_p2p_delete_group_message" msgid="834559380069647086">"Заборави ја оваа група?"</string>
-    <string name="wifi_tether_checkbox_text" msgid="1847167643625779136">"Точка на пристап на пренослива Wi-Fi"</string>
-    <string name="wifi_hotspot_checkbox_text" msgid="7763495093333664887">"Жешко место за Wi‑Fi"</string>
+    <string name="wifi_hotspot_checkbox_text" msgid="7763495093333664887">"Точка на пристап за Wi‑Fi"</string>
     <string name="wifi_hotspot_off_subtext" msgid="5466126533609394170">"Не се споделува интернет или содржини со други уреди"</string>
     <string name="wifi_hotspot_tethering_on_subtext" product="tablet" msgid="5752490509369962007">"Интернет-врската на таблетов се споделува преку точка на пристап"</string>
     <string name="wifi_hotspot_tethering_on_subtext" product="default" msgid="6461075246164300670">"Интернет-врската на телефонов се споделува преку точка на пристап"</string>
     <string name="wifi_hotspot_on_local_only_subtext" msgid="2068110388011294735">"Апликацијата споделува содржини. За споделување на интернет-врската, исклучете ја, а потоа вклучете ја точката на пристап"</string>
-    <string name="wifi_hotspot_name_title" msgid="1341735529132128887">"Име на Wi‑Fi"</string>
+    <string name="wifi_hotspot_name_title" msgid="8237000746618636778">"Име на точка на пристап"</string>
     <string name="wifi_hotspot_name_summary_connecting" msgid="3378299995508671967">"Се вклучува <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>…"</string>
     <string name="wifi_hotspot_name_summary_connected" msgid="3888672084861445362">"Другите уреди може да се поврзат на <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>"</string>
-    <string name="wifi_hotspot_password_title" msgid="1955592302902091281">"Лозинка за Wi-Fi"</string>
+    <string name="wifi_hotspot_password_title" msgid="8676859981917573801">"Лозинка на точка на пристап"</string>
     <string name="wifi_hotspot_ap_band_title" msgid="1165801173359290681">"Појас на точката на пристап"</string>
     <string name="wifi_hotspot_footer_info_regular" msgid="1203489406068036455">"Користете точка на пристап за да создадете Wi‑Fi мрежа за другите уреди. Точката на пристап обезбедува интернет со помош на мобилната интернет-врска. Може да ви се наплатат дополнителни трошоци за мобилниот интернет."</string>
     <string name="wifi_hotspot_footer_info_local_only" msgid="857988412470694109">"Апликациите може да создадат точка на пристап за да споделуваат содржини со уредите во близина."</string>
@@ -897,9 +906,8 @@
     <string name="wifi_tether_enabled_subtext" msgid="7842111748046063857">"<xliff:g id="NETWORK_SSID">%1$s</xliff:g> е активно"</string>
     <string name="wifi_tether_failed_subtext" msgid="1484941858530919002">"Грешка на точка на пристап на пренослива Wi-Fi"</string>
     <string name="wifi_tether_configure_ap_text" msgid="7974681394041609308">"Поставете точка на пристап со Wi-Fi"</string>
-    <string name="wifi_hotspot_configure_ap_text" msgid="5478614731464220432">"Постав. жешко место за Wi‑Fi"</string>
+    <string name="wifi_hotspot_configure_ap_text" msgid="5478614731464220432">"Точка на пристап за Wi‑Fi"</string>
     <string name="wifi_hotspot_configure_ap_text_summary" msgid="5560680057727007011">"Точка на пристап AndroidAP WPA2 PSK"</string>
-    <string name="wifi_tether_configure_subtext" msgid="2050196439900426456">"Точка на пристап <xliff:g id="NETWORK_SSID">%1$s</xliff:g> <xliff:g id="NETWORK_SECURITY">%2$s</xliff:g>"</string>
     <string name="wifi_tether_configure_ssid_default" msgid="8467525402622138547">"AndroidHotspot"</string>
     <string name="wifi_calling_settings_title" msgid="4102921303993404577">"Повикување преку Wi-Fi"</string>
     <string name="wifi_calling_suggestion_title" msgid="9008010480466359578">"Вклучете Повици преку Wi-Fi"</string>
@@ -940,7 +948,7 @@
     <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="emergency_address_summary" msgid="3266760199681945746">"Адреса што ќе ја користат службите за итни случаи како ваша локација ако повикате итни служби преку Wi-Fi"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"Екран"</string>
     <string name="sound_settings" msgid="5534671337768745343">"Звук"</string>
     <string name="all_volume_title" msgid="4296957391257836961">"Јачини"</string>
@@ -994,6 +1002,7 @@
     <string name="search_settings" msgid="1910951467596035063">"Пребарај"</string>
     <string name="search_settings_summary" msgid="9205656546570654169">"Управувај со подесувањата за пребарување и историја"</string>
     <string name="search_settings_no_results" msgid="8799027492641230999">"Нема резултати"</string>
+    <string name="search_clear_history" msgid="4196658962573162457">"Исчисти ја историјата"</string>
     <string name="display_settings" msgid="7965901687241669598">"Приказ"</string>
     <string name="accelerometer_title" msgid="7854608399547349157">"Автоматско ротирање на екранот"</string>
     <string name="color_mode_title" msgid="3159275920408338215">"Интензивни бои"</string>
@@ -1121,16 +1130,15 @@
     <string name="hardware_revision" msgid="8893547686367095527">"Верзија на хардвер"</string>
     <string name="fcc_equipment_id" msgid="149114368246356737">"ID на опрема"</string>
     <string name="baseband_version" msgid="1848990160763524801">"Верзија со основен појас на фреквенција"</string>
-    <string name="kernel_version" msgid="9192574954196167602">"Верзија на јадро"</string>
-    <string name="build_number" msgid="3075795840572241758">"Изгради број"</string>
-    <string name="selinux_status" msgid="6212165375172061672">"Статус на SELinux"</string>
+    <string name="kernel_version" msgid="9192574954196167602">"Верзија на кернел"</string>
+    <string name="build_number" msgid="3075795840572241758">"Број на верзија"</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>
     <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>
@@ -1151,10 +1159,9 @@
     <string name="status_wifi_mac_address" msgid="2202206684020765378">"Адреса на MAC за Wi-Fi"</string>
     <string name="status_bt_address" msgid="4195174192087439720">"Адреса на Bluetooth"</string>
     <string name="status_serial_number" msgid="2257111183374628137">"Сериски број"</string>
-    <string name="status_unavailable" msgid="7862009036663793314">"Недостапен"</string>
     <string name="status_up_time" msgid="7294859476816760399">"Време од последно рестартирање"</string>
     <string name="status_awake_time" msgid="2393949909051183652">"Време на активност"</string>
-    <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>
@@ -1220,7 +1227,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>
@@ -1250,14 +1257,14 @@
     <string name="storage_detail_system" msgid="4629506366064709687">"Систем"</string>
     <string name="storage_detail_explore" msgid="7911344011431568294">"Истражи <xliff:g id="NAME">^1</xliff:g>"</string>
     <string name="storage_detail_dialog_other" msgid="8907101974576694793">"Под друго се подразбира споделени датотеки што ги зачувале апликациите, датотеки преземени од интернет или Bluetooth, датотеки на Android итн. \n\nЗа да ги видите видливите содржини на <xliff:g id="NAME">^1</xliff:g>, допрете Истражи."</string>
-    <string name="storage_detail_dialog_system" msgid="862835644848361569">"Системот опфаќа датотеки што се извршуваат на верзијата на Android <xliff:g id="VERSION">%s</xliff:g>"</string>
+    <string name="storage_detail_dialog_system" msgid="862835644848361569">"Системот опфаќа датотеки што се извршуваат на верзијата <xliff:g id="VERSION">%s</xliff:g> на Android"</string>
     <string name="storage_detail_dialog_user" msgid="3267254783294197804">"<xliff:g id="USER_0">^1</xliff:g> може да има зачувани фотографии, музика, апликации или други податоци што зафаќаат <xliff:g id="SIZE">^2</xliff:g> меморија. \n\nЗа детали, префрлете се на <xliff:g id="USER_1">^1</xliff:g>."</string>
     <string name="storage_wizard_init_title" msgid="5085400514028585772">"Поставете <xliff:g id="NAME">^1</xliff:g>"</string>
     <string name="storage_wizard_init_external_title" msgid="4867326438945303598">"Користи како пренослива меморија"</string>
     <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>
@@ -1323,10 +1330,11 @@
     <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="restore_default_apn" msgid="8178010218751639581">"Враќање стандардни поставки на APN."</string>
     <string name="menu_restore" msgid="8260067415075573273">"Ресетирај на стандардни вредности"</string>
-    <string name="restore_default_apn_completed" msgid="2824775307377604897">"Ресетирањето стандардни подесувања на APN е завршено."</string>
+    <string name="restore_default_apn_completed" msgid="2824775307377604897">"Ресетирањето стандардни поставки на APN е завршено."</string>
     <string name="reset_dashboard_title" msgid="6254873816990678620">"Опции за ресетирање"</string>
+    <string name="reset_dashboard_summary" msgid="4851012632493522755">"Може да се ресетира мрежа, апликации или уред"</string>
     <string name="reset_network_title" msgid="6166025966016873843">"Ресетирај Wi-Fi, мобилен интернет и Bluetooth"</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>
@@ -1335,17 +1343,14 @@
     <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="6617679904229218425">"Избриши ги сите податоци (фабричко ресетирање)"</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>
-    </plurals>
-    <string name="master_clear_summary" msgid="6902443944660426951">"Внатрешната меморија и сите податоци ќе се ресетираат"</string>
-    <string name="master_clear_desc" product="tablet" msgid="9146059417023157222">"Ова ќе ги избрише сите податоци од "<b>"внатрешна меморија"</b>"на вашиот таблет, заедно со:\n\n"<li>"вашата сметка на Google"</li>\n<li>"податоци и подесувања на систем и апликации"</li>\n<li>"преземени апликации"</li></string>
-    <string name="master_clear_desc" product="default" msgid="4800386183314202571">"Ова ќе ги избрише сите податоци од "<b>"внатрешната меморија"</b>" на телефонот, заедно со:\n\n"<li>"вашата сметка на Google"</li>\n<li>"податоци и подесувања на систем и апликации"</li>\n<li>"преземени апликации"</li></string>
+    <string name="master_clear_title" msgid="3531267871084279512">"Избриши ги сите податоци (фабричко ресетирање)"</string>
+    <string name="master_clear_desc" product="tablet" msgid="9146059417023157222">"Ова ќе ги избрише сите податоци од "<b>"внатрешна меморија"</b>"на вашиот таблет, заедно со:\n\n"<li>"вашата сметка на Google"</li>\n<li>"податоци и поставки на систем и апликации"</li>\n<li>"преземени апликации"</li></string>
+    <string name="master_clear_desc" product="default" msgid="4800386183314202571">"Ова ќе ги избрише сите податоци од "<b>"внатрешната меморија"</b>" на телефонот, заедно со:\n\n"<li>"вашата сметка на Google"</li>\n<li>"податоци и поставки на систем и апликации"</li>\n<li>"преземени апликации"</li></string>
     <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"Моментално сте најавени на следниве сметки:\n"</string>
     <string name="master_clear_other_users_present" product="default" msgid="5161423070702470742">\n\n"Присутни се и други корисници на уредот.\n"</string>
     <string name="master_clear_desc_also_erases_external" msgid="1903185203791274237"><li>"Музика"</li>\n<li>"Фотографии"</li>\n<li>"Други податоци за корисникот"</li></string>
+    <string name="master_clear_desc_also_erases_esim" msgid="312352697653096008"><li>"Оператори на eSIM-картичката"</li></string>
+    <string name="master_clear_desc_no_cancel_mobile_plan" msgid="5460926449093211144">\n\n"Тоа нема да го откаже вашиот пакет за мобилни услуги."</string>
     <string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="7744115866662613411">\n\n"За да исчистите музика, слики и други податоци на корисникот, "<b>"меморијата"</b>" треба да се избрише."</string>
     <string name="master_clear_desc_erase_external_storage" product="default" msgid="4801026652617377093">\n\n"За да исчистите музика, слики и други податоци на корисникот, "<b>"СД картичката"</b>" треба да се избрише."</string>
     <string name="erase_external_storage" product="nosdcard" msgid="969364037450286809">"Избриши USB меморија"</string>
@@ -1451,7 +1456,7 @@
     <string name="license_title" msgid="1990487604356037871">"Лиценца"</string>
     <string name="terms_title" msgid="7697580845616764642">"Правила и услови"</string>
     <string name="webview_license_title" msgid="2813507464175738967">"Системска лиценца за WebView"</string>
-    <string name="wallpaper_attributions" msgid="3645880512943433928">"Позадини"</string>
+    <string name="wallpaper_attributions" msgid="3645880512943433928">"Тапети"</string>
     <string name="wallpaper_attributions_values" msgid="2996183537914690469">"Даватели на сателитски снимки:\n©2014 CNES/Astrium, DigitalGlobe, Bluesky"</string>
     <string name="settings_manual_activity_title" msgid="8133150693616006051">"Упатство"</string>
     <string name="settings_manual_activity_unavailable" msgid="4752403782883814898">"Постои проблем со вчитување на упатството."</string>
@@ -1462,15 +1467,16 @@
     <string name="settings_safetylegal_activity_title" msgid="6901214628496951727">"Безбедносни информации"</string>
     <string name="settings_safetylegal_activity_unreachable" msgid="250674109915859456">"Немате врска со податоци. За да ги видите овие информации сега, одете на %s од кој било компјутер поврзан на интернет."</string>
     <string name="settings_safetylegal_activity_loading" msgid="8059022597639516348">"Се вчитува..."</string>
-    <string name="lockpassword_choose_your_password_header" msgid="8624900666929394990">"Изберете лозинка"</string>
-    <string name="lockpassword_choose_your_password_header_for_fingerprint" msgid="6624409510609085450">"Поставете лозинка за отпечаток"</string>
-    <string name="lockpassword_choose_your_pattern_header" msgid="6949761069941694050">"Изберете шема"</string>
-    <string name="lockpassword_choose_your_pattern_header_for_fingerprint" msgid="5901096361617543819">"Поставете шема за отпечаток"</string>
-    <string name="lockpassword_choose_your_pin_header" msgid="7598849519816138302">"Изберете PIN"</string>
-    <string name="lockpassword_choose_your_pin_header_for_fingerprint" msgid="765344692615917183">"Поставете PIN за отпечаток"</string>
-    <string name="lockpassword_confirm_your_password_header" msgid="6308478184889846633">"Потврдете ја лозинката"</string>
+    <string name="lockpassword_choose_your_screen_lock_header" msgid="3872462096767152394">"Поставете заклучување екран"</string>
+    <string name="lockpassword_choose_your_password_message" msgid="1197569283524841412">"За безбедност, поставете лозинка"</string>
+    <string name="lockpassword_choose_your_password_header_for_fingerprint" msgid="2541818487015343503">"Поставете лозинка за користење отпечаток"</string>
+    <string name="lockpassword_choose_your_pattern_header_for_fingerprint" msgid="7709785406243556723">"Поставете шема за користење отпечаток"</string>
+    <string name="lockpassword_choose_your_pin_message" msgid="1875420718677275646">"За безбедност, поставете PIN"</string>
+    <string name="lockpassword_choose_your_pin_header_for_fingerprint" msgid="1549639053195796674">"За да користите отпечаток, поставете PIN"</string>
+    <string name="lockpassword_choose_your_pattern_message" msgid="5986983400689720015">"За безбедност, поставете шема"</string>
+    <string name="lockpassword_confirm_your_password_header" msgid="1266027268220850931">"Внесете ја лозинката повторно"</string>
     <string name="lockpassword_confirm_your_pattern_header" msgid="7543433733032330821">"Потврдете ја шемата"</string>
-    <string name="lockpassword_confirm_your_pin_header" msgid="49038294648213197">"Потврдете го PIN-от"</string>
+    <string name="lockpassword_confirm_your_pin_header" msgid="7744513791910572550">"Внесете го PIN-кодот повторно"</string>
     <string name="lockpassword_confirm_passwords_dont_match" msgid="5140892109439191415">"Лозинките не се совпаѓаат"</string>
     <string name="lockpassword_confirm_pins_dont_match" msgid="7226244811505606217">"PIN-овите не се совпаѓаат"</string>
     <string name="lockpassword_choose_lock_generic_header" msgid="3811438094903786145">"Избери начин на отклучување"</string>
@@ -1489,6 +1495,12 @@
     <string name="lockpassword_strong_auth_required_work_pattern" msgid="3003781907040522053">"За дополнителна безбедност, користете ја шемата на работниот профил"</string>
     <string name="lockpassword_strong_auth_required_work_pin" msgid="3367491332598821552">"За дополнителна безбедност, внесете го PIN-кодот на работниот профил"</string>
     <string name="lockpassword_strong_auth_required_work_password" msgid="8159775129968582940">"За дополнителна безбедност, внесете ја лозинката на работниот профил"</string>
+    <string name="lockpassword_confirm_your_pattern_details_frp" msgid="6757336656791723193">"Телефонот е ресетиран на фабрички поставки. За да го користите, внесете ја претходната шема."</string>
+    <string name="lockpassword_confirm_your_pin_details_frp" msgid="826520613445990470">"Телефонот е ресетиран на фабрички поставки. За да го користите, внесете го претходниот PIN."</string>
+    <string name="lockpassword_confirm_your_password_details_frp" msgid="8944081074615739040">"Телефонот е ресетиран на фабрички поставки. За да го користите, внесете ја претходната лозинка."</string>
+    <string name="lockpassword_confirm_your_pattern_header_frp" msgid="2898036091609128286">"Потврдете ја шемата"</string>
+    <string name="lockpassword_confirm_your_pin_header_frp" msgid="4141601774778898803">"Потврди PIN"</string>
+    <string name="lockpassword_confirm_your_password_header_frp" msgid="3762615419295360480">"Потврдете ја лозинката"</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>
@@ -1538,13 +1550,12 @@
     <string name="install_applications_title" msgid="4987712352256508946">"Дозв. ги сите изв. на аплик."</string>
     <string name="recent_app_category_title" msgid="6673071268966003928">"Неодамна отворени апликации"</string>
     <string name="see_all_apps_title" msgid="1317153498074308438">"Видете ги сите <xliff:g id="COUNT">%1$d</xliff:g> апликации"</string>
-    <string name="recent_app_summary" msgid="3366446669844932300">"Пред <xliff:g id="TIME">^1</xliff:g>"</string>
     <string name="install_all_warning" product="tablet" msgid="8310489909586138165">"Вашиот таблет и личните податоци се повеќе подложни на напади од апликации од непознати извори. Ако инсталирате апликации од изворов, се согласувате дека сте одговорни за каква било штета на таблетот или губењето податоци што може да произлезат од користењето на овие апликации."</string>
     <string name="install_all_warning" product="default" msgid="1952257127370115988">"Вашиот телефон и личните податоци се повеќе подложни на напади од апликации од непознати извори. Ако инсталирате апликации од изворов, се согласувате дека сте одговорни за каква било штета на телефонот или губењето податоци што може да произлезат од користењето на овие апликации."</string>
     <string name="advanced_settings" msgid="1777249286757067969">"Напредни поставки"</string>
     <string name="advanced_settings_summary" msgid="4016682978071086747">"Овозможи повеќе опции за подесување"</string>
     <string name="application_info_label" msgid="5736524913065714880">"Информации за апликацијата"</string>
-    <string name="storage_label" msgid="8700867073480107253">"Меморија"</string>
+    <string name="storage_label" msgid="8700867073480107253">"Капацитет"</string>
     <string name="auto_launch_label" msgid="2669236885531442195">"Отвори стандардно"</string>
     <string name="auto_launch_label_generic" msgid="3230569852551968694">"Стандардни вредности"</string>
     <string name="screen_compatibility_label" msgid="663250687205465394">"Компатибилност на екран"</string>
@@ -1601,13 +1612,13 @@
     <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>
     <string name="clear_data_dlg_title" msgid="5605258400134511197">"Избриши податоци за апликацијата?"</string>
-    <string name="clear_data_dlg_text" msgid="3951297329833822490">"Сите податоци на оваа апликација ќе бидат трајно избришани. Ова ги опфаќа сите датотеки, подесувања, сметки, бази на податоци, итн."</string>
+    <string name="clear_data_dlg_text" msgid="3951297329833822490">"Сите податоци на оваа апликација ќе бидат трајно избришани. Ова ги опфаќа сите датотеки, поставки, сметки, бази на податоци, итн."</string>
     <string name="dlg_ok" msgid="2402639055725653590">"Во ред"</string>
     <string name="dlg_cancel" msgid="1674753358972975911">"Откажи"</string>
     <string name="app_not_found_dlg_title" msgid="3127123411738434964"></string>
@@ -1802,7 +1813,7 @@
     <string name="accessibility_settings_summary" msgid="981260486011624939">"Читачи на екран, екран, контроли за интеракција"</string>
     <string name="vision_settings_title" msgid="4204111425716868288">"Визуелна пристапност"</string>
     <string name="vision_settings_description" msgid="5679491180156408260">"Уредот може да го приспособите да одговара на вашите потреби. Овие карактеристики за пристапност може да ги смените подоцна во Поставки."</string>
-    <string name="vision_settings_suggestion_title" msgid="917294957154878441">"Зголемете ја големината на фонтот"</string>
+    <string name="vision_settings_suggestion_title" msgid="8058794060304707004">"Променете ја големината на фонтот"</string>
     <string name="screen_reader_category_title" msgid="7739154903913400641">"Читачи на екран"</string>
     <string name="audio_and_captions_category_title" msgid="3420727114421447524">"Аудио и текст на екранот"</string>
     <string name="display_category_title" msgid="685461049938269166">"Приказ"</string>
@@ -1839,10 +1850,9 @@
     <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="preference_summary_default_combination" msgid="8532964268242666060">"<xliff:g id="STATE">%1$s</xliff:g>/<xliff:g id="DESCRIPTION">%2$s</xliff:g>"</string>
     <string name="accessibility_summary_state_enabled" msgid="8359913912320966304">"ВКЛУЧЕНО"</string>
     <string name="accessibility_summary_state_disabled" msgid="2241315620132005595">"ИСКЛУЧЕНО"</string>
-    <string name="enable_quick_setting" msgid="2366999897816894536">"Прикажи во „Брзи подесувања“"</string>
+    <string name="enable_quick_setting" msgid="2366999897816894536">"Прикажи во „Брзи поставки“"</string>
     <string name="daltonizer_type" msgid="1124178250809091080">"Режим на корекција"</string>
     <plurals name="accessibilty_autoclick_preference_subtitle_extremely_short_delay" formatted="false" msgid="7340347830562315800">
       <item quantity="one">Исклучително кратко задржување (<xliff:g id="CLICK_DELAY_LABEL_1">%1$d</xliff:g> ms)</item>
@@ -1958,12 +1968,14 @@
     <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_whitelisted" msgid="7375400051141016808">"Апликацијата не може да се оптимизира за употреба на батеријата"</string>
+    <string name="background_activity_warning_dialog_title" msgid="2216249969149568871">"Да се ограничи активноста во заднина?"</string>
+    <string name="background_activity_warning_dialog_text" msgid="7049624449246121981">"Апликацијата може да се однесува необично ако ја ограничите нејзината активност во заднина"</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" msgid="6393929085382334341">"Употреба од апликациите по целосно полнење (<xliff:g id="RELATIVE_TIME">^1</xliff:g>)"</string>
+    <string name="power_usage_list_summary_device" msgid="4461926045610455423">"Употреба од уредот по целосно полнење <xliff:g id="RELATIVE_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>
@@ -2071,7 +2083,7 @@
     <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>
@@ -2209,14 +2221,14 @@
     <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">"Треба да поставите PIN или лозинка за заклучување на екранот пред да може да ја користите меморијата за акредитиви."</string>
+    <string name="credentials_configure_lock_screen_hint" msgid="8058230497337529036">"Пред да може да користите складирање акредитиви, уредот треба да има безбеден заклучен екран"</string>
+    <string name="credentials_configure_lock_screen_button" msgid="253239765216055321">"ПОСТАВИ ЗАКЛУЧУВАЊЕ"</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>
@@ -2224,11 +2236,11 @@
     <string name="backup_section_title" msgid="7952232291452882740">"Бекап и обнова"</string>
     <string name="personal_data_section_title" msgid="7815209034443782061">"Лични податоци"</string>
     <string name="backup_data_title" msgid="1239105919852668016">"Направи резервна копија на моите податоци"</string>
-    <string name="backup_data_summary" msgid="708773323451655666">"Бекап на податоци за апликација, на лозинки на Wi-Fi и други подесувања на сервери на Google"</string>
-    <string name="backup_configure_account_title" msgid="3790872965773196615">"Резервна сметка"</string>
+    <string name="backup_data_summary" msgid="708773323451655666">"Бекап на податоци за апликација, на лозинки на Wi-Fi и други поставки на сервери на Google"</string>
+    <string name="backup_configure_account_title" msgid="3790872965773196615">"Сметка за бекап"</string>
     <string name="include_app_data_title" msgid="2829970132260278394">"Опфати податоци за апликација"</string>
     <string name="auto_restore_title" msgid="5397528966329126506">"Автоматско враќање"</string>
-    <string name="auto_restore_summary" msgid="4235615056371993807">"При инсталирање апликација, обнови снимени подесувања и податоци"</string>
+    <string name="auto_restore_summary" msgid="4235615056371993807">"При инсталирање апликација, обнови снимени поставки и податоци"</string>
     <string name="backup_inactive_title" msgid="685838037986644604">"Услугата за бекап не е активна"</string>
     <string name="backup_configure_account_default_summary" msgid="2436933224764745553">"Во моментов нема сметка каде што се складираат резервни копии на податоци"</string>
     <string name="backup_erase_dialog_title" msgid="1027640829482174106"></string>
@@ -2336,8 +2348,6 @@
     <skip />
     <string name="cant_sync_dialog_title" msgid="2777238588398046285">"Не може рачно да се синхронизира"</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, внесете го PIN-кодот"</string>
     <string name="enter_pattern" msgid="4187435713036808566">"За да стартувате Android, внесете ја шемата"</string>
@@ -2351,6 +2361,7 @@
     <string name="misc_files_selected_count" msgid="4647048020823912088">"избрани <xliff:g id="NUMBER">%1$d</xliff:g> од <xliff:g id="TOTAL">%2$d</xliff:g>"</string>
     <string name="misc_files_selected_count_bytes" msgid="2876232009069114352">"<xliff:g id="NUMBER">%1$s</xliff:g> од <xliff:g id="TOTAL">%2$s</xliff:g>"</string>
     <string name="select_all" msgid="1562774643280376715">"Избери сè"</string>
+    <string name="data_plan_usage_manage_plans_button_text" msgid="8997761990902708162">"Управувајте со пакетите"</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>
@@ -2413,7 +2424,7 @@
     <string name="data_usage_auto_sync_off_dialog" msgid="4025938250775413864">"Ова ќе ги зачува податоците и употребата на батеријата, но треба секоја сметка да се синхронизира рачно за да се соберат најнови информации. Освен тоа, нема да добивате известувања за ажурирања."</string>
     <string name="data_usage_cycle_editor_title" msgid="1373797281540188533">"Датум на ресетирање циклус на употреба"</string>
     <string name="data_usage_cycle_editor_subtitle" msgid="5512903797979928416">"Датум за секој месец:"</string>
-    <string name="data_usage_cycle_editor_positive" msgid="8821760330497941117">"Поставено"</string>
+    <string name="data_usage_cycle_editor_positive" msgid="8821760330497941117">"Постави"</string>
     <string name="data_usage_warning_editor_title" msgid="3704136912240060339">"Постави опомена за потрошен интернет"</string>
     <string name="data_usage_limit_editor_title" msgid="9153595142385030015">"Постави граница на потрошен интернет"</string>
     <string name="data_usage_limit_dialog_title" msgid="3023111643632996097">"Ограничување користење на интернет"</string>
@@ -2436,6 +2447,9 @@
     <string name="data_usage_metered_mobile" msgid="5423305619126978393">"Мобилни мрежи"</string>
     <string name="data_usage_metered_wifi" msgid="1761738002328299714">"Мрежи на Wi‑Fi со огран. пренос"</string>
     <string name="data_usage_metered_wifi_disabled" msgid="727808462375941567">"За да изберете мрежи со огран. пренос на подат., вклучете Wi‑Fi."</string>
+    <string name="data_usage_metered_auto" msgid="1262028400911918865">"Автоматски"</string>
+    <string name="data_usage_metered_yes" msgid="9217539611385225894">"Со ограничен интернет"</string>
+    <string name="data_usage_metered_no" msgid="4025232961929071789">"Со неограничен интернет"</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>
@@ -2527,9 +2541,6 @@
     <string name="backup_pw_set_button_text" msgid="2387480910044648795">"Постави лозинка за бекап"</string>
     <string name="backup_pw_cancel_button_text" msgid="8845630125391744615">"Откажи"</string>
     <string name="additional_system_update_settings_list_item_title" msgid="214987609894661992">"Дополнителни ажурирања на системот"</string>
-    <string name="selinux_status_disabled" msgid="924551035552323327">"Оневозможено"</string>
-    <string name="selinux_status_permissive" msgid="6004965534713398778">"Дозволиво"</string>
-    <string name="selinux_status_enforcing" msgid="2252703756208463329">"Се спроведува"</string>
     <string name="ssl_ca_cert_warning" msgid="2045866713601984673">"Мрежата може да се следи"</string>
     <string name="done_button" msgid="1991471253042622230">"Готово"</string>
     <plurals name="ssl_ca_cert_dialog_title" formatted="false" msgid="7145092748045794650">
@@ -2571,7 +2582,7 @@
     <string name="user_add_user_title" msgid="2108112641783146007">"Да се додаде нов корисник?"</string>
     <string name="user_add_user_message_long" msgid="8562152293752222985">"Со создавање дополнителни корисници може да го споделите уредов со други. Секој корисник има сопствен простор што може да го нагодува со сопствени апликации, тапети и така натаму. Корисниците може и да нагодуваат поставки на уредот, како Wi‑Fi, што се однесуваат на сите.\n\nКога додавате нов корисник, тој треба да го постави својот простор.\n\nСекој корисник може да ажурира апликации за сите други корисници."</string>
     <string name="user_add_user_message_short" msgid="1511354412249044381">"Кога додавате нов корисник, тоа лице треба да го постави својот простор.\n\nСекој корисник може да ажурира апликации за сите други корисници."</string>
-    <string name="user_setup_dialog_title" msgid="1765794166801864563">"Постави корисник сега?"</string>
+    <string name="user_setup_dialog_title" msgid="1765794166801864563">"Ќе поставите корисник сега?"</string>
     <string name="user_setup_dialog_message" msgid="1004068621380867148">"Проверете дали лицето е достапно да го земе уредот и да го постави својот простор"</string>
     <string name="user_setup_profile_dialog_message" msgid="3896568553327558731">"Постави профил сега?"</string>
     <string name="user_setup_button_setup_now" msgid="3391388430158437629">"Постави сега"</string>
@@ -2612,7 +2623,7 @@
     <string name="emergency_info_summary" msgid="5062945162967838521">"Информации и контакти за <xliff:g id="USER_NAME">%1$s</xliff:g>"</string>
     <string name="application_restrictions" msgid="8207332020898004394">"Дозволи апликации и содржина"</string>
     <string name="apps_with_restrictions_header" msgid="3660449891478534440">"Апликации со ограничувања"</string>
-    <string name="apps_with_restrictions_settings_button" msgid="3841347287916635821">"Прошири подесувања за апликација"</string>
+    <string name="apps_with_restrictions_settings_button" msgid="3841347287916635821">"Прошири поставки за апликација"</string>
     <string name="global_change_warning" product="tablet" msgid="8045013389464294039">"Ова подесување влијае на сите корисници на овој таблет."</string>
     <string name="global_change_warning" product="default" msgid="2461264421590324675">"Ова подесување влијае на сите корисници на овој телефон."</string>
     <string name="global_locale_change_title" msgid="5956281361384221451">"Промени јазик"</string>
@@ -2668,9 +2679,9 @@
     <string name="app_sees_restricted_accounts" msgid="7503264525057246240">"Оваа апликација може да пристапи кон вашите сметки"</string>
     <string name="app_sees_restricted_accounts_and_controlled_by" msgid="6968697624437267294">"Оваа апликација може да пристапува до вашите сметки. Контролирано од <xliff:g id="APP">%1$s</xliff:g>"</string>
     <string name="restriction_wifi_config_title" msgid="8889556384136994814">"Wi-Fi и мобилен"</string>
-    <string name="restriction_wifi_config_summary" msgid="70888791513065244">"Дозволи промена на Wi-Fi и подесувања на мобилен"</string>
+    <string name="restriction_wifi_config_summary" msgid="70888791513065244">"Дозволи промена на Wi-Fi и поставки на мобилен"</string>
     <string name="restriction_bluetooth_config_title" msgid="8871681580962503671">"Bluetooth"</string>
-    <string name="restriction_bluetooth_config_summary" msgid="8372319681287562506">"Дозволи промена на спарувања и подесувања на Bluetooth"</string>
+    <string name="restriction_bluetooth_config_summary" msgid="8372319681287562506">"Дозволи промена на спарувања и поставки на Bluetooth"</string>
     <string name="restriction_nfc_enable_title" msgid="5888100955212267941">"NFC"</string>
     <string name="restriction_nfc_enable_summary_config" msgid="3232480757215851738">"Дозволете размена на податоци кога <xliff:g id="DEVICE_NAME">%1$s</xliff:g> ќе допре друг уред со NFC"</string>
     <string name="restriction_nfc_enable_summary" product="tablet" msgid="3891097373396149915">"Овозможи размена на податоци кога таблетот допира друг уред"</string>
@@ -2727,6 +2738,7 @@
       <item quantity="one">Прикажи %d сокриена ставка</item>
       <item quantity="other">Прикажи %d сокриени ставки</item>
     </plurals>
+    <string name="dashboard_suggestion_condition_footer_content_description" msgid="2898588191174845961">"Собери"</string>
     <string name="network_dashboard_title" msgid="4771589228992391573">"Мрежа и Интернет"</string>
     <string name="network_dashboard_summary_mobile" msgid="3851083934739500429">"мобилна"</string>
     <string name="network_dashboard_summary_data_usage" msgid="3843261364705042212">"потрошен сообраќај"</string>
@@ -2829,8 +2841,14 @@
       <item quantity="one">Вклучено е <xliff:g id="ON_COUNT">%d</xliff:g> автоматско правило</item>
       <item quantity="other">Вклучени се <xliff:g id="ON_COUNT">%d</xliff:g> автоматски правила</item>
     </plurals>
-    <string name="zen_mode_settings_title" msgid="842308776768942600">"Поставки за „Не вознемирувај“"</string>
-    <string name="zen_mode_priority_settings_title" msgid="2623117023031824309">"Дозволува само приоритетно"</string>
+    <string name="zen_mode_settings_title" msgid="1066226840983908121">"Не вознемирувај"</string>
+    <string name="zen_mode_behavior_settings_title" msgid="1463303933529313969">"Однесување"</string>
+    <string name="zen_mode_behavior_allow_title" msgid="3845615648136218141">"Дозволете звуци и вибрации од"</string>
+    <string name="zen_mode_behavior_no_sound" msgid="1219626004723208056">"Без звук"</string>
+    <string name="zen_mode_behavior_total_silence" msgid="6716603819806610626">"Без звук (Целосна тишина)"</string>
+    <string name="zen_mode_behavior_no_sound_except" msgid="4968477585788243114">"Без звук, освен <xliff:g id="CATEGORIES">%1$s</xliff:g>"</string>
+    <!-- no translation found for zen_mode_behavior_alarms_only (2423480992071472963) -->
+    <skip />
     <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>
@@ -2872,13 +2890,15 @@
     <string name="notifications_title" msgid="8086372779371204971">"Известувања"</string>
     <string name="app_notifications_title" msgid="5810577805218003760">"Известувања за апликација"</string>
     <string name="notification_channel_title" msgid="2260666541030178452">"Категорија на известувањето"</string>
+    <string name="notification_group_title" msgid="7180506440133859601">"Група на категорија известувања"</string>
     <string name="notification_importance_title" msgid="848692592679312666">"Важност"</string>
-    <string name="notification_importance_unspecified" msgid="2196023702875112081">"Дозволи апликацијата да одлучи"</string>
+    <string name="notification_importance_unspecified" msgid="6622173510486113958">"Дозволете звук"</string>
     <string name="notification_importance_blocked" msgid="7938180808339386300">"Никогаш не прикажувај известувања"</string>
     <string name="notification_importance_min" msgid="5455049524984686275">"Без звук или визуелен прекин"</string>
     <string name="notification_importance_low" msgid="8881468429453766553">"Без звук"</string>
     <string name="notification_importance_default" msgid="5958338024601957516">"Испушти звук"</string>
     <string name="notification_importance_high" msgid="2082429479238228527">"Испушти звук и прикажи го на екранот"</string>
+    <string name="notification_importance_high_silent" msgid="2667033773703765252">"Прикажи го на екранот"</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>
@@ -2921,8 +2941,13 @@
     <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="channel_group_notifications_off_desc" msgid="1620950416247316370">"Android го блокира појавувањето на оваа група известувања на уредов"</string>
     <string name="notification_channels" msgid="5346841743182627500">"Категории"</string>
     <string name="notification_channels_other" msgid="5645317113885788226">"Друго"</string>
+    <plurals name="notification_group_summary" formatted="false" msgid="3420621520561455358">
+      <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="no_channels" msgid="3077375508177744586">"Апликацијава не објави ниедно известување"</string>
     <string name="app_settings_link" msgid="8894946007543660906">"Дополнителни поставки во апликацијата"</string>
     <string name="app_notification_listing_summary_zero" msgid="6482582965081108108">"Вклучено за сите апликации"</string>
@@ -2999,12 +3024,14 @@
     <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>
+    <!-- no translation found for zen_mode_media_system_other (8900209390529859777) -->
+    <skip />
     <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="239685342222975733">"Доколку истото лице повикува по втор пат во период од <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>
@@ -3033,6 +3060,7 @@
     <string name="zen_mode_screen_off_visual_interruptions" msgid="4850792880144382633">"Кога екранот е исклучен"</string>
     <string name="zen_mode_no_visual_interruptions" msgid="8742776003822778472">"Кога екранот е вклучен или исклучен"</string>
     <string name="notification_app_settings_button" msgid="6685640230371477485">"Поставки на известувања"</string>
+    <string name="suggestion_button_text" msgid="3275010948381252006">"Во ред"</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>
@@ -3048,11 +3076,11 @@
     <string name="experimental_preference" msgid="7083015446690681376">"(Експериментално)"</string>
     <string name="encryption_interstitial_header" msgid="468015813904595613">"Безбедно стартување"</string>
     <string name="encryption_continue_button" msgid="1121880322636992402">"Продолжи"</string>
-    <string name="encryption_interstitial_message_pin" msgid="2317181134653424679">"Може дополнително да го заштитите уредот ако го бара PIN-кодот пред да се стартува. Сѐ додека уредот не се стартува, не може да прима повици, пораки или известувања, што опфаќа и аларми. \n\nОва помага да се заштитат податоците на загубени или украдени уреди. Да се бара PIN за стартување на уредот?"</string>
-    <string name="encryption_interstitial_message_pattern" msgid="7081249914068568570">"Може дополнително да го заштитите уредот ако ја бара шемата пред да се стартува. Сѐ додека уредот не се стартува, не може да прима повици, пораки или известувања, што опфаќа и аларми. \n\nОва помага да се заштитат податоците на загубени или украдени уреди. Да се бара шема за стартување на уредот?"</string>
-    <string name="encryption_interstitial_message_password" msgid="7796567133897436443">"Може дополнително да го заштитите уредот ако ја бара лозинката пред да се стартува. Сѐ додека уредот не се стартува, не може да прима повици, пораки или известувања, што опфаќа и аларми. \n\nОва помага да се заштитат податоците на загубени или украдени уреди. Да се бара лозинка за стартување на уредот?"</string>
-    <string name="encryption_interstitial_message_pin_for_fingerprint" msgid="4550632760119547492">"Освен користењето на отпечатокот од прст за отклучување на уредот, може да го заштитите уредот дополнително ако бара ПИН пред да се стартува. Сѐ додека уредот не се стартува, не може да прима повици, пораки или известувања, што опфаќа и аларми.\n\nТоа помага да се заштитат податоците на загубени или украдени уреди. Да се бара PIN за стартување на уредот?"</string>
-    <string name="encryption_interstitial_message_pattern_for_fingerprint" msgid="932184823193006087">"Освен користењето на отпечатокот од прст за отклучување на уредот, може да го заштитите уредот дополнително ако ја бара шемата пред да се стартува. Сѐ додека уредот не се стартува, не може да прима повици, пораки или известувања, што опфаќа и аларми.\n\nТоа помага да се заштитат податоците на загубени или украдени уреди. Да се бара шема за стартување на уредот?"</string>
+    <string name="encryption_interstitial_message_pin" msgid="2317181134653424679">"Може дополнително да го заштитите уредот ако го бара PIN-кодот пред да се стартува. Сѐ додека уредот не се стартува, не може да прима повици, пораки или известувања, како и аларми. \n\nОва помага да се заштитат податоците на загубени или украдени уреди. Да се бара PIN за стартување на уредот?"</string>
+    <string name="encryption_interstitial_message_pattern" msgid="7081249914068568570">"Може дополнително да го заштитите уредот ако ја бара шемата пред да се стартува. Сѐ додека уредот не се стартува, не може да прима повици, пораки или известувања, како и аларми. \n\nОва помага да се заштитат податоците на загубени или украдени уреди. Да се бара шема за стартување на уредот?"</string>
+    <string name="encryption_interstitial_message_password" msgid="7796567133897436443">"Може дополнително да го заштитите уредот ако ја бара лозинката пред да се стартува. Сѐ додека уредот не се стартува, не може да прима повици, пораки или известувања, како и аларми. \n\nОва помага да се заштитат податоците на загубени или украдени уреди. Да се бара лозинка за стартување на уредот?"</string>
+    <string name="encryption_interstitial_message_pin_for_fingerprint" msgid="4550632760119547492">"Освен користењето на отпечатокот од прст за отклучување на уредот, може да го заштитите уредот дополнително ако бара ПИН пред да се стартува. Сѐ додека уредот не се стартува, не може да прима повици, пораки или известувања, како и аларми.\n\nТоа помага да се заштитат податоците на загубени или украдени уреди. Да се бара PIN за стартување на уредот?"</string>
+    <string name="encryption_interstitial_message_pattern_for_fingerprint" msgid="932184823193006087">"Освен користењето на отпечатокот од прст за отклучување на уредот, може да го заштитите уредот дополнително ако ја бара шемата пред да се стартува. Сѐ додека уредот не се стартува, не може да прима повици, пораки или известувања, како и аларми.\n\nТоа помага да се заштитат податоците на загубени или украдени уреди. Да се бара шема за стартување на уредот?"</string>
     <string name="encryption_interstitial_message_password_for_fingerprint" msgid="5560954719370251702">"Освен користењето на отпечатокот за отклучување на уредот, може дополнително да го заштитите ако бара лозинка пред да се стартува. Сѐ додека уредот не се стартува, не може да прима повици, пораки или известувања, вклучувајќи и аларми.\n\nТоа помага да се заштитат податоците на загубени или украдени уреди. Да се бара лозинка за стартување на уредот?"</string>
     <string name="encryption_interstitial_yes" msgid="4439509435889513411">"Да"</string>
     <string name="encryption_interstitial_no" msgid="8935031349097025137">"Не"</string>
@@ -3073,14 +3101,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>
@@ -3151,7 +3179,7 @@
     <string name="default_app" msgid="6864503001385843060">"(Стандардно)"</string>
     <string name="system_app" msgid="9068313769550747372">"(Систем)"</string>
     <string name="system_default_app" msgid="3091113402349739037">"(Стандардно за системот)"</string>
-    <string name="apps_storage" msgid="4353308027210435513">"Складирање апликации"</string>
+    <string name="apps_storage" msgid="4353308027210435513">"Капацитет за апл."</string>
     <string name="usage_access" msgid="5479504953931038165">"Пристап за користење"</string>
     <string name="permit_usage_access" msgid="4012876269445832300">"Дозволи пристап за користење"</string>
     <string name="app_usage_preference" msgid="7065701732733134991">"Претпочитани поставки за користење на аплик."</string>
@@ -3169,7 +3197,7 @@
     <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">
@@ -3217,6 +3245,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="sms_mirroring_pref" msgid="6475043279147376031">"Отсликување SMS-пораки"</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>
@@ -3283,7 +3312,7 @@
     <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="permit_write_settings" msgid="658555006453212691">"Дозволи менување на поставките на системот"</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>
@@ -3319,7 +3348,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>
@@ -3378,9 +3407,12 @@
     <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="connectivity_monitor_switch" msgid="9059759348648583421">"Монитор за интернет-врска"</string>
+    <string name="connectivity_monitor_switch_summary" msgid="2828658652378866401">"Мониторот за интернет-врска ќе води евиденција кога ќе открие проблем со врската и ќе го извести корисникот да пријави грешка"</string>
+    <string name="connectivity_monitor_toast" msgid="5551859612881173028">"За да се примени промената на мониторот за интернет-врска, рестартирајте го уредот"</string>
     <string name="camera_hal_hdrplus_switch" msgid="8377365197105267466">"Камера HAL HDR+"</string>
     <string name="camera_hal_hdrplus_toast" msgid="2063703797270055299">"За применување промена на Камера HAL HDR+, рестартиртирајте го уредот"</string>
+    <string name="camera_laser_sensor_switch" msgid="8913588990743234440">"Ласерски сензор за камерата"</string>
     <string name="ota_disable_automatic_update" msgid="2319639631655915050">"Автоматски ажурирања на системот"</string>
     <string name="usage" msgid="2977875522080448986">"Користење"</string>
     <string name="cellular_data_usage" msgid="2155683719898158203">"Потрошен мобилен интернет"</string>
@@ -3401,12 +3433,12 @@
       <item quantity="other"><xliff:g id="COUNT">%1$d</xliff:g> ограничувања</item>
     </plurals>
     <string name="operator_warning" msgid="1862988028996859195">"Пресметаниот сообраќај на операторот може да се разликува од пресметаниот сообраќај на вашиот уред"</string>
-    <string name="data_used_template" msgid="3245919669966296505">"<xliff:g id="ID_1">%1$s</xliff:g> потрошено"</string>
+    <string name="data_used_template" msgid="3245919669966296505">"Потрошено <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="set_data_warning" msgid="6115364758236594593">"Извести за потрошен интернет"</string>
     <string name="data_warning" msgid="209133958008062117">"Предупредување за интернет"</string>
     <string name="set_data_limit" msgid="2901526323210516923">"Ограничување на интернет"</string>
     <string name="data_limit" msgid="1885406964934590552">"Ограничување за интернет"</string>
-    <string name="data_usage_template" msgid="392191945602400904">"<xliff:g id="ID_1">%1$s</xliff:g> потрошено помеѓу <xliff:g id="ID_2">%2$s</xliff:g>"</string>
+    <string name="data_usage_template" msgid="2923744765873163859">"Потрошено <xliff:g id="ID_1">%1$s</xliff:g> <xliff:g id="ID_2">%2$s</xliff:g>"</string>
     <string name="configure" msgid="1029654422228677273">"Конфигурирај"</string>
     <string name="data_usage_other_apps" msgid="3272872663517382050">"Други апликации вклучени во употребата"</string>
     <plurals name="data_saver_unrestricted_summary" formatted="false" msgid="2635267833484232703">
@@ -3466,7 +3498,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>
@@ -3475,7 +3507,7 @@
     <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="387052719462473500">"Контролирајте ги информациите на заклучениот екран"</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="8483187649355540109">"Поддршка и совети"</string>
@@ -3483,7 +3515,7 @@
     <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>
+    <string name="bluetooth_disabled" msgid="6244000672828617410">"Исклучен"</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>
@@ -3585,7 +3617,7 @@
     <string name="web_action_enable_title" msgid="4051513950976670853">"Инстант апликации"</string>
     <string name="web_action_enable_summary" msgid="3108127559723396382">"Отворај линкови во апликации, дури и ако не се инсталирани"</string>
     <string name="web_action_section_title" msgid="7364647086538399136">"Инстант апликации"</string>
-    <string name="instant_apps_account" msgid="1433620209791992528">"Сметка за инстант апликација"</string>
+    <string name="instant_apps_settings" msgid="8827777916518348213">"Поставки за инстант апликации"</string>
     <string name="domain_url_section_title" msgid="7046835219056428883">"Инсталирани апликации"</string>
     <string name="automatic_storage_manager_activation_warning" msgid="6353100011690933254">"Управникот со меморија сега управува со вашата меморија"</string>
     <string name="account_for_section_header" msgid="5356566418548737121">"Сметки за <xliff:g id="USER_NAME">%1$s</xliff:g>"</string>
@@ -3632,7 +3664,9 @@
     <string name="enterprise_privacy_always_on_vpn_personal" msgid="9217774730260037434">"VPN е поставена да биде секогаш вклучена во личниот профил"</string>
     <string name="enterprise_privacy_always_on_vpn_work" msgid="7244472958208315814">"VPN е поставена да биде секогаш вклучена во работниот профил"</string>
     <string name="enterprise_privacy_global_http_proxy" msgid="7936664553416257333">"Поставен е глобален HTTP прокси"</string>
-    <string name="enterprise_privacy_ca_certs" msgid="5885892204903688909">"Доверливи акредитиви"</string>
+    <string name="enterprise_privacy_ca_certs_device" msgid="2019652712782510262">"Доверливи акредитиви"</string>
+    <string name="enterprise_privacy_ca_certs_personal" msgid="2279084820904076599">"Доверливи акредитиви на вашиот личен профил"</string>
+    <string name="enterprise_privacy_ca_certs_work" msgid="6187377647815301809">"Доверливи акредитиви на вашиот работен профил"</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="other">Минимум <xliff:g id="COUNT_1">%d</xliff:g> сертификати ЦА</item>
@@ -3681,7 +3715,7 @@
     <string name="app_info_storage_title" msgid="5554719444625611987">"Искористен простор"</string>
     <string name="webview_uninstalled_for_user" msgid="1819903169194420983">"(деинсталирано за корисникот <xliff:g id="USER">%s</xliff:g>)"</string>
     <string name="webview_disabled_for_user" msgid="1216426047631256825">"(оневозможено за корисникот <xliff:g id="USER">%s</xliff:g>)"</string>
-    <string name="autofill_app" msgid="7338387238377914374">"Услуга за автоматско пополнување"</string>
+    <string name="autofill_app" msgid="7338387238377914374">"Автоматско пополнување"</string>
     <string name="autofill_keywords" msgid="7485591824120812710">"автоматско, пополнување, автоматско пополнување"</string>
     <string name="autofill_confirmation_message" msgid="2784869528908005194">"&lt;b&gt;Проверете дали е ова апликација на која ѝ верувате&lt;/b&gt; &lt;br/&gt; &lt;br/&gt; &lt;xliff:g id=app_name example=„Автоматско пополнување на Google“&gt;%1$s&lt;/xliff:g&gt; го користи она што е на екранот за да утврди што може автоматски да се пополни."</string>
     <string name="device_theme" msgid="4571803018917608588">"Тема на уредот"</string>
@@ -3695,6 +3729,8 @@
     <string name="carrier_provisioning" msgid="4398683675591893169">"Информации за обезбедување оператор"</string>
     <string name="trigger_carrier_provisioning" msgid="3434865918009286187">"Активирајте обезбедување оператор"</string>
     <string name="new_device_suggestion_title" msgid="698847081680980774">"Што има ново и интересно?"</string>
-    <string name="new_device_suggestion_summary" msgid="7172709269203435870">"Погледнете ги најдобрите 5 функции"</string>
+    <string name="new_device_suggestion_summary" product="default" msgid="206396571522515855">"Запознајте се со новиот телефон"</string>
+    <string name="new_device_suggestion_summary" product="tablet" msgid="393751455688210956">"Запознајте се со новиот таблет"</string>
+    <string name="new_device_suggestion_summary" product="device" msgid="2939870049868336652">"Запознајте се со новиот уред"</string>
     <string name="disabled_low_ram_device" msgid="3751578499721173344">"Функцијава не е достапна на овој уред"</string>
 </resources>
diff --git a/res/values-ml/arrays.xml b/res/values-ml/arrays.xml
index 85d818f..2dd30af 100644
--- a/res/values-ml/arrays.xml
+++ b/res/values-ml/arrays.xml
@@ -100,8 +100,6 @@
     <!-- no translation found for wifi_security_no_eap:0 (2084555984818107151) -->
     <!-- no translation found for wifi_security_no_eap:1 (397579322683471524) -->
     <!-- no translation found for wifi_security_no_eap:2 (1968820975358150484) -->
-    <!-- no translation found for wifi_ap_security:0 (5251664683198623324) -->
-    <!-- no translation found for wifi_ap_security:1 (7989073072260294673) -->
   <string-array name="wifi_eap_method">
     <item msgid="1160193392455075561">"PEAP"</item>
     <item msgid="7981731051382306293">"TLS"</item>
@@ -243,8 +241,8 @@
     <item msgid="5387405117297558954">"വൈബ്രേറ്റുചെയ്യുക"</item>
     <item msgid="3434165993711230924">"കോൺടാക്റ്റുകൾ റീഡുചെയ്യുക"</item>
     <item msgid="616161687718081936">"കോൺടാക്റ്റുകൾ പരിഷ്‌ക്കരിക്കുക"</item>
-    <item msgid="7638002295329050091">"കോൾ ലോഗ് റീഡുചെയ്യുക"</item>
-    <item msgid="6546959730920410907">"കോൾ ലോഗ് പരിഷ്‌ക്കരിക്കുക"</item>
+    <item msgid="7638002295329050091">"കോൾ ചരിത്രം റീഡ് ചെയ്യുക"</item>
+    <item msgid="6546959730920410907">"കോൾ ചരിത്രം പരിഷ്‌ക്കരിക്കുക"</item>
     <item msgid="446877710771379667">"കലണ്ടർ റീഡുചെയ്യുക"</item>
     <item msgid="7674458294386319722">"കലണ്ടർ പരിഷ്‌ക്കരിക്കുക"</item>
     <item msgid="8281201165558093009">"wi-fi സ്‌കാൻ"</item>
@@ -307,11 +305,11 @@
     <item msgid="6602854600289714121">"ലൊക്കേഷൻ"</item>
     <item msgid="8677040780775113033">"ലൊക്കേഷൻ"</item>
     <item msgid="1660743989948992916">"ലൊക്കേഷൻ"</item>
-    <item msgid="8791172739860195290">"വൈബ്രേറ്റുചെയ്യുക"</item>
+    <item msgid="8791172739860195290">"വൈബ്രേറ്റ് ചെയ്യുക"</item>
     <item msgid="383413555642128046">"കോൺടാക്റ്റുകൾ റീഡുചെയ്യുക"</item>
     <item msgid="3654594895269697313">"കോൺടാക്റ്റുകൾ പരിഷ്‌ക്കരിക്കുക"</item>
-    <item msgid="7928393476362362538">"കോൾ ലോഗ് റീഡുചെയ്യുക"</item>
-    <item msgid="6248591205254641116">"കോൾ ലോഗ് പരിഷ്‌ക്കരിക്കുക"</item>
+    <item msgid="7928393476362362538">"കോൾ ചരിത്രം റീഡ് ചെയ്യുക"</item>
+    <item msgid="6248591205254641116">"കോൾ ചരിത്രം പരിഷ്‌ക്കരിക്കുക"</item>
     <item msgid="6093344633066170692">"കലണ്ടർ റീഡുചെയ്യുക"</item>
     <item msgid="1334886368750347692">"കലണ്ടർ പരിഷ്‌ക്കരിക്കുക"</item>
     <item msgid="1638204101698708656">"ലൊക്കേഷൻ"</item>
diff --git a/res/values-ml/strings.xml b/res/values-ml/strings.xml
index 90b0075..b925370 100644
--- a/res/values-ml/strings.xml
+++ b/res/values-ml/strings.xml
@@ -166,7 +166,7 @@
     <string name="bluetooth_map_acceptance_dialog_text" msgid="8712508202081143737">"%1$s, നിങ്ങളുടെ സന്ദേശങ്ങൾ ആക്‌സസ്സുചെയ്യാൻ താൽപ്പര്യപ്പെടുന്നു. %2$s എന്നതിലേക്ക് ആക്‌സസ്സ് നൽകണോ?"</string>
     <string name="bluetooth_sap_request" msgid="2669762224045354417">"SIM ആക്‌സസ്സ് അഭ്യർത്ഥന"</string>
     <string name="bluetooth_sap_acceptance_dialog_text" msgid="4414253873553608690">"<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g> ഉപകരണം SIM കാർഡ് ആക്‌സസ്സ് ചെയ്യാൻ താൽപ്പര്യപ്പെടുന്നു. SIM കാർഡിലേക്ക് ആക്‌സസ്സ് അനുവദിക്കുന്നത് കണക്ഷന്റെ സമയപരിധിയ്‌ക്കായി ഉപകരണത്തിൽ ഡാറ്റ കണക്റ്റിവിറ്റിയെ പ്രവർത്തനരഹിതമാക്കുന്നതിനിടയാക്കും. <xliff:g id="DEVICE_NAME_1">%2$s?</xliff:g> ഉപകരണത്തിന് ആക്‌സസ്സ് നൽകുക"</string>
-    <string name="bluetooth_device_name_summary" msgid="4757990010751789977">"<xliff:g id="DEVICE_NAME">^1</xliff:g> എന്ന പേരിൽ മറ്റ് ഉപകരണങ്ങൾക്ക് ദൃശ്യമാക്കുക"</string>
+    <string name="bluetooth_device_name_summary" msgid="522235742194965734">"<xliff:g id="DEVICE_NAME">^1</xliff:g> എന്ന പേരിൽ മറ്റ് ഉപകരണങ്ങൾക്ക് ദൃശ്യമാക്കുക"</string>
     <string name="bluetooth_paired_device_title" msgid="8638994696317952019">"നിങ്ങളുടെ ഉപകരണങ്ങൾ"</string>
     <string name="bluetooth_pairing_page_title" msgid="7712127387361962608">"പുതിയ ഉപകരണവുമായി ജോടിയാക്കുക"</string>
     <string name="date_and_time" msgid="9062980487860757694">"തീയതിയും സമയവും"</string>
@@ -306,12 +306,14 @@
     <string name="date_and_time_settings_title" msgid="3350640463596716780">"തീയതിയും സമയവും"</string>
     <string name="date_and_time_settings_title_setup_wizard" msgid="2391530758339384324">"തീയതിയും സമയവും സജ്ജീകരിക്കുക"</string>
     <string name="date_and_time_settings_summary" msgid="7095318986757583584">"തീയതി, സമയം, സമയ മേഖല, ഫോർമാറ്റുകൾ എന്നിവ സജ്ജീകരിക്കുക"</string>
-    <string name="date_time_auto" msgid="7076906458515908345">"തീയതിയും സമയവും സ്വയമേ നൽകൂ"</string>
+    <string name="date_time_auto" msgid="7076906458515908345">"സ്വമേധയാ തീയതിയും സമയവും നൽകൂ"</string>
     <string name="date_time_auto_summaryOn" msgid="4609619490075140381">"നെറ്റ്‌വർക്ക് നൽകുന്ന സമയം ഉപയോഗിക്കുക"</string>
     <string name="date_time_auto_summaryOff" msgid="8698762649061882791">"നെറ്റ്‌വർക്ക് നൽകുന്ന സമയം ഉപയോഗിക്കുക"</string>
     <string name="zone_auto" msgid="334783869352026648">"സ്വയമേയുള്ള സമയക്രമീകരണം"</string>
     <string name="zone_auto_summaryOn" msgid="6142830927278458314">"നെറ്റ്‌വർക്ക് നൽകുന്ന സമയ മേഖല ഉപയോഗിക്കുക"</string>
     <string name="zone_auto_summaryOff" msgid="2597745783162041390">"നെറ്റ്‌വർക്ക് നൽകുന്ന സമയ മേഖല ഉപയോഗിക്കുക"</string>
+    <string name="date_time_24hour_auto" msgid="2117383168985653422">"സ്വമേധയായുള്ള 24‑മണിക്കൂർ ഫോർമാറ്റ്"</string>
+    <string name="date_time_24hour_auto_summary" msgid="6351812925651480277">"ഡിഫോൾട്ട് ഭാഷ ഉപയോഗിക്കുക"</string>
     <string name="date_time_24hour_title" msgid="3203537578602803850">"24 മണിക്കൂർ ഫോർമാറ്റ്"</string>
     <string name="date_time_24hour" msgid="1193032284921000063">"24-മണി. ഫോർമാറ്റ് ഉപയോഗിക്കൂ"</string>
     <string name="date_time_set_time_title" msgid="6296795651349047016">"സമയം"</string>
@@ -324,7 +326,7 @@
     <string name="zone_list_menu_sort_by_timezone" msgid="2720190443744884114">"സമയ മേഖലയനുസരിച്ച് അടുക്കുക"</string>
     <string name="date_picker_title" msgid="1338210036394128512">"തീയതി"</string>
     <string name="time_picker_title" msgid="483460752287255019">"സമയം"</string>
-    <string name="lock_after_timeout" msgid="4590337686681194648">"സ്വയമേവ ലോക്കുചെയ്യുക"</string>
+    <string name="lock_after_timeout" msgid="4590337686681194648">"സ്വമേധയാ ലോക്കുചെയ്യുക"</string>
     <string name="lock_after_timeout_summary" msgid="6128431871360905631">"സുഷു‌പ്തിയ്ക്ക് <xliff:g id="TIMEOUT_STRING">%1$s</xliff:g> കഴിഞ്ഞ്"</string>
     <string name="lock_immediately_summary_with_exception" msgid="9119632173886172690">"<xliff:g id="TRUST_AGENT_NAME">%1$s</xliff:g> എന്നതിനാൽ അൺലോക്ക് ചെയ്‌തിരിക്കുമ്പോൾ ഒഴികെ, സുഷുപ്‌തിയിലായ ശേഷം ഉടനടി"</string>
     <string name="lock_after_timeout_summary_with_exception" msgid="5579064842797188409">"സുഷുപ്‌തിയിലായതിനുശേഷം <xliff:g id="TIMEOUT_STRING">%1$s</xliff:g>, <xliff:g id="TRUST_AGENT_NAME">%2$s</xliff:g> അൺലോക്കുചെയ്‌തിരിക്കുമ്പോൾ ഒഴികെ"</string>
@@ -341,8 +343,7 @@
     <string name="Accounts_settings_title" msgid="1643879107901699406">"അക്കൗണ്ടുകൾ"</string>
     <string name="location_settings_title" msgid="1369675479310751735">"ലൊക്കേഷൻ"</string>
     <string name="account_settings_title" msgid="626177544686329806">"അക്കൗണ്ടുകൾ"</string>
-    <!-- no translation found for security_settings_title (4918904614964215087) -->
-    <skip />
+    <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>
@@ -373,6 +374,9 @@
     <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="1961957425135180242">"അടുത്തത്"</string>
+    <string name="setup_fingerprint_enroll_skip_title" msgid="362050541117362034">"ഫിംഗർപ്രിന്‍റ് ഒഴിവാക്കണോ?"</string>
+    <string name="setup_fingerprint_enroll_skip_after_adding_lock_text" msgid="958990414356204763">"ഫിംഗർപ്രിന്‍റ് സജ്ജമാക്കാൻ ഒന്നോ രണ്ടോ മിനിറ്റോ മാത്രമേ എടുക്കൂ. ഈ ഘട്ടം ഒഴിവാക്കുകയാണെങ്കിൽ, പിന്നീട് ക്രമീകരണത്തിൽ നിങ്ങൾക്ക് ഫിംഗർപ്രിന്‍റ് ചേർക്കാവുന്നതാണ്."</string>
+    <string name="lock_screen_intro_skip_title" msgid="4988210105913705679">"സ്‌ക്രീൻ ലോക്ക് ഒഴിവാക്കണോ?"</string>
     <string name="lock_screen_intro_skip_dialog_text_frp" product="tablet" msgid="1581834104051243425">"ഉപകരണ പരിരക്ഷാ ഫീച്ചറുകൾ ഓണാക്കില്ല. ഈ ടാബ്‌ലെറ്റ് നഷ്ടപ്പെടുകയോ മോഷ്ടിക്കപ്പെടുകയോ പുനഃക്രമീകരിക്കുകയോ ചെയ്താൽ, ടാബ്‌ലെറ്റ് ഉപയോഗിക്കുന്നതിൽ നിന്ന് മറ്റുള്ളവരെ തടയാൻ നിങ്ങൾക്കാവില്ല."</string>
     <string name="lock_screen_intro_skip_dialog_text_frp" product="device" msgid="4629503416877189572">"ഉപകരണ പരിരക്ഷാ ഫീച്ചറുകൾ ഓണാക്കില്ല. ഈ ഉപകരണം നഷ്ടപ്പെടുകയോ മോഷ്ടിക്കപ്പെടുകയോ പുനഃക്രമീകരിക്കുകയോ ചെയ്താൽ, ഉപകരണം ഉപയോഗിക്കുന്നതിൽ നിന്ന് മറ്റുള്ളവരെ തടയാൻ നിങ്ങൾക്കാവില്ല."</string>
     <string name="lock_screen_intro_skip_dialog_text_frp" product="default" msgid="2423428240245737909">"ഉപകരണ പരിരക്ഷാ ഫീച്ചറുകൾ ഓണാക്കില്ല. ഈ ഫോൺ നഷ്ടപ്പെടുകയോ മോഷ്ടിക്കപ്പെടുകയോ പുനഃക്രമീകരിക്കുകയോ ചെയ്താൽ, ഫോൺ ഉപയോഗിക്കുന്നതിൽ നിന്ന് മറ്റുള്ളവരെ തടയാൻ നിങ്ങൾക്കാവില്ല."</string>
@@ -382,13 +386,13 @@
     <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="3051496861358227199">"സെൻസർ സ്പർശിക്കുക"</string>
-    <string name="security_settings_fingerprint_enroll_find_sensor_message" msgid="8793966374365960368">"ഫോണിന്റെ പിൻവശത്താണ് അതുള്ളത്. നിങ്ങളുടെ ചൂണ്ടുവിരൽ ഉപയോഗിക്കുക."</string>
+    <string name="security_settings_fingerprint_enroll_find_sensor_message" msgid="8793966374365960368">"ഫോണിന്റെ പിൻവശത്താണ് അതുള്ളത്. ചൂണ്ടുവിരൽ ഉപയോഗിക്കുക."</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_content_description" msgid="2058830032070449160">"ഉപകരണത്തിലെ ചിത്രീകരണവും ഫിംഗർപ്രിന്റ് സെൻസർ ലൊക്കേഷനും"</string>
     <string name="security_settings_fingerprint_enroll_dialog_name_label" msgid="7086763077909041106">"പേര്"</string>
     <string name="security_settings_fingerprint_enroll_dialog_ok" msgid="4150384963879569750">"ശരി"</string>
     <string name="security_settings_fingerprint_enroll_dialog_delete" msgid="4114615413240707936">"ഇല്ലാതാക്കുക"</string>
     <string name="security_settings_fingerprint_enroll_start_title" msgid="2068961812439460133">"സെൻസർ സ്പർശിക്കുക"</string>
-    <string name="security_settings_fingerprint_enroll_start_message" msgid="3909929328942564524">"സെൻസറിൽ വിരൽ വച്ച് ഒരു വൈബ്രേഷൻ അനുഭവപ്പെട്ട ശേഷം വിരൽ മാറ്റുക."</string>
+    <string name="security_settings_fingerprint_enroll_start_message" msgid="3909929328942564524">"സെൻസറിൽ വിരൽ വച്ച് വൈബ്രേഷൻ അനുഭവപ്പെട്ട ശേഷം വിരൽ മാറ്റുക."</string>
     <string name="security_settings_fingerprint_enroll_repeat_title" msgid="2819679722403209778">"ഉയർത്തുക, വീണ്ടും സ്പർശിക്കുക"</string>
     <string name="security_settings_fingerprint_enroll_repeat_message" msgid="6158989350522518586">"നിങ്ങളുടെ ഫിംഗർപ്രിന്റിന്റെ വ്യത്യസ്ത ഭാഗങ്ങൾ ചേർക്കുന്നതിന് നിങ്ങളുടെ വിരൽ ഉയർത്തിക്കൊണ്ടിരിക്കുക"</string>
     <string name="security_settings_fingerprint_enroll_finish_title" msgid="7567276170287972230">"ഫിംഗർപ്രിന്റ് ചേർത്തു"</string>
@@ -458,7 +462,7 @@
     <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="lock_settings_picker_fingerprint_added_security_message" msgid="5768002109707648463">"അധിക സുരക്ഷയ്ക്ക്, ബാക്കപ്പ് സ്‌ക്രീൻ ലോക്ക് സജ്ജീകരിക്കുക."</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>
@@ -500,29 +504,37 @@
     <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>
-    <!-- no translation found for unlock_disable_frp_warning_content_pattern_fingerprint (2986105377420905314) -->
-    <skip />
-    <string name="unlock_disable_frp_warning_content_pin" msgid="586996206210265131">"നിങ്ങളുടെ PIN കൂടാതെ ഉപകരണ പരിരക്ഷാ ഫീച്ചറുകൾ പ്രവർത്തിക്കില്ല."</string>
-    <!-- no translation found for unlock_disable_frp_warning_content_pin_fingerprint (3370462835533123695) -->
-    <skip />
+    <string name="unlock_disable_frp_warning_content_pattern_fingerprint" msgid="2986105377420905314">"നിങ്ങളുടെ പാറ്റേൺ കൂടാതെ ഉപകരണ പരിരക്ഷാ ഫീച്ചറുകൾ പ്രവർത്തിക്കില്ല.<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="3370462835533123695">"നിങ്ങളുടെ പിൻ കൂടാതെ ഉപകരണ പരിരക്ഷാ ഫീച്ചറുകൾ പ്രവർത്തിക്കില്ല.<xliff:g id="EMPTY_LINE">
+
+</xliff:g>സംരക്ഷിച്ചിട്ടുള്ള നിങ്ങളുടെ വിരലടയാളങ്ങളും ഈ ഉപകരണത്തിൽ നിന്ന് നീക്കംചെയ്യപ്പെടും, നിങ്ങൾക്ക് ഫോൺ അൺലോക്ക് ചെയ്യാനോ വാങ്ങലുകൾക്ക് അംഗീകാരം നൽകാനോ ആപ്പിലേക്ക് സൈൻ ഇൻ ചെയ്യാനോ കഴിയില്ല."</string>
     <string name="unlock_disable_frp_warning_content_password" msgid="5420612686852555537">"നിങ്ങളുടെ പാസ്‌വേഡ് കൂടാതെ ഉപകരണ പരിരക്ഷാ ഫീച്ചറുകൾ പ്രവർത്തിക്കില്ല."</string>
-    <!-- no translation found for unlock_disable_frp_warning_content_password_fingerprint (3595476296430536798) -->
-    <skip />
+    <string name="unlock_disable_frp_warning_content_password_fingerprint" msgid="3595476296430536798">"നിങ്ങളുടെ പാസ്‌വേഡ് കൂടാതെ ഉപകരണ പരിരക്ഷാ ഫീച്ചറുകൾ പ്രവർത്തിക്കില്ല.<xliff:g id="EMPTY_LINE">
+
+</xliff:g>സംരക്ഷിച്ചിട്ടുള്ള നിങ്ങളുടെ വിരലടയാളങ്ങളും ഈ ഉപകരണത്തിൽ നിന്ന് നീക്കംചെയ്യപ്പെടും, നിങ്ങൾക്ക് ഫോൺ അൺലോക്ക് ചെയ്യാനോ വാങ്ങലുകൾക്ക് അംഗീകാരം നൽകാനോ ആപ്പുകളിലേക്ക് സൈൻ ഇൻ ചെയ്യാനോ കഴിയില്ല."</string>
     <string name="unlock_disable_frp_warning_content_unknown" msgid="1550718040483548220">"നിങ്ങളുടെ സ്ക്രീൻ ലോക്ക് കൂടാതെ ഉപകരണ പരിരക്ഷാ ഫീച്ചറുകൾ പ്രവർത്തിക്കില്ല."</string>
-    <!-- no translation found for unlock_disable_frp_warning_content_unknown_fingerprint (3679351662094349506) -->
-    <skip />
+    <string name="unlock_disable_frp_warning_content_unknown_fingerprint" msgid="3679351662094349506">"നിങ്ങളുടെ സ്‌ക്രീൻ ലോക്ക് കൂടാതെ ഉപകരണ പരിരക്ഷാ ഫീച്ചറുകൾ പ്രവർത്തിക്കില്ല.<xliff:g id="EMPTY_LINE">
+
+</xliff:g>സംരക്ഷിച്ചിട്ടുള്ള നിങ്ങളുടെ വിരലടയാളങ്ങളും ഈ ഉപകരണത്തിൽ നിന്ന് നീക്കംചെയ്യപ്പെടും, നിങ്ങൾക്ക് ഫോൺ അൺലോക്ക് ചെയ്യാനോ വാങ്ങലുകൾക്ക് അംഗീകാരം നൽകാനോ ആപ്പിലേക്ക് സൈൻ ഇൻ ചെയ്യാനോ കഴിയില്ല."</string>
     <string name="unlock_disable_frp_warning_content_pattern_profile" msgid="8682200103576359918">"നിങ്ങളുടെ പാറ്റേൺ കൂടാതെ പ്രൊഫൈൽ പരിരക്ഷാ ഫീച്ചറുകൾ പ്രവർത്തിക്കില്ല."</string>
-    <!-- no translation found for unlock_disable_frp_warning_content_pattern_fingerprint_profile (6718155854303231675) -->
-    <skip />
+    <string name="unlock_disable_frp_warning_content_pattern_fingerprint_profile" msgid="6718155854303231675">"നിങ്ങളുടെ പാറ്റേൺ കൂടാതെ പ്രൊഫൈൽ പരിരക്ഷാ ഫീച്ചറുകൾ പ്രവർത്തിക്കില്ല.<xliff:g id="EMPTY_LINE">
+
+</xliff:g>സംരക്ഷിച്ചിട്ടുള്ള നിങ്ങളുടെ വിരലടയാളങ്ങളും ഈ പ്രൊഫൈലിൽ നിന്ന് നീക്കംചെയ്യപ്പെടും, നിങ്ങൾക്ക് അവയുപയോഗിച്ച് പ്രൊഫൈൽ അൺലോക്ക് ചെയ്യാനോ വാങ്ങലുകൾക്ക് അംഗീകാരം നൽകാനോ ആപ്പിലേക്ക് സൈൻ ഇൻ ചെയ്യാനോ കഴിയില്ല."</string>
     <string name="unlock_disable_frp_warning_content_pin_profile" msgid="7790688070593867767">"നിങ്ങളുടെ പിൻ കൂടാതെ പ്രൊഫൈൽ പരിരക്ഷാ ഫീച്ചറുകൾ പ്രവർത്തിക്കില്ല."</string>
-    <!-- no translation found for unlock_disable_frp_warning_content_pin_fingerprint_profile (4209564603132870532) -->
-    <skip />
+    <string name="unlock_disable_frp_warning_content_pin_fingerprint_profile" msgid="4209564603132870532">"നിങ്ങളുടെ പിൻ കൂടാതെ പ്രൊഫൈൽ പരിരക്ഷാ ഫീച്ചറുകൾ പ്രവർത്തിക്കില്ല.<xliff:g id="EMPTY_LINE">
+
+</xliff:g>സംരക്ഷിച്ചിട്ടുള്ള നിങ്ങളുടെ വിരലടയാളങ്ങളും ഈ പ്രൊഫൈലിൽ നിന്ന് നീക്കംചെയ്യപ്പെടും, നിങ്ങൾക്ക് അവയുപയോഗിച്ച് പ്രൊഫൈൽ അൺലോക്ക് ചെയ്യാനോ വാങ്ങലുകൾക്ക് അംഗീകാരം നൽകാനോ ആപ്പിലേക്ക് സൈൻ ഇൻ ചെയ്യാനോ കഴിയില്ല."</string>
     <string name="unlock_disable_frp_warning_content_password_profile" msgid="7569285520567674461">"നിങ്ങളുടെ പാസ്‌വേഡ് കൂടാതെ പ്രൊഫൈൽ പരിരക്ഷാ ഫീച്ചറുകൾ പ്രവർത്തിക്കില്ല."</string>
-    <!-- no translation found for unlock_disable_frp_warning_content_password_fingerprint_profile (2994300676764706047) -->
-    <skip />
+    <string name="unlock_disable_frp_warning_content_password_fingerprint_profile" msgid="2994300676764706047">"നിങ്ങളുടെ പാസ്‌വേഡ് കൂടാതെ പ്രൊഫൈൽ പരിരക്ഷാ ഫീച്ചറുകൾ പ്രവർത്തിക്കില്ല.<xliff:g id="EMPTY_LINE">
+
+</xliff:g>സംരക്ഷിച്ചിട്ടുള്ള നിങ്ങളുടെ വിരലടയാളങ്ങളും ഈ പ്രൊഫൈലിൽ നിന്ന് നീക്കംചെയ്യപ്പെടും, നിങ്ങൾക്ക് അവയുപയോഗിച്ച് പ്രൊഫൈൽ അൺലോക്ക് ചെയ്യാനോ വാങ്ങലുകൾക്ക് അംഗീകാരം നൽകാനോ ആപ്പിലേക്ക് സൈൻ ഇൻ ചെയ്യാനോ കഴിയില്ല."</string>
     <string name="unlock_disable_frp_warning_content_unknown_profile" msgid="6984215718701688202">"നിങ്ങളുടെ സ്ക്രീൻ ലോക്ക് കൂടാതെ പ്രൊഫൈൽ പരിരക്ഷാ ഫീച്ചറുകൾ പ്രവർത്തിക്കില്ല."</string>
-    <!-- no translation found for unlock_disable_frp_warning_content_unknown_fingerprint_profile (4994062501123299418) -->
-    <skip />
+    <string name="unlock_disable_frp_warning_content_unknown_fingerprint_profile" msgid="4994062501123299418">"നിങ്ങളുടെ സ്‌ക്രീൻ ലോക്ക് കൂടാതെ പ്രൊഫൈൽ പരിരക്ഷാ ഫീച്ചറുകൾ പ്രവർത്തിക്കില്ല.<xliff:g id="EMPTY_LINE">
+
+</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>
@@ -581,6 +593,7 @@
     <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="lockpassword_clear_label" msgid="5724429464960458155">"മായ്‌ക്കുക"</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>
@@ -590,12 +603,12 @@
       <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> ആപ്‌സ് സജീവമാണ്</item>
       <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> ആപ്പ് സജീവമാണ്</item>
     </plurals>
-    <string name="manage_trust_agents" msgid="4629279457536987768">"പരിചിത ഏജന്റുകൾ"</string>
+    <string name="manage_trust_agents" msgid="4629279457536987768">"വിശ്വസ്ത ഏജൻ്റുകൾ"</string>
     <string name="disabled_because_no_backup_security" msgid="6877660253409580377">"ഉപയോഗിക്കാൻ, ആദ്യം സ്‌ക്രീൻ ലോക്ക് സജ്ജീകരിക്കുക"</string>
     <string name="manage_trust_agents_summary" msgid="1475819820389620546">"ഒന്നുമില്ല"</string>
     <plurals name="manage_trust_agents_summary_on" formatted="false" msgid="3935182396726101824">
-      <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>
@@ -693,7 +706,7 @@
     <string name="nfc_disclaimer_title" msgid="4364003873202264039">"NFC ഓണാക്കുക"</string>
     <string name="nfc_disclaimer_content" msgid="5566907911915158075">"ഈ ഉപകരണത്തിനും മറ്റേതെങ്കിലും ചുറ്റുവട്ട ഉപകരണങ്ങൾക്കും അല്ലെങ്കിൽ പേയ്മെന്റ് ടെർമിനലുകളും ആക്സസ്സ് റീഡറുകളും ഇന്ററാക്ടീവ് പരസ്യങ്ങളും അല്ലെങ്കിൽ ടാഗുകളും പോലുള്ള ലക്ഷ്യങ്ങൾക്കും ഇടയിൽ NFC, വിവരങ്ങൾ കൈമാറുന്നു."</string>
     <string name="android_beam_settings_title" msgid="7832812974600338649">"Android ബീം"</string>
-    <string name="android_beam_on_summary" msgid="3618057099355636830">"NFC വഴി അപ്ലിക്കേഷൻ ഉള്ളടക്കം പ്രക്ഷേപണം ചെയ്യാൻ തയ്യാറാണ്"</string>
+    <string name="android_beam_on_summary" msgid="3618057099355636830">"ആപ്പിന്‍റെ ഉള്ളടക്കം NFC കൈമാറ്റത്തിന് തയ്യാർ"</string>
     <string name="android_beam_off_summary" msgid="4663095428454779138">"ഓഫ്"</string>
     <string name="android_beam_disabled_summary" msgid="1737782116894793393">"NFC ഓഫ് ചെ‌യ്തതിനാൽ ലഭ്യമല്ല"</string>
     <string name="android_beam_label" msgid="6257036050366775040">"Android ബീം"</string>
@@ -720,7 +733,7 @@
     <string name="wifi_poor_network_detection_summary" msgid="2784135142239546291">"മികച്ച ഇന്റർനെറ്റ് കണക്ഷൻ ഉണ്ടാകുന്നതുവരെ വൈഫൈ നെറ്റ്‌വർക്ക് ഉപയോഗിക്കരുത്"</string>
     <string name="wifi_avoid_poor_network_detection_summary" msgid="4674423884870027498">"മികച്ച ഇന്റർനെറ്റ് കണക്ഷനുള്ള നെറ്റ്‌വർക്കുകൾ മാത്രം ഉപയോഗിക്കുക"</string>
     <string name="use_open_wifi_automatically_title" msgid="6851951242903078588">"ഓപ്പൺ നെറ്റ്‌വർക്കുകളിലേക്ക് കണക്റ്റുചെയ്യുക"</string>
-    <string name="use_open_wifi_automatically_summary" msgid="2982091714252931713">"ഉയർന്ന ഗുണമേന്മയുള്ള പബ്ലിക് നെറ്റ്‌വർക്കുകളിലേക്ക് സ്വയമേവ കണക്റ്റുചെയ്യുക"</string>
+    <string name="use_open_wifi_automatically_summary" msgid="2982091714252931713">"ഉയർന്ന ഗുണമേന്മയുള്ള പബ്ലിക് നെറ്റ്‌വർക്കുകളിലേക്ക് സ്വമേധയാ കണക്റ്റുചെയ്യുക"</string>
     <string name="use_open_wifi_automatically_summary_scoring_disabled" msgid="593964217679325831">"ഉപയോഗിക്കാനായി, ഒരു നെറ്റ്‌വർക്ക് റേറ്റിംഗ് ദാതാവിനെ തിരഞ്ഞെടുക്കുക"</string>
     <string name="use_open_wifi_automatically_summary_scorer_unsupported_disabled" msgid="8472122600853650258">"ഉപയോഗിക്കാനായി, അനുയോജ്യമായ ഒരു നെറ്റ്‌വർക്ക് റേറ്റിംഗ് ദാതാവിനെ തിരഞ്ഞെടുക്കുക"</string>
     <string name="wifi_install_credentials" msgid="3551143317298272860">"സർട്ടിഫിക്കറ്റുകൾ ഇൻസ്റ്റാളുചെയ്യുക"</string>
@@ -774,6 +787,7 @@
     <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,6 +824,8 @@
     <string name="wifi_wps_available_first_item" msgid="4422547079984583502">"WPS ലഭ്യമാണ്"</string>
     <string name="wifi_wps_available_second_item" msgid="8427520131718215301">" (WPS ലഭ്യമാണ്)"</string>
     <string name="wifi_wps_nfc_enter_password" msgid="2288214226916117159">"നിങ്ങളുടെ നെറ്റ്‌വർക്ക് പാസ്‌വേഡ് നൽകുക"</string>
+    <string name="wifi_carrier_connect" msgid="8174696557882299911">"കാരിയർ വൈഫൈ നെറ്റ്‌വർക്ക്"</string>
+    <string name="wifi_carrier_content" msgid="4634077285415851933">"<xliff:g id="NAME">%1%s</xliff:g> എന്നയാൾ വഴി കണക്‌റ്റുചെയ്യുക"</string>
     <string name="wifi_scan_always_turnon_message" msgid="203123538572122989">"ലൊക്കേഷൻ കൃത്യത മെച്ചപ്പെടുത്തുന്നതിനും മറ്റ് ആവശ്യകതകൾക്കായും, വൈഫൈ ഓഫായിരിക്കുമ്പോൾപ്പോലും നെറ്റ്‌വർക്ക് സ്‌കാൻ ചെയ്യാൻ <xliff:g id="APP_NAME">%1$s</xliff:g> താൽപ്പര്യപ്പെടുന്നു.\n\nസ്‌കാൻ ചെയ്യാൻ താൽപ്പര്യപ്പെടുന്ന എല്ലാ അപ്ലിക്കേഷനുകൾക്കായും ഇത് അനുവദിക്കണോ?"</string>
     <string name="wifi_scan_always_turnoff_message" msgid="5538901671131941043">"ഇത് ഓഫുചെയ്യുന്നതിന്, ഓവർഫ്ലോ മെനുവിലെ വിപുലമായത് എന്നതിലേക്ക് പോകുക."</string>
     <string name="wifi_scan_always_confirm_allow" msgid="5355973075896817232">"അനുവദിക്കുക"</string>
@@ -827,6 +843,7 @@
     <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_modify" msgid="6100248070440710782">"പരിഷ്‌ക്കരിക്കുക"</string>
     <string name="wifi_failed_forget_message" msgid="1348172929201654986">"നെറ്റ്‌വർക്ക് നിരസിക്കുന്നതിൽ പരാജയപ്പെട്ടു"</string>
     <string name="wifi_save" msgid="3331121567988522826">"സംരക്ഷിക്കുക"</string>
     <string name="wifi_failed_save_message" msgid="6650004874143815692">"നെറ്റ്‌വർക്ക് സംരക്ഷിക്കുന്നതിൽ പരാജയപ്പെട്ടു"</string>
@@ -839,6 +856,7 @@
     <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_title" msgid="3471132676909349382">"നെറ്റ്‍വർക്ക് ‌വിവരങ്ങൾ"</string>
     <string name="wifi_details_subnet_mask" msgid="6720279144174924410">"സബ്‌നെറ്റ് മാസ്‌ക്"</string>
     <string name="wifi_details_dns" msgid="8648826607751830768">"DNS"</string>
     <string name="wifi_details_ipv6_address_header" msgid="6734119149106422148">"IPv6 വിലാസങ്ങൾ"</string>
@@ -871,16 +889,15 @@
     <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_off_subtext" msgid="5466126533609394170">"മറ്റ് ഉപകരണങ്ങളുമായി ഇന്റർനെറ്റോ ഉള്ളടക്കമോ പങ്കിടുന്നില്ല"</string>
     <string name="wifi_hotspot_tethering_on_subtext" product="tablet" msgid="5752490509369962007">"ഹോട്ട്‌സ്‌പോട്ട് വഴി, ഈ ടാബ്‌ലെറ്റിന്റെ ഇന്റർനെറ്റ് കണക്ഷൻ പങ്കിടുന്നു"</string>
     <string name="wifi_hotspot_tethering_on_subtext" product="default" msgid="6461075246164300670">"ഹോട്ട്‌സ്‌പോട്ട് വഴി, ഈ ഫോണിന്റെ ഇന്റർനെറ്റ് കണക്ഷൻ പങ്കിടുന്നു"</string>
     <string name="wifi_hotspot_on_local_only_subtext" msgid="2068110388011294735">"ആപ്പ് ഉള്ളടക്കം പങ്കിടുന്നു. ഇന്റർനെറ്റ് കണക്ഷൻ പങ്കിടുന്നതിന്, ഹോട്ട്‌സ്പോട്ട് ഓഫാക്കുക, തുടർന്ന് ഓണാക്കുക"</string>
-    <string name="wifi_hotspot_name_title" msgid="1341735529132128887">"വൈഫൈയുടെ പേര്"</string>
+    <string name="wifi_hotspot_name_title" msgid="8237000746618636778">"ഹോട്ട്‌സ്‌പോട്ടിന്റെ പേര്"</string>
     <string name="wifi_hotspot_name_summary_connecting" msgid="3378299995508671967">"<xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g> ഓണാക്കുന്നു..."</string>
     <string name="wifi_hotspot_name_summary_connected" msgid="3888672084861445362">"<xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g> ഹോട്ട്‌സ്പോട്ടിലേക്ക് മറ്റ് ഉപകരണങ്ങൾക്ക് കണക്റ്റുചെയ്യാൻ കഴിയും"</string>
-    <string name="wifi_hotspot_password_title" msgid="1955592302902091281">"വൈഫൈ പാസ്‌വേഡ്"</string>
+    <string name="wifi_hotspot_password_title" msgid="8676859981917573801">"ഹോട്ട്‌സ്‌പോട്ടിന്റെ പാസ്‌വേഡ്"</string>
     <string name="wifi_hotspot_ap_band_title" msgid="1165801173359290681">"AP ബാൻഡ്"</string>
     <string name="wifi_hotspot_footer_info_regular" msgid="1203489406068036455">"നിങ്ങളുടെ മറ്റ് ഉപകരണങ്ങൾക്കായി ഒരു വൈഫൈ നെറ്റ്‌വർക്ക് സൃഷ്ടിക്കുന്നതിന് ഹോട്ട്‌സ്പോട്ട് ഉപയോഗിക്കുക. ഹോട്ട്‌സ്പോട്ട് ഇന്റർനെറ്റ് നൽകുന്നത് നിങ്ങളുടെ മൊബൈൽ ഡാറ്റാ കണക്ഷൻ ഉപയോഗിച്ചുകൊണ്ടാണ്. അധിക മൊബൈൽ ഡാറ്റ നിരക്കുകൾ ബാധകമായേക്കാം."</string>
     <string name="wifi_hotspot_footer_info_local_only" msgid="857988412470694109">"ചുറ്റുവട്ടത്തുള്ള ഉപകരണങ്ങളുമായി ഉള്ളടക്കം പങ്കിടുന്നതിന് ആപ്പുകൾക്ക് ഹോട്ട്‌സ്പോട്ട് സൃഷ്ടിക്കാൻ കഴിയും."</string>
@@ -891,7 +908,6 @@
     <string name="wifi_tether_configure_ap_text" msgid="7974681394041609308">"വൈഫൈ ഹോട്ട്‌സ്പോട്ട് സജ്ജീകരിക്കുക"</string>
     <string name="wifi_hotspot_configure_ap_text" msgid="5478614731464220432">"വൈഫൈ ഹോട്ട്‌സ്‌പോട്ട് സജ്ജീകരണം"</string>
     <string name="wifi_hotspot_configure_ap_text_summary" msgid="5560680057727007011">"AndroidAP WPA2 PSK ഹോട്ട്‌സ്‌പോട്ട്"</string>
-    <string name="wifi_tether_configure_subtext" msgid="2050196439900426456">"<xliff:g id="NETWORK_SSID">%1$s</xliff:g> <xliff:g id="NETWORK_SECURITY">%2$s</xliff:g> ഹോട്ട്‌സ്‌പോട്ട്"</string>
     <string name="wifi_tether_configure_ssid_default" msgid="8467525402622138547">"AndroidHotspot"</string>
     <string name="wifi_calling_settings_title" msgid="4102921303993404577">"വൈഫൈ കോളിംഗ്"</string>
     <string name="wifi_calling_suggestion_title" msgid="9008010480466359578">"വൈഫൈ കോളിംഗ് ഓണാക്കുക"</string>
@@ -932,7 +948,7 @@
     <string name="wifi_calling_off_explanation" msgid="2597566001655908391">"വൈഫൈ കോളിംഗ് ഓണായിരിക്കുമ്പോൾ, നിങ്ങളുടെ മുൻഗണനയും ഏത് സിഗ്നലാണ് ശക്തമെന്നതും അടിസ്ഥാനമാക്കി ഫോണിന് വൈഫൈ നെറ്റ്‌വർക്കോ കാരിയർ നെറ്റ്‌വർക്കോ വഴി കോളുകൾ റൂട്ട് ചെയ്യാനാകും. ഈ ഫീച്ചർ ഓണാക്കുന്നതിനുമുമ്പ്, നിരക്കുകളും മറ്റ് വിശദാംശങ്ങളും അറിയുന്നതിന് നിങ്ങളുടെ കാരിയറെ ബന്ധപ്പെടുക."</string>
     <string name="wifi_calling_off_explanation_2" msgid="2329334487851497223"></string>
     <string name="emergency_address_title" msgid="3571902448699714454">"അടിയന്തര വിലാസം അപ്ഡേറ്റുചെയ്യുക"</string>
-    <string name="emergency_address_summary" msgid="306028701568728126">"വൈഫൈ ഉപയോഗിച്ച് നിങ്ങൾ 911-ലേക്ക് വിളിക്കുമ്പോൾ, ലൊക്കേഷൻ പോലുള്ള അടിയന്തര സേവനങ്ങൾ ഉപയോഗിക്കുന്ന വിലാസം"</string>
+    <string name="emergency_address_summary" msgid="3266760199681945746">"വൈഫൈ ഉപയോഗിച്ച് നിങ്ങളൊരു അടിയന്തര കോൾ വിളിക്കുമ്പോൾ, ലൊക്കേഷൻ പോലുള്ള അടിയന്തര സേവനങ്ങൾ ഉപയോഗിക്കുന്ന വിലാസം"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"ഡിസ്പ്ലേ"</string>
     <string name="sound_settings" msgid="5534671337768745343">"ശബ്‌ദം"</string>
     <string name="all_volume_title" msgid="4296957391257836961">"വോളിയം"</string>
@@ -986,18 +1002,19 @@
     <string name="search_settings" msgid="1910951467596035063">"തിരയൽ"</string>
     <string name="search_settings_summary" msgid="9205656546570654169">"തിരയൽ ക്രമീകരണങ്ങളും ചരിത്രവും നിയന്ത്രിക്കുക"</string>
     <string name="search_settings_no_results" msgid="8799027492641230999">"ഫലങ്ങൾ ഇല്ല"</string>
+    <string name="search_clear_history" msgid="4196658962573162457">"ചരിത്രം മായ്‌ക്കുക"</string>
     <string name="display_settings" msgid="7965901687241669598">"ഡിസ്പ്ലേ"</string>
     <string name="accelerometer_title" msgid="7854608399547349157">"സ്‌ക്രീൻ സ്വയമേ തിരിക്കുക"</string>
     <string name="color_mode_title" msgid="3159275920408338215">"കടും നിറങ്ങൾ"</string>
-    <string name="accelerometer_summary_on" product="tablet" msgid="429982132339828942">"ടാബ്‌ലെറ്റ് തിരിക്കുമ്പോൾ സ്വയമേവ ഓറിയന്റേഷൻ മാറുക"</string>
-    <string name="accelerometer_summary_on" product="default" msgid="1133737282813048021">"ഫോൺ തിരിക്കുമ്പോൾ സ്വയമേവ ഓറിയന്റേഷൻ മാറുക"</string>
-    <string name="accelerometer_summary_off" product="tablet" msgid="4781734213242521682">"ടാബ്‌ലെറ്റ് തിരിക്കുമ്പോൾ സ്വയമേവ ഓറിയന്റേഷൻ മാറുക"</string>
-    <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>
     <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>
@@ -1032,7 +1049,7 @@
     <string name="night_display_summary_on_auto_mode_never" msgid="9117830821363119835">"ഒരിക്കലും സ്വയമേവ ഓഫാക്കില്ല"</string>
     <string name="night_display_summary_on_auto_mode_custom" msgid="5510753572245577263">"<xliff:g id="ID_1">%1$s</xliff:g>-ന് സ്വയമേവ ഓഫാക്കും"</string>
     <string name="night_display_summary_on_auto_mode_twilight" msgid="852270120144683507">"സൂര്യോദയ സമയത്ത് സ്വയമേവ ഓഫാക്കും"</string>
-    <string name="screen_timeout" msgid="4351334843529712571">"സ്ലീപ്പിലാക്കുക"</string>
+    <string name="screen_timeout" 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>
@@ -1056,15 +1073,13 @@
     <string name="automatic_brightness" msgid="5014143533884135461">"യാന്ത്രിക തെളിച്ചം"</string>
     <string name="lift_to_wake_title" msgid="4555378006856277635">"സജീവമാക്കാൻ ലിഫ്റ്റുചെയ്യുക"</string>
     <string name="ambient_display_screen_title" msgid="4252755516328775766">"അറിയിപ്പിനു സ്ക്രീൻ ഓണാക്കുക"</string>
-    <!-- no translation found for ambient_display_screen_summary_always_on (7337555569694794132) -->
-    <skip />
+    <string name="ambient_display_screen_summary_always_on" msgid="7337555569694794132">"എപ്പോഴും ഓണാണ് / ഉയർന്ന ബാറ്ററി ഉപയോഗം"</string>
     <string name="ambient_display_screen_summary_notifications" msgid="1449570742600868654">"പുതിയ അറിയിപ്പുകൾ"</string>
     <string name="ambient_display_category_triggers" msgid="4359289754456268573">"കാണിക്കേണ്ട സമയം"</string>
     <string name="doze_title" msgid="2375510714460456687">"പുതിയ അറിയിപ്പുകൾ"</string>
     <string name="doze_summary" msgid="3846219936142814032">"നിങ്ങൾക്ക് അറിയിപ്പുകൾ ലഭിക്കുന്ന സമയത്ത് സ്ക്രീൻ സജീവമാക്കുക"</string>
     <string name="doze_always_on_title" msgid="1046222370442629646">"എല്ലായ്‌പ്പോഴും ഓണാണ്"</string>
-    <!-- no translation found for doze_always_on_summary (6978257596231155345) -->
-    <skip />
+    <string name="doze_always_on_summary" msgid="6978257596231155345">"സമയം, അറിയിപ്പ് ഐക്കണുകൾ എന്നിവയും മറ്റ് വിവരങ്ങളും കാണിക്കുക. ഉയർന്ന ബാറ്ററി ഉപയോഗം."</string>
     <string name="title_font_size" msgid="4405544325522105222">"ഫോണ്ട് വലുപ്പം"</string>
     <string name="short_summary_font_size" msgid="6819778801232989076">"ടെക്സ്റ്റ് ചെറുതോ വലുതോ ആക്കുക"</string>
     <string name="sim_lock_settings" msgid="3392331196873564292">"സിം കാർഡ് ലോക്ക് ക്രമീകരണങ്ങൾ"</string>
@@ -1117,7 +1132,6 @@
     <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>
     <string name="device_status_activity_title" msgid="1411201799384697904">"നില"</string>
     <string name="device_status" msgid="607405385799807324">"നില"</string>
@@ -1145,7 +1159,6 @@
     <string name="status_wifi_mac_address" msgid="2202206684020765378">"വൈഫൈ MAC വിലാസം"</string>
     <string name="status_bt_address" msgid="4195174192087439720">"ബ്ലൂടൂത്ത് വിലാസം"</string>
     <string name="status_serial_number" msgid="2257111183374628137">"സീരിയല്‍ നമ്പര്‍"</string>
-    <string name="status_unavailable" msgid="7862009036663793314">"ലഭ്യമല്ല"</string>
     <string name="status_up_time" msgid="7294859476816760399">"പ്രവർത്തിക്കുന്ന സമയം"</string>
     <string name="status_awake_time" msgid="2393949909051183652">"സജീവമായിരിക്കുന്ന സമയം"</string>
     <string name="internal_memory" msgid="9129595691484260784">"ആന്തരിക സ്റ്റോറേജ്"</string>
@@ -1157,7 +1170,7 @@
     <string name="memory_calculating_size" msgid="2188358544203768588">"കണക്കാക്കുന്നു..."</string>
     <string name="memory_apps_usage" msgid="5128673488173839077">"ആപ്സുകളും ആപ്സ് ഡാറ്റയും"</string>
     <string name="memory_media_usage" msgid="3738830697707880405">"മീഡിയ"</string>
-    <string name="memory_downloads_usage" msgid="3755173051677533027">"ഡൗണ്‍ലോഡ്"</string>
+    <string name="memory_downloads_usage" msgid="3755173051677533027">"ഡൗണ്‍ലോഡുകൾ"</string>
     <string name="memory_dcim_usage" msgid="558887013613822577">"ചിത്രങ്ങളും വീഡിയോകളും"</string>
     <string name="memory_music_usage" msgid="1363785144783011606">"ഓഡിയോ (സംഗീതം, റിംഗ്ടോണുകൾ, പോഡ്കാസ്‌റ്റുകൾ തുടങ്ങിയവ)"</string>
     <string name="memory_media_misc_usage" msgid="6094866738586451683">"മറ്റ് ഫയലുകൾ"</string>
@@ -1243,7 +1256,7 @@
     <string name="storage_detail_other" msgid="8404938385075638238">"മറ്റുള്ളവ"</string>
     <string name="storage_detail_system" msgid="4629506366064709687">"സിസ്‌റ്റം"</string>
     <string name="storage_detail_explore" msgid="7911344011431568294">"<xliff:g id="NAME">^1</xliff:g> അടുത്തറിയുക"</string>
-    <string name="storage_detail_dialog_other" msgid="8907101974576694793">"മറ്റുള്ളവയിൽ, ആപ്‌സ് വഴി സംരക്ഷിച്ച പങ്കിട്ട ഫയലുകളും ഇന്റർനെറ്റിൽ നിന്നോ Bluetooth-ൽ നിന്നോ ഡൗൺലോഡ് ചെയ്തിട്ടുള്ള ഫയലുകളും Android ഫയലുകളും മറ്റുള്ളവയും ഉൾപ്പെടുന്നു. \n\nഈ <xliff:g id="NAME">^1</xliff:g> എന്നതിന്റെ മുഴുവൻ ഉള്ളടക്കങ്ങളും കാണുന്നതിന്, അടുത്തറിയുക ടാപ്പുചെയ്യുക."</string>
+    <string name="storage_detail_dialog_other" msgid="8907101974576694793">"ആപ്‌സ് സംരക്ഷിച്ചിട്ടുള്ള പങ്കിട്ട ഫയലുകളും ഇന്റർനെറ്റിൽ നിന്നോ Bluetooth-ൽ നിന്നോ ഡൗൺലോഡ് ചെയ്തിട്ടുള്ള ഫയലുകളും Android ഫയലുകളും ഉൾപ്പെടെയുള്ളവ മറ്റുള്ളവയിൽ ഉൾപ്പെടുന്നു. \n\n ഈ <xliff:g id="NAME">^1</xliff:g> എന്നതിന്റെ മുഴുവൻ ഉള്ളടക്കങ്ങളും കാണുന്നതിന്, ടാപ്പ് ചെയ്യുക."</string>
     <string name="storage_detail_dialog_system" msgid="862835644848361569">"സിസ്‌റ്റത്തിൽ Android പതിപ്പ് <xliff:g id="VERSION">%s</xliff:g> റൺ ചെയ്യാൻ ഉപയോഗിച്ച ഫയലുകളും ഉൾപ്പെടുന്നു"</string>
     <string name="storage_detail_dialog_user" msgid="3267254783294197804">"<xliff:g id="USER_0">^1</xliff:g> എന്ന ഉപയോക്താവിന്, സ്റ്റോറേജിന്റെ <xliff:g id="SIZE">^2</xliff:g> ഉപയോഗിക്കുന്ന, സംരക്ഷിച്ചിട്ടുള്ള ഫോട്ടോകളോ സംഗീതമോ ആപ്‌സോ മറ്റ് ഡാറ്റയോ ഉണ്ടായേക്കാം. \n\nകൂടുതൽ വിശദാംശങ്ങൾ കാണുന്നതിന്, <xliff:g id="USER_1">^1</xliff:g> എന്ന ഉപയോക്താവിലേക്ക് മാറുക."</string>
     <string name="storage_wizard_init_title" msgid="5085400514028585772">"നിങ്ങളുടെ <xliff:g id="NAME">^1</xliff:g> സജ്ജമാക്കുക"</string>
@@ -1321,6 +1334,7 @@
     <string name="menu_restore" msgid="8260067415075573273">"സ്ഥിരമായതിലേക്ക് പുനഃസജ്ജമാക്കുക"</string>
     <string name="restore_default_apn_completed" msgid="2824775307377604897">"സ്ഥിര APN ക്രമീകരണങ്ങൾ പുനഃസജ്ജീകരിക്കൽ പൂർത്തിയാക്കി."</string>
     <string name="reset_dashboard_title" msgid="6254873816990678620">"ഓപ്‌ഷനുകള്‍ റീസെറ്റുചെയ്യുക"</string>
+    <string name="reset_dashboard_summary" msgid="4851012632493522755">"നെറ്റ്‌വർക്കോ ആപ്പുകളോ ഉപകരണമോ റീസെറ്റുചെയ്യാം"</string>
     <string name="reset_network_title" msgid="6166025966016873843">"വൈഫൈ, മൊബൈൽ, Bluetooth എന്നിവ റീസെറ്റുചെയ്യുക"</string>
     <string name="reset_network_desc" msgid="5547979398298881406">"ഇങ്ങനെ ചെയ്താൽ ഇനിപ്പറയുന്നവ ഉപ്പെടെയുള്ള എല്ലാ നെറ്റ്‍വർക്ക് ക്രമീകരണവും പുനഃക്രമീകരിക്കപ്പെടും:\n\n"<li>"വൈഫൈ"</li>\n<li>"മൊബൈൽ ഡാറ്റ"</li>\n<li>"Bluetooth"</li></string>
     <string name="reset_network_button_text" msgid="2035676527471089853">"ക്രമീകരണം റീസെറ്റുചെയ്യുക"</string>
@@ -1329,17 +1343,14 @@
     <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="6617679904229218425">"എല്ലാ ഡാറ്റയും മായ്‌ക്കുക (ഫാക്‌ടറി റീസെറ്റ്)"</string>
-    <plurals name="master_clear_with_account_summary" formatted="false" msgid="5911377203778818712">
-      <item quantity="other"><xliff:g id="ACCOUNT_COUNT">%1$d</xliff:g> അക്കൗണ്ടുകൾ പുനഃക്രമീകരിക്കപ്പെടും</item>
-      <item quantity="one">1 അക്കൗണ്ട് പുനഃക്രമീകരിക്കപ്പെടും</item>
-    </plurals>
-    <string name="master_clear_summary" msgid="6902443944660426951">"ഇന്റേണൽ സ്‌റ്റോറേജും എല്ലാ ഡാറ്റയും പുനഃക്രമീകരിക്കുന്നതാണ്"</string>
+    <string name="master_clear_title" msgid="3531267871084279512">"എല്ലാ ഡാറ്റയും മായ്‌ക്കുക (ഫാക്‌ടറി റീസെറ്റ്)"</string>
     <string name="master_clear_desc" product="tablet" msgid="9146059417023157222">"ഇത് നിങ്ങളുടെ ടാബ്‌ലെറ്റിന്റെ "<b>"ആന്തരിക സംഭരണത്തിൽ"</b>" നിന്നും ഇവയുൾപ്പെടെ എല്ലാ ഡാറ്റയും മായ്ക്കും:\n\n"<li>"നിങ്ങളുടെ Google അക്കൗണ്ട്"</li>\n<li>"സി‌സ്റ്റത്തിന്റെയും അപ്ലിക്കേഷന്റെയും ഡാറ്റയും ക്രമീകരണങ്ങളും"</li>\n<li>"ഡൗൺലോഡുചെ‌യ്‌ത അപ്ലിക്കേഷനുകൾ"</li></string>
     <string name="master_clear_desc" product="default" msgid="4800386183314202571">"ഇത് നിങ്ങളുടെ ഫോണിലെ "<b>"ആന്തരിക സംഭരണത്തിലെ"</b>" എല്ലാ ഡാറ്റയും മായ്ക്കും, അതിൽ ഇവയുൾപ്പെടുന്നു:\n\n"<li>"നിങ്ങളുടെ Google അക്കൗണ്ട്"</li>\n<li>"സിസ്റ്റം, അപ്ലിക്കേഷൻ എന്നിവയുടെ ഡാറ്റയും ക്രമീകരണങ്ങളും"</li>\n<li>"ഡൗൺലോഡ്ചെയ്‌ത അപ്ലിക്കേഷനുകൾ"</li></string>
     <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"നിങ്ങൾ നിലവിൽ ഇനിപ്പറയുന്ന അക്കൗണ്ടുകളിൽ സൈൻ ചെ‌യ്തിരിക്കുന്നു:\n"</string>
     <string name="master_clear_other_users_present" product="default" msgid="5161423070702470742">\n\n"ഈ ഉപകരണത്തിൽ മറ്റ് ഉപയോക്താക്കളുണ്ട്.\n"</string>
     <string name="master_clear_desc_also_erases_external" msgid="1903185203791274237"><li>"സംഗീതം"</li>\n<li>"ഫോട്ടോകൾ"</li>\n<li>"മറ്റ് ഉപയോക്തൃ ഡാറ്റ"</li></string>
+    <string name="master_clear_desc_also_erases_esim" msgid="312352697653096008"><li>"eSIM-ലെ കാരിയറുകൾ"</li></string>
+    <string name="master_clear_desc_no_cancel_mobile_plan" msgid="5460926449093211144">\n\n"നിങ്ങളുടെ മൊബൈൽ സർവീസ് പ്ലാൻ ഇത് റദ്ദാക്കുകയില്ല."</string>
     <string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="7744115866662613411">\n\n"സംഗീതം, ചിത്രങ്ങൾ, മറ്റ് ഉപയോക്തൃ ഡാറ്റ എന്നിവ മായ്ക്കുന്നതിന്, "<b>"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>
@@ -1359,7 +1370,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>
@@ -1409,7 +1420,7 @@
     <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="7247994752324805202">"ലൊക്കേഷൻ നിർണ്ണയിക്കാൻ GPS-ഉം ഉപകരണ സെൻസറുകളും ഉപയോഗിക്കുക"</string>
@@ -1456,15 +1467,16 @@
     <string name="settings_safetylegal_activity_title" msgid="6901214628496951727">"സുരക്ഷാ വിവരം"</string>
     <string name="settings_safetylegal_activity_unreachable" msgid="250674109915859456">"നിങ്ങൾക്ക് ഒരു ഡാറ്റ കണ‌ക്ഷൻ ഇല്ല. ഈ വിവരം ഇപ്പോൾ കാണുന്നതിന്, ഇന്റ‌ർനെറ്റിൽ കണ‌ക്റ്റുചെ‌യ്‌തിരിക്കുന്ന ഏതൊരു കമ്പ്യൂട്ടറിൽ നിന്നും %s എന്നതിലേക്ക് പോകുക."</string>
     <string name="settings_safetylegal_activity_loading" msgid="8059022597639516348">"ലോഡുചെയ്യുന്നു..."</string>
-    <string name="lockpassword_choose_your_password_header" msgid="8624900666929394990">"പാസ്‌വേഡ് തിരഞ്ഞെടുക്കൂ"</string>
-    <string name="lockpassword_choose_your_password_header_for_fingerprint" msgid="6624409510609085450">"വിരലടയാളം ഉപയോഗിക്കാൻ, പാസ്‌വേഡ് സജ്ജമാക്കുക"</string>
-    <string name="lockpassword_choose_your_pattern_header" msgid="6949761069941694050">"പാറ്റേൺ തിരഞ്ഞെടുക്കൂ"</string>
-    <string name="lockpassword_choose_your_pattern_header_for_fingerprint" msgid="5901096361617543819">"വിരലടയാളം ഉപയോഗിക്കാൻ, പാറ്റേൺ സജ്ജമാക്കുക"</string>
-    <string name="lockpassword_choose_your_pin_header" msgid="7598849519816138302">"പിൻ തിരഞ്ഞെടുക്കൂ"</string>
-    <string name="lockpassword_choose_your_pin_header_for_fingerprint" msgid="765344692615917183">"വിരലടയാളം ഉപയോഗിക്കാൻ, പിൻ സജ്ജമാക്കുക"</string>
-    <string name="lockpassword_confirm_your_password_header" msgid="6308478184889846633">"നിങ്ങളുടെ പാസ്‌വേഡ് സ്ഥിരീകരിക്കുക"</string>
+    <string name="lockpassword_choose_your_screen_lock_header" msgid="3872462096767152394">"ഒരു സ്‌ക്രീൻ ലോക്ക് സജ്ജമാക്കുക"</string>
+    <string name="lockpassword_choose_your_password_message" msgid="1197569283524841412">"സുരക്ഷയ്‌ക്കായി, ഒരു പാസ്‌വേഡ് സജ്ജമാക്കുക"</string>
+    <string name="lockpassword_choose_your_password_header_for_fingerprint" msgid="2541818487015343503">"വിരലടയാളത്തിന്, പാസ്‌വേഡ് സജ്ജമാക്കൂ"</string>
+    <string name="lockpassword_choose_your_pattern_header_for_fingerprint" msgid="7709785406243556723">"വിരലടയാളത്തിന്, പാറ്റേൺ സജ്ജമാക്കൂ"</string>
+    <string name="lockpassword_choose_your_pin_message" msgid="1875420718677275646">"സുരക്ഷയ്‌ക്കായി, ഒരു പിൻ സജ്ജമാക്കുക"</string>
+    <string name="lockpassword_choose_your_pin_header_for_fingerprint" msgid="1549639053195796674">"വിരലടയാളം ഉപയോഗിക്കാൻ, പിൻ സജ്ജീകരിക്കുക"</string>
+    <string name="lockpassword_choose_your_pattern_message" msgid="5986983400689720015">"സുരക്ഷയ്‌ക്കായി, ഒരു പാറ്റേൺ സജ്ജീകരിക്കുക"</string>
+    <string name="lockpassword_confirm_your_password_header" msgid="1266027268220850931">"നിങ്ങളുടെ പാസ്‌വേഡ് വീണ്ടും നൽകുക"</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="7744513791910572550">"നിങ്ങളുടെ പിൻ വീണ്ടും നൽകുക"</string>
     <string name="lockpassword_confirm_passwords_dont_match" msgid="5140892109439191415">"പാസ്‌വേഡുകൾ പൊരുത്തപ്പെടുന്നില്ല"</string>
     <string name="lockpassword_confirm_pins_dont_match" msgid="7226244811505606217">"പിൻ നമ്പറുകൾ പൊരുത്തപ്പെടുന്നില്ല"</string>
     <string name="lockpassword_choose_lock_generic_header" msgid="3811438094903786145">"അൺലോക്ക് തിരഞ്ഞെടുക്കൽ"</string>
@@ -1477,18 +1489,18 @@
     <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>
-    <!-- no translation found for lockpassword_strong_auth_required_device_pattern (530802132223800623) -->
-    <skip />
-    <!-- no translation found for lockpassword_strong_auth_required_device_pin (7829294830078036417) -->
-    <skip />
-    <!-- no translation found for lockpassword_strong_auth_required_device_password (3552644641574796973) -->
-    <skip />
-    <!-- no translation found for lockpassword_strong_auth_required_work_pattern (3003781907040522053) -->
-    <skip />
-    <!-- no translation found for lockpassword_strong_auth_required_work_pin (3367491332598821552) -->
-    <skip />
-    <!-- no translation found for lockpassword_strong_auth_required_work_password (8159775129968582940) -->
-    <skip />
+    <string name="lockpassword_strong_auth_required_device_pattern" msgid="530802132223800623">"അധിക സുരക്ഷയ്ക്ക്, നിങ്ങളുടെ ഉപകരണത്തിന്റെ പാറ്റേൺ ഉപയോഗിക്കുക"</string>
+    <string name="lockpassword_strong_auth_required_device_pin" msgid="7829294830078036417">"അധിക സുരക്ഷയ്ക്ക്, നിങ്ങളുടെ ഉപകരണത്തിന്റെ പിൻ നൽകുക"</string>
+    <string name="lockpassword_strong_auth_required_device_password" msgid="3552644641574796973">"അധിക സുരക്ഷയ്ക്ക്, നിങ്ങളുടെ ഉപകരണത്തിന്റെ പാസ്‌വേഡ് നൽകുക"</string>
+    <string name="lockpassword_strong_auth_required_work_pattern" msgid="3003781907040522053">"അധിക സുരക്ഷയ്ക്ക്, നിങ്ങളുടെ ഔദ്യോഗിക പാറ്റേൺ ഉപയോഗിക്കുക"</string>
+    <string name="lockpassword_strong_auth_required_work_pin" msgid="3367491332598821552">"അധിക സുരക്ഷയ്ക്ക്, നിങ്ങളുടെ ഔദ്യോഗിക പിൻ നൽകുക"</string>
+    <string name="lockpassword_strong_auth_required_work_password" msgid="8159775129968582940">"അധിക സുരക്ഷയ്ക്ക്, നിങ്ങളുടെ ഔദ്യോഗിക പാസ്‌വേഡ് നൽകുക"</string>
+    <string name="lockpassword_confirm_your_pattern_details_frp" msgid="6757336656791723193">"ഫാക്‌ടറി ക്രമീകരണത്തിലേക്ക് നിങ്ങളുടെ ഫോൺ റീസെറ്റ് ചെയ്‌തു. ഫോൺ ഉപയോഗിക്കാനായി മുമ്പത്തെ പാറ്റേൺ നൽകുക."</string>
+    <string name="lockpassword_confirm_your_pin_details_frp" msgid="826520613445990470">"ഫാക്‌ടറി ക്രമീകരണത്തിലേക്ക് നിങ്ങളുടെ ഫോൺ റീസെറ്റ് ചെയ്‌തു. ഫോൺ ഉപയോഗിക്കാനായി മുമ്പത്തെ പിൻ നൽകുക."</string>
+    <string name="lockpassword_confirm_your_password_details_frp" msgid="8944081074615739040">"ഫാക്‌ടറി ക്രമീകരണത്തിലേക്ക് നിങ്ങളുടെ ഫോൺ റീസെറ്റ് ചെയ്‌തു. ഫോൺ ഉപയോഗിക്കാനായി മുമ്പത്തെ പാസ്‌വേഡ് നൽകുക."</string>
+    <string name="lockpassword_confirm_your_pattern_header_frp" msgid="2898036091609128286">"പാറ്റേൺ പരിശോധിക്കുക"</string>
+    <string name="lockpassword_confirm_your_pin_header_frp" msgid="4141601774778898803">"പിൻ പരിശോധിക്കുക"</string>
+    <string name="lockpassword_confirm_your_password_header_frp" msgid="3762615419295360480">"പാസ്‌വേഡ് പരിശോധിക്കുക"</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>
@@ -1538,7 +1550,6 @@
     <string name="install_applications_title" msgid="4987712352256508946">"എല്ലാ അപ്ലിക്കേഷൻ ഉറവിടങ്ങളും അനുവദിക്കുക"</string>
     <string name="recent_app_category_title" msgid="6673071268966003928">"ഈയടുത്ത് തുറന്ന ആപ്പുകൾ"</string>
     <string name="see_all_apps_title" msgid="1317153498074308438">"എല്ലാ <xliff:g id="COUNT">%1$d</xliff:g> ആപ്പുകളും കാണൂ"</string>
-    <string name="recent_app_summary" msgid="3366446669844932300">"<xliff:g id="TIME">^1</xliff:g> മുമ്പ്"</string>
     <string name="install_all_warning" product="tablet" msgid="8310489909586138165">"തിരിച്ചറിയാനാകാത്ത ആപ്‌സിനാൽ നിങ്ങളുടെ ടാബ്‌ലെറ്റും വ്യക്തിഗത ഡാറ്റയും ആക്രമിക്കപ്പെടാനുള്ള സാധ്യത വളരെ കൂടുതലാണ്. ഈ ഉറവിടത്തിൽ നിന്ന് ആപ്‌സ് ഇൻസ്റ്റാൾ ചെയ്യുന്നതിലൂടെ, ഈ ആപ്‌സ് ഉപയോഗിക്കുന്നതിനാൽ നിങ്ങളുടെ ടാബ്‌ലെറ്റിന് സംഭവിച്ചേക്കാവുന്ന എല്ലാ നാശനഷ്‌ടങ്ങൾക്കും അല്ലെങ്കിൽ ഡാറ്റാ നഷ്‌ടങ്ങൾക്കും നിങ്ങൾക്കാണ് ഉത്തരവാദിത്തമെന്ന് നിങ്ങൾ അംഗീകരിക്കുന്നു."</string>
     <string name="install_all_warning" product="default" msgid="1952257127370115988">"തിരിച്ചറിയാനാകാത്ത ആപ്‌സിനാൽ നിങ്ങളുടെ ഫോണും വ്യക്തിഗത ഡാറ്റയും ആക്രമിക്കപ്പെടാനുള്ള സാധ്യത വളരെ കൂടുതലാണ്. ഈ ഉറവിടത്തിൽ നിന്ന് ആപ്‌സ് ഇൻസ്റ്റാൾ ചെയ്യുന്നതിലൂടെ, ഈ ആപ്‌സ് ഉപയോഗിക്കുന്നതിനാൽ നിങ്ങളുടെ ഫോണിന് സംഭവിച്ചേക്കാവുന്ന എല്ലാ നാശനഷ്‌ടങ്ങൾക്കും അല്ലെങ്കിൽ ഡാറ്റാ നഷ്‌ടങ്ങൾക്കും നിങ്ങൾക്കാണ് ഉത്തരവാദിത്തമെന്ന് നിങ്ങൾ അംഗീകരിക്കുന്നു."</string>
     <string name="advanced_settings" msgid="1777249286757067969">"വിപുലമായ ക്രമീകരണം"</string>
@@ -1725,7 +1736,7 @@
     <string name="hardkeyboard_category" msgid="5957168411305769899">"ഫിസിക്കൽ കീബോർഡ് ക്രമീകരണങ്ങൾ"</string>
     <string name="auto_punctuate_summary" msgid="4372126865670574837">"\".\" ചേർക്കുന്നതിന് സ്‌പേസ് കീ രണ്ടുതവണ അമർത്തുക"</string>
     <string name="show_password" msgid="4837897357002495384">"പാസ്‌വേ‌ഡുകൾ കാണിക്കുക"</string>
-    <string name="show_password_summary" msgid="3365397574784829969">"ടൈപ്പുചെയ്യുന്നതിനൊപ്പം അൽപ്പസമയം പ്രതീകം പ്രദർശിപ്പിക്കുക"</string>
+    <string name="show_password_summary" msgid="3365397574784829969">"ടൈപ്പ് ചെയ്യുന്ന അക്ഷരങ്ങൾ പ്രദർശിപ്പിക്കുക"</string>
     <string name="spellchecker_security_warning" msgid="9060897418527708922">"പാസ്‌വേഡുകൾ, ക്രെഡിറ്റ് കാർഡ് നമ്പറുകൾ എന്നിവ പോലുള്ള വ്യക്തിഗതമായ ഡാറ്റയുൾപ്പെടെ നിങ്ങൾ ടൈപ്പുചെയ്യുന്ന എല്ലാ വാചകവും ഈ അക്ഷരത്തെറ്റ് പരിശോധനയ്‌ക്ക് ശേഖരിക്കാനായേക്കും. ഇത് <xliff:g id="SPELLCHECKER_APPLICATION_NAME">%1$s</xliff:g> അപ്ലിക്കേഷനിൽ നിന്നും വരുന്നു. ഈ അക്ഷരത്തെറ്റ് പരിശോധന ഉപയോഗിക്കണോ?"</string>
     <string name="spellchecker_quick_settings" msgid="246728645150092058">"ക്രമീകരണം"</string>
     <string name="spellchecker_language" msgid="6041050114690541437">"ഭാഷ"</string>
@@ -1802,7 +1813,7 @@
     <string name="accessibility_settings_summary" msgid="981260486011624939">"സ്‌ക്രീൻ റീഡറുകൾ, ‌ഡിസ്‌പ്ലേ, ഇന്റരാക്ഷൻ നിയന്ത്രണങ്ങൾ"</string>
     <string name="vision_settings_title" msgid="4204111425716868288">"വീക്ഷണ ക്രമീകരണം"</string>
     <string name="vision_settings_description" msgid="5679491180156408260">"ആവശ്യങ്ങൾക്ക് അനുസരിച്ച് നിങ്ങൾക്ക് ഈ ഉപകരണം ഇഷ്ടാനുസൃതമാക്കാം. ഈ ഉപയോഗസഹായി ഫീച്ചറുകൾ പിന്നീട് ക്രമീകരണത്തിൽ മാറ്റാവുന്നതാണ്."</string>
-    <string name="vision_settings_suggestion_title" msgid="917294957154878441">"ഫോണ്ട് വലുപ്പം വർദ്ധിപ്പിക്കുക"</string>
+    <string name="vision_settings_suggestion_title" msgid="8058794060304707004">"ഫോണ്ട് വലുപ്പം മാറ്റുക"</string>
     <string name="screen_reader_category_title" msgid="7739154903913400641">"സ്‌ക്രീൻ റീഡറുകൾ"</string>
     <string name="audio_and_captions_category_title" msgid="3420727114421447524">"ഓഡിയോയും സ്‌ക്രീനിലെ ടെക്‌സ്‌റ്റും"</string>
     <string name="display_category_title" msgid="685461049938269166">"ഡി‌സ്‌പ്ലേ"</string>
@@ -1839,7 +1850,6 @@
     <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="preference_summary_default_combination" msgid="8532964268242666060">"<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>
@@ -1958,12 +1968,14 @@
     <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_whitelisted" msgid="7375400051141016808">"ബാറ്ററി ഉപയോഗത്തിനായി ആപ്പ് ഓപ്‌റ്റിമൈസ് ചെയ്യാനാവില്ല"</string>
+    <string name="background_activity_warning_dialog_title" msgid="2216249969149568871">"പശ്ചാത്തല പ്രവർത്തനം പരിമിതപ്പെടുത്തണോ?"</string>
+    <string name="background_activity_warning_dialog_text" msgid="7049624449246121981">"നിങ്ങൾ ഒരു ആപ്പിനായി പശ്ചാത്തല പ്രവർത്തനം പരിമിതപ്പെടുത്തുകയാണെങ്കിൽ, അത് ശരിയായി പ്രവർത്തിക്കാനിടയില്ല."</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" msgid="6393929085382334341">"പൂർണ്ണമായി ചാർജ് ചെയ്‌തതിന് ശേഷമുള്ള ആപ്പ് ഉപയോഗം (<xliff:g id="RELATIVE_TIME">^1</xliff:g>)"</string>
+    <string name="power_usage_list_summary_device" msgid="4461926045610455423">"പൂർണ്ണമായി ചാർജ് ചെയ്‌തതിന് ശേഷമുള്ള ഉപകരണ ഉപയോഗം (<xliff:g id="RELATIVE_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>
@@ -2062,7 +2074,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>
@@ -2101,7 +2113,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>
@@ -2209,14 +2221,14 @@
     <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_configure_lock_screen_hint" msgid="8058230497337529036">"ക്രെഡൻഷ്യൽ സ്‌റ്റോറേജ് ഉപയോഗിക്കുന്നതിന് മുമ്പ്, നിങ്ങളുടെ ഉപകരണത്തിന് സുരക്ഷിത ലോക്ക് സ്‌ക്രീൻ ഉണ്ടായിരിക്കണം."</string>
+    <string name="credentials_configure_lock_screen_button" msgid="253239765216055321">"ലോക്ക് സജ്ജീകരിക്കുക"</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>
@@ -2336,8 +2348,6 @@
     <skip />
     <string name="cant_sync_dialog_title" msgid="2777238588398046285">"സ്വമേധയാ സമന്വയിപ്പിക്കാനായില്ല"</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>
@@ -2351,6 +2361,7 @@
     <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_plan_usage_manage_plans_button_text" msgid="8997761990902708162">"പ്ലാനുകൾ മാനേജുചെയ്യുക"</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>
@@ -2407,7 +2418,7 @@
     <string name="data_usage_app_restrict_dialog" msgid="1466689968707308512">"മൊബൈൽ നെറ്റ്‌വർക്കുകൾ ലഭ്യമാകുമ്പോൾ മാത്രം പാശ്ചാത്തല ഡാറ്റയെ ആശ്രയിക്കുന്ന ഒരു അപ്ലിക്കേഷൻ പ്രവർത്തനം നിർത്തുന്നതിന് ഈ സവിശേഷത ഇടയാക്കും.\n\nഅപ്ലിക്കേഷനിൽ ലഭ്യമായ ക്രമീകരണങ്ങളിൽ കൂടുതൽ ഉചിതമായ ഡാറ്റാ ഉപയോഗ നിയന്ത്രണങ്ങൾ നിങ്ങൾക്ക് കണ്ടെത്താനാകും."</string>
     <string name="data_usage_restrict_denied_dialog" msgid="55012417305745608">"മൊബൈൽ ഡാറ്റക്ക് പരിധി സജ്ജീകരിക്കുമ്പോൾ മാത്രമേ പശ്ചാത്തല ഡാറ്റ പരിമിതപ്പെടുത്താൻ കഴിയൂ."</string>
     <string name="data_usage_auto_sync_on_dialog_title" msgid="2438617846762244389">"ഡാറ്റ സ്വയംസമന്വയിപ്പിക്കൽ ഓണാക്കണോ?"</string>
-    <string name="data_usage_auto_sync_on_dialog" product="tablet" msgid="8581983093524041669">"വെബിൽ നിങ്ങളുടെ അക്കൗണ്ടുകളിൽ വരുത്തുന്ന മാറ്റങ്ങളെല്ലാം നിങ്ങളുടെ ടാബ്‌ലെറ്റിലേക്ക് സ്വയമേവ പകർത്തും.\n\nടാബ്‌ലെറ്റിൽ നിങ്ങൾ വരുത്തുന്ന മാറ്റങ്ങളെല്ലാം ചില അക്കൗണ്ടുകൾ സ്വയമേവ വെബിലേക്കും പകർത്താനിടയുണ്ട്. ഒരു Google അക്കൗണ്ട് ഇത്തരത്തിൽ പ്രവർത്തിക്കുന്നു."</string>
+    <string name="data_usage_auto_sync_on_dialog" product="tablet" msgid="8581983093524041669">"വെബിൽ നിങ്ങളുടെ അക്കൗണ്ടുകളിൽ വരുത്തുന്ന മാറ്റങ്ങളെല്ലാം നിങ്ങളുടെ ടാബ്‌ലെറ്റിലേക്ക് സ്വമേധയാ പകർത്തും.\n\nടാബ്‌ലെറ്റിൽ നിങ്ങൾ വരുത്തുന്ന മാറ്റങ്ങളെല്ലാം ചില അക്കൗണ്ടുകൾ സ്വമേധയാ വെബിലേക്കും പകർത്താനിടയുണ്ട്. ഒരു Google അക്കൗണ്ട് ഇത്തരത്തിൽ പ്രവർത്തിക്കുന്നു."</string>
     <string name="data_usage_auto_sync_on_dialog" product="default" msgid="8651376294887142858">"വെബിൽ നിങ്ങളുടെ അക്കൗണ്ടുകളിൽ വരുത്തുന്ന മാറ്റങ്ങളെല്ലാം നിങ്ങളുടെ ഫോണിലേക്ക് സ്വയമേവ പകർത്തും.\n\nഫോണിൽ നിങ്ങൾ വരുത്തുന്ന മാറ്റങ്ങളെല്ലാം ചില അക്കൗണ്ടുകൾ സ്വയമേവ വെബിലേക്കും പകർത്താനിടയുണ്ട്. ഒരു Google അക്കൗണ്ട് ഇത്തരത്തിൽ പ്രവർത്തിക്കുന്നു."</string>
     <string name="data_usage_auto_sync_off_dialog_title" msgid="9013139130490125793">"ഡാറ്റ സ്വയം സമന്വയിപ്പിക്കൽ ഓഫാക്കണോ?"</string>
     <string name="data_usage_auto_sync_off_dialog" msgid="4025938250775413864">"ഇത് ഡാറ്റയും ബാറ്ററി ഉപയോഗവും സംരക്ഷിക്കുമെങ്കിലും ഏറ്റവും പുതിയ വിവരങ്ങൾ ശേഖരിക്കാൻ നിങ്ങൾക്ക് ഓരോ അക്കൗണ്ടും സ്വമേധയാ സമന്വയിപ്പിക്കേണ്ടതായി വരും. അപ്‌ഡേറ്റുകൾ സംഭവിക്കുമ്പോൾ നിങ്ങൾക്ക് അറിയിപ്പുകൾ ലഭിക്കുകയുമില്ല."</string>
@@ -2436,6 +2447,9 @@
     <string name="data_usage_metered_mobile" msgid="5423305619126978393">"മൊബൈൽ നെറ്റ്‌വർക്കുകൾ"</string>
     <string name="data_usage_metered_wifi" msgid="1761738002328299714">"മീറ്റർ-മാപക വൈഫൈ നെറ്റ്‌വർക്ക്"</string>
     <string name="data_usage_metered_wifi_disabled" msgid="727808462375941567">"മീറ്റർ-മാപക നെറ്റ്‌വർക്കുകൾ തിരഞ്ഞെടുക്കാൻ വൈഫൈ ഓണാക്കുക."</string>
+    <string name="data_usage_metered_auto" msgid="1262028400911918865">"സ്വയമേവ"</string>
+    <string name="data_usage_metered_yes" msgid="9217539611385225894">"മീറ്റർമാപകം അല്ലാത്തത്"</string>
+    <string name="data_usage_metered_no" msgid="4025232961929071789">"മീറ്റർമാപകം"</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>
@@ -2527,9 +2541,6 @@
     <string name="backup_pw_set_button_text" msgid="2387480910044648795">"ബാക്കപ്പ് പാസ്‌വേഡ് സജ്ജീകരിക്കുക"</string>
     <string name="backup_pw_cancel_button_text" msgid="8845630125391744615">"റദ്ദാക്കുക"</string>
     <string name="additional_system_update_settings_list_item_title" msgid="214987609894661992">"അധിക സി‌സ്റ്റം അപ്ഡേറ്റുകൾ"</string>
-    <string name="selinux_status_disabled" msgid="924551035552323327">"പ്രവർത്തനരഹിതമാക്കി"</string>
-    <string name="selinux_status_permissive" msgid="6004965534713398778">"അനുവദനീയം"</string>
-    <string name="selinux_status_enforcing" msgid="2252703756208463329">"നടപ്പിലാക്കുന്നു"</string>
     <string name="ssl_ca_cert_warning" msgid="2045866713601984673">"നെറ്റ്‌വർക്ക് നിരീക്ഷിക്കപ്പെടാം"</string>
     <string name="done_button" msgid="1991471253042622230">"പൂർത്തിയാക്കി"</string>
     <plurals name="ssl_ca_cert_dialog_title" formatted="false" msgid="7145092748045794650">
@@ -2727,11 +2738,12 @@
       <item quantity="other">മറച്ച %d ഇനങ്ങൾ കാണിക്കുക</item>
       <item quantity="one">മറച്ച %d ഇനം കാണിക്കുക</item>
     </plurals>
+    <string name="dashboard_suggestion_condition_footer_content_description" msgid="2898588191174845961">"ചുരുക്കുക"</string>
     <string name="network_dashboard_title" msgid="4771589228992391573">"നെറ്റ്‌വർക്കും ഇന്റർനെറ്റും"</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_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>
@@ -2770,7 +2782,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>
@@ -2786,8 +2798,7 @@
     <string name="keywords_gesture" msgid="3526905012224714078">"ജെസ്‌റ്ററുകൾ"</string>
     <string name="keywords_payment_settings" msgid="5220104934130446416">"പണമടയ്ക്കുക. ടാപ്പുചെയ്യുക, പേയ്‌മെന്റുകൾ"</string>
     <string name="keywords_backup" msgid="470070289135403022">"ബാക്കപ്പ് ചെയ്യൂ"</string>
-    <!-- no translation found for keywords_assist_gesture_launch (813968759791342591) -->
-    <skip />
+    <string name="keywords_assist_gesture_launch" msgid="813968759791342591">"വിരൽചലനം"</string>
     <string name="setup_wifi_nfc_tag" msgid="9028353016222911016">"വൈഫൈ NFC ടാഗ് സജ്ജമാക്കുക"</string>
     <string name="write_tag" msgid="8571858602896222537">"റൈറ്റുചെയ്യുക"</string>
     <string name="status_awaiting_tap" msgid="2130145523773160617">"റൈറ്റുചെയ്യാൻ ഒരു ടാഗ് ടാപ്പുചെയ്യുക..."</string>
@@ -2827,11 +2838,17 @@
     <string name="boot_sounds_title" msgid="567029107382343709">"ശബ്ദങ്ങൾ ഓണാക്കുക"</string>
     <string name="zen_mode_settings_summary_off" msgid="1857165567766351925">"സ്വയമേവയുള്ള നിയമങ്ങളൊന്നും ഓണാക്കിയിട്ടില്ല"</string>
     <plurals name="zen_mode_settings_summary_on" formatted="false" msgid="1216562765753405784">
-      <item quantity="other"><xliff:g id="ON_COUNT">%d</xliff:g> സ്വയമേവയുള്ള നയങ്ങൾ ഓണാക്കി</item>
-      <item quantity="one">1 സ്വയമേവയുള്ള നയം ഓണാക്കി</item>
+      <item quantity="other"><xliff:g id="ON_COUNT">%d</xliff:g> സ്വമേധയായുള്ള നയങ്ങൾ ഓണാക്കി</item>
+      <item quantity="one">1 സ്വമേധയായുള്ള നയം ഓണാക്കി</item>
     </plurals>
-    <string name="zen_mode_settings_title" msgid="842308776768942600">"\'ശല്യപ്പെടുത്തരുത്\' മുൻഗണന"</string>
-    <string name="zen_mode_priority_settings_title" msgid="2623117023031824309">"മുൻഗണനയുള്ളവ മാത്രം"</string>
+    <string name="zen_mode_settings_title" msgid="1066226840983908121">"ശല്യം ചെയ്യരുത്"</string>
+    <string name="zen_mode_behavior_settings_title" msgid="1463303933529313969">"പ്രവർത്തനരീതി"</string>
+    <string name="zen_mode_behavior_allow_title" msgid="3845615648136218141">"ഇനിപ്പറയുന്നതിൽ നിന്നുള്ള ശബ്ദങ്ങളും അലാറമുകളും അനുവദിക്കുക"</string>
+    <string name="zen_mode_behavior_no_sound" msgid="1219626004723208056">"ശബ്‌ദമില്ല"</string>
+    <string name="zen_mode_behavior_total_silence" msgid="6716603819806610626">"ശബ്ദമില്ല (മൊത്തം നിശബ്ദം)"</string>
+    <string name="zen_mode_behavior_no_sound_except" msgid="4968477585788243114">"<xliff:g id="CATEGORIES">%1$s</xliff:g> ഒഴികെ ശബ്ദമില്ല"</string>
+    <!-- no translation found for zen_mode_behavior_alarms_only (2423480992071472963) -->
+    <skip />
     <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>
@@ -2873,13 +2890,15 @@
     <string name="notifications_title" msgid="8086372779371204971">"അറിയിപ്പുകൾ"</string>
     <string name="app_notifications_title" msgid="5810577805218003760">"ആപ്പ് അറിയിപ്പുകൾ"</string>
     <string name="notification_channel_title" msgid="2260666541030178452">"അറിയിപ്പ് വിഭാഗം"</string>
+    <string name="notification_group_title" msgid="7180506440133859601">"അറിയിപ്പ് വിഭാഗ ഗ്രൂപ്പ്"</string>
     <string name="notification_importance_title" msgid="848692592679312666">"പ്രാധാന്യം"</string>
-    <string name="notification_importance_unspecified" msgid="2196023702875112081">"ആപ്പ് തീരുമാനിക്കട്ടെ"</string>
+    <string name="notification_importance_unspecified" msgid="6622173510486113958">"ശ‌ബ്‌ദം അനുവദിക്കുക"</string>
     <string name="notification_importance_blocked" msgid="7938180808339386300">"അറിയിപ്പുകൾ ഒരിക്കലും കാണിക്കരുത്"</string>
     <string name="notification_importance_min" msgid="5455049524984686275">"ശബ്ദപരമോ ദൃശ്യപരമോ ആയ തടസ്സമില്ല"</string>
     <string name="notification_importance_low" msgid="8881468429453766553">"ശബ്‌ദമില്ല"</string>
     <string name="notification_importance_default" msgid="5958338024601957516">"ശബ്ദമുണ്ടാക്കുക"</string>
     <string name="notification_importance_high" msgid="2082429479238228527">"ശബ്ദമുണ്ടാക്കുക, സ്ക്രീനിൽ കാണിക്കുക"</string>
+    <string name="notification_importance_high_silent" msgid="2667033773703765252">"സ്‌ക്രീനിൽ പോപ്പ്"</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>
@@ -2891,7 +2910,7 @@
     <string name="notification_channel_summary_default" msgid="1111749130423589931">"ഉയർന്ന പ്രാധാന്യം"</string>
     <string name="notification_channel_summary_high" msgid="2085017556511003283">"അടിയന്തര പ്രാധാന്യം"</string>
     <string name="default_notification_assistant" msgid="7631945224761430146">"അറിയിപ്പ് സഹായി"</string>
-    <string name="manage_notification_access_title" msgid="7510080164564944891">"അറിയിപ്പ് ക്രമീകരണം"</string>
+    <string name="manage_notification_access_title" msgid="7510080164564944891">"അറിയിപ്പ് ആക്സസ്സ്"</string>
     <string name="work_profile_notification_access_blocked_summary" msgid="8748026238701253040">"ഔദ്യോഗിക പ്രൊഫൈൽ അറിയിപ്പുകളിലേക്കുള്ള ആക്‌സസ്സ് ബ്ലോക്കുചെയ്‌തു"</string>
     <string name="manage_notification_access_summary_zero" msgid="2409912785614953348">"അപ്ലിക്കേഷനുകൾക്ക് അറിയിപ്പുകൾ വായിക്കാനായില്ല"</string>
     <plurals name="manage_notification_access_summary_nonzero" formatted="false" msgid="7930130030691218387">
@@ -2916,15 +2935,19 @@
     <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>
-    <!-- no translation found for picture_in_picture_app_detail_summary (1264019085827708920) -->
-    <skip />
+    <string name="picture_in_picture_app_detail_summary" msgid="1264019085827708920">"ഈ ആപ്പ് തുറന്നിരിക്കുന്ന സമയത്തോ നിങ്ങളത് വിട്ടുകഴിഞ്ഞാലോ (ഉദാഹരണത്തിന്, ഒരു വീഡിയോ കാണുന്നത് തുടരുന്നതിന്) ഒരു ചിത്രത്തിനുള്ളിൽ ചിത്ര വിൻഡോ സൃഷ്‌ടിക്കാൻ ഈ ആപ്പിനെ അനുവദിക്കുക. നിങ്ങൾ ഉപയോഗിക്കുന്ന മറ്റ് ആപ്പുകളുടെ മുകളിൽ ഈ വിൻഡോ പ്രദർശിപ്പിക്കുന്നു."</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="channel_group_notifications_off_desc" msgid="1620950416247316370">"ഈ ഗ്രൂപ്പിൽ പെട്ട അറിയിപ്പുകൾ ഈ ഉപകരണത്തിൽ ദൃശ്യമാകുന്നത് Android ബ്ലോക്ക് ചെയ്യുന്നു"</string>
     <string name="notification_channels" msgid="5346841743182627500">"വിഭാഗങ്ങള്‍"</string>
     <string name="notification_channels_other" msgid="5645317113885788226">"മറ്റുള്ളവ"</string>
+    <plurals name="notification_group_summary" formatted="false" msgid="3420621520561455358">
+      <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="no_channels" msgid="3077375508177744586">"ഈ ആപ്പ് അറിയിപ്പുകളൊന്നും പോസ്‌റ്റുചെയ്‌തിട്ടില്ല"</string>
     <string name="app_settings_link" msgid="8894946007543660906">"ആപ്പിലെ അധിക ക്രമീകരണം"</string>
     <string name="app_notification_listing_summary_zero" msgid="6482582965081108108">"എല്ലാ ആപ്പുകൾക്കുമായി ഓണാക്കി"</string>
@@ -3001,12 +3024,14 @@
     <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>
+    <!-- no translation found for zen_mode_media_system_other (8900209390529859777) -->
+    <skip />
     <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="239685342222975733">"<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>
@@ -3035,6 +3060,7 @@
     <string name="zen_mode_screen_off_visual_interruptions" msgid="4850792880144382633">"സ്ക്രീൻ ഓഫായിരിയ്ക്കുമ്പോൾ"</string>
     <string name="zen_mode_no_visual_interruptions" msgid="8742776003822778472">"സ്ക്രീൻ ഓണോ ഓഫോ ആയിരിക്കുമ്പോൾ"</string>
     <string name="notification_app_settings_button" msgid="6685640230371477485">"അറിയിപ്പ് ക്രമീകരണങ്ങൾ"</string>
+    <string name="suggestion_button_text" msgid="3275010948381252006">"ശരി"</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>
@@ -3140,8 +3166,8 @@
     <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="default_assist_title" msgid="8868488975409247921">"അസിസ്റ്റ് ആപ്പ്"</string>
+    <string name="assist_and_voice_input_title" msgid="1733165754793221197">"അസിസ്റ്റ്, ശബ്ദ ഇൻപുട്ട്"</string>
+    <string name="default_assist_title" msgid="8868488975409247921">"സഹായ ആപ്പ്"</string>
     <string name="assistant_security_warning_title" msgid="8673079231955467177">"<xliff:g id="ASSISTANT_APP_NAME">%s</xliff:g>-നെ നിങ്ങളുടെ സഹായി ആക്കണോ?"</string>
     <string name="assistant_security_warning" msgid="8498726261327239136">"നിങ്ങളുടെ സ്ക്രീനിൽ ദൃശ്യമാകുന്നതോ ആപ്സിനുള്ളിൽ ആക്സസ് ചെയ്യാവുന്നതോ ആയ വിവരങ്ങൾ ഉൾപ്പെടെ, നിങ്ങളുടെ സിസ്റ്റത്തിൽ ഉപയോഗത്തിലുള്ള ആപ്സിനെ കുറിച്ചുള്ള വിവരങ്ങൾ വായിക്കാൻ അസിസ്റ്റന്റിന് കഴിയും."</string>
     <string name="assistant_security_warning_agree" msgid="7710290206928033908">"അംഗീകരിക്കുക"</string>
@@ -3219,6 +3245,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="sms_mirroring_pref" msgid="6475043279147376031">"SMS മിററിംഗ്"</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>
@@ -3226,7 +3253,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>
@@ -3285,7 +3312,7 @@
     <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="permit_write_settings" msgid="658555006453212691">"സിസ്‌റ്റം ക്രമീകരണം മാറ്റാൻ അനുവദിക്കുക"</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>
@@ -3321,7 +3348,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>
@@ -3353,7 +3380,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>
@@ -3380,9 +3407,12 @@
     <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="connectivity_monitor_switch" msgid="9059759348648583421">"കണക്റ്റിവിറ്റി മോണിറ്റർ"</string>
+    <string name="connectivity_monitor_switch_summary" msgid="2828658652378866401">"കണക്‌റ്റിവിറ്റി മോണിറ്റർ, ഒരു പ്രശ്‌നം കണ്ടെത്തുമ്പോൾ അതിന്‍റെ ലോഗുകൾ ശേഖരിക്കുകയും ബഗ് ഫയൽ ചെയ്യാൻ ഉപയോക്താവിന് അറിയിയിപ്പ് നൽകുകയും ചെയ്യും"</string>
+    <string name="connectivity_monitor_toast" msgid="5551859612881173028">"കണക്‌റ്റിവിറ്റി മോണിറ്ററിലെ മാറ്റം പ്രാവര്‍ത്തികമാക്കാൻ ഉപകരണം റീബൂട്ട് ചെയ്യുക"</string>
     <string name="camera_hal_hdrplus_switch" msgid="8377365197105267466">"ക്യാമറ HAL HDR+"</string>
     <string name="camera_hal_hdrplus_toast" msgid="2063703797270055299">"ക്യാമറ HAL HDR+ മാറ്റം പ്രയോഗിക്കാൻ, ഉപകരണം റീബൂട്ട് ചെയ്യുക"</string>
+    <string name="camera_laser_sensor_switch" msgid="8913588990743234440">"ക്യാമറ ലേസർ സെൻസർ"</string>
     <string name="ota_disable_automatic_update" msgid="2319639631655915050">"സ്വയമേവയുള്ള സിസ്റ്റം അപ്ഡേറ്റുകൾ"</string>
     <string name="usage" msgid="2977875522080448986">"ഉപയോഗം"</string>
     <string name="cellular_data_usage" msgid="2155683719898158203">"മൊബൈൽ ഡാറ്റ ഉപയോഗം"</string>
@@ -3402,13 +3432,13 @@
       <item quantity="other"><xliff:g id="COUNT">%1$d</xliff:g> നിയന്ത്രണങ്ങൾ</item>
       <item quantity="one">ഒരു നിയന്ത്രണം</item>
     </plurals>
-    <string name="operator_warning" msgid="1862988028996859195">"ഉപകരണം കണക്കാക്കുന്നതിൽ നിന്നും വ്യത്യസ്തമായിട്ടായിരിക്കാം സേവനദായകൻ കണക്കാക്കുന്നത്"</string>
+    <string name="operator_warning" msgid="1862988028996859195">"ഉപകരണം കണക്കാക്കുന്നതിൽ നിന്നും വ്യത്യസ്തമായിട്ടായിരിക്കാം സേവനദാതാക്കള്‍ കണക്കാക്കുന്നത്"</string>
     <string name="data_used_template" msgid="3245919669966296505">"<xliff:g id="ID_1">%1$s</xliff:g> ഉപയോഗിച്ചു"</string>
     <string name="set_data_warning" msgid="6115364758236594593">"ഡാറ്റ മുന്നറിയിപ്പ് സജ്ജമാക്കുക"</string>
     <string name="data_warning" msgid="209133958008062117">"ഡാറ്റാ മുന്നറിയിപ്പ്"</string>
     <string name="set_data_limit" msgid="2901526323210516923">"ഡാറ്റാ പരിധി സജ്ജീകരിക്കുക"</string>
     <string name="data_limit" msgid="1885406964934590552">"ഡാറ്റാ പരിധി"</string>
-    <string name="data_usage_template" msgid="392191945602400904">"<xliff:g id="ID_2">%2$s</xliff:g> എന്നീ തീയതികൾക്ക് ഇടയിൽ <xliff:g id="ID_1">%1$s</xliff:g> ഉപയോഗിച്ചു"</string>
+    <string name="data_usage_template" msgid="2923744765873163859">"<xliff:g id="ID_1">%1$s</xliff:g> ഉപയോഗിച്ചു <xliff:g id="ID_2">%2$s</xliff:g>"</string>
     <string name="configure" msgid="1029654422228677273">"കോൺഫിഗർ ചെയ്യുക"</string>
     <string name="data_usage_other_apps" msgid="3272872663517382050">"ഉപയോഗത്തിൽ ഉൾപ്പെട്ട മറ്റ് ആപ്‌സ്"</string>
     <plurals name="data_saver_unrestricted_summary" formatted="false" msgid="2635267833484232703">
@@ -3432,7 +3462,7 @@
     <string name="suggestion_additional_fingerprints_summary" msgid="5471253233176471245">"മറ്റൊരു വിരൽ ഉപയോഗിച്ച് അൺലോക്കുചെയ്യുക"</string>
     <string name="battery_saver_on_summary" msgid="9072203872401530722">"ഓൺ / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="battery_saver_off_summary" msgid="8309471955051162327">"ഓഫ്/ <xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="battery_saver_desc_turn_on_auto_never" msgid="6715896635178578813">"ഒരിക്കലും സ്വയമേവ ഓണാക്കരുത്"</string>
+    <string name="battery_saver_desc_turn_on_auto_never" msgid="6715896635178578813">"ഒരിക്കലും സ്വമേധയാ ഓണാകരുത്"</string>
     <string name="battery_saver_desc_turn_on_auto_pct" msgid="7472323223085636533">"ബാറ്ററി നില %1$s ആകുമ്പോൾ സ്വയമേവ ഓണാക്കുക"</string>
     <string name="not_battery_optimizing" msgid="5362861851864837617">"ബാറ്ററി ഒപ്റ്റിമൈസേഷൻ ഉപയോഗിക്കുന്നില്ല"</string>
     <string name="lockscreen_remote_input" msgid="969871538778211843">"ഉപകരണം ലോക്കുചെയ്തിരിക്കുകയാണെങ്കിൽ അറിയിപ്പുകൾക്ക് മറുപടികളോ മറ്റ് ടെക്സ്റ്റുകളോ ടൈപ്പുചെയ്യുന്നത് തടയുക"</string>
@@ -3457,7 +3487,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>
@@ -3477,7 +3507,7 @@
     <string name="button_confirm_convert_fbe" msgid="7101855374850373091">"വൈപ്പുചെയ്ത് പരിവർത്തനം ചെയ്യുക"</string>
     <string name="reset_shortcut_manager_throttling" msgid="6495066467198668994">"കുറുക്കുവഴിമാനേജർ നിരക്ക്-പരിമിതപ്പെടുത്തൽ പുനഃക്രമീകരിക്കുക"</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="387052719462473500">"ലോക്ക് സ്‌ക്രീനിൽ ‌വിവരം നിയന്ത്രിക്കുക"</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="8483187649355540109">"സഹായവും ‌നുറുങ്ങുകളും"</string>
@@ -3485,7 +3515,7 @@
     <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>
+    <string name="bluetooth_disabled" msgid="6244000672828617410">"ഓഫ്"</string>
     <string name="bluetooth_connected_summary" msgid="7672528674593152862">"<xliff:g id="ID_1">%1$s</xliff:g> എന്നതിൽ കണക്‌റ്റുചെയ്‌തു"</string>
     <string name="bluetooth_connected_multiple_devices_summary" msgid="9173661896296663932">"ഒന്നിലധികം ഉപകരണങ്ങളിൽ കണക്‌റ്റുചെയ്‌തു"</string>
     <string name="demo_mode" msgid="2798762752209330277">"സിസ്റ്റം UI ഡെമോ മോഡ്"</string>
@@ -3587,7 +3617,7 @@
     <string name="web_action_enable_title" msgid="4051513950976670853">"ഇൻസ്‌റ്റ‌ന്റ് ആപ്പ്"</string>
     <string name="web_action_enable_summary" msgid="3108127559723396382">"ആപ്പുകൾ ഇൻസ്റ്റാൾ ചെയ്തിട്ടില്ലെങ്കിൽ പോലും, അവയിൽ ലിങ്കുകൾ തുറക്കുക"</string>
     <string name="web_action_section_title" msgid="7364647086538399136">"ഇൻസ്‌റ്റ‌ന്റ് ആപ്പ്"</string>
-    <string name="instant_apps_account" msgid="1433620209791992528">"ഇൻസ്റ്റന്റ് ആപ്പ് അക്കൗണ്ട്"</string>
+    <string name="instant_apps_settings" msgid="8827777916518348213">"ഇൻസ്‌റ്റന്‍റ് ആപ്പ് മുൻഗണനകൾ"</string>
     <string name="domain_url_section_title" msgid="7046835219056428883">"ഇൻസ്‌റ്റാളുചെയ്‌ത അപ്ലിക്കേഷനുകൾ"</string>
     <string name="automatic_storage_manager_activation_warning" msgid="6353100011690933254">"നിങ്ങളുടെ സ്റ്റോറേജ് ഇപ്പോൾ മാനേജുചെയ്യുന്നത് സ്റ്റോറേജ് ​​മാനേജരാണ്"</string>
     <string name="account_for_section_header" msgid="5356566418548737121">"<xliff:g id="USER_NAME">%1$s</xliff:g> എന്ന ഉപയോക്താവിന്റെ അക്കൗണ്ടുകൾ"</string>
@@ -3634,7 +3664,9 @@
     <string name="enterprise_privacy_always_on_vpn_personal" msgid="9217774730260037434">"എപ്പോഴും ഓണായിരിക്കുന്ന VPN നിങ്ങളുടെ സ്വകാര്യ പ്രൊഫൈലിൽ ഓണായിരിക്കുന്നു"</string>
     <string name="enterprise_privacy_always_on_vpn_work" msgid="7244472958208315814">"എല്ലായ്‌പ്പോഴും ഓണായിരിക്കുന്ന VPN നിങ്ങളുടെ ഔദ്യോഗിക പ്രൊഫൈലിൽ ഓണായിരിക്കുന്നു"</string>
     <string name="enterprise_privacy_global_http_proxy" msgid="7936664553416257333">"ഗ്ലോബൽ HTTP പ്രോക്സി സെറ്റ്"</string>
-    <string name="enterprise_privacy_ca_certs" msgid="5885892204903688909">"പരിചിത ക്രെഡൻഷ്യൽ"</string>
+    <string name="enterprise_privacy_ca_certs_device" msgid="2019652712782510262">"വിശ്വാസയോഗ്യമായ ക്രെഡൻഷ്യലുകൾ"</string>
+    <string name="enterprise_privacy_ca_certs_personal" msgid="2279084820904076599">"നിങ്ങളുടെ വ്യക്തിഗത പ്രൊഫൈലിലെ വിശ്വാസയോഗ്യമായ ക്രെഡൻഷ്യലുകൾ"</string>
+    <string name="enterprise_privacy_ca_certs_work" msgid="6187377647815301809">"നിങ്ങളുടെ ഔദ്യോഗിക പ്രൊഫൈലിലെ വിശ്വാസയോഗ്യമായ ക്രെഡൻഷ്യലുകൾ"</string>
     <plurals name="enterprise_privacy_number_ca_certs" formatted="false" msgid="526375234629534165">
       <item quantity="other">ചുരുങ്ങിയത് <xliff:g id="COUNT_1">%d</xliff:g> CA സർട്ടിഫിക്കറ്റുകൾ</item>
       <item quantity="one">ചുരുങ്ങിയത് <xliff:g id="COUNT_0">%d</xliff:g> CA സർട്ടിഫിക്കറ്റ്</item>
@@ -3683,7 +3715,7 @@
     <string name="app_info_storage_title" msgid="5554719444625611987">"ഉപയോഗിച്ച ഇടം"</string>
     <string name="webview_uninstalled_for_user" msgid="1819903169194420983">"(<xliff:g id="USER">%s</xliff:g> എന്നയാൾക്ക് ‌അൺഇൻസ്റ്റാൾചെയ്തു)"</string>
     <string name="webview_disabled_for_user" msgid="1216426047631256825">"(<xliff:g id="USER">%s</xliff:g> എന്നയാൾക്ക് കാണാനാവില്ല)"</string>
-    <string name="autofill_app" msgid="7338387238377914374">"സ്വയമേവ പൂരിപ്പിക്കൽ സേവനം"</string>
+    <string name="autofill_app" msgid="7338387238377914374">"സ്വയം പൂരിപ്പിക്കൽ സേവനം"</string>
     <string name="autofill_keywords" msgid="7485591824120812710">"സ്വയമേവ, പൂരിപ്പിക്കൽ, സ്വയമേവ പൂരിപ്പിക്കൽ"</string>
     <string name="autofill_confirmation_message" msgid="2784869528908005194">"&lt;b&gt;ഈ ആപ്പിനെ നിങ്ങൾ വിശ്വസിക്കുന്നുണ്ടെന്ന് ഉറപ്പുവരുത്തുക&lt;/b&gt; &lt;br/&gt; &lt;br/&gt; &lt;xliff:g id=app_name example=Google Autofill&gt;%1$s&lt;/xliff:g&gt; സ്വയമേവ പൂരിപ്പിക്കേണ്ടത് എന്താണെന്ന് നിർണ്ണയിക്കുന്നതിന് നിങ്ങളുടെ സ്‌ക്രീനിൽ ഉള്ളത് ഉപയോഗിക്കുന്നു."</string>
     <string name="device_theme" msgid="4571803018917608588">"ഉപകരണത്തിന്റെ തീം"</string>
@@ -3697,6 +3729,8 @@
     <string name="carrier_provisioning" msgid="4398683675591893169">"കാരിയര്‍ പ്രൊവിഷനിംഗ് വിവരം"</string>
     <string name="trigger_carrier_provisioning" msgid="3434865918009286187">"കാരിയർ പ്രൊവിഷനിംഗ് തുടങ്ങുക"</string>
     <string name="new_device_suggestion_title" msgid="698847081680980774">"പുതിയതും ആവേശമുണർത്തുന്നതുമായ കാര്യങ്ങൾ എന്തൊക്കെയാണ്?"</string>
-    <string name="new_device_suggestion_summary" msgid="7172709269203435870">"പ്രധാന 5 ഫീച്ചറുകൾ പരിശോധിക്കുക"</string>
+    <string name="new_device_suggestion_summary" product="default" msgid="206396571522515855">"നിങ്ങളുടെ പുതിയ ഫോണിനെ അറിയുക‌"</string>
+    <string name="new_device_suggestion_summary" product="tablet" msgid="393751455688210956">"നിങ്ങളുടെ ‌പുതിയ ‌ടാബ്‌ലെറ്റിനെ അറിയുക‌"</string>
+    <string name="new_device_suggestion_summary" product="device" msgid="2939870049868336652">"നിങ്ങളുടെ പുതിയ ഉപകരണത്തെ അറിയുക"</string>
     <string name="disabled_low_ram_device" msgid="3751578499721173344">"ഈ ഫീച്ചർ ഈ ഉപകരണത്തിൽ ലഭ്യമല്ല"</string>
 </resources>
diff --git a/res/values-mn/arrays.xml b/res/values-mn/arrays.xml
index 039d16a..dd5f969 100644
--- a/res/values-mn/arrays.xml
+++ b/res/values-mn/arrays.xml
@@ -100,8 +100,6 @@
     <!-- no translation found for wifi_security_no_eap:0 (2084555984818107151) -->
     <!-- no translation found for wifi_security_no_eap:1 (397579322683471524) -->
     <!-- no translation found for wifi_security_no_eap:2 (1968820975358150484) -->
-    <!-- no translation found for wifi_ap_security:0 (5251664683198623324) -->
-    <!-- no translation found for wifi_ap_security:1 (7989073072260294673) -->
   <string-array name="wifi_eap_method">
     <item msgid="1160193392455075561">"PEAP"</item>
     <item msgid="7981731051382306293">"TLS"</item>
diff --git a/res/values-mn/strings.xml b/res/values-mn/strings.xml
index e7bbca0..dbb74d1 100644
--- a/res/values-mn/strings.xml
+++ b/res/values-mn/strings.xml
@@ -166,7 +166,7 @@
     <string name="bluetooth_map_acceptance_dialog_text" msgid="8712508202081143737">"%1$s таны зурвасуудад хандалт хийх хүсэлтэй байна. %2$s-д хандалт хийхийг зөвшөөрөх үү?"</string>
     <string name="bluetooth_sap_request" msgid="2669762224045354417">"СИМ хандалтын хүсэлт"</string>
     <string name="bluetooth_sap_acceptance_dialog_text" msgid="4414253873553608690">"<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g> нь таны СИМ картанд хандах хүсэлтэй байна. СИМ картанд хандалтыг нээж өгснөөр холболтын хугацааны туршид төхөөрөмжийн дата холболтыг идэвхгүй болгоно. <xliff:g id="DEVICE_NAME_1">%2$s?</xliff:g>-д хандалтыг нээх"</string>
-    <string name="bluetooth_device_name_summary" msgid="4757990010751789977">"Бусад төхөөрөмжид <xliff:g id="DEVICE_NAME">^1</xliff:g>-р харагдана"</string>
+    <string name="bluetooth_device_name_summary" msgid="522235742194965734">"Бусад төхөөрөмжид “<xliff:g id="DEVICE_NAME">^1</xliff:g>”-р харагдана"</string>
     <string name="bluetooth_paired_device_title" msgid="8638994696317952019">"Таны төхөөрөмж"</string>
     <string name="bluetooth_pairing_page_title" msgid="7712127387361962608">"Шинэ төхөөрөмж холбох"</string>
     <string name="date_and_time" msgid="9062980487860757694">"Огноо &amp; цаг"</string>
@@ -312,6 +312,8 @@
     <string name="zone_auto" msgid="334783869352026648">"Автомат цагийн бүс"</string>
     <string name="zone_auto_summaryOn" msgid="6142830927278458314">"Сүлжээний цагийг ашиглах"</string>
     <string name="zone_auto_summaryOff" msgid="2597745783162041390">"Сүлжээний цагийг ашиглах"</string>
+    <string name="date_time_24hour_auto" msgid="2117383168985653422">"24 цагийн автомат формат"</string>
+    <string name="date_time_24hour_auto_summary" msgid="6351812925651480277">"Бүс нутгийн өгөгдмөл цагийг ашиглах"</string>
     <string name="date_time_24hour_title" msgid="3203537578602803850">"24 цагийн формат"</string>
     <string name="date_time_24hour" msgid="1193032284921000063">"24 цагийн формат ашиглах"</string>
     <string name="date_time_set_time_title" msgid="6296795651349047016">"Цаг"</string>
@@ -372,6 +374,9 @@
     <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="1961957425135180242">"Дараагийн"</string>
+    <string name="setup_fingerprint_enroll_skip_title" msgid="362050541117362034">"Хурууны хээг алгасах уу?"</string>
+    <string name="setup_fingerprint_enroll_skip_after_adding_lock_text" msgid="958990414356204763">"Хурууны хээг тохируулахад хэдхэн минут болно. Та үүнийг алгасвал хурууны хээгээ дараа тохиргоо хэсэгт нэмэх боломжтой."</string>
+    <string name="lock_screen_intro_skip_title" msgid="4988210105913705679">"Дэлгэцийн түгжээг алгасах уу?"</string>
     <string name="lock_screen_intro_skip_dialog_text_frp" product="tablet" msgid="1581834104051243425">"Төхөөрөмжийн хамгаалалтын онцлогийг асаахгүй. Та таблетаа гээсэн,  хулгайд алдсан эсвэл сэргээсэн тохиолдолд үүнийг хэн нэгэн этгээд ашиглахаас сэргийлэх боломжгүй."</string>
     <string name="lock_screen_intro_skip_dialog_text_frp" product="device" msgid="4629503416877189572">"Төхөөрөмжийн хамгаалалтын онцлогийг асаахгүй. Та төхөөрөмжөө гээсэн, хулгайд алдсан эсвэл сэргээсэн тохиолдолд үүнийг хэн нэгэн этгээд ашиглахаас сэргийлэх боломжгүй."</string>
     <string name="lock_screen_intro_skip_dialog_text_frp" product="default" msgid="2423428240245737909">"Төхөөрөмжийн хамгаалалтын онцлогийг асаахгүй. Та утсаа гээсэн, хулгайд алдсан эсвэл сэргээсэн тохиолдолд үүнийг хэн нэгэн этгээд ашиглахаас сэргийлэх боломжгүй."</string>
@@ -457,7 +462,7 @@
     <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="lock_settings_picker_fingerprint_added_security_message" msgid="5768002109707648463">"Хамгаалалтыг сайжруулахын тулд дэлгэцийн нөөц түгжээг тохируулна уу."</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>
@@ -588,6 +593,7 @@
     <string name="lockpassword_pin_no_sequential_digits" msgid="680765285206990584">"Цифр өсөх, буурах, давхцахыг зөвшөөрдөггүй"</string>
     <string name="lockpassword_ok_label" msgid="313822574062553672">"OK"</string>
     <string name="lockpassword_cancel_label" msgid="8818529276331121899">"Цуцлах"</string>
+    <string name="lockpassword_clear_label" msgid="5724429464960458155">"Устгах"</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>
@@ -647,7 +653,7 @@
     <string name="bluetooth_device_context_connect_advanced" msgid="2643129703569788771">"Сонголтууд..."</string>
     <string name="bluetooth_menu_advanced" msgid="8572178316357220524">"Дэлгэрэнгүй"</string>
     <string name="bluetooth_advanced_titlebar" msgid="2142159726881547669">"Bluetooth дэлгэрэнгүй"</string>
-    <string name="bluetooth_empty_list_bluetooth_off" msgid="6351930724051893423">"Bluetoothийг идэвхжүүлсэн үед таны төхөөрөмж ойролцоо байгаа Bluetooth төхөөрөмжүүдтэй холбогдох боломжтой болно."</string>
+    <string name="bluetooth_empty_list_bluetooth_off" msgid="6351930724051893423">"Bluetooth-г идэвхжүүлсэн үед таны төхөөрөмж ойролцоо байгаа Bluetooth төхөөрөмжүүдтэй холбогдох боломжтой болно."</string>
     <string name="ble_scan_notify_text" msgid="1295915006005700650">"Байршлын нарийвчлалыг сайжруулахын тулд системийн апп болон үйлчилгээ нь Bluetooth төхөөрөмжийг илрүүлэх боломжтой. Ta үүнийг <xliff:g id="LINK_BEGIN_0">LINK_BEGIN</xliff:g>Хайлт хийх тохиргоо<xliff:g id="LINK_END_1">LINK_END</xliff:g> дотроос өөрчилж болно."</string>
     <string name="bluetooth_connect_failed" msgid="4500234659813241053">"Холбогдож чадсангүй. Дахин оролдоно уу."</string>
     <string name="device_details_title" msgid="6576953269221085300">"Төхөөрөмжийн дэлгэрэнгүй мэдээлэл"</string>
@@ -704,7 +710,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>
@@ -781,6 +787,7 @@
     <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,6 +824,8 @@
     <string name="wifi_wps_available_first_item" msgid="4422547079984583502">"WPS боломжтой"</string>
     <string name="wifi_wps_available_second_item" msgid="8427520131718215301">" (WPS боломжтой)"</string>
     <string name="wifi_wps_nfc_enter_password" msgid="2288214226916117159">"Сүлжээний нууц үгээ оруулна уу"</string>
+    <string name="wifi_carrier_connect" msgid="8174696557882299911">"Оператор компанийн Wi‑Fi сүлжээ"</string>
+    <string name="wifi_carrier_content" msgid="4634077285415851933">"<xliff:g id="NAME">%1%s</xliff:g>-р холбогдох"</string>
     <string name="wifi_scan_always_turnon_message" msgid="203123538572122989">"Байршлын нарийвчлалыг сайжруулах болон бусад зорилгоор <xliff:g id="APP_NAME">%1$s</xliff:g> нь Wi-Fi хаалттай байгаа хэдий ч сүлжээний сканийг идэвхжүүлэхийг хүсч байна.\n\nҮүнийг скан хийхийг хүсч байгаа бүх апп-д зөвшөөрөх үү?"</string>
     <string name="wifi_scan_always_turnoff_message" msgid="5538901671131941043">"Үүнийг унтраахын тулд дээрх цэсний Дэлгэрэнгүй рүү очно уу."</string>
     <string name="wifi_scan_always_confirm_allow" msgid="5355973075896817232">"Зөвшөөрөх"</string>
@@ -834,6 +843,7 @@
     <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_modify" msgid="6100248070440710782">"Өөрчлөх"</string>
     <string name="wifi_failed_forget_message" msgid="1348172929201654986">"Сүлжээг мартаж чадсангүй"</string>
     <string name="wifi_save" msgid="3331121567988522826">"Хадгалах"</string>
     <string name="wifi_failed_save_message" msgid="6650004874143815692">"Сүлжээг хадгалж чадсангүй"</string>
@@ -846,6 +856,7 @@
     <string name="wifi_advanced_titlebar" msgid="4485841401774142908">"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_title" msgid="3471132676909349382">"Сүлжээний мэдээлэл"</string>
     <string name="wifi_details_subnet_mask" msgid="6720279144174924410">"Subnet маск"</string>
     <string name="wifi_details_dns" msgid="8648826607751830768">"DNS"</string>
     <string name="wifi_details_ipv6_address_header" msgid="6734119149106422148">"IPv6 хаяг"</string>
@@ -878,16 +889,15 @@
     <string name="wifi_p2p_cancel_connect_title" msgid="255267538099324413">"Урилгыг цуцлах уу?"</string>
     <string name="wifi_p2p_cancel_connect_message" msgid="7477756213423749402">"Та <xliff:g id="PEER_NAME">%1$s</xliff:g>-тай холбох урилгыг цуцлахыг хүсэж байна уу?"</string>
     <string name="wifi_p2p_delete_group_message" msgid="834559380069647086">"Энэ бүлгэмийг устгах уу?"</string>
-    <string name="wifi_tether_checkbox_text" msgid="1847167643625779136">"Зөөврийн Wi‑Fi сүлжээний цэг"</string>
     <string name="wifi_hotspot_checkbox_text" msgid="7763495093333664887">"Wi-Fi хотспот"</string>
     <string name="wifi_hotspot_off_subtext" msgid="5466126533609394170">"Интернэт эсвэл агуулгыг бусад төхөөрөмжтэй хуваалцаагүй"</string>
     <string name="wifi_hotspot_tethering_on_subtext" product="tablet" msgid="5752490509369962007">"Энэ таблетын интернэт холболтыг сүлжээний цэгээр хуваалцаж байна"</string>
     <string name="wifi_hotspot_tethering_on_subtext" product="default" msgid="6461075246164300670">"Энэ утасны интернэт холболтыг сүлжээний цэгээр хуваалцаж байна"</string>
     <string name="wifi_hotspot_on_local_only_subtext" msgid="2068110388011294735">"Апп агуулга хуваалцаж байна. Интернэт холболтыг хуваалцахын тулд сүлжээний цэгийг унтрааж дахин асаана уу"</string>
-    <string name="wifi_hotspot_name_title" msgid="1341735529132128887">"Wi‑Fi-н нэр"</string>
+    <string name="wifi_hotspot_name_title" msgid="8237000746618636778">"Сүлжээний цэгийн нэр"</string>
     <string name="wifi_hotspot_name_summary_connecting" msgid="3378299995508671967">"<xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>-г асааж байна..."</string>
     <string name="wifi_hotspot_name_summary_connected" msgid="3888672084861445362">"Бусад төхөөрөмж <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>-д холбогдох боломжтой"</string>
-    <string name="wifi_hotspot_password_title" msgid="1955592302902091281">"Wi-Fi нууц үг"</string>
+    <string name="wifi_hotspot_password_title" msgid="8676859981917573801">"Сүлжээний цэгийн нууц үг"</string>
     <string name="wifi_hotspot_ap_band_title" msgid="1165801173359290681">"AP Band"</string>
     <string name="wifi_hotspot_footer_info_regular" msgid="1203489406068036455">"Бусад төхөөрөмждөө Wi‑Fi холболт үүсгэхийн тулд сүлжээний цэгийг ашиглана уу. Сүлжээний цэг нь таны мобайл датаны холболтоор интернэтэд холбогдоно. Мобайл датаны нэмэлт төлбөр гарна."</string>
     <string name="wifi_hotspot_footer_info_local_only" msgid="857988412470694109">"Апп ойролцоох төхөөрөмжтэй агуулга хуваалцахын тулд сүлжээний цэг үүсгэх боломжтой."</string>
@@ -898,7 +908,6 @@
     <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">"АндройдСүлжээнийЦэг"</string>
     <string name="wifi_calling_settings_title" msgid="4102921303993404577">"Wi-Fi дуудлага"</string>
     <string name="wifi_calling_suggestion_title" msgid="9008010480466359578">"Wi-Fi Дуудлагыг асаах"</string>
@@ -939,7 +948,7 @@
     <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="emergency_address_summary" msgid="3266760199681945746">"Wi-Fi-р яаралтай дуудлага хийх үед яаралтай тусламжийн үйлчилгээнээс танд тусламж үзүүлэх байршлын хаяг"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"Дэлгэц"</string>
     <string name="sound_settings" msgid="5534671337768745343">"Дуу"</string>
     <string name="all_volume_title" msgid="4296957391257836961">"Дууны хэмжээ"</string>
@@ -993,6 +1002,7 @@
     <string name="search_settings" msgid="1910951467596035063">"Хайх"</string>
     <string name="search_settings_summary" msgid="9205656546570654169">"Хайлтын тохиргоо болон түүхийг удирдах"</string>
     <string name="search_settings_no_results" msgid="8799027492641230999">"Илэрц алга"</string>
+    <string name="search_clear_history" msgid="4196658962573162457">"Түүхийг устгах"</string>
     <string name="display_settings" msgid="7965901687241669598">"Дэлгэц"</string>
     <string name="accelerometer_title" msgid="7854608399547349157">"Дэлгэцийг автоматаар эргүүлэх"</string>
     <string name="color_mode_title" msgid="3159275920408338215">"Тод өнгө"</string>
@@ -1122,7 +1132,6 @@
     <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>
     <string name="device_status_activity_title" msgid="1411201799384697904">"Статус"</string>
     <string name="device_status" msgid="607405385799807324">"Статус"</string>
@@ -1150,7 +1159,6 @@
     <string name="status_wifi_mac_address" msgid="2202206684020765378">"Wi-Fi MAC хаяг"</string>
     <string name="status_bt_address" msgid="4195174192087439720">"Bluetooth хаяг"</string>
     <string name="status_serial_number" msgid="2257111183374628137">"Сериалын дугаар"</string>
-    <string name="status_unavailable" msgid="7862009036663793314">"Байхгүй"</string>
     <string name="status_up_time" msgid="7294859476816760399">"Асаалттай байсан хугацаа"</string>
     <string name="status_awake_time" msgid="2393949909051183652">"Идэвхтэй байх хугацаа"</string>
     <string name="internal_memory" msgid="9129595691484260784">"Дотоод сан"</string>
@@ -1326,6 +1334,7 @@
     <string name="menu_restore" msgid="8260067415075573273">"Үндсэн рүү сэргээх"</string>
     <string name="restore_default_apn_completed" msgid="2824775307377604897">"Үндсэн APN тохиргоог дахин шинэчилж дууслаа."</string>
     <string name="reset_dashboard_title" msgid="6254873816990678620">"Сонголтыг шинэчлэх"</string>
+    <string name="reset_dashboard_summary" msgid="4851012632493522755">"Сүлжээ, апп эсвэл төхөөрөмжийг шинэчлэх боломжтой"</string>
     <string name="reset_network_title" msgid="6166025966016873843">"Wi-Fi, мобайл &amp; Bluetooth-г шинэчлэх"</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>
@@ -1334,17 +1343,14 @@
     <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="6617679904229218425">"Бүх өгөгдлийг устгах (Үйлдвэрийн тохиргоонд буцаах)"</string>
-    <plurals name="master_clear_with_account_summary" formatted="false" msgid="5911377203778818712">
-      <item quantity="other"><xliff:g id="ACCOUNT_COUNT">%1$d</xliff:g> бүртгэлийг шинэчилнэ</item>
-      <item quantity="one">1 бүртгэлийг шинэчилнэ</item>
-    </plurals>
-    <string name="master_clear_summary" msgid="6902443944660426951">"Дотоод сангийн бүх өгөгдлийг шинэчлэх болно"</string>
+    <string name="master_clear_title" msgid="3531267871084279512">"Бүх өгөгдлийг устгах (үйлдвэрийн тохиргоонд шинэчлэх)"</string>
     <string name="master_clear_desc" product="tablet" msgid="9146059417023157222">"Энэ таны таблетын "<b>"дотоод сангаас"</b>"таны \n\n"<li>"Google акаунт"</li>\n<li>"Системийн болон апп өгөгдөл болон тохиргоо"</li>\n<li>"Татаж авсан апп-уудыг"</li>" оруулан бүх өгөгдлийг устгах болно"</string>
-    <string name="master_clear_desc" product="default" msgid="4800386183314202571">"Энэ таны утасны "<b>"дотоод сангаас"</b>"таны \n\n"<li>"Google акаунт"</li>\n<li>"Системийн болон апп өгөгдөл болон тохиргоо"</li>\n<li>"Татаж авсан апп-уудыг"</li>" оруулан бүх өгөгдлийг устгах болно"</string>
+    <string name="master_clear_desc" product="default" msgid="4800386183314202571">"Энэ таны утасны "<b>"дотоод сангаас"</b>" таны \n\n"<li>"Google бүртгэл"</li>\n<li>"Системийн болон апп өгөгдөл болон тохиргоо"</li>\n<li>"Татаж авсан аппуудыг"</li>" оруулан бүх өгөгдлийг устгах болно"</string>
     <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"Та одоогоор дараах акаунтуудаар нэвтэрсэн байна:\n"</string>
     <string name="master_clear_other_users_present" product="default" msgid="5161423070702470742">\n\n"Энэ төхөөрөмж дээр өөр хэрэглэгчид байна.\n"</string>
     <string name="master_clear_desc_also_erases_external" msgid="1903185203791274237"><li>"Хөгжим"</li>\n<li>"Зураг"</li>\n<li>"Бусад хэрэглэгчийн өгөгдөл"</li></string>
+    <string name="master_clear_desc_also_erases_esim" msgid="312352697653096008"><li>"eSIM-н оператор компани"</li></string>
+    <string name="master_clear_desc_no_cancel_mobile_plan" msgid="5460926449093211144">\n\n"Энэ нь таны мобайл үйлчилгээний төлөвлөгөөг цуцлахгүй."</string>
     <string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="7744115866662613411">\n\n"Хөгжим, зураг болон бусад хэрэглэгчийн өгөгдлийг цэвэрлэхийн тулд "<b>"USB санг"</b>" арилгах шаардлагатай."</string>
     <string name="master_clear_desc_erase_external_storage" product="default" msgid="4801026652617377093">\n\n"Хөгжим, зураг болон бусад хэрэглэгчийн өгөгдлийг цэвэрлэхийн тулд "<b>"SD картыг"</b>" арилгах шаардлагатай."</string>
     <string name="erase_external_storage" product="nosdcard" msgid="969364037450286809">"USB санг арилгах"</string>
@@ -1461,15 +1467,16 @@
     <string name="settings_safetylegal_activity_title" msgid="6901214628496951727">"Аюулгүй байдлын мэдээлэл"</string>
     <string name="settings_safetylegal_activity_unreachable" msgid="250674109915859456">"Танд дата холболт байхгүй байна. Энэ мэдээллийг одоо харахын тулд Интернэтэд холбогдсон дурын компьютерээс %s руу очно уу."</string>
     <string name="settings_safetylegal_activity_loading" msgid="8059022597639516348">"Ачаалж байна..."</string>
-    <string name="lockpassword_choose_your_password_header" msgid="8624900666929394990">"Нууц үгээ сонгоно уу"</string>
-    <string name="lockpassword_choose_your_password_header_for_fingerprint" msgid="6624409510609085450">"Хурууны хээ ашиглахын тулд нууц үг тохируулах"</string>
-    <string name="lockpassword_choose_your_pattern_header" msgid="6949761069941694050">"Өөрийн хээг сонгоно уу"</string>
-    <string name="lockpassword_choose_your_pattern_header_for_fingerprint" msgid="5901096361617543819">"Хурууны хээ ашиглахын тулд загвар тохируулах"</string>
-    <string name="lockpassword_choose_your_pin_header" msgid="7598849519816138302">"Өөрийн PIN-г сонгоно уу"</string>
-    <string name="lockpassword_choose_your_pin_header_for_fingerprint" msgid="765344692615917183">"Хурууны хээ ашиглахын тулд ПИН тохируулах"</string>
-    <string name="lockpassword_confirm_your_password_header" msgid="6308478184889846633">"Нууц үгээ баталгаажуулна уу"</string>
+    <string name="lockpassword_choose_your_screen_lock_header" msgid="3872462096767152394">"Дэлгэцийн түгжээ тохируулах"</string>
+    <string name="lockpassword_choose_your_password_message" msgid="1197569283524841412">"Аюулгүйн үүднээс нууц үг тохируулах"</string>
+    <string name="lockpassword_choose_your_password_header_for_fingerprint" msgid="2541818487015343503">"Хурууны хээ ашиглахын тулд нууц үг тохируулна уу"</string>
+    <string name="lockpassword_choose_your_pattern_header_for_fingerprint" msgid="7709785406243556723">"Хурууны хээ ашиглахын тулд загвар тохируулна уу"</string>
+    <string name="lockpassword_choose_your_pin_message" msgid="1875420718677275646">"Аюулгүйн үүднээс ПИН тохируулах"</string>
+    <string name="lockpassword_choose_your_pin_header_for_fingerprint" msgid="1549639053195796674">"Хурууны хээ ашиглах бол ПИН тохируулна уу"</string>
+    <string name="lockpassword_choose_your_pattern_message" msgid="5986983400689720015">"Аюулгүй байдлын үүднээс загвар тохируулна уу"</string>
+    <string name="lockpassword_confirm_your_password_header" msgid="1266027268220850931">"Нууц үгээ дахин оруулах"</string>
     <string name="lockpassword_confirm_your_pattern_header" msgid="7543433733032330821">"Хээгээ баталгаажуулна уу"</string>
-    <string name="lockpassword_confirm_your_pin_header" msgid="49038294648213197">"Өөрийн PIN-г баталгаажуулна уу"</string>
+    <string name="lockpassword_confirm_your_pin_header" msgid="7744513791910572550">"ПИН-ээ дахин оруулах"</string>
     <string name="lockpassword_confirm_passwords_dont_match" msgid="5140892109439191415">"Нууц үг таарахгүй байна."</string>
     <string name="lockpassword_confirm_pins_dont_match" msgid="7226244811505606217">"PIN таарахгүй байна"</string>
     <string name="lockpassword_choose_lock_generic_header" msgid="3811438094903786145">"Тайлах сонголт"</string>
@@ -1488,6 +1495,12 @@
     <string name="lockpassword_strong_auth_required_work_pattern" msgid="3003781907040522053">"Хамгаалалтыг сайжруулахын тулд ажлынхаа зурган түгжээг ашиглана уу"</string>
     <string name="lockpassword_strong_auth_required_work_pin" msgid="3367491332598821552">"Хамгаалалтыг сайжруулахын тулд ажлынхаа ПИН-ийг оруулна уу"</string>
     <string name="lockpassword_strong_auth_required_work_password" msgid="8159775129968582940">"Хамгаалалтыг сайжруулахын тулд ажлынхаа нууц үгийг оруулна уу"</string>
+    <string name="lockpassword_confirm_your_pattern_details_frp" msgid="6757336656791723193">"Таны утсыг үйлдвэрийн тохиргоонд шинэчилсэн байна. Энэ утсыг ашиглахын тулд өмнөх загвараа оруулна уу."</string>
+    <string name="lockpassword_confirm_your_pin_details_frp" msgid="826520613445990470">"Таны утсыг үйлдвэрийн тохиргоонд шинэчилсэн байна. Энэ утсыг ашиглахын тулд өмнөх ПИН-ээ оруулна уу."</string>
+    <string name="lockpassword_confirm_your_password_details_frp" msgid="8944081074615739040">"Таны утсыг үйлдвэрийн тохиргоонд шинэчилсэн байна. Энэ утсыг ашиглахын тулд өмнөх нууц үгээ оруулна уу."</string>
+    <string name="lockpassword_confirm_your_pattern_header_frp" msgid="2898036091609128286">"Загварыг баталгаажуулах"</string>
+    <string name="lockpassword_confirm_your_pin_header_frp" msgid="4141601774778898803">"ПИН баталгаажуулах"</string>
+    <string name="lockpassword_confirm_your_password_header_frp" msgid="3762615419295360480">"Нууц үг баталгаажуулах"</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>
@@ -1496,7 +1509,7 @@
     <string name="lockpattern_change_lock_pin_label" msgid="266707138486731661">"Тайлах PIN өөрчлөх"</string>
     <string name="lockpattern_recording_intro_header" msgid="308287052221942814">"Тайлах хээг зурна уу"</string>
     <string name="lockpattern_recording_intro_footer" msgid="1118579101409152113">"Цэсийг дарж туслам аваарай."</string>
-    <string name="lockpattern_recording_inprogress" msgid="6667844062721656773">"Дуусгаад хуруугаа аваарай"</string>
+    <string name="lockpattern_recording_inprogress" msgid="6667844062721656773">"Дуусаад хуруугаа аваарай"</string>
     <string name="lockpattern_recording_incorrect_too_short" msgid="1348234155120957561">"Хамгийн багадаа <xliff:g id="NUMBER">%d</xliff:g> цэгийг холбоно уу. Дахиж оролдоорой."</string>
     <string name="lockpattern_pattern_entered_header" msgid="4316818983675591604">"Хээ бичигдсэн"</string>
     <string name="lockpattern_need_to_confirm" msgid="8054853451639221265">"Баталгаажуулахын тулд хээг дахиад зурна уу"</string>
@@ -1537,7 +1550,6 @@
     <string name="install_applications_title" msgid="4987712352256508946">"Бүх апп эх үүсвэрийг зөвшөөрөх"</string>
     <string name="recent_app_category_title" msgid="6673071268966003928">"Саяхан нээсэн апп"</string>
     <string name="see_all_apps_title" msgid="1317153498074308438">"Бүх <xliff:g id="COUNT">%1$d</xliff:g> аппыг харах"</string>
-    <string name="recent_app_summary" msgid="3366446669844932300">"<xliff:g id="TIME">^1</xliff:g>-н өмнө"</string>
     <string name="install_all_warning" product="tablet" msgid="8310489909586138165">"Таны таблет болон хувийн өгөгдөл тодорхойгүй апп суулгасан тохиолдолд гэмтэж болзошгүй. Энэ эх сурвалжаас апп суулгаснаар та тухайн аппыг ашигласнаас үүдэн таны таблетад гэмтэл гарах, эсвэл өгөгдөл устах зэрэг гарсан эрсдлийг хариуцна гэдгээ зөвшөөрч байна."</string>
     <string name="install_all_warning" product="default" msgid="1952257127370115988">"Таны утас болон хувийн өгөгдөл тодорхойгүй апп суулгасан тохиолдолд гэмтэж болзошгүй. Энэ эх сурвалжаас апп суулгаснаар та тухайн аппыг ашигласнаас үүдэн таны утсанд гэмтэл гарах, эсвэл өгөгдөл устах зэрэг гарсан эрсдлийг хариуцна гэдгээ зөвшөөрч байна."</string>
     <string name="advanced_settings" msgid="1777249286757067969">"Дэлгэрэнгүй тохиргоо"</string>
@@ -1586,7 +1598,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>
@@ -1801,7 +1813,7 @@
     <string name="accessibility_settings_summary" msgid="981260486011624939">"Дэлгэц уншигч, дэлгэц, харилцан үйлдлийн хяналт"</string>
     <string name="vision_settings_title" msgid="4204111425716868288">"Харааны тохиргоо"</string>
     <string name="vision_settings_description" msgid="5679491180156408260">"Та энэ төхөөрөмжийг өөрийнхөө шаардлагад нийцүүлэн тохируулах боломжтой. Эдгээр сонголтуудыг дараа нь Тохиргоо хэсэгт өөрчлөх боломжтой."</string>
-    <string name="vision_settings_suggestion_title" msgid="917294957154878441">"Фонтын хэмжээг ихэсгэх"</string>
+    <string name="vision_settings_suggestion_title" msgid="8058794060304707004">"Фонтын хэмжээг өөрчлөх"</string>
     <string name="screen_reader_category_title" msgid="7739154903913400641">"Дэлгэц уншигч"</string>
     <string name="audio_and_captions_category_title" msgid="3420727114421447524">"Аудио &amp; дэлгэцийн текст"</string>
     <string name="display_category_title" msgid="685461049938269166">"Дэлгэц"</string>
@@ -1838,7 +1850,6 @@
     <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="preference_summary_default_combination" msgid="8532964268242666060">"<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>
@@ -1957,12 +1968,14 @@
     <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_whitelisted" msgid="7375400051141016808">"Аппыг батерейны ашиглалтад оновчлох боломжгүй"</string>
+    <string name="background_activity_warning_dialog_title" msgid="2216249969149568871">"Арын үйл ажиллагааг хязгаарлах уу?"</string>
+    <string name="background_activity_warning_dialog_text" msgid="7049624449246121981">"Та арын үйл ажиллагааг аппад хязгаарласан тохиолдолд апп буруу ажиллаж болзошгүй"</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" msgid="6393929085382334341">"Бүрэн цэнэглэснээс хойших аппын ашиглалт (<xliff:g id="RELATIVE_TIME">^1</xliff:g>)"</string>
+    <string name="power_usage_list_summary_device" msgid="4461926045610455423">"Бүрэн цэнэглэснээс хойших төхөөрөмжийн ашиглалт (<xliff:g id="RELATIVE_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>
@@ -2208,14 +2221,14 @@
     <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">"Та жуухын санг ашиглаж эхлэхийн өмнө дэлгэцийн түгжээний PIN эсхүл нууц үгийг тохируулах хэрэгтэй."</string>
+    <string name="credentials_configure_lock_screen_hint" msgid="8058230497337529036">"Та итгэмжлэлийн сан ашиглахын өмнө таны төхөөрөмжид аюулгүй түгжигдсэн дэлгэц байх шаардлагатай"</string>
+    <string name="credentials_configure_lock_screen_button" msgid="253239765216055321">"ТҮГЖЭЭГ ТОХИРУУЛАХ"</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>
@@ -2335,8 +2348,6 @@
     <skip />
     <string name="cant_sync_dialog_title" msgid="2777238588398046285">"Гараар синк хийх боломжгүй"</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">"Андройдыг эхлүүлэхийн тулд нууц үгээ оруулна уу"</string>
     <string name="enter_pin" msgid="5305333588093263790">"Андройдыг эхлүүлэхийн тулд PIN оруулна уу"</string>
     <string name="enter_pattern" msgid="4187435713036808566">"Андройдыг эхлүүлэхийн тулд хээгээ зурна уу"</string>
@@ -2350,6 +2361,7 @@
     <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_plan_usage_manage_plans_button_text" msgid="8997761990902708162">"Төлөвлөгөөг удирдах"</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>
@@ -2409,7 +2421,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>
@@ -2435,6 +2447,9 @@
     <string name="data_usage_metered_mobile" msgid="5423305619126978393">"Мобайл сүлжээнүүд"</string>
     <string name="data_usage_metered_wifi" msgid="1761738002328299714">"Тоолууртай Wi‑Fi сүлжээ"</string>
     <string name="data_usage_metered_wifi_disabled" msgid="727808462375941567">"Тоолууртай сүлжээ сонгохын тулд Wi-Fi асаагаарай."</string>
+    <string name="data_usage_metered_auto" msgid="1262028400911918865">"Автомат"</string>
+    <string name="data_usage_metered_yes" msgid="9217539611385225894">"Хязгаартай"</string>
+    <string name="data_usage_metered_no" msgid="4025232961929071789">"Хязгааргүй"</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>
@@ -2526,9 +2541,6 @@
     <string name="backup_pw_set_button_text" msgid="2387480910044648795">"Нөөшлөлтийн нууц үгийг тохируулах"</string>
     <string name="backup_pw_cancel_button_text" msgid="8845630125391744615">"Цуцлах"</string>
     <string name="additional_system_update_settings_list_item_title" msgid="214987609894661992">"Системийн нэмэлт шинэчлэлтүүд"</string>
-    <string name="selinux_status_disabled" msgid="924551035552323327">"Идэвхгүйжүүлсэн"</string>
-    <string name="selinux_status_permissive" msgid="6004965534713398778">"Зөвшөөрсөн"</string>
-    <string name="selinux_status_enforcing" msgid="2252703756208463329">"Хүчилж байна"</string>
     <string name="ssl_ca_cert_warning" msgid="2045866713601984673">"Сүлжээ хянагдаж байж болзошгүй"</string>
     <string name="done_button" msgid="1991471253042622230">"Дууссан"</string>
     <plurals name="ssl_ca_cert_dialog_title" formatted="false" msgid="7145092748045794650">
@@ -2726,6 +2738,7 @@
       <item quantity="other">Нуусан %d зүйлийг харуулах</item>
       <item quantity="one">Нуусан %d зүйлийг харуулах</item>
     </plurals>
+    <string name="dashboard_suggestion_condition_footer_content_description" msgid="2898588191174845961">"Буулгах"</string>
     <string name="network_dashboard_title" msgid="4771589228992391573">"Сүлжээ &amp; интернэт"</string>
     <string name="network_dashboard_summary_mobile" msgid="3851083934739500429">"мобайл"</string>
     <string name="network_dashboard_summary_data_usage" msgid="3843261364705042212">"дата ашиглалт"</string>
@@ -2828,8 +2841,14 @@
       <item quantity="other"><xliff:g id="ON_COUNT">%d</xliff:g> автомат дүрмийг асаасан</item>
       <item quantity="one">1 автомат дүрмийг асаасан</item>
     </plurals>
-    <string name="zen_mode_settings_title" msgid="842308776768942600">"Бүү саад бол сонголт"</string>
-    <string name="zen_mode_priority_settings_title" msgid="2623117023031824309">"Зөвхөн хамгийн чухал гэснийг зөвшөөрнө"</string>
+    <string name="zen_mode_settings_title" msgid="1066226840983908121">"Бүү саад бол"</string>
+    <string name="zen_mode_behavior_settings_title" msgid="1463303933529313969">"Тохиргоо"</string>
+    <string name="zen_mode_behavior_allow_title" msgid="3845615648136218141">"Дуу, чичиргээг дараахаас зөвшөөрөх"</string>
+    <string name="zen_mode_behavior_no_sound" msgid="1219626004723208056">"Дуугүй"</string>
+    <string name="zen_mode_behavior_total_silence" msgid="6716603819806610626">"Дуугүй (Бүгдийг нь дуугүй болгох)"</string>
+    <string name="zen_mode_behavior_no_sound_except" msgid="4968477585788243114">"<xliff:g id="CATEGORIES">%1$s</xliff:g>-с өөр дуу алга"</string>
+    <!-- no translation found for zen_mode_behavior_alarms_only (2423480992071472963) -->
+    <skip />
     <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>
@@ -2860,7 +2879,7 @@
     <string name="lock_screen_notifications_title" msgid="6173076173408887213">"Түгжигдсэн дэлгэц дээр"</string>
     <string name="lock_screen_notifications_summary_show" msgid="6407527697810672847">"Бүх мэдэгдлийн агуулгыг харуулах"</string>
     <string name="lock_screen_notifications_summary_hide" msgid="7891552853357258782">"Нууц сэдэвтэй мэдэгдлийн агуулгыг нуух"</string>
-    <string name="lock_screen_notifications_summary_disable" msgid="859628910427886715">"Мэдэгдлийг харуулахгүй"</string>
+    <string name="lock_screen_notifications_summary_disable" msgid="859628910427886715">"Огт мэдэгдэл харуулахгүй"</string>
     <string name="lock_screen_notifications_interstitial_message" msgid="6164532459432182244">"Таны төхөөрөмж түгжээтэй үед мэдэгдлийг хэрхэн харуулах вэ?"</string>
     <string name="lock_screen_notifications_interstitial_title" msgid="1416589393106326972">"Мэдэгдэл"</string>
     <string name="lock_screen_notifications_summary_show_profile" msgid="835870815661120772">"Ажлын мэдэгдлийн бүх агуулгыг харуулах"</string>
@@ -2871,13 +2890,15 @@
     <string name="notifications_title" msgid="8086372779371204971">"Мэдэгдэл"</string>
     <string name="app_notifications_title" msgid="5810577805218003760">"Aпп мэдэгдлүүд"</string>
     <string name="notification_channel_title" msgid="2260666541030178452">"Мэдэгдлийн ангилал"</string>
+    <string name="notification_group_title" msgid="7180506440133859601">"Мэдэгдлийн ангиллын бүлэг"</string>
     <string name="notification_importance_title" msgid="848692592679312666">"Ач холбогдол"</string>
-    <string name="notification_importance_unspecified" msgid="2196023702875112081">"Апп-р шийдүүлнэ үү"</string>
+    <string name="notification_importance_unspecified" msgid="6622173510486113958">"Дууг зөвшөөрөх"</string>
     <string name="notification_importance_blocked" msgid="7938180808339386300">"Мэдэгдлийг хэзээ ч харуулахгүй"</string>
     <string name="notification_importance_min" msgid="5455049524984686275">"Дуугүй, эсвэл үзэхэд саадгүй"</string>
     <string name="notification_importance_low" msgid="8881468429453766553">"Дуугүй"</string>
     <string name="notification_importance_default" msgid="5958338024601957516">"Дуу гаргах"</string>
     <string name="notification_importance_high" msgid="2082429479238228527">"Дуу гаргаж, дэлгэцэд гэнэт гаргах"</string>
+    <string name="notification_importance_high_silent" msgid="2667033773703765252">"Дэлгэцэд гаргах"</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>
@@ -2918,8 +2939,13 @@
     <string name="loading_notification_apps" msgid="5031818677010335895">"Апп-уудыг ачаалж байна..."</string>
     <string name="app_notifications_off_desc" msgid="4882445501376722969">"Андройд энэ аппын мэдэгдлийг энэ төхөөрөмжид харуулахыг хориглож байна"</string>
     <string name="channel_notifications_off_desc" msgid="5899225298718840635">"Андройд энэ мэдэгдлийн ангиллыг энэ төхөөрөмжид харуулахыг хориглож байна"</string>
+    <string name="channel_group_notifications_off_desc" msgid="1620950416247316370">"Андройд энэ мэдэгдлийн бүлгийг энэ төхөөрөмжид харуулахыг хориглож байна"</string>
     <string name="notification_channels" msgid="5346841743182627500">"Ангилал"</string>
     <string name="notification_channels_other" msgid="5645317113885788226">"Бусад"</string>
+    <plurals name="notification_group_summary" formatted="false" msgid="3420621520561455358">
+      <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="no_channels" msgid="3077375508177744586">"Энэ апп ямар ч мэдэгдэл нийтлээгүй"</string>
     <string name="app_settings_link" msgid="8894946007543660906">"Аппын нэмэлт тохиргоо"</string>
     <string name="app_notification_listing_summary_zero" msgid="6482582965081108108">"Бүх апп-д асаасан"</string>
@@ -2983,7 +3009,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>
@@ -2996,12 +3022,14 @@
     <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>
+    <!-- no translation found for zen_mode_media_system_other (8900209390529859777) -->
+    <skip />
     <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="239685342222975733">"Хэрэв нэг хүн <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>
@@ -3030,6 +3058,7 @@
     <string name="zen_mode_screen_off_visual_interruptions" msgid="4850792880144382633">"Дэлгэц унтарсан үед"</string>
     <string name="zen_mode_no_visual_interruptions" msgid="8742776003822778472">"Дэлгэц асаалттай буюу унтраалттай үед"</string>
     <string name="notification_app_settings_button" msgid="6685640230371477485">"Мэдэгдлийн тохиргоо"</string>
+    <string name="suggestion_button_text" msgid="3275010948381252006">"Ок"</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>
@@ -3185,7 +3214,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>
@@ -3214,6 +3243,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="sms_mirroring_pref" msgid="6475043279147376031">"SMS тусгал үүсгэх"</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>
@@ -3280,7 +3310,7 @@
     <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="permit_write_settings" msgid="658555006453212691">"Системийн тохиргоог өөрчлөхийг зөвшөөрөх"</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>
@@ -3375,9 +3405,12 @@
     <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="connectivity_monitor_switch" msgid="9059759348648583421">"Холболтын хяналт"</string>
+    <string name="connectivity_monitor_switch_summary" msgid="2828658652378866401">"ConnectivityMonitor холболтын асуудал илэрсэн үед нэвтрэлтийг цуглуулж хэрэглэгчид алдааг засах мэдэгдэл илгээнэ"</string>
+    <string name="connectivity_monitor_toast" msgid="5551859612881173028">"Холболтын хяналтын өөрчлөлтийг хэрэгжүүлэх бол төхөөрөмжийг дахин асаана уу"</string>
     <string name="camera_hal_hdrplus_switch" msgid="8377365197105267466">"Камер HAL HDR+"</string>
     <string name="camera_hal_hdrplus_toast" msgid="2063703797270055299">"Камер HAL HDR+ өөрчлөлтийг хэрэгжүүлэхийн тулд төхөөрөмжийг дахин асаана уу"</string>
+    <string name="camera_laser_sensor_switch" msgid="8913588990743234440">"Камерын лазер мэдрэгч"</string>
     <string name="ota_disable_automatic_update" msgid="2319639631655915050">"Системийн автомат шинэчлэлтүүд"</string>
     <string name="usage" msgid="2977875522080448986">"Хэрэглээ"</string>
     <string name="cellular_data_usage" msgid="2155683719898158203">"Мобайл дата ашиглалт"</string>
@@ -3397,20 +3430,20 @@
       <item quantity="other"><xliff:g id="COUNT">%1$d</xliff:g> хязгаарлалт</item>
       <item quantity="one">1 хязгаарлалт</item>
     </plurals>
-    <string name="operator_warning" msgid="1862988028996859195">"Оператор компанийн дата тооцоололт нь төхөөрөмжийн тооцоололтоос өөр байна"</string>
+    <string name="operator_warning" msgid="1862988028996859195">"Оператор компанийн дата тооцоололт нь төхөөрөмжийн тооцоололтоос өөр байж болно"</string>
     <string name="data_used_template" msgid="3245919669966296505">"<xliff:g id="ID_1">%1$s</xliff:g> ашигласан"</string>
     <string name="set_data_warning" msgid="6115364758236594593">"Өгөгдлийн сануулгыг тохируулах"</string>
     <string name="data_warning" msgid="209133958008062117">"Дата хэрэглээний сануулга"</string>
     <string name="set_data_limit" msgid="2901526323210516923">"Дата хязгаар тогтоох"</string>
     <string name="data_limit" msgid="1885406964934590552">"Дата хязгаар"</string>
-    <string name="data_usage_template" msgid="392191945602400904">"<xliff:g id="ID_1">%1$s</xliff:g>  <xliff:g id="ID_2">%2$s</xliff:g> хооронд ашигласан"</string>
+    <string name="data_usage_template" msgid="2923744765873163859">"<xliff:g id="ID_2">%2$s</xliff:g>-д <xliff:g id="ID_1">%1$s</xliff:g>-г ашигласан"</string>
     <string name="configure" msgid="1029654422228677273">"Тохируулах"</string>
     <string name="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="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>
@@ -3472,15 +3505,15 @@
     <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="387052719462473500">"Түгжигдсэн дэлгэцийн мэдээллийг хянах"</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="8483187649355540109">"Дэмжлэг &amp; зөвлөгөө"</string>
     <string name="developer_smallest_width" msgid="7516950434587313360">"Хамгийн бага өргөн"</string>
     <string name="premium_sms_none" msgid="8268105565738040566">"Суулгасан апп гуравдагч талын SMS хандалтыг шаардаагүй байна"</string>
     <string name="premium_sms_warning" msgid="9086859595338944882">"Гуравдагч талын SMS нь таны оператор компанийн төлбөр дээр нэмэгдэж болно. Хэрэв та энэ апп-д зөвшөөрлийг идэвхжүүлбэл энэ апп-р гуравдагч тал SMS илгээх боломжтой болно."</string>
-    <string name="premium_sms_access" msgid="4660047004791638305">"Гуравдагч талын SMS хандалт"</string>
-    <string name="bluetooth_disabled" msgid="2456198532288640046">"Бусад төхөөрөмжид боломжгүй"</string>
+    <string name="premium_sms_access" msgid="4660047004791638305">"Премиум SMS хандалт"</string>
+    <string name="bluetooth_disabled" msgid="6244000672828617410">"Идэвхгүй"</string>
     <string name="bluetooth_connected_summary" msgid="7672528674593152862">"<xliff:g id="ID_1">%1$s</xliff:g>-д холбогдсон"</string>
     <string name="bluetooth_connected_multiple_devices_summary" msgid="9173661896296663932">"Олон төхөөрөмжтэй холбогдсон"</string>
     <string name="demo_mode" msgid="2798762752209330277">"Системийн UI демо горим"</string>
@@ -3582,7 +3615,7 @@
     <string name="web_action_enable_title" msgid="4051513950976670853">"Шуурхай апп"</string>
     <string name="web_action_enable_summary" msgid="3108127559723396382">"Аппыг суулгаагүй байсан ч холбоосыг апп-д нээх"</string>
     <string name="web_action_section_title" msgid="7364647086538399136">"Шуурхай апп"</string>
-    <string name="instant_apps_account" msgid="1433620209791992528">"Шуурхай аппын бүртгэл"</string>
+    <string name="instant_apps_settings" msgid="8827777916518348213">"Шуурхай аппын сонголт"</string>
     <string name="domain_url_section_title" msgid="7046835219056428883">"Суулгасан апп"</string>
     <string name="automatic_storage_manager_activation_warning" msgid="6353100011690933254">"Таны санг одоо сангийн менежер удирдаж байна"</string>
     <string name="account_for_section_header" msgid="5356566418548737121">"<xliff:g id="USER_NAME">%1$s</xliff:g>-н бүртгэл"</string>
@@ -3629,7 +3662,9 @@
     <string name="enterprise_privacy_always_on_vpn_personal" msgid="9217774730260037434">"Тогтмол асаалттай VPN-г таны хувийн профайлд асаасан"</string>
     <string name="enterprise_privacy_always_on_vpn_work" msgid="7244472958208315814">"Тогтмол асаалттай VPN-г таны амжлын профайлд асаасан"</string>
     <string name="enterprise_privacy_global_http_proxy" msgid="7936664553416257333">"Дэлхий нийтийн HTTP прокси тохиргоо"</string>
-    <string name="enterprise_privacy_ca_certs" msgid="5885892204903688909">"Итгэмжилсэн үнэмлэх"</string>
+    <string name="enterprise_privacy_ca_certs_device" msgid="2019652712782510262">"Итгэмжит мандат үнэмлэх"</string>
+    <string name="enterprise_privacy_ca_certs_personal" msgid="2279084820904076599">"Таны хувийн профайлд суулгасан итгэмжит мандат үнэмлэх"</string>
+    <string name="enterprise_privacy_ca_certs_work" msgid="6187377647815301809">"Таны ажлын профайлд суулгасан итгэмжит мандат үнэмлэх"</string>
     <plurals name="enterprise_privacy_number_ca_certs" formatted="false" msgid="526375234629534165">
       <item quantity="other">Хамгийн багадаа <xliff:g id="COUNT_1">%d</xliff:g> CA сертификат</item>
       <item quantity="one">Хамгийн багадаа <xliff:g id="COUNT_0">%d</xliff:g> CA сертификат</item>
@@ -3692,6 +3727,8 @@
     <string name="carrier_provisioning" msgid="4398683675591893169">"Оператор компанийн хангалтын мэдээлэл"</string>
     <string name="trigger_carrier_provisioning" msgid="3434865918009286187">"Оператор компанийн хангалтыг асаах"</string>
     <string name="new_device_suggestion_title" msgid="698847081680980774">"Шинэ соргог зүйл юу байна?"</string>
-    <string name="new_device_suggestion_summary" msgid="7172709269203435870">"Шилдэг 5 онцлогийг харна уу"</string>
+    <string name="new_device_suggestion_summary" product="default" msgid="206396571522515855">"Шинэ утастай танилцах"</string>
+    <string name="new_device_suggestion_summary" product="tablet" msgid="393751455688210956">"Шинэ таблеттай танилцах"</string>
+    <string name="new_device_suggestion_summary" product="device" msgid="2939870049868336652">"Шинэ төхөөрөмжтэй танилцах"</string>
     <string name="disabled_low_ram_device" msgid="3751578499721173344">"Энэ онцлог энэ төхөөрөмжид боломжгүй"</string>
 </resources>
diff --git a/res/values-mr-nokeys/strings.xml b/res/values-mr-nokeys/strings.xml
index 3d5a6a8..db0e2ea 100644
--- a/res/values-mr-nokeys/strings.xml
+++ b/res/values-mr-nokeys/strings.xml
@@ -16,5 +16,5 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="applications_settings_summary" msgid="6616938758022986257">"अनुप्रयोग व्‍यवस्‍थापित करा"</string>
+    <string name="applications_settings_summary" msgid="6616938758022986257">"अॅप्लिकेशन व्‍यवस्‍थापित करा"</string>
 </resources>
diff --git a/res/values-mr/arrays.xml b/res/values-mr/arrays.xml
index 3940dab..9cafb85 100644
--- a/res/values-mr/arrays.xml
+++ b/res/values-mr/arrays.xml
@@ -70,7 +70,7 @@
     <item msgid="8934131797783724664">"स्कॅन करत आहे…"</item>
     <item msgid="8513729475867537913">"कनेक्ट करत आहे..."</item>
     <item msgid="515055375277271756">"प्रमाणीकरण करत आहे…"</item>
-    <item msgid="1943354004029184381">"IP पत्ता प्राप्त करत आहे…"</item>
+    <item msgid="1943354004029184381">"IP पत्ता मिळवत आहे…"</item>
     <item msgid="4221763391123233270">"कनेक्ट केले"</item>
     <item msgid="624838831631122137">"निलंबित"</item>
     <item msgid="7979680559596111948">"डिस्कनेक्ट करत आहे..."</item>
@@ -84,7 +84,7 @@
     <item msgid="8878186979715711006">"स्कॅन करत आहे…"</item>
     <item msgid="355508996603873860">"<xliff:g id="NETWORK_NAME">%1$s</xliff:g> वर कनेक्ट करत आहे…"</item>
     <item msgid="554971459996405634">"<xliff:g id="NETWORK_NAME">%1$s</xliff:g> सह प्रमाणीकरण करत आहे…"</item>
-    <item msgid="7928343808033020343">"<xliff:g id="NETWORK_NAME">%1$s</xliff:g> वरून IP पत्ता प्राप्त करत आहे…"</item>
+    <item msgid="7928343808033020343">"<xliff:g id="NETWORK_NAME">%1$s</xliff:g> वरून IP पत्ता मिळवत आहे…"</item>
     <item msgid="8937994881315223448">"<xliff:g id="NETWORK_NAME">%1$s</xliff:g> वर कनेक्ट केले आहे"</item>
     <item msgid="1330262655415760617">"निलंबित"</item>
     <item msgid="7698638434317271902">"<xliff:g id="NETWORK_NAME">%1$s</xliff:g> वरून डिस्कनेक्ट करत आहे…"</item>
@@ -100,8 +100,6 @@
     <!-- no translation found for wifi_security_no_eap:0 (2084555984818107151) -->
     <!-- no translation found for wifi_security_no_eap:1 (397579322683471524) -->
     <!-- no translation found for wifi_security_no_eap:2 (1968820975358150484) -->
-    <!-- no translation found for wifi_ap_security:0 (5251664683198623324) -->
-    <!-- no translation found for wifi_ap_security:1 (7989073072260294673) -->
   <string-array name="wifi_eap_method">
     <item msgid="1160193392455075561">"PEAP"</item>
     <item msgid="7981731051382306293">"TLS"</item>
@@ -136,7 +134,7 @@
     <item msgid="8151962652413645395">"2 मिनिटे"</item>
     <item msgid="8675215713017289017">"5 मिनिटे"</item>
     <item msgid="477015974247590543">"1 तास"</item>
-    <item msgid="5198271470953124739">"कधीही कालबाह्य नाही"</item>
+    <item msgid="5198271470953124739">"कधीही टाइमआउट नाही"</item>
   </string-array>
   <string-array name="wifi_signal">
     <item msgid="2245412278046491293">"खराब"</item>
@@ -225,14 +223,14 @@
     <item msgid="2681427309183221543">"GID"</item>
   </string-array>
   <string-array name="app_install_location_entries">
-    <item msgid="8151497958991952759">"अंतर्गत डिव्हाइस संचयन"</item>
+    <item msgid="8151497958991952759">"अंतर्गत डिव्हाइस स्टोरेज"</item>
     <item msgid="3738430123799803530">"काढण्यायोग्य SD कार्ड"</item>
     <item msgid="4498124044785815005">"सिस्टम ला ठरवू द्या"</item>
   </string-array>
   <string-array name="app_ops_categories">
     <item msgid="6358963769537892925">"स्थान"</item>
     <item msgid="255608127647030286">"वैयक्तिक"</item>
-    <item msgid="4588829735729884491">"संदेशन"</item>
+    <item msgid="4588829735729884491">"मेसेजिंग"</item>
     <item msgid="886742181977884584">"मीडिया"</item>
     <item msgid="7924928667052300589">"डिव्हाइस"</item>
   </string-array>
@@ -262,7 +260,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>
@@ -276,7 +274,7 @@
     <item msgid="6325739889222559394">"मीडिया व्हॉल्यूम"</item>
     <item msgid="5762123934816216821">"अलार्म व्हॉल्यूम"</item>
     <item msgid="785049718065337473">"सूचना व्हॉल्यूम"</item>
-    <item msgid="6700305533746877052">"ब्लूटुथ व्हॉल्यूम"</item>
+    <item msgid="6700305533746877052">"ब्लूटूथ व्हॉल्यूम"</item>
     <item msgid="2029227495214047094">"सक्रिय ठेवा"</item>
     <item msgid="26109888160231211">"स्थानाचे परीक्षण करा"</item>
     <item msgid="5753382310468855812">"उच्च पॉवर स्थानाचे परीक्षण करा"</item>
@@ -329,7 +327,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>
@@ -343,7 +341,7 @@
     <item msgid="7878027809189330917">"मीडिया व्हॉल्यूम"</item>
     <item msgid="7260546305036218513">"अलार्म व्हॉल्यूम"</item>
     <item msgid="9103719301075748925">"सूचना व्हॉल्यूम"</item>
-    <item msgid="7025966722295861512">"ब्लूटुथ व्हॉल्यूम"</item>
+    <item msgid="7025966722295861512">"ब्लूटूथ व्हॉल्यूम"</item>
     <item msgid="4665183401128289653">"सक्रिय ठेवा"</item>
     <item msgid="8584357129746649222">"स्थान"</item>
     <item msgid="7669257279311110599">"स्थान"</item>
@@ -428,7 +426,7 @@
     <item msgid="6692305604213080515">"प्रारंभ करत आहे…"</item>
     <item msgid="8001704909356800092">"कनेक्ट करीत आहे..."</item>
     <item msgid="4039737283841672166">"कनेक्ट केले"</item>
-    <item msgid="4042143101664725090">"कालबाह्य"</item>
+    <item msgid="4042143101664725090">"टाइमआउट"</item>
     <item msgid="7664124146786465092">"अयशस्वी"</item>
   </string-array>
   <string-array name="security_settings_premium_sms_values">
@@ -451,7 +449,7 @@
   </string-array>
   <string-array name="proc_stats_process_states">
     <item msgid="5069825997142785829">"कायम"</item>
-    <item msgid="5779398140277006695">"शीर्ष क्रियाकलाप"</item>
+    <item msgid="5779398140277006695">"आघाडीच्या अॅक्टिव्हिटी"</item>
     <item msgid="1439598363694578255">"महत्त्वाचे (अग्रभाग)"</item>
     <item msgid="3396458970745718652">"महत्त्वाचे (पार्श्वभूमी)"</item>
     <item msgid="5214825238247511992">"बॅकअप घ्‍या"</item>
@@ -459,10 +457,10 @@
     <item msgid="7438189122367820362">"सेवा (चालत आहे)"</item>
     <item msgid="918687422516982498">"सेवा (रीस्टार्ट करत आहे)"</item>
     <item msgid="6807727069641853029">"प्राप्तकर्ता"</item>
-    <item msgid="6782857406100845127">"मुख्यपृष्ठ"</item>
-    <item msgid="2860945127596974299">"अंतिम क्रियाकलाप"</item>
-    <item msgid="8610560843693675830">"कॅश   केलेला (क्रियाकलाप)"</item>
-    <item msgid="4338089220026248848">"कॅश   केलेला (क्रियाकलाप क्लायंट)"</item>
+    <item msgid="6782857406100845127">"होम"</item>
+    <item msgid="2860945127596974299">"शेवटच्या अॅक्टिव्हिटी"</item>
+    <item msgid="8610560843693675830">"कॅशे केलेली (अॅक्टिव्हिटी)"</item>
+    <item msgid="4338089220026248848">"कॅशे केलेला (अॅक्टिव्हिटी क्लायंट)"</item>
     <item msgid="6652164677254579050">"कॅश   केलेला (रिक्त)"</item>
   </string-array>
   <string-array name="color_picker">
diff --git a/res/values-mr/strings.xml b/res/values-mr/strings.xml
index 913a90e..15cd3ec 100644
--- a/res/values-mr/strings.xml
+++ b/res/values-mr/strings.xml
@@ -30,7 +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="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>
@@ -74,9 +74,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>
@@ -85,75 +85,75 @@
     <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" 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_lock_voice_dialing_summary" msgid="4741338867496787042">"स्क्रीन लॉक असते तेव्हा ब्लूटूथ डायलरचा वापर प्रतिबंधित करा"</string>
+    <string name="bluetooth_devices" msgid="1886018064039454227">"ब्लूटूथ डिव्हाइस"</string>
     <string name="bluetooth_device_name" msgid="8415828355207423800">"डिव्हाइस नाव"</string>
     <string name="bluetooth_device_details" msgid="4594773497930028085">"डिव्हाइस सेटिंग्ज"</string>
     <string name="bluetooth_profile_details" msgid="6823621790324933337">"प्रोफाईल सेटिंग्ज"</string>
     <string name="bluetooth_name_not_set" msgid="2653752006416027426">"खाते नाव वापरून, कोणतेही नाव सेट केले नाही"</string>
     <string name="bluetooth_scan_for_devices" msgid="9214184305566815727">"डिव्हाइसेससाठी स्कॅन करा"</string>
-    <string name="bluetooth_rename_device" msgid="4352483834491958740">"हा डिव्हाइस पुनर्नामित करा"</string>
+    <string name="bluetooth_rename_device" msgid="4352483834491958740">"या डिव्हाइस ला पुन्हा नाव द्या"</string>
     <string name="bluetooth_rename_button" msgid="1648028693822994566">"पुनर्नामित करा"</string>
-    <string name="bluetooth_disconnect_title" msgid="7830252930348734303">"डिव्‍हाइस डिस्‍कनेक्‍ट करायचे का?"</string>
+    <string name="bluetooth_disconnect_title" msgid="7830252930348734303">"डिव्हाइस डिस्‍कनेक्‍ट करायचे का?"</string>
     <string name="bluetooth_disconnect_all_profiles" product="default" msgid="8208712728668714199">"तुमचा फोन <xliff:g id="DEVICE_NAME">%1$s</xliff:g>वरून डिस्कनेक्ट होईल."</string>
     <string name="bluetooth_disconnect_all_profiles" product="tablet" msgid="6611038575213485336">"तुमचे टॅबलेट <xliff:g id="DEVICE_NAME">%1$s</xliff:g>वरून डिस्कनेक्ट होईल."</string>
     <string name="bluetooth_disconnect_all_profiles" product="device" msgid="3995834526315103965">"तुमचे डिव्हाइस <xliff:g id="DEVICE_NAME">%1$s</xliff:g>वरून डिस्कनेक्ट होईल."</string>
     <string name="bluetooth_disconnect_dialog_ok" msgid="3308586619539119106">"‍डिस्कनेक्ट करा"</string>
-    <string name="bluetooth_empty_list_user_restricted" msgid="603521233563983689">"आपल्‍याकडे ब्लूटुथ सेटिंग्‍ज बदलण्‍याची परवानगी नाही."</string>
+    <string name="bluetooth_empty_list_user_restricted" msgid="603521233563983689">"आपल्‍याकडे ब्लूटूथ सेटिंग्‍ज बदलण्‍याची परवानगी नाही."</string>
     <string name="bluetooth_pairing_pref_title" msgid="7429413067477968637">"नवीन डिव्हाइस जोडा"</string>
-    <string name="bluetooth_is_visible_message" msgid="6222396240776971862">"ब्लूटुथ सेटिंग्ज उघड्या असताना जवळपासच्या डिव्हाइसेसवर <xliff:g id="DEVICE_NAME">%1$s</xliff:g> दृश्यमान असते."</string>
-    <string name="bluetooth_footer_mac_message" product="default" msgid="1109366350000220283">"फोनचा ब्लुटूथ अ‍ॅड्रेस: <xliff:g id="BLUETOOTH_MAC_ADDRESS">%1$s</xliff:g>"</string>
-    <string name="bluetooth_footer_mac_message" product="tablet" msgid="6807634484499166486">"टॅबलेटचा ब्लुटूथ अ‍ॅड्रेस: <xliff:g id="BLUETOOTH_MAC_ADDRESS">%1$s</xliff:g>"</string>
-    <string name="bluetooth_footer_mac_message" product="device" msgid="8413944740341742061">"डिव्हाइसचा ब्लुटूथ अ‍ॅड्रेस: <xliff:g id="BLUETOOTH_MAC_ADDRESS">%1$s</xliff:g>"</string>
+    <string name="bluetooth_is_visible_message" msgid="6222396240776971862">"ब्लूटूथ सेटिंग्ज उघडी असताना जवळपासच्या डीव्हाइसवर <xliff:g id="DEVICE_NAME">%1$s</xliff:g> दृश्यमान असते."</string>
+    <string name="bluetooth_footer_mac_message" product="default" msgid="1109366350000220283">"फोनचा ब्लूटूथ अ‍ॅड्रेस: <xliff:g id="BLUETOOTH_MAC_ADDRESS">%1$s</xliff:g>"</string>
+    <string name="bluetooth_footer_mac_message" product="tablet" msgid="6807634484499166486">"टॅबलेटचा ब्लूटूथ अ‍ॅड्रेस: ब्लूटूथ<xliff:g id="BLUETOOTH_MAC_ADDRESS">%1$s</xliff:g>"</string>
+    <string name="bluetooth_footer_mac_message" product="device" msgid="8413944740341742061">"डीव्हाइसचा ब्लूटूथ अ‍ॅड्रेस: <xliff:g id="BLUETOOTH_MAC_ADDRESS">%1$s</xliff:g>"</string>
     <string name="bluetooth_is_disconnect_question" msgid="5334933802445256306">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> डिस्कनेक्ट करायचे?"</string>
     <string name="bluetooth_broadcasting" msgid="16583128958125247">"प्रसारण"</string>
     <string name="bluetooth_disable_profile_title" msgid="5916643979709342557">"प्रोफाईल अक्षम करायचे?"</string>
     <string name="bluetooth_disable_profile_message" msgid="2895844842011809904">"हे अक्षम करेल:&lt;br&gt;&lt;b&gt;<xliff:g id="PROFILE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;यावरून:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%2$s</xliff:g>&lt;/b&gt;"</string>
     <string name="bluetooth_unknown" msgid="644716244548801421"></string>
-    <string name="bluetooth_device" msgid="5291950341750186887">"अनामित ब्लूटुथ डिव्हाइस"</string>
+    <string name="bluetooth_device" msgid="5291950341750186887">"नाव नसलेले ब्लूटूथ डिव्हाइस"</string>
     <string name="progress_scanning" msgid="192587958424295789">"शोधत आहे"</string>
-    <string name="bluetooth_no_devices_found" msgid="1085232930277181436">"जवळपास ब्लूटुथ डिव्हाइसेस आढळली नाहीत."</string>
-    <string name="bluetooth_notif_ticker" msgid="4726721390078512173">"ब्लूटुथ जोडणी विनंती"</string>
-    <string name="bluetooth_notif_title" msgid="2485175521845371514">"जोडणी विनंती"</string>
+    <string name="bluetooth_no_devices_found" msgid="1085232930277181436">"जवळपास ब्लूटूथ डिव्हाइस आढळली नाहीत."</string>
+    <string name="bluetooth_notif_ticker" msgid="4726721390078512173">"ब्लूटूथ पेअरींग विनंती"</string>
+    <string name="bluetooth_notif_title" msgid="2485175521845371514">"पेअरींग विनंती"</string>
     <string name="bluetooth_notif_message" msgid="5057417127600942904">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> सह जोडण्यासाठी टॅप करा."</string>
     <string name="bluetooth_show_received_files" msgid="3144149432555230410">"मिळालेल्या फायली"</string>
-    <string name="device_picker" msgid="4978696506172252813">"ब्लूटुथ डिव्हाइस निवडा"</string>
-    <string name="bluetooth_ask_enablement" msgid="3387222809404177525">"<xliff:g id="APP_NAME">%1$s</xliff:g> ब्लूटुथ चालू करू इच्छितो"</string>
-    <string name="bluetooth_ask_disablement" msgid="5890386255790160573">"<xliff:g id="APP_NAME">%1$s</xliff:g> ब्लूटुथ बंद करू इच्छितो"</string>
-    <string name="bluetooth_ask_enablement_no_name" msgid="1644353686104482763">"अॅप ब्लूटुथ चालू करु इच्छित आहे"</string>
-    <string name="bluetooth_ask_disablement_no_name" msgid="9218830122674868548">"अॅप ब्लूटुथ बंद करू इच्छितो"</string>
-    <string name="bluetooth_ask_discovery" product="tablet" msgid="4791779658660357386">"<xliff:g id="APP_NAME">%1$s</xliff:g> आपला टॅब्लेट अन्य ब्लूटुथ डिव्हाइसेसाठी <xliff:g id="TIMEOUT">%2$d</xliff:g> सेकंदांसाठी दृश्यमान करू इच्छितो."</string>
-    <string name="bluetooth_ask_discovery" product="default" msgid="1308225382575535366">"<xliff:g id="APP_NAME">%1$s</xliff:g> आपला फोन अन्य ब्लूटुथ डिव्हाइसेसाठी <xliff:g id="TIMEOUT">%2$d</xliff:g> सेकंदांसाठी दृश्यमान करू इच्छितो."</string>
-    <string name="bluetooth_ask_discovery_no_name" product="tablet" msgid="225715443477752935">"अॅप आपला टॅब्लेट अन्य ब्लूटुथ डिव्हाइसेसाठी <xliff:g id="TIMEOUT">%1$d</xliff:g> सेकंदांसाठी दृश्यमान करू इच्छितो."</string>
-    <string name="bluetooth_ask_discovery_no_name" product="default" msgid="4949152735544109994">"अॅप आपला फोन अन्य ब्लूटुथ डिव्हाइसेसाठी <xliff:g id="TIMEOUT">%1$d</xliff:g> सेकंदांसाठी दृश्यमान करू इच्छितो."</string>
-    <string name="bluetooth_ask_lasting_discovery" product="tablet" msgid="8528329166577187961">"<xliff:g id="APP_NAME">%1$s</xliff:g> आपला टॅब्लेट इतर ब्लूटुथ डिव्हाइसेससाठी दृश्‍यमान बनवू इच्छित आहे. आपण ब्लूटुथ सेटिंग्जमध्ये नंतर हे बदलू शकता."</string>
-    <string name="bluetooth_ask_lasting_discovery" product="default" msgid="4398738575307583138">"<xliff:g id="APP_NAME">%1$s</xliff:g> आपला फोन इतर ब्लूटुथ डिव्हाइसेससाठी दृश्‍यमान बनवू इच्छित आहे. आपण ब्लूटुथ सेटिंग्जमध्ये नंतर हे बदलू शकता."</string>
-    <string name="bluetooth_ask_lasting_discovery_no_name" product="tablet" msgid="1702590641426207062">"अॅप आपला टॅब्लेट इतर ब्लूटुथ डिव्हाइसेससाठी दृश्‍यमान बनवू इच्छित आहे. आपण ब्लूटुथ सेटिंग्जमध्ये नंतर हे बदलू शकता."</string>
-    <string name="bluetooth_ask_lasting_discovery_no_name" product="default" msgid="8549952177383992238">"अॅप आपला फोन इतर ब्लूटुथ डिव्हाइसेससाठी दृश्‍यमान बनवू इच्छित आहे. आपण ब्लूटुथ सेटिंग्जमध्ये नंतर हे बदलू शकता."</string>
-    <string name="bluetooth_ask_enablement_and_discovery" product="tablet" msgid="1141843490422565755">"<xliff:g id="APP_NAME">%1$s</xliff:g> ब्लूटुथ चालू करू इच्छितो आणि <xliff:g id="TIMEOUT">%2$d</xliff:g> सेकंदांसाठी आपला टॅब्लेट अन्य डिव्हाइसेससाठी दृश्‍यमान बनवू इच्छितो."</string>
-    <string name="bluetooth_ask_enablement_and_discovery" product="default" msgid="5195836980079191473">"<xliff:g id="APP_NAME">%1$s</xliff:g> ब्लूटुथ चालू करू इच्छितो आणि <xliff:g id="TIMEOUT">%2$d</xliff:g> सेकंदांसाठी आपला फोन अन्य डिव्हाइसेससाठी दृश्‍यमान बनवू इच्छितो."</string>
-    <string name="bluetooth_ask_enablement_and_discovery_no_name" product="tablet" msgid="7009338445281693765">"अॅप ब्लूटुथ चालू करु इच्छित आहे आणि इतर डिव्हाइसेससाठी <xliff:g id="TIMEOUT">%1$d</xliff:g> सेकंदांकरिता आपला टॅब्लेट दृश्यमान बनवू इच्छित आहे."</string>
-    <string name="bluetooth_ask_enablement_and_discovery_no_name" product="default" msgid="8386904242279878734">"अॅप ब्लूटुथ चालू करु इच्छित आहे आणि इतर डिव्हाइसेससाठी <xliff:g id="TIMEOUT">%1$d</xliff:g> सेकंदांकरिता आपला फोन दृश्यमान बनवू इच्छित आहे."</string>
-    <string name="bluetooth_ask_enablement_and_lasting_discovery" product="tablet" msgid="2279471426575892686">"<xliff:g id="APP_NAME">%1$s</xliff:g> ब्लूटुथ चालू करु इच्छित आहे आणि आपला टॅब्लेट इतर डिव्हाइसेससाठी दृश्‍यमान बनवू इच्छित आहे. आपण ब्लूटुथ सेटिंग्जमध्ये नंतर हे बदलू शकता."</string>
-    <string name="bluetooth_ask_enablement_and_lasting_discovery" product="default" msgid="6961969825475461450">"<xliff:g id="APP_NAME">%1$s</xliff:g> अॅप ब्लूटुथ चालू करु इच्छित आहे आणि आपला फोन इतर डिव्हाइसेससाठी दृश्‍यमान बनवू इच्छित आहे. आपण ब्लूटुथ सेटिंग्जमध्ये नंतर हे बदलू शकता."</string>
-    <string name="bluetooth_ask_enablement_and_lasting_discovery_no_name" product="tablet" msgid="692477613671555006">"अॅप ब्लूटुथ चालू करु इच्छित आहे आणि आपला टॅब्लेट इतर डिव्हाइसेससाठी दृश्‍यमान बनवू इच्छित आहे. आपण ब्लूटुथ सेटिंग्जमध्ये नंतर हे बदलू शकता."</string>
-    <string name="bluetooth_ask_enablement_and_lasting_discovery_no_name" product="default" msgid="6374480121751597648">"अॅप ब्लूटुथ चालू करु इच्छित आहे आणि आपला फोन इतर डिव्हाइसेससाठी दृश्‍यमान बनवू इच्छित आहे. आपण ब्लूटुथ सेटिंग्जमध्ये नंतर हे बदलू शकता."</string>
-    <string name="bluetooth_turning_on" msgid="4850574877288036646">"ब्लूटुथ चालू करत आहे…"</string>
-    <string name="bluetooth_turning_off" msgid="2337747302892025192">"ब्लूटुथ बंद करत आहे…"</string>
+    <string name="device_picker" msgid="4978696506172252813">"ब्लूटूथ डिव्हाइस निवडा"</string>
+    <string name="bluetooth_ask_enablement" msgid="3387222809404177525">"<xliff:g id="APP_NAME">%1$s</xliff:g> ब्लूटूथ चालू करू इच्छितो"</string>
+    <string name="bluetooth_ask_disablement" msgid="5890386255790160573">"<xliff:g id="APP_NAME">%1$s</xliff:g> ब्लूटूथ बंद करू इच्छितो"</string>
+    <string name="bluetooth_ask_enablement_no_name" msgid="1644353686104482763">"अॅप ब्लूटूथ चालू करु इच्छित आहे"</string>
+    <string name="bluetooth_ask_disablement_no_name" msgid="9218830122674868548">"अॅप ब्लूटूथ बंद करू इच्छितो"</string>
+    <string name="bluetooth_ask_discovery" product="tablet" msgid="4791779658660357386">"<xliff:g id="APP_NAME">%1$s</xliff:g> आपला टॅबलेट अन्य ब्लूटूथ डीव्हाइससाठी <xliff:g id="TIMEOUT">%2$d</xliff:g> सेकंदांसाठी दृश्यमान करू इच्छितो."</string>
+    <string name="bluetooth_ask_discovery" product="default" msgid="1308225382575535366">"<xliff:g id="APP_NAME">%1$s</xliff:g> आपला फोन अन्य ब्लूटूथ डीव्हाइससाठी <xliff:g id="TIMEOUT">%2$d</xliff:g> सेकंदांसाठी दृश्यमान करू इच्छितो."</string>
+    <string name="bluetooth_ask_discovery_no_name" product="tablet" msgid="225715443477752935">"अॅप आपला टॅबलेट अन्य ब्लूटूथ डीव्हाइससाठी <xliff:g id="TIMEOUT">%1$d</xliff:g> सेकंदांसाठी दृश्यमान करू इच्छितो."</string>
+    <string name="bluetooth_ask_discovery_no_name" product="default" msgid="4949152735544109994">"अॅप आपला फोन अन्य ब्लूटूथ डीव्हाइससाठी <xliff:g id="TIMEOUT">%1$d</xliff:g> सेकंदांसाठी दृश्यमान करू इच्छितो."</string>
+    <string name="bluetooth_ask_lasting_discovery" product="tablet" msgid="8528329166577187961">"<xliff:g id="APP_NAME">%1$s</xliff:g> आपला टॅबलेट इतर ब्लूटूथ डीव्हाइससाठी दृश्‍यमान करू इच्छित आहे. तुम्ही ब्लूटूथ सेटिंग्जमध्ये नंतर हे बदलू शकता."</string>
+    <string name="bluetooth_ask_lasting_discovery" product="default" msgid="4398738575307583138">"<xliff:g id="APP_NAME">%1$s</xliff:g> आपला फोन इतर ब्लूटूथ डीव्हाइससाठी दृश्‍यमान करू इच्छित आहे. तुम्ही ब्लूटूथ सेटिंग्जमध्ये नंतर हे बदलू शकता."</string>
+    <string name="bluetooth_ask_lasting_discovery_no_name" product="tablet" msgid="1702590641426207062">"अॅप आपला टॅबलेट इतर ब्लूटूथ डीव्हाइससाठी दृश्‍यमान करू इच्छित आहे. तुम्ही ब्लूटूथ सेटिंग्जमध्ये नंतर हे बदलू शकता."</string>
+    <string name="bluetooth_ask_lasting_discovery_no_name" product="default" msgid="8549952177383992238">"अॅप आपला फोन इतर ब्लूटूथ डीव्हाइससाठी दृश्‍यमान करू इच्छित आहे. तुम्ही ब्लूटूथ सेटिंग्जमध्ये नंतर हे बदलू शकता."</string>
+    <string name="bluetooth_ask_enablement_and_discovery" product="tablet" msgid="1141843490422565755">"<xliff:g id="APP_NAME">%1$s</xliff:g> ब्लूटूथ चालू करू इच्छितो आणि <xliff:g id="TIMEOUT">%2$d</xliff:g> सेकंदांसाठी आपला टॅबलेट अन्य डीव्हाइससाठी दृश्‍यमान करू इच्छितो."</string>
+    <string name="bluetooth_ask_enablement_and_discovery" product="default" msgid="5195836980079191473">"<xliff:g id="APP_NAME">%1$s</xliff:g> ब्लूटूथ चालू करू इच्छितो आणि <xliff:g id="TIMEOUT">%2$d</xliff:g> सेकंदांसाठी आपला फोन अन्य डीव्हाइससाठी दृश्‍यमान करू इच्छितो."</string>
+    <string name="bluetooth_ask_enablement_and_discovery_no_name" product="tablet" msgid="7009338445281693765">"अॅप ब्लूटूथ चालू करु इच्छित आहे आणि इतर डीव्हाइससाठी <xliff:g id="TIMEOUT">%1$d</xliff:g> सेकंदांकरिता आपला टॅबलेट दृश्यमान बनवू इच्छित आहे."</string>
+    <string name="bluetooth_ask_enablement_and_discovery_no_name" product="default" msgid="8386904242279878734">"अॅप ब्लूटूथ चालू करु इच्छित आहे आणि इतर डीव्हाइससाठी <xliff:g id="TIMEOUT">%1$d</xliff:g> सेकंदांकरिता आपला फोन दृश्यमान बनवू इच्छित आहे."</string>
+    <string name="bluetooth_ask_enablement_and_lasting_discovery" product="tablet" msgid="2279471426575892686">"<xliff:g id="APP_NAME">%1$s</xliff:g> ब्लूटूथ चालू करु इच्छित आहे आणि आपला टॅबलेट इतर डीव्हाइससाठी दृश्‍यमान करू इच्छित आहे. तुम्ही ब्लूटूथ सेटिंग्जमध्ये नंतर हे बदलू शकता."</string>
+    <string name="bluetooth_ask_enablement_and_lasting_discovery" product="default" msgid="6961969825475461450">"<xliff:g id="APP_NAME">%1$s</xliff:g> अॅप ब्लूटूथ चालू करु इच्छित आहे आणि आपला फोन इतर डीव्हाइससाठी दृश्‍यमान करू इच्छित आहे. तुम्ही ब्लूटूथ सेटिंग्जमध्ये नंतर हे बदलू शकता."</string>
+    <string name="bluetooth_ask_enablement_and_lasting_discovery_no_name" product="tablet" msgid="692477613671555006">"अॅप ब्लूटूथ चालू करु इच्छित आहे आणि आपला टॅबलेट इतर डीव्हाइससाठी दृश्‍यमान करू इच्छित आहे. तुम्ही ब्लूटूथ सेटिंग्जमध्ये नंतर हे बदलू शकता."</string>
+    <string name="bluetooth_ask_enablement_and_lasting_discovery_no_name" product="default" msgid="6374480121751597648">"अॅप ब्लूटूथ चालू करु इच्छित आहे आणि आपला फोन इतर डीव्हाइससाठी दृश्‍यमान करू इच्छित आहे. तुम्ही ब्लूटूथ सेटिंग्जमध्ये नंतर हे बदलू शकता."</string>
+    <string name="bluetooth_turning_on" msgid="4850574877288036646">"ब्लूटूथ चालू करत आहे…"</string>
+    <string name="bluetooth_turning_off" msgid="2337747302892025192">"ब्लूटूथ बंद करत आहे…"</string>
     <string name="bluetooth_auto_connect" msgid="40711424456733571">"स्वयं-कनेक्ट"</string>
     <string name="bluetooth_connection_permission_request" msgid="4747918249032890077">"ब्लूटुथ कनेक्शन विनंती"</string>
     <string name="bluetooth_connection_notif_message" msgid="3603316575471431846">"\"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>\" शी कनेक्ट करण्यासाठी टॅप करा."</string>
@@ -166,7 +166,7 @@
     <string name="bluetooth_map_acceptance_dialog_text" msgid="8712508202081143737">"%1$s ला आपल्या संदेशामध्ये प्रवेश करण्याची आवश्यकता आहे. %2$s ला प्रवेश करण्याची अनुमती द्यायची?"</string>
     <string name="bluetooth_sap_request" msgid="2669762224045354417">"सिम प्रवेश विनंती"</string>
     <string name="bluetooth_sap_acceptance_dialog_text" msgid="4414253873553608690">"<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g> आपल्या सिम कार्डवर प्रवेश करू इच्छित आहे. सिम कार्डवर प्रवेश मंजूर केल्यामुळे कनेक्शनच्या कालावधीसाठी आपल्या डिव्हाइसवरील डेटा कनेक्टिव्हिटी अक्षम होईल. <xliff:g id="DEVICE_NAME_1">%2$s?</xliff:g> वर प्रवेश द्या"</string>
-    <string name="bluetooth_device_name_summary" msgid="4757990010751789977">"अन्‍य डिव्‍हाइसला \'<xliff:g id="DEVICE_NAME">^1</xliff:g>\' म्‍हणून दिसत आहे"</string>
+    <string name="bluetooth_device_name_summary" msgid="522235742194965734">"इतर डिव्‍हाइसना \'<xliff:g id="DEVICE_NAME">^1</xliff:g>\' म्‍हणून दिसत आहे"</string>
     <string name="bluetooth_paired_device_title" msgid="8638994696317952019">"तुमचे डिव्हाइस"</string>
     <string name="bluetooth_pairing_page_title" msgid="7712127387361962608">"नवीन डिव्हाइस जोडा"</string>
     <string name="date_and_time" msgid="9062980487860757694">"तारीख आणि वेळ"</string>
@@ -175,7 +175,7 @@
     <skip />
     <string name="intent_sender_sendbroadcast_text" msgid="1415735148895872715">"<xliff:g id="BROADCAST">broadcast</xliff:g> पाठवा"</string>
     <string name="intent_sender_action_label" msgid="616458370005452389">"<xliff:g id="ACTION">Action</xliff:g>:"</string>
-    <string name="intent_sender_startactivity_text" msgid="5080516029580421895">"<xliff:g id="ACTIVITY">activity</xliff:g> प्रारंभ करा"</string>
+    <string name="intent_sender_startactivity_text" msgid="5080516029580421895">"<xliff:g id="ACTIVITY">activity</xliff:g> प्रारंभ"</string>
     <string name="intent_sender_resource_label" msgid="6963659726895482829">"<xliff:g id="RESOURCE">Resource</xliff:g>:"</string>
     <string name="intent_sender_account_label" msgid="465210404475603404">"खाते:"</string>
     <string name="proxy_settings_title" msgid="9049437837600320881">"प्रॉक्सी"</string>
@@ -189,7 +189,7 @@
     <string name="proxy_error_dismiss" msgid="4993171795485460060">"ठीक"</string>
     <string name="proxy_error_invalid_host" msgid="6865850167802455230">"आपण टाइप केलेले होस्टनाव वैध नाही."</string>
     <string name="proxy_error_invalid_exclusion_list" msgid="678527645450894773">"आपण टाइप केलेली प्रवेश नाकारलेली सूची योग्यरितीने स्वरूपित नाही. प्रवेश नाकारलेल्या डोमेनची स्वल्पविरामाने-विभक्त सूची टाइप करा."</string>
-    <string name="proxy_error_empty_port" msgid="5539106187558215246">"आपल्याला पोर्ट फील्ड पूर्ण करण्‍याची आवश्यकता आहे"</string>
+    <string name="proxy_error_empty_port" msgid="5539106187558215246">"तुम्हाला पोर्ट फील्ड पूर्ण करण्‍याची आवश्यकता आहे"</string>
     <string name="proxy_error_empty_host_set_port" msgid="2451694104858226781">"होस्ट फील्ड रिक्त असल्यास पोर्ट फील्ड रिक्त असणे आवश्यक आहे."</string>
     <string name="proxy_error_invalid_port" msgid="5988270202074492710">"आपण टाइप केलेला पोर्ट वैध नाही."</string>
     <string name="proxy_warning_limited_support" msgid="7229337138062837422">"ब्राउझरद्वारे HTTP प्रॉक्सी वापरले जाते परंतु अन्य अॅप्सद्वारे कदाचित वापरले जाणार नाही."</string>
@@ -221,7 +221,7 @@
     <string name="radio_info_http_client_test" msgid="2382286093023138339">"HTTP क्लायंट चाचणी:"</string>
     <string name="ping_test_label" msgid="579228584343892613">"पिंग चाचणी चालवा"</string>
     <string name="radio_info_smsc_label" msgid="6399460520126501354">"SMSC:"</string>
-    <string name="radio_info_smsc_update_label" msgid="7258686760358791539">"अद्यतनित करा"</string>
+    <string name="radio_info_smsc_update_label" msgid="7258686760358791539">"अपडेट करा"</string>
     <string name="radio_info_smsc_refresh_label" msgid="6902302130315125102">"रीफ्रेश करा"</string>
     <string name="radio_info_toggle_dns_check_label" msgid="6625185764803245075">"DNS तपासणी टॉगल करा"</string>
     <string name="oem_radio_info_label" msgid="6163141792477958941">"OEM-विशिष्ट माहिती/सेटिंग्ज"</string>
@@ -233,19 +233,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>
@@ -266,27 +266,27 @@
     <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="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>
     <string name="okay" msgid="1997666393121016642">"ठीक आहे"</string>
     <string name="forget" msgid="1400428660472591263">"विसरा"</string>
-    <string name="save" msgid="879993180139353333">"जतन करा"</string>
+    <string name="save" msgid="879993180139353333">"सेव्ह करा"</string>
     <string name="done" msgid="6942539184162713160">"पूर्ण झाले"</string>
     <string name="settings_label" msgid="1626402585530130914">"सेटिंग्ज"</string>
     <string name="settings_label_launcher" msgid="8344735489639482340">"सेटिंग्ज"</string>
     <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>
-    <string name="radio_controls_summary" msgid="1838624369870907268">"वाय-फाय, ब्लूटुथ, विमान मोड, मोबाईल नेटवर्क आणि VPN व्यवस्थापित करा"</string>
+    <string name="radio_controls_summary" msgid="1838624369870907268">"Wi‑Fi, Bluetooth, विमान मोड, मोबाईल नेटवर्क आणि VPN व्यवस्थापित करा"</string>
     <string name="cellular_data_title" msgid="6835451574385496662">"मोबाइल डेटा"</string>
     <string name="calls_title" msgid="3544471959217176768">"कॉल"</string>
     <string name="sms_messages_title" msgid="1778636286080572535">"SMS संदेश"</string>
@@ -312,8 +312,10 @@
     <string name="zone_auto" msgid="334783869352026648">"स्वयंचलित टाइम झोन"</string>
     <string name="zone_auto_summaryOn" msgid="6142830927278458314">"नेटवर्कने-प्रदान केलेला टाइम झोन वापरा"</string>
     <string name="zone_auto_summaryOff" msgid="2597745783162041390">"नेटवर्कने-प्रदान केलेला टाइम झोन वापरा"</string>
+    <string name="date_time_24hour_auto" msgid="2117383168985653422">"आपोआप चालणारे 24-तास फॉरमॅट"</string>
+    <string name="date_time_24hour_auto_summary" msgid="6351812925651480277">"locale डीफॉल्ट वापरा"</string>
     <string name="date_time_24hour_title" msgid="3203537578602803850">"24‑तास स्वरूप"</string>
-    <string name="date_time_24hour" msgid="1193032284921000063">"24-तास स्वरूप वापरा"</string>
+    <string name="date_time_24hour" msgid="1193032284921000063">"२४-तास स्वरूप वापरा"</string>
     <string name="date_time_set_time_title" msgid="6296795651349047016">"वेळ"</string>
     <string name="date_time_set_time" msgid="5716856602742530696">"वेळ सेट करा"</string>
     <string name="date_time_set_timezone_title" msgid="3047322337368233197">"टाइम झोन"</string>
@@ -341,14 +343,13 @@
     <string name="Accounts_settings_title" msgid="1643879107901699406">"खाती"</string>
     <string name="location_settings_title" msgid="1369675479310751735">"स्थान"</string>
     <string name="account_settings_title" msgid="626177544686329806">"खाती"</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="security_settings_title" msgid="4918904614964215087">"सुरक्षितता आणि स्थान"</string>
+    <string name="encryption_and_credential_settings_title" msgid="6514904533438791561">"एंक्रिप्शन आणि क्रेडेंशियल"</string>
+    <string name="encryption_and_credential_settings_summary" product="default" msgid="8721883002237981248">"फोन एंक्रिप्ट केला"</string>
+    <string name="encryption_and_credential_settings_summary" product="tablet" msgid="7200428573872395685">"डिव्हाइस एन्क्रिप्‍ट केले"</string>
     <string name="lockscreen_settings_title" msgid="3922976395527087455">"लॉक स्क्रीन प्राधान्ये"</string>
-    <string name="security_settings_summary" msgid="967393342537986570">"माझे स्थान, स्क्रीन अनलॉक, सिम कार्ड लॉक, क्रेडेन्शियल संचयन लॉक सेट करा"</string>
-    <string name="cdma_security_settings_summary" msgid="6068799952798901542">"माझे स्थान, स्क्रीन लॉक, क्रेडेन्शियल संचयन लॉक सेट करा"</string>
+    <string name="security_settings_summary" msgid="967393342537986570">"माझे स्थान, स्क्रीन अनलॉक, सिम कार्ड लॉक, क्रेडेन्शियल स्टोरेज लॉक सेट करा"</string>
+    <string name="cdma_security_settings_summary" msgid="6068799952798901542">"माझे स्थान, स्क्रीन लॉक, क्रेडेन्शियल स्टोरेज लॉक सेट करा"</string>
     <string name="security_passwords_title" msgid="2881269890053568809">"गोपनीयता"</string>
     <string name="disabled_by_administrator_summary" msgid="1601828700318996341">"प्रशासकाने अक्षम केलेले"</string>
     <string name="security_status_title" msgid="5848766673665944640">"सुरक्षितता स्थिती"</string>
@@ -366,24 +367,27 @@
     <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="1550756694054944874">"फोन अनलॉक करण्यासाठी किंवा खरेदींना मंजूरी देण्यासाठी तुमचे फिंगरप्रिंट वापरा.\n\nटीप: तुम्ही हे डिव्हाइस अनलॉक करण्यासाठी तुम्‍ही तुमचे फिंगरप्रिंट वापरू शकत नाही. अधिक माहितीसाठी संस्थेच्या प्रशासकाशी संपर्क साधा."</string>
-    <string name="security_settings_fingerprint_enroll_introduction_message_setup" msgid="6817326798834882531">"फोन अनलॉक करण्यासाठी किंवा खरेदीला मंजूरी देण्यासाठी तुमचे फिंगरप्रिंट वापरा.\n\nटीप: सक्षम पॅटर्न किंवा पिनच्या तुलनेत तुमचे फिंगरप्रिंट ही कमी सुरक्षित असू शकते."</string>
+    <string name="security_settings_fingerprint_enroll_introduction_message" msgid="3508870672887336095">"आपला फोन अनलॉक करण्यासाठी, खरेदी अधिकृत करण्‍यासाठी किंवा अॅप्समध्ये साइन इन करण्‍यासाठी फक्त फिंगरप्रिंट सेन्सरला स्पर्श करा. तुम्ही ज्यांचे फिंगरप्रिंट जोडता त्याविषयी सावधगिरी बाळगा. जोडलेला एक प्रिंट देखील यापैकी कोणतीही गोष्ट करू शकतो. \n\n टिप: आपले फिंगरप्रिंट क्लिष्ट पॅटर्न किंवा पिन पेक्षा कमी सुरक्षित असू शकतात."</string>
+    <string name="security_settings_fingerprint_enroll_introduction_message_unlock_disabled" msgid="1550756694054944874">"फोन अनलॉक करण्यासाठी किंवा खरेदींना मंजूरी देण्यासाठी तुमचे फिंगरप्रिंट वापरा.\n\nटिप: तुम्ही हे डिव्हाइस अनलॉक करण्यासाठी तुम्‍ही तुमचे फिंगरप्रिंट वापरू शकत नाही. अधिक माहितीसाठी संस्थेच्या प्रशासकाशी संपर्क साधा."</string>
+    <string name="security_settings_fingerprint_enroll_introduction_message_setup" msgid="6817326798834882531">"फोन अनलॉक करण्यासाठी किंवा खरेदीला मंजुरी देण्यासाठी तुमचे फिंगरप्रिंट वापरा.\n\nटीप: सक्षम पॅटर्न किंवा पिनच्या तुलनेत तुमचे फिंगरप्रिंट ही कमी सुरक्षित असू शकते."</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel" msgid="3199351118385606526">"रद्द करा"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue" msgid="7472492858148162530">"सुरु ठेवा"</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel_setup" msgid="5021369420474432665">"वगळा"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue_setup" msgid="1961957425135180242">"पुढील"</string>
-    <string name="lock_screen_intro_skip_dialog_text_frp" product="tablet" msgid="1581834104051243425">"डिव्हाइस संरक्षण वैशिष्ट्ये चालू होणार नाहीत. हा टॅबलेट हरवल्यास, चोरी झाल्यास किंवा रीसेट केल्यास तुम्ही इतरांना तो वापरण्यापासून प्रतिबंधित करू शकणार नाही."</string>
-    <string name="lock_screen_intro_skip_dialog_text_frp" product="device" msgid="4629503416877189572">"डिव्हाइस संरक्षण वैशिष्ट्ये सुरू होणार नाहीत. हे डिव्‍हाइस हरवल्यास, चोरी झाल्यास किंवा रीसेट केल्यास तुम्ही इतरांना तो वापरण्यापासून प्रतिबंधित करू शकणार नाही."</string>
+    <string name="setup_fingerprint_enroll_skip_title" msgid="362050541117362034">"फिंगरप्रिंट वगळायचे?"</string>
+    <string name="setup_fingerprint_enroll_skip_after_adding_lock_text" msgid="958990414356204763">"फिंगरप्रिंट सेटअप केवळ एक किंवा दोन मिनिटे घेतो. तुम्ही हे वगळल्यास, तुम्ही नंतर सेटिंग्जमध्ये तुमचे फिंगरप्रिंट जोडू शकता."</string>
+    <string name="lock_screen_intro_skip_title" msgid="4988210105913705679">"स्क्रीन लॉक वगळायचे?"</string>
+    <string name="lock_screen_intro_skip_dialog_text_frp" product="tablet" msgid="1581834104051243425">"डिव्हाइस संरक्षण वैशिष्ट्ये चालू होणार नाहीत. हा टॅब्लेट हरवल्यास, चोरी झाल्यास किंवा रीसेट केल्यास तुम्ही इतरांना तो वापरण्यापासून प्रतिबंधित करू शकणार नाही."</string>
+    <string name="lock_screen_intro_skip_dialog_text_frp" product="device" msgid="4629503416877189572">"डिव्हाइस संरक्षण वैशिष्ट्ये सुरू होणार नाहीत. हे डिव्हाइस हरवल्यास, चोरी झाल्यास किंवा रीसेट केल्यास तुम्ही इतरांना तो वापरण्यापासून प्रतिबंधित करू शकणार नाही."</string>
     <string name="lock_screen_intro_skip_dialog_text_frp" product="default" msgid="2423428240245737909">"डिव्हाइस संरक्षण वैशिष्ट्ये सुरू होणार नाहीत. हा फोन हरवल्यास, चोरी झाल्यास किंवा रीसेट केल्यास तुम्ही इतरांना तो वापरण्यापासून प्रतिबंधित करू शकणार नाही."</string>
-    <string name="lock_screen_intro_skip_dialog_text" product="tablet" msgid="5219287483885558525">"डिव्हाइस संरक्षण्‍ा वैशिष्ट्ये सुरू होणार नाहीत. हा टॅबलेट हरवल्यास किंवा चोरी झाल्यास तुम्ही इतरांना तो वापरण्यापासून प्रतिबंधित करू शकणार नाही."</string>
+    <string name="lock_screen_intro_skip_dialog_text" product="tablet" msgid="5219287483885558525">"डिव्हाइस संरक्षण्‍ा वैशिष्ट्ये सुरू होणार नाहीत. हा टॅब्लेट हरवल्यास किंवा चोरी झाल्यास तुम्ही इतरांना तो वापरण्यापासून प्रतिबंधित करू शकणार नाही."</string>
     <string name="lock_screen_intro_skip_dialog_text" product="device" msgid="1466238255429527112">"डिव्हाइस संरक्षण्‍ा वैशिष्ट्ये सुरू होणार नाहीत. हे डिव्हाइस हरवल्यास किंवा चोरी झाल्यास तुम्ही इतरांना ते वापरण्यापासून प्रतिबंधित करू शकणार नाही."</string>
     <string name="lock_screen_intro_skip_dialog_text" product="default" msgid="3008526710555416125">"डिव्हाइस संरक्षण्‍ा वैशिष्ट्ये सुरू होणार नाहीत. हा फोन हरवल्यास किंवा चोरी झाल्यास तुम्ही इतरांना तो वापरण्यापासून प्रतिबंधित करू शकणार नाही."</string>
     <string name="skip_anyway_button_label" msgid="2323522873558834513">"तरीही वगळा"</string>
     <string name="go_back_button_label" msgid="4745265266186209467">"परत जा"</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_title" msgid="3051496861358227199">"सेंसरला स्पर्श करा"</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_message" msgid="8793966374365960368">"ते तुमच्या फोनच्या मागील भागावर आहे. तुमची तर्जनी वापरा."</string>
-    <string name="security_settings_fingerprint_enroll_find_sensor_content_description" msgid="2058830032070449160">"डिव्हाइस आणि फिंगरप्रिंट सेन्सर स्थानासह चित्रे"</string>
+    <string name="security_settings_fingerprint_enroll_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>
@@ -403,7 +407,7 @@
     <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>
@@ -418,50 +422,50 @@
     <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_button_text" product="tablet" msgid="1189623490604750854">"टॅबलेट कूटबद्ध करा"</string>
-    <string name="crypt_keeper_button_text" product="default" msgid="2008346408473255519">"फोन कूटबद्ध करा"</string>
+    <string name="crypt_keeper_settings_title" msgid="4219233835490520414">"एंक्रिप्शन"</string>
+    <string name="crypt_keeper_encrypt_title" product="tablet" msgid="1060273569887301457">"टॅबलेट एंक्रिप्ट करा"</string>
+    <string name="crypt_keeper_encrypt_title" product="default" msgid="1878996487755806122">"फोन एंक्रिप्ट करा"</string>
+    <string name="crypt_keeper_encrypted_summary" msgid="1868233637888132906">"एंक्रिप्ट केले"</string>
+    <string name="crypt_keeper_desc" product="tablet" msgid="503014594435731275">"तुम्ही तुमची खाती, सेटिंग्ज, डाउनलोड केलेले अ‍ॅप्स आणि त्यांचा डेटा, मीडिया आणि इतर फायली एंक्रिप्ट करू शकता. तुम्ही आपला टॅब्लेट एंक्रिप्ट केल्यानंतर, तुम्ही स्क्रीन लॉक (म्हणजे, एक पॅटर्न किंवा अंकीय पिन किंवा संकेतशब्द) सेट केला आहे हे गृहित धरून, प्रत्येकवेळी तुम्ही टॅब्लेट चालू करता तेव्हा त्याचे एंक्रिप्ट करण्‍यासाठी आपल्‍याला स्क्रीन अनलॉक करण्‍याची आवश्यकता असेल. एंक्रिप्ट करण्‍याचा अन्य एकमेव मार्ग आपला सर्व डेटा मिटवून, फॅक्‍टरी डेटा रीसेट करणे हा होय.\n\nएंक्रिप्शनला एक तास किंवा अधिक वेळ लागू शकतो. तुम्ही संपूर्ण प्रक्रियेत चार्ज केलेल्या बॅटरीसह प्रारंभ करणे आणि आपला टॅब्लेट प्लग इन केलेला ठेवणे आवश्यक आहे. तुम्ही त्यात व्यत्यय आणल्यास, तुम्ही आपला काही किंवा सर्व डेटा गमवाल."</string>
+    <string name="crypt_keeper_desc" product="default" msgid="2579929266645543631">"तुम्ही तुमची खाती, सेटिंग्ज, डाउनलोड केलेली अ‍ॅप्स आणि त्यांचा डेटा, मीडिया आणि इतर फायली एंक्रिप्ट करू शकता. तुम्ही आपला फोन एंक्रिप्ट केल्यानंतर, तुम्ही स्क्रीन लॉक (म्हणजे, एक पॅटर्न किंवा अंकीय पिन किंवा संकेतशब्द) सेट केला आहे हे गृहित धरून, प्रत्येकवेळी तुम्ही फोन चालू करता तेव्हा त्याचे एंक्रिप्ट करण्‍यासाठी आपल्‍याला स्क्रीन अनलॉक करण्‍याची आवश्यकता असेल. एंक्रिप्ट करण्‍याचा अन्य एकमेव मार्ग आपला सर्व डेटा मिटवून, फॅक्‍टरी डेटा रीसेट करणे हा होय.\n\nएंक्रिप्टीकरणास एक तास किंवा अधिक वेळ लागू शकतो. तुम्ही संपूर्ण प्रक्रियेत चार्ज केलेल्या बॅटरीसह प्रारंभ करणे आणि आपला फोन प्लग इन केलेला ठेवणे आवश्यक आहे. तुम्ही त्यात व्यत्यय आणल्यास, तुम्ही आपला काही किंवा सर्व डेटा गमवाल."</string>
+    <string name="crypt_keeper_button_text" product="tablet" msgid="1189623490604750854">"टॅबलेट एंक्रिप्ट करा"</string>
+    <string name="crypt_keeper_button_text" product="default" msgid="2008346408473255519">"फोन एंक्रिप्ट करा"</string>
     <string name="crypt_keeper_low_charge_text" msgid="2029407131227814893">"आपली बॅटरी चार्ज करा आणि पुन्हा प्रयत्न करा."</string>
     <string name="crypt_keeper_unplugged_text" msgid="4785376766063053901">"आपला चार्जर प्लग इन करा आणि पुन्हा प्रयत्न करा."</string>
     <string name="crypt_keeper_dialog_need_password_title" msgid="4058971800557767">"कोणताही लॉक स्क्रीन पिन किंवा संकेतशब्द नाही"</string>
     <string name="crypt_keeper_dialog_need_password_message" msgid="4071395977297369642">"आपण एनक्रिप्शन सुरु करण्यापूर्वी आपल्याला एक लॉक स्क्रीन पिन ‍किंवा संकेतशब्द सेट करण्याची आवश्यकता आहे."</string>
-    <string name="crypt_keeper_confirm_title" msgid="5100339496381875522">"कूटबद्ध करायचे?"</string>
-    <string name="crypt_keeper_final_desc" product="tablet" msgid="517662068757620756">"कूटबद्धीकरण कार्य परत न करता येणारे आहे आणि आपण त्यात व्यत्यय आणल्यास, आपला डेटा गमावेल. कूटबद्धीकरणास एखादा तास किंवा जास्त वेळ लागतो, यादरम्यान टॅबलेट कित्येक वेळा रीस्टार्ट होईल."</string>
-    <string name="crypt_keeper_final_desc" product="default" msgid="287503113671320916">"कूटबद्धीकरण कार्य परत न करता येणारे आहे आणि आपण त्यात व्यत्यय आणल्यास, आपला डेटा गमावेल. कूटबद्धीकरणास एखादा तास किंवा जास्त वेळ लागतो, यादरम्यान फोन कित्येक वेळा रीस्टार्ट होईल."</string>
-    <string name="crypt_keeper_setup_title" msgid="1783951453124244969">"कूटबद्ध करत आहे"</string>
-    <string name="crypt_keeper_setup_description" product="tablet" msgid="6689952371032099350">"आपला टॅबलेट कूटबद्ध केला जात असताना प्रतीक्षा करा. <xliff:g id="PERCENT">^1</xliff:g>% पूर्ण."</string>
-    <string name="crypt_keeper_setup_description" product="default" msgid="951918761585534875">"आपला फोन कूटबद्ध केला जात असताना प्रतीक्षा करा. <xliff:g id="PERCENT">^1</xliff:g>% पूर्ण."</string>
-    <string name="crypt_keeper_setup_time_remaining" product="tablet" msgid="1655047311546745695">"आपला टॅबलेट कूटबद्ध केला जात असताना प्रतीक्षा करा. शिल्लक वेळ: <xliff:g id="DURATION">^1</xliff:g>"</string>
-    <string name="crypt_keeper_setup_time_remaining" product="default" msgid="1862964662304683072">"आपला फोन कूटबद्ध केला जात असताना प्रतीक्षा करा. शिल्लक वेळ: <xliff:g id="DURATION">^1</xliff:g>"</string>
+    <string name="crypt_keeper_confirm_title" msgid="5100339496381875522">"एंक्रिप्ट करायचे?"</string>
+    <string name="crypt_keeper_final_desc" product="tablet" msgid="517662068757620756">"एंक्रिप्शन कार्य परत न करता येणारे आहे आणि आपण त्यात व्यत्यय आणल्यास, आपला डेटा गमावेल. एंक्रिप्शनला एखादा तास किंवा जास्त वेळ लागतो, यादरम्यान टॅबलेट कित्येक वेळा रीस्टार्ट होईल."</string>
+    <string name="crypt_keeper_final_desc" product="default" msgid="287503113671320916">"एंक्रिप्शन कार्य परत न करता येणारे आहे आणि आपण त्यात व्यत्यय आणल्यास, आपला डेटा गमावेल. एंक्रिप्शनला एखादा तास किंवा जास्त वेळ लागतो, यादरम्यान फोन कित्येक वेळा रीस्टार्ट होईल."</string>
+    <string name="crypt_keeper_setup_title" msgid="1783951453124244969">"एंक्रिप्ट करत आहे"</string>
+    <string name="crypt_keeper_setup_description" product="tablet" msgid="6689952371032099350">"आपला टॅब्लेट एंक्रिप्ट केला जात असताना प्रतीक्षा करा. <xliff:g id="PERCENT">^1</xliff:g>% पूर्ण."</string>
+    <string name="crypt_keeper_setup_description" product="default" msgid="951918761585534875">"आपला फोन एंक्रिप्ट केला जात असताना प्रतीक्षा करा. <xliff:g id="PERCENT">^1</xliff:g>% पूर्ण."</string>
+    <string name="crypt_keeper_setup_time_remaining" product="tablet" msgid="1655047311546745695">"आपला टॅब्लेट एंक्रिप्ट केला जात असताना प्रतीक्षा करा. शिल्लक वेळ: <xliff:g id="DURATION">^1</xliff:g>"</string>
+    <string name="crypt_keeper_setup_time_remaining" product="default" msgid="1862964662304683072">"आपला फोन एंक्रिप्ट केला जात असताना प्रतीक्षा करा. शिल्लक वेळ: <xliff:g id="DURATION">^1</xliff:g>"</string>
     <string name="crypt_keeper_force_power_cycle" product="tablet" msgid="556504311511212648">"आपला टॅबलेट अनलॉक करण्‍यासाठी, तो बंद करा आणि नंतर चालू करा."</string>
     <string name="crypt_keeper_force_power_cycle" product="default" msgid="1794353635603020327">"आपला फोन अनलॉक करण्‍यासाठी, तो बंद करा आणि नंतर चालू करा."</string>
-    <string name="crypt_keeper_warn_wipe" msgid="2738374897337991667">"चेतावणी: अनलॉक करण्‍याच्या आणखी <xliff:g id="COUNT">^1</xliff:g> अयशस्‍वी प्रयत्नांनंतर आपले डिव्‍हाइस पुसले जाईल."</string>
+    <string name="crypt_keeper_warn_wipe" msgid="2738374897337991667">"चेतावणी: अनलॉक करण्‍याच्या आणखी <xliff:g id="COUNT">^1</xliff:g> अयशस्‍वी प्रयत्नांनंतर तुमचे डिव्हाइस पुसले जाईल."</string>
     <string name="crypt_keeper_enter_password" msgid="2223340178473871064">"आपला संकेतशब्द टाइप करा"</string>
-    <string name="crypt_keeper_failed_title" msgid="7133499413023075961">"कूटबद्धीकरण अयशस्वी"</string>
-    <string name="crypt_keeper_failed_summary" product="tablet" msgid="8219375738445017266">"कूटबद्धीकरणात व्यत्यय आला आणि हे पूर्ण होऊ शकत नाही. परिणामस्वरूप, आपल्या टॅबलेटवरील डेटा यापुढे प्रवेशयोग्य राहणार नाही. \n\n आपला टॅबलेट वापरून पुन्हा सुरु करण्यासाठी, आपल्याला फॅक्टरी रीसेट करण्याची आवश्यकता आहे. रीसेट केल्यानंतर आपण आपला टॅबलेट सेट करता, तेव्हा आपल्याकडे आपल्या Google खात्यावर बॅकअप घेतलेला कोणताही डेटा पुनर्संचयित करण्याची संधी असेल."</string>
-    <string name="crypt_keeper_failed_summary" product="default" msgid="3270131542549577953">"कूटबद्धीकरणात व्यत्यय आला आणि पूर्ण होऊ शकत नाही. परिणामस्वरूप, आपल्या फोनवरील डेटा यापुढे प्रवेशयोग्य नाही.\n\nआपला फोन वापरणे पुन्हा सुरु करण्यासाठी, आपल्याला फॅक्टरी रीसेट करण्याची आवश्यकता आहे. रीसेट केल्यानंतर जेव्हा आपण आपला फोन सेट करता, तेव्हा आपल्याकडे आपल्या Google खात्यावर बॅकअप घेतलेला कोणताही डेटा पुनर्संचयित करण्याची संधी असेल."</string>
+    <string name="crypt_keeper_failed_title" msgid="7133499413023075961">"एंक्रिप्शन अयशस्वी"</string>
+    <string name="crypt_keeper_failed_summary" product="tablet" msgid="8219375738445017266">"कूटबद्धीकरणात व्यत्यय आला आणि हे पूर्ण होऊ शकत नाही. परिणामस्वरूप, आपल्या टॅबलेटवरील डेटा यापुढे प्रवेशयोग्य राहणार नाही. \n\n आपला टॅबलेट वापरून पुन्हा सुरु करण्यासाठी, आपल्याला फॅक्टरी रीसेट करण्याची आवश्यकता आहे. रीसेट केल्यानंतर आपण आपला टॅबलेट सेट करता, तेव्हा आपल्याकडे आपल्या Google खात्यावर बॅकअप घेतलेला कोणताही डेटा रीस्टोअर करण्याची संधी असेल."</string>
+    <string name="crypt_keeper_failed_summary" product="default" msgid="3270131542549577953">"कूटबद्धीकरणात व्यत्यय आला आणि पूर्ण होऊ शकत नाही. परिणामस्वरूप, आपल्या फोनवरील डेटा यापुढे प्रवेशयोग्य नाही.\n\nआपला फोन वापरणे पुन्हा सुरु करण्यासाठी, आपल्याला फॅक्टरी रीसेट करण्याची आवश्यकता आहे. रीसेट केल्यानंतर जेव्हा आपण आपला फोन सेट करता, तेव्हा आपल्याकडे आपल्या Google खात्यावर बॅकअप घेतलेला कोणताही डेटा रीस्टोअर करण्याची संधी असेल."</string>
     <string name="crypt_keeper_data_corrupt_title" msgid="8759119849089795751">"विकूटन अयशस्वी"</string>
-    <string name="crypt_keeper_data_corrupt_summary" product="tablet" msgid="840107296925798402">"आपण प्रविष्ट केलेला संकेतशब्द चुकीचा आहे, परंतु दुर्दैवाने आपला डेटा दूषित आहे. \n\nआपला टॅबलेट वापरणे पुनः सुरु करण्यासाठी, आपल्याला फॅक्टरी रीसेट करणे आवश्यक आहे. रीसेट केल्यानंतर आपण आपला टॅबलेट सेट करता, तेव्हा आपल्याला आपल्या Google खात्यावर बॅक अप घेतलेला कोणताही डेटा पुनर्संचयित करण्याची संधी असेल."</string>
-    <string name="crypt_keeper_data_corrupt_summary" product="default" msgid="8843311420059663824">"आपण प्रविष्ट केलेला संकेतशब्द बरोबर आहे, परंतु दुर्दैवाने आपला डेटा दूषित आहे. \n\nआपला फोन वापरणे पुनः सुरु करण्यासाठी, आपल्याला फॅक्टरी रीसेट करणे आवश्यक आहे. रीसेट केल्यानंतर आपण आपला फोन सेट करता, तेव्हा आपल्याला आपल्या Google खात्यावर बॅक अप घेतलेला कोणताही डेटा पुनर्संचयित करण्याची संधी असेल."</string>
+    <string name="crypt_keeper_data_corrupt_summary" product="tablet" msgid="840107296925798402">"आपण एंटर केलेला पासवर्ड चुकीचा आहे, परंतु दुर्दैवाने आपला डेटा दूषित आहे. \n\nआपला टॅबलेट वापरणे पुनः सुरु करण्यासाठी, आपल्याला फॅक्टरी रीसेट करणे आवश्यक आहे. रीसेट केल्यानंतर आपण आपला टॅबलेट सेट करता, तेव्हा आपल्याला आपल्या Google खात्यावर बॅक अप घेतलेला कोणताही डेटा रीस्टोअर करण्याची संधी असेल."</string>
+    <string name="crypt_keeper_data_corrupt_summary" product="default" msgid="8843311420059663824">"आपण एंटर केलेला पासवर्ड बरोबर आहे, परंतु दुर्दैवाने आपला डेटा दूषित आहे. \n\nआपला फोन वापरणे पुनः सुरु करण्यासाठी, आपल्याला फॅक्टरी रीसेट करणे आवश्यक आहे. रीसेट केल्यानंतर आपण आपला फोन सेट करता, तेव्हा आपल्याला आपल्या Google खात्यावर बॅक अप घेतलेला कोणताही डेटा रीस्टोअर करण्याची संधी असेल."</string>
     <string name="crypt_keeper_switch_input_method" msgid="4168332125223483198">"इनपुट पद्धत स्विच करा"</string>
     <string name="suggested_lock_settings_title" msgid="8971630898700461034">"स्क्रीन लॉक सेट करा"</string>
-    <string name="suggested_lock_settings_summary" msgid="8778462376012231110">"आपले डिव्हाइस संरक्षित करा"</string>
+    <string name="suggested_lock_settings_summary" msgid="8778462376012231110">"तुमचे डिव्हाइस संरक्षित करा"</string>
     <string name="suggested_fingerprint_lock_settings_title" msgid="3655973509619012084">"फिंगरप्रिंट वापरा"</string>
     <string name="suggested_fingerprint_lock_settings_summary" msgid="2149569133725273864">"आपल्या फिंगरप्रिंटसह अनलॉक करा"</string>
     <string name="lock_settings_picker_title" msgid="1095755849152582712">"स्क्रीन लॉक निवडा"</string>
     <string name="lock_settings_picker_title_profile" msgid="8822511284992306796">"कार्य लॉक निवडा"</string>
     <string name="setup_lock_settings_picker_title" product="tablet" msgid="90329443364067215">"आपला टॅबलेट संरक्षित करा"</string>
-    <string name="setup_lock_settings_picker_title" product="device" msgid="2399952075134938929">"आपले डिव्हाइस संरक्षित करा"</string>
+    <string name="setup_lock_settings_picker_title" product="device" msgid="2399952075134938929">"तुमचे डिव्हाइस संरक्षित करा"</string>
     <string name="setup_lock_settings_picker_title" product="default" msgid="1572244299605153324">"आपला फोन संरक्षित करा"</string>
-    <string name="setup_lock_settings_picker_fingerprint_message" msgid="5585650064305600578">"अतिरिक्त सुरक्षिततेसाठी, बॅकअप स्क्रीन लॉक सेट करा."</string>
-    <string name="setup_lock_settings_picker_message" product="tablet" msgid="8919671129189936210">"डिव्हाइस संरक्षण वैशिष्ट्ये सक्रिय करून आपल्या परवानगीशिवाय हा टॅबलेट वापरण्यापासून इतरांना प्रतिबंधित करा. आपण वापरू इच्छित असलेला स्क्रीन लॉक निवडा."</string>
-    <string name="setup_lock_settings_picker_message" product="device" msgid="3787276514406353777">"डिव्हाइस संरक्षण वैशिष्ट्ये सक्रिय करून आपल्या परवानगीशिवाय हे डिव्हाइस वापरण्यापासून इतरांना प्रतिबंधित करा. आपण वापरू इच्छित असलेला स्क्रीन लॉक निवडा."</string>
-    <string name="setup_lock_settings_picker_message" product="default" msgid="3692856437543730446">"डिव्हाइस संरक्षण वैशिष्ट्ये सक्रिय करून आपल्या परवानगीशिवाय हा फोन वापरण्यापासून इतरांना प्रतिबंधित करा. आपण वापरू इच्छित असलेला स्क्रीन लॉक निवडा."</string>
+    <string name="lock_settings_picker_fingerprint_added_security_message" msgid="5768002109707648463">"अतिरिक्त सुरक्षिततेसाठी, बॅकअप स्क्रीन लॉक सेट करा."</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>
@@ -470,13 +474,13 @@
     <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>
@@ -484,7 +488,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>
@@ -492,39 +496,47 @@
     <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>
-    <!-- no translation found for unlock_disable_frp_warning_content_pattern_fingerprint (2986105377420905314) -->
-    <skip />
-    <string name="unlock_disable_frp_warning_content_pin" msgid="586996206210265131">"आपल्या पिनशिवाय डिव्हाइस संरक्षण वैशिष्ट्ये कार्य करणार नाहीत."</string>
-    <!-- no translation found for unlock_disable_frp_warning_content_pin_fingerprint (3370462835533123695) -->
-    <skip />
-    <string name="unlock_disable_frp_warning_content_password" msgid="5420612686852555537">"आपल्या संकेतशब्दाशिवाय डिव्हाइस संरक्षण वैशिष्ट्ये कार्य करणार नाहीत."</string>
-    <!-- no translation found for unlock_disable_frp_warning_content_password_fingerprint (3595476296430536798) -->
-    <skip />
-    <string name="unlock_disable_frp_warning_content_unknown" msgid="1550718040483548220">"आपल्या स्क्रीनलॉकशिवाय डिव्हाइस संरक्षण वैशिष्ट्ये कार्य करणार नाहीत."</string>
-    <!-- no translation found for unlock_disable_frp_warning_content_unknown_fingerprint (3679351662094349506) -->
-    <skip />
+    <string name="unlock_disable_frp_warning_content_pattern" msgid="8869767290771023461">"तुमच्या पॅटर्नशिवाय डिव्हाइस संरक्षण वैशिष्ट्ये कार्य करणार नाहीत."</string>
+    <string name="unlock_disable_frp_warning_content_pattern_fingerprint" msgid="2986105377420905314">"तुमच्या नमुन्याशिवाय डिव्हाइस संरक्षण वैशिष्ट्ये काम करणार नाहीत.<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="3370462835533123695">"तुमच्या पिनशिवाय डिव्हाइस संरक्षण वैशिष्ट्ये काम करणार नाहीत.<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="3595476296430536798">"तुमच्या पासवर्डशिवाय डिव्हाइस संरक्षण वैशिष्ट्ये काम करणार नाहीत.<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="3679351662094349506">"तुमच्या स्क्रीन लॉकशिवाय डिव्हाइस संरक्षण वैशिष्ट्ये काम करणार नाहीत.<xliff:g id="EMPTY_LINE">
+
+</xliff:g>तुमच्या सेव्ह केलेल्या फिंगरप्रिंट देखील या डिव्हाइस मधून काढल्या जातील आणि तुम्ही तुमचा फोन अनलॉक, खरेदींना अधिकृत किंवा त्या वापरून अॅप्समध्ये साइन इन करू शकणार नाही."</string>
     <string name="unlock_disable_frp_warning_content_pattern_profile" msgid="8682200103576359918">"आपल्या नमुन्याशिवाय प्रोफाईल संरक्षण वैशिष्ट्ये कार्य करणार नाहीत."</string>
-    <!-- no translation found for unlock_disable_frp_warning_content_pattern_fingerprint_profile (6718155854303231675) -->
-    <skip />
+    <string name="unlock_disable_frp_warning_content_pattern_fingerprint_profile" msgid="6718155854303231675">"तुमच्या नमुन्याशिवाय प्रोफाइल संरक्षण वैशिष्ट्ये काम करणार नाहीत.<xliff:g id="EMPTY_LINE">
+
+</xliff:g>तुमच्या सेव्ह केलेल्या फिंगरप्रिंट देखील या प्रोफाइलमधून काढल्या जातील आणि तुम्ही तुमची प्रोफाइल अनलॉक, खरेदींना अधिकृत किंवा त्या वापरून अॅप्समध्ये साइन इन करू शकणार नाही."</string>
     <string name="unlock_disable_frp_warning_content_pin_profile" msgid="7790688070593867767">"आपल्या पिनशिवाय प्रोफाईल संरक्षण वैशिष्ट्ये कार्य करणार नाहीत."</string>
-    <!-- no translation found for unlock_disable_frp_warning_content_pin_fingerprint_profile (4209564603132870532) -->
-    <skip />
+    <string name="unlock_disable_frp_warning_content_pin_fingerprint_profile" msgid="4209564603132870532">"तुमच्या पिनशिवाय प्रोफाइल संरक्षण वैशिष्ट्ये काम करणार नाहीत.<xliff:g id="EMPTY_LINE">
+
+</xliff:g>तुमच्या सेव्ह केलेल्या फिंगरप्रिंट देखील या प्रोफाइलमधून काढल्या जातील आणि तुम्ही तुमची प्रोफाइल अनलॉक, खरेदींना अधिकृत किंवा त्या वापरून अॅप्समध्ये साइन इन करू शकणार नाही."</string>
     <string name="unlock_disable_frp_warning_content_password_profile" msgid="7569285520567674461">"आपल्या संकेतशब्दाशिवाय प्रोफाईल संरक्षण वैशिष्ट्ये कार्य करणार नाहीत."</string>
-    <!-- no translation found for unlock_disable_frp_warning_content_password_fingerprint_profile (2994300676764706047) -->
-    <skip />
+    <string name="unlock_disable_frp_warning_content_password_fingerprint_profile" msgid="2994300676764706047">"तुमच्या पासवर्डशिवाय प्रोफाइल संरक्षण वैशिष्ट्ये काम करणार नाहीत.<xliff:g id="EMPTY_LINE">
+
+</xliff:g>तुमच्या सेव्ह केलेल्या फिंगरप्रिंट देखील या प्रोफाइलमधून काढल्या जातील आणि तुम्ही तुमची प्रोफाइल अनलॉक, खरेदींना अधिकृत किंवा त्या वापरून अॅप्समध्ये साइन इन करू शकणार नाही."</string>
     <string name="unlock_disable_frp_warning_content_unknown_profile" msgid="6984215718701688202">"आपल्या स्क्रीनलॉक शिवाय प्रोफाईल संरक्षण वैशिष्ट्ये कार्य करणार नाहीत."</string>
-    <!-- no translation found for unlock_disable_frp_warning_content_unknown_fingerprint_profile (4994062501123299418) -->
-    <skip />
+    <string name="unlock_disable_frp_warning_content_unknown_fingerprint_profile" msgid="4994062501123299418">"तुमच्या स्क्रीन लॉकशिवाय प्रोफाइल संरक्षण वैशिष्ट्ये काम करणार नाहीत.<xliff:g id="EMPTY_LINE">
+
+</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_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>
@@ -552,7 +564,7 @@
     <string name="lockpassword_illegal_character" msgid="8049611046639943217">"यामध्ये अवैध वर्ण समाविष्ट असू शकत नाही"</string>
     <string name="lockpassword_password_requires_alpha" msgid="3036589522150097731">"कमीत कमी एक अक्षर असणे आवश्यक आहे"</string>
     <string name="lockpassword_password_requires_digit" msgid="5140062925787058765">"कमीत कमी एक अंक असणे आवश्यक आहे"</string>
-    <string name="lockpassword_password_requires_symbol" msgid="5944350865681510893">"कमीत कमी एक चिन्ह असणे आवश्यक आहे"</string>
+    <string name="lockpassword_password_requires_symbol" msgid="5944350865681510893">"कमीत कमी एक आयकन असणे आवश्यक आहे"</string>
     <plurals name="lockpassword_password_requires_letters" formatted="false" msgid="9013132344745898400">
       <item quantity="one">किमान <xliff:g id="COUNT">%d</xliff:g> अक्षर असणे आवश्यक आहे</item>
       <item quantity="other">किमान <xliff:g id="COUNT">%d</xliff:g> अक्षरे असणे आवश्यक आहे</item>
@@ -570,21 +582,22 @@
       <item quantity="other">किमान <xliff:g id="COUNT">%d</xliff:g> संख्यात्मक अंक असणे आवश्यक आहे</item>
     </plurals>
     <plurals name="lockpassword_password_requires_symbols" formatted="false" msgid="6751305770863640574">
-      <item quantity="one">किमान <xliff:g id="COUNT">%d</xliff:g> विशेष चिन्ह असणे आवश्यक आहे</item>
-      <item quantity="other">किमान <xliff:g id="COUNT">%d</xliff:g> विशेष चिन्हे असणे आवश्यक आहे</item>
+      <item quantity="one">किमान <xliff:g id="COUNT">%d</xliff:g> विशेष आयकन असणे आवश्यक आहे</item>
+      <item quantity="other">किमान <xliff:g id="COUNT">%d</xliff:g> विशेष आयकन असणे आवश्यक आहे</item>
     </plurals>
     <plurals name="lockpassword_password_requires_nonletter" formatted="false" msgid="4440596998172043055">
       <item quantity="one">किमान <xliff:g id="COUNT">%d</xliff:g> अक्षर नसलेला वर्ण असणे आवश्यक आहे</item>
       <item quantity="other">किमान <xliff:g id="COUNT">%d</xliff:g> अक्षर नसलेले वर्ण असणे आवश्यक आहे</item>
     </plurals>
-    <string name="lockpassword_password_recently_used" msgid="942665351220525547">"डिव्हाइस प्रशासक अलीकडील संकेतशब्द वापरण्याची अनुमती देत नाही"</string>
+    <string name="lockpassword_password_recently_used" msgid="942665351220525547">"डिव्हाइस प्रशासक अलीकडील पासवर्ड वापरण्याची अनुमती देत नाही"</string>
     <string name="lockpassword_pin_no_sequential_digits" msgid="680765285206990584">"अंकांच्या चढत्या, उतरत्या किंवा पुनरावृत्त क्रमाला अनुमती नाही"</string>
     <string name="lockpassword_ok_label" msgid="313822574062553672">"ठीक"</string>
     <string name="lockpassword_cancel_label" msgid="8818529276331121899">"रद्द करा"</string>
+    <string name="lockpassword_clear_label" msgid="5724429464960458155">"साफ करा"</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>
@@ -597,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="bluetooth_quick_toggle_title" msgid="1037056952714061893">"ब्लूटुथ"</string>
+    <string name="bluetooth_quick_toggle_title" msgid="1037056952714061893">"ब्लूटूथ"</string>
     <string name="bluetooth_quick_toggle_summary" msgid="5293641680139873341">"ब्लूटुथ चालू करा"</string>
-    <string name="bluetooth_settings" msgid="1810521656168174329">"ब्लूटुथ"</string>
-    <string name="bluetooth_settings_title" msgid="1908745291161353016">"ब्लूटुथ"</string>
+    <string name="bluetooth_settings" 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_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>
@@ -620,7 +633,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>
@@ -628,23 +641,23 @@
     <string name="bluetooth_pairing_dialog_title" msgid="1417255032435317301">"या डिव्हाइसशी जोडायचे?"</string>
     <string name="bluetooth_pairing_dialog_sharing_phonebook_title" msgid="7664141669886358618">"फोन बुक सामायिक करायचे?"</string>
     <string name="bluetooth_pairing_dialog_contants_request" msgid="5531109163573611348">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> आपल्या संपर्कांवर आणि कॉल इतिहासावर प्रवेश करू इच्छित आहे."</string>
-    <string name="bluetooth_pairing_dialog_paring_request" msgid="8451248193517851958">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> ब्लूटुथ सह जोडू इच्‍छिते. कनेक्‍ट केले असताना, त्यास आपल्‍या संपर्कांवर आणि कॉल इतिहासावर प्रवेश असेल."</string>
+    <string name="bluetooth_pairing_dialog_paring_request" msgid="8451248193517851958">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> ब्लूटूथ सह जोडू इच्‍छिते. कनेक्‍ट केले असताना, त्यास आपल्‍या संपर्कांवर आणि कॉल इतिहासावर अॅक्सेस असेल."</string>
     <string name="bluetooth_preference_paired_devices" msgid="1970524193086791964">"जोडलेली डिव्हाइसेस"</string>
     <string name="bluetooth_preference_found_devices" msgid="1647983835063249680">"उपलब्ध डिव्हाइसेस"</string>
     <string name="bluetooth_preference_no_found_devices" msgid="7594339669961811591">"कोणतेही डिव्हाइसेस उपलब्ध नाहीत"</string>
     <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="ble_scan_notify_text" msgid="1295915006005700650">"स्‍थान अचूकता सुधारण्‍यासाठी, सिस्टीम अ‍ॅप्स आणि सेवा अद्याप ब्लूटुथ डिव्‍हाइसेस शोधू शकतात. आपण हे <xliff:g id="LINK_BEGIN_0">LINK_BEGIN</xliff:g>स्कॅनिंग सेटिंग्ज<xliff:g id="LINK_END_1">LINK_END</xliff:g> मध्‍ये बदलू शकता."</string>
+    <string name="bluetooth_advanced_titlebar" msgid="2142159726881547669">"प्रगत ब्लूटूथ"</string>
+    <string name="bluetooth_empty_list_bluetooth_off" msgid="6351930724051893423">"ब्लूटूथ चालू असते तेव्हा, तुमचे डिव्हाइस इतर जवळच्या ब्लूटूथ डिव्हाइस सह संवाद करु शकते."</string>
+    <string name="ble_scan_notify_text" msgid="1295915006005700650">"स्‍थान अचूकता सुधारण्‍यासाठी, सिस्टम अ‍ॅप्स आणि सेवा अद्याप ब्लूटूथ डिव्हाइस शोधू शकतात. तुम्ही हे <xliff:g id="LINK_BEGIN_0">LINK_BEGIN</xliff:g>स्कॅनिंग सेटिंग्ज<xliff:g id="LINK_END_1">LINK_END</xliff:g> मध्‍ये बदलू शकता."</string>
     <string name="bluetooth_connect_failed" msgid="4500234659813241053">"कनेक्ट होऊ शकत नाही. पुन्हा प्रयत्न करा."</string>
     <string name="device_details_title" msgid="6576953269221085300">"डिव्हाइस तपशील"</string>
-    <string name="bluetooth_device_mac_address" msgid="2513724313558236181">"डिव्हाइसचा ब्लुटूथ अ‍ॅड्रेस: <xliff:g id="ADDRESS">%1$s</xliff:g>"</string>
+    <string name="bluetooth_device_mac_address" msgid="2513724313558236181">"डीव्हाइसचा ब्लूटूथ अ‍ॅड्रेस: <xliff:g id="ADDRESS">%1$s</xliff:g>"</string>
     <string name="bluetooth_unpair_dialog_title" msgid="38467834196432400">"डिव्हाइस विसरलात का?"</string>
     <string name="bluetooth_unpair_dialog_body" product="default" msgid="9087609557757135712">"तुमचा फोन यापुढे <xliff:g id="DEVICE_NAME">%1$s</xliff:g>शी जोडलेला राहणार नाही"</string>
     <string name="bluetooth_unpair_dialog_body" product="tablet" msgid="7785695793007576501">"तुमचा टॅबलेट यापुढे <xliff:g id="DEVICE_NAME">%1$s</xliff:g>शी जोडलेला राहणार नाही"</string>
@@ -654,31 +667,31 @@
     <string name="bluetooth_disconnect_a2dp_profile" msgid="3524648279150937177">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> मीडिया ऑडिओवरून डिस्कनेक्ट होईल."</string>
     <string name="bluetooth_disconnect_headset_profile" msgid="8635908811168780720">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> हँड्सफ्री ऑडिओवरून डिस्कनेक्ट होईल."</string>
     <string name="bluetooth_disconnect_hid_profile" msgid="3282295189719352075">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> इनपुट डिव्हाइसवरून डिस्कनेक्ट होईल."</string>
-    <string name="bluetooth_disconnect_pan_user_profile" msgid="8037627994382458698">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> द्वारे इंटरनेट प्रवेश डिस्कनेक्ट केला जाईल."</string>
-    <string name="bluetooth_disconnect_pan_nap_profile" product="tablet" msgid="1262792320446274407">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> या टॅब्लेटचे इंटरनेट कनेक्शन सामायिक करण्यावरून डिस्कनेक्ट होईल."</string>
-    <string name="bluetooth_disconnect_pan_nap_profile" product="default" msgid="5700332050175684571">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> या फोनचे इंटरनेट कनेक्शन सामायिक करण्यावरून डिस्कनेक्ट होईल."</string>
-    <string name="bluetooth_device_advanced_title" msgid="6066342531927499308">"जोडलेले ब्लूटुथ डिव्हाइस"</string>
+    <string name="bluetooth_disconnect_pan_user_profile" msgid="8037627994382458698">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> द्वारे इंटरनेट अॅक्सेस डिस्कनेक्ट केला जाईल."</string>
+    <string name="bluetooth_disconnect_pan_nap_profile" product="tablet" msgid="1262792320446274407">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> या टॅबलेटचे इंटरनेट कनेक्शन शेअर केल्याने डिस्कनेक्ट होईल."</string>
+    <string name="bluetooth_disconnect_pan_nap_profile" product="default" msgid="5700332050175684571">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> या फोनचे इंटरनेट कनेक्शन शेअर केल्याने डिस्कनेक्ट होईल."</string>
+    <string name="bluetooth_device_advanced_title" msgid="6066342531927499308">"पेअर केलेले ब्लूटूथ डिव्हाइस"</string>
     <string name="bluetooth_device_advanced_online_mode_title" msgid="3689050071425683114">"कनेक्ट करा"</string>
-    <string name="bluetooth_device_advanced_online_mode_summary" msgid="1204424107263248336">"ब्लूटुथ डिव्हाइसवर कनेक्ट करा"</string>
+    <string name="bluetooth_device_advanced_online_mode_summary" msgid="1204424107263248336">"ब्लूटूथ डीव्हाइसवर कनेक्ट करा"</string>
     <string name="bluetooth_device_advanced_profile_header_title" msgid="102745381968579605">"यासाठी वापरा"</string>
     <string name="bluetooth_device_advanced_rename_device" msgid="5148578059584955791">"पुनर्नामित करा"</string>
     <string name="bluetooth_device_advanced_enable_opp_title" msgid="8222550640371627365">"येणार्‍या फाईल स्थानांतरणांना अनुमती द्या"</string>
-    <string name="bluetooth_pan_user_profile_summary_connected" msgid="4602294638909590612">"इंटरनेट प्रवेशासाठी डिव्हाइसवर कनेक्ट केले"</string>
-    <string name="bluetooth_pan_nap_profile_summary_connected" msgid="1561383706411975199">"डिव्हाइससह स्थानिक इंटरनेट कनेक्शन सामायिक करत आहे"</string>
+    <string name="bluetooth_pan_user_profile_summary_connected" msgid="4602294638909590612">"इंटरनेट अॅक्सेससाठी डीव्हाइसवर कनेक्ट केले"</string>
+    <string name="bluetooth_pan_nap_profile_summary_connected" msgid="1561383706411975199">"डीव्हाइससह स्थानिक इंटरनेट कनेक्शन शेअर करत आहे"</string>
     <string name="bluetooth_dock_settings" msgid="3218335822716052885">"डॉक सेटिंग्ज"</string>
     <string name="bluetooth_dock_settings_title" msgid="5543069893044375188">"ऑडिओसाठी डॉक वापरा"</string>
     <string name="bluetooth_dock_settings_headset" msgid="1001821426078644650">"स्पीकर फोन म्हणून"</string>
     <string name="bluetooth_dock_settings_a2dp" msgid="8791004998846630574">"संगीत आणि मीडियासाठी"</string>
     <string name="bluetooth_dock_settings_remember" msgid="5551459057010609115">"सेटिंग्ज लक्षात ठेवा"</string>
     <string name="wifi_display_settings_title" msgid="8740852850033480136">"कास्‍ट करा"</string>
-    <string name="wifi_display_enable_menu_item" msgid="4883036464138167674">"वायरलेस प्रदर्शन सक्षम करा"</string>
+    <string name="wifi_display_enable_menu_item" msgid="4883036464138167674">"वायरलेस डिस्प्ले सुरू करा"</string>
     <string name="wifi_display_no_devices_found" msgid="1382012407154143453">"कोणतीही जवळपासची डिव्हाइसेस आढळली नाहीत."</string>
     <string name="wifi_display_status_connecting" msgid="5688608834000748607">"कनेक्ट करीत आहे"</string>
     <string name="wifi_display_status_connected" msgid="8364125226376985558">"कनेक्ट केले"</string>
     <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>
@@ -691,13 +704,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>
@@ -705,9 +718,9 @@
     <string name="wifi_settings_title" msgid="3103415012485692233">"वाय-फाय"</string>
     <string name="wifi_settings_summary" msgid="668767638556052820">"वायरलेस प्रवेश बिंदू सेट करा आणि  व्यवस्थापित करा"</string>
     <string name="wifi_select_network" msgid="4210954938345463209">"वाय-फाय निवडा"</string>
-    <string name="wifi_starting" msgid="6732377932749942954">"वाय-फाय चालू करीत आहे..."</string>
-    <string name="wifi_stopping" msgid="8952524572499500804">"वाय-फाय बंद करीत आहे…"</string>
-    <string name="wifi_error" msgid="3207971103917128179">"त्रुटी"</string>
+    <string name="wifi_starting" msgid="6732377932749942954">"वाय-फाय चालू करत आहे..."</string>
+    <string name="wifi_stopping" msgid="8952524572499500804">"वाय-फाय बंद करत आहे…"</string>
+    <string name="wifi_error" msgid="3207971103917128179">"एरर"</string>
     <string name="wifi_sap_no_channel_error" msgid="3108445199311817111">"या देशात 5 GHz बँड उपलब्‍ध नाही"</string>
     <string name="wifi_in_airplane_mode" msgid="8652520421778203796">"विमान मोड मध्ये"</string>
     <string name="wifi_notify_open_networks" msgid="76298880708051981">"नेटवर्क सूचना उघडा"</string>
@@ -723,8 +736,8 @@
     <string name="use_open_wifi_automatically_summary" msgid="2982091714252931713">"उच्च गुणवत्तेच्या सार्वजनिक नेटवर्कशी स्वयंचलितपणे कनेक्ट करा"</string>
     <string name="use_open_wifi_automatically_summary_scoring_disabled" msgid="593964217679325831">"वापरण्‍यासाठी, नेटवर्क रेटिंग पुरवठादार निवडा"</string>
     <string name="use_open_wifi_automatically_summary_scorer_unsupported_disabled" msgid="8472122600853650258">"वापरण्‍यासाठी, सुसंगत नेटवर्क रेटिंग पुरवठादार निवडा"</string>
-    <string name="wifi_install_credentials" msgid="3551143317298272860">"प्रमाणपत्रे स्थापित करा"</string>
-    <string name="wifi_scan_notify_text" msgid="5593805423071186757">"स्‍थान अचूकता सुधारण्‍यासाठी, सिस्टीम अ‍ॅप्स आणि सेवा अद्याप वाय-फाय नेटवर्कसाठी स्कॅन करू शकतात. आपण हे <xliff:g id="LINK_BEGIN_0">LINK_BEGIN</xliff:g>स्कॅनिंग सेटिंग्ज<xliff:g id="LINK_END_1">LINK_END</xliff:g> मध्‍ये बदलू शकता."</string>
+    <string name="wifi_install_credentials" msgid="3551143317298272860">"प्रमाणपत्रे इंस्टॉल करा"</string>
+    <string name="wifi_scan_notify_text" msgid="5593805423071186757">"स्‍थान अचूकता सुधारण्‍यासाठी, सिस्टम अ‍ॅप्स आणि सेवा अद्याप वाय-फाय नेटवर्कसाठी स्कॅन करू शकतात. तुम्ही हे <xliff:g id="LINK_BEGIN_0">LINK_BEGIN</xliff:g>स्कॅनिंग सेटिंग्ज<xliff:g id="LINK_END_1">LINK_END</xliff:g> मध्‍ये बदलू शकता."</string>
     <string name="wifi_scan_notify_text_scanning_off" msgid="3426075479272242098">"स्थान अचूकता वाढवण्यासाठी, <xliff:g id="LINK_BEGIN_0">LINK_BEGIN</xliff:g>स्कॅनिंग सेटिंग्ज<xliff:g id="LINK_END_1">LINK_END</xliff:g> मध्ये वाय-फाय स्कॅनिंग चालू करा."</string>
     <string name="wifi_scan_notify_remember_choice" msgid="7104867814641144485">"पुन्हा दर्शवू नका"</string>
     <string name="wifi_setting_sleep_policy_title" msgid="5149574280392680092">"निष्क्रिय असताना वाय-फाय चालू ठेवा"</string>
@@ -734,9 +747,9 @@
     <string name="wifi_suspend_optimizations" msgid="1220174276403689487">"वाय-फाय ऑप्टिमायझेशन"</string>
     <string name="wifi_suspend_optimizations_summary" msgid="4151428966089116856">"वाय-फाय चालू असताना बॅटरी वापर कमी करा"</string>
     <string name="wifi_limit_optimizations_summary" msgid="9000801068363468950">"वाय-फाय द्वारे वापरलेल्या बॅटरीवर मर्यादा घाला"</string>
-    <string name="wifi_switch_away_when_unvalidated" msgid="1707247692180853058">"वाय-फाय ने इंटरनेट प्रवेश गमावल्यास मोबाइल डेटावर स्विच करा."</string>
+    <string name="wifi_switch_away_when_unvalidated" msgid="1707247692180853058">"वाय-फाय ने इंटरनेट अॅक्सेस गमावल्यास मोबाइल डेटावर स्विच करा."</string>
     <string name="wifi_cellular_data_fallback_title" msgid="8753386877755616476">"मोबाइल डेटावर स्‍वयंचलितपणे स्विच करा"</string>
-    <string name="wifi_cellular_data_fallback_summary" msgid="6375399280719867214">"वाय-फायवरून इंटरनेटवर प्रवेश नसताना मोबाइल डेटा वापरा. डेटा वापर लागू होऊ शकतो."</string>
+    <string name="wifi_cellular_data_fallback_summary" msgid="6375399280719867214">"वाय-फायवरून इंटरनेटवर अॅक्सेस नसताना मोबाइल डेटा वापरा. डेटा वापर लागू होऊ शकतो."</string>
     <string name="wifi_add_network" msgid="6234851776910938957">"नेटवर्क जोडा"</string>
     <string name="wifi_configure_settings_preference_title" msgid="2913345003906899146">"वाय-फाय प्राधान्ये"</string>
     <string name="wifi_configure_settings_preference_summary_wakeup_on" msgid="646393113104367290">"वाय-फाय स्वयंचलितपणे परत चालू होते"</string>
@@ -745,7 +758,7 @@
     <string name="wifi_menu_wps_pbc" msgid="2668564692207863017">"WPS पुश बटण"</string>
     <string name="wifi_menu_more_options" msgid="2448097861752719396">"अधिक पर्याय"</string>
     <string name="wifi_menu_wps_pin" msgid="6426448256268695933">"WPS पिन प्रविष्टी"</string>
-    <string name="wifi_menu_p2p" msgid="7619851399250896797">"वाय-फाय थेट"</string>
+    <string name="wifi_menu_p2p" msgid="7619851399250896797">"वाय-फाय डिरेक्ट"</string>
     <string name="wifi_menu_scan" msgid="1470911530412095868">"स्कॅन करा"</string>
     <string name="wifi_menu_advanced" msgid="7522252991919573664">"प्रगत"</string>
     <string name="wifi_menu_configure" msgid="6150926852602171938">"कॉन्फिगर करा"</string>
@@ -756,7 +769,7 @@
     <string name="wifi_menu_write_to_nfc" msgid="7692881642188240324">"NFC टॅग वर लिहा"</string>
     <string name="wifi_empty_list_wifi_off" msgid="8056223875951079463">"उपलब्ध नेटवर्क पाहण्यासाठी, वाय-फाय चालू करा."</string>
     <string name="wifi_empty_list_wifi_on" msgid="8746108031587976356">"वाय-फाय नेटवर्क शोधत आहे…"</string>
-    <string name="wifi_empty_list_user_restricted" msgid="7322372065475939129">"आपल्याला वाय-फाय नेटवर्क बदलण्याची परवानगी नाही."</string>
+    <string name="wifi_empty_list_user_restricted" msgid="7322372065475939129">"तुमच्याला वाय-फाय नेटवर्क बदलण्याची परवानगी नाही."</string>
     <string name="wifi_more" msgid="3195296805089107950">"अधिक"</string>
     <string name="wifi_setup_wps" msgid="8128702488486283957">"स्वयंचलित सेटअप (WPS)"</string>
     <string name="wifi_show_advanced" msgid="3409422789616520979">"प्रगत पर्याय"</string>
@@ -764,26 +777,27 @@
     <string name="wifi_advanced_toggle_description_collapsed" msgid="1463812308429197263">"ड्रॉप-डाउन सूची प्रगत पर्याय. विस्तृत करण्‍यासाठी दोनदा-टॅप करा."</string>
     <string name="wifi_wps_setup_title" msgid="8207552222481570175">"वाय-फाय संरक्षित सेटअप"</string>
     <string name="wifi_wps_setup_msg" msgid="315174329121275092">"WPS प्रारंभ करीत आहे…"</string>
-    <string name="wifi_wps_onstart_pbc" msgid="817003360936932340">"आपल्या राउटरवरील वाय‑फाय संरक्षित सेटअप बटण दाबा. त्यास \"WPS\" म्हटले जाऊ शकते किंवा या चिन्हाने चिन्हांकित केले जाऊ शकते:"</string>
-    <string name="wifi_wps_onstart_pin" msgid="223344506445335358">"आपल्या वाय-फाय राउटरवर पिन <xliff:g id="NUMBER">%1$s</xliff:g> प्रविष्ट करा. सेटअप पूर्ण होण्यास दोन मिनिटांपर्यंत लागू शकतात."</string>
+    <string name="wifi_wps_onstart_pbc" msgid="817003360936932340">"तुमच्या राउटरवरील वाय‑फाय संरक्षित सेटअप बटण दाबा. त्यास \"WPS\" म्हटले जाऊ शकते किंवा या चिन्हाने चिन्हांकित केले जाऊ शकते:"</string>
+    <string name="wifi_wps_onstart_pin" msgid="223344506445335358">"तुमच्या Wi‑Fi राउटरवर पिन <xliff:g id="NUMBER">%1$s</xliff:g> एंटर करा. सेटअप पूर्ण होण्यास दोन मिनिटे वेळ लागू शकतो."</string>
     <string name="wifi_wps_complete" msgid="2388138550456729134">"WPS यशस्वी झाले. नेटवर्कशी कनेक्ट करत आहे..."</string>
-    <string name="wifi_wps_connected" msgid="7153432445748931183">"वाय-फाय नेटवर्क <xliff:g id="NETWORK_NAME">%s</xliff:g> शी कनेक्ट झाले"</string>
+    <string name="wifi_wps_connected" msgid="7153432445748931183">"Wi‑Fi नेटवर्क <xliff:g id="NETWORK_NAME">%s</xliff:g> शी कनेक्ट झाले"</string>
     <string name="wifi_wps_in_progress" msgid="3372311348221357944">"WPS आधीपासून प्रगतीपथावर आहे आणि पूर्ण होण्यास दोन मिनिटे लागू शकतात"</string>
     <string name="wifi_wps_failed_generic" msgid="5668775022238832527">"WEP अयशस्वी. कृपया काही मिनिटांनी पुन्हा प्रयत्न करा."</string>
     <string name="wifi_wps_failed_wep" msgid="2702820087105284461">"वायरलेस राउटर सुरक्षा सेटिंग (WEP) समर्थित नाही"</string>
     <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>
     <string name="wifi_signal" msgid="5514120261628065287">"सिग्नल सामर्थ्य"</string>
     <string name="wifi_status" msgid="4824568012414605414">"स्थिती"</string>
-    <string name="wifi_speed" msgid="3526198708812322037">"दुवा गती"</string>
+    <string name="wifi_speed" msgid="3526198708812322037">"लिंक गती"</string>
     <string name="wifi_frequency" msgid="7791090119577812214">"वारंवारता"</string>
     <string name="wifi_ip_address" msgid="1440054061044402918">"IP पत्ता"</string>
     <string name="passpoint_label" msgid="6381371313076009926">"द्वारे जतन केले"</string>
-    <string name="passpoint_content" msgid="8447207162397870483">"<xliff:g id="NAME">%1$s</xliff:g> क्रेडेन्शियल"</string>
+    <string name="passpoint_content" msgid="8447207162397870483">"<xliff:g id="NAME">%1$s</xliff:g> क्रेडेंशियल"</string>
     <string name="wifi_eap_method" msgid="8529436133640730382">"EAP पद्धत"</string>
     <string name="please_select_phase2" msgid="5231074529772044898">"टप्पा 2 प्रमाणीकरण"</string>
     <string name="wifi_eap_ca_cert" msgid="3521574865488892851">"CA प्रमाणपत्र"</string>
@@ -797,11 +811,11 @@
     <string name="wifi_ap_choose_2G" msgid="8724267386885036210">"2.4 GHz बँड"</string>
     <string name="wifi_ap_choose_5G" msgid="8137061170937978040">"5 GHz बँड"</string>
     <string name="wifi_ip_settings" msgid="3359331401377059481">"IP सेटिंग्ज"</string>
-    <string name="wifi_shared" msgid="844142443226926070">"इतर डिव्हाइस वापरकर्त्यांसह सामायिक करा"</string>
+    <string name="wifi_shared" msgid="844142443226926070">"इतर डिव्हाइस वापरकर्त्यांसह शेअर करा"</string>
     <string name="wifi_unchanged" msgid="3410422020930397102">"(न बदललेले)"</string>
     <string name="wifi_unspecified" msgid="4917316464723064807">"कृपया निवडा"</string>
     <string name="wifi_multiple_cert_added" msgid="3240743501460165224">"(एकाधिक प्रमाणपत्रे जोडली)"</string>
-    <string name="wifi_use_system_certs" msgid="5270879895056893783">"सिस्टीम प्रमाणपत्रे वापरा"</string>
+    <string name="wifi_use_system_certs" msgid="5270879895056893783">"सिस्टम प्रमाणपत्रे वापरा"</string>
     <string name="wifi_do_not_provide_eap_user_cert" msgid="5160499244977160665">"प्रदान करू नका"</string>
     <string name="wifi_do_not_validate_eap_server" msgid="4266754430576348471">"प्रमाणित करू नका"</string>
     <string name="wifi_do_not_validate_eap_server_warning" msgid="1787190245542586660">"कोणतेही प्रमाणपत्र निर्दिष्ट केले नाही. आपले कनेक्शन खाजगी होणार नाही."</string>
@@ -810,25 +824,28 @@
     <string name="wifi_wps_available_first_item" msgid="4422547079984583502">"WPS उपलब्ध"</string>
     <string name="wifi_wps_available_second_item" msgid="8427520131718215301">" (WPS उपलब्ध)"</string>
     <string name="wifi_wps_nfc_enter_password" msgid="2288214226916117159">"आपला नेटवर्क संकेतशब्द प्रविष्ट करा"</string>
+    <string name="wifi_carrier_connect" msgid="8174696557882299911">"वाहक वाय-फाय नेटवर्क"</string>
+    <string name="wifi_carrier_content" msgid="4634077285415851933">"<xliff:g id="NAME">%1%s</xliff:g> ने कनेक्ट करा"</string>
     <string name="wifi_scan_always_turnon_message" msgid="203123538572122989">"स्थान अचूकता सुधारण्यासाठी आणि इतर हेतूंसाठी, <xliff:g id="APP_NAME">%1$s</xliff:g> ला नेटवर्क स्कॅनिंग चालू करण्याची आवश्यकता आहे, वाय-फाय बंद असताना देखील.\n\nस्कॅन करू इच्छित सर्व अॅप्सना अनुमती द्यायची?"</string>
     <string name="wifi_scan_always_turnoff_message" msgid="5538901671131941043">"हे बंद करण्यासाठी, ओव्हरफ्लो मेनू मधील प्रगत वर जा."</string>
     <string name="wifi_scan_always_confirm_allow" msgid="5355973075896817232">"अनुमती द्या"</string>
     <string name="wifi_scan_always_confirm_deny" msgid="4463982053823520710">"नकार द्या"</string>
     <string name="wifi_hotspot_title" msgid="7726205804813286950">"कनेक्ट करण्यासाठी साइन इन करायचे?"</string>
-    <string name="wifi_hotspot_message" msgid="3673833421453455747">"<xliff:g id="APP_NAME">%1$s</xliff:g> साठी आपण नेटवर्कशी कनेक्ट करण्यापूर्वी आपल्याला ऑनलाइन साइन करण्याची आवश्यकता आहे."</string>
+    <string name="wifi_hotspot_message" msgid="3673833421453455747">"<xliff:g id="APP_NAME">%1$s</xliff:g> साठी आपण नेटवर्कशी कनेक्ट करण्यापूर्वी तुम्हाला ऑनलाइन साइन करण्याची आवश्यकता आहे."</string>
     <string name="wifi_hotspot_connect" msgid="5065506390164939225">"कनेक्ट करा"</string>
-    <string name="no_internet_access_text" msgid="7133561752896706392">"या नेटवर्कवर इंटरनेट प्रवेश नाही. कनेक्‍ट केलेले राहायचे?"</string>
+    <string name="no_internet_access_text" msgid="7133561752896706392">"या नेटवर्कवर इंटरनेट अॅक्सेस नाही. कनेक्‍ट केलेले राहायचे?"</string>
     <string name="no_internet_access_remember" msgid="4697314331614625075">"या नेटर्वकसाठी पुन्हा विचारू नका"</string>
     <string name="lost_internet_access_title" msgid="6228530645663584505">"वाय-फाय इंटरनेटशी कनेक्ट केलेले नाही"</string>
-    <string name="lost_internet_access_text" msgid="9029649339816197345">"वाय-फायचे कनेक्शन खराब असताना आपण मोबाइल नेटवर्कवर स्विच करू शकता. डेटा वापर शुल्क लागू होऊ शकतात."</string>
+    <string name="lost_internet_access_text" msgid="9029649339816197345">"वाय-फायचे कनेक्शन खराब असताना तुम्ही मोबाइल नेटवर्कवर स्विच करू शकता. डेटा वापर शुल्क लागू होऊ शकतात."</string>
     <string name="lost_internet_access_switch" msgid="2262459569601190039">"मोबाइलवर स्विच करा"</string>
     <string name="lost_internet_access_cancel" msgid="338273139419871110">"वाय‑फाय वर सुरु ठेवा"</string>
     <string name="lost_internet_access_persist" msgid="7634876061262676255">"पुन्हा कधीही दर्शवू नका"</string>
     <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_modify" msgid="6100248070440710782">"बदल करा"</string>
     <string name="wifi_failed_forget_message" msgid="1348172929201654986">"नेटवर्क विसरण्यात अयशस्वी"</string>
-    <string name="wifi_save" msgid="3331121567988522826">"जतन करा"</string>
+    <string name="wifi_save" msgid="3331121567988522826">"सेव्ह करा"</string>
     <string name="wifi_failed_save_message" msgid="6650004874143815692">"नेटवर्क जतन करण्यात अयशस्वी"</string>
     <string name="wifi_cancel" msgid="6763568902542968964">"रद्द करा"</string>
     <string name="wifi_saved_access_points_titlebar" msgid="2996149477240134064">"जतन केलेली नेटवर्क"</string>
@@ -839,59 +856,58 @@
     <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_title" msgid="3471132676909349382">"नेटवर्क माहिती"</string>
     <string name="wifi_details_subnet_mask" msgid="6720279144174924410">"सबनेट मास्क"</string>
     <string name="wifi_details_dns" msgid="8648826607751830768">"DNS"</string>
     <string name="wifi_details_ipv6_address_header" msgid="6734119149106422148">"IPv6 पत्‍ते"</string>
     <string name="wifi_saved_access_points_label" msgid="2013409399392285262">"जतन केलेली नेटवर्क"</string>
     <string name="wifi_advanced_settings_label" msgid="3654366894867838338">"IP सेटिंग्ज"</string>
     <string name="wifi_advanced_not_available" msgid="5823045095444154586">"वाय‑फाय प्रगत सेटिंग्ज या वापरकर्त्यासाठी उपलब्ध नाहीत"</string>
-    <string name="wifi_ip_settings_menu_save" msgid="7296724066102908366">"जतन करा"</string>
+    <string name="wifi_ip_settings_menu_save" msgid="7296724066102908366">"सेव्ह करा"</string>
     <string name="wifi_ip_settings_menu_cancel" msgid="6582567330136502340">"रद्द करा"</string>
     <string name="wifi_ip_settings_invalid_ip_address" msgid="2513142355364274970">"वैध IP पत्ता टाइप करा."</string>
     <string name="wifi_ip_settings_invalid_gateway" msgid="8164264988361096450">"वैध गेटवे पत्ता टाइप करा."</string>
     <string name="wifi_ip_settings_invalid_dns" msgid="8744583948328391047">"वैध DNS पत्ता टाइप करा."</string>
-    <string name="wifi_ip_settings_invalid_network_prefix_length" msgid="40470058023181052">"0 आणि 32 दरम्यान नेटवर्क प्रत्यय लांबी टाइप करा."</string>
+    <string name="wifi_ip_settings_invalid_network_prefix_length" msgid="40470058023181052">"0 आणि 32 दरम्यान नेटवर्क उपसर्ग लांबी टाइप करा."</string>
     <string name="wifi_dns1" msgid="7344118050720080045">"DNS 1"</string>
     <string name="wifi_dns2" msgid="1368601006824882659">"DNS 2"</string>
     <string name="wifi_gateway" msgid="163914742461092086">"गेटवे"</string>
     <string name="wifi_network_prefix_length" msgid="3028785234245085998">"नेटवर्क उपसर्ग लांबी"</string>
-    <string name="wifi_p2p_settings_title" msgid="5444461191435291082">"वाय-फाय थेट"</string>
+    <string name="wifi_p2p_settings_title" msgid="5444461191435291082">"वाय-फाय डिरेक्ट"</string>
     <string name="wifi_p2p_device_info" msgid="3191876744469364173">"डिव्हाइस माहिती"</string>
     <string name="wifi_p2p_persist_network" msgid="1646424791818168590">"हे कनेक्शन लक्षात ठेवा"</string>
     <string name="wifi_p2p_menu_search" msgid="3436429984738771974">"डिव्हाइसेस शोधा"</string>
     <string name="wifi_p2p_menu_searching" msgid="2396704492143633876">"शोधत आहे..."</string>
-    <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>
     <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_off_subtext" msgid="5466126533609394170">"इंटरनेट किंवा आशय इतर डिव्हाइससोबत शेअर करत नाही"</string>
     <string name="wifi_hotspot_tethering_on_subtext" product="tablet" msgid="5752490509369962007">"या टॅबलेटचे इंटरनेट कनेक्शन हॉटस्पॉटने शेअर करत आहे"</string>
     <string name="wifi_hotspot_tethering_on_subtext" product="default" msgid="6461075246164300670">"या फोनचे इंटरनेट कनेक्शन हॉटस्पॉटने शेअर करत आहे"</string>
     <string name="wifi_hotspot_on_local_only_subtext" msgid="2068110388011294735">"अ‍ॅप आशय शेअर करत आहे. इंटरनेट कनेक्शन शेअर करण्यासाठी, हॉटस्‍पॉट बंद करा, नंतर चालू करा"</string>
-    <string name="wifi_hotspot_name_title" msgid="1341735529132128887">"वाय-फायचे नाव"</string>
+    <string name="wifi_hotspot_name_title" msgid="8237000746618636778">"हॉटस्पॉट नाव"</string>
     <string name="wifi_hotspot_name_summary_connecting" msgid="3378299995508671967">"<xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g> चालू करत आहे..."</string>
     <string name="wifi_hotspot_name_summary_connected" msgid="3888672084861445362">"इतर डिव्हाइस <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>शी कनेक्ट होऊ शकतात"</string>
-    <string name="wifi_hotspot_password_title" msgid="1955592302902091281">"वाय-फाय पासवर्ड"</string>
+    <string name="wifi_hotspot_password_title" msgid="8676859981917573801">"हॉटस्पॉट पासवर्ड"</string>
     <string name="wifi_hotspot_ap_band_title" msgid="1165801173359290681">"AP Band"</string>
-    <string name="wifi_hotspot_footer_info_regular" msgid="1203489406068036455">"तुमच्या इतर डिव्हाइससाठी वाय-फाय नेटवर्क तयार करण्यासाठी हॉटस्पॉटचा वापर करा. हॉटस्पॉट हे तुमच्या मोबाइल डेटा कनेक्शनमधून इंटरनेट पुरवते. अतिरिक्त मोबाइल डेटा शुल्क लागू होऊ शकते."</string>
+    <string name="wifi_hotspot_footer_info_regular" msgid="1203489406068036455">"तुमच्या इतर डीव्हाइससाठी वाय-फाय नेटवर्क तयार करण्यासाठी हॉटस्पॉटचा वापर करा. हॉटस्पॉट हे तुमच्या मोबाइल डेटा कनेक्शनमधून इंटरनेट पुरवते. अतिरिक्त मोबाइल डेटा शुल्क लागू होऊ शकते."</string>
     <string name="wifi_hotspot_footer_info_local_only" msgid="857988412470694109">"जवळपासच्या डिव्हाइससोबत आशय शेअर करण्यासाठी अ‍ॅप्स हॉटस्पॉट तयार करू शकतात."</string>
     <string name="wifi_tether_starting" msgid="1322237938998639724">"हॉटस्पॉट चालू करीत आहे…"</string>
     <string name="wifi_tether_stopping" msgid="4835852171686388107">"हॉटस्पॉट बंद करीत आहे…"</string>
     <string name="wifi_tether_enabled_subtext" msgid="7842111748046063857">"<xliff:g id="NETWORK_SSID">%1$s</xliff:g> सक्रिय आहे"</string>
-    <string name="wifi_tether_failed_subtext" msgid="1484941858530919002">"पोर्टेबल वाय-फाय हॉटस्पॉट त्रुटी"</string>
+    <string name="wifi_tether_failed_subtext" msgid="1484941858530919002">"पोर्टेबल वाय-फाय हॉटस्पॉट एरर"</string>
     <string name="wifi_tether_configure_ap_text" msgid="7974681394041609308">"वाय-फाय हॉटस्पॉट सेट करा"</string>
     <string name="wifi_hotspot_configure_ap_text" msgid="5478614731464220432">"वाय-फाय हॉटस्पॉट सेटअप"</string>
     <string name="wifi_hotspot_configure_ap_text_summary" msgid="5560680057727007011">"AndroidAP WPA2 PSK हॉटस्पॉट"</string>
-    <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>
@@ -903,7 +919,7 @@
     <skip />
     <string name="wifi_calling_roaming_mode_dialog_title" msgid="7800926602662078576">"रोमिंग प्राधान्य"</string>
   <string-array name="wifi_calling_mode_choices">
-    <item msgid="2124257075906188844">"वाय-फाय प्राधान्यकृत"</item>
+    <item msgid="2124257075906188844">"वाय-फाय अग्रमानांकित"</item>
     <item msgid="1335127656328817518">"प्राधान्य दिलेला मोबाइल"</item>
     <item msgid="3132912693346866895">"केवळ वाय-फाय"</item>
   </string-array>
@@ -918,7 +934,7 @@
     <item msgid="3194458950573886239">"0"</item>
   </string-array>
   <string-array name="wifi_calling_mode_choices_without_wifi_only">
-    <item msgid="5782108782860004851">"वाय-फाय प्राधान्यकृत"</item>
+    <item msgid="5782108782860004851">"वाय-फाय अग्रमानांकित"</item>
     <item msgid="5074515506087318555">"प्राधान्य दिलेला मोबाइल"</item>
   </string-array>
   <string-array name="wifi_calling_mode_choices_v2_without_wifi_only">
@@ -929,11 +945,11 @@
     <item msgid="2339246858001475047">"2"</item>
     <item msgid="6200207341126893791">"1"</item>
   </string-array>
-    <string name="wifi_calling_off_explanation" msgid="2597566001655908391">"वाय-फाय कॉलिंग चालू असताना, आपला फोन आपल्या प्राधान्यावर आणि कोणता सिग्नल मजबूत आहे याच्या आधारावर, वाय-फाय नेटवर्क किंवा आपल्या वाहकाच्या नेटवर्कद्वारे कॉल मार्गस्थ करू शकतो. हे वैशिष्ट्य चालू करण्यापूर्वी, फी आणि इतर तपशीलांच्या संबंधात आपल्या वाहकास विचारा."</string>
+    <string name="wifi_calling_off_explanation" msgid="2597566001655908391">"वाय-फाय कॉलिंग चालू असताना, आपला फोन तुमच्या प्राधान्यावर आणि कोणता सिग्नल मजबूत आहे याच्या आधारावर, वाय-फाय नेटवर्क किंवा तुमच्या वाहकाच्या नेटवर्कद्वारे कॉल राउट करू शकतो. हे वैशिष्ट्य चालू करण्यापूर्वी, फी आणि इतर तपशीलांच्या संबंधात तुमच्या वाहकास विचारा."</string>
     <string name="wifi_calling_off_explanation_2" msgid="2329334487851497223"></string>
-    <string name="emergency_address_title" msgid="3571902448699714454">"आणीबाणी पत्ता अद्यतनित करा"</string>
-    <string name="emergency_address_summary" msgid="306028701568728126">"वायफाय वापरून आपण 911 वर कॉल केल्यास आपले स्थान म्हणून आणीबाणी सेवांनी वापरलेला पत्ता"</string>
-    <string name="display_settings_title" msgid="1708697328627382561">"प्रदर्शन"</string>
+    <string name="emergency_address_title" msgid="3571902448699714454">"आणीबाणी पत्ता अपडेट करा"</string>
+    <string name="emergency_address_summary" msgid="3266760199681945746">"तुम्ही वाय-फायवरून एखादा आपात्कालीन कॉल केल्यास तुमचे स्थान म्हणून आपात्कालीन सेवा तुमचा वापरत असलेला पत्ता"</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>
@@ -953,15 +969,15 @@
     <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>
     <string name="volume_alarm_description" msgid="8322615148532654841">"अलार्म"</string>
-    <string name="volume_ring_mute" msgid="3018992671608737202">"रिंगटोन आणि सूचना नि:शब्द करा"</string>
-    <string name="volume_media_mute" msgid="3399059928695998166">"संगीत आणि इतर मीडिया नि:शब्द करा"</string>
-    <string name="volume_notification_mute" msgid="7955193480006444159">"सूचना नि:शब्द करा"</string>
-    <string name="volume_alarm_mute" msgid="4452239420351035936">"अलार्म नि:शब्द करा"</string>
+    <string name="volume_ring_mute" msgid="3018992671608737202">"रिंगटोन आणि सूचना म्युट"</string>
+    <string name="volume_media_mute" msgid="3399059928695998166">"संगीत आणि इतर मीडिया म्युट करा"</string>
+    <string name="volume_notification_mute" msgid="7955193480006444159">"सूचना म्युट करा"</string>
+    <string name="volume_alarm_mute" msgid="4452239420351035936">"अलार्म म्युट करा"</string>
     <string name="dock_settings" msgid="1820107306693002541">"डॉक"</string>
     <string name="dock_settings_title" msgid="9161438664257429372">"डॉक सेटिंग्ज"</string>
     <string name="dock_audio_settings_title" msgid="3324750259959570305">"ऑडिओ"</string>
@@ -986,13 +1002,14 @@
     <string name="search_settings" msgid="1910951467596035063">"शोध"</string>
     <string name="search_settings_summary" msgid="9205656546570654169">"शोध सेटिंग्ज आणि इतिहास व्यवस्थापित करा"</string>
     <string name="search_settings_no_results" msgid="8799027492641230999">"कोणतेही परिणाम नाहीत"</string>
-    <string name="display_settings" msgid="7965901687241669598">"प्रदर्शन"</string>
+    <string name="search_clear_history" msgid="4196658962573162457">"इतिहास साफ करा"</string>
+    <string name="display_settings" msgid="7965901687241669598">"डिस्प्ले"</string>
     <string name="accelerometer_title" msgid="7854608399547349157">"स्वयं-फिरणारी स्क्रीन"</string>
     <string name="color_mode_title" msgid="3159275920408338215">"गडद रंग"</string>
-    <string name="accelerometer_summary_on" product="tablet" msgid="429982132339828942">"टॅबलेट फिरवताना अभिमुखता स्वयंचलितपणे स्विच करा"</string>
-    <string name="accelerometer_summary_on" product="default" msgid="1133737282813048021">"फोन फिरवताना अभिमुखता स्वयंचलितपणे स्विच करा"</string>
-    <string name="accelerometer_summary_off" product="tablet" msgid="4781734213242521682">"टॅबलेट फिरवताना अभिमुखता स्वयंचलितपणे स्विच करा"</string>
-    <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>
@@ -1051,20 +1068,18 @@
     <string name="screensaver_settings_disabled_prompt" msgid="1239088321034437608">"फोन डॉक केलेला असताना आणि/किंवा निष्क्रिय असताना काय होते हे नियंत्रित करण्यासाठी स्क्रीन सेव्हर चालू करा."</string>
     <string name="screensaver_settings_when_to_dream" msgid="7262410541382890146">"कधी सुरू करायचे"</string>
     <string name="screensaver_settings_current" msgid="4663846038247130023">"वर्तमान स्क्रीन सेव्हर"</string>
-    <string name="screensaver_settings_dream_start" msgid="4998187847985120168">"आता प्रारंभ करा"</string>
+    <string name="screensaver_settings_dream_start" msgid="4998187847985120168">"आता सुरू करा"</string>
     <string name="screensaver_settings_button" msgid="7292214707625717013">"सेटिंग्ज"</string>
     <string name="automatic_brightness" msgid="5014143533884135461">"स्वयंचलित चकाकी"</string>
     <string name="lift_to_wake_title" msgid="4555378006856277635">"सक्रिय करण्‍यासाठी लिफ्‍ट"</string>
     <string name="ambient_display_screen_title" msgid="4252755516328775766">"अँबियन्ट डिसप्ले"</string>
-    <!-- no translation found for ambient_display_screen_summary_always_on (7337555569694794132) -->
-    <skip />
+    <string name="ambient_display_screen_summary_always_on" msgid="7337555569694794132">"नेहमी चालू / बॅटरीचा वाढलेला वापर"</string>
     <string name="ambient_display_screen_summary_notifications" msgid="1449570742600868654">"नवीन सूचना"</string>
     <string name="ambient_display_category_triggers" msgid="4359289754456268573">"कधी दाखवायचे"</string>
     <string name="doze_title" msgid="2375510714460456687">"नवीन सूचना"</string>
     <string name="doze_summary" msgid="3846219936142814032">"सूचना प्राप्त केल्यावर स्क्रीन सक्रिय करा"</string>
     <string name="doze_always_on_title" msgid="1046222370442629646">"नेहमी चालू"</string>
-    <!-- no translation found for doze_always_on_summary (6978257596231155345) -->
-    <skip />
+    <string name="doze_always_on_summary" msgid="6978257596231155345">"वेळ, सूचना आयकॉन आणि इतर माहिती दाखवा. बॅटरीचा वाढलेला वापर."</string>
     <string name="title_font_size" msgid="4405544325522105222">"फॉन्ट आकार"</string>
     <string name="short_summary_font_size" msgid="6819778801232989076">"मजकूर आणखी मोठा किंवा आणखी लहान करा"</string>
     <string name="sim_lock_settings" msgid="3392331196873564292">"सिम कार्ड लॉक सेटिंग्ज"</string>
@@ -1096,17 +1111,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_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_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>
     <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>
@@ -1117,7 +1132,6 @@
     <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>
     <string name="device_status_activity_title" msgid="1411201799384697904">"स्थिती"</string>
     <string name="device_status" msgid="607405385799807324">"स्थिती"</string>
@@ -1126,7 +1140,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>
@@ -1143,13 +1157,12 @@
     <string name="status_roaming" msgid="2638800467430913403">"रोमिंग"</string>
     <string name="status_operator" msgid="2274875196954742087">"नेटवर्क"</string>
     <string name="status_wifi_mac_address" msgid="2202206684020765378">"वाय-फाय MAC पत्ता"</string>
-    <string name="status_bt_address" msgid="4195174192087439720">"ब्लूटुथ पत्ता"</string>
-    <string name="status_serial_number" msgid="2257111183374628137">"अनुक्रमांक"</string>
-    <string name="status_unavailable" msgid="7862009036663793314">"अनुपलब्ध"</string>
+    <string name="status_bt_address" msgid="4195174192087439720">"ब्लूटूथ पत्ता"</string>
+    <string name="status_serial_number" msgid="2257111183374628137">"सीरीअल नंबर"</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>
@@ -1164,30 +1177,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>
@@ -1214,7 +1227,7 @@
     <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>
@@ -1229,29 +1242,29 @@
     <string name="storage_rename_title" msgid="8242663969839491485">"संचयन पुनर्नामित करा"</string>
     <string name="storage_dialog_unmounted" msgid="6403320870103261477">"हे <xliff:g id="NAME_0">^1</xliff:g> सुरक्षितपणे बाहेर काढले आहे परंतु अद्याप उपलब्‍ध आहे. \n\nहे <xliff:g id="NAME_1">^1</xliff:g> वापरण्यासाठी, आपल्‍याला प्रथम ते माउंट करणे आवश्‍यक आहे."</string>
     <string name="storage_dialog_unmountable" msgid="3732209361668282254">"हे <xliff:g id="NAME_0">^1</xliff:g> दूषित झाले आहे. \n\n हे <xliff:g id="NAME_1">^1</xliff:g> वापरण्‍यासाठी, आपल्‍याला प्रथम ते सेट करणे आव्‍ाश्यक आहे."</string>
-    <string name="storage_dialog_unsupported" msgid="4503128224360482228">"हे डिव्‍हाइस या <xliff:g id="NAME_0">^1</xliff:g> चे समर्थन करीत नाही. \n\nया डिव्‍हाइससह हे <xliff:g id="NAME_1">^1</xliff:g> वापरण्‍यासाठी आपल्‍याला प्रथम ते सेट करणे आवश्‍यक आहे."</string>
-    <string name="storage_internal_format_details" msgid="4018647158382548820">"फॉर्मेट झाल्यानंतर, आपण हे <xliff:g id="NAME_0">^1</xliff:g> इतर डिव्‍हाइसेसमध्‍ये वापरू शकता. \n\nया <xliff:g id="NAME_1">^1</xliff:g> वरील सर्व डेटा मिटविला जाईल. बॅकअप घेण्‍याचा प्रथम विचार करा. \n\n"<b>"फोटो आणि इतर मीडियाचा बॅकअप घ्‍या"</b>" \nया डिव्‍हाइस वरील वैकल्पिक संचयनावर आपल्‍या मीडिया फायली हलवा किंवा USB केबल वापरून त्या संगणकावर स्थानांतरित करा. \n\n"<b>"अ‍ॅप्सचा बॅकअप घ्‍या"</b>" \nया <xliff:g id="NAME_6">^1</xliff:g> वर संचयित केलेले सर्व अ‍ॅप्स विस्थापित केले जातील आणि त्यांचा डेटा मिटविला जाईल. हे अ‍ॅप्स ठेवण्‍यासाठी, ते या डिव्‍हाइस वरील वैकल्पिक संचयनावर हलवा."</string>
+    <string name="storage_dialog_unsupported" msgid="4503128224360482228">"हे डिव्हाइस या <xliff:g id="NAME_0">^1</xliff:g> चे सपोर्ट करत नाही. \n\nया डिव्‍हाइससह हे <xliff:g id="NAME_1">^1</xliff:g> वापरण्‍यासाठी आपल्‍याला प्रथम ते सेट करणे आवश्‍यक आहे."</string>
+    <string name="storage_internal_format_details" msgid="4018647158382548820">"फॉर्मेट झाल्यानंतर, तुम्ही हे <xliff:g id="NAME_0">^1</xliff:g> इतर डिव्हाइसमध्‍ये वापरू शकता. \n\nया <xliff:g id="NAME_1">^1</xliff:g> वरील सर्व डेटा मिटविला जाईल. बॅकअप घेण्‍याचा प्रथम विचार करा. \n\n"<b>"फोटो आणि इतर मीडियाचा बॅकअप घ्‍या"</b>\n"या डिव्हाइस वरील पर्यायी स्टोरेजवर तुमच्या मीडिया फायली हलवा किंवा USB केबल वापरून त्या कॉंप्युटरवर ट्रांसफर करा. \n\n"<b>"अ‍ॅप्सचा बॅकअप घ्‍या"</b>\n" <xliff:g id="NAME_6">^1</xliff:g> वर स्टोअर केलेली सर्व अ‍ॅप्स अनइंस्टॉल केली जातील आणि त्यांचा डेटा मिटविला जाईल. हे अ‍ॅप्स ठेवण्‍यासाठी, ते या डिव्हाइस वरील पर्यायी स्टोरेजवर हलवा."</string>
     <string name="storage_internal_unmount_details" msgid="3582802571684490057"><b>"आपण <xliff:g id="NAME_0">^1</xliff:g> हे बाहेर काढता तेव्‍हा, त्यावर संचयित केलेले अ‍ॅप्स कार्य करणे थांबवतील आणि ते पुन्हा घातले जाईपर्यंत त्यावर संचयित केलेल्‍या मीडिया फायली उपलब्ध असणार नाहीत."</b>" \n\nहे <xliff:g id="NAME_1">^1</xliff:g> केवळ या डिव्‍हाइसवर कार्य करण्‍यासाठी स्वरूपित केले आहे. ते इतर कशावरही कार्य करणार नाही."</string>
-    <string name="storage_internal_forget_details" msgid="9028875424669047327">"अॅप्स, फोटो किंवा या <xliff:g id="NAME">^1</xliff:g> मध्ये असलेला डेटा वापरण्यासाठी, तो पुन्हा घाला. \n\nवैकल्पिकपणे, डिव्हाइस उपलब्ध नसल्यास आपण हे संचयन विसरणे निवडू शकता. \n\nआपण विसरणे निवडल्यास, डिव्हाइसमध्ये असलेला सर्व डेटा नेहमीसाठी गमावला जाईल. \n\nआपण नंतर अॅप्स पुन्हा स्थापित करू शकता, परंतु या डिव्हाइसवर संचयित केलेला त्यांचा डेटा गमावला जाईल."</string>
+    <string name="storage_internal_forget_details" msgid="9028875424669047327">"अॅप्स, फोटो किंवा या <xliff:g id="NAME">^1</xliff:g> मध्ये असलेला डेटा वापरण्यासाठी, तो पुन्हा घाला. \n\nपर्यायीपणे, डिव्हाइस उपलब्ध नसल्यास तुम्ही हे स्टोरेज विसरणे निवडू शकता. \n\nतुम्ही विसरणे निवडल्यास, डिव्हाइस मध्ये असलेला सर्व डेटा नेहमीसाठी गमावला जाईल. \n\nतुम्ही नंतर अॅप्स पुन्हा इंस्टॉल करू शकता, परंतु या डिव्हाइस वर स्टोअर केलेला त्यांचा डेटा गमावला जाईल."</string>
     <string name="storage_internal_forget_confirm_title" msgid="1370847944388479245">"<xliff:g id="NAME">^1</xliff:g> ला विसरला?"</string>
     <string name="storage_internal_forget_confirm" msgid="1148446041396902905">"या <xliff:g id="NAME">^1</xliff:g> वर संचयित केलेले सर्व अ‍ॅप्स, फोटो आणि डेटा कायमचा गमावला जाईल."</string>
     <string name="storage_detail_apps" msgid="6141154016753507490">"अॅप्स"</string>
-    <string name="storage_detail_images" msgid="6950678857740634769">"प्रतिमा"</string>
+    <string name="storage_detail_images" msgid="6950678857740634769">"इमेज"</string>
     <string name="storage_detail_videos" msgid="2919743464827110953">"व्हिडिओ"</string>
     <string name="storage_detail_audio" msgid="1197685141676483213">"ऑडिओ"</string>
     <string name="storage_detail_cached" msgid="8547136365247818567">"कॅश केलेला डेटा"</string>
     <string name="storage_detail_other" msgid="8404938385075638238">"इतर"</string>
-    <string name="storage_detail_system" msgid="4629506366064709687">"सिस्टीम"</string>
+    <string name="storage_detail_system" msgid="4629506366064709687">"सिस्टम"</string>
     <string name="storage_detail_explore" msgid="7911344011431568294">"<xliff:g id="NAME">^1</xliff:g> एक्सप्लोर करा"</string>
-    <string name="storage_detail_dialog_other" msgid="8907101974576694793">"अन्यमध्ये अ‍ॅप्सद्वारे जतन केलेल्या सामायिक केलेल्या फायली, इंटरनेट किंवा ब्लूटुथ वरून डाउनलोड केलेल्या फायली, Android फायली आणि इत्यादीचा समावेश होतो. \n\n<xliff:g id="NAME">^1</xliff:g> ची दृश्यमान सामग्री पाहण्यासाठी, एक्सप्लोर करा टॅप करा."</string>
+    <string name="storage_detail_dialog_other" msgid="8907101974576694793">"इतर गोष्टींमध्ये अ‍ॅप्सद्वारे सेव्ह केलेल्या शेअर केलेल्या फायली, इंटरनेट किंवा ब्लूटूथ वरून डाउनलोड केलेल्या फायली, Android फायली आणि इत्यादीचा समावेश होतो. \n\n<xliff:g id="NAME">^1</xliff:g> चा दृश्यमान अाशय पाहण्यासाठी, एक्सप्लोर करा टॅप करा."</string>
     <string name="storage_detail_dialog_system" msgid="862835644848361569">"सिस्टममध्ये अशा फायली आहेत ज्यांचा वापर Android आवृत्ती <xliff:g id="VERSION">%s</xliff:g> चालवण्यासाठी केला जातो"</string>
     <string name="storage_detail_dialog_user" msgid="3267254783294197804">"<xliff:g id="USER_0">^1</xliff:g> कडे <xliff:g id="SIZE">^2</xliff:g> संचय वापरणारे, जतन केलेले फोटो, संगीत, अॅप्स किंवा इतर डेटा असू शकतो. \n\nतपशील पाहण्यासाठी, <xliff:g id="USER_1">^1</xliff:g> वर स्विच करा."</string>
     <string name="storage_wizard_init_title" msgid="5085400514028585772">"आपले <xliff:g id="NAME">^1</xliff:g> सेट करा"</string>
     <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>
@@ -1266,7 +1279,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>
@@ -1309,7 +1322,7 @@
     <string name="mvno_match_data" msgid="4560671695220540466">"MVNO मूल्य"</string>
     <string name="menu_delete" msgid="6981294422841124659">"APN हटवा"</string>
     <string name="menu_new" msgid="3014205883303921729">"नवीन APN"</string>
-    <string name="menu_save" msgid="8109345640668285399">"जतन करा"</string>
+    <string name="menu_save" msgid="8109345640668285399">"सेव्ह करा"</string>
     <string name="menu_cancel" msgid="2194502410474697474">"टाकून द्या"</string>
     <string name="error_title" msgid="7631322303341024692"></string>
     <string name="error_name_empty" msgid="5508155943840201232">"नाव फील्ड रिक्त असू शकत नाही."</string>
@@ -1320,7 +1333,8 @@
     <string name="restore_default_apn" msgid="8178010218751639581">"डीफॉल्ट APN सेटिंग्ज पुनर्संचयित करत आहे."</string>
     <string name="menu_restore" msgid="8260067415075573273">"डीफॉल्टवर रीसेट करा"</string>
     <string name="restore_default_apn_completed" msgid="2824775307377604897">"डीफॉल्ट APN सेटिंग्ज रीसेट करणे पूर्ण झाले."</string>
-    <string name="reset_dashboard_title" msgid="6254873816990678620">"पर्याय रीसेट करा"</string>
+    <string name="reset_dashboard_title" msgid="6254873816990678620">"रीसेट पर्याय"</string>
+    <string name="reset_dashboard_summary" msgid="4851012632493522755">"नेटवर्क, अॅप्स आणि डिव्हाइस रीसेट केले जाऊ शकतात"</string>
     <string name="reset_network_title" msgid="6166025966016873843">"वायफाय मोबाइल आणि ब्लूटुथ रीसेट करा"</string>
     <string name="reset_network_desc" msgid="5547979398298881406">"हे यांसह सर्व नेटवर्क सेटिंग्‍ज रीसेट करेल:\n\n"<li>"वाय‑फाय"</li>\n<li>"मोबाइल डेटा"</li>\n<li>"ब्लूटुथ"</li></string>
     <string name="reset_network_button_text" msgid="2035676527471089853">"सेटिंग्ज रीसेट करा"</string>
@@ -1329,20 +1343,17 @@
     <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="6617679904229218425">"सर्व डेटा मिटवा (फॅक्टरी रीसेट)"</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>
-    </plurals>
-    <string name="master_clear_summary" msgid="6902443944660426951">"अंतर्गत संचयन आणि सर्व डेटा रीसेट केला जाईल"</string>
+    <string name="master_clear_title" msgid="3531267871084279512">"सर्व डेटा मिटवा (फॅक्टरी रीसेट)"</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_also_erases_esim" msgid="312352697653096008"><li>"eSIM वरील वाहक"</li></string>
+    <string name="master_clear_desc_no_cancel_mobile_plan" msgid="5460926449093211144">\n\n"असे केल्‍याने तुमच्‍या मोबाइल सेवा प्‍लॅन रद्द होणार नाही."</string>
+    <string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="7744115866662613411">\n\n"संगीत, चित्रे आणि अन्य वापरकर्ता डेटा साफ करण्यासाठी, "<b>"USB स्टोरेज"</b>" मिटविणे आवश्यक आहे."</string>
     <string name="master_clear_desc_erase_external_storage" product="default" msgid="4801026652617377093">\n\n"संगीत, चित्रे आणि अन्य वापरकर्ता डेटा साफ करण्यासाठी, "<b>"SD कार्ड"</b>" पुसण्याची आवश्यकता आहे."</string>
-    <string name="erase_external_storage" product="nosdcard" msgid="969364037450286809">"USB संचयन मिटवा"</string>
+    <string name="erase_external_storage" product="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>
@@ -1359,24 +1370,24 @@
     <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>
-    <string name="tether_settings_title_usb_bluetooth" msgid="5355828977109785001">"टिथरिंग"</string>
-    <string name="tether_settings_title_all" msgid="3058586928118801157">"हॉटस्‍पॉट आणि टिथरिंग"</string>
-    <string name="tether_settings_summary_hotspot_on_tether_on" msgid="930464462687425777">"हॉटस्पॉट चालू, टिथरिंग करत आहे"</string>
+    <string name="tether_settings_title_bluetooth" msgid="355855408317564420">"ब्लूटूथ टेदरिंग"</string>
+    <string name="tether_settings_title_usb_bluetooth" msgid="5355828977109785001">"टेदरिंग"</string>
+    <string name="tether_settings_title_all" msgid="3058586928118801157">"हॉटस्‍पॉट आणि टेदरिंग"</string>
+    <string name="tether_settings_summary_hotspot_on_tether_on" msgid="930464462687425777">"हॉटस्पॉट चालू, टेदरिंग करत आहे"</string>
     <string name="tether_settings_summary_hotspot_on_tether_off" msgid="3473671453891735907">"हॉटस्पॉट चालू"</string>
-    <string name="tether_settings_summary_hotspot_off_tether_on" msgid="1618256180720077354">"टिथरिंग"</string>
+    <string name="tether_settings_summary_hotspot_off_tether_on" msgid="1618256180720077354">"टेदरिंग"</string>
     <string name="tether_settings_disabled_on_data_saver" msgid="1576908608463904152">"डेटा बचतकर्ता चालू असताना टिथर करू शकत नाही किंवा पोर्टेबल हॉटस्पॉटचा वापर करू शकत नाही"</string>
     <string name="usb_title" msgid="7483344855356312510">"USB"</string>
     <string name="usb_tethering_button_text" msgid="585829947108007917">"USB टेदरिंग"</string>
     <string name="usb_tethering_subtext" product="default" msgid="5991482890033484794">"फोनचे इंटरनेट कनेक्शन USBने शेअर करा"</string>
     <string name="usb_tethering_subtext" product="tablet" msgid="5988796139573211318">"टॅबलेटचे इंटरनेट कनेक्शन USBने शेअर करा"</string>
-    <string name="bluetooth_tether_checkbox_text" msgid="2379175828878753652">"ब्लूटुथ टेदरिंग"</string>
-    <string name="bluetooth_tethering_subtext" product="tablet" msgid="4558227863463153412">"टॅबलेटचे इंटरनेट कनेक्शन ब्लुटूथने शेअर करा"</string>
-    <string name="bluetooth_tethering_subtext" product="default" msgid="1055197887836203595">"फोनचे इंटरनेट कनेक्शन ब्लुटूथने शेअर करा"</string>
-    <string name="bluetooth_tethering_off_subtext_config" msgid="6326877798974938021">"या <xliff:g id="DEVICE_NAME">%1$d</xliff:g>चे इंटरनेट कनेक्शन ब्लूटुथ द्वारे शेअर करत आहे"</string>
+    <string name="bluetooth_tether_checkbox_text" msgid="2379175828878753652">"ब्लूटूथ टेदरिंग"</string>
+    <string name="bluetooth_tethering_subtext" product="tablet" msgid="4558227863463153412">"टॅबलेटचे इंटरनेट कनेक्शन ब्लूटूथने शेअर करा"</string>
+    <string name="bluetooth_tethering_subtext" product="default" msgid="1055197887836203595">"फोनचे इंटरनेट कनेक्शन ब्लूटूथने शेअर करा"</string>
+    <string name="bluetooth_tethering_off_subtext_config" msgid="6326877798974938021">"या <xliff:g id="DEVICE_NAME">%1$d</xliff:g>चे इंटरनेट कनेक्शन ब्लूटूथ द्वारे शेअर करत आहे"</string>
     <string name="bluetooth_tethering_overflow_error" msgid="2135590598511178690">"<xliff:g id="MAXCONNECTION">%1$d</xliff:g> पेक्षा अधिक डिव्हाइसेसवर टेदर करू शकत नाही."</string>
     <string name="bluetooth_untether_blank" msgid="2871192409329334813">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> टेदर करणे रद्द करेल."</string>
     <string name="tethering_footer_info" msgid="1308462275952345985">"तुमच्या मोबाइल डेटा कनेक्शनने इतर डिव्हाइसना इंटरनेट देण्यासाठी हॉटस्पॉट आणि टेदरिंगचा वापर करा. आशय जवळपासच्या डिव्हाइससोबत शेअर करण्यासाठी अ‍ॅप्स हॉटस्‍पॉट तयार देखील करू शकतात."</string>
@@ -1385,11 +1396,11 @@
     <string name="manage_mobile_plan_title" msgid="7630170375010107744">"मोबाईल योजना"</string>
     <string name="sms_application_title" msgid="4903928270533250448">"SMS अ‍ॅप"</string>
     <string name="sms_change_default_dialog_title" msgid="1958688831875804286">"SMS अॅप बदलायचा?"</string>
-    <string name="sms_change_default_dialog_text" msgid="1522783933230274787">"<xliff:g id="CURRENT_APP">%2$s</xliff:g> च्याऐवजी <xliff:g id="NEW_APP">%1$s</xliff:g> आपला SMS अॅप म्हणून वापरायचा?"</string>
-    <string name="sms_change_default_no_previous_dialog_text" msgid="602683880284921998">"आपला SMS अॅप म्हणून <xliff:g id="NEW_APP">%s</xliff:g> वापरायचा?"</string>
+    <string name="sms_change_default_dialog_text" msgid="1522783933230274787">"<xliff:g id="CURRENT_APP">%2$s</xliff:g> च्याऐवजी <xliff:g id="NEW_APP">%1$s</xliff:g> ला तुमचा SMS अॅप म्हणून वापराय?"</string>
+    <string name="sms_change_default_no_previous_dialog_text" msgid="602683880284921998">"तुमचा SMS अॅप म्हणून <xliff:g id="NEW_APP">%s</xliff:g> वापरायचा?"</string>
     <string name="network_scorer_picker_title" msgid="6383879578279046456">"नेटवर्क रेटिंग प्रदाता"</string>
     <string name="network_scorer_picker_none_preference" msgid="9028375117241790936">"काहीही नाही"</string>
-    <string name="network_scorer_change_active_dialog_title" msgid="3776301550387574975">"वाय-फाय सहाय्यक बदलायचे?"</string>
+    <string name="network_scorer_change_active_dialog_title" msgid="3776301550387574975">"वाय-फाय साहाय्यक बदलायचा?"</string>
     <string name="network_scorer_change_active_dialog_text" msgid="8035173880322990715">"आपली नेटवर्क कनेक्शन व्यवस्थापित करण्यासाठी <xliff:g id="CURRENT_APP">%2$s</xliff:g> ऐवजी <xliff:g id="NEW_APP">%1$s</xliff:g> वापरायचा?"</string>
     <string name="network_scorer_change_active_no_previous_dialog_text" msgid="7444620909047611601">"आपली नेटवर्क कनेक्शन व्यवस्थापित करण्यासाठी <xliff:g id="NEW_APP">%s</xliff:g> वापरायचा?"</string>
     <string name="mobile_unknown_sim_operator" msgid="2156912373230276157">"अज्ञात सिम ऑपरेटर"</string>
@@ -1412,24 +1423,24 @@
     <string name="location_mode_screen_title" msgid="4528716772270246542">"स्थान मोड"</string>
     <string name="location_mode_high_accuracy_description" msgid="3453010562265338113">"स्थान निर्धारित करण्‍यासाठी GPS, वाय‑फाय, ब्लूटुथ किंवा मोबाइल नेटवर्क वापरा"</string>
     <string name="location_mode_battery_saving_description" msgid="2365298246603348985">"स्थान निर्धारित करण्‍यासाठी वाय‑फाय, ब्लूटुथ किंवा मोबाइल नेटवर्क वापरा"</string>
-    <string name="location_mode_sensors_only_description" msgid="7247994752324805202">"स्थान निर्धारित करण्यासाठी GPS आणि डिव्हाइस सेन्सर वापरा"</string>
+    <string name="location_mode_sensors_only_description" msgid="7247994752324805202">"स्थान निर्धारित करण्यासाठी GPS आणि डिव्हाइस सेंसर वापरा"</string>
     <string name="location_scanning_screen_title" msgid="4408076862929611554">"स्कॅन करत आहे"</string>
     <string name="location_scanning_wifi_always_scanning_title" msgid="6216705505621183645">"वाय-फाय स्कॅन करणे"</string>
-    <string name="location_scanning_wifi_always_scanning_description" msgid="8036382029606868081">"सिस्टीम अ‍ॅप्‍स आणि सेवांना कधीही वाय-फाय नेटवर्क शोधण्‍याची अनुमती देउन स्थान सुधारित करा."</string>
-    <string name="location_scanning_bluetooth_always_scanning_title" msgid="5444989508204520019">"ब्लूटुथ स्कॅन करणे"</string>
-    <string name="location_scanning_bluetooth_always_scanning_description" msgid="8602726521250591852">"सिस्टीम अ‍ॅप्‍स आणि सेवांना कधीही ब्लूटुथ डिव्‍हाइसेस शोधण्‍याची अनुमती देउन स्थान सुधारित करा."</string>
+    <string name="location_scanning_wifi_always_scanning_description" msgid="8036382029606868081">"सिस्टम अ‍ॅप्‍स आणि सेवांना कधीही वाय-फाय नेटवर्क शोधण्‍याची अनुमती देऊन स्थान सुधारित करा."</string>
+    <string name="location_scanning_bluetooth_always_scanning_title" msgid="5444989508204520019">"ब्लूटूथ स्कॅन करणे"</string>
+    <string name="location_scanning_bluetooth_always_scanning_description" msgid="8602726521250591852">"सिस्टम अ‍ॅप्‍स आणि सेवांना कधीही ब्लूटूथ डिव्हाइस शोधण्‍याची अनुमती देउन स्थान सुधारित करा."</string>
     <string name="location_network_based" msgid="9134175479520582215">"वाय-फाय आणि मोबाईल नेटवर्क स्थान"</string>
     <string name="location_neighborhood_level" msgid="5141318121229984788">"आपल्या स्थानाचा अधिक जलद अंदाज घेण्यासाठी अॅप्सना Google ची स्थान सेवा वापरू द्या. अनामित स्थान डेटा संकलित केला जाईल आणि Google कडे पाठविला जाईल."</string>
     <string name="location_neighborhood_level_wifi" msgid="4234820941954812210">"वाय-फाय द्वारे निर्धारित केलेले स्थान"</string>
     <string name="location_gps" msgid="8392461023569708478">"GPS उपग्रह"</string>
     <string name="location_street_level" product="tablet" msgid="1669562198260860802">"आपले स्थान सूचित करण्यासाठी आपल्या टॅब्लेटवर अॅप्सना GPS वापरु द्या"</string>
     <string name="location_street_level" product="default" msgid="4617445745492014203">"आपले स्थान सूचित करण्यासाठी आपल्या फोनवर अॅप्सना GPS वापरु द्या"</string>
-    <string name="assisted_gps" msgid="4649317129586736885">"सहाय्यक GPS वापरा"</string>
-    <string name="assisted_gps_enabled" msgid="8751899609589792803">"GPS ला सहाय्य करण्यासाठी सर्व्हर वापरा (नेटवर्क वापर कमी करण्यासाठी अनचेक करा)"</string>
-    <string name="assisted_gps_disabled" msgid="6982698333968010748">"GPS ला सहाय्य करण्यासाठी सर्व्हर वापरा (GPS कार्यप्रदर्शन सुधारण्यासाठी अनचेक करा)"</string>
+    <string name="assisted_gps" msgid="4649317129586736885">"साहाय्यक GPS वापरा"</string>
+    <string name="assisted_gps_enabled" msgid="8751899609589792803">"GPS ला साहाय्य करण्यासाठी सर्व्हर वापरा (नेटवर्क वापर कमी करण्यासाठी अनचेक करा)"</string>
+    <string name="assisted_gps_disabled" msgid="6982698333968010748">"GPS ला साहाय्य करण्यासाठी सर्व्हर वापरा (GPS कामगिरी सुधारण्यासाठी अनचेक करा)"</string>
     <string name="use_location_title" msgid="5206937465504979977">"स्थान आणि Google शोध"</string>
     <string name="use_location_summary" msgid="3978805802386162520">"Google ला शोध परिणाम आणि अन्य सेवा सुधारण्यासाठी आपले स्थान वापरू द्या"</string>
-    <string name="location_access_title" msgid="7064108942964081243">"माझ्या स्थानामध्ये प्रवेश करा"</string>
+    <string name="location_access_title" msgid="7064108942964081243">"माझी स्थाने अॅक्सेस करा"</string>
     <string name="location_access_summary" msgid="69031404093194341">"आपली परवानगी विचारणार्‍या अॅप्सना आपली स्थान माहिती वापरु द्या"</string>
     <string name="location_sources_heading" msgid="1278732419851088319">"स्थान स्रोत"</string>
     <string name="about_settings" product="tablet" msgid="593457295516533765">"टॅबलेट विषयी"</string>
@@ -1444,9 +1455,9 @@
     <string name="copyright_title" msgid="865906688917260647">"कॉपीराइट"</string>
     <string name="license_title" msgid="1990487604356037871">"परवाना"</string>
     <string name="terms_title" msgid="7697580845616764642">"अटी आणि नियम"</string>
-    <string name="webview_license_title" msgid="2813507464175738967">"सिस्टीम WebView परवाना"</string>
+    <string name="webview_license_title" msgid="2813507464175738967">"सिस्टम WebView परवाना"</string>
     <string name="wallpaper_attributions" msgid="3645880512943433928">"वॉलपेपर"</string>
-    <string name="wallpaper_attributions_values" msgid="2996183537914690469">"उपग्रह प्रतिमा प्रदाते:\n©2014 CNES / Astrium, DigitalGlobe, Bluesky"</string>
+    <string name="wallpaper_attributions_values" msgid="2996183537914690469">"उपग्रह इमेज प्रदाते:\n©2014 CNES / Astrium, DigitalGlobe, Bluesky"</string>
     <string name="settings_manual_activity_title" msgid="8133150693616006051">"व्यक्तिचलित"</string>
     <string name="settings_manual_activity_unavailable" msgid="4752403782883814898">"व्यक्तिचलित लोड करताना समस्या आली."</string>
     <string name="settings_license_activity_title" msgid="8525014571806471216">"तृतीय-पक्ष परवाने"</string>
@@ -1456,81 +1467,82 @@
     <string name="settings_safetylegal_activity_title" msgid="6901214628496951727">"सुरक्षितता माहिती"</string>
     <string name="settings_safetylegal_activity_unreachable" msgid="250674109915859456">"आपल्याकडे डेटा कनेक्शन नाही. ही माहिती आता पाहण्यासाठी, इंटरनेटशी कनेक्ट केलेल्या कोणत्याही संगणकावरून %s वर जा."</string>
     <string name="settings_safetylegal_activity_loading" msgid="8059022597639516348">"लोड करत आहे..."</string>
-    <string name="lockpassword_choose_your_password_header" msgid="8624900666929394990">"आपला संकेतशब्द निवडा"</string>
-    <string name="lockpassword_choose_your_password_header_for_fingerprint" msgid="6624409510609085450">"फिंगरप्रिंट वापरण्यासाठी पासवर्ड सेट करा"</string>
-    <string name="lockpassword_choose_your_pattern_header" msgid="6949761069941694050">"आपला नमुना निवडा"</string>
-    <string name="lockpassword_choose_your_pattern_header_for_fingerprint" msgid="5901096361617543819">"फिंगरप्रिंट वापरण्यासाठी पॅटर्न सेट करा"</string>
-    <string name="lockpassword_choose_your_pin_header" msgid="7598849519816138302">"आपला पिन निवडा"</string>
-    <string name="lockpassword_choose_your_pin_header_for_fingerprint" msgid="765344692615917183">"फिंगरप्रिंट वापरण्यासाठी पिन सेट करा"</string>
-    <string name="lockpassword_confirm_your_password_header" msgid="6308478184889846633">"आपल्या संकेतशब्दाची पुष्टी करा"</string>
+    <string name="lockpassword_choose_your_screen_lock_header" msgid="3872462096767152394">"स्क्रीन लॉक सेट करा"</string>
+    <string name="lockpassword_choose_your_password_message" msgid="1197569283524841412">"सुरक्षिततेसाठी पासवर्ड सेट करा."</string>
+    <string name="lockpassword_choose_your_password_header_for_fingerprint" msgid="2541818487015343503">"फिंगरप्रिंट वापरासाठी, पासवर्ड सेट करा"</string>
+    <string name="lockpassword_choose_your_pattern_header_for_fingerprint" msgid="7709785406243556723">"फिंगरप्रिंट वापरासाठी, पॅटर्न सेट करा"</string>
+    <string name="lockpassword_choose_your_pin_message" msgid="1875420718677275646">"सुरक्षिततेसाठी पिन सेट करा"</string>
+    <string name="lockpassword_choose_your_pin_header_for_fingerprint" msgid="1549639053195796674">"फिंगरप्रिंट वापरण्‍यासाठी, पिन सेट करा"</string>
+    <string name="lockpassword_choose_your_pattern_message" msgid="5986983400689720015">"सुरक्षिततेसाठी, एक पॅटर्न सेट करा"</string>
+    <string name="lockpassword_confirm_your_password_header" msgid="1266027268220850931">"तुमचा पासवर्ड पुन्‍हा टाका"</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="7744513791910572550">"तुमचा पिन पुन्हा टाका"</string>
     <string name="lockpassword_confirm_passwords_dont_match" msgid="5140892109439191415">"संकेतशब्द जुळत नाहीत"</string>
     <string name="lockpassword_confirm_pins_dont_match" msgid="7226244811505606217">"पिन जुळत नाहीत"</string>
     <string name="lockpassword_choose_lock_generic_header" msgid="3811438094903786145">"अनलॉक निवड"</string>
     <string name="lockpassword_password_set_toast" msgid="4875050283108629383">"संकेतशब्द सेट केला गेला आहे"</string>
     <string name="lockpassword_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>
-    <!-- no translation found for lockpassword_strong_auth_required_device_pattern (530802132223800623) -->
-    <skip />
-    <!-- no translation found for lockpassword_strong_auth_required_device_pin (7829294830078036417) -->
-    <skip />
-    <!-- no translation found for lockpassword_strong_auth_required_device_password (3552644641574796973) -->
-    <skip />
-    <!-- no translation found for lockpassword_strong_auth_required_work_pattern (3003781907040522053) -->
-    <skip />
-    <!-- no translation found for lockpassword_strong_auth_required_work_pin (3367491332598821552) -->
-    <skip />
-    <!-- no translation found for lockpassword_strong_auth_required_work_password (8159775129968582940) -->
-    <skip />
+    <string name="lockpassword_strong_auth_required_device_pattern" msgid="530802132223800623">"वाढीव सुरक्षिततेसाठी, तुमच्या डीव्हाइसचा पॅटर्न वापरा"</string>
+    <string name="lockpassword_strong_auth_required_device_pin" msgid="7829294830078036417">"वाढीव सुरक्षिततेसाठी, तुमच्या डिव्हाइसचा पिन टाका"</string>
+    <string name="lockpassword_strong_auth_required_device_password" msgid="3552644641574796973">"वाढीव सुरक्षिततेसाठी, तुमच्या डिव्हाइसचा पासवर्ड टाका"</string>
+    <string name="lockpassword_strong_auth_required_work_pattern" msgid="3003781907040522053">"वाढीव सुरक्षिततेसाठी, तुमच्या कामाचा पॅटर्न वापरा"</string>
+    <string name="lockpassword_strong_auth_required_work_pin" msgid="3367491332598821552">"वाढीव सुरक्षिततेसाठी, तुमच्या कामाचा पिन टाका"</string>
+    <string name="lockpassword_strong_auth_required_work_password" msgid="8159775129968582940">"वाढीव सुरक्षिततेसाठी, तुमच्या कामाचा पासवर्ड टाका"</string>
+    <string name="lockpassword_confirm_your_pattern_details_frp" msgid="6757336656791723193">"तुमचा फोन फॅक्टरी सेटिंग्जवर रीसेट केला होता. हा फोन वापरण्यासाठी, तुमचा याआधीचा पॅटर्न टाका."</string>
+    <string name="lockpassword_confirm_your_pin_details_frp" msgid="826520613445990470">"तुमचा फोन फॅक्टरी सेटिंग्जवर रीसेट केला होता. हा फोन वापरण्यासाठी, तुमचा याआधीचा पिन टाका."</string>
+    <string name="lockpassword_confirm_your_password_details_frp" msgid="8944081074615739040">"तुमचा फोन फॅक्टरी सेटिंग्जवर रीसेट केला होता. हा फोन वापरण्यासाठी, तुमचा याआधीचा पासवर्ड टाका."</string>
+    <string name="lockpassword_confirm_your_pattern_header_frp" msgid="2898036091609128286">"पॅटर्नची पडताळणी करा"</string>
+    <string name="lockpassword_confirm_your_pin_header_frp" msgid="4141601774778898803">"पिनची पडताळणी करा"</string>
+    <string name="lockpassword_confirm_your_password_header_frp" msgid="3762615419295360480">"पासवर्डची पडताळणी करा"</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_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_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="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>
@@ -1538,9 +1550,8 @@
     <string name="install_applications_title" msgid="4987712352256508946">"सर्व अॅप स्त्रोतांना अनुमती द्या"</string>
     <string name="recent_app_category_title" msgid="6673071268966003928">"अलीकडे उघडलेले अ‍ॅप्स"</string>
     <string name="see_all_apps_title" msgid="1317153498074308438">"सगळे <xliff:g id="COUNT">%1$d</xliff:g> अ‍ॅप्स पहा"</string>
-    <string name="recent_app_summary" msgid="3366446669844932300">"<xliff:g id="TIME">^1</xliff:g>पूर्वी"</string>
-    <string name="install_all_warning" product="tablet" msgid="8310489909586138165">"आपले टॅबलेट आणि वैयक्तिक डेटा अज्ञात अनुप्रयोगांद्वारे आक्रमणांपासून अधिक असुरक्षित असतात. या स्रोताकडील अ‍ॅप्स स्थापित करून, आपण सहमत आहात की त्यांच्या वापराच्या परिणामी होणार्‍या आपल्या टॅबलेटच्या कोणत्याही नुकसानासाठी किंवा डेटाच्या हानीसाठी आपण जबाबदार आहात."</string>
-    <string name="install_all_warning" product="default" msgid="1952257127370115988">"आपला फोन आणि वैयक्तिक डेटा अज्ञात अनुप्रयोगांद्वारे आक्रमणांपासून अधिक असुरक्षित असतात. या स्रोताकडील अ‍ॅप्स स्थापित करून, आपण सहमत आहात की त्यांच्या वापराच्या परिणामी होणार्‍या आपल्या फोनच्या कोणत्याही नुकसानासाठी किंवा डेटाच्या हानीसाठी आपण जबाबदार आहात."</string>
+    <string name="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>
@@ -1561,18 +1572,18 @@
     <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="auto_launch_enable_text" msgid="4275746249511874845">"आपण काही क्रियांसाठी डीफॉल्टनुसार हा अॅप लाँच करणे निवडले आहे."</string>
+    <string name="app_factory_reset" msgid="6635744722502563022">"अपडेट अनइंस्टॉल करा"</string>
+    <string name="auto_launch_enable_text" msgid="4275746249511874845">"तुम्ही काही क्रियांसाठी डीफॉल्टनुसार हा अॅप लाँच करणे निवडले आहे."</string>
     <string name="always_allow_bind_appwidgets_text" msgid="566822577792032925">"आपण या अॅपला विजेट तयार करण्याची आणि त्यांच्या डेटामध्ये प्रवेश करण्याची अनुमती देण्यासाठी निवडले आहे."</string>
     <string name="auto_launch_disable_text" msgid="7800385822185540166">"कोणताही डीफॉल्ट सेट केलेला नाही."</string>
     <string name="clear_activities" msgid="7408923511535174430">"डीफॉल्ट साफ करा"</string>
@@ -1587,7 +1598,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>
@@ -1596,14 +1607,14 @@
     <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="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>
@@ -1611,7 +1622,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>
@@ -1628,7 +1639,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>
@@ -1641,8 +1652,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>
@@ -1655,10 +1666,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>
@@ -1683,9 +1694,9 @@
     <string name="running_processes_item_description_s_p" msgid="8019860457123222953">"<xliff:g id="NUMPROCESS">%1$d</xliff:g> प्रक्रिया आणि <xliff:g id="NUMSERVICES">%2$d</xliff:g> सेवा"</string>
     <string name="running_processes_item_description_p_s" msgid="744424668287252915">"<xliff:g id="NUMPROCESS">%1$d</xliff:g> प्रक्रिया आणि <xliff:g id="NUMSERVICES">%2$d</xliff:g> सेवा"</string>
     <string name="running_processes_item_description_p_p" msgid="1607384595790852782">"<xliff:g id="NUMPROCESS">%1$d</xliff:g> प्रक्रिया आणि <xliff:g id="NUMSERVICES">%2$d</xliff:g> सेवा"</string>
-    <string name="running_processes_header_title" msgid="6588371727640789560">"डिव्‍हाइस मेमरी"</string>
+    <string name="running_processes_header_title" msgid="6588371727640789560">"डिव्हाइस मेमरी"</string>
     <string name="running_processes_header_footer" msgid="723908176275428442">"अ‍ॅप RAM वापर"</string>
-    <string name="running_processes_header_system_prefix" msgid="6104153299581682047">"सिस्टीम"</string>
+    <string name="running_processes_header_system_prefix" msgid="6104153299581682047">"सिस्टम"</string>
     <string name="running_processes_header_apps_prefix" msgid="5787594452716832727">"अॅप्स"</string>
     <string name="running_processes_header_free_prefix" msgid="4620613031737078415">"मोकळी"</string>
     <string name="running_processes_header_used_prefix" msgid="5924288703085123978">"वापरलेली"</string>
@@ -1752,7 +1763,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>
@@ -1765,7 +1776,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>
@@ -1799,13 +1810,13 @@
     <string name="usage_time_label" msgid="295954901452833058">"वापर वेळ"</string>
     <string name="accessibility_settings" msgid="3975902491934816215">"प्रवेशयोग्यता"</string>
     <string name="accessibility_settings_title" msgid="2130492524656204459">"प्रवेशयोग्यता सेटिंग्ज"</string>
-    <string name="accessibility_settings_summary" msgid="981260486011624939">"स्क्रीन रीडर, प्रदर्शन, परस्‍परसंवाद नियंत्रणे"</string>
+    <string name="accessibility_settings_summary" msgid="981260486011624939">"स्क्रीन रीडर, डिस्प्ले, परस्‍परसंवाद नियंत्रणे"</string>
     <string name="vision_settings_title" msgid="4204111425716868288">"दृष्टी सेटिंग्ज"</string>
-    <string name="vision_settings_description" msgid="5679491180156408260">"आपल्या गरजा पूर्ण करण्यासाठी आपण हे डिव्हाइस सानुकूलित करू शकता. ही प्रवेशयोग्यता वैशिष्ट्ये नंतर सेटिंग्जमध्ये बदलू शकता."</string>
-    <string name="vision_settings_suggestion_title" msgid="917294957154878441">"फॉंटचा आकार वाढवा"</string>
+    <string name="vision_settings_description" msgid="5679491180156408260">"तुमच्या गरजा पूर्ण करण्यासाठी तुम्ही हे डिव्हाइस कस्टमाइझ करू शकता. नंतर सेटिंग्जमध्ये ही अॅक्सेसयोग्यता वैशिष्ट्ये बदलू शकता."</string>
+    <string name="vision_settings_suggestion_title" msgid="8058794060304707004">"फाँटचा आकार बदला"</string>
     <string name="screen_reader_category_title" msgid="7739154903913400641">"स्क्रीन वाचक"</string>
     <string name="audio_and_captions_category_title" msgid="3420727114421447524">"ऑडिओ आणि स्क्रीनवरील मजकूर"</string>
-    <string name="display_category_title" msgid="685461049938269166">"प्रदर्शन"</string>
+    <string name="display_category_title" msgid="685461049938269166">"डिस्प्ले"</string>
     <string name="interaction_control_category_title" msgid="7836591031872839151">"संवादात्मकता नियंत्रणे"</string>
     <string name="user_installed_services_category_title" msgid="6426376488922158647">"डाउनलोड केलेल्या सेवा"</string>
     <string name="experimental_category_title" msgid="5272318666666893547">"प्रायोगिक"</string>
@@ -1831,7 +1842,7 @@
     <string name="accessibility_toggle_screen_magnification_auto_update_preference_title" msgid="7218498768415430963">"स्क्रीन विस्तृतीकरण स्वयं अद्ययावत करा"</string>
     <string name="accessibility_toggle_screen_magnification_auto_update_preference_summary" msgid="4392059334816220155">"अॅप संक्रमणांवर स्क्रीन विस्तृतीकरण अद्ययावत करा"</string>
     <string name="accessibility_power_button_ends_call_prerefence_title" msgid="6673851944175874235">"पॉवर बटण कॉल समाप्त करते"</string>
-    <string name="accessibility_toggle_large_pointer_icon_title" msgid="535173100516295580">"मोठा माऊस पॉईंटर"</string>
+    <string name="accessibility_toggle_large_pointer_icon_title" msgid="535173100516295580">"मोठा माउस पॉइंटर"</string>
     <string name="accessibility_toggle_master_mono_title" msgid="4363806997971905302">"मोनो ऑडिओ"</string>
     <string name="accessibility_toggle_master_mono_summary" msgid="5634277025251530927">"ऑडिओ प्ले करताना चॅनेल एकत्र करा"</string>
     <string name="accessibility_long_press_timeout_preference_title" msgid="6708467774619266508">"स्पर्श आणि धरण्याचा विलंब"</string>
@@ -1839,7 +1850,6 @@
     <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="preference_summary_default_combination" msgid="8532964268242666060">"<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>
@@ -1871,12 +1881,12 @@
     <string name="captioning_standard_options_title" msgid="3284211791180335844">"मानक पर्याय"</string>
     <string name="captioning_locale" msgid="4559155661018823503">"भाषा"</string>
     <string name="captioning_text_size" msgid="6737002449104466028">"मजकूर आकार"</string>
-    <string name="captioning_preset" msgid="8939737196538429044">"मथळा शैली"</string>
+    <string name="captioning_preset" msgid="8939737196538429044">"कॅप्शन स्टाइल"</string>
     <string name="captioning_custom_options_title" msgid="5067500939930322405">"सानुकूल पर्याय"</string>
     <string name="captioning_background_color" msgid="9053011212948992570">"पार्श्वभूमी रंग"</string>
     <string name="captioning_background_opacity" msgid="6029993616419971202">"पार्श्वभूमी अपारदर्शकता"</string>
-    <string name="captioning_window_color" msgid="6902052743419717394">"मथळा विंडो रंग"</string>
-    <string name="captioning_window_opacity" msgid="5041556024849862376">"मथळा विंडो अपारदर्शकता"</string>
+    <string name="captioning_window_color" msgid="6902052743419717394">"कॅप्शन विंडो रंग"</string>
+    <string name="captioning_window_opacity" msgid="5041556024849862376">"कॅप्शन विंडो अपारदर्शकता"</string>
     <string name="captioning_foreground_color" msgid="85623486537640059">"मजकूर रंग"</string>
     <string name="captioning_foreground_opacity" msgid="4370967856995419788">"मजकूर अपारदर्शकता"</string>
     <string name="captioning_edge_color" msgid="3670094753735263238">"किनारीचा रंग"</string>
@@ -1899,17 +1909,17 @@
     <string name="color_magenta" msgid="5059212823607815549">"किरमिजी तांबडा"</string>
     <string name="enable_service_title" msgid="3061307612673835592">"<xliff:g id="SERVICE">%1$s</xliff:g> वापरायचे?"</string>
     <string name="capabilities_list_title" msgid="86713361724771971">"यासाठी <xliff:g id="SERVICE">%1$s</xliff:g> आवश्यक आहे:"</string>
-    <string name="touch_filtered_warning" msgid="8644034725268915030">"अ‍ॅप परवानगी विनंती अस्पष्‍ट करीत असल्‍याने, सेटिंग्ज आपला प्रतिसाद सत्यापित करू शकत नाहीत."</string>
-    <string name="enable_service_encryption_warning" msgid="3064686622453974606">"आपण <xliff:g id="SERVICE">%1$s</xliff:g> चालू केल्‍यास, आपले डिव्‍हाइस डेटा कूटबद्धीकरण वर्धित करण्‍यासाठी आपला स्क्रीन लॉक वापरणार नाही."</string>
-    <string name="secure_lock_encryption_warning" msgid="460911459695077779">"आपण प्रवेशयोग्यता सेवा चालू केली असल्‍यामुळे, आपले डिव्‍हाइस डेटा कूटबद्धीकरण वर्धित करण्‍यासाठी आपला स्क्रीन लॉक वापरणार नाही."</string>
-    <string name="enable_service_pattern_reason" msgid="777577618063306751">"<xliff:g id="SERVICE">%1$s</xliff:g> चालू करण्यामुळे डेटा कूटबद्धीकरण प्रभावित होते, आपल्याला आपल्या नमुन्याची पुष्टी करण्याची आवश्यकता आहे."</string>
-    <string name="enable_service_pin_reason" msgid="7882035264853248228">"<xliff:g id="SERVICE">%1$s</xliff:g> चालू करण्याने कूटबद्धीकरण डेटा प्रभावित होतो, आपल्याला आपल्या पिन ची पुष्टी करण्याची आवश्यकता आहे."</string>
-    <string name="enable_service_password_reason" msgid="1224075277603097951">"<xliff:g id="SERVICE">%1$s</xliff:g> चालू करण्यामुळे डेटा कूटबद्धीकरण प्रभावित होते, आपल्याला आपल्या संकेतशब्दाची पुष्टी करण्याची आवश्यकता आहे."</string>
+    <string name="touch_filtered_warning" msgid="8644034725268915030">"अ‍ॅप परवानगी विनंती अस्पष्‍ट करीत असल्‍याने, सेटिंग्ज आपल्या प्रतिसादाची पडताळणी करू शकत नाहीत."</string>
+    <string name="enable_service_encryption_warning" msgid="3064686622453974606">"तुम्ही <xliff:g id="SERVICE">%1$s</xliff:g> चालू केल्‍यास, तुमचे डिव्हाइस डेटा एंक्रिप्शन वर्धित करण्‍यासाठी तुमचे स्क्रीन लॉक वापरणार नाही."</string>
+    <string name="secure_lock_encryption_warning" msgid="460911459695077779">"तुम्ही अॅक्सेसयोग्यता सेवा चालू केली असल्‍यामुळे, तुमचे डिव्हाइस डेटा एंक्रिप्शन वर्धित करण्‍यासाठी तुमचे स्क्रीन लॉक वापरणार नाही."</string>
+    <string name="enable_service_pattern_reason" msgid="777577618063306751">"<xliff:g id="SERVICE">%1$s</xliff:g> चालू करण्यामुळे डेटा एंक्रिप्शनवर परिणाम होतो, तुम्हाला तुमच्या पॅटर्नची पुष्टी करण्याची आवश्यकता आहे."</string>
+    <string name="enable_service_pin_reason" msgid="7882035264853248228">"<xliff:g id="SERVICE">%1$s</xliff:g> चालू करण्याने एंक्रिप्शन डेटा प्रभावित होतो, तुम्हाला तुमच्या पिन ची पुष्टी करण्याची आवश्यकता आहे."</string>
+    <string name="enable_service_password_reason" msgid="1224075277603097951">"<xliff:g id="SERVICE">%1$s</xliff:g> चालू करण्यामुळे डेटा एंक्रिप्शनवर परिणाम होतो, तुम्हाला तुमच्या पासवर्डची पुष्टी करण्याची आवश्यकता आहे."</string>
     <string name="capability_title_receiveAccessibilityEvents" msgid="1869032063969970755">"आपल्या क्रियांचे निरीक्षण करा"</string>
     <string name="capability_desc_receiveAccessibilityEvents" msgid="6640333613848713883">"आपण अॅपसह परस्परसंवाद करत असताना सूचना प्राप्त करा."</string>
     <string name="disable_service_title" msgid="3624005212728512896">"<xliff:g id="SERVICE">%1$s</xliff:g> थांबवायचे?"</string>
     <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>
@@ -1924,7 +1934,7 @@
       <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>
@@ -1942,7 +1952,7 @@
     <string name="print_job_summary" msgid="8472427347192930694">"<xliff:g id="PRINTER">%1$s</xliff:g>\n<xliff:g id="TIME">%2$s</xliff:g>"</string>
     <string name="print_printing_state_title_template" msgid="5736107667714582025">"<xliff:g id="PRINT_JOB_NAME">%1$s</xliff:g> मुद्रण करीत आहे"</string>
     <string name="print_cancelling_state_title_template" msgid="7102968925358219875">"<xliff:g id="PRINT_JOB_NAME">%1$s</xliff:g> रद्द करीत आहे"</string>
-    <string name="print_failed_state_title_template" msgid="1436099128973357969">"प्रिंटर त्रुटी <xliff:g id="PRINT_JOB_NAME">%1$s</xliff:g>"</string>
+    <string name="print_failed_state_title_template" msgid="1436099128973357969">"प्रिंटर एरर <xliff:g id="PRINT_JOB_NAME">%1$s</xliff:g>"</string>
     <string name="print_blocked_state_title_template" msgid="9065391617425962424">"प्रिंटरने <xliff:g id="PRINT_JOB_NAME">%1$s</xliff:g> अवरोधित केले"</string>
     <string name="print_search_box_shown_utterance" msgid="7730361832020726951">"शोध बॉक्स दर्शविला"</string>
     <string name="print_search_box_hidden_utterance" msgid="7980832833405818400">"शोध बॉक्स लपविला"</string>
@@ -1953,17 +1963,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="background_activity_summary_whitelisted" msgid="7375400051141016808">"बॅटरी वापरासाठी अॅप ऑप्टिमाइझ करू शकत नाही"</string>
+    <string name="background_activity_warning_dialog_title" msgid="2216249969149568871">"बॅकग्राउंड अॅक्टिव्हिटी मर्यादित ठेवायची?"</string>
+    <string name="background_activity_warning_dialog_text" msgid="7049624449246121981">"तुम्‍ही एखाद्या अॅपसाठी बॅकग्राउंड अॅक्टिव्हिटी मर्यादित ठेवल्‍यास, ते व्‍यवस्थित न चालण्‍याची शक्‍यता आहे"</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" msgid="6393929085382334341">"पूर्ण चार्ज केल्‍यापासूनचा अॅप वापर (<xliff:g id="RELATIVE_TIME">^1</xliff:g>)"</string>
+    <string name="power_usage_list_summary_device" msgid="4461926045610455423">"पूर्ण चार्ज केल्‍यापासूनचा डिव्‍हाइस वापर (<xliff:g id="RELATIVE_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>
@@ -1980,7 +1992,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>
@@ -1990,33 +2002,33 @@
     <string name="controls_subtitle" msgid="390468421138288702">"पॉवर वापर समायोजित करा"</string>
     <string name="packages_subtitle" msgid="4736416171658062768">"समाविष्ट पॅकेज"</string>
     <string name="battery_abnormal_details_title" msgid="5469019021857291216">"अ‍ॅप्स बॅटरी संपवत आहेत"</string>
-    <string name="battery_abnormal_wakelock_summary" msgid="4326186999058828831">"डिव्हाइस सक्रिय ठेवते"</string>
+    <string name="battery_abnormal_wakelock_summary" msgid="4326186999058828831">"डिव्हाइस अॅक्टिव्हेट ठेवते"</string>
     <string name="battery_abnormal_wakeup_alarm_summary" msgid="644657277875785240">"डिव्हाइसला बॅकग्राउंडमध्‍ये सक्रिय ठेवते"</string>
     <string name="battery_abnormal_location_summary" msgid="6552797246798806002">"स्थानाशी संबंधित माहिती वारंवार मागत आहे"</string>
     <string name="battery_abnormal_apps_summary" msgid="792553273248686972">"<xliff:g id="NUMBER">%1$d</xliff:g> अ‍ॅप्स विचित्र प्रकारे काम करत आहेत"</string>
     <string name="dialog_stop_title" msgid="6395127715596746479">"अ‍ॅप बंद करायचे का?"</string>
     <string name="dialog_stop_message" product="default" msgid="4006631636646776488">"तुमचा फोन, बॅटरी सामान्यपणे हाताळू शकत नाही कारण <xliff:g id="APP">%1$s</xliff:g> तुमच्या फोनला जागे ठेवत राहते.\n\nही समस्या सोडवण्यासाठी, तुम्ही अ‍ॅप थांबवू शकता.\n\nहे होत राहिल्यास, बॅटरीचे कार्यप्रदर्शन सुधारण्यासाठी तुम्हाला अ‍ॅप कदाचित अनइंस्टॉल करावे लागेल."</string>
     <string name="dialog_stop_message" product="tablet" msgid="2369957934555162428">"तुमचा टॅबलेट, बॅटरी सामान्यपणे हाताळू शकत नाही कारण <xliff:g id="APP">%1$s</xliff:g> तुमच्या टॅबलेटला जागे ठेवत राहते.\n\nही समस्या सोडवण्यासाठी, तुम्ही अ‍ॅप थांबवू शकता.\n\nहे होत राहिल्यास बॅटरीचे कार्यप्रदर्शन सुधारण्यासाठी तुम्हाला अ‍ॅप कदाचित अनइंस्टॉल करावे लागेल."</string>
-    <string name="dialog_stop_message" product="device" msgid="6195430620406365292">"तुमचा डिव्हाइस, बॅटरी सामान्यपणे हाताळू शकत नाही कारण <xliff:g id="APP">%1$s</xliff:g> तुमच्या डिव्हाइसला जागे ठेवते.\n\nही समस्या सोडवण्याच्या दृष्टीने तुम्ही अ‍ॅप थांबवू शकता.\n\nहे होत राहिल्यास, बॅटरीचे कार्यप्रदर्शन सुधारण्यासाठी तुम्हाला अ‍ॅप कदाचित अनइंस्टॉल करावे लागेल."</string>
+    <string name="dialog_stop_message" product="device" msgid="6195430620406365292">"तुमचे डिव्हाइस , बॅटरी सामान्यपणे हाताळू शकत नाही कारण <xliff:g id="APP">%1$s</xliff:g> तुमच्या डिव्हाइस ला जागे ठेवते.\n\nही समस्या सोडवण्याच्या दृष्टीने तुम्ही अ‍ॅप थांबवू शकता.\n\nहे होत राहिल्यास, बॅटरीचे कामगिरी सुधारण्यासाठी तुम्हाला अ‍ॅप कदाचित अनइंस्टॉल करावे लागेल."</string>
     <string name="dialog_stop_message_wakeup_alarm" product="default" msgid="1638726742782558262">"तुमचा फोन, बॅटरी सामान्यपणे हाताळू शकत नाही कारण <xliff:g id="APP_0">%1$s</xliff:g> तुमच्या फोनला जागे करत राहते.\n\nही समस्या सोडवण्यासाठी तुम्ही<xliff:g id="APP_1">%1$s</xliff:g> बंद करू शकता.\n\nहे होत राहिल्यास तुम्हाला कदाचित अ‍ॅप अनइंस्टॉल करावे लागेल."</string>
     <string name="dialog_stop_message_wakeup_alarm" product="tablet" msgid="8771690983566539742">"तुमचा टॅबलेट, बॅटरी सामान्यपणे हाताळू शकत नाही कारण <xliff:g id="APP_0">%1$s</xliff:g> तुमच्या टॅबलेटला जागे करत राहते.\n\nही समस्या सोडवण्यासाठी तुम्ही <xliff:g id="APP_1">%1$s</xliff:g> थांबवू शकता.\n\nहे होत राहिल्यास बॅटरीचे कार्यप्रदर्शन सुधारण्यासाठी तुम्हाला अ‍ॅप कदाचित अनइंस्टॉल करावे लागेल."</string>
-    <string name="dialog_stop_message_wakeup_alarm" product="device" msgid="2854944538238649520">"तुमचे डिव्हाइस, बॅटरी सामान्यपणे हाताळू शकत नाही कारण <xliff:g id="APP_0">%1$s</xliff:g> तुमच्या डिव्हाइसला जागे करत राहते.\n\nही समस्या सोडवण्यासाठी तुम्ही <xliff:g id="APP_1">%1$s</xliff:g>बंद करू शकता.\n\nहे होत राहिल्यास बॅटरीचे कार्यप्रदर्शन सुधारण्यासाठी तुम्हाला कदाचित अ‍ॅप अनइंंस्टॉल करावे लागेल."</string>
+    <string name="dialog_stop_message_wakeup_alarm" product="device" msgid="2854944538238649520">"तुमचे डिव्हाइस , बॅटरी सामान्यपणे हाताळू शकत नाही कारण <xliff:g id="APP_0">%1$s</xliff:g> तुमच्या डिव्हाइस ला जागे करत राहते.\n\nही समस्या सोडवण्यासाठी तुम्ही <xliff:g id="APP_1">%1$s</xliff:g>बंद करू शकता.\n\nहे होत राहिल्यास बॅटरीचे कामगिरी सुधारण्यासाठी तुम्हाला कदाचित अ‍ॅप अनइंंस्टॉल करावे लागेल."</string>
     <string name="dialog_stop_ok" msgid="2319777211264004900">"अ‍ॅप बंद करा"</string>
     <string name="dialog_background_check_title" msgid="6936542136153283692">"बॅकग्राउंडवर वापर बंद करायचा आणि अ‍ॅप थांबवायचे का?"</string>
-    <string name="dialog_background_check_message" product="default" msgid="4045827746349279563">"तुमचे डिव्हाइस, बॅटरी सामान्यपणे हाताळू शकत नाही कारण <xliff:g id="APP_0">%1$s</xliff:g> तुमच्या डिव्हाइसला जागे करत राहते.\n\nही समस्या सोडवण्याच्या दृष्टीने तुम्ही <xliff:g id="APP_1">%1$s</xliff:g> थांबवू आणि त्याचे बॅकग्राउंडमध्ये चालत राहणे प्रतिबंधित करू शकता."</string>
+    <string name="dialog_background_check_message" product="default" msgid="4045827746349279563">"तुमचे डिव्हाइस , बॅटरी सामान्यपणे हाताळू शकत नाही कारण <xliff:g id="APP_0">%1$s</xliff:g> तुमच्या डिव्हाइस ला जागे करत राहते.\n\nही समस्या सोडवण्याच्या दृष्टीने तुम्ही <xliff:g id="APP_1">%1$s</xliff:g> थांबवू आणि त्याचे बॅकग्राउंडमध्ये रन होत राहणे प्रतिबंधित करू शकता."</string>
     <string name="dialog_background_check_message" product="tablet" msgid="8348214419901788270">"तुमचा टॅबलेट, बॅटरी सामान्यपणे हाताळू शकत नाही कारण <xliff:g id="APP_0">%1$s</xliff:g> तुमच्या डिव्हाइसला जागे करत राहते.\n\nही समस्या सोडवण्याच्या दृष्टीने तुम्ही <xliff:g id="APP_1">%1$s</xliff:g> थांबवू आणि त्याचे बॅकग्राउंडमध्ये चालत राहणे प्रतिबंधित करू शकता."</string>
-    <string name="dialog_background_check_message" product="device" msgid="5847977433118915863">"तुमचे डिव्हाइस, बॅटरी सामान्यपणे हाताळू शकत नाही कारण <xliff:g id="APP_0">%1$s</xliff:g> तुमच्या डिव्हाइसला जागे करत राहते.\n\nही समस्या सोडवण्याच्या दृष्टीने तुम्ही <xliff:g id="APP_1">%1$s</xliff:g> थांबवू आणि त्याचे बॅकग्राउंंडवर चालत राहणे प्रतिबंधित करू शकता."</string>
+    <string name="dialog_background_check_message" product="device" msgid="5847977433118915863">"तुमचे डिव्हाइस , बॅटरी सामान्यपणे हाताळू शकत नाही कारण <xliff:g id="APP_0">%1$s</xliff:g> तुमच्या डिव्हाइस ला जागे करत राहते.\n\nही समस्या सोडवण्याच्या दृष्टीने तुम्ही <xliff:g id="APP_1">%1$s</xliff:g> थांबवू आणि ते बॅकग्राउंंडवर रन होत राहणे प्रतिबंधित करू शकता."</string>
     <string name="dialog_background_check_ok" msgid="412876934682899659">"बंद करा"</string>
     <string name="dialog_location_title" msgid="5888917530725874727">"स्थान बंद करायचे का?"</string>
     <string name="dialog_location_message" product="default" msgid="7774807745601479888">"तुमचा फोन, बॅटरी सामान्यपणे हाताळू शकत नाही कारण <xliff:g id="APP">%1$s</xliff:g> तुम्ही अ‍ॅप वापरत नसताना तुमची स्थानसंबंधित माहिती विचारत राहते.\n\nही समस्या सोडवण्यासाठी तुम्ही या अ‍ॅपची स्थानसंबंधित माहिती बंद करू शकता."</string>
     <string name="dialog_location_message" product="tablet" msgid="118745801732181618">"तुमचा टॅबलेट, बॅटरी सामान्यपणे हाताळू शकत नाही कारण <xliff:g id="APP">%1$s</xliff:g> तुम्ही अ‍ॅप वापरत नसताना तुमची स्थानसंबंधित माहिती विचारत राहते.\n\nही समस्या सोडवण्यासाठी तुम्ही या अ‍ॅपची स्थानसंबंधित माहिती बंद करू शकता."</string>
-    <string name="dialog_location_message" product="device" msgid="6783678153382298295">"तुमचे डिव्हाइस, बॅटरी सामान्यपणे हाताळू शकत नाही कारण <xliff:g id="APP">%1$s</xliff:g> तुमच्या डिव्हाइसला जागे करत राहते.\n\nही समस्या सोडवण्यासाठी तुम्ही या अ‍ॅपसाठी स्थानसंबंधित माहिती मिळणे बंद करू शकता."</string>
+    <string name="dialog_location_message" product="device" msgid="6783678153382298295">"तुमचे डिव्हाइस , बॅटरी सामान्यपणे हाताळू शकत नाही कारण <xliff:g id="APP">%1$s</xliff:g> तुमच्या डिव्हाइस ला जागे करत राहते.\n\nही समस्या सोडवण्यासाठी तुम्ही या अ‍ॅपसाठी स्थानसंबंधित माहिती मिळणे बंद करू शकता."</string>
     <string name="dialog_location_ok" msgid="4572391197601313986">"बंद करा"</string>
     <string name="power_screen" msgid="3023346080675904613">"स्क्रीन"</string>
     <string name="power_flashlight" msgid="7794409781003567614">"फ्लॅशलाइट"</string>
     <string name="power_camera" msgid="4976286950934622605">"कॅमेरा"</string>
     <string name="power_wifi" msgid="1135085252964054957">"वाय-फाय"</string>
-    <string name="power_bluetooth" msgid="4373329044379008289">"ब्लूटुथ"</string>
+    <string name="power_bluetooth" msgid="4373329044379008289">"ब्लूटूथ"</string>
     <string name="power_cell" msgid="3392999761958982492">"मोबाइल नेटवर्क स्टँडबाय"</string>
     <string name="power_phone" msgid="5392641106474567277">"व्हॉइस कॉल"</string>
     <string name="power_idle" product="tablet" msgid="4612478572401640759">"टॅबलेट निष्क्रिय"</string>
@@ -2053,7 +2065,7 @@
     <string name="battery_action_app_settings" msgid="4570481408106287454">"अ‍ॅप सेटिंग्ज"</string>
     <string name="battery_action_display" msgid="7338551244519110831">"स्क्रीन सेटिंग्ज"</string>
     <string name="battery_action_wifi" msgid="8181553479021841207">"वाय-फाय सेटिंग्ज"</string>
-    <string name="battery_action_bluetooth" msgid="8374789049507723142">"ब्लूटुथ सेटिंग्ज"</string>
+    <string name="battery_action_bluetooth" msgid="8374789049507723142">"ब्लूटूथ सेटिंग्ज"</string>
     <string name="battery_desc_voice" msgid="8980322055722959211">"व्हॉइस कॉलद्वारे वापरलेली बॅटरी"</string>
     <string name="battery_desc_standby" product="tablet" msgid="6284747418668280364">"टॅबलेट निष्क्रिय असताना वापरलेली बॅटरी"</string>
     <string name="battery_desc_standby" product="default" msgid="3009080001948091424">"फोन निष्क्रिय असताना वापरलेली बॅटरी"</string>
@@ -2061,15 +2073,15 @@
     <string name="battery_sugg_radio" msgid="8211336978326295047">"सेल कव्हरेज नसलेल्या क्षेत्रांमध्ये पॉवर वाचविण्यासाठी विमान मोड वर स्विच करा"</string>
     <string name="battery_desc_flashlight" msgid="2908579430841025494">"फ्‍लॅशलाइट द्वारे वापरलेली बॅटरी"</string>
     <string name="battery_desc_camera" msgid="7375389919760613499">"कॅमेर्‍याद्वारे वापरलेली बॅटरी"</string>
-    <string name="battery_desc_display" msgid="5432795282958076557">"प्रदर्शन आणि बॅकलाइटद्वारे वापरलेली बॅटरी"</string>
-    <string name="battery_sugg_display" msgid="3370202402045141760">"स्क्रीन चकाकी आणि/किंवा स्क्रीन कालबाह्य कमी करते"</string>
+    <string name="battery_desc_display" msgid="5432795282958076557">"डिस्प्ले आणि बॅकलाइटद्वारे वापरलेली बॅटरी"</string>
+    <string name="battery_sugg_display" msgid="3370202402045141760">"स्क्रीन चकाकी आणि/किंवा स्क्रीन टाइमआउट कमी करते"</string>
     <string name="battery_desc_wifi" msgid="2375567464707394131">"वाय-फाय द्वारे वापरलेली बॅटरी"</string>
     <string name="battery_sugg_wifi" msgid="7776093125855397043">"जेव्हा वाय-फाय वापरत नसाल किंवा ते उपलब्ध नसेल तेव्हा ते बंद करा"</string>
-    <string name="battery_desc_bluetooth" msgid="8069070756186680367">"ब्लूटुथ द्वारे वापरलेली बॅटरी"</string>
-    <string name="battery_sugg_bluetooth_basic" msgid="4565141162650835009">"आपण ब्लूटुथ वापरत नसता तेव्हा ते बंद करा"</string>
-    <string name="battery_sugg_bluetooth_headset" msgid="4071352514714259230">"एका भिन्न ब्लूटुथ उपकरणावर कनेक्ट करून पहा"</string>
+    <string name="battery_desc_bluetooth" msgid="8069070756186680367">"ब्लूटूथ द्वारे वापरलेली बॅटरी"</string>
+    <string name="battery_sugg_bluetooth_basic" msgid="4565141162650835009">"तुम्ही ब्लूटूथ वापरत नसता तेव्हा ते बंद करा"</string>
+    <string name="battery_sugg_bluetooth_headset" msgid="4071352514714259230">"एका भिन्न ब्लूटूथ उपकरणावर कनेक्ट करून पहा"</string>
     <string name="battery_desc_apps" msgid="8530418792605735226">"अॅपद्वारे वापरलेली बॅटरी"</string>
-    <string name="battery_sugg_apps_info" msgid="6907588126789841231">"अॅप थांबवा किंवा विस्थापित करा"</string>
+    <string name="battery_sugg_apps_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>
@@ -2156,29 +2168,29 @@
     <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_wifi" msgid="319262861956544493">"वाय-फाय सेटिंग अपडेट करत आहे"</string>
+    <string name="gadget_toggle_bluetooth" msgid="7538903239807020826">"ब्लूटुथ सेटिंग्ज अपडेट करत आहे"</string>
     <string name="gadget_state_template" msgid="5156935629902649932">"<xliff:g id="ID_1">%1$s</xliff:g> <xliff:g id="ID_2">%2$s</xliff:g>"</string>
     <string name="gadget_state_on" msgid="6909119593004937688">"वर"</string>
     <string name="gadget_state_off" msgid="5220212352953066317">"बंद"</string>
     <string name="gadget_state_turning_on" msgid="3395992057029439039">"चालू करीत आहे"</string>
     <string name="gadget_state_turning_off" msgid="2395546048102176157">"बंद करीत आहे"</string>
     <string name="gadget_wifi" msgid="4712584536500629417">"वाय-फाय"</string>
-    <string name="gadget_bluetooth" msgid="8998572807378694410">"ब्लूटुथ"</string>
+    <string name="gadget_bluetooth" msgid="8998572807378694410">"ब्लूटूथ"</string>
     <string name="gadget_location" msgid="2974757497945178165">"स्थान"</string>
     <string name="gadget_sync" msgid="858895763714222152">"संकालन करा"</string>
     <string name="gadget_brightness_template" msgid="930541920933123603">"चकाकी <xliff:g id="ID_1">%1$s</xliff:g>"</string>
@@ -2187,36 +2199,36 @@
     <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_reset" msgid="3239382277144980418">"क्रेडेन्शियल साफ करा"</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>
+    <string name="trusted_credentials" msgid="4266945289534242402">"विश्वसनीय क्रेडेंशियल"</string>
     <string name="trusted_credentials_summary" msgid="6735221351155686632">"विश्वसनीय CA प्रमाणपत्रे प्रदर्शित करा"</string>
-    <string name="user_credentials" msgid="3719013347787187083">"वापरकर्ता क्रेडेन्शियल"</string>
-    <string name="user_credentials_summary" msgid="7271228342106080167">"संचयित केलेले क्रेडेन्शियल पहा आणि सुधारित करा"</string>
+    <string name="user_credentials" msgid="3719013347787187083">"वापरकर्ता क्रेडेंशियल"</string>
+    <string name="user_credentials_summary" msgid="7271228342106080167">"स्टोअर केलेले क्रेडेंशियल पहा आणि सुधारित करा"</string>
     <string name="advanced_security_title" msgid="2434776238010578865">"प्रगत"</string>
     <string name="credential_storage_type" msgid="8629968543494001364">"संचयन प्रकार"</string>
     <string name="credential_storage_type_hardware" msgid="6077193544333904427">"हार्डवेअर-बॅक अप घेतला"</string>
     <string name="credential_storage_type_software" msgid="4403117271207715378">"केवळ सॉफ्टवेअर"</string>
-    <string name="credentials_settings_not_available" msgid="7968275634486624215">"या वापरकर्त्यासाठी क्रेडेन्शियल उपलब्ध नाहीत"</string>
-    <string name="credential_for_vpn_and_apps" msgid="4168197158768443365">"VPN आणि अॅप्ससाठी स्थापित केले"</string>
-    <string name="credential_for_wifi" msgid="6228425986551591864">"वाय-फाय साठी स्थापित केले"</string>
+    <string name="credentials_settings_not_available" msgid="7968275634486624215">"या वापरकर्त्यासाठी क्रेडेंशियल उपलब्ध नाहीत"</string>
+    <string name="credential_for_vpn_and_apps" msgid="4168197158768443365">"VPN आणि अॅप्ससाठी इंस्टॉल केले"</string>
+    <string name="credential_for_wifi" msgid="6228425986551591864">"वाय-फाय साठी इंस्टॉल केले"</string>
     <string name="credentials_unlock" msgid="385427939577366499"></string>
-    <string name="credentials_unlock_hint" msgid="2301301378040499348">"क्रेडेन्शियल संचयनासाठी संकेतशब्द टाइप करा."</string>
+    <string name="credentials_unlock_hint" msgid="2301301378040499348">"क्रेडेंशियल स्टोरेजसाठी पासवर्ड टाइप करा."</string>
     <string name="credentials_old_password" msgid="7553393815538684028">"वर्तमान संकेतशब्द:"</string>
     <string name="credentials_reset_hint" msgid="6297256880896133631">"सर्व सामग्री काढायची?"</string>
-    <string name="credentials_password_too_short" msgid="7502749986405522663">"संकेतशब्दामध्ये कमीत कमी 8 वर्ण असणे आवश्यक आहे."</string>
     <string name="credentials_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="8058230497337529036">"तुम्ही क्रेडेन्शियल स्टोरेज वापरण्यापूर्वी, तुमच्या डीव्हाइसला एक सुरक्षित स्क्रीन लॉक असणे आवश्यक आहे"</string>
+    <string name="credentials_configure_lock_screen_button" msgid="253239765216055321">"लॉक सेट करा"</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>
@@ -2224,34 +2236,34 @@
     <string name="backup_section_title" msgid="7952232291452882740">"बॅकअप घ्या आणि पुनर्संचयित करा"</string>
     <string name="personal_data_section_title" msgid="7815209034443782061">"वैयक्तिक डेटा"</string>
     <string name="backup_data_title" msgid="1239105919852668016">"माझ्या डेटाचा बॅकअप घ्या"</string>
-    <string name="backup_data_summary" msgid="708773323451655666">"Google सर्व्हरमध्ये अॅप डेटा, वाय-फाय संकेतशब्द आणि इतर सेटिंग्जचा बॅक अप घ्या"</string>
+    <string name="backup_data_summary" msgid="708773323451655666">"Google सर्व्हरमध्ये अॅप डेटा, वाय-फाय पासवर्ड आणि इतर सेटिंग्जचा बॅक अप घ्या"</string>
     <string name="backup_configure_account_title" msgid="3790872965773196615">"बॅकअप खाते"</string>
     <string name="include_app_data_title" msgid="2829970132260278394">"अॅप डेटा समाविष्ट करा"</string>
     <string name="auto_restore_title" msgid="5397528966329126506">"स्वयंचलित पुनर्संचयन"</string>
-    <string name="auto_restore_summary" msgid="4235615056371993807">"अॅप पुनर्स्थापित करताना, बॅक अप घेतलेल्या सेटिंग्ज आणि डेटा पुनर्संचयित करा"</string>
+    <string name="auto_restore_summary" msgid="4235615056371993807">"अॅप पुन्हा इंस्टॉल करताना, बॅक अप घेतलेल्या सेटिंग्ज आणि डेटा रीस्टोअर करा"</string>
     <string name="backup_inactive_title" msgid="685838037986644604">"बॅक अप सेवा सक्रिय नाही"</string>
-    <string name="backup_configure_account_default_summary" msgid="2436933224764745553">"कोणतेही खाते सध्या बॅक अप घेतलेला डेटा संचयित करत नाहीये"</string>
+    <string name="backup_configure_account_default_summary" msgid="2436933224764745553">"कोणतेही खाते सध्या बॅक अप घेतलेला डेटा स्टोअर करत नाहीये"</string>
     <string name="backup_erase_dialog_title" msgid="1027640829482174106"></string>
-    <string name="backup_erase_dialog_message" msgid="5221011285568343155">"Google सर्व्हरवरील आपल्या वाय-फाय संकेतशब्द, बुकमार्क, इतर सेटिंग्ज आणि अॅप डेटाचा बॅक अप घेणे थांबवायचे तसेच सर्व प्रतिलिपी मिटवायच्या?"</string>
-    <string name="fullbackup_erase_dialog_message" msgid="694766389396659626">"डिव्हाइस डेटाचा (जसे की वाय-फाय संकेतशब्द आणि कॉल इतिहास) आणि (अॅप्सद्वारे संचयित केलेल्या सेटिंग्ज आणि फायली यासारख्या) अॅप डेटाचा बॅकअप घेणे थांबवा, तसेच दूरस्थ सर्व्हर वरील सर्व प्रती मिटवायच्या?"</string>
-    <string name="fullbackup_data_summary" msgid="960850365007767734">"स्वयंचलितपणे डिव्‍हाइस डेटाचा (जसे की वाय-फाय संकेतशब्द आणि कॉल इतिहास) आणि अ‍ॅप डेटाचा (जसे की अ‍ॅप्‍स द्वारे संचयित केलेल्या सेटिंग्ज आणि फायली) दूरस्‍थपणे बॅकअप घ्‍या.\n\nआपण स्वयंचलित बॅकअप चालू करता तेव्‍हा, डिव्‍हाइस आणि अ‍ॅप डेटा मधूनमधून दूरस्‍थपणे जतन केला जातो. अ‍ॅप डेटा हा संपर्क, संदेश आणि फोटो यासारख्‍या संभाव्य संवेदनशील डेटासह अ‍ॅपने जतन केलेला कोणताही डेटा असू शकतो (विकासकाच्या सेटिंग्जवर आधारित)."</string>
+    <string name="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="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="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>
@@ -2260,9 +2272,9 @@
     <string name="sound_category_call_ringtone_vibrate_title" msgid="1543777228646645163">"कॉल रिंगटोन आणि कंपन"</string>
     <string name="sound_category_system_title" msgid="1480844520622721141">"सिस्टम"</string>
     <string name="wifi_setup_title" msgid="2970260757780025029">"वाय-फाय सेटअप"</string>
-    <string name="wifi_setup_title_editing_network" msgid="6020614644556717979">"वाय-फाय नेटवर्क <xliff:g id="NETWORK_NAME">%s</xliff:g> शी कनेक्ट करा"</string>
-    <string name="wifi_setup_title_connecting_network" msgid="5572226790101017822">"वाय-फाय नेटवर्क <xliff:g id="NETWORK_NAME">%s</xliff:g> शी कनेक्ट करीत आहे..."</string>
-    <string name="wifi_setup_title_connected_network" msgid="1608788657122010919">"वाय-फाय नेटवर्क <xliff:g id="NETWORK_NAME">%s</xliff:g> शी कनेक्ट झाले"</string>
+    <string name="wifi_setup_title_editing_network" msgid="6020614644556717979">"Wi‑Fi नेटवर्क <xliff:g id="NETWORK_NAME">%s</xliff:g> शी कनेक्ट करा"</string>
+    <string name="wifi_setup_title_connecting_network" msgid="5572226790101017822">"Wi‑Fi नेटवर्क <xliff:g id="NETWORK_NAME">%s</xliff:g> शी कनेक्ट करत आहे..."</string>
+    <string name="wifi_setup_title_connected_network" msgid="1608788657122010919">"Wi‑Fi नेटवर्क <xliff:g id="NETWORK_NAME">%s</xliff:g> शी कनेक्ट झाले"</string>
     <string name="wifi_setup_title_add_network" msgid="6932651000151032301">"एक नेटवर्क जोडा"</string>
     <string name="wifi_setup_not_connected" msgid="6997432604664057052">"कनेक्ट केले नाही"</string>
     <string name="wifi_setup_add_network" msgid="5939624680150051807">"नेटवर्क जोडा"</string>
@@ -2273,7 +2285,7 @@
     <string name="wifi_setup_detail" msgid="2336990478140503605">"नेटवर्क तपशील"</string>
     <string name="wifi_setup_connect" msgid="7954456989590237049">"कनेक्ट करा"</string>
     <string name="wifi_setup_forget" msgid="2562847595567347526">"विसरा"</string>
-    <string name="wifi_setup_save" msgid="3659235094218508211">"जतन करा"</string>
+    <string name="wifi_setup_save" msgid="3659235094218508211">"सेव्ह करा"</string>
     <string name="wifi_setup_cancel" msgid="3185216020264410239">"रद्द करा"</string>
     <string name="wifi_setup_status_scanning" msgid="5317003416385428036">"नेटवर्क स्कॅन करत आहे…"</string>
     <string name="wifi_setup_status_select_network" msgid="3960480613544747397">"नेटवर्कशी कनेक्ट करण्यासाठी त्यावर टॅप करा"</string>
@@ -2284,13 +2296,13 @@
     <string name="wifi_setup_status_connecting" msgid="4971421484401530740">"कनेक्ट करीत आहे..."</string>
     <string name="wifi_setup_status_proceed_to_next" msgid="6708250000342940031">"पुढील चरणावर जा"</string>
     <string name="wifi_setup_status_eap_not_supported" msgid="6796317704783144190">"EAP समर्थित नाही."</string>
-    <string name="wifi_setup_eap_not_supported" msgid="6812710317883658843">"आपण सेटअप दरम्यान EAP वाय-फाय कनेक्शन कॉन्फिगर करु शकत नाही, आपण ते सेटिंग्ज &gt; वायरलेस &amp; नेटवर्क मध्ये करु शकता."</string>
+    <string name="wifi_setup_eap_not_supported" msgid="6812710317883658843">"तुम्ही सेटअप दरम्यान EAP Wi‑Fi कनेक्शन कॉंफिगर करु शकत नाही, तुम्ही ते सेटिंग्ज &gt; वायरलेस &amp; नेटवर्क मध्ये करु शकता."</string>
     <string name="wifi_setup_description_connecting" msgid="2793554932006756795">"कनेक्ट करण्यास काही मिनिटे लागू शकतात…"</string>
-    <string name="wifi_setup_description_connected" msgid="6649168170073219153">"सेटअप सुरू ठेवण्यासाठी "<b>"पुढील"</b>" वर टॅप करा.\n\nएका भिन्न वाय‑फाय नेटवर्कशी कनेक्ट करण्यासाठी "<b>"परत"</b>" वर टॅप करा."</string>
+    <string name="wifi_setup_description_connected" msgid="6649168170073219153">"सेटअप सुरू ठेवण्यासाठी "<b>"पुढील"</b>" वर टॅप करा.\n\nएका वेगळ्या वाय‑फाय नेटवर्कशी कनेक्ट करण्यासाठी "<b>"परत"</b>" वर टॅप करा."</string>
     <string name="accessibility_sync_enabled" msgid="558480439730263116">"संकालन सक्षम केले"</string>
     <string name="accessibility_sync_disabled" msgid="1741194106479011384">"संकालन अक्षम केले"</string>
     <string name="accessibility_sync_in_progress" msgid="4501160520879902723">"आता संकालन करीत आहे"</string>
-    <string name="accessibility_sync_error" msgid="8703299118794272041">"संकालन त्रुटी."</string>
+    <string name="accessibility_sync_error" msgid="8703299118794272041">"सिंक एरर."</string>
     <string name="sync_failed" msgid="1696499856374109647">"संकालन अयशस्वी"</string>
     <string name="sync_active" msgid="8476943765960863040">"संकालन सक्रिय"</string>
     <string name="account_sync_settings_title" msgid="5131314922423053588">"संकालन करा"</string>
@@ -2300,14 +2312,14 @@
     <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>
-    <string name="sync_error" msgid="5060969083117872149">"संकालन त्रुटी"</string>
+    <string name="sync_error" msgid="5060969083117872149">"सिंक एरर"</string>
     <string name="last_synced" msgid="4242919465367022234">"अंतिम संकालन केले: <xliff:g id="LAST_SYNC_TIME">%1$s</xliff:g>"</string>
     <string name="sync_in_progress" msgid="5151314196536070569">"आता संकालन करीत आहे…"</string>
     <string name="settings_backup" msgid="2274732978260797031">"बॅक अप सेटिंग्ज"</string>
@@ -2335,13 +2347,11 @@
     <!-- 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="wimax_settings" msgid="2655139497028469039">"4G"</string>
-    <string name="status_wimax_mac_address" msgid="8390791848661413416">"4G MAC पत्ता"</string>
+    <string name="cant_sync_dialog_message" msgid="1938380442159016449">"या आयटमसाठी सध्या सिंक अक्षम केले आहे. हे सेटिंग बदलण्यासाठी, पार्श्वभूमीवरील डेटा आणि आपोआप होणारे सिंक तात्पुरते चालू करा."</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>
@@ -2351,6 +2361,7 @@
     <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_plan_usage_manage_plans_button_text" msgid="8997761990902708162">"योजना व्यवस्थापित करा"</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>
@@ -2361,7 +2372,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>
@@ -2400,17 +2411,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>
@@ -2419,10 +2430,10 @@
     <string name="data_usage_limit_dialog_title" msgid="3023111643632996097">"डेटा वापर मर्यादित करत आहे"</string>
     <string name="data_usage_limit_dialog_mobile" product="tablet" msgid="4983487893343645667">"आपल्या टॅबलेटने आपण सेट केलेली मर्यादा गाठताच तो मोबाइल डेटा बंद करेल.\n\nआपल्या टॅबलेटद्वारे डेटा वापर मोजला जात असल्याने आणि आपला वाहक वापराची गणना वेगळ्या प्रकारे करू शकत असल्याने, कमी मर्यादा सेट करणे विचारात घ्या."</string>
     <string name="data_usage_limit_dialog_mobile" product="default" msgid="3926320594049434225">"आपल्या फोनने आपण सेट केलेली मर्यादा गाठताच तो मोबाइल डेटा बंद करेल.\n\nआपल्या फोनद्वारे डेटा वापर मोजला जात असल्याने आणि आपला वाहक वापराची गणना वेगळ्या प्रकारे करू शकत असल्याने, कमी मर्यादा सेट करणे विचारात घ्या."</string>
-    <string name="data_usage_restrict_background_title" msgid="2201315502223035062">"पार्श्वभूमी डेटा प्रतिबंधित करायचा?"</string>
-    <string name="data_usage_restrict_background" msgid="434093644726734586">"आपण पार्श्वभूमी मोबाइल डेटा प्रतिबंधित केल्यास, आपण वाय-फाय शी कनेक्ट असल्याशिवाय काही अॅप्स आणि सेवा कार्य करणार नाहीत."</string>
-    <string name="data_usage_restrict_background_multiuser" product="tablet" msgid="7096707497743363380">"आपण पार्श्वभूमी मोबाइल डेटा प्रतिबंधित केल्यास, आपण वाय-फाय शी कनेक्ट असल्याशिवाय काही अॅप्स आणि सेवा कार्य करणार नाहीत.\n\nहे सेटिंग या टॅबलेटवरील सर्व वापरकर्त्यांना प्रभावित करते."</string>
-    <string name="data_usage_restrict_background_multiuser" product="default" msgid="7910798414964288424">"आपण पार्श्वभूमी मोबाइल डेटा प्रतिबंधित केल्यास, आपण वाय-फाय शी कनेक्ट असल्याशिवाय काही अॅप्स आणि सेवा कार्य करणार नाहीत.\n\nहे सेटिंग या फोनवरील सर्व वापरकर्त्यांना प्रभावित करते."</string>
+    <string name="data_usage_restrict_background_title" msgid="2201315502223035062">"पार्श्वभूमीवरील डेटा प्रतिबंधित करायचा?"</string>
+    <string name="data_usage_restrict_background" msgid="434093644726734586">"तुम्ही पार्श्वभूमी मोबाइल डेटा प्रतिबंधित केल्यास, तुम्ही वाय-फाय शी कनेक्ट असल्याशिवाय काही अॅप्स आणि सेवा काम करणार नाहीत."</string>
+    <string name="data_usage_restrict_background_multiuser" product="tablet" msgid="7096707497743363380">"तुम्ही पार्श्वभूमी मोबाइल डेटा प्रतिबंधित केल्यास, तुम्ही वाय-फाय शी कनेक्ट असल्याशिवाय काही अॅप्स आणि सेवा काम करणार नाहीत.\n\nहे सेटिंग या टॅबलेटवरील सर्व वापरकर्त्यांवर परिणाम करते."</string>
+    <string name="data_usage_restrict_background_multiuser" product="default" msgid="7910798414964288424">"तुम्ही पार्श्वभूमी मोबाइल डेटा प्रतिबंधित केल्यास, तुम्ही वाय-फाय शी कनेक्ट असल्याशिवाय काही अॅप्स आणि सेवा काम करणार नाहीत.\n\nहे सेटिंग या फोनवरील सर्व वापरकर्त्यांवर परिणाम करते."</string>
     <string name="data_usage_sweep_warning" msgid="6387081852568846982"><font size="18">"<xliff:g id="NUMBER">^1</xliff:g>"</font>" "<font size="9">"<xliff:g id="UNIT">^2</xliff:g>"</font>\n<font size="12">"चेतावणी"</font></string>
     <string name="data_usage_sweep_limit" msgid="860566507375933039"><font size="18">"<xliff:g id="NUMBER">^1</xliff:g>"</font>" "<font size="9">"<xliff:g id="UNIT">^2</xliff:g>"</font>\n<font size="12">"मर्यादा"</font></string>
     <string name="data_usage_uninstalled_apps" msgid="614263770923231598">"काढलेले अॅप्स"</string>
@@ -2432,17 +2443,20 @@
     <string name="data_usage_total_during_range_mobile" product="tablet" msgid="1925687342154538972">"<xliff:g id="RANGE">%2$s</xliff:g>: आपल्या टॅब्लेटच्या मापनाप्रमाणे सुमारे <xliff:g id="TOTAL">%1$s</xliff:g> वापरले. आपल्या वाहकाच्या डेटा वापराची गणना भिन्न असू शकते."</string>
     <string name="data_usage_total_during_range_mobile" product="default" msgid="5063981061103812900">"<xliff:g id="RANGE">%2$s</xliff:g>: आपल्या फोनच्या मापनाप्रमाणे सुमारे <xliff:g id="TOTAL">%1$s</xliff:g> वापरले. आपल्या वाहकाच्या डेटा वापराची गणना भिन्न असू शकते."</string>
     <string name="data_usage_metered_title" msgid="7383175371006596441">"नेटवर्क प्रतिबंध"</string>
-    <string name="data_usage_metered_body" msgid="7655851702771342507">"पार्श्वभूमी डेटा प्रतिबंधित असताना मीटर केलेली नेटवर्क मोबाइल नेटवर्कप्रमाणे हाताळली जातात. ही नेटवर्क मोठ्‍या डाउनलोडसाठी वापरण्‍यापूर्वी अ‍ॅप्‍स चेतावणी देऊ शकतात."</string>
+    <string name="data_usage_metered_body" msgid="7655851702771342507">"पार्श्वभूमीवरील डेटा प्रतिबंधित असताना मीटर केलेली नेटवर्क मोबाइल नेटवर्कप्रमाणे वापरली जातात. मोठ्‍या डाउनलोडसाठी ही नेटवर्क वापरण्‍यापूर्वी अ‍ॅप्‍सकडून चेतावणी मिळू शकते."</string>
     <string name="data_usage_metered_mobile" msgid="5423305619126978393">"मोबाईल नेटवर्क"</string>
     <string name="data_usage_metered_wifi" msgid="1761738002328299714">"मीटर केलेली वाय-फाय नेटवर्क"</string>
     <string name="data_usage_metered_wifi_disabled" msgid="727808462375941567">"मीटर केलेली नेटवर्क निवडण्‍यासाठी, वाय-फाय चालू करा."</string>
+    <string name="data_usage_metered_auto" msgid="1262028400911918865">"स्वयंचलित"</string>
+    <string name="data_usage_metered_yes" msgid="9217539611385225894">"मीटरने मोजले"</string>
+    <string name="data_usage_metered_no" msgid="4025232961929071789">"मीटरने मोजले नाही"</string>
     <string name="data_usage_disclaimer" msgid="6887858149980673444">"वाहक डेटा गणना आपल्या डिव्हाइसपेक्षा भिन्न असू शकते."</string>
     <string name="cryptkeeper_emergency_call" msgid="198578731586097145">"आणीबाणीचा कॉल"</string>
     <string name="cryptkeeper_return_to_call" msgid="5613717339452772491">"कॉल वर परत"</string>
     <string name="vpn_name" msgid="4689699885361002297">"नाव"</string>
     <string name="vpn_type" msgid="5435733139514388070">"प्रकार"</string>
     <string name="vpn_server" msgid="2123096727287421913">"सर्व्हर पत्ता"</string>
-    <string name="vpn_mppe" msgid="6639001940500288972">"PPP कूटबद्धीकरण (MPPE)"</string>
+    <string name="vpn_mppe" msgid="6639001940500288972">"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>
@@ -2455,7 +2469,7 @@
     <string name="vpn_routes" msgid="3818655448226312232">"अग्रेषण मार्ग (उदा. 10.0.0.0/8)"</string>
     <string name="vpn_username" msgid="1863901629860867849">"वापरकर्तानाव"</string>
     <string name="vpn_password" msgid="6756043647233596772">"संकेतशब्द"</string>
-    <string name="vpn_save_login" msgid="6350322456427484881">"खाते माहिती जतन करा"</string>
+    <string name="vpn_save_login" msgid="6350322456427484881">"खाते माहिती सेव्ह करा"</string>
     <string name="vpn_not_used" msgid="9094191054524660891">"(वापरले नाही)"</string>
     <string name="vpn_no_ca_cert" msgid="8776029412793353361">"(सर्व्हर सत्यापित करू नका)"</string>
     <string name="vpn_no_server_cert" msgid="2167487440231913330">"(सर्व्हरवरुन प्राप्त झालेले)"</string>
@@ -2466,7 +2480,7 @@
     <string name="vpn_always_on_invalid_reason_other" msgid="5959352052515258208">"प्रविष्ट केलेली माहिती नेहमी-चालू VPN ला समर्थित करत नाही"</string>
     <string name="vpn_cancel" msgid="1979937976123659332">"रद्द करा"</string>
     <string name="vpn_done" msgid="8678655203910995914">"डिसमिस करा"</string>
-    <string name="vpn_save" msgid="4233484051644764510">"जतन करा"</string>
+    <string name="vpn_save" msgid="4233484051644764510">"सेव्ह करा"</string>
     <string name="vpn_connect" msgid="8469608541746132301">"कनेक्ट करा"</string>
     <string name="vpn_replace" msgid="5442836256121957861">"पुनर्स्थित करा"</string>
     <string name="vpn_edit" msgid="8647191407179996943">"VPN प्रोफाईल संपादित करा"</string>
@@ -2486,7 +2500,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>
@@ -2494,7 +2508,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>
@@ -2517,41 +2531,38 @@
     <string name="one_usercrt" msgid="2150319011101639509">"एक वापरकर्ता प्रमाणपत्र"</string>
     <string name="one_cacrt" msgid="6844397037970164809">"एक CA प्रमाणपत्र"</string>
     <string name="n_cacrts" msgid="5979300323482053820">"%d CA प्रमाणपत्रे"</string>
-    <string name="user_credential_title" msgid="1954061209643070652">"क्रेडेन्शियल तपशील"</string>
-    <string name="user_credential_removed" msgid="6514189495799401838">"क्रेडेन्शियल काढले: <xliff:g id="CREDENTIAL_NAME">%s</xliff:g>"</string>
-    <string name="user_credential_none_installed" msgid="3729607560420971841">"कोणतेही वापरकर्ता क्रेडेन्शियल स्थापित केलेले नाहीत"</string>
+    <string name="user_credential_title" msgid="1954061209643070652">"क्रेडेंशियल तपशील"</string>
+    <string name="user_credential_removed" msgid="6514189495799401838">"क्रेडेंशियल काढले: <xliff:g id="CREDENTIAL_NAME">%s</xliff:g>"</string>
+    <string name="user_credential_none_installed" msgid="3729607560420971841">"कोणतेही वापरकर्ता क्रेडेंशियल इंस्टॉल केलेले नाहीत"</string>
     <string name="spellcheckers_settings_title" msgid="399981228588011501">"शब्दलेखन तपासक"</string>
     <string name="current_backup_pw_prompt" msgid="7735254412051914576">"येथे आपला वर्तमान पूर्ण बॅकअप संकेतशब्द टाइप करा"</string>
     <string name="new_backup_pw_prompt" msgid="8755501377391998428">"येथे पूर्ण बॅकअप साठी एक नवीन संकेतशब्द टाइप करा"</string>
-    <string name="confirm_new_backup_pw_prompt" msgid="3238728882512787864">"येथे आपला नवीन पूर्ण बॅकअप संकेतशब्द परत टाइप करा"</string>
+    <string name="confirm_new_backup_pw_prompt" msgid="3238728882512787864">"येथे आपला नवीन पूर्ण बॅकअप पासवर्ड परत टाइप करा"</string>
     <string name="backup_pw_set_button_text" msgid="2387480910044648795">"बॅकअप संकेतशब्द सेट करा"</string>
     <string name="backup_pw_cancel_button_text" msgid="8845630125391744615">"रद्द करा"</string>
-    <string name="additional_system_update_settings_list_item_title" msgid="214987609894661992">"अतिरिक्त सिस्टम अद्यतने"</string>
-    <string name="selinux_status_disabled" msgid="924551035552323327">"अक्षम"</string>
-    <string name="selinux_status_permissive" msgid="6004965534713398778">"मुक्ताचारी"</string>
-    <string name="selinux_status_enforcing" msgid="2252703756208463329">"अंमलबजावणी"</string>
+    <string name="additional_system_update_settings_list_item_title" msgid="214987609894661992">"अतिरिक्त सिस्टम अपडेट"</string>
     <string name="ssl_ca_cert_warning" msgid="2045866713601984673">"नेटवर्कचे परीक्षण केले जाऊ शकते"</string>
     <string name="done_button" msgid="1991471253042622230">"पूर्ण झाले"</string>
     <plurals name="ssl_ca_cert_dialog_title" formatted="false" msgid="7145092748045794650">
-      <item quantity="one">विश्वासू किंवा काढा प्रमाणपत्र</item>
-      <item quantity="other">विश्वासू किंवा काढा प्रमाणपत्रे</item>
+      <item quantity="one">प्रमाणपत्रावर विश्वास ठेवा अथवा काढून टाका</item>
+      <item quantity="other">प्रमाणपत्रांवर विश्वास ठेवा अथवा काढून टाका</item>
     </plurals>
     <plurals name="ssl_ca_cert_info_message_device_owner" formatted="false" msgid="1489335297837656666">
-      <item quantity="one"><xliff:g id="MANAGING_DOMAIN_1">%s</xliff:g> नी आपल्या डिव्हाइसवर प्रमाणप‍त्र अधिकार स्थापित केले आहेत, जे त्यांना ईमेल, अॅप्स आणि सुरक्षित वेबसाइटसह आपल्या डिव्हाइस नेटवर्क क्रियाकलापाचे परीक्षण करण्याची अनुमती देऊ शकतात.\n\nया प्रमाणपत्रांंविषयी अधिक माहितीसाठी, आपल्या प्रशासकाशी संपर्क साधा.</item>
-      <item quantity="other"><xliff:g id="MANAGING_DOMAIN_1">%s</xliff:g> नी आपल्या डिव्हाइसवर प्रमाणप‍त्र अधिकार स्थापित केले आहेत, जे त्यांना ईमेल, अॅप्स आणि सुरक्षित वेबसाइटसह आपल्या डिव्हाइस नेटवर्क क्रियाकलापाचे परीक्षण करण्याची अनुमती देऊ शकतात.\n\nया प्रमाणपत्रांंविषयी अधिक माहितीसाठी, आपल्या प्रशासकाशी संपर्क साधा.</item>
+      <item quantity="one"><xliff:g id="MANAGING_DOMAIN_1">%s</xliff:g> नी तुमच्या डिव्हाइस वर एक प्रमाणप‍त्र अधिकार इंस्टॉल केले आहेत, जे त्यांना ईमेल, अॅप्स आणि सुरक्षित वेबसाइटसह तुमच्या डिव्हाइस नेटवर्क अॅक्टिव्हिटीचे परीक्षण करण्याची अनुमती देऊ शकतात.\n\nया प्रमाणपत्रांंविषयी अधिक माहितीसाठी, तुमच्या प्रशासकाशी संपर्क साधा.</item>
+      <item quantity="other"><xliff:g id="MANAGING_DOMAIN_1">%s</xliff:g> नी तुमच्या डिव्हाइस वर एक प्रमाणप‍त्र अधिकार इंस्टॉल केले आहेत, जे त्यांना ईमेल, अॅप्स आणि सुरक्षित वेबसाइटसह तुमच्या डिव्हाइस नेटवर्क अॅक्टिव्हिटीचे परीक्षण करण्याची अनुमती देऊ शकतात.\n\nया प्रमाणपत्रांंविषयी अधिक माहितीसाठी, तुमच्या प्रशासकाशी संपर्क साधा.</item>
     </plurals>
     <plurals name="ssl_ca_cert_info_message" formatted="false" msgid="30645643499556573">
-      <item quantity="one"><xliff:g id="MANAGING_DOMAIN_1">%s</xliff:g> नी आपल्या कार्य प्रोफाईलसाठी प्रमाणप‍त्र अधिकार स्थापित केले आहेत, जे त्यांना ईमेल, अॅप्स आणि सुरक्षित वेबसाइटसह कार्य नेटवर्क क्रियाकलापाचे परीक्षण करण्याची अनुमती देऊ शकतात.\n\nया प्रमाणपत्रांंविषयी अधिक माहितीसाठी, आपल्या प्रशासकाशी संपर्क साधा.</item>
-      <item quantity="other"><xliff:g id="MANAGING_DOMAIN_1">%s</xliff:g> नी आपल्या कार्य प्रोफाईलसाठी प्रमाणप‍त्र अधिकार स्थापित केले आहेत, जे त्यांना ईमेल, अॅप्स आणि सुरक्षित वेबसाइटसह कार्य नेटवर्क क्रियाकलापाचे परीक्षण करण्याची अनुमती देऊ शकतात.\n\nया प्रमाणपत्रांंविषयी अधिक माहितीसाठी, आपल्या प्रशासकाशी संपर्क साधा.</item>
+      <item quantity="one"><xliff:g id="MANAGING_DOMAIN_1">%s</xliff:g> नी आपल्या कार्य प्रोफाइलसाठी प्रमाणप‍त्र अधिकार इंस्टॉल केले आहेत, जे त्यांना ईमेल, अॅप्स आणि सुरक्षित वेबसाइटसह कार्य नेटवर्क क्रियाकलापाचे परीक्षण करण्याची अनुमती देऊ शकतात.\n\nया प्रमाणपत्रांंविषयी अधिक माहितीसाठी, तुमच्या प्रशासकाशी संपर्क साधा.</item>
+      <item quantity="other"><xliff:g id="MANAGING_DOMAIN_1">%s</xliff:g> नी आपल्या कार्य प्रोफाइलसाठी प्रमाणप‍त्र अधिकार इंस्टॉल केले आहेत, जे त्यांना ईमेल, अॅप्स आणि सुरक्षित वेबसाइटसह कार्य नेटवर्क क्रियाकलापाचे परीक्षण करण्याची अनुमती देऊ शकतात.\n\nया प्रमाणपत्रांंविषयी अधिक माहितीसाठी, तुमच्या प्रशासकाशी संपर्क साधा.</item>
     </plurals>
-    <string name="ssl_ca_cert_warning_message" msgid="8216218659139190498">"एक तृतीय पक्ष ईमेल, अॅप्स आणि सुरक्षित वेबसाइट यासह, आपल्या नेटवर्क क्रियाकलापाचे परीक्षण करण्यास सक्षम आहे.\n\nआपल्या डिव्हाइसवर स्थापित केलेले विश्वसनीय क्रेडेन्शियल हे शक्य करत आहे."</string>
+    <string name="ssl_ca_cert_warning_message" msgid="8216218659139190498">"एक तृतीय पक्ष ईमेल, अॅप्स आणि सुरक्षित वेबसाइट यासह, आपल्या नेटवर्क अॅक्टिव्हिटीचे परीक्षण करण्यास सक्षम आहे.\n\nआपल्या डीव्हाइसवर इंस्टॉल केलेले विश्वसनीय क्रेडेंशियल हे शक्य करते."</string>
     <plurals name="ssl_ca_cert_settings_button" formatted="false" msgid="2426799352517325228">
       <item quantity="one">प्रमाणपत्र तपासा</item>
       <item quantity="other">प्रमाणपत्रे तपासा</item>
     </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>
@@ -2569,10 +2580,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>
@@ -2607,16 +2618,16 @@
     <string name="user_enable_calling_confirm_title" msgid="4315789475268695378">"फोन कॉल चालू करायचे?"</string>
     <string name="user_enable_calling_confirm_message" msgid="8061594235219352787">"या वापरकर्त्याशी कॉल इतिहास सामायिक केला जाईल."</string>
     <string name="user_enable_calling_and_sms_confirm_title" msgid="7243308401401932681">"फोन कॉल आणि SMS चालू करायचे?"</string>
-    <string name="user_enable_calling_and_sms_confirm_message" msgid="4025082715546544967">"या वापरकर्त्याशी कॉल आणि SMS इतिहास सामायिक केला जाईल."</string>
+    <string name="user_enable_calling_and_sms_confirm_message" msgid="4025082715546544967">"या वापरकर्त्याशी कॉल आणि SMS इतिहास शेअर केला जाईल."</string>
     <string name="emergency_info_title" msgid="208607506217060337">"आणीबाणी माहिती"</string>
     <string name="emergency_info_summary" msgid="5062945162967838521">"<xliff:g id="USER_NAME">%1$s</xliff:g> साठी माहिती आणि संपर्क"</string>
     <string name="application_restrictions" msgid="8207332020898004394">"अॅप्स आणि सामग्रीला अनुमती द्या"</string>
-    <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>
@@ -2625,9 +2636,9 @@
     <string name="nfc_payment_use_default" msgid="3234730182120288495">"डीफॉल्ट वापरा"</string>
     <string name="nfc_payment_favor_default" msgid="5743781166099608372">"नेहमी"</string>
     <string name="nfc_payment_favor_open" msgid="1923314062109977944">"दुसरा देयक अॅप खुला असतो तेव्हा त्यास वगळून"</string>
-    <string name="nfc_payment_pay_with" msgid="7524904024378144072">"टॅप करा आणि देय द्या टर्मिनलवर, यासह देय द्या:"</string>
+    <string name="nfc_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>
@@ -2669,8 +2680,8 @@
     <string name="app_sees_restricted_accounts_and_controlled_by" msgid="6968697624437267294">"हा अ‍ॅप आपल्‍या खात्यांमध्‍ये प्रवेश करू शकतो. <xliff:g id="APP">%1$s</xliff:g> द्वारे नियंत्रित"</string>
     <string name="restriction_wifi_config_title" msgid="8889556384136994814">"वाय-फाय आणि मोबाईल"</string>
     <string name="restriction_wifi_config_summary" msgid="70888791513065244">"वाय-फाय आणि मोबाईल सेटिंग्जच्या सुधारणेस अनुमती द्या"</string>
-    <string name="restriction_bluetooth_config_title" msgid="8871681580962503671">"ब्लूटुथ"</string>
-    <string name="restriction_bluetooth_config_summary" msgid="8372319681287562506">"ब्लूटुथ जोडण्या आणि सेटिंग्जच्या सुधारणेस अनुमती द्या"</string>
+    <string name="restriction_bluetooth_config_title" msgid="8871681580962503671">"ब्लूटूथ"</string>
+    <string name="restriction_bluetooth_config_summary" msgid="8372319681287562506">"ब्लूटूथ जोडण्या आणि सेटिंग्जच्या सुधारणेस अनुमती द्या"</string>
     <string name="restriction_nfc_enable_title" msgid="5888100955212267941">"NFC"</string>
     <string name="restriction_nfc_enable_summary_config" msgid="3232480757215851738">"जेव्हा हे <xliff:g id="DEVICE_NAME">%1$s</xliff:g> दुसर्‍या NFC डिव्हाइसला स्पर्श करते तेव्हा डेटा विनिमयास अनुमती द्या"</string>
     <string name="restriction_nfc_enable_summary" product="tablet" msgid="3891097373396149915">"टॅबलेट दुसर्‍या डिव्हाइसला स्पर्श करतो तेव्हा डेटा अदलाबदलीस अनुमती द्या"</string>
@@ -2688,7 +2699,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>
@@ -2712,9 +2723,9 @@
     <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_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>
@@ -2727,23 +2738,24 @@
       <item quantity="one">%d लपविलेला आयटम दर्शवा</item>
       <item quantity="other">%d लपविलेले आयटम दर्शवा</item>
     </plurals>
+    <string name="dashboard_suggestion_condition_footer_content_description" msgid="2898588191174845961">"कोलॅप्स"</string>
     <string name="network_dashboard_title" msgid="4771589228992391573">"नेटवर्क आणि इंटरनेट"</string>
     <string name="network_dashboard_summary_mobile" msgid="3851083934739500429">"मोबाइल"</string>
     <string name="network_dashboard_summary_data_usage" msgid="3843261364705042212">"डेटा वापर"</string>
     <string name="network_dashboard_summary_hotspot" msgid="8494210248613254574">"हॉटस्पॉट"</string>
     <string name="connected_devices_dashboard_title" msgid="2355264951438890709">"कनेक्‍ट केलेले डिव्‍हाइसेस"</string>
-    <string name="connected_devices_dashboard_summary" msgid="2390582103384791904">"ब्लूटुथ, कास्‍ट, NFC"</string>
+    <string name="connected_devices_dashboard_summary" msgid="2390582103384791904">"ब्लूटूथ, कास्‍ट, NFC"</string>
     <string name="connected_devices_dashboard_no_nfc_summary" msgid="9106040742715366495">"ब्लूटूथ, कास्ट"</string>
     <string name="app_and_notification_dashboard_title" msgid="7838365599185397539">"अॅप्स आणि सूचना"</string>
     <string name="app_and_notification_dashboard_summary" msgid="2363314178802548682">"परवानग्या, डीफॉल्ट अ‍ॅप्स"</string>
     <string name="account_dashboard_title" msgid="4936890821712178853">"वापरकर्ते आणि खाती"</string>
     <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="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>
@@ -2751,17 +2763,17 @@
     <string name="keywords_display_brightness_level" msgid="3891383826236015854">"मंद स्क्रीन, टचस्क्रीन, बॅटरी"</string>
     <string name="keywords_display_auto_brightness" msgid="3325150824507953765">"मंद स्क्रीन, टचस्क्रीन, बॅटरी"</string>
     <string name="keywords_display_night_display" msgid="7630169927425425754">"मंद स्क्रीन, रात्र, रंगछटा"</string>
-    <string name="keywords_display_wallpaper" msgid="7362076351860131776">"पार्श्वभूमी, वैयक्तीकृत करा, सानुकूल प्रदर्शन"</string>
+    <string name="keywords_display_wallpaper" msgid="7362076351860131776">"पार्श्वभूमी, वैयक्तीकृत करा, सानुकूल डिस्प्ले"</string>
     <string name="keywords_display_font_size" msgid="3404655440064726124">"मजकूर आकार"</string>
     <string name="keywords_display_cast_screen" msgid="7684618996741933067">"प्रोजेक्ट, कास्‍ट करा"</string>
-    <string name="keywords_storage" msgid="3299217909546089225">"स्थान, डिस्क, हार्ड ड्राइव्ह, डिव्‍हाइस वापर"</string>
+    <string name="keywords_storage" msgid="3299217909546089225">"स्थान, डिस्क, हार्ड ड्राइव्ह, डिव्हाइस वापर"</string>
     <string name="keywords_battery" msgid="1173830745699768388">"पॉवर वापर, चार्ज"</string>
     <string name="keywords_spell_checker" msgid="1399641226370605729">"शब्दलेखन, शब्दकोश, शब्दलेखन-तपासक, स्वयं-दुरुस्ती"</string>
-    <string name="keywords_voice_input" msgid="769778245192531102">"ओळखकर्ता, इनपुट, उच्चारण, बोलणे, भाषा, हँड्सफ्री, हँड फ्री, ओळख, चीड आणणारे, शब्द, ऑडिओ, इतिहास, ब्लूटुथ हेडसेट"</string>
+    <string name="keywords_voice_input" msgid="769778245192531102">"ओळखकर्ता, इनपुट, उच्चारण, बोलणे, भाषा, हँड्सफ्री, हँड फ्री, ओळख, आक्षेपार्ह, शब्द, ऑडिओ, इतिहास, ब्लूटूथ हेडसेट"</string>
     <string name="keywords_text_to_speech_output" msgid="5150660047085754699">"रेट करा, भाषा, डीफॉल्ट, बोला, बोलणे, tts, प्रवेशयोग्यता, स्क्रीन रीडर, दृष्‍टीहीन"</string>
     <string name="keywords_date_and_time" msgid="758325881602648204">"घड्‍याळ, लष्करी"</string>
     <string name="keywords_network_reset" msgid="6024276007080940820">"रीसेट करा, पुनर्संचयित करा, फॅक्टरी"</string>
-    <string name="keywords_factory_data_reset" msgid="5894970373671252165">"पुसा, हटवा, पुनर्संचयित करा, साफ करा, काढा"</string>
+    <string name="keywords_factory_data_reset" msgid="5894970373671252165">"पुसा, हटवा, पुनर्स्टोअर करा, साफ करा, काढा"</string>
     <string name="keywords_printing" msgid="1701778563617114846">"प्रिंटर"</string>
     <string name="keywords_sounds" msgid="7146245090127541167">"स्पीकर बीप"</string>
     <string name="keywords_sounds_and_notifications_interruptions" msgid="5426093074031208917">"व्यत्यय आणू नका, व्यत्यय आणा, व्यत्यय, खंडित करा"</string>
@@ -2770,28 +2782,27 @@
     <string name="keywords_location_mode" msgid="8584992704568356084">"अचूकता"</string>
     <string name="keywords_accounts" msgid="1957925565953357627">"खाते"</string>
     <string name="keywords_users" msgid="3434190133131387942">"प्रतिबंध, प्रतिबंधित करा, प्रतिबंधित"</string>
-    <string name="keywords_keyboard_and_ime" msgid="9143339015329957107">"मजकूर सुधारणा, योग्य, ध्वनी, कंपन, स्वयं, भाषा, जेश्चर, सुचवा, सूचना, थीम, चीड आणणारे, शब्द, प्रकार, इमोजी, आंतरराष्ट्रीय"</string>
+    <string name="keywords_keyboard_and_ime" msgid="9143339015329957107">"मजकूर सुधारणा, योग्य, ध्वनी, कंपन, अॉटो, भाषा, जेश्चर, सुचवा, सूचना, थीम, आक्षेपार्ह, शब्द, प्रकार, ईमोजी, आंतरराष्ट्रीय"</string>
     <string name="keywords_reset_apps" msgid="5293291209613191845">"रीसेट करा, प्राधान्ये, डीफॉल्‍ट"</string>
     <string name="keywords_emergency_app" msgid="3143078441279044780">"आणीबाणी, हिम, अॅप, डीफॉल्ट"</string>
     <string name="keywords_default_phone_app" msgid="4213090563141778486">"फोन, डायलर, डीफॉल्ट"</string>
-    <string name="keywords_all_apps" msgid="7814015440655563156">"अॅप्स, डाउनलोड, अनुप्रयोग, सिस्टीम"</string>
+    <string name="keywords_all_apps" msgid="7814015440655563156">"अॅप्स, डाउनलोड, अॅप्लिकेशन, सिस्टम"</string>
     <string name="keywords_app_permissions" msgid="4229936435938011023">"अॅप्स, परवानग्या, सुरक्षितता"</string>
     <string name="keywords_default_apps" msgid="223872637509160136">"अ‍ॅप्‍स, डीफॉल्‍ट"</string>
-    <string name="keywords_ignore_optimizations" msgid="6102579291119055029">"ऑप्टिमायझेशन दुर्लक्षित करा, मात्रा, अॅप स्टँडबाय"</string>
+    <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="3526905012224714078">"जेश्चर"</string>
     <string name="keywords_payment_settings" msgid="5220104934130446416">"देय द्या, टॅप करा, पेमेंट"</string>
     <string name="keywords_backup" msgid="470070289135403022">"बॅकअप, बॅक अप"</string>
-    <!-- no translation found for keywords_assist_gesture_launch (813968759791342591) -->
-    <skip />
+    <string name="keywords_assist_gesture_launch" msgid="813968759791342591">"जेश्चर"</string>
     <string name="setup_wifi_nfc_tag" msgid="9028353016222911016">"वाय-फाय NFC टॅग सेट अप"</string>
     <string name="write_tag" msgid="8571858602896222537">"लिहा"</string>
     <string name="status_awaiting_tap" msgid="2130145523773160617">"लिहिण्यासाठी एक टॅग टॅप करा..."</string>
-    <string name="status_invalid_password" msgid="2575271864572897406">"अवैध संकेतशब्द, पुन्हा प्रयत्न करा."</string>
+    <string name="status_invalid_password" msgid="2575271864572897406">"अवैध पासवर्ड, पुन्हा प्रयत्न करा."</string>
     <string name="status_write_success" msgid="5228419086308251169">"यशस्वी!"</string>
     <string name="status_failed_to_write" msgid="8072752734686294718">"NFC टॅग मध्ये डेटा लिहिण्यास अक्षम. समस्या कायम राहिल्यास, भिन्न टॅग वापरुन पहा"</string>
     <string name="status_tag_not_writable" msgid="2511611539977682175">"NFC टॅग लिहीण्यायोग्य नाही. कृपया भिन्न टॅग वापरा."</string>
@@ -2830,8 +2841,14 @@
       <item quantity="one"><xliff:g id="ON_COUNT">%d</xliff:g> स्वयंचलित नियम चालू केला</item>
       <item quantity="other"><xliff:g id="ON_COUNT">%d</xliff:g> स्वयंचलित नियम चालू केले</item>
     </plurals>
-    <string name="zen_mode_settings_title" msgid="842308776768942600">"व्यत्यय आणू नका प्राधान्ये"</string>
-    <string name="zen_mode_priority_settings_title" msgid="2623117023031824309">"केवळ प्राधान्य अनुमती देते"</string>
+    <string name="zen_mode_settings_title" msgid="1066226840983908121">"व्यत्यय आणू नका"</string>
+    <string name="zen_mode_behavior_settings_title" msgid="1463303933529313969">"वर्तन"</string>
+    <string name="zen_mode_behavior_allow_title" msgid="3845615648136218141">"यांचे ध्वनी आणि व्हायब्रेशन राहू द्या"</string>
+    <string name="zen_mode_behavior_no_sound" msgid="1219626004723208056">"कोणताही ध्वनी नाही"</string>
+    <string name="zen_mode_behavior_total_silence" msgid="6716603819806610626">"ध्वनी नाही (संपूर्ण शांतता)"</string>
+    <string name="zen_mode_behavior_no_sound_except" msgid="4968477585788243114">"<xliff:g id="CATEGORIES">%1$s</xliff:g> खेरीज कोणताही ध्वनी नाही"</string>
+    <!-- no translation found for zen_mode_behavior_alarms_only (2423480992071472963) -->
+    <skip />
     <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>
@@ -2839,7 +2856,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>
@@ -2858,28 +2875,30 @@
     <string name="advanced_section_header" msgid="8833934850242546903">"प्रगत"</string>
     <string name="profile_section_header" msgid="2320848161066912001">"कार्य सूचना"</string>
     <string name="notification_badging_title" msgid="5938709971403474078">"सूचना बिंदूंना अनुमती द्या"</string>
-    <string name="notification_pulse_title" msgid="1905382958860387030">"लुकलुकता प्रकाश"</string>
+    <string name="notification_pulse_title" msgid="1905382958860387030">"ब्लिंक लाइट"</string>
     <string name="lock_screen_notifications_title" msgid="6173076173408887213">"लॉक स्क्रीनवर"</string>
     <string name="lock_screen_notifications_summary_show" msgid="6407527697810672847">"सर्व सूचना सामग्री दर्शवा"</string>
     <string name="lock_screen_notifications_summary_hide" msgid="7891552853357258782">"संवेदनशील सूचना सामग्री लपवा"</string>
     <string name="lock_screen_notifications_summary_disable" msgid="859628910427886715">"सूचना अजिबात दर्शवू नका"</string>
-    <string name="lock_screen_notifications_interstitial_message" msgid="6164532459432182244">"आपले डिव्हाइस लॉक केले असताना, सूचना कशा दर्शविल्या जाव्यात असे आपण इच्छिता?"</string>
+    <string name="lock_screen_notifications_interstitial_message" msgid="6164532459432182244">"तुमचे डिव्हाइस लॉक केले असताना, सूचना कशा दर्शविल्या जाव्यात असे तुम्ही इच्छिता?"</string>
     <string name="lock_screen_notifications_interstitial_title" msgid="1416589393106326972">"सूचना"</string>
     <string name="lock_screen_notifications_summary_show_profile" msgid="835870815661120772">"सर्व कार्य सूचना सामग्री दर्शवा"</string>
     <string name="lock_screen_notifications_summary_hide_profile" msgid="256116258285695645">"संवेदनशील कार्य सूचना सामग्री लपवा"</string>
     <string name="lock_screen_notifications_summary_disable_profile" msgid="4080720698960233358">"प्रोफाईल सूचना अजिबात दर्शवू नका"</string>
-    <string name="lock_screen_notifications_interstitial_message_profile" msgid="8307705621027472346">"आपले डिव्हाइस लॉक केले असताना, प्रोफाईल सूचना कशा दर्शविल्या जाव्यात असे आपण इच्छिता?"</string>
+    <string name="lock_screen_notifications_interstitial_message_profile" msgid="8307705621027472346">"तुमचे डिव्हाइस लॉक केले असताना, प्रोफाईल सूचना कशा दर्शविल्या जाव्यात असे तुम्ही इच्छिता?"</string>
     <string name="lock_screen_notifications_interstitial_title_profile" msgid="3169806586032521333">"प्रोफाईल सूचना"</string>
     <string name="notifications_title" msgid="8086372779371204971">"सूचना"</string>
     <string name="app_notifications_title" msgid="5810577805218003760">"अॅप सूचना"</string>
     <string name="notification_channel_title" msgid="2260666541030178452">"सूचना प्रकार"</string>
+    <string name="notification_group_title" msgid="7180506440133859601">"सूचना वर्गवारी गट"</string>
     <string name="notification_importance_title" msgid="848692592679312666">"महत्त्व"</string>
-    <string name="notification_importance_unspecified" msgid="2196023702875112081">"अॅपला ठरवू द्या"</string>
+    <string name="notification_importance_unspecified" msgid="6622173510486113958">"ध्वनीला अनुमती द्या"</string>
     <string name="notification_importance_blocked" msgid="7938180808339386300">"सूचना कधीही दर्शवू नका"</string>
     <string name="notification_importance_min" msgid="5455049524984686275">"कोणताही ध्वनी किंवा व्हिज्युअल व्यत्यय नाही"</string>
     <string name="notification_importance_low" msgid="8881468429453766553">"कोणताही ध्वनी नाही"</string>
     <string name="notification_importance_default" msgid="5958338024601957516">"ध्वनी करा"</string>
     <string name="notification_importance_high" msgid="2082429479238228527">"ध्वनी करा आणि स्क्रीनवर पॉप करा"</string>
+    <string name="notification_importance_high_silent" msgid="2667033773703765252">"स्क्रीनवरील पॉप"</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>
@@ -2890,7 +2909,7 @@
     <string name="notification_channel_summary_low" msgid="322317684244981244">"मध्यम महत्त्व"</string>
     <string name="notification_channel_summary_default" msgid="1111749130423589931">"सर्वाधिक महत्व"</string>
     <string name="notification_channel_summary_high" msgid="2085017556511003283">"त्वरित महत्त्व"</string>
-    <string name="default_notification_assistant" msgid="7631945224761430146">"सूचना सहाय्यक"</string>
+    <string name="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>
@@ -2898,33 +2917,37 @@
       <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_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="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>
-    <!-- no translation found for picture_in_picture_app_detail_summary (1264019085827708920) -->
-    <skip />
+    <string name="picture_in_picture_app_detail_summary" msgid="1264019085827708920">"अ‍ॅप खुले असताना किंवा तुम्ही ते सोडल्यानंतर या अ‍ॅपला चित्रामध्ये चित्र विंडो तयार करण्याची परवानगी द्या (उदाहरणार्थ, व्हिडिओ पाहणे सुरू ठेवणे). ही विंडो तुम्ही वापरत असलेल्या इतर अ‍ॅप्सच्या वरती दिसते."</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>
+    <string name="channel_group_notifications_off_desc" msgid="1620950416247316370">"या सूचनांचा गट या डीव्हाइसवर दिसणे Android ब्लॉक करत आहे"</string>
     <string name="notification_channels" msgid="5346841743182627500">"श्रेण्या"</string>
     <string name="notification_channels_other" msgid="5645317113885788226">"अन्य"</string>
+    <plurals name="notification_group_summary" formatted="false" msgid="3420621520561455358">
+      <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="no_channels" msgid="3077375508177744586">"या अॅपने कोणत्याही सूचना पोस्ट केल्या नाहीत"</string>
     <string name="app_settings_link" msgid="8894946007543660906">"अ‍ॅपमधील अतिरिक्त सेटिंग्ज"</string>
     <string name="app_notification_listing_summary_zero" msgid="6482582965081108108">"सर्व अ‍ॅप्ससाठी चालू केले"</string>
@@ -2938,21 +2961,21 @@
     </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_summary" msgid="3516007157020189746">"व्यत्यय आणू नका केवळ प्राधान्यावर सेट केले असते तेव्‍हा या सूचनांना व्यत्यय आणू द्या"</string>
     <string name="app_notification_visibility_override_title" msgid="2187232730902430718">"लॉक स्क्रीनवर"</string>
     <string name="app_notification_row_banned" msgid="5983655258784814773">"अवरोधित"</string>
     <string name="app_notification_row_priority" msgid="7723839972982746568">"प्राधान्य"</string>
     <string name="app_notification_row_sensitive" msgid="1809610030432329940">"संवेदनशील"</string>
     <string name="app_notifications_dialog_done" msgid="3484067728568791014">"पूर्ण झाले"</string>
     <string name="app_notification_importance_title" msgid="8002263131149345584">"महत्त्व"</string>
-    <string name="notification_show_lights_title" msgid="7671781299688190532">"लुकलुकता प्रकाश"</string>
+    <string name="notification_show_lights_title" msgid="7671781299688190532">"ब्लिंक लाइट"</string>
     <string name="notification_vibrate_title" msgid="1646667807969755957">"कंपन"</string>
     <string name="notification_channel_sound_title" msgid="3899212238513507941">"ध्वनी"</string>
     <string name="zen_mode_rule_delete_button" msgid="903658142711011617">"हटवा"</string>
@@ -3001,12 +3024,14 @@
     <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>
+    <!-- no translation found for zen_mode_media_system_other (8900209390529859777) -->
+    <skip />
     <string name="zen_mode_reminders" msgid="5458502056440485730">"स्मरणपत्रे"</string>
     <string name="zen_mode_events" msgid="7914446030988618264">"इव्हेंट"</string>
     <string name="zen_mode_all_callers" msgid="584186167367236922">"सर्व कॉलकर्ता"</string>
     <string name="zen_mode_selected_callers" msgid="3127598874060615742">"निवडलेले कॉलर"</string>
-    <string name="zen_mode_repeat_callers" msgid="5019521886428322131">"कॉलरची पुनरावृत्ती करा"</string>
-    <string name="zen_mode_repeat_callers_summary" msgid="7192713032364140137">"दुसर्‍या वेळी समान व्‍यक्ती <xliff:g id="MINUTES">%d</xliff:g> मिनिटाच्या कालावधीत कॉल करीत असल्यास, त्यास अनुमती द्या"</string>
+    <string name="zen_mode_repeat_callers" msgid="5019521886428322131">"नियमित कॉलर"</string>
+    <string name="zen_mode_repeat_callers_summary" msgid="239685342222975733">"एकाच व्यक्तीने <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>
@@ -3025,9 +3050,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>
@@ -3035,12 +3060,13 @@
     <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="suggestion_button_text" msgid="3275010948381252006">"ठीक"</string>
     <string name="device_feedback" msgid="3238056036766293294">"या डिव्हाइस बद्दल अभिप्राय पाठवा"</string>
-    <string name="restr_pin_enter_admin_pin" msgid="1085834515677448072">"प्रशासक पिन प्रविष्ट करा"</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>
@@ -3050,21 +3076,21 @@
     <string name="experimental_preference" msgid="7083015446690681376">"(प्रायोगिक)"</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="5560954719370251702">"आपले डिव्‍हाइस अनलॉक करण्‍यासाठी आपले फिंगरप्रिंट वापरण्‍याव्यतिरिक्त, ते प्रारंभ होण्‍यापूर्वी आपण आपला संकेतशब्‍द आवश्‍यक करून हे डिव्‍हाइस अधिक सुरक्षित करू शकता. डिव्हाइस सुरू होईपर्यंत, तो कॉल, संदेश किंवा अलार्मसह सूचना प्राप्त करू शकत नाही.\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="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>
@@ -3075,7 +3101,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>
@@ -3108,7 +3134,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>
@@ -3124,7 +3150,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>
@@ -3141,9 +3167,9 @@
     <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="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="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>
@@ -3151,7 +3177,7 @@
     <string name="default_browser_title_none" msgid="2124785489953628553">"कोणतेही डीफॉल्‍ट ब्राउझर नाही"</string>
     <string name="default_phone_title" msgid="282005908059637350">"फोन अॅप"</string>
     <string name="default_app" msgid="6864503001385843060">"(डीफॉल्ट)"</string>
-    <string name="system_app" msgid="9068313769550747372">"(सिस्टीम)"</string>
+    <string name="system_app" msgid="9068313769550747372">"(सिस्टम)"</string>
     <string name="system_default_app" msgid="3091113402349739037">"(सिस्टम डीफॉल्ट)"</string>
     <string name="apps_storage" msgid="4353308027210435513">"अ‍ॅप्स संचयन"</string>
     <string name="usage_access" msgid="5479504953931038165">"वापर प्रवेश"</string>
@@ -3189,23 +3215,23 @@
     <string name="high_power_desc" msgid="6283926163708585760">"बॅटरी ऑप्टिमायझेशन वापरू नका. आपली बॅटरी अधिक द्रुतपणे संपवू शकते."</string>
     <string name="high_power_prompt_title" msgid="6358673688590282655">"अॅप नेहमी पार्श्वभूमीत चालू द्यायचे?"</string>
     <string name="high_power_prompt_body" msgid="1031422980602565049">"<xliff:g id="APP_NAME">%1$s</xliff:g> नेहमी पार्श्वभूमीमध्ये चालू दिल्याने बॅटरीचे आयुर्मान कमी होऊ शकते. \n\nआपण हे नंतर सेटिंग्ज &gt; अ‍ॅप्स आणि सूचना मधून बदलू शकता."</string>
-    <string name="battery_summary" msgid="8044042095190688654">"<xliff:g id="PERCENTAGE">%1$s</xliff:g> शेवटचे पूर्ण चार्ज झाल्यानंतरचा वापर"</string>
+    <string name="battery_summary" msgid="8044042095190688654">"शेवटच्या पूर्ण चार्जनंतर <xliff:g id="PERCENTAGE">%1$s</xliff:g> वापर"</string>
     <string name="battery_power_management" msgid="5571519699679107523">"ऊर्जा व्यवस्थापन"</string>
     <string name="no_battery_summary" msgid="3528036835462846814">"पूर्ण चार्ज झाल्यानंतर बॅटरी वापर नाही"</string>
     <string name="app_notification_preferences" msgid="1599319335092722613">"अ‍ॅप सेटिंग्ज"</string>
     <string name="system_ui_settings" msgid="579824306467081123">"SystemUI ट्यूनर दर्शवा"</string>
     <string name="additional_permissions" msgid="6463784193877056080">"अतिरिक्त परवानग्या"</string>
     <string name="additional_permissions_more" msgid="3538612272673191451">"<xliff:g id="COUNT">%1$d</xliff:g> अधिक"</string>
-    <string name="share_remote_bugreport_dialog_title" msgid="1124840737776588602">"दोष अहवाल सामायिक करायचा?"</string>
+    <string name="share_remote_bugreport_dialog_title" msgid="1124840737776588602">"बग रीपोर्ट शेअर करायचा?"</string>
     <string name="share_remote_bugreport_dialog_message_finished" msgid="4973886976504823801">"आपल्या IT प्रशासकाने या डिव्हाइसच्या समस्येचे निवारण करण्यात मदत करण्यासाठी दोष अहवालाची विनंती केली. अॅप्स आणि डेटा सामायिक केले जाऊ शकतात."</string>
-    <string name="share_remote_bugreport_dialog_message" msgid="3495929560689435496">"आपल्या IT प्रशासकाने या डिव्हाइसच्या समस्येचे निवारण करण्यात मदत करण्यासाठी एका दोष अहवालाची विनंती केली. अॅप्स आणि डेटा सामायिक केले जाऊ शकतात आणि आपले डिव्हाइस तात्पुरते धीमे होऊ शकते."</string>
-    <string name="sharing_remote_bugreport_dialog_message" msgid="5859287696666024466">"हा दोष अहवाल आपल्या IT प्रशासकासह सामायिक केला जात आहे. अधिक तपशीलांसाठी त्यांच्याशी संपर्क साधा."</string>
+    <string name="share_remote_bugreport_dialog_message" msgid="3495929560689435496">"तुमच्या IT प्रशासकाने या डिव्हाइस च्या समस्येचे निवारण करण्यात मदत करण्यासाठी एका दोष अहवालाची विनंती केली. अॅप्स आणि डेटा शेअर केले जाऊ शकतात आणि तुमचे डिव्हाइस तात्पुरते धीमे होऊ शकते."</string>
+    <string name="sharing_remote_bugreport_dialog_message" msgid="5859287696666024466">"हा बग रीपोर्ट आपल्या IT प्रशासकासह शेअर केला जात आहे. अधिक तपशीलांसाठी त्यांच्याशी संपर्क साधा."</string>
     <string name="share_remote_bugreport_action" msgid="532226159318779397">"सामायिक करा"</string>
     <string name="decline_remote_bugreport_action" msgid="518720235407565134">"नकार द्या"</string>
     <string name="usb_use_charging_only" msgid="2180443097365214467">"हे डिव्हाइस चार्ज करा"</string>
-    <string name="usb_use_charging_only_desc" msgid="3066256793008540627">"फक्त हे डिव्‍हाइस चार्ज करा"</string>
+    <string name="usb_use_charging_only_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>
@@ -3219,15 +3245,16 @@
     <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="sms_mirroring_pref" msgid="6475043279147376031">"SMS मिररिंग"</string>
     <string name="background_check_pref" msgid="7550258400138010979">"पार्श्वभूमी तपासणे"</string>
     <string name="background_check_title" msgid="4534254315824525593">"पूर्ण पार्श्वभूमी प्रवेश"</string>
     <string name="assist_access_context_title" msgid="2269032346698890257">"स्क्रीनवरील मजकूर वापरा"</string>
-    <string name="assist_access_context_summary" msgid="1991421283142279560">"स्क्रीन सामग्रींमध्ये मजकूर म्हणून प्रवेश करण्यासाठी सहाय्यक अॅपला अनुमती द्या"</string>
+    <string name="assist_access_context_summary" msgid="1991421283142279560">"स्क्रीन सामग्रींमध्ये मजकूर म्हणून प्रवेश करण्यासाठी साहाय्यक अॅपला अनुमती द्या"</string>
     <string name="assist_access_screenshot_title" msgid="4034721336291215819">"स्क्रीनशॉट वापरा"</string>
-    <string name="assist_access_screenshot_summary" msgid="6761636689013259901">"स्क्रीनच्या प्रतिमेमध्ये प्रवेश करण्यासाठी सहाय्यक अॅपला अनुमती द्या"</string>
+    <string name="assist_access_screenshot_summary" msgid="6761636689013259901">"स्क्रीनच्या प्रतिमेमध्ये प्रवेश करण्यासाठी साहाय्यक अॅपला अनुमती द्या"</string>
     <string name="assist_flash_title" msgid="506661221230034891">"स्क्रीन फ्लॅश करा"</string>
-    <string name="assist_flash_summary" msgid="9160668468824099262">"सहाय्य अॅप स्क्रीन किंवा स्क्रीनशॉट मधून मजकुरात प्रवेश करतो तेव्हा स्क्रीनच्या किनारी फ्लॅश करा"</string>
-    <string name="assist_footer" msgid="1982791172085896864">"सहाय्यक अॅप्स आपण पाहत असलेल्या स्क्रीनवरील माहितीच्या आधारावर आपल्याला मदत करू शकतात. काही अॅप्स आपल्याला एकत्रित सहाय्य देण्यासाठी लॉन्चर आणि व्हॉइस इनपुट सेवा दोघांना समर्थन देतात."</string>
+    <string name="assist_flash_summary" msgid="9160668468824099262">"साहाय्य अॅप स्क्रीन किंवा स्क्रीनशॉट मधून मजकूरअॅक्सेस करते तेव्हा स्क्रीनच्या किनारी फ्लॅश करा"</string>
+    <string name="assist_footer" msgid="1982791172085896864">"साहाय्यक अॅप्स आपण पाहत असलेल्या स्क्रीनवरील माहितीच्या आधारावर आपल्याला मदत करू शकतात. काही अॅप्स आपल्याला एकत्रित सहाय्य देण्यासाठी लॉन्चर आणि व्हॉइस इनपुट सेवा दोघांना समर्थन देतात."</string>
     <string name="average_memory_use" msgid="829566450150198512">"सरासरी मेमरी वापर"</string>
     <string name="maximum_memory_use" msgid="7493720799710132496">"कमाल मेमरी वापर"</string>
     <string name="memory_usage" msgid="1781358557214390033">"मेमरी वापर"</string>
@@ -3261,7 +3288,7 @@
     <string name="ignore_optimizations_title" msgid="2829637961185027768">"बॅटरी ऑप्टिमायझेशनकडे दुर्लक्ष करण्यासाठी <xliff:g id="APP">%s</xliff:g> ला अनुमती द्यायची?"</string>
     <string name="app_list_preference_none" msgid="108006867520327904">"काहीही नाही"</string>
     <string name="work_profile_usage_access_warning" msgid="2918050775124911939">"या अ‍ॅपसाठी वापर प्रवेश बंद करणे आपल्या प्रशासकाला आपल्या कार्य प्रोफाइलमधील अ‍ॅप्सच्या डेटा वापराचा मागोवा घेण्यास प्रतिबंधित करत नाही"</string>
-    <string name="accessibility_lock_screen_progress" msgid="2408292742980383166">"<xliff:g id="COUNT_1">%2$d</xliff:g> पैकी <xliff:g id="COUNT_0">%1$d</xliff:g> वर्ण वापरले"</string>
+    <string name="accessibility_lock_screen_progress" msgid="2408292742980383166">"<xliff:g id="COUNT_0">%1$d</xliff:g> पैकी <xliff:g id="COUNT_1">%2$d</xliff:g> वर्ण वापरले"</string>
     <string name="draw_overlay" msgid="6564116025404257047">"इतर अ‍ॅप्सच्या वर प्रदर्शित करा"</string>
     <string name="system_alert_window_settings" msgid="8466613169103527868">"इतर अ‍ॅप्सच्या वर प्रदर्शित करा"</string>
     <string name="system_alert_window_apps_title" msgid="7005760279028569491">"अॅप्स"</string>
@@ -3270,23 +3297,23 @@
     <string name="app_overlay_permission_preference" msgid="9039432222453006038">"अ‍ॅपच्या शीर्षस्थानी प्रदर्शनाची परवानगी"</string>
     <string name="allow_overlay_description" msgid="8961670023925421358">"या अ‍ॅपला आपण वापरत असलेल्या इतर अ‍ॅप्सच्या शीर्षस्थानी प्रदर्शित होण्याची अनुमती द्या. ते आपल्या त्या अ‍ॅप्सच्या वापरात हस्तक्षेप करू शकते किंवा त्यांच्या दिसण्यात किंवा वर्तणुकीत बदल करू शकते."</string>
     <string name="keywords_vr_listener" msgid="7441221822576384680">"vr आभासी वास्तविकता श्रोता स्टीरीओ मदतकर्ता सेवा"</string>
-    <string name="keywords_system_alert_window" msgid="5049498015597864850">"इतर अ‍ॅप्सच्या शीर्षस्थानी प्रणाली सूचना विंडो संवाद प्रदर्शन"</string>
+    <string name="keywords_system_alert_window" msgid="5049498015597864850">"इतर अ‍ॅप्सच्या शीर्षस्थानी प्रणाली सूचना विंडो संवाद डिस्प्ले"</string>
     <string name="overlay_settings" msgid="6930854109449524280">"इतर अ‍ॅप्सच्या वर प्रदर्शित करा"</string>
     <string name="system_alert_window_summary" msgid="602892301318324492">"<xliff:g id="COUNT_1">%2$d</xliff:g> पैकी <xliff:g id="COUNT_0">%1$d</xliff:g> अ‍ॅप्सना इतर अ‍ॅप्सच्या वर प्रदर्शित होण्याची अनुमती"</string>
     <string name="filter_overlay_apps" msgid="6965969283342557573">"परवानगी असलेले अ‍ॅप्स"</string>
     <string name="app_permission_summary_allowed" msgid="1505409933012886711">"परवानगी आहे"</string>
     <string name="app_permission_summary_not_allowed" msgid="2592617058101882802">"परवानगी नाही"</string>
-    <string name="keywords_install_other_apps" msgid="761078076051006558">"अज्ञात स्रोत अ‍ॅप्स स्थापित करा"</string>
+    <string name="keywords_install_other_apps" msgid="761078076051006558">"अज्ञात स्रोत अ‍ॅप्स इंस्टॉल करा"</string>
     <string name="write_settings" msgid="4797457275727195681">"सिस्टम सेटिंग्ज सुधारित करा"</string>
-    <string name="keywords_write_settings" msgid="6415597272561105138">"सिस्टीम सेटिंग्ज सुधारित करा लिहा"</string>
+    <string name="keywords_write_settings" msgid="6415597272561105138">"सिस्टम सेटिंग्ज सुधारित करा लिहा"</string>
     <string name="write_settings_summary" msgid="4302268998611412696">"सिस्‍टीम सेटिंग्ज सुधारित करण्‍यासाठी <xliff:g id="COUNT_1">%2$d</xliff:g> पैकी <xliff:g id="COUNT_0">%1$d</xliff:g> अॅप्सनी अनुमती दिली"</string>
-    <string name="filter_install_sources_apps" msgid="3102976274848199118">"इतर अॅप्स स्थापित करू शकतात"</string>
+    <string name="filter_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="permit_write_settings" msgid="658555006453212691">"सिस्‍टम सेटिंग्‍ज सुधारण्‍याची अनुमती द्या"</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>
@@ -3294,9 +3321,9 @@
     <string name="camera_gesture_desc" msgid="1831390075255870960">"आपले मनगट दोनदा वळवून कॅमेरा अॅप उघडा"</string>
     <string name="camera_double_tap_power_gesture_title" msgid="1651873760405034645">"कॅमेर्‍यासाठी पॉवर बटण दोनदा दाबा"</string>
     <string name="camera_double_tap_power_gesture_desc" msgid="7355664631775680376">"आपली स्क्रीन अनलॉक न करता कॅमेरा द्रुतपणे उघडा"</string>
-    <string name="screen_zoom_title" msgid="5233515303733473927">"प्रदर्शन आकार"</string>
+    <string name="screen_zoom_title" msgid="5233515303733473927">"डिस्प्ले आकार"</string>
     <string name="screen_zoom_short_summary" msgid="7291960817349834688">"स्क्रीन वरील आयटम आणखी मोठे किंवा आणखी लहान करा"</string>
-    <string name="screen_zoom_keywords" msgid="9176477565403352552">"प्रदर्शन घनता, स्क्रीन झूम, मापन, मापन करीत आहे"</string>
+    <string name="screen_zoom_keywords" msgid="9176477565403352552">"डिस्प्ले घनता, स्क्रीन झूम, मापन, मापन करीत आहे"</string>
     <string name="screen_zoom_summary" msgid="6445488991799015407">"आपल्या स्क्रीन वरील आयटम आणखी लहान किंवा आणखी मोठे करा. आपल्या स्क्रीन वरील काही अॅप्स स्थान बदलू शकतात."</string>
     <string name="screen_zoom_preview_title" msgid="4680671508172336572">"पूर्वावलोकन"</string>
     <string name="screen_zoom_make_smaller_desc" msgid="4622359904253364742">"आणखी लहान करा"</string>
@@ -3305,7 +3332,7 @@
     <string name="screen_zoom_conversation_icon_pete" msgid="998709701837681129">"P"</string>
     <string name="screen_zoom_conversation_message_1" msgid="6546951024984852686">"हाय पीट!"</string>
     <string name="screen_zoom_conversation_message_2" msgid="6935424214137738647">"अरे, आज कॉफी प्यायला चलायचं?"</string>
-    <string name="screen_zoom_conversation_message_3" msgid="5218221201861387402">"हो नक्की. मला जवळचे एक चांगले ठिकाण माहित आहे."</string>
+    <string name="screen_zoom_conversation_message_3" msgid="5218221201861387402">"हो नक्की. मला जवळचे एक चांगले ठिकाण माहीत आहे."</string>
     <string name="screen_zoom_conversation_message_4" msgid="5564676794767555447">"छान!"</string>
     <string name="screen_zoom_conversation_timestamp_1" msgid="7453710416319650556">"मंगळवारी 6:00PM वाजता"</string>
     <string name="screen_zoom_conversation_timestamp_2" msgid="7107225702890747588">"मंगळवारी 6:01PM वाजता"</string>
@@ -3318,12 +3345,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>
@@ -3332,7 +3359,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>
@@ -3341,24 +3368,24 @@
     <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">"पोर्टेबल वाय-फाय हॉटस्पॉट <xliff:g id="ID_1">%1$s</xliff:g> चालू आहे, या डीव्हाइसकरिता वाय-फाय बंद केले आहे."</string>
     <string name="condition_airplane_title" msgid="287356299107070503">"विमान मोड चालू आहे"</string>
-    <string name="condition_airplane_summary" msgid="5561586417832393666">"वाय-फाय, ब्लूटुथ आणि मोबाइल नेटवर्क बंद केले आहेत. आपण फोन कॉल करू शकत नाही किंवा इंटरनेटशी कनेक्ट करू शकत नाही."</string>
+    <string name="condition_airplane_summary" msgid="5561586417832393666">"वाय-फाय, ब्लूटुथ आणि मोबाइल नेटवर्क बंद केले आहेत. तुम्ही फोन कॉल करू शकत नाही किंवा इंटरनेटशी कनेक्ट करू शकत नाही."</string>
     <string name="condition_zen_title" msgid="2679168532600816392">"व्यत्यय आणू नका चालू आहे ( <xliff:g id="ID_1">%1$s</xliff:g> )"</string>
     <string name="condition_battery_title" msgid="3272131008388575349">"बॅटरी बचतकर्ता चालू आहे"</string>
-    <string name="condition_battery_summary" msgid="4418839236027977450">"कार्यप्रदर्शन कमी झाले आहे. स्थान सेवा आणि पार्श्वभूमी डेटा बंद केले आहेत."</string>
+    <string name="condition_battery_summary" msgid="4418839236027977450">"कामगिरी कमी झाली आहे. स्थान सेवा आणि पार्श्वभूमीवरील डेटा बंद केला आहेत."</string>
     <string name="condition_cellular_title" msgid="1327317003797575735">"मोबाइल डेटा बंद आहे"</string>
-    <string name="condition_cellular_summary" msgid="1818046558419658463">"इंटरनेट केवळ Wi-Fi द्वारे उपलब्ध आहे"</string>
+    <string name="condition_cellular_summary" msgid="1818046558419658463">"इंटरनेट केवळ वाय-फाय द्वारे उपलब्ध आहे"</string>
     <string name="condition_bg_data_title" msgid="2483860304802846542">"डेटा बचतकर्ता चालू आहे"</string>
-    <string name="condition_bg_data_summary" msgid="656957852895282228">"पार्श्वभूमी डेटा केवळ Wi-Fi द्वारे उपलब्ध आहे. Wi-Fi उपलब्ध नसते तेव्हा हे काही अॅप्स किंवा सेवांना प्रभावित करू शकते."</string>
+    <string name="condition_bg_data_summary" msgid="656957852895282228">"पार्श्वभूमीवरील डेटा केवळ वाय-फाय द्वारे उपलब्ध आहे. वाय-फाय उपलब्ध नसते तेव्हा काही अॅप्स किंवा सेवांवर परिणाम होऊ शकतो."</string>
     <string name="condition_work_title" msgid="7293722361184366648">"कार्य प्रोफाइल बंद आहे"</string>
     <string name="condition_work_summary" msgid="7543202177571590378">"आपल्या कार्य प्रोफाइल संबंधित अॅप्स, पार्श्वभूमी संकालन आणि इतर वैशिष्ट्ये बंद केली आहेत."</string>
     <string name="night_display_suggestion_title" msgid="6602129097059325291">"रात्रीच्या प्रकाशाचे वेळापत्रक सेट करा"</string>
@@ -3378,12 +3405,15 @@
     </plurals>
     <string name="suggestion_remove" msgid="904627293892092439">"काढा"</string>
     <string name="color_temperature" msgid="2070126836910615605">"छान रंगाचे तापमान"</string>
-    <string name="color_temperature_desc" msgid="4793729830226404052">"आणखी छान प्रदर्शन रंग वापरा"</string>
+    <string name="color_temperature_desc" msgid="4793729830226404052">"आणखी छान डिस्प्ले रंग वापरा"</string>
     <string name="color_temperature_toast" msgid="4974218172133854827">"रंग बदल लागू करण्यासाठी, स्क्रीन बंद करा"</string>
-    <string name="telephony_monitor_toast" msgid="7003764250271195384">"टेलिफोनी मॉनिटर बदल लागू करण्‍यासाठी, डिव्‍हाइस रीबूट करा"</string>
+    <string name="connectivity_monitor_switch" msgid="9059759348648583421">"कनेक्टिव्हिटी मॉनिटर"</string>
+    <string name="connectivity_monitor_switch_summary" msgid="2828658652378866401">"कनेक्टिव्हिटी समस्‍या आल्‍यावर कनेक्टिव्हिटी मॉनिटर लॉग गोळा करेल आणि वापरकर्त्‍याला बग फाइल करण्‍यासाठी सूचनेचे संकेत देईल"</string>
+    <string name="connectivity_monitor_toast" msgid="5551859612881173028">"कनेक्टिव्हिटी मॉनिटर बदल लागू करण्‍यासाठी, डिव्हाइस रीबूट करा"</string>
     <string name="camera_hal_hdrplus_switch" msgid="8377365197105267466">"कॅमेरा HAL HDR+"</string>
     <string name="camera_hal_hdrplus_toast" msgid="2063703797270055299">"कॅमेरा HAL HDR+ बदल लागू करण्यासाठी डिव्हाइस रीबूट करा"</string>
-    <string name="ota_disable_automatic_update" msgid="2319639631655915050">"स्वयंचलित सिस्टम अद्यतने"</string>
+    <string name="camera_laser_sensor_switch" msgid="8913588990743234440">"कॅमेरा लेझर सेंसर"</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>
@@ -3408,7 +3438,7 @@
     <string name="data_warning" msgid="209133958008062117">"डेटा चेतावणी"</string>
     <string name="set_data_limit" msgid="2901526323210516923">"डेटा मर्यादा सेट करा"</string>
     <string name="data_limit" msgid="1885406964934590552">"डेटा मर्यादा"</string>
-    <string name="data_usage_template" msgid="392191945602400904">"<xliff:g id="ID_2">%2$s</xliff:g> मध्‍ये <xliff:g id="ID_1">%1$s</xliff:g> वापरला"</string>
+    <string name="data_usage_template" msgid="2923744765873163859">"<xliff:g id="ID_1">%1$s</xliff:g> दरम्यान <xliff:g id="ID_2">%2$s</xliff:g> वापरले"</string>
     <string name="configure" msgid="1029654422228677273">"कॉन्फिगर करा"</string>
     <string name="data_usage_other_apps" msgid="3272872663517382050">"वापरामध्ये समाविष्‍ट केलेले अन्य अॅप्स"</string>
     <plurals name="data_saver_unrestricted_summary" formatted="false" msgid="2635267833484232703">
@@ -3417,18 +3447,18 @@
     </plurals>
     <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="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>
@@ -3454,12 +3484,12 @@
     <string name="notification_log_details_content_intent" msgid="1113554570409128083">"हेतू"</string>
     <string name="notification_log_details_delete_intent" msgid="905118520685297007">"हेतू हटवा"</string>
     <string name="notification_log_details_full_screen_intent" msgid="7118560817013522978">"पूर्ण स्क्रीन हेतू"</string>
-    <string name="notification_log_details_actions" msgid="242523930165118066">"कारवाई"</string>
+    <string name="notification_log_details_actions" msgid="242523930165118066">"कृती:"</string>
     <string name="notification_log_details_title" msgid="7177091647508863295">"शीर्षक"</string>
     <string name="notification_log_details_remoteinput" msgid="8328591329858827409">"दूरस्थ इनपुट"</string>
     <string name="notification_log_details_content_view" msgid="6638731378278561786">"सानुकूल दृश्य"</string>
     <string name="notification_log_details_extras" msgid="4188418723779942047">"अतिरिक्त"</string>
-    <string name="notification_log_details_icon" msgid="8939114059726188218">"चिन्ह"</string>
+    <string name="notification_log_details_icon" msgid="8939114059726188218">"आयकन"</string>
     <string name="notification_log_details_parcel" msgid="243148037601903212">"पार्सल आकार"</string>
     <string name="notification_log_details_ashmem" msgid="7241814108477320636">"अश्मेम"</string>
     <string name="notification_log_details_sound" msgid="5506232879598808099">"ध्वनी"</string>
@@ -3477,25 +3507,25 @@
     <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="387052719462473500">"लॉक स्क्रीनवरील माहिती नियंत्रित करा"</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="8483187649355540109">"साहाय्य आणि टिपा"</string>
     <string name="developer_smallest_width" msgid="7516950434587313360">"सर्वात लहान रुंदी"</string>
-    <string name="premium_sms_none" msgid="8268105565738040566">"स्थापित केलेल्या कोणत्याही अॅप्सनी प्रीमियम SMS प्रवेशाची विनंती केली नाही"</string>
-    <string name="premium_sms_warning" msgid="9086859595338944882">"प्रीमियम SMS मुळे आपल्याला कदाचित शुल्क द्यावे लागू शकेल आणि आपल्या कॅरियर बिलिंग मध्ये जोडले जाईल. आपण अॅपसाठी परवानगी सक्षम केल्यास, तो अॅप वापरून आपण प्रीमियम SMS पाठविण्यात सक्षम असाल."</string>
+    <string name="premium_sms_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>
+    <string name="bluetooth_disabled" msgid="6244000672828617410">"बंद"</string>
     <string name="bluetooth_connected_summary" msgid="7672528674593152862">"<xliff:g id="ID_1">%1$s</xliff:g>शी कनेक्ट केले"</string>
     <string name="bluetooth_connected_multiple_devices_summary" msgid="9173661896296663932">"एकाधिक डिव्हाइसशी कनेक्ट केले"</string>
-    <string name="demo_mode" msgid="2798762752209330277">"सिस्टीम UI डेमो मोड"</string>
+    <string name="demo_mode" msgid="2798762752209330277">"सिस्टम UI डेमो मोड"</string>
     <string name="quick_settings_developer_tiles" msgid="5947788063262762448">"द्रुत सेटिंग्ज विकासक टाइल"</string>
     <string name="support_escalation_title" msgid="4111071371281023145">"मदत करण्यासाठी आम्ही येथे आहोत"</string>
     <string name="support_escalation_24_7_title" msgid="8118369197749832074">"आम्ही आपल्यासाठी 24/7 येथे आहोत"</string>
     <string name="support_escalation_24_7_content_description" msgid="3772776213036994533">"आम्ही आपल्यासाठी 24/7 येथे आहोत"</string>
     <string name="support_escalation_summary" msgid="8473084168776014405">"कोणत्याही समस्येचे निराकरण करण्यात मदत करण्यासाठी आमचा सहाय्य कार्यसंघ येथे आहे"</string>
     <string name="support_escalation_24_7_summary" msgid="2802773279262547187">"आमचा सहाय्य कार्यसंघ दररोज, दिवसभर येथे आहे"</string>
-    <string name="support_escalation_closed_summary" msgid="2240967274380168303">"मदत शोधा किंवा सहाय्य तासांदरम्यान (स्थानिक वेळ) परत या:&lt;br&gt;&lt;b&gt;<xliff:g id="OPERATION_HOURS">%s</xliff:g>&lt;/b&gt;"</string>
+    <string name="support_escalation_closed_summary" msgid="2240967274380168303">"मदत शोधा किंवा साहाय्य तासांदरम्यान (स्थानिक वेळ) परत या:&lt;br&gt;&lt;b&gt;<xliff:g id="OPERATION_HOURS">%s</xliff:g>&lt;/b&gt;"</string>
     <string name="support_escalation_no_internet_summary" msgid="2526082812336597989">"फोन सहाय्य तास (स्थानिक वेळ)&lt;br&gt;&lt;b&gt;<xliff:g id="OPERATION_HOURS">%s</xliff:g>&lt;/b&gt;"</string>
     <string name="support_escalation_unavailable_summary" msgid="5208552975245211898">"मदत शोधा किंवा टिपा आणि युक्त्या एक्सप्लोर करा"</string>
     <string name="support_country_list_title" msgid="823853371280534111">"यासाठी समर्थन:"</string>
@@ -3510,11 +3540,11 @@
     <string name="support_sign_in_required_title" msgid="1367187789121480440">"सहाय्याशी संपर्क साधा"</string>
     <string name="support_sign_in_button_text" msgid="3054769428620671241">"साइन इन करा"</string>
     <string name="support_sign_in_required_help" msgid="5200654782405538114">"साइन इन करू शकत नाही?"</string>
-    <string name="support_disclaimer_title" msgid="4825302018208770031">"सिस्टीम माहिती पाठवा"</string>
-    <string name="support_disclaimer_do_not_show" msgid="3378367075323727539">"परत दर्शवू नका"</string>
+    <string name="support_disclaimer_title" msgid="4825302018208770031">"सिस्टम माहिती पाठवा"</string>
+    <string name="support_disclaimer_do_not_show" msgid="3378367075323727539">"परत दाखवू नका"</string>
     <string name="support_account_request_prefix" msgid="6387847874661861650">"हे विनंती करत आहेत"</string>
     <string name="support_account_picker_add_account" msgid="5076277544846506214">"खाते जोडा"</string>
-    <string name="support_system_information_title" msgid="3439905790018934773">"सिस्टिम माहिती"</string>
+    <string name="support_system_information_title" msgid="3439905790018934773">"सिस्टम माहिती"</string>
     <string name="managed_profile_settings_title" msgid="2729481936758125054">"कार्य प्रोफाइल सेटिंग्ज"</string>
     <string name="managed_profile_contact_search_title" msgid="6034734926815544221">"संपर्क शोध"</string>
     <string name="managed_profile_contact_search_summary" msgid="5431253552272970512">"कॉलर आणि संपर्कांना ओळखण्यासाठी आपल्या संस्थेनुसार संपर्क शोधांची अनुमती द्या"</string>
@@ -3534,12 +3564,12 @@
     <string name="bluetooth_talkback_computer" msgid="4875089335641234463">"संगणक"</string>
     <string name="bluetooth_talkback_headset" msgid="5140152177885220949">"हेडसेट"</string>
     <string name="bluetooth_talkback_phone" msgid="4260255181240622896">"फोन"</string>
-    <string name="bluetooth_talkback_imaging" msgid="551146170554589119">"प्रतिमा"</string>
+    <string name="bluetooth_talkback_imaging" msgid="551146170554589119">"इमेज"</string>
     <string name="bluetooth_talkback_headphone" msgid="26580326066627664">"हेडफोन"</string>
     <string name="bluetooth_talkback_input_peripheral" msgid="5165842622743212268">"इनपुट परिधीय"</string>
-    <string name="bluetooth_talkback_bluetooth" msgid="5615463912185280812">"ब्लूटुथ"</string>
+    <string name="bluetooth_talkback_bluetooth" msgid="5615463912185280812">"ब्लूटूथ"</string>
     <string name="automatic_storage_manager_settings" msgid="7819434542155181607">"संचय व्यवस्थापित करा"</string>
-    <string name="automatic_storage_manager_text" msgid="4562950476680600604">"संचय स्थान मोकळे करण्यात मदत करण्यासाठी, संचय व्यवस्थापक आपल्या डिव्हाइस वरून बॅक अप घेतलेले फोटो आणि व्हिडिओ काढतो."</string>
+    <string name="automatic_storage_manager_text" msgid="4562950476680600604">"स्टोरेज स्थान मोकळे करण्यात मदत करण्यासाठी, स्टोरेज व्यवस्थापक तुमच्या डिव्हाइस वरून बॅक अप घेतलेले फोटो आणि व्हिडिओ काढतो."</string>
     <string name="automatic_storage_manager_days_title" msgid="2017913896160914647">"फोटो आणि व्हिडिओ काढा"</string>
     <string name="automatic_storage_manager_preference_title" msgid="5753702798151073383">"संचय व्यवस्थापक"</string>
     <string name="deletion_helper_automatic_title" msgid="6605660435498272520">"स्वयंचलित"</string>
@@ -3548,7 +3578,7 @@
     <string name="gesture_preference_title" msgid="5280023307132819052">"जेश्चर"</string>
     <string name="gesture_preference_summary" product="default" msgid="8627850388011956901">"आपला फोन नियंत्रित करण्यासाठी जलद जेश्चर"</string>
     <string name="gesture_preference_summary" product="tablet" msgid="4717535378272065510">"आपले टॅबलेट नियंत्रित करण्यासाठी जलद जेश्चर"</string>
-    <string name="gesture_preference_summary" product="device" msgid="4205941452664950852">"आपले डिव्हाइस नियंत्रित करण्यासाठी जलद जेश्चर"</string>
+    <string name="gesture_preference_summary" product="device" msgid="4205941452664950852">"तुमचे डिव्हाइस नियंत्रित करण्यासाठी जलद जेश्चर"</string>
     <string name="double_tap_power_for_camera_title" msgid="64716226816032800">"कॅमेर्‍यावर जा"</string>
     <string name="double_tap_power_for_camera_summary" msgid="242037150983277829">"कॅमेरा द्रुतपणे उघडण्यासाठी, पॉवर बटण दोनदा दाबा. कोणत्याही स्क्रीन वरून कार्य करते."</string>
     <string name="double_tap_power_for_camera_suggestion_title" msgid="6500405261202883589">"कॅमेरा पटकन उघडा"</string>
@@ -3561,7 +3591,7 @@
     <string name="double_twist_for_camera_suggestion_summary" product="device" msgid="5980398380988039489">"सेल्फी मोडसाठी डिव्हाइस दोनदा फिरवा"</string>
     <string name="ambient_display_title" product="default" msgid="5144814600610448504">"फोन तपासण्‍यासाठी दोनदा-टॅप करा"</string>
     <string name="ambient_display_title" product="tablet" msgid="8688795028609563837">"टॅब्लेट तपासण्‍यासाठी दोनदा-टॅप करा"</string>
-    <string name="ambient_display_title" product="device" msgid="3423781975742145894">"डिव्हाइस तपासण्‍यासाठी दोनदा-टॅप करा"</string>
+    <string name="ambient_display_title" product="device" msgid="3423781975742145894">"डिव्हाइस तपासण्‍यासाठी दोनदा टॅप करा"</string>
     <string name="ambient_display_summary" msgid="525662960806416373">"वेळ, सूचना आयकन आणि इतर माहिती तपासण्यासाठी तुमच्या स्क्रीनवर दोनदा टॅप करा."</string>
     <string name="ambient_display_suggestion_summary" msgid="5987443721392571847">"स्क्रीन बंद असताना सूचना तपासा"</string>
     <string name="ambient_display_pickup_title" product="default" msgid="818688002837687268">"फोन तपासण्‍यासाठी तो उचला"</string>
@@ -3585,10 +3615,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="instant_apps_settings" msgid="8827777916518348213">"इंस्टंट अ‍ॅप्स प्राधान्ये"</string>
+    <string name="domain_url_section_title" msgid="7046835219056428883">"इंस्टॉल केलेले अॅप्स"</string>
     <string name="automatic_storage_manager_activation_warning" msgid="6353100011690933254">"आपला संचय आता संचय व्यवस्थापक व्यवस्थापित करीत आहे"</string>
     <string name="account_for_section_header" msgid="5356566418548737121">"<xliff:g id="USER_NAME">%1$s</xliff:g> साठी खाती"</string>
     <string name="configure_section_header" msgid="7391183586410814450">"कॉन्फिगर करा"</string>
@@ -3603,7 +3633,7 @@
     <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>
@@ -3611,11 +3641,11 @@
     <string name="enterprise_privacy_installed_packages" msgid="2313698828178764590">"आपल्या डिव्हाइसवरील अ‍ॅप्सची सूची"</string>
     <string name="enterprise_privacy_usage_stats" msgid="4398411405572759370">"प्रत्येक अ‍ॅपमध्ये वापरलेला वेळ आणि डेटा यांचे प्रमाण"</string>
     <string name="enterprise_privacy_network_logs" msgid="161722817268849590">"सर्वात अलीकडील नेटवर्क रहदारी लॉग"</string>
-    <string name="enterprise_privacy_bug_reports" msgid="843225086779037863">"सर्वात अलीकडील दोष अहवाल"</string>
+    <string name="enterprise_privacy_bug_reports" msgid="843225086779037863">"सर्वात अलीकडील बग रीपोर्ट"</string>
     <string name="enterprise_privacy_security_logs" msgid="5377362481617301074">"सर्वात अलीकडील सुरक्षा लॉग"</string>
     <string name="enterprise_privacy_none" msgid="7706621148858381189">"काहीही नाही"</string>
-    <string name="enterprise_privacy_enterprise_installed_packages" msgid="6353757812144878828">"स्थापित केलेले अॅप्स"</string>
-    <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>
@@ -3634,20 +3664,22 @@
     <string name="enterprise_privacy_always_on_vpn_personal" msgid="9217774730260037434">"आपल्‍या वैयक्तिक प्रोफाइलमध्‍ये नेहमी VPN चालू असणे सक्रिय आहे"</string>
     <string name="enterprise_privacy_always_on_vpn_work" msgid="7244472958208315814">"आपल्‍या कार्य प्रोफाइलमध्‍ये नेहमी VPN चालू असणे सक्रिय आहे"</string>
     <string name="enterprise_privacy_global_http_proxy" msgid="7936664553416257333">"जागतिक HTTP प्रॉक्‍सी सेट आहे"</string>
-    <string name="enterprise_privacy_ca_certs" msgid="5885892204903688909">"विश्वासू क्रेडेन्शियल"</string>
+    <string name="enterprise_privacy_ca_certs_device" msgid="2019652712782510262">"विश्वसनीय क्रेडेंशिअल"</string>
+    <string name="enterprise_privacy_ca_certs_personal" msgid="2279084820904076599">"तुमच्‍या खाजगी प्रोफाइलमधील विश्वसनीय क्रेडेंशिअल"</string>
+    <string name="enterprise_privacy_ca_certs_work" msgid="6187377647815301809">"तुमच्‍या कार्य प्रोफाइलमधील विश्वसनीय क्रेडेंशिअल"</string>
     <plurals name="enterprise_privacy_number_ca_certs" formatted="false" msgid="526375234629534165">
       <item quantity="one">किमान <xliff:g id="COUNT_1">%d</xliff:g> CA प्रमाणपत्र</item>
       <item quantity="other">किमान <xliff:g id="COUNT_1">%d</xliff:g> CA प्रमाणपत्रे</item>
     </plurals>
-    <string name="enterprise_privacy_lock_device" msgid="8791656477097208540">"प्रशासक डिव्हाइस लॉक करू शकतो आणि संकेतशब्द रीसेट करू शकतो"</string>
+    <string name="enterprise_privacy_lock_device" msgid="8791656477097208540">"प्रशासक डिव्हाइस लॉक करू शकतो आणि पासवर्ड रीसेट करू शकतो"</string>
     <string name="enterprise_privacy_wipe_device" msgid="2821960015797241790">"प्रशासक डिव्हाइसवरील सर्व डेटा हटवू शकतो"</string>
-    <string name="enterprise_privacy_failed_password_wipe_device" msgid="1001255609345002878">"सर्व डिव्हाइस डेटा हटवण्यापूर्वी अयशस्वी झालेले संकेतशब्द प्रयत्न"</string>
+    <string name="enterprise_privacy_failed_password_wipe_device" msgid="1001255609345002878">"सर्व डिव्हाइस डेटा हटवण्यापूर्वी अयशस्वी झालेले पासवर्ड प्रयत्न"</string>
     <string name="enterprise_privacy_failed_password_wipe_work" msgid="4040565826652951057">"सर्व कार्य प्रोफाइल डेटा हटवण्यापूर्वी अयशस्वी झालेले संकेतशब्द प्रयत्न"</string>
     <plurals name="enterprise_privacy_number_failed_password_wipe" formatted="false" msgid="5279099270351036696">
       <item quantity="one"><xliff:g id="COUNT_1">%d</xliff:g> प्रयत्न</item>
       <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> प्रयत्न</item>
     </plurals>
-    <string name="do_disclosure_generic" msgid="8653670456990823307">"हे डिव्हाइस आपल्या संस्थेने व्यवस्थापित केले आहे."</string>
+    <string name="do_disclosure_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>
@@ -3697,6 +3729,8 @@
     <string name="carrier_provisioning" msgid="4398683675591893169">"वाहक तरतूद माहिती"</string>
     <string name="trigger_carrier_provisioning" msgid="3434865918009286187">"वाहक तरतूद ट्रिगर करा"</string>
     <string name="new_device_suggestion_title" msgid="698847081680980774">"नवीन आणि रोमांचक असे काय आहे?"</string>
-    <string name="new_device_suggestion_summary" msgid="7172709269203435870">"टॉप 5 वैशिष्ट्ये पहा"</string>
+    <string name="new_device_suggestion_summary" product="default" msgid="206396571522515855">"तुमच्या नवीन फोनबद्दल माहिती देणार्‍या सफरीवर चला"</string>
+    <string name="new_device_suggestion_summary" product="tablet" msgid="393751455688210956">"तुमच्या नवीन टॅबलेटबद्दल माहिती देणार्‍या सफरीवर चला"</string>
+    <string name="new_device_suggestion_summary" product="device" msgid="2939870049868336652">"तुमच्या नवीन डीव्हाइसबद्दल माहिती देणार्‍या सफरीवर चला"</string>
     <string name="disabled_low_ram_device" msgid="3751578499721173344">"हे वैशिष्‍ट्य या डिव्हाइसवर उपलब्ध नाही"</string>
 </resources>
diff --git a/res/values-ms/arrays.xml b/res/values-ms/arrays.xml
index cca58e6..2eae154 100644
--- a/res/values-ms/arrays.xml
+++ b/res/values-ms/arrays.xml
@@ -100,8 +100,6 @@
     <!-- no translation found for wifi_security_no_eap:0 (2084555984818107151) -->
     <!-- no translation found for wifi_security_no_eap:1 (397579322683471524) -->
     <!-- no translation found for wifi_security_no_eap:2 (1968820975358150484) -->
-    <!-- no translation found for wifi_ap_security:0 (5251664683198623324) -->
-    <!-- no translation found for wifi_ap_security:1 (7989073072260294673) -->
   <string-array name="wifi_eap_method">
     <item msgid="1160193392455075561">"PEAP"</item>
     <item msgid="7981731051382306293">"TLS"</item>
diff --git a/res/values-ms/strings.xml b/res/values-ms/strings.xml
index 5bafe623..9ff1e0b 100644
--- a/res/values-ms/strings.xml
+++ b/res/values-ms/strings.xml
@@ -166,7 +166,7 @@
     <string name="bluetooth_map_acceptance_dialog_text" msgid="8712508202081143737">"%1$s ingin mengakses mesej anda. Berikan akses kepada %2$s?"</string>
     <string name="bluetooth_sap_request" msgid="2669762224045354417">"Permintaan akses SIM"</string>
     <string name="bluetooth_sap_acceptance_dialog_text" msgid="4414253873553608690">"<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g> mahu mengakses kad SIM anda. Pemberian akses kepada kad SIM akan melumpuhkan sambungan data pada peranti anda untuk tempoh sambungan itu. Berikan akses kepada <xliff:g id="DEVICE_NAME_1">%2$s?</xliff:g>"</string>
-    <string name="bluetooth_device_name_summary" msgid="4757990010751789977">"Kelihatan kepada peranti lain sebagai \'<xliff:g id="DEVICE_NAME">^1</xliff:g>\'"</string>
+    <string name="bluetooth_device_name_summary" msgid="522235742194965734">"Kelihatan kepada peranti lain sebagai “<xliff:g id="DEVICE_NAME">^1</xliff:g>”"</string>
     <string name="bluetooth_paired_device_title" msgid="8638994696317952019">"Peranti anda"</string>
     <string name="bluetooth_pairing_page_title" msgid="7712127387361962608">"Gandingkan peranti baharu"</string>
     <string name="date_and_time" msgid="9062980487860757694">"Tarikh &amp; masa"</string>
@@ -312,6 +312,8 @@
     <string name="zone_auto" msgid="334783869352026648">"Zon waktu automatik"</string>
     <string name="zone_auto_summaryOn" msgid="6142830927278458314">"Gunakan zon waktu yang diberikan oleh rangkaian"</string>
     <string name="zone_auto_summaryOff" msgid="2597745783162041390">"Gunakan zon waktu yang diberikan oleh rangkaian"</string>
+    <string name="date_time_24hour_auto" msgid="2117383168985653422">"Format 24 jam automatik"</string>
+    <string name="date_time_24hour_auto_summary" msgid="6351812925651480277">"Gunakan lalai tempat peristiwa"</string>
     <string name="date_time_24hour_title" msgid="3203537578602803850">"Format 24 jam"</string>
     <string name="date_time_24hour" msgid="1193032284921000063">"Gunakan format 24 jam"</string>
     <string name="date_time_set_time_title" msgid="6296795651349047016">"Masa"</string>
@@ -372,6 +374,9 @@
     <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="1961957425135180242">"Seterusnya"</string>
+    <string name="setup_fingerprint_enroll_skip_title" msgid="362050541117362034">"Langkau cap jari?"</string>
+    <string name="setup_fingerprint_enroll_skip_after_adding_lock_text" msgid="958990414356204763">"Persediaan cap jari hanya mengambil masa seminit dua. Jika anda melangkau langkah ini, anda boleh menambah cap jari kemudian dalam tetapan."</string>
+    <string name="lock_screen_intro_skip_title" msgid="4988210105913705679">"Langkau kunci skrin?"</string>
     <string name="lock_screen_intro_skip_dialog_text_frp" product="tablet" msgid="1581834104051243425">"Ciri perlindungan peranti tidak akan dihidupkan. Anda tidak akan dapat menghalang orang lain daripada menggunakan tablet ini jika tablet hilang, dicuri atau ditetapkan semula."</string>
     <string name="lock_screen_intro_skip_dialog_text_frp" product="device" msgid="4629503416877189572">"Ciri perlindungan peranti tidak akan dihidupkan. Anda tidak akan dapat menghalang orang lain daripada menggunakan peranti ini jika peranti hilang, dicuri atau ditetapkan semula."</string>
     <string name="lock_screen_intro_skip_dialog_text_frp" product="default" msgid="2423428240245737909">"Ciri perlindungan peranti tidak akan dihidupkan. Anda tidak akan dapat menghalang orang lain daripada menggunakan telefon ini jika telefon hilang, dicuri atau ditetapkan semula."</string>
@@ -457,7 +462,7 @@
     <string name="setup_lock_settings_picker_title" product="tablet" msgid="90329443364067215">"Lindungi tablet anda"</string>
     <string name="setup_lock_settings_picker_title" product="device" msgid="2399952075134938929">"Lindungi peranti anda"</string>
     <string name="setup_lock_settings_picker_title" product="default" msgid="1572244299605153324">"Lindungi telefon anda"</string>
-    <string name="setup_lock_settings_picker_fingerprint_message" msgid="5585650064305600578">"Untuk keselamatan tambahan, sediakan kunci skrin sandaran."</string>
+    <string name="lock_settings_picker_fingerprint_added_security_message" msgid="5768002109707648463">"Untuk keselamatan tambahan, tetapkan kunci skrin sandaran."</string>
     <string name="setup_lock_settings_picker_message" product="tablet" msgid="8919671129189936210">"Halang orang lain daripada menggunakan tablet 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="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>
@@ -588,6 +593,7 @@
     <string name="lockpassword_pin_no_sequential_digits" msgid="680765285206990584">"Angka menaik, menurun atau jujukan berulang tidak dibenarkan"</string>
     <string name="lockpassword_ok_label" msgid="313822574062553672">"OK"</string>
     <string name="lockpassword_cancel_label" msgid="8818529276331121899">"Batal"</string>
+    <string name="lockpassword_clear_label" msgid="5724429464960458155">"Kosongkan"</string>
     <string name="lockpattern_tutorial_cancel_label" msgid="6431583477570493261">"Batal"</string>
     <string name="lockpattern_tutorial_continue_label" msgid="3559793618653400434">"Seterusnya"</string>
     <string name="lock_setup" msgid="3355847066343753943">"Persediaan selesai."</string>
@@ -781,6 +787,7 @@
     <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>
@@ -817,6 +824,8 @@
     <string name="wifi_wps_available_first_item" msgid="4422547079984583502">"WPS tersedia"</string>
     <string name="wifi_wps_available_second_item" msgid="8427520131718215301">" (WPS tersedia)"</string>
     <string name="wifi_wps_nfc_enter_password" msgid="2288214226916117159">"Masukkan kata laluan rangkaian anda"</string>
+    <string name="wifi_carrier_connect" msgid="8174696557882299911">"Rangkaian Wi-Fi pembawa"</string>
+    <string name="wifi_carrier_content" msgid="4634077285415851933">"Sambung melalui <xliff:g id="NAME">%1%s</xliff:g>"</string>
     <string name="wifi_scan_always_turnon_message" msgid="203123538572122989">"Untuk memperbaik ketepatan lokasi dan untuk tujuan lain, <xliff:g id="APP_NAME">%1$s</xliff:g> ingin menghidupkan imbasan rangkaian, walaupun semasa Wi-Fi dimatikan.\n\nBenarkan fungsi ini untuk semua apl yang ingin mengimbas?"</string>
     <string name="wifi_scan_always_turnoff_message" msgid="5538901671131941043">"Untuk mematikan, pergi ke Lanjutan dlm menu limpahan."</string>
     <string name="wifi_scan_always_confirm_allow" msgid="5355973075896817232">"Benarkan"</string>
@@ -834,6 +843,7 @@
     <string name="wifi_connect" msgid="1076622875777072845">"Sambung"</string>
     <string name="wifi_failed_connect_message" msgid="8491902558970292871">"Gagal menyambung ke rangkaian."</string>
     <string name="wifi_forget" msgid="8168174695608386644">"Lupakan"</string>
+    <string name="wifi_modify" msgid="6100248070440710782">"Ubah suai"</string>
     <string name="wifi_failed_forget_message" msgid="1348172929201654986">"Gagal melupakan rangkaian"</string>
     <string name="wifi_save" msgid="3331121567988522826">"Simpan"</string>
     <string name="wifi_failed_save_message" msgid="6650004874143815692">"Gagal menyimpan rangkaian"</string>
@@ -846,6 +856,7 @@
     <string name="wifi_advanced_titlebar" msgid="4485841401774142908">"Wi-Fi Lanjutan"</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_title" msgid="3471132676909349382">"Maklumat rangkaian"</string>
     <string name="wifi_details_subnet_mask" msgid="6720279144174924410">"Tapisan subrangkaian"</string>
     <string name="wifi_details_dns" msgid="8648826607751830768">"DNS"</string>
     <string name="wifi_details_ipv6_address_header" msgid="6734119149106422148">"Alamat IPv6"</string>
@@ -878,16 +889,15 @@
     <string name="wifi_p2p_cancel_connect_title" msgid="255267538099324413">"Batalkan jemputan?"</string>
     <string name="wifi_p2p_cancel_connect_message" msgid="7477756213423749402">"Adakah anda mahu membatalkan jemputan untuk berhubung dengan <xliff:g id="PEER_NAME">%1$s</xliff:g>?"</string>
     <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_off_subtext" msgid="5466126533609394170">"Tidak berkongsi sambungan Internet atau kandungan dengan peranti lain"</string>
     <string name="wifi_hotspot_tethering_on_subtext" product="tablet" msgid="5752490509369962007">"Berkongsi sambungan Internet tablet ini melalui tempat liputan"</string>
     <string name="wifi_hotspot_tethering_on_subtext" product="default" msgid="6461075246164300670">"Berkongsi sambungan Internet telefon ini melalui tempat liputan"</string>
     <string name="wifi_hotspot_on_local_only_subtext" msgid="2068110388011294735">"Apl berkongsi kandungan. Untuk berkongsi sambungan Internet, matikan dan hidupkan tempat liputan."</string>
-    <string name="wifi_hotspot_name_title" msgid="1341735529132128887">"Nama Wi‑Fi"</string>
+    <string name="wifi_hotspot_name_title" msgid="8237000746618636778">"Nama tempat liputan"</string>
     <string name="wifi_hotspot_name_summary_connecting" msgid="3378299995508671967">"Menghidupkan <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>..."</string>
     <string name="wifi_hotspot_name_summary_connected" msgid="3888672084861445362">"Peranti lain boleh bersambung ke <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>"</string>
-    <string name="wifi_hotspot_password_title" msgid="1955592302902091281">"Kata laluan Wi-Fi"</string>
+    <string name="wifi_hotspot_password_title" msgid="8676859981917573801">"Kata laluan tempat liputan"</string>
     <string name="wifi_hotspot_ap_band_title" msgid="1165801173359290681">"Jalur AP"</string>
     <string name="wifi_hotspot_footer_info_regular" msgid="1203489406068036455">"Gunakan tempat liputan untuk membuat rangkaian Wi-Fi bagi peranti anda yang lain. Tempat liputan menyediakan Internet menggunakan sambungan data mudah alih anda. Caj data mudah alih tambahan mungkin dikenakan."</string>
     <string name="wifi_hotspot_footer_info_local_only" msgid="857988412470694109">"Apl boleh membuat tempat liputan untuk berkongsi kandungan dengan peranti berdekatan."</string>
@@ -898,7 +908,6 @@
     <string name="wifi_tether_configure_ap_text" msgid="7974681394041609308">"Sediakan liputan Wi-Fi"</string>
     <string name="wifi_hotspot_configure_ap_text" msgid="5478614731464220432">"Persediaan tmpt liputan Wi-Fi"</string>
     <string name="wifi_hotspot_configure_ap_text_summary" msgid="5560680057727007011">"Tempat liputan WPA2 PSK AndroidAP"</string>
-    <string name="wifi_tether_configure_subtext" msgid="2050196439900426456">"Tempat liputan <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">"TitikPanasAndroid"</string>
     <string name="wifi_calling_settings_title" msgid="4102921303993404577">"Panggilan Wi-Fi"</string>
     <string name="wifi_calling_suggestion_title" msgid="9008010480466359578">"Hidupkan Panggilan Wi-Fi"</string>
@@ -939,7 +948,7 @@
     <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="emergency_address_summary" msgid="3266760199681945746">"Alamat digunakan oleh perkhidmatan kecemasan sebagai lokasi anda jika anda membuat panggilan kecemasan menggunakan Wi-Fi"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"Paparan"</string>
     <string name="sound_settings" msgid="5534671337768745343">"Bunyi"</string>
     <string name="all_volume_title" msgid="4296957391257836961">"Kelantangan"</string>
@@ -993,6 +1002,7 @@
     <string name="search_settings" msgid="1910951467596035063">"Carian"</string>
     <string name="search_settings_summary" msgid="9205656546570654169">"Urus tetapan dan sejarah carian"</string>
     <string name="search_settings_no_results" msgid="8799027492641230999">"Tiada hasil carian"</string>
+    <string name="search_clear_history" msgid="4196658962573162457">"Kosongkan sejarah"</string>
     <string name="display_settings" msgid="7965901687241669598">"Paparan"</string>
     <string name="accelerometer_title" msgid="7854608399547349157">"Skrin autoputar"</string>
     <string name="color_mode_title" msgid="3159275920408338215">"Warna terang"</string>
@@ -1122,7 +1132,6 @@
     <string name="baseband_version" msgid="1848990160763524801">"Versi jalur asas"</string>
     <string name="kernel_version" msgid="9192574954196167602">"Versi inti"</string>
     <string name="build_number" msgid="3075795840572241758">"Nombor binaan"</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>
     <string name="device_status" msgid="607405385799807324">"Status"</string>
@@ -1150,7 +1159,6 @@
     <string name="status_wifi_mac_address" msgid="2202206684020765378">"Alamat MAC Wi-Fi"</string>
     <string name="status_bt_address" msgid="4195174192087439720">"Alamat Bluetooth"</string>
     <string name="status_serial_number" msgid="2257111183374628137">"Nombor siri"</string>
-    <string name="status_unavailable" msgid="7862009036663793314">"Tidak tersedia"</string>
     <string name="status_up_time" msgid="7294859476816760399">"Masa hidup"</string>
     <string name="status_awake_time" msgid="2393949909051183652">"Masa berjaga"</string>
     <string name="internal_memory" msgid="9129595691484260784">"Storan dalaman"</string>
@@ -1326,6 +1334,7 @@
     <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>
     <string name="reset_dashboard_title" msgid="6254873816990678620">"Pilihan tetapan semula"</string>
+    <string name="reset_dashboard_summary" msgid="4851012632493522755">"Rangkaian, apl atau peranti boleh ditetapkan semula"</string>
     <string name="reset_network_title" msgid="6166025966016873843">"Tetapkan semula Wi-Fi, mudah alih &amp; Bluetooth"</string>
     <string name="reset_network_desc" msgid="5547979398298881406">"Tindakan ini akan menetapkan semula semua tetapan rangkaian, termasuk:\n\n"<li>"Wi‑Fi"</li>\n<li>"Data mudah alih"</li>\n<li>"Bluetooth"</li></string>
     <string name="reset_network_button_text" msgid="2035676527471089853">"Tetapkan semula tetapan"</string>
@@ -1334,17 +1343,14 @@
     <string name="reset_network_confirm_title" msgid="1759888886976962773">"Tetapkan semula?"</string>
     <string name="network_reset_not_available" msgid="7188610385577164676">"Tetapan semula rangkaian tidak tersedia untuk pengguna ini"</string>
     <string name="reset_network_complete_toast" msgid="787829973559541880">"Tetapan rangkaian telah ditetapkan semula"</string>
-    <string name="master_clear_title" msgid="6617679904229218425">"Padamkan semua data (Tetapan semula kilang)"</string>
-    <plurals name="master_clear_with_account_summary" formatted="false" msgid="5911377203778818712">
-      <item quantity="other"><xliff:g id="ACCOUNT_COUNT">%1$d</xliff:g> akaun akan ditetapkan semula</item>
-      <item quantity="one">1 akaun akan ditetapkan semula</item>
-    </plurals>
-    <string name="master_clear_summary" msgid="6902443944660426951">"Storan dalaman &amp; semua data akan ditetapkan semula"</string>
+    <string name="master_clear_title" msgid="3531267871084279512">"Padamkan semua data (tetapan semula kilang)"</string>
     <string name="master_clear_desc" product="tablet" msgid="9146059417023157222">"Ini akan memadamkan semua data dari "<b>"storan dalaman"</b>" tablet anda, termasuk:\n\n"<li>"Akaun Google anda"</li>\n<li>"Data dan tetapan sistem dan aplikasi"</li>\n<li>"Aplikasi yang dimuat turun"</li></string>
     <string name="master_clear_desc" product="default" msgid="4800386183314202571">"Ini akan memadamkan semua data daripada "<b>"storan dalaman"</b>" telefon anda, termasuk:\n\n"<li>"Akaun Google anda"</li>\n<li>"Data dan tetapan sistem dan aplikasi"</li>\n<li>"Aplikasi yang dimuat turun"</li></string>
     <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"Anda melog masuk ke dalam akaun berikut buat masa ini:\n"</string>
     <string name="master_clear_other_users_present" product="default" msgid="5161423070702470742">\n\n"Terdapat pengguna lain pada peranti ini.\n"</string>
     <string name="master_clear_desc_also_erases_external" msgid="1903185203791274237"><li>"Muzik"</li>\n<li>"Foto"</li>\n<li>"Data pengguna yang lain"</li></string>
+    <string name="master_clear_desc_also_erases_esim" msgid="312352697653096008"><li>"Pembawa pada eSIM"</li></string>
+    <string name="master_clear_desc_no_cancel_mobile_plan" msgid="5460926449093211144">\n\n"Ini tidak akan membatalkan pelan perkhidmatan mudah alih anda."</string>
     <string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="7744115866662613411">\n\n"Untuk memadam bersih muzik, gambar dan data pengguna lain, "<b>"storan USB"</b>" perlu dipadamkan."</string>
     <string name="master_clear_desc_erase_external_storage" product="default" msgid="4801026652617377093">\n\n"Untuk turut memadam bersih muzik, gambar dan data pengguna lain, "<b>"kad SD"</b>" perlu dipadamkan."</string>
     <string name="erase_external_storage" product="nosdcard" msgid="969364037450286809">"Padamkan storan USB"</string>
@@ -1461,15 +1467,16 @@
     <string name="settings_safetylegal_activity_title" msgid="6901214628496951727">"Maklumat keselamatan"</string>
     <string name="settings_safetylegal_activity_unreachable" msgid="250674109915859456">"Anda tidak mempunyai sambungan data. Untuk melihat maklumat ini sekarang, pergi ke %s dari sebarang komputer yang disambungkan ke Internet."</string>
     <string name="settings_safetylegal_activity_loading" msgid="8059022597639516348">"Memuatkan..."</string>
-    <string name="lockpassword_choose_your_password_header" msgid="8624900666929394990">"Pilih kata laluan anda"</string>
-    <string name="lockpassword_choose_your_password_header_for_fingerprint" msgid="6624409510609085450">"Ttpkn kta lluan utk gnakan cp jari"</string>
-    <string name="lockpassword_choose_your_pattern_header" msgid="6949761069941694050">"Pilih corak anda"</string>
-    <string name="lockpassword_choose_your_pattern_header_for_fingerprint" msgid="5901096361617543819">"Ttpkn corak utk gnakan cp jari"</string>
-    <string name="lockpassword_choose_your_pin_header" msgid="7598849519816138302">"Pilih PIN anda"</string>
-    <string name="lockpassword_choose_your_pin_header_for_fingerprint" msgid="765344692615917183">"Ttpkn PIN utk gunakan cap jari"</string>
-    <string name="lockpassword_confirm_your_password_header" msgid="6308478184889846633">"Sahkan kata laluan anda"</string>
+    <string name="lockpassword_choose_your_screen_lock_header" msgid="3872462096767152394">"Tetapkan kunci skrin"</string>
+    <string name="lockpassword_choose_your_password_message" msgid="1197569283524841412">"Sebagai langkah keselamatan, tetapkan kata laluan"</string>
+    <string name="lockpassword_choose_your_password_header_for_fingerprint" msgid="2541818487015343503">"Utk mnggnakan cap jari, ttpkn kta laluan"</string>
+    <string name="lockpassword_choose_your_pattern_header_for_fingerprint" msgid="7709785406243556723">"Utk menggunakan cap jari, tetapkan corak"</string>
+    <string name="lockpassword_choose_your_pin_message" msgid="1875420718677275646">"Sebagai langkah keselamatan, tetapkan PIN"</string>
+    <string name="lockpassword_choose_your_pin_header_for_fingerprint" msgid="1549639053195796674">"Untuk menggunakan cap jari, tetapkan PIN"</string>
+    <string name="lockpassword_choose_your_pattern_message" msgid="5986983400689720015">"Sebagai langkah keselamatan, tetapkan corak"</string>
+    <string name="lockpassword_confirm_your_password_header" msgid="1266027268220850931">"Masukkan semula kata laluan anda"</string>
     <string name="lockpassword_confirm_your_pattern_header" msgid="7543433733032330821">"Sahkan corak anda"</string>
-    <string name="lockpassword_confirm_your_pin_header" msgid="49038294648213197">"Sahkan PIN anda"</string>
+    <string name="lockpassword_confirm_your_pin_header" msgid="7744513791910572550">"Masukkan semula PIN anda"</string>
     <string name="lockpassword_confirm_passwords_dont_match" msgid="5140892109439191415">"Kata laluan tidak sepadan"</string>
     <string name="lockpassword_confirm_pins_dont_match" msgid="7226244811505606217">"PIN tidak sepadan"</string>
     <string name="lockpassword_choose_lock_generic_header" msgid="3811438094903786145">"Pilihan buka kunci"</string>
@@ -1488,6 +1495,12 @@
     <string name="lockpassword_strong_auth_required_work_pattern" msgid="3003781907040522053">"Untuk keselamatan tambahan, gunakan corak kerja anda"</string>
     <string name="lockpassword_strong_auth_required_work_pin" msgid="3367491332598821552">"Untuk keselamatan tambahan, masukkan PIN kerja anda"</string>
     <string name="lockpassword_strong_auth_required_work_password" msgid="8159775129968582940">"Untuk keselamatan tambahan, masukkan kata laluan kerja anda"</string>
+    <string name="lockpassword_confirm_your_pattern_details_frp" msgid="6757336656791723193">"Telefon ditetapkan semula kpd tetapan kilang. Untuk menggunakan telefon, masukkan corak terdahulu."</string>
+    <string name="lockpassword_confirm_your_pin_details_frp" msgid="826520613445990470">"Telefon ditetapkan semula kepada tetapan kilang. Untuk menggunakan telefon, masukkan PIN terdahulu."</string>
+    <string name="lockpassword_confirm_your_password_details_frp" msgid="8944081074615739040">"Telefon dittpkn semula kpd tetapan kilang. Utk menggunakan telefon, masukkan kata laluan terdahulu."</string>
+    <string name="lockpassword_confirm_your_pattern_header_frp" msgid="2898036091609128286">"Sahkan corak"</string>
+    <string name="lockpassword_confirm_your_pin_header_frp" msgid="4141601774778898803">"Sahkan PIN"</string>
+    <string name="lockpassword_confirm_your_password_header_frp" msgid="3762615419295360480">"Sahkan kata laluan"</string>
     <string name="lockpassword_invalid_pin" msgid="15588049067548470">"PIN salah"</string>
     <string name="lockpassword_invalid_password" msgid="4038507398784975200">"Kata laluan salah"</string>
     <string name="lockpattern_need_to_unlock_wrong" msgid="1745247595356012176">"Corak salah"</string>
@@ -1537,7 +1550,6 @@
     <string name="install_applications_title" msgid="4987712352256508946">"Benarkan semua sumber apl"</string>
     <string name="recent_app_category_title" msgid="6673071268966003928">"Apl yang dibuka baru-baru ini"</string>
     <string name="see_all_apps_title" msgid="1317153498074308438">"Lihat kesemua <xliff:g id="COUNT">%1$d</xliff:g> apl"</string>
-    <string name="recent_app_summary" msgid="3366446669844932300">"<xliff:g id="TIME">^1</xliff:g> yang lalu"</string>
     <string name="install_all_warning" product="tablet" msgid="8310489909586138165">"Tablet dan data peribadi anda lebih mudah diserang oleh apl yang tidak diketahui. Dengan memasang apl daripada sumber ini, anda bersetuju bahawa anda bertanggungjawab terhadap sebarang kerosakan pada tablet anda atau kehilangan data akibat penggunaan apl tersebut."</string>
     <string name="install_all_warning" product="default" msgid="1952257127370115988">"Telefon dan data peribadi anda lebih mudah diserang oleh apl yang tidak diketahui. Dengan memasang apl daripada sumber ini, anda bersetuju bahawa anda bertanggungjawab terhadap sebarang kerosakan pada telefon anda atau kehilangan data akibat penggunaan apl tersebut."</string>
     <string name="advanced_settings" msgid="1777249286757067969">"Tetapan terperinci"</string>
@@ -1801,7 +1813,7 @@
     <string name="accessibility_settings_summary" msgid="981260486011624939">"Pembaca skrin, paparan, kawalan interaksi"</string>
     <string name="vision_settings_title" msgid="4204111425716868288">"Tetapan Penglihatan"</string>
     <string name="vision_settings_description" msgid="5679491180156408260">"Anda boleh menyesuaikan peranti ini mengikut keperluan anda. Ciri kebolehaksesan ini boleh diubah kemudian dalam Tetapan."</string>
-    <string name="vision_settings_suggestion_title" msgid="917294957154878441">"Besarkan saiz fon"</string>
+    <string name="vision_settings_suggestion_title" msgid="8058794060304707004">"Tukar saiz fon"</string>
     <string name="screen_reader_category_title" msgid="7739154903913400641">"Pembaca skrin"</string>
     <string name="audio_and_captions_category_title" msgid="3420727114421447524">"Audio &amp; teks pada skrin"</string>
     <string name="display_category_title" msgid="685461049938269166">"Paparan"</string>
@@ -1838,7 +1850,6 @@
     <string name="accessibility_display_inversion_preference_subtitle" msgid="7052959202195368109">"Mungkin menjejaskan prestasi"</string>
     <string name="accessibility_autoclick_preference_title" msgid="7014499339068449623">"Klik selepas penuding berhenti bergerak"</string>
     <string name="accessibility_autoclick_delay_preference_title" msgid="3962261178385106006">"Lengah sebelum klik"</string>
-    <string name="preference_summary_default_combination" msgid="8532964268242666060">"<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">"HIDUP"</string>
     <string name="accessibility_summary_state_disabled" msgid="2241315620132005595">"MATI"</string>
     <string name="enable_quick_setting" msgid="2366999897816894536">"Tunjukkan dalam Tetapan Pantas"</string>
@@ -1957,12 +1968,14 @@
     <string name="background_activity_summary_on" msgid="649282072540085599">"Apl boleh berjalan di latar belakang apabila tidak digunakan"</string>
     <string name="background_activity_summary_off" msgid="7666330699090632040">"Aktiviti latar belakang apl terhad apabila tidak digunakan"</string>
     <string name="background_activity_summary_disabled" msgid="3710669050484599847">"Apl tidak dibenarkan berjalan di latar belakang"</string>
+    <string name="background_activity_summary_whitelisted" msgid="7375400051141016808">"Apl tidak dapat dioptimumkan untuk penggunaan bateri"</string>
+    <string name="background_activity_warning_dialog_title" msgid="2216249969149568871">"Hadkan aktiviti latar belakang?"</string>
+    <string name="background_activity_warning_dialog_text" msgid="7049624449246121981">"Jika anda mengehadkan aktiviti latar belakang untuk apl, fungsi apl itu mungkin terganggu"</string>
     <string name="device_screen_usage" msgid="3386088035570409683">"Penggunaan skrin sejak cas penuh"</string>
     <string name="device_screen_consumption" msgid="4607589286438986687">"Penggunaan skrin"</string>
     <string name="device_cellular_network" msgid="4724773411762382950">"Pengimbasan rangkaian mudah alih"</string>
-    <string name="power_last_full_charge_summary" msgid="532845389094620657">"<xliff:g id="TIME">^1</xliff:g> yang lalu"</string>
-    <string name="power_usage_list_summary" msgid="6775339745194635000">"Penggunaan apl sejak cas penuh (<xliff:g id="TIME">^1</xliff:g> yang lalu)"</string>
-    <string name="power_usage_list_summary_device" msgid="7036566616386864302">"Penggunaan peranti sejak cas penuh (<xliff:g id="TIME">^1</xliff:g> yang lalu)"</string>
+    <string name="power_usage_list_summary" msgid="6393929085382334341">"Penggunaan apl sejak cas penuh (<xliff:g id="RELATIVE_TIME">^1</xliff:g>)"</string>
+    <string name="power_usage_list_summary_device" msgid="4461926045610455423">"Penggunaan peranti sejak cas penuh (<xliff:g id="RELATIVE_TIME">^1</xliff:g>)"</string>
     <string name="screen_usage_summary" msgid="6687403051423153550">"Jumlah masa skrin dihidupkan sejak cas penuh"</string>
     <string name="device_usage_list_summary" msgid="5623036661468763251">"Penggunaan peranti sejak cas penuh"</string>
     <string name="battery_since_unplugged" msgid="338073389740738437">"Bateri digunakan sejak palam dicabut"</string>
@@ -2208,14 +2221,14 @@
     <string name="credentials_unlock_hint" msgid="2301301378040499348">"Taip kata laluan untuk storan bukti kelayakan."</string>
     <string name="credentials_old_password" msgid="7553393815538684028">"Kata laluan semasa:"</string>
     <string name="credentials_reset_hint" msgid="6297256880896133631">"Alih keluar semua kandungan?"</string>
-    <string name="credentials_password_too_short" msgid="7502749986405522663">"Kata laluan mesti mempunyai sekurang-kurangnya 8 aksara."</string>
     <string name="credentials_wrong_password" msgid="2541932597104054807">"Kata laluan salah."</string>
     <string name="credentials_reset_warning" msgid="5320653011511797600">"Kata laluan salah. Anda ada satu lagi peluang sebelum storan kelayakan dipadamkan."</string>
     <string name="credentials_reset_warning_plural" msgid="6514085665301095279">"Kata laluan salah. Anda ada <xliff:g id="NUMBER">%1$d</xliff:g> lagi peluang sebelum storan bukti kelayakan dipadamkan."</string>
     <string name="credentials_erased" msgid="2907836028586342969">"Storan bukti kelayakan dipadamkan."</string>
     <string name="credentials_not_erased" msgid="7685932772284216097">"Storan bukti kelayakan tidak boleh dipadamkan."</string>
     <string name="credentials_enabled" msgid="7588607413349978930">"Storan bukti klykn didayakan."</string>
-    <string name="credentials_configure_lock_screen_hint" msgid="6757119179588664966">"Anda perlu menetapkan PIN atau kata laluan kunci skrin sebelum anda boleh menggunakan storan bukti kelayakan."</string>
+    <string name="credentials_configure_lock_screen_hint" msgid="8058230497337529036">"Sebelum anda dapat menggunakan storan bukti kelayakan, peranti anda perlu ada skrin kunci selamat"</string>
+    <string name="credentials_configure_lock_screen_button" msgid="253239765216055321">"TETAPKAN KUNCI"</string>
     <string name="usage_access_title" msgid="332333405495457839">"Apl dgn akses guna"</string>
     <string name="emergency_tone_title" msgid="1055954530111587114">"Nada kecemasan"</string>
     <string name="emergency_tone_summary" msgid="722259232924572153">"Tetapkan tingkah laku semasa membuat panggilan kecemasan"</string>
@@ -2335,8 +2348,6 @@
     <skip />
     <string name="cant_sync_dialog_title" msgid="2777238588398046285">"Tidak boleh menyegerakkan secara manual"</string>
     <string name="cant_sync_dialog_message" msgid="1938380442159016449">"Penyegerakan untuk item ini dilumpuhkan pada masa ini. Untuk menukar tetapan ini, hidupkan data latar belakang dan penyegerakan automatik buat sementara waktu."</string>
-    <string name="wimax_settings" msgid="2655139497028469039">"4G"</string>
-    <string name="status_wimax_mac_address" msgid="8390791848661413416">"Alamat MAC 4G"</string>
     <string name="enter_password" msgid="8035706727471334122">"Untuk memulakan Android, masukkan kata laluan anda"</string>
     <string name="enter_pin" msgid="5305333588093263790">"Untuk memulakan Android, masukkan PIN anda"</string>
     <string name="enter_pattern" msgid="4187435713036808566">"Untuk memulakan Android, lukis corak anda"</string>
@@ -2350,6 +2361,7 @@
     <string name="misc_files_selected_count" msgid="4647048020823912088">"pilihan <xliff:g id="NUMBER">%1$d</xliff:g> dari <xliff:g id="TOTAL">%2$d</xliff:g>"</string>
     <string name="misc_files_selected_count_bytes" msgid="2876232009069114352">"<xliff:g id="NUMBER">%1$s</xliff:g> dari <xliff:g id="TOTAL">%2$s</xliff:g>"</string>
     <string name="select_all" msgid="1562774643280376715">"Pilih semua"</string>
+    <string name="data_plan_usage_manage_plans_button_text" msgid="8997761990902708162">"Urus pelan"</string>
     <string name="data_usage_summary_title" msgid="3804110657238092929">"Penggunaan data"</string>
     <string name="data_usage_app_summary_title" msgid="4147258989837459172">"Penggunaan data apl"</string>
     <string name="data_usage_accounting" msgid="7170028915873577387">"Cara pengiraan data pembawa mungkin berbeza dengan peranti anda."</string>
@@ -2435,6 +2447,9 @@
     <string name="data_usage_metered_mobile" msgid="5423305619126978393">"Rangkaian mudah alih"</string>
     <string name="data_usage_metered_wifi" msgid="1761738002328299714">"Rangkaian Wi-Fi bermeter"</string>
     <string name="data_usage_metered_wifi_disabled" msgid="727808462375941567">"Untuk memilih rangkaian bermeter, hidupkan Wi-Fi."</string>
+    <string name="data_usage_metered_auto" msgid="1262028400911918865">"Automatik"</string>
+    <string name="data_usage_metered_yes" msgid="9217539611385225894">"Bermeter"</string>
+    <string name="data_usage_metered_no" msgid="4025232961929071789">"Tidak bermeter"</string>
     <string name="data_usage_disclaimer" msgid="6887858149980673444">"Cara pengiraan data pembawa mungkin berbeza dengan peranti anda."</string>
     <string name="cryptkeeper_emergency_call" msgid="198578731586097145">"Panggilan kecemasan"</string>
     <string name="cryptkeeper_return_to_call" msgid="5613717339452772491">"Kembali ke panggilan"</string>
@@ -2526,9 +2541,6 @@
     <string name="backup_pw_set_button_text" msgid="2387480910044648795">"Tetapkan kata laluan sandaran"</string>
     <string name="backup_pw_cancel_button_text" msgid="8845630125391744615">"Batal"</string>
     <string name="additional_system_update_settings_list_item_title" msgid="214987609894661992">"Kemas kini sistem tmbahan"</string>
-    <string name="selinux_status_disabled" msgid="924551035552323327">"Dilumpuhkan"</string>
-    <string name="selinux_status_permissive" msgid="6004965534713398778">"Permisif"</string>
-    <string name="selinux_status_enforcing" msgid="2252703756208463329">"Menguatkuasakan"</string>
     <string name="ssl_ca_cert_warning" msgid="2045866713601984673">"Rangkaian mungkin dipantau"</string>
     <string name="done_button" msgid="1991471253042622230">"Selesai"</string>
     <plurals name="ssl_ca_cert_dialog_title" formatted="false" msgid="7145092748045794650">
@@ -2726,6 +2738,7 @@
       <item quantity="other">Tunjukkan %d item yang tersembunyi</item>
       <item quantity="one">Tunjukkan %d item yang tersembunyi</item>
     </plurals>
+    <string name="dashboard_suggestion_condition_footer_content_description" msgid="2898588191174845961">"Runtuhkan"</string>
     <string name="network_dashboard_title" msgid="4771589228992391573">"Rangkaian &amp; Internet"</string>
     <string name="network_dashboard_summary_mobile" msgid="3851083934739500429">"mudah alih"</string>
     <string name="network_dashboard_summary_data_usage" msgid="3843261364705042212">"penggunaan data"</string>
@@ -2828,8 +2841,14 @@
       <item quantity="other"><xliff:g id="ON_COUNT">%d</xliff:g> peraturan automatik dihidupkan</item>
       <item quantity="one">1 peraturan automatik dihidupkan</item>
     </plurals>
-    <string name="zen_mode_settings_title" msgid="842308776768942600">"Pilihan Jangan Ganggu"</string>
-    <string name="zen_mode_priority_settings_title" msgid="2623117023031824309">"Benarkan keutamaan sahaja"</string>
+    <string name="zen_mode_settings_title" msgid="1066226840983908121">"Jangan Ganggu"</string>
+    <string name="zen_mode_behavior_settings_title" msgid="1463303933529313969">"Gelagat"</string>
+    <string name="zen_mode_behavior_allow_title" msgid="3845615648136218141">"Benarkan bunyi &amp; getaran drp"</string>
+    <string name="zen_mode_behavior_no_sound" msgid="1219626004723208056">"Tiada bunyi"</string>
+    <string name="zen_mode_behavior_total_silence" msgid="6716603819806610626">"Tiada bunyi (Senyap Sepenuhnya)"</string>
+    <string name="zen_mode_behavior_no_sound_except" msgid="4968477585788243114">"Tiada bunyi kecuali <xliff:g id="CATEGORIES">%1$s</xliff:g>"</string>
+    <!-- no translation found for zen_mode_behavior_alarms_only (2423480992071472963) -->
+    <skip />
     <string name="zen_mode_automation_settings_title" msgid="4228995740594063774">"Peraturan automatik"</string>
     <string name="zen_mode_automation_suggestion_title" msgid="5105443455143476201">"Ttpkan peraturan Jangan Ganggu"</string>
     <string name="zen_mode_automation_suggestion_summary" msgid="4732808039946935657">"Hadkan bunyi &amp; getaran pada masa tertentu"</string>
@@ -2871,13 +2890,15 @@
     <string name="notifications_title" msgid="8086372779371204971">"Pemberitahuan"</string>
     <string name="app_notifications_title" msgid="5810577805218003760">"Pemberitahuan apl"</string>
     <string name="notification_channel_title" msgid="2260666541030178452">"Kategori pemberitahuan"</string>
+    <string name="notification_group_title" msgid="7180506440133859601">"Kumpulan kategori pemberitahuan"</string>
     <string name="notification_importance_title" msgid="848692592679312666">"Kepentingan"</string>
-    <string name="notification_importance_unspecified" msgid="2196023702875112081">"Biarkan apl yang menentukan"</string>
+    <string name="notification_importance_unspecified" msgid="6622173510486113958">"Benarkan bunyi"</string>
     <string name="notification_importance_blocked" msgid="7938180808339386300">"Jangan sekali-kali tunjukkan pemberitahuan"</string>
     <string name="notification_importance_min" msgid="5455049524984686275">"Tiada gangguan bunyi atau visual"</string>
     <string name="notification_importance_low" msgid="8881468429453766553">"Tiada bunyi"</string>
     <string name="notification_importance_default" msgid="5958338024601957516">"Berbunyi"</string>
     <string name="notification_importance_high" msgid="2082429479238228527">"Berbunyi dan paparkan pada skrin"</string>
+    <string name="notification_importance_high_silent" msgid="2667033773703765252">"Paparkan pada skrin"</string>
     <string name="notification_importance_min_title" msgid="6974673091137544803">"Rendah"</string>
     <string name="notification_importance_low_title" msgid="8131254047772814309">"Sederhana"</string>
     <string name="notification_importance_default_title" msgid="9120383978536089489">"Tinggi"</string>
@@ -2920,8 +2941,13 @@
     <string name="loading_notification_apps" msgid="5031818677010335895">"Memuatkan apl..."</string>
     <string name="app_notifications_off_desc" msgid="4882445501376722969">"Android menyekat pemberitahuan apl ini daripada muncul pada peranti ini"</string>
     <string name="channel_notifications_off_desc" msgid="5899225298718840635">"Android menyekat kategori pemberitahuan ini daripada muncul pada peranti ini"</string>
+    <string name="channel_group_notifications_off_desc" msgid="1620950416247316370">"Android menyekat kumpulan pemberitahuan ini daripada muncul pada peranti ini"</string>
     <string name="notification_channels" msgid="5346841743182627500">"Kategori"</string>
     <string name="notification_channels_other" msgid="5645317113885788226">"Lain-lain"</string>
+    <plurals name="notification_group_summary" formatted="false" msgid="3420621520561455358">
+      <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> kategori</item>
+      <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> kategori</item>
+    </plurals>
     <string name="no_channels" msgid="3077375508177744586">"Apl ini belum menyiarkan sebarang pemberitahuan"</string>
     <string name="app_settings_link" msgid="8894946007543660906">"Tetapan tambahan dalam apl"</string>
     <string name="app_notification_listing_summary_zero" msgid="6482582965081108108">"Dihidupkan untuk semua apl"</string>
@@ -2998,12 +3024,14 @@
     <string name="zen_mode_from_starred" msgid="2678345811950997027">"Daripada kenalan dibintangkan sahaja"</string>
     <string name="zen_mode_from_none" msgid="8219706639954614136">"Tiada"</string>
     <string name="zen_mode_alarms" msgid="2165302777886552926">"Penggera"</string>
+    <!-- no translation found for zen_mode_media_system_other (8900209390529859777) -->
+    <skip />
     <string name="zen_mode_reminders" msgid="5458502056440485730">"Peringatan"</string>
     <string name="zen_mode_events" msgid="7914446030988618264">"Acara"</string>
     <string name="zen_mode_all_callers" msgid="584186167367236922">"Semua pemanggil"</string>
     <string name="zen_mode_selected_callers" msgid="3127598874060615742">"Pemanggil dipilih"</string>
     <string name="zen_mode_repeat_callers" msgid="5019521886428322131">"Pemanggil berulang"</string>
-    <string name="zen_mode_repeat_callers_summary" msgid="7192713032364140137">"Jika orang yang sama memanggil sekali lagi dalam tempoh <xliff:g id="MINUTES">%d</xliff:g> minit, benarkannya"</string>
+    <string name="zen_mode_repeat_callers_summary" msgid="239685342222975733">"Jika orang yang sama memanggil sekali lagi dalam tempoh <xliff:g id="MINUTES">%d</xliff:g> minit"</string>
     <string name="zen_mode_when" msgid="2767193283311106373">"Hidupkan secara automatik"</string>
     <string name="zen_mode_when_never" msgid="8809494351918405602">"Jangan sekali-kali"</string>
     <string name="zen_mode_when_every_night" msgid="3122486110091921009">"Setiap malam"</string>
@@ -3032,6 +3060,7 @@
     <string name="zen_mode_screen_off_visual_interruptions" msgid="4850792880144382633">"Apabila skrin dimatikan"</string>
     <string name="zen_mode_no_visual_interruptions" msgid="8742776003822778472">"Apabila skrin dihidupkan atau dimatikan"</string>
     <string name="notification_app_settings_button" msgid="6685640230371477485">"Tetapan pemberitahuan"</string>
+    <string name="suggestion_button_text" msgid="3275010948381252006">"Ok"</string>
     <string name="device_feedback" msgid="3238056036766293294">"Hntr mklm balas mngenai peranti ini"</string>
     <string name="restr_pin_enter_admin_pin" msgid="1085834515677448072">"Masukkan PIN pentadbir"</string>
     <string name="switch_on_text" msgid="1124106706920572386">"Dihidupkan"</string>
@@ -3216,6 +3245,7 @@
     <string name="usb_summary_file_transfers" msgid="6435943692610175111">"Memindahkan fail"</string>
     <string name="usb_summary_photo_transfers" msgid="8440204169576585250">"Memindahkan foto (PTP)"</string>
     <string name="usb_summary_MIDI" msgid="5687906612187885908">"Menggunakan peranti sebagai MIDI"</string>
+    <string name="sms_mirroring_pref" msgid="6475043279147376031">"Pencerminan SMS"</string>
     <string name="background_check_pref" msgid="7550258400138010979">"Semakan latar belakang"</string>
     <string name="background_check_title" msgid="4534254315824525593">"Akses latar belakang penuh"</string>
     <string name="assist_access_context_title" msgid="2269032346698890257">"Gunakan teks daripada skrin"</string>
@@ -3282,7 +3312,7 @@
     <string name="write_settings_title" msgid="4232152481902542284">"Boleh mengubah suai tetapan sistem"</string>
     <string name="write_system_settings" msgid="3482913590601096763">"Ubah suai tetapan sistem"</string>
     <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="permit_write_settings" msgid="658555006453212691">"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>
@@ -3377,9 +3407,12 @@
     <string name="color_temperature" msgid="2070126836910615605">"Suhu warna sejuk"</string>
     <string name="color_temperature_desc" msgid="4793729830226404052">"Gunakan warna paparan yang lebih sejuk"</string>
     <string name="color_temperature_toast" msgid="4974218172133854827">"Untuk mengenakan perubahan warna, matikan skrin"</string>
-    <string name="telephony_monitor_toast" msgid="7003764250271195384">"Untuk menggunakan perubahan telephony monitor, but semula peranti"</string>
+    <string name="connectivity_monitor_switch" msgid="9059759348648583421">"Connectivity Monitor"</string>
+    <string name="connectivity_monitor_switch_summary" msgid="2828658652378866401">"ConnectivityMonitor akan mengumpulkan log apabila mengesan masalah kesambungan dan memaparkan pemberitahuan kepada pengguna untuk memfailkan pepijat."</string>
+    <string name="connectivity_monitor_toast" msgid="5551859612881173028">"Untuk menggunakan perubahan connectivity monitor, but semula peranti"</string>
     <string name="camera_hal_hdrplus_switch" msgid="8377365197105267466">"Camera HAL HDR+"</string>
     <string name="camera_hal_hdrplus_toast" msgid="2063703797270055299">"Untuk menggunakan perubahan Camera HAL HDR+, but semula peranti"</string>
+    <string name="camera_laser_sensor_switch" msgid="8913588990743234440">"Penderia Laser Kamera"</string>
     <string name="ota_disable_automatic_update" msgid="2319639631655915050">"Kemas kini sistem automatik"</string>
     <string name="usage" msgid="2977875522080448986">"Penggunaan"</string>
     <string name="cellular_data_usage" msgid="2155683719898158203">"Penggunaan data mudah alih"</string>
@@ -3405,7 +3438,7 @@
     <string name="data_warning" msgid="209133958008062117">"Amaran data"</string>
     <string name="set_data_limit" msgid="2901526323210516923">"Tetapkan had data"</string>
     <string name="data_limit" msgid="1885406964934590552">"Had data"</string>
-    <string name="data_usage_template" msgid="392191945602400904">"<xliff:g id="ID_1">%1$s</xliff:g> digunakan antara <xliff:g id="ID_2">%2$s</xliff:g>"</string>
+    <string name="data_usage_template" msgid="2923744765873163859">"<xliff:g id="ID_1">%1$s</xliff:g> digunakan <xliff:g id="ID_2">%2$s</xliff:g>"</string>
     <string name="configure" msgid="1029654422228677273">"Konfigurasikan"</string>
     <string name="data_usage_other_apps" msgid="3272872663517382050">"Apl lain yang termasuk dalam penggunaan"</string>
     <plurals name="data_saver_unrestricted_summary" formatted="false" msgid="2635267833484232703">
@@ -3474,7 +3507,7 @@
     <string name="button_confirm_convert_fbe" msgid="7101855374850373091">"Padamkan dan tukar"</string>
     <string name="reset_shortcut_manager_throttling" msgid="6495066467198668994">"Tetapkan semula had kadar ShortcutManager"</string>
     <string name="reset_shortcut_manager_throttling_complete" msgid="1826770872063707900">"Had kadar ShortcutManager telah ditetapkan semula"</string>
-    <string name="notification_suggestion_title" msgid="4506524937307816475">"Kawal pemberitahuan skrin kunci"</string>
+    <string name="notification_suggestion_title" msgid="387052719462473500">"Kawal maklumat pada skrin kunci"</string>
     <string name="notification_suggestion_summary" msgid="8521159741445416875">"Tunjukkan atau sembunyikan kandungan pemberitahuan"</string>
     <string name="page_tab_title_summary" msgid="4070309266374993258">"Semua"</string>
     <string name="page_tab_title_support" msgid="8483187649355540109">"Sokongan &amp; petua"</string>
@@ -3482,7 +3515,7 @@
     <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>
     <string name="premium_sms_access" msgid="4660047004791638305">"Akses SMS Premium"</string>
-    <string name="bluetooth_disabled" msgid="2456198532288640046">"Tidak kelihatan kepada peranti lain"</string>
+    <string name="bluetooth_disabled" msgid="6244000672828617410">"Mati"</string>
     <string name="bluetooth_connected_summary" msgid="7672528674593152862">"Dihubungkan ke <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="bluetooth_connected_multiple_devices_summary" msgid="9173661896296663932">"Dihubungkan ke berbilang peranti"</string>
     <string name="demo_mode" msgid="2798762752209330277">"Mod tunjuk cara UI sistem"</string>
@@ -3561,7 +3594,7 @@
     <string name="ambient_display_title" product="device" msgid="3423781975742145894">"Ketik dua kali untuk menyemak peranti"</string>
     <string name="ambient_display_summary" msgid="525662960806416373">"Untuk menyemak masa, ikon pemberitahuan dan maklumat lain, ketik dua kali pada skrin anda."</string>
     <string name="ambient_display_suggestion_summary" msgid="5987443721392571847">"Semak pemberitahuan apabila skrin dimatikan"</string>
-    <string name="ambient_display_pickup_title" product="default" msgid="818688002837687268">"Angkat untuk menyemak telefon"</string>
+    <string name="ambient_display_pickup_title" product="default" msgid="818688002837687268">"Angkat utk menyemak telefon"</string>
     <string name="ambient_display_pickup_title" product="tablet" msgid="4455864282995698097">"Angkat untuk menyemak tablet"</string>
     <string name="ambient_display_pickup_title" product="device" msgid="5380534405773531175">"Angkat untuk menyemak peranti"</string>
     <string name="ambient_display_pickup_summary" product="default" msgid="4567020486787561873">"Untuk menyemak masa, ikon pemberitahuan dan maklumat lain, angkat telefon anda."</string>
@@ -3584,7 +3617,7 @@
     <string name="web_action_enable_title" msgid="4051513950976670853">"Apl segera"</string>
     <string name="web_action_enable_summary" msgid="3108127559723396382">"Buka pautan dalam apl, meskipun tidak dipasang"</string>
     <string name="web_action_section_title" msgid="7364647086538399136">"Apl segera"</string>
-    <string name="instant_apps_account" msgid="1433620209791992528">"Akaun apl segera"</string>
+    <string name="instant_apps_settings" msgid="8827777916518348213">"Pilihan Apl Segera"</string>
     <string name="domain_url_section_title" msgid="7046835219056428883">"Apl yang dipasang"</string>
     <string name="automatic_storage_manager_activation_warning" msgid="6353100011690933254">"Storan anda kini diurus oleh pengurus storan"</string>
     <string name="account_for_section_header" msgid="5356566418548737121">"Akaun untuk <xliff:g id="USER_NAME">%1$s</xliff:g>"</string>
@@ -3631,7 +3664,9 @@
     <string name="enterprise_privacy_always_on_vpn_personal" msgid="9217774730260037434">"VPN sentiasa hidup dihidupkan dalam profil peribadi anda"</string>
     <string name="enterprise_privacy_always_on_vpn_work" msgid="7244472958208315814">"VPN sentiasa hidup dihidupkan dalam profil kerja anda"</string>
     <string name="enterprise_privacy_global_http_proxy" msgid="7936664553416257333">"Proksi HTTP global ditetapkan"</string>
-    <string name="enterprise_privacy_ca_certs" msgid="5885892204903688909">"Bukti kelayakan dipercayai"</string>
+    <string name="enterprise_privacy_ca_certs_device" msgid="2019652712782510262">"Bukti kelayakan dipercayai"</string>
+    <string name="enterprise_privacy_ca_certs_personal" msgid="2279084820904076599">"Bukti kelayakan dipercayai dalam profil peribadi anda"</string>
+    <string name="enterprise_privacy_ca_certs_work" msgid="6187377647815301809">"Bukti kelayakan dipercayai dalam profil kerja anda"</string>
     <plurals name="enterprise_privacy_number_ca_certs" formatted="false" msgid="526375234629534165">
       <item quantity="other">Minimum <xliff:g id="COUNT_1">%d</xliff:g> sijil CA</item>
       <item quantity="one">Minimum <xliff:g id="COUNT_0">%d</xliff:g> sijil CA</item>
@@ -3694,6 +3729,8 @@
     <string name="carrier_provisioning" msgid="4398683675591893169">"Maklumat Peruntukan Pembawa"</string>
     <string name="trigger_carrier_provisioning" msgid="3434865918009286187">"Cetus Peruntukan Pembawa"</string>
     <string name="new_device_suggestion_title" msgid="698847081680980774">"Apakah yang baharu dan menarik?"</string>
-    <string name="new_device_suggestion_summary" msgid="7172709269203435870">"Lihatlah 5 ciri teratas"</string>
+    <string name="new_device_suggestion_summary" product="default" msgid="206396571522515855">"Teroka telefon baharu anda"</string>
+    <string name="new_device_suggestion_summary" product="tablet" msgid="393751455688210956">"Teroka tablet baharu anda"</string>
+    <string name="new_device_suggestion_summary" product="device" msgid="2939870049868336652">"Teroka peranti baharu anda"</string>
     <string name="disabled_low_ram_device" msgid="3751578499721173344">"Video ini tidak tersedia pada peranti ini"</string>
 </resources>
diff --git a/res/values-my/arrays.xml b/res/values-my/arrays.xml
index 7a8f67a..8be20cd 100644
--- a/res/values-my/arrays.xml
+++ b/res/values-my/arrays.xml
@@ -100,8 +100,6 @@
     <!-- no translation found for wifi_security_no_eap:0 (2084555984818107151) -->
     <!-- no translation found for wifi_security_no_eap:1 (397579322683471524) -->
     <!-- no translation found for wifi_security_no_eap:2 (1968820975358150484) -->
-    <!-- no translation found for wifi_ap_security:0 (5251664683198623324) -->
-    <!-- no translation found for wifi_ap_security:1 (7989073072260294673) -->
   <string-array name="wifi_eap_method">
     <item msgid="1160193392455075561">"PEAP"</item>
     <item msgid="7981731051382306293">"TLS"</item>
@@ -413,7 +411,7 @@
     <item msgid="758587126802411846">"အဖြူပေါ်အမည်း"</item>
     <item msgid="1495307195241623402">"အမည်းပေါ်အဝါ"</item>
     <item msgid="6039700130994371612">"အပြာပေါ်အဝါ"</item>
-    <item msgid="7169235156349580064">"မိမိစိတ်ကြိုက်"</item>
+    <item msgid="7169235156349580064">"စိတ်ကြိုက်"</item>
   </string-array>
   <string-array name="vpn_types_long">
     <item msgid="2732002039459078847">"PPTP VPN"</item>
diff --git a/res/values-my/strings.xml b/res/values-my/strings.xml
index b8a1a55..d825be1 100644
--- a/res/values-my/strings.xml
+++ b/res/values-my/strings.xml
@@ -166,7 +166,7 @@
     <string name="bluetooth_map_acceptance_dialog_text" msgid="8712508202081143737">"%1$s သည် သင်၏ စာများကို ရယူအသုံးပြုလိုသည်။ %2$s ကို အသုံးပြုခွင့် ပေးမည်လား?"</string>
     <string name="bluetooth_sap_request" msgid="2669762224045354417">"SIM ကဒ် သုံးခွင့် တောင်းဆိုမှု"</string>
     <string name="bluetooth_sap_acceptance_dialog_text" msgid="4414253873553608690">"<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g> သည် သင့် SIM ကဒ်အား ဝင်ရောက်သုံးလို၏။ SIM ကဒ်အား ဝင်ရောက်သုံးခွင့်ပြုပါက ချိတ်ဆက်နေစဉ်ကာလအတွင်း သင့် စက်ကိရိယာ၏ ဒေတာချိတ်ဆက်မှုအား ပိတ်ထားလိမ့်မည်။ <xliff:g id="DEVICE_NAME_1">%2$s?</xliff:g> အား ဝင်ရောက်သုံးခွင့်ပြုရန်"</string>
-    <string name="bluetooth_device_name_summary" msgid="4757990010751789977">"အခြားစက်ပစ္စည်းများက \'<xliff:g id="DEVICE_NAME">^1</xliff:g>\' အဖြစ် မြင်တွေ့ရပါလိမ့်မည်"</string>
+    <string name="bluetooth_device_name_summary" msgid="522235742194965734">"အခြားစက်ပစ္စည်းများက \'<xliff:g id="DEVICE_NAME">^1</xliff:g>\' အဖြစ် မြင်ရပါမည်"</string>
     <string name="bluetooth_paired_device_title" msgid="8638994696317952019">"သင်၏ စက်ပစ္စည်းများ"</string>
     <string name="bluetooth_pairing_page_title" msgid="7712127387361962608">"စက်ပစ္စည်းအသစ်ကို တွဲချိတ်ရန်"</string>
     <string name="date_and_time" msgid="9062980487860757694">"ရက်စွဲနှင့် အချိန်"</string>
@@ -250,7 +250,7 @@
     <string name="skip_label" msgid="47510779345218297">"ကျော်ရန်"</string>
     <string name="next_label" msgid="4693520878012668114">"ရှေ့သို့"</string>
     <string name="language_picker_title" msgid="3596315202551687690">"ဘာသာစကားများ"</string>
-    <string name="pref_title_lang_selection" msgid="2014920136978776034">"ဘာသာစကားဆိုင်ရာ မိမိစိတ်ကြိုက်ဆက်တင်များ"</string>
+    <string name="pref_title_lang_selection" msgid="2014920136978776034">"စိတ်ကြိုက်ဘာသာစကား"</string>
     <string name="locale_remove_menu" msgid="7651301406723638854">"ဖယ်ရှားပါ"</string>
     <string name="add_a_language" msgid="2330538812283783022">"ဘာသာစကားတစ်ခု ပေါင်းထည့်ပါ"</string>
     <plurals name="dlg_remove_locales_title" formatted="false" msgid="4276642359346122396">
@@ -297,10 +297,10 @@
     <string name="roaming_disable" msgid="1295279574370898378">"ရုန်းမင်းပြုလုပ်နေစဉ် ဒေတာဝန်ဆောင်မှုများကို ဆက်သွယ်ခြင်း"</string>
     <string name="roaming_reenable_message" msgid="9141007271031717369">"ဒေတာဆက်သွယ်မှုပြတ်တောက်သွားပါသည် အဘယ်ကြောင့်ဆိုသော် သင့်အိမ်၏ကွန်ယက်မှထွက်ကာ ဒေတာရုန်းမင်းကွန်ယက်ကိုလဲပိတ်ထားသောကြောင့်ဖြစ်သည်"</string>
     <string name="roaming_turn_it_on_button" msgid="4387601818162120589">"ဖွင့်မည်"</string>
-    <string name="roaming_warning" msgid="4275443317524544705">"သိသာသည့် ငွေကြေးကုန်ကျမှုများ ရှိနိုင်ပါသည်။"</string>
+    <string name="roaming_warning" msgid="4275443317524544705">"ငွေကြေး အတော်အတန်ကုန်ကျနိုင်ပါသည်။"</string>
     <string name="roaming_warning_multiuser" product="tablet" msgid="6458990250829214777">"ကွန်ယက်ပြင်ပဒေတာအသုံးပြုခြင်းကို သင် ခွင့်ပြုလျှင် သိသာကြီးမာသောသုံးစွဲခ ကျခံရလိမ့်မည် !\n\n ဤအစီအမံသည် ဤတက်ဘလက်မှ သူံးစွဲသူအားလုံးကို အကျိုးသက်ရောက်လိမ့်မည်။"</string>
     <string name="roaming_warning_multiuser" product="default" msgid="6368421100292355440">"ကွန်ယက်ပြင်ပဒေတာအသုံးပြုခြင်းကို သင် ခွင့်ပြုလျှင် သိသာကြီးမာသောသုံးစွဲခ ကျခံရလိမ့်မည် !\n\n ဤအစီအမံသည် ဤဖုန်းမှ သူံးစွဲသူအားလုံးကို အကျိုးသက်ရောက်လိမ့်မည်။"</string>
-    <string name="roaming_reenable_title" msgid="6068100976707316772">"ကွန်ရက်ပြင်ပဒေတာအသုံးပြုခြင်း ခွင့်​ပြုမည်လား?"</string>
+    <string name="roaming_reenable_title" msgid="6068100976707316772">"ကွန်ရက်ပြင်ပဒေတာ သုံးခွင့်​ပြုမလား။"</string>
     <string name="networks" msgid="6333316876545927039">"ဖုန်းလိုင်းကုမ္ပဏီရွေးချယ်မှု"</string>
     <string name="sum_carrier_select" msgid="3616956422251879163">"ကွန်ယက်ဝန်ဆောင်မှုကို ရွေးချယ်ပါ"</string>
     <string name="date_and_time_settings_title" msgid="3350640463596716780">"ရက်စွဲနှင့် အချိန်"</string>
@@ -312,6 +312,8 @@
     <string name="zone_auto" msgid="334783869352026648">"အလိုအလျောက်အချိန်ဇုန်နယ်"</string>
     <string name="zone_auto_summaryOn" msgid="6142830927278458314">"ကွန်ရက်က ဖော်ပြသောအချိန်ကို အသုံးပြုမည်"</string>
     <string name="zone_auto_summaryOff" msgid="2597745783162041390">"ကွန်ရက်က ဖော်ပြသောအချိန်ကို အသုံးပြုမည်"</string>
+    <string name="date_time_24hour_auto" msgid="2117383168985653422">"အလိုအလျောက် ၂၄-နာရီစနစ်"</string>
+    <string name="date_time_24hour_auto_summary" msgid="6351812925651480277">"အသုံးပြုမည့် ဘာသာစကားကို မူရင်းအြဖစ်သုံးရန်"</string>
     <string name="date_time_24hour_title" msgid="3203537578602803850">"၂၄-နာရီပုံစံ"</string>
     <string name="date_time_24hour" msgid="1193032284921000063">"၂၄-နာရီပုံစံကို အသုံးပြုမည်"</string>
     <string name="date_time_set_time_title" msgid="6296795651349047016">"အချိန်"</string>
@@ -341,8 +343,7 @@
     <string name="Accounts_settings_title" msgid="1643879107901699406">"အကောင့်များ"</string>
     <string name="location_settings_title" msgid="1369675479310751735">"တည်နေရာ"</string>
     <string name="account_settings_title" msgid="626177544686329806">"အကောင့်များ"</string>
-    <!-- no translation found for security_settings_title (4918904614964215087) -->
-    <skip />
+    <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,8 +361,8 @@
     <string name="fingerprint_add_title" msgid="1926752654454033904">"လက်ဗွေထည့်သွင်းမည်"</string>
     <string name="fingerprint_enable_keyguard_toggle_title" msgid="5078060939636911795">"ဖုန်းမျက်နှာပြင်အား သော့ချရန်"</string>
     <plurals name="security_settings_fingerprint_preference_summary" formatted="false" msgid="624961700033979880">
-      <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> လက်ဗွေရာများ ပြင်ဆင်သတ်မှတ်ရန်</item>
-      <item quantity="one"><xliff:g id="COUNT_0">%1$d</xliff:g> လက်ဗွေရာ ပြင်ဆင်သတ်မှတ်ရန်</item>
+      <item quantity="other">လက်ဗွေရာ <xliff:g id="COUNT_1">%1$d</xliff:g> ခု ပြင်ဆင်သတ်မှတ်ရန်</item>
+      <item quantity="one">လက်ဗွေရာ <xliff:g id="COUNT_0">%1$d</xliff:g> ခု ပြင်ဆင်သတ်မှတ်ရန်</item>
     </plurals>
     <string name="security_settings_fingerprint_preference_summary_none" msgid="1507739327565151923"></string>
     <string name="security_settings_fingerprint_enroll_introduction_title" msgid="3201556857492526098">"လက်ဗွေရာသုံး၍ ဖွင့်ပါ"</string>
@@ -373,6 +374,9 @@
     <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="1961957425135180242">"ရှေ့သို့"</string>
+    <string name="setup_fingerprint_enroll_skip_title" msgid="362050541117362034">"လက်ဗွေထည့်သွင်းမှု ကျော်မလား။"</string>
+    <string name="setup_fingerprint_enroll_skip_after_adding_lock_text" msgid="958990414356204763">"လက်ဗွေသတ်မှတ်မှုသည် မိနစ်အနည်းငယ်သာ ကြာပါသည်။ ၎င်းကိုကျော်လိုက်လျှင် သင့်လက်ဗွေကို နောင်တွင် ဆက်တင်များ၌ ထည့်သွင်းနိုင်ပါသည်။"</string>
+    <string name="lock_screen_intro_skip_title" msgid="4988210105913705679">"မျက်နှာပြင်လော့ခ် ကျော်မလား။"</string>
     <string name="lock_screen_intro_skip_dialog_text_frp" product="tablet" msgid="1581834104051243425">"စက်ပစ္စည်းကာကွယ်ရန် ဝန်ဆောင်မှုများ ပွင့်မည်မဟုတ်ပါ။ ပျောက်ဆုံးသွားလျှင်၊ ခိုးခံရလျှင် သို့မဟုတ် ပြင်ဆင်သတ်မှတ်ခံရလျှင် ဤတက်ဘလက်ကို အခြားသူများအသုံးပြုခြင်းမှ ကာကွယ်နိုင်မည်မဟုတ်ပါ။"</string>
     <string name="lock_screen_intro_skip_dialog_text_frp" product="device" msgid="4629503416877189572">"စက်ပစ္စည်းကာကွယ်ရန် ဝန်ဆောင်မှုများ ပွင့်မည်မဟုတ်ပါ။ ပျောက်ဆုံးသွားလျှင်၊ ခိုးခံရလျှင် သို့မဟုတ် ပြင်ဆင်သတ်မှတ်ခံရလျှင် ဤစက်ပစ္စည်းကို အခြားသူများအသုံးပြုခြင်းမှ ကာကွယ်နိုင်မည်မဟုတ်ပါ။"</string>
     <string name="lock_screen_intro_skip_dialog_text_frp" product="default" msgid="2423428240245737909">"စက်ပစ္စည်းကာကွယ်ရန် ဝန်ဆောင်မှုများ ပွင့်မည်မဟုတ်ပါ။ ပျောက်ဆုံးသွားလျှင်၊ ခိုးခံရလျှင် သို့မဟုတ် ပြင်ဆင်သတ်မှတ်ခံရလျှင် ဤဖုန်းကို အခြားသူများအသုံးပြုခြင်းမှ ကာကွယ်နိုင်မည်မဟုတ်ပါ။"</string>
@@ -388,7 +392,7 @@
     <string name="security_settings_fingerprint_enroll_dialog_ok" msgid="4150384963879569750">"အိုကေ"</string>
     <string name="security_settings_fingerprint_enroll_dialog_delete" msgid="4114615413240707936">"ဖျက်ရန်"</string>
     <string name="security_settings_fingerprint_enroll_start_title" msgid="2068961812439460133">"အာရုံခံကိရိယာကို ထိပါ"</string>
-    <string name="security_settings_fingerprint_enroll_start_message" msgid="3909929328942564524">"သင့်လက်ချောင်းကို အာရုံခံကိရိယာ ပေါ်သို့ တင်ပေးလိုက်ကာ တုန်ခါမှုကို ခံစားရချိန်တွင် မ’ယူလိုက်ပါ"</string>
+    <string name="security_settings_fingerprint_enroll_start_message" msgid="3909929328942564524">"သင့်လက်ချောင်းကို အာရုံခံကိရိယာပေါ်သို့ တင်လိုက်ပြီး တုန်ခါမှုကို ခံစားရချိန်တွင် ပြန်ရုပ်လိုက်ပါ"</string>
     <string name="security_settings_fingerprint_enroll_repeat_title" msgid="2819679722403209778">"မြှောက်ပါ၊ ထို့နောက် ပြန်ထိပါ"</string>
     <string name="security_settings_fingerprint_enroll_repeat_message" msgid="6158989350522518586">"လက်ဗွေ၏ အစိတ်အပိုင်းအမျိုးမျိုးကို ထည့်ရန်အတွက် သင့်လက်ချောင်းကို အကြိမ်ကြိမ် ပြန်မြှောက်ပါ"</string>
     <string name="security_settings_fingerprint_enroll_finish_title" msgid="7567276170287972230">"လက်ဗွေကို ထည့်ပြီးပါပြီ"</string>
@@ -402,7 +406,7 @@
     <string name="security_settings_fingerprint_enroll_touch_dialog_message" msgid="2989019978041986175">"သင့်ဖုန်း ကျောဘက်ရှိ အာရုံခံကိရိယာကို ထိပါ။ လက်ညှိုးကို အသုံးပြုပါ။"</string>
     <string name="security_settings_fingerprint_enroll_error_dialog_title" msgid="3618021988442639280">"စာရင်းသွင်းမှု မပြီးစီးခဲ့ပါ"</string>
     <string name="security_settings_fingerprint_enroll_error_timeout_dialog_message" msgid="2942551158278899627">"လက်ဗွေ ပေးသွင်းမှု ကန့်သတ်ချိန် ကုန်သွားပြီ။ ထပ်စမ်းကြည့်ပါ။"</string>
-    <string name="security_settings_fingerprint_enroll_error_generic_dialog_message" msgid="3624760637222239293">"လက်ဗွေ ပေးသွင်းမှု အလုပ်မဖြစ်ခဲ့ပါ။ အခြား လက်ချောင်းကို သုံးရန် ထပ်စမ်းကြည်ပါ။"</string>
+    <string name="security_settings_fingerprint_enroll_error_generic_dialog_message" msgid="3624760637222239293">"လက်ဗွေထည့်သွင်းမှု အဆင်မပြေပါ။ အခြားလက်ချောင်းကို သုံးပါ သို့မဟုတ် ထပ်စမ်းကြည့်ပါ။"</string>
     <string name="fingerprint_enroll_button_add" msgid="6317978977419045463">"နောက်တစ်ခု ထည့်ရန်"</string>
     <string name="fingerprint_enroll_button_next" msgid="6247009337616342759">"ရှေ့သို့"</string>
     <string name="security_settings_fingerprint_enroll_disclaimer" msgid="2624905914239271751">"သင့်ဖုန်းကို သော့ဖွင့်ရန်အပြင်၊ သင်သည်သင့်လက်ဗွေကို ဝယ်ယူမှုများနှင့် အပ်ဖ်အသုံးပြုခွင့်ကို ခွင့်ပြုရန် အသုံးပြုနိုင်သည်။ "<annotation id="url">"ပိုမိုလေ့လာရန်"</annotation></string>
@@ -458,7 +462,7 @@
     <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="lock_settings_picker_fingerprint_added_security_message" msgid="5768002109707648463">"လုံခြုံရေး ပိုမိုကောင်းမွန်စေရန် မျက်နှာပြင်လော့ခ်ချခြင်း အရန်နည်းလမ်းတစ်ခုကို သတ်မှတ်ပါ။"</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>
@@ -482,7 +486,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>
@@ -500,29 +504,37 @@
     <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>
-    <!-- no translation found for unlock_disable_frp_warning_content_pattern_fingerprint (2986105377420905314) -->
-    <skip />
+    <string name="unlock_disable_frp_warning_content_pattern_fingerprint" msgid="2986105377420905314">"စက်ပစ္စည်းကို အကာအကွယ်ပေးသည့် ဝန်ဆောင်မှုများမှာ သင်၏ ပုံစံမပါဘဲ အလုပ်မလုပ်နိုင်ပါ။<xliff:g id="EMPTY_LINE">
+
+</xliff:g>သိမ်းဆည်းထားသော သင့်လက်ဗွေများကိုပါ ဤပရိုဖိုင်မှ ဖယ်ရှားလိုက်မည် ဖြစ်ပြီး သင်၏ပရိုဖိုင်ကို ဖွင့်ခြင်း၊ ဝယ်ယူမှုများကို ခွင့်ပြုခြင်း သို့မဟုတ် ၎င်းတို့ဖြင့် အက်ပ်များသို့ လက်မှတ်ထိုးဝင်ခြင်းများ ပြုလုပ်နိုင်တော့မည် မဟုတ်ပါ။"</string>
     <string name="unlock_disable_frp_warning_content_pin" msgid="586996206210265131">"ကိရိယာအား ကာကွယ်ရေး အင်္ဂါရပ်များမှာ သင်၏ PIN မရှိဘဲ အလုပ်မလုပ်နိုင်ပါ။"</string>
-    <!-- no translation found for unlock_disable_frp_warning_content_pin_fingerprint (3370462835533123695) -->
-    <skip />
+    <string name="unlock_disable_frp_warning_content_pin_fingerprint" msgid="3370462835533123695">"စက်ပစ္စည်းကို အကာအကွယ်ပေးသည့် ဝန်ဆောင်မှုများမှာ သင်၏ ပင်နံပါတ်မပါဘဲ အလုပ်မလုပ်နိုင်ပါ။<xliff:g id="EMPTY_LINE">
+
+</xliff:g>သိမ်းဆည်းထားသော သင့်လက်ဗွေများကိုပါ ဤပရိုဖိုင်မှ ဖယ်ရှားလိုက်မည် ဖြစ်ပြီး သင်၏ပရိုဖိုင်ကို ဖွင့်ခြင်း၊ ဝယ်ယူမှုများကို ခွင့်ပြုခြင်း သို့မဟုတ် ၎င်းတို့ဖြင့် အက်ပ်များသို့ လက်မှတ်ထိုးဝင်ခြင်းများ ပြုလုပ်နိုင်တော့မည် မဟုတ်ပါ။"</string>
     <string name="unlock_disable_frp_warning_content_password" msgid="5420612686852555537">"ကိရိယာအား ကာကွယ်ရေးဝန်ဆောင်မှုများသည် သင်၏စကားဝှက်မပါဘဲ အလုပ်မလုပ်နိုင်ပါ။"</string>
-    <!-- no translation found for unlock_disable_frp_warning_content_password_fingerprint (3595476296430536798) -->
-    <skip />
+    <string name="unlock_disable_frp_warning_content_password_fingerprint" msgid="3595476296430536798">"စက်ပစ္စည်းကို အကာအကွယ်ပေးသည့် ဝန်ဆောင်မှုများမှာ သင်၏ စကားဝှက်မပါဘဲ အလုပ်မလုပ်နိုင်ပါ။<xliff:g id="EMPTY_LINE">
+
+</xliff:g>သိမ်းဆည်းထားသော သင့်လက်ဗွေများကိုပါ ဤပရိုဖိုင်မှ ဖယ်ရှားလိုက်မည် ဖြစ်ပြီး သင်၏ပရိုဖိုင်ကို ဖွင့်ခြင်း၊ ဝယ်ယူမှုများကို ခွင့်ပြုခြင်း သို့မဟုတ် ၎င်းတို့ဖြင့် အက်ပ်များသို့ လက်မှတ်ထိုးဝင်ခြင်းများ ပြုလုပ်နိုင်တော့မည် မဟုတ်ပါ။"</string>
     <string name="unlock_disable_frp_warning_content_unknown" msgid="1550718040483548220">"ကိရိယာအား ကာကွယ်ရေး အင်္ဂါရပ်များမှာ သင်၏ မျက်မှာပြင် သော့ခတ်မှု မရှိဘဲ အလုပ်မလုပ်နိုင်ပါ။"</string>
-    <!-- no translation found for unlock_disable_frp_warning_content_unknown_fingerprint (3679351662094349506) -->
-    <skip />
+    <string name="unlock_disable_frp_warning_content_unknown_fingerprint" msgid="3679351662094349506">"စက်ပစ္စည်းကို အကာအကွယ်ပေးသည့် ဝန်ဆောင်မှုများမှာ မျက်နှာပြင်လော့ခ်မပါဘဲ အလုပ်မလုပ်နိုင်ပါ။<xliff:g id="EMPTY_LINE">
+
+</xliff:g>သိမ်းဆည်းထားသော သင့်လက်ဗွေများကိုပါ ဤပရိုဖိုင်မှ ဖယ်ရှားလိုက်မည် ဖြစ်ပြီး သင်၏ပရိုဖိုင်ကို ဖွင့်ခြင်း၊ ဝယ်ယူမှုများကို ခွင့်ပြုခြင်း သို့မဟုတ် ၎င်းတို့ဖြင့် အက်ပ်များသို့ လက်မှတ်ထိုးဝင်ခြင်းများ ပြုလုပ်နိုင်တော့မည် မဟုတ်ပါ။"</string>
     <string name="unlock_disable_frp_warning_content_pattern_profile" msgid="8682200103576359918">"သင့်ပုံစံမပါဘဲ ပရိုဖိုင်ကာကွယ်မှုအင်္ဂါရပ် အလုပ်လုပ်မည်မဟုတ်ပါ။"</string>
-    <!-- no translation found for unlock_disable_frp_warning_content_pattern_fingerprint_profile (6718155854303231675) -->
-    <skip />
+    <string name="unlock_disable_frp_warning_content_pattern_fingerprint_profile" msgid="6718155854303231675">"ပရိုဖိုင်ကို အကာအကွယ်ပေးသည့် ဝန်ဆောင်မှုများမှာ သင်၏ ပုံစံမပါဘဲ အလုပ်မလုပ်နိုင်ပါ။<xliff:g id="EMPTY_LINE">
+
+</xliff:g>သိမ်းဆည်းထားသော သင့်လက်ဗွေများကိုပါ ဤပရိုဖိုင်မှ ဖယ်ရှားလိုက်မည် ဖြစ်ပြီး သင်၏ပရိုဖိုင်ကို ဖွင့်ခြင်း၊ ဝယ်ယူမှုများကို ခွင့်ပြုခြင်း သို့မဟုတ် ၎င်းတို့ဖြင့် အက်ပ်များသို့ လက်မှတ်ထိုးဝင်ခြင်းများ ပြုလုပ်နိုင်တော့မည် မဟုတ်ပါ။"</string>
     <string name="unlock_disable_frp_warning_content_pin_profile" msgid="7790688070593867767">"သင့်ပင်နံပါတ်မပါဘဲ ပရိုဖိုင်ကာကွယ်မှုအင်္ဂါရပ် အလုပ်လုပ်မည်မဟုတ်ပါ။"</string>
-    <!-- no translation found for unlock_disable_frp_warning_content_pin_fingerprint_profile (4209564603132870532) -->
-    <skip />
+    <string name="unlock_disable_frp_warning_content_pin_fingerprint_profile" msgid="4209564603132870532">"ပရိုဖိုင်ကို အကာအကွယ်ပေးသည့် ဝန်ဆောင်မှုများမှာ သင်၏ ပင်နံပါတ်မပါဘဲ အလုပ်မလုပ်နိုင်ပါ။<xliff:g id="EMPTY_LINE">
+
+</xliff:g>သိမ်းဆည်းထားသော သင့်လက်ဗွေများကိုပါ ဤပရိုဖိုင်မှ ဖယ်ရှားလိုက်မည် ဖြစ်ပြီး သင်၏ပရိုဖိုင်ကို ဖွင့်ခြင်း၊ ဝယ်ယူမှုများကို ခွင့်ပြုခြင်း သို့မဟုတ် ၎င်းတို့ဖြင့် အက်ပ်များသို့ လက်မှတ်ထိုးဝင်ခြင်းများ ပြုလုပ်နိုင်တော့မည် မဟုတ်ပါ။"</string>
     <string name="unlock_disable_frp_warning_content_password_profile" msgid="7569285520567674461">"သင့်စကားဝှက်မပါဘဲ ပရိုဖိုင်ကာကွယ်မှုအင်္ဂါရပ် အလုပ်လုပ်မည်မဟုတ်ပါ။"</string>
-    <!-- no translation found for unlock_disable_frp_warning_content_password_fingerprint_profile (2994300676764706047) -->
-    <skip />
+    <string name="unlock_disable_frp_warning_content_password_fingerprint_profile" msgid="2994300676764706047">"ပရိုဖိုင်ကို အကာအကွယ်ပေးသည့် ဝန်ဆောင်မှုများမှာ သင်၏ စကားဝှက်မပါဘဲ အလုပ်မလုပ်နိုင်ပါ။<xliff:g id="EMPTY_LINE">
+
+</xliff:g>သိမ်းဆည်းထားသော သင့်လက်ဗွေများကိုပါ ဤပရိုဖိုင်မှ ဖယ်ရှားလိုက်မည် ဖြစ်ပြီး သင်၏ပရိုဖိုင်ကို ဖွင့်ခြင်း၊ ဝယ်ယူမှုများကို ခွင့်ပြုခြင်း သို့မဟုတ် ၎င်းတို့ဖြင့် အက်ပ်များသို့ လက်မှတ်ထိုးဝင်ခြင်းများ ပြုလုပ်နိုင်တော့မည် မဟုတ်ပါ။"</string>
     <string name="unlock_disable_frp_warning_content_unknown_profile" msgid="6984215718701688202">"သင့်မျက်နှာပြင်သော့ခတ်မှုမပါဘဲ ပရိုဖိုင်ကာကွယ်မှုအင်္ဂါရပ် အလုပ်လုပ်မည်မဟုတ်ပါ။"</string>
-    <!-- no translation found for unlock_disable_frp_warning_content_unknown_fingerprint_profile (4994062501123299418) -->
-    <skip />
+    <string name="unlock_disable_frp_warning_content_unknown_fingerprint_profile" msgid="4994062501123299418">"ပရိုဖိုင်ကို အကာအကွယ်ပေးသည့် ဝန်ဆောင်မှုများမှာ မျက်နှာပြင်လော့ခ်မပါဘဲ အလုပ်မလုပ်နိုင်ပါ။<xliff:g id="EMPTY_LINE">
+
+</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>
@@ -581,6 +593,7 @@
     <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="lockpassword_clear_label" msgid="5724429464960458155">"ရှင်းထုတ်ရန်"</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>
@@ -640,8 +653,8 @@
     <string name="bluetooth_device_context_connect_advanced" msgid="2643129703569788771">"ရွေးချယ်စရာများ"</string>
     <string name="bluetooth_menu_advanced" msgid="8572178316357220524">"အဆင့်မြင့်"</string>
     <string name="bluetooth_advanced_titlebar" msgid="2142159726881547669">"အဆင့်မြင့် ဘလူးတုသ်"</string>
-    <string name="bluetooth_empty_list_bluetooth_off" msgid="6351930724051893423">"ဘလူးတုသ်ကို ဖွင့်ထားလျှင်၊ သင်၏ ကိရိယာသည် အနီးရှိ အခြား ဘလူးတုသ် ကိရိယာများဖြင့် ဆက်သွယ်နိုင်သည်။"</string>
-    <string name="ble_scan_notify_text" msgid="1295915006005700650">"တည်နေရာမှန်ကန်မှု တိုးတက်စေရန် စနစ်အက်ပ်များနှင့် ဝန်ဆောင်မှုများသည် ဘလူးတုသ် စက်ပစ္စည်းများကို ရှာဖွေနိုင်ပါသေးသည်။ ၎င်းကို <xliff:g id="LINK_BEGIN_0">LINK_BEGIN</xliff:g>ရှာဖွေမှု ဆက်တင်များ<xliff:g id="LINK_END_1">LINK_END</xliff:g> တွင်ပြောင်းလဲနိုင်ပါသည်။"</string>
+    <string name="bluetooth_empty_list_bluetooth_off" msgid="6351930724051893423">"ဘလူးတုသ်ကိုဖွင့်ထားလျှင် သင်၏စက်သည် အနီးရှိ အခြားဘလူးတုသ်ကိရိယာများနှင့် ဆက်သွယ်နိုင်သည်။"</string>
+    <string name="ble_scan_notify_text" msgid="1295915006005700650">"တည်နေရာတိကျမှု ပိုမိုကောင်းမွန်စေရန် အက်ပ်နှင့် ဝန်ဆောင်မှုများသည် ဘလူးတုသ်ကိရိယာများကို ရှာဖွေနိုင်ပါသေးသည်။ ၎င်းကို <xliff:g id="LINK_BEGIN_0">LINK_BEGIN</xliff:g>ရှာဖွေမှု ဆက်တင်များ<xliff:g id="LINK_END_1">LINK_END</xliff:g> တွင်ပြောင်းလဲနိုင်ပါသည်။"</string>
     <string name="bluetooth_connect_failed" msgid="4500234659813241053">"ချိတ်ဆက်မရပါ။ ထပ်လုပ်ကြည့်ပါ။"</string>
     <string name="device_details_title" msgid="6576953269221085300">"စက်ပစ္စည်းဆိုင်ရာ အသေးစိတ်အချက်အလက်များ"</string>
     <string name="bluetooth_device_mac_address" msgid="2513724313558236181">"စက်ပစ္စည်း၏ ဘလူးတုသ်လိပ်စာ- <xliff:g id="ADDRESS">%1$s</xliff:g>"</string>
@@ -710,7 +723,7 @@
     <string name="wifi_error" msgid="3207971103917128179">"အမှား"</string>
     <string name="wifi_sap_no_channel_error" msgid="3108445199311817111">"5 GHz ဘန်းဤနိုင်ငံတွင်မရပါ"</string>
     <string name="wifi_in_airplane_mode" msgid="8652520421778203796">"လေယာဉ်ပျံပေါ်သုံးစနစ်"</string>
-    <string name="wifi_notify_open_networks" msgid="76298880708051981">"ပွင့်လင်းကွန်ရက် အကြောင်းကြားချက်"</string>
+    <string name="wifi_notify_open_networks" msgid="76298880708051981">"အများသုံးကွန်ရက် အကြောင်းကြားချက်"</string>
     <string name="wifi_notify_open_networks_summary" msgid="2761326999921366960">"အရည်အသွေးမြင့် အများသုံးကွန်ရက်ရှိလျှင် အကြောင်းကြားပေးရန်"</string>
     <string name="wifi_wakeup" msgid="8815640989361538036">"Wi-Fi ကို အလိုအလျောက် ဖွင့်ရန်"</string>
     <string name="wifi_wakeup_summary" msgid="2530814331062997163">"သင်၏နေအိမ်ကွန်ရက်ကဲ့သို့သော သိမ်းဆည်းထားသည့် အရည်အသွေးမြင့် ကွန်ရက်များအနီးသို့ ရောက်သည့်အခါ Wi-Fi ကို ဖွင့်လိုက်ပါမည်"</string>
@@ -724,7 +737,7 @@
     <string name="use_open_wifi_automatically_summary_scoring_disabled" msgid="593964217679325831">"အသုံးပြုရန် ကွန်ရက်အဆင့် သတ်မှတ်ပေးသူကို ရွေးချယ်ပါ"</string>
     <string name="use_open_wifi_automatically_summary_scorer_unsupported_disabled" msgid="8472122600853650258">"အသုံးပြုရန် ကိုက်ညီမှုရှိသည့် ကွန်ရက်အဆင့် သတ်မှတ်ပေးသူကို ရွေးချယ်ပါ"</string>
     <string name="wifi_install_credentials" msgid="3551143317298272860">"အသိအမှတ်ပြုလက်မှတ်များထည့်သွင်းရန်"</string>
-    <string name="wifi_scan_notify_text" msgid="5593805423071186757">"တည်နေရာမှန်ကန်မှု တိုးတက်စေရန် စနစ်အက်ပ်များနှင့် ဝန်ဆောင်မှုများသည် Wi-Fi ကွန်ရက်များကို ရှာဖွေနိုင်ပါသေးသည်။ ၎င်းကို <xliff:g id="LINK_BEGIN_0">LINK_BEGIN</xliff:g>ရှာဖွေမှု ဆက်တင်များ<xliff:g id="LINK_END_1">LINK_END</xliff:g> တွင်ပြောင်းလဲနိုင်ပါသည်။"</string>
+    <string name="wifi_scan_notify_text" msgid="5593805423071186757">"တည်နေရာမှန်ကန်မှု ကောင်းလာစေရန် စနစ်အက်ပ်များနှင့် ဝန်ဆောင်မှုများသည် Wi-Fi ကွန်ရက်များကို ရှာဖွေနိုင်ပါသေးသည်။ ၎င်းကို <xliff:g id="LINK_BEGIN_0">LINK_BEGIN</xliff:g>ရှာဖွေမှု ဆက်တင်များ<xliff:g id="LINK_END_1">LINK_END</xliff:g>တွင် ပြောင်းလဲနိုင်ပါသည်။"</string>
     <string name="wifi_scan_notify_text_scanning_off" msgid="3426075479272242098">"တည်နေရာ ပိုမိုတိကျလာစေရန် <xliff:g id="LINK_BEGIN_0">LINK_BEGIN</xliff:g>ရှာဖွေမှု ဆက်တင်များ<xliff:g id="LINK_END_1">LINK_END</xliff:g> ရှိ Wi-Fi ရှာဖွေခြင်းကို ဖွင့်ပါ။"</string>
     <string name="wifi_scan_notify_remember_choice" msgid="7104867814641144485">"နောက်ထပ်မပြပါနှင့်"</string>
     <string name="wifi_setting_sleep_policy_title" msgid="5149574280392680092">"စက်ပိတ်ထားစဉ် Wi-Fi ဖွင့်ထားပါ"</string>
@@ -737,7 +750,7 @@
     <string name="wifi_switch_away_when_unvalidated" msgid="1707247692180853058">"Wi-Fi တွင် အင်တာနက် ချိတ်ဆက်မှုမရှိတော့ပါက မိုဘိုင်းဒေတာသို့ ပြောင်းပါ။"</string>
     <string name="wifi_cellular_data_fallback_title" msgid="8753386877755616476">"မိုဘိုင်းဒေတာစနစ်သို့ အလိုအလျောက် ပြောင်းရန်"</string>
     <string name="wifi_cellular_data_fallback_summary" msgid="6375399280719867214">"Wi-Fi တွင် အင်တာနက်ချိတ်ဆက်မှု မရှိသည့်အခါ မိုဘိုင်းဒေတာကို အသုံးပြုပါ။ ဒေတာသုံးစွဲခ ကျသင့်နိုင်ပါသည်။"</string>
-    <string name="wifi_add_network" msgid="6234851776910938957">"ကွန်ယက်ထပ်ထည့်ရန်"</string>
+    <string name="wifi_add_network" msgid="6234851776910938957">"ကွန်ရက်ထပ်ထည့်ရန်"</string>
     <string name="wifi_configure_settings_preference_title" msgid="2913345003906899146">"Wi‑Fi စိတ်ကြိုက် ရွေးချယ်မှုများ"</string>
     <string name="wifi_configure_settings_preference_summary_wakeup_on" msgid="646393113104367290">"Wi‑Fi သည် အလိုအလျှောက် ပြန်ဖွင့်သည်"</string>
     <string name="wifi_configure_settings_preference_summary_wakeup_off" msgid="2782566279864356713">"Wi‑Fi သည် အလိုအလျှောက် ပြန်မဖွင့်ပါ"</string>
@@ -754,7 +767,7 @@
     <string name="wifi_menu_forget" msgid="8736964302477327114">"ကွန်ရက်အား မေ့ရန်"</string>
     <string name="wifi_menu_modify" msgid="2068554918652440105">"ကွန်ယက်အား ပြင်ရန်"</string>
     <string name="wifi_menu_write_to_nfc" msgid="7692881642188240324">"NFC တဲဂ် သို့ ရေးရန်"</string>
-    <string name="wifi_empty_list_wifi_off" msgid="8056223875951079463">"ရရှိနိုင်သည့်ကွန်ရက်များကို မြင်ရန် ဝိုင်ဖိုင်ဖွင့်ပါ"</string>
+    <string name="wifi_empty_list_wifi_off" msgid="8056223875951079463">"ရနိုင်သည့်ကွန်ရက်များကို မြင်ရန် Wi-Fi ဖွင့်ပါ"</string>
     <string name="wifi_empty_list_wifi_on" msgid="8746108031587976356">"ဝိုင်ဖိုင်ကွန်ယက်များရှာဖွေနေသည်"</string>
     <string name="wifi_empty_list_user_restricted" msgid="7322372065475939129">"သင့်မှာ Wi-Fi  ကွန်ရက်ကို ပြောင်းလဲရန် ခွင့်ပြုချက် မရှိပါ။"</string>
     <string name="wifi_more" msgid="3195296805089107950">"နောက်ထပ်"</string>
@@ -774,6 +787,7 @@
     <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,6 +824,8 @@
     <string name="wifi_wps_available_first_item" msgid="4422547079984583502">"WPSရရှိုနိုင်သည်"</string>
     <string name="wifi_wps_available_second_item" msgid="8427520131718215301">" (WPSရရှိုနိုင်သည်)"</string>
     <string name="wifi_wps_nfc_enter_password" msgid="2288214226916117159">"သင်၏ ကွန်ရက် စကားဝှက်ကို ထည့်သွင်းရန်"</string>
+    <string name="wifi_carrier_connect" msgid="8174696557882299911">"ဖုန်းကုမ္ပဏီ Wi‑Fi ကွန်ရက်"</string>
+    <string name="wifi_carrier_content" msgid="4634077285415851933">"<xliff:g id="NAME">%1%s</xliff:g> မှတစ်ဆင့် ချိတ်ဆက်ရန်"</string>
     <string name="wifi_scan_always_turnon_message" msgid="203123538572122989">"တည်နေရာ တိကျမှုနှင့် တခြားရည်ရွယ်ချက်များအတွက် ပိုကောင်းစေရန် <xliff:g id="APP_NAME">%1$s</xliff:g> သည် ဝိုင်ဖိုင်ပိတ်ထားချိန်မှာပင်လျှင် ကွန်ရက်ရှာဖွေမှုကို ဖွင့်လိုသည်။\n\n အခြား ရှာဖွေလိုသော အပလီကေးရှင်းအားလုံးကို ခွင့်ပြုရမည်လား?"</string>
     <string name="wifi_scan_always_turnoff_message" msgid="5538901671131941043">"ဒါကို ပိတ်ရန်၊ လျှံစီး မီနူးထဲက အဆင့်မြင့် ဆီကို သွားပါ။"</string>
     <string name="wifi_scan_always_confirm_allow" msgid="5355973075896817232">"ခွင့်ပြုရန်"</string>
@@ -827,6 +843,7 @@
     <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_modify" msgid="6100248070440710782">"ပြင်ဆင်ရန်"</string>
     <string name="wifi_failed_forget_message" msgid="1348172929201654986">"ကွန်ရက် မေ့ပစ်ရန် မအောင်မြင်ခဲ့ပါ"</string>
     <string name="wifi_save" msgid="3331121567988522826">"သိမ်းရန်"</string>
     <string name="wifi_failed_save_message" msgid="6650004874143815692">"ကွန်ရက်ကို မှတ်သားရန် မအောင်မြင်ခဲ့ပါ"</string>
@@ -839,6 +856,7 @@
     <string name="wifi_advanced_titlebar" msgid="4485841401774142908">"အဆင့်မြင့် 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_title" msgid="3471132676909349382">"ကွန်ရက် အချက်အလက်"</string>
     <string name="wifi_details_subnet_mask" msgid="6720279144174924410">"Subnet ကွင်းဆက်နံပါတ်"</string>
     <string name="wifi_details_dns" msgid="8648826607751830768">"DNS"</string>
     <string name="wifi_details_ipv6_address_header" msgid="6734119149106422148">"IPv6 လိပ်စာများ"</string>
@@ -871,16 +889,15 @@
     <string name="wifi_p2p_cancel_connect_title" msgid="255267538099324413">"ဖိတ်ကြားချက် ဖျက်သိမ်းမည်လား?"</string>
     <string name="wifi_p2p_cancel_connect_message" msgid="7477756213423749402">"<xliff:g id="PEER_NAME">%1$s</xliff:g> နှင့် ချိတ်ဆက်ရန် ဖိတ်ကြားချက်ကို သင်ဖျက်သိမ်းချင်သလား?"</string>
     <string name="wifi_p2p_delete_group_message" msgid="834559380069647086">"ဤအုပ်စုကိုမေ့ပစ်မည်လား?"</string>
-    <string name="wifi_tether_checkbox_text" msgid="1847167643625779136">"ခရီးဆောင် Wi-Fi  ဟော့စပေါ့"</string>
-    <string name="wifi_hotspot_checkbox_text" msgid="7763495093333664887">"ကြိုးမဲ့ ဟော့စပေါ့"</string>
+    <string name="wifi_hotspot_checkbox_text" msgid="7763495093333664887">"Wi-Fi ဟော့စပေါ့"</string>
     <string name="wifi_hotspot_off_subtext" msgid="5466126533609394170">"အင်တာနက် သို့မဟုတ် ပါဝင်သည့်အကြောင်းအရာများကို အခြားစက်ပစ္စည်းများနှင့် မျှဝေထားခြင်းမရှိပါ"</string>
     <string name="wifi_hotspot_tethering_on_subtext" product="tablet" msgid="5752490509369962007">"ဤတက်ဘလက်၏ အင်တာနက်ကို ဟော့စပေါ့မှ တစ်ဆင့် မျှဝေနေပါသည်"</string>
     <string name="wifi_hotspot_tethering_on_subtext" product="default" msgid="6461075246164300670">"ဤဖုန်း၏ အင်တာနက်ကို ဟော့စပေါ့မှ တစ်ဆင့် မျှဝေနေပါသည်"</string>
     <string name="wifi_hotspot_on_local_only_subtext" msgid="2068110388011294735">"အက်ပ်သည် ပါဝင်သည့်အကြောင်းအရာများကို မျှဝေနေပါသည်။ အင်တာနက်ကို မျှဝေရန် ဟော့စပေါ့ကို ပိတ်ပြီး ပြန်ဖွင့်ပါ"</string>
-    <string name="wifi_hotspot_name_title" msgid="1341735529132128887">"Wi‑Fi အမည်"</string>
+    <string name="wifi_hotspot_name_title" msgid="8237000746618636778">"ဟော့စပေါ့အမည်"</string>
     <string name="wifi_hotspot_name_summary_connecting" msgid="3378299995508671967">"<xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g> ကို ဖွင့်နေပါသည်..."</string>
     <string name="wifi_hotspot_name_summary_connected" msgid="3888672084861445362">"အခြားစက်ပစ္စည်းများက <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g> နှင့် ချိတ်ဆက်နိုင်ပါသည်"</string>
-    <string name="wifi_hotspot_password_title" msgid="1955592302902091281">"Wi‑Fi စကားဝှက်"</string>
+    <string name="wifi_hotspot_password_title" msgid="8676859981917573801">"ဟော့စပေါ့စကားဝှက်"</string>
     <string name="wifi_hotspot_ap_band_title" msgid="1165801173359290681">"AP လိုင်း"</string>
     <string name="wifi_hotspot_footer_info_regular" msgid="1203489406068036455">"သင်၏ အခြားစက်ပစ္စည်းများအတွက် Wi‑Fi ကွန်ရက်ကို ဖွင့်ပေးရန် ဟော့စပေါ့ကို အသုံးပြုပါ။ ဟော့စပေါ့က သင်၏ မိုဘိုင်းဒေတာဆက်သွယ်မှုကို အသုံးပြုပြီး အင်တာနက်ကို ဖန်တီးပေးနိုင်ပါသည်။ မိုဘိုင်းဒေတာသုံးစွဲခ ပိုကုန်ကျနိုင်ပါသည်။"</string>
     <string name="wifi_hotspot_footer_info_local_only" msgid="857988412470694109">"ပါဝင်သည့်အကြောင်းအရာများကို အနီးတစ်ဝိုက်ရှိ စက်ပစ္စည်းများနှင့် မျှဝေရန်အတွက် အက်ပ်များက ဟော့စပေါ့တစ်ခု ဖွင့်နိုင်ပါသည်။"</string>
@@ -891,7 +908,6 @@
     <string name="wifi_tether_configure_ap_text" msgid="7974681394041609308">"Wi-Fi ဟော့စပေါ့ သတ်မှတ်ရန်"</string>
     <string name="wifi_hotspot_configure_ap_text" msgid="5478614731464220432">"ကြိုးမဲ့ ဟော့စပေါ့ စဖွင့်သတ်မှတ်ရန်"</string>
     <string name="wifi_hotspot_configure_ap_text_summary" msgid="5560680057727007011">"AndroidAP WPA2 PSK ဟော့စပေါ့"</string>
-    <string name="wifi_tether_configure_subtext" msgid="2050196439900426456">"<xliff:g id="NETWORK_SSID">%1$s</xliff:g> <xliff:g id="NETWORK_SECURITY">%2$s</xliff:g> ဟော့စပေါ့"</string>
     <string name="wifi_tether_configure_ssid_default" msgid="8467525402622138547">"Android ဟော့စပေါ့"</string>
     <string name="wifi_calling_settings_title" msgid="4102921303993404577">"Wi-Fi  ခေါ်ဆိုမှု"</string>
     <string name="wifi_calling_suggestion_title" msgid="9008010480466359578">"Wi-Fi ခေါ်ဆိုမှုဖွင့်ပါ"</string>
@@ -932,7 +948,7 @@
     <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="emergency_address_summary" msgid="3266760199681945746">"Wi‑Fi သုံး၍ အရေးပေါ်ဖုန်းခေါ်သောအခါ အရေးပေါ်ဝန်ဆောင်မှုများက သင့်တည်နေရာအဖြစ် အသုံးပြုသော လိပ်စာ"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"ဖန်သားပြင်"</string>
     <string name="sound_settings" msgid="5534671337768745343">"အသံ"</string>
     <string name="all_volume_title" msgid="4296957391257836961">"အသံအတိုးအကျယ်"</string>
@@ -986,6 +1002,7 @@
     <string name="search_settings" msgid="1910951467596035063">"ရှာဖွေခြင်း"</string>
     <string name="search_settings_summary" msgid="9205656546570654169">"ရှာဖွေခြင်းဆက်တင်နှင့် မှတ်တမ်းအား စီမံမည်"</string>
     <string name="search_settings_no_results" msgid="8799027492641230999">"ရလဒ် တစ်ခုမျှ မရှိပါ"</string>
+    <string name="search_clear_history" msgid="4196658962573162457">"မှတ်တမ်းကို ရှင်းလင်းရန်"</string>
     <string name="display_settings" msgid="7965901687241669598">"ဖန်သားပြင်"</string>
     <string name="accelerometer_title" msgid="7854608399547349157">"မျက်နှာပြင်ကို အော်တိုလှည့်ရန်"</string>
     <string name="color_mode_title" msgid="3159275920408338215">"တောက်ပသော အရောင်များ"</string>
@@ -1032,7 +1049,7 @@
     <string name="night_display_summary_on_auto_mode_never" msgid="9117830821363119835">"မည်သည့်အခါမျှ အလိုအလျောက် ပိတ်မည် မဟုတ်ပါ"</string>
     <string name="night_display_summary_on_auto_mode_custom" msgid="5510753572245577263">"<xliff:g id="ID_1">%1$s</xliff:g> တွင် အလိုအလျောက် ပိတ်ပါမည်"</string>
     <string name="night_display_summary_on_auto_mode_twilight" msgid="852270120144683507">"နေထွက်ချိန်တွင် အလိုအလျောက် ပိတ်ပါမည်"</string>
-    <string name="screen_timeout" msgid="4351334843529712571">"ပိတ်ထားရန်"</string>
+    <string name="screen_timeout" 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>
@@ -1041,7 +1058,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>
@@ -1050,21 +1067,19 @@
     <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="ambient_display_screen_title" msgid="4252755516328775766">"ဝန်းကျင်ပြသမှု"</string>
-    <!-- no translation found for ambient_display_screen_summary_always_on (7337555569694794132) -->
-    <skip />
+    <string name="ambient_display_screen_summary_always_on" msgid="7337555569694794132">"အမြဲဖွင့်ထားရန် / ဘက်ထရီအသုံးပြုမှု တိုးလာသည်"</string>
     <string name="ambient_display_screen_summary_notifications" msgid="1449570742600868654">"အကြောင်းကြားချက်အသစ်များ"</string>
     <string name="ambient_display_category_triggers" msgid="4359289754456268573">"ပြသရမည့်အချိန်"</string>
     <string name="doze_title" msgid="2375510714460456687">"အကြောင်းကြားချက်အသစ်များ"</string>
-    <string name="doze_summary" msgid="3846219936142814032">"အကြောင်းကြားချက်များ သင်လက်ခံရရှိချိန်တွင် ဖန်သားပြင်ကို ဖွင့်ခိုင်းပါ"</string>
+    <string name="doze_summary" msgid="3846219936142814032">"အကြောင်းကြားချက်များ လက်ခံရရှိချိန်တွင် ဖန်သားပြင်ကို နှိုးပါ"</string>
     <string name="doze_always_on_title" msgid="1046222370442629646">"အမြဲတမ်း ဖွင့်ထားရန်"</string>
-    <!-- no translation found for doze_always_on_summary (6978257596231155345) -->
-    <skip />
+    <string name="doze_always_on_summary" msgid="6978257596231155345">"အချိန်၊ အကြောင်းကြားချက်သင်္ကေတများနှင့် အခြားအချက်အလက်များကို ပြသပါ။ ဘက်ထရီအသုံးပြုမှု တိုးလာသည်။"</string>
     <string name="title_font_size" msgid="4405544325522105222">"စာလုံးအရွယ်အစား"</string>
     <string name="short_summary_font_size" msgid="6819778801232989076">"စာလုံးကို ပိုကြီးအောင် သို့မဟုတ် ပိုသေးအောင်ပြုလုပ်ပါ"</string>
     <string name="sim_lock_settings" msgid="3392331196873564292">"ဆင်းမ်ကဒ် လော့ခ်ဆက်တင်များ"</string>
@@ -1108,16 +1123,15 @@
     <string name="device_info_settings" product="default" msgid="475872867864762157">"ဖုန်းအခြေအနေ"</string>
     <string name="system_update_settings_list_item_title" msgid="3342887311059985961">"စနစ်အားတိုးမြင့်ခြင်း"</string>
     <string name="system_update_settings_list_item_summary" msgid="3853057315907710747"></string>
-    <string name="firmware_version" msgid="4801135784886859972">"Androidဗားရှင်း"</string>
+    <string name="firmware_version" msgid="4801135784886859972">"Android ဗားရှင်း"</string>
     <string name="security_patch" msgid="8438384045870296634">"Android လုံခြုံမှု ပက်ခ်ျ အဆင့်"</string>
     <string name="model_info" msgid="1952009518045740889">"မော်ဒယ်"</string>
-    <string name="hardware_info" msgid="2605080746512527805">"မော်ဒယ်နှင့် စက်ပစ္စည်းဆိုင်ရာ"</string>
+    <string name="hardware_info" msgid="2605080746512527805">"မော်ဒယ်နှင့် စက်ပစ္စည်း"</string>
     <string name="hardware_revision" msgid="8893547686367095527">"စက်ပစ္စည်းဗားရှင်း"</string>
     <string name="fcc_equipment_id" msgid="149114368246356737">"စက်ပစ္စည်း အမှတ်"</string>
     <string name="baseband_version" msgid="1848990160763524801">"baseband ဗားရှင်း"</string>
-    <string name="kernel_version" msgid="9192574954196167602">"kernelဗားရှင်း"</string>
+    <string name="kernel_version" msgid="9192574954196167602">"Kernel ဗားရှင်း"</string>
     <string name="build_number" msgid="3075795840572241758">"တည်ဆောင်မှုနံပါတ်"</string>
-    <string name="selinux_status" msgid="6212165375172061672">"SELinux အခြေအနေ"</string>
     <string name="device_info_not_available" msgid="8062521887156825182">"မရရှိနိုင်ပါ"</string>
     <string name="device_status_activity_title" msgid="1411201799384697904">"အခြေအနေ"</string>
     <string name="device_status" msgid="607405385799807324">"အခြေအနေ"</string>
@@ -1145,7 +1159,6 @@
     <string name="status_wifi_mac_address" msgid="2202206684020765378">"Wi-Fi ၏ MAC လိပ်စာ"</string>
     <string name="status_bt_address" msgid="4195174192087439720">"ဘလူးတုသ်လိပ်စာ"</string>
     <string name="status_serial_number" msgid="2257111183374628137">"စက်မှတ်ပုံတင်နံပါတ်"</string>
-    <string name="status_unavailable" msgid="7862009036663793314">"မရရှိနိုင်ပါ။"</string>
     <string name="status_up_time" msgid="7294859476816760399">"ဖွင့်ထားသောအချိန်"</string>
     <string name="status_awake_time" msgid="2393949909051183652">"ပြန်ပွင့်မည်အချိန်"</string>
     <string name="internal_memory" msgid="9129595691484260784">"စက်တွင်း သိုလှောင်ထားမှု"</string>
@@ -1320,7 +1333,8 @@
     <string name="restore_default_apn" msgid="8178010218751639581">"မူရင်း APNဆက်တင်များကိုပြန်လည်ရယူစေမည်"</string>
     <string name="menu_restore" msgid="8260067415075573273">"စနစ်အား မူလစက်ရုံအခြအေနေထံ ပြန်လည်သတ်မှတ်ရန်"</string>
     <string name="restore_default_apn_completed" msgid="2824775307377604897">"APN ၏မူရင်းအပြင်အဆင်များကို အစသို့ပြန်လည်စတင်မှုအား ပြီးဆုံးပါပြီ"</string>
-    <string name="reset_dashboard_title" msgid="6254873816990678620">"ပြင်ဆင်သတ်မှတ်ခြင်း ရွေးချယ်စရာများ"</string>
+    <string name="reset_dashboard_title" msgid="6254873816990678620">"ပြန်သတ်မှတ်ရန်ရွေးစရာများ"</string>
+    <string name="reset_dashboard_summary" msgid="4851012632493522755">"ကွန်ရက်၊ အက်ပ် (သို့) ကိရိယာများကို ပြင်ဆင်သတ်မှတ်နိုင်ပါသည်"</string>
     <string name="reset_network_title" msgid="6166025966016873843">"Wi-Fi၊ မိုဘိုင်းနှင့် ဘလူးတုသ်ကို ပြင်ဆင်သတ်မှတ်ရန်"</string>
     <string name="reset_network_desc" msgid="5547979398298881406">"၎င်းသည် အောက်ပါတို့အပါအဝင် ကွန်ရက်ဆက်တင်များအားလုံးကို ပြင်ဆင်သတ်မှတ်လိုက်ပါမည်−\n\n"<li>"Wi‑Fi"</li>\n<li>"မိုဘိုင်းဒေတာ"</li>\n<li>"ဘလူးတုသ်"</li></string>
     <string name="reset_network_button_text" msgid="2035676527471089853">"ဆက်တင်များ ပြန်လည်သတ်မှတ်ရန်"</string>
@@ -1329,17 +1343,14 @@
     <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="6617679904229218425">"ဒေတာအားလုံးကို ဖျက်ရန် (စက်ရုံထုတ်ဆက်တင်အတိုင်း ပြင်ဆင်သတ်မှတ်ရန်)"</string>
-    <plurals name="master_clear_with_account_summary" formatted="false" msgid="5911377203778818712">
-      <item quantity="other">အကောင့် <xliff:g id="ACCOUNT_COUNT">%1$d</xliff:g> ခုကို ပြင်ဆင်သတ်မှတ်လိုက်ပါမည်</item>
-      <item quantity="one">အကောင့် ၁ ခုကို ပြင်ဆင်သတ်မှတ်လိုက်ပါမည်</item>
-    </plurals>
-    <string name="master_clear_summary" msgid="6902443944660426951">"စက်တွင်းသိုလှောင်ခန်းနှင့် ဒေတာအားလုံးကို ပြင်ဆင်သတ်မှတ်လိုက်ပါမည်"</string>
+    <string name="master_clear_title" msgid="3531267871084279512">"ဒေတာအားလုံးကို ဖျက်ရန် (စက်ရုံထုတ်ဆက်တင်အတိုင်း ပြင်ဆင်သတ်မှတ်ရန်)"</string>
     <string name="master_clear_desc" product="tablet" msgid="9146059417023157222">"ဤသည်မှာ သင့်တက်ဘလက်ထဲရှိ"<b></b>"သင့်ဂူးဂဲလ်အကောင့်\n\n"<li>"စနစ်နှင့် အက်ပ်ဒေတာနှင့် ဆက်တင်များ"</li>\n<li>"ဒေါင်းလုပ်ပြုလုပ်ထားသော အက်ပ်"</li>"iအပါအဝင်\n"<li>"စက်အတွင်းသိမ်းဆည်းထားခြင်း"</li>"များကို ဖျက်ပါလိမ့်မည်"</string>
-    <string name="master_clear_desc" product="default" msgid="4800386183314202571">"ဤသည်မှာ သင့်ဖုန်းထဲရှိ\n"<li>"သင့်ဂူးဂဲလ်အကောင့်"</li>\n<li>"စနစ်နှင့် အက်ပ်ဒေတာနှင့် အဆင်အပြင်များ"</li>\n<li>"ဒေါင်းလုပ်ပြုလုပ်ထားသော အက်ပ်"</li>"iအပါအဝင်\n"<b>"စက်အတွင်းသိမ်းဆည်းထားခြင်း"</b>"များကို ဖျက်ပါလိမ့်မည်"</string>
-    <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"သင်သည် လက်ရှိဤအကောင့်များကို ဆိုင်းအင်လုပ်ထားပါသည်\n"</string>
+    <string name="master_clear_desc" product="default" msgid="4800386183314202571">"ဤသည်က သင့်ဖုန်း၏"<b>"စက်အတွင်းသိုလှောင်မှု"</b>" အပါအဝင် အောက်ပါတို့ကို ဖျက်ပါလိမ့်မည်- \n\n"<li>"သင်၏ Google အကောင့်"</li>\n<li>"စနစ်နှင့် အက်ပ်ဒေတာ၊ ဆက်တင်များ၊"</li>\n<li>"ဒေါင်းလုဒ်လုပ်ထားသည့်အက်ပ်များ"</li></string>
+    <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"သင်သည် လက်ရှိတွင် အောက်ပါအကောင့်များကို ဝင်ရောက်ထားပါသည်\n"</string>
     <string name="master_clear_other_users_present" product="default" msgid="5161423070702470742">\n\n"ဤစက်ပစ္စည်းပေါ်တွင် အခြားအသုံးပြုသူများလဲ ရှိသည်။\n"</string>
     <string name="master_clear_desc_also_erases_external" msgid="1903185203791274237"><li>"သီချင်း"</li>\n<li>"ဓာတ်ပုံများ"</li>\n<li>"အသုံးပြုသူ၏တခြားဒေတာ"</li></string>
+    <string name="master_clear_desc_also_erases_esim" msgid="312352697653096008"><li>"eSIM ရှိ ဖုန်းကုမ္ပဏီများ"</li></string>
+    <string name="master_clear_desc_no_cancel_mobile_plan" msgid="5460926449093211144">\n\n"၎င်းက သင်၏ မိုဘိုင်းဝန်ဆောင်မှုအစီအစဉ်ကို ဖျက်သိမ်းမည်မဟုတ်ပါ။"</string>
     <string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="7744115866662613411">\n\n"သီချင်း၊ ပုံများနှင့် အသုံးပြုသူ၏တခြားဒေတာများကို ရှင်းလင်းရန်အတွက်"<b>"USBသိုလှောင်ကိရိယာ"</b>"အား ဖျက်ရန်လိုအပ်ပါသည်။"</string>
     <string name="master_clear_desc_erase_external_storage" product="default" msgid="4801026652617377093">\n\n"သီချင်း၊ ပုံများနှင့် တခြားသောအသုံးပြုသူ၏ဒေတာများကို ရှင်းလင်းရန်အတွက်"<b>"SDကဒ်"</b>"အား ဖျက်ရန်လိုအပ်ပါသည်။"</string>
     <string name="erase_external_storage" product="nosdcard" msgid="969364037450286809">"USBသိုလှောင်ကိရိယာအား ဖျက်ခြင်း"</string>
@@ -1350,7 +1361,7 @@
     <string name="erase_esim_storage_description" product="default" msgid="708691303677321598">"ဖုန်းထဲရှိ eSIMs အားလုံးကို ဖျက်လိုက်ပါ။ ဤသို့ပြုလုပ်ခြင်းဖြင့် သင်၏ မိုဘိုင်းဝန်ဆောင်မှု အစီအစဉ်ကို ဖျက်သိမ်းလိမ့်မည်မဟုတ်ပါ။"</string>
     <string name="erase_esim_storage_description" product="tablet" msgid="1780953956941209107">"တက်ဘလက်ထဲရှိ eSIMs အားလုံးကို ဖျက်လိုက်ပါ။ ၎င်းသည် သင်၏ မိုဘိုင်းဝန်ဆောင်မှု အစီအစဉ်ကို ပယ်ဖျက်လိုက်မည်မဟုတ်ပါ။"</string>
     <string name="master_clear_button_text" product="tablet" msgid="3130786116528304116">"တက်ဘလက်ကို အစမှပြန်လည်စတင်စေရန်"</string>
-    <string name="master_clear_button_text" product="default" msgid="7550632653343157971">"ဖုန်းကို အစမှပြန်လည်စတင်စေရန်"</string>
+    <string name="master_clear_button_text" product="default" msgid="7550632653343157971">"ဖုန်းကို ပြန်သတ်မှတ်ရန်"</string>
     <string name="master_clear_final_desc" msgid="7318683914280403086">"သင့်ကိုယ်ပိုင်အချက်အလက်များနှင့် ဒေါင်းလုပ်ပြုလုပ်ထားသောအပလီကေးရှင်းများကို ဖျက်မည်လား? ဤလုပ်ဆောင်ချက်ကို ပြန်လည်နောက်ပြန်၍မရပါ!"</string>
     <string name="master_clear_final_button_text" msgid="5390908019019242910">"အားလုံးကိုဖျက်ရန်"</string>
     <string name="master_clear_failed" msgid="2503230016394586353">"စနစ်အားရှင်းလင်းခြင်းဝန်ဆောင်မှုမရှိသောကြောင့် အစမှပြန်လည်စတင်နိုင်ခြင်းအားမပြုလုပ်နိုင်ပါ"</string>
@@ -1456,15 +1467,16 @@
     <string name="settings_safetylegal_activity_title" msgid="6901214628496951727">"လုံခြုံမှုဆိုင်ရာအချက်အလက်များ"</string>
     <string name="settings_safetylegal_activity_unreachable" msgid="250674109915859456">"သင့်တွင်ဒေတာဆက်သွယ်မှုမရှိပါ။ ဤကြောင်းကြားချက်ကိုကြည့်ရန်အတွက် အင်တာနက်ဆက်သွယ်မှုရှိသည့် မည်သည့်ကွန်ပြုတာမှမဆို %sထံသွားပါ။"</string>
     <string name="settings_safetylegal_activity_loading" msgid="8059022597639516348">"ဖွင့်နေဆဲ…"</string>
-    <string name="lockpassword_choose_your_password_header" msgid="8624900666929394990">"သင့်စကားဝှက်ကိုရွေးချယ်ပါ"</string>
-    <string name="lockpassword_choose_your_password_header_for_fingerprint" msgid="6624409510609085450">"လက်ဗွေသုံးရန် စကားဝှက်သတ်မှတ်ပါ"</string>
-    <string name="lockpassword_choose_your_pattern_header" msgid="6949761069941694050">"သင့်ပုံစံအား ရွေးပါ"</string>
-    <string name="lockpassword_choose_your_pattern_header_for_fingerprint" msgid="5901096361617543819">"လက်ဗွေသုံးရန် ပုံစံသတ်မှတ်ပါ"</string>
-    <string name="lockpassword_choose_your_pin_header" msgid="7598849519816138302">"သင့်ပင်နံပါတ်အား ရွေးပါ"</string>
-    <string name="lockpassword_choose_your_pin_header_for_fingerprint" msgid="765344692615917183">"လက်ဗွေသုံးရန် ပင်သတ်မှတ်ပါ"</string>
-    <string name="lockpassword_confirm_your_password_header" msgid="6308478184889846633">"သင့်စကားဝှက်ကို အတည်ပြုပါ"</string>
+    <string name="lockpassword_choose_your_screen_lock_header" msgid="3872462096767152394">"မျက်နှာပြင်လော့ခ်တစ်ခုကို သတ်မှတ်ပါ"</string>
+    <string name="lockpassword_choose_your_password_message" msgid="1197569283524841412">"လုံခြုံရေးအတွက် စကားဝှက်တစ်ခု သတ်မှတ်ပါ"</string>
+    <string name="lockpassword_choose_your_password_header_for_fingerprint" msgid="2541818487015343503">"လက်ဗွေကို အသုံးပြုရန် စကားဝှက်သတ်မှတ်ပါ"</string>
+    <string name="lockpassword_choose_your_pattern_header_for_fingerprint" msgid="7709785406243556723">"လက်ဗွေကို အသုံးပြုရန် ပုံစံသတ်မှတ်ပါ"</string>
+    <string name="lockpassword_choose_your_pin_message" msgid="1875420718677275646">"လုံခြုံရေးအတွက် ပင်နံပါတ်တစ်ခု သတ်မှတ်ပါ"</string>
+    <string name="lockpassword_choose_your_pin_header_for_fingerprint" msgid="1549639053195796674">"လက်ဗွေကိုသုံးရန် ပင်နံပါတ်သတ်မှတ်ပါ"</string>
+    <string name="lockpassword_choose_your_pattern_message" msgid="5986983400689720015">"လုံခြုံရေးအတွက် ပုံစံတစ်ခု သတ်မှတ်ပါ"</string>
+    <string name="lockpassword_confirm_your_password_header" msgid="1266027268220850931">"သင့်စကားဝှက်ကို ပြန်ထည့်ပါ"</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="7744513791910572550">"သင့်ပင်နံပါတ်ကို ပြန်ထည့်ပါ"</string>
     <string name="lockpassword_confirm_passwords_dont_match" msgid="5140892109439191415">"စကားဝှက်များ မတူပါ။"</string>
     <string name="lockpassword_confirm_pins_dont_match" msgid="7226244811505606217">"ပင်နံပါတ် မတူပါ။"</string>
     <string name="lockpassword_choose_lock_generic_header" msgid="3811438094903786145">"လော့ခ်ဖွင့်ရန် ရွေးချယ်မှု"</string>
@@ -1477,18 +1489,18 @@
     <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>
-    <!-- no translation found for lockpassword_strong_auth_required_device_pattern (530802132223800623) -->
-    <skip />
-    <!-- no translation found for lockpassword_strong_auth_required_device_pin (7829294830078036417) -->
-    <skip />
-    <!-- no translation found for lockpassword_strong_auth_required_device_password (3552644641574796973) -->
-    <skip />
-    <!-- no translation found for lockpassword_strong_auth_required_work_pattern (3003781907040522053) -->
-    <skip />
-    <!-- no translation found for lockpassword_strong_auth_required_work_pin (3367491332598821552) -->
-    <skip />
-    <!-- no translation found for lockpassword_strong_auth_required_work_password (8159775129968582940) -->
-    <skip />
+    <string name="lockpassword_strong_auth_required_device_pattern" msgid="530802132223800623">"လုံခြုံရေး ပိုကောင်းစေရန် သင်၏ စက်ပစ္စည်းပုံစံကို သုံးပါ"</string>
+    <string name="lockpassword_strong_auth_required_device_pin" msgid="7829294830078036417">"လုံခြုံရေး ပိုကောင်းစေရန် သင်၏ စက်ပစ္စည်းပင်နံပါတ်ကို ထည့်ပါ"</string>
+    <string name="lockpassword_strong_auth_required_device_password" msgid="3552644641574796973">"လုံခြုံရေး ပိုကောင်းစေရန် သင်၏ စက်ပစ္စည်းလျှို့ဝှက်စကားလုံးကို ထည့်ပါ"</string>
+    <string name="lockpassword_strong_auth_required_work_pattern" msgid="3003781907040522053">"လုံခြုံရေး ပိုကောင်းစေရန် သင်၏အလုပ် ပုံစံကို သုံးပါ"</string>
+    <string name="lockpassword_strong_auth_required_work_pin" msgid="3367491332598821552">"လုံခြုံရေး ပိုကောင်းစေရန် သင်၏အလုပ် ပင်နံပါတ်ကို ထည့်ပါ"</string>
+    <string name="lockpassword_strong_auth_required_work_password" msgid="8159775129968582940">"လုံခြုံရေး ပိုကောင်းစေရန် သင်၏အလုပ် လျှို့ဝှက်စကားလုံးကို ထည့်ပါ"</string>
+    <string name="lockpassword_confirm_your_pattern_details_frp" msgid="6757336656791723193">"သင့်ဖုန်းကို စက်ရုံဆက်တင်သို့ ပြင်ဆင်သတ်မှတ်ထားပါသည်။ ဤဖုန်းအား အသုံးပြုရန် ယခင် ပုံစံကို ထည့်ပါ။"</string>
+    <string name="lockpassword_confirm_your_pin_details_frp" msgid="826520613445990470">"သင့်ဖုန်းကို စက်ရုံဆက်တင်သို့ ပြင်ဆင်သတ်မှတ်ထားပါသည်။ ဤဖုန်းအားအသုံးပြုရန် ယခင် ပင်နံပါတ်ကို ထည့်ပါ။"</string>
+    <string name="lockpassword_confirm_your_password_details_frp" msgid="8944081074615739040">"သင့်ဖုန်းကို စက်ရုံဆက်တင်သို့ ပြင်ဆင်သတ်မှတ်ထားပါသည်။ ဤဖုန်းအား အသုံးပြုရန် ယခင် စကားဝှက်ကို ထည့်ပါ။"</string>
+    <string name="lockpassword_confirm_your_pattern_header_frp" msgid="2898036091609128286">"ပုံစံကို အတည်ပြုပါ"</string>
+    <string name="lockpassword_confirm_your_pin_header_frp" msgid="4141601774778898803">"ပင်နံပါတ်ကို အတည်ပြုပါ"</string>
+    <string name="lockpassword_confirm_your_password_header_frp" msgid="3762615419295360480">"စကားဝှက်ကို အတည်ပြုပါ"</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>
@@ -1538,7 +1550,6 @@
     <string name="install_applications_title" msgid="4987712352256508946">"အက်ပ်ရင်းမြစ်များ ခွင့်ပြုရန်"</string>
     <string name="recent_app_category_title" msgid="6673071268966003928">"မကြာသေးမီက ဖွင့်ထားသော အက်ပ်များ"</string>
     <string name="see_all_apps_title" msgid="1317153498074308438">"အက်ပ် <xliff:g id="COUNT">%1$d</xliff:g> ခုလုံးကို ကြည့်ရန်"</string>
-    <string name="recent_app_summary" msgid="3366446669844932300">"ပြီးခဲ့သည့် <xliff:g id="TIME">^1</xliff:g> က"</string>
     <string name="install_all_warning" product="tablet" msgid="8310489909586138165">"သင်၏တက်ဘလက်နှင့် ကိုယ်ရေးကိုယ်တာ အချက်အလက်များသည် အမျိုးအမည် မသိသောအက်ပ်များ၏ တိုက်ခိုက်ခြင်းကို ပိုမိုခံရနိုင်ပါသည်။ ဤနေရာမှ ရယူထားသည့် အက်ပ်များကို ထည့်သွင်းအသုံးပြုခြင်းဖြင့် ဖြစ်ပေါ်လာနိုင်သော ဖုန်းပျက်စီးမှု သို့မဟုတ် ဒေတာဆုံးရှုံးမှုများအတွက် သင့်ထံ၌သာ တာဝန်ရှိကြောင်းကို သင်က သဘောတူရာရောက်ပါသည်။"</string>
     <string name="install_all_warning" product="default" msgid="1952257127370115988">"သင်၏ဖုန်းနှင့် ကိုယ်ရေးကိုယ်တာ အချက်အလက်များသည် အမျိုးအမည် မသိသောအက်ပ်များ၏ တိုက်ခိုက်ခြင်းကို ပိုမိုခံရနိုင်ပါသည်။ ဤနေရာမှ ရယူထားသည့် အက်ပ်များကို ထည့်သွင်းအသုံးပြုခြင်းဖြင့် ဖြစ်ပေါ်လာနိုင်သော ဖုန်းပျက်စီးမှု သို့မဟုတ် ဒေတာဆုံးရှုံးမှုများအတွက် သင့်ထံ၌သာ တာဝန်ရှိကြောင်းကို သင်က သဘောတူရာရောက်ပါသည်။"</string>
     <string name="advanced_settings" msgid="1777249286757067969">"အဆင့်မြင့်အပြင်အဆင်များ"</string>
@@ -1558,7 +1569,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>
@@ -1802,7 +1813,7 @@
     <string name="accessibility_settings_summary" msgid="981260486011624939">"မျက်နှာပြင် ဖတ်စနစ်များ၊ မျက်နှာပြင် ပြသမှု၊ အပြန်အလှန်ဆက်သွယ်ချက် ထိန်းချုပ်မှုများ"</string>
     <string name="vision_settings_title" msgid="4204111425716868288">"မြင်ကွင်း ဆက်တင်များ"</string>
     <string name="vision_settings_description" msgid="5679491180156408260">"သင့်လိုအပ်ချက်များနှင့် ကိုက်ညီမှုရှိစေရန် ဤစက်ပစ္စည်းကို သင့်စိတ်ကြိုက်ပြင်ဆင်နိုင်သည်။ သုံးရလွယ်သည့် ဤဝန်ဆောင်မှုများကို ဆက်တင်များထဲ၌ နောက်ပိုင်းတွင် ပြောင်းလဲနိုင်သည်။"</string>
-    <string name="vision_settings_suggestion_title" msgid="917294957154878441">"စာလုံးအရွယ်အစားကို ကြီးအောင်ပြုလုပ်ရန်"</string>
+    <string name="vision_settings_suggestion_title" msgid="8058794060304707004">"စာလုံးအရွယ်အစားပြောင်းရန်"</string>
     <string name="screen_reader_category_title" msgid="7739154903913400641">"မျက်နှာပြင် ဖတ်စနစ်များ"</string>
     <string name="audio_and_captions_category_title" msgid="3420727114421447524">"အသံနှင့် ဖန်သားပြင်ပေါ်ရှိ စာသား"</string>
     <string name="display_category_title" msgid="685461049938269166">"မျက်နှာပြင်ပြသမှု"</string>
@@ -1839,7 +1850,6 @@
     <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="preference_summary_default_combination" msgid="8532964268242666060">"<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>
@@ -1930,7 +1940,7 @@
     <string name="print_menu_item_add_printers" msgid="2890738028215834012">"ပရင်တာများထည့်ရန်"</string>
     <string name="print_feature_state_on" msgid="8098901852502441048">"ပွင့်နေသည်"</string>
     <string name="print_feature_state_off" msgid="7294876968403966040">"ပိတ်ထားသည်"</string>
-    <string name="print_menu_item_add_service" msgid="3811645167869797802">"ဆားဗစ် အသစ်ထည့်ရန်"</string>
+    <string name="print_menu_item_add_service" msgid="3811645167869797802">"ဝန်ဆောင်မှုထည့်ရန်"</string>
     <string name="print_menu_item_add_printer" msgid="8251218970577291032">"ပရင်တာ ထည့်ရန်"</string>
     <string name="print_menu_item_search" msgid="7025589328240514553">"ရှာဖွေခြင်း"</string>
     <string name="print_searching_for_printers" msgid="4680248496457576358">"စာထုတ်စက်များကို ရှာနေပါသည်"</string>
@@ -1958,12 +1968,14 @@
     <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_whitelisted" msgid="7375400051141016808">"အက်ပ်အတွက် ဘက်ထရီအသုံးပြုမှု လျှော့ချ၍ မရနိုင်ပါ"</string>
+    <string name="background_activity_warning_dialog_title" msgid="2216249969149568871">"နောက်ခံလုပ်ဆောင်ချက်ကို ကန့်သတ်လိုပါသလား။"</string>
+    <string name="background_activity_warning_dialog_text" msgid="7049624449246121981">"အက်ပ်အတွက် နောက်ခံလုပ်ဆောင်ချက်ကို ကန့်သတ်လိုက်ပါက ပုံမှန်အလုပ်လုပ်မည် မဟုတ်ပါ"</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" msgid="6393929085382334341">"အားအပြည့်သွင်းပြီးကတည်းက အက်ပ်အသုံးပြုချိန် (<xliff:g id="RELATIVE_TIME">^1</xliff:g>)"</string>
+    <string name="power_usage_list_summary_device" msgid="4461926045610455423">"အားအပြည့်သွင်းပြီးကတည်းက စက်ပစ္စည်းအသုံးပြုချိန် (<xliff:g id="RELATIVE_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>
@@ -2013,14 +2025,14 @@
     <string name="dialog_location_message" product="device" msgid="6783678153382298295">"အက်ပ်ကို အသုံးပြုနေခြင်း မရှိသော်လည်း <xliff:g id="APP">%1$s</xliff:g> သည် သင်၏တည်နေရာကို အမြဲတောင်းဆိုနေသောကြောင့် သင်၏စက်ပစ္စည်းသည် ဘက်ထရီကို ပုံမှန်စီမံခန့်ခွဲ၍ မရပါ။\n\nဤပြဿနာကို ဖြေရှင်းရန် ဤအက်ပ်အတွက် တည်နေရာဝန်ဆောင်မှုကို ပိတ်ထားနိုင်ပါသည်။"</string>
     <string name="dialog_location_ok" msgid="4572391197601313986">"ပိတ်ရန်"</string>
     <string name="power_screen" msgid="3023346080675904613">"မှန်သားမျက်နှာပြင်"</string>
-    <string name="power_flashlight" msgid="7794409781003567614">"ဖလက်ရှမီး"</string>
+    <string name="power_flashlight" msgid="7794409781003567614">"ဖလက်ရှ်မီး"</string>
     <string name="power_camera" msgid="4976286950934622605">"ကင်မရာ"</string>
     <string name="power_wifi" msgid="1135085252964054957">"Wi-Fi"</string>
     <string name="power_bluetooth" msgid="4373329044379008289">"ဘလူးတုသ်"</string>
-    <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>
@@ -2209,14 +2221,14 @@
     <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">"စကားဝှက်မှာ အနည်းဆုံးအက္ခရာ(၈)ခုရှိရမည်"</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_configure_lock_screen_hint" msgid="8058230497337529036">"ယုံကြည်စိတ်ချရသော သိုလှောင်ရာနေရာကို မသုံးနိုင်မီ သင့်စက်ပစ္စည်းတွင် လုံခြုံသော လော့ခ်ချထားချိန် မျက်နှာပြင်စနစ်ကို သတ်မှတ်ရပါမည်"</string>
+    <string name="credentials_configure_lock_screen_button" msgid="253239765216055321">"လော့ခ်ကို သတ်မှတ်ရန်"</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>
@@ -2265,7 +2277,7 @@
     <string name="wifi_setup_title_connected_network" msgid="1608788657122010919">"ဝိုင်ဖိုင်ကွန်ရက် <xliff:g id="NETWORK_NAME">%s</xliff:g> ကို ချိတ်ဆက်ထားသည်"</string>
     <string name="wifi_setup_title_add_network" msgid="6932651000151032301">"ကွန်ယက်အား ထပ်ထည့်ရန်"</string>
     <string name="wifi_setup_not_connected" msgid="6997432604664057052">"ဆက်သွယ်မှု  မရှိပါ"</string>
-    <string name="wifi_setup_add_network" msgid="5939624680150051807">"ကွန်ယက်ထပ်ထည့်ရန်"</string>
+    <string name="wifi_setup_add_network" msgid="5939624680150051807">"ကွန်ရက်ထပ်ထည့်ရန်"</string>
     <string name="wifi_setup_refresh_list" msgid="3411615711486911064">"ပြန်လည်ဆန်းသစ်ရန် စာရင်း"</string>
     <string name="wifi_setup_skip" msgid="6661541841684895522">"ကျော်ရန်"</string>
     <string name="wifi_setup_next" msgid="3388694784447820477">"ရှေ့သို့"</string>
@@ -2336,8 +2348,6 @@
     <skip />
     <string name="cant_sync_dialog_title" msgid="2777238588398046285">"ထပ်တူကိုက်ညီရန် လူအားဖြင့်ပြုလုပ်၍မရပါ"</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">"အန်ဒရွိုက်ကို စရန်၊ သင်၏ စကားဝှက်ကို ရိုက်ထည့်ပါ"</string>
     <string name="enter_pin" msgid="5305333588093263790">"အန်ဒရွိုက်ကို စရန်၊ သင်၏ PIN ကို ရိုက်ထည့်ပါ"</string>
     <string name="enter_pattern" msgid="4187435713036808566">"အန်ဒရွိုက်ကို စရန်၊ သင်၏ ပုံဆွဲပုံစံကို ရေးဆွဲပါ"</string>
@@ -2351,6 +2361,7 @@
     <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_plan_usage_manage_plans_button_text" msgid="8997761990902708162">"အစီအစဉ်များ စီမံရန်"</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>
@@ -2406,8 +2417,8 @@
     <string name="data_usage_app_restrict_dialog_title" msgid="1613108390242737923">"နောက်ခံဒေတာ ကန့်သတ်မည်လား?"</string>
     <string name="data_usage_app_restrict_dialog" msgid="1466689968707308512">"မိုဘိုင်းလ်ကွန်ရက်သာ ရှိနေသောအချိန်တွင် ဤအစီအစဥ်သည် နောက်ခံ အချက်အလက် အသုံးပြုခြင်းကို မှီခိုနေသော အပလီကေးရှင်းတစ်ခု အလုပ်လုပ်ခြင်းကို ရပ်စေနိုင်သည်။\n\nအပလီကေးရှင်းထဲမှ ဆက်တင်များထဲတွင် ပိုမိုသင့်လျော်သော ဒေတာအသုံးပြုခြင်းထိန်းချုပ်မှုများကို ရှာဖွေနိုင်သည်။"</string>
     <string name="data_usage_restrict_denied_dialog" msgid="55012417305745608">"မိုဘိုင်းဒေတာကို ကန့်သတ်မှုပြုလုပ်ထားသည့် အခါတွင်သာ နောက်ခံ၌ ဒေတာအသုံးပြုမှုကို ကန့်သတ်နိုင်ပါသည်။"</string>
-    <string name="data_usage_auto_sync_on_dialog_title" msgid="2438617846762244389">"ဒေတာများကို အလိုလျောက်တူအောင်လုပ်ခြင်းကို ဖွင့်မည်လား?"</string>
-    <string name="data_usage_auto_sync_on_dialog" product="tablet" msgid="8581983093524041669">"သင်က ဝဘ် ပေါ်က သင်၏ အကောင့်ထဲ ပြုလုပ်သည့် အပြောင်းအလဲ မှန်သမျှကို သင့်တက်ဘလက်ထံသို့ အလိုအလျောက် ကူပေးမည်။ \n\nအချို့  အကောင့်များသည် သင်က သင့်တက်ဘလက်သို့ ပြုလုပ်လိုပ်သည့် အပြောင်းအလဲ မှန်သမျှကို ဝဘ်ဆီသို့ အလိုအလျောက် ကူးပေးနိုင်ပါသေးသည်။ Google အကောင့် ထိုသို့ အလုပ်လုပ်ပါသည်။"</string>
+    <string name="data_usage_auto_sync_on_dialog_title" msgid="2438617846762244389">"ဒေတာ အော်တို-စင့်ခ် ဖွင့်မလား။"</string>
+    <string name="data_usage_auto_sync_on_dialog" product="tablet" msgid="8581983093524041669">"ဝဘ်ပေါ်တွင် သင်၏ အကောင့်အတွက်လုပ်သည့် အပြောင်းအလဲအားလုံးကို သင့်တက်ဘလက်သို့ အလိုအလျောက် ကူးပေးမည်။ \n\nအချို့အကောင့်များသည် သင့်တက်ဘလက်သို့ ပြုလုပ်သည့် အပြောင်းအလဲများကို ဝဘ်ဆီသို့ အလိုအလျောက် ကူးပေးနိုင်ပါသည်။ Google အကောင့်၏ အလုပ်လုပ်ပုံ ဖြစ်ပါသည်။"</string>
     <string name="data_usage_auto_sync_on_dialog" product="default" msgid="8651376294887142858">"သင်က ဝဘ် ပေါ်က သင်၏ အကောင့်ထဲ ပြုလုပ်သည့် အပြောင်းအလဲ မှန်သမျှကို သင့်ဖုန်းထံသို့ အလိုအလျောက် ကူပေးမည်။ \n\nအချို့ အကောင့်များသည် သင်က ဖုန်းသို့ ပြုလုပ်လိုပ်သည့် အပြောင်းအလဲ မှန်သမျှကို ဝဘ်ဆီသို့ အလိုအလျောက် ကူးပေးနိုင်ပါသေးသည်။ Google အကောင့် ထိုသို့ အလုပ်လုပ်ပါသည်။"</string>
     <string name="data_usage_auto_sync_off_dialog_title" msgid="9013139130490125793">"ဒေတာ အော်တိုစင့်ခ် ပိတ်မလား။"</string>
     <string name="data_usage_auto_sync_off_dialog" msgid="4025938250775413864">"၎င်းသည် ဒေတာနှင့် ဘက်ထရီအသုံးပြုမှုကို လျှော့ချပေးမည်၊ သို့သော် လတ်တလောအချက်အလက်များကို ရယူရန် သင်ကိုယ်တိုင် အကောင့်တစ်ခုချင်းကို စင့်ခ်လုပ်ရမည်။ အပ်ဒိတ်များထွက်သည့် အကြောင်းကြားချက်များကိုမူ သင်လက်ခံရရှိတော့မည်မဟုတ်ပါ။"</string>
@@ -2436,6 +2447,9 @@
     <string name="data_usage_metered_mobile" msgid="5423305619126978393">"မိုဘိုင်းလ်ကွန်ယက်များ"</string>
     <string name="data_usage_metered_wifi" msgid="1761738002328299714">"မီတာသုံး Wi-Fi ကွန်ရက်များ"</string>
     <string name="data_usage_metered_wifi_disabled" msgid="727808462375941567">"မီတာသုံး ကွန်ရက်များကို ရွေးရန် Wi-Fi ကို ဖွင့်လိုက်ပါ။"</string>
+    <string name="data_usage_metered_auto" msgid="1262028400911918865">"အလိုအလျောက်"</string>
+    <string name="data_usage_metered_yes" msgid="9217539611385225894">"မီတာဖြင့် ကောက်ခံသည်"</string>
+    <string name="data_usage_metered_no" msgid="4025232961929071789">"မီတာဖြင့်ကောက်ခံခြင်း မဟုတ်ပါ"</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>
@@ -2527,9 +2541,6 @@
     <string name="backup_pw_set_button_text" msgid="2387480910044648795">"အရန်သိမ်းဆည်းခြင်းအတွက် စကားဝှက်သတ်မှတ်ရန်"</string>
     <string name="backup_pw_cancel_button_text" msgid="8845630125391744615">"မလုပ်တော့"</string>
     <string name="additional_system_update_settings_list_item_title" msgid="214987609894661992">"ဖြည့်စွက် စနစ်တိုးမြင့်မှုများ"</string>
-    <string name="selinux_status_disabled" msgid="924551035552323327">"သုံးမရအောင် ပိတ်ထားခြင်း"</string>
-    <string name="selinux_status_permissive" msgid="6004965534713398778">"ထိန်းချုပ်မှုမဲ့"</string>
-    <string name="selinux_status_enforcing" msgid="2252703756208463329">"ဖိအားပေးရန်"</string>
     <string name="ssl_ca_cert_warning" msgid="2045866713601984673">"ကွန်ရက်ကို စောင့်ကြည့်စစ်ဆေးခံရနိုင်သည်"</string>
     <string name="done_button" msgid="1991471253042622230">"ပြီးပါပြီ"</string>
     <plurals name="ssl_ca_cert_dialog_title" formatted="false" msgid="7145092748045794650">
@@ -2575,7 +2586,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>
@@ -2727,6 +2738,7 @@
       <item quantity="other">ဖျောက်ထားသည့် %d ခုကို ပြပါ</item>
       <item quantity="one">ဖျောက်ထားသည့် %d ခုကို ပြပါ</item>
     </plurals>
+    <string name="dashboard_suggestion_condition_footer_content_description" msgid="2898588191174845961">"ချုံ့ကြည့်ရန်"</string>
     <string name="network_dashboard_title" msgid="4771589228992391573">"ကွန်ရက်နှင့် အင်တာနက်"</string>
     <string name="network_dashboard_summary_mobile" msgid="3851083934739500429">"မိုဘိုင်း"</string>
     <string name="network_dashboard_summary_data_usage" msgid="3843261364705042212">"‌‌ဒေတာသုံးစွဲမှု"</string>
@@ -2734,7 +2746,7 @@
     <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_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>
@@ -2786,8 +2798,7 @@
     <string name="keywords_gesture" msgid="3526905012224714078">"ဟန်များ"</string>
     <string name="keywords_payment_settings" msgid="5220104934130446416">"ပေးချေမှု၊ တို့ခြင်း၊ ငွေပေးချေခြင်းများ"</string>
     <string name="keywords_backup" msgid="470070289135403022">"မိတ္တူ၊ မိတ္တူကူးပါ"</string>
-    <!-- no translation found for keywords_assist_gesture_launch (813968759791342591) -->
-    <skip />
+    <string name="keywords_assist_gesture_launch" msgid="813968759791342591">"ဟန်"</string>
     <string name="setup_wifi_nfc_tag" msgid="9028353016222911016">"ကြိုးမဲ့ NFC တဲဂ်ကို စဖွင့်သတ်မှတ်ရန်"</string>
     <string name="write_tag" msgid="8571858602896222537">"ရေးရန်"</string>
     <string name="status_awaiting_tap" msgid="2130145523773160617">"ရေးရန် တဲဂ် တစ်ခုကို ပုပ်ပါ..."</string>
@@ -2803,7 +2814,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>
@@ -2830,8 +2841,14 @@
       <item quantity="other">အလိုအလျောက် စည်းမျဉ်း <xliff:g id="ON_COUNT">%d</xliff:g> ခုကို ဖွင့်ထားသည်</item>
       <item quantity="one">အလိုအလျောက် စည်းမျဉ်း ၁ ခုကို ဖွင့်ထားသည်</item>
     </plurals>
-    <string name="zen_mode_settings_title" msgid="842308776768942600">"မနှောင့်ယှက်ရ ရွေးချယ်မှု"</string>
-    <string name="zen_mode_priority_settings_title" msgid="2623117023031824309">"ဦးစားပေးများသာ ခွင့်ပြုရန်"</string>
+    <string name="zen_mode_settings_title" msgid="1066226840983908121">"မနှောင့်ယှက်ရ"</string>
+    <string name="zen_mode_behavior_settings_title" msgid="1463303933529313969">"အပြုအမူ"</string>
+    <string name="zen_mode_behavior_allow_title" msgid="3845615648136218141">"ဤနေရာမှ အသံနှင့် တုန်ခါမှုများကို ခွင့်ပြုပါ-"</string>
+    <string name="zen_mode_behavior_no_sound" msgid="1219626004723208056">"အသံပိတ်ထားသည်"</string>
+    <string name="zen_mode_behavior_total_silence" msgid="6716603819806610626">"အသံပိတ်ထားသည် (လုံးဝမမြည်ပါ)"</string>
+    <string name="zen_mode_behavior_no_sound_except" msgid="4968477585788243114">"<xliff:g id="CATEGORIES">%1$s</xliff:g> မှလွဲ၍ အခြားအသံ ပိတ်ထားသည်"</string>
+    <!-- no translation found for zen_mode_behavior_alarms_only (2423480992071472963) -->
+    <skip />
     <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>
@@ -2860,7 +2877,7 @@
     <string name="notification_badging_title" msgid="5938709971403474078">"အကြောင်းကြားချက်အမှတ်အသားများကို ခွင့်ပြုရန်"</string>
     <string name="notification_pulse_title" msgid="1905382958860387030">"မီး မှိတ်တုတ်မှိတ်တုတ်လုပ်ရန်"</string>
     <string name="lock_screen_notifications_title" msgid="6173076173408887213">"လော့ခ်ချထားသည့်မျက်နှာပြင်ပေါ်တွင်"</string>
-    <string name="lock_screen_notifications_summary_show" msgid="6407527697810672847">"အကြောင်းကြားချက်ပါ အကြောင်းအရာအားလုံးကို ပြမည်"</string>
+    <string name="lock_screen_notifications_summary_show" msgid="6407527697810672847">"အကြောင်းကြားချက်ပါ အကြောင်းအရာအားလုံးကို ပြပါ"</string>
     <string name="lock_screen_notifications_summary_hide" msgid="7891552853357258782">"အရေးကြီးသည့် အသိပေးအကြောင်းအရာကိုဝှက်ထားရန်"</string>
     <string name="lock_screen_notifications_summary_disable" msgid="859628910427886715">"အကြောင်းကြားချက်များကို လုံးဝမပြပါနှင့်"</string>
     <string name="lock_screen_notifications_interstitial_message" msgid="6164532459432182244">"သင်၏ကိရိယာကို လော့ခ်ချထားချိန် အကြောင်းကြားချက်များကို ဘယ်လိုပြစေလိုပါသလဲ။"</string>
@@ -2873,13 +2890,15 @@
     <string name="notifications_title" msgid="8086372779371204971">"အကြောင်းကြားချက်များ"</string>
     <string name="app_notifications_title" msgid="5810577805218003760">"အက်ပ်အသိပေးချက်များ"</string>
     <string name="notification_channel_title" msgid="2260666541030178452">"အသိပေးချက် အမျိုးအစား"</string>
+    <string name="notification_group_title" msgid="7180506440133859601">"အကြောင်းကြားချက် အုပ်စုအမျိုးအစား"</string>
     <string name="notification_importance_title" msgid="848692592679312666">"အရေးပါမှု"</string>
-    <string name="notification_importance_unspecified" msgid="2196023702875112081">"အက်ပ်ကို ဆုံးဖြတ်ခွင့်ပေးပါ"</string>
+    <string name="notification_importance_unspecified" msgid="6622173510486113958">"အသံကို ခွင့်ပြုရန်"</string>
     <string name="notification_importance_blocked" msgid="7938180808339386300">"အကြောင်းကြားချက်များကို ဘယ်တော့မှ မပြပါနှင့်"</string>
     <string name="notification_importance_min" msgid="5455049524984686275">"အသံ သို့မဟုတ် ရုပ်ပုံ ဖွင့်ခြင်းတို့ကို မပြုလုပ်လိုပါ"</string>
     <string name="notification_importance_low" msgid="8881468429453766553">"အသံမပါ"</string>
     <string name="notification_importance_default" msgid="5958338024601957516">"အသံဖွင့်ပါ"</string>
     <string name="notification_importance_high" msgid="2082429479238228527">"အသံဖွင့်၍ မျက်နှာပြင်ပေါ်တွင် ပြပါ"</string>
+    <string name="notification_importance_high_silent" msgid="2667033773703765252">"ဖန်သားပြင်ပေါ်တွင် ပြရန်"</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>
@@ -2916,15 +2935,19 @@
     <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>
-    <!-- no translation found for picture_in_picture_app_detail_summary (1264019085827708920) -->
-    <skip />
+    <string name="picture_in_picture_app_detail_summary" msgid="1264019085827708920">"အက်ပ်ပွင့်နေစဉ် သို့မဟုတ် ထွက်လိုက်စဉ်တွင် ဤအက်ပ်အား တစ်ခုပေါ်တစ်ခုထပ်၍ ဖွင့်သည့် ဝင်းဒိုးတစ်ခု ပြုလုပ်ခွင့်ပြုပါ (ဥပမာ ဗီဒီယိုဆက်ကြည့်ရန်)။ ဤဝင်းဒိုးကို သင်သုံးနေသော အခြားအက်ပ်များ၏အပေါ်တွင် ပြသပါလိမ့်မည်။"</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="channel_group_notifications_off_desc" msgid="1620950416247316370">"၎င်းသတိပေးချက်အုပ်စုကို ဤစက်ပစ္စည်းတွင် ပေါ်မလာစေရန် Android က ပိတ်ဆို့ထားပါသည်"</string>
     <string name="notification_channels" msgid="5346841743182627500">"အမျိုးအစားများ"</string>
     <string name="notification_channels_other" msgid="5645317113885788226">"အခြား"</string>
+    <plurals name="notification_group_summary" formatted="false" msgid="3420621520561455358">
+      <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="no_channels" msgid="3077375508177744586">"ဤအက်ပ်က မည်သည့် အကြောင်းကြားချက်ကိုမျှ ပို့စ်တင်မထားပါ"</string>
     <string name="app_settings_link" msgid="8894946007543660906">"အက်ပ်အတွင်း နောက်ထပ်ဆက်တင်များ"</string>
     <string name="app_notification_listing_summary_zero" msgid="6482582965081108108">"အက်ပ်များအားလုံးအတွက် ဖွင့်ထားသည်"</string>
@@ -2944,13 +2967,13 @@
     <string name="notification_content_block_summary" msgid="7746185794438882389">"အရိပ်ထဲ သို့မဟုတ် တွဲချိတ်ထားသည့် စက်ပစ္စည်းများပေါ်တွင် အကြောင်းကြားချက်များကို ဘယ်တော့မှ မပြပါနှင့်"</string>
     <string name="notification_badge_title" msgid="6370122441168519809">"အကြောင်းကြားချက်အမှတ်အသားကို ခွင့်ပြုရန်"</string>
     <string name="notification_channel_badge_title" msgid="2240827899882847087">"အကြောင်းကြားချက်အမှတ်အသားကို ပြသရန်"</string>
-    <string name="app_notification_override_dnd_title" msgid="7867458246395884830">"မနှောင်ယှက်ပါနှင့် ကို အပေါ်မှဖျက်ရေးပါ"</string>
-    <string name="app_notification_override_dnd_summary" msgid="3516007157020189746">"မနှောင်ယှက်ပါနှင့် ကို ဦးစားပေးမှု အတွက်သာ ဆိုပြီး သတ်မှတ်ထားလျှင် ဤသတိပေးချက်များအား ဆက်လက်ပြီး စွက်ဖက်ခွင့် ပြုပါ"</string>
+    <string name="app_notification_override_dnd_title" msgid="7867458246395884830">"\"မနှော့်ယှက်ပါနှင့်\" နေရာတွင် အစားထိုးပါ"</string>
+    <string name="app_notification_override_dnd_summary" msgid="3516007157020189746">"\"မနှောင့်ယှက်ပါနှင့်\" ကို ဦးစားပေးမှုအတွက်သာဟု သတ်မှတ်ထားလျှင် ဤသတိပေးချက်များအား ဆက်လက်ပြီး ကြားဝင်ခွင့် ပြုပါ"</string>
     <string name="app_notification_visibility_override_title" msgid="2187232730902430718">"လော့ခ်ချထားသည့်မျက်နှာပြင်ပေါ်တွင်"</string>
     <string name="app_notification_row_banned" msgid="5983655258784814773">"ပိတ်ဆို့ထား"</string>
     <string name="app_notification_row_priority" msgid="7723839972982746568">"ဦးစားပေးမှု"</string>
     <string name="app_notification_row_sensitive" msgid="1809610030432329940">"သိမ်မွေ့သော"</string>
-    <string name="app_notifications_dialog_done" msgid="3484067728568791014">"လုပ်ပြီး"</string>
+    <string name="app_notifications_dialog_done" msgid="3484067728568791014">"ပြီးပါပြီ"</string>
     <string name="app_notification_importance_title" msgid="8002263131149345584">"အရေးပါမှု"</string>
     <string name="notification_show_lights_title" msgid="7671781299688190532">"မီးကို မှိတ်တုတ်မှိတ်တုတ်လုပ်ရန်"</string>
     <string name="notification_vibrate_title" msgid="1646667807969755957">"တုန်ခါရန်"</string>
@@ -2963,7 +2986,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>
@@ -2984,16 +3007,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>
@@ -3001,12 +3024,14 @@
     <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>
+    <!-- no translation found for zen_mode_media_system_other (8900209390529859777) -->
+    <skip />
     <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="239685342222975733">"<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>
@@ -3026,15 +3051,16 @@
     <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">"Do Not Disturb မှ ပိတ်ထားသည့် အကြောင်းကြားချက်များက မျက်နှာပြင်ပေါ်တွင် ဖော်ပြခြင်း သို့မဟုတ် ပေါ်လာခြင်းတို့မလုပ်နိုင်ရန် တားဆီးပါ"</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">"Do Not Disturb ကပိတ်ထားသော်လည်း မျက်နှာပြင်ကိုဖွင့်ခြင်း သို့မဟုတ် သတိပေးချက်မှိတ်တုတ်မီးပြခြင်းတို့အားဖြင့် အကြောင်းကြားခြင်းများကို တားဆီးပါ"</string>
+    <string name="zen_mode_screen_off_summary" msgid="6490932947651798094">"\"မနှောင့်ယှက်ရ\" မှ ပိတ်ထားသည့် အကြောင်းကြားချက်များအား မျက်နှာပြင်ဖွင့်ခြင်း၊ သတိပေးချက်မီးပြခြင်းတို့ မပြုရန် တားဆီးပါ"</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>
     <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="suggestion_button_text" msgid="3275010948381252006">"အိုကေ"</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>
@@ -3185,12 +3211,12 @@
     <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>
@@ -3204,13 +3230,13 @@
     <string name="decline_remote_bugreport_action" msgid="518720235407565134">"ငြင်းပယ်ပါ"</string>
     <string name="usb_use_charging_only" msgid="2180443097365214467">"ဤစက်ကို အားသွင်းပါ"</string>
     <string name="usb_use_charging_only_desc" msgid="3066256793008540627">"ဤဖုန်းကိုသာ အားသွင်းပါ"</string>
-    <string name="usb_use_power_only" msgid="6426550616883919530">"အားဖြည့်ပေးပါ"</string>
-    <string name="usb_use_power_only_desc" msgid="3461232831015575152">"ချိတ်ဆက်ထားသော စက်ပစ္စည်းကို အားသွင်းခြင်း။ USB ဖြင့် အားသွင်းခြင်းကို ပံ့ပိုးသည့် စက်ပစ္စည်းများတွင်သာ အသုံးပြုနိုင်ပါသည်။"</string>
-    <string name="usb_use_file_transfers" msgid="7409600791007250137">"ဖိုင်များကို လွှဲပြောင်းပါ"</string>
+    <string name="usb_use_power_only" msgid="6426550616883919530">"အားဖြည့်ခြင်း"</string>
+    <string name="usb_use_power_only_desc" msgid="3461232831015575152">"ချိတ်ဆက်ထားသော စက်ပစ္စည်းကို အားသွင်းသည်။ USB ဖြင့် အားသွင်းခြင်းကို ပံ့ပိုးသည့် စက်ပစ္စည်းများတွင်သာ အသုံးပြုနိုင်ပါသည်။"</string>
+    <string name="usb_use_file_transfers" msgid="7409600791007250137">"ဖိုင်များကို လွှဲပြောင်းခြင်း"</string>
     <string name="usb_use_file_transfers_desc" msgid="4235764784331804488">"ဖိုင်များကို အခြားစက်ပစ္စည်းတစ်ခုသို့ လွှဲပြောင်းပါ"</string>
-    <string name="usb_use_photo_transfers" msgid="7794775645350330454">"ဓာတ်ပုံများ လွှဲပြောင်းရန် (PTP)"</string>
+    <string name="usb_use_photo_transfers" msgid="7794775645350330454">"ဓာတ်ပုံများ လွှဲပြောင်းခြင်း (PTP)"</string>
     <string name="usb_use_photo_transfers_desc" msgid="2963034811151325996">"MTP ကို မပံ့ပိုးလျှင် (PTP) ဓာတ်ပုံများ သို့မဟုတ် ဖိုင်များကို လွှဲပြောင်းရန်"</string>
-    <string name="usb_use_MIDI" msgid="870922185938298263">"စက်ပစ္စည်းကို MIDI အဖြစ်အသုံးပြုပါ"</string>
+    <string name="usb_use_MIDI" msgid="870922185938298263">"စက်ကို MIDI အဖြစ်အသုံးပြုခြင်း"</string>
     <string name="usb_use_MIDI_desc" msgid="8473936990076693175">"ဤစက်ပစ္စည်းကို MIDI အဖြစ်အသုံးပြုပါ"</string>
     <string name="usb_use" msgid="3256040963685055320">"USB ကို အောက်ပါအတွက် အသုံးပြုပါ -"</string>
     <string name="usb_pref" msgid="1400617804525116158">"USB"</string>
@@ -3219,6 +3245,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="sms_mirroring_pref" msgid="6475043279147376031">"SMS စကရင်ပွားခြင်း"</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>
@@ -3275,7 +3302,7 @@
     <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="app_permission_summary_allowed" msgid="1505409933012886711">"ခွင့်ပြုထားသည်"</string>
-    <string name="app_permission_summary_not_allowed" msgid="2592617058101882802">"ခွင့်ပြုမထားပါ"</string>
+    <string name="app_permission_summary_not_allowed" msgid="2592617058101882802">"ခွင့်မပြုပါ"</string>
     <string name="keywords_install_other_apps" msgid="761078076051006558">"မူရင်းမသိ အရင်းအမြစ် အက်ပ်များ ထည့်သွင်း"</string>
     <string name="write_settings" msgid="4797457275727195681">"စနစ်ဆက်တင်များ ပြန်ပြင်ခြင်း"</string>
     <string name="keywords_write_settings" msgid="6415597272561105138">"စနစ်ချိန်ညှိချက်များကို ရေးသားပြုပြင်မည်"</string>
@@ -3285,7 +3312,7 @@
     <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="permit_write_settings" msgid="658555006453212691">"စက်စနစ် ဆက်တင်များကို ပြင်ဆင်ခွင့် ပြုရန်"</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>
@@ -3380,9 +3407,12 @@
     <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="connectivity_monitor_switch" msgid="9059759348648583421">"ချိတ်ဆက်မှုအခြေအနေကို စောင့်ကြပ်ကြည့်ရှုခြင်း"</string>
+    <string name="connectivity_monitor_switch_summary" msgid="2828658652378866401">"ချိတ်ဆက်မှုအခြေအနေကို စောင့်ကြပ်ကြည့်ရှုခြင်းစနစ်က ချိတ်ဆက်မှုတွင် ပြဿနာရှိနေလျှင် မှတ်တမ်းပြုစုပြီး အသုံးပြုသူအား ချွတ်ယွင်းချက်ကို အစီရင်ခံရန် အကြောင်းကြားပေးပါမည်။"</string>
+    <string name="connectivity_monitor_toast" msgid="5551859612881173028">"ချိတ်ဆက်မှုအခြေအနေကို စောင့်ကြပ်ကြည့်ရှုခြင်းစနစ်အား အပြောင်းအလဲ ပြုလုပ်ရန် စက်ပစ္စည်းကို ပြန်လည်စတင်ပါ"</string>
     <string name="camera_hal_hdrplus_switch" msgid="8377365197105267466">"ကင်မရာ HAL HDR+"</string>
     <string name="camera_hal_hdrplus_toast" msgid="2063703797270055299">"ကင်မရာ HAL HDR+ ပြောင်းလဲမှုကို ပြုလုပ်ရန် စက်ပစ္စည်းကို ပြန်လည်စတင်ပါ"</string>
+    <string name="camera_laser_sensor_switch" msgid="8913588990743234440">"Camera လေဆာ အာရုံခံကိရိယာ"</string>
     <string name="ota_disable_automatic_update" msgid="2319639631655915050">"အလိုအလျောက် စနစ်အပ်ဒိတ်များ"</string>
     <string name="usage" msgid="2977875522080448986">"အသုံးပြုမှု"</string>
     <string name="cellular_data_usage" msgid="2155683719898158203">"မိုဘိုင်းဒေတာ အသုံးပြုမှု"</string>
@@ -3408,7 +3438,7 @@
     <string name="data_warning" msgid="209133958008062117">"ဒေတာသတိပေးချက်"</string>
     <string name="set_data_limit" msgid="2901526323210516923">"ဒေတာအကန့်အသတ် သတ်မှတ်ရန်"</string>
     <string name="data_limit" msgid="1885406964934590552">"ဒေတာအကန့်အသတ်"</string>
-    <string name="data_usage_template" msgid="392191945602400904">"<xliff:g id="ID_1">%1$s</xliff:g> <xliff:g id="ID_2">%2$s</xliff:g> အကြားအသုံးပြုခဲ့သည်"</string>
+    <string name="data_usage_template" msgid="2923744765873163859">"<xliff:g id="ID_2">%2$s</xliff:g> တွင် <xliff:g id="ID_1">%1$s</xliff:g> သုံးထားသည်"</string>
     <string name="configure" msgid="1029654422228677273">"ပြင်ဆင်သတ်မှတ်ရန်"</string>
     <string name="data_usage_other_apps" msgid="3272872663517382050">"အသုံးပြုမှုတွင် ပါဝင်သည့် အခြားအက်ပ်များ"</string>
     <plurals name="data_saver_unrestricted_summary" formatted="false" msgid="2635267833484232703">
@@ -3477,7 +3507,7 @@
     <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="387052719462473500">"လော့ခ်ချမျက်နှာပြင်ရှိ အချက်အလက်များကို ထိန်းချုပ်ရန်"</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="8483187649355540109">"အကူအညီနှင့် နည်းလမ်းများ"</string>
@@ -3485,7 +3515,7 @@
     <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>
+    <string name="bluetooth_disabled" msgid="6244000672828617410">"ပိတ်ထားသည်"</string>
     <string name="bluetooth_connected_summary" msgid="7672528674593152862">"<xliff:g id="ID_1">%1$s</xliff:g> နှင့် ချိတ်ဆက်ထားပါသည်"</string>
     <string name="bluetooth_connected_multiple_devices_summary" msgid="9173661896296663932">"စက်ပစ္စည်းအများအပြားနှင့် ချိတ်ဆက်ထားပါသည်"</string>
     <string name="demo_mode" msgid="2798762752209330277">"စနစ် UI သရုပ်ပြမုဒ်"</string>
@@ -3564,7 +3594,7 @@
     <string name="ambient_display_title" product="device" msgid="3423781975742145894">"စက်ပစ္စည်းကို စစ်ဆေးကြည့်ရန် နှစ်ချက်တို့ပါ"</string>
     <string name="ambient_display_summary" msgid="525662960806416373">"အချိန်၊ အကြောင်းကြားချက်သင်္ကေတများနှင့် အခြားအချက်အလက်များကို ကြည့်ရန် သင့်မျက်နှာပြင်ကို နှစ်ကြိမ်ဆက်တိုက်တို့ပါ။"</string>
     <string name="ambient_display_suggestion_summary" msgid="5987443721392571847">"ဖန်သားပြင်ပိတ်ထားစဉ် အကြောင်းကြားချက်များကို စစ်ဆေးရန်"</string>
-    <string name="ambient_display_pickup_title" product="default" msgid="818688002837687268">"ဖုန်းကိုစစ်ရန် ကောက်ယူပါ"</string>
+    <string name="ambient_display_pickup_title" product="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="4567020486787561873">"အချိန်၊ အကြောင်းကြားချက်သင်္ကေတများနှင့် အခြားအချက်အလက်များကို စစ်ဆေးရန် သင့်ဖုန်းကို ကောက်ယူလိုက်ပါ။"</string>
@@ -3587,7 +3617,7 @@
     <string name="web_action_enable_title" msgid="4051513950976670853">"ချက်ခြင်းသုံး အက်ပ်များ"</string>
     <string name="web_action_enable_summary" msgid="3108127559723396382">"ထည့်သွင်းထားခြင်း မရှိသေးလျှင်ပင် လင့်ခ်များကို အက်ပ်တွင် ဖွင့်ပါသည်"</string>
     <string name="web_action_section_title" msgid="7364647086538399136">"ချက်ခြင်းသုံး အက်ပ်များ"</string>
-    <string name="instant_apps_account" msgid="1433620209791992528">"ချက်ခြင်းသုံးအက်ပ် အကောင့်"</string>
+    <string name="instant_apps_settings" msgid="8827777916518348213">"Instant Apps ရွေးချယ်မှုများ"</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>
@@ -3634,7 +3664,9 @@
     <string name="enterprise_privacy_always_on_vpn_personal" msgid="9217774730260037434">"သင့်ကိုယ်ရေးကိုယ်တာ ပရိုဖိုင်တွင် VPN အမြဲသုံးရန် ကို ဖွင့်ထားသည်"</string>
     <string name="enterprise_privacy_always_on_vpn_work" msgid="7244472958208315814">"သင့်အလုပ်ပရိုဖိုင်တွင် VPN အမြဲသုံးရန်ကို ဖွင့်ထားသည်"</string>
     <string name="enterprise_privacy_global_http_proxy" msgid="7936664553416257333">"ကမ္ဘာသုံး HTTP ပရောက်စီကို သတ်မှတ်ထားပါသည်"</string>
-    <string name="enterprise_privacy_ca_certs" msgid="5885892204903688909">"စိတ်ချရသော အထောက်အထားများ"</string>
+    <string name="enterprise_privacy_ca_certs_device" msgid="2019652712782510262">"စိတ်ချရသော အထောက်အထားများ"</string>
+    <string name="enterprise_privacy_ca_certs_personal" msgid="2279084820904076599">"သင့်ကိုယ်ပိုင်ပရိုဖိုင်ရှိ စိတ်ချရသော အထောက်အထားများ"</string>
+    <string name="enterprise_privacy_ca_certs_work" msgid="6187377647815301809">"သင့်အလုပ်ပရိုဖိုင်ရှိ စိတ်ချရသော အထောက်အထားများ"</string>
     <plurals name="enterprise_privacy_number_ca_certs" formatted="false" msgid="526375234629534165">
       <item quantity="other">အနည်းဆုံး CA အသိအမှတ်ပြုလက်မှတ် <xliff:g id="COUNT_1">%d</xliff:g> ခု</item>
       <item quantity="one">အနည်းဆုံး CA အသိအမှတ်ပြုလက်မှတ် <xliff:g id="COUNT_0">%d</xliff:g> ခု</item>
@@ -3697,6 +3729,8 @@
     <string name="carrier_provisioning" msgid="4398683675591893169">"ဝန်ဆောင်မှုပေးသူက ပေးထားသည့် အချက်အလက်များ"</string>
     <string name="trigger_carrier_provisioning" msgid="3434865918009286187">"Trigger Carrier Provisioning"</string>
     <string name="new_device_suggestion_title" msgid="698847081680980774">"စိတ်လှုပ်ရှားဖွယ်ရာ အသစ်အဆန်း ရှိပါသလား။"</string>
-    <string name="new_device_suggestion_summary" msgid="7172709269203435870">"ထိပ်တန်း ဝန်ဆောင်မှု ၅ မျိုးကို ကြည့်ရန်"</string>
+    <string name="new_device_suggestion_summary" product="default" msgid="206396571522515855">"သင်၏ဖုန်းအသစ်ကို လေ့လာကြည့်ရှုပါ"</string>
+    <string name="new_device_suggestion_summary" product="tablet" msgid="393751455688210956">"သင်၏တက်ဘလက်အသစ်ကို လေ့လာကြည့်ရှုပါ"</string>
+    <string name="new_device_suggestion_summary" product="device" msgid="2939870049868336652">"သင်၏ စက်ပစ္စည်းအသစ်ကို လေ့လာကြည့်ရှုပါ"</string>
     <string name="disabled_low_ram_device" msgid="3751578499721173344">"ဤဝန်ဆောင်မှုကို ဤစက်ပစ္စည်းတွင် မရရှိနိုင်ပါ"</string>
 </resources>
diff --git a/res/values-nb/arrays.xml b/res/values-nb/arrays.xml
index b92038b..ceae0b3 100644
--- a/res/values-nb/arrays.xml
+++ b/res/values-nb/arrays.xml
@@ -100,8 +100,6 @@
     <!-- no translation found for wifi_security_no_eap:0 (2084555984818107151) -->
     <!-- no translation found for wifi_security_no_eap:1 (397579322683471524) -->
     <!-- no translation found for wifi_security_no_eap:2 (1968820975358150484) -->
-    <!-- no translation found for wifi_ap_security:0 (5251664683198623324) -->
-    <!-- no translation found for wifi_ap_security:1 (7989073072260294673) -->
   <string-array name="wifi_eap_method">
     <item msgid="1160193392455075561">"PEAP"</item>
     <item msgid="7981731051382306293">"TLS"</item>
diff --git a/res/values-nb/strings.xml b/res/values-nb/strings.xml
index 3f8bbca..4bf0b8a 100644
--- a/res/values-nb/strings.xml
+++ b/res/values-nb/strings.xml
@@ -166,7 +166,7 @@
     <string name="bluetooth_map_acceptance_dialog_text" msgid="8712508202081143737">"%1$s ønsker adgang til meldingene dine. Vil du gi %2$s tilgang?"</string>
     <string name="bluetooth_sap_request" msgid="2669762224045354417">"Forespørsel om tilgang til SIM-kort"</string>
     <string name="bluetooth_sap_acceptance_dialog_text" msgid="4414253873553608690">"<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g> vil ha tilgang til SIM-kortet ditt. Hvis du gir tilgang til SIM-kortet, slås datatilkoblingen på enheten av så lenge tillatelsen varer. Gi tilgang til <xliff:g id="DEVICE_NAME_1">%2$s?</xliff:g>"</string>
-    <string name="bluetooth_device_name_summary" msgid="4757990010751789977">"Synlig som «<xliff:g id="DEVICE_NAME">^1</xliff:g>» for andre enheter"</string>
+    <string name="bluetooth_device_name_summary" msgid="522235742194965734">"Synlig som «<xliff:g id="DEVICE_NAME">^1</xliff:g>» for andre enheter"</string>
     <string name="bluetooth_paired_device_title" msgid="8638994696317952019">"Enhetene dine"</string>
     <string name="bluetooth_pairing_page_title" msgid="7712127387361962608">"Koble til en ny enhet"</string>
     <string name="date_and_time" msgid="9062980487860757694">"Dato og klokkeslett"</string>
@@ -312,6 +312,8 @@
     <string name="zone_auto" msgid="334783869352026648">"Automatisk tidssone"</string>
     <string name="zone_auto_summaryOn" msgid="6142830927278458314">"Bruk nettverkets egen tidssone"</string>
     <string name="zone_auto_summaryOff" msgid="2597745783162041390">"Bruk nettverkets egen tidssone"</string>
+    <string name="date_time_24hour_auto" msgid="2117383168985653422">"Automatisk 24-timers format"</string>
+    <string name="date_time_24hour_auto_summary" msgid="6351812925651480277">"Bruk lokal standard"</string>
     <string name="date_time_24hour_title" msgid="3203537578602803850">"24-timers format"</string>
     <string name="date_time_24hour" msgid="1193032284921000063">"Bruk 24-timers format"</string>
     <string name="date_time_set_time_title" msgid="6296795651349047016">"Tid"</string>
@@ -372,6 +374,9 @@
     <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="1961957425135180242">"Neste"</string>
+    <string name="setup_fingerprint_enroll_skip_title" msgid="362050541117362034">"Hoppe over fingeravtrykk?"</string>
+    <string name="setup_fingerprint_enroll_skip_after_adding_lock_text" msgid="958990414356204763">"Det tar bare et minutt eller to å konfigurere fingeravtrykk. Hvis du hopper over dette, kan du legge til fingeravtrykket ditt senere i innstillingene."</string>
+    <string name="lock_screen_intro_skip_title" msgid="4988210105913705679">"Vil du hoppe over skjermlås?"</string>
     <string name="lock_screen_intro_skip_dialog_text_frp" product="tablet" msgid="1581834104051243425">"Funksjoner for enhetsbeskyttelse blir ikke slått på. Du kommer ikke til å kunne forhindre at andre bruker dette nettbrettet hvis du mister det eller det blir stjålet eller tilbakestilt."</string>
     <string name="lock_screen_intro_skip_dialog_text_frp" product="device" msgid="4629503416877189572">"Funksjoner for enhetsbeskyttelse blir ikke slått på. Du kommer ikke til å kunne forhindre at andre bruker denne enheten hvis du mister den eller den blir stjålet eller tilbakestilt."</string>
     <string name="lock_screen_intro_skip_dialog_text_frp" product="default" msgid="2423428240245737909">"Funksjoner for enhetsbeskyttelse blir ikke slått på. Du kommer ikke til å kunne forhindre at andre bruker denne telefonen hvis du mister den eller den blir stjålet eller tilbakestilt."</string>
@@ -457,7 +462,7 @@
     <string name="setup_lock_settings_picker_title" product="tablet" msgid="90329443364067215">"Beskytt nettbrettet"</string>
     <string name="setup_lock_settings_picker_title" product="device" msgid="2399952075134938929">"Beskytt enheten"</string>
     <string name="setup_lock_settings_picker_title" product="default" msgid="1572244299605153324">"Beskytt telefonen"</string>
-    <string name="setup_lock_settings_picker_fingerprint_message" msgid="5585650064305600578">"Velg en reserveskjermlås for bedre beskyttelse."</string>
+    <string name="lock_settings_picker_fingerprint_added_security_message" msgid="5768002109707648463">"Angi en reserveskjermlås for bedre beskyttelse."</string>
     <string name="setup_lock_settings_picker_message" product="tablet" msgid="8919671129189936210">"Hindre at andre bruker dette nettbrettet uten din tillatelse, ved å aktivere funksjoner for enhetsbeskyttelse. Velg skjermlåsen du vil bruke."</string>
     <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>
@@ -499,29 +504,37 @@
     <string name="unlock_disable_frp_warning_title" msgid="264008934468492550">"Vil du fjerne enhetsbeskyttelsen?"</string>
     <string name="unlock_disable_frp_warning_title_profile" msgid="5507136301904313583">"Vil du fjerne profilbeskyttelsen?"</string>
     <string name="unlock_disable_frp_warning_content_pattern" msgid="8869767290771023461">"Funksjoner for enhetsbeskyttelse kommer ikke til å fungere uten mønsteret ditt."</string>
-    <!-- no translation found for unlock_disable_frp_warning_content_pattern_fingerprint (2986105377420905314) -->
-    <skip />
+    <string name="unlock_disable_frp_warning_content_pattern_fingerprint" msgid="2986105377420905314">"Funksjonene for enhetsbeskyttelse kommer ikke til å fungere uten mønsteret ditt.<xliff:g id="EMPTY_LINE">
+
+</xliff:g>De lagrede fingeravtrykkene dine blir også slettet fra enheten, og du kommer ikke til å kunne låse opp telefonen din, autorisere kjøp eller logge på apper med dem."</string>
     <string name="unlock_disable_frp_warning_content_pin" msgid="586996206210265131">"Funksjoner for enhetsbeskyttelse kommer ikke til å fungere uten PIN-koden din."</string>
-    <!-- no translation found for unlock_disable_frp_warning_content_pin_fingerprint (3370462835533123695) -->
-    <skip />
+    <string name="unlock_disable_frp_warning_content_pin_fingerprint" msgid="3370462835533123695">"Funksjonene for enhetsbeskyttelse kommer ikke til å fungere uten PIN-koden din.<xliff:g id="EMPTY_LINE">
+
+</xliff:g>De lagrede fingeravtrykkene dine blir også slettet fra enheten, og du kommer ikke til å kunne låse opp telefonen din, autorisere kjøp eller logge på apper med dem."</string>
     <string name="unlock_disable_frp_warning_content_password" msgid="5420612686852555537">"Funksjoner for enhetsbeskyttelse kommer ikke til å fungere uten passordet ditt."</string>
-    <!-- no translation found for unlock_disable_frp_warning_content_password_fingerprint (3595476296430536798) -->
-    <skip />
+    <string name="unlock_disable_frp_warning_content_password_fingerprint" msgid="3595476296430536798">"Funksjonene for enhetsbeskyttelse kommer ikke til å fungere uten passordet ditt.<xliff:g id="EMPTY_LINE">
+
+</xliff:g>De lagrede fingeravtrykkene dine blir også slettet fra enheten, og du kommer ikke til å kunne låse opp telefonen, autorisere kjøp eller logge på apper med dem."</string>
     <string name="unlock_disable_frp_warning_content_unknown" msgid="1550718040483548220">"Funksjoner for enhetsbeskyttelse kommer ikke til å fungere uten skjermlåsen din."</string>
-    <!-- no translation found for unlock_disable_frp_warning_content_unknown_fingerprint (3679351662094349506) -->
-    <skip />
+    <string name="unlock_disable_frp_warning_content_unknown_fingerprint" msgid="3679351662094349506">"Funksjonene for enhetsbeskyttelse kommer ikke til å fungere uten skjermlåsen din.<xliff:g id="EMPTY_LINE">
+
+</xliff:g>De lagrede fingeravtrykkene dine blir også slettet fra enheten, og du kommer ikke til å kunne låse opp telefonen din, autorisere kjøp eller logge på apper med dem."</string>
     <string name="unlock_disable_frp_warning_content_pattern_profile" msgid="8682200103576359918">"Funksjonene for profilbeskyttelse fungerer ikke uten mønsteret ditt."</string>
-    <!-- no translation found for unlock_disable_frp_warning_content_pattern_fingerprint_profile (6718155854303231675) -->
-    <skip />
+    <string name="unlock_disable_frp_warning_content_pattern_fingerprint_profile" msgid="6718155854303231675">"Funksjonene for profilbeskyttelse fungerer ikke uten mønsteret ditt.<xliff:g id="EMPTY_LINE">
+
+</xliff:g>De lagrede fingeravtrykkene dine fjernes også fra denne profilen, og du kommer ikke til å kunne låse opp profilen, autorisere kjøp eller logge på apper med dem."</string>
     <string name="unlock_disable_frp_warning_content_pin_profile" msgid="7790688070593867767">"Funksjonene for profilbeskyttelse fungerer ikke uten PIN-koden din."</string>
-    <!-- no translation found for unlock_disable_frp_warning_content_pin_fingerprint_profile (4209564603132870532) -->
-    <skip />
+    <string name="unlock_disable_frp_warning_content_pin_fingerprint_profile" msgid="4209564603132870532">"Funksjonene for profilbeskyttelse fungerer ikke uten PIN-koden din.<xliff:g id="EMPTY_LINE">
+
+</xliff:g>De lagrede fingeravtrykkene dine fjernes også fra denne profilen, og du kommer ikke til å kunne låse opp profilen, autorisere kjøp eller logge på apper med dem."</string>
     <string name="unlock_disable_frp_warning_content_password_profile" msgid="7569285520567674461">"Funksjonene for profilbeskyttelse fungerer ikke uten passordet ditt."</string>
-    <!-- no translation found for unlock_disable_frp_warning_content_password_fingerprint_profile (2994300676764706047) -->
-    <skip />
+    <string name="unlock_disable_frp_warning_content_password_fingerprint_profile" msgid="2994300676764706047">"Funksjonene for profilbeskyttelse fungerer ikke uten passordet ditt.<xliff:g id="EMPTY_LINE">
+
+</xliff:g>De lagrede fingeravtrykkene dine fjernes også fra denne profilen, og du kommer ikke til å kunne låse opp profilen, autorisere kjøp eller logge på apper med dem."</string>
     <string name="unlock_disable_frp_warning_content_unknown_profile" msgid="6984215718701688202">"Funksjonene for profilbeskyttelse fungerer ikke uten skjermlåsen din."</string>
-    <!-- no translation found for unlock_disable_frp_warning_content_unknown_fingerprint_profile (4994062501123299418) -->
-    <skip />
+    <string name="unlock_disable_frp_warning_content_unknown_fingerprint_profile" msgid="4994062501123299418">"Funksjonene for profilbeskyttelse fungerer ikke uten skjermlåsen din.<xliff:g id="EMPTY_LINE">
+
+</xliff:g>De lagrede fingeravtrykkene dine fjernes også fra denne profilen, og du kommer ikke til å kunne låse opp profilen, autorisere kjøp eller logge på apper med dem."</string>
     <string name="unlock_disable_frp_warning_ok" msgid="7075138677177748705">"Ja, fjern"</string>
     <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>
@@ -580,6 +593,7 @@
     <string name="lockpassword_pin_no_sequential_digits" msgid="680765285206990584">"En sekvens av stigende, synkende eller like sifre er ikke tillatt"</string>
     <string name="lockpassword_ok_label" msgid="313822574062553672">"OK"</string>
     <string name="lockpassword_cancel_label" msgid="8818529276331121899">"Avbryt"</string>
+    <string name="lockpassword_clear_label" msgid="5724429464960458155">"Fjern"</string>
     <string name="lockpattern_tutorial_cancel_label" msgid="6431583477570493261">"Avbryt"</string>
     <string name="lockpattern_tutorial_continue_label" msgid="3559793618653400434">"Neste"</string>
     <string name="lock_setup" msgid="3355847066343753943">"Konfigurasjonen er fullført."</string>
@@ -773,6 +787,7 @@
     <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>
@@ -809,6 +824,8 @@
     <string name="wifi_wps_available_first_item" msgid="4422547079984583502">"WPS tilgjengelig"</string>
     <string name="wifi_wps_available_second_item" msgid="8427520131718215301">" (WPS tilgjengelig)"</string>
     <string name="wifi_wps_nfc_enter_password" msgid="2288214226916117159">"Skriv inn nettverkspassordet ditt"</string>
+    <string name="wifi_carrier_connect" msgid="8174696557882299911">"Operatørens Wi-Fi-nettverk"</string>
+    <string name="wifi_carrier_content" msgid="4634077285415851933">"Koble til via <xliff:g id="NAME">%1%s</xliff:g>"</string>
     <string name="wifi_scan_always_turnon_message" msgid="203123538572122989">"<xliff:g id="APP_NAME">%1$s</xliff:g> ønsker å bruke nettverksskanning, også når Wi-Fi er slått av, for bedre posisjonsnøyaktighet og andre formål. \n\nVil du tillate dette for alle apper som prøver å skanne?"</string>
     <string name="wifi_scan_always_turnoff_message" msgid="5538901671131941043">"For å slå dette av går du til Avansert i overflytsmenyen."</string>
     <string name="wifi_scan_always_confirm_allow" msgid="5355973075896817232">"Tillat"</string>
@@ -826,6 +843,7 @@
     <string name="wifi_connect" msgid="1076622875777072845">"Koble til"</string>
     <string name="wifi_failed_connect_message" msgid="8491902558970292871">"Kan ikke koble til nettverket"</string>
     <string name="wifi_forget" msgid="8168174695608386644">"Glem"</string>
+    <string name="wifi_modify" msgid="6100248070440710782">"Endre"</string>
     <string name="wifi_failed_forget_message" msgid="1348172929201654986">"Kunne ikke slette nettverket"</string>
     <string name="wifi_save" msgid="3331121567988522826">"Lagre"</string>
     <string name="wifi_failed_save_message" msgid="6650004874143815692">"Kunne ikke lagre nettverket"</string>
@@ -838,6 +856,7 @@
     <string name="wifi_advanced_titlebar" msgid="4485841401774142908">"Avanserte Wi-Fi-innst."</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_title" msgid="3471132676909349382">"Nettverksinformasjon"</string>
     <string name="wifi_details_subnet_mask" msgid="6720279144174924410">"Nettverksmaske"</string>
     <string name="wifi_details_dns" msgid="8648826607751830768">"DNS"</string>
     <string name="wifi_details_ipv6_address_header" msgid="6734119149106422148">"IPv6-adresser"</string>
@@ -870,16 +889,15 @@
     <string name="wifi_p2p_cancel_connect_title" msgid="255267538099324413">"Vil du avbryte invitasjonen?"</string>
     <string name="wifi_p2p_cancel_connect_message" msgid="7477756213423749402">"Vil du avbryte invitasjonen til å koble til <xliff:g id="PEER_NAME">%1$s</xliff:g>?"</string>
     <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_off_subtext" msgid="5466126533609394170">"Deler ikke Internett eller innhold med andre enheter"</string>
     <string name="wifi_hotspot_tethering_on_subtext" product="tablet" msgid="5752490509369962007">"Deler nettbrettets Internett-tilkobling via Wi-Fi-sone"</string>
     <string name="wifi_hotspot_tethering_on_subtext" product="default" msgid="6461075246164300670">"Deler telefonens Internett-tilkobling via Wi-Fi-sone"</string>
     <string name="wifi_hotspot_on_local_only_subtext" msgid="2068110388011294735">"Appen deler innhold. Slå Wi-Fi-sone av og på for å dele Internett-tilkobling."</string>
-    <string name="wifi_hotspot_name_title" msgid="1341735529132128887">"Wi-Fi-navn"</string>
+    <string name="wifi_hotspot_name_title" msgid="8237000746618636778">"Navn på Wi-Fi-sonen"</string>
     <string name="wifi_hotspot_name_summary_connecting" msgid="3378299995508671967">"Slår på <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g> …"</string>
     <string name="wifi_hotspot_name_summary_connected" msgid="3888672084861445362">"Andre enheter kan koble til <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>"</string>
-    <string name="wifi_hotspot_password_title" msgid="1955592302902091281">"Wi-Fi-passord"</string>
+    <string name="wifi_hotspot_password_title" msgid="8676859981917573801">"Passord for Wi-Fi-sonen"</string>
     <string name="wifi_hotspot_ap_band_title" msgid="1165801173359290681">"AP-bånd"</string>
     <string name="wifi_hotspot_footer_info_regular" msgid="1203489406068036455">"Bruk Wi-Fi-soner for å opprette Wi-Fi-nettverk for de andre enhetene dine. Wi-Fi-soner gir Internett-tilgang ved hjelp av mobildatatilkoblingen din."</string>
     <string name="wifi_hotspot_footer_info_local_only" msgid="857988412470694109">"Du kan bruke apper til å opprette Wi-Fi-soner for deling av innhold med enheter i nærheten."</string>
@@ -890,7 +908,6 @@
     <string name="wifi_tether_configure_ap_text" msgid="7974681394041609308">"Konfigurer Wi-Fi-sone"</string>
     <string name="wifi_hotspot_configure_ap_text" msgid="5478614731464220432">"Konfigurasjon av Wi-Fi-sone"</string>
     <string name="wifi_hotspot_configure_ap_text_summary" msgid="5560680057727007011">"AndroidAP WPA2 PSK-Wi-Fi-sone"</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>-Wi-Fi-sone"</string>
     <string name="wifi_tether_configure_ssid_default" msgid="8467525402622138547">"AndroidHotspot"</string>
     <string name="wifi_calling_settings_title" msgid="4102921303993404577">"Wi-Fi-anrop"</string>
     <string name="wifi_calling_suggestion_title" msgid="9008010480466359578">"Slå på Wi-Fi-anrop"</string>
@@ -931,7 +948,7 @@
     <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="emergency_address_summary" msgid="3266760199681945746">"Adressen som oppgis som posisjonen din til beredskapstjenester, hvis du utfører et nødanrop med Wi-Fi"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"Skjerm"</string>
     <string name="sound_settings" msgid="5534671337768745343">"Lyd"</string>
     <string name="all_volume_title" msgid="4296957391257836961">"Volumer"</string>
@@ -985,6 +1002,7 @@
     <string name="search_settings" msgid="1910951467596035063">"Søk"</string>
     <string name="search_settings_summary" msgid="9205656546570654169">"Søkeinnstillinger og -logg"</string>
     <string name="search_settings_no_results" msgid="8799027492641230999">"Ingen resultater"</string>
+    <string name="search_clear_history" msgid="4196658962573162457">"Tøm loggen"</string>
     <string name="display_settings" msgid="7965901687241669598">"Skjerm"</string>
     <string name="accelerometer_title" msgid="7854608399547349157">"Rotér skjermen automatisk"</string>
     <string name="color_mode_title" msgid="3159275920408338215">"Levende farger"</string>
@@ -1048,22 +1066,20 @@
     <string name="screensaver_settings_summary_never" msgid="5165622985174349585">"Aldri"</string>
     <string name="screensaver_settings_summary_off" msgid="2481581696365146473">"Av"</string>
     <string name="screensaver_settings_disabled_prompt" msgid="1239088321034437608">"For å kontrollere hva som skjer når telefonen er plassert i dokken og/eller i hvilemodus, slå på skjermspareren."</string>
-    <string name="screensaver_settings_when_to_dream" msgid="7262410541382890146">"Når du skal begynne"</string>
+    <string name="screensaver_settings_when_to_dream" msgid="7262410541382890146">"Starttidspunkt"</string>
     <string name="screensaver_settings_current" msgid="4663846038247130023">"Nåværende skjermsparer"</string>
     <string name="screensaver_settings_dream_start" msgid="4998187847985120168">"Start nå"</string>
     <string name="screensaver_settings_button" msgid="7292214707625717013">"Innstillinger"</string>
     <string name="automatic_brightness" msgid="5014143533884135461">"Automatisk lysstyrke"</string>
     <string name="lift_to_wake_title" msgid="4555378006856277635">"Aktiver enheten med løftebevegelser"</string>
     <string name="ambient_display_screen_title" msgid="4252755516328775766">"Passiv skjerm"</string>
-    <!-- no translation found for ambient_display_screen_summary_always_on (7337555569694794132) -->
-    <skip />
+    <string name="ambient_display_screen_summary_always_on" msgid="7337555569694794132">"Alltid på / økt batteribruk"</string>
     <string name="ambient_display_screen_summary_notifications" msgid="1449570742600868654">"Nye varsler"</string>
-    <string name="ambient_display_category_triggers" msgid="4359289754456268573">"Når det skal vises"</string>
+    <string name="ambient_display_category_triggers" msgid="4359289754456268573">"Når den skal vises"</string>
     <string name="doze_title" msgid="2375510714460456687">"Nye varsler"</string>
     <string name="doze_summary" msgid="3846219936142814032">"Skjermen slås på når du mottar varsler"</string>
     <string name="doze_always_on_title" msgid="1046222370442629646">"Alltid på"</string>
-    <!-- no translation found for doze_always_on_summary (6978257596231155345) -->
-    <skip />
+    <string name="doze_always_on_summary" msgid="6978257596231155345">"Vis klokkeslett, varselikoner og annen informasjon. Økt batteribruk."</string>
     <string name="title_font_size" msgid="4405544325522105222">"Skriftstørrelse"</string>
     <string name="short_summary_font_size" msgid="6819778801232989076">"Gjør teksten større eller mindre"</string>
     <string name="sim_lock_settings" msgid="3392331196873564292">"Innstillinger for SIM-kort-lås"</string>
@@ -1116,7 +1132,6 @@
     <string name="baseband_version" msgid="1848990160763524801">"Basisbåndversjon"</string>
     <string name="kernel_version" msgid="9192574954196167602">"Kjerneversjon"</string>
     <string name="build_number" msgid="3075795840572241758">"Delversjonsnummer"</string>
-    <string name="selinux_status" msgid="6212165375172061672">"SELinux-status"</string>
     <string name="device_info_not_available" msgid="8062521887156825182">"Ikke tilgjengelig"</string>
     <string name="device_status_activity_title" msgid="1411201799384697904">"Status"</string>
     <string name="device_status" msgid="607405385799807324">"Status"</string>
@@ -1144,7 +1159,6 @@
     <string name="status_wifi_mac_address" msgid="2202206684020765378">"MAC-adresse for Wi-Fi"</string>
     <string name="status_bt_address" msgid="4195174192087439720">"Bluetooth-adresse"</string>
     <string name="status_serial_number" msgid="2257111183374628137">"Serienummer"</string>
-    <string name="status_unavailable" msgid="7862009036663793314">"Ikke tilgjengelig"</string>
     <string name="status_up_time" msgid="7294859476816760399">"Oppetid"</string>
     <string name="status_awake_time" msgid="2393949909051183652">"Våken tid"</string>
     <string name="internal_memory" msgid="9129595691484260784">"Intern lagring"</string>
@@ -1243,7 +1257,7 @@
     <string name="storage_detail_system" msgid="4629506366064709687">"System"</string>
     <string name="storage_detail_explore" msgid="7911344011431568294">"Utforsk <xliff:g id="NAME">^1</xliff:g>"</string>
     <string name="storage_detail_dialog_other" msgid="8907101974576694793">"Annet omfatter delte filer lagret av apper, filer lastet ned fra Internett eller Bluetooth, Android-filer og så videre. \n\nFor å se det synlige innholdet på <xliff:g id="NAME">^1</xliff:g>, trykk på Utforsk."</string>
-    <string name="storage_detail_dialog_system" msgid="862835644848361569">"Delen System inneholder filer som brukes for å kjøre Android-versjon <xliff:g id="VERSION">%s</xliff:g>"</string>
+    <string name="storage_detail_dialog_system" msgid="862835644848361569">"Systemet inkluderer filer som brukes for å kjøre Android-versjon <xliff:g id="VERSION">%s</xliff:g>"</string>
     <string name="storage_detail_dialog_user" msgid="3267254783294197804">"<xliff:g id="USER_0">^1</xliff:g> kan ha lagret bilder, musikk, apper eller andre data, som bruker <xliff:g id="SIZE">^2</xliff:g> lagringsplass. \n\nFor å se mer informasjon, bytt til <xliff:g id="USER_1">^1</xliff:g>."</string>
     <string name="storage_wizard_init_title" msgid="5085400514028585772">"Konfigurer <xliff:g id="NAME">^1</xliff:g>"</string>
     <string name="storage_wizard_init_external_title" msgid="4867326438945303598">"Bruk som bærbar lagring"</string>
@@ -1320,6 +1334,7 @@
     <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>
     <string name="reset_dashboard_title" msgid="6254873816990678620">"Alternativer for tilbakestilling"</string>
+    <string name="reset_dashboard_summary" msgid="4851012632493522755">"Nettverket, appene eller enheten kan tilbakestilles"</string>
     <string name="reset_network_title" msgid="6166025966016873843">"Tilbakestil Wi-Fi, mobil og Bluetooth"</string>
     <string name="reset_network_desc" msgid="5547979398298881406">"Dette tilbakestiller alle nettverksinnstillinger, inkludert:\n\n"<li>"Wi‑Fi"</li>\n<li>"Mobildata"</li>\n<li>"Bluetooth"</li></string>
     <string name="reset_network_button_text" msgid="2035676527471089853">"Tilbakestill innstillingene"</string>
@@ -1328,17 +1343,14 @@
     <string name="reset_network_confirm_title" msgid="1759888886976962773">"Vil du tilbakestille?"</string>
     <string name="network_reset_not_available" msgid="7188610385577164676">"Tilbakestilling av nettverket er ikke tilgjengelig for denne brukeren"</string>
     <string name="reset_network_complete_toast" msgid="787829973559541880">"Nettverksinnstillingene er tilbakestilt"</string>
-    <string name="master_clear_title" msgid="6617679904229218425">"Slett alle data (tilbakestilling til fabrikkstandard)"</string>
-    <plurals name="master_clear_with_account_summary" formatted="false" msgid="5911377203778818712">
-      <item quantity="other"><xliff:g id="ACCOUNT_COUNT">%1$d</xliff:g> kontoer blir tilbakestilt</item>
-      <item quantity="one">1 konto blir tilbakestilt</item>
-    </plurals>
-    <string name="master_clear_summary" msgid="6902443944660426951">"Intern lagring og alle dataene tilbakestilles"</string>
+    <string name="master_clear_title" msgid="3531267871084279512">"Slett alle data (tilbakestilling til fabrikkstandard)"</string>
     <string name="master_clear_desc" product="tablet" msgid="9146059417023157222">"Dette sletter alle data fra nettbrettets "<b>"interne lagringsplass"</b>", inkludert følgende:\n\n"<li>"Google-kontoen din"</li>\n<li>"Data og innstillinger for system og apper"</li>\n<li>"Nedlastede apper"</li></string>
     <string name="master_clear_desc" product="default" msgid="4800386183314202571">"Dette sletter alle data fra telefonens "<b>"interne lagringsplass"</b>", inkludert følgende:\n\n"<li>"Google-kontoen din"</li>\n<li>"Data og innstillinger for system og apper"</li>\n<li>"Nedlastede apper"</li></string>
     <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"Du er for øyeblikket pålogget følgende kontoer:\n"</string>
     <string name="master_clear_other_users_present" product="default" msgid="5161423070702470742">\n\n"Det er andre brukere tilstede på denne enheten.\n"</string>
     <string name="master_clear_desc_also_erases_external" msgid="1903185203791274237"><li>"Musikk"</li>\n<li>"Bilder"</li>\n<li>"Andre brukerdata"</li></string>
+    <string name="master_clear_desc_also_erases_esim" msgid="312352697653096008"><li>"Operatører på e-SIM-kortet"</li></string>
+    <string name="master_clear_desc_no_cancel_mobile_plan" msgid="5460926449093211144">\n\n"Dette kansellerer ikke mobilabonnementet ditt."</string>
     <string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="7744115866662613411">\n\n"For å slette musikk, bilder og andre brukerdata må "<b>"USB-lageret"</b>" tømmes."</string>
     <string name="master_clear_desc_erase_external_storage" product="default" msgid="4801026652617377093">\n\n"For å slette musikk, bilder og andre brukerdata, må "<b>"SD-kortet"</b>" tømmes."</string>
     <string name="erase_external_storage" product="nosdcard" msgid="969364037450286809">"Slett USB-lagring"</string>
@@ -1455,15 +1467,16 @@
     <string name="settings_safetylegal_activity_title" msgid="6901214628496951727">"Sikkerhetsinformasjon"</string>
     <string name="settings_safetylegal_activity_unreachable" msgid="250674109915859456">"Du har ingen datatilkobling. Hvis du vil se denne informasjonen nå, kan du gå til %s fra en datamaskin som er koblet til Internett."</string>
     <string name="settings_safetylegal_activity_loading" msgid="8059022597639516348">"Laster inn …"</string>
-    <string name="lockpassword_choose_your_password_header" msgid="8624900666929394990">"Velg passord"</string>
-    <string name="lockpassword_choose_your_password_header_for_fingerprint" msgid="6624409510609085450">"Angi passord for å bruke fingeravtrykk"</string>
-    <string name="lockpassword_choose_your_pattern_header" msgid="6949761069941694050">"Velg mønster"</string>
-    <string name="lockpassword_choose_your_pattern_header_for_fingerprint" msgid="5901096361617543819">"Angi mønster for å bruke fingeravtrykk"</string>
-    <string name="lockpassword_choose_your_pin_header" msgid="7598849519816138302">"Velg PIN-kode"</string>
-    <string name="lockpassword_choose_your_pin_header_for_fingerprint" msgid="765344692615917183">"Angi PIN for å bruke fingeravtrykk"</string>
-    <string name="lockpassword_confirm_your_password_header" msgid="6308478184889846633">"Bekreft passordet ditt"</string>
+    <string name="lockpassword_choose_your_screen_lock_header" msgid="3872462096767152394">"Angi en skjermlås"</string>
+    <string name="lockpassword_choose_your_password_message" msgid="1197569283524841412">"Angi et passord for sikkerheten"</string>
+    <string name="lockpassword_choose_your_password_header_for_fingerprint" msgid="2541818487015343503">"For å bruke fingeravtrykk, angi passord"</string>
+    <string name="lockpassword_choose_your_pattern_header_for_fingerprint" msgid="7709785406243556723">"For å bruke fingeravtrykk, angi mønster"</string>
+    <string name="lockpassword_choose_your_pin_message" msgid="1875420718677275646">"Angi en PIN-kode for sikkerheten"</string>
+    <string name="lockpassword_choose_your_pin_header_for_fingerprint" msgid="1549639053195796674">"For å bruke fingeravtrykk, angi PIN-kode"</string>
+    <string name="lockpassword_choose_your_pattern_message" msgid="5986983400689720015">"Angi et mønster for sikkerheten"</string>
+    <string name="lockpassword_confirm_your_password_header" msgid="1266027268220850931">"Angi passordet på nytt"</string>
     <string name="lockpassword_confirm_your_pattern_header" msgid="7543433733032330821">"Bekreft mønsteret"</string>
-    <string name="lockpassword_confirm_your_pin_header" msgid="49038294648213197">"Bekreft PIN-koden"</string>
+    <string name="lockpassword_confirm_your_pin_header" msgid="7744513791910572550">"Angi PIN-koden på nytt"</string>
     <string name="lockpassword_confirm_passwords_dont_match" msgid="5140892109439191415">"Passordene samsvarer ikke"</string>
     <string name="lockpassword_confirm_pins_dont_match" msgid="7226244811505606217">"PIN-kodene samsvarer ikke"</string>
     <string name="lockpassword_choose_lock_generic_header" msgid="3811438094903786145">"Valg for opplåsing"</string>
@@ -1476,18 +1489,18 @@
     <string name="lockpassword_confirm_your_pattern_generic_profile" msgid="4435638308193361861">"Bruk jobbmønsteret ditt for å fortsette"</string>
     <string name="lockpassword_confirm_your_pin_generic_profile" msgid="3730141667547002246">"Skriv inn jobb-PIN-koden din for å fortsette"</string>
     <string name="lockpassword_confirm_your_password_generic_profile" msgid="4250642723467019894">"Skriv inn jobbpassordet ditt for å fortsette"</string>
-    <!-- no translation found for lockpassword_strong_auth_required_device_pattern (530802132223800623) -->
-    <skip />
-    <!-- no translation found for lockpassword_strong_auth_required_device_pin (7829294830078036417) -->
-    <skip />
-    <!-- no translation found for lockpassword_strong_auth_required_device_password (3552644641574796973) -->
-    <skip />
-    <!-- no translation found for lockpassword_strong_auth_required_work_pattern (3003781907040522053) -->
-    <skip />
-    <!-- no translation found for lockpassword_strong_auth_required_work_pin (3367491332598821552) -->
-    <skip />
-    <!-- no translation found for lockpassword_strong_auth_required_work_password (8159775129968582940) -->
-    <skip />
+    <string name="lockpassword_strong_auth_required_device_pattern" msgid="530802132223800623">"Bruk enhetsmønsteret ditt for bedre beskyttelse"</string>
+    <string name="lockpassword_strong_auth_required_device_pin" msgid="7829294830078036417">"Skriv inn PIN-koden din for bedre beskyttelse"</string>
+    <string name="lockpassword_strong_auth_required_device_password" msgid="3552644641574796973">"Skriv inn enhetspassordet ditt for bedre beskyttelse"</string>
+    <string name="lockpassword_strong_auth_required_work_pattern" msgid="3003781907040522053">"Bruk jobbmønsteret ditt for bedre beskyttelse"</string>
+    <string name="lockpassword_strong_auth_required_work_pin" msgid="3367491332598821552">"Skriv inn jobb-PIN-koden din for bedre beskyttelse"</string>
+    <string name="lockpassword_strong_auth_required_work_password" msgid="8159775129968582940">"Skriv inn jobbpassordet ditt for bedre beskyttelse"</string>
+    <string name="lockpassword_confirm_your_pattern_details_frp" msgid="6757336656791723193">"Telefonen er tilbakestilt til fabrikkstandard. For å bruke den, skriv inn det forrige mønsteret ditt."</string>
+    <string name="lockpassword_confirm_your_pin_details_frp" msgid="826520613445990470">"Telefonen er tilbakestilt til fabrikkstandard. For å bruke den, skriv inn den forrige PIN-koden din."</string>
+    <string name="lockpassword_confirm_your_password_details_frp" msgid="8944081074615739040">"Telefonen er tilbakestilt til fabrikkstandard. For å bruke den, skriv inn det forrige passordet ditt."</string>
+    <string name="lockpassword_confirm_your_pattern_header_frp" msgid="2898036091609128286">"Bekreft mønster"</string>
+    <string name="lockpassword_confirm_your_pin_header_frp" msgid="4141601774778898803">"Bekreft PIN-kode"</string>
+    <string name="lockpassword_confirm_your_password_header_frp" msgid="3762615419295360480">"Bekreft passord"</string>
     <string name="lockpassword_invalid_pin" msgid="15588049067548470">"Feil PIN-kode"</string>
     <string name="lockpassword_invalid_password" msgid="4038507398784975200">"Feil passord"</string>
     <string name="lockpattern_need_to_unlock_wrong" msgid="1745247595356012176">"Feil mønster"</string>
@@ -1511,7 +1524,7 @@
     <string name="lockpattern_settings_enable_visible_pattern_title" msgid="2615606088906120711">"Gjør mønsteret synlig"</string>
     <string name="lockpattern_settings_enable_visible_pattern_title_profile" msgid="4864525074768391381">"Gjør profilmønsteret synlig"</string>
     <string name="lockpattern_settings_enable_tactile_feedback_title" msgid="4389015658335522989">"Vibrer ved trykk"</string>
-    <string name="lockpattern_settings_enable_power_button_instantly_locks" msgid="5735444062633666327">"Av/på låser umiddelbart"</string>
+    <string name="lockpattern_settings_enable_power_button_instantly_locks" msgid="5735444062633666327">"Av/på-knapp låser umiddelbart"</string>
     <string name="lockpattern_settings_power_button_instantly_locks_summary" msgid="8196258755143711694">"Unntatt når den holdes opplåst av <xliff:g id="TRUST_AGENT_NAME">%1$s</xliff:g>"</string>
     <string name="lockpattern_settings_choose_lock_pattern" msgid="1652352830005653447">"Opplåsingsmønster"</string>
     <string name="lockpattern_settings_change_lock_pattern" msgid="1123908306116495545">"Opplåsingsmønster"</string>
@@ -1537,7 +1550,6 @@
     <string name="install_applications_title" msgid="4987712352256508946">"Tillat alle appkilder"</string>
     <string name="recent_app_category_title" msgid="6673071268966003928">"Nylig åpnede apper"</string>
     <string name="see_all_apps_title" msgid="1317153498074308438">"Se alle de <xliff:g id="COUNT">%1$d</xliff:g> appene"</string>
-    <string name="recent_app_summary" msgid="3366446669844932300">"for <xliff:g id="TIME">^1</xliff:g> siden"</string>
     <string name="install_all_warning" product="tablet" msgid="8310489909586138165">"Nettbrettet ditt og personopplysningene dine er mer sårbare for angrep hvis du bruker ukjente apper. Ved å installere apper fra denne kilden godtar du at du selv er ansvarlig for enhver skade på nettbrettet eller tap av data som kan oppstå, fra bruk av slike apper."</string>
     <string name="install_all_warning" product="default" msgid="1952257127370115988">"Telefonen din og personopplysningene dine er mer sårbare for angrep hvis du bruker ukjente apper. Ved å installere apper fra denne kilden godtar du at du selv er ansvarlig for enhver skade på telefonen eller tap av data som kan oppstå, fra bruk av slike apper."</string>
     <string name="advanced_settings" msgid="1777249286757067969">"Avanserte innstillinger"</string>
@@ -1724,7 +1736,7 @@
     <string name="hardkeyboard_category" msgid="5957168411305769899">"Innstillinger for fysisk tastatur"</string>
     <string name="auto_punctuate_summary" msgid="4372126865670574837">"Trykk mellomromstasten to ganger for å skrive punktum"</string>
     <string name="show_password" msgid="4837897357002495384">"Vis passord"</string>
-    <string name="show_password_summary" msgid="3365397574784829969">"Vis tegnene kjapt mens du skriver"</string>
+    <string name="show_password_summary" msgid="3365397574784829969">"Vis tegnene mens du skriver"</string>
     <string name="spellchecker_security_warning" msgid="9060897418527708922">"Denne stavekontrollen kan være i stand til å samle all tekst du skriver, herunder personlige opplysninger som passord og kredittkortnumre. Den kommer fra appen <xliff:g id="SPELLCHECKER_APPLICATION_NAME">%1$s</xliff:g>. Vil du bruke denne stavekontrollen?"</string>
     <string name="spellchecker_quick_settings" msgid="246728645150092058">"Innstillinger"</string>
     <string name="spellchecker_language" msgid="6041050114690541437">"Språk"</string>
@@ -1801,7 +1813,7 @@
     <string name="accessibility_settings_summary" msgid="981260486011624939">"Skjermlesere, skjerm, interaksjonskontroller"</string>
     <string name="vision_settings_title" msgid="4204111425716868288">"Synsinnstillinger"</string>
     <string name="vision_settings_description" msgid="5679491180156408260">"Du kan tilpasse denne enheten etter egne behov. Tilgjengelighetsfunksjonene kan du endre senere i Innstillinger."</string>
-    <string name="vision_settings_suggestion_title" msgid="917294957154878441">"Øk skriftstørrelsen"</string>
+    <string name="vision_settings_suggestion_title" msgid="8058794060304707004">"Endre skriftstørrelse"</string>
     <string name="screen_reader_category_title" msgid="7739154903913400641">"Skjermlesere"</string>
     <string name="audio_and_captions_category_title" msgid="3420727114421447524">"Lyd og tekst på skjermen"</string>
     <string name="display_category_title" msgid="685461049938269166">"Skjerm"</string>
@@ -1838,7 +1850,6 @@
     <string name="accessibility_display_inversion_preference_subtitle" msgid="7052959202195368109">"Kan påvirke ytelsen"</string>
     <string name="accessibility_autoclick_preference_title" msgid="7014499339068449623">"Klikk etter at markøren stanser"</string>
     <string name="accessibility_autoclick_delay_preference_title" msgid="3962261178385106006">"Forsinkelse før klikk"</string>
-    <string name="preference_summary_default_combination" msgid="8532964268242666060">"<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">"PÅ"</string>
     <string name="accessibility_summary_state_disabled" msgid="2241315620132005595">"AV"</string>
     <string name="enable_quick_setting" msgid="2366999897816894536">"Vis i hurtiginnstillingene"</string>
@@ -1957,12 +1968,14 @@
     <string name="background_activity_summary_on" msgid="649282072540085599">"Apen kan kjøre i bakgrunnen når den ikke er i bruk"</string>
     <string name="background_activity_summary_off" msgid="7666330699090632040">"Appens bakgrunnsaktivitet er begrenset når den ikke er i bruk"</string>
     <string name="background_activity_summary_disabled" msgid="3710669050484599847">"Appen har ikke tillatelse til å kjøre i bakgrunnen"</string>
+    <string name="background_activity_summary_whitelisted" msgid="7375400051141016808">"Appen kan ikke optimaliseres for batteribruk"</string>
+    <string name="background_activity_warning_dialog_title" msgid="2216249969149568871">"Vil du begrense bakgrunnsaktivitet?"</string>
+    <string name="background_activity_warning_dialog_text" msgid="7049624449246121981">"Hvis du begrenser bakgrunnsaktivitet for en app, kan det oppstå problemer"</string>
     <string name="device_screen_usage" msgid="3386088035570409683">"Skjermbruk siden batteriet var fulladet"</string>
     <string name="device_screen_consumption" msgid="4607589286438986687">"Strømforbruk fra skjermen"</string>
     <string name="device_cellular_network" msgid="4724773411762382950">"Skanning etter mobilnettverk"</string>
-    <string name="power_last_full_charge_summary" msgid="532845389094620657">"for <xliff:g id="TIME">^1</xliff:g> siden"</string>
-    <string name="power_usage_list_summary" msgid="6775339745194635000">"Appbruk siden batteriet var fulladet (for <xliff:g id="TIME">^1</xliff:g> siden)"</string>
-    <string name="power_usage_list_summary_device" msgid="7036566616386864302">"Bruk av enheten siden sist batteriet var fulladet (for <xliff:g id="TIME">^1</xliff:g> siden)"</string>
+    <string name="power_usage_list_summary" msgid="6393929085382334341">"Appbruk siden sist batteriet var fulladet (<xliff:g id="RELATIVE_TIME">^1</xliff:g>)"</string>
+    <string name="power_usage_list_summary_device" msgid="4461926045610455423">"Bruk av enheten siden sist batteriet var fulladet (<xliff:g id="RELATIVE_TIME">^1</xliff:g>)"</string>
     <string name="screen_usage_summary" msgid="6687403051423153550">"Hvor lenge skjermen har vært på siden batteriet var fulladet"</string>
     <string name="device_usage_list_summary" msgid="5623036661468763251">"Enhetsbruk siden batteriet var fulladet"</string>
     <string name="battery_since_unplugged" msgid="338073389740738437">"Batteribruk siden strømmen ble trukket ut"</string>
@@ -2208,14 +2221,14 @@
     <string name="credentials_unlock_hint" msgid="2301301378040499348">"Skriv inn passordet for legitimasjonslageret."</string>
     <string name="credentials_old_password" msgid="7553393815538684028">"Nåværende passord:"</string>
     <string name="credentials_reset_hint" msgid="6297256880896133631">"Vil du fjerne alt innholdet?"</string>
-    <string name="credentials_password_too_short" msgid="7502749986405522663">"Passordet må bestå av minst åtte tegn."</string>
     <string name="credentials_wrong_password" msgid="2541932597104054807">"Feil passord."</string>
     <string name="credentials_reset_warning" msgid="5320653011511797600">"Feil passord. Du har ett forsøk til før legitimasjonslageret slettes."</string>
     <string name="credentials_reset_warning_plural" msgid="6514085665301095279">"Feil passord. Du har <xliff:g id="NUMBER">%1$d</xliff:g> flere forsøk før legitimasjonslageret slettes."</string>
     <string name="credentials_erased" msgid="2907836028586342969">"Legitimasjonslageret ble tømt."</string>
     <string name="credentials_not_erased" msgid="7685932772284216097">"Leg.lageret kan ikke slettes."</string>
     <string name="credentials_enabled" msgid="7588607413349978930">"Akkreditivlageret er aktivert."</string>
-    <string name="credentials_configure_lock_screen_hint" msgid="6757119179588664966">"Du må angi en PIN-kode eller et passord for skjermlås før du kan bruke legitimasjonslagring."</string>
+    <string name="credentials_configure_lock_screen_hint" msgid="8058230497337529036">"Enheten din må ha en sikker låseskjerm før du kan bruke legitimasjonslager"</string>
+    <string name="credentials_configure_lock_screen_button" msgid="253239765216055321">"ANGI LÅS"</string>
     <string name="usage_access_title" msgid="332333405495457839">"Apper med brukstilgang"</string>
     <string name="emergency_tone_title" msgid="1055954530111587114">"Nødtone"</string>
     <string name="emergency_tone_summary" msgid="722259232924572153">"Velg oppførsel når en nødsamtale opprettes"</string>
@@ -2335,8 +2348,6 @@
     <skip />
     <string name="cant_sync_dialog_title" msgid="2777238588398046285">"Kan ikke synkronisere manuelt"</string>
     <string name="cant_sync_dialog_message" msgid="1938380442159016449">"Synkronisering for dette elementet er deaktivert. Hvis du vil endre innstillinger, kan du midlertidig slå på bakgrunnsdata og automatisk synkronisering."</string>
-    <string name="wimax_settings" msgid="2655139497028469039">"4G"</string>
-    <string name="status_wimax_mac_address" msgid="8390791848661413416">"4G MAC-adresse"</string>
     <string name="enter_password" msgid="8035706727471334122">"Skriv inn passordet ditt for å starte Android"</string>
     <string name="enter_pin" msgid="5305333588093263790">"Skriv inn PIN-koden din for å starte Android"</string>
     <string name="enter_pattern" msgid="4187435713036808566">"Tegn mønsteret ditt for å starte Android"</string>
@@ -2350,6 +2361,7 @@
     <string name="misc_files_selected_count" msgid="4647048020823912088">"du har valgt <xliff:g id="NUMBER">%1$d</xliff:g> av <xliff:g id="TOTAL">%2$d</xliff:g>"</string>
     <string name="misc_files_selected_count_bytes" msgid="2876232009069114352">"<xliff:g id="NUMBER">%1$s</xliff:g> av totalt <xliff:g id="TOTAL">%2$s</xliff:g>"</string>
     <string name="select_all" msgid="1562774643280376715">"Velg alle"</string>
+    <string name="data_plan_usage_manage_plans_button_text" msgid="8997761990902708162">"Administrer abonnementer"</string>
     <string name="data_usage_summary_title" msgid="3804110657238092929">"Databruk"</string>
     <string name="data_usage_app_summary_title" msgid="4147258989837459172">"Appens databruk"</string>
     <string name="data_usage_accounting" msgid="7170028915873577387">"Operatørens måling av databruk samsvarer ikke nødvendigvis med enhetens måling."</string>
@@ -2435,6 +2447,9 @@
     <string name="data_usage_metered_mobile" msgid="5423305619126978393">"Mobilnettverk"</string>
     <string name="data_usage_metered_wifi" msgid="1761738002328299714">"Wi‑Fi-nettverk med datamåling"</string>
     <string name="data_usage_metered_wifi_disabled" msgid="727808462375941567">"Du må slå på Wi-Fi for å velge nettverk med datamåling."</string>
+    <string name="data_usage_metered_auto" msgid="1262028400911918865">"Automatisk"</string>
+    <string name="data_usage_metered_yes" msgid="9217539611385225894">"Med datamåling"</string>
+    <string name="data_usage_metered_no" msgid="4025232961929071789">"Uten datamåling"</string>
     <string name="data_usage_disclaimer" msgid="6887858149980673444">"Operatørens måling av databruk samsvarer ikke nødvendigvis med enhetens måling."</string>
     <string name="cryptkeeper_emergency_call" msgid="198578731586097145">"Nødanrop"</string>
     <string name="cryptkeeper_return_to_call" msgid="5613717339452772491">"Tilbake til anrop"</string>
@@ -2526,9 +2541,6 @@
     <string name="backup_pw_set_button_text" msgid="2387480910044648795">"Angi passord for sikkerhetskopiering"</string>
     <string name="backup_pw_cancel_button_text" msgid="8845630125391744615">"Avbryt"</string>
     <string name="additional_system_update_settings_list_item_title" msgid="214987609894661992">"Ytterligere systemoppdateringer"</string>
-    <string name="selinux_status_disabled" msgid="924551035552323327">"Slått av"</string>
-    <string name="selinux_status_permissive" msgid="6004965534713398778">"Valgfri"</string>
-    <string name="selinux_status_enforcing" msgid="2252703756208463329">"Håndhevende"</string>
     <string name="ssl_ca_cert_warning" msgid="2045866713601984673">"Nettverket blir muligens overvåket"</string>
     <string name="done_button" msgid="1991471253042622230">"Ferdig"</string>
     <plurals name="ssl_ca_cert_dialog_title" formatted="false" msgid="7145092748045794650">
@@ -2559,7 +2571,7 @@
     <string name="user_summary_restricted_not_set_up" msgid="1628116001964325544">"Ikke konfigurert – begrenset profil"</string>
     <string name="user_summary_managed_profile_not_set_up" msgid="1659125858619760573">"Ikke konfigurert – arbeidsprofil"</string>
     <string name="user_admin" msgid="993402590002400782">"Administrator"</string>
-    <string name="user_you" msgid="1639158809315025986">"Deg (<xliff:g id="NAME">%s</xliff:g>)"</string>
+    <string name="user_you" msgid="1639158809315025986">"Du (<xliff:g id="NAME">%s</xliff:g>)"</string>
     <string name="user_nickname" msgid="5148818000228994488">"Kallenavn"</string>
     <string name="user_add_user_type_title" msgid="2146438670792322349">"Legg til"</string>
     <string name="user_add_max_count" msgid="5405885348463433157">"Du kan legge til opptil <xliff:g id="USER_COUNT">%1$d</xliff:g> brukere"</string>
@@ -2571,7 +2583,7 @@
     <string name="user_add_user_message_long" msgid="8562152293752222985">"Du kan dele denne enheten med andre folk ved å opprette flere brukere. Hver bruker har sin egen plass de kan tilpasse med apper, bakgrunner og annet. Brukere kan også endre enhetsinnstillinger, for eksempel Wi-Fi, som påvirker alle.\n\nNår du legger til en ny bruker, må vedkommende angi innstillinger for plassen sin.\n\nAlle brukere kan oppdatere apper for alle andre brukere."</string>
     <string name="user_add_user_message_short" msgid="1511354412249044381">"Når du legger til en ny bruker, må vedkommende konfigurere sitt eget område.\n\nAlle brukere kan oppdatere apper for alle andre brukere."</string>
     <string name="user_setup_dialog_title" msgid="1765794166801864563">"Konfigurere brukeren nå?"</string>
-    <string name="user_setup_dialog_message" msgid="1004068621380867148">"Sørg for at brukeren er tilgjengelig sånn at vedkommende kan konfigurere området sitt på enheten"</string>
+    <string name="user_setup_dialog_message" msgid="1004068621380867148">"Sørg for at brukeren er tilgjengelig for å konfigurere området sitt på enheten"</string>
     <string name="user_setup_profile_dialog_message" msgid="3896568553327558731">"Vil du konfigurere profilen nå?"</string>
     <string name="user_setup_button_setup_now" msgid="3391388430158437629">"Konfigurer nå"</string>
     <string name="user_setup_button_setup_later" msgid="3068729597269172401">"Ikke nå"</string>
@@ -2726,6 +2738,7 @@
       <item quantity="other">Vis %d skjulte elementer</item>
       <item quantity="one">Vis %d skjult element</item>
     </plurals>
+    <string name="dashboard_suggestion_condition_footer_content_description" msgid="2898588191174845961">"Skjul"</string>
     <string name="network_dashboard_title" msgid="4771589228992391573">"Nettverk og Internett"</string>
     <string name="network_dashboard_summary_mobile" msgid="3851083934739500429">"mobil"</string>
     <string name="network_dashboard_summary_data_usage" msgid="3843261364705042212">"databruk"</string>
@@ -2785,8 +2798,7 @@
     <string name="keywords_gesture" msgid="3526905012224714078">"bevegelser"</string>
     <string name="keywords_payment_settings" msgid="5220104934130446416">"betal, trykk på, betalinger"</string>
     <string name="keywords_backup" msgid="470070289135403022">"sikkerhetskopi, sikkerhetskopiér"</string>
-    <!-- no translation found for keywords_assist_gesture_launch (813968759791342591) -->
-    <skip />
+    <string name="keywords_assist_gesture_launch" msgid="813968759791342591">"bevegelse"</string>
     <string name="setup_wifi_nfc_tag" msgid="9028353016222911016">"Konfigurer NFC-tag for Wi-Fi"</string>
     <string name="write_tag" msgid="8571858602896222537">"Skriv"</string>
     <string name="status_awaiting_tap" msgid="2130145523773160617">"Trykk på en brikke for å skrive"</string>
@@ -2829,8 +2841,14 @@
       <item quantity="other"><xliff:g id="ON_COUNT">%d</xliff:g> automatiske regler er slått på</item>
       <item quantity="one">1 automatisk regel er slått på</item>
     </plurals>
-    <string name="zen_mode_settings_title" msgid="842308776768942600">"Innstillinger for Ikke forstyrr"</string>
-    <string name="zen_mode_priority_settings_title" msgid="2623117023031824309">"Prioritet tillater bare"</string>
+    <string name="zen_mode_settings_title" msgid="1066226840983908121">"Ikke forstyrr"</string>
+    <string name="zen_mode_behavior_settings_title" msgid="1463303933529313969">"Atferd"</string>
+    <string name="zen_mode_behavior_allow_title" msgid="3845615648136218141">"Tillat lyd og vibrasjoner fra"</string>
+    <string name="zen_mode_behavior_no_sound" msgid="1219626004723208056">"Ingen lyd"</string>
+    <string name="zen_mode_behavior_total_silence" msgid="6716603819806610626">"Ingen lyd (total stillhet)"</string>
+    <string name="zen_mode_behavior_no_sound_except" msgid="4968477585788243114">"Ingen lyd, unntatt <xliff:g id="CATEGORIES">%1$s</xliff:g>"</string>
+    <!-- no translation found for zen_mode_behavior_alarms_only (2423480992071472963) -->
+    <skip />
     <string name="zen_mode_automation_settings_title" msgid="4228995740594063774">"Automatiske regler"</string>
     <string name="zen_mode_automation_suggestion_title" msgid="5105443455143476201">"Angi Ikke forstyrr-regler"</string>
     <string name="zen_mode_automation_suggestion_summary" msgid="4732808039946935657">"Begrens lyd og vibrering til bestemte tider"</string>
@@ -2872,13 +2890,15 @@
     <string name="notifications_title" msgid="8086372779371204971">"Varsler"</string>
     <string name="app_notifications_title" msgid="5810577805218003760">"Appvarsler"</string>
     <string name="notification_channel_title" msgid="2260666541030178452">"Varselkategori"</string>
+    <string name="notification_group_title" msgid="7180506440133859601">"Varselkategorigruppe"</string>
     <string name="notification_importance_title" msgid="848692592679312666">"Viktighet"</string>
-    <string name="notification_importance_unspecified" msgid="2196023702875112081">"La appen bestemme"</string>
+    <string name="notification_importance_unspecified" msgid="6622173510486113958">"Tillat lyd"</string>
     <string name="notification_importance_blocked" msgid="7938180808339386300">"Vis aldri varsler"</string>
     <string name="notification_importance_min" msgid="5455049524984686275">"Ingen lyd eller visuell forstyrrelse"</string>
     <string name="notification_importance_low" msgid="8881468429453766553">"Ingen lyd"</string>
     <string name="notification_importance_default" msgid="5958338024601957516">"Lag lyd"</string>
     <string name="notification_importance_high" msgid="2082429479238228527">"Lag lyd og vis i forgrunnen"</string>
+    <string name="notification_importance_high_silent" msgid="2667033773703765252">"Vis i forgrunnen"</string>
     <string name="notification_importance_min_title" msgid="6974673091137544803">"Lav"</string>
     <string name="notification_importance_low_title" msgid="8131254047772814309">"Middels"</string>
     <string name="notification_importance_default_title" msgid="9120383978536089489">"Høy"</string>
@@ -2915,15 +2935,19 @@
     <string name="picture_in_picture_keywords" msgid="8361318686701764690">"pip bilde i"</string>
     <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>
-    <!-- no translation found for picture_in_picture_app_detail_summary (1264019085827708920) -->
-    <skip />
+    <string name="picture_in_picture_app_detail_summary" msgid="1264019085827708920">"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="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>
     <string name="app_notifications_off_desc" msgid="4882445501376722969">"Android blokkerer varslene fra denne appen fra å vises på denne enheten"</string>
     <string name="channel_notifications_off_desc" msgid="5899225298718840635">"Android blokkerer denne varselkategorien fra å vises på denne enheten"</string>
+    <string name="channel_group_notifications_off_desc" msgid="1620950416247316370">"Android blokkerer denne varselgruppen fra å vises på denne enheten"</string>
     <string name="notification_channels" msgid="5346841743182627500">"Kategorier"</string>
     <string name="notification_channels_other" msgid="5645317113885788226">"Annet"</string>
+    <plurals name="notification_group_summary" formatted="false" msgid="3420621520561455358">
+      <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> kategorier</item>
+      <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> kategori</item>
+    </plurals>
     <string name="no_channels" msgid="3077375508177744586">"Denne appen har ikke publisert noen varsler"</string>
     <string name="app_settings_link" msgid="8894946007543660906">"Flere innstillinger i appen"</string>
     <string name="app_notification_listing_summary_zero" msgid="6482582965081108108">"Slått på for alle apper"</string>
@@ -3000,12 +3024,14 @@
     <string name="zen_mode_from_starred" msgid="2678345811950997027">"Bare fra stjernemerkede kontakter"</string>
     <string name="zen_mode_from_none" msgid="8219706639954614136">"Ingen"</string>
     <string name="zen_mode_alarms" msgid="2165302777886552926">"Alarmer"</string>
+    <!-- no translation found for zen_mode_media_system_other (8900209390529859777) -->
+    <skip />
     <string name="zen_mode_reminders" msgid="5458502056440485730">"Påminnelser"</string>
     <string name="zen_mode_events" msgid="7914446030988618264">"Hendelser"</string>
     <string name="zen_mode_all_callers" msgid="584186167367236922">"Alle oppringere"</string>
     <string name="zen_mode_selected_callers" msgid="3127598874060615742">"Utvalgte oppringere"</string>
     <string name="zen_mode_repeat_callers" msgid="5019521886428322131">"Gjentatte anrop"</string>
-    <string name="zen_mode_repeat_callers_summary" msgid="7192713032364140137">"Tillat hvis den samme personen ringer enda en gang innen <xliff:g id="MINUTES">%d</xliff:g> minutter"</string>
+    <string name="zen_mode_repeat_callers_summary" msgid="239685342222975733">"Hvis samme person ringer enda en gang innen <xliff:g id="MINUTES">%d</xliff:g> minutter"</string>
     <string name="zen_mode_when" msgid="2767193283311106373">"Slå på automatisk"</string>
     <string name="zen_mode_when_never" msgid="8809494351918405602">"Aldri"</string>
     <string name="zen_mode_when_every_night" msgid="3122486110091921009">"Hver kveld"</string>
@@ -3034,6 +3060,7 @@
     <string name="zen_mode_screen_off_visual_interruptions" msgid="4850792880144382633">"Når skjermen er av"</string>
     <string name="zen_mode_no_visual_interruptions" msgid="8742776003822778472">"Når skjermen er på eller av"</string>
     <string name="notification_app_settings_button" msgid="6685640230371477485">"Varselinnstillinger"</string>
+    <string name="suggestion_button_text" msgid="3275010948381252006">"Ok"</string>
     <string name="device_feedback" msgid="3238056036766293294">"Send tilbakemelding om enheten"</string>
     <string name="restr_pin_enter_admin_pin" msgid="1085834515677448072">"Skriv inn PIN-koden for administrator"</string>
     <string name="switch_on_text" msgid="1124106706920572386">"På"</string>
@@ -3218,6 +3245,7 @@
     <string name="usb_summary_file_transfers" msgid="6435943692610175111">"Overføring av filer"</string>
     <string name="usb_summary_photo_transfers" msgid="8440204169576585250">"Overføring av bilder (PTP)"</string>
     <string name="usb_summary_MIDI" msgid="5687906612187885908">"Bruk av enheten som MIDI"</string>
+    <string name="sms_mirroring_pref" msgid="6475043279147376031">"SMS-speiling"</string>
     <string name="background_check_pref" msgid="7550258400138010979">"Bakgrunnssjekk"</string>
     <string name="background_check_title" msgid="4534254315824525593">"Full bakgrunnstilgang"</string>
     <string name="assist_access_context_title" msgid="2269032346698890257">"Bruk teksten fra skjermen"</string>
@@ -3284,7 +3312,7 @@
     <string name="write_settings_title" msgid="4232152481902542284">"Kan endre systeminnstillingene"</string>
     <string name="write_system_settings" msgid="3482913590601096763">"Endre systeminnstillingene"</string>
     <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="permit_write_settings" msgid="658555006453212691">"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>
@@ -3379,9 +3407,12 @@
     <string name="color_temperature" msgid="2070126836910615605">"Kald fargetemperatur"</string>
     <string name="color_temperature_desc" msgid="4793729830226404052">"Bruk kaldere skjermfarger"</string>
     <string name="color_temperature_toast" msgid="4974218172133854827">"For å bruke fargeendringen, slå av skjermen"</string>
-    <string name="telephony_monitor_toast" msgid="7003764250271195384">"Start enheten på nytt for å aktivere endringene i telefonmonitoren"</string>
+    <string name="connectivity_monitor_switch" msgid="9059759348648583421">"Tilkoblingsmonitor"</string>
+    <string name="connectivity_monitor_switch_summary" msgid="2828658652378866401">"Tilkoblingsmonitoren loggfører problemer som oppdages med tilkoblingen, og varsler brukeren om å sende inn en feilrapport"</string>
+    <string name="connectivity_monitor_toast" msgid="5551859612881173028">"Start enheten på nytt for å aktivere endringene i tilkoblingsmonitoren"</string>
     <string name="camera_hal_hdrplus_switch" msgid="8377365197105267466">"Kamera HAL HDR+"</string>
     <string name="camera_hal_hdrplus_toast" msgid="2063703797270055299">"Start enheten på nytt for å aktivere endringene i Kamera HAL HDR+"</string>
+    <string name="camera_laser_sensor_switch" msgid="8913588990743234440">"Kameraets lasersensor"</string>
     <string name="ota_disable_automatic_update" msgid="2319639631655915050">"Automatiske systemoppdateringer"</string>
     <string name="usage" msgid="2977875522080448986">"Bruk"</string>
     <string name="cellular_data_usage" msgid="2155683719898158203">"Bruk av mobildata"</string>
@@ -3403,11 +3434,11 @@
     </plurals>
     <string name="operator_warning" msgid="1862988028996859195">"Operatørens måling av databruk samsvarer ikke nødvendigvis med enhetens måling."</string>
     <string name="data_used_template" msgid="3245919669966296505">"<xliff:g id="ID_1">%1$s</xliff:g> er brukt"</string>
-    <string name="set_data_warning" msgid="6115364758236594593">"Angi datavarsel"</string>
-    <string name="data_warning" msgid="209133958008062117">"Advarsel for dataforbruk"</string>
+    <string name="set_data_warning" msgid="6115364758236594593">"Angi varsel om databruk"</string>
+    <string name="data_warning" msgid="209133958008062117">"Varsel om databruk"</string>
     <string name="set_data_limit" msgid="2901526323210516923">"Angi en datagrense"</string>
     <string name="data_limit" msgid="1885406964934590552">"Datagrense"</string>
-    <string name="data_usage_template" msgid="392191945602400904">"<xliff:g id="ID_1">%1$s</xliff:g> er brukt i tidsrommet <xliff:g id="ID_2">%2$s</xliff:g>"</string>
+    <string name="data_usage_template" msgid="2923744765873163859">"<xliff:g id="ID_1">%1$s</xliff:g> brukte <xliff:g id="ID_2">%2$s</xliff:g>"</string>
     <string name="configure" msgid="1029654422228677273">"Konfigurer"</string>
     <string name="data_usage_other_apps" msgid="3272872663517382050">"Andre apper som er inkludert i bruken"</string>
     <plurals name="data_saver_unrestricted_summary" formatted="false" msgid="2635267833484232703">
@@ -3476,7 +3507,7 @@
     <string name="button_confirm_convert_fbe" msgid="7101855374850373091">"Slett og konvertér"</string>
     <string name="reset_shortcut_manager_throttling" msgid="6495066467198668994">"Vil du tilbakestille frekvensbegrensning for ShortcutManager?"</string>
     <string name="reset_shortcut_manager_throttling_complete" msgid="1826770872063707900">"Frekvensberegning for ShortcutManager er tilbakestilt"</string>
-    <string name="notification_suggestion_title" msgid="4506524937307816475">"Kontrollér låseskjermvarsler"</string>
+    <string name="notification_suggestion_title" msgid="387052719462473500">"Kontrollér informasjon på låseskjermen"</string>
     <string name="notification_suggestion_summary" msgid="8521159741445416875">"Vis eller skjul varselinnhold"</string>
     <string name="page_tab_title_summary" msgid="4070309266374993258">"Alle"</string>
     <string name="page_tab_title_support" msgid="8483187649355540109">"Brukerstøtte og tips"</string>
@@ -3484,7 +3515,7 @@
     <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>
     <string name="premium_sms_access" msgid="4660047004791638305">"Tilgang til premium-SMS"</string>
-    <string name="bluetooth_disabled" msgid="2456198532288640046">"Ikke synlig for andre enheter"</string>
+    <string name="bluetooth_disabled" msgid="6244000672828617410">"Av"</string>
     <string name="bluetooth_connected_summary" msgid="7672528674593152862">"Koblet til <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="bluetooth_connected_multiple_devices_summary" msgid="9173661896296663932">"Koblet til flere enheter"</string>
     <string name="demo_mode" msgid="2798762752209330277">"Demomodus for systembrukergrensesnittet"</string>
@@ -3549,7 +3580,7 @@
     <string name="gesture_preference_summary" product="tablet" msgid="4717535378272065510">"Hurtigbevegelser for å kontrollere nettbrettet ditt"</string>
     <string name="gesture_preference_summary" product="device" msgid="4205941452664950852">"Hurtigbevegelser for å kontrollere enheten din"</string>
     <string name="double_tap_power_for_camera_title" msgid="64716226816032800">"Åpne kameraet raskt"</string>
-    <string name="double_tap_power_for_camera_summary" msgid="242037150983277829">"Trykk på av/på-knappen to ganger for å åpne kameraet raskt. Dette fungerer fra alle skjermbilder."</string>
+    <string name="double_tap_power_for_camera_summary" msgid="242037150983277829">"Trykk på av/på-knappen to ganger for å åpne kameraet raskt. Dette fungerer på alle skjermer."</string>
     <string name="double_tap_power_for_camera_suggestion_title" msgid="6500405261202883589">"Rask åpning av kameraet"</string>
     <string name="double_tap_power_for_camera_suggestion_summary" msgid="7010153544554016996">"Trykk på av/på-knappen to ganger for å åpne kameraet"</string>
     <string name="double_twist_for_camera_mode_title" msgid="4877834147983530479">"Vend kameraet"</string>
@@ -3570,7 +3601,7 @@
     <string name="ambient_display_pickup_summary" product="tablet" msgid="5435283849947236648">"Ta opp nettbrettet for å sjekke tidspunkt, varselikoner og annen informasjon."</string>
     <string name="ambient_display_pickup_summary" product="device" msgid="8256669101643381568">"Ta opp enheten for å sjekke tidspunkt, varselikoner og annen informasjon."</string>
     <string name="ambient_display_pickup_suggestion_summary" msgid="7014700589991761035">"Sjekk varsler når skjermen er slått av"</string>
-    <string name="fingerprint_swipe_for_notifications_title" msgid="5816346492253270243">"Varsler med fingeravtrykksensor"</string>
+    <string name="fingerprint_swipe_for_notifications_title" msgid="5816346492253270243">"Sveip fingersensoren for varsler"</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="default" msgid="1770661868393713922">"Sjekk varsler ved å sveipe ned på fingeravtrykksensoren på baksiden av telefonen."</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="tablet" msgid="902719947767712895">"Sjekk varsler ved å sveipe ned på fingeravtrykksensoren på baksiden av nettbrettet."</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="device" msgid="5372926094116306647">"Sjekk varsler ved å sveipe ned på fingeravtrykksensoren på baksiden av enheten."</string>
@@ -3586,7 +3617,7 @@
     <string name="web_action_enable_title" msgid="4051513950976670853">"Instant-apper"</string>
     <string name="web_action_enable_summary" msgid="3108127559723396382">"Åpne linker i apper – selv om appene ikke er installert"</string>
     <string name="web_action_section_title" msgid="7364647086538399136">"Instant-apper"</string>
-    <string name="instant_apps_account" msgid="1433620209791992528">"Konto for instant-apper"</string>
+    <string name="instant_apps_settings" msgid="8827777916518348213">"Instant Apps-innstillinger"</string>
     <string name="domain_url_section_title" msgid="7046835219056428883">"Installerte apper"</string>
     <string name="automatic_storage_manager_activation_warning" msgid="6353100011690933254">"Lagringsplassen din blir nå administrert av lagringsadministratoren"</string>
     <string name="account_for_section_header" msgid="5356566418548737121">"Kontoer for <xliff:g id="USER_NAME">%1$s</xliff:g>"</string>
@@ -3633,7 +3664,9 @@
     <string name="enterprise_privacy_always_on_vpn_personal" msgid="9217774730260037434">"Alltid-på-VPN er slått på i den personlige profilen din"</string>
     <string name="enterprise_privacy_always_on_vpn_work" msgid="7244472958208315814">"Alltid-på-VPN er slått på i jobbprofilen din"</string>
     <string name="enterprise_privacy_global_http_proxy" msgid="7936664553416257333">"Global HTTP-proxy-tjener er angitt"</string>
-    <string name="enterprise_privacy_ca_certs" msgid="5885892204903688909">"Pålitelig legitimasjon"</string>
+    <string name="enterprise_privacy_ca_certs_device" msgid="2019652712782510262">"Pålitelig legitimasjon"</string>
+    <string name="enterprise_privacy_ca_certs_personal" msgid="2279084820904076599">"Pålitelig legitimasjon i den personlige profilen din"</string>
+    <string name="enterprise_privacy_ca_certs_work" msgid="6187377647815301809">"Pålitelig legitimasjon i jobbprofilen din"</string>
     <plurals name="enterprise_privacy_number_ca_certs" formatted="false" msgid="526375234629534165">
       <item quantity="other">Minimum <xliff:g id="COUNT_1">%d</xliff:g> CA-sertifikater</item>
       <item quantity="one">Minimum <xliff:g id="COUNT_0">%d</xliff:g> CA-sertifikat</item>
@@ -3696,6 +3729,8 @@
     <string name="carrier_provisioning" msgid="4398683675591893169">"Informasjon om operatørhåndtering"</string>
     <string name="trigger_carrier_provisioning" msgid="3434865918009286187">"Utløs operatørhåndtering"</string>
     <string name="new_device_suggestion_title" msgid="698847081680980774">"Hva er nytt og spennende?"</string>
-    <string name="new_device_suggestion_summary" msgid="7172709269203435870">"Sjekk ut de 5 mest populære funksjonene"</string>
+    <string name="new_device_suggestion_summary" product="default" msgid="206396571522515855">"Få en innføring i den nye telefonen din"</string>
+    <string name="new_device_suggestion_summary" product="tablet" msgid="393751455688210956">"Få en innføring i det nye nettbrettet ditt"</string>
+    <string name="new_device_suggestion_summary" product="device" msgid="2939870049868336652">"Få en innføring i den nye enheten din"</string>
     <string name="disabled_low_ram_device" msgid="3751578499721173344">"Denne funksjonen er ikke tilgjengelig på denne enheten"</string>
 </resources>
diff --git a/res/values-ne/arrays.xml b/res/values-ne/arrays.xml
index a234d9f..f151d59 100644
--- a/res/values-ne/arrays.xml
+++ b/res/values-ne/arrays.xml
@@ -100,8 +100,6 @@
     <!-- no translation found for wifi_security_no_eap:0 (2084555984818107151) -->
     <!-- no translation found for wifi_security_no_eap:1 (397579322683471524) -->
     <!-- no translation found for wifi_security_no_eap:2 (1968820975358150484) -->
-    <!-- no translation found for wifi_ap_security:0 (5251664683198623324) -->
-    <!-- no translation found for wifi_ap_security:1 (7989073072260294673) -->
   <string-array name="wifi_eap_method">
     <item msgid="1160193392455075561">"PEAP"</item>
     <item msgid="7981731051382306293">"TLS"</item>
diff --git a/res/values-ne/strings.xml b/res/values-ne/strings.xml
index 2edd541..d15f550 100644
--- a/res/values-ne/strings.xml
+++ b/res/values-ne/strings.xml
@@ -166,7 +166,7 @@
     <string name="bluetooth_map_acceptance_dialog_text" msgid="8712508202081143737">"%1$s तपाईँको सन्देशमा पहुँच चाहन्छ। %2$s मा पहुँच दिने हो?"</string>
     <string name="bluetooth_sap_request" msgid="2669762224045354417">"SIM पहुँच अनुरोध"</string>
     <string name="bluetooth_sap_acceptance_dialog_text" msgid="4414253873553608690">"<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g> ले तपाईँको SIM कार्ड पहुँच गर्न चाहन्छ। यन्त्रमा SIM कार्ड पहुँच प्रदान गर्दा जडान अवधिको समयमा तपाईँको डेटा जडान निष्क्रिय हुनेछ। <xliff:g id="DEVICE_NAME_1">%2$s?</xliff:g> लाई पहुँच प्रदान गर्नुहोस्"</string>
-    <string name="bluetooth_device_name_summary" msgid="4757990010751789977">"अन्य यन्त्रहरूमा <xliff:g id="DEVICE_NAME">^1</xliff:g> को रूपमा देख्न सकिन्छ"</string>
+    <string name="bluetooth_device_name_summary" msgid="522235742194965734">"अन्य यन्त्रहरूमा <xliff:g id="DEVICE_NAME">^1</xliff:g> को रूपमा देखिन्छ"</string>
     <string name="bluetooth_paired_device_title" msgid="8638994696317952019">"तपाईंका यन्त्रहरू"</string>
     <string name="bluetooth_pairing_page_title" msgid="7712127387361962608">"नयाँ यन्त्रलाई जोडा बनाउनुहोस्"</string>
     <string name="date_and_time" msgid="9062980487860757694">"मिति र समय"</string>
@@ -312,6 +312,8 @@
     <string name="zone_auto" msgid="334783869352026648">"स्वत: समय क्षेत्र"</string>
     <string name="zone_auto_summaryOn" msgid="6142830927278458314">"सञ्जालद्वारा उपलव्ध गराइएको समय क्षेत्र प्रयोग गर्नुहोस्"</string>
     <string name="zone_auto_summaryOff" msgid="2597745783162041390">"सञ्जाल उपलव्ध गराइएको समय क्षेत्र प्रयोग गर्नुहोस्"</string>
+    <string name="date_time_24hour_auto" msgid="2117383168985653422">"स्वत: २४ घन्टे ढाँचामा"</string>
+    <string name="date_time_24hour_auto_summary" msgid="6351812925651480277">"लोकेलको पूर्वनिर्धारित सेटिङ प्रयोग गर्नुहोस्"</string>
     <string name="date_time_24hour_title" msgid="3203537578602803850">"२४ घण्टे ढाँचामा"</string>
     <string name="date_time_24hour" msgid="1193032284921000063">"२४-घण्टे ढाँचा प्रयोग गर्नुहोस्"</string>
     <string name="date_time_set_time_title" msgid="6296795651349047016">"समय"</string>
@@ -372,6 +374,9 @@
     <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="1961957425135180242">"अर्को"</string>
+    <string name="setup_fingerprint_enroll_skip_title" msgid="362050541117362034">"फिंगरप्रिन्ट सेटअप छाड्ने हो?"</string>
+    <string name="setup_fingerprint_enroll_skip_after_adding_lock_text" msgid="958990414356204763">"फिंगरप्रिन्ट सेटअप गर्न केवल एक वा दुई मिनेट लाग्छ। छाड्नु भएको खण्डमा, तपाईं सेटिङहरूमा गएर पछि आफ्नो फिंगरप्रिन्ट थप्न सक्नुहुन्छ।"</string>
+    <string name="lock_screen_intro_skip_title" msgid="4988210105913705679">"स्क्रिन लक सेटअप छाड्ने हो?"</string>
     <string name="lock_screen_intro_skip_dialog_text_frp" product="tablet" msgid="1581834104051243425">"यन्त्रको सुरक्षासम्बन्धी सुविधाहरू सक्रिय गरिने छैनन्। तपाईं यो ट्याब्लेट हराएको वा चोरी भएको वा रिसेट भएको अवस्थामा अरूलाई यो चलाउनबाट रोक्न सक्नुहुने छैन।"</string>
     <string name="lock_screen_intro_skip_dialog_text_frp" product="device" msgid="4629503416877189572">"यन्त्रको सुरक्षासम्बन्धी सुविधाहरू सक्रिय गरिने छैनन्। तपाईं यो यन्त्र हराएको वा चोरी भएको वा रिसेट भएको अवस्थामा अरूलाई यो चलाउनबाट रोक्न सक्नुहुने छैन।"</string>
     <string name="lock_screen_intro_skip_dialog_text_frp" product="default" msgid="2423428240245737909">"यन्त्रको सुरक्षासम्बन्धी सुविधाहरू सक्रिय गरिने छैनन्। तपाईं यो फोन हराएको वा चोरी भएको वा रिसेट भएको अवस्थामा अरूलाई यो चलाउनबाट रोक्न सक्नुहुने छैन।"</string>
@@ -442,7 +447,7 @@
     <string name="crypt_keeper_warn_wipe" msgid="2738374897337991667">"चेतावनी: खुला गर्न <xliff:g id="COUNT">^1</xliff:g> भन्दा बढी असफल प्रयासहरू पछि तपाईँको उपकरण पुछिने छ!"</string>
     <string name="crypt_keeper_enter_password" msgid="2223340178473871064">"तपाईँको पासवर्ड टाइप गर्नुहोस्"</string>
     <string name="crypt_keeper_failed_title" msgid="7133499413023075961">"इन्क्रिप्सन असफल"</string>
-    <string name="crypt_keeper_failed_summary" product="tablet" msgid="8219375738445017266">"इन्क्रिप्सन अवरूद्ध भयो र पूरा हुन सक्दैन। परिणाम स्वरूप तपाईंको ट्याब्लेटको डेटा अब पहुँचयोग्य हुँदैन।\n \n तपाईंको ट्याब्लेटको प्रयोग सुरू गर्नका लागि तपाईंले कारखाना पुनःसेट गर्नु  पर्छ। जब पुनःसेट हुन्छ तब तपाईं ट्याब्लेट सेट गर्नुहुन्छ, तपाईंको Google खातामा जगेडा गरिएको कुनै पनि डेटा पुनर्स्थापना गर्ने अवसर तपाईंलाई हुने छ।"</string>
+    <string name="crypt_keeper_failed_summary" product="tablet" msgid="8219375738445017266">"इन्क्रिप्सन अवरूद्ध भयो र पूरा हुन सक्दैन। परिणाम स्वरूप तपाईंको ट्याब्लेटको डेटा अब पहुँचयोग्य हुँदैन।\n \n तपाईंको ट्याब्लेटको प्रयोग सुरु गर्नका लागि तपाईंले कारखाना पुनःसेट गर्नु  पर्छ। जब पुनःसेट हुन्छ तब तपाईं ट्याब्लेट सेट गर्नुहुन्छ, तपाईंको Google खातामा जगेडा गरिएको कुनै पनि डेटा पुनर्स्थापना गर्ने अवसर तपाईंलाई हुने छ।"</string>
     <string name="crypt_keeper_failed_summary" product="default" msgid="3270131542549577953">"एन्क्रिप्सन रोकिएको थियो र पूरा हुन सकेन। नतिजाको रूपमा तपाईंको फोनमा डेटा पहुँच यग्य छैन। \n\nतपाईंको फोनको उपयोग फरि सुरु गर्नको लागि तपाईंले एउटा फ्याक्ट्रि पुनःसेट गर्न जरूरी छ। जब तपाईं पुनःसेटपछि तपाईंको फोन सेटअप गर्नु हुन्छ भने  कुनै पनि डेटा जुन तपाईंको Google खातामा ब्याकअप गरिएको थियो तपाईंलाई पुनःप्राप्त गर्ने अवसर हुने छ।"</string>
     <string name="crypt_keeper_data_corrupt_title" msgid="8759119849089795751">"गुप्तिकरण उल्टाउन असफल"</string>
     <string name="crypt_keeper_data_corrupt_summary" product="tablet" msgid="840107296925798402">"तपाईँले प्रविष्ट गर्नुभएको पासवर्ड ठीक छ, तर दुर्भाग्यबश तपाईँको डेटा बिग्रिएको छ।\n\n तपाईँको ट्याब्लेट पुन: प्रयोग गर्न फ्याक्ट्री रिसेट गर्न पर्छ। रिसेट गरे पश्चात जब तपाई आफ्नो ट्याब्लेट सेटअप गर्नुहुन्छ तपाईँले Google खातामा ब्याकअप भए सम्मका डेटा पुनर्स्थापना गर्ने अवसर प्राप्त गर्नु हुनेछ।"</string>
@@ -457,7 +462,7 @@
     <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="lock_settings_picker_fingerprint_added_security_message" msgid="5768002109707648463">"थप सुरक्षाका लागि एउटा ब्याकअप स्क्रिन लक सेट अप गर्नुहोस्।"</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>
@@ -499,29 +504,37 @@
     <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>
-    <!-- no translation found for unlock_disable_frp_warning_content_pattern_fingerprint (2986105377420905314) -->
-    <skip />
+    <string name="unlock_disable_frp_warning_content_pattern_fingerprint" msgid="2986105377420905314">"यन्त्रका सुरक्षासम्बन्धी सुविधाहरूले तपाईंको ढाँचाबिना काम गर्ने छैनन्। <xliff:g id="EMPTY_LINE">
+
+</xliff:g> यस यन्त्रबाट तपाईंका सुरक्षित गरिएका फिंगरप्रिन्टहरू पनि हटाइने छन् र तपाईं तिनीहरूमार्फत आफ्नो फोन अनलक गर्ने, खरिदसम्बन्धी आधिकार प्रदान गर्ने वा अनुप्रयोगहरूमा साइन इन गर्ने कार्यहरू गर्न सक्नुहुनेछैन।"</string>
     <string name="unlock_disable_frp_warning_content_pin" msgid="586996206210265131">"यन्त्र सुरक्षा सुविधाहरू तपाईँको PIN बिना काम गर्ने छैनन्।"</string>
-    <!-- no translation found for unlock_disable_frp_warning_content_pin_fingerprint (3370462835533123695) -->
-    <skip />
+    <string name="unlock_disable_frp_warning_content_pin_fingerprint" msgid="3370462835533123695">"यन्त्रका सुरक्षासम्बन्धी सुविधाहरूले तपाईंको PIN बिना काम गर्ने छैनन्। <xliff:g id="EMPTY_LINE">
+
+</xliff:g>यस यन्त्रबाट तपाईंका सुरक्षित गरिएका फिंगरप्रिन्टहरू पनि हटाइने छन् र तपाईं तिनीहरूमार्फत आफ्नो फोन अनलक गर्ने, खरिदसम्बन्धी आधिकार प्रदान गर्ने वा अनुप्रयोगहरूमा साइन इन गर्ने कार्यहरू गर्न सक्नुहुनेछैन।"</string>
     <string name="unlock_disable_frp_warning_content_password" msgid="5420612686852555537">"यन्त्र सुरक्षा सुविधाहरू तपाईँको पासवर्ड बिना काम गर्ने छैनन्।"</string>
-    <!-- no translation found for unlock_disable_frp_warning_content_password_fingerprint (3595476296430536798) -->
-    <skip />
+    <string name="unlock_disable_frp_warning_content_password_fingerprint" msgid="3595476296430536798">"यन्त्रका सुरक्षासम्बन्धी सुविधाहरूले तपाईंको पासवर्डबिना काम गर्ने छैनन्। <xliff:g id="EMPTY_LINE">
+
+</xliff:g> यस यन्त्रबाट तपाईंका सुरक्षित गरिएका फिंगरप्रिन्टहरू पनि हटाइने छन् र तपाईं तिनीहरूमार्फत आफ्नो फोन अनलक गर्ने, खरिदसम्बन्धी आधिकार प्रदान गर्ने वा अनुप्रयोगहरूमा साइन इन गर्ने कार्यहरू गर्न सक्नुहुनेछैन।"</string>
     <string name="unlock_disable_frp_warning_content_unknown" msgid="1550718040483548220">"यन्त्र सुरक्षा सुविधाहरू तपाईँको स्क्रिन लक बिना काम गर्ने छैनन्।"</string>
-    <!-- no translation found for unlock_disable_frp_warning_content_unknown_fingerprint (3679351662094349506) -->
-    <skip />
+    <string name="unlock_disable_frp_warning_content_unknown_fingerprint" msgid="3679351662094349506">"यन्त्रका सुरक्षासम्बन्धी सुविधाहरूले तपाईंको स्क्रिन लकबिना काम गर्ने छैनन्। <xliff:g id="EMPTY_LINE">
+
+</xliff:g>यस यन्त्रबाट तपाईंका सुरक्षित गरिएका फिंगरप्रिन्टहरू पनि हटाइने छन् र तपाईं तिनीहरूमार्फत आफ्नो फोन अनलक गर्ने, खरिदसम्बन्धी आधिकार प्रदान गर्ने वा अनुप्रयोगहरूमा साइन इन गर्ने कार्यहरू गर्न सक्नुहुनेछैन।"</string>
     <string name="unlock_disable_frp_warning_content_pattern_profile" msgid="8682200103576359918">"प्रोफाइल सुरक्षा विशेषताहरूले तपाईँको ढाँचा बिना काम गर्नेछैनन्।"</string>
-    <!-- no translation found for unlock_disable_frp_warning_content_pattern_fingerprint_profile (6718155854303231675) -->
-    <skip />
+    <string name="unlock_disable_frp_warning_content_pattern_fingerprint_profile" msgid="6718155854303231675">"प्रोफाइलका सुरक्षासम्बन्धी सुविधाहरूले तपाईंको ढाँचाबिना काम गर्ने छैनन्।<xliff:g id="EMPTY_LINE">
+
+</xliff:g>यस प्रोफाइलबाट तपाईंका सुरक्षित गरिएका फिंगरप्रिन्टहरू पनि हटाइने छन् र तपाईं तिनीहरूमार्फत आफ्नो प्रोफाइल अनलक गर्ने, खरिदसम्बन्धी अधिकार प्रदान गर्ने वा अनुप्रयोगहरूमा साइन इन गर्ने कार्यहरू सक्नुहुनेछैन।"</string>
     <string name="unlock_disable_frp_warning_content_pin_profile" msgid="7790688070593867767">"प्रोफाइल सुरक्षा विशेषताहरूले तपाईँको PIN बिना काम गर्नेछैनन्।"</string>
-    <!-- no translation found for unlock_disable_frp_warning_content_pin_fingerprint_profile (4209564603132870532) -->
-    <skip />
+    <string name="unlock_disable_frp_warning_content_pin_fingerprint_profile" msgid="4209564603132870532">"प्रोफाइलका सुरक्षासम्बन्धी सुविधाहरूले तपाईंको PIN बिना काम गर्ने छैनन्।<xliff:g id="EMPTY_LINE">
+
+</xliff:g>यस प्रोफाइलबाट तपाईंका सुरक्षित गरिएका फिंगरप्रिन्टहरू पनि हटाइने छन् र तपाईं तिनीहरूमार्फत आफ्नो प्रोफाइल अनलक गर्ने, खरिदसम्बन्धी अधिकार प्रदान गर्ने वा अनुप्रयोगहरूमा साइन इन गर्ने कार्यहरू गर्न सक्नुहुनेछैन।"</string>
     <string name="unlock_disable_frp_warning_content_password_profile" msgid="7569285520567674461">"प्रोफाइल सुरक्षा विशेषताहरूले तपाईँको पासवर्ड बिना काम गर्नेछैनन्।"</string>
-    <!-- no translation found for unlock_disable_frp_warning_content_password_fingerprint_profile (2994300676764706047) -->
-    <skip />
+    <string name="unlock_disable_frp_warning_content_password_fingerprint_profile" msgid="2994300676764706047">"प्रोफाइलका सुरक्षासम्बन्धी सुविधाहरूले तपाईंको पासवर्डबिना काम गर्ने छैनन्।<xliff:g id="EMPTY_LINE">
+
+</xliff:g>यस प्रोफाइलबाट तपाईंका सुरक्षित गरिएका फिंगरप्रिन्टहरू पनि हटाइने छन् र तपाईं तिनीहरूमार्फत आफ्नो फोन अनलक गर्ने, खरिदसम्बन्धी आधिकार प्रदान गर्ने वा अनुप्रयोगहरूमा साइन इन गर्ने कार्यहरू गर्न सक्नुहुनेछैन।"</string>
     <string name="unlock_disable_frp_warning_content_unknown_profile" msgid="6984215718701688202">"प्रोफाइल सुरक्षा विशेषताहरूले तपाईँको स्क्रिन लक बिना काम गर्नेछैनन्।"</string>
-    <!-- no translation found for unlock_disable_frp_warning_content_unknown_fingerprint_profile (4994062501123299418) -->
-    <skip />
+    <string name="unlock_disable_frp_warning_content_unknown_fingerprint_profile" msgid="4994062501123299418">"प्रोफाइलका सुरक्षासम्बन्धी सुविधाहरूले तपाईंको स्क्रिन लकबिना काम गर्ने छैनन्।<xliff:g id="EMPTY_LINE">
+
+</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">"अनलक PIN परिवर्तन गर्नुहोस्"</string>
@@ -580,6 +593,7 @@
     <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="lockpassword_clear_label" msgid="5724429464960458155">"खाली गर्नुहोस्"</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>
@@ -773,6 +787,7 @@
     <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,6 +824,8 @@
     <string name="wifi_wps_available_first_item" msgid="4422547079984583502">"WPS उपलब्ध छ"</string>
     <string name="wifi_wps_available_second_item" msgid="8427520131718215301">" (WPS उपलब्ध)"</string>
     <string name="wifi_wps_nfc_enter_password" msgid="2288214226916117159">"आफ्नो सञ्जाल पासवर्ड प्रविष्ट गर्नुहोस्"</string>
+    <string name="wifi_carrier_connect" msgid="8174696557882299911">"सेवा प्रदायकको Wi‑Fi नेटवर्क"</string>
+    <string name="wifi_carrier_content" msgid="4634077285415851933">"<xliff:g id="NAME">%1%s</xliff:g> मार्फत जडान गर्नुहोस्"</string>
     <string name="wifi_scan_always_turnon_message" msgid="203123538572122989">"स्थान सटिकता सुधार गर्न र अन्य प्रायोजनहरूको लागि, <xliff:g id="APP_NAME">%1$s</xliff:g> नेटवर्क स्क्यानिङ खुला भएको चाहन्छ, Wi-Fi बन्द भएता पनि।\n\nके यसलाई सबै अनुप्रयोगहरूको लागि अनुमति दिन चाहनुहुन्छ जसले स्क्यान गर्न चाहन्छन्?"</string>
     <string name="wifi_scan_always_turnoff_message" msgid="5538901671131941043">"यो बन्द गर्न, अतिप्रवाह मेनुमा उन्नतमा जानुहोस्।"</string>
     <string name="wifi_scan_always_confirm_allow" msgid="5355973075896817232">"अनुमति दिनुहोस्"</string>
@@ -826,6 +843,7 @@
     <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_modify" msgid="6100248070440710782">"परिमार्जन गर्नुहोस्"</string>
     <string name="wifi_failed_forget_message" msgid="1348172929201654986">"सञ्जाल बिर्सन विफल"</string>
     <string name="wifi_save" msgid="3331121567988522826">"सुरक्षित गर्नुहोस्"</string>
     <string name="wifi_failed_save_message" msgid="6650004874143815692">"सञ्जाल बचत गर्न विफल"</string>
@@ -838,6 +856,7 @@
     <string name="wifi_advanced_titlebar" msgid="4485841401774142908">"जटिल 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_title" msgid="3471132676909349382">"नेटवर्कसम्बन्धी जानकारी"</string>
     <string name="wifi_details_subnet_mask" msgid="6720279144174924410">"सबनेट मास्क"</string>
     <string name="wifi_details_dns" msgid="8648826607751830768">"DNS"</string>
     <string name="wifi_details_ipv6_address_header" msgid="6734119149106422148">"IPv6 ठेगानाहरू"</string>
@@ -870,16 +889,15 @@
     <string name="wifi_p2p_cancel_connect_title" msgid="255267538099324413">"आमन्त्रण रद्द गर्ने हो?"</string>
     <string name="wifi_p2p_cancel_connect_message" msgid="7477756213423749402">"<xliff:g id="PEER_NAME">%1$s</xliff:g>सँग जोडिने आमन्त्रण के रद्द गर्न चाहनु हुन्छ ?"</string>
     <string name="wifi_p2p_delete_group_message" msgid="834559380069647086">"यो समूह बिर्सनुभयो?"</string>
-    <string name="wifi_tether_checkbox_text" msgid="1847167643625779136">"पोर्टेबल Wi-Fi हटस्पट"</string>
     <string name="wifi_hotspot_checkbox_text" msgid="7763495093333664887">"Wi-Fi हटस्पट"</string>
     <string name="wifi_hotspot_off_subtext" msgid="5466126533609394170">"अन्य यन्त्रहरूसँग इन्टरनेट वा सामग्री आदान-प्रदान गरिरहेको छैन"</string>
     <string name="wifi_hotspot_tethering_on_subtext" product="tablet" msgid="5752490509369962007">"हटस्पटमार्फत यो ट्याब्लेटको इन्टरनेट जडान साझा गर्दै"</string>
     <string name="wifi_hotspot_tethering_on_subtext" product="default" msgid="6461075246164300670">"हटस्पटमार्फत यो फोनको इन्टरनेट जडान साझा गर्दै"</string>
     <string name="wifi_hotspot_on_local_only_subtext" msgid="2068110388011294735">"अनुप्रयोगले सामग्री आदान-प्रदान गर्दैछ। इन्टरनेट जडान साझा गर्न हटस्पट निष्क्रिय पार्नुहोस्, त्यसपछि फेरि  गर्नुहोस्‌"</string>
-    <string name="wifi_hotspot_name_title" msgid="1341735529132128887">"Wi‑Fi को नाम"</string>
+    <string name="wifi_hotspot_name_title" msgid="8237000746618636778">"हटस्पटको नाम"</string>
     <string name="wifi_hotspot_name_summary_connecting" msgid="3378299995508671967">"<xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g> सक्रिय गर्दै..."</string>
     <string name="wifi_hotspot_name_summary_connected" msgid="3888672084861445362">"अन्य यन्त्रहरू <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g> मा जडान गर्न सक्छन्"</string>
-    <string name="wifi_hotspot_password_title" msgid="1955592302902091281">"Wi-Fi को पासवर्ड"</string>
+    <string name="wifi_hotspot_password_title" msgid="8676859981917573801">"हटस्पटको पासवर्ड"</string>
     <string name="wifi_hotspot_ap_band_title" msgid="1165801173359290681">"AP ब्यान्ड"</string>
     <string name="wifi_hotspot_footer_info_regular" msgid="1203489406068036455">"आफ्ना अन्य यन्त्रहरूका लागि Wi‑Fi नेटवर्क सिर्जना गर्न हटस्पट प्रयोग गर्नुहोस्। हटस्पटले तपाईंको मोबाइल डेटा जडान प्रयोग गरेर इन्टरनेट प्रदान गर्दछ। अतिरिक्त मोबाइल डेटा शुल्क लागू हुनसक्छ।"</string>
     <string name="wifi_hotspot_footer_info_local_only" msgid="857988412470694109">"अनुप्रयोगहरूले नजिकैका यन्त्रहरूसँग सामग्री आदान-प्रदान गर्न एउटा हटस्पट सिर्जना गर्न सक्छन्।"</string>
@@ -890,7 +908,6 @@
     <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">"Wi-Fi कलिङ"</string>
     <string name="wifi_calling_suggestion_title" msgid="9008010480466359578">"Wi-Fi कलिङलाई सक्रिय गर्नुहोस्"</string>
@@ -931,7 +948,7 @@
     <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="emergency_address_summary" msgid="3266760199681945746">"तपाईंले WiFi प्रयोग गरी आपतकालीन कल गर्दा आपतकालीन सेवाहरूले तपाईंको स्थानको रूपमा प्रयोग गर्ने ठेगाना"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"प्रदर्शन"</string>
     <string name="sound_settings" msgid="5534671337768745343">"आवाज"</string>
     <string name="all_volume_title" msgid="4296957391257836961">"भोल्युम"</string>
@@ -985,6 +1002,7 @@
     <string name="search_settings" msgid="1910951467596035063">"खोज्नुहोस्"</string>
     <string name="search_settings_summary" msgid="9205656546570654169">"खोज सेटिङहरू र इतिहास प्रबन्ध गर्नुहोस्"</string>
     <string name="search_settings_no_results" msgid="8799027492641230999">"कुनै परिणाम फेला पारिएन"</string>
+    <string name="search_clear_history" msgid="4196658962573162457">"इतिहास खाली गर्नुहोस्"</string>
     <string name="display_settings" msgid="7965901687241669598">"प्रदर्शन"</string>
     <string name="accelerometer_title" msgid="7854608399547349157">"स्वतःघुम्ने स्क्रिन"</string>
     <string name="color_mode_title" msgid="3159275920408338215">"जीवन्त रङहरू"</string>
@@ -1048,22 +1066,20 @@
     <string name="screensaver_settings_summary_never" msgid="5165622985174349585">"कहिल्यै पनि होइन"</string>
     <string name="screensaver_settings_summary_off" msgid="2481581696365146473">"बन्द"</string>
     <string name="screensaver_settings_disabled_prompt" msgid="1239088321034437608">"फोन डकमा र/वा शयन अवस्थामा हुँदा हुने कुरालाई नियन्त्रण गर्न स्क्रिन सेभरलार्इ सक्रिय गर्नुहोस्।"</string>
-    <string name="screensaver_settings_when_to_dream" msgid="7262410541382890146">"सुरू हुने समय"</string>
+    <string name="screensaver_settings_when_to_dream" msgid="7262410541382890146">"सुरु हुने समय"</string>
     <string name="screensaver_settings_current" msgid="4663846038247130023">"हालको स्क्रिन सेभर"</string>
     <string name="screensaver_settings_dream_start" msgid="4998187847985120168">"अब सुरु गर्नुहोस्"</string>
     <string name="screensaver_settings_button" msgid="7292214707625717013">"सेटिङहरू"</string>
     <string name="automatic_brightness" msgid="5014143533884135461">"स्वचालित उज्यालोपना"</string>
     <string name="lift_to_wake_title" msgid="4555378006856277635">"चालु गर्न उठाउनुहोस्"</string>
     <string name="ambient_display_screen_title" msgid="4252755516328775766">"एम्बियन्ट प्रदर्शन"</string>
-    <!-- no translation found for ambient_display_screen_summary_always_on (7337555569694794132) -->
-    <skip />
+    <string name="ambient_display_screen_summary_always_on" msgid="7337555569694794132">"सधैँ सक्रिय / ब्याट्रीको बढेको उपयोग"</string>
     <string name="ambient_display_screen_summary_notifications" msgid="1449570742600868654">"नयाँ सूचनाहरू"</string>
     <string name="ambient_display_category_triggers" msgid="4359289754456268573">"देखाउने समय"</string>
     <string name="doze_title" msgid="2375510714460456687">"नयाँ सूचनाहरू"</string>
     <string name="doze_summary" msgid="3846219936142814032">"सूचनाहरू प्राप्त हुँदा स्क्रिनलाई सक्रिय गर्नुहोस्"</string>
     <string name="doze_always_on_title" msgid="1046222370442629646">"सधैँ सक्रिय"</string>
-    <!-- no translation found for doze_always_on_summary (6978257596231155345) -->
-    <skip />
+    <string name="doze_always_on_summary" msgid="6978257596231155345">"समय, सूचनाका आइकनहरू र अन्य जानकारी देखाउनुहोस्। ब्याट्रीको बढेको उपयोग।"</string>
     <string name="title_font_size" msgid="4405544325522105222">"फन्ट आकार"</string>
     <string name="short_summary_font_size" msgid="6819778801232989076">"पाठ सन्देश अझ ठूलो वा सानो पार्नुहोस्"</string>
     <string name="sim_lock_settings" msgid="3392331196873564292">"SIM कार्ड लक सेटिङहरू"</string>
@@ -1116,7 +1132,6 @@
     <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>
     <string name="device_status_activity_title" msgid="1411201799384697904">"वस्तुस्थिति"</string>
     <string name="device_status" msgid="607405385799807324">"वस्तुस्थिति"</string>
@@ -1144,7 +1159,6 @@
     <string name="status_wifi_mac_address" msgid="2202206684020765378">"Wi-Fi म्याक ठेगाना"</string>
     <string name="status_bt_address" msgid="4195174192087439720">"ब्लुटुथ ठेगाना"</string>
     <string name="status_serial_number" msgid="2257111183374628137">"क्रम संख्या"</string>
-    <string name="status_unavailable" msgid="7862009036663793314">"अनुपलब्ध"</string>
     <string name="status_up_time" msgid="7294859476816760399">"सक्रिय समय"</string>
     <string name="status_awake_time" msgid="2393949909051183652">"जाग्ने समय"</string>
     <string name="internal_memory" msgid="9129595691484260784">"आन्तरिक भण्डारण"</string>
@@ -1320,6 +1334,7 @@
     <string name="menu_restore" msgid="8260067415075573273">"पूर्वनिर्धारितमा पुनःसेट गर्नुहोस्"</string>
     <string name="restore_default_apn_completed" msgid="2824775307377604897">"पूर्वनिर्धारित APN सेटिङहरू पुनःसेट पुरा भयो।"</string>
     <string name="reset_dashboard_title" msgid="6254873816990678620">"रिसेटका विकल्पहरू"</string>
+    <string name="reset_dashboard_summary" msgid="4851012632493522755">"नेटवर्क, अनुप्रयोगहरू वा यन्त्रलाई रिसेट गर्न सकिन्छ"</string>
     <string name="reset_network_title" msgid="6166025966016873843">"Wi-Fi, मोबाइल र ब्लुटुथ रिसेट गर्नुहोस्"</string>
     <string name="reset_network_desc" msgid="5547979398298881406">"यसले निम्न सेटिङहरू लगायत सम्पूर्ण नेटवर्क सम्बन्धी सेटिहरूलाई रिसेट गर्नेछ:\n\n"<li>"Wi‑Fi"</li>\n<li>"मोबाइल डेटा"</li>\n<li>"ब्लुटुथ"</li></string>
     <string name="reset_network_button_text" msgid="2035676527471089853">"सेटिङहरू रिसेट गर्नुहोस्"</string>
@@ -1328,17 +1343,14 @@
     <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="6617679904229218425">"सबै डेटा मेटाउनुहोस् (फ्याक्ट्री रिसेट)"</string>
-    <plurals name="master_clear_with_account_summary" formatted="false" msgid="5911377203778818712">
-      <item quantity="other"><xliff:g id="ACCOUNT_COUNT">%1$d</xliff:g> खाता रिसेट हुनेछन्</item>
-      <item quantity="one">१ खाता रिसेट हुनेछ</item>
-    </plurals>
-    <string name="master_clear_summary" msgid="6902443944660426951">"आन्तरिक भण्डारण र सबै डेटा रिसेट हुनेछन्"</string>
+    <string name="master_clear_title" msgid="3531267871084279512">"सबै डेटा मेटाउनुहोस् (फ्याक्ट्री रिसेट गर्नुहोस्)"</string>
     <string name="master_clear_desc" product="tablet" msgid="9146059417023157222">"यस कार्यले तपाईँको सम्पूर्ण डेटा मेटाउँछ ट्याब्लेटको "<b>" आन्तरिक भण्डारणबाट "</b>" : जसमा, \n \n "<li>" तपाईँको Google खाता "</li>" \n "<li>" प्रणाली र अनुप्रयोग डेटा र सेटिङहरू"</li>" \n "<li>" डाउनलोड गरिएका अनुप्रयोगहरू "</li></string>
     <string name="master_clear_desc" product="default" msgid="4800386183314202571">"यसले सबै डेटा तपाईंको "<b>"आन्तरिक भण्डारणबाट मेटाउँदछ"</b>", समावेश गर्दछ:\n\n"<li>"तपाईंको Google खाता"</li>\n<li>"प्रणाली र अनुप्रयोग डेटा र सेटिङहरू"</li>\n<li>"डाउनलोड गरिएका अनुप्रयोगहरू"</li></string>
     <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n" \nतपाईँले अहिले निम्न खाताहरूमा साइन इन गर्नुभयो:\n"</string>
     <string name="master_clear_other_users_present" product="default" msgid="5161423070702470742">\n\n" यस यन्त्रमा हाल अन्य प्रयोगकर्ताहरु छन्। \n"</string>
     <string name="master_clear_desc_also_erases_external" msgid="1903185203791274237"><li>"संगीत"</li>\n<li>"तस्बिरहरू"</li>\n<li>"अन्य उपयोगकर्ता डेटा"</li></string>
+    <string name="master_clear_desc_also_erases_esim" msgid="312352697653096008"><li>"eSIM मा रहेका सेवा प्रदायकहरू"</li></string>
+    <string name="master_clear_desc_no_cancel_mobile_plan" msgid="5460926449093211144">\n\n"यस कार्यले तपाईंको मोबाइल सेवाको योजना रद्द गर्नेछैन।"</string>
     <string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="7744115866662613411">\n" \n संगीत, चित्र र अन्य उपयोगकर्ता डेटा हटाउन "<b>"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>
@@ -1442,7 +1454,7 @@
     <string name="safety_and_regulatory_info" msgid="5103161279848427185">"सुरक्षा र नियामक सम्बन्धी मार्गदर्शन"</string>
     <string name="copyright_title" msgid="865906688917260647">"प्रतिलिपि अधिकार"</string>
     <string name="license_title" msgid="1990487604356037871">"इजाजतपत्र"</string>
-    <string name="terms_title" msgid="7697580845616764642">"सेवा सर्तहरू"</string>
+    <string name="terms_title" msgid="7697580845616764642">"सेवाका सर्तहरू"</string>
     <string name="webview_license_title" msgid="2813507464175738967">"प्रणाली वेबभ्यु लाइसेन्स"</string>
     <string name="wallpaper_attributions" msgid="3645880512943433928">"वालपेपरहरु"</string>
     <string name="wallpaper_attributions_values" msgid="2996183537914690469">"स्याटलाइट कल्पना प्रदायकहरू:\n©२०१४ CNES / Astrium, DigitalGlobe, Bluesky"</string>
@@ -1455,15 +1467,16 @@
     <string name="settings_safetylegal_activity_title" msgid="6901214628496951727">"सुरक्षा जानकारी"</string>
     <string name="settings_safetylegal_activity_unreachable" msgid="250674109915859456">"तपाईंसँग डेटा जडान छैन। यो जानकारी अब हेर्नको लागि इन्टरनेटमा जडित कुनै पनि कम्प्युटरबाट %s मा जानुहोस्।"</string>
     <string name="settings_safetylegal_activity_loading" msgid="8059022597639516348">"लोड हुँदै..."</string>
-    <string name="lockpassword_choose_your_password_header" msgid="8624900666929394990">"तपाईंको पासवर्ड छनौट गर्नुहोस्"</string>
-    <string name="lockpassword_choose_your_password_header_for_fingerprint" msgid="6624409510609085450">"फिंगरप्रिन्ट प्रयोग गर्न पासवर्ड सेट गर्नुहोस्"</string>
-    <string name="lockpassword_choose_your_pattern_header" msgid="6949761069941694050">"तपाईँको ढाँचा छान्नुहोस्"</string>
-    <string name="lockpassword_choose_your_pattern_header_for_fingerprint" msgid="5901096361617543819">"फिंगरप्रिन्ट प्रयोग गर्न ढाँचा सेट गर्नुहोस्"</string>
-    <string name="lockpassword_choose_your_pin_header" msgid="7598849519816138302">"तपाईँको PIN छान्नुहोस्"</string>
-    <string name="lockpassword_choose_your_pin_header_for_fingerprint" msgid="765344692615917183">"फिंगरप्रिन्ट प्रयोग गर्न PIN सेट गर्नुहोस्"</string>
-    <string name="lockpassword_confirm_your_password_header" msgid="6308478184889846633">"तपाईँको पासवर्ड निश्चित गर्नुहोस्"</string>
+    <string name="lockpassword_choose_your_screen_lock_header" msgid="3872462096767152394">"एउटा स्क्रिन लक सेट गर्नुहोस्"</string>
+    <string name="lockpassword_choose_your_password_message" msgid="1197569283524841412">"सुरक्षाका लागि एउटा पासवर्ड सेट गर्नुहोस्"</string>
+    <string name="lockpassword_choose_your_password_header_for_fingerprint" msgid="2541818487015343503">"फिंगरप्रिन्ट प्रयोग गर्न पासवर्ड सेट गर्नु…"</string>
+    <string name="lockpassword_choose_your_pattern_header_for_fingerprint" msgid="7709785406243556723">"फिंगरप्रिन्ट प्रयोग गर्न ढाँचा सेट गर्नु…"</string>
+    <string name="lockpassword_choose_your_pin_message" msgid="1875420718677275646">"सुरक्षाका ला‍गि एउटा PIN सेट गर्नुहोस्"</string>
+    <string name="lockpassword_choose_your_pin_header_for_fingerprint" msgid="1549639053195796674">"फिंगरप्रिन्ट प्रयोग गर्न PIN सेट गर्नुहोस्"</string>
+    <string name="lockpassword_choose_your_pattern_message" msgid="5986983400689720015">"सुरक्षाका लागि कुनै ढाँचा सेट गर्नुहोस्"</string>
+    <string name="lockpassword_confirm_your_password_header" msgid="1266027268220850931">"आफ्नो पासवर्ड पुन: प्रविष्ट गर्नुहोस्"</string>
     <string name="lockpassword_confirm_your_pattern_header" msgid="7543433733032330821">"तपाईँको ढाँचा निश्चित गर्नुहोस्"</string>
-    <string name="lockpassword_confirm_your_pin_header" msgid="49038294648213197">"तपाईँको PIN को पुष्टि गर्नुहोस्"</string>
+    <string name="lockpassword_confirm_your_pin_header" msgid="7744513791910572550">"आफ्नो PIN पुन: प्रविष्ट गर्नुहोस्"</string>
     <string name="lockpassword_confirm_passwords_dont_match" msgid="5140892109439191415">"पासवर्ड मेल खाँदैन"</string>
     <string name="lockpassword_confirm_pins_dont_match" msgid="7226244811505606217">"PIN मिल्दैन"</string>
     <string name="lockpassword_choose_lock_generic_header" msgid="3811438094903786145">"चयन अनलक गर्नुहोस्"</string>
@@ -1476,18 +1489,18 @@
     <string name="lockpassword_confirm_your_pattern_generic_profile" msgid="4435638308193361861">"जारी राख्नका लागि आफ्नो कार्य प्रोफाइलको ढाँचा प्रयोग गर्नुहोस्"</string>
     <string name="lockpassword_confirm_your_pin_generic_profile" msgid="3730141667547002246">"जारी राख्नका लागि आफ्नो कार्य प्रोफाइलको PIN प्रविष्ट गर्नुहोस्"</string>
     <string name="lockpassword_confirm_your_password_generic_profile" msgid="4250642723467019894">"जारी राख्नका लागि आफ्नो कार्य प्रोफाइलको पासवर्ड प्रविष्ट गर्नुहोस्"</string>
-    <!-- no translation found for lockpassword_strong_auth_required_device_pattern (530802132223800623) -->
-    <skip />
-    <!-- no translation found for lockpassword_strong_auth_required_device_pin (7829294830078036417) -->
-    <skip />
-    <!-- no translation found for lockpassword_strong_auth_required_device_password (3552644641574796973) -->
-    <skip />
-    <!-- no translation found for lockpassword_strong_auth_required_work_pattern (3003781907040522053) -->
-    <skip />
-    <!-- no translation found for lockpassword_strong_auth_required_work_pin (3367491332598821552) -->
-    <skip />
-    <!-- no translation found for lockpassword_strong_auth_required_work_password (8159775129968582940) -->
-    <skip />
+    <string name="lockpassword_strong_auth_required_device_pattern" msgid="530802132223800623">"थप सुरक्षाका लागि आफ्नो यन्त्रको ढाँचा प्रयोग गर्नुहोस्‌"</string>
+    <string name="lockpassword_strong_auth_required_device_pin" msgid="7829294830078036417">"थप सुरक्षाका लागि आफ्नो यन्त्रको PIN प्रविष्ट गर्नुहोस्"</string>
+    <string name="lockpassword_strong_auth_required_device_password" msgid="3552644641574796973">"थप सुरक्षाका लागि आफ्नो यन्त्रको पासवर्ड प्रविष्ट गर्नुहोस्"</string>
+    <string name="lockpassword_strong_auth_required_work_pattern" msgid="3003781907040522053">"थप सुरक्षाका लागि आफ्नो यन्त्रको कार्य प्रोफाइलको ढाँचा प्रयोग गर्नुहोस्"</string>
+    <string name="lockpassword_strong_auth_required_work_pin" msgid="3367491332598821552">"थप सुरक्षाका लागि आफ्नो यन्त्रको कार्य प्रोफाइलको PIN प्रविष्ट गर्नुहोस्"</string>
+    <string name="lockpassword_strong_auth_required_work_password" msgid="8159775129968582940">"थप सुरक्षाका लागि आफ्नो यन्त्रको कार्य प्रोफाइलको पासवर्ड प्रविष्ट गर्नुहोस्"</string>
+    <string name="lockpassword_confirm_your_pattern_details_frp" msgid="6757336656791723193">"तपाईंको फोन फ्याक्ट्री सेटिङमा रिसेट गरिएको छ। यो फोन प्रयोग गर्न आफ्नो पछिल्लो ढाँचा प्रविष्ट गर्नुहोस्।"</string>
+    <string name="lockpassword_confirm_your_pin_details_frp" msgid="826520613445990470">"तपाईंको फोन फ्याक्ट्री सेटिङमा रिसेट गरिएको छ। यो फोन प्रयोग गर्न आफ्नो पछिल्लो PIN प्रविष्ट गर्नुहोस्।"</string>
+    <string name="lockpassword_confirm_your_password_details_frp" msgid="8944081074615739040">"तपाईंको फोन फ्याक्ट्री सेटिङमा रिसेट गरिएको छ। यो फोन प्रयोग गर्न आफ्नो पछिल्लो पासवर्ड प्रविष्ट गर्नुहोस्।"</string>
+    <string name="lockpassword_confirm_your_pattern_header_frp" msgid="2898036091609128286">"ढाँचा पुष्टि गर्नुहोस्‌"</string>
+    <string name="lockpassword_confirm_your_pin_header_frp" msgid="4141601774778898803">"PIN पुष्टि गर्नुहोस्‌"</string>
+    <string name="lockpassword_confirm_your_password_header_frp" msgid="3762615419295360480">"पासवर्ड पुष्टि गर्नुहोस्"</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>
@@ -1537,7 +1550,6 @@
     <string name="install_applications_title" msgid="4987712352256508946">"सबै अनुप्रयोग स्रोतहरू अनुमति"</string>
     <string name="recent_app_category_title" msgid="6673071268966003928">"हालै खोलिएका अनुप्रयोगहरू"</string>
     <string name="see_all_apps_title" msgid="1317153498074308438">"सबै <xliff:g id="COUNT">%1$d</xliff:g> अनुप्रयोगहरू हेर्नुहोस्"</string>
-    <string name="recent_app_summary" msgid="3366446669844932300">"<xliff:g id="TIME">^1</xliff:g> पहिले"</string>
     <string name="install_all_warning" product="tablet" msgid="8310489909586138165">"तपाईंको ट्याब्लेट र व्यक्तिगत डेटा अज्ञात अनुप्रयोगहरूबाट हुने आक्रमणमा पर्न सक्ने जोखिम अझ बढी हुन्छ। यो स्रोतबाट प्राप्त हुने अनुप्रयोगहरूको स्थापना गरेर, तिनीहरूको प्रयोगबाट तपाईंको ट्याब्लेटमा हुनसक्ने क्षति वा डेटाको नोक्सानीको जिम्मेवार तपाईं आफैँ हुनुहुन्छ भन्ने कुरामा तपाईं सहमत हुनुहुन्छ।"</string>
     <string name="install_all_warning" product="default" msgid="1952257127370115988">"तपाईंको फोन र व्यक्तिगत डेटा अज्ञात अनुप्रयोगहरूबाट हुने आक्रमणमा पर्न सक्ने जोखिम अझ बढी हुन्छ। यो स्रोतबाट प्राप्त हुने अनुप्रयोगहरूको स्थापना गरेर, तिनीहरूको प्रयोगबाट तपाईंको फोनमा हुनसक्ने क्षति वा डेटाको नोक्सानीको जिम्मेवार तपाईं आफैँ हुनुहुन्छ भन्ने कुरामा तपाईं सहमत हुनुहुन्छ।"</string>
     <string name="advanced_settings" msgid="1777249286757067969">"जटिल सेटिङहरू"</string>
@@ -1801,7 +1813,7 @@
     <string name="accessibility_settings_summary" msgid="981260486011624939">"स्क्रिन रिडरहरू, प्रदर्शन, अन्तर्क्रिया नियन्त्रणहरू"</string>
     <string name="vision_settings_title" msgid="4204111425716868288">"दृश्यका सेटिङहरू"</string>
     <string name="vision_settings_description" msgid="5679491180156408260">"तपाईंले आफ्नो आवश्यकताहरूसँग मेल खाने बनाउन यस यन्त्रलाई आफू अनुकूल गर्न सक्नुहुन्छ। यी पहुँच सुविधाहरू सेटिङमा पछि परिवर्तन गर्न सकिनेछ।"</string>
-    <string name="vision_settings_suggestion_title" msgid="917294957154878441">"फन्टको आकार बढाउनुहोस्"</string>
+    <string name="vision_settings_suggestion_title" msgid="8058794060304707004">"फन्ट साइज बदल्नुहोस्"</string>
     <string name="screen_reader_category_title" msgid="7739154903913400641">"स्क्रिन रिडरहरू"</string>
     <string name="audio_and_captions_category_title" msgid="3420727114421447524">"अडियो तथा स्क्रिनमा देखिने पाठ सन्देश"</string>
     <string name="display_category_title" msgid="685461049938269166">"प्रदर्शन"</string>
@@ -1825,7 +1837,7 @@
     <string name="accessibility_global_gesture_preference_title" msgid="2048884356166982714">"भोल्युम कुञ्जीको सर्टकट"</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="1765853731190717372">"सर्टकट सक्रिय हुँदा पहुँचसम्बन्धी सुविधा सुरू गर्न तपाईं दुवै भोल्युम कुञ्जीहरूलाई ३ सेकेन्डसम्म थिच्न सक्नुहुन्छ।"</string>
+    <string name="accessibility_shortcut_description" msgid="1765853731190717372">"सर्टकट सक्रिय हुँदा पहुँचसम्बन्धी सुविधा सुरु गर्न तपाईं दुवै भोल्युम कुञ्जीहरूलाई ३ सेकेन्डसम्म थिच्न सक्नुहुन्छ।"</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>
@@ -1838,7 +1850,6 @@
     <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="preference_summary_default_combination" msgid="8532964268242666060">"<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>
@@ -1936,7 +1947,7 @@
     <string name="print_service_disabled" msgid="7739452396114245222">"सेवा असक्षम गरियो"</string>
     <string name="print_print_jobs" msgid="3582094777756968793">"छपाइ कार्यहरू"</string>
     <string name="print_print_job" msgid="7563741676053287211">"छपाइ कार्य गर्नुहोस्"</string>
-    <string name="print_restart" msgid="8373999687329384202">"पुनःस्टार्ट गर्नुहोस्"</string>
+    <string name="print_restart" msgid="8373999687329384202">"पुनः सुरु गर्नुहोस्"</string>
     <string name="print_cancel" msgid="3621199386568672235">"रद्द गर्नुहोस्"</string>
     <string name="print_job_summary" msgid="8472427347192930694">"<xliff:g id="PRINTER">%1$s</xliff:g>\n<xliff:g id="TIME">%2$s</xliff:g>"</string>
     <string name="print_printing_state_title_template" msgid="5736107667714582025">"प्रिन्ट गरिँदै <xliff:g id="PRINT_JOB_NAME">%1$s</xliff:g>"</string>
@@ -1957,12 +1968,14 @@
     <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_whitelisted" msgid="7375400051141016808">"अनुप्रयोगलाई ब्याट्रीको प्रयोगको लागि अनुकूलन गर्न सकिँदैन"</string>
+    <string name="background_activity_warning_dialog_title" msgid="2216249969149568871">"पृष्ठभूमिको गतिविधिलाई सीमित गर्ने हो?"</string>
+    <string name="background_activity_warning_dialog_text" msgid="7049624449246121981">"तपाईंले कुनै अनुप्रयोगको पृष्ठभूमिको गतिविधिलाई सीमित गर्नुभयो भने यसले सही तरिकाले काम नगर्न सक्छ"</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" msgid="6393929085382334341">"पूर्ण चार्ज भएदेखि अनुप्रयोगको प्रयोग (<xliff:g id="RELATIVE_TIME">^1</xliff:g>)"</string>
+    <string name="power_usage_list_summary_device" msgid="4461926045610455423">"पूर्ण चार्ज भएदेखि यन्त्रको प्रयोग (<xliff:g id="RELATIVE_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>
@@ -2208,14 +2221,14 @@
     <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">"पासवर्ड कम से कम ८ अक्षरको हुनु पर्छ।"</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">"तपाईँले प्रामाणिक डेटा भण्डारण प्रयोग गर्नुअघि तपाईँले लक स्क्रिन PIN वा पासवर्ड सेट गर्नु पर्छ।"</string>
+    <string name="credentials_configure_lock_screen_hint" msgid="8058230497337529036">"तपाईंले प्रमाणको भण्डारण प्रयोग गर्न सक्नुअघि तपाईंको यन्त्रमा एक सुरक्षित लक स्क्रिन हुनु अनिवार्य छ"</string>
+    <string name="credentials_configure_lock_screen_button" msgid="253239765216055321">"लक सेट गर्नुहोस्"</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>
@@ -2335,8 +2348,6 @@
     <skip />
     <string name="cant_sync_dialog_title" msgid="2777238588398046285">"आफैँ सिंक गर्न सकेन।"</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>
@@ -2350,6 +2361,7 @@
     <string name="misc_files_selected_count" msgid="4647048020823912088">"चयनित <xliff:g id="NUMBER">%1$d</xliff:g> यस <xliff:g id="TOTAL">%2$d</xliff:g>भन्दा बाहिर"</string>
     <string name="misc_files_selected_count_bytes" msgid="2876232009069114352">"<xliff:g id="NUMBER">%1$s</xliff:g> मा <xliff:g id="TOTAL">%2$s</xliff:g>"</string>
     <string name="select_all" msgid="1562774643280376715">"सबैलाई चयन गर्नुहोस्"</string>
+    <string name="data_plan_usage_manage_plans_button_text" msgid="8997761990902708162">"योजनाहरूको व्यवस्थापन गर्नुहोस्"</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>
@@ -2435,6 +2447,9 @@
     <string name="data_usage_metered_mobile" msgid="5423305619126978393">"मोबाइल नेटवर्क"</string>
     <string name="data_usage_metered_wifi" msgid="1761738002328299714">"मिटर राखिएका Wi-Fi सञ्जालहरू"</string>
     <string name="data_usage_metered_wifi_disabled" msgid="727808462375941567">"मिटर राखिएका सञ्जालहरू चयन गर्न, Wi-Fi खोल्नुहोस्।"</string>
+    <string name="data_usage_metered_auto" msgid="1262028400911918865">"स्वचालित"</string>
+    <string name="data_usage_metered_yes" msgid="9217539611385225894">"मिटर गरिएको छ"</string>
+    <string name="data_usage_metered_no" msgid="4025232961929071789">"मिटर गरिएको छैन"</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>
@@ -2526,9 +2541,6 @@
     <string name="backup_pw_set_button_text" msgid="2387480910044648795">"ब्याकअप पासवर्ड सेट गर्नुहोस्"</string>
     <string name="backup_pw_cancel_button_text" msgid="8845630125391744615">"रद्द गर्नुहोस्"</string>
     <string name="additional_system_update_settings_list_item_title" msgid="214987609894661992">"थप प्रणाली अपडेटहरू"</string>
-    <string name="selinux_status_disabled" msgid="924551035552323327">"असक्षम पारियो"</string>
-    <string name="selinux_status_permissive" msgid="6004965534713398778">"अनुमोदक"</string>
-    <string name="selinux_status_enforcing" msgid="2252703756208463329">"सबल पार्दै"</string>
     <string name="ssl_ca_cert_warning" msgid="2045866713601984673">"सञ्जाल अनुगमित हुन सक्छ"</string>
     <string name="done_button" msgid="1991471253042622230">"सम्पन्न भयो"</string>
     <plurals name="ssl_ca_cert_dialog_title" formatted="false" msgid="7145092748045794650">
@@ -2726,6 +2738,7 @@
       <item quantity="other">लुकाइएका %d वस्तुहरू देखाउनुहोस्</item>
       <item quantity="one">लुकाइएको %d वस्तु देखाउनुहोस्</item>
     </plurals>
+    <string name="dashboard_suggestion_condition_footer_content_description" msgid="2898588191174845961">"संक्षिप्त गर्नुहोस्"</string>
     <string name="network_dashboard_title" msgid="4771589228992391573">"नेटवर्क र इन्टरनेट"</string>
     <string name="network_dashboard_summary_mobile" msgid="3851083934739500429">"मोबाइल"</string>
     <string name="network_dashboard_summary_data_usage" msgid="3843261364705042212">"डेटाको प्रयोग"</string>
@@ -2785,8 +2798,7 @@
     <string name="keywords_gesture" msgid="3526905012224714078">"इसाराहरू"</string>
     <string name="keywords_payment_settings" msgid="5220104934130446416">"भुक्तानी गर्नुहोस्, ट्याप गर्नुहोस्, भुक्तानी"</string>
     <string name="keywords_backup" msgid="470070289135403022">"ब्याकअप, ब्याकअप गर्नुहोस्"</string>
-    <!-- no translation found for keywords_assist_gesture_launch (813968759791342591) -->
-    <skip />
+    <string name="keywords_assist_gesture_launch" msgid="813968759791342591">"इसारा"</string>
     <string name="setup_wifi_nfc_tag" msgid="9028353016222911016">"Wi-Fi NFC ट्याग सेट गर्नुहोस्"</string>
     <string name="write_tag" msgid="8571858602896222537">"लेख्नुहोस्"</string>
     <string name="status_awaiting_tap" msgid="2130145523773160617">"लेख्न ट्याग छुनुहोस्..."</string>
@@ -2829,8 +2841,14 @@
       <item quantity="other"><xliff:g id="ON_COUNT">%d</xliff:g> स्वचालित नियम सक्रिय गरिए</item>
       <item quantity="one">१ स्वचालित नियम सक्रिय गरियो</item>
     </plurals>
-    <string name="zen_mode_settings_title" msgid="842308776768942600">"बाधा नपुर्‍याउनुहोस् मोडका प्राथमिकताहरू"</string>
-    <string name="zen_mode_priority_settings_title" msgid="2623117023031824309">"प्राथमिकताले मात्र अनुमति  दिन्छ"</string>
+    <string name="zen_mode_settings_title" msgid="1066226840983908121">"बाधा नपुऱ्याउनुहोस्"</string>
+    <string name="zen_mode_behavior_settings_title" msgid="1463303933529313969">"व्यवहार"</string>
+    <string name="zen_mode_behavior_allow_title" msgid="3845615648136218141">"निम्नबाट आउने आवाज र कम्पनहरूलाई अनुमति दिनु"</string>
+    <string name="zen_mode_behavior_no_sound" msgid="1219626004723208056">"कुनै पनि आवाज ननिकाल्ने"</string>
+    <string name="zen_mode_behavior_total_silence" msgid="6716603819806610626">"आवाज ननिकाल्ने (पूर्ण शान्त)"</string>
+    <string name="zen_mode_behavior_no_sound_except" msgid="4968477585788243114">"निम्नबाहेक कुनै आवाज ननिकाल्ने <xliff:g id="CATEGORIES">%1$s</xliff:g>"</string>
+    <!-- no translation found for zen_mode_behavior_alarms_only (2423480992071472963) -->
+    <skip />
     <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>
@@ -2872,13 +2890,15 @@
     <string name="notifications_title" msgid="8086372779371204971">"सूचनाहरू"</string>
     <string name="app_notifications_title" msgid="5810577805218003760">"अनुप्रयोग सूचनाहरू"</string>
     <string name="notification_channel_title" msgid="2260666541030178452">"सूचनाको प्रकार"</string>
+    <string name="notification_group_title" msgid="7180506440133859601">"सूचनासम्बन्धी कोटिको समूह"</string>
     <string name="notification_importance_title" msgid="848692592679312666">"महत्त्व"</string>
-    <string name="notification_importance_unspecified" msgid="2196023702875112081">"अनुप्रयोगलाई निर्णय गर्न दिनुहोस्"</string>
+    <string name="notification_importance_unspecified" msgid="6622173510486113958">"ध्वनिलाई अनुमति दिनुहोस्"</string>
     <string name="notification_importance_blocked" msgid="7938180808339386300">"सूचनाहरू कहिल्यै नदेखाउनुहोस्"</string>
     <string name="notification_importance_min" msgid="5455049524984686275">"कुनै आवाज ननिकाल्ने वा दृश्य सम्बन्धी अवरोध नपुर्याउने"</string>
     <string name="notification_importance_low" msgid="8881468429453766553">"आवाज ननिकाल्ने"</string>
     <string name="notification_importance_default" msgid="5958338024601957516">"आवाज निकाल्ने"</string>
     <string name="notification_importance_high" msgid="2082429479238228527">"आवाज निकाल्ने र स्क्रिनमा पपअप देखाउने"</string>
+    <string name="notification_importance_high_silent" msgid="2667033773703765252">"स्क्रिनमा देखाउनुहोस्"</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>
@@ -2915,15 +2935,19 @@
     <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>
-    <!-- no translation found for picture_in_picture_app_detail_summary (1264019085827708920) -->
-    <skip />
+    <string name="picture_in_picture_app_detail_summary" msgid="1264019085827708920">"यो अनुप्रयोग खुला रहेको अवस्थामा वा तपाईंले यसलाई छाड्नुभएपछि (उदाहरणका लागि, भिडियो हेर्ने कार्य जारी राख्न) यस अनुप्रयोगलाई picture-in-picture विन्डो सिर्जना गर्न अनुमति दिनुहोस्। यो विन्डो तपाईंले प्रयोग गरिरहनुभएका अन्य अनुप्रयोगहरूको शीर्ष भागमा देखिन्छ।"</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="channel_group_notifications_off_desc" msgid="1620950416247316370">"Android ले यस यन्त्रमा यी सूचनाहरूको समूहलाई देखिनबाट रोक लगाइरहेको छ"</string>
     <string name="notification_channels" msgid="5346841743182627500">"कोटीहरू"</string>
     <string name="notification_channels_other" msgid="5645317113885788226">"अन्य"</string>
+    <plurals name="notification_group_summary" formatted="false" msgid="3420621520561455358">
+      <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="no_channels" msgid="3077375508177744586">"यो अनुप्रयोगले कुनै पनि सूचना पोस्ट गरेको छैन"</string>
     <string name="app_settings_link" msgid="8894946007543660906">"अनुप्रयोगका अतिरिक्त सेटिङहरू"</string>
     <string name="app_notification_listing_summary_zero" msgid="6482582965081108108">"सबै अनुप्रयोगका लागि सक्रिय गरिएको छ"</string>
@@ -3000,12 +3024,14 @@
     <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>
+    <!-- no translation found for zen_mode_media_system_other (8900209390529859777) -->
+    <skip />
     <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="239685342222975733">"एउटै व्यक्तिले <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>
@@ -3034,6 +3060,7 @@
     <string name="zen_mode_screen_off_visual_interruptions" msgid="4850792880144382633">"स्क्रिन अफ हुँदा"</string>
     <string name="zen_mode_no_visual_interruptions" msgid="8742776003822778472">"स्क्रिन अन वा अफ हुँदा"</string>
     <string name="notification_app_settings_button" msgid="6685640230371477485">"सूचना सेटिङहरू"</string>
+    <string name="suggestion_button_text" msgid="3275010948381252006">"ठीक छ"</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>
@@ -3218,6 +3245,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="sms_mirroring_pref" msgid="6475043279147376031">"SMS प्रतिविम्ब गर्ने सुविधा"</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>
@@ -3284,7 +3312,7 @@
     <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="permit_write_settings" msgid="658555006453212691">"प्रणालीका सेटिङहरू परिमार्जन गर्न दिनुहोस्"</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>
@@ -3379,9 +3407,12 @@
     <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="connectivity_monitor_switch" msgid="9059759348648583421">"कनेक्टिभिटी मनिटर"</string>
+    <string name="connectivity_monitor_switch_summary" msgid="2828658652378866401">"ConnectivityMonitor ले प्रयोगकर्ताहरूलाई जडानसम्बन्धी कुनै समस्या पत्ता लगायो भने लगहरू सङ्कलन गरी बगबारे रिपोर्ट गर्न भनी सूचित गर्ने छ"</string>
+    <string name="connectivity_monitor_toast" msgid="5551859612881173028">"कनेक्टिभिटी मनिटरमा गरिएको परिवर्तनलाई लागू गर्न यन्त्र पुनः बुट गर्नुहोस्"</string>
     <string name="camera_hal_hdrplus_switch" msgid="8377365197105267466">"क्यामेरा HAL HDR+"</string>
     <string name="camera_hal_hdrplus_toast" msgid="2063703797270055299">"क्यामेरा HAL HDR+ मा गरिएको परिवर्तनलाई लागू गर्न यन्त्रलाई पुनः बुट गर्नुहोस्"</string>
+    <string name="camera_laser_sensor_switch" msgid="8913588990743234440">"क्यामेरा लेजरको सेन्सर"</string>
     <string name="ota_disable_automatic_update" msgid="2319639631655915050">"स्वचालित प्रणाली अद्यावधिकहरू"</string>
     <string name="usage" msgid="2977875522080448986">"उपयोग"</string>
     <string name="cellular_data_usage" msgid="2155683719898158203">"मोबाइल डेटाको प्रयोग"</string>
@@ -3407,7 +3438,7 @@
     <string name="data_warning" msgid="209133958008062117">"डेटा चेतावनी"</string>
     <string name="set_data_limit" msgid="2901526323210516923">"डेटाको सीमा सेट गर्नुहोस्"</string>
     <string name="data_limit" msgid="1885406964934590552">"डेटाको सीमा"</string>
-    <string name="data_usage_template" msgid="392191945602400904">"<xliff:g id="ID_1">%1$s</xliff:g> <xliff:g id="ID_2">%2$s</xliff:g> बीचमा प्रयोग गरियो"</string>
+    <string name="data_usage_template" msgid="2923744765873163859">"<xliff:g id="ID_2">%2$s</xliff:g> सम्म <xliff:g id="ID_1">%1$s</xliff:g> प्रयोग गरियो"</string>
     <string name="configure" msgid="1029654422228677273">"कन्फिगर गर्नुहोस्"</string>
     <string name="data_usage_other_apps" msgid="3272872663517382050">"प्रयोगमा समावेश गरिएका अन्य अनुप्रयोगहरू"</string>
     <plurals name="data_saver_unrestricted_summary" formatted="false" msgid="2635267833484232703">
@@ -3424,8 +3455,8 @@
     <string name="home_app" msgid="4066188520886810030">"घरेलु अनुप्रयोग"</string>
     <string name="no_default_home" msgid="7184117487704520238">"पूर्वनिर्धारित गृहपृष्ठ छैन"</string>
     <string name="lockpattern_settings_require_cred_before_startup" msgid="3832020101401318248">"स्टार्ट-अप सुरक्षित गर्नुहोस्"</string>
-    <string name="lockpattern_settings_require_pattern_before_startup_summary" msgid="7873036097628404476">"तपाईंको यन्त्रलाई सुरूवात गर्न ढाँचा आवश्यक छ। यन्त्र बन्द हुँदा, यसले कल, सन्देश, सूचना, वा अलार्महरू प्राप्त गर्न सक्दैन।"</string>
-    <string name="lockpattern_settings_require_pin_before_startup_summary" msgid="6022831284097476933">"तपाईंको यन्त्र सुरूवात गर्न PIN आवश्यक छ। यन्त्र बन्द हुँदा, यसले कल, सन्देश, सूचना, वा अलार्महरू प्राप्त गर्न सक्दैन।"</string>
+    <string name="lockpattern_settings_require_pattern_before_startup_summary" msgid="7873036097628404476">"तपाईंको यन्त्रलाई सुरुवात गर्न ढाँचा आवश्यक छ। यन्त्र बन्द हुँदा, यसले कल, सन्देश, सूचना, वा अलार्महरू प्राप्त गर्न सक्दैन।"</string>
+    <string name="lockpattern_settings_require_pin_before_startup_summary" msgid="6022831284097476933">"तपाईंको यन्त्र सुरुवात गर्न PIN आवश्यक छ। यन्त्र बन्द हुँदा, यसले कल, सन्देश, सूचना, वा अलार्महरू प्राप्त गर्न सक्दैन।"</string>
     <string name="lockpattern_settings_require_password_before_startup_summary" msgid="6818285221244966231">"तपाईंको यन्त्र स्टार्ट अप गर्न पासवर्ड आवश्यक छ। यन्त्र बन्द हुँदा, यसले कल, सन्देश, सूचना, वा अलार्महरू प्राप्त गर्न सक्दैन।"</string>
     <string name="suggestion_additional_fingerprints" msgid="2214281455363797037">"अर्को फिंगरप्रिन्ट थप्नुहोस्"</string>
     <string name="suggestion_additional_fingerprints_summary" msgid="5471253233176471245">"अर्को औँलाको प्रयोग गरी अनलक गर्नुहोस्"</string>
@@ -3478,7 +3509,7 @@
     <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="387052719462473500">"लक स्क्रिनमा जानकारी नियन्त्रण गर्नुहोस्"</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="8483187649355540109">"सहायता र सुझावहरू"</string>
@@ -3486,7 +3517,7 @@
     <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>
+    <string name="bluetooth_disabled" msgid="6244000672828617410">"निष्क्रिय छ"</string>
     <string name="bluetooth_connected_summary" msgid="7672528674593152862">"<xliff:g id="ID_1">%1$s</xliff:g> मा जडान गरियो"</string>
     <string name="bluetooth_connected_multiple_devices_summary" msgid="9173661896296663932">"धेरै यन्त्रहरूमा जडान गरियो"</string>
     <string name="demo_mode" msgid="2798762752209330277">"प्रणालीको UI को प्रदर्शन मोड"</string>
@@ -3550,7 +3581,7 @@
     <string name="gesture_preference_summary" product="default" msgid="8627850388011956901">"फोनलाई नियन्त्रण गर्ने द्रुत इसाराहरू"</string>
     <string name="gesture_preference_summary" product="tablet" msgid="4717535378272065510">"आफ्नो ट्याब्लेटलाई नियन्त्रण गर्ने द्रुत इसाराहरू"</string>
     <string name="gesture_preference_summary" product="device" msgid="4205941452664950852">"आफ्नो यन्त्रलाई नियन्त्रण गर्ने द्रुत इसाराहरू"</string>
-    <string name="double_tap_power_for_camera_title" msgid="64716226816032800">"क्यामेरा खोलिहाल्नुहोस्"</string>
+    <string name="double_tap_power_for_camera_title" msgid="64716226816032800">"सिधै क्यामेरामा जानुहोस्"</string>
     <string name="double_tap_power_for_camera_summary" msgid="242037150983277829">"द्रुत रूपमा क्यामेरा खोल्न पावर बटनलाई दुई पटक थिच्नुहोस्। जुनसुकै स्क्रिन मार्फत यो सुविधाको प्रयोग गर्न सकिन्छ।"</string>
     <string name="double_tap_power_for_camera_suggestion_title" msgid="6500405261202883589">"चाँडै क्यामेरा खोल्नुहोस्"</string>
     <string name="double_tap_power_for_camera_suggestion_summary" msgid="7010153544554016996">"क्यामेरा खोल्न पावर बटनमा दुई पटक थिच्नुहोस्"</string>
@@ -3588,7 +3619,7 @@
     <string name="web_action_enable_title" msgid="4051513950976670853">"तात्कालिक अनुप्रयोगहरू"</string>
     <string name="web_action_enable_summary" msgid="3108127559723396382">"अनुप्रयोगहरूको स्थापना नगरिए तापनि लिंकहरूलाई तिनीहरूमा खोल्नुहोस्"</string>
     <string name="web_action_section_title" msgid="7364647086538399136">"तात्कालिक अनुप्रयोगहरू"</string>
-    <string name="instant_apps_account" msgid="1433620209791992528">"तात्कालिक अनुप्रयोगहरूको खाता"</string>
+    <string name="instant_apps_settings" msgid="8827777916518348213">"तात्कालिक अनुप्रयोगका प्राथमिकताहरू"</string>
     <string name="domain_url_section_title" msgid="7046835219056428883">"स्थापना गरिएका अनुप्रयोगहरू"</string>
     <string name="automatic_storage_manager_activation_warning" msgid="6353100011690933254">"तपाईंको भण्डारण अहिले भण्डारण प्रबन्धकद्वारा व्यवस्थापन भइरहेको छ"</string>
     <string name="account_for_section_header" msgid="5356566418548737121">"<xliff:g id="USER_NAME">%1$s</xliff:g> का खाताहरू"</string>
@@ -3635,7 +3666,9 @@
     <string name="enterprise_privacy_always_on_vpn_personal" msgid="9217774730260037434">"तपाईँको व्यक्तिगत प्रोफाइलमा सधैँ-सक्रिय रहने VPN सेवा सक्रिय गरिएको छ"</string>
     <string name="enterprise_privacy_always_on_vpn_work" msgid="7244472958208315814">"तपाईँको कार्य प्रोफाइलमा सधैँ-सक्रिय रहने VPN सेवा सक्रिय गरिएको छ"</string>
     <string name="enterprise_privacy_global_http_proxy" msgid="7936664553416257333">"विश्वव्यापी HTTP प्रोक्सी सेट गरियो"</string>
-    <string name="enterprise_privacy_ca_certs" msgid="5885892204903688909">"विश्वसनीय प्रमाणहरू"</string>
+    <string name="enterprise_privacy_ca_certs_device" msgid="2019652712782510262">"विश्वसनीय प्रमाणपत्रहरू"</string>
+    <string name="enterprise_privacy_ca_certs_personal" msgid="2279084820904076599">"तपाईंको व्यक्तिगत प्रोफाइलमा रहेका विश्वसनीय प्रमाणपत्रहरू"</string>
+    <string name="enterprise_privacy_ca_certs_work" msgid="6187377647815301809">"तपाईंको कार्य प्रोफाइलमा रहेका विश्वसनीय प्रमाणपत्रहरू"</string>
     <plurals name="enterprise_privacy_number_ca_certs" formatted="false" msgid="526375234629534165">
       <item quantity="other">न्यूनतम <xliff:g id="COUNT_1">%d</xliff:g> CA का प्रमाणपत्र</item>
       <item quantity="one">न्यूनतम <xliff:g id="COUNT_0">%d</xliff:g> CA को प्रमाणपत्र</item>
@@ -3698,6 +3731,8 @@
     <string name="carrier_provisioning" msgid="4398683675591893169">"सेवा प्रदायकको प्रावधान सम्बन्धी जानकारी"</string>
     <string name="trigger_carrier_provisioning" msgid="3434865918009286187">"सेवा प्रदायकको प्रावधानलाई ट्रिगर गर्नुहोस्"</string>
     <string name="new_device_suggestion_title" msgid="698847081680980774">"सेटिङहरूको गृहपृष्ठमा नयाँ र रोमाञ्चक के छ?"</string>
-    <string name="new_device_suggestion_summary" msgid="7172709269203435870">"शीर्ष ५ सुविधाहरू हेर्नुहोस्"</string>
+    <string name="new_device_suggestion_summary" product="default" msgid="206396571522515855">"आफ्नो नयाँ फोनको बारेमा राम्रोसँग जान्नुहोस्‌"</string>
+    <string name="new_device_suggestion_summary" product="tablet" msgid="393751455688210956">"आफ्नो नयाँ ट्याब्लेटको बारेमा राम्रोसँग जान्नुहोस्‌"</string>
+    <string name="new_device_suggestion_summary" product="device" msgid="2939870049868336652">"आफ्नो नयाँ यन्त्रको बारेमा राम्रोसँग जान्नुहोस्‌"</string>
     <string name="disabled_low_ram_device" msgid="3751578499721173344">"यस यन्त्रमा यो सुविधा उपलब्ध छैन"</string>
 </resources>
diff --git a/res/values-nl/arrays.xml b/res/values-nl/arrays.xml
index f71a6ad..6bff3da 100644
--- a/res/values-nl/arrays.xml
+++ b/res/values-nl/arrays.xml
@@ -100,8 +100,6 @@
     <!-- no translation found for wifi_security_no_eap:0 (2084555984818107151) -->
     <!-- no translation found for wifi_security_no_eap:1 (397579322683471524) -->
     <!-- no translation found for wifi_security_no_eap:2 (1968820975358150484) -->
-    <!-- no translation found for wifi_ap_security:0 (5251664683198623324) -->
-    <!-- no translation found for wifi_ap_security:1 (7989073072260294673) -->
   <string-array name="wifi_eap_method">
     <item msgid="1160193392455075561">"PEAP"</item>
     <item msgid="7981731051382306293">"TLS"</item>
diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml
index 7f494bf..1da909c 100644
--- a/res/values-nl/strings.xml
+++ b/res/values-nl/strings.xml
@@ -166,7 +166,7 @@
     <string name="bluetooth_map_acceptance_dialog_text" msgid="8712508202081143737">"%1$s wil toegang tot je berichten. Toegang geven aan %2$s?"</string>
     <string name="bluetooth_sap_request" msgid="2669762224045354417">"Toegangsverzoek voor simkaart"</string>
     <string name="bluetooth_sap_acceptance_dialog_text" msgid="4414253873553608690">"<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g> wil toegang tot je simkaart. Als je toegang tot de simkaart verleent, wordt de gegevensverbinding op je apparaat uitgeschakeld voor de duur van de verbinding. Toegang verlenen aan <xliff:g id="DEVICE_NAME_1">%2$s?</xliff:g>"</string>
-    <string name="bluetooth_device_name_summary" msgid="4757990010751789977">"Zichtbaar als <xliff:g id="DEVICE_NAME">^1</xliff:g> voor andere apparaten"</string>
+    <string name="bluetooth_device_name_summary" msgid="522235742194965734">"Zichtbaar als <xliff:g id="DEVICE_NAME">^1</xliff:g> voor andere apparaten"</string>
     <string name="bluetooth_paired_device_title" msgid="8638994696317952019">"Je apparaten"</string>
     <string name="bluetooth_pairing_page_title" msgid="7712127387361962608">"Nieuw apparaat koppelen"</string>
     <string name="date_and_time" msgid="9062980487860757694">"Datum en tijd"</string>
@@ -293,8 +293,8 @@
     <string name="cellular_data_summary" msgid="4660351864416939504">"Datagebruik via mobiel netwerk toestaan"</string>
     <string name="allow_data_usage_title" msgid="2238205944729213062">"Geg.gebr. bij roaming toestaan"</string>
     <string name="roaming" msgid="3596055926335478572">"Gegevensroaming"</string>
-    <string name="roaming_enable" msgid="3737380951525303961">"Verbinding maken met gegevensservices tijdens roaming"</string>
-    <string name="roaming_disable" msgid="1295279574370898378">"Verbinding maken met gegevensservices tijdens roaming"</string>
+    <string name="roaming_enable" msgid="3737380951525303961">"Verbinding maken met dataservices tijdens roaming"</string>
+    <string name="roaming_disable" msgid="1295279574370898378">"Verbinding maken met dataservices tijdens roaming"</string>
     <string name="roaming_reenable_message" msgid="9141007271031717369">"De gegevensverbinding is verbroken, omdat je je thuisnetwerk hebt verlaten terwijl gegevensroaming was uitgeschakeld."</string>
     <string name="roaming_turn_it_on_button" msgid="4387601818162120589">"Inschakelen"</string>
     <string name="roaming_warning" msgid="4275443317524544705">"Er kunnen hoge kosten in rekening worden gebracht."</string>
@@ -312,6 +312,8 @@
     <string name="zone_auto" msgid="334783869352026648">"Automatische tijdzone"</string>
     <string name="zone_auto_summaryOn" msgid="6142830927278458314">"Netwerktijdzone gebruiken"</string>
     <string name="zone_auto_summaryOff" msgid="2597745783162041390">"Netwerktijdzone gebruiken"</string>
+    <string name="date_time_24hour_auto" msgid="2117383168985653422">"Automatische 24-uursnotatie"</string>
+    <string name="date_time_24hour_auto_summary" msgid="6351812925651480277">"Lokale standaard gebruiken"</string>
     <string name="date_time_24hour_title" msgid="3203537578602803850">"24‑uursnotatie"</string>
     <string name="date_time_24hour" msgid="1193032284921000063">"24-uurs klok gebruiken"</string>
     <string name="date_time_set_time_title" msgid="6296795651349047016">"Tijd"</string>
@@ -372,6 +374,9 @@
     <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="1961957425135180242">"Volgende"</string>
+    <string name="setup_fingerprint_enroll_skip_title" msgid="362050541117362034">"Vingerafdruk overslaan?"</string>
+    <string name="setup_fingerprint_enroll_skip_after_adding_lock_text" msgid="958990414356204763">"Het instellen van een vingerafdruk kost slechts een minuut of twee. Als je dit nu overslaat, kun je je vingerafdruk later toevoegen via de instellingen."</string>
+    <string name="lock_screen_intro_skip_title" msgid="4988210105913705679">"Schermvergrendeling overslaan?"</string>
     <string name="lock_screen_intro_skip_dialog_text_frp" product="tablet" msgid="1581834104051243425">"De apparaatbeschermingsfuncties worden niet ingeschakeld. Je kunt niet voorkomen dat anderen deze tablet gebruiken als je deze verliest, als de tablet wordt gestolen of als deze wordt gereset."</string>
     <string name="lock_screen_intro_skip_dialog_text_frp" product="device" msgid="4629503416877189572">"De apparaatbeschermingsfuncties worden niet ingeschakeld. Je kunt niet voorkomen dat anderen dit apparaat gebruiken als je het verliest, als het wordt gestolen of als het wordt gereset."</string>
     <string name="lock_screen_intro_skip_dialog_text_frp" product="default" msgid="2423428240245737909">"De apparaatbeschermingsfuncties worden niet ingeschakeld. Je kunt niet voorkomen dat anderen deze telefoon gebruiken als je deze verliest, als de telefoon wordt gestolen of als deze wordt gereset."</string>
@@ -380,15 +385,15 @@
     <string name="lock_screen_intro_skip_dialog_text" product="default" msgid="3008526710555416125">"De apparaatbeschermingsfuncties worden niet ingeschakeld. Je kunt niet voorkomen dat anderen deze telefoon gebruiken als je deze verliest of als deze wordt gestolen."</string>
     <string name="skip_anyway_button_label" msgid="2323522873558834513">"Toch overslaan"</string>
     <string name="go_back_button_label" msgid="4745265266186209467">"Terug"</string>
-    <string name="security_settings_fingerprint_enroll_find_sensor_title" msgid="3051496861358227199">"De sensor aanraken"</string>
+    <string name="security_settings_fingerprint_enroll_find_sensor_title" msgid="3051496861358227199">"Raak de sensor aan"</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_message" msgid="8793966374365960368">"De sensor bevindt zich aan de achterkant van je telefoon. Gebruik je wijsvinger."</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_content_description" msgid="2058830032070449160">"Ilustratie met apparaat en locatie van vingerafdruksensor"</string>
     <string name="security_settings_fingerprint_enroll_dialog_name_label" msgid="7086763077909041106">"Naam"</string>
     <string name="security_settings_fingerprint_enroll_dialog_ok" msgid="4150384963879569750">"OK"</string>
     <string name="security_settings_fingerprint_enroll_dialog_delete" msgid="4114615413240707936">"Verwijderen"</string>
-    <string name="security_settings_fingerprint_enroll_start_title" msgid="2068961812439460133">"De sensor aanraken"</string>
+    <string name="security_settings_fingerprint_enroll_start_title" msgid="2068961812439460133">"Raak de sensor aan"</string>
     <string name="security_settings_fingerprint_enroll_start_message" msgid="3909929328942564524">"Plaats je vinger op de sensor en til deze op nadat je een trilling hebt gevoeld"</string>
-    <string name="security_settings_fingerprint_enroll_repeat_title" msgid="2819679722403209778">"Optillen en opnieuw aanraken"</string>
+    <string name="security_settings_fingerprint_enroll_repeat_title" msgid="2819679722403209778">"Til op en raak opnieuw aan"</string>
     <string name="security_settings_fingerprint_enroll_repeat_message" msgid="6158989350522518586">"Raak de sensor meerdere keren aan om de verschillende delen van je vingerafdruk toe te voegen"</string>
     <string name="security_settings_fingerprint_enroll_finish_title" msgid="7567276170287972230">"Vingerafdruk toegevoegd"</string>
     <string name="security_settings_fingerprint_enroll_finish_message" msgid="4796715961273420536">"Wanneer je dit pictogram ziet, kun je je vingerafdruk gebruiken voor identificatie of om een aankoop goed te keuren."</string>
@@ -457,7 +462,7 @@
     <string name="setup_lock_settings_picker_title" product="tablet" msgid="90329443364067215">"Je tablet beschermen"</string>
     <string name="setup_lock_settings_picker_title" product="device" msgid="2399952075134938929">"Je apparaat beschermen"</string>
     <string name="setup_lock_settings_picker_title" product="default" msgid="1572244299605153324">"Bescherm je telefoon"</string>
-    <string name="setup_lock_settings_picker_fingerprint_message" msgid="5585650064305600578">"Stel een extra schermvergrendeling in voor betere beveiliging."</string>
+    <string name="lock_settings_picker_fingerprint_added_security_message" msgid="5768002109707648463">"Stel een extra schermvergrendeling in voor betere beveiliging."</string>
     <string name="setup_lock_settings_picker_message" product="tablet" msgid="8919671129189936210">"Stel apparaatbeschermingsfuncties in om te voorkomen dat anderen deze tablet zonder je toestemming gebruiken. Kies de schermvergrendeling die je wilt gebruiken."</string>
     <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>
@@ -588,6 +593,7 @@
     <string name="lockpassword_pin_no_sequential_digits" msgid="680765285206990584">"Een oplopende, aflopende of herhaalde reeks cijfers is niet toegestaan"</string>
     <string name="lockpassword_ok_label" msgid="313822574062553672">"OK"</string>
     <string name="lockpassword_cancel_label" msgid="8818529276331121899">"Annuleren"</string>
+    <string name="lockpassword_clear_label" msgid="5724429464960458155">"Wissen"</string>
     <string name="lockpattern_tutorial_cancel_label" msgid="6431583477570493261">"Annuleren"</string>
     <string name="lockpattern_tutorial_continue_label" msgid="3559793618653400434">"Volgende"</string>
     <string name="lock_setup" msgid="3355847066343753943">"Het instellen is voltooid."</string>
@@ -781,6 +787,7 @@
     <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>
@@ -817,6 +824,8 @@
     <string name="wifi_wps_available_first_item" msgid="4422547079984583502">"WPS beschikbaar"</string>
     <string name="wifi_wps_available_second_item" msgid="8427520131718215301">" (WPS beschikbaar)"</string>
     <string name="wifi_wps_nfc_enter_password" msgid="2288214226916117159">"Geef je netwerkwachtwoord op"</string>
+    <string name="wifi_carrier_connect" msgid="8174696557882299911">"Wifi-netwerk van provider"</string>
+    <string name="wifi_carrier_content" msgid="4634077285415851933">"Verbinden via <xliff:g id="NAME">%1%s</xliff:g>"</string>
     <string name="wifi_scan_always_turnon_message" msgid="203123538572122989">"Om de locatieprecisie te verbeteren en voor andere doeleinden, wil <xliff:g id="APP_NAME">%1$s</xliff:g> de netwerkscan inschakelen, zelfs als wifi is uitgeschakeld.\n\nDit toestaan voor alle apps die willen scannen?"</string>
     <string name="wifi_scan_always_turnoff_message" msgid="5538901671131941043">"Ga in het overloopmenu naar \'Geavanceerd\' om dit uit te schakelen."</string>
     <string name="wifi_scan_always_confirm_allow" msgid="5355973075896817232">"Toestaan"</string>
@@ -834,6 +843,7 @@
     <string name="wifi_connect" msgid="1076622875777072845">"Verbinden"</string>
     <string name="wifi_failed_connect_message" msgid="8491902558970292871">"Kan geen verbinding maken met het netwerk"</string>
     <string name="wifi_forget" msgid="8168174695608386644">"Vergeten"</string>
+    <string name="wifi_modify" msgid="6100248070440710782">"Aanpassen"</string>
     <string name="wifi_failed_forget_message" msgid="1348172929201654986">"Vergeten van netwerk is mislukt"</string>
     <string name="wifi_save" msgid="3331121567988522826">"Opslaan"</string>
     <string name="wifi_failed_save_message" msgid="6650004874143815692">"Opslaan van netwerk is mislukt"</string>
@@ -846,6 +856,7 @@
     <string name="wifi_advanced_titlebar" msgid="4485841401774142908">"Geavanceerde wifi-instellingen"</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_title" msgid="3471132676909349382">"Netwerkinformatie"</string>
     <string name="wifi_details_subnet_mask" msgid="6720279144174924410">"Subnetmasker"</string>
     <string name="wifi_details_dns" msgid="8648826607751830768">"DNS"</string>
     <string name="wifi_details_ipv6_address_header" msgid="6734119149106422148">"IPv6-adressen"</string>
@@ -878,16 +889,15 @@
     <string name="wifi_p2p_cancel_connect_title" msgid="255267538099324413">"Uitnodiging annuleren?"</string>
     <string name="wifi_p2p_cancel_connect_message" msgid="7477756213423749402">"Wil je de uitnodiging voor verbinding met <xliff:g id="PEER_NAME">%1$s</xliff:g> annuleren?"</string>
     <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_off_subtext" msgid="5466126533609394170">"Internet of content wordt niet gedeeld met andere apparaten"</string>
     <string name="wifi_hotspot_tethering_on_subtext" product="tablet" msgid="5752490509369962007">"Internetverbinding van deze tablet delen via hotspot"</string>
     <string name="wifi_hotspot_tethering_on_subtext" product="default" msgid="6461075246164300670">"Internetverbinding van deze telefoon delen via hotspot"</string>
     <string name="wifi_hotspot_on_local_only_subtext" msgid="2068110388011294735">"App deelt content. Als je je internetverbinding wilt delen, schakel je de hotspot uit en weer in."</string>
-    <string name="wifi_hotspot_name_title" msgid="1341735529132128887">"Wifi-naam"</string>
+    <string name="wifi_hotspot_name_title" msgid="8237000746618636778">"Naam hotspot"</string>
     <string name="wifi_hotspot_name_summary_connecting" msgid="3378299995508671967">"<xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g> inschakelen..."</string>
     <string name="wifi_hotspot_name_summary_connected" msgid="3888672084861445362">"Andere apparaten kunnen verbinding maken met <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>"</string>
-    <string name="wifi_hotspot_password_title" msgid="1955592302902091281">"Wifi-wachtwoord"</string>
+    <string name="wifi_hotspot_password_title" msgid="8676859981917573801">"Wachtwoord hotspot"</string>
     <string name="wifi_hotspot_ap_band_title" msgid="1165801173359290681">"Frequentieband voor toegangspunt"</string>
     <string name="wifi_hotspot_footer_info_regular" msgid="1203489406068036455">"Gebruik een hotspot om een wifi-netwerk te maken voor je andere apparaten. De hotspot biedt internet via je mobiele dataverbinding. Er kunnen extra kosten voor mobiele data van toepassing zijn."</string>
     <string name="wifi_hotspot_footer_info_local_only" msgid="857988412470694109">"Apps kunnen hotspots maken om content te delen met apparaten in de buurt."</string>
@@ -898,7 +908,6 @@
     <string name="wifi_tether_configure_ap_text" msgid="7974681394041609308">"Wifi-hotspot instellen"</string>
     <string name="wifi_hotspot_configure_ap_text" msgid="5478614731464220432">"Wifi-hotspotconfiguratie"</string>
     <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">"Bellen via wifi"</string>
     <string name="wifi_calling_suggestion_title" msgid="9008010480466359578">"Bellen via wifi inschakelen"</string>
@@ -939,7 +948,7 @@
     <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="emergency_address_summary" msgid="3266760199681945746">"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>
     <string name="sound_settings" msgid="5534671337768745343">"Geluid"</string>
     <string name="all_volume_title" msgid="4296957391257836961">"Volumes"</string>
@@ -993,6 +1002,7 @@
     <string name="search_settings" msgid="1910951467596035063">"Zoeken"</string>
     <string name="search_settings_summary" msgid="9205656546570654169">"Instellingen voor zoeken en zoekgeschiedenis beheren"</string>
     <string name="search_settings_no_results" msgid="8799027492641230999">"Geen resultaten"</string>
+    <string name="search_clear_history" msgid="4196658962573162457">"Geschiedenis wissen"</string>
     <string name="display_settings" msgid="7965901687241669598">"Weergave"</string>
     <string name="accelerometer_title" msgid="7854608399547349157">"Scherm autom. draaien"</string>
     <string name="color_mode_title" msgid="3159275920408338215">"Levendige kleuren"</string>
@@ -1122,7 +1132,6 @@
     <string name="baseband_version" msgid="1848990160763524801">"Smalbandversie"</string>
     <string name="kernel_version" msgid="9192574954196167602">"Kernel-versie"</string>
     <string name="build_number" msgid="3075795840572241758">"Build-nummer"</string>
-    <string name="selinux_status" msgid="6212165375172061672">"SELinux-status"</string>
     <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>
@@ -1150,7 +1159,6 @@
     <string name="status_wifi_mac_address" msgid="2202206684020765378">"MAC-adres voor wifi"</string>
     <string name="status_bt_address" msgid="4195174192087439720">"Bluetooth-adres"</string>
     <string name="status_serial_number" msgid="2257111183374628137">"Serienummer"</string>
-    <string name="status_unavailable" msgid="7862009036663793314">"Niet beschikbaar"</string>
     <string name="status_up_time" msgid="7294859476816760399">"Bedrijfstijd"</string>
     <string name="status_awake_time" msgid="2393949909051183652">"Stand-bytijd"</string>
     <string name="internal_memory" msgid="9129595691484260784">"Interne opslag"</string>
@@ -1326,6 +1334,7 @@
     <string name="menu_restore" msgid="8260067415075573273">"Standaardinstellingen herstellen"</string>
     <string name="restore_default_apn_completed" msgid="2824775307377604897">"Herstellen van standaard-APN-instellingen voltooid."</string>
     <string name="reset_dashboard_title" msgid="6254873816990678620">"Opties voor resetten"</string>
+    <string name="reset_dashboard_summary" msgid="4851012632493522755">"Netwerk, apps of apparaat kunnen worden gereset"</string>
     <string name="reset_network_title" msgid="6166025966016873843">"Wifi, mobiel en Bluetooth resetten"</string>
     <string name="reset_network_desc" msgid="5547979398298881406">"Hiermee worden alle netwerkinstellingen gereset, waaronder:\n\n"<li>"wifi"</li>\n<li>"mobiele data"</li>\n<li>"Bluetooth"</li></string>
     <string name="reset_network_button_text" msgid="2035676527471089853">"Instellingen resetten"</string>
@@ -1334,17 +1343,14 @@
     <string name="reset_network_confirm_title" msgid="1759888886976962773">"Resetten?"</string>
     <string name="network_reset_not_available" msgid="7188610385577164676">"Netwerk herstellen is niet beschikbaar voor deze gebruiker"</string>
     <string name="reset_network_complete_toast" msgid="787829973559541880">"Netwerkinstellingen zijn gereset"</string>
-    <string name="master_clear_title" msgid="6617679904229218425">"Alle gegevens wissen (fabrieksinstellingen terugzetten)"</string>
-    <plurals name="master_clear_with_account_summary" formatted="false" msgid="5911377203778818712">
-      <item quantity="other"><xliff:g id="ACCOUNT_COUNT">%1$d</xliff:g> accounts worden gereset</item>
-      <item quantity="one">1 account wordt gereset</item>
-    </plurals>
-    <string name="master_clear_summary" msgid="6902443944660426951">"Interne opslag en alle gegevens worden gereset"</string>
+    <string name="master_clear_title" msgid="3531267871084279512">"Alle gegevens wissen (fabrieksinstellingen terugzetten)"</string>
     <string name="master_clear_desc" product="tablet" msgid="9146059417023157222">"Hiermee worden alle gegevens in de "<b>"interne opslag"</b>" van je telefoon gewist, waaronder:\n\n"<li>"Je Google-account"</li>\n<li>"Gegevens en instellingen van het systeem en de apps"</li>\n<li>"Gedownloade apps"</li></string>
     <string name="master_clear_desc" product="default" msgid="4800386183314202571">"Hiermee worden alle gegevens in de "<b>"interne opslag"</b>" van je telefoon gewist, waaronder:\n\n"<li>"Je Google-account"</li>\n<li>"Gegevens en instellingen van het systeem en de apps"</li>\n<li>"Gedownloade apps"</li></string>
     <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"Je bent momenteel aangemeld bij de volgende accounts:\n"</string>
     <string name="master_clear_other_users_present" product="default" msgid="5161423070702470742">\n\n"Er zijn andere gebruikers aanwezig op dit apparaat.\n"</string>
     <string name="master_clear_desc_also_erases_external" msgid="1903185203791274237"><li>"Muziek"</li>\n<li>"Foto\'s"</li>\n<li>"Andere gebruikersgegevens"</li></string>
+    <string name="master_clear_desc_also_erases_esim" msgid="312352697653096008"><li>"Providers op e-simkaart"</li></string>
+    <string name="master_clear_desc_no_cancel_mobile_plan" msgid="5460926449093211144">\n\n"Hierdoor wordt je mobiele abonnement niet opgezegd."</string>
     <string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="7744115866662613411">\n\n"Als je muziek, foto\'s en andere gebruikersgegevens wilt wissen, moet de "<b>"USB-opslag"</b>" worden gewist."</string>
     <string name="master_clear_desc_erase_external_storage" product="default" msgid="4801026652617377093">\n\n"Als je muziek, foto\'s en andere gebruikersgegevens wilt wissen, moet de "<b>"SD-kaart"</b>" worden gewist."</string>
     <string name="erase_external_storage" product="nosdcard" msgid="969364037450286809">"USB-opslag wissen"</string>
@@ -1461,15 +1467,16 @@
     <string name="settings_safetylegal_activity_title" msgid="6901214628496951727">"Veiligheidsinformatie"</string>
     <string name="settings_safetylegal_activity_unreachable" msgid="250674109915859456">"Je hebt geen gegevensverbinding. Als je deze informatie nu wilt weergeven, ga je op een computer met internetverbinding naar %s."</string>
     <string name="settings_safetylegal_activity_loading" msgid="8059022597639516348">"Laden..."</string>
-    <string name="lockpassword_choose_your_password_header" msgid="8624900666929394990">"Je wachtwoord kiezen"</string>
-    <string name="lockpassword_choose_your_password_header_for_fingerprint" msgid="6624409510609085450">"Stel wachtwoord in voor gebruik van vingerafdruk"</string>
-    <string name="lockpassword_choose_your_pattern_header" msgid="6949761069941694050">"Je patroon kiezen"</string>
-    <string name="lockpassword_choose_your_pattern_header_for_fingerprint" msgid="5901096361617543819">"Stel patroon in voor gebruik van vingerafdruk"</string>
-    <string name="lockpassword_choose_your_pin_header" msgid="7598849519816138302">"Je pincode kiezen"</string>
-    <string name="lockpassword_choose_your_pin_header_for_fingerprint" msgid="765344692615917183">"Stel pincode in voor gebruik van vingerafdruk"</string>
-    <string name="lockpassword_confirm_your_password_header" msgid="6308478184889846633">"Je wachtwoord bevestigen"</string>
+    <string name="lockpassword_choose_your_screen_lock_header" msgid="3872462096767152394">"Een schermvergrendeling instellen"</string>
+    <string name="lockpassword_choose_your_password_message" msgid="1197569283524841412">"Stel een wachtwoord in voor betere beveiliging"</string>
+    <string name="lockpassword_choose_your_password_header_for_fingerprint" msgid="2541818487015343503">"Pincode instellen voor vingerafdruk"</string>
+    <string name="lockpassword_choose_your_pattern_header_for_fingerprint" msgid="7709785406243556723">"Patroon instellen voor vingerafdruk"</string>
+    <string name="lockpassword_choose_your_pin_message" msgid="1875420718677275646">"Stel een pincode in voor betere beveiliging"</string>
+    <string name="lockpassword_choose_your_pin_header_for_fingerprint" msgid="1549639053195796674">"Pincode instellen voor vingerafdruk"</string>
+    <string name="lockpassword_choose_your_pattern_message" msgid="5986983400689720015">"Stel een patroon in voor betere beveiliging"</string>
+    <string name="lockpassword_confirm_your_password_header" msgid="1266027268220850931">"Geef je wachtwoord opnieuw op"</string>
     <string name="lockpassword_confirm_your_pattern_header" msgid="7543433733032330821">"Je patroon bevestigen"</string>
-    <string name="lockpassword_confirm_your_pin_header" msgid="49038294648213197">"Bevestig de pincode"</string>
+    <string name="lockpassword_confirm_your_pin_header" msgid="7744513791910572550">"Geef je pincode opnieuw op"</string>
     <string name="lockpassword_confirm_passwords_dont_match" msgid="5140892109439191415">"Wachtwoorden komen niet overeen"</string>
     <string name="lockpassword_confirm_pins_dont_match" msgid="7226244811505606217">"Pincodes komen niet overeen"</string>
     <string name="lockpassword_choose_lock_generic_header" msgid="3811438094903786145">"Ontgrendelingsmethode"</string>
@@ -1488,6 +1495,12 @@
     <string name="lockpassword_strong_auth_required_work_pattern" msgid="3003781907040522053">"Geef voor extra veiligheid het patroon voor je werkprofiel op"</string>
     <string name="lockpassword_strong_auth_required_work_pin" msgid="3367491332598821552">"Geef voor extra veiligheid de pincode voor je werkprofiel op"</string>
     <string name="lockpassword_strong_auth_required_work_password" msgid="8159775129968582940">"Geef voor extra veiligheid het wachtwoord voor je werkprofiel op"</string>
+    <string name="lockpassword_confirm_your_pattern_details_frp" msgid="6757336656791723193">"Je telefoon is teruggezet op de fabrieksinstellingen. Geef je vorige patroon op."</string>
+    <string name="lockpassword_confirm_your_pin_details_frp" msgid="826520613445990470">"Je telefoon is teruggezet op de fabrieksinstellingen. Geef je vorige pincode op."</string>
+    <string name="lockpassword_confirm_your_password_details_frp" msgid="8944081074615739040">"Je telefoon is teruggezet op de fabrieksinstellingen. Geef je vorige wachtwoord op."</string>
+    <string name="lockpassword_confirm_your_pattern_header_frp" msgid="2898036091609128286">"Patroon verifiëren"</string>
+    <string name="lockpassword_confirm_your_pin_header_frp" msgid="4141601774778898803">"Pincode verifiëren"</string>
+    <string name="lockpassword_confirm_your_password_header_frp" msgid="3762615419295360480">"Wachtwoord verifiëren"</string>
     <string name="lockpassword_invalid_pin" msgid="15588049067548470">"Onjuiste pincode"</string>
     <string name="lockpassword_invalid_password" msgid="4038507398784975200">"Onjuist wachtwoord"</string>
     <string name="lockpattern_need_to_unlock_wrong" msgid="1745247595356012176">"Onjuist patroon"</string>
@@ -1537,7 +1550,6 @@
     <string name="install_applications_title" msgid="4987712352256508946">"Alle appbronnen toestaan"</string>
     <string name="recent_app_category_title" msgid="6673071268966003928">"Recent geopende apps"</string>
     <string name="see_all_apps_title" msgid="1317153498074308438">"Alle <xliff:g id="COUNT">%1$d</xliff:g> apps bekijken"</string>
-    <string name="recent_app_summary" msgid="3366446669844932300">"<xliff:g id="TIME">^1</xliff:g> geleden"</string>
     <string name="install_all_warning" product="tablet" msgid="8310489909586138165">"Je tablet en persoonlijke gegevens zijn gevoelig voor aanvallen door onbekende apps. Als je apps van deze bron installeert, ga je ermee akkoord dat je verantwoordelijk bent voor eventuele schade aan je tablet of verlies van gegevens als gevolg van het gebruik van deze apps."</string>
     <string name="install_all_warning" product="default" msgid="1952257127370115988">"Je telefoon en persoonlijke gegevens zijn gevoelig voor aanvallen door onbekende apps. Als je apps van deze bron installeert, ga je ermee akkoord dat je verantwoordelijk bent voor eventuele schade aan je telefoon of verlies van gegevens als gevolg van het gebruik van deze apps."</string>
     <string name="advanced_settings" msgid="1777249286757067969">"Geavanceerde instellingen"</string>
@@ -1655,7 +1667,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">"Winkel"</string>
+    <string name="app_install_details_group_title" msgid="7084623031296083574">"Store"</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>
@@ -1801,7 +1813,7 @@
     <string name="accessibility_settings_summary" msgid="981260486011624939">"Schermlezers, display, interactieopties"</string>
     <string name="vision_settings_title" msgid="4204111425716868288">"Optische instellingen"</string>
     <string name="vision_settings_description" msgid="5679491180156408260">"Je kunt dit apparaat aanpassen aan je behoeften. Deze toegankelijkheidsfuncties kunnen later worden gewijzigd in Instellingen."</string>
-    <string name="vision_settings_suggestion_title" msgid="917294957154878441">"Lettergrootte vergroten"</string>
+    <string name="vision_settings_suggestion_title" msgid="8058794060304707004">"Lettergrootte wijzigen"</string>
     <string name="screen_reader_category_title" msgid="7739154903913400641">"Schermlezers"</string>
     <string name="audio_and_captions_category_title" msgid="3420727114421447524">"Audio en tekst op het scherm"</string>
     <string name="display_category_title" msgid="685461049938269166">"Display"</string>
@@ -1838,7 +1850,6 @@
     <string name="accessibility_display_inversion_preference_subtitle" msgid="7052959202195368109">"Kan gevolgen hebben voor de prestaties"</string>
     <string name="accessibility_autoclick_preference_title" msgid="7014499339068449623">"Klikken als muisaanwijzer niet meer beweegt"</string>
     <string name="accessibility_autoclick_delay_preference_title" msgid="3962261178385106006">"Vertraging vóór klikken"</string>
-    <string name="preference_summary_default_combination" msgid="8532964268242666060">"<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">"AAN"</string>
     <string name="accessibility_summary_state_disabled" msgid="2241315620132005595">"UIT"</string>
     <string name="enable_quick_setting" msgid="2366999897816894536">"Weergeven in Snelle instellingen"</string>
@@ -1948,7 +1959,7 @@
     <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">"Accugebruikgegevens niet beschikbaar."</string>
+    <string name="power_usage_not_available" msgid="3109326074656512387">"Batterijgebruikgegevens 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>
@@ -1957,12 +1968,14 @@
     <string name="background_activity_summary_on" msgid="649282072540085599">"App kan op de achtergrond worden uitgevoerd wanneer deze niet wordt gebruikt"</string>
     <string name="background_activity_summary_off" msgid="7666330699090632040">"Achtergrondactiviteit van de app is beperkt wanneer deze niet wordt gebruikt"</string>
     <string name="background_activity_summary_disabled" msgid="3710669050484599847">"App mag niet worden uitgevoerd op de achtergrond"</string>
+    <string name="background_activity_summary_whitelisted" msgid="7375400051141016808">"App kan niet worden geoptimaliseerd voor batterijgebruik"</string>
+    <string name="background_activity_warning_dialog_title" msgid="2216249969149568871">"Achtergrondactiviteit beperken?"</string>
+    <string name="background_activity_warning_dialog_text" msgid="7049624449246121981">"Als je de achtergrondactiviteit voor een app beperkt, functioneert de app mogelijk niet meer correct"</string>
     <string name="device_screen_usage" msgid="3386088035570409683">"Schermgebruik sinds volledige lading"</string>
     <string name="device_screen_consumption" msgid="4607589286438986687">"Schermverbruik"</string>
     <string name="device_cellular_network" msgid="4724773411762382950">"Scannen naar mobiele netwerken"</string>
-    <string name="power_last_full_charge_summary" msgid="532845389094620657">"<xliff:g id="TIME">^1</xliff:g> geleden"</string>
-    <string name="power_usage_list_summary" msgid="6775339745194635000">"App-gebruik sinds volledige lading (<xliff:g id="TIME">^1</xliff:g> geleden)"</string>
-    <string name="power_usage_list_summary_device" msgid="7036566616386864302">"Apparaatgebruik sinds laatste keer volledig opladen (<xliff:g id="TIME">^1</xliff:g> geleden)"</string>
+    <string name="power_usage_list_summary" msgid="6393929085382334341">"App-gebruik sinds volledige lading (<xliff:g id="RELATIVE_TIME">^1</xliff:g>)"</string>
+    <string name="power_usage_list_summary_device" msgid="4461926045610455423">"Apparaatgebruik sinds volledige lading (<xliff:g id="RELATIVE_TIME">^1</xliff:g>)"</string>
     <string name="screen_usage_summary" msgid="6687403051423153550">"Tijd die het scherm is ingeschakeld sinds volledige lading"</string>
     <string name="device_usage_list_summary" msgid="5623036661468763251">"Apparaatgebruik sinds volledige lading"</string>
     <string name="battery_since_unplugged" msgid="338073389740738437">"Accugebruik sinds losgekoppeld"</string>
@@ -2208,14 +2221,14 @@
     <string name="credentials_unlock_hint" msgid="2301301378040499348">"Voer het wachtwoord voor certificaatopslag in."</string>
     <string name="credentials_old_password" msgid="7553393815538684028">"Huidig wachtwoord:"</string>
     <string name="credentials_reset_hint" msgid="6297256880896133631">"Alle content verwijderen?"</string>
-    <string name="credentials_password_too_short" msgid="7502749986405522663">"Het wachtwoord moet uit ten minste 8 tekens bestaan."</string>
     <string name="credentials_wrong_password" msgid="2541932597104054807">"Onjuist wachtwoord."</string>
     <string name="credentials_reset_warning" msgid="5320653011511797600">"Onjuist wachtwoord. Je hebt nog één poging voordat de certificaten worden gewist."</string>
     <string name="credentials_reset_warning_plural" msgid="6514085665301095279">"Onjuist wachtwoord. Je hebt nog <xliff:g id="NUMBER">%1$d</xliff:g> pogingen voordat de certificaten worden gewist."</string>
     <string name="credentials_erased" msgid="2907836028586342969">"Certificaten gewist."</string>
     <string name="credentials_not_erased" msgid="7685932772284216097">"Kan certificaten niet wissen."</string>
     <string name="credentials_enabled" msgid="7588607413349978930">"Certificaatopslag ingeschakeld."</string>
-    <string name="credentials_configure_lock_screen_hint" msgid="6757119179588664966">"Je moet een pincode of wachtwoord voor het vergrendelen van het scherm instellen voordat je certificaatgegevens kunt opslaan."</string>
+    <string name="credentials_configure_lock_screen_hint" msgid="8058230497337529036">"Voordat je de opslag voor certificaatgegevens kunt gebruiken, moet je apparaat een beveiligd vergrendelingsscherm hebben"</string>
+    <string name="credentials_configure_lock_screen_button" msgid="253239765216055321">"VERGRENDELING INST."</string>
     <string name="usage_access_title" msgid="332333405495457839">"Apps met gebruikstoegang"</string>
     <string name="emergency_tone_title" msgid="1055954530111587114">"Toon voor noodoproep"</string>
     <string name="emergency_tone_summary" msgid="722259232924572153">"Gedrag bij noodoproepen instellen"</string>
@@ -2335,8 +2348,6 @@
     <skip />
     <string name="cant_sync_dialog_title" msgid="2777238588398046285">"Kan niet handmatig synchroniseren"</string>
     <string name="cant_sync_dialog_message" msgid="1938380442159016449">"Synchroniseren is op dit moment uitgeschakeld voor dit item. Als je deze instelling wilt wijzigen, schakel je achtergrondgegevens en automatisch synchroniseren tijdelijk in."</string>
-    <string name="wimax_settings" msgid="2655139497028469039">"4G"</string>
-    <string name="status_wimax_mac_address" msgid="8390791848661413416">"4G MAC-adres"</string>
     <string name="enter_password" msgid="8035706727471334122">"Geef je wachtwoord op om Android te starten"</string>
     <string name="enter_pin" msgid="5305333588093263790">"Geef je pincode op om Android te starten"</string>
     <string name="enter_pattern" msgid="4187435713036808566">"Teken je patroon om Android te starten"</string>
@@ -2350,6 +2361,7 @@
     <string name="misc_files_selected_count" msgid="4647048020823912088">"<xliff:g id="NUMBER">%1$d</xliff:g> van <xliff:g id="TOTAL">%2$d</xliff:g> geselecteerd"</string>
     <string name="misc_files_selected_count_bytes" msgid="2876232009069114352">"<xliff:g id="NUMBER">%1$s</xliff:g> van <xliff:g id="TOTAL">%2$s</xliff:g>"</string>
     <string name="select_all" msgid="1562774643280376715">"Alles selecteren"</string>
+    <string name="data_plan_usage_manage_plans_button_text" msgid="8997761990902708162">"Abonnementen beheren"</string>
     <string name="data_usage_summary_title" msgid="3804110657238092929">"Datagebruik"</string>
     <string name="data_usage_app_summary_title" msgid="4147258989837459172">"Gegevensgebruik van app"</string>
     <string name="data_usage_accounting" msgid="7170028915873577387">"De door de provider berekende gegevens kunnen afwijken van de berekening van je apparaat."</string>
@@ -2409,8 +2421,8 @@
     <string name="data_usage_auto_sync_on_dialog" product="tablet" msgid="8581983093524041669">"Wijzigingen die je op internet aanbrengt in je accounts, worden automatisch naar je telefoon gekopieerd.\n\nBij sommige accounts worden mogelijk ook de wijzigingen die je op de tablet aanbrengt, naar internet gekopieerd. Dit geldt bijvoorbeeld voor Google-accounts."</string>
     <string name="data_usage_auto_sync_on_dialog" product="default" msgid="8651376294887142858">"Wijzigingen die je op internet aanbrengt in je accounts, worden automatisch naar je telefoon gekopieerd.\n\nBij sommige accounts worden mogelijk ook de wijzigingen die je op de telefoon aanbrengt, naar internet gekopieerd. Dit geldt bijvoorbeeld voor Google-accounts."</string>
     <string name="data_usage_auto_sync_off_dialog_title" msgid="9013139130490125793">"Auto-synchr. uitschakelen?"</string>
-    <string name="data_usage_auto_sync_off_dialog" msgid="4025938250775413864">"Hiermee beperk je gegevens- en batterijgebruik. Je moet elk account echter handmatig synchroniseren om recente informatie te verzamelen. Je ontvangt geen meldingen wanneer er updates zijn."</string>
-    <string name="data_usage_cycle_editor_title" msgid="1373797281540188533">"Herzieningsdatum voor gebruikscyclus"</string>
+    <string name="data_usage_auto_sync_off_dialog" msgid="4025938250775413864">"Hiermee beperk je data- en batterijgebruik. Je moet elk account echter handmatig synchroniseren om recente informatie te verzamelen. Je ontvangt geen meldingen wanneer er updates zijn."</string>
+    <string name="data_usage_cycle_editor_title" msgid="1373797281540188533">"Datum voor resetten gebruikscyclus"</string>
     <string name="data_usage_cycle_editor_subtitle" msgid="5512903797979928416">"Datum van elke maand:"</string>
     <string name="data_usage_cycle_editor_positive" msgid="8821760330497941117">"Ingesteld"</string>
     <string name="data_usage_warning_editor_title" msgid="3704136912240060339">"Waarschuwing voor gegevensverbruik instellen"</string>
@@ -2435,6 +2447,9 @@
     <string name="data_usage_metered_mobile" msgid="5423305619126978393">"Mobiele netwerken"</string>
     <string name="data_usage_metered_wifi" msgid="1761738002328299714">"Betaalde wifi-netwerken"</string>
     <string name="data_usage_metered_wifi_disabled" msgid="727808462375941567">"Als je betaalde netwerken wilt selecteren, schakel je wifi in."</string>
+    <string name="data_usage_metered_auto" msgid="1262028400911918865">"Automatisch"</string>
+    <string name="data_usage_metered_yes" msgid="9217539611385225894">"Betaald"</string>
+    <string name="data_usage_metered_no" msgid="4025232961929071789">"Niet betaald"</string>
     <string name="data_usage_disclaimer" msgid="6887858149980673444">"De door de provider berekende gegevens kunnen afwijken van die van je apparaat."</string>
     <string name="cryptkeeper_emergency_call" msgid="198578731586097145">"Noodoproep"</string>
     <string name="cryptkeeper_return_to_call" msgid="5613717339452772491">"Terug naar gesprek"</string>
@@ -2526,9 +2541,6 @@
     <string name="backup_pw_set_button_text" msgid="2387480910044648795">"Wachtwoord voor back-up instellen"</string>
     <string name="backup_pw_cancel_button_text" msgid="8845630125391744615">"Annuleren"</string>
     <string name="additional_system_update_settings_list_item_title" msgid="214987609894661992">"Aanvullende systeemupdates"</string>
-    <string name="selinux_status_disabled" msgid="924551035552323327">"Disabled (Uitgeschakeld)"</string>
-    <string name="selinux_status_permissive" msgid="6004965534713398778">"Permissive (Tolerant)"</string>
-    <string name="selinux_status_enforcing" msgid="2252703756208463329">"Enforcing (Wordt afgedwongen)"</string>
     <string name="ssl_ca_cert_warning" msgid="2045866713601984673">"Netwerk kan worden gemonitord"</string>
     <string name="done_button" msgid="1991471253042622230">"Gereed"</string>
     <plurals name="ssl_ca_cert_dialog_title" formatted="false" msgid="7145092748045794650">
@@ -2644,7 +2656,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>
@@ -2871,13 +2883,15 @@
     <string name="notifications_title" msgid="8086372779371204971">"Meldingen"</string>
     <string name="app_notifications_title" msgid="5810577805218003760">"App-meldingen"</string>
     <string name="notification_channel_title" msgid="2260666541030178452">"Meldingscategorie"</string>
+    <string name="notification_group_title" msgid="7180506440133859601">"Groep meldingscategorieën"</string>
     <string name="notification_importance_title" msgid="848692592679312666">"Belang"</string>
-    <string name="notification_importance_unspecified" msgid="2196023702875112081">"Laat de app beslissen"</string>
+    <string name="notification_importance_unspecified" msgid="6622173510486113958">"Geluid toestaan"</string>
     <string name="notification_importance_blocked" msgid="7938180808339386300">"Nooit meldingen weergeven"</string>
     <string name="notification_importance_min" msgid="5455049524984686275">"Geen geluid of visuele onderbreking"</string>
     <string name="notification_importance_low" msgid="8881468429453766553">"Geen geluid"</string>
     <string name="notification_importance_default" msgid="5958338024601957516">"Geluid laten horen"</string>
     <string name="notification_importance_high" msgid="2082429479238228527">"Geluid laten horen en op het scherm weergeven"</string>
+    <string name="notification_importance_high_silent" msgid="2667033773703765252">"Weergeven op scherm"</string>
     <string name="notification_importance_min_title" msgid="6974673091137544803">"Laag"</string>
     <string name="notification_importance_low_title" msgid="8131254047772814309">"Gemiddeld"</string>
     <string name="notification_importance_default_title" msgid="9120383978536089489">"Hoog"</string>
@@ -2920,8 +2934,13 @@
     <string name="loading_notification_apps" msgid="5031818677010335895">"Apps laden..."</string>
     <string name="app_notifications_off_desc" msgid="4882445501376722969">"Android blokkeert de weergave van meldingen van deze app op dit apparaat"</string>
     <string name="channel_notifications_off_desc" msgid="5899225298718840635">"Android blokkeert de weergave van deze categorie meldingen op dit apparaat"</string>
+    <string name="channel_group_notifications_off_desc" msgid="1620950416247316370">"Android blokkeert de weergave van deze groep meldingen op dit apparaat"</string>
     <string name="notification_channels" msgid="5346841743182627500">"Categorieën"</string>
     <string name="notification_channels_other" msgid="5645317113885788226">"Anders"</string>
+    <plurals name="notification_group_summary" formatted="false" msgid="3420621520561455358">
+      <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> categorieën</item>
+      <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> categorie</item>
+    </plurals>
     <string name="no_channels" msgid="3077375508177744586">"Deze app heeft geen meldingen geplaatst"</string>
     <string name="app_settings_link" msgid="8894946007543660906">"Extra instellingen in de app"</string>
     <string name="app_notification_listing_summary_zero" msgid="6482582965081108108">"Ingeschakeld voor alle apps"</string>
@@ -2998,6 +3017,7 @@
     <string name="zen_mode_from_starred" msgid="2678345811950997027">"Alleen van contacten met ster"</string>
     <string name="zen_mode_from_none" msgid="8219706639954614136">"Geen"</string>
     <string name="zen_mode_alarms" msgid="2165302777886552926">"Alarmen"</string>
+    <string name="zen_mode_alarms_summary" msgid="3774926045611788635">"Alarmen hebben altijd prioriteit en maken geluid"</string>
     <string name="zen_mode_reminders" msgid="5458502056440485730">"Herinneringen"</string>
     <string name="zen_mode_events" msgid="7914446030988618264">"Evenementen"</string>
     <string name="zen_mode_all_callers" msgid="584186167367236922">"Alle bellers"</string>
@@ -3032,6 +3052,7 @@
     <string name="zen_mode_screen_off_visual_interruptions" msgid="4850792880144382633">"Als scherm uit is"</string>
     <string name="zen_mode_no_visual_interruptions" msgid="8742776003822778472">"Als scherm aan of uit is"</string>
     <string name="notification_app_settings_button" msgid="6685640230371477485">"Instellingen voor meldingen"</string>
+    <string name="suggestion_button_text" msgid="3275010948381252006">"OK"</string>
     <string name="device_feedback" msgid="3238056036766293294">"Feedback sturen over dit apparaat"</string>
     <string name="restr_pin_enter_admin_pin" msgid="1085834515677448072">"Beheerderspincode invoeren"</string>
     <string name="switch_on_text" msgid="1124106706920572386">"Aan"</string>
@@ -3216,6 +3237,7 @@
     <string name="usb_summary_file_transfers" msgid="6435943692610175111">"Bestanden overzetten"</string>
     <string name="usb_summary_photo_transfers" msgid="8440204169576585250">"Foto\'s overzetten (PTP)"</string>
     <string name="usb_summary_MIDI" msgid="5687906612187885908">"Apparaat gebruiken als MIDI"</string>
+    <string name="sms_mirroring_pref" msgid="6475043279147376031">"Sms-mirroring"</string>
     <string name="background_check_pref" msgid="7550258400138010979">"Achtergrondcontrole"</string>
     <string name="background_check_title" msgid="4534254315824525593">"Volledige toegang tot achtergrond"</string>
     <string name="assist_access_context_title" msgid="2269032346698890257">"Tekst van scherm gebruiken"</string>
@@ -3282,7 +3304,7 @@
     <string name="write_settings_title" msgid="4232152481902542284">"Kan systeeminstellingen aanpassen"</string>
     <string name="write_system_settings" msgid="3482913590601096763">"Systeeminstellingen aanpassen"</string>
     <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="permit_write_settings" msgid="658555006453212691">"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>
@@ -3377,9 +3399,12 @@
     <string name="color_temperature" msgid="2070126836910615605">"Koele kleurtemperatuur"</string>
     <string name="color_temperature_desc" msgid="4793729830226404052">"Koelere weergavekleuren gebruiken"</string>
     <string name="color_temperature_toast" msgid="4974218172133854827">"Schakel het scherm uit om de kleurwijziging toe te passen"</string>
-    <string name="telephony_monitor_toast" msgid="7003764250271195384">"Start het apparaat opnieuw op om de wijziging in Telephony Monitor toe te passen"</string>
+    <string name="connectivity_monitor_switch" msgid="9059759348648583421">"ConnectivityMonitor"</string>
+    <string name="connectivity_monitor_switch_summary" msgid="2828658652378866401">"ConnectivityMonitor verzamelt logboeken wanneer een connectiviteitsprobleem wordt gedetecteerd. De gebruiker krijgt een melding te zien waarin wordt gevraagd of hij een bug wil indienen."</string>
+    <string name="connectivity_monitor_toast" msgid="5551859612881173028">"Start het apparaat opnieuw op om de wijziging in ConnectivityMonitor toe te passen"</string>
     <string name="camera_hal_hdrplus_switch" msgid="8377365197105267466">"Camera HAL HDR+"</string>
     <string name="camera_hal_hdrplus_toast" msgid="2063703797270055299">"Start het apparaat opnieuw op om de wijziging in Camera HAL HDR+ toe te passen"</string>
+    <string name="camera_laser_sensor_switch" msgid="8913588990743234440">"Cameralasersensor"</string>
     <string name="ota_disable_automatic_update" msgid="2319639631655915050">"Automatische systeemupdates"</string>
     <string name="usage" msgid="2977875522080448986">"Gebruik"</string>
     <string name="cellular_data_usage" msgid="2155683719898158203">"Gebruik van mobiele data"</string>
@@ -3405,7 +3430,7 @@
     <string name="data_warning" msgid="209133958008062117">"Datawaarschuwing"</string>
     <string name="set_data_limit" msgid="2901526323210516923">"Datalimiet instellen"</string>
     <string name="data_limit" msgid="1885406964934590552">"Datalimiet"</string>
-    <string name="data_usage_template" msgid="392191945602400904">"<xliff:g id="ID_1">%1$s</xliff:g> gebruikt tussen <xliff:g id="ID_2">%2$s</xliff:g>"</string>
+    <string name="data_usage_template" msgid="2923744765873163859">"<xliff:g id="ID_1">%1$s</xliff:g> gebruikt in de periode <xliff:g id="ID_2">%2$s</xliff:g>"</string>
     <string name="configure" msgid="1029654422228677273">"Configureren"</string>
     <string name="data_usage_other_apps" msgid="3272872663517382050">"Andere apps opgenomen in gebruik"</string>
     <plurals name="data_saver_unrestricted_summary" formatted="false" msgid="2635267833484232703">
@@ -3413,7 +3438,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="952796077540228711">"Onbeperkte gegevens"</string>
+    <string name="unrestricted_data_saver" msgid="952796077540228711">"Onbeperkte data"</string>
     <string name="restrict_background_blacklisted" msgid="3995443391711013068">"Achtergrondgegevens zijn uitgeschakeld"</string>
     <string name="data_saver_on" msgid="6774217590237934709">"Aan"</string>
     <string name="data_saver_off" msgid="6892309031162738794">"Uit"</string>
@@ -3474,7 +3499,7 @@
     <string name="button_confirm_convert_fbe" msgid="7101855374850373091">"Wissen en converteren"</string>
     <string name="reset_shortcut_manager_throttling" msgid="6495066467198668994">"Frequentielimieten van ShortcutManager opnieuw instellen"</string>
     <string name="reset_shortcut_manager_throttling_complete" msgid="1826770872063707900">"De frequentielimieten van ShortcutManager zijn opnieuw ingesteld."</string>
-    <string name="notification_suggestion_title" msgid="4506524937307816475">"Meldingen voor vergrendelingsscherm beheren"</string>
+    <string name="notification_suggestion_title" msgid="387052719462473500">"Informatie op vergrendelingsscherm beheren"</string>
     <string name="notification_suggestion_summary" msgid="8521159741445416875">"Content van meldingen weergeven of verbergen"</string>
     <string name="page_tab_title_summary" msgid="4070309266374993258">"Alle"</string>
     <string name="page_tab_title_support" msgid="8483187649355540109">"Ondersteuning &amp; tips"</string>
@@ -3482,7 +3507,7 @@
     <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>
     <string name="premium_sms_access" msgid="4660047004791638305">"Premium sms-toegang"</string>
-    <string name="bluetooth_disabled" msgid="2456198532288640046">"Niet zichtbaar voor andere apparaten"</string>
+    <string name="bluetooth_disabled" msgid="6244000672828617410">"Uit"</string>
     <string name="bluetooth_connected_summary" msgid="7672528674593152862">"Verbonden met <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="bluetooth_connected_multiple_devices_summary" msgid="9173661896296663932">"Verbonden met meerdere apparaten"</string>
     <string name="demo_mode" msgid="2798762752209330277">"Demomodus voor systeemgebruikersinterface"</string>
@@ -3584,7 +3609,7 @@
     <string name="web_action_enable_title" msgid="4051513950976670853">"Instant-apps"</string>
     <string name="web_action_enable_summary" msgid="3108127559723396382">"Links openen in apps, zelfs als deze niet zijn geïnstalleerd"</string>
     <string name="web_action_section_title" msgid="7364647086538399136">"Instant-apps"</string>
-    <string name="instant_apps_account" msgid="1433620209791992528">"Account voor instant-apps"</string>
+    <string name="instant_apps_settings" msgid="8827777916518348213">"Voorkeuren voor instant-apps"</string>
     <string name="domain_url_section_title" msgid="7046835219056428883">"Geïnstalleerde apps"</string>
     <string name="automatic_storage_manager_activation_warning" msgid="6353100011690933254">"Je opslag wordt nu beheerd door de opslagbeheerder"</string>
     <string name="account_for_section_header" msgid="5356566418548737121">"Accounts voor <xliff:g id="USER_NAME">%1$s</xliff:g>"</string>
@@ -3631,7 +3656,9 @@
     <string name="enterprise_privacy_always_on_vpn_personal" msgid="9217774730260037434">"Always-on VPN ingeschakeld in je persoonlijke profiel"</string>
     <string name="enterprise_privacy_always_on_vpn_work" msgid="7244472958208315814">"Always-on VPN ingeschakeld in je werkprofiel"</string>
     <string name="enterprise_privacy_global_http_proxy" msgid="7936664553416257333">"Algemene HTTP-proxy ingesteld"</string>
-    <string name="enterprise_privacy_ca_certs" msgid="5885892204903688909">"Vertrouwde certificaatgegevens"</string>
+    <string name="enterprise_privacy_ca_certs_device" msgid="2019652712782510262">"Vertrouwde certificaatgegevens"</string>
+    <string name="enterprise_privacy_ca_certs_personal" msgid="2279084820904076599">"Vertrouwde certificaatgegevens in je persoonlijke profiel"</string>
+    <string name="enterprise_privacy_ca_certs_work" msgid="6187377647815301809">"Vertrouwde certificaatgegevens in je werkprofiel"</string>
     <plurals name="enterprise_privacy_number_ca_certs" formatted="false" msgid="526375234629534165">
       <item quantity="other">Minimaal <xliff:g id="COUNT_1">%d</xliff:g> CA-certificaten</item>
       <item quantity="one">Minimaal <xliff:g id="COUNT_0">%d</xliff:g> CA-certificaat</item>
@@ -3694,6 +3721,8 @@
     <string name="carrier_provisioning" msgid="4398683675591893169">"Gegevens voor providerregistratie"</string>
     <string name="trigger_carrier_provisioning" msgid="3434865918009286187">"Providerregistratie activeren"</string>
     <string name="new_device_suggestion_title" msgid="698847081680980774">"Wat is er nieuw en interessant?"</string>
-    <string name="new_device_suggestion_summary" msgid="7172709269203435870">"De vijf belangrijkste functies controleren"</string>
+    <string name="new_device_suggestion_summary" product="default" msgid="206396571522515855">"Een rondleiding volgen voor je nieuwe telefoon"</string>
+    <string name="new_device_suggestion_summary" product="tablet" msgid="393751455688210956">"Een rondleiding volgen voor je nieuwe tablet"</string>
+    <string name="new_device_suggestion_summary" product="device" msgid="2939870049868336652">"Een rondleiding volgen voor je nieuwe apparaat"</string>
     <string name="disabled_low_ram_device" msgid="3751578499721173344">"Deze functie is niet beschikbaar op dit apparaat"</string>
 </resources>
diff --git a/res/values-pa/arrays.xml b/res/values-pa/arrays.xml
index bc69218..3748d8e 100644
--- a/res/values-pa/arrays.xml
+++ b/res/values-pa/arrays.xml
@@ -84,7 +84,7 @@
     <item msgid="8878186979715711006">"ਸਕੈਨ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ..."</item>
     <item msgid="355508996603873860">"<xliff:g id="NETWORK_NAME">%1$s</xliff:g> ਨਾਲ ਕਨੈਕਟ ਕਰ ਰਿਹਾ ਹੈ…"</item>
     <item msgid="554971459996405634">"<xliff:g id="NETWORK_NAME">%1$s</xliff:g> ਨਾਲ ਪ੍ਰਮਾਣਿਤ ਕਰ ਰਿਹਾ ਹੈ…"</item>
-    <item msgid="7928343808033020343">"<xliff:g id="NETWORK_NAME">%1$s</xliff:g> ਤੋਂ IP ਪਤਾ ਪ੍ਰਾਪਤ ਕਰ ਰਿਹਾ ਹੈ…"</item>
+    <item msgid="7928343808033020343">"<xliff:g id="NETWORK_NAME">%1$s</xliff:g> ਤੋਂ IP ਪਤਾ ਪ੍ਰਾਪਤ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ…"</item>
     <item msgid="8937994881315223448">"<xliff:g id="NETWORK_NAME">%1$s</xliff:g> ਨਾਲ ਕਨੈਕਟ ਕੀਤਾ"</item>
     <item msgid="1330262655415760617">"ਮੁਅੱਤਲ ਕੀਤਾ"</item>
     <item msgid="7698638434317271902">"<xliff:g id="NETWORK_NAME">%1$s</xliff:g> ਤੋਂ ਡਿਸਕਨੈਕਟ ਕਰ ਰਿਹਾ ਹੈ…"</item>
@@ -100,8 +100,6 @@
     <!-- no translation found for wifi_security_no_eap:0 (2084555984818107151) -->
     <!-- no translation found for wifi_security_no_eap:1 (397579322683471524) -->
     <!-- no translation found for wifi_security_no_eap:2 (1968820975358150484) -->
-    <!-- no translation found for wifi_ap_security:0 (5251664683198623324) -->
-    <!-- no translation found for wifi_ap_security:1 (7989073072260294673) -->
   <string-array name="wifi_eap_method">
     <item msgid="1160193392455075561">"PEAP"</item>
     <item msgid="7981731051382306293">"TLS"</item>
@@ -122,8 +120,8 @@
     <!-- no translation found for wifi_ap_band_config_2G_only:0 (7006771583217001015) -->
   <string-array name="wifi_p2p_wps_setup">
     <item msgid="5085064298144493867">"ਪੁਸ਼ ਬਟਨ"</item>
-    <item msgid="1624323946324499595">"ਪੀਅਰ ਡੀਵਾਈਸ ਦਾ PIN"</item>
-    <item msgid="5366790421523328066">"ਇਸ ਡੀਵਾਈਸ ਤੋਂ PIN"</item>
+    <item msgid="1624323946324499595">"ਪੀਅਰ ਡੀਵਾਈਸ ਤੋਂ ਪਿੰਨ"</item>
+    <item msgid="5366790421523328066">"ਇਸ ਡੀਵਾਈਸ ਤੋਂ ਪਿੰਨ"</item>
   </string-array>
   <string-array name="wifi_p2p_status">
     <item msgid="1701505390737218306">"ਕਨੈਕਟ ਕੀਤਾ"</item>
@@ -234,7 +232,7 @@
     <item msgid="255608127647030286">"ਨਿੱਜੀ"</item>
     <item msgid="4588829735729884491">"ਮੈਸੇਂਜ਼ਿੰਗ"</item>
     <item msgid="886742181977884584">"ਮੀਡੀਆ"</item>
-    <item msgid="7924928667052300589">"ਡੀਵਾਈਸ:"</item>
+    <item msgid="7924928667052300589">"ਡੀਵਾਈਸ"</item>
   </string-array>
   <string-array name="app_ops_summaries">
     <item msgid="4979188868761515915">"ਕੋਰਸ ਨਿਰਧਾਰਿਤ ਸਥਾਨ"</item>
@@ -247,14 +245,14 @@
     <item msgid="6546959730920410907">"ਕਾਲ ਲੌਗ ਸੰਸ਼ੋਧਿਤ ਕਰੋ"</item>
     <item msgid="446877710771379667">"ਕੈਲੰਡਰ ਪੜ੍ਹੋ"</item>
     <item msgid="7674458294386319722">"ਕੈਲੰਡਰ ਸੰਸ਼ੋਧਿਤ ਕਰੋੇ"</item>
-    <item msgid="8281201165558093009">"wi-fi ਸਕੈਨ"</item>
+    <item msgid="8281201165558093009">"ਵਾਈ-ਫਾਈ ਸਕੈਨ"</item>
     <item msgid="8694611243479480497">"ਸੂਚਨਾ"</item>
     <item msgid="7776439107987345446">"ਸੈਲ ਸਕੈਨ"</item>
-    <item msgid="514615766544675057">"ਫੋਨ ਤੇ ਕਾਲ ਕਰੋ"</item>
+    <item msgid="514615766544675057">"ਫ਼ੋਨ ਤੇ ਕਾਲ ਕਰੋ"</item>
     <item msgid="8181415497109310680">"SMS ਪੜ੍ਹੋ"</item>
     <item msgid="6816551144382117307">"SMS ਲਿਖੋ"</item>
     <item msgid="4600463921908905030">"SMS ਪ੍ਰਾਪਤ ਕਰੋ"</item>
-    <item msgid="5958926493289432745">"ਐਮਰਜੈਂਸੀ SMS ਪ੍ਰਾਪਤ ਕਰੋ"</item>
+    <item msgid="5958926493289432745">"ਸੰਕਟਕਾਲੀਨ SMS ਪ੍ਰਾਪਤ ਕਰੋ"</item>
     <item msgid="4945269495221089540">"MMS ਪ੍ਰਾਪਤ ਕਰੋ"</item>
     <item msgid="5570472453573929087">"WAP ਪੁਸ਼ ਪ੍ਰਾਪਤ ਕਰੋ"</item>
     <item msgid="7125408150230860501">"SMS ਭੇਜੋ"</item>
@@ -264,17 +262,17 @@
     <item msgid="1545733463471924009">"ਟੌਪ ਤੇ ਡ੍ਰਾ ਕਰੋ"</item>
     <item msgid="3609046903962454582">"ਪਹੁੰਚ ਸੂਚਨਾਵਾਂ"</item>
     <item msgid="4671646036128214513">"ਕੈਮਰਾ"</item>
-    <item msgid="1097324338692486211">"ਔਡੀਓ ਰਿਕਾਰਡ ਕਰੋ"</item>
-    <item msgid="5031552983987798163">"ਔਡੀਓ ਪਲੇ ਕਰੋ"</item>
+    <item msgid="1097324338692486211">" ਆਡੀਓ  ਰਿਕਾਰਡ ਕਰੋ"</item>
+    <item msgid="5031552983987798163">" ਆਡੀਓ  ਪਲੇ ਕਰੋ"</item>
     <item msgid="8374996688066472414">"ਕਲਿਪਬੋਰਡ ਪੜ੍ਹੋ"</item>
     <item msgid="3045529469061083747">"ਕਲਿਪਬੋਰਡ ਬਦਲੋ"</item>
     <item msgid="5124443975763747838">"ਮੀਡੀਆ ਬਟਨ"</item>
-    <item msgid="4547883971364273343">"ਔਡੀਓ ਫੋਕਸ"</item>
+    <item msgid="4547883971364273343">" ਆਡੀਓ  ਫੋਕਸ"</item>
     <item msgid="2603878814882344450">"ਮਾਸਟਰ ਵੌਲਿਊਮ"</item>
     <item msgid="7136963238377062018">"ਅਵਾਜ਼ ਵੋਲਯੂਮ"</item>
-    <item msgid="4270236897655923007">"ਰਿੰਗ ਵੌਲਿਊਮ"</item>
-    <item msgid="6325739889222559394">"ਮੀਡੀਆ ਵੌਲਿਊਮ"</item>
-    <item msgid="5762123934816216821">"ਅਲਾਰਮ ਵੌਲਿਊਮ"</item>
+    <item msgid="4270236897655923007">"ਰਿੰਗ ਦੀ ਅਵਾਜ਼"</item>
+    <item msgid="6325739889222559394">"ਮੀਡੀਆ ਦੀ ਅਵਾਜ਼"</item>
+    <item msgid="5762123934816216821">"ਅਲਾਰਮ ਦੀ ਅਵਾਜ਼"</item>
     <item msgid="785049718065337473">"ਸੂਚਨਾ ਵੌਲਿਊਮ"</item>
     <item msgid="6700305533746877052">"bluetooth ਵੌਲਿਊਮ"</item>
     <item msgid="2029227495214047094">"ਸਕਿਰਿਆ ਰੱਖੋ"</item>
@@ -282,13 +280,13 @@
     <item msgid="5753382310468855812">"ਉੱਚ ਪਾਵਰ ਨਿਰਧਾਰਿਤ ਸਥਾਨ ਦਾ ਨਿਰੀਖਣ ਕਰੋ"</item>
     <item msgid="3356591542543137332">"ਵਰਤੋਂ ਸਟੈਟਸ ਪ੍ਰਾਪਤ ਕਰੋ"</item>
     <item msgid="3073734345226842233">"ਮਾਈਕ੍ਰੋਫੋਨ ਨੂੰ ਮਿਊਟ/ਅਨਮਿਊਟ ਕਰੋ"</item>
-    <item msgid="2111767435887685265">"ਟੋਸਟ ਵਿਖਾਓ"</item>
+    <item msgid="2111767435887685265">"ਟੋਸਟ  ਦਿਖਾਓ"</item>
     <item msgid="1091168669714823370">"ਪ੍ਰੋਜੈਕਟ ਮੀਡੀਆ"</item>
     <item msgid="485564189219029300">"VPN ਨੂੰ ਸਰਗਰਮ ਕਰੋ"</item>
     <item msgid="7155384795265164395">"ਵਾਲਪੇਪਰ ਲਿਖੋ"</item>
     <item msgid="1835836196806147034">"ਸਹਾਇਕ ਬਣਤਰ"</item>
     <item msgid="5989890403088155055">"ਸਹਾਇਕ ਸਕਰੀਨਸ਼ਾਟ"</item>
-    <item msgid="8582699692765917557">"ਫੋਨ ਸਥਿਤੀ ਪੜ੍ਹੋ"</item>
+    <item msgid="8582699692765917557">"ਫ਼ੋਨ ਸਥਿਤੀ ਪੜ੍ਹੋ"</item>
     <item msgid="1474039653814954902">"ਵੌਇਸਮੇਲ ਸ਼ਾਮਲ ਕਰੋ"</item>
     <item msgid="7222837656938871633">"SIP ਵਰਤੋ"</item>
     <item msgid="6108267038969274380">"ਆਊਟਗੋਇੰਗ ਕਾਲ \'ਤੇ ਪ੍ਰਕਿਰਿਆ ਕਰੋ"</item>
@@ -301,7 +299,7 @@
     <item msgid="6628873315024166197">"ਸਕਰੀਨ ਚਾਲੂ ਕਰੋ"</item>
     <item msgid="3253368931113490863">"ਖਾਤੇ ਲਓ"</item>
     <item msgid="780392378084812901">"ਬੈਕਗ੍ਰਾਊਂਡ ਵਿੱਚ ਚਲਾਓ"</item>
-    <item msgid="2629748510881309577">"ਪਹੁੰਚਯੋਗਤਾ ਵੌਲਿਊਮ"</item>
+    <item msgid="2629748510881309577">"ਪਹੁੰਚਯੋਗਤਾ ਅਵਾਜ਼"</item>
   </string-array>
   <string-array name="app_ops_labels">
     <item msgid="6602854600289714121">"ਟਿਕਾਣਾ"</item>
@@ -317,7 +315,7 @@
     <item msgid="1638204101698708656">"ਟਿਕਾਣਾ"</item>
     <item msgid="2154671955760380322">"ਸੂਚਨਾ ਪੋਸਟ ਕਰੋ"</item>
     <item msgid="4282477730595931828">"ਟਿਕਾਣਾ"</item>
-    <item msgid="4891423912898525905">"ਫੋਨ ਤੇ ਕਾਲ ਕਰੋ"</item>
+    <item msgid="4891423912898525905">"ਫ਼ੋਨ ਤੇ ਕਾਲ ਕਰੋ"</item>
     <item msgid="2623604824935968113">"SMS/MMS ਪੜ੍ਹੋ"</item>
     <item msgid="4420177125221176306">"SMS/MMS ਲਿਖੋ"</item>
     <item msgid="3986142739951490025">"SMS/MMS ਪ੍ਰਾਪਤ ਕਰੋ"</item>
@@ -331,17 +329,17 @@
     <item msgid="736541391767350377">"ਟੌਪ ਤੇ ਡ੍ਰਾ ਕਰੋ"</item>
     <item msgid="5530815681721654194">"ਪਹੁੰਚ ਸੂਚਨਾਵਾਂ"</item>
     <item msgid="781213371706962767">"ਕੈਮਰਾ"</item>
-    <item msgid="1720492593061838172">"ਔਡੀਓ ਰਿਕਾਰਡ ਕਰੋ"</item>
-    <item msgid="3493046322001257041">"ਔਡੀਓ ਪਲੇ ਕਰੋ"</item>
+    <item msgid="1720492593061838172">" ਆਡੀਓ  ਰਿਕਾਰਡ ਕਰੋ"</item>
+    <item msgid="3493046322001257041">" ਆਡੀਓ  ਪਲੇ ਕਰੋ"</item>
     <item msgid="136815868796597058">"ਕਲਿਪਬੋਰਡ ਪੜ੍ਹੋ"</item>
     <item msgid="5238692940326972503">"ਕਲਿਪਬੋਰਡ ਬਦਲੋ"</item>
     <item msgid="5753789168376302997">"ਮੀਡੀਆ ਬਟਨ"</item>
-    <item msgid="3265262911688671938">"ਔਡੀਓ ਫੋਕਸ"</item>
+    <item msgid="3265262911688671938">" ਆਡੀਓ  ਫੋਕਸ"</item>
     <item msgid="2098976479485046797">"ਮਾਸਟਰ ਵੌਲਿਊਮ"</item>
     <item msgid="5660213838861789350">"ਵੌਇਸ ਵੌਲਿਊਮ"</item>
-    <item msgid="7983336752371254444">"ਰਿੰਗ ਵੌਲਿਊਮ"</item>
-    <item msgid="7878027809189330917">"ਮੀਡੀਆ ਵੌਲਿਊਮ"</item>
-    <item msgid="7260546305036218513">"ਅਲਾਰਮ ਵੌਲਿਊਮ"</item>
+    <item msgid="7983336752371254444">"ਰਿੰਗ ਦੀ ਅਵਾਜ਼"</item>
+    <item msgid="7878027809189330917">"ਮੀਡੀਆ ਦੀ ਅਵਾਜ਼"</item>
+    <item msgid="7260546305036218513">"ਅਲਾਰਮ ਦੀ ਅਵਾਜ਼"</item>
     <item msgid="9103719301075748925">"ਸੂਚਨਾ ਵੌਲਿਊਮ"</item>
     <item msgid="7025966722295861512">"Bluetooth ਵੌਲਿਊਮ"</item>
     <item msgid="4665183401128289653">"ਸਕਿਰਿਆ ਰੱਖੋ"</item>
@@ -349,13 +347,13 @@
     <item msgid="7669257279311110599">"ਟਿਕਾਣਾ"</item>
     <item msgid="3459320345690097795">"ਵਰਤੋਂ ਸਟੈਟਸ ਪ੍ਰਾਪਤ ਕਰੋ"</item>
     <item msgid="1312534577834048535">"ਮਾਈਕ੍ਰੋਫੋਨ ਨੂੰ ਮਿਊਟ/ਅਨਮਿਊਟ ਕਰੋ"</item>
-    <item msgid="427580389823724225">"ਟੋਸਟ ਵਿਖਾਓ"</item>
+    <item msgid="427580389823724225">"ਟੋਸਟ  ਦਿਖਾਓ"</item>
     <item msgid="4992007785575926253">"ਪ੍ਰੋਜੈਕਟ ਮੀਡੀਆ"</item>
     <item msgid="2482631530338029480">"VPN ਨੂੰ ਸਰਗਰਮ ਕਰੋ"</item>
     <item msgid="1662979573471871926">"ਵਾਲਪੇਪਰ ਲਿਖੋ"</item>
     <item msgid="5964768335278263478">"ਸਹਾਇਕ ਬਣਤਰ"</item>
     <item msgid="2657138701132782702">"ਸਹਾਇਕ ਸਕਰੀਨਸ਼ਾਟ"</item>
-    <item msgid="8571369610363539266">"ਫੋਨ ਸਥਿਤੀ ਪੜ੍ਹੋ"</item>
+    <item msgid="8571369610363539266">"ਫ਼ੋਨ ਸਥਿਤੀ ਪੜ੍ਹੋ"</item>
     <item msgid="4542463358215230845">"ਵੌਇਸਮੇਲ ਸ਼ਾਮਲ ਕਰੋ"</item>
     <item msgid="864565065016166003">"SIP ਵਰਤੋ"</item>
     <item msgid="1958009349883195116">"ਆਊਟਗੋਇੰਗ ਕਾਲ \'ਤੇ ਪ੍ਰਕਿਰਿਆ ਕਰੋ"</item>
@@ -368,7 +366,7 @@
     <item msgid="5832543806893763620">"ਸਕਰੀਨ ਚਾਲੂ ਕਰੋ"</item>
     <item msgid="5258373962467495905">"ਖਾਤੇ ਲਓ"</item>
     <item msgid="334625385979270703">"ਬੈਕਗ੍ਰਾਊਂਡ ਵਿੱਚ ਚਲਾਓ"</item>
-    <item msgid="9039213578110332702">"ਪਹੁੰਚਯੋਗਤਾ ਵੌਲਿਊਮ"</item>
+    <item msgid="9039213578110332702">"ਪਹੁੰਚਯੋਗਤਾ ਅਵਾਜ਼"</item>
   </string-array>
   <string-array name="long_press_timeout_selector_titles">
     <item msgid="3511504869290423954">"ਘੱਟ"</item>
@@ -413,7 +411,7 @@
     <item msgid="758587126802411846">"ਸਫ਼ੈਦ \'ਤੇ ਕਾਲਾ"</item>
     <item msgid="1495307195241623402">"ਕਾਲੇ \'ਤੇ ਪੀਲਾ"</item>
     <item msgid="6039700130994371612">"ਨੀਲੇ \'ਤੇ ਪੀਲਾ"</item>
-    <item msgid="7169235156349580064">"ਵਿਸ਼ੇਸ਼-ਵਿਉਂਤਬੱਧ"</item>
+    <item msgid="7169235156349580064">"ਵਿਉਂਂਤੀ"</item>
   </string-array>
   <string-array name="vpn_types_long">
     <item msgid="2732002039459078847">"PPTP VPN"</item>
@@ -454,7 +452,7 @@
     <item msgid="5779398140277006695">"ਟੌਪ ਗਤੀਵਿਧੀ"</item>
     <item msgid="1439598363694578255">"ਮਹੱਤਵਪੂਰਣ (ਫੋਰਗ੍ਰਾਉਂਡ)"</item>
     <item msgid="3396458970745718652">"ਮਹੱਤਵਪੂਰਣ (ਪਿਛੋਕੜ)"</item>
-    <item msgid="5214825238247511992">"ਬੈਕਅਪ ਕਰੋ"</item>
+    <item msgid="5214825238247511992">"ਬੈਕਅੱਪ"</item>
     <item msgid="311372689168254967">"ਹੈਵੀ ਵੇਟ"</item>
     <item msgid="7438189122367820362">"ਸੇਵਾ (ਚੱਲ ਰਹੀ ਹੈ)"</item>
     <item msgid="918687422516982498">"ਸੇਵਾ (ਰੀਸਟਾਰਟ ਕਰ ਰਿਹਾ ਹੈ)"</item>
@@ -462,7 +460,7 @@
     <item msgid="6782857406100845127">"ਹੋਮ"</item>
     <item msgid="2860945127596974299">"ਪਿਛਲੀ ਗਤੀਵਿਧੀ"</item>
     <item msgid="8610560843693675830">"ਕੈਚ ਕੀਤੀ (ਗਤੀਵਿਧੀ)"</item>
-    <item msgid="4338089220026248848">"ਕੈਚ ਕੀਤੀ (ਗਤੀਵਿਧੀ ਕਲਾਈਂਟ)"</item>
+    <item msgid="4338089220026248848">"ਕੈਸ਼ ਕੀਤੀ (ਗਤੀਵਿਧੀ ਕਲਾਇੰਟ)"</item>
     <item msgid="6652164677254579050">"ਕੈਚ ਕੀਤੀ (ਖਾਲੀ)"</item>
   </string-array>
   <string-array name="color_picker">
diff --git a/res/values-pa/strings.xml b/res/values-pa/strings.xml
index 2b361b5..5b64bb9 100644
--- a/res/values-pa/strings.xml
+++ b/res/values-pa/strings.xml
@@ -22,7 +22,7 @@
     <string name="allow" msgid="3349662621170855910">"ਆਗਿਆ ਦਿਓ"</string>
     <string name="deny" msgid="6947806159746484865">"ਅਸਵੀਕਾਰ ਕਰੋ"</string>
     <string name="dlg_close" msgid="7471087791340790015">"ਬੰਦ ਕਰੋ"</string>
-    <string name="dlg_switch" msgid="6243971420240639064">"ਸਵਿਚ ਕਰੋ"</string>
+    <string name="dlg_switch" msgid="6243971420240639064">"ਸਵਿੱਚ ਕਰੋ"</string>
     <string name="device_info_default" msgid="7847265875578739287">"ਅਗਿਆਤ"</string>
     <plurals name="show_dev_countdown" formatted="false" msgid="7201398282729229649">
       <item quantity="one">ਤੁਸੀਂ ਹੁਣ ਇੱਕ ਵਿਕਾਸਕਾਰ ਬਣਨ ਤੋਂ <xliff:g id="STEP_COUNT_1">%1$d</xliff:g> ਕਦਮ ਦੂਰ ਹੋ।</item>
@@ -30,21 +30,21 @@
     </plurals>
     <string name="show_dev_on" msgid="1110711554982716293">"ਹੁਣ ਤੁਸੀਂ ਇੱਕ ਵਿਕਾਸਕਾਰ ਹੋ!"</string>
     <string name="show_dev_already" msgid="2151632240145446227">"ਕੋਈ ਲੋੜ ਨਹੀਂ, ਤੁਸੀਂ ਪਹਿਲਾਂ ਹੀ ਇੱਕ ਵਿਕਾਸਕਾਰ ਹੋ।"</string>
-    <string name="dev_settings_disabled_warning" msgid="4909448907673974370">"ਕਿਰਪਾ ਕਰਕੇ ਪਹਿਲਾਂ ਵਿਕਾਸਕਾਰ ਚੋਣਾਂ ਨੂੰ ਯੋਗ ਬਣਾਓ।"</string>
+    <string name="dev_settings_disabled_warning" msgid="4909448907673974370">"ਕਿਰਪਾ ਕਰਕੇ ਪਹਿਲਾਂ ਵਿਕਾਸਕਾਰ ਵਿਕਲਪਾਂ ਨੂੰ ਚਾਲੂ ਕਰੋ।"</string>
     <string name="header_category_wireless_networks" msgid="5110914332313954940">"ਵਾਇਰਲੈੱਸ ਅਤੇ ਨੈੱਟਵਰਕ"</string>
     <string name="header_category_connections" msgid="6471513040815680662">"ਕਨੈਕਸ਼ਨ"</string>
-    <string name="header_category_device" msgid="4544026001618307754">"ਡੀਵਾਈਸ:"</string>
+    <string name="header_category_device" msgid="4544026001618307754">"ਡੀਵਾਈਸ"</string>
     <string name="header_category_personal" msgid="3310195187905720823">"ਨਿੱਜੀ"</string>
     <string name="header_category_access" msgid="7580499097416970962">"ਪਹੁੰਚ"</string>
     <string name="header_category_system" msgid="2816866961183068977">"ਸਿਸਟਮ"</string>
-    <string name="radio_info_data_connection_enable" msgid="8656750679353982712">"ਡੈੈਟਾ ਕਨੈਕਸ਼ਨ ਯੋਗ ਬਣਾਓ"</string>
-    <string name="radio_info_data_connection_disable" msgid="8541302390883231216">"ਡੈਟਾ ਕਨੈਕਸ਼ਨ ਅਯੋਗ ਬਣਾਓ"</string>
+    <string name="radio_info_data_connection_enable" msgid="8656750679353982712">"ਡਾਟਾ ਕਨੈਕਸ਼ਨ ਚਾਲੂ ਕਰੋ"</string>
+    <string name="radio_info_data_connection_disable" msgid="8541302390883231216">"ਡਾਟਾ ਕਨੈਕਸ਼ਨ ਬੰਦ ਕਰੋ"</string>
     <string name="volte_provisioned_switch_string" msgid="7979882929810283786">"VoLTE ਪ੍ਰੋਵਿਨਜਨਡ"</string>
-    <string name="vt_provisioned_switch_string" msgid="7876998291744854759">"ਵੀਡੀਓ ਕਾਲਿੰਗ ਦੀ ਪ੍ਰੋਵੀਜ਼ਨ ਕੀਤੀ ਗਈ"</string>
+    <string name="vt_provisioned_switch_string" msgid="7876998291744854759">"ਵੀਡੀਓ ਕਾਲਿੰਗ ਦੀ ਪ੍ਰੋਵਿਜ਼ਨ ਕੀਤੀ ਗਈ"</string>
     <string name="wfc_provisioned_switch_string" msgid="3985406545172898078">"Wifi ਕਾਲਿੰਗ ਦੀ ਪ੍ਰੋਵੀਜ਼ਨ ਕੀਤੀ ਗਈ"</string>
     <string name="eab_provisioned_switch_string" msgid="3482272907448592975">"EAB/ਮੌਜੂਦਗੀ ਦੀ ਵਿਵਸਥਾ ਚਾਲੂ ਕੀਤੀ"</string>
     <string name="radio_info_radio_power" msgid="7187666084867419643">"ਮੋਬਾਈਲ ਰੇਡੀਓ ਪਾਵਰ"</string>
-    <string name="radioInfo_menu_viewADN" msgid="7069468158519465139">"ਸਿਮ ਪਤਾ ਬੁੱਕ ਵੇਖੋ"</string>
+    <string name="radioInfo_menu_viewADN" msgid="7069468158519465139">"ਸਿਮ ਪਤਾ ਬੁੱਕ ਦੇਖੋ"</string>
     <string name="radioInfo_menu_viewFDN" msgid="7934301566925610318">"ਫਿਕਸਡ ਡਾਇਲਿੰਗ ਨੰਬਰ ਦੇਖੋ"</string>
     <string name="radioInfo_menu_viewSDN" msgid="7130280686244955669">"ਸੇਵਾ ਡਾਇਲਿੰਗ ਨੰਬਰ ਦੇਖੋ"</string>
     <string name="radioInfo_menu_getIMS" msgid="185171476413967831">"IMS ਸੇਵਾ ਅਵਸਥਾ"</string>
@@ -78,44 +78,44 @@
     <string name="sdcard_unmount" product="default" msgid="3364184561355611897">"SD ਕਾਰਡ ਨੂੰ ਅਨਮਾਉਂਟ ਕਰੋ"</string>
     <string name="sdcard_format" product="nosdcard" msgid="6285310523155166716">"USB ਸਟੋਰੇਜ ਮਿਟਾਓ"</string>
     <string name="sdcard_format" product="default" msgid="6713185532039187532">"SD ਕਾਰਡ ਮਿਟਾਓ"</string>
-    <string name="preview_pager_content_description" msgid="8926235999291761243">"ਝਲਕ"</string>
-    <string name="preview_page_indicator_content_description" msgid="4821343428913401264">"ਝਲਕ, <xliff:g id="NUM_PAGES">%2$d</xliff:g> ਵਿੱਚੋਂ <xliff:g id="CURRENT_PAGE">%1$d</xliff:g> ਪੰਨਾ"</string>
+    <string name="preview_pager_content_description" msgid="8926235999291761243">"ਪੂਰਵ-ਝਲਕ"</string>
+    <string name="preview_page_indicator_content_description" msgid="4821343428913401264">"ਪੂਰਵ-ਝਲਕ, <xliff:g id="NUM_PAGES">%2$d</xliff:g> ਵਿੱਚੋਂ <xliff:g id="CURRENT_PAGE">%1$d</xliff:g> ਪੰਨਾ"</string>
     <string name="font_size_summary" msgid="1690992332887488183">"ਸਕ੍ਰੀਨ \'ਤੇ ਪਈ ਲਿਖਤ ਨੂੰ ਛੋਟਾ ਜਾਂ ਵੱਡਾ ਕਰੋ।"</string>
     <string name="font_size_make_smaller_desc" msgid="7919995133365371569">"ਛੋਟਾ ਕਰੋ"</string>
     <string name="font_size_make_larger_desc" msgid="4316986572233686061">"ਵੱਡਾ ਕਰੋ"</string>
     <!-- no translation found for font_size_preview_text (4818424565068376732) -->
     <skip />
     <string name="font_size_preview_text_headline" msgid="7955317408475392247">"ਨਮੂਨਾ ਲਿਖਤ"</string>
-    <string name="font_size_preview_text_title" msgid="1310536233106975546">"ਔਜ਼ ਦਾ ਨਿਰਾਲਾ ਜਾਦੂਗਰ"</string>
+    <string name="font_size_preview_text_title" msgid="1310536233106975546">"ਔਜ਼ ਦਾ ਨਿਰਾਲਾ ਵਿਜ਼ਾਰਡ"</string>
     <string name="font_size_preview_text_subtitle" msgid="4231671528173110093">"ਪਾਠ 11: ਔਜ਼ ਦਾ ਹੀਰਿਆਂ-ਪੰਨਿਆਂ ਵਾਲਾ ਨਿਰਾਲਾ ਸ਼ਹਿਰ"</string>
-    <string name="font_size_preview_text_body" msgid="2846183528684496723">"ਹਰੇ ਰੰਗ ਦੀਆਂ ਐਨਕਾਂ ਲਗਾ ਕੇ ਵੀ ਡੋਰਥੀ ਅਤੇ ਉਸ ਦੇ ਦੋਸਤ ਨਿਰਾਲੇ ਸ਼ਹਿਰ ਦੀ ਚਮਕ-ਦਮਕ ਵੇਖ ਕੇ ਹੈਰਾਨ ਸਨ। ਹਰੇ ਰੰਗ ਦੇ ਮਾਰਬਲ ਨਾਲ ਬਣੇ ਹੋਏ ਸੁੰਦਰ ਘਰ, ਗਲੀਆਂ ਵਿੱਚ ਕਤਾਰਬੱਧ ਸਨ ਅਤੇ ਉਹਨਾਂ ਵਿੱਚ ਚਮਕਦੇ ਪੰਨੇ ਜੜੇ ਹੋਏ ਸਨ। ਉਹ ਉਸੇ ਹਰੇ ਮਾਰਬਲ ਦੇ ਫੁੱਟਪਾਥ \'ਤੇ ਪੈਦਲ ਤੁਰ ਪਏ, ਅਤੇ ਜਿੱਥੇ ਆਲੇ-ਦੁਆਲੇ ਰੱਖੇ ਹੋਏ ਮਾਰਬਲ ਪੱਥਰ ਆਪਸ ਵਿੱਚ ਜੁੜਦੇ ਸਨ ਉੱਥੇ ਨੇੜੇ-ਨੇੜੇ ਲਗਾਏ ਗਏ ਪੰਨਿਆਂ ਦੀਆਂ ਕਤਾਰਾਂ ਸਨ ਅਤੇ ਧੁੱਪ ਵਿੱਚ ਚਮਕ ਰਹੀਆਂ ਸਨ। ਖਿੜਕੀਆਂ ਦੇ ਸ਼ੀਸ਼ੇ ਹਰੇ ਰੰਗ ਦੇ ਸਨ; ਇੱਥੋਂ ਤੱਕ ਕਿ ਸ਼ਹਿਰ ਦੇ ਉੱਤੇ ਅਸਮਾਨ ਵਿੱਚ ਵੀ ਹਰੇ ਰੰਗ ਦੀ ਭਾਅ ਸੀ, ਅਤੇ ਸੂਰਜ ਦੀਆਂ ਕਿਰਨਾਂ ਵੀ ਹਰੇ ਰੰਗ ਦੀਆਂ ਸਨ। \n\nਉੱਥੇ ਬਹੁਤ ਸਾਰੇ ਲੋਕ, ਆਦਮੀ, ਔਰਤਾਂ, ਅਤੇ ਬੱਚੇ ਘੁੰਮ ਰਹੇ ਸਨ, ਅਤੇ ਉਹਨਾਂ ਨੇ ਹਰੇ ਰੰਗ ਦੇ ਕੱਪੜੇ ਪਾਏ ਹੋਏ ਸਨ ਅਤੇ ਉਹਨਾਂ ਦੀ ਚਮੜੀ ਦਾ ਰੰਗ ਵੀ ਹਰਾ ਹੀ ਸੀ। ਉੁਹਨਾਂ ਨੇ ਡੋਰਥੀ ਅਤੇ ਉਸਦੇ ਅਜੀਬੋ-ਗਰੀਬ ਦੋਸਤਾਂ ਵੱਲ ਹੈਰਾਨੀ ਭਰੀਆਂ ਨਜ਼ਰਾਂ ਨਾਲ ਵੇਖਿਆ, ਅਤੇ ਜਦੋਂ ਬੱਚਿਆਂ ਨੇ ਸ਼ੇਰ ਨੂੰ ਵੇਖਿਆ ਤਾਂ ਸਾਰੇ ਬੱਚੇ ਭੱਜ ਗਏ ਅਤੇ ਆਪਣੀਆਂ ਮਾਵਾਂ ਦੇ ਪਿੱਛੇ ਜਾ ਕੇ ਲੁਕ ਗਏ; ਪਰ ਕਿਸੇ ਨੇ ਵੀ ਉਹਨਾਂ ਨਾਲ ਗੱਲ ਨਹੀਂ ਕੀਤੀ। ਗਲੀ ਵਿੱਚ ਬਹੁਤ ਸਾਰੀਆਂ ਦੁਕਾਨਾਂ ਸਨ, ਅਤੇ ਡੋਰਥੀ ਨੇ ਵੇਖਿਆ ਕਿ ਉੱਥੇ ਸਭ ਕੁਝ ਹਰੇ ਰੰਗ ਦਾ ਹੀ ਸੀ। ਹਰੇ ਰੰਗ ਦੀਆਂ ਟੌਫੀਆਂ, ਅਤੇ ਹਰੇ ਰੰਗੇ ਦੇ ਮੱਕੀ ਦੇ ਫੁੱਲੇ ਵੇਚੇ ਜਾ ਰਹੇ ਸਨ, ਹਰੇ ਰੰਗ ਦੇ ਬੂਟ ਵੀ, ਹਰੀਆਂ ਟੋਪੀਆਂ, ਅਤੇ ਸਾਰੀਆਂ ਕਿਸਮਾਂ ਦੇ ਹਰੇ ਰੰਗ ਦੇ ਕੱਪੜੇ। ਇੱਕ ਥਾਂ \'ਤੇ ਇੱਕ ਵਿਅਕਤੀ ਹਰੇ ਰੰਗ ਦੀ ਸ਼ਕੰਜਵੀ ਵੇਚ ਰਿਹਾ ਸੀ, ਅਤੇ ਜਦੋਂ ਬੱਚੇ ਸ਼ਕੰਜਵੀ ਨੂੰ ਖ਼ਰੀਦ ਰਹੇ ਸਨ ਤਾਂ ਡੋਰਥੀ ਵੇਖ ਸਕਦੀ ਸੀ ਕਿ ਉਹ ਉਸ ਵਿਅਕਤੀ ਨੂੰ ਹਰੇ ਰੰਗ ਦੀਆਂ ਪੈਨੀਆਂ (ਪੈਸੇ) ਦੇ ਰਹੇ ਸਨ। \n\nਇੰਝ ਪ੍ਰਤੀਤ ਹੁੰਦਾ ਸੀ ਕਿ ਉੱਥੇ ਕੋਈ ਘੋੜੇ ਜਾਂ ਕਿਸੇ ਵੀ ਕਿਸਮ ਦੇ ਜਾਨਵਰ ਨਹੀਂ ਸਨ: ਬੰਦੇ ਹਰੇ ਰੰਗ ਦੇ ਛੋਟੇ-ਛੋਟੇ ਗੱਡਿਆਂ ਉੱਤੇ ਚੀਜ਼ਾਂ ਨੂੰ ਇੱਧਰ-ਉੱਧਰ ਲੈ ਕੇ ਜਾ ਰਹੇ ਸਨ, ਜਿੰਨ੍ਹਾਂ ਨੂੰ ਉਹ ਆਪਣੇ ਅੱਗੇ ਧਕੇਲ ਕੇ ਲੈ ਜਾ ਰਹੇ ਸਨ। ਹਰ ਕੋਈ ਖੁਸ਼ ਅਤੇ ਸੰਤੁਸ਼ਟ ਅਤੇ ਖ਼ੁਸ਼ਹਾਲ ਪ੍ਰਤੀਤ ਹੋ ਰਿਹਾ ਸੀ।"</string>
+    <string name="font_size_preview_text_body" msgid="2846183528684496723">"ਹਰੇ ਰੰਗ ਦੀਆਂ ਐਨਕਾਂ ਲਗਾ ਕੇ ਵੀ ਡੋਰਥੀ ਅਤੇ ਉਸ ਦੇ ਦੋਸਤ ਨਿਰਾਲੇ ਸ਼ਹਿਰ ਦੀ ਚਮਕ-ਦਮਕ ਦੇਖ ਕੇ ਹੈਰਾਨ ਸਨ। ਹਰੇ ਰੰਗ ਦੇ ਮਾਰਬਲ ਨਾਲ ਬਣੇ ਹੋਏ ਸੁੰਦਰ ਘਰ, ਗਲੀਆਂ ਵਿੱਚ ਕਤਾਰਬੱਧ ਸਨ ਅਤੇ ਉਹਨਾਂ ਵਿੱਚ ਚਮਕਦੇ ਪੰਨੇ ਜੜੇ ਹੋਏ ਸਨ। ਉਹ ਉਸੇ ਹਰੇ ਮਾਰਬਲ ਦੇ ਫੁੱਟਪਾਥ \'ਤੇ ਪੈਦਲ ਤੁਰ ਪਏ, ਅਤੇ ਜਿੱਥੇ ਆਲੇ-ਦੁਆਲੇ ਰੱਖੇ ਹੋਏ ਮਾਰਬਲ ਪੱਥਰ ਆਪਸ ਵਿੱਚ ਜੁੜਦੇ ਸਨ ਉੱਥੇ ਨੇੜੇ-ਨੇੜੇ ਲਗਾਏ ਗਏ ਪੰਨਿਆਂ ਦੀਆਂ ਕਤਾਰਾਂ ਸਨ ਅਤੇ ਧੁੱਪ ਵਿੱਚ ਚਮਕ ਰਹੀਆਂ ਸਨ। ਖਿੜਕੀਆਂ ਦੇ ਸ਼ੀਸ਼ੇ ਹਰੇ ਰੰਗ ਦੇ ਸਨ; ਇੱਥੋਂ ਤੱਕ ਕਿ ਸ਼ਹਿਰ ਦੇ ਉੱਤੇ ਅਸਮਾਨ ਵਿੱਚ ਵੀ ਹਰੇ ਰੰਗ ਦੀ ਭਾਅ ਸੀ, ਅਤੇ ਸੂਰਜ ਦੀਆਂ ਕਿਰਨਾਂ ਵੀ ਹਰੇ ਰੰਗ ਦੀਆਂ ਸਨ। \n\nਉੱਥੇ ਬਹੁਤ ਸਾਰੇ ਲੋਕ, ਆਦਮੀ, ਔਰਤਾਂ, ਅਤੇ ਬੱਚੇ ਘੁੰਮ ਰਹੇ ਸਨ, ਅਤੇ ਉਹਨਾਂ ਨੇ ਹਰੇ ਰੰਗ ਦੇ ਕੱਪੜੇ ਪਾਏ ਹੋਏ ਸਨ ਅਤੇ ਉਹਨਾਂ ਦੀ ਚਮੜੀ ਦਾ ਰੰਗ ਵੀ ਹਰਾ ਹੀ ਸੀ। ਉੁਹਨਾਂ ਨੇ ਡੋਰਥੀ ਅਤੇ ਉਸਦੇ ਅਜੀਬੋ-ਗਰੀਬ ਦੋਸਤਾਂ ਵੱਲ ਹੈਰਾਨੀ ਭਰੀਆਂ ਨਜ਼ਰਾਂ ਨਾਲ ਦੇਖਿਆ, ਅਤੇ ਜਦੋਂ ਬੱਚਿਆਂ ਨੇ ਸ਼ੇਰ ਨੂੰ ਦੇਖਿਆ ਤਾਂ ਸਾਰੇ ਬੱਚੇ ਭੱਜ ਗਏ ਅਤੇ ਆਪਣੀਆਂ ਮਾਵਾਂ ਦੇ ਪਿੱਛੇ ਜਾ ਕੇ ਲੁਕ ਗਏ; ਪਰ ਕਿਸੇ ਨੇ ਵੀ ਉਹਨਾਂ ਨਾਲ ਗੱਲ ਨਹੀਂ ਕੀਤੀ। ਗਲੀ ਵਿੱਚ ਬਹੁਤ ਸਾਰੀਆਂ ਦੁਕਾਨਾਂ ਸਨ, ਅਤੇ ਡੋਰਥੀ ਨੇ ਦੇਖਿਆ ਕਿ ਉੱਥੇ ਸਭ ਕੁਝ ਹਰੇ ਰੰਗ ਦਾ ਹੀ ਸੀ। ਹਰੇ ਰੰਗ ਦੀਆਂ ਟੌਫੀਆਂ, ਅਤੇ ਹਰੇ ਰੰਗੇ ਦੇ ਮੱਕੀ ਦੇ ਫੁੱਲੇ ਵੇਚੇ ਜਾ ਰਹੇ ਸਨ, ਹਰੇ ਰੰਗ ਦੇ ਬੂਟ ਵੀ, ਹਰੀਆਂ ਟੋਪੀਆਂ, ਅਤੇ ਸਾਰੀਆਂ ਕਿਸਮਾਂ ਦੇ ਹਰੇ ਰੰਗ ਦੇ ਕੱਪੜੇ। ਇੱਕ ਥਾਂ \'ਤੇ ਇੱਕ ਵਿਅਕਤੀ ਹਰੇ ਰੰਗ ਦੀ ਸ਼ਕੰਜਵੀ ਵੇਚ ਰਿਹਾ ਸੀ, ਅਤੇ ਜਦੋਂ ਬੱਚੇ ਸ਼ਕੰਜਵੀ ਨੂੰ ਖਰੀਦ ਰਹੇ ਸਨ ਤਾਂ ਡੋਰਥੀ ਦੇਖ ਸਕਦੀ ਸੀ ਕਿ ਉਹ ਉਸ ਵਿਅਕਤੀ ਨੂੰ ਹਰੇ ਰੰਗ ਦੀਆਂ ਪੈਨੀਆਂ (ਪੈਸੇ) ਦੇ ਰਹੇ ਸਨ। \n\nਇੰਝ ਪ੍ਰਤੀਤ ਹੁੰਦਾ ਸੀ ਕਿ ਉੱਥੇ ਕੋਈ ਘੋੜੇ ਜਾਂ ਕਿਸੇ ਵੀ ਕਿਸਮ ਦੇ ਜਾਨਵਰ ਨਹੀਂ ਸਨ: ਬੰਦੇ ਹਰੇ ਰੰਗ ਦੇ ਛੋਟੇ-ਛੋਟੇ ਗੱਡਿਆਂ ਉੱਤੇ ਚੀਜ਼ਾਂ ਨੂੰ ਇੱਧਰ-ਉੱਧਰ ਲੈ ਕੇ ਜਾ ਰਹੇ ਸਨ, ਜਿੰਨ੍ਹਾਂ ਨੂੰ ਉਹ ਆਪਣੇ ਅੱਗੇ ਧਕੇਲ ਕੇ ਲੈ ਜਾ ਰਹੇ ਸਨ। ਹਰ ਕੋਈ ਖੁਸ਼ ਅਤੇ ਸੰਤੁਸ਼ਟ ਅਤੇ ਖ਼ੁਸ਼ਹਾਲ ਪ੍ਰਤੀਤ ਹੋ ਰਿਹਾ ਸੀ।"</string>
     <string name="font_size_save" msgid="3450855718056759095">"ਠੀਕ"</string>
     <string name="sdcard_setting" product="nosdcard" msgid="8281011784066476192">"USB ਸਟੋਰੇਜ"</string>
     <string name="sdcard_setting" product="default" msgid="5922637503871474866">"SD ਕਾਰਡ"</string>
-    <string name="bluetooth" msgid="5549625000628014477">"Bluetooth"</string>
+    <string name="bluetooth" msgid="5549625000628014477">"ਬਲੂਟੁੱਥ"</string>
     <string name="bluetooth_is_discoverable" msgid="8373421452106840526">"ਸਾਰੀਆਂ ਨੇੜਲੀਆਂ Bluetooth ਡਿਵਾਈਸਾਂ (<xliff:g id="DISCOVERABLE_TIME_PERIOD">%1$s</xliff:g>) ਲਈ ਦ੍ਰਿਸ਼ਮਾਨ"</string>
     <string name="bluetooth_is_discoverable_always" msgid="2849387702249327748">"ਸਾਰੀਆਂ ਨੇੜਲੀਆਂ Bluetooth ਡਿਵਾਈਸਾਂ ਲਈ ਦ੍ਰਿਸ਼ਮਾਨ"</string>
     <string name="bluetooth_not_visible_to_other_devices" msgid="9120274591523391910">"ਹੋਰਾਂ Bluetooth ਡਿਵਾਈਸਾਂ ਲਈ ਦ੍ਰਿਸ਼ਮਾਨ ਨਹੀਂ"</string>
     <string name="bluetooth_only_visible_to_paired_devices" msgid="2049983392373296028">"ਕੇਵਲ ਪੇਅਰ ਕੀਤੀਆਂ ਡਿਵਾਈਸਾਂ ਲਈ ਦ੍ਰਿਸ਼ਮਾਨ ਨਹੀਂ"</string>
     <string name="bluetooth_visibility_timeout" msgid="8002247464357005429">"ਦ੍ਰਿਸ਼ਟਤਾ ਦਾ ਸਮਾਂ ਸਮਾਪਤ"</string>
-    <string name="bluetooth_lock_voice_dialing" msgid="3139322992062086225">"ਲੌਕ ਵੌਇਸ ਡਾਇਲਿੰਗ"</string>
-    <string name="bluetooth_lock_voice_dialing_summary" msgid="4741338867496787042">"ਜਦੋਂ ਸਕ੍ਰੀਨ ਲੌਕ ਕੀਤੀ ਹੋਵੇ ਤਾਂ bluetooth ਡਾਇਲਰ ਦੀ ਵਰਤੋਂ ਰੋਕੋ"</string>
-    <string name="bluetooth_devices" msgid="1886018064039454227">"Bluetooth ਡਿਵਾਈਸਾਂ"</string>
+    <string name="bluetooth_lock_voice_dialing" msgid="3139322992062086225">" ਲਾਕ  ਵੌਇਸ ਡਾਇਲਿੰਗ"</string>
+    <string name="bluetooth_lock_voice_dialing_summary" msgid="4741338867496787042">"ਜਦੋਂ ਸਕ੍ਰੀਨ  ਲਾਕ  ਕੀਤੀ ਹੋਵੇ ਤਾਂ bluetooth ਡਾਇਲਰ ਦੀ ਵਰਤੋਂ ਰੋਕੋ"</string>
+    <string name="bluetooth_devices" msgid="1886018064039454227">"ਬਲੂਟੁੱਥ ਡਿਵਾਈਸਾਂ"</string>
     <string name="bluetooth_device_name" msgid="8415828355207423800">"ਡੀਵਾਈਸ ਦਾ ਨਾਮ"</string>
     <string name="bluetooth_device_details" msgid="4594773497930028085">"ਡੀਵਾਈਸ ਸੈਟਿੰਗਾਂ"</string>
     <string name="bluetooth_profile_details" msgid="6823621790324933337">"ਪ੍ਰੋਫਾਈਲ ਸੈਟਿੰਗਾਂ"</string>
     <string name="bluetooth_name_not_set" msgid="2653752006416027426">"ਖਾਤਾ ਨਾਮ ਵਰਤਦੇ ਹੋਏ, ਕੋਈ ਨਾਮ ਸੈੱਟ ਨਹੀਂ ਕੀਤਾ"</string>
     <string name="bluetooth_scan_for_devices" msgid="9214184305566815727">"ਡਿਵਾਈਸਾਂ ਲਈ ਸਕੈਨ ਕਰੋ"</string>
-    <string name="bluetooth_rename_device" msgid="4352483834491958740">"ਇਸ ਡੀਵਾਈਸ ਨੂੰ ਮੁੜ-ਨਾਮਕਰਨ ਕਰੋ"</string>
-    <string name="bluetooth_rename_button" msgid="1648028693822994566">"ਮੁੜ-ਨਾਮਕਰਨ ਕਰੋ"</string>
-    <string name="bluetooth_disconnect_title" msgid="7830252930348734303">"ਕੀ ਡੀਵਾਈਸ ਡਿਸਕਨੈਕਟ ਕਰਨੀ ਹੈ?"</string>
+    <string name="bluetooth_rename_device" msgid="4352483834491958740">"ਇਸ ਡੀਵਾਈਸ ਦਾ ਨਾਮ ਬਦਲੋ"</string>
+    <string name="bluetooth_rename_button" msgid="1648028693822994566">"ਨਾਮ ਬਦਲੋ"</string>
+    <string name="bluetooth_disconnect_title" msgid="7830252930348734303">"ਕੀ ਡੀਵਾਈਸ ਡਿਸਕਨੈਕਟ ਕਰਨਾ ਹੈ?"</string>
     <string name="bluetooth_disconnect_all_profiles" product="default" msgid="8208712728668714199">"ਤੁਹਾਡਾ ਫ਼ੋਨ <xliff:g id="DEVICE_NAME">%1$s</xliff:g> ਤੋਂ ਡਿਸਕਨੈਕਟ ਹੋ ਜਾਵੇਗਾ।"</string>
     <string name="bluetooth_disconnect_all_profiles" product="tablet" msgid="6611038575213485336">"ਤੁਹਾਡਾ ਟੈਬਲੈੱਟ <xliff:g id="DEVICE_NAME">%1$s</xliff:g> ਤੋਂ ਡਿਸਕਨੈਕਟ ਹੋ ਜਾਵੇਗਾ।"</string>
-    <string name="bluetooth_disconnect_all_profiles" product="device" msgid="3995834526315103965">"ਤੁਹਾਡੀ ਡੀਵਾਈਸ <xliff:g id="DEVICE_NAME">%1$s</xliff:g> ਤੋਂ ਡਿਸਕਨੈਕਟ ਹੋ ਜਾਵੇਗੀ।"</string>
+    <string name="bluetooth_disconnect_all_profiles" product="device" msgid="3995834526315103965">"ਤੁਹਾਡਾ ਡੀਵਾਈਸ <xliff:g id="DEVICE_NAME">%1$s</xliff:g> ਤੋਂ ਡਿਸਕਨੈਕਟ ਹੋ ਜਾਵੇਗਾ।"</string>
     <string name="bluetooth_disconnect_dialog_ok" msgid="3308586619539119106">"ਡਿਸਕਨੈਕਟ ਕਰੋ"</string>
-    <string name="bluetooth_empty_list_user_restricted" msgid="603521233563983689">"ਤੁਹਾਨੂੰ Bluetooth ਸੈਟਿੰਗਾਂ ਬਦਲਣ ਦੀ ਅਨੁਮਤੀ ਨਹੀਂ ਹੈ।"</string>
-    <string name="bluetooth_pairing_pref_title" msgid="7429413067477968637">"ਨਵੀਂ ਡੀਵਾਈਸ ਜੋੜਾਬੱਧ ਕਰੋ"</string>
-    <string name="bluetooth_is_visible_message" msgid="6222396240776971862">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> ਨੇੜਲੀਆਂ ਡਿਵਾਈਸਾਂ ਲਈ ਦਿਖਣਯੋਗ ਹੁੰਦਾ ਹੈ ਜਦੋਂ Bluetooth ਸੈਟਿੰਗਾਂ ਖੁੱਲ੍ਹੀਆਂ ਹੁੰਦੀਆਂ ਹਨ।"</string>
+    <string name="bluetooth_empty_list_user_restricted" msgid="603521233563983689">"ਤੁਹਾਨੂੰ ਬਲੂਟੁੱਥ ਸੈਟਿੰਗਾਂ ਬਦਲਣ ਦੀ ਇਜਾਜ਼ਤ ਨਹੀਂ ਹੈ।"</string>
+    <string name="bluetooth_pairing_pref_title" msgid="7429413067477968637">"ਨਵਾਂ ਡੀਵਾਈਸ ਜੋੜਾਬੱਧ ਕਰੋ"</string>
+    <string name="bluetooth_is_visible_message" msgid="6222396240776971862">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> ਨੇੜਲੇ ਡੀਵਾਈਸ ਲਈ ਦਿਖਣਯੋਗ ਹੁੰਦਾ ਹੈ ਜਦੋਂ ਬਲੂਟੁੱਥ ਸੈਟਿੰਗਾਂ ਖੁੱਲ੍ਹੀਆਂ ਹੁੰਦੀਆਂ ਹਨ।"</string>
     <string name="bluetooth_footer_mac_message" product="default" msgid="1109366350000220283">"ਫ਼ੋਨ ਦਾ ਬਲੂਟੁੱਥ ਪਤਾ: <xliff:g id="BLUETOOTH_MAC_ADDRESS">%1$s</xliff:g>"</string>
     <string name="bluetooth_footer_mac_message" product="tablet" msgid="6807634484499166486">"ਟੈਬਲੈੱਟ ਦਾ ਬਲੂਟੁੱਥ ਪਤਾ: <xliff:g id="BLUETOOTH_MAC_ADDRESS">%1$s</xliff:g>"</string>
     <string name="bluetooth_footer_mac_message" product="device" msgid="8413944740341742061">"ਡੀਵਾਈਸ ਦਾ ਬਲੂਟੁੱਥ ਪਤਾ: <xliff:g id="BLUETOOTH_MAC_ADDRESS">%1$s</xliff:g>"</string>
@@ -124,14 +124,14 @@
     <string name="bluetooth_disable_profile_title" msgid="5916643979709342557">"ਕੀ ਪ੍ਰੋਫਾਈਲ ਅਸਮਰੱਥ ਬਣਾਉਣੀ ਹੈ?"</string>
     <string name="bluetooth_disable_profile_message" msgid="2895844842011809904">"ਇਹ ਇਸਨੂੰ ਅਸਮਰੱਥ ਬਣਾਏਗਾ:&lt;br&gt;&lt;b&gt;<xliff:g id="PROFILE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;ਇਸਤੋਂ:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%2$s</xliff:g>&lt;/b&gt;"</string>
     <string name="bluetooth_unknown" msgid="644716244548801421"></string>
-    <string name="bluetooth_device" msgid="5291950341750186887">"ਬਿਨਾਂ ਨਾਮ ਦਿੱਤੀ Bluetooth ਡੀਵਾਈਸ"</string>
+    <string name="bluetooth_device" msgid="5291950341750186887">"ਬਿਨਾਂ ਨਾਮ ਦਾ ਬਲੂਟੁੱਥ ਡੀਵਾਈਸ"</string>
     <string name="progress_scanning" msgid="192587958424295789">"ਖੋਜ ਰਿਹਾ ਹੈ"</string>
     <string name="bluetooth_no_devices_found" msgid="1085232930277181436">"ਕੋਈ ਨੇੜਲੀਆਂ Bluetooth ਡਿਵਾਈਸਾਂ ਨਹੀਂ ਮਿਲੀਆਂ।"</string>
-    <string name="bluetooth_notif_ticker" msgid="4726721390078512173">"Bluetooth ਪੇਅਰਿੰਗ ਬੇਨਤੀ"</string>
-    <string name="bluetooth_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="3144149432555230410">"ਪ੍ਰਾਪਤ ਕੀਤੀਆਂ ਫ਼ਾਈਲਾਂ"</string>
-    <string name="device_picker" msgid="4978696506172252813">"Bluetooth ਡੀਵਾਈਸ ਚੁਣੋ"</string>
+    <string name="device_picker" msgid="4978696506172252813">"ਬਲੂਟੁੱਥ ਡੀਵਾਈਸ ਚੁਣੋ"</string>
     <string name="bluetooth_ask_enablement" msgid="3387222809404177525">"<xliff:g id="APP_NAME">%1$s</xliff:g> ਬਲੂਟੁੱਥ ਨੂੰ ਚਾਲੂ ਕਰਨਾ ਚਾਹੁੰਦੀ ਹੈ"</string>
     <string name="bluetooth_ask_disablement" msgid="5890386255790160573">"<xliff:g id="APP_NAME">%1$s</xliff:g> ਬਲੂਟੁੱਥ ਨੂੰ ਬੰਦ ਕਰਨਾ ਚਾਹੁੰਦੀ ਹੈ"</string>
     <string name="bluetooth_ask_enablement_no_name" msgid="1644353686104482763">"ਇੱਕ ਐਪ ਬਲੂਟੁੱਥ ਨੂੰ ਚਾਲੂ ਕਰਨਾ ਚਾਹੁੰਦੀ ਹੈ"</string>
@@ -146,29 +146,29 @@
     <string name="bluetooth_ask_lasting_discovery_no_name" product="default" msgid="8549952177383992238">"ਇੱਕ ਐਪ ਤੁਹਾਡੇ ਫ਼ੋਨ ਨੂੰ ਹੋਰ ਬਲੂਟੁੱਥ ਡੀਵਾਈਸਾਂ ਵਾਸਤੇ ਦਿਖਣਯੋਗ ਬਣਾਉਣਾ ਚਾਹੁੰਦੀ ਹੈ। ਤੁਸੀਂ ਇਸਨੂੰ ਬਾਅਦ ਵਿੱਚ ਬਲੂਟੁੱਥ ਸੈਟਿੰਗਾਂ ਵਿੱਚ ਬਦਲ ਸਕਦੇ ਹੋ।"</string>
     <string name="bluetooth_ask_enablement_and_discovery" product="tablet" msgid="1141843490422565755">"<xliff:g id="APP_NAME">%1$s</xliff:g> ਬਲੂਟੁੱਥ ਨੂੰ ਚਾਲੂ ਕਰਨਾ ਚਾਹੁੰਦੀ ਹੈ ਅਤੇ ਤੁਹਾਡੇ ਟੈਬਲੈੱਟ ਨੂੰ <xliff:g id="TIMEOUT">%2$d</xliff:g> ਸਕਿੰਟਾਂ ਲਈ ਹੋਰ ਡੀਵਾਈਸਾਂ ਵਾਸਤੇ ਦਿਖਣਯੋਗ ਬਣਾਉਣਾ ਚਾਹੁੰਦੀ ਹੈ।"</string>
     <string name="bluetooth_ask_enablement_and_discovery" product="default" msgid="5195836980079191473">"<xliff:g id="APP_NAME">%1$s</xliff:g> ਬਲੂਟੁੱਥ ਨੂੰ ਚਾਲੂ ਕਰਨਾ ਚਾਹੁੰਦੀ ਹੈ ਅਤੇ ਤੁਹਾਡੇ ਫ਼ੋਨ ਨੂੰ <xliff:g id="TIMEOUT">%2$d</xliff:g> ਸਕਿੰਟਾਂ ਲਈ ਹੋਰ ਡੀਵਾਈਸਾਂ ਵਾਸਤੇ ਦਿਖਣਯੋਗ ਬਣਾਉਣਾ ਚਾਹੁੰਦੀ ਹੈ।"</string>
-    <string name="bluetooth_ask_enablement_and_discovery_no_name" product="tablet" msgid="7009338445281693765">"ਇੱਕ ਐਪ ਬਲੂਟੁੱਥ ਨੂੰ ਚਾਲੂ ਕਰਨਾ ਚਾਹੁੰਦੀ ਹੈ ਅਤੇ ਤੁਹਾਡੇ ਟੈਬਲੈੱਟ ਨੂੰ <xliff:g id="TIMEOUT">%1$d</xliff:g> ਸਕਿੰਟਾਂ ਲਈ ਕਿਸੇ ਹੋਰ ਡੀਵਾਈਸਾਂ ਵਾਸਤੇ ਦਿਖਣਯੋਗ ਬਣਾਉਣਾ ਚਾਹੁੰਦੀ ਹੈ।"</string>
+    <string name="bluetooth_ask_enablement_and_discovery_no_name" product="tablet" msgid="7009338445281693765">"ਇੱਕ ਐਪ ਬਲੂਟੁੱਥ ਨੂੰ ਚਾਲੂ ਕਰਨਾ ਚਾਹੁੰਦੀ ਹੈ ਅਤੇ ਤੁਹਾਡੇ ਟੈਬਲੈੱਟ ਨੂੰ <xliff:g id="TIMEOUT">%1$d</xliff:g> ਸਕਿੰਟਾਂ ਲਈ ਹੋਰ ਡੀਵਾਈਸਾਂ ਵਾਸਤੇ ਦਿਖਣਯੋਗ ਬਣਾਉਣਾ ਚਾਹੁੰਦੀ ਹੈ।"</string>
     <string name="bluetooth_ask_enablement_and_discovery_no_name" product="default" msgid="8386904242279878734">"ਇੱਕ ਐਪ ਬਲੂਟੁੱਥ ਨੂੰ ਚਾਲੂ ਕਰਨਾ ਚਾਹੁੰਦੀ ਹੈ ਅਤੇ ਤੁਹਾਡੇ ਫ਼ੋਨ ਨੂੰ <xliff:g id="TIMEOUT">%1$d</xliff:g> ਸਕਿੰਟਾਂ ਲਈ ਹੋਰ ਡੀਵਾਈਸਾਂ ਵਾਸਤੇ ਦਿਖਣਯੋਗ ਬਣਾਉਣਾ ਚਾਹੁੰਦੀ ਹੈ।"</string>
     <string name="bluetooth_ask_enablement_and_lasting_discovery" product="tablet" msgid="2279471426575892686">"<xliff:g id="APP_NAME">%1$s</xliff:g> ਬਲੂਟੁੱਥ ਨੂੰ ਚਾਲੂ ਕਰਨਾ ਚਾਹੁੰਦੀ ਹੈ ਅਤੇ ਤੁਹਾਡੇ ਟੈਬਲੈੱਟ ਨੂੰ ਹੋਰ ਡੀਵਾਈਸਾਂ ਵਾਸਤੇ ਦਿਖਣਯੋਗ ਬਣਾਉਣਾ ਚਾਹੁੰਦੀ ਹੈ। ਤੁਸੀਂ ਇਸਨੂੰ ਬਾਅਦ ਵਿੱਚ ਬਲੂਟੁੱਥ ਸੈਟਿੰਗਾਂ ਵਿੱਚ ਬਦਲ ਸਕਦੇ ਹੋ।"</string>
     <string name="bluetooth_ask_enablement_and_lasting_discovery" product="default" msgid="6961969825475461450">"<xliff:g id="APP_NAME">%1$s</xliff:g> ਬਲੂਟੁੱਥ ਨੂੰ ਚਾਲੂ ਕਰਨਾ ਚਾਹੁੰਦੀ ਹੈ ਅਤੇ ਤੁਹਾਡੇ ਫ਼ੋਨ ਨੂੰ ਹੋਰ ਡੀਵਾਈਸਾਂ ਵਾਸਤੇ ਦਿਖਣਯੋਗ ਬਣਾਉਣਾ ਚਾਹੁੰਦੀ ਹੈ। ਤੁਸੀਂ ਇਸਨੂੰ ਬਾਅਦ ਵਿੱਚ ਬਲੂਟੁੱਥ ਸੈਟਿੰਗਾਂ ਵਿੱਚ ਬਦਲ ਸਕਦੇ ਹੋ।"</string>
     <string name="bluetooth_ask_enablement_and_lasting_discovery_no_name" product="tablet" msgid="692477613671555006">"ਇੱਕ ਐਪ ਬਲੂਟੁੱਥ ਨੂੰ ਚਾਲੂ ਕਰਨਾ ਚਾਹੁੰਦੀ ਹੈ ਅਤੇ ਤੁਹਾਡੇ ਟੈਬਲੈੱਟ ਨੂੰ ਹੋਰ ਡੀਵਾਈਸਾਂ ਵਾਸਤੇ ਦਿਖਣਯੋਗ ਬਣਾਉਣਾ ਚਾਹੁੰਦੀ ਹੈ। ਤੁਸੀਂ ਇਸਨੂੰ ਬਾਅਦ ਵਿੱਚ ਬਲੂਟੁੱਥ ਸੈਟਿੰਗਾਂ ਵਿੱਚ ਬਦਲ ਸਕਦੇ ਹੋ।"</string>
     <string name="bluetooth_ask_enablement_and_lasting_discovery_no_name" product="default" msgid="6374480121751597648">"ਇੱਕ ਐਪ ਬਲੂਟੁੱਥ ਨੂੰ ਚਾਲੂ ਕਰਨਾ ਚਾਹੁੰਦੀ ਹੈ ਅਤੇ ਤੁਹਾਡੇ ਫ਼ੋਨ ਨੂੰ ਹੋਰ ਡੀਵਾਈਸਾਂ ਵਾਸਤੇ ਦਿਖਣਯੋਗ ਬਣਾਉਣਾ ਚਾਹੁੰਦੀ ਹੈ। ਤੁਸੀਂ ਇਸਨੂੰ ਬਾਅਦ ਵਿੱਚ ਬਲੂਟੁੱਥ ਸੈਟਿੰਗਾਂ ਵਿੱਚ ਬਦਲ ਸਕਦੇ ਹੋ।"</string>
-    <string name="bluetooth_turning_on" msgid="4850574877288036646">"Bluetooth ਚਾਲੂ ਕਰ ਰਿਹਾ ਹੈ…"</string>
-    <string name="bluetooth_turning_off" msgid="2337747302892025192">"Bluetooth ਬੰਦ ਕਰ ਰਿਹਾ ਹੈ…"</string>
+    <string name="bluetooth_turning_on" msgid="4850574877288036646">"ਬਲੂਟੁੱਥ ਚਾਲੂ ਹੋ ਰਿਹਾ ਹੈ…"</string>
+    <string name="bluetooth_turning_off" msgid="2337747302892025192">"ਬਲੂਟੁੱਥ ਬੰਦ ਹੋ ਰਿਹਾ ਹੈ…"</string>
     <string name="bluetooth_auto_connect" msgid="40711424456733571">"ਆਟੋ-ਕਨੈਕਟ ਕਰੋ"</string>
     <string name="bluetooth_connection_permission_request" msgid="4747918249032890077">"Bluetooth ਕਨੈਕਸ਼ਨ ਬੇਨਤੀ"</string>
     <string name="bluetooth_connection_notif_message" msgid="3603316575471431846">"\"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>\"  ਨਾਲ ਕਨੈਕਟ ਕਰਨ ਲਈ ਟੈਪ ਕਰੋ।"</string>
     <string name="bluetooth_connection_dialog_text" msgid="8455427559949998023">"ਕੀ ਤੁਸੀਂ \"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>\" ਨਾਲ ਕਨੈਕਟ ਕਰਨਾ ਚਾਹੁੰਦੇ ਹੋ?"</string>
-    <string name="bluetooth_phonebook_request" msgid="3951420080540915279">"ਫੋਨ ਬੁੱਕ ਪਹੁੰਚ ਬੇਨਤੀ"</string>
+    <string name="bluetooth_phonebook_request" msgid="3951420080540915279">"ਫ਼ੋਨ ਬੁੱਕ ਪਹੁੰਚ ਬੇਨਤੀ"</string>
     <string name="bluetooth_pb_acceptance_dialog_text" msgid="8930347091018455505">"<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g> ਤੁਹਾਡੇ ਸੰਪਰਕਾਂ ਅਤੇ ਇਤਿਹਾਸ \'ਤੇ ਪਹੁੰਚ ਕਰਨਾ ਚਾਹੁੁੰਦਾ ਹੈ। ਕੀ <xliff:g id="DEVICE_NAME_1">%2$s</xliff:g> ਨੂੰ ਪਹੁੰਚ ਦੇਣੀ ਹੈ?"</string>
     <string name="bluetooth_remember_choice" msgid="6919682671787049800">"ਦੁਬਾਰਾ ਨਾ ਪੁੱਛਣਾ"</string>
     <string name="bluetooth_pb_remember_choice" msgid="3622898084442402071">"ਦੁਬਾਰਾ ਨਾ ਪੁੱਛਣਾ"</string>
     <string name="bluetooth_map_request" msgid="4595727689513143902">"ਸੁਨੇਹਾ ਪਹੁੰਚ ਬੇਨਤੀ"</string>
     <string name="bluetooth_map_acceptance_dialog_text" msgid="8712508202081143737">"%1$s ਤੁਹਾਡੇ ਸੁਨੇਹਿਆਂ ਤੱਕ ਪਹੁੰਚ ਪ੍ਰਾਪਤ ਕਰਨਾ ਚਾਹੁੰਦਾ ਹੈ। ਕੀ %2$s ਤੱਕ ਪਹੁੰਚ ਪ੍ਰਾਪਤ ਕਰਨੀ ਹੈ?"</string>
-    <string name="bluetooth_sap_request" msgid="2669762224045354417">"ਸਿਮ ਐਕਸੈਸ ਬੇਨਤੀ"</string>
-    <string name="bluetooth_sap_acceptance_dialog_text" msgid="4414253873553608690">"<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g> ਤੁਹਾਡੇ ਸਿਮ ਕਾਰਡ ਦੀ ਐਕਸੈਸ ਕਰਨਾ ਚਾਹੁੰਦਾ/ਚਾਹੁੰਦੀ ਹੈ। ਸਿਮ ਕਾਰਡ ਦੀ ਐਕਸੈਸ ਦੇਣਾ ਕਨੈਕਸ਼ਨ ਦੀ ਸਮਾਂ ਮਿਆਦ ਦੇ ਲਈ ਤੁਹਾਡੀ ਡੀਵਾਈਸ \'ਤੇ ਕਨੈਕਟਿਵਿਟੀ ਨੂੰ ਅਸਮਰਥਿਤ ਕਰ ਦੇਵੇਗਾ। <xliff:g id="DEVICE_NAME_1">%2$s?</xliff:g> ਨੂੰ ਐਕਸੈਸ ਦਿਓ"</string>
-    <string name="bluetooth_device_name_summary" msgid="4757990010751789977">"ਹੋਰਾਂ ਡੀਵਾਈਸਾਂ ਲਈ <xliff:g id="DEVICE_NAME">^1</xliff:g> ਵਜੋਂ ਦਿਖਣਯੋਗ ਹੈ"</string>
+    <string name="bluetooth_sap_request" msgid="2669762224045354417">"ਸਿਮ ਪਹੁੰਚ ਬੇਨਤੀ"</string>
+    <string name="bluetooth_sap_acceptance_dialog_text" msgid="4414253873553608690">"<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g> ਤੁਹਾਡੇ ਸਿਮ ਕਾਰਡ ਦੀ ਪਹੁੰਚ ਕਰਨਾ ਚਾਹੁੰਦਾ/ਚਾਹੁੰਦੀ ਹੈ। ਸਿਮ ਕਾਰਡ ਦੀ ਪਹੁੰਚ ਦੇਣਾ ਕਨੈਕਸ਼ਨ ਦੀ ਸਮਾਂ ਮਿਆਦ ਦੇ ਲਈ ਤੁਹਾਡੇ ਡੀਵਾਈਸ \'ਤੇ ਕਨੈਕਟਿਵਿਟੀ ਨੂੰ ਅਸਮਰਥਿਤ ਕਰ ਦੇਵੇਗਾ। <xliff:g id="DEVICE_NAME_1">%2$s?</xliff:g> ਨੂੰ ਪਹੁੰਚ ਦਿਓ"</string>
+    <string name="bluetooth_device_name_summary" msgid="522235742194965734">"ਹੋਰਾਂ ਡੀਵਾਈਸਾਂ ਲਈ <xliff:g id="DEVICE_NAME">^1</xliff:g> ਵਜੋਂ ਦਿਖਣਯੋਗ"</string>
     <string name="bluetooth_paired_device_title" msgid="8638994696317952019">"ਤੁਹਾਡੀਆਂ ਡੀਵਾਈਸਾਂ"</string>
-    <string name="bluetooth_pairing_page_title" msgid="7712127387361962608">"ਨਵੀਂ ਡੀਵਾਈਸ ਜੋੜਾਬੱਧ ਕਰੋ"</string>
+    <string name="bluetooth_pairing_page_title" msgid="7712127387361962608">"ਨਵਾਂ ਡੀਵਾਈਸ ਜੋੜਾਬੱਧ ਕਰੋ"</string>
     <string name="date_and_time" msgid="9062980487860757694">"ਤਾਰੀਖ ਅਤੇ ਸਮਾਂ"</string>
     <string name="choose_timezone" msgid="1362834506479536274">"ਸਮਾਂ ਜ਼ੋਨ ਚੁਣੋ"</string>
     <!-- no translation found for intent_sender_data_label (6332324780477289261) -->
@@ -191,37 +191,37 @@
     <string name="proxy_error_invalid_exclusion_list" msgid="678527645450894773">"ਤੁਹਾਡੇ ਵੱਲੋਂ ਟਾਈਪ ਕੀਤੀ ਰੂਪ ਸੂਚੀ ਸਹੀ ਢੰਗ ਨਾਲ ਫੌਰਮੈਟ ਨਹੀਂ ਕੀਤੀ ਹੋਈ ਹੈ। ਰੂਪ ਵਾਲੇ ਡੋਮੇਨਾਂ ਦੀ ਇੱਕ ਕਾਮਾ-ਵੱਖ ਕੀਤੀ ਸੂਚੀ ਟਾਈਪ ਕਰੋ।"</string>
     <string name="proxy_error_empty_port" msgid="5539106187558215246">"ਤੁਹਾਨੂੰ ਪੋਰਟ ਖੇਤਰ ਪੂਰਾ ਕਰਨ ਦੀ ਲੋੜ ਹੈ।"</string>
     <string name="proxy_error_empty_host_set_port" msgid="2451694104858226781">"ਜੇਕਰ ਹੋਸਟ ਖੇਤਰ ਖਾਲੀ ਹੈ ਤਾਂ ਪੋਰਟ ਖੇਤਰ ਖਾਲੀ ਹੋਣਾ ਚਾਹੀਦਾ ਹੈ।"</string>
-    <string name="proxy_error_invalid_port" msgid="5988270202074492710">"ਤੁਹਾਡੇ ਵੱਲੋਂ ਟਾਈਪ ਕੀਤਾ ਪੋਰਟ ਪ੍ਰਮਾਣਿਕ ਨਹੀਂ ਹੈ।"</string>
+    <string name="proxy_error_invalid_port" msgid="5988270202074492710">"ਤੁਹਾਡੇ ਵੱਲੋਂ ਟਾਈਪ ਕੀਤਾ ਪੋਰਟ ਵੈਧ ਨਹੀਂ ਹੈ।"</string>
     <string name="proxy_warning_limited_support" msgid="7229337138062837422">"HTTP ਪ੍ਰੌਕਸੀ ਬ੍ਰਾਊਜ਼ਰ ਵੱਲੋਂ ਵਰਤੀ ਜਾਂਦੀ ਹੈ ਪਰ ਹੋ ਸਕਦਾ ਹੈ ਹੋਰ ਐਪਾਂ ਵੱਲੋਂ ਇਸ ਦੀ ਵਰਤੋਂ ਨਾ ਕੀਤੀ ਜਾ ਸਕੇ।"</string>
     <string name="proxy_url_title" msgid="7185282894936042359">"PAC URL: "</string>
     <string name="radio_info_signal_location_label" msgid="3242990404410530456">"ਸੈੱਲ ਟਿਕਾਣਾ ਜਾਣਕਾਰੀ (ਹਟਾਈ ਗਈ):"</string>
     <string name="radio_info_neighboring_location_label" msgid="5766020323342985397">"ਆਂਢ-ਗੁਆਂਢ ਸੈੱਲ ਜਾਣਕਾਰੀ (ਹਟਾਈ ਗਈ):"</string>
     <string name="radio_info_cell_info_refresh_rate" msgid="7062777594049622128">"ਸੈੱਲ ਜਾਣਕਾਰੀ ਮੁੜ-ਤਾਜ਼ਾ ਕਰਨ ਦੀ ਦਰ:"</string>
     <string name="radio_info_cellinfo_label" msgid="6213223844927623098">"ਸਾਰੀ ਸੈੱਲ ਮਾਪ ਜਾਣਕਾਰੀ:"</string>
-    <string name="radio_info_dcrtinfo_label" msgid="4062076024399431876">"ਡੈਟਾ ਕਨੈਕਸ਼ਨ ਰੀਅਲ-ਟਾਈਮ ਜਾਣਕਾਰੀ:"</string>
-    <string name="radio_info_gprs_service_label" msgid="4209624131644060517">"ਡੈਟਾ ਸੇਵਾ:"</string>
+    <string name="radio_info_dcrtinfo_label" msgid="4062076024399431876">"ਡਾਟਾ ਕਨੈਕਸ਼ਨ ਰੀਅਲ-ਟਾਈਮ ਜਾਣਕਾਰੀ:"</string>
+    <string name="radio_info_gprs_service_label" msgid="4209624131644060517">" ਡਾਟਾ  ਸੇਵਾ:"</string>
     <string name="radio_info_roaming_label" msgid="6141505430275138647">"ਰੋਮਿੰਗ:"</string>
     <string name="radio_info_imei_label" msgid="1220524224732944192">"IMEI:"</string>
     <string name="radio_info_call_redirect_label" msgid="2743797189722106231">"ਇਸ \'ਤੇ ਕਾਲ ਰੀਡਾਇਰੈਕਟ ਕਰੋ:"</string>
     <string name="radio_info_ppp_resets_label" msgid="3587319503902576102">"ਬੂਟ ਤੋਂ ਬਾਅਦ PPP ਰੀਸੈੱਟ ਦੀ ਗਿਣਤੀ:"</string>
     <string name="radio_info_current_network_label" msgid="9151285540639134945">"ਵਰਤਮਾਨ ਨੈੱਟਵਰਕ:"</string>
-    <string name="radio_info_ppp_received_label" msgid="363579470428151850">"ਡੈਟਾ ਪ੍ਰਾਪਤ ਹੋਇਆ:"</string>
+    <string name="radio_info_ppp_received_label" msgid="363579470428151850">" ਡਾਟਾ  ਪ੍ਰਾਪਤ ਹੋਇਆ:"</string>
     <string name="radio_info_gsm_service_label" msgid="1370863866816125489">"ਵੌਇਸ ਸੇਵਾ:"</string>
     <string name="radio_info_signal_strength_label" msgid="5155734002519307416">"ਸਿਗਨਲ ਸਟ੍ਰੈਂਥ:"</string>
     <string name="radio_info_call_status_label" msgid="2611065018172747413">"ਵੌਇਸ ਕਾਲ ਸਥਿਤੀ:"</string>
-    <string name="radio_info_ppp_sent_label" msgid="7748668735880404586">"ਡੈਟਾ ਭੇਜਿਆ ਗਿਆ:"</string>
+    <string name="radio_info_ppp_sent_label" msgid="7748668735880404586">" ਡਾਟਾ  ਭੇਜਿਆ ਗਿਆ:"</string>
     <string name="radio_info_message_waiting_label" msgid="1037302619943328273">"ਸੁਨੇਹਾ ਉਡੀਕ:"</string>
     <string name="radio_info_phone_number_label" msgid="7942153178953255231">"ਫ਼ੋਨ ਨੰਬਰ:"</string>
     <string name="radio_info_band_mode_label" msgid="8730871744887454509">"ਰੇਡੀਓ ਬੈਂਡ ਚੁਣੋ"</string>
     <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>
     <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>
@@ -240,12 +240,12 @@
     <string name="sdcard_settings_mass_storage_status" product="default" msgid="2742075324087038036">"SD ਕਾਰਡ ਨੂੰ ਇੱਕ ਮਾਸ ਸਟੋਰੇਜ ਡੀਵਾਈਸ ਦੇ ਤੌਰ ਤੇ ਵਰਤਿਆ ਜਾ ਰਿਹਾ ਹੈ।"</string>
     <string name="sdcard_settings_unmounted_status" product="nosdcard" msgid="5128923500235719226">"ਹੁਣ USB ਸਟੋਰੇਜ ਨੂੰ ਹਟਾਉਣਾ ਸੁਰੱਖਿਅਤ ਹੈ।"</string>
     <string name="sdcard_settings_unmounted_status" product="default" msgid="666233604712540408">"ਹੁਣ SD ਕਾਰਡ ਨੂੰ ਹਟਾਉਣਾ ਸੁਰੱਖਿਅਤ ਹੈ।"</string>
-    <string name="sdcard_settings_bad_removal_status" product="nosdcard" msgid="7761390725880773697">"USB ਸਟੋਰੇਜ ਵਰਤਣ ਵਿੱਚ ਹੋਣ ਵੇਲੇ ਹੀ ਹਟਾ ਦਿੱਤੀ ਗਈ ਸੀ!"</string>
+    <string name="sdcard_settings_bad_removal_status" product="nosdcard" msgid="7761390725880773697">"USB ਸਟੋਰੇਜ ਵਰਤੋਂ ਵਿੱਚ ਹੁੰਦੇ ਹੋਏ ਹੀ ਹਟਾ ਦਿੱਤੀ ਗਈ ਸੀ!"</string>
     <string name="sdcard_settings_bad_removal_status" product="default" msgid="5145797653495907970">"SD ਕਾਰਡ ਵਰਤੋਂ ਵਿੱਚ ਹੋਣ ਵੇਲੇ ਹੀ ਹਟਾ ਦਿੱਤਾ ਗਿਆ ਸੀ!"</string>
     <string name="sdcard_settings_used_bytes_label" msgid="8820289486001170836">"ਵਰਤੀ ਗਈ ਬਾਈਟਸ:"</string>
-    <string name="sdcard_settings_scanning_status" product="nosdcard" msgid="7503429447676219564">"USB ਸਟੋਰੇਜ ਲਈ ਮੀਡੀਆ ਕਾਰਡ ਸਕੈਨ ਕਰ ਰਿਹਾ ਹੈ..."</string>
+    <string name="sdcard_settings_scanning_status" product="nosdcard" msgid="7503429447676219564">"ਮੀਡੀਆ ਲਈ USB ਸਟੋਰੇਜ ਸਕੈਨ ਹੋ ਰਹੀ ਹੈ…"</string>
     <string name="sdcard_settings_scanning_status" product="default" msgid="2763464949274455656">"ਮੀਡੀਆ ਲਈ SD ਕਾਰਡ ਸਕੈਨ ਕਰ ਰਿਹਾ ਹੈ..."</string>
-    <string name="sdcard_settings_read_only_status" product="nosdcard" msgid="3624143937437417788">"USB ਸਟੋਰੇਜ ਰੀਡ-ਓਨਲੀ ਮਾਉਂਟ ਕੀਤੀ।"</string>
+    <string name="sdcard_settings_read_only_status" product="nosdcard" msgid="3624143937437417788">"USB ਸਟੋਰੇਜ ਸਿਰਫ਼-ਪੜ੍ਹਨ ਲਈ ਮਾਉਂਟ ਕੀਤੀ।"</string>
     <string name="sdcard_settings_read_only_status" product="default" msgid="4518291824764698112">"SD ਕਾਰਡ ਰੀਡ-ਓਨਰੀ ਮਾਉਂਟ ਕੀਤਾ ਗਿਆ।"</string>
     <string name="skip_label" msgid="47510779345218297">"ਛੱਡੋ"</string>
     <string name="next_label" msgid="4693520878012668114">"ਅੱਗੇ"</string>
@@ -269,8 +269,8 @@
     <string name="activity_picker_label" msgid="6295660302548177109">"ਗਤੀਵਿਧੀ ਚੁਣੋ"</string>
     <string name="device_info_label" msgid="6551553813651711205">"ਡੀਵਾਈਸ ਜਾਣਕਾਰੀ"</string>
     <string name="display_label" msgid="8074070940506840792">"ਸਕ੍ਰੀਨ"</string>
-    <string name="phone_info_label" product="tablet" msgid="7820855350955963628">"ਟੈਬਲੇਟ ਜਾਣਕਾਰੀ"</string>
-    <string name="phone_info_label" product="default" msgid="2127552523124277664">"ਫੋਨ ਜਾਣਕਾਰੀ"</string>
+    <string name="phone_info_label" product="tablet" msgid="7820855350955963628">"ਟੈਬਲੈੱਟ ਜਾਣਕਾਰੀ"</string>
+    <string name="phone_info_label" product="default" msgid="2127552523124277664">"ਫ਼ੋਨ ਜਾਣਕਾਰੀ"</string>
     <string name="sd_card_settings_label" product="nosdcard" msgid="8101475181301178428">"USB ਸਟੋਰੇਜ"</string>
     <string name="sd_card_settings_label" product="default" msgid="5743100901106177102">"SD ਕਾਰਡ"</string>
     <string name="proxy_settings_label" msgid="3271174136184391743">"ਪ੍ਰੌਕਸੀ ਸੈਟਿੰਗਾਂ"</string>
@@ -286,21 +286,21 @@
     <string name="airplane_mode" msgid="8837269988154128601">"ਹਵਾਈ ਜਹਾਜ਼ ਮੋਡ"</string>
     <string name="radio_controls_title" msgid="3447085191369779032">"ਹੋਰ"</string>
     <string name="wireless_networks_settings_title" msgid="3643009077742794212">"ਵਾਇਰਲੈੱਸ ਅਤੇ ਨੈੱਟਵਰਕ"</string>
-    <string name="radio_controls_summary" msgid="1838624369870907268">"Wi‑Fi, Bluetooth, ਏਅਰਪਲੇਨ ਮੋਡ, ਮੋਬਾਈਲ ਨੈੱਟਵਰਕ &amp; VPN ਵਿਵਸਥਿਤ ਕਰੋ"</string>
-    <string name="cellular_data_title" msgid="6835451574385496662">"ਮੋਬਾਈਲ ਡੈਟਾ"</string>
+    <string name="radio_controls_summary" msgid="1838624369870907268">"ਵਾਈ‑ਫਾਈ, ਬਲੂਟੁੱਥ, ਹਵਾਈ ਜਹਾਜ਼ ਮੋਡ, ਮੋਬਾਈਲ ਨੈੱਟਵਰਕ &amp; VPN ਪ੍ਰਬੰਧਿਤ ਕਰੋ"</string>
+    <string name="cellular_data_title" msgid="6835451574385496662">"ਮੋਬਾਈਲ ਡਾਟਾ"</string>
     <string name="calls_title" msgid="3544471959217176768">"ਕਾਲਾਂ"</string>
     <string name="sms_messages_title" msgid="1778636286080572535">"SMS ਸੁਨੇਹੇ"</string>
-    <string name="cellular_data_summary" msgid="4660351864416939504">"ਮੋਬਾਈਲ ਨੈੱਟਵਰਕ \'ਤੇ ਡੈਟਾ ਉਪਯੋਗ ਯੋਗ ਬਣਾਓ"</string>
-    <string name="allow_data_usage_title" msgid="2238205944729213062">"ਰੋਮਿੰਗ ਵੇਲੇ ਡੈਟਾ ਉਪਯੋਗ ਦੀ ਆਗਿਆ ਦਿਓ"</string>
-    <string name="roaming" msgid="3596055926335478572">"ਡੈਟਾ ਰੋਮਿੰਗ"</string>
-    <string name="roaming_enable" msgid="3737380951525303961">"ਰੋਮਿੰਗ ਵੇਲੇ ਡੈਟਾ ਸੇਵਾਵਾਂ ਨਾਲ ਕਨੈਕਟ ਕਰੋ"</string>
-    <string name="roaming_disable" msgid="1295279574370898378">"ਰੋਮਿੰਗ ਵੇਲੇ ਡੈਟਾ ਸੇਵਾਵਾਂ ਨਾਲ ਕਨੈਕਟ ਕਰੋ"</string>
-    <string name="roaming_reenable_message" msgid="9141007271031717369">"ਤੁਹਾਡੀ ਡੈਟਾ ਕਨੈਕਟੀਵਿਟੀ ਨਸ਼ਟ ਹੋ ਗਈ ਹੈ ਕਿਉਂਕਿ ਤੁਸੀਂ ਆਪਣਾ ਡੈਟਾ ਰੋਮਿੰਗ ਬੰਦ ਨਾਲ ਹੋਮ ਨੈੱਟਵਰਕ ਛੱਡ ਦਿੱਤਾ ਸੀ।"</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_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" msgid="4275443317524544705">"ਤੁਹਾਨੂੰ ਵਾਧੂ ਖਰਚਾ ਦੇਣਾ ਪੈ ਸਕਦਾ ਹੈ"</string>
+    <string name="roaming_warning_multiuser" product="tablet" msgid="6458990250829214777">"ਜਦੋਂ ਤੁਸੀਂ ਡਾਟਾ ਰੋਮਿੰਗ ਦੀ ਆਗਿਆ ਦਿੰਦੇ ਹੋ, ਤਾਂ ਤੁਹਾਨੂੰ ਖਾਸ ਰੋਮਿੰਗ ਖਰਚੇ ਪੈ ਸਕਦੇ ਹਨ!\n\nਇਹ ਸੈਟਿੰਗ ਇਸ ਟੈਬਲੈੱਟ ਦੇ ਸਾਰੇ ਵਰਤੋਂਕਾਰਾਂ ਤੇ ਅਸਰ ਪਾਉਂਦੀ ਹੈ।"</string>
+    <string name="roaming_warning_multiuser" product="default" msgid="6368421100292355440">"ਜਦੋਂ ਤੁਸੀਂ ਡਾਟਾ ਰੋਮਿੰਗ ਦੀ ਆਗਿਆ ਦਿੰਦੇ ਹੋ, ਤਾਂ ਤੁਹਾਨੂੰ ਖਾਸ ਰੋਮਿੰਗ ਖਰਚੇ ਪੈ ਸਕਦੇ ਹਨ!\n\nਇਹ ਸੈਟਿੰਗ ਇਸ ਫ਼ੋਨ ਦੇ ਸਾਰੇ ਵਰਤੋਂਕਾਰਾਂ ਤੇ ਅਸਰ ਪਾਉਂਦੀ ਹੈ।"</string>
+    <string name="roaming_reenable_title" msgid="6068100976707316772">"ਕੀ ਡਾਟਾ ਰੋਮਿੰਗ ਦੀ ਆਗਿਆ ਦੇਣੀ ਹੈ?"</string>
     <string name="networks" msgid="6333316876545927039">"ਓਪਰੇਟਰ ਚੋਣ"</string>
     <string name="sum_carrier_select" msgid="3616956422251879163">"ਇੱਕ ਨੈੱਟਵਰਕ ਓਪਰੇਟਰ ਚੁਣੋ"</string>
     <string name="date_and_time_settings_title" msgid="3350640463596716780">"ਤਾਰੀਖ ਅਤੇ ਸਮਾਂ"</string>
@@ -312,6 +312,8 @@
     <string name="zone_auto" msgid="334783869352026648">"ਸਵੈਚਲਿਤ ਸਮਾਂ ਜ਼ੋਨ"</string>
     <string name="zone_auto_summaryOn" msgid="6142830927278458314">"ਨੈੱਟਵਰਕ ਵੱਲੋਂ -ਮੁਹੱਈਆ ਕੀਤੀ ਸਮਾਂ ਜ਼ੋਨ ਵਰਤੋ"</string>
     <string name="zone_auto_summaryOff" msgid="2597745783162041390">"ਨੈੱਟਵਰਕ ਵੱਲੋਂ -ਮੁਹੱਈਆ ਕੀਤੀ ਸਮਾਂ ਜ਼ੋਨ ਵਰਤੋ"</string>
+    <string name="date_time_24hour_auto" msgid="2117383168985653422">"ਸਵੈਚਲਿਤ 24‑ਘੰਟੇ ਵੰਨਗੀ"</string>
+    <string name="date_time_24hour_auto_summary" msgid="6351812925651480277">"Use locale default"</string>
     <string name="date_time_24hour_title" msgid="3203537578602803850">"24‑ਘੰਟੇ ਫੌਰਮੈਟ"</string>
     <string name="date_time_24hour" msgid="1193032284921000063">"24-ਘੰਟੇ ਵੰਨਗੀ ਵਰਤੋ"</string>
     <string name="date_time_set_time_title" msgid="6296795651349047016">"ਸਮਾਂ"</string>
@@ -320,70 +322,72 @@
     <string name="date_time_set_timezone" msgid="5045627174274377814">"ਸਮਾਂ ਜ਼ੋਨ ਚੁਣੋ"</string>
     <string name="date_time_set_date_title" msgid="6928286765325608604">"ਤਾਰੀਖ"</string>
     <string name="date_time_set_date" msgid="7021491668550232105">"ਤਾਰੀਖ ਸੈੱਟ ਕਰੋ"</string>
-    <string name="zone_list_menu_sort_alphabetically" msgid="5683377702671088588">"ਅਲਫਾਬੈਟਿਕਲੀ ਛਾਂਟੋ"</string>
+    <string name="zone_list_menu_sort_alphabetically" msgid="5683377702671088588">"ਵਰਨਮਾਲਾ ਅਨੁਸਾਰ ਛਾਂਟੋ"</string>
     <string name="zone_list_menu_sort_by_timezone" msgid="2720190443744884114">"ਸਮਾਂ ਜ਼ੋਨ ਮੁਤਾਬਕ ਛਾਂਟੋ"</string>
     <string name="date_picker_title" msgid="1338210036394128512">"ਤਾਰੀਖ"</string>
     <string name="time_picker_title" msgid="483460752287255019">"ਸਮਾਂ"</string>
-    <string name="lock_after_timeout" msgid="4590337686681194648">"ਸਵੈਚਲਿਤ ਤਰੀਕੇ ਨਾਲ ਲੌਕ ਕਰੋ"</string>
+    <string name="lock_after_timeout" msgid="4590337686681194648">"ਸਵੈਚਲਿਤ ਤਰੀਕੇ ਨਾਲ ਲਾਕ ਕਰੋ"</string>
     <string name="lock_after_timeout_summary" msgid="6128431871360905631">"ਸਲੀਪ ਤੋਂ ਬਾਅਦ <xliff:g id="TIMEOUT_STRING">%1$s</xliff:g>"</string>
-    <string name="lock_immediately_summary_with_exception" msgid="9119632173886172690">"ਸਲੀਪ ਦੇ ਤੁਰੰਤ ਬਾਅਦ, ਇਸਦੇ ਸਿਵਾਏ ਜਦੋਂ <xliff:g id="TRUST_AGENT_NAME">%1$s</xliff:g> ਵੱਲੋਂ ਅਨਲੌਕ ਨਾ ਰੱਖਿਆ ਗਿਆ ਹੋਵੇ"</string>
-    <string name="lock_after_timeout_summary_with_exception" msgid="5579064842797188409">"ਸਲੀਪ ਤੋਂ ਬਾਅਦ <xliff:g id="TIMEOUT_STRING">%1$s</xliff:g>, ਸਿਵਾਏ ਇਸਦੇ ਜਦੋਂ <xliff:g id="TRUST_AGENT_NAME">%2$s</xliff:g> ਵੱਲੋਂ ਅਨਲੌਕ ਰੱਖਿਆ ਹੋਵੇ"</string>
-    <string name="show_owner_info_on_lockscreen_label" msgid="5074906168357568434">"ਲੌਕ ਸਕ੍ਰੀਨ ਤੇ ਮਾਲਕ ਜਾਣਕਾਰੀ ਦਿਖਾਓ"</string>
-    <string name="owner_info_settings_title" msgid="5530285568897386122">"ਲੌਕ ਸਕ੍ਰੀਨ ਸੁਨੇਹਾ"</string>
-    <string name="security_enable_widgets_title" msgid="2754833397070967846">"ਵਿਜਿਟ ਨੂੰ ਸਮਰੱਥ ਬਣਾਓ"</string>
+    <string name="lock_immediately_summary_with_exception" msgid="9119632173886172690">"ਸਲੀਪ ਦੇ ਤੁਰੰਤ ਬਾਅਦ, ਇਸਦੇ ਸਿਵਾਏ ਜਦੋਂ <xliff:g id="TRUST_AGENT_NAME">%1$s</xliff:g> ਵੱਲੋਂ ਅਣਲਾਕ ਨਾ ਰੱਖਿਆ ਗਿਆ ਹੋਵੇ"</string>
+    <string name="lock_after_timeout_summary_with_exception" msgid="5579064842797188409">"ਸਲੀਪ ਤੋਂ ਬਾਅਦ <xliff:g id="TIMEOUT_STRING">%1$s</xliff:g>, ਸਿਵਾਏ ਇਸਦੇ ਜਦੋਂ <xliff:g id="TRUST_AGENT_NAME">%2$s</xliff:g> ਵੱਲੋਂ ਅਣਲਾਕ ਰੱਖਿਆ ਹੋਵੇ"</string>
+    <string name="show_owner_info_on_lockscreen_label" msgid="5074906168357568434">" ਲਾਕ  ਸਕ੍ਰੀਨ ਤੇ ਮਾਲਕ ਜਾਣਕਾਰੀ ਦਿਖਾਓ"</string>
+    <string name="owner_info_settings_title" msgid="5530285568897386122">" ਲਾਕ  ਸਕ੍ਰੀਨ ਸੁਨੇਹਾ"</string>
+    <string name="security_enable_widgets_title" msgid="2754833397070967846">"ਵਿਜੇਟ ਨੂੰ ਚਾਲੂ ਕਰੋ"</string>
     <string name="security_enable_widgets_disabled_summary" msgid="6392489775303464905">"ਪ੍ਰਸ਼ਾਸਕ ਦੁਆਰਾ ਅਯੋਗ ਬਣਾਇਆ ਗਿਆ"</string>
     <string name="owner_info_settings_summary" msgid="7472393443779227052">"ਕੋਈ ਨਹੀਂ"</string>
     <string name="owner_info_settings_status" msgid="120407527726476378">"<xliff:g id="COUNT_0">%1$d</xliff:g> / <xliff:g id="COUNT_1">%2$d</xliff:g>"</string>
-    <string name="owner_info_settings_edit_text_hint" msgid="7591869574491036360">"ਉਦਾ., ਜੋਏ ਦਾ Android."</string>
+    <string name="owner_info_settings_edit_text_hint" msgid="7591869574491036360">"ਉਦਾਹਰਨ ਵਜੋਂ, ਜੋਏ ਦਾ Android."</string>
     <string name="user_info_settings_title" msgid="1195015434996724736">"ਉਪਭੋਗਤਾ ਜਾਣਕਾਰੀ"</string>
-    <string name="show_profile_info_on_lockscreen_label" msgid="2741208907263877990">"ਲੌਕ ਸਕ੍ਰੀਨ ਤੇ ਪ੍ਰੋਫਾਈਲ ਜਾਣਕਾਰੀ ਦਿਖਾਓ"</string>
+    <string name="show_profile_info_on_lockscreen_label" msgid="2741208907263877990">" ਲਾਕ  ਸਕ੍ਰੀਨ ਤੇ ਪ੍ਰੋਫਾਈਲ ਜਾਣਕਾਰੀ ਦਿਖਾਓ"</string>
     <string name="profile_info_settings_title" msgid="3518603215935346604">"ਪ੍ਰੋਫਾਈਲ ਜਾਣਕਾਰੀ"</string>
     <string name="Accounts_settings_title" msgid="1643879107901699406">"ਖਾਤੇ"</string>
     <string name="location_settings_title" msgid="1369675479310751735">"ਟਿਕਾਣਾ"</string>
     <string name="account_settings_title" msgid="626177544686329806">"ਖਾਤੇ"</string>
-    <!-- no translation found for security_settings_title (4918904614964215087) -->
-    <skip />
+    <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="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_passwords_title" msgid="2881269890053568809">"ਪਰਦੇਦਾਰੀ"</string>
     <string name="disabled_by_administrator_summary" msgid="1601828700318996341">"ਪ੍ਰਸ਼ਾਸਕ ਦੁਆਰਾ ਅਯੋਗ ਬਣਾਇਆ ਗਿਆ"</string>
     <string name="security_status_title" msgid="5848766673665944640">"ਸੁਰੱਖਿਆ ਅਵਸਥਾ"</string>
-    <string name="security_dashboard_summary" msgid="6757421634477554939">"ਸਕ੍ਰੀਨ ਲੌਕ, ਫਿੰਗਰਪ੍ਰਿੰਟ"</string>
-    <string name="security_dashboard_summary_no_fingerprint" msgid="8129641548372335540">"ਸਕ੍ਰੀਨ ਲੌਕ"</string>
+    <string name="security_dashboard_summary" msgid="6757421634477554939">"ਸਕ੍ਰੀਨ  ਲਾਕ , ਫਿੰਗਰਪ੍ਰਿੰਟ"</string>
+    <string name="security_dashboard_summary_no_fingerprint" msgid="8129641548372335540">"ਸਕ੍ਰੀਨ  ਲਾਕ"</string>
     <string name="security_settings_fingerprint_preference_title" msgid="2488725232406204350">"ਫਿੰਗਰਪ੍ਰਿੰਟ"</string>
     <string name="fingerprint_manage_category_title" msgid="8293801041700001681">"ਫਿੰਗਰਪ੍ਰਿੰਟਸ ਵਿਵਸਥਿਤ ਕਰੋ"</string>
     <string name="fingerprint_usage_category_title" msgid="8438526918999536619">"ਇਸ ਲਈ ਫਿੰਗਰਪ੍ਰਿੰਟ ਵਰਤੋ"</string>
-    <string name="fingerprint_add_title" msgid="1926752654454033904">"ਫਿੰਗਰਪ੍ਰਿੰਟ ਜੋੜੋ"</string>
-    <string name="fingerprint_enable_keyguard_toggle_title" msgid="5078060939636911795">"ਸਕ੍ਰੀਨ ਲੌਕ"</string>
+    <string name="fingerprint_add_title" msgid="1926752654454033904">"ਫਿੰਗਰਪ੍ਰਿੰਟ ਸ਼ਾਮਲ ਕਰੋ"</string>
+    <string name="fingerprint_enable_keyguard_toggle_title" msgid="5078060939636911795">"ਸਕ੍ਰੀਨ  ਲਾਕ"</string>
     <plurals name="security_settings_fingerprint_preference_summary" formatted="false" msgid="624961700033979880">
       <item quantity="one"><xliff:g id="COUNT_1">%1$d</xliff:g> ਫਿੰਗਰਪ੍ਰਿੰਟ ਸਥਾਪਤ ਕੀਤਾ ਗਿਆ</item>
       <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> ਫਿੰਗਰਪ੍ਰਿੰਟ ਸਥਾਪਤ ਕੀਤੇ ਗਏ</item>
     </plurals>
     <string name="security_settings_fingerprint_preference_summary_none" msgid="1507739327565151923"></string>
-    <string name="security_settings_fingerprint_enroll_introduction_title" msgid="3201556857492526098">"ਫਿੰਗਰਪ੍ਰਿੰਟ ਨਾਲ ਅਨਲੌਕ ਕਰੋ"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_title" msgid="3201556857492526098">"ਫਿੰਗਰਪ੍ਰਿੰਟ ਨਾਲ ਅਣਲਾਕ ਕਰੋ"</string>
     <string name="security_settings_fingerprint_enroll_introduction_title_unlock_disabled" msgid="7066417934622827305">"ਆਪਣਾ ਫਿੰਗਰਪ੍ਰਿੰਟ ਵਰਤੋ"</string>
-    <string name="security_settings_fingerprint_enroll_introduction_message" msgid="3508870672887336095">"ਆਪਣੇ ਫੋਨ ਨੂੰ ਅਨਲੌਕ ਕਰਨ, ਖ਼ਰੀਦਾਂ ਨੂੰ ਅਧਿਕਾਰਿਤ ਕਰਨ, ਜਾਂ ਐਪਾਂ ਵਿੱਚ ਸਾਈਨ ਇਨ ਕਰਨ ਲਈ ਸਿਰਫ਼ ਫਿੰਗਰਪ੍ਰਿੰਟ ਸੰਵੇਦਕ ਨੂੰ ਸਪਰਸ਼ ਕਰੋ। ਇਸ ਬਾਰੇ ਸਾਵਧਾਨ ਰਹੋ ਕਿ ਤੁਸੀਂ ਕਿਸ ਵਿਅਕਤੀ ਦੇ ਫਿੰਗਰਪ੍ਰਿੰਟਾਂ ਨੂੰ ਸ਼ਾਮਲ ਕਰ ਰਹੇ ਹੋ। ਇੱਥੋਂ ਤੱਕ ਕਿ ਸ਼ਾਮਲ ਕੀਤੇ ਗਏ ਇੱਕ ਪ੍ਰਿੰਟ ਨਾਲ ਇਹਨਾਂ ਚੀਜ਼ਾਂ ਵਿੱਚੋਂ ਕੋਈ ਵੀ ਚੀਜ਼ ਕੀਤੀ ਜਾ ਸਕਦੀ ਹੈ।\n\nਨੋਟ ਕਰੋ: ਤੁਹਾਡਾ ਫਿੰਗਰਪ੍ਰਿੰਟ ਇੱਕ ਮਜ਼ਬੂਤ ਪੈਟਰਨ ਜਾਂ PIN ਤੋਂ ਘੱਟ ਸੁਰੱਖਿਅਤ ਹੋ ਸਕਦਾ ਹੈ।"</string>
-    <string name="security_settings_fingerprint_enroll_introduction_message_unlock_disabled" msgid="1550756694054944874">"ਆਪਣੇ ਫ਼ੋਨ ਨੂੰ ਅਨਲੌਕ ਕਰਨ ਜਾਂ ਖਰੀਦਾਂ ਨੂੰ ਮਨਜ਼ੂਰ ਕਰਨ ਲਈ ਆਪਣੇ ਫਿੰਗਰਪ੍ਰਿੰਟ ਦੀ ਵਰਤੋਂ ਕਰੋ। \n\nਨੋਟ ਕਰੋ: ਤੁਸੀਂ ਇਸ ਡੀਵਾਈਸ ਨੂੰ ਅਨਲੌਕ ਕਰਨ ਲਈ ਆਪਣੇ ਫਿੰਗਰਪ੍ਰਿੰਟ ਦੀ ਵਰਤੋਂ ਨਹੀਂ ਕਰ ਸਕਦੇ। ਵਧੇਰੇ ਜਾਣਕਾਰੀ ਲਈ, ਆਪਣੇ ਸੰਗਠਨ ਦੇ ਪ੍ਰਸ਼ਾਸਕ ਨਾਲ ਸੰਪਰਕ ਕਰੋ।"</string>
-    <string name="security_settings_fingerprint_enroll_introduction_message_setup" msgid="6817326798834882531">"ਆਪਣੇ ਫ਼ੋਨ ਨੂੰ ਅਨਲੌਕ ਕਰਨ ਲਈ ਜਾਂ ਖਰੀਦਾਂ ਨੂੰ ਮਨਜ਼ੂਰ ਕਰਨ ਲਈ ਲਈ ਆਪਣੇ ਫਿੰਗਰਪ੍ਰਿੰਟ ਦੀ ਵਰਤੋਂ ਕਰੋ। \n\n ਨੋਟ ਕਰੋ: ਤੁਹਾਡਾ ਫਿੰਗਰਪ੍ਰਿੰਟ ਇੱਕ ਮਜ਼ਬੂਤ ਪੈਟਰਨ ਜਾਂ PIN ਤੋਂ ਘੱਟ ਸੁਰੱਖਿਅਤ ਹੋ ਸਕਦਾ ਹੈ।"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_message" msgid="3508870672887336095">"ਆਪਣੇ ਫ਼ੋਨ ਨੂੰ ਅਣਲਾਕ ਕਰਨ, ਖਰੀਦਾਂ ਨੂੰ ਅਧਿਕਾਰਿਤ ਕਰਨ, ਜਾਂ ਐਪਾਂ ਵਿੱਚ ਸਾਈਨ-ਇਨ ਕਰਨ ਲਈ ਸਿਰਫ਼ ਫਿੰਗਰਪ੍ਰਿੰਟ ਸੈਂਸਰ ਨੂੰ ਸਪਰਸ਼ ਕਰੋ। ਇਸ ਬਾਰੇ ਸਾਵਧਾਨ ਰਹੋ ਕਿ ਤੁਸੀਂ ਕਿਸ ਵਿਅਕਤੀ ਦੇ ਫਿੰਗਰਪ੍ਰਿੰਟਾਂ ਨੂੰ ਸ਼ਾਮਲ ਕਰ ਰਹੇ ਹੋ। ਇੱਥੋਂ ਤੱਕ ਕਿ ਸ਼ਾਮਲ ਕੀਤੇ ਗਏ ਇੱਕ ਪ੍ਰਿੰਟ ਨਾਲ ਇਹਨਾਂ ਵਿੱਚੋਂ ਕੋਈ ਵੀ ਚੀਜ਼ ਕੀਤੀ ਜਾ ਸਕਦੀ ਹੈ।\n\nਨੋਟ ਕਰੋ: ਤੁਹਾਡਾ ਫਿੰਗਰਪ੍ਰਿੰਟ ਇੱਕ ਮਜ਼ਬੂਤ ਪੈਟਰਨ ਜਾਂ ਪਿੰਨ ਤੋਂ ਘੱਟ ਸੁਰੱਖਿਅਤ ਹੋ ਸਕਦਾ ਹੈ।"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_message_unlock_disabled" msgid="1550756694054944874">"ਆਪਣੇ ਫ਼ੋਨ ਨੂੰ ਅਣਲਾਕ ਕਰਨ ਜਾਂ ਖਰੀਦਾਂ ਨੂੰ ਮਨਜ਼ੂਰ ਕਰਨ ਲਈ ਆਪਣੇ ਫਿੰਗਰਪ੍ਰਿੰਟ ਦੀ ਵਰਤੋਂ ਕਰੋ। \n\nਨੋਟ ਕਰੋ: ਤੁਸੀਂ ਇਸ ਡੀਵਾਈਸ ਨੂੰ ਅਣਲਾਕ ਕਰਨ ਲਈ ਆਪਣੇ ਫਿੰਗਰਪ੍ਰਿੰਟ ਦੀ ਵਰਤੋਂ ਨਹੀਂ ਕਰ ਸਕਦੇ। ਵਧੇਰੇ ਜਾਣਕਾਰੀ ਲਈ, ਆਪਣੇ ਸੰਗਠਨ ਦੇ ਪ੍ਰਸ਼ਾਸਕ ਨਾਲ ਸੰਪਰਕ ਕਰੋ।"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_message_setup" msgid="6817326798834882531">"ਆਪਣੇ ਫ਼ੋਨ ਨੂੰ ਅਣਲਾਕ ਕਰਨ ਲਈ ਜਾਂ ਖਰੀਦਾਂ ਨੂੰ ਮਨਜ਼ੂਰ ਕਰਨ ਲਈ ਆਪਣੇ ਫਿੰਗਰਪ੍ਰਿੰਟ ਦੀ ਵਰਤੋਂ ਕਰੋ। \n\n ਨੋਟ ਕਰੋ: ਤੁਹਾਡਾ ਫਿੰਗਰਪ੍ਰਿੰਟ ਇੱਕ ਮਜ਼ਬੂਤ ਪੈਟਰਨ ਜਾਂ ਪਿੰਨ ਤੋਂ ਘੱਟ ਸੁਰੱਖਿਅਤ ਹੋ ਸਕਦਾ ਹੈ।"</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel" msgid="3199351118385606526">"ਰੱਦ ਕਰੋ"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue" msgid="7472492858148162530">"ਜਾਰੀ ਰੱਖੋ"</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel_setup" msgid="5021369420474432665">"ਛੱਡੋ"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue_setup" msgid="1961957425135180242">"ਅੱਗੇ"</string>
-    <string name="lock_screen_intro_skip_dialog_text_frp" product="tablet" msgid="1581834104051243425">"ਡੀਵਾਈਸ ਸੁਰੱਖਿਆ ਵਿਸ਼ੇਸ਼ਤਾਵਾਂ ਚਾਲੂ ਨਹੀਂ ਕੀਤੀਆਂ ਜਾਣਗੀਆਂ। ਜੇਕਰ ਤੁਹਾਡਾ ਟੈਬਲੈੱਟ ਗੁੰਮ ਹੋ ਜਾਂਦਾ ਹੈ, ਚੋਰੀ ਹੋ ਜਾਂਦਾ ਹੈ ਜਾਂ ਰੀਸੈੱਟ ਕੀਤਾ ਜਾਂਦਾ ਹੈ ਤਾਂ ਤੁਸੀਂ ਹੋਰਾਂ ਨੂੰ ਇਸਦੀ ਵਰਤੋਂ ਕਰਨ ਤੋਂ ਰੋਕਣ ਵਿੱਚ ਅਸਮਰੱਥ ਹੋੋਵੋਂਗੇ।"</string>
-    <string name="lock_screen_intro_skip_dialog_text_frp" product="device" msgid="4629503416877189572">"ਡੀਵਾਈਸ ਸੁਰੱਖਿਆ ਵਿਸ਼ੇਸ਼ਤਾਵਾਂ ਚਾਲੂ ਨਹੀਂ ਕੀਤੀਆਂ ਜਾਣਗੀਆਂ। ਜੇਕਰ ਤੁਹਾਡੀ ਡੀਵਾਈਸ ਗੁੰਮ, ਚੋਰੀ ਹੋ ਜਾਂਦੀ ਹੈ ਜਾਂ ਰੀਸੈੱਟ ਕੀਤੀ ਜਾਂਦੀ ਹੈ ਤਾਂ ਤੁਸੀਂ ਹੋਰਾਂ ਨੂੰ ਇਸਦੀ ਵਰਤੋਂ ਕਰਨ ਤੋਂ ਰੋਕਣ ਵਿੱਚ ਅਸਮਰੱਥ ਹੋੋਵੋਂਗੇ।"</string>
-    <string name="lock_screen_intro_skip_dialog_text_frp" product="default" msgid="2423428240245737909">"ਡੀਵਾਈਸ ਸੁਰੱਖਿਆ ਵਿਸ਼ੇਸ਼ਤਾਵਾਂ ਚਾਲੂ ਨਹੀਂ ਕੀਤੀਆਂ ਜਾਣਗੀਆਂ। ਜੇਕਰ ਤੁਹਾਡਾ ਫ਼ੋਨ ਗੁੰਮ, ਚੋਰੀ ਹੋ ਜਾਂਦਾ ਹੈ ਜਾਂ ਰੀਸੈੱਟ ਕੀਤਾ ਜਾਂਦਾ ਹੈ ਤਾਂ ਤੁਸੀਂ ਹੋਰਾਂ ਨੂੰ ਇਸਦੀ ਦੀ ਵਰਤੋਂ ਕਰਨ ਤੋਂ ਰੋਕਣ ਵਿੱਚ ਅਸਮਰੱਥ ਹੋੋਵੋਂਗੇ।"</string>
-    <string name="lock_screen_intro_skip_dialog_text" product="tablet" msgid="5219287483885558525">"ਡੀਵਾਈਸ ਸੁਰੱਖਿਆ ਵਿਸ਼ੇਸ਼ਤਾਵਾਂ ਚਾਲੂ ਨਹੀਂ ਕੀਤੀਆਂ ਜਾਣਗੀਆਂ। ਜੇਕਰ ਤੁਹਾਡਾ ਟੈਬਲੈੱਟ ਗੁੰਮ ਜਾਂ ਚੋਰੀ ਹੋ ਜਾਂਦਾ ਹੈ ਤਾਂ ਤੁਸੀਂ ਹੋਰਾਂ ਨੂੰ ਇਸਦੀ ਵਰਤੋਂ ਕਰਨ ਤੋਂ ਰੋਕਣ ਵਿੱਚ ਅਸਮਰੱਥ ਹੋੋਵੋਂਗੇ।"</string>
-    <string name="lock_screen_intro_skip_dialog_text" product="device" msgid="1466238255429527112">"ਡੀਵਾਈਸ ਸੁਰੱਖਿਆ ਵਿਸ਼ੇਸ਼ਤਾਵਾਂ ਚਾਲੂ ਨਹੀਂ ਕੀਤੀਆਂ ਜਾਣਗੀਆਂ। ਜੇਕਰ ਤੁਹਾਡੀ ਡੀਵਾਈਸ ਗੁੰਮ ਜਾਂ ਚੋਰੀ ਹੋ ਜਾਂਦੀ ਹੈ ਤਾਂ ਤੁਸੀਂ ਹੋਰਾਂ ਨੂੰ ਇਸਦੀ ਵਰਤੋਂ ਕਰਨ ਤੋਂ ਰੋਕਣ ਵਿੱਚ ਅਸਮਰੱਥ ਹੋੋਵੋਂਗੇ।"</string>
-    <string name="lock_screen_intro_skip_dialog_text" product="default" msgid="3008526710555416125">"ਡੀਵਾਈਸ ਸੁਰੱਖਿਆ ਵਿਸ਼ੇਸ਼ਤਾਵਾਂ ਚਾਲੂ ਨਹੀਂ ਕੀਤੀਆਂ ਜਾਣਗੀਆਂ। ਜੇਕਰ ਤੁਹਾਡਾ ਫ਼ੋਨ ਗੁੰਮ ਜਾਂ ਚੋਰੀ ਹੋ ਜਾਂਦਾ ਹੈ ਤਾਂ ਤੁਸੀਂ ਹੋਰਾਂ ਨੂੰ ਇਸਦੀ ਵਰਤੋਂ ਕਰਨ ਤੋਂ ਰੋਕਣ ਵਿੱਚ ਅਸਮਰੱਥ ਹੋੋਵੋਂਗੇ।"</string>
+    <string name="setup_fingerprint_enroll_skip_title" msgid="362050541117362034">"ਕੀ ਫਿੰਗਰਪ੍ਰਿੰਟ ਛੱਡਣਾ ਹੈ?"</string>
+    <string name="setup_fingerprint_enroll_skip_after_adding_lock_text" msgid="958990414356204763">"ਫਿੰਗਰਪ੍ਰਿੰਟ ਸਥਾਪਨਾ ਵਿੱਚ ਸਿਰਫ਼ ਇੱਕ ਜਾਂ ਦੋ ਮਿੰਟ ਲੱਗਦੇ ਹਨ। ਜੇਕਰ ਤੁਸੀਂ ਇਸ ਨੂੰ ਛੱਡ ਦਿੰਦੇ ਹੋ, ਤਾਂ ਤੁਸੀਂ ਬਾਅਦ ਵਿੱਚ ਸੈਟਿੰਗਾਂ ਵਿੱਚ ਆਪਣੇ ਫਿੰਗਰਪ੍ਰਿੰਟ ਸ਼ਾਮਲ ਕਰ ਸਕਦੇ ਹੋ।"</string>
+    <string name="lock_screen_intro_skip_title" msgid="4988210105913705679">"ਕੀ ਸਕ੍ਰੀਨ  ਲਾਕ  ਨੂੰ ਛੱਡਣਾ ਹੈ?"</string>
+    <string name="lock_screen_intro_skip_dialog_text_frp" product="tablet" msgid="1581834104051243425">"ਡੀਵਾਈਸ ਸੁਰੱਖਿਆ ਵਿਸ਼ੇਸ਼ਤਾਵਾਂ ਚਾਲੂ ਨਹੀਂ ਕੀਤੀਆਂ ਜਾਣਗੀਆਂ। ਜੇਕਰ ਤੁਹਾਡਾ ਟੈਬਲੈੱਟ ਗੁੰਮ ਹੋ ਜਾਂਦਾ ਹੈ, ਚੋਰੀ ਹੋ ਜਾਂਦਾ ਹੈ ਜਾਂ ਰੀਸੈੱਟ ਕੀਤਾ ਜਾਂਦਾ ਹੈ ਤਾਂ ਤੁਸੀਂ ਹੋਰਾਂ ਨੂੰ ਇਸਦੀ ਵਰਤੋਂ ਕਰਨ ਤੋਂ ਰੋਕਣ ਵਿੱਚ ਅਸਮਰੱਥ ਹੋੋਵੋਗੇ।"</string>
+    <string name="lock_screen_intro_skip_dialog_text_frp" product="device" msgid="4629503416877189572">"ਡੀਵਾਈਸ ਸੁਰੱਖਿਆ ਵਿਸ਼ੇਸ਼ਤਾਵਾਂ ਚਾਲੂ ਨਹੀਂ ਕੀਤੀਆਂ ਜਾਣਗੀਆਂ। ਜੇਕਰ ਤੁਹਾਡਾ ਡੀਵਾਈਸ ਗੁੰਮ, ਚੋਰੀ ਹੋ ਜਾਂਦਾ ਹੈ ਜਾਂ ਰੀਸੈੱਟ ਕੀਤਾ ਜਾਂਦਾ ਹੈ ਤਾਂ ਤੁਸੀਂ ਹੋਰਾਂ ਨੂੰ ਇਸਦੀ ਵਰਤੋਂ ਕਰਨ ਤੋਂ ਰੋਕਣ ਵਿੱਚ ਅਸਮਰੱਥ ਹੋੋਵੋਗੇ।"</string>
+    <string name="lock_screen_intro_skip_dialog_text_frp" product="default" msgid="2423428240245737909">"ਡੀਵਾਈਸ ਸੁਰੱਖਿਆ ਵਿਸ਼ੇਸ਼ਤਾਵਾਂ ਚਾਲੂ ਨਹੀਂ ਕੀਤੀਆਂ ਜਾਣਗੀਆਂ। ਜੇਕਰ ਤੁਹਾਡਾ ਫ਼ੋਨ ਗੁੰਮ, ਚੋਰੀ ਹੋ ਜਾਂਦਾ ਹੈ ਜਾਂ ਰੀਸੈੱਟ ਕੀਤਾ ਜਾਂਦਾ ਹੈ ਤਾਂ ਤੁਸੀਂ ਹੋਰਾਂ ਨੂੰ ਇਸਦੀ ਦੀ ਵਰਤੋਂ ਕਰਨ ਤੋਂ ਰੋਕਣ ਵਿੱਚ ਅਸਮਰੱਥ ਹੋੋਵੋਗੇ।"</string>
+    <string name="lock_screen_intro_skip_dialog_text" product="tablet" msgid="5219287483885558525">"ਡੀਵਾਈਸ ਸੁਰੱਖਿਆ ਵਿਸ਼ੇਸ਼ਤਾਵਾਂ ਚਾਲੂ ਨਹੀਂ ਕੀਤੀਆਂ ਜਾਣਗੀਆਂ। ਜੇਕਰ ਤੁਹਾਡਾ ਟੈਬਲੈੱਟ ਗੁੰਮ ਜਾਂ ਚੋਰੀ ਹੋ ਜਾਂਦਾ ਹੈ ਤਾਂ ਤੁਸੀਂ ਹੋਰਾਂ ਨੂੰ ਇਸਦੀ ਵਰਤੋਂ ਕਰਨ ਤੋਂ ਰੋਕਣ ਵਿੱਚ ਅਸਮਰੱਥ ਹੋੋਵੋਗੇ।"</string>
+    <string name="lock_screen_intro_skip_dialog_text" product="device" msgid="1466238255429527112">"ਡੀਵਾਈਸ ਸੁਰੱਖਿਆ ਵਿਸ਼ੇਸ਼ਤਾਵਾਂ ਚਾਲੂ ਨਹੀਂ ਕੀਤੀਆਂ ਜਾਣਗੀਆਂ। ਜੇਕਰ ਤੁਹਾਡਾ ਡੀਵਾਈਸ ਗੁੰਮ ਜਾਂ ਚੋਰੀ ਹੋ ਜਾਂਦਾ ਹੈ ਤਾਂ ਤੁਸੀਂ ਹੋਰਾਂ ਨੂੰ ਇਸਦੀ ਵਰਤੋਂ ਕਰਨ ਤੋਂ ਰੋਕਣ ਵਿੱਚ ਅਸਮਰੱਥ ਹੋੋਵੋਗੇ।"</string>
+    <string name="lock_screen_intro_skip_dialog_text" product="default" msgid="3008526710555416125">"ਡੀਵਾਈਸ ਸੁਰੱਖਿਆ ਵਿਸ਼ੇਸ਼ਤਾਵਾਂ ਚਾਲੂ ਨਹੀਂ ਕੀਤੀਆਂ ਜਾਣਗੀਆਂ। ਜੇਕਰ ਤੁਹਾਡਾ ਫ਼ੋਨ ਗੁੰਮ ਜਾਂ ਚੋਰੀ ਹੋ ਜਾਂਦਾ ਹੈ ਤਾਂ ਤੁਸੀਂ ਹੋਰਾਂ ਨੂੰ ਇਸਦੀ ਵਰਤੋਂ ਕਰਨ ਤੋਂ ਰੋਕਣ ਵਿੱਚ ਅਸਮਰੱਥ ਹੋੋਵੋਗੇ।"</string>
     <string name="skip_anyway_button_label" msgid="2323522873558834513">"ਫੇਰ ਵੀ ਛੱਡੋ"</string>
     <string name="go_back_button_label" msgid="4745265266186209467">"ਵਾਪਸ ਜਾਓ"</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_title" msgid="3051496861358227199">"ਸੈਂਸਰ ਨੂੰ ਸਪੱਰਸ਼ ਕਰੋ"</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_message" msgid="8793966374365960368">"ਇਹ ਤੁਹਾਡੇ ਫ਼ੋਨ ਦੇ ਪਿਛਲੇ ਪਾਸੇ ਹੈ। ਆਪਣੀ ਪਹਿਲੀ ਉਂਗਲ ਦੀ ਵਰਤੋਂ ਕਰੋ।"</string>
-    <string name="security_settings_fingerprint_enroll_find_sensor_content_description" msgid="2058830032070449160">"ਡੀਵਾਈਸ ਵਾਲੀ ਤਸਵੀਰ ਅਤੇ ਫ਼ਿੰਗਰਪ੍ਰਿੰਟ ਸੈਂਸਰ ਸਥਾਨ"</string>
+    <string name="security_settings_fingerprint_enroll_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>
@@ -391,164 +395,172 @@
     <string name="security_settings_fingerprint_enroll_start_message" msgid="3909929328942564524">"ਆਪਣੀ ਉਂਗਲ ਨੂੰ ਸੰਵੇਦਕ ’ਤੇ ਰੱਖੋ ਅਤੇ ਇੱਕ ਕੰਪਨ ਮਹਿਸੂਸ ਹੋਣ ਤੋਂ ਬਾਅਦ ਚੁੱਕ ਲਵੋ"</string>
     <string name="security_settings_fingerprint_enroll_repeat_title" msgid="2819679722403209778">"ਚੁੱਕੋ, ਫਿਰ ਦੁਬਾਰਾ ਸਪੱਰਸ਼ ਕਰੋ"</string>
     <string name="security_settings_fingerprint_enroll_repeat_message" msgid="6158989350522518586">"ਆਪਣੇ ਫਿੰਗਰਪ੍ਰਿੰਟ ਦੇ ਵੱਖ-ਵੱਖ ਭਾਗਾਂ ਨੂੰ ਸ਼ਾਮਲ ਕਰਨ ਲਈ ਆਪਣੀ ਉਂਗਲ ਨੂੰ ਰੱਖਣਾ-ਚੁੱਕਣਾ ਜਾਰੀ ਰੱਖੋ"</string>
-    <string name="security_settings_fingerprint_enroll_finish_title" msgid="7567276170287972230">"ਫਿੰਗਰਪ੍ਰਿੰਟ ਸ਼ਾਮਲ ਕੀਤਾ ਗਿਆ"</string>
+    <string name="security_settings_fingerprint_enroll_finish_title" msgid="7567276170287972230">"ਫਿੰਗਰਪ੍ਰਿੰਟ ਸ਼ਾਮਲ ਹੋ ਗਿਆ"</string>
     <string name="security_settings_fingerprint_enroll_finish_message" msgid="4796715961273420536">"ਜਦ ਤੁਹਾਨੂੰ ਇਹ ਪ੍ਰਤੀਕ ਦਿਖਾਈ ਦਿੰਦਾ ਹੈ, ਤਾਂ ਪਛਾਣ ਕਰਨ ਜਾਂ ਖਰੀਦਾਂ ਨੂੰ ਮਨਜ਼ੂਰ ਕਰਨ ਲਈ ਆਪਣੇ ਫਿੰਗਰਪ੍ਰਿੰਟ ਦੀ ਵਰਤੋਂ ਕਰੋ।"</string>
     <string name="security_settings_fingerprint_enroll_enrolling_skip" msgid="3710211704052369752">"ਇਸਨੂੰ ਬਾਅਦ ਵਿੱਚ ਕਰੋ"</string>
     <string name="setup_fingerprint_enroll_enrolling_skip_title" msgid="6808422329107426923">"ਕੀ ਫਿੰਗਰਪ੍ਰਿੰਟ ਸੈਟਅਪ ਛੱਡਣਾ ਹੈ?"</string>
-    <string name="setup_fingerprint_enroll_enrolling_skip_message" msgid="274849306857859783">"ਤੁਸੀਂ ਆਪਣੇ ਫ਼ੋਨ ਨੂੰ ਅਨਲੌਕ ਕਰਨ ਦਾ ਇੱਕ ਤਰੀਕਾ ਆਪਣੇ ਉਂਗਲਾਂ ਦੇ ਨਿਸ਼ਾਨ ਦਾ ਉਪਯੋਗ ਕਰਨਾ ਚੁਣਿਆ ਹੈ। ਜੇਕਰ ਤੁਸੀਂ ਹੁਣੇ ਇਸਨੂੰ ਛੱਡਦੇ ਹੋ, ਤਾਂ ਤੁਹਾਨੂੰ ਇਹ ਬਾਅਦ ਵਿੱਚ ਸਥਾਪਿਤ ਕਰਨ ਦੀ ਲੋੜ ਹੋਵੇਗੀ। ਸੈੱਟਅੱਪ ਸਿਰਫ਼ ਇੱਕ ਮਿੰਟ ਲੈਂਦਾ ਹੈ।"</string>
-    <string name="security_settings_fingerprint_enroll_setup_screen_lock" msgid="1195743489835505376">"ਸਕ੍ਰੀਨ ਲੌਕ ਸੈੱਟਅੱਪ ਕਰੋ"</string>
+    <string name="setup_fingerprint_enroll_enrolling_skip_message" msgid="274849306857859783">"ਤੁਸੀਂ ਆਪਣੇ ਫ਼ੋਨ ਨੂੰ ਅਣਲਾਕ ਕਰਨ ਦਾ ਇੱਕ ਤਰੀਕਾ ਆਪਣੇ ਉਂਗਲਾਂ ਦੇ ਨਿਸ਼ਾਨ ਦੀ ਵਰਤੋਂ ਕਰਨਾ ਚੁਣਿਆ ਹੈ। ਜੇਕਰ ਤੁਸੀਂ ਹੁਣੇ ਇਸਨੂੰ ਛੱਡਦੇ ਹੋ, ਤਾਂ ਤੁਹਾਨੂੰ ਇਹ ਬਾਅਦ ਵਿੱਚ ਸਥਾਪਿਤ ਕਰਨ ਦੀ ਲੋੜ ਹੋਵੇਗੀ। ਸੈੱਟਅੱਪ ਸਿਰਫ਼ ਇੱਕ ਮਿੰਟ ਲੈਂਦਾ ਹੈ।"</string>
+    <string name="security_settings_fingerprint_enroll_setup_screen_lock" msgid="1195743489835505376">"ਸਕ੍ਰੀਨ  ਲਾਕ  ਸੈੱਟਅੱਪ ਕਰੋ"</string>
     <string name="security_settings_fingerprint_enroll_done" msgid="4014607378328187567">"ਹੋ ਗਿਆ"</string>
     <string name="security_settings_fingerprint_enroll_touch_dialog_title" msgid="1863561601428695160">"ਓਹੋ, ਉਹ ਸੈਂਸਰ ਨਹੀਂ ਹੈ"</string>
-    <string name="security_settings_fingerprint_enroll_touch_dialog_message" msgid="2989019978041986175">"ਫ਼ੋਨ ਦੇ ਪਿਛਲੇ ਪਾਸੇ ਸੈਂਸਰ ਨੂੰ ਸਪੱਰਸ਼ ਕਰੋ। ਪਹਿਲੀ ਉਂਗਲ ਵਰਤੋ।"</string>
+    <string name="security_settings_fingerprint_enroll_touch_dialog_message" msgid="2989019978041986175">"ਫ਼ੋਨ ਦੇ ਪਿਛਲੇ ਪਾਸੇ ਸੈਂਸਰ ਨੂੰ ਸਪਰਸ਼ ਕਰੋ। ਪਹਿਲੀ ਉਂਗਲ ਵਰਤੋ।"</string>
     <string name="security_settings_fingerprint_enroll_error_dialog_title" msgid="3618021988442639280">"ਦਾਖਲਾ ਪੂਰਾ ਨਾ ਕੀਤਾ ਗਿਆ"</string>
     <string name="security_settings_fingerprint_enroll_error_timeout_dialog_message" msgid="2942551158278899627">"ਫਿੰਗਰਪ੍ਰਿੰਟ ਦਾਖ਼ਲੇ ਦੀ ਸਮਾਂ ਸੀਮਾ ਪੂਰੀ ਹੋ ਗਈ। ਦੁਬਾਰਾ ਕੋਸ਼ਿਸ਼ ਕਰੋ।"</string>
     <string name="security_settings_fingerprint_enroll_error_generic_dialog_message" msgid="3624760637222239293">"ਫਿੰਗਰਪ੍ਰਿੰਟ ਦਾਖ਼ਲੇ ਨੇ ਕੰਮ ਨਹੀਂ ਕੀਤਾ। ਦੁਬਾਰਾ ਕੋਸ਼ਿਸ਼ ਕਰੋ ਜਾਂ ਕੋਈ ਵੱਖਰੀ ਉਂਗਲ ਉਪਯੋਗ ਕਰੋ।"</string>
     <string name="fingerprint_enroll_button_add" msgid="6317978977419045463">"ਇੱਕ ਹੋਰ ਸ਼ਾਮਲ ਕਰੋ"</string>
     <string name="fingerprint_enroll_button_next" msgid="6247009337616342759">"ਅੱਗੇ"</string>
-    <string name="security_settings_fingerprint_enroll_disclaimer" msgid="2624905914239271751">"ਤੁਹਾਡੇ ਫ਼ੋਨ ਨੂੰ ਅਨਲੌਕ ਕਰਨ ਤੋਂ ਇਲਾਵਾ, ਤੁਸੀਂ ਖਰੀਦਾਰੀਆਂ ਅਤੇ ਐਪ ਐਕਸੈਸ ਨੂੰ ਪ੍ਰਮਾਣਿਤ ਕਰਨ ਲਈ ਆਪਣੇ ਫਿੰਗਰਪ੍ਰਿੰਟ ਦਾ ਉਪਯੋਗ ਵੀ ਕਰ ਸਕਦੇ ਹੋ। "<annotation id="url">"ਹੋਰ ਜਾਣੋ"</annotation></string>
-    <string name="security_settings_fingerprint_enroll_disclaimer_lockscreen_disabled" msgid="7846871823167357942">" ਸਕ੍ਰੀਨ ਲੌਕ ਵਿਕਲਪ ਨੂੰ ਅਯੋਗ ਬਣਾਇਆ ਗਿਆ ਹੈ। ਹੋਰ ਜਾਣਕਾਰੀ ਲਈ, ਆਪਣੀ ਸੰਸਥਾ ਦੇ ਪ੍ਰਸ਼ਾਸਕ ਨਾਲ ਸੰਪਰਕ ਕਰੋ। "<annotation id="admin_details">"ਹੋਰ ਵੇਰਵੇ"</annotation>\n\n"ਤੁਸੀਂ ਖਰੀਦਾਂ ਨੂੰ ਅਧਿਕਾਰਿਤ ਕਰਨ ਅਤੇ ਐਪ \'ਤੇ ਪਹੁੰਚ ਕਰਨ ਲਈ ਹਾਲੇ ਵੀ ਆਪਣੇ ਫਿੰਗਰਪ੍ਰਿੰਟ ਦੀ ਵਰਤੋਂ ਕਰ ਸਕਦੇ ਹੋ। "<annotation id="url">"ਹੋਰ ਜਾਣੋ"</annotation></string>
+    <string name="security_settings_fingerprint_enroll_disclaimer" msgid="2624905914239271751">"ਤੁਹਾਡੇ ਫ਼ੋਨ ਨੂੰ ਅਣਲਾਕ ਕਰਨ ਤੋਂ ਇਲਾਵਾ, ਤੁਸੀਂ ਖਰੀਦਾਰੀਆਂ ਅਤੇ ਐਪ ਪਹੁੰਚ ਨੂੰ ਪ੍ਰਮਾਣਿਤ ਕਰਨ ਲਈ ਆਪਣੇ ਫਿੰਗਰਪ੍ਰਿੰਟ ਦੀ ਵਰਤੋਂ ਵੀ ਕਰ ਸਕਦੇ ਹੋ। "<annotation id="url">"ਹੋਰ ਜਾਣੋ"</annotation></string>
+    <string name="security_settings_fingerprint_enroll_disclaimer_lockscreen_disabled" msgid="7846871823167357942">" ਸਕ੍ਰੀਨ ਲਾਕ ਵਿਕਲਪ ਨੂੰ ਅਯੋਗ ਬਣਾਇਆ ਗਿਆ ਹੈ। ਹੋਰ ਜਾਣਕਾਰੀ ਲਈ, ਆਪਣੀ ਸੰਸਥਾ ਦੇ ਪ੍ਰਸ਼ਾਸਕ ਨਾਲ ਸੰਪਰਕ ਕਰੋ। "<annotation id="admin_details">"ਹੋਰ ਵੇਰਵੇ"</annotation>\n\n"ਤੁਸੀਂ ਖਰੀਦਾਂ ਨੂੰ ਅਧਿਕਾਰਿਤ ਕਰਨ ਅਤੇ ਐਪ \'ਤੇ ਪਹੁੰਚ ਕਰਨ ਲਈ ਹਾਲੇ ਵੀ ਆਪਣੇ ਫਿੰਗਰਪ੍ਰਿੰਟ ਦੀ ਵਰਤੋਂ ਕਰ ਸਕਦੇ ਹੋ। "<annotation id="url">"ਹੋਰ ਜਾਣੋ"</annotation></string>
     <string name="security_settings_fingerprint_enroll_lift_touch_again" msgid="1888772560642539718">"ਉਂਗਲ ਚੁੱਕੋ, ਫਿਰ ਦੁਬਾਰਾ ਸੰਵੇਦਕ ਨੂੰ ਸਪੱਰਸ਼ ਕਰੋ"</string>
-    <string name="fingerprint_add_max" msgid="1020927549936895822">"ਤੁਸੀਂ <xliff:g id="COUNT">%d</xliff:g> ਤੱਕ ਫਿੰਗਰਪ੍ਰਿੰਟ ਜੋੜ ਸਕਦੇ ਹੋ"</string>
+    <string name="fingerprint_add_max" msgid="1020927549936895822">"ਤੁਸੀਂ <xliff:g id="COUNT">%d</xliff:g> ਤੱਕ ਫਿੰਗਰਪ੍ਰਿੰਟ ਸ਼ਾਮਲ ਕਰ ਸਕਦੇ ਹੋ"</string>
     <string name="fingerprint_intro_error_max" msgid="6864066984678078441">"ਤੁਸੀਂ ਫਿੰਗਰਪ੍ਰਿੰਟਾਂ ਦੀ ਅਧਿਕਤਮ ਸੰਖਿਆ ਨੂੰ ਸ਼ਾਮਲ ਕੀਤਾ ਹੋਇਆ ਹੈ"</string>
     <string name="fingerprint_intro_error_unknown" msgid="1905692132326523040">"ਹੋਰ ਫਿੰਗਰਪ੍ਰਿੰਟਾਂ ਨੂੰ ਸ਼ਾਮਲ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਦਾ"</string>
     <string name="fingerprint_last_delete_title" msgid="6410310101247028988">"ਕੀ ਸਾਰੇ ਫਿੰਗਰਪ੍ਰਿੰਟ ਹਟਾਉਣੇ ਹਨ?"</string>
     <string name="fingerprint_delete_title" msgid="1368196182612202898">"\'<xliff:g id="FINGERPRINT_ID">%1$s</xliff:g>\' ਨੂੰ ਹਟਾਓ"</string>
     <string name="fingerprint_delete_message" msgid="8597787803567398131">"ਕੀ ਤੁਸੀਂ ਇਸ ਫਿੰਗਰਪ੍ਰਿੰਟ ਨੂੰ ਮਿਟਾਉਣਾ ਚਾਹੁੰਦੇ ਹੋ?"</string>
-    <string name="fingerprint_last_delete_message" msgid="7852321001254275878">"ਤੁਸੀਂ ਆਪਣੇ ਫ਼ੋਨ ਨੂੰ ਅਨਲੌਕ ਕਰਨ, ਖਰੀਦਾਂ ਨੂੰ ਅਧਿਕਾਰਿਤ ਕਰਨ ਜਾਂ ਉਹਨਾਂ ਨਾਲ ਐਪਾਂ \'ਤੇ ਸਾਈਨ ਇਨ ਕਰਨ ਲਈ ਆਪਣੇ ਫਿੰਗਰਪ੍ਰਿੰਟਾਂ ਦੀ ਵਰਤੋਂ ਨਹੀਂ ਕਰ ਸਕੋਂਗੇ"</string>
-    <string name="fingerprint_last_delete_message_profile_challenge" msgid="6521520787746771912">"ਤੁਸੀਂ ਆਪਣੇ ਕਾਰਜ ਪ੍ਰੋਫਾਈਲ ਨੂੰ ਅਨਲੌਕ ਕਰਨ, ਖਰੀਦਾਂ ਨੂੰ ਅਧਿਕਾਰਿਤ ਕਰਨ ਜਾਂ ਕਾਰਜ ਐਪਾਂ \'ਤੇ ਸਾਈਨ ਇਨ ਕਰਨ ਲਈ ਆਪਣੇ ਫਿੰਗਰਪ੍ਰਿੰਟਾਂ ਦੀ ਵਰਤੋਂ ਨਹੀਂ ਕਰ ਸਕੋਂਗੇ"</string>
+    <string name="fingerprint_last_delete_message" msgid="7852321001254275878">"ਤੁਸੀਂ ਆਪਣੇ ਫ਼ੋਨ ਨੂੰ ਅਣਲਾਕ ਕਰਨ, ਖਰੀਦਾਂ ਨੂੰ ਅਧਿਕਾਰਿਤ ਕਰਨ ਜਾਂ ਉਹਨਾਂ ਨਾਲ ਐਪਾਂ \'ਤੇ ਸਾਈਨ-ਇਨ ਕਰਨ ਲਈ ਆਪਣੇ ਫਿੰਗਰਪ੍ਰਿੰਟਾਂ ਦੀ ਵਰਤੋਂ ਨਹੀਂ ਕਰ ਸਕੋਂਗੇ"</string>
+    <string name="fingerprint_last_delete_message_profile_challenge" msgid="6521520787746771912">"ਤੁਸੀਂ ਆਪਣੇ ਕਾਰਜ ਪ੍ਰੋਫਾਈਲ ਨੂੰ ਅਣਲਾਕ ਕਰਨ, ਖਰੀਦਾਂ ਨੂੰ ਅਧਿਕਾਰਿਤ ਕਰਨ ਜਾਂ ਕਾਰਜ ਐਪਾਂ \'ਤੇ ਸਾਈਨ-ਇਨ ਕਰਨ ਲਈ ਆਪਣੇ ਫਿੰਗਰਪ੍ਰਿੰਟਾਂ ਦੀ ਵਰਤੋਂ ਨਹੀਂ ਕਰ ਸਕੋਂਗੇ"</string>
     <string name="fingerprint_last_delete_confirm" msgid="2634726361059274289">"ਹਾਂ, ਹਟਾਓ"</string>
     <string name="confirm_fingerprint_icon_content_description" msgid="5255544532157079096">"ਜਾਰੀ ਰੱਖਣ ਲਈ ਆਪਣਾ ਫਿੰਗਰਪ੍ਰਿੰਟ ਵਰਤੋ।"</string>
     <string name="crypt_keeper_settings_title" msgid="4219233835490520414">"ਇਨਕ੍ਰਿਪਸ਼ਨ"</string>
-    <string name="crypt_keeper_encrypt_title" product="tablet" msgid="1060273569887301457">"ਟੈਬਲੇਟ ਇਨਕ੍ਰਿਪਟ ਕਰੋ"</string>
-    <string name="crypt_keeper_encrypt_title" product="default" msgid="1878996487755806122">"ਫੋਨ ਇਨਕ੍ਰਿਪਟ ਕਰੋ"</string>
+    <string name="crypt_keeper_encrypt_title" product="tablet" msgid="1060273569887301457">"ਟੈਬਲੈੱਟ ਇਨਕ੍ਰਿਪਟ ਕਰੋ"</string>
+    <string name="crypt_keeper_encrypt_title" product="default" msgid="1878996487755806122">"ਫ਼ੋਨ ਇਨਕ੍ਰਿਪਟ ਕਰੋ"</string>
     <string name="crypt_keeper_encrypted_summary" msgid="1868233637888132906">"ਇਨਕ੍ਰਿਪਟ ਕੀਤਾ"</string>
-    <string name="crypt_keeper_desc" product="tablet" msgid="503014594435731275">"ਤੁਸੀਂ ਆਪਣੇ ਖਾਤੇ, ਸੈਟਿੰਗਾਂ. ਡਾਊਨਲੋਡ ਕੀਤੇ ਐਪਸ ਅਤੇ ਉਹਨਾਂ ਦਾ ਡੈਟਾ, ਮੀਡੀਆ ਅਤੇ ਹੋਰ ਫਾਈਲਾਂ ਇਨਕ੍ਰਿਪਟ ਕਰ ਸਕਦੇ ਹੋ। ਆਪਣੀ ਟੈਬਲੇਟ ਨੂੰ ਇਨਕ੍ਰਿਪਟ ਕਰਨ ਤੋਂ ਬਾਅਦ, ਇਹ ਮੰਨਦੇ ਹੋਏ ਕਿ ਤੁਸੀਂ ਇੱਕ ਸਕ੍ਰੀਨ ਲੌਕ ਸੈਟ ਅਪ ਕੀਤਾ ਹੈ (ਮਤਲਬ, ਇੱਕ ਪੈਟਰਨ ਜਾਂ ਸੰਖਿਆਤਮਿਕ 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_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">"ਕੋਈ ਲੌਕ ਸਕ੍ਰੀਨ PIN ਜਾਂ ਪਾਸਵਰਡ ਨਹੀਂ"</string>
-    <string name="crypt_keeper_dialog_need_password_message" msgid="4071395977297369642">"ਤੁਹਾਨੂੰ ਇਨਕ੍ਰਿਪਸ਼ਨ ਸ਼ੁਰੂ ਸਕਣ ਤੋਂ ਪਹਿਲਾਂ ਇੱਕ ਲੌਕ ਸਕ੍ਰੀਨ PIN ਜਾਂ ਪਾਸਵਰਡ ਸੈਟ ਕਰਨ ਦੀ ਲੋੜ ਹੈ"</string>
+    <string name="crypt_keeper_unplugged_text" msgid="4785376766063053901">"ਆਪਣਾ ਚਾਰਜਰ ਪਲੱਗ-ਇਨ ਕਰੋ ਅਤੇ ਦੁਬਾਰਾ ਕੋਸ਼ਿਸ਼ ਕਰੋ।"</string>
+    <string name="crypt_keeper_dialog_need_password_title" msgid="4058971800557767">"ਕੋਈ ਲਾਕ ਸਕ੍ਰੀਨ ਪਿੰਨ ਜਾਂ ਪਾਸਵਰਡ ਨਹੀਂ"</string>
+    <string name="crypt_keeper_dialog_need_password_message" msgid="4071395977297369642">"ਤੁਹਾਨੂੰ ਇਨਕ੍ਰਿਪਸ਼ਨ ਸ਼ੁਰੂ ਕਰਨ ਤੋਂ ਪਹਿਲਾਂ ਇੱਕ ਲਾਕ ਸਕ੍ਰੀਨ ਪਿੰਨ ਜਾਂ ਪਾਸਵਰਡ ਸੈੱਟ ਕਰਨ ਦੀ ਲੋੜ ਹੈ"</string>
     <string name="crypt_keeper_confirm_title" msgid="5100339496381875522">"ਕੀ ਇਨਕ੍ਰਿਪਟ ਕਰਨਾ ਹੈ?"</string>
-    <string name="crypt_keeper_final_desc" product="tablet" msgid="517662068757620756">"ਇਨਕ੍ਰਿਪਸ਼ਨ ਓਪਰੇਸ਼ਨ ਅਬਦਲ ਹੈ ਅਤੇ ਜੇਕਰ ਤੁਸੀਂ ਇਸਨੂੰ ਰੋਕਦੇ ਹੋ, ਤਾਂ ਤੁਹਾਡਾ ਡੈਟਾ ਨਸ਼ਟ ਹੋ ਜਾਏਗਾ। ਇਨਕ੍ਰਿਪਸ਼ਨ ਵਿੱਚ ਇੱਕ ਘੰਟਾ ਜਾਂ ਇਸਤੋਂ ਵੱਧ ਸਮਾਂ ਲੱਗਦਾ ਹੈ, ਜਿਸਦੇ ਦੌਰਾਨ ਟੈਬਲੇਟ ਕਈ ਵਾਰ ਰੀਸਟਾਰਟ ਹੋਵੇਗੀ।"</string>
-    <string name="crypt_keeper_final_desc" product="default" msgid="287503113671320916">"ਇਨਕ੍ਰਿਪਸ਼ਨ ਓਪਰੇਸ਼ਨ ਅਬਦਲ ਹੈ ਅਤੇ ਜੇਕਰ ਤੁਸੀਂ ਇਸਨੂੰ ਰੋਕਦੇ ਹੋ, ਤਾਂ ਤੁਹਾਡਾ ਡੈਟਾ ਨਸ਼ਟ ਹੋ ਜਾਏਗਾ। ਇਨਕ੍ਰਿਪਸ਼ਨ ਵਿੱਚ ਇੱਕ ਘੰਟਾ ਜਾਂ ਇਸਤੋਂ ਵੱਧ ਸਮਾਂ ਲੱਗਦਾ ਹੈ, ਜਿਸਦੇ ਦੌਰਾਨ ਫੋਨ ਕਈ ਵਾਰ ਰੀਸਟਾਰਟ ਹੋਵੇਗਾ।"</string>
+    <string name="crypt_keeper_final_desc" product="tablet" msgid="517662068757620756">"ਇਨਕ੍ਰਿਪਸ਼ਨ ਓਪਰੇਸ਼ਨ ਅਬਦਲ ਹੈ ਅਤੇ ਜੇਕਰ ਤੁਸੀਂ ਇਸਨੂੰ ਰੋਕਦੇ ਹੋ, ਤਾਂ ਤੁਹਾਡਾ ਡਾਟਾ ਨਸ਼ਟ ਹੋ ਜਾਵੇਗਾ। ਇਨਕ੍ਰਿਪਸ਼ਨ ਵਿੱਚ ਇੱਕ ਘੰਟਾ ਜਾਂ ਇਸਤੋਂ ਵੱਧ ਸਮਾਂ ਲੱਗਦਾ ਹੈ, ਜਿਸਦੇ ਦੌਰਾਨ ਟੈਬਲੈੱਟ ਕਈ ਵਾਰ ਮੁੜ-ਚਾਲੂ ਹੋਵੇਗਾ।"</string>
+    <string name="crypt_keeper_final_desc" product="default" msgid="287503113671320916">"ਇਨਕ੍ਰਿਪਸ਼ਨ ਓਪਰੇਸ਼ਨ ਅਬਦਲ ਹੈ ਅਤੇ ਜੇਕਰ ਤੁਸੀਂ ਇਸਨੂੰ ਰੋਕਦੇ ਹੋ, ਤਾਂ ਤੁਹਾਡਾ ਡਾਟਾ ਨਸ਼ਟ ਹੋ ਜਾਏਗਾ। ਇਨਕ੍ਰਿਪਸ਼ਨ ਵਿੱਚ ਇੱਕ ਘੰਟਾ ਜਾਂ ਇਸਤੋਂ ਵੱਧ ਸਮਾਂ ਲੱਗਦਾ ਹੈ, ਜਿਸਦੇ ਦੌਰਾਨ ਫ਼ੋਨ ਕਈ ਵਾਰ ਰੀਸਟਾਰਟ ਹੋਵੇਗਾ।"</string>
     <string name="crypt_keeper_setup_title" msgid="1783951453124244969">"ਇਨਕ੍ਰਿਪਟ ਕਰ ਰਿਹਾ ਹੈ"</string>
-    <string name="crypt_keeper_setup_description" product="tablet" msgid="6689952371032099350">"ਜਦੋਂ ਤੁਹਾਡੀ ਟੈਬਲੇਟ ਇਨਕ੍ਰਿਪਟ ਕੀਤੀ ਜਾ ਰਹੀ ਹੋਵੇ ਤਾਂ ਠਹਿਰੋ। <xliff:g id="PERCENT">^1</xliff:g>% ਪੂਰਾ।"</string>
-    <string name="crypt_keeper_setup_description" product="default" msgid="951918761585534875">"ਜਦੋਂ ਤੁਹਾਡਾ ਫੋਨ ਇਨਕ੍ਰਿਪਟ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੋਵੇ ਤਾਂ ਠਹਿਰੋ। <xliff:g id="PERCENT">^1</xliff:g>% ਪੂਰਾ।"</string>
-    <string name="crypt_keeper_setup_time_remaining" product="tablet" msgid="1655047311546745695">"ਜਦੋਂ ਤੁਹਾਡੀ ਟੈਬਲੇਟ ਇਨਕ੍ਰਿਪਟ ਕੀਤੀ ਜਾ ਰਹੀ ਹੋਵੇ ਤਾਂ ਠਹਿਰੋ। ਬਾਕੀ ਸਮਾਂ: <xliff:g id="DURATION">^1</xliff:g>"</string>
-    <string name="crypt_keeper_setup_time_remaining" product="default" msgid="1862964662304683072">"ਜਦੋਂ ਤੁਹਾਡਾ ਫੋਨ ਇਨਕ੍ਰਿਪਟ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੋਵੇ ਤਂ ਠਹਿਰੋ। ਬਾਕੀ ਸਮਾਂ: <xliff:g id="DURATION">^1</xliff:g>"</string>
-    <string name="crypt_keeper_force_power_cycle" product="tablet" msgid="556504311511212648">"ਆਪਣੀ ਟੈਬਲੇਟ ਨੂੰ ਅਨਲੌਕ ਕਰਨ ਲਈ, ਇਸਨੂੰ ਬੰਦ ਕਰੋ ਅਤੇ ਫਿਰ ਚਾਲੂ ਕਰੋ।"</string>
-    <string name="crypt_keeper_force_power_cycle" product="default" msgid="1794353635603020327">"ਆਪਣਾ ਫੋਨ ਅਨਲੌਕ ਕਰਨ ਲਈ, ਇਸਨੂੰ ਬੰਦ ਅਤੇ ਫਿਰ ਚਾਲੂ ਕਰੋ।"</string>
-    <string name="crypt_keeper_warn_wipe" msgid="2738374897337991667">"ਚਿਤਾਵਨੀ: ਅਨਲੌਕ ਕੀਤੇ ਜਾਣ ਲਈ <xliff:g id="COUNT">^1</xliff:g> ਤੋਂ ਵੱਧ ਅਸਫਲ ਕੋਸ਼ਿਸ਼ਾਂ ਤੋਂ ਬਾਅਦ ਤੁਹਾਡੀ ਡੀਵਾਈਸ ਮਿਟਾ ਦਿੱਤੀ ਜਾਏਗੀ!"</string>
+    <string name="crypt_keeper_setup_description" product="tablet" msgid="6689952371032099350">"ਤੁਹਾਡਾ ਟੈਬਲੈੱਟ ਇਨਕ੍ਰਿਪਟ ਹੋਣ ਤਕ ਇੰਤਜ਼ਾਰ ਕਰੋ। <xliff:g id="PERCENT">^1</xliff:g> ਪੂਰਾ।"</string>
+    <string name="crypt_keeper_setup_description" product="default" msgid="951918761585534875">"ਜਦੋਂ ਤੁਹਾਡਾ ਫ਼ੋਨ ਇਨਕ੍ਰਿਪਟ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੋਵੇ ਤਾਂ ਠਹਿਰੋ। <xliff:g id="PERCENT">^1</xliff:g>% ਪੂਰਾ।"</string>
+    <string name="crypt_keeper_setup_time_remaining" product="tablet" msgid="1655047311546745695">"ਤੁਹਾਡਾ ਟੈਬਲੈੱਟ ਇਨਕ੍ਰਿਪਟ ਹੋਣ ਤਕ ਇੰਤਜ਼ਾਰ ਕਰੋ। ਬਾਕੀ ਸਮਾਂ: <xliff:g id="DURATION">^1</xliff:g>"</string>
+    <string name="crypt_keeper_setup_time_remaining" product="default" msgid="1862964662304683072">"ਜਦੋਂ ਤੁਹਾਡਾ ਫ਼ੋਨ ਇਨਕ੍ਰਿਪਟ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੋਵੇ ਤਂ ਠਹਿਰੋ। ਬਾਕੀ ਸਮਾਂ: <xliff:g id="DURATION">^1</xliff:g>"</string>
+    <string name="crypt_keeper_force_power_cycle" product="tablet" msgid="556504311511212648">"ਆਪਣੇ ਟੈਬਲੈੱਟ ਨੂੰ ਅਣਲਾਕ ਕਰਨ ਲਈ, ਇਸਨੂੰ ਬੰਦ ਕਰੋ ਅਤੇ ਫਿਰ ਚਾਲੂ ਕਰੋ।"</string>
+    <string name="crypt_keeper_force_power_cycle" product="default" msgid="1794353635603020327">"ਆਪਣਾ ਫ਼ੋਨ ਅਣਲਾਕ ਕਰਨ ਲਈ, ਇਸਨੂੰ ਬੰਦ ਅਤੇ ਫਿਰ ਚਾਲੂ ਕਰੋ।"</string>
+    <string name="crypt_keeper_warn_wipe" msgid="2738374897337991667">"ਚਿਤਾਵਨੀ: ਅਣਲਾਕ ਕੀਤੇ ਜਾਣ ਲਈ <xliff:g id="COUNT">^1</xliff:g> ਤੋਂ ਵੱਧ ਅਸਫਲ ਕੋਸ਼ਿਸ਼ਾਂ ਤੋਂ ਬਾਅਦ ਤੁਹਾਡਾ ਡੀਵਾਈਸ ਮਿਟਾ ਦਿੱਤਾ ਜਾਏਗਾ!"</string>
     <string name="crypt_keeper_enter_password" msgid="2223340178473871064">"ਆਪਣਾ ਪਾਸਵਰਡ ਟਾਈਪ ਕਰੋ"</string>
     <string name="crypt_keeper_failed_title" msgid="7133499413023075961">"ਇਨਕ੍ਰਿਪਸ਼ਨ ਅਸਫਲ"</string>
-    <string name="crypt_keeper_failed_summary" product="tablet" msgid="8219375738445017266">"ਇਨਕ੍ਰਿਪਸ਼ਨ ਰੋਕਿਆ ਗਿਆ ਸੀ ਅਤੇ ਪੂਰਾ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਦਾ। ਸਿੱਟੇ ਵਜੋਂ, ਤੁਹਾਡੀ ਟੈਬਲੇਟ ਤੇ ਡੈਟਾ ਹੁਣ ਪਹੁੰਚਯੋਗ ਨਹੀਂ ਹੈ। \n\n ਆਪਣੀ ਟੈਬਲੇਟ ਵਰਤਣਾ ਦੁਬਾਰਾ ਸ਼ੁਰੂ ਕਰਨ ਲਈ, ਤੁਹਾਨੂੰ ਇੱਕ ਫੈਕਟਰੀ ਰੀਸੈੱਟ ਕਰਨ ਦੀ ਲੋੜ ਹੈ। ਜਦੋਂ ਤੁਸੀਂ ਰੀਸੈੱਟ ਤੋਂ ਬਾਅਦ ਆਪਣੀ ਟੈਬਲੇਟ ਸੈਟ ਅਪ ਕਰਦੇ ਹੋ, ਤਾਂ ਤੁਹਾਡੇ ਕੋਲ ਉਹ ਕੋਈ ਵੀ ਡੈਟਾ ਰੀਸਟੋਰ ਕਰਨ ਦਾ ਮੌਕਾ ਹੁੰਦਾ ਹੈ, ਜੋ ਤੁਹਾਡੇ Google ਖਾਤੇ ਨਾਲ ਬੈਕ ਅਪ ਕੀਤਾ ਗਿਆ ਸੀ।"</string>
-    <string name="crypt_keeper_failed_summary" product="default" msgid="3270131542549577953">"ਇਨਕ੍ਰਿਪਸ਼ਨ ਰੋਕਿਆ ਗਿਆ ਸੀ ਅਤੇ ਪੂਰਾ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਦਾ। ਸਿੱਟੇ ਵਜੋਂ, ਤੁਹਾਡੇ ਫੋਨ ਤੇ ਡੈਟਾ ਹੁਣ ਪਹੁੰਚਯੋਗ ਨਹੀਂ ਹੈ। \n\nਆਪਣਾ ਫੋਨ ਵਰਤਣਾ ਦੁਬਾਰਾ ਸ਼ੁਰੂ ਕਰਨ ਲਈ, ਤੁਹਾਨੂੰ ਇੱਕ ਫੈਕਟਰੀ ਰੀਸੈੱਟ ਕਰਨ ਦੀ ਲੋੜ ਹੈ। ਜਦੋਂ ਤੁਸੀਂ ਰੀਸੈੱਟ ਤੋਂ ਬਾਅਦ ਆਪਣਾ ਫੋਨ ਸੈਟ ਅਪ ਕਰਦੇ ਹੋ, ਤਾਂ ਤੁਹਾਡੇ ਕੋਲ ਉਹ ਕੋਈ ਵੀ ਡੈਟਾ ਰੀਸਟੋਰ ਕਰਨ ਦਾ ਮੌਕਾ ਹੁੰਦਾ ਹੈ, ਜੋ ਤੁਹਾਡੇ Google ਖਾਤੇ ਨਾਲ ਬੈਕ ਅਪ ਕੀਤਾ ਗਿਆ ਸੀ।"</string>
+    <string name="crypt_keeper_failed_summary" product="tablet" msgid="8219375738445017266">"ਇਨਕ੍ਰਿਪਸ਼ਨ ਰੋਕਿਆ ਗਿਆ ਸੀ ਅਤੇ ਪੂਰਾ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਦਾ। ਸਿੱਟੇ ਵਜੋਂ, ਤੁਹਾਡੇ ਟੈਬਲੈੱਟ ਤੇ ਡਾਟਾ ਹੁਣ ਪਹੁੰਚਯੋਗ ਨਹੀਂ ਹੈ। \n\n ਆਪਣਾ ਟੈਬਲੈੱਟ ਵਰਤਣਾ ਦੁਬਾਰਾ ਸ਼ੁਰੂ ਕਰਨ ਲਈ, ਤੁਹਾਨੂੰ ਇੱਕ ਫੈਕਟਰੀ ਰੀਸੈੱਟ ਕਰਨ ਦੀ ਲੋੜ ਹੈ। ਜਦੋਂ ਤੁਸੀਂ ਰੀਸੈੱਟ ਤੋਂ ਬਾਅਦ ਆਪਣਾ ਟੈਬਲੈੱਟ ਸੈੱਟ ਅੱਪ ਕਰਦੇ ਹੋ, ਤਾਂ ਤੁਹਾਡੇ ਕੋਲ ਉਹ ਕੋਈ ਵੀ ਡਾਟਾ ਰੀਸਟੋਰ ਕਰਨ ਦਾ ਮੌਕਾ ਹੁੰਦਾ ਹੈ, ਜੋ ਤੁਹਾਡੇ Google ਖਾਤੇ ਨਾਲ ਬੈੱਕ ਅੱਪ ਕੀਤਾ ਗਿਆ ਸੀ।"</string>
+    <string name="crypt_keeper_failed_summary" product="default" msgid="3270131542549577953">"ਇਨਕ੍ਰਿਪਸ਼ਨ ਰੋਕਿਆ ਗਿਆ ਸੀ ਅਤੇ ਪੂਰਾ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਦਾ। ਸਿੱਟੇ ਵਜੋਂ, ਤੁਹਾਡੇ ਫ਼ੋਨ ਤੇ ਡਾਟਾ ਹੁਣ ਪਹੁੰਚਯੋਗ ਨਹੀਂ ਹੈ। \n\nਆਪਣਾ ਫ਼ੋਨ ਵਰਤਣਾ ਦੁਬਾਰਾ ਸ਼ੁਰੂ ਕਰਨ ਲਈ, ਤੁਹਾਨੂੰ ਇੱਕ ਫੈਕਟਰੀ ਰੀਸੈੱਟ ਕਰਨ ਦੀ ਲੋੜ ਹੈ। ਜਦੋਂ ਤੁਸੀਂ ਰੀਸੈੱਟ ਤੋਂ ਬਾਅਦ ਆਪਣਾ ਫ਼ੋਨ ਸੈੱਟ ਅੱਪ ਕਰਦੇ ਹੋ, ਤਾਂ ਤੁਹਾਡੇ ਕੋਲ ਉਹ ਕੋਈ ਵੀ ਡਾਟਾ ਰੀਸਟੋਰ ਕਰਨ ਦਾ ਮੌਕਾ ਹੁੰਦਾ ਹੈ, ਜੋ ਤੁਹਾਡੇ Google ਖਾਤੇ ਨਾਲ ਬੈਕ ਅੱਪ ਕੀਤਾ ਗਿਆ ਸੀ।"</string>
     <string name="crypt_keeper_data_corrupt_title" msgid="8759119849089795751">"ਡੀਕ੍ਰਿਪਸ਼ਨ ਅਸਫਲ"</string>
-    <string name="crypt_keeper_data_corrupt_summary" product="tablet" msgid="840107296925798402">"ਤੁਹਾਡੇ ਵੱਲੋਂ ਦਰਜ ਕੀਤਾ ਪਾਸਵਰਡ ਸਹੀ ਹੈ, ਪਰੰਤੂ ਅਫ਼ਸੋਸ ਨਾਲ ਡੈਟਾ ਕਰਪਟ ਹੈ। \n\nਆਪਣੀ ਟੈਬਲੈਟ ਵਰਤਣਾ ਦੁਬਾਰਾ ਸ਼ੁਰੂ ਕਰਨ ਲਈ, ਤੁਹਾਨੂੰ ਇੱਕ ਫੈਕਟਰੀ ਰੀਸੈੱਟ ਕਰਨ ਦੀ ਲੋੜ ਹੈ। ਜਦੋਂ ਤੁਸੀਂ ਰੀਸੈੱਟ ਤੋਂ ਬਾਅਦ ਆਪਣੀ ਟੈਬਲੇਟ ਸੈਟ ਅਪ ਕਰਦੇ ਹੋ, ਤਾਂ ਤੁਹਾਡੇ ਕੋਲ ਉਹ ਕੋਈ ਵੀ ਡੈਟਾ ਰੀਸਟੋਰ ਕਰਨ ਦਾ ਮੌਕਾ ਹੁੰਦਾ ਹੈ, ਜੋ ਤੁਹਾਡੇ Google ਖਾਤੇ ਨਾਲ ਬੈਕ ਅਪ ਕੀਤਾ ਗਿਆ ਸੀ।"</string>
-    <string name="crypt_keeper_data_corrupt_summary" product="default" msgid="8843311420059663824">"ਤੁਹਾਡੇ ਵੱਲੋਂ ਦਰਜ ਕੀਤਾ ਪਾਸਵਰਡ ਸਹੀ ਹੈ, ਪਰੰਤੂ ਅਫ਼ਸੋਸ ਨਾਲ ਡੈਟਾ ਕਰਪਟ ਹੈ। \n\nਆਪਣਾ ਫੋਨ ਵਰਤਣਾ ਦੁਬਾਰਾ ਸ਼ੁਰੂ ਕਰਨ ਲਈ, ਤੁਹਾਨੂੰ ਇੱਕ ਫੈਕਟਰੀ ਰੀਸੈੱਟ ਕਰਨ ਦੀ ਲੋੜ ਹੈ। ਜਦੋਂ ਤੁਸੀਂ ਰੀਸੈੱਟ ਤੋਂ ਬਾਅਦ ਆਪਣੀ ਟੈਬਲੇਟ ਸੈਟ ਅਪ ਕਰਦੇ ਹੋ, ਤਾਂ ਤੁਹਾਡੇ ਕੋਲ ਉਹ ਕੋਈ ਵੀ ਡੈਟਾ ਰੀਸਟੋਰ ਕਰਨ ਦਾ ਮੌਕਾ ਹੁੰਦਾ ਹੈ, ਜੋ ਤੁਹਾਡੇ Google ਖਾਤੇ ਨਾਲ ਬੈਕ ਅਪ ਕੀਤਾ ਗਿਆ ਸੀ।"</string>
-    <string name="crypt_keeper_switch_input_method" msgid="4168332125223483198">"ਇਨਪੁੱਟ ਵਿਧੀ ਬਦਲੋ"</string>
-    <string name="suggested_lock_settings_title" msgid="8971630898700461034">"ਸਕ੍ਰੀਨ ਲੌਕ ਸੈੱਟ ਕਰੋ"</string>
-    <string name="suggested_lock_settings_summary" msgid="8778462376012231110">"ਆਪਣੀ ਡੀਵਾਈਸ ਦੀ ਰੱਖਿਆ ਕਰੋ"</string>
+    <string name="crypt_keeper_data_corrupt_summary" product="tablet" msgid="840107296925798402">"ਤੁਹਾਡੇ ਵੱਲੋਂ ਦਰਜ ਕੀਤਾ ਪਾਸਵਰਡ ਸਹੀ ਹੈ, ਪਰੰਤੂ ਅਫ਼ਸੋਸ ਨਾਲ ਡਾਟਾ ਕਰਪਟ ਹੈ। \n\nਆਪਣੀ ਟੈਬਲੈੱਟ ਵਰਤਣਾ ਦੁਬਾਰਾ ਸ਼ੁਰੂ ਕਰਨ ਲਈ, ਤੁਹਾਨੂੰ ਇੱਕ ਫੈਕਟਰੀ ਰੀਸੈੱਟ ਕਰਨ ਦੀ ਲੋੜ ਹੈ। ਜਦੋਂ ਤੁਸੀਂ ਰੀਸੈੱਟ ਤੋਂ ਬਾਅਦ ਆਪਣੀ ਟੈਬਲੈੱਟ ਸੈੱਟ ਅੱਪ ਕਰਦੇ ਹੋ, ਤਾਂ ਤੁਹਾਡੇ ਕੋਲ ਉਹ ਕੋਈ ਵੀ ਡਾਟਾ ਰੀਸਟੋਰ ਕਰਨ ਦਾ ਮੌਕਾ ਹੁੰਦਾ ਹੈ, ਜੋ ਤੁਹਾਡੇ Google ਖਾਤੇ ਨਾਲ ਬੈਕ ਅੱਪ ਕੀਤਾ ਗਿਆ ਸੀ।"</string>
+    <string name="crypt_keeper_data_corrupt_summary" product="default" msgid="8843311420059663824">"ਤੁਹਾਡੇ ਵੱਲੋਂ ਦਰਜ ਕੀਤਾ ਪਾਸਵਰਡ ਸਹੀ ਹੈ, ਪਰੰਤੂ ਅਫ਼ਸੋਸ ਨਾਲ ਡਾਟਾ ਕਰਪਟ ਹੈ। \n\nਆਪਣਾ ਫ਼ੋਨ ਵਰਤਣਾ ਦੁਬਾਰਾ ਸ਼ੁਰੂ ਕਰਨ ਲਈ, ਤੁਹਾਨੂੰ ਇੱਕ ਫੈਕਟਰੀ ਰੀਸੈੱਟ ਕਰਨ ਦੀ ਲੋੜ ਹੈ। ਜਦੋਂ ਤੁਸੀਂ ਰੀਸੈੱਟ ਤੋਂ ਬਾਅਦ ਆਪਣੀ ਟੈਬਲੈੱਟ ਸੈੱਟ ਅੱਪ ਕਰਦੇ ਹੋ, ਤਾਂ ਤੁਹਾਡੇ ਕੋਲ ਉਹ ਕੋਈ ਵੀ ਡਾਟਾ ਰੀਸਟੋਰ ਕਰਨ ਦਾ ਮੌਕਾ ਹੁੰਦਾ ਹੈ, ਜੋ ਤੁਹਾਡੇ Google ਖਾਤੇ ਨਾਲ ਬੈਕ ਅੱਪ ਕੀਤਾ ਗਿਆ ਸੀ।"</string>
+    <string name="crypt_keeper_switch_input_method" msgid="4168332125223483198">"ਇਨਪੁੱਟ ਵਿਧੀ ਸਵਿੱਚ ਕਰੋ"</string>
+    <string name="suggested_lock_settings_title" msgid="8971630898700461034">"ਸਕ੍ਰੀਨ  ਲਾਕ  ਸੈੱਟ ਕਰੋ"</string>
+    <string name="suggested_lock_settings_summary" msgid="8778462376012231110">"ਆਪਣੇ ਡੀਵਾਈਸ ਦੀ ਰੱਖਿਆ ਕਰੋ"</string>
     <string name="suggested_fingerprint_lock_settings_title" msgid="3655973509619012084">"ਫਿੰਗਰਪ੍ਰਿੰਟ ਵਰਤੋ"</string>
-    <string name="suggested_fingerprint_lock_settings_summary" msgid="2149569133725273864">"ਆਪਣੇ ਫਿੰਗਰਪ੍ਰਿੰਟ ਨਾਲ ਅਨਲੌਕ ਕਰੋ"</string>
-    <string name="lock_settings_picker_title" msgid="1095755849152582712">"ਸਕ੍ਰੀਨ ਲੌਕ ਚੁਣੋ"</string>
-    <string name="lock_settings_picker_title_profile" msgid="8822511284992306796">"ਕੰਮ ਲੌਕ ਚੁਣੋ"</string>
-    <string name="setup_lock_settings_picker_title" product="tablet" msgid="90329443364067215">"ਆਪਣੇ ਟੈਬਲੈੱਟ ਦੀ ਰੱਖਿਆ ਕਰੋ"</string>
-    <string name="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="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="suggested_fingerprint_lock_settings_summary" msgid="2149569133725273864">"ਆਪਣੇ ਫਿੰਗਰਪ੍ਰਿੰਟ ਨਾਲ ਅਣਲਾਕ ਕਰੋ"</string>
+    <string name="lock_settings_picker_title" msgid="1095755849152582712">"ਸਕ੍ਰੀਨ  ਲਾਕ  ਚੁਣੋ"</string>
+    <string name="lock_settings_picker_title_profile" msgid="8822511284992306796">"ਕੰਮ  ਲਾਕ  ਚੁਣੋ"</string>
+    <string name="setup_lock_settings_picker_title" product="tablet" msgid="90329443364067215">"ਟੈਬਲੈੱਟ ਦੀ ਸੁਰੱਖਿਆ ਕਰੋ"</string>
+    <string name="setup_lock_settings_picker_title" product="device" msgid="2399952075134938929">"ਆਪਣੇ ਡੀਵਾਈਸ ਦੀ ਰੱਖਿਆ ਕਰੋ"</string>
+    <string name="setup_lock_settings_picker_title" product="default" msgid="1572244299605153324">"ਆਪਣੇ ਫ਼ੋਨ ਦੀ ਰੱਖਿਆ ਕਰੋ"</string>
+    <string name="lock_settings_picker_fingerprint_added_security_message" msgid="5768002109707648463">"ਵਾਧੂ ਸੁਰੱਖਿਆ ਲਈ, ਕੋਈ ਬੈਕਅੱਪ ਸਕ੍ਰੀਨ  ਲਾਕ  ਸੈੱਟ ਕਰੋ।"</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">"ਪੈਟਰਨ, PIN ਜਾਂ ਪਾਸਵਰਡ ਸੁਰੱਖਿਆ ਬਦਲੋ ਜਾਂ ਅਸਮਰੱਥ ਬਣਾਓ"</string>
-    <string name="unlock_set_unlock_launch_picker_enable_summary" msgid="4791110798817242301">"ਸਕ੍ਰੀਨ ਨੂੰ ਲੌਕ ਕਰਨ ਲਈ ਇੱਕ ਵਿਧੀ ਚੁਣੋ"</string>
+    <string name="unlock_set_unlock_launch_picker_title_profile" msgid="124176557311393483">"ਕਾਰਜ ਪ੍ਰੋਫਾਈਲ  ਲਾਕ"</string>
+    <string name="unlock_set_unlock_launch_picker_change_title" msgid="5045866882028324941">" ਲਾਕ  ਸਕ੍ਰੀਨ ਬਦਲੋ"</string>
+    <string name="unlock_set_unlock_launch_picker_change_summary" msgid="2790960639554590668">"ਪੈਟਰਨ, ਪਿੰਨ ਜਾਂ ਪਾਸਵਰਡ ਸੁਰੱਖਿਆ ਬਦਲੋ ਜਾਂ ਬੰਦ ਕਰੋ"</string>
+    <string name="unlock_set_unlock_launch_picker_enable_summary" msgid="4791110798817242301">"ਸਕ੍ਰੀਨ ਨੂੰ  ਲਾਕ  ਕਰਨ ਲਈ ਇੱਕ ਵਿਧੀ ਚੁਣੋ"</string>
     <string name="unlock_set_unlock_off_title" msgid="7117155352183088342">"ਕੋਈ ਨਹੀਂ"</string>
     <string name="unlock_set_unlock_off_summary" msgid="94361581669110415"></string>
     <string name="unlock_set_unlock_none_title" msgid="5679243878975864640">"ਸਵਾਈਪ ਕਰੋ"</string>
     <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">"PIN"</string>
+    <string name="unlock_set_unlock_pin_title" msgid="5846029709462329515">"ਪਿੰਨ"</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="current_screen_lock" msgid="4104091715420072219">"ਮੌਜੂਦਾ ਸਕ੍ਰੀਨ  ਲਾਕ"</string>
     <string name="fingerprint_unlock_set_unlock_pattern" msgid="4939057588092120368">"ਫਿੰਗਰਪ੍ਰਿੰਟ + ਪੈਟਰਨ"</string>
-    <string name="fingerprint_unlock_set_unlock_pin" msgid="8010746824051056986">"ਫਿੰਗਰਪ੍ਰਿੰਟ + PIN"</string>
+    <string name="fingerprint_unlock_set_unlock_pin" msgid="8010746824051056986">"ਫਿੰਗਰਪ੍ਰਿੰਟ + ਪਿੰਨ"</string>
     <string name="fingerprint_unlock_set_unlock_password" msgid="7351131075806338634">"ਫਿੰਗਰਪ੍ਰਿੰਟ + ਪਾਸਵਰਡ"</string>
     <string name="fingerprint_unlock_skip_fingerprint" msgid="1441077909803666681">"ਫਿੰਗਰਪ੍ਰਿੰਟ ਬਿਨਾਂ ਜਾਰੀ ਰੱਖੋ"</string>
-    <string name="fingerprint_unlock_title" msgid="2826226740306003991">"ਤੁਸੀਂ ਆਪਣੇ ਫਿੰਗਰਪ੍ਰਿੰਟ ਦੀ ਵਰਤੋਂ ਨਾਲ ਆਪਣੇ ਫ਼ੋਨ ਨੂੰ ਅਨਲੌਕ ਕਰ ਸਕਦੇ ਹੋ। ਸੁਰੱਖਿਆ ਲਈ, ਇਸ ਵਿਕਲਪ ਨੂੰ ਇੱਕ ਬੈਕਅੱਪ ਸਕ੍ਰੀਨ ਲੌਕ ਦੀ ਲੋੜ ਹੈ।"</string>
+    <string name="fingerprint_unlock_title" msgid="2826226740306003991">"ਤੁਸੀਂ ਆਪਣੇ ਫਿੰਗਰਪ੍ਰਿੰਟ ਦੀ ਵਰਤੋਂ ਨਾਲ ਆਪਣੇ ਫ਼ੋਨ ਨੂੰ ਅਣਲਾਕ ਕਰ ਸਕਦੇ ਹੋ। ਸੁਰੱਖਿਆ ਲਈ, ਇਸ ਵਿਕਲਪ ਨੂੰ ਇੱਕ ਬੈਕਅੱਪ ਸਕ੍ਰੀਨ ਲਾਕ ਦੀ ਲੋੜ ਹੈ।"</string>
     <string name="unlock_set_unlock_disabled_summary" msgid="2051593894736282302">"ਪ੍ਰਸ਼ਾਸਕ, ਇਨਕ੍ਰਿਪਸ਼ਨ ਨੀਤੀ ਜਾਂ ਕ੍ਰੀਡੈਂਸ਼ੀਅਲ ਸਟੋਰੇਜ ਵੱਲੋਂ ਅਯੋਗ ਬਣਾਇਆ ਗਿਆ"</string>
     <string name="unlock_set_unlock_mode_off" msgid="5881952274566013651">"ਕੋਈ ਨਹੀਂ"</string>
     <string name="unlock_set_unlock_mode_none" msgid="8467360084676871617">"ਸਵਾਈਪ ਕਰੋ"</string>
     <string name="unlock_set_unlock_mode_pattern" msgid="7837270780919299289">"ਪੈਟਰਨ"</string>
-    <string name="unlock_set_unlock_mode_pin" msgid="3541326261341386690">"PIN"</string>
+    <string name="unlock_set_unlock_mode_pin" msgid="3541326261341386690">"ਪਿੰਨ"</string>
     <string name="unlock_set_unlock_mode_password" msgid="1203938057264146610">"ਪਾਸਵਰਡ"</string>
-    <string name="unlock_setup_wizard_fingerprint_details" msgid="7893457665921363009">"ਜਦੋਂ ਤੁਸੀਂ ਇੱਕ ਸਕ੍ਰੀਨ ਲੌਕ ਸੈਟ ਅਪ ਕਰ ਲਓ, ਤਾਂ ਤੁਸੀਂ ਸੈਟਿੰਗਾਂ &gt; ਸੁਰੱਖਿਆ ਵਿੱਚ ਆਪਣਾ ਫਿੰਗਰਪ੍ਰਿੰਟ ਸੈਟ ਅਪ ਕਰ ਸਕਦੇ ਹੋ।"</string>
-    <string name="unlock_disable_lock_title" msgid="1427036227416979120">"ਸਕ੍ਰੀਨ ਲੌਕ ਬੰਦ ਕਰੋ"</string>
+    <string name="unlock_setup_wizard_fingerprint_details" msgid="7893457665921363009">"ਜਦੋਂ ਤੁਸੀਂ ਇੱਕ ਸਕ੍ਰੀਨ ਲਾਕ ਸੈੱਟ ਅੱਪ ਕਰ ਲਓ, ਤਾਂ ਤੁਸੀਂ ਸੈਟਿੰਗਾਂ &gt; ਸੁਰੱਖਿਆ ਵਿੱਚ ਆਪਣਾ ਫਿੰਗਰਪ੍ਰਿੰਟ ਵੀ ਸੈੱਟ ਅੱਪ ਕਰ ਸਕਦੇ ਹੋ।"</string>
+    <string name="unlock_disable_lock_title" msgid="1427036227416979120">"ਸਕ੍ਰੀਨ  ਲਾਕ  ਬੰਦ ਕਰੋ"</string>
     <string name="unlock_disable_frp_warning_title" msgid="264008934468492550">"ਕੀ ਡੀਵਾਈਸ ਸੁਰੱਖਿਆ ਨੂੰ ਹਟਾਉਣਾ ਹੈ?"</string>
     <string name="unlock_disable_frp_warning_title_profile" msgid="5507136301904313583">"ਕੀ ਪ੍ਰੋਫਾਈਲ ਰੱਖਿਆ ਹਟਾਉਣੀ ਹੈ?"</string>
     <string name="unlock_disable_frp_warning_content_pattern" msgid="8869767290771023461">"ਡੀਵਾਈਸ ਸੁਰੱਖਿਆ ਵਿਸ਼ੇਸ਼ਤਾਵਾਂ ਤੁਹਾਡੇ ਪੈਟਰਨ ਤੋਂ ਬਗੈਰ ਕੰਮ ਨਹੀਂ ਕਰਨਗੀਆਂ।"</string>
-    <!-- no translation found for unlock_disable_frp_warning_content_pattern_fingerprint (2986105377420905314) -->
-    <skip />
-    <string name="unlock_disable_frp_warning_content_pin" msgid="586996206210265131">"ਡੀਵਾਈਸ ਰੱਖਿਆ ਵਿਸ਼ੇਸ਼ਤਾਵਾਂ ਤੁਹਾਡੇ ਪਿੰਨ ਤੋਂ ਬਗੈਰ ਕੰਮ ਨਹੀਂ ਕਰਨਗੀਆਂ।"</string>
-    <!-- no translation found for unlock_disable_frp_warning_content_pin_fingerprint (3370462835533123695) -->
-    <skip />
+    <string name="unlock_disable_frp_warning_content_pattern_fingerprint" msgid="2986105377420905314">"ਡੀਵਾਈਸ ਸੁਰੱਖਿਆ ਵਿਸ਼ੇਸ਼ਤਾਵਾਂ ਤੁਹਾਡੇ ਪੈਟਰਨ ਤੋਂ ਬਗੈਰ ਕੰਮ ਨਹੀਂ ਕਰਨਗੀਆਂ।<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="3370462835533123695">"ਡੀਵਾਈਸ ਸੁਰੱਖਿਆ ਵਿਸ਼ੇਸ਼ਤਾਵਾਂ ਤੁਹਾਡੇ ਪਿੰਨ ਤੋਂ ਬਗੈਰ ਕੰਮ ਨਹੀਂ ਕਰਨਗੀਆਂ।<xliff:g id="EMPTY_LINE">
+
+</xliff:g>ਤੁਹਾਡੇ ਰੱਖਿਅਤ ਕੀਤੇ ਫਿੰਗਰਪ੍ਰਿੰਟਾਂ ਨੂੰ ਵੀ ਇਸ ਡੀਵਾਈਸ ਤੋਂ ਹਟਾਇਆ ਜਾਵੇਗਾ ਅਤੇ ਤੁਸੀਂ ਉਹਨਾਂ ਨਾਲ ਆਪਣੇ ਫ਼ੋਨ ਨੂੰ ਅਣਲਾਕ ਕਰਨ, ਖਰੀਦਾਂ ਨੂੰ ਅਧਿਕਾਰਿਤ ਕਰਨ, ਜਾਂ ਐਪਾਂ ਵਿੱਚ ਸਾਈਨ-ਇਨ ਕਰਨ ਦੇ ਯੋਗ ਨਹੀਂ ਰਹੋਗੇ।"</string>
     <string name="unlock_disable_frp_warning_content_password" msgid="5420612686852555537">"ਡੀਵਾਈਸ ਸੁਰੱਖਿਆ ਵਿਸ਼ੇਸ਼ਤਾਵਾਂ ਤੁਹਾਡੇ ਪਾਸਵਰਡ ਤੋਂ ਬਗੈਰ ਕੰਮ ਨਹੀਂ ਕਰਨਗੀਆਂ।"</string>
-    <!-- no translation found for unlock_disable_frp_warning_content_password_fingerprint (3595476296430536798) -->
-    <skip />
-    <string name="unlock_disable_frp_warning_content_unknown" msgid="1550718040483548220">"ਡੀਵਾਈਸ ਰੱਖਿਆ ਵਿਸ਼ੇਸ਼ਤਾਵਾਂ ਤੁਹਾਡੇ ਸਕ੍ਰੀਨ ਲੌਕ ਤੋਂ ਬਗੈਰ ਕੰਮ ਨਹੀਂ ਕਰਨਗੀਆਂ।"</string>
-    <!-- no translation found for unlock_disable_frp_warning_content_unknown_fingerprint (3679351662094349506) -->
-    <skip />
+    <string name="unlock_disable_frp_warning_content_password_fingerprint" msgid="3595476296430536798">"ਡੀਵਾਈਸ ਸੁਰੱਖਿਆ ਵਿਸ਼ੇਸ਼ਤਾਵਾਂ ਤੁਹਾਡੇ ਪਾਸਵਰਡ ਤੋਂ ਬਗੈਰ ਕੰਮ ਨਹੀਂ ਕਰਨਗੀਆਂ।<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="3679351662094349506">"ਡੀਵਾਈਸ ਸੁਰੱਖਿਆ ਵਿਸ਼ੇਸ਼ਤਾਵਾਂ ਤੁਹਾਡੇ ਸਕ੍ਰੀਨ ਲਾਕ ਦੇ ਬਿਨਾਂ ਕੰਮ ਨਹੀਂ ਕਰਨਗੀਆਂ।<xliff:g id="EMPTY_LINE">
+
+</xliff:g>ਤੁਹਾਡੇ ਰੱਖਿਅਤ ਕੀਤੇ ਫਿੰਗਰਪ੍ਰਿੰਟਾਂ ਨੂੰ ਵੀ ਇਸ ਡੀਵਾਈਸ ਤੋਂ ਹਟਾਇਆ ਜਾਵੇਗਾ ਅਤੇ ਤੁਸੀਂ ਉਹਨਾਂ ਨਾਲ ਆਪਣੇ ਫ਼ੋਨ ਨੂੰ ਅਣਲਾਕ ਕਰਨ, ਖਰੀਦਾਂ ਨੂੰ ਅਧਿਕਾਰਿਤ ਕਰਨ, ਜਾਂ ਐਪਾਂ ਵਿੱਚ ਸਾਈਨ-ਇਨ ਕਰਨ ਦੇ ਯੋਗ ਨਹੀਂ ਰਹੋਗੇ।"</string>
     <string name="unlock_disable_frp_warning_content_pattern_profile" msgid="8682200103576359918">"ਪ੍ਰੋਫਾਈਲ ਰੱਖਿਆ ਵਿਸ਼ੇਸ਼ਤਾਵਾਂ ਤੁਹਾਡੇ ਪੈਟਰਨ ਦੇ ਬਿਨਾਂ ਕੰਮ ਨਹੀਂ ਕਰਨਗੀਆਂ।"</string>
-    <!-- no translation found for unlock_disable_frp_warning_content_pattern_fingerprint_profile (6718155854303231675) -->
-    <skip />
-    <string name="unlock_disable_frp_warning_content_pin_profile" msgid="7790688070593867767">"ਪ੍ਰੋਫਾਈਲ ਰੱਖਿਆ ਵਿਸ਼ੇਸ਼ਤਾਵਾਂ ਤੁਹਾਡੇ PIN ਦੇ ਬਿਨਾਂ ਕੰਮ ਨਹੀਂ ਕਰਨਗੀਆਂ।"</string>
-    <!-- no translation found for unlock_disable_frp_warning_content_pin_fingerprint_profile (4209564603132870532) -->
-    <skip />
-    <string name="unlock_disable_frp_warning_content_password_profile" msgid="7569285520567674461">"ਪ੍ਰੋਫਾਈਲ ਰੱਖਿਆ ਵਿਸ਼ੇਸ਼ਤਾਵਾਂ ਤੁਹਾਡੇ ਪਾਸਵਰਡ ਦੇ ਬਿਨਾਂ ਕੰਮ ਨਹੀਂ ਕਰਨਗੀਆਂ।"</string>
-    <!-- no translation found for unlock_disable_frp_warning_content_password_fingerprint_profile (2994300676764706047) -->
-    <skip />
-    <string name="unlock_disable_frp_warning_content_unknown_profile" msgid="6984215718701688202">"ਪ੍ਰੋਫਾਈਲ ਰੱਖਿਆ ਵਿਸ਼ੇਸ਼ਤਾਵਾਂ ਤੁਹਾਡੇ ਸਕ੍ਰੀਨ ਲੌਕ ਦੇ ਬਿਨਾਂ ਕੰਮ ਨਹੀਂ ਕਰਨਗੀਆਂ।"</string>
-    <!-- no translation found for unlock_disable_frp_warning_content_unknown_fingerprint_profile (4994062501123299418) -->
-    <skip />
+    <string name="unlock_disable_frp_warning_content_pattern_fingerprint_profile" msgid="6718155854303231675">"ਪ੍ਰੋਫਾਈਲ ਸੁਰੱਖਿਆ ਵਿਸ਼ੇਸ਼ਤਾਵਾਂ ਤੁਹਾਡੇ ਪੈਟਰਨ ਦੇ ਬਿਨਾਂ ਕੰਮ ਨਹੀਂ ਕਰਨਗੀਆਂ।<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="4209564603132870532">"ਪ੍ਰੋਫਾਈਲ ਸੁਰੱਖਿਆ ਵਿਸ਼ੇਸ਼ਤਾਵਾਂ ਤੁਹਾਡੇ ਪਿੰਨ ਦੇ ਬਿਨਾਂ ਕੰਮ ਨਹੀਂ ਕਰਨਗੀਆਂ।<xliff:g id="EMPTY_LINE">
+
+</xliff:g>ਤੁਹਾਡੇ ਰੱਖਿਅਤ ਕੀਤੇ ਫਿੰਗਰਪ੍ਰਿੰਟਾਂ ਨੂੰ ਵੀ ਇਸ ਪ੍ਰੋਫਾਈਲ ਤੋਂ ਹਟਾਇਆ ਜਾਵੇਗਾ ਅਤੇ ਤੁਸੀਂ ਉਹਨਾਂ ਨਾਲ ਆਪਣੇ ਪ੍ਰੋਫਾਈਲ ਨੂੰ ਅਣਲਾਕ ਕਰਨ, ਖਰੀਦਾਂ ਨੂੰ ਅਧਿਕਾਰਿਤ ਕਰਨ, ਜਾਂ ਐਪਾਂ ਵਿੱਚ ਸਾਈਨ-ਇਨ ਕਰਨ ਦੇ ਯੋਗ ਨਹੀਂ ਰਹੋਗੇ।"</string>
+    <string name="unlock_disable_frp_warning_content_password_profile" msgid="7569285520567674461">"ਪ੍ਰੋਫਾਈਲ ਸੁਰੱਖਿਆ ਵਿਸ਼ੇਸ਼ਤਾਵਾਂ ਤੁਹਾਡੇ ਪਾਸਵਰਡ ਦੇ ਬਿਨਾਂ ਕੰਮ ਨਹੀਂ ਕਰਨਗੀਆਂ।"</string>
+    <string name="unlock_disable_frp_warning_content_password_fingerprint_profile" msgid="2994300676764706047">"ਪ੍ਰੋਫਾਈਲ ਸੁਰੱਖਿਆ ਵਿਸ਼ੇਸ਼ਤਾਵਾਂ ਤੁਹਾਡੇ ਪਾਸਵਰਡ ਦੇ ਬਿਨਾਂ ਕੰਮ ਨਹੀਂ ਕਰਨਗੀਆਂ।<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="4994062501123299418">"ਪ੍ਰੋਫਾਈਲ ਸੁਰੱਖਿਆ ਵਿਸ਼ੇਸ਼ਤਾਵਾਂ ਤੁਹਾਡੇ ਸਕ੍ਰੀਨ ਲਾਕ ਦੇ ਬਿਨਾਂ ਕੰਮ ਨਹੀਂ ਕਰਨਗੀਆਂ।<xliff:g id="EMPTY_LINE">
+
+</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">"ਅਨਲੌਕ PIN ਬਦਲੋ"</string>
-    <string name="unlock_change_lock_password_title" msgid="5606298470358768865">"ਅਨਲੌਕ ਪਾਸਵਰਡ ਬਦਲੋ"</string>
+    <string name="unlock_change_lock_pattern_title" msgid="2044092014872741130">"ਅਣਲਾਕ ਪੈਟਰਨ ਬਦਲੋ"</string>
+    <string name="unlock_change_lock_pin_title" msgid="806629901095938484">"ਅਣਲਾਕ ਪਿੰਨ ਬਦਲੋ"</string>
+    <string name="unlock_change_lock_password_title" msgid="5606298470358768865">"ਅਣਲਾਕ ਪਾਸਵਰਡ ਬਦਲੋ"</string>
     <string name="lock_failed_attempts_before_wipe" msgid="2219711062197089783">"ਦੁਬਾਰਾ ਕੋਸ਼ਿਸ਼ ਕਰੋ। <xliff:g id="TOTAL_ATTEMPTS">%2$d</xliff:g> ਵਿੱਚੋਂ <xliff:g id="CURRENT_ATTEMPTS">%1$d</xliff:g> ਕੋਸ਼ਿਸ਼।"</string>
-    <string name="lock_last_attempt_before_wipe_warning_title" msgid="4277765862798876826">"ਤੁਹਾਡਾ ਡੈਟਾ ਮਿਟਾਇਆ ਜਾਵੇਗਾ"</string>
-    <string name="lock_last_pattern_attempt_before_wipe_device" msgid="1688030823464420974">"ਜੇਕਰ ਤੁਸੀਂ ਅਗਲੀ ਕੋਸ਼ਿਸ਼ \'ਤੇ ਕੋਈ ਗਲਤ ਪੈਟਰਨ ਦਾਖਲ ਕਰਦੇ ਹੋ, ਤਾਂ ਇਸ ਡੀਵਾਈਸ ਦਾ ਡੈਟਾ ਮਿਟਾਇਆ ਜਾਵੇਗਾ"</string>
-    <string name="lock_last_pin_attempt_before_wipe_device" msgid="5350785938296254352">"ਜੇਕਰ ਤੁਸੀਂ ਅਗਲੀ ਕੋਸ਼ਿਸ਼ \'ਤੇ ਕੋਈ ਗਲਤ PIN ਦਾਖਲ ਕਰਦੇ ਹੋ, ਤਾਂ ਇਸ ਡੀਵਾਈਸ ਦਾ ਡੈਟਾ ਮਿਟਾਇਆ ਜਾਵੇਗਾ"</string>
-    <string name="lock_last_password_attempt_before_wipe_device" msgid="6208035114731421034">"ਜੇਕਰ ਤੁਸੀਂ ਅਗਲੀ ਕੋਸ਼ਿਸ਼ \'ਤੇ ਕੋਈ ਗਲਤ ਪਾਸਵਰਡ ਦਾਖਲ ਕਰਦੇ ਹੋ, ਤਾਂ ਇਸ ਡੀਵਾਈਸ ਦਾ ਡੈਟਾ ਮਿਟਾਇਆ ਜਾਵੇਗਾ"</string>
+    <string name="lock_last_attempt_before_wipe_warning_title" msgid="4277765862798876826">"ਤੁਹਾਡਾ  ਡਾਟਾ  ਮਿਟਾਇਆ ਜਾਵੇਗਾ"</string>
+    <string name="lock_last_pattern_attempt_before_wipe_device" msgid="1688030823464420974">"ਜੇਕਰ ਤੁਸੀਂ ਅਗਲੀ ਕੋਸ਼ਿਸ਼ \'ਤੇ ਕੋਈ ਗਲਤ ਪੈਟਰਨ ਦਾਖਲ ਕਰਦੇ ਹੋ, ਤਾਂ ਇਸ ਡੀਵਾਈਸ ਦਾ ਡਾਟਾ ਮਿਟਾਇਆ ਜਾਵੇਗਾ"</string>
+    <string name="lock_last_pin_attempt_before_wipe_device" msgid="5350785938296254352">"ਜੇਕਰ ਤੁਸੀਂ ਅਗਲੀ ਕੋਸ਼ਿਸ਼ \'ਤੇ ਕੋਈ ਗਲਤ ਪਿੰਨ ਦਾਖਲ ਕਰਦੇ ਹੋ, ਤਾਂ ਇਸ ਡੀਵਾਈਸ ਦਾ ਡਾਟਾ ਮਿਟਾਇਆ ਜਾਵੇਗਾ"</string>
+    <string name="lock_last_password_attempt_before_wipe_device" msgid="6208035114731421034">"ਜੇਕਰ ਤੁਸੀਂ ਅਗਲੀ ਕੋਸ਼ਿਸ਼ \'ਤੇ ਕੋਈ ਗ਼ਲਤ ਪਾਸਵਰਡ ਦਾਖਲ ਕਰਦੇ ਹੋ, ਤਾਂ ਇਸ ਡੀਵਾਈਸ ਦਾ ਡਾਟਾ ਮਿਟਾਇਆ ਜਾਵੇਗਾ"</string>
     <string name="lock_last_pattern_attempt_before_wipe_user" msgid="7851504071368235547">"ਜੇਕਰ ਤੁਸੀਂ ਅਗਲੀ ਕੋਸ਼ਿਸ਼ \'ਤੇ ਕੋਈ ਗਲਤ ਪੈਟਰਨ ਦਾਖਲ ਕਰਦੇ ਹੋ, ਤਾਂ ਇਸ ਵਰਤੋਂਕਾਰ ਨੂੰ ਮਿਟਾਇਆ ਜਾਵੇਗਾ"</string>
-    <string name="lock_last_pin_attempt_before_wipe_user" msgid="4049024921333961715">"ਜੇਕਰ ਤੁਸੀਂ ਅਗਲੀ ਕੋਸ਼ਿਸ਼ \'ਤੇ ਕੋਈ ਗਲਤ PIN ਦਾਖਲ ਕਰਦੇ ਹੋ, ਤਾਂ ਇਸ ਵਰਤੋਂਕਾਰ ਨੂੰ ਮਿਟਾਇਆ ਜਾਵੇਗਾ"</string>
+    <string name="lock_last_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">"ਜੇਕਰ ਤੁਸੀਂ ਅਗਲੀ ਕੋਸ਼ਿਸ਼ \'ਤੇ ਕੋਈ ਗਲਤ PIN ਦਾਖਲ ਕਰਦੇ ਹੋ, ਤਾਂ ਤੁਹਾਡਾ ਕਾਰਜ ਪ੍ਰੋਫਾਈਲ ਅਤੇ ਇਸਦਾ ਡੈਟਾ ਮਿਟਾਇਆ ਜਾਵੇਗਾ"</string>
-    <string name="lock_last_password_attempt_before_wipe_profile" msgid="6786586046975042158">"ਜੇਕਰ ਤੁਸੀਂ ਅਗਲੀ ਕੋਸ਼ਿਸ਼ \'ਤੇ ਕੋਈ ਗਲਤ ਪਾਸਵਰਡ ਦਾਖਲ ਕਰਦੇ ਹੋ, ਤਾਂ ਤੁਹਾਡਾ ਕਾਰਜ ਪ੍ਰੋਫਾਈਲ ਅਤੇ ਇਸਦਾ ਡੈਟਾ ਮਿਟਾਇਆ ਜਾਵੇਗਾ"</string>
-    <string name="lock_failed_attempts_now_wiping_device" msgid="5047439819181833824">"ਬਹੁਤ ਸਾਰੀਆਂ ਗਲਤ ਕੋਸ਼ਿਸ਼ਾਂ। ਇਸ ਡੀਵਾਈਸ ਦਾ ਡੈਟਾ ਮਿਟਾਇਆ ਜਾਵੇਗਾ।"</string>
+    <string name="lock_last_pattern_attempt_before_wipe_profile" msgid="2437716252059050291">"ਜੇਕਰ ਤੁਸੀਂ ਅਗਲੀ ਕੋਸ਼ਿਸ਼ \'ਤੇ ਕੋਈ ਗਲਤ ਪੈਟਰਨ ਦਾਖਲ ਕਰਦੇ ਹੋ, ਤਾਂ ਤੁਹਾਡਾ ਕਾਰਜ ਪ੍ਰੋਫਾਈਲ ਅਤੇ ਇਸਦਾ ਡਾਟਾ ਮਿਟਾਇਆ ਜਾਵੇਗਾ"</string>
+    <string name="lock_last_pin_attempt_before_wipe_profile" msgid="5799931839127476913">"ਜੇਕਰ ਤੁਸੀਂ ਅਗਲੀ ਕੋਸ਼ਿਸ਼ \'ਤੇ ਕੋਈ ਗਲਤ ਪਿੰਨ ਦਾਖਲ ਕਰਦੇ ਹੋ, ਤਾਂ ਤੁਹਾਡਾ ਕਾਰਜ ਪ੍ਰੋਫਾਈਲ ਅਤੇ ਇਸਦਾ ਡਾਟਾ ਮਿਟਾ ਦਿੱਤਾ ਜਾਵੇਗਾ"</string>
+    <string name="lock_last_password_attempt_before_wipe_profile" msgid="6786586046975042158">"ਜੇਕਰ ਤੁਸੀਂ ਅਗਲੀ ਕੋਸ਼ਿਸ਼ \'ਤੇ ਕੋਈ ਗਲਤ ਪਾਸਵਰਡ ਦਾਖਲ ਕਰਦੇ ਹੋ, ਤਾਂ ਤੁਹਾਡਾ ਕਾਰਜ ਪ੍ਰੋਫਾਈਲ ਅਤੇ ਇਸਦਾ ਡਾਟਾ ਮਿਟਾਇਆ ਜਾਵੇਗਾ"</string>
+    <string name="lock_failed_attempts_now_wiping_device" msgid="5047439819181833824">"ਬਹੁਤ ਸਾਰੀਆਂ ਗ਼ਲਤ ਕੋਸ਼ਿਸ਼ਾਂ। ਇਸ ਡੀਵਾਈਸ ਦਾ ਡਾਟਾ ਮਿਟਾਇਆ ਜਾਵੇਗਾ।"</string>
     <string name="lock_failed_attempts_now_wiping_user" msgid="6188180643494518001">"ਬਹੁਤ ਸਾਰੀਆਂ ਗਲਤ ਕੋਸ਼ਿਸ਼ਾਂ। ਇਸ ਵਰਤੋਂਕਾਰ ਨੂੰ ਮਿਟਾਇਆ ਜਾਵੇਗਾ।"</string>
-    <string name="lock_failed_attempts_now_wiping_profile" msgid="1745475043685915442">"ਬਹੁਤ ਸਾਰੀਆਂ ਗਲਤ ਕੋਸ਼ਿਸ਼ਾਂ। ਇਹ ਕਾਰਜ ਪ੍ਰੋਫਾਈਲ ਅਤੇ ਇਸਦਾ ਡੈਟਾ ਮਿਟਾਇਆ ਜਾਵੇਗਾ।"</string>
+    <string name="lock_failed_attempts_now_wiping_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_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">"ਡੀਵਾਈਸ ਪ੍ਰਸ਼ਾਸਕ ਇੱਕ ਹਾਲੀਆ PIN ਵਰਤਣ ਦੀ ਇਜਾਜ਼ਤ ਨਹੀਂ ਦਿੰਦਾ ਹੈ"</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>
@@ -581,6 +593,7 @@
     <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="lockpassword_clear_label" msgid="5724429464960458155">"ਕਲੀਅਰ ਕਰੋ"</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>
@@ -591,45 +604,45 @@
       <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> ਕਿਰਿਆਸ਼ੀਲ ਐਪਾਂ</item>
     </plurals>
     <string name="manage_trust_agents" msgid="4629279457536987768">"ਭਰੋਸੇਯੋਗ ਏਜੰਟ"</string>
-    <string name="disabled_because_no_backup_security" msgid="6877660253409580377">"ਵਰਤਣ ਲਈ, ਪਹਿਲਾਂ ਇੱਕ ਸਕ੍ਰੀਨ ਲੌਕ ਸੈੱਟ ਕਰੋ"</string>
+    <string name="disabled_because_no_backup_security" msgid="6877660253409580377">"ਵਰਤਣ ਲਈ, ਪਹਿਲਾਂ ਇੱਕ ਸਕ੍ਰੀਨ  ਲਾਕ  ਸੈੱਟ ਕਰੋ"</string>
     <string name="manage_trust_agents_summary" msgid="1475819820389620546">"ਕੋਈ ਨਹੀਂ"</string>
     <plurals name="manage_trust_agents_summary_on" formatted="false" msgid="3935182396726101824">
       <item quantity="one"><xliff:g id="COUNT">%d</xliff:g> ਕਿਰਿਆਸ਼ੀਲ ਭਰੋਸੇਯੋਗ ਏਜੰਟ</item>
       <item quantity="other"><xliff:g id="COUNT">%d</xliff:g> ਕਿਰਿਆਸ਼ੀਲ ਭਰੋਸੇਯੋਗ ਏਜੰਟ</item>
     </plurals>
-    <string name="bluetooth_quick_toggle_title" msgid="1037056952714061893">"Bluetooth"</string>
-    <string name="bluetooth_quick_toggle_summary" msgid="5293641680139873341">"Bluetooth ਚਾਲੂ ਕਰੋ"</string>
-    <string name="bluetooth_settings" msgid="1810521656168174329">"Bluetooth"</string>
-    <string name="bluetooth_settings_title" msgid="1908745291161353016">"Bluetooth"</string>
-    <string name="bluetooth_settings_summary" msgid="2091062709530570462">"ਕਨੈਕਸ਼ਨ ਵਿਵਸਥਿਤ ਕਰੋ, ਡੀਵਾਈਸ ਨਾਮ &amp; ਖੋਜਯੋਗਤਾ ਸੈੱਟ ਕਰੋ"</string>
+    <string name="bluetooth_quick_toggle_title" msgid="1037056952714061893">"ਬਲੂਟੁੱਥ"</string>
+    <string name="bluetooth_quick_toggle_summary" msgid="5293641680139873341">"ਬਲੂਟੁੱਥ ਚਾਲੂ ਕਰੋ"</string>
+    <string name="bluetooth_settings" msgid="1810521656168174329">"ਬਲੂਟੁੱਥ"</string>
+    <string name="bluetooth_settings_title" msgid="1908745291161353016">"ਬਲੂਟੁੱਥ"</string>
+    <string name="bluetooth_settings_summary" msgid="2091062709530570462">"ਕਨੈਕਸ਼ਨ ਵਿਵਸਥਿਤ ਕਰੋ, ਡੀਵਾਈਸ ਨਾਮ ਅਤੇ ਖੋਜਯੋਗਤਾ ਸੈੱਟ ਕਰੋ"</string>
     <string name="bluetooth_pairing_request" msgid="2605098826364694673">"ਕੀ <xliff:g id="DEVICE_NAME">%1$s</xliff:g> ਦੇ ਨਾਲ ਜੋੜੀ ਬਣਾਉਣੀ ਹੈ?"</string>
-    <string name="bluetooth_pairing_key_msg" msgid="418124944140102021">"ਬਲੂਟੁੱਥ ਜੋੜੀ ਕੋਡ"</string>
-    <string name="bluetooth_enter_passkey_msg" msgid="6813273136442138444">"ਪੇਅਰਿੰਗ ਕੋਡ ਟਾਈਪ ਕਰੋ ਫਿਰ ਵਾਪਸ ਜਾਓ ਜਾਂ ਦਾਖਲ ਕਰੋ ਨੂੰ ਦਬਾਓ"</string>
-    <string name="bluetooth_enable_alphanumeric_pin" msgid="7222713483058171357">"PIN ਵਿੱਚ ਅੱਖਰ ਜਾਂ ਚਿੰਨ੍ਹ ਹਨ"</string>
+    <string name="bluetooth_pairing_key_msg" msgid="418124944140102021">"ਬਲੂਟੁੱਥ ਜੋੜਾਬੱਧਕਰਨ ਕੋਡ"</string>
+    <string name="bluetooth_enter_passkey_msg" msgid="6813273136442138444">"ਜੋੜਾਬੱਧ ਕਰਨ ਦਾ ਕੋਡ ਟਾਈਪ ਕਰੋ ਫਿਰ ਵਾਪਸ ਜਾਓ ਜਾਂ ਦਾਖਲ ਕਰੋ ਨੂੰ ਦਬਾਓ"</string>
+    <string name="bluetooth_enable_alphanumeric_pin" msgid="7222713483058171357">"ਪਿੰਨ ਵਿੱਚ ਅੱਖਰ ਜਾਂ ਚਿੰਨ੍ਹ ਹਨ"</string>
     <string name="bluetooth_pin_values_hint" msgid="3815897557875873646">"ਆਮ ਤੌਰ ਤੇ 0000 ਜਾਂ 1234"</string>
     <string name="bluetooth_pin_values_hint_16_digits" msgid="7849359451584101077">"16 ਅੰਕਾਂ ਦਾ ਹੋਣਾ ਲਾਜ਼ਮੀ ਹੈ"</string>
-    <string name="bluetooth_enter_pin_other_device" msgid="4637977124526813470">"ਤੁਹਾਨੂੰ ਹੋਰ ਡੀਵਾਈਸ ਤੇ ਇਹ PIN ਟਾਈਪ ਕਰਨ ਦੀ ਲੋੜ ਹੋ ਸਕਦੀ ਹੈ।"</string>
+    <string name="bluetooth_enter_pin_other_device" msgid="4637977124526813470">"ਤੁਹਾਨੂੰ ਹੋਰ ਡੀਵਾਈਸ ਤੇ ਇਹ ਪਿੰਨ ਟਾਈਪ ਕਰਨ ਦੀ ਲੋੜ ਹੋ ਸਕਦੀ ਹੈ।"</string>
     <string name="bluetooth_enter_passkey_other_device" msgid="2798719004030279602">"ਤੁਹਾਨੂੰ ਹੋਰ ਡੀਵਾਈਸ ਤੇ ਵੀ ਇਹ ਪਾਸਕੁੰਜੀ ਟਾਈਪ ਕਰਨ ਦੀ ਲੋੜ ਹੋ ਸਕਦੀ ਹੈ।"</string>
     <string name="bluetooth_confirm_passkey_msg" msgid="3708312912841950052">"ਇਸ ਨਾਲ ਪੇਅਰ ਕਰਨ ਲਈ:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;ਯਕੀਨੀ ਬਣਾਓ ਕਿ ਇਹ ਇਸ ਪਾਸਕੁੰਜੀ ਨੂੰ ਦਿਖਾ ਰਿਹਾ ਹੈ:&lt;br&gt;&lt;b&gt;<xliff:g id="PASSKEY">%2$s</xliff:g>&lt;/b&gt;"</string>
-    <string name="bluetooth_incoming_pairing_msg" msgid="1615930853859551491">"ਇਸਤੋਂ:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;ਕੀ ਇਸ ਡੀਵਾਈਸ ਨਾਲ ਪੇਅਰ ਕਰਨਾ ਹੈ?"</string>
-    <string name="bluetooth_display_passkey_pin_msg" msgid="2796550001376088433">"ਇਸ ਨਾਲ ਪੇਅਰ ਕਰਨ ਲਈ:<xliff:g id="BOLD1_0">&lt;br&gt;&lt;b&gt;</xliff:g><xliff:g id="DEVICE_NAME">%1$s</xliff:g><xliff:g id="END_BOLD1">&lt;/b&gt;&lt;br&gt;&lt;br&gt;</xliff:g>ਇਸਤੇ ਟਾਈਪ ਕਰੋ:<xliff:g id="BOLD2_1">&lt;br&gt;&lt;b&gt;</xliff:g><xliff:g id="PASSKEY">%2$s</xliff:g><xliff:g id="END_BOLD2">&lt;/b&gt;</xliff:g>, ਫਿਰ ਵਾਪਸ ਜਾਓ ਜਾਂ ਦਾਖਲ ਕਰੋ ਕੁੰਜੀ ਨੂੰ ਦਬਾਓ।"</string>
-    <string name="bluetooth_pairing_shares_phonebook" msgid="2277931851483023208">"ਆਪਣੇ ਸੰਪਰਕਾਂ ਅਤੇ ਕਾਲ ਇਤਿਹਾਸ ਨੂੰ ਐਕਸੈਸ ਕਰਨ ਦੀ <xliff:g id="DEVICE_NAME">%1$s</xliff:g> ਨੂੰ ਅਨੁਮਤੀ ਦਿਓ"</string>
+    <string name="bluetooth_incoming_pairing_msg" msgid="1615930853859551491">"ਇਸਤੋਂ:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;ਕੀ ਇਸ ਡੀਵਾਈਸ ਨਾਲ ਜੋੜਾਬੱਧ ਕਰਨਾ ਹੈ?"</string>
+    <string name="bluetooth_display_passkey_pin_msg" msgid="2796550001376088433">"ਇਸ ਨਾਲ ਜੋੜਾਬੱਧ ਕਰਨ ਲਈ:<xliff:g id="BOLD1_0">&lt;br&gt;&lt;b&gt;</xliff:g><xliff:g id="DEVICE_NAME">%1$s</xliff:g><xliff:g id="END_BOLD1">&lt;/b&gt;&lt;br&gt;&lt;br&gt;</xliff:g>ਇਸਤੇ ਟਾਈਪ ਕਰੋ:<xliff:g id="BOLD2_1">&lt;br&gt;&lt;b&gt;</xliff:g><xliff:g id="PASSKEY">%2$s</xliff:g><xliff:g id="END_BOLD2">&lt;/b&gt;</xliff:g>, ਫਿਰ \'ਵਾਪਸ ਜਾਓ\' ਜਾਂ \'ਦਾਖਲ ਕਰੋ\' ਕੁੰਜੀ ਨੂੰ ਦਬਾਓ।"</string>
+    <string name="bluetooth_pairing_shares_phonebook" msgid="2277931851483023208">"ਆਪਣੇ ਸੰਪਰਕਾਂ ਅਤੇ ਕਾਲ ਇਤਿਹਾਸ ਨੂੰ ਪਹੁੰਚ ਕਰਨ ਦੀ <xliff:g id="DEVICE_NAME">%1$s</xliff:g> ਨੂੰ ਆਗਿਆ ਦਿਓ"</string>
     <string name="bluetooth_error_title" msgid="6850384073923533096"></string>
     <string name="bluetooth_connecting_error_message" msgid="1397388344342081090">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>ਨਾਲ ਕਨੈਕਟ ਨਹੀਂ ਕਰ ਸਕਿਆ।"</string>
     <string name="bluetooth_preference_scan_title" msgid="2277464653118896016">"ਡਿਵਾਈਸਾਂ ਲਈ ਸਕੈਨ ਕਰੋ"</string>
     <string name="bluetooth_search_for_devices" msgid="2754007356491461674">"ਤਾਜ਼ਾ"</string>
     <string name="bluetooth_searching_for_devices" msgid="9203739709307871727">"ਖੋਜ ਰਿਹਾ ਹੈ..."</string>
     <string name="bluetooth_preference_device_settings" msgid="907776049862799122">"ਡੀਵਾਈਸ ਸੈਟਿੰਗਾਂ"</string>
-    <string name="bluetooth_preference_paired_dialog_title" msgid="8875124878198774180">"ਪੇਅਰ ਕੀਤੀ ਡੀਵਾਈਸ"</string>
+    <string name="bluetooth_preference_paired_dialog_title" msgid="8875124878198774180">"ਜੋੜਾਬੱਧ ਕੀਤਾ ਡੀਵਾਈਸ"</string>
     <string name="bluetooth_preference_paired_dialog_name_label" msgid="8111146086595617285">"ਨਾਮ"</string>
-    <string name="bluetooth_preference_paired_dialog_internet_option" msgid="7112953286863428412">"ਇੰਟਰਨੈਟ ਕਨੈਕਸ਼ਨ"</string>
+    <string name="bluetooth_preference_paired_dialog_internet_option" msgid="7112953286863428412">"ਇੰਟਰਨੈੱਟ ਕਨੈਕਸ਼ਨ"</string>
     <string name="bluetooth_preference_paired_dialog_keyboard_option" msgid="2271954176947879628">"ਕੀ-ਬੋਰਡ"</string>
     <string name="bluetooth_preference_paired_dialog_contacts_option" msgid="7747163316331917594">"ਸੰਪਰਕ ਅਤੇ ਕਾਲ ਇਤਿਹਾਸ"</string>
-    <string name="bluetooth_pairing_dialog_title" msgid="1417255032435317301">"ਕੀ ਇਸ ਡੀਵਾਈਸ ਨਾਲ ਪੇਅਰ ਕਰਨਾ ਹੈ?"</string>
-    <string name="bluetooth_pairing_dialog_sharing_phonebook_title" msgid="7664141669886358618">"ਕੀ ਫੋਨ ਬੁਕ ਸ਼ੇਅਰ ਕਰਨੀ ਹੈ?"</string>
+    <string name="bluetooth_pairing_dialog_title" msgid="1417255032435317301">"ਕੀ ਇਸ ਡੀਵਾਈਸ ਨਾਲ ਜੋੜਾਬੱਧ ਕਰਨਾ ਹੈ?"</string>
+    <string name="bluetooth_pairing_dialog_sharing_phonebook_title" msgid="7664141669886358618">"ਕੀ ਫ਼ੋਨ ਬੁੱਕ ਸਾਂਝਾ ਕਰਨੀ ਹੈ?"</string>
     <string name="bluetooth_pairing_dialog_contants_request" msgid="5531109163573611348">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> ਤੁਹਾਡੇ ਸੰਪਰਕਾਂ ਅਤੇ ਕਾਲ ਇਤਿਹਾਸ ਤੱਕ ਪਹੁੰਚ ਪ੍ਰਾਪਤ ਕਰਨਾ ਚਾਹੁੰਦਾ ਹੈ।"</string>
-    <string name="bluetooth_pairing_dialog_paring_request" msgid="8451248193517851958">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> Bluetooth ਨਾਲ ਪੇਅਰ ਕਰਨਾ ਚਾਹੁੰਦੀ ਹੈ। ਕਨੈਕਟ ਹੋਣ ਤੋਂ ਬਾਅਦ, ਇਸਦੀ ਤੁਹਾਡੇ ਸੰਪਰਕਾਂ ਅਤੇ ਕਾਲ ਇਤਿਹਾਸ ਤੱਕ ਪਹੁੰਚ ਹੋਵੇਗੀ।"</string>
-    <string name="bluetooth_preference_paired_devices" msgid="1970524193086791964">"ਪੇਅਰ ਕੀਤੀਆਂ ਡਿਵਾਈਸਾਂ"</string>
+    <string name="bluetooth_pairing_dialog_paring_request" msgid="8451248193517851958">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> ਬਲੂਟੁੱਥ ਨਾਲ ਜੋੜਾਬੱਧ ਕਰਨਾ ਚਾਹੁੰਦੀ ਹੈ। ਕਨੈਕਟ ਹੋਣ ਤੋਂ ਬਾਅਦ, ਇਸਦੀ ਤੁਹਾਡੇ ਸੰਪਰਕਾਂ ਅਤੇ ਕਾਲ ਇਤਿਹਾਸ ਤੱਕ ਪਹੁੰਚ ਹੋਵੇਗੀ।"</string>
+    <string name="bluetooth_preference_paired_devices" msgid="1970524193086791964">"ਜੋੜਾਬੱਧ ਕੀਤੇ ਡੀਵਾਈਸ"</string>
     <string name="bluetooth_preference_found_devices" msgid="1647983835063249680">"ਉਪਲਬਧ ਡੀਵਾਈਸਾਂ"</string>
     <string name="bluetooth_preference_no_found_devices" msgid="7594339669961811591">"ਕੋਈ ਡਿਵਾਈਸਾਂ ਉਪਲਬਧ ਨਹੀਂ"</string>
     <string name="bluetooth_device_context_connect" msgid="3997659895003244941">"ਕਨੈਕਟ ਕਰੋ"</string>
@@ -638,142 +651,143 @@
     <string name="bluetooth_device_context_unpair" msgid="662992425948536144">"ਅਨਪੇਅਰ ਕਰੋ"</string>
     <string name="bluetooth_device_context_disconnect_unpair" msgid="7644014238070043798">"ਡਿਸਕਨੈਕਟ &amp; ਅਨਪੇਅਰ ਕਰੋ"</string>
     <string name="bluetooth_device_context_connect_advanced" msgid="2643129703569788771">"ਚੋਣਾਂ…"</string>
-    <string name="bluetooth_menu_advanced" msgid="8572178316357220524">"ਉੱਨਤ"</string>
-    <string name="bluetooth_advanced_titlebar" msgid="2142159726881547669">"ਉੱਨਤ Bluetooth"</string>
-    <string name="bluetooth_empty_list_bluetooth_off" msgid="6351930724051893423">"ਜਦੋਂ Bluetooth ਨੂੰ ਚਾਲੂ ਕੀਤਾ ਜਾਂਦਾ ਹੈ, ਤਾਂ ਤੁਹਾਡੀ ਡੀਵਾਈਸ ਹੋਰਾਂ ਨੇੜਲੀਆਂ Bluetooth ਡੀਵਾਈਸਾਂ ਨਾਲ ਸੰਚਾਰ ਕਰ ਸਕਦੀ ਹੈ।"</string>
-    <string name="ble_scan_notify_text" msgid="1295915006005700650">"ਨਿਰਧਾਰਿਤ ਸਥਾਨ ਸ਼ੁੱਧਤਾ ਨੂੰ ਬਿਹਤਰ ਬਣਾਉਣ ਲਈ, ਸਿਸਟਮ ਐਪਸ ਅਤੇ ਸੇਵਾਵਾਂ Bluetooth ਡਿਵਾਈਸਾਂ ਨੂੰ ਤਦ ਵੀ ਖੋਜ ਸਕਦੀਆਂ ਹਨ। ਤੁਸੀਂ ਇਸਨੂੰ <xliff:g id="LINK_BEGIN_0">LINK_BEGIN</xliff:g>ਸਕੈਨਿੰਗ ਸੈਟਿੰਗਾਂ<xliff:g id="LINK_END_1">LINK_END</xliff:g> ਵਿੱਚ ਬਦਲ ਸਕਦੇ ਹੋ।"</string>
+    <string name="bluetooth_menu_advanced" msgid="8572178316357220524">"ਵਿਕਸਿਤ"</string>
+    <string name="bluetooth_advanced_titlebar" msgid="2142159726881547669">"ਵਿਕਸਿਤ ਬਲੂਟੁੱਥ"</string>
+    <string name="bluetooth_empty_list_bluetooth_off" msgid="6351930724051893423">"ਜਦੋਂ ਬਲੂਟੁੱਥ ਨੂੰ ਚਾਲੂ ਕੀਤਾ ਜਾਂਦਾ ਹੈ, ਤਾਂ ਤੁਹਾਡਾ ਡੀਵਾਈਸ ਹੋਰਾਂ ਨੇੜਲਿਆਂ ਬਲੂਟੁੱਥ ਡੀਵਾਈਸਾਂ ਨਾਲ ਸੰਚਾਰ ਕਰ ਸਕਦਾ ਹੈ।"</string>
+    <string name="ble_scan_notify_text" msgid="1295915006005700650">"ਟਿਕਾਣਾ ਸ਼ੁੱਧਤਾ ਨੂੰ ਬਿਹਤਰ ਬਣਾਉਣ ਲਈ, ਸਿਸਟਮ ਐਪਾਂ ਅਤੇ ਸੇਵਾਵਾਂ ਬਲੂਟੁੱਥ ਡੀਵਾਈਸਾਂ ਨੂੰ ਤਦ ਵੀ ਖੋਜ ਸਕਦੀਆਂ ਹਨ। ਤੁਸੀਂ ਇਸਨੂੰ <xliff:g id="LINK_BEGIN_0">LINK_BEGIN</xliff:g>ਸਕੈਨਿੰਗ ਸੈਟਿੰਗਾਂ<xliff:g id="LINK_END_1">LINK_END</xliff:g> ਵਿੱਚ ਬਦਲ ਸਕਦੇ ਹੋ।"</string>
     <string name="bluetooth_connect_failed" msgid="4500234659813241053">"ਕਨੈਕਟ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਿਆ। ਦੁਬਾਰਾ ਕੋਸ਼ਿਸ਼ ਕਰੋ।"</string>
     <string name="device_details_title" msgid="6576953269221085300">"ਡੀਵਾਈਸ ਦੇ ਵੇਰਵੇ"</string>
     <string name="bluetooth_device_mac_address" msgid="2513724313558236181">"ਡੀਵਾਈਸ ਦਾ ਬਲੂਟੁੱਥ ਪਤਾ: <xliff:g id="ADDRESS">%1$s</xliff:g>"</string>
-    <string name="bluetooth_unpair_dialog_title" msgid="38467834196432400">"ਡੀਵਾਈਸ ਨੂੰ ਅਣਜੋੜਾਬੱਧ ਕਰੀਏ?"</string>
+    <string name="bluetooth_unpair_dialog_title" msgid="38467834196432400">"ਕੀ ਡੀਵਾਈਸ ਨੂੰ ਅਣਜੋੜਾਬੱਧ ਕਰਨਾ ਹੈ?"</string>
     <string name="bluetooth_unpair_dialog_body" product="default" msgid="9087609557757135712">"ਤੁਹਾਡਾ ਫ਼ੋਨ ਹੁਣ <xliff:g id="DEVICE_NAME">%1$s</xliff:g> ਨਾਲ ਜੋੜਾਬੱਧ ਨਹੀਂ ਰਹੇਗਾ"</string>
     <string name="bluetooth_unpair_dialog_body" product="tablet" msgid="7785695793007576501">"ਤੁਹਾਡਾ ਟੈਬਲੈੱਟ ਹੁਣ <xliff:g id="DEVICE_NAME">%1$s</xliff:g> ਨਾਲ ਜੋੜਾਬੱਧ ਨਹੀਂ ਰਹੇਗਾ"</string>
-    <string name="bluetooth_unpair_dialog_body" product="device" msgid="251257782642157557">"ਤੁਹਾਡੀ ਡੀਵਾਈਸ ਹੁਣ <xliff:g id="DEVICE_NAME">%1$s</xliff:g> ਨਾਲ ਜੋੜਾਬੱਧ ਨਹੀਂ ਰਹੇਗੀ"</string>
+    <string name="bluetooth_unpair_dialog_body" product="device" msgid="251257782642157557">"ਤੁਹਾਡਾ ਡੀਵਾਈਸ ਹੁਣ <xliff:g id="DEVICE_NAME">%1$s</xliff:g> ਨਾਲ ਜੋੜਾਬੱਧ ਨਹੀਂ ਰਹੇਗਾ"</string>
     <string name="bluetooth_unpair_dialog_forget_confirm_button" msgid="3829370108973879006">"ਡੀਵਾਈਸ ਨੂੰ ਅਣਜੋੜਾਬੱਧ ਕਰੋ"</string>
     <string name="bluetooth_connect_specific_profiles_title" msgid="6952214406025825164">"ਇਸ ਨਾਲ ਕਨੈਕਟ ਕਰੋ…"</string>
-    <string name="bluetooth_disconnect_a2dp_profile" msgid="3524648279150937177">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> ਨੂੰ ਮੀਡੀਆ ਔਡੀਓ ਤੋਂ ਡਿਸਕਨੈਕਟ ਕੀਤਾ ਜਾਏਗਾ।"</string>
-    <string name="bluetooth_disconnect_headset_profile" msgid="8635908811168780720">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> ਨੂੰ ਹੈਂਡਸਫ੍ਰੀ ਔਡੀਓ ਤੋਂ ਡਿਸਕਨੈਕਟ ਕੀਤਾ ਜਾਏਗਾ।"</string>
-    <string name="bluetooth_disconnect_hid_profile" msgid="3282295189719352075">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> ਨੂੰ ਇਨਪੁਟ ਡੀਵਾਈਸ ਤੋਂ ਡਿਸਕਨੈਕਟ ਕੀਤਾ ਜਾਏਗਾ।"</string>
-    <string name="bluetooth_disconnect_pan_user_profile" msgid="8037627994382458698">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> ਰਾਹੀਂ ਇੰਟਰਨੈਟ ਪਹੁੰਚ ਡਿਸਕਨੈਕਟ ਕੀਤੀ ਜਾਏਗੀ।"</string>
-    <string name="bluetooth_disconnect_pan_nap_profile" product="tablet" msgid="1262792320446274407">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> ਨੂੰ ਇਸ ਟੈਬਲੇਟ ਦਾ ਇੰਟਰਨੈਟ ਕਨੈਕਸ਼ਨ ਸ਼ੇਅਰ ਕਰਨ ਤੋਂ ਡਿਸਕਨੈਕਟ ਕੀਤਾ ਜਾਏਗਾ।"</string>
-    <string name="bluetooth_disconnect_pan_nap_profile" product="default" msgid="5700332050175684571">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> ਨੂੰ ਇਸ ਫੋਨ ਦਾ ਇੰਟਰਨੈਟ ਕਨੈਕਸ਼ਨ ਸ਼ੇਅਰ ਕਰਨ ਤੋਂ ਡਿਸਕਨੈਕਟ ਕੀਤਾ ਜਾਏਗਾ।"</string>
-    <string name="bluetooth_device_advanced_title" msgid="6066342531927499308">"ਪੇਅਰ ਕੀਤੀ Bluetooth ਡੀਵਾਈਸ"</string>
+    <string name="bluetooth_disconnect_a2dp_profile" msgid="3524648279150937177">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> ਨੂੰ ਮੀਡੀਆ  ਆਡੀਓ  ਤੋਂ ਡਿਸਕਨੈਕਟ ਕੀਤਾ ਜਾਏਗਾ।"</string>
+    <string name="bluetooth_disconnect_headset_profile" msgid="8635908811168780720">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> ਨੂੰ ਹੈਂਡਸਫ੍ਰੀ  ਆਡੀਓ  ਤੋਂ ਡਿਸਕਨੈਕਟ ਕੀਤਾ ਜਾਏਗਾ।"</string>
+    <string name="bluetooth_disconnect_hid_profile" msgid="3282295189719352075">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> ਨੂੰ ਇਨਪੁੱਟ ਡੀਵਾਈਸ ਤੋਂ ਡਿਸਕਨੈਕਟ ਕੀਤਾ ਜਾਏਗਾ।"</string>
+    <string name="bluetooth_disconnect_pan_user_profile" msgid="8037627994382458698">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> ਰਾਹੀਂ ਇੰਟਰਨੈੱਟ ਪਹੁੰਚ ਡਿਸਕਨੈਕਟ ਕੀਤੀ ਜਾਏਗੀ।"</string>
+    <string name="bluetooth_disconnect_pan_nap_profile" product="tablet" msgid="1262792320446274407">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> ਨੂੰ ਇਸ ਟੈਬਲੈੱਟ ਦਾ ਇੰਟਰਨੈਟ ਕਨੈਕਸ਼ਨ ਸਾਂਝਾ ਕਰਨ ਤੋਂ ਡਿਸਕਨੈਕਟ ਕੀਤਾ ਜਾਵੇਗਾ।"</string>
+    <string name="bluetooth_disconnect_pan_nap_profile" product="default" msgid="5700332050175684571">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> ਨੂੰ ਇਸ ਫ਼ੋਨ ਦਾ ਇੰਟਰਨੈੱਟ ਕਨੈਕਸ਼ਨ ਸ਼ੇਅਰ ਕਰਨ ਤੋਂ ਡਿਸਕਨੈਕਟ ਕੀਤਾ ਜਾਏਗਾ।"</string>
+    <string name="bluetooth_device_advanced_title" msgid="6066342531927499308">"ਜੋੜਾਬੱਧ ਕੀਤਾ ਬਲੂਟੁੱਥ ਡੀਵਾਈਸ"</string>
     <string name="bluetooth_device_advanced_online_mode_title" msgid="3689050071425683114">"ਕਨੈਕਟ ਕਰੋ"</string>
-    <string name="bluetooth_device_advanced_online_mode_summary" msgid="1204424107263248336">"Bluetooth ਡੀਵਾਈਸ ਨਾਲ ਕਨੈਕਟ ਕਰੋ"</string>
+    <string name="bluetooth_device_advanced_online_mode_summary" msgid="1204424107263248336">"ਬਲੂਟੁੱਥ ਡੀਵਾਈਸ ਨਾਲ ਕਨੈਕਟ ਕਰੋ"</string>
     <string name="bluetooth_device_advanced_profile_header_title" msgid="102745381968579605">"ਇਸ ਲਈ ਵਰਤੋ"</string>
     <string name="bluetooth_device_advanced_rename_device" msgid="5148578059584955791">"ਮੁੜ-ਨਾਮਕਰਨ ਕਰੋ"</string>
     <string name="bluetooth_device_advanced_enable_opp_title" msgid="8222550640371627365">"ਇਨਕਮਿੰਗ ਫਾਈਲ ਟ੍ਰਾਂਸਫਰ ਦੀ ਆਗਿਆ ਦਿਓ"</string>
-    <string name="bluetooth_pan_user_profile_summary_connected" msgid="4602294638909590612">"ਇੰਟਰਨੈਟ ਪਹੁੰਚ ਲਈ ਡੀਵਾਈਸ ਨਾਲ ਕਨੈਕਟ ਕੀਤਾ"</string>
-    <string name="bluetooth_pan_nap_profile_summary_connected" msgid="1561383706411975199">"ਡੀਵਾਈਸ ਨਾਲ ਸਥਾਨਕ ਇੰਟਰਨੈਟ ਕਨੈਕਸ਼ਨ ਸ਼ੇਅਰ ਕਰ ਰਿਹਾ ਹੈ"</string>
+    <string name="bluetooth_pan_user_profile_summary_connected" msgid="4602294638909590612">"ਇੰਟਰਨੈੱਟ ਪਹੁੰਚ ਲਈ ਡੀਵਾਈਸ ਨਾਲ ਕਨੈਕਟ ਕੀਤਾ"</string>
+    <string name="bluetooth_pan_nap_profile_summary_connected" msgid="1561383706411975199">"ਡੀਵਾਈਸ ਨਾਲ ਸਥਾਨਕ ਇੰਟਰਨੈੱਟ ਕਨੈਕਸ਼ਨ ਸਾਂਝਾ ਕਰ ਰਿਹਾ ਹੈ"</string>
     <string name="bluetooth_dock_settings" msgid="3218335822716052885">"ਡੌਕ ਸੈਟਿੰਗਾਂ"</string>
-    <string name="bluetooth_dock_settings_title" msgid="5543069893044375188">"ਔਡੀਓ ਲਈ ਡੌਕ ਵਰਤੋ"</string>
-    <string name="bluetooth_dock_settings_headset" msgid="1001821426078644650">"ਸਪੀਕਰ ਫੋਨ ਦੇ ਤੌਰ ਤੇ"</string>
+    <string name="bluetooth_dock_settings_title" msgid="5543069893044375188">" ਆਡੀਓ  ਲਈ ਡੌਕ ਵਰਤੋ"</string>
+    <string name="bluetooth_dock_settings_headset" msgid="1001821426078644650">"ਸਪੀਕਰ ਫ਼ੋਨ ਦੇ ਤੌਰ ਤੇ"</string>
     <string name="bluetooth_dock_settings_a2dp" msgid="8791004998846630574">"ਸੰਗੀਤ ਅਤੇ ਮੀਡੀਆ ਲਈ"</string>
     <string name="bluetooth_dock_settings_remember" msgid="5551459057010609115">"ਸੈਟਿੰਗਾਂ ਯਾਦ ਰੱਖੋ"</string>
     <string name="wifi_display_settings_title" msgid="8740852850033480136">"ਕਾਸਟ"</string>
-    <string name="wifi_display_enable_menu_item" msgid="4883036464138167674">"ਵਾਇਰਲੈਸ ਡਿਸਪਲੇ ਸਮਰੱਥ ਬਣਾਓ"</string>
+    <string name="wifi_display_enable_menu_item" msgid="4883036464138167674">"ਵਾਇਰਲੈਸ ਡਿਸਪਲੇ ਚਾਲੂ ਕਰੋ"</string>
     <string name="wifi_display_no_devices_found" msgid="1382012407154143453">"ਕੋਈ ਨੇੜਲੀਆਂ ਡਿਵਾਈਸਾਂ ਨਹੀਂ ਮਿਲੀਆਂ।"</string>
     <string name="wifi_display_status_connecting" msgid="5688608834000748607">"ਕਨੈਕਟ ਕਰ ਰਿਹਾ ਹੈ"</string>
     <string name="wifi_display_status_connected" msgid="8364125226376985558">"ਕਨੈਕਟ ਕੀਤਾ"</string>
     <string name="wifi_display_status_in_use" msgid="8556830875615434792">"ਵਰਤੋਂ ਵਿੱਚ"</string>
     <string name="wifi_display_status_not_available" msgid="5714978725794210102">"ਅਣਉਪਲਬਧ"</string>
-    <string name="wifi_display_details" msgid="7791118209992162698">"ਡਿਸਪਲੇ ਸੈਟਿੰਗਜ਼"</string>
-    <string name="wifi_display_options_title" msgid="5740656401635054838">"ਵਾਇਰਲੈਸ ਡਿਸਪਲੇ ਚੋਣਾਂ"</string>
+    <string name="wifi_display_details" msgid="7791118209992162698">"ਡਿਸਪਲੇ ਸੈਟਿੰਗਾਂ"</string>
+    <string name="wifi_display_options_title" msgid="5740656401635054838">"ਵਾਇਰਲੈੱਸ ਡਿਸਪਲੇ ਚੋਣਾਂ"</string>
     <string name="wifi_display_options_forget" msgid="9119048225398894580">"ਭੁੱਲਣਾ"</string>
     <string name="wifi_display_options_done" msgid="5703116500357822557">"ਹੋ ਗਿਆ"</string>
     <string name="wifi_display_options_name" msgid="4756080222307467898">"ਨਾਮ"</string>
     <string name="wifi_band_24ghz" msgid="852929254171856911">"2.4 GHz"</string>
     <string name="wifi_band_5ghz" msgid="6433822023268515117">"5 GHz"</string>
     <string name="link_speed" msgid="8896664974117585555">"%1$d Mbps"</string>
-    <string name="wifi_ask_enable" msgid="2795469717302060104">"<xliff:g id="REQUESTER">%s</xliff:g> Wi-Fi ਨੂੰ ਚਾਲੂ ਕਰਨਾ ਚਾਹੁੰਦੀ ਹੈ"</string>
-    <string name="wifi_ask_disable" msgid="728366570145493573">"<xliff:g id="REQUESTER">%s</xliff:g> Wi-Fi ਨੂੰ ਬੰਦ ਕਰਨਾ ਚਾਹੁੰਦੀ ਹੈ"</string>
+    <string name="wifi_ask_enable" msgid="2795469717302060104">"<xliff:g id="REQUESTER">%s</xliff:g> ਵਾਈ-ਫਾਈ ਨੂੰ ਚਾਲੂ ਕਰਨਾ ਚਾਹੁੰਦੀ ਹੈ"</string>
+    <string name="wifi_ask_disable" msgid="728366570145493573">"<xliff:g id="REQUESTER">%s</xliff:g> ਵਾਈ-ਫਾਈ ਨੂੰ ਬੰਦ ਕਰਨਾ ਚਾਹੁੰਦੀ ਹੈ"</string>
     <string name="nfc_quick_toggle_title" msgid="6769159366307299004">"NFC"</string>
-    <string name="nfc_quick_toggle_summary" product="tablet" msgid="8302974395787498915">"ਜਦੋਂ ਟੈਬਲੇਟ ਦੂਜੀ ਡੀਵਾਈਸ ਨੂੰ ਛੋਂਹਦੀ ਹੈ ਤਾਂ ਡੈਟਾ ਐਕਸਚੇਂਜ ਦੀ ਆਗਿਆ ਦਿਓ"</string>
-    <string name="nfc_quick_toggle_summary" product="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="wifi_quick_toggle_title" msgid="8850161330437693895">"Wi‑Fi"</string>
-    <string name="wifi_quick_toggle_summary" msgid="2696547080481267642">"Wi‑Fi ਚਾਲੂ ਕਰੋ"</string>
-    <string name="wifi_settings" msgid="29722149822540994">"Wi‑Fi"</string>
-    <string name="wifi_settings_category" msgid="8719175790520448014">"Wi-Fi ਸੈਟਿੰਗਾਂ"</string>
-    <string name="wifi_settings_title" msgid="3103415012485692233">"Wi‑Fi"</string>
-    <string name="wifi_settings_summary" msgid="668767638556052820">"ਵਾਇਰਲੈਸ ਪਹੁੰਚ ਬਿੰਦੂ ਸੈਟ ਅਪ &amp; ਵਿਵਸਥਿਤ ਕਰੋ"</string>
-    <string name="wifi_select_network" msgid="4210954938345463209">"Wi‑Fi ਚੁਣੋ"</string>
-    <string name="wifi_starting" msgid="6732377932749942954">"Wi‑Fi ਚਾਲੂ ਕਰ ਰਿਹਾ ਹੈ…"</string>
-    <string name="wifi_stopping" msgid="8952524572499500804">"Wi‑Fi ਬੰਦ ਕਰ ਰਿਹਾ ਹੈ…"</string>
+    <string name="android_beam_explained" msgid="1810540319385192758">"ਜਦੋਂ ਇਹ ਵਿਸ਼ੇਸ਼ਤਾ ਚਾਲੂ ਕੀਤੀ ਹੋਵੇ, ਤਾਂ ਡੀਵਾਈਸਾਂ ਨੂੰ ਇੱਕ-ਦੂਜੇ ਦੇ ਨੇੜੇ ਰੱਖ ਕੇ ਤੁਸੀਂ ਐਪ ਸਮੱਗਰੀ ਨੂੰ ਕਿਸੇ ਹੋਰ NFC-ਸਮਰੱਥਾ ਵਾਲੇ ਡੀਵਾਈਸ \'ਤੇ ਬੀਮ ਕਰ ਸਕਦੇ ਹੋ। ਉਦਾਹਰਨ ਲਈ, ਤੁਸੀਂ ਵੈੱਬ ਪੰਨਿਆਂ, YouTube ਵੀਡੀਓ, ਸੰਪਰਕਾਂ, ਅਤੇ ਹੋਰ ਚੀਜ਼ਾਂ ਨੂੰ ਬੀਮ ਕਰ ਸਕਦੇ ਹੋ।\n\nਬੱਸ ਡੀਵਾਈਸਾਂ ਨੂੰ ਇੱਕ-ਦੂਜੇ ਦੇ ਨੇੜੇ ਲਿਆਓ (ਮਿਸਾਲ ਦੇ ਤੌਰ \'ਤੇ ਪਿਛਲੇ ਪਾਸੇ ਨੂੰ ਪਿਛਲੇ ਪਾਸੇ ਨਾਲ ਜੋੜੋ) ਅਤੇ ਫਿਰ ਆਪਣੀ ਸਕ੍ਰੀਨ ਨੂੰ ਟੈਪ ਕਰੋ। ਐਪ ਇਹ ਤੈੈਅ ਕਰਦੀ ਹੈ ਕਿ ਕਿਹੜੀ ਚੀਜ਼ ਬੀਮ ਕੀਤੀ ਜਾਂਦੀ ਹੈ।"</string>
+    <string name="wifi_quick_toggle_title" msgid="8850161330437693895">"ਵਾਈ‑ਫਾਈ"</string>
+    <string name="wifi_quick_toggle_summary" msgid="2696547080481267642">"ਵਾਈ‑ਫਾਈ ਚਾਲੂ ਕਰੋ"</string>
+    <string name="wifi_settings" msgid="29722149822540994">"ਵਾਈ‑ਫਾਈ"</string>
+    <string name="wifi_settings_category" msgid="8719175790520448014">"ਵਾਈ-ਫਾਈ ਸੈਟਿੰਗਾਂ"</string>
+    <string name="wifi_settings_title" msgid="3103415012485692233">"ਵਾਈ‑ਫਾਈ"</string>
+    <string name="wifi_settings_summary" msgid="668767638556052820">"ਵਾਇਰਲੈਸ ਐਕਸੈੱਸ ਪੁਆਇੰਟ ਸੈੱਟ ਅੱਪ &amp; ਵਿਵਸਥਿਤ ਕਰੋ"</string>
+    <string name="wifi_select_network" msgid="4210954938345463209">"ਵਾਈ‑ਫਾਈ ਚੁਣੋ"</string>
+    <string name="wifi_starting" msgid="6732377932749942954">"ਵਾਈ‑ਫਾਈ ਚਾਲੂ ਹੋ ਰਿਹਾ ਹੈ…"</string>
+    <string name="wifi_stopping" msgid="8952524572499500804">"ਵਾਈ‑ਫਾਈ ਬੰਦ ਹੋ ਰਿਹਾ ਹੈ…"</string>
     <string name="wifi_error" msgid="3207971103917128179">"ਅਸ਼ੁੱਧੀ"</string>
     <string name="wifi_sap_no_channel_error" msgid="3108445199311817111">"5 GHz ਬੈਂਡ ਇਸ ਦੇਸ਼ ਵਿੱਚ ਉਪਲਬਧ ਨਹੀਂ ਹੈ"</string>
     <string name="wifi_in_airplane_mode" msgid="8652520421778203796">"ਏਅਰਪਲੇਨ ਮੋਡ ਵਿੱਚ"</string>
     <string name="wifi_notify_open_networks" msgid="76298880708051981">"ਖੁੱਲ੍ਹੇ ਨੈੱਟਵਰਕ ਦੀ ਸੂਚਨਾ"</string>
     <string name="wifi_notify_open_networks_summary" msgid="2761326999921366960">"ਉੱਚ ਗੁਣਵੱਤਾ ਵਾਲਾ ਕੋਈ ਜਨਤਕ ਨੈੱਟਵਰਕ ਉਪਲਬਧ ਹੋਣ \'ਤੇ ਸੂਚਿਤ ਕਰੋ"</string>
-    <string name="wifi_wakeup" msgid="8815640989361538036">"Wi‑Fi ਸਵੈਚਲਿਤ ਤੌਰ \'ਤੇ ਚਾਲੂ ਕਰੋ"</string>
-    <string name="wifi_wakeup_summary" msgid="2530814331062997163">"ਤੁਹਾਡੇ ਘਰੇਲੂ ਨੈੱਟਵਰਕ ਵਰਗੇ ਉੱਚ-ਗੁਣਵੱਤਾ ਵਾਲੇ ਰੱਖਿਅਤ ਕੀਤੇ ਨੈੱਟਵਰਕਾਂ ਦੇ ਨੇੜੇ ਹੋਣ \'ਤੇ Wi-Fi ਦੁਬਾਰਾ ਚਾਲੂ ਹੋ ਜਾਵੇਗਾ"</string>
-    <string name="wifi_wakeup_summary_scanning_disabled" msgid="7247227922074840445">"ਅਣਉਪਲਬਧ ਕਿਉਂਕਿ Wi‑Fi ਸਕੈਨਿੰਗ ਬੰਦ ਹੈ"</string>
+    <string name="wifi_wakeup" msgid="8815640989361538036">"ਵਾਈ‑ਫਾਈ ਸਵੈਚਲਿਤ ਤੌਰ \'ਤੇ ਚਾਲੂ ਕਰੋ"</string>
+    <string name="wifi_wakeup_summary" msgid="2530814331062997163">"ਤੁਹਾਡੇ ਘਰੇਲੂ ਨੈੱਟਵਰਕ ਵਰਗੇ ਉੱਚ-ਗੁਣਵੱਤਾ ਵਾਲੇ ਰੱਖਿਅਤ ਕੀਤੇ ਨੈੱਟਵਰਕਾਂ ਦੇ ਨੇੜੇ ਹੋਣ \'ਤੇ ਵਾਈ-ਫਾਈ ਦੁਬਾਰਾ ਚਾਲੂ ਹੋ ਜਾਵੇਗਾ"</string>
+    <string name="wifi_wakeup_summary_scanning_disabled" msgid="7247227922074840445">"ਅਣਉਪਲਬਧ, ਕਿਉਂਕਿ ਵਾਈ‑ਫਾਈ ਸਕੈਨਿੰਗ ਬੰਦ ਹੈ"</string>
     <string name="wifi_wakeup_summary_scoring_disabled" msgid="108339002136866897">"ਵਰਤਣ ਲਈ, ਕੋਈ ਨੈੱਟਵਰਕ ਰੇਟਿੰਗ ਪ੍ਰਦਾਨਕ ਚੁਣੋ"</string>
     <string name="wifi_poor_network_detection" msgid="4925789238170207169">"ਖ਼ਰਾਬ ਕਨੈਕਸ਼ਨਾਂ ਤੋਂ ਬਚੋ"</string>
-    <string name="wifi_poor_network_detection_summary" msgid="2784135142239546291">"ਜੇਕਰ ਤੱਕ ਤੁਹਾਡੇ ਕੋਲ ਇੱਕ ਚੰਗਾ ਇੰਟਰਨੈਟ ਕਨੈਕਸ਼ਨ ਨਾ ਹੋਵੇ ਤਾਂ Wi‑Fi ਨੈੱਟਵਰਕ ਨਾ ਵਰਤੋ"</string>
-    <string name="wifi_avoid_poor_network_detection_summary" msgid="4674423884870027498">"ਕੇਵਲ ਉਹ ਨੈੱਟਵਰਕ ਵਰਤੋ ਜਿਹਨਾਂ ਦਾ ਇੱਕ ਚੰਗਾ ਇੰਟਰਨੈਟ ਕਨੈਕਸ਼ਨ ਹੈ"</string>
+    <string name="wifi_poor_network_detection_summary" msgid="2784135142239546291">"ਜੇਕਰ ਤੱਕ ਤੁਹਾਡੇ ਕੋਲ ਇੱਕ ਚੰਗਾ ਇੰਟਰਨੈੱਟ ਕਨੈਕਸ਼ਨ ਨਾ ਹੋਵੇ ਤਾਂ ਵਾਈ-ਫਾਈ ਨੈੱਟਵਰਕ ਨਾ ਵਰਤੋ"</string>
+    <string name="wifi_avoid_poor_network_detection_summary" msgid="4674423884870027498">"ਕੇਵਲ ਉਹ ਨੈੱਟਵਰਕ ਵਰਤੋ ਜਿਹਨਾਂ ਦਾ ਇੱਕ ਚੰਗਾ ਇੰਟਰਨੈੱਟ ਕਨੈਕਸ਼ਨ ਹੈ"</string>
     <string name="use_open_wifi_automatically_title" msgid="6851951242903078588">"ਖੁੱਲ੍ਹੇ ਨੈੱਟਵਰਕਾਂ ਨਾਲ ਕਨੈਕਟ ਕਰੋ"</string>
     <string name="use_open_wifi_automatically_summary" msgid="2982091714252931713">"ਆਪਣੇ ਆਪ ਉੱਚ-ਗੁਣਵੱਤਾ ਵਾਲੇ ਜਨਤਕ ਨੈੱਟਵਰਕਾਂ ਨਾਲ ਕਨੈਕਟ ਕਰੋ"</string>
     <string name="use_open_wifi_automatically_summary_scoring_disabled" msgid="593964217679325831">"ਵਰਤਣ ਲਈ, ਕੋਈ ਨੈੱਟਵਰਕ ਰੇਟਿੰਗ ਪ੍ਰਦਾਨਕ ਚੁਣੋ"</string>
     <string name="use_open_wifi_automatically_summary_scorer_unsupported_disabled" msgid="8472122600853650258">"ਵਰਤਣ ਲਈ, ਕੋਈ ਅਨੁਰੂਪ ਨੈੱਟਵਰਕ ਰੇਟਿੰਗ ਪ੍ਰਦਾਨਕ ਚੁਣੋ"</string>
-    <string name="wifi_install_credentials" msgid="3551143317298272860">"ਸਰਟੀਫਿਕੇਟ ਇੰਸਟੌਲ ਕਰੋ"</string>
-    <string name="wifi_scan_notify_text" msgid="5593805423071186757">"ਨਿਰਧਾਰਿਤ ਸਥਾਨ ਸ਼ੁੱਧਤਾ ਨੂੰ ਬਿਹਤਰ ਬਣਾਉਣ ਲਈ, ਸਿਸਟਮ ਐਪਸ ਅਤੇ ਸੇਵਾਵਾਂ Wi‑Fi ਨੈਟਵਰਕਾਂ ਨੂੰ ਤਦ ਵੀ ਸਕੈਨ ਕਰ ਸਕਦੀਆਂ ਹਨ। ਤੁਸੀਂ ਇਸਨੂੰ <xliff:g id="LINK_BEGIN_0">LINK_BEGIN</xliff:g>ਸਕੈਨਿੰਗ ਸੈਟਿੰਗਾਂ<xliff:g id="LINK_END_1">LINK_END</xliff:g> ਵਿੱਚ ਬਦਲ ਸਕਦੇ ਹੋ।"</string>
-    <string name="wifi_scan_notify_text_scanning_off" msgid="3426075479272242098">"ਟਿਕਾਣੇ ਦੀ ਸਟੀਕਤਾ ਨੂੰ ਬਿਹਤਰ ਬਣਾਉਣ ਲਈ, <xliff:g id="LINK_BEGIN_0">LINK_BEGIN</xliff:g>ਸਕੈਨਿੰਗ ਸੈਟਿੰਗਾਂ<xliff:g id="LINK_END_1">LINK_END</xliff:g> ਵਿੱਚ Wi-Fi ਸਕੈਨ ਕਰਨ ਨੂੰ ਚਾਲੂ ਕਰੋ।"</string>
+    <string name="wifi_install_credentials" msgid="3551143317298272860">"ਪ੍ਰਮਾਣ-ਪੱਤਰ ਸਥਾਪਤ ਕਰੋ"</string>
+    <string name="wifi_scan_notify_text" msgid="5593805423071186757">"ਟਿਕਾਣਾ ਸ਼ੁੱਧਤਾ ਨੂੰ ਬਿਹਤਰ ਬਣਾਉਣ ਲਈ, ਸਿਸਟਮ ਐਪਾਂ ਅਤੇ ਸੇਵਾਵਾਂ ਵਾਈ-ਫਾਈ ਨੈੱਟਵਰਕਾਂ ਨੂੰ ਤਦ ਵੀ ਸਕੈਨ ਕਰ ਸਕਦੀਆਂ ਹਨ। ਤੁਸੀਂ ਇਸਨੂੰ <xliff:g id="LINK_BEGIN_0">LINK_BEGIN</xliff:g>ਸਕੈਨਿੰਗ ਸੈਟਿੰਗਾਂ<xliff:g id="LINK_END_1">LINK_END</xliff:g> ਵਿੱਚ ਬਦਲ ਸਕਦੇ ਹੋ।"</string>
+    <string name="wifi_scan_notify_text_scanning_off" msgid="3426075479272242098">"ਟਿਕਾਣੇ ਦੀ ਸਟੀਕਤਾ ਨੂੰ ਬਿਹਤਰ ਬਣਾਉਣ ਲਈ, <xliff:g id="LINK_BEGIN_0">LINK_BEGIN</xliff:g>ਸਕੈਨਿੰਗ ਸੈਟਿੰਗਾਂ<xliff:g id="LINK_END_1">LINK_END</xliff:g> ਵਿੱਚ ਵਾਈ-ਫਾਈ ਸਕੈਨ ਕਰਨ ਨੂੰ ਚਾਲੂ ਕਰੋ।"</string>
     <string name="wifi_scan_notify_remember_choice" msgid="7104867814641144485">"ਦੁਬਾਰਾ ਨਾ ਦਿਖਾਓ"</string>
-    <string name="wifi_setting_sleep_policy_title" msgid="5149574280392680092">"ਨਿਸ਼ਕਿਰਿਆ ਹੋਣ ਦੇ ਦੌਰਾਨ Wi‑Fi ਚਾਲੂ ਰੱਖੋ"</string>
-    <string name="wifi_setting_on_during_sleep_title" msgid="8308975500029751565">"ਨਿਸ਼ਕਿਰਿਆ ਹੋਣ ਦੇ ਦੌਰਾਨ Wi‑Fi ਚਾਲੂ"</string>
+    <string name="wifi_setting_sleep_policy_title" msgid="5149574280392680092">"ਨਿਸ਼ਕਿਰਿਆ ਹੋਣ ਦੇ ਦੌਰਾਨ ਵਾਈ‑ਫਾਈ ਚਾਲੂ ਰੱਖੋ"</string>
+    <string name="wifi_setting_on_during_sleep_title" msgid="8308975500029751565">"ਨਿਸ਼ਕਿਰਿਆ ਹੋਣ ਦੇ ਦੌਰਾਨ ਵਾਈ‑ਫਾਈ ਚਾਲੂ"</string>
     <string name="wifi_setting_sleep_policy_error" msgid="8174902072673071961">"ਸੈਟਿੰਗ ਬਦਲਣ ਵਿੱਚ ਇੱਕ ਸਮੱਸਿਆ ਹੋਈ ਸੀ"</string>
     <string name="wifi_suspend_efficiency_title" msgid="2338325886934703895">"ਸਮਰੱਥਾ ਬਿਹਤਰ ਬਣਾਓ"</string>
-    <string name="wifi_suspend_optimizations" msgid="1220174276403689487">"Wi‑Fi ਅਨੁਕੂਲਨ"</string>
-    <string name="wifi_suspend_optimizations_summary" msgid="4151428966089116856">"ਜਦੋਂ Wi‑Fi ਚਾਲੂ ਹੋਵੇ ਤਾਂ ਬੈਟਰੀ ਵਰਤੋਂ ਘੱਟ ਕਰੋ"</string>
-    <string name="wifi_limit_optimizations_summary" msgid="9000801068363468950">"Wi‑Fi ਵੱਲੋਂ ਵਰਤੀ ਗਈ ਸੀਮਿਤ ਬੈਟਰੀ"</string>
-    <string name="wifi_switch_away_when_unvalidated" msgid="1707247692180853058">"Wi‑Fi ਦੀ ਇੰਟਰਨੈੱਟ \'ਤੇ ਪਹੁੰਚ ਚਲੀ ਜਾਣ \'ਤੇ ਬਦਲਕੇ ਮੋਬਾਈਲ ਡੈਟੇ \'ਤੇ ਜਾਓ।"</string>
-    <string name="wifi_cellular_data_fallback_title" msgid="8753386877755616476">"ਸਵੈਚਲਿਤ ਤੌਰ \'ਤੇ ਬਦਲੀ ਕਰਕੇ ਮੋਬਾਈਲ ਡੈਟੇ \'ਤੇ ਜਾਓ"</string>
-    <string name="wifi_cellular_data_fallback_summary" msgid="6375399280719867214">"Wi‑Fi ਦੀ ਇੰਟਰਨੈੱਟ \'ਤੇ ਪਹੁੰਚ ਨਾ ਹੋਣ \'ਤੇ ਮੋਬਾਈਲ ਡੈਟਾ ਵਰਤੋ। ਡੈਟਾ ਉਪਯੋਗ ਵਾਸਤੇ ਖਰਚੇ ਲਾਗੂ ਹੋ ਸਕਦੇ ਹਨ।"</string>
-    <string name="wifi_add_network" msgid="6234851776910938957">"ਨੈੱਟਵਰਕ ਜੋੜੋ"</string>
-    <string name="wifi_configure_settings_preference_title" msgid="2913345003906899146">"Wi‑Fi ਤਰਜੀਹਾਂ"</string>
-    <string name="wifi_configure_settings_preference_summary_wakeup_on" msgid="646393113104367290">"Wi‑Fi ਸਵੈਚਲਿਤ ਤੌਰ \'ਤੇ ਦੁਬਾਰਾ ਚਾਲੂ ਹੁੰਦਾ ਹੈ"</string>
-    <string name="wifi_configure_settings_preference_summary_wakeup_off" msgid="2782566279864356713">"Wi‑Fi ਸਵੈਚਲਿਤ ਤੌਰ \'ਤੇ ਦੁਬਾਰਾ ਚਾਲੂ ਨਹੀਂ ਹੁੰਦਾ ਹੈ"</string>
-    <string name="wifi_access_points" msgid="7053990007031968609">"Wi‑Fi ਨੈੱਟਵਰਕ"</string>
+    <string name="wifi_suspend_optimizations" msgid="1220174276403689487">"ਵਾਈ‑ਫਾਈ ਅਨੁਕੂਲਨ"</string>
+    <string name="wifi_suspend_optimizations_summary" msgid="4151428966089116856">"ਜਦੋਂ ਵਾਈ‑ਫਾਈ ਚਾਲੂ ਹੋਵੇ ਤਾਂ ਬੈਟਰੀ ਵਰਤੋਂ ਘੱਟ ਕਰੋ"</string>
+    <string name="wifi_limit_optimizations_summary" msgid="9000801068363468950">"ਵਾਈ‑ਫਾਈ ਵੱਲੋਂ ਵਰਤੀ ਗਈ ਸੀਮਿਤ ਬੈਟਰੀ"</string>
+    <string name="wifi_switch_away_when_unvalidated" msgid="1707247692180853058">"ਵਾਈ-ਫਾਈ ਦੀ ਇੰਟਰਨੈੱਟ \'ਤੇ ਪਹੁੰਚ ਚਲੀ ਜਾਣ \'ਤੇ ਸਵਿੱਚ ਕਰਕੇ ਮੋਬਾਈਲ ਡਾਟੇ \'ਤੇ ਜਾਓ।"</string>
+    <string name="wifi_cellular_data_fallback_title" msgid="8753386877755616476">"ਸਵੈਚਲਿਤ ਤੌਰ \'ਤੇ ਸਵਿੱਚ ਕਰਕੇ ਮੋਬਾਈਲ ਡਾਟੇ \'ਤੇ ਜਾਓ"</string>
+    <string name="wifi_cellular_data_fallback_summary" msgid="6375399280719867214">"ਵਾਈ‑ਫਾਈ ਦੀ ਇੰਟਰਨੈੱਟ \'ਤੇ ਪਹੁੰਚ ਨਾ ਹੋਣ \'ਤੇ ਮੋਬਾਈਲ ਡਾਟਾ ਵਰਤੋ। ਡਾਟਾ ਵਰਤੋਂ ਵਾਸਤੇ ਖਰਚੇ ਲਾਗੂ ਹੋ ਸਕਦੇ ਹਨ।"</string>
+    <string name="wifi_add_network" msgid="6234851776910938957">"ਨੈੱਟਵਰਕ ਸ਼ਾਮਲ ਕਰੋ"</string>
+    <string name="wifi_configure_settings_preference_title" msgid="2913345003906899146">"ਵਾਈ‑ਫਾਈ ਤਰਜੀਹਾਂ"</string>
+    <string name="wifi_configure_settings_preference_summary_wakeup_on" msgid="646393113104367290">"ਵਾਈ‑ਫਾਈ ਸਵੈਚਲਿਤ ਤੌਰ \'ਤੇ ਦੁਬਾਰਾ ਚਾਲੂ ਹੁੰਦਾ ਹੈ"</string>
+    <string name="wifi_configure_settings_preference_summary_wakeup_off" msgid="2782566279864356713">"ਵਾਈ‑ਫਾਈ ਸਵੈਚਲਿਤ ਤੌਰ \'ਤੇ ਦੁਬਾਰਾ ਚਾਲੂ ਨਹੀਂ ਹੁੰਦਾ ਹੈ"</string>
+    <string name="wifi_access_points" msgid="7053990007031968609">"ਵਾਈ‑ਫਾਈ ਨੈੱਟਵਰਕ"</string>
     <string name="wifi_menu_wps_pbc" msgid="2668564692207863017">"WPS ਪੁਸ਼ ਬਟਨ"</string>
     <string name="wifi_menu_more_options" msgid="2448097861752719396">"ਹੋਰ ਚੋਣਾਂ"</string>
-    <string name="wifi_menu_wps_pin" msgid="6426448256268695933">"WPS Pin ਐਂਟਰੀ"</string>
-    <string name="wifi_menu_p2p" msgid="7619851399250896797">"Wi‑Fi ਡਾਇਰੈਕਟ"</string>
+    <string name="wifi_menu_wps_pin" msgid="6426448256268695933">"WPS ਪਿੰਨ ਐਂਟਰੀ"</string>
+    <string name="wifi_menu_p2p" msgid="7619851399250896797">"ਵਾਈ‑ਫਾਈ ਡਾਇਰੈਕਟ"</string>
     <string name="wifi_menu_scan" msgid="1470911530412095868">"ਸਕੈਨ ਕਰੋ"</string>
-    <string name="wifi_menu_advanced" msgid="7522252991919573664">"ਉੱਨਤ"</string>
-    <string name="wifi_menu_configure" msgid="6150926852602171938">"ਸੰਰੂਪਣ ਕਰੋ"</string>
+    <string name="wifi_menu_advanced" msgid="7522252991919573664">"ਵਿਕਸਿਤ"</string>
+    <string name="wifi_menu_configure" msgid="6150926852602171938">"ਰੂਪ-ਰੇਖਾ ਬਦਲੋ"</string>
     <string name="wifi_menu_connect" msgid="4996220309848349408">"ਨੈੱਟਵਰਕ ਨਾਲ ਕਨੈਕਟ ਕਰੋ"</string>
     <string name="wifi_menu_remember" msgid="8814185749388713796">"ਨੈੱਟਵਰਕ ਯਾਦ ਰੱਖੋ"</string>
     <string name="wifi_menu_forget" msgid="8736964302477327114">"ਨੈੱਟਵਰਕ ਛੱਡ ਦਿਓ"</string>
     <string name="wifi_menu_modify" msgid="2068554918652440105">"ਨੈੱਟਵਰਕ ਸੰਸ਼ੋਧਿਤ ਕਰੋ"</string>
     <string name="wifi_menu_write_to_nfc" msgid="7692881642188240324">"NFC ਟੈਗ ਵਿੱਚ ਲਿਖੋ"</string>
-    <string name="wifi_empty_list_wifi_off" msgid="8056223875951079463">"ਉਪਲਬਧ ਨੈੱਟਵਰਕ ਦੇਖਣ ਲਈ, Wi‑Fi ਚਾਲੂ ਕਰੋ।"</string>
-    <string name="wifi_empty_list_wifi_on" msgid="8746108031587976356">"Wi‑Fi ਨੈਟਵਰਕਾਂ ਦੀ ਖੋਜ ਕਰ ਰਿਹਾ ਹੈ…"</string>
-    <string name="wifi_empty_list_user_restricted" msgid="7322372065475939129">"ਤੁਹਾਡੇ ਕੋਲ Wi‑Fi ਨੈੱਟਵਰਕ ਨੂੰ ਬਦਲਣ ਦੀ ਅਨੁਮਤੀ ਨਹੀਂ ਹੈ।"</string>
+    <string name="wifi_empty_list_wifi_off" msgid="8056223875951079463">"ਉਪਲਬਧ ਨੈੱਟਵਰਕ ਦੇਖਣ ਲਈ, ਵਾਈ‑ਫਾਈ ਚਾਲੂ ਕਰੋ।"</string>
+    <string name="wifi_empty_list_wifi_on" msgid="8746108031587976356">"ਵਾਈ‑ਫਾਈ ਨੈੱਟਵਰਕਾਂ ਦੀ ਖੋਜ ਹੋ ਰਹੀ ਹੈ…"</string>
+    <string name="wifi_empty_list_user_restricted" msgid="7322372065475939129">"ਤੁਹਾਡੇ ਕੋਲ ਵਾਈ‑ਫਾਈ ਨੈੱਟਵਰਕ ਨੂੰ ਬਦਲਣ ਦੀ ਇਜਾਜ਼ਤ ਨਹੀਂ ਹੈ।"</string>
     <string name="wifi_more" msgid="3195296805089107950">"ਹੋਰ"</string>
     <string name="wifi_setup_wps" msgid="8128702488486283957">"ਆਟੋਮੈਟਿਕ ਸੈਟਅਪ (WPS)"</string>
-    <string name="wifi_show_advanced" msgid="3409422789616520979">"ਉੱਨਤ ਚੋਣਾਂ"</string>
-    <string name="wifi_advanced_toggle_description_expanded" msgid="2380600578544493084">"ਡ੍ਰੌਪ ਡਾਊਨ ਸੂਚੀ ਉੱਨਤ ਵਿਕਲਪ। ਸੁੰਗੇੜਨ ਲਈ ਡਬਲ-ਟੈਪ ਕਰੋ।"</string>
-    <string name="wifi_advanced_toggle_description_collapsed" msgid="1463812308429197263">"ਡ੍ਰੌਪ ਡਾਊਨ ਸੂਚੀ ਉੱਨਤ ਵਿਕਲਪ। ਵਿਸਤਾਰ ਕਰਨ ਲਈ ਡਬਲ-ਟੈਪ ਕਰੋ।"</string>
-    <string name="wifi_wps_setup_title" msgid="8207552222481570175">"Wi‑Fi ਸੁਰੱਖਿਅਤ ਸੈਟਅਪ"</string>
+    <string name="wifi_show_advanced" msgid="3409422789616520979">"ਵਿਕਸਿਤ ਵਿਕਲਪ"</string>
+    <string name="wifi_advanced_toggle_description_expanded" msgid="2380600578544493084">"ਡ੍ਰੌਪ-ਡਾਊਨ ਸੂਚੀ ਉੱਨਤ ਵਿਕਲਪ। ਸੰਖਿਪਤ ਲਈ ਡਬਲ ਟੈਪ ਕਰੋ।"</string>
+    <string name="wifi_advanced_toggle_description_collapsed" msgid="1463812308429197263">"ਡ੍ਰੌਪ-ਡਾਊਨ ਸੂਚੀ ਉੱਨਤ ਵਿਕਲਪ। ਵਿਸਤਾਰ ਕਰਨ ਲਈ ਡਬਲ ਟੈਪ ਕਰੋ।"</string>
+    <string name="wifi_wps_setup_title" msgid="8207552222481570175">"ਵਾਈ‑ਫਾਈ ਸੁਰੱਖਿਅਤ ਸੈੱਟਅੱਪ"</string>
     <string name="wifi_wps_setup_msg" msgid="315174329121275092">"WPS ਨੂੰ ਚਾਲੂ ਕਰ ਰਿਹਾ ਹੈ…"</string>
-    <string name="wifi_wps_onstart_pbc" msgid="817003360936932340">"ਆਪਣੇ ਰੂਟਰ ਤੇ Wi‑Fi ਸੁਰੱਖਿਅਤ ਸੈਟਅਪ ਬਟਨ ਦਬਾਓ। ਇਸਨੂੰ \"WPS\" ਕਿਹਾ ਜਾ ਸਕਦਾ ਹੈ ਜਾਂ ਇਸ ਚਿੰਨ੍ਹ ਨਾਲ ਚਿੰਨ੍ਹਿਤ ਕੀਤਾ ਜਾ ਸਕਦਾ ਹੈ:"</string>
-    <string name="wifi_wps_onstart_pin" msgid="223344506445335358">"ਆਪਣੇ Wi‑Fi ਰੂਟਰ ਤੇ pin <xliff:g id="NUMBER">%1$s</xliff:g> ਦਾਖਲ ਕਰੋ। ਸੈਟਅਪ ਨੂੰ ਪੂਰਾ ਹੋਣ ਵਿੱਚ ਦੋ ਮਿੰਟ ਲੱਗ ਸਕਦੇ ਹਨ।"</string>
+    <string name="wifi_wps_onstart_pbc" msgid="817003360936932340">"ਆਪਣੇ ਰੂਟਰ ਤੇ ਵਾਈ‑ਫਾਈ ਸੁਰੱਖਿਅਤ ਸੈੱਟਅੱਪ ਬਟਨ ਦਬਾਓ। ਇਸਨੂੰ \"WPS\" ਕਿਹਾ ਜਾ ਸਕਦਾ ਹੈ ਜਾਂ ਇਸ ਚਿੰਨ੍ਹ ਨਾਲ ਚਿੰਨ੍ਹਿਤ ਕੀਤਾ ਜਾ ਸਕਦਾ ਹੈ:"</string>
+    <string name="wifi_wps_onstart_pin" msgid="223344506445335358">"ਆਪਣੇ ਵਾਈ‑ਫਾਈ ਰੂਟਰ \'ਤੇ ਪਿੰਨ <xliff:g id="NUMBER">%1$s</xliff:g> ਦਾਖਲ ਕਰੋ। ਸੈੱਟਅੱਪ ਨੂੰ ਪੂਰਾ ਹੋਣ ਵਿੱਚ ਦੋ ਮਿੰਟ ਲੱਗ ਸਕਦੇ ਹਨ।"</string>
     <string name="wifi_wps_complete" msgid="2388138550456729134">"WPS ਸਫਲ। ਨੈੱਟਵਰਕ ਨਾਲ ਕਨੈਕਟ ਕਰ ਰਿਹਾ ਹੈ..."</string>
-    <string name="wifi_wps_connected" msgid="7153432445748931183">"Wi‑Fi ਨੈੱਟਵਰਕ <xliff:g id="NETWORK_NAME">%s</xliff:g> ਨਾਲ ਕਨੈਕਟ ਕੀਤਾ"</string>
+    <string name="wifi_wps_connected" msgid="7153432445748931183">"ਵਾਈ‑ਫਾਈ ਨੈੱਟਵਰਕ <xliff:g id="NETWORK_NAME">%s</xliff:g> ਨਾਲ ਕਨੈਕਟ ਕੀਤਾ"</string>
     <string name="wifi_wps_in_progress" msgid="3372311348221357944">"WPS ਪਹਿਲਾਂ ਹੀ ਚਾਲੂ ਹੈ ਅਤੇ ਪੂਰਾ ਕਰਨ ਵਿੱਚ ਦੋ ਮਿੰਟ ਲੱਗ ਸਕਦੇ ਹਨ"</string>
     <string name="wifi_wps_failed_generic" msgid="5668775022238832527">"WPS ਅਸਫਲ। ਕਿਰਪਾ ਕਰਕੇ ਥੋੜ੍ਹੀ ਦੇਰ ਵਿੱਚ ਦੁਬਾਰਾ ਕੋਸ਼ਿਸ਼ ਕਰੋ।"</string>
     <string name="wifi_wps_failed_wep" msgid="2702820087105284461">"ਵਾਇਰਲੈਸ ਰੂਟਰ ਸੁਰੱਖਿਆ ਸੈਟਿੰਗ (WEP) ਸਮਰਥਿਤ ਨਹੀਂ ਹੈ"</string>
     <string name="wifi_wps_failed_tkip" msgid="4282401586860713349">"ਵਾਇਰਲੈਸ ਰੂਟਰ ਸੁਰੱਖਿਆ ਸੈਟਿੰਗ (TKIP) ਸਮਰਥਿਤ ਨਹੀਂ ਹੈ"</string>
     <string name="wifi_wps_failed_auth" msgid="1174614355181181958">"ਪ੍ਰਮਾਣੀਕਰਨ ਅਸਫਲ। ਕਿਰਪਾ ਕਰਕੇ ਦੁਬਾਰਾ ਕੋਸ਼ਿਸ਼ ਕਰੋ।"</string>
     <string name="wifi_wps_failed_overlap" msgid="5159533685596844778">"ਦੂਜਾ WPS ਸੈਸ਼ਨ ਖੋਜਿਆ ਗਿਆ ਸੀ। ਕਿਰਪਾ ਕਰਕੇ ਥੋੜ੍ਹੀ ਦੇਰ ਵਿੱਚ ਦੁਬਾਰਾ ਕੋਸ਼ਿਸ਼ ਕਰੋ।"</string>
+    <string name="wifi_wps_failed_wifi_disconnected" msgid="3829472117754104164">"ਵਾਈ‑ਫਾਈ ਡਿਸਕਨੈਕਟ ਹੋਇਆ। 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 +802,7 @@
     <string name="please_select_phase2" msgid="5231074529772044898">"ਫੇਜ਼ 2 ਪ੍ਰਮਾਣੀਕਰਨ"</string>
     <string name="wifi_eap_ca_cert" msgid="3521574865488892851">"CA ਪ੍ਰਮਾਣ-ਪੱਤਰ"</string>
     <string name="wifi_eap_domain" msgid="8471124344218082064">"ਡੋਮੇਨ"</string>
-    <string name="wifi_eap_user_cert" msgid="1291089413368160789">"ਉਪਭੋਗਤਾ ਸਰਟੀਫਿਕੇਟ"</string>
+    <string name="wifi_eap_user_cert" msgid="1291089413368160789">"ਵਰਤੋਂਕਾਰ ਪ੍ਰਮਾਣ-ਪੱਤਰ"</string>
     <string name="wifi_eap_identity" msgid="4359453783379679103">"ਪਛਾਣ"</string>
     <string name="wifi_eap_anonymous" msgid="2989469344116577955">"ਅਨਾਮ ਪਛਾਣ"</string>
     <string name="wifi_password" msgid="5948219759936151048">"ਪਾਸਵਰਡ"</string>
@@ -810,44 +824,48 @@
     <string name="wifi_wps_available_first_item" msgid="4422547079984583502">"WPS ਉਪਲਬਧ"</string>
     <string name="wifi_wps_available_second_item" msgid="8427520131718215301">" (WPS ਉਪਲਬਧ)"</string>
     <string name="wifi_wps_nfc_enter_password" msgid="2288214226916117159">"ਆਪਣਾ ਨੈੱਟਵਰਕ ਪਾਸਵਰਡ ਦਾਖਲ ਕਰੋ"</string>
-    <string name="wifi_scan_always_turnon_message" msgid="203123538572122989">"ਨਿਰਧਾਰਿਤ ਸਥਾਨ ਸ਼ੁੱਧਤਾ ਨੂੰ ਬਿਹਤਰ ਬਣਾਉਣ ਲਈ ਅਤੇ ਹੋਰਾਂ ਮੰਤਵਾਂ ਲਈ, <xliff:g id="APP_NAME">%1$s</xliff:g> ਨੈੱਟਵਰਕ ਸਕੈਨਿੰਗ ਚਾਲੂ ਕਰਨਾ ਚਾਹੁੰਦਾ ਹੈ, ਭਾਵੇਂ Wi-Fi ਬੰਦ ਹੋਵੇ। \n\nਕੀ ਇਸਨੂੰ ਸਾਰੇ ਐਪਸ ਲਈ ਆਗਿਆ ਦੇਣੀ ਹੈ ਜਿਹਨਾਂ ਨੂੰ ਸਕੈਨ ਕਰਨਾ ਚਾਹੁੰਦਾ ਹੈ?"</string>
-    <string name="wifi_scan_always_turnoff_message" msgid="5538901671131941043">"ਇਸਨੂੰ ਬੰਦ ਕਰਨ ਲਈ, ਓਵਰਫਲੋ ਮੀਨੂ ਵਿੱਚ ਉੱਨਤ ਤੇ ਜਾਓ।"</string>
+    <string name="wifi_carrier_connect" msgid="8174696557882299911">"ਕੈਰੀਅਰ ਵਾਈ‑ਫਾਈ ਨੈੱਟਵਰਕ"</string>
+    <string name="wifi_carrier_content" msgid="4634077285415851933">"<xliff:g id="NAME">%1%s</xliff:g> ਰਾਹੀਂ ਕਨੈਕਟ ਕਰੋ"</string>
+    <string name="wifi_scan_always_turnon_message" msgid="203123538572122989">"ਟਿਕਾਣਾ ਸ਼ੁੱਧਤਾ ਨੂੰ ਬਿਹਤਰ ਬਣਾਉਣ ਲਈ ਅਤੇ ਹੋਰਾਂ ਮੰਤਵਾਂ ਲਈ, <xliff:g id="APP_NAME">%1$s</xliff:g> ਨੈੱਟਵਰਕ ਸਕੈਨਿੰਗ ਚਾਲੂ ਕਰਨਾ ਚਾਹੁੰਦਾ ਹੈ, ਭਾਵੇਂ ਵਾਈ-ਫਾਈ ਬੰਦ ਹੋਵੇ। \n\nਕੀ ਇਸਨੂੰ ਸਾਰੀਆਂ ਐਪਾਂ ਲਈ ਆਗਿਆ ਦੇਣੀ ਹੈ ਜਿਹਨਾਂ ਨੂੰ ਸਕੈਨ ਕਰਨਾ ਚਾਹੁੰਦਾ ਹੈ?"</string>
+    <string name="wifi_scan_always_turnoff_message" msgid="5538901671131941043">"ਇਸਨੂੰ ਬੰਦ ਕਰਨ ਲਈ, ਓਵਰਫ਼ਲੋ ਮੀਨੂ ਵਿੱਚ ਵਿਕਸਿਤ ਤੇ ਜਾਓ।"</string>
     <string name="wifi_scan_always_confirm_allow" msgid="5355973075896817232">"ਆਗਿਆ ਦਿਓ"</string>
     <string name="wifi_scan_always_confirm_deny" msgid="4463982053823520710">"ਅਸਵੀਕਾਰ ਕਰੋ"</string>
-    <string name="wifi_hotspot_title" msgid="7726205804813286950">"ਕੀ ਕਨੈਕਟ ਕਰਨ ਲਈ ਸਾਈਨ ਇਨ ਕਰਨਾ ਹੈ?"</string>
-    <string name="wifi_hotspot_message" msgid="3673833421453455747">"<xliff:g id="APP_NAME">%1$s</xliff:g> ਨੂੰ ਤੁਹਾਡੇ ਵੱਲੋਂ ਨੈੱਟਵਰਕ ਨਾਲ ਕਨੈਕਟ ਕਰਨ ਤੋਂ ਪਹਿਲਾਂ ਔਨਲਾਈਨ ਸਾਈਨ ਇਨ ਕਰਨ ਦੀ ਲੋੜ ਹੈ।"</string>
+    <string name="wifi_hotspot_title" msgid="7726205804813286950">"ਕੀ ਕਨੈਕਟ ਕਰਨ ਲਈ ਸਾਈਨ-ਇਨ ਕਰਨਾ ਹੈ?"</string>
+    <string name="wifi_hotspot_message" msgid="3673833421453455747">"<xliff:g id="APP_NAME">%1$s</xliff:g> ਨੂੰ ਤੁਹਾਡੇ ਵੱਲੋਂ ਨੈੱਟਵਰਕ ਨਾਲ ਕਨੈਕਟ ਕਰਨ ਤੋਂ ਪਹਿਲਾਂ ਆਨਲਾਈਨ ਸਾਈਨ-ਇਨ ਕਰਨ ਦੀ ਲੋੜ ਹੈ।"</string>
     <string name="wifi_hotspot_connect" msgid="5065506390164939225">"ਕਨੈਕਟ ਕਰੋ"</string>
-    <string name="no_internet_access_text" msgid="7133561752896706392">"ਇਸ ਨੈੱਟਵਰਕ ਦੀ ਕੋਈ ਇੰਟਰਨੈਟ ਪਹੁੰਚ ਨਹੀਂ ਹੈ। ਕੀ ਕਨੈਕਟ ਰਹਿਣਾ ਹੈ?"</string>
+    <string name="no_internet_access_text" msgid="7133561752896706392">"ਇਸ ਨੈੱਟਵਰਕ ਦੀ ਕੋਈ ਇੰਟਰਨੈੱਟ ਪਹੁੰਚ ਨਹੀਂ ਹੈ। ਕੀ ਕਨੈਕਟ ਰਹਿਣਾ ਹੈ?"</string>
     <string name="no_internet_access_remember" msgid="4697314331614625075">"ਇਸ ਨੈੱਟਵਰਕ ਲਈ ਦੁਬਾਰਾ ਨਾ ਆਖੋ"</string>
-    <string name="lost_internet_access_title" msgid="6228530645663584505">"Wi‑Fi ਇੰਟਰਨੈੱਟ ਨਾਲ ਕਨੈਕਟ ਨਹੀਂ ਹੈ"</string>
-    <string name="lost_internet_access_text" msgid="9029649339816197345">"ਜਦੋਂ ਵੀ 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>
+    <string name="lost_internet_access_title" msgid="6228530645663584505">"ਵਾਈ-ਫਾਈ ਇੰਟਰਨੈੱਟ ਨਾਲ ਕਨੈਕਟ ਨਹੀਂ ਹੈ"</string>
+    <string name="lost_internet_access_text" msgid="9029649339816197345">"ਜਦੋਂ ਵੀ ਵਾਈ-ਫਾਈ ਕਨੈਕਸ਼ਨ ਖਰਾਬ ਹੋਵੇ ਤਾਂ ਤੁਸੀਂ ਬਦਲਕੇ ਮੋਬਾਈਲ ਨੈੱਟਵਰਕ \'ਤੇ ਜਾ ਸਕਦੇ ਹੋ। ਡਾਟਾ ਵਰਤੋਂ ਦੇ ਖਰਚੇ ਲਾਗੂ ਹੋ ਸਕਦੇ ਹਨ।"</string>
+    <string name="lost_internet_access_switch" msgid="2262459569601190039">"ਮੋਬਾਈਲ \'ਤੇ ਸਵਿੱਚ ਕਰੋ"</string>
+    <string name="lost_internet_access_cancel" msgid="338273139419871110">"ਵਾਈ‑ਫਾਈ \'ਤੇ ਬਣੇ ਰਹੋ"</string>
+    <string name="lost_internet_access_persist" msgid="7634876061262676255">"ਕਦੇ ਦੁਬਾਰਾ ਨਾ  ਦਿਖਾਓ"</string>
     <string name="wifi_connect" msgid="1076622875777072845">"ਕਨੈਕਟ ਕਰੋ"</string>
     <string name="wifi_failed_connect_message" msgid="8491902558970292871">"ਨੈੱਟਵਰਕ ਕਨੈਕਟ ਕਰਨ ਵਿੱਚ ਅਸਫਲ"</string>
     <string name="wifi_forget" msgid="8168174695608386644">"ਭੁੱਲਣਾ"</string>
+    <string name="wifi_modify" msgid="6100248070440710782">"ਸੋਧੋ"</string>
     <string name="wifi_failed_forget_message" msgid="1348172929201654986">"ਨੈੱਟਵਰਕ ਛੱਡਣ ਵਿੱਚ ਅਸਫਲ"</string>
     <string name="wifi_save" msgid="3331121567988522826">"ਰੱਖਿਅਤ ਕਰੋ"</string>
-    <string name="wifi_failed_save_message" msgid="6650004874143815692">"ਨੈੱਟਵਰਕ ਸੁਰੱਖਿਅਤ ਕਰਨ ਵਿੱਚ ਅਸਫਲ"</string>
+    <string name="wifi_failed_save_message" msgid="6650004874143815692">"ਨੈੱਟਵਰਕ ਰੱਖਿਅਤ ਕਰਨ ਵਿੱਚ ਅਸਫਲ"</string>
     <string name="wifi_cancel" msgid="6763568902542968964">"ਰੱਦ ਕਰੋ"</string>
-    <string name="wifi_saved_access_points_titlebar" msgid="2996149477240134064">"ਸੁਰੱਖਿਅਤ ਕੀਤੇ ਨੈੱਟਵਰਕ"</string>
+    <string name="wifi_saved_access_points_titlebar" msgid="2996149477240134064">"ਰੱਖਿਅਤ ਕੀਤੇ ਨੈੱਟਵਰਕ"</string>
     <plurals name="wifi_saved_access_points_summary" formatted="false" msgid="6094679048871529675">
       <item quantity="one">%d ਨੈੱਟਵਰਕ</item>
       <item quantity="other">%d ਨੈੱਟਵਰਕ</item>
     </plurals>
-    <string name="wifi_advanced_titlebar" msgid="4485841401774142908">"ਉੱਨਤ Wi‑Fi"</string>
+    <string name="wifi_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_title" msgid="3471132676909349382">"ਨੈੱਟਵਰਕ ਬਾਰੇ ਜਾਣਕਾਰੀ"</string>
     <string name="wifi_details_subnet_mask" msgid="6720279144174924410">"ਸਬਨੈੱਟ ਮਾਸਕ"</string>
     <string name="wifi_details_dns" msgid="8648826607751830768">"DNS"</string>
     <string name="wifi_details_ipv6_address_header" msgid="6734119149106422148">"IPv6 ਪਤੇ"</string>
-    <string name="wifi_saved_access_points_label" msgid="2013409399392285262">"ਸੁਰੱਖਿਅਤ ਕੀਤੇ ਨੈੱਟਵਰਕ"</string>
+    <string name="wifi_saved_access_points_label" msgid="2013409399392285262">"ਰੱਖਿਅਤ ਕੀਤੇ ਨੈੱਟਵਰਕ"</string>
     <string name="wifi_advanced_settings_label" msgid="3654366894867838338">"IP ਸੈਟਿੰਗਾਂ"</string>
-    <string name="wifi_advanced_not_available" msgid="5823045095444154586">"Wi‑Fi ਉੱਨਤ ਸੈਟਿੰਗਾਂ ਇਸ ਵਰਤੋਂਕਾਰ ਲਈ ਉਪਲਬਧ ਨਹੀਂ ਹਨ"</string>
+    <string name="wifi_advanced_not_available" msgid="5823045095444154586">"ਵਾਈ-ਫਾਈ ਉੱਨਤ ਸੈਟਿੰਗਾਂ ਇਸ ਵਰਤੋਂਕਾਰ ਲਈ ਉਪਲਬਧ ਨਹੀਂ ਹਨ"</string>
     <string name="wifi_ip_settings_menu_save" msgid="7296724066102908366">"ਰੱਖਿਅਤ ਕਰੋ"</string>
     <string name="wifi_ip_settings_menu_cancel" msgid="6582567330136502340">"ਰੱਦ ਕਰੋ"</string>
-    <string name="wifi_ip_settings_invalid_ip_address" msgid="2513142355364274970">"ਇੱਕ ਪ੍ਰਮਾਣਿਕ IP ਪਤਾ ਟਾਈਪ ਕਰੋ।"</string>
+    <string name="wifi_ip_settings_invalid_ip_address" msgid="2513142355364274970">"ਇੱਕ ਵੈਧ IP ਪਤਾ ਟਾਈਪ ਕਰੋ।"</string>
     <string name="wifi_ip_settings_invalid_gateway" msgid="8164264988361096450">"ਇੱਕ ਪ੍ਰਮਾਣਿਕ ਗੇਟਵੇ ਪਤਾ ਟਾਈਪ ਕਰੋ।"</string>
     <string name="wifi_ip_settings_invalid_dns" msgid="8744583948328391047">"ਇੱਕ ਪ੍ਰਮਾਣਿਕ DNS ਪਤਾ ਟਾਈਪ ਕਰੋ।"</string>
     <string name="wifi_ip_settings_invalid_network_prefix_length" msgid="40470058023181052">"0 ਅਤੇ 32 ਦੇ ਵਿਚਕਾਰ ਇੱਕ ਨੈੱਟਵਰਕ ਅਗੇਤਰ ਲੰਮਾਈ ਟਾਈਪ ਕਰੋ।"</string>
@@ -855,12 +873,12 @@
     <string name="wifi_dns2" msgid="1368601006824882659">"DNS 2"</string>
     <string name="wifi_gateway" msgid="163914742461092086">"ਗੇਟਵੇ"</string>
     <string name="wifi_network_prefix_length" msgid="3028785234245085998">"ਨੈੱਟਵਰਕ ਅਗੇਤਰ ਲੰਮਾਈ"</string>
-    <string name="wifi_p2p_settings_title" msgid="5444461191435291082">"Wi‑Fi ਡਾਇਰੈਕਟ"</string>
+    <string name="wifi_p2p_settings_title" msgid="5444461191435291082">"ਵਾਈ‑ਫਾਈ ਡਾਇਰੈਕਟ"</string>
     <string name="wifi_p2p_device_info" msgid="3191876744469364173">"ਡੀਵਾਈਸ ਜਾਣਕਾਰੀ"</string>
     <string name="wifi_p2p_persist_network" msgid="1646424791818168590">"ਇਹ ਕਨੈਕਸ਼ਨ ਯਾਦ ਰੱਖੋ"</string>
-    <string name="wifi_p2p_menu_search" msgid="3436429984738771974">"ਡਿਵਾਈਸਾਂ ਖੋਜੋ"</string>
+    <string name="wifi_p2p_menu_search" msgid="3436429984738771974">"ਡੀਵਾਈਸਾਂ ਖੋਜੋ"</string>
     <string name="wifi_p2p_menu_searching" msgid="2396704492143633876">"ਖੋਜ ਰਿਹਾ ਹੈ..."</string>
-    <string name="wifi_p2p_menu_rename" msgid="8448896306960060415">"ਡੀਵਾਈਸ ਨੂੰ ਮੁੜ-ਨਾਮਕਰਨ ਕਰੋ"</string>
+    <string name="wifi_p2p_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>
@@ -871,46 +889,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">"ਪੋਰਟੇਬਲ Wi‑Fi ਹੌਟਸਪੌਟ"</string>
-    <string name="wifi_hotspot_checkbox_text" msgid="7763495093333664887">"Wi‑Fi ਹੌਟਸਪੌਟ"</string>
-    <string name="wifi_hotspot_off_subtext" msgid="5466126533609394170">"ਦੂਜੀਆਂ ਡੀਵਾਈਸਾਂ ਨਾਲ ਇੰਟਰਨੈੱਟ ਜਾਂ ਸਮੱਗਰੀ ਸਾਂਝੀ ਨਹੀਂ ਕੀਤੀ ਜਾ ਰਹੀ ਹੈ"</string>
+    <string name="wifi_hotspot_checkbox_text" msgid="7763495093333664887">"ਵਾਈ‑ਫਾਈ ਹੌਟਸਪੌਟ"</string>
+    <string name="wifi_hotspot_off_subtext" msgid="5466126533609394170">"ਦੂਜੇ ਡੀਵਾਈਸਾਂ ਨਾਲ ਇੰਟਰਨੈੱਟ ਜਾਂ ਸਮੱਗਰੀ ਸਾਂਝੀ ਨਹੀਂ ਕੀਤੀ ਜਾ ਰਹੀ ਹੈ"</string>
     <string name="wifi_hotspot_tethering_on_subtext" product="tablet" msgid="5752490509369962007">"ਇਸ ਟੈਬਲੈੱਟ ਦੇ ਇੰਟਰਨੈੱਟ ਕਨੈਕਸ਼ਨ ਨੂੰ ਹੌਟਸਪੌਟ ਰਾਹੀਂ ਸਾਂਝਾ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ"</string>
     <string name="wifi_hotspot_tethering_on_subtext" product="default" msgid="6461075246164300670">"ਇਸ ਫ਼ੋਨ ਦੇ ਇੰਟਰਨੈੱਟ ਕਨੈਕਸ਼ਨ ਨੂੰ ਹੌਟਸਪੌਟ ਰਾਹੀਂ ਸਾਂਝਾ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ"</string>
     <string name="wifi_hotspot_on_local_only_subtext" msgid="2068110388011294735">"ਐਪ ਸਮੱਗਰੀ ਸਾਂਝਾ ਕਰ ਰਹੀ ਹੈ। ਇੰਟਰਨੈੱਟ ਕਨੈਕਸ਼ਨ ਸਾਂਝਾ ਕਰਨ ਲਈ, ਹੌਟਸਪੌਟ ਨੂੰ ਬੰਦ ਕਰਕੇ, ਫਿਰ ਚਾਲੂ ਕਰੋ"</string>
-    <string name="wifi_hotspot_name_title" msgid="1341735529132128887">"Wi‑Fi ਦਾ ਨਾਮ"</string>
+    <string name="wifi_hotspot_name_title" msgid="8237000746618636778">"ਹੌਟਸਪੌਟ ਨਾਮ"</string>
     <string name="wifi_hotspot_name_summary_connecting" msgid="3378299995508671967">"<xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g> ਨੂੰ ਚਾਲੂ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ..."</string>
     <string name="wifi_hotspot_name_summary_connected" msgid="3888672084861445362">"ਹੋਰ ਡੀਵਾਈਸਾਂ <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g> ਨਾਲ ਕਨੈਕਟ ਹੋ ਸਕਦੀਆਂ ਹਨ"</string>
-    <string name="wifi_hotspot_password_title" msgid="1955592302902091281">"Wi-Fi ਪਾਸਵਰਡ"</string>
+    <string name="wifi_hotspot_password_title" msgid="8676859981917573801">"ਹੌਟਸਪੌਟ ਪਾਸਵਰਡ"</string>
     <string name="wifi_hotspot_ap_band_title" msgid="1165801173359290681">"AP ਬੈਂਡ"</string>
-    <string name="wifi_hotspot_footer_info_regular" msgid="1203489406068036455">"ਆਪਣੀਆਂ ਹੋਰ ਡੀਵਾਈਸਾਂ ਵਾਸਤੇ ਇੱਕ Wi-Fi ਨੈੱਟਵਰਕ ਬਣਾਉਣ ਲਈ ਹੌਟਸਪੌਟ ਦੀ ਵਰਤੋਂ ਕਰੋ। ਹੌਟਸਪੌਟ ਤੁਹਾਡੇ ਮੋਬਾਈਲ ਡੈਟਾ ਕਨੈਕਸ਼ਨ ਦੀ ਵਰਤੋਂ ਕਰਕੇ ਇੰਟਰਨੈੱਟ ਮੁਹੱਈਆ ਕਰਦਾ ਹੈ। ਵਧੀਕ ਮੋਬਾਈਲ ਡੈਟਾ ਚਾਰਜ ਲਾਗੂ ਹੋ ਸਕਦੇ ਹਨ।"</string>
-    <string name="wifi_hotspot_footer_info_local_only" msgid="857988412470694109">"ਨੇੜਲੀ ਡੀਵਾਈਸਾਂ ਨਾਲ ਸਮੱਗਰੀ ਨੂੰ ਸਾਂਝਾ ਕਰਨ ਲਈ ਐਪਾਂ ਇੱਕ ਹੌਟਸਪੌਟ ਬਣਾ ਸਕਦੀਆਂ ਹਨ।"</string>
+    <string name="wifi_hotspot_footer_info_regular" msgid="1203489406068036455">"ਆਪਣੇ ਹੋਰ ਡੀਵਾਈਸਾਂ ਲਈ ਇੱਕ ਵਾਈ-ਫਾਈ ਨੈੱਟਵਰਕ ਬਣਾਉਣ ਲਈ ਹੌਟਸਪੌਟ ਦੀ ਵਰਤੋਂ ਕਰੋ। ਹੌਟਸਪੌਟ ਤੁਹਾਡੇ ਮੋਬਾਈਲ ਡਾਟਾ ਕਨੈਕਸ਼ਨ ਦੀ ਵਰਤੋਂ ਕਰਕੇ ਇੰਟਰਨੈੱਟ ਮੁਹੱਈਆ ਕਰਦਾ ਹੈ। ਵਧੀਕ ਮੋਬਾਈਲ ਡਾਟਾ ਖਰਚੇ ਲਾਗੂ ਹੋ ਸਕਦੇ ਹਨ।"</string>
+    <string name="wifi_hotspot_footer_info_local_only" msgid="857988412470694109">"ਨੇੜਲੇ ਡੀਵਾਈਸ ਨਾਲ ਸਮੱਗਰੀ ਨੂੰ ਸਾਂਝਾ ਕਰਨ ਲਈ ਐਪਾਂ ਇੱਕ ਹੌਟਸਪੌਟ ਬਣਾ ਸਕਦੇ ਹਨ।"</string>
     <string name="wifi_tether_starting" msgid="1322237938998639724">"ਹੌਟਸਪੌਟ ਚਾਲੂ ਕਰ ਰਿਹਾ ਹੈ..."</string>
     <string name="wifi_tether_stopping" msgid="4835852171686388107">"ਹੌਟਸਪੌਟ ਬੰਦ ਕਰ ਰਿਹਾ ਹੈ…"</string>
     <string name="wifi_tether_enabled_subtext" msgid="7842111748046063857">"<xliff:g id="NETWORK_SSID">%1$s</xliff:g> ਕਿਰਿਆਸ਼ੀਲ ਹੈ"</string>
-    <string name="wifi_tether_failed_subtext" msgid="1484941858530919002">"ਪੋਰਟੇਬਲ Wi‑Fi ਹੌਟਸਪੌਟ ਅਸ਼ੁੱਧੀ"</string>
-    <string name="wifi_tether_configure_ap_text" msgid="7974681394041609308">"Wi‑Fi ਹੌਟਸਪੌਟ ਸਥਾਪਤ ਕਰੋ"</string>
-    <string name="wifi_hotspot_configure_ap_text" msgid="5478614731464220432">"Wi‑Fi ਹੌਟਸਪੌਟ ਸੈਟਅਪ"</string>
+    <string name="wifi_tether_failed_subtext" msgid="1484941858530919002">"ਪੋਰਟੇਬਲ ਵਾਈ‑ਫਾਈ ਹੌਟਸਪੌਟ ਗੜਬੜ"</string>
+    <string name="wifi_tether_configure_ap_text" msgid="7974681394041609308">"ਵਾਈ‑ਫਾਈ ਹੌਟਸਪੌਟ ਸਥਾਪਤ ਕਰੋ"</string>
+    <string name="wifi_hotspot_configure_ap_text" msgid="5478614731464220432">"ਵਾਈ‑ਫਾਈ ਹੌਟਸਪੌਟ ਸੈੱਟਅੱਪ"</string>
     <string name="wifi_hotspot_configure_ap_text_summary" msgid="5560680057727007011">"AndroidAP WPA2 PSK ਹੌਟਸਪੌਟ"</string>
-    <string name="wifi_tether_configure_subtext" msgid="2050196439900426456">"<xliff:g id="NETWORK_SSID">%1$s</xliff:g> <xliff:g id="NETWORK_SECURITY">%2$s</xliff:g> ਹੌਟਸਪੌਟ"</string>
     <string name="wifi_tether_configure_ssid_default" msgid="8467525402622138547">"AndroidHotspot"</string>
-    <string name="wifi_calling_settings_title" msgid="4102921303993404577">"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_settings_title" msgid="4102921303993404577">"ਵਾਈ-ਫਾਈ ਕਾਲਿੰਗ"</string>
+    <string name="wifi_calling_suggestion_title" msgid="9008010480466359578">"ਵਾਈ-ਫਾਈ ਕਾਲਿੰਗ ਚਾਲੂ ਕਰੋ"</string>
+    <string name="wifi_calling_suggestion_summary" msgid="3765923249566552233">"ਮੋਬਾਈਲ ਨੈੱਟਵਰਕ ਦੀ ਥਾਂ ਵਾਈ-ਫਾਈ ਦੀ ਵਰਤੋਂ ਕਰੋ"</string>
     <string name="wifi_calling_mode_title" msgid="2164073796253284289">"ਕਾਲਿੰਗ ਤਰਜੀਹ"</string>
-    <string name="wifi_calling_mode_dialog_title" msgid="8149690312199253909">"Wi-Fi ਕਾਲਿੰਗ ਮੋਡ"</string>
+    <string name="wifi_calling_mode_dialog_title" msgid="8149690312199253909">"ਵਾਈ-ਫਾਈ ਕਾਲਿੰਗ ਮੋਡ"</string>
     <string name="wifi_calling_roaming_mode_title" msgid="1565039047187685115">"ਰੋਮਿੰਗ ਤਰਜੀਹ"</string>
     <!-- no translation found for wifi_calling_roaming_mode_summary (8642014873060687717) -->
     <skip />
     <string name="wifi_calling_roaming_mode_dialog_title" msgid="7800926602662078576">"ਰੋਮਿੰਗ ਤਰਜੀਹ"</string>
   <string-array name="wifi_calling_mode_choices">
-    <item msgid="2124257075906188844">"ਤਰਜੀਹੀ Wi-Fi"</item>
+    <item msgid="2124257075906188844">"ਤਰਜੀਹੀ ਵਾਈ-ਫਾਈ"</item>
     <item msgid="1335127656328817518">"ਮੋਬਾਈਲ ਨੂੰ ਤਰਜੀਹ ਹੈ"</item>
-    <item msgid="3132912693346866895">"ਕੇਵਲ Wi-Fi"</item>
+    <item msgid="3132912693346866895">"ਸਿਰਫ਼ ਵਾਈ-ਫਾਈ"</item>
   </string-array>
   <string-array name="wifi_calling_mode_choices_v2">
-    <item msgid="742988808283756263">"Wi-Fi"</item>
+    <item msgid="742988808283756263">"ਵਾਈ-ਫਾਈ"</item>
     <item msgid="7715869266611010880">"ਮੋਬਾਈਲ"</item>
-    <item msgid="2838022395783120596">"ਸਿਰਫ਼ Wi-Fi"</item>
+    <item msgid="2838022395783120596">"ਸਿਰਫ਼ ਵਾਈ-ਫਾਈ"</item>
   </string-array>
   <string-array name="wifi_calling_mode_values">
     <item msgid="4799585830102342375">"2"</item>
@@ -918,40 +934,40 @@
     <item msgid="3194458950573886239">"0"</item>
   </string-array>
   <string-array name="wifi_calling_mode_choices_without_wifi_only">
-    <item msgid="5782108782860004851">"Wi-Fi ਤਰਜੀਹੀ"</item>
+    <item msgid="5782108782860004851">"ਵਾਈ-ਫਾਈ ਤਰਜੀਹੀ"</item>
     <item msgid="5074515506087318555">"ਮੋਬਾਈਲ ਨੂੰ ਤਰਜੀਹ ਹੈ"</item>
   </string-array>
   <string-array name="wifi_calling_mode_choices_v2_without_wifi_only">
-    <item msgid="6132150507201243768">"Wi-Fi"</item>
+    <item msgid="6132150507201243768">"ਵਾਈ-ਫਾਈ"</item>
     <item msgid="1118703915148755405">"ਮੋਬਾਈਲ"</item>
   </string-array>
   <string-array name="wifi_calling_mode_values_without_wifi_only">
     <item msgid="2339246858001475047">"2"</item>
     <item msgid="6200207341126893791">"1"</item>
   </string-array>
-    <string name="wifi_calling_off_explanation" msgid="2597566001655908391">"ਜਦੋਂ Wi-Fi ਕਾਲਿੰਗ ਚਾਲੂ ਹੁੰਦੀ ਹੈ, ਤਾਂ ਤੁਹਾਡਾ ਫੋਨ ਤੁਹਾਡੀ ਤਰਜੀਹ ਅਤੇ ਕਿਹੜਾ ਸਿਗਨਲ ਵੱਧ ਮਜ਼ਬੂਤ ਹੈ, ਦੇ ਆਧਾਰ ਤੇ Wi-Fi ਨੈੱਟਵਰਕਾਂ ਜਾਂ ਤੁਹਾਡੇ ਕੈਰੀਅਰ ਦੇ ਨੈੱਟਵਰਕ ਰਾਹੀਆਂ ਕਾਲਾਂ ਰੂਟ ਕਰ ਸਕਦਾ ਹੈ। ਇਸ ਵਿਸ਼ੇਸ਼ਤਾ ਨੂੰ ਚਾਲੂ ਕਰਨ ਤੋਂ ਪਹਿਲਾਂ, ਫੀਸ ਅਤੇ ਹੋਰ ਵੇਰਵਿਆਂ ਲਈ ਆਪਣੇ ਕੈਰੀਅਰ ਨੂੰ ਸੰਪਰਕ ਕਰੋ।"</string>
+    <string name="wifi_calling_off_explanation" msgid="2597566001655908391">"ਜਦੋਂ ਵਾਈ-ਫਾਈ ਕਾਲਿੰਗ ਚਾਲੂ ਹੁੰਦੀ ਹੈ, ਤਾਂ ਤੁਹਾਡਾ ਫ਼ੋਨ ਤੁਹਾਡੀ ਤਰਜੀਹ ਅਤੇ ਕਿਹੜਾ ਸਿਗਨਲ ਵੱਧ ਮਜ਼ਬੂਤ ਹੈ, ਦੇ ਆਧਾਰ ਤੇ ਵਾਈ-ਫਾਈ ਨੈੱਟਵਰਕਾਂ ਜਾਂ ਤੁਹਾਡੇ ਕੈਰੀਅਰ ਦੇ ਨੈੱਟਵਰਕ ਰਾਹੀ ਕਾਲਾਂ ਰੂਟ ਕਰ ਸਕਦਾ ਹੈ। ਇਸ ਵਿਸ਼ੇਸ਼ਤਾ ਨੂੰ ਚਾਲੂ ਕਰਨ ਤੋਂ ਪਹਿਲਾਂ, ਫੀਸ ਅਤੇ ਹੋਰ ਵੇਰਵਿਆਂ ਲਈ ਆਪਣੇ ਕੈਰੀਅਰ ਨੂੰ ਸੰਪਰਕ ਕਰੋ।"</string>
     <string name="wifi_calling_off_explanation_2" msgid="2329334487851497223"></string>
-    <string name="emergency_address_title" msgid="3571902448699714454">"ਐਮਰਜੈਂਸੀ ਪਤਾ ਅੱਪਡੇਟ ਕਰੋ"</string>
-    <string name="emergency_address_summary" msgid="306028701568728126">"ਤੁਹਾਡੇ ਵੱਲੋਂ WiFi ਦੀ ਵਰਤੋਂ ਨਾਲ 911 ਨੂੰ ਕਾਲ ਕਰਨ \'ਤੇ ਐਮਰਜੈਂਸੀ ਸੇਵਾਵਾਂ ਦੁਆਰਾ ਤੁਹਾਡੇ ਟਿਕਾਣੇ ਵਜੋਂ ਵਰਤਿਆ ਜਾਣ ਵਾਲਾ ਪਤਾ"</string>
+    <string name="emergency_address_title" msgid="3571902448699714454">"ਸੰਕਟਕਾਲੀਨ ਪਤਾ ਅੱਪਡੇਟ ਕਰੋ"</string>
+    <string name="emergency_address_summary" msgid="3266760199681945746">"ਜੇਕਰ ਤੁਸੀਂ ਵਾਈ-ਫਾਈ ਦੀ ਵਰਤੋਂ ਨਾਲ ਕੋਈ ਸੰਕਟਕਾਲੀਨ ਕਾਲ ਕਰਦੇ ਹੋਂ, ਤਾਂ ਸੰਕਟਕਾਲੀਨ ਸੇਵਾਵਾਂ ਵੱਲੋਂ ਇਸ ਪਤੇ ਦੀ ਵਰਤੋਂ ਤੁਹਾਡੇ ਪਤੇ ਵਜੋਂ ਕੀਤੀ ਜਾਂਦੀ ਹੈ"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"ਡਿਸਪਲੇ"</string>
     <string name="sound_settings" msgid="5534671337768745343">"ਧੁਨੀ"</string>
     <string name="all_volume_title" msgid="4296957391257836961">"ਵੋਲਯੂਮ"</string>
     <string name="musicfx_title" msgid="3415566786340790345">"ਸੰਗੀਤ ਇਫੈਕਟਸ"</string>
-    <string name="ring_volume_title" msgid="5592466070832128777">"ਰਿੰਗ ਵੌਲਯੂਮ"</string>
-    <string name="vibrate_in_silent_title" msgid="3897968069156767036">"ਸਾਈਲੈਂਟ ਹੋਣ ਵੇਲੇ ਥਰਥਰਾਹਟ ਕਰੋ"</string>
+    <string name="ring_volume_title" msgid="5592466070832128777">"ਰਿੰਗ ਦੀ ਅਵਾਜ਼"</string>
+    <string name="vibrate_in_silent_title" msgid="3897968069156767036">"ਸ਼ਾਂਤ ਹੋਣ ਵੇਲੇ ਥਰਥਰਾਹਟ ਕਰੋ"</string>
     <string name="notification_sound_title" msgid="5137483249425507572">"ਪੂਰਵ-ਨਿਰਧਾਰਤ ਸੂਚਨਾ ਧੁਨੀ"</string>
     <string name="incoming_call_volume_title" msgid="8073714801365904099">"ਰਿੰਗਟੋਨ"</string>
     <string name="notification_volume_title" msgid="2012640760341080408">"ਸੂਚਨਾ"</string>
-    <string name="checkbox_notification_same_as_incoming_call" msgid="1073644356290338921">"ਸੂਚਨਾਵਾਂ ਲਈ ਇਨਕਮਿੰਗ ਕਾਲ ਵੌਲਿਊਮ ਵਰਤੋ"</string>
-    <string name="home_work_profile_not_supported" msgid="1357721012342357037">"ਕੰਮ ਪ੍ਰੋਫਾਈਲਾਂ ਦਾ ਸਮਰਥਨ ਨਹੀਂ ਕਰਦਾ"</string>
+    <string name="checkbox_notification_same_as_incoming_call" msgid="1073644356290338921">"ਸੂਚਨਾਵਾਂ ਲਈ ਇਨਕਮਿੰਗ ਕਾਲ ਅਵਾਜ਼ ਵਰਤੋ"</string>
+    <string name="home_work_profile_not_supported" msgid="1357721012342357037">"ਕਾਰਜ ਪ੍ਰੋਫਾਈਲਾਂ ਦਾ ਸਮਰਥਨ ਨਹੀਂ ਕਰਦਾ"</string>
     <string name="notification_sound_dialog_title" msgid="3805140135741385667">"ਪੂਰਵ-ਨਿਰਧਾਰਤ ਸੂਚਨਾ ਧੁਨੀ"</string>
     <string name="media_volume_title" msgid="3576565767317118106">"ਮੀਡੀਆ"</string>
     <string name="media_volume_summary" msgid="5363248930648849974">"ਸੰਗੀਤ ਅਤੇ ਵੀਡੀਓ ਲਈ ਵੌਲਿਊਮ ਸੈੱਟ ਕਰੋ"</string>
     <string name="alarm_volume_title" msgid="2285597478377758706">"ਅਲਾਰਮ"</string>
-    <string name="dock_settings_summary" msgid="455802113668982481">"ਅਟੈਚ ਕੀਤੇ ਡੌਕ ਲਈ ਔਡੀਓ ਸੈਟਿੰਗਾਂ"</string>
+    <string name="dock_settings_summary" msgid="455802113668982481">"ਅਟੈਚ ਕੀਤੇ ਡੌਕ ਲਈ ਆਡੀਓ ਸੈਟਿੰਗਾਂ"</string>
     <string name="dtmf_tone_enable_title" msgid="8533399267725365088">"ਡਾਇਲ ਪੈਡ ਟਚ ਟੋਨਾਂ"</string>
     <string name="sound_effects_enable_title" msgid="4429690369187229592">"ਧੁਨੀਆਂ \'ਤੇ ਟੈਪ ਕਰੋ"</string>
-    <string name="lock_sounds_enable_title" msgid="450098505659399520">"ਸਕ੍ਰੀਨ ਲੌਕ ਅਵਾਜ਼"</string>
+    <string name="lock_sounds_enable_title" msgid="450098505659399520">"ਸਕ੍ਰੀਨ  ਲਾਕ  ਅਵਾਜ਼"</string>
     <string name="haptic_feedback_enable_title" msgid="7152163068278526530">"ਟੈਪ \'ਤੇ ਥਰਥਰਾਹਟ ਕਰੋ"</string>
     <string name="audio_record_proc_title" msgid="4271091199976457534">"ਸ਼ੋਰ ਰੱਦ ਕਰਨਾ"</string>
     <string name="volume_media_description" msgid="7949355934788807863">"ਸੰਗੀਤ, ਵੀਡੀਓ, ਗੇਮਸ, &amp; ਹੋਰ ਮੀਡੀਆ"</string>
@@ -964,35 +980,36 @@
     <string name="volume_alarm_mute" msgid="4452239420351035936">"ਅਲਾਰਮਾਂ ਨੂੰ ਮਿਊਟ ਕਰੋ"</string>
     <string name="dock_settings" msgid="1820107306693002541">"ਡੌਕ"</string>
     <string name="dock_settings_title" msgid="9161438664257429372">"ਡੌਕ ਸੈਟਿੰਗਾਂ"</string>
-    <string name="dock_audio_settings_title" msgid="3324750259959570305">"ਔਡੀਓ"</string>
-    <string name="dock_audio_summary_desk" msgid="6487784412371139335">"ਅਟੈਚ ਕੀਤੇ ਡੈਸਕਟੌਪ ਡੌਕ ਦੀਆਂ ਸੈਟਿੰਗਾਂ"</string>
+    <string name="dock_audio_settings_title" msgid="3324750259959570305">" ਆਡੀਓ"</string>
+    <string name="dock_audio_summary_desk" msgid="6487784412371139335">"ਅਟੈਚ ਕੀਤੇ ਡੈਸਕਟਾਪ ਡੌਕ ਦੀਆਂ ਸੈਟਿੰਗਾਂ"</string>
     <string name="dock_audio_summary_car" msgid="6740897586006248450">"ਅਟੈਚ ਕੀਤੇ ਕਾਰ ਡੌਕ ਲਈ ਸੈਟਿੰਗਾਂ"</string>
-    <string name="dock_audio_summary_none" product="tablet" msgid="8215337394914283607">"ਟੈਬਲੇਟ ਡੌਕ ਨਹੀਂ ਕੀਤੀ"</string>
-    <string name="dock_audio_summary_none" product="default" msgid="289909253741048784">"ਫੋਨ ਡੌਕ ਨਹੀਂ ਕੀਤਾ"</string>
+    <string name="dock_audio_summary_none" product="tablet" msgid="8215337394914283607">"ਟੈਬਲੈੱਟ ਡੌਕ ਨਹੀਂ ਕੀਤੀ"</string>
+    <string name="dock_audio_summary_none" product="default" msgid="289909253741048784">"ਫ਼ੋਨ ਡੌਕ ਨਹੀਂ ਕੀਤਾ"</string>
     <string name="dock_audio_summary_unknown" msgid="4465059868974255693">"ਅਟੈਚ ਕੀਤੇ ਡੌਕ ਲਈ ਸੈਟਿੰਗਾਂ"</string>
     <string name="dock_not_found_title" msgid="3290961741828952424">"ਡੌਕ ਨਹੀਂ ਮਿਲਿਆ"</string>
-    <string name="dock_not_found_text" product="tablet" msgid="8405432495282299143">"ਤੁਹਾਨੂੰ ਡੌਕ ਔਡੀਓ ਸੈਟ ਅਪ ਕਰਨ ਤੋਂ ਪਹਿਲਾਂ ਟੈਬਲੇਟ ਡੌਕ ਕਰਨ ਦੀ ਲੋੜ ਹੈ।"</string>
-    <string name="dock_not_found_text" product="default" msgid="1460497923342627801">"ਤੁਹਾਨੂੰ ਡੌਕ ਔਡੀਓ ਸੈਟ ਅਪ ਕਰਨ ਤੋਂ ਪਹਿਲਾਂ ਫੋਨ ਡੌਕ ਕਰਨ ਦੀ ਲੋੜ ਹੈ।"</string>
+    <string name="dock_not_found_text" product="tablet" msgid="8405432495282299143">"ਤੁਹਾਨੂੰ ਡੌਕ ਆਡੀਓ ਸੈੱਟ ਅੱਪ ਕਰਨ ਤੋਂ ਪਹਿਲਾਂ ਟੈਬਲੈੱਟ ਡੌਕ ਕਰਨ ਦੀ ਲੋੜ ਹੈ।"</string>
+    <string name="dock_not_found_text" product="default" msgid="1460497923342627801">"ਤੁਹਾਨੂੰ ਡੌਕ ਔਡੀਓ ਸੈੱਟ ਅੱਪ ਕਰਨ ਤੋਂ ਪਹਿਲਾਂ ਫ਼ੋਨ ਡੌਕ ਕਰਨ ਦੀ ਲੋੜ ਹੈ।"</string>
     <string name="dock_sounds_enable_title" msgid="885839627097024110">"ਡੌਕ ਇਨਸਰਟ ਅਵਾਜ਼"</string>
-    <string name="dock_sounds_enable_summary_on" product="tablet" msgid="838102386448981339">"ਡੌਕ ਤੋਂ ਟੈਬਲੇਟ ਪਾਉਂਦੇ ਹੋਏ ਜਾਂ ਹਟਾਉਂਦੇ ਹੋਏ ਅਵਾਜ਼ ਪਲੇ ਕਰੋ"</string>
-    <string name="dock_sounds_enable_summary_on" product="default" msgid="8491180514199743771">"ਡੌਕ ਤੋਂ ਫੋਨ ਪਾਉਂਦੇ ਹੋਏ ਜਾਂ ਹਟਾਉਂਦੇ ਹੋਏ ਅਵਾਜ਼ ਪਲੇ ਕਰੋ"</string>
-    <string name="dock_sounds_enable_summary_off" product="tablet" msgid="4308252722466813560">"ਡੌਕ ਤੋਂ ਟੈਬਲੇਟ ਪਾਉਂਦੇ ਹੋਏ ਜਾਂ ਹਟਾਉਂਦੇ ਹੋਏ ਅਵਾਜ਼ ਪਲੇ ਨਾ ਕਰੋ"</string>
-    <string name="dock_sounds_enable_summary_off" product="default" msgid="2034927992716667672">"ਡੌਕ ਤੋਂ ਫੋਨ ਪਾਉਂਦੇ ਹੋਏ ਜਾਂ ਹਟਾਉਂਦੇ ਹੋਏ ਅਵਾਜ਼ ਪਲੇ ਨਾ ਕਰੋ"</string>
+    <string name="dock_sounds_enable_summary_on" product="tablet" msgid="838102386448981339">"ਡੌਕ ਤੋਂ ਟੈਬਲੈੱਟ ਪਾਉਂਦੇ ਹੋਏ ਜਾਂ ਹਟਾਉਂਦੇ ਹੋਏ ਅਵਾਜ਼ ਪਲੇ ਕਰੋ"</string>
+    <string name="dock_sounds_enable_summary_on" product="default" msgid="8491180514199743771">"ਡੌਕ ਤੋਂ ਫ਼ੋਨ ਪਾਉਂਦੇ ਹੋਏ ਜਾਂ ਹਟਾਉਂਦੇ ਹੋਏ ਅਵਾਜ਼ ਚਲਾਓ"</string>
+    <string name="dock_sounds_enable_summary_off" product="tablet" msgid="4308252722466813560">"ਡੌਕ ਤੋਂ ਟੈਬਲੈੱਟ ਪਾਉਂਦੇ ਹੋਏ ਜਾਂ ਹਟਾਉਂਦੇ ਹੋਏ ਅਵਾਜ਼ ਪਲੇ ਨਾ ਕਰੋ"</string>
+    <string name="dock_sounds_enable_summary_off" product="default" msgid="2034927992716667672">"ਡੌਕ ਤੋਂ ਫ਼ੋਨ ਪਾਉਂਦੇ ਹੋਏ ਜਾਂ ਹਟਾਉਂਦੇ ਹੋਏ ਅਵਾਜ਼ ਚਾਲੂ ਨਾ ਕਰੋ"</string>
     <string name="account_settings" msgid="6403589284618783461">"ਖਾਤੇ"</string>
-    <string name="accessibility_category_work" msgid="4339262969083355720">"ਕੰਮ ਪ੍ਰੋਫਾਈਲ ਖਾਤੇ - <xliff:g id="MANAGED_BY">%s</xliff:g>"</string>
+    <string name="accessibility_category_work" msgid="4339262969083355720">"ਕਾਰਜ ਪ੍ਰੋਫਾਈਲ ਖਾਤੇ - <xliff:g id="MANAGED_BY">%s</xliff:g>"</string>
     <string name="accessibility_category_personal" msgid="1263518850905945594">"ਨਿੱਜੀ ਪ੍ਰੋਫਾਈਲ ਖਾਤੇ"</string>
     <string name="accessibility_work_account_title" msgid="1231830766637939527">"ਕੰਮ ਖਾਤਾ - <xliff:g id="MANAGED_BY">%s</xliff:g>"</string>
     <string name="accessibility_personal_account_title" msgid="2169071663029067826">"ਨਿੱਜੀ ਖਾਤਾ - <xliff:g id="MANAGED_BY">%s</xliff:g>"</string>
     <string name="search_settings" msgid="1910951467596035063">"ਖੋਜੋ"</string>
     <string name="search_settings_summary" msgid="9205656546570654169">"ਖੋਜ ਸੈਟਿੰਗ ਅਤੇ ਇਤਿਹਾਸ ਵਿਵਸਥਿਤ ਕਰੋ"</string>
     <string name="search_settings_no_results" msgid="8799027492641230999">"ਕੋਈ ਨਤੀਜੇ ਨਹੀਂ"</string>
+    <string name="search_clear_history" msgid="4196658962573162457">"ਇਤਿਹਾਸ ਕਲੀਅਰ ਕਰੋ"</string>
     <string name="display_settings" msgid="7965901687241669598">"ਡਿਸਪਲੇ"</string>
     <string name="accelerometer_title" msgid="7854608399547349157">"ਸਕ੍ਰੀਨ ਆਪਣੇ-ਆਪ ਘੁੰਮਾਓ"</string>
     <string name="color_mode_title" msgid="3159275920408338215">"ਸ਼ੋਖ ਰੰਗ"</string>
-    <string name="accelerometer_summary_on" product="tablet" msgid="429982132339828942">"ਟੈਬਲੇਟ ਨੂੰ ਰੋਟੇਟ ਕਰਨ ਵੇਲੇ ਆਟੋਮੈਟਿਕਲੀ ਅਨੁਕੂਲਨ ਸਵਿਚ ਕਰੋ"</string>
-    <string name="accelerometer_summary_on" product="default" msgid="1133737282813048021">"ਫੋਨ ਨੂੰ ਰੋਟੇਟ ਕਰਨ ਵੇਲੇ ਆਟੋਮੈਟਿਕਲੀ ਅਨੁਕੂਲਨ ਸਵਿਚ ਕਰੋ"</string>
-    <string name="accelerometer_summary_off" product="tablet" msgid="4781734213242521682">"ਟੈਬਲੇਟ ਨੂੰ ਰੋਟੇਟ ਕਰਨ ਵੇਲੇ ਆਟੋਮੈਟਿਕਲੀ ਅਨੁਕੂਲਨ ਸਵਿਚ ਕਰੋ"</string>
-    <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>
@@ -1018,10 +1035,10 @@
     <string name="night_display_text" msgid="1837277457033025056">"ਰਾਤਰੀ ਲਾਈਟ ਤੁਹਾਡੀ ਸਕ੍ਰੀਨ ਨੂੰ ਭੂਰੇ ਪੀਲੇ ਰੰਗ ਦੀ ਭਾਹ ਦਿੰਦੀ ਹੈ। ਇਸ ਨਾਲ ਮੱਧਮ ਰੌਸ਼ਨੀ ਵਿੱਚ ਤੁਹਾਡੀ ਸਕ੍ਰੀਨ ਨੂੰ ਵੇਖਣਾ ਜਾਂ ਪੜ੍ਹਨਾ ਵਧੇਰੇ ਆਸਾਨ ਹੋ ਜਾਂਦਾ ਹੈ ਅਤੇ ਤੁਹਾਨੂੰ ਵਧੇਰੇ ਆਸਾਨੀ ਨਾਲ ਸੌਣ ਵਿੱਚ ਮਦਦ ਮਿਲ ਸਕਦੀ ਹੈ।"</string>
     <string name="night_display_auto_mode_title" msgid="6574111412154833409">"ਸਮਾਂ-ਸੂਚੀ"</string>
     <string name="night_display_auto_mode_never" msgid="2483761922928753400">"ਕੋਈ ਨਹੀਂ"</string>
-    <string name="night_display_auto_mode_custom" msgid="2379394568898721765">"ਵਿਸ਼ੇਸ਼-ਵਿਉਂਤਬੱਧ ਸਮੇਂ \'ਤੇ ਚਾਲੂ ਹੋ ਜਾਂਦੀ ਹੈ"</string>
+    <string name="night_display_auto_mode_custom" msgid="2379394568898721765">"ਵਿਉਂਂਤੀ ਸਮੇਂ ਤੇ ਚਾਲੂ ਹੋ ਜਾਂਦੀ ਹੈ"</string>
     <string name="night_display_auto_mode_twilight" msgid="589042813708244059">"ਸੂਰਜ ਡੁੱਬਣ ਤੋਂ ਲੈਕੇ ਸੂਰਜ ਚੜ੍ਹਨ ਤੱਕ ਚਾਲੂ ਰਹਿੰਦੀ ਹੈ"</string>
-    <string name="night_display_start_time_title" msgid="8918016772613689584">"ਸ਼ੁਰੂਆਤੀ ਸਮਾਂ"</string>
-    <string name="night_display_end_time_title" msgid="8286061578083519350">"ਸਮਾਪਤੀ ਸਮਾਂ"</string>
+    <string name="night_display_start_time_title" msgid="8918016772613689584">"ਸ਼ੁਰੂੂਆਤ ਦਾ ਸਮਾਂ"</string>
+    <string name="night_display_end_time_title" msgid="8286061578083519350">"ਸਮਾਪਤੀ ਦਾ ਸਮਾਂ"</string>
     <string name="night_display_status_title" msgid="1784041143360286267">"ਅਵਸਥਾ"</string>
     <string name="night_display_temperature_title" msgid="1435292789272017136">"ਤੀਬਰਤਾ"</string>
     <string name="night_display_summary_off" msgid="1792750041697946539">"ਬੰਦ / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
@@ -1037,7 +1054,7 @@
     <string name="screen_timeout_summary" msgid="327761329263064327">"<xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> ਦੀ ਕਿਰਿਆਹੀਣਤਾ ਤੋਂ ਬਾਅਦ"</string>
     <string name="wallpaper_settings_title" msgid="5449180116365824625">"ਵਾਲਪੇਪਰ"</string>
     <string name="wallpaper_settings_summary_default" msgid="3395741565658711416">"ਪੂਰਵ-ਨਿਰਧਾਰਤ"</string>
-    <string name="wallpaper_settings_summary_custom" msgid="515035303981687172">"ਵਿਸ਼ੇਸ਼-ਵਿਉਂਤਬੱਧ"</string>
+    <string name="wallpaper_settings_summary_custom" msgid="515035303981687172">"ਵਿਉਂਂਤੀ"</string>
     <string name="wallpaper_suggestion_title" msgid="8583988696513822528">"ਵਾਲਪੇਪਰ ਬਦਲੋ"</string>
     <string name="wallpaper_suggestion_summary" msgid="1579144009898110491">"ਆਪਣੀ ਸਕ੍ਰੀਨ ਨੂੰ ਵਿਅਕਤੀਗਤ ਬਣਾਓ"</string>
     <string name="wallpaper_settings_fragment_title" msgid="519078346877860129">"ਇਸਤੋਂ ਵਾਲਪੇਪਰ ਚੁਣੋ"</string>
@@ -1048,76 +1065,73 @@
     <string name="screensaver_settings_summary_dock" msgid="2072657401664633283">"ਜਦੋਂ ਡੌਕ ਕੀਤਾ ਹੋਵੇ"</string>
     <string name="screensaver_settings_summary_never" msgid="5165622985174349585">"ਕਦੇ ਵੀ ਨਹੀਂ"</string>
     <string name="screensaver_settings_summary_off" msgid="2481581696365146473">"ਬੰਦ"</string>
-    <string name="screensaver_settings_disabled_prompt" msgid="1239088321034437608">"ਇਹ ਕੰਟਰੋਲ ਕਰਨ ਲਈ ਕਿ ਜਦੋਂ ਫੋਨ ਡੌਕ ਕੀਤਾ ਅਤੇ/ਜਾਂ ਸਲੀਪ ਮੋਡ ਵਿੱਚ ਹੁੰਦਾ ਹੈ ਉਦੋਂ ਕੀ ਹੁੰਦਾ ਹੈ, ਸਕ੍ਰੀਨ ਸੇਵਰ ਚਾਲੂ ਕਰੋ।"</string>
+    <string name="screensaver_settings_disabled_prompt" msgid="1239088321034437608">"ਇਹ ਕੰਟਰੋਲ ਕਰਨ ਲਈ ਕਿ ਜਦੋਂ ਫ਼ੋਨ ਡੌਕ ਕੀਤਾ ਅਤੇ/ਜਾਂ ਸਲੀਪ ਮੋਡ ਵਿੱਚ ਹੁੰਦਾ ਹੈ ਉਦੋਂ ਕੀ ਹੁੰਦਾ ਹੈ, ਸਕ੍ਰੀਨ ਸੇਵਰ ਚਾਲੂ ਕਰੋ।"</string>
     <string name="screensaver_settings_when_to_dream" msgid="7262410541382890146">"ਕਦੋਂ ਸ਼ੁਰੂ ਕਰਨਾ ਹੈ"</string>
     <string name="screensaver_settings_current" msgid="4663846038247130023">"ਵਰਤਮਾਨ ਸਕ੍ਰੀਨ ਸੇਵਰ"</string>
     <string name="screensaver_settings_dream_start" msgid="4998187847985120168">"ਹੁਣ ਚਾਲੂ ਕਰੋ"</string>
     <string name="screensaver_settings_button" msgid="7292214707625717013">"ਸੈਟਿੰਗਾਂ"</string>
     <string name="automatic_brightness" msgid="5014143533884135461">"ਸਵੈਚਲਿਤ ਚਮਕ"</string>
-    <string name="lift_to_wake_title" msgid="4555378006856277635">"ਸਕਿਰਿਆ ਕਰਨ ਲਈ ਚੁੱਕੋ"</string>
-    <string name="ambient_display_screen_title" msgid="4252755516328775766">"ਤੱਕਣੀਯੋਗ ਡਿਸਪਲੇ"</string>
-    <!-- no translation found for ambient_display_screen_summary_always_on (7337555569694794132) -->
-    <skip />
+    <string name="lift_to_wake_title" msgid="4555378006856277635">"ਕਿਰਿਆਸ਼ੀਲ ਕਰਨ ਲਈ ਚੁੱਕੋ"</string>
+    <string name="ambient_display_screen_title" msgid="4252755516328775766">"ਸਰਗਰਮ ਡਿਸਪਲੇ"</string>
+    <string name="ambient_display_screen_summary_always_on" msgid="7337555569694794132">"ਹਮੇਸ਼ਾ ਚਾਲੂ / ਬੈਟਰੀ ਵਰਤੋਂ ਵਧ ਜਾਵੇਗੀ"</string>
     <string name="ambient_display_screen_summary_notifications" msgid="1449570742600868654">"ਨਵੀਆਂ ਸੁਚਨਾਵਾਂ"</string>
     <string name="ambient_display_category_triggers" msgid="4359289754456268573">"ਦਿਖਾਉਣ ਦਾ ਸਮਾਂ"</string>
     <string name="doze_title" msgid="2375510714460456687">"ਨਵੀਆਂ ਸੁਚਨਾਵਾਂ"</string>
-    <string name="doze_summary" msgid="3846219936142814032">"ਜਦ ਤੁਹਾਨੂੰ ਸੂਚਨਾਵਾਂ ਪ੍ਰਾਪਤ ਹੋਣ ਤਾਂ ਸਕ੍ਰੀਨ ਨੂੰ ਸਜੀਵ ਕਰੋ"</string>
+    <string name="doze_summary" msgid="3846219936142814032">"ਜਦ ਤੁਹਾਨੂੰ ਸੂਚਨਾਵਾਂ ਪ੍ਰਾਪਤ ਹੋਣ ਤਾਂ ਸਕ੍ਰੀਨ ਕਿਰਿਆਸ਼ੀਲ ਕਰੋ"</string>
     <string name="doze_always_on_title" msgid="1046222370442629646">"ਹਮੇਸ਼ਾ ਚਾਲੂ"</string>
-    <!-- no translation found for doze_always_on_summary (6978257596231155345) -->
-    <skip />
+    <string name="doze_always_on_summary" msgid="6978257596231155345">"ਸਮਾਂ, ਸੂਚਨਾ ਪ੍ਰਤੀਕ, ਅਤੇ ਹੋਰ ਜਾਣਕਾਰੀ ਦਿਖਾਓ। ਬੈਟਰੀ ਵਰਤੋਂ ਵਧ ਜਾਵੇਗੀ।"</string>
     <string name="title_font_size" msgid="4405544325522105222">"ਫੌਂਟ ਦਾ ਆਕਾਰ"</string>
     <string name="short_summary_font_size" msgid="6819778801232989076">"ਲਿਖਤ ਨੂੰ ਵੱਡਾ ਜਾਂ ਛੋਟਾ ਕਰੋ"</string>
-    <string name="sim_lock_settings" msgid="3392331196873564292">"SIM ਕਾਰਡ ਲੌਕ ਸੈਟਿੰਗਾਂ"</string>
-    <string name="sim_lock_settings_category" msgid="6242052161214271091">"SIM ਕਾਰਡ ਲੌਕ"</string>
+    <string name="sim_lock_settings" msgid="3392331196873564292">"ਸਿਮ ਕਾਰਡ ਲਾਕ ਸੈਟਿੰਗਾਂ"</string>
+    <string name="sim_lock_settings_category" msgid="6242052161214271091">"SIM ਕਾਰਡ  ਲਾਕ"</string>
     <string name="sim_lock_settings_summary_off" msgid="8028944267104896401">"ਬੰਦ"</string>
-    <string name="sim_lock_settings_summary_on" msgid="39103355956342985">"ਲੌਕ ਕੀਤਾ ਗਿਆ"</string>
-    <string name="sim_lock_settings_title" msgid="9018585580955414596">"SIM ਕਾਰਡ ਲੌਕ"</string>
-    <string name="sim_pin_toggle" msgid="1742123478029451888">"SIM ਕਾਰਡ ਲੌਕ ਕਰੋ"</string>
-    <string name="sim_lock_on" product="tablet" msgid="5058355081270397764">"ਟੈਬਲੇਟ ਵਰਤਣ ਲਈ 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">"ਨਵਾਂ 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_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_enable_sim_lock" msgid="4517742794997166918">"SIM ਕਾਰਡ  ਲਾਕ  ਕਰੋ"</string>
+    <string name="sim_disable_sim_lock" msgid="7664729528754784824">"ਸਿਮ ਕਾਰਡ ਅਣਲਾਕ ਕਰੋ"</string>
+    <string name="sim_enter_old" msgid="6074196344494634348">"ਪੁਰਾਣਾ ਸਿਮ ਪਿੰਨ"</string>
+    <string name="sim_enter_new" msgid="8742727032729243562">"ਨਵਾਂ ਸਿਮ ਪਿੰਨ"</string>
+    <string name="sim_reenter_new" msgid="6523819386793546888">"ਨਵਾਂ ਪਿੰਨ ਮੁੜ-ਟਾਈਪ ਕਰੋ"</string>
+    <string name="sim_change_pin" msgid="7328607264898359112">"ਸਿਮ ਪਿੰਨ"</string>
+    <string name="sim_bad_pin" msgid="2345230873496357977">"ਗਲਤ ਪਿੰਨ"</string>
+    <string name="sim_pins_dont_match" msgid="1695021563878890574">"ਪਿੰਨ ਮੇਲ ਨਹੀਂ ਖਾਂਦੇ"</string>
+    <string name="sim_change_failed" msgid="3602072380172511475">"ਪਿੰਨ ਨਹੀਂ ਬਦਲ ਸਕਦਾ।\nਸ਼ਾਇਦ ਪਿੰਨ ਗਲਤ ਹੈ।"</string>
+    <string name="sim_change_succeeded" msgid="8556135413096489627">"ਸਿਮ ਪਿੰਨ ਸਫਲਤਾਪੂਰਵਕ ਬਦਲਿਆ ਗਿਆ"</string>
+    <string name="sim_lock_failed" msgid="2489611099235575984">"ਸਿਮ ਕਾਰਡ ਲਾਕ ਦੀ ਸਥਿਤੀ ਨਹੀਂ ਬਦਲ ਸਕਦੀ।\nਸੰਭਾਵਿਤ ਤੌਰ \'ਤੇ ਗਲਤ ਪਿੰਨ।"</string>
     <string name="sim_enter_ok" msgid="6475946836899218919">"ਠੀਕ"</string>
     <string name="sim_enter_cancel" msgid="6240422158517208036">"ਰੱਦ ਕਰੋ"</string>
     <string name="sim_multi_sims_title" msgid="9159427879911231239">"ਮਲਟੀਪਲ SIM ਮਿਲੇ"</string>
-    <string name="sim_multi_sims_summary" msgid="2698176447067691396">"ਉਹ SIM ਚੁਣੋ ਜਿਸਨੂੰ ਤੁਸੀਂ ਮੋਬਾਈਲ ਡੈਟੇ ਲਈ ਤਰਜੀਹ ਦਿੰਦੇ ਹੋ।"</string>
-    <string name="sim_change_data_title" msgid="294357201685244532">"ਕੀ ਡੈਟਾ SIM ਬਦਲਣਾ ਹੈ?"</string>
-    <string name="sim_change_data_message" msgid="5854582807996717811">"ਮੋਬਾਈਲ ਡੈਟੇ ਦੇ ਲਈ <xliff:g id="OLD_SIM">%2$s</xliff:g> ਦੀ ਬਜਾਏ <xliff:g id="NEW_SIM">%1$s</xliff:g> ਨੂੰ ਵਰਤੀਏ?"</string>
-    <string name="sim_preferred_title" msgid="5567909634636045268">"ਕੀ ਤਰਜੀਹੀ SIM ਕਾਰਡ ਅਪਡੇਟ ਕਰਨਾ ਹੈ?"</string>
-    <string name="sim_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>
+    <string name="sim_multi_sims_summary" msgid="2698176447067691396">"ਉਹ ਸਿਮ ਚੁਣੋ ਜਿਸਨੂੰ ਤੁਸੀਂ ਮੋਬਾਈਲ ਡਾਟੇ ਲਈ ਤਰਜੀਹ ਦਿੰਦੇ ਹੋ।"</string>
+    <string name="sim_change_data_title" msgid="294357201685244532">"ਕੀ  ਡਾਟਾ  SIM ਬਦਲਣਾ ਹੈ?"</string>
+    <string name="sim_change_data_message" msgid="5854582807996717811">"ਮੋਬਾਈਲ ਡਾਟੇ ਲਈ <xliff:g id="OLD_SIM">%2$s</xliff:g> ਦੀ ਬਜਾਏ <xliff:g id="NEW_SIM">%1$s</xliff:g> ਨੂੰ ਵਰਤਣਾ ਹੈ?"</string>
+    <string name="sim_preferred_title" msgid="5567909634636045268">"ਕੀ ਤਰਜੀਹੀ ਸਿਮ ਕਾਰਡ ਅੱਪਡੇਟ ਕਰਨਾ ਹੈ?"</string>
+    <string name="sim_preferred_message" msgid="8466930554330635780">"ਤੁਹਾਡੀ ਡੀਵਾਈਸ ਵਿੱਚ ਸਿਰਫ਼ <xliff:g id="NEW_SIM">%1$s</xliff:g> ਸਿਮ ਹੀ ਹੈ। ਕੀ ਤੁਸੀਂ ਇਸ ਸਿਮ ਨੂੰ ਮੋਬਾਈਲ ਡਾਟੇ, ਕਾਲਾਂ, ਅਤੇ SMS ਸੁਨੇਹਿਆਂ ਦੇ ਲਈ ਵਰਤਣਾ ਚਾਹੁੰਦੇ ਹੋ?"</string>
+    <string name="wrong_pin_code_pukked" msgid="4003655226832658066">"ਗਲਤ ਸਿਮ ਪਿੰਨ ਕੋਡ, ਆਪਣੇ ਡੀਵਾਈਸ ਨੂੰ ਅਣਲਾਕ ਕਰਨ ਲਈ ਹੁਣ ਤੁਹਾਨੂੰ ਲਾਜ਼ਮੀ ਤੌਰ \'ਤੇ ਆਪਣੇ ਕੈਰੀਅਰ ਨਾਲ ਸੰਪਰਕ ਕਰਨਾ ਚਾਹੀਦਾ ਹੈ।"</string>
     <plurals name="wrong_pin_code" formatted="false" msgid="1582398808893048097">
-      <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>
+      <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">"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="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_summary" msgid="3853057315907710747"></string>
-    <string name="firmware_version" msgid="4801135784886859972">"Android ਰੂਪ"</string>
+    <string name="firmware_version" msgid="4801135784886859972">"Android ਵਰਜਨ"</string>
     <string name="security_patch" msgid="8438384045870296634">"Android ਸੁਰੱਖਿਆ ਪੈਚ ਪੱਧਰ"</string>
     <string name="model_info" msgid="1952009518045740889">"ਮਾਡਲ"</string>
     <string name="hardware_info" msgid="2605080746512527805">"ਮਾਡਲ ਅਤੇ ਹਾਰਡਵੇਅਰ"</string>
-    <string name="hardware_revision" msgid="8893547686367095527">"ਹਾਰਡਵੇਅਰ ਰੂਪ"</string>
-    <string name="fcc_equipment_id" msgid="149114368246356737">"ਉਪਕਰਨ ID"</string>
-    <string name="baseband_version" msgid="1848990160763524801">"ਬੇਸਬੈਂਡ ਰੂਪ"</string>
-    <string name="kernel_version" msgid="9192574954196167602">"Kernel ਰੂਪ"</string>
+    <string name="hardware_revision" msgid="8893547686367095527">"ਹਾਰਡਵੇਅਰ ਵਰਜਨ"</string>
+    <string name="fcc_equipment_id" msgid="149114368246356737">"ਉਪਕਰਨ ਆਈ.ਡੀ."</string>
+    <string name="baseband_version" msgid="1848990160763524801">"ਬੇਸਬੈਂਡ ਵਰਜਨ"</string>
+    <string name="kernel_version" msgid="9192574954196167602">"Kernel ਵਰਜਨ"</string>
     <string name="build_number" msgid="3075795840572241758">"ਬਿਲਡ ਨੰਬਰ"</string>
-    <string name="selinux_status" msgid="6212165375172061672">"SELinux ਸਥਿਤੀ"</string>
     <string name="device_info_not_available" msgid="8062521887156825182">"ਉਪਲਬਧ ਨਹੀਂ ਹੈ"</string>
     <string name="device_status_activity_title" msgid="1411201799384697904">"ਅਵਸਥਾ"</string>
     <string name="device_status" msgid="607405385799807324">"ਅਵਸਥਾ"</string>
@@ -1132,7 +1146,7 @@
     <string name="status_number" product="default" msgid="5123197324870153205">"ਮੇਰਾ ਫ਼ੋਨ ਨੰਬਰ"</string>
     <string name="status_min_number" msgid="3519504522179420597">"MIN"</string>
     <string name="status_msid_number" msgid="909010114445780530">"MSID"</string>
-    <string name="status_prl_version" msgid="1007470446618081441">"PRL ਰੂਪ"</string>
+    <string name="status_prl_version" msgid="1007470446618081441">"PRL ਵਰਜਨ"</string>
     <string name="status_meid_number" msgid="1751442889111731088">"MEID"</string>
     <string name="status_icc_id" msgid="943368755577172747">"ICCID"</string>
     <string name="status_network_type" msgid="3279383550222116235">"ਮੋਬਾਈਲ ਨੈੱਟਵਰਕ ਪ੍ਰਕਾਰ"</string>
@@ -1142,11 +1156,10 @@
     <string name="status_signal_strength" msgid="3732655254188304547">"ਸਿਗਨਲ ਸਟ੍ਰੈਂਥ"</string>
     <string name="status_roaming" msgid="2638800467430913403">"ਰੋਮਿੰਗ"</string>
     <string name="status_operator" msgid="2274875196954742087">"ਨੈੱਟਵਰਕ"</string>
-    <string name="status_wifi_mac_address" msgid="2202206684020765378">"Wi‑Fi MAC ਪਤਾ"</string>
-    <string name="status_bt_address" msgid="4195174192087439720">"Bluetooth ਪਤਾ"</string>
+    <string name="status_wifi_mac_address" msgid="2202206684020765378">"ਵਾਈ‑ਫਾਈ MAC ਪਤਾ"</string>
+    <string name="status_bt_address" msgid="4195174192087439720">"ਬਲੂਟੁੱਥ ਪਤਾ"</string>
     <string name="status_serial_number" msgid="2257111183374628137">"ਕ੍ਰਮ ਸੰਖਿਆ"</string>
-    <string name="status_unavailable" msgid="7862009036663793314">"ਅਣਉਪਲਬਧ"</string>
-    <string name="status_up_time" msgid="7294859476816760399">"ਅਪ ਟਾਈਮ"</string>
+    <string name="status_up_time" msgid="7294859476816760399">"ਅੱਪ ਟਾਈਮ"</string>
     <string name="status_awake_time" msgid="2393949909051183652">"ਸਕਿਰਿਆ ਸਮਾਂ"</string>
     <string name="internal_memory" msgid="9129595691484260784">"ਅੰਦਰੂਨੀ ਸਟੋਰੇਜ"</string>
     <string name="sd_memory" product="nosdcard" msgid="2510246194083052841">"USB ਸਟੋਰੇਜ"</string>
@@ -1155,14 +1168,14 @@
     <string name="memory_available_read_only" msgid="6497534390167920206">"ਉਪਲਬਧ (ਰੀ਼ਡ-ਓਨਲੀ)"</string>
     <string name="memory_size" msgid="6629067715017232195">"ਕੁੱਲ ਸਪੇਸ"</string>
     <string name="memory_calculating_size" msgid="2188358544203768588">"ਗਣਨਾ ਕੀਤੀ ਜਾ ਰਹੀ ਹੈ…"</string>
-    <string name="memory_apps_usage" msgid="5128673488173839077">"ਐਪਸ &amp; ਐਪ ਡੈਟਾ"</string>
+    <string name="memory_apps_usage" msgid="5128673488173839077">"ਐਪਸ &amp; ਐਪ  ਡਾਟਾ"</string>
     <string name="memory_media_usage" msgid="3738830697707880405">"ਮੀਡੀਆ"</string>
     <string name="memory_downloads_usage" msgid="3755173051677533027">"ਡਾਊਨਲੋਡ"</string>
     <string name="memory_dcim_usage" msgid="558887013613822577">"ਤਸਵੀਰਾਂ, ਵੀਡੀਓ"</string>
-    <string name="memory_music_usage" msgid="1363785144783011606">"ਔਡੀਓ (ਸੰਗੀਤ, ਰਿੰਗਟੋਨਾਂ, ਪੌਡਕਾਸਟਾਂ ਆਦਿ)"</string>
+    <string name="memory_music_usage" msgid="1363785144783011606">" ਆਡੀਓ  (ਸੰਗੀਤ, ਰਿੰਗਟੋਨਾਂ, ਪੌਡਕਾਸਟਾਂ ਆਦਿ)"</string>
     <string name="memory_media_misc_usage" msgid="6094866738586451683">"ਹੋਰ ਫਾਈਲਾਂ"</string>
-    <string name="memory_media_cache_usage" msgid="6704293333141177910">"ਕੈਚ ਕੀਤਾ ਡੈਟਾ"</string>
-    <string name="sd_eject" product="nosdcard" msgid="4988563376492400073">"ਸ਼ੇਅਰ ਕੀਤੀ ਸਟੋਰੇਜ ਅਨਮਾਉਂਟ ਕਰੋ"</string>
+    <string name="memory_media_cache_usage" msgid="6704293333141177910">"ਕੈਚ ਕੀਤਾ  ਡਾਟਾ"</string>
+    <string name="sd_eject" product="nosdcard" msgid="4988563376492400073">"ਸਾਂਝੀ ਕੀਤੀ ਸਟੋਰੇਜ ਅਨਮਾਉਂਟ ਕਰੋ"</string>
     <string name="sd_eject" product="default" msgid="6915293408836853020">"SD ਕਾਰਡ ਨੂੰ ਅਨਮਾਉਂਟ ਕਰੋ"</string>
     <string name="sd_eject_summary" product="nosdcard" msgid="5009296896648072891">"ਅੰਦਰੂਨੀ USB ਸਟੋਰੇਜ ਨੂੰ ਅਨਮਾਉਂਟ ਕਰੋ"</string>
     <string name="sd_eject_summary" product="default" msgid="3300599435073550246">"SD ਕਾਰਡ ਨੂੰ ਅਨਮਾਉਂਟ ਕਰੋ ਤਾਂ ਜੋ ਤੁਸੀਂ ਇਸਨੂੰ ਸੁਰੱਖਿਅਤ ਰੂਪ ਨਾਲ ਹਟਾ ਸਕੋ।"</string>
@@ -1174,32 +1187,32 @@
     <string name="sd_mount_summary" product="default" msgid="4673411327373419641"></string>
     <string name="sd_format" product="nosdcard" msgid="2148179271623099054">"USB ਸਟੋਰੇਜ ਮਿਟਾਓ"</string>
     <string name="sd_format" product="default" msgid="2576054280507119870">"SD ਕਾਰਡ ਮਿਟਾਓ"</string>
-    <string name="sd_format_summary" product="nosdcard" msgid="6331905044907914603">"ਅੰਦਰੂਨੀ USB ਸਟੋਰੇਜ ਦਾ ਸਾਰਾ ਡੈਟਾ ਮਿਟਾਉਂਦਾ ਹੈ, ਜਿਵੇਂ ਸੰਗੀਤ ਅਤੇ ਫ਼ੋਟੋਆਂ"</string>
-    <string name="sd_format_summary" product="default" msgid="212703692181793109">"SD ਕਾਰਡ ਦਾ ਸਾਰਾ ਡੈਟਾ ਮਿਟਾਉਂਦਾ ਹੈ, ਜਿਵੇਂ ਸੰਗੀਤ ਅਤੇ ਫ਼ੋਟੋਆਂ"</string>
-    <string name="memory_clear_cache_title" msgid="5423840272171286191">"ਕੀ ਕੈਚ ਕੀਤਾ ਡੈਟਾ ਹਟਾਉਣਾ ਹੈ?"</string>
-    <string name="memory_clear_cache_message" msgid="4550262490807415948">"ਇਹ ਸਾਰੇ ਐਪਸ ਲਈ ਕੈਚ ਕੀਤਾ ਡੈਟਾ ਹਟਾ ਦੇਵੇਗਾ।"</string>
-    <string name="mtp_ptp_mode_summary" msgid="3710436114807789270">"MTP ਜਾਂ PTP ਫੰਕਸ਼ਨ ਸਕਿਰਿਆ ਹੈ"</string>
+    <string name="sd_format_summary" product="nosdcard" msgid="6331905044907914603">"ਅੰਦਰੂਨੀ USB ਸਟੋਰੇਜ ਦਾ ਸਾਰਾ ਡਾਟਾ ਮਿਟਾਉਂਦਾ ਹੈ, ਜਿਵੇਂ ਸੰਗੀਤ ਅਤੇ ਫ਼ੋਟੋਆਂ"</string>
+    <string name="sd_format_summary" product="default" msgid="212703692181793109">"SD ਕਾਰਡ ਦਾ ਸਾਰਾ  ਡਾਟਾ  ਮਿਟਾਉਂਦਾ ਹੈ, ਜਿਵੇਂ ਸੰਗੀਤ ਅਤੇ ਫ਼ੋਟੋਆਂ"</string>
+    <string name="memory_clear_cache_title" msgid="5423840272171286191">"ਕੀ ਕੈਚ ਕੀਤਾ  ਡਾਟਾ  ਹਟਾਉਣਾ ਹੈ?"</string>
+    <string name="memory_clear_cache_message" msgid="4550262490807415948">"ਇਹ ਸਾਰੇ ਐਪਸ ਲਈ ਕੈਚ ਕੀਤਾ  ਡਾਟਾ  ਹਟਾ ਦੇਵੇਗਾ।"</string>
+    <string name="mtp_ptp_mode_summary" msgid="3710436114807789270">"MTP ਜਾਂ PTP ਫੰਕਸ਼ਨ ਕਿਰਿਆਸ਼ੀਲ ਹੈ"</string>
     <string name="dlg_confirm_unmount_title" product="nosdcard" msgid="3077285629197874055">"ਕੀ USB ਸਟੋਰੇਜ ਨੂੰ ਅਨਮਾਉਂਟ ਕਰਨਾ ਹੈ?"</string>
     <string name="dlg_confirm_unmount_title" product="default" msgid="3634502237262534381">"ਕੀ SD ਕਾਰਡ ਨੂੰ  ਅਨਮਾਉਂਟ ਕਰਨਾ ਹੈ?"</string>
-    <string name="dlg_confirm_unmount_text" product="nosdcard" msgid="4322636662873269018">"ਜੇਕਰ ਤੁਸੀਂ USB ਸਟੋਰੇਜ ਨੂੰ ਅਨਮਾਉਂਟ ਕਰਦੇ ਹੋ, ਤਾਂ ਕੁਝ ਐਪਸ ਜੋ ਤੁਸੀਂ ਵਰਤ ਰਹੇ ਹੋ ਬੰਦ ਹੋ ਜਾਣਗੇ ਅਤੇ ਅਣਉਪਲਬਧ ਹੋ ਸਕਦੇ ਹਨ, ਜਦੋਂ ਤੱਕ ਤੁਸੀਂ USB ਸਟੋਰੇਜ ਨੂੰ ਰੀਮਾਉਂਟ ਨਹੀਂ ਕਰਦੇ।"</string>
+    <string name="dlg_confirm_unmount_text" product="nosdcard" msgid="4322636662873269018">"ਜੇਕਰ ਤੁਸੀਂ USB ਸਟੋਰੇਜ ਨੂੰ ਅਨਮਾਉਂਟ ਕਰਦੇ ਹੋ, ਤਾਂ ਕੁਝ ਐਪਾਂ ਜੋ ਤੁਸੀਂ ਵਰਤ ਰਹੇ ਹੋ ਬੰਦ ਹੋ ਜਾਣਗੇ ਅਤੇ ਅਣਉਪਲਬਧ ਹੋ ਸਕਦੀਆਂ ਹਨ, ਜਦੋਂ ਤੱਕ ਤੁਸੀਂ USB ਸਟੋਰੇਜ ਨੂੰ ਰੀਮਾਉਂਟ ਨਹੀਂ ਕਰਦੇ।"</string>
     <string name="dlg_confirm_unmount_text" product="default" msgid="6998379994779187692">"ਜੇਕਰ ਤੁਸੀਂ SD ਕਾਰਡ ਨੂੰ ਅਨਮਾਉਂਟ ਕਰਦੇ ਹੋ, ਤਾਂ ਕੁਝ ਐਪਸ ਜੋ ਤੁਸੀਂ ਵਰਤ ਰਹੇ ਹੋ ਬੰਦ ਹੋ ਜਾਣਗੇ ਅਤੇ ਅਣਉਪਲਬਧ ਹੋ ਸਕਦੇ ਹਨ, ਜਦੋਂ ਤੱਕ ਤੁਸੀਂ SD ਕਾਰਡ ਨੂੰ ਰੀਮਾਉਂਟ ਨਹੀਂ ਕਰਦੇ।"</string>
     <string name="dlg_error_unmount_title" product="nosdcard" msgid="4642742385125426529"></string>
     <string name="dlg_error_unmount_title" product="default" msgid="4642742385125426529"></string>
-    <string name="dlg_error_unmount_text" product="nosdcard" msgid="9191518889746166147">"USB ਸਟੋਰੇਜ ਨੂੰ ਅਨਮਾਉਂਟ ਨਹੀਂ ਕਰ ਸਕਿਆ। ਬਾਅਦ ਵਿੱਚ ਦੁਬਾਰਾ ਕੋਸ਼ਿਸ਼ ਕਰੋ।"</string>
+    <string name="dlg_error_unmount_text" product="nosdcard" msgid="9191518889746166147">"USB ਸਟੋਰੇਜ ਨੂੰ ਅਨਮਾਉਂਟ ਨਹੀਂ ਹੋ ਸਕੀ। ਬਾਅਦ ਵਿੱਚ ਦੁਬਾਰਾ ਕੋਸ਼ਿਸ਼ ਕਰੋ।"</string>
     <string name="dlg_error_unmount_text" product="default" msgid="3500976899159848422">"SD ਕਾਰਡ ਨੂੰ ਅਨਮਾਉਂਟ ਨਹੀਂ ਕਰ ਸਕਿਆ। ਬਾਅਦ ਵਿੱਚ ਦੁਬਾਰਾ ਕੋਸ਼ਿਸ਼ ਕਰੋ।"</string>
     <string name="unmount_inform_text" product="nosdcard" msgid="7120241136790744265">"USB ਸਟੋਰੇਜ ਅਨਮਾਉਂਟ ਹੋ ਜਾਏਗੀ।"</string>
     <string name="unmount_inform_text" product="default" msgid="1904212716075458402">"SD ਕਾਰਡ ਅਨਮਾਉਂਟ ਕੀਤਾ ਜਾਏਗਾ।"</string>
     <string name="sd_ejecting_title" msgid="8824572198034365468">"ਅਨਮਾਉਂਟ ਕਰ ਰਿਹਾ ਹੈ"</string>
     <string name="sd_ejecting_summary" msgid="2028753069184908491">"ਪ੍ਰਗਤੀ ਵਿੱਚ ਅਨਮਾਉਂਟ ਕਰੋ"</string>
-    <string name="storage_low_title" msgid="1388569749716225155">"ਸਟੋਰੇਜ ਸਪੇਸ ਖਾਲੀ ਹੋ ਰਿਹਾ ਹੈ"</string>
-    <string name="storage_low_summary" msgid="7737465774892563129">"ਕੁਝ ਸਿਸਟਮ ਫੰਕਸ਼ਨ, ਜਿਵੇਂ ਸਿੰਕ ਕਰਨਾ, ਸਹੀ ਢੰਗ ਨਾਲ ਕੰਮ ਨਹੀਂ ਵੀ ਕਰ ਸਕਦੇ। ਆਈਟਮਾਂ ਮਿਟਾ ਕੇ ਜਾਂ ਅਨਪਿੰਨ ਕਰਕੇ ਸਪੇਸ ਖਾਲੀ ਕਰਨ ਦੀ ਕੋਸ਼ਿਸ਼ ਕਰੋ, ਜਿਵੇਂ ਐਪਸ ਜਾਂ ਮੀਡੀਆ ਸਮੱਗਰੀ।"</string>
+    <string name="storage_low_title" msgid="1388569749716225155">"ਸਟੋਰੇਜ ਦੀ ਜਗ੍ਹਾ ਖਾਲੀ ਹੋ ਰਹੀ ਹੈ"</string>
+    <string name="storage_low_summary" msgid="7737465774892563129">"ਕੁਝ ਸਿਸਟਮ ਫੰਕਸ਼ਨ, ਜਿਵੇਂ ਸਮਕਾਲੀਕਿਰਤ ਕਰਨਾ, ਸਹੀ ਢੰਗ ਨਾਲ ਕੰਮ ਨਹੀਂ ਵੀ ਕਰ ਸਕਦੇ। ਆਈਟਮਾਂ ਮਿਟਾ ਕੇ ਜਾਂ ਅਨਪਿੰਨ ਕਰਕੇ ਸਪੇਸ ਖਾਲੀ ਕਰਨ ਦੀ ਕੋਸ਼ਿਸ਼ ਕਰੋ, ਜਿਵੇਂ ਐਪਾਂ ਜਾਂ ਮੀਡੀਆ ਸਮੱਗਰੀ।"</string>
     <string name="storage_menu_rename" msgid="7141058657592615390">"ਮੁੜ-ਨਾਮਕਰਨ ਕਰੋ"</string>
     <string name="storage_menu_mount" msgid="1014683672493425425">"ਮਾਉਂਟ ਕਰੋ"</string>
     <string name="storage_menu_unmount" msgid="681485356885955898">"ਬਾਹਰ ਕੱਢੋ"</string>
     <string name="storage_menu_format" msgid="7690626079653152152">"ਫੌਰਮੈਟ"</string>
     <string name="storage_menu_format_public" msgid="7464714208010125682">"ਪੋਰਟੇਬਲ ਦੇ ਤੌਰ ਤੇ ਫੌਰਮੈਟ ਕਰੋ"</string>
     <string name="storage_menu_format_private" msgid="546017531835902096">"ਅੰਦਰਲੀ ਤੌਰ ਤੇ ਫੌਰਮੈਟ ਕਰੋ"</string>
-    <string name="storage_menu_migrate" msgid="3969621494238154294">"ਡੇਟਾ ਨੂੰ ਸਥਾਂਨਤਿਰਤ ਕਰੋ"</string>
+    <string name="storage_menu_migrate" msgid="3969621494238154294">" ਡਾਟਾ  ਨੂੰ ਸਥਾਂਨਤਿਰਤ ਕਰੋ"</string>
     <string name="storage_menu_forget" msgid="6305824238997983426">"ਭੁੱਲ ਜਾਓ"</string>
     <string name="storage_menu_set_up" msgid="4263294929451685366">"ਸਥਾਪਤ ਕਰੋ"</string>
     <string name="storage_menu_explore" msgid="4637496051816521560">"ਐਕਸਪਲੋਰ ਕਰੋ"</string>
@@ -1210,9 +1223,9 @@
     <string name="usb_mtp_title" msgid="3399663424394065964">"ਮੀਡੀਆ ਡੀਵਾਈਸ (MTP)"</string>
     <string name="usb_mtp_summary" msgid="4617321473211391236">"Windows ਤੇ ਜਾਂ Mac Android ਫਾਈਲ ਟ੍ਰਾਂਸਫਰ ਵਰਤਦੇ ਹੋਏ ਤੁਹਾਨੂੰ ਮੀਡੀਆ ਫਾਈਲਾਂ ਟ੍ਰਾਂਸਫਰ ਕਰਨ ਦੀ ਆਗਿਆ ਦਿੰਦਾ ਹੈ (www.android.com/filetransfer ਦੇਖੋ)"</string>
     <string name="usb_ptp_title" msgid="3852760810622389620">"ਕੈਮਰਾ (PTP)"</string>
-    <string name="usb_ptp_summary" msgid="7406889433172511530">"ਤੁਹਾਨੂੰ ਕੈਮਰਾ ਸੌਫਟਵੇਅਰ ਵਰਤਦੇ ਹੋਏ ਫ਼ੋਟੋਆਂ ਅਤੇ ਕੰਪਿਊਟਰ ਤੇ ਕੋਈ ਵੀ ਫਾਈਲਾਂ ਟ੍ਰਾਂਸਫਰ ਕਰਨ ਦੀ ਆਗਿਆ ਦਿੰਦਾ ਹੈ ਜੋ MTP ਦਾ ਸਮਰਥਨ ਨਹੀਂ ਕਰਦੇ"</string>
+    <string name="usb_ptp_summary" msgid="7406889433172511530">"ਤੁਹਾਨੂੰ ਕੈਮਰਾ ਸਾਫ਼ਟਵੇਅਰ ਵਰਤਦੇ ਹੋਏ ਫ਼ੋਟੋਆਂ ਅਤੇ ਕੰਪਿਊਟਰ ਤੇ ਕੋਈ ਵੀ ਫ਼ਾਈਲਾਂ ਟ੍ਰਾਂਸਫਰ ਕਰਨ ਦੀ ਆਗਿਆ ਦਿੰਦਾ ਹੈ ਜੋ MTP ਦਾ ਸਮਰਥਨ ਨਹੀਂ ਕਰਦੇ"</string>
     <string name="usb_midi_title" msgid="3069990264258413994">"MIDI"</string>
-    <string name="usb_midi_summary" msgid="539169474810956358">"MIDI ਸਮਰਥਿਤ ਐਪਲੀਕੇਸ਼ਨਾਂ ਨੂੰ ਤੁਹਾਡੇ ਕੰਪਿਊਟਰ ਤੇ MIDI ਸੌਫਟਵੇਅਰ ਨਾਲ USB ਤੇ ਕੰਮ ਕਰਨ ਦੀ ਆਗਿਆ ਦਿੰਦਾ ਹੈ।"</string>
+    <string name="usb_midi_summary" msgid="539169474810956358">"MIDI ਸਮਰਥਿਤ ਐਪਲੀਕੇਸ਼ਨਾਂ ਨੂੰ ਤੁਹਾਡੇ ਕੰਪਿਊਟਰ ਤੇ MIDI ਸਾਫ਼ਟਵੇਅਰ ਨਾਲ USB ਤੇ ਕੰਮ ਕਰਨ ਦੀ ਆਗਿਆ ਦਿੰਦਾ ਹੈ।"</string>
     <string name="storage_other_users" msgid="808708845102611856">"ਹੋਰ ਉਪਭੋਗਤਾ"</string>
     <string name="storage_internal_title" msgid="690771193137801021">"ਡੀਵਾਈਸ ਸਟੋਰੇਜ"</string>
     <string name="storage_external_title" msgid="3433462910096848696">"ਪੋਰਟੇਬਲ ਸਟੋਰੇਜ"</string>
@@ -1226,60 +1239,60 @@
     <string name="storage_unmount_failure" msgid="5758387106579519489">"<xliff:g id="NAME">%1$s</xliff:g> ਨੂੰ ਸੁਰੱਖਿਅਤ ਰੂਪ ਨਾਲ ਨਹੀਂ ਕੱਢ ਸਕਿਆ"</string>
     <string name="storage_format_success" msgid="3023144070597190555">"<xliff:g id="NAME">%1$s</xliff:g> ਫੌਰਮੈਟ ਕੀਤਾ ਹੈ"</string>
     <string name="storage_format_failure" msgid="6032640952779735766">"<xliff:g id="NAME">%1$s</xliff:g> ਨੂੰ ਫੌਰਮੈਟ ਨਹੀਂ ਕਰ ਸਕਿਆ"</string>
-    <string name="storage_rename_title" msgid="8242663969839491485">"ਸਟੋਰੇਜ ਨੂੰ ਮੁੜ-ਨਾਮਕਰਨ ਕਰੋ"</string>
+    <string name="storage_rename_title" msgid="8242663969839491485">"ਸਟੋਰੇਜ ਦਾ ਨਾਮ ਬਦਲੋ"</string>
     <string name="storage_dialog_unmounted" msgid="6403320870103261477">"ਇਹ <xliff:g id="NAME_0">^1</xliff:g> ਸੁਰੱਖਿਅਤ ਰੂਪ ਨਾਲ ਹਟਾਇਆ ਗਿਆ ਹੈ, ਪਰੰਤੂ ਅਜੇ ਵੀ ਉਪਲਬਧ ਹੈ। \n\nਇਹ <xliff:g id="NAME_1">^1</xliff:g> ਵਰਤਣ ਲਈ, ਤੁਹਾਨੂੰ ਪਹਿਲਾਂ ਇਸਨੂੰ ਮਾਉਂਟ ਕਰਨਾ ਪਵੇਗਾ।"</string>
     <string name="storage_dialog_unmountable" msgid="3732209361668282254">"ਇਹ <xliff:g id="NAME_0">^1</xliff:g> ਕਰਪਟ ਹੈ। \n\nਇਹ <xliff:g id="NAME_1">^1</xliff:g> ਵਰਤਣ ਲਈ, ਤੁਹਾਨੂੰ ਪਹਿਲਾਂ ਇਸਨੂੰ ਸੈਟ ਅਪ ਕਰਨਾ ਪਵੇਗਾ।"</string>
-    <string name="storage_dialog_unsupported" msgid="4503128224360482228">"ਇਹ ਡੀਵਾਈਸ ਇਸ <xliff:g id="NAME_0">^1</xliff:g> ਦਾ ਸਮਰਥਨ ਨਹੀਂ ਕਰਦੀ। \n\nਇਸ ਡੀਵਾਈਸ ਨਾਲ ਇਹ <xliff:g id="NAME_1">^1</xliff:g> ਵਰਤਣ ਲਈ, ਤੁਹਾਨੂੰ ਪਹਿਲਾਂ ਇਸਨੂੰ ਸੈਟ ਅਪ ਕਰਨਾ ਪਵੇਗਾ।"</string>
-    <string name="storage_internal_format_details" msgid="4018647158382548820">"ਫਾਰਮੈਟ ਕਰਨ ਤੋਂ ਬਾਅਦ, ਤੁਸੀਂ ਦੂਜੀਆਂ ਡਿਵਾਈਆਂ ਵਿੱਚ ਇਸ <xliff:g id="NAME_0">^1</xliff:g>  ਦਾ ਉਪਯੋਗ ਕਰ ਸਕਦੇ ਹੋ. \n\nਇਸ <xliff:g id="NAME_1">^1</xliff:g> \'ਤੇ ਮੌਜੂਦ ਸਾਰਾ ਡੇਟਾ ਸਾਫ਼ ਕਰ ਦੇਵੇਗਾ. ਸਭ ਤੋਂ ਪਹਿਲਾਂ ਬੈੱਕ ਅੱਪ ਲੈਣ \'ਤੇ ਵਿਚਾਰ ਕਰੋ. \n\n"<b>"ਫ਼ੋਟੋਆਂ ਅਤੇ ਦੂਜੇ ਮੀਡੀਆ ਦਾ ਬੈੱਕ ਅੱਪ ਲਓ"</b>" \nਆਪਣੀ ਮੀਡੀਆ ਫ਼ਾਈਲਾਂ ਨੂੰ ਇਸ ਡੀਵਾਈਸ \'ਤੇ ਵਿਕਲਪਿਕ ਸਟੋਰੇਜ ਵਿੱਚ ਮੂਵ ਕਰੋ, ਜਾਂ ਉਹਨਾਂ ਨੂੰ ਕਿਸੇ USB ਕੇਬਲ ਦਾ ਉਪਯੋਗ ਕਰਕੇ ਕਿਸੇ ਕੰਪਿਊਟਰ ਵਿੱਚ ਟ੍ਰਾਂਸਫ਼ਰ ਕਰੋ. \n\n"<b>"ਐਪਸ ਦਾ ਬੈੱਕ ਅੱਪ ਲਓ"</b>" \nਇਸ <xliff:g id="NAME_6">^1</xliff:g> \'ਤੇ ਸਟੋਰ ਕੀਤੀ ਸਾਰੀਆਂ ਐਪਸ ਦੀਆਂ ਸਥਾਪਨਾ ਨੂੰ ਰੱਦ ਕੀਤਾ ਜਾਵੇਗਾ ਅਤੇ ਉਹਨਾਂ ਦੇ ਡੇਟਾ ਨੂੰ ਸਾਫ਼ ਕਰ ਦਿੱਤਾ ਜਾਵੇਗਾ. ਇਹਨਾਂ ਐਪਸ ਨੂੰ ਰੱਖਣ ਲਈ, ਇਹਨਾਂ ਨੂੰ ਇਸ ਡੀਵਾਈਸ \'ਤੇ ਵਿਕਲਪਿਕ ਸਟੋਰੇਜ ਵਿੱਚ ਲੈ ਜਾਓ."</string>
-    <string name="storage_internal_unmount_details" msgid="3582802571684490057"><b>"ਜਦੋਂ ਤੁਸੀਂ ਇਸ <xliff:g id="NAME_0">^1</xliff:g> ਨੂੰ ਬਾਹਦ ਕੱਢਦੇ ਹੋ, ਤਾਂ ਇਸ \'ਤੇ ਸਟੋਰ ਕੀਤੀਆਂ ਐਪਸ ਕੰਮ ਕਰਨਾ ਬੰਦ ਕਰ ਦੇਣਗੀ, ਅਤੇ ਇਸ \'ਤੇ ਸਟੋਰ ਕੀਤੀਆਂ ਮੀਡੀਆ ਫ਼ਾਈਲਾਂ ਉਦੋਂ ਤੱਕ ਉਪਲਬਧ ਨਹੀਂ ਹੋਣਗੀਆਂ ਜਦੋਂ ਤੱਕ ਇਸਨੂੰ ਮੁੜ ਸੰਮਿਲਿਤ ਨਾ ਕੀਤਾ ਜਾਵੇ।"</b>" \n\nਇਸ <xliff:g id="NAME_1">^1</xliff:g> ਨੂੰ ਸਿਰਫ਼ ਇਸ ਡੀਵਾਈਸ \'ਤੇ ਕੰਮ ਕਰਨ ਲਈ ਫਾਰਮੈਟ ਕੀਤਾ ਗਿਆ ਹੈ। ਇਹ ਕਿਸੇ ਹੋਰ ਡੀਵਾਈਸਾਂ \'ਤੇ ਕੰਮ ਨਹੀਂ ਕਰੇਗਾ।"</string>
-    <string name="storage_internal_forget_details" msgid="9028875424669047327">"ਐਪਸ, ਫ਼ੋਟੋਆਂ, ਜਾਂ ਇਸ <xliff:g id="NAME">^1</xliff:g> ਵਿੱਚ ਸ਼ਾਮਿਲ ਡੇਟਾ ਦਾ ਉਪਯੋਗ ਕਰਨ ਲਈ, ਇਸਨੂੰ ਮੁੜ ਸੰਮਿਲਿਤ ਕਰੋ। \n\nਵਿਕਲਪਿਕ ਰੂਪ ਵਿੱਚ, ਤੁਸੀਂ ਇਸ ਸਟੋਰੇਜ ਨੂੰ ਭੁੱਲਣਾ ਚੁਣ ਸਕਦੇ ਹੋ ਜੇਕਰ ਇਹ ਡੀਵਾਈਸ ਉਪਲਬਧ ਨਹੀਂ ਹੈ। \n\nਜੇਕਰ ਤੁਸੀਂ ਭੁੱਲਣਾ ਚੁਣਦੇ ਹੋ, ਤਾਂ ਡੀਵਾਈਸ ਵਿੱਚ ਸ਼ਾਮਿਲ ਸਾਰਾ ਡੇਟਾ ਹਮੇਸ਼ਾ ਲਈ ਗੁਆਚ ਜਾਵੇਗਾ। \n\nਤੁਸੀਂ ਐਪਸ ਨੂੰ ਬਾਅਦ ਵਿੱਚ ਮੁੜ ਸਥਾਪਿਤ ਕਰ ਸਕਦੇ ਹੋ, ਲੇਕਿਨ ਇਸ ਡੀਵਾਈਸ \'ਤੇ ਸਟੋਰ ਕੀਤਾ ਉਹਨਾਂ ਦਾ ਡੇਟਾ ਗੁਆਚ ਜਾਵੇਗਾ।"</string>
+    <string name="storage_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_internal_forget_confirm" msgid="1148446041396902905">"ਇਸ <xliff:g id="NAME">^1</xliff:g> ਤੇ ਸਟੋਰ ਕੀਤੇ ਸਾਰੇ ਐਪਸ, ਫ਼ੋਟੋਆਂ ਅਤੇ  ਡਾਟਾ  ਹਮੇਸ਼ਾਂ ਲਈ ਨਸ਼ਟ ਹੋ ਜਾਏਗਾ।"</string>
     <string name="storage_detail_apps" msgid="6141154016753507490">"ਐਪਾਂ"</string>
     <string name="storage_detail_images" msgid="6950678857740634769">"ਚਿੱਤਰ"</string>
     <string name="storage_detail_videos" msgid="2919743464827110953">"ਵੀਡੀਓ"</string>
-    <string name="storage_detail_audio" msgid="1197685141676483213">"ਔਡੀਓ"</string>
-    <string name="storage_detail_cached" msgid="8547136365247818567">"ਕੈਚ ਕੀਤਾ ਡੈਟਾ"</string>
+    <string name="storage_detail_audio" msgid="1197685141676483213">" ਆਡੀਓ"</string>
+    <string name="storage_detail_cached" msgid="8547136365247818567">"ਕੈਚ ਕੀਤਾ  ਡਾਟਾ"</string>
     <string name="storage_detail_other" msgid="8404938385075638238">"ਹੋਰ"</string>
     <string name="storage_detail_system" msgid="4629506366064709687">"ਸਿਸਟਮ"</string>
     <string name="storage_detail_explore" msgid="7911344011431568294">"<xliff:g id="NAME">^1</xliff:g> ਐਕਸਪਲੋਰ ਕਰੋ"</string>
-    <string name="storage_detail_dialog_other" msgid="8907101974576694793">"ਹੋਰਾਂ ਵਿੱਚ ਸ਼ਾਮਲ ਹਨ ਐਪਾਂ ਦੁਆਰਾ ਰੱਖਿਅਤ ਸਾਂਝੀਆਂ ਕੀਤੀਆਂ ਫ਼ਾਈਲਾਂ, ਇੰਟਰਨੈੱਟ ਜਾਂ ਬਲੂਟੁੱਥ ਤੋਂ ਡਾਊਨਲੋਡ ਕੀਤੀਆਂ ਫ਼ਾਈਲਾਂ, Android ਫ਼ਾਈਲਾਂ, ਅਤੇ ਹੋਰ ਵੀ ਬਹੁਤ ਕੁਝ। \n\nਇਸ <xliff:g id="NAME">^1</xliff:g> ਦੀਆਂ ਦਿਖਣਯੋਗ ਸਮੱਗਰੀਆਂ ਨੂੰ ਵੇਖਣ ਲਈ, ਪੜਚੋਲ ਕਰੋ \'ਤੇ ਟੈਪ ਕਰੋ।"</string>
-    <string name="storage_detail_dialog_system" msgid="862835644848361569">"ਸਿਸਟਮ ਵਿੱਚ Android ਰੂਪ <xliff:g id="VERSION">%s</xliff:g> ਨੂੰ ਚਲਾਉਣ ਲਈ ਵਰਤੀਆਂ ਜਾਂਦੀਆਂ ਫ਼ਾਈਲਾਂ ਸ਼ਾਮਲ ਹਨ"</string>
-    <string name="storage_detail_dialog_user" msgid="3267254783294197804">"<xliff:g id="USER_0">^1</xliff:g> ਨੇ <xliff:g id="SIZE">^2</xliff:g> ਸਟੋਰੇਜ ਦੀ ਵਰਤੋਂ ਕਰਦੇ ਹੋਏ ਫ਼ੋਟੋਆਂ, ਸੰਗੀਤ, ਐਪਾਂ ਜਾਂ ਹੋਰ ਡੈਟਾ ਰੱਖਿਅਤ ਕੀਤਾ ਹੋ ਸਕਦਾ ਹੈ। \n\nਵੇਰਵੇ ਦੇਖਣ ਲਈ, ਬਦਲੀ ਕਰਕੇ <xliff:g id="USER_1">^1</xliff:g> \'ਤੇ ਜਾਓ।"</string>
+    <string name="storage_detail_dialog_other" msgid="8907101974576694793">"ਹੋਰਾਂ ਵਿੱਚ ਸ਼ਾਮਲ ਹਨ ਐਪਾਂ ਦੁਆਰਾ ਰੱਖਿਅਤ ਸਾਂਝੀਆਂ ਕੀਤੀਆਂ ਫ਼ਾਈਲਾਂ, ਇੰਟਰਨੈੱਟ ਜਾਂ ਬਲੂਟੁੱਥ ਤੋਂ ਡਾਊਨਲੋਡ ਕੀਤੀਆਂ ਫ਼ਾਈਲਾਂ, Android ਫ਼ਾਈਲਾਂ, ਅਤੇ ਹੋਰ ਵੀ ਬਹੁਤ ਕੁਝ। \n\nਇਸ <xliff:g id="NAME">^1</xliff:g> ਦੀਆਂ ਦਿਖਣਯੋਗ ਸਮੱਗਰੀਆਂ ਨੂੰ ਦੇਖਣ ਲਈ, ਪੜਚੋਲ ਕਰੋ \'ਤੇ ਟੈਪ ਕਰੋ।"</string>
+    <string name="storage_detail_dialog_system" msgid="862835644848361569">"ਸਿਸਟਮ ਵਿੱਚ Android ਵਰਜਨ <xliff:g id="VERSION">%s</xliff:g> ਨੂੰ ਚਲਾਉਣ ਲਈ ਵਰਤੀਆਂ ਜਾਂਦੀਆਂ ਫ਼ਾਈਲਾਂ ਸ਼ਾਮਲ ਹਨ"</string>
+    <string name="storage_detail_dialog_user" msgid="3267254783294197804">"<xliff:g id="USER_0">^1</xliff:g> ਨੇ <xliff:g id="SIZE">^2</xliff:g> ਸਟੋਰੇਜ ਦੀ ਵਰਤੋਂ ਕਰਦੇ ਹੋਏ ਫ਼ੋਟੋਆਂ, ਸੰਗੀਤ, ਐਪਾਂ ਜਾਂ ਹੋਰ ਡਾਟਾ ਰੱਖਿਅਤ ਕੀਤਾ ਹੋ ਸਕਦਾ ਹੈ। \n\nਵੇਰਵੇ ਦੇਖਣ ਲਈ, ਬਦਲੀ ਕਰਕੇ <xliff:g id="USER_1">^1</xliff:g> \'ਤੇ ਜਾਓ।"</string>
     <string name="storage_wizard_init_title" msgid="5085400514028585772">"ਆਪਣੇ <xliff:g id="NAME">^1</xliff:g> ਨੂੰ ਸੈੱਟ ਅੱਪ ਕਰੋ"</string>
-    <string name="storage_wizard_init_external_title" msgid="4867326438945303598">"ਪੋਰਟੇਬਲ ਸਟੋਰੇਜ ਦੇ ਰੂਪ ਵਿੱਚ ਉਪਯੋਗ ਕਰੋ"</string>
+    <string name="storage_wizard_init_external_title" msgid="4867326438945303598">"ਪੋਰਟੇਬਲ ਸਟੋਰੇਜ ਦੇ ਵੱਜੋਂ ਵਰਤੋਂ ਕਰੋ"</string>
     <string name="storage_wizard_init_external_summary" msgid="7476105886344565074">"ਡਿਵਾਈਸਾਂ ਦੇ ਵਿੱਚਕਾਰ ਫ਼ੋਟੋਆਂ ਅਤੇ ਦੂਜੇ ਮੀਡੀਓ ਨੂੰ ਮੂਵ ਕਰਨ ਲਈ."</string>
-    <string name="storage_wizard_init_internal_title" msgid="9100613534261408519">"ਅੰਦਰਲੀ ਸਟੋਰੇਜ ਦੇ ਰੂਪ ਵਿੱਚ ਉਪਯੋਗ ਕਰੋ"</string>
-    <string name="storage_wizard_init_internal_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> will ਸਿਰਫ਼ ਇਸ ਡੀਵਾਈਸ ਵਿੱਚ ਕੰਮ ਕਰੇਗਾ. \n\n "<b>"ਫਾਰਮੈਟ ਕਰਨਾ ਵਰਤਮਾਨ ਵਿੱਚ <xliff:g id="NAME_2">^1</xliff:g> \'ਤੇ ਸਟੋਰ ਕੀਤੀ ਸਾਰੇ ਡੇਟਾ ਨੂੰ ਸਾਫ਼ ਕਰ ਦਿੰਦਾ ਹੈ."</b>" ਡੇਟਾ ਗੁਆਚਣ ਤੋਂ ਬੱਚਣ ਲਈ, ਇਸਦਾ ਬੈੱਕ ਅੱਪ ਲੈਣ \'ਤੇ ਵਿਚਾਰ ਕਰੋ."</string>
+    <string name="storage_wizard_init_internal_title" msgid="9100613534261408519">"ਅੰਦਰੂਨੀ ਸਟੋਰੇਜ ਵੱਜੋਂ ਵਰਤੋਂ ਕਰੋ"</string>
+    <string name="storage_wizard_init_internal_summary" msgid="6240417501036216410">"ਐਪਾਂ ਅਤੇ ਫ਼ੋਟੋਆਂ ਸਮੇਤ, ਸਿਰਫ਼ ਇਸ ਡੀਵਾਈਸ \'ਤੇ ਕੁਝ ਵੀ ਸਟੋਰ ਕਰਨ ਦੇ ਲਈ। ਫਾਰਮੈਟ ਕਰਨ ਦੀ ਲੋੜ ਹੈ ਜੋ ਇਸਨੂੰ ਦੂਜੇ ਡੀਵਾਈਸਾਂ ਦੇ ਨਾਲ ਕੰਮ ਕਰਨ ਤੋਂ ਬਚਾਉਂਦਾ ਹੈ।"</string>
+    <string name="storage_wizard_format_confirm_title" msgid="2814021794538252546">"ਅੰਦਰੂਨੀ ਸਟੋਰੇਜ ਵੱਜੋਂ ਫਾਰਮੈਟ ਕਰੋ"</string>
+    <string name="storage_wizard_format_confirm_body" msgid="4401758710076806509">"ਇਸਨੂੰ <xliff:g id="NAME_0">^1</xliff:g> ਨੂੰ ਸੁਰੱਖਿਅਤ ਬਣਾਉਣ ਲਈ ਇਹ ਫਾਰਮੈਟ ਕਰਨ ਦੀ ਲੋੜ ਹੁੰਦੀ ਹੈ। \n\nਫਾਰਮੈਟ ਕਰਨ ਤੋਂ ਬਾਅਦ, ਇਹ <xliff:g id="NAME_1">^1</xliff:g> ਸਿਰਫ਼ ਇਸ ਡੀਵਾਈਸ ਵਿੱਚ ਕੰਮ ਕਰੇਗਾ। \n\n"<b>"ਫਾਰਮੈਟ ਕਰਨਾ ਵਰਤਮਾਨ ਵਿੱਚ <xliff:g id="NAME_2">^1</xliff:g> \'ਤੇ ਸਟੋਰ ਕੀਤੇ ਸਾਰੇ ਡਾਟਾ ਨੂੰ ਸਾਫ਼ ਕਰ ਦਿੰਦਾ ਹੈ।"</b>" ਡਾਟਾ ਗੁਆਚਣ ਤੋਂ ਬੱਚਣ ਲਈ, ਇਸਦਾ ਬੈੱਕਅੱਪ ਲੈਣ \'ਤੇ ਵਿਚਾਰ ਕਰੋ।"</string>
     <string name="storage_wizard_format_confirm_public_title" msgid="4905690038882041566">"ਪੋਰਟੇਬਲ ਸਟੋਰੇਜ ਵੱਜੋਂ ਫਾਰਮੈਟ ਕਰੋ"</string>
-    <string name="storage_wizard_format_confirm_public_body" msgid="1516932692920060272">"ਇਸਨੂੰ <xliff:g id="NAME_0">^1</xliff:g> ਨੂੰ ਫਾਰਮੈਟ ਕਰਨ ਦੀ ਲੋੜ ਹੁੰਦੀ ਹੈ। \n\n"<b>"ਫਾਰਮੈਟ ਕਰਨਾ <xliff:g id="NAME_1">^1</xliff:g> \'ਤੇ ਵਰਤਮਾਨ ਵਿੱਚ ਸਟੋਰ ਕੀਤੇ ਸਾਰੇ ਡੇਟਾ ਨੂੰ ਮਿਟਾ ਦਿੰਦਾ ਹੈ।"</b>" ਡੇਟਾ ਨੂੰ ਗੁਆਚਣ ਤੋਂ ਬੱਚਣ ਲਈ, ਇਸਦਾ ਬੈੱਕ ਅੱਪ ਲੈਣ \'ਤੇ ਵਿਚਾਰ ਕਰੋ।"</string>
+    <string name="storage_wizard_format_confirm_public_body" msgid="1516932692920060272">"ਇਸਨੂੰ <xliff:g id="NAME_0">^1</xliff:g> ਨੂੰ ਫਾਰਮੈਟ ਕਰਨ ਦੀ ਲੋੜ ਹੁੰਦੀ ਹੈ। \n\n"<b>"ਫਾਰਮੈਟ ਕਰਨਾ <xliff:g id="NAME_1">^1</xliff:g> \'ਤੇ ਵਰਤਮਾਨ ਵਿੱਚ ਸਟੋਰ ਕੀਤੇ ਸਾਰੇ  ਡਾਟਾ  ਨੂੰ ਮਿਟਾ ਦਿੰਦਾ ਹੈ।"</b>"  ਡਾਟਾ  ਨੂੰ ਗੁਆਚਣ ਤੋਂ ਬੱਚਣ ਲਈ, ਇਸਦਾ ਬੈੱਕ ਅੱਪ ਲੈਣ \'ਤੇ ਵਿਚਾਰ ਕਰੋ।"</string>
     <string name="storage_wizard_format_confirm_next" msgid="2774557300531702572">"ਸਾਫ਼ ਕਰੋ ਅਤੇ ਫਾਰਮੈਟ ਕਰੋ"</string>
     <string name="storage_wizard_format_progress_title" msgid="6487352396450582292">"<xliff:g id="NAME">^1</xliff:g> ਨੂੰ ਫਾਰਮੈਟ ਕਰ ਰਿਹਾ ਹੈ…"</string>
-    <string name="storage_wizard_format_progress_body" msgid="4445041233802828430">"<xliff:g id="NAME">^1</xliff:g> ਨੂੰ ਫਾਰਮੈਟ ਕਰਨ ਵੇਲੇ ਇਸਨੂੰ ਨਾ ਹਟਾਓ."</string>
-    <string name="storage_wizard_migrate_title" msgid="1363078147938160407">"ਡੇਟਾ ਨੂੰ ਨਵੇਂ ਸਟੋਰੇਜ ਵਿੱਚ ਮੂਵ ਕਰੋ"</string>
-    <string name="storage_wizard_migrate_body" msgid="890751699549542345">"ਤੁਸੀਂ ਇਸ ਨਵੇਂ <xliff:g id="NAME">^1</xliff:g>ਵਿੱਚ ਆਪਣੀਆਂ ਫ਼ੋਟੋਆਂ, ਫ਼ਾਈਲਾਂ ਅਤੇ ਐਪ ਦੇ ਡੇਟਾ ਨੂੰ ਮੂਵ ਕਰ ਸਕਦੇ ਹੋ।\n\nਇਹ ਮੂਵ ਲਗਭਗ <xliff:g id="TIME">^2</xliff:g> ਲੈਂਦਾ ਹੈ ਅੰਦਰਲੀ ਸਟੋਰੇਜ \'ਤੇ <xliff:g id="SIZE">^3</xliff:g> ਖਾਲੀ ਕਰ ਦੇਵੇਗਾ। ਕੁਝ ਐਪਸ ਇਹ ਕਿਰਿਆ ਹੋਣ ਵੇਲੇ ਕੰਮ ਨਹੀਂ ਕਰਨਗੇ।"</string>
+    <string name="storage_wizard_format_progress_body" msgid="4445041233802828430">"<xliff:g id="NAME">^1</xliff:g> ਨੂੰ ਫਾਰਮੈਟ ਕਰਨ ਵੇਲੇ ਇਸਨੂੰ ਨਾ ਹਟਾਓ।"</string>
+    <string name="storage_wizard_migrate_title" msgid="1363078147938160407">"ਡਾਟਾ ਨੂੰ ਨਵੀਂ ਸਟੋਰੇਜ ਵਿੱਚ ਲਿਜਾਓ"</string>
+    <string name="storage_wizard_migrate_body" msgid="890751699549542345">"ਤੁਸੀਂ ਇਸ ਨਵੇਂ <xliff:g id="NAME">^1</xliff:g> ਵਿੱਚ ਆਪਣੀਆਂ ਫ਼ੋਟੋਆਂ, ਫ਼ਾਈਲਾਂ ਅਤੇ ਐਪ ਦਾ ਡਾਟਾ ਲੈ ਕੇ ਜਾ ਸਕਦੇ ਹੋ।\n\nਲਿਜਾਣ ਵਿੱਚ ਲਗਭਗ <xliff:g id="TIME">^2</xliff:g> ਲੱਗਣਗੇ, ਅਤੇ ਅੰਦਰੂਨੀ ਸਟੋਰੇਜ \'ਤੇ <xliff:g id="SIZE">^3</xliff:g> ਖਾਲੀ ਹੋ ਜਾਵੇਗੀ। ਕੁਝ ਐਪਾਂ ਇਹ ਕਿਰਿਆ ਹੋਣ ਵੇਲੇ ਕੰਮ ਨਹੀਂ ਕਰਨਗੀਆਂ।"</string>
     <string name="storage_wizard_migrate_now" msgid="4523444323744239143">"ਹੁਣੇ ਮੂਵ ਕਰੋ"</string>
     <string name="storage_wizard_migrate_later" msgid="3173482328116026253">"ਬਾਅਦ ਵਿੱਚ ਮੂਵ ਕਰੋ"</string>
-    <string name="storage_wizard_migrate_confirm_title" msgid="8564833529613286965">"ਡੇਟਾ ਨੂੰ ਹੁਣੇ ਮੂਵ ਕਰੋ"</string>
+    <string name="storage_wizard_migrate_confirm_title" msgid="8564833529613286965">" ਡਾਟਾ  ਨੂੰ ਹੁਣੇ ਮੂਵ ਕਰੋ"</string>
     <string name="storage_wizard_migrate_confirm_body" msgid="4212060581792135962"><b>"ਇਹ ਮੂਵ ਲਗਭਗ <xliff:g id="TIME">^1</xliff:g> ਲੈਂਦਾ ਹੈ। ਅਤੇ ਇਹ <xliff:g id="NAME">^3</xliff:g> \'ਤੇ <xliff:g id="SIZE">^2</xliff:g> ਨੂੰ ਮੁਕਤ ਕਰ ਏਵੇਗਾ।"</b></string>
     <string name="storage_wizard_migrate_confirm_next" msgid="5509475628423823202">"ਮੂਵ ਕਰੋ"</string>
-    <string name="storage_wizard_migrate_progress_title" msgid="1665479429044202868">"ਡੇਟਾ ਮੂਵ ਕਰ ਰਿਹਾ ਹੈ..."</string>
-    <string name="storage_wizard_migrate_details" msgid="3709728824651136227">"ਮੂਵ ਦੇ ਦੌਰਾਨ \n• <xliff:g id="NAME">^1</xliff:g> ਨੂੰ ਨਾ ਹਟਾਓ. \n• ਕੁਝ ਐਪ ਸਹੀ ਤਰੀਕੇ ਦੇ ਨਾਲ ਕੰਮ ਨਹੀਂ ਕਰਨSome apps won\'t work correctly. \n• Keep the device charged."</string>
+    <string name="storage_wizard_migrate_progress_title" msgid="1665479429044202868">" ਡਾਟਾ  ਮੂਵ ਕਰ ਰਿਹਾ ਹੈ..."</string>
+    <string name="storage_wizard_migrate_details" msgid="3709728824651136227">"ਮੂਵ ਦੇ ਦੌਰਾਨ \n• <xliff:g id="NAME">^1</xliff:g> ਨੂੰ ਨਾ ਹਟਾਓ. \n• ਕੁਝ ਐਪ ਸਹੀ ਤਰੀਕੇ ਦੇ ਨਾਲ ਕੰਮ ਨਹੀਂ ਕਰਨ। \n• ਡੀਵਾਈਸ ਨੂੰ ਚਾਰਜ ਰੱਖੋ"</string>
     <string name="storage_wizard_ready_title" msgid="5381632402953258267">"<xliff:g id="NAME">^1</xliff:g> ਤਿਆਰ ਹੈ"</string>
     <string name="storage_wizard_ready_external_body" msgid="2879508114260597474">"ਤੁਹਾਡ <xliff:g id="NAME">^1</xliff:g> ਫ਼ੋਟੋਆਂ ਅਤੇ ਦੂਜੇ ਮੀਡੀਆ ਦੇ ਨਾਲ ਉਪਯੋਗ ਕਰਨ ਲਈ ਬਿਲਕੁਲ ਤਿਆਰ ਹੈ."</string>
-    <string name="storage_wizard_ready_internal_body" msgid="122532674037860197">"ਤੁਹਾਡਾ ਨਵਾਂ <xliff:g id="NAME">^1</xliff:g> ਕੰਮ ਕਰ ਰਿਹਾ ਹੈ. \n\nਇਸ ਡੀਵਾਈਸ ਵਿੱਚ ਫ਼ੋਟੋਆਂ, ਫ਼ਾਈਲਾਂ, ਅਤੇ ਐਪ ਡੇਟਾ ਨੂੰ ਮੂਵ ਕਰਨ ਲਈ, ਸੈੱਟਿੰਗਜ਼ ਅਤੇ ਸਟੋਰੇਜ \'ਤੇ ਜਾਓ."</string>
+    <string name="storage_wizard_ready_internal_body" msgid="122532674037860197">"ਤੁਹਾਡਾ ਨਵਾਂ <xliff:g id="NAME">^1</xliff:g> ਕੰਮ ਕਰ ਰਿਹਾ ਹੈ। \n\nਇਸ ਡੀਵਾਈਸ ਵਿੱਚ ਫੋਟੋਆਂ, ਫ਼ਾਈਲਾਂ, ਅਤੇ ਐਪ ਡਾਟਾ ਨੂੰ ਲੈ ਜਾਣ ਲਈ, ਸੈਟਿੰਗਾਂ ਅਤੇ ਸਟੋਰੇਜ \'ਤੇ ਜਾਓ।"</string>
     <string name="storage_wizard_move_confirm_title" msgid="292782012677890250">"<xliff:g id="APP">^1</xliff:g> ਨੂੰ ਮੂਵ ਕਰੋ"</string>
-    <string name="storage_wizard_move_confirm_body" msgid="5176432115206478941">"<xliff:g id="APP">^1</xliff:g> ਅਤੇ ਇਸਦੇ ਡੇਟਾ ਨੂੰ <xliff:g id="NAME_0">^2</xliff:g> ਵਿੱਚ ਮੂਵ ਕਰਨਾ ਸਿਰਫ਼ ਕੁਝ ਸਮਾਂ ਲੈਂਦਾ ਹੈ. ਤੁਸੀਂ ਉਦੋਂ ਤੱਕ ਇਸ ਐਪ ਦਾ ਉਪਯੋਗ ਕਰਨ ਦੇ ਯੋਗ ਨਹੀਂ ਹੋਵੋਗੇ ਜਦੋਂ ਤੱਕ ਇਹ ਮੂਵ ਪੂਰਾ ਨਹੀਂ ਹੋ ਜਾਂਦਾ ਹੈ. \n\nਮੂਵ ਦੇ ਦੌਰਾਨ <xliff:g id="NAME_1">^2</xliff:g> ਨੂੰ ਨਾ ਹਟਾਓ."</string>
+    <string name="storage_wizard_move_confirm_body" msgid="5176432115206478941">"<xliff:g id="APP">^1</xliff:g> ਅਤੇ ਇਸਦੇ ਡਾਟਾ ਨੂੰ <xliff:g id="NAME_0">^2</xliff:g> ਵਿੱਚ ਮੂਵ ਕਰਨਾ ਸਿਰਫ਼ ਕੁਝ ਸਮਾਂ ਲੈਂਦਾ ਹੈ। ਤੁਸੀਂ ਉਦੋਂ ਤੱਕ ਇਸ ਐਪ ਦੀ ਵਰਤੋਂ ਕਰਨ ਦੇ ਯੋਗ ਨਹੀਂ ਹੋਵੋਗੇ ਜਦੋਂ ਤੱਕ ਇਹ ਮੂਵ ਪੂਰਾ ਨਹੀਂ ਹੋ ਜਾਂਦਾ ਹੈ। \n\nਮੂਵ ਦੇ ਦੌਰਾਨ <xliff:g id="NAME_1">^2</xliff:g> ਨੂੰ ਨਾ ਹਟਾਓ।"</string>
     <string name="storage_wizard_move_progress_title" msgid="4443920302548035674">"<xliff:g id="APP">^1</xliff:g> ਨੂੰ ਮੂਵ ਕਰ ਰਿਹਾ ਹੈ…"</string>
-    <string name="storage_wizard_move_progress_body" msgid="7802577486578105609">"ਮੂਵ ਦੇ ਦੌਰਾਨ <xliff:g id="NAME">^1</xliff:g> ਨੂੰ ਨਾ ਹਟਾਓ. \n\nਇਸ ਡੀਵਾਈਸ \'ਤੇ <xliff:g id="APP">^2</xliff:g> ਐਪ ਉਦੋਂ ਤੱਕ ਉਪਲਬਧ ਨਹੀਂ ਹੋਵੇਗੀ ਜਦੋਂ ਤੱਕ ਮੂਵ ਪੂਰਾ ਨਹੀਂ ਹੋ ਜਾਂਦਾ ਹੈ."</string>
-    <string name="storage_wizard_move_progress_cancel" msgid="542047237524588792">"ਮੂਵ ਨੂੰ ਰੱਦ ਕਰੋ"</string>
-    <string name="storage_wizard_slow_body" msgid="8010127667184768025">"ਇਹ <xliff:g id="NAME_0">^1</xliff:g> ਹੌਲੀ ਜਾਪਦਾ ਹੈ। \n\nਤੁਸੀਂ ਜਾਰੀ ਰੱਖ ਸਕਦੇ ਹੋ, ਲੇਕਿਨ ਇਸ ਸਥਾਨ ਵਿੱਚ ਮੂਵ ਕੀਤੀ ਗਈ ਐਪਸ ਅਟਕ ਸਕਦੀ ਹੈ ਅਤੇ ਡੇਟਾ ਟ੍ਰਾਂਸਫ਼ਰ ਵਿੱਚ ਵੱਧ ਸਮਾਂ ਲੱਗ ਸਕਦਾ ਹੈ। \n\nਬਿਹਤਰ ਪ੍ਰਦਰਸ਼ਨ ਲਈ ਹੋਰ ਤੇਜ਼ <xliff:g id="NAME_1">^1</xliff:g> ਦਾ ਉਪਯੋਗ ਕਰਨ \'ਤੇ ਵਿਚਾਰ ਕਰੋ।"</string>
+    <string name="storage_wizard_move_progress_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_level_title" msgid="2965679202786873272">"ਬੈਟਰੀ ਪੱਧਰ"</string>
     <string name="apn_settings" msgid="3743170484827528406">"APNs"</string>
-    <string name="apn_edit" msgid="1354715499708424718">"ਪਹੁੰਚ ਬਿੰਦੂ ਸੰਪਾਦਿਤ ਕਰੋ"</string>
+    <string name="apn_edit" msgid="1354715499708424718">"ਪਹੁੰਚ ਬਿੰਦੂ ਦਾ ਸੰਪਾਦਨ ਕਰੋ"</string>
     <string name="apn_not_set" msgid="4974192007399968164">"ਸੈੱਟ ਨਹੀਂ ਕੀਤਾ"</string>
     <string name="apn_name" msgid="4115580098369824123">"ਨਾਮ"</string>
     <string name="apn_apn" msgid="2479425126733513353">"APN"</string>
@@ -1301,7 +1314,7 @@
     <string name="apn_type" msgid="469613123902220544">"APN ਪ੍ਰਕਾਰ"</string>
     <string name="apn_protocol" msgid="3272222921649348640">"APN ਪ੍ਰੋਟੋਕੋਲ"</string>
     <string name="apn_roaming_protocol" msgid="3386954381510788422">"APN ਰੋਮਿੰਗ ਪ੍ਰੋਟੋਕੋਲ"</string>
-    <string name="carrier_enabled" msgid="407655861175280806">"APN ਸਮਰੱਥ/ਅਸਮਰੱਥ"</string>
+    <string name="carrier_enabled" msgid="407655861175280806">"APN ਚਾਲੂ/ਬੰਦ"</string>
     <string name="carrier_enabled_summaryOn" msgid="6338915271908057531">"APN ਸਮਰਥਿਤ"</string>
     <string name="carrier_enabled_summaryOff" msgid="4300790190221203756">"APN ਅਸਮਰਥਿਤ"</string>
     <string name="bearer" msgid="594270280031923558">"ਬੀਅਰਰ"</string>
@@ -1310,7 +1323,7 @@
     <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>
@@ -1318,40 +1331,38 @@
     <string name="error_mnc_not23" msgid="8418177072458379439">"MNC ਖੇਤਰ 2 ਜਾਂ 3 ਅੰਕਾਂ ਦਾ ਹੋਣਾ ਲਾਜ਼ਮੀ ਹੈ।"</string>
     <string name="error_adding_apn_type" msgid="4181334016628549645">"ਕੈਰੀਅਰ %s ਕਿਸਮ ਦੇ APNs ਨੂੰ ਸ਼ਾਮਲ ਕਰਨ ਦੀ ਇਜਾਜ਼ਤ ਨਹੀਂ ਦਿੰਦਾ।"</string>
     <string name="restore_default_apn" msgid="8178010218751639581">"ਪੂਰਵ-ਨਿਰਧਾਰਤ APN ਸੈਟਿੰਗਾਂ ਰੀਸਟੋਰ ਕਰ ਰਿਹਾ ਹੈ।"</string>
-    <string name="menu_restore" msgid="8260067415075573273">"ਡਿਫੌਲਟਸ ਤੇ ਰੀਸੈੱਟ ਕਰੋ"</string>
+    <string name="menu_restore" msgid="8260067415075573273">"ਪੂਰਵ-ਨਿਰਧਾਰਤ ਤੇ ਰੀਸੈੱਟ ਕਰੋ"</string>
     <string name="restore_default_apn_completed" msgid="2824775307377604897">"ਪੂਰਵ-ਨਿਰਧਾਰਤ APN ਸੈਟਿੰਗਾਂ ਰੀਸੈੱਟ ਕਰਨਾ ਪੂਰਾ ਹੋਇਆ।"</string>
     <string name="reset_dashboard_title" msgid="6254873816990678620">"ਰੀਸੈੱਟ ਵਿਕਲਪ"</string>
-    <string name="reset_network_title" msgid="6166025966016873843">"Wi-Fi, ਮੋਬਾਈਲ ਅਤੇ ਬਲੂਟੁੱਥ ਨੂੰ ਰੀਸੈੱਟ ਕਰੋ"</string>
-    <string name="reset_network_desc" msgid="5547979398298881406">"ਇਹ ਨੈੱਟਵਰਕ ਦੀਆਂ ਸਾਰੀਆਂ ਸੈਟਿੰਗਾਂ ਨੂੰ ਰੀਸੈੱਟ ਕਰੇਗਾ, ਜਿਸ ਵਿੱਚ ਇਹ ਸ਼ਾਮਲ ਹਨ:\n\n"<li>"Wi‑Fi"</li>\n<li>"ਮੋਬਾਈਲ ਡੈਟਾ"</li>\n<li>"ਬਲੂਟੁੱਥ"</li></string>
-    <string name="reset_network_button_text" msgid="2035676527471089853">"ਰੀਸੈੱਟ ਸੈਟਿੰਗਾਂ"</string>
-    <string name="reset_network_final_desc" msgid="6388371121099245116">"ਕੀ ਸਾਰੀਆਂ ਨੈੱਟਵਰਕ ਸੈਟਿੰਗਾਂ ਰੀਸੈੱਟ ਕਰਨੀਆਂ ਹਨ? ਤੁਸੀਂ ਇਹ ਕਿਰਿਆ ਅਨਡੂ ਨਹੀ ਕਰ ਸਕਦੇ!"</string>
-    <string name="reset_network_final_button_text" msgid="1797434793741744635">"ਰੀਸੈੱਟ ਸੈਟਿੰਗਾਂ"</string>
+    <string name="reset_dashboard_summary" msgid="4851012632493522755">"ਨੈੱਟਵਰਕ, ਐਪਾਂ, ਜਾਂ ਡੀਵਾਈਸ ਨੂੰ ਰੀਸੈੱਟ ਕੀਤਾ ਜਾ ਸਕਦਾ ਹੈ"</string>
+    <string name="reset_network_title" msgid="6166025966016873843">"ਵਾਈ-ਫਾਈ, ਮੋਬਾਈਲ ਅਤੇ ਬਲੂਟੁੱਥ ਨੂੰ ਰੀਸੈੱਟ ਕਰੋ"</string>
+    <string name="reset_network_desc" msgid="5547979398298881406">"ਇਹ ਨੈੱਟਵਰਕ ਦੀਆਂ ਸਾਰੀਆਂ ਸੈਟਿੰਗਾਂ ਨੂੰ ਰੀਸੈੱਟ ਕਰੇਗਾ, ਜਿਸ ਵਿੱਚ ਇਹ ਸ਼ਾਮਲ ਹਨ:\n\n"<li>"ਵਾਈ-ਫਾਈ"</li>\n<li>"ਮੋਬਾਈਲ ਡਾਟਾ"</li>\n<li>"ਬਲੂਟੁੱਥ"</li></string>
+    <string name="reset_network_button_text" msgid="2035676527471089853">"ਸੈਟਿੰਗਾਂ ਰੀਸੈੱਟ ਕਰੋ"</string>
+    <string name="reset_network_final_desc" msgid="6388371121099245116">"ਕੀ ਸਾਰੀਆਂ ਨੈੱਟਵਰਕ ਸੈਟਿੰਗਾਂ ਰੀਸੈੱਟ ਕਰਨੀਆਂ ਹਨ? ਤੁਸੀਂ ਇਸ ਕਾਰਵਾਈ ਨੂੰ ਅਣਕੀਤਾ ਨਹੀ ਕਰ ਸਕਦੇ!"</string>
+    <string name="reset_network_final_button_text" msgid="1797434793741744635">"ਸੈਟਿੰਗਾਂ ਰੀਸੈੱਟ ਕਰੋ"</string>
     <string name="reset_network_confirm_title" msgid="1759888886976962773">"ਕੀ ਰੀਸੈੱਟ ਕਰਨਾ ਹੈ?"</string>
     <string name="network_reset_not_available" msgid="7188610385577164676">"ਇਸ ਉਪਭੋਗਤਾ ਲਈ ਨੈੱਟਵਰਕ ਰੀਸੈੱਟ ਉਪਲਬਧ ਨਹੀਂ ਹੈ"</string>
     <string name="reset_network_complete_toast" msgid="787829973559541880">"ਨੈੱਟਵਰਕ ਸੈਟਿੰਗਾਂ ਰੀਸੈੱਟ ਕੀਤੀਆਂ ਗਈਆਂ ਹਨ"</string>
-    <string name="master_clear_title" msgid="6617679904229218425">"ਸਾਰਾ ਡੈਟਾ ਮਿਟਾਓ (ਫੈਕਟਰੀ ਰੀਸੈੱਟ)"</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>
-    </plurals>
-    <string name="master_clear_summary" msgid="6902443944660426951">"ਅੰਦਰੂਨੀ ਸਟੋਰੇਜ ਅਤੇ ਸਾਰਾ ਡੈਟਾ ਰੀਸੈੱਟ ਕੀਤਾ ਜਾਵੇਗਾ"</string>
-    <string name="master_clear_desc" product="tablet" msgid="9146059417023157222">"ਇਹ ਤੁਹਾਡੀ ਟੈਬਲੇਟ ਦੀ "<b>"ਅੰਦਰੂਨੀ ਸਟੋਰੇਜ"</b>"ਦਾ ਸਾਰਾ ਡੈਟਾ ਮਿਟਾ ਦੇਵੇਗਾ, ਜਿਸ ਵਿੱਚ ਸ਼ਾਮਲ ਹੈ:\n\n"<li>"ਤੁਹਾਡਾ Google ਖਾਤਾ"</li>\n<li>"ਸਿਸਟਮ ਅਤੇ ਐਪ ਡੈਟਾ ਅਤੇ ਸੈਟਿੰਗਾਂ"</li>\n<li>"ਡਾਊਨਲੋਡ ਕੀਤੇ ਐਪਸ"</li></string>
-    <string name="master_clear_desc" product="default" msgid="4800386183314202571">"ਇਹ ਤੁਹਾਡੇ ਫੋਨ ਦੀ "<b>"ਅੰਦਰੂਨੀ ਸਟੋਰੇਜ"</b>" ਦਾ ਸਾਰਾ ਡੈਟਾ ਮਿਟਾ ਦੇਵੇਗਾ, ਜਿਸ ਵਿੱਚ ਸ਼ਾਮਲ ਹੈ:\n\n"<li>"ਤੁਹਾਡਾ Google ਖਾਤਾ"</li>\n<li>"ਸਿਸਟਮ ਅਤੇ ਐਪ ਡੈਟਾ ਅਤੇ ਸੈਟਿੰਗਾਂ"</li>\n<li>"ਡਾਊਨਲੋਡ ਕੀਤੇ ਐਪਸ"</li></string>
+    <string name="master_clear_title" msgid="3531267871084279512">"ਸਾਰਾ  ਡਾਟਾ  ਮਿਟਾਓ (ਫੈਕਟਰੀ ਰੀਸੈੱਟ)"</string>
+    <string name="master_clear_desc" product="tablet" msgid="9146059417023157222">"ਇਹ ਤੁਹਾਡੇ ਟੈਬਲੈੱਟ ਦੀ "<b>"ਅੰਦਰੂਨੀ ਸਟੋਰੇਜ"</b>"ਦਾ ਸਾਰਾ ਡਾਟਾ ਮਿਟਾ ਦੇਵੇਗਾ, ਜਿਸ ਵਿੱਚ ਸ਼ਾਮਲ ਹੈ:\n\n"<li>"ਤੁਹਾਡਾ Google ਖਾਤਾ"</li>\n<li>"ਸਿਸਟਮ ਅਤੇ ਐਪ ਡਾਟਾ ਅਤੇ ਸੈਟਿੰਗਾਂ"</li>\n<li>"ਡਾਊਨਲੋਡ ਕੀਤੀਆਂ ਐਪਾਂ"</li></string>
+    <string name="master_clear_desc" product="default" msgid="4800386183314202571">"ਇਹ ਤੁਹਾਡੇ ਫ਼ੋਨ ਦੀ "<b>"ਅੰਦਰੂਨੀ ਸਟੋਰੇਜ"</b>" ਦਾ ਸਾਰਾ ਡਾਟਾ ਮਿਟਾ ਦੇਵੇਗਾ, ਜਿਸ ਵਿੱਚ ਸ਼ਾਮਲ ਹੈ:\n\n"<li>"ਤੁਹਾਡਾ Google ਖਾਤਾ"</li>\n<li>"ਸਿਸਟਮ ਅਤੇ ਐਪ ਡਾਟਾ ਅਤੇ ਸੈਟਿੰਗਾਂ"</li>\n<li>"ਡਾਊਨਲੋਡ ਕੀਤੇ ਐਪਾਂ"</li></string>
     <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"ਤੁਸੀਂ ਇਸ ਵੇਲੇ ਇਹਨਾਂ ਖਾਤਿਆਂ ਤੇ ਸਾਈਨ ਇਨ ਕਰ ਰਹੇ ਹੋ:\n"</string>
-    <string name="master_clear_other_users_present" product="default" msgid="5161423070702470742">\n\n"ਇਸ ਡੀਵਾਈਸ ਤੇ ਹੋਰ ਉਪਭੋਗਤਾ ਮੌਜੂਦ ਨਹੀਂ ਹਨ।\n"</string>
-    <string name="master_clear_desc_also_erases_external" msgid="1903185203791274237"><li>"ਸੰਗੀਤ"</li>\n<li>"ਫੋਟੋਆਂ"</li>\n<li>"ਹੋਰ ਉਪਭੋਗਤਾ ਡੈਟਾ"</li></string>
-    <string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="7744115866662613411">\n\n"ਸੰੰਗੀਤ ਤਸਵੀਰਾਂ ਅਤੇ ਹੋਰ ਉਪਭੋਗਤਾ ਡੈਟਾ ਹਟਾਉਣ ਲਈ, "<b>"USB ਸਟੋਰੇਜ"</b>" ਨੂੰ ਮਿਟਾਉਣ ਦੀ ਲੋੜ ਹੈ।"</string>
-    <string name="master_clear_desc_erase_external_storage" product="default" msgid="4801026652617377093">\n\n"ਸੰਗੀਤ, ਤਸਵੀਰਾਂ ਅਤੇ ਹੋਰ ਉਪਭੋਗਤਾ ਡੈਟਾ ਹਟਾਉਣ ਲਈ, "<b>"SD ਕਾਰਡ"</b>" ਨੂੰ ਮਿਟਾਉਣ ਦੀ ਲੋੜ ਹੈ।"</string>
+    <string name="master_clear_other_users_present" product="default" msgid="5161423070702470742">\n\n"ਇਸ ਡੀਵਾਈਸ ਤੇ ਹੋਰ ਵਰਤੋਂਕਾਰ ਮੌਜੂਦ ਨਹੀਂ ਹਨ।\n"</string>
+    <string name="master_clear_desc_also_erases_external" msgid="1903185203791274237"><li>"ਸੰਗੀਤ"</li>\n<li>"ਫੋਟੋਆਂ"</li>\n<li>"ਹੋਰ ਉਪਭੋਗਤਾ  ਡਾਟਾ "</li></string>
+    <string name="master_clear_desc_also_erases_esim" msgid="312352697653096008"><li>"eSIM \'ਤੇ ਕੈਰੀਅਰ"</li></string>
+    <string name="master_clear_desc_no_cancel_mobile_plan" msgid="5460926449093211144">\n\n"ਇਸ ਨਾਲ ਤੁਹਾਡੀ ਮੋਬਾਈਲ ਸੇਵਾ ਯੋਜਨਾ ਰੱਦ ਨਹੀਂ ਹੋਵੇਗੀ।"</string>
+    <string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="7744115866662613411">\n\n"ਸੰਗੀਤ, ਤਸਵੀਰਾਂ ਅਤੇ ਹੋਰ ਵਰਤੋਂਕਾਰ ਡਾਟਾ ਸਾਫ਼ ਕਰਨ ਲਈ, "<b>"USB ਸਟੋਰੇਜ"</b>" ਨੂੰ ਮਿਟਾਉਣ ਦੀ ਲੋੜ ਹੈ।"</string>
+    <string name="master_clear_desc_erase_external_storage" product="default" msgid="4801026652617377093">\n\n"ਸੰਗੀਤ, ਤਸਵੀਰਾਂ ਅਤੇ ਹੋਰ ਉਪਭੋਗਤਾ  ਡਾਟਾ  ਹਟਾਉਣ ਲਈ, "<b>"SD ਕਾਰਡ"</b>" ਨੂੰ ਮਿਟਾਉਣ ਦੀ ਲੋੜ ਹੈ।"</string>
     <string name="erase_external_storage" product="nosdcard" msgid="969364037450286809">"USB ਸਟੋਰੇਜ ਮਿਟਾਓ"</string>
     <string name="erase_external_storage" product="default" msgid="1397239046334307625">"SD ਕਾਰਡ ਮਿਟਾਓ"</string>
-    <string name="erase_external_storage_description" product="nosdcard" msgid="4728558173931599429">"ਅੰਦਰੂਨੀ USB ਸਟੋਰੇਜ ਤੇ ਸਾਰਾ ਡੈਟਾ ਮਿਟਾਓ, ਜਿਵੇਂ ਸੰਗੀਤ ਜਾਂ ਫ਼ੋਟੋਆਂ"</string>
-    <string name="erase_external_storage_description" product="default" msgid="1737638779582964966">"SD ਕਾਰਡ ਦਾ ਸਾਰਾ ਡੈਟਾ ਮਿਟਾਓ, ਜਿਵੇਂ ਸੰਗੀਤ ਜਾਂ ਫ਼ੋਟੋਆਂ"</string>
+    <string name="erase_external_storage_description" product="nosdcard" msgid="4728558173931599429">"ਅੰਦਰੂਨੀ USB ਸਟੋਰੇਜ ਤੇ ਸਾਰਾ ਡਾਟਾ ਮਿਟਾਓ, ਜਿਵੇਂ ਸੰਗੀਤ ਜਾਂ ਫ਼ੋਟੋਆਂ"</string>
+    <string name="erase_external_storage_description" product="default" msgid="1737638779582964966">"SD ਕਾਰਡ ਦਾ ਸਾਰਾ  ਡਾਟਾ  ਮਿਟਾਓ, ਜਿਵੇਂ ਸੰਗੀਤ ਜਾਂ ਫ਼ੋਟੋਆਂ"</string>
     <string name="erase_esim_storage" msgid="1886761972867390123">"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>
+    <string name="erase_esim_storage_description" product="tablet" msgid="1780953956941209107">"ਟੈਬਲੈੱਟ ਵਿੱਚੋਂ ਸਾਰੇ eSIM ਮਿਟਾਓ। ਇਹ ਤੁਹਾਡੇ ਮੋਬਾਈਲ ਸੇਵਾ ਪਲਾਨ ਨੂੰ ਰੱਦ ਨਹੀਂ ਕਰੇਗਾ।"</string>
+    <string name="master_clear_button_text" product="tablet" msgid="3130786116528304116">"ਟੈਬਲੈੱਟ ਰੀਸੈੱਟ ਕਰੋ"</string>
+    <string name="master_clear_button_text" product="default" msgid="7550632653343157971">"ਫ਼ੋਨ ਰੀਸੈੱਟ ਕਰੋ"</string>
+    <string name="master_clear_final_desc" msgid="7318683914280403086">"ਕੀ ਆਪਣੀ ਸਾਰੀ ਨਿੱਜੀ ਜਾਣਕਾਰੀ ਅਤੇ ਡਾਊਨਲੋਡ ਕੀਤੀਆਂ ਐਪਾਂ ਮਿਟਾਉਣੀਆਂ ਹਨ? ਤੁਸੀਂ ਇਸ ਕਾਰਵਾਈ ਨੂੰ ਅਣਕੀਤਾ ਨਹੀਂ ਕਰ ਸਕਦੇ!"</string>
     <string name="master_clear_final_button_text" msgid="5390908019019242910">"ਸਭ ਕੁਝ ਮਿਟਾਓ"</string>
     <string name="master_clear_failed" msgid="2503230016394586353">"ਕੋਈ ਰੀਸੈੱਟ ਪਰਫੌਰਮ ਨਹੀਂ ਕੀਤਾ ਗਿਆ ਸੀ ਕਿਉਂਕਿ ਸਿਸਟਮ ਕਲੀਅਰ ਸੇਵਾ ਉਪਲਬਧ ਨਹੀਂ ਹੈ।"</string>
     <string name="master_clear_confirm_title" msgid="7572642091599403668">"ਕੀ ਰੀਸੈੱਟ ਕਰਨਾ ਹੈ?"</string>
@@ -1359,27 +1370,27 @@
     <string name="master_clear_progress_title" msgid="5194793778701994634">"ਮਿਟਾ ਰਿਹਾ ਹੈ"</string>
     <string name="master_clear_progress_text" msgid="6559096229480527510">"ਕਿਰਪਾ ਕਰਕੇ ਠਹਿਰੋ..."</string>
     <string name="call_settings_title" msgid="5188713413939232801">"ਕਾਲ ਸੈਟਿੰਗਾਂ"</string>
-    <string name="call_settings_summary" msgid="7291195704801002886">"ਵੌਇਸਮੇਲ, ਕਾਲ ਫਾਰਵਰਡਿੰਗ, ਕਾਲ ਵੇਟਿੰਗ, ਕਾਲਰ ID ਸੈਟ ਅਪ ਕਰੋ"</string>
+    <string name="call_settings_summary" msgid="7291195704801002886">"ਵੌਇਸਮੇਲ, ਕਾਲ ਫਾਰਵਰਡਿੰਗ, ਕਾਲ ਵੇਟਿੰਗ, ਕਾਲਰ ਆਈ.ਡੀ. ਸੈੱਟ ਅੱਪ ਕਰੋ"</string>
     <string name="tether_settings_title_usb" msgid="6688416425801386511">"USB ਟੈਦਰਿੰਗ"</string>
     <string name="tether_settings_title_wifi" msgid="3277144155960302049">"ਪੋਰਟੇਬਲ ਹੌਟਸਪੌਟ"</string>
-    <string name="tether_settings_title_bluetooth" msgid="355855408317564420">"Bluetooth ਟੈਦਰਿੰਗ"</string>
-    <string name="tether_settings_title_usb_bluetooth" msgid="5355828977109785001">"ਟੀਥਰਿੰਗ"</string>
+    <string name="tether_settings_title_bluetooth" msgid="355855408317564420">"ਬਲੂਟੁੱਥ ਟੈਦਰਿੰਗ"</string>
+    <string name="tether_settings_title_usb_bluetooth" msgid="5355828977109785001">"ਟੈਦਰਿੰਗ"</string>
     <string name="tether_settings_title_all" msgid="3058586928118801157">"ਹੌਟਸਪੌਟ ਅਤੇ ਟੈਦਰਿੰਗ"</string>
     <string name="tether_settings_summary_hotspot_on_tether_on" msgid="930464462687425777">"ਹੌਟਸਪੌਟ ਚਾਲੂ ਹੈ, ਟੈਦਰਿੰਗ ਚਾਲੂ ਹੈ"</string>
     <string name="tether_settings_summary_hotspot_on_tether_off" msgid="3473671453891735907">"ਹੌਟਸਪੌਟ ਚਾਲੂ ਹੈ"</string>
-    <string name="tether_settings_summary_hotspot_off_tether_on" msgid="1618256180720077354">"ਟੈਦਰਿੰਗ ਚਾਲੂ ਹੈ"</string>
-    <string name="tether_settings_disabled_on_data_saver" msgid="1576908608463904152">"ਡੈਟਾ ਸੇਵਰ ਚਾਲੂ ਹੋਣ \'ਤੇ ਟੈਦਰ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਦਾ ਜਾਂ ਪੋਰਟੇਬਲ ਹੌਟਸਪੌਟ ਦੀ ਵਰਤੋਂ ਨਹੀਂ ਕੀਤੀ ਜਾ ਸਕਦੀ"</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_subtext" product="default" msgid="5991482890033484794">"ਫ਼ੋਨ ਦੇ ਇੰਟਰਨੈੱਟ ਕਨੈਕਸ਼ਨ ਨੂੰ USB ਰਾਹੀਂ ਸਾਂਝਾ ਕਰੋ"</string>
     <string name="usb_tethering_subtext" product="tablet" msgid="5988796139573211318">"ਟੈਬਲੈੱਟ ਦੇ ਇੰਟਰਨੈੱਟ ਕਨੈਕਸ਼ਨ ਨੂੰ USB ਰਾਹੀਂ ਸਾਂਝਾ ਕਰੋ"</string>
-    <string name="bluetooth_tether_checkbox_text" msgid="2379175828878753652">"Bluetooth ਟੈਦਰਿੰਗ"</string>
+    <string name="bluetooth_tether_checkbox_text" msgid="2379175828878753652">"ਬਲੂਟੁੱਥ ਟੈਦਰਿੰਗ"</string>
     <string name="bluetooth_tethering_subtext" product="tablet" msgid="4558227863463153412">"ਟੈਬਲੈੱਟ ਦੇ ਇੰਟਰਨੈੱਟ ਕਨੈਕਸ਼ਨ ਨੂੰ ਬਲੂਟੁੱਥ ਰਾਹੀਂ ਸਾਂਝਾ ਕਰੋ"</string>
     <string name="bluetooth_tethering_subtext" product="default" msgid="1055197887836203595">"ਫ਼ੋਨ ਦੇ ਇੰਟਰਨੈੱਟ ਕਨੈਕਸ਼ਨ ਨੂੰ ਬਲੂਟੁੱਥ ਰਾਹੀਂ ਸਾਂਝਾ ਕਰੋ"</string>
     <string name="bluetooth_tethering_off_subtext_config" msgid="6326877798974938021">"ਇਸ <xliff:g id="DEVICE_NAME">%1$d</xliff:g> ਦੇ ਇੰਟਰਨੈੱਟ ਕਨੈਕਸ਼ਨ ਨੂੰ ਬਲੂਟੁੱਥ ਰਾਹੀਂ ਸਾਂਝਾ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ"</string>
     <string name="bluetooth_tethering_overflow_error" msgid="2135590598511178690">"<xliff:g id="MAXCONNECTION">%1$d</xliff:g> ਤੋਂ ਵੱਧ ਡਿਵਾਈਸਾਂ ਨਾਲ ਟੀਥਰ ਨਹੀਂ ਕਰ ਸਕਦਾ।"</string>
     <string name="bluetooth_untether_blank" msgid="2871192409329334813">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> ਅਨਟੀਥਰ ਹੋ ਜਾਏਗਾ।"</string>
-    <string name="tethering_footer_info" msgid="1308462275952345985">"ਆਪਣੇ ਮੋਬਾਈਲ ਡੈਟਾ ਕਨੈਕਸ਼ਨ ਦੇ ਰਾਹੀਂ ਦੂਜੀਆਂ ਡੀਵਾਈਸਾਂ ਨੂੰ ਇੰਟਰਨੈੱਟ ਮੁਹੱਈਆ ਕਰਵਾਉਣ ਲਈ ਹੌਟਸਪੌਟ ਅਤੇ ਟੈਦਰਿੰਗ ਦੀ ਵਰਤੋਂ ਕਰੋ। ਨੇੜਲੀਆਂ ਡੀਵਾਈਸਾਂ ਨਾਲ ਸਮੱਗਰੀ ਨੂੰ ਸਾਂਝਾ ਕਰਨ ਲਈ ਐਪਾਂ ਵੀ ਇੱਕ ਹੌਟਸਪੌਟ ਬਣਾ ਸਕਦੀਆਂ ਹਨ।"</string>
+    <string name="tethering_footer_info" msgid="1308462275952345985">"ਆਪਣੇ ਮੋਬਾਈਲ ਡਾਟਾ ਕਨੈਕਸ਼ਨ ਦੇ ਰਾਹੀਂ ਦੂਜੇ ਡੀਵਾਈਸਾਂ ਨੂੰ ਇੰਟਰਨੈੱਟ ਮੁਹੱਈਆ ਕਰਵਾਉਣ ਲਈ ਹੌਟਸਪੌਟ ਅਤੇ ਟੈਦਰਿੰਗ ਦੀ ਵਰਤੋਂ ਕਰੋ। ਨੇੜਲੇ ਡੀਵਾਈਸਾਂ ਨਾਲ ਸਮੱਗਰੀ ਨੂੰ ਸਾਂਝਾ ਕਰਨ ਲਈ ਐਪਾਂ ਵੀ ਇੱਕ ਹੌਟਸਪੌਟ ਬਣਾ ਸਕਦੀਆਂ ਹਨ।"</string>
     <string name="tethering_help_button_text" msgid="656117495547173630">"ਮਦਦ"</string>
     <string name="network_settings_title" msgid="2876509814832830757">"ਮੋਬਾਈਲ ਨੈੱਟਵਰਕ"</string>
     <string name="manage_mobile_plan_title" msgid="7630170375010107744">"ਮੋਬਾਈਲ ਪਲਾਨ"</string>
@@ -1389,19 +1400,19 @@
     <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">"ਕੀ Wi‑Fi ਸਹਾਇਕ ਬਦਲਣਾ ਹੈ?"</string>
+    <string name="network_scorer_change_active_dialog_title" msgid="3776301550387574975">"ਕੀ ਵਾਈ‑ਫਾਈ ਸਹਾਇਕ ਬਦਲਣਾ ਹੈ?"</string>
     <string name="network_scorer_change_active_dialog_text" msgid="8035173880322990715">"ਕੀ ਆਪਣੇ ਨੈੱਟਵਰਕ ਕਨੈਕਸ਼ਨਾਂ ਨੂੰ ਵਿਵਸਥਿਤ ਕਰਨ ਲਈ <xliff:g id="CURRENT_APP">%2$s</xliff:g> ਦੀ ਬਜਾਇ  <xliff:g id="NEW_APP">%1$s</xliff:g> ਨੂੰ ਵਰਤਣਾ ਹੈ?"</string>
     <string name="network_scorer_change_active_no_previous_dialog_text" msgid="7444620909047611601">"ਕੀ ਆਪਣੇ ਨੈੱਟਵਰਕ ਕਨੈਕਸ਼ਨਾਂ ਨੂੰ ਵਿਵਸਥਿਤ ਕਰਨ ਲਈ <xliff:g id="NEW_APP">%s</xliff:g> ਵਰਤਣਾ ਹੈ?"</string>
-    <string name="mobile_unknown_sim_operator" msgid="2156912373230276157">"ਅਗਿਆਤ SIM ਓਪਰੇਟਰ"</string>
+    <string name="mobile_unknown_sim_operator" msgid="2156912373230276157">"ਅਗਿਆਤ ਸਿਮ ਓਪਰੇਟਰ"</string>
     <string name="mobile_no_provisioning_url" msgid="9053814051811634125">"<xliff:g id="OPERATOR">%1$s</xliff:g> ਦੀ ਕੋਈ ਗਿਆਤ ਵਿਵਸਥਾਕਰਨ ਵੈੱਬਸਾਈਟ ਨਹੀਂ ਹੈ"</string>
     <string name="mobile_insert_sim_card" msgid="9052590985784056395">"ਕਿਰਪਾ ਕਰਕੇ SIM ਕਾਰਡ ਪਾਓ ਅਤੇ ਰੀਸਟਾਰਟ ਕਰੋ"</string>
-    <string name="mobile_connect_to_internet" msgid="1733894125065249639">"ਕਿਰਪਾ ਕਰਕੇ ਇੰਟਰਨੈਟ ਨਾਲ ਕਨੈਕਟ ਕਰੋ"</string>
+    <string name="mobile_connect_to_internet" msgid="1733894125065249639">"ਕਿਰਪਾ ਕਰਕੇ ਇੰਟਰਨੈੱਟ ਨਾਲ ਕਨੈਕਟ ਕਰੋ"</string>
     <string name="location_title" msgid="1029961368397484576">"ਮੇਰਾ ਟਿਕਾਣਾ"</string>
-    <string name="managed_profile_location_switch_title" msgid="6712332547063039683">"ਕੰਮ ਪ੍ਰੋਫਾਈਲ ਲਈ ਨਿਰਧਾਰਿਤ ਸਥਾਨ"</string>
+    <string name="managed_profile_location_switch_title" msgid="6712332547063039683">"ਕਾਰਜ ਪ੍ਰੋਫਾਈਲ ਲਈ ਟਿਕਾਣਾ"</string>
     <string name="location_mode_title" msgid="3982009713118421689">"ਮੋਡ"</string>
     <string name="location_mode_high_accuracy_title" msgid="8241802585110932849">"ਉੱਚ ਸ਼ੁੱਧਤਾ"</string>
     <string name="location_mode_battery_saving_title" msgid="711273645208158637">"ਬੈਟਰੀ ਦੀ ਬਚਤ"</string>
-    <string name="location_mode_sensors_only_title" msgid="3040366132175435160">"ਸਿਰਫ਼ ਡੀਵਾਈਸ"</string>
+    <string name="location_mode_sensors_only_title" msgid="3040366132175435160">"ਕੇਵਲ ਡੀਵਾਈਸ"</string>
     <string name="location_mode_location_off_title" msgid="2829713015012529465">"ਟਿਕਾਣਾ ਬੰਦ"</string>
     <string name="location_app_level_permissions" msgid="1825588230817081339">"ਐਪ-ਪੱਧਰ ਇਜਾਜ਼ਤਾਂ"</string>
     <string name="location_category_recent_location_requests" msgid="1938721350424447421">"ਹਾਲੀਆ ਟਿਕਾਣਾ ਬੇਨਤੀਆਂ"</string>
@@ -1410,32 +1421,32 @@
     <string name="location_high_battery_use" msgid="517199943258508020">"ਉੱਚ ਬੈਟਰੀ ਵਰਤੋਂ"</string>
     <string name="location_low_battery_use" msgid="8602232529541903596">"ਘੱਟ ਬੈਟਰੀ ਵਰਤੋਂ"</string>
     <string name="location_mode_screen_title" msgid="4528716772270246542">"ਟਿਕਾਣਾ ਮੋਡ"</string>
-    <string name="location_mode_high_accuracy_description" msgid="3453010562265338113">"ਟਿਕਾਣੇ ਦਾ ਪਤਾ ਲਗਾਉਣ ਲਈ GPS, Wi‑Fi, ਬਲੂਟੁੱਥ, ਜਾਂ ਮੋਬਾਈਲ ਨੈੱਟਵਰਕ ਵਰਤੋ"</string>
-    <string name="location_mode_battery_saving_description" msgid="2365298246603348985">"ਟਿਕਾਣੇ ਦਾ ਪਤਾ ਲਗਾਉਣ ਲਈ Wi‑Fi, ਬਲੂਟੁੱਥ, ਜਾਂ ਮੋਬਾਈਲ ਨੈੱਟਵਰਕ ਵਰਤੋ"</string>
+    <string name="location_mode_high_accuracy_description" msgid="3453010562265338113">"ਟਿਕਾਣੇ ਦਾ ਪਤਾ ਲਗਾਉਣ ਲਈ GPS, ਵਾਈ‑ਫਾਈ, ਬਲੂਟੁੱਥ, ਜਾਂ ਮੋਬਾਈਲ ਨੈੱਟਵਰਕ ਵਰਤੋ"</string>
+    <string name="location_mode_battery_saving_description" msgid="2365298246603348985">"ਟਿਕਾਣੇ ਦਾ ਪਤਾ ਲਗਾਉਣ ਲਈ ਵਾਈ‑ਫਾਈ, ਬਲੂਟੁੱਥ, ਜਾਂ ਮੋਬਾਈਲ ਨੈੱਟਵਰਕ ਵਰਤੋ"</string>
     <string name="location_mode_sensors_only_description" msgid="7247994752324805202">"ਟਿਕਾਣੇ ਦਾ ਪਤਾ ਲਗਾਉਣ ਲਈ GPS ਅਤੇ ਡੀਵਾਈਸ ਸੈਂਸਰਾਂ ਦੀ ਵਰਤੋਂ ਕਰੋ"</string>
     <string name="location_scanning_screen_title" msgid="4408076862929611554">"ਸਕੈਨ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ"</string>
-    <string name="location_scanning_wifi_always_scanning_title" msgid="6216705505621183645">"Wi‑Fi ਸਕੈਨਿੰਗ"</string>
-    <string name="location_scanning_wifi_always_scanning_description" msgid="8036382029606868081">"ਸਿਸਟਮ ਐਪਾਂ ਅਤੇ ਸੇਵਾਵਾਂ ਨੂੰ ਕਿਸੇ ਵੀ ਸਮੇਂ Wi‑Fi ਨੈੱਟਵਰਕਾਂ ਦਾ ਪਤਾ ਲਾਉਣ ਦੀ ਆਗਿਆ ਦੇ ਕੇ ਟਿਕਾਣਾ ਸੇਵਾ ਬਿਹਤਰ ਬਣਾਓ।"</string>
-    <string name="location_scanning_bluetooth_always_scanning_title" msgid="5444989508204520019">"Bluetooth ਸਕੈਨਿੰਗ"</string>
-    <string name="location_scanning_bluetooth_always_scanning_description" msgid="8602726521250591852">"ਸਿਸਟਮ ਐਪਾਂ ਅਤੇ ਸੇਵਾਵਾਂ ਨੂੰ ਕਿਸੇ ਵੀ ਸਮੇਂ Bluetooth ਡੀਵਾਈਸਾਂ ਦਾ ਪਤਾ ਲਾਉਣ ਦੀ ਆਗਿਆ ਦੇ ਕੇ ਟਿਕਾਣਾ ਸੇਵਾ ਬਿਹਤਰ ਬਣਾਓ।"</string>
-    <string name="location_network_based" msgid="9134175479520582215">"Wi‑Fi &amp; ਮੋਬਾਈਲ ਨੈੱਟਵਰਕ ਨਿਰਧਾਰਿਤ ਸਥਾਨ"</string>
-    <string name="location_neighborhood_level" msgid="5141318121229984788">"ਐਪਸ ਨੂੰ ਤੁਹਾਡੇ ਨਿਰਧਾਰਿਤ ਸਥਾਨ ਦਾ ਤੇਜ਼ ਅਨੁਮਾਨ ਲਗਾਉਣ ਲਈ Google ਦੀ ਨਿਰਧਾਰਿਤ ਸਥਾਨ ਸੇਵਾ ਵਰਤਣ ਦਿਓ। ਅਨਾਮ ਨਿਰਧਾਰਿਤ ਸਥਾਨ ਡੈਟਾ ਇਕੱਤਰ ਕੀਤਾ ਜਾਏਗਾ ਅਤੇ Google ਨੂੰ ਭੇਜਿਆ ਜਾਏਗਾ।"</string>
-    <string name="location_neighborhood_level_wifi" msgid="4234820941954812210">"Wi‑Fi ਵੱਲੋਂ ਨਿਸ਼ਚਿਤ ਨਿਰਧਾਰਿਤ ਸਥਾਨ"</string>
+    <string name="location_scanning_wifi_always_scanning_title" msgid="6216705505621183645">"ਵਾਈ‑ਫਾਈ ਸਕੈਨਿੰਗ"</string>
+    <string name="location_scanning_wifi_always_scanning_description" msgid="8036382029606868081">"ਸਿਸਟਮ ਐਪਾਂ ਅਤੇ ਸੇਵਾਵਾਂ ਨੂੰ ਕਿਸੇ ਵੀ ਸਮੇਂ ਵਾਈ‑ਫਾਈ ਨੈੱਟਵਰਕਾਂ ਦਾ ਪਤਾ ਲਾਉਣ ਦੀ ਆਗਿਆ ਦੇ ਕੇ ਟਿਕਾਣਾ ਸੇਵਾ ਬਿਹਤਰ ਬਣਾਓ।"</string>
+    <string name="location_scanning_bluetooth_always_scanning_title" msgid="5444989508204520019">"ਬਲੂਟੁੱਥ ਸਕੈਨਿੰਗ"</string>
+    <string name="location_scanning_bluetooth_always_scanning_description" msgid="8602726521250591852">"ਸਿਸਟਮ ਐਪਾਂ ਅਤੇ ਸੇਵਾਵਾਂ ਨੂੰ ਕਿਸੇ ਵੀ ਸਮੇਂ ਬਲੂਟੁੱਥ ਡੀਵਾਈਸਾਂ ਦਾ ਪਤਾ ਲਾਉਣ ਦੀ ਆਗਿਆ ਦੇ ਕੇ ਟਿਕਾਣਾ ਸੇਵਾ ਬਿਹਤਰ ਬਣਾਓ।"</string>
+    <string name="location_network_based" msgid="9134175479520582215">"ਵਾਈ‑ਫਾਈ &amp; ਮੋਬਾਈਲ ਨੈੱਟਵਰਕ ਟਿਕਾਣਾ"</string>
+    <string name="location_neighborhood_level" msgid="5141318121229984788">"ਐਪਸ ਨੂੰ ਤੁਹਾਡੇ ਨਿਰਧਾਰਿਤ ਸਥਾਨ ਦਾ ਤੇਜ਼ ਅਨੁਮਾਨ ਲਗਾਉਣ ਲਈ Google ਦੀ ਨਿਰਧਾਰਿਤ ਸਥਾਨ ਸੇਵਾ ਵਰਤਣ ਦਿਓ। ਅਨਾਮ ਨਿਰਧਾਰਿਤ ਸਥਾਨ  ਡਾਟਾ  ਇਕੱਤਰ ਕੀਤਾ ਜਾਏਗਾ ਅਤੇ Google ਨੂੰ ਭੇਜਿਆ ਜਾਏਗਾ।"</string>
+    <string name="location_neighborhood_level_wifi" msgid="4234820941954812210">"ਵਾਈ‑ਫਾਈ ਵੱਲੋਂ ਪਤਾ ਲਗਾਇਆ ਟਿਕਾਣਾ"</string>
     <string name="location_gps" msgid="8392461023569708478">"GPS ਸੈਟੇਲਾਈਟਸ"</string>
-    <string name="location_street_level" product="tablet" msgid="1669562198260860802">"ਆਪਣੇ ਨਿਰਧਾਰਿਤ ਸਥਾਨ ਨੂੰ ਸੁਨਿਸ਼ਚਿਤ ਕਰਨ ਲਈ ਐਪਸ ਨੂੰ ਆਪਣੀ ਟੈਬਲੇਟ ਤੇ GPS ਵਰਤਣ ਦਿਓ"</string>
-    <string name="location_street_level" product="default" msgid="4617445745492014203">"ਆਪਣੇ ਨਿਰਧਾਰਿਤ ਸਥਾਨ ਨੂੰ ਸੁਨਿਸ਼ਚਿਤ ਕਰਨ ਲਈ ਐਪਸ ਨੂੰ ਆਪਣੇ ਫੋਨ ਤੇ GPS ਵਰਤਣ ਦਿਓ"</string>
+    <string name="location_street_level" product="tablet" msgid="1669562198260860802">"ਆਪਣੇ ਟਿਕਾਣੇ ਨੂੰ ਸੁਨਿਸ਼ਚਿਤ ਕਰਨ ਲਈ ਐਪਾਂ ਨੂੰ ਆਪਣੇ ਟੈਬਲੈੱਟ ਤੇ GPS ਵਰਤਣ ਦਿਓ"</string>
+    <string name="location_street_level" product="default" msgid="4617445745492014203">"ਆਪਣੇ ਟਿਕਾਣੇ ਨੂੰ ਸੁਨਿਸ਼ਚਿਤ ਕਰਨ ਲਈ ਐਪਾਂ ਨੂੰ ਆਪਣੇ ਫ਼ੋਨ ਤੇ GPS ਵਰਤਣ ਦਿਓ"</string>
     <string name="assisted_gps" msgid="4649317129586736885">"ਸਹਾਇਤ ਪ੍ਰਾਪਤ GPS ਵਰਤੋ"</string>
-    <string name="assisted_gps_enabled" msgid="8751899609589792803">"GPS ਦੀ ਸਹਾਇਤਾ ਲਈ ਸਰਵਰ ਵਰਤੋ (ਨੈੱਟਵਰਕ ਵਰਤੋਂ ਘੱਟ ਕਰਨ ਲਈ ਅਨਚੈਕ ਕਰੋ)"</string>
-    <string name="assisted_gps_disabled" msgid="6982698333968010748">"GPS ਦੀ ਸਹਾਇਤਾ ਲਈ ਸਰਵਰ ਵਰਤੋ (GPS ਪ੍ਰਦਰਸ਼ਨ ਨੂੰ ਬਿਹਤਰ ਬਣਾਉਣ ਲਈ ਅਨਚੈਕ ਕਰੋ)"</string>
+    <string name="assisted_gps_enabled" msgid="8751899609589792803">"GPS ਦੀ ਸਹਾਇਤਾ ਲਈ ਸਰਵਰ ਵਰਤੋ (ਨੈੱਟਵਰਕ ਵਰਤੋਂ ਘੱਟ ਕਰਨ ਲਈ ਨਿਸ਼ਾਨ ਹਟਾਓ)"</string>
+    <string name="assisted_gps_disabled" msgid="6982698333968010748">"GPS ਦੀ ਸਹਾਇਤਾ ਲਈ ਸਰਵਰ ਵਰਤੋ (GPS ਪ੍ਰਦਰਸ਼ਨ ਨੂੰ ਬਿਹਤਰ ਬਣਾਉਣ ਲਈ ਨਿਸ਼ਾਨ ਹਟਾਓ)"</string>
     <string name="use_location_title" msgid="5206937465504979977">"ਟਿਕਾਣਾ &amp; Google ਖੋਜ"</string>
-    <string name="use_location_summary" msgid="3978805802386162520">"Google ਨੂੰ ਖੋਜ ਨਤੀਜਿਆਂ ਅਤੇ ਹੋਰ ਸੇਵਾਵਾਂ ਨੂੰ ਬਿਹਤਰ ਬਣਾਉਣ ਲਈ ਤੁਹਾਡਾ ਨਿਰਧਾਰਿਤ ਸਥਾਨ ਵਰਤਣ ਦਿਓ"</string>
-    <string name="location_access_title" msgid="7064108942964081243">"ਮੇਰੇ ਨਿਰਧਾਰਿਤ ਸਥਾਨ ਤੱਕ ਪਹੁੰਚ ਪ੍ਰਾਪਤ ਕਰੋ"</string>
+    <string name="use_location_summary" msgid="3978805802386162520">"Google ਨੂੰ ਖੋਜ ਨਤੀਜਿਆਂ ਅਤੇ ਹੋਰ ਸੇਵਾਵਾਂ ਨੂੰ ਬਿਹਤਰ ਬਣਾਉਣ ਲਈ ਤੁਹਾਡਾ ਟਿਕਾਣਾ ਵਰਤਣ ਦਿਓ"</string>
+    <string name="location_access_title" msgid="7064108942964081243">"ਮੇਰੇ ਟਿਕਾਣਾ ਤੱਕ ਪਹੁੰਚ ਪ੍ਰਾਪਤ ਕਰੋ"</string>
     <string name="location_access_summary" msgid="69031404093194341">"ਜਿਹਨਾਂ ਐਪਸ ਨੇ ਤੁਹਾਡੀ ਅਨੁਮਤੀ ਮੰਗੀ ਹੈ, ਉਹਨਾਂ ਨੂੰ ਆਪਣੀ ਨਿਰਧਾਰਿਤ ਸਥਾਨ ਜਾਣਕਾਰੀ ਵਰਤਣ ਦਿਓ"</string>
     <string name="location_sources_heading" msgid="1278732419851088319">"ਨਿਰਧਾਰਿਤ ਸਰੋਤ"</string>
-    <string name="about_settings" product="tablet" msgid="593457295516533765">"ਟੈਬਲੇਟ ਬਾਰੇ"</string>
+    <string name="about_settings" product="tablet" msgid="593457295516533765">"ਟੈਬਲੈੱਟ ਬਾਰੇ"</string>
     <string name="about_settings" product="default" msgid="1743378368185371685">"ਫ਼ੋਨ ਬਾਰੇ"</string>
-    <string name="about_settings" product="emulator" msgid="221313099578564438">"ਇਮੂਲੇਟ ਕੀਤੀ ਡੀਵਾਈਸ ਬਾਰੇ"</string>
-    <string name="about_settings_summary" msgid="3371517697156165959">"ਕਨੂੰਨੀ ਜਾਣਕਾਰੀ, ਸਥਿਤੀ, ਸੌਫਟਵੇਅਰ ਰੂਪ ਦੇਖੋ"</string>
+    <string name="about_settings" 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>
     <string name="manual" msgid="3025943393642974445">"ਮੈਨੁਅਲ"</string>
@@ -1454,104 +1465,104 @@
     <string name="settings_license_activity_loading" msgid="3337535809093591740">"ਲੋਡ ਕਰ ਰਿਹਾ ਹੈ…"</string>
     <string name="settings_safetylegal_title" msgid="1289483965535937431">"ਸੁਰੱਖਿਆ ਜਾਣਕਾਰੀ"</string>
     <string name="settings_safetylegal_activity_title" msgid="6901214628496951727">"ਸੁਰੱਖਿਆ ਜਾਣਕਾਰੀ"</string>
-    <string name="settings_safetylegal_activity_unreachable" msgid="250674109915859456">"ਤੁਹਾਡੇ ਕੋਲ ਇੱਕ ਡੈਟਾ ਕਨੈਕਸ਼ਨ ਨਹੀਂ ਹੈ। ਹੁਣ ਇਸ ਜਾਣਕਾਰੀ ਨੂੰ ਦੇਖਣ ਲਈ, ਇੰਟਰਨੈਟ ਨਾਲ ਕਨੈਕਟ ਕੀਤੇ ਕਿਸੇ ਵੀ ਕੰਪਿਊਟਰ ਤੋਂ %s ਤੇ ਜਾਓ।"</string>
+    <string name="settings_safetylegal_activity_unreachable" msgid="250674109915859456">"ਤੁਹਾਡੇ ਕੋਲ ਕੋਈ ਡਾਟਾ ਕਨੈਕਸ਼ਨ ਨਹੀਂ ਹੈ। ਹੁਣ ਇਸ ਜਾਣਕਾਰੀ ਨੂੰ ਦੇਖਣ ਲਈ, ਇੰਟਰਨੈੱਟ ਨਾਲ ਕਨੈਕਟ ਕੀਤੇ ਕਿਸੇ ਵੀ ਕੰਪਿਊਟਰ ਤੋਂ %s ਤੇ ਜਾਓ।"</string>
     <string name="settings_safetylegal_activity_loading" msgid="8059022597639516348">"ਲੋਡ ਕਰ ਰਿਹਾ ਹੈ…"</string>
-    <string name="lockpassword_choose_your_password_header" msgid="8624900666929394990">"ਆਪਣਾ ਪਾਸਵਰਡ ਚੁਣੋ"</string>
-    <string name="lockpassword_choose_your_password_header_for_fingerprint" msgid="6624409510609085450">"ਫਿੰਗਰਪ੍ਰਿੰਟ ਵਰਤਣ ਲਈ ਪਾਸਵਰਡ ਸੈੱਟ ਕਰੋ"</string>
-    <string name="lockpassword_choose_your_pattern_header" msgid="6949761069941694050">"ਆਪਣਾ ਪੈਟਰਨ ਚੁਣੋ"</string>
-    <string name="lockpassword_choose_your_pattern_header_for_fingerprint" msgid="5901096361617543819">"ਫਿੰਗਰਪ੍ਰਿੰਟ ਵਰਤਣ ਲਈ ਪੈਟਰਨ ਸੈੱਟ ਕਰੋ"</string>
-    <string name="lockpassword_choose_your_pin_header" msgid="7598849519816138302">"ਆਪਣਾ PIN ਚੁਣੋ"</string>
-    <string name="lockpassword_choose_your_pin_header_for_fingerprint" msgid="765344692615917183">"ਫਿੰਗਰਪ੍ਰਿੰਟ ਵਰਤਣ ਲਈ PIN ਸੈੱਟ ਕਰੋ"</string>
-    <string name="lockpassword_confirm_your_password_header" msgid="6308478184889846633">"ਆਪਣੇ ਪਾਸਵਰਡ ਦੀ ਪੁਸ਼ਟੀ ਕਰੋ"</string>
+    <string name="lockpassword_choose_your_screen_lock_header" msgid="3872462096767152394">"ਕੋਈ ਸਕ੍ਰੀਨ  ਲਾਕ  ਸਥਾਪਤ ਕਰੋ"</string>
+    <string name="lockpassword_choose_your_password_message" msgid="1197569283524841412">"ਸੁਰੱਖਿਆ ਲਈ, ਇੱਕ ਪਾਸਵਰਡ ਸੈੱਟ ਕਰੋ"</string>
+    <string name="lockpassword_choose_your_password_header_for_fingerprint" msgid="2541818487015343503">"ਫਿੰਗਰਪ੍ਰਿੰਟ ਵਰਤਣ ਲਈ, ਕੋਈ ਪਾਸਵਰਡ ਸੈੱਟ ਕਰੋ"</string>
+    <string name="lockpassword_choose_your_pattern_header_for_fingerprint" msgid="7709785406243556723">"ਫਿੰਗਰਪ੍ਰਿੰਟ ਵਰਤਣ ਲਈ, ਕੋਈ ਪੈਟਰਨ ਸੈੱਟ ਕਰੋ"</string>
+    <string name="lockpassword_choose_your_pin_message" msgid="1875420718677275646">"ਸੁਰੱਖਿਆ ਲਈ, ਇੱਕ ਪਿੰਨ ਸਥਾਪਤ ਕਰੋ"</string>
+    <string name="lockpassword_choose_your_pin_header_for_fingerprint" msgid="1549639053195796674">"ਫਿੰਗਰਪ੍ਰਿੰਟ ਵਰਤਣ ਲਈ, ਕੋਈ ਪਿੰਨ ਸੈੱਟ ਕਰੋ"</string>
+    <string name="lockpassword_choose_your_pattern_message" msgid="5986983400689720015">"ਸੁਰੱਖਿਆ ਲਈ, ਕੋਈ ਪੈਟਰਨ ਸੈੱਟ ਕਰੋ"</string>
+    <string name="lockpassword_confirm_your_password_header" msgid="1266027268220850931">"ਆਪਣਾ ਪਾਸਵਰਡ ਮੁੜ-ਦਾਖਲ ਕਰੋ"</string>
     <string name="lockpassword_confirm_your_pattern_header" msgid="7543433733032330821">"ਆਪਣੇ ਪੈਟਰਨ ਦੀ ਪੁਸ਼ਟੀ ਕਰੋ"</string>
-    <string name="lockpassword_confirm_your_pin_header" msgid="49038294648213197">"ਆਪਣੇ PIN ਦੀ ਪੁਸ਼ਟੀ ਕਰੋ"</string>
+    <string name="lockpassword_confirm_your_pin_header" msgid="7744513791910572550">"ਆਪਣਾ ਪਿੰਨ ਮੁੜ-ਦਾਖਲ ਕਰੋ"</string>
     <string name="lockpassword_confirm_passwords_dont_match" msgid="5140892109439191415">"ਪਾਸਵਰਡ ਮੇਲ ਨਹੀਂ ਖਾਂਦੇ"</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">"PIN ਸੈੱਟ ਕੀਤਾ ਗਿਆ ਗਿਆ ਹੈ"</string>
+    <string name="lockpassword_confirm_pins_dont_match" msgid="7226244811505606217">"ਪਿੰਨ ਮੇਲ ਨਹੀਂ ਖਾਂਦੇ"</string>
+    <string name="lockpassword_choose_lock_generic_header" msgid="3811438094903786145">"ਅਣਲਾਕ ਚੋਣ"</string>
+    <string name="lockpassword_password_set_toast" msgid="4875050283108629383">"ਪਾਸਵਰਡ ਸੈੱਟ ਕੀਤਾ ਗਿਆ ਹੈ"</string>
+    <string name="lockpassword_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">"ਜਾਰੀ ਰੱਖਣ ਲਈ ਆਪਣੀ ਡੀਵਾਈਸ ਦਾ PIN ਦਾਖਲ ਕਰੋ"</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">"ਜਾਰੀ ਰੱਖਣ ਲਈ ਆਪਣਾ ਕੰਮ ਸਬੰਧੀ PIN ਦਾਖਲ ਕਰੋ"</string>
+    <string name="lockpassword_confirm_your_pin_generic_profile" msgid="3730141667547002246">"ਜਾਰੀ ਰੱਖਣ ਲਈ ਆਪਣਾ ਕੰਮ ਸਬੰਧੀ ਪਿੰਨ ਦਾਖਲ ਕਰੋ"</string>
     <string name="lockpassword_confirm_your_password_generic_profile" msgid="4250642723467019894">"ਜਾਰੀ ਰੱਖਣ ਲਈ ਆਪਣਾ ਕੰਮ ਸਬੰਧੀ ਪਾਸਵਰਡ ਦਾਖਲ ਕਰੋ"</string>
-    <!-- no translation found for lockpassword_strong_auth_required_device_pattern (530802132223800623) -->
-    <skip />
-    <!-- no translation found for lockpassword_strong_auth_required_device_pin (7829294830078036417) -->
-    <skip />
-    <!-- no translation found for lockpassword_strong_auth_required_device_password (3552644641574796973) -->
-    <skip />
-    <!-- no translation found for lockpassword_strong_auth_required_work_pattern (3003781907040522053) -->
-    <skip />
-    <!-- no translation found for lockpassword_strong_auth_required_work_pin (3367491332598821552) -->
-    <skip />
-    <!-- no translation found for lockpassword_strong_auth_required_work_password (8159775129968582940) -->
-    <skip />
-    <string name="lockpassword_invalid_pin" msgid="15588049067548470">"ਗ਼ਲਤ PIN"</string>
-    <string name="lockpassword_invalid_password" msgid="4038507398784975200">"ਗ਼ਲਤ ਪਾਸਵਰਡ"</string>
+    <string name="lockpassword_strong_auth_required_device_pattern" msgid="530802132223800623">"ਵਾਧੂ ਸੁਰੱਖਿਆ ਲਈ, ਆਪਣੇ ਡੀਵਾਈਸ ਪੈਟਰਨ ਦੀ ਵਰਤੋਂ ਕਰੋ"</string>
+    <string name="lockpassword_strong_auth_required_device_pin" msgid="7829294830078036417">"ਵਾਧੂ ਸੁਰੱਖਿਆ ਲਈ, ਆਪਣਾ ਡੀਵਾਈਸ ਪਿੰਨ ਦਾਖਲ ਕਰੋ"</string>
+    <string name="lockpassword_strong_auth_required_device_password" msgid="3552644641574796973">"ਵਾਧੂ ਸੁਰੱਖਿਆ ਲਈ, ਆਪਣੇ ਡੀਵਾਈਸ ਦਾ ਪਾਸਵਰਡ ਦਾਖਲ ਕਰੋ"</string>
+    <string name="lockpassword_strong_auth_required_work_pattern" msgid="3003781907040522053">"ਵਾਧੂ ਸੁਰੱਖਿਆ ਲਈ, ਆਪਣੇ ਕਾਰਜ-ਸਥਾਨ ਦੇ ਪੈਟਰਨ ਦੀ ਵਰਤੋਂ ਕਰੋ"</string>
+    <string name="lockpassword_strong_auth_required_work_pin" msgid="3367491332598821552">"ਵਾਧੂ ਸੁਰੱਖਿਆ ਲਈ, ਆਪਣਾ ਕੰਮ ਸਬੰਧੀ ਪਿੰਨ ਦਾਖਲ ਕਰੋ"</string>
+    <string name="lockpassword_strong_auth_required_work_password" msgid="8159775129968582940">"ਵਾਧੂ ਸੁਰੱਖਿਆ ਲਈ, ਆਪਣੇ ਕਾਰਜ-ਸਥਾਨ ਦਾ ਪਾਸਵਰਡ ਦਾਖਲ ਕਰੋ"</string>
+    <string name="lockpassword_confirm_your_pattern_details_frp" msgid="6757336656791723193">"Your phone was reset to factory settings. To use this phone, enter your previous pattern."</string>
+    <string name="lockpassword_confirm_your_pin_details_frp" msgid="826520613445990470">"Your phone was reset to factory settings. To use this phone, enter your previous PIN."</string>
+    <string name="lockpassword_confirm_your_password_details_frp" msgid="8944081074615739040">"Your phone was reset to factory settings. To use this phone, enter your previous password."</string>
+    <string name="lockpassword_confirm_your_pattern_header_frp" msgid="2898036091609128286">"ਪੈਟਰਨ ਦੀ ਪੁਸ਼ਟੀ ਕਰੋ"</string>
+    <string name="lockpassword_confirm_your_pin_header_frp" msgid="4141601774778898803">"ਪਿੰਨ ਦੀ ਪੁਸ਼ਟੀ ਕਰੋ"</string>
+    <string name="lockpassword_confirm_your_password_header_frp" msgid="3762615419295360480">"Verify password"</string>
+    <string name="lockpassword_invalid_pin" msgid="15588049067548470">"ਗਲਤ ਪਿੰਨ"</string>
+    <string name="lockpassword_invalid_password" msgid="4038507398784975200">"ਗਲਤ ਪਾਸਵਰਡ"</string>
     <string name="lockpattern_need_to_unlock_wrong" msgid="1745247595356012176">"ਗ਼ਲਤ ਪੈਟਰਨ"</string>
     <string name="lock_settings_title" msgid="4213839087748988686">"ਡੀਵਾਈਸ ਸੁਰੱਖਿਆ"</string>
-    <string name="lockpattern_change_lock_pattern_label" msgid="5679630792003440352">"ਅਨਲੌਕ ਪੈਟਰਨ ਬਦਲੋ"</string>
-    <string name="lockpattern_change_lock_pin_label" msgid="266707138486731661">"ਅਨਲੌਕ PIN ਬਦਲੋ"</string>
-    <string name="lockpattern_recording_intro_header" msgid="308287052221942814">"ਅਨਲੌਕ ਕਰਨ ਲਈ ਇੱਕ ਪੈਟਰਨ ਉਲੀਕੋ"</string>
+    <string name="lockpattern_change_lock_pattern_label" msgid="5679630792003440352">"ਅਣਲਾਕ ਪੈਟਰਨ ਬਦਲੋ"</string>
+    <string name="lockpattern_change_lock_pin_label" msgid="266707138486731661">"ਅਣਲਾਕ ਪਿੰਨ ਬਦਲੋ"</string>
+    <string name="lockpattern_recording_intro_header" msgid="308287052221942814">"ਅਣਲਾਕ ਕਰਨ ਲਈ ਇੱਕ ਪੈਟਰਨ ਉਲੀਕੋ"</string>
     <string name="lockpattern_recording_intro_footer" msgid="1118579101409152113">"ਮਦਦ ਲਈ ਮੀਨੂ ਦਬਾਓ।"</string>
     <string name="lockpattern_recording_inprogress" msgid="6667844062721656773">"ਜਦੋਂ ਹੋ ਜਾਏ ਤਾਂ ਉਂਗਲ ਹਟਾਓ"</string>
     <string name="lockpattern_recording_incorrect_too_short" msgid="1348234155120957561">"ਘੱਟੋ-ਘੱਟ <xliff:g id="NUMBER">%d</xliff:g> ਬਿੰਦੂਆਂ ਨੂੰ ਜੋੜੋ। ਦੁਬਾਰਾ ਕੋਸ਼ਿਸ਼ ਕਰੋ।"</string>
-    <string name="lockpattern_pattern_entered_header" msgid="4316818983675591604">"ਪੈਟਰਨ ਰਿਕਾਰਡ ਕੀਤਾ"</string>
-    <string name="lockpattern_need_to_confirm" msgid="8054853451639221265">"ਪੁਸ਼ਟੀ ਕਰਨ ਲਈ ਦੁਬਾਰਾ ਪੈਟਰਨ ਡ੍ਰਾ ਕਰੋ"</string>
-    <string name="lockpattern_pattern_confirmed_header" msgid="8455614172231880211">"ਤੁਹਾਡਾ ਨਵਾਂ ਅਨਲੌਕ ਪੈਟਰਨ"</string>
+    <string name="lockpattern_pattern_entered_header" msgid="4316818983675591604">"ਪੈਟਰਨ ਰਿਕਾਰਡ ਹੋ ਗਿਆ"</string>
+    <string name="lockpattern_need_to_confirm" msgid="8054853451639221265">"ਪੁਸ਼ਟੀ ਕਰਨ ਲਈ ਦੁਬਾਰਾ ਪੈਟਰਨ ਉਲੀਕੋ"</string>
+    <string name="lockpattern_pattern_confirmed_header" msgid="8455614172231880211">"ਤੁਹਾਡਾ ਨਵਾਂ ਅਣਲਾਕ ਪੈਟਰਨ"</string>
     <string name="lockpattern_confirm_button_text" msgid="1128204343957002841">"ਪੁਸ਼ਟੀ ਕਰੋ"</string>
     <string name="lockpattern_restart_button_text" msgid="3337574403350953926">"ਰੀਡ੍ਰਾ ਕਰੋ"</string>
     <string name="lockpattern_retry_button_text" msgid="3480423193273588166">"ਹਟਾਓ"</string>
     <string name="lockpattern_continue_button_text" msgid="4723771754714471410">"ਜਾਰੀ ਰੱਖੋ"</string>
-    <string name="lockpattern_settings_title" msgid="3207750489460466680">"ਪੈਟਰਨ ਅਨਲੌਕ ਕਰੋ"</string>
+    <string name="lockpattern_settings_title" msgid="3207750489460466680">"ਪੈਟਰਨ ਅਣਲਾਕ ਕਰੋ"</string>
     <string name="lockpattern_settings_enable_title" msgid="6920616873671115281">"ਲੁੜੀਂਦਾ ਪੈਟਰਨ"</string>
-    <string name="lockpattern_settings_enable_summary" msgid="1165707416664252167">"ਸਕ੍ਰੀਨ ਨੂੰ ਅਨਲੌਕ ਕਰਨ ਲਈ ਪੈਟਰਨ ਡ੍ਰਾ ਕਰਨਾ ਲਾਜ਼ਮੀ ਹੈ"</string>
+    <string name="lockpattern_settings_enable_summary" msgid="1165707416664252167">"ਸਕ੍ਰੀਨ ਨੂੰ ਅਣਲਾਕ ਕਰਨ ਲਈ ਪੈਟਰਨ ਡ੍ਰਾ ਕਰਨਾ ਲਾਜ਼ਮੀ ਹੈ"</string>
     <string name="lockpattern_settings_enable_visible_pattern_title" msgid="2615606088906120711">"ਪੈਟਰਨ ਨੂੰ ਦਿਖਣਯੋਗ ਬਣਾਓ"</string>
     <string name="lockpattern_settings_enable_visible_pattern_title_profile" msgid="4864525074768391381">"ਪ੍ਰੋਫਾਈਲ ਪੈਟਰਨ ਨੂੰ ਦਿਖਣਯੋਗ ਬਣਾਓ"</string>
     <string name="lockpattern_settings_enable_tactile_feedback_title" msgid="4389015658335522989">"ਟੈਪ \'ਤੇ ਥਰਥਰਾਹਟ ਕਰੋ"</string>
-    <string name="lockpattern_settings_enable_power_button_instantly_locks" msgid="5735444062633666327">"ਪਾਵਰ ਬਟਨ ਤੁਰੰਤ ਲੌਕ ਹੁੰਦਾ ਹੈ"</string>
-    <string name="lockpattern_settings_power_button_instantly_locks_summary" msgid="8196258755143711694">"ਸਿਵਾਏ ਇਸਦੇ ਜਦੋਂ <xliff:g id="TRUST_AGENT_NAME">%1$s</xliff:g> ਵੱਲੋਂ ਅਨਲੌਕ ਰੱਖਿਆ ਹੋਵੇ"</string>
-    <string name="lockpattern_settings_choose_lock_pattern" msgid="1652352830005653447">"ਅਨਲੌਕ ਪੈਟਰਨ ਸੈੱਟ ਕਰੋ"</string>
-    <string name="lockpattern_settings_change_lock_pattern" msgid="1123908306116495545">"ਅਨਲੌਕ ਪੈਟਰਨ ਬਦਲੋ"</string>
-    <string name="lockpattern_settings_help_how_to_record" msgid="2614673439060830433">"ਇੱਕ ਅਨਲੌਕ ਪੈਟਰਨ ਕਿਵੇਂ ਉਲੀਕੀਏ"</string>
+    <string name="lockpattern_settings_enable_power_button_instantly_locks" msgid="5735444062633666327">"ਪਾਵਰ ਬਟਨ ਤੁਰੰਤ  ਲਾਕ  ਹੁੰਦਾ ਹੈ"</string>
+    <string name="lockpattern_settings_power_button_instantly_locks_summary" msgid="8196258755143711694">"ਸਿਵਾਏ ਇਸਦੇ ਜਦੋਂ <xliff:g id="TRUST_AGENT_NAME">%1$s</xliff:g> ਵੱਲੋਂ ਅਣਲਾਕ ਰੱਖਿਆ ਹੋਵੇ"</string>
+    <string name="lockpattern_settings_choose_lock_pattern" msgid="1652352830005653447">"ਅਣਲਾਕ ਪੈਟਰਨ ਸੈੱਟ ਕਰੋ"</string>
+    <string name="lockpattern_settings_change_lock_pattern" msgid="1123908306116495545">"ਅਣਲਾਕ ਪੈਟਰਨ ਬਦਲੋ"</string>
+    <string name="lockpattern_settings_help_how_to_record" msgid="2614673439060830433">"ਇੱਕ ਅਣਲਾਕ ਪੈਟਰਨ ਕਿਵੇਂ ਉਲੀਕੀਏ"</string>
     <string name="lockpattern_too_many_failed_confirmation_attempts" msgid="6909161623701848863">"ਬਹੁਤ ਸਾਰੀਆਂ ਗ਼ਲਤ ਕੋਸ਼ਿਸ਼ਾਂ। <xliff:g id="NUMBER">%d</xliff:g> ਸਕਿੰਟਾਂ ਵਿੱਚ ਦੁਬਾਰਾ ਕੋਸ਼ਿਸ਼ ਕਰੋ।"</string>
-    <string name="activity_not_found" msgid="5551664692991605325">"ਤੁਹਾਡੇ ਫੋਨ ਤੇ ਐਪਲੀਕੇਸ਼ਨ ਇੰਸਟੌਲ ਨਹੀਂ ਕੀਤੀ ਹੈ।"</string>
-    <string name="lock_settings_profile_title" msgid="2121876391814535295">"ਕੰਮ ਪ੍ਰੋਫਾਈਲ ਸੁਰੱਖਿਆ"</string>
-    <string name="lock_settings_profile_screen_lock_title" msgid="3334747927367115256">"ਕੰਮ ਪ੍ਰੋਫਾਈਲ ਸਕ੍ਰੀਨ ਲੌਕ"</string>
-    <string name="lock_settings_profile_unification_title" msgid="4973102698492659123">"ਇੱਕ ਲੌਕ ਵਰਤੋ"</string>
-    <string name="lock_settings_profile_unification_summary" msgid="7178299172998641303">"ਕਾਰਜ-ਸਥਾਨ ਪ੍ਰੋਫਾਈਲ ਅਤੇ ਡੀਵਾਈਸ ਸਕ੍ਰੀਨ ਲਈ ਇੱਕ ਲੌਕ ਦੀ ਵਰਤੋਂ ਕਰੋ"</string>
-    <string name="lock_settings_profile_unification_dialog_title" msgid="4824620230229285301">"ਕੀ ਇੱਕ ਲੌਕ ਵਰਤਣਾ ਹੈ?"</string>
-    <string name="lock_settings_profile_unification_dialog_body" msgid="7128305504872026659">"ਤੁਹਾਡੀ ਡੀਵਾਈਸ ਤੁਹਾਡੇ ਕਾਰਜ ਪ੍ਰੋਫਾਈਲ ਸਕ੍ਰੀਨ ਲੌਕ ਦੀ ਵਰਤੋਂ ਕਰੇਗੀ। ਕਾਰਜ ਨੀਤੀਆਂ ਦੋਵਾਂ ਲੌਕਾਂ \'ਤੇ ਲਾਗੂ ਹੋਣਗੀਆਂ।"</string>
-    <string name="lock_settings_profile_unification_dialog_uncompliant_body" msgid="3221303098797469900">"ਤੁਹਾਡਾ ਕਾਰਜ-ਸਥਾਨ ਪ੍ਰੋਫਾਈਲ ਲੌਕ ਤੁਹਾਡੀਆਂ ਸੰਸਥਾ ਦੀਆਂ ਸੁਰੱਖਿਆ ਲੋੜਾਂ ਨੂੰ ਪੂਰਾ ਨਹੀਂ ਕਰਦਾ ਹੈ। ਤੁਸੀਂ ਇੱਕੋ ਲੌਕ ਦੀ ਵਰਤੋਂ ਆਪਣੀ ਡੀਵਾਈਸ ਸਕ੍ਰੀਨ ਅਤੇ ਆਪਣੇ ਕਾਰਜ-ਸਥਾਨ ਪ੍ਰੋਫਾਈਲ ਲਈ ਕਰ ਸਕਦੇ ਹੋ, ਪਰ ਕੋਈ ਵੀ ਕਾਰਜ-ਸਥਾਨ ਲੌਕ ਨੀਤੀਆਂ ਲਾਗੂ ਕੀਤੀਆਂ ਜਾਣਗੀਆਂ।"</string>
-    <string name="lock_settings_profile_unification_dialog_confirm" msgid="8249970828159656518">"ਇੱਕ ਲੌਕ ਵਰਤੋ"</string>
-    <string name="lock_settings_profile_unification_dialog_uncompliant_confirm" msgid="5943758576756482777">"ਇੱਕ ਲੌਕ ਵਰਤੋ"</string>
-    <string name="lock_settings_profile_unified_summary" msgid="9008819078132993492">"ਡੀਵਾਈਸ ਸਕ੍ਰੀਨ ਲੌਕ ਵਰਗਾ"</string>
+    <string name="activity_not_found" msgid="5551664692991605325">"ਤੁਹਾਡੇ ਫ਼ੋਨ ਤੇ ਐਪਲੀਕੇਸ਼ਨ ਸਥਾਪਤ ਨਹੀਂ ਕੀਤੀ ਹੈ।"</string>
+    <string name="lock_settings_profile_title" msgid="2121876391814535295">"ਕਾਰਜ ਪ੍ਰੋਫਾਈਲ ਸੁਰੱਖਿਆ"</string>
+    <string name="lock_settings_profile_screen_lock_title" msgid="3334747927367115256">"ਕਾਰਜ ਪ੍ਰੋਫਾਈਲ ਸਕ੍ਰੀਨ  ਲਾਕ"</string>
+    <string name="lock_settings_profile_unification_title" msgid="4973102698492659123">"ਇੱਕ  ਲਾਕ  ਵਰਤੋ"</string>
+    <string name="lock_settings_profile_unification_summary" msgid="7178299172998641303">"ਕਾਰਜ ਪ੍ਰੋਫਾਈਲ ਅਤੇ ਡੀਵਾਈਸ ਸਕ੍ਰੀਨ ਲਈ ਇੱਕ ਲਾਕ ਦੀ ਵਰਤੋਂ ਕਰੋ"</string>
+    <string name="lock_settings_profile_unification_dialog_title" msgid="4824620230229285301">"ਕੀ ਇੱਕ  ਲਾਕ  ਵਰਤਣਾ ਹੈ?"</string>
+    <string name="lock_settings_profile_unification_dialog_body" msgid="7128305504872026659">"ਤੁਹਾਡਾ ਡੀਵਾਈਸ ਤੁਹਾਡੇ ਕਾਰਜ ਪ੍ਰੋਫਾਈਲ ਸਕ੍ਰੀਨ ਲਾਕ ਦੀ ਵਰਤੋਂ ਕਰੇਗਾ। ਕਾਰਜ ਨੀਤੀਆਂ ਦੋਵਾਂ ਲਾਕਾਂ \'ਤੇ ਲਾਗੂ ਹੋਣਗੀਆਂ।"</string>
+    <string name="lock_settings_profile_unification_dialog_uncompliant_body" msgid="3221303098797469900">"ਤੁਹਾਡਾ ਕਾਰਜ ਪ੍ਰੋਫਾਈਲ ਲਾਕ ਤੁਹਾਡੀ ਸੰਸਥਾ ਦੀਆਂ ਸੁਰੱਖਿਆ ਲੋੜਾਂ ਨੂੰ ਪੂਰਾ ਨਹੀਂ ਕਰਦਾ ਹੈ। ਤੁਸੀਂ ਇੱਕੋ ਲਾਕ ਦੀ ਵਰਤੋਂ ਆਪਣੇ ਡੀਵਾਈਸ ਸਕ੍ਰੀਨ ਅਤੇ ਆਪਣੇ ਕਾਰਜ ਪ੍ਰੋਫਾਈਲ ਲਈ ਕਰ ਸਕਦੇ ਹੋ, ਪਰ ਕੋਈ ਵੀ ਕਾਰਜ ਲਾਕ ਨੀਤੀਆਂ ਲਾਗੂ ਕੀਤੀਆਂ ਜਾਣਗੀਆਂ।"</string>
+    <string name="lock_settings_profile_unification_dialog_confirm" msgid="8249970828159656518">"ਇੱਕ  ਲਾਕ  ਵਰਤੋ"</string>
+    <string name="lock_settings_profile_unification_dialog_uncompliant_confirm" msgid="5943758576756482777">"ਇੱਕ  ਲਾਕ  ਵਰਤੋ"</string>
+    <string name="lock_settings_profile_unified_summary" msgid="9008819078132993492">"ਡੀਵਾਈਸ ਸਕ੍ਰੀਨ ਲਾਕ ਵਰਗਾ"</string>
     <string name="manageapplications_settings_title" msgid="7041951105633616745">"ਐਪਸ ਵਿਵਸਥਿਤ ਕਰੋ"</string>
-    <string name="manageapplications_settings_summary" msgid="1794401500935451259">"ਇੰਸਟੌਲ ਕੀਤੇ ਐਪਸ ਵਿਵਸਥਿਤ ਕਰੋ ਅਤੇ ਹਟਾਓ"</string>
+    <string name="manageapplications_settings_summary" msgid="1794401500935451259">"ਸਥਾਪਤ ਕੀਤੀਆਂ ਐਪਾਂ ਵਿਵਸਥਿਤ ਕਰੋ ਅਤੇ ਹਟਾਓ"</string>
     <string name="applications_settings" msgid="5281808652705396152">"ਐਪ ਜਾਣਕਾਰੀ"</string>
-    <string name="applications_settings_summary" msgid="6683465446264515367">"ਐਪਸ ਵਿਵਸਥਿਤ ਕਰੋ, ਤਤਕਾਲ ਲੌਂਚ ਸ਼ਾਰਟਕੱਟ ਸੈਟ ਅਪ ਕਰੋ"</string>
+    <string name="applications_settings_summary" msgid="6683465446264515367">"ਐਪਾਂ ਵਿਵਸਥਿਤ ਕਰੋ, ਤਤਕਾਲ ਲਾਂਚ ਸ਼ਾਰਟਕੱਟ ਸੈੱਟਅੱਪ ਕਰੋ"</string>
     <string name="applications_settings_header" msgid="1014813055054356646">"ਐਪ ਸੈਟਿੰਗਾਂ"</string>
     <string name="install_applications" msgid="4872012136210802181">"ਅਗਿਆਤ ਸਰੋਤ"</string>
     <string name="install_applications_title" msgid="4987712352256508946">"ਸਾਰੇ ਐਪ ਸਰੋਤਾਂ ਦੀ ਆਗਿਆ ਦਿਓ"</string>
     <string name="recent_app_category_title" msgid="6673071268966003928">"ਹਾਲ ਹੀ ਵਿੱਚ ਖੋਲ੍ਹੀਆਂ ਗਈਆਂ ਐਪਾਂ"</string>
     <string name="see_all_apps_title" msgid="1317153498074308438">"ਸਾਰੀਆਂ <xliff:g id="COUNT">%1$d</xliff:g> ਐਪਾਂ ਦੇਖੋ"</string>
-    <string name="recent_app_summary" msgid="3366446669844932300">"<xliff:g id="TIME">^1</xliff:g> ਪਹਿਲਾਂ"</string>
-    <string name="install_all_warning" product="tablet" msgid="8310489909586138165">"ਤੁਹਾਡਾ ਟੈਬਲੈੱਟ ਅਤੇ ਨਿੱਜੀ ਡੈਟਾ ਅਗਿਆਤ ਐਪਾਂ ਤੋਂ ਹਮਲੇ ਪ੍ਰਤੀ ਵਧੇਰੇ ਵਿੰਨਣਸ਼ੀਲ ਹਨ। ਇਸ ਸਰੋਤ ਤੋਂ ਐਪਾਂ ਸਥਾਪਿਤ ਕਰ ਕੇ, ਤੁਸੀਂ ਸਹਿਮਤੀ ਦਿੰਦੇ ਹੋ ਕਿ ਆਪਣੇ ਟੈਬਲੈੱਟ ਨੂੰ ਹੋਣ ਵਾਲੇ ਕਿਸੇ ਵੀ ਨੁਕਸਾਨ ਜਾਂ ਡੈਟੇ ਦੇ ਗੁੰਮ ਹੋਣ ਲਈ ਤੁਸੀਂ ਜ਼ਿੰਮੇਵਾਰ ਹੋ ਜੋ ਸ਼ਾਇਦ ਇਹਨਾਂ ਐਪਾਂ ਨੂੰ ਵਰਤਣ ਦੇ ਨਤੀਜੇ ਵਜੋਂ ਹੋ ਸਕਦਾ ਹੈ।"</string>
-    <string name="install_all_warning" product="default" msgid="1952257127370115988">"ਤੁਹਾਡਾ ਫ਼ੋਨ ਅਤੇ ਨਿੱਜੀ ਡੈਟਾ ਅਗਿਆਤ ਐਪਾਂ ਤੋਂ ਹਮਲੇ ਪ੍ਰਤੀ ਵਧੇਰੇ ਵਿੰਨਣਸ਼ੀਲ ਹਨ। ਇਸ ਸਰੋਤ ਤੋਂ ਐਪਾਂ ਸਥਾਪਿਤ ਕਰ ਕੇ, ਤੁਸੀਂ ਸਹਿਮਤੀ ਦਿੰਦੇ ਹੋ ਕਿ ਆਪਣੇ ਫ਼ੋਨ ਨੂੰ ਹੋਣ ਵਾਲੇ ਕਿਸੇ ਵੀ ਨੁਕਸਾਨ ਜਾਂ ਡੈਟੇ ਦੇ ਗੁੰਮ ਹੋਣ ਲਈ ਤੁਸੀਂ ਜ਼ਿੰਮੇਵਾਰ ਹੋ ਜੋ ਸ਼ਾਇਦ ਇਹਨਾਂ ਐਪਾਂ ਨੂੰ ਵਰਤਣ ਦੇ ਨਤੀਜੇ ਵਜੋਂ ਹੋ ਸਕਦਾ ਹੈ।"</string>
+    <string name="install_all_warning" product="tablet" msgid="8310489909586138165">"ਤੁਹਾਡਾ ਟੈਬਲੈੱਟ ਅਤੇ ਨਿੱਜੀ ਡਾਟਾ ਅਗਿਆਤ ਐਪਾਂ ਤੋਂ ਹਮਲੇ ਪ੍ਰਤੀ ਵਧੇਰੇ ਕਮਜ਼ੋਰ ਹੈ। ਇਸ ਸਰੋਤ ਤੋਂ ਐਪਾਂ ਸਥਾਪਿਤ ਕਰਕੇ, ਤੁਸੀਂ ਸਹਿਮਤੀ ਦਿੰਦੇ ਹੋ ਕਿ ਆਪਣੇ ਟੈਬਲੈੱਟ ਨੂੰ ਹੋਣ ਵਾਲੇ ਕਿਸੇ ਵੀ ਨੁਕਸਾਨ ਜਾਂ ਡਾਟੇ ਦੇ ਗੁੰਮ ਹੋਣ ਲਈ ਤੁਸੀਂ ਜ਼ਿੰਮੇਵਾਰ ਹੋ, ਜੋ ਸ਼ਾਇਦ ਇਹਨਾਂ ਐਪਾਂ ਨੂੰ ਵਰਤਣ ਦੇ ਨਤੀਜੇ ਵਜੋਂ ਹੋ ਸਕਦਾ ਹੈ।"</string>
+    <string name="install_all_warning" product="default" msgid="1952257127370115988">"ਤੁਹਾਡਾ ਫ਼ੋਨ ਅਤੇ ਨਿੱਜੀ ਡਾਟਾ ਅਗਿਆਤ ਐਪਾਂ ਤੋਂ ਹਮਲੇ ਪ੍ਰਤੀ ਵਧੇਰੇ ਵਿੰਨਣਸ਼ੀਲ ਹਨ। ਇਸ ਸਰੋਤ ਤੋਂ ਐਪਾਂ ਸਥਾਪਤ ਕਰ ਕੇ, ਤੁਸੀਂ ਸਹਿਮਤੀ ਦਿੰਦੇ ਹੋ ਕਿ ਆਪਣੇ ਫ਼ੋਨ ਨੂੰ ਹੋਣ ਵਾਲੇ ਕਿਸੇ ਵੀ ਨੁਕਸਾਨ ਜਾਂ ਡਾਟੇ ਦੇ ਗੁੰਮ ਹੋਣ ਲਈ ਤੁਸੀਂ ਜ਼ਿੰਮੇਵਾਰ ਹੋ ਜੋ ਸ਼ਾਇਦ ਇਹਨਾਂ ਐਪਾਂ ਨੂੰ ਵਰਤਣ ਦੇ ਨਤੀਜੇ ਵਜੋਂ ਹੋ ਸਕਦਾ ਹੈ।"</string>
     <string name="advanced_settings" msgid="1777249286757067969">"ਉੱਨਤ ਸੈਟਿੰਗਾਂ"</string>
-    <string name="advanced_settings_summary" msgid="4016682978071086747">"ਹੋਰ ਸੈਟਿੰਗਾਂ ਚੋਣਾਂ ਸਮਰੱਥ ਬਣਾਓ"</string>
+    <string name="advanced_settings_summary" msgid="4016682978071086747">"ਹੋਰ ਸੈਟਿੰਗਾਂ ਚੋਣਾਂ ਚਾਲੂ ਕਰੋ"</string>
     <string name="application_info_label" msgid="5736524913065714880">"ਐਪ ਜਾਣਕਾਰੀ"</string>
     <string name="storage_label" msgid="8700867073480107253">"ਸਟੋਰੇਜ"</string>
     <string name="auto_launch_label" msgid="2669236885531442195">"ਪੂਰਵ-ਨਿਰਧਾਰਤ ਵਜੋਂ ਖੋਲ੍ਹੋ"</string>
     <string name="auto_launch_label_generic" msgid="3230569852551968694">"ਡਿਫੌਲਟਸ"</string>
-    <string name="screen_compatibility_label" msgid="663250687205465394">"ਸਕ੍ਰੀਨ ਅਨੁਕੂਲਤਾ"</string>
-    <string name="permissions_label" msgid="2605296874922726203">"ਅਨੁਮਤੀਆਂ"</string>
-    <string name="cache_header_label" msgid="1877197634162461830">"ਕੈਚ"</string>
-    <string name="clear_cache_btn_text" msgid="5756314834291116325">"ਕੈਚ ਹਟਾਓ"</string>
-    <string name="cache_size_label" msgid="7505481393108282913">"ਕੈਚ"</string>
+    <string name="screen_compatibility_label" msgid="663250687205465394">"ਸਕ੍ਰੀਨ ਅਨੁਰੂਪਤਾ"</string>
+    <string name="permissions_label" msgid="2605296874922726203">"ਇਜਾਜ਼ਤਾਂ"</string>
+    <string name="cache_header_label" msgid="1877197634162461830">"ਕੈਸ਼ੇ"</string>
+    <string name="clear_cache_btn_text" msgid="5756314834291116325">"ਕੈਸ਼ੇ ਹਟਾਓ"</string>
+    <string name="cache_size_label" msgid="7505481393108282913">"ਕੈਸ਼ੇ"</string>
     <plurals name="uri_permissions_text" formatted="false" msgid="3983110543017963732">
       <item quantity="one">%d ਆਈਟਮਾਂ</item>
       <item quantity="other">%d ਆਈਟਮਾਂ</item>
@@ -1562,18 +1573,18 @@
     <string name="total_size_label" msgid="1048676419552557254">"ਕੁੱਲ"</string>
     <string name="application_size_label" msgid="7376689739076506885">"ਐਪ ਦਾ ਆਕਾਰ"</string>
     <string name="external_code_size_label" msgid="3459343140355961335">"USB ਸਟੋਰੇਜ ਐਪ"</string>
-    <string name="data_size_label" msgid="6117971066063850416">"ਵਰਤੋਂਕਾਰ ਦਾ ਡੈਟਾ"</string>
-    <string name="external_data_size_label" product="nosdcard" msgid="7533821466482000453">"USB ਸਟੋਰੇਜ ਡੈਟਾ"</string>
+    <string name="data_size_label" msgid="6117971066063850416">"ਵਰਤੋਂਕਾਰ ਦਾ  ਡਾਟਾ"</string>
+    <string name="external_data_size_label" product="nosdcard" msgid="7533821466482000453">"USB ਸਟੋਰੇਜ ਡਾਟਾ"</string>
     <string name="external_data_size_label" product="default" msgid="626414192825329708">"SD ਕਾਰਡ"</string>
-    <string name="uninstall_text" msgid="3644892466144802466">"ਅਣਇੰਸਟੌਲ ਕਰੋ"</string>
-    <string name="uninstall_all_users_text" msgid="851857393177950340">"ਸਾਰੇ ਉਪਭੋਗਤਾਵਾਂ ਲਈ ਅਣਇੰਸਟੌਲ ਕਰੋ"</string>
-    <string name="install_text" msgid="884360662922471113">"ਇੰਸਟੌਲ ਕਰੋ"</string>
+    <string name="uninstall_text" msgid="3644892466144802466">"ਅਣਸਥਾਪਤ ਕਰੋ"</string>
+    <string name="uninstall_all_users_text" msgid="851857393177950340">"ਸਾਰੇ ਵਰਤੋਂਕਾਰਾਂ ਲਈ ਅਣਸਥਾਪਤ ਕਰੋ"</string>
+    <string name="install_text" msgid="884360662922471113">"ਸਥਾਪਤ ਕਰੋ"</string>
     <string name="disable_text" msgid="6544054052049395202">"ਅਸਮਰੱਥ ਬਣਾਓ"</string>
-    <string name="enable_text" msgid="9217362512327828987">"ਸਮਰੱਥ ਬਣਾਓ"</string>
-    <string name="clear_user_data_text" msgid="5597622864770098388">"ਡੈਟਾ ਹਟਾਓ"</string>
-    <string name="app_factory_reset" msgid="6635744722502563022">"ਅਪਡੇਟਾਂ ਅਣਇੰਸਟੌਲ ਕਰੋ"</string>
-    <string name="auto_launch_enable_text" msgid="4275746249511874845">"ਤੁਸੀਂ ਇਸ ਐਪ ਨੂੰ ਕੁਝ ਕਿਰਿਆਵਾਂ ਲਈ ਬਾਇ ਪੂਰਵ-ਨਿਰਧਾਰਤ ਲੌਂਚ ਕਰਨ ਦੀ ਚੋਣ ਕੀਤੀ ਹੈ।"</string>
-    <string name="always_allow_bind_appwidgets_text" msgid="566822577792032925">"ਤੁਸੀਂ ਇਸ ਐਪ ਨੂੰ ਵਿਜੇਟ ਬਣਾਉਣ ਲਈ ਅਤੇ ਉਹਨਾਂ ਦੇ ਡੈਟਾ ਤੱਕ ਪਹੁੰਚ ਦੀ ਆਗਿਆ ਦੇਣ ਦੀ ਚੋਣ ਕੀਤੀ ਹੈ।"</string>
+    <string name="enable_text" msgid="9217362512327828987">"ਚਾਲੂ ਕਰੋ"</string>
+    <string name="clear_user_data_text" msgid="5597622864770098388">" ਡਾਟਾ  ਹਟਾਓ"</string>
+    <string name="app_factory_reset" msgid="6635744722502563022">"ਅੱਪਡੇਟਾਂ ਅਣਸਥਾਪਤ ਕਰੋ"</string>
+    <string name="auto_launch_enable_text" msgid="4275746249511874845">"ਤੁਸੀਂ ਇਸ ਐਪ ਨੂੰ ਕੁਝ ਕਾਰਵਾਈਆਂ ਲਈ ਪੂਰਵ-ਨਿਰਧਾਰਤ ਤੌਰ \'ਤੇ ਲਾਂਚ ਕਰਨ ਦੀ ਚੋਣ ਕੀਤੀ ਹੈ।"</string>
+    <string name="always_allow_bind_appwidgets_text" msgid="566822577792032925">"ਤੁਸੀਂ ਇਸ ਐਪ ਨੂੰ ਵਿਜੇਟ ਬਣਾਉਣ ਲਈ ਅਤੇ ਉਹਨਾਂ ਦੇ ਡਾਟਾ ਤੱਕ ਪਹੁੰਚ ਦੀ ਆਗਿਆ ਦੇਣ ਦੀ ਚੋਣ ਕੀਤੀ ਹੈ।"</string>
     <string name="auto_launch_disable_text" msgid="7800385822185540166">"ਕੋਈ ਡਿਫੌਲਟਸ ਸੈਟ ਨਹੀਂ ਕੀਤੇ"</string>
     <string name="clear_activities" msgid="7408923511535174430">"ਡਿਫੌਲਟਸ ਹਟਾਓ"</string>
     <string name="screen_compatibility_text" msgid="1616155457673106022">"ਇਹ ਐਪ ਤੁਹਾਡੀ ਸਕ੍ਰੀਨ ਲਈ ਡਿਜਾਈਨ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਦਾ। ਤੁਸੀਂ ਇਸਤੇ ਨਿਯੰਤਰਣ ਪਾ ਸਕਦੇ ਹੋ ਕਿ ਇਹ ਇੱਥੇ ਤੁਹਾਡੀ ਸਕ੍ਰੀਨ ਕਿਵੇਂ ਵਿਵਸਥਿਤ ਕਰੇ।"</string>
@@ -1587,11 +1598,11 @@
     <string name="default_emergency_app" msgid="1951760659640369980">"ਆਪਾਤਕਾਲ ਐਪ"</string>
     <string name="reset_app_preferences" msgid="1321050641018356925">"ਐਪ ਤਰਜੀਹਾਂ ਰੀਸੈੱਟ ਕਰੋ"</string>
     <string name="reset_app_preferences_title" msgid="6093179367325336662">"ਕੀ ਐਪ ਤਰਜੀਹਾਂ ਰੀਸੈੱਟ ਕਰਨੀਆਂ ਹਨ?"</string>
-    <string name="reset_app_preferences_desc" msgid="4822447731869201512">"ਇਹ ਨਿਮਨਲਿਖਤ ਲਈ ਸਾਰੀਆਂ ਤਰਜੀਹਾਂ ਰੀਸੈੱਟ ਕਰ ਦੇਵੇਗਾ:\n\n "<li>"ਅਯੋਗ ਬਣਾਈਆਂ ਐਪਾਂ"</li>\n" "<li>"ਅਯੋਗ ਬਣਾਈਆਂ ਐਪ ਸੂਚਨਾਵਾਂ"</li>\n" "<li>"ਕਿਰਿਆਵਾਂ ਲਈ ਪੂਰਵ-ਨਿਰਧਾਰਤ ਐਪਲੀਕੇਸ਼ਨਾਂ"</li>\n" "<li>"ਐਪਾਂ ਲਈ ਪਿਛੋਕੜ ਡੈਟਾ ਪਾਬੰਦੀਆਂ"</li>\n" "<li>"ਕੋਈ ਵੀ ਇਜਾਜ਼ਤ ਪਾਬੰਦੀਆਂ"</li>\n\n" ਤੁਹਾਡਾ ਕੋਈ ਵੀ ਐਪ ਡੈਟਾ ਨਸ਼ਟ ਨਹੀਂ ਹੋਵੇਗਾ।"</string>
+    <string name="reset_app_preferences_desc" msgid="4822447731869201512">"ਇਹ ਨਿਮਨਲਿਖਤ ਲਈ ਸਾਰੀਆਂ ਤਰਜੀਹਾਂ ਰੀਸੈੱਟ ਕਰ \n\n "<li>"ਅਯੋਗ ਬਣਾਈਆਂ "</li>\n" "<li>"ਅਯੋਗ ਬਣਾਈਆਂ ਐਪਾਂ"</li>\n" "<li>"ਕਿਰਿਆਵਾਂ ਲਈ ਪੂਰਵ-ਨਿਰਧਾਰਤ ਐਪਲੀਕੇਸ਼ਨਾਂ"</li>\n" "<li>"ਐਪਾਂ ਲਈ ਪਿਛੋਕੜ ਡਾਟਾ ਪਾਬੰਦੀਆਂ"</li>\n" "<li>"ਕੋਈ ਵੀ ਇਜਾਜ਼ਤ ਪਾਬੰਦੀਆਂ"</li>\n\n" ਤੁਹਾਡਾ ਕੋਈ ਵੀ ਐਪ ਡਾਟਾ ਨਸ਼ਟ ਨਹੀਂ ਹੋਵੇਗਾ।"</string>
     <string name="reset_app_preferences_button" msgid="2559089511841281242">"ਐਪਾਂ ਰੀਸੈੱਟ ਕਰੋ"</string>
     <string name="manage_space_text" msgid="8852711522447794676">"ਸਪੇਸ ਵਿਵਸਥਿਤ ਕਰੋ"</string>
     <string name="filter" msgid="2018011724373033887">"ਫਿਲਟਰ"</string>
-    <string name="filter_dlg_title" msgid="8693024463731076091">"ਫਿਲਟਰ ਚੋਣਾਂ ਚੁਣੋ"</string>
+    <string name="filter_dlg_title" msgid="8693024463731076091">"ਫਿਲਟਰ ਵਿਕਲਪ ਚੁਣੋ"</string>
     <string name="filter_apps_all" msgid="8899612398848280352">"ਸਾਰੀਆਂ ਐਪਾਂ"</string>
     <string name="filter_apps_disabled" msgid="5862632369555319938">"ਅਯੋਗ ਬਣਾਈਆਂ ਐਪਾਂ"</string>
     <string name="filter_apps_third_party" msgid="7786348047690140979">"ਡਾਊਨਲੋਡ ਕੀਤਾ"</string>
@@ -1602,23 +1613,23 @@
     <string name="installed" msgid="3070865169422600098">"ਸਥਾਪਤ"</string>
     <string name="no_applications" msgid="7336588977497084921">"ਕੋਈ ਐਪਾਂ ਨਹੀਂ।"</string>
     <string name="internal_storage" msgid="1584700623164275282">"ਅੰਦਰੂਨੀ ਸਟੋਰੇਜ"</string>
-    <string name="internal_storage_sentence" msgid="889098931914857143">"ਅੰਦਰਲੀ ਸਟੋਰੇਜ"</string>
+    <string name="internal_storage_sentence" msgid="889098931914857143">"ਅੰਦਰੂਨੀ ਸਟੋਰੇਜ"</string>
     <string name="sd_card_storage" product="nosdcard" msgid="2673203150465132465">"USB ਸਟੋਰੇਜ"</string>
     <string name="sd_card_storage" product="default" msgid="7623513618171928235">"SD ਕਾਰਡ ਸਟੋਰੇਜ"</string>
     <string name="recompute_size" msgid="7722567982831691718">"ਅਕਾਰ ਰੀਕੰਪਿਊਟ ਕਰ ਰਿਹਾ ਹੈ..."</string>
-    <string name="clear_data_dlg_title" msgid="5605258400134511197">"ਕੀ ਐਪ ਡੈਟਾ ਮਿਟਾਉਣਾ ਹੈ?"</string>
-    <string name="clear_data_dlg_text" msgid="3951297329833822490">"ਇਸ ਐਪ ਦਾ ਸਾਰਾ ਡੈਟਾ ਸਥਾਈ ਤੌਰ ਤੇ ਮਿਟਾਇਆ ਜਾਏਗਾ। ਇਸ ਵਿੱਚ ਸਾਰੀਆਂ ਫਾਈਲਾਂ, ਸੈਟਿੰਗਾਂ, ਖਾਤੇ, ਡੈਟਾਬੇਸ ਆਦਿ ਸ਼ਾਮਲ ਹਨ।"</string>
+    <string name="clear_data_dlg_title" msgid="5605258400134511197">"ਕੀ ਐਪ ਡਾਟਾ ਮਿਟਾਉਣਾ ਹੈ?"</string>
+    <string name="clear_data_dlg_text" msgid="3951297329833822490">"ਇਸ ਐਪ ਦਾ ਸਾਰਾ ਡਾਟਾ ਸਥਾਈ ਤੌਰ ਤੇ ਮਿਟਾਇਆ ਜਾਏਗਾ। ਇਸ ਵਿੱਚ ਸਾਰੀਆਂ ਫ਼ਾਈਲਾਂ, ਸੈਟਿੰਗਾਂ, ਖਾਤੇ, ਡਾਟਾਬੇਸ ਆਦਿ ਸ਼ਾਮਲ ਹਨ।"</string>
     <string name="dlg_ok" msgid="2402639055725653590">"ਠੀਕ"</string>
     <string name="dlg_cancel" msgid="1674753358972975911">"ਰੱਦ ਕਰੋ"</string>
     <string name="app_not_found_dlg_title" msgid="3127123411738434964"></string>
     <string name="app_not_found_dlg_text" msgid="4893589904687340011">"ਐਪ ਇੰਸਟੌਲ ਕੀਤੇ ਐਪਸ ਦੀ ਸੂਚੀ ਵਿੱਚ ਨਹੀਂ ਮਿਲਿਆ ਸੀ।"</string>
-    <string name="clear_data_failed" msgid="7214074331627422248">"ਐਪ ਡੈਟਾ ਨਹੀਂ ਹਟਾ ਸਕਿਆ"</string>
-    <string name="clear_failed_dlg_title" msgid="2387060805294783175">"ਡੈਟਾ ਹਟਾਓ"</string>
-    <string name="clear_failed_dlg_text" msgid="5464475937929941008">"ਐਪ ਲਈ ਡੈਟਾ ਨਹੀਂ ਹਟਾ ਸਕਿਆ।"</string>
-    <string name="security_settings_desc" product="tablet" msgid="1292421279262430109">"ਇਹ ਐਪ ਤੁਹਾਡੀ ਟੈਬਲੇਟ ਤੇ ਇਹਨਾਂ ਤੱਕ ਪਹੁੰਚ ਪ੍ਰਾਪਤ ਕਰ ਸਕਦਾ ਹੈ:"</string>
-    <string name="security_settings_desc" product="default" msgid="61749028818785244">"ਇਹ ਐਪ ਤੁਹਾਡੇ ਫੋਨ ਤੇ ਇਹ ਪਹੁੰਚ ਪ੍ਰਾਪਤ ਕਰ ਸਕਦਾ ਹੈ:"</string>
-    <string name="security_settings_desc_multi" product="tablet" msgid="7300932212437084403">"ਇਹ ਐਪ ਤੁਹਾਡੀ ਟੈਬਲੇਟ ਤੇ ਇਹਨਾਂ ਤੱਕ ਪਹੁੰਚ ਸਕਦਾ ਹੈ। ਪਰਫੌਰਮੈਂਸ ਬਿਹਤਰ ਬਣਾਉਣ ਅਤੇ ਮੈਮਰੀ ਵਰਤੋਂ ਘਟਾਉਣ ਲਈ, ਇਹਨਾਂ ਵਿੱਚੋਂ ਕੁਝ ਅਨੁਮਤੀਆਂ <xliff:g id="BASE_APP_NAME">%1$s</xliff:g> ਤੇ ਉਪਲਬਧ ਹਨ ਕਿਉਂਕਿ ਇਹ <xliff:g id="ADDITIONAL_APPS_LIST">%2$s</xliff:g> ਦੇ ਤੌਰ ਤੇ ਸਮਾਨ ਪ੍ਰਕਿਰਿਆ ਵਿੱਚ ਚੱਲਦੀਆਂ ਹਨ:"</string>
-    <string name="security_settings_desc_multi" product="default" msgid="6610268420793984752">"ਇਹ ਐਪ ਤੁਹਾਡੇ ਫੋਨ ਤੇ ਇਹਨਾਂ ਤੱਕ ਪਹੁੰਚ ਸਕਦਾ ਹੈ। ਪਰਫੌਰਮੈਂਸ ਬਿਹਤਰ ਬਣਾਉਣ ਅਤੇ ਮੈਮਰੀ ਵਰਤੋਂ ਘਟਾਉਣ ਲਈ, ਇਹਨਾਂ ਵਿੱਚੋਂ ਕੁਝ ਅਨੁਮਤੀਆਂ <xliff:g id="BASE_APP_NAME">%1$s</xliff:g> ਤੇ ਉਪਲਬਧ ਹਨ ਕਿਉਂਕਿ ਇਹ <xliff:g id="ADDITIONAL_APPS_LIST">%2$s</xliff:g> ਦੇ ਤੌਰ ਤੇ ਸਮਾਨ ਪ੍ਰਕਿਰਿਆ ਵਿੱਚ ਚੱਲਦੀਆਂ ਹਨ:"</string>
+    <string name="clear_data_failed" msgid="7214074331627422248">"ਐਪ  ਡਾਟਾ  ਨਹੀਂ ਹਟਾ ਸਕਿਆ"</string>
+    <string name="clear_failed_dlg_title" msgid="2387060805294783175">" ਡਾਟਾ  ਹਟਾਓ"</string>
+    <string name="clear_failed_dlg_text" msgid="5464475937929941008">"ਐਪ ਲਈ  ਡਾਟਾ  ਨਹੀਂ ਹਟਾ ਸਕਿਆ।"</string>
+    <string name="security_settings_desc" product="tablet" msgid="1292421279262430109">"ਇਹ ਐਪ ਤੁਹਾਡੇ ਟੈਬਲੈੱਟ ਤੇ ਇਹਨਾਂ ਤੱਕ ਪਹੁੰਚ ਪ੍ਰਾਪਤ ਕਰ ਸਕਦੀ ਹੈ:"</string>
+    <string name="security_settings_desc" product="default" msgid="61749028818785244">"ਇਹ ਐਪ ਤੁਹਾਡੇ ਫ਼ੋਨ ਤੇ ਇਹ ਪਹੁੰਚ ਪ੍ਰਾਪਤ ਕਰ ਸਕਦੀ ਹੈ:"</string>
+    <string name="security_settings_desc_multi" product="tablet" msgid="7300932212437084403">"ਇਹ ਐਪ ਤੁਹਾਡੇ ਟੈਬਲੈੱਟ ਤੇ ਇਹਨਾਂ ਤੱਕ ਪਹੁੰਚ ਸਕਦੀ ਹੈ। ਪ੍ਰਦਰਸ਼ਨ ਬਿਹਤਰ ਬਣਾਉਣ ਅਤੇ ਮੈਮਰੀ ਵਰਤੋਂ ਘਟਾਉਣ ਲਈ, ਇਹਨਾਂ ਵਿੱਚੋਂ ਕੁਝ ਇਜਾਜ਼ਤਾਂ <xliff:g id="BASE_APP_NAME">%1$s</xliff:g> \'ਤੇ ਉਪਲਬਧ ਹਨ, ਕਿਉਂਕਿ ਇਹ <xliff:g id="ADDITIONAL_APPS_LIST">%2$s</xliff:g> ਦੇ ਤੌਰ ਤੇ ਸਮਾਨ ਪ੍ਰਕਿਰਿਆ ਵਿੱਚ ਚੱਲਦੀਆਂ ਹਨ:"</string>
+    <string name="security_settings_desc_multi" product="default" msgid="6610268420793984752">"ਇਹ ਐਪ ਤੁਹਾਡੇ ਫ਼ੋਨ ਤੇ ਇਹਨਾਂ ਤੱਕ ਪਹੁੰਚ ਸਕਦਾ ਹੈ। ਪਰਫੌਰਮੈਂਸ ਬਿਹਤਰ ਬਣਾਉਣ ਅਤੇ ਮੈਮਰੀ ਵਰਤੋਂ ਘਟਾਉਣ ਲਈ, ਇਹਨਾਂ ਵਿੱਚੋਂ ਕੁਝ ਇਜਾਜ਼ਤਾਂ <xliff:g id="BASE_APP_NAME">%1$s</xliff:g> ਤੇ ਉਪਲਬਧ ਹਨ ਕਿਉਂਕਿ ਇਹ <xliff:g id="ADDITIONAL_APPS_LIST">%2$s</xliff:g> ਦੇ ਤੌਰ ਤੇ ਸਮਾਨ ਪ੍ਰਕਿਰਿਆ ਵਿੱਚ ਚੱਲਦੀਆਂ ਹਨ:"</string>
     <string name="join_two_items" msgid="1336880355987539064">"<xliff:g id="FIRST_ITEM">%1$s</xliff:g> ਅਤੇ <xliff:g id="SECOND_ITEM">%2$s</xliff:g>"</string>
     <string name="join_two_unrelated_items" msgid="1873827777191260824">"<xliff:g id="FIRST_ITEM">%1$s</xliff:g>, <xliff:g id="SECOND_ITEM">%2$s</xliff:g>"</string>
     <string name="join_many_items_last" msgid="5925635036718502724">"<xliff:g id="ALL_BUT_LAST_ITEM">%1$s</xliff:g> ਅਤੇ <xliff:g id="LAST_ITEM_0">%2$s</xliff:g>"</string>
@@ -1629,31 +1640,31 @@
     <string name="computing_size" msgid="1599186977475211186">"ਹਿਸਾਬ ਲਗਾ ਰਿਹਾ ਹੈ…"</string>
     <string name="invalid_size_value" msgid="1582744272718752951">"ਪੈਕੇਜ ਅਕਾਰ ਨੂੰ ਕੰਪਿਊਟ ਨਹੀਂ ਕਰ ਸਕਿਆ।"</string>
     <string name="empty_list_msg" msgid="3552095537348807772">"ਤੁਹਾਡੇ ਕੋਲ ਕੋਈ ਤੀਜੀ-ਪਾਰਟੀ ਦੇ ਇੰਸਟੌਲ ਕੀਤੇ ਐਪਸ ਨਹੀਂ ਹਨ।"</string>
-    <string name="version_text" msgid="9189073826278676425">"ਰੂਪ <xliff:g id="VERSION_NUM">%1$s</xliff:g>"</string>
+    <string name="version_text" msgid="9189073826278676425">"ਵਰਜਨ <xliff:g id="VERSION_NUM">%1$s</xliff:g>"</string>
     <string name="move_app" msgid="5042838441401731346">"ਮੂਵ ਕਰੋ"</string>
-    <string name="move_app_to_internal" product="tablet" msgid="2299714147283854957">"ਟੈਬਲੇਟ ਵਿੱਚ ਮੂਵ ਕਰੋ"</string>
-    <string name="move_app_to_internal" product="default" msgid="3895430471913858185">"ਫੋਨ ਵਿੱਚ ਮੂਵ ਕਰੋ"</string>
-    <string name="move_app_to_sdcard" product="nosdcard" msgid="4350451696315265420">"USB ਸਟੋਰੇਜ ਵਿੱਚ ਮੂਵ ਕਰੋ"</string>
+    <string name="move_app_to_internal" product="tablet" msgid="2299714147283854957">"ਟੈਬਲੈੱਟ ਵਿੱਚ ਲਿਜਾਓ"</string>
+    <string name="move_app_to_internal" product="default" msgid="3895430471913858185">"ਫ਼ੋਨ ਵਿੱਚ ਮੂਵ ਕਰੋ"</string>
+    <string name="move_app_to_sdcard" product="nosdcard" msgid="4350451696315265420">"USB ਸਟੋਰੇਜ ਵਿੱਚ ਲਿਜਾਓ"</string>
     <string name="move_app_to_sdcard" product="default" msgid="1143379049903056407">"SD ਕਾਰਡ ਵਿੱਚ ਮੂਵ ਕਰੋ"</string>
     <string name="moving" msgid="6431016143218876491">"ਮੂਵ ਕਰ ਰਿਹਾ ਹੈ"</string>
     <string name="another_migration_already_in_progress" msgid="7817354268848365487">"ਕੋਈ ਹੋਰ ਮਾਈਗ੍ਰੇਸ਼ਨ ਪਹਿਲਾਂ ਤੋਂ ਹੀ ਪ੍ਰਕਿਰਿਆ ਵਿੱਚ ਹੈ।"</string>
-    <string name="insufficient_storage" msgid="481763122991093080">"ਕਾਫ਼ੀ ਸਟੋਰੇਜ ਸਪੇਸ ਨਹੀਂ।"</string>
+    <string name="insufficient_storage" msgid="481763122991093080">"ਸਟੋਰੇਜ ਲਈ ਲੋੜੀਂਦੀ ਜਗ੍ਹਾ ਨਹੀਂ ਹੈ।"</string>
     <string name="does_not_exist" msgid="1501243985586067053">"ਐਪ ਮੌਜੂਦ ਨਹੀਂ ਹੈ।"</string>
     <string name="app_forward_locked" msgid="6331564656683790866">"ਐਪ ਕਾਪੀ-ਸੁਰੱਖਿਅਤ ਹੈ।"</string>
-    <string name="invalid_location" msgid="4354595459063675191">"ਨਿਰਧਾਰਿਤ ਸਥਾਨ ਇੰਸਟੌਲ ਕਰਨਾ ਪ੍ਰਮਾਣਿਕ ਨਹੀਂ ਹੈ।"</string>
+    <string name="invalid_location" msgid="4354595459063675191">"ਟਿਕਾਣਾ ਸਥਾਪਤ ਕਰਨਾ ਵੈਧ ਨਹੀਂ ਹੈ।"</string>
     <string name="system_package" msgid="1352722848400644991">"ਸਿਸਟਮ ਅਪਡੇਟਾਂ ਬਾਹਰੀ ਮੀਡੀਆ ਤੇ ਇੰਸਟੌਲ ਨਹੀਂ ਕੀਤੀਆਂ ਜਾ ਸਕਦੀਆਂ।"</string>
     <string name="move_error_device_admin" msgid="8673026002690505763">"ਡੀਵਾਈਸ ਪ੍ਰਸ਼ਾਸਕ ਐਪ ਬਾਹਰੀ ਮੀਡੀਆ \'ਤੇ ਸਥਾਪਤ ਨਹੀਂ ਕੀਤੀ ਜਾ ਸਕਦੀ"</string>
     <string name="force_stop_dlg_title" msgid="977530651470711366">"ਕੀ ਜ਼ਬਰਦਸਤੀ ਬੰਦ ਕਰਨਾ ਹੈ?"</string>
     <string name="force_stop_dlg_text" msgid="7208364204467835578">"ਜੇ ਤੁਸੀਂ ਕਿਸੇ ਐਪ ਨੂੰ ਜ਼ਬਰਦਸਤੀ ਬੰਦ ਕਰਦੇ ਹੋ, ਤਾਂ ਹੋ ਸਕਦਾ ਹੈ ਇਹ ਠੀਕ ਤਰ੍ਹਾਂ ਕਾਰਜ ਨਾ ਕਰੇ।"</string>
     <string name="move_app_failed_dlg_title" msgid="1282561064082384192"></string>
     <string name="move_app_failed_dlg_text" msgid="187885379493011720">"ਐਪ ਮੂਵ ਨਹੀਂ ਕਰ ਸਕਿਆ। <xliff:g id="REASON">%1$s</xliff:g>"</string>
-    <string name="app_install_location_title" msgid="2068975150026852168">"ਤਰਜੀਹੀ ਇੰਸਟੌਲ ਨਿਰਧਾਰਿਤ ਸਥਾਨ"</string>
+    <string name="app_install_location_title" msgid="2068975150026852168">"ਤਰਜੀਹੀ ਸਥਾਪਤ ਟਿਕਾਣਾ"</string>
     <string name="app_install_location_summary" msgid="5155453752692959098">"ਨਵੇਂ ਐਪਸ ਲਈ ਤਰਜੀਹੀ ਇੰਸਟੌਲੇਸ਼ਨ ਨਿਰਧਾਰਿਤ ਸਥਾਨ ਬਦਲੋ"</string>
     <string name="app_disable_dlg_title" msgid="3916469657537695436">"ਕੀ ਬਿਲਟ-ਇਨ ਐਪ ਨੂੰ ਅਸਮਰੱਥ ਬਣਾਉਣਾ ਹੈ?"</string>
     <string name="app_disable_dlg_positive" msgid="7375627244201714263">"ਐਪ ਨੂੰ ਅਸਮਰੱਥ ਬਣਾਓ"</string>
     <string name="app_disable_dlg_text" msgid="5632072173181990531">"ਜੇਕਰ ਤੁਸੀਂ ਇਸ ਐਪ ਨੂੰ ਅਯੋਗ ਬਣਾਉਂਦੇ ਹੋ, ਤਾਂ ਹੋ ਸਕਦਾ ਹੈ ਕਿ Android ਅਤੇ ਹੋਰ ਐਪਾਂ ਉਸ ਤਰ੍ਹਾਂ ਕੰਮ ਨਾ ਕਰਨ ਜਿਵੇਂ ਇਹਨਾਂ ਤੋਂ ਉਮੀਦ ਕੀਤੀ ਜਾਂਦੀ ਹੈ।"</string>
-    <string name="app_special_disable_dlg_title" msgid="2690148680327142674">"ਕੀ ਡੈਟਾ ਮਿਟਾਉਣਾ ਹੈ ਅਤੇ ਐਪ ਨੂੰ ਅਸਮਰੱਥ ਬਣਾਉਣਾ ਹੈ?"</string>
-    <string name="app_special_disable_dlg_text" msgid="5832078825810635913">"ਜੇਕਰ ਤੁਸੀਂ ਇਸ ਐਪ ਨੂੰ ਅਯੋਗ ਬਣਾਉਂਦੇ ਹੋ, ਤਾਂ ਹੋ ਸਕਦਾ ਹੈ ਕਿ Android ਅਤੇ ਹੋਰ ਐਪਾਂ ਉਸ ਤਰ੍ਹਾਂ ਕੰਮ ਨਾ ਕਰਨ ਜਿਵੇਂ ਇਹਨਾਂ ਤੋਂ ਉਮੀਦ ਕੀਤੀ ਜਾਂਦੀ ਹੈ। ਤੁਹਾਡਾ ਡੈਟਾ ਵੀ ਮਿਟਾ ਦਿੱਤਾ ਜਾਏਗਾ।"</string>
+    <string name="app_special_disable_dlg_title" msgid="2690148680327142674">"ਕੀ ਡਾਟਾ ਮਿਟਾਉਣਾ ਹੈ ਅਤੇ ਐਪ ਨੂੰ ਬੰਦ ਕਰਨਾ ਹੈ?"</string>
+    <string name="app_special_disable_dlg_text" msgid="5832078825810635913">"ਜੇਕਰ ਤੁਸੀਂ ਇਸ ਐਪ ਨੂੰ ਅਯੋਗ ਬਣਾਉਂਦੇ ਹੋ, ਤਾਂ ਹੋ ਸਕਦਾ ਹੈ ਕਿ Android ਅਤੇ ਹੋਰ ਐਪਾਂ ਉਸ ਤਰ੍ਹਾਂ ਕੰਮ ਨਾ ਕਰਨ ਜਿਵੇਂ ਇਹਨਾਂ ਤੋਂ ਉਮੀਦ ਕੀਤੀ ਜਾਂਦੀ ਹੈ। ਤੁਹਾਡਾ  ਡਾਟਾ  ਵੀ ਮਿਟਾ ਦਿੱਤਾ ਜਾਏਗਾ।"</string>
     <string name="app_disable_notifications_dlg_title" msgid="7669264654851761857">"ਕੀ ਸੂਚਨਾਵਾਂ ਬੰਦ ਕਰਨੀਆਂ ਹਨ?"</string>
     <string name="app_disable_notifications_dlg_text" msgid="5088484670924769845">"ਜੇਕਰ ਤੁਸੀਂ ਇਸ ਐਪ ਲਈ ਸੂਚਨਾਵਾਂ ਬੰਦ ਕਰਦੇ ਹੋ, ਤਾਂ ਤੁਹਾਡੇ ਤੋਂ ਮਹੱਤਵਪੂਰਣ ਚਿਤਾਵਨੀਆਂ ਅਤੇ ਅਪਡੇਟਾਂ ਖੁੰਝ ਸਕਦੀਆਂ ਹਨ।"</string>
     <string name="app_install_details_group_title" msgid="7084623031296083574">"ਸਟੋਰ"</string>
@@ -1663,9 +1674,9 @@
     <string name="app_ops_settings" msgid="5108481883575527511">"App ops"</string>
     <string name="app_ops_running" msgid="7706949900637284122">"ਦੌੜ"</string>
     <string name="app_ops_never_used" msgid="9114608022906887802">"(ਕਦੇ ਵੀ ਨਹੀਂ ਵਰਤਿਆ)"</string>
-    <string name="no_default_apps" msgid="2915315663141025400">"ਕੋਈ ਪੂਰਵ-ਨਿਰਧਾਰਤ ਐਪਸ ਨਹੀਂ।"</string>
+    <string name="no_default_apps" msgid="2915315663141025400">"ਕੋਈ ਪੂਰਵ-ਨਿਰਧਾਰਤ ਐਪਾਂ ਨਹੀਂ।"</string>
     <string name="storageuse_settings_title" msgid="5657014373502630403">"ਸਟੋਰੇਜ ਵਰਤੋਂ"</string>
-    <string name="storageuse_settings_summary" msgid="3748286507165697834">"ਐਪਸ ਵੱਲੋਂ ਵਰਤੀ ਗਈ ਸਟੋਰੇਜ ਦੇਖੋ"</string>
+    <string name="storageuse_settings_summary" msgid="3748286507165697834">"ਐਪਾਂ ਵੱਲੋਂ ਵਰਤੀ ਗਈ ਸਟੋਰੇਜ ਦੇਖੋ"</string>
     <string name="service_restarting" msgid="2242747937372354306">"ਰੀਸਟਾਰਟ ਹੋ ਰਿਹਾ ਹੈ"</string>
     <string name="cached" msgid="1059590879740175019">"ਕੈਚ ਕੀਤੀ ਪਿਛੋਕੜ ਪ੍ਰਕਿਰਿਆ"</string>
     <string name="no_running_services" msgid="2059536495597645347">"ਕੁਝ ਨਹੀਂ ਚੱਲ ਰਿਹਾ।"</string>
@@ -1683,7 +1694,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>
@@ -1705,8 +1716,8 @@
     <string name="process_service_in_use_description" msgid="8993335064403217080">"ਸੇਵਾ <xliff:g id="COMP_NAME">%1$s</xliff:g> ਵਰਤੋਂ ਵਿੱਚ ਹੈ।"</string>
     <string name="process_provider_in_use_description" msgid="5586603325677678940">"ਪ੍ਰੋਵਾਈਡਰ <xliff:g id="COMP_NAME">%1$s</xliff:g> ਵਰਤੋਂ ਵਿੱਚ ਹੈ।"</string>
     <string name="runningservicedetails_stop_dlg_title" msgid="4253292537154337233">"ਕੀ ਸਿਸਟਮ ਸੇਵਾ ਬੰਦ ਕਰਨੀ ਹੈ?"</string>
-    <string name="runningservicedetails_stop_dlg_text" product="tablet" msgid="3371302398335665793">"ਜੇਕਰ ਤੁਸੀਂ ਇਹ ਸੇਵਾ ਬੰਦ ਕਰਦੇ ਹੋ, ਤਾਂ ਤੁਹਾਡੀ ਟੈਬਲੇਟ ਦੀਆਂ ਕੁਝ ਵਿਸ਼ੇਸ਼ਤਾਵਾਂ ਸਹੀ ਢੰਗ ਨਾਲ ਕੰਮ ਕਰਨਾ ਬੰਦ ਕਰ ਸਕਦੀਆਂ ਹਨ ਜਦੋਂ ਤੱਕ ਤੁਸੀਂ ਇਸਦੀ ਪਾਵਰ ਬੰਦ ਅਤੇ ਫਿਰ ਦੁਬਾਰਾ ਚਾਲੂ ਨਹੀਂ ਕਰਦੇ।"</string>
-    <string name="runningservicedetails_stop_dlg_text" product="default" msgid="3920243762189484756">"ਜੇਕਰ ਤੁਸੀਂ ਇਹ ਸੇਵਾ ਬੰਦ ਕਰਦੇ ਹੋ, ਤਾਂ ਤੁਹਾਡੇ ਫੋਨ ਦੀਆਂ ਕੁਝ ਵਿਸ਼ੇਸ਼ਤਾਵਾਂ ਸਹੀ ਢੰਗ ਨਾਲ ਕੰਮ ਕਰਨਾ ਬੰਦ ਕਰ ਸਕਦੀਆਂ ਹਨ ਜਦੋਂ ਤੱਕ ਤੁਸੀਂ ਇਸਦੀ ਪਾਵਰ ਬੰਦ ਅਤੇ ਫਿਰ ਦੁਬਾਰਾ ਚਾਲੂ ਨਹੀਂ ਕਰਦੇ।"</string>
+    <string name="runningservicedetails_stop_dlg_text" product="tablet" msgid="3371302398335665793">"ਜੇਕਰ ਤੁਸੀਂ ਇਹ ਸੇਵਾ ਬੰਦ ਕਰਦੇ ਹੋ, ਤਾਂ ਤੁਹਾਡੀ ਟੈਬਲੈੱਟ ਦੀਆਂ ਕੁਝ ਵਿਸ਼ੇਸ਼ਤਾਵਾਂ ਸਹੀ ਢੰਗ ਨਾਲ ਕੰਮ ਕਰਨਾ ਬੰਦ ਕਰ ਸਕਦੀਆਂ ਹਨ, ਜਦੋਂ ਤੱਕ ਤੁਸੀਂ ਇਸਦੀ ਪਾਵਰ ਬੰਦ ਅਤੇ ਫਿਰ ਦੁਬਾਰਾ ਚਾਲੂ ਨਹੀਂ ਕਰਦੇ।"</string>
+    <string name="runningservicedetails_stop_dlg_text" product="default" msgid="3920243762189484756">"ਜੇਕਰ ਤੁਸੀਂ ਇਹ ਸੇਵਾ ਬੰਦ ਕਰਦੇ ਹੋ, ਤਾਂ ਤੁਹਾਡੇ ਫ਼ੋਨ ਦੀਆਂ ਕੁਝ ਵਿਸ਼ੇਸ਼ਤਾਵਾਂ ਸਹੀ ਢੰਗ ਨਾਲ ਕੰਮ ਕਰਨਾ ਬੰਦ ਕਰ ਸਕਦੀਆਂ ਹਨ ਜਦੋਂ ਤੱਕ ਤੁਸੀਂ ਇਸਦੀ ਪਾਵਰ ਬੰਦ ਅਤੇ ਫਿਰ ਦੁਬਾਰਾ ਚਾਲੂ ਨਹੀਂ ਕਰਦੇ।"</string>
     <string name="language_input_gesture_title" msgid="8749227808244881255">"ਭਾਸ਼ਾਵਾਂ, ਇਨਪੁੱਟ ਅਤੇ ਸੰਕੇਤ"</string>
     <string name="language_input_gesture_summary_on_with_assist" msgid="7219895055450633449"></string>
     <string name="language_input_gesture_summary_on_non_assist" msgid="756147879200943161"></string>
@@ -1724,9 +1735,9 @@
     <string name="auto_punctuate" msgid="4595367243950425833">"ਆਟੋ-ਵਿਸ਼ਰਾਮ ਚਿੰਨ੍ਹ ਲਗਾਓ"</string>
     <string name="hardkeyboard_category" msgid="5957168411305769899">"ਫਿਜੀਕਲ ਕੀ-ਬੋਰਡ ਸੈਟਿੰਗਾਂ"</string>
     <string name="auto_punctuate_summary" msgid="4372126865670574837">"\" \" ਦਰਜ ਕਰਨ ਲਈ ਸਪੇਸ ਕੁੰਜੀ ਦੋ ਵਾਰ ਦਬਾਓ।"</string>
-    <string name="show_password" msgid="4837897357002495384">"ਪਾਸਵਰਡ ਵਿਖਾਓ"</string>
-    <string name="show_password_summary" msgid="3365397574784829969">"ਟਾਈਪ ਕੀਤੇ ਜਾਣ ਸਮੇਂ ਅੱਖਰ-ਚਿੰਨ੍ਹਾਂ ਨੂੰ ਥੋੜ੍ਹੇ ਸਮੇਂ ਲਈ ਵਿਖਾਓ"</string>
-    <string name="spellchecker_security_warning" msgid="9060897418527708922">"ਇਹ ਸਪੈੱਲ ਚੈਕਰ ਤੁਹਾਡੇ ਵੱਲੋਂ ਟਾਈਪ ਕੀਤਾ ਜਾਣ ਵਾਲਾ ਸਾਰਾ ਟੈਕਸਟ ਇਕੱਤਰ ਕਰਨ ਵਿੱਚ ਸਮਰੱਥ ਹੋ ਸਕਦਾ ਹੈ, ਨਿੱਜੀ ਡੈਟਾ ਸਮੇਤ ਜਿਵੇਂ ਪਾਸਵਰਡ ਅਤੇ ਕ੍ਰੈਡਿਟ ਕਾਰਡ ਨੰਬਰ। ਇਹ <xliff:g id="SPELLCHECKER_APPLICATION_NAME">%1$s</xliff:g> ਐਪ ਤੋਂ ਆਉਂਦਾ ਹੈ। ਕੀ ਇਹ ਸਪੈੱਲ ਚੈਕਰ ਵਰਤਣਾ ਹੈ?"</string>
+    <string name="show_password" msgid="4837897357002495384">"ਪਾਸਵਰਡ  ਦਿਖਾਓ"</string>
+    <string name="show_password_summary" msgid="3365397574784829969">"ਟਾਈਪ ਕੀਤੇ ਜਾਣ ਸਮੇਂ ਅੱਖਰ-ਚਿੰਨ੍ਹਾਂ ਨੂੰ ਥੋੜ੍ਹੇ ਸਮੇਂ ਲਈ ਦਿਖਾਓ"</string>
+    <string name="spellchecker_security_warning" msgid="9060897418527708922">"ਇਹ ਸਪੈੱਲ-ਚੈਕਰ ਤੁਹਾਡੇ ਵੱਲੋਂ ਟਾਈਪ ਕੀਤਾ ਜਾਣ ਵਾਲੀ ਸਾਰੀ ਲਿਖਤ ਇਕੱਤਰ ਕਰਨ ਵਿੱਚ ਸਮਰੱਥ ਹੋ ਸਕਦਾ ਹੈ, ਨਿੱਜੀ ਡਾਟਾ ਸਮੇਤ ਜਿਵੇਂ ਪਾਸਵਰਡ ਅਤੇ ਕ੍ਰੈਡਿਟ ਕਾਰਡ ਨੰਬਰ। ਇਹ <xliff:g id="SPELLCHECKER_APPLICATION_NAME">%1$s</xliff:g> ਐਪ ਤੋਂ ਆਉਂਦਾ ਹੈ। ਕੀ ਇਸ ਸਪੈੱਲ-ਚੈਕਰ ਨੂੰ ਵਰਤਣਾ ਹੈ?"</string>
     <string name="spellchecker_quick_settings" msgid="246728645150092058">"ਸੈਟਿੰਗਾਂ"</string>
     <string name="spellchecker_language" msgid="6041050114690541437">"ਭਾਸ਼ਾ"</string>
     <string name="keyboard_and_input_methods_category" msgid="6035224122054465137">"ਕੀ-ਬੋਰਡ ਅਤੇ ਇਨਪੁੱਟ"</string>
@@ -1735,10 +1746,10 @@
     <string name="add_virtual_keyboard" msgid="3302152381456516928">"ਕੀ-ਬੋਰਡਾਂ ਦਾ ਪ੍ਰਬੰਧਨ ਕਰੋ"</string>
     <string name="keyboard_assistance_category" msgid="5843634175231134014">"ਕੀ-ਬੋਰਡ ਸਹਾਇਤਾ"</string>
     <string name="physical_keyboard_title" msgid="8285149877925752042">"ਭੌਤਿਕ ਕੀ-ਬੋਰਡ"</string>
-    <string name="show_ime" msgid="2658582193437188227">"ਆਭਾਸੀ ਕੀ-ਬੋਰਡ ਵਿਖਾਓ"</string>
+    <string name="show_ime" msgid="2658582193437188227">"ਆਭਾਸੀ ਕੀ-ਬੋਰਡ  ਦਿਖਾਓ"</string>
     <string name="show_ime_summary" msgid="8164993045923240698">"ਭੌਤਿਕ ਕੀ-ਬੋਰਡ ਕਿਰਿਆਸ਼ੀਲ ਹੋਣ ਦੌਰਾਨ ਇਸ ਨੂੰ ਸਕ੍ਰੀਨ \'ਤੇ ਬਣਾਈ ਰੱਖੋ"</string>
     <string name="keyboard_shortcuts_helper" msgid="4839453720463798145">"ਕੀ-ਬੋਰਡ ਸ਼ਾਰਟਕੱਟ ਸਹਾਇਕ"</string>
-    <string name="keyboard_shortcuts_helper_summary" msgid="5871299901459743288">"ਉਪਲਬਧ ਸ਼ਾਰਟਕੱਟ ਵਿਖਾਓ"</string>
+    <string name="keyboard_shortcuts_helper_summary" msgid="5871299901459743288">"ਉਪਲਬਧ ਸ਼ਾਰਟਕੱਟ ਪ੍ਰਦਰਸ਼ਿਤ ਕਰੋ"</string>
     <string name="default_keyboard_layout" msgid="4172606673510531271">"ਪੂਰਵ-ਨਿਰਧਾਰਤ"</string>
     <string name="pointer_speed" msgid="1221342330217861616">"ਪੋਆਇੰਟਰ ਗਤੀ"</string>
     <string name="game_controller_settings_category" msgid="8794508575329923718">"ਗੇਮ ਕੰਟ੍ਰੋਲਰ"</string>
@@ -1746,13 +1757,13 @@
     <string name="vibrate_input_devices_summary" msgid="4595570516865299153">"ਕਨੈਕਟ ਕੀਤੇ ਜਾਣ ਤੇ ਗੇਮ ਕੰਟ੍ਰੋਲਰ ਲਈ ਰੀਡਾਇਰੈਕਟ ਵਾਈਬ੍ਰੇਟਰ।"</string>
     <string name="keyboard_layout_dialog_title" msgid="8030087214949381372">"ਕੀ-ਬੋਰਡ ਲੇਆਉਟ ਚੁਣੋ"</string>
     <string name="keyboard_layout_dialog_setup_button" msgid="8514583747236476384">"ਕੀ-ਬੋਰਡ ਲੇਆਉਟ ਸੈਟ ਅਪ ਕਰੋ"</string>
-    <string name="keyboard_layout_dialog_switch_hint" msgid="3889961090676293795">"ਸਵਿਚ ਕਰਨ ਲਈ, ਕੰਟ੍ਰੋਲ-ਸਪੇਸਬਾਰ ਦਬਾਓ"</string>
+    <string name="keyboard_layout_dialog_switch_hint" msgid="3889961090676293795">"ਸਵਿੱਚ ਕਰਨ ਲਈ, ਕੰਟ੍ਰੋਲ-ਸਪੇਸਬਾਰ ਦਬਾਓ"</string>
     <string name="keyboard_layout_default_label" msgid="2952672513543482165">"ਪੂਰਵ-ਨਿਰਧਾਰਤ"</string>
     <string name="keyboard_layout_picker_title" msgid="556081931972771610">"ਕੀ-ਬੋਰਡ ਲੇਆਉਟ"</string>
     <string name="user_dict_settings_title" msgid="3427169369758733521">"ਨਿੱਜੀ ਸ਼ਬਦਕੋਸ਼"</string>
     <string name="user_dict_settings_summary" msgid="7965571192902870454"></string>
-    <string name="user_dict_settings_add_menu_title" msgid="4056762757149923551">"ਜੋੜੋ"</string>
-    <string name="user_dict_settings_add_dialog_title" msgid="4702613990174126482">"ਸ਼ਬਦਕੋਸ਼ ਵਿੱਚ ਜੋੜੋ"</string>
+    <string name="user_dict_settings_add_menu_title" msgid="4056762757149923551">"ਸ਼ਾਮਲ ਕਰੋ"</string>
+    <string name="user_dict_settings_add_dialog_title" msgid="4702613990174126482">"ਸ਼ਬਦਕੋਸ਼ ਵਿੱਚ ਸ਼ਾਮਲ ਕਰੋ"</string>
     <string name="user_dict_settings_add_screen_title" msgid="742580720124344291">"ਵਾਕਾਂਸ਼"</string>
     <string name="user_dict_settings_add_dialog_more_options" msgid="8848798370746019825">"ਹੋਰ ਚੋਣਾਂ"</string>
     <string name="user_dict_settings_add_dialog_less_options" msgid="2441785268726036101">"ਘੱਟ ਚੋਣਾਂ"</string>
@@ -1762,19 +1773,19 @@
     <string name="user_dict_settings_add_locale_option_name" msgid="5696358317061318532">"ਭਾਸ਼ਾ:"</string>
     <string name="user_dict_settings_add_word_hint" msgid="5725254076556821247">"ਇੱਕ ਸ਼ਬਦ ਟਾਈਪ ਕਰੋ"</string>
     <string name="user_dict_settings_add_shortcut_hint" msgid="7333763456561873445">"ਵਿਕਲਪਕ ਸ਼ਾਰਟਕੱਟ"</string>
-    <string name="user_dict_settings_edit_dialog_title" msgid="8967476444840548674">"ਸ਼ਬਦ ਸੰਪਾਦਿਤ ਕਰੋ"</string>
-    <string name="user_dict_settings_context_menu_edit_title" msgid="2210564879320004837">"ਸੰਪਾਦਿਤ ਕਰੋ"</string>
+    <string name="user_dict_settings_edit_dialog_title" msgid="8967476444840548674">"ਸ਼ਬਦ ਦਾ ਸੰਪਾਦਨ ਕਰੋ"</string>
+    <string name="user_dict_settings_context_menu_edit_title" msgid="2210564879320004837">"ਸੰਪਾਦਨ ਕਰੋ"</string>
     <string name="user_dict_settings_context_menu_delete_title" msgid="9140703913776549054">"ਮਿਟਾਓ"</string>
     <string name="user_dict_settings_empty_text" msgid="1971969756133074922">"ਤੁਹਾਡੇ ਕੋਲ ਵਰਤੋਂਕਾਰ ਸ਼ਬਦਕੋਸ਼ ਵਿੱਚ ਕੋਈ ਸ਼ਬਦ ਨਹੀਂ ਹਨ। ਇੱਕ ਸ਼ਬਦ ਸ਼ਾਮਲ ਕਰਨ ਲਈ ਸ਼ਾਮਲ ਕਰੋ (+) ਬਟਨ \'ਤੇ ਟੈਪ ਕਰੋ।"</string>
     <string name="user_dict_settings_all_languages" msgid="6742000040975959247">"ਸਾਰੀਆਂ ਭਾਸ਼ਾਵਾਂ ਲਈ"</string>
     <string name="user_dict_settings_more_languages" msgid="7316375944684977910">"ਹੋਰ ਭਾਸ਼ਾਵਾਂ…"</string>
     <string name="testing" msgid="6584352735303604146">"ਜਾਂਚ"</string>
-    <string name="testing_phone_info" product="tablet" msgid="193561832258534798">"ਟੈਬਲੇਟ ਜਾਣਕਾਰੀ"</string>
-    <string name="testing_phone_info" product="default" msgid="8656693364332840056">"ਫੋਨ ਜਾਣਕਾਰੀ"</string>
+    <string name="testing_phone_info" product="tablet" msgid="193561832258534798">"ਟੈਬਲੈੱਟ ਜਾਣਕਾਰੀ"</string>
+    <string name="testing_phone_info" product="default" msgid="8656693364332840056">"ਫ਼ੋਨ ਜਾਣਕਾਰੀ"</string>
     <string name="input_methods_settings_title" msgid="6800066636850553887">"ਟੈਕਸਟ ਇਨਪੁਟ"</string>
-    <string name="input_method" msgid="5434026103176856164">"ਇਨਪੁਟ ਵਿਧੀ"</string>
+    <string name="input_method" msgid="5434026103176856164">"ਇਨਪੁੱਟ ਵਿਧੀ"</string>
     <string name="current_input_method" msgid="2636466029213488159">"ਮੌਜੂਦਾ ਕੀ-ਬੋਰਡ"</string>
-    <string name="input_method_selector" msgid="4311213129681430709">"ਇਨਪੁਟ ਵਿਧੀ ਚੋਣਕਾਰ"</string>
+    <string name="input_method_selector" msgid="4311213129681430709">"ਇਨਪੁੱਟ ਵਿਧੀ ਚੋਣਕਾਰ"</string>
     <string name="input_method_selector_show_automatically_title" msgid="1001612945471546158">"ਸਵੈਚਲਿਤ"</string>
     <string name="input_method_selector_always_show_title" msgid="3891824124222371634">"ਹਮੇਸਾਂ ਦਿਖਾਓ"</string>
     <string name="input_method_selector_always_hide_title" msgid="7699647095118680424">"ਹਮੇਸ਼ਾਂ ਲੁਕਾਓ"</string>
@@ -1789,8 +1800,8 @@
     <string name="gadget_picker_title" msgid="98374951396755811">"ਗੈਜੇਟ ਚੁਣੋ"</string>
     <string name="widget_picker_title" msgid="9130684134213467557">"ਵਿਜੇਟ ਚੁਣੋ"</string>
     <string name="allow_bind_app_widget_activity_allow_bind_title" msgid="2538303018392590627">"ਕੀ ਵਿਜੇਟ ਬਣਾਉਣਾ ਹੈ ਅਤੇ ਪਹੁੰਚ ਦੀ ਆਗਿਆ ਦੇਣੀ ਹੈ?"</string>
-    <string name="allow_bind_app_widget_activity_allow_bind" msgid="1584388129273282080">"ਤੁਹਾਡੇ ਵੱਲੋਂ ਵਿਜੇਟ ਬਣਾਉਣ ਤੋਂ ਬਾਅਦ, <xliff:g id="WIDGET_HOST_NAME">%1$s</xliff:g> ਸਾਰੇ ਡੈਟਾ ਤੱਕ ਪਹੁੰਚ ਪ੍ਰਾਪਤ ਕਰ ਸਕਦਾ ਹੈ, ਜੋ ਇਹ ਡਿਸਪਲੇ ਕਰਦਾ ਹੈ।"</string>
-    <string name="allow_bind_app_widget_activity_always_allow_bind" msgid="7037503685859688034">"ਹਮੇਸ਼ਾਂ <xliff:g id="WIDGET_HOST_NAME">%1$s</xliff:g> ਨੂੰ ਵਿਜੇਟ ਬਣਾਉਣ ਅਤੇ ਉਹਨਾਂ ਦੇ ਡੈਟਾ ਤੱਕ ਪਹੁੰਚ ਦੀ ਆਗਿਆ ਦਿਓ"</string>
+    <string name="allow_bind_app_widget_activity_allow_bind" msgid="1584388129273282080">"ਤੁਹਾਡੇ ਵੱਲੋਂ ਵਿਜੇਟ ਬਣਾਉਣ ਤੋਂ ਬਾਅਦ, <xliff:g id="WIDGET_HOST_NAME">%1$s</xliff:g> ਸਾਰੇ ਡਾਟਾ ਤੱਕ ਪਹੁੰਚ ਪ੍ਰਾਪਤ ਕਰ ਸਕਦਾ ਹੈ, ਜੋ ਇਹ ਡਿਸਪਲੇ ਕਰਦਾ ਹੈ।"</string>
+    <string name="allow_bind_app_widget_activity_always_allow_bind" msgid="7037503685859688034">"ਹਮੇਸ਼ਾਂ <xliff:g id="WIDGET_HOST_NAME">%1$s</xliff:g> ਨੂੰ ਵਿਜੇਟ ਬਣਾਉਣ ਅਤੇ ਉਹਨਾਂ ਦੇ ਡਾਟਾ ਤੱਕ ਪਹੁੰਚ ਦੀ ਆਗਿਆ ਦਿਓ"</string>
     <string name="usage_stats_label" msgid="5890846333487083609">"ਵਰਤੋਂ ਅੰਕੜੇ"</string>
     <string name="testing_usage_stats" msgid="7823048598893937339">"ਵਰਤੋਂ ਅੰਕੜੇ"</string>
     <string name="display_order_text" msgid="8592776965827565271">"ਇਸ ਮੁਤਾਬਕ ਛਾਂਟੋ:"</string>
@@ -1801,10 +1812,10 @@
     <string name="accessibility_settings_title" msgid="2130492524656204459">"ਪਹੁੰਚਯੋਗਤਾ ਸੈਟਿੰਗਾਂ"</string>
     <string name="accessibility_settings_summary" msgid="981260486011624939">"ਸਕ੍ਰੀਨ ਰੀਡਰ, ਡਿਸਪਲੇ, ਅੰਤਰਕਿਰਿਆ ਕੰਟਰੋਲ"</string>
     <string name="vision_settings_title" msgid="4204111425716868288">"ਨਜ਼ਰ ਸਬੰਧੀ ਸੈਟਿੰਗਾਂ"</string>
-    <string name="vision_settings_description" msgid="5679491180156408260">"ਤੁਸੀਂ ਇਸ ਡੀਵਾਈਸ ਨੂੰ ਆਪਣੀਆਂ ਲੋੜਾਂ ਦੇ ਅਨੁਸਾਰ ਵਿਸ਼ੇਸ਼-ਵਿਉਂਤਬੱਧ ਕਰ ਸਕਦੇ ਹੋ। ਇਹਨਾਂ ਪਹੁੰਚਯੋਗਤਾ ਵਿਸ਼ੇਸ਼ਤਾਵਾਂ ਨੂੰ ਬਾਅਦ ਵਿੱਚ ਸੈਟਿੰਗਾਂ ਵਿੱੱਚ ਜਾਕੇ ਬਦਲਿਆ ਜਾ ਸਕਦਾ ਹੈ।"</string>
-    <string name="vision_settings_suggestion_title" msgid="917294957154878441">"ਫੌਂਟ ਆਕਾਰ ਵਧਾਓ"</string>
+    <string name="vision_settings_description" msgid="5679491180156408260">"ਤੁਸੀਂ ਇਸ ਡੀਵਾਈਸ ਨੂੰ ਆਪਣੀਆਂ ਲੋੜਾਂ ਦੇ ਅਨੁਸਾਰ ਵਿਉਂਤਬੱਧ ਕਰ ਸਕਦੇ ਹੋ। ਇਹਨਾਂ ਪਹੁੰਚਯੋਗਤਾ ਵਿਸ਼ੇਸ਼ਤਾਵਾਂ ਨੂੰ ਬਾਅਦ ਵਿੱਚ ਸੈਟਿੰਗਾਂ ਵਿੱਚ ਜਾ ਕੇ ਬਦਲਿਆ ਜਾ ਸਕਦਾ ਹੈ।"</string>
+    <string name="vision_settings_suggestion_title" msgid="8058794060304707004">"ਫੌਂਟ ਦਾ ਆਕਾਰ ਬਦਲੋ"</string>
     <string name="screen_reader_category_title" msgid="7739154903913400641">"ਸਕ੍ਰੀਨ ਪਾਠਕ"</string>
-    <string name="audio_and_captions_category_title" msgid="3420727114421447524">"ਔਡੀਓ ਅਤੇ ਔਨ-ਸਕ੍ਰੀਨ ਲਿਖਤ"</string>
+    <string name="audio_and_captions_category_title" msgid="3420727114421447524">" ਆਡੀਓ  ਅਤੇ ਔਨ-ਸਕ੍ਰੀਨ ਲਿਖਤ"</string>
     <string name="display_category_title" msgid="685461049938269166">"ਡਿਸਪਲੇ"</string>
     <string name="interaction_control_category_title" msgid="7836591031872839151">"ਅੰਤਰਕਿਰਿਆ ਕੰਟਰੋਲ"</string>
     <string name="user_installed_services_category_title" msgid="6426376488922158647">"ਡਾਊਨਲੋਡ ਕੀਤੀਆਂ ਸੇਵਾਵਾਂ"</string>
@@ -1817,29 +1828,28 @@
     <string name="accessibility_screen_magnification_gestures_title" msgid="3719929521571489913">"ਤਿੰਨ-ਟੈਪਾਂ ਨਾਲ ਵੱਡਾ ਕਰੋ"</string>
     <string name="accessibility_screen_magnification_navbar_title" msgid="7141753038957538230">"ਬਟਨ ਨਾਲ ਵੱਡਾ ਕਰੋ"</string>
     <string name="accessibility_screen_magnification_state_navbar_gesture" msgid="2760906043221923793">"ਬਟਨ ਅਤੇ ਤਿੰਨ-ਟੈਪ ਨਾਲ ਵੱਡਾ ਕਰੋ"</string>
-    <string name="accessibility_preference_magnification_summary" msgid="5867883657521404509">"ਸਕ੍ਰੀਨ \'ਤੇ ਜ਼ੂਮ ਇਨ ਕਰੋ"</string>
+    <string name="accessibility_preference_magnification_summary" msgid="5867883657521404509">"ਸਕ੍ਰੀਨ \'ਤੇ ਜ਼ੂਮ ਵਧਾਓ"</string>
     <string name="accessibility_screen_magnification_short_summary" msgid="3411979839172752057">"ਜ਼ੂਮ ਕਰਨ ਲਈ 3 ਵਾਰ ਟੈਪ ਕਰੋ"</string>
     <string name="accessibility_screen_magnification_navbar_short_summary" msgid="3693116360267980492">"ਜ਼ੂਮ ਕਰਨ ਲਈ ਬਟਨ \'ਤੇ ਟੈਪ ਕਰੋ"</string>
-    <string name="accessibility_screen_magnification_summary" msgid="5258868553337478505"><b>"ਜ਼ੂਮ ਕਰਨ ਲਈ"</b>", ਸਕ੍ਰੀਨ \'ਤੇ ਤੇਜ਼ੀ ਨਾਲ 3 ਵਾਰ ਟੈਪ ਕਰੋ।\n"<ul><li>"ਸਕ੍ਰੋਲ ਕਰਨ ਲਈ 2 ਜਾਂ ਜ਼ਿਆਦਾ ਉਂਗਲਾਂ ਘਸੀਟੋ"</li>\n<li>"ਜ਼ੂਮ ਨੂੰ ਵਿਵਸਥਿਤ ਕਰਨ ਲਈ 2 ਜਾਂ ਜ਼ਿਆਦਾ ਉਂਗਲਾਂ ਨਾਲ ਚੂੰਢੀ ਭਰੋ"</li></ul>\n\n<b>"ਅਸਥਾਈ ਤੌਰ \'ਤੇ ਜ਼ੂਮ ਕਰਨ ਲਈ"</b>", ਸਕ੍ਰੀਨ \'ਤੇ 3 ਵਾਰ ਟੈਪ ਕਰੋ, ਅਤੇ ਆਪਣੀ ਉਂਗਲ ਨੂੰ ਤੀਜੇ ਟੈਪ \'ਤੇ ਦਬਾਈ ਰੱਖੋ।\n"<ul><li>"ਸਕ੍ਰੀਨ \'ਤੇ ਆਲੇ-ਦੁਆਲੇ ਜਾਣ ਲਈ ਘਸੀਟੋ"</li>\n<li>"ਜ਼ੂਮ ਆਊਟ ਕਰਨ ਲਈ ਉਂਗਲ ਚੁੱਕੋ"</li></ul>\n\n"ਤੁਸੀਂ ਕੀ-ਬੋਰਡ ਜਾਂ ਆਵਾਗੌਣ ਪੱਟੀ \'ਤੇ ਜ਼ੂਮ ਇਨ ਨਹੀਂ ਕਰ ਸਕਦੇ।"</string>
-    <string name="accessibility_screen_magnification_navbar_summary" msgid="1996584694050087161">"ਜਦੋਂ ਵੱਡਦਰਸ਼ੀਕਰਨ ਚਾਲੂ ਹੋਵੇ, ਤਾਂ ਤੇਜ਼ੀ ਨਾਲ ਵੱਡਾ ਕਰਨ ਲਈ ਸਕ੍ਰੀਨ ਦੇ ਹੇਠਾਂ ਪਹੁੰਚਯੋਗਤਾ ਬਟਨ ਦੀ ਵਰਤੋਂ ਕਰੋ।\n\n"<b>"ਜ਼ੂਮ ਕਰਨ ਲਈ"</b>", ਪਹੁੰਚਯੋਗਤਾ ਬਟਨ \'ਤੇ ਟੈਪ ਕਰੋ, ਫਿਰ ਸਕ੍ਰੀਨ \'ਤੇ ਕਿਤੇ ਵੀ ਟੈਪ ਕਰੋ।\n"<ul><li>"ਸਕ੍ਰੋਲ ਕਰਨ ਲਈ 2 ਜਾਂ ਜ਼ਿਆਦਾ ਉਂਗਲਾਂ ਘਸੀਟੋ"</li>\n<li>"ਜ਼ੂਮ ਨੂੰ ਵਿਵਸਥਿਤ ਕਰਨ ਲਈ 2 ਜਾਂ ਜ਼ਿਆਦਾ ਉਂਗਲਾਂ ਨਾਲ ਚੂੰਢੀ ਭਰੋ"</li></ul>\n\n<b>"ਅਸਥਾਈ ਤੌਰ \'ਤੇ ਜ਼ੂਮ ਕਰਨ ਲਈ"</b>", ਪਹੁੰਚਯੋਗਤਾ ਬਟਨ \'ਤੇ ਟੈਪ ਕਰੋ, ਫਿਰ ਸਕ੍ਰੀਨ \'ਤੇ ਕੀਤੇ ਵੀ ਸਪੱਰਸ਼ ਕਰੋ ਅਤੇ ਦਬਾਈ ਰੱਖੋ।\n"<ul><li>"ਸਕ੍ਰੀਨ \'ਤੇ ਆਲੇ-ਦੁਆਲੇ ਜਾਣ ਲਈ ਘਸੀਟੋ"</li>\n<li>"ਜ਼ੂਮ ਆਊਟ ਕਰਨ ਲਈ ਉਂਗਲ ਚੁੱਕੋ"</li></ul>\n\n"ਤੁਸੀਂ ਕੀ-ਬੋਰਡ ਜਾਂ ਆਵਾਗੌਣ ਪੱਟੀ \'ਤੇ ਜ਼ੂਮ ਇਨ ਨਹੀਂ ਕਰ ਸਕਦੇ।"</string>
+    <string name="accessibility_screen_magnification_summary" msgid="5258868553337478505"><b>"ਜ਼ੂਮ ਕਰਨ ਲਈ"</b>", ਸਕ੍ਰੀਨ \'ਤੇ ਤੇਜ਼ੀ ਨਾਲ 3 ਵਾਰ ਟੈਪ ਕਰੋ।\n"<ul><li>"ਸਕ੍ਰੋਲ ਕਰਨ ਲਈ 2 ਜਾਂ ਜ਼ਿਆਦਾ ਉਂਗਲਾਂ ਘਸੀਟੋ"</li>\n<li>"ਜ਼ੂਮ ਨੂੰ ਵਿਵਸਥਿਤ ਕਰਨ ਲਈ 2 ਜਾਂ ਜ਼ਿਆਦਾ ਉਂਗਲਾਂ ਨਾਲ ਚੂੰਢੀ ਭਰੋ"</li></ul>\n\n<b>"ਅਸਥਾਈ ਤੌਰ \'ਤੇ ਜ਼ੂਮ ਕਰਨ ਲਈ"</b>", ਸਕ੍ਰੀਨ \'ਤੇ 3 ਵਾਰ ਟੈਪ ਕਰੋ, ਅਤੇ ਆਪਣੀ ਉਂਗਲ ਨੂੰ ਤੀਜੇ ਟੈਪ \'ਤੇ ਦਬਾਈ ਰੱਖੋ।\n"<ul><li>"ਸਕ੍ਰੀਨ \'ਤੇ ਆਲੇ-ਦੁਆਲੇ ਜਾਣ ਲਈ ਘਸੀਟੋ"</li>\n<li>"ਜ਼ੂਮ ਘਟਾਉਣ ਲਈ ਉਂਗਲ ਚੁੱਕੋ"</li></ul>\n\n"ਤੁਸੀਂ ਕੀ-ਬੋਰਡ ਜਾਂ ਦਿਸ਼ਾ-ਨਿਰਦੇਸ਼ ਪੱਟੀ \'ਤੇ ਜ਼ੂਮ ਵਧਾ ਨਹੀਂ ਸਕਦੇ।"</string>
+    <string name="accessibility_screen_magnification_navbar_summary" msgid="1996584694050087161">"ਜਦੋਂ ਵੱਡਦਰਸ਼ੀਕਰਨ ਚਾਲੂ ਹੋਵੇ, ਤਾਂ ਤੇਜ਼ੀ ਨਾਲ ਵੱਡਾ ਕਰਨ ਲਈ ਸਕ੍ਰੀਨ ਦੇ ਹੇਠਾਂ ਪਹੁੰਚਯੋਗਤਾ ਬਟਨ ਦੀ ਵਰਤੋਂ ਕਰੋ।\n\n"<b>"ਜ਼ੂਮ ਕਰਨ ਲਈ"</b>", ਪਹੁੰਚਯੋਗਤਾ ਬਟਨ \'ਤੇ ਟੈਪ ਕਰੋ, ਫਿਰ ਸਕ੍ਰੀਨ \'ਤੇ ਕਿਤੇ ਵੀ ਟੈਪ ਕਰੋ।\n"<ul><li>"ਸਕ੍ਰੋਲ ਕਰਨ ਲਈ 2 ਜਾਂ ਜ਼ਿਆਦਾ ਉਂਗਲਾਂ ਘਸੀਟੋ"</li>\n<li>"ਜ਼ੂਮ ਨੂੰ ਵਿਵਸਥਿਤ ਕਰਨ ਲਈ 2 ਜਾਂ ਜ਼ਿਆਦਾ ਉਂਗਲਾਂ ਨਾਲ ਚੂੰਢੀ ਭਰੋ"</li></ul>\n\n<b>"ਅਸਥਾਈ ਤੌਰ \'ਤੇ ਜ਼ੂਮ ਕਰਨ ਲਈ"</b>", ਪਹੁੰਚਯੋਗਤਾ ਬਟਨ \'ਤੇ ਟੈਪ ਕਰੋ, ਫਿਰ ਸਕ੍ਰੀਨ \'ਤੇ ਕੀਤੇ ਵੀ ਸਪੱਰਸ਼ ਕਰੋ ਅਤੇ ਦਬਾਈ ਰੱਖੋ।\n"<ul><li>"ਸਕ੍ਰੀਨ \'ਤੇ ਆਲੇ-ਦੁਆਲੇ ਜਾਣ ਲਈ ਘਸੀਟੋ"</li>\n<li>"ਜ਼ੂਮ ਘਟਾਉਣ ਲਈ ਉਂਗਲ ਚੁੱਕੋ"</li></ul>\n\n"ਤੁਸੀਂ ਕੀ-ਬੋਰਡ ਜਾਂ ਦਿਸ਼ਾ-ਨਿਰਦੇਸ਼ ਪੱਟੀ \'ਤੇ ਜ਼ੂਮ ਵਧਾ ਨਹੀਂ ਸਕਦੇ।"</string>
     <string name="accessibility_screen_magnification_navbar_configuration_warning" msgid="70533120652758190">"ਪਹੁੰਚਯੋਗਤਾ ਬਟਨ <xliff:g id="SERVICE">%1$s</xliff:g> \'ਤੇ ਸੈੱਟ ਹੈ। ਵੱਡਦਰਸ਼ੀਕਰਨ ਦੀ ਵਰਤੋਂ ਕਰਨ ਲਈ, ਪਹੁੰਚਯੋਗਤਾ ਬਟਨ ਨੂੰ ਸਪੱਰਸ਼ ਕਰੋ ਅਤੇ ਦਬਾਈ ਰੱਖੋ, ਫਿਰ ਵੱਡਦਰਸ਼ੀਕਰਨ ਨੂੰ ਚੁਣੋ।"</string>
     <string name="accessibility_global_gesture_preference_title" msgid="2048884356166982714">"ਵੌਲਿਊਮ ਕੁੰਜੀ ਸ਼ਾਰਟਕੱਟ"</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="1765853731190717372">"ਜਦੋਂ ਸ਼ਾਰਟਕੱਟ ਚਾਲੂ ਹੋਵੇ, ਤਾਂ ਤੁਸੀਂ ਕਿਸੇ ਪਹੁੰਚਯੋਗਤਾ ਵਿਸ਼ੇਸ਼ਤਾ ਨੂੰ ਸ਼ੁਰੂ ਕਰਨ ਲਈ ਦੋਵੇਂ ਵੌਲਿਊਮ ਕੁੰਜੀਆਂ ਨੂੰ 3 ਸਕਿੰਟਾਂ ਲਈ ਦੱਬ ਸਕਦੇ ਹੋ।"</string>
+    <string name="accessibility_shortcut_service_on_lock_screen_title" msgid="5490636079625489534">" ਲਾਕ  ਸਕ੍ਰੀਨ ਤੋਂ ਇਜਾਜ਼ਤ ਦਿਓ"</string>
+    <string name="accessibility_shortcut_description" msgid="1765853731190717372">"ਜਦੋਂ ਸ਼ਾਰਟਕੱਟ ਚਾਲੂ ਹੋਵੇ, ਤਾਂ ਤੁਸੀਂ ਕਿਸੇ ਪਹੁੰਚਯੋਗਤਾ ਵਿਸ਼ੇਸ਼ਤਾ ਨੂੰ ਸ਼ੁਰੂ ਕਰਨ ਲਈ ਦੋਵੇਂ ਅਵਾਜ਼ ਕੁੰਜੀਆਂ ਨੂੰ 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_power_button_ends_call_prerefence_title" msgid="6673851944175874235">"ਪਾਵਰ ਬਟਨ ਕਾਲ ਖਤਮ ਕਰਦਾ ਹੈ"</string>
     <string name="accessibility_toggle_large_pointer_icon_title" msgid="535173100516295580">"ਵੱਡਾ ਮਾਊਸ ਪੁਆਇੰਟਰ"</string>
-    <string name="accessibility_toggle_master_mono_title" msgid="4363806997971905302">"ਮੋਨੋ ਔਡੀਓ"</string>
-    <string name="accessibility_toggle_master_mono_summary" msgid="5634277025251530927">"ਔਡੀਓ ਚਲਾਉਣ ਦੌਰਾਨ ਚੈਨਲਾਂ ਨੂੰ ਇਕੱਠਾ ਕਰੋ"</string>
+    <string name="accessibility_toggle_master_mono_title" msgid="4363806997971905302">"ਮੋਨੋ  ਆਡੀਓ"</string>
+    <string name="accessibility_toggle_master_mono_summary" msgid="5634277025251530927">" ਆਡੀਓ  ਚਲਾਉਣ ਦੌਰਾਨ ਚੈਨਲਾਂ ਨੂੰ ਇਕੱਠਾ ਕਰੋ"</string>
     <string name="accessibility_long_press_timeout_preference_title" msgid="6708467774619266508">"ਛੋਹਣ ਅਤੇ ਛੋਹੀ ਰੱਖਣ ਵਿੱਚ ਦੇਰੀ"</string>
     <string name="accessibility_display_inversion_preference_title" msgid="2119647786141420802">"ਰੰਗ ਇਨਵਰਜਨ"</string>
     <string name="accessibility_display_inversion_preference_subtitle" msgid="7052959202195368109">"ਪ੍ਰਦਰਸ਼ਨ \'ਤੇ ਅਸਰ ਪਾ ਸਕਦੀ ਹੈ"</string>
     <string name="accessibility_autoclick_preference_title" msgid="7014499339068449623">"ਪੋਇੰਟਰ ਰੁਕਣ ਤੋਂ ਬਾਅਦ ਕਲਿੱਕ ਕਰੋ"</string>
     <string name="accessibility_autoclick_delay_preference_title" msgid="3962261178385106006">"ਕਲਿੱਕ ਤੋਂ ਪਹਿਲਾਂ ਦੇਰੀ"</string>
-    <string name="preference_summary_default_combination" msgid="8532964268242666060">"<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>
@@ -1867,21 +1877,21 @@
     <string name="accessibility_menu_item_settings" msgid="3344942964710773365">"ਸੈਟਿੰਗਾਂ"</string>
     <string name="accessibility_feature_state_on" msgid="2864292320042673806">"ਚਾਲੂ"</string>
     <string name="accessibility_feature_state_off" msgid="4172584906487070211">"ਬੰਦ"</string>
-    <string name="captioning_preview_title" msgid="1234015253497016890">"ਪ੍ਰੀਵਿਊ"</string>
+    <string name="captioning_preview_title" msgid="1234015253497016890">"ਪੂਰਵ-ਝਲਕ"</string>
     <string name="captioning_standard_options_title" msgid="3284211791180335844">"ਮਿਆਰੀ ਚੋਣਾਂ"</string>
     <string name="captioning_locale" msgid="4559155661018823503">"ਭਾਸ਼ਾ"</string>
     <string name="captioning_text_size" msgid="6737002449104466028">"ਲਿਖਤ ਦਾ ਆਕਾਰ"</string>
-    <string name="captioning_preset" msgid="8939737196538429044">"ਕੈਪਸ਼ਨ ਸਟਾਈਲ"</string>
-    <string name="captioning_custom_options_title" msgid="5067500939930322405">"ਕਸਟਮ ਚੋਣਾਂ"</string>
+    <string name="captioning_preset" msgid="8939737196538429044">"ਸੁਰਖੀ ਸ਼ੈਲੀ"</string>
+    <string name="captioning_custom_options_title" msgid="5067500939930322405">"ਵਿਉਂਂਤੀ ਵਿਕਲਪ"</string>
     <string name="captioning_background_color" msgid="9053011212948992570">"ਬੈਕਗ੍ਰਾਉਂਡ ਦਾ ਰੰਗ"</string>
     <string name="captioning_background_opacity" msgid="6029993616419971202">"ਬੈਕਗ੍ਰਾਉਂਡ ਅਪਾਰਦਰਸ਼ਤਾ"</string>
-    <string name="captioning_window_color" msgid="6902052743419717394">"ਕੈਪਸ਼ਨ ਵਿੰਡੋ ਰੰਗ"</string>
-    <string name="captioning_window_opacity" msgid="5041556024849862376">"ਕੈਪਸ਼ਨ ਵਿੰਡੋ ਧੁੰਦਲਾਪਣ"</string>
+    <string name="captioning_window_color" msgid="6902052743419717394">"ਸੁਰਖੀ ਵਿੰਡੋ ਰੰਗ"</string>
+    <string name="captioning_window_opacity" msgid="5041556024849862376">"ਸੁਰਖੀ ਵਿੰਡੋ ਧੁੰਦਲਾਪਣ"</string>
     <string name="captioning_foreground_color" msgid="85623486537640059">"ਟੈਕਸਟ ਰੰਗ"</string>
     <string name="captioning_foreground_opacity" msgid="4370967856995419788">"ਪਾਠ ਅਪਾਰਦਰਸ਼ਤਾ"</string>
     <string name="captioning_edge_color" msgid="3670094753735263238">"ਕਿਨਾਰੇ ਦਾ ਰੰਗ"</string>
     <string name="captioning_edge_type" msgid="5997247394951682154">"ਐਜ ਪ੍ਰਕਾਰ"</string>
-    <string name="captioning_typeface" msgid="1826169240566563259">"ਫੌਂਟ ਪਰਿਵਾਰ"</string>
+    <string name="captioning_typeface" msgid="1826169240566563259">"ਫ਼ੌਂਟ ਪਰਿਵਾਰ"</string>
     <string name="captioning_preview_text" msgid="4067935959797375065">"ਸੁਰਖੀਆਂ ਇੰਜ ਦਿਖਾਈ ਦੇਣਗੀਆਂ"</string>
     <string name="captioning_preview_characters" msgid="7105909138497851769">"Aa"</string>
     <string name="locale_default" msgid="2593883646136326969">"ਪੂਰਵ-ਨਿਰਧਾਰਤ"</string>
@@ -1899,12 +1909,12 @@
     <string name="color_magenta" msgid="5059212823607815549">"ਮਜੈਂਟਾ"</string>
     <string name="enable_service_title" msgid="3061307612673835592">"ਕੀ <xliff:g id="SERVICE">%1$s</xliff:g> ਵਰਤਣੀ ਹੈ?"</string>
     <string name="capabilities_list_title" msgid="86713361724771971">"<xliff:g id="SERVICE">%1$s</xliff:g> ਨੂੰ ਇਹ ਕਰਨ ਦੀ ਲੋੜ ਹੈ:"</string>
-    <string name="touch_filtered_warning" msgid="8644034725268915030">"ਕਿਉਂਕਿ ਇੱਕ ਐਪ ਇੱਕ ਅਨੁਮਤੀ ਬੇਨਤੀ ਨੂੰ ਅਸਪਸ਼ਟ ਬਣਾ ਰਿਹਾ ਹੈ, ਸੈਟਿੰਗਾਂ ਤੁਹਾਡੇ ਜਵਾਬ ਦੀ ਜਾਂਚ ਨਹੀਂ ਕਰ ਸਕਦੀਆਂ।"</string>
-    <string name="enable_service_encryption_warning" msgid="3064686622453974606">"ਜੇਕਰ ਤੁਸੀਂ <xliff:g id="SERVICE">%1$s</xliff:g> ਚਾਲੂ ਕਰਦੇ ਹੋ, ਤਾਂ ਤੁਹਾਡੀ ਡੀਵਾਈਸ ਡੈਟਾ ਇਨਕ੍ਰਿਪਸ਼ਨ ਵਧਾਉਣ ਲਈ ਤੁਹਾਡੀ ਸਕ੍ਰੀਨ ਲੌਕ ਨਹੀਂ ਵਰਤੇਗੀ।"</string>
-    <string name="secure_lock_encryption_warning" msgid="460911459695077779">"ਕਿਉਂਕਿ ਤੁਸੀਂ ਇੱਕ ਪਹੁੰਚਯੋਗਤਾ ਸੇਵਾ ਚਾਲੂ ਕੀਤੀ ਹੈ, ਤੁਹਾਡੀ ਡੀਵਾਈਸ ਡੈਟਾ ਇਨਕ੍ਰਿਪਸ਼ਨ ਨੂੰ ਵਧਾਉਣ ਲਈ ਤੁਹਾਡਾ ਸਕ੍ਰੀਨ ਅਨਲੌਕ ਨਹੀਂ ਵਰਤੇਗੀ।"</string>
-    <string name="enable_service_pattern_reason" msgid="777577618063306751">"ਕਿਉਂਕਿ <xliff:g id="SERVICE">%1$s</xliff:g> ਨੂੰ ਚਾਲੂ ਕਰਨ ਨਾਲ ਡੈਟਾ ਇਨਕ੍ਰਿਪਸ਼ਨ ਤੇ ਅਸਰ ਪੈਂਦਾ ਹੈ, ਤੁਹਾਨੂੰ ਆਪਣੇ ਪੈਟਰਨ ਦੀ ਪੁਸ਼ਟੀ ਕਰਨ ਦੀ ਲੋੜ ਹੈ।"</string>
-    <string name="enable_service_pin_reason" msgid="7882035264853248228">"ਕਿਉਂਕਿ <xliff:g id="SERVICE">%1$s</xliff:g> ਨੂੰ ਚਾਲੂ ਕਰਨ ਨਾਲ ਡੈਟਾ ਇਨਕ੍ਰਿਪਸ਼ਨ ਤੇ ਅਸਰ ਪੈਂਦਾ ਹੈ, ਤੁਹਾਨੂੰ ਆਪਣੇ PIN ਦੀ ਪੁਸ਼ਟੀ ਕਰਨ ਦੀ ਲੋੜ ਹੈ।"</string>
-    <string name="enable_service_password_reason" msgid="1224075277603097951">"ਕਿਉਂਕਿ <xliff:g id="SERVICE">%1$s</xliff:g> ਨੂੰ ਚਾਲੂ ਕਰਨ ਨਾਲ ਡੈਟਾ ਇਨਕ੍ਰਿਪਸ਼ਨ ਤੇ ਅਸਰ ਪੈਂਦਾ ਹੈ, ਤੁਹਾਨੂੰ ਆਪਣੇ ਪਾਸਵਰਡ ਦੀ ਪੁਸ਼ਟੀ ਕਰਨ ਦੀ ਲੋੜ ਹੈ।"</string>
+    <string name="touch_filtered_warning" msgid="8644034725268915030">"ਕਿਉਂਕਿ ਇੱਕ ਐਪ ਇੱਕ ਇਜਾਜ਼ਤ ਬੇਨਤੀ ਨੂੰ ਅਸਪਸ਼ਟ ਬਣਾ ਰਿਹਾ ਹੈ, ਸੈਟਿੰਗਾਂ ਤੁਹਾਡੇ ਜਵਾਬ ਦੀ ਜਾਂਚ ਨਹੀਂ ਕਰ ਸਕਦੀਆਂ।"</string>
+    <string name="enable_service_encryption_warning" msgid="3064686622453974606">"ਜੇਕਰ ਤੁਸੀਂ <xliff:g id="SERVICE">%1$s</xliff:g> ਚਾਲੂ ਕਰਦੇ ਹੋ, ਤਾਂ ਤੁਹਾਡਾ ਡੀਵਾਈਸ ਡਾਟਾ ਇਨਕ੍ਰਿਪਸ਼ਨ ਵਧਾਉਣ ਲਈ ਤੁਹਾਡੀ ਸਕ੍ਰੀਨ ਲਾਕ ਨਹੀਂ ਵਰਤੇਗੀ।"</string>
+    <string name="secure_lock_encryption_warning" msgid="460911459695077779">"ਕਿਉਂਕਿ ਤੁਸੀਂ ਇੱਕ ਪਹੁੰਚਯੋਗਤਾ ਸੇਵਾ ਚਾਲੂ ਕੀਤੀ ਹੈ, ਤੁਹਾਡਾ ਡੀਵਾਈਸ ਡਾਟਾ ਇਨਕ੍ਰਿਪਸ਼ਨ ਨੂੰ ਵਧਾਉਣ ਲਈ ਤੁਹਾਡਾ ਸਕ੍ਰੀਨ ਅਨਲਾਕ ਨਹੀਂ ਵਰਤੇਗਾ।"</string>
+    <string name="enable_service_pattern_reason" msgid="777577618063306751">"ਕਿਉਂਕਿ <xliff:g id="SERVICE">%1$s</xliff:g> ਨੂੰ ਚਾਲੂ ਕਰਨ ਨਾਲ  ਡਾਟਾ  ਇਨਕ੍ਰਿਪਸ਼ਨ ਤੇ ਅਸਰ ਪੈਂਦਾ ਹੈ, ਤੁਹਾਨੂੰ ਆਪਣੇ ਪੈਟਰਨ ਦੀ ਪੁਸ਼ਟੀ ਕਰਨ ਦੀ ਲੋੜ ਹੈ।"</string>
+    <string name="enable_service_pin_reason" msgid="7882035264853248228">"ਤੁਹਾਨੂੰ ਆਪਣੇ ਪਿੰਨ ਦੀ ਪੁਸ਼ਟੀ ਕਰਨ ਦੀ ਲੋੜ ਹੈ, ਕਿਉਂਕਿ <xliff:g id="SERVICE">%1$s</xliff:g> ਨੂੰ ਚਾਲੂ ਕਰਨ ਨਾਲ ਡਾਟਾ ਇਨਕ੍ਰਿਪਸ਼ਨ ਤੇ ਅਸਰ ਪੈਂਦਾ ਹੈ।"</string>
+    <string name="enable_service_password_reason" msgid="1224075277603097951">"ਕਿਉਂਕਿ <xliff:g id="SERVICE">%1$s</xliff:g> ਨੂੰ ਚਾਲੂ ਕਰਨ ਨਾਲ ਡਾਟਾ ਇਨਕ੍ਰਿਪਸ਼ਨ ਤੇ ਅਸਰ ਪੈਂਦਾ ਹੈ, ਤੁਹਾਨੂੰ ਆਪਣੇ ਪਾਸਵਰਡ ਦੀ ਪੁਸ਼ਟੀ ਕਰਨ ਦੀ ਲੋੜ ਹੈ।"</string>
     <string name="capability_title_receiveAccessibilityEvents" msgid="1869032063969970755">"ਤੁਹਾਡੀਆਂ ਸਰਗਰਮੀਆਂ ਦਾ ਨਿਰੀਖਣ ਕਰਨਾ"</string>
     <string name="capability_desc_receiveAccessibilityEvents" msgid="6640333613848713883">"ਜਦੋਂ ਤੁਸੀਂ ਕਿਸੇ ਐਪ ਨਾਲ ਅੰਤਰਕਿਰਿਆ ਕਰ ਰਹੇ ਹੋਵੋ ਤਾਂ ਸੂਚਨਾਵਾਂ ਪ੍ਰਾਪਤ ਕਰਨਾ।"</string>
     <string name="disable_service_title" msgid="3624005212728512896">"ਕੀ <xliff:g id="SERVICE">%1$s</xliff:g> ਬੰਦ ਕਰਨੀ ਹੈ?"</string>
@@ -1916,22 +1926,22 @@
     <string name="print_settings" msgid="4742428530112487843">"ਪ੍ਰਿੰਟਿੰਗ"</string>
     <string name="print_settings_summary_no_service" msgid="6354322414246865875">"ਬੰਦ"</string>
     <plurals name="print_settings_summary" formatted="false" msgid="6005468025646083029">
-      <item quantity="one"><xliff:g id="COUNT">%1$d</xliff:g> ਪ੍ਰਿੰਟ ਸੇਵਾ ਚਾਲੂ ਹੈ</item>
-      <item quantity="other"><xliff:g id="COUNT">%1$d</xliff:g> ਪ੍ਰਿੰਟ ਸੇਵਾਵਾਂ ਚਾਲੂ ਹਨ</item>
+      <item quantity="one"> ਪ੍ਰਿੰਟ ਸੇਵਾ ਚਾਲੂ ਹੈ<xliff:g id="COUNT">%1$d</xliff:g></item>
+      <item quantity="other"> ਪ੍ਰਿੰਟ ਸੇਵਾ ਚਾਲੂ ਹੈ<xliff:g id="COUNT">%1$d</xliff:g></item>
     </plurals>
     <plurals name="print_jobs_summary" formatted="false" msgid="5810106725778525400">
       <item quantity="one"><xliff:g id="COUNT">%1$d</xliff:g> ਪ੍ਰਿੰਟ ਜੌਬ</item>
-      <item quantity="other"><xliff:g id="COUNT">%1$d</xliff:g> ਪ੍ਰਿੰਟ ਜੌਬਾਂ</item>
+      <item quantity="other"><xliff:g id="COUNT">%1$d</xliff:g> ਪ੍ਰਿੰਟ ਜੌਬ</item>
     </plurals>
     <string name="print_settings_title" msgid="3685449667822217816">"ਪ੍ਰਿੰਟ ਸੇਵਾਵਾਂ"</string>
     <string name="print_no_services_installed" msgid="8443039625463872294">"ਕੋਈ ਸੇਵਾਵਾਂ ਇੰਸਟੌਲ ਨਹੀਂ ਕੀਤੀਆਂ"</string>
     <string name="print_no_printers_found" msgid="989018646884973683">"ਕੋਈ ਪ੍ਰਿੰਟਰ ਨਹੀਂ ਮਿਲੇ"</string>
     <string name="print_menu_item_settings" msgid="6591330373682227082">"ਸੈਟਿੰਗਾਂ"</string>
-    <string name="print_menu_item_add_printers" msgid="2890738028215834012">"ਪ੍ਰਿੰਟਰ ਜੋੜੋ"</string>
+    <string name="print_menu_item_add_printers" msgid="2890738028215834012">"ਪ੍ਰਿੰਟਰ ਸ਼ਾਮਲ ਕਰੋ"</string>
     <string name="print_feature_state_on" msgid="8098901852502441048">"ਚਾਲੂ"</string>
     <string name="print_feature_state_off" msgid="7294876968403966040">"ਬੰਦ"</string>
-    <string name="print_menu_item_add_service" msgid="3811645167869797802">"ਸੇਵਾ ਜੋੜੋ"</string>
-    <string name="print_menu_item_add_printer" msgid="8251218970577291032">"ਪ੍ਰਿੰਟਰ ਜੋੜੋ"</string>
+    <string name="print_menu_item_add_service" msgid="3811645167869797802">"ਸੇਵਾ ਸ਼ਾਮਲ ਕਰੋ"</string>
+    <string name="print_menu_item_add_printer" msgid="8251218970577291032">"ਪ੍ਰਿੰਟਰ ਸ਼ਾਮਲ ਕਰੋ"</string>
     <string name="print_menu_item_search" msgid="7025589328240514553">"ਖੋਜੋ"</string>
     <string name="print_searching_for_printers" msgid="4680248496457576358">"ਪ੍ਰਿੰਟਰ ਖੋਜ ਰਿਹਾ ਹੈ"</string>
     <string name="print_service_disabled" msgid="7739452396114245222">"ਸੇਵਾ ਅਯੋਗ ਬਣਾਈ ਗਈ ਹੈ"</string>
@@ -1944,8 +1954,8 @@
     <string name="print_cancelling_state_title_template" msgid="7102968925358219875">"<xliff:g id="PRINT_JOB_NAME">%1$s</xliff:g> ਨੂੰ ਰੱਦ ਕਰ ਰਿਹਾ ਹੈ"</string>
     <string name="print_failed_state_title_template" msgid="1436099128973357969">"ਪ੍ਰਿੰਟਰ ਅਸ਼ੁੱਧੀ <xliff:g id="PRINT_JOB_NAME">%1$s</xliff:g>"</string>
     <string name="print_blocked_state_title_template" msgid="9065391617425962424">"ਪ੍ਰਿੰਟਰ ਬਲੌਕ ਕੀਤਾ <xliff:g id="PRINT_JOB_NAME">%1$s</xliff:g>"</string>
-    <string name="print_search_box_shown_utterance" msgid="7730361832020726951">"ਖੋਜ ਬੌਕਸ ਦਿਖਾਇਆ"</string>
-    <string name="print_search_box_hidden_utterance" msgid="7980832833405818400">"ਖੋਜ ਬੌਕਸ ਲੁਕਾਇਆ"</string>
+    <string name="print_search_box_shown_utterance" msgid="7730361832020726951">"ਖੋਜ ਬਾਕਸ ਦਿਖਾਇਆ"</string>
+    <string name="print_search_box_hidden_utterance" msgid="7980832833405818400">"ਖੋਜ ਬਾਕਸ ਲੁਕਾਇਆ"</string>
     <string name="printer_info_desc" msgid="5824995108703060003">"ਇਸ ਪ੍ਰਿੰਟਰ ਬਾਰੇ ਹੋਰ ਜਾਣਕਾਰੀ"</string>
     <string name="power_usage_summary_title" msgid="7190304207330319919">"ਬੈਟਰੀ"</string>
     <string name="power_usage_summary" msgid="7237084831082848168">"ਬੈਟਰੀ ਵਰਤਦੇ ਹੋਏ ਕੀ ਕੀਤਾ ਗਿਆ ਹੈ"</string>
@@ -1958,32 +1968,34 @@
     <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_whitelisted" msgid="7375400051141016808">"ਐਪ ਨੂੰ ਬੈਟਰੀ ਵਰਤੋਂ ਲਈ ਸੁਯੋਗ ਨਹੀਂ ਬਣਾਇਆ ਜਾ ਸਕਦਾ"</string>
+    <string name="background_activity_warning_dialog_title" msgid="2216249969149568871">"ਕੀ ਬੈਕਗ੍ਰਾਊਂਡ ਸਰਗਰਮੀ ਸੀਮਿਤ ਕਰਨੀ ਹੈ?"</string>
+    <string name="background_activity_warning_dialog_text" msgid="7049624449246121981">"ਜੇਕਰ ਤੁਸੀਂ ਕਿਸੇ ਐਪ ਦੀ ਬੈਕਗ੍ਰਾਊਂਡ ਸਰਗਰਮੀ ਨੂੰ ਸੀਮਿਤ ਕਰਦੇ ਹੋ, ਤਾਂ ਉਹ ਅਜੀਬ ਢੰਗ ਨਾਲ ਵਰਤਾਅ ਕਰ ਸਕਦੀ ਹੈ"</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" msgid="6393929085382334341">"ਪੂਰਾ ਚਾਰਜ ਕਰਨ ਤੋਂ ਬਾਅਦ ਐਪ ਵਰਤੋਂ (<xliff:g id="RELATIVE_TIME">^1</xliff:g>)"</string>
+    <string name="power_usage_list_summary_device" msgid="4461926045610455423">"ਪੂਰਾ ਚਾਰਜ ਕਰਨ ਤੋਂ ਬਾਅਦ ਡੀਵਾਈਸ ਵਰਤੋਂ (<xliff:g id="RELATIVE_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>
     <string name="battery_stats_duration" msgid="7464501326709469282">"ਅਨਪਲਗ ਕਰਨ ਤੋਂ ਬਾਅਦ <xliff:g id="TIME">%1$s</xliff:g>"</string>
-    <string name="battery_stats_charging_label" msgid="4223311142875178785">"ਚਾਰਜਿੰਗ"</string>
+    <string name="battery_stats_charging_label" msgid="4223311142875178785">"ਚਾਰਜ ਹੋ ਰਿਹਾ ਹੈ"</string>
     <string name="battery_stats_screen_on_label" msgid="7150221809877509708">"ਸਕ੍ਰੀਨ ਚਾਲੂ"</string>
     <string name="battery_stats_gps_on_label" msgid="1193657533641951256">"GPS ਚਾਲੂ"</string>
     <string name="battery_stats_camera_on_label" msgid="4935637383628414968">"ਕੈਮਰਾ ਚਾਲੂ"</string>
     <string name="battery_stats_flashlight_on_label" msgid="4319637669889411307">"ਫਲੈਸ਼ਲਾਈਟ ਚਾਲੂ"</string>
-    <string name="battery_stats_wifi_running_label" msgid="1845839195549226252">"Wi‑Fi"</string>
+    <string name="battery_stats_wifi_running_label" msgid="1845839195549226252">"ਵਾਈ‑ਫਾਈ"</string>
     <string name="battery_stats_wake_lock_label" msgid="1908942681902324095">"ਸਕਿਰਿਆ"</string>
     <string name="battery_stats_phone_signal_label" msgid="4137799310329041341">"ਮੋਬਾਈਲ ਨੈੱਟਵਰਕ ਸਿਗਨਲ"</string>
     <!-- no translation found for battery_stats_last_duration (1535831453827905957) -->
     <skip />
-    <string name="awake" msgid="387122265874485088">"ਡੀਵਾਈਸ ਦਾ ਸਕਿਰਿਆ ਸਮਾਂ"</string>
-    <string name="wifi_on_time" msgid="3208518458663637035">"Wi‑Fi ਚਾਲੂ ਹੋਣ ਦਾ ਸਮਾਂ"</string>
-    <string name="bluetooth_on_time" msgid="3056108148042308690">"Wi‑Fi ਚਾਲੂ ਹੋਣ ਦਾ ਸਮਾਂ"</string>
-    <string name="advanced_battery_title" msgid="2068039111517508622">"ਉੱਨਤ ਬੈਟਰੀ ਵਰਤੋਂ"</string>
+    <string name="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="history_details_title" msgid="3608240585315506067">"ਇਤਿਹਾਸ ਵੇਰਵੇ"</string>
     <string name="battery_details_title" msgid="6101394441569858580">"ਬੈਟਰੀ ਵਰਤੋਂ"</string>
     <string name="details_subtitle" msgid="32593908269911734">"ਵਰਤੋਂ ਵੇਰਵੇ"</string>
@@ -1997,30 +2009,30 @@
     <string name="dialog_stop_title" msgid="6395127715596746479">"ਕੀ ਐਪ ਬੰਦ ਕਰੀਏ?"</string>
     <string name="dialog_stop_message" product="default" msgid="4006631636646776488">"ਤੁਹਾਡਾ ਫ਼ੋਨ ਬੈਟਰੀ ਦਾ ਪ੍ਰਬੰਧਨ ਆਮ ਵਾਂਗ ਨਹੀਂ ਕਰ ਸਕਦਾ ਕਿਉਂਕਿ <xliff:g id="APP">%1$s</xliff:g> ਐਪ ਤੁਹਾਡੇ ਫ਼ੋਨ ਨੂੰ ਕਿਰਿਆਸ਼ੀਲ ਰੱਖ ਰਹੀ ਹੈ।\n\nਇਸ ਸਮੱਸਿਆ ਨੂੰ ਹੱਲ ਕਰਨ ਦੀ ਕੋਸ਼ਿਸ਼ ਕਰਨ ਲਈ, ਤੁਸੀਂ ਐਪ ਨੂੰ ਬੰਦ ਕਰ ਸਕਦੇ ਹੋ।\n\nਜੇਕਰ ਇੰਝ ਹੋਣਾ ਜਾਰੀ ਰਹਿੰਦਾ ਹੈ, ਤਾਂ ਤੁਹਾਨੂੰ ਬੈਟਰੀ ਪ੍ਰਦਰਸ਼ਨ ਬਿਹਤਰ ਕਰਨ ਲਈ ਐਪ ਨੂੰ ਅਣਸਥਾਪਤ ਕਰਨ ਦੀ ਲੋੜ ਪੈ ਸਕਦੀ ਹੈ।"</string>
     <string name="dialog_stop_message" product="tablet" msgid="2369957934555162428">"ਤੁਹਾਡਾ ਟੈਬਲੈੱਟ ਬੈਟਰੀ ਦਾ ਪ੍ਰਬੰਧਨ ਆਮ ਵਾਂਗ ਨਹੀਂ ਕਰ ਸਕਦਾ ਕਿਉਂਕਿ <xliff:g id="APP">%1$s</xliff:g> ਐਪ ਤੁਹਾਡੇ ਟੈਬਲੈੱਟ ਨੂੰ ਕਿਰਿਆਸ਼ੀਲ ਰੱਖ ਰਹੀ ਹੈ।\n\nਇਸ ਸਮੱਸਿਆ ਨੂੰ ਠੀਕ ਕਰਨ ਦੀ ਕੋਸ਼ਿਸ਼ ਕਰਨ ਲਈ, ਤੁਸੀਂ ਐਪ ਨੂੰ ਬੰਦ ਕਰ ਸਕਦੇ ਹੋ।\n\nਜੇਕਰ ਇੰਝ ਹੋਣਾ ਜਾਰੀ ਰਹਿੰਦਾ ਹੈ, ਤਾਂ ਤੁਹਾਨੂੰ ਬੈਟਰੀ ਪ੍ਰਦਰਸ਼ਨ ਬਿਹਤਰ ਕਰਨ ਲਈ ਐਪ ਨੂੰ ਅਣਸਥਾਪਤ ਕਰਨ ਦੀ ਲੋੜ ਪੈ ਸਕਦੀ ਹੈ।"</string>
-    <string name="dialog_stop_message" product="device" msgid="6195430620406365292">"ਤੁਹਾਡੀ ਡੀਵਾਈਸ ਬੈਟਰੀ ਦਾ ਪ੍ਰਬੰਧਨ ਆਮ ਵਾਂਗ ਨਹੀਂ ਕਰ ਸਕਦੀ ਕਿਉਂਕਿ <xliff:g id="APP">%1$s</xliff:g> ਐਪ ਤੁਹਾਡੀ ਡੀਵਾਈਸ ਨੂੰ ਕਿਰਿਆਸ਼ੀਲ ਰੱਖ ਰਹੀ ਹੈ।\n\nਇਸ ਸਮੱਸਿਆ ਨੂੰ ਹੱਲ ਕਰਨ ਦੀ ਕੋਸ਼ਿਸ਼ ਕਰਨ ਲਈ, ਤੁਸੀਂ ਐਪ ਨੂੰ ਬੰਦ ਕਰ ਸਕਦੇ ਹੋ।\n\nਜੇਕਰ ਇੰਝ ਹੋਣਾ ਜਾਰੀ ਰਹਿੰਦਾ ਹੈ, ਤਾਂ ਤੁਹਾਨੂੰ ਬੈਟਰੀ ਪ੍ਰਦਰਸ਼ਨ ਬਿਹਤਰ ਕਰਨ ਲਈ ਐਪ ਨੂੰ ਅਣਸਥਾਪਤ ਕਰਨ ਦੀ ਲੋੜ ਪੈ ਸਕਦੀ ਹੈ।"</string>
+    <string name="dialog_stop_message" product="device" msgid="6195430620406365292">"ਤੁਹਾਡਾ ਡੀਵਾਈਸ ਬੈਟਰੀ ਦਾ ਪ੍ਰਬੰਧਨ ਆਮ ਵਾਂਗ ਨਹੀਂ ਕਰ ਸਕਦਾ ਕਿਉਂਕਿ <xliff:g id="APP">%1$s</xliff:g> ਐਪ ਤੁਹਾਡੇ ਡੀਵਾਈਸ ਨੂੰ ਕਿਰਿਆਸ਼ੀਲ ਰੱਖ ਰਹੀ ਹੈ।\n\nਇਸ ਸਮੱਸਿਆ ਨੂੰ ਹੱਲ ਕਰਨ ਦੀ ਕੋਸ਼ਿਸ਼ ਕਰਨ ਲਈ, ਤੁਸੀਂ ਐਪ ਨੂੰ ਬੰਦ ਕਰ ਸਕਦੇ ਹੋ।\n\nਜੇਕਰ ਇੰਝ ਹੋਣਾ ਜਾਰੀ ਰਹਿੰਦਾ ਹੈ, ਤਾਂ ਤੁਹਾਨੂੰ ਬੈਟਰੀ ਪ੍ਰਦਰਸ਼ਨ ਬਿਹਤਰ ਕਰਨ ਲਈ ਐਪ ਨੂੰ ਅਣਸਥਾਪਤ ਕਰਨ ਦੀ ਲੋੜ ਪੈ ਸਕਦੀ ਹੈ।"</string>
     <string name="dialog_stop_message_wakeup_alarm" product="default" msgid="1638726742782558262">"ਤੁਹਾਡਾ ਫ਼ੋਨ ਬੈਟਰੀ ਦਾ ਪ੍ਰਬੰਧਨ ਆਮ ਵਾਂਗ ਨਹੀਂ ਕਰ ਸਕਦਾ ਕਿਉਂਕਿ <xliff:g id="APP_0">%1$s</xliff:g> ਐਪ ਤੁਹਾਡੇ ਫ਼ੋਨ ਨੂੰ ਕਿਰਿਆਸ਼ੀਲ ਕਰਦੀ ਰਹਿੰਦੀ ਹੈ।\n\nਇਸ ਸਮੱਸਿਆ ਨੂੰ ਹੱਲ ਕਰਨ ਦੀ ਕੋਸ਼ਿਸ਼ ਕਰਨ ਲਈ, ਤੁਸੀਂ <xliff:g id="APP_1">%1$s</xliff:g> ਨੂੰ ਬੰਦ ਕਰ ਸਕਦੇ ਹੋ।\n\nਜੇਕਰ ਇੰਝ ਹੋਣਾ ਜਾਰੀ ਰਹਿੰਦਾ ਹੈ, ਤਾਂ ਤੁਹਾਨੂੰ ਬੈਟਰੀ ਪ੍ਰਦਰਸ਼ਨ ਨੂੰ ਬਿਹਤਰ ਕਰਨ ਲਈ ਐਪ ਨੂੰ ਅਣਸਥਾਪਤ ਕਰਨ ਦੀ ਲੋੜ ਪੈ ਸਕਦੀ ਹੈ।"</string>
     <string name="dialog_stop_message_wakeup_alarm" product="tablet" msgid="8771690983566539742">"ਤੁਹਾਡਾ ਟੈਬਲੈੱਟ ਬੈਟਰੀ ਦਾ ਪ੍ਰਬੰਧਨ ਆਮ ਵਾਂਗ ਨਹੀਂ ਕਰ ਸਕਦਾ ਕਿਉਂਕਿ <xliff:g id="APP_0">%1$s</xliff:g> ਐਪ ਤੁਹਾਡੇ ਟੈਬਲੈੱਟ ਨੂੰ ਕਿਰਿਆਸ਼ੀਲ ਕਰਦੀ ਰਹਿੰਦੀ ਹੈ।\n\nਇਸ ਸਮੱਸਿਆ ਨੂੰ ਹੱਲ ਕਰਨ ਦੀ ਕੋਸ਼ਿਸ਼ ਕਰਨ ਲਈ, ਤੁਸੀਂ <xliff:g id="APP_1">%1$s</xliff:g> ਨੂੰ ਬੰਦ ਕਰ ਸਕਦੇ ਹੋ।\n\nਜੇਕਰ ਇੰਝ ਹੋਣਾ ਜਾਰੀ ਰਹਿੰਦਾ ਹੈ, ਤਾਂ ਤੁਹਾਨੂੰ ਬੈਟਰੀ ਪ੍ਰਦਰਸ਼ਨ ਨੂੰ ਬਿਹਤਰ ਕਰਨ ਲਈ ਐਪ ਨੂੰ ਅਣਸਥਾਪਤ ਕਰਨ ਦੀ ਲੋੜ ਪੈ ਸਕਦੀ ਹੈ।"</string>
-    <string name="dialog_stop_message_wakeup_alarm" product="device" msgid="2854944538238649520">"ਤੁਹਾਡੀ ਡੀਵਾਈਸ ਬੈਟਰੀ ਦਾ ਪ੍ਰਬੰਧਨ ਆਮ ਵਾਂਗ ਨਹੀਂ ਕਰ ਸਕਦੀ ਕਿਉਂਕਿ <xliff:g id="APP_0">%1$s</xliff:g> ਐਪ ਤੁਹਾਡੀ ਡੀਵਾਈਸ ਨੂੰ ਕਿਰਿਆਸ਼ੀਲ ਕਰਦੀ ਰਹਿੰਦੀ ਹੈ।\n\nਇਸ ਸਮੱਸਿਆ ਨੂੰ ਹੱਲ ਕਰਨ ਦੀ ਕੋਸ਼ਿਸ਼ ਕਰਨ ਲਈ, ਤੁਸੀਂ <xliff:g id="APP_1">%1$s</xliff:g> ਨੂੰ ਬੰਦ ਕਰ ਸਕਦੇ ਹੋ।\n\nਜੇਕਰ ਇੰਝ ਹੋਣਾ ਜਾਰੀ ਰਹਿੰਦਾ ਹੈ, ਤਾਂ ਤੁਹਾਨੂੰ ਬੈਟਰੀ ਪ੍ਰਦਰਸ਼ਨ ਨੂੰ ਬਿਹਤਰ ਕਰਨ ਲਈ ਐਪ ਨੂੰ ਅਣਸਥਾਪਤ ਕਰਨ ਦੀ ਲੋੜ ਪੈ ਸਕਦੀ ਹੈ।"</string>
+    <string name="dialog_stop_message_wakeup_alarm" product="device" msgid="2854944538238649520">"ਤੁਹਾਡਾ ਡੀਵਾਈਸ ਬੈਟਰੀ ਦਾ ਪ੍ਰਬੰਧਨ ਆਮ ਵਾਂਗ ਨਹੀਂ ਕਰ ਸਕਦਾ ਕਿਉਂਕਿ <xliff:g id="APP_0">%1$s</xliff:g> ਐਪ ਤੁਹਾਡੇ ਡੀਵਾਈਸ ਨੂੰ ਕਿਰਿਆਸ਼ੀਲ ਕਰਦੀ ਰਹਿੰਦੀ ਹੈ।\n\nਇਸ ਸਮੱਸਿਆ ਨੂੰ ਹੱਲ ਕਰਨ ਦੀ ਕੋਸ਼ਿਸ਼ ਕਰਨ ਲਈ, ਤੁਸੀਂ <xliff:g id="APP_1">%1$s</xliff:g> ਨੂੰ ਬੰਦ ਕਰ ਸਕਦੇ ਹੋ।\n\nਜੇਕਰ ਇੰਝ ਹੋਣਾ ਜਾਰੀ ਰਹਿੰਦਾ ਹੈ, ਤਾਂ ਤੁਹਾਨੂੰ ਬੈਟਰੀ ਪ੍ਰਦਰਸ਼ਨ ਨੂੰ ਬਿਹਤਰ ਕਰਨ ਲਈ ਐਪ ਨੂੰ ਅਣਸਥਾਪਤ ਕਰਨ ਦੀ ਲੋੜ ਪੈ ਸਕਦੀ ਹੈ।"</string>
     <string name="dialog_stop_ok" msgid="2319777211264004900">"ਐਪ ਬੰਦ ਕਰੋ"</string>
     <string name="dialog_background_check_title" msgid="6936542136153283692">"ਕੀ ਬੈਕਗ੍ਰਾਊਂਡ ਵਿੱਚ ਵਰਤੋਂ ਅਤੇ ਐਪ ਨੂੰ ਬੰਦ ਕਰੀਏ?"</string>
     <string name="dialog_background_check_message" product="default" msgid="4045827746349279563">"ਤੁਹਾਡਾ ਫ਼ੋਨ ਬੈਟਰੀ ਦਾ ਪ੍ਰਬੰਧਨ ਆਮ ਵਾਂਗ ਨਹੀਂ ਕਰ ਸਕਦਾ ਕਿਉਂਕਿ <xliff:g id="APP_0">%1$s</xliff:g> ਐਪ ਤੁਹਾਡੇ ਫ਼ੋਨ ਨੂੰ ਕਿਰਿਆਸ਼ੀਲ ਕਰਦੀ ਰਹਿੰਦੀ ਹੈ।\n\nਇਸ ਸਮੱਸਿਆ ਨੂੰ ਹੱਲ ਕਰਨ ਲਈ, ਤੁਸੀਂ <xliff:g id="APP_1">%1$s</xliff:g> ਐਪ ਨੂੰ ਬੰਦ ਕਰ ਸਕਦੇ ਹੋ ਅਤੇ ਉਸਨੂੰ ਬੈਕਗ੍ਰਾਊਂਡ ਵਿੱਚ ਚੱਲਣ ਤੋਂ ਰੋਕ ਸਕਦੇ ਹੋ।"</string>
-    <string name="dialog_background_check_message" product="tablet" msgid="8348214419901788270">"ਤੁਹਾਡਾ ਟੈਬਲੈੱਟ ਬੈਟਰੀ ਦਾ ਪ੍ਰਬੰਧਨ ਆਮ ਵਾਂਗ ਨਹੀਂ ਕਰ ਸਕਦਾ ਕਿਉਂਕਿ <xliff:g id="APP_0">%1$s</xliff:g> ਐਪ ਤੁਹਾਡੇ ਟੈਬਲੈੱਟ ਨੂੰ ਕਿਰਿਆਸ਼ੀਲ ਕਰਦੀ ਰਹਿੰਦੀ ਹੈ।\n\nਇਸ ਸਮੱਸਿਆ ਨੂੰ ਹੱਲ ਕਰਨ ਲਈ, ਤੁਸੀਂ <xliff:g id="APP_1">%1$s</xliff:g> ਐਪ ਨੂੰ ਬੰਦ ਕਰ ਸਕਦੇ ਹੋ ਅਤੇ ਉਸਨੂੰ ਬੈਕਗ੍ਰਾਊਂਡ ਵਿੱਚ ਚੱਲਣ ਤੋਂ ਰੋਕ ਸਕਦੇ ਹੋ।"</string>
-    <string name="dialog_background_check_message" product="device" msgid="5847977433118915863">"ਤੁਹਾਡੀ ਡੀਵਾਈਸ ਬੈਟਰੀ ਦਾ ਪ੍ਰਬੰਧਨ ਆਮ ਵਾਂਗ ਨਹੀਂ ਕਰ ਸਕਦੀ ਕਿਉਂਕਿ <xliff:g id="APP_0">%1$s</xliff:g> ਐਪ ਤੁਹਾਡੀ ਡੀਵਾਈਸ ਨੂੰ ਕਿਰਿਆਸ਼ੀਲ ਕਰਦੀ ਰਹਿੰਦੀ ਹੈ।\n\nਇਸ ਸਮੱਸਿਆ ਨੂੰ ਹੱਲ ਕਰਨ ਲਈ, ਤੁਸੀਂ <xliff:g id="APP_1">%1$s</xliff:g> ਐਪ ਨੂੰ ਬੰਦ ਕਰ ਸਕਦੇ ਹੋ ਅਤੇ ਉਸਨੂੰ ਬੈਕਗ੍ਰਾਊਂਡ ਵਿੱਚ ਚੱਲਣ ਤੋਂ ਰੋਕ ਸਕਦੇ ਹੋ।"</string>
+    <string name="dialog_background_check_message" product="tablet" msgid="8348214419901788270">"ਤੁਹਾਡਾ ਟੈਬਲੈੱਟ ਬੈਟਰੀ ਦਾ ਪ੍ਰਬੰਧਨ ਆਮ ਵਾਂਗ ਨਹੀਂ ਕਰ ਸਕਦਾ ਕਿਉਂਕਿ <xliff:g id="APP_0">%1$s</xliff:g> ਐਪ ਤੁਹਾਡੇ ਟੈਬਲੈੱਟ ਨੂੰ ਕਿਰਿਆਸ਼ੀਲ ਕਰਦੀ ਰਹਿੰਦੀ ਹੈ।\n\nਇਸ ਸਮੱਸਿਆ ਨੂੰ ਹੱਲ ਕਰਨ ਲਈ, ਤੁਸੀਂ <xliff:g id="APP_1">%1$s</xliff:g> ਨੂੰ ਬੰਦ ਕਰ ਸਕਦੇ ਹੋ ਅਤੇ ਉਸਨੂੰ ਬੈਕਗ੍ਰਾਊਂਡ ਵਿੱਚ ਚੱਲਣ ਤੋਂ ਰੋਕ ਸਕਦੇ ਹੋ।"</string>
+    <string name="dialog_background_check_message" product="device" msgid="5847977433118915863">"ਤੁਹਾਡਾ ਡੀਵਾਈਸ ਬੈਟਰੀ ਦਾ ਪ੍ਰਬੰਧਨ ਆਮ ਵਾਂਗ ਨਹੀਂ ਕਰ ਸਕਦਾ ਕਿਉਂਕਿ <xliff:g id="APP_0">%1$s</xliff:g> ਐਪ ਤੁਹਾਡੇ ਡੀਵਾਈਸ ਨੂੰ ਕਿਰਿਆਸ਼ੀਲ ਕਰਦੀ ਰਹਿੰਦੀ ਹੈ।\n\nਇਸ ਸਮੱਸਿਆ ਨੂੰ ਹੱਲ ਕਰਨ ਲਈ, ਤੁਸੀਂ <xliff:g id="APP_1">%1$s</xliff:g> ਐਪ ਨੂੰ ਬੰਦ ਕਰ ਸਕਦੇ ਹੋ ਅਤੇ ਉਸਨੂੰ ਬੈਕਗ੍ਰਾਊਂਡ ਵਿੱਚ ਚੱਲਣ ਤੋਂ ਰੋਕ ਸਕਦੇ ਹੋ।"</string>
     <string name="dialog_background_check_ok" msgid="412876934682899659">"ਬੰਦ ਕਰੋ"</string>
     <string name="dialog_location_title" msgid="5888917530725874727">"ਟਿਕਾਣਾ ਬੰਦ ਕਰੀਏ?"</string>
     <string name="dialog_location_message" product="default" msgid="7774807745601479888">"ਤੁਹਾਡਾ ਫ਼ੋਨ ਬੈਟਰੀ ਦਾ ਪ੍ਰਬੰਧਨ ਆਮ ਵਾਂਗ ਨਹੀਂ ਕਰ ਸਕਦਾ ਕਿਉਂਕਿ ਜਦੋਂ ਤੁਸੀਂ <xliff:g id="APP">%1$s</xliff:g> ਦੀ ਵਰਤੋਂ ਨਹੀਂ ਕਰ ਰਹੇ ਹੁੰਦੇ ਤਾਂ ਵੀ ਐਪ ਤੁਹਾਡਾ ਟਿਕਾਣਾ ਪੁੱਛਦੀ ਰਹਿੰਦੀ ਹੈ।\n\nਇਸ ਸਮੱਸਿਆ ਨੂੰ ਹੱਲ ਕਰਨ ਲਈ, ਤੁਸੀਂ ਇਸ ਐਪ ਲਈ ਟਿਕਾਣੇ ਨੂੰ ਬੰਦ ਕਰ ਸਕਦੇ ਹੋ।"</string>
     <string name="dialog_location_message" product="tablet" msgid="118745801732181618">"ਤੁਹਾਡਾ ਟੈਬਲੈੱਟ ਬੈਟਰੀ ਦਾ ਪ੍ਰਬੰਧਨ ਆਮ ਵਾਂਗ ਨਹੀਂ ਕਰ ਸਕਦਾ ਕਿਉਂਕਿ ਜਦੋਂ ਤੁਸੀਂ <xliff:g id="APP">%1$s</xliff:g> ਦੀ ਵਰਤੋਂ ਨਹੀਂ ਕਰ ਰਹੇ ਹੁੰਦੇ ਹੋ ਤਾਂ ਵੀ ਐਪ ਤੁਹਾਡਾ ਟਿਕਾਣਾ ਪੁੱਛਦੀ ਰਹਿੰਦੀ ਹੈ।\n\nਇਸ ਸਮੱਸਿਆ ਨੂੰ ਹੱਲ ਕਰਨ ਲਈ, ਤੁਸੀਂ ਇਸ ਐਪ ਲਈ ਟਿਕਾਣੇ ਨੂੰ ਬੰਦ ਕਰ ਸਕਦੇ ਹੋ।"</string>
-    <string name="dialog_location_message" product="device" msgid="6783678153382298295">"ਤੁਹਾਡੀ ਡੀਵਾਈਸ ਬੈਟਰੀ ਦਾ ਪ੍ਰਬੰਧਨ ਆਮ ਵਾਂਗ ਨਹੀਂ ਕਰ ਸਕਦੀ ਕਿਉਂਕਿ ਜਦੋਂ ਤੁਸੀਂ <xliff:g id="APP">%1$s</xliff:g> ਦੀ ਵਰਤੋਂ ਨਹੀਂ ਕਰ ਰਹੇ ਹੁੰਦੇ ਤਾਂ ਵੀ ਐਪ ਤੁਹਾਡਾ ਟਿਕਾਣਾ ਪੁੱਛਦੀ ਰਹਿੰਦੀ ਹੈ।\n\nਇਸ ਸਮੱਸਿਆ ਨੂੰ ਠੀਕ ਕਰਨ ਲਈ, ਤੁਸੀਂ ਇਸ ਐਪ ਲਈ ਟਿਕਾਣਾ ਬੰਦ ਕਰ ਸਕਦੇ ਹੋ।"</string>
+    <string name="dialog_location_message" product="device" msgid="6783678153382298295">"ਤੁਹਾਡਾ ਡੀਵਾਈਸ ਬੈਟਰੀ ਦਾ ਪ੍ਰਬੰਧਨ ਆਮ ਵਾਂਗ ਨਹੀਂ ਕਰ ਸਕਦਾ ਕਿਉਂਕਿ ਜਦੋਂ ਤੁਸੀਂ <xliff:g id="APP">%1$s</xliff:g> ਦੀ ਵਰਤੋਂ ਨਹੀਂ ਕਰ ਰਹੇ ਹੁੰਦੇ ਤਾਂ ਵੀ ਐਪ ਤੁਹਾਡਾ ਟਿਕਾਣਾ ਪੁੱਛਦੀ ਰਹਿੰਦੀ ਹੈ।\n\nਇਸ ਸਮੱਸਿਆ ਨੂੰ ਠੀਕ ਕਰਨ ਲਈ, ਤੁਸੀਂ ਇਸ ਐਪ ਲਈ ਟਿਕਾਣਾ ਬੰਦ ਕਰ ਸਕਦੇ ਹੋ।"</string>
     <string name="dialog_location_ok" msgid="4572391197601313986">"ਬੰਦ ਕਰੋ"</string>
     <string name="power_screen" msgid="3023346080675904613">"ਸਕ੍ਰੀਨ"</string>
     <string name="power_flashlight" msgid="7794409781003567614">"ਫਲੈਸ਼ਲਾਈਟ"</string>
     <string name="power_camera" msgid="4976286950934622605">"ਕੈਮਰਾ"</string>
-    <string name="power_wifi" msgid="1135085252964054957">"Wi‑Fi"</string>
-    <string name="power_bluetooth" msgid="4373329044379008289">"Bluetooth"</string>
-    <string name="power_cell" msgid="3392999761958982492">"ਮੋਬਾਈਲ ਨੈੱਟਵਰਕ ਸਟੈਂਡਬਾਇ"</string>
+    <string name="power_wifi" msgid="1135085252964054957">"ਵਾਈ‑ਫਾਈ"</string>
+    <string name="power_bluetooth" msgid="4373329044379008289">"ਬਲੂਟੁੱਥ"</string>
+    <string name="power_cell" msgid="3392999761958982492">"ਮੋਬਾਈਲ ਨੈੱਟਵਰਕ ਸਟੈਂਡਬਾਏ"</string>
     <string name="power_phone" msgid="5392641106474567277">"ਵੌਇਸ ਕਾਲਾਂ"</string>
-    <string name="power_idle" product="tablet" msgid="4612478572401640759">"ਟੈਬਲੇਟ ਨਿਸ਼ਕਿਰਿਆ"</string>
-    <string name="power_idle" product="default" msgid="9055659695602194990">"ਫੋਨ ਨਿਸ਼ਕਿਰਿਆ"</string>
+    <string name="power_idle" product="tablet" msgid="4612478572401640759">"ਟੈਬਲੈੱਟ ਨਿਸ਼ਕਿਰਿਆ"</string>
+    <string name="power_idle" product="default" msgid="9055659695602194990">"ਫ਼ੋਨ ਨਿਸ਼ਕਿਰਿਆ"</string>
     <string name="power_unaccounted" msgid="709925017022660740">"ਵਿਵਿਧ"</string>
     <string name="power_overcounted" msgid="2762354976171358445">"ਓਵਰ-ਕਾਉਂਟਿਡ"</string>
     <string name="power_apps" msgid="2043554781293951327">"ਐਪਾਂ"</string>
@@ -2031,15 +2043,15 @@
     <string name="usage_type_cpu_foreground" msgid="6500579611933211831">"CPU ਫੋਰਗ੍ਰਾਉਂਡ"</string>
     <string name="usage_type_wake_lock" msgid="5125438890233677880">"ਸਕਿਰਿਆ ਰੱਖੋ"</string>
     <string name="usage_type_gps" msgid="7989688715128160790">"GPS"</string>
-    <string name="usage_type_wifi_running" msgid="3134357198266380400">"Wi‑Fi ਚੱਲ ਰਿਹਾ ਹੈ"</string>
-    <string name="usage_type_phone" product="tablet" msgid="262638572890253393">"ਟੈਬਲੇਟ"</string>
-    <string name="usage_type_phone" product="default" msgid="9108247984998041853">"ਫੋਨ"</string>
-    <string name="usage_type_data_send" msgid="8971710128438365919">"ਮੋਬਾਈਲ ਪੈਕੇਟ ਭੇਜਿਆ ਗਿਆ"</string>
+    <string name="usage_type_wifi_running" msgid="3134357198266380400">"ਵਾਈ‑ਫਾਈ ਚੱਲ ਰਿਹਾ ਹੈ"</string>
+    <string name="usage_type_phone" product="tablet" msgid="262638572890253393">"ਟੈਬਲੈੱਟ"</string>
+    <string name="usage_type_phone" product="default" msgid="9108247984998041853">"ਫ਼ੋਨ ਕਰੋ"</string>
+    <string name="usage_type_data_send" msgid="8971710128438365919">"ਮੋਬਾਈਲ ਪੈਕੇਟ ਭੇਜੇ ਗਏ"</string>
     <string name="usage_type_data_recv" msgid="5468564329333954445">"ਮੋਬਾਈਲ ਪੈਕੇਟ ਪ੍ਰਾਪਤ ਕੀਤੇ"</string>
-    <string name="usage_type_radio_active" msgid="1732647857619420121">"ਮੋਬਾਈਲ ਰੇਡੀਓ ਸਕਿਰਿਆ"</string>
-    <string name="usage_type_data_wifi_send" msgid="1847552143597396162">"Wi‑Fi ਪੈਕੇਟ ਭੇਜੇ"</string>
-    <string name="usage_type_data_wifi_recv" msgid="5678475911549183829">"Wi‑Fi ਪੈਕੇਟ ਪ੍ਰਾਪਤ ਕੀਤੇ"</string>
-    <string name="usage_type_audio" msgid="6957269406840886290">"ਔਡੀਓ"</string>
+    <string name="usage_type_radio_active" msgid="1732647857619420121">"ਮੋਬਾਈਲ ਰੇਡੀਓ ਕਿਰਿਆਸ਼ੀਲ"</string>
+    <string name="usage_type_data_wifi_send" msgid="1847552143597396162">"ਵਾਈ‑ਫਾਈ ਪੈਕੇਟ ਭੇਜੇ"</string>
+    <string name="usage_type_data_wifi_recv" msgid="5678475911549183829">"ਵਾਈ‑ਫਾਈ ਪੈਕੇਟ ਪ੍ਰਾਪਤ ਕੀਤੇ"</string>
+    <string name="usage_type_audio" msgid="6957269406840886290">" ਆਡੀਓ"</string>
     <string name="usage_type_video" msgid="4295357792078579944">"ਵੀਡੀਓ"</string>
     <string name="usage_type_camera" msgid="8299433109956769757">"ਕੈਮਰਾ"</string>
     <string name="usage_type_flashlight" msgid="1516392356962208230">"ਫਲੈਸ਼ਲਾਈਟ"</string>
@@ -2052,26 +2064,26 @@
     <string name="battery_action_app_details" msgid="7861051816778419018">"ਐਪ ਜਾਣਕਾਰੀ"</string>
     <string name="battery_action_app_settings" msgid="4570481408106287454">"ਐਪ ਸੈਟਿੰਗਾਂ"</string>
     <string name="battery_action_display" msgid="7338551244519110831">"ਸਕ੍ਰੀਨ ਸੈਟਿੰਗਾਂ"</string>
-    <string name="battery_action_wifi" msgid="8181553479021841207">"Wi‑Fi ਸੈਟਿੰਗਾਂ"</string>
-    <string name="battery_action_bluetooth" msgid="8374789049507723142">"Bluetooth ਸੈਟਿੰਗਾਂ"</string>
+    <string name="battery_action_wifi" msgid="8181553479021841207">"ਵਾਈ-ਫਾਈ ਸੈਟਿੰਗਾਂ"</string>
+    <string name="battery_action_bluetooth" msgid="8374789049507723142">"ਬਲੂਟੁੱਥ ਸੈਟਿੰਗਾਂ"</string>
     <string name="battery_desc_voice" msgid="8980322055722959211">"ਵੌਇਸ ਕਾਲਾਂ ਵੱਲੋਂ ਵਰਤੀ ਗਈ ਬੈਟਰੀ"</string>
-    <string name="battery_desc_standby" product="tablet" msgid="6284747418668280364">"ਜਦੋਂ ਟੈਬਲੇਟ ਨਿਸ਼ਕਿਰਿਆ ਹੁੰਦੀ ਹੈ ਤਾਂ ਵਰਤੀ ਗਈ ਬੈਟਰੀ"</string>
-    <string name="battery_desc_standby" product="default" msgid="3009080001948091424">"ਫੋਨ ਦੇ ਨਿਸ਼ਕਿਰਿਆ ਹੋਣ ਵੇਲੇ ਵਰਤੀ ਗਈ ਬੈਟਰੀ"</string>
+    <string name="battery_desc_standby" product="tablet" msgid="6284747418668280364">"ਜਦੋਂ ਟੈਬਲੈੱਟ ਨਿਸ਼ਕਿਰਿਆ ਹੁੰਦਾ ਹੈ ਤਾਂ ਵਰਤੀ ਗਈ ਬੈਟਰੀ"</string>
+    <string name="battery_desc_standby" product="default" msgid="3009080001948091424">"ਫ਼ੋਨ ਦੇ ਨਿਸ਼ਕਿਰਿਆ ਹੋਣ ਵੇਲੇ ਵਰਤੀ ਗਈ ਬੈਟਰੀ"</string>
     <string name="battery_desc_radio" msgid="5479196477223185367">"ਸੈਲ ਰੇਡੀਓ ਵੱਲੋਂ ਵਰਤੀ ਗਈ ਬੈਟਰੀ"</string>
-    <string name="battery_sugg_radio" msgid="8211336978326295047">"ਕੋਈ ਸੈਲ ਕਵਰੇਜ ਨਹੀਂ ਵਾਲੇ ਖੇਤਰਾਂ ਵਿੱਚ ਪਾਵਰ ਸੁਰੱਖਿਅਤ ਕਰਨ ਲਈ ਏਅਰਪਲੇਨ ਮੋਡ ਤੇ ਸਵਿਚ ਕਰੋ"</string>
+    <string name="battery_sugg_radio" msgid="8211336978326295047">"ਕੋਈ ਸੈੱਲ ਕਵਰੇਜ ਨਹੀਂ ਵਾਲੇ ਖੇਤਰਾਂ ਵਿੱਚ ਪਾਵਰ ਰੱਖਿਅਤ ਕਰਨ ਲਈ ਹਵਾਈ ਜਹਾਜ਼ ਮੋਡ \'ਤੇ ਬਦਲੋ"</string>
     <string name="battery_desc_flashlight" msgid="2908579430841025494">"ਫਲੈਸ਼ਲਾਈਟ ਵੱਲੋਂ ਵਰਤੀ ਗਈ ਬੈਟਰੀ"</string>
     <string name="battery_desc_camera" msgid="7375389919760613499">"ਕੈਮਰੇ ਵੱਲੋਂ ਵਰਤੀ ਗਈ ਬੈਟਰੀ"</string>
     <string name="battery_desc_display" msgid="5432795282958076557">"ਡਿਸਪਲੇ ਅਤੇ ਬੈਕਲਾਈਟ ਵੱਲੋਂ ਵਰਤੀ ਗਈ ਬੈਟਰੀ"</string>
     <string name="battery_sugg_display" msgid="3370202402045141760">"ਸਕ੍ਰੀਨ ਚਮਕ ਅਤੇ/ਜਾਂ ਸਕ੍ਰੀਨ ਟਾਈਮਆਉਟ ਘਟਾਓ"</string>
-    <string name="battery_desc_wifi" msgid="2375567464707394131">"Wi‑Fi ਵੱਲੋਂ ਵਰਤੀ ਗਈ ਬੈਟਰੀ"</string>
-    <string name="battery_sugg_wifi" msgid="7776093125855397043">"Wi‑Fi ਬੰਦ ਕਰੋ ਜਦੋਂ ਇਸਨੂੰ ਵਰਤ ਨਾ ਰਹੇ ਹੋਵੋ ਜਾਂ ਜਦੋਂ ਇਹ ਉਪਲਬਧ ਨਾ ਹੋਵੇ"</string>
-    <string name="battery_desc_bluetooth" msgid="8069070756186680367">"Bluetooth ਵੱਲੋਂ ਵਰਤੀ ਗਈ ਬੈਟਰੀ"</string>
+    <string name="battery_desc_wifi" msgid="2375567464707394131">"ਵਾਈ‑ਫਾਈ ਵੱਲੋਂ ਵਰਤੀ ਗਈ ਬੈਟਰੀ"</string>
+    <string name="battery_sugg_wifi" msgid="7776093125855397043">"ਵਾਈ‑ਫਾਈ ਬੰਦ ਕਰੋ ਜਦੋਂ ਇਸਨੂੰ ਵਰਤ ਨਾ ਰਹੇ ਹੋਵੋ ਜਾਂ ਜਦੋਂ ਇਹ ਉਪਲਬਧ ਨਾ ਹੋਵੇ"</string>
+    <string name="battery_desc_bluetooth" msgid="8069070756186680367">"ਬਲੂਟੁੱਥ ਵੱਲੋਂ ਵਰਤੀ ਗਈ ਬੈਟਰੀ"</string>
     <string name="battery_sugg_bluetooth_basic" msgid="4565141162650835009">"ਜਦੋਂ ਤੁਸੀਂ Bluetooth ਨਾ ਵਰਤ ਰਹੇ ਹੋਵੋ ਤਾਂ ਇਸਨੂੰ ਬੰਦ ਕਰੋ"</string>
-    <string name="battery_sugg_bluetooth_headset" msgid="4071352514714259230">"ਇੱਕ ਵੱਖਰੀ Bluetooth ਡੀਵਾਈਸ ਨਾਲ ਕਨੈਕਟ ਕਰਨ ਦੀ ਕੋਸ਼ਿਸ਼ ਕਰ ਰਿਹਾ ਹੈ"</string>
+    <string name="battery_sugg_bluetooth_headset" msgid="4071352514714259230">"ਇੱਕ ਵੱਖਰੇ ਬਲੂਟੁੱਥ ਡੀਵਾਈਸ ਨਾਲ ਕਨੈਕਟ ਕਰਨ ਦੀ ਕੋਸ਼ਿਸ਼ ਕਰ ਰਿਹਾ ਹੈ"</string>
     <string name="battery_desc_apps" msgid="8530418792605735226">"ਐਪ ਵੱਲੋਂ ਵਰਤੀ ਗਈ ਬੈਟਰੀ"</string>
-    <string name="battery_sugg_apps_info" msgid="6907588126789841231">"ਐਪ ਰੋਕੋ ਜਾਂ ਅਣਇੰਸਟੌਲ ਕਰੋ"</string>
+    <string name="battery_sugg_apps_info" msgid="6907588126789841231">"ਐਪ ਰੋਕੋ ਜਾਂ ਅਣਸਥਾਪਤ ਕਰੋ"</string>
     <string name="battery_sugg_apps_gps" msgid="5959067516281866135">"ਬੈਟਰੀ-ਬਚਤ ਮੋਡ ਚੁਣੋ"</string>
-    <string name="battery_sugg_apps_settings" msgid="3974902365643634514">"ਐਪ ਬੈਟਰੀ ਵਰਤੋਂ ਨੂੰ ਘਟਾਉਣ ਲਈ ਸੈਟਿੰਗਾਂ ਆੱਫਰ ਕਰ ਸਕਦੇ ਹਨ"</string>
+    <string name="battery_sugg_apps_settings" msgid="3974902365643634514">"ਐਪ ਬੈਟਰੀ ਵਰਤੋਂ ਨੂੰ ਘਟਾਉਣ ਲਈ ਸੈਟਿੰਗਾਂ ਪੇਸ਼ਕਸ਼ ਕਰ ਸਕਦੇ ਹਨ"</string>
     <string name="battery_desc_users" msgid="7682989161885027823">"ਉਪਭੋਗਤਾ ਵੱਲੋਂ ਵਰਤੀ ਗਈ ਬੈਟਰੀ"</string>
     <string name="battery_desc_unaccounted" msgid="7404256448541818019">"ਵਿਵਿਧ ਪਾਵਰ ਵਰਤੋਂ"</string>
     <string name="battery_msg_unaccounted" msgid="1963583522633067961">"ਬੈਟਰੀ ਵਰਤੋਂ ਪਾਵਰ ਵਰਤੋਂ ਦਾ ਇੱਕ ਅਨੁਮਾਨ ਹੈ ਅਤੇ ਇਸ ਵਿੱਚ ਬੈਟਰੀ ਖ਼ਰਚ ਦਾ ਹਰੇਕ ਸਰੋਤ ਸ਼ਾਮਲ ਨਹੀਂ ਹੁੰਦਾ। ਵਿਵਿਧ ਹਿਸਾਬ ਲਗਾਈ ਅਨੁਮਾਨਿਤ ਪਾਵਰ ਵਰਤੋਂ ਅਤੇ ਬੈਟਰੀ ਤੇ ਦੇਖੇ ਗਏ ਅਸਲੀ ਖ਼ਰਚ ਵਿਚਕਾਰ ਅੰਤਰ ਹੈ।"</string>
@@ -2083,8 +2095,8 @@
     <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="67169726550144016">"ਬੈਟਰੀ ਵਰਤੋਂ ਸਬੰਧੀ ਡੈਟਾ ਅਨੁਮਾਨਿਤ ਹੈ ਅਤੇ ਵਰਤੋਂ ਦੇ ਆਧਾਰ \'ਤੇ ਬਦਲ ਸਕਦਾ ਹੈ"</string>
+    <string name="battery_last_full_charge" msgid="7151251641099019361">"ਪਿਛਲੀ ਵਾਰ ਪੂਰਾ ਚਾਰਜ ਕੀਤਾ:"</string>
+    <string name="battery_footer_summary" msgid="67169726550144016">"ਬੈਟਰੀ ਵਰਤੋਂ ਸਬੰਧੀ ਡਾਟਾ ਅਨੁਮਾਨਿਤ ਹੈ ਅਤੇ ਵਰਤੋਂ ਦੇ ਆਧਾਰ \'ਤੇ ਬਦਲ ਸਕਦਾ ਹੈ"</string>
     <string name="battery_detail_foreground" msgid="3350401514602032183">"ਕਿਰਿਆਸ਼ੀਲ ਵਰਤੋਂ ਵਿੱਚ ਹੋਣ ਦੌਰਾਨ"</string>
     <string name="battery_detail_background" msgid="1929644393553768999">"ਬੈਕਗ੍ਰਾਊਂਡ ਵਿੱਚ ਹੋਣ ਦੌਰਾਨ"</string>
     <string name="battery_detail_power_usage" msgid="6485766868610469101">"ਬੈਟਰੀ ਵਰਤੋਂ"</string>
@@ -2106,7 +2118,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>
@@ -2122,7 +2134,7 @@
     <string name="process_stats_os_cache" msgid="6432533624875078233">"ਕੈਚਿਸ"</string>
     <string name="process_stats_ram_use" msgid="976912589127397307">"RAM ਵਰਤੋਂ"</string>
     <string name="process_stats_bg_ram_use" msgid="5398191511030462404">"RAM ਵਰਤੋਂ (ਪਿਛੋਕੜ)"</string>
-    <string name="process_stats_run_time" msgid="6520628955709369115">"ਰਨ ਸਮਾਂ"</string>
+    <string name="process_stats_run_time" msgid="6520628955709369115">"ਚੱਲਣ ਦਾ ਸਮਾਂ"</string>
     <string name="processes_subtitle" msgid="6827502409379462438">"ਪ੍ਰਕਿਰਿਆਵਾਂ"</string>
     <string name="services_subtitle" msgid="4296402367067266425">"ਸੇਵਾਵਾਂ"</string>
     <string name="menu_proc_stats_duration" msgid="2323483592994720196">"ਮਿਆਦ"</string>
@@ -2148,15 +2160,15 @@
     <string name="menu_proc_stats_type_foreground" msgid="2286182659954958586">"ਫੋਰਗ੍ਰਾਊਂਡ"</string>
     <string name="menu_proc_stats_type_cached" msgid="5084272779786820693">"ਕੈਚ ਕੀਤੀ"</string>
     <string name="voice_input_output_settings" msgid="1336135218350444783">"ਵੌਇਸ ਇਨਪੁਟ &amp; ਆਊਟਪੁਟ"</string>
-    <string name="voice_input_output_settings_title" msgid="2442850635048676991">"ਵੌਇਸ ਇਨਪੁਟ &amp; ਆਊਟਪੁਟ ਸੈਟਿੰਗਾਂ"</string>
+    <string name="voice_input_output_settings_title" msgid="2442850635048676991">"ਵੌਇਸ ਇਨਪੁੱਟ &amp; ਆਉਟਪੁੱਟ ਸੈਟਿੰਗਾਂ"</string>
     <string name="voice_search_settings_title" msgid="2775469246913196536">"ਵੌਇਸ ਖੋਜ"</string>
     <string name="keyboard_settings_title" msgid="5080115226780201234">"Android ਕੀ-ਬੋਰਡ"</string>
-    <string name="voice_input_settings" msgid="1099937800539324567">"ਵੌਇਸ ਇਨਪੁਟ ਸੈਟਿੰਗਾਂ"</string>
+    <string name="voice_input_settings" msgid="1099937800539324567">"ਵੌਇਸ ਇਨਪੁੱਟ ਸੈਟਿੰਗਾਂ"</string>
     <string name="voice_input_settings_title" msgid="2676028028084981891">"ਵੌਇਸ ਇਨਪੁਟ"</string>
     <string name="voice_service_preference_section_title" msgid="3778706644257601021">"ਵੌਇਸ ਇਨਪੁਟ ਸੇਵਾਵਾਂ"</string>
     <string name="voice_interactor_preference_summary" msgid="1801414022026937190">"ਪੂਰਾ ਹੌਟਵਰਡ ਅਤੇ ਇੰਟਰੈਕਸ਼ਨ"</string>
-    <string name="voice_recognizer_preference_summary" msgid="669880813593690527">"ਸਧਾਰਨ ਸਪੀਚ ਟੂ ਟੈਕਸਟ"</string>
-    <string name="voice_interaction_security_warning" msgid="6378608263983737325">"ਇਹ ਵੌਇਸ ਇਨਪੁਟ ਸੇਵਾ ਹਮੇਸ਼ਾਂ-ਚਾਲੂ ਵੌਇਸ ਨਿਰੀਖਣ ਪਰਫੌਰਮ ਕਕਰ ਵਿੱਚ ਅਤੇ ਤੁਹਾਡੇ ਵੱਲੋਂ ਵੌਇਸ ਸਮਰਥਿਤ ਐਪਲੀਕੇਸ਼ਨਾਂ ਤੇ ਨਿਯੰਤਰਣ ਪਾਉਣ ਵਿੱਚ ਸਮਰੱਥ ਹੋਵੇਗੀ। ਇਹ <xliff:g id="VOICE_INPUT_SERVICE_APP_NAME">%s</xliff:g> ਐਪਲੀਕੇਸ਼ਨ ਤੋਂ ਆਉਂਦੀ ਹੈ। ਕੀ ਇਸ ਸੇਵਾ ਦੀ ਵਰਤੋਂ ਨੂੰ ਸਮਰੱਥ ਬਣਾਉਣਾ ਹੈ?"</string>
+    <string name="voice_recognizer_preference_summary" msgid="669880813593690527">"ਸਧਾਰਨ ਬੋਲੀ ਤੋਂ ਲਿਖਤ"</string>
+    <string name="voice_interaction_security_warning" msgid="6378608263983737325">"ਇਹ ਵੌਇਸ ਇਨਪੁੱਟ ਸੇਵਾ ਹਮੇਸ਼ਾਂ-ਚਾਲੂ ਵੌਇਸ ਨਿਰੀਖਣ ਪਰਫੌਰਮ ਕਰਨ ਵਿੱਚ ਅਤੇ ਤੁਹਾਡੇ ਵੱਲੋਂ ਵੌਇਸ ਸਮਰਥਿਤ ਐਪਲੀਕੇਸ਼ਨਾਂ ਤੇ ਨਿਯੰਤਰਣ ਪਾਉਣ ਵਿੱਚ ਸਮਰੱਥ ਹੋਵੇਗੀ। ਇਹ <xliff:g id="VOICE_INPUT_SERVICE_APP_NAME">%s</xliff:g>ਐਪਲੀਕੇਸ਼ਨ ਤੋਂ ਆਉਂਦੀ ਹੈ। ਕੀ ਇਸ ਸੇਵਾ ਦੀ ਵਰਤੋਂ ਨੂੰ ਚਾਲੂ ਕਰਨਾ ਹੈ?"</string>
     <string name="tts_engine_preference_title" msgid="1578826947311494239">"ਤਰਜੀਹੀ ਇੰਜਣ"</string>
     <string name="tts_engine_settings_title" msgid="6886964122861384818">"ਇੰਜਣ ਦੀਆਂ ਸੈਟਿੰਗਾਂ"</string>
     <string name="tts_sliders_title" msgid="992059150784095263">"ਬੋਲਣ ਦੀ ਗਤੀ ਅਤੇ ਸੁਰ"</string>
@@ -2170,15 +2182,15 @@
     <string name="tts_reset" msgid="2661752909256313270">"ਰੀਸੈੱਟ ਕਰੋ"</string>
     <string name="tts_play" msgid="2628469503798633884">"ਚਲਾਓ"</string>
     <string name="gadget_title" msgid="5519037532720577836">"ਪਾਵਰ ਨਿਯੰਤਰਣ"</string>
-    <string name="gadget_toggle_wifi" msgid="319262861956544493">"Wi‑Fi ਸੈਟਿੰਗ ਅਪਡੇਟ ਕਰ ਰਿਹਾ ਹੈ"</string>
-    <string name="gadget_toggle_bluetooth" msgid="7538903239807020826">"Bluetooth ਸੈਟਿੰਗ ਅਪਡੇਟ ਕਰ ਰਿਹਾ ਹੈ"</string>
+    <string name="gadget_toggle_wifi" msgid="319262861956544493">"ਵਾਈ‑ਫਾਈ ਸੈਟਿੰਗ ਅੱਪਡੇਟ ਹੋ ਰਹੀ ਹੈ"</string>
+    <string name="gadget_toggle_bluetooth" msgid="7538903239807020826">"Bluetooth ਸੈਟਿੰਗ ਅੱਪਡੇਟ ਕਰ ਰਿਹਾ ਹੈ"</string>
     <string name="gadget_state_template" msgid="5156935629902649932">"<xliff:g id="ID_1">%1$s</xliff:g> <xliff:g id="ID_2">%2$s</xliff:g>"</string>
     <string name="gadget_state_on" msgid="6909119593004937688">"ਚਾਲੂ"</string>
     <string name="gadget_state_off" msgid="5220212352953066317">"ਬੰਦ"</string>
     <string name="gadget_state_turning_on" msgid="3395992057029439039">"ਚਾਲੂ ਕਰ ਰਿਹਾ ਹੈ"</string>
     <string name="gadget_state_turning_off" msgid="2395546048102176157">"ਬੰਦ ਕਰ ਰਿਹਾ ਹੈ"</string>
-    <string name="gadget_wifi" msgid="4712584536500629417">"Wi‑Fi"</string>
-    <string name="gadget_bluetooth" msgid="8998572807378694410">"Bluetooth"</string>
+    <string name="gadget_wifi" msgid="4712584536500629417">"ਵਾਈ‑ਫਾਈ"</string>
+    <string name="gadget_bluetooth" msgid="8998572807378694410">"ਬਲੂਟੁੱਥ"</string>
     <string name="gadget_location" msgid="2974757497945178165">"ਟਿਕਾਣਾ"</string>
     <string name="gadget_sync" msgid="858895763714222152">"ਸਿੰਕ ਕਰੋ"</string>
     <string name="gadget_brightness_template" msgid="930541920933123603">"ਚਮਕ <xliff:g id="ID_1">%1$s</xliff:g>"</string>
@@ -2189,52 +2201,52 @@
     <string name="vpn_settings_title" msgid="5662579425832406705">"VPN"</string>
     <string name="credentials_title" msgid="4446234003860769883">"ਕ੍ਰੀਡੈਂਸ਼ੀਅਲ ਸਟੋਰੇਜ"</string>
     <string name="credentials_install" product="nosdcard" msgid="466093273825150847">"ਸਟੋਰੇਜ ਤੋਂ ਸਥਾਪਤ ਕਰੋ"</string>
-    <string name="credentials_install" product="default" msgid="953914549998062317">"SD ਕਾਰਡ ਤੋਂ ਇੰਸਟੌਲ ਕਰੋ"</string>
-    <string name="credentials_install_summary" product="nosdcard" msgid="4220422806818210676">"ਸਟੋਰੇਜ ਤੋਂ ਸਰਟੀਫਿਕੇਟ ਸਥਾਪਤ ਕਰੋ"</string>
-    <string name="credentials_install_summary" product="default" msgid="5737658257407822713">"SD ਕਾਰਡ ਤੋਂ ਸਰਟੀਫਿਕੇਟ ਇੰਸਟੌਲ ਕਰੋ"</string>
+    <string name="credentials_install" product="default" msgid="953914549998062317">"SD ਕਾਰਡ ਤੋਂ ਸਥਾਪਤ ਕਰੋ"</string>
+    <string name="credentials_install_summary" product="nosdcard" msgid="4220422806818210676">"ਸਟੋਰੇਜ ਤੋਂ ਪ੍ਰਮਾਣ-ਪੱਤਰ ਸਥਾਪਤ ਕਰੋ"</string>
+    <string name="credentials_install_summary" product="default" msgid="5737658257407822713">"SD ਕਾਰਡ ਤੋਂ ਪ੍ਰਮਾਣ-ਪੱਤਰ ਸਥਾਪਤ ਕਰੋ"</string>
     <string name="credentials_reset" msgid="3239382277144980418">"ਕ੍ਰੀਡੈਂਸ਼ੀਅਲ ਹਟਾਓ"</string>
     <string name="credentials_reset_summary" msgid="3369361230171260282">"ਸਾਰੇ ਸਰਟੀਫਿਕੇਟ ਹਟਾਓ"</string>
     <string name="trusted_credentials" msgid="4266945289534242402">"ਭਰੋਸੇਯੋਗ ਕ੍ਰੀਡੈਂਸ਼ੀਅਲ"</string>
-    <string name="trusted_credentials_summary" msgid="6735221351155686632">"ਭਰੋਸੇਯੋਗ CA ਸਰਟੀਫਿਕੇਟ ਪ੍ਰਦਰਸ਼ਿਤ ਕਰੋ"</string>
+    <string name="trusted_credentials_summary" msgid="6735221351155686632">"ਭਰੋਸੇਯੋਗ CA ਪ੍ਰਮਾਣ-ਪੱਤਰ ਪ੍ਰਦਰਸ਼ਿਤ ਕਰੋ"</string>
     <string name="user_credentials" msgid="3719013347787187083">"ਵਰਤੋਂਕਾਰ ਕ੍ਰੀਡੈਂਸ਼ੀਅਲ"</string>
-    <string name="user_credentials_summary" msgid="7271228342106080167">"ਸਟੋਰ ਕੀਤੇ ਕ੍ਰੀਡੈਂਸ਼ੀਅਲ ਵੇਖੋ ਅਤੇ ਸੋਧੋ"</string>
-    <string name="advanced_security_title" msgid="2434776238010578865">"ਉੱਨਤ"</string>
-    <string name="credential_storage_type" msgid="8629968543494001364">"ਸਟੋਰੇਜ ਦੀ ਕਿਸਮ"</string>
+    <string name="user_credentials_summary" msgid="7271228342106080167">"ਸਟੋਰ ਕੀਤੇ ਕ੍ਰੀਡੈਂਸ਼ੀਅਲ ਦੇਖੋ ਅਤੇ ਸੋਧੋ"</string>
+    <string name="advanced_security_title" msgid="2434776238010578865">"ਵਿਕਸਿਤ"</string>
+    <string name="credential_storage_type" msgid="8629968543494001364">"ਸਟੋਰੇਜ ਦਾ ਪ੍ਰਕਾਰ"</string>
     <string name="credential_storage_type_hardware" msgid="6077193544333904427">"ਹਾਰਡਵੇਅਰ-ਸਮਰਥਿਤ"</string>
-    <string name="credential_storage_type_software" msgid="4403117271207715378">"ਕੇਵਲ ਸੌਫਟਵੇਅਰ"</string>
-    <string name="credentials_settings_not_available" msgid="7968275634486624215">"ਇਸ ਉਪਭੋਗਤਾ ਲਈ ਕ੍ਰੈਡੈਂਸ਼ੀਅਲ ਉਪਲਬਧ ਨਹੀਂ ਹਨ"</string>
+    <string name="credential_storage_type_software" msgid="4403117271207715378">"ਕੇਵਲ ਸਾਫਟਵੇਅਰ"</string>
+    <string name="credentials_settings_not_available" msgid="7968275634486624215">"ਇਸ ਵਰਤੋਂਕਾਰ ਲਈ ਕ੍ਰੀਡੈਂਸ਼ੀਅਲ ਉਪਲਬਧ ਨਹੀਂ ਹਨ"</string>
     <string name="credential_for_vpn_and_apps" msgid="4168197158768443365">"VPN ਅਤੇ ਐਪਾਂ ਲਈ ਸਥਾਪਤ ਕੀਤਾ ਗਿਆ"</string>
-    <string name="credential_for_wifi" msgid="6228425986551591864">"Wi-Fi ਲਈ ਸਥਾਪਤ ਕੀਤਾ ਗਿਆ"</string>
+    <string name="credential_for_wifi" msgid="6228425986551591864">"ਵਾਈ-ਫਾਈ ਲਈ ਸਥਾਪਤ ਕੀਤਾ ਗਿਆ"</string>
     <string name="credentials_unlock" msgid="385427939577366499"></string>
-    <string name="credentials_unlock_hint" msgid="2301301378040499348">"ਕ੍ਰੈਡੈਂਸ਼ੀਅਲ ਸਟੋਰੇਜ ਲਈ ਪਾਸਵਰਡ ਟਾਈਪ ਕਰੋ।"</string>
+    <string name="credentials_unlock_hint" msgid="2301301378040499348">"ਕ੍ਰੀਡੈਂਸ਼ੀਅਲ ਸਟੋਰੇਜ ਲਈ ਪਾਸਵਰਡ ਟਾਈਪ ਕਰੋ।"</string>
     <string name="credentials_old_password" msgid="7553393815538684028">"ਵਰਤਮਾਨ ਪਾਸਵਰਡ:"</string>
     <string name="credentials_reset_hint" msgid="6297256880896133631">"ਕੀ ਸਾਰੀਆਂ ਸਮੱਗਰੀਆਂ ਹਟਾਉਣੀਆਂ ਹਨ?"</string>
-    <string name="credentials_password_too_short" msgid="7502749986405522663">"ਪਾਸਵਰਡ ਵਿੱਚ ਘੱਟੋ-ਘੱਟ 8 ਅੱਖਰ-ਚਿੰਨ੍ਹ ਹੋਣੇ ਚਾਹੀਦੇ ਹਨ।"</string>
-    <string name="credentials_wrong_password" msgid="2541932597104054807">"ਗ਼ਲਤ ਪਾਸਵਰਡ।"</string>
-    <string name="credentials_reset_warning" msgid="5320653011511797600">"ਗ਼ਲਤ ਪਾਸਵਰਡ। ਕ੍ਰੈਡੈਂਸ਼ੀਅਲ ਸਟੋਰੇਜ ਮਿਟਾਉਣ ਤੋਂ ਪਹਿਲਾਂ ਤੁਹਾਡੇ ਕੋਲ ਇੱਕ ਹੋਰ ਮੌਕਾ ਹੈ।"</string>
-    <string name="credentials_reset_warning_plural" msgid="6514085665301095279">"ਗ਼ਲਤ ਪਾਸਵਰਡ। ਕ੍ਰੈਡੈਂਸ਼ੀਅਲ ਸਟੋਰੇਜ ਮਿਟਾਉਣ ਤੋਂ ਪਹਿਲਾਂ ਤੁਹਾਡੇ ਕੋਲ <xliff:g id="NUMBER">%1$d</xliff:g> ਹੋਰ ਮੌਕੇ ਹਨ।"</string>
-    <string name="credentials_erased" msgid="2907836028586342969">"ਪ੍ਰਮਾਣੀਕਰਨ ਸਟੋਰੇਜ ਮਿਟਾਈ ਗਈ ਹੈ।"</string>
-    <string name="credentials_not_erased" msgid="7685932772284216097">"ਕ੍ਰੈਡੈਂਸ਼ੀਅਲ ਸਟੋਰੇਜ ਨਹੀਂ ਮਿਟਾਈ ਜਾ ਸਕੀ।"</string>
-    <string name="credentials_enabled" msgid="7588607413349978930">"ਪ੍ਰਮਾਣੀਕਰਨ ਸਟੋਰੇਜ ਸਮਰਥਿਤ ਹੈ।"</string>
-    <string name="credentials_configure_lock_screen_hint" msgid="6757119179588664966">"ਤੁਹਾਨੂੰ ਕ੍ਰੈਡੈਂਸ਼ੀਅਲ ਸਟੋਰੇਜ ਵਰਤ ਸਕਣ ਤੋਂ ਪਹਿਲਾਂ ਇੱਕ ਲੌਕ ਸਕ੍ਰੀਨ PIN ਜਾਂ ਪਾਸਵਰਡ ਸੈੱਟ ਕਰਨ ਦੀ ਲੋੜ ਹੈ"</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="8058230497337529036">"ਤੁਹਾਡੇ ਵੱਲੋਂ ਕ੍ਰੀਡੈਂਸ਼ੀਅਲ ਸਟੋਰੇਜ ਵਰਤੇ ਜਾ ਸਕਣ ਤੋਂ ਪਹਿਲਾਂ, ਤੁਹਾਡੇ ਡੀਵਾਈਸ \'ਤੇ ਸੁਰੱਖਿਅਤ ਸਕ੍ਰੀਨ ਲਾਕ ਹੋਣਾ ਲਾਜ਼ਮੀ ਹੈ"</string>
+    <string name="credentials_configure_lock_screen_button" msgid="253239765216055321">"ਲਾਕ ਸੈੱਟ ਕਰੋ"</string>
     <string name="usage_access_title" msgid="332333405495457839">"ਵਰਤੋਂ ਤੱਕ ਪਹੁੰਚ ਵਾਲੀਆਂ ਐਪਾਂ"</string>
-    <string name="emergency_tone_title" msgid="1055954530111587114">"ਐਮਰਜੈਂਸੀ ਟੋਨ"</string>
-    <string name="emergency_tone_summary" msgid="722259232924572153">"ਜਦੋਂ ਇੱਕ ਐਮਰਜੈਂਸੀ ਕਾਲ ਕੀਤੀ ਜਾਂਦੀ ਹੈ ਤਾਂ ਵਿਵਹਾਰ ਸੈੱਟ ਕਰੋ"</string>
+    <string name="emergency_tone_title" msgid="1055954530111587114">"ਸੰਕਟਕਾਲੀਨ ਟੋਨ"</string>
+    <string name="emergency_tone_summary" msgid="722259232924572153">"ਜਦੋਂ ਇੱਕ ਸੰਕਟਕਾਲੀਨ ਕਾਲ ਕੀਤੀ ਜਾਂਦੀ ਹੈ ਤਾਂ ਵਿਵਹਾਰ ਸੈੱਟ ਕਰੋ"</string>
     <string name="privacy_settings_title" msgid="2978878794187459190">"ਬੈਕਅੱਪ"</string>
-    <string name="backup_section_title" msgid="7952232291452882740">"ਬੈਕਅਪ &amp; ਰੀਸਟੋਰ ਕਰੋ"</string>
-    <string name="personal_data_section_title" msgid="7815209034443782061">"ਨਿੱਜੀ ਡੈਟਾ"</string>
-    <string name="backup_data_title" msgid="1239105919852668016">"ਮੇਰਾ ਡੈਟਾ ਬੈਕ ਅਪ ਕਰੋ"</string>
-    <string name="backup_data_summary" msgid="708773323451655666">"Google ਸਰਵਰਾਂ ਤੇ ਐਪ ਡੈਟਾ, Wi‑Fi ਪਾਸਵਰਡਾਂ ਅਤੇ ਹੋਰ ਸੈਟਿੰਗਾਂ ਬੈਕ ਅਪ ਕਰੋ"</string>
-    <string name="backup_configure_account_title" msgid="3790872965773196615">"ਬੈਕਅਪ ਖਾਤਾ"</string>
-    <string name="include_app_data_title" msgid="2829970132260278394">"ਐਪ ਡੈਟਾ ਸ਼ਾਮਲ ਕਰੋ"</string>
+    <string name="backup_section_title" msgid="7952232291452882740">"ਬੈਕਅੱਪ &amp; ਰੀਸਟੋਰ ਕਰੋ"</string>
+    <string name="personal_data_section_title" msgid="7815209034443782061">"ਨਿੱਜੀ  ਡਾਟਾ"</string>
+    <string name="backup_data_title" msgid="1239105919852668016">"ਮੇਰਾ ਡਾਟਾ ਬੈਕ ਅੱਪ ਲਓ"</string>
+    <string name="backup_data_summary" msgid="708773323451655666">"Google ਸਰਵਰਾਂ ਤੇ ਐਪ ਡਾਟਾ, Wi‑Fi ਪਾਸਵਰਡਾਂ ਅਤੇ ਹੋਰ ਸੈਟਿੰਗਾਂ ਬੈਕ ਅੱਪ ਲਓ"</string>
+    <string name="backup_configure_account_title" msgid="3790872965773196615">"ਬੈਕਅੱਪ ਖਾਤਾ"</string>
+    <string name="include_app_data_title" msgid="2829970132260278394">"ਐਪ  ਡਾਟਾ  ਸ਼ਾਮਲ ਕਰੋ"</string>
     <string name="auto_restore_title" msgid="5397528966329126506">"ਆਟੋਮੈਟਿਕ ਰੀਸਟੋਰ ਕਰੋ"</string>
-    <string name="auto_restore_summary" msgid="4235615056371993807">"ਇੱਕ ਐਪ ਨੂੰ ਦੁਬਾਰਾ ਇੰਸਟੌਲ ਕਰਦੇ ਸਮੇਂ, ਬੈਕ ਅਪ ਸੈਟਿੰਗਾਂ ਅਤੇ ਡੈਟਾ ਰੀਸਟੋਰ ਕਰੋ"</string>
+    <string name="auto_restore_summary" msgid="4235615056371993807">"ਇੱਕ ਐਪ ਨੂੰ ਦੁਬਾਰਾ ਸਥਾਪਤ ਕਰਦੇ ਸਮੇਂ, ਬੈਕ ਅੱਪ ਸੈਟਿੰਗਾਂ ਅਤੇ ਡਾਟਾ ਰੀਸਟੋਰ ਕਰੋ"</string>
     <string name="backup_inactive_title" msgid="685838037986644604">"ਬੈਕਅੱਪ ਸੇਵਾ ਕਿਰਿਆਸ਼ੀਲ ਨਹੀਂ"</string>
-    <string name="backup_configure_account_default_summary" msgid="2436933224764745553">"ਕੋਈ ਖਾਤਾ ਇਸ ਵੇਲੇ ਬੈਕ ਅਪ ਕੀਤਾ ਡੈਟਾ ਸਟੋਰ ਨਹੀਂ ਕਰ ਰਿਹਾ ਹੈ"</string>
+    <string name="backup_configure_account_default_summary" msgid="2436933224764745553">"ਵਰਤਮਾਨ ਤੌਰ \'ਤੇ ਕੋਈ ਖਾਤਾ ਉਸ ਡਾਟਾ ਨੂੰ ਸਟੋਰ ਨਹੀਂ ਕਰ ਰਿਹਾ ਹੈ, ਜਿਸ ਦਾ ਬੈਕਅੱਪ ਲਿਆ ਗਿਆ ਹੈ"</string>
     <string name="backup_erase_dialog_title" msgid="1027640829482174106"></string>
-    <string name="backup_erase_dialog_message" msgid="5221011285568343155">"ਆਪਣੇ Wi‑Fi ਪਾਸਵਰਡਾਂ, ਬੁੱਕਮਾਰਕਾਂ, ਹੋਰ ਸੈਟਿੰਗਾਂ ਅਤੇ ਐਪ ਡੈਟਾ ਨੂੰ ਬੈਕ ਅਪ ਕਰਨਾ ਬੰਦ ਕਰਨਾ ਹੈ ਅਤੇ Google ਸਰਵਰਾਂ ਦੀਆਂ ਸਾਰੀਆਂ ਕਾਪੀਆਂ ਮਿਟਾਉਣੀਆਂ ਹਨ?"</string>
-    <string name="fullbackup_erase_dialog_message" msgid="694766389396659626">"ਕੀ ਡੀਵਾਈਸ ਡੇਟਾ (ਜਿਵੇਂ ਕਿ Wi-Fi ਪਾਸਵਰਡ ਅਤੇ ਕਲ ਇਤਿਹਾਸ) ਅਤੇ ਐਪ ਡੇਟਾ (ਜਿਵੇਂ ਕਿ ਐਪਸ ਦਾ ਸਟੋਰ ਕੀਤੀ ਸੈੱਟਿੰਗਜ਼ ਅਤੇ ਫ਼ਾਈਲਾਂ) ਦਾ ਬੈੱਕ ਅੱਪ ਤੋਂ ਰੋਕਣਾ ਹੈ, ਅਤੇ ਇਸਦੇ ਨਾਲ-ਨਾਲ ਰਿਮੋਟ ਸਰਵਰ \'ਤੇ ਸਾਰੀਆਂ ਪ੍ਰਤੀਲਿਪੀਆਂ ਨੂੰ ਮਿਟਾਉਣਾ ਹੈ?"</string>
-    <string name="fullbackup_data_summary" msgid="960850365007767734">"ਡੀਵਾਈਸ ਡੇਟਾ ਰਿਮੋਟ ਦੇ ਰੂਪ ਵਿੱਚ (ਜਿਵੇਂ ਕਿ Wi-Fi ਪਾਸਵਰਡ ਅਤੇ ਕਲ ਇਤਿਹਾਸ) ਅਤੇ ਐਪ ਡੇਟਾ (ਜਿਵੇਂ ਕਿ ਐਪਸ ਦਾ ਸਟੋਰ ਕੀਤੀ ਸੈੱਟਿੰਗਜ਼ ਅਤੇ ਫ਼ਾਈਲਾਂ) ਦਾ ਸਵੈਚਲ ਬੈੱਕ ਅੱਪ ਲਿਓ।\n\nਜਦੋਂ ਤੁਸੀਂ ਸਵੈਚਲ ਬੈੱਕ ਅੱਪ ਨੂੰ ਚਾਲੂ ਕਰਦੇ ਹੋ, ਤਾਂ ਡੀਵਾਈਸ ਅਤੇ ਐਪ ਡੇਟਾ ਨੂੰ ਰਿਮੋਟ ਦੇ ਰੂਪ ਵਿੱਚ ਅਵਧੀ ਅਨੁਸਾਰ ਸੁਰੱਖਿਅਤ ਕੀਤਾ ਜਾਂਦਾ ਹੈ। ਐਪ ਡੇਟਾ ਕੋਈ ਵੀ ਡੇਟਾ ਹੋ ਸਕਦਾ ਹੈ ਜੋ ਸੰਪਰਕ, ਸੁਨੇਹੇ, ਅਤੇ ਫ਼ੋਟੋਆਂ ਵਰਗੇ ਸੰਭਾਵੀ ਸੰਵੇਦਨਸ਼ੀਲ ਡੇਟਾ ਸਮੇਤ, ਕਿਸੇ ਐਪ ਨੇ ਸੁਰੱਖਿਅਤ ਕੀਤਾ ਹੁੰਦਾ ਹੈ (ਨਿਰਮਾਤਾ ਸੈੱਟਿੰਗਜ਼ ਦੇ ਅਧਾਰ \'ਤੇ)।"</string>
+    <string name="backup_erase_dialog_message" msgid="5221011285568343155">"ਆਪਣੇ ਵਾਈ-ਫਾਈ ਪਾਸਵਰਡਾਂ, ਬੁੱਕਮਾਰਕਾਂ, ਹੋਰ ਸੈਟਿੰਗਾਂ ਅਤੇ ਐਪ ਡਾਟਾ ਨੂੰ ਬੈਕ ਅੱਪ ਕਰਨਾ ਬੰਦ ਕਰਨਾ ਹੈ ਅਤੇ Google ਸਰਵਰਾਂ ਦੀਆਂ ਸਾਰੀਆਂ ਕਾਪੀਆਂ ਮਿਟਾਉਣੀਆਂ ਹਨ?"</string>
+    <string name="fullbackup_erase_dialog_message" msgid="694766389396659626">"ਕੀ ਡੀਵਾਈਸ ਡਾਟਾ (ਜਿਵੇਂ ਕਿ ਵਾਈ-ਫਾਈ ਪਾਸਵਰਡ ਅਤੇ ਕਾਲ ਇਤਿਹਾਸ) ਅਤੇ ਐਪ ਡਾਟਾ (ਜਿਵੇਂ ਕਿ ਐਪਾਂ ਦਾ ਸਟੋਰ ਕੀਤੀ ਸੈਟਿੰਗਾਂ ਅਤੇ ਫ਼ਾਈਲਾਂ) ਦੇ ਬੈੱਕਅੱਪ ਤੋਂ ਰੋਕਣਾ ਹੈ, ਅਤੇ ਇਸਦੇ ਨਾਲ-ਨਾਲ ਰਿਮੋਟ ਸਰਵਰ \'ਤੇ ਸਾਰੀਆਂ ਪ੍ਰਤੀਲਿਪੀਆਂ ਨੂੰ ਮਿਟਾਉਣਾ ਹੈ?"</string>
+    <string name="fullbackup_data_summary" msgid="960850365007767734">"ਡੀਵਾਈਸ ਡਾਟਾ ਰਿਮੋਟ ਦੇ ਰੂਪ ਵਿੱਚ (ਜਿਵੇਂ ਕਿ ਵਾਈ-ਫਾਈ ਪਾਸਵਰਡ ਅਤੇ ਕਾਲ ਇਤਿਹਾਸ) ਅਤੇ ਐਪ ਡਾਟਾ (ਜਿਵੇਂ ਕਿ ਐਪਾਂ ਵੱਲੋਂ ਸਟੋਰ ਕੀਤੀਆਂ ਸੈਟਿੰਗਾਂ ਅਤੇ ਫ਼ਾਈਲਾਂ) ਦਾ ਸਵੈਚਲਿਤ ਬੈੱਕਅੱਪ ਲਓ।\n\nਜਦੋਂ ਤੁਸੀਂ ਸਵੈਚਲਿਤ ਬੈਕਅੱਪ ਨੂੰ ਚਾਲੂ ਕਰਦੇ ਹੋ, ਤਾਂ ਡੀਵਾਈਸ ਅਤੇ ਐਪ ਡਾਟਾ ਨੂੰ ਰਿਮੋਟ ਦੇ ਰੂਪ ਵਿੱਚ ਅਵਧੀ ਅਨੁਸਾਰ ਰੱਖਿਅਤ ਕੀਤਾ ਜਾਂਦਾ ਹੈ। ਐਪ ਡਾਟਾ ਕੋਈ ਵੀ ਡਾਟਾ ਹੋ ਸਕਦਾ ਹੈ ਜੋ ਸੰਪਰਕ, ਸੁਨੇਹੇ, ਅਤੇ ਫ਼ੋਟੋਆਂ ਵਰਗੇ ਸੰਭਾਵੀ ਸੰਵੇਦਨਸ਼ੀਲ ਡਾਟਾ ਸਮੇਤ, ਕਿਸੇ ਐਪ ਨੇ ਰੱਖਿਅਤ ਕੀਤਾ ਹੁੰਦਾ ਹੈ (ਵਿਕਾਸਕਾਰ ਸੈਟਿੰਗਾਂ ਦੇ ਅਧਾਰ \'ਤੇ)।"</string>
     <string name="device_admin_settings_title" msgid="4960761799560705902">"ਡੀਵਾਈਸ ਪ੍ਰਸ਼ਾਸਕ ਸੈਟਿੰਗਾਂ"</string>
     <string name="active_device_admin_msg" msgid="578748451637360192">"ਡੀਵਾਈਸ ਪ੍ਰਸ਼ਾਸਕ ਐਪ"</string>
     <string name="remove_device_admin" msgid="9207368982033308173">"ਇਸ ਡੀਵਾਈਸ ਪ੍ਰਸ਼ਾਸਕ ਐਪ ਨੂੰ ਅਕਿਰਿਆਸ਼ੀਲ ਕਰੋ"</string>
@@ -2250,22 +2262,22 @@
     <string name="device_admin_add_title" msgid="3140663753671809044">"ਡੀਵਾਈਸ ਪ੍ਰਸ਼ਾਸਕ"</string>
     <string name="device_admin_warning" msgid="7482834776510188134">"ਇਸ ਪ੍ਰਸ਼ਾਸਕ ਐਪ ਨੂੰ ਸਰਗਰਮ ਕਰਨ ਨਾਲ <xliff:g id="APP_NAME">%1$s</xliff:g> ਐਪ ਨੂੰ ਅੱਗੇ ਦਿੱਤੀਆਂ ਕਾਰਵਾਈਆਂ ਕਰਨ ਦੀ ਇਜਾਜ਼ਤ ਮਿਲਦੀ ਹੈ:"</string>
     <string name="device_admin_status" msgid="7234814785374977990">"ਇਹ ਪ੍ਰਸ਼ਾਸਕ ਐਪ ਕਿਰਿਆਸ਼ੀਲ ਹੈ ਅਤੇ <xliff:g id="APP_NAME">%1$s</xliff:g> ਐਪ ਨੂੰ ਅੱਗੇ ਦਿੱਤੀਆਂ ਕਾਰਵਾਈਆਂ ਨੂੰ ਕਰਨ ਲਈ ਇਜਾਜ਼ਤ ਦਿੰਦੀ ਹੈ:"</string>
-    <string name="profile_owner_add_title" msgid="6249331160676175009">"ਕੀ ਪ੍ਰੋਫਾਈਲ ਮੈਨੇਜਰ ਨੂੰ ਸਕਿਰਿਆ ਬਣਾਉਣਾ ਹੈ?"</string>
-    <string name="adding_profile_owner_warning" msgid="1354474524852805802">"ਜਾਰੀ ਰੱਖਣ ਦੁਆਰਾ, ਤੁਹਾਡੇ ਵਰਤੋਂਕਾਰ ਨੂੰ ਤੁਹਾਡੇ ਪ੍ਰਸ਼ਾਸਕ ਦੁਆਰਾ ਪ੍ਰਬੰਧਿਤ ਕੀਤਾ ਜਾਏਗਾ ਜੋ ਕਿ ਤੁਹਾਡੇ ਨਿੱਜੀ ਡੈਟੇ ਤੋਂ ਇਲਾਵਾ, ਸਬੰਧਿਤ ਡੈਟੇ ਨੂੰ ਸਟੋਰ ਕਰਨ ਦੇ ਵੀ ਯੋਗ ਹੋ ਸਕਦਾ ਹੈ।\n\n ਤੁਹਾਡਾ ਪ੍ਰਸ਼ਾਸਕ ਇਸ ਵਰਤੋਂਕਾਰ ਨਾਲ ਸਬੰਧਿਤ ਸੈਟਿੰਗਾਂ, ਪਹੁੰਚ, ਐਪਾਂ, ਅਤੇ ਡੈਟੇ ਦੀ ਨਿਗਰਾਨੀ ਅਤੇ ਪ੍ਰਬੰਧਨ ਕਰ ਸਕਦਾ ਹੈ, ਜਿਸ ਵਿੱਚ ਨੈੱਟਵਰਕ ਸਰਗਰਮੀ ਅਤੇ ਤੁਹਾਡੀ ਡੀਵਾਈਸ ਦੀ ਟਿਕਾਣਾ ਜਾਣਕਾਰੀ ਵੀ ਸ਼ਾਮਲ ਹੈ।"</string>
+    <string name="profile_owner_add_title" msgid="6249331160676175009">"ਕੀ ਪ੍ਰੋਫਾਈਲ ਮੈਨੇਜਰ ਨੂੰ ਕਿਰਿਆਸ਼ੀਲ ਬਣਾਉਣਾ ਹੈ?"</string>
+    <string name="adding_profile_owner_warning" msgid="1354474524852805802">"ਜਾਰੀ ਰੱਖਣ ਦੁਆਰਾ, ਤੁਹਾਡੇ ਵਰਤੋਂਕਾਰ ਨੂੰ ਤੁਹਾਡੇ ਪ੍ਰਸ਼ਾਸਕ ਦੁਆਰਾ ਪ੍ਰਬੰਧਿਤ ਕੀਤਾ ਜਾਏਗਾ ਜੋ ਕਿ ਤੁਹਾਡੇ ਨਿੱਜੀ ਡਾਟੇ ਤੋਂ ਇਲਾਵਾ, ਸੰਬੰਧਿਤ ਡਾਟੇ ਨੂੰ ਸਟੋਰ ਕਰਨ ਦੇ ਵੀ ਯੋਗ ਹੋ ਸਕਦਾ ਹੈ।\n\n ਤੁਹਾਡਾ ਪ੍ਰਸ਼ਾਸਕ ਇਸ ਵਰਤੋਂਕਾਰ ਨਾਲ ਸੰਬੰਧਿਤ ਸੈਟਿੰਗਾਂ, ਪਹੁੰਚ, ਐਪਾਂ, ਅਤੇ ਡਾਟੇ ਦੀ ਨਿਗਰਾਨੀ ਅਤੇ ਪ੍ਰਬੰਧਨ ਕਰ ਸਕਦਾ ਹੈ, ਜਿਸ ਵਿੱਚ ਨੈੱਟਵਰਕ ਕਿਰਿਆਸ਼ੀਲਤਾ ਅਤੇ ਤੁਹਾਡੇ ਡੀਵਾਈਸ ਦੀ ਟਿਕਾਣਾ ਜਾਣਕਾਰੀ ਵੀ ਸ਼ਾਮਲ ਹੈ।"</string>
     <string name="admin_disabled_other_options" msgid="7712694507069054530">"ਤੁਹਾਡੇ ਪ੍ਰਸ਼ਾਸਕ ਵੱਲੋਂ ਹੋਰ ਵਿਕਲਪਾਂ ਨੂੰ ਅਯੋਗ ਬਣਾਇਆ ਗਿਆ ਹੈ"</string>
     <string name="admin_more_details" msgid="7901420667346456102">"ਹੋਰ ਵੇਰਵੇ"</string>
     <string name="untitled_apn" msgid="1230060359198685513">"ਬਿਨਾਂ ਨਾਮ"</string>
     <string name="sound_category_sound_title" msgid="1488759370067953996">"ਸਧਾਰਨ"</string>
     <string name="notification_log_title" msgid="3766148588239398464">"ਸੂਚਨਾ ਲੌਗ"</string>
-    <string name="sound_category_call_ringtone_vibrate_title" msgid="1543777228646645163">"ਕਾਲ ਰਿੰਗਟੋਨ ਅਤੇ ਥਰਥਰਾਹਟ"</string>
+    <string name="sound_category_call_ringtone_vibrate_title" msgid="1543777228646645163">"ਕਾਲ ਰਿੰਗਟੋਨ &amp; ਵਾਈਬ੍ਰੇਟ"</string>
     <string name="sound_category_system_title" msgid="1480844520622721141">"ਸਿਸਟਮ"</string>
-    <string name="wifi_setup_title" msgid="2970260757780025029">"Wi‑Fi ਸੈਟਅਪ"</string>
-    <string name="wifi_setup_title_editing_network" msgid="6020614644556717979">"Wi‑Fi ਨੈੱਟਵਰਕ <xliff:g id="NETWORK_NAME">%s</xliff:g> ਨਾਲ ਕਨੈਕਟ ਕਰੋ"</string>
-    <string name="wifi_setup_title_connecting_network" msgid="5572226790101017822">"Wi‑Fi ਨੈੱਟਵਰਕ <xliff:g id="NETWORK_NAME">%s</xliff:g> ਨਾਲ ਕਨੈਕਟ ਕਰ ਰਿਹਾ ਹੈ…"</string>
-    <string name="wifi_setup_title_connected_network" msgid="1608788657122010919">"Wi‑Fi ਨੈੱਟਵਰਕ <xliff:g id="NETWORK_NAME">%s</xliff:g> ਨਾਲ ਕਨੈਕਟ ਕੀਤਾ"</string>
-    <string name="wifi_setup_title_add_network" msgid="6932651000151032301">"ਇੱਕ ਨੈੱਟਵਰਕ ਜੋੜੋ"</string>
+    <string name="wifi_setup_title" msgid="2970260757780025029">"ਵਾਈ‑ਫਾਈ ਸੈੱਟਅੱਪ"</string>
+    <string name="wifi_setup_title_editing_network" msgid="6020614644556717979">"ਵਾਈ‑ਫਾਈ ਨੈੱਟਵਰਕ <xliff:g id="NETWORK_NAME">%s</xliff:g> ਨਾਲ ਕਨੈਕਟ ਕਰੋ"</string>
+    <string name="wifi_setup_title_connecting_network" msgid="5572226790101017822">"ਵਾਈ‑ਫਾਈ ਨੈੱਟਵਰਕ <xliff:g id="NETWORK_NAME">%s</xliff:g> ਨਾਲ ਕਨੈਕਟ ਹੋ ਰਿਹਾ ਹੈ…"</string>
+    <string name="wifi_setup_title_connected_network" msgid="1608788657122010919">"ਵਾਈ‑ਫਾਈ ਨੈੱਟਵਰਕ <xliff:g id="NETWORK_NAME">%s</xliff:g> ਨਾਲ ਕਨੈਕਟ ਕੀਤਾ"</string>
+    <string name="wifi_setup_title_add_network" msgid="6932651000151032301">"ਇੱਕ ਨੈੱਟਵਰਕ ਸ਼ਾਮਲ ਕਰੋ"</string>
     <string name="wifi_setup_not_connected" msgid="6997432604664057052">"ਕਨੈਕਟ ਨਹੀਂ ਕੀਤਾ"</string>
-    <string name="wifi_setup_add_network" msgid="5939624680150051807">"ਨੈੱਟਵਰਕ ਜੋੜੋ"</string>
+    <string name="wifi_setup_add_network" msgid="5939624680150051807">"ਨੈੱਟਵਰਕ ਸ਼ਾਮਲ ਕਰੋ"</string>
     <string name="wifi_setup_refresh_list" msgid="3411615711486911064">"ਸੂਚੀ ਤਾਜ਼ਾ ਕਰੋ"</string>
     <string name="wifi_setup_skip" msgid="6661541841684895522">"ਛੱਡੋ"</string>
     <string name="wifi_setup_next" msgid="3388694784447820477">"ਅੱਗੇ"</string>
@@ -2284,9 +2296,9 @@
     <string name="wifi_setup_status_connecting" msgid="4971421484401530740">"ਕਨੈਕਟ ਕਰ ਰਿਹਾ ਹੈ…"</string>
     <string name="wifi_setup_status_proceed_to_next" msgid="6708250000342940031">"ਅਗਲੇ ਸਟੈਪ ਤੇ ਜਾਓ"</string>
     <string name="wifi_setup_status_eap_not_supported" msgid="6796317704783144190">"EAP ਸਮਰਥਿਤ ਨਹੀਂ ਹੈ।"</string>
-    <string name="wifi_setup_eap_not_supported" msgid="6812710317883658843">"ਤੁਸੀਂ ਸੈਟਅਪ ਦੇ ਦੌਰਾਨ ਇੱਕ EAP Wi‑Fi ਕਨੈਕਸ਼ਨ ਕੌਂਫਿਗਰ ਨਹੀਂ ਕਰ ਸਕਦੇ। ਸੈਟਅਪ ਤੋਂ ਬਾਅਦ, ਤੁਸੀਂ ਸੈਟਿੰਗਾਂ &gt; ਵਾਇਰਲੈਸ &amp; ਨੈਟਵਰਕਾਂ ਵਿੱਚ ਅਜਿਹਾ ਕਰ ਸਕਦੇ ਹੋ।"</string>
+    <string name="wifi_setup_eap_not_supported" msgid="6812710317883658843">"ਤੁਸੀਂ ਸੈੱਟਅੱਪ ਦੇ ਦੌਰਾਨ ਇੱਕ EAP ਵਾਈ-ਫਾਈ ਕਨੈਕਸ਼ਨ ਰੂਪ-ਰੇਖਾ ਨਹੀਂ ਬਦਲ ਸਕਦੇ। ਸੈੱਟਅੱਪ ਤੋਂ ਬਾਅਦ, ਤੁਸੀਂ ਸੈਟਿੰਗਾਂ &gt; ਵਾਇਰਲੈਸ &amp; ਨੈੱਟਵਰਕਾਂ ਵਿੱਚ ਅਜਿਹਾ ਕਰ ਸਕਦੇ ਹੋ।"</string>
     <string name="wifi_setup_description_connecting" msgid="2793554932006756795">"ਕਨੈਕਟ ਹੋਣ ਵਿੱਚ ਥੋੜ੍ਹੀ ਦੇਰ ਲੱਗ ਸਕਦੀ ਹੈ..."</string>
-    <string name="wifi_setup_description_connected" msgid="6649168170073219153">"ਸੈੱਟਅਪ ਜਾਰੀ ਰੱਖਣ ਲਈ "<b>"ਅੱਗੇ"</b>" \'ਤੇ ਟੈਪ ਕਰੋ।\n\n ਇੱਕ ਵੱਖਰੇ Wi-Fi ਨੈੱਟਵਰਕ ਨਾਲ ਕਨੈਕਟ ਹੋਣ ਲਈ "<b>"ਪਿੱਛੇ"</b>" \'ਤੇ ਟੈਪ ਕਰੋ।"</string>
+    <string name="wifi_setup_description_connected" msgid="6649168170073219153">"ਸੈੱਟਅੱਪ ਜਾਰੀ ਰੱਖਣ ਲਈ "<b>"ਅੱਗੇ"</b>" \'ਤੇ ਟੈਪ ਕਰੋ।\n\nਇੱਕ ਵੱਖਰੇ ਵਾਈ-ਫਾਈ ਨੈੱਟਵਰਕ ਨਾਲ ਕਨੈਕਟ ਹੋਣ ਲਈ "<b>"ਪਿੱਛੇ"</b>" \'ਤੇ ਟੈਪ ਕਰੋ।"</string>
     <string name="accessibility_sync_enabled" msgid="558480439730263116">"ਸਿੰਕ ਸਮਰਥਿਤ"</string>
     <string name="accessibility_sync_disabled" msgid="1741194106479011384">"ਸਿੰਕ ਅਸਮਰਥਿਤ"</string>
     <string name="accessibility_sync_in_progress" msgid="4501160520879902723">"ਹੁਣ ਸਮਕਾਲੀਕਰਨ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ"</string>
@@ -2296,22 +2308,22 @@
     <string name="account_sync_settings_title" msgid="5131314922423053588">"ਸਿੰਕ ਕਰੋ"</string>
     <string name="sync_is_failing" msgid="1591561768344128377">"ਸਮਕਾਲੀਕਰਨ ਵਿੱਚ ਇਸ ਵੇਲੇ ਸਮੱਸਿਆਵਾਂ ਹੋ ਰਹੀਆਂ ਹਨ। ਇਹ ਜਲਦੀ ਹੀ ਠੀਕ ਹੋ ਜਾਏਗਾ।"</string>
     <string name="add_account_label" msgid="7811707265834013767">"ਖਾਤਾ ਸ਼ਾਮਲ ਕਰੋ"</string>
-    <string name="managed_profile_not_available_label" msgid="852263300911325904">"ਕੰਮ ਪ੍ਰੋਫਾਈਲ ਅਜੇ ਉਪਲਬਧ ਨਹੀਂ ਹੈ"</string>
+    <string name="managed_profile_not_available_label" msgid="852263300911325904">"ਕਾਰਜ ਪ੍ਰੋਫਾਈਲ ਅਜੇ ਉਪਲਬਧ ਨਹੀਂ ਹੈ"</string>
     <string name="work_mode_label" msgid="5794470908668593961">"ਕੰਮ ਮੋਡ"</string>
-    <string name="work_mode_summary" msgid="1620246003886940776">"ਐਪਾਂ, ਬੈਕਗ੍ਰਾਊਂਡ ਸਮਕਾਲੀਕਰਨ, ਅਤੇ ਸਬੰਧਿਤ ਵਿਸ਼ੇਸ਼ਤਾਵਾਂ ਸ਼ਾਮਲ ਕਰਦੇ ਹੋਏ ਕੰਮ ਪ੍ਰੋਫਾਈਲ ਨੂੰ ਕੰਮ ਕਰਨ ਦੀ ਮਨਜ਼ੂਰੀ ਦਿਓ"</string>
-    <string name="remove_managed_profile_label" msgid="3856519337797285325">"ਕੰਮ ਪ੍ਰੋਫਾਈਲ ਹਟਾਓ"</string>
-    <string name="background_data" msgid="5779592891375473817">"ਪਿਛੋਕੜ ਡੈਟਾ"</string>
-    <string name="background_data_summary" msgid="8328521479872763452">"ਐਪਸ ਕਿਸੇ ਵੀ ਸਮੇਂ ਡੈਟਾ ਸਿੰਕ ਕਰ ਸਕਦੇ ਹਨ, ਭੇਜ ਅਤੇ ਪ੍ਰਾਪਤ ਕਰ ਸਕਦੇ ਹਨ"</string>
-    <string name="background_data_dialog_title" msgid="6059217698124786537">"ਕੀ ਪਿਛੋਕੜ ਡੈਟਾ ਅਸਮਰੱਥ ਬਣਾਉਣਾ ਹੈ?"</string>
-    <string name="background_data_dialog_message" msgid="6981661606680941633">"ਪਿਛੋਕੜ ਡੈਟਾ ਨੂੰ ਅਸਮਰੱਥ ਬਣਾਉਣ ਨਾਲ ਇਹ ਬੈਟਰੀ ਸਮਰੱਥਾ ਵਧਾਉਂਦਾ ਹੈ ਅਤੇ ਡੈਟਾ ਉਪਯੋਗ ਨੂੰ ਘੱਟ ਕਰਦਾ ਹੈ। ਕੁਝ ਐਪਸ ਤਦ ਵੀ ਪਿਛੋਕੜ ਡੈਟਾ ਕਨੈਕਸ਼ਨ ਵਰਤ ਸਕਦੇ ਹਨ।"</string>
-    <string name="sync_automatically" msgid="1682730255435062059">"ਐਪ ਡੈਟਾ ਆਟੋ-ਸਿੰਕ ਕਰੋ"</string>
+    <string name="work_mode_summary" msgid="1620246003886940776">"ਐਪਾਂ, ਬੈਕਗ੍ਰਾਊਂਡ ਸਮਕਾਲੀਕਰਨ, ਅਤੇ ਸਬੰਧਿਤ ਵਿਸ਼ੇਸ਼ਤਾਵਾਂ ਸ਼ਾਮਲ ਕਰਦੇ ਹੋਏ ਕਾਰਜ ਪ੍ਰੋਫਾਈਲ ਨੂੰ ਕੰਮ ਕਰਨ ਦੀ ਆਗਿਆ ਦਿਓ"</string>
+    <string name="remove_managed_profile_label" msgid="3856519337797285325">"ਕਾਰਜ ਪ੍ਰੋਫਾਈਲ ਹਟਾਓ"</string>
+    <string name="background_data" msgid="5779592891375473817">"ਪਿਛੋਕੜ  ਡਾਟਾ"</string>
+    <string name="background_data_summary" msgid="8328521479872763452">"ਐਪਸ ਕਿਸੇ ਵੀ ਸਮੇਂ  ਡਾਟਾ  ਸਿੰਕ ਕਰ ਸਕਦੇ ਹਨ, ਭੇਜ ਅਤੇ ਪ੍ਰਾਪਤ ਕਰ ਸਕਦੇ ਹਨ"</string>
+    <string name="background_data_dialog_title" msgid="6059217698124786537">"ਕੀ ਪਿਛੋਕੜ  ਡਾਟਾ  ਅਸਮਰੱਥ ਬਣਾਉਣਾ ਹੈ?"</string>
+    <string name="background_data_dialog_message" msgid="6981661606680941633">"ਬੈਕਗ੍ਰਾਊਂਡ ਡਾਟਾ ਨੂੰ ਅਸਮਰੱਥ ਬਣਾਉਣ ਨਾਲ ਇਹ ਬੈਟਰੀ ਸਮਰੱਥਾ ਵਧਾਉਂਦਾ ਹੈ ਅਤੇ ਡਾਟਾ ਵਰਤੋਂ ਨੂੰ ਘੱਟ ਕਰਦਾ ਹੈ। ਕੁਝ ਐਪਾਂ ਤਦ ਵੀ ਬੈਕਗ੍ਰਾਊਂਡ ਡਾਟਾ ਕਨੈਕਸ਼ਨ ਵਰਤ ਸਕਦੀਆਂ ਹਨ।"</string>
+    <string name="sync_automatically" msgid="1682730255435062059">"ਐਪ  ਡਾਟਾ  ਆਟੋ-ਸਿੰਕ ਕਰੋ"</string>
     <string name="sync_enabled" msgid="4551148952179416813">"ਸਿੰਕ ਚਾਲੂ ਹੈ"</string>
     <string name="sync_disabled" msgid="8511659877596511991">"ਸਮਕਾਲੀਕਰਨ ਬੰਦ ਹੈ"</string>
     <string name="sync_error" msgid="5060969083117872149">"ਸਿੰਕ ਅਸ਼ੁੱਧੀ"</string>
     <string name="last_synced" msgid="4242919465367022234">"ਪਿਛਲਾ ਸਮਕਾਲੀਕਰਨ <xliff:g id="LAST_SYNC_TIME">%1$s</xliff:g>"</string>
     <string name="sync_in_progress" msgid="5151314196536070569">"ਹੁਣ ਸਮਕਾਲੀਕਰਨ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ…"</string>
-    <string name="settings_backup" msgid="2274732978260797031">"ਬੈਕ ਅਪ ਸੈਟਿੰਗਾਂ"</string>
-    <string name="settings_backup_summary" msgid="7916877705938054035">"ਮੇਰੀਆਂ ਸੈਟਿੰਗਾਂ ਬੈਕ ਅਪ ਕਰੋ"</string>
+    <string name="settings_backup" msgid="2274732978260797031">"ਬੈਕ ਅੱਪ ਸੈਟਿੰਗਾਂ"</string>
+    <string name="settings_backup_summary" msgid="7916877705938054035">"ਮੇਰੀਆਂ ਸੈਟਿੰਗਾਂ ਬੈਕ ਅੱਪ ਲਓ"</string>
     <string name="sync_menu_sync_now" msgid="6154608350395805683">"ਹੁਣ ਸਮਕਾਲੀਕਰਨ ਕਰੋ"</string>
     <string name="sync_menu_sync_cancel" msgid="8292379009626966949">"ਸਮਕਾਲੀਕਰਨ ਰੱਦ ਕਰੋ"</string>
     <string name="sync_one_time_sync" msgid="3733796114909082260">"ਹੁਣੇ ਸਮਕਾਲੀਕਰਨ ਲਈ ਟੈਪ ਕਰੋ<xliff:g id="LAST_SYNC_TIME">
@@ -2319,31 +2331,29 @@
     <string name="sync_gmail" msgid="714886122098006477">"Gmail"</string>
     <string name="sync_calendar" msgid="9056527206714733735">"ਕੈਲੰਡਰ"</string>
     <string name="sync_contacts" msgid="9174914394377828043">"ਸੰਪਰਕ"</string>
-    <string name="sync_plug" msgid="3905078969081888738"><font fgcolor="#ffffffff">"Google ਸਿੰਕ ਤੇ ਤੁਹਾਡਾ ਸੁਆਗਤ ਹੈ!"</font>" \nਤੁਸੀਂ ਜਿੱਥੇ ਵੀ ਹੋਵੋ, ਉੱਥੋਂ ਤੁਹਾਡੇ ਸੰਪਰਕਾਂ, ਮੁਲਾਕਾਤਾਂ ਆਦਿ ਤੱਕ ਪਹੁੰਚ ਦੀ ਆਗਿਆ ਦੇਣ ਲਈ ਡੈਟਾ ਸਿੰਕ ਕਰਨ ਲਈ ਇੱਕ Google ਪਹੁੰਚ।"</string>
+    <string name="sync_plug" msgid="3905078969081888738"><font fgcolor="#ffffffff">"Google ਸਿੰਕ ਤੇ ਤੁਹਾਡਾ ਸੁਆਗਤ ਹੈ!"</font>" \nਤੁਸੀਂ ਜਿੱਥੇ ਵੀ ਹੋਵੋ, ਉੱਥੋਂ ਤੁਹਾਡੇ ਸੰਪਰਕਾਂ, ਮੁਲਾਕਾਤਾਂ ਆਦਿ ਤੱਕ ਪਹੁੰਚ ਦੀ ਆਗਿਆ ਦੇਣ ਲਈ ਡਾਟਾ ਸਿੰਕ ਕਰਨ ਲਈ ਇੱਕ Google ਪਹੁੰਚ।"</string>
     <string name="header_application_sync_settings" msgid="6205903695598000286">"ਐਪ ਸਿੰਕ ਸੈਟਿੰਗਾਂ"</string>
-    <string name="header_data_and_synchronization" msgid="5165024023936509896">"ਡੈਟਾ &amp; ਸਿੰਕ੍ਰੋਨਾਈਜ਼ੇਸ਼ਨ"</string>
+    <string name="header_data_and_synchronization" msgid="5165024023936509896">" ਡਾਟਾ  &amp; ਸਿੰਕ੍ਰੋਨਾਈਜ਼ੇਸ਼ਨ"</string>
     <string name="preference_change_password_title" msgid="8955581790270130056">"ਪਾਸਵਰਡ ਬਦਲੋ"</string>
     <string name="header_account_settings" msgid="5382475087121880626">"ਖਾਤਾ ਸੈਟਿੰਗਾਂ"</string>
     <string name="remove_account_label" msgid="5921986026504804119">"ਖਾਤਾ ਹਟਾਓ"</string>
     <string name="header_add_an_account" msgid="756108499532023798">"ਇੱਕ ਖਾਤਾ ਸ਼ਾਮਲ ਕਰੋ"</string>
     <string name="finish_button_label" msgid="481587707657751116">"ਸਮਾਪਤ ਕਰੋ"</string>
     <string name="really_remove_account_title" msgid="8800653398717172460">"ਕੀ ਖਾਤਾ ਹਟਾਉਣਾ ਹੈ?"</string>
-    <string name="really_remove_account_message" product="tablet" msgid="1936147502815641161">"ਇਸ ਖਾਤੇ ਨੂੰ ਹਟਾਉਣ ਨਾਲ ਇਸਦੇ ਸਾਰੇ ਸੁਨੇਹੇ, ਸੰਪਰਕ ਅਤੇ ਟੈਬਲੇਟ ਦਾ ਹੋਰ ਡੈਟਾ ਮਿਟ ਜਾਏਗਾ!"</string>
-    <string name="really_remove_account_message" product="default" msgid="3483528757922948356">"ਇਸ ਖਾਤੇ ਨੂੰ ਹਟਾਉਣ ਨਾਲ ਇਸਦੇ ਸਾਰੇ ਸੁਨੇਹੇ, ਸੰਪਰਕ ਅਤੇ ਫੋਨ ਦਾ ਹੋਰ ਡੈਟਾ ਮਿਟ ਜਾਏਗਾ!"</string>
+    <string name="really_remove_account_message" product="tablet" msgid="1936147502815641161">"ਇਸ ਖਾਤੇ ਨੂੰ ਹਟਾਉਣ ਨਾਲ ਇਸਦੇ ਸਾਰੇ ਸੁਨੇਹੇ, ਸੰਪਰਕ ਅਤੇ ਟੈਬਲੈੱਟ ਦਾ ਹੋਰ ਡਾਟਾ ਮਿਟ ਜਾਏਗਾ!"</string>
+    <string name="really_remove_account_message" product="default" msgid="3483528757922948356">"ਇਸ ਖਾਤੇ ਨੂੰ ਹਟਾਉਣ ਨਾਲ ਇਸਦੇ ਸਾਰੇ ਸੁਨੇਹੇ, ਸੰਪਰਕ ਅਤੇ ਫ਼ੋਨ ਦਾ ਹੋਰ ਡਾਟਾ ਮਿਟ ਜਾਏਗਾ!"</string>
     <string name="remove_account_failed" msgid="3901397272647112455">"ਤੁਹਾਡੇ ਪ੍ਰਸ਼ਾਸਕ ਵੱਲੋਂ ਇਸ ਤਬਦੀਲੀ ਦੀ ਇਜਾਜ਼ਤ ਨਹੀਂ ਹੈ"</string>
     <string name="provider_label" msgid="7724593781904508866">"Push ਸਬਸਕ੍ਰਿਪਸ਼ੰਸ"</string>
     <!-- no translation found for sync_item_title (4782834606909853006) -->
     <skip />
     <string name="cant_sync_dialog_title" msgid="2777238588398046285">"ਮੈਨੂਅਲੀ ਸਿੰਕ ਨਹੀਂ ਕਰ ਸਕਦਾ"</string>
-    <string name="cant_sync_dialog_message" msgid="1938380442159016449">"ਇਸ ਆਈਟਮ ਲਈ ਸਿੰਕ ਇਸ ਵੇਲੇ ਅਸਮਰਥਿਤ ਹੈ। ਇਸ ਸੈਟਿੰਗ ਨੂੰ ਬਦਲਣ ਲਈ, ਪਿਛੋਕੜ ਡੈਟਾ ਅਤੇ ਆਟੋਮੈਟਿਕ ਸਿੰਕ ਅਸਥਾਈ ਤੌਰ ਤੇ ਚਾਲੂ ਕਰੋ।"</string>
-    <string name="wimax_settings" msgid="2655139497028469039">"4G"</string>
-    <string name="status_wimax_mac_address" msgid="8390791848661413416">"4G MAC ਪਤਾ"</string>
+    <string name="cant_sync_dialog_message" msgid="1938380442159016449">"ਇਸ ਆਈਟਮ ਲਈ ਸਿੰਕ ਇਸ ਵੇਲੇ ਅਸਮਰਥਿਤ ਹੈ। ਇਸ ਸੈਟਿੰਗ ਨੂੰ ਬਦਲਣ ਲਈ, ਪਿਛੋਕੜ  ਡਾਟਾ  ਅਤੇ ਆਟੋਮੈਟਿਕ ਸਿੰਕ ਅਸਥਾਈ ਤੌਰ ਤੇ ਚਾਲੂ ਕਰੋ।"</string>
     <string name="enter_password" msgid="8035706727471334122">"Android ਨੂੰ ਚਾਲੂ ਕਰਨ ਲਈ, ਆਪਣਾ ਪਾਸਵਰਡ ਦਾਖਲ ਕਰੋ"</string>
-    <string name="enter_pin" msgid="5305333588093263790">"Android ਨੂੰ ਚਾਲੂ ਕਰਨ ਲਈ, ਆਪਣਾ PIN ਦਾਖਲ ਕਰੋ"</string>
+    <string name="enter_pin" msgid="5305333588093263790">"Android ਨੂੰ ਚਾਲੂ ਕਰਨ ਲਈ, ਆਪਣਾ ਪਿੰਨ ਦਾਖਲ ਕਰੋ"</string>
     <string name="enter_pattern" msgid="4187435713036808566">"Android ਨੂੰ ਚਾਲੂ ਕਰਨ ਲਈ, ਆਪਣਾ ਪੈਟਰਨ ਡ੍ਰਾ ਕਰੋ"</string>
     <string name="cryptkeeper_wrong_pattern" msgid="8423835922362956999">"ਗ਼ਲਤ ਪੈਟਰਨ"</string>
-    <string name="cryptkeeper_wrong_password" msgid="5200857195368904047">"ਗ਼ਲਤ ਪਾਸਵਰਡ"</string>
-    <string name="cryptkeeper_wrong_pin" msgid="755720788765259382">"ਗ਼ਲਤ PIN"</string>
+    <string name="cryptkeeper_wrong_password" msgid="5200857195368904047">"ਗਲਤ ਪਾਸਵਰਡ"</string>
+    <string name="cryptkeeper_wrong_pin" msgid="755720788765259382">"ਗਲਤ ਪਿੰਨ"</string>
     <string name="checking_decryption" msgid="8287458611802609493">"ਜਾਂਚ ਕਰ ਰਿਹਾ ਹੈ..."</string>
     <string name="starting_android" msgid="4001324195902252681">"Android ਨੂੰ ਚਾਲੂ ਕਰ ਰਿਹਾ ਹੈ..."</string>
     <string name="delete" msgid="4219243412325163003">"ਮਿਟਾਓ"</string>
@@ -2351,94 +2361,98 @@
     <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_plan_usage_manage_plans_button_text" msgid="8997761990902708162">"ਯੋਜਨਾਵਾਂ ਦਾ ਪ੍ਰਬੰਧਨ ਕਰੋ"</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_cellular_data" msgid="9168928285122125137">"ਮੋਬਾਈਲ ਡਾਟਾ"</string>
+    <string name="data_usage_data_limit" msgid="1193930999713192703">" ਡਾਟਾ  ਸੀਮਾ ਸੈੱਟ ਕਰੋ"</string>
+    <string name="data_usage_cycle" msgid="5652529796195787949">"ਡਾਟਾ ਵਰਤੋਂ ਸਾਈਕਲ"</string>
     <string name="data_usage_app_items_header_text" msgid="5017850810459372828">"ਐਪ ਵਰਤੋਂ"</string>
-    <string name="data_usage_menu_roaming" msgid="8042359966835203296">"ਡੈਟਾ ਰੋਮਿੰਗ"</string>
-    <string name="data_usage_menu_restrict_background" msgid="1989394568592253331">"ਪਿਛੋਕੜ ਡੈਟਾ ਤੇ ਪ੍ਰਤਿਬੰਧ ਲਾਓ"</string>
-    <string name="data_usage_menu_allow_background" msgid="2694761978633359223">"ਪਿਛੋਕੜ ਡੈਟਾ ਦੀ ਆਗਿਆ ਦਿਓ"</string>
+    <string name="data_usage_menu_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>
-    <string name="data_usage_menu_show_wifi" msgid="2296217964873872571">"Wi‑Fi ਦਿਖਾਓ"</string>
-    <string name="data_usage_menu_hide_wifi" msgid="7290056718050186769">"Wi‑Fi ਲੁਕਾਓ"</string>
+    <string name="data_usage_menu_show_wifi" msgid="2296217964873872571">"ਵਾਈ‑ਫਾਈ ਦਿਖਾਓ"</string>
+    <string name="data_usage_menu_hide_wifi" msgid="7290056718050186769">"ਵਾਈ‑ਫਾਈ ਲੁਕਾਓ"</string>
     <string name="data_usage_menu_show_ethernet" msgid="5181361208532314097">"ਈਥਰਨੈਟ ਵਰਤੋਂ ਦਿਖਾਓ"</string>
     <string name="data_usage_menu_hide_ethernet" msgid="3326702187179943681">"ਈਥਰਨੈਟ ਵਰਤੋਂ ਲੁਕਾਓ"</string>
     <string name="data_usage_menu_metered" msgid="6235119991372755026">"ਨੈੱਟਵਰਕ ਪ੍ਰਤਿਬੰਧ"</string>
-    <string name="data_usage_menu_auto_sync" msgid="8203999775948778560">"ਡੈਟਾ ਸਵੈ-ਸਮਕਾਲੀਕਿਰਤ ਕਰੋ"</string>
+    <string name="data_usage_menu_auto_sync" msgid="8203999775948778560">" ਡਾਟਾ  ਸਵੈ-ਸਮਕਾਲੀਕਿਰਤ ਕਰੋ"</string>
     <string name="data_usage_menu_sim_cards" msgid="6410498422797244073">"SIM ਕਾਰਡ"</string>
     <string name="data_usage_menu_cellular_networks" msgid="8339835014751511300">"ਮੋਬਾਈਲ ਨੈੱਟਵਰਕ"</string>
     <string name="data_usage_cellular_data_summary" msgid="8413357481361268285">"ਸੀਮਾ ਤੇ ਰੋਕਿਆ"</string>
-    <string name="account_settings_menu_auto_sync" msgid="6243013719753700377">"ਡੈਟਾ ਸਵੈ-ਸਮਕਾਲੀਕਿਰਤ ਕਰੋ"</string>
-    <string name="account_settings_menu_auto_sync_personal" msgid="785541379617346438">"ਨਿੱਜੀ ਡੈਟਾ ਆਟੋ-ਸਿੰਕ ਕਰੋ"</string>
-    <string name="account_settings_menu_auto_sync_work" msgid="329565580969147026">"ਕੰਮ ਡੈਟਾ ਆਟੋ-ਸਿੰਕ ਕਰੋ"</string>
+    <string name="account_settings_menu_auto_sync" msgid="6243013719753700377">" ਡਾਟਾ  ਸਵੈ-ਸਮਕਾਲੀਕਿਰਤ ਕਰੋ"</string>
+    <string name="account_settings_menu_auto_sync_personal" msgid="785541379617346438">"ਨਿੱਜੀ  ਡਾਟਾ  ਆਟੋ-ਸਿੰਕ ਕਰੋ"</string>
+    <string name="account_settings_menu_auto_sync_work" msgid="329565580969147026">"ਕੰਮ  ਡਾਟਾ  ਆਟੋ-ਸਿੰਕ ਕਰੋ"</string>
     <string name="data_usage_change_cycle" msgid="7776556448920114866">"ਸਾਈਕਲ ਬਦਲੋ..."</string>
-    <string name="data_usage_pick_cycle_day" msgid="4470796861757050966">"ਡੈਟਾ ਉਪਯੋਗ ਸਾਈਕਲ ਰੀਸੈੱਟ ਕਰਨ ਲਈ ਮਹੀਨੇ ਦਾ ਦਿਨ:"</string>
-    <string name="data_usage_empty" msgid="8621855507876539282">"ਇਸ ਮਿਆਦ ਦੇ ਦੌਰਾਨ ਕਿਸੇ ਐਪਸ ਨੇ ਡੈਟਾ ਨਹੀਂ ਵਰਤਿਆ।"</string>
+    <string name="data_usage_pick_cycle_day" msgid="4470796861757050966">"ਡਾਟਾ ਵਰਤੋਂ ਸਾਈਕਲ ਰੀਸੈੱਟ ਕਰਨ ਲਈ ਮਹੀਨੇ ਦਾ ਦਿਨ:"</string>
+    <string name="data_usage_empty" msgid="8621855507876539282">"ਇਸ ਮਿਆਦ ਦੇ ਦੌਰਾਨ ਕਿਸੇ ਐਪਸ ਨੇ  ਡਾਟਾ  ਨਹੀਂ ਵਰਤਿਆ।"</string>
     <string name="data_usage_label_foreground" msgid="4938034231928628164">"ਫੋਰਗ੍ਰਾਊਂਡ"</string>
     <string name="data_usage_label_background" msgid="3225844085975764519">"ਪਿਛੋਕੜ"</string>
     <string name="data_usage_app_restricted" msgid="3568465218866589705">"ਪ੍ਰਤਿਬੰਧਿਤ"</string>
-    <string name="data_usage_disable_mobile" msgid="8656552431969276305">"ਮੋਬਾਈਲ ਡੈਟਾ ਬੰਦ ਕਰੀਏ?"</string>
-    <string name="data_usage_disable_mobile_limit" msgid="4644364396844393848">"ਮੋਬਾਈਲ ਡੈਟਾ ਸੀਮਾ ਸੈੱਟ ਕਰੋ"</string>
-    <string name="data_usage_disable_4g_limit" msgid="6233554774946681175">"4G ਡੈਟਾ ਸੀਮਾ ਸੈੱਟ ਕਰੋ"</string>
-    <string name="data_usage_disable_3g_limit" msgid="2558557840444266906">"2G-3G ਡੈਟਾ ਸੀਮਾ ਸੈੱਟ ਕਰੋ"</string>
-    <string name="data_usage_disable_wifi_limit" msgid="1394901415264660888">"Wi‑Fi ਡੈਟਾ ਸੀਮਾ ਸੈੱਟ ਕਰੋ"</string>
-    <string name="data_usage_tab_wifi" msgid="481146038146585749">"Wi‑Fi"</string>
+    <string name="data_usage_disable_mobile" msgid="8656552431969276305">"ਮੋਬਾਈਲ ਡਾਟਾ ਬੰਦ ਕਰਨਾ ਹੈ?"</string>
+    <string name="data_usage_disable_mobile_limit" msgid="4644364396844393848">"ਮੋਬਾਈਲ ਡਾਟਾ ਸੀਮਾ ਸੈੱਟ ਕਰੋ"</string>
+    <string name="data_usage_disable_4g_limit" msgid="6233554774946681175">"4G  ਡਾਟਾ  ਸੀਮਾ ਸੈੱਟ ਕਰੋ"</string>
+    <string name="data_usage_disable_3g_limit" msgid="2558557840444266906">"2G-3G ਡਾਟਾ ਸੀਮਾ ਸੈੱਟ ਕਰੋ"</string>
+    <string name="data_usage_disable_wifi_limit" msgid="1394901415264660888">"ਵਾਈ‑ਫਾਈ ਡਾਟਾ ਸੀਮਾ ਸੈੱਟ ਕਰੋ"</string>
+    <string name="data_usage_tab_wifi" msgid="481146038146585749">"ਵਾਈ‑ਫਾਈ"</string>
     <string name="data_usage_tab_ethernet" msgid="7298064366282319911">"ਈਥਰਨੈਟ"</string>
     <string name="data_usage_tab_mobile" msgid="454140350007299045">"ਮੋਬਾਈਲ"</string>
     <string name="data_usage_tab_4g" msgid="1301978716067512235">"4G"</string>
     <string name="data_usage_tab_3g" msgid="6092169523081538718">"2G-3G"</string>
     <string name="data_usage_list_mobile" msgid="5588685410495019866">"ਮੋਬਾਈਲ"</string>
     <string name="data_usage_list_none" msgid="3933892774251050735">"ਕੋਈ ਨਹੀਂ"</string>
-    <string name="data_usage_enable_mobile" msgid="986782622560157977">"ਮੋਬਾਈਲ ਡੈਟਾ"</string>
-    <string name="data_usage_enable_3g" msgid="6304006671869578254">"2G-3G ਡੈਟਾ"</string>
-    <string name="data_usage_enable_4g" msgid="3635854097335036738">"4G ਡੈਟਾ"</string>
+    <string name="data_usage_enable_mobile" msgid="986782622560157977">"ਮੋਬਾਈਲ ਡਾਟਾ"</string>
+    <string name="data_usage_enable_3g" msgid="6304006671869578254">"2G-3G ਡਾਟਾ"</string>
+    <string name="data_usage_enable_4g" msgid="3635854097335036738">"4G  ਡਾਟਾ"</string>
     <string name="data_usage_forground_label" msgid="7654319010655983591">"ਫੋਰਗ੍ਰਾਊਂਡ:"</string>
     <string name="data_usage_background_label" msgid="2722008379947694926">"ਪਿਛੋਕੜ"</string>
     <string name="data_usage_app_settings" msgid="2279171379771253165">"ਐਪ ਸੈਟਿੰਗਾਂ"</string>
-    <string name="data_usage_app_restrict_background" msgid="7359227831562303223">"ਪਿਛੋਕੜ ਡੈਟਾ"</string>
-    <string name="data_usage_app_restrict_background_summary" msgid="5853552187570622572">"ਬੈਕਗ੍ਰਾਊਂਡ ਵਿੱਚ ਮੋਬਾਈਲ ਡੈਟੇ ਦੀ ਵਰਤੋਂ ਨੂੰ ਯੋਗ ਬਣਾਓ"</string>
-    <string name="data_usage_app_restrict_background_summary_disabled" msgid="7401927377070755054">"ਇਸ ਐਪ ਲਈ ਪਿਛੋਕੜ ਡੈਟਾ ਤੇ ਪ੍ਰਤਿਬੰਧ ਲਾਉਣ ਲਈ, ਪਹਿਲਾਂ ਇੱਕ ਮੋਬਾਈਲ ਡੈਟਾ ਸੀਮਾ ਸੈੱਟ ਕਰੋ।"</string>
-    <string name="data_usage_app_restrict_dialog_title" msgid="1613108390242737923">"ਕੀ ਪਿਛੋਕੜ ਡੈਟਾ ਤੇ ਪ੍ਰਤਿਬੰਧ ਲਾਉਣਾ ਹੈ?"</string>
-    <string name="data_usage_app_restrict_dialog" msgid="1466689968707308512">"ਇਹ ਵਿਸ਼ੇਸ਼ਤਾ ਇੱਕ ਅਜਿਹੇ ਐਪ ਦਾ ਕਾਰਨ ਬਣ ਸਕਦੀ ਹੈ ਜੋ ਕੰਮ ਕਰਨਾ ਬੰਦ ਕਰਨ ਲਈ ਪਿਛੋਕੜ ਡੈਟਾ ਤੇ ਨਿਰਭਰ ਹੈ, ਕੇਵਲ ਉਦੋਂ ਜਦੋਂ ਮੋਬਾਈਲ ਨੈੱਟਵਰਕ ਉਪਲਬਧ ਹੋਣ।\n\nਤੁਸੀਂ ਐਪ ਵਿੱਚ ਉਪਲਬਧ ਸੈਟਿੰਗਾਂ ਵਿੱਚ ਹੋਰ ਉਚਿਤ ਡੈਟਾ ਉਪਯੋਗ ਨਿਯੰਤਰਣ ਲੱਭ ਸਕਦੇ ਹੋ।"</string>
-    <string name="data_usage_restrict_denied_dialog" msgid="55012417305745608">"ਬੈਕਗ੍ਰਾਊਂਡ ਡੈਟੇ \'ਤੇ ਪਾਬੰਦੀ ਲਗਾਉਣਾ ਕੇਵਲ ਉਦੋਂ ਸੰਭਵ ਹੈ ਜਦੋਂ ਤੁਸੀਂ ਇੱਕ ਮੋਬਾਈਲ ਡੈਟਾ ਸੀਮਾ ਸੈੱਟ ਕੀਤੀ ਹੋਵੇ।"</string>
-    <string name="data_usage_auto_sync_on_dialog_title" msgid="2438617846762244389">"ਕੀ ਆਟੋ-ਸਿੰਕ ਡੈਟਾ ਚਾਲੂ ਕਰਨਾ ਹੈ?"</string>
-    <string name="data_usage_auto_sync_on_dialog" product="tablet" msgid="8581983093524041669">"ਤੁਸੀਂ ਵੈਬ ਤੇ ਆਪਣੇ ਖਾਤਿਆਂ ਵਿੱਚ ਜੋ ਕੋਈ ਵੀ ਬਦਲਾਵ ਕਰਦੇ ਹੋ, ਉਹ ਆਟੋਮੈਟਿਕਲੀ ਤੁਹਾਡੀ ਟੈਬਲੇਟ ਤੇ ਕਾਪੀ ਕੀਤੇ ਜਾਣਗੇ।\n\nਕੁਝ ਖਾਤੇ ਆਟੋਮੈਟਿਕਲੀ ਉਹ ਬਦਲਾਵ ਕਾਪੀ ਕਰ ਸਕਦੇ ਹਨ ਜੋ ਤੁਸੀਂ ਵੈਬ ਤੇ ਆਪਣੀ ਟੈਬਲੇਟ ਵਿੱਚ ਕਰਦੇ ਹੋ। ਇੱਕ Google ਖਾਤਾ ਇਸ ਤਰ੍ਹਾਂ ਕੰਮ ਕਰਦਾ ਹੈ।"</string>
-    <string name="data_usage_auto_sync_on_dialog" product="default" msgid="8651376294887142858">"ਤੁਸੀਂ ਵੈਬ ਤੇ ਆਪਣੇ ਖਾਤਿਆਂ ਵਿੱਚ ਜੋ ਕੋਈ ਵੀ ਬਦਲਾਵ ਕਰਦੇ ਹੋ, ਉਹ ਆਟੋਮੈਟਿਕਲੀ ਤੁਹਾਡੇ ਫੋਨ ਤੇ ਕਾਪੀ ਕੀਤੇ ਜਾਣਗੇ।\n\nਕੁਝ ਖਾਤੇ ਆਟੋਮੈਟਿਕਲੀ ਉਹ ਬਦਲਾਵ ਕਾਪੀ ਕਰ ਸਕਦੇ ਹਨ ਜੋ ਤੁਸੀਂ ਵੈਬ ਤੇ ਆਪਣੇ ਫੋਨ ਵਿੱਚ ਕਰਦੇ ਹੋ। ਇੱਕ Google ਖਾਤਾ ਇਸ ਤਰ੍ਹਾਂ ਕੰਮ ਕਰਦਾ ਹੈ।"</string>
-    <string name="data_usage_auto_sync_off_dialog_title" msgid="9013139130490125793">"ਡੈਟੇ ਦਾ ਸਵੈ-ਸਮਕਾਲੀਕਰਨ ਬੰਦ ਕਰੀਏ?"</string>
-    <string name="data_usage_auto_sync_off_dialog" msgid="4025938250775413864">"ਇਹ ਡੈਟੇ ਅਤੇ ਬੈਟਰੀ ਦੀ ਬੱਚਤ ਕਰੇਗਾ, ਪਰ ਹਾਲੀਆ ਜਾਣਕਾਰੀ ਇਕੱਤਰ ਕਰਨ ਲਈ ਤੁਹਾਨੂੰ ਹਰੇਕ ਖਾਤੇ ਦਾ ਹੱਥੀਂ ਸਮਕਾਲੀਕਰਨ ਕਰਨ ਦੀ ਲੋੜ ਹੋਵੇਗੀ। ਇਸਤੋਂ ਇਲਾਵਾ ਜਦੋਂ ਅੱਪਡੇਟ ਹੁੰਦੇ ਹਨ ਤਾਂ ਤੁਸੀਂ ਸੂਚਨਾਵਾਂ ਪ੍ਰਾਪਤ ਨਹੀਂ ਕਰੋਂਗੇ।"</string>
+    <string name="data_usage_app_restrict_background" msgid="7359227831562303223">"ਪਿਛੋਕੜ  ਡਾਟਾ"</string>
+    <string name="data_usage_app_restrict_background_summary" msgid="5853552187570622572">"ਬੈਕਗ੍ਰਾਊਂਡ ਵਿੱਚ ਮੋਬਾਈਲ ਡਾਟਾ ਦੀ ਵਰਤੋਂ ਨੂੰ ਚਾਲੂ ਕਰੋ"</string>
+    <string name="data_usage_app_restrict_background_summary_disabled" msgid="7401927377070755054">"ਇਸ ਐਪ ਲਈ ਬੈਕਗ੍ਰਾਊਂਡ ਡਾਟਾ ਤੇ ਪ੍ਰਤਿਬੰਧ ਲਾਉਣ ਲਈ, ਪਹਿਲਾਂ ਇੱਕ ਮੋਬਾਈਲ ਡਾਟਾ ਸੀਮਾ ਸੈੱਟ ਕਰੋ।"</string>
+    <string name="data_usage_app_restrict_dialog_title" msgid="1613108390242737923">"ਕੀ ਪਿਛੋਕੜ  ਡਾਟਾ  ਤੇ ਪ੍ਰਤਿਬੰਧ ਲਾਉਣਾ ਹੈ?"</string>
+    <string name="data_usage_app_restrict_dialog" msgid="1466689968707308512">"ਇਹ ਵਿਸ਼ੇਸ਼ਤਾ ਇੱਕ ਅਜਿਹੇ ਐਪ ਦਾ ਕਾਰਨ ਬਣ ਸਕਦੀ ਹੈ ਜੋ ਕੰਮ ਕਰਨਾ ਬੰਦ ਕਰਨ ਲਈ ਬੈਕਗ੍ਰਾਊਂਡ ਡਾਟਾ ਤੇ ਨਿਰਭਰ ਹੈ, ਕੇਵਲ ਉਦੋਂ ਜਦੋਂ ਮੋਬਾਈਲ ਨੈੱਟਵਰਕ ਉਪਲਬਧ ਹੋਣ।\n\nਤੁਸੀਂ ਐਪ ਵਿੱਚ ਉਪਲਬਧ ਸੈਟਿੰਗਾਂ ਵਿੱਚ ਹੋਰ ਉਚਿਤ ਡਾਟਾ ਵਰਤੋਂ ਨਿਯੰਤਰਣ ਲੱਭ ਸਕਦੇ ਹੋ।"</string>
+    <string name="data_usage_restrict_denied_dialog" msgid="55012417305745608">"ਬੈਕਗ੍ਰਾਊਂਡ ਡਾਟੇ \'ਤੇ ਪਾਬੰਦੀ ਲਗਾਉਣਾ ਸਿਰਫ਼ ਉਦੋਂ ਸੰਭਵ ਹੈ ਜਦੋਂ ਤੁਸੀਂ ਇੱਕ ਮੋਬਾਈਲ ਡਾਟਾ ਸੀਮਾ ਸੈੱਟ ਕੀਤੀ ਹੋਵੇ।"</string>
+    <string name="data_usage_auto_sync_on_dialog_title" msgid="2438617846762244389">"ਕੀ ਆਟੋ-ਸਿੰਕ  ਡਾਟਾ  ਚਾਲੂ ਕਰਨਾ ਹੈ?"</string>
+    <string name="data_usage_auto_sync_on_dialog" product="tablet" msgid="8581983093524041669">"ਵੈੱਬ ਤੇ ਤੁਹਾਡੇ ਖਾਤਿਆਂ ਵਿੱਚ ਕੀਤੇ ਗਏ ਕੋਈ ਵੀ ਬਦਲਾਅ ਸਵੈਚਲਿਤ ਤੌਰ \'ਤੇ ਹੀ ਤੁਹਾਡੇ ਟੈਬਲੈੱਟ ਤੇ ਕਾਪੀ ਕੀਤੇ ਜਾਣਗੇ।\n\nਕੁਝ ਖਾਤੇ ਸਵੈਚਲਿਤ ਤੌਰ \'ਤੇ ਉਹ ਬਦਲਾਅ ਕਾਪੀ ਕਰ ਸਕਦੇ ਹਨ ਜੋ ਤੁਸੀਂ ਵੈੱਬ ਤੇ ਆਪਣੇ ਟੈਬਲੈੱਟ ਵਿੱਚ ਕਰਦੇ ਹੋ। ਇੱਕ Google ਖਾਤਾ ਇਸ ਤਰ੍ਹਾਂ ਕੰਮ ਕਰਦਾ ਹੈ।"</string>
+    <string name="data_usage_auto_sync_on_dialog" product="default" msgid="8651376294887142858">"ਤੁਸੀਂ ਵੈੱਬ ਤੇ ਆਪਣੇ ਖਾਤਿਆਂ ਵਿੱਚ ਜੋ ਕੋਈ ਵੀ ਬਦਲਾਵ ਕਰਦੇ ਹੋ, ਉਹ ਸਵੈਚਲਿਤ ਤੌਰ \'ਤੇ ਤੁਹਾਡੇ ਫ਼ੋਨ ਤੇ ਕਾਪੀ ਕੀਤੇ ਜਾਣਗੇ।\n\nਕੁਝ ਖਾਤੇ ਸਵੈਚਲਿਤ ਤੌਰ \'ਤੇ ਉਹ ਬਦਲਾਵ ਕਾਪੀ ਕਰ ਸਕਦੇ ਹਨ ਜੋ ਤੁਸੀਂ ਵੈੱਬ ਤੇ ਆਪਣੇ ਫ਼ੋਨ ਵਿੱਚ ਕਰਦੇ ਹੋ। ਇੱਕ Google ਖਾਤਾ ਇਸ ਤਰ੍ਹਾਂ ਕੰਮ ਕਰਦਾ ਹੈ।"</string>
+    <string name="data_usage_auto_sync_off_dialog_title" msgid="9013139130490125793">"ਡਾਟੇ ਦਾ ਸਵੈ-ਸਮਕਾਲੀਕਰਨ ਬੰਦ ਕਰੀਏ?"</string>
+    <string name="data_usage_auto_sync_off_dialog" msgid="4025938250775413864">"ਇਹ ਡਾਟਾ ਅਤੇ ਬੈਟਰੀ ਦੀ ਬੱਚਤ ਕਰੇਗਾ, ਪਰ ਹਾਲੀਆ ਜਾਣਕਾਰੀ ਇਕੱਤਰ ਕਰਨ ਲਈ ਤੁਹਾਨੂੰ ਹਰੇਕ ਖਾਤੇ ਦਾ ਹੱਥੀਂ ਸਮਕਾਲੀਕਰਨ ਕਰਨ ਦੀ ਲੋੜ ਹੋਵੇਗੀ। ਇਸਤੋਂ ਇਲਾਵਾ ਜਦੋਂ ਅੱਪਡੇਟ ਹੁੰਦੇ ਹਨ ਤਾਂ ਤੁਸੀਂ ਸੂਚਨਾਵਾਂ ਪ੍ਰਾਪਤ ਨਹੀਂ ਕਰੋਂਗੇ।"</string>
     <string name="data_usage_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_restrict_background_title" msgid="2201315502223035062">"ਕੀ ਪਿਛੋਕੜ ਡੈਟਾ ਤੇ ਪ੍ਰਤਿਬੰਧ ਲਾਉਣਾ ਹੈ?"</string>
-    <string name="data_usage_restrict_background" msgid="434093644726734586">"ਜੇਕਰ ਤੁਸੀਂ ਬੈਕਗ੍ਰਾਊਂਡ ਮੋਬਾਈਲ ਡੈਟੇ \'ਤੇ ਪਾਬੰਦੀ ਲਗਾਉਂਦੇ ਹੋ, ਤਾਂ ਕੁਝ ਐਪਾਂ ਅਤੇ ਸੇਵਾਵਾਂ ਉਦੋਂ ਤੱਕ ਕੰਮ ਨਹੀਂ ਕਰਨਗੀਆਂ ਜਦੋਂ ਤੱਕ ਤੁਸੀਂ Wi‑Fi ਨਾਲ ਕਨੈਕਟ ਨਹੀਂ ਹੁੰਦੇ।"</string>
-    <string name="data_usage_restrict_background_multiuser" product="tablet" msgid="7096707497743363380">"ਜੇਕਰ ਤੁਸੀਂ ਬੈਕਗ੍ਰਾਊਂਡ ਮੋਬਾਈਲ ਡੈਟੇ \'ਤੇ ਪ੍ਰਤੀਬੰਧ ਲਗਾਉਂਦੇ ਹੋ, ਤਾਂ ਕੁਝ ਐਪਾਂ ਅਤੇ ਸੇਵਾਵਾਂ ਉਦੋਂ ਤੱਕ ਕੰਮ ਨਹੀਂ ਕਰਨਗੀਆਂ ਜਦੋਂ ਤੱਕ ਤੁਸੀਂ Wi‑Fi ਨਾਲ ਕਨੈਕਟ ਨਹੀਂ ਹੁੰਦੇ।\n\nਇਹ ਸੈਟਿੰਗ ਇਸ ਟੈਬਲੈੱਟ \'ਤੇ ਸਾਰੇ ਵਰਤੋਂਕਾਰਾਂ ਨੂੰ ਪ੍ਰਭਾਵਿਤ ਕਰਦੀ ਹੈ।"</string>
-    <string name="data_usage_restrict_background_multiuser" product="default" msgid="7910798414964288424">"ਜੇਕਰ ਤੁਸੀਂ ਬੈਕਗ੍ਰਾਊਂਡ ਮੋਬਾਈਲ ਡੈਟੇ \'ਤੇ ਪਾਬੰਦੀ ਲਗਾਉਂਦੇ ਹੋ, ਤਾਂ ਕੁਝ ਐਪਾਂ ਅਤੇ ਸੇਵਾਵਾਂ ਉਦੋਂ ਤੱਕ ਕੰਮ ਨਹੀਂ ਕਰਨਗੀਆਂ ਜਦੋਂ ਤੱਕ ਤੁਸੀਂ Wi‑Fi ਨਾਲ ਕਨੈਕਟ ਨਹੀਂ ਹੁੰਦੇ।\n\nਇਹ ਸੈਟਿੰਗ ਇਸ ਫ਼ੋਨ \'ਤੇ ਸਾਰੇ ਵਰਤੋਂਕਾਰਾਂ ਨੂੰ ਪ੍ਰਭਾਵਿਤ ਕਰਦੀ ਹੈ।"</string>
+    <string name="data_usage_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>
+    <string name="data_usage_restrict_background_multiuser" product="default" msgid="7910798414964288424">"ਜੇਕਰ ਤੁਸੀਂ ਬੈਕਗ੍ਰਾਊਂਡ ਮੋਬਾਈਲ ਡਾਟੇ \'ਤੇ ਪਾਬੰਦੀ ਲਗਾਉਂਦੇ ਹੋ, ਤਾਂ ਕੁਝ ਐਪਾਂ ਅਤੇ ਸੇਵਾਵਾਂ ਉਦੋਂ ਤੱਕ ਕੰਮ ਨਹੀਂ ਕਰਨਗੀਆਂ ਜਦੋਂ ਤੱਕ ਤੁਸੀਂ ਵਾਈ-ਫਾਈ ਨਾਲ ਕਨੈਕਟ ਨਹੀਂ ਹੁੰਦੇ।\n\nਇਹ ਸੈਟਿੰਗ ਇਸ ਫ਼ੋਨ \'ਤੇ ਸਾਰੇ ਵਰਤੋਂਕਾਰਾਂ ਨੂੰ ਪ੍ਰਭਾਵਿਤ ਕਰਦੀ ਹੈ।"</string>
     <string name="data_usage_sweep_warning" msgid="6387081852568846982"><font size="18">"<xliff:g id="NUMBER">^1</xliff:g>"</font>" "<font size="9">"<xliff:g id="UNIT">^2</xliff:g>"</font>\n<font size="12">"ਚਿਤਾਵਨੀ"</font></string>
     <string name="data_usage_sweep_limit" msgid="860566507375933039"><font size="18">"<xliff:g id="NUMBER">^1</xliff:g>"</font>" "<font size="9">"<xliff:g id="UNIT">^2</xliff:g>"</font>\n<font size="12">"ਸੀਮਾ"</font></string>
     <string name="data_usage_uninstalled_apps" msgid="614263770923231598">"ਹਟਾਏ ਗਏ ਐਪਸ"</string>
     <string name="data_usage_uninstalled_apps_users" msgid="7986294489899813194">"ਹਟਾਏ ਗਏ ਐਪਸ ਅਤੇ ਉਪਭੋਗਤਾ"</string>
     <string name="data_usage_received_sent" msgid="5039699009276621757">"<xliff:g id="RECEIVED">%1$s</xliff:g> ਪ੍ਰਾਪਤ ਕੀਤਾ, <xliff:g id="SENT">%2$s</xliff:g> ਭੇਜਿਆ"</string>
     <string name="data_usage_total_during_range" msgid="4091294280619255237">"<xliff:g id="RANGE">%2$s</xliff:g>: ਲਗਭਗ <xliff:g id="TOTAL">%1$s</xliff:g> ਵਰਤਿਆ।"</string>
-    <string name="data_usage_total_during_range_mobile" product="tablet" msgid="1925687342154538972">"<xliff:g id="RANGE">%2$s</xliff:g>: ਲਗਭਗ <xliff:g id="TOTAL">%1$s</xliff:g> ਵਰਤੋਂ ਕੀਤੀ, ਜਿਵੇਂ ਕਿ ਤੁਹਾਡੀ ਟੈਬਲੇਟ ਵੱਲੋਂ ਹਿਸਾਬ ਲਗਾਇਆ ਗਿਆ ਹੈ। ਤੁਹਾਡੇ ਕੈਰੀਅਰ ਦਾ ਡੈਟਾ ਉਪਯੋਗ ਹਿਸਾਬ ਵੱਖ ਹੋ ਸਕਦਾ ਹੈ।"</string>
-    <string name="data_usage_total_during_range_mobile" product="default" msgid="5063981061103812900">"<xliff:g id="RANGE">%2$s</xliff:g>: ਲਗਭਗ <xliff:g id="TOTAL">%1$s</xliff:g> ਵਰਤੋਂ ਕੀਤੀ, ਜਿਵੇਂ ਕਿ ਤੁਹਾਡੇ ਫੋਨ ਵੱਲੋਂ ਹਿਸਾਬ ਲਗਾਇਆ ਗਿਆ ਹੈ। ਤੁਹਾਡੇ ਕੈਰੀਅਰ ਦਾ ਡੈਟਾ ਉਪਯੋਗ ਹਿਸਾਬ ਵੱਖ ਹੋ ਸਕਦਾ ਹੈ।"</string>
+    <string name="data_usage_total_during_range_mobile" product="tablet" msgid="1925687342154538972">"<xliff:g id="RANGE">%2$s</xliff:g>: ਲਗਭਗ <xliff:g id="TOTAL">%1$s</xliff:g> ਵਰਤੋਂ ਕੀਤੀ, ਜਿਵੇਂ ਤੁਹਾਡੇ ਟੈਬਲੈੱਟ ਵੱਲੋਂ ਹਿਸਾਬ ਲਗਾਇਆ। ਤੁਹਾਡੇ ਕੈਰੀਅਰ ਦਾ ਡਾਟਾ ਵਰਤੋਂ ਹਿਸਾਬ ਵੱਖ ਹੋ ਸਕਦਾ ਹੈ।"</string>
+    <string name="data_usage_total_during_range_mobile" product="default" msgid="5063981061103812900">"<xliff:g id="RANGE">%2$s</xliff:g>: ਲਗਭਗ <xliff:g id="TOTAL">%1$s</xliff:g> ਵਰਤੋਂ ਕੀਤੀ, ਜਿਵੇਂ ਕਿ ਤੁਹਾਡੇ ਫ਼ੋਨ ਵੱਲੋਂ ਹਿਸਾਬ ਲਗਾਇਆ ਗਿਆ ਹੈ। ਤੁਹਾਡੇ ਕੈਰੀਅਰ ਦਾ ਡਾਟਾ ਵਰਤੋਂ ਹਿਸਾਬ ਵੱਖ ਹੋ ਸਕਦਾ ਹੈ।"</string>
     <string name="data_usage_metered_title" msgid="7383175371006596441">"ਨੈੱਟਵਰਕ ਪ੍ਰਤਿਬੰਧ"</string>
-    <string name="data_usage_metered_body" msgid="7655851702771342507">"ਬੈਕਗ੍ਰਾਊਂਡ ਡੈਟੇ \'ਤੇ ਪਾਬੰਦੀ ਲਗਾਏ ਜਾਣ \'ਤੇ ਮੀਟਰ ਕੀਤੇ ਨੈੱਟਵਰਕਾਂ ਨਾਲ ਮੋਬਾਈਲ ਨੈੱਟਵਰਕਾਂ ਵਰਗਾ ਵਿਹਾਰ ਕੀਤਾ ਜਾਂਦਾ ਹੈ। ਐਪਾਂ ਵੱਡੇ ਡਾਊਨਲੋਡਾਂ ਲਈ ਇਹਨਾਂ ਨੈੱਟਵਰਕਾਂ ਦੀ ਵਰਤੋਂ ਕਰਨ ਤੋਂ ਪਹਿਲਾਂ ਚੇਤਾਵਨੀ ਦੇ ਸਕਦੀਆਂ ਹਨ।"</string>
+    <string name="data_usage_metered_body" msgid="7655851702771342507">"ਬੈਕਗ੍ਰਾਊਂਡ ਡਾਟੇ \'ਤੇ ਪਾਬੰਦੀ ਲਗਾਏ ਜਾਣ \'ਤੇ ਮੀਟਰ ਕੀਤੇ ਨੈੱਟਵਰਕਾਂ ਨਾਲ ਮੋਬਾਈਲ ਨੈੱਟਵਰਕਾਂ ਵਰਗਾ ਵਿਹਾਰ ਕੀਤਾ ਜਾਂਦਾ ਹੈ। ਐਪਾਂ ਵੱਡੇ ਡਾਊਨਲੋਡਾਂ ਲਈ ਇਹਨਾਂ ਨੈੱਟਵਰਕਾਂ ਦੀ ਵਰਤੋਂ ਕਰਨ ਤੋਂ ਪਹਿਲਾਂ ਚਿਤਾਵਨੀ ਦੇ ਸਕਦੀਆਂ ਹਨ।"</string>
     <string name="data_usage_metered_mobile" msgid="5423305619126978393">"ਮੋਬਾਈਲ ਨੈੱਟਵਰਕ"</string>
-    <string name="data_usage_metered_wifi" msgid="1761738002328299714">"ਮੀਟਰਡ Wi‑Fi ਨੈੱਟਵਰਕ"</string>
-    <string name="data_usage_metered_wifi_disabled" msgid="727808462375941567">"ਮੀਟਰਡ ਨੈੱਟਵਰਕ ਚੁਣਨ ਲਈ, Wi‑Fi ਚਾਲੂ ਕਰੋ।"</string>
-    <string name="data_usage_disclaimer" msgid="6887858149980673444">"ਕੈਰੀਅਰ ਦਾ ਡੈਟਾ ਹਿਸਾਬ ਤੁਹਾਡੀ ਡੀਵਾਈਸ ਤੋਂ ਵੱਖ ਹੋ ਸਕਦਾ ਹੈ।"</string>
-    <string name="cryptkeeper_emergency_call" msgid="198578731586097145">"ਐਮਰਜੈਂਸੀ ਕਾਲ ਕਰੋ"</string>
-    <string name="cryptkeeper_return_to_call" msgid="5613717339452772491">"ਕਾਲ ਤੇ ਵਾਪਸ ਜਾਓ"</string>
+    <string name="data_usage_metered_wifi" msgid="1761738002328299714">"ਮੀਟਰਬੱਧ ਕੀਤੇ ਗਏ ਵਾਈ‑ਫਾਈ ਨੈੱਟਵਰਕ"</string>
+    <string name="data_usage_metered_wifi_disabled" msgid="727808462375941567">"ਮੀਟਰਬੱਧ ਕੀਤੇ ਗਏ ਨੈੱਟਵਰਕ ਚੁਣਨ ਲਈ, ਵਾਈ‑ਫਾਈ ਚਾਲੂ ਕਰੋ।"</string>
+    <string name="data_usage_metered_auto" msgid="1262028400911918865">"ਸਵੈਚਲਿਤ"</string>
+    <string name="data_usage_metered_yes" msgid="9217539611385225894">"ਮੀਟਰਬੱਧ ਕੀਤਾ ਗਿਆ"</string>
+    <string name="data_usage_metered_no" msgid="4025232961929071789">"ਮੀਟਰਬੱਧ ਨਹੀਂ ਕੀਤਾ ਗਿਆ"</string>
+    <string name="data_usage_disclaimer" msgid="6887858149980673444">"ਕੈਰੀਅਰ ਦਾ ਡਾਟਾ ਹਿਸਾਬ ਤੁਹਾਡੇ ਡੀਵਾਈਸ ਤੋਂ ਵੱਖ ਹੋ ਸਕਦਾ ਹੈ।"</string>
+    <string name="cryptkeeper_emergency_call" msgid="198578731586097145">"ਸੰਕਟਕਾਲੀਨ ਕਾਲ"</string>
+    <string name="cryptkeeper_return_to_call" msgid="5613717339452772491">"ਕਾਲ \'ਤੇ ਵਾਪਸ ਜਾਓ"</string>
     <string name="vpn_name" msgid="4689699885361002297">"ਨਾਮ"</string>
     <string name="vpn_type" msgid="5435733139514388070">"ਟਾਈਪ ਕਰੋ"</string>
     <string name="vpn_server" msgid="2123096727287421913">"ਸਰਵਰ ਦਾ ਪਤਾ"</string>
@@ -2446,18 +2460,18 @@
     <string name="vpn_l2tp_secret" msgid="529359749677142076">"L2TP ਗੁਪਤ"</string>
     <string name="vpn_ipsec_identifier" msgid="4098175859460006296">"IPSec ਪਛਾਣਕਰਤਾ"</string>
     <string name="vpn_ipsec_secret" msgid="4526453255704888704">"IPSec ਪ੍ਰੀ-ਸ਼ੇਅਰ ਕੀਤੀ ਕੁੰਜੀ"</string>
-    <string name="vpn_ipsec_user_cert" msgid="6880651510020187230">"IPSec ਉਪਭੋਗਤਾ ਸਰਟੀਫਿਕੇਟ"</string>
-    <string name="vpn_ipsec_ca_cert" msgid="91338213449148229">"IPSec CA ਸਰਟੀਫਿਕੇਟ"</string>
+    <string name="vpn_ipsec_user_cert" msgid="6880651510020187230">"IPSec ਵਰਤੋਂਕਾਰ ਪ੍ਰਮਾਣ-ਪੱਤਰ"</string>
+    <string name="vpn_ipsec_ca_cert" msgid="91338213449148229">"IPSec CA ਪ੍ਰਮਾਣ-ਪੱਤਰ"</string>
     <string name="vpn_ipsec_server_cert" msgid="6599276718456935010">"IPSec ਸਰਵਰ ਸਰਟੀਫਿਕੇਟ"</string>
-    <string name="vpn_show_options" msgid="7182688955890457003">"ਉੱਨਤ ਚੋਣਾਂ ਦਿਖਾਓ"</string>
+    <string name="vpn_show_options" msgid="7182688955890457003">"ਵਿਕਸਿਤ ਚੋਣਾਂ ਦਿਖਾਓ"</string>
     <string name="vpn_search_domains" msgid="5391995501541199624">"DNS ਖੋਜ ਡੋਮੇਨ"</string>
-    <string name="vpn_dns_servers" msgid="5570715561245741829">"DNS ਸਰਵਰ (ਉਦਾਹਰਨ ਲਈ 8.8.8.8)"</string>
-    <string name="vpn_routes" msgid="3818655448226312232">"ਫਾਰਵਰਡਿੰਗ ਰੂਟਸ (ਉਦਾਹਰਨ ਲਈ 10.0.0.0/8)"</string>
+    <string name="vpn_dns_servers" msgid="5570715561245741829">"DNS ਸਰਵਰ (ਉਦਾਹਰਨ ਵਜੋਂ 8.8.8.8)"</string>
+    <string name="vpn_routes" msgid="3818655448226312232">"ਫਾਰਵਰਡਿੰਗ ਰੂਟਸ (ਉਦਾਹਰਨ ਵਜੋਂ 10.0.0.0/8)"</string>
     <string name="vpn_username" msgid="1863901629860867849">"ਵਰਤੋਂਕਾਰ ਨਾਮ"</string>
     <string name="vpn_password" msgid="6756043647233596772">"ਪਾਸਵਰਡ"</string>
     <string name="vpn_save_login" msgid="6350322456427484881">"ਖਾਤਾ ਜਾਣਕਾਰੀ ਰੱਖਿਅਤ ਕਰੋ"</string>
     <string name="vpn_not_used" msgid="9094191054524660891">"(ਵਰਤਿਆ ਨਹੀਂ)"</string>
-    <string name="vpn_no_ca_cert" msgid="8776029412793353361">"(ਸਰਵਰ ਪ੍ਰਮਾਣਿਤ ਨਾ ਕਰੋ)"</string>
+    <string name="vpn_no_ca_cert" msgid="8776029412793353361">"(ਸਰਵਰ ਦੀ ਪੁਸ਼ਟੀ ਨਾ ਕਰੋ)"</string>
     <string name="vpn_no_server_cert" msgid="2167487440231913330">"(ਸਰਵਰ ਤੋਂ ਪ੍ਰਾਪਤ ਕੀਤਾ)"</string>
     <string name="vpn_always_on_invalid_reason_type" msgid="7574518311224455825">"ਇਹ VPN ਕਿਸਮ ਹਰ ਸਮੇਂ ਕਨੈਕਟ ਹੋਈ ਨਹੀਂ ਰਹਿ ਸਕਦੀ"</string>
     <string name="vpn_always_on_invalid_reason_server" msgid="477304620899799383">"\'ਹਮੇਸ਼ਾ-ਚਾਲੂ VPN\' ਸਿਰਫ਼ ਸੰਖਿਆਤਮਿਕ ਸਰਵਰ ਪਤਿਆਂ ਦਾ ਸਮਰਥਨ ਕਰਦਾ ਹੈ"</string>
@@ -2469,12 +2483,12 @@
     <string name="vpn_save" msgid="4233484051644764510">"ਰੱਖਿਅਤ ਕਰੋ"</string>
     <string name="vpn_connect" msgid="8469608541746132301">"ਕਨੈਕਟ ਕਰੋ"</string>
     <string name="vpn_replace" msgid="5442836256121957861">"ਤਬਦੀਲ ਕਰੋ"</string>
-    <string name="vpn_edit" msgid="8647191407179996943">"VPN ਪ੍ਰੋਫਾਈਲ ਸੰਪਾਦਿਤ ਕਰੋ"</string>
+    <string name="vpn_edit" msgid="8647191407179996943">"VPN ਪ੍ਰੋਫਾਈਲ ਦਾ ਸੰਪਾਦਨ ਕਰੋ"</string>
     <string name="vpn_forget" msgid="3684651372749415446">"ਭੁੱਲ ਜਾਓ"</string>
     <string name="vpn_connect_to" msgid="5965299358485793260">"<xliff:g id="PROFILE">%s</xliff:g> ਨਾਲ ਕਨੈਕਟ ਕਰੋ"</string>
     <string name="vpn_disconnect_confirm" msgid="3743970132487505659">"ਇਹ VPN ਡਿਸਕਨੈਕਟ ਕਰੀਏ?"</string>
     <string name="vpn_disconnect" msgid="7426570492642111171">"ਡਿਸਕਨੈਕਟ ਕਰੋ"</string>
-    <string name="vpn_version" msgid="1939804054179766249">"ਸੰਸਕਰਨ <xliff:g id="VERSION">%s</xliff:g>"</string>
+    <string name="vpn_version" msgid="1939804054179766249">"ਵਰਜਨ <xliff:g id="VERSION">%s</xliff:g>"</string>
     <string name="vpn_forget_long" msgid="2232239391189465752">"VPN ਨੂੰ ਛੱਡੋ"</string>
     <string name="vpn_replace_vpn_title" msgid="2963898301277610248">"ਕੀ ਮੌਜੂਦਾ VPN ਨੂੰ ਤਬਦੀਲ ਕਰਨਾ ਹੈ?"</string>
     <string name="vpn_set_vpn_title" msgid="4009987321156037267">"ਕੀ ਹਮੇਸ਼ਾ-ਚਾਲੂ VPN ਨੂੰ ਸੈੱਟ ਕਰਨਾ ਹੈ?"</string>
@@ -2486,19 +2500,19 @@
     <string name="vpn_cant_connect_title" msgid="4517706987875907511">"<xliff:g id="VPN_NAME">%1$s</xliff:g> ਨਾਲ ਕਨੈਕਟ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਦਾ"</string>
     <string name="vpn_cant_connect_message" msgid="1352832123114214283">"ਇਹ ਐਪ \'ਹਮੇਸ਼ਾ-ਚਾਲੂ VPN\' ਦਾ ਸਮਰਥਨ ਨਹੀਂ ਕਰਦੀ"</string>
     <string name="vpn_title" msgid="6317731879966640551">"VPN"</string>
-    <string name="vpn_create" msgid="5628219087569761496">"VPN ਪ੍ਰੋਫਾਈਲ ਜੋੜੋ"</string>
+    <string name="vpn_create" msgid="5628219087569761496">"VPN ਪ੍ਰੋਫਾਈਲ ਸ਼ਾਮਲ ਕਰੋ"</string>
     <string name="vpn_menu_edit" msgid="408275284159243490">"ਪ੍ਰੋਫਾਈਲ ਦਾ ਸੰਪਾਦਨ ਕਰੋ"</string>
     <string name="vpn_menu_delete" msgid="8098021690546891414">"ਪ੍ਰੋਫਾਈਲ ਮਿਟਾਓ"</string>
     <string name="vpn_menu_lockdown" msgid="7863024538064268139">"ਹਮੇਸ਼ਾਂ-ਚਾਲੂ VPN"</string>
-    <string name="vpn_no_vpns_added" msgid="5002741367858707244">"ਕੋਈ VPNs ਸ਼ਾਮਲ ਨਹੀਂ ਕੀਤੇ ਗਏ"</string>
+    <string name="vpn_no_vpns_added" msgid="5002741367858707244">"ਕੋਈ VPN ਸ਼ਾਮਲ ਨਹੀਂ ਕੀਤੇ ਗਏ"</string>
     <string name="vpn_always_on_summary" msgid="2821344524094363617">"ਹਰ ਸਮੇਂ VPN ਨਾਲ ਕਨੈਕਟ ਰਹੋ"</string>
     <string name="vpn_always_on_summary_not_supported" msgid="592304911378771510">"ਇਸ ਐਪ ਵੱਲੋਂ ਸਮਰਥਿਤ ਨਹੀਂ ਹੈ"</string>
     <string name="vpn_always_on_summary_active" msgid="8800736191241875669">"ਹਮੇਸ਼ਾ-ਚਾਲੂ ਕਿਰਿਆਸ਼ੀਲ ਹੈ"</string>
-    <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>
-    <string name="vpn_lockdown_config_error" msgid="3898576754914217248">"ਸਰਵਰ ਅਤੇ DNS ਦੋਵਾਂ ਲਈ ਹਮੇਸ਼ਾਂ-ਚਾਲੂ VPN ਲਈ ਇੱਕ IP ਪਤਾ ਲੁੜੀਂਦਾ ਹੈ।"</string>
+    <string name="vpn_lockdown_config_error" msgid="3898576754914217248">"ਸਰਵਰ ਅਤੇ DNS ਦੋਵਾਂ ਲਈ ਹਮੇਸ਼ਾਂ-ਚਾਲੂ VPN ਲਈ ਇੱਕ IP ਪਤਾ ਲੋੜੀਂਦਾ ਹੈ।"</string>
     <string name="vpn_no_network" msgid="3050233675132726155">"ਕੋਈ ਨੈੱਟਵਰਕ ਕਨੈਕਸ਼ਨ ਨਹੀਂ ਹੈ। ਕਿਰਪਾ ਕਰਕੇ ਬਾਅਦ ਵਿੱਚ ਦੁਬਾਰਾ ਕੋਸ਼ਿਸ਼ ਕਰੋ।"</string>
     <string name="vpn_disconnected" msgid="280531508768927471">"VPN ਤੋਂ ਡਿਸਕਨੈਕਟ ਕੀਤਾ ਗਿਆ"</string>
     <string name="vpn_disconnected_summary" msgid="3082851661207900606">"ਕੋਈ ਨਹੀਂ"</string>
@@ -2506,30 +2520,27 @@
     <string name="trusted_credentials_system_tab" msgid="3984284264816924534">"ਸਿਸਟਮ"</string>
     <string name="trusted_credentials_user_tab" msgid="2244732111398939475">"ਵਰਤੋਂਕਾਰ"</string>
     <string name="trusted_credentials_disable_label" msgid="3864493185845818506">"ਅਸਮਰੱਥ ਬਣਾਓ"</string>
-    <string name="trusted_credentials_enable_label" msgid="2498444573635146913">"ਸਮਰੱਥ ਬਣਾਓ"</string>
+    <string name="trusted_credentials_enable_label" msgid="2498444573635146913">"ਚਾਲੂ ਕਰੋ"</string>
     <string name="trusted_credentials_remove_label" msgid="3633691709300260836">"ਹਟਾਓ"</string>
     <string name="trusted_credentials_trust_label" msgid="8003264222650785429">"ਭਰੋਸਾ ਕਰੋ"</string>
-    <string name="trusted_credentials_enable_confirmation" msgid="83215982842660869">"ਕੀ CA ਸਰਟੀਫਿਕੇਟ ਨੂੰ ਸਮਰੱਥ ਬਣਾਉਣਾ ਹੈ?"</string>
-    <string name="trusted_credentials_disable_confirmation" msgid="8199697813361646792">"ਕੀ ਸਿਸਟਮ CA ਸਰਟੀਫਿਕੇਟ ਨੂੰ ਅਸਮਰੱਥ ਬਣਾਉਣਾ ਹੈ?"</string>
-    <string name="trusted_credentials_remove_confirmation" msgid="443561923016852941">"ਕੀ ਉਪਭੋਗਤਾ CA ਸਰਟੀਫਿਕੇਟ ਨੂੰ ਸਥਾਈ ਤੌਰ ਤੇ ਹਟਾਉਣਾ ਹੈ?"</string>
-    <string name="credential_contains" msgid="3984922924723974084">"ਇਸ ਇੰਦਰਾਜ਼ ਵਿੱਚ ਇਹ ਸ਼ਾਮਲ ਹਨ:"</string>
+    <string name="trusted_credentials_enable_confirmation" msgid="83215982842660869">"ਕੀ CA ਪ੍ਰਮਾਣ-ਪੱਤਰ ਨੂੰ ਚਾਲੂ ਕਰਦਾ ਹੈ?"</string>
+    <string name="trusted_credentials_disable_confirmation" msgid="8199697813361646792">"ਕੀ ਸਿਸਟਮ CA ਪ੍ਰਮਾਣ-ਪੱਤਰ ਨੂੰ ਬੰਦ ਕਰਦਾ ਹੈ?"</string>
+    <string name="trusted_credentials_remove_confirmation" msgid="443561923016852941">"ਕੀ ਵਰਤੋਂਕਾਰ CA ਪ੍ਰਮਾਣ-ਪੱਤਰ ਨੂੰ ਸਥਾਈ ਤੌਰ ਤੇ ਹਟਾਉਣਾ ਹੈ?"</string>
+    <string name="credential_contains" msgid="3984922924723974084">"ਇਸ ਇੰਦਰਾਜ ਵਿੱਚ ਇਹ ਸ਼ਾਮਲ ਹਨ:"</string>
     <string name="one_userkey" msgid="6034020579534914349">"ਇੱਕ ਉਪਭੋਗਤਾ ਕੁੰਜੀ"</string>
-    <string name="one_usercrt" msgid="2150319011101639509">"ਇੱਕ ਉਪਭੋਗਤਾ ਸਰਟੀਫਿਕੇਟ"</string>
-    <string name="one_cacrt" msgid="6844397037970164809">"ਇੱਕ CA ਸਰਟੀਫਿਕੇਟ"</string>
+    <string name="one_usercrt" msgid="2150319011101639509">"ਇੱਕ ਵਰਤੋਂਕਾਰ ਪ੍ਰਮਾਣ-ਪੱਤਰ"</string>
+    <string name="one_cacrt" msgid="6844397037970164809">"ਇੱਕ CA ਪ੍ਰਮਾਣ-ਪੱਤਰ"</string>
     <string name="n_cacrts" msgid="5979300323482053820">"%d CA ਸਰਟੀਫਿਕੇਟ"</string>
     <string name="user_credential_title" msgid="1954061209643070652">"ਕ੍ਰੀਡੈਂਸ਼ੀਅਲ ਵੇਰਵੇ"</string>
     <string name="user_credential_removed" msgid="6514189495799401838">"ਹਟਾਇਆ ਗਿਆ ਕ੍ਰੀਡੈਂਸ਼ੀਅਲ: <xliff:g id="CREDENTIAL_NAME">%s</xliff:g>"</string>
     <string name="user_credential_none_installed" msgid="3729607560420971841">"ਕੋਈ ਵਰਤੋਂਕਾਰ ਕ੍ਰੀਡੈਂਸ਼ੀਅਲ ਸਥਾਪਤ ਨਹੀਂ ਹਨ"</string>
     <string name="spellcheckers_settings_title" msgid="399981228588011501">"ਸਪੈੱਲ ਚੈਕਰ"</string>
-    <string name="current_backup_pw_prompt" msgid="7735254412051914576">"ਆਪਣਾ ਮੌਜੂਦਾ ਪੂਰਾ ਬੈਕਅਪ ਪਾਸਵਰਡ ਇੱਥੇ ਟਾਈਪ ਕਰੋ"</string>
-    <string name="new_backup_pw_prompt" msgid="8755501377391998428">"ਇੱਥੇ ਪੂਰੇ ਬੈਕਅਪ ਲਈ ਇੱਕ ਨਵਾਂ ਪਾਸਵਰਡ ਟਾਈਪ ਕਰੋ"</string>
-    <string name="confirm_new_backup_pw_prompt" msgid="3238728882512787864">"ਆਪਣਾ ਨਵਾਂ ਪੂਰਾ ਬੈਕਅਪ ਪਾਸਵਰਡ ਇੱਥੇ ਦੁਬਾਰਾ ਟਾਈਪ ਕਰੋ"</string>
-    <string name="backup_pw_set_button_text" msgid="2387480910044648795">"ਬੈਕਅਪ ਪਾਸਵਰਡ ਸੈੱਟ ਕਰੋ"</string>
+    <string name="current_backup_pw_prompt" msgid="7735254412051914576">"ਆਪਣਾ ਮੌਜੂਦਾ ਪੂਰਾ ਬੈਕਅੱਪ ਪਾਸਵਰਡ ਇੱਥੇ ਟਾਈਪ ਕਰੋ"</string>
+    <string name="new_backup_pw_prompt" msgid="8755501377391998428">"ਇੱਥੇ ਪੂਰੇ ਬੈਕਅੱਪ ਲਈ ਇੱਕ ਨਵਾਂ ਪਾਸਵਰਡ ਟਾਈਪ ਕਰੋ"</string>
+    <string name="confirm_new_backup_pw_prompt" msgid="3238728882512787864">"ਆਪਣਾ ਨਵਾਂ ਪੂਰਾ ਬੈਕਅੱਪ ਪਾਸਵਰਡ ਇੱਥੇ ਦੁਬਾਰਾ ਟਾਈਪ ਕਰੋ"</string>
+    <string name="backup_pw_set_button_text" msgid="2387480910044648795">"ਬੈਕਅੱਪ ਪਾਸਵਰਡ ਸੈੱਟ ਕਰੋ"</string>
     <string name="backup_pw_cancel_button_text" msgid="8845630125391744615">"ਰੱਦ ਕਰੋ"</string>
     <string name="additional_system_update_settings_list_item_title" msgid="214987609894661992">"ਵਾਧੂ ਸਿਸਟਮ ਅਪਡੇਟਾਂ"</string>
-    <string name="selinux_status_disabled" msgid="924551035552323327">"ਅਯੋਗ ਬਣਾਇਆ"</string>
-    <string name="selinux_status_permissive" msgid="6004965534713398778">"ਅਨੁਮਤੀ ਦੇਣ ਵਾਲਾ"</string>
-    <string name="selinux_status_enforcing" msgid="2252703756208463329">"ਲਾਗੂ ਕਰ ਰਿਹਾ ਹੈ"</string>
     <string name="ssl_ca_cert_warning" msgid="2045866713601984673">"ਨੈੱਟਵਰਕ ਦਾ ਨਿਰੀਖਣ ਕੀਤਾ ਜਾ ਸਕਦਾ ਹੈ"</string>
     <string name="done_button" msgid="1991471253042622230">"ਹੋ ਗਿਆ"</string>
     <plurals name="ssl_ca_cert_dialog_title" formatted="false" msgid="7145092748045794650">
@@ -2537,88 +2548,88 @@
       <item quantity="other">ਪ੍ਰਮਾਣ-ਪੱਤਰਾਂ \'ਤੇ ਭਰੋਸਾ ਕਰੋ ਜਾਂ ਹਟਾਓ</item>
     </plurals>
     <plurals name="ssl_ca_cert_info_message_device_owner" formatted="false" msgid="1489335297837656666">
-      <item quantity="one"><xliff:g id="MANAGING_DOMAIN_1">%s</xliff:g> ਨੇ ਤੁਹਾਡੀ ਡੀਵਾਈਸ \'ਤੇ ਪ੍ਰਮਾਣ-ਪੱਤਰ ਅਥਾਰਿਟੀਆਂ ਸਥਾਪਤ ਕੀਤੀਆਂ ਹਨ, ਜੋ ਉਹਨਾਂ ਨੂੰ ਈਮੇਲਾਂ, ਐਪਾਂ, ਅਤੇ ਸੁਰੱਖਿਅਤ ਵੈਬਸਾਈਟਾਂ ਸਮੇਤ ਤੁਹਾਡੀ ਡੀਵਾਈਸ ਨੈੱਟਰਵਕ ਸਰਗਰਮੀ ਦੀ ਨਿਗਰਾਨੀ ਕਰਨ ਦੇ ਸਕਦੀਆਂ ਹਨ।\n\nਇਹਨਾਂ ਪ੍ਰਮਾਣ-ਪੱਤਰਾਂ ਬਾਰੇ ਹੋਰ ਜਾਣਕਾਰੀ ਲਈ, ਆਪਣੇ ਪ੍ਰਸ਼ਾਸਕ ਨਾਲ ਸੰਪਰਕ ਕਰੋ।</item>
-      <item quantity="other"><xliff:g id="MANAGING_DOMAIN_1">%s</xliff:g> ਨੇ ਤੁਹਾਡੀ ਡੀਵਾਈਸ \'ਤੇ ਪ੍ਰਮਾਣ-ਪੱਤਰ ਅਥਾਰਿਟੀਆਂ ਸਥਾਪਤ ਕੀਤੀਆਂ ਹਨ, ਜੋ ਉਹਨਾਂ ਨੂੰ ਈਮੇਲਾਂ, ਐਪਾਂ, ਅਤੇ ਸੁਰੱਖਿਅਤ ਵੈਬਸਾਈਟਾਂ ਸਮੇਤ ਤੁਹਾਡੀ ਡੀਵਾਈਸ ਨੈੱਟਰਵਕ ਸਰਗਰਮੀ ਦੀ ਨਿਗਰਾਨੀ ਕਰਨ ਦੇ ਸਕਦੀਆਂ ਹਨ।\n\nਇਹਨਾਂ ਪ੍ਰਮਾਣ-ਪੱਤਰਾਂ ਬਾਰੇ ਹੋਰ ਜਾਣਕਾਰੀ ਲਈ, ਆਪਣੇ ਪ੍ਰਸ਼ਾਸਕ ਨਾਲ ਸੰਪਰਕ ਕਰੋ।</item>
+      <item quantity="one"><xliff:g id="MANAGING_DOMAIN_1">%s</xliff:g> ਨੇ ਤੁਹਾਡੇ ਡੀਵਾਈਸ \'ਤੇ ਪ੍ਰਮਾਣ-ਪੱਤਰ ਅਥਾਰਿਟੀਆਂ ਸਥਾਪਤ ਕੀਤੀਆਂ ਹਨ, ਜੋ ਉਹਨਾਂ ਨੂੰ ਈਮੇਲਾਂ, ਐਪਾਂ, ਅਤੇ ਸੁਰੱਖਿਅਤ ਵੈੱਬਸਾਈਟਾਂ ਸਮੇਤ ਤੁਹਾਡੀ ਡੀਵਾਈਸ ਨੈੱਟਰਵਕ ਸਰਗਰਮੀ ਦੀ ਨਿਗਰਾਨੀ ਕਰਨ ਦੇ ਸਕਦੀਆਂ ਹਨ।\n\nਇਹਨਾਂ ਪ੍ਰਮਾਣ-ਪੱਤਰਾਂ ਬਾਰੇ ਹੋਰ ਜਾਣਕਾਰੀ ਲਈ, ਆਪਣੇ ਪ੍ਰਸ਼ਾਸਕ ਨੂੰ ਸੰਪਰਕ ਕਰੋ।</item>
+      <item quantity="other"><xliff:g id="MANAGING_DOMAIN_1">%s</xliff:g> ਨੇ ਤੁਹਾਡੇ ਡੀਵਾਈਸ \'ਤੇ ਪ੍ਰਮਾਣ-ਪੱਤਰ ਅਥਾਰਿਟੀਆਂ ਸਥਾਪਤ ਕੀਤੀਆਂ ਹਨ, ਜੋ ਉਹਨਾਂ ਨੂੰ ਈਮੇਲਾਂ, ਐਪਾਂ, ਅਤੇ ਸੁਰੱਖਿਅਤ ਵੈੱਬਸਾਈਟਾਂ ਸਮੇਤ ਤੁਹਾਡੀ ਡੀਵਾਈਸ ਨੈੱਟਰਵਕ ਸਰਗਰਮੀ ਦੀ ਨਿਗਰਾਨੀ ਕਰਨ ਦੇ ਸਕਦੀਆਂ ਹਨ।\n\nਇਹਨਾਂ ਪ੍ਰਮਾਣ-ਪੱਤਰਾਂ ਬਾਰੇ ਹੋਰ ਜਾਣਕਾਰੀ ਲਈ, ਆਪਣੇ ਪ੍ਰਸ਼ਾਸਕ ਨੂੰ ਸੰਪਰਕ ਕਰੋ।</item>
     </plurals>
     <plurals name="ssl_ca_cert_info_message" formatted="false" msgid="30645643499556573">
-      <item quantity="one"><xliff:g id="MANAGING_DOMAIN_1">%s</xliff:g> ਨੇ ਤੁਹਾਡੀ ਕੰਮ ਪ੍ਰੋਫਾਈਲ ਲਈ ਪ੍ਰਮਾਣ-ਪੱਤਰ ਅਥਾਰਿਟੀਆਂ ਨੂੰ ਸਥਾਪਤ ਕੀਤਾ ਹੈ, ਜੋ ਉਹਨਾਂ ਨੂੰ ਈਮੇਲਾਂ, ਐਪਾਂ, ਅਤੇ ਸੁਰੱਖਿਅਤ ਵੈੱਬਸਾਈਟਾਂ ਸਮੇਤ ਕੰਮ ਨੈੱਟਵਰਕ ਸਰਗਰਮੀ ਦੀ ਨਿਗਰਾਨੀ ਕਰਨ ਦੇ ਸਕਦੀਆਂ ਹਨ।\n\nਇਹਨਾਂ ਪ੍ਰਮਾਣ-ਪੱਤਰਾਂ ਬਾਰੇ ਹੋਰ ਜਾਣਕਾਰੀ ਲਈ, ਆਪਣੇ ਪ੍ਰਸ਼ਾਸਕ ਨਾਲ ਸੰਪਰਕ ਕਰੋ।</item>
-      <item quantity="other"><xliff:g id="MANAGING_DOMAIN_1">%s</xliff:g> ਨੇ ਤੁਹਾਡੀ ਕੰਮ ਪ੍ਰੋਫਾਈਲ ਲਈ ਪ੍ਰਮਾਣ-ਪੱਤਰ ਅਥਾਰਿਟੀਆਂ ਨੂੰ ਸਥਾਪਤ ਕੀਤਾ ਹੈ, ਜੋ ਉਹਨਾਂ ਨੂੰ ਈਮੇਲਾਂ, ਐਪਾਂ, ਅਤੇ ਸੁਰੱਖਿਅਤ ਵੈੱਬਸਾਈਟਾਂ ਸਮੇਤ ਕੰਮ ਨੈੱਟਵਰਕ ਸਰਗਰਮੀ ਦੀ ਨਿਗਰਾਨੀ ਕਰਨ ਦੇ ਸਕਦੀਆਂ ਹਨ।\n\nਇਹਨਾਂ ਪ੍ਰਮਾਣ-ਪੱਤਰਾਂ ਬਾਰੇ ਹੋਰ ਜਾਣਕਾਰੀ ਲਈ, ਆਪਣੇ ਪ੍ਰਸ਼ਾਸਕ ਨਾਲ ਸੰਪਰਕ ਕਰੋ।</item>
+      <item quantity="one"><xliff:g id="MANAGING_DOMAIN_1">%s</xliff:g> ਨੇ ਤੁਹਾਡੀ ਕੰਮ ਪ੍ਰੋਫਾਈਲ ਲਈ ਪ੍ਰਮਾਣ-ਪੱਤਰ ਅਥਾਰਿਟੀਆਂ ਨੂੰ ਸਥਾਪਤ ਕੀਤਾ ਹੈ, ਜੋ ਉਹਨਾਂ ਨੂੰ ਈਮੇਲਾਂ, ਐਪਾਂ, ਅਤੇ ਸੁਰੱਖਿਅਤ ਵੈੱਬਸਾਈਟਾਂ ਸਮੇਤ ਕੰਮ ਨੈੱਟਵਰਕ ਸਰਗਰਮੀ ਦੀ ਨਿਗਰਾਨੀ ਕਰਨ ਦੇ ਸਕਦੀਆਂ ਹਨ।\n\nਇਹਨਾਂ ਪ੍ਰਮਾਣ-ਪੱਤਰਾਂ ਬਾਰੇ ਹੋਰ ਜਾਣਕਾਰੀ ਲਈ, ਆਪਣੇ ਪ੍ਰਸ਼ਾਸਕ ਨੂੰ ਸੰਪਰਕ ਕਰੋ।</item>
+      <item quantity="other"><xliff:g id="MANAGING_DOMAIN_1">%s</xliff:g> ਨੇ ਤੁਹਾਡੀ ਕੰਮ ਪ੍ਰੋਫਾਈਲ ਲਈ ਪ੍ਰਮਾਣ-ਪੱਤਰ ਅਥਾਰਿਟੀਆਂ ਨੂੰ ਸਥਾਪਤ ਕੀਤਾ ਹੈ, ਜੋ ਉਹਨਾਂ ਨੂੰ ਈਮੇਲਾਂ, ਐਪਾਂ, ਅਤੇ ਸੁਰੱਖਿਅਤ ਵੈੱਬਸਾਈਟਾਂ ਸਮੇਤ ਕੰਮ ਨੈੱਟਵਰਕ ਸਰਗਰਮੀ ਦੀ ਨਿਗਰਾਨੀ ਕਰਨ ਦੇ ਸਕਦੀਆਂ ਹਨ।\n\nਇਹਨਾਂ ਪ੍ਰਮਾਣ-ਪੱਤਰਾਂ ਬਾਰੇ ਹੋਰ ਜਾਣਕਾਰੀ ਲਈ, ਆਪਣੇ ਪ੍ਰਸ਼ਾਸਕ ਨੂੰ ਸੰਪਰਕ ਕਰੋ।</item>
     </plurals>
-    <string name="ssl_ca_cert_warning_message" msgid="8216218659139190498">"ਇੱਕ ਤੀਜੀ ਪਾਰਟੀ ਤੁਹਾਡੀ ਨੈੱਟਵਰਕ ਗਤੀਵਿਧੀ ਦਾ ਨਿਰੀਖਣ ਕਰਨ ਵਿੱਚ ਸਮਰੱਥ ਹੈ, ਈਮੇਲਾਂ, ਐਪਸ ਅਤੇ ਸੁਰੱਖਿਅਤ ਵੈਬਸਾਈਟਾਂ ਸਮੇਤ।\n\nਤੁਹਾਡੀ ਡੀਵਾਈਸ ਤੇ ਇੰਸਟੌਲ ਕੀਤਾ ਇੱਕ ਭਰੋਸੇਯੋਗ ਕ੍ਰੈਡੈਂਸ਼ੀਅਲ ਇਸਨੂੰ ਸੰਭਵ ਬਣਾ ਰਿਹਾ ਹੈ।"</string>
+    <string name="ssl_ca_cert_warning_message" msgid="8216218659139190498">"ਇੱਕ ਤੀਜੀ ਪਾਰਟੀ ਤੁਹਾਡੀ ਨੈੱਟਵਰਕ ਗਤੀਵਿਧੀ ਦਾ ਨਿਰੀਖਣ ਕਰਨ ਵਿੱਚ ਸਮਰੱਥ ਹੈ, ਈਮੇਲਾਂ, ਐਪਾਂ ਅਤੇ ਸੁਰੱਖਿਅਤ ਵੈੱਬਸਾਈਟਾਂ ਸਮੇਤ।\n\nਤੁਹਾਡੇ ਡੀਵਾਈਸ ਤੇ ਸਥਾਪਤ ਕੀਤਾ ਇੱਕ ਭਰੋਸੇਯੋਗ ਕ੍ਰੀਡੈਂਸ਼ੀਅਲ ਇਸਨੂੰ ਸੰਭਵ ਬਣਾ ਰਿਹਾ ਹੈ।"</string>
     <plurals name="ssl_ca_cert_settings_button" formatted="false" msgid="2426799352517325228">
       <item quantity="one">ਪ੍ਰਮਾਣ-ਪੱਤਰਾਂ ਦੀ ਜਾਂਚ ਕਰੋ</item>
       <item quantity="other">ਪ੍ਰਮਾਣ-ਪੱਤਰਾਂ ਦੀ ਜਾਂਚ ਕਰੋ</item>
     </plurals>
     <string name="user_settings_title" msgid="6151874007858148344">"ਵਰਤੋਂਕਾਰ"</string>
     <string name="user_list_title" msgid="7937158411137563543">"ਉਪਭੋਗਤਾ &amp; ਪ੍ਰੋਫਾਈਲਾਂ"</string>
-    <string name="user_add_user_or_profile_menu" msgid="6923838875175259418">"ਉਪਭੋਗਤਾ ਜਾਂ ਪ੍ਰੋਫਾਈਲ ਜੋੜੋ"</string>
+    <string name="user_add_user_or_profile_menu" msgid="6923838875175259418">"ਵਰਤੋਂਕਾਰ ਜਾਂ ਪ੍ਰੋਫਾਈਲ ਜੋੜੋ"</string>
     <string name="user_add_user_menu" msgid="1675956975014862382">"ਵਰਤੋਂਕਾਰ ਸ਼ਾਮਲ ਕਰੋ"</string>
     <string name="user_summary_restricted_profile" msgid="6354966213806839107">"ਪ੍ਰਤਿਬੰਧਿਤ ਪ੍ਰੋਫਾਈਲ"</string>
-    <string name="user_need_lock_message" msgid="5879715064416886811">"ਇਸਤੋਂ ਪਹਿਲਾਂ ਕਿ ਤੁਸੀਂ ਇੱਕ ਪ੍ਰਤਿਬੰਧਿਤ ਪ੍ਰੋਫਾਈਲ ਬਣਾ ਸਕੋ, ਤੁਹਾਨੂੰ ਆਪਣੇ ਐਪਸ ਅਤੇ ਨਿੱਜੀ ਡੈਟਾ ਸੁਰੱਖਿਅਤ ਕਰਨ ਲਈ ਇੱਕ ਸਕ੍ਰੀਨ ਲੌਕ ਸੈਟ ਅਪ ਕਰਨ ਦੀ ਲੋੜ ਹੈ।"</string>
-    <string name="user_set_lock_button" msgid="8311219392856626841">"ਲੌਕ ਸੈੱਟ ਕਰੋ"</string>
+    <string name="user_need_lock_message" msgid="5879715064416886811">"ਇਸਤੋਂ ਪਹਿਲਾਂ ਕਿ ਤੁਸੀਂ ਇੱਕ ਪ੍ਰਤਿਬੰਧਿਤ ਪ੍ਰੋਫਾਈਲ ਬਣਾ ਸਕੋ, ਤੁਹਾਨੂੰ ਆਪਣੀਆਂ ਐਪਾਂ ਅਤੇ ਨਿੱਜੀ ਡਾਟਾ ਸੁਰੱਖਿਅਤ ਕਰਨ ਲਈ ਇੱਕ ਸਕ੍ਰੀਨ  ਲਾਕ  ਸੈੱਟ ਅੱਪ ਕਰਨ ਦੀ ਲੋੜ ਹੈ।"</string>
+    <string name="user_set_lock_button" msgid="8311219392856626841">" ਲਾਕ  ਸੈੱਟ ਕਰੋ"</string>
     <string name="user_summary_not_set_up" msgid="8778205026866794909">"ਸੈਟ ਅਪ ਨਹੀਂ ਕੀਤਾ"</string>
-    <string name="user_summary_restricted_not_set_up" msgid="1628116001964325544">"ਸੈਟ ਅਪ ਨਹੀਂ ਕੀਤੀ - ਪ੍ਰਤਿਬੰਧਿਤ ਪ੍ਰੋਫਾਈਲ"</string>
-    <string name="user_summary_managed_profile_not_set_up" msgid="1659125858619760573">"ਸੈਟ ਅਪ ਨਹੀਂ ਕੀਤਾ - ਕੰਮ ਪ੍ਰੋਫਾਈਲ"</string>
+    <string name="user_summary_restricted_not_set_up" msgid="1628116001964325544">"ਸੈੱਟ ਅੱਪ ਨਹੀਂ ਕੀਤੀ - ਪ੍ਰਤਿਬੰਧਿਤ ਪ੍ਰੋਫਾਈਲ"</string>
+    <string name="user_summary_managed_profile_not_set_up" msgid="1659125858619760573">"ਸੈੱਟ ਅੱਪ ਨਹੀਂ ਕੀਤਾ - ਕਾਰਜ ਪ੍ਰੋਫਾਈਲ"</string>
     <string name="user_admin" msgid="993402590002400782">"ਪ੍ਰਸ਼ਾਸਕ"</string>
     <string name="user_you" msgid="1639158809315025986">"ਤੁਸੀਂ (<xliff:g id="NAME">%s</xliff:g>)"</string>
     <string name="user_nickname" msgid="5148818000228994488">"ਉਪਨਾਮ"</string>
-    <string name="user_add_user_type_title" msgid="2146438670792322349">"ਜੋੜੋ"</string>
-    <string name="user_add_max_count" msgid="5405885348463433157">"ਤੁਸੀਂ <xliff:g id="USER_COUNT">%1$d</xliff:g> ਉਪਭੋਗਤਾ ਜੋਡ਼ ਸਕਦੇ ਹੋ"</string>
-    <string name="user_add_user_item_summary" msgid="4702776187132008661">"ਉਪਭੋਗਤਾਵਾਂ ਕੋਲ ਉਹਨਾਂ ਦੇ ਆਪਣੇ ਐਪਸ ਅਤੇ ਸਮੱਗਰੀ ਹੁੰਦੀ ਹੈ"</string>
-    <string name="user_add_profile_item_summary" msgid="5931663986889138941">"ਤੁਸੀਂ ਆਪਣੇ ਖਾਤੇ ਤੋਂ ਐਪਸ ਅਤੇ ਸਮੱਗਰੀ ਲਈ ਪਹੁੰਚ ਪ੍ਰਤਿਬੰਧ ਕਰ ਸਕਦੇ ਹੋ"</string>
+    <string name="user_add_user_type_title" msgid="2146438670792322349">"ਸ਼ਾਮਲ ਕਰੋ"</string>
+    <string name="user_add_max_count" msgid="5405885348463433157">"ਤੁਸੀਂ <xliff:g id="USER_COUNT">%1$d</xliff:g> ਵਰਤੋਂਕਾਰ ਸ਼ਾਮਲ ਕਰ ਸਕਦੇ ਹੋ"</string>
+    <string name="user_add_user_item_summary" msgid="4702776187132008661">"ਉਪਭੋਗਤਾਵਾਂ ਕੋਲ ਉਹਨਾਂ ਦੀਆਂ ਆਪਣੀਆਂ ਐਪਾਂ ਅਤੇ ਸਮੱਗਰੀ ਹੁੰਦੀਆਂ ਹਨ"</string>
+    <string name="user_add_profile_item_summary" msgid="5931663986889138941">"ਤੁਸੀਂ ਆਪਣੇ ਖਾਤੇ ਤੋਂ ਐਪਾਂ ਅਤੇ ਸਮੱਗਰੀ ਲਈ ਪਹੁੰਚ ਪ੍ਰਤਿਬੰਧ ਕਰ ਸਕਦੇ ਹੋ"</string>
     <string name="user_add_user_item_title" msgid="8212199632466198969">"ਵਰਤੋਂਕਾਰ"</string>
     <string name="user_add_profile_item_title" msgid="8353515490730363621">"ਪ੍ਰਤਿਬੰਧਿਤ ਪ੍ਰੋਫਾਈਲ"</string>
     <string name="user_add_user_title" msgid="2108112641783146007">"ਕੀ ਨਵਾਂ ਵਰਤੋਂਕਾਰ ਸ਼ਾਮਲ ਕਰਨਾ ਹੈ?"</string>
-    <string name="user_add_user_message_long" msgid="8562152293752222985">"ਤੁਸੀਂ ਵਾਧੂ ਉਪਭੋਗਤਾ ਬਣਾ ਕੇ ਹੋਰਾਂ ਲੋਕਾਂ ਨਾਲ ਇਹ ਡੀਵਾਈਸ ਸ਼ੇਅਰ ਕਰ ਸਕਦੇ ਹੋ। ਹਰੇਕ ਉਪਭੋਗਤਾ ਦਾ ਆਪਣਾ ਖੁਦ ਦਾ ਸਪੇਸ ਹੁੰਦਾ ਹੈ, ਜਿਸਨੂੰ ਉਹ ਐਪਸ ਅਤੇ ਵਾਲਪੇਪਰ ਆਦਿ ਨਾਲ ਅਨੁਕੂਲ ਬਣਾ ਸਕਦੇ ਹਨ। ਉਪਭੋਗਤਾ ਡੀਵਾਈਸ ਸੈਟਿੰਗਾਂ ਵੀ ਵਰਤ ਸਕਦੇ ਹਨ ਜਿਵੇਂ Wi‑Fi ਜੋ ਹਰੇਕ ਤੇ ਅਸਰ ਪਾਉਂਦਾ ਹੈ।\n\nਜਦੋਂ ਤੁਸੀਂ ਇੱਕ ਨਵਾਂ ਉਪਭੋਗਤਾ ਜੋੜਦੇ ਹੋ, ਉਸ ਵਿਅਕਤੀ ਨੂੰ ਆਪਣਾ ਸਪੇਸ ਸੈਟ ਅਪ ਕਰਨ ਦੀ ਲੋੜ ਹੁੰਦੀ ਹੈ।\n\nਕੋਈ ਵੀ ਉਪਭੋਗਤਾ ਹੋਰ ਸਾਰੇ ਉਪਭੋਗਤਾਵਾਂ ਦੇ ਐਪਸ ਨੂੰ ਅਪਡੇਟ ਕਰ ਸਕਦਾ ਹੈ।"</string>
-    <string name="user_add_user_message_short" msgid="1511354412249044381">"ਜਦੋਂ ਤੁਸੀਂ ਇੱਕ ਨਵਾਂ ਵਰਤੋਂਕਾਰ ਸ਼ਾਮਲ ਕਰਦੇ ਹੋ, ਉਸ ਵਿਅਕਤੀ ਨੂੰ ਆਪਣੀ ਜਗ੍ਹਾ ਸਥਾਪਤ ਕਰਨ ਦੀ ਲੋੜ ਹੁੰਦੀ ਹੈ।\n\nਕੋਈ ਵੀ ਵਰਤੋਂਕਾਰ ਹੋਰ ਸਾਰੇ ਵਰਤੋਂਕਾਰਾਂ ਦੀਆਂ ਐਪਾਂ ਨੂੰ ਅੱਪਡੇਟ ਕਰ ਸਕਦਾ ਹੈ।"</string>
+    <string name="user_add_user_message_long" msgid="8562152293752222985">"ਤੁਸੀਂ ਵਾਧੂ ਵਰਤੋਂਕਾਰ ਬਣਾ ਕੇ ਹੋਰਾਂ ਲੋਕਾਂ ਨਾਲ ਇਹ ਡੀਵਾਈਸ ਸਾਂਝਾ ਕਰ ਸਕਦੇ ਹੋ। ਹਰੇਕ ਵਰਤੋਂਕਾਰ ਦੀ ਆਪਣੀ ਖੁਦ ਦਾ ਜਗ੍ਹਾ ਹੁੰਦੀ ਹੈ, ਜਿਸਨੂੰ ਉਹ ਐਪਾਂ ਅਤੇ ਵਾਲਪੇਪਰ ਆਦਿ ਨਾਲ ਵਿਉਂਤਬੱਧ ਕਰ ਸਕਦੇ ਹਨ। ਵਰਤੋਂਕਾਰ ਡੀਵਾਈਸ ਸੈਟਿੰਗਾਂ ਵੀ ਵਰਤ ਸਕਦੇ ਹਨ ਜਿਵੇਂ ਵਾਈ‑ਫਾਈ ਜੋ ਹਰੇਕ ਤੇ ਅਸਰ ਪਾਉਂਦਾ ਹੈ।\n\nਜਦੋਂ ਤੁਸੀਂ ਇੱਕ ਨਵਾਂ ਵਰਤੋਂਕਾਰ ਜੋੜਦੇ ਹੋ, ਉਸ ਵਿਅਕਤੀ ਨੂੰ ਆਪਣਾ ਸਪੇਸ ਸੈੱਟ ਅੱਪ ਕਰਨ ਦੀ ਲੋੜ ਹੁੰਦੀ ਹੈ।\n\nਕੋਈ ਵੀ ਵਰਤੋਂਕਾਰ ਹੋਰ ਸਾਰੇ ਵਰਤੋਂਕਾਰਾਂ ਦੀਆਂ ਐਪਾਂ ਨੂੰ ਅੱਪਡੇਟ ਕਰ ਸਕਦਾ ਹੈ।"</string>
+    <string name="user_add_user_message_short" msgid="1511354412249044381">"ਜਦੋਂ ਤੁਸੀਂ ਇੱਕ ਨਵਾਂ ਵਰਤੋਂਕਾਰ ਸ਼ਾਮਲ ਕਰਦੇ ਹੋ, ਉਸ ਵਿਅਕਤੀ ਨੂੰ ਆਪਣੀ ਜਗ੍ਹਾ ਸੈੱਟਅੱਪ ਕਰਨ ਦੀ ਲੋੜ ਹੁੰਦੀ ਹੈ।\n\nਕੋਈ ਵੀ ਵਰਤੋਂਕਾਰ ਹੋਰ ਸਾਰੇ ਵਰਤੋਂਕਾਰਾਂ ਦੀਆਂ ਐਪਾਂ ਨੂੰ ਅੱਪਡੇਟ ਕਰ ਸਕਦਾ ਹੈ।"</string>
     <string name="user_setup_dialog_title" msgid="1765794166801864563">"ਕੀ ਹੁਣ ਵਰਤੋਂਕਾਰ ਸਥਾਪਤ ਕਰਨਾ ਹੈ?"</string>
     <string name="user_setup_dialog_message" msgid="1004068621380867148">"ਯਕੀਨੀ ਬਣਾਓ ਕਿ ਵਿਅਕਤੀ ਡੀਵਾਈਸ ਲੈਣ ਅਤੇ ਆਪਣੀ ਜਗ੍ਹਾ ਸਥਾਪਤ ਕਰਨ ਲਈ ਉਪਲਬਧ ਹੈ"</string>
-    <string name="user_setup_profile_dialog_message" msgid="3896568553327558731">"ਕੀ ਹੁਣ ਪ੍ਰੋਫਾਈਲ ਸੈਟ ਅਪ ਕਰਨੀ ਹੈ?"</string>
+    <string name="user_setup_profile_dialog_message" msgid="3896568553327558731">"ਕੀ ਹੁਣ ਪ੍ਰੋਫਾਈਲ ਸੈੱਟ ਅੱਪ ਕਰਨੀ ਹੈ?"</string>
     <string name="user_setup_button_setup_now" msgid="3391388430158437629">"ਹੁਣੇ ਸਥਾਪਤ ਕਰੋ"</string>
     <string name="user_setup_button_setup_later" msgid="3068729597269172401">"ਅਜੇ ਨਹੀਂ"</string>
-    <string name="user_cannot_manage_message" product="tablet" msgid="7153048188252553320">"ਕੇਵਲ ਟੈਬਲੇਟ ਦਾ ਮਾਲਕ ਹੀ ਉਪਭੋਗਤਾਵਾਂ ਨੂੰ ਵਿਵਸਥਿਤ ਕਰ ਸਕਦਾ ਹੈ।"</string>
-    <string name="user_cannot_manage_message" product="default" msgid="959315813089950649">"ਕੇਵਲ ਫੋਨ ਦਾ ਮਾਲਕ ਹੀ ਉਪਭੋਗਤਾਵਾਂ ਨੂੰ ਵਿਵਸਥਿਤ ਕਰ ਸਕਦਾ ਹੈ।"</string>
-    <string name="user_cannot_add_accounts_message" msgid="5116692653439737050">"ਪ੍ਰਤਿਬੰਧਿਤ ਪ੍ਰੋਫਾਈਲਾਂ ਖਾਤੇ ਨਹੀਂ ਜੋੜ ਸਕਦੀਆਂ"</string>
+    <string name="user_cannot_manage_message" product="tablet" msgid="7153048188252553320">"ਕੇਵਲ ਟੈਬਲੈੱਟ ਦਾ ਮਾਲਕ ਹੀ ਵਰਤੋਂਕਾਰਾਂ ਨੂੰ ਪ੍ਰਬੰਧਿਤ ਕਰ ਸਕਦਾ ਹੈ।"</string>
+    <string name="user_cannot_manage_message" product="default" msgid="959315813089950649">"ਕੇਵਲ ਫ਼ੋਨ ਦਾ ਮਾਲਕ ਹੀ ਵਰਤੋਂਕਾਰਾਂ ਨੂੰ ਵਿਵਸਥਿਤ ਕਰ ਸਕਦਾ ਹੈ।"</string>
+    <string name="user_cannot_add_accounts_message" msgid="5116692653439737050">"ਪ੍ਰਤਿਬੰਧਿਤ ਪ੍ਰੋਫਾਈਲਾਂ ਖਾਤੇ ਸ਼ਾਮਲ ਨਹੀਂ ਕਰ ਸਕਦੇ"</string>
     <string name="user_remove_user_menu" msgid="6897150520686691355">"<xliff:g id="USER_NAME">%1$s</xliff:g> ਨੂੰ ਇਸ ਡੀਵਾਈਸ ਤੋਂ ਮਿਟਾਓ"</string>
-    <string name="user_lockscreen_settings" msgid="4965661345247084878">"ਲੌਕ ਸਕ੍ਰੀਨ ਸੈਟਿੰਗਾਂ"</string>
-    <string name="user_add_on_lockscreen_menu" msgid="9072312646546364619">"ਲੌਕ ਸਕ੍ਰੀਨ ਤੋਂ ਵਰਤੋਂਕਾਰਾਂ ਨੂੰ ਸ਼ਾਮਲ ਕਰੋ"</string>
+    <string name="user_lockscreen_settings" msgid="4965661345247084878">"ਲਾਕ ਸਕ੍ਰੀਨ ਸੈਟਿੰਗਾਂ"</string>
+    <string name="user_add_on_lockscreen_menu" msgid="9072312646546364619">"ਲਾਕ ਸਕ੍ਰੀਨ ਤੋਂ ਵਰਤੋਂਕਾਰਾਂ ਨੂੰ ਸ਼ਾਮਲ ਕਰੋ"</string>
     <string name="user_new_user_name" msgid="369856859816028856">"ਨਵਾਂ ਵਰਤੋਂਕਾਰ"</string>
     <string name="user_new_profile_name" msgid="2632088404952119900">"ਨਵੀਂ ਪ੍ਰੋਫਾਈਲ"</string>
     <string name="user_confirm_remove_self_title" msgid="8432050170899479556">"ਕੀ ਖੁਦ ਨੂੰ ਹਟਾਉਣਾ ਹੈ?"</string>
     <string name="user_confirm_remove_title" msgid="1163721647646152032">"ਕੀ ਇਹ ਵਰਤੋਂਕਾਰ ਹਟਾਉਣਾ ਹੈ?"</string>
     <string name="user_profile_confirm_remove_title" msgid="5573161550669867342">"ਕੀ ਇਹ ਪ੍ਰੋਫਾਈਲ ਹਟਾਉਣੀ ਹੈ?"</string>
-    <string name="work_profile_confirm_remove_title" msgid="2017323555783522213">"ਕੀ ਕੰਮ ਪ੍ਰੋਫਾਈਲ ਹਟਾਉਣੀ ਹੈ?"</string>
-    <string name="user_confirm_remove_self_message" product="tablet" msgid="2391372805233812410">"ਇਸ ਟੈਬਲੈੱਟ ’ਤੇ ਤੁਹਾਡੀ ਜਗ੍ਹਾ ਅਤੇ ਡੈਟਾ ਨਸ਼ਟ ਹੋ ਜਾਏਗਾ। ਤੁਸੀਂ ਇਸ ਕਿਰਿਆ ਨੂੰ ਅਣਕੀਤਾ ਨਹੀਂ ਕਰ ਸਕਦੇ।"</string>
-    <string name="user_confirm_remove_self_message" product="default" msgid="7943645442479360048">"ਇਸ ਫੋਨ ’ਤੇ ਤੁਹਾਡੀ ਜਗ੍ਹਾ ਅਤੇ ਡੈਟਾ ਨਸ਼ਟ ਹੋ ਜਾਏਗਾ। ਤੁਸੀਂ ਇਸ ਕਿਰਿਆ ਨੂੰ ਅਣਕੀਤਾ ਨਹੀਂ ਕਰ ਸਕਦੇ।"</string>
-    <string name="user_confirm_remove_message" msgid="1020629390993095037">"ਸਾਰੀਆਂ ਐਪਾਂ ਅਤੇ ਡੈਟਾ ਮਿਟਾ ਦਿੱਤੇ ਜਾਣਗੇ।"</string>
-    <string name="work_profile_confirm_remove_message" msgid="323856589749078140">"ਜੇਕਰ ਤੁਸੀਂ ਜਾਰੀ ਰੱਖਦੇ ਹੋ ਤਾਂ ਇਸ ਪ੍ਰੋਫਾਈਲ ਵਿੱਚ ਸਾਰੇ ਐਪਸ ਅਤੇ ਡੈਟਾ ਮਿਟਾ ਦਿੱਤਾ ਜਾਏਗਾ।"</string>
-    <string name="user_profile_confirm_remove_message" msgid="7373754145959298522">"ਸਾਰੀਆਂ ਐਪਾਂ ਅਤੇ ਡੈਟਾ ਮਿਟਾ ਦਿੱਤੇ ਜਾਣਗੇ।"</string>
+    <string name="work_profile_confirm_remove_title" msgid="2017323555783522213">"ਕੀ ਕਾਰਜ ਪ੍ਰੋਫਾਈਲ ਹਟਾਉਣੀ ਹੈ?"</string>
+    <string name="user_confirm_remove_self_message" product="tablet" msgid="2391372805233812410">"ਇਸ ਟੈਬਲੈੱਟ ’ਤੇ ਤੁਹਾਡੀ ਜਗ੍ਹਾ ਅਤੇ ਡਾਟਾ ਨਸ਼ਟ ਹੋ ਜਾਵੇਗਾ। ਤੁਸੀਂ ਇਸ ਕਾਰਵਾਈ ਨੂੰ ਅਣਕੀਤਾ ਨਹੀਂ ਕਰ ਸਕਦੇ।"</string>
+    <string name="user_confirm_remove_self_message" product="default" msgid="7943645442479360048">"ਇਸ ਫ਼ੋਨ ’ਤੇ ਤੁਹਾਡੀ ਜਗ੍ਹਾ ਅਤੇ ਡਾਟਾ ਨਸ਼ਟ ਹੋ ਜਾਵੇਗਾ। ਤੁਸੀਂ ਇਸ ਕਾਰਵਾਈ ਨੂੰ ਅਣਕੀਤਾ ਨਹੀਂ ਕਰ ਸਕਦੇ।"</string>
+    <string name="user_confirm_remove_message" msgid="1020629390993095037">"ਸਾਰੀਆਂ ਐਪਾਂ ਅਤੇ  ਡਾਟਾ  ਮਿਟਾ ਦਿੱਤੇ ਜਾਣਗੇ।"</string>
+    <string name="work_profile_confirm_remove_message" msgid="323856589749078140">"ਜੇਕਰ ਤੁਸੀਂ ਜਾਰੀ ਰੱਖਦੇ ਹੋ ਤਾਂ ਇਸ ਪ੍ਰੋਫਾਈਲ ਵਿੱਚ ਸਾਰੀਆਂ ਐਪਾਂ ਅਤੇ ਡਾਟਾ ਮਿਟਾ ਦਿੱਤਾ ਜਾਏਗਾ।"</string>
+    <string name="user_profile_confirm_remove_message" msgid="7373754145959298522">"ਸਾਰੀਆਂ ਐਪਾਂ ਅਤੇ  ਡਾਟਾ  ਮਿਟਾ ਦਿੱਤੇ ਜਾਣਗੇ।"</string>
     <string name="user_adding_new_user" msgid="1521674650874241407">"ਨਵਾਂ ਉਪਭੋਗਤਾ ਜੋੜ ਰਿਹਾ ਹੈ…"</string>
-    <string name="user_delete_user_description" msgid="3158592592118767056">"ਉਪਭੋਗਤਾ ਨੂੰ ਮਿਟਾਓ"</string>
+    <string name="user_delete_user_description" msgid="3158592592118767056">"ਵਰਤੋਂਕਾਰ ਨੂੰ ਮਿਟਾਓ"</string>
     <string name="user_delete_button" msgid="5131259553799403201">"ਮਿਟਾਓ"</string>
     <string name="user_guest" msgid="8475274842845401871">"ਮਹਿਮਾਨ"</string>
     <string name="user_exit_guest_title" msgid="5613997155527410675">"ਮਹਿਮਾਨ ਹਟਾਓ"</string>
     <string name="user_exit_guest_confirm_title" msgid="3405527634738147409">"ਕੀ ਮਹਿਮਾਨ ਹਟਾਉਣਾ ਹੈ?"</string>
-    <string name="user_exit_guest_confirm_message" msgid="2194459201944413257">"ਇਸ ਸੈਸ਼ਨ ਵਿੱਚ ਸਾਰੇ ਐਪਸ ਅਤੇ ਡੈਟਾ ਮਿਟਾ ਦਿੱਤਾ ਜਾਏਗਾ।"</string>
+    <string name="user_exit_guest_confirm_message" msgid="2194459201944413257">"ਇਸ ਸੈਸ਼ਨ ਵਿੱਚ ਸਾਰੀਆਂ ਐਪਾਂ ਅਤੇ ਡਾਟਾ ਨੂੰ ਮਿਟਾ ਦਿੱਤਾ ਜਾਏਗਾ।"</string>
     <string name="user_exit_guest_dialog_remove" msgid="6351370829952745350">"ਹਟਾਓ"</string>
-    <string name="user_enable_calling" msgid="5128605672081602348">"ਫੋਨ ਕਾਲਾਂ ਚਾਲੂ ਕਰੋ"</string>
-    <string name="user_enable_calling_sms" msgid="9172507088023097063">"ਫੋਨ ਕਾਲਾਂ ਅਤੇ SMS ਚਾਲੂ ਕਰੋ"</string>
+    <string name="user_enable_calling" msgid="5128605672081602348">"ਫ਼ੋਨ ਕਾਲਾਂ ਚਾਲੂ ਕਰੋ"</string>
+    <string name="user_enable_calling_sms" msgid="9172507088023097063">"ਫ਼ੋਨ ਕਾਲਾਂ &amp; SMS ਚਾਲੂ ਕਰੋ"</string>
     <string name="user_remove_user" msgid="6490483480937295389">"ਵਰਤੋਂਕਾਰ ਹਟਾਓ"</string>
-    <string name="user_enable_calling_confirm_title" msgid="4315789475268695378">"ਕੀ ਫੋਨ ਕਾਲਾਂ ਚਾਲੂ ਕਰਨੀਆਂ ਹਨ?"</string>
+    <string name="user_enable_calling_confirm_title" msgid="4315789475268695378">"ਕੀ ਫ਼ੋਨ ਕਾਲਾਂ ਚਾਲੂ ਕਰਨੀਆਂ ਹਨ?"</string>
     <string name="user_enable_calling_confirm_message" msgid="8061594235219352787">"ਕਾਲ ਇਤਿਹਾਸ ਇਸ ਵਰਤੋਂਕਾਰ ਨਾਲ ਸਾਂਝਾ ਕੀਤਾ ਜਾਏਗਾ।"</string>
-    <string name="user_enable_calling_and_sms_confirm_title" msgid="7243308401401932681">"ਕੀ ਫੋਨ ਕਾਲਾਂ ਅਤੇ SMS ਚਾਲੂ ਕਰਨੇ ਹਨ?"</string>
+    <string name="user_enable_calling_and_sms_confirm_title" msgid="7243308401401932681">"ਕੀ ਫ਼ੋਨ ਕਾਲਾਂ &amp; SMS ਚਾਲੂ ਕਰਨੇ ਹਨ?"</string>
     <string name="user_enable_calling_and_sms_confirm_message" msgid="4025082715546544967">"ਕਾਲ ਅਤੇ SMS ਇਤਿਹਾਸ ਇਸ ਵਰਤੋਂਕਾਰ ਨਾਲ ਸਾਂਝਾ ਕੀਤਾ ਜਾਏਗਾ।"</string>
-    <string name="emergency_info_title" msgid="208607506217060337">"ਸੰਕਟਕਾਲ ਜਾਣਕਾਰੀ"</string>
+    <string name="emergency_info_title" msgid="208607506217060337">"ਸੰਕਟਕਾਲੀਨ ਜਾਣਕਾਰੀ"</string>
     <string name="emergency_info_summary" msgid="5062945162967838521">"<xliff:g id="USER_NAME">%1$s</xliff:g> ਦੀ ਜਾਣਕਾਰੀ ਅਤੇ ਸੰਪਰਕ"</string>
-    <string name="application_restrictions" msgid="8207332020898004394">"ਐਪਸ ਅਤੇ ਸਮੱਗਰੀ ਦੀ ਆਗਿਆ ਦਿਓ"</string>
+    <string name="application_restrictions" msgid="8207332020898004394">"ਐਪਾਂ ਅਤੇ ਸਮੱਗਰੀ ਦੀ ਆਗਿਆ ਦਿਓ"</string>
     <string name="apps_with_restrictions_header" msgid="3660449891478534440">"ਪ੍ਰਤਿਬੰਧਾਂ ਵਾਲੇ ਐਪਲੀਕੇਸ਼ਨ"</string>
     <string name="apps_with_restrictions_settings_button" msgid="3841347287916635821">"ਐਪਲੀਕੇਸ਼ਨ ਲਈ ਸੈਟਿੰਗਾਂ ਦਾ ਵਿਸਤਾਰ ਕਰੋ"</string>
-    <string name="global_change_warning" product="tablet" msgid="8045013389464294039">"ਇਹ ਸੈਟਿੰਗ ਇਸ ਟੈਬਲੇਟ ਦੇ ਸਾਰੇ ਉਪਭੋਗਤਾਵਾਂ ਤੇ ਅਸਰ ਪਾਉਂਦੀ ਹੈ।"</string>
-    <string name="global_change_warning" product="default" msgid="2461264421590324675">"ਇਹ ਸੈਟਿੰਗ ਇਸ ਫੋਨ ਦੇ ਸਾਰੇ ਉਪਭੋਗਤਾਵਾਂ ਤੇ ਅਸਰ ਪਾਉਂਦੀ ਹੈ।"</string>
+    <string name="global_change_warning" product="tablet" msgid="8045013389464294039">"ਇਹ ਸੈਟਿੰਗ ਇਸ ਟੈਬਲੈੱਟ ਦੇ ਸਾਰੇ ਵਰਤੋਂਕਾਰਾਂ ਤੇ ਅਸਰ ਪਾਉਂਦੀ ਹੈ।"</string>
+    <string name="global_change_warning" product="default" msgid="2461264421590324675">"ਇਹ ਸੈਟਿੰਗ ਇਸ ਫ਼ੋਨ ਦੇ ਸਾਰੇ ਵਰਤੋਂਕਾਰਾਂ ਤੇ ਅਸਰ ਪਾਉਂਦੀ ਹੈ।"</string>
     <string name="global_locale_change_title" msgid="5956281361384221451">"ਭਾਸ਼ਾ ਬਦਲੋ"</string>
-    <string name="nfc_payment_settings_title" msgid="1807298287380821613">"ਟੈਪ ਅਤੇ ਭੁਗਤਾਨ ਕਰੋ"</string>
+    <string name="nfc_payment_settings_title" msgid="1807298287380821613">"ਟੈਪ ਕਰਕੇ ਭੁਗਤਾਨ ਕਰੋ"</string>
     <string name="nfc_payment_how_it_works" msgid="3028822263837896720">"ਇਹ ਕਿਵੇਂ ਕੰਮ ਕਰਦਾ ਹੈ"</string>
-    <string name="nfc_payment_no_apps" msgid="5477904979148086424">"ਸਟੋਰਾਂ ਵਿੱਚ ਆਪਣੇ ਫੋਨ ਨਾਲ ਭੁਗਤਾਨ ਕਰੋ"</string>
+    <string name="nfc_payment_no_apps" msgid="5477904979148086424">"ਸਟੋਰਾਂ ਵਿੱਚ ਆਪਣੇ ਫ਼ੋਨ ਨਾਲ ਭੁਗਤਾਨ ਕਰੋ"</string>
     <string name="nfc_payment_default" msgid="8648420259219150395">"ਭੁਗਤਾਨ ਪੂਰਵ-ਨਿਰਧਾਰਤ"</string>
     <string name="nfc_payment_default_not_set" msgid="7485060884228447765">"ਸੈੱਟ ਨਹੀਂ ਕੀਤਾ"</string>
     <string name="nfc_payment_app_and_desc" msgid="7942415346564794258">"<xliff:g id="APP">%1$s</xliff:g> - <xliff:g id="DESCRIPTION">%2$s</xliff:g>"</string>
@@ -2627,7 +2638,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>
@@ -2635,12 +2646,12 @@
     <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">"PIN ਬਦਲੋ"</string>
+    <string name="restriction_menu_change_pin" msgid="740081584044302775">"ਪਿੰਨ ਬਦਲੋ"</string>
     <string name="app_notifications_switch_label" msgid="9124072219553687583">"ਸੂਚਨਾਵਾਂ ਦਿਖਾਓ"</string>
-    <string name="help_label" msgid="6886837949306318591">"ਮਦਦ ਅਤੇ ਪ੍ਰਤੀਕਰਮ"</string>
+    <string name="help_label" msgid="6886837949306318591">"ਮਦਦ &amp; ਫੀਡਬੈਕ"</string>
     <string name="support_summary" msgid="2705726826263742491">"ਮਦਦ ਲੇਖ, ਫ਼ੋਨ ਅਤੇ ਚੈਟ, ਸ਼ੁਰੂਆਤ ਕਰਨਾ"</string>
     <string name="user_account_title" msgid="1127193807312271167">"ਸਮੱਗਰੀ ਲਈ ਖਾਤਾ"</string>
-    <string name="user_picture_title" msgid="7297782792000291692">"ਫ਼ੋਟੋ ID"</string>
+    <string name="user_picture_title" msgid="7297782792000291692">"ਫ਼ੋਟੋ ਆਈ.ਡੀ."</string>
     <string name="extreme_threats_title" msgid="6549541803542968699">"ਐਕਸਟ੍ਰੀਮ ਖਤਰੇ"</string>
     <string name="extreme_threats_summary" msgid="8777860706500920667">"ਜੀਵਨ ਅਤੇ ਜਾਇਦਾਦ ਲਈ ਐਕਸਟ੍ਰੀਮ ਖਤਰਿਆਂ ਦੀਆਂ ਚਿਤਾਵਨੀਆਂ ਪ੍ਰਾਪਤ ਕਰੋ"</string>
     <string name="severe_threats_title" msgid="8362676353803170963">"ਗੰਭੀਰ ਖਤਰੇ"</string>
@@ -2648,18 +2659,18 @@
     <string name="amber_alerts_title" msgid="2772220337031146529">"AMBER ਚਿਤਾਵਨੀਆਂ"</string>
     <string name="amber_alerts_summary" msgid="4312984614037904489">"ਬਾਲ ਅਗਵਾ ਬਾਰੇ ਬੁਲੇਟਿਨ ਪ੍ਰਾਪਤ ਕਰੋ"</string>
     <string name="repeat_title" msgid="6473587828597786996">"ਦੁਹਰਾਓ"</string>
-    <string name="call_manager_enable_title" msgid="7718226115535784017">"ਕਾਲ ਮੈਨੇਜਰ ਨੂੰ ਸਮਰੱਥ ਬਣਾਓ"</string>
+    <string name="call_manager_enable_title" msgid="7718226115535784017">"ਕਾਲ ਮੈਨੇਜਰ ਨੂੰ ਚਾਲੂ ਕਰੋ"</string>
     <string name="call_manager_enable_summary" msgid="8458447798019519240">"ਇਸ ਸੇਵਾ ਨੂੰ ਇਹ ਵਿਵਸਥਿਤ ਕਰਨ ਦੀ ਆਗਿਆ ਦਿਓ ਕਿ ਤੁਹਾਡੀਆਂ ਕਾਲਾਂ ਕਿਵੇਂ ਕੀਤੀਆਂ ਜਾਣ।"</string>
     <string name="call_manager_title" msgid="4479949569744516457">"ਕਾਲ ਮੈਨੇਜਰ"</string>
     <!-- no translation found for call_manager_summary (5918261959486952674) -->
     <skip />
     <string name="cell_broadcast_settings" msgid="4124461751977706019">"ਸੰਕਟਕਾਲੀਨ ਸੁਚੇਤਨਾਵਾਂ"</string>
     <string name="network_operators_settings" msgid="2583178259504630435">"ਨੈੱਟਵਰਕ ਓਪਰੇਟਰ"</string>
-    <string name="access_point_names" msgid="1381602020438634481">"ਪਹੁੰਚ ਬਿੰਦੂ ਨਾਮ"</string>
+    <string name="access_point_names" msgid="1381602020438634481">"ਐਕਸੈੱਸ ਪੁਆਇੰਟ ਨਾਮ"</string>
     <string name="enhanced_4g_lte_mode_title" msgid="5808043757309522392">"ਵਿਸਤ੍ਰਿਤ 4G LTE ਮੋਡ"</string>
-    <string name="enhanced_4g_lte_mode_summary" msgid="1376589643017218924">"ਵੌਇਸ ਅਤੇ ਸੰਚਾਰ ਵਧਾਉਣ ਲਈ LTE ਡੈਟਾ ਵਰਤੋ (ਸਿਫ਼ਾਰਿਸ਼ ਕੀਤਾ)"</string>
+    <string name="enhanced_4g_lte_mode_summary" msgid="1376589643017218924">"ਵੌਇਸ ਅਤੇ ਸੰਚਾਰ ਵਧਾਉਣ ਲਈ LTE  ਡਾਟਾ  ਵਰਤੋ (ਸਿਫ਼ਾਰਿਸ਼ ਕੀਤਾ)"</string>
     <string name="preferred_network_type_title" msgid="3431041717309776341">"ਤਰਜੀਹੀ ਨੈੱਟਵਰਕ ਪ੍ਰਕਾਰ"</string>
-    <string name="preferred_network_type_summary" msgid="6564884693884755019">"LTE (ਸਿਫਾਰਿਸ਼ ਕੀਤਾ)"</string>
+    <string name="preferred_network_type_summary" msgid="6564884693884755019">"LTE ( ਸਿਫ਼ਾਰਸ਼  ਕੀਤਾ)"</string>
     <string name="work_sim_title" msgid="4843322164662606891">"ਦਫ਼ਤਰ SIM"</string>
     <string name="user_restrictions_title" msgid="5794473784343434273">"ਐਪ &amp; ਸਮੱਗਰੀ ਪਹੁੰਚ"</string>
     <string name="user_rename" msgid="8523499513614655279">"ਮੁੜ-ਨਾਮਕਰਨ ਕਰੋ"</string>
@@ -2667,14 +2678,14 @@
     <string name="user_restrictions_controlled_by" msgid="3164078767438313899">"<xliff:g id="APP">%1$s</xliff:g> ਵੱਲੋਂ ਨਿਯੰਤਰਿਤ"</string>
     <string name="app_sees_restricted_accounts" msgid="7503264525057246240">"ਇਹ ਐਪ ਤੁਹਾਡੇ ਖਾਤਿਆਂ ਤੱਕ ਪਹੁੰਚ ਪ੍ਰਾਪਤ ਕਰ ਸਕਦਾ ਹੈ"</string>
     <string name="app_sees_restricted_accounts_and_controlled_by" msgid="6968697624437267294">"ਇਹ ਐਪ ਤੁਹਾਡੇ ਖਾਤਿਆਂ ਤੱਕ ਪਹੁੰਚ ਪ੍ਰਾਪਤ ਕਰ ਸਕਦਾ ਹੈ। <xliff:g id="APP">%1$s</xliff:g> ਵੱਲੋਂ ਨਿਯੰਤਰਿਤ"</string>
-    <string name="restriction_wifi_config_title" msgid="8889556384136994814">"Wi‑Fi ਅਤੇ ਮੋਬਾਈਲ"</string>
-    <string name="restriction_wifi_config_summary" msgid="70888791513065244">"Wi‑Fi ਅਤੇ ਮੋਬਾਈਲ ਸੈਟਿੰਗਾਂ ਦੇ ਸੰਸ਼ੋਧਨ ਦੀ ਆਗਿਆ ਦਿਓ"</string>
-    <string name="restriction_bluetooth_config_title" msgid="8871681580962503671">"Bluetooth"</string>
-    <string name="restriction_bluetooth_config_summary" msgid="8372319681287562506">"Bluetooth ਪੇਅਰਿੰਗ ਅਤੇ ਸੈਟਿੰਗਾਂ ਦੇ ਸੰਸ਼ੋਧਨ ਦੀ ਆਗਿਆ ਦਿਓ"</string>
+    <string name="restriction_wifi_config_title" msgid="8889556384136994814">"ਵਾਈ‑ਫਾਈ ਅਤੇ ਮੋਬਾਈਲ"</string>
+    <string name="restriction_wifi_config_summary" msgid="70888791513065244">"ਵਾਈ-ਫਾਈ ਅਤੇ ਮੋਬਾਈਲ ਸੈਟਿੰਗਾਂ ਦੇ ਸੰਸ਼ੋਧਨ ਦੀ ਆਗਿਆ ਦਿਓ"</string>
+    <string name="restriction_bluetooth_config_title" msgid="8871681580962503671">"ਬਲੂਟੁੱਥ"</string>
+    <string name="restriction_bluetooth_config_summary" msgid="8372319681287562506">"ਬਲੂਟੁੱਥ ਜੋੜਾਬੱਧ ਕਰਨ ਅਤੇ ਸੈਟਿੰਗਾਂ ਦੇ ਸੰਸ਼ੋਧਨ ਦੀ ਆਗਿਆ ਦਿਓ"</string>
     <string name="restriction_nfc_enable_title" msgid="5888100955212267941">"NFC"</string>
-    <string name="restriction_nfc_enable_summary_config" msgid="3232480757215851738">"ਜਦੋਂ ਇਹ <xliff:g id="DEVICE_NAME">%1$s</xliff:g> ਡੀਵਾਈਸ ਦੂਜੀ NFC ਡੀਵਾਈਸ ਨੂੰ ਛੋਂਹਦੀ ਹੈ ਤਾਂ ਡੈਟਾ ਐਕਸਚੇਂਜ ਦੀ ਆਗਿਆ ਜਿਓ"</string>
-    <string name="restriction_nfc_enable_summary" product="tablet" msgid="3891097373396149915">"ਜਦੋਂ ਟੈਬਲੇਟ ਦੂਜੀ ਡੀਵਾਈਸ ਨੂੰ ਛੋਂਹਦੀ ਹੈ ਤਾਂ ਡੈਟਾ ਐਕਸਚੇਂਜ ਦੀ ਆਗਿਆ ਦਿਓ"</string>
-    <string name="restriction_nfc_enable_summary" 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>
@@ -2689,11 +2700,11 @@
     <string name="sim_settings_summary" msgid="4050372057097516088">"<xliff:g id="SIM_NAME">%1$s</xliff:g> - <xliff:g id="SIM_NUMBER">%2$s</xliff:g>"</string>
     <string name="sim_cards_changed_message" msgid="7900721153345139783">"SIM ਕਾਰਡ ਬਦਲੇ ਗਏ ਹਨ"</string>
     <string name="sim_cards_changed_message_summary" msgid="8258058274989383204">"ਸਰਗਰਮੀਆਂ ਸੈੱਟ ਕਰਨ ਲਈ ਟੈਪ ਕਰੋ"</string>
-    <string name="sim_cellular_data_unavailable" msgid="9109302537004566098">"ਮੋਬਾਈਲ ਡੈਟਾ ਅਣਉਪਲਬਧ ਹੈ"</string>
-    <string name="sim_cellular_data_unavailable_summary" msgid="5416535001368135327">"ਇੱਕ ਡੈਟਾ SIM ਚੁਣਨ ਲਈ ਟੈਪ ਕਰੋ"</string>
+    <string name="sim_cellular_data_unavailable" msgid="9109302537004566098">"ਮੋਬਾਈਲ ਡਾਟਾ ਅਣਉਪਲਬਧ ਹੈ"</string>
+    <string name="sim_cellular_data_unavailable_summary" msgid="5416535001368135327">"ਇੱਕ  ਡਾਟਾ  SIM ਚੁਣਨ ਲਈ ਟੈਪ ਕਰੋ"</string>
     <string name="sim_calls_always_use" msgid="7936774751250119715">"ਕਾਲਾਂ ਲਈ ਹਮੇਸ਼ਾਂ ਇਹ ਵਰਤੋ"</string>
-    <string name="select_sim_for_data" msgid="2366081042162853044">"ਡੈਟਾ ਲਈ ਇੱਕ SIM ਚੁਣੋ"</string>
-    <string name="data_switch_started" msgid="2040761479817166311">"ਡੈਟਾ SIM ਸਵਿਚ ਕਰਦੇ ਹੋਏ, ਇਸ ਵਿੱਚ ਇੱਕ ਮਿੰਟ ਲੱਗ ਸਕਦਾ ਹੈ..."</string>
+    <string name="select_sim_for_data" msgid="2366081042162853044">" ਡਾਟਾ  ਲਈ ਇੱਕ SIM ਚੁਣੋ"</string>
+    <string name="data_switch_started" msgid="2040761479817166311">" ਡਾਟਾ  SIM ਸਵਿਚ ਕਰਦੇ ਹੋਏ, ਇਸ ਵਿੱਚ ਇੱਕ ਮਿੰਟ ਲੱਗ ਸਕਦਾ ਹੈ..."</string>
     <string name="select_sim_for_calls" msgid="3503094771801109334">"ਇਸਦੇ ਨਾਲ ਕਾਲ ਕਰੋ"</string>
     <string name="sim_select_card" msgid="211285163525563293">"ਇੱਕ SIM ਕਾਰਡ ਚੁਣੋ"</string>
     <string name="sim_card_number_title" msgid="7845379943474336488">"SIM <xliff:g id="CARD_NUMBER">%1$d</xliff:g>"</string>
@@ -2709,7 +2720,7 @@
     <string name="color_purple" msgid="3888532466427762504">"ਜਾਮਨੀ"</string>
     <string name="sim_no_inserted_msg" msgid="210316755353227087">"ਕੋਈ SIM ਕਾਰਡ ਨਹੀਂ ਪਾਏ"</string>
     <string name="sim_status_title" msgid="6744870675182447160">"SIM ਸਥਿਤੀ"</string>
-    <string name="sim_call_back_title" msgid="5181549885999280334">"ਪੂਰਵ-ਨਿਰਧਾਰਤ SIM ਤੋਂ ਕਾਲ ਬੈਕ ਕਰੋ"</string>
+    <string name="sim_call_back_title" msgid="5181549885999280334">"ਪੂਰਵ-ਨਿਰਧਾਰਤ ਸਿਮ ਤੋਂ ਕਾਲ ਬੈਕ ਕਰੋ"</string>
     <string name="sim_outgoing_call_title" msgid="1019763076116874255">"ਆਉਟਗੋਇੰਗ ਕਾਲਾਂ ਲਈ SIM"</string>
     <string name="sim_other_call_settings" msgid="8247802316114482477">"ਹੋਰ ਕਾਲ ਸੈਟਿੰਗਾਂ"</string>
     <string name="preferred_network_offload_title" msgid="1605829724169550275">"ਤਰਜੀਹੀ ਨੈੱਟਵਰਕ ਔਫਲੋਡ"</string>
@@ -2724,14 +2735,15 @@
     <string name="sim_selection_required_pref" msgid="3446721423206414652">"ਚੋਣ ਲੁੜੀਂਦੀ"</string>
     <string name="dashboard_title" msgid="5453710313046681820">"ਸੈਟਿੰਗਾਂ"</string>
     <plurals name="settings_suggestion_header_summary_hidden_items" formatted="false" msgid="5597356221942118048">
-      <item quantity="one">%d ਲੁਕੀਆਂ ਹੋਈਆਂ ਆਈਟਮਾਂ ਵਿਖਾਓ</item>
-      <item quantity="other">%d ਲੁਕੀਆਂ ਹੋਈਆਂ ਆਈਟਮਾਂ ਵਿਖਾਓ</item>
+      <item quantity="one">%d ਲੁਕੀਆਂ ਹੋਈਆਂ ਆਈਟਮਾਂ  ਦਿਖਾਓ </item>
+      <item quantity="other">%d ਲੁਕੀਆਂ ਹੋਈਆਂ ਆਈਟਮਾਂ  ਦਿਖਾਓ </item>
     </plurals>
+    <string name="dashboard_suggestion_condition_footer_content_description" msgid="2898588191174845961">"ਸਮੇਟੋ"</string>
     <string name="network_dashboard_title" msgid="4771589228992391573">"ਨੈੱਟਵਰਕ ਅਤੇ ਇੰਟਰਨੈੱਟ"</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_data_usage" msgid="3843261364705042212">"ਡਾਟਾ ਵਰਤੋਂ"</string>
     <string name="network_dashboard_summary_hotspot" msgid="8494210248613254574">"ਹੌਟਸਪੌਟ"</string>
-    <string name="connected_devices_dashboard_title" msgid="2355264951438890709">"ਕਨੈਕਟ ਕੀਤੀਆਂ ਡੀਵਾਈਸਾਂ"</string>
+    <string name="connected_devices_dashboard_title" msgid="2355264951438890709">"ਕਨੈਕਟ ਕੀਤੇ ਡੀਵਾਈਸ"</string>
     <string name="connected_devices_dashboard_summary" msgid="2390582103384791904">"ਬਲੂਟੁੱਥ, ਕਾਸਟ, NFC"</string>
     <string name="connected_devices_dashboard_no_nfc_summary" msgid="9106040742715366495">"ਬਲੂਟੁੱਥ, ਕਾਸਟ"</string>
     <string name="app_and_notification_dashboard_title" msgid="7838365599185397539">"ਐਪਾਂ ਅਤੇ ਸੂਚਨਾਵਾਂ"</string>
@@ -2742,70 +2754,69 @@
     <string name="search_results_title" msgid="1796252422574886932">"ਸੈਟਿੰਗਾਂ"</string>
     <string name="search_menu" msgid="6283419262313758339">"ਸੈਟਿੰਗਾਂ ਵਿੱਚ ਖੋਜੋ"</string>
     <string name="query_hint_text" msgid="3350700807437473939">"ਸੈਟਿੰਗਾਂ ਵਿੱਚ ਖੋਜੋ"</string>
-    <string name="keywords_wifi" msgid="1395786161993828719">"wifi, wi-fi, ਨੈੱਟਵਰਕ ਕਨੈਕਸ਼ਨ"</string>
-    <string name="keywords_more_default_sms_app" msgid="2265154063220360784">"ਲਿਖਤ ਸੁਨੇਹਾ, ਟੈਕਸਟਿੰਗ, ਸੁਨੇਹੇ, ਮੈਸੇਜਿੰਗ"</string>
-    <string name="keywords_more_mobile_networks" msgid="8995946622054642367">"ਸੈਲਿਊਲਰ, ਮੋਬਾਈਲ, ਸੈੱਲ ਕੈਰੀਅਰ, ਵਾਇਰਲੈੱਸ, ਡੈਟਾ, 4g,3g, 2g, lte"</string>
-    <string name="keywords_wifi_calling" msgid="1784064367330122679">"wifi, wi-fi, ਕਾਲ, ਕਾਲਿੰਗ"</string>
+    <string name="keywords_wifi" msgid="1395786161993828719">"ਵਾਈ-ਫਾਈ, ਵਾਈ-ਫਾਈ, ਨੈੱਟਵਰਕ ਕਨੈਕਸ਼ਨ"</string>
+    <string name="keywords_more_default_sms_app" msgid="2265154063220360784">"ਲਿਖਤ ਸੁਨੇਹਾ, ਲਿਖਤ ਭੇਜਣਾ, ਸੁਨੇਹੇ, ਸੁਨੇਹਾ ਭੇਜਣਾ"</string>
+    <string name="keywords_more_mobile_networks" msgid="8995946622054642367">"ਸੈਲਿਊਲਰ, ਮੋਬਾਈਲ, ਸੈੱਲ ਕੈਰੀਅਰ, ਵਾਇਰਲੈੱਸ, ਡਾਟਾ, 4g,3g, 2g, lte"</string>
+    <string name="keywords_wifi_calling" msgid="1784064367330122679">"ਵਾਈਫਾਈ, ਵਾਈ-ਫਾਈ, ਕਾਲ, ਕਾਲਿੰਗ"</string>
     <string name="keywords_home" msgid="3626170808219458848">"ਲੌਂਚਰ"</string>
-    <string name="keywords_display" msgid="8910345814565493016">"ਸਕਰੀਨ, ਟੱਚਸਕਰੀਨ"</string>
-    <string name="keywords_display_brightness_level" msgid="3891383826236015854">"ਡਿਮ ਸਕਰੀਨ, ਟੱਚਸਕਰੀਨ, ਬੈਟਰੀ"</string>
-    <string name="keywords_display_auto_brightness" msgid="3325150824507953765">"ਡਿਮ ਸਕਰੀਨ, ਟੱਚਸਕਰੀਨ, ਬੈਟਰੀ"</string>
+    <string name="keywords_display" msgid="8910345814565493016">"ਸਕ੍ਰੀਨ, ਟੱਚਸਕ੍ਰੀਨ"</string>
+    <string name="keywords_display_brightness_level" msgid="3891383826236015854">"ਡਿਮ ਸਕ੍ਰੀਨ, ਟੱਚਸਕ੍ਰੀਨ, ਬੈਟਰੀ"</string>
+    <string name="keywords_display_auto_brightness" msgid="3325150824507953765">"ਡਿਮ ਸਕ੍ਰੀਨ, ਟੱਚਸਕ੍ਰੀਨ, ਬੈਟਰੀ"</string>
     <string name="keywords_display_night_display" msgid="7630169927425425754">"ਡਿਮ ਸਕ੍ਰੀਨ, ਰਾਤ, ਭਾਹ"</string>
-    <string name="keywords_display_wallpaper" msgid="7362076351860131776">"ਬੈਕਗ੍ਰਾਊਂਡ, ਨਿੱਜੀਕਰਨ, ਡਿਸਪਲੇ ਵਿਸ਼ੇਸ਼-ਵਿਉਂਤਬੱਧ ਕਰੋ"</string>
+    <string name="keywords_display_wallpaper" msgid="7362076351860131776">"ਬੈਕਗ੍ਰਾਊਂਡ, ਵਿਅਕਤੀਗਤ, ਵਿਉਂਤਬੱਧ ਡਿਸਪਲੇ"</string>
     <string name="keywords_display_font_size" msgid="3404655440064726124">"ਟੈਕਸਟ ਆਕਾਰ"</string>
     <string name="keywords_display_cast_screen" msgid="7684618996741933067">"ਪ੍ਰੋਜੈਕਟ, ਕਾਸਟ"</string>
     <string name="keywords_storage" msgid="3299217909546089225">"ਸਪੇਸ, ਡਿਸਕ, ਹਾਰਡ ਡਰਾਈਵ, ਡੀਵਾਈਸ ਵਰਤੋਂ"</string>
     <string name="keywords_battery" msgid="1173830745699768388">"ਪਾਵਰ ਵਰਤੋਂ, ਚਾਰਜ"</string>
     <string name="keywords_spell_checker" msgid="1399641226370605729">"ਸ਼ਬਦਜੋੜ, ਸ਼ਬਦਕੋਸ਼, ਸ਼ਬਦਜੋੜ ਜਾਂਚ, ਸਵੈ-ਸੁਧਾਈ ਕਰੋ"</string>
-    <string name="keywords_voice_input" msgid="769778245192531102">"ਪਛਾਣਕਰਤਾ, ਇਨਪੁੱਟ, ਬੋਲੀ, ਬੋਲੋ, ਭਾਸ਼ਾ, ਹੈਂਡ-ਸਫ਼ਰੀ, ਹੈਂਡ ਸਫ਼ਰੀ, ਪਛਾਣ, ਅਪਮਾਨਜਨਕ, ਸ਼ਬਦ, ਔਡੀਓ, ਇਤਿਹਾਸ, ਬਲਿਊਟੁੱਥ ਹੈੱਡਸੈੱਟ"</string>
-    <string name="keywords_text_to_speech_output" msgid="5150660047085754699">"ਰੇਟ, ਭਾਸ਼ਾ, ਪੂਰਵ-ਨਿਰਧਾਰਤ, ਬੋਲੋ, ਬੋਲਣਾ, tts, ਪਹੁੰਚਯੋਗਤਾ, ਸਕਰੀਨ ਰੀਡਰ, ਨੇਤਰਹੀਣ"</string>
+    <string name="keywords_voice_input" msgid="769778245192531102">"ਪਛਾਣਕਰਤਾ, ਇਨਪੁੱਟ, ਬੋਲੀ, ਬੋਲੋ, ਭਾਸ਼ਾ, ਹੈਂਡਸ-ਫ਼ਰੀ, ਹੈਂਡ ਫ਼ਰੀ, ਪਛਾਣ, ਅਪਮਾਨਜਨਕ, ਸ਼ਬਦ, ਔਡੀਓ, ਇਤਿਹਾਸ, ਬਲੂਟੁੱਥ ਹੈੱਡਸੈੱਟ"</string>
+    <string name="keywords_text_to_speech_output" msgid="5150660047085754699">"ਰੇਟ, ਭਾਸ਼ਾ, ਪੂਰਵ-ਨਿਰਧਾਰਤ, ਬੋਲੋ, ਬੋਲਣਾ, tts, ਪਹੁੰਚਯੋਗਤਾ, ਸਕ੍ਰੀਨ ਰੀਡਰ, ਨੇਤਰਹੀਣ"</string>
     <string name="keywords_date_and_time" msgid="758325881602648204">"ਘੜੀ, ਫੌਜ"</string>
     <string name="keywords_network_reset" msgid="6024276007080940820">"ਮੁੜ-ਸੈੱਟ ਕਰੋ, ਮੁੜ-ਸਟੋਰ ਕਰੋ, ਫੈਕਟਰੀ"</string>
     <string name="keywords_factory_data_reset" msgid="5894970373671252165">"ਸਾਫ਼ ਕਰੋ, ਮਿਟਾਓ, ਮੁੜ-ਸਟੋਰ ਕਰੋ, ਸਾਫ਼ ਕਰੋ, ਹਟਾਓ"</string>
     <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>
     <string name="keywords_accounts" msgid="1957925565953357627">"ਖਾਤਾ"</string>
     <string name="keywords_users" msgid="3434190133131387942">"ਪਾਬੰਦੀ, ਪਾਬੰਦੀ ਲਗਾਓ, ਪਾਬੰਦੀ ਲਗਾਈ"</string>
-    <string name="keywords_keyboard_and_ime" msgid="9143339015329957107">"ਪਾਠ ਸੁਧਾਈ, ਸਹੀ, ਆਵਾਜ਼, ਕੰਬਣਾ, ਸਵੈ, ਭਾਸ਼ਾ, ਸੰਕੇਤ, ਸੁਝਾਓ, ਸੁਝਾਅ, ਥੀਮ, ਅਪਮਾਨਜਨਕ, ਸ਼ਬਦ, ਕਿਸਮ, ਇਮੋਜੀ, ਅੰਤਰਰਾਸ਼ਟਰੀ"</string>
+    <string name="keywords_keyboard_and_ime" msgid="9143339015329957107">"ਲਿਖਤ ਸੁਧਾਈ, ਸਹੀ, ਧੁਨੀ, ਕੰਬਣਾ, ਸਵੈ, ਭਾਸ਼ਾ, ਸੰਕੇਤ, ਸੁਝਾਓ, ਸੁਝਾਅ, ਥੀਮ, ਅਪਮਾਨਜਨਕ, ਸ਼ਬਦ, ਕਿਸਮ, ਇਮੋਜੀ, ਅੰਤਰਰਾਸ਼ਟਰੀ"</string>
     <string name="keywords_reset_apps" msgid="5293291209613191845">"ਮੁੜ-ਸੈੱਟ ਕਰੋ, ਤਰਜੀਹਾਂ, ਪੂਰਵ-ਨਿਰਧਾਰਤ"</string>
     <string name="keywords_emergency_app" msgid="3143078441279044780">"ਐਮਰਜੈਂਸੀ, ਬਰਫ, ਐਪ, ਪੂਰਵ-ਨਿਰਧਾਰਤ"</string>
-    <string name="keywords_default_phone_app" msgid="4213090563141778486">"ਫੋਨ, ਡਾਇਲਰ, ਪੂਰਵ-ਨਿਰਧਾਰਤ"</string>
+    <string name="keywords_default_phone_app" msgid="4213090563141778486">"ਫ਼ੋਨ, ਡਾਇਲਰ, ਪੂਰਵ-ਨਿਰਧਾਰਤ"</string>
     <string name="keywords_all_apps" msgid="7814015440655563156">"ਐਪਾਂ, ਡਾਊਨਲੋਡ ਕਰੋ, ਐਪਲੀਕੇਸ਼ਨਾਂ, ਸਿਸਟਮ"</string>
     <string name="keywords_app_permissions" msgid="4229936435938011023">"ਐਪ, ਇਜਾਜ਼ਤਾਂ, ਸੁਰੱਖਿਆ"</string>
     <string name="keywords_default_apps" msgid="223872637509160136">"ਐਪਾਂ, ਪੂਰਵ-ਨਿਰਧਾਰਤ"</string>
-    <string name="keywords_ignore_optimizations" msgid="6102579291119055029">"ਅਨੁਕੂਲਨ ਅਣਡਿੱਠ ਕਰੋ, doze, ਐਪ ਸਟੈਂਡਬਾਇ"</string>
+    <string name="keywords_ignore_optimizations" msgid="6102579291119055029">"ਅਨੁਕੂਲਨ ਅਣਡਿੱਠ ਕਰੋ, doze, ਐਪ ਸਟੈਂਡਬਾਏ"</string>
     <string name="keywords_color_mode" msgid="6362744316886077510">"ਚਮਕੀਲਾ, rgb, srgb, ਰੰਗ, ਕੁਦਰਤੀ, ਸਧਾਰਨ"</string>
     <string name="keywords_color_temperature" msgid="2688947724153266364">"ਰੰਗ ਤਾਪਮਾਨ D65 D73 ਚਿੱਟਾ ਪੀਲਾ ਨੀਲਾ ਨਿੱਘਾ ਠੰਡਾ"</string>
-    <string name="keywords_lockscreen" msgid="5746561909668570047">"ਅਨਲੌਕ ਕਰਨ ਲਈ ਸਲਾਈਡ ਕਰੋ, ਪਾਸਵਰਡ, ਪੈਟਰਨ, PIN"</string>
-    <string name="keywords_profile_challenge" msgid="789611397846512845">"ਕੰਮ ਚੁਣੌਤੀ, ਕੰਮ, ਪ੍ਰੋਫਾਈਲ"</string>
-    <string name="keywords_unification" msgid="1922900767659821025">"ਕੰਮ ਪ੍ਰੋਫਾਈਲ, ਪ੍ਰਬੰਧਿਤ ਕੀਤੀ ਗਈ ਪ੍ਰੋਫਾਈਲ, ਇਕਰੂਪ ਕਰਨਾ, ਏਕੀਕਰਨ, ਕੰਮ, ਪ੍ਰੋਫਾਈਲ"</string>
+    <string name="keywords_lockscreen" msgid="5746561909668570047">"ਅਣਲਾਕ ਕਰਨ ਲਈ ਸਲਾਈਡ ਕਰੋ, ਪਾਸਵਰਡ, ਪੈਟਰਨ, ਪਿੰਨ ਦਾਖਲ ਕਰੋ"</string>
+    <string name="keywords_profile_challenge" msgid="789611397846512845">"ਕਾਰਜ ਚੁਣੌਤੀ, ਕਾਰਜ, ਪ੍ਰੋਫਾਈਲ"</string>
+    <string name="keywords_unification" msgid="1922900767659821025">"ਕਾਰਜ ਪ੍ਰੋਫਾਈਲ, ਪ੍ਰਬੰਧਿਤ ਕੀਤੀ ਗਈ ਪ੍ਰੋਫਾਈਲ, ਇਕਰੂਪ ਕਰਨਾ, ਏਕੀਕਰਨ, ਕੰਮ, ਪ੍ਰੋਫਾਈਲ"</string>
     <string name="keywords_gesture" msgid="3526905012224714078">"ਸੰਕੇਤ"</string>
     <string name="keywords_payment_settings" msgid="5220104934130446416">"ਭੁਗਤਾਨ ਕਰੋ, ਟੈਪ ਕਰੋ, ਭੁਗਤਾਨ"</string>
     <string name="keywords_backup" msgid="470070289135403022">"ਬੈਕਅੱਪ, ਬੈਕ ਅੱਪ"</string>
-    <!-- no translation found for keywords_assist_gesture_launch (813968759791342591) -->
-    <skip />
-    <string name="setup_wifi_nfc_tag" msgid="9028353016222911016">"Wi-Fi NFC ਟੈਗ ਸੈਟ ਅਪ ਕਰੋ"</string>
+    <string name="keywords_assist_gesture_launch" msgid="813968759791342591">"ਸੰਕੇਤ"</string>
+    <string name="setup_wifi_nfc_tag" msgid="9028353016222911016">"ਵਾਈ-ਫਾਈ NFC ਟੈਗ ਸੈੱਟ ਅੱਪ ਕਰੋ"</string>
     <string name="write_tag" msgid="8571858602896222537">"ਲਿਖੋ"</string>
     <string name="status_awaiting_tap" msgid="2130145523773160617">"ਲਿਖਣ ਲਈ ਇੱਕ ਟੈਗ ਟੈਪ ਕਰੋ..."</string>
-    <string name="status_invalid_password" msgid="2575271864572897406">"ਗ਼ਲਤ ਪਾਸਵਰਡ, ਦੁਬਾਰਾ ਕੋਸ਼ਿਸ਼ ਕਰੋ।"</string>
+    <string name="status_invalid_password" msgid="2575271864572897406">"ਅਵੈਧ ਪਾਸਵਰਡ, ਦੁਬਾਰਾ ਕੋਸ਼ਿਸ਼ ਕਰੋ।"</string>
     <string name="status_write_success" msgid="5228419086308251169">"ਸਫਲਤਾ!"</string>
-    <string name="status_failed_to_write" msgid="8072752734686294718">"NFC ਟੈਗ ਤੇ ਡੈਟਾ ਲਿਖਣ ਵਿੱਚ ਅਸਮਰੱਥ। ਜੇਕਰ ਸਮੱਸਿਆ ਬਣੀ ਰਹਿੰਦੀ ਹੈ, ਤਾਂ ਇੱਕ ਵੱਖਰੇ ਟੈਗ ਦੀ ਕੋਸ਼ਿਸ਼ ਕਰੋ"</string>
+    <string name="status_failed_to_write" msgid="8072752734686294718">"NFC ਟੈਗ ਤੇ  ਡਾਟਾ  ਲਿਖਣ ਵਿੱਚ ਅਸਮਰੱਥ। ਜੇਕਰ ਸਮੱਸਿਆ ਬਣੀ ਰਹਿੰਦੀ ਹੈ, ਤਾਂ ਇੱਕ ਵੱਖਰੇ ਟੈਗ ਦੀ ਕੋਸ਼ਿਸ਼ ਕਰੋ"</string>
     <string name="status_tag_not_writable" msgid="2511611539977682175">"NFC ਟੈਗ ਲਿਖਣਯੋਗ ਨਹੀਂ ਹੈ। ਕਿਰਪਾ ਕਰਕੇ ਇੱਕ ਵੱਖਰਾ ਟੈਗ ਵਰਤੋ।"</string>
     <string name="default_sound" msgid="8821684447333687810">"ਪੂਰਵ-ਨਿਰਧਾਰਤ ਧੁਨੀ"</string>
-    <string name="sound_settings_summary" msgid="4100853606668287965">"ਰਿੰਗ ਵੌਲਯੂਮ <xliff:g id="PERCENTAGE">%1$s</xliff:g> ਹੈ"</string>
-    <string name="sound_dashboard_summary" msgid="3402435125958012986">"ਵੌਲਿਊਮ, ਥਰਥਰਾਹਟ, \'ਮੈਨੂੰ ਪਰੇਸ਼ਾਨ ਨਾ ਕਰੋ\'"</string>
+    <string name="sound_settings_summary" msgid="4100853606668287965">"ਰਿੰਗ ਦੀ ਅਵਾਜ਼ <xliff:g id="PERCENTAGE">%1$s</xliff:g> ਹੈ"</string>
+    <string name="sound_dashboard_summary" msgid="3402435125958012986">"ਅਵਾਜ਼, ਥਰਥਰਾਹਟ, \'ਪਰੇਸ਼ਾਨ ਨਾ ਕਰੋ\'"</string>
     <string name="sound_settings_summary_vibrate" msgid="1869282574422220096">"ਰਿੰਗਰ ਥਰਥਰਾਹਟ \'ਤੇ ਸੈੱਟ ਹੈ"</string>
-    <string name="sound_settings_summary_silent" msgid="5074529767435584948">"ਰਿੰਗਰ ਖਾਮੋਸ਼ \'ਤੇ ਸੈੱਟ ਹੈ"</string>
-    <string name="sound_settings_example_summary" msgid="2404914514266523165">"ਰਿੰਗ ਵੌਲਯੂਮ 80% ਹੈ"</string>
-    <string name="media_volume_option_title" msgid="2811531786073003825">"ਮੀਡੀਆ ਵੌਲਿਊਮ"</string>
-    <string name="alarm_volume_option_title" msgid="8219324421222242421">"ਅਲਾਰਮ ਵੌਲਿਊਮ"</string>
-    <string name="ring_volume_option_title" msgid="6767101703671248309">"ਰਿੰਗ ਵੌਲਿਊਮ"</string>
+    <string name="sound_settings_summary_silent" msgid="5074529767435584948">"ਰਿੰਗਰ ਸ਼ਾਂਤ \'ਤੇ ਸੈੱਟ ਹੈ"</string>
+    <string name="sound_settings_example_summary" msgid="2404914514266523165">"ਰਿੰਗ ਦੀ ਅਵਾਜ਼ 80% ਹੈ"</string>
+    <string name="media_volume_option_title" msgid="2811531786073003825">"ਮੀਡੀਆ ਦੀ ਅਵਾਜ਼"</string>
+    <string name="alarm_volume_option_title" msgid="8219324421222242421">"ਅਲਾਰਮ ਦੀ ਅਵਾਜ਼"</string>
+    <string name="ring_volume_option_title" msgid="6767101703671248309">"ਰਿੰਗ ਦੀ ਅਵਾਜ਼"</string>
     <string name="notification_volume_option_title" msgid="6064656124416882130">"ਸੂਚਨਾ ਵੌਲਿਊਮ"</string>
-    <string name="ringtone_title" msgid="5379026328015343686">"ਫੋਨ ਰਿੰਗਟੋਨ"</string>
+    <string name="ringtone_title" msgid="5379026328015343686">"ਫ਼ੋਨ ਰਿੰਗਟੋਨ"</string>
     <string name="notification_ringtone_title" msgid="4468722874617061231">"ਪੂਰਵ-ਨਿਰਧਾਰਤ ਸੂਚਨਾ ਧੁਨੀ"</string>
     <string name="notification_unknown_sound_title" msgid="2535027767851838335">"ਐਪ ਵੱਲੋਂ ਮੁਹੱਈਆ ਕਰਵਾਈ ਧੁਨੀ"</string>
     <string name="notification_sound_default" msgid="565135733949733766">"ਪੂਰਵ-ਨਿਰਧਾਰਤ ਸੂਚਨਾ ਧੁਨੀ"</string>
@@ -2813,15 +2824,15 @@
     <string name="vibrate_when_ringing_title" msgid="3806079144545849032">"ਕਾਲਾਂ ਲਈ ਥਰਥਰਾਹਟ ਵੀ ਕਰੋ"</string>
     <string name="other_sound_settings" msgid="3151004537006844718">"ਹੋਰ ਅਵਾਜ਼ਾਂ"</string>
     <string name="dial_pad_tones_title" msgid="1999293510400911558">"ਡਾਇਲ ਪੈਡ ਟੋਨਾਂ"</string>
-    <string name="screen_locking_sounds_title" msgid="1340569241625989837">"ਸਕ੍ਰੀਨ ਲੌਕ ਕਰਨ ਦੀਆਂ ਧੁਨੀਆਂ"</string>
+    <string name="screen_locking_sounds_title" msgid="1340569241625989837">"ਸਕ੍ਰੀਨ ਲਾਕ ਕਰਨ ਦੀਆਂ ਧੁਨੀਆਂ"</string>
     <string name="charging_sounds_title" msgid="1132272552057504251">"ਚਾਰਜ ਕਰਨ ਦੀਆਂ ਧੁਨੀਆਂ"</string>
     <string name="docking_sounds_title" msgid="155236288949940607">"ਡੌਕ ਕਰਨ ਦੀਆਂ ਅਵਾਜ਼ਾਂ"</string>
     <string name="touch_sounds_title" msgid="5326587106892390176">"ਸਪੱਰਸ਼ ਧੁਨੀਆਂ"</string>
     <string name="vibrate_on_touch_title" msgid="5388579924689395023">"ਟੈਪ \'ਤੇ ਥਰਥਰਾਹਟ ਕਰੋ"</string>
     <string name="dock_audio_media_title" msgid="1346838179626123900">"ਡੌਕ ਸਪੀਕਰ ਪਲੇ ਕਰਦਾ ਹੈ"</string>
-    <string name="dock_audio_media_disabled" msgid="3430953622491538080">"ਸਾਰੇ ਔਡੀਓ"</string>
-    <string name="dock_audio_media_enabled" msgid="667849382924908673">"ਕੇਵਲ ਮੀਡੀਆ ਔਡੀਓ"</string>
-    <string name="emergency_tone_silent" msgid="1067515631635824291">"ਖਾਮੋਸ਼"</string>
+    <string name="dock_audio_media_disabled" msgid="3430953622491538080">"ਸਾਰੇ  ਆਡੀਓ"</string>
+    <string name="dock_audio_media_enabled" msgid="667849382924908673">"ਕੇਵਲ ਮੀਡੀਆ  ਆਡੀਓ"</string>
+    <string name="emergency_tone_silent" msgid="1067515631635824291">"ਸ਼ਾਂਤ"</string>
     <string name="emergency_tone_alert" msgid="8941852695428130667">"ਚਿਤਾਵਨੀ"</string>
     <string name="emergency_tone_vibrate" msgid="8281126443204950847">"ਥਰਥਰਾਹਟ ਕਰੋ"</string>
     <string name="boot_sounds_title" msgid="567029107382343709">"ਚਾਲੂ ਹੋਣ \'ਤੇ ਵੱਜਣ ਵਾਲੀਆਂ ਧੁਨੀਆਂ"</string>
@@ -2830,16 +2841,22 @@
       <item quantity="one"><xliff:g id="ON_COUNT">%d</xliff:g> ਸਵੈਚਲਿਤ ਨਿਯਮ ਚਾਲੂ ਕੀਤਾ ਹੋਇਆ ਹੈ</item>
       <item quantity="other"><xliff:g id="ON_COUNT">%d</xliff:g> ਸਵੈਚਲਿਤ ਨਿਯਮ ਚਾਲੂ ਕੀਤੇ ਹੋਏ ਹਨ</item>
     </plurals>
-    <string name="zen_mode_settings_title" msgid="842308776768942600">"\'ਮੈਨੂੰ ਪਰੇਸ਼ਾਨ ਨਾ ਕਰੋ\' ਤਰਜੀਹਾਂ"</string>
-    <string name="zen_mode_priority_settings_title" msgid="2623117023031824309">"ਕੇਵਲ ਤਰਜੀਹੀ ਦੀ ਆਗਿਆ ਹੈ"</string>
+    <string name="zen_mode_settings_title" msgid="1066226840983908121">"ਪਰੇਸ਼ਾਨ ਨਾ ਕਰੋ"</string>
+    <string name="zen_mode_behavior_settings_title" msgid="1463303933529313969">"ਵਰਤਾਅ"</string>
+    <string name="zen_mode_behavior_allow_title" msgid="3845615648136218141">"ਇਸ ਨੂੰ ਧੁਨੀਆਂ ਅਤੇ ਥਰਥਰਾਹਟਾਂ ਕਰਨ ਦਿਓ"</string>
+    <string name="zen_mode_behavior_no_sound" msgid="1219626004723208056">"ਕੋਈ ਧੁਨੀ ਨਹੀਂ"</string>
+    <string name="zen_mode_behavior_total_silence" msgid="6716603819806610626">"ਕੋਈ ਧੁਨੀ ਨਹੀਂ (ਪੂਰੀ ਖਾਮੋਸ਼ੀ)"</string>
+    <string name="zen_mode_behavior_no_sound_except" msgid="4968477585788243114">"ਸਿਵਾਏ <xliff:g id="CATEGORIES">%1$s</xliff:g> ਕੋਈ ਧੁਨੀ ਨਹੀਂ"</string>
+    <!-- no translation found for zen_mode_behavior_alarms_only (2423480992071472963) -->
+    <skip />
     <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_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>
@@ -2850,41 +2867,43 @@
     <string name="work_sync_dialog_title" msgid="7123973297187354813">"ਧੁਨੀਆਂ ਬਦਲੀਏ?"</string>
     <string name="work_sync_dialog_yes" msgid="7243884940551635717">"ਬਦਲੋ"</string>
     <string name="work_sync_dialog_message" msgid="7841728953710863208">"ਤੁਹਾਡੀਆਂ ਨਿੱਜੀ ਪ੍ਰੋਫਾਈਲ ਧੁਨੀਆਂ ਤੁਹਾਡੇ ਕਾਰਜ ਪ੍ਰੋਫਾਈਲ ਲਈ ਵਰਤੀਆਂ ਜਾਣਗੀਆਂ"</string>
-    <string name="ringtones_install_custom_sound_title" msgid="5948792721161302255">"ਵਿਸ਼ੇਸ਼-ਵਿਉਂਤਬੱਧ ਧੁਨੀ ਸ਼ਾਮਲ ਕਰੀਏ?"</string>
+    <string name="ringtones_install_custom_sound_title" msgid="5948792721161302255">"ਵਿਉਂਤੀ ਧੁਨੀ ਸ਼ਾਮਲ ਕਰਨੀ ਹੈ?"</string>
     <string name="ringtones_install_custom_sound_content" msgid="2195581481608512786">"ਇਹ ਫ਼ਾਈਲ <xliff:g id="FOLDER_NAME">%s</xliff:g> ਫੋਲਡਰ ਵਿੱਚ ਕਾਪੀ ਕੀਤੀ ਜਾਵੇਗੀ"</string>
     <string name="ringtones_category_preference_title" msgid="5675912303120102366">"ਰਿੰਗਟੋਨਾਂ"</string>
     <string name="other_sound_category_preference_title" msgid="2521096636124314015">"ਹੋਰ ਧੁਨੀਆਂ ਅਤੇ ਥਰਥਰਾਹਟਾਂ"</string>
     <string name="configure_notification_settings" msgid="7616737397127242615">"ਸੂਚਨਾਵਾਂ"</string>
-    <string name="advanced_section_header" msgid="8833934850242546903">"ਉੱਨਤ"</string>
+    <string name="advanced_section_header" msgid="8833934850242546903">"ਵਿਕਸਿਤ"</string>
     <string name="profile_section_header" msgid="2320848161066912001">"ਕੰਮ ਸਬੰਧੀ ਸੂਚਨਾਵਾਂ"</string>
-    <string name="notification_badging_title" msgid="5938709971403474078">"ਸੂਚਨਾ ਬਿੰਦੂਆਂ ਨੂੰ ਇਜਾਜ਼ਤ ਦਿਓ"</string>
+    <string name="notification_badging_title" msgid="5938709971403474078">"ਸੂਚਨਾ ਬਿੰਦੂਆਂ ਨੂੰ ਆਗਿਆ ਦਿਓ"</string>
     <string name="notification_pulse_title" msgid="1905382958860387030">"ਲਾਈਟ ਨੂੰ ਟਿਮ-ਟਿਮਾਓ"</string>
-    <string name="lock_screen_notifications_title" msgid="6173076173408887213">"ਲੌਕ ਸਕ੍ਰੀਨ \'ਤੇ"</string>
+    <string name="lock_screen_notifications_title" msgid="6173076173408887213">"ਲਾਕ ਸਕ੍ਰੀਨ \'ਤੇ"</string>
     <string name="lock_screen_notifications_summary_show" msgid="6407527697810672847">"ਸਾਰੀ ਸੂਚਨਾ ਸਮੱਗਰੀ ਦਿਖਾਓ"</string>
     <string name="lock_screen_notifications_summary_hide" msgid="7891552853357258782">"ਸੰਵੇਦਨਸ਼ੀਲ ਸੂਚਨਾ ਸਮੱਗਰੀ ਲੁਕਾਓ"</string>
     <string name="lock_screen_notifications_summary_disable" msgid="859628910427886715">"ਬਿਲਕੁਲ ਵੀ ਸੂਚਨਾਵਾਂ ਨਾ ਦਿਖਾਓ"</string>
-    <string name="lock_screen_notifications_interstitial_message" msgid="6164532459432182244">"ਜਦੋਂ ਤੁਹਾਡੀ ਡੀਵਾਈਸ ਲੌਕ ਹੋਵੇ, ਤਾਂ ਤੁਸੀਂ ਸੂਚਨਾਵਾਂ ਕਿਵੇਂ ਦਿਖਾਉਣੀਆਂ ਚਾਹੁੰਦੇ ਹੋ?"</string>
+    <string name="lock_screen_notifications_interstitial_message" msgid="6164532459432182244">"ਜਦੋਂ ਤੁਹਾਡਾ ਡੀਵਾਈਸ ਲਾਕ ਹੋਵੇ, ਤਾਂ ਤੁਸੀਂ ਸੂਚਨਾਵਾਂ ਕਿਵੇਂ ਦਿਖਾਉਣੀਆਂ ਚਾਹੁੰਦੇ ਹੋ?"</string>
     <string name="lock_screen_notifications_interstitial_title" msgid="1416589393106326972">"ਸੂਚਨਾਵਾਂ"</string>
-    <string name="lock_screen_notifications_summary_show_profile" msgid="835870815661120772">"ਕੰਮ ਸਬੰਧੀ ਸਾਰੀ ਸੂਚਨਾ ਸਮੱਗਰੀ ਨੂੰ ਵਿਖਾਓ"</string>
+    <string name="lock_screen_notifications_summary_show_profile" msgid="835870815661120772">"ਕੰਮ ਸਬੰਧੀ ਸਾਰੀ ਸੂਚਨਾ ਸਮੱਗਰੀ ਨੂੰ ਦਿਖਾਓ"</string>
     <string name="lock_screen_notifications_summary_hide_profile" msgid="256116258285695645">"ਕੰਮ ਸਬੰਧੀ ਸੰਵੇਦਨਸ਼ੀਲ ਸੂਚਨਾ ਸਮੱਗਰੀ ਨੂੰ ਲੁਕਾਓ"</string>
-    <string name="lock_screen_notifications_summary_disable_profile" msgid="4080720698960233358">"ਕੰਮ ਸੂਚਨਾਵਾਂ ਬਿਲਕੁਲ ਵੀ ਨਾ ਵਿਖਾਓ"</string>
-    <string name="lock_screen_notifications_interstitial_message_profile" msgid="8307705621027472346">"ਜਦੋਂ ਤੁਹਾਡੀ ਡੀਵਾਈਸ ਲੌਕ ਹੋਵੇ, ਤਾਂ ਤੁਸੀਂ ਪ੍ਰੋਫਾਈਲ ਸੂਚਨਾਵਾਂ ਨੂੰ ਕਿਸ ਤਰ੍ਹਾਂ ਵਿਖਾਉਣਾ ਚਾਹੁੰਦੇ ਹੋ?"</string>
+    <string name="lock_screen_notifications_summary_disable_profile" msgid="4080720698960233358">"ਕੰਮ ਸੂਚਨਾਵਾਂ ਬਿਲਕੁਲ ਵੀ ਨਾ  ਦਿਖਾਓ"</string>
+    <string name="lock_screen_notifications_interstitial_message_profile" msgid="8307705621027472346">"ਜਦੋਂ ਤੁਹਾਡਾ ਡੀਵਾਈਸ ਲਾਕ ਹੋਵੇ, ਤਾਂ ਤੁਸੀਂ ਪ੍ਰੋਫਾਈਲ ਸੂਚਨਾਵਾਂ ਕਿਸ ਤਰ੍ਹਾਂ ਦਿਖਾਉਣੀਆਂ ਚਾਹੁੰਦੇ ਹੋ?"</string>
     <string name="lock_screen_notifications_interstitial_title_profile" msgid="3169806586032521333">"ਪ੍ਰੋਫਾਈਲ ਸੂਚਨਾਵਾਂ"</string>
     <string name="notifications_title" msgid="8086372779371204971">"ਸੂਚਨਾਵਾਂ"</string>
     <string name="app_notifications_title" msgid="5810577805218003760">"ਐਪ ਸੂਚਨਾਵਾਂ"</string>
     <string name="notification_channel_title" msgid="2260666541030178452">"ਸੂਚਨਾ ਸ਼੍ਰੇਣੀ"</string>
+    <string name="notification_group_title" msgid="7180506440133859601">"ਸੂਚਨਾ ਸ਼੍ਰੇਣੀ ਗਰੁੱਪ"</string>
     <string name="notification_importance_title" msgid="848692592679312666">"ਮਹੱਤਤਾ"</string>
-    <string name="notification_importance_unspecified" msgid="2196023702875112081">"ਐਪ ਨੂੰ ਤੈਅ ਕਰਨ ਦਿਓ"</string>
-    <string name="notification_importance_blocked" msgid="7938180808339386300">"ਸੂਚਨਾਵਾਂ ਕਦੇ ਵੀ ਨਾ ਵਿਖਾਓ"</string>
+    <string name="notification_importance_unspecified" msgid="6622173510486113958">"ਧੁਨੀ ਵੱਜਣ ਦਿਓ"</string>
+    <string name="notification_importance_blocked" msgid="7938180808339386300">"ਸੂਚਨਾਵਾਂ ਕਦੇ ਵੀ ਨਾ  ਦਿਖਾਓ"</string>
     <string name="notification_importance_min" msgid="5455049524984686275">"ਕੋਈ ਧੁਨੀ ਜਾਂ ਦ੍ਰਿਸ਼ਟਾਂਤਕ ਰੁਕਾਵਟ ਨਹੀਂ"</string>
     <string name="notification_importance_low" msgid="8881468429453766553">"ਕੋਈ ਧੁਨੀ ਨਹੀਂ"</string>
     <string name="notification_importance_default" msgid="5958338024601957516">"ਧੁਨੀ ਵਜਾਓ"</string>
-    <string name="notification_importance_high" msgid="2082429479238228527">"ਧੁਨੀ ਵਜਾਓ ਅਤੇ ਸਕ੍ਰੀਨ \'ਤੇ ਵਿਖਾਓ"</string>
+    <string name="notification_importance_high" msgid="2082429479238228527">"ਧੁਨੀ ਵਜਾਓ ਅਤੇ ਸਕ੍ਰੀਨ \'ਤੇ  ਦਿਖਾਓ"</string>
+    <string name="notification_importance_high_silent" msgid="2667033773703765252">"ਸਕ੍ਰੀਨ \'ਤੇ ਦਿਖਾਓ"</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_interruption" msgid="7136150018111848721">"ਰੁਕਾਵਟਾਂ ਦੀ ਇਜਾਜ਼ਤ ਦਿਓ"</string>
+    <string name="allow_interruption" msgid="7136150018111848721">"ਰੁਕਾਵਟਾਂ ਦੀ ਆਗਿਆ ਦਿਓ"</string>
     <string name="allow_interruption_summary" msgid="7870159391333957050">"ਐਪ ਨੂੰ ਧੁਨੀ ਵਜਾਉਣ, ਥਰਥਰਾਹਟ ਕਰਨ, ਅਤੇ/ਜਾਂ ਸਕ੍ਰੀਨ \'ਤੇ ਸੂਚਨਾਵਾਂ ਦਿਖਾਉਣ ਦੀ ਆਗਿਆ ਦਿਓ"</string>
     <string name="notification_channel_summary_min" msgid="5401718014765921892">"ਘੱਟ ਮਹੱਤਵ"</string>
     <string name="notification_channel_summary_low" msgid="322317684244981244">"ਔਸਤ ਮਹੱਤਵ"</string>
@@ -2892,7 +2911,7 @@
     <string name="notification_channel_summary_high" msgid="2085017556511003283">"ਜ਼ਰੂਰੀ ਮਹੱਤਵ"</string>
     <string name="default_notification_assistant" msgid="7631945224761430146">"ਸੂਚਨਾ ਸਹਾਇਕ"</string>
     <string name="manage_notification_access_title" msgid="7510080164564944891">"ਸੂਚਨਾ ਪਹੁੰਚ"</string>
-    <string name="work_profile_notification_access_blocked_summary" msgid="8748026238701253040">"ਕਾਰਜ ਪ੍ਰੋਫਾਈਲ ਸੂਚਨਾਵਾਂ \'ਤੇ ਪਹੁੰਚ ਨੂੰ ਬਲੌਕ ਕੀਤਾ ਗਿਆ ਹੈ"</string>
+    <string name="work_profile_notification_access_blocked_summary" msgid="8748026238701253040">"ਕਾਰਜ ਪ੍ਰੋਫਾਈਲ ਸੂਚਨਾਵਾਂ \'ਤੇ ਪਹੁੰਚ ਨੂੰ ਬਲਾਕ ਕੀਤਾ ਗਿਆ ਹੈ"</string>
     <string name="manage_notification_access_summary_zero" msgid="2409912785614953348">"ਐਪ ਸੂਚਨਾਵਾਂ ਨਹੀਂ ਪੜ੍ਹ ਸਕਦੇ"</string>
     <plurals name="manage_notification_access_summary_nonzero" formatted="false" msgid="7930130030691218387">
       <item quantity="one">%d ਐਪਸ ਸੂਚਨਾਵਾਂ ਪੜ੍ਹ ਸਕਦੇ ਹਨ</item>
@@ -2900,31 +2919,35 @@
     </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_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>
+    <string name="picture_in_picture_title" msgid="5824849294270017113">"ਤਸਵੀਰ-ਵਿੱਚ-ਤਸਵੀਰ"</string>
     <string name="picture_in_picture_empty_text" msgid="685224245260197779">"ਸਥਾਪਤ ਕੀਤੀਆਂ ਹੋਈਆਂ ਐਪਾਂ ਵਿੱਚੋਂ ਕੋਈ ਵੀ ਐਪ ਤਸਵੀਰ-ਵਿੱਚ-ਤਸਵੀਰ ਮੋਡ ਦਾ ਸਮਰਥਨ ਨਹੀਂ ਕਰਦੀ"</string>
     <string name="picture_in_picture_keywords" msgid="8361318686701764690">"pip ਤਸਵੀਰ ਵਿੱਚ"</string>
-    <string name="picture_in_picture_app_detail_title" msgid="4080800421316791732">"ਤਸਵੀਰ-ਵਿੱਚ-ਤਸਵੀਰ ਮੋਡ"</string>
+    <string name="picture_in_picture_app_detail_title" msgid="4080800421316791732">"ਤਸਵੀਰ-ਵਿੱਚ-ਤਸਵੀਰ"</string>
     <string name="picture_in_picture_app_detail_switch" msgid="1131910667023738296">"ਤਸਵੀਰ-ਵਿੱਚ-ਤਸਵੀਰ ਨੂੰ ਇਜਾਜ਼ਤ ਦਿਓ"</string>
-    <!-- no translation found for picture_in_picture_app_detail_summary (1264019085827708920) -->
-    <skip />
+    <string name="picture_in_picture_app_detail_summary" msgid="1264019085827708920">"ਇਸ ਐਪ ਨੂੰ ਤਸਵੀਰ-ਵਿੱਚ-ਤਸਵੀਰ ਵਿੰਡੋ ਬਣਾਉਣ ਦੀ ਇਜਾਜ਼ਤ ਦਿਓ ਜਦੋਂ ਐਪ ਖੁੱਲ੍ਹੀ ਹੋਵੇ ਜਾਂ ਜਦੋਂ ਤੁਸੀਂ ਇਸ ਨੂੰ ਛੱਡ ਦਿਓ (ਉਦਾਹਰਨ ਲਈ, ਵੀਡੀਓ ਦੇਖਣਾ ਜਾਰੀ ਰੱਖਣ ਲਈ)। ਇਹ ਵਿੰਡੋ ਤੁਹਾਡੇ ਦੁਆਰਾ ਵਰਤੀਆਂ ਜਾ ਰਹੀਆਂ ਦੂਜੀਆਂ ਐਪਾਂ ਦੇ ਉੱਪਰ ਪ੍ਰਦਰਸ਼ਿਤ ਹੁੰਦੀ ਹੈ।"</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>
+    <string name="app_notifications_off_desc" msgid="4882445501376722969">"Android ਵੱਲੋਂ ਇਸ ਐਪ ਦੀਆਂ ਸੂਚਨਾਵਾਂ ਨੂੰ ਇਸ ਡੀਵਾਈਸ \'ਤੇ ਦਿਖਾਏ ਜਾਣ ਤੋਂ ਰੋਕਿਆ ਜਾ ਰਿਹਾ ਹੈ"</string>
+    <string name="channel_notifications_off_desc" msgid="5899225298718840635">"Android ਵੱਲੋਂ ਸੂਚਨਾਵਾਂ ਦੀ ਇਸ ਸ਼੍ਰੇਣੀ ਨੂੰ ਇਸ ਡੀਵਾਈਸ \'ਤੇ ਦਿਖਾਏ ਜਾਣ ਤੋਂ ਰੋਕਿਆ ਜਾ ਰਿਹਾ ਹੈ"</string>
+    <string name="channel_group_notifications_off_desc" msgid="1620950416247316370">"Android ਵੱਲੋਂ ਸੂਚਨਾਵਾਂ ਦੇ ਇਸ ਗਰੁੱਪ ਨੂੰ ਇਸ ਡੀਵਾਈਸ \'ਤੇ ਦਿਖਾਏ ਜਾਣ ਤੋਂ ਬਲਾਕ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ"</string>
     <string name="notification_channels" msgid="5346841743182627500">"ਸ਼੍ਰੇਣੀਆਂ"</string>
     <string name="notification_channels_other" msgid="5645317113885788226">"ਹੋਰ"</string>
+    <plurals name="notification_group_summary" formatted="false" msgid="3420621520561455358">
+      <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="no_channels" msgid="3077375508177744586">"ਇਸ ਐਪ ਨੇ ਕੋਈ ਵੀ ਸੂਚਨਾਵਾਂ ਪੋਸਟ ਨਹੀਂ ਕੀਤੀਆਂ ਹਨ"</string>
     <string name="app_settings_link" msgid="8894946007543660906">"ਐਪ ਵਿੱਚ ਵਾਧੂ ਸੈਟਿੰਗਾਂ"</string>
     <string name="app_notification_listing_summary_zero" msgid="6482582965081108108">"ਸਾਰੀਆਂ ਐਪਾਂ ਦੇ ਲਈ ਚਾਲੂ ਕੀਤਾ"</string>
@@ -2938,15 +2961,15 @@
     </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="6370122441168519809">"ਸੂਚਨਾ ਬਿੰਦੂ ਨੂੰ ਇਜਾਜ਼ਤ ਦਿਓ"</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_visibility_override_title" msgid="2187232730902430718">"ਲੌਕ ਸਕ੍ਰੀਨ \'ਤੇ"</string>
+    <string name="app_notification_override_dnd_title" msgid="7867458246395884830">"\'ਪਰੇਸ਼ਾਨ ਨਾ ਕਰੋ\' ਨੂੰ ਓਵਰਰਾਈਡ ਕਰੋ"</string>
+    <string name="app_notification_override_dnd_summary" msgid="3516007157020189746">"ਇਹਨਾਂ ਸੂਚਨਾਵਾਂ ਨੂੰ ਰੋਕੇ ਰਹਿਣਾ ਜਾਰੀ ਰਹਿਣ ਦਿਓ ਜਦੋਂ \'ਪਰੇਸ਼ਾਨ ਨਾ ਕਰੋ\' ਨੂੰ \'ਸਿਰਫ਼ ਤਰਜੀਹ\' \'ਤੇ ਸੈੱਟ ਕੀਤਾ ਹੋਵੇ।"</string>
+    <string name="app_notification_visibility_override_title" msgid="2187232730902430718">"ਲਾਕ ਸਕ੍ਰੀਨ \'ਤੇ"</string>
     <string name="app_notification_row_banned" msgid="5983655258784814773">"ਬਲੌਕ ਕੀਤੀਆਂ"</string>
     <string name="app_notification_row_priority" msgid="7723839972982746568">"ਤਰਜੀਹ"</string>
     <string name="app_notification_row_sensitive" msgid="1809610030432329940">"ਸੰਵੇਦਨਸ਼ੀਲ"</string>
@@ -2958,7 +2981,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,17 +2990,17 @@
     <string name="zen_mode_delete_rule_button" msgid="4248741120307752294">"ਮਿਟਾਓ"</string>
     <string name="zen_mode_rule_type" msgid="2289413469580142888">"ਨਿਯਮ ਦਾ ਪ੍ਰਕਾਰ"</string>
     <string name="zen_mode_rule_type_unknown" msgid="3049377282766700600">"ਅਗਿਆਤ"</string>
-    <string name="zen_mode_configure_rule" msgid="8865785428056490305">"ਨਿਯਮ ਕੌਂਫਿਗਰ ਕਰੋ"</string>
+    <string name="zen_mode_configure_rule" msgid="8865785428056490305">"ਨਿਯਮ ਦੀ ਰੂਪ-ਰੇਖਾ ਬਦਲੋ"</string>
     <string name="zen_schedule_rule_type_name" msgid="142936744435271449">"ਸਮਾਂ ਨਿਯਮ"</string>
-    <string name="zen_schedule_rule_enabled_toast" msgid="3379499360390382259">"ਨਿਰਧਾਰਿਤ ਸਮੇਂ ਦੇ ਦੌਰਾਨ ਮੈਨੂੰ ਪਰੇਸ਼ਾਨ ਨਾ ਕਰੋ ਚਾਲੂ ਕਰਨ ਲਈ ਸਵੈਚਲ ਨਿਯਮ ਸੈੱਟ ਕਰੋ"</string>
-    <string name="zen_event_rule_type_name" msgid="2645981990973086797">"ਵਰਤਾਰਾ ਨਿਯਮ"</string>
-    <string name="zen_event_rule_enabled_toast" msgid="6910577623330811480">"ਨਿਰਧਾਰਿਤ ਇਵੈਂਟਸ ਦੇ ਦੌਰਾਨ ਮੈਨੂੰ ਪਰੇਸ਼ਾਨ ਨਾ ਕਰੋ ਚਾਲੂ ਕਰਨ ਲਈ ਸਵੈਚਲ ਨਿਯਮ ਸੈੱਟ ਕਰੋ"</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_mode_event_rule_calendar" msgid="8787906563769067418">"ਇਸ ਲਈ ਇਵੈਂਟ ਦੇ ਦੌਰਾਨ"</string>
     <string name="zen_mode_event_rule_summary_calendar_template" msgid="5135844750232403975">"<xliff:g id="CALENDAR">%1$s</xliff:g> ਲਈ ਇਵੈਂਟ ਦੇ ਦੌਰਾਨ"</string>
     <string name="zen_mode_event_rule_summary_any_calendar" msgid="4936646399126636358">"ਕੋਈ ਵੀ ਕੈਲੰਡਰ"</string>
-    <string name="zen_mode_event_rule_summary_reply_template" msgid="6590671260829837157">"ਜਵਾਬ <xliff:g id="REPLY">%1$s</xliff:g> ਕਿੱਥੇ ਹੈ"</string>
+    <string name="zen_mode_event_rule_summary_reply_template" msgid="6590671260829837157">"ਜਿੱਥੇ ਜਵਾਬ <xliff:g id="REPLY">%1$s</xliff:g> ਹੈ"</string>
     <string name="zen_mode_event_rule_calendar_any" msgid="6485568415998569885">"ਕੋਈ ਵੀ ਕੈਲੰਡਰ"</string>
-    <string name="zen_mode_event_rule_reply" msgid="5166322024212403739">"ਜਵਾਬ ਕਿੱਥੇ ਹੈ"</string>
+    <string name="zen_mode_event_rule_reply" msgid="5166322024212403739">"ਜਿੱਥੇ ਜਵਾਬ ਇਹ ਹੈ"</string>
     <string name="zen_mode_event_rule_reply_any_except_no" msgid="8868873496008825961">"ਹਾਂ, ਸ਼ਾਇਦ, ਜਾਂ ਜਵਾਬ ਨਹੀਂ ਦਿੱਤਾ ਗਿਆ"</string>
     <string name="zen_mode_event_rule_reply_yes_or_maybe" msgid="2769656565454495824">"ਹਾਂ ਜਾਂ ਸ਼ਾਇਦ"</string>
     <string name="zen_mode_event_rule_reply_yes" msgid="1003598835878784659">"ਹਾਂ"</string>
@@ -2987,8 +3010,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>
@@ -2998,73 +3021,76 @@
     <string name="zen_mode_selected_messages" msgid="8245990149599142281">"ਚੁਣੇ ਗਏ ਸੁਨੇਹੇ"</string>
     <string name="zen_mode_from_anyone" msgid="2638322015361252161">"ਕਿਸੇ ਵੀ ਵਿਅਕਤੀ ਤੋਂ"</string>
     <string name="zen_mode_from_contacts" msgid="2232335406106711637">"ਸਿਰਫ਼ ਸੰਪਰਕਾਂ ਤੋਂ"</string>
-    <string name="zen_mode_from_starred" msgid="2678345811950997027">"ਸਿਰਫ਼ ਸਿਤਾਰੇ ਵਾਲੇ ਸੰਪਰਕਾਂ ਤੋਂ"</string>
+    <string name="zen_mode_from_starred" msgid="2678345811950997027">"ਸਿਰਫ਼ ਤਾਰਾਬੱਧ ਸੰਪਰਕਾਂ ਤੋਂ"</string>
     <string name="zen_mode_from_none" msgid="8219706639954614136">"ਕੋਈ ਨਹੀਂ"</string>
     <string name="zen_mode_alarms" msgid="2165302777886552926">"ਅਲਾਰਮ"</string>
-    <string name="zen_mode_reminders" msgid="5458502056440485730">"ਯਾਦ-ਦਹਾਨੀਆਂ"</string>
-    <string name="zen_mode_events" msgid="7914446030988618264">"ਵਰਤਾਰੇ"</string>
+    <!-- no translation found for zen_mode_media_system_other (8900209390529859777) -->
+    <skip />
+    <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="239685342222975733">"ਜੇਕਰ ਇੱਕੋ ਵਿਅਕਤੀ <xliff:g id="MINUTES">%d</xliff:g> ਮਿੰਟ ਵਿੱਚ ਦੂਜੀ ਵਾਰ ਕਾਲ ਕਰੇ"</string>
     <string name="zen_mode_when" msgid="2767193283311106373">"ਆਟੋਮੈਟਿਕਲੀ ਚਾਲੂ ਕਰੋ"</string>
     <string name="zen_mode_when_never" msgid="8809494351918405602">"ਕਦੇ ਵੀ ਨਹੀਂ"</string>
     <string name="zen_mode_when_every_night" msgid="3122486110091921009">"ਹਰੇਕ ਰਾਤ ਨੂੰ"</string>
     <string name="zen_mode_when_weeknights" msgid="8354070633893273783">"ਵੀਕਨਾਈਟਸ"</string>
-    <string name="zen_mode_start_time" msgid="8102602297273744441">"ਸ਼ੁਰੂਆਤੀ ਸਮਾਂ"</string>
-    <string name="zen_mode_end_time" msgid="8774327885892705505">"ਸਮਾਪਤੀ ਸਮਾਂ"</string>
+    <string name="zen_mode_start_time" msgid="8102602297273744441">"ਸ਼ੁਰੂੂਆਤ ਦਾ ਸਮਾਂ"</string>
+    <string name="zen_mode_end_time" msgid="8774327885892705505">"ਸਮਾਪਤੀ ਦਾ ਸਮਾਂ"</string>
     <string name="zen_mode_end_time_next_day_summary_format" msgid="4201521691238728701">"<xliff:g id="FORMATTED_TIME">%s</xliff:g> ਅਗਲੇ ਦਿਨ"</string>
     <string name="zen_mode_summary_alarms_only_indefinite" msgid="2061973221027570123">"ਅਲਾਰਮਾਂ ਵਿੱਚ ਬਦਲਾਵ ਕੇਵਲ ਅਨਿਸ਼ਚਿਤ ਤੌਰ ਤੇ"</string>
     <plurals name="zen_mode_summary_alarms_only_by_minute" formatted="false" msgid="6122003583875424601">
-      <item quantity="one">ਅਲਾਰਮਾਂ ਵਿੱਚ ਕੇਵਲ <xliff:g id="DURATION">%1$d</xliff:g> ਮਿੰਟਾਂ ਲਈ ਬਦਲਾਵ (<xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g> ਤੱਕ)</item>
-      <item quantity="other">ਅਲਾਰਮਾਂ ਵਿੱਚ ਕੇਵਲ <xliff:g id="DURATION">%1$d</xliff:g> ਮਿੰਟਾਂ ਲਈ ਬਦਲਾਵ (<xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g> ਤੱਕ)</item>
+      <item quantity="one"><xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g> ਤੱਕ <xliff:g id="DURATION">%1$d</xliff:g> ਮਿੰਟਾਂ ਲਈ ਸਿਰਫ਼ ਅਲਾਰਮਾਂ ਵਿੱਚ ਬਦਲੋ</item>
+      <item quantity="other"><xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g> ਤੱਕ <xliff:g id="DURATION">%1$d</xliff:g> ਮਿੰਟਾਂ ਲਈ ਸਿਰਫ਼ ਅਲਾਰਮਾਂ ਵਿੱਚ ਬਦਲੋ</item>
     </plurals>
     <plurals name="zen_mode_summary_alarms_only_by_hour" formatted="false" msgid="2407703455581767748">
-      <item quantity="one">ਅਲਾਰਮਾਂ ਵਿੱਚ ਕੇਵਲ <xliff:g id="DURATION">%1$d</xliff:g> ਘੰਟਿਆਂ ਲਈ <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g> ਤੱਕ ਬਦਲਾਵ</item>
-      <item quantity="other">ਅਲਾਰਮਾਂ ਵਿੱਚ ਕੇਵਲ<xliff:g id="DURATION">%1$d</xliff:g> ਘੰਟਿਆਂ ਲਈ <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g> ਤੱਕ ਬਦਲਾਵ</item>
+      <item quantity="one"><xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g> ਤੱਕ <xliff:g id="DURATION">%1$d</xliff:g> ਘੰਟਿਆਂ ਲਈ ਸਿਰਫ਼ ਅਲਾਰਮਾਂ ਵਿੱਚ ਬਦਲੋ</item>
+      <item quantity="other"><xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g> ਤੱਕ <xliff:g id="DURATION">%1$d</xliff:g> ਘੰਟਿਆਂ ਲਈ ਸਿਰਫ਼ ਅਲਾਰਮਾਂ ਵਿੱਚ ਬਦਲੋ</item>
     </plurals>
     <string name="zen_mode_summary_alarms_only_by_time" msgid="7465525754879341907">"ਅਲਾਰਮ ਨੂੰ ਸਿਰਫ਼ <xliff:g id="FORMATTEDTIME">%1$s</xliff:g> ਤੱਕ ਬਦਲੋ"</string>
     <string name="zen_mode_summary_always" msgid="6172985102689237703">"ਹਮੇਸ਼ਾਂ ਵਿਘਨ ਪਾਓ ਵਿੱਚ ਬਦਲੋ"</string>
-    <string name="zen_mode_screen_on" msgid="7712038508173845101">"ਸਕ੍ਰੀਨ ਦੇ ਬੰਦ ਹੋਣ \'ਤੇ ਬਲੌਕ ਕਰੋ"</string>
-    <string name="zen_mode_screen_on_summary" msgid="6444425984146305149">"\"ਮੈਨੂੰ ਪਰੇਸ਼ਾਨ ਨਾ ਕਰੋ\" ਦੁਆਰਾ ਖਾਮੋਸ਼ ਕੀਤੀਆਂ ਸੂਚਨਾਵਾਂ ਨੂੰ ਸਕ੍ਰੀਨ \'ਤੇ ਝਲਕਣ ਜਾਂ ਵਿਖਾਈ ਦੇਣ ਤੋਂ ਰੋਕੋ"</string>
-    <string name="zen_mode_screen_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">"ਪ੍ਰਸ਼ਾਸਕ PIN ਦਾਖਲ ਕਰੋ"</string>
+    <string name="suggestion_button_text" msgid="3275010948381252006">"ਠੀਕ ਹੈ"</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_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="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="encryption_interstitial_header" msgid="468015813904595613">"ਸੁਰੱਖਿਅਤ ਸ਼ੁਰੂਆਤ"</string>
     <string name="encryption_continue_button" msgid="1121880322636992402">"ਜਾਰੀ ਰੱਖੋ"</string>
-    <string name="encryption_interstitial_message_pin" msgid="2317181134653424679">"ਤੁਸੀਂ ਇਸ ਡੀਵਾਈਸ ਦੇ ਚਾਲੂ ਹੋਣ ਤੋਂ ਪਹਿਲਾਂ ਆਪਣਾ PIN ਦਾਖਲ ਕਰਨਾ ਲੋੜੀਂਦਾ ਬਣਾਕੇ ਇਸਨੂੰ ਹੋਰ ਸੁਰੱਖਿਅਤ ਬਣਾ ਸਕਦੇ ਹੋ। ਜਦੋਂ ਤੱਕ ਡੀਵਾਈਸ ਚਾਲੂ ਨਹੀਂ ਹੁੰਦੀ, ਇਹ ਅਲਾਰਮਾਂ ਸਹਿਤ, ਕਾਲਾਂ, ਸੁਨੇਹੇ ਜਾਂ ਸੂਚਨਾਵਾਂ ਪ੍ਰਾਪਤ ਨਹੀਂ ਕਰ ਸਕਦੀ। \n\nਇਹ ਗੁਆਚੀਆਂ ਜਾਂ ਚੋਰੀ ਹੋਈਆਂ ਡੀਵਾਈਸਾਂ \'ਤੇ ਡੈਟਾ ਸੁਰੱਖਿਅਤ ਕਰਨ ਵਿੱਚ ਸਹਾਇਤਾ ਕਰਦਾ ਹੈ। ਤੁਹਾਡੀ ਡੀਵਾਈਸ ਨੂੰ ਚਾਲੂ ਕਰਨ ਲਈ PIN ਦਾਖਲ ਕਰਨਾ ਲੋੜੀਂਦਾ ਬਣਾਈਏ?"</string>
-    <string name="encryption_interstitial_message_pattern" msgid="7081249914068568570">"ਤੁਸੀਂ ਇਸ ਡੀਵਾਈਸ ਦੇ ਚਾਲੂ ਹੋਣ ਤੋਂ ਪਹਿਲਾਂ ਆਪਣਾ ਪੈਟਰਨ ਦਾਖਲ ਕਰਨਾ ਲੋੜੀਂਦਾ ਬਣਾਕੇ ਇਸਨੂੰ ਹੋਰ ਸੁਰੱਖਿਅਤ ਬਣਾ ਸਕਦੇ ਹੋ। ਜਦੋਂ ਤੱਕ ਡੀਵਾਈਸ ਚਾਲੂ ਨਹੀਂ ਹੁੰਦੀ, ਇਹ ਅਲਾਰਮਾਂ ਸਹਿਤ, ਕਾਲਾਂ, ਸੁਨੇਹੇ ਜਾਂ ਸੂਚਨਾਵਾਂ ਪ੍ਰਾਪਤ ਨਹੀਂ ਕਰ ਸਕਦੀ।\n\nਇਹ ਗੁਆਚੀਆਂ ਜਾਂ ਚੋਰੀ ਹੋਈਆਂ ਡੀਵਾਈਸਾਂ \'ਤੇ ਡੈਟਾ ਸੁਰੱਖਿਅਤ ਕਰਨ ਵਿੱਚ ਸਹਾਇਤਾ ਕਰਦਾ ਹੈ। ਤੁਹਾਡੀ ਡੀਵਾਈਸ ਨੂੰ ਸ਼ੁਰੂ ਕਰਨ ਲਈ ਪੈਟਰਨ ਦਾਖਲ ਕਰਨਾ ਲੋੜੀਂਦਾ ਬਣਾਈਏ?"</string>
-    <string name="encryption_interstitial_message_password" msgid="7796567133897436443">"ਤੁਸੀਂ ਇਸ ਡੀਵਾਈਸ ਦੇ ਸ਼ੁਰੂ ਹੋਣ ਤੋਂ ਪਹਿਲਾਂ ਆਪਣਾ ਪਾਸਵਰਡ ਦਾਖਲ ਕਰਨਾ ਲੋੜੀਂਦਾ ਬਣਾਕੇ ਇਸਨੂੰ ਹੋਰ ਸੁਰੱਖਿਅਤ ਬਣਾ ਸਕਦੇ ਹੋ। ਜਦੋਂ ਤੱਕ ਡੀਵਾਈਸ ਚਾਲੂ ਨਹੀਂ ਹੁੰਦੀ, ਇਹ ਅਲਾਰਮਾਂ ਸਹਿਤ, ਕਾਲਾਂ, ਸੁਨੇਹੇ ਜਾਂ ਸੂਚਨਾਵਾਂ ਪ੍ਰਾਪਤ ਨਹੀਂ ਕਰ ਸਕਦੀ। \n\nਇਹ ਗੁਆਚੀਆਂ ਜਾਂ ਚੋਰੀ ਹੋਈਆਂ ਡੀਵਾਈਸਾਂ \'ਤੇ ਡੈਟਾ ਸੁਰੱਖਿਅਤ ਕਰਨ ਵਿੱਚ ਸਹਾਇਤਾ ਕਰਦਾ ਹੈ। ਤੁਹਾਡੀ ਡੀਵਾਈਸ ਨੂੰ ਚਾਲੂ ਕਰਨ ਲਈ ਪਾਸਵਰਡ ਲੋੜੀਂਦਾ ਬਣਾਈਏ?"</string>
-    <string name="encryption_interstitial_message_pin_for_fingerprint" msgid="4550632760119547492">"ਆਪਣੀ ਡੀਵਾਈਸ ਨੂੰ ਅਨਲੌਕ ਕਰਨ ਲਈ ਆਪਣੇ ਫਿੰਗਰਪ੍ਰਿੰਟ ਦੀ ਵਰਤੋਂ ਕਰਨ ਤੋਂ ਇਲਾਵਾ, ਤੁਸੀਂ ਇਸ ਡੀਵਾਈਸ ਦੇ ਚਾਲੂ ਹੋਣ ਤੋਂ ਪਹਿਲਾਂ ਆਪਣਾ PIN ਦਾਖਲ ਕਰਨਾ ਲੋੜੀਂਦਾ ਬਣਾਕੇ ਇਸਨੂੰ ਹੋਰ ਸੁਰੱਖਿਅਤ ਬਣਾ ਸਕਦੇ ਹੋ। ਜਦੋਂ ਤੱਕ ਡੀਵਾਈਸ ਚਾਲੂ ਨਹੀਂ ਹੁੰਦੀ, ਇਹ ਅਲਾਰਮਾਂ ਸਹਿਤ, ਕਾਲਾਂ, ਸੁਨੇਹੇ ਜਾਂ ਸੂਚਨਾਵਾਂ ਪ੍ਰਾਪਤ ਨਹੀਂ ਕਰ ਸਕਦੀ।\n\nਇਹ ਗੁਆਚੀਆਂ ਜਾਂ ਚੋਰੀ ਹੋਈਆਂ ਡੀਵਾਈਸਾਂ \'ਤੇ ਡੈਟਾ ਸੁਰੱਖਿਅਤ ਕਰਨ ਵਿੱਚ ਸਹਾਇਤਾ ਕਰਦਾ ਹੈ। ਤੁਹਾਡੀ ਡੀਵਾਈਸ ਨੂੰ ਚਾਲੂ ਕਰਨ ਸਮੇਂ PIN ਦਾਖਲ ਕਰਨਾ ਲੋੜੀਂਦਾ ਬਣਾਈਏ?"</string>
-    <string name="encryption_interstitial_message_pattern_for_fingerprint" msgid="932184823193006087">"ਆਪਣੀ ਡੀਵਾਈਸ ਨੂੰ ਅਨਲੌਕ ਕਰਨ ਲਈ ਆਪਣੇ ਫਿੰਗਰਪ੍ਰਿੰਟ ਦੀ ਵਰਤੋਂ ਕਰਨ ਦੇ ਨਾਲ-ਨਾਲ, ਤੁਸੀਂ ਇਸ ਡੀਵਾਈਸ ਦੇ ਚਾਲੂ ਹੋਣ ਤੋਂ ਪਹਿਲਾਂ ਆਪਣਾ ਪੈਟਰਨ ਦਾਖਲ ਕਰਨਾ ਲੋੜੀਂਦਾ ਬਣਾਕੇ ਇਸਨੂੰ ਹੋਰ ਸੁਰੱਖਿਅਤ ਬਣਾ ਸਕਦੇ ਹੋ। ਜਦੋਂ ਤੱਕ ਡੀਵਾਈਸ ਚਾਲੂ ਨਹੀਂ ਹੁੰਦੀ, ਇਹ ਅਲਾਰਮਾਂ ਸਹਿਤ, ਕਾਲਾਂ, ਸੁਨੇਹੇ ਜਾਂ ਸੂਚਨਾਵਾਂ ਪ੍ਰਾਪਤ ਨਹੀਂ ਕਰ ਸਕਦੀ।\n\nਇਹ ਗੁਆਚੀਆਂ ਜਾਂ ਚੋਰੀ ਹੋਈਆਂ ਡੀਵਾਈਸਾਂ \'ਤੇ ਡੈਟਾ ਸੁਰੱਖਿਅਤ ਕਰਨ ਵਿੱਚ ਸਹਾਇਤਾ ਕਰਦਾ ਹੈ। ਤੁਹਾਡੀ ਡੀਵਾਈਸ ਨੂੰ ਚਾਲੂ ਕਰਨ ਲਈ ਪੈਟਰਨ ਦਾਖਲ ਕਰਨਾ ਲੋੜੀਂਦਾ ਬਣਾਈਏ?"</string>
-    <string name="encryption_interstitial_message_password_for_fingerprint" msgid="5560954719370251702">"ਆਪਣੀ ਡੀਵਾਈਸ ਨੂੰ ਅਨਲੌਕ ਕਰਨ ਲਈ ਆਪਣੇ ਫਿੰਗਰਪ੍ਰਿੰਟ ਦੀ ਵਰਤੋਂ ਕਰਨ ਤੋਂ ਇਲਾਵਾ, ਤੁਸੀਂ ਇਸ ਡੀਵਾਈਸ ਦੇ ਚਾਲੂ ਹੋਣ ਤੋਂ ਪਹਿਲਾਂ ਆਪਣਾ ਪਾਸਵਰਡ ਦਾਖਲ ਕਰਨਾ ਲੋੜੀਂਦਾ ਬਣਾਕੇ ਇਸਨੂੰ ਹੋਰ ਸੁਰੱਖਿਅਤ ਬਣਾ ਸਕਦੇ ਹੋ। ਜਦੋਂ ਤੱਕ ਡੀਵਾਈਸ ਚਾਲੂ ਨਹੀਂ ਹੁੰਦੀ, ਇਹ ਅਲਾਰਮਾਂ ਸਹਿਤ, ਕਾਲਾਂ, ਸੁਨੇਹੇ ਜਾਂ ਸੂਚਨਾਵਾਂ ਪ੍ਰਾਪਤ ਨਹੀਂ ਕਰ ਸਕਦੀ।\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">"ਕੀ PIN ਲੁੜੀਂਦਾ ਹੈ?"</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">"ਜਦੋਂ ਤੁਸੀਂ ਇਸ ਡੀਵਾਈਸ ਨੂੰ ਚਾਲੂ ਕਰਨ ਲਈ ਆਪਣਾ PIN ਦਰਜ ਕਰਦੇ ਹੋ, ਤਾਂ ਪਹੁੰਚਯੋਗਤਾ ਸੇਵਾਵਾਂ ਜਿਵੇਂ <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="encrypt_talkback_dialog_message_password" msgid="4155875981789127796">"ਜਦੋਂ ਤੁਸੀਂ ਇਸ ਡੀਵਾਈਸ ਨੂੰ ਚਾਲੂ ਕਰਨ ਲਈ ਆਪਣਾ ਪਾਸਵਰਡ ਦਾਖਲ ਕਰਦੇ ਹੋ, ਤਾਂ ਪਹੁੰਚਯੋਗਤਾ ਸੇਵਾਵਾਂ ਜਿਵੇਂ <xliff:g id="SERVICE">%1$s</xliff:g> ਅਜੇ ਉਪਲਬਧ ਨਹੀਂ ਹੋਣਗੀਆਂ।"</string>
+    <string name="direct_boot_unaware_dialog_message" msgid="7870273558547549125">"ਨੋਟ ਕਰੋ: ਰੀਬੂਟ ਤੋਂ ਬਾਅਦ, ਜਦੋਂ ਤੱਕ ਤੁਸੀਂ ਆਪਣਾ ਫ਼ੋਨ ਅਣਲਾਕ ਨਹੀਂ ਕਰਦੇ ਤਦ ਤੱਕ ਇਹ ਐਪ ਚਾਲੂ ਨਹੀਂ ਹੋ ਸਕਦੀ"</string>
     <string name="imei_information_title" msgid="8499085421609752290">"IMEI ਜਾਣਕਾਰੀ"</string>
     <string name="imei_information_summary" msgid="2074095606556565233">"IMEI ਸੰਬੰਧਿਤ ਜਾਣਕਾਰੀ"</string>
     <string name="slot_number" msgid="3762676044904653577">"(ਸਲੌਟ<xliff:g id="SLOT_NUM">%1$d</xliff:g>)"</string>
@@ -3077,7 +3103,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>
@@ -3087,9 +3113,9 @@
     <string name="notifications_disabled" msgid="334416731283131597">"ਸਭ ਕੁਝ ਬੰਦ ਕੀਤਾ ਹੋਇਆ ਹੈ"</string>
     <string name="notifications_partly_blocked" msgid="592071133950126656">"<xliff:g id="COUNT_1">%2$d</xliff:g> ਵਿੱਚੋਂ <xliff:g id="COUNT_0">%1$d</xliff:g> ਸ਼੍ਰੇਣੀਆਂ ਬੰਦ ਹਨ"</string>
     <string name="notifications_silenced" msgid="4728603513072110381">"ਚੁੱਪ ਕਰਵਾਈਆਂ ਗਈਆਂ"</string>
-    <string name="notifications_redacted" msgid="4493588975742803160">"ਲੌਕ ਸਕ੍ਰੀਨ \'ਤੇ ਸੰਵੇਦਨਸ਼ੀਲ ਸਮੱਗਰੀ ਨਹੀਂ"</string>
-    <string name="notifications_hidden" msgid="3619610536038757468">"ਲੌਕ ਸਕ੍ਰੀਨ \'ਤੇ ਨਹੀਂ"</string>
-    <string name="notifications_priority" msgid="1066342037602085552">"ਮੈਨੂੰ ਪਰੇਸ਼ਾਨ ਨਾ ਕਰੋ ਨੂੰ ਓਵਰਰਾਈਡ ਕੀਤਾ ਗਿਆ"</string>
+    <string name="notifications_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>
@@ -3117,14 +3143,14 @@
     <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="filter_notif_dnd_channels" msgid="1817930848881696728">"ਸ਼੍ਰੇਣੀਆਂ: \'ਪਰੇਸ਼ਾਨ ਨਾ ਕਰੋ\' ਨੂੰ ਓਵਰਰਾਈਡ ਕਰਦੀਆਂ ਹਨ"</string>
+    <string name="advanced_apps" msgid="4812975097124803873">"ਵਿਕਸਿਤ"</string>
+    <string name="configure_apps" msgid="6685680790825882528">"ਐਪਾਂ ਦੀ ਰੂਪ-ਰੇਖਾ ਬਦਲੋ"</string>
     <string name="unknown_app" msgid="5275921288718717656">"ਅਗਿਆਤ ਐਪ"</string>
     <string name="app_permissions" msgid="4148222031991883874">"ਐਪ ਇਜਾਜ਼ਤਾਂ"</string>
     <string name="app_permissions_summary" msgid="5163974162150406324">"<xliff:g id="APPS">%1$s</xliff:g> ਦੀ ਵਰਤੋਂ ਕਰ ਰਹੀਆਂ ਐਪਾਂ"</string>
-    <string name="tap_to_wake" msgid="7211944147196888807">"ਜਗਾਉਣ ਲਈ ਟੈਪ ਕਰੋ"</string>
-    <string name="tap_to_wake_summary" msgid="4341387904987585616">"ਡੀਵਾਈਸ ਨੂੰ ਜਗਾਉਣ ਲਈ ਸਕ੍ਰੀਨ \'ਤੇ ਕਿੱਥੇ ਵੀ ਦੋਹਰਾ ਟੈਪ ਕਰੋ"</string>
+    <string name="tap_to_wake" 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>
@@ -3140,24 +3166,24 @@
     <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="default_assist_title" msgid="8868488975409247921">"ਸਹਾਇਤਾ ਐਪ"</string>
+    <string name="assist_and_voice_input_title" msgid="1733165754793221197">"ਸਹਾਇਕ ਅਤੇ ਅਵਾਜ਼ੀ ਇਨਪੁੱਟ"</string>
+    <string name="default_assist_title" msgid="8868488975409247921">"ਸਹਾਇਕ ਐਪ"</string>
     <string name="assistant_security_warning_title" msgid="8673079231955467177">"ਕੀ <xliff:g id="ASSISTANT_APP_NAME">%s</xliff:g> ਨੂੰ ਆਪਣਾ ਸਹਾਇਕ ਬਣਾਉਣਾ ਹੈ?"</string>
     <string name="assistant_security_warning" msgid="8498726261327239136">"ਸਹਾਇਕ ਤੁਹਾਡੇ ਸਿਸਟਮ ਤੇ ਮੌਜੂਦ ਵਰਤੋਂ ਵਿੱਚ ਹੋਣ ਵਾਲੇ ਐਪਸ ਬਾਰੇ ਜਾਣਕਾਰੀ ਪੜ੍ਹਨ ਵਿੱਚ ਸਮਰੱਥ ਹੋਵੇਗਾ, ਤੁਹਾਡੀ ਸਕ੍ਰੀਨ ਤੇ ਦ੍ਰਿਸ਼ਮਾਨ ਜਾਂ ਐਪਸ ਵਿੱਚ ਪਹੁੰਚਯੋਗ ਜਾਣਕਾਰੀ ਸਮੇਤ।"</string>
     <string name="assistant_security_warning_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>
     <string name="system_app" msgid="9068313769550747372">"(ਸਿਸਟਮ)"</string>
     <string name="system_default_app" msgid="3091113402349739037">"(ਸਿਸਟਮ ਪੂਰਵ-ਨਿਰਧਾਰਤ)"</string>
-    <string name="apps_storage" msgid="4353308027210435513">"ਐਪਾਂ ਸਟੋਰੇਜ"</string>
+    <string name="apps_storage" msgid="4353308027210435513">"ਐਪਾਂ ਦੀ ਸਟੋਰੇਜ"</string>
     <string name="usage_access" msgid="5479504953931038165">"ਉਪਯੋਗ ਪਹੁੰਚ"</string>
-    <string name="permit_usage_access" msgid="4012876269445832300">"ਪਰਮਿਟ ਉਪਭੋਗਤਾ ਐਕਸੈਸ"</string>
+    <string name="permit_usage_access" msgid="4012876269445832300">"ਪਰਮਿਟ ਵਰਤੋਂਕਾਰ ਪਹੁੰਚ"</string>
     <string name="app_usage_preference" msgid="7065701732733134991">"ਐਪ ਉਪਯੋਗਤਾ ਪਸੰਦ"</string>
-    <string name="usage_access_description" msgid="1352111094596416795">"ਉਪਯੋਗਤਾ ਐਕਸੈਸ ਤੁਸੀਂ ਕਿਹੜੀਆਂ ਐਪਸ ਦਾ ਉਪਯੋਗ ਕਰ ਰਹੇ ਹੋ ਅਤੇ ਕਿੰਨੀ ਵਾਰੀ, ਇਸਦੇ ਨਾਲ-ਨਾਲ ਆਪਣੇ ਕੈਰੀਅਰ, ਭਾਸ਼ਾ ਸੈੱਟਿੰਗਜ਼, ਅਤੇ ਹੋਰ ਵੇਰਵੇ ਨੂੰ ਟ੍ਰੈਕ ਕਰਨ ਲਈ ਕਿਸੇ ਐਪ ਨੂੰ ਅਨੁਮਤੀ ਦਿੰਦਾ ਹੈ।"</string>
+    <string name="usage_access_description" msgid="1352111094596416795">"ਵਰਤੋਂ ਪਹੁੰਚ ਤੁਸੀਂ ਕਿਹੜੀਆਂ ਐਪਾਂ ਦੀ ਵਰਤੋਂ ਕਰ ਰਹੇ ਹੋ ਅਤੇ ਕਿੰਨੀ ਵਾਰੀ, ਇਸਦੇ ਨਾਲ-ਨਾਲ ਆਪਣੇ ਕੈਰੀਅਰ, ਭਾਸ਼ਾ ਸੈਟਿੰਗਾਂ, ਅਤੇ ਹੋਰ ਵੇਰਵੇ ਨੂੰ ਟਰੈਕ ਕਰਨ ਲਈ ਕਿਸੇ ਐਪ ਨੂੰ ਆਗਿਆ ਦਿੰਦਾ ਹੈ।"</string>
     <string name="memory_settings_title" msgid="7490541005204254222">"ਮੈਮਰੀ"</string>
     <string name="memory_details_title" msgid="8542565326053693320">"ਮੈਮਰੀ ਵੇਰਵੇ"</string>
     <string name="always_running" msgid="6042448320077429656">"ਹਮੇਸ਼ਾਂ ਚੱਲਦਾ ਹੈ (<xliff:g id="PERCENTAGE">%s</xliff:g>)"</string>
@@ -3197,37 +3223,38 @@
     <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_file_transfers" msgid="7409600791007250137">"ਫ਼ਾਈਲਾਂ ਦਾ ਤਬਾਦਲਾ ਕਰੋ"</string>
+    <string name="usb_use_power_only_desc" msgid="3461232831015575152">"ਕਨੈਕਟ ਕੀਤੇ ਡੀਵਾਈਸ ਨੂੰ ਚਾਰਜ ਕਰੋ। ਸਿਰਫ਼ USB ਚਾਰਜਿੰਗ ਦਾ ਸਮਰਥਨ ਕਰਨ ਵਾਲੇ ਡੀਵਾਈਸਾਂ \'ਤੇ ਕੰਮ ਕਰਦਾ ਹੈ।"</string>
+    <string name="usb_use_file_transfers" msgid="7409600791007250137">"ਫ਼ਾਈਲਾਂ ਟ੍ਰਾਂਸਫਰ ਕਰੋ"</string>
     <string name="usb_use_file_transfers_desc" msgid="4235764784331804488">"ਫ਼ਾਈਲਾਂ ਦਾ ਕਿਸੇ ਹੋਰ ਡੀਵਾਈਸ \'ਤੇ ਤਬਾਦਲਾ ਕਰੋ"</string>
-    <string name="usb_use_photo_transfers" msgid="7794775645350330454">"ਫ਼ੋਟੋਆਂ ਦਾ ਤਬਾਦਲਾ ਕਰੋ (PTP)"</string>
-    <string name="usb_use_photo_transfers_desc" msgid="2963034811151325996">"ਫ਼ੋਟੋਆਂ ਜਾਂ ਫ਼ਾਈਲਾਂ ਦਾ ਤਬਾਦਲਾ ਕਰੋ ਜੇਕਰ MTP ਸਮਰਥਿਤ ਨਹੀਂ ਹੈ (PTP)"</string>
+    <string name="usb_use_photo_transfers" msgid="7794775645350330454">"ਫ਼ੋਟੋਆਂ ਟ੍ਰਾਂਸਫਰ ਕਰੋ (PTP)"</string>
+    <string name="usb_use_photo_transfers_desc" msgid="2963034811151325996">"ਫ਼ੋਟੋਆਂ ਜਾਂ ਫ਼ਾਈਲਾਂ ਟ੍ਰਾਂਸਫਰ ਕਰੋ ਜੇਕਰ MTP ਸਮਰਥਿਤ ਨਹੀਂ ਹੈ (PTP)"</string>
     <string name="usb_use_MIDI" msgid="870922185938298263">"ਡੀਵਾਈਸ ਦੀ ਵਰਤੋਂ MIDI ਵਜੋਂ ਕਰੋ"</string>
     <string name="usb_use_MIDI_desc" msgid="8473936990076693175">"ਇਸ ਡੀਵਾਈਸ ਦੀ MIDI ਵਜੋਂ ਵਰਤੋਂ ਕਰੋ"</string>
-    <string name="usb_use" msgid="3256040963685055320">"ਇਹਨਾਂ ਲਈ USB ਦੀ ਵਰਤੋਂ ਕਰੋ"</string>
+    <string name="usb_use" msgid="3256040963685055320">"ਇਸ ਲਈ USB ਦੀ ਵਰਤੋਂ ਕਰੋ"</string>
     <string name="usb_pref" msgid="1400617804525116158">"USB"</string>
-    <string name="usb_summary_charging_only" msgid="7544327009143659751">"ਇਸ ਡੀਵਾਈਸ ਨੂੰ ਚਾਰਜ ਕਰ ਰਹੀ ਹੈ"</string>
+    <string name="usb_summary_charging_only" msgid="7544327009143659751">"ਇਸ ਡੀਵਾਈਸ ਨੂੰ ਚਾਰਜ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ"</string>
     <string name="usb_summary_power_only" msgid="3629517713817003738">"ਪਾਵਰ ਸਪਲਾਈ ਕਰਨ ਲਈ"</string>
     <string name="usb_summary_file_transfers" msgid="6435943692610175111">"ਫ਼ਾਈਲਾਂ ਦਾ ਤਬਾਦਲਾ ਕਰਨ ਲਈ"</string>
     <string name="usb_summary_photo_transfers" msgid="8440204169576585250">"ਫ਼ੋਟੋਆਂ ਦਾ ਤਬਾਦਲਾ ਕਰਨ ਲਈ (PTP)"</string>
     <string name="usb_summary_MIDI" msgid="5687906612187885908">"ਡੀਵਾਈਸ ਨੂੰ MIDI ਵਜੋਂ ਵਰਤਣਾ"</string>
+    <string name="sms_mirroring_pref" msgid="6475043279147376031">"SMS ਪ੍ਰਤਿਬਿੰਬੀਕਰਨ"</string>
     <string name="background_check_pref" msgid="7550258400138010979">"ਬੈਕਗ੍ਰਾਊਂਡ ਜਾਂਚ"</string>
     <string name="background_check_title" msgid="4534254315824525593">"ਪੂਰੀ ਬੈਕਗ੍ਰਾਊਂਡ ਪਹੁੰਚ"</string>
     <string name="assist_access_context_title" msgid="2269032346698890257">"ਸਕ੍ਰੀਨ ਤੋਂ ਲਿਖਤ ਵਰਤੋ"</string>
     <string name="assist_access_context_summary" msgid="1991421283142279560">"ਸਹਾਇਕ ਐਪ ਨੂੰ ਲਿਖਤ ਵਜੋਂ ਸਕ੍ਰੀਨ ਸਮੱਗਰੀ ਤੱਕ ਪਹੁੰਚ ਦੀ ਆਗਿਆ ਦਿਓ"</string>
-    <string name="assist_access_screenshot_title" msgid="4034721336291215819">"ਸਕ੍ਰੀਨਸ਼ੌਟ ਵਰਤੋ"</string>
+    <string name="assist_access_screenshot_title" msgid="4034721336291215819">"ਸਕ੍ਰੀਨਸ਼ਾਟ ਵਰਤੋ"</string>
     <string name="assist_access_screenshot_summary" msgid="6761636689013259901">"ਸਹਾਇਕ ਐਪ ਨੂੰ ਸਕ੍ਰੀਨ ਦੇ ਇੱਕ ਚਿੱਤਰ ਤੱਕ ਪਹੁੰਚ ਦੀ ਆਗਿਆ ਦਿਓ"</string>
     <string name="assist_flash_title" msgid="506661221230034891">"ਸਕ੍ਰੀਨ ਨੂੰ ਫਲੈਸ਼ ਕਰੋ"</string>
-    <string name="assist_flash_summary" msgid="9160668468824099262">"ਸਹਾਇਤਾ ਐਪ ਵੱਲੋਂ ਸਕ੍ਰੀਨ ਜਾਂ ਸਕ੍ਰੀਨਸ਼ਾਟ ਤੋਂ ਲਿਖਤ \'ਤੇ ਪਹੁੰਚ ਕਰਨ \'ਤੇ ਸਕ੍ਰੀਨ ਦੇ ਕਿਨਾਰਿਆਂ ਨੂੰ ਫਲੈਸ਼ ਕਰੋ"</string>
-    <string name="assist_footer" msgid="1982791172085896864">"ਸਹਾਇਕ ਐਪ ਤੁਹਾਡੇ ਵੱਲੋਂ ਦੇਖੀ ਜਾ ਰਹੀ ਸਕ੍ਰੀਨ ਤੋਂ ਪ੍ਰਾਪਤ ਜਾਣਕਾਰੀ ਦੇ ਆਧਾਰ ਤੇ ਤੁਹਾਡੀ ਸਹਾਇਤਾ ਕਰ ਸਕਦਾ ਹੈ। ਕੁਝ ਐਪਸ ਤੁਹਾਨੂੰ ਏਕੀਕ੍ਰਿਤ ਸਹਾਇਤਾ ਦੇਣ ਲਈ ਲੌਂਚਰ ਅਤੇ ਵੌਇਸ ਇਨਪੁਟ ਸੇਵਾਵਾਂ ਦੋਵਾਂ ਦਾ ਸਮਰਥਨ ਕਰਦੇ ਹਨ।"</string>
+    <string name="assist_flash_summary" msgid="9160668468824099262">"ਸਹਾਇਕ ਐਪ ਵੱਲੋਂ ਸਕ੍ਰੀਨ ਜਾਂ ਸਕ੍ਰੀਨਸ਼ਾਟ ਤੋਂ ਲਿਖਤ \'ਤੇ ਪਹੁੰਚ ਕਰਨ \'ਤੇ ਸਕ੍ਰੀਨ ਦੇ ਕਿਨਾਰਿਆਂ ਨੂੰ ਫਲੈਸ਼ ਕਰੋ"</string>
+    <string name="assist_footer" msgid="1982791172085896864">"ਸਹਾਇਕ ਐਪਾਂ ਤੁਹਾਡੇ ਵੱਲੋਂ ਦੇਖੀ ਜਾ ਰਹੀ ਸਕ੍ਰੀਨ ਤੋਂ ਪ੍ਰਾਪਤ ਜਾਣਕਾਰੀ ਦੇ ਆਧਾਰ ਤੇ ਤੁਹਾਡੀ ਮਦਦ ਕਰ ਸਕਦੀਆਂ ਹਨ। ਕੁਝ ਐਪਾਂ ਤੁਹਾਨੂੰ ਏਕੀਕ੍ਰਿਤ ਸਹਾਇਤਾ ਦੇਣ ਲਈ ਲਾਂਚਰ ਅਤੇ ਵੌਇਸ ਇਨਪੁੱਟ ਸੇਵਾਵਾਂ ਦੋਵਾਂ ਦਾ ਸਮਰਥਨ ਕਰਦੇ ਹਨ।"</string>
     <string name="average_memory_use" msgid="829566450150198512">"ਔਸਤ ਮੈਮਰੀ ਵਰਤੋਂ"</string>
     <string name="maximum_memory_use" msgid="7493720799710132496">"ਅਧਿਕਤਮ ਮੈਮਰੀ ਵਰਤੋਂ"</string>
     <string name="memory_usage" msgid="1781358557214390033">"ਮੈਮਰੀ ਉਪਯੋਗਤਾ"</string>
@@ -3248,19 +3275,19 @@
     </plurals>
     <string name="running_frequency" msgid="6622624669948277693">"ਬਾਰੰਬਾਰਤਾ"</string>
     <string name="memory_maximum_usage" msgid="6513785462055278341">"ਅਧਿਕਤਮ ਵਰਤੋਂ"</string>
-    <string name="no_data_usage" msgid="9131454024293628063">"ਕੋਈ ਡੈਟਾ ਨਹੀਂ ਵਰਤਿਆ"</string>
+    <string name="no_data_usage" msgid="9131454024293628063">"ਕੋਈ  ਡਾਟਾ  ਨਹੀਂ ਵਰਤਿਆ"</string>
     <string name="zen_access_warning_dialog_title" msgid="1198189958031157142">"ਕੀ <xliff:g id="APP">%1$s</xliff:g> ਨੂੰ ਪਰੇਸ਼ਾਨ ਨਾ ਕਰੋ ਤੱਕ ਪਹੁੰਚ ਦੀ ਆਗਿਆ ਦੇਣੀ ਹੈ?"</string>
     <string name="zen_access_warning_dialog_summary" msgid="4015885767653010873">"ਐਪ ਪਰੇਸ਼ਾਨ ਨਾ ਕਰੋ ਨੂੰ ਚਾਲੂ/ਬੰਦ ਕਰਨ ਅਤੇ ਸੰਬੰਧਿਤ ਸੈਟਿੰਗਾਂ ਵਿੱਚ ਬਦਲਾਵ ਕਰਨ ਵਿੱਚ ਸਮਰੱਥ ਹੋਵੇਗਾ।"</string>
     <string name="zen_access_disabled_package_warning" msgid="302820100078584431">"ਸੂਚਨਾ ਪਹੁੰਚ ਦੇ ਚਾਲੂ ਹੋਣ ਕਾਰਨ ਇਸ ਦਾ ਚਾਲੂ ਰਹਿਣਾ ਲਾਜ਼ਮੀ ਹੈ"</string>
-    <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>
     <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>
@@ -3268,7 +3295,7 @@
     <string name="system_alert_window_access_title" msgid="6297115362542361241">"ਦੂਜੀਆਂ ਐਪਾਂ ਦੇ ਉੱਪਰ ਪ੍ਰਦਰਸ਼ਿਤ ਕਰੋ"</string>
     <string name="permit_draw_overlay" msgid="7456536798718633432">"ਦੂਜੀਆਂ ਐਪਾਂ ਉੱਪਰ ਪ੍ਰਦਰਸ਼ਿਤ ਹੋਣ ਨੂੰ ਇਜਾਜ਼ਤ ਦਿਓ"</string>
     <string name="app_overlay_permission_preference" msgid="9039432222453006038">"ਉੱਪਰ ਐਪ ਡਿਸਪਲੇ ਲਈ ਇਜਾਜ਼ਤ"</string>
-    <string name="allow_overlay_description" msgid="8961670023925421358">"ਇਸ ਐਪ ਨੂੰ ਤੁਹਾਡੇ ਵੱਲੋਂ ਵਰਤੀਆਂ ਜਾ ਰਹੀਆਂ ਹੋਰ ਐਪਾਂ \'ਤੇ ਦਿਖਾਈ ਦੇਣ ਦਿਓ। ਇਹ ਤੁਹਾਡੇ ਦੁਆਰਾ ਉਹਨਾਂ ਐਪਾਂ ਦੀ ਵਰਤੋਂ ਵਿੱਚ ਦਖ਼ਲ ਦੇ ਸਕਦੀ ਹੈ ਜਾਂ ਉਹਨਾਂ ਦੇ ਦਿਖਾਈ ਦੇਣ ਜਾਂ ਕੰਮ ਕਰਨ ਦੇ ਤਰੀਕੇ ਨੂੰ ਬਦਲ ਸਕਦੀ ਹੈ।"</string>
+    <string name="allow_overlay_description" msgid="8961670023925421358">"ਇਸ ਐਪ ਨੂੰ ਤੁਹਾਡੇ ਵੱਲੋਂ ਵਰਤੀਆਂ ਜਾ ਰਹੀਆਂ ਹੋਰ ਐਪਾਂ \'ਤੇ ਪ੍ਰਦਰਸ਼ਿਤ ਕਰਨ ਦਿਓ। ਇਹ ਤੁਹਾਡੇ ਦੁਆਰਾ ਉਹਨਾਂ ਐਪਾਂ ਦੀ ਵਰਤੋਂ ਵਿੱਚ ਦਖ਼ਲ ਦੇ ਸਕਦੀ ਹੈ ਜਾਂ ਉਹਨਾਂ ਦੇ ਦਿਖਾਈ ਦੇਣ ਜਾਂ ਕੰਮ ਕਰਨ ਦੇ ਤਰੀਕੇ ਨੂੰ ਬਦਲ ਸਕਦੀ ਹੈ।"</string>
     <string name="keywords_vr_listener" msgid="7441221822576384680">"VR ਆਭਾਸੀ ਵਾਸਤਵਿਕਤਾ ਸਰੋਤਾ ਸਟੀਰੀਓ ਸਹਾਇਕ ਸੇਵਾ"</string>
     <string name="keywords_system_alert_window" msgid="5049498015597864850">"ਸਿਸਟਮ ਚਿਤਾਵਨੀ ਵਿੰਡੋ ਡਾਇਲੌਗ ਦੂਜੀਆਂ ਐਪਾਂ ਦੇ ਉੱਪਰ ਪ੍ਰਦਰਸ਼ਿਤ ਕਰੋ"</string>
     <string name="overlay_settings" msgid="6930854109449524280">"ਦੂਜੀਆਂ ਐਪਾਂ ਦੇ ਉੱਪਰ ਪ੍ਰਦਰਸ਼ਿਤ ਕਰੋ"</string>
@@ -3276,29 +3303,29 @@
     <string name="filter_overlay_apps" msgid="6965969283342557573">"ਅਨੁਮਤੀ ਵਾਲੀਆਂ ਐਪਸ"</string>
     <string name="app_permission_summary_allowed" msgid="1505409933012886711">"ਇਜਾਜ਼ਤ ਹੈ"</string>
     <string name="app_permission_summary_not_allowed" msgid="2592617058101882802">"ਇਜਾਜ਼ਤ ਨਹੀਂ"</string>
-    <string name="keywords_install_other_apps" msgid="761078076051006558">"ਅਗਿਆਤ ਸਰੋਤ ਐਪਾਂ ਸਥਾਪਿਤ ਕਰੋ"</string>
+    <string name="keywords_install_other_apps" msgid="761078076051006558">"ਅਗਿਆਤ ਸਰੋਤ ਐਪਾਂ ਸਥਾਪਤ ਕਰੋ"</string>
     <string name="write_settings" msgid="4797457275727195681">"ਸਿਸਟਮ ਸੈਟਿੰਗਾਂ ਸੰਸ਼ੋਧਿਤ ਕਰੋ"</string>
-    <string name="keywords_write_settings" msgid="6415597272561105138">"ਸੰਸ਼ੋਧਿਤ ਸਿਸਟਮ ਸੈਟਿੰਗਸ ਲਿਖੋ"</string>
+    <string name="keywords_write_settings" msgid="6415597272561105138">"ਸੰਸ਼ੋਧਿਤ ਸਿਸਟਮ ਸੈਟਿੰਗਾਂ ਲਿਖੋ"</string>
     <string name="write_settings_summary" msgid="4302268998611412696">"<xliff:g id="COUNT_1">%2$d</xliff:g> ਵਿੱਚੋਂ <xliff:g id="COUNT_0">%1$d</xliff:g> ਐਪ ਨੂੰ ਸਿਸਟਮ ਸੈਟਿੰਗਾਂ ਸੰਸ਼ੋਧਿਤ ਕਰਨ ਦੀ ਆਗਿਆ ਦਿੱਤੀ"</string>
     <string name="filter_install_sources_apps" msgid="3102976274848199118">"ਹੋਰ ਐਪਾਂ ਸਥਾਪਤ ਕਰ ਸਕਦੀਆਂ ਹਨ"</string>
     <string name="filter_write_settings_apps" msgid="2914615026197322551">"ਸਿਸਟਮ ਸੈਟਿੰਗਾਂ ਸੰਸ਼ੋਧਿਤ ਕਰ ਸਕਦਾ ਹੈ"</string>
     <string name="write_settings_title" msgid="4232152481902542284">"ਸਿਸਟਮ ਸੈਟਿੰਗਾਂ ਸੰਸ਼ੋਧਿਤ ਕਰ ਸਕਦਾ ਹੈ"</string>
     <string name="write_system_settings" msgid="3482913590601096763">"ਸਿਸਟਮ ਸੈਟਿੰਗਾਂ ਸੰਸ਼ੋਧਿਤ ਕਰੋ"</string>
-    <string name="write_settings_preference" msgid="3407383041273067448">"ਐਪ ਨੂੰ ਸਿਸਟਮ ਸੈਟਿੰਗਾਂ ਸੰਸ਼ੋਧਿਤ ਕਰਨ ਦੀ ਅਨੁਮਤੀ"</string>
-    <string name="permit_write_settings" msgid="6393779336656870080">"ਸਿਸਟਮ ਸੈਟਿੰਗਾਂ ਸੰਸ਼ੋਧਿਤ ਕਰਨ ਦੀ ਆਗਿਆ ਦਿਓ"</string>
-    <string name="write_settings_description" msgid="6868293938839954623">"ਇਹ ਅਨੁਮਤੀ ਇੱਕ ਐਪ ਨੂੰ ਸਿਸਟਮ ਸੈਟਿੰਗਾਂ ਸੰਸ਼ੋਧਿਤ ਕਰਨ ਲਈ ਆਗਿਆ ਦਿੰਦੀ ਹੈ।"</string>
+    <string name="write_settings_preference" msgid="3407383041273067448">"ਐਪ ਨੂੰ ਸਿਸਟਮ ਸੈਟਿੰਗਾਂ ਸੰਸ਼ੋਧਿਤ ਕਰਨ ਦੀ ਇਜਾਜ਼ਤ"</string>
+    <string name="permit_write_settings" msgid="658555006453212691">"ਸਿਸਟਮ ਸੈਟਿੰਗਾਂ ਸੋਧਣ ਦਿਓ"</string>
+    <string name="write_settings_description" msgid="6868293938839954623">"ਇਹ ਇਜਾਜ਼ਤ ਇੱਕ ਐਪ ਨੂੰ ਸਿਸਟਮ ਸੈਟਿੰਗਾਂ ਸੰਸ਼ੋਧਿਤ ਕਰਨ ਲਈ ਆਗਿਆ ਦਿੰਦੀ ਹੈ।"</string>
     <string name="write_settings_on" msgid="8230580416068832239">"ਹਾਂ"</string>
     <string name="write_settings_off" msgid="5156104383386336233">"ਨਹੀਂ"</string>
     <string name="external_source_switch_title" msgid="3621381992793251070">"ਇਸ ਸਰੋਤ ਤੋਂ ਇਜਾਜ਼ਤ ਦਿਓ"</string>
     <string name="camera_gesture_title" msgid="1075838577642393011">"ਕੈਮਰੇ ਲਈ ਦੋ ਵਾਰ ਮੋੜੋ"</string>
     <string name="camera_gesture_desc" msgid="1831390075255870960">"ਆਪਣੇ ਗੁੱਟ ਨੂੰ ਦੋ ਵਾਰ ਮੋੜਕੇ ਕੈਮਰਾ ਐਪ ਖੋਲ੍ਹੋ"</string>
     <string name="camera_double_tap_power_gesture_title" msgid="1651873760405034645">"ਕੈਮਰੇ ਲਈ ਪਾਵਰ ਬਟਨ ਨੂੰ ਦੋ ਵਾਰੀ ਦਬਾਓ"</string>
-    <string name="camera_double_tap_power_gesture_desc" msgid="7355664631775680376">"ਆਪਣੀ ਸਕ੍ਰੀਨ ਨੂੰ ਅਨਲੌਕ ਕੀਤੇ ਬਗੈਰ ਤੁਰੰਤ ਕੈਮਰਾ ਖੋਲ੍ਹੋ"</string>
+    <string name="camera_double_tap_power_gesture_desc" msgid="7355664631775680376">"ਆਪਣੀ ਸਕ੍ਰੀਨ ਨੂੰ ਅਣਲਾਕ ਕੀਤੇ ਬਗੈਰ ਤੁਰੰਤ ਕੈਮਰਾ ਖੋਲ੍ਹੋ"</string>
     <string name="screen_zoom_title" msgid="5233515303733473927">"ਡਿਸਪਲੇ ਆਕਾਰ"</string>
     <string name="screen_zoom_short_summary" msgid="7291960817349834688">"ਸਕ੍ਰੀਨ \'ਤੇ ਪਈਆਂ ਆਈਟਮਾਂ ਨੂੰ ਵੱਡਾ ਜਾਂ ਛੋਟਾ ਕਰੋ"</string>
-    <string name="screen_zoom_keywords" msgid="9176477565403352552">"ਡਿਸਪਲੇ ਘਣਤਾ, ਸਕਰੀਨ ਜ਼ੂਮ, ਪੈਮਾਨਾ, ਸਕੇਲਿੰਗ"</string>
+    <string name="screen_zoom_keywords" msgid="9176477565403352552">"ਡਿਸਪਲੇ ਘਣਤਾ, ਸਕ੍ਰੀਨ ਜ਼ੂਮ, ਪੈਮਾਨਾ, ਸਕੇਲਿੰਗ"</string>
     <string name="screen_zoom_summary" msgid="6445488991799015407">"ਆਪਣੀ ਸਕ੍ਰੀਨ \'ਤੇ ਪਈਆਂ ਆਈਟਮਾਂ ਨੂੰ ਵੱਡਾ ਜਾਂ ਛੋਟਾ ਕਰੋ। ਤੁਹਾਡੀ ਸਕ੍ਰੀਨ \'ਤੇ ਪਈਆਂ ਕੁਝ ਐਪਾਂ ਦੀ ਸਥਿਤੀ ਬਦਲ ਸਕਦੀ ਹੈ।"</string>
-    <string name="screen_zoom_preview_title" msgid="4680671508172336572">"ਝਲਕ"</string>
+    <string name="screen_zoom_preview_title" msgid="4680671508172336572">"ਪੂਰਵ-ਝਲਕ"</string>
     <string name="screen_zoom_make_smaller_desc" msgid="4622359904253364742">"ਛੋਟਾ ਕਰੋ"</string>
     <string name="screen_zoom_make_larger_desc" msgid="2236171043607896594">"ਵੱਡਾ ਕਰੋ"</string>
     <string name="screen_zoom_conversation_icon_alex" msgid="8443032489384985820">"A"</string>
@@ -3312,7 +3339,7 @@
     <string name="screen_zoom_conversation_timestamp_3" msgid="3785674344762707688">"ਮੰਗਲ 6:02PM"</string>
     <string name="screen_zoom_conversation_timestamp_4" msgid="2511469395448561259">"ਮੰਗਲ 6:03PM"</string>
     <string name="disconnected" msgid="4836600637485526329">"ਕਨੈਕਟ ਨਹੀਂ ਹੈ"</string>
-    <string name="data_usage_summary_format" msgid="7507047900192160585">"<xliff:g id="AMOUNT">%1$s</xliff:g> ਡੈਟਾ ਵਰਤਿਆ ਗਿਆ"</string>
+    <string name="data_usage_summary_format" msgid="7507047900192160585">"<xliff:g id="AMOUNT">%1$s</xliff:g> ਡਾਟਾ ਵਰਤਿਆ ਗਿਆ"</string>
     <plurals name="notification_summary" formatted="false" msgid="3941492005316143599">
       <item quantity="one"><xliff:g id="COUNT">%d</xliff:g> ਐਪ ਲਈ ਬੰਦ</item>
       <item quantity="other"><xliff:g id="COUNT">%d</xliff:g> ਐਪਾਂ ਲਈ ਬੰਦ</item>
@@ -3331,36 +3358,36 @@
     <string name="payment_summary" msgid="3472482669588561110">"<xliff:g id="APP_NAME">%1$s</xliff:g> ਪੂਰਵ-ਨਿਰਧਾਰਤ ਹੈ"</string>
     <string name="location_on_summary" msgid="5127631544018313587">"ਚਾਲੂ / <xliff:g id="LOCATION_MODE">%1$s</xliff:g>"</string>
     <string name="location_off_summary" msgid="6474350053215707957">"ਬੰਦ"</string>
-    <string name="backup_disabled" msgid="485189128759595412">"ਬੈਕ ਅੱਪ ਅਯੋਗ ਬਣਾਇਆ ਗਿਆ"</string>
+    <string name="backup_disabled" msgid="485189128759595412">"ਬੈਕ ਅੱਪ ਬੰਦ ਕੀਤਾ ਗਿਆ"</string>
     <string name="about_summary" msgid="924181828102801010">"ਅੱਪਡੇਟ ਕਰਕੇ Android <xliff:g id="VERSION">%1$s</xliff:g> ਕੀਤਾ ਗਿਆ"</string>
-    <string name="disabled_by_policy_title" msgid="627023216027648534">"ਕਾਰਵਾਈ ਦੀ ਇਜਾਜ਼ਤ ਨਹੀਂ"</string>
+    <string name="disabled_by_policy_title" msgid="627023216027648534">"ਕਾਰਵਾਈ ਦੀ ਆਗਿਆ ਨਹੀਂ"</string>
     <string name="disabled_by_policy_title_adjust_volume" msgid="7399450998356045023">"ਤੁਸੀਂ ਵੌਲਿਊਮ ਨੂੰ ਬਦਲ ਨਹੀਂ ਸਕਦੇ"</string>
     <string name="disabled_by_policy_title_outgoing_calls" msgid="7919816644946067058">"ਕਾਲ ਕਰਨ ਦੀ ਇਜਾਜ਼ਤ ਨਹੀਂ ਹੈ"</string>
-    <string name="disabled_by_policy_title_sms" msgid="5733307423899610340">"SMS ਦੀ ਇਜਾਜ਼ਤ ਨਹੀਂ ਹੈ"</string>
+    <string name="disabled_by_policy_title_sms" msgid="5733307423899610340">"SMS ਦੀ ਆਗਿਆ ਨਹੀਂ ਹੈ"</string>
     <string name="disabled_by_policy_title_camera" msgid="6225008536855644874">"ਕੈਮਰੇ ਦੀ ਇਜਾਜ਼ਤ ਨਹੀਂ ਹੈ"</string>
     <string name="disabled_by_policy_title_screen_capture" msgid="4066913623298047094">"ਸਕ੍ਰੀਨਸ਼ਾਟ ਦੀ ਇਜਾਜ਼ਤ ਨਹੀਂ ਹੈ"</string>
     <string name="default_admin_support_msg" msgid="2853684309779513863">"ਇਹ ਕਾਰਵਾਈ ਅਯੋਗ ਹੈ। ਹੋਰ ਜਾਣਨ ਲਈ, ਆਪਣੀ ਸੰਸਥਾ ਦੇ ਪ੍ਰਸ਼ਾਸਕ ਨਾਲ ਸੰਪਰਕ ਕਰੋ।"</string>
     <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_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">"ਪੋਰਟੇਬਲ Wi-Fi ਹੌਟਸਪੌਟ <xliff:g id="ID_1">%1$s</xliff:g> ਸਰਗਰਮ ਹੈ, ਇਸ ਡੀਵਾਈਸ ਲਈ Wi-Fi ਬੰਦ ਹੈ।"</string>
+    <string name="condition_hotspot_summary" msgid="3433182779269409683">"ਪੋਰਟੇਬਲ ਵਾਈ-ਫਾਈ ਹੌਟਸਪੌਟ <xliff:g id="ID_1">%1$s</xliff:g> ਸਰਗਰਮ ਹੈ, ਇਸ ਡੀਵਾਈਸ ਲਈ ਵਾਈ-ਫਾਈ ਬੰਦ ਹੈ।"</string>
     <string name="condition_airplane_title" msgid="287356299107070503">"ਜਹਾਜ਼ ਮੋਡ ਚਾਲੂ ਹੈ"</string>
-    <string name="condition_airplane_summary" msgid="5561586417832393666">"Wi-Fi, ਬਲੂਟੁੱਥ, ਅਤੇ ਮੋਬਾਈਲ ਨੈੱਟਵਰਕ ਬੰਦ ਹਨ। ਤੁਸੀਂ ਫ਼ੋਨ ਕਾਲਾਂ ਨਹੀਂ ਕਰ ਸਕਦੇ ਜਾਂ ਇੰਟਰਨੈੱਟ ਨਾਲ ਕਨੈਕਟ ਨਹੀਂ ਹੋ ਸਕਦੇ।"</string>
-    <string name="condition_zen_title" msgid="2679168532600816392">"ਮੈਨੂੰ ਪਰੇਸ਼ਾਨ ਨਾ ਕਰੋ ਚਾਲੂ ਹੈ (<xliff:g id="ID_1">%1$s</xliff:g>)"</string>
+    <string name="condition_airplane_summary" msgid="5561586417832393666">"ਵਾਈ-ਫਾਈ, ਬਲੂਟੁੱਥ, ਅਤੇ ਮੋਬਾਈਲ ਨੈੱਟਵਰਕ ਬੰਦ ਹਨ। ਤੁਸੀਂ ਫ਼ੋਨ ਕਾਲਾਂ ਨਹੀਂ ਕਰ ਸਕਦੇ ਜਾਂ ਇੰਟਰਨੈੱਟ ਨਾਲ ਕਨੈਕਟ ਨਹੀਂ ਹੋ ਸਕਦੇ।"</string>
+    <string name="condition_zen_title" msgid="2679168532600816392">"ਪਰੇਸ਼ਾਨ ਨਾ ਕਰੋ ਚਾਲੂ ਹੈ (<xliff:g id="ID_1">%1$s</xliff:g>)"</string>
     <string name="condition_battery_title" msgid="3272131008388575349">"ਬੈਟਰੀ ਸੇਵਰ ਚਾਲੂ ਹੈ"</string>
-    <string name="condition_battery_summary" msgid="4418839236027977450">"ਕਾਰਗੁਜ਼ਾਰੀ ਘਟਾਈ ਗਈ ਹੈ। ਟਿਕਾਣਾ ਸੇਵਾਵਾਂ ਅਤੇ ਪਿਛੋਕੜ ਡੈਟਾ ਬੰਦ ਹਨ।"</string>
-    <string name="condition_cellular_title" msgid="1327317003797575735">"ਮੋਬਾਈਲ ਡੈਟਾ ਬੰਦ ਹੈ"</string>
-    <string name="condition_cellular_summary" msgid="1818046558419658463">"ਇੰਟਰਨੈੱਟ ਸਿਰਫ਼ Wi-Fi ਰਾਹੀਂ ਹੀ ਉਪਲਬਧ ਹੈ"</string>
-    <string name="condition_bg_data_title" msgid="2483860304802846542">"ਡੈਟਾ ਸੇਵਰ ਚਾਲੂ ਹੈ"</string>
-    <string name="condition_bg_data_summary" msgid="656957852895282228">"ਪਿਛੋਕੜ ਡੈਟਾ ਸਿਰਫ਼ Wi-Fi ਰਾਹੀਂ ਉਪਲਬਧ ਹੈ। Wi-Fi ਉਪਲਬਧ ਨਾ ਹੋਣ \'ਤੇ ਇਹ ਕੁਝ ਐਪਾਂ ਜਾਂ ਸੇਵਾਵਾਂ \'ਤੇ ਅਸਰ ਪਾ ਸਕਦਾ ਹੈ।"</string>
-    <string name="condition_work_title" msgid="7293722361184366648">"ਕੰਮ ਪ੍ਰੋਫਾਈਲ ਬੰਦ ਹੈ"</string>
-    <string name="condition_work_summary" msgid="7543202177571590378">"ਤੁਹਾਡੀ ਕੰਮ ਪ੍ਰੋਫਾਈਲ ਨਾਲ ਸਬੰਧਿਤ ਐਪਾਂ, ਬੈਕਗ੍ਰਾਊਂਡ ਸਮਕਾਲੀਕਰਨ, ਅਤੇ ਹੋਰ ਵਿਸ਼ੇਸ਼ਤਾਵਾਂ ਬੰਦ ਹਨ।"</string>
+    <string name="condition_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_work_title" msgid="7293722361184366648">"ਕਾਰਜ ਪ੍ਰੋਫਾਈਲ ਬੰਦ ਹੈ"</string>
+    <string name="condition_work_summary" msgid="7543202177571590378">"ਤੁਹਾਡੀ ਕਾਰਜ ਪ੍ਰੋਫਾਈਲ ਨਾਲ ਸਬੰਧਿਤ ਐਪਾਂ, ਬੈਕਗ੍ਰਾਊਂਡ ਸਮਕਾਲੀਕਰਨ, ਅਤੇ ਹੋਰ ਵਿਸ਼ੇਸ਼ਤਾਵਾਂ ਬੰਦ ਹਨ।"</string>
     <string name="night_display_suggestion_title" msgid="6602129097059325291">"ਰਾਤ ਦੀ ਰੋਸ਼ਨੀ ਸਬੰਧੀ ਸਮਾਂ-ਸੂਚੀ ਸੈੱਟ ਕਰੋ"</string>
     <string name="night_display_suggestion_summary" msgid="1747638280833631187">"ਤੁਹਾਨੂੰ ਸੌਣ ਵਿੱਚ ਮਦਦ ਕਰਨ ਲਈ ਸਕ੍ਰੀਨ ਨੂੰ ਪੀਲੀ-ਸੰਤਰੀ ਭਾਹ ਦਿਓ"</string>
     <string name="condition_night_display_title" msgid="5599814941976856183">"ਰਾਤਰੀ ਲਾਈਟ ਚਾਲੂ ਹੈ"</string>
@@ -3380,21 +3407,24 @@
     <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="connectivity_monitor_switch" msgid="9059759348648583421">"ਕਨੈਕਟਿਵਟੀ ਮੋਨੀਟਰ"</string>
+    <string name="connectivity_monitor_switch_summary" msgid="2828658652378866401">"ਕਨੈਕਟਿਵਟੀ ਮੋਨੀਟਰ ਕਿਸੇ ਕਨੈਕਟਿਵਟੀ ਸਮੱਸਿਆ ਦਾ ਪਤਾ ਲੱਗਣ \'ਤੇ ਲੌਗਾਂ ਨੂੰ ਇਕੱਤਰ ਕਰੇਗਾ ਅਤੇ ਵਰਤੋਂਕਾਰ ਨੂੰ ਇੱਕ ਬੱਗ ਦਾਇਰ ਕਰਨ ਲਈ ਸੂਚਨਾ ਦੇਵੇਗਾ"</string>
+    <string name="connectivity_monitor_toast" msgid="5551859612881173028">"ਕਨੈਕਟਿਵਟੀ ਮੋਨੀਟਰ ਬਦਲਾਅ ਲਾਗੂ ਕਰਨ ਲਈ, ਡੀਵਾਈਸ ਨੂੰ ਰੀਬੂਟ ਕਰੋ"</string>
     <string name="camera_hal_hdrplus_switch" msgid="8377365197105267466">"ਕੈਮਰਾ HAL HDR+"</string>
     <string name="camera_hal_hdrplus_toast" msgid="2063703797270055299">"ਕੈਮਰਾ HAL HDR+ ਤਬਦੀਲੀ ਲਾਗੂ ਕਰਨ ਲਈ, ਡੀਵਾਈਸ ਨੂੰ ਰੀਬੂਟ ਕਰੋ"</string>
+    <string name="camera_laser_sensor_switch" msgid="8913588990743234440">"ਕੈਮਰਾ ਲੇਜ਼ਰ ਸੈਂਸਰ"</string>
     <string name="ota_disable_automatic_update" msgid="2319639631655915050">"ਸਵੈਚਾਲਿਤ ਸਿਸਟਮ ਅੱਪਡੇਟਾਂ"</string>
     <string name="usage" msgid="2977875522080448986">"ਵਰਤੋਂ"</string>
-    <string name="cellular_data_usage" msgid="2155683719898158203">"ਮੋਬਾਈਲ ਡੈਟਾ ਉਪਯੋਗ"</string>
-    <string name="wifi_data_usage" msgid="686754111095324306">"Wi-Fi ਡੈਟਾ ਉਪਯੋਗ"</string>
-    <string name="ethernet_data_usage" msgid="5108764537574354616">"ਈਥਰਨੈੱਟ ਡੈਟਾ ਉਪਯੋਗ"</string>
-    <string name="wifi" msgid="1081550856200013637">"Wi-Fi"</string>
+    <string name="cellular_data_usage" msgid="2155683719898158203">"ਮੋਬਾਈਲ ਡਾਟਾ ਵਰਤੋਂ"</string>
+    <string name="wifi_data_usage" msgid="686754111095324306">"ਵਾਈ-ਫਾਈ ਡਾਟਾ ਵਰਤੋਂ"</string>
+    <string name="ethernet_data_usage" msgid="5108764537574354616">"ਈਥਰਨੈੱਟ ਡਾਟਾ ਵਰਤੋਂ"</string>
+    <string name="wifi" msgid="1081550856200013637">"ਵਾਈ-ਫਾਈ"</string>
     <string name="ethernet" msgid="6600095783781389720">"ਈਥਰਨੈੱਟ"</string>
-    <string name="cell_data_template" msgid="405684854174361041">"<xliff:g id="AMOUNT">^1</xliff:g> ਮੋਬਾਈਲ ਡੈਟਾ"</string>
-    <string name="wifi_data_template" msgid="6265570748799357386">"<xliff:g id="AMOUNT">^1</xliff:g> Wi-Fi ਡੈਟਾ"</string>
-    <string name="ethernet_data_template" msgid="5782476509881033590">"<xliff:g id="AMOUNT">^1</xliff:g> ਈਥਰਨੈੱਟ ਡੈਟਾ"</string>
-    <string name="cell_warning_only" msgid="763147658209027140">"<xliff:g id="ID_1">%1$s</xliff:g> ਡੈਟਾ ਚੇਤਾਵਨੀ"</string>
-    <string name="cell_warning_and_limit" msgid="2273413629267437470">"<xliff:g id="ID_1">%1$s</xliff:g> ਡੈਟਾ ਚੇਤਾਵਨੀ / <xliff:g id="ID_2">%2$s</xliff:g> ਡੈਟਾ ਸੀਮਾ"</string>
+    <string name="cell_data_template" msgid="405684854174361041">"<xliff:g id="AMOUNT">^1</xliff:g> ਮੋਬਾਈਲ ਡਾਟਾ"</string>
+    <string name="wifi_data_template" msgid="6265570748799357386">"<xliff:g id="AMOUNT">^1</xliff:g> ਵਾਈ-ਫਾਈ ਡਾਟਾ"</string>
+    <string name="ethernet_data_template" msgid="5782476509881033590">"<xliff:g id="AMOUNT">^1</xliff:g> ਈਥਰਨੈੱਟ  ਡਾਟਾ"</string>
+    <string name="cell_warning_only" msgid="763147658209027140">"<xliff:g id="ID_1">%1$s</xliff:g>  ਡਾਟਾ   ਚਿਤਾਵਨੀ"</string>
+    <string name="cell_warning_and_limit" msgid="2273413629267437470">"<xliff:g id="ID_1">%1$s</xliff:g>  ਡਾਟਾ   ਚਿਤਾਵਨੀ  / <xliff:g id="ID_2">%2$s</xliff:g>  ਡਾਟਾ  ਸੀਮਾ"</string>
     <string name="billing_cycle" msgid="5169909190811133499">"ਬਿਲਿੰਗ ਚੱਕਰ"</string>
     <string name="billing_cycle_fragment_summary" msgid="8231066353654583106">"ਮਹੀਨਾਵਾਰ <xliff:g id="ID_1">%1$s</xliff:g> ਤਾਰੀਖ ਨੂੰ"</string>
     <string name="network_restrictions" msgid="8234695294536675380">"ਨੈੱਟਵਰਕ ਪਾਬੰਦੀਆਂ"</string>
@@ -3402,41 +3432,41 @@
       <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>
-    <string name="set_data_limit" msgid="2901526323210516923">"ਡੈਟਾ ਸੀਮਾ ਸੈੱਟ ਕਰੋ"</string>
-    <string name="data_limit" msgid="1885406964934590552">"ਡੈਟਾ ਸੀਮਾ"</string>
-    <string name="data_usage_template" msgid="392191945602400904">"<xliff:g id="ID_2">%2$s</xliff:g> ਦੌਰਾਨ <xliff:g id="ID_1">%1$s</xliff:g> ਵਰਤਿਆ ਗਿਆ"</string>
-    <string name="configure" msgid="1029654422228677273">"ਸੰਰੂਪਣ ਕਰੋ"</string>
+    <string name="set_data_warning" msgid="6115364758236594593">" ਡਾਟਾ   ਚਿਤਾਵਨੀ  ਸੈੱਟ ਕਰੋ"</string>
+    <string name="data_warning" msgid="209133958008062117">" ਡਾਟਾ   ਚਿਤਾਵਨੀ"</string>
+    <string name="set_data_limit" msgid="2901526323210516923">" ਡਾਟਾ  ਸੀਮਾ ਸੈੱਟ ਕਰੋ"</string>
+    <string name="data_limit" msgid="1885406964934590552">" ਡਾਟਾ  ਸੀਮਾ"</string>
+    <string name="data_usage_template" msgid="2923744765873163859">"<xliff:g id="ID_2">%2$s</xliff:g> ਤੱਕ <xliff:g id="ID_1">%1$s</xliff:g> ਵਰਤੀ ਗਈ"</string>
+    <string name="configure" msgid="1029654422228677273">"ਰੂਪ-ਰੇਖਾ ਬਦਲੋ"</string>
     <string name="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="952796077540228711">"ਗੈਰ-ਪਾਬੰਦੀਸ਼ੁਦਾ ਡੈਟਾ"</string>
-    <string name="restrict_background_blacklisted" msgid="3995443391711013068">"ਪਿਛੋਕੜ ਡੈਟਾ ਬੰਦ ਕੀਤਾ ਗਿਆ ਹੈ"</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">"ਤੁਹਾਡੀ ਡੀਵਾਈਸ ਨੂੰ ਸ਼ੁਰੂ ਕਰਨ ਲਈ PIN ਦੀ ਮੰਗ ਨੂੰ ਲਾਜ਼ਮੀ ਬਣਾਓ। ਬੰਦ ਹੋਣ \'ਤੇ, ਇਹ ਡੀਵਾਈਸ ਕਾਲਾਂ, ਸੁਨੇਹਿਆਂ, ਸੂਚਨਾਵਾਂ, ਜਾਂ ਅਲਾਰਮਾਂ ਨੂੰ ਪ੍ਰਾਪਤ ਨਹੀਂ ਕਰ ਸਕਦੀ।"</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="suggestion_additional_fingerprints_summary" msgid="5471253233176471245">"ਕਿਸੇ ਹੋਰ ਉਂਗਲ ਨਾਲ ਅਣਲਾਕ ਕਰੋ"</string>
     <string name="battery_saver_on_summary" msgid="9072203872401530722">"ਚਾਲੂ / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="battery_saver_off_summary" msgid="8309471955051162327">"ਬੰਦ / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="battery_saver_desc_turn_on_auto_never" msgid="6715896635178578813">"ਕਦੇ ਵੀ ਸਵੈਚਾਲਿਤ ਤੌਰ \'ਤੇ ਚਾਲੂ ਨਾ ਕਰੋ"</string>
     <string name="battery_saver_desc_turn_on_auto_pct" msgid="7472323223085636533">"%1$s ਬੈਟਰੀ ਬਾਕੀ ਰਹਿਣ \'ਤੇ ਸਵੈਚਾਲਿਤ ਤੌਰ \'ਤੇ ਚਾਲੂ ਕਰੋ"</string>
     <string name="not_battery_optimizing" msgid="5362861851864837617">"ਬੈਟਰੀ ਔਪਟੀਮਾਈਜੇਸ਼ਨ ਦੀ ਵਰਤੋਂ ਨਹੀਂ ਕੀਤੀ ਜਾ ਰਹੀ"</string>
-    <string name="lockscreen_remote_input" msgid="969871538778211843">"ਜੇਕਰ ਡੀਵਾਈਸ ਲੌਕ ਹੈ, ਤਾਂ ਸੂਚਨਾਵਾਂ ਵਿੱਚ ਜਵਾਬਾਂ ਜਾਂ ਹੋਰ ਲਿਖਤੀ ਸੁਨੇਹਿਆਂ ਨੂੰ ਟਾਈਪ ਕਰਨ ਤੋਂ ਰੋਕੋ"</string>
-    <string name="default_spell_checker" msgid="8506899870026026660">"ਪੂਰਵ-ਨਿਰਧਾਰਤ ਸਪੈੱਲ ਚੈਕਰ"</string>
+    <string name="lockscreen_remote_input" msgid="969871538778211843">"ਜੇਕਰ ਡੀਵਾਈਸ ਲਾਕ ਹੈ, ਤਾਂ ਸੂਚਨਾਵਾਂ ਵਿੱਚ ਜਵਾਬਾਂ ਜਾਂ ਹੋਰ ਲਿਖਤੀ ਸੁਨੇਹਿਆਂ ਨੂੰ ਟਾਈਪ ਕਰਨ ਤੋਂ ਰੋਕੋ"</string>
+    <string name="default_spell_checker" msgid="8506899870026026660">"ਪੂਰਵ-ਨਿਰਧਾਰਤ ਸਪੈੱਲ-ਚੈਕਰ"</string>
     <string name="choose_spell_checker" msgid="6596539862291699367">"ਸਪੈੱਲ ਚੈਕਰ ਚੁਣੋ"</string>
     <string name="spell_checker_not_selected" msgid="8871083796179200696">"ਚੁਣਿਆ ਨਹੀਂ ਗਿਆ"</string>
     <string name="notification_log_no_title" msgid="5678029849672024215">"(ਕੋਈ ਨਹੀਂ)"</string>
@@ -3457,9 +3487,9 @@
     <string name="notification_log_details_actions" msgid="242523930165118066">"ਕਾਰਵਾਈਆਂ"</string>
     <string name="notification_log_details_title" msgid="7177091647508863295">"ਸਿਰਲੇਖ"</string>
     <string name="notification_log_details_remoteinput" msgid="8328591329858827409">"ਰਿਮੋਟ ਇਨਪੁੱਟ"</string>
-    <string name="notification_log_details_content_view" msgid="6638731378278561786">"ਵਿਸ਼ੇਸ਼-ਵਿਉਂਤਬੱਧ ਝਲਕ"</string>
+    <string name="notification_log_details_content_view" msgid="6638731378278561786">"ਵਿਉਂਂਤੀ ਝਲਕ"</string>
     <string name="notification_log_details_extras" msgid="4188418723779942047">"ਵਾਧੂ"</string>
-    <string name="notification_log_details_icon" msgid="8939114059726188218">"ਚਿੰਨ੍ਹ"</string>
+    <string name="notification_log_details_icon" msgid="8939114059726188218">"ਪ੍ਰਤੀਕ"</string>
     <string name="notification_log_details_parcel" msgid="243148037601903212">"ਪਾਰਸਲ ਦਾ ਆਕਾਰ"</string>
     <string name="notification_log_details_ashmem" msgid="7241814108477320636">"ashmem"</string>
     <string name="notification_log_details_sound" msgid="5506232879598808099">"ਧੁਨੀ"</string>
@@ -3470,27 +3500,27 @@
     <string name="notification_log_details_ranking_none" msgid="599607025882587844">"ਰੈਕਿੰਗ ਔਬਜੈਕਟ ਵਿੱਚ ਇਹ ਕੁੰਜੀ ਸ਼ਾਮਲ ਨਹੀਂ ਹੈ।"</string>
     <string name="special_access" msgid="3458780842491881155">"ਵਿਸ਼ੇਸ਼ ਐਪ ਪਹੁੰਚ"</string>
     <plurals name="special_access_summary" formatted="false" msgid="260765309935675867">
-      <item quantity="one"><xliff:g id="COUNT">%d</xliff:g> ਐਪ ਗੈਰ-ਪਾਬੰਦੀਸ਼ੁਦਾ ਡੈਟੇ ਦੀ ਵਰਤੋਂ ਕਰ ਸਕਦੀ ਹੈ</item>
-      <item quantity="other"><xliff:g id="COUNT">%d</xliff:g> ਐਪਾਂ ਗੈਰ-ਪਾਬੰਦੀਸ਼ੁਦਾ ਡੈਟੇ ਦੀ ਵਰਤੋਂ ਕਰ ਸਕਦੀਆਂ ਹਨ</item>
+      <item quantity="one"><xliff:g id="COUNT">%d</xliff:g> ਐਪ ਗੈਰ-ਪਾਬੰਦੀਸ਼ੁਦਾ ਡਾਟੇ ਦੀ ਵਰਤੋਂ ਕਰ ਸਕਦੀ ਹੈ</item>
+      <item quantity="other"><xliff:g id="COUNT">%d</xliff:g> ਐਪਾਂ ਗੈਰ-ਪਾਬੰਦੀਸ਼ੁਦਾ ਡਾਟੇ ਦੀ ਵਰਤੋਂ ਕਰ ਸਕਦੀਆਂ ਹਨ</item>
     </plurals>
-    <string name="confirm_convert_to_fbe_warning" msgid="1487005506049137659">"ਕੀ ਸੱਚਮੁੱਚ ਵਰਤੋਂਕਾਰ ਡੈਟੇ ਨੂੰ ਮਿਟਾਉਣਾ ਅਤੇ ਫ਼ਾਈਲ ਇਨਕ੍ਰਿਪਸ਼ਨ ਵਿੱਚ ਤਬਦੀਲ ਕਰਨਾ ਹੈ?"</string>
+    <string name="confirm_convert_to_fbe_warning" msgid="1487005506049137659">"ਕੀ ਸੱਚਮੁੱਚ ਵਰਤੋਂਕਾਰ  ਡਾਟੇ  ਨੂੰ ਮਿਟਾਉਣਾ ਅਤੇ ਫ਼ਾਈਲ ਇਨਕ੍ਰਿਪਸ਼ਨ ਵਿੱਚ ਤਬਦੀਲ ਕਰਨਾ ਹੈ?"</string>
     <string name="button_confirm_convert_fbe" msgid="7101855374850373091">"ਮਿਟਾਓ ਅਤੇ ਰੁਪਾਂਤਰਣ ਕਰੋ"</string>
     <string name="reset_shortcut_manager_throttling" msgid="6495066467198668994">"ShortcutManager ਰੇਟ-ਲਿਮਟਿੰਗ ਰੀਸੈੱਟ ਕਰੋ"</string>
     <string name="reset_shortcut_manager_throttling_complete" msgid="1826770872063707900">"ShortcutManager ਰੇਟ-ਲਿਮਟਿੰਗ ਰੀਸੈੱਟ ਕੀਤੀ ਜਾ ਚੁੱਕੀ ਹੈ"</string>
-    <string name="notification_suggestion_title" msgid="4506524937307816475">"ਲੌਕ ਸਕ੍ਰੀਨ ਸੂਚਨਾਵਾਂ ਨੂੰ ਕੰਟਰੋਲ ਕਰੋ"</string>
-    <string name="notification_suggestion_summary" msgid="8521159741445416875">"ਸੂਚਨਾ ਸਮੱਗਰੀ ਨੂੰ ਵਿਖਾਓ ਜਾਂ ਲੁਕਾਓ"</string>
+    <string name="notification_suggestion_title" msgid="387052719462473500">" ਲਾਕ  ਸਕ੍ਰੀਨ \'ਤੇ ਜਾਣਕਾਰੀ ਨੂੰ ਕੰਟਰੋਲ ਕਰੋ"</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="8483187649355540109">"ਸਹਾਇਤਾ ਅਤੇ ਨੁਕਤੇ"</string>
     <string name="developer_smallest_width" msgid="7516950434587313360">"ਸਭ ਤੋਂ ਘੱਟ ਚੁੜਾਈ"</string>
     <string name="premium_sms_none" msgid="8268105565738040566">"ਕਿਸੇ ਵੀ ਸਥਾਪਤ ਐਪ ਨੇ ਪ੍ਰੀਮੀਅਮ SMS ਪਹੁੰਚ ਦੀ ਬੇਨਤੀ ਨਹੀਂ ਕੀਤੀ"</string>
-    <string name="premium_sms_warning" msgid="9086859595338944882">"ਪ੍ਰੀਮੀਅਮ SMS ਦਾ ਤੁਹਾਡੇ ਤੋਂ ਖ਼ਰਚਾ ਲਿਆ ਜਾ ਸਕਦਾ ਹੈ ਅਤੇ ਤੁਹਾਡੇ ਕੈਰੀਅਰ ਬਿੱਲਾਂ ਵਿੱਚ ਵਾਧਾ ਹੋ ਜਾਵੇਗਾ। ਜੇਕਰ ਤੁਸੀਂ ਕਿਸੇ ਐਪ ਲਈ ਇਜਾਜ਼ਤ ਨੂੰ ਯੋਗ ਬਣਾਉਂਦੇ ਹੋ, ਤਾਂ ਤੁਸੀਂ ਉਸ ਐਪ ਦੀ ਵਰਤੋਂ ਨਾਲ ਪ੍ਰੀਮੀਅਮ SMS ਭੇਜਣ ਦੇ ਯੋਗ ਹੋ ਜਾਵੋਗੇ।"</string>
+    <string name="premium_sms_warning" msgid="9086859595338944882">"ਪ੍ਰੀਮੀਅਮ SMS ਦਾ ਤੁਹਾਡੇ ਤੋਂ ਖਰਚਾ ਲਿਆ ਜਾ ਸਕਦਾ ਹੈ ਅਤੇ ਤੁਹਾਡੇ ਕੈਰੀਅਰ ਬਿੱਲਾਂ ਵਿੱਚ ਵਾਧਾ ਹੋ ਜਾਵੇਗਾ। ਜੇਕਰ ਤੁਸੀਂ ਕਿਸੇ ਐਪ ਲਈ ਇਜਾਜ਼ਤ ਨੂੰ ਯੋਗ ਬਣਾਉਂਦੇ ਹੋ, ਤਾਂ ਤੁਸੀਂ ਉਸ ਐਪ ਦੀ ਵਰਤੋਂ ਨਾਲ ਪ੍ਰੀਮੀਅਮ SMS ਭੇਜਣ ਦੇ ਯੋਗ ਹੋ ਜਾਵੋਗੇ।"</string>
     <string name="premium_sms_access" msgid="4660047004791638305">"ਪ੍ਰੀਮੀਅਮ SMS ਪਹੁੰਚ"</string>
-    <string name="bluetooth_disabled" msgid="2456198532288640046">"ਦੂਜੀਆਂ ਡੀਵਾਈਸਾਂ ਲਈ ਦਿਖਣਯੋਗ ਨਹੀਂ"</string>
+    <string name="bluetooth_disabled" msgid="6244000672828617410">"ਬੰਦ"</string>
     <string name="bluetooth_connected_summary" msgid="7672528674593152862">"<xliff:g id="ID_1">%1$s</xliff:g> ਨਾਲ ਕਨੈਕਟ ਹੈ"</string>
     <string name="bluetooth_connected_multiple_devices_summary" msgid="9173661896296663932">"ਇੱਕ ਤੋਂ ਜ਼ਿਆਦਾ ਡੀਵਾਈਸਾਂ ਨਾਲ ਕਨੈਕਟ ਹੈ"</string>
     <string name="demo_mode" msgid="2798762752209330277">"ਸਿਸਟਮ UI ਡੈਮੋ ਮੋਡ"</string>
     <string name="quick_settings_developer_tiles" msgid="5947788063262762448">"ਤਤਕਾਲ ਸੈਟਿੰਗਾਂ ਦੀਆਂ ਵਿਕਾਸਕਾਰ ਟਾਇਲਾਂ"</string>
-    <string name="support_escalation_title" msgid="4111071371281023145">"ਅਸੀਂ ਸਹਾਇਤਾ ਕਰਨ ਲਈ ਉਪਲਬਧ ਹਾਂ"</string>
+    <string name="support_escalation_title" msgid="4111071371281023145">"ਅਸੀਂ ਮਦਦ ਕਰਨ ਲਈ ਉਪਲਬਧ ਹਾਂ"</string>
     <string name="support_escalation_24_7_title" msgid="8118369197749832074">"ਅਸੀਂ ਤੁਹਾਡੇ ਲਈ 24/7 ਉਪਲਬਧ ਹਾਂ"</string>
     <string name="support_escalation_24_7_content_description" msgid="3772776213036994533">"ਅਸੀਂ ਤੁਹਾਡੇ ਲਈ 24 7 ਉਪਲਬਧ ਹਾਂ"</string>
     <string name="support_escalation_summary" msgid="8473084168776014405">"ਸਾਡੀ ਸਹਾਇਤਾ ਟੀਮ ਕਿਸੇ ਵੀ ਸਮੱਸਿਆ ਨੂੰ ਹੱਲ ਕਰਨ ਵਿੱਚ ਮਦਦ ਲਈ ਉਪਲਬਧ ਹੈ"</string>
@@ -3498,24 +3528,24 @@
     <string name="support_escalation_closed_summary" msgid="2240967274380168303">"ਮਦਦ ਖੋਜੋ ਜਾਂ ਸਹਾਇਤਾ ਸਮੇਂ ਦੌਰਾਨ ਵਾਪਸ ਆਓ (ਸਥਾਨਕ ਸਮਾਂ):&lt;br&gt;&lt;b&gt;<xliff:g id="OPERATION_HOURS">%s</xliff:g>&lt;/b&gt;"</string>
     <string name="support_escalation_no_internet_summary" msgid="2526082812336597989">"ਫ਼ੋਨ ਰਾਹੀਂ ਸਹਾਇਤਾ ਦਾ ਸਮਾਂ (ਸਥਾਨਕ ਸਮਾਂ)&lt;br&gt;&lt;b&gt;<xliff:g id="OPERATION_HOURS">%s</xliff:g>&lt;/b&gt;"</string>
     <string name="support_escalation_unavailable_summary" msgid="5208552975245211898">"ਮਦਦ ਖੋਜੋ ਜਾਂ ਨੁਕਤਿਆਂ ਅਤੇ ਜੁਗਤਾਂ ਦੀ ਪੜਚੋਲ ਕਰੋ"</string>
-    <string name="support_country_list_title" msgid="823853371280534111">"ਇਸ ਲਈ ਸਮਰਥਨ:"</string>
+    <string name="support_country_list_title" msgid="823853371280534111">"ਇਸ ਲਈ ਸਹਾਇਤਾ:"</string>
     <string name="support_country_format" msgid="4502523713489559595">"<xliff:g id="COUNTRY">%1$s</xliff:g> - <xliff:g id="LANGUAGE">%2$s</xliff:g>"</string>
     <string name="support_phone_international_format" msgid="2143528744844720829">"<xliff:g id="LANGUAGE">%1$s</xliff:g> (<xliff:g id="PHONE">%2$s</xliff:g>)"</string>
     <string name="support_international_phone_title" msgid="1308334014138718455">"ਕੀ ਵਿਦੇਸ਼ ਯਾਤਰਾ ਕਰ ਰਹੇ ਹੋ?"</string>
     <string name="support_international_phone_summary" msgid="208231793637026927">"ਅੰਤਰਰਾਸ਼ਟਰੀ ਖਰਚੇ ਲਾਗੂ ਹੋ ਸਕਦੇ ਹਨ।"</string>
-    <string name="support_escalation_by_phone" msgid="4843223043487058711">"ਫੋਨ"</string>
+    <string name="support_escalation_by_phone" msgid="4843223043487058711">"ਫ਼ੋਨ ਕਰੋ"</string>
     <string name="support_escalation_by_chat" msgid="977019859110763749">"ਚੈਟ ਕਰੋ"</string>
     <string name="support_tips_and_tricks_title" msgid="4153466795695447828">"ਨੁਕਤਿਆਂ ਅਤੇ ਜੁਗਤਾਂਂ ਦੀ ਪੜਚੋਲ ਕਰੋ"</string>
-    <string name="support_help_feedback_title" msgid="693440287222186718">"ਮਦਦ ਖੋਜੋ ਅਤੇ ਪ੍ਰਤੀਕਰਮ ਭੇਜੋ"</string>
+    <string name="support_help_feedback_title" msgid="693440287222186718">"ਮਦਦ ਖੋਜੋ ਅਤੇ ਵਿਚਾਰ ਭੇਜੋ"</string>
     <string name="support_sign_in_required_title" msgid="1367187789121480440">"ਸਹਾਇਤਾ ਨੂੰ ਸੰਪਰਕ ਕਰੋ"</string>
-    <string name="support_sign_in_button_text" msgid="3054769428620671241">"ਸਾਈਨ ਇਨ ਕਰੋ"</string>
-    <string name="support_sign_in_required_help" msgid="5200654782405538114">"ਕੀ ਸਾਈਨ ਇਨ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਦਾ?"</string>
+    <string name="support_sign_in_button_text" msgid="3054769428620671241">"ਸਾਈਨ-ਇਨ ਕਰੋ"</string>
+    <string name="support_sign_in_required_help" msgid="5200654782405538114">"ਕੀ ਸਾਈਨ-ਇਨ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਦਾ?"</string>
     <string name="support_disclaimer_title" msgid="4825302018208770031">"ਸਿਸਟਮ ਜਾਣਕਾਰੀ ਭੇਜੋ"</string>
-    <string name="support_disclaimer_do_not_show" msgid="3378367075323727539">"ਦੁਬਾਰਾ ਨਾ ਵਿਖਾਓ"</string>
+    <string name="support_disclaimer_do_not_show" msgid="3378367075323727539">"ਦੁਬਾਰਾ ਨਾ  ਦਿਖਾਓ"</string>
     <string name="support_account_request_prefix" msgid="6387847874661861650">"ਇਸ ਵਜੋਂ ਬੇਨਤੀ ਕੀਤੀ ਜਾ ਰਹੀ ਹੈ"</string>
     <string name="support_account_picker_add_account" msgid="5076277544846506214">"ਖਾਤਾ ਸ਼ਾਮਲ ਕਰੋ"</string>
     <string name="support_system_information_title" msgid="3439905790018934773">"ਸਿਸਟਮ ਜਾਣਕਾਰੀ"</string>
-    <string name="managed_profile_settings_title" msgid="2729481936758125054">"ਕੰਮ ਪ੍ਰੋਫਾਈਲ ਸੈਟਿੰਗਾਂ"</string>
+    <string name="managed_profile_settings_title" msgid="2729481936758125054">"ਕਾਰਜ ਪ੍ਰੋਫਾਈਲ ਸੈਟਿੰਗਾਂ"</string>
     <string name="managed_profile_contact_search_title" msgid="6034734926815544221">"ਸੰਪਰਕ ਖੋਜ"</string>
     <string name="managed_profile_contact_search_summary" msgid="5431253552272970512">"ਕਾਲ ਕਰਨ ਵਾਲਿਆਂ ਅਤੇ ਸੰਪਰਕਾਂ ਦੀ ਪਛਾਣ ਕਰਨ ਲਈ ਤੁਹਾਡੀ ਸੰਸਥਾ ਵਿੱੱਚ ਸੰਪਰਕ ਖੋਜਾਂ ਕਰਨ ਦਿਓ"</string>
     <plurals name="hours" formatted="false" msgid="7020844602875333472">
@@ -3533,14 +3563,14 @@
     <string name="support_estimated_wait_time" msgid="6523081420029378051">"~<xliff:g id="ESTIMATE">%1$s</xliff:g> ਉਡੀਕ ਕਰੋ"</string>
     <string name="bluetooth_talkback_computer" msgid="4875089335641234463">"ਕੰਪਿਊਟਰ"</string>
     <string name="bluetooth_talkback_headset" msgid="5140152177885220949">"ਹੈੱਡਸੈੱਟ"</string>
-    <string name="bluetooth_talkback_phone" msgid="4260255181240622896">"ਫੋਨ"</string>
+    <string name="bluetooth_talkback_phone" msgid="4260255181240622896">"ਫ਼ੋਨ ਕਰੋ"</string>
     <string name="bluetooth_talkback_imaging" msgid="551146170554589119">"ਇਮੇਜਿੰਗ"</string>
     <string name="bluetooth_talkback_headphone" msgid="26580326066627664">"ਹੈੱਡਫੋਨ"</string>
     <string name="bluetooth_talkback_input_peripheral" msgid="5165842622743212268">"ਇਨਪੁੱਟ ਪੈਰਿਫੈਰਲ"</string>
     <string name="bluetooth_talkback_bluetooth" msgid="5615463912185280812">"ਬਲੂਟੁੱਥ"</string>
     <string name="automatic_storage_manager_settings" msgid="7819434542155181607">"ਸਟੋਰੇਜ ਦਾ ਪ੍ਰਬੰਧਨ ਕਰੋ"</string>
-    <string name="automatic_storage_manager_text" msgid="4562950476680600604">"ਸਟੋਰੇਜ ਥਾਂ ਖ਼ਾਲੀ ਕਰਨ ਵਿੱਚ ਮਦਦ ਲਈ, ਸਟੋਰੇਜ ਪ੍ਰਬੰਧਕ ਤੁਹਾਡੀ ਡੀਵਾਈਸ ਤੋਂ ਬੈਕਅੱਪ ਲਈਆਂ ਗਈਆਂ ਫ਼ੋਟੋਆਂ ਅਤੇ ਵੀਡੀਓ ਨੂੰ ਹਟਾਉਂਦਾ ਹੈ।"</string>
-    <string name="automatic_storage_manager_days_title" msgid="2017913896160914647">"ਫ਼ੋਟੋਆਂ ਅਤੇ ਵੀਡੀਓ ਹਟਾਓ"</string>
+    <string name="automatic_storage_manager_text" msgid="4562950476680600604">"ਸਟੋਰੇਜ ਦੀ ਜਗ੍ਹਾ ਖਾਲੀ ਕਰਨ ਵਿੱਚ ਮਦਦ ਲਈ, ਸਟੋਰੇਜ ਪ੍ਰਬੰਧਕ ਤੁਹਾਡੇ ਡੀਵਾਈਸ ਤੋਂ ਬੈਕਅੱਪ ਲਈਆਂ ਗਈਆਂ ਫ਼ੋਟੋਆਂ ਅਤੇ ਵੀਡੀਓ ਹਟਾਉਂਦਾ ਹੈ।"</string>
+    <string name="automatic_storage_manager_days_title" msgid="2017913896160914647">"ਫੋਟੋਆਂ ਅਤੇ ਵੀਡੀਓ ਹਟਾਓ"</string>
     <string name="automatic_storage_manager_preference_title" msgid="5753702798151073383">"ਸਟੋਰੇਜ ਪ੍ਰਬੰਧਕ"</string>
     <string name="deletion_helper_automatic_title" msgid="6605660435498272520">"ਸਵੈਚਾਲਿਤ"</string>
     <string name="deletion_helper_manual_title" msgid="7947432164411214029">"ਦਸਤੀ"</string>
@@ -3548,7 +3578,7 @@
     <string name="gesture_preference_title" msgid="5280023307132819052">"ਸੰਕੇਤ"</string>
     <string name="gesture_preference_summary" product="default" msgid="8627850388011956901">"ਤੁਹਾਡੇ ਫ਼ੋਨ ਨੂੰ ਕੰਟਰੋਲ ਕਰਨ ਲਈ ਤੁਰੰਤ ਸੰਕੇਤ"</string>
     <string name="gesture_preference_summary" product="tablet" msgid="4717535378272065510">"ਤੁਹਾਡੇ ਟੈਬਲੈੱਟ ਨੂੰ ਕੰਟਰੋਲ ਕਰਨ ਲਈ ਤੁਰੰਤ ਸੰਕੇਤ"</string>
-    <string name="gesture_preference_summary" product="device" msgid="4205941452664950852">"ਤੁਹਾਡੀ ਡੀਵਾਈਸ ਨੂੰ ਕੰਟਰੋਲ ਕਰਨ ਲਈ ਤੁਰੰਤ ਸੰਕੇਤ"</string>
+    <string name="gesture_preference_summary" product="device" msgid="4205941452664950852">"ਤੁਹਾਡੇ ਡੀਵਾਈਸ ਨੂੰ ਕੰਟਰੋਲ ਕਰਨ ਲਈ ਤੁਰੰਤ ਸੰਕੇਤ"</string>
     <string name="double_tap_power_for_camera_title" msgid="64716226816032800">"ਕੈਮਰੇ \'ਤੇ ਜਾਓ"</string>
     <string name="double_tap_power_for_camera_summary" msgid="242037150983277829">"ਕੈਮਰੇ ਨੂੰ ਤੁਰੰਤ ਖੋਲ੍ਹਣ ਲਈ, ਪਾਵਰ ਬਟਨ ਨੂੰ ਦੋ ਵਾਰ ਦਬਾਓ। ਇਹ ਕਿਸੇ ਵੀ ਸਕ੍ਰੀਨ ਤੋਂ ਕੰਮ ਕਰਦਾ ਹੈ।"</string>
     <string name="double_tap_power_for_camera_suggestion_title" msgid="6500405261202883589">"ਤੁਰੰਤ ਕੈਮਰਾ ਖੋਲ੍ਹੋ"</string>
@@ -3559,57 +3589,57 @@
     <string name="double_twist_for_camera_suggestion_summary" product="default" msgid="447403641027147153">"ਸੈਲਫ਼ੀ ਮੋਡ ਲਈ ਫ਼ੋਨ ਨੂੰ ਡਬਲ-ਟਵਿਸਟ ਕਰੋ"</string>
     <string name="double_twist_for_camera_suggestion_summary" product="tablet" msgid="1724660290703318739">"ਸੈਲਫ਼ੀ ਮੋਡ ਲਈ ਟੈਬਲੈੱਟ ਨੂੰ ਡਬਲ-ਟਵਿਸਟ ਕਰੋ"</string>
     <string name="double_twist_for_camera_suggestion_summary" product="device" msgid="5980398380988039489">"ਸੈਲਫ਼ੀ ਮੋਡ ਲਈ ਡੀਵਾਈਸ ਨੂੰ ਡਬਲ-ਟਵਿਸਟ ਕਰੋ"</string>
-    <string name="ambient_display_title" product="default" msgid="5144814600610448504">"ਸੂਚਨਾਵਾਂ ਵੇਖਣ ਲਈ ਫ਼ੋਨ \'ਤੇ ਡਬਲ-ਟੈਪ ਕਰੋ"</string>
-    <string name="ambient_display_title" product="tablet" msgid="8688795028609563837">"ਸੂਚਨਾਵਾਂ ਵੇਖਣ ਲਈ ਟੈਬਲੈੱਟ \'ਤੇ ਡਬਲ-ਟੈਪ ਕਰੋ"</string>
-    <string name="ambient_display_title" product="device" msgid="3423781975742145894">"ਸੂਚਨਾਵਾਂ ਵੇਖਣ ਲਈ ਡੀਵਾਈਸ \'ਤੇ ਡਬਲ-ਟੈਪ ਕਰੋ"</string>
-    <string name="ambient_display_summary" msgid="525662960806416373">"ਸਮਾਂ, ਸੂਚਨਾ ਪ੍ਰਤੀਕਾਂ, ਅਤੇ ਹੋਰ ਜਾਣਕਾਰੀ ਦੇਖਣ ਲਈ ਆਪਣੀ ਸਕ੍ਰੀਨ \'ਤੇ ਡਬਲ-ਟੈਪ ਕਰੋ।"</string>
+    <string name="ambient_display_title" product="default" msgid="5144814600610448504">"ਸੂਚਨਾਵਾਂ ਦੇਖਣ ਲਈ ਫ਼ੋਨ \'ਤੇ ਦੋ ਵਾਰ ਟੈਪ ਕਰੋ"</string>
+    <string name="ambient_display_title" product="tablet" msgid="8688795028609563837">"ਸੂਚਨਾਵਾਂ ਦੇਖਣ ਲਈ ਟੈਬਲੈੱਟ \'ਤੇ ਦੋ ਵਾਰ ਟੈਪ ਕਰੋ"</string>
+    <string name="ambient_display_title" product="device" msgid="3423781975742145894">"ਸੂਚਨਾਵਾਂ ਦੇਖਣ ਲਈ ਡੀਵਾਈਸ \'ਤੇ ਦੋ ਵਾਰ ਟੈਪ ਕਰੋ"</string>
+    <string name="ambient_display_summary" msgid="525662960806416373">"ਸਮਾਂ, ਸੂਚਨਾ ਪ੍ਰਤੀਕਾਂ, ਅਤੇ ਹੋਰ ਜਾਣਕਾਰੀ ਦੇਖਣ ਲਈ ਆਪਣੀ ਸਕ੍ਰੀਨ \'ਤੇ ਦੋ ਵਾਰ ਟੈਪ ਕਰੋ।"</string>
     <string name="ambient_display_suggestion_summary" msgid="5987443721392571847">"ਸਕ੍ਰੀਨ ਬੰਦ ਹੋਣ \'ਤੇ ਸੂਚਨਾਵਾਂ ਦੇਖੋ"</string>
-    <string name="ambient_display_pickup_title" product="default" msgid="818688002837687268">"ਸੂਚਨਾਵਾਂ ਵੇਖਣ ਲਈ ਫ਼ੋਨ ਨੂੰ ਚੁੱਕੋ"</string>
-    <string name="ambient_display_pickup_title" product="tablet" msgid="4455864282995698097">"ਸੂਚਨਾਵਾਂ ਵੇਖਣ ਲਈ ਟੈਬਲੈੱਟ ਨੂੰ ਚੁੱਕੋ"</string>
-    <string name="ambient_display_pickup_title" product="device" msgid="5380534405773531175">"ਸੂਚਨਾਵਾਂ ਵੇਖਣ ਲਈ ਡੀਵਾਈਸ ਨੂੰ ਚੁੱਕੋ"</string>
+    <string name="ambient_display_pickup_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="4567020486787561873">"ਸਮਾਂ, ਸੂਚਨਾ ਪ੍ਰਤੀਕਾਂ, ਅਤੇ ਹੋਰ ਜਾਣਕਾਰੀ ਦੇਖਣ ਲਈ ਆਪਣੇ ਫ਼ੋਨ ਨੂੰ ਚੁੱਕੋ।"</string>
     <string name="ambient_display_pickup_summary" product="tablet" msgid="5435283849947236648">"ਸਮਾਂ, ਸੂਚਨਾ ਪ੍ਰਤੀਕਾਂ, ਅਤੇ ਹੋਰ ਜਾਣਕਾਰੀ ਦੇਖਣ ਲਈ ਆਪਣੇ ਟੈਬਲੈੱਟ ਨੂੰ ਚੁੱਕੋ।"</string>
-    <string name="ambient_display_pickup_summary" product="device" msgid="8256669101643381568">"ਸਮਾਂ, ਸੂਚਨਾ ਪ੍ਰਤੀਕਾਂ, ਅਤੇ ਹੋਰ ਜਾਣਕਾਰੀ ਦੇਖਣ ਲਈ ਆਪਣੀ ਡੀਵਾਈਸ ਨੂੰ ਚੁੱਕੋ।"</string>
+    <string name="ambient_display_pickup_summary" product="device" msgid="8256669101643381568">"ਸਮਾਂ, ਸੂਚਨਾ ਪ੍ਰਤੀਕਾਂ, ਅਤੇ ਹੋਰ ਜਾਣਕਾਰੀ ਦੇਖਣ ਲਈ ਆਪਣੇ ਡੀਵਾਈਸ ਨੂੰ ਚੁੱਕੋ।"</string>
     <string name="ambient_display_pickup_suggestion_summary" msgid="7014700589991761035">"ਸਕ੍ਰੀਨ ਬੰਦ ਹੋਣ \'ਤੇ ਸੂਚਨਾਵਾਂ ਦੇਖੋ"</string>
     <string name="fingerprint_swipe_for_notifications_title" msgid="5816346492253270243">"ਸੂਚਨਾਵਾਂ ਲਈ ਫਿੰਗਰਪ੍ਰਿੰਟ ਸਵਾਈਪ ਕਰੋ"</string>
-    <string name="fingerprint_swipe_for_notifications_summary" product="default" msgid="1770661868393713922">"ਆਪਣੀਆਂ ਸੂਚਨਾਵਾਂ ਵੇਖਣ ਲਈ, ਆਪਣੇ ਫ਼ੋਨ ਦੇ ਪਿਛਲੇ ਪਾਸੇ ਫਿੰਗਰਪ੍ਰਿੰਟ ਸੈਂਸਰ \'ਤੇ ਹੇਠਾਂ ਨੂੰ ਸਵਾਈਪ ਕਰੋ।"</string>
-    <string name="fingerprint_swipe_for_notifications_summary" product="tablet" msgid="902719947767712895">"ਆਪਣੀਆਂ ਸੂਚਨਾਵਾਂ ਵੇਖਣ ਲਈ, ਆਪਣੇ ਟੈਬਲੈੱਟ ਦੇ ਪਿਛਲੇ ਪਾਸੇ ਫਿੰਗਰਪ੍ਰਿੰਟ ਸੈਂਸਰ \'ਤੇ ਹੇਠਾਂ ਨੂੰ ਸਵਾਈਪ ਕਰੋ।"</string>
-    <string name="fingerprint_swipe_for_notifications_summary" product="device" msgid="5372926094116306647">"ਆਪਣੀਆਂ ਸੂਚਨਾਵਾਂ ਵੇਖਣ ਲਈ, ਆਪਣੀ ਡੀਵਾਈਸ ਦੇ ਪਿਛਲੇ ਪਾਸੇ ਫਿੰਗਰਪ੍ਰਿੰਟ ਸੈਂਸਰ \'ਤੇ ਹੇਠਾਂ ਨੂੰ ਸਵਾਈਪ ਕਰੋ।"</string>
+    <string name="fingerprint_swipe_for_notifications_summary" product="default" msgid="1770661868393713922">"ਆਪਣੀਆਂ ਸੂਚਨਾਵਾਂ ਦੇਖਣ ਲਈ, ਆਪਣੇ ਫ਼ੋਨ ਦੇ ਪਿਛਲੇ ਪਾਸੇ ਫਿੰਗਰਪ੍ਰਿੰਟ ਸੈਂਸਰ \'ਤੇ ਹੇਠਾਂ ਨੂੰ ਸਵਾਈਪ ਕਰੋ।"</string>
+    <string name="fingerprint_swipe_for_notifications_summary" product="tablet" msgid="902719947767712895">"ਆਪਣੀਆਂ ਸੂਚਨਾਵਾਂ ਦੇਖਣ ਲਈ, ਆਪਣੇ ਟੈਬਲੈੱਟ ਦੇ ਪਿਛਲੇ ਪਾਸੇ ਫਿੰਗਰਪ੍ਰਿੰਟ ਸੈਂਸਰ \'ਤੇ ਹੇਠਾਂ ਨੂੰ ਸਵਾਈਪ ਕਰੋ।"</string>
+    <string name="fingerprint_swipe_for_notifications_summary" product="device" msgid="5372926094116306647">"ਆਪਣੀਆਂ ਸੂਚਨਾਵਾਂ ਦੇਖਣ ਲਈ, ਆਪਣੇ ਡੀਵਾਈਸ ਦੇ ਪਿਛਲੇ ਪਾਸੇ ਫਿੰਗਰਪ੍ਰਿੰਟ ਸੈਂਸਰ \'ਤੇ ਹੇਠਾਂ ਨੂੰ ਸਵਾਈਪ ਕਰੋ।"</string>
     <string name="fingerprint_swipe_for_notifications_suggestion_title" msgid="1677291167470357802">"ਸੂਚਨਾਵਾਂ ਤੇਜ਼ੀ ਨਾਲ ਦੇਖੋ"</string>
     <string name="fingerprint_swipe_for_notifications_suggestion_summary" msgid="127592803294414082">"ਫਿੰਗਰਪ੍ਰਿੰਟ ਸੈਂਸਰ \'ਤੇ ਥੱਲੇ ਨੂੰ ਸਵਾਈਪ ਕਰੋ"</string>
     <string name="gesture_setting_on" msgid="3455094265233870280">"ਚਾਲੂ"</string>
     <string name="gesture_setting_off" msgid="5230169535435881894">"ਬੰਦ"</string>
-    <string name="oem_unlock_enable_disabled_summary_bootloader_unlocked" msgid="4265541229765635629">"ਬੂਟਲੋਡਰ ਪਹਿਲਾਂ ਹੀ ਅਨਲੌਕ ਕੀਤਾ ਹੋਇਆ ਹੈ"</string>
+    <string name="oem_unlock_enable_disabled_summary_bootloader_unlocked" msgid="4265541229765635629">"ਬੂਟਲੋਡਰ ਪਹਿਲਾਂ ਹੀ ਅਣਲਾਕ ਕੀਤਾ ਹੋਇਆ ਹੈ"</string>
     <string name="oem_unlock_enable_disabled_summary_connectivity" msgid="415954951226204461">"ਪਹਿਲਾਂ ਇੰਟਰਨੈੱਟ ਨਾਲ ਕਨੈਕਟ ਕਰੋ"</string>
     <string name="oem_unlock_enable_disabled_summary_connectivity_or_locked" msgid="5884723935668892613">"ਇੰਟਰਨੈੱਟ ਨਾਲ ਕਨੈਕਟ ਕਰੋ ਜਾਂ ਆਪਣੇ ਕੈਰੀਅਰ ਨੂੰ ਸੰਪਰਕ ਕਰੋ"</string>
-    <string name="oem_unlock_enable_disabled_summary_sim_locked_device" msgid="4149387448213399630">"ਕੈਰੀਅਰ-ਲੌਕ ਕੀਤੀਆਂ ਡੀਵਾਈਸਾਂਂ \'ਤੇ ਉਪਲਬਧ ਨਹੀਂ"</string>
+    <string name="oem_unlock_enable_disabled_summary_sim_locked_device" msgid="4149387448213399630">"ਕੈਰੀਅਰ- ਲਾਕ  ਕੀਤੀਆਂ ਡੀਵਾਈਸਾਂਂ \'ਤੇ ਉਪਲਬਧ ਨਹੀਂ"</string>
     <string name="automatic_storage_manager_freed_bytes" msgid="7517560170441007788">"<xliff:g id="SIZE">%1$s</xliff:g> ਕੁੱਲ ਉਪਲਬਧ ਕਰਵਾਈ ਗਈ\n\nਪਿਛਲੀ ਵਾਰ <xliff:g id="DATE">%2$s</xliff:g> ਨੂੰ ਚਲਾਈ ਗਈ"</string>
     <string name="web_action_enable_title" msgid="4051513950976670853">"ਤਤਕਾਲ ਐਪਾਂ"</string>
     <string name="web_action_enable_summary" msgid="3108127559723396382">"ਐਪਾਂ ਸਥਾਪਤ ਨਾ ਹੋਈਆਂ ਹੋਣ \'ਤੇ ਵੀ ਉਹਨਾਂ ਵਿਚਲੇ ਲਿੰਕਾਂ ਨੂੰ ਖੋਲ੍ਹੋ"</string>
     <string name="web_action_section_title" msgid="7364647086538399136">"ਤਤਕਾਲ ਐਪਾਂ"</string>
-    <string name="instant_apps_account" msgid="1433620209791992528">"\'ਤਤਕਾਲ ਐਪਾਂ\' ਖਾਤਾ"</string>
+    <string name="instant_apps_settings" msgid="8827777916518348213">"ਤਤਕਾਲ ਐਪਾਂ ਸੰਬੰਧੀ ਤਰਜੀਹਾਂ"</string>
     <string name="domain_url_section_title" msgid="7046835219056428883">"ਸਥਾਪਤ ਕੀਤੀਆਂ ਐਪਾਂ"</string>
-    <string name="automatic_storage_manager_activation_warning" msgid="6353100011690933254">"ਤੁਹਾਡੀ ਸਟੋਰੇਜ ਦਾ ਪ੍ਰਬੰਧਨ ਹੁਣ ਸਟੋਰੇਜ ਪ੍ਰਬੰਧਕ ਦੁਆਰਾ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ"</string>
+    <string name="automatic_storage_manager_activation_warning" msgid="6353100011690933254">"ਤੁਹਾਡੀ ਸਟੋਰੇਜ ਦਾ ਪ੍ਰਬੰਧਨ ਹੁਣ ਸਟੋਰੇਜ ਪ੍ਰਬੰਧਕ ਵੱਲੋਂ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ"</string>
     <string name="account_for_section_header" msgid="5356566418548737121">"<xliff:g id="USER_NAME">%1$s</xliff:g> ਦੇ ਖਾਤੇ"</string>
-    <string name="configure_section_header" msgid="7391183586410814450">"ਸੰਰੂਪਣ ਕਰੋ"</string>
-    <string name="auto_sync_account_title" msgid="898796354710116383">"ਡੈਟੇ ਨੂੰ ਸਵੈਚਲਿਤ ਤੌਰ \'ਤੇ ਸਮਕਾਲੀਕਿਰਤ ਕਰੋ"</string>
-    <string name="auto_sync_personal_account_title" msgid="8496263182646100610">"ਨਿੱਜੀ ਡੈਟੇ ਨੂੰ ਸਵੈਚਲਿਤ ਤੌਰ \'ਤੇ ਸਮਕਾਲੀਕਿਰਤ ਕਰੋ"</string>
-    <string name="auto_sync_work_account_title" msgid="4489172450037434152">"ਕਾਰਜ ਡੈਟੇ ਨੂੰ ਸਵੈਚਲਿਤ ਤੌਰ \'ਤੇ ਸਮਕਾਲੀਕਿਰਤ ਕਰੋ"</string>
-    <string name="auto_sync_account_summary" msgid="692499211629185107">"ਐਪਾਂ ਨੂੰ ਸਵੈਚਲਿਤ ਤੌਰ \'ਤੇ ਡੈਟੇ ਨੂੰ ਤਾਜ਼ਾ ਕਰਨ ਦਿਓ"</string>
+    <string name="configure_section_header" msgid="7391183586410814450">"ਰੂਪ-ਰੇਖਾ ਬਦਲੋ"</string>
+    <string name="auto_sync_account_title" msgid="898796354710116383">" ਡਾਟੇ  ਨੂੰ ਸਵੈਚਲਿਤ ਤੌਰ \'ਤੇ ਸਮਕਾਲੀਕਿਰਤ ਕਰੋ"</string>
+    <string name="auto_sync_personal_account_title" msgid="8496263182646100610">"ਨਿੱਜੀ  ਡਾਟੇ  ਨੂੰ ਸਵੈਚਲਿਤ ਤੌਰ \'ਤੇ ਸਮਕਾਲੀਕਿਰਤ ਕਰੋ"</string>
+    <string name="auto_sync_work_account_title" msgid="4489172450037434152">"ਕਾਰਜ  ਡਾਟੇ  ਨੂੰ ਸਵੈਚਲਿਤ ਤੌਰ \'ਤੇ ਸਮਕਾਲੀਕਿਰਤ ਕਰੋ"</string>
+    <string name="auto_sync_account_summary" msgid="692499211629185107">"ਐਪਾਂ ਨੂੰ ਸਵੈਚਲਿਤ ਤੌਰ \'ਤੇ  ਡਾਟੇ  ਨੂੰ ਤਾਜ਼ਾ ਕਰਨ ਦਿਓ"</string>
     <string name="account_sync_title" msgid="7214747784136106491">"ਖਾਤਾ ਸਮਕਾਲੀਕਰਨ"</string>
     <string name="account_sync_summary_some_on" msgid="3375930757891381175">"<xliff:g id="ID_2">%2$d</xliff:g> ਵਿੱਚੋਂ <xliff:g id="ID_1">%1$d</xliff:g> ਆਈਟਮਾਂ ਲਈ ਸਮਕਾਲੀਕਰਨ ਚਾਲੂ ਹੈ"</string>
     <string name="account_sync_summary_all_on" msgid="570431636622254156">"ਸਾਰੀਆਂ ਆਈਟਮਾਂ ਲਈ ਸਮਕਾਲੀਕਰਨ ਚਾਲੂ ਹੈ"</string>
     <string name="account_sync_summary_all_off" msgid="8782409931761182734">"ਸਾਰੀਆਂ ਆਈਟਮਾਂ ਲਈ ਸਮਕਾਲੀਕਰਨ ਬੰਦ ਹੈ"</string>
-    <string name="enterprise_privacy_settings" msgid="1177106810374146496">"ਪ੍ਰਬੰਧਿਤ ਕੀਤੀ ਡੀਵਾਈਸ ਬਾਰੇ ਜਾਣਕਾਰੀ"</string>
+    <string name="enterprise_privacy_settings" msgid="1177106810374146496">"ਪ੍ਰਬੰਧਿਤ ਕੀਤੇ ਡੀਵਾਈਸ ਬਾਰੇ ਜਾਣਕਾਰੀ"</string>
     <string name="enterprise_privacy_settings_summary_generic" msgid="5853292305730761128">"ਤਬਦੀਲੀਆਂ ਅਤੇ ਸੈਟਿੰਗਾਂ ਦਾ ਪ੍ਰਬੰਧਨ ਤੁਹਾਡੇ ਸੰਗਠਨ ਵੱਲੋਂ ਕੀਤਾ ਜਾਂਦਾ ਹੈ"</string>
     <string name="enterprise_privacy_settings_summary_with_name" msgid="4266234968317996188">"ਤਬਦੀਲੀਆਂ ਅਤੇ ਸੈਟਿੰਗਾਂ ਦਾ ਪ੍ਰਬੰਧਨ <xliff:g id="ORGANIZATION_NAME">%s</xliff:g> ਵੱਲੋਂ ਕੀਤਾ ਜਾਂਦਾ ਹੈ"</string>
-    <string name="enterprise_privacy_header" msgid="7402406406883832509">"ਤੁਹਾਡੇ ਕਾਰਜ ਡੈਟੇ ਤੱਕ ਪਹੁੰਚ ਮੁਹੱਈਆ ਕਰਵਾਉਣ ਲਈ, ਤੁਹਾਡਾ ਸੰਗਠਨ ਤੁਹਾਡੀ ਡੀਵਾਈਸ \'ਤੇ ਸੈਟਿੰਗਾਂ ਨੂੰ ਬਦਲ ਅਤੇ ਸਾਫਟਵੇਅਰ ਸਥਾਪਤ ਕਰ ਸਕਦਾ ਹੈ।\n\nਹੋਰ ਵੇਰਵਿਆਂ ਲਈ, ਆਪਣੇ ਸੰਗਠਨ ਦੇ ਪ੍ਰਸ਼ਾਸਕ ਨਾਲ ਸੰਪਰਕ ਕਰੋ।"</string>
-    <string name="enterprise_privacy_exposure_category" msgid="7313392680107938517">"ਜਾਣਕਾਰੀ ਦੀਆਂ ਉਹ ਕਿਸਮਾਂ ਜੋ ਤੁਹਾਡਾ ਸੰਗਠਨ ਵੇਖ ਸਕਦਾ ਹੈ"</string>
+    <string name="enterprise_privacy_header" msgid="7402406406883832509">"ਤੁਹਾਡੇ ਕਾਰਜ ਡਾਟੇ ਤੱਕ ਪਹੁੰਚ ਮੁਹੱਈਆ ਕਰਵਾਉਣ ਲਈ, ਤੁਹਾਡਾ ਸੰਗਠਨ ਤੁਹਾਡੇ ਡੀਵਾਈਸ \'ਤੇ ਸੈਟਿੰਗਾਂ ਨੂੰ ਬਦਲ ਅਤੇ ਸਾਫ਼ਟਵੇਅਰ ਸਥਾਪਤ ਕਰ ਸਕਦਾ ਹੈ।\n\nਹੋਰ ਵੇਰਵਿਆਂ ਲਈ, ਆਪਣੇ ਸੰਗਠਨ ਦੇ ਪ੍ਰਸ਼ਾਸਕ ਨੂੰ ਸੰਪਰਕ ਕਰੋ।"</string>
+    <string name="enterprise_privacy_exposure_category" msgid="7313392680107938517">"ਜਾਣਕਾਰੀ ਦੀਆਂ ਉਹ ਕਿਸਮਾਂ ਜੋ ਤੁਹਾਡਾ ਸੰਗਠਨ  ਦੇਖ  ਸਕਦਾ ਹੈ"</string>
     <string name="enterprise_privacy_exposure_changes_category" msgid="9079283547182933771">"ਤੁਹਾਡੇ ਸੰਗਠਨ ਦੇ ਪ੍ਰਸ਼ਾਸਕ ਵੱਲੋਂ ਕੀਤੀਆਂ ਗਈਆਂ ਤਬਦੀਲੀਆਂ"</string>
     <string name="enterprise_privacy_device_access_category" msgid="5423434164248819058">"ਇਸ ਡੀਵਾਈਸ \'ਤੇ ਤੁਹਾਡੀ ਪਹੁੰਚ"</string>
-    <string name="enterprise_privacy_enterprise_data" msgid="2773968662865848413">"ਤੁਹਾਡੇ ਕਾਰਜ ਖਾਤੇ ਨਾਲ ਸਬੰਧਿਤ ਡੈਟਾ, ਜਿਵੇਂ ਕਿ ਈਮੇਲ ਅਤੇ ਕੈਲੰਡਰ"</string>
-    <string name="enterprise_privacy_installed_packages" msgid="2313698828178764590">"ਤੁਹਾਡੀ ਡੀਵਾਈਸ \'ਤੇ ਸਥਾਪਤ ਕੀਤੀਆਂ ਐਪਾਂ ਦੀ ਸੂਚੀ"</string>
-    <string name="enterprise_privacy_usage_stats" msgid="4398411405572759370">"ਹਰੇਕ ਐਪ ਵਿੱਚ ਲਗਾਇਆ ਸਮਾਂ ਅਤੇ ਵਰਤਿਆ ਗਿਆ ਡੈਟਾ"</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>
@@ -3634,15 +3664,17 @@
     <string name="enterprise_privacy_always_on_vpn_personal" msgid="9217774730260037434">"ਤੁਹਾਡੇ ਨਿੱਜੀ ਪ੍ਰੋਫਾਈਲ ਵਿੱਚ \'ਹਮੇਸ਼ਾ-ਚਾਲੂ VPN\' ਵਿਕਲਪ ਨੂੰ ਚਾਲੂ ਕੀਤਾ ਹੋਇਆ ਹੈ"</string>
     <string name="enterprise_privacy_always_on_vpn_work" msgid="7244472958208315814">"ਤੁਹਾਡੇ ਕਾਰਜ ਪ੍ਰੋਫਾਈਲ ਵਿੱਚ \'ਹਮੇਸ਼ਾ-ਚਾਲੂ VPN\' ਵਿਕਲਪ ਨੂੰ ਚਾਲੂ ਕੀਤਾ ਹੋਇਆ ਹੈ"</string>
     <string name="enterprise_privacy_global_http_proxy" msgid="7936664553416257333">"ਗਲੋਬਲ HTTP ਪ੍ਰੌਕਸੀ ਸੈੱਟ ਕੀਤੀ ਗਈ"</string>
-    <string name="enterprise_privacy_ca_certs" msgid="5885892204903688909">"ਭਰੋਸੇਯੋਗ ਕ੍ਰੀਡੈਂਸ਼ੀਅਲ"</string>
+    <string name="enterprise_privacy_ca_certs_device" msgid="2019652712782510262">"ਭਰੋਸੇਯੋਗ ਕ੍ਰੀਡੈਂਸ਼ੀਅਲ"</string>
+    <string name="enterprise_privacy_ca_certs_personal" msgid="2279084820904076599">"ਤੁਹਾਡੇ ਨਿੱਜੀ ਪ੍ਰੋਫਾਈਲ ਵਿੱਚ ਭਰੋਸੇਯੋਗ ਕ੍ਰੀਡੈਂਸ਼ੀਅਲ"</string>
+    <string name="enterprise_privacy_ca_certs_work" msgid="6187377647815301809">"ਤੁਹਾਡੇ ਕਾਰਜ-ਸਥਾਨ ਪ੍ਰੋਫਾਈਲ ਵਿੱਚ ਭਰੋਸੇਯੋਗ ਕ੍ਰੀਡੈਂਸ਼ੀਅਲ"</string>
     <plurals name="enterprise_privacy_number_ca_certs" formatted="false" msgid="526375234629534165">
       <item quantity="one">ਨਿਊਨਤਮ <xliff:g id="COUNT_1">%d</xliff:g> CA ਪ੍ਰਮਾਣ-ਪੱਤਰ</item>
       <item quantity="other">ਨਿਊਨਤਮ <xliff:g id="COUNT_1">%d</xliff:g> CA ਪ੍ਰਮਾਣ-ਪੱਤਰ</item>
     </plurals>
-    <string name="enterprise_privacy_lock_device" msgid="8791656477097208540">"ਪ੍ਰਸ਼ਾਸਕ ਡੀਵਾਈਸ ਨੂੰ ਲੌਕ ਅਤੇ ਪਾਸਵਰਡ ਨੂੰ ਰੀਸੈੱਟ ਕਰ ਸਕਦਾ ਹੈ"</string>
-    <string name="enterprise_privacy_wipe_device" msgid="2821960015797241790">"ਪ੍ਰਸ਼ਾਸਕ ਡੀਵਾਈਸ ਦਾ ਸਾਰਾ ਡੈਟਾ ਮਿਟਾ ਸਕਦਾ ਹੈ"</string>
-    <string name="enterprise_privacy_failed_password_wipe_device" msgid="1001255609345002878">"ਸਾਰਾ ਡੀਵਾਈਸ ਡੈਟਾ ਮਿਟਾਏ ਜਾਣ ਤੋਂ ਪਹਿਲਾਂ ਪਾਸਵਰਡ ਦਾਖਲ ਕਰਨ ਦੀਆਂ ਅਸਫਲ ਕੋਸ਼ਿਸ਼ਾਂ ਦੀ ਗਿਣਤੀ"</string>
-    <string name="enterprise_privacy_failed_password_wipe_work" msgid="4040565826652951057">"ਕਾਰਜ ਪ੍ਰੋਫਾਈਲ ਡੈਟਾ ਮਿਟਾਏ ਜਾਣ ਤੋਂ ਪਹਿਲਾਂ ਪਾਸਵਰਡ ਦਾਖਲ ਕਰਨ ਦੀਆਂ ਅਸਫਲ ਕੋਸ਼ਿਸ਼ਾਂ ਦੀ ਗਿਣਤੀ"</string>
+    <string name="enterprise_privacy_lock_device" msgid="8791656477097208540">"ਪ੍ਰਸ਼ਾਸਕ ਡੀਵਾਈਸ ਨੂੰ ਲਾਕ ਅਤੇ ਪਾਸਵਰਡ ਨੂੰ ਰੀਸੈੱਟ ਕਰ ਸਕਦਾ ਹੈ"</string>
+    <string name="enterprise_privacy_wipe_device" msgid="2821960015797241790">"ਪ੍ਰਸ਼ਾਸਕ ਡੀਵਾਈਸ ਦਾ ਸਾਰਾ ਡਾਟਾ ਮਿਟਾ ਸਕਦਾ ਹੈ"</string>
+    <string name="enterprise_privacy_failed_password_wipe_device" msgid="1001255609345002878">"ਸਾਰਾ ਡੀਵਾਈਸ ਡਾਟਾ ਮਿਟਾਏ ਜਾਣ ਤੋਂ ਪਹਿਲਾਂ ਪਾਸਵਰਡ ਦਾਖਲ ਕਰਨ ਦੀਆਂ ਅਸਫਲ ਕੋਸ਼ਿਸ਼ਾਂ ਦੀ ਗਿਣਤੀ"</string>
+    <string name="enterprise_privacy_failed_password_wipe_work" msgid="4040565826652951057">"ਕਾਰਜ ਪ੍ਰੋਫਾਈਲ ਡਾਟਾ ਮਿਟਾਏ ਜਾਣ ਤੋਂ ਪਹਿਲਾਂ ਪਾਸਵਰਡ ਦਾਖਲ ਕਰਨ ਦੀਆਂ ਅਸਫਲ ਕੋਸ਼ਿਸ਼ਾਂ ਦੀ ਗਿਣਤੀ"</string>
     <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>
@@ -3659,17 +3691,17 @@
     <string name="default_contacts_app_title" msgid="3497370557378660098">"ਸੰਪਰਕ ਐਪ"</string>
     <plurals name="default_email_app_title" formatted="false" msgid="42826975161049245">
       <item quantity="one">ਈਮੇਲ ਕਲਾਇੰਟ ਐਪ</item>
-      <item quantity="other">ਈਮੇਲ ਕਲਾਇੰਟ ਐਪਾਂ</item>
+      <item quantity="other">ਈਮੇਲ ਕਲਾਇੰਟ ਐਪ</item>
     </plurals>
     <string name="default_map_app_title" msgid="7560143381633608567">"ਨਕਸ਼ਾ ਐਪ"</string>
     <plurals name="default_phone_app_title" formatted="false" msgid="6714041230953195024">
       <item quantity="one">ਫ਼ੋਨ ਐਪ</item>
-      <item quantity="other">ਫ਼ੋਨ ਐਪਾਂ</item>
+      <item quantity="other">ਫ਼ੋਨ ਐਪ</item>
     </plurals>
     <string name="app_names_concatenation_template_2" msgid="4309216198909946380">"<xliff:g id="FIRST_APP_NAME">%1$s</xliff:g>, <xliff:g id="SECOND_APP_NAME">%2$s</xliff:g>"</string>
     <string name="app_names_concatenation_template_3" msgid="8949045544491604376">"<xliff:g id="FIRST_APP_NAME">%1$s</xliff:g>, <xliff:g id="SECOND_APP_NAME">%2$s</xliff:g>, <xliff:g id="THIRD_APP_NAME">%3$s</xliff:g>"</string>
     <string name="storage_photos_videos" msgid="319854636702241898">"ਫ਼ੋਟੋਆਂ ਅਤੇ ਵੀਡੀਓ"</string>
-    <string name="storage_music_audio" msgid="789779084825206838">"ਸੰਗੀਤ ਅਤੇ ਔਡੀਓ"</string>
+    <string name="storage_music_audio" msgid="789779084825206838">"ਸੰਗੀਤ ਅਤੇ ਆਡੀਓ"</string>
     <string name="storage_games" msgid="7703159201697117621">"ਗੇਮਾਂ"</string>
     <string name="storage_other_apps" msgid="5524321740031718083">"ਹੋਰ ਐਪਾਂ"</string>
     <string name="storage_files" msgid="8581083146777364063">"ਫ਼ਾਈਲਾਂ"</string>
@@ -3679,7 +3711,7 @@
     <string name="clear_instant_app_data" msgid="2004222610585890909">"ਐਪ ਕਲੀਅਰ ਕਰੋ"</string>
     <string name="clear_instant_app_confirmation" msgid="7451671214898856857">"ਕੀ ਤੁਸੀਂ ਇਸ \'ਤਤਕਾਲ ਐਪ\' ਨੂੰ ਹਟਾਉਣਾ ਚਾਹੁੰਦੇ ਹੋ?"</string>
     <string name="game_storage_settings" msgid="3410689937046696557">"ਗੇਮਾਂ"</string>
-    <string name="audio_files_title" msgid="4777048870657911307">"ਔਡੀਓ ਫ਼ਾਈਲਾਂ"</string>
+    <string name="audio_files_title" msgid="4777048870657911307">"ਆਡੀਓ ਫ਼ਾਈਲਾਂ"</string>
     <string name="app_info_storage_title" msgid="5554719444625611987">"ਵਰਤੀ ਗਈ ਜਗ੍ਹਾ"</string>
     <string name="webview_uninstalled_for_user" msgid="1819903169194420983">"(ਵਰਤੋਂਕਾਰ <xliff:g id="USER">%s</xliff:g> ਲਈ ਅਣਸਥਾਪਤ ਕੀਤੀ)"</string>
     <string name="webview_disabled_for_user" msgid="1216426047631256825">"(ਵਰਤੋਂਕਾਰ <xliff:g id="USER">%s</xliff:g> ਲਈ ਅਯੋਗ ਬਣਾਈ)"</string>
@@ -3692,11 +3724,13 @@
     <string name="storage_manager_indicator_off" msgid="7488057587180724388">"ਬੰਦ"</string>
     <string name="storage_manager_indicator_on" msgid="8625551710194584733">"ਚਾਲੂ"</string>
     <string name="install_type_instant" msgid="3174425974536078647">"ਤਤਕਾਲ ਐਪ"</string>
-    <string name="automatic_storage_manager_deactivation_warning" msgid="5605210730828410482">"ਸਟੋਰੇਜ ਮੈਨੇਜਰ ਨੂੰ ਬੰਦ ਕਰੀਏ?"</string>
+    <string name="automatic_storage_manager_deactivation_warning" msgid="5605210730828410482">"ਸਟੋਰੇਜ ਪ੍ਰਬੰਧਕ ਨੂੰ ਬੰਦ ਕਰਨਾ ਹੈ?"</string>
     <string name="storage_movies_tv" msgid="5498394447562086890">"ਮੂਵੀ ਅਤੇ ਟੀਵੀ ਐਪਾਂ"</string>
     <string name="carrier_provisioning" msgid="4398683675591893169">"ਕੈਰੀਅਰ ਵਿਵਸਥਾਕਰਨ ਜਾਣਕਾਰੀ"</string>
     <string name="trigger_carrier_provisioning" msgid="3434865918009286187">"ਕੈਰੀਅਰ ਵਿਵਸਥਾਕਰਨ ਨੂੰ ਤੂਲ ਦਿਓ"</string>
     <string name="new_device_suggestion_title" msgid="698847081680980774">"ਕੀ ਕੁਝ ਨਵਾਂ ਅਤੇ ਦਿਲਚਸਪ ਹੈ?"</string>
-    <string name="new_device_suggestion_summary" msgid="7172709269203435870">"ਪ੍ਰਮੁੱਖ 5 ਵਿਸ਼ੇਸ਼ਤਾਵਾਂ ਨੂੰ ਦੇਖੋ"</string>
+    <string name="new_device_suggestion_summary" product="default" msgid="206396571522515855">"Take a tour of your new phone"</string>
+    <string name="new_device_suggestion_summary" product="tablet" msgid="393751455688210956">"ਆਪਣਾ ਨਵਾਂ ਟੈਬਲੈੱਟ ਵਰਤਣ ਬਾਰੇ ਜਾਣਕਾਰੀ ਪ੍ਰਾਪਤ ਕਰੋ"</string>
+    <string name="new_device_suggestion_summary" product="device" msgid="2939870049868336652">"Take a tour of your new device"</string>
     <string name="disabled_low_ram_device" msgid="3751578499721173344">"ਇਹ ਵਿਸ਼ੇਸ਼ਤਾ ਇਸ ਡੀਵਾਈਸ \'ਤੇ ਉਪਲਬਧ ਨਹੀਂ ਹੈ"</string>
 </resources>
diff --git a/res/values-pl/arrays.xml b/res/values-pl/arrays.xml
index ad48481..d72c6a1 100644
--- a/res/values-pl/arrays.xml
+++ b/res/values-pl/arrays.xml
@@ -100,8 +100,6 @@
     <!-- no translation found for wifi_security_no_eap:0 (2084555984818107151) -->
     <!-- no translation found for wifi_security_no_eap:1 (397579322683471524) -->
     <!-- no translation found for wifi_security_no_eap:2 (1968820975358150484) -->
-    <!-- no translation found for wifi_ap_security:0 (5251664683198623324) -->
-    <!-- no translation found for wifi_ap_security:1 (7989073072260294673) -->
   <string-array name="wifi_eap_method">
     <item msgid="1160193392455075561">"PEAP"</item>
     <item msgid="7981731051382306293">"TLS"</item>
diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml
index c60e11b..4db0297 100644
--- a/res/values-pl/strings.xml
+++ b/res/values-pl/strings.xml
@@ -168,7 +168,7 @@
     <string name="bluetooth_map_acceptance_dialog_text" msgid="8712508202081143737">"%1$s chce uzyskać dostęp do Twoich wiadomości. Zezwolić na dostęp?"</string>
     <string name="bluetooth_sap_request" msgid="2669762224045354417">"Prośba o dostęp do karty SIM"</string>
     <string name="bluetooth_sap_acceptance_dialog_text" msgid="4414253873553608690">"<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g> chce uzyskać dostęp do Twojej karty SIM. Jeśli na to zezwolisz, na czas tego połączenia na urządzeniu zostanie wyłączone połączenie transmisji danych. Przyznaj dostęp do urządzenia <xliff:g id="DEVICE_NAME_1">%2$s?</xliff:g>"</string>
-    <string name="bluetooth_device_name_summary" msgid="4757990010751789977">"Widoczne dla innych urządzeń jako „<xliff:g id="DEVICE_NAME">^1</xliff:g>”"</string>
+    <string name="bluetooth_device_name_summary" msgid="522235742194965734">"Widoczne dla innych urządzeń jako „<xliff:g id="DEVICE_NAME">^1</xliff:g>”"</string>
     <string name="bluetooth_paired_device_title" msgid="8638994696317952019">"Twoje urządzenia"</string>
     <string name="bluetooth_pairing_page_title" msgid="7712127387361962608">"Sparuj nowe urządzenie"</string>
     <string name="date_and_time" msgid="9062980487860757694">"Data i czas"</string>
@@ -295,7 +295,7 @@
     <string name="calls_title" msgid="3544471959217176768">"Połączenia"</string>
     <string name="sms_messages_title" msgid="1778636286080572535">"SMS-y"</string>
     <string name="cellular_data_summary" msgid="4660351864416939504">"Zezwalaj na mobilną transmisję danych"</string>
-    <string name="allow_data_usage_title" msgid="2238205944729213062">"Transmisja danych w roamingu"</string>
+    <string name="allow_data_usage_title" msgid="2238205944729213062">"Użycie danych w roamingu"</string>
     <string name="roaming" msgid="3596055926335478572">"Roaming danych"</string>
     <string name="roaming_enable" msgid="3737380951525303961">"Połącz z usługami transmisji danych w roamingu"</string>
     <string name="roaming_disable" msgid="1295279574370898378">"Połącz z usługami transmisji danych w roamingu"</string>
@@ -316,6 +316,8 @@
     <string name="zone_auto" msgid="334783869352026648">"Automatyczna strefa czasowa"</string>
     <string name="zone_auto_summaryOn" msgid="6142830927278458314">"Użyj strefy czasowej podanej przez sieć"</string>
     <string name="zone_auto_summaryOff" msgid="2597745783162041390">"Użyj strefy czasowej podanej przez sieć"</string>
+    <string name="date_time_24hour_auto" msgid="2117383168985653422">"Automatyczny 24-godzinny"</string>
+    <string name="date_time_24hour_auto_summary" msgid="6351812925651480277">"Użyj ustawień domyślnych dla regionu"</string>
     <string name="date_time_24hour_title" msgid="3203537578602803850">"Format 24-godzinny"</string>
     <string name="date_time_24hour" msgid="1193032284921000063">"Format 24-godzinny"</string>
     <string name="date_time_set_time_title" msgid="6296795651349047016">"Godzina"</string>
@@ -378,6 +380,9 @@
     <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="1961957425135180242">"Dalej"</string>
+    <string name="setup_fingerprint_enroll_skip_title" msgid="362050541117362034">"Pominąć odcisk palca?"</string>
+    <string name="setup_fingerprint_enroll_skip_after_adding_lock_text" msgid="958990414356204763">"Zapisanie odcisku palca zajmuje tylko chwilę. Zawsze możesz go dodać później w ustawieniach."</string>
+    <string name="lock_screen_intro_skip_title" msgid="4988210105913705679">"Pominąć blokadę ekranu?"</string>
     <string name="lock_screen_intro_skip_dialog_text_frp" product="tablet" msgid="1581834104051243425">"Zabezpieczenia urządzenia nie zostaną włączone. Nie będzie można uniemożliwić innym osobom korzystania z tego tabletu, gdy zostanie zgubiony, skradziony lub zresetowany."</string>
     <string name="lock_screen_intro_skip_dialog_text_frp" product="device" msgid="4629503416877189572">"Zabezpieczenia urządzenia nie zostaną włączone. Nie będzie można uniemożliwić innym osobom korzystania z urządzenia, gdy zostanie zgubione, skradzione lub zresetowane."</string>
     <string name="lock_screen_intro_skip_dialog_text_frp" product="default" msgid="2423428240245737909">"Zabezpieczenia urządzenia nie zostaną włączone. Nie będzie można uniemożliwić innym osobom korzystania z tego telefonu, gdy zostanie zgubiony, skradziony lub zresetowany."</string>
@@ -463,7 +468,7 @@
     <string name="setup_lock_settings_picker_title" product="tablet" msgid="90329443364067215">"Chroń swój tablet"</string>
     <string name="setup_lock_settings_picker_title" product="device" msgid="2399952075134938929">"Chroń swoje urządzenie"</string>
     <string name="setup_lock_settings_picker_title" product="default" msgid="1572244299605153324">"Zabezpiecz telefon"</string>
-    <string name="setup_lock_settings_picker_fingerprint_message" msgid="5585650064305600578">"Ze względów bezpieczeństwa skonfiguruj zapasową blokadę ekranu."</string>
+    <string name="lock_settings_picker_fingerprint_added_security_message" msgid="5768002109707648463">"Dla większego bezpieczeństwa skonfiguruj zapasową blokadę ekranu."</string>
     <string name="setup_lock_settings_picker_message" product="tablet" msgid="8919671129189936210">"Włącz funkcje ochrony urządzenia, by zablokować innym możliwość używania tego tabletu bez Twojej zgody. Wybierz rodzaj blokady ekranu."</string>
     <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>
@@ -606,10 +611,11 @@
     <string name="lockpassword_pin_no_sequential_digits" msgid="680765285206990584">"Ciąg cyfr rosnących, malejących lub powtarzających się jest niedozwolony"</string>
     <string name="lockpassword_ok_label" msgid="313822574062553672">"OK"</string>
     <string name="lockpassword_cancel_label" msgid="8818529276331121899">"Anuluj"</string>
+    <string name="lockpassword_clear_label" msgid="5724429464960458155">"OK"</string>
     <string name="lockpattern_tutorial_cancel_label" msgid="6431583477570493261">"Anuluj"</string>
     <string name="lockpattern_tutorial_continue_label" msgid="3559793618653400434">"Dalej"</string>
     <string name="lock_setup" msgid="3355847066343753943">"Konfiguracja została ukończona."</string>
-    <string name="manage_device_admin" msgid="537804979483211453">"Aplikacje do administrowania urządzeniem"</string>
+    <string name="manage_device_admin" msgid="537804979483211453">"Aplikacje do zarządzania urządzeniem"</string>
     <string name="number_of_device_admins_none" msgid="7185056721919496069">"Brak aktywnych aplikacji"</string>
     <plurals name="number_of_device_admins" formatted="false" msgid="3361891840111523393">
       <item quantity="few"><xliff:g id="COUNT_1">%d</xliff:g> aktywne aplikacje</item>
@@ -765,7 +771,7 @@
     <string name="wifi_limit_optimizations_summary" msgid="9000801068363468950">"Limit użycia baterii dla Wi‑Fi"</string>
     <string name="wifi_switch_away_when_unvalidated" msgid="1707247692180853058">"Przełącz na mobilną transmisję danych, jeśli Wi-Fi utraci dostęp do internetu."</string>
     <string name="wifi_cellular_data_fallback_title" msgid="8753386877755616476">"Automatycznie przełączaj na mobilną transmisję danych"</string>
-    <string name="wifi_cellular_data_fallback_summary" msgid="6375399280719867214">"Używaj mobilnej transmisji danych, gdy sieć Wi-Fi nie ma dostępu do internetu. Mogą obowiązywać opłaty za transmisję danych."</string>
+    <string name="wifi_cellular_data_fallback_summary" msgid="6375399280719867214">"Używaj mobilnej transmisji danych, gdy sieć Wi-Fi nie ma dostępu do internetu. Mogą obowiązywać opłaty za użycie danych."</string>
     <string name="wifi_add_network" msgid="6234851776910938957">"Dodaj sieć"</string>
     <string name="wifi_configure_settings_preference_title" msgid="2913345003906899146">"Ustawienia Wi‑Fi"</string>
     <string name="wifi_configure_settings_preference_summary_wakeup_on" msgid="646393113104367290">"Wi‑Fi włączy się automatycznie"</string>
@@ -803,6 +809,7 @@
     <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>
@@ -839,6 +846,8 @@
     <string name="wifi_wps_available_first_item" msgid="4422547079984583502">"Protokół WPS jest dostępny"</string>
     <string name="wifi_wps_available_second_item" msgid="8427520131718215301">" (protokół WPS dostępny)"</string>
     <string name="wifi_wps_nfc_enter_password" msgid="2288214226916117159">"Podaj hasło do sieci"</string>
+    <string name="wifi_carrier_connect" msgid="8174696557882299911">"Sieć Wi‑Fi operatora"</string>
+    <string name="wifi_carrier_content" msgid="4634077285415851933">"Połącz przez: <xliff:g id="NAME">%1%s</xliff:g>"</string>
     <string name="wifi_scan_always_turnon_message" msgid="203123538572122989">"Aby zwiększyć dokładność lokalizacji (i w innych celach), <xliff:g id="APP_NAME">%1$s</xliff:g> chce włączyć skanowanie sieci – nawet gdy Wi-Fi jest wyłączone.\n\nZezwolić na to wszystkim aplikacjom, które chcą wykonywać skanowanie?"</string>
     <string name="wifi_scan_always_turnoff_message" msgid="5538901671131941043">"Aby wyłączyć tę opcję, w rozszerzonym menu otwórz Zaawansowane."</string>
     <string name="wifi_scan_always_confirm_allow" msgid="5355973075896817232">"Zezwól"</string>
@@ -849,13 +858,14 @@
     <string name="no_internet_access_text" msgid="7133561752896706392">"Ta sieć nie ma dostępu do internetu. Nadal chcesz się z nią łączyć?"</string>
     <string name="no_internet_access_remember" msgid="4697314331614625075">"Nie pytaj ponownie o tę sieć"</string>
     <string name="lost_internet_access_title" msgid="6228530645663584505">"Sieć Wi-Fi nie jest połączona z internetem"</string>
-    <string name="lost_internet_access_text" msgid="9029649339816197345">"Gdy połączenie sieci Wi-Fi z internetem jest słabe, możesz przełączać się na sieć komórkową. Mogą być naliczane opłaty za transmisję danych."</string>
+    <string name="lost_internet_access_text" msgid="9029649339816197345">"Gdy połączenie sieci Wi-Fi z internetem jest słabe, możesz przełączać się na sieć komórkową. Mogą być naliczane opłaty za użycie danych."</string>
     <string name="lost_internet_access_switch" msgid="2262459569601190039">"Przełącz na sieć komórkową"</string>
     <string name="lost_internet_access_cancel" msgid="338273139419871110">"Pozostań przy Wi-Fi"</string>
     <string name="lost_internet_access_persist" msgid="7634876061262676255">"Nie pokazuj już nigdy"</string>
     <string name="wifi_connect" msgid="1076622875777072845">"Połącz"</string>
     <string name="wifi_failed_connect_message" msgid="8491902558970292871">"Nie można nawiązać połączenia z siecią"</string>
     <string name="wifi_forget" msgid="8168174695608386644">"Zapomnij"</string>
+    <string name="wifi_modify" msgid="6100248070440710782">"Zmień"</string>
     <string name="wifi_failed_forget_message" msgid="1348172929201654986">"Nie udało się zapomnieć sieci"</string>
     <string name="wifi_save" msgid="3331121567988522826">"Zapisz"</string>
     <string name="wifi_failed_save_message" msgid="6650004874143815692">"Nie udało się zapisać sieci"</string>
@@ -870,6 +880,7 @@
     <string name="wifi_advanced_titlebar" msgid="4485841401774142908">"Zaawansowane"</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_title" msgid="3471132676909349382">"Informacje o sieci"</string>
     <string name="wifi_details_subnet_mask" msgid="6720279144174924410">"Maska podsieci"</string>
     <string name="wifi_details_dns" msgid="8648826607751830768">"DNS"</string>
     <string name="wifi_details_ipv6_address_header" msgid="6734119149106422148">"Adresy IPv6"</string>
@@ -902,16 +913,15 @@
     <string name="wifi_p2p_cancel_connect_title" msgid="255267538099324413">"Anulować zaproszenie?"</string>
     <string name="wifi_p2p_cancel_connect_message" msgid="7477756213423749402">"Czy chcesz anulować zaproszenie do połączenia z <xliff:g id="PEER_NAME">%1$s</xliff:g>?"</string>
     <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_off_subtext" msgid="5466126533609394170">"Nie udostępniam internetu ani treści innym urządzeniom"</string>
     <string name="wifi_hotspot_tethering_on_subtext" product="tablet" msgid="5752490509369962007">"Udostępniam połączenie internetowe tabletu przez hotspot"</string>
     <string name="wifi_hotspot_tethering_on_subtext" product="default" msgid="6461075246164300670">"Udostępniam połączenie internetowe telefonu przez hotspot"</string>
     <string name="wifi_hotspot_on_local_only_subtext" msgid="2068110388011294735">"Aplikacja udostępnia treści. Aby udostępnić połączenie internetowe, wyłącz i ponownie włącz hostpot"</string>
-    <string name="wifi_hotspot_name_title" msgid="1341735529132128887">"Nazwa Wi‑Fi"</string>
+    <string name="wifi_hotspot_name_title" msgid="8237000746618636778">"Nazwa hotspota"</string>
     <string name="wifi_hotspot_name_summary_connecting" msgid="3378299995508671967">"Włączam: <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>..."</string>
     <string name="wifi_hotspot_name_summary_connected" msgid="3888672084861445362">"Inne urządzenia mogą łączyć się z: <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>"</string>
-    <string name="wifi_hotspot_password_title" msgid="1955592302902091281">"Hasło Wi-Fi"</string>
+    <string name="wifi_hotspot_password_title" msgid="8676859981917573801">"Hasło do hotspota"</string>
     <string name="wifi_hotspot_ap_band_title" msgid="1165801173359290681">"Pasmo punktu dostępu"</string>
     <string name="wifi_hotspot_footer_info_regular" msgid="1203489406068036455">"Użyj hotspotu do utworzenia sieci Wi-Fi dla innych urządzeń. Hotspot zapewnia dostęp do internetu, korzystając z połączenia mobilnej transmisji danych. Mogą zostać naliczone dodatkowe opłaty za transfer danych."</string>
     <string name="wifi_hotspot_footer_info_local_only" msgid="857988412470694109">"Aplikacje mogą utworzyć hotspot, by udostępniać treści urządzeniom w pobliżu."</string>
@@ -922,7 +932,6 @@
     <string name="wifi_tether_configure_ap_text" msgid="7974681394041609308">"Skonfiguruj hotspot Wi-Fi"</string>
     <string name="wifi_hotspot_configure_ap_text" msgid="5478614731464220432">"Konfiguracja hotspotu Wi‑Fi"</string>
     <string name="wifi_hotspot_configure_ap_text_summary" msgid="5560680057727007011">"Hotspot AndroidAP WPA2 PSK"</string>
-    <string name="wifi_tether_configure_subtext" msgid="2050196439900426456">"Hotspot <xliff:g id="NETWORK_SSID">%1$s</xliff:g> <xliff:g id="NETWORK_SECURITY">%2$s</xliff:g>"</string>
     <string name="wifi_tether_configure_ssid_default" msgid="8467525402622138547">"Punkt dostępu Android"</string>
     <string name="wifi_calling_settings_title" msgid="4102921303993404577">"Połączenia przez Wi-Fi"</string>
     <string name="wifi_calling_suggestion_title" msgid="9008010480466359578">"Włącz funkcję połączeń przez Wi-Fi"</string>
@@ -963,7 +972,7 @@
     <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="emergency_address_summary" msgid="3266760199681945746">"Adres, który służby ratunkowe będą traktować jako Twoją lokalizację, jeśli zadzwonisz pod numer alarmowy przez Wi-Fi"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"Wyświetlacz"</string>
     <string name="sound_settings" msgid="5534671337768745343">"Dźwięk"</string>
     <string name="all_volume_title" msgid="4296957391257836961">"Głośność"</string>
@@ -1017,6 +1026,7 @@
     <string name="search_settings" msgid="1910951467596035063">"Wyszukiwanie"</string>
     <string name="search_settings_summary" msgid="9205656546570654169">"Zarządzaj ustawieniami i historią wyszukiwania"</string>
     <string name="search_settings_no_results" msgid="8799027492641230999">"Brak wyników"</string>
+    <string name="search_clear_history" msgid="4196658962573162457">"Wyczyść historię"</string>
     <string name="display_settings" msgid="7965901687241669598">"Wyświetlacz"</string>
     <string name="accelerometer_title" msgid="7854608399547349157">"Autoobracanie ekranu"</string>
     <string name="color_mode_title" msgid="3159275920408338215">"Żywe kolory"</string>
@@ -1086,7 +1096,7 @@
     <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="ambient_display_screen_title" msgid="4252755516328775766">"Ekran dostosowany do otoczenia"</string>
+    <string name="ambient_display_screen_title" msgid="4252755516328775766">"Ekran zgodny z otoczeniem"</string>
     <string name="ambient_display_screen_summary_always_on" msgid="7337555569694794132">"Zawsze włączony/ Zwiększone zużycie baterii"</string>
     <string name="ambient_display_screen_summary_notifications" msgid="1449570742600868654">"Nowe powiadomienia"</string>
     <string name="ambient_display_category_triggers" msgid="4359289754456268573">"Kiedy wyświetlać"</string>
@@ -1148,7 +1158,6 @@
     <string name="baseband_version" msgid="1848990160763524801">"Wersja pasma podstawowego"</string>
     <string name="kernel_version" msgid="9192574954196167602">"Wersja jądra"</string>
     <string name="build_number" msgid="3075795840572241758">"Numer kompilacji"</string>
-    <string name="selinux_status" msgid="6212165375172061672">"Stan SELinux"</string>
     <string name="device_info_not_available" msgid="8062521887156825182">"Niedostępna"</string>
     <string name="device_status_activity_title" msgid="1411201799384697904">"Stan telefonu"</string>
     <string name="device_status" msgid="607405385799807324">"Stan telefonu"</string>
@@ -1176,7 +1185,6 @@
     <string name="status_wifi_mac_address" msgid="2202206684020765378">"Adres MAC karty Wi-Fi"</string>
     <string name="status_bt_address" msgid="4195174192087439720">"Adres Bluetooth"</string>
     <string name="status_serial_number" msgid="2257111183374628137">"Numer seryjny"</string>
-    <string name="status_unavailable" msgid="7862009036663793314">"Niedostępny"</string>
     <string name="status_up_time" msgid="7294859476816760399">"Czas działania"</string>
     <string name="status_awake_time" msgid="2393949909051183652">"Czas działania (włączony)"</string>
     <string name="internal_memory" msgid="9129595691484260784">"Pamięć wewnętrzna"</string>
@@ -1352,6 +1360,7 @@
     <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="6254873816990678620">"Zresetuj opcje"</string>
+    <string name="reset_dashboard_summary" msgid="4851012632493522755">"Można zresetować sieć, aplikacje lub urządzenie"</string>
     <string name="reset_network_title" msgid="6166025966016873843">"Zresetuj Wi-Fi, sieć komórkową i Bluetooth"</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>
@@ -1360,19 +1369,14 @@
     <string name="reset_network_confirm_title" msgid="1759888886976962773">"Zresetować?"</string>
     <string name="network_reset_not_available" msgid="7188610385577164676">"Resetowanie sieci nie jest dostępne dla tego użytkownika"</string>
     <string name="reset_network_complete_toast" msgid="787829973559541880">"Ustawienia sieciowe zostały zresetowane"</string>
-    <string name="master_clear_title" msgid="6617679904229218425">"Wykasuj wszystkie dane (przywróć dane fabryczne)"</string>
-    <plurals name="master_clear_with_account_summary" formatted="false" msgid="5911377203778818712">
-      <item quantity="few"><xliff:g id="ACCOUNT_COUNT">%1$d</xliff:g> konta zostaną zresetowane</item>
-      <item quantity="many"><xliff:g id="ACCOUNT_COUNT">%1$d</xliff:g> kont zostanie zresetowanych</item>
-      <item quantity="other"><xliff:g id="ACCOUNT_COUNT">%1$d</xliff:g> konta zostanie zresetowane</item>
-      <item quantity="one">1 konto zostanie zresetowane</item>
-    </plurals>
-    <string name="master_clear_summary" msgid="6902443944660426951">"Pamięć wewnętrzna i wszystkie dane zostaną zresetowane"</string>
+    <string name="master_clear_title" msgid="3531267871084279512">"Wykasuj wszystkie dane (przywróć dane fabryczne)"</string>
     <string name="master_clear_desc" product="tablet" msgid="9146059417023157222">"Zostaną usunięte wszystkie dane z "<b>"wewnętrznej pamięci"</b>" tabletu, w tym:\n\n"<li>"Dane konta Google"</li>\n<li>"Dane i ustawienia systemu oraz aplikacji"</li>\n<li>"Pobrane aplikacje"</li></string>
     <string name="master_clear_desc" product="default" msgid="4800386183314202571">"Zostaną usunięte wszystkie dane z "<b>"wewnętrznej pamięci"</b>" telefonu, w tym:\n\n"<li>"Dane konta Google"</li>\n<li>"Dane i ustawienia systemu oraz aplikacji"</li>\n<li>"Pobrane aplikacje"</li></string>
-    <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"Zalogowano się na konta:\n"</string>
+    <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"W tej chwili używasz kont:\n"</string>
     <string name="master_clear_other_users_present" product="default" msgid="5161423070702470742">\n\n"Z tego urządzenia korzystają inni użytkownicy.\n"</string>
     <string name="master_clear_desc_also_erases_external" msgid="1903185203791274237"><li>"Muzyka"</li>\n<li>"Zdjęcia"</li>\n<li>"Inne dane użytkownika"</li></string>
+    <string name="master_clear_desc_also_erases_esim" msgid="312352697653096008"><li>"Operatorzy na karcie eSIM"</li></string>
+    <string name="master_clear_desc_no_cancel_mobile_plan" msgid="5460926449093211144">\n\n"Nie spowoduje to anulowania Twojego abonamentu w sieci komórkowej."</string>
     <string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="7744115866662613411">\n\n"Aby usunąć muzykę, zdjęcia i inne dane użytkownika, należy wymazać "<b>"nośnik USB"</b>"."</string>
     <string name="master_clear_desc_erase_external_storage" product="default" msgid="4801026652617377093">\n\n"Aby usunąć muzykę, zdjęcia i inne dane użytkownika, należy wymazać "<b>"kartę SD"</b>"."</string>
     <string name="erase_external_storage" product="nosdcard" msgid="969364037450286809">"Wyczyść nośnik USB"</string>
@@ -1489,15 +1493,16 @@
     <string name="settings_safetylegal_activity_title" msgid="6901214628496951727">"Informacje o bezpieczeństwie"</string>
     <string name="settings_safetylegal_activity_unreachable" msgid="250674109915859456">"Brak połączenia transmisji danych. Aby wyświetlić te informacje teraz, przejdź do strony %s na dowolnym komputerze połączonym z internetem."</string>
     <string name="settings_safetylegal_activity_loading" msgid="8059022597639516348">"Wczytuję..."</string>
-    <string name="lockpassword_choose_your_password_header" msgid="8624900666929394990">"Wybierz hasło"</string>
-    <string name="lockpassword_choose_your_password_header_for_fingerprint" msgid="6624409510609085450">"Aby korzystać z odcisku palca, ustaw hasło"</string>
-    <string name="lockpassword_choose_your_pattern_header" msgid="6949761069941694050">"Wybierz wzór"</string>
-    <string name="lockpassword_choose_your_pattern_header_for_fingerprint" msgid="5901096361617543819">"Aby korzystać z odcisku palca, ustaw wzór"</string>
-    <string name="lockpassword_choose_your_pin_header" msgid="7598849519816138302">"Wybierz kod PIN"</string>
-    <string name="lockpassword_choose_your_pin_header_for_fingerprint" msgid="765344692615917183">"Aby korzystać z odcisku palca, ustaw kod PIN"</string>
-    <string name="lockpassword_confirm_your_password_header" msgid="6308478184889846633">"Potwierdź hasło"</string>
+    <string name="lockpassword_choose_your_screen_lock_header" msgid="3872462096767152394">"Ustawianie blokady ekranu"</string>
+    <string name="lockpassword_choose_your_password_message" msgid="1197569283524841412">"Ze względów bezpieczeństwa ustaw hasło"</string>
+    <string name="lockpassword_choose_your_password_header_for_fingerprint" msgid="2541818487015343503">"Aby używać odcisku palca, ustaw hasło"</string>
+    <string name="lockpassword_choose_your_pattern_header_for_fingerprint" msgid="7709785406243556723">"Aby używać odcisku palca, ustaw wzór"</string>
+    <string name="lockpassword_choose_your_pin_message" msgid="1875420718677275646">"Ze względów bezpieczeństwa ustaw kod PIN"</string>
+    <string name="lockpassword_choose_your_pin_header_for_fingerprint" msgid="1549639053195796674">"Aby używać odcisku palca, ustaw kod PIN"</string>
+    <string name="lockpassword_choose_your_pattern_message" msgid="5986983400689720015">"Ze względów bezpieczeństwa ustaw wzór"</string>
+    <string name="lockpassword_confirm_your_password_header" msgid="1266027268220850931">"Podaj ponownie hasło"</string>
     <string name="lockpassword_confirm_your_pattern_header" msgid="7543433733032330821">"Potwierdź wzór"</string>
-    <string name="lockpassword_confirm_your_pin_header" msgid="49038294648213197">"Potwierdź PIN"</string>
+    <string name="lockpassword_confirm_your_pin_header" msgid="7744513791910572550">"Podaj ponownie kod PIN"</string>
     <string name="lockpassword_confirm_passwords_dont_match" msgid="5140892109439191415">"Hasła nie są takie same"</string>
     <string name="lockpassword_confirm_pins_dont_match" msgid="7226244811505606217">"Kody PIN nie są takie same"</string>
     <string name="lockpassword_choose_lock_generic_header" msgid="3811438094903786145">"Wybór blokady"</string>
@@ -1516,6 +1521,12 @@
     <string name="lockpassword_strong_auth_required_work_pattern" msgid="3003781907040522053">"Ze względów bezpieczeństwa podaj wzór do profilu do pracy"</string>
     <string name="lockpassword_strong_auth_required_work_pin" msgid="3367491332598821552">"Ze względów bezpieczeństwa podaj kod PIN do profilu do pracy"</string>
     <string name="lockpassword_strong_auth_required_work_password" msgid="8159775129968582940">"Ze względów bezpieczeństwa podaj hasło do profilu do pracy"</string>
+    <string name="lockpassword_confirm_your_pattern_details_frp" msgid="6757336656791723193">"Telefon został zresetowany do ustawień fabrycznych. Aby korzystać z tego telefonu, wprowadź poprzedni wzór."</string>
+    <string name="lockpassword_confirm_your_pin_details_frp" msgid="826520613445990470">"Telefon został zresetowany do ustawień fabrycznych. Aby korzystać z tego telefonu, wprowadź poprzedni kod PIN."</string>
+    <string name="lockpassword_confirm_your_password_details_frp" msgid="8944081074615739040">"Telefon został zresetowany do ustawień fabrycznych. Aby korzystać z tego telefonu, wpisz poprzednie hasło."</string>
+    <string name="lockpassword_confirm_your_pattern_header_frp" msgid="2898036091609128286">"Zweryfikuj wzór"</string>
+    <string name="lockpassword_confirm_your_pin_header_frp" msgid="4141601774778898803">"Zweryfikuj PIN"</string>
+    <string name="lockpassword_confirm_your_password_header_frp" msgid="3762615419295360480">"Zweryfikuj hasło"</string>
     <string name="lockpassword_invalid_pin" msgid="15588049067548470">"Nieprawidłowy kod PIN"</string>
     <string name="lockpassword_invalid_password" msgid="4038507398784975200">"Nieprawidłowe hasło"</string>
     <string name="lockpattern_need_to_unlock_wrong" msgid="1745247595356012176">"Nieprawidłowy wzór"</string>
@@ -1565,7 +1576,6 @@
     <string name="install_applications_title" msgid="4987712352256508946">"Zezwalaj na wszystkie źródła"</string>
     <string name="recent_app_category_title" msgid="6673071268966003928">"Niedawno otwierane aplikacje"</string>
     <string name="see_all_apps_title" msgid="1317153498074308438">"Wyświetl wszystkie aplikacje (<xliff:g id="COUNT">%1$d</xliff:g>)"</string>
-    <string name="recent_app_summary" msgid="3366446669844932300">"<xliff:g id="TIME">^1</xliff:g> temu"</string>
     <string name="install_all_warning" product="tablet" msgid="8310489909586138165">"Tablet i dane osobiste są bardziej narażone na atak nieznanych aplikacji. Instalując aplikacje z tego źródła, przyjmujesz odpowiedzialność za wszelkie uszkodzenia telefonu bądź utratę danych, które mogą być spowodowane używaniem tych aplikacji."</string>
     <string name="install_all_warning" product="default" msgid="1952257127370115988">"Telefon i dane osobiste są bardziej narażone na atak nieznanych aplikacji. Instalując aplikacje z tego źródła, przyjmujesz odpowiedzialność za wszelkie uszkodzenia telefonu bądź utratę danych, które mogą być spowodowane używaniem tych aplikacji."</string>
     <string name="advanced_settings" msgid="1777249286757067969">"Ustawienia zaawansowane"</string>
@@ -1828,10 +1838,10 @@
     <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 ekranu, wyświetlacz, sterowanie interakcją"</string>
+    <string name="accessibility_settings_summary" msgid="981260486011624939">"Czytniki, wyświetlacz, sterowanie interakcją"</string>
     <string name="vision_settings_title" msgid="4204111425716868288">"Dla niedowidzących"</string>
     <string name="vision_settings_description" msgid="5679491180156408260">"Możesz dostosować urządzenie do swoich potrzeb. Ułatwienia dostępu możesz zawsze zmienić w Ustawieniach."</string>
-    <string name="vision_settings_suggestion_title" msgid="917294957154878441">"Zwiększ rozmiar czcionki"</string>
+    <string name="vision_settings_suggestion_title" msgid="8058794060304707004">"Zmień rozmiar czcionki"</string>
     <string name="screen_reader_category_title" msgid="7739154903913400641">"Czytniki ekranu"</string>
     <string name="audio_and_captions_category_title" msgid="3420727114421447524">"Dźwięk i tekst na ekranie"</string>
     <string name="display_category_title" msgid="685461049938269166">"Wyświetlacz"</string>
@@ -1868,7 +1878,6 @@
     <string name="accessibility_display_inversion_preference_subtitle" msgid="7052959202195368109">"Może wpłynąć na wydajność"</string>
     <string name="accessibility_autoclick_preference_title" msgid="7014499339068449623">"Kliknij, gdy wskaźnik się zatrzyma"</string>
     <string name="accessibility_autoclick_delay_preference_title" msgid="3962261178385106006">"Opóźnienie przed kliknięciem"</string>
-    <string name="preference_summary_default_combination" msgid="8532964268242666060">"<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">"WŁ."</string>
     <string name="accessibility_summary_state_disabled" msgid="2241315620132005595">"WYŁ."</string>
     <string name="enable_quick_setting" msgid="2366999897816894536">"Pokaż w szybkich ustawieniach"</string>
@@ -2001,12 +2010,14 @@
     <string name="background_activity_summary_on" msgid="649282072540085599">"Nieużywana aplikacja może działać w tle"</string>
     <string name="background_activity_summary_off" msgid="7666330699090632040">"Aktywność nieużywanej aplikacji w tle jest ograniczona"</string>
     <string name="background_activity_summary_disabled" msgid="3710669050484599847">"Aplikacja nie może działać w tle"</string>
+    <string name="background_activity_summary_whitelisted" msgid="7375400051141016808">"Nie można zoptymalizować aplikacji pod kątem zużycia baterii"</string>
+    <string name="background_activity_warning_dialog_title" msgid="2216249969149568871">"Ograniczyć aktywność w tle?"</string>
+    <string name="background_activity_warning_dialog_text" msgid="7049624449246121981">"Jeśli ograniczysz aktywność aplikacji w tle, może ona działać nieprawidłowo"</string>
     <string name="device_screen_usage" msgid="3386088035570409683">"Wykorzystanie przez ekran od ostatniego naładowania"</string>
     <string name="device_screen_consumption" msgid="4607589286438986687">"Zużycie przez ekran"</string>
     <string name="device_cellular_network" msgid="4724773411762382950">"Skanowanie sieci komórkowej"</string>
-    <string name="power_last_full_charge_summary" msgid="532845389094620657">"<xliff:g id="TIME">^1</xliff:g> temu"</string>
-    <string name="power_usage_list_summary" msgid="6775339745194635000">"Wykorzystanie od pełnego naładowania (<xliff:g id="TIME">^1</xliff:g> temu)"</string>
-    <string name="power_usage_list_summary_device" msgid="7036566616386864302">"Zużycie przez urządzenie od pełnego naładowania (<xliff:g id="TIME">^1</xliff:g> temu)"</string>
+    <string name="power_usage_list_summary" msgid="6393929085382334341">"Zużycie przez aplikację od pełnego naładowania (<xliff:g id="RELATIVE_TIME">^1</xliff:g>)"</string>
+    <string name="power_usage_list_summary_device" msgid="4461926045610455423">"Zużycie przez urządzenie od pełnego naładowania (<xliff:g id="RELATIVE_TIME">^1</xliff:g>)"</string>
     <string name="screen_usage_summary" msgid="6687403051423153550">"Czas włączenia ekranu od pełnego naładowania"</string>
     <string name="device_usage_list_summary" msgid="5623036661468763251">"Wykorzystanie przez urządzenie od ostatniego naładowania"</string>
     <string name="battery_since_unplugged" msgid="338073389740738437">"Użycie baterii od odłączenia"</string>
@@ -2148,9 +2159,7 @@
     <string name="battery_saver_turn_on_automatically_title" msgid="9023847300114669426">"Włącz automatycznie"</string>
     <string name="battery_saver_turn_on_automatically_never" msgid="6610846456314373">"Nigdy"</string>
     <string name="battery_saver_turn_on_automatically_pct" msgid="8665950426992057191">"przy <xliff:g id="PERCENT">%1$s</xliff:g> baterii"</string>
-    <!-- String.format failed for translation -->
-    <!-- no translation found for battery_percentage (723291197508049369) -->
-    <skip />
+    <string name="battery_percentage" msgid="723291197508049369">"Poziom naładowania baterii w %%"</string>
     <string name="battery_percentage_description" msgid="8511658577507384014">"Pokazuj procentowy poziom naładowania baterii na pasku stanu"</string>
     <string name="process_stats_summary_title" msgid="1144688045609771677">"Statystyki procesów"</string>
     <string name="process_stats_summary" msgid="109387941605607762">"Rozbudowane statystyki uruchomionych procesów"</string>
@@ -2254,14 +2263,14 @@
     <string name="credentials_unlock_hint" msgid="2301301378040499348">"Podaj hasło do magazynu danych logowania."</string>
     <string name="credentials_old_password" msgid="7553393815538684028">"Bieżące hasło:"</string>
     <string name="credentials_reset_hint" msgid="6297256880896133631">"Usunąć całą zawartość?"</string>
-    <string name="credentials_password_too_short" msgid="7502749986405522663">"Hasło musi mieć co najmniej 8 znaków."</string>
     <string name="credentials_wrong_password" msgid="2541932597104054807">"Nieprawidłowe hasło."</string>
     <string name="credentials_reset_warning" msgid="5320653011511797600">"Nieprawidłowe hasło. Pozostała jedna próba przed wyczyszczeniem magazynu danych logowania."</string>
     <string name="credentials_reset_warning_plural" msgid="6514085665301095279">"Nieprawidłowe hasło. Pozostała liczba prób przed wyczyszczeniem magazynu danych logowania: <xliff:g id="NUMBER">%1$d</xliff:g>."</string>
     <string name="credentials_erased" msgid="2907836028586342969">"Wyczyszczono magazyn danych logowania."</string>
     <string name="credentials_not_erased" msgid="7685932772284216097">"Nie można wymazać magazynu."</string>
     <string name="credentials_enabled" msgid="7588607413349978930">"Magazyn danych logowania jest włączony."</string>
-    <string name="credentials_configure_lock_screen_hint" msgid="6757119179588664966">"Aby korzystać z magazynu danych logowania, musisz ustawić kod PIN lub hasło blokady ekranu."</string>
+    <string name="credentials_configure_lock_screen_hint" msgid="8058230497337529036">"Jeśli chcesz korzystać z magazynu danych logowania, musisz skonfigurować na urządzeniu ekran blokady"</string>
+    <string name="credentials_configure_lock_screen_button" msgid="253239765216055321">"USTAW BLOKADĘ"</string>
     <string name="usage_access_title" msgid="332333405495457839">"Aplikacje monitorujące"</string>
     <string name="emergency_tone_title" msgid="1055954530111587114">"Sygnał alarmowy"</string>
     <string name="emergency_tone_summary" msgid="722259232924572153">"Skonfiguruj sposób działania w przypadku połączenia alarmowego"</string>
@@ -2285,7 +2294,7 @@
     <string name="remove_device_admin" msgid="9207368982033308173">"Dezaktywuj tę aplikację do administrowania urządzeniem"</string>
     <string name="uninstall_device_admin" msgid="271120195128542165">"Odinstaluj aplikację"</string>
     <string name="remove_and_uninstall_device_admin" msgid="3837625952436169878">"Dezaktywuj i odinstaluj"</string>
-    <string name="select_device_admin_msg" msgid="7347389359013278077">"Aplikacje do administrowania urządzeniem"</string>
+    <string name="select_device_admin_msg" msgid="7347389359013278077">"Aplikacje do zarządzania urządzeniem"</string>
     <string name="no_device_admins" msgid="4846602835339095768">"Brak dostępnych aplikacji do administrowania urządzeniem"</string>
     <string name="personal_device_admin_title" msgid="2849617316347669861">"Osobiste"</string>
     <string name="managed_device_admin_title" msgid="7853955652864478435">"Praca"</string>
@@ -2381,8 +2390,6 @@
     <skip />
     <string name="cant_sync_dialog_title" msgid="2777238588398046285">"Nie można zsynchronizować ręcznie"</string>
     <string name="cant_sync_dialog_message" msgid="1938380442159016449">"Synchronizacja tego elementu jest obecnie wyłączona. Aby zmienić ustawienie, tymczasowo włącz obsługę danych w tle i automatyczną synchronizację."</string>
-    <string name="wimax_settings" msgid="2655139497028469039">"4G"</string>
-    <string name="status_wimax_mac_address" msgid="8390791848661413416">"Adres MAC 4G"</string>
     <string name="enter_password" msgid="8035706727471334122">"Aby uruchomić Androida, wpisz hasło"</string>
     <string name="enter_pin" msgid="5305333588093263790">"Aby uruchomić Androida, wpisz kod PIN"</string>
     <string name="enter_pattern" msgid="4187435713036808566">"Aby uruchomić Androida, narysuj wzór"</string>
@@ -2396,14 +2403,15 @@
     <string name="misc_files_selected_count" msgid="4647048020823912088">"wybrano <xliff:g id="NUMBER">%1$d</xliff:g> z <xliff:g id="TOTAL">%2$d</xliff:g>"</string>
     <string name="misc_files_selected_count_bytes" msgid="2876232009069114352">"<xliff:g id="NUMBER">%1$s</xliff:g> z <xliff:g id="TOTAL">%2$s</xliff:g>"</string>
     <string name="select_all" msgid="1562774643280376715">"Wybierz wszystkie"</string>
+    <string name="data_plan_usage_manage_plans_button_text" msgid="8997761990902708162">"Zarządzaj abonamentami"</string>
     <string name="data_usage_summary_title" msgid="3804110657238092929">"Użycie danych"</string>
-    <string name="data_usage_app_summary_title" msgid="4147258989837459172">"Przesył danych w aplikacji"</string>
+    <string name="data_usage_app_summary_title" msgid="4147258989837459172">"Użycie danych w aplikacji"</string>
     <string name="data_usage_accounting" msgid="7170028915873577387">"Operator sieci komórkowej może obliczać ilość przesłanych danych inaczej niż urządzenie."</string>
     <string name="data_usage_app" msgid="4970478397515423303">"Transmisja danych w aplikacjach"</string>
     <string name="data_usage_app_info_label" msgid="3409931235687866706">"INFORMACJE O APLIKACJI"</string>
     <string name="data_usage_cellular_data" msgid="9168928285122125137">"Mobilna transmisja danych"</string>
     <string name="data_usage_data_limit" msgid="1193930999713192703">"Ustaw limit transmisji danych"</string>
-    <string name="data_usage_cycle" msgid="5652529796195787949">"Cykl transmisji danych"</string>
+    <string name="data_usage_cycle" msgid="5652529796195787949">"Cykl użycie danych"</string>
     <string name="data_usage_app_items_header_text" msgid="5017850810459372828">"Transmisja danych w aplikacjach"</string>
     <string name="data_usage_menu_roaming" msgid="8042359966835203296">"Roaming danych"</string>
     <string name="data_usage_menu_restrict_background" msgid="1989394568592253331">"Ogranicz dane w tle"</string>
@@ -2422,7 +2430,7 @@
     <string name="account_settings_menu_auto_sync_personal" msgid="785541379617346438">"Autosynchronizacja: osobiste"</string>
     <string name="account_settings_menu_auto_sync_work" msgid="329565580969147026">"Autosynchronizacja: do pracy"</string>
     <string name="data_usage_change_cycle" msgid="7776556448920114866">"Zmień cykl"</string>
-    <string name="data_usage_pick_cycle_day" msgid="4470796861757050966">"Resetowanie cyklu transmisji danych – dzień miesiąca:"</string>
+    <string name="data_usage_pick_cycle_day" msgid="4470796861757050966">"Resetowanie cyklu użycia danych – dzień miesiąca:"</string>
     <string name="data_usage_empty" msgid="8621855507876539282">"W tym okresie aplikacje nie pobierały danych."</string>
     <string name="data_usage_label_foreground" msgid="4938034231928628164">"Pierwszy plan"</string>
     <string name="data_usage_label_background" msgid="3225844085975764519">"Tło"</string>
@@ -2449,19 +2457,19 @@
     <string name="data_usage_app_restrict_background_summary" msgid="5853552187570622572">"Włącz mobilną transmisję danych w tle"</string>
     <string name="data_usage_app_restrict_background_summary_disabled" msgid="7401927377070755054">"Transmisję danych w tle możesz ograniczyć po ustawieniu limitu."</string>
     <string name="data_usage_app_restrict_dialog_title" msgid="1613108390242737923">"Ograniczyć dane w tle?"</string>
-    <string name="data_usage_app_restrict_dialog" msgid="1466689968707308512">"Gdy będą dostępne tylko sieci komórkowe, funkcja ta może zakłócić działanie aplikacji, które korzystają z przesyłu danych w tle.\n\nSzczegółowe ustawienia transmisji danych są zazwyczaj dostępne bezpośrednio w poszczególnych aplikacjach."</string>
+    <string name="data_usage_app_restrict_dialog" msgid="1466689968707308512">"Gdy będą dostępne tylko sieci komórkowe, funkcja ta może zakłócić działanie aplikacji, które korzystają z przesyłu danych w tle.\n\nSzczegółowe ustawienia użycia danych są zazwyczaj dostępne bezpośrednio w poszczególnych aplikacjach."</string>
     <string name="data_usage_restrict_denied_dialog" msgid="55012417305745608">"Ograniczenie transmisji danych w tle jest możliwe tylko po ustawieniu limitu mobilnej transmisji danych."</string>
     <string name="data_usage_auto_sync_on_dialog_title" msgid="2438617846762244389">"Włączyć autosynchronizację?"</string>
-    <string name="data_usage_auto_sync_on_dialog" product="tablet" msgid="8581983093524041669">"Wszystkie zmiany, które wprowadzisz na swoich kontach w internecie, będą automatycznie kopiowane na Twój telefon.\n\nNiektóre konta mogą też automatycznie kopiować do wersji internetowej wszystkie zmiany, wszystkie zmiany, które wprowadzisz na telefonie.  W ten sposób działa właśnie konto Google."</string>
-    <string name="data_usage_auto_sync_on_dialog" product="default" msgid="8651376294887142858">"Wszystkie zmiany, które wprowadzisz na swoich kontach w internecie, będą automatycznie kopiowane na Twój telefon.\n\nNiektóre konta mogą też automatycznie kopiować do wersji internetowej wszystkie zmiany, wszystkie zmiany, które wprowadzisz na telefonie.  W ten sposób działa właśnie konto Google."</string>
+    <string name="data_usage_auto_sync_on_dialog" product="tablet" msgid="8581983093524041669">"Wszystkie zmiany, które wprowadzisz na swoich kontach w internecie, będą automatycznie kopiowane na Twój telefon.\n\nNiektóre konta mogą też automatycznie kopiować do wersji internetowej wszystkie zmiany, które wprowadzisz na telefonie. W ten sposób działa właśnie konto Google."</string>
+    <string name="data_usage_auto_sync_on_dialog" product="default" msgid="8651376294887142858">"Wszystkie zmiany, które wprowadzisz na swoich kontach w internecie, będą automatycznie kopiowane na Twój telefon.\n\nNiektóre konta mogą też automatycznie kopiować do wersji internetowej wszystkie zmiany, które wprowadzisz na telefonie. W ten sposób działa właśnie konto Google."</string>
     <string name="data_usage_auto_sync_off_dialog_title" msgid="9013139130490125793">"Wyłączyć autosynchronizację?"</string>
     <string name="data_usage_auto_sync_off_dialog" msgid="4025938250775413864">"Powoduje przesyłanie mniejszej ilości danych oraz zmniejsza użycie baterii, ale pobranie najnowszych informacji będzie wymagało ręcznej synchronizacji każdego konta. Poza tym nie będziesz otrzymywać powiadomień o aktualizacjach."</string>
     <string name="data_usage_cycle_editor_title" msgid="1373797281540188533">"Data resetowania cyklu transmisji danych"</string>
     <string name="data_usage_cycle_editor_subtitle" msgid="5512903797979928416">"Data w każdym miesiącu:"</string>
     <string name="data_usage_cycle_editor_positive" msgid="8821760330497941117">"Zapisz"</string>
-    <string name="data_usage_warning_editor_title" msgid="3704136912240060339">"Ustaw ostrzeżenie o transmisji danych"</string>
-    <string name="data_usage_limit_editor_title" msgid="9153595142385030015">"Ustaw limit danych"</string>
-    <string name="data_usage_limit_dialog_title" msgid="3023111643632996097">"Ograniczanie transmisji danych"</string>
+    <string name="data_usage_warning_editor_title" msgid="3704136912240060339">"Ustaw ostrzeżenie o użyciu danych"</string>
+    <string name="data_usage_limit_editor_title" msgid="9153595142385030015">"Ustaw limit użycia danych"</string>
+    <string name="data_usage_limit_dialog_title" msgid="3023111643632996097">"Ograniczanie użycia danych"</string>
     <string name="data_usage_limit_dialog_mobile" product="tablet" msgid="4983487893343645667">"Tablet wyłączy mobilną transmisję danych po osiągnięciu ustawionego limitu.\n\nTablet może obliczać ilość przesłanych danych inaczej niż operator sieci komórkowej, więc najlepiej ustaw zaniżony limit."</string>
     <string name="data_usage_limit_dialog_mobile" product="default" msgid="3926320594049434225">"Telefon wyłączy mobilną transmisję danych po osiągnięciu ustawionego limitu.\n\nTelefon może obliczać ilość przesłanych danych inaczej niż operator sieci komórkowej, więc najlepiej ustaw zaniżony limit."</string>
     <string name="data_usage_restrict_background_title" msgid="2201315502223035062">"Ograniczyć dane w tle?"</string>
@@ -2481,6 +2489,9 @@
     <string name="data_usage_metered_mobile" msgid="5423305619126978393">"Sieci komórkowe"</string>
     <string name="data_usage_metered_wifi" msgid="1761738002328299714">"Sieci Wi‑Fi z pomiarem"</string>
     <string name="data_usage_metered_wifi_disabled" msgid="727808462375941567">"Aby wybrać sieci z pomiarem, włącz Wi-Fi."</string>
+    <string name="data_usage_metered_auto" msgid="1262028400911918865">"Automatycznie"</string>
+    <string name="data_usage_metered_yes" msgid="9217539611385225894">"Użycie danych jest mierzone"</string>
+    <string name="data_usage_metered_no" msgid="4025232961929071789">"Użycie danych nie jest mierzone"</string>
     <string name="data_usage_disclaimer" msgid="6887858149980673444">"Operator komórkowy może obliczać ilość przesłanych danych inaczej niż urządzenie."</string>
     <string name="cryptkeeper_emergency_call" msgid="198578731586097145">"Połączenie alarmowe"</string>
     <string name="cryptkeeper_return_to_call" msgid="5613717339452772491">"Powrót do połączenia"</string>
@@ -2572,9 +2583,6 @@
     <string name="backup_pw_set_button_text" msgid="2387480910044648795">"Ustaw hasło"</string>
     <string name="backup_pw_cancel_button_text" msgid="8845630125391744615">"Anuluj"</string>
     <string name="additional_system_update_settings_list_item_title" msgid="214987609894661992">"Dodatkowe aktualizacje systemu"</string>
-    <string name="selinux_status_disabled" msgid="924551035552323327">"Wyłączony"</string>
-    <string name="selinux_status_permissive" msgid="6004965534713398778">"Pobłażliwy"</string>
-    <string name="selinux_status_enforcing" msgid="2252703756208463329">"Restrykcyjny"</string>
     <string name="ssl_ca_cert_warning" msgid="2045866713601984673">"Sieć może być monitorowana"</string>
     <string name="done_button" msgid="1991471253042622230">"Gotowe"</string>
     <plurals name="ssl_ca_cert_dialog_title" formatted="false" msgid="7145092748045794650">
@@ -2782,9 +2790,10 @@
       <item quantity="other">Pokaż %d ukrytego elementu</item>
       <item quantity="one">Pokaż %d ukryty element</item>
     </plurals>
+    <string name="dashboard_suggestion_condition_footer_content_description" msgid="2898588191174845961">"Zwiń"</string>
     <string name="network_dashboard_title" msgid="4771589228992391573">"Sieć i internet"</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_data_usage" msgid="3843261364705042212">"użycie danych"</string>
     <string name="network_dashboard_summary_hotspot" msgid="8494210248613254574">"hotspot"</string>
     <string name="connected_devices_dashboard_title" msgid="2355264951438890709">"Połączone urządzenia"</string>
     <string name="connected_devices_dashboard_summary" msgid="2390582103384791904">"Bluetooth, przesyłanie, komunikacja NFC"</string>
@@ -2886,8 +2895,14 @@
       <item quantity="other">Włączone <xliff:g id="ON_COUNT">%d</xliff:g> automatycznej reguły</item>
       <item quantity="one">Włączona 1 automatyczna reguła</item>
     </plurals>
-    <string name="zen_mode_settings_title" msgid="842308776768942600">"Ustawienia Nie przeszkadzać"</string>
-    <string name="zen_mode_priority_settings_title" msgid="2623117023031824309">"Tylko priorytetowe"</string>
+    <string name="zen_mode_settings_title" msgid="1066226840983908121">"Nie przeszkadzać"</string>
+    <string name="zen_mode_behavior_settings_title" msgid="1463303933529313969">"Działanie"</string>
+    <string name="zen_mode_behavior_allow_title" msgid="3845615648136218141">"Zezwól na dźwięki i wibracje z"</string>
+    <string name="zen_mode_behavior_no_sound" msgid="1219626004723208056">"Brak dźwięku"</string>
+    <string name="zen_mode_behavior_total_silence" msgid="6716603819806610626">"Brak dźwięku (całkowita cisza)"</string>
+    <string name="zen_mode_behavior_no_sound_except" msgid="4968477585788243114">"Brak dźwięku oprócz: <xliff:g id="CATEGORIES">%1$s</xliff:g>"</string>
+    <!-- no translation found for zen_mode_behavior_alarms_only (2423480992071472963) -->
+    <skip />
     <string name="zen_mode_automation_settings_title" msgid="4228995740594063774">"Automatyczne reguły"</string>
     <string name="zen_mode_automation_suggestion_title" msgid="5105443455143476201">"Ustaw reguły Nie przeszkadzać"</string>
     <string name="zen_mode_automation_suggestion_summary" msgid="4732808039946935657">"Ogranicz dźwięki i wibracje o pewnych porach"</string>
@@ -2929,19 +2944,21 @@
     <string name="notifications_title" msgid="8086372779371204971">"Powiadomienia"</string>
     <string name="app_notifications_title" msgid="5810577805218003760">"Powiadomienia aplikacji"</string>
     <string name="notification_channel_title" msgid="2260666541030178452">"Kategoria powiadomienia"</string>
+    <string name="notification_group_title" msgid="7180506440133859601">"Grupa kategorii powiadomień"</string>
     <string name="notification_importance_title" msgid="848692592679312666">"Ważność"</string>
-    <string name="notification_importance_unspecified" msgid="2196023702875112081">"Do decyzji aplikacji"</string>
+    <string name="notification_importance_unspecified" msgid="6622173510486113958">"Zezwól na dźwięk"</string>
     <string name="notification_importance_blocked" msgid="7938180808339386300">"Nigdy nie pokazuj powiadomień"</string>
     <string name="notification_importance_min" msgid="5455049524984686275">"Brak dźwięku i komunikatów wizualnych"</string>
     <string name="notification_importance_low" msgid="8881468429453766553">"Brak dźwięku"</string>
     <string name="notification_importance_default" msgid="5958338024601957516">"Sygnalizacja dźwiękiem"</string>
     <string name="notification_importance_high" msgid="2082429479238228527">"Sygnalizacja dźwiękiem i wyświetlenie komunikatu"</string>
+    <string name="notification_importance_high_silent" msgid="2667033773703765252">"Pokaż na ekranie"</string>
     <string name="notification_importance_min_title" msgid="6974673091137544803">"Niska"</string>
     <string name="notification_importance_low_title" msgid="8131254047772814309">"Średnia"</string>
     <string name="notification_importance_default_title" msgid="9120383978536089489">"Wysoka"</string>
     <string name="notification_importance_high_title" msgid="3058778300264746473">"Pilne"</string>
     <string name="allow_interruption" msgid="7136150018111848721">"Zezwól na przerywanie"</string>
-    <string name="allow_interruption_summary" msgid="7870159391333957050">"Zezwól tej aplikacji na dźwięki, wibracje i/lub wyświetlanie powiadomień na ekranie"</string>
+    <string name="allow_interruption_summary" msgid="7870159391333957050">"Zezwól tej aplikacji na dźwięki, wibracje­i/lub wyświetlanie powiadomień na ekranie"</string>
     <string name="notification_channel_summary_min" msgid="5401718014765921892">"Mało ważne"</string>
     <string name="notification_channel_summary_low" msgid="322317684244981244">"Średnio ważne"</string>
     <string name="notification_channel_summary_default" msgid="1111749130423589931">"Bardzo ważne"</string>
@@ -2980,8 +2997,15 @@
     <string name="loading_notification_apps" msgid="5031818677010335895">"Wczytuję aplikacje..."</string>
     <string name="app_notifications_off_desc" msgid="4882445501376722969">"Android blokuje powiadomienia z tej aplikacji na urządzeniu"</string>
     <string name="channel_notifications_off_desc" msgid="5899225298718840635">"Android blokuje tę kategorię powiadomień na urządzeniu"</string>
+    <string name="channel_group_notifications_off_desc" msgid="1620950416247316370">"Android blokuje tę grupę powiadomień na urządzeniu"</string>
     <string name="notification_channels" msgid="5346841743182627500">"Kategorie"</string>
     <string name="notification_channels_other" msgid="5645317113885788226">"Inne"</string>
+    <plurals name="notification_group_summary" formatted="false" msgid="3420621520561455358">
+      <item quantity="few"><xliff:g id="COUNT_1">%d</xliff:g> kategorie</item>
+      <item quantity="many"><xliff:g id="COUNT_1">%d</xliff:g> kategorii</item>
+      <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> kategorii</item>
+      <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> kategoria</item>
+    </plurals>
     <string name="no_channels" msgid="3077375508177744586">"Ta aplikacja nie opublikowała żadnych powiadomień"</string>
     <string name="app_settings_link" msgid="8894946007543660906">"Dodatkowe ustawienia w aplikacji"</string>
     <string name="app_notification_listing_summary_zero" msgid="6482582965081108108">"Włączone dla wszystkich aplikacji"</string>
@@ -3062,12 +3086,14 @@
     <string name="zen_mode_from_starred" msgid="2678345811950997027">"Tylko od kontaktów z gwiazdką"</string>
     <string name="zen_mode_from_none" msgid="8219706639954614136">"Żadne"</string>
     <string name="zen_mode_alarms" msgid="2165302777886552926">"Alarmy"</string>
+    <!-- no translation found for zen_mode_media_system_other (8900209390529859777) -->
+    <skip />
     <string name="zen_mode_reminders" msgid="5458502056440485730">"Przypomnienia"</string>
     <string name="zen_mode_events" msgid="7914446030988618264">"Wydarzenia"</string>
     <string name="zen_mode_all_callers" msgid="584186167367236922">"Wszyscy rozmówcy"</string>
     <string name="zen_mode_selected_callers" msgid="3127598874060615742">"Wybrani rozmówcy"</string>
     <string name="zen_mode_repeat_callers" msgid="5019521886428322131">"Dzwoniący powtórnie"</string>
-    <string name="zen_mode_repeat_callers_summary" msgid="7192713032364140137">"Zezwalaj na połączenie, jeśli ta sama osoba dzwoni po raz drugi w ciągu <xliff:g id="MINUTES">%d</xliff:g> minut"</string>
+    <string name="zen_mode_repeat_callers_summary" msgid="239685342222975733">"Jeśli ta sama osoba dzwoni po raz drugi w ciągu <xliff:g id="MINUTES">%d</xliff:g> min"</string>
     <string name="zen_mode_when" msgid="2767193283311106373">"Włącz automatycznie"</string>
     <string name="zen_mode_when_never" msgid="8809494351918405602">"Nigdy"</string>
     <string name="zen_mode_when_every_night" msgid="3122486110091921009">"Każdej nocy"</string>
@@ -3100,6 +3126,7 @@
     <string name="zen_mode_screen_off_visual_interruptions" msgid="4850792880144382633">"Gdy ekran jest wyłączony"</string>
     <string name="zen_mode_no_visual_interruptions" msgid="8742776003822778472">"Gdy ekran jest włączony lub wyłączony"</string>
     <string name="notification_app_settings_button" msgid="6685640230371477485">"Ustawienia powiadomień"</string>
+    <string name="suggestion_button_text" msgid="3275010948381252006">"OK"</string>
     <string name="device_feedback" msgid="3238056036766293294">"Prześlij opinię o tym urządzeniu"</string>
     <string name="restr_pin_enter_admin_pin" msgid="1085834515677448072">"Wpisz kod PIN administratora"</string>
     <string name="switch_on_text" msgid="1124106706920572386">"Wł."</string>
@@ -3227,7 +3254,7 @@
     <string name="system_app" msgid="9068313769550747372">"(Systemowa)"</string>
     <string name="system_default_app" msgid="3091113402349739037">"(Domyślna aplikacja systemu)"</string>
     <string name="apps_storage" msgid="4353308027210435513">"Magazyn aplikacji"</string>
-    <string name="usage_access" msgid="5479504953931038165">"Dostęp do użytkowania"</string>
+    <string name="usage_access" msgid="5479504953931038165">"Dostęp do danych o użyciu"</string>
     <string name="permit_usage_access" msgid="4012876269445832300">"Zezwól na dostęp do użytkowania"</string>
     <string name="app_usage_preference" msgid="7065701732733134991">"Ustawienia użycia aplikacji"</string>
     <string name="usage_access_description" msgid="1352111094596416795">"Dostęp do użytkowania umożliwia aplikacji śledzenie tego, jakich innych aplikacji i jak często używasz, oraz odczytywanie m.in. informacji o operatorze i ustawień językowych."</string>
@@ -3285,7 +3312,7 @@
     <string name="usb_use_power_only_desc" msgid="3461232831015575152">"Ładuje podłączone urządzenie. Działa tylko z urządzeniami obsługującymi ładowanie przez USB."</string>
     <string name="usb_use_file_transfers" msgid="7409600791007250137">"Przesłać pliki"</string>
     <string name="usb_use_file_transfers_desc" msgid="4235764784331804488">"Przesyłaj pliki do innego urządzenia"</string>
-    <string name="usb_use_photo_transfers" msgid="7794775645350330454">"Przesyłać zdjęcia (PTP)"</string>
+    <string name="usb_use_photo_transfers" msgid="7794775645350330454">"Przesłać zdjęcia (PTP)"</string>
     <string name="usb_use_photo_transfers_desc" msgid="2963034811151325996">"Przesyłanie zdjęć lub plików, jeśli MTP nie jest obsługiwane (PTP)"</string>
     <string name="usb_use_MIDI" msgid="870922185938298263">"Użyć urządzenia jako MIDI"</string>
     <string name="usb_use_MIDI_desc" msgid="8473936990076693175">"Użyj tego urządzenia jako MIDI"</string>
@@ -3296,6 +3323,7 @@
     <string name="usb_summary_file_transfers" msgid="6435943692610175111">"Przesyłanie plików"</string>
     <string name="usb_summary_photo_transfers" msgid="8440204169576585250">"Przesyłanie zdjęć (PTP)"</string>
     <string name="usb_summary_MIDI" msgid="5687906612187885908">"Używanie urządzenia jako MIDI"</string>
+    <string name="sms_mirroring_pref" msgid="6475043279147376031">"Przekazywanie SMS-ów"</string>
     <string name="background_check_pref" msgid="7550258400138010979">"Kontrola działania w tle"</string>
     <string name="background_check_title" msgid="4534254315824525593">"Pełny dostęp w tle"</string>
     <string name="assist_access_context_title" msgid="2269032346698890257">"Używanie tekstu na ekranie"</string>
@@ -3364,7 +3392,7 @@
     <string name="write_settings_title" msgid="4232152481902542284">"Mogą modyfikować ustawienia systemu"</string>
     <string name="write_system_settings" msgid="3482913590601096763">"Modyfikowanie ustawień systemu"</string>
     <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="permit_write_settings" msgid="658555006453212691">"Zezwól na modyfikowanie ustawień systemowych"</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>
@@ -3465,14 +3493,17 @@
     <string name="color_temperature" msgid="2070126836910615605">"Chłodna temperatura kolorów"</string>
     <string name="color_temperature_desc" msgid="4793729830226404052">"Używaj chłodniejszych kolorów na ekranie"</string>
     <string name="color_temperature_toast" msgid="4974218172133854827">"Aby zastosować zmianę kolorów, wyłącz ekran"</string>
-    <string name="telephony_monitor_toast" msgid="7003764250271195384">"Aby zmiana ustawienia monitorowania telefonii zaczęła obowiązywać, zrestartuj urządzenie"</string>
+    <string name="connectivity_monitor_switch" msgid="9059759348648583421">"Monitorowanie łączności"</string>
+    <string name="connectivity_monitor_switch_summary" msgid="2828658652378866401">"ConnectivityMonitor zbiera logi po wykryciu problemu z łącznością i powiadamia użytkownika o możliwości zgłoszenia błędu"</string>
+    <string name="connectivity_monitor_toast" msgid="5551859612881173028">"Aby zmiana ustawienia monitorowania łączności zaczęła obowiązywać, zrestartuj urządzenie"</string>
     <string name="camera_hal_hdrplus_switch" msgid="8377365197105267466">"HAL HDR+ aparatu"</string>
     <string name="camera_hal_hdrplus_toast" msgid="2063703797270055299">"Aby zmiana HAL HDR+ aparatu zaczęła obowiązywać, zrestartuj urządzenie"</string>
+    <string name="camera_laser_sensor_switch" msgid="8913588990743234440">"Czujnik lasera aparatu"</string>
     <string name="ota_disable_automatic_update" msgid="2319639631655915050">"Automatyczne aktualizacje systemu"</string>
     <string name="usage" msgid="2977875522080448986">"Wykorzystanie danych"</string>
     <string name="cellular_data_usage" msgid="2155683719898158203">"Mobilna transmisja danych"</string>
-    <string name="wifi_data_usage" msgid="686754111095324306">"Transmisja danych przez Wi-Fi"</string>
-    <string name="ethernet_data_usage" msgid="5108764537574354616">"Transmisja danych w sieci Ethernet"</string>
+    <string name="wifi_data_usage" msgid="686754111095324306">"Użycie danych przez Wi-Fi"</string>
+    <string name="ethernet_data_usage" msgid="5108764537574354616">"Użycie danych w sieci Ethernet"</string>
     <string name="wifi" msgid="1081550856200013637">"Wi-Fi"</string>
     <string name="ethernet" msgid="6600095783781389720">"Ethernet"</string>
     <string name="cell_data_template" msgid="405684854174361041">"<xliff:g id="AMOUNT">^1</xliff:g> danych mobilnych"</string>
@@ -3495,7 +3526,7 @@
     <string name="data_warning" msgid="209133958008062117">"Próg ostrzegawczy"</string>
     <string name="set_data_limit" msgid="2901526323210516923">"Ustaw limit transmisji danych"</string>
     <string name="data_limit" msgid="1885406964934590552">"Limit danych"</string>
-    <string name="data_usage_template" msgid="392191945602400904">"W okresie <xliff:g id="ID_2">%2$s</xliff:g> wykorzystano <xliff:g id="ID_1">%1$s</xliff:g>"</string>
+    <string name="data_usage_template" msgid="2923744765873163859">"<xliff:g id="ID_1">%1$s</xliff:g> w okresie <xliff:g id="ID_2">%2$s</xliff:g>"</string>
     <string name="configure" msgid="1029654422228677273">"Skonfiguruj"</string>
     <string name="data_usage_other_apps" msgid="3272872663517382050">"Inne aplikacje korzystające z transmisji danych"</string>
     <plurals name="data_saver_unrestricted_summary" formatted="false" msgid="2635267833484232703">
@@ -3568,7 +3599,7 @@
     <string name="button_confirm_convert_fbe" msgid="7101855374850373091">"Wyczyść i przekształć"</string>
     <string name="reset_shortcut_manager_throttling" msgid="6495066467198668994">"Zresetuj ograniczanie szybkości w usłudze ShortcutManager"</string>
     <string name="reset_shortcut_manager_throttling_complete" msgid="1826770872063707900">"Zresetowano ograniczenie szybkości w usłudze ShortcutManager"</string>
-    <string name="notification_suggestion_title" msgid="4506524937307816475">"Skonfiguruj powiadomienia na ekranie blokady"</string>
+    <string name="notification_suggestion_title" msgid="387052719462473500">"Zarządzaj informacjami wyświetlanymi na ekranie blokady"</string>
     <string name="notification_suggestion_summary" msgid="8521159741445416875">"Pokaż lub ukryj informacje w powiadomieniach"</string>
     <string name="page_tab_title_summary" msgid="4070309266374993258">"Wszystkie"</string>
     <string name="page_tab_title_support" msgid="8483187649355540109">"Wsparcie i wskazówki"</string>
@@ -3576,7 +3607,7 @@
     <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>
     <string name="premium_sms_access" msgid="4660047004791638305">"Dostęp do SMS-ów specjalnych"</string>
-    <string name="bluetooth_disabled" msgid="2456198532288640046">"Niewidoczny dla innych urządzeń"</string>
+    <string name="bluetooth_disabled" msgid="6244000672828617410">"Wyłączony"</string>
     <string name="bluetooth_connected_summary" msgid="7672528674593152862">"Połączono z: <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="bluetooth_connected_multiple_devices_summary" msgid="9173661896296663932">"Połączono z wieloma urządzeniami"</string>
     <string name="demo_mode" msgid="2798762752209330277">"Tryb demonstracyjny interfejsu"</string>
@@ -3684,7 +3715,7 @@
     <string name="web_action_enable_title" msgid="4051513950976670853">"Aplikacje błyskawiczne"</string>
     <string name="web_action_enable_summary" msgid="3108127559723396382">"Otwieraj linki nawet w niezainstalowanych aplikacjach"</string>
     <string name="web_action_section_title" msgid="7364647086538399136">"Aplikacje błyskawiczne"</string>
-    <string name="instant_apps_account" msgid="1433620209791992528">"Konto do aplikacji błyskawicznych"</string>
+    <string name="instant_apps_settings" msgid="8827777916518348213">"Ustawienia aplikacji błyskawicznych"</string>
     <string name="domain_url_section_title" msgid="7046835219056428883">"Zainstalowane aplikacje"</string>
     <string name="automatic_storage_manager_activation_warning" msgid="6353100011690933254">"Pamięcią zarządza teraz menedżer miejsca"</string>
     <string name="account_for_section_header" msgid="5356566418548737121">"Konta użytkownika <xliff:g id="USER_NAME">%1$s</xliff:g>"</string>
@@ -3735,7 +3766,9 @@
     <string name="enterprise_privacy_always_on_vpn_personal" msgid="9217774730260037434">"Wyłączono stały VPN w Twoim profilu osobistym"</string>
     <string name="enterprise_privacy_always_on_vpn_work" msgid="7244472958208315814">"Włączono stały VPN w Twoim profilu do pracy"</string>
     <string name="enterprise_privacy_global_http_proxy" msgid="7936664553416257333">"Ustawiono globalny serwer proxy HTTP"</string>
-    <string name="enterprise_privacy_ca_certs" msgid="5885892204903688909">"Zaufane dane uwierzytelniające"</string>
+    <string name="enterprise_privacy_ca_certs_device" msgid="2019652712782510262">"Zaufane dane logowania"</string>
+    <string name="enterprise_privacy_ca_certs_personal" msgid="2279084820904076599">"Zaufane dane logowania w Twoim profilu osobistym"</string>
+    <string name="enterprise_privacy_ca_certs_work" msgid="6187377647815301809">"Zaufane dane logowania w Twoim profilu do pracy"</string>
     <plurals name="enterprise_privacy_number_ca_certs" formatted="false" msgid="526375234629534165">
       <item quantity="few">Co najmniej <xliff:g id="COUNT_1">%d</xliff:g> certyfikaty urzędu certyfikacji</item>
       <item quantity="many">Co najmniej <xliff:g id="COUNT_1">%d</xliff:g> certyfikatów urzędu certyfikacji</item>
@@ -3808,6 +3841,8 @@
     <string name="carrier_provisioning" msgid="4398683675591893169">"Informacje o obsłudze administracyjnej operatora"</string>
     <string name="trigger_carrier_provisioning" msgid="3434865918009286187">"Uruchom obsługę administracyjną operatora"</string>
     <string name="new_device_suggestion_title" msgid="698847081680980774">"Co nowego i fajnego?"</string>
-    <string name="new_device_suggestion_summary" msgid="7172709269203435870">"Zobacz 5 najlepszych funkcji"</string>
+    <string name="new_device_suggestion_summary" product="default" msgid="206396571522515855">"Poznaj swój nowy telefon"</string>
+    <string name="new_device_suggestion_summary" product="tablet" msgid="393751455688210956">"Poznaj swój nowy tablet"</string>
+    <string name="new_device_suggestion_summary" product="device" msgid="2939870049868336652">"Poznaj swoje nowe urządzenie"</string>
     <string name="disabled_low_ram_device" msgid="3751578499721173344">"Ta funkcja jest niedostępna na tym urządzeniu."</string>
 </resources>
diff --git a/res/values-pt-rBR/arrays.xml b/res/values-pt-rBR/arrays.xml
index b5d9790..3c5a7ca 100644
--- a/res/values-pt-rBR/arrays.xml
+++ b/res/values-pt-rBR/arrays.xml
@@ -100,8 +100,6 @@
     <!-- no translation found for wifi_security_no_eap:0 (2084555984818107151) -->
     <!-- no translation found for wifi_security_no_eap:1 (397579322683471524) -->
     <!-- no translation found for wifi_security_no_eap:2 (1968820975358150484) -->
-    <!-- no translation found for wifi_ap_security:0 (5251664683198623324) -->
-    <!-- no translation found for wifi_ap_security:1 (7989073072260294673) -->
   <string-array name="wifi_eap_method">
     <item msgid="1160193392455075561">"PEAP"</item>
     <item msgid="7981731051382306293">"TLS"</item>
diff --git a/res/values-pt-rBR/strings.xml b/res/values-pt-rBR/strings.xml
index 16fd857..d1c47cf 100644
--- a/res/values-pt-rBR/strings.xml
+++ b/res/values-pt-rBR/strings.xml
@@ -166,7 +166,7 @@
     <string name="bluetooth_map_acceptance_dialog_text" msgid="8712508202081143737">"%1$s deseja acessar suas mensagens. Conceder acesso a %2$s?"</string>
     <string name="bluetooth_sap_request" msgid="2669762224045354417">"Solicitação de acesso ao cartão SIM"</string>
     <string name="bluetooth_sap_acceptance_dialog_text" msgid="4414253873553608690">"O <xliff:g id="DEVICE_NAME_0">%1$s</xliff:g> deseja acessar seu cartão SIM. A concessão de acesso ao cartão SIM desativará a conectividade de dados no seu dispositivo durante a conexão. Conceda acesso ao <xliff:g id="DEVICE_NAME_1">%2$s?</xliff:g>"</string>
-    <string name="bluetooth_device_name_summary" msgid="4757990010751789977">"Visível como \'<xliff:g id="DEVICE_NAME">^1</xliff:g>\' para outros dispositivos"</string>
+    <string name="bluetooth_device_name_summary" msgid="522235742194965734">"Visível como \"<xliff:g id="DEVICE_NAME">^1</xliff:g>\" para outros dispositivos"</string>
     <string name="bluetooth_paired_device_title" msgid="8638994696317952019">"Seus dispositivos"</string>
     <string name="bluetooth_pairing_page_title" msgid="7712127387361962608">"Parear novo dispositivo"</string>
     <string name="date_and_time" msgid="9062980487860757694">"Data e hora"</string>
@@ -312,6 +312,8 @@
     <string name="zone_auto" msgid="334783869352026648">"Fuso horário automático"</string>
     <string name="zone_auto_summaryOn" msgid="6142830927278458314">"Usar fuso horário fornecido pela rede"</string>
     <string name="zone_auto_summaryOff" msgid="2597745783162041390">"Usar fuso horário fornecido pela rede"</string>
+    <string name="date_time_24hour_auto" msgid="2117383168985653422">"Formato de 24 horas automático"</string>
+    <string name="date_time_24hour_auto_summary" msgid="6351812925651480277">"Usar localidade padrão"</string>
     <string name="date_time_24hour_title" msgid="3203537578602803850">"Formato de 24 horas"</string>
     <string name="date_time_24hour" msgid="1193032284921000063">"Formato de 24 horas"</string>
     <string name="date_time_set_time_title" msgid="6296795651349047016">"Horário"</string>
@@ -329,7 +331,7 @@
     <string name="lock_immediately_summary_with_exception" msgid="9119632173886172690">"Imediatamente após a suspensão, exceto quando mantido desbloqueado por <xliff:g id="TRUST_AGENT_NAME">%1$s</xliff:g>"</string>
     <string name="lock_after_timeout_summary_with_exception" msgid="5579064842797188409">"<xliff:g id="TIMEOUT_STRING">%1$s</xliff:g> após suspensão, exceto quando mantido desbloqueado por <xliff:g id="TRUST_AGENT_NAME">%2$s</xliff:g>"</string>
     <string name="show_owner_info_on_lockscreen_label" msgid="5074906168357568434">"Mostrar informações do proprietário na tela de bloqueio"</string>
-    <string name="owner_info_settings_title" msgid="5530285568897386122">"Msg na tela de bloqueio"</string>
+    <string name="owner_info_settings_title" msgid="5530285568897386122">"Mensagem na tela de bloqueio"</string>
     <string name="security_enable_widgets_title" msgid="2754833397070967846">"Ativar widgets"</string>
     <string name="security_enable_widgets_disabled_summary" msgid="6392489775303464905">"Desativada pelo administrador"</string>
     <string name="owner_info_settings_summary" msgid="7472393443779227052">"Nenhuma"</string>
@@ -359,7 +361,7 @@
     <string name="fingerprint_add_title" msgid="1926752654454033904">"Adicionar impressão digital"</string>
     <string name="fingerprint_enable_keyguard_toggle_title" msgid="5078060939636911795">"bloqueio de tela"</string>
     <plurals name="security_settings_fingerprint_preference_summary" formatted="false" msgid="624961700033979880">
-      <item quantity="one"><xliff:g id="COUNT_1">%1$d</xliff:g> impressões digitais configuradas</item>
+      <item quantity="one"><xliff:g id="COUNT_1">%1$d</xliff:g> impressão digital configurada</item>
       <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> impressões digitais configuradas</item>
     </plurals>
     <string name="security_settings_fingerprint_preference_summary_none" msgid="1507739327565151923"></string>
@@ -372,22 +374,25 @@
     <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="1961957425135180242">"Próxima"</string>
+    <string name="setup_fingerprint_enroll_skip_title" msgid="362050541117362034">"Pular impressão digital?"</string>
+    <string name="setup_fingerprint_enroll_skip_after_adding_lock_text" msgid="958990414356204763">"A configuração da impressão digital leva apenas um ou dois minutos. Se você pular essa etapa, poderá adicionar sua impressão digital mais tarde nas configurações."</string>
+    <string name="lock_screen_intro_skip_title" msgid="4988210105913705679">"Pular bloqueio de tela?"</string>
     <string name="lock_screen_intro_skip_dialog_text_frp" product="tablet" msgid="1581834104051243425">"Os recursos de proteção do dispositivo não serão ativados. Você não poderá impedir que outras pessoas usem este tablet se ele for perdido, roubado ou redefinido."</string>
     <string name="lock_screen_intro_skip_dialog_text_frp" product="device" msgid="4629503416877189572">"Os recursos de proteção do dispositivo não serão ativados. Você não poderá impedir que outras pessoas usem este dispositivo se ele for perdido, roubado ou redefinido."</string>
     <string name="lock_screen_intro_skip_dialog_text_frp" product="default" msgid="2423428240245737909">"Os recursos de proteção do dispositivo não serão ativados. Você não poderá impedir que outras pessoas usem este smartphone se ele for perdido, roubado ou redefinido."</string>
     <string name="lock_screen_intro_skip_dialog_text" product="tablet" msgid="5219287483885558525">"Os recursos de proteção do dispositivo não serão ativados. Você não poderá impedir que outras pessoas usem este tablet se ele for perdido ou roubado."</string>
     <string name="lock_screen_intro_skip_dialog_text" product="device" msgid="1466238255429527112">"Os recursos de proteção do dispositivo não serão ativados. Você não poderá impedir que outras pessoas usem este dispositivo se ele for perdido ou roubado."</string>
     <string name="lock_screen_intro_skip_dialog_text" product="default" msgid="3008526710555416125">"Os recursos de proteção do dispositivo não serão ativados. Você não poderá impedir que outras pessoas usem este smartphone se ele for perdido ou roubado."</string>
-    <string name="skip_anyway_button_label" msgid="2323522873558834513">"Ignorar"</string>
+    <string name="skip_anyway_button_label" msgid="2323522873558834513">"Pular mesmo assim"</string>
     <string name="go_back_button_label" msgid="4745265266186209467">"Voltar"</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_title" msgid="3051496861358227199">"Toque no sensor"</string>
-    <string name="security_settings_fingerprint_enroll_find_sensor_message" msgid="8793966374365960368">"Ele fica na parte de trás do seu smartphone. Use seu dedo indicador."</string>
+    <string name="security_settings_fingerprint_enroll_find_sensor_message" msgid="8793966374365960368">"Ele fica na parte traseira do seu smartphone. Use o dedo indicador."</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_content_description" msgid="2058830032070449160">"Ilustração mostrando a localização do sensor de impressão digital no dispositivo"</string>
     <string name="security_settings_fingerprint_enroll_dialog_name_label" msgid="7086763077909041106">"Nome"</string>
     <string name="security_settings_fingerprint_enroll_dialog_ok" msgid="4150384963879569750">"Ok"</string>
     <string name="security_settings_fingerprint_enroll_dialog_delete" msgid="4114615413240707936">"Excluir"</string>
     <string name="security_settings_fingerprint_enroll_start_title" msgid="2068961812439460133">"Toque no sensor"</string>
-    <string name="security_settings_fingerprint_enroll_start_message" msgid="3909929328942564524">"Coloque seu dedo no sensor e levante após sentir uma vibração"</string>
+    <string name="security_settings_fingerprint_enroll_start_message" msgid="3909929328942564524">"Encoste o dedo no sensor e levante após sentir uma vibração"</string>
     <string name="security_settings_fingerprint_enroll_repeat_title" msgid="2819679722403209778">"Levante e toque novamente"</string>
     <string name="security_settings_fingerprint_enroll_repeat_message" msgid="6158989350522518586">"Continue levantando o dedo para adicionar as diferentes partes da sua impressão digital"</string>
     <string name="security_settings_fingerprint_enroll_finish_title" msgid="7567276170287972230">"Impressão digital adicionada"</string>
@@ -398,10 +403,10 @@
     <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="2989019978041986175">"Toque no sensor na parte de trás do smartphone. Use o dedo indicador."</string>
+    <string name="security_settings_fingerprint_enroll_touch_dialog_message" msgid="2989019978041986175">"Toque no sensor na parte traseira do smartphone. Use o dedo indicador."</string>
     <string name="security_settings_fingerprint_enroll_error_dialog_title" msgid="3618021988442639280">"O registro não foi concluído"</string>
     <string name="security_settings_fingerprint_enroll_error_timeout_dialog_message" msgid="2942551158278899627">"Prazo de registro de impressões digitais atingido. Tente novamente."</string>
-    <string name="security_settings_fingerprint_enroll_error_generic_dialog_message" msgid="3624760637222239293">"O registro de impressões digitais não funcionou. Tente novamente ou use um dedo diferente."</string>
+    <string name="security_settings_fingerprint_enroll_error_generic_dialog_message" msgid="3624760637222239293">"O registro da impressão digital não funcionou. Tente novamente ou use um dedo diferente."</string>
     <string name="fingerprint_enroll_button_add" msgid="6317978977419045463">"Adicionar outra"</string>
     <string name="fingerprint_enroll_button_next" msgid="6247009337616342759">"Próxima"</string>
     <string name="security_settings_fingerprint_enroll_disclaimer" msgid="2624905914239271751">"Além de desbloquear seu smartphone, também é possível usar sua impressão digital para autorizar compras e acesso a apps. "<annotation id="url">"Saiba mais"</annotation></string>
@@ -457,7 +462,7 @@
     <string name="setup_lock_settings_picker_title" product="tablet" msgid="90329443364067215">"Proteger o tablet"</string>
     <string name="setup_lock_settings_picker_title" product="device" msgid="2399952075134938929">"Proteger o dispositivo"</string>
     <string name="setup_lock_settings_picker_title" product="default" msgid="1572244299605153324">"Proteger o smartphone"</string>
-    <string name="setup_lock_settings_picker_fingerprint_message" msgid="5585650064305600578">"Para aumentar a segurança, configure um bloqueio de tela alternativo."</string>
+    <string name="lock_settings_picker_fingerprint_added_security_message" msgid="5768002109707648463">"Para aumentar a segurança, defina um bloqueio de tela alternativo."</string>
     <string name="setup_lock_settings_picker_message" product="tablet" msgid="8919671129189936210">"Para impedir que outras pessoas usem este tablet 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="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>
@@ -499,29 +504,37 @@
     <string name="unlock_disable_frp_warning_title" msgid="264008934468492550">"Remover proteção do dispositivo?"</string>
     <string name="unlock_disable_frp_warning_title_profile" msgid="5507136301904313583">"Remover proteção de perfil?"</string>
     <string name="unlock_disable_frp_warning_content_pattern" msgid="8869767290771023461">"Os recursos de proteção do dispositivo não funcionarão sem seu padrão."</string>
-    <!-- no translation found for unlock_disable_frp_warning_content_pattern_fingerprint (2986105377420905314) -->
-    <skip />
+    <string name="unlock_disable_frp_warning_content_pattern_fingerprint" msgid="2986105377420905314">"Os recursos de proteção do dispositivo não funcionarão sem seu padrão.<xliff:g id="EMPTY_LINE">
+
+</xliff:g>Suas impressões digitais salvas também serão removidas deste dispositivo e não será possível desbloquear o smartphone, autorizar compras ou fazer login em apps com elas."</string>
     <string name="unlock_disable_frp_warning_content_pin" msgid="586996206210265131">"Os recursos de proteção do dispositivo não funcionarão sem seu PIN."</string>
-    <!-- no translation found for unlock_disable_frp_warning_content_pin_fingerprint (3370462835533123695) -->
-    <skip />
+    <string name="unlock_disable_frp_warning_content_pin_fingerprint" msgid="3370462835533123695">"Os recursos de proteção do dispositivo não funcionarão sem seu PIN.<xliff:g id="EMPTY_LINE">
+
+</xliff:g>Suas impressões digitais salvas também serão removidas deste dispositivo e não será possível desbloquear o smartphone, autorizar compras ou fazer login em apps com elas."</string>
     <string name="unlock_disable_frp_warning_content_password" msgid="5420612686852555537">"Os recursos de proteção do dispositivo não funcionarão sem sua senha."</string>
-    <!-- no translation found for unlock_disable_frp_warning_content_password_fingerprint (3595476296430536798) -->
-    <skip />
+    <string name="unlock_disable_frp_warning_content_password_fingerprint" msgid="3595476296430536798">"Os recursos de proteção do dispositivo não funcionarão sem sua senha.<xliff:g id="EMPTY_LINE">
+
+</xliff:g>Suas impressões digitais salvas também serão removidas deste dispositivo e não será possível desbloquear o smartphone, autorizar compras ou fazer login em apps com elas."</string>
     <string name="unlock_disable_frp_warning_content_unknown" msgid="1550718040483548220">"Os recursos de proteção do dispositivo não funcionarão sem seu bloqueio de tela."</string>
-    <!-- no translation found for unlock_disable_frp_warning_content_unknown_fingerprint (3679351662094349506) -->
-    <skip />
+    <string name="unlock_disable_frp_warning_content_unknown_fingerprint" msgid="3679351662094349506">"Os recursos de proteção do dispositivo não funcionarão sem seu bloqueio de tela.<xliff:g id="EMPTY_LINE">
+
+</xliff:g>Suas impressões digitais salvas também serão removidas deste dispositivo e não será possível desbloquear o smartphone, autorizar compras ou fazer login em apps com elas."</string>
     <string name="unlock_disable_frp_warning_content_pattern_profile" msgid="8682200103576359918">"Os recursos de proteção de perfil não funcionam sem seu padrão."</string>
-    <!-- no translation found for unlock_disable_frp_warning_content_pattern_fingerprint_profile (6718155854303231675) -->
-    <skip />
+    <string name="unlock_disable_frp_warning_content_pattern_fingerprint_profile" msgid="6718155854303231675">"Os recursos de proteção de perfil não funcionarão sem seu padrão.<xliff:g id="EMPTY_LINE">
+
+</xliff:g>Suas impressões digitais salvas também serão removidas deste perfil e não será possível desbloquear o perfil, autorizar compras ou fazer login em apps com elas."</string>
     <string name="unlock_disable_frp_warning_content_pin_profile" msgid="7790688070593867767">"Os recursos de proteção de perfil não funcionam sem seu PIN."</string>
-    <!-- no translation found for unlock_disable_frp_warning_content_pin_fingerprint_profile (4209564603132870532) -->
-    <skip />
+    <string name="unlock_disable_frp_warning_content_pin_fingerprint_profile" msgid="4209564603132870532">"Os recursos de proteção de perfil não funcionarão sem seu PIN.<xliff:g id="EMPTY_LINE">
+
+</xliff:g>Suas impressões digitais salvas também serão removidas deste perfil e não será possível desbloquear o perfil, autorizar compras ou fazer login em apps com elas."</string>
     <string name="unlock_disable_frp_warning_content_password_profile" msgid="7569285520567674461">"Os recursos de proteção de perfil não funcionam sem sua senha."</string>
-    <!-- no translation found for unlock_disable_frp_warning_content_password_fingerprint_profile (2994300676764706047) -->
-    <skip />
+    <string name="unlock_disable_frp_warning_content_password_fingerprint_profile" msgid="2994300676764706047">"Os recursos de proteção de perfil não funcionarão sem sua senha.<xliff:g id="EMPTY_LINE">
+
+</xliff:g>Suas impressões digitais salvas também serão removidas deste perfil e não será possível desbloquear o perfil, autorizar compras ou fazer login em apps com elas."</string>
     <string name="unlock_disable_frp_warning_content_unknown_profile" msgid="6984215718701688202">"Os recursos de proteção de perfil não funcionarão sem seu bloqueio de tela."</string>
-    <!-- no translation found for unlock_disable_frp_warning_content_unknown_fingerprint_profile (4994062501123299418) -->
-    <skip />
+    <string name="unlock_disable_frp_warning_content_unknown_fingerprint_profile" msgid="4994062501123299418">"Os recursos de proteção de perfil não funcionarão sem seu bloqueio de tela.<xliff:g id="EMPTY_LINE">
+
+</xliff:g>Suas impressões digitais salvas também serão removidas deste perfil e não será possível desbloquear o perfil, autorizar compras ou fazer login em apps com elas."</string>
     <string name="unlock_disable_frp_warning_ok" msgid="7075138677177748705">"Sim, remover"</string>
     <string name="unlock_change_lock_pattern_title" msgid="2044092014872741130">"Mudar padrão de desbloqueio"</string>
     <string name="unlock_change_lock_pin_title" msgid="806629901095938484">"Mudar PIN de desbloqueio"</string>
@@ -580,6 +593,7 @@
     <string name="lockpassword_pin_no_sequential_digits" msgid="680765285206990584">"Não é permitido usar uma sequência de dígitos em ordem crescente, decrescente ou repetidos"</string>
     <string name="lockpassword_ok_label" msgid="313822574062553672">"OK"</string>
     <string name="lockpassword_cancel_label" msgid="8818529276331121899">"Cancelar"</string>
+    <string name="lockpassword_clear_label" msgid="5724429464960458155">"Limpar"</string>
     <string name="lockpattern_tutorial_cancel_label" msgid="6431583477570493261">"Cancelar"</string>
     <string name="lockpattern_tutorial_continue_label" msgid="3559793618653400434">"Avançar"</string>
     <string name="lock_setup" msgid="3355847066343753943">"A configuração foi concluída."</string>
@@ -639,7 +653,7 @@
     <string name="bluetooth_device_context_connect_advanced" msgid="2643129703569788771">"Opções…"</string>
     <string name="bluetooth_menu_advanced" msgid="8572178316357220524">"Avançado"</string>
     <string name="bluetooth_advanced_titlebar" msgid="2142159726881547669">"Bluetooth avançado"</string>
-    <string name="bluetooth_empty_list_bluetooth_off" msgid="6351930724051893423">"Com o Bluetooth ativado, o dispositivo pode se comunicar"</string>
+    <string name="bluetooth_empty_list_bluetooth_off" msgid="6351930724051893423">"Com o Bluetooth ativado, o dispositivo pode se comunicar com dispositivos próximos"</string>
     <string name="ble_scan_notify_text" msgid="1295915006005700650">"Para aumentar a precisão da localização, apps e serviços do sistema ainda detectam dispositivos Bluetooth. É possível alterar isso nas <xliff:g id="LINK_BEGIN_0">LINK_BEGIN</xliff:g>configurações de verificação<xliff:g id="LINK_END_1">LINK_END</xliff:g>."</string>
     <string name="bluetooth_connect_failed" msgid="4500234659813241053">"Não foi possível conectar. Tente novamente."</string>
     <string name="device_details_title" msgid="6576953269221085300">"Detalhes do dispositivo"</string>
@@ -694,9 +708,9 @@
     <string name="android_beam_settings_title" msgid="7832812974600338649">"Android Beam"</string>
     <string name="android_beam_on_summary" msgid="3618057099355636830">"Pronto para transmitir conteúdo de apps via NFC"</string>
     <string name="android_beam_off_summary" msgid="4663095428454779138">"Desativado"</string>
-    <string name="android_beam_disabled_summary" msgid="1737782116894793393">"Indisponível porque o NFC está desativado"</string>
+    <string name="android_beam_disabled_summary" msgid="1737782116894793393">"Indisponível porque a NFC está desativada"</string>
     <string name="android_beam_label" msgid="6257036050366775040">"Android Beam"</string>
-    <string name="android_beam_explained" msgid="1810540319385192758">"Quando esse recurso está ativado, é possível enviar o conteúdo do app para outro dispositivo compatível com NFC, mantendo os dispositivos próximos, Por exemplo, é possível enviar páginas da Web, vídeos do YouTube, contatos e muito mais.\n\nBasta posicionar os dispositivos próximos (normalmente de costas um para o outro) e tocar na tela. O app determina o que é enviado."</string>
+    <string name="android_beam_explained" msgid="1810540319385192758">"Quando esse recurso está ativado, é possível enviar o conteúdo do app para outro dispositivo compatível com NFC, mantendo os dispositivos próximos. Por exemplo, é possível enviar páginas da Web, vídeos do YouTube, contatos e muito mais.\n\nBasta aproximar os dispositivos (normalmente de costas um para o outro) e tocar na tela. O app determina o que é enviado."</string>
     <string name="wifi_quick_toggle_title" msgid="8850161330437693895">"Wi-Fi"</string>
     <string name="wifi_quick_toggle_summary" msgid="2696547080481267642">"Ativar o Wi-Fi"</string>
     <string name="wifi_settings" msgid="29722149822540994">"Wi-Fi"</string>
@@ -773,6 +787,7 @@
     <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>
@@ -809,6 +824,8 @@
     <string name="wifi_wps_available_first_item" msgid="4422547079984583502">"WPS disponível"</string>
     <string name="wifi_wps_available_second_item" msgid="8427520131718215301">" (WPS disponível)"</string>
     <string name="wifi_wps_nfc_enter_password" msgid="2288214226916117159">"Insira a senha da rede"</string>
+    <string name="wifi_carrier_connect" msgid="8174696557882299911">"Rede Wi‑Fi de operadora"</string>
+    <string name="wifi_carrier_content" msgid="4634077285415851933">"Conecte-se via <xliff:g id="NAME">%1%s</xliff:g>"</string>
     <string name="wifi_scan_always_turnon_message" msgid="203123538572122989">"Para aumentar a precisão da localização e outras finalidades, <xliff:g id="APP_NAME">%1$s</xliff:g> quer ativar a verificação de rede, mesmo que o Wi-Fi esteja desligado.\n\nPermitir isto para todos os apps que quiserem verificar?"</string>
     <string name="wifi_scan_always_turnoff_message" msgid="5538901671131941043">"Para desativar esta opção, vá para \"Avançado\" no menu flutuante."</string>
     <string name="wifi_scan_always_confirm_allow" msgid="5355973075896817232">"Permitir"</string>
@@ -826,6 +843,7 @@
     <string name="wifi_connect" msgid="1076622875777072845">"Conectar"</string>
     <string name="wifi_failed_connect_message" msgid="8491902558970292871">"Falha ao conectar à rede"</string>
     <string name="wifi_forget" msgid="8168174695608386644">"Esquecer"</string>
+    <string name="wifi_modify" msgid="6100248070440710782">"Modificar"</string>
     <string name="wifi_failed_forget_message" msgid="1348172929201654986">"Falha ao esquecer a rede"</string>
     <string name="wifi_save" msgid="3331121567988522826">"Salvar"</string>
     <string name="wifi_failed_save_message" msgid="6650004874143815692">"Falha ao salvar a rede"</string>
@@ -838,6 +856,7 @@
     <string name="wifi_advanced_titlebar" msgid="4485841401774142908">"Wi-Fi avançado"</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_title" msgid="3471132676909349382">"Informações da rede"</string>
     <string name="wifi_details_subnet_mask" msgid="6720279144174924410">"Máscara de sub-rede"</string>
     <string name="wifi_details_dns" msgid="8648826607751830768">"DNS"</string>
     <string name="wifi_details_ipv6_address_header" msgid="6734119149106422148">"Endereços IPv6"</string>
@@ -870,16 +889,15 @@
     <string name="wifi_p2p_cancel_connect_title" msgid="255267538099324413">"Cancelar convite?"</string>
     <string name="wifi_p2p_cancel_connect_message" msgid="7477756213423749402">"Deseja cancelar o convite para se conectar com <xliff:g id="PEER_NAME">%1$s</xliff:g>?"</string>
     <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_off_subtext" msgid="5466126533609394170">"Não está compartilhando a Internet ou conteúdo com outros dispositivos"</string>
     <string name="wifi_hotspot_tethering_on_subtext" product="tablet" msgid="5752490509369962007">"Compartilhando a conexão de Internet deste tablet via ponto de acesso"</string>
     <string name="wifi_hotspot_tethering_on_subtext" product="default" msgid="6461075246164300670">"Compartilhando a conexão de Internet deste smartphone via ponto de acesso"</string>
     <string name="wifi_hotspot_on_local_only_subtext" msgid="2068110388011294735">"O app está compartilhando conteúdo. Para compartilhar a conexão com a Internet, desative e ative o ponto de acesso."</string>
-    <string name="wifi_hotspot_name_title" msgid="1341735529132128887">"Nome do Wi-Fi"</string>
+    <string name="wifi_hotspot_name_title" msgid="8237000746618636778">"Nome do ponto de acesso"</string>
     <string name="wifi_hotspot_name_summary_connecting" msgid="3378299995508671967">"Ativando <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>..."</string>
     <string name="wifi_hotspot_name_summary_connected" msgid="3888672084861445362">"Outros dispositivos podem se conectar a <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>"</string>
-    <string name="wifi_hotspot_password_title" msgid="1955592302902091281">"Senha do Wi-Fi"</string>
+    <string name="wifi_hotspot_password_title" msgid="8676859981917573801">"Senha do ponto de acesso"</string>
     <string name="wifi_hotspot_ap_band_title" msgid="1165801173359290681">"Banda de AP"</string>
     <string name="wifi_hotspot_footer_info_regular" msgid="1203489406068036455">"Use o ponto de acesso para criar uma rede Wi‑Fi para outros dispositivos. O ponto de acesso fornece Internet usando sua conexão de dados móveis. Pode haver cobrança adicional para dados móveis."</string>
     <string name="wifi_hotspot_footer_info_local_only" msgid="857988412470694109">"Os apps podem criar um ponto de acesso para compartilhamento de conteúdo com dispositivos nas proximidades."</string>
@@ -890,7 +908,6 @@
     <string name="wifi_tether_configure_ap_text" msgid="7974681394041609308">"Configurar ponto de acesso Wi-Fi"</string>
     <string name="wifi_hotspot_configure_ap_text" msgid="5478614731464220432">"Config. ponto de acesso Wi-Fi"</string>
     <string name="wifi_hotspot_configure_ap_text_summary" msgid="5560680057727007011">"Ponto de acesso AndroidAP WPA2 PSK"</string>
-    <string name="wifi_tether_configure_subtext" msgid="2050196439900426456">"Ponto de acesso <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">"Ponto de acesso Android"</string>
     <string name="wifi_calling_settings_title" msgid="4102921303993404577">"Chamadas por Wi-Fi"</string>
     <string name="wifi_calling_suggestion_title" msgid="9008010480466359578">"Ativar chamada no Wi-Fi"</string>
@@ -931,7 +948,7 @@
     <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="emergency_address_summary" msgid="3266760199681945746">"Endereço usado como sua localização pelos serviços de emergência se você fizer uma chamada de emergência usando o Wi‑Fi"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"Tela"</string>
     <string name="sound_settings" msgid="5534671337768745343">"Som"</string>
     <string name="all_volume_title" msgid="4296957391257836961">"Volumes"</string>
@@ -985,6 +1002,7 @@
     <string name="search_settings" msgid="1910951467596035063">"Pesquisar"</string>
     <string name="search_settings_summary" msgid="9205656546570654169">"Gerenciar configurações e histórico de pesquisa"</string>
     <string name="search_settings_no_results" msgid="8799027492641230999">"Nenhum resultado"</string>
+    <string name="search_clear_history" msgid="4196658962573162457">"Limpar histórico"</string>
     <string name="display_settings" msgid="7965901687241669598">"Tela"</string>
     <string name="accelerometer_title" msgid="7854608399547349157">"Girar tela automaticamente"</string>
     <string name="color_mode_title" msgid="3159275920408338215">"Cores vívidas"</string>
@@ -1044,7 +1062,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 encaixado"</string>
+    <string name="screensaver_settings_summary_dock" msgid="2072657401664633283">"Quando ancorado"</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>
@@ -1055,15 +1073,13 @@
     <string name="automatic_brightness" msgid="5014143533884135461">"Brilho automático"</string>
     <string name="lift_to_wake_title" msgid="4555378006856277635">"Levantar para ativar"</string>
     <string name="ambient_display_screen_title" msgid="4252755516328775766">"Exibição de ambiente"</string>
-    <!-- no translation found for ambient_display_screen_summary_always_on (7337555569694794132) -->
-    <skip />
+    <string name="ambient_display_screen_summary_always_on" msgid="7337555569694794132">"Sempre ativado / Aumento do uso da bateria"</string>
     <string name="ambient_display_screen_summary_notifications" msgid="1449570742600868654">"Novas notificações"</string>
     <string name="ambient_display_category_triggers" msgid="4359289754456268573">"Quando mostrar"</string>
     <string name="doze_title" msgid="2375510714460456687">"Novas notificações"</string>
     <string name="doze_summary" msgid="3846219936142814032">"Ativar a tela ao receber notificações"</string>
     <string name="doze_always_on_title" msgid="1046222370442629646">"Sempre ativado"</string>
-    <!-- no translation found for doze_always_on_summary (6978257596231155345) -->
-    <skip />
+    <string name="doze_always_on_summary" msgid="6978257596231155345">"Mostrar horário, ícones de notificação e outras informações. Aumento do uso da bateria."</string>
     <string name="title_font_size" msgid="4405544325522105222">"Tamanho da fonte"</string>
     <string name="short_summary_font_size" msgid="6819778801232989076">"Tornar o texto maior ou menor"</string>
     <string name="sim_lock_settings" msgid="3392331196873564292">"Bloqueio do SIM"</string>
@@ -1116,7 +1132,6 @@
     <string name="baseband_version" msgid="1848990160763524801">"Versão da banda de base"</string>
     <string name="kernel_version" msgid="9192574954196167602">"Versão do kernel"</string>
     <string name="build_number" msgid="3075795840572241758">"Número da versão"</string>
-    <string name="selinux_status" msgid="6212165375172061672">"Status do SELinux"</string>
     <string name="device_info_not_available" msgid="8062521887156825182">"Não disponível"</string>
     <string name="device_status_activity_title" msgid="1411201799384697904">"Status"</string>
     <string name="device_status" msgid="607405385799807324">"Status"</string>
@@ -1144,7 +1159,6 @@
     <string name="status_wifi_mac_address" msgid="2202206684020765378">"Endereço MAC da rede Wi-Fi"</string>
     <string name="status_bt_address" msgid="4195174192087439720">"Endereço Bluetooth"</string>
     <string name="status_serial_number" msgid="2257111183374628137">"Número de série"</string>
-    <string name="status_unavailable" msgid="7862009036663793314">"Não disponível"</string>
     <string name="status_up_time" msgid="7294859476816760399">"Tempo de atividade"</string>
     <string name="status_awake_time" msgid="2393949909051183652">"Tempo ativo"</string>
     <string name="internal_memory" msgid="9129595691484260784">"Armaz. interno"</string>
@@ -1320,25 +1334,23 @@
     <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="6254873816990678620">"Redefinir opções"</string>
+    <string name="reset_dashboard_summary" msgid="4851012632493522755">"A rede, os apps ou o dispositivo podem ser redefinidos"</string>
     <string name="reset_network_title" msgid="6166025966016873843">"Redefinir Wi-Fi, rede móvel e Bluetooth"</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>
     <string name="reset_network_confirm_title" msgid="1759888886976962773">"Redefinir?"</string>
     <string name="network_reset_not_available" msgid="7188610385577164676">"A redefinição da rede não está disponível para esse usuário"</string>
     <string name="reset_network_complete_toast" msgid="787829973559541880">"As configurações de rede foram redefinidas"</string>
-    <string name="master_clear_title" msgid="6617679904229218425">"Limpar todos os dados (redefinição para a configuração original)"</string>
-    <plurals name="master_clear_with_account_summary" formatted="false" msgid="5911377203778818712">
-      <item quantity="one"><xliff:g id="ACCOUNT_COUNT">%1$d</xliff:g> conta será redefinida</item>
-      <item quantity="other"><xliff:g id="ACCOUNT_COUNT">%1$d</xliff:g> contas serão redefinidas</item>
-    </plurals>
-    <string name="master_clear_summary" msgid="6902443944660426951">"O armazenamento interno e todos os dados serão redefinidos"</string>
+    <string name="master_clear_title" msgid="3531267871084279512">"Limpar todos os dados (redefinição para configuração original)"</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_accounts" product="default" msgid="6412857499147999073">\n\n"No momento você está conectado às seguintes contas:\n"</string>
     <string name="master_clear_other_users_present" product="default" msgid="5161423070702470742">\n\n"Há outros usuários presentes neste dispositivo.\n"</string>
     <string name="master_clear_desc_also_erases_external" msgid="1903185203791274237"><li>"Músicas"</li>\n<li>"Fotos"</li>\n<li>"Outros dados do usuário"</li></string>
+    <string name="master_clear_desc_also_erases_esim" msgid="312352697653096008"><li>"Operadoras no eSIM"</li></string>
+    <string name="master_clear_desc_no_cancel_mobile_plan" msgid="5460926449093211144">\n\n"Essa ação não cancelará seu plano de serviços móveis."</string>
     <string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="7744115866662613411">\n\n"Para limpar músicas, fotos e outros dados de usuário, o "<b>"armazenamento USB"</b>" precisa ser apagado."</string>
     <string name="master_clear_desc_erase_external_storage" product="default" msgid="4801026652617377093">\n\n"Para limpar músicas, imagens e outros dados de usuário, o conteúdo do "<b>"cartão SD"</b>" precisa ser apagado."</string>
     <string name="erase_external_storage" product="nosdcard" msgid="969364037450286809">"Apagar armazenamento USB"</string>
@@ -1350,7 +1362,7 @@
     <string name="erase_esim_storage_description" product="tablet" msgid="1780953956941209107">"Limpa todos os eSIMs no tablet. Essa opção não cancela seu plano de serviços móveis."</string>
     <string name="master_clear_button_text" product="tablet" msgid="3130786116528304116">"Redefinir tablet"</string>
     <string name="master_clear_button_text" product="default" msgid="7550632653343157971">"Redefinir smartphone"</string>
-    <string name="master_clear_final_desc" msgid="7318683914280403086">"Limpar todas as suas informações pessoais e apps baixados por download? Não é possível desfazer esta ação."</string>
+    <string name="master_clear_final_desc" msgid="7318683914280403086">"Limpar todas as suas informações pessoais e apps transferidos por download? Não é possível desfazer esta ação."</string>
     <string name="master_clear_final_button_text" msgid="5390908019019242910">"Apagar tudo"</string>
     <string name="master_clear_failed" msgid="2503230016394586353">"Nenhuma redefinição foi realizada porque o serviço de Limpeza do sistema não está disponível."</string>
     <string name="master_clear_confirm_title" msgid="7572642091599403668">"Redefinir?"</string>
@@ -1455,18 +1467,19 @@
     <string name="settings_safetylegal_activity_title" msgid="6901214628496951727">"Informações de segurança"</string>
     <string name="settings_safetylegal_activity_unreachable" msgid="250674109915859456">"Você não tem uma conexão de dados. Para visualizar estas informações agora, acesse %s em qualquer computador conectado à Internet."</string>
     <string name="settings_safetylegal_activity_loading" msgid="8059022597639516348">"Carregando..."</string>
-    <string name="lockpassword_choose_your_password_header" msgid="8624900666929394990">"Escolha a sua senha"</string>
-    <string name="lockpassword_choose_your_password_header_for_fingerprint" msgid="6624409510609085450">"Para usar a impressão digital, defina uma senha"</string>
-    <string name="lockpassword_choose_your_pattern_header" msgid="6949761069941694050">"Escolha seu padrão"</string>
-    <string name="lockpassword_choose_your_pattern_header_for_fingerprint" msgid="5901096361617543819">"Para usar a impressão digital, defina um padrão"</string>
-    <string name="lockpassword_choose_your_pin_header" msgid="7598849519816138302">"Escolha o seu PIN"</string>
-    <string name="lockpassword_choose_your_pin_header_for_fingerprint" msgid="765344692615917183">"Para usar a impressão digital, defina um PIN"</string>
-    <string name="lockpassword_confirm_your_password_header" msgid="6308478184889846633">"Confirme sua senha"</string>
+    <string name="lockpassword_choose_your_screen_lock_header" msgid="3872462096767152394">"Definir um bloqueio de tela"</string>
+    <string name="lockpassword_choose_your_password_message" msgid="1197569283524841412">"Por segurança, defina uma senha"</string>
+    <string name="lockpassword_choose_your_password_header_for_fingerprint" msgid="2541818487015343503">"Para usar sua digital, defina uma senha"</string>
+    <string name="lockpassword_choose_your_pattern_header_for_fingerprint" msgid="7709785406243556723">"Para usar sua digital, defina um padrão"</string>
+    <string name="lockpassword_choose_your_pin_message" msgid="1875420718677275646">"Por segurança, defina um PIN"</string>
+    <string name="lockpassword_choose_your_pin_header_for_fingerprint" msgid="1549639053195796674">"Para usar a impressão digital, defina um PIN"</string>
+    <string name="lockpassword_choose_your_pattern_message" msgid="5986983400689720015">"Por segurança, defina um padrão"</string>
+    <string name="lockpassword_confirm_your_password_header" msgid="1266027268220850931">"Digite sua senha novamente"</string>
     <string name="lockpassword_confirm_your_pattern_header" msgid="7543433733032330821">"Confirme seu padrão"</string>
-    <string name="lockpassword_confirm_your_pin_header" msgid="49038294648213197">"Confirme o seu PIN"</string>
+    <string name="lockpassword_confirm_your_pin_header" msgid="7744513791910572550">"Digite seu PIN novamente"</string>
     <string name="lockpassword_confirm_passwords_dont_match" msgid="5140892109439191415">"As senhas não correspondem"</string>
     <string name="lockpassword_confirm_pins_dont_match" msgid="7226244811505606217">"Os PINs não correspondem"</string>
-    <string name="lockpassword_choose_lock_generic_header" msgid="3811438094903786145">"Seleção de desbloqueio"</string>
+    <string name="lockpassword_choose_lock_generic_header" msgid="3811438094903786145">"Selecionar desbloqueio"</string>
     <string name="lockpassword_password_set_toast" msgid="4875050283108629383">"A senha foi definida"</string>
     <string name="lockpassword_pin_set_toast" msgid="6011826444725291475">"O PIN foi definido"</string>
     <string name="lockpassword_pattern_set_toast" msgid="6867259621331406236">"O padrão foi definido"</string>
@@ -1476,18 +1489,18 @@
     <string name="lockpassword_confirm_your_pattern_generic_profile" msgid="4435638308193361861">"Use seu padrão de trabalho para continuar"</string>
     <string name="lockpassword_confirm_your_pin_generic_profile" msgid="3730141667547002246">"Digite seu PIN de trabalho para continuar"</string>
     <string name="lockpassword_confirm_your_password_generic_profile" msgid="4250642723467019894">"Digite sua senha de trabalho para continuar"</string>
-    <!-- no translation found for lockpassword_strong_auth_required_device_pattern (530802132223800623) -->
-    <skip />
-    <!-- no translation found for lockpassword_strong_auth_required_device_pin (7829294830078036417) -->
-    <skip />
-    <!-- no translation found for lockpassword_strong_auth_required_device_password (3552644641574796973) -->
-    <skip />
-    <!-- no translation found for lockpassword_strong_auth_required_work_pattern (3003781907040522053) -->
-    <skip />
-    <!-- no translation found for lockpassword_strong_auth_required_work_pin (3367491332598821552) -->
-    <skip />
-    <!-- no translation found for lockpassword_strong_auth_required_work_password (8159775129968582940) -->
-    <skip />
+    <string name="lockpassword_strong_auth_required_device_pattern" msgid="530802132223800623">"Para aumentar a segurança, use o padrão do dispositivo"</string>
+    <string name="lockpassword_strong_auth_required_device_pin" msgid="7829294830078036417">"Para aumentar a segurança, digite o PIN do dispositivo"</string>
+    <string name="lockpassword_strong_auth_required_device_password" msgid="3552644641574796973">"Para aumentar a segurança, digite a senha do dispositivo."</string>
+    <string name="lockpassword_strong_auth_required_work_pattern" msgid="3003781907040522053">"Para aumentar a segurança, use o padrão de trabalho"</string>
+    <string name="lockpassword_strong_auth_required_work_pin" msgid="3367491332598821552">"Para aumentar a segurança, digite o PIN de trabalho"</string>
+    <string name="lockpassword_strong_auth_required_work_password" msgid="8159775129968582940">"Para aumentar a segurança, digite a senha de trabalho"</string>
+    <string name="lockpassword_confirm_your_pattern_details_frp" msgid="6757336656791723193">"Seu smartphone foi redefinido para a configuração original. Para usá-lo, digite seu padrão anterior."</string>
+    <string name="lockpassword_confirm_your_pin_details_frp" msgid="826520613445990470">"Seu smartphone foi redefinido para a configuração original. Para usá-lo, digite seu PIN anterior."</string>
+    <string name="lockpassword_confirm_your_password_details_frp" msgid="8944081074615739040">"Seu smartphone foi redefinido para a configuração original. Para usá-lo, digite sua senha anterior."</string>
+    <string name="lockpassword_confirm_your_pattern_header_frp" msgid="2898036091609128286">"Verificar padrão"</string>
+    <string name="lockpassword_confirm_your_pin_header_frp" msgid="4141601774778898803">"Verificar PIN"</string>
+    <string name="lockpassword_confirm_your_password_header_frp" msgid="3762615419295360480">"Verificar senha"</string>
     <string name="lockpassword_invalid_pin" msgid="15588049067548470">"PIN incorreto"</string>
     <string name="lockpassword_invalid_password" msgid="4038507398784975200">"Senha incorreta"</string>
     <string name="lockpattern_need_to_unlock_wrong" msgid="1745247595356012176">"Padrão incorreto"</string>
@@ -1511,7 +1524,7 @@
     <string name="lockpattern_settings_enable_visible_pattern_title" msgid="2615606088906120711">"Tornar o padrão visível"</string>
     <string name="lockpattern_settings_enable_visible_pattern_title_profile" msgid="4864525074768391381">"Tornar o padrão de perfil visível"</string>
     <string name="lockpattern_settings_enable_tactile_feedback_title" msgid="4389015658335522989">"Vibrar ao tocar"</string>
-    <string name="lockpattern_settings_enable_power_button_instantly_locks" msgid="5735444062633666327">"Botão liga/desliga bloqueia"</string>
+    <string name="lockpattern_settings_enable_power_button_instantly_locks" msgid="5735444062633666327">"Bloquear com botão liga/desliga"</string>
     <string name="lockpattern_settings_power_button_instantly_locks_summary" msgid="8196258755143711694">"Exceto quando mantido desbloqueado por <xliff:g id="TRUST_AGENT_NAME">%1$s</xliff:g>"</string>
     <string name="lockpattern_settings_choose_lock_pattern" msgid="1652352830005653447">"Padrão de desbloqueio"</string>
     <string name="lockpattern_settings_change_lock_pattern" msgid="1123908306116495545">"Alterar padrão"</string>
@@ -1537,7 +1550,6 @@
     <string name="install_applications_title" msgid="4987712352256508946">"Permitir todas as origens"</string>
     <string name="recent_app_category_title" msgid="6673071268966003928">"Apps abertos recentemente"</string>
     <string name="see_all_apps_title" msgid="1317153498074308438">"Ver todos os <xliff:g id="COUNT">%1$d</xliff:g> apps"</string>
-    <string name="recent_app_summary" msgid="3366446669844932300">"Há <xliff:g id="TIME">^1</xliff:g>"</string>
     <string name="install_all_warning" product="tablet" msgid="8310489909586138165">"Seu tablet e seus dados pessoais estão mais vulneráveis a ataques de apps desconhecidos. Ao instalar apps dessa fonte, você concorda que é responsável por qualquer dano causado ao seu tablet ou pela perda de dados que possa resultar do uso desses apps."</string>
     <string name="install_all_warning" product="default" msgid="1952257127370115988">"Seu smartphone e seus dados pessoais estão mais vulneráveis a ataques de apps desconhecidos. Ao instalar apps dessa fonte, você concorda que é responsável por qualquer dano causado ao seu smartphone ou pela perda de dados que possa resultar do uso desses apps."</string>
     <string name="advanced_settings" msgid="1777249286757067969">"Configurações avançadas"</string>
@@ -1586,7 +1598,7 @@
     <string name="default_emergency_app" msgid="1951760659640369980">"App de emergência"</string>
     <string name="reset_app_preferences" msgid="1321050641018356925">"Redefinir apps"</string>
     <string name="reset_app_preferences_title" msgid="6093179367325336662">"Redefinir apps?"</string>
-    <string name="reset_app_preferences_desc" msgid="4822447731869201512">"Isso redefinirá todas as preferências para:\n \n "<li>"apps desabilitados;"</li>" \n "<li>"notificações de apps desabilitados;"</li>" \n "<li>"apps padrão para ações;"</li>" \n "<li>"restrições de dados em segundo plano para apps;"</li>" \n "<li>"qualquer restrição de permissão."</li>" \n\n Você não perderá os dados dos apps."</string>
+    <string name="reset_app_preferences_desc" msgid="4822447731869201512">"Isso redefinirá todas as preferências para:\n \n "<li>"apps desabilitados"</li>" \n "<li>"notificações de apps desabilitados"</li>" \n "<li>"apps padrão para ações"</li>" \n "<li>"restrições de dados em segundo plano para apps"</li>" \n "<li>"qualquer restrição de permissão"</li>" \n\n Você não perderá os dados dos apps."</string>
     <string name="reset_app_preferences_button" msgid="2559089511841281242">"Redefinir apps"</string>
     <string name="manage_space_text" msgid="8852711522447794676">"Gerenciar espaço"</string>
     <string name="filter" msgid="2018011724373033887">"Filtro"</string>
@@ -1739,7 +1751,7 @@
     <string name="keyboard_shortcuts_helper" msgid="4839453720463798145">"Assistente de atalhos do teclado"</string>
     <string name="keyboard_shortcuts_helper_summary" msgid="5871299901459743288">"Mostrar atalhos disponíveis"</string>
     <string name="default_keyboard_layout" msgid="4172606673510531271">"Padrão"</string>
-    <string name="pointer_speed" msgid="1221342330217861616">"Velocidade do ponteiro"</string>
+    <string name="pointer_speed" msgid="1221342330217861616">"Velocidade do cursor"</string>
     <string name="game_controller_settings_category" msgid="8794508575329923718">"Controlador de jogos"</string>
     <string name="vibrate_input_devices" msgid="2599591466928793082">"Usar vibração"</string>
     <string name="vibrate_input_devices_summary" msgid="4595570516865299153">"Redirecionar vibração para o controlador de jogos quando estiver conectado."</string>
@@ -1801,7 +1813,7 @@
     <string name="accessibility_settings_summary" msgid="981260486011624939">"Controles de interação, leitores de tela, exibição"</string>
     <string name="vision_settings_title" msgid="4204111425716868288">"Configuração visual"</string>
     <string name="vision_settings_description" msgid="5679491180156408260">"É possível personalizar este dispositivo para atender às suas necessidades. Esses recursos de acessibilidade podem ser alterados posteriormente em \"Configurar\"."</string>
-    <string name="vision_settings_suggestion_title" msgid="917294957154878441">"Aumentar tamanho da fonte"</string>
+    <string name="vision_settings_suggestion_title" msgid="8058794060304707004">"Alterar tamanho da fonte"</string>
     <string name="screen_reader_category_title" msgid="7739154903913400641">"Leitores de tela"</string>
     <string name="audio_and_captions_category_title" msgid="3420727114421447524">"Áudio e texto na tela"</string>
     <string name="display_category_title" msgid="685461049938269166">"Tela"</string>
@@ -1838,7 +1850,6 @@
     <string name="accessibility_display_inversion_preference_subtitle" msgid="7052959202195368109">"Pode afetar o desempenho"</string>
     <string name="accessibility_autoclick_preference_title" msgid="7014499339068449623">"Clicar após parada do ponteiro"</string>
     <string name="accessibility_autoclick_delay_preference_title" msgid="3962261178385106006">"Atraso antes do clique"</string>
-    <string name="preference_summary_default_combination" msgid="8532964268242666060">"<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">"ATIVAR"</string>
     <string name="accessibility_summary_state_disabled" msgid="2241315620132005595">"DESATIVAR"</string>
     <string name="enable_quick_setting" msgid="2366999897816894536">"Mostrar em \"Configurações rápidas\""</string>
@@ -1957,12 +1968,14 @@
     <string name="background_activity_summary_on" msgid="649282072540085599">"O app pode ser executado em segundo plano quando não está em uso"</string>
     <string name="background_activity_summary_off" msgid="7666330699090632040">"A atividade em segundo plano do app é limitada quando ele não está em uso"</string>
     <string name="background_activity_summary_disabled" msgid="3710669050484599847">"Execução do app em segundo plano não permitida"</string>
+    <string name="background_activity_summary_whitelisted" msgid="7375400051141016808">"Não é possível otimizar o consumo de bateria do app"</string>
+    <string name="background_activity_warning_dialog_title" msgid="2216249969149568871">"Limitar atividade em segundo plano?"</string>
+    <string name="background_activity_warning_dialog_text" msgid="7049624449246121981">"Se você limitar as atividades em segundo plano de um app, ele poderá apresentar mau funcionamento"</string>
     <string name="device_screen_usage" msgid="3386088035570409683">"Uso da tela desde a carga completa"</string>
     <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_device" msgid="7036566616386864302">"Uso do dispositivo desde a última carga completa (<xliff:g id="TIME">^1</xliff:g> atrás)"</string>
+    <string name="power_usage_list_summary" msgid="6393929085382334341">"Uso de apps desde a última carga completa (<xliff:g id="RELATIVE_TIME">^1</xliff:g>)"</string>
+    <string name="power_usage_list_summary_device" msgid="4461926045610455423">"Uso do dispositivo desde a última carga completa (<xliff:g id="RELATIVE_TIME">^1</xliff:g>)"</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>
     <string name="battery_since_unplugged" msgid="338073389740738437">"Uso da bateria desde a desconexão do aparelho"</string>
@@ -2208,14 +2221,14 @@
     <string name="credentials_unlock_hint" msgid="2301301378040499348">"Digite a senha para o armazenamento de credenciais."</string>
     <string name="credentials_old_password" msgid="7553393815538684028">"Senha atual:"</string>
     <string name="credentials_reset_hint" msgid="6297256880896133631">"Remover todo o conteúdo?"</string>
-    <string name="credentials_password_too_short" msgid="7502749986405522663">"A senha deve ter no mínimo 8 caracteres."</string>
     <string name="credentials_wrong_password" msgid="2541932597104054807">"Senha incorreta."</string>
     <string name="credentials_reset_warning" msgid="5320653011511797600">"Senha incorreta. Você tem uma ou mais tentativas antes do armazenamento de credencial ser apagado."</string>
     <string name="credentials_reset_warning_plural" msgid="6514085665301095279">"Senha incorreta. Você tem mais <xliff:g id="NUMBER">%1$d</xliff:g> tentativas antes do armazenamento de credencial ser apagado."</string>
     <string name="credentials_erased" msgid="2907836028586342969">"Armazenamento de credenciais apagado."</string>
     <string name="credentials_not_erased" msgid="7685932772284216097">"Armaz. de creden. não apagado."</string>
     <string name="credentials_enabled" msgid="7588607413349978930">"Armazenamento de credenciais ativado."</string>
-    <string name="credentials_configure_lock_screen_hint" msgid="6757119179588664966">"É necessário configurar PIN ou senha para a tela de bloqueio antes de usar o armazenamento de credenciais."</string>
+    <string name="credentials_configure_lock_screen_hint" msgid="8058230497337529036">"Para que você possa usar o armazenamento de credenciais, seu dispositivo precisa ter uma tela de bloqueio"</string>
+    <string name="credentials_configure_lock_screen_button" msgid="253239765216055321">"DEFINIR BLOQUEIO"</string>
     <string name="usage_access_title" msgid="332333405495457839">"Apps com acesso ao uso"</string>
     <string name="emergency_tone_title" msgid="1055954530111587114">"Tom de emergência"</string>
     <string name="emergency_tone_summary" msgid="722259232924572153">"Definir comportamento durante uma chamada de emergência"</string>
@@ -2266,7 +2279,7 @@
     <string name="wifi_setup_not_connected" msgid="6997432604664057052">"Não conectado"</string>
     <string name="wifi_setup_add_network" msgid="5939624680150051807">"Adicionar rede"</string>
     <string name="wifi_setup_refresh_list" msgid="3411615711486911064">"Atualizar lista"</string>
-    <string name="wifi_setup_skip" msgid="6661541841684895522">"Ignorar"</string>
+    <string name="wifi_setup_skip" msgid="6661541841684895522">"Pular"</string>
     <string name="wifi_setup_next" msgid="3388694784447820477">"Avançar"</string>
     <string name="wifi_setup_back" msgid="144777383739164044">"Voltar"</string>
     <string name="wifi_setup_detail" msgid="2336990478140503605">"Detalhes da rede"</string>
@@ -2335,8 +2348,6 @@
     <skip />
     <string name="cant_sync_dialog_title" msgid="2777238588398046285">"Não é possível sincronizar manualmente"</string>
     <string name="cant_sync_dialog_message" msgid="1938380442159016449">"A sincronização para o item está desativada no momento. Para alterar essa configuração, ative os dados de segundo plano e a sincronização automática temporariamente."</string>
-    <string name="wimax_settings" msgid="2655139497028469039">"4G"</string>
-    <string name="status_wimax_mac_address" msgid="8390791848661413416">"Endereço MAC 4G"</string>
     <string name="enter_password" msgid="8035706727471334122">"Para iniciar o Android, digite sua senha"</string>
     <string name="enter_pin" msgid="5305333588093263790">"Para iniciar o Android, digite seu PIN"</string>
     <string name="enter_pattern" msgid="4187435713036808566">"Para iniciar o Android, desenhe seu padrão"</string>
@@ -2350,6 +2361,7 @@
     <string name="misc_files_selected_count" msgid="4647048020823912088">"selecionados <xliff:g id="NUMBER">%1$d</xliff:g> de <xliff:g id="TOTAL">%2$d</xliff:g>"</string>
     <string name="misc_files_selected_count_bytes" msgid="2876232009069114352">"<xliff:g id="NUMBER">%1$s</xliff:g> de <xliff:g id="TOTAL">%2$s</xliff:g>"</string>
     <string name="select_all" msgid="1562774643280376715">"Selecionar tudo"</string>
+    <string name="data_plan_usage_manage_plans_button_text" msgid="8997761990902708162">"Gerenciar planos"</string>
     <string name="data_usage_summary_title" msgid="3804110657238092929">"Uso de dados"</string>
     <string name="data_usage_app_summary_title" msgid="4147258989837459172">"Dados uso de apps"</string>
     <string name="data_usage_accounting" msgid="7170028915873577387">"O cálculo da operadora poderá ser diferente de seu dispositivo."</string>
@@ -2379,7 +2391,7 @@
     <string name="data_usage_pick_cycle_day" msgid="4470796861757050966">"Dia do mês para redefinir o ciclo de uso dos dados:"</string>
     <string name="data_usage_empty" msgid="8621855507876539282">"Nenhum app usou dados durante o período."</string>
     <string name="data_usage_label_foreground" msgid="4938034231928628164">"Primeiro plano"</string>
-    <string name="data_usage_label_background" msgid="3225844085975764519">"Plano de fundo"</string>
+    <string name="data_usage_label_background" msgid="3225844085975764519">"Segundo plano"</string>
     <string name="data_usage_app_restricted" msgid="3568465218866589705">"restrito"</string>
     <string name="data_usage_disable_mobile" msgid="8656552431969276305">"Desativar os dados móveis?"</string>
     <string name="data_usage_disable_mobile_limit" msgid="4644364396844393848">"Definir limite de dados móveis"</string>
@@ -2410,7 +2422,7 @@
     <string name="data_usage_auto_sync_on_dialog" product="default" msgid="8651376294887142858">"As alterações feitas em suas contas na Web serão automaticamente copiadas para o smartphone.\n\nAlgumas contas também poderão copiar automaticamente as alterações feitas no smartphone para a Web. É assim que funciona uma Conta do Google."</string>
     <string name="data_usage_auto_sync_off_dialog_title" msgid="9013139130490125793">"Desativar sincroniz. automática?"</string>
     <string name="data_usage_auto_sync_off_dialog" msgid="4025938250775413864">"Isto preservará o uso de dados e da bateria, mas será necessário sincronizar manualmente cada conta para obter as informações mais recentes, e você não será informado de novas atualizações."</string>
-    <string name="data_usage_cycle_editor_title" msgid="1373797281540188533">"Data de redefinição do ciclo de uso"</string>
+    <string name="data_usage_cycle_editor_title" msgid="1373797281540188533">"Escolha o dia de início do ciclo"</string>
     <string name="data_usage_cycle_editor_subtitle" msgid="5512903797979928416">"Data de cada mês:"</string>
     <string name="data_usage_cycle_editor_positive" msgid="8821760330497941117">"Definir"</string>
     <string name="data_usage_warning_editor_title" msgid="3704136912240060339">"Definir aviso de uso de dados"</string>
@@ -2435,6 +2447,9 @@
     <string name="data_usage_metered_mobile" msgid="5423305619126978393">"Redes móveis"</string>
     <string name="data_usage_metered_wifi" msgid="1761738002328299714">"Redes Wi-Fi limitadas"</string>
     <string name="data_usage_metered_wifi_disabled" msgid="727808462375941567">"Para selecionar redes limitadas, ative o Wi-Fi."</string>
+    <string name="data_usage_metered_auto" msgid="1262028400911918865">"Automático"</string>
+    <string name="data_usage_metered_yes" msgid="9217539611385225894">"Limitada"</string>
+    <string name="data_usage_metered_no" msgid="4025232961929071789">"Ilimitada"</string>
     <string name="data_usage_disclaimer" msgid="6887858149980673444">"O cálculo da operadora poderá ser diferente de seu dispositivo."</string>
     <string name="cryptkeeper_emergency_call" msgid="198578731586097145">"Chamada de emergência"</string>
     <string name="cryptkeeper_return_to_call" msgid="5613717339452772491">"Retornar à chamada"</string>
@@ -2526,9 +2541,6 @@
     <string name="backup_pw_set_button_text" msgid="2387480910044648795">"Definir a senha de backup"</string>
     <string name="backup_pw_cancel_button_text" msgid="8845630125391744615">"Cancelar"</string>
     <string name="additional_system_update_settings_list_item_title" msgid="214987609894661992">"Mais atualizações do sistema"</string>
-    <string name="selinux_status_disabled" msgid="924551035552323327">"Desativado"</string>
-    <string name="selinux_status_permissive" msgid="6004965534713398778">"Permissivo"</string>
-    <string name="selinux_status_enforcing" msgid="2252703756208463329">"Impondo"</string>
     <string name="ssl_ca_cert_warning" msgid="2045866713601984673">"A rede pode ser monitorada"</string>
     <string name="done_button" msgid="1991471253042622230">"Concluído"</string>
     <plurals name="ssl_ca_cert_dialog_title" formatted="false" msgid="7145092748045794650">
@@ -2571,7 +2583,7 @@
     <string name="user_add_user_message_long" msgid="8562152293752222985">"É possível compartilhar esse dispositivo com outras pessoas criando usuários adicionais. Cada usuário tem seu próprio espaço, que pode ser personalizado com apps, planos de fundo etc. Os usuários também podem ajustar as configurações do dispositivo, como Wi‑Fi, que afetam a todos.\n\nQuando você adiciona um novo usuário, essa pessoa precisa configurar o próprio espaço.\n\nQualquer usuário pode atualizar apps para os demais usuários."</string>
     <string name="user_add_user_message_short" msgid="1511354412249044381">"Quando você adiciona um novo usuário, essa pessoa precisa configurar o próprio espaço.\n\nQualquer usuário pode atualizar apps para os demais usuários."</string>
     <string name="user_setup_dialog_title" msgid="1765794166801864563">"Configurar o usuário agora?"</string>
-    <string name="user_setup_dialog_message" msgid="1004068621380867148">"Certifique-se de que a pessoa está disponível para assumir o dispositivo e configurar seu espaço"</string>
+    <string name="user_setup_dialog_message" msgid="1004068621380867148">"Certifique-se de que a pessoa está disponível para acessar o dispositivo e configurar seu espaço"</string>
     <string name="user_setup_profile_dialog_message" msgid="3896568553327558731">"Configurar perfil agora?"</string>
     <string name="user_setup_button_setup_now" msgid="3391388430158437629">"Configurar agora"</string>
     <string name="user_setup_button_setup_later" msgid="3068729597269172401">"Agora não"</string>
@@ -2615,7 +2627,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">"Tocar e pagar"</string>
+    <string name="nfc_payment_settings_title" msgid="1807298287380821613">"Toque e pague"</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>
@@ -2624,13 +2636,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 \"Tocar e pagar\", pagar com:"</string>
+    <string name="nfc_payment_pay_with" msgid="7524904024378144072">"Em um terminal \"Toque e pague\", 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 \"Tocar e pagar\"?"</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_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>
@@ -2643,7 +2655,7 @@
     <string name="extreme_threats_title" msgid="6549541803542968699">"Ameaças extremas"</string>
     <string name="extreme_threats_summary" msgid="8777860706500920667">"Receba alertas para ameaças extremas: materiais ou à vida"</string>
     <string name="severe_threats_title" msgid="8362676353803170963">"Ameaças graves"</string>
-    <string name="severe_threats_summary" msgid="8848126509420177320">"Receber alertas para ameaças graves: materiais ou à vida"</string>
+    <string name="severe_threats_summary" msgid="8848126509420177320">"Receber alertas para ameaças graves, materiais ou à vida"</string>
     <string name="amber_alerts_title" msgid="2772220337031146529">"Alertas AMBER"</string>
     <string name="amber_alerts_summary" msgid="4312984614037904489">"Receber boletins sobre crianças sequestradas"</string>
     <string name="repeat_title" msgid="6473587828597786996">"Repetir"</string>
@@ -2785,8 +2797,7 @@
     <string name="keywords_gesture" msgid="3526905012224714078">"gestos"</string>
     <string name="keywords_payment_settings" msgid="5220104934130446416">"pagar, tocar, pagamentos"</string>
     <string name="keywords_backup" msgid="470070289135403022">"backup, back up"</string>
-    <!-- no translation found for keywords_assist_gesture_launch (813968759791342591) -->
-    <skip />
+    <string name="keywords_assist_gesture_launch" msgid="813968759791342591">"gesto"</string>
     <string name="setup_wifi_nfc_tag" msgid="9028353016222911016">"Configurar etiqueta NFC Wi-Fi"</string>
     <string name="write_tag" msgid="8571858602896222537">"Gravar"</string>
     <string name="status_awaiting_tap" msgid="2130145523773160617">"Toque em uma marca para gravar…"</string>
@@ -2830,7 +2841,7 @@
       <item quantity="other"><xliff:g id="ON_COUNT">%d</xliff:g> regras automáticas ativadas</item>
     </plurals>
     <string name="zen_mode_settings_title" msgid="842308776768942600">"Preferências de \"Não perturbe\""</string>
-    <string name="zen_mode_priority_settings_title" msgid="2623117023031824309">"Permite Somente prioridade"</string>
+    <string name="zen_mode_priority_settings_title" msgid="2623117023031824309">"Configurar \"Somente prioridade\""</string>
     <string name="zen_mode_automation_settings_title" msgid="4228995740594063774">"Regras automáticas"</string>
     <string name="zen_mode_automation_suggestion_title" msgid="5105443455143476201">"Definir regras de Não perturbe"</string>
     <string name="zen_mode_automation_suggestion_summary" msgid="4732808039946935657">"Limitar som e vibrar eventualmente"</string>
@@ -2872,19 +2883,21 @@
     <string name="notifications_title" msgid="8086372779371204971">"Notificações"</string>
     <string name="app_notifications_title" msgid="5810577805218003760">"Notificações de apps"</string>
     <string name="notification_channel_title" msgid="2260666541030178452">"Categoria da notificação"</string>
+    <string name="notification_group_title" msgid="7180506440133859601">"Grupo de categoria de notificações"</string>
     <string name="notification_importance_title" msgid="848692592679312666">"Importância"</string>
-    <string name="notification_importance_unspecified" msgid="2196023702875112081">"Deixar o app decidir"</string>
+    <string name="notification_importance_unspecified" msgid="6622173510486113958">"Permitir som"</string>
     <string name="notification_importance_blocked" msgid="7938180808339386300">"Nunca mostrar notificações"</string>
     <string name="notification_importance_min" msgid="5455049524984686275">"Sem som ou interrupção visual"</string>
     <string name="notification_importance_low" msgid="8881468429453766553">"Sem som"</string>
     <string name="notification_importance_default" msgid="5958338024601957516">"Emitir som"</string>
     <string name="notification_importance_high" msgid="2082429479238228527">"Emitir som e exibir na tela"</string>
+    <string name="notification_importance_high_silent" msgid="2667033773703765252">"Exibir na tela"</string>
     <string name="notification_importance_min_title" msgid="6974673091137544803">"Baixa"</string>
     <string name="notification_importance_low_title" msgid="8131254047772814309">"Média"</string>
     <string name="notification_importance_default_title" msgid="9120383978536089489">"Alta"</string>
     <string name="notification_importance_high_title" msgid="3058778300264746473">"Urgente"</string>
     <string name="allow_interruption" msgid="7136150018111848721">"Permitir interrupções"</string>
-    <string name="allow_interruption_summary" msgid="7870159391333957050">"Permite que o app emita um som, vibre e/ou mostre notificações na tela"</string>
+    <string name="allow_interruption_summary" msgid="7870159391333957050">"Permitir que o app emita um som, vibre e/ou mostre notificações na tela"</string>
     <string name="notification_channel_summary_min" msgid="5401718014765921892">"Importância baixa"</string>
     <string name="notification_channel_summary_low" msgid="322317684244981244">"Importância média"</string>
     <string name="notification_channel_summary_default" msgid="1111749130423589931">"Importância elevada"</string>
@@ -2915,15 +2928,19 @@
     <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">"Permitir picture-in-picture"</string>
-    <!-- no translation found for picture_in_picture_app_detail_summary (1264019085827708920) -->
-    <skip />
+    <string name="picture_in_picture_app_detail_summary" msgid="1264019085827708920">"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="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>
     <string name="app_notifications_off_desc" msgid="4882445501376722969">"O Android está impedindo que as notificações desse app sejam exibidas neste dispositivo"</string>
     <string name="channel_notifications_off_desc" msgid="5899225298718840635">"O Android está impedindo que essa categoria de notificações seja exibida neste dispositivo"</string>
+    <string name="channel_group_notifications_off_desc" msgid="1620950416247316370">"O Android está impedindo que esse grupo de notificações seja exibido neste dispositivo"</string>
     <string name="notification_channels" msgid="5346841743182627500">"Categorias"</string>
     <string name="notification_channels_other" msgid="5645317113885788226">"Outros"</string>
+    <plurals name="notification_group_summary" formatted="false" msgid="3420621520561455358">
+      <item quantity="one"><xliff:g id="COUNT_1">%d</xliff:g> categoria</item>
+      <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> categorias</item>
+    </plurals>
     <string name="no_channels" msgid="3077375508177744586">"Este app não postou nenhuma notificação"</string>
     <string name="app_settings_link" msgid="8894946007543660906">"Configurações adicionais no app"</string>
     <string name="app_notification_listing_summary_zero" msgid="6482582965081108108">"Ativadas para todos os apps"</string>
@@ -2944,7 +2961,7 @@
     <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 essas notificações continuem a interromper quando \"Não perturbe\" estiver definido para \"Somente prioridade\""</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_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>
@@ -2974,9 +2991,9 @@
     <string name="zen_mode_event_rule_calendar" msgid="8787906563769067418">"Durante os eventos de"</string>
     <string name="zen_mode_event_rule_summary_calendar_template" msgid="5135844750232403975">"Durante eventos para <xliff:g id="CALENDAR">%1$s</xliff:g>"</string>
     <string name="zen_mode_event_rule_summary_any_calendar" msgid="4936646399126636358">"qualquer agenda"</string>
-    <string name="zen_mode_event_rule_summary_reply_template" msgid="6590671260829837157">"Onde a resposta seja <xliff:g id="REPLY">%1$s</xliff:g>"</string>
+    <string name="zen_mode_event_rule_summary_reply_template" msgid="6590671260829837157">"Quando a resposta for <xliff:g id="REPLY">%1$s</xliff:g>"</string>
     <string name="zen_mode_event_rule_calendar_any" msgid="6485568415998569885">"Qualquer agenda"</string>
-    <string name="zen_mode_event_rule_reply" msgid="5166322024212403739">"Onde a resposta seja"</string>
+    <string name="zen_mode_event_rule_reply" msgid="5166322024212403739">"Quando a resposta for"</string>
     <string name="zen_mode_event_rule_reply_any_except_no" msgid="8868873496008825961">"\"Sim\", \"Talvez\" ou \"Sem resposta\""</string>
     <string name="zen_mode_event_rule_reply_yes_or_maybe" msgid="2769656565454495824">"\"Sim\" ou \"Talvez\""</string>
     <string name="zen_mode_event_rule_reply_yes" msgid="1003598835878784659">"Sim"</string>
@@ -3000,6 +3017,7 @@
     <string name="zen_mode_from_starred" msgid="2678345811950997027">"Apenas de contatos marcados com estrela"</string>
     <string name="zen_mode_from_none" msgid="8219706639954614136">"Nenhuma"</string>
     <string name="zen_mode_alarms" msgid="2165302777886552926">"Alarmes"</string>
+    <string name="zen_mode_alarms_summary" msgid="3774926045611788635">"Alarmes são sempre prioridade e emitem som"</string>
     <string name="zen_mode_reminders" msgid="5458502056440485730">"Lembretes"</string>
     <string name="zen_mode_events" msgid="7914446030988618264">"Eventos"</string>
     <string name="zen_mode_all_callers" msgid="584186167367236922">"Todos os autores de chamadas"</string>
@@ -3034,6 +3052,7 @@
     <string name="zen_mode_screen_off_visual_interruptions" msgid="4850792880144382633">"Quando a tela está desativada"</string>
     <string name="zen_mode_no_visual_interruptions" msgid="8742776003822778472">"Quando a tela estiver ativada ou desativada"</string>
     <string name="notification_app_settings_button" msgid="6685640230371477485">"Configurações de notificação"</string>
+    <string name="suggestion_button_text" msgid="3275010948381252006">"Ok"</string>
     <string name="device_feedback" msgid="3238056036766293294">"Enviar feedback sobre o dispositivo"</string>
     <string name="restr_pin_enter_admin_pin" msgid="1085834515677448072">"Inserir PIN do administrador"</string>
     <string name="switch_on_text" msgid="1124106706920572386">"Ativado"</string>
@@ -3139,24 +3158,24 @@
     <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">"Assist. e entrada por voz"</string>
+    <string name="assist_and_voice_input_title" msgid="1733165754793221197">"Assistente 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 navegador"</string>
+    <string name="default_browser_title" msgid="8101772675085814670">"App de navegação"</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>
     <string name="system_app" msgid="9068313769550747372">"(Sistema)"</string>
     <string name="system_default_app" msgid="3091113402349739037">"(Padrão do sistema)"</string>
     <string name="apps_storage" msgid="4353308027210435513">"Armazenamento de apps"</string>
-    <string name="usage_access" msgid="5479504953931038165">"Acesso de uso"</string>
-    <string name="permit_usage_access" msgid="4012876269445832300">"Permitir acesso de uso"</string>
+    <string name="usage_access" msgid="5479504953931038165">"Acesso ao uso"</string>
+    <string name="permit_usage_access" msgid="4012876269445832300">"Permitir acesso ao uso"</string>
     <string name="app_usage_preference" msgid="7065701732733134991">"Preferências de uso de apps"</string>
-    <string name="usage_access_description" msgid="1352111094596416795">"O acesso de uso permite que um app rastreie que outros apps você está usando e com que frequência, bem como sua operadora, as configurações de idioma e outros detalhes."</string>
+    <string name="usage_access_description" msgid="1352111094596416795">"O acesso ao uso permite que um app rastreie que outros apps você está usando e com que frequência, bem como sua operadora, as configurações de idioma e outros detalhes."</string>
     <string name="memory_settings_title" msgid="7490541005204254222">"Memória"</string>
     <string name="memory_details_title" msgid="8542565326053693320">"Detalhes da memória"</string>
     <string name="always_running" msgid="6042448320077429656">"Sempre em execução (<xliff:g id="PERCENTAGE">%s</xliff:g>)"</string>
@@ -3170,7 +3189,7 @@
     <string name="process_format" msgid="77905604092541454">"<xliff:g id="APP_NAME">%1$s</xliff:g> (<xliff:g id="COUNT">%2$d</xliff:g>)"</string>
     <string name="high_power_apps" msgid="3459065925679828230">"Otimização de bateria"</string>
     <string name="additional_battery_info" msgid="4754099329165411970">"Alertas de uso"</string>
-    <string name="show_all_apps" msgid="1512506948197818534">"Mostrar uso total no dispositivo"</string>
+    <string name="show_all_apps" msgid="1512506948197818534">"Mostrar uso total do dispositivo"</string>
     <string name="hide_extra_apps" msgid="5016497281322459633">"Mostrar uso de apps"</string>
     <string name="power_high_usage_title" msgid="6027369425057347826">"Uso elevado"</string>
     <plurals name="power_high_usage_summary" formatted="false" msgid="467347882627862744">
@@ -3204,7 +3223,7 @@
     <string name="usb_use_charging_only" msgid="2180443097365214467">"Carregar este dispositivo"</string>
     <string name="usb_use_charging_only_desc" msgid="3066256793008540627">"Somente carregar este dispositivo"</string>
     <string name="usb_use_power_only" msgid="6426550616883919530">"Fornecer energia"</string>
-    <string name="usb_use_power_only_desc" msgid="3461232831015575152">"Carregue o dispositivo conectado. Isso funciona apenas com dispositivos compatíveis com o carregamento por USB."</string>
+    <string name="usb_use_power_only_desc" msgid="3461232831015575152">"Carregue o dispositivo conectado. Funciona apenas com dispositivos compatíveis com carregamento por USB."</string>
     <string name="usb_use_file_transfers" msgid="7409600791007250137">"Transferir arquivos"</string>
     <string name="usb_use_file_transfers_desc" msgid="4235764784331804488">"Transfere arquivos para outro dispositivo"</string>
     <string name="usb_use_photo_transfers" msgid="7794775645350330454">"Transferir fotos (PTP)"</string>
@@ -3218,6 +3237,7 @@
     <string name="usb_summary_file_transfers" msgid="6435943692610175111">"Transferência de arquivos"</string>
     <string name="usb_summary_photo_transfers" msgid="8440204169576585250">"Transferência de fotos (PTP)"</string>
     <string name="usb_summary_MIDI" msgid="5687906612187885908">"Uso do dispositivo como MIDI"</string>
+    <string name="sms_mirroring_pref" msgid="6475043279147376031">"Espelhamento de SMS"</string>
     <string name="background_check_pref" msgid="7550258400138010979">"Verificação em segundo plano"</string>
     <string name="background_check_title" msgid="4534254315824525593">"Acesso completo ao segundo plano"</string>
     <string name="assist_access_context_title" msgid="2269032346698890257">"Usar texto da tela"</string>
@@ -3284,7 +3304,7 @@
     <string name="write_settings_title" msgid="4232152481902542284">"Pode modificar configurações do sistema"</string>
     <string name="write_system_settings" msgid="3482913590601096763">"Mudar configurações do sistema"</string>
     <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="permit_write_settings" msgid="658555006453212691">"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>
@@ -3379,9 +3399,12 @@
     <string name="color_temperature" msgid="2070126836910615605">"Temperatura de cor fria"</string>
     <string name="color_temperature_desc" msgid="4793729830226404052">"Usar cores de tela mais frias"</string>
     <string name="color_temperature_toast" msgid="4974218172133854827">"Para aplicar a alteração de cor, desative a tela"</string>
-    <string name="telephony_monitor_toast" msgid="7003764250271195384">"Para que a alteração do monitor de telefonia seja aplicada, reinicialize o dispositivo"</string>
+    <string name="connectivity_monitor_switch" msgid="9059759348648583421">"Monitor de conectividade"</string>
+    <string name="connectivity_monitor_switch_summary" msgid="2828658652378866401">"O monitor de conectividade coletará registros quando detectar um problema de conectividade e enviará uma notificação ao usuário para informar um bug"</string>
+    <string name="connectivity_monitor_toast" msgid="5551859612881173028">"Para que a alteração do monitor de conectividade seja aplicada, reinicialize o dispositivo"</string>
     <string name="camera_hal_hdrplus_switch" msgid="8377365197105267466">"HDR+ da câmera HAL"</string>
     <string name="camera_hal_hdrplus_toast" msgid="2063703797270055299">"Para aplicar a alteração ao HDR+ da câmera HAL, reinicialize o dispositivo"</string>
+    <string name="camera_laser_sensor_switch" msgid="8913588990743234440">"Sensor a laser da câmera"</string>
     <string name="ota_disable_automatic_update" msgid="2319639631655915050">"Atualizações automáticas do sistema"</string>
     <string name="usage" msgid="2977875522080448986">"Utilização"</string>
     <string name="cellular_data_usage" msgid="2155683719898158203">"Uso de dados móveis"</string>
@@ -3407,7 +3430,7 @@
     <string name="data_warning" msgid="209133958008062117">"Aviso de dados"</string>
     <string name="set_data_limit" msgid="2901526323210516923">"Definir limite de dados"</string>
     <string name="data_limit" msgid="1885406964934590552">"Limite de dados"</string>
-    <string name="data_usage_template" msgid="392191945602400904">"<xliff:g id="ID_1">%1$s</xliff:g> usado(s) entre <xliff:g id="ID_2">%2$s</xliff:g>"</string>
+    <string name="data_usage_template" msgid="2923744765873163859">"<xliff:g id="ID_1">%1$s</xliff:g> usado(s) entre <xliff:g id="ID_2">%2$s</xliff:g>"</string>
     <string name="configure" msgid="1029654422228677273">"Configurar"</string>
     <string name="data_usage_other_apps" msgid="3272872663517382050">"Outros apps inclusos no uso"</string>
     <plurals name="data_saver_unrestricted_summary" formatted="false" msgid="2635267833484232703">
@@ -3427,7 +3450,7 @@
     <string name="lockpattern_settings_require_pattern_before_startup_summary" msgid="7873036097628404476">"Exigir padrão para iniciar seu dispositivo. Enquanto desativado, este dispositivo não recebe chamadas, mensagens, notificações ou alarmes."</string>
     <string name="lockpattern_settings_require_pin_before_startup_summary" msgid="6022831284097476933">"Exigir PIN para iniciar seu dispositivo. Enquanto desativado, este dispositivo não recebe chamadas, mensagens, notificações ou alarmes."</string>
     <string name="lockpattern_settings_require_password_before_startup_summary" msgid="6818285221244966231">"Exigir senha para iniciar seu dispositivo. Enquanto desativado, este dispositivo não recebe chamadas, mensagens, notificações ou alarmes."</string>
-    <string name="suggestion_additional_fingerprints" msgid="2214281455363797037">"Adicionar outra impr. digital"</string>
+    <string name="suggestion_additional_fingerprints" msgid="2214281455363797037">"Adicionar outra impressão digital"</string>
     <string name="suggestion_additional_fingerprints_summary" msgid="5471253233176471245">"Desbloqueie com um dedo diferente"</string>
     <string name="battery_saver_on_summary" msgid="9072203872401530722">"Ativado / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="battery_saver_off_summary" msgid="8309471955051162327">"Desativada / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
@@ -3467,7 +3490,7 @@
     <string name="notification_log_details_none" msgid="184131801230614059">"nenhum"</string>
     <string name="notification_log_details_ranking_null" msgid="244660392058720919">"O objeto de classificação está ausente."</string>
     <string name="notification_log_details_ranking_none" msgid="599607025882587844">"O objeto de classificação não contém essa chave."</string>
-    <string name="special_access" msgid="3458780842491881155">"Acesso especial ao app"</string>
+    <string name="special_access" msgid="3458780842491881155">"Acesso especial a apps"</string>
     <plurals name="special_access_summary" formatted="false" msgid="260765309935675867">
       <item quantity="one"><xliff:g id="COUNT">%d</xliff:g> app pode usar dados irrestritos</item>
       <item quantity="other"><xliff:g id="COUNT">%d</xliff:g> apps podem usar dados irrestritos</item>
@@ -3476,7 +3499,7 @@
     <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="387052719462473500">"Controlar informações na 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="8483187649355540109">"Suporte e dicas"</string>
@@ -3484,7 +3507,7 @@
     <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>
     <string name="premium_sms_access" msgid="4660047004791638305">"Acesso a SMS premium"</string>
-    <string name="bluetooth_disabled" msgid="2456198532288640046">"Não visível para outros dispositivos"</string>
+    <string name="bluetooth_disabled" msgid="6244000672828617410">"Desativado"</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 vários dispositivos"</string>
     <string name="demo_mode" msgid="2798762752209330277">"Modo de demonstração da IU do sistema"</string>
@@ -3564,16 +3587,16 @@
     <string name="ambient_display_summary" msgid="525662960806416373">"Para verificar a hora, ícones de notificação e outras informações, toque duas vezes na tela."</string>
     <string name="ambient_display_suggestion_summary" msgid="5987443721392571847">"Verificar as notificações quando a tela estiver desligada"</string>
     <string name="ambient_display_pickup_title" product="default" msgid="818688002837687268">"Levantar o smartphone para verificá-lo"</string>
-    <string name="ambient_display_pickup_title" product="tablet" msgid="4455864282995698097">"Levante o tablet para verificá-lo"</string>
-    <string name="ambient_display_pickup_title" product="device" msgid="5380534405773531175">"Levante o dispositivo para verificá-lo"</string>
+    <string name="ambient_display_pickup_title" product="tablet" msgid="4455864282995698097">"Levantar o tablet para verificá-lo"</string>
+    <string name="ambient_display_pickup_title" product="device" msgid="5380534405773531175">"Levantar o dispositivo para verificá-lo"</string>
     <string name="ambient_display_pickup_summary" product="default" msgid="4567020486787561873">"Para verificar a hora, ícones de notificação e outras informações, pegue o smartphone."</string>
     <string name="ambient_display_pickup_summary" product="tablet" msgid="5435283849947236648">"Para verificar a hora, ícones de notificação e outras informações, pegue o tablet."</string>
     <string name="ambient_display_pickup_summary" product="device" msgid="8256669101643381568">"Para verificar a hora, ícones de notificação e outras informações, pegue o dispositivo."</string>
     <string name="ambient_display_pickup_suggestion_summary" msgid="7014700589991761035">"Verificar as notificações quando a tela estiver desligada"</string>
-    <string name="fingerprint_swipe_for_notifications_title" msgid="5816346492253270243">"Deslizar impressão digital para ver as notificações"</string>
-    <string name="fingerprint_swipe_for_notifications_summary" product="default" msgid="1770661868393713922">"Para verificar suas notificações, deslize para baixo no sensor de impressão digital na parte traseira do smartphone."</string>
-    <string name="fingerprint_swipe_for_notifications_summary" product="tablet" msgid="902719947767712895">"Para verificar suas notificações, deslize para baixo no sensor de impressão digital na parte traseira do tablet."</string>
-    <string name="fingerprint_swipe_for_notifications_summary" product="device" msgid="5372926094116306647">"Para verificar suas notificações, deslize para baixo no sensor de impressão digital na parte traseira do dispositivo."</string>
+    <string name="fingerprint_swipe_for_notifications_title" msgid="5816346492253270243">"Usar impressão digital para ver as notificações"</string>
+    <string name="fingerprint_swipe_for_notifications_summary" product="default" msgid="1770661868393713922">"Para ver suas notificações, deslize o dedo indicador para baixo no sensor de impressão digital localizado na parte traseira do smartphone."</string>
+    <string name="fingerprint_swipe_for_notifications_summary" product="tablet" msgid="902719947767712895">"Para ver suas notificações, deslize o dedo indicador para baixo no sensor de impressão digital localizado na parte traseira do tablet."</string>
+    <string name="fingerprint_swipe_for_notifications_summary" product="device" msgid="5372926094116306647">"Para ver suas notificações, deslize o dedo indicador para baixo no sensor de impressão digital localizado na parte traseira do dispositivo."</string>
     <string name="fingerprint_swipe_for_notifications_suggestion_title" msgid="1677291167470357802">"Ver notificações rapidamente"</string>
     <string name="fingerprint_swipe_for_notifications_suggestion_summary" msgid="127592803294414082">"Deslize para baixo no sensor de impressão digital"</string>
     <string name="gesture_setting_on" msgid="3455094265233870280">"Ativado"</string>
@@ -3586,7 +3609,7 @@
     <string name="web_action_enable_title" msgid="4051513950976670853">"Apps instantâneos"</string>
     <string name="web_action_enable_summary" msgid="3108127559723396382">"Abrir links em apps, mesmo que eles não estejam instalados"</string>
     <string name="web_action_section_title" msgid="7364647086538399136">"Apps instantâneos"</string>
-    <string name="instant_apps_account" msgid="1433620209791992528">"Conta de apps instantâneos"</string>
+    <string name="instant_apps_settings" msgid="8827777916518348213">"Preferências de Instant Apps"</string>
     <string name="domain_url_section_title" msgid="7046835219056428883">"Apps instalados"</string>
     <string name="automatic_storage_manager_activation_warning" msgid="6353100011690933254">"Seu armazenamento está sendo controlado pelo gerenciador de armazenamento"</string>
     <string name="account_for_section_header" msgid="5356566418548737121">"Contas de <xliff:g id="USER_NAME">%1$s</xliff:g>"</string>
@@ -3633,7 +3656,9 @@
     <string name="enterprise_privacy_always_on_vpn_personal" msgid="9217774730260037434">"\"VPN sempre ativa\" ativada no seu perfil pessoal"</string>
     <string name="enterprise_privacy_always_on_vpn_work" msgid="7244472958208315814">"\"VPN sempre ativa\" ativada no seu perfil de trabalho"</string>
     <string name="enterprise_privacy_global_http_proxy" msgid="7936664553416257333">"Proxy HTTP geral definido"</string>
-    <string name="enterprise_privacy_ca_certs" msgid="5885892204903688909">"Credenciais confiáveis"</string>
+    <string name="enterprise_privacy_ca_certs_device" msgid="2019652712782510262">"Credenciais confiáveis"</string>
+    <string name="enterprise_privacy_ca_certs_personal" msgid="2279084820904076599">"Credenciais confiáveis no seu perfil pessoal"</string>
+    <string name="enterprise_privacy_ca_certs_work" msgid="6187377647815301809">"Credenciais confiáveis no seu perfil de trabalho"</string>
     <plurals name="enterprise_privacy_number_ca_certs" formatted="false" msgid="526375234629534165">
       <item quantity="one">No mínimo <xliff:g id="COUNT_1">%d</xliff:g> certificado de CA</item>
       <item quantity="other">No mínimo <xliff:g id="COUNT_1">%d</xliff:g> certificados de CA</item>
@@ -3692,10 +3717,12 @@
     <string name="storage_manager_indicator_on" msgid="8625551710194584733">"Ativado"</string>
     <string name="install_type_instant" msgid="3174425974536078647">"App instantâneo"</string>
     <string name="automatic_storage_manager_deactivation_warning" msgid="5605210730828410482">"Desativar o gerenciador de armazenamento?"</string>
-    <string name="storage_movies_tv" msgid="5498394447562086890">"Apps de filme e televisão"</string>
+    <string name="storage_movies_tv" msgid="5498394447562086890">"Apps de filmes e TV"</string>
     <string name="carrier_provisioning" msgid="4398683675591893169">"Informações de aprovisionamento da operadora"</string>
     <string name="trigger_carrier_provisioning" msgid="3434865918009286187">"Acionar aprovisionamento da operadora"</string>
     <string name="new_device_suggestion_title" msgid="698847081680980774">"O que há de novo e empolgante?"</string>
-    <string name="new_device_suggestion_summary" msgid="7172709269203435870">"Confira os cinco melhores recursos"</string>
+    <string name="new_device_suggestion_summary" product="default" msgid="206396571522515855">"Faça um tour pelo seu novo smartphone"</string>
+    <string name="new_device_suggestion_summary" product="tablet" msgid="393751455688210956">"Faça um tour pelo seu novo tablet"</string>
+    <string name="new_device_suggestion_summary" product="device" msgid="2939870049868336652">"Faça um tour pelo seu novo dispositivo"</string>
     <string name="disabled_low_ram_device" msgid="3751578499721173344">"Este recurso não está disponível neste dispositivo"</string>
 </resources>
diff --git a/res/values-pt-rPT/arrays.xml b/res/values-pt-rPT/arrays.xml
index d79abab..9df255c 100644
--- a/res/values-pt-rPT/arrays.xml
+++ b/res/values-pt-rPT/arrays.xml
@@ -100,8 +100,6 @@
     <!-- no translation found for wifi_security_no_eap:0 (2084555984818107151) -->
     <!-- no translation found for wifi_security_no_eap:1 (397579322683471524) -->
     <!-- no translation found for wifi_security_no_eap:2 (1968820975358150484) -->
-    <!-- no translation found for wifi_ap_security:0 (5251664683198623324) -->
-    <!-- no translation found for wifi_ap_security:1 (7989073072260294673) -->
   <string-array name="wifi_eap_method">
     <item msgid="1160193392455075561">"PEAP"</item>
     <item msgid="7981731051382306293">"TLS"</item>
diff --git a/res/values-pt-rPT/strings.xml b/res/values-pt-rPT/strings.xml
index 4e173d9..5fe21c5 100644
--- a/res/values-pt-rPT/strings.xml
+++ b/res/values-pt-rPT/strings.xml
@@ -25,7 +25,7 @@
     <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">You are now <xliff:g id="STEP_COUNT_1">%1$d</xliff:g> steps away from being a developer.</item>
+      <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="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>
@@ -166,7 +166,7 @@
     <string name="bluetooth_map_acceptance_dialog_text" msgid="8712508202081143737">"%1$s pretende aceder às suas mensagens. Conceder acesso a %2$s?"</string>
     <string name="bluetooth_sap_request" msgid="2669762224045354417">"Pedido de acesso ao SIM"</string>
     <string name="bluetooth_sap_acceptance_dialog_text" msgid="4414253873553608690">"<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g> pretende aceder ao seu cartão SIM. Ao conceder acesso ao cartão SIM, desativa a conetividade de dados no seu dispositivo durante a ligação. Fornecer acesso a <xliff:g id="DEVICE_NAME_1">%2$s?</xliff:g>"</string>
-    <string name="bluetooth_device_name_summary" msgid="4757990010751789977">"Visível como \"<xliff:g id="DEVICE_NAME">^1</xliff:g>\" para outros dispositivos"</string>
+    <string name="bluetooth_device_name_summary" msgid="522235742194965734">"Visível como \"<xliff:g id="DEVICE_NAME">^1</xliff:g>\" para outros dispositivos"</string>
     <string name="bluetooth_paired_device_title" msgid="8638994696317952019">"Os seus dispositivos"</string>
     <string name="bluetooth_pairing_page_title" msgid="7712127387361962608">"Sincronizar o novo dispositivo"</string>
     <string name="date_and_time" msgid="9062980487860757694">"Data e hora"</string>
@@ -254,7 +254,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">Remove selected languages?</item>
+      <item quantity="one">Pretende remover o idioma selecionado?</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>
@@ -312,12 +312,14 @@
     <string name="zone_auto" msgid="334783869352026648">"Fuso horário automático"</string>
     <string name="zone_auto_summaryOn" msgid="6142830927278458314">"Utilizar fuso horário fornecido pela rede"</string>
     <string name="zone_auto_summaryOff" msgid="2597745783162041390">"Utilizar fuso horário fornecido pela rede"</string>
+    <string name="date_time_24hour_auto" msgid="2117383168985653422">"Formato de 24 horas automático"</string>
+    <string name="date_time_24hour_auto_summary" msgid="6351812925651480277">"Utilizar local predefinido"</string>
     <string name="date_time_24hour_title" msgid="3203537578602803850">"Formato de 24 horas"</string>
     <string name="date_time_24hour" msgid="1193032284921000063">"Utilizar formato de 24 horas"</string>
     <string name="date_time_set_time_title" msgid="6296795651349047016">"Hora"</string>
     <string name="date_time_set_time" msgid="5716856602742530696">"Definir hora"</string>
     <string name="date_time_set_timezone_title" msgid="3047322337368233197">"Fuso horário"</string>
-    <string name="date_time_set_timezone" msgid="5045627174274377814">"Seleccionar fuso horário"</string>
+    <string name="date_time_set_timezone" msgid="5045627174274377814">"Selecionar fuso horário"</string>
     <string name="date_time_set_date_title" msgid="6928286765325608604">"Data"</string>
     <string name="date_time_set_date" msgid="7021491668550232105">"Definir data"</string>
     <string name="zone_list_menu_sort_alphabetically" msgid="5683377702671088588">"Ordenar alfabeticamente"</string>
@@ -359,11 +361,11 @@
     <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_1">%1$d</xliff:g> fingerprints set up</item>
+      <item quantity="one"><xliff:g id="COUNT_0">%1$d</xliff:g> impressão digital configurada</item>
       <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> impressões digitais configuradas</item>
     </plurals>
     <string name="security_settings_fingerprint_preference_summary_none" msgid="1507739327565151923"></string>
-    <string name="security_settings_fingerprint_enroll_introduction_title" msgid="3201556857492526098">"Desbloquear com impr. digital"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_title" msgid="3201556857492526098">"Desbloq. com impressão digital"</string>
     <string name="security_settings_fingerprint_enroll_introduction_title_unlock_disabled" msgid="7066417934622827305">"Utilizar a impressão digital"</string>
     <string name="security_settings_fingerprint_enroll_introduction_message" msgid="3508870672887336095">"Basta tocar no sensor de impressões digitais para desbloquear o telemóvel, autorizar compras ou iniciar sessão em aplicações. Quaisquer impressões digitais adicionadas ao telemóvel podem executar estas ações, pelo que deve ter cuidado com quem adiciona.\n\nNota: a impressão digital pode ser menos segura do que um padrão ou um PIN fortes."</string>
     <string name="security_settings_fingerprint_enroll_introduction_message_unlock_disabled" msgid="1550756694054944874">"Utilize a sua impressão digital para desbloquear o telemóvel ou para autorizar compras.\n\nNota: não pode utilizar a sua impressão digital para desbloquear este dispositivo. Para mais informações, contacte o administrador da sua entidade."</string>
@@ -372,6 +374,9 @@
     <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="1961957425135180242">"Seguinte"</string>
+    <string name="setup_fingerprint_enroll_skip_title" msgid="362050541117362034">"Ignorar impressão digital?"</string>
+    <string name="setup_fingerprint_enroll_skip_after_adding_lock_text" msgid="958990414356204763">"A configuração da impressão digital demora apenas um ou dois minutos. Se ignorar este passo, pode adicionar a impressão digital mais tarde nas definições."</string>
+    <string name="lock_screen_intro_skip_title" msgid="4988210105913705679">"Ignorar bloqueio de ecrã?"</string>
     <string name="lock_screen_intro_skip_dialog_text_frp" product="tablet" msgid="1581834104051243425">"As funcionalidades de proteção do dispositivo não serão ativadas. Não poderá impedir terceiros de utilizar este tablet em caso de perda, de roubo ou de reposição."</string>
     <string name="lock_screen_intro_skip_dialog_text_frp" product="device" msgid="4629503416877189572">"As funcionalidades de proteção do dispositivo não serão ativadas. Não poderá impedir terceiros de utilizar este dispositivo em caso de perda, de roubo ou de reposição."</string>
     <string name="lock_screen_intro_skip_dialog_text_frp" product="default" msgid="2423428240245737909">"As funcionalidades de proteção do dispositivo não serão ativadas. Não poderá impedir terceiros de utilizar este telemóvel em caso de perda, de roubo ou de reposição."</string>
@@ -380,15 +385,15 @@
     <string name="lock_screen_intro_skip_dialog_text" product="default" msgid="3008526710555416125">"As funcionalidades de proteção do dispositivo não serão ativadas. Não poderá impedir terceiros de utilizar este telemóvel em caso de perda ou de roubo."</string>
     <string name="skip_anyway_button_label" msgid="2323522873558834513">"Ignorar mesmo assim"</string>
     <string name="go_back_button_label" msgid="4745265266186209467">"Voltar"</string>
-    <string name="security_settings_fingerprint_enroll_find_sensor_title" msgid="3051496861358227199">"Tocar no sensor"</string>
+    <string name="security_settings_fingerprint_enroll_find_sensor_title" msgid="3051496861358227199">"Toque no sensor"</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_message" msgid="8793966374365960368">"Está na parte traseira do telemóvel. Utilize o dedo indicador."</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_content_description" msgid="2058830032070449160">"Ilustração com o dispositivo e a localização do sensor de impressões digitais"</string>
     <string name="security_settings_fingerprint_enroll_dialog_name_label" msgid="7086763077909041106">"Nome"</string>
     <string name="security_settings_fingerprint_enroll_dialog_ok" msgid="4150384963879569750">"OK"</string>
     <string name="security_settings_fingerprint_enroll_dialog_delete" msgid="4114615413240707936">"Eliminar"</string>
-    <string name="security_settings_fingerprint_enroll_start_title" msgid="2068961812439460133">"Tocar no sensor"</string>
+    <string name="security_settings_fingerprint_enroll_start_title" msgid="2068961812439460133">"Toque no sensor"</string>
     <string name="security_settings_fingerprint_enroll_start_message" msgid="3909929328942564524">"Coloque o dedo sobre o sensor e levante-o depois de sentir uma vibração"</string>
-    <string name="security_settings_fingerprint_enroll_repeat_title" msgid="2819679722403209778">"Levantar e tocar novamente"</string>
+    <string name="security_settings_fingerprint_enroll_repeat_title" msgid="2819679722403209778">"Levante e toque novamente"</string>
     <string name="security_settings_fingerprint_enroll_repeat_message" msgid="6158989350522518586">"Mantenha o dedo levantado para adicionar as diferentes partes da sua impressão digital"</string>
     <string name="security_settings_fingerprint_enroll_finish_title" msgid="7567276170287972230">"Impressão digital adicionada"</string>
     <string name="security_settings_fingerprint_enroll_finish_message" msgid="4796715961273420536">"Quando vir este ícone, utilize a sua impressão digital para identificação ou para autorizar compras."</string>
@@ -457,7 +462,7 @@
     <string name="setup_lock_settings_picker_title" product="tablet" msgid="90329443364067215">"Proteger o seu tablet"</string>
     <string name="setup_lock_settings_picker_title" product="device" msgid="2399952075134938929">"Proteger o dispositivo"</string>
     <string name="setup_lock_settings_picker_title" product="default" msgid="1572244299605153324">"Proteger o telemóvel"</string>
-    <string name="setup_lock_settings_picker_fingerprint_message" msgid="5585650064305600578">"Para maior segurança, configure um bloqueio de ecrã de segurança."</string>
+    <string name="lock_settings_picker_fingerprint_added_security_message" msgid="5768002109707648463">"Para maior segurança, defina um bloqueio de ecrã de segurança."</string>
     <string name="setup_lock_settings_picker_message" product="tablet" msgid="8919671129189936210">"Impeça terceiros de utilizar este tablet 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="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>
@@ -561,47 +566,48 @@
     <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">Must contain at least <xliff:g id="COUNT">%d</xliff:g> letters</item>
+      <item quantity="one">Tem de incluir, pelo menos, 1 letra</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">Must contain at least <xliff:g id="COUNT">%d</xliff:g> lowercase letters</item>
+      <item quantity="one">Tem de incluir, pelo menos, 1 letra minúscula</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">Must contain at least <xliff:g id="COUNT">%d</xliff:g> uppercase letters</item>
+      <item quantity="one">Tem de incluir, pelo menos, 1 letra maiúscula</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">Must contain at least <xliff:g id="COUNT">%d</xliff:g> numerical digits</item>
+      <item quantity="one">Tem de incluir, pelo menos, 1 dígito numérico</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">Must contain at least <xliff:g id="COUNT">%d</xliff:g> special symbols</item>
+      <item quantity="one">Tem de incluir, pelo menos, 1 símbolo especial</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">Must contain at least <xliff:g id="COUNT">%d</xliff:g> non-letter characters</item>
+      <item quantity="one">Tem de incluir, pelo menos, 1 caráter que não seja uma letra</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>
     <string name="lockpassword_pin_no_sequential_digits" msgid="680765285206990584">"Não é permitida uma sequência de dígitos ascendente, descendente ou repetida"</string>
     <string name="lockpassword_ok_label" msgid="313822574062553672">"OK"</string>
     <string name="lockpassword_cancel_label" msgid="8818529276331121899">"Cancelar"</string>
+    <string name="lockpassword_clear_label" msgid="5724429464960458155">"Limpar"</string>
     <string name="lockpattern_tutorial_cancel_label" msgid="6431583477570493261">"Cancelar"</string>
     <string name="lockpattern_tutorial_continue_label" msgid="3559793618653400434">"Seguinte"</string>
     <string name="lock_setup" msgid="3355847066343753943">"A configuração está concluída."</string>
     <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_1">%d</xliff:g> active apps</item>
+      <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> aplicação ativa</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"><xliff:g id="COUNT">%d</xliff:g> active trust agents</item>
+      <item quantity="one">1 agente fidedigno ativo</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>
@@ -647,7 +653,7 @@
     <string name="bluetooth_device_context_connect_advanced" msgid="2643129703569788771">"Opções..."</string>
     <string name="bluetooth_menu_advanced" msgid="8572178316357220524">"Avançadas"</string>
     <string name="bluetooth_advanced_titlebar" msgid="2142159726881547669">"Bluetooth Avançado"</string>
-    <string name="bluetooth_empty_list_bluetooth_off" msgid="6351930724051893423">"Quando o Bluetooth está ativado, o disp. pode comunicar com outros disp. Bluetooth próximos."</string>
+    <string name="bluetooth_empty_list_bluetooth_off" msgid="6351930724051893423">"Com o Bluetooth ativado, o dispositivo pode comunicar com dispositivos próximos."</string>
     <string name="ble_scan_notify_text" msgid="1295915006005700650">"Para melhorar a precisão da localização, os serviços e as aplicações do sistema podem continuar a detetar dispositivos Bluetooth. Pode alterar esta opção nas <xliff:g id="LINK_BEGIN_0">LINK_BEGIN</xliff:g>definições de procura<xliff:g id="LINK_END_1">LINK_END</xliff:g>."</string>
     <string name="bluetooth_connect_failed" msgid="4500234659813241053">"Não foi possível ligar. Tente novamente."</string>
     <string name="device_details_title" msgid="6576953269221085300">"Detalhes do dispositivo"</string>
@@ -781,6 +787,7 @@
     <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>
@@ -817,6 +824,8 @@
     <string name="wifi_wps_available_first_item" msgid="4422547079984583502">"WPS disponível"</string>
     <string name="wifi_wps_available_second_item" msgid="8427520131718215301">" (WPS disponível)"</string>
     <string name="wifi_wps_nfc_enter_password" msgid="2288214226916117159">"Introduzir a palavra-passe da rede"</string>
+    <string name="wifi_carrier_connect" msgid="8174696557882299911">"Rede Wi-Fi do operador"</string>
+    <string name="wifi_carrier_content" msgid="4634077285415851933">"Ligar através de <xliff:g id="NAME">%1%s</xliff:g>"</string>
     <string name="wifi_scan_always_turnon_message" msgid="203123538572122989">"Para melhorar a precisão da localização e para outros fins, <xliff:g id="APP_NAME">%1$s</xliff:g> pretende ativar a verificação de redes, mesmo quando o Wi-Fi está desativado.\n\nPermitir esta opção para todas as aplicações que pretenderem verificar?"</string>
     <string name="wifi_scan_always_turnoff_message" msgid="5538901671131941043">"Para desativar, aceda a Avançadas no menu adicional."</string>
     <string name="wifi_scan_always_confirm_allow" msgid="5355973075896817232">"Permitir"</string>
@@ -834,18 +843,20 @@
     <string name="wifi_connect" msgid="1076622875777072845">"Ligar"</string>
     <string name="wifi_failed_connect_message" msgid="8491902558970292871">"Não foi possível estabelecer ligação à rede"</string>
     <string name="wifi_forget" msgid="8168174695608386644">"Esquecer"</string>
+    <string name="wifi_modify" msgid="6100248070440710782">"Modificar"</string>
     <string name="wifi_failed_forget_message" msgid="1348172929201654986">"Não foi possível esquecer a rede"</string>
     <string name="wifi_save" msgid="3331121567988522826">"Guardar"</string>
     <string name="wifi_failed_save_message" msgid="6650004874143815692">"Não foi possível guardar a rede"</string>
     <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">%d networks</item>
+      <item quantity="one">1 rede</item>
       <item quantity="other">%d redes</item>
     </plurals>
     <string name="wifi_advanced_titlebar" msgid="4485841401774142908">"Wi-Fi Avançada"</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_title" msgid="3471132676909349382">"Informação da rede"</string>
     <string name="wifi_details_subnet_mask" msgid="6720279144174924410">"Máscara de sub-rede"</string>
     <string name="wifi_details_dns" msgid="8648826607751830768">"DNS"</string>
     <string name="wifi_details_ipv6_address_header" msgid="6734119149106422148">"Endereços IPv6"</string>
@@ -878,16 +889,15 @@
     <string name="wifi_p2p_cancel_connect_title" msgid="255267538099324413">"Cancelar convite?"</string>
     <string name="wifi_p2p_cancel_connect_message" msgid="7477756213423749402">"Pretende cancelar o convite para se ligar a <xliff:g id="PEER_NAME">%1$s</xliff:g>?"</string>
     <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_off_subtext" msgid="5466126533609394170">"Não está a partilhar Internet ou conteúdo com outros dispositivos"</string>
     <string name="wifi_hotspot_tethering_on_subtext" product="tablet" msgid="5752490509369962007">"A partilhar a ligação à Internet deste tablet através de zona Wi-Fi"</string>
     <string name="wifi_hotspot_tethering_on_subtext" product="default" msgid="6461075246164300670">"A partilhar a ligação à Internet deste telemóvel através de zona Wi-Fi"</string>
     <string name="wifi_hotspot_on_local_only_subtext" msgid="2068110388011294735">"A aplicação está a partilhar conteúdo. Para partilhar a ligação à Internet, desative a zona Wi-Fi e, de seguida, ative-a"</string>
-    <string name="wifi_hotspot_name_title" msgid="1341735529132128887">"Nome de Wi-Fi"</string>
+    <string name="wifi_hotspot_name_title" msgid="8237000746618636778">"Nome da zona Wi-Fi"</string>
     <string name="wifi_hotspot_name_summary_connecting" msgid="3378299995508671967">"A ativar <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>..."</string>
     <string name="wifi_hotspot_name_summary_connected" msgid="3888672084861445362">"Podem ser ligados outros dispositivos a <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>"</string>
-    <string name="wifi_hotspot_password_title" msgid="1955592302902091281">"Palavra-passe de Wi-Fi"</string>
+    <string name="wifi_hotspot_password_title" msgid="8676859981917573801">"Palavra-passe da zona Wi-Fi"</string>
     <string name="wifi_hotspot_ap_band_title" msgid="1165801173359290681">"Banda do PA"</string>
     <string name="wifi_hotspot_footer_info_regular" msgid="1203489406068036455">"Utilize uma zona Wi-Fi para criar uma rede Wi-Fi para os seus outros dispositivos. A zona Wi-Fi disponibiliza Internet através da sua ligação móvel de dados. Podem ser aplicados custos de dados móveis adicionais."</string>
     <string name="wifi_hotspot_footer_info_local_only" msgid="857988412470694109">"As aplicações podem criar uma zona Wi-Fi para partilhar conteúdo com dispositivos próximos."</string>
@@ -898,7 +908,6 @@
     <string name="wifi_tether_configure_ap_text" msgid="7974681394041609308">"Configurar ponto de acesso Wi-Fi"</string>
     <string name="wifi_hotspot_configure_ap_text" msgid="5478614731464220432">"Configuração de zona Wi-Fi"</string>
     <string name="wifi_hotspot_configure_ap_text_summary" msgid="5560680057727007011">"Zona Wi-Fi AndroidAP WPA2 PSK"</string>
-    <string name="wifi_tether_configure_subtext" msgid="2050196439900426456">"Zona Wi-Fi <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">"Chamadas Wi-Fi"</string>
     <string name="wifi_calling_suggestion_title" msgid="9008010480466359578">"Ativar Chamadas Wi-Fi"</string>
@@ -939,7 +948,7 @@
     <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="emergency_address_summary" msgid="3266760199681945746">"O endereço utilizado pelos serviços de emergência como a sua localização se efetuar uma chamada de emergência através de Wi-Fi"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"Ecrã"</string>
     <string name="sound_settings" msgid="5534671337768745343">"Som"</string>
     <string name="all_volume_title" msgid="4296957391257836961">"Volumes"</string>
@@ -993,6 +1002,7 @@
     <string name="search_settings" msgid="1910951467596035063">"Pesquisar"</string>
     <string name="search_settings_summary" msgid="9205656546570654169">"Gerir definições e histórico de pesquisa"</string>
     <string name="search_settings_no_results" msgid="8799027492641230999">"Sem resultados"</string>
+    <string name="search_clear_history" msgid="4196658962573162457">"Limpar histórico"</string>
     <string name="display_settings" msgid="7965901687241669598">"Ecrã"</string>
     <string name="accelerometer_title" msgid="7854608399547349157">"Rodar ecrã automaticamente"</string>
     <string name="color_mode_title" msgid="3159275920408338215">"Cores vivas"</string>
@@ -1045,7 +1055,7 @@
     <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 a imagem de fundo"</string>
+    <string name="wallpaper_suggestion_title" msgid="8583988696513822528">"Alterar 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>
@@ -1105,7 +1115,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">Incorrect SIM PIN code, you have <xliff:g id="NUMBER_1">%d</xliff:g> remaining attempts.</item>
+      <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="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>
@@ -1122,7 +1132,6 @@
     <string name="baseband_version" msgid="1848990160763524801">"Versão de banda base"</string>
     <string name="kernel_version" msgid="9192574954196167602">"Versão do kernel"</string>
     <string name="build_number" msgid="3075795840572241758">"Número de compilação"</string>
-    <string name="selinux_status" msgid="6212165375172061672">"Estado SELinux"</string>
     <string name="device_info_not_available" msgid="8062521887156825182">"Não disponível"</string>
     <string name="device_status_activity_title" msgid="1411201799384697904">"Estado"</string>
     <string name="device_status" msgid="607405385799807324">"Estado"</string>
@@ -1150,7 +1159,6 @@
     <string name="status_wifi_mac_address" msgid="2202206684020765378">"Endereço MAC de Wi-Fi"</string>
     <string name="status_bt_address" msgid="4195174192087439720">"Endereço Bluetooth"</string>
     <string name="status_serial_number" msgid="2257111183374628137">"Número de série"</string>
-    <string name="status_unavailable" msgid="7862009036663793314">"Indisponível"</string>
     <string name="status_up_time" msgid="7294859476816760399">"Tempo de actividade"</string>
     <string name="status_awake_time" msgid="2393949909051183652">"Hora de actividade"</string>
     <string name="internal_memory" msgid="9129595691484260784">"Armazenamento interno"</string>
@@ -1326,6 +1334,7 @@
     <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>
     <string name="reset_dashboard_title" msgid="6254873816990678620">"Opções de reposição"</string>
+    <string name="reset_dashboard_summary" msgid="4851012632493522755">"É possível repor a rede, as aplicações ou o dispositivo."</string>
     <string name="reset_network_title" msgid="6166025966016873843">"Repor Wi-Fi, dados móveis e Bluetooth"</string>
     <string name="reset_network_desc" msgid="5547979398298881406">"Esta ação repõe todas as definições de rede, incluindo:\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">"Repor definições"</string>
@@ -1334,17 +1343,14 @@
     <string name="reset_network_confirm_title" msgid="1759888886976962773">"Pretende repor?"</string>
     <string name="network_reset_not_available" msgid="7188610385577164676">"A reposição de rede não está disponível para este utilizador"</string>
     <string name="reset_network_complete_toast" msgid="787829973559541880">"As definições de rede foram repostas"</string>
-    <string name="master_clear_title" msgid="6617679904229218425">"Apagar todos os dados (reposição de dados de fábrica)"</string>
-    <plurals name="master_clear_with_account_summary" formatted="false" msgid="5911377203778818712">
-      <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>
-    <string name="master_clear_desc" product="tablet" msgid="9146059417023157222">"Serão apagados todos os dados do "<b>"armazenamento interno"</b>" do tablet, incluindo:\n\n"<li>"A conta Google"</li>\n<li>"Dados e definições do sistema e da aplicação"</li>\n<li>"Aplicações transferidas"</li></string>
-    <string name="master_clear_desc" product="default" msgid="4800386183314202571">"Serão apagados todos os dados do "<b>"armazenamento interno"</b>" do telemóvel, incluindo:\n\n"<li>"A conta Google"</li>\n<li>"Dados e definições do sistema e da aplicação"</li>\n<li>"Aplicações transferidas"</li></string>
+    <string name="master_clear_title" msgid="3531267871084279512">"Apagar todos os dados (reposição de dados de fábrica)"</string>
+    <string name="master_clear_desc" product="tablet" msgid="9146059417023157222">"Serão apagados todos os dados do "<b>"armazenamento interno"</b>" do tablet, incluindo:\n\n"<li>"A Conta Google"</li>\n<li>"Dados e definições do sistema e da aplicação"</li>\n<li>"Aplicações transferidas"</li></string>
+    <string name="master_clear_desc" product="default" msgid="4800386183314202571">"Serão apagados todos os dados do "<b>"armazenamento interno"</b>" do telemóvel, incluindo:\n\n"<li>"A Conta Google"</li>\n<li>"Dados e definições do sistema e da aplicação"</li>\n<li>"Aplicações transferidas"</li></string>
     <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"Actualmente, tem sessão iniciada nas seguintes contas:\n"</string>
     <string name="master_clear_other_users_present" product="default" msgid="5161423070702470742">\n\n"Existem outros utilizadores presentes neste dispositivo.\n"</string>
     <string name="master_clear_desc_also_erases_external" msgid="1903185203791274237"><li>"Música"</li>\n<li>"Fotografias"</li>\n<li>"Outros dados do utilizador"</li></string>
+    <string name="master_clear_desc_also_erases_esim" msgid="312352697653096008"><li>"Operadores no eSIM"</li></string>
+    <string name="master_clear_desc_no_cancel_mobile_plan" msgid="5460926449093211144">\n\n"Esta ação não cancela o seu plano de serviços móveis."</string>
     <string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="7744115866662613411">\n\n"Para limpar músicas, imagens e outros dados do utilizador, é necessário apagar a "<b>"memória de armazenamento USB"</b>"."</string>
     <string name="master_clear_desc_erase_external_storage" product="default" msgid="4801026652617377093">\n\n"Para limpar também músicas, imagens e outros dados do utilizador, é necessário apagar o "<b>"cartão SD"</b>"."</string>
     <string name="erase_external_storage" product="nosdcard" msgid="969364037450286809">"Apagar armazenamento USB"</string>
@@ -1461,15 +1467,16 @@
     <string name="settings_safetylegal_activity_title" msgid="6901214628496951727">"Informações de segurança"</string>
     <string name="settings_safetylegal_activity_unreachable" msgid="250674109915859456">"Não tem uma ligação de dados. Para visualizar estas informações agora, aceda a %s a partir de qualquer computador ligado à internet."</string>
     <string name="settings_safetylegal_activity_loading" msgid="8059022597639516348">"A carregar..."</string>
-    <string name="lockpassword_choose_your_password_header" msgid="8624900666929394990">"Escolha a palavra-passe"</string>
-    <string name="lockpassword_choose_your_password_header_for_fingerprint" msgid="6624409510609085450">"Para util. imp. dig., def. pal.-passe"</string>
-    <string name="lockpassword_choose_your_pattern_header" msgid="6949761069941694050">"Escolher o padrão"</string>
-    <string name="lockpassword_choose_your_pattern_header_for_fingerprint" msgid="5901096361617543819">"Para util. imp. dig., def. pad."</string>
-    <string name="lockpassword_choose_your_pin_header" msgid="7598849519816138302">"Escolha o PIN"</string>
-    <string name="lockpassword_choose_your_pin_header_for_fingerprint" msgid="765344692615917183">"Para util. imp. dig., def. PIN"</string>
-    <string name="lockpassword_confirm_your_password_header" msgid="6308478184889846633">"Confirmar palavra-passe"</string>
+    <string name="lockpassword_choose_your_screen_lock_header" msgid="3872462096767152394">"Definir um bloqueio de ecrã"</string>
+    <string name="lockpassword_choose_your_password_message" msgid="1197569283524841412">"Por motivos de segurança, defina uma palavra-passe."</string>
+    <string name="lockpassword_choose_your_password_header_for_fingerprint" msgid="2541818487015343503">"Definir alternativa à impressão digital"</string>
+    <string name="lockpassword_choose_your_pattern_header_for_fingerprint" msgid="7709785406243556723">"Definir alternativa à impressão digital"</string>
+    <string name="lockpassword_choose_your_pin_message" msgid="1875420718677275646">"Por motivos de segurança, defina um PIN."</string>
+    <string name="lockpassword_choose_your_pin_header_for_fingerprint" msgid="1549639053195796674">"Para a impressão digital, defina um PIN"</string>
+    <string name="lockpassword_choose_your_pattern_message" msgid="5986983400689720015">"Por motivos de segurança, defina um padrão."</string>
+    <string name="lockpassword_confirm_your_password_header" msgid="1266027268220850931">"Reintroduzir a palavra-passe"</string>
     <string name="lockpassword_confirm_your_pattern_header" msgid="7543433733032330821">"Confirmar o padrão"</string>
-    <string name="lockpassword_confirm_your_pin_header" msgid="49038294648213197">"Confirmar PIN"</string>
+    <string name="lockpassword_confirm_your_pin_header" msgid="7744513791910572550">"Reintroduzir o PIN"</string>
     <string name="lockpassword_confirm_passwords_dont_match" msgid="5140892109439191415">"As palavras-passe não correspondem"</string>
     <string name="lockpassword_confirm_pins_dont_match" msgid="7226244811505606217">"Os PINs não correspondem"</string>
     <string name="lockpassword_choose_lock_generic_header" msgid="3811438094903786145">"Seleção de desbloqueio"</string>
@@ -1488,6 +1495,12 @@
     <string name="lockpassword_strong_auth_required_work_pattern" msgid="3003781907040522053">"Para maior segurança, utilize o padrão de trabalho"</string>
     <string name="lockpassword_strong_auth_required_work_pin" msgid="3367491332598821552">"Para maior segurança, introduza o PIN de trabalho"</string>
     <string name="lockpassword_strong_auth_required_work_password" msgid="8159775129968582940">"Para maior segurança, introduza a palavra-passe de trabalho"</string>
+    <string name="lockpassword_confirm_your_pattern_details_frp" msgid="6757336656791723193">"As definições de fábrica do telemóvel foram repostas. Para o utilizar, introduza o padrão anterior."</string>
+    <string name="lockpassword_confirm_your_pin_details_frp" msgid="826520613445990470">"As definições de fábrica do telemóvel foram repostas. Para o utilizar, introduza o PIN anterior."</string>
+    <string name="lockpassword_confirm_your_password_details_frp" msgid="8944081074615739040">"As definições de fábrica do telem. foram repostas. Para o utilizar, introduza a pal.-passe anterior."</string>
+    <string name="lockpassword_confirm_your_pattern_header_frp" msgid="2898036091609128286">"Validar padrão"</string>
+    <string name="lockpassword_confirm_your_pin_header_frp" msgid="4141601774778898803">"Validar o PIN"</string>
+    <string name="lockpassword_confirm_your_password_header_frp" msgid="3762615419295360480">"Validar palavra-passe"</string>
     <string name="lockpassword_invalid_pin" msgid="15588049067548470">"PIN incorreto"</string>
     <string name="lockpassword_invalid_password" msgid="4038507398784975200">"Palavra-passe incorreta"</string>
     <string name="lockpattern_need_to_unlock_wrong" msgid="1745247595356012176">"Sequência incorreta"</string>
@@ -1511,7 +1524,7 @@
     <string name="lockpattern_settings_enable_visible_pattern_title" msgid="2615606088906120711">"Ver sequência de desbloqueio"</string>
     <string name="lockpattern_settings_enable_visible_pattern_title_profile" msgid="4864525074768391381">"Tornar o padrão do perfil visível"</string>
     <string name="lockpattern_settings_enable_tactile_feedback_title" msgid="4389015658335522989">"Vibrar ao tocar"</string>
-    <string name="lockpattern_settings_enable_power_button_instantly_locks" msgid="5735444062633666327">"Bloq. c/ botão ligar/desligar"</string>
+    <string name="lockpattern_settings_enable_power_button_instantly_locks" msgid="5735444062633666327">"Bloquear com botão lig./desl."</string>
     <string name="lockpattern_settings_power_button_instantly_locks_summary" msgid="8196258755143711694">"Exceto quando mantido bloqueado por <xliff:g id="TRUST_AGENT_NAME">%1$s</xliff:g>"</string>
     <string name="lockpattern_settings_choose_lock_pattern" msgid="1652352830005653447">"Definir padrão de desbloqueio"</string>
     <string name="lockpattern_settings_change_lock_pattern" msgid="1123908306116495545">"Mudar padrão de desbloqueio"</string>
@@ -1537,7 +1550,6 @@
     <string name="install_applications_title" msgid="4987712352256508946">"Permit. todas as fontes aplic."</string>
     <string name="recent_app_category_title" msgid="6673071268966003928">"Aplicações abertas recentemente"</string>
     <string name="see_all_apps_title" msgid="1317153498074308438">"Ver as <xliff:g id="COUNT">%1$d</xliff:g> aplicações"</string>
-    <string name="recent_app_summary" msgid="3366446669844932300">"Há <xliff:g id="TIME">^1</xliff:g>"</string>
     <string name="install_all_warning" product="tablet" msgid="8310489909586138165">"O seu tablet e os dados pessoais são mais vulneráveis a ataques de aplicações desconhecidas. Ao instalar aplicações desta fonte, aceita ser responsável por quaisquer danos no tablet ou perdas de dados que possam resultar da utilização do mesmo."</string>
     <string name="install_all_warning" product="default" msgid="1952257127370115988">"O seu telemóvel e os dados pessoais são mais vulneráveis a ataques de aplicações desconhecidas. Ao instalar aplicações desta fonte, aceita ser responsável por quaisquer danos no telemóvel ou perdas de dados que possam resultar da utilização do mesmo."</string>
     <string name="advanced_settings" msgid="1777249286757067969">"Definições avançadas"</string>
@@ -1552,7 +1564,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">%d items</item>
+      <item quantity="one">1 item</item>
       <item quantity="other">%d itens</item>
     </plurals>
     <string name="clear_uri_btn_text" msgid="8575655132961012158">"Limpar acesso"</string>
@@ -1584,7 +1596,7 @@
     <string name="show_running_services" msgid="5736278767975544570">"Mostrar serv. em execução"</string>
     <string name="show_background_processes" msgid="2009840211972293429">"Mostrar proc. em cache"</string>
     <string name="default_emergency_app" msgid="1951760659640369980">"Aplicação de emergência"</string>
-    <string name="reset_app_preferences" msgid="1321050641018356925">"Repor pref. de aplic."</string>
+    <string name="reset_app_preferences" msgid="1321050641018356925">"Repor preferências de aplicações"</string>
     <string name="reset_app_preferences_title" msgid="6093179367325336662">"Repor preferências de aplicações?"</string>
     <string name="reset_app_preferences_desc" msgid="4822447731869201512">"Procede à reposição de todas as preferências de:\n\n "<li>"Aplicações desativadas"</li>\n" "<li>"Notificações de aplicações desativadas"</li>\n" "<li>"Aplicações predefinidas para ações"</li>\n" "<li>"Restrições de dados em segundo plano para aplicações"</li>\n" "<li>"Todas as restrições de permissão"</li>\n\n" Não irá perder quaisquer dados das aplicações."</string>
     <string name="reset_app_preferences_button" msgid="2559089511841281242">"Repor aplicações"</string>
@@ -1798,10 +1810,10 @@
     <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ã, visualização, controlos de interação"</string>
+    <string name="accessibility_settings_summary" msgid="981260486011624939">"Leitores de ecrã, controlos de interação, ecrã"</string>
     <string name="vision_settings_title" msgid="4204111425716868288">"Definições de visão"</string>
     <string name="vision_settings_description" msgid="5679491180156408260">"Pode personalizar este dispositivo de acordo com as suas necessidades. Pode alterar estas funcionalidades de acessibilidade mais tarde em Definições."</string>
-    <string name="vision_settings_suggestion_title" msgid="917294957154878441">"Aumentar tamanho do tipo de letra"</string>
+    <string name="vision_settings_suggestion_title" msgid="8058794060304707004">"Alterar o tamanho do tipo de letra"</string>
     <string name="screen_reader_category_title" msgid="7739154903913400641">"Leitores de ecrã"</string>
     <string name="audio_and_captions_category_title" msgid="3420727114421447524">"Áudio e texto no ecrã"</string>
     <string name="display_category_title" msgid="685461049938269166">"Visualização"</string>
@@ -1838,29 +1850,28 @@
     <string name="accessibility_display_inversion_preference_subtitle" msgid="7052959202195368109">"Pode afetar o desempenho"</string>
     <string name="accessibility_autoclick_preference_title" msgid="7014499339068449623">"Clicar depois de o ponteiro parar de se mover"</string>
     <string name="accessibility_autoclick_delay_preference_title" msgid="3962261178385106006">"Atraso antes de clicar"</string>
-    <string name="preference_summary_default_combination" msgid="8532964268242666060">"<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">"ATIVADO"</string>
     <string name="accessibility_summary_state_disabled" msgid="2241315620132005595">"DESATIVADO"</string>
     <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">Extremely short delay (<xliff:g id="CLICK_DELAY_LABEL_1">%1$d</xliff:g> ms)</item>
+      <item quantity="one">Atraso extremamente curto (<xliff:g id="CLICK_DELAY_LABEL_0">%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">Very short delay (<xliff:g id="CLICK_DELAY_LABEL_1">%1$d</xliff:g> ms)</item>
+      <item quantity="one">Atraso muito curto (<xliff:g id="CLICK_DELAY_LABEL_0">%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">Short delay (<xliff:g id="CLICK_DELAY_LABEL_1">%1$d</xliff:g> ms)</item>
+      <item quantity="one">Atraso curto (<xliff:g id="CLICK_DELAY_LABEL_0">%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">Long delay (<xliff:g id="CLICK_DELAY_LABEL_1">%1$d</xliff:g> ms)</item>
+      <item quantity="one">Atraso longo (<xliff:g id="CLICK_DELAY_LABEL_0">%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">Very long delay (<xliff:g id="CLICK_DELAY_LABEL_1">%1$d</xliff:g> ms)</item>
+      <item quantity="one">Atraso muito longo (<xliff:g id="CLICK_DELAY_LABEL_0">%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>
@@ -1915,11 +1926,11 @@
     <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"><xliff:g id="COUNT">%1$d</xliff:g> print services on</item>
+      <item quantity="one">1 serviço de impressão ativado</item>
       <item quantity="other"><xliff:g id="COUNT">%1$d</xliff:g> serviços de impressão ativados</item>
     </plurals>
     <plurals name="print_jobs_summary" formatted="false" msgid="5810106725778525400">
-      <item quantity="one"><xliff:g id="COUNT">%1$d</xliff:g> print jobs</item>
+      <item quantity="one">1 tarefa de impressão</item>
       <item quantity="other"><xliff:g id="COUNT">%1$d</xliff:g> tarefas de impressão</item>
     </plurals>
     <string name="print_settings_title" msgid="3685449667822217816">"Serviços de impressão"</string>
@@ -1948,7 +1959,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">"Dados utiliz. bater. não disp."</string>
+    <string name="power_usage_not_available" msgid="3109326074656512387">"Sem dados de uso da bateria."</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>
@@ -1957,12 +1968,14 @@
     <string name="background_activity_summary_on" msgid="649282072540085599">"A aplicação pode ser executada em segundo plano quando não está a ser utilizada"</string>
     <string name="background_activity_summary_off" msgid="7666330699090632040">"A atividade em segundo plano da aplicação está limitada quando esta não está a ser utilizada"</string>
     <string name="background_activity_summary_disabled" msgid="3710669050484599847">"A aplicação não tem autorização para ser executada em segundo plano"</string>
+    <string name="background_activity_summary_whitelisted" msgid="7375400051141016808">"Não é possível otimizar a utilização da bateria da aplicação."</string>
+    <string name="background_activity_warning_dialog_title" msgid="2216249969149568871">"Pretende limitar a atividade em segundo plano?"</string>
+    <string name="background_activity_warning_dialog_text" msgid="7049624449246121981">"Se limitar a atividade em segundo plano de uma aplicação, esta pode apresentar um comportamento anormal."</string>
     <string name="device_screen_usage" msgid="3386088035570409683">"Utilização do ecrã desde carregamento completo"</string>
     <string name="device_screen_consumption" msgid="4607589286438986687">"Consumo do ecrã"</string>
     <string name="device_cellular_network" msgid="4724773411762382950">"Procura de redes móveis"</string>
-    <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">"Utilização de aplicações desde o carregamento completo (há <xliff:g id="TIME">^1</xliff:g>)"</string>
-    <string name="power_usage_list_summary_device" msgid="7036566616386864302">"Utilização do dispositivo desde o carregamento completo (há <xliff:g id="TIME">^1</xliff:g>)"</string>
+    <string name="power_usage_list_summary" msgid="6393929085382334341">"Utilização de aplicações desde o carregamento completo (<xliff:g id="RELATIVE_TIME">^1</xliff:g>)"</string>
+    <string name="power_usage_list_summary_device" msgid="4461926045610455423">"Utilização do dispositivo desde o carregamento completo (<xliff:g id="RELATIVE_TIME">^1</xliff:g>)"</string>
     <string name="screen_usage_summary" msgid="6687403051423153550">"Tempo durante o qual o ecrã tem estado ativado desde o carregamento completo"</string>
     <string name="device_usage_list_summary" msgid="5623036661468763251">"Utilização do dispositivo desde o carregamento completo"</string>
     <string name="battery_since_unplugged" msgid="338073389740738437">"Bateria utilizada desde que foi desligado"</string>
@@ -2208,14 +2221,14 @@
     <string name="credentials_unlock_hint" msgid="2301301378040499348">"Introduzir palavra-passe do armazenamento de credenciais."</string>
     <string name="credentials_old_password" msgid="7553393815538684028">"Palavra-passe actual:"</string>
     <string name="credentials_reset_hint" msgid="6297256880896133631">"Pretende remover todo o conteúdo?"</string>
-    <string name="credentials_password_too_short" msgid="7502749986405522663">"A palavra-passe deve ter, pelo menos, 8 caracteres."</string>
     <string name="credentials_wrong_password" msgid="2541932597104054807">"Palavra-passe incorrecta."</string>
     <string name="credentials_reset_warning" msgid="5320653011511797600">"Palavra-passe incorrecta. Tem mais uma tentativa antes de o armazenamento de credenciais ser apagado."</string>
     <string name="credentials_reset_warning_plural" msgid="6514085665301095279">"Palavra-passe incorrecta. Tem mais <xliff:g id="NUMBER">%1$d</xliff:g> tentativas antes de o armazenamento de credenciais ser apagado."</string>
     <string name="credentials_erased" msgid="2907836028586342969">"Armaz. credenciais apagado."</string>
     <string name="credentials_not_erased" msgid="7685932772284216097">"Não foi possível apagar o armazenamento de credenciais."</string>
     <string name="credentials_enabled" msgid="7588607413349978930">"O armazenamento de credenciais está ativado."</string>
-    <string name="credentials_configure_lock_screen_hint" msgid="6757119179588664966">"Para poder utilizar o armazenamento de credenciais, é necessário definir primeiro um PIN ou palavra-passe do ecrã de bloqueio."</string>
+    <string name="credentials_configure_lock_screen_hint" msgid="8058230497337529036">"Antes de poder utilizar o armazenamento de credenciais, o seu dispositivo tem de possuir um ecrã de bloqueio seguro"</string>
+    <string name="credentials_configure_lock_screen_button" msgid="253239765216055321">"DEFINIR BLOQUEIO"</string>
     <string name="usage_access_title" msgid="332333405495457839">"Apps com acesso de utilização"</string>
     <string name="emergency_tone_title" msgid="1055954530111587114">"Tom de emergência"</string>
     <string name="emergency_tone_summary" msgid="722259232924572153">"Definir o comportamento quando é efetuada uma chamada de emergência"</string>
@@ -2335,8 +2348,6 @@
     <skip />
     <string name="cant_sync_dialog_title" msgid="2777238588398046285">"Não é possível sincronizar manualmente"</string>
     <string name="cant_sync_dialog_message" msgid="1938380442159016449">"A sincronização deste item está atualmente desativada. Para alterar esta definição, ative temporariamente os dados de segundo plano e a sincronização automática."</string>
-    <string name="wimax_settings" msgid="2655139497028469039">"4G"</string>
-    <string name="status_wimax_mac_address" msgid="8390791848661413416">"Endereço MAC de 4G"</string>
     <string name="enter_password" msgid="8035706727471334122">"Para iniciar o Android, introduza a palavra-passe"</string>
     <string name="enter_pin" msgid="5305333588093263790">"Para iniciar o Android, introduza o PIN"</string>
     <string name="enter_pattern" msgid="4187435713036808566">"Para iniciar o Android, desenhe o padrão"</string>
@@ -2350,6 +2361,7 @@
     <string name="misc_files_selected_count" msgid="4647048020823912088">"selecionado(s) <xliff:g id="NUMBER">%1$d</xliff:g> de <xliff:g id="TOTAL">%2$d</xliff:g>"</string>
     <string name="misc_files_selected_count_bytes" msgid="2876232009069114352">"<xliff:g id="NUMBER">%1$s</xliff:g> de <xliff:g id="TOTAL">%2$s</xliff:g>"</string>
     <string name="select_all" msgid="1562774643280376715">"Selecionar tudo"</string>
+    <string name="data_plan_usage_manage_plans_button_text" msgid="8997761990902708162">"Gerir planos de dados"</string>
     <string name="data_usage_summary_title" msgid="3804110657238092929">"Utilização de dados"</string>
     <string name="data_usage_app_summary_title" msgid="4147258989837459172">"Utilização dados da apli."</string>
     <string name="data_usage_accounting" msgid="7170028915873577387">"A contagem do operador de dados pode diferir do seu dispositivo."</string>
@@ -2435,6 +2447,9 @@
     <string name="data_usage_metered_mobile" msgid="5423305619126978393">"Redes móveis"</string>
     <string name="data_usage_metered_wifi" msgid="1761738002328299714">"Redes Wi‑Fi de acesso limitado"</string>
     <string name="data_usage_metered_wifi_disabled" msgid="727808462375941567">"Para selecionar redes de acesso limitado, ative o Wi‑Fi."</string>
+    <string name="data_usage_metered_auto" msgid="1262028400911918865">"Automático"</string>
+    <string name="data_usage_metered_yes" msgid="9217539611385225894">"Acesso limitado"</string>
+    <string name="data_usage_metered_no" msgid="4025232961929071789">"Acesso ilimitado"</string>
     <string name="data_usage_disclaimer" msgid="6887858149980673444">"A contagem de dados do operador pode ser diferente da do seu dispositivo."</string>
     <string name="cryptkeeper_emergency_call" msgid="198578731586097145">"Chamada de emergência"</string>
     <string name="cryptkeeper_return_to_call" msgid="5613717339452772491">"Regressar à chamada"</string>
@@ -2526,26 +2541,23 @@
     <string name="backup_pw_set_button_text" msgid="2387480910044648795">"Definir palavra-passe de cópia de segurança"</string>
     <string name="backup_pw_cancel_button_text" msgid="8845630125391744615">"Cancelar"</string>
     <string name="additional_system_update_settings_list_item_title" msgid="214987609894661992">"Atualizações adicionais do sistema"</string>
-    <string name="selinux_status_disabled" msgid="924551035552323327">"Desativado"</string>
-    <string name="selinux_status_permissive" msgid="6004965534713398778">"Permissivo"</string>
-    <string name="selinux_status_enforcing" msgid="2252703756208463329">"Forçador"</string>
     <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">Trust or remove certificates</item>
+      <item quantity="one">Confiar ou remover o certificado</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_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>
+      <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>
     </plurals>
     <plurals name="ssl_ca_cert_info_message" formatted="false" msgid="30645643499556573">
-      <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>
+      <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>
     </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">Check certificates</item>
+      <item quantity="one">Verificar certificado</item>
       <item quantity="other">Verificar certificados</item>
     </plurals>
     <string name="user_settings_title" msgid="6151874007858148344">"Utilizadores"</string>
@@ -2637,7 +2649,7 @@
     <string name="restriction_menu_change_pin" msgid="740081584044302775">"Alterar PIN"</string>
     <string name="app_notifications_switch_label" msgid="9124072219553687583">"Mostrar notificações"</string>
     <string name="help_label" msgid="6886837949306318591">"Ajuda e comentários"</string>
-    <string name="support_summary" msgid="2705726826263742491">"Artigos de ajuda, telefone e chat, começar a utilizar"</string>
+    <string name="support_summary" msgid="2705726826263742491">"Artigos de ajuda, telefone e chat, como começar"</string>
     <string name="user_account_title" msgid="1127193807312271167">"Conta para conteúdo"</string>
     <string name="user_picture_title" msgid="7297782792000291692">"ID da fotografia"</string>
     <string name="extreme_threats_title" msgid="6549541803542968699">"Ameaças extremas"</string>
@@ -2723,7 +2735,7 @@
     <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">Show %d hidden items</item>
+      <item quantity="one">Mostrar %d item oculto</item>
       <item quantity="other">Mostrar %d itens ocultos</item>
     </plurals>
     <string name="network_dashboard_title" msgid="4771589228992391573">"Rede e Internet"</string>
@@ -2825,7 +2837,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"><xliff:g id="ON_COUNT">%d</xliff:g> automatic rules turned on</item>
+      <item quantity="one">1 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 incomodar"</string>
@@ -2871,13 +2883,15 @@
     <string name="notifications_title" msgid="8086372779371204971">"Notificações"</string>
     <string name="app_notifications_title" msgid="5810577805218003760">"Notificações de aplicações"</string>
     <string name="notification_channel_title" msgid="2260666541030178452">"Categoria de notificações"</string>
+    <string name="notification_group_title" msgid="7180506440133859601">"Grupo de categoria de notificações"</string>
     <string name="notification_importance_title" msgid="848692592679312666">"Importância"</string>
-    <string name="notification_importance_unspecified" msgid="2196023702875112081">"Permitir que a aplicação decida"</string>
+    <string name="notification_importance_unspecified" msgid="6622173510486113958">"Permitir som"</string>
     <string name="notification_importance_blocked" msgid="7938180808339386300">"Nunca mostrar notificações"</string>
     <string name="notification_importance_min" msgid="5455049524984686275">"Sem interrupção sonora ou visual"</string>
     <string name="notification_importance_low" msgid="8881468429453766553">"Sem som"</string>
     <string name="notification_importance_default" msgid="5958338024601957516">"Emitir som"</string>
     <string name="notification_importance_high" msgid="2082429479238228527">"Emitir som e aparecer no ecrã"</string>
+    <string name="notification_importance_high_silent" msgid="2667033773703765252">"Aparecer no ecrã"</string>
     <string name="notification_importance_min_title" msgid="6974673091137544803">"Baixa"</string>
     <string name="notification_importance_low_title" msgid="8131254047772814309">"Média"</string>
     <string name="notification_importance_default_title" msgid="9120383978536089489">"Alta"</string>
@@ -2893,8 +2907,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 apps can read notifications</item>
-      <item quantity="other">%d aplicações conseguem ler notificações</item>
+      <item quantity="one">%d aplicação pode ler notificações</item>
+      <item quantity="other">%d aplicações podem 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>
@@ -2920,17 +2934,22 @@
     <string name="loading_notification_apps" msgid="5031818677010335895">"A carregar aplicações..."</string>
     <string name="app_notifications_off_desc" msgid="4882445501376722969">"O Android está a bloquear a apresentação das notificações desta aplicação neste dispositivo"</string>
     <string name="channel_notifications_off_desc" msgid="5899225298718840635">"O Android está a bloquear a apresentação desta categoria de notificações neste dispositivo"</string>
+    <string name="channel_group_notifications_off_desc" msgid="1620950416247316370">"O Android está a bloquear a apresentação deste grupo de notificações neste dispositivo."</string>
     <string name="notification_channels" msgid="5346841743182627500">"Categorias"</string>
     <string name="notification_channels_other" msgid="5645317113885788226">"Outra"</string>
+    <plurals name="notification_group_summary" formatted="false" msgid="3420621520561455358">
+      <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> categoria</item>
+      <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> categorias</item>
+    </plurals>
     <string name="no_channels" msgid="3077375508177744586">"Esta aplicação não publicou notificações"</string>
     <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">Turned off for <xliff:g id="COUNT_1">%d</xliff:g> apps</item>
+      <item quantity="one">Desativado para <xliff:g id="COUNT_0">%d</xliff:g> aplicação</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_1">%d</xliff:g> categories deleted</item>
+      <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> categoria eliminada</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>
@@ -2998,6 +3017,7 @@
     <string name="zen_mode_from_starred" msgid="2678345811950997027">"Apenas de contactos com estrela"</string>
     <string name="zen_mode_from_none" msgid="8219706639954614136">"Nenhuma"</string>
     <string name="zen_mode_alarms" msgid="2165302777886552926">"Alarmes"</string>
+    <string name="zen_mode_alarms_summary" msgid="3774926045611788635">"Os alarmes têm sempre prioridade e emitem som"</string>
     <string name="zen_mode_reminders" msgid="5458502056440485730">"Lembretes"</string>
     <string name="zen_mode_events" msgid="7914446030988618264">"Eventos"</string>
     <string name="zen_mode_all_callers" msgid="584186167367236922">"Todos os autores de chamadas"</string>
@@ -3013,12 +3033,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">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>
+      <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>
     </plurals>
     <plurals name="zen_mode_summary_alarms_only_by_hour" formatted="false" msgid="2407703455581767748">
-      <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>
+      <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>
     </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>
@@ -3032,6 +3052,7 @@
     <string name="zen_mode_screen_off_visual_interruptions" msgid="4850792880144382633">"Quando o ecrã está desligado"</string>
     <string name="zen_mode_no_visual_interruptions" msgid="8742776003822778472">"Quando o ecrã está ligado ou desligado"</string>
     <string name="notification_app_settings_button" msgid="6685640230371477485">"Definições de notificações"</string>
+    <string name="suggestion_button_text" msgid="3275010948381252006">"Ok"</string>
     <string name="device_feedback" msgid="3238056036766293294">"Enviar comentários do dispositivo"</string>
     <string name="restr_pin_enter_admin_pin" msgid="1085834515677448072">"Introduzir o PIN do administrador"</string>
     <string name="switch_on_text" msgid="1124106706920572386">"Ativado"</string>
@@ -3091,15 +3112,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_1">%d</xliff:g> permissions granted</item>
+      <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> autorização concedida</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_2">%d</xliff:g> of <xliff:g id="COUNT_3">%d</xliff:g> permissions granted</item>
+      <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="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_1">%d</xliff:g> additional permissions</item>
+      <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> permissão adicional</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>
@@ -3128,7 +3149,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"><xliff:g id="COUNT">%d</xliff:g> apps opening supported links</item>
+      <item quantity="one">Uma aplicação que abre links compatíveis</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>
@@ -3137,7 +3158,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">"Entr. texto por voz e assist."</string>
+    <string name="assist_and_voice_input_title" msgid="1733165754793221197">"Assistência e entrada de voz"</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>
@@ -3146,7 +3167,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 Telefone"</string>
+    <string name="default_phone_title" msgid="282005908059637350">"Aplicação de 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>
@@ -3168,15 +3189,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">"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 completa do dispositivo"</string>
+    <string name="show_all_apps" msgid="1512506948197818534">"Mostrar utilização total do dispositivo"</string>
     <string name="hide_extra_apps" msgid="5016497281322459633">"Mostrar utilização de aplic."</string>
     <string name="power_high_usage_title" msgid="6027369425057347826">"Utilização elevada"</string>
     <plurals name="power_high_usage_summary" formatted="false" msgid="467347882627862744">
-      <item quantity="one"><xliff:g id="NUMBER">%2$d</xliff:g> apps behaving abnormally</item>
+      <item quantity="one"><xliff:g id="APP">%1$s</xliff:g> aplicação está a apresentar um comportamento anormal</item>
       <item quantity="other"><xliff:g id="NUMBER">%2$d</xliff:g> aplicações estão a apresentar um comportamento anormal</item>
     </plurals>
     <plurals name="power_high_usage_title" formatted="false" msgid="3826660033363082922">
-      <item quantity="one">Aplicações a consumir rapidamente a bateria</item>
+      <item quantity="one"><xliff:g id="APP">%1$s</xliff:g> a consumir rapidamente a bateria</item>
       <item quantity="other">Aplicações a consumir rapidamente a bateria</item>
     </plurals>
     <string name="high_power_filter_on" msgid="3222265297576680099">"Não otimizada"</string>
@@ -3216,6 +3237,7 @@
     <string name="usb_summary_file_transfers" msgid="6435943692610175111">"Transferir ficheiros"</string>
     <string name="usb_summary_photo_transfers" msgid="8440204169576585250">"Transferir fotos (PTP)"</string>
     <string name="usb_summary_MIDI" msgid="5687906612187885908">"Utilizar o dispositivo como MIDI"</string>
+    <string name="sms_mirroring_pref" msgid="6475043279147376031">"Espelhamento de SMS"</string>
     <string name="background_check_pref" msgid="7550258400138010979">"Verificação em segundo plano"</string>
     <string name="background_check_title" msgid="4534254315824525593">"Acesso completo em segundo plano"</string>
     <string name="assist_access_context_title" msgid="2269032346698890257">"Utilizar o texto do ecrã"</string>
@@ -3240,7 +3262,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"><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="one">1 aplicação utilizou a memória nos(as) últimos(as) <xliff:g id="DURATION_0">%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>
@@ -3282,7 +3304,7 @@
     <string name="write_settings_title" msgid="4232152481902542284">"Podem modificar as definições do sistema"</string>
     <string name="write_system_settings" msgid="3482913590601096763">"Modificar definições sistema"</string>
     <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="permit_write_settings" msgid="658555006453212691">"Permitir alteração das 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>
@@ -3311,7 +3333,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">Off for <xliff:g id="COUNT">%d</xliff:g> apps</item>
+      <item quantity="one">Desativadas para 1 aplicação</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>
@@ -3320,7 +3342,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 do tipo de letra"</string>
+    <string name="display_dashboard_summary" msgid="4145888780290131488">"Imagem de fundo, suspensão, tamanho da 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>
@@ -3366,20 +3388,23 @@
     <string name="suggestions_summary" msgid="2509040178581728056">"+<xliff:g id="ID_1">%1$d</xliff:g>"</string>
     <string name="suggestions_more_title" msgid="8223690393059519879">"Mais <xliff:g id="ID_1">%1$d</xliff:g>"</string>
     <plurals name="suggestions_collapsed_title" formatted="false" msgid="1857433444865249823">
-      <item quantity="one"><xliff:g id="COUNT">%1$d</xliff:g> sugestões</item>
+      <item quantity="one">1 sugestão</item>
       <item quantity="other"><xliff:g id="COUNT">%1$d</xliff:g> sugestões</item>
     </plurals>
     <plurals name="suggestions_collapsed_summary" formatted="false" msgid="7680263825371165461">
-      <item quantity="one">Mais <xliff:g id="COUNT">%1$d</xliff:g> sugestões</item>
+      <item quantity="one">Mais 1 sugestão</item>
       <item quantity="other">Mais <xliff:g id="COUNT">%1$d</xliff:g> sugestões</item>
     </plurals>
     <string name="suggestion_remove" msgid="904627293892092439">"Remover"</string>
     <string name="color_temperature" msgid="2070126836910615605">"Temperatura da cor fria"</string>
     <string name="color_temperature_desc" msgid="4793729830226404052">"Utilizar cores de visualização mais frias"</string>
     <string name="color_temperature_toast" msgid="4974218172133854827">"Para aplicar uma alteração de cor, desligue o ecrã"</string>
-    <string name="telephony_monitor_toast" msgid="7003764250271195384">"Para aplicar a alteração ao Monitor de telefonia, reinicie o dispositivo"</string>
+    <string name="connectivity_monitor_switch" msgid="9059759348648583421">"Monitor de conetividade"</string>
+    <string name="connectivity_monitor_switch_summary" msgid="2828658652378866401">"O Monitor de conetividade recolhe registos quando deteta um problema de conetividade e apresenta uma notificação ao utilizador para comunicar um erro."</string>
+    <string name="connectivity_monitor_toast" msgid="5551859612881173028">"Para aplicar a alteração do monitor de conetividade, reinicie o dispositivo."</string>
     <string name="camera_hal_hdrplus_switch" msgid="8377365197105267466">"Câmara HAL HDR+"</string>
     <string name="camera_hal_hdrplus_toast" msgid="2063703797270055299">"Para aplicar a alteração da Câmara HAL HDR+, reinicie o dispositivo."</string>
+    <string name="camera_laser_sensor_switch" msgid="8913588990743234440">"Sensor de laser da câmara"</string>
     <string name="ota_disable_automatic_update" msgid="2319639631655915050">"Atualizações do sistema automáticas"</string>
     <string name="usage" msgid="2977875522080448986">"Utilização"</string>
     <string name="cellular_data_usage" msgid="2155683719898158203">"Utilização de dados móveis"</string>
@@ -3396,7 +3421,7 @@
     <string name="billing_cycle_fragment_summary" msgid="8231066353654583106">"Mensalmente no dia <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="network_restrictions" msgid="8234695294536675380">"Restrições de rede"</string>
     <plurals name="network_restrictions_summary" formatted="false" msgid="4301618027244595839">
-      <item quantity="one"><xliff:g id="COUNT">%1$d</xliff:g> restrictions</item>
+      <item quantity="one">1 restrição</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>
@@ -3405,11 +3430,11 @@
     <string name="data_warning" msgid="209133958008062117">"Aviso de dados"</string>
     <string name="set_data_limit" msgid="2901526323210516923">"Definir limite de dados"</string>
     <string name="data_limit" msgid="1885406964934590552">"Limite de dados"</string>
-    <string name="data_usage_template" msgid="392191945602400904">"<xliff:g id="ID_1">%1$s</xliff:g> utilizado(s) entre <xliff:g id="ID_2">%2$s</xliff:g>"</string>
+    <string name="data_usage_template" msgid="2923744765873163859">"<xliff:g id="ID_1">%1$s</xliff:g> utilizado(s) entre <xliff:g id="ID_2">%2$s</xliff:g>"</string>
     <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"><xliff:g id="COUNT">%1$d</xliff:g> apps allowed to use unrestricted data when Data Saver is on</item>
+      <item quantity="one">1 aplicação autorizada a utilizar dados sem restrições quando a Poupança de dados está ativada</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>
@@ -3467,22 +3492,22 @@
     <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"><xliff:g id="COUNT">%d</xliff:g> apps can use unrestricted data</item>
+      <item quantity="one">1 aplicação pode utilizar dados sem restrições</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>
     <string name="button_confirm_convert_fbe" msgid="7101855374850373091">"Limpar e converter"</string>
     <string name="reset_shortcut_manager_throttling" msgid="6495066467198668994">"Repor o limite de taxa do ShortcutManager"</string>
     <string name="reset_shortcut_manager_throttling_complete" msgid="1826770872063707900">"O limite de taxa do ShortcutManager foi reposto"</string>
-    <string name="notification_suggestion_title" msgid="4506524937307816475">"Controlar notific. do ecrã de bloqueio"</string>
+    <string name="notification_suggestion_title" msgid="387052719462473500">"Controlar as informações no ecrã de bloqueio"</string>
     <string name="notification_suggestion_summary" msgid="8521159741445416875">"Mostrar ou ocultar conteúdo de notificações"</string>
     <string name="page_tab_title_summary" msgid="4070309266374993258">"Todas"</string>
-    <string name="page_tab_title_support" msgid="8483187649355540109">"Apoio téc. e sugest."</string>
+    <string name="page_tab_title_support" msgid="8483187649355540109">"Apoio técnico e sugestões"</string>
     <string name="developer_smallest_width" msgid="7516950434587313360">"A menor largura"</string>
     <string name="premium_sms_none" msgid="8268105565738040566">"Nenhuma aplicação instalada solicitou acesso a SMS premium"</string>
     <string name="premium_sms_warning" msgid="9086859595338944882">"O serviço de SMS premium pode custar dinheiro e, nesse caso, será adicionado às faturas do seu operador. Se ativar a autorização para uma aplicação, poderá enviar SMS premium através da mesma."</string>
     <string name="premium_sms_access" msgid="4660047004791638305">"Acesso a SMS premium"</string>
-    <string name="bluetooth_disabled" msgid="2456198532288640046">"Não visível para outros dispositivos"</string>
+    <string name="bluetooth_disabled" msgid="6244000672828617410">"Desativado"</string>
     <string name="bluetooth_connected_summary" msgid="7672528674593152862">"Ligado a <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="bluetooth_connected_multiple_devices_summary" msgid="9173661896296663932">"Ligado a vários dispositivos"</string>
     <string name="demo_mode" msgid="2798762752209330277">"Modo de demonstração da IU do sistema"</string>
@@ -3516,15 +3541,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"><xliff:g id="NUMBER">%s</xliff:g> hours</item>
+      <item quantity="one">1 hora</item>
       <item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> horas</item>
     </plurals>
     <plurals name="minutes" formatted="false" msgid="4666832442068789413">
-      <item quantity="one"><xliff:g id="NUMBER">%s</xliff:g> minutes</item>
+      <item quantity="one">1 minuto</item>
       <item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> minutos</item>
     </plurals>
     <plurals name="seconds" formatted="false" msgid="3876307354560025025">
-      <item quantity="one"><xliff:g id="NUMBER">%s</xliff:g> seconds</item>
+      <item quantity="one">1 segundo</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>
@@ -3568,14 +3593,14 @@
     <string name="ambient_display_pickup_summary" product="tablet" msgid="5435283849947236648">"Para consultar a hora, os ícones das notificações e outras informações, pegue no tablet."</string>
     <string name="ambient_display_pickup_summary" product="device" msgid="8256669101643381568">"Para consultar a hora, os ícones das notificações e outras informações, pegue no dispositivo."</string>
     <string name="ambient_display_pickup_suggestion_summary" msgid="7014700589991761035">"Consultar as notificações com o ecrã desativado"</string>
-    <string name="fingerprint_swipe_for_notifications_title" msgid="5816346492253270243">"Deslizar rapidamente a impressão digital para ver as notificações"</string>
+    <string name="fingerprint_swipe_for_notifications_title" msgid="5816346492253270243">"Utilizar impressão digital para ver as notificações"</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="default" msgid="1770661868393713922">"Para verificar as suas notificações, deslize rapidamente para baixo no sensor de impressões digitais situado na parte posterior do telemóvel."</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="tablet" msgid="902719947767712895">"Para verificar as suas notificações, deslize rapidamente para baixo no sensor de impressões digitais situado na parte posterior do tablet."</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="device" msgid="5372926094116306647">"Para verificar as suas notificações, deslize rapidamente para baixo no sensor de impressões digitais situado na parte posterior do dispositivo."</string>
     <string name="fingerprint_swipe_for_notifications_suggestion_title" msgid="1677291167470357802">"Ver as notificações rapidamente"</string>
     <string name="fingerprint_swipe_for_notifications_suggestion_summary" msgid="127592803294414082">"Deslizar rapid. p/ baixo no sensor de impressões digitais"</string>
-    <string name="gesture_setting_on" msgid="3455094265233870280">"Ativados"</string>
-    <string name="gesture_setting_off" msgid="5230169535435881894">"Desativados"</string>
+    <string name="gesture_setting_on" msgid="3455094265233870280">"Ativado"</string>
+    <string name="gesture_setting_off" msgid="5230169535435881894">"Desativado"</string>
     <string name="oem_unlock_enable_disabled_summary_bootloader_unlocked" msgid="4265541229765635629">"O carregador de arranque já está desbloqueado"</string>
     <string name="oem_unlock_enable_disabled_summary_connectivity" msgid="415954951226204461">"Ligar à Internet primeiro"</string>
     <string name="oem_unlock_enable_disabled_summary_connectivity_or_locked" msgid="5884723935668892613">"Estabelecer ligação à Internet ou contactar o operador"</string>
@@ -3584,7 +3609,7 @@
     <string name="web_action_enable_title" msgid="4051513950976670853">"Aplicações instantâneas"</string>
     <string name="web_action_enable_summary" msgid="3108127559723396382">"Abrir links nas aplicações, mesmo que não estejam instaladas"</string>
     <string name="web_action_section_title" msgid="7364647086538399136">"Aplicações instantâneas"</string>
-    <string name="instant_apps_account" msgid="1433620209791992528">"Conta de aplicações instantâneas"</string>
+    <string name="instant_apps_settings" msgid="8827777916518348213">"Preferências das Aplicações instantâneas"</string>
     <string name="domain_url_section_title" msgid="7046835219056428883">"Aplicações instaladas"</string>
     <string name="automatic_storage_manager_activation_warning" msgid="6353100011690933254">"O seu armazenamento está agora a ser gerido pelo gestor de armazenamento"</string>
     <string name="account_for_section_header" msgid="5356566418548737121">"Contas de <xliff:g id="USER_NAME">%1$s</xliff:g>"</string>
@@ -3614,7 +3639,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">Minimum <xliff:g id="COUNT_1">%d</xliff:g> apps</item>
+      <item quantity="one">No mínimo, <xliff:g id="COUNT_0">%d</xliff:g> aplicação</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>
@@ -3622,7 +3647,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_1">%d</xliff:g> apps</item>
+      <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> aplicação</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>
@@ -3631,9 +3656,11 @@
     <string name="enterprise_privacy_always_on_vpn_personal" msgid="9217774730260037434">"A opção VPN sempre ligada está ativada no seu perfil pessoal"</string>
     <string name="enterprise_privacy_always_on_vpn_work" msgid="7244472958208315814">"A opção VPN sempre ligada está ativada no seu perfil de trabalho"</string>
     <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>
+    <string name="enterprise_privacy_ca_certs_device" msgid="2019652712782510262">"Credenciais fidedignas"</string>
+    <string name="enterprise_privacy_ca_certs_personal" msgid="2279084820904076599">"Credenciais fidedignas no seu perfil pessoal"</string>
+    <string name="enterprise_privacy_ca_certs_work" msgid="6187377647815301809">"Credenciais fidedignas no seu perfil de trabalho"</string>
     <plurals name="enterprise_privacy_number_ca_certs" formatted="false" msgid="526375234629534165">
-      <item quantity="one">Minimum <xliff:g id="COUNT_1">%d</xliff:g> CA certificates</item>
+      <item quantity="one">No mínimo, <xliff:g id="COUNT_0">%d</xliff:g> certificado da AC</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>
@@ -3641,7 +3668,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_1">%d</xliff:g> attempts</item>
+      <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> tentativa</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>
@@ -3649,18 +3676,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">Camera apps</item>
+      <item quantity="one">Aplicação de câmara</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">Email client apps</item>
+      <item quantity="one">Aplicação de cliente de email</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">Phone apps</item>
+      <item quantity="one">Aplicação de telefone</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>
@@ -3694,6 +3721,8 @@
     <string name="carrier_provisioning" msgid="4398683675591893169">"Informações de fornecimento do operador"</string>
     <string name="trigger_carrier_provisioning" msgid="3434865918009286187">"Acionar fornecimento do operador"</string>
     <string name="new_device_suggestion_title" msgid="698847081680980774">"Quais são as grandes novidades?"</string>
-    <string name="new_device_suggestion_summary" msgid="7172709269203435870">"Conhecer as 5 principais funcionalidades"</string>
+    <string name="new_device_suggestion_summary" product="default" msgid="206396571522515855">"Faça uma visita guiada ao seu novo telemóvel"</string>
+    <string name="new_device_suggestion_summary" product="tablet" msgid="393751455688210956">"Faça uma visita guiada ao seu novo tablet"</string>
+    <string name="new_device_suggestion_summary" product="device" msgid="2939870049868336652">"Faça uma visita guiada ao seu novo dispositivo"</string>
     <string name="disabled_low_ram_device" msgid="3751578499721173344">"Esta funcionalidade não está disponível neste dispositivo."</string>
 </resources>
diff --git a/res/values-pt/arrays.xml b/res/values-pt/arrays.xml
index b5d9790..3c5a7ca 100644
--- a/res/values-pt/arrays.xml
+++ b/res/values-pt/arrays.xml
@@ -100,8 +100,6 @@
     <!-- no translation found for wifi_security_no_eap:0 (2084555984818107151) -->
     <!-- no translation found for wifi_security_no_eap:1 (397579322683471524) -->
     <!-- no translation found for wifi_security_no_eap:2 (1968820975358150484) -->
-    <!-- no translation found for wifi_ap_security:0 (5251664683198623324) -->
-    <!-- no translation found for wifi_ap_security:1 (7989073072260294673) -->
   <string-array name="wifi_eap_method">
     <item msgid="1160193392455075561">"PEAP"</item>
     <item msgid="7981731051382306293">"TLS"</item>
diff --git a/res/values-pt/strings.xml b/res/values-pt/strings.xml
index 16fd857..d1c47cf 100644
--- a/res/values-pt/strings.xml
+++ b/res/values-pt/strings.xml
@@ -166,7 +166,7 @@
     <string name="bluetooth_map_acceptance_dialog_text" msgid="8712508202081143737">"%1$s deseja acessar suas mensagens. Conceder acesso a %2$s?"</string>
     <string name="bluetooth_sap_request" msgid="2669762224045354417">"Solicitação de acesso ao cartão SIM"</string>
     <string name="bluetooth_sap_acceptance_dialog_text" msgid="4414253873553608690">"O <xliff:g id="DEVICE_NAME_0">%1$s</xliff:g> deseja acessar seu cartão SIM. A concessão de acesso ao cartão SIM desativará a conectividade de dados no seu dispositivo durante a conexão. Conceda acesso ao <xliff:g id="DEVICE_NAME_1">%2$s?</xliff:g>"</string>
-    <string name="bluetooth_device_name_summary" msgid="4757990010751789977">"Visível como \'<xliff:g id="DEVICE_NAME">^1</xliff:g>\' para outros dispositivos"</string>
+    <string name="bluetooth_device_name_summary" msgid="522235742194965734">"Visível como \"<xliff:g id="DEVICE_NAME">^1</xliff:g>\" para outros dispositivos"</string>
     <string name="bluetooth_paired_device_title" msgid="8638994696317952019">"Seus dispositivos"</string>
     <string name="bluetooth_pairing_page_title" msgid="7712127387361962608">"Parear novo dispositivo"</string>
     <string name="date_and_time" msgid="9062980487860757694">"Data e hora"</string>
@@ -312,6 +312,8 @@
     <string name="zone_auto" msgid="334783869352026648">"Fuso horário automático"</string>
     <string name="zone_auto_summaryOn" msgid="6142830927278458314">"Usar fuso horário fornecido pela rede"</string>
     <string name="zone_auto_summaryOff" msgid="2597745783162041390">"Usar fuso horário fornecido pela rede"</string>
+    <string name="date_time_24hour_auto" msgid="2117383168985653422">"Formato de 24 horas automático"</string>
+    <string name="date_time_24hour_auto_summary" msgid="6351812925651480277">"Usar localidade padrão"</string>
     <string name="date_time_24hour_title" msgid="3203537578602803850">"Formato de 24 horas"</string>
     <string name="date_time_24hour" msgid="1193032284921000063">"Formato de 24 horas"</string>
     <string name="date_time_set_time_title" msgid="6296795651349047016">"Horário"</string>
@@ -329,7 +331,7 @@
     <string name="lock_immediately_summary_with_exception" msgid="9119632173886172690">"Imediatamente após a suspensão, exceto quando mantido desbloqueado por <xliff:g id="TRUST_AGENT_NAME">%1$s</xliff:g>"</string>
     <string name="lock_after_timeout_summary_with_exception" msgid="5579064842797188409">"<xliff:g id="TIMEOUT_STRING">%1$s</xliff:g> após suspensão, exceto quando mantido desbloqueado por <xliff:g id="TRUST_AGENT_NAME">%2$s</xliff:g>"</string>
     <string name="show_owner_info_on_lockscreen_label" msgid="5074906168357568434">"Mostrar informações do proprietário na tela de bloqueio"</string>
-    <string name="owner_info_settings_title" msgid="5530285568897386122">"Msg na tela de bloqueio"</string>
+    <string name="owner_info_settings_title" msgid="5530285568897386122">"Mensagem na tela de bloqueio"</string>
     <string name="security_enable_widgets_title" msgid="2754833397070967846">"Ativar widgets"</string>
     <string name="security_enable_widgets_disabled_summary" msgid="6392489775303464905">"Desativada pelo administrador"</string>
     <string name="owner_info_settings_summary" msgid="7472393443779227052">"Nenhuma"</string>
@@ -359,7 +361,7 @@
     <string name="fingerprint_add_title" msgid="1926752654454033904">"Adicionar impressão digital"</string>
     <string name="fingerprint_enable_keyguard_toggle_title" msgid="5078060939636911795">"bloqueio de tela"</string>
     <plurals name="security_settings_fingerprint_preference_summary" formatted="false" msgid="624961700033979880">
-      <item quantity="one"><xliff:g id="COUNT_1">%1$d</xliff:g> impressões digitais configuradas</item>
+      <item quantity="one"><xliff:g id="COUNT_1">%1$d</xliff:g> impressão digital configurada</item>
       <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> impressões digitais configuradas</item>
     </plurals>
     <string name="security_settings_fingerprint_preference_summary_none" msgid="1507739327565151923"></string>
@@ -372,22 +374,25 @@
     <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="1961957425135180242">"Próxima"</string>
+    <string name="setup_fingerprint_enroll_skip_title" msgid="362050541117362034">"Pular impressão digital?"</string>
+    <string name="setup_fingerprint_enroll_skip_after_adding_lock_text" msgid="958990414356204763">"A configuração da impressão digital leva apenas um ou dois minutos. Se você pular essa etapa, poderá adicionar sua impressão digital mais tarde nas configurações."</string>
+    <string name="lock_screen_intro_skip_title" msgid="4988210105913705679">"Pular bloqueio de tela?"</string>
     <string name="lock_screen_intro_skip_dialog_text_frp" product="tablet" msgid="1581834104051243425">"Os recursos de proteção do dispositivo não serão ativados. Você não poderá impedir que outras pessoas usem este tablet se ele for perdido, roubado ou redefinido."</string>
     <string name="lock_screen_intro_skip_dialog_text_frp" product="device" msgid="4629503416877189572">"Os recursos de proteção do dispositivo não serão ativados. Você não poderá impedir que outras pessoas usem este dispositivo se ele for perdido, roubado ou redefinido."</string>
     <string name="lock_screen_intro_skip_dialog_text_frp" product="default" msgid="2423428240245737909">"Os recursos de proteção do dispositivo não serão ativados. Você não poderá impedir que outras pessoas usem este smartphone se ele for perdido, roubado ou redefinido."</string>
     <string name="lock_screen_intro_skip_dialog_text" product="tablet" msgid="5219287483885558525">"Os recursos de proteção do dispositivo não serão ativados. Você não poderá impedir que outras pessoas usem este tablet se ele for perdido ou roubado."</string>
     <string name="lock_screen_intro_skip_dialog_text" product="device" msgid="1466238255429527112">"Os recursos de proteção do dispositivo não serão ativados. Você não poderá impedir que outras pessoas usem este dispositivo se ele for perdido ou roubado."</string>
     <string name="lock_screen_intro_skip_dialog_text" product="default" msgid="3008526710555416125">"Os recursos de proteção do dispositivo não serão ativados. Você não poderá impedir que outras pessoas usem este smartphone se ele for perdido ou roubado."</string>
-    <string name="skip_anyway_button_label" msgid="2323522873558834513">"Ignorar"</string>
+    <string name="skip_anyway_button_label" msgid="2323522873558834513">"Pular mesmo assim"</string>
     <string name="go_back_button_label" msgid="4745265266186209467">"Voltar"</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_title" msgid="3051496861358227199">"Toque no sensor"</string>
-    <string name="security_settings_fingerprint_enroll_find_sensor_message" msgid="8793966374365960368">"Ele fica na parte de trás do seu smartphone. Use seu dedo indicador."</string>
+    <string name="security_settings_fingerprint_enroll_find_sensor_message" msgid="8793966374365960368">"Ele fica na parte traseira do seu smartphone. Use o dedo indicador."</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_content_description" msgid="2058830032070449160">"Ilustração mostrando a localização do sensor de impressão digital no dispositivo"</string>
     <string name="security_settings_fingerprint_enroll_dialog_name_label" msgid="7086763077909041106">"Nome"</string>
     <string name="security_settings_fingerprint_enroll_dialog_ok" msgid="4150384963879569750">"Ok"</string>
     <string name="security_settings_fingerprint_enroll_dialog_delete" msgid="4114615413240707936">"Excluir"</string>
     <string name="security_settings_fingerprint_enroll_start_title" msgid="2068961812439460133">"Toque no sensor"</string>
-    <string name="security_settings_fingerprint_enroll_start_message" msgid="3909929328942564524">"Coloque seu dedo no sensor e levante após sentir uma vibração"</string>
+    <string name="security_settings_fingerprint_enroll_start_message" msgid="3909929328942564524">"Encoste o dedo no sensor e levante após sentir uma vibração"</string>
     <string name="security_settings_fingerprint_enroll_repeat_title" msgid="2819679722403209778">"Levante e toque novamente"</string>
     <string name="security_settings_fingerprint_enroll_repeat_message" msgid="6158989350522518586">"Continue levantando o dedo para adicionar as diferentes partes da sua impressão digital"</string>
     <string name="security_settings_fingerprint_enroll_finish_title" msgid="7567276170287972230">"Impressão digital adicionada"</string>
@@ -398,10 +403,10 @@
     <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="2989019978041986175">"Toque no sensor na parte de trás do smartphone. Use o dedo indicador."</string>
+    <string name="security_settings_fingerprint_enroll_touch_dialog_message" msgid="2989019978041986175">"Toque no sensor na parte traseira do smartphone. Use o dedo indicador."</string>
     <string name="security_settings_fingerprint_enroll_error_dialog_title" msgid="3618021988442639280">"O registro não foi concluído"</string>
     <string name="security_settings_fingerprint_enroll_error_timeout_dialog_message" msgid="2942551158278899627">"Prazo de registro de impressões digitais atingido. Tente novamente."</string>
-    <string name="security_settings_fingerprint_enroll_error_generic_dialog_message" msgid="3624760637222239293">"O registro de impressões digitais não funcionou. Tente novamente ou use um dedo diferente."</string>
+    <string name="security_settings_fingerprint_enroll_error_generic_dialog_message" msgid="3624760637222239293">"O registro da impressão digital não funcionou. Tente novamente ou use um dedo diferente."</string>
     <string name="fingerprint_enroll_button_add" msgid="6317978977419045463">"Adicionar outra"</string>
     <string name="fingerprint_enroll_button_next" msgid="6247009337616342759">"Próxima"</string>
     <string name="security_settings_fingerprint_enroll_disclaimer" msgid="2624905914239271751">"Além de desbloquear seu smartphone, também é possível usar sua impressão digital para autorizar compras e acesso a apps. "<annotation id="url">"Saiba mais"</annotation></string>
@@ -457,7 +462,7 @@
     <string name="setup_lock_settings_picker_title" product="tablet" msgid="90329443364067215">"Proteger o tablet"</string>
     <string name="setup_lock_settings_picker_title" product="device" msgid="2399952075134938929">"Proteger o dispositivo"</string>
     <string name="setup_lock_settings_picker_title" product="default" msgid="1572244299605153324">"Proteger o smartphone"</string>
-    <string name="setup_lock_settings_picker_fingerprint_message" msgid="5585650064305600578">"Para aumentar a segurança, configure um bloqueio de tela alternativo."</string>
+    <string name="lock_settings_picker_fingerprint_added_security_message" msgid="5768002109707648463">"Para aumentar a segurança, defina um bloqueio de tela alternativo."</string>
     <string name="setup_lock_settings_picker_message" product="tablet" msgid="8919671129189936210">"Para impedir que outras pessoas usem este tablet 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="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>
@@ -499,29 +504,37 @@
     <string name="unlock_disable_frp_warning_title" msgid="264008934468492550">"Remover proteção do dispositivo?"</string>
     <string name="unlock_disable_frp_warning_title_profile" msgid="5507136301904313583">"Remover proteção de perfil?"</string>
     <string name="unlock_disable_frp_warning_content_pattern" msgid="8869767290771023461">"Os recursos de proteção do dispositivo não funcionarão sem seu padrão."</string>
-    <!-- no translation found for unlock_disable_frp_warning_content_pattern_fingerprint (2986105377420905314) -->
-    <skip />
+    <string name="unlock_disable_frp_warning_content_pattern_fingerprint" msgid="2986105377420905314">"Os recursos de proteção do dispositivo não funcionarão sem seu padrão.<xliff:g id="EMPTY_LINE">
+
+</xliff:g>Suas impressões digitais salvas também serão removidas deste dispositivo e não será possível desbloquear o smartphone, autorizar compras ou fazer login em apps com elas."</string>
     <string name="unlock_disable_frp_warning_content_pin" msgid="586996206210265131">"Os recursos de proteção do dispositivo não funcionarão sem seu PIN."</string>
-    <!-- no translation found for unlock_disable_frp_warning_content_pin_fingerprint (3370462835533123695) -->
-    <skip />
+    <string name="unlock_disable_frp_warning_content_pin_fingerprint" msgid="3370462835533123695">"Os recursos de proteção do dispositivo não funcionarão sem seu PIN.<xliff:g id="EMPTY_LINE">
+
+</xliff:g>Suas impressões digitais salvas também serão removidas deste dispositivo e não será possível desbloquear o smartphone, autorizar compras ou fazer login em apps com elas."</string>
     <string name="unlock_disable_frp_warning_content_password" msgid="5420612686852555537">"Os recursos de proteção do dispositivo não funcionarão sem sua senha."</string>
-    <!-- no translation found for unlock_disable_frp_warning_content_password_fingerprint (3595476296430536798) -->
-    <skip />
+    <string name="unlock_disable_frp_warning_content_password_fingerprint" msgid="3595476296430536798">"Os recursos de proteção do dispositivo não funcionarão sem sua senha.<xliff:g id="EMPTY_LINE">
+
+</xliff:g>Suas impressões digitais salvas também serão removidas deste dispositivo e não será possível desbloquear o smartphone, autorizar compras ou fazer login em apps com elas."</string>
     <string name="unlock_disable_frp_warning_content_unknown" msgid="1550718040483548220">"Os recursos de proteção do dispositivo não funcionarão sem seu bloqueio de tela."</string>
-    <!-- no translation found for unlock_disable_frp_warning_content_unknown_fingerprint (3679351662094349506) -->
-    <skip />
+    <string name="unlock_disable_frp_warning_content_unknown_fingerprint" msgid="3679351662094349506">"Os recursos de proteção do dispositivo não funcionarão sem seu bloqueio de tela.<xliff:g id="EMPTY_LINE">
+
+</xliff:g>Suas impressões digitais salvas também serão removidas deste dispositivo e não será possível desbloquear o smartphone, autorizar compras ou fazer login em apps com elas."</string>
     <string name="unlock_disable_frp_warning_content_pattern_profile" msgid="8682200103576359918">"Os recursos de proteção de perfil não funcionam sem seu padrão."</string>
-    <!-- no translation found for unlock_disable_frp_warning_content_pattern_fingerprint_profile (6718155854303231675) -->
-    <skip />
+    <string name="unlock_disable_frp_warning_content_pattern_fingerprint_profile" msgid="6718155854303231675">"Os recursos de proteção de perfil não funcionarão sem seu padrão.<xliff:g id="EMPTY_LINE">
+
+</xliff:g>Suas impressões digitais salvas também serão removidas deste perfil e não será possível desbloquear o perfil, autorizar compras ou fazer login em apps com elas."</string>
     <string name="unlock_disable_frp_warning_content_pin_profile" msgid="7790688070593867767">"Os recursos de proteção de perfil não funcionam sem seu PIN."</string>
-    <!-- no translation found for unlock_disable_frp_warning_content_pin_fingerprint_profile (4209564603132870532) -->
-    <skip />
+    <string name="unlock_disable_frp_warning_content_pin_fingerprint_profile" msgid="4209564603132870532">"Os recursos de proteção de perfil não funcionarão sem seu PIN.<xliff:g id="EMPTY_LINE">
+
+</xliff:g>Suas impressões digitais salvas também serão removidas deste perfil e não será possível desbloquear o perfil, autorizar compras ou fazer login em apps com elas."</string>
     <string name="unlock_disable_frp_warning_content_password_profile" msgid="7569285520567674461">"Os recursos de proteção de perfil não funcionam sem sua senha."</string>
-    <!-- no translation found for unlock_disable_frp_warning_content_password_fingerprint_profile (2994300676764706047) -->
-    <skip />
+    <string name="unlock_disable_frp_warning_content_password_fingerprint_profile" msgid="2994300676764706047">"Os recursos de proteção de perfil não funcionarão sem sua senha.<xliff:g id="EMPTY_LINE">
+
+</xliff:g>Suas impressões digitais salvas também serão removidas deste perfil e não será possível desbloquear o perfil, autorizar compras ou fazer login em apps com elas."</string>
     <string name="unlock_disable_frp_warning_content_unknown_profile" msgid="6984215718701688202">"Os recursos de proteção de perfil não funcionarão sem seu bloqueio de tela."</string>
-    <!-- no translation found for unlock_disable_frp_warning_content_unknown_fingerprint_profile (4994062501123299418) -->
-    <skip />
+    <string name="unlock_disable_frp_warning_content_unknown_fingerprint_profile" msgid="4994062501123299418">"Os recursos de proteção de perfil não funcionarão sem seu bloqueio de tela.<xliff:g id="EMPTY_LINE">
+
+</xliff:g>Suas impressões digitais salvas também serão removidas deste perfil e não será possível desbloquear o perfil, autorizar compras ou fazer login em apps com elas."</string>
     <string name="unlock_disable_frp_warning_ok" msgid="7075138677177748705">"Sim, remover"</string>
     <string name="unlock_change_lock_pattern_title" msgid="2044092014872741130">"Mudar padrão de desbloqueio"</string>
     <string name="unlock_change_lock_pin_title" msgid="806629901095938484">"Mudar PIN de desbloqueio"</string>
@@ -580,6 +593,7 @@
     <string name="lockpassword_pin_no_sequential_digits" msgid="680765285206990584">"Não é permitido usar uma sequência de dígitos em ordem crescente, decrescente ou repetidos"</string>
     <string name="lockpassword_ok_label" msgid="313822574062553672">"OK"</string>
     <string name="lockpassword_cancel_label" msgid="8818529276331121899">"Cancelar"</string>
+    <string name="lockpassword_clear_label" msgid="5724429464960458155">"Limpar"</string>
     <string name="lockpattern_tutorial_cancel_label" msgid="6431583477570493261">"Cancelar"</string>
     <string name="lockpattern_tutorial_continue_label" msgid="3559793618653400434">"Avançar"</string>
     <string name="lock_setup" msgid="3355847066343753943">"A configuração foi concluída."</string>
@@ -639,7 +653,7 @@
     <string name="bluetooth_device_context_connect_advanced" msgid="2643129703569788771">"Opções…"</string>
     <string name="bluetooth_menu_advanced" msgid="8572178316357220524">"Avançado"</string>
     <string name="bluetooth_advanced_titlebar" msgid="2142159726881547669">"Bluetooth avançado"</string>
-    <string name="bluetooth_empty_list_bluetooth_off" msgid="6351930724051893423">"Com o Bluetooth ativado, o dispositivo pode se comunicar"</string>
+    <string name="bluetooth_empty_list_bluetooth_off" msgid="6351930724051893423">"Com o Bluetooth ativado, o dispositivo pode se comunicar com dispositivos próximos"</string>
     <string name="ble_scan_notify_text" msgid="1295915006005700650">"Para aumentar a precisão da localização, apps e serviços do sistema ainda detectam dispositivos Bluetooth. É possível alterar isso nas <xliff:g id="LINK_BEGIN_0">LINK_BEGIN</xliff:g>configurações de verificação<xliff:g id="LINK_END_1">LINK_END</xliff:g>."</string>
     <string name="bluetooth_connect_failed" msgid="4500234659813241053">"Não foi possível conectar. Tente novamente."</string>
     <string name="device_details_title" msgid="6576953269221085300">"Detalhes do dispositivo"</string>
@@ -694,9 +708,9 @@
     <string name="android_beam_settings_title" msgid="7832812974600338649">"Android Beam"</string>
     <string name="android_beam_on_summary" msgid="3618057099355636830">"Pronto para transmitir conteúdo de apps via NFC"</string>
     <string name="android_beam_off_summary" msgid="4663095428454779138">"Desativado"</string>
-    <string name="android_beam_disabled_summary" msgid="1737782116894793393">"Indisponível porque o NFC está desativado"</string>
+    <string name="android_beam_disabled_summary" msgid="1737782116894793393">"Indisponível porque a NFC está desativada"</string>
     <string name="android_beam_label" msgid="6257036050366775040">"Android Beam"</string>
-    <string name="android_beam_explained" msgid="1810540319385192758">"Quando esse recurso está ativado, é possível enviar o conteúdo do app para outro dispositivo compatível com NFC, mantendo os dispositivos próximos, Por exemplo, é possível enviar páginas da Web, vídeos do YouTube, contatos e muito mais.\n\nBasta posicionar os dispositivos próximos (normalmente de costas um para o outro) e tocar na tela. O app determina o que é enviado."</string>
+    <string name="android_beam_explained" msgid="1810540319385192758">"Quando esse recurso está ativado, é possível enviar o conteúdo do app para outro dispositivo compatível com NFC, mantendo os dispositivos próximos. Por exemplo, é possível enviar páginas da Web, vídeos do YouTube, contatos e muito mais.\n\nBasta aproximar os dispositivos (normalmente de costas um para o outro) e tocar na tela. O app determina o que é enviado."</string>
     <string name="wifi_quick_toggle_title" msgid="8850161330437693895">"Wi-Fi"</string>
     <string name="wifi_quick_toggle_summary" msgid="2696547080481267642">"Ativar o Wi-Fi"</string>
     <string name="wifi_settings" msgid="29722149822540994">"Wi-Fi"</string>
@@ -773,6 +787,7 @@
     <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>
@@ -809,6 +824,8 @@
     <string name="wifi_wps_available_first_item" msgid="4422547079984583502">"WPS disponível"</string>
     <string name="wifi_wps_available_second_item" msgid="8427520131718215301">" (WPS disponível)"</string>
     <string name="wifi_wps_nfc_enter_password" msgid="2288214226916117159">"Insira a senha da rede"</string>
+    <string name="wifi_carrier_connect" msgid="8174696557882299911">"Rede Wi‑Fi de operadora"</string>
+    <string name="wifi_carrier_content" msgid="4634077285415851933">"Conecte-se via <xliff:g id="NAME">%1%s</xliff:g>"</string>
     <string name="wifi_scan_always_turnon_message" msgid="203123538572122989">"Para aumentar a precisão da localização e outras finalidades, <xliff:g id="APP_NAME">%1$s</xliff:g> quer ativar a verificação de rede, mesmo que o Wi-Fi esteja desligado.\n\nPermitir isto para todos os apps que quiserem verificar?"</string>
     <string name="wifi_scan_always_turnoff_message" msgid="5538901671131941043">"Para desativar esta opção, vá para \"Avançado\" no menu flutuante."</string>
     <string name="wifi_scan_always_confirm_allow" msgid="5355973075896817232">"Permitir"</string>
@@ -826,6 +843,7 @@
     <string name="wifi_connect" msgid="1076622875777072845">"Conectar"</string>
     <string name="wifi_failed_connect_message" msgid="8491902558970292871">"Falha ao conectar à rede"</string>
     <string name="wifi_forget" msgid="8168174695608386644">"Esquecer"</string>
+    <string name="wifi_modify" msgid="6100248070440710782">"Modificar"</string>
     <string name="wifi_failed_forget_message" msgid="1348172929201654986">"Falha ao esquecer a rede"</string>
     <string name="wifi_save" msgid="3331121567988522826">"Salvar"</string>
     <string name="wifi_failed_save_message" msgid="6650004874143815692">"Falha ao salvar a rede"</string>
@@ -838,6 +856,7 @@
     <string name="wifi_advanced_titlebar" msgid="4485841401774142908">"Wi-Fi avançado"</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_title" msgid="3471132676909349382">"Informações da rede"</string>
     <string name="wifi_details_subnet_mask" msgid="6720279144174924410">"Máscara de sub-rede"</string>
     <string name="wifi_details_dns" msgid="8648826607751830768">"DNS"</string>
     <string name="wifi_details_ipv6_address_header" msgid="6734119149106422148">"Endereços IPv6"</string>
@@ -870,16 +889,15 @@
     <string name="wifi_p2p_cancel_connect_title" msgid="255267538099324413">"Cancelar convite?"</string>
     <string name="wifi_p2p_cancel_connect_message" msgid="7477756213423749402">"Deseja cancelar o convite para se conectar com <xliff:g id="PEER_NAME">%1$s</xliff:g>?"</string>
     <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_off_subtext" msgid="5466126533609394170">"Não está compartilhando a Internet ou conteúdo com outros dispositivos"</string>
     <string name="wifi_hotspot_tethering_on_subtext" product="tablet" msgid="5752490509369962007">"Compartilhando a conexão de Internet deste tablet via ponto de acesso"</string>
     <string name="wifi_hotspot_tethering_on_subtext" product="default" msgid="6461075246164300670">"Compartilhando a conexão de Internet deste smartphone via ponto de acesso"</string>
     <string name="wifi_hotspot_on_local_only_subtext" msgid="2068110388011294735">"O app está compartilhando conteúdo. Para compartilhar a conexão com a Internet, desative e ative o ponto de acesso."</string>
-    <string name="wifi_hotspot_name_title" msgid="1341735529132128887">"Nome do Wi-Fi"</string>
+    <string name="wifi_hotspot_name_title" msgid="8237000746618636778">"Nome do ponto de acesso"</string>
     <string name="wifi_hotspot_name_summary_connecting" msgid="3378299995508671967">"Ativando <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>..."</string>
     <string name="wifi_hotspot_name_summary_connected" msgid="3888672084861445362">"Outros dispositivos podem se conectar a <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>"</string>
-    <string name="wifi_hotspot_password_title" msgid="1955592302902091281">"Senha do Wi-Fi"</string>
+    <string name="wifi_hotspot_password_title" msgid="8676859981917573801">"Senha do ponto de acesso"</string>
     <string name="wifi_hotspot_ap_band_title" msgid="1165801173359290681">"Banda de AP"</string>
     <string name="wifi_hotspot_footer_info_regular" msgid="1203489406068036455">"Use o ponto de acesso para criar uma rede Wi‑Fi para outros dispositivos. O ponto de acesso fornece Internet usando sua conexão de dados móveis. Pode haver cobrança adicional para dados móveis."</string>
     <string name="wifi_hotspot_footer_info_local_only" msgid="857988412470694109">"Os apps podem criar um ponto de acesso para compartilhamento de conteúdo com dispositivos nas proximidades."</string>
@@ -890,7 +908,6 @@
     <string name="wifi_tether_configure_ap_text" msgid="7974681394041609308">"Configurar ponto de acesso Wi-Fi"</string>
     <string name="wifi_hotspot_configure_ap_text" msgid="5478614731464220432">"Config. ponto de acesso Wi-Fi"</string>
     <string name="wifi_hotspot_configure_ap_text_summary" msgid="5560680057727007011">"Ponto de acesso AndroidAP WPA2 PSK"</string>
-    <string name="wifi_tether_configure_subtext" msgid="2050196439900426456">"Ponto de acesso <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">"Ponto de acesso Android"</string>
     <string name="wifi_calling_settings_title" msgid="4102921303993404577">"Chamadas por Wi-Fi"</string>
     <string name="wifi_calling_suggestion_title" msgid="9008010480466359578">"Ativar chamada no Wi-Fi"</string>
@@ -931,7 +948,7 @@
     <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="emergency_address_summary" msgid="3266760199681945746">"Endereço usado como sua localização pelos serviços de emergência se você fizer uma chamada de emergência usando o Wi‑Fi"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"Tela"</string>
     <string name="sound_settings" msgid="5534671337768745343">"Som"</string>
     <string name="all_volume_title" msgid="4296957391257836961">"Volumes"</string>
@@ -985,6 +1002,7 @@
     <string name="search_settings" msgid="1910951467596035063">"Pesquisar"</string>
     <string name="search_settings_summary" msgid="9205656546570654169">"Gerenciar configurações e histórico de pesquisa"</string>
     <string name="search_settings_no_results" msgid="8799027492641230999">"Nenhum resultado"</string>
+    <string name="search_clear_history" msgid="4196658962573162457">"Limpar histórico"</string>
     <string name="display_settings" msgid="7965901687241669598">"Tela"</string>
     <string name="accelerometer_title" msgid="7854608399547349157">"Girar tela automaticamente"</string>
     <string name="color_mode_title" msgid="3159275920408338215">"Cores vívidas"</string>
@@ -1044,7 +1062,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 encaixado"</string>
+    <string name="screensaver_settings_summary_dock" msgid="2072657401664633283">"Quando ancorado"</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>
@@ -1055,15 +1073,13 @@
     <string name="automatic_brightness" msgid="5014143533884135461">"Brilho automático"</string>
     <string name="lift_to_wake_title" msgid="4555378006856277635">"Levantar para ativar"</string>
     <string name="ambient_display_screen_title" msgid="4252755516328775766">"Exibição de ambiente"</string>
-    <!-- no translation found for ambient_display_screen_summary_always_on (7337555569694794132) -->
-    <skip />
+    <string name="ambient_display_screen_summary_always_on" msgid="7337555569694794132">"Sempre ativado / Aumento do uso da bateria"</string>
     <string name="ambient_display_screen_summary_notifications" msgid="1449570742600868654">"Novas notificações"</string>
     <string name="ambient_display_category_triggers" msgid="4359289754456268573">"Quando mostrar"</string>
     <string name="doze_title" msgid="2375510714460456687">"Novas notificações"</string>
     <string name="doze_summary" msgid="3846219936142814032">"Ativar a tela ao receber notificações"</string>
     <string name="doze_always_on_title" msgid="1046222370442629646">"Sempre ativado"</string>
-    <!-- no translation found for doze_always_on_summary (6978257596231155345) -->
-    <skip />
+    <string name="doze_always_on_summary" msgid="6978257596231155345">"Mostrar horário, ícones de notificação e outras informações. Aumento do uso da bateria."</string>
     <string name="title_font_size" msgid="4405544325522105222">"Tamanho da fonte"</string>
     <string name="short_summary_font_size" msgid="6819778801232989076">"Tornar o texto maior ou menor"</string>
     <string name="sim_lock_settings" msgid="3392331196873564292">"Bloqueio do SIM"</string>
@@ -1116,7 +1132,6 @@
     <string name="baseband_version" msgid="1848990160763524801">"Versão da banda de base"</string>
     <string name="kernel_version" msgid="9192574954196167602">"Versão do kernel"</string>
     <string name="build_number" msgid="3075795840572241758">"Número da versão"</string>
-    <string name="selinux_status" msgid="6212165375172061672">"Status do SELinux"</string>
     <string name="device_info_not_available" msgid="8062521887156825182">"Não disponível"</string>
     <string name="device_status_activity_title" msgid="1411201799384697904">"Status"</string>
     <string name="device_status" msgid="607405385799807324">"Status"</string>
@@ -1144,7 +1159,6 @@
     <string name="status_wifi_mac_address" msgid="2202206684020765378">"Endereço MAC da rede Wi-Fi"</string>
     <string name="status_bt_address" msgid="4195174192087439720">"Endereço Bluetooth"</string>
     <string name="status_serial_number" msgid="2257111183374628137">"Número de série"</string>
-    <string name="status_unavailable" msgid="7862009036663793314">"Não disponível"</string>
     <string name="status_up_time" msgid="7294859476816760399">"Tempo de atividade"</string>
     <string name="status_awake_time" msgid="2393949909051183652">"Tempo ativo"</string>
     <string name="internal_memory" msgid="9129595691484260784">"Armaz. interno"</string>
@@ -1320,25 +1334,23 @@
     <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="6254873816990678620">"Redefinir opções"</string>
+    <string name="reset_dashboard_summary" msgid="4851012632493522755">"A rede, os apps ou o dispositivo podem ser redefinidos"</string>
     <string name="reset_network_title" msgid="6166025966016873843">"Redefinir Wi-Fi, rede móvel e Bluetooth"</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>
     <string name="reset_network_confirm_title" msgid="1759888886976962773">"Redefinir?"</string>
     <string name="network_reset_not_available" msgid="7188610385577164676">"A redefinição da rede não está disponível para esse usuário"</string>
     <string name="reset_network_complete_toast" msgid="787829973559541880">"As configurações de rede foram redefinidas"</string>
-    <string name="master_clear_title" msgid="6617679904229218425">"Limpar todos os dados (redefinição para a configuração original)"</string>
-    <plurals name="master_clear_with_account_summary" formatted="false" msgid="5911377203778818712">
-      <item quantity="one"><xliff:g id="ACCOUNT_COUNT">%1$d</xliff:g> conta será redefinida</item>
-      <item quantity="other"><xliff:g id="ACCOUNT_COUNT">%1$d</xliff:g> contas serão redefinidas</item>
-    </plurals>
-    <string name="master_clear_summary" msgid="6902443944660426951">"O armazenamento interno e todos os dados serão redefinidos"</string>
+    <string name="master_clear_title" msgid="3531267871084279512">"Limpar todos os dados (redefinição para configuração original)"</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_accounts" product="default" msgid="6412857499147999073">\n\n"No momento você está conectado às seguintes contas:\n"</string>
     <string name="master_clear_other_users_present" product="default" msgid="5161423070702470742">\n\n"Há outros usuários presentes neste dispositivo.\n"</string>
     <string name="master_clear_desc_also_erases_external" msgid="1903185203791274237"><li>"Músicas"</li>\n<li>"Fotos"</li>\n<li>"Outros dados do usuário"</li></string>
+    <string name="master_clear_desc_also_erases_esim" msgid="312352697653096008"><li>"Operadoras no eSIM"</li></string>
+    <string name="master_clear_desc_no_cancel_mobile_plan" msgid="5460926449093211144">\n\n"Essa ação não cancelará seu plano de serviços móveis."</string>
     <string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="7744115866662613411">\n\n"Para limpar músicas, fotos e outros dados de usuário, o "<b>"armazenamento USB"</b>" precisa ser apagado."</string>
     <string name="master_clear_desc_erase_external_storage" product="default" msgid="4801026652617377093">\n\n"Para limpar músicas, imagens e outros dados de usuário, o conteúdo do "<b>"cartão SD"</b>" precisa ser apagado."</string>
     <string name="erase_external_storage" product="nosdcard" msgid="969364037450286809">"Apagar armazenamento USB"</string>
@@ -1350,7 +1362,7 @@
     <string name="erase_esim_storage_description" product="tablet" msgid="1780953956941209107">"Limpa todos os eSIMs no tablet. Essa opção não cancela seu plano de serviços móveis."</string>
     <string name="master_clear_button_text" product="tablet" msgid="3130786116528304116">"Redefinir tablet"</string>
     <string name="master_clear_button_text" product="default" msgid="7550632653343157971">"Redefinir smartphone"</string>
-    <string name="master_clear_final_desc" msgid="7318683914280403086">"Limpar todas as suas informações pessoais e apps baixados por download? Não é possível desfazer esta ação."</string>
+    <string name="master_clear_final_desc" msgid="7318683914280403086">"Limpar todas as suas informações pessoais e apps transferidos por download? Não é possível desfazer esta ação."</string>
     <string name="master_clear_final_button_text" msgid="5390908019019242910">"Apagar tudo"</string>
     <string name="master_clear_failed" msgid="2503230016394586353">"Nenhuma redefinição foi realizada porque o serviço de Limpeza do sistema não está disponível."</string>
     <string name="master_clear_confirm_title" msgid="7572642091599403668">"Redefinir?"</string>
@@ -1455,18 +1467,19 @@
     <string name="settings_safetylegal_activity_title" msgid="6901214628496951727">"Informações de segurança"</string>
     <string name="settings_safetylegal_activity_unreachable" msgid="250674109915859456">"Você não tem uma conexão de dados. Para visualizar estas informações agora, acesse %s em qualquer computador conectado à Internet."</string>
     <string name="settings_safetylegal_activity_loading" msgid="8059022597639516348">"Carregando..."</string>
-    <string name="lockpassword_choose_your_password_header" msgid="8624900666929394990">"Escolha a sua senha"</string>
-    <string name="lockpassword_choose_your_password_header_for_fingerprint" msgid="6624409510609085450">"Para usar a impressão digital, defina uma senha"</string>
-    <string name="lockpassword_choose_your_pattern_header" msgid="6949761069941694050">"Escolha seu padrão"</string>
-    <string name="lockpassword_choose_your_pattern_header_for_fingerprint" msgid="5901096361617543819">"Para usar a impressão digital, defina um padrão"</string>
-    <string name="lockpassword_choose_your_pin_header" msgid="7598849519816138302">"Escolha o seu PIN"</string>
-    <string name="lockpassword_choose_your_pin_header_for_fingerprint" msgid="765344692615917183">"Para usar a impressão digital, defina um PIN"</string>
-    <string name="lockpassword_confirm_your_password_header" msgid="6308478184889846633">"Confirme sua senha"</string>
+    <string name="lockpassword_choose_your_screen_lock_header" msgid="3872462096767152394">"Definir um bloqueio de tela"</string>
+    <string name="lockpassword_choose_your_password_message" msgid="1197569283524841412">"Por segurança, defina uma senha"</string>
+    <string name="lockpassword_choose_your_password_header_for_fingerprint" msgid="2541818487015343503">"Para usar sua digital, defina uma senha"</string>
+    <string name="lockpassword_choose_your_pattern_header_for_fingerprint" msgid="7709785406243556723">"Para usar sua digital, defina um padrão"</string>
+    <string name="lockpassword_choose_your_pin_message" msgid="1875420718677275646">"Por segurança, defina um PIN"</string>
+    <string name="lockpassword_choose_your_pin_header_for_fingerprint" msgid="1549639053195796674">"Para usar a impressão digital, defina um PIN"</string>
+    <string name="lockpassword_choose_your_pattern_message" msgid="5986983400689720015">"Por segurança, defina um padrão"</string>
+    <string name="lockpassword_confirm_your_password_header" msgid="1266027268220850931">"Digite sua senha novamente"</string>
     <string name="lockpassword_confirm_your_pattern_header" msgid="7543433733032330821">"Confirme seu padrão"</string>
-    <string name="lockpassword_confirm_your_pin_header" msgid="49038294648213197">"Confirme o seu PIN"</string>
+    <string name="lockpassword_confirm_your_pin_header" msgid="7744513791910572550">"Digite seu PIN novamente"</string>
     <string name="lockpassword_confirm_passwords_dont_match" msgid="5140892109439191415">"As senhas não correspondem"</string>
     <string name="lockpassword_confirm_pins_dont_match" msgid="7226244811505606217">"Os PINs não correspondem"</string>
-    <string name="lockpassword_choose_lock_generic_header" msgid="3811438094903786145">"Seleção de desbloqueio"</string>
+    <string name="lockpassword_choose_lock_generic_header" msgid="3811438094903786145">"Selecionar desbloqueio"</string>
     <string name="lockpassword_password_set_toast" msgid="4875050283108629383">"A senha foi definida"</string>
     <string name="lockpassword_pin_set_toast" msgid="6011826444725291475">"O PIN foi definido"</string>
     <string name="lockpassword_pattern_set_toast" msgid="6867259621331406236">"O padrão foi definido"</string>
@@ -1476,18 +1489,18 @@
     <string name="lockpassword_confirm_your_pattern_generic_profile" msgid="4435638308193361861">"Use seu padrão de trabalho para continuar"</string>
     <string name="lockpassword_confirm_your_pin_generic_profile" msgid="3730141667547002246">"Digite seu PIN de trabalho para continuar"</string>
     <string name="lockpassword_confirm_your_password_generic_profile" msgid="4250642723467019894">"Digite sua senha de trabalho para continuar"</string>
-    <!-- no translation found for lockpassword_strong_auth_required_device_pattern (530802132223800623) -->
-    <skip />
-    <!-- no translation found for lockpassword_strong_auth_required_device_pin (7829294830078036417) -->
-    <skip />
-    <!-- no translation found for lockpassword_strong_auth_required_device_password (3552644641574796973) -->
-    <skip />
-    <!-- no translation found for lockpassword_strong_auth_required_work_pattern (3003781907040522053) -->
-    <skip />
-    <!-- no translation found for lockpassword_strong_auth_required_work_pin (3367491332598821552) -->
-    <skip />
-    <!-- no translation found for lockpassword_strong_auth_required_work_password (8159775129968582940) -->
-    <skip />
+    <string name="lockpassword_strong_auth_required_device_pattern" msgid="530802132223800623">"Para aumentar a segurança, use o padrão do dispositivo"</string>
+    <string name="lockpassword_strong_auth_required_device_pin" msgid="7829294830078036417">"Para aumentar a segurança, digite o PIN do dispositivo"</string>
+    <string name="lockpassword_strong_auth_required_device_password" msgid="3552644641574796973">"Para aumentar a segurança, digite a senha do dispositivo."</string>
+    <string name="lockpassword_strong_auth_required_work_pattern" msgid="3003781907040522053">"Para aumentar a segurança, use o padrão de trabalho"</string>
+    <string name="lockpassword_strong_auth_required_work_pin" msgid="3367491332598821552">"Para aumentar a segurança, digite o PIN de trabalho"</string>
+    <string name="lockpassword_strong_auth_required_work_password" msgid="8159775129968582940">"Para aumentar a segurança, digite a senha de trabalho"</string>
+    <string name="lockpassword_confirm_your_pattern_details_frp" msgid="6757336656791723193">"Seu smartphone foi redefinido para a configuração original. Para usá-lo, digite seu padrão anterior."</string>
+    <string name="lockpassword_confirm_your_pin_details_frp" msgid="826520613445990470">"Seu smartphone foi redefinido para a configuração original. Para usá-lo, digite seu PIN anterior."</string>
+    <string name="lockpassword_confirm_your_password_details_frp" msgid="8944081074615739040">"Seu smartphone foi redefinido para a configuração original. Para usá-lo, digite sua senha anterior."</string>
+    <string name="lockpassword_confirm_your_pattern_header_frp" msgid="2898036091609128286">"Verificar padrão"</string>
+    <string name="lockpassword_confirm_your_pin_header_frp" msgid="4141601774778898803">"Verificar PIN"</string>
+    <string name="lockpassword_confirm_your_password_header_frp" msgid="3762615419295360480">"Verificar senha"</string>
     <string name="lockpassword_invalid_pin" msgid="15588049067548470">"PIN incorreto"</string>
     <string name="lockpassword_invalid_password" msgid="4038507398784975200">"Senha incorreta"</string>
     <string name="lockpattern_need_to_unlock_wrong" msgid="1745247595356012176">"Padrão incorreto"</string>
@@ -1511,7 +1524,7 @@
     <string name="lockpattern_settings_enable_visible_pattern_title" msgid="2615606088906120711">"Tornar o padrão visível"</string>
     <string name="lockpattern_settings_enable_visible_pattern_title_profile" msgid="4864525074768391381">"Tornar o padrão de perfil visível"</string>
     <string name="lockpattern_settings_enable_tactile_feedback_title" msgid="4389015658335522989">"Vibrar ao tocar"</string>
-    <string name="lockpattern_settings_enable_power_button_instantly_locks" msgid="5735444062633666327">"Botão liga/desliga bloqueia"</string>
+    <string name="lockpattern_settings_enable_power_button_instantly_locks" msgid="5735444062633666327">"Bloquear com botão liga/desliga"</string>
     <string name="lockpattern_settings_power_button_instantly_locks_summary" msgid="8196258755143711694">"Exceto quando mantido desbloqueado por <xliff:g id="TRUST_AGENT_NAME">%1$s</xliff:g>"</string>
     <string name="lockpattern_settings_choose_lock_pattern" msgid="1652352830005653447">"Padrão de desbloqueio"</string>
     <string name="lockpattern_settings_change_lock_pattern" msgid="1123908306116495545">"Alterar padrão"</string>
@@ -1537,7 +1550,6 @@
     <string name="install_applications_title" msgid="4987712352256508946">"Permitir todas as origens"</string>
     <string name="recent_app_category_title" msgid="6673071268966003928">"Apps abertos recentemente"</string>
     <string name="see_all_apps_title" msgid="1317153498074308438">"Ver todos os <xliff:g id="COUNT">%1$d</xliff:g> apps"</string>
-    <string name="recent_app_summary" msgid="3366446669844932300">"Há <xliff:g id="TIME">^1</xliff:g>"</string>
     <string name="install_all_warning" product="tablet" msgid="8310489909586138165">"Seu tablet e seus dados pessoais estão mais vulneráveis a ataques de apps desconhecidos. Ao instalar apps dessa fonte, você concorda que é responsável por qualquer dano causado ao seu tablet ou pela perda de dados que possa resultar do uso desses apps."</string>
     <string name="install_all_warning" product="default" msgid="1952257127370115988">"Seu smartphone e seus dados pessoais estão mais vulneráveis a ataques de apps desconhecidos. Ao instalar apps dessa fonte, você concorda que é responsável por qualquer dano causado ao seu smartphone ou pela perda de dados que possa resultar do uso desses apps."</string>
     <string name="advanced_settings" msgid="1777249286757067969">"Configurações avançadas"</string>
@@ -1586,7 +1598,7 @@
     <string name="default_emergency_app" msgid="1951760659640369980">"App de emergência"</string>
     <string name="reset_app_preferences" msgid="1321050641018356925">"Redefinir apps"</string>
     <string name="reset_app_preferences_title" msgid="6093179367325336662">"Redefinir apps?"</string>
-    <string name="reset_app_preferences_desc" msgid="4822447731869201512">"Isso redefinirá todas as preferências para:\n \n "<li>"apps desabilitados;"</li>" \n "<li>"notificações de apps desabilitados;"</li>" \n "<li>"apps padrão para ações;"</li>" \n "<li>"restrições de dados em segundo plano para apps;"</li>" \n "<li>"qualquer restrição de permissão."</li>" \n\n Você não perderá os dados dos apps."</string>
+    <string name="reset_app_preferences_desc" msgid="4822447731869201512">"Isso redefinirá todas as preferências para:\n \n "<li>"apps desabilitados"</li>" \n "<li>"notificações de apps desabilitados"</li>" \n "<li>"apps padrão para ações"</li>" \n "<li>"restrições de dados em segundo plano para apps"</li>" \n "<li>"qualquer restrição de permissão"</li>" \n\n Você não perderá os dados dos apps."</string>
     <string name="reset_app_preferences_button" msgid="2559089511841281242">"Redefinir apps"</string>
     <string name="manage_space_text" msgid="8852711522447794676">"Gerenciar espaço"</string>
     <string name="filter" msgid="2018011724373033887">"Filtro"</string>
@@ -1739,7 +1751,7 @@
     <string name="keyboard_shortcuts_helper" msgid="4839453720463798145">"Assistente de atalhos do teclado"</string>
     <string name="keyboard_shortcuts_helper_summary" msgid="5871299901459743288">"Mostrar atalhos disponíveis"</string>
     <string name="default_keyboard_layout" msgid="4172606673510531271">"Padrão"</string>
-    <string name="pointer_speed" msgid="1221342330217861616">"Velocidade do ponteiro"</string>
+    <string name="pointer_speed" msgid="1221342330217861616">"Velocidade do cursor"</string>
     <string name="game_controller_settings_category" msgid="8794508575329923718">"Controlador de jogos"</string>
     <string name="vibrate_input_devices" msgid="2599591466928793082">"Usar vibração"</string>
     <string name="vibrate_input_devices_summary" msgid="4595570516865299153">"Redirecionar vibração para o controlador de jogos quando estiver conectado."</string>
@@ -1801,7 +1813,7 @@
     <string name="accessibility_settings_summary" msgid="981260486011624939">"Controles de interação, leitores de tela, exibição"</string>
     <string name="vision_settings_title" msgid="4204111425716868288">"Configuração visual"</string>
     <string name="vision_settings_description" msgid="5679491180156408260">"É possível personalizar este dispositivo para atender às suas necessidades. Esses recursos de acessibilidade podem ser alterados posteriormente em \"Configurar\"."</string>
-    <string name="vision_settings_suggestion_title" msgid="917294957154878441">"Aumentar tamanho da fonte"</string>
+    <string name="vision_settings_suggestion_title" msgid="8058794060304707004">"Alterar tamanho da fonte"</string>
     <string name="screen_reader_category_title" msgid="7739154903913400641">"Leitores de tela"</string>
     <string name="audio_and_captions_category_title" msgid="3420727114421447524">"Áudio e texto na tela"</string>
     <string name="display_category_title" msgid="685461049938269166">"Tela"</string>
@@ -1838,7 +1850,6 @@
     <string name="accessibility_display_inversion_preference_subtitle" msgid="7052959202195368109">"Pode afetar o desempenho"</string>
     <string name="accessibility_autoclick_preference_title" msgid="7014499339068449623">"Clicar após parada do ponteiro"</string>
     <string name="accessibility_autoclick_delay_preference_title" msgid="3962261178385106006">"Atraso antes do clique"</string>
-    <string name="preference_summary_default_combination" msgid="8532964268242666060">"<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">"ATIVAR"</string>
     <string name="accessibility_summary_state_disabled" msgid="2241315620132005595">"DESATIVAR"</string>
     <string name="enable_quick_setting" msgid="2366999897816894536">"Mostrar em \"Configurações rápidas\""</string>
@@ -1957,12 +1968,14 @@
     <string name="background_activity_summary_on" msgid="649282072540085599">"O app pode ser executado em segundo plano quando não está em uso"</string>
     <string name="background_activity_summary_off" msgid="7666330699090632040">"A atividade em segundo plano do app é limitada quando ele não está em uso"</string>
     <string name="background_activity_summary_disabled" msgid="3710669050484599847">"Execução do app em segundo plano não permitida"</string>
+    <string name="background_activity_summary_whitelisted" msgid="7375400051141016808">"Não é possível otimizar o consumo de bateria do app"</string>
+    <string name="background_activity_warning_dialog_title" msgid="2216249969149568871">"Limitar atividade em segundo plano?"</string>
+    <string name="background_activity_warning_dialog_text" msgid="7049624449246121981">"Se você limitar as atividades em segundo plano de um app, ele poderá apresentar mau funcionamento"</string>
     <string name="device_screen_usage" msgid="3386088035570409683">"Uso da tela desde a carga completa"</string>
     <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_device" msgid="7036566616386864302">"Uso do dispositivo desde a última carga completa (<xliff:g id="TIME">^1</xliff:g> atrás)"</string>
+    <string name="power_usage_list_summary" msgid="6393929085382334341">"Uso de apps desde a última carga completa (<xliff:g id="RELATIVE_TIME">^1</xliff:g>)"</string>
+    <string name="power_usage_list_summary_device" msgid="4461926045610455423">"Uso do dispositivo desde a última carga completa (<xliff:g id="RELATIVE_TIME">^1</xliff:g>)"</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>
     <string name="battery_since_unplugged" msgid="338073389740738437">"Uso da bateria desde a desconexão do aparelho"</string>
@@ -2208,14 +2221,14 @@
     <string name="credentials_unlock_hint" msgid="2301301378040499348">"Digite a senha para o armazenamento de credenciais."</string>
     <string name="credentials_old_password" msgid="7553393815538684028">"Senha atual:"</string>
     <string name="credentials_reset_hint" msgid="6297256880896133631">"Remover todo o conteúdo?"</string>
-    <string name="credentials_password_too_short" msgid="7502749986405522663">"A senha deve ter no mínimo 8 caracteres."</string>
     <string name="credentials_wrong_password" msgid="2541932597104054807">"Senha incorreta."</string>
     <string name="credentials_reset_warning" msgid="5320653011511797600">"Senha incorreta. Você tem uma ou mais tentativas antes do armazenamento de credencial ser apagado."</string>
     <string name="credentials_reset_warning_plural" msgid="6514085665301095279">"Senha incorreta. Você tem mais <xliff:g id="NUMBER">%1$d</xliff:g> tentativas antes do armazenamento de credencial ser apagado."</string>
     <string name="credentials_erased" msgid="2907836028586342969">"Armazenamento de credenciais apagado."</string>
     <string name="credentials_not_erased" msgid="7685932772284216097">"Armaz. de creden. não apagado."</string>
     <string name="credentials_enabled" msgid="7588607413349978930">"Armazenamento de credenciais ativado."</string>
-    <string name="credentials_configure_lock_screen_hint" msgid="6757119179588664966">"É necessário configurar PIN ou senha para a tela de bloqueio antes de usar o armazenamento de credenciais."</string>
+    <string name="credentials_configure_lock_screen_hint" msgid="8058230497337529036">"Para que você possa usar o armazenamento de credenciais, seu dispositivo precisa ter uma tela de bloqueio"</string>
+    <string name="credentials_configure_lock_screen_button" msgid="253239765216055321">"DEFINIR BLOQUEIO"</string>
     <string name="usage_access_title" msgid="332333405495457839">"Apps com acesso ao uso"</string>
     <string name="emergency_tone_title" msgid="1055954530111587114">"Tom de emergência"</string>
     <string name="emergency_tone_summary" msgid="722259232924572153">"Definir comportamento durante uma chamada de emergência"</string>
@@ -2266,7 +2279,7 @@
     <string name="wifi_setup_not_connected" msgid="6997432604664057052">"Não conectado"</string>
     <string name="wifi_setup_add_network" msgid="5939624680150051807">"Adicionar rede"</string>
     <string name="wifi_setup_refresh_list" msgid="3411615711486911064">"Atualizar lista"</string>
-    <string name="wifi_setup_skip" msgid="6661541841684895522">"Ignorar"</string>
+    <string name="wifi_setup_skip" msgid="6661541841684895522">"Pular"</string>
     <string name="wifi_setup_next" msgid="3388694784447820477">"Avançar"</string>
     <string name="wifi_setup_back" msgid="144777383739164044">"Voltar"</string>
     <string name="wifi_setup_detail" msgid="2336990478140503605">"Detalhes da rede"</string>
@@ -2335,8 +2348,6 @@
     <skip />
     <string name="cant_sync_dialog_title" msgid="2777238588398046285">"Não é possível sincronizar manualmente"</string>
     <string name="cant_sync_dialog_message" msgid="1938380442159016449">"A sincronização para o item está desativada no momento. Para alterar essa configuração, ative os dados de segundo plano e a sincronização automática temporariamente."</string>
-    <string name="wimax_settings" msgid="2655139497028469039">"4G"</string>
-    <string name="status_wimax_mac_address" msgid="8390791848661413416">"Endereço MAC 4G"</string>
     <string name="enter_password" msgid="8035706727471334122">"Para iniciar o Android, digite sua senha"</string>
     <string name="enter_pin" msgid="5305333588093263790">"Para iniciar o Android, digite seu PIN"</string>
     <string name="enter_pattern" msgid="4187435713036808566">"Para iniciar o Android, desenhe seu padrão"</string>
@@ -2350,6 +2361,7 @@
     <string name="misc_files_selected_count" msgid="4647048020823912088">"selecionados <xliff:g id="NUMBER">%1$d</xliff:g> de <xliff:g id="TOTAL">%2$d</xliff:g>"</string>
     <string name="misc_files_selected_count_bytes" msgid="2876232009069114352">"<xliff:g id="NUMBER">%1$s</xliff:g> de <xliff:g id="TOTAL">%2$s</xliff:g>"</string>
     <string name="select_all" msgid="1562774643280376715">"Selecionar tudo"</string>
+    <string name="data_plan_usage_manage_plans_button_text" msgid="8997761990902708162">"Gerenciar planos"</string>
     <string name="data_usage_summary_title" msgid="3804110657238092929">"Uso de dados"</string>
     <string name="data_usage_app_summary_title" msgid="4147258989837459172">"Dados uso de apps"</string>
     <string name="data_usage_accounting" msgid="7170028915873577387">"O cálculo da operadora poderá ser diferente de seu dispositivo."</string>
@@ -2379,7 +2391,7 @@
     <string name="data_usage_pick_cycle_day" msgid="4470796861757050966">"Dia do mês para redefinir o ciclo de uso dos dados:"</string>
     <string name="data_usage_empty" msgid="8621855507876539282">"Nenhum app usou dados durante o período."</string>
     <string name="data_usage_label_foreground" msgid="4938034231928628164">"Primeiro plano"</string>
-    <string name="data_usage_label_background" msgid="3225844085975764519">"Plano de fundo"</string>
+    <string name="data_usage_label_background" msgid="3225844085975764519">"Segundo plano"</string>
     <string name="data_usage_app_restricted" msgid="3568465218866589705">"restrito"</string>
     <string name="data_usage_disable_mobile" msgid="8656552431969276305">"Desativar os dados móveis?"</string>
     <string name="data_usage_disable_mobile_limit" msgid="4644364396844393848">"Definir limite de dados móveis"</string>
@@ -2410,7 +2422,7 @@
     <string name="data_usage_auto_sync_on_dialog" product="default" msgid="8651376294887142858">"As alterações feitas em suas contas na Web serão automaticamente copiadas para o smartphone.\n\nAlgumas contas também poderão copiar automaticamente as alterações feitas no smartphone para a Web. É assim que funciona uma Conta do Google."</string>
     <string name="data_usage_auto_sync_off_dialog_title" msgid="9013139130490125793">"Desativar sincroniz. automática?"</string>
     <string name="data_usage_auto_sync_off_dialog" msgid="4025938250775413864">"Isto preservará o uso de dados e da bateria, mas será necessário sincronizar manualmente cada conta para obter as informações mais recentes, e você não será informado de novas atualizações."</string>
-    <string name="data_usage_cycle_editor_title" msgid="1373797281540188533">"Data de redefinição do ciclo de uso"</string>
+    <string name="data_usage_cycle_editor_title" msgid="1373797281540188533">"Escolha o dia de início do ciclo"</string>
     <string name="data_usage_cycle_editor_subtitle" msgid="5512903797979928416">"Data de cada mês:"</string>
     <string name="data_usage_cycle_editor_positive" msgid="8821760330497941117">"Definir"</string>
     <string name="data_usage_warning_editor_title" msgid="3704136912240060339">"Definir aviso de uso de dados"</string>
@@ -2435,6 +2447,9 @@
     <string name="data_usage_metered_mobile" msgid="5423305619126978393">"Redes móveis"</string>
     <string name="data_usage_metered_wifi" msgid="1761738002328299714">"Redes Wi-Fi limitadas"</string>
     <string name="data_usage_metered_wifi_disabled" msgid="727808462375941567">"Para selecionar redes limitadas, ative o Wi-Fi."</string>
+    <string name="data_usage_metered_auto" msgid="1262028400911918865">"Automático"</string>
+    <string name="data_usage_metered_yes" msgid="9217539611385225894">"Limitada"</string>
+    <string name="data_usage_metered_no" msgid="4025232961929071789">"Ilimitada"</string>
     <string name="data_usage_disclaimer" msgid="6887858149980673444">"O cálculo da operadora poderá ser diferente de seu dispositivo."</string>
     <string name="cryptkeeper_emergency_call" msgid="198578731586097145">"Chamada de emergência"</string>
     <string name="cryptkeeper_return_to_call" msgid="5613717339452772491">"Retornar à chamada"</string>
@@ -2526,9 +2541,6 @@
     <string name="backup_pw_set_button_text" msgid="2387480910044648795">"Definir a senha de backup"</string>
     <string name="backup_pw_cancel_button_text" msgid="8845630125391744615">"Cancelar"</string>
     <string name="additional_system_update_settings_list_item_title" msgid="214987609894661992">"Mais atualizações do sistema"</string>
-    <string name="selinux_status_disabled" msgid="924551035552323327">"Desativado"</string>
-    <string name="selinux_status_permissive" msgid="6004965534713398778">"Permissivo"</string>
-    <string name="selinux_status_enforcing" msgid="2252703756208463329">"Impondo"</string>
     <string name="ssl_ca_cert_warning" msgid="2045866713601984673">"A rede pode ser monitorada"</string>
     <string name="done_button" msgid="1991471253042622230">"Concluído"</string>
     <plurals name="ssl_ca_cert_dialog_title" formatted="false" msgid="7145092748045794650">
@@ -2571,7 +2583,7 @@
     <string name="user_add_user_message_long" msgid="8562152293752222985">"É possível compartilhar esse dispositivo com outras pessoas criando usuários adicionais. Cada usuário tem seu próprio espaço, que pode ser personalizado com apps, planos de fundo etc. Os usuários também podem ajustar as configurações do dispositivo, como Wi‑Fi, que afetam a todos.\n\nQuando você adiciona um novo usuário, essa pessoa precisa configurar o próprio espaço.\n\nQualquer usuário pode atualizar apps para os demais usuários."</string>
     <string name="user_add_user_message_short" msgid="1511354412249044381">"Quando você adiciona um novo usuário, essa pessoa precisa configurar o próprio espaço.\n\nQualquer usuário pode atualizar apps para os demais usuários."</string>
     <string name="user_setup_dialog_title" msgid="1765794166801864563">"Configurar o usuário agora?"</string>
-    <string name="user_setup_dialog_message" msgid="1004068621380867148">"Certifique-se de que a pessoa está disponível para assumir o dispositivo e configurar seu espaço"</string>
+    <string name="user_setup_dialog_message" msgid="1004068621380867148">"Certifique-se de que a pessoa está disponível para acessar o dispositivo e configurar seu espaço"</string>
     <string name="user_setup_profile_dialog_message" msgid="3896568553327558731">"Configurar perfil agora?"</string>
     <string name="user_setup_button_setup_now" msgid="3391388430158437629">"Configurar agora"</string>
     <string name="user_setup_button_setup_later" msgid="3068729597269172401">"Agora não"</string>
@@ -2615,7 +2627,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">"Tocar e pagar"</string>
+    <string name="nfc_payment_settings_title" msgid="1807298287380821613">"Toque e pague"</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>
@@ -2624,13 +2636,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 \"Tocar e pagar\", pagar com:"</string>
+    <string name="nfc_payment_pay_with" msgid="7524904024378144072">"Em um terminal \"Toque e pague\", 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 \"Tocar e pagar\"?"</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_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>
@@ -2643,7 +2655,7 @@
     <string name="extreme_threats_title" msgid="6549541803542968699">"Ameaças extremas"</string>
     <string name="extreme_threats_summary" msgid="8777860706500920667">"Receba alertas para ameaças extremas: materiais ou à vida"</string>
     <string name="severe_threats_title" msgid="8362676353803170963">"Ameaças graves"</string>
-    <string name="severe_threats_summary" msgid="8848126509420177320">"Receber alertas para ameaças graves: materiais ou à vida"</string>
+    <string name="severe_threats_summary" msgid="8848126509420177320">"Receber alertas para ameaças graves, materiais ou à vida"</string>
     <string name="amber_alerts_title" msgid="2772220337031146529">"Alertas AMBER"</string>
     <string name="amber_alerts_summary" msgid="4312984614037904489">"Receber boletins sobre crianças sequestradas"</string>
     <string name="repeat_title" msgid="6473587828597786996">"Repetir"</string>
@@ -2785,8 +2797,7 @@
     <string name="keywords_gesture" msgid="3526905012224714078">"gestos"</string>
     <string name="keywords_payment_settings" msgid="5220104934130446416">"pagar, tocar, pagamentos"</string>
     <string name="keywords_backup" msgid="470070289135403022">"backup, back up"</string>
-    <!-- no translation found for keywords_assist_gesture_launch (813968759791342591) -->
-    <skip />
+    <string name="keywords_assist_gesture_launch" msgid="813968759791342591">"gesto"</string>
     <string name="setup_wifi_nfc_tag" msgid="9028353016222911016">"Configurar etiqueta NFC Wi-Fi"</string>
     <string name="write_tag" msgid="8571858602896222537">"Gravar"</string>
     <string name="status_awaiting_tap" msgid="2130145523773160617">"Toque em uma marca para gravar…"</string>
@@ -2830,7 +2841,7 @@
       <item quantity="other"><xliff:g id="ON_COUNT">%d</xliff:g> regras automáticas ativadas</item>
     </plurals>
     <string name="zen_mode_settings_title" msgid="842308776768942600">"Preferências de \"Não perturbe\""</string>
-    <string name="zen_mode_priority_settings_title" msgid="2623117023031824309">"Permite Somente prioridade"</string>
+    <string name="zen_mode_priority_settings_title" msgid="2623117023031824309">"Configurar \"Somente prioridade\""</string>
     <string name="zen_mode_automation_settings_title" msgid="4228995740594063774">"Regras automáticas"</string>
     <string name="zen_mode_automation_suggestion_title" msgid="5105443455143476201">"Definir regras de Não perturbe"</string>
     <string name="zen_mode_automation_suggestion_summary" msgid="4732808039946935657">"Limitar som e vibrar eventualmente"</string>
@@ -2872,19 +2883,21 @@
     <string name="notifications_title" msgid="8086372779371204971">"Notificações"</string>
     <string name="app_notifications_title" msgid="5810577805218003760">"Notificações de apps"</string>
     <string name="notification_channel_title" msgid="2260666541030178452">"Categoria da notificação"</string>
+    <string name="notification_group_title" msgid="7180506440133859601">"Grupo de categoria de notificações"</string>
     <string name="notification_importance_title" msgid="848692592679312666">"Importância"</string>
-    <string name="notification_importance_unspecified" msgid="2196023702875112081">"Deixar o app decidir"</string>
+    <string name="notification_importance_unspecified" msgid="6622173510486113958">"Permitir som"</string>
     <string name="notification_importance_blocked" msgid="7938180808339386300">"Nunca mostrar notificações"</string>
     <string name="notification_importance_min" msgid="5455049524984686275">"Sem som ou interrupção visual"</string>
     <string name="notification_importance_low" msgid="8881468429453766553">"Sem som"</string>
     <string name="notification_importance_default" msgid="5958338024601957516">"Emitir som"</string>
     <string name="notification_importance_high" msgid="2082429479238228527">"Emitir som e exibir na tela"</string>
+    <string name="notification_importance_high_silent" msgid="2667033773703765252">"Exibir na tela"</string>
     <string name="notification_importance_min_title" msgid="6974673091137544803">"Baixa"</string>
     <string name="notification_importance_low_title" msgid="8131254047772814309">"Média"</string>
     <string name="notification_importance_default_title" msgid="9120383978536089489">"Alta"</string>
     <string name="notification_importance_high_title" msgid="3058778300264746473">"Urgente"</string>
     <string name="allow_interruption" msgid="7136150018111848721">"Permitir interrupções"</string>
-    <string name="allow_interruption_summary" msgid="7870159391333957050">"Permite que o app emita um som, vibre e/ou mostre notificações na tela"</string>
+    <string name="allow_interruption_summary" msgid="7870159391333957050">"Permitir que o app emita um som, vibre e/ou mostre notificações na tela"</string>
     <string name="notification_channel_summary_min" msgid="5401718014765921892">"Importância baixa"</string>
     <string name="notification_channel_summary_low" msgid="322317684244981244">"Importância média"</string>
     <string name="notification_channel_summary_default" msgid="1111749130423589931">"Importância elevada"</string>
@@ -2915,15 +2928,19 @@
     <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">"Permitir picture-in-picture"</string>
-    <!-- no translation found for picture_in_picture_app_detail_summary (1264019085827708920) -->
-    <skip />
+    <string name="picture_in_picture_app_detail_summary" msgid="1264019085827708920">"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="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>
     <string name="app_notifications_off_desc" msgid="4882445501376722969">"O Android está impedindo que as notificações desse app sejam exibidas neste dispositivo"</string>
     <string name="channel_notifications_off_desc" msgid="5899225298718840635">"O Android está impedindo que essa categoria de notificações seja exibida neste dispositivo"</string>
+    <string name="channel_group_notifications_off_desc" msgid="1620950416247316370">"O Android está impedindo que esse grupo de notificações seja exibido neste dispositivo"</string>
     <string name="notification_channels" msgid="5346841743182627500">"Categorias"</string>
     <string name="notification_channels_other" msgid="5645317113885788226">"Outros"</string>
+    <plurals name="notification_group_summary" formatted="false" msgid="3420621520561455358">
+      <item quantity="one"><xliff:g id="COUNT_1">%d</xliff:g> categoria</item>
+      <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> categorias</item>
+    </plurals>
     <string name="no_channels" msgid="3077375508177744586">"Este app não postou nenhuma notificação"</string>
     <string name="app_settings_link" msgid="8894946007543660906">"Configurações adicionais no app"</string>
     <string name="app_notification_listing_summary_zero" msgid="6482582965081108108">"Ativadas para todos os apps"</string>
@@ -2944,7 +2961,7 @@
     <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 essas notificações continuem a interromper quando \"Não perturbe\" estiver definido para \"Somente prioridade\""</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_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>
@@ -2974,9 +2991,9 @@
     <string name="zen_mode_event_rule_calendar" msgid="8787906563769067418">"Durante os eventos de"</string>
     <string name="zen_mode_event_rule_summary_calendar_template" msgid="5135844750232403975">"Durante eventos para <xliff:g id="CALENDAR">%1$s</xliff:g>"</string>
     <string name="zen_mode_event_rule_summary_any_calendar" msgid="4936646399126636358">"qualquer agenda"</string>
-    <string name="zen_mode_event_rule_summary_reply_template" msgid="6590671260829837157">"Onde a resposta seja <xliff:g id="REPLY">%1$s</xliff:g>"</string>
+    <string name="zen_mode_event_rule_summary_reply_template" msgid="6590671260829837157">"Quando a resposta for <xliff:g id="REPLY">%1$s</xliff:g>"</string>
     <string name="zen_mode_event_rule_calendar_any" msgid="6485568415998569885">"Qualquer agenda"</string>
-    <string name="zen_mode_event_rule_reply" msgid="5166322024212403739">"Onde a resposta seja"</string>
+    <string name="zen_mode_event_rule_reply" msgid="5166322024212403739">"Quando a resposta for"</string>
     <string name="zen_mode_event_rule_reply_any_except_no" msgid="8868873496008825961">"\"Sim\", \"Talvez\" ou \"Sem resposta\""</string>
     <string name="zen_mode_event_rule_reply_yes_or_maybe" msgid="2769656565454495824">"\"Sim\" ou \"Talvez\""</string>
     <string name="zen_mode_event_rule_reply_yes" msgid="1003598835878784659">"Sim"</string>
@@ -3000,6 +3017,7 @@
     <string name="zen_mode_from_starred" msgid="2678345811950997027">"Apenas de contatos marcados com estrela"</string>
     <string name="zen_mode_from_none" msgid="8219706639954614136">"Nenhuma"</string>
     <string name="zen_mode_alarms" msgid="2165302777886552926">"Alarmes"</string>
+    <string name="zen_mode_alarms_summary" msgid="3774926045611788635">"Alarmes são sempre prioridade e emitem som"</string>
     <string name="zen_mode_reminders" msgid="5458502056440485730">"Lembretes"</string>
     <string name="zen_mode_events" msgid="7914446030988618264">"Eventos"</string>
     <string name="zen_mode_all_callers" msgid="584186167367236922">"Todos os autores de chamadas"</string>
@@ -3034,6 +3052,7 @@
     <string name="zen_mode_screen_off_visual_interruptions" msgid="4850792880144382633">"Quando a tela está desativada"</string>
     <string name="zen_mode_no_visual_interruptions" msgid="8742776003822778472">"Quando a tela estiver ativada ou desativada"</string>
     <string name="notification_app_settings_button" msgid="6685640230371477485">"Configurações de notificação"</string>
+    <string name="suggestion_button_text" msgid="3275010948381252006">"Ok"</string>
     <string name="device_feedback" msgid="3238056036766293294">"Enviar feedback sobre o dispositivo"</string>
     <string name="restr_pin_enter_admin_pin" msgid="1085834515677448072">"Inserir PIN do administrador"</string>
     <string name="switch_on_text" msgid="1124106706920572386">"Ativado"</string>
@@ -3139,24 +3158,24 @@
     <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">"Assist. e entrada por voz"</string>
+    <string name="assist_and_voice_input_title" msgid="1733165754793221197">"Assistente 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 navegador"</string>
+    <string name="default_browser_title" msgid="8101772675085814670">"App de navegação"</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>
     <string name="system_app" msgid="9068313769550747372">"(Sistema)"</string>
     <string name="system_default_app" msgid="3091113402349739037">"(Padrão do sistema)"</string>
     <string name="apps_storage" msgid="4353308027210435513">"Armazenamento de apps"</string>
-    <string name="usage_access" msgid="5479504953931038165">"Acesso de uso"</string>
-    <string name="permit_usage_access" msgid="4012876269445832300">"Permitir acesso de uso"</string>
+    <string name="usage_access" msgid="5479504953931038165">"Acesso ao uso"</string>
+    <string name="permit_usage_access" msgid="4012876269445832300">"Permitir acesso ao uso"</string>
     <string name="app_usage_preference" msgid="7065701732733134991">"Preferências de uso de apps"</string>
-    <string name="usage_access_description" msgid="1352111094596416795">"O acesso de uso permite que um app rastreie que outros apps você está usando e com que frequência, bem como sua operadora, as configurações de idioma e outros detalhes."</string>
+    <string name="usage_access_description" msgid="1352111094596416795">"O acesso ao uso permite que um app rastreie que outros apps você está usando e com que frequência, bem como sua operadora, as configurações de idioma e outros detalhes."</string>
     <string name="memory_settings_title" msgid="7490541005204254222">"Memória"</string>
     <string name="memory_details_title" msgid="8542565326053693320">"Detalhes da memória"</string>
     <string name="always_running" msgid="6042448320077429656">"Sempre em execução (<xliff:g id="PERCENTAGE">%s</xliff:g>)"</string>
@@ -3170,7 +3189,7 @@
     <string name="process_format" msgid="77905604092541454">"<xliff:g id="APP_NAME">%1$s</xliff:g> (<xliff:g id="COUNT">%2$d</xliff:g>)"</string>
     <string name="high_power_apps" msgid="3459065925679828230">"Otimização de bateria"</string>
     <string name="additional_battery_info" msgid="4754099329165411970">"Alertas de uso"</string>
-    <string name="show_all_apps" msgid="1512506948197818534">"Mostrar uso total no dispositivo"</string>
+    <string name="show_all_apps" msgid="1512506948197818534">"Mostrar uso total do dispositivo"</string>
     <string name="hide_extra_apps" msgid="5016497281322459633">"Mostrar uso de apps"</string>
     <string name="power_high_usage_title" msgid="6027369425057347826">"Uso elevado"</string>
     <plurals name="power_high_usage_summary" formatted="false" msgid="467347882627862744">
@@ -3204,7 +3223,7 @@
     <string name="usb_use_charging_only" msgid="2180443097365214467">"Carregar este dispositivo"</string>
     <string name="usb_use_charging_only_desc" msgid="3066256793008540627">"Somente carregar este dispositivo"</string>
     <string name="usb_use_power_only" msgid="6426550616883919530">"Fornecer energia"</string>
-    <string name="usb_use_power_only_desc" msgid="3461232831015575152">"Carregue o dispositivo conectado. Isso funciona apenas com dispositivos compatíveis com o carregamento por USB."</string>
+    <string name="usb_use_power_only_desc" msgid="3461232831015575152">"Carregue o dispositivo conectado. Funciona apenas com dispositivos compatíveis com carregamento por USB."</string>
     <string name="usb_use_file_transfers" msgid="7409600791007250137">"Transferir arquivos"</string>
     <string name="usb_use_file_transfers_desc" msgid="4235764784331804488">"Transfere arquivos para outro dispositivo"</string>
     <string name="usb_use_photo_transfers" msgid="7794775645350330454">"Transferir fotos (PTP)"</string>
@@ -3218,6 +3237,7 @@
     <string name="usb_summary_file_transfers" msgid="6435943692610175111">"Transferência de arquivos"</string>
     <string name="usb_summary_photo_transfers" msgid="8440204169576585250">"Transferência de fotos (PTP)"</string>
     <string name="usb_summary_MIDI" msgid="5687906612187885908">"Uso do dispositivo como MIDI"</string>
+    <string name="sms_mirroring_pref" msgid="6475043279147376031">"Espelhamento de SMS"</string>
     <string name="background_check_pref" msgid="7550258400138010979">"Verificação em segundo plano"</string>
     <string name="background_check_title" msgid="4534254315824525593">"Acesso completo ao segundo plano"</string>
     <string name="assist_access_context_title" msgid="2269032346698890257">"Usar texto da tela"</string>
@@ -3284,7 +3304,7 @@
     <string name="write_settings_title" msgid="4232152481902542284">"Pode modificar configurações do sistema"</string>
     <string name="write_system_settings" msgid="3482913590601096763">"Mudar configurações do sistema"</string>
     <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="permit_write_settings" msgid="658555006453212691">"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>
@@ -3379,9 +3399,12 @@
     <string name="color_temperature" msgid="2070126836910615605">"Temperatura de cor fria"</string>
     <string name="color_temperature_desc" msgid="4793729830226404052">"Usar cores de tela mais frias"</string>
     <string name="color_temperature_toast" msgid="4974218172133854827">"Para aplicar a alteração de cor, desative a tela"</string>
-    <string name="telephony_monitor_toast" msgid="7003764250271195384">"Para que a alteração do monitor de telefonia seja aplicada, reinicialize o dispositivo"</string>
+    <string name="connectivity_monitor_switch" msgid="9059759348648583421">"Monitor de conectividade"</string>
+    <string name="connectivity_monitor_switch_summary" msgid="2828658652378866401">"O monitor de conectividade coletará registros quando detectar um problema de conectividade e enviará uma notificação ao usuário para informar um bug"</string>
+    <string name="connectivity_monitor_toast" msgid="5551859612881173028">"Para que a alteração do monitor de conectividade seja aplicada, reinicialize o dispositivo"</string>
     <string name="camera_hal_hdrplus_switch" msgid="8377365197105267466">"HDR+ da câmera HAL"</string>
     <string name="camera_hal_hdrplus_toast" msgid="2063703797270055299">"Para aplicar a alteração ao HDR+ da câmera HAL, reinicialize o dispositivo"</string>
+    <string name="camera_laser_sensor_switch" msgid="8913588990743234440">"Sensor a laser da câmera"</string>
     <string name="ota_disable_automatic_update" msgid="2319639631655915050">"Atualizações automáticas do sistema"</string>
     <string name="usage" msgid="2977875522080448986">"Utilização"</string>
     <string name="cellular_data_usage" msgid="2155683719898158203">"Uso de dados móveis"</string>
@@ -3407,7 +3430,7 @@
     <string name="data_warning" msgid="209133958008062117">"Aviso de dados"</string>
     <string name="set_data_limit" msgid="2901526323210516923">"Definir limite de dados"</string>
     <string name="data_limit" msgid="1885406964934590552">"Limite de dados"</string>
-    <string name="data_usage_template" msgid="392191945602400904">"<xliff:g id="ID_1">%1$s</xliff:g> usado(s) entre <xliff:g id="ID_2">%2$s</xliff:g>"</string>
+    <string name="data_usage_template" msgid="2923744765873163859">"<xliff:g id="ID_1">%1$s</xliff:g> usado(s) entre <xliff:g id="ID_2">%2$s</xliff:g>"</string>
     <string name="configure" msgid="1029654422228677273">"Configurar"</string>
     <string name="data_usage_other_apps" msgid="3272872663517382050">"Outros apps inclusos no uso"</string>
     <plurals name="data_saver_unrestricted_summary" formatted="false" msgid="2635267833484232703">
@@ -3427,7 +3450,7 @@
     <string name="lockpattern_settings_require_pattern_before_startup_summary" msgid="7873036097628404476">"Exigir padrão para iniciar seu dispositivo. Enquanto desativado, este dispositivo não recebe chamadas, mensagens, notificações ou alarmes."</string>
     <string name="lockpattern_settings_require_pin_before_startup_summary" msgid="6022831284097476933">"Exigir PIN para iniciar seu dispositivo. Enquanto desativado, este dispositivo não recebe chamadas, mensagens, notificações ou alarmes."</string>
     <string name="lockpattern_settings_require_password_before_startup_summary" msgid="6818285221244966231">"Exigir senha para iniciar seu dispositivo. Enquanto desativado, este dispositivo não recebe chamadas, mensagens, notificações ou alarmes."</string>
-    <string name="suggestion_additional_fingerprints" msgid="2214281455363797037">"Adicionar outra impr. digital"</string>
+    <string name="suggestion_additional_fingerprints" msgid="2214281455363797037">"Adicionar outra impressão digital"</string>
     <string name="suggestion_additional_fingerprints_summary" msgid="5471253233176471245">"Desbloqueie com um dedo diferente"</string>
     <string name="battery_saver_on_summary" msgid="9072203872401530722">"Ativado / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="battery_saver_off_summary" msgid="8309471955051162327">"Desativada / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
@@ -3467,7 +3490,7 @@
     <string name="notification_log_details_none" msgid="184131801230614059">"nenhum"</string>
     <string name="notification_log_details_ranking_null" msgid="244660392058720919">"O objeto de classificação está ausente."</string>
     <string name="notification_log_details_ranking_none" msgid="599607025882587844">"O objeto de classificação não contém essa chave."</string>
-    <string name="special_access" msgid="3458780842491881155">"Acesso especial ao app"</string>
+    <string name="special_access" msgid="3458780842491881155">"Acesso especial a apps"</string>
     <plurals name="special_access_summary" formatted="false" msgid="260765309935675867">
       <item quantity="one"><xliff:g id="COUNT">%d</xliff:g> app pode usar dados irrestritos</item>
       <item quantity="other"><xliff:g id="COUNT">%d</xliff:g> apps podem usar dados irrestritos</item>
@@ -3476,7 +3499,7 @@
     <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="387052719462473500">"Controlar informações na 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="8483187649355540109">"Suporte e dicas"</string>
@@ -3484,7 +3507,7 @@
     <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>
     <string name="premium_sms_access" msgid="4660047004791638305">"Acesso a SMS premium"</string>
-    <string name="bluetooth_disabled" msgid="2456198532288640046">"Não visível para outros dispositivos"</string>
+    <string name="bluetooth_disabled" msgid="6244000672828617410">"Desativado"</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 vários dispositivos"</string>
     <string name="demo_mode" msgid="2798762752209330277">"Modo de demonstração da IU do sistema"</string>
@@ -3564,16 +3587,16 @@
     <string name="ambient_display_summary" msgid="525662960806416373">"Para verificar a hora, ícones de notificação e outras informações, toque duas vezes na tela."</string>
     <string name="ambient_display_suggestion_summary" msgid="5987443721392571847">"Verificar as notificações quando a tela estiver desligada"</string>
     <string name="ambient_display_pickup_title" product="default" msgid="818688002837687268">"Levantar o smartphone para verificá-lo"</string>
-    <string name="ambient_display_pickup_title" product="tablet" msgid="4455864282995698097">"Levante o tablet para verificá-lo"</string>
-    <string name="ambient_display_pickup_title" product="device" msgid="5380534405773531175">"Levante o dispositivo para verificá-lo"</string>
+    <string name="ambient_display_pickup_title" product="tablet" msgid="4455864282995698097">"Levantar o tablet para verificá-lo"</string>
+    <string name="ambient_display_pickup_title" product="device" msgid="5380534405773531175">"Levantar o dispositivo para verificá-lo"</string>
     <string name="ambient_display_pickup_summary" product="default" msgid="4567020486787561873">"Para verificar a hora, ícones de notificação e outras informações, pegue o smartphone."</string>
     <string name="ambient_display_pickup_summary" product="tablet" msgid="5435283849947236648">"Para verificar a hora, ícones de notificação e outras informações, pegue o tablet."</string>
     <string name="ambient_display_pickup_summary" product="device" msgid="8256669101643381568">"Para verificar a hora, ícones de notificação e outras informações, pegue o dispositivo."</string>
     <string name="ambient_display_pickup_suggestion_summary" msgid="7014700589991761035">"Verificar as notificações quando a tela estiver desligada"</string>
-    <string name="fingerprint_swipe_for_notifications_title" msgid="5816346492253270243">"Deslizar impressão digital para ver as notificações"</string>
-    <string name="fingerprint_swipe_for_notifications_summary" product="default" msgid="1770661868393713922">"Para verificar suas notificações, deslize para baixo no sensor de impressão digital na parte traseira do smartphone."</string>
-    <string name="fingerprint_swipe_for_notifications_summary" product="tablet" msgid="902719947767712895">"Para verificar suas notificações, deslize para baixo no sensor de impressão digital na parte traseira do tablet."</string>
-    <string name="fingerprint_swipe_for_notifications_summary" product="device" msgid="5372926094116306647">"Para verificar suas notificações, deslize para baixo no sensor de impressão digital na parte traseira do dispositivo."</string>
+    <string name="fingerprint_swipe_for_notifications_title" msgid="5816346492253270243">"Usar impressão digital para ver as notificações"</string>
+    <string name="fingerprint_swipe_for_notifications_summary" product="default" msgid="1770661868393713922">"Para ver suas notificações, deslize o dedo indicador para baixo no sensor de impressão digital localizado na parte traseira do smartphone."</string>
+    <string name="fingerprint_swipe_for_notifications_summary" product="tablet" msgid="902719947767712895">"Para ver suas notificações, deslize o dedo indicador para baixo no sensor de impressão digital localizado na parte traseira do tablet."</string>
+    <string name="fingerprint_swipe_for_notifications_summary" product="device" msgid="5372926094116306647">"Para ver suas notificações, deslize o dedo indicador para baixo no sensor de impressão digital localizado na parte traseira do dispositivo."</string>
     <string name="fingerprint_swipe_for_notifications_suggestion_title" msgid="1677291167470357802">"Ver notificações rapidamente"</string>
     <string name="fingerprint_swipe_for_notifications_suggestion_summary" msgid="127592803294414082">"Deslize para baixo no sensor de impressão digital"</string>
     <string name="gesture_setting_on" msgid="3455094265233870280">"Ativado"</string>
@@ -3586,7 +3609,7 @@
     <string name="web_action_enable_title" msgid="4051513950976670853">"Apps instantâneos"</string>
     <string name="web_action_enable_summary" msgid="3108127559723396382">"Abrir links em apps, mesmo que eles não estejam instalados"</string>
     <string name="web_action_section_title" msgid="7364647086538399136">"Apps instantâneos"</string>
-    <string name="instant_apps_account" msgid="1433620209791992528">"Conta de apps instantâneos"</string>
+    <string name="instant_apps_settings" msgid="8827777916518348213">"Preferências de Instant Apps"</string>
     <string name="domain_url_section_title" msgid="7046835219056428883">"Apps instalados"</string>
     <string name="automatic_storage_manager_activation_warning" msgid="6353100011690933254">"Seu armazenamento está sendo controlado pelo gerenciador de armazenamento"</string>
     <string name="account_for_section_header" msgid="5356566418548737121">"Contas de <xliff:g id="USER_NAME">%1$s</xliff:g>"</string>
@@ -3633,7 +3656,9 @@
     <string name="enterprise_privacy_always_on_vpn_personal" msgid="9217774730260037434">"\"VPN sempre ativa\" ativada no seu perfil pessoal"</string>
     <string name="enterprise_privacy_always_on_vpn_work" msgid="7244472958208315814">"\"VPN sempre ativa\" ativada no seu perfil de trabalho"</string>
     <string name="enterprise_privacy_global_http_proxy" msgid="7936664553416257333">"Proxy HTTP geral definido"</string>
-    <string name="enterprise_privacy_ca_certs" msgid="5885892204903688909">"Credenciais confiáveis"</string>
+    <string name="enterprise_privacy_ca_certs_device" msgid="2019652712782510262">"Credenciais confiáveis"</string>
+    <string name="enterprise_privacy_ca_certs_personal" msgid="2279084820904076599">"Credenciais confiáveis no seu perfil pessoal"</string>
+    <string name="enterprise_privacy_ca_certs_work" msgid="6187377647815301809">"Credenciais confiáveis no seu perfil de trabalho"</string>
     <plurals name="enterprise_privacy_number_ca_certs" formatted="false" msgid="526375234629534165">
       <item quantity="one">No mínimo <xliff:g id="COUNT_1">%d</xliff:g> certificado de CA</item>
       <item quantity="other">No mínimo <xliff:g id="COUNT_1">%d</xliff:g> certificados de CA</item>
@@ -3692,10 +3717,12 @@
     <string name="storage_manager_indicator_on" msgid="8625551710194584733">"Ativado"</string>
     <string name="install_type_instant" msgid="3174425974536078647">"App instantâneo"</string>
     <string name="automatic_storage_manager_deactivation_warning" msgid="5605210730828410482">"Desativar o gerenciador de armazenamento?"</string>
-    <string name="storage_movies_tv" msgid="5498394447562086890">"Apps de filme e televisão"</string>
+    <string name="storage_movies_tv" msgid="5498394447562086890">"Apps de filmes e TV"</string>
     <string name="carrier_provisioning" msgid="4398683675591893169">"Informações de aprovisionamento da operadora"</string>
     <string name="trigger_carrier_provisioning" msgid="3434865918009286187">"Acionar aprovisionamento da operadora"</string>
     <string name="new_device_suggestion_title" msgid="698847081680980774">"O que há de novo e empolgante?"</string>
-    <string name="new_device_suggestion_summary" msgid="7172709269203435870">"Confira os cinco melhores recursos"</string>
+    <string name="new_device_suggestion_summary" product="default" msgid="206396571522515855">"Faça um tour pelo seu novo smartphone"</string>
+    <string name="new_device_suggestion_summary" product="tablet" msgid="393751455688210956">"Faça um tour pelo seu novo tablet"</string>
+    <string name="new_device_suggestion_summary" product="device" msgid="2939870049868336652">"Faça um tour pelo seu novo dispositivo"</string>
     <string name="disabled_low_ram_device" msgid="3751578499721173344">"Este recurso não está disponível neste dispositivo"</string>
 </resources>
diff --git a/res/values-ro/arrays.xml b/res/values-ro/arrays.xml
index 61604fd..d091d83 100644
--- a/res/values-ro/arrays.xml
+++ b/res/values-ro/arrays.xml
@@ -100,8 +100,6 @@
     <!-- no translation found for wifi_security_no_eap:0 (2084555984818107151) -->
     <!-- no translation found for wifi_security_no_eap:1 (397579322683471524) -->
     <!-- no translation found for wifi_security_no_eap:2 (1968820975358150484) -->
-    <!-- no translation found for wifi_ap_security:0 (5251664683198623324) -->
-    <!-- no translation found for wifi_ap_security:1 (7989073072260294673) -->
   <string-array name="wifi_eap_method">
     <item msgid="1160193392455075561">"PEAP"</item>
     <item msgid="7981731051382306293">"TLS"</item>
diff --git a/res/values-ro/strings.xml b/res/values-ro/strings.xml
index 0052523..3659ad8 100644
--- a/res/values-ro/strings.xml
+++ b/res/values-ro/strings.xml
@@ -167,7 +167,7 @@
     <string name="bluetooth_map_acceptance_dialog_text" msgid="8712508202081143737">"%1$s dorește să acceseze mesajele dvs. Oferiți acces pentru %2$s?"</string>
     <string name="bluetooth_sap_request" msgid="2669762224045354417">"Solicitare de acces la SIM"</string>
     <string name="bluetooth_sap_acceptance_dialog_text" msgid="4414253873553608690">"<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g> dorește să acceseze cardul SIM. Dacă acordați accesul la cardul SIM, conexiunea de date de pe dispozitiv va fi dezactivată pe durata conectării. Acordați accesul pentru <xliff:g id="DEVICE_NAME_1">%2$s?</xliff:g>"</string>
-    <string name="bluetooth_device_name_summary" msgid="4757990010751789977">"Vizibil ca „<xliff:g id="DEVICE_NAME">^1</xliff:g>” pentru alte dispozitive"</string>
+    <string name="bluetooth_device_name_summary" msgid="522235742194965734">"Vizibil ca „<xliff:g id="DEVICE_NAME">^1</xliff:g>” pentru alte dispozitive"</string>
     <string name="bluetooth_paired_device_title" msgid="8638994696317952019">"Dispozitivele dvs."</string>
     <string name="bluetooth_pairing_page_title" msgid="7712127387361962608">"Asociați un nou dispozitiv"</string>
     <string name="date_and_time" msgid="9062980487860757694">"Data și ora"</string>
@@ -251,7 +251,7 @@
     <string name="skip_label" msgid="47510779345218297">"Omiteți"</string>
     <string name="next_label" msgid="4693520878012668114">"Înainte"</string>
     <string name="language_picker_title" msgid="3596315202551687690">"Limbi"</string>
-    <string name="pref_title_lang_selection" msgid="2014920136978776034">"Preferințele pentru limbă"</string>
+    <string name="pref_title_lang_selection" msgid="2014920136978776034">"Preferințe pentru limbă"</string>
     <string name="locale_remove_menu" msgid="7651301406723638854">"Eliminați"</string>
     <string name="add_a_language" msgid="2330538812283783022">"Adăugați o limbă"</string>
     <plurals name="dlg_remove_locales_title" formatted="false" msgid="4276642359346122396">
@@ -314,6 +314,8 @@
     <string name="zone_auto" msgid="334783869352026648">"Fus orar automat"</string>
     <string name="zone_auto_summaryOn" msgid="6142830927278458314">"Folosește fusul orar din rețea"</string>
     <string name="zone_auto_summaryOff" msgid="2597745783162041390">"Folosește fusul orar din rețea"</string>
+    <string name="date_time_24hour_auto" msgid="2117383168985653422">"Format automat de 24 de ore"</string>
+    <string name="date_time_24hour_auto_summary" msgid="6351812925651480277">"Utilizați setarea locală prestabilită"</string>
     <string name="date_time_24hour_title" msgid="3203537578602803850">"Format de 24 de ore"</string>
     <string name="date_time_24hour" msgid="1193032284921000063">"Utilizați formatul de 24 de ore"</string>
     <string name="date_time_set_time_title" msgid="6296795651349047016">"Oră"</string>
@@ -329,7 +331,7 @@
     <string name="lock_after_timeout" msgid="4590337686681194648">"Blocare automată"</string>
     <string name="lock_after_timeout_summary" msgid="6128431871360905631">"La <xliff:g id="TIMEOUT_STRING">%1$s</xliff:g> după inactivitate"</string>
     <string name="lock_immediately_summary_with_exception" msgid="9119632173886172690">"Imediat după intervalul de inactivitate, cu excepția cazului când este păstrat deblocat prin <xliff:g id="TRUST_AGENT_NAME">%1$s</xliff:g>"</string>
-    <string name="lock_after_timeout_summary_with_exception" msgid="5579064842797188409">"<xliff:g id="TIMEOUT_STRING">%1$s</xliff:g> după intrarea în inactivitate, dacă dispozitivul nu este menținut în activitate de <xliff:g id="TRUST_AGENT_NAME">%2$s</xliff:g>"</string>
+    <string name="lock_after_timeout_summary_with_exception" msgid="5579064842797188409">"La <xliff:g id="TIMEOUT_STRING">%1$s</xliff:g> după intrarea în inactivitate, dacă dispozitivul nu este menținut în activitate de <xliff:g id="TRUST_AGENT_NAME">%2$s</xliff:g>"</string>
     <string name="show_owner_info_on_lockscreen_label" msgid="5074906168357568434">"Afișați info. proprietar la blocarea ecranului"</string>
     <string name="owner_info_settings_title" msgid="5530285568897386122">"Mesaj pe ecranul de blocare"</string>
     <string name="security_enable_widgets_title" msgid="2754833397070967846">"Activați widgeturi"</string>
@@ -368,13 +370,16 @@
     <string name="security_settings_fingerprint_preference_summary_none" msgid="1507739327565151923"></string>
     <string name="security_settings_fingerprint_enroll_introduction_title" msgid="3201556857492526098">"Deblocați cu amprenta"</string>
     <string name="security_settings_fingerprint_enroll_introduction_title_unlock_disabled" msgid="7066417934622827305">"Folosiți amprenta"</string>
-    <string name="security_settings_fingerprint_enroll_introduction_message" msgid="3508870672887336095">"Puteți să deblocați telefonul, să autorizați achiziții sau să vă conectați la aplicații atingând senzorul pentru amprente. Aveți grijă ce amprente adăugați. Aceste acțiuni sunt posibile folosind chiar și o singură amprentă adăugată.\n\nNotă: este posibil ca amprenta să fie mai puțin sigură decât un model sau un cod PIN puternic."</string>
+    <string name="security_settings_fingerprint_enroll_introduction_message" msgid="3508870672887336095">"Puteți să deblocați telefonul, să autorizați achiziții sau să vă conectați la aplicații atingând senzorul pentru amprente. Aveți grijă ce amprente adăugați. Aceste acțiuni sunt posibile folosind chiar și o singură amprentă adăugată.\n\nNotă: este posibil ca amprenta să fie mai puțin sigură decât un model sau un cod PIN complex."</string>
     <string name="security_settings_fingerprint_enroll_introduction_message_unlock_disabled" msgid="1550756694054944874">"Folosiți amprenta ca să deblocați telefonul sau să aprobați achizițiile.\n\nNotă: nu vă puteți folosi amprenta ca să deblocați acest dispozitiv. Pentru informații suplimentare, contactați administratorul organizației."</string>
-    <string name="security_settings_fingerprint_enroll_introduction_message_setup" msgid="6817326798834882531">"Folosiți amprenta ca să deblocați telefonul sau să aprobați achizițiile.\n\nNotă: este posibil ca amprenta să fie mai puțin sigură decât un model sau un cod PIN puternic."</string>
+    <string name="security_settings_fingerprint_enroll_introduction_message_setup" msgid="6817326798834882531">"Folosiți amprenta ca să deblocați telefonul sau să aprobați achizițiile.\n\nNotă: este posibil ca amprenta să fie mai puțin sigură decât un model sau un cod PIN complex."</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel" msgid="3199351118385606526">"Anulați"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue" msgid="7472492858148162530">"Continuați"</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel_setup" msgid="5021369420474432665">"Omiteți"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue_setup" msgid="1961957425135180242">"Înainte"</string>
+    <string name="setup_fingerprint_enroll_skip_title" msgid="362050541117362034">"Omiteți amprenta?"</string>
+    <string name="setup_fingerprint_enroll_skip_after_adding_lock_text" msgid="958990414356204763">"Setarea amprentei durează doar un minut sau două. Dacă ignorați acest pas acum, puteți adăuga amprenta mai târziu din setări."</string>
+    <string name="lock_screen_intro_skip_title" msgid="4988210105913705679">"Omiteți blocarea ecranului?"</string>
     <string name="lock_screen_intro_skip_dialog_text_frp" product="tablet" msgid="1581834104051243425">"Funcțiile de protecție a dispozitivului nu vor fi activate. Nu îi veți putea împiedica pe alții să folosească această tabletă dacă este pierdută, furată sau resetată."</string>
     <string name="lock_screen_intro_skip_dialog_text_frp" product="device" msgid="4629503416877189572">"Funcțiile de protecție a dispozitivului nu vor fi activate. Nu îi veți putea împiedica pe alții să folosească acest dispozitiv dacă este pierdut, furat sau resetat."</string>
     <string name="lock_screen_intro_skip_dialog_text_frp" product="default" msgid="2423428240245737909">"Funcțiile de protecție a dispozitivului nu vor fi activate. Nu îi veți putea împiedica pe alții să folosească acest telefon dacă este pierdut, furat sau resetat."</string>
@@ -392,7 +397,7 @@
     <string name="security_settings_fingerprint_enroll_start_title" msgid="2068961812439460133">"Atingeți senzorul"</string>
     <string name="security_settings_fingerprint_enroll_start_message" msgid="3909929328942564524">"Puneți degetul pe senzor și ridicați-l după ce simțiți o vibrație"</string>
     <string name="security_settings_fingerprint_enroll_repeat_title" msgid="2819679722403209778">"Ridicați, apoi atingeți din nou"</string>
-    <string name="security_settings_fingerprint_enroll_repeat_message" msgid="6158989350522518586">"Ridicați încontinuu degetul pentru a adăuga toate părțile amprentei"</string>
+    <string name="security_settings_fingerprint_enroll_repeat_message" msgid="6158989350522518586">"Ridicați degetul și atingeți din nou pentru a adăuga toate părțile amprentei"</string>
     <string name="security_settings_fingerprint_enroll_finish_title" msgid="7567276170287972230">"Amprentă adăugată"</string>
     <string name="security_settings_fingerprint_enroll_finish_message" msgid="4796715961273420536">"Când vedeți această pictogramă, folosiți amprenta pentru identificare sau pentru a aproba achizițiile."</string>
     <string name="security_settings_fingerprint_enroll_enrolling_skip" msgid="3710211704052369752">"Mai târziu"</string>
@@ -460,7 +465,7 @@
     <string name="setup_lock_settings_picker_title" product="tablet" msgid="90329443364067215">"Protejați tableta"</string>
     <string name="setup_lock_settings_picker_title" product="device" msgid="2399952075134938929">"Protejați dispozitivul"</string>
     <string name="setup_lock_settings_picker_title" product="default" msgid="1572244299605153324">"Protejați telefonul"</string>
-    <string name="setup_lock_settings_picker_fingerprint_message" msgid="5585650064305600578">"Pentru mai multă siguranță, configurați o blocare a ecranului de rezervă."</string>
+    <string name="lock_settings_picker_fingerprint_added_security_message" msgid="5768002109707648463">"Pentru mai multă siguranță, configurați o blocare de rezervă a ecranului."</string>
     <string name="setup_lock_settings_picker_message" product="tablet" msgid="8919671129189936210">"Activați funcțiile de protecție a dispozitivului pentru a împiedica alte persoane să folosească această tabletă 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="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>
@@ -597,6 +602,7 @@
     <string name="lockpassword_pin_no_sequential_digits" msgid="680765285206990584">"Șirurile de cifre ascendente, descendente sau repetate nu sunt permise"</string>
     <string name="lockpassword_ok_label" msgid="313822574062553672">"OK"</string>
     <string name="lockpassword_cancel_label" msgid="8818529276331121899">"Anulați"</string>
+    <string name="lockpassword_clear_label" msgid="5724429464960458155">"Ștergeți"</string>
     <string name="lockpattern_tutorial_cancel_label" msgid="6431583477570493261">"Anulați"</string>
     <string name="lockpattern_tutorial_continue_label" msgid="3559793618653400434">"Înainte"</string>
     <string name="lock_setup" msgid="3355847066343753943">"Configurarea este completă."</string>
@@ -742,7 +748,7 @@
     <string name="use_open_wifi_automatically_summary_scoring_disabled" msgid="593964217679325831">"Pentru a folosi funcția, selectați un furnizor de evaluări ale rețelei"</string>
     <string name="use_open_wifi_automatically_summary_scorer_unsupported_disabled" msgid="8472122600853650258">"Pentru a folosi funcția, selectați un furnizor de evaluări ale rețelei compatibil"</string>
     <string name="wifi_install_credentials" msgid="3551143317298272860">"Instalați certificate"</string>
-    <string name="wifi_scan_notify_text" msgid="5593805423071186757">"Pentru a îmbunătăți precizia localizării, aplicațiile și serviciile de sistem pot totuși să caute rețelele Wi‑Fi. Puteți să schimbați acest aspect din <xliff:g id="LINK_BEGIN_0">LINK_BEGIN</xliff:g>setările de scanare<xliff:g id="LINK_END_1">LINK_END</xliff:g>."</string>
+    <string name="wifi_scan_notify_text" msgid="5593805423071186757">"Pentru a îmbunătăți precizia localizării, aplicațiile și serviciile de sistem pot totuși să caute rețele Wi‑Fi. Puteți să schimbați acest aspect din <xliff:g id="LINK_BEGIN_0">LINK_BEGIN</xliff:g>setările de scanare<xliff:g id="LINK_END_1">LINK_END</xliff:g>."</string>
     <string name="wifi_scan_notify_text_scanning_off" msgid="3426075479272242098">"Pentru a îmbunătăți precizia localizării, activați scanarea Wi-Fi în <xliff:g id="LINK_BEGIN_0">LINK_BEGIN</xliff:g>setările de scanare<xliff:g id="LINK_END_1">LINK_END</xliff:g>."</string>
     <string name="wifi_scan_notify_remember_choice" msgid="7104867814641144485">"Nu mai afișa"</string>
     <string name="wifi_setting_sleep_policy_title" msgid="5149574280392680092">"Mențineți Wi-Fi activat în modul inactiv"</string>
@@ -792,6 +798,7 @@
     <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>
@@ -828,6 +835,8 @@
     <string name="wifi_wps_available_first_item" msgid="4422547079984583502">"WPS disponibil"</string>
     <string name="wifi_wps_available_second_item" msgid="8427520131718215301">" (WPS disponibil)"</string>
     <string name="wifi_wps_nfc_enter_password" msgid="2288214226916117159">"Introduceți parola de rețea"</string>
+    <string name="wifi_carrier_connect" msgid="8174696557882299911">"Rețeaua Wi‑Fi a operatorului"</string>
+    <string name="wifi_carrier_content" msgid="4634077285415851933">"Conectați-vă prin <xliff:g id="NAME">%1%s</xliff:g>"</string>
     <string name="wifi_scan_always_turnon_message" msgid="203123538572122989">"Pentru a îmbunătăți precizia locației, precum și pentru alte scopuri, <xliff:g id="APP_NAME">%1$s</xliff:g> solicită permisiunea să activeze scanarea rețelelor, chiar și atunci când rețeaua Wi-Fi este dezactivată.\n\nPermiteți acest lucru pentru toate aplicațiile care solicită scanarea?"</string>
     <string name="wifi_scan_always_turnoff_message" msgid="5538901671131941043">"Pentru a dezactiva, accesați Avansat din meniul suplimentar."</string>
     <string name="wifi_scan_always_confirm_allow" msgid="5355973075896817232">"Permiteți"</string>
@@ -845,6 +854,7 @@
     <string name="wifi_connect" msgid="1076622875777072845">"Conectați-vă"</string>
     <string name="wifi_failed_connect_message" msgid="8491902558970292871">"Nu s-a putut stabili conexiunea la rețea"</string>
     <string name="wifi_forget" msgid="8168174695608386644">"Eliminați"</string>
+    <string name="wifi_modify" msgid="6100248070440710782">"Modificați"</string>
     <string name="wifi_failed_forget_message" msgid="1348172929201654986">"Nu s-a putut elimina rețeaua"</string>
     <string name="wifi_save" msgid="3331121567988522826">"Salvați"</string>
     <string name="wifi_failed_save_message" msgid="6650004874143815692">"Nu s-a putut salva rețeaua"</string>
@@ -858,6 +868,7 @@
     <string name="wifi_advanced_titlebar" msgid="4485841401774142908">"Setări Wi-Fi avansate"</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_title" msgid="3471132676909349382">"Informații despre rețea"</string>
     <string name="wifi_details_subnet_mask" msgid="6720279144174924410">"Mască de subrețea"</string>
     <string name="wifi_details_dns" msgid="8648826607751830768">"DNS"</string>
     <string name="wifi_details_ipv6_address_header" msgid="6734119149106422148">"Adrese IPv6"</string>
@@ -890,16 +901,15 @@
     <string name="wifi_p2p_cancel_connect_title" msgid="255267538099324413">"Anulați invitația?"</string>
     <string name="wifi_p2p_cancel_connect_message" msgid="7477756213423749402">"Doriți să anulați invitația de conectare cu <xliff:g id="PEER_NAME">%1$s</xliff:g>?"</string>
     <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_off_subtext" msgid="5466126533609394170">"Nu se permite altor dispozitive accesul la conexiunea de internet sau la conținut"</string>
     <string name="wifi_hotspot_tethering_on_subtext" product="tablet" msgid="5752490509369962007">"Se permite accesul la conexiunea de internet a tabletei prin hotspot"</string>
     <string name="wifi_hotspot_tethering_on_subtext" product="default" msgid="6461075246164300670">"Se permite accesul la conexiunea de internet a telefonului prin hotspot"</string>
     <string name="wifi_hotspot_on_local_only_subtext" msgid="2068110388011294735">"Aplicația trimite conținut. Pentru a permite accesul la conexiunea de internet, dezactivați hotspotul, apoi activați-l"</string>
-    <string name="wifi_hotspot_name_title" msgid="1341735529132128887">"Numele Wi-Fi"</string>
+    <string name="wifi_hotspot_name_title" msgid="8237000746618636778">"Numele pentru hotspot"</string>
     <string name="wifi_hotspot_name_summary_connecting" msgid="3378299995508671967">"Se activează <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>..."</string>
     <string name="wifi_hotspot_name_summary_connected" msgid="3888672084861445362">"Alte dispozitive se pot conecta la <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>"</string>
-    <string name="wifi_hotspot_password_title" msgid="1955592302902091281">"Parola rețelei Wi-Fi"</string>
+    <string name="wifi_hotspot_password_title" msgid="8676859981917573801">"Parola pentru hotspot"</string>
     <string name="wifi_hotspot_ap_band_title" msgid="1165801173359290681">"Banda AP"</string>
     <string name="wifi_hotspot_footer_info_regular" msgid="1203489406068036455">"Folosiți hotspotul pentru a crea o rețea Wi-Fi pentru celelalte dispozitive. Hotspotul oferă o conexiune de internet folosind conexiunea dvs. de date mobile. Este posibil să se aplice taxe suplimentare pentru datele mobile."</string>
     <string name="wifi_hotspot_footer_info_local_only" msgid="857988412470694109">"Aplicațiile pot crea un hotspot pentru a trimite conținut dispozitivelor din apropiere."</string>
@@ -910,7 +920,6 @@
     <string name="wifi_tether_configure_ap_text" msgid="7974681394041609308">"Configurați hotspotul Wi-Fi"</string>
     <string name="wifi_hotspot_configure_ap_text" msgid="5478614731464220432">"Configurare hotspot Wi-Fi"</string>
     <string name="wifi_hotspot_configure_ap_text_summary" msgid="5560680057727007011">"Hotspot AndroidAP WPA2 PSK"</string>
-    <string name="wifi_tether_configure_subtext" msgid="2050196439900426456">"Hotspot <xliff:g id="NETWORK_SSID">%1$s</xliff:g> <xliff:g id="NETWORK_SECURITY">%2$s</xliff:g>"</string>
     <string name="wifi_tether_configure_ssid_default" msgid="8467525402622138547">"AndroidHotspot"</string>
     <string name="wifi_calling_settings_title" msgid="4102921303993404577">"Apelare prin Wi-Fi"</string>
     <string name="wifi_calling_suggestion_title" msgid="9008010480466359578">"Activați Apelarea prin Wi-Fi"</string>
@@ -951,7 +960,7 @@
     <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="emergency_address_summary" msgid="3266760199681945746">"Adresa folosită de serviciile de urgență drept locația dvs. dacă efectuați un apel de urgență prin Wi-Fi"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"Afișaj"</string>
     <string name="sound_settings" msgid="5534671337768745343">"Sunet"</string>
     <string name="all_volume_title" msgid="4296957391257836961">"Volume"</string>
@@ -1005,6 +1014,7 @@
     <string name="search_settings" msgid="1910951467596035063">"Căutați"</string>
     <string name="search_settings_summary" msgid="9205656546570654169">"Gestionați setările și istoricul căutărilor"</string>
     <string name="search_settings_no_results" msgid="8799027492641230999">"Niciun rezultat"</string>
+    <string name="search_clear_history" msgid="4196658962573162457">"Ștergeți istoricul"</string>
     <string name="display_settings" msgid="7965901687241669598">"Afișaj"</string>
     <string name="accelerometer_title" msgid="7854608399547349157">"Rotire automată a ecranului"</string>
     <string name="color_mode_title" msgid="3159275920408338215">"Culori vii"</string>
@@ -1059,7 +1069,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 o imagine de fundal din"</string>
+    <string name="wallpaper_settings_fragment_title" msgid="519078346877860129">"Alegeți 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>
@@ -1077,7 +1087,7 @@
     <string name="ambient_display_screen_title" msgid="4252755516328775766">"Afișaj ambiental"</string>
     <string name="ambient_display_screen_summary_always_on" msgid="7337555569694794132">"Activat permanent/Utilizare ridicată a bateriei"</string>
     <string name="ambient_display_screen_summary_notifications" msgid="1449570742600868654">"Notificări noi"</string>
-    <string name="ambient_display_category_triggers" msgid="4359289754456268573">"Când să se afișeze"</string>
+    <string name="ambient_display_category_triggers" msgid="4359289754456268573">"Când se afișează"</string>
     <string name="doze_title" msgid="2375510714460456687">"Notificări noi"</string>
     <string name="doze_summary" msgid="3846219936142814032">"Activează ecranul când primiți notificări"</string>
     <string name="doze_always_on_title" msgid="1046222370442629646">"Activat permanent"</string>
@@ -1135,7 +1145,6 @@
     <string name="baseband_version" msgid="1848990160763524801">"Versiunea benzii de bază"</string>
     <string name="kernel_version" msgid="9192574954196167602">"Versiune nucleu"</string>
     <string name="build_number" msgid="3075795840572241758">"Numărul versiunii"</string>
-    <string name="selinux_status" msgid="6212165375172061672">"Stare SELinux"</string>
     <string name="device_info_not_available" msgid="8062521887156825182">"Indisponibil"</string>
     <string name="device_status_activity_title" msgid="1411201799384697904">"Stare"</string>
     <string name="device_status" msgid="607405385799807324">"Stare"</string>
@@ -1163,7 +1172,6 @@
     <string name="status_wifi_mac_address" msgid="2202206684020765378">"Adresă MAC Wi-Fi"</string>
     <string name="status_bt_address" msgid="4195174192087439720">"Adresă Bluetooth"</string>
     <string name="status_serial_number" msgid="2257111183374628137">"Număr de serie"</string>
-    <string name="status_unavailable" msgid="7862009036663793314">"Indisponibilă"</string>
     <string name="status_up_time" msgid="7294859476816760399">"Durată de funcționare"</string>
     <string name="status_awake_time" msgid="2393949909051183652">"Durată de activitate"</string>
     <string name="internal_memory" msgid="9129595691484260784">"Stocare internă"</string>
@@ -1339,6 +1347,7 @@
     <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>
     <string name="reset_dashboard_title" msgid="6254873816990678620">"Opțiuni de resetare"</string>
+    <string name="reset_dashboard_summary" msgid="4851012632493522755">"Rețeaua, aplicațiile sau dispozitivul pot fi resetate"</string>
     <string name="reset_network_title" msgid="6166025966016873843">"Resetați conexiunea Wi-Fi, conexiunea mobilă și prin Bluetooth"</string>
     <string name="reset_network_desc" msgid="5547979398298881406">"Astfel, toate setările pentru rețea vor fi reinițializate, inclusiv:\n\n"<li>"Wi‑Fi,"</li>\n<li>"date mobile,"</li>\n<li>"Bluetooth."</li></string>
     <string name="reset_network_button_text" msgid="2035676527471089853">"Resetați setările"</string>
@@ -1347,18 +1356,14 @@
     <string name="reset_network_confirm_title" msgid="1759888886976962773">"Resetați?"</string>
     <string name="network_reset_not_available" msgid="7188610385577164676">"Resetarea rețelei nu este disponibilă pentru acest utilizator"</string>
     <string name="reset_network_complete_toast" msgid="787829973559541880">"Setările pentru rețea au fost reinițializate"</string>
-    <string name="master_clear_title" msgid="6617679904229218425">"Ștergeți toate datele (Reveniți la setările din fabrică)"</string>
-    <plurals name="master_clear_with_account_summary" formatted="false" msgid="5911377203778818712">
-      <item quantity="few"><xliff:g id="ACCOUNT_COUNT">%1$d</xliff:g> conturi vor fi resetate</item>
-      <item quantity="other"><xliff:g id="ACCOUNT_COUNT">%1$d</xliff:g> de conturi vor fi resetate</item>
-      <item quantity="one">1 cont va fi resetat</item>
-    </plurals>
-    <string name="master_clear_summary" msgid="6902443944660426951">"Se vor reseta stocarea internă și toate datele"</string>
+    <string name="master_clear_title" msgid="3531267871084279512">"Ștergeți toate datele (reveniți la setările din fabrică)"</string>
     <string name="master_clear_desc" product="tablet" msgid="9146059417023157222">"Această acțiune va șterge toate datele din "<b>"stocarea internă"</b>" a tabletei dvs., inclusiv:\n\n"<li>"Contul dvs. Google;"</li>\n<li>"datele și setările sistemului și ale aplicațiilor;"</li>\n<li>"aplicațiile descărcate;"</li></string>
     <string name="master_clear_desc" product="default" msgid="4800386183314202571">"Această acțiune va șterge toate datele din "<b>"stocarea internă"</b>" a telefonului dvs., inclusiv:\n\n"<li>"Contul dvs. Google;"</li>\n<li>"datele și setările sistemului și ale aplicațiilor;"</li>\n<li>"aplicațiile descărcate;"</li></string>
     <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"În prezent sunteți conectat(ă) la următoarele conturi:\n"</string>
     <string name="master_clear_other_users_present" product="default" msgid="5161423070702470742">\n\n"Pe acest dispozitiv sunt prezenți și alți utilizatori.\n"</string>
-    <string name="master_clear_desc_also_erases_external" msgid="1903185203791274237"><li>"Muzică"</li>\n<li>"Fotografii"</li>\n<li>"Alte date ale utilizatorului"</li></string>
+    <string name="master_clear_desc_also_erases_external" msgid="1903185203791274237"><li>"Muzică;"</li>\n<li>"Fotografii;"</li>\n<li>"Alte date ale utilizatorului."</li></string>
+    <string name="master_clear_desc_also_erases_esim" msgid="312352697653096008"><li>"Operatori pe eSIM"</li></string>
+    <string name="master_clear_desc_no_cancel_mobile_plan" msgid="5460926449093211144">\n\n"Planul dvs. de servicii mobile nu va fi anulat astfel."</string>
     <string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="7744115866662613411">\n\n"Pentru a șterge muzică, imagini și alte date ale utilizatorului, "<b>"stocarea USB"</b>" trebuie să fie ștearsă."</string>
     <string name="master_clear_desc_erase_external_storage" product="default" msgid="4801026652617377093">\n\n"Pentru a șterge muzică, imagini și alte date ale utilizatorului, "<b>"cardul SD"</b>" trebuie să fie șters."</string>
     <string name="erase_external_storage" product="nosdcard" msgid="969364037450286809">"Ștergeți stocarea USB"</string>
@@ -1465,7 +1470,7 @@
     <string name="terms_title" msgid="7697580845616764642">"Termeni și condiții"</string>
     <string name="webview_license_title" msgid="2813507464175738967">"Licență de sistem pentru WebView"</string>
     <string name="wallpaper_attributions" msgid="3645880512943433928">"Imagini de fundal"</string>
-    <string name="wallpaper_attributions_values" msgid="2996183537914690469">"Furnizorii de imagini din satelit:\n©2014 CNES / Astrium, DigitalGlobe, Bluesky"</string>
+    <string name="wallpaper_attributions_values" msgid="2996183537914690469">"Furnizori de imagini din satelit:\n©2014 CNES / Astrium, DigitalGlobe, Bluesky"</string>
     <string name="settings_manual_activity_title" msgid="8133150693616006051">"Manual"</string>
     <string name="settings_manual_activity_unavailable" msgid="4752403782883814898">"A apărut o problemă la încărcarea manualului."</string>
     <string name="settings_license_activity_title" msgid="8525014571806471216">"Licențe terță parte"</string>
@@ -1475,15 +1480,16 @@
     <string name="settings_safetylegal_activity_title" msgid="6901214628496951727">"Informații privind siguranța"</string>
     <string name="settings_safetylegal_activity_unreachable" msgid="250674109915859456">"Nu aveți o conexiune de date. Pentru a vedea aceste informații acum, accesați %s de pe orice computer conectat la internet."</string>
     <string name="settings_safetylegal_activity_loading" msgid="8059022597639516348">"Se încarcă…"</string>
-    <string name="lockpassword_choose_your_password_header" msgid="8624900666929394990">"Alegeți parola"</string>
-    <string name="lockpassword_choose_your_password_header_for_fingerprint" msgid="6624409510609085450">"Pentru a utiliza amprenta, setați parola"</string>
-    <string name="lockpassword_choose_your_pattern_header" msgid="6949761069941694050">"Alegeți modelul"</string>
-    <string name="lockpassword_choose_your_pattern_header_for_fingerprint" msgid="5901096361617543819">"Pentru a utiliza amprenta, setați modelul"</string>
-    <string name="lockpassword_choose_your_pin_header" msgid="7598849519816138302">"Alegeți codul PIN"</string>
-    <string name="lockpassword_choose_your_pin_header_for_fingerprint" msgid="765344692615917183">"Pentru a utiliza amprenta, setați codul PIN"</string>
-    <string name="lockpassword_confirm_your_password_header" msgid="6308478184889846633">"Confirmați parola"</string>
+    <string name="lockpassword_choose_your_screen_lock_header" msgid="3872462096767152394">"Setați o blocare a ecranului"</string>
+    <string name="lockpassword_choose_your_password_message" msgid="1197569283524841412">"Din motive de securitate, setați o parolă"</string>
+    <string name="lockpassword_choose_your_password_header_for_fingerprint" msgid="2541818487015343503">"Pentru a utiliza amprenta, setați o parolă"</string>
+    <string name="lockpassword_choose_your_pattern_header_for_fingerprint" msgid="7709785406243556723">"Pentru a utiliza amprenta, setați un model"</string>
+    <string name="lockpassword_choose_your_pin_message" msgid="1875420718677275646">"Din motive de securitate, setați un cod PIN"</string>
+    <string name="lockpassword_choose_your_pin_header_for_fingerprint" msgid="1549639053195796674">"Pentru a utiliza amprenta, setați un cod PIN"</string>
+    <string name="lockpassword_choose_your_pattern_message" msgid="5986983400689720015">"Din motive de securitate, setați un model"</string>
+    <string name="lockpassword_confirm_your_password_header" msgid="1266027268220850931">"Reintroduceți parola"</string>
     <string name="lockpassword_confirm_your_pattern_header" msgid="7543433733032330821">"Confirmați modelul"</string>
-    <string name="lockpassword_confirm_your_pin_header" msgid="49038294648213197">"Confirmați codul PIN"</string>
+    <string name="lockpassword_confirm_your_pin_header" msgid="7744513791910572550">"Reintroduceți codul PIN"</string>
     <string name="lockpassword_confirm_passwords_dont_match" msgid="5140892109439191415">"Parolele nu corespund"</string>
     <string name="lockpassword_confirm_pins_dont_match" msgid="7226244811505606217">"Codurile PIN nu corespund"</string>
     <string name="lockpassword_choose_lock_generic_header" msgid="3811438094903786145">"Selectați metoda de deblocare"</string>
@@ -1502,6 +1508,12 @@
     <string name="lockpassword_strong_auth_required_work_pattern" msgid="3003781907040522053">"Pentru mai multă siguranță, folosiți modelul de serviciu"</string>
     <string name="lockpassword_strong_auth_required_work_pin" msgid="3367491332598821552">"Pentru mai multă siguranță, introduceți codul PIN de serviciu"</string>
     <string name="lockpassword_strong_auth_required_work_password" msgid="8159775129968582940">"Pentru mai multă siguranță, introduceți parola de serviciu"</string>
+    <string name="lockpassword_confirm_your_pattern_details_frp" msgid="6757336656791723193">"S-a revenit la setările din fabrică ale telefonului. Pentru a-l folosi, formați modelul precedent."</string>
+    <string name="lockpassword_confirm_your_pin_details_frp" msgid="826520613445990470">"S-a revenit la setările din fabrică ale telefonului. Pentru a-l folosi, scrieți codul PIN precedent."</string>
+    <string name="lockpassword_confirm_your_password_details_frp" msgid="8944081074615739040">"S-a revenit la setările din fabrică ale telefonului. Pentru a-l folosi, scrieți parola precedentă."</string>
+    <string name="lockpassword_confirm_your_pattern_header_frp" msgid="2898036091609128286">"Confirmați modelul"</string>
+    <string name="lockpassword_confirm_your_pin_header_frp" msgid="4141601774778898803">"Confirmați codul PIN"</string>
+    <string name="lockpassword_confirm_your_password_header_frp" msgid="3762615419295360480">"Confirmați parola"</string>
     <string name="lockpassword_invalid_pin" msgid="15588049067548470">"Cod PIN greșit"</string>
     <string name="lockpassword_invalid_password" msgid="4038507398784975200">"Parolă greșită"</string>
     <string name="lockpattern_need_to_unlock_wrong" msgid="1745247595356012176">"Model greșit"</string>
@@ -1551,7 +1563,6 @@
     <string name="install_applications_title" msgid="4987712352256508946">"Permite aplic. din orice surse"</string>
     <string name="recent_app_category_title" msgid="6673071268966003928">"Aplicații deschise recent"</string>
     <string name="see_all_apps_title" msgid="1317153498074308438">"Afișați toate cele <xliff:g id="COUNT">%1$d</xliff:g> aplicații"</string>
-    <string name="recent_app_summary" msgid="3366446669844932300">"Acum <xliff:g id="TIME">^1</xliff:g>"</string>
     <string name="install_all_warning" product="tablet" msgid="8310489909586138165">"Tableta și datele dvs. personale sunt mai vulnerabile la un atac din partea aplicațiilor necunoscute. Dacă instalați aplicații din această sursă, acceptați că sunteți singura persoană responsabilă pentru deteriorarea tabletei sau pentru pierderea datelor, care pot avea loc în urma utilizării acestor aplicații."</string>
     <string name="install_all_warning" product="default" msgid="1952257127370115988">"Telefonul și datele dvs. personale sunt mai vulnerabile la un atac din partea aplicațiilor necunoscute. Dacă instalați aplicații din această sursă, acceptați că sunteți singura persoană responsabilă pentru deteriorarea telefonului sau pentru pierderea datelor, care pot avea loc în urma utilizării acestor aplicații."</string>
     <string name="advanced_settings" msgid="1777249286757067969">"Setări avansate"</string>
@@ -1816,7 +1827,7 @@
     <string name="accessibility_settings_summary" msgid="981260486011624939">"Cititoare de ecran, afișaj, comenzi pentru interacțiune"</string>
     <string name="vision_settings_title" msgid="4204111425716868288">"Setări pentru vedere"</string>
     <string name="vision_settings_description" msgid="5679491180156408260">"Puteți personaliza acest dispozitiv conform dorințelor dvs. Aceste funcții de accesibilitate pot fi modificate ulterior în Setări."</string>
-    <string name="vision_settings_suggestion_title" msgid="917294957154878441">"Măriți dimensiunea fontului"</string>
+    <string name="vision_settings_suggestion_title" msgid="8058794060304707004">"Modificați dimensiunea fontului"</string>
     <string name="screen_reader_category_title" msgid="7739154903913400641">"Cititoare de ecran"</string>
     <string name="audio_and_captions_category_title" msgid="3420727114421447524">"Audio și text pe ecran"</string>
     <string name="display_category_title" msgid="685461049938269166">"Afișare"</string>
@@ -1853,7 +1864,6 @@
     <string name="accessibility_display_inversion_preference_subtitle" msgid="7052959202195368109">"Poate afecta performanța"</string>
     <string name="accessibility_autoclick_preference_title" msgid="7014499339068449623">"Clic după ce cursorul a încetat să se mai miște"</string>
     <string name="accessibility_autoclick_delay_preference_title" msgid="3962261178385106006">"Întârziere înainte de clic"</string>
-    <string name="preference_summary_default_combination" msgid="8532964268242666060">"<xliff:g id="STATE">%1$s</xliff:g>/<xliff:g id="DESCRIPTION">%2$s</xliff:g>"</string>
     <string name="accessibility_summary_state_enabled" msgid="8359913912320966304">"ACTIVAT"</string>
     <string name="accessibility_summary_state_disabled" msgid="2241315620132005595">"DEZACTIVAT"</string>
     <string name="enable_quick_setting" msgid="2366999897816894536">"Afișați în Setări rapide"</string>
@@ -1979,12 +1989,14 @@
     <string name="background_activity_summary_on" msgid="649282072540085599">"Aplicația poate rula în fundal când nu este folosită"</string>
     <string name="background_activity_summary_off" msgid="7666330699090632040">"Activitatea de fundal a aplicației este limitată când aceasta nu este folosită"</string>
     <string name="background_activity_summary_disabled" msgid="3710669050484599847">"Aplicației nu i se permite să ruleze în fundal"</string>
+    <string name="background_activity_summary_whitelisted" msgid="7375400051141016808">"Aplicația nu poate fi optimizată pentru utilizarea bateriei"</string>
+    <string name="background_activity_warning_dialog_title" msgid="2216249969149568871">"Limitați activitatea de fundal?"</string>
+    <string name="background_activity_warning_dialog_text" msgid="7049624449246121981">"Dacă limitați activitatea de fundal pentru o aplicație, aceasta se poate comporta necorespunzător"</string>
     <string name="device_screen_usage" msgid="3386088035570409683">"Utilizarea ecranului de la încărcare"</string>
     <string name="device_screen_consumption" msgid="4607589286438986687">"Consumul ecranului"</string>
     <string name="device_cellular_network" msgid="4724773411762382950">"Scanarea rețelei mobile"</string>
-    <string name="power_last_full_charge_summary" msgid="532845389094620657">"în urmă cu <xliff:g id="TIME">^1</xliff:g>"</string>
-    <string name="power_usage_list_summary" msgid="6775339745194635000">"Utilizarea de către aplicații de la ultima încărcare (în urmă cu <xliff:g id="TIME">^1</xliff:g>)"</string>
-    <string name="power_usage_list_summary_device" msgid="7036566616386864302">"Utilizarea dispozitivului de la ultima încărcare completă (acum <xliff:g id="TIME">^1</xliff:g>)"</string>
+    <string name="power_usage_list_summary" msgid="6393929085382334341">"Utilizarea de către aplicații de la ultima încărcare (<xliff:g id="RELATIVE_TIME">^1</xliff:g>)"</string>
+    <string name="power_usage_list_summary_device" msgid="4461926045610455423">"Utilizarea dispozitivului de la ultima încărcare completă (<xliff:g id="RELATIVE_TIME">^1</xliff:g>)"</string>
     <string name="screen_usage_summary" msgid="6687403051423153550">"Perioada de timp de la încărcarea completă cât a fost pornit ecranul"</string>
     <string name="device_usage_list_summary" msgid="5623036661468763251">"Utilizarea dispozitivului de la încărcarea completă"</string>
     <string name="battery_since_unplugged" msgid="338073389740738437">"Utilizarea bateriei de la deconectare"</string>
@@ -2230,14 +2242,14 @@
     <string name="credentials_unlock_hint" msgid="2301301378040499348">"Introduceți parola pentru spațiul de stocare a certificatelor."</string>
     <string name="credentials_old_password" msgid="7553393815538684028">"Parola actuală:"</string>
     <string name="credentials_reset_hint" msgid="6297256880896133631">"Eliminați întregul conținut?"</string>
-    <string name="credentials_password_too_short" msgid="7502749986405522663">"Parola trebuie să conțină minimum 8 caractere."</string>
     <string name="credentials_wrong_password" msgid="2541932597104054807">"Parolă incorectă."</string>
     <string name="credentials_reset_warning" msgid="5320653011511797600">"Parolă incorectă. Mai aveți dreptul la o singură încercare înainte ca acreditările stocate să fie șterse."</string>
     <string name="credentials_reset_warning_plural" msgid="6514085665301095279">"Parolă incorectă. Mai aveți dreptul la <xliff:g id="NUMBER">%1$d</xliff:g> încercări înainte ca acreditările stocate să fie șterse."</string>
     <string name="credentials_erased" msgid="2907836028586342969">"Acreditările stocate sunt șterse."</string>
     <string name="credentials_not_erased" msgid="7685932772284216097">"Nu s-au șters acredit. stocate"</string>
     <string name="credentials_enabled" msgid="7588607413349978930">"Stocarea acreditărilor este activată."</string>
-    <string name="credentials_configure_lock_screen_hint" msgid="6757119179588664966">"Trebuie să setați un cod PIN sau o parolă pentru blocarea ecranului înainte de a putea utiliza spațiul de stocare a certificatelor."</string>
+    <string name="credentials_configure_lock_screen_hint" msgid="8058230497337529036">"Înainte de a putea folosi spațiul de stocare a certificatelor, dispozitivul trebuie să aibă un ecran de blocare de siguranță"</string>
+    <string name="credentials_configure_lock_screen_button" msgid="253239765216055321">"CONFIGURAȚI BLOCAREA"</string>
     <string name="usage_access_title" msgid="332333405495457839">"Aplicații cu acces de utilizare"</string>
     <string name="emergency_tone_title" msgid="1055954530111587114">"Ton de urgență"</string>
     <string name="emergency_tone_summary" msgid="722259232924572153">"Setați comportamentul la efectuarea unui apel de urgență"</string>
@@ -2357,8 +2369,6 @@
     <skip />
     <string name="cant_sync_dialog_title" msgid="2777238588398046285">"Sincronizarea manuală nu este posibilă"</string>
     <string name="cant_sync_dialog_message" msgid="1938380442159016449">"În prezent, sincronizarea pentru acest element este dezactivată. Pentru a schimba această setare, activați temporar datele de fundal și sincronizarea automată."</string>
-    <string name="wimax_settings" msgid="2655139497028469039">"4G"</string>
-    <string name="status_wimax_mac_address" msgid="8390791848661413416">"Adresă MAC 4G"</string>
     <string name="enter_password" msgid="8035706727471334122">"Pentru a lansa sistemul de operare Android, introduceți parola"</string>
     <string name="enter_pin" msgid="5305333588093263790">"Pentru a lansa sistemul de operare Android, introduceți codul PIN"</string>
     <string name="enter_pattern" msgid="4187435713036808566">"Pentru a lansa sistemul de operare Android, desenați șablonul"</string>
@@ -2372,6 +2382,7 @@
     <string name="misc_files_selected_count" msgid="4647048020823912088">"au fost selectate <xliff:g id="NUMBER">%1$d</xliff:g> din <xliff:g id="TOTAL">%2$d</xliff:g>"</string>
     <string name="misc_files_selected_count_bytes" msgid="2876232009069114352">"<xliff:g id="NUMBER">%1$s</xliff:g> din <xliff:g id="TOTAL">%2$s</xliff:g>"</string>
     <string name="select_all" msgid="1562774643280376715">"Selectați-le pe toate"</string>
+    <string name="data_plan_usage_manage_plans_button_text" msgid="8997761990902708162">"Gestionați planurile"</string>
     <string name="data_usage_summary_title" msgid="3804110657238092929">"Utilizarea datelor"</string>
     <string name="data_usage_app_summary_title" msgid="4147258989837459172">"Utilizarea datelor aplic."</string>
     <string name="data_usage_accounting" msgid="7170028915873577387">"Datele pot fi contorizate diferit la operator și pe dispozitiv."</string>
@@ -2457,6 +2468,9 @@
     <string name="data_usage_metered_mobile" msgid="5423305619126978393">"Rețele mobile"</string>
     <string name="data_usage_metered_wifi" msgid="1761738002328299714">"Rețele Wi‑Fi contorizate"</string>
     <string name="data_usage_metered_wifi_disabled" msgid="727808462375941567">"Pentru a selecta rețelele Wi-Fi contorizate, porniți Wi-Fi."</string>
+    <string name="data_usage_metered_auto" msgid="1262028400911918865">"Automat"</string>
+    <string name="data_usage_metered_yes" msgid="9217539611385225894">"Contorizată"</string>
+    <string name="data_usage_metered_no" msgid="4025232961929071789">"Necontorizată"</string>
     <string name="data_usage_disclaimer" msgid="6887858149980673444">"Datele pot fi contorizate diferit la operator și pe dispozitiv."</string>
     <string name="cryptkeeper_emergency_call" msgid="198578731586097145">"Apel de urgență"</string>
     <string name="cryptkeeper_return_to_call" msgid="5613717339452772491">"Reveniți la apel"</string>
@@ -2548,9 +2562,6 @@
     <string name="backup_pw_set_button_text" msgid="2387480910044648795">"Setați parola pentru backup"</string>
     <string name="backup_pw_cancel_button_text" msgid="8845630125391744615">"Anulați"</string>
     <string name="additional_system_update_settings_list_item_title" msgid="214987609894661992">"Actualizări de sistem suplimentare"</string>
-    <string name="selinux_status_disabled" msgid="924551035552323327">"Dezactivat"</string>
-    <string name="selinux_status_permissive" msgid="6004965534713398778">"Facultativ"</string>
-    <string name="selinux_status_enforcing" msgid="2252703756208463329">"Obligatoriu"</string>
     <string name="ssl_ca_cert_warning" msgid="2045866713601984673">"Rețeaua poate fi monitorizată"</string>
     <string name="done_button" msgid="1991471253042622230">"Terminat"</string>
     <plurals name="ssl_ca_cert_dialog_title" formatted="false" msgid="7145092748045794650">
@@ -2753,6 +2764,7 @@
       <item quantity="other">Afișați %d de elemente ascunse</item>
       <item quantity="one">Afișați %d element ascuns</item>
     </plurals>
+    <string name="dashboard_suggestion_condition_footer_content_description" msgid="2898588191174845961">"Restrângeți"</string>
     <string name="network_dashboard_title" msgid="4771589228992391573">"Rețea și internet"</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>
@@ -2856,8 +2868,14 @@
       <item quantity="other"><xliff:g id="ON_COUNT">%d</xliff:g> de reguli automate activate</item>
       <item quantity="one">1 regulă automată activată</item>
     </plurals>
-    <string name="zen_mode_settings_title" msgid="842308776768942600">"Preferințe pentru Nu deranja"</string>
-    <string name="zen_mode_priority_settings_title" msgid="2623117023031824309">"„Numai cu prioritate” permite"</string>
+    <string name="zen_mode_settings_title" msgid="1066226840983908121">"Nu deranja"</string>
+    <string name="zen_mode_behavior_settings_title" msgid="1463303933529313969">"Comportament"</string>
+    <string name="zen_mode_behavior_allow_title" msgid="3845615648136218141">"Permiteți sunete și vibrații de la"</string>
+    <string name="zen_mode_behavior_no_sound" msgid="1219626004723208056">"Fără sunet"</string>
+    <string name="zen_mode_behavior_total_silence" msgid="6716603819806610626">"Fără sunet (Niciun sunet)"</string>
+    <string name="zen_mode_behavior_no_sound_except" msgid="4968477585788243114">"Fără sunet, cu excepția <xliff:g id="CATEGORIES">%1$s</xliff:g>"</string>
+    <!-- no translation found for zen_mode_behavior_alarms_only (2423480992071472963) -->
+    <skip />
     <string name="zen_mode_automation_settings_title" msgid="4228995740594063774">"Reguli automate"</string>
     <string name="zen_mode_automation_suggestion_title" msgid="5105443455143476201">"Setați regulile pentru Nu deranja"</string>
     <string name="zen_mode_automation_suggestion_summary" msgid="4732808039946935657">"Limitați sunetele și vibrațiile uneori"</string>
@@ -2899,13 +2917,15 @@
     <string name="notifications_title" msgid="8086372779371204971">"Notificări"</string>
     <string name="app_notifications_title" msgid="5810577805218003760">"Notificări din aplicații"</string>
     <string name="notification_channel_title" msgid="2260666541030178452">"Categoria notificării"</string>
+    <string name="notification_group_title" msgid="7180506440133859601">"Grupul categoriei de notificări"</string>
     <string name="notification_importance_title" msgid="848692592679312666">"Importanță"</string>
-    <string name="notification_importance_unspecified" msgid="2196023702875112081">"Permiteți aplicației să decidă"</string>
+    <string name="notification_importance_unspecified" msgid="6622173510486113958">"Permiteți sunetul"</string>
     <string name="notification_importance_blocked" msgid="7938180808339386300">"Nu afișați niciodată notificările"</string>
     <string name="notification_importance_min" msgid="5455049524984686275">"Fără sunet sau întrerupere vizuală"</string>
     <string name="notification_importance_low" msgid="8881468429453766553">"Fără sunet"</string>
     <string name="notification_importance_default" msgid="5958338024601957516">"Se emite un sunet"</string>
     <string name="notification_importance_high" msgid="2082429479238228527">"Se emite un sunet și se evidențiază pe ecran"</string>
+    <string name="notification_importance_high_silent" msgid="2667033773703765252">"Evidențiere pe ecran"</string>
     <string name="notification_importance_min_title" msgid="6974673091137544803">"Scăzută"</string>
     <string name="notification_importance_low_title" msgid="8131254047772814309">"Medie"</string>
     <string name="notification_importance_default_title" msgid="9120383978536089489">"Ridicată"</string>
@@ -2949,8 +2969,14 @@
     <string name="loading_notification_apps" msgid="5031818677010335895">"Se încarcă aplicațiile..."</string>
     <string name="app_notifications_off_desc" msgid="4882445501376722969">"Android blochează notificările acestei aplicații pe acest dispozitiv"</string>
     <string name="channel_notifications_off_desc" msgid="5899225298718840635">"Android blochează această categorie de notificări pe acest dispozitiv"</string>
+    <string name="channel_group_notifications_off_desc" msgid="1620950416247316370">"Android blochează acest grup de notificări pe dispozitiv"</string>
     <string name="notification_channels" msgid="5346841743182627500">"Categorii"</string>
     <string name="notification_channels_other" msgid="5645317113885788226">"Altele"</string>
+    <plurals name="notification_group_summary" formatted="false" msgid="3420621520561455358">
+      <item quantity="few"><xliff:g id="COUNT_1">%d</xliff:g> categorii</item>
+      <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> de categorii</item>
+      <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> categorie</item>
+    </plurals>
     <string name="no_channels" msgid="3077375508177744586">"Această aplicație nu a postat nicio notificare"</string>
     <string name="app_settings_link" msgid="8894946007543660906">"Setări suplimentare în aplicație"</string>
     <string name="app_notification_listing_summary_zero" msgid="6482582965081108108">"Activat pentru toate aplicațiile"</string>
@@ -3029,12 +3055,14 @@
     <string name="zen_mode_from_starred" msgid="2678345811950997027">"Doar de la persoanele de contact cu stea"</string>
     <string name="zen_mode_from_none" msgid="8219706639954614136">"Niciunul"</string>
     <string name="zen_mode_alarms" msgid="2165302777886552926">"Alarme"</string>
+    <!-- no translation found for zen_mode_media_system_other (8900209390529859777) -->
+    <skip />
     <string name="zen_mode_reminders" msgid="5458502056440485730">"Mementouri"</string>
     <string name="zen_mode_events" msgid="7914446030988618264">"Evenimente"</string>
     <string name="zen_mode_all_callers" msgid="584186167367236922">"Toți apelanții"</string>
     <string name="zen_mode_selected_callers" msgid="3127598874060615742">"Apelanți selectați"</string>
     <string name="zen_mode_repeat_callers" msgid="5019521886428322131">"Apelanți care revin"</string>
-    <string name="zen_mode_repeat_callers_summary" msgid="7192713032364140137">"Dacă aceeași persoană apelează a doua oară într-un interval de <xliff:g id="MINUTES">%d</xliff:g> minute, permite apelul"</string>
+    <string name="zen_mode_repeat_callers_summary" msgid="239685342222975733">"Dacă aceeași persoană apelează a doua oară într-un interval de <xliff:g id="MINUTES">%d</xliff:g> minute"</string>
     <string name="zen_mode_when" msgid="2767193283311106373">"Activați automat"</string>
     <string name="zen_mode_when_never" msgid="8809494351918405602">"Niciodată"</string>
     <string name="zen_mode_when_every_night" msgid="3122486110091921009">"În fiecare seară"</string>
@@ -3065,6 +3093,7 @@
     <string name="zen_mode_screen_off_visual_interruptions" msgid="4850792880144382633">"Când ecranul este dezactivat"</string>
     <string name="zen_mode_no_visual_interruptions" msgid="8742776003822778472">"Când ecranul este activat sau dezactivat"</string>
     <string name="notification_app_settings_button" msgid="6685640230371477485">"Setări pentru notificări"</string>
+    <string name="suggestion_button_text" msgid="3275010948381252006">"OK"</string>
     <string name="device_feedback" msgid="3238056036766293294">"Trimiteți feedback despre dispoz."</string>
     <string name="restr_pin_enter_admin_pin" msgid="1085834515677448072">"Introduceți codul PIN de administrator"</string>
     <string name="switch_on_text" msgid="1124106706920572386">"Activat"</string>
@@ -3248,13 +3277,14 @@
     <string name="usb_use_photo_transfers_desc" msgid="2963034811151325996">"Transferați fotografii sau fișiere dacă MTP nu este acceptat (PTP)"</string>
     <string name="usb_use_MIDI" msgid="870922185938298263">"Folosiți dispozitivul ca MIDI"</string>
     <string name="usb_use_MIDI_desc" msgid="8473936990076693175">"Folosiți acest dispozitiv ca MIDI"</string>
-    <string name="usb_use" msgid="3256040963685055320">"Folosiți conexiunea USB ca să"</string>
+    <string name="usb_use" msgid="3256040963685055320">"Folosiți conexiunea USB ca să:"</string>
     <string name="usb_pref" msgid="1400617804525116158">"USB"</string>
     <string name="usb_summary_charging_only" msgid="7544327009143659751">"Încărcarea acestui dispozitiv"</string>
     <string name="usb_summary_power_only" msgid="3629517713817003738">"Alimentarea altui dispozitiv"</string>
     <string name="usb_summary_file_transfers" msgid="6435943692610175111">"Transfer de fișiere"</string>
     <string name="usb_summary_photo_transfers" msgid="8440204169576585250">"Transferul de fotografii (PTP)"</string>
     <string name="usb_summary_MIDI" msgid="5687906612187885908">"Dispozitivul se folosește ca MIDI"</string>
+    <string name="sms_mirroring_pref" msgid="6475043279147376031">"Oglindirea SMS-urilor"</string>
     <string name="background_check_pref" msgid="7550258400138010979">"Verificare de fundal"</string>
     <string name="background_check_title" msgid="4534254315824525593">"Acces complet la fundal"</string>
     <string name="assist_access_context_title" msgid="2269032346698890257">"Folosește textul de pe ecran"</string>
@@ -3322,7 +3352,7 @@
     <string name="write_settings_title" msgid="4232152481902542284">"Pot modifica setările de sistem"</string>
     <string name="write_system_settings" msgid="3482913590601096763">"Modifică setările de sistem"</string>
     <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="permit_write_settings" msgid="658555006453212691">"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>
@@ -3420,9 +3450,12 @@
     <string name="color_temperature" msgid="2070126836910615605">"Temperatura culorii: rece"</string>
     <string name="color_temperature_desc" msgid="4793729830226404052">"Folosiți culori mai reci pentru afișare"</string>
     <string name="color_temperature_toast" msgid="4974218172133854827">"Pentru a aplica modificarea culorilor, dezactivați ecranul"</string>
-    <string name="telephony_monitor_toast" msgid="7003764250271195384">"Pentru a aplica modificarea pentru Telephony Monitor, reporniți dispozitivul"</string>
+    <string name="connectivity_monitor_switch" msgid="9059759348648583421">"Connectivity Monitor"</string>
+    <string name="connectivity_monitor_switch_summary" msgid="2828658652378866401">"Connectivity Monitor colectează jurnalele când detectează o problemă de conectivitate și trimite notificări utilizatorilor să semnaleze o eroare"</string>
+    <string name="connectivity_monitor_toast" msgid="5551859612881173028">"Pentru a aplica modificarea pentru Connectivity Monitor, reporniți dispozitivul"</string>
     <string name="camera_hal_hdrplus_switch" msgid="8377365197105267466">"Camera foto HAL HDR+"</string>
     <string name="camera_hal_hdrplus_toast" msgid="2063703797270055299">"Pentru a aplica modificarea Camerei foto HAL HDR+, reporniți dispozitivul"</string>
+    <string name="camera_laser_sensor_switch" msgid="8913588990743234440">"Senzor laser al camerei foto"</string>
     <string name="ota_disable_automatic_update" msgid="2319639631655915050">"Actualizări automate de sistem"</string>
     <string name="usage" msgid="2977875522080448986">"Utilizare"</string>
     <string name="cellular_data_usage" msgid="2155683719898158203">"Utilizarea datelor mobile"</string>
@@ -3449,7 +3482,7 @@
     <string name="data_warning" msgid="209133958008062117">"Avertisment pentru date"</string>
     <string name="set_data_limit" msgid="2901526323210516923">"Setați limita de date"</string>
     <string name="data_limit" msgid="1885406964934590552">"Limită de date"</string>
-    <string name="data_usage_template" msgid="392191945602400904">"Date utilizate în intervalul <xliff:g id="ID_2">%2$s</xliff:g>: <xliff:g id="ID_1">%1$s</xliff:g>"</string>
+    <string name="data_usage_template" msgid="2923744765873163859">"S-au folosit <xliff:g id="ID_1">%1$s</xliff:g> pe <xliff:g id="ID_2">%2$s</xliff:g>"</string>
     <string name="configure" msgid="1029654422228677273">"Configurați"</string>
     <string name="data_usage_other_apps" msgid="3272872663517382050">"Alte aplicații incluse în utilizare"</string>
     <plurals name="data_saver_unrestricted_summary" formatted="false" msgid="2635267833484232703">
@@ -3520,7 +3553,7 @@
     <string name="button_confirm_convert_fbe" msgid="7101855374850373091">"Ștergeți și convertiți"</string>
     <string name="reset_shortcut_manager_throttling" msgid="6495066467198668994">"Resetați limitarea frecvenței pentru ShortcutManager"</string>
     <string name="reset_shortcut_manager_throttling_complete" msgid="1826770872063707900">"Limitarea frecvenței pentru ShortcutManager a fost resetată"</string>
-    <string name="notification_suggestion_title" msgid="4506524937307816475">"Controlați notificările pe ecranul de blocare"</string>
+    <string name="notification_suggestion_title" msgid="387052719462473500">"Controlați informațiile de pe ecranul de blocare"</string>
     <string name="notification_suggestion_summary" msgid="8521159741445416875">"Afișați sau ascundeți conținutul notificării"</string>
     <string name="page_tab_title_summary" msgid="4070309266374993258">"Toate"</string>
     <string name="page_tab_title_support" msgid="8483187649355540109">"Asistență și sfaturi"</string>
@@ -3528,7 +3561,7 @@
     <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>
     <string name="premium_sms_access" msgid="4660047004791638305">"Acces la SMS-uri premium"</string>
-    <string name="bluetooth_disabled" msgid="2456198532288640046">"Nu este vizibil pentru alte dispozitive"</string>
+    <string name="bluetooth_disabled" msgid="6244000672828617410">"Dezactivat"</string>
     <string name="bluetooth_connected_summary" msgid="7672528674593152862">"Conectat la <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="bluetooth_connected_multiple_devices_summary" msgid="9173661896296663932">"Conectat la mai multe dispozitive"</string>
     <string name="demo_mode" msgid="2798762752209330277">"Mod demonstrativ pentru IU sistem"</string>
@@ -3633,7 +3666,7 @@
     <string name="web_action_enable_title" msgid="4051513950976670853">"Aplicații instantanee"</string>
     <string name="web_action_enable_summary" msgid="3108127559723396382">"Deschideți linkuri în aplicații, chiar dacă acestea nu sunt instalate"</string>
     <string name="web_action_section_title" msgid="7364647086538399136">"Aplicații instantanee"</string>
-    <string name="instant_apps_account" msgid="1433620209791992528">"Cont de aplicații instantanee"</string>
+    <string name="instant_apps_settings" msgid="8827777916518348213">"Preferințe pentru aplicații instantanee"</string>
     <string name="domain_url_section_title" msgid="7046835219056428883">"Aplicații instalate"</string>
     <string name="automatic_storage_manager_activation_warning" msgid="6353100011690933254">"Spațiul de stocare este acum gestionat de managerul spațiului de stocare"</string>
     <string name="account_for_section_header" msgid="5356566418548737121">"Conturi pentru <xliff:g id="USER_NAME">%1$s</xliff:g>"</string>
@@ -3682,7 +3715,9 @@
     <string name="enterprise_privacy_always_on_vpn_personal" msgid="9217774730260037434">"Rețeaua VPN activată permanent a fost activată în profilul dvs. personal"</string>
     <string name="enterprise_privacy_always_on_vpn_work" msgid="7244472958208315814">"Rețeaua VPN activată permanent a fost activată în profilul dvs. de serviciu"</string>
     <string name="enterprise_privacy_global_http_proxy" msgid="7936664553416257333">"Proxy global HTTP setat"</string>
-    <string name="enterprise_privacy_ca_certs" msgid="5885892204903688909">"Acreditări de încredere"</string>
+    <string name="enterprise_privacy_ca_certs_device" msgid="2019652712782510262">"Acreditări de încredere"</string>
+    <string name="enterprise_privacy_ca_certs_personal" msgid="2279084820904076599">"Acreditări de încredere în profilul personal"</string>
+    <string name="enterprise_privacy_ca_certs_work" msgid="6187377647815301809">"Acreditări de încredere în profilul de serviciu"</string>
     <plurals name="enterprise_privacy_number_ca_certs" formatted="false" msgid="526375234629534165">
       <item quantity="few">Cel puțin <xliff:g id="COUNT_1">%d</xliff:g> certificate CA</item>
       <item quantity="other">Cel puțin <xliff:g id="COUNT_1">%d</xliff:g> de certificate CA</item>
@@ -3750,6 +3785,8 @@
     <string name="carrier_provisioning" msgid="4398683675591893169">"Informații despre provizionarea operatorului"</string>
     <string name="trigger_carrier_provisioning" msgid="3434865918009286187">"Declanșați provizionarea operatorului"</string>
     <string name="new_device_suggestion_title" msgid="698847081680980774">"Ce este nou și interesant?"</string>
-    <string name="new_device_suggestion_summary" msgid="7172709269203435870">"Încercați cele 5 funcții principale"</string>
+    <string name="new_device_suggestion_summary" product="default" msgid="206396571522515855">"Faceți un tur al noului dvs. telefon"</string>
+    <string name="new_device_suggestion_summary" product="tablet" msgid="393751455688210956">"Faceți un tur al noii dvs. tablete"</string>
+    <string name="new_device_suggestion_summary" product="device" msgid="2939870049868336652">"Faceți un tur al noului dvs. dispozitiv"</string>
     <string name="disabled_low_ram_device" msgid="3751578499721173344">"Această caracteristică nu este disponibilă pe acest dispozitiv"</string>
 </resources>
diff --git a/res/values-ru/arrays.xml b/res/values-ru/arrays.xml
index 621dd40..8f79165 100644
--- a/res/values-ru/arrays.xml
+++ b/res/values-ru/arrays.xml
@@ -100,8 +100,6 @@
     <!-- no translation found for wifi_security_no_eap:0 (2084555984818107151) -->
     <!-- no translation found for wifi_security_no_eap:1 (397579322683471524) -->
     <!-- no translation found for wifi_security_no_eap:2 (1968820975358150484) -->
-    <!-- no translation found for wifi_ap_security:0 (5251664683198623324) -->
-    <!-- no translation found for wifi_ap_security:1 (7989073072260294673) -->
   <string-array name="wifi_eap_method">
     <item msgid="1160193392455075561">"PEAP"</item>
     <item msgid="7981731051382306293">"TLS"</item>
diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml
index 0955580..c4652b1 100644
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml
@@ -168,7 +168,7 @@
     <string name="bluetooth_map_acceptance_dialog_text" msgid="8712508202081143737">"%1$s хочет получить доступ к вашим сообщениям. Предоставить доступ %2$s?"</string>
     <string name="bluetooth_sap_request" msgid="2669762224045354417">"Запрос на доступ к SIM-карте"</string>
     <string name="bluetooth_sap_acceptance_dialog_text" msgid="4414253873553608690">"Устройство \"<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g>\" запрашивает доступ к вашей SIM-карте. Если вы его предоставите, будет установлено соединение, на время которого будут отключены все сервисы передачи данных. Открыть доступ устройству \"<xliff:g id="DEVICE_NAME_1">%2$s?</xliff:g>\""</string>
-    <string name="bluetooth_device_name_summary" msgid="4757990010751789977">"Название в списке устройств: <xliff:g id="DEVICE_NAME">^1</xliff:g>"</string>
+    <string name="bluetooth_device_name_summary" msgid="522235742194965734">"Название в списке устройств: <xliff:g id="DEVICE_NAME">^1</xliff:g>"</string>
     <string name="bluetooth_paired_device_title" msgid="8638994696317952019">"Ваши устройства"</string>
     <string name="bluetooth_pairing_page_title" msgid="7712127387361962608">"Подключение нового устройства"</string>
     <string name="date_and_time" msgid="9062980487860757694">"Дата и время"</string>
@@ -316,6 +316,8 @@
     <string name="zone_auto" msgid="334783869352026648">"Часовой пояс сети"</string>
     <string name="zone_auto_summaryOn" msgid="6142830927278458314">"Использовать часовой пояс сети"</string>
     <string name="zone_auto_summaryOff" msgid="2597745783162041390">"Использовать часовой пояс сети"</string>
+    <string name="date_time_24hour_auto" msgid="2117383168985653422">"24-часовой формат по умолчанию"</string>
+    <string name="date_time_24hour_auto_summary" msgid="6351812925651480277">"Региональные настройки по умолчанию"</string>
     <string name="date_time_24hour_title" msgid="3203537578602803850">"24-часовой формат"</string>
     <string name="date_time_24hour" msgid="1193032284921000063">"24-часовой формат"</string>
     <string name="date_time_set_time_title" msgid="6296795651349047016">"Время"</string>
@@ -354,7 +356,7 @@
     <string name="cdma_security_settings_summary" msgid="6068799952798901542">"Настройка функции \"Мое местоположение\", разблокировка экрана и блокировка хранилища регистрационных данных"</string>
     <string name="security_passwords_title" msgid="2881269890053568809">"Конфиденциальность"</string>
     <string name="disabled_by_administrator_summary" msgid="1601828700318996341">"Отключено администратором"</string>
-    <string name="security_status_title" msgid="5848766673665944640">"Статус безопасности"</string>
+    <string name="security_status_title" msgid="5848766673665944640">"Статус защиты"</string>
     <string name="security_dashboard_summary" msgid="6757421634477554939">"Блокировка экрана, цифровой отпечаток"</string>
     <string name="security_dashboard_summary_no_fingerprint" msgid="8129641548372335540">"Блокировка экрана"</string>
     <string name="security_settings_fingerprint_preference_title" msgid="2488725232406204350">"Отпечатки пальцев"</string>
@@ -378,6 +380,9 @@
     <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="1961957425135180242">"Далее"</string>
+    <string name="setup_fingerprint_enroll_skip_title" msgid="362050541117362034">"Не настраивать отпечатки?"</string>
+    <string name="setup_fingerprint_enroll_skip_after_adding_lock_text" msgid="958990414356204763">"Ввод отпечатков пальцев занимает 1–2 минуты. Вы можете добавить их позже через настройки устройства."</string>
+    <string name="lock_screen_intro_skip_title" msgid="4988210105913705679">"Не настраивать блокировку?"</string>
     <string name="lock_screen_intro_skip_dialog_text_frp" product="tablet" msgid="1581834104051243425">"Защита устройства не будет активирована. В случае потери или кражи планшета либо сброса его настроек им смогут воспользоваться посторонние."</string>
     <string name="lock_screen_intro_skip_dialog_text_frp" product="device" msgid="4629503416877189572">"Защита не будет активирована. В случае потери или кражи устройства либо сброса его настроек им смогут воспользоваться посторонние."</string>
     <string name="lock_screen_intro_skip_dialog_text_frp" product="default" msgid="2423428240245737909">"Защита устройства не будет активирована. В случае потери или кражи телефона либо сброса его настроек им смогут воспользоваться посторонние."</string>
@@ -393,11 +398,11 @@
     <string name="security_settings_fingerprint_enroll_dialog_ok" msgid="4150384963879569750">"ОК"</string>
     <string name="security_settings_fingerprint_enroll_dialog_delete" msgid="4114615413240707936">"Удалить"</string>
     <string name="security_settings_fingerprint_enroll_start_title" msgid="2068961812439460133">"Коснитесь сканера отпечатков"</string>
-    <string name="security_settings_fingerprint_enroll_start_message" msgid="3909929328942564524">"Приложите палец к сканеру и удерживайте, пока не почувствуете вибрацию."</string>
+    <string name="security_settings_fingerprint_enroll_start_message" msgid="3909929328942564524">"Прикладывайте палец к сканеру и удерживайте, пока не почувствуете вибрацию."</string>
     <string name="security_settings_fingerprint_enroll_repeat_title" msgid="2819679722403209778">"Коснитесь несколько раз"</string>
-    <string name="security_settings_fingerprint_enroll_repeat_message" msgid="6158989350522518586">"Немного перемещайте палец, чтобы отсканировать его полностью"</string>
+    <string name="security_settings_fingerprint_enroll_repeat_message" msgid="6158989350522518586">"Немного перемещайте палец, чтобы отсканировать его полностью."</string>
     <string name="security_settings_fingerprint_enroll_finish_title" msgid="7567276170287972230">"Отпечаток добавлен"</string>
-    <string name="security_settings_fingerprint_enroll_finish_message" msgid="4796715961273420536">"Этот значок указывает на то, что вы можете подтверждать покупки и свою личность с помощью отпечатка пальца."</string>
+    <string name="security_settings_fingerprint_enroll_finish_message" msgid="4796715961273420536">"Этот значок указывает, что вы можете подтверждать покупки и свою личность с помощью отпечатка пальца."</string>
     <string name="security_settings_fingerprint_enroll_enrolling_skip" msgid="3710211704052369752">"Не сейчас"</string>
     <string name="setup_fingerprint_enroll_enrolling_skip_title" msgid="6808422329107426923">"Не настраивать доступ по отпечаткам?"</string>
     <string name="setup_fingerprint_enroll_enrolling_skip_message" msgid="274849306857859783">"Для разблокировки телефона вы выбрали сканирование отпечатка пальца. Настройка займет около минуты. Если вы пропустите ее сейчас, вам все равно придется сделать это позже."</string>
@@ -463,7 +468,7 @@
     <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="lock_settings_picker_fingerprint_added_security_message" msgid="5768002109707648463">"Для более надежной защиты настройте дополнительный способ блокировки экрана."</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>
@@ -509,7 +514,7 @@
 
 </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="3370462835533123695">"Без PIN-кода защита устройства работать не будет.<xliff:g id="EMPTY_LINE">
+    <string name="unlock_disable_frp_warning_content_pin_fingerprint" msgid="3370462835533123695">"Без PIN-кода не будет работать защита устройства.<xliff:g id="EMPTY_LINE">
 
 </xliff:g>Сохраненные отпечатки пальцев будут удалены, поэтому вы больше не сможете снимать блокировку, совершать покупки и входить в приложения с их помощью."</string>
     <string name="unlock_disable_frp_warning_content_password" msgid="5420612686852555537">"Без пароля не будет работать защита устройства."</string>
@@ -524,8 +529,8 @@
     <string name="unlock_disable_frp_warning_content_pattern_fingerprint_profile" msgid="6718155854303231675">"Без графического ключа защита профиля работать не будет.<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="4209564603132870532">"Без PIN-кода защита профиля работать не будет.<xliff:g id="EMPTY_LINE">
+    <string name="unlock_disable_frp_warning_content_pin_profile" msgid="7790688070593867767">"Без PIN-кода не будет работать защита профиля."</string>
+    <string name="unlock_disable_frp_warning_content_pin_fingerprint_profile" msgid="4209564603132870532">"Без PIN-кода не будет работать защита профиля.<xliff:g id="EMPTY_LINE">
 
 </xliff:g>Сохраненные отпечатки пальцев будут удалены, поэтому вы больше не сможете снимать блокировку, совершать покупки и входить в приложения с их помощью."</string>
     <string name="unlock_disable_frp_warning_content_password_profile" msgid="7569285520567674461">"Без пароля защита профиля работать не будет."</string>
@@ -606,6 +611,7 @@
     <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="lockpassword_clear_label" msgid="5724429464960458155">"Сбросить"</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>
@@ -726,7 +732,7 @@
     <string name="android_beam_off_summary" msgid="4663095428454779138">"Выключено"</string>
     <string name="android_beam_disabled_summary" msgid="1737782116894793393">"Недоступно, так как NFC отключен"</string>
     <string name="android_beam_label" msgid="6257036050366775040">"Android Beam"</string>
-    <string name="android_beam_explained" msgid="1810540319385192758">"Эта функция позволяет обмениваться информацией между устройствами, приложив их друг к другу. Передавать можно практически любые данные, включая контакты, веб-страницы и видео.\n\nПросто разместите устройства рядом (например, совместите их задние панели) и нажмите на экран. Передаваемые данные зависят от приложения."</string>
+    <string name="android_beam_explained" msgid="1810540319385192758">"Эта функция позволяет обмениваться информацией между устройствами, приложив их друг к другу. Передавать можно практически любые данные, включая контакты, веб-страницы и видео.\n\nСовместите задние панели устройств и нажмите на экран. Передаваемые данные зависят от приложения."</string>
     <string name="wifi_quick_toggle_title" msgid="8850161330437693895">"Wi-Fi"</string>
     <string name="wifi_quick_toggle_summary" msgid="2696547080481267642">"Включить Wi‑Fi"</string>
     <string name="wifi_settings" msgid="29722149822540994">"Wi-Fi"</string>
@@ -803,6 +809,7 @@
     <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>
@@ -839,6 +846,8 @@
     <string name="wifi_wps_available_first_item" msgid="4422547079984583502">"Поддерживает WPS"</string>
     <string name="wifi_wps_available_second_item" msgid="8427520131718215301">" (доступно WPS)"</string>
     <string name="wifi_wps_nfc_enter_password" msgid="2288214226916117159">"Введите пароль для подключения к сети."</string>
+    <string name="wifi_carrier_connect" msgid="8174696557882299911">"Сеть Wi‑Fi оператора связи"</string>
+    <string name="wifi_carrier_content" msgid="4634077285415851933">"Подключиться через <xliff:g id="NAME">%1%s</xliff:g>"</string>
     <string name="wifi_scan_always_turnon_message" msgid="203123538572122989">"Чтобы определение местоположения и некоторые другие функции работали лучше, приложению \"<xliff:g id="APP_NAME">%1$s</xliff:g>\" необходимо выполнять поиск сетей, даже если модуль Wi-Fi отключен.\n\nРазрешить?"</string>
     <string name="wifi_scan_always_turnoff_message" msgid="5538901671131941043">"Этот параметр можно отключить в расширенных настройках в дополнительном меню."</string>
     <string name="wifi_scan_always_confirm_allow" msgid="5355973075896817232">"Разрешить"</string>
@@ -856,6 +865,7 @@
     <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_modify" msgid="6100248070440710782">"Изменить"</string>
     <string name="wifi_failed_forget_message" msgid="1348172929201654986">"Не удалось удалить сеть."</string>
     <string name="wifi_save" msgid="3331121567988522826">"Сохранить"</string>
     <string name="wifi_failed_save_message" msgid="6650004874143815692">"Не удалось сохранить сеть."</string>
@@ -870,6 +880,7 @@
     <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_title" msgid="3471132676909349382">"Информация о сети"</string>
     <string name="wifi_details_subnet_mask" msgid="6720279144174924410">"Маска подсети"</string>
     <string name="wifi_details_dns" msgid="8648826607751830768">"DNS"</string>
     <string name="wifi_details_ipv6_address_header" msgid="6734119149106422148">"IPv6-адреса"</string>
@@ -902,16 +913,15 @@
     <string name="wifi_p2p_cancel_connect_title" msgid="255267538099324413">"Отмена приглашения"</string>
     <string name="wifi_p2p_cancel_connect_message" msgid="7477756213423749402">"Вы собираетесь отменить приглашение на подключение к устройству \"<xliff:g id="PEER_NAME">%1$s</xliff:g>\". Продолжить?"</string>
     <string name="wifi_p2p_delete_group_message" msgid="834559380069647086">"Удалить эту группу?"</string>
-    <string name="wifi_tether_checkbox_text" msgid="1847167643625779136">"Точка доступа Wi-Fi"</string>
     <string name="wifi_hotspot_checkbox_text" msgid="7763495093333664887">"Точка доступа Wi‑Fi"</string>
     <string name="wifi_hotspot_off_subtext" msgid="5466126533609394170">"Другим устройствам закрыт доступ к Интернету или контенту"</string>
     <string name="wifi_hotspot_tethering_on_subtext" product="tablet" msgid="5752490509369962007">"Доступ к интернет-соединению планшета через точку доступа открыт"</string>
     <string name="wifi_hotspot_tethering_on_subtext" product="default" msgid="6461075246164300670">"Доступ к интернет-подключению телефона через точку доступа открыт"</string>
     <string name="wifi_hotspot_on_local_only_subtext" msgid="2068110388011294735">"Предоставлен доступ к контенту приложения. Чтобы открыть другим устройствам доступ к интернет-соединению, отключите и снова включите точку доступа."</string>
-    <string name="wifi_hotspot_name_title" msgid="1341735529132128887">"Название точки доступа Wi‑Fi"</string>
+    <string name="wifi_hotspot_name_title" msgid="8237000746618636778">"Название точки доступа"</string>
     <string name="wifi_hotspot_name_summary_connecting" msgid="3378299995508671967">"Подключение к точке доступа \"<xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>\"..."</string>
     <string name="wifi_hotspot_name_summary_connected" msgid="3888672084861445362">"Другие устройства могут подключаться к точке доступа \"<xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>\""</string>
-    <string name="wifi_hotspot_password_title" msgid="1955592302902091281">"Пароль Wi-Fi"</string>
+    <string name="wifi_hotspot_password_title" msgid="8676859981917573801">"Пароль точки доступа"</string>
     <string name="wifi_hotspot_ap_band_title" msgid="1165801173359290681">"Диапазон частот Wi-Fi"</string>
     <string name="wifi_hotspot_footer_info_regular" msgid="1203489406068036455">"Создайте сеть Wi‑Fi для других своих устройств с помощью точки доступа. Она позволяет пользоваться мобильным Интернетом. За передачу и скачивание данных может взиматься дополнительная плата."</string>
     <string name="wifi_hotspot_footer_info_local_only" msgid="857988412470694109">"Приложения могут создавать точки доступа, чтобы делиться контентом с устройствами поблизости."</string>
@@ -922,7 +932,6 @@
     <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">"Хот-спот Android"</string>
     <string name="wifi_calling_settings_title" msgid="4102921303993404577">"Звонки по Wi-Fi"</string>
     <string name="wifi_calling_suggestion_title" msgid="9008010480466359578">"Включите звонки по Wi-Fi"</string>
@@ -963,7 +972,7 @@
     <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="emergency_address_summary" msgid="3266760199681945746">"Адрес, по которому будут направлены экстренные службы в случае вызова по сети Wi-Fi"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"Экран"</string>
     <string name="sound_settings" msgid="5534671337768745343">"Звук"</string>
     <string name="all_volume_title" msgid="4296957391257836961">"Громкость"</string>
@@ -1017,6 +1026,7 @@
     <string name="search_settings" msgid="1910951467596035063">"Поиск"</string>
     <string name="search_settings_summary" msgid="9205656546570654169">"Настроить параметры и управлять историей поиска"</string>
     <string name="search_settings_no_results" msgid="8799027492641230999">"Ничего не найдено"</string>
+    <string name="search_clear_history" msgid="4196658962573162457">"Очистить историю"</string>
     <string name="display_settings" msgid="7965901687241669598">"Экран"</string>
     <string name="accelerometer_title" msgid="7854608399547349157">"Автоповорот экрана"</string>
     <string name="color_mode_title" msgid="3159275920408338215">"Насыщенные цвета"</string>
@@ -1148,7 +1158,6 @@
     <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>
     <string name="device_status_activity_title" msgid="1411201799384697904">"Общая информация"</string>
     <string name="device_status" msgid="607405385799807324">"Общая информация"</string>
@@ -1176,7 +1185,6 @@
     <string name="status_wifi_mac_address" msgid="2202206684020765378">"MAC-адрес Wi-Fi"</string>
     <string name="status_bt_address" msgid="4195174192087439720">"Адрес Bluetooth"</string>
     <string name="status_serial_number" msgid="2257111183374628137">"Серийный номер"</string>
-    <string name="status_unavailable" msgid="7862009036663793314">"Недоступно"</string>
     <string name="status_up_time" msgid="7294859476816760399">"Время с момента включения"</string>
     <string name="status_awake_time" msgid="2393949909051183652">"Время работы"</string>
     <string name="internal_memory" msgid="9129595691484260784">"Внутренний накопитель"</string>
@@ -1352,6 +1360,7 @@
     <string name="menu_restore" msgid="8260067415075573273">"Сбросить настройки"</string>
     <string name="restore_default_apn_completed" msgid="2824775307377604897">"Настройки по умолчанию восстановлены"</string>
     <string name="reset_dashboard_title" msgid="6254873816990678620">"Сброс настроек"</string>
+    <string name="reset_dashboard_summary" msgid="4851012632493522755">"Вы можете сбросить настройки сети, приложений или устройства"</string>
     <string name="reset_network_title" msgid="6166025966016873843">"Сбросить настройки Wi-Fi, мобильного Интернета и Bluetooth"</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>
@@ -1360,19 +1369,14 @@
     <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="6617679904229218425">"Удалить все данные (Сбросить настройки)"</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_title" msgid="3531267871084279512">"Удалить все данные (сброс к заводским настройкам)"</string>
     <string name="master_clear_desc" product="tablet" msgid="9146059417023157222">"Будут удалены все данные из "<b>"внутренней памяти"</b>" устройства, в том числе:\n\n"<li>"Ваш аккаунт Google"</li>\n<li>"Настройки/данные системы и приложений"</li>\n<li>"Загруженные приложения"</li></string>
     <string name="master_clear_desc" product="default" msgid="4800386183314202571">"Будут удалены все данные из "<b>"внутренней памяти"</b>" устройства, в том числе:\n\n"<li>"Ваш аккаунт Google"</li>\n<li>"Настройки/данные системы и приложений"</li>\n<li>"Загруженные приложения"</li></string>
     <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"Аккаунты на этом устройстве:\n"</string>
     <string name="master_clear_other_users_present" product="default" msgid="5161423070702470742">\n\n"На этом устройстве есть другие аккаунты пользователей.\n"</string>
     <string name="master_clear_desc_also_erases_external" msgid="1903185203791274237"><li>"Музыка"</li>\n<li>"Фото"</li>\n<li>"Другие данные"</li></string>
+    <string name="master_clear_desc_also_erases_esim" msgid="312352697653096008"><li>"Операторы на eSIM"</li></string>
+    <string name="master_clear_desc_no_cancel_mobile_plan" msgid="5460926449093211144">\n\n"Вы не потеряете доступ к услугам оператора связи."</string>
     <string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="7744115866662613411">\n\n"Чтобы удалить музыку, изображения и другие пользовательские данные, необходимо очистить "<b>"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>
@@ -1416,7 +1420,7 @@
     <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>
@@ -1489,15 +1493,16 @@
     <string name="settings_safetylegal_activity_title" msgid="6901214628496951727">"Сведения о безопасности"</string>
     <string name="settings_safetylegal_activity_unreachable" msgid="250674109915859456">"Устройство не подключено к Интернету. Чтобы просмотреть эту информацию, откройте страницу %s на любом компьютере с интернет-доступом."</string>
     <string name="settings_safetylegal_activity_loading" msgid="8059022597639516348">"Загрузка…"</string>
-    <string name="lockpassword_choose_your_password_header" msgid="8624900666929394990">"Выберите пароль"</string>
-    <string name="lockpassword_choose_your_password_header_for_fingerprint" msgid="6624409510609085450">"Задайте пароль"</string>
-    <string name="lockpassword_choose_your_pattern_header" msgid="6949761069941694050">"Создайте графический ключ"</string>
-    <string name="lockpassword_choose_your_pattern_header_for_fingerprint" msgid="5901096361617543819">"Задайте графический ключ"</string>
-    <string name="lockpassword_choose_your_pin_header" msgid="7598849519816138302">"Введите PIN-код"</string>
-    <string name="lockpassword_choose_your_pin_header_for_fingerprint" msgid="765344692615917183">"Задайте PIN-код"</string>
-    <string name="lockpassword_confirm_your_password_header" msgid="6308478184889846633">"Подтвердите пароль"</string>
+    <string name="lockpassword_choose_your_screen_lock_header" msgid="3872462096767152394">"Настройте блокировку экрана"</string>
+    <string name="lockpassword_choose_your_password_message" msgid="1197569283524841412">"Защитите устройство: задайте пароль"</string>
+    <string name="lockpassword_choose_your_password_header_for_fingerprint" msgid="2541818487015343503">"Задайте пароль"</string>
+    <string name="lockpassword_choose_your_pattern_header_for_fingerprint" msgid="7709785406243556723">"Задайте графический ключ"</string>
+    <string name="lockpassword_choose_your_pin_message" msgid="1875420718677275646">"Защитите устройство: задайте PIN-код"</string>
+    <string name="lockpassword_choose_your_pin_header_for_fingerprint" msgid="1549639053195796674">"Задайте PIN-код"</string>
+    <string name="lockpassword_choose_your_pattern_message" msgid="5986983400689720015">"Защитите устройство: создайте графический ключ"</string>
+    <string name="lockpassword_confirm_your_password_header" msgid="1266027268220850931">"Введите пароль ещё раз"</string>
     <string name="lockpassword_confirm_your_pattern_header" msgid="7543433733032330821">"Подтвердите графический ключ"</string>
-    <string name="lockpassword_confirm_your_pin_header" msgid="49038294648213197">"Подтвердите PIN-код"</string>
+    <string name="lockpassword_confirm_your_pin_header" msgid="7744513791910572550">"Введите PIN-код ещё раз"</string>
     <string name="lockpassword_confirm_passwords_dont_match" msgid="5140892109439191415">"Пароли не совпадают"</string>
     <string name="lockpassword_confirm_pins_dont_match" msgid="7226244811505606217">"PIN-коды не совпадают"</string>
     <string name="lockpassword_choose_lock_generic_header" msgid="3811438094903786145">"Способ блокировки"</string>
@@ -1513,13 +1518,19 @@
     <string name="lockpassword_strong_auth_required_device_pattern" msgid="530802132223800623">"Укажите графический ключ"</string>
     <string name="lockpassword_strong_auth_required_device_pin" msgid="7829294830078036417">"Введите PIN-код"</string>
     <string name="lockpassword_strong_auth_required_device_password" msgid="3552644641574796973">"Введите пароль устройства"</string>
-    <string name="lockpassword_strong_auth_required_work_pattern" msgid="3003781907040522053">"Укажите графический ключ, чтобы попасть в рабочий профиль"</string>
-    <string name="lockpassword_strong_auth_required_work_pin" msgid="3367491332598821552">"Введите PIN-код, чтобы попасть в рабочий профиль"</string>
+    <string name="lockpassword_strong_auth_required_work_pattern" msgid="3003781907040522053">"Укажите графический ключ от рабочего профиля"</string>
+    <string name="lockpassword_strong_auth_required_work_pin" msgid="3367491332598821552">"Введите PIN-код рабочего профиля"</string>
     <string name="lockpassword_strong_auth_required_work_password" msgid="8159775129968582940">"Введите пароль от рабочего профиля"</string>
+    <string name="lockpassword_confirm_your_pattern_details_frp" msgid="6757336656791723193">"Настройки вашего телефона были сброшены. Чтобы использовать его, введите свой прежний графический ключ."</string>
+    <string name="lockpassword_confirm_your_pin_details_frp" msgid="826520613445990470">"Настройки вашего телефона были сброшены. Чтобы использовать его, введите свой прежний PIN-код."</string>
+    <string name="lockpassword_confirm_your_password_details_frp" msgid="8944081074615739040">"Настройки вашего телефона были сброшены. Чтобы использовать его, введите свой прежний пароль."</string>
+    <string name="lockpassword_confirm_your_pattern_header_frp" msgid="2898036091609128286">"Подтверждение графического ключа"</string>
+    <string name="lockpassword_confirm_your_pin_header_frp" msgid="4141601774778898803">"Подтверждение PIN-кода"</string>
+    <string name="lockpassword_confirm_your_password_header_frp" msgid="3762615419295360480">"Подтверждение пароля"</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="lock_settings_title" msgid="4213839087748988686">"Защита устройства"</string>
     <string name="lockpattern_change_lock_pattern_label" msgid="5679630792003440352">"Изменить ключ"</string>
     <string name="lockpattern_change_lock_pin_label" msgid="266707138486731661">"Изменить PIN-код"</string>
     <string name="lockpattern_recording_intro_header" msgid="308287052221942814">"Начертите ключ разблокировки"</string>
@@ -1565,7 +1576,6 @@
     <string name="install_applications_title" msgid="4987712352256508946">"Разрешить из всех источников"</string>
     <string name="recent_app_category_title" msgid="6673071268966003928">"Недавно открытые приложения"</string>
     <string name="see_all_apps_title" msgid="1317153498074308438">"Показать все приложения (<xliff:g id="COUNT">%1$d</xliff:g>)"</string>
-    <string name="recent_app_summary" msgid="3366446669844932300">"<xliff:g id="TIME">^1</xliff:g> назад"</string>
     <string name="install_all_warning" product="tablet" msgid="8310489909586138165">"Ваши личные данные и данные планшета более уязвимы для атак приложений из неизвестных источников. Устанавливая приложения из этого источника, вы соглашаетесь с тем, что несете полную ответственность за любой ущерб, нанесенный планшету, и потерю данных, связанные с использованием этих приложений."</string>
     <string name="install_all_warning" product="default" msgid="1952257127370115988">"Ваши личные данные и данные телефона более уязвимы для атак приложений из неизвестных источников. Устанавливая приложения из этого источника, вы соглашаетесь с тем, что несете полную ответственность за любой ущерб, нанесенный телефону, и потерю данных, связанные с использованием этих приложений."</string>
     <string name="advanced_settings" msgid="1777249286757067969">"Расширенные настройки"</string>
@@ -1831,7 +1841,7 @@
     <string name="accessibility_settings_summary" msgid="981260486011624939">"Программы чтения с экрана, экран, элементы управления"</string>
     <string name="vision_settings_title" msgid="4204111425716868288">"Настройки спец. возможностей"</string>
     <string name="vision_settings_description" msgid="5679491180156408260">"Используйте специальные возможности для удобной работы с устройством. Эти параметры можно изменить в настройках."</string>
-    <string name="vision_settings_suggestion_title" msgid="917294957154878441">"Увеличить размер шрифта"</string>
+    <string name="vision_settings_suggestion_title" msgid="8058794060304707004">"Измените размер шрифта"</string>
     <string name="screen_reader_category_title" msgid="7739154903913400641">"Программы чтения с экрана"</string>
     <string name="audio_and_captions_category_title" msgid="3420727114421447524">"Аудио и озвучивание текста"</string>
     <string name="display_category_title" msgid="685461049938269166">"Экран"</string>
@@ -1868,7 +1878,6 @@
     <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="preference_summary_default_combination" msgid="8532964268242666060">"<xliff:g id="DESCRIPTION">%2$s</xliff:g>: <xliff:g id="STATE">%1$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>
@@ -2001,12 +2010,14 @@
     <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_whitelisted" msgid="7375400051141016808">"Для этого приложения нельзя оптимизировать расход заряда"</string>
+    <string name="background_activity_warning_dialog_title" msgid="2216249969149568871">"Ограничить работу в фоновом режиме?"</string>
+    <string name="background_activity_warning_dialog_text" msgid="7049624449246121981">"Это действие может привести к неправильной работе приложения."</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" msgid="6393929085382334341">"Использование приложений с момента полной зарядки (<xliff:g id="RELATIVE_TIME">^1</xliff:g> назад)"</string>
+    <string name="power_usage_list_summary_device" msgid="4461926045610455423">"Использование устройства с момента полной зарядки (<xliff:g id="RELATIVE_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>
@@ -2127,7 +2138,7 @@
     <string name="battery_overall_usage" msgid="2093409063297375436">"<xliff:g id="PERCENT">%1$s</xliff:g> заряда батареи"</string>
     <string name="battery_detail_since_full_charge" msgid="7515347842046955855">"Использование с момента полной зарядки"</string>
     <string name="battery_last_full_charge" msgid="7151251641099019361">"Последняя полная зарядка"</string>
-    <string name="battery_footer_summary" msgid="67169726550144016">"Время работы батареи указано приблизительно и может меняться в зависимости от интенсивности использования"</string>
+    <string name="battery_footer_summary" msgid="67169726550144016">"Время работы батареи указано приблизительно и может меняться в зависимости от интенсивности использования."</string>
     <string name="battery_detail_foreground" msgid="3350401514602032183">"В активном режиме"</string>
     <string name="battery_detail_background" msgid="1929644393553768999">"В фоновом режиме"</string>
     <string name="battery_detail_power_usage" msgid="6485766868610469101">"Расход заряда батареи"</string>
@@ -2252,14 +2263,14 @@
     <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">"Перед использованием хранилища учетных данных необходимо задать PIN-код или пароль блокировки экрана."</string>
+    <string name="credentials_configure_lock_screen_hint" msgid="8058230497337529036">"Чтобы использовать хранилище учетных данных, необходимо сначала настроить блокировку экрана на устройстве"</string>
+    <string name="credentials_configure_lock_screen_button" msgid="253239765216055321">"НАСТРОИТЬ БЛОКИРОВКУ"</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>
@@ -2379,8 +2390,6 @@
     <skip />
     <string name="cant_sync_dialog_title" msgid="2777238588398046285">"Не удалось синхронизировать данные"</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"</string>
     <string name="enter_password" msgid="8035706727471334122">"Чтобы запустить Android, введите пароль"</string>
     <string name="enter_pin" msgid="5305333588093263790">"Чтобы запустить Android, введите PIN-код"</string>
     <string name="enter_pattern" msgid="4187435713036808566">"Чтобы запустить Android, введите графический ключ"</string>
@@ -2394,6 +2403,7 @@
     <string name="misc_files_selected_count" msgid="4647048020823912088">"Выбрано: <xliff:g id="NUMBER">%1$d</xliff:g> из <xliff:g id="TOTAL">%2$d</xliff:g>"</string>
     <string name="misc_files_selected_count_bytes" msgid="2876232009069114352">"<xliff:g id="NUMBER">%1$s</xliff:g> из <xliff:g id="TOTAL">%2$s</xliff:g>"</string>
     <string name="select_all" msgid="1562774643280376715">"Выбрать все"</string>
+    <string name="data_plan_usage_manage_plans_button_text" msgid="8997761990902708162">"Управление тарифами"</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>
@@ -2450,8 +2460,8 @@
     <string name="data_usage_app_restrict_dialog" msgid="1466689968707308512">"Если будут доступны только мобильные сети, программы, зависящие от фонового режима, могут перестать работать.\n\nУстановите другие параметры передачи данных в настройках приложения."</string>
     <string name="data_usage_restrict_denied_dialog" msgid="55012417305745608">"Чтобы ограничить передачу данных в фоновом режиме, сначала установите лимит мобильного трафика."</string>
     <string name="data_usage_auto_sync_on_dialog_title" msgid="2438617846762244389">"Включить автосинхронизацию?"</string>
-    <string name="data_usage_auto_sync_on_dialog" product="tablet" msgid="8581983093524041669">"Все изменения, внесенные в аккаунты на компьютере, будут автоматически скопированы на устройство.\n\nВ некоторых случаях также выполняется обратная синхронизация (например, для аккаунта Google)."</string>
-    <string name="data_usage_auto_sync_on_dialog" product="default" msgid="8651376294887142858">"Все изменения, внесенные в аккаунты на компьютере, будут автоматически скопированы на устройство.\n\nВ некоторых случаях также выполняется обратная синхронизация (например, для аккаунта Google)."</string>
+    <string name="data_usage_auto_sync_on_dialog" product="tablet" msgid="8581983093524041669">"Все изменения в аккаунтах на компьютере будут автоматически копироваться на устройство.\n\nВ некоторых случаях также выполняется обратная синхронизация (например, для аккаунта Google)."</string>
+    <string name="data_usage_auto_sync_on_dialog" product="default" msgid="8651376294887142858">"Все изменения в аккаунтах на компьютере будут автоматически копироваться на устройство.\n\nВ некоторых случаях также выполняется обратная синхронизация (например, для аккаунта Google)."</string>
     <string name="data_usage_auto_sync_off_dialog_title" msgid="9013139130490125793">"Отключить автосинхронизацию?"</string>
     <string name="data_usage_auto_sync_off_dialog" msgid="4025938250775413864">"Расход трафика и энергии будет ниже, но для получения новых данных придется синхронизировать аккаунты вручную. Уведомления о наличии обновлений будут отключены."</string>
     <string name="data_usage_cycle_editor_title" msgid="1373797281540188533">"Сброс статистики"</string>
@@ -2479,6 +2489,9 @@
     <string name="data_usage_metered_mobile" msgid="5423305619126978393">"Мобильные сети"</string>
     <string name="data_usage_metered_wifi" msgid="1761738002328299714">"Сети Wi‑Fi с тарификацией"</string>
     <string name="data_usage_metered_wifi_disabled" msgid="727808462375941567">"Чтобы настроить сети с тарификацией трафика, включите Wi‑Fi."</string>
+    <string name="data_usage_metered_auto" msgid="1262028400911918865">"Автоматически"</string>
+    <string name="data_usage_metered_yes" msgid="9217539611385225894">"Сеть с тарификацией трафика"</string>
+    <string name="data_usage_metered_no" msgid="4025232961929071789">"Сеть без тарификации трафика"</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>
@@ -2570,9 +2583,6 @@
     <string name="backup_pw_set_button_text" msgid="2387480910044648795">"Сохранить пароль"</string>
     <string name="backup_pw_cancel_button_text" msgid="8845630125391744615">"Отмена"</string>
     <string name="additional_system_update_settings_list_item_title" msgid="214987609894661992">"Дополнительные обновления системы"</string>
-    <string name="selinux_status_disabled" msgid="924551035552323327">"Отключено"</string>
-    <string name="selinux_status_permissive" msgid="6004965534713398778">"Только предупреждение"</string>
-    <string name="selinux_status_enforcing" msgid="2252703756208463329">"Блокировка"</string>
     <string name="ssl_ca_cert_warning" msgid="2045866713601984673">"Сеть может отслеживаться"</string>
     <string name="done_button" msgid="1991471253042622230">"Готово"</string>
     <plurals name="ssl_ca_cert_dialog_title" formatted="false" msgid="7145092748045794650">
@@ -2780,6 +2790,7 @@
       <item quantity="many">Показать %d скрытых объектов</item>
       <item quantity="other">Показать %d скрытых объекта</item>
     </plurals>
+    <string name="dashboard_suggestion_condition_footer_content_description" msgid="2898588191174845961">"Свернуть"</string>
     <string name="network_dashboard_title" msgid="4771589228992391573">"Сеть и Интернет"</string>
     <string name="network_dashboard_summary_mobile" msgid="3851083934739500429">"моб. сети"</string>
     <string name="network_dashboard_summary_data_usage" msgid="3843261364705042212">"передача данных"</string>
@@ -2874,7 +2885,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>
@@ -2884,8 +2895,14 @@
       <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_settings_title" msgid="1066226840983908121">"Не беспокоить"</string>
+    <string name="zen_mode_behavior_settings_title" msgid="1463303933529313969">"Действия"</string>
+    <string name="zen_mode_behavior_allow_title" msgid="3845615648136218141">"Вкл. звуки и вибросигналы из"</string>
+    <string name="zen_mode_behavior_no_sound" msgid="1219626004723208056">"Без звука"</string>
+    <string name="zen_mode_behavior_total_silence" msgid="6716603819806610626">"Полная тишина"</string>
+    <string name="zen_mode_behavior_no_sound_except" msgid="4968477585788243114">"Без звука, кроме: <xliff:g id="CATEGORIES">%1$s</xliff:g>"</string>
+    <!-- no translation found for zen_mode_behavior_alarms_only (2423480992071472963) -->
+    <skip />
     <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>
@@ -2927,13 +2944,15 @@
     <string name="notifications_title" msgid="8086372779371204971">"Уведомления"</string>
     <string name="app_notifications_title" msgid="5810577805218003760">"Уведомления приложений"</string>
     <string name="notification_channel_title" msgid="2260666541030178452">"Категория уведомления"</string>
+    <string name="notification_group_title" msgid="7180506440133859601">"Группа категорий уведомлений"</string>
     <string name="notification_importance_title" msgid="848692592679312666">"Важность"</string>
-    <string name="notification_importance_unspecified" msgid="2196023702875112081">"На усмотрение приложения"</string>
+    <string name="notification_importance_unspecified" msgid="6622173510486113958">"Разрешить звуковой сигнал"</string>
     <string name="notification_importance_blocked" msgid="7938180808339386300">"Отключить уведомления"</string>
     <string name="notification_importance_min" msgid="5455049524984686275">"Без уведомлений"</string>
     <string name="notification_importance_low" msgid="8881468429453766553">"Без звука"</string>
     <string name="notification_importance_default" msgid="5958338024601957516">"Звук"</string>
     <string name="notification_importance_high" msgid="2082429479238228527">"Звук и всплывающее окно"</string>
+    <string name="notification_importance_high_silent" msgid="2667033773703765252">"Всплывающее окно"</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>
@@ -2976,10 +2995,17 @@
     <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="channel_group_notifications_off_desc" msgid="1620950416247316370">"Android блокирует эту группу уведомлений"</string>
     <string name="notification_channels" msgid="5346841743182627500">"Категории"</string>
     <string name="notification_channels_other" msgid="5645317113885788226">"Другие"</string>
+    <plurals name="notification_group_summary" formatted="false" msgid="3420621520561455358">
+      <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="no_channels" msgid="3077375508177744586">"Для этого приложения нет уведомлений."</string>
     <string name="app_settings_link" msgid="8894946007543660906">"Доп. настройки в приложении"</string>
     <string name="app_notification_listing_summary_zero" msgid="6482582965081108108">"Отключены для всех приложений"</string>
@@ -3060,12 +3086,14 @@
     <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>
+    <!-- no translation found for zen_mode_media_system_other (8900209390529859777) -->
+    <skip />
     <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="239685342222975733">"Если абонент звонит повторно в течение <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>
@@ -3098,6 +3126,7 @@
     <string name="zen_mode_screen_off_visual_interruptions" msgid="4850792880144382633">"При отключенном экране"</string>
     <string name="zen_mode_no_visual_interruptions" msgid="8742776003822778472">"При включенном и отключенном экране"</string>
     <string name="notification_app_settings_button" msgid="6685640230371477485">"Настройки уведомлений"</string>
+    <string name="suggestion_button_text" msgid="3275010948381252006">"ОК"</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>
@@ -3117,7 +3146,7 @@
     <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_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>
@@ -3294,6 +3323,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="sms_mirroring_pref" msgid="6475043279147376031">"Трансляция SMS"</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>
@@ -3362,7 +3392,7 @@
     <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="permit_write_settings" msgid="658555006453212691">"Разрешить изменение системных настроек"</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>
@@ -3463,9 +3493,12 @@
     <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">"Чтобы включить Telephony Monitor, перезагрузите устройство"</string>
+    <string name="connectivity_monitor_switch" msgid="9059759348648583421">"Connectivity Monitor"</string>
+    <string name="connectivity_monitor_switch_summary" msgid="2828658652378866401">"Обнаружив проблему подключения, Connectivity Monitor будет собирать журналы и предлагать пользователю отправить отчет об ошибке"</string>
+    <string name="connectivity_monitor_toast" msgid="5551859612881173028">"Чтобы включить Connectivity Monitor, перезагрузите устройство"</string>
     <string name="camera_hal_hdrplus_switch" msgid="8377365197105267466">"HDR+ HAL камеры"</string>
     <string name="camera_hal_hdrplus_toast" msgid="2063703797270055299">"Чтобы включить HDR+ HAL камеры, перезагрузите устройство"</string>
+    <string name="camera_laser_sensor_switch" msgid="8913588990743234440">"Лазерный датчик камеры"</string>
     <string name="ota_disable_automatic_update" msgid="2319639631655915050">"Автоматические обновления системы"</string>
     <string name="usage" msgid="2977875522080448986">"Передача данных"</string>
     <string name="cellular_data_usage" msgid="2155683719898158203">"Мобильный трафик"</string>
@@ -3493,7 +3526,7 @@
     <string name="data_warning" msgid="209133958008062117">"Предупреждение"</string>
     <string name="set_data_limit" msgid="2901526323210516923">"Установить лимит трафика"</string>
     <string name="data_limit" msgid="1885406964934590552">"Лимит трафика"</string>
-    <string name="data_usage_template" msgid="392191945602400904">"Использовано за период <xliff:g id="ID_2">%2$s</xliff:g>: <xliff:g id="ID_1">%1$s</xliff:g>"</string>
+    <string name="data_usage_template" msgid="2923744765873163859">"Использовано <xliff:g id="ID_1">%1$s</xliff:g> (<xliff:g id="ID_2">%2$s</xliff:g>)"</string>
     <string name="configure" msgid="1029654422228677273">"Настроить"</string>
     <string name="data_usage_other_apps" msgid="3272872663517382050">"Другие приложения"</string>
     <plurals name="data_saver_unrestricted_summary" formatted="false" msgid="2635267833484232703">
@@ -3566,7 +3599,7 @@
     <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="387052719462473500">"Выберите параметры для информации на заблокированном экране"</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="8483187649355540109">"Помощь и советы"</string>
@@ -3574,7 +3607,7 @@
     <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>
+    <string name="bluetooth_disabled" msgid="6244000672828617410">"Отключено"</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>
@@ -3657,14 +3690,14 @@
     <string name="ambient_display_title" product="default" msgid="5144814600610448504">"Просмотр времени и уведомлений двойным нажатием"</string>
     <string name="ambient_display_title" product="tablet" msgid="8688795028609563837">"Просмотр времени и уведомлений двойным нажатием"</string>
     <string name="ambient_display_title" product="device" msgid="3423781975742145894">"Просмотр времени и уведомлений двойным нажатием"</string>
-    <string name="ambient_display_summary" msgid="525662960806416373">"Чтобы увидеть время, значки уведомлений и другую информацию, дважды коснитесь экрана."</string>
+    <string name="ambient_display_summary" msgid="525662960806416373">"Чтобы увидеть время, значки уведомлений и другую информацию, дважды коснитесь экрана"</string>
     <string name="ambient_display_suggestion_summary" msgid="5987443721392571847">"Проверять уведомления при отключенном экране"</string>
     <string name="ambient_display_pickup_title" product="default" msgid="818688002837687268">"Поднять, чтобы проверить уведомления"</string>
     <string name="ambient_display_pickup_title" product="tablet" msgid="4455864282995698097">"Просмотр уведомлений в вертикальном положении планшета"</string>
     <string name="ambient_display_pickup_title" product="device" msgid="5380534405773531175">"Просмотр уведомлений в вертикальном положении устройства"</string>
-    <string name="ambient_display_pickup_summary" product="default" msgid="4567020486787561873">"Чтобы увидеть время, значки уведомлений и другую информацию, возьмите телефон."</string>
-    <string name="ambient_display_pickup_summary" product="tablet" msgid="5435283849947236648">"Чтобы увидеть время, значки уведомлений и другую информацию, возьмите планшет."</string>
-    <string name="ambient_display_pickup_summary" product="device" msgid="8256669101643381568">"Чтобы увидеть время, значки уведомлений и другую информацию, возьмите устройство."</string>
+    <string name="ambient_display_pickup_summary" product="default" msgid="4567020486787561873">"Чтобы увидеть время, значки уведомлений и другую информацию, возьмите телефон"</string>
+    <string name="ambient_display_pickup_summary" product="tablet" msgid="5435283849947236648">"Чтобы увидеть время, значки уведомлений и другую информацию, возьмите планшет"</string>
+    <string name="ambient_display_pickup_summary" product="device" msgid="8256669101643381568">"Чтобы увидеть время, значки уведомлений и другую информацию, возьмите устройство"</string>
     <string name="ambient_display_pickup_suggestion_summary" msgid="7014700589991761035">"Проверять уведомления при отключенном экране"</string>
     <string name="fingerprint_swipe_for_notifications_title" msgid="5816346492253270243">"Использовать сканер отпечатков для просмотра уведомлений"</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="default" msgid="1770661868393713922">"Чтобы увидеть уведомления, проведите вниз по сканеру отпечатков пальцев на задней панели телефона"</string>
@@ -3682,7 +3715,7 @@
     <string name="web_action_enable_title" msgid="4051513950976670853">"Приложения с мгновенным запуском"</string>
     <string name="web_action_enable_summary" msgid="3108127559723396382">"Открывать ссылки в приложениях, даже если они не установлены на устройстве"</string>
     <string name="web_action_section_title" msgid="7364647086538399136">"Приложения с мгновенным запуском"</string>
-    <string name="instant_apps_account" msgid="1433620209791992528">"Аккаунт для приложений с мгновенным запуском"</string>
+    <string name="instant_apps_settings" msgid="8827777916518348213">"Настройки приложений с мгновенным запуском"</string>
     <string name="domain_url_section_title" msgid="7046835219056428883">"Установленные приложения"</string>
     <string name="automatic_storage_manager_activation_warning" msgid="6353100011690933254">"Память устройства теперь управляется менеджером хранилища"</string>
     <string name="account_for_section_header" msgid="5356566418548737121">"Аккаунты для пользователя <xliff:g id="USER_NAME">%1$s</xliff:g>"</string>
@@ -3733,7 +3766,9 @@
     <string name="enterprise_privacy_always_on_vpn_personal" msgid="9217774730260037434">"Постоянная VPN включена в вашем личном профиле"</string>
     <string name="enterprise_privacy_always_on_vpn_work" msgid="7244472958208315814">"Постоянная VPN включена в вашем рабочем профиле"</string>
     <string name="enterprise_privacy_global_http_proxy" msgid="7936664553416257333">"Выбран глобальный прокси-сервер HTTP"</string>
-    <string name="enterprise_privacy_ca_certs" msgid="5885892204903688909">"Надежные сертификаты"</string>
+    <string name="enterprise_privacy_ca_certs_device" msgid="2019652712782510262">"Надежные сертификаты"</string>
+    <string name="enterprise_privacy_ca_certs_personal" msgid="2279084820904076599">"Надежные сертификаты в персональном профиле"</string>
+    <string name="enterprise_privacy_ca_certs_work" msgid="6187377647815301809">"Надежные сертификаты в рабочем профиле"</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>
@@ -3806,6 +3841,8 @@
     <string name="carrier_provisioning" msgid="4398683675591893169">"Сведения об операторе"</string>
     <string name="trigger_carrier_provisioning" msgid="3434865918009286187">"Запустить синхронизацию оператора"</string>
     <string name="new_device_suggestion_title" msgid="698847081680980774">"Что нового?"</string>
-    <string name="new_device_suggestion_summary" msgid="7172709269203435870">"5 функций, которые вам пригодятся"</string>
+    <string name="new_device_suggestion_summary" product="default" msgid="206396571522515855">"Познакомьтесь со своим новым телефоном"</string>
+    <string name="new_device_suggestion_summary" product="tablet" msgid="393751455688210956">"Познакомьтесь со своим новым планшетом"</string>
+    <string name="new_device_suggestion_summary" product="device" msgid="2939870049868336652">"Познакомьтесь со своим новым устройством"</string>
     <string name="disabled_low_ram_device" msgid="3751578499721173344">"Функция недоступна на этом устройстве."</string>
 </resources>
diff --git a/res/values-si/arrays.xml b/res/values-si/arrays.xml
index aa1a012..fb0c577 100644
--- a/res/values-si/arrays.xml
+++ b/res/values-si/arrays.xml
@@ -100,8 +100,6 @@
     <!-- no translation found for wifi_security_no_eap:0 (2084555984818107151) -->
     <!-- no translation found for wifi_security_no_eap:1 (397579322683471524) -->
     <!-- no translation found for wifi_security_no_eap:2 (1968820975358150484) -->
-    <!-- no translation found for wifi_ap_security:0 (5251664683198623324) -->
-    <!-- no translation found for wifi_ap_security:1 (7989073072260294673) -->
   <string-array name="wifi_eap_method">
     <item msgid="1160193392455075561">"PEAP"</item>
     <item msgid="7981731051382306293">"TLS"</item>
diff --git a/res/values-si/strings.xml b/res/values-si/strings.xml
index e4fbae5..243ee45 100644
--- a/res/values-si/strings.xml
+++ b/res/values-si/strings.xml
@@ -166,7 +166,7 @@
     <string name="bluetooth_map_acceptance_dialog_text" msgid="8712508202081143737">"%1$s හට ඔබගේ පණිවිඩ වෙත ප්‍රවේශ විමට අවශ්‍යයි. %2$s හට ප්‍රවේශය දෙන්නද?"</string>
     <string name="bluetooth_sap_request" msgid="2669762224045354417">"SIM කාඩ්පත් ප්‍රවේශය ඉල්ලීම"</string>
     <string name="bluetooth_sap_acceptance_dialog_text" msgid="4414253873553608690">"<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g> හට ඔබේ SIM කාඩ්පත වෙත පිවිසීමට අවශ්‍යයි. SIM කාඩ්පතට ප්‍රවේශය ලබා දිම ඔබේ උපාංගයට සබැඳුම් කාල සීමාව සඳහා දත්ත සබැඳුම් හැකියාව අබල කරනු ඇත. <xliff:g id="DEVICE_NAME_1">%2$s?</xliff:g> වෙත ප්‍රවේශය ලබා දෙන්න"</string>
-    <string name="bluetooth_device_name_summary" msgid="4757990010751789977">"වෙනත් උපාංගවලට <xliff:g id="DEVICE_NAME">^1</xliff:g> ලෙස දෘශ්‍යමානයි"</string>
+    <string name="bluetooth_device_name_summary" msgid="522235742194965734">"වෙනත් උපාංගවලට <xliff:g id="DEVICE_NAME">^1</xliff:g> ලෙස දෘශ්‍යමානයි"</string>
     <string name="bluetooth_paired_device_title" msgid="8638994696317952019">"ඔබගේ උපාංග"</string>
     <string name="bluetooth_pairing_page_title" msgid="7712127387361962608">"නව උපාංගය යුගල කරන්න"</string>
     <string name="date_and_time" msgid="9062980487860757694">"දිනය සහ වේලාව"</string>
@@ -312,6 +312,8 @@
     <string name="zone_auto" msgid="334783869352026648">"ස්වයංක්‍රිය කාල කලාපය"</string>
     <string name="zone_auto_summaryOn" msgid="6142830927278458314">"ජාලයෙන්-සැපයූ වේලා කලාපය භාවිතා කරන්න"</string>
     <string name="zone_auto_summaryOff" msgid="2597745783162041390">"ජාලයෙන්-සැපයූ වේලා කලාපය භාවිතා කරන්න"</string>
+    <string name="date_time_24hour_auto" msgid="2117383168985653422">"ස්වයංක්‍රිය පැය 24 ආකෘතිය"</string>
+    <string name="date_time_24hour_auto_summary" msgid="6351812925651480277">"පෙදෙසි පෙරනිමි භාවිතා කරන්න"</string>
     <string name="date_time_24hour_title" msgid="3203537578602803850">"පැය 24 ආකාරය"</string>
     <string name="date_time_24hour" msgid="1193032284921000063">"පැය 24 ආකාරය භාවිත කරන්න"</string>
     <string name="date_time_set_time_title" msgid="6296795651349047016">"වේලාව"</string>
@@ -341,7 +343,7 @@
     <string name="Accounts_settings_title" msgid="1643879107901699406">"ගිණුම්"</string>
     <string name="location_settings_title" msgid="1369675479310751735">"ස්ථානය"</string>
     <string name="account_settings_title" msgid="626177544686329806">"ගිණුම්"</string>
-    <string name="security_settings_title" msgid="4918904614964215087">"ආරක්ෂාව සහ පිහිටීම"</string>
+    <string name="security_settings_title" msgid="4918904614964215087">"ආරක්ෂාව සහ ස්ථානය"</string>
     <string name="encryption_and_credential_settings_title" msgid="6514904533438791561">"සංකේතනය සහ අක්තපත්‍ර"</string>
     <string name="encryption_and_credential_settings_summary" product="default" msgid="8721883002237981248">"දුරකතනය සංකේතනය කර ඇත"</string>
     <string name="encryption_and_credential_settings_summary" product="tablet" msgid="7200428573872395685">"උපාංගය සංකේතිතයි"</string>
@@ -372,6 +374,9 @@
     <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="1961957425135180242">"ඊළඟ"</string>
+    <string name="setup_fingerprint_enroll_skip_title" msgid="362050541117362034">"ඇඟිලි සලකුණ මඟ හරින්නද?"</string>
+    <string name="setup_fingerprint_enroll_skip_after_adding_lock_text" msgid="958990414356204763">"ඇඟිලි සලකුණු සැකසීම මිනිත්තුවක් හෝ දෙකක් පමණක් ගනී. ඔබ මෙය මඟ හරින්නේ නම්, ඔබට පසුව ඔබගේ ඇඟිලි සලකුණු සැකසීම් තුළ සැකසිය හැක."</string>
+    <string name="lock_screen_intro_skip_title" msgid="4988210105913705679">"තිර අගුල මග හරින්නද?"</string>
     <string name="lock_screen_intro_skip_dialog_text_frp" product="tablet" msgid="1581834104051243425">"උපාංග ආරක්ෂණ විශේෂාංග ක්‍රියාත්මක නොකරනු ඇත. මෙම ටැබ්ලට් පරිගණකය නැති වුවහොත්, සොරකම් කළහොත්, හෝ යළි සැකසුවහොත් වෙනත් අය එය භාවිත කිරීම වැළැක්වීමට ඔබට නොහැකි වනු ඇත."</string>
     <string name="lock_screen_intro_skip_dialog_text_frp" product="device" msgid="4629503416877189572">"උපාංග ආරක්ෂණ විශේෂාංග ක්‍රියාත්මක නොකරනු ඇත. මෙම උපාංගය නැති වුවහොත්, සොරකම් කළහොත්, හෝ යළි සැකසුවහොත් වෙනත් අය එය භාවිත කිරීම වැළැක්වීමට ඔබට නොහැකි වනු ඇත."</string>
     <string name="lock_screen_intro_skip_dialog_text_frp" product="default" msgid="2423428240245737909">"උපාංග ආරක්ෂණ විශේෂාංග ක්‍රියාත්මක නොකරනු ඇත. මෙම දුරකථනය නැති වුවහොත්, සොරකම් කළහොත්, හෝ යළි සැකසුවහොත් වෙනත් අය එය භාවිත කිරීම වැළැක්වීමට ඔබට නොහැකි වනු ඇත."</string>
@@ -457,7 +462,7 @@
     <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="lock_settings_picker_fingerprint_added_security_message" msgid="5768002109707648463">"අමතර ආරක්ෂාව සඳහා, උපස්ථ තිර අගුලක් සකසන්න."</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>
@@ -588,6 +593,7 @@
     <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="lockpassword_clear_label" msgid="5724429464960458155">"හිස් කරන්න"</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>
@@ -781,6 +787,7 @@
     <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,6 +824,8 @@
     <string name="wifi_wps_available_first_item" msgid="4422547079984583502">"WPS ඇත"</string>
     <string name="wifi_wps_available_second_item" msgid="8427520131718215301">" (WPS පවතී)"</string>
     <string name="wifi_wps_nfc_enter_password" msgid="2288214226916117159">"ඔබගේ ජාල මුරපදය ඇතුළත් කරන්න"</string>
+    <string name="wifi_carrier_connect" msgid="8174696557882299911">"වාහක Wi-Fi ජාලය"</string>
+    <string name="wifi_carrier_content" msgid="4634077285415851933">"<xliff:g id="NAME">%1%s</xliff:g> හරහා සම්බන්ධ කරන්න"</string>
     <string name="wifi_scan_always_turnon_message" msgid="203123538572122989">"ස්ථාන නිරවද්‍යතාවය වැඩි කිරීමට සහ වෙනත් අරමුණු සඳහා, Wi-Fi අක්‍රිය වුවද <xliff:g id="APP_NAME">%1$s</xliff:g>  හට ජාල පරිලෝකනය සක්‍රිය කිරීමට අවශ්‍යය. \n\nපරිලෝකනය අවශ්‍ය සියලු යෙදුම් සඳහා මෙයට අවසර දෙන්නේ ද?"</string>
     <string name="wifi_scan_always_turnoff_message" msgid="5538901671131941043">"මෙය අක්‍රිය කිරීමට, ඉතිරී ගිය මෙනුව තුළ උසස් වෙත යන්න."</string>
     <string name="wifi_scan_always_confirm_allow" msgid="5355973075896817232">"අවසර දෙන්න"</string>
@@ -834,6 +843,7 @@
     <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_modify" msgid="6100248070440710782">"වෙනස් කරන්න"</string>
     <string name="wifi_failed_forget_message" msgid="1348172929201654986">"ජාලය අමතක කිරීම අසාර්ථක වුණි"</string>
     <string name="wifi_save" msgid="3331121567988522826">"සුරකින්න"</string>
     <string name="wifi_failed_save_message" msgid="6650004874143815692">"ජාලය සුරැකීම අසාර්ථක වුණි"</string>
@@ -846,6 +856,7 @@
     <string name="wifi_advanced_titlebar" msgid="4485841401774142908">"උසස් 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_title" msgid="3471132676909349382">"ජාල තොරතුරු"</string>
     <string name="wifi_details_subnet_mask" msgid="6720279144174924410">"සබ්නෙට් මාස්ක්"</string>
     <string name="wifi_details_dns" msgid="8648826607751830768">"DNS"</string>
     <string name="wifi_details_ipv6_address_header" msgid="6734119149106422148">"IPv6 ලිපින"</string>
@@ -878,16 +889,15 @@
     <string name="wifi_p2p_cancel_connect_title" msgid="255267538099324413">"ආරාධනාව අවලංගු කරන්නද?"</string>
     <string name="wifi_p2p_cancel_connect_message" msgid="7477756213423749402">"<xliff:g id="PEER_NAME">%1$s</xliff:g> සමඟ සම්බන්ධ වීමට ඇති ආරාධනාව අවලංගු කිරීමට ඔබට අවශ්‍යද?"</string>
     <string name="wifi_p2p_delete_group_message" msgid="834559380069647086">"මෙම කණ්ඩායම අමතකද?"</string>
-    <string name="wifi_tether_checkbox_text" msgid="1847167643625779136">"ජංගම Wi-Fi හොට්ස්පොට්"</string>
     <string name="wifi_hotspot_checkbox_text" msgid="7763495093333664887">"Wi-Fi හොට්ස්පොට්"</string>
     <string name="wifi_hotspot_off_subtext" msgid="5466126533609394170">"වෙනත් උපාංග සමග අන්තර්ජාලය හෝ අන්තර්ගතය බෙදා නොගනී"</string>
     <string name="wifi_hotspot_tethering_on_subtext" product="tablet" msgid="5752490509369962007">"හොට්ස්පොට් හරහා මෙම ටැබ්ලට් පරිගණකයේ අන්තර්ජාල සබැඳුම බෙදා ගනිමින්"</string>
     <string name="wifi_hotspot_tethering_on_subtext" product="default" msgid="6461075246164300670">"හොට්ස්පොට් හරහා මෙම දුරකථනයේ අන්තර්ජාල සබැඳුම බෙදා ගනිමින්"</string>
     <string name="wifi_hotspot_on_local_only_subtext" msgid="2068110388011294735">"යෙදුම අන්තර්ගතය බෙදා ගනිමින් සිටී. අන්තර්ජාල සබැඳුමක් බෙදා ගැනීමට, හොට්ස්පොට් ක්‍රියාවිරහිත කර, අනතුරුව ක්‍රියාත්මක කරන්න"</string>
-    <string name="wifi_hotspot_name_title" msgid="1341735529132128887">"Wi-Fi නම"</string>
+    <string name="wifi_hotspot_name_title" msgid="8237000746618636778">"හොට්ස්පොට් නම"</string>
     <string name="wifi_hotspot_name_summary_connecting" msgid="3378299995508671967">"<xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g> ක්‍රියාත්මක කරමින්..."</string>
     <string name="wifi_hotspot_name_summary_connected" msgid="3888672084861445362">"වෙනත් උපාංගවලට <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g> වෙත සම්බන්ධ විය හැකිය"</string>
-    <string name="wifi_hotspot_password_title" msgid="1955592302902091281">"Wi-Fi මුරපදය"</string>
+    <string name="wifi_hotspot_password_title" msgid="8676859981917573801">"හොට්ස්පොට් මුරපදය"</string>
     <string name="wifi_hotspot_ap_band_title" msgid="1165801173359290681">"AP කලාපය"</string>
     <string name="wifi_hotspot_footer_info_regular" msgid="1203489406068036455">"ඔබගේ අනෙකුත් උපාංග සඳහා Wi-Fi ජාලයක් තැනීමට හොට්ස්පොට් භාවිත කරන්න. හොට්ස්පොට් ඔබගේ ජංගම දත්ත සබැඳුම භාවිත කරමින් අන්තර්ජාල සපයයි. අමතර ජංගම දත්ත ගාස්තු අදාළ විය හැකිය."</string>
     <string name="wifi_hotspot_footer_info_local_only" msgid="857988412470694109">"යෙදුම් අවට උපාංග සමග අන්තර්ගතය බෙදා ගැනීමට හොට්ස්පොට් එකක් සෑදිය හැකිය."</string>
@@ -898,7 +908,6 @@
     <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">"Wi-Fi ඇමතීම"</string>
     <string name="wifi_calling_suggestion_title" msgid="9008010480466359578">"Wi-Fi ඇමතුම ක්‍රියාත්මක කරන්න"</string>
@@ -939,7 +948,7 @@
     <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="emergency_address_summary" msgid="3266760199681945746">"ඔබ WiFi භාවිත කර හදිසි අවස්ථා ඇමතුමක් කළ විට හදිසි අවස්ථා සේවා විසින් භාවිත කරන ලිපිනය"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"සංදර්ශකය"</string>
     <string name="sound_settings" msgid="5534671337768745343">"ශබ්ද"</string>
     <string name="all_volume_title" msgid="4296957391257836961">"ශබ්ද තීව්‍රතා"</string>
@@ -993,6 +1002,7 @@
     <string name="search_settings" msgid="1910951467596035063">"සෙවීම"</string>
     <string name="search_settings_summary" msgid="9205656546570654169">"සෙවුම් සැකසීම් සහ ඉතිහාසය කළමනාකරණය කරන්න"</string>
     <string name="search_settings_no_results" msgid="8799027492641230999">"ප්‍රතිඵල නැත"</string>
+    <string name="search_clear_history" msgid="4196658962573162457">"ඉතිහාසය හිස් කරන්න"</string>
     <string name="display_settings" msgid="7965901687241669598">"සංදර්ශකය"</string>
     <string name="accelerometer_title" msgid="7854608399547349157">"ස්වයංක්‍රීයව-භ්‍රමණය වන තීරය"</string>
     <string name="color_mode_title" msgid="3159275920408338215">"විචිත්‍ර වර්ණ"</string>
@@ -1122,7 +1132,6 @@
     <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>
     <string name="device_status_activity_title" msgid="1411201799384697904">"තත්වය"</string>
     <string name="device_status" msgid="607405385799807324">"තත්වය"</string>
@@ -1150,7 +1159,6 @@
     <string name="status_wifi_mac_address" msgid="2202206684020765378">"Wi‑Fi MAC ලිපිනය"</string>
     <string name="status_bt_address" msgid="4195174192087439720">"බ්ලූටූත් ලිපිනය"</string>
     <string name="status_serial_number" msgid="2257111183374628137">"අනුක්‍රමාංකය"</string>
-    <string name="status_unavailable" msgid="7862009036663793314">"ලබාගත නොහැක"</string>
     <string name="status_up_time" msgid="7294859476816760399">"ක්‍රියාකාරීව ඇති කාලය"</string>
     <string name="status_awake_time" msgid="2393949909051183652">"අවදි වේලාව"</string>
     <string name="internal_memory" msgid="9129595691484260784">"අභ්‍යන්තර ආචයනය"</string>
@@ -1326,7 +1334,8 @@
     <string name="menu_restore" msgid="8260067415075573273">"සුපුරුදු වෙත යළි සකසන්න"</string>
     <string name="restore_default_apn_completed" msgid="2824775307377604897">"සුපුරුදු APN සැකසීම නැවත සැකසීම සම්පූර්ණ කරන ලදි."</string>
     <string name="reset_dashboard_title" msgid="6254873816990678620">"යළි සැකසීමේ විකල්ප"</string>
-    <string name="reset_network_title" msgid="6166025966016873843">"Wi-Fi, ජංගම සහ බ්ලූටූත් යළි සකසන්න"</string>
+    <string name="reset_dashboard_summary" msgid="4851012632493522755">"ජාල, යෙදුම්, හෝ උපාංගය යළි සැකසිය හැකිය"</string>
+    <string name="reset_network_title" msgid="6166025966016873843">"Wi-Fi, ජංගම, බ්ලූටූත් යළි සක."</string>
     <string name="reset_network_desc" msgid="5547979398298881406">"මෙය, පහත ඒවා ඇතුළුව සියලු ජාල සැකසීම් යළි සකසනු ඇත:\n\n"<li>"Wi‑Fi"</li>\n<li>"ජංගම දත්ත"</li>\n<li>"බ්ලූටූත්"</li></string>
     <string name="reset_network_button_text" msgid="2035676527471089853">"සැකසීම් යළි පිහිටුවන ලදි"</string>
     <string name="reset_network_final_desc" msgid="6388371121099245116">"සියලු ජාල සැකසීම් යළි පිහිටුවන්නද? ඔබට මෙම ක්‍රියාව ආපසු හැරවිය නොහැකිය!"</string>
@@ -1334,17 +1343,14 @@
     <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="6617679904229218425">"සියලු දත්ත මකන්න (කර්මාන්ත ශාලා යළි සැකසීම)"</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>
-    </plurals>
-    <string name="master_clear_summary" msgid="6902443944660426951">"අභ්‍යන්තර ආචයනය සහ සියලු දත්ත යළි පිහිටුවනු ලැබේ"</string>
+    <string name="master_clear_title" msgid="3531267871084279512">"සියලු දත්ත මකන්න (කර්මාන්තශාලා යළි සැකසීම)"</string>
     <string name="master_clear_desc" product="tablet" msgid="9146059417023157222">"ඔබගේ ටැබ්ලටයේ "<b>"අභ්‍යන්තර ආචනය"</b>", සියලු දත්ත මකයි:\n\n"<li>"ඔබගේ Google ගිණුම"</li>\n<li>"පද්ධති සහ යෙදුම් දත්ත සහ සැකසීම්"</li>\n<li>"බාගත යෙදුම්"</li>" අන්තර්ගතය."</string>
     <string name="master_clear_desc" product="default" msgid="4800386183314202571">"මෙය ඔබගේ දුරකථනයේ "<b>"අභ්‍යන්තර ගබඩාවේ"</b>" සියලු දත්ත මකයි:\n\n"<li>"ඔබගේ Google ගිණුම"</li>\n<li>"පද්ධති සහ යෙදුම් දත්ත සහ සැකසීම්"</li>\n<li>"බාගත යෙදුම්"</li>" අන්තර්ගතය."</string>
     <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"ඔබ දැනට පහත ගිණුම් වෙත පුරනය වී සිටියි:\n"</string>
     <string name="master_clear_other_users_present" product="default" msgid="5161423070702470742">\n\n"මෙම උපාංගයේ වෙනත් පරිශීලකයින් සිටි.\n"</string>
     <string name="master_clear_desc_also_erases_external" msgid="1903185203791274237"><li>"සංගීතය"</li>\n<li>"ඡායාරූප"</li>\n<li>"වෙනත් පරිශීලක දත්ත"</li></string>
+    <string name="master_clear_desc_also_erases_esim" msgid="312352697653096008"><li>"eSIM හි ගෙන යයි"</li></string>
+    <string name="master_clear_desc_no_cancel_mobile_plan" msgid="5460926449093211144">\n\n"මෙය ඔබගේ ජංගම සේවා සැලසුම අවලංගු නොකරනු ඇත."</string>
     <string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="7744115866662613411">\n\n"සංගීත, පින්තූර, සහ වෙනත් පරිශීලක දත්ත මැකීමට, "<b>"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>
@@ -1461,15 +1467,16 @@
     <string name="settings_safetylegal_activity_title" msgid="6901214628496951727">"ආරක්ෂක තොරතුරු"</string>
     <string name="settings_safetylegal_activity_unreachable" msgid="250674109915859456">"ඔබට දත්ත සම්බන්ධතාවයක් නොමැත. දැන් මෙම තොරතුරු නැරඹීමට, අන්තර්ජාලයට සම්බන්ධ ඕනෑම පරිගණකයකින් %s වෙත යන්න."</string>
     <string name="settings_safetylegal_activity_loading" msgid="8059022597639516348">"පූරණය වෙමින්..."</string>
-    <string name="lockpassword_choose_your_password_header" msgid="8624900666929394990">"ඔබගේ මුරපදය තෝරන්න"</string>
-    <string name="lockpassword_choose_your_password_header_for_fingerprint" msgid="6624409510609085450">"ඇඟිලි සලකුණ භාවිත කිරීමට, මුරපදයක් සකසන්න"</string>
-    <string name="lockpassword_choose_your_pattern_header" msgid="6949761069941694050">"ඔබගේ රටාව තෝරන්න"</string>
-    <string name="lockpassword_choose_your_pattern_header_for_fingerprint" msgid="5901096361617543819">"ඇඟිලි සලකුණ භාවිත කිරීමට, රටාවක් සකසන්න"</string>
-    <string name="lockpassword_choose_your_pin_header" msgid="7598849519816138302">"ඔබගේ PIN තෝරාගන්න"</string>
-    <string name="lockpassword_choose_your_pin_header_for_fingerprint" msgid="765344692615917183">"ඇඟිලි සලකුණ භාවිත කිරීමට, PIN අංකයක් සකසන්න"</string>
-    <string name="lockpassword_confirm_your_password_header" msgid="6308478184889846633">"ඔබගේ මුරපදය තහවුරු කරන්න"</string>
+    <string name="lockpassword_choose_your_screen_lock_header" msgid="3872462096767152394">"තිර අගුලක් සකසන්න"</string>
+    <string name="lockpassword_choose_your_password_message" msgid="1197569283524841412">"ආරක්ෂාව සඳහා, මුරපදයක් සකසන්න"</string>
+    <string name="lockpassword_choose_your_password_header_for_fingerprint" msgid="2541818487015343503">"ඇඟිලි සලකුණ භාවිත කිරීමට, මුරපදයක් සකසන්න"</string>
+    <string name="lockpassword_choose_your_pattern_header_for_fingerprint" msgid="7709785406243556723">"ඇඟිලි සලකුණ භාවිත කිරීමට, රටාවක් සකසන්න"</string>
+    <string name="lockpassword_choose_your_pin_message" msgid="1875420718677275646">"ආරක්ෂාව සඳහා, PIN එකක් සකසන්න"</string>
+    <string name="lockpassword_choose_your_pin_header_for_fingerprint" msgid="1549639053195796674">"ඇඟිලි සලකුණ භාවිත කිරීමට, PIN අංකයක් සකසන්න"</string>
+    <string name="lockpassword_choose_your_pattern_message" msgid="5986983400689720015">"ආරක්ෂාව සඳහා, රටාවක් සකසන්න"</string>
+    <string name="lockpassword_confirm_your_password_header" msgid="1266027268220850931">"ඔබගේ මුරපදය නැවතත් ඇතුළු කරන්න"</string>
     <string name="lockpassword_confirm_your_pattern_header" msgid="7543433733032330821">"ඔබගේ රටාව තහවුරු කරන්න"</string>
-    <string name="lockpassword_confirm_your_pin_header" msgid="49038294648213197">"ඔබගේ PIN තහවුරු කරන්න"</string>
+    <string name="lockpassword_confirm_your_pin_header" msgid="7744513791910572550">"ඔබගේ PIN අංකය නැවත ඇතුළු කරන්න"</string>
     <string name="lockpassword_confirm_passwords_dont_match" msgid="5140892109439191415">"මුරපද නොගැලපේ"</string>
     <string name="lockpassword_confirm_pins_dont_match" msgid="7226244811505606217">"PIN නොගැලපේ"</string>
     <string name="lockpassword_choose_lock_generic_header" msgid="3811438094903786145">"අගුලු හැරීම තේරීම"</string>
@@ -1488,6 +1495,12 @@
     <string name="lockpassword_strong_auth_required_work_pattern" msgid="3003781907040522053">"අමතර ආරක්ෂාව සඳහා, ඔබේ කාර්යාල රටාව ඇතුලත් කරන්න"</string>
     <string name="lockpassword_strong_auth_required_work_pin" msgid="3367491332598821552">"අමතර ආරක්ෂාව සඳහා, ඔබේ කාර්යාල PIN එක ඇතුලත් කරන්න"</string>
     <string name="lockpassword_strong_auth_required_work_password" msgid="8159775129968582940">"අමතර ආරක්ෂාව සඳහා, ඔබේ කාර්යාල මුරපදය ඇතුලත් කරන්න"</string>
+    <string name="lockpassword_confirm_your_pattern_details_frp" msgid="6757336656791723193">"ඔබගේ දුරකථනය කර්මාන්තශාලා සැකසීම්වලට නැවත සකසා ඇත. මෙම දුරකථනය භාවිතා කිරීම සඳහා, ඔබගේ පෙර රටාව ඇතුළත් කරන්න."</string>
+    <string name="lockpassword_confirm_your_pin_details_frp" msgid="826520613445990470">"ඔබගේ දුරකථනය කර්මාන්තශාලා සැකසීම්වලට නැවත සකසා ඇත. මෙම දුරකථනය භාවිතා කිරීම සඳහා, ඔබගේ පෙර PIN අංකය ඇතුළත් කරන්න."</string>
+    <string name="lockpassword_confirm_your_password_details_frp" msgid="8944081074615739040">"ඔබගේ දුරකථනය කර්මාන්තශාලා සැකසීම්වලට නැවත සකසා ඇත. මෙම දුරකථනය භාවිතා කිරීම සඳහා, ඔබගේ පෙර මුරපදය ඇතුළත් කරන්න."</string>
+    <string name="lockpassword_confirm_your_pattern_header_frp" msgid="2898036091609128286">"රටාව තහවුරු කරන්න"</string>
+    <string name="lockpassword_confirm_your_pin_header_frp" msgid="4141601774778898803">"PIN අංකය තහවුරු කරන්න"</string>
+    <string name="lockpassword_confirm_your_password_header_frp" msgid="3762615419295360480">"මුරපදය තහවුරු කරන්න"</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>
@@ -1537,7 +1550,6 @@
     <string name="install_applications_title" msgid="4987712352256508946">"සියලුම යෙදුම් මූලාශ්‍ර වලට ඉඩ දෙන්න"</string>
     <string name="recent_app_category_title" msgid="6673071268966003928">"මෑතකදී විවෘත කරන ලද යෙදුම්"</string>
     <string name="see_all_apps_title" msgid="1317153498074308438">"සියලු යෙදුම් <xliff:g id="COUNT">%1$d</xliff:g> බලන්න"</string>
-    <string name="recent_app_summary" msgid="3366446669844932300">"<xliff:g id="TIME">^1</xliff:g>කට පෙර"</string>
     <string name="install_all_warning" product="tablet" msgid="8310489909586138165">"ඔබගේ ටැබ්ලටය සහ පෞද්ගලික දත්ත නොදන්නා යෙදුම් මඟින් තර්ජන එල්ල කිරීමේ හැකියාව වැඩිය. මෙම මුලාශ්‍රය මඟින් ලැබෙන යෙදුම් ස්ථාපනයෙන් සහ භාවිතයෙන් ඔබේ දුරකතනයට හෝ ඔබේ දත්ත වලට සිදුවන හානිය පිලිබඳ වගකීම ඔබ ලබා ගන්නා බවට එකඟ වේ."</string>
     <string name="install_all_warning" product="default" msgid="1952257127370115988">"ඔබගේ දුරකථනය සහ පෞද්ගලික දත්ත නොදන්නා යෙදුම් මඟින් තර්ජන එල්ල කිරීමේ හැකියාව වැඩිය. මෙම මුලාශ්‍රය මඟින් ලැබෙන යෙදුම් ස්ථාපනයෙන් සහ භාවිතයෙන් ඔබේ දුරකතනයට හෝ ඔබේ දත්ත වලට සිදුවන හානිය පිලිබඳ වගකීම ඔබ ලබා ගන්නා බවට එකඟ වේ."</string>
     <string name="advanced_settings" msgid="1777249286757067969">"උසස් සැකසුම්"</string>
@@ -1801,7 +1813,7 @@
     <string name="accessibility_settings_summary" msgid="981260486011624939">"තිර කියවන, සංදර්ශක, අන්තර්ක්‍රියා පාලන"</string>
     <string name="vision_settings_title" msgid="4204111425716868288">"දෘශ්‍ය සැකසීම්"</string>
     <string name="vision_settings_description" msgid="5679491180156408260">"ඔබට ඔබේ අවශ්‍යතාවන්ට ගැළපෙන පරිදි මෙම උපාංගය අභිරුචිකරණය කළ හැකිය. මෙම ප්‍රවේශ්‍යතා විශේෂාංග සැකසීම්වල පසුව වෙනස් කළ හැකිය."</string>
-    <string name="vision_settings_suggestion_title" msgid="917294957154878441">"ෆොන්ට තරම වැඩි කරන්න"</string>
+    <string name="vision_settings_suggestion_title" msgid="8058794060304707004">"ෆොන්ට තරම වෙනස් කරන්න"</string>
     <string name="screen_reader_category_title" msgid="7739154903913400641">"තිර කියවන"</string>
     <string name="audio_and_captions_category_title" msgid="3420727114421447524">"ශ්‍රව්‍ය සහ තිරය මත පෙළ"</string>
     <string name="display_category_title" msgid="685461049938269166">"සංදර්ශකය"</string>
@@ -1838,7 +1850,6 @@
     <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="preference_summary_default_combination" msgid="8532964268242666060">"<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>
@@ -1957,12 +1968,14 @@
     <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_whitelisted" msgid="7375400051141016808">"යෙදුම බැටරි භාවිතය සඳහා ප්‍රශස්තකරණය කිරීමට නොහැක"</string>
+    <string name="background_activity_warning_dialog_title" msgid="2216249969149568871">"පසුබිම් ක්‍රියාකාරිත්වය සීමා කරන්නද?"</string>
+    <string name="background_activity_warning_dialog_text" msgid="7049624449246121981">"ඔබ යෙදුමක පසුබිම් ක්‍රියාකාරිත්වය සීමා කළහොත්, එය වැරදි ලෙස ක්‍රියා කරනු ඇත"</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" msgid="6393929085382334341">"පූර්ණ ආරෝපණයේ සිට යෙදුම භාවිතය (<xliff:g id="RELATIVE_TIME">^1</xliff:g>)"</string>
+    <string name="power_usage_list_summary_device" msgid="4461926045610455423">"පූර්ණ ආරෝපණයේ සිට උපාංග භාවිතය (<xliff:g id="RELATIVE_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>
@@ -2208,14 +2221,14 @@
     <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">"අක්තපත්‍ර ආචයනය ඔබ භාවිතා කිරීමට පෙර අගුළු තිර PIN එකක් හෝ මුරපදයක් ඔබ දැමිය යුතුය."</string>
+    <string name="credentials_configure_lock_screen_hint" msgid="8058230497337529036">"ඔබට අක්තපත්‍ර ගබඩාව භාවිත කිරීමට හැකි වීමට පෙර, ඔබගේ උපාංගයට ආරක්ෂිත අගුලු තිරයක් තිබිය යුතුය"</string>
+    <string name="credentials_configure_lock_screen_button" msgid="253239765216055321">"අගුල සකසන්න"</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>
@@ -2335,8 +2348,6 @@
     <skip />
     <string name="cant_sync_dialog_title" msgid="2777238588398046285">"අතින් සමමුහුර්ත කළ නොහැක"</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 ආරම්භ කිරීමට, ඔබගේ PIN එක ඇතුළු කරන්න"</string>
     <string name="enter_pattern" msgid="4187435713036808566">"Android ආරම්භ කිරීමට, ඔබගේ රටාව අදින්න"</string>
@@ -2350,6 +2361,7 @@
     <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_plan_usage_manage_plans_button_text" msgid="8997761990902708162">"සැලසුම් කළමනාකරණය කරන්න"</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>
@@ -2435,6 +2447,9 @@
     <string name="data_usage_metered_mobile" msgid="5423305619126978393">"ජංගම ජාල"</string>
     <string name="data_usage_metered_wifi" msgid="1761738002328299714">"Wi-Fi ජාල මාපකය කරන ලදි"</string>
     <string name="data_usage_metered_wifi_disabled" msgid="727808462375941567">"මාපකය කරන ලද ජාල තේරීමට, Wi-Fi සක්‍රිය කරන්න."</string>
+    <string name="data_usage_metered_auto" msgid="1262028400911918865">"ස්වයංක්‍රිය"</string>
+    <string name="data_usage_metered_yes" msgid="9217539611385225894">"මනිනු ලැබේ"</string>
+    <string name="data_usage_metered_no" msgid="4025232961929071789">"මනිනු නොලැබේ"</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>
@@ -2526,9 +2541,6 @@
     <string name="backup_pw_set_button_text" msgid="2387480910044648795">"උපස්ථ මුරපදය සකසන්න"</string>
     <string name="backup_pw_cancel_button_text" msgid="8845630125391744615">"අවලංගු කරන්න"</string>
     <string name="additional_system_update_settings_list_item_title" msgid="214987609894661992">"අමතර පද්ධති යාවත්කාල කිරීම්"</string>
-    <string name="selinux_status_disabled" msgid="924551035552323327">"අබලයි"</string>
-    <string name="selinux_status_permissive" msgid="6004965534713398778">"අනුදත්"</string>
-    <string name="selinux_status_enforcing" msgid="2252703756208463329">"බල කරමින්"</string>
     <string name="ssl_ca_cert_warning" msgid="2045866713601984673">"ඇතැම් විට ජාලය නිරීක්ෂණය විය හැක"</string>
     <string name="done_button" msgid="1991471253042622230">"අවසන්"</string>
     <plurals name="ssl_ca_cert_dialog_title" formatted="false" msgid="7145092748045794650">
@@ -2726,6 +2738,7 @@
       <item quantity="one">සඟවන ලද අයිතම %dක් පෙන්වන්න</item>
       <item quantity="other">සඟවන ලද අයිතම %dක් පෙන්වන්න</item>
     </plurals>
+    <string name="dashboard_suggestion_condition_footer_content_description" msgid="2898588191174845961">"හකුළන්න"</string>
     <string name="network_dashboard_title" msgid="4771589228992391573">"ජාලය සහ අන්තර්ජාලය"</string>
     <string name="network_dashboard_summary_mobile" msgid="3851083934739500429">"ජංගම"</string>
     <string name="network_dashboard_summary_data_usage" msgid="3843261364705042212">"දත්ත භාවිතය"</string>
@@ -2828,8 +2841,14 @@
       <item quantity="one">ස්වයංක්‍රිය රීති <xliff:g id="ON_COUNT">%d</xliff:g>ක් සක්‍රියයි</item>
       <item quantity="other">ස්වයංක්‍රිය රීති <xliff:g id="ON_COUNT">%d</xliff:g>ක් සක්‍රියයි</item>
     </plurals>
-    <string name="zen_mode_settings_title" msgid="842308776768942600">"මනාපවලට බාධා ‍නොකරන්න"</string>
-    <string name="zen_mode_priority_settings_title" msgid="2623117023031824309">"ප්‍රමුඛතා පමණි ඉඩ දෙයි"</string>
+    <string name="zen_mode_settings_title" msgid="1066226840983908121">"බාධා නොකරන්න"</string>
+    <string name="zen_mode_behavior_settings_title" msgid="1463303933529313969">"හැසිරීම"</string>
+    <string name="zen_mode_behavior_allow_title" msgid="3845615648136218141">"ශබ්ද සහ කම්පනවලට ඉඩ දෙන්න"</string>
+    <string name="zen_mode_behavior_no_sound" msgid="1219626004723208056">"ශබ්ද නැත"</string>
+    <string name="zen_mode_behavior_total_silence" msgid="6716603819806610626">"ශබ්ද නැත (සම්පූර්ණ නිහඬතාව)"</string>
+    <string name="zen_mode_behavior_no_sound_except" msgid="4968477585788243114">"<xliff:g id="CATEGORIES">%1$s</xliff:g> හැර ශබ්ද නැත"</string>
+    <!-- no translation found for zen_mode_behavior_alarms_only (2423480992071472963) -->
+    <skip />
     <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>
@@ -2871,13 +2890,15 @@
     <string name="notifications_title" msgid="8086372779371204971">"දැනුම්දීම්"</string>
     <string name="app_notifications_title" msgid="5810577805218003760">"යෙදුම් දැනුම්දීම්"</string>
     <string name="notification_channel_title" msgid="2260666541030178452">"දැනුම්දීම් ප්‍රවර්ගය"</string>
+    <string name="notification_group_title" msgid="7180506440133859601">"දැනුම්දීම් ප්‍රවර්ග සමූහය"</string>
     <string name="notification_importance_title" msgid="848692592679312666">"වැදගත්කම"</string>
-    <string name="notification_importance_unspecified" msgid="2196023702875112081">"යෙදුමට තීරණය කිරීමට ඉඩ දෙන්න"</string>
+    <string name="notification_importance_unspecified" msgid="6622173510486113958">"ශබ්දයට ඉඩ දෙන්න"</string>
     <string name="notification_importance_blocked" msgid="7938180808339386300">"දැනුම්දීම් කිසිදා නොපෙන්වන්න"</string>
     <string name="notification_importance_min" msgid="5455049524984686275">"ශබ්ද හෝ දෘශ්‍ය බාධා නැත"</string>
     <string name="notification_importance_low" msgid="8881468429453766553">"ශබ්ද නැත"</string>
     <string name="notification_importance_default" msgid="5958338024601957516">"ශබ්ද කරන්න"</string>
     <string name="notification_importance_high" msgid="2082429479238228527">"ශබ්ද කර තිරය මත උත්පතනය කරන්න"</string>
+    <string name="notification_importance_high_silent" msgid="2667033773703765252">"තිරය මත උත්පතනය"</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>
@@ -2920,8 +2941,13 @@
     <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="channel_group_notifications_off_desc" msgid="1620950416247316370">"දැනුම්දීම් සමූහයක් මෙම උපාංගය මත දිස් වීම Android අවහිර කරමින් ඇත"</string>
     <string name="notification_channels" msgid="5346841743182627500">"ප්‍රවර්ග"</string>
     <string name="notification_channels_other" msgid="5645317113885788226">"වෙනත්"</string>
+    <plurals name="notification_group_summary" formatted="false" msgid="3420621520561455358">
+      <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="no_channels" msgid="3077375508177744586">"මෙම යෙදුම දැනුම්දීම් කිසිවක් පළ කර නැත"</string>
     <string name="app_settings_link" msgid="8894946007543660906">"අමතර සැකසීම් යෙදුම තුළ ඇත"</string>
     <string name="app_notification_listing_summary_zero" msgid="6482582965081108108">"සියලු යෙදුම් සඳහා සක්‍රීයයි"</string>
@@ -2998,12 +3024,14 @@
     <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>
+    <!-- no translation found for zen_mode_media_system_other (8900209390529859777) -->
+    <skip />
     <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="239685342222975733">"එකම පුද්ගලයා විනාඩි <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>
@@ -3032,6 +3060,7 @@
     <string name="zen_mode_screen_off_visual_interruptions" msgid="4850792880144382633">"තිරය ක්‍රියාවිරහිත විට"</string>
     <string name="zen_mode_no_visual_interruptions" msgid="8742776003822778472">"තිරය ක්‍රියාත්මක හෝ ක්‍රියාවිරහිත විට"</string>
     <string name="notification_app_settings_button" msgid="6685640230371477485">"දැනුම්දීම් සැකසීම්"</string>
+    <string name="suggestion_button_text" msgid="3275010948381252006">"හරි"</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>
@@ -3202,7 +3231,7 @@
     <string name="usb_use_charging_only" msgid="2180443097365214467">"මෙම උපාංගය ආරෝපණය කිරීම"</string>
     <string name="usb_use_charging_only_desc" msgid="3066256793008540627">"මෙම උපාංගය දැන් ආරෝපනය කරන්න"</string>
     <string name="usb_use_power_only" msgid="6426550616883919530">"බලය සැපයීම"</string>
-    <string name="usb_use_power_only_desc" msgid="3461232831015575152">"සම්බන්ධිත උපාංගය ආරෝපණය කරන්න. වැඩ කරන්නේ USB ආරෝපණය වෙත සහය දක්වන උපාංග සමඟ පමණි."</string>
+    <string name="usb_use_power_only_desc" msgid="3461232831015575152">"සම්බන්ධිත උපාංගය ආරෝපණය කරන්න. වැඩ කරන්නේ USB ආරෝපණයට  සහය දක්වන උපාංග සමඟ පමණි."</string>
     <string name="usb_use_file_transfers" msgid="7409600791007250137">"ගොනු මාරු කිරීම"</string>
     <string name="usb_use_file_transfers_desc" msgid="4235764784331804488">"වෙනත් උපාංගයකට ගොනු මාරු කරන්න"</string>
     <string name="usb_use_photo_transfers" msgid="7794775645350330454">"ඡායාරූප හුවමාරුව (PTP)"</string>
@@ -3216,6 +3245,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="sms_mirroring_pref" msgid="6475043279147376031">"SMS Mirroring"</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>
@@ -3282,7 +3312,7 @@
     <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="permit_write_settings" msgid="658555006453212691">"පද්ධති සැකසීම් වෙනස් කිරීමට ඉඩ දෙන්න"</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>
@@ -3377,9 +3407,12 @@
     <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">"Telephony Monitor වෙනස්කම සක්‍රිය කිරීමට, උපාංගය නැවත පණ ගන්වන්න"</string>
+    <string name="connectivity_monitor_switch" msgid="9059759348648583421">"සබැඳුම් හැකියා නිරීක්ෂකය"</string>
+    <string name="connectivity_monitor_switch_summary" msgid="2828658652378866401">"ConnectivityMonitor සබැඳුම් හැකියා ගැටලුවක් හඳුනා ගත් විට ලොග රැස් කිරීම සහ දෝෂයක් ගොනු කිරීමට පරිශීලකයා වෙත දැනුම්දීම ප්‍රේරණය කිරීම කරනු ඇත"</string>
+    <string name="connectivity_monitor_toast" msgid="5551859612881173028">"සබැඳුම් හැකියා නිරීක්ෂක වෙනස් කිරීම යෙදීමට, උපාංගය නැවත පණ ගන්වන්න"</string>
     <string name="camera_hal_hdrplus_switch" msgid="8377365197105267466">"කැමරා HAL HDR+"</string>
     <string name="camera_hal_hdrplus_toast" msgid="2063703797270055299">"කැමරා HAL HDR+ වෙනස් කිරීම යෙදීමට, උපාංගය නැවත පණ ගන්වන්න"</string>
+    <string name="camera_laser_sensor_switch" msgid="8913588990743234440">"කැමරා ලේසර් සංවේදකය"</string>
     <string name="ota_disable_automatic_update" msgid="2319639631655915050">"ස්වයංක්‍රිය පද්ධති යාවත්කාලීන"</string>
     <string name="usage" msgid="2977875522080448986">"භාවිතය"</string>
     <string name="cellular_data_usage" msgid="2155683719898158203">"ජංගම දත්ත භාවිතය"</string>
@@ -3405,7 +3438,7 @@
     <string name="data_warning" msgid="209133958008062117">"දත්ත අනතුරු ඇඟවීම"</string>
     <string name="set_data_limit" msgid="2901526323210516923">"දත්ත සීමාව සකසන්න"</string>
     <string name="data_limit" msgid="1885406964934590552">"දත්ත සීමාව"</string>
-    <string name="data_usage_template" msgid="392191945602400904">"<xliff:g id="ID_1">%1$s</xliff:g> <xliff:g id="ID_2">%2$s</xliff:g> අතර භාවිත විය"</string>
+    <string name="data_usage_template" msgid="2923744765873163859">"<xliff:g id="ID_1">%1$s</xliff:g> <xliff:g id="ID_2">%2$s</xliff:g> භාවිත කළ"</string>
     <string name="configure" msgid="1029654422228677273">"වින්‍යාස කිරීම"</string>
     <string name="data_usage_other_apps" msgid="3272872663517382050">"භාවිතය තුළ ඇතුළත් වෙනත් යෙදුම්"</string>
     <plurals name="data_saver_unrestricted_summary" formatted="false" msgid="2635267833484232703">
@@ -3474,7 +3507,7 @@
     <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="387052719462473500">"අගුලු තිරය මත පාලන තොරතුරු"</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="8483187649355540109">"සහාය සහ ඉඟි"</string>
@@ -3482,7 +3515,7 @@
     <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>
+    <string name="bluetooth_disabled" msgid="6244000672828617410">"ක්‍රියාවිරහිතයි"</string>
     <string name="bluetooth_connected_summary" msgid="7672528674593152862">"<xliff:g id="ID_1">%1$s</xliff:g> වෙත සම්බන්ධිතයි"</string>
     <string name="bluetooth_connected_multiple_devices_summary" msgid="9173661896296663932">"උපාංග කිහිපයකට සම්බන්ධිතයි"</string>
     <string name="demo_mode" msgid="2798762752209330277">"පද්ධති UI ආදර්ශන ප්‍රකාරය"</string>
@@ -3561,7 +3594,7 @@
     <string name="ambient_display_title" product="device" msgid="3423781975742145894">"උපාංගය පරීක්ෂා කිරීමට දෙවරක් තට්ටු කරන්න"</string>
     <string name="ambient_display_summary" msgid="525662960806416373">"වේලාව, දැනුම්දීම් නිරූපක, සහ වෙනත් තොරතුරු පරීක්ෂා කිරීමට, ඔබේ තිරය දෙවරක් තට්ටු කරන්න."</string>
     <string name="ambient_display_suggestion_summary" msgid="5987443721392571847">"තිරය ක්‍රියාවිරහිත විට දැනුම්දීම් පරීක්ෂා කරන්න"</string>
-    <string name="ambient_display_pickup_title" product="default" msgid="818688002837687268">"දුරකථනය පරීක්ෂා කිරීමට ඔසවන්න"</string>
+    <string name="ambient_display_pickup_title" product="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="4567020486787561873">"වේලාව, දැනුම්දීම් නිරූපක, සහ වෙනත් තොරතුරු පරීක්ෂා කිරීමට, ඔබේ දුරකථනය අතට ගන්න."</string>
@@ -3584,7 +3617,7 @@
     <string name="web_action_enable_title" msgid="4051513950976670853">"ක්ෂණික යෙදුම්"</string>
     <string name="web_action_enable_summary" msgid="3108127559723396382">"යෙදුම්වල සබැඳි, ඒවා ස්ථාපනය කර නැති විටද විවෘත කරන්න"</string>
     <string name="web_action_section_title" msgid="7364647086538399136">"ක්ෂණික යෙදුම්"</string>
-    <string name="instant_apps_account" msgid="1433620209791992528">"ක්ෂණික යෙදුම් ගිණුම"</string>
+    <string name="instant_apps_settings" msgid="8827777916518348213">"ක්ෂණික යෙදුම් මනාප"</string>
     <string name="domain_url_section_title" msgid="7046835219056428883">"ස්ථාපිත යෙදුම්"</string>
     <string name="automatic_storage_manager_activation_warning" msgid="6353100011690933254">"ඔබේ ගබඩාව දැන් ගබඩා කළමනාකරු විසින් පාලනය කරනු ලැබේ"</string>
     <string name="account_for_section_header" msgid="5356566418548737121">"<xliff:g id="USER_NAME">%1$s</xliff:g> සඳහා ගිණුම්"</string>
@@ -3631,7 +3664,9 @@
     <string name="enterprise_privacy_always_on_vpn_personal" msgid="9217774730260037434">"ඔබේ පුද්ගලික පැතිකඩ මත සැම විට ක්‍රියාත්මක VPN ක්‍රියාත්මකයි"</string>
     <string name="enterprise_privacy_always_on_vpn_work" msgid="7244472958208315814">"ඔබේ කාර්යාල පැතිකඩ මත සැම විට ක්‍රියාත්මක VPN ක්‍රියාත්මකයි"</string>
     <string name="enterprise_privacy_global_http_proxy" msgid="7936664553416257333">"ගෝලීය HTTP ප්‍රොක්සි සකසන ලදී"</string>
-    <string name="enterprise_privacy_ca_certs" msgid="5885892204903688909">"විශ්වාසි අක්තපත්‍ර"</string>
+    <string name="enterprise_privacy_ca_certs_device" msgid="2019652712782510262">"විශ්වාසි අක්තපත්‍ර"</string>
+    <string name="enterprise_privacy_ca_certs_personal" msgid="2279084820904076599">"ඔබගේ පුද්ගලික පැතිකඩෙහි විශ්වාසී අක්තපත්‍ර"</string>
+    <string name="enterprise_privacy_ca_certs_work" msgid="6187377647815301809">"ඔබගේ වැඩ පැතිකඩෙහි විශ්වාසී අක්තපත්‍ර"</string>
     <plurals name="enterprise_privacy_number_ca_certs" formatted="false" msgid="526375234629534165">
       <item quantity="one">අඩුම වශයෙන් CA සහතික <xliff:g id="COUNT_1">%d</xliff:g>ක්</item>
       <item quantity="other">අඩුම වශයෙන් CA සහතික <xliff:g id="COUNT_1">%d</xliff:g>ක්</item>
@@ -3690,10 +3725,12 @@
     <string name="storage_manager_indicator_on" msgid="8625551710194584733">"ක්‍රියාත්මකයි"</string>
     <string name="install_type_instant" msgid="3174425974536078647">"ක්ෂණික යෙදුම"</string>
     <string name="automatic_storage_manager_deactivation_warning" msgid="5605210730828410482">"ආචයන කළමනාකරු අක්‍රිය කරන්නද?"</string>
-    <string name="storage_movies_tv" msgid="5498394447562086890">"චිත්‍රපටය සහ රූපවාහිනී යෙදුම්"</string>
+    <string name="storage_movies_tv" msgid="5498394447562086890">"චිත්‍රපටය සහ TV යෙදුම්"</string>
     <string name="carrier_provisioning" msgid="4398683675591893169">"වාහක ප්‍රතිපාදන තතු"</string>
     <string name="trigger_carrier_provisioning" msgid="3434865918009286187">"උත්ප්‍රේරක වාහක ප්‍රතිපාදන"</string>
     <string name="new_device_suggestion_title" msgid="698847081680980774">"අලුත් සහ උද්යෝගිමත් දේවල් මොනවාද?"</string>
-    <string name="new_device_suggestion_summary" msgid="7172709269203435870">"ඉහළම විශේෂාංග 5 පරීක්ෂා කරන්න"</string>
+    <string name="new_device_suggestion_summary" product="default" msgid="206396571522515855">"ඔබගේ නව දුරකථනය ගැන දැන ගන්න"</string>
+    <string name="new_device_suggestion_summary" product="tablet" msgid="393751455688210956">"ඔබගේ නව ටැබ්ලට් පරිගණකය ගැන දැන ගන්න"</string>
+    <string name="new_device_suggestion_summary" product="device" msgid="2939870049868336652">"ඔබගේ නව උපාංගය ගැන දැන ගන්න"</string>
     <string name="disabled_low_ram_device" msgid="3751578499721173344">"මෙම අංගය මෙම උපාංගයේ ලබා ගත නොහැක"</string>
 </resources>
diff --git a/res/values-sk/arrays.xml b/res/values-sk/arrays.xml
index 90cc3ec..b596b86 100644
--- a/res/values-sk/arrays.xml
+++ b/res/values-sk/arrays.xml
@@ -100,8 +100,6 @@
     <!-- no translation found for wifi_security_no_eap:0 (2084555984818107151) -->
     <!-- no translation found for wifi_security_no_eap:1 (397579322683471524) -->
     <!-- no translation found for wifi_security_no_eap:2 (1968820975358150484) -->
-    <!-- no translation found for wifi_ap_security:0 (5251664683198623324) -->
-    <!-- no translation found for wifi_ap_security:1 (7989073072260294673) -->
   <string-array name="wifi_eap_method">
     <item msgid="1160193392455075561">"PEAP"</item>
     <item msgid="7981731051382306293">"TLS"</item>
@@ -247,7 +245,7 @@
     <item msgid="6546959730920410907">"úprava denníka hovorov"</item>
     <item msgid="446877710771379667">"čítanie kalendára"</item>
     <item msgid="7674458294386319722">"úprava kalendára"</item>
-    <item msgid="8281201165558093009">"prehľadanie sietí Wi-Fi"</item>
+    <item msgid="8281201165558093009">"prehľadanie sietí Wi‑Fi"</item>
     <item msgid="8694611243479480497">"upozornenie"</item>
     <item msgid="7776439107987345446">"prehľadanie mobilných sietí"</item>
     <item msgid="514615766544675057">"volanie na telefón"</item>
diff --git a/res/values-sk/strings.xml b/res/values-sk/strings.xml
index 4b18e9b..4470dc2 100644
--- a/res/values-sk/strings.xml
+++ b/res/values-sk/strings.xml
@@ -43,7 +43,7 @@
     <string name="radio_info_data_connection_disable" msgid="8541302390883231216">"Zakázať dátové pripojenie"</string>
     <string name="volte_provisioned_switch_string" msgid="7979882929810283786">"Poskytované VoLTE"</string>
     <string name="vt_provisioned_switch_string" msgid="7876998291744854759">"Poskytované videohovory"</string>
-    <string name="wfc_provisioned_switch_string" msgid="3985406545172898078">"Poskytované volanie cez Wi-Fi"</string>
+    <string name="wfc_provisioned_switch_string" msgid="3985406545172898078">"Poskytované volanie cez Wi‑Fi"</string>
     <string name="eab_provisioned_switch_string" msgid="3482272907448592975">"Zaistenie EAB/Presence"</string>
     <string name="radio_info_radio_power" msgid="7187666084867419643">"Sila signálu GSM"</string>
     <string name="radioInfo_menu_viewADN" msgid="7069468158519465139">"Zobraziť adresár SIM karty"</string>
@@ -55,7 +55,7 @@
     <string name="radio_info_ims_reg_status_not_registered" msgid="4438054067642750717">"Nezaregistrované"</string>
     <string name="radio_info_ims_feature_status_available" msgid="3687807290327566879">"K dispozícii"</string>
     <string name="radio_info_ims_feature_status_unavailable" msgid="4606182208970114368">"Nie je k dispozícii"</string>
-    <string name="radio_info_ims_reg_status" msgid="7534612158445529715">"Registrácia IMS: <xliff:g id="STATUS">%1$s</xliff:g>\nHlas cez LTE: <xliff:g id="AVAILABILITY_0">%2$s</xliff:g>\nHlas cez Wi-Fi: <xliff:g id="AVAILABILITY_1">%3$s</xliff:g>\nVideohovory: <xliff:g id="AVAILABILITY_2">%4$s</xliff:g>\nRozhranie UT: <xliff:g id="AVAILABILITY_3">%5$s</xliff:g>"</string>
+    <string name="radio_info_ims_reg_status" msgid="7534612158445529715">"Registrácia IMS: <xliff:g id="STATUS">%1$s</xliff:g>\nHlas cez LTE: <xliff:g id="AVAILABILITY_0">%2$s</xliff:g>\nHlas cez Wi‑Fi: <xliff:g id="AVAILABILITY_1">%3$s</xliff:g>\nVideohovory: <xliff:g id="AVAILABILITY_2">%4$s</xliff:g>\nRozhranie UT: <xliff:g id="AVAILABILITY_3">%5$s</xliff:g>"</string>
     <string name="radioInfo_service_in" msgid="1697703164394784618">"V prevádzke"</string>
     <string name="radioInfo_service_out" msgid="7999094221728929681">"Mimo prevádzky"</string>
     <string name="radioInfo_service_emergency" msgid="6274434235469661525">"Len tiesňové volania"</string>
@@ -168,7 +168,7 @@
     <string name="bluetooth_map_acceptance_dialog_text" msgid="8712508202081143737">"Zariadenie %1$s chce získať prístup k vašim správam. Chcete zariadeniu %2$s tento prístup umožniť?"</string>
     <string name="bluetooth_sap_request" msgid="2669762224045354417">"Žiadosť o prístup k SIM karte"</string>
     <string name="bluetooth_sap_acceptance_dialog_text" msgid="4414253873553608690">"Zariadenie <xliff:g id="DEVICE_NAME_0">%1$s</xliff:g> chce pristupovať k vašej SIM karte. Udelenie prístupu k SIM karte zakáže na vašom zariadení dátové pripojenie po dobu jeho trvania. Udeliť prístup zariadeniu <xliff:g id="DEVICE_NAME_1">%2$s?</xliff:g>"</string>
-    <string name="bluetooth_device_name_summary" msgid="4757990010751789977">"Viditeľné pre ostatné zariadenia ako <xliff:g id="DEVICE_NAME">^1</xliff:g>"</string>
+    <string name="bluetooth_device_name_summary" msgid="522235742194965734">"Viditeľné pre ostatné zariadenia ako <xliff:g id="DEVICE_NAME">^1</xliff:g>"</string>
     <string name="bluetooth_paired_device_title" msgid="8638994696317952019">"Vaše zariadenia"</string>
     <string name="bluetooth_pairing_page_title" msgid="7712127387361962608">"Párovanie nového zariadenia"</string>
     <string name="date_and_time" msgid="9062980487860757694">"Dátum a čas"</string>
@@ -290,7 +290,7 @@
     <string name="airplane_mode" msgid="8837269988154128601">"Režim v lietadle"</string>
     <string name="radio_controls_title" msgid="3447085191369779032">"Ďalšie"</string>
     <string name="wireless_networks_settings_title" msgid="3643009077742794212">"Bezdrôtové pripojenia a siete"</string>
-    <string name="radio_controls_summary" msgid="1838624369870907268">"Spravovať Wi-Fi, Bluetooth, režim v lietadle, mobilné siete a siete VPN"</string>
+    <string name="radio_controls_summary" msgid="1838624369870907268">"Spravovať Wi‑Fi, Bluetooth, režim v lietadle, mobilné siete a siete VPN"</string>
     <string name="cellular_data_title" msgid="6835451574385496662">"Mobilné dáta"</string>
     <string name="calls_title" msgid="3544471959217176768">"Hovory"</string>
     <string name="sms_messages_title" msgid="1778636286080572535">"Správy SMS"</string>
@@ -301,9 +301,9 @@
     <string name="roaming_disable" msgid="1295279574370898378">"Pripájať sa k dátovým službám pri roamingu"</string>
     <string name="roaming_reenable_message" msgid="9141007271031717369">"Dátové pripojenie bolo prerušené, pretože ste opustili domovskú sieť a máte vypnutý dátový roaming."</string>
     <string name="roaming_turn_it_on_button" msgid="4387601818162120589">"Zapnúť"</string>
-    <string name="roaming_warning" msgid="4275443317524544705">"Môžu sa vám účtovať vysoké poplatky."</string>
-    <string name="roaming_warning_multiuser" product="tablet" msgid="6458990250829214777">"Ak povolíte dátový roaming, môžu sa vám účtovať vysoké poplatky za roaming!\n\nToto nastavenie ovplyvní všetkých používateľov tohto tabletu."</string>
-    <string name="roaming_warning_multiuser" product="default" msgid="6368421100292355440">"Ak povolíte dátový roaming, môžu sa vám účtovať vysoké poplatky za roaming!\n\nToto nastavenie ovplyvní všetkých používateľov tohto telefónu."</string>
+    <string name="roaming_warning" msgid="4275443317524544705">"Môžu sa vám účtovať nemalé poplatky."</string>
+    <string name="roaming_warning_multiuser" product="tablet" msgid="6458990250829214777">"Ak povolíte dátový roaming, môžu sa vám účtovať nemalé poplatky za roaming!\n\nToto nastavenie ovplyvní všetkých používateľov tohto tabletu."</string>
+    <string name="roaming_warning_multiuser" product="default" msgid="6368421100292355440">"Ak povolíte dátový roaming, môžu sa vám účtovať nemalé poplatky za roaming!\n\nToto nastavenie ovplyvní všetkých používateľov tohto telefónu."</string>
     <string name="roaming_reenable_title" msgid="6068100976707316772">"Povoliť dátový roaming?"</string>
     <string name="networks" msgid="6333316876545927039">"Výber operátora"</string>
     <string name="sum_carrier_select" msgid="3616956422251879163">"Zvoliť sieťového operátora"</string>
@@ -316,6 +316,8 @@
     <string name="zone_auto" msgid="334783869352026648">"Automatické časové pásmo"</string>
     <string name="zone_auto_summaryOn" msgid="6142830927278458314">"Použiť časové pásmo zo siete"</string>
     <string name="zone_auto_summaryOff" msgid="2597745783162041390">"Použiť časové pásmo zo siete"</string>
+    <string name="date_time_24hour_auto" msgid="2117383168985653422">"Automatický 24‑hod. formát"</string>
+    <string name="date_time_24hour_auto_summary" msgid="6351812925651480277">"Použiť miestny predvolený formát"</string>
     <string name="date_time_24hour_title" msgid="3203537578602803850">"24-hodinový formát"</string>
     <string name="date_time_24hour" msgid="1193032284921000063">"Používať 24-hodinový formát"</string>
     <string name="date_time_set_time_title" msgid="6296795651349047016">"Čas"</string>
@@ -378,6 +380,9 @@
     <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="1961957425135180242">"Ďalej"</string>
+    <string name="setup_fingerprint_enroll_skip_title" msgid="362050541117362034">"Preskočiť odtlačok prsta?"</string>
+    <string name="setup_fingerprint_enroll_skip_after_adding_lock_text" msgid="958990414356204763">"Nastavenie odtlačku prsta trvá približne minútu. Ak tento krok preskočíte, môžete si odtlačok prsta pridať neskôr v Nastaveniach."</string>
+    <string name="lock_screen_intro_skip_title" msgid="4988210105913705679">"Preskočiť zámku obrazovky?"</string>
     <string name="lock_screen_intro_skip_dialog_text_frp" product="tablet" msgid="1581834104051243425">"Funkcie ochrany zariadenia sa nezapnú. V prípade straty, krádeže alebo obnovenia nebudete môcť cudzím osobám zabrániť v používaní tohto tabletu."</string>
     <string name="lock_screen_intro_skip_dialog_text_frp" product="device" msgid="4629503416877189572">"Funkcie ochrany zariadenia sa nezapnú. V prípade straty, krádeže alebo obnovenia nebudete môcť cudzím osobám zabrániť v používaní tohto zariadenia."</string>
     <string name="lock_screen_intro_skip_dialog_text_frp" product="default" msgid="2423428240245737909">"Funkcie ochrany zariadenia sa nezapnú. V prípade straty, krádeže alebo obnovenia nebudete môcť cudzím osobám zabrániť v používaní tohto telefónu."</string>
@@ -386,13 +391,13 @@
     <string name="lock_screen_intro_skip_dialog_text" product="default" msgid="3008526710555416125">"Funkcie ochrany zariadenia sa nezapnú. V prípade straty alebo krádeže nebudete môcť cudzím osobám zabrániť v používaní tohto telefónu."</string>
     <string name="skip_anyway_button_label" msgid="2323522873558834513">"Preskočiť"</string>
     <string name="go_back_button_label" msgid="4745265266186209467">"Späť"</string>
-    <string name="security_settings_fingerprint_enroll_find_sensor_title" msgid="3051496861358227199">"Dotknutie sa snímača"</string>
+    <string name="security_settings_fingerprint_enroll_find_sensor_title" msgid="3051496861358227199">"Dotknite sa senzora"</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_message" msgid="8793966374365960368">"Nachádza sa na zadnej strane telefónu. Použite ukazovák."</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_content_description" msgid="2058830032070449160">"Ilustrácia zariadenia a umiestnenia senzoru odtlačku prsta"</string>
     <string name="security_settings_fingerprint_enroll_dialog_name_label" msgid="7086763077909041106">"Meno"</string>
     <string name="security_settings_fingerprint_enroll_dialog_ok" msgid="4150384963879569750">"OK"</string>
     <string name="security_settings_fingerprint_enroll_dialog_delete" msgid="4114615413240707936">"Odstrániť"</string>
-    <string name="security_settings_fingerprint_enroll_start_title" msgid="2068961812439460133">"Dotyk na snímač"</string>
+    <string name="security_settings_fingerprint_enroll_start_title" msgid="2068961812439460133">"Dotknite sa senzora"</string>
     <string name="security_settings_fingerprint_enroll_start_message" msgid="3909929328942564524">"Priložte prst k senzoru a zdvihnite ho, keď zacítite vibráciu."</string>
     <string name="security_settings_fingerprint_enroll_repeat_title" msgid="2819679722403209778">"Zdvihnite a opäť priložte"</string>
     <string name="security_settings_fingerprint_enroll_repeat_message" msgid="6158989350522518586">"Zdvíhajte prst, aby ste pridali všetky odlišné časti odtlačku"</string>
@@ -404,13 +409,13 @@
     <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="2989019978041986175">"Dotknite sa snímača na zadnej strane telefónu. Použite ukazovák."</string>
+    <string name="security_settings_fingerprint_enroll_touch_dialog_message" msgid="2989019978041986175">"Dotknite sa senzora na zadnej strane telefónu. Použite ukazovák."</string>
     <string name="security_settings_fingerprint_enroll_error_dialog_title" msgid="3618021988442639280">"Registrácia nebola dokončená"</string>
     <string name="security_settings_fingerprint_enroll_error_timeout_dialog_message" msgid="2942551158278899627">"Časový limit registrácie odtlačku prsta vypršal. Skúste to znova."</string>
     <string name="security_settings_fingerprint_enroll_error_generic_dialog_message" msgid="3624760637222239293">"Registrácia odtlačku prsta nefungovala. Skúste to znova alebo použite iný prst."</string>
     <string name="fingerprint_enroll_button_add" msgid="6317978977419045463">"Pridať ďalší"</string>
     <string name="fingerprint_enroll_button_next" msgid="6247009337616342759">"Ďalej"</string>
-    <string name="security_settings_fingerprint_enroll_disclaimer" msgid="2624905914239271751">"Okrem odomknutia svojho telefónu môžete pomocou odtlačku autorizovať nákupy a prístup aplikácií. "<annotation id="url">"Ďalšie informácie"</annotation></string>
+    <string name="security_settings_fingerprint_enroll_disclaimer" msgid="2624905914239271751">"Okrem odomknutia svojho telefónu môžete pomocou odtlačku schvaľovať nákupy a prístup aplikácií. "<annotation id="url">"Ďalšie informácie"</annotation></string>
     <string name="security_settings_fingerprint_enroll_disclaimer_lockscreen_disabled" msgid="7846871823167357942">" Možnosť zámky obrazovky je zakázaná. Ďalšie informácie vám poskytne správca vašej organizácie. "<annotation id="admin_details">"Ďalšie podrobnosti"</annotation>\n\n"Naďalej môžete pomocou odtlačku prsta schvaľovať nákupy a prístup do aplikácií. "<annotation id="url">"Ďalšie informácie"</annotation></string>
     <string name="security_settings_fingerprint_enroll_lift_touch_again" msgid="1888772560642539718">"Nadvihnite prst, potom sa opäť dotknite senzora"</string>
     <string name="fingerprint_add_max" msgid="1020927549936895822">"Môžete pridať ďalšie odtlačky (max. <xliff:g id="COUNT">%d</xliff:g>)"</string>
@@ -419,7 +424,7 @@
     <string name="fingerprint_last_delete_title" msgid="6410310101247028988">"Odstrániť všetky odtlačky prstov?"</string>
     <string name="fingerprint_delete_title" msgid="1368196182612202898">"Odstránenie odtlačku prsta <xliff:g id="FINGERPRINT_ID">%1$s</xliff:g>"</string>
     <string name="fingerprint_delete_message" msgid="8597787803567398131">"Chcete tento odtlačok prsta odstrániť?"</string>
-    <string name="fingerprint_last_delete_message" msgid="7852321001254275878">"Pomocou odtlačkov prstov nebudete môcť odomknúť telefón, autorizovať nákupy ani sa prihlásiť do aplikácií."</string>
+    <string name="fingerprint_last_delete_message" msgid="7852321001254275878">"Pomocou odtlačkov prstov nebudete môcť odomknúť telefón, schvaľovať nákupy ani sa prihlásiť do aplikácií."</string>
     <string name="fingerprint_last_delete_message_profile_challenge" msgid="6521520787746771912">"Pomocou odtlačkov prstov nebudete môcť odomknúť pracovný profil, schváliť nákupy ani sa prihlásiť do pracovných aplikácií."</string>
     <string name="fingerprint_last_delete_confirm" msgid="2634726361059274289">"Áno, odstrániť"</string>
     <string name="confirm_fingerprint_icon_content_description" msgid="5255544532157079096">"Pokračujte priložením prsta."</string>
@@ -463,7 +468,7 @@
     <string name="setup_lock_settings_picker_title" product="tablet" msgid="90329443364067215">"Chráňte svoj tablet"</string>
     <string name="setup_lock_settings_picker_title" product="device" msgid="2399952075134938929">"Chráňte svoje zariadenie"</string>
     <string name="setup_lock_settings_picker_title" product="default" msgid="1572244299605153324">"Chráňte svoje telefón"</string>
-    <string name="setup_lock_settings_picker_fingerprint_message" msgid="5585650064305600578">"Získajte vyššiu bezpečnosť a nastavte si dodatočnú zámku obrazovky."</string>
+    <string name="lock_settings_picker_fingerprint_added_security_message" msgid="5768002109707648463">"Získajte vyššiu bezpečnosť a nastavte si dodatočnú zámku obrazovky."</string>
     <string name="setup_lock_settings_picker_message" product="tablet" msgid="8919671129189936210">"Aktivujte funkcie ochrany zariadenia a zabráňte tak ostatným v používaní tohto tabletu bez vášho povolenia. Vyberte zámku obrazovky, ktorú chcete používať."</string>
     <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>
@@ -507,35 +512,35 @@
     <string name="unlock_disable_frp_warning_content_pattern" msgid="8869767290771023461">"Funkcie ochrany zariadenia nebudú bez vášho vzoru fungovať."</string>
     <string name="unlock_disable_frp_warning_content_pattern_fingerprint" msgid="2986105377420905314">"Funkcie ochrany zariadenia nebudú fungovať bez vášho vzoru.<xliff:g id="EMPTY_LINE">
 
-</xliff:g>Z tohto zariadenia sa tiež odstránia vaše uložené odtlačky prstov a nebudete môcť pomocou nich ďalej odomykať svoj telefón, autorizovať nákupy ani sa prihlasovať do aplikácií."</string>
+</xliff:g>Z tohto zariadenia sa tiež odstránia vaše uložené odtlačky prstov a nebudete môcť pomocou nich ďalej odomykať svoj telefón, schvaľovať nákupy ani sa prihlasovať do aplikácií."</string>
     <string name="unlock_disable_frp_warning_content_pin" msgid="586996206210265131">"Funkcie ochrany zariadenia nebudú fungovať bez vášho kódu PIN."</string>
     <string name="unlock_disable_frp_warning_content_pin_fingerprint" msgid="3370462835533123695">"Funkcie ochrany zariadenia nebudú fungovať bez vášho kódu PIN.<xliff:g id="EMPTY_LINE">
 
-</xliff:g>Z tohto zariadenia sa tiež odstránia vaše uložené odtlačky prstov a nebudete môcť pomocou nich ďalej odomykať svoj telefón, autorizovať nákupy ani sa prihlasovať do aplikácií."</string>
+</xliff:g>Z tohto zariadenia sa tiež odstránia vaše uložené odtlačky prstov a nebudete môcť pomocou nich ďalej odomykať svoj telefón, schvaľovať nákupy ani sa prihlasovať do aplikácií."</string>
     <string name="unlock_disable_frp_warning_content_password" msgid="5420612686852555537">"Funkcie ochrany zariadenia nebudú fungovať bez vášho hesla."</string>
     <string name="unlock_disable_frp_warning_content_password_fingerprint" msgid="3595476296430536798">"Funkcie ochrany zariadenia nebudú fungovať bez vášho hesla.<xliff:g id="EMPTY_LINE">
 
-</xliff:g>Z tohto zariadenia sa tiež odstránia vaše uložené odtlačky prstov a nebudete môcť pomocou nich ďalej odomykať svoj telefón, autorizovať nákupy ani sa prihlasovať do aplikácií."</string>
+</xliff:g>Z tohto zariadenia sa tiež odstránia vaše uložené odtlačky prstov a nebudete môcť pomocou nich ďalej odomykať svoj telefón, schvaľovať nákupy ani sa prihlasovať do aplikácií."</string>
     <string name="unlock_disable_frp_warning_content_unknown" msgid="1550718040483548220">"Funkcie ochrany zariadenia nebudú fungovať bez vašej zámky obrazovky."</string>
     <string name="unlock_disable_frp_warning_content_unknown_fingerprint" msgid="3679351662094349506">"Funkcie ochrany zariadenia nebudú fungovať bez vašej zámky obrazovky.<xliff:g id="EMPTY_LINE">
 
-</xliff:g>Z tohto zariadenia sa tiež odstránia vaše uložené odtlačky prstov a nebudete môcť pomocou nich ďalej odomykať svoj telefón, autorizovať nákupy ani sa prihlasovať do aplikácií."</string>
+</xliff:g>Z tohto zariadenia sa tiež odstránia vaše uložené odtlačky prstov a nebudete môcť pomocou nich ďalej odomykať svoj telefón, schvaľovať nákupy ani sa prihlasovať do aplikácií."</string>
     <string name="unlock_disable_frp_warning_content_pattern_profile" msgid="8682200103576359918">"Funkcie ochrany zariadenia nebudú fungovať bez vášho bezpečnostného vzoru."</string>
     <string name="unlock_disable_frp_warning_content_pattern_fingerprint_profile" msgid="6718155854303231675">"Funkcie ochrany profilu nebudú fungovať bez vášho bezpečnostného vzoru.<xliff:g id="EMPTY_LINE">
 
-</xliff:g>Z tohto profilu sa tiež odstránia vaše uložené odtlačky prstov a nebudete môcť pomocou nich ďalej odomykať svoj profil, autorizovať nákupy ani sa prihlasovať do aplikácií."</string>
+</xliff:g>Z tohto profilu sa tiež odstránia vaše uložené odtlačky prstov a nebudete môcť pomocou nich ďalej odomykať svoj profil, schvaľovať nákupy ani sa prihlasovať do aplikácií."</string>
     <string name="unlock_disable_frp_warning_content_pin_profile" msgid="7790688070593867767">"Funkcie ochrany zariadenia nebudú fungovať bez vášho kódu PIN."</string>
     <string name="unlock_disable_frp_warning_content_pin_fingerprint_profile" msgid="4209564603132870532">"Funkcie ochrany profilu nebudú fungovať bez vášho kódu PIN.<xliff:g id="EMPTY_LINE">
 
-</xliff:g>Z tohto profilu sa tiež odstránia vaše uložené odtlačky prstov a nebudete môcť pomocou nich ďalej odomykať svoj profil, autorizovať nákupy ani sa prihlasovať do aplikácií."</string>
+</xliff:g>Z tohto profilu sa tiež odstránia vaše uložené odtlačky prstov a nebudete môcť pomocou nich ďalej odomykať svoj profil, schvaľovať nákupy ani sa prihlasovať do aplikácií."</string>
     <string name="unlock_disable_frp_warning_content_password_profile" msgid="7569285520567674461">"Funkcie na ochranu zariadenia nebudú fungovať bez vášho hesla."</string>
     <string name="unlock_disable_frp_warning_content_password_fingerprint_profile" msgid="2994300676764706047">"Funkcie ochrany profilu nebudú fungovať bez vášho hesla.<xliff:g id="EMPTY_LINE">
 
-</xliff:g>Z tohto profilu sa tiež odstránia vaše uložené odtlačky prstov a nebudete môcť pomocou nich ďalej odomykať svoj profil, autorizovať nákupy ani sa prihlasovať do aplikácií."</string>
+</xliff:g>Z tohto profilu sa tiež odstránia vaše uložené odtlačky prstov a nebudete môcť pomocou nich ďalej odomykať svoj profil, schvaľovať nákupy ani sa prihlasovať do aplikácií."</string>
     <string name="unlock_disable_frp_warning_content_unknown_profile" msgid="6984215718701688202">"Funkcie ochrany zariadenia nebudú fungovať bez vašej zámky obrazovky."</string>
     <string name="unlock_disable_frp_warning_content_unknown_fingerprint_profile" msgid="4994062501123299418">"Funkcie ochrany profilu nebudú fungovať bez vašej zámky obrazovky.<xliff:g id="EMPTY_LINE">
 
-</xliff:g>Z tohto profilu sa tiež odstránia vaše uložené odtlačky prstov a nebudete môcť pomocou nich ďalej odomykať svoj profil, autorizovať nákupy ani sa prihlasovať do aplikácií."</string>
+</xliff:g>Z tohto profilu sa tiež odstránia vaše uložené odtlačky prstov a nebudete môcť pomocou nich ďalej odomykať svoj profil, schvaľovať nákupy ani sa prihlasovať do aplikácií."</string>
     <string name="unlock_disable_frp_warning_ok" msgid="7075138677177748705">"Áno, odstrániť"</string>
     <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>
@@ -606,6 +611,7 @@
     <string name="lockpassword_pin_no_sequential_digits" msgid="680765285206990584">"Vzostupná, zostupná alebo opakovaná sekvencia čísiel nie je povolená"</string>
     <string name="lockpassword_ok_label" msgid="313822574062553672">"OK"</string>
     <string name="lockpassword_cancel_label" msgid="8818529276331121899">"Zrušiť"</string>
+    <string name="lockpassword_clear_label" msgid="5724429464960458155">"Vymazať"</string>
     <string name="lockpattern_tutorial_cancel_label" msgid="6431583477570493261">"Zrušiť"</string>
     <string name="lockpattern_tutorial_continue_label" msgid="3559793618653400434">"Ďalej"</string>
     <string name="lock_setup" msgid="3355847066343753943">"Nastavenie je dokončené."</string>
@@ -670,7 +676,7 @@
     <string name="bluetooth_menu_advanced" msgid="8572178316357220524">"Rozšírené"</string>
     <string name="bluetooth_advanced_titlebar" msgid="2142159726881547669">"Rozšírené nastavenia Bluetooth"</string>
     <string name="bluetooth_empty_list_bluetooth_off" msgid="6351930724051893423">"Keď je zapnuté pripojenie Bluetooth, zariadenie môže komunikovať s ostatnými zariadeniami s funkciou Bluetooth v okolí."</string>
-    <string name="ble_scan_notify_text" msgid="1295915006005700650">"Systémové aplikácie a služby môžu stále rozpoznávať zariadenia Bluetooth, aby tak zlepšili presnosť polohy. Môžete to zmeniť v <xliff:g id="LINK_BEGIN_0">LINK_BEGIN</xliff:g>nastaveniach vyhľadávania zariadení<xliff:g id="LINK_END_1">LINK_END</xliff:g>."</string>
+    <string name="ble_scan_notify_text" msgid="1295915006005700650">"Systémové aplikácie a služby môžu i tak rozpoznávať zariadenia Bluetooth, aby zlepšili presnosť určovania polohy. Toto správanie môžete zmeniť v <xliff:g id="LINK_BEGIN_0">LINK_BEGIN</xliff:g>nastaveniach vyhľadávania<xliff:g id="LINK_END_1">LINK_END</xliff:g>."</string>
     <string name="bluetooth_connect_failed" msgid="4500234659813241053">"Nepodarilo sa pripojiť. Skúste to znova."</string>
     <string name="device_details_title" msgid="6576953269221085300">"Podrobnosti o zariadení"</string>
     <string name="bluetooth_device_mac_address" msgid="2513724313558236181">"Adresa Bluetooth zariadenia: <xliff:g id="ADDRESS">%1$s</xliff:g>"</string>
@@ -714,8 +720,8 @@
     <string name="wifi_band_24ghz" msgid="852929254171856911">"2,4 GHz"</string>
     <string name="wifi_band_5ghz" msgid="6433822023268515117">"5 GHz"</string>
     <string name="link_speed" msgid="8896664974117585555">"%1$d Mbps"</string>
-    <string name="wifi_ask_enable" msgid="2795469717302060104">"<xliff:g id="REQUESTER">%s</xliff:g> chce zapnúť Wi-Fi"</string>
-    <string name="wifi_ask_disable" msgid="728366570145493573">"<xliff:g id="REQUESTER">%s</xliff:g> chce vypnúť Wi-Fi"</string>
+    <string name="wifi_ask_enable" msgid="2795469717302060104">"<xliff:g id="REQUESTER">%s</xliff:g> chce zapnúť Wi‑Fi"</string>
+    <string name="wifi_ask_disable" msgid="728366570145493573">"<xliff:g id="REQUESTER">%s</xliff:g> chce vypnúť Wi‑Fi"</string>
     <string name="nfc_quick_toggle_title" msgid="6769159366307299004">"NFC"</string>
     <string name="nfc_quick_toggle_summary" product="tablet" msgid="8302974395787498915">"Povoliť výmenu dát, ak sa tablet dotýka iného zariadenia"</string>
     <string name="nfc_quick_toggle_summary" product="default" msgid="5237208142892767592">"Povoliť výmenu dát, ak sa telefón dotýka iného zariadenia"</string>
@@ -727,15 +733,15 @@
     <string name="android_beam_disabled_summary" msgid="1737782116894793393">"Nedostupné, pretože je vypnutá technológia NFC"</string>
     <string name="android_beam_label" msgid="6257036050366775040">"Android Beam"</string>
     <string name="android_beam_explained" msgid="1810540319385192758">"Keď je táto funkcia zapnutá a podržíte zariadenia blízko pri sebe, môžete odosielať obsah aplikácií do iného zariadenia s technológiou NFC. Môžete napríklad odosielať webové stránky, videá YouTube, kontakty a ďalší obsah.\n\nStačí priložiť zariadenia k sebe (obyčajne zadnými stranami) a potom klepnúť na obrazovku. Aplikácia určí, aký obsah sa prenesie."</string>
-    <string name="wifi_quick_toggle_title" msgid="8850161330437693895">"Wi-Fi"</string>
-    <string name="wifi_quick_toggle_summary" msgid="2696547080481267642">"Zapnúť Wi-Fi"</string>
-    <string name="wifi_settings" msgid="29722149822540994">"Wi-Fi"</string>
-    <string name="wifi_settings_category" msgid="8719175790520448014">"Nastavenia Wi-Fi"</string>
-    <string name="wifi_settings_title" msgid="3103415012485692233">"Wi-Fi"</string>
+    <string name="wifi_quick_toggle_title" msgid="8850161330437693895">"Wi‑Fi"</string>
+    <string name="wifi_quick_toggle_summary" msgid="2696547080481267642">"Zapnúť Wi‑Fi"</string>
+    <string name="wifi_settings" msgid="29722149822540994">"Wi‑Fi"</string>
+    <string name="wifi_settings_category" msgid="8719175790520448014">"Nastavenia Wi‑Fi"</string>
+    <string name="wifi_settings_title" msgid="3103415012485692233">"Wi‑Fi"</string>
     <string name="wifi_settings_summary" msgid="668767638556052820">"Umožňuje nastaviť a spravovať prístupové body bezdrôtovej siete"</string>
-    <string name="wifi_select_network" msgid="4210954938345463209">"Vybrať sieť Wi-Fi"</string>
-    <string name="wifi_starting" msgid="6732377932749942954">"Prebieha zapínanie siete Wi-Fi..."</string>
-    <string name="wifi_stopping" msgid="8952524572499500804">"Prebieha vypínanie Wi-Fi..."</string>
+    <string name="wifi_select_network" msgid="4210954938345463209">"Vybrať sieť Wi‑Fi"</string>
+    <string name="wifi_starting" msgid="6732377932749942954">"Prebieha zapínanie siete Wi‑Fi..."</string>
+    <string name="wifi_stopping" msgid="8952524572499500804">"Prebieha vypínanie Wi‑Fi..."</string>
     <string name="wifi_error" msgid="3207971103917128179">"Chyba"</string>
     <string name="wifi_sap_no_channel_error" msgid="3108445199311817111">"V tejto krajine nie je pásmo 5 GHz k dispozícii"</string>
     <string name="wifi_in_airplane_mode" msgid="8652520421778203796">"Režim v lietadle"</string>
@@ -746,35 +752,35 @@
     <string name="wifi_wakeup_summary_scanning_disabled" msgid="7247227922074840445">"Nedostupné, pretože vyhľadávanie cez Wi‑Fi je vypnuté"</string>
     <string name="wifi_wakeup_summary_scoring_disabled" msgid="108339002136866897">"Ak sa chcete automaticky pripájať, je potrebné vybrať poskytovateľa hodnotenia siete"</string>
     <string name="wifi_poor_network_detection" msgid="4925789238170207169">"Vyhnúť sa nekvalitným pripojeniam"</string>
-    <string name="wifi_poor_network_detection_summary" msgid="2784135142239546291">"Nepoužívať sieť Wi-Fi, pokiaľ nemá dostatočne kvalitné internetové pripojenie"</string>
+    <string name="wifi_poor_network_detection_summary" msgid="2784135142239546291">"Nepoužívať sieť Wi‑Fi, pokiaľ nemá dostatočne kvalitné internetové pripojenie"</string>
     <string name="wifi_avoid_poor_network_detection_summary" msgid="4674423884870027498">"Použiť iba siete s dobrým pripojením k internetu"</string>
     <string name="use_open_wifi_automatically_title" msgid="6851951242903078588">"Pripájať k otvoreným sieťam"</string>
-    <string name="use_open_wifi_automatically_summary" msgid="2982091714252931713">"Automaticky pripájať k verejným sieťam vysokej kvality"</string>
+    <string name="use_open_wifi_automatically_summary" msgid="2982091714252931713">"Automaticky pripájať ku kvalitným verejným sieťam"</string>
     <string name="use_open_wifi_automatically_summary_scoring_disabled" msgid="593964217679325831">"Ak sa chcete automaticky pripájať, je potrebné vybrať poskytovateľa hodnotenia siete"</string>
     <string name="use_open_wifi_automatically_summary_scorer_unsupported_disabled" msgid="8472122600853650258">"Ak sa chcete automaticky pripájať, je potrebné vybrať kompatibilného poskytovateľa hodnotenia siete"</string>
     <string name="wifi_install_credentials" msgid="3551143317298272860">"Inštalácia certifikátov"</string>
-    <string name="wifi_scan_notify_text" msgid="5593805423071186757">"Systémové aplikácie a služby môžu stále vyhľadávať siete Wi-Fi, aby tak zlepšili presnosť polohy. Môžete to zmeniť v <xliff:g id="LINK_BEGIN_0">LINK_BEGIN</xliff:g>nastaveniach vyhľadávania zariadení<xliff:g id="LINK_END_1">LINK_END</xliff:g>."</string>
-    <string name="wifi_scan_notify_text_scanning_off" msgid="3426075479272242098">"Ak chcete zlepšiť presnosť polohy, zapnite vyhľadávanie sietí Wi-Fi v <xliff:g id="LINK_BEGIN_0">LINK_BEGIN</xliff:g>nastaveniach vyhľadávania<xliff:g id="LINK_END_1">LINK_END</xliff:g>."</string>
+    <string name="wifi_scan_notify_text" msgid="5593805423071186757">"Systémové aplikácie a služby môžu i tak vyhľadávať siete Wi‑Fi, aby zlepšili presnosť určovania polohy. Toto správanie môžete zmeniť v <xliff:g id="LINK_BEGIN_0">LINK_BEGIN</xliff:g>nastaveniach vyhľadávania zariadení<xliff:g id="LINK_END_1">LINK_END</xliff:g>."</string>
+    <string name="wifi_scan_notify_text_scanning_off" msgid="3426075479272242098">"Ak chcete spresniť určovanie polohy, zapnite vyhľadávanie sietí Wi‑Fi v <xliff:g id="LINK_BEGIN_0">LINK_BEGIN</xliff:g>nastaveniach vyhľadávania<xliff:g id="LINK_END_1">LINK_END</xliff:g>."</string>
     <string name="wifi_scan_notify_remember_choice" msgid="7104867814641144485">"Túto správu znova nezobrazovať"</string>
-    <string name="wifi_setting_sleep_policy_title" msgid="5149574280392680092">"Wi-Fi zapnuté aj v režime spánku"</string>
+    <string name="wifi_setting_sleep_policy_title" msgid="5149574280392680092">"Wi‑Fi zapnuté aj v režime spánku"</string>
     <string name="wifi_setting_on_during_sleep_title" msgid="8308975500029751565">"Wi‑Fi aktívne v režime spánku"</string>
     <string name="wifi_setting_sleep_policy_error" msgid="8174902072673071961">"Pri zmene nastavení sa vyskytol problém"</string>
     <string name="wifi_suspend_efficiency_title" msgid="2338325886934703895">"Zlepšiť výkonnosť"</string>
-    <string name="wifi_suspend_optimizations" msgid="1220174276403689487">"Optimalizácia Wi-Fi"</string>
-    <string name="wifi_suspend_optimizations_summary" msgid="4151428966089116856">"Minimalizovať spotrebu batérie pri zapnutej sieti Wi-Fi"</string>
-    <string name="wifi_limit_optimizations_summary" msgid="9000801068363468950">"Obmedz. využitie batérie sieťou Wi-Fi"</string>
+    <string name="wifi_suspend_optimizations" msgid="1220174276403689487">"Optimalizácia Wi‑Fi"</string>
+    <string name="wifi_suspend_optimizations_summary" msgid="4151428966089116856">"Minimalizovať spotrebu batérie pri zapnutej sieti Wi‑Fi"</string>
+    <string name="wifi_limit_optimizations_summary" msgid="9000801068363468950">"Obmedz. využitie batérie sieťou Wi‑Fi"</string>
     <string name="wifi_switch_away_when_unvalidated" msgid="1707247692180853058">"Prepínať na mobilné dáta, keď sieť Wi‑Fi nebude mať pripojenie k internetu"</string>
     <string name="wifi_cellular_data_fallback_title" msgid="8753386877755616476">"Automaticky prepnúť na mobilné dáta"</string>
-    <string name="wifi_cellular_data_fallback_summary" msgid="6375399280719867214">"Používať mobilné dáta, keď Wi-Fi nemá prístup k internetu. Za využité dáta vám môžu byť účtované poplatky."</string>
+    <string name="wifi_cellular_data_fallback_summary" msgid="6375399280719867214">"Používať mobilné dáta, keď Wi‑Fi nemá prístup k internetu. Za využité dáta vám môžu byť účtované poplatky."</string>
     <string name="wifi_add_network" msgid="6234851776910938957">"Pridať sieť"</string>
-    <string name="wifi_configure_settings_preference_title" msgid="2913345003906899146">"Predvoľby siete Wi‑Fi"</string>
+    <string name="wifi_configure_settings_preference_title" msgid="2913345003906899146">"Predvoľby Wi‑Fi"</string>
     <string name="wifi_configure_settings_preference_summary_wakeup_on" msgid="646393113104367290">"Wi‑Fi sa automaticky znova zapne"</string>
     <string name="wifi_configure_settings_preference_summary_wakeup_off" msgid="2782566279864356713">"Wi‑Fi sa nezapína automaticky znova"</string>
-    <string name="wifi_access_points" msgid="7053990007031968609">"Siete Wi-Fi"</string>
+    <string name="wifi_access_points" msgid="7053990007031968609">"Siete Wi‑Fi"</string>
     <string name="wifi_menu_wps_pbc" msgid="2668564692207863017">"Tlačidlo WPS"</string>
     <string name="wifi_menu_more_options" msgid="2448097861752719396">"Ďalšie možnosti"</string>
     <string name="wifi_menu_wps_pin" msgid="6426448256268695933">"Zadanie kódu WPS PIN"</string>
-    <string name="wifi_menu_p2p" msgid="7619851399250896797">"Wi-Fi Direct"</string>
+    <string name="wifi_menu_p2p" msgid="7619851399250896797">"Wi‑Fi Direct"</string>
     <string name="wifi_menu_scan" msgid="1470911530412095868">"Vyhľadávanie"</string>
     <string name="wifi_menu_advanced" msgid="7522252991919573664">"Rozšírené"</string>
     <string name="wifi_menu_configure" msgid="6150926852602171938">"Konfigurácia"</string>
@@ -783,26 +789,27 @@
     <string name="wifi_menu_forget" msgid="8736964302477327114">"Odstrániť sieť"</string>
     <string name="wifi_menu_modify" msgid="2068554918652440105">"Upraviť sieť"</string>
     <string name="wifi_menu_write_to_nfc" msgid="7692881642188240324">"Zápis na štítok NFC"</string>
-    <string name="wifi_empty_list_wifi_off" msgid="8056223875951079463">"Ak chcete zobraziť dostupné siete, zapnite Wi-Fi."</string>
-    <string name="wifi_empty_list_wifi_on" msgid="8746108031587976356">"Prebieha vyhľadávanie sietí Wi-Fi..."</string>
-    <string name="wifi_empty_list_user_restricted" msgid="7322372065475939129">"Nemáte povolenie na zmenu siete Wi-Fi."</string>
+    <string name="wifi_empty_list_wifi_off" msgid="8056223875951079463">"Ak chcete zobraziť dostupné siete, zapnite Wi‑Fi."</string>
+    <string name="wifi_empty_list_wifi_on" msgid="8746108031587976356">"Prebieha vyhľadávanie sietí Wi‑Fi..."</string>
+    <string name="wifi_empty_list_user_restricted" msgid="7322372065475939129">"Nemáte povolenie na zmenu siete Wi‑Fi."</string>
     <string name="wifi_more" msgid="3195296805089107950">"Ďalšie"</string>
     <string name="wifi_setup_wps" msgid="8128702488486283957">"Automatické nastavenie (WPS)"</string>
     <string name="wifi_show_advanced" msgid="3409422789616520979">"Rozšírené možnosti"</string>
     <string name="wifi_advanced_toggle_description_expanded" msgid="2380600578544493084">"Rozbaľovací zoznam Rozšírené možnosti. Zbalíte ho dvojitým klepnutím."</string>
     <string name="wifi_advanced_toggle_description_collapsed" msgid="1463812308429197263">"Rozbaľovací zoznam Rozšírené možnosti. Rozbalíte ho dvojitým klepnutím."</string>
-    <string name="wifi_wps_setup_title" msgid="8207552222481570175">"Chránené nastavenie siete Wi-Fi"</string>
+    <string name="wifi_wps_setup_title" msgid="8207552222481570175">"Chránené nastavenie siete Wi‑Fi"</string>
     <string name="wifi_wps_setup_msg" msgid="315174329121275092">"Spúšťanie WPS…"</string>
-    <string name="wifi_wps_onstart_pbc" msgid="817003360936932340">"Stlačte na svojom smerovači tlačidlo Chránené nastavenie Wi-Fi. Môže byť označené písmenami WPS alebo týmto symbolom:"</string>
-    <string name="wifi_wps_onstart_pin" msgid="223344506445335358">"Zadajte na svojom smerovači Wi-Fi kód PIN <xliff:g id="NUMBER">%1$s</xliff:g>. Proces nastavenia môže trvať až dve minúty."</string>
+    <string name="wifi_wps_onstart_pbc" msgid="817003360936932340">"Stlačte na svojom smerovači tlačidlo Chránené nastavenie Wi‑Fi. Môže byť označené písmenami WPS alebo týmto symbolom:"</string>
+    <string name="wifi_wps_onstart_pin" msgid="223344506445335358">"Zadajte na svojom smerovači Wi‑Fi kód PIN <xliff:g id="NUMBER">%1$s</xliff:g>. Proces nastavenia môže trvať až dve minúty."</string>
     <string name="wifi_wps_complete" msgid="2388138550456729134">"Spustenie WPS sa podarilo. Prebieha pripájanie k sieti…"</string>
-    <string name="wifi_wps_connected" msgid="7153432445748931183">"Pripojené k sieti Wi-Fi <xliff:g id="NETWORK_NAME">%s</xliff:g>"</string>
+    <string name="wifi_wps_connected" msgid="7153432445748931183">"Pripojené k sieti Wi‑Fi <xliff:g id="NETWORK_NAME">%s</xliff:g>"</string>
     <string name="wifi_wps_in_progress" msgid="3372311348221357944">"WPS prebieha a dokončenie procesu môže trvať až dve mnúty"</string>
     <string name="wifi_wps_failed_generic" msgid="5668775022238832527">"Spustenie WPS zlyhalo. Skúste to znova o niekoľko minút."</string>
     <string name="wifi_wps_failed_wep" msgid="2702820087105284461">"Nastavenie zabezpečenia bezdrôtového smerovača (TKIP) nie je podporované"</string>
     <string name="wifi_wps_failed_tkip" msgid="4282401586860713349">"Nastavenie zabezpečenia bezdrôtového smerovača (TKIP) nie je podporované"</string>
     <string name="wifi_wps_failed_auth" msgid="1174614355181181958">"Zlyhanie overenia totožnosti. Skúste to znova."</string>
     <string name="wifi_wps_failed_overlap" msgid="5159533685596844778">"Bola rozpoznaná ďalšia relácia WPS. Skúste to znova o niekoľko minút."</string>
+    <string name="wifi_wps_failed_wifi_disconnected" msgid="3829472117754104164">"Sieť Wi‑Fi je odpojená. Nastavenie WPS bolo zrušené."</string>
     <string name="wifi_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>
@@ -839,7 +846,9 @@
     <string name="wifi_wps_available_first_item" msgid="4422547079984583502">"WPS je k dispozícii"</string>
     <string name="wifi_wps_available_second_item" msgid="8427520131718215301">" (WPS je k dispozícii)"</string>
     <string name="wifi_wps_nfc_enter_password" msgid="2288214226916117159">"Zadajte heslo siete"</string>
-    <string name="wifi_scan_always_turnon_message" msgid="203123538572122989">"Aplikácia <xliff:g id="APP_NAME">%1$s</xliff:g> chce zapnúť vyhľadávanie sietí (z dôvodu dosiahnutia vyššej presnosti určovania polohy aj z iných dôvodov) a hľadať siete aj v prípade, že je vypnutý modul Wi-Fi.\n\nChcete túto možnosť povoliť všetkým aplikáciám, ktoré chcú vyhľadávať siete?"</string>
+    <string name="wifi_carrier_connect" msgid="8174696557882299911">"Sieť Wi‑Fi operátora"</string>
+    <string name="wifi_carrier_content" msgid="4634077285415851933">"Pripojené prostredníctvom operátora <xliff:g id="NAME">%1%s</xliff:g>"</string>
+    <string name="wifi_scan_always_turnon_message" msgid="203123538572122989">"Aplikácia <xliff:g id="APP_NAME">%1$s</xliff:g> chce zapnúť vyhľadávanie sietí (z dôvodu dosiahnutia vyššej presnosti určovania polohy aj z iných dôvodov) a hľadať siete aj v prípade, že je vypnutý modul Wi‑Fi.\n\nChcete túto možnosť povoliť všetkým aplikáciám, ktoré chcú vyhľadávať siete?"</string>
     <string name="wifi_scan_always_turnoff_message" msgid="5538901671131941043">"Ak chcete toto nastavenie vypnúť, prejdite na položku Rozšírené v rozšírenej ponuke."</string>
     <string name="wifi_scan_always_confirm_allow" msgid="5355973075896817232">"Povoliť"</string>
     <string name="wifi_scan_always_confirm_deny" msgid="4463982053823520710">"Odmietnuť"</string>
@@ -848,14 +857,15 @@
     <string name="wifi_hotspot_connect" msgid="5065506390164939225">"PRIPOJIŤ"</string>
     <string name="no_internet_access_text" msgid="7133561752896706392">"Táto sieť nemá prístup k internetu. Chcete k nej zostať pripojený/-á?"</string>
     <string name="no_internet_access_remember" msgid="4697314331614625075">"Nabudúce sa na túto sieť nepýtať"</string>
-    <string name="lost_internet_access_title" msgid="6228530645663584505">"Sieť Wi-Fi nie je pripojená k internetu"</string>
-    <string name="lost_internet_access_text" msgid="9029649339816197345">"Ak máte slabé pripojenie Wi-Fi, môžete prepnúť na mobilnú sieť. Za využité dáta vám však môžu byť účtované poplatky."</string>
+    <string name="lost_internet_access_title" msgid="6228530645663584505">"Sieť Wi‑Fi nie je pripojená k internetu"</string>
+    <string name="lost_internet_access_text" msgid="9029649339816197345">"Ak máte slabé pripojenie Wi‑Fi, môžete prepnúť na mobilnú sieť. Za využité dáta vám však môžu byť účtované poplatky."</string>
     <string name="lost_internet_access_switch" msgid="2262459569601190039">"Prepnúť na mobilné dáta"</string>
     <string name="lost_internet_access_cancel" msgid="338273139419871110">"Ďalej používať Wi‑Fi"</string>
     <string name="lost_internet_access_persist" msgid="7634876061262676255">"Viac už nezobrazovať"</string>
     <string name="wifi_connect" msgid="1076622875777072845">"Pripojiť"</string>
     <string name="wifi_failed_connect_message" msgid="8491902558970292871">"Nepodarilo sa pripojiť k sieti"</string>
     <string name="wifi_forget" msgid="8168174695608386644">"Odstrániť"</string>
+    <string name="wifi_modify" msgid="6100248070440710782">"Upraviť"</string>
     <string name="wifi_failed_forget_message" msgid="1348172929201654986">"Sieť sa nepodarilo odstrániť"</string>
     <string name="wifi_save" msgid="3331121567988522826">"Uložiť"</string>
     <string name="wifi_failed_save_message" msgid="6650004874143815692">"Nepodarilo sa uložiť sieť"</string>
@@ -867,15 +877,16 @@
       <item quantity="other">%d sietí</item>
       <item quantity="one">1 sieť</item>
     </plurals>
-    <string name="wifi_advanced_titlebar" msgid="4485841401774142908">"Wi-Fi, rozšírené"</string>
+    <string name="wifi_advanced_titlebar" msgid="4485841401774142908">"Wi‑Fi, rozšírené"</string>
     <string name="wifi_advanced_mac_address_title" msgid="6571335466330978393">"Adresa MAC"</string>
     <string name="wifi_advanced_ip_address_title" msgid="6215297094363164846">"Adresa IP"</string>
+    <string name="wifi_details_title" msgid="3471132676909349382">"Informácie o sieti"</string>
     <string name="wifi_details_subnet_mask" msgid="6720279144174924410">"Maska podsiete"</string>
     <string name="wifi_details_dns" msgid="8648826607751830768">"DNS"</string>
     <string name="wifi_details_ipv6_address_header" msgid="6734119149106422148">"Adresy IPv6"</string>
     <string name="wifi_saved_access_points_label" msgid="2013409399392285262">"Uložené siete"</string>
     <string name="wifi_advanced_settings_label" msgid="3654366894867838338">"Nastavenia adresy IP"</string>
-    <string name="wifi_advanced_not_available" msgid="5823045095444154586">"Rozšírené nastavenia Wi-Fi nie sú pre tohto používateľa dostupné"</string>
+    <string name="wifi_advanced_not_available" msgid="5823045095444154586">"Rozšírené nastavenia Wi‑Fi nie sú pre tohto používateľa dostupné"</string>
     <string name="wifi_ip_settings_menu_save" msgid="7296724066102908366">"Uložiť"</string>
     <string name="wifi_ip_settings_menu_cancel" msgid="6582567330136502340">"Zrušiť"</string>
     <string name="wifi_ip_settings_invalid_ip_address" msgid="2513142355364274970">"Zadajte platnú adresu IP."</string>
@@ -902,46 +913,44 @@
     <string name="wifi_p2p_cancel_connect_title" msgid="255267538099324413">"Zrušiť pozvánku?"</string>
     <string name="wifi_p2p_cancel_connect_message" msgid="7477756213423749402">"Chcete zrušiť pozvánku na spojenie s klientom <xliff:g id="PEER_NAME">%1$s</xliff:g>?"</string>
     <string name="wifi_p2p_delete_group_message" msgid="834559380069647086">"Odstrániť túto skupinu?"</string>
-    <string name="wifi_tether_checkbox_text" msgid="1847167643625779136">"Prenosný hotspot Wi-Fi"</string>
     <string name="wifi_hotspot_checkbox_text" msgid="7763495093333664887">"Hotspot Wi‑Fi"</string>
     <string name="wifi_hotspot_off_subtext" msgid="5466126533609394170">"S inými zariadeniami sa nezdieľa internet ani obsah"</string>
     <string name="wifi_hotspot_tethering_on_subtext" product="tablet" msgid="5752490509369962007">"Internetové pripojenie tohto tabletu sa zdieľa cez hotspot"</string>
     <string name="wifi_hotspot_tethering_on_subtext" product="default" msgid="6461075246164300670">"Internetové pripojenie tohto telefónu sa zdieľa cez hotspot"</string>
     <string name="wifi_hotspot_on_local_only_subtext" msgid="2068110388011294735">"Aplikácia zdieľa obsah. Ak chcete zdieľať internetové pripojenie, vypnite hotspot a potom ho zapnite."</string>
-    <string name="wifi_hotspot_name_title" msgid="1341735529132128887">"Názov siete Wi‑Fi"</string>
+    <string name="wifi_hotspot_name_title" msgid="8237000746618636778">"Názov hotspotu"</string>
     <string name="wifi_hotspot_name_summary_connecting" msgid="3378299995508671967">"Zapína sa hotspot <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>…"</string>
     <string name="wifi_hotspot_name_summary_connected" msgid="3888672084861445362">"Iné zariadenia sa môžu pripojiť k hotspotu <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>"</string>
-    <string name="wifi_hotspot_password_title" msgid="1955592302902091281">"Heslo siete Wi-Fi"</string>
+    <string name="wifi_hotspot_password_title" msgid="8676859981917573801">"Heslo hotspotu"</string>
     <string name="wifi_hotspot_ap_band_title" msgid="1165801173359290681">"Pásmo pre prístupový bod"</string>
     <string name="wifi_hotspot_footer_info_regular" msgid="1203489406068036455">"Použite hotspot na vytvorenie siete Wi‑Fi pre ostatné zariadenia. Hotspot poskytuje internet pomocou mobilného dátového pripojenia. Môžu vám byť účtované ďalšie poplatky za mobilné dáta."</string>
     <string name="wifi_hotspot_footer_info_local_only" msgid="857988412470694109">"Aplikácie tiež môžu vytvoriť hostpot na zdieľanie obsahu so zariadeniami v okolí."</string>
     <string name="wifi_tether_starting" msgid="1322237938998639724">"Prebieha zapínanie hotspotu..."</string>
     <string name="wifi_tether_stopping" msgid="4835852171686388107">"Prebieha vypínanie hotspotu..."</string>
     <string name="wifi_tether_enabled_subtext" msgid="7842111748046063857">"Sieť <xliff:g id="NETWORK_SSID">%1$s</xliff:g> je aktívna"</string>
-    <string name="wifi_tether_failed_subtext" msgid="1484941858530919002">"Chyba hotspotu siete Wi-Fi"</string>
-    <string name="wifi_tether_configure_ap_text" msgid="7974681394041609308">"Nastaviť hotspot Wi-Fi"</string>
+    <string name="wifi_tether_failed_subtext" msgid="1484941858530919002">"Chyba hotspotu siete Wi‑Fi"</string>
+    <string name="wifi_tether_configure_ap_text" msgid="7974681394041609308">"Nastaviť hotspot Wi‑Fi"</string>
     <string name="wifi_hotspot_configure_ap_text" msgid="5478614731464220432">"Nastavenie hotspotu Wi‑Fi"</string>
     <string name="wifi_hotspot_configure_ap_text_summary" msgid="5560680057727007011">"Hotspot AndroidAP WPA2 PSK"</string>
-    <string name="wifi_tether_configure_subtext" msgid="2050196439900426456">"Hotspot <xliff:g id="NETWORK_SSID">%1$s</xliff:g> <xliff:g id="NETWORK_SECURITY">%2$s</xliff:g>"</string>
     <string name="wifi_tether_configure_ssid_default" msgid="8467525402622138547">"AndroidHotspot"</string>
-    <string name="wifi_calling_settings_title" msgid="4102921303993404577">"Volanie cez Wi-Fi"</string>
-    <string name="wifi_calling_suggestion_title" msgid="9008010480466359578">"Zapnutie volania cez Wi-Fi"</string>
-    <string name="wifi_calling_suggestion_summary" msgid="3765923249566552233">"Namiesto mobilnej siete použite Wi-Fi"</string>
+    <string name="wifi_calling_settings_title" msgid="4102921303993404577">"Volanie cez Wi‑Fi"</string>
+    <string name="wifi_calling_suggestion_title" msgid="9008010480466359578">"Zapnutie volania cez Wi‑Fi"</string>
+    <string name="wifi_calling_suggestion_summary" msgid="3765923249566552233">"Namiesto mobilnej siete použite Wi‑Fi"</string>
     <string name="wifi_calling_mode_title" msgid="2164073796253284289">"Predvoľba volania"</string>
-    <string name="wifi_calling_mode_dialog_title" msgid="8149690312199253909">"Režim volania cez Wi-Fi"</string>
+    <string name="wifi_calling_mode_dialog_title" msgid="8149690312199253909">"Režim volania cez Wi‑Fi"</string>
     <string name="wifi_calling_roaming_mode_title" msgid="1565039047187685115">"Predvoľby roamingu"</string>
     <!-- no translation found for wifi_calling_roaming_mode_summary (8642014873060687717) -->
     <skip />
     <string name="wifi_calling_roaming_mode_dialog_title" msgid="7800926602662078576">"Predvoľby roamingu"</string>
   <string-array name="wifi_calling_mode_choices">
-    <item msgid="2124257075906188844">"Uprednostniť Wi-Fi"</item>
+    <item msgid="2124257075906188844">"Uprednostniť Wi‑Fi"</item>
     <item msgid="1335127656328817518">"Preferujem mobilné dáta"</item>
-    <item msgid="3132912693346866895">"Len Wi-Fi"</item>
+    <item msgid="3132912693346866895">"Len Wi‑Fi"</item>
   </string-array>
   <string-array name="wifi_calling_mode_choices_v2">
-    <item msgid="742988808283756263">"Wi-Fi"</item>
+    <item msgid="742988808283756263">"Wi‑Fi"</item>
     <item msgid="7715869266611010880">"Mobilné dáta"</item>
-    <item msgid="2838022395783120596">"Len Wi-Fi"</item>
+    <item msgid="2838022395783120596">"Len Wi‑Fi"</item>
   </string-array>
   <string-array name="wifi_calling_mode_values">
     <item msgid="4799585830102342375">"2"</item>
@@ -949,21 +958,21 @@
     <item msgid="3194458950573886239">"0"</item>
   </string-array>
   <string-array name="wifi_calling_mode_choices_without_wifi_only">
-    <item msgid="5782108782860004851">"Uprednostniť Wi-Fi"</item>
+    <item msgid="5782108782860004851">"Uprednostniť Wi‑Fi"</item>
     <item msgid="5074515506087318555">"Preferujem mobilné dáta"</item>
   </string-array>
   <string-array name="wifi_calling_mode_choices_v2_without_wifi_only">
-    <item msgid="6132150507201243768">"Wi-Fi"</item>
+    <item msgid="6132150507201243768">"Wi‑Fi"</item>
     <item msgid="1118703915148755405">"Mobilné dáta"</item>
   </string-array>
   <string-array name="wifi_calling_mode_values_without_wifi_only">
     <item msgid="2339246858001475047">"2"</item>
     <item msgid="6200207341126893791">"1"</item>
   </string-array>
-    <string name="wifi_calling_off_explanation" msgid="2597566001655908391">"Ak je zapnuté volanie Wi-Fi, váš telefón môže smerovať volania cez siete Wi-Fi alebo cez sieť vášho operátora. Závisí to od vašich nastavení a od toho, ktorý signál je silnejší. Pred zapnutím tejto funkcie kontaktujte svojho operátora a informujte sa o poplatkoch a ďalších podrobnostiach."</string>
+    <string name="wifi_calling_off_explanation" msgid="2597566001655908391">"Ak je zapnuté volanie Wi‑Fi, váš telefón môže smerovať volania cez siete Wi‑Fi alebo cez sieť vášho operátora. Závisí to od vašich nastavení a od toho, ktorý signál je silnejší. Pred zapnutím tejto funkcie kontaktujte svojho operátora a informujte sa o poplatkoch a ďalších podrobnostiach."</string>
     <string name="wifi_calling_off_explanation_2" msgid="2329334487851497223"></string>
     <string name="emergency_address_title" msgid="3571902448699714454">"Aktualizácia tiesňovej adresy"</string>
-    <string name="emergency_address_summary" msgid="306028701568728126">"Adresa, ktorej polohu použijú tiesňové služby, keď zavoláte linku 112 pomocou Wi-Fi"</string>
+    <string name="emergency_address_summary" msgid="3266760199681945746">"Adresa, ktorú tiesňové služby použijú ako vašu polohu, ak uskutočníte tiesňové volanie pomocou siete Wi‑Fi."</string>
     <string name="display_settings_title" msgid="1708697328627382561">"Obrazovka"</string>
     <string name="sound_settings" msgid="5534671337768745343">"Zvuk"</string>
     <string name="all_volume_title" msgid="4296957391257836961">"Hlasitosti"</string>
@@ -1017,6 +1026,7 @@
     <string name="search_settings" msgid="1910951467596035063">"Hľadať"</string>
     <string name="search_settings_summary" msgid="9205656546570654169">"Správa nastavení a histórie vyhľadávaní"</string>
     <string name="search_settings_no_results" msgid="8799027492641230999">"Žiadne výsledky"</string>
+    <string name="search_clear_history" msgid="4196658962573162457">"Vymazať históriu"</string>
     <string name="display_settings" msgid="7965901687241669598">"Obrazovka"</string>
     <string name="accelerometer_title" msgid="7854608399547349157">"Automaticky otáčať obrazovku"</string>
     <string name="color_mode_title" msgid="3159275920408338215">"Živé farby"</string>
@@ -1069,11 +1079,11 @@
     <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">"Zmena tapety"</string>
+    <string name="wallpaper_suggestion_title" msgid="8583988696513822528">"Zmeniť tapetu"</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">"Počas nabíjania alebo v doku"</string>
+    <string name="screensaver_settings_summary_either_long" msgid="7302740999250873332">"Pri nabíjaní 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>
@@ -1148,7 +1158,6 @@
     <string name="baseband_version" msgid="1848990160763524801">"Verzia základného pásma"</string>
     <string name="kernel_version" msgid="9192574954196167602">"Verzia jadra"</string>
     <string name="build_number" msgid="3075795840572241758">"Číslo zostavy"</string>
-    <string name="selinux_status" msgid="6212165375172061672">"Stav zabezpečenia SELinux"</string>
     <string name="device_info_not_available" msgid="8062521887156825182">"Nie je k dispozícii"</string>
     <string name="device_status_activity_title" msgid="1411201799384697904">"Stav"</string>
     <string name="device_status" msgid="607405385799807324">"Stav"</string>
@@ -1173,10 +1182,9 @@
     <string name="status_signal_strength" msgid="3732655254188304547">"Sila signálu"</string>
     <string name="status_roaming" msgid="2638800467430913403">"Roaming"</string>
     <string name="status_operator" msgid="2274875196954742087">"Sieť"</string>
-    <string name="status_wifi_mac_address" msgid="2202206684020765378">"Adresa MAC siete Wi-Fi"</string>
+    <string name="status_wifi_mac_address" msgid="2202206684020765378">"Adresa MAC siete Wi‑Fi"</string>
     <string name="status_bt_address" msgid="4195174192087439720">"Adresa Bluetooth"</string>
     <string name="status_serial_number" msgid="2257111183374628137">"Sériové číslo"</string>
-    <string name="status_unavailable" msgid="7862009036663793314">"Nie je k dispozícii"</string>
     <string name="status_up_time" msgid="7294859476816760399">"Doba prevádzky"</string>
     <string name="status_awake_time" msgid="2393949909051183652">"Doba prevádzky"</string>
     <string name="internal_memory" msgid="9129595691484260784">"Interný ukl. priestor"</string>
@@ -1247,10 +1255,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é miesto: <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é <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">"Celkové využité miesto 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_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>
@@ -1275,7 +1283,7 @@
     <string name="storage_detail_system" msgid="4629506366064709687">"Systém"</string>
     <string name="storage_detail_explore" msgid="7911344011431568294">"Preskúmať položku <xliff:g id="NAME">^1</xliff:g>"</string>
     <string name="storage_detail_dialog_other" msgid="8907101974576694793">"Priečinok Iné obsahuje zdieľané súbory uložené aplikáciami, súbory stiahnuté z internetu alebo prostredníctvom rozhrania Bluetooth, súbory Androidu atď. \n\nAk chcete zobraziť viditeľný obsah tohto zariadenia typu <xliff:g id="NAME">^1</xliff:g>, klepnite na položku Preskúmať."</string>
-    <string name="storage_detail_dialog_system" msgid="862835644848361569">"Systém zahrnuje súbory, ktoré sa používajú na fungovanie Androidu verzie <xliff:g id="VERSION">%s</xliff:g>"</string>
+    <string name="storage_detail_dialog_system" msgid="862835644848361569">"Systém obsahuje súbory, používané na fungovanie Androidu verzie <xliff:g id="VERSION">%s</xliff:g>."</string>
     <string name="storage_detail_dialog_user" msgid="3267254783294197804">"<xliff:g id="USER_0">^1</xliff:g> môže mať uložené fotky, hudbu, aplikácie a ďalšie dáta, ktoré využívajú <xliff:g id="SIZE">^2</xliff:g> úložiska. \n\nAk chcete zobraziť podrobnosti, prepnite na používateľa <xliff:g id="USER_1">^1</xliff:g>."</string>
     <string name="storage_wizard_init_title" msgid="5085400514028585772">"Nastavte úložisko <xliff:g id="NAME">^1</xliff:g>"</string>
     <string name="storage_wizard_init_external_title" msgid="4867326438945303598">"Použiť ako prenosné úložisko"</string>
@@ -1352,7 +1360,8 @@
     <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>
     <string name="reset_dashboard_title" msgid="6254873816990678620">"Obnovenie možností"</string>
-    <string name="reset_network_title" msgid="6166025966016873843">"Resetovať Wi-Fi, mobilné pripojenie a Bluetooth"</string>
+    <string name="reset_dashboard_summary" msgid="4851012632493522755">"Sieť, aplikácie a zariadenie sa dajú obnoviť"</string>
+    <string name="reset_network_title" msgid="6166025966016873843">"Resetovať Wi‑Fi, dáta a Bluetooth"</string>
     <string name="reset_network_desc" msgid="5547979398298881406">"Touto akciou obnovíte nastavenia všetkých sietí vrátane\n\n"<li>"Wi‑Fi"</li>\n<li>"mobilnej siete"</li>\n<li>"siete Bluetooth"</li></string>
     <string name="reset_network_button_text" msgid="2035676527471089853">"Obnoviť nastavenia"</string>
     <string name="reset_network_final_desc" msgid="6388371121099245116">"Chcete resetovať všetky nastavenia sietí? Túto akciu nie je možné vrátiť späť."</string>
@@ -1360,19 +1369,14 @@
     <string name="reset_network_confirm_title" msgid="1759888886976962773">"Resetovať?"</string>
     <string name="network_reset_not_available" msgid="7188610385577164676">"Tento používateľ nemôže resetovať nastavenia siete"</string>
     <string name="reset_network_complete_toast" msgid="787829973559541880">"Sieťové nastavenia boli obnovené"</string>
-    <string name="master_clear_title" msgid="6617679904229218425">"Vymazať všetky dáta (obnovenie výrobných nastavení)"</string>
-    <plurals name="master_clear_with_account_summary" formatted="false" msgid="5911377203778818712">
-      <item quantity="few">Obnovia sa <xliff:g id="ACCOUNT_COUNT">%1$d</xliff:g> účty</item>
-      <item quantity="many">Obnoví sa <xliff:g id="ACCOUNT_COUNT">%1$d</xliff:g> účtu</item>
-      <item quantity="other">Obnoví sa <xliff:g id="ACCOUNT_COUNT">%1$d</xliff:g> účtov</item>
-      <item quantity="one">Obnoví sa 1 účet</item>
-    </plurals>
-    <string name="master_clear_summary" msgid="6902443944660426951">"Obnovia sa všetky dáta a vnútorné úložisko"</string>
+    <string name="master_clear_title" msgid="3531267871084279512">"Vymazať všetky dáta (obnovenie výrobných nastavení)"</string>
     <string name="master_clear_desc" product="tablet" msgid="9146059417023157222">"Táto operácia vymaže všetky dáta v "<b>"internom úložisku"</b>" tabletu, vrátane:\n\n"<li>"účtu Google"</li>\n<li>"dát a nastavení systému a aplikácií"</li>\n<li>"stiahnutých aplikácií"</li></string>
     <string name="master_clear_desc" product="default" msgid="4800386183314202571">"Táto operácia vymaže všetky dáta v "<b>"internom úložisku"</b>" telefónu, vrátane:\n\n"<li>"účtu Google"</li>\n<li>"dát a nastavení systému a aplikácií"</li>\n<li>"stiahnutých aplikácií"</li></string>
     <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"Aktuálne ste prihlásení do nasledujúcich účtov:\n"</string>
     <string name="master_clear_other_users_present" product="default" msgid="5161423070702470742">\n\n"Na tomto zariadení sú prítomní ďalší používatelia.\n"</string>
     <string name="master_clear_desc_also_erases_external" msgid="1903185203791274237"><li>"Hudba"</li>\n<li>"Fotografie"</li>\n<li>"Iné používateľské údaje"</li></string>
+    <string name="master_clear_desc_also_erases_esim" msgid="312352697653096008"><li>"Operátori na eSIM"</li></string>
+    <string name="master_clear_desc_no_cancel_mobile_plan" msgid="5460926449093211144">\n\n"Nezruší sa tým vaša tarifa mobilných služieb."</string>
     <string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="7744115866662613411">\n\n"Ak chcete vymazať hudbu, obrázky a ďalšie používateľské dáta, je treba vymazať "<b>"úložisko USB"</b>"."</string>
     <string name="master_clear_desc_erase_external_storage" product="default" msgid="4801026652617377093">\n\n"Ak chcete vymazať hudbu, obrázky a ďalšie používateľské dáta, je treba vymazať "<b>"SD kartu"</b>"."</string>
     <string name="erase_external_storage" product="nosdcard" msgid="969364037450286809">"Vymazať ukladací priestor USB"</string>
@@ -1408,7 +1412,7 @@
     <string name="usb_tethering_subtext" product="tablet" msgid="5988796139573211318">"Zdieľať internetové pripojenie tabletu cez USB"</string>
     <string name="bluetooth_tether_checkbox_text" msgid="2379175828878753652">"Pripojenie cez Bluetooth"</string>
     <string name="bluetooth_tethering_subtext" product="tablet" msgid="4558227863463153412">"Zdieľanie internetového pripojenia tabletu cez Bluetooth"</string>
-    <string name="bluetooth_tethering_subtext" product="default" msgid="1055197887836203595">"Zdieľanie internetového pripojenia telefónu cez Bluetooth"</string>
+    <string name="bluetooth_tethering_subtext" product="default" msgid="1055197887836203595">"Zdieľať internetové pripojenie telefónu cez Bluetooth"</string>
     <string name="bluetooth_tethering_off_subtext_config" msgid="6326877798974938021">"Internetové pripojenie zariadenia <xliff:g id="DEVICE_NAME">%1$d</xliff:g> sa zdieľa cez Bluetooth"</string>
     <string name="bluetooth_tethering_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>
@@ -1422,7 +1426,7 @@
     <string name="sms_change_default_no_previous_dialog_text" msgid="602683880284921998">"Použiť aplikáciu <xliff:g id="NEW_APP">%s</xliff:g> ako aplikáciu pre SMS?"</string>
     <string name="network_scorer_picker_title" msgid="6383879578279046456">"Poskytovateľ hodnotenia siete"</string>
     <string name="network_scorer_picker_none_preference" msgid="9028375117241790936">"Žiadne"</string>
-    <string name="network_scorer_change_active_dialog_title" msgid="3776301550387574975">"Zmeniť aplikáciu asistent pripojenia Wi-Fi?"</string>
+    <string name="network_scorer_change_active_dialog_title" msgid="3776301550387574975">"Zmeniť aplikáciu asistent pripojenia Wi‑Fi?"</string>
     <string name="network_scorer_change_active_dialog_text" msgid="8035173880322990715">"Chcete spravovať sieťové pripojenia pomocou aplikácie <xliff:g id="NEW_APP">%1$s</xliff:g> namiesto aplikácie <xliff:g id="CURRENT_APP">%2$s</xliff:g>?"</string>
     <string name="network_scorer_change_active_no_previous_dialog_text" msgid="7444620909047611601">"Chcete spravovať sieťové pripojenia pomocou aplikácie <xliff:g id="NEW_APP">%s</xliff:g>?"</string>
     <string name="mobile_unknown_sim_operator" msgid="2156912373230276157">"Neznámy operátor SIM karty"</string>
@@ -1443,17 +1447,17 @@
     <string name="location_high_battery_use" msgid="517199943258508020">"Vysoká spotreba batérie"</string>
     <string name="location_low_battery_use" msgid="8602232529541903596">"Nízka spotreba batérie"</string>
     <string name="location_mode_screen_title" msgid="4528716772270246542">"Režim polohy"</string>
-    <string name="location_mode_high_accuracy_description" msgid="3453010562265338113">"Na určenie polohy používať GPS, Wi-Fi, Bluetooth alebo mobilné siete"</string>
-    <string name="location_mode_battery_saving_description" msgid="2365298246603348985">"Na určenie polohy používať Wi-Fi, Bluetooth alebo mobilné siete"</string>
+    <string name="location_mode_high_accuracy_description" msgid="3453010562265338113">"Na určenie polohy používať GPS, Wi‑Fi, Bluetooth alebo mobilné siete"</string>
+    <string name="location_mode_battery_saving_description" msgid="2365298246603348985">"Na určenie polohy používať Wi‑Fi, Bluetooth alebo mobilné siete"</string>
     <string name="location_mode_sensors_only_description" msgid="7247994752324805202">"Na určenie polohy používať GPS a senzory zariadenia"</string>
     <string name="location_scanning_screen_title" msgid="4408076862929611554">"Vyhľadávanie"</string>
-    <string name="location_scanning_wifi_always_scanning_title" msgid="6216705505621183645">"Vyhľadávať siete Wi-Fi"</string>
-    <string name="location_scanning_wifi_always_scanning_description" msgid="8036382029606868081">"Vylepšite určovanie polohy tým, že systémovým aplikáciám a službám umožníte kedykoľvek rozpoznávať siete Wi-Fi."</string>
+    <string name="location_scanning_wifi_always_scanning_title" msgid="6216705505621183645">"Vyhľadávať siete Wi‑Fi"</string>
+    <string name="location_scanning_wifi_always_scanning_description" msgid="8036382029606868081">"Vylepšite určovanie polohy tým, že systémovým aplikáciám a službám umožníte kedykoľvek rozpoznávať siete Wi‑Fi."</string>
     <string name="location_scanning_bluetooth_always_scanning_title" msgid="5444989508204520019">"Vyhľadávať zariadenia Bluetooth"</string>
     <string name="location_scanning_bluetooth_always_scanning_description" msgid="8602726521250591852">"Vylepšite určovanie polohy tým, že systémovým aplikáciám a službám umožníte kedykoľvek rozpoznávať zariadenia Bluetooth."</string>
-    <string name="location_network_based" msgid="9134175479520582215">"Poloha Wi-Fi a mobilnej siete"</string>
+    <string name="location_network_based" msgid="9134175479520582215">"Poloha Wi‑Fi a mobilnej siete"</string>
     <string name="location_neighborhood_level" msgid="5141318121229984788">"Povoliť apl. používať službu urč. polohy Google a rýchl. odhad. vašu polohu. Anonym. údaje o polohe sa budú odosielať spol. Google."</string>
-    <string name="location_neighborhood_level_wifi" msgid="4234820941954812210">"Poloha je určená podľa siete Wi-Fi"</string>
+    <string name="location_neighborhood_level_wifi" msgid="4234820941954812210">"Poloha je určená podľa siete Wi‑Fi"</string>
     <string name="location_gps" msgid="8392461023569708478">"Satelity GPS"</string>
     <string name="location_street_level" product="tablet" msgid="1669562198260860802">"Umožniť aplikáciám na vašom tablete určovať polohu pomocou GPS"</string>
     <string name="location_street_level" product="default" msgid="4617445745492014203">"Umožniť aplikáciám na vašom telefóne určovať polohu pomocou GPS"</string>
@@ -1489,15 +1493,16 @@
     <string name="settings_safetylegal_activity_title" msgid="6901214628496951727">"Bezpečnostné informácie"</string>
     <string name="settings_safetylegal_activity_unreachable" msgid="250674109915859456">"Nemáte dátové pripojenie. Ak chcete tieto informácie zobraziť teraz, prejdite v ľubovoľnom počítači pripojenom na Internet na adresu %s."</string>
     <string name="settings_safetylegal_activity_loading" msgid="8059022597639516348">"Načítava sa…"</string>
-    <string name="lockpassword_choose_your_password_header" msgid="8624900666929394990">"Zvoľte si heslo"</string>
-    <string name="lockpassword_choose_your_password_header_for_fingerprint" msgid="6624409510609085450">"Ak chcete použiť odtlačok prsta, nastavte heslo"</string>
-    <string name="lockpassword_choose_your_pattern_header" msgid="6949761069941694050">"Zvoľte si vzor"</string>
-    <string name="lockpassword_choose_your_pattern_header_for_fingerprint" msgid="5901096361617543819">"Ak chcete použiť odtlačok prsta, nastavte vzor"</string>
-    <string name="lockpassword_choose_your_pin_header" msgid="7598849519816138302">"Zvoľte si PIN"</string>
-    <string name="lockpassword_choose_your_pin_header_for_fingerprint" msgid="765344692615917183">"Ak chcete použiť odtlačok prsta, nastavte PIN"</string>
-    <string name="lockpassword_confirm_your_password_header" msgid="6308478184889846633">"Potvrďte heslo"</string>
+    <string name="lockpassword_choose_your_screen_lock_header" msgid="3872462096767152394">"Nastavenie zámky obrazovky"</string>
+    <string name="lockpassword_choose_your_password_message" msgid="1197569283524841412">"Z bezpečnostných dôvodov si nastavte heslo"</string>
+    <string name="lockpassword_choose_your_password_header_for_fingerprint" msgid="2541818487015343503">"Ak chcete použiť odtlačok prsta, nastavte heslo"</string>
+    <string name="lockpassword_choose_your_pattern_header_for_fingerprint" msgid="7709785406243556723">"Ak chcete použiť odtlačok prsta, nastavte vzor"</string>
+    <string name="lockpassword_choose_your_pin_message" msgid="1875420718677275646">"Z bezpečnostných dôvodov si nastavte kód PIN"</string>
+    <string name="lockpassword_choose_your_pin_header_for_fingerprint" msgid="1549639053195796674">"Odtlačok vyžaduje nastavenie kódu PIN"</string>
+    <string name="lockpassword_choose_your_pattern_message" msgid="5986983400689720015">"Z bezpečnostných dôvodov si nastavte vzor"</string>
+    <string name="lockpassword_confirm_your_password_header" msgid="1266027268220850931">"Znova zadajte heslo"</string>
     <string name="lockpassword_confirm_your_pattern_header" msgid="7543433733032330821">"Potvrďte svoj vzor"</string>
-    <string name="lockpassword_confirm_your_pin_header" msgid="49038294648213197">"Potvrďte kód PIN"</string>
+    <string name="lockpassword_confirm_your_pin_header" msgid="7744513791910572550">"Znova zadajte kód PIN"</string>
     <string name="lockpassword_confirm_passwords_dont_match" msgid="5140892109439191415">"Heslá sa nezhodujú"</string>
     <string name="lockpassword_confirm_pins_dont_match" msgid="7226244811505606217">"Kódy PIN nie sú zhodné"</string>
     <string name="lockpassword_choose_lock_generic_header" msgid="3811438094903786145">"Spôsob odomknutia"</string>
@@ -1516,6 +1521,12 @@
     <string name="lockpassword_strong_auth_required_work_pattern" msgid="3003781907040522053">"Zadajte bezpečnostný pracovný vzor a získajte vyššiu mieru zabezpečenia"</string>
     <string name="lockpassword_strong_auth_required_work_pin" msgid="3367491332598821552">"Zadajte pracovný kód PIN a získajte vyššiu mieru zabezpečenia"</string>
     <string name="lockpassword_strong_auth_required_work_password" msgid="8159775129968582940">"Zadajte pracovné heslo a získajte vyššiu mieru zabezpečenia"</string>
+    <string name="lockpassword_confirm_your_pattern_details_frp" msgid="6757336656791723193">"V telefóne boli obnovené výrobné nastavenia. Ak ho chcete použiť, zadajte predchádzajúci vzor."</string>
+    <string name="lockpassword_confirm_your_pin_details_frp" msgid="826520613445990470">"V telefóne boli obnovené výrobné nastavenia. Ak ho chcete použiť, zadajte predchádzajúci PIN."</string>
+    <string name="lockpassword_confirm_your_password_details_frp" msgid="8944081074615739040">"V telefóne boli obnovené výrobné nastavenia. Ak ho chcete použiť, zadajte predchádzajúce heslo."</string>
+    <string name="lockpassword_confirm_your_pattern_header_frp" msgid="2898036091609128286">"Overenie vzoru"</string>
+    <string name="lockpassword_confirm_your_pin_header_frp" msgid="4141601774778898803">"Overenie kódu PIN"</string>
+    <string name="lockpassword_confirm_your_password_header_frp" msgid="3762615419295360480">"Overenie hesla"</string>
     <string name="lockpassword_invalid_pin" msgid="15588049067548470">"Nesprávny kód PIN"</string>
     <string name="lockpassword_invalid_password" msgid="4038507398784975200">"Nesprávne heslo"</string>
     <string name="lockpattern_need_to_unlock_wrong" msgid="1745247595356012176">"Nesprávny vzor"</string>
@@ -1564,15 +1575,14 @@
     <string name="install_applications" msgid="4872012136210802181">"Neznáme zdroje"</string>
     <string name="install_applications_title" msgid="4987712352256508946">"Povoliť všet. zdroje aplikácií"</string>
     <string name="recent_app_category_title" msgid="6673071268966003928">"Nedávno spustené aplikácie"</string>
-    <string name="see_all_apps_title" msgid="1317153498074308438">"Zobraziť všetky aplikácie (počet: <xliff:g id="COUNT">%1$d</xliff:g>)"</string>
-    <string name="recent_app_summary" msgid="3366446669844932300">"pred <xliff:g id="TIME">^1</xliff:g>"</string>
+    <string name="see_all_apps_title" msgid="1317153498074308438">"Zobraziť všetky aplikácie (<xliff:g id="COUNT">%1$d</xliff:g>)"</string>
     <string name="install_all_warning" product="tablet" msgid="8310489909586138165">"Váš tablet a osobné dáta sú náchylnejšie na útok z neznámych aplikácií. Inštaláciou aplikácií z tohto zdroja vyjadrujete súhlas s tým, že nesiete zodpovednosť za akékoľvek poškodenie tabletu alebo stratu dát, ktoré by mohli nastať pri ich používaní."</string>
     <string name="install_all_warning" product="default" msgid="1952257127370115988">"Váš telefón a osobné dáta sú náchylnejšie na útok z neznámych aplikácií. Inštaláciou aplikácií z tohto zdroja vyjadrujete súhlas s tým, že nesiete zodpovednosť za akékoľvek poškodenie telefónu alebo stratu dát, ktoré by mohli nastať pri ich používaní."</string>
     <string name="advanced_settings" msgid="1777249286757067969">"Rozšírené nastavenia"</string>
     <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">"Nastavenie predvoleného otvárania"</string>
+    <string name="auto_launch_label" msgid="2669236885531442195">"Predvolené otváranie"</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>
@@ -1614,8 +1624,8 @@
     <string name="show_running_services" msgid="5736278767975544570">"Spustené služby"</string>
     <string name="show_background_processes" msgid="2009840211972293429">"Vyrovnávacia pamäť"</string>
     <string name="default_emergency_app" msgid="1951760659640369980">"Aplikácia pre tiesňové volania"</string>
-    <string name="reset_app_preferences" msgid="1321050641018356925">"Obnovenie predvolieb aplikácií"</string>
-    <string name="reset_app_preferences_title" msgid="6093179367325336662">"Chcete obnoviť predvoľby aplikácií?"</string>
+    <string name="reset_app_preferences" msgid="1321050641018356925">"Resetovať predvoľby aplikácií"</string>
+    <string name="reset_app_preferences_title" msgid="6093179367325336662">"Chcete resetovať predvoľby aplikácií?"</string>
     <string name="reset_app_preferences_desc" msgid="4822447731869201512">"Touto akciou obnovíte predvoľby položiek:\n\n "<li>"deaktivované aplikácie,"</li>\n" "<li>"deaktivované upozornenia aplikácií,"</li>\n" "<li>"predvolené aplikácie pre rôzne akcie,"</li>\n" "<li>"obmedzenia dátových prenosov na pozadí pre aplikácie,"</li>\n" "<li>"akékoľvek obmedzenia povolení."</li>\n\n" Neprídete o žiadne dáta v aplikáciách."</string>
     <string name="reset_app_preferences_button" msgid="2559089511841281242">"Obnoviť aplikácie"</string>
     <string name="manage_space_text" msgid="8852711522447794676">"Správa pamäte"</string>
@@ -1831,11 +1841,11 @@
     <string name="accessibility_settings_summary" msgid="981260486011624939">"Čítačky obrazovky, zobrazenie, ovládacie prvky interakcie"</string>
     <string name="vision_settings_title" msgid="4204111425716868288">"Pre slabozrakých"</string>
     <string name="vision_settings_description" msgid="5679491180156408260">"Zariadenie môžete prispôsobiť, aby zodpovedalo vašim potrebám. Tieto funkcie dostupnosti môžete neskôr zmeniť v Nastaveniach."</string>
-    <string name="vision_settings_suggestion_title" msgid="917294957154878441">"Zväčšiť veľkosť písma"</string>
+    <string name="vision_settings_suggestion_title" msgid="8058794060304707004">"Zmeniť veľkosť písma"</string>
     <string name="screen_reader_category_title" msgid="7739154903913400641">"Čítačky obrazovky"</string>
     <string name="audio_and_captions_category_title" msgid="3420727114421447524">"Zvuk a text na obrazovke"</string>
     <string name="display_category_title" msgid="685461049938269166">"Zobrazenie"</string>
-    <string name="interaction_control_category_title" msgid="7836591031872839151">"Ovládacie prvky interakcie"</string>
+    <string name="interaction_control_category_title" msgid="7836591031872839151">"Interaktívne ovládanie"</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>
@@ -1868,7 +1878,6 @@
     <string name="accessibility_display_inversion_preference_subtitle" msgid="7052959202195368109">"Môže ovplyvniť výkonnosť"</string>
     <string name="accessibility_autoclick_preference_title" msgid="7014499339068449623">"Kliknutie po zastavení kurzora"</string>
     <string name="accessibility_autoclick_delay_preference_title" msgid="3962261178385106006">"Oneskorenie pred kliknutím"</string>
-    <string name="preference_summary_default_combination" msgid="8532964268242666060">"<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">"ZAPNUTÉ"</string>
     <string name="accessibility_summary_state_disabled" msgid="2241315620132005595">"VYPNUTÉ"</string>
     <string name="enable_quick_setting" msgid="2366999897816894536">"Zobraziť v Rýchlych nastaveniach"</string>
@@ -2001,31 +2010,33 @@
     <string name="background_activity_summary_on" msgid="649282072540085599">"Keď sa aplikácia nepoužíva, môže byť spustená na pozadí"</string>
     <string name="background_activity_summary_off" msgid="7666330699090632040">"Keď sa aplikácia nepoužíva, jej aktivita na pozadí je obmedzená"</string>
     <string name="background_activity_summary_disabled" msgid="3710669050484599847">"Aplikácia nemá povolené spustenie na pozadí"</string>
+    <string name="background_activity_summary_whitelisted" msgid="7375400051141016808">"Využitie batérie touto aplikáciou sa nedá optimalizovať"</string>
+    <string name="background_activity_warning_dialog_title" msgid="2216249969149568871">"Obmedziť aktivitu na pozadí?"</string>
+    <string name="background_activity_warning_dialog_text" msgid="7049624449246121981">"Ak obmedzíte aktivitu aplikácie na pozadí, nemusí fungovať správne"</string>
     <string name="device_screen_usage" msgid="3386088035570409683">"Využitie obrazovky od úplného nabitia"</string>
     <string name="device_screen_consumption" msgid="4607589286438986687">"Spotreba obrazovkou"</string>
     <string name="device_cellular_network" msgid="4724773411762382950">"Vyhľadávanie mobilnej siete"</string>
-    <string name="power_last_full_charge_summary" msgid="532845389094620657">"pred <xliff:g id="TIME">^1</xliff:g>"</string>
-    <string name="power_usage_list_summary" msgid="6775339745194635000">"Spotreba aplikácií od úplného nabitia (pred <xliff:g id="TIME">^1</xliff:g>)"</string>
-    <string name="power_usage_list_summary_device" msgid="7036566616386864302">"Využitie v zariadení od úplného nabitia (pred <xliff:g id="TIME">^1</xliff:g>)"</string>
+    <string name="power_usage_list_summary" msgid="6393929085382334341">"Využitie aplikácií od úplného nabitia (<xliff:g id="RELATIVE_TIME">^1</xliff:g>)"</string>
+    <string name="power_usage_list_summary_device" msgid="4461926045610455423">"Využitie v zariadení od úplného nabitia (<xliff:g id="RELATIVE_TIME">^1</xliff:g>)"</string>
     <string name="screen_usage_summary" msgid="6687403051423153550">"Ako dlho bola zapnutá obrazovka od úplného dobitia"</string>
     <string name="device_usage_list_summary" msgid="5623036661468763251">"Využitie zariadenia od úplného dobitia"</string>
     <string name="battery_since_unplugged" msgid="338073389740738437">"Využitie batérie od odpojenia"</string>
     <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íjanie"</string>
+    <string name="battery_stats_charging_label" msgid="4223311142875178785">"Nabíja sa"</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>
     <string name="battery_stats_flashlight_on_label" msgid="4319637669889411307">"Zapnuté svietidlo"</string>
-    <string name="battery_stats_wifi_running_label" msgid="1845839195549226252">"Wi-Fi"</string>
+    <string name="battery_stats_wifi_running_label" msgid="1845839195549226252">"Wi‑Fi"</string>
     <string name="battery_stats_wake_lock_label" msgid="1908942681902324095">"Aktívny režim"</string>
     <string name="battery_stats_phone_signal_label" msgid="4137799310329041341">"Signál mobilnej siete"</string>
     <!-- no translation found for battery_stats_last_duration (1535831453827905957) -->
     <skip />
     <string name="awake" msgid="387122265874485088">"Doba používania zariadenia"</string>
-    <string name="wifi_on_time" msgid="3208518458663637035">"Čas prevádzky siete Wi-Fi"</string>
-    <string name="bluetooth_on_time" msgid="3056108148042308690">"Čas prevádzky siete Wi-Fi"</string>
+    <string name="wifi_on_time" msgid="3208518458663637035">"Čas prevádzky siete Wi‑Fi"</string>
+    <string name="bluetooth_on_time" msgid="3056108148042308690">"Čas prevádzky siete Wi‑Fi"</string>
     <string name="advanced_battery_title" msgid="2068039111517508622">"Podrobnosti využitia batérie"</string>
     <string name="history_details_title" msgid="3608240585315506067">"Podrobnosti histórie"</string>
     <string name="battery_details_title" msgid="6101394441569858580">"Využitie batérie"</string>
@@ -2058,7 +2069,7 @@
     <string name="power_screen" msgid="3023346080675904613">"Obrazovka"</string>
     <string name="power_flashlight" msgid="7794409781003567614">"Svetlo"</string>
     <string name="power_camera" msgid="4976286950934622605">"Fotoaparát"</string>
-    <string name="power_wifi" msgid="1135085252964054957">"Wi-Fi"</string>
+    <string name="power_wifi" msgid="1135085252964054957">"Wi‑Fi"</string>
     <string name="power_bluetooth" msgid="4373329044379008289">"Bluetooth"</string>
     <string name="power_cell" msgid="3392999761958982492">"Pohotovostný režim mobilnej siete"</string>
     <string name="power_phone" msgid="5392641106474567277">"Hlasové hovory"</string>
@@ -2074,7 +2085,7 @@
     <string name="usage_type_cpu_foreground" msgid="6500579611933211831">"CPU v popredí"</string>
     <string name="usage_type_wake_lock" msgid="5125438890233677880">"Zakázať režim spánku"</string>
     <string name="usage_type_gps" msgid="7989688715128160790">"GPS"</string>
-    <string name="usage_type_wifi_running" msgid="3134357198266380400">"Pripojenie Wi-Fi aktívne"</string>
+    <string name="usage_type_wifi_running" msgid="3134357198266380400">"Pripojenie Wi‑Fi aktívne"</string>
     <string name="usage_type_phone" product="tablet" msgid="262638572890253393">"Tablet"</string>
     <string name="usage_type_phone" product="default" msgid="9108247984998041853">"Telefón"</string>
     <string name="usage_type_data_send" msgid="8971710128438365919">"Odoslané pakety – mobilná sieť"</string>
@@ -2095,7 +2106,7 @@
     <string name="battery_action_app_details" msgid="7861051816778419018">"O aplikácii"</string>
     <string name="battery_action_app_settings" msgid="4570481408106287454">"Nastavenia aplikácie"</string>
     <string name="battery_action_display" msgid="7338551244519110831">"Nastavenia obrazovky"</string>
-    <string name="battery_action_wifi" msgid="8181553479021841207">"Nastavenia Wi-Fi"</string>
+    <string name="battery_action_wifi" msgid="8181553479021841207">"Nastavenia Wi‑Fi"</string>
     <string name="battery_action_bluetooth" msgid="8374789049507723142">"Nastavenia Bluetooth"</string>
     <string name="battery_desc_voice" msgid="8980322055722959211">"Využitie batérie hlasovými hovormi"</string>
     <string name="battery_desc_standby" product="tablet" msgid="6284747418668280364">"Využitie batérie v stave nečinnosti tabletu"</string>
@@ -2106,8 +2117,8 @@
     <string name="battery_desc_camera" msgid="7375389919760613499">"Batéria využívaná fotoaparátom"</string>
     <string name="battery_desc_display" msgid="5432795282958076557">"Využitie batérie obrazovkou a podsvietením"</string>
     <string name="battery_sugg_display" msgid="3370202402045141760">"Znížte jas obrazovky alebo interval vypnutia obrazovky"</string>
-    <string name="battery_desc_wifi" msgid="2375567464707394131">"Využitie batérie sieťou Wi-Fi"</string>
-    <string name="battery_sugg_wifi" msgid="7776093125855397043">"Vypnite pripojenie Wi-Fi, keď sa sieť Wi-Fi nepoužíva alebo keď nie je k dispozícii"</string>
+    <string name="battery_desc_wifi" msgid="2375567464707394131">"Využitie batérie sieťou Wi‑Fi"</string>
+    <string name="battery_sugg_wifi" msgid="7776093125855397043">"Vypnite pripojenie Wi‑Fi, keď sa sieť Wi‑Fi nepoužíva alebo keď nie je k dispozícii"</string>
     <string name="battery_desc_bluetooth" msgid="8069070756186680367">"Využitie batérie technológiou Bluetooth"</string>
     <string name="battery_sugg_bluetooth_basic" msgid="4565141162650835009">"Keď technológiu Bluetooth nepoužívate, vypnite ju"</string>
     <string name="battery_sugg_bluetooth_headset" msgid="4071352514714259230">"Skúste sa pripojiť k inému zariadeniu Bluetooth"</string>
@@ -2177,7 +2188,7 @@
     <string name="mem_use_kernel_cache_type" msgid="6411475064463957513">"Vyrovnávacie pamäte jadra Kernel"</string>
     <string name="mem_use_zram_type" msgid="9087217476795358232">"ZRam swap"</string>
     <string name="mem_use_free_type" msgid="717708548454880840">"Voľné"</string>
-    <string name="mem_use_total" msgid="6308786055749777934">"Celkové"</string>
+    <string name="mem_use_total" msgid="6308786055749777934">"Celkove"</string>
     <string name="menu_duration_3h" msgid="4714866438374738385">"3 hodiny"</string>
     <string name="menu_duration_6h" msgid="1940846763432184132">"6 hodín"</string>
     <string name="menu_duration_12h" msgid="7890465404584356294">"12 hodín"</string>
@@ -2213,14 +2224,14 @@
     <string name="tts_reset" msgid="2661752909256313270">"Obnoviť"</string>
     <string name="tts_play" msgid="2628469503798633884">"Prehrať"</string>
     <string name="gadget_title" msgid="5519037532720577836">"Ovládanie napájania"</string>
-    <string name="gadget_toggle_wifi" msgid="319262861956544493">"Prebieha aktualizácia nastavenia Wi-Fi"</string>
+    <string name="gadget_toggle_wifi" msgid="319262861956544493">"Prebieha aktualizácia nastavenia Wi‑Fi"</string>
     <string name="gadget_toggle_bluetooth" msgid="7538903239807020826">"Prebieha aktualizácia nastavenia Bluetooth"</string>
     <string name="gadget_state_template" msgid="5156935629902649932">"<xliff:g id="ID_1">%1$s</xliff:g> <xliff:g id="ID_2">%2$s</xliff:g>"</string>
     <string name="gadget_state_on" msgid="6909119593004937688">"zapnuté"</string>
     <string name="gadget_state_off" msgid="5220212352953066317">"vypnuté"</string>
     <string name="gadget_state_turning_on" msgid="3395992057029439039">"zapínanie"</string>
     <string name="gadget_state_turning_off" msgid="2395546048102176157">"vypínanie"</string>
-    <string name="gadget_wifi" msgid="4712584536500629417">"Wi-Fi"</string>
+    <string name="gadget_wifi" msgid="4712584536500629417">"Wi‑Fi"</string>
     <string name="gadget_bluetooth" msgid="8998572807378694410">"Bluetooth"</string>
     <string name="gadget_location" msgid="2974757497945178165">"Poloha"</string>
     <string name="gadget_sync" msgid="858895763714222152">"Synchronizácia"</string>
@@ -2247,19 +2258,19 @@
     <string name="credential_storage_type_software" msgid="4403117271207715378">"Iba softvérové"</string>
     <string name="credentials_settings_not_available" msgid="7968275634486624215">"Poverenia nie sú pre tohto používateľa k dispozícii"</string>
     <string name="credential_for_vpn_and_apps" msgid="4168197158768443365">"Nainštalované pre sieť VPN a aplikácie"</string>
-    <string name="credential_for_wifi" msgid="6228425986551591864">"Nainštalované pre sieť Wi-Fi"</string>
+    <string name="credential_for_wifi" msgid="6228425986551591864">"Nainštalované pre sieť Wi‑Fi"</string>
     <string name="credentials_unlock" msgid="385427939577366499"></string>
     <string name="credentials_unlock_hint" msgid="2301301378040499348">"Zadajte heslo pre úložisko poverení."</string>
     <string name="credentials_old_password" msgid="7553393815538684028">"Aktuálne heslo:"</string>
     <string name="credentials_reset_hint" msgid="6297256880896133631">"Chcete odstrániť všetok obsah?"</string>
-    <string name="credentials_password_too_short" msgid="7502749986405522663">"Heslo musí mať aspoň osem znakov."</string>
     <string name="credentials_wrong_password" msgid="2541932597104054807">"Nesprávne heslo."</string>
     <string name="credentials_reset_warning" msgid="5320653011511797600">"Nesprávne heslo. Do vymazania úložiska poverení vám zostáva jeden pokus."</string>
     <string name="credentials_reset_warning_plural" msgid="6514085665301095279">"Nesprávne heslo. Počet zostávajúcich pokusov do vymazania úložiska poverení: <xliff:g id="NUMBER">%1$d</xliff:g>."</string>
     <string name="credentials_erased" msgid="2907836028586342969">"Úložisko poverení bolo vymazané"</string>
     <string name="credentials_not_erased" msgid="7685932772284216097">"Úlož. poverení nemožno vymazať"</string>
     <string name="credentials_enabled" msgid="7588607413349978930">"Úložisko poverení je aktivované."</string>
-    <string name="credentials_configure_lock_screen_hint" msgid="6757119179588664966">"Pred použitím úložiska poverení musíte nastaviť PIN alebo heslo na uzamknutie obrazovky."</string>
+    <string name="credentials_configure_lock_screen_hint" msgid="8058230497337529036">"Než budete môcť používať úložisko poverení, musí mať zariadenie nastavenú zabezpečenú uzamknutú obrazovku"</string>
+    <string name="credentials_configure_lock_screen_button" msgid="253239765216055321">"NASTAVIŤ UZAMKNUTIE"</string>
     <string name="usage_access_title" msgid="332333405495457839">"Prístup k dátam o používaní"</string>
     <string name="emergency_tone_title" msgid="1055954530111587114">"Tiesňové vyzváňanie"</string>
     <string name="emergency_tone_summary" msgid="722259232924572153">"Nastaviť správanie pri tiesňovom volaní"</string>
@@ -2267,7 +2278,7 @@
     <string name="backup_section_title" msgid="7952232291452882740">"Zálohovať a obnoviť"</string>
     <string name="personal_data_section_title" msgid="7815209034443782061">"Osobné údaje"</string>
     <string name="backup_data_title" msgid="1239105919852668016">"Zálohovať moje dáta"</string>
-    <string name="backup_data_summary" msgid="708773323451655666">"Zálohovať dáta aplikácií, heslá Wi-Fi a ďalšie nastavenia na serveroch Google"</string>
+    <string name="backup_data_summary" msgid="708773323451655666">"Zálohovať dáta aplikácií, heslá Wi‑Fi a ďalšie nastavenia na serveroch Google"</string>
     <string name="backup_configure_account_title" msgid="3790872965773196615">"Zálohovací účet"</string>
     <string name="include_app_data_title" msgid="2829970132260278394">"Zahrnúť dáta aplikácií"</string>
     <string name="auto_restore_title" msgid="5397528966329126506">"Automaticky obnovovať"</string>
@@ -2275,9 +2286,9 @@
     <string name="backup_inactive_title" msgid="685838037986644604">"Služba zálohovania nie je aktívna"</string>
     <string name="backup_configure_account_default_summary" msgid="2436933224764745553">"Momentálne nie sú záložné údaje ukladané do žiadneho účtu"</string>
     <string name="backup_erase_dialog_title" msgid="1027640829482174106"></string>
-    <string name="backup_erase_dialog_message" msgid="5221011285568343155">"Chcete zastaviť zálohovanie hesiel Wi-Fi, záložiek, ďalších nastavení a dát aplikácií? Chcete vymazať všetky kópie na serveroch Google?"</string>
-    <string name="fullbackup_erase_dialog_message" msgid="694766389396659626">"Chcete zastaviť zálohovanie dát zariadenia (ako sú heslá Wi-Fi a história hovorov) a dát aplikácií (ako sú nastavenia a súbory uložené aplikáciami)? Chcete vymazať všetky kópie na vzdialených serveroch?"</string>
-    <string name="fullbackup_data_summary" msgid="960850365007767734">"Automaticky vzdialene zálohujte údaje zariadenia (napr. heslá do sietí Wi-Fi a históriu hovorov) a údaje aplikácií (napr. nastavenia a súbory uložené aplikáciami). \n\nKeď zapnete automatické zálohovanie, údaje zariadenia a aplikácií sa budú pravidelne vzdialene ukladať. Údaje aplikácie môžu byť ľubovoľné informácie uložené aplikáciou (na základe nastavení vývojára) aj potenciálne citlivé údaje, ako sú kontakty, správy a fotky."</string>
+    <string name="backup_erase_dialog_message" msgid="5221011285568343155">"Chcete zastaviť zálohovanie hesiel Wi‑Fi, záložiek, ďalších nastavení a dát aplikácií? Chcete vymazať všetky kópie na serveroch Google?"</string>
+    <string name="fullbackup_erase_dialog_message" msgid="694766389396659626">"Chcete zastaviť zálohovanie dát zariadenia (ako sú heslá Wi‑Fi a história hovorov) a dát aplikácií (ako sú nastavenia a súbory uložené aplikáciami)? Chcete vymazať všetky kópie na vzdialených serveroch?"</string>
+    <string name="fullbackup_data_summary" msgid="960850365007767734">"Automaticky vzdialene zálohujte údaje zariadenia (napr. heslá do sietí Wi‑Fi a históriu hovorov) a údaje aplikácií (napr. nastavenia a súbory uložené aplikáciami). \n\nKeď zapnete automatické zálohovanie, údaje zariadenia a aplikácií sa budú pravidelne vzdialene ukladať. Údaje aplikácie môžu byť ľubovoľné informácie uložené aplikáciou (na základe nastavení vývojára) aj potenciálne citlivé údaje, ako sú kontakty, správy a fotky."</string>
     <string name="device_admin_settings_title" msgid="4960761799560705902">"Nastavenia správcu zariadenia"</string>
     <string name="active_device_admin_msg" msgid="578748451637360192">"Aplikácia na správu zariadenia"</string>
     <string name="remove_device_admin" msgid="9207368982033308173">"Deaktivovať túto aplikáciu na správu zariadenia"</string>
@@ -2302,10 +2313,10 @@
     <string name="notification_log_title" msgid="3766148588239398464">"Denník upozornení"</string>
     <string name="sound_category_call_ringtone_vibrate_title" msgid="1543777228646645163">"Tón zvonenia a vibrovanie"</string>
     <string name="sound_category_system_title" msgid="1480844520622721141">"Systém"</string>
-    <string name="wifi_setup_title" msgid="2970260757780025029">"Nastavenie Wi-Fi"</string>
-    <string name="wifi_setup_title_editing_network" msgid="6020614644556717979">"Pripojenie k sieti Wi-Fi <xliff:g id="NETWORK_NAME">%s</xliff:g>"</string>
-    <string name="wifi_setup_title_connecting_network" msgid="5572226790101017822">"Prebieha pripájanie k sieti Wi-Fi <xliff:g id="NETWORK_NAME">%s</xliff:g>..."</string>
-    <string name="wifi_setup_title_connected_network" msgid="1608788657122010919">"Pripojené k sieti Wi-Fi <xliff:g id="NETWORK_NAME">%s</xliff:g>"</string>
+    <string name="wifi_setup_title" msgid="2970260757780025029">"Nastavenie Wi‑Fi"</string>
+    <string name="wifi_setup_title_editing_network" msgid="6020614644556717979">"Pripojenie k sieti Wi‑Fi <xliff:g id="NETWORK_NAME">%s</xliff:g>"</string>
+    <string name="wifi_setup_title_connecting_network" msgid="5572226790101017822">"Prebieha pripájanie k sieti Wi‑Fi <xliff:g id="NETWORK_NAME">%s</xliff:g>..."</string>
+    <string name="wifi_setup_title_connected_network" msgid="1608788657122010919">"Pripojené k sieti Wi‑Fi <xliff:g id="NETWORK_NAME">%s</xliff:g>"</string>
     <string name="wifi_setup_title_add_network" msgid="6932651000151032301">"Pridanie siete"</string>
     <string name="wifi_setup_not_connected" msgid="6997432604664057052">"Nepripojené"</string>
     <string name="wifi_setup_add_network" msgid="5939624680150051807">"Pridať sieť"</string>
@@ -2327,9 +2338,9 @@
     <string name="wifi_setup_status_connecting" msgid="4971421484401530740">"Pripája sa..."</string>
     <string name="wifi_setup_status_proceed_to_next" msgid="6708250000342940031">"Prejsť na ďalší krok"</string>
     <string name="wifi_setup_status_eap_not_supported" msgid="6796317704783144190">"Protokol EAP nie je podporovaný."</string>
-    <string name="wifi_setup_eap_not_supported" msgid="6812710317883658843">"Počas inštalácie nie je možné konfigurovať pripojenie k sieti Wi-Fi cez protokol EAP. Po inštalácii to môžete vykonať v sekcii Nastavenia &gt; Bezdrôtové pripojenie a siete."</string>
+    <string name="wifi_setup_eap_not_supported" msgid="6812710317883658843">"Počas inštalácie nie je možné konfigurovať pripojenie k sieti Wi‑Fi cez protokol EAP. Po inštalácii to môžete vykonať v sekcii Nastavenia &gt; Bezdrôtové pripojenie a siete."</string>
     <string name="wifi_setup_description_connecting" msgid="2793554932006756795">"Pripájanie môže trvať niekoľko minút..."</string>
-    <string name="wifi_setup_description_connected" msgid="6649168170073219153">"Ak chcete pokračovať v nastavovaní, klepnite na možnosť "<b>"Ďalej"</b>".\n\nAk sa chcete pripojiť k inej sieti Wi-Fi, klepnite na možnosť "<b>"Späť"</b>"."</string>
+    <string name="wifi_setup_description_connected" msgid="6649168170073219153">"Ak chcete pokračovať v nastavovaní, klepnite na možnosť "<b>"Ďalej"</b>".\n\nAk sa chcete pripojiť k inej sieti Wi‑Fi, klepnite na možnosť "<b>"Späť"</b>"."</string>
     <string name="accessibility_sync_enabled" msgid="558480439730263116">"Synchronizácia je povolená"</string>
     <string name="accessibility_sync_disabled" msgid="1741194106479011384">"Synchronizácia bola zakázaná"</string>
     <string name="accessibility_sync_in_progress" msgid="4501160520879902723">"Synchronizuje sa…"</string>
@@ -2379,8 +2390,6 @@
     <skip />
     <string name="cant_sync_dialog_title" msgid="2777238588398046285">"Nie je možné ručne synchronizovať"</string>
     <string name="cant_sync_dialog_message" msgid="1938380442159016449">"Synchronizácia tejto položky je momentálne zakázaná. Ak chcete toto nastavenie zmeniť, dočasne zapnite dátové prenosy na pozadí a automatickú synchronizáciu."</string>
-    <string name="wimax_settings" msgid="2655139497028469039">"4G"</string>
-    <string name="status_wimax_mac_address" msgid="8390791848661413416">"Adresa 4G MAC"</string>
     <string name="enter_password" msgid="8035706727471334122">"Ak chcete spustiť Android, zadajte heslo."</string>
     <string name="enter_pin" msgid="5305333588093263790">"Ak chcete spustiť Android, zadajte číslo PIN."</string>
     <string name="enter_pattern" msgid="4187435713036808566">"Ak chcete spustiť Android, nakreslite vzor."</string>
@@ -2394,6 +2403,7 @@
     <string name="misc_files_selected_count" msgid="4647048020823912088">"vybraté: <xliff:g id="NUMBER">%1$d</xliff:g> z <xliff:g id="TOTAL">%2$d</xliff:g>"</string>
     <string name="misc_files_selected_count_bytes" msgid="2876232009069114352">"<xliff:g id="NUMBER">%1$s</xliff:g> z <xliff:g id="TOTAL">%2$s</xliff:g>"</string>
     <string name="select_all" msgid="1562774643280376715">"Vybrať všetko"</string>
+    <string name="data_plan_usage_manage_plans_button_text" msgid="8997761990902708162">"Spravovať plány"</string>
     <string name="data_usage_summary_title" msgid="3804110657238092929">"Spotreba dát"</string>
     <string name="data_usage_app_summary_title" msgid="4147258989837459172">"Spotreba dát apl."</string>
     <string name="data_usage_accounting" msgid="7170028915873577387">"Účtovanie dát operátorom sa môže líšiť od údajov zariadenia."</string>
@@ -2407,7 +2417,7 @@
     <string name="data_usage_menu_restrict_background" msgid="1989394568592253331">"Obmedziť prenosy na pozadí"</string>
     <string name="data_usage_menu_allow_background" msgid="2694761978633359223">"Povoliť prenosy na pozadí"</string>
     <string name="data_usage_menu_split_4g" msgid="5322857680792601899">"Samostatné použitie 4G"</string>
-    <string name="data_usage_menu_show_wifi" msgid="2296217964873872571">"Zobraziť využitie Wi-Fi"</string>
+    <string name="data_usage_menu_show_wifi" msgid="2296217964873872571">"Zobraziť využitie Wi‑Fi"</string>
     <string name="data_usage_menu_hide_wifi" msgid="7290056718050186769">"Skryť využitie Wi‑Fi"</string>
     <string name="data_usage_menu_show_ethernet" msgid="5181361208532314097">"Zobraziť využitie siete Ethernet"</string>
     <string name="data_usage_menu_hide_ethernet" msgid="3326702187179943681">"Skryť využitie Ethernetu"</string>
@@ -2429,13 +2439,13 @@
     <string name="data_usage_disable_mobile_limit" msgid="4644364396844393848">"Nastaviť dát. limit mobil. sietí"</string>
     <string name="data_usage_disable_4g_limit" msgid="6233554774946681175">"Nastaviť dátový limit siete 4G"</string>
     <string name="data_usage_disable_3g_limit" msgid="2558557840444266906">"Nastaviť dát. limit sietí 2G-3G"</string>
-    <string name="data_usage_disable_wifi_limit" msgid="1394901415264660888">"Nastaviť dát. limit Wi-Fi"</string>
-    <string name="data_usage_tab_wifi" msgid="481146038146585749">"Wi-Fi"</string>
+    <string name="data_usage_disable_wifi_limit" msgid="1394901415264660888">"Nastaviť dát. limit Wi‑Fi"</string>
+    <string name="data_usage_tab_wifi" msgid="481146038146585749">"Wi‑Fi"</string>
     <string name="data_usage_tab_ethernet" msgid="7298064366282319911">"Ethernet"</string>
-    <string name="data_usage_tab_mobile" msgid="454140350007299045">"Mobil"</string>
+    <string name="data_usage_tab_mobile" msgid="454140350007299045">"Mobilné"</string>
     <string name="data_usage_tab_4g" msgid="1301978716067512235">"4G"</string>
     <string name="data_usage_tab_3g" msgid="6092169523081538718">"2G-3G"</string>
-    <string name="data_usage_list_mobile" msgid="5588685410495019866">"Mobil"</string>
+    <string name="data_usage_list_mobile" msgid="5588685410495019866">"Mobilné"</string>
     <string name="data_usage_list_none" msgid="3933892774251050735">"Žiadne"</string>
     <string name="data_usage_enable_mobile" msgid="986782622560157977">"Mobilné dáta"</string>
     <string name="data_usage_enable_3g" msgid="6304006671869578254">"Dátové prenosy 2G a 3G"</string>
@@ -2457,13 +2467,13 @@
     <string name="data_usage_cycle_editor_title" msgid="1373797281540188533">"Dátum obnovenia cyklu spotreby"</string>
     <string name="data_usage_cycle_editor_subtitle" msgid="5512903797979928416">"Dátum v každom mesiaci:"</string>
     <string name="data_usage_cycle_editor_positive" msgid="8821760330497941117">"Nastaviť"</string>
-    <string name="data_usage_warning_editor_title" msgid="3704136912240060339">"Nastaviť upozornenie o využívaní údajov"</string>
-    <string name="data_usage_limit_editor_title" msgid="9153595142385030015">"Nastavenie limitu spotreby dát"</string>
+    <string name="data_usage_warning_editor_title" msgid="3704136912240060339">"Upozornenie na spotrebu dát"</string>
+    <string name="data_usage_limit_editor_title" msgid="9153595142385030015">"Limit spotreby dát"</string>
     <string name="data_usage_limit_dialog_title" msgid="3023111643632996097">"Obmedzenie spotreby dát"</string>
     <string name="data_usage_limit_dialog_mobile" product="tablet" msgid="4983487893343645667">"Po dosiahnutí nastaveného limitu váš tablet vypne mobilné dátové pripojenie.\n\nKeďže spotrebu dát meria tablet, ale váš operátor môže spotrebu vyčísliť inak, je vhodné si nastaviť nižší limit."</string>
     <string name="data_usage_limit_dialog_mobile" product="default" msgid="3926320594049434225">"Po dosiahnutí nastaveného limitu váš telefón vypne mobilné dátové pripojenie.\n\nKeďže spotrebu dát meria telefón, ale váš operátor môže spotrebu vyčísliť inak, je vhodné nastaviť si nižší limit."</string>
     <string name="data_usage_restrict_background_title" msgid="2201315502223035062">"Obmedziť prenosy na pozadí?"</string>
-    <string name="data_usage_restrict_background" msgid="434093644726734586">"Ak obmedzíte mobilné dáta na pozadí, niektoré aplikácie a služby nebudú fungovať, dokým sa nepripojíte k sieti Wi-Fi."</string>
+    <string name="data_usage_restrict_background" msgid="434093644726734586">"Ak obmedzíte mobilné dáta na pozadí, niektoré aplikácie a služby nebudú fungovať, dokým sa nepripojíte k sieti Wi‑Fi."</string>
     <string name="data_usage_restrict_background_multiuser" product="tablet" msgid="7096707497743363380">"Ak obmedzíte mobilné dáta na pozadí, niektoré aplikácie a služby nebudú fungovať, dokým sa nepripojíte k sieti Wi‑Fi.\n\nToto nastavenie platí pre všetkých používateľov tabletu."</string>
     <string name="data_usage_restrict_background_multiuser" product="default" msgid="7910798414964288424">"Ak obmedzíte mobilné dáta na pozadí, niektoré aplikácie a služby nebudú fungovať, dokým sa nepripojíte k sieti Wi‑Fi.\n\nToto nastavenie platí pre všetkých používateľov telefónu."</string>
     <string name="data_usage_sweep_warning" msgid="6387081852568846982"><font size="18">"<xliff:g id="NUMBER">^1</xliff:g>"</font>" "<font size="9">"<xliff:g id="UNIT">^2</xliff:g>"</font>\n<font size="12">"upozorn."</font></string>
@@ -2477,8 +2487,11 @@
     <string name="data_usage_metered_title" msgid="7383175371006596441">"Obmedzenia siete"</string>
     <string name="data_usage_metered_body" msgid="7655851702771342507">"Keď sú dátové prenosy na pozadí obmedzené, zaobchádzame s meranými sieťami rovnako ako s mobilnými. Pred sťahovaním veľkých súborov pomocou týchto sietí vás môžu aplikácie upozorniť."</string>
     <string name="data_usage_metered_mobile" msgid="5423305619126978393">"Mobilné siete"</string>
-    <string name="data_usage_metered_wifi" msgid="1761738002328299714">"Merané siete Wi-Fi"</string>
-    <string name="data_usage_metered_wifi_disabled" msgid="727808462375941567">"Ak chcete vybrať merané siete, zapnite Wi-Fi."</string>
+    <string name="data_usage_metered_wifi" msgid="1761738002328299714">"Merané siete Wi‑Fi"</string>
+    <string name="data_usage_metered_wifi_disabled" msgid="727808462375941567">"Ak chcete vybrať merané siete, zapnite Wi‑Fi."</string>
+    <string name="data_usage_metered_auto" msgid="1262028400911918865">"Automaticky"</string>
+    <string name="data_usage_metered_yes" msgid="9217539611385225894">"S meraním dát"</string>
+    <string name="data_usage_metered_no" msgid="4025232961929071789">"Bez merania dát"</string>
     <string name="data_usage_disclaimer" msgid="6887858149980673444">"Účtovanie dát operátorom sa môže líšiť od údajov zariadenia."</string>
     <string name="cryptkeeper_emergency_call" msgid="198578731586097145">"Tiesňové volanie"</string>
     <string name="cryptkeeper_return_to_call" msgid="5613717339452772491">"Späť na hovor"</string>
@@ -2548,7 +2561,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">"Zakázať"</string>
+    <string name="trusted_credentials_disable_label" msgid="3864493185845818506">"Deaktivovať"</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>
@@ -2570,9 +2583,6 @@
     <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">"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>
     <string name="done_button" msgid="1991471253042622230">"Hotovo"</string>
     <plurals name="ssl_ca_cert_dialog_title" formatted="false" msgid="7145092748045794650">
@@ -2620,7 +2630,7 @@
     <string name="user_add_user_item_title" msgid="8212199632466198969">"Používateľ"</string>
     <string name="user_add_profile_item_title" msgid="8353515490730363621">"Obmedzený profil"</string>
     <string name="user_add_user_title" msgid="2108112641783146007">"Pridať nového používateľa?"</string>
-    <string name="user_add_user_message_long" msgid="8562152293752222985">"Toto zariadenie môžete zdieľať s inými ľuďmi tak, že vytvoríte ďalších používateľov. Každý používateľ má svoje prostredie, ktoré si môže prispôsobiť aplikáciami, tapetou atď. Môže tiež upraviť nastavenia zariadenia (napr. sieť Wi-Fi), ktoré ovplyvnia všetkých ostatných používateľov.\n\nKeď pridáte nového používateľa, musí si nastaviť vlastný priestor.\n\nKaždý používateľ môže aktualizovať aplikácie všetkých ostatných používateľov."</string>
+    <string name="user_add_user_message_long" msgid="8562152293752222985">"Toto zariadenie môžete zdieľať s inými ľuďmi tak, že vytvoríte ďalších používateľov. Každý používateľ má svoje prostredie, ktoré si môže prispôsobiť aplikáciami, tapetou atď. Môže tiež upraviť nastavenia zariadenia (napr. sieť Wi‑Fi), ktoré ovplyvnia všetkých ostatných používateľov.\n\nKeď pridáte nového používateľa, musí si nastaviť vlastný priestor.\n\nKaždý používateľ môže aktualizovať aplikácie všetkých ostatných používateľov."</string>
     <string name="user_add_user_message_short" msgid="1511354412249044381">"Keď pridáte nového používateľa, musí si nastaviť vlastný priestor.\n\nAkýkoľvek používateľ môže aktualizovať aplikácie všetkých ostatných používateľov."</string>
     <string name="user_setup_dialog_title" msgid="1765794166801864563">"Chcete teraz nastaviť používateľa?"</string>
     <string name="user_setup_dialog_message" msgid="1004068621380867148">"Uistite sa, že je daná osoba k dispozícii a môže si na zariadení nastaviť svoj priestor."</string>
@@ -2696,7 +2706,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>
@@ -2704,7 +2714,7 @@
     <string name="call_manager_title" msgid="4479949569744516457">"Správca hovorov"</string>
     <!-- no translation found for call_manager_summary (5918261959486952674) -->
     <skip />
-    <string name="cell_broadcast_settings" msgid="4124461751977706019">"Núdzové upozornenia"</string>
+    <string name="cell_broadcast_settings" msgid="4124461751977706019">"Tiesňové upozornenia"</string>
     <string name="network_operators_settings" msgid="2583178259504630435">"Sieťoví operátori"</string>
     <string name="access_point_names" msgid="1381602020438634481">"Názvy prístupových bodov"</string>
     <string name="enhanced_4g_lte_mode_title" msgid="5808043757309522392">"Zlepšený režim 4G LTE"</string>
@@ -2718,8 +2728,8 @@
     <string name="user_restrictions_controlled_by" msgid="3164078767438313899">"Riadi: <xliff:g id="APP">%1$s</xliff:g>"</string>
     <string name="app_sees_restricted_accounts" msgid="7503264525057246240">"Táto aplikácia má prístup k vašim účtom"</string>
     <string name="app_sees_restricted_accounts_and_controlled_by" msgid="6968697624437267294">"Táto aplikácia má prístup k vašim účtom. Riadené aplikáciou <xliff:g id="APP">%1$s</xliff:g>."</string>
-    <string name="restriction_wifi_config_title" msgid="8889556384136994814">"Siete Wi-Fi a mobilné siete"</string>
-    <string name="restriction_wifi_config_summary" msgid="70888791513065244">"Povoliť úpravu nastavení sietí Wi-Fi a mobilných sietí"</string>
+    <string name="restriction_wifi_config_title" msgid="8889556384136994814">"Siete Wi‑Fi a mobilné siete"</string>
+    <string name="restriction_wifi_config_summary" msgid="70888791513065244">"Povoliť úpravu nastavení sietí Wi‑Fi a mobilných sietí"</string>
     <string name="restriction_bluetooth_config_title" msgid="8871681580962503671">"Bluetooth"</string>
     <string name="restriction_bluetooth_config_summary" msgid="8372319681287562506">"Povoliť úpravy párovania a nastavení rozhrania Bluetooth"</string>
     <string name="restriction_nfc_enable_title" msgid="5888100955212267941">"NFC"</string>
@@ -2780,6 +2790,7 @@
       <item quantity="other">Zobraziť %d skrytých položiek</item>
       <item quantity="one">Zobraziť %d skrytú položku</item>
     </plurals>
+    <string name="dashboard_suggestion_condition_footer_content_description" msgid="2898588191174845961">"Zbaliť"</string>
     <string name="network_dashboard_title" msgid="4771589228992391573">"Sieť a internet"</string>
     <string name="network_dashboard_summary_mobile" msgid="3851083934739500429">"mobilné"</string>
     <string name="network_dashboard_summary_data_usage" msgid="3843261364705042212">"spotreba dát"</string>
@@ -2840,7 +2851,7 @@
     <string name="keywords_payment_settings" msgid="5220104934130446416">"platiť, klepnutie, platby"</string>
     <string name="keywords_backup" msgid="470070289135403022">"záloha, zálohovanie"</string>
     <string name="keywords_assist_gesture_launch" msgid="813968759791342591">"gesto"</string>
-    <string name="setup_wifi_nfc_tag" msgid="9028353016222911016">"Nastavenie štítka NFC pre Wi-Fi"</string>
+    <string name="setup_wifi_nfc_tag" msgid="9028353016222911016">"Nastavenie štítka NFC pre Wi‑Fi"</string>
     <string name="write_tag" msgid="8571858602896222537">"Zapísať"</string>
     <string name="status_awaiting_tap" msgid="2130145523773160617">"Klepnutím na značku začnete zápis..."</string>
     <string name="status_invalid_password" msgid="2575271864572897406">"Neplatné heslo, skúste to znova."</string>
@@ -2861,7 +2872,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íka"</string>
+    <string name="alarm_ringtone_title" msgid="6344025478514311386">"Predvolený zvuk budíkov"</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>
@@ -2884,8 +2895,14 @@
       <item quantity="other">Je zapnutých <xliff:g id="ON_COUNT">%d</xliff:g> automatických pravidiel</item>
       <item quantity="one">Je zapnuté 1 automatické pravidlo</item>
     </plurals>
-    <string name="zen_mode_settings_title" msgid="842308776768942600">"Nastavenia režimu Nerušiť"</string>
-    <string name="zen_mode_priority_settings_title" msgid="2623117023031824309">"Prioritné"</string>
+    <string name="zen_mode_settings_title" msgid="1066226840983908121">"Nerušiť"</string>
+    <string name="zen_mode_behavior_settings_title" msgid="1463303933529313969">"Správanie"</string>
+    <string name="zen_mode_behavior_allow_title" msgid="3845615648136218141">"Povoliť zvuky a vibrácie z:"</string>
+    <string name="zen_mode_behavior_no_sound" msgid="1219626004723208056">"Bez zvuku"</string>
+    <string name="zen_mode_behavior_total_silence" msgid="6716603819806610626">"Žiadne zvuky (Úplné ticho)"</string>
+    <string name="zen_mode_behavior_no_sound_except" msgid="4968477585788243114">"Žiadne zvuky okrem <xliff:g id="CATEGORIES">%1$s</xliff:g>"</string>
+    <!-- no translation found for zen_mode_behavior_alarms_only (2423480992071472963) -->
+    <skip />
     <string name="zen_mode_automation_settings_title" msgid="4228995740594063774">"Automatické pravidlá"</string>
     <string name="zen_mode_automation_suggestion_title" msgid="5105443455143476201">"Nastavenie pravidiel Nerušiť"</string>
     <string name="zen_mode_automation_suggestion_summary" msgid="4732808039946935657">"V určitých časoch obmedziť zvuky a vibrovanie"</string>
@@ -2912,7 +2929,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">"Blikanie"</string>
+    <string name="notification_pulse_title" msgid="1905382958860387030">"Blikať"</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>
@@ -2927,19 +2944,21 @@
     <string name="notifications_title" msgid="8086372779371204971">"Upozornenia"</string>
     <string name="app_notifications_title" msgid="5810577805218003760">"Upozornenia aplikácií"</string>
     <string name="notification_channel_title" msgid="2260666541030178452">"Kategória upozornenia"</string>
+    <string name="notification_group_title" msgid="7180506440133859601">"Skupina kategórií upozornení"</string>
     <string name="notification_importance_title" msgid="848692592679312666">"Dôležitosť"</string>
-    <string name="notification_importance_unspecified" msgid="2196023702875112081">"Umožnite aplikácii rozhodovať sa"</string>
+    <string name="notification_importance_unspecified" msgid="6622173510486113958">"Povoliť zvuk"</string>
     <string name="notification_importance_blocked" msgid="7938180808339386300">"Nikdy nezobrazovať upozornenia"</string>
     <string name="notification_importance_min" msgid="5455049524984686275">"Bez zvuku a vizuálneho vyrušenia"</string>
     <string name="notification_importance_low" msgid="8881468429453766553">"Bez zvuku"</string>
     <string name="notification_importance_default" msgid="5958338024601957516">"Vydať zvukový signál"</string>
     <string name="notification_importance_high" msgid="2082429479238228527">"Vydať zvukový signál a vyskočiť na obrazovku"</string>
+    <string name="notification_importance_high_silent" msgid="2667033773703765252">"Vyskočiť na obrazovke"</string>
     <string name="notification_importance_min_title" msgid="6974673091137544803">"Nízka"</string>
     <string name="notification_importance_low_title" msgid="8131254047772814309">"Stredná"</string>
     <string name="notification_importance_default_title" msgid="9120383978536089489">"Vysoká"</string>
     <string name="notification_importance_high_title" msgid="3058778300264746473">"Neodkladná"</string>
     <string name="allow_interruption" msgid="7136150018111848721">"Povoliť vyrušenia"</string>
-    <string name="allow_interruption_summary" msgid="7870159391333957050">"Povoľte aplikácii spustiť zvuk, vibrovať a/alebo spúšťať upozornenia na obrazovke"</string>
+    <string name="allow_interruption_summary" msgid="7870159391333957050">"Povoliť aplikácii prehrávať zvuk, vibrovať alebo zobrazovať upozornenia na obrazovke"</string>
     <string name="notification_channel_summary_min" msgid="5401718014765921892">"Nízka dôležitosť"</string>
     <string name="notification_channel_summary_low" msgid="322317684244981244">"Stredná dôležitosť"</string>
     <string name="notification_channel_summary_default" msgid="1111749130423589931">"Vysoká dôležitosť"</string>
@@ -2978,8 +2997,15 @@
     <string name="loading_notification_apps" msgid="5031818677010335895">"Načítavajú sa aplikácie..."</string>
     <string name="app_notifications_off_desc" msgid="4882445501376722969">"Android blokuje zobrazovanie upozornení z danej aplikácie na tomto zariadení"</string>
     <string name="channel_notifications_off_desc" msgid="5899225298718840635">"Android blokuje zobrazovanie danej kategórie upozornení na tomto zariadení"</string>
+    <string name="channel_group_notifications_off_desc" msgid="1620950416247316370">"Android blokuje zobrazovanie danej skupiny upozornení na tomto zariadení"</string>
     <string name="notification_channels" msgid="5346841743182627500">"Kategórie"</string>
     <string name="notification_channels_other" msgid="5645317113885788226">"Iné"</string>
+    <plurals name="notification_group_summary" formatted="false" msgid="3420621520561455358">
+      <item quantity="few"><xliff:g id="COUNT_1">%d</xliff:g> kategórie</item>
+      <item quantity="many"><xliff:g id="COUNT_1">%d</xliff:g> kategórie</item>
+      <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> kategórií</item>
+      <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> kategória</item>
+    </plurals>
     <string name="no_channels" msgid="3077375508177744586">"Táto aplikácia ešte neposlala žiadne upozornenia"</string>
     <string name="app_settings_link" msgid="8894946007543660906">"Ďalšie nastavenia v aplikácii"</string>
     <string name="app_notification_listing_summary_zero" msgid="6482582965081108108">"Zapnuté pre všetky aplikácie"</string>
@@ -3003,15 +3029,15 @@
     <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">"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_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="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">"Blikanie"</string>
+    <string name="notification_show_lights_title" msgid="7671781299688190532">"Blikať"</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>
@@ -3047,7 +3073,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">"Zastaviť v čase ukončenia alebo v čase spustenia ďalšieho budíka (podľa toho, čo nastane skôr)"</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="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>
@@ -3060,12 +3086,14 @@
     <string name="zen_mode_from_starred" msgid="2678345811950997027">"Iba od kontaktov s hviezdičkou"</string>
     <string name="zen_mode_from_none" msgid="8219706639954614136">"Žiadne"</string>
     <string name="zen_mode_alarms" msgid="2165302777886552926">"Budíky"</string>
+    <!-- no translation found for zen_mode_media_system_other (8900209390529859777) -->
+    <skip />
     <string name="zen_mode_reminders" msgid="5458502056440485730">"Pripomenutia"</string>
     <string name="zen_mode_events" msgid="7914446030988618264">"Udalosti"</string>
     <string name="zen_mode_all_callers" msgid="584186167367236922">"Všetci volajúci"</string>
     <string name="zen_mode_selected_callers" msgid="3127598874060615742">"Vybraní volajúci"</string>
     <string name="zen_mode_repeat_callers" msgid="5019521886428322131">"Opakované volania"</string>
-    <string name="zen_mode_repeat_callers_summary" msgid="7192713032364140137">"Ak tá istá osoba zavolá druhýkrát do <xliff:g id="MINUTES">%d</xliff:g> min, povoliť hovor"</string>
+    <string name="zen_mode_repeat_callers_summary" msgid="239685342222975733">"Ak tá istá osoba zavolá druhýkrát do <xliff:g id="MINUTES">%d</xliff:g> min"</string>
     <string name="zen_mode_when" msgid="2767193283311106373">"Zapínať automaticky"</string>
     <string name="zen_mode_when_never" msgid="8809494351918405602">"Nikdy"</string>
     <string name="zen_mode_when_every_night" msgid="3122486110091921009">"Každú noc"</string>
@@ -3098,7 +3126,8 @@
     <string name="zen_mode_screen_off_visual_interruptions" msgid="4850792880144382633">"Keď je obrazovka vypnutá"</string>
     <string name="zen_mode_no_visual_interruptions" msgid="8742776003822778472">"Keď je obrazovka zapnutá alebo vypnutá"</string>
     <string name="notification_app_settings_button" msgid="6685640230371477485">"Nastavenia upozornení"</string>
-    <string name="device_feedback" msgid="3238056036766293294">"Odoslať spätnú väzbu o zariadení"</string>
+    <string name="suggestion_button_text" msgid="3275010948381252006">"OK"</string>
+    <string name="device_feedback" msgid="3238056036766293294">"Spätná väzba o zariadení"</string>
     <string name="restr_pin_enter_admin_pin" msgid="1085834515677448072">"Zadajte PIN správcu"</string>
     <string name="switch_on_text" msgid="1124106706920572386">"Zapnuté"</string>
     <string name="switch_off_text" msgid="1139356348100829659">"Vypnuté"</string>
@@ -3131,13 +3160,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">"Nastavenie predvoleného otvárania"</string>
+    <string name="launch_by_default" msgid="1840761193189009248">"Predvolené otváranie"</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">"<xliff:g id="STORAGE_TYPE">%2$s</xliff:g> – využité miesto <xliff:g id="SIZE">%1$s</xliff:g>"</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_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>
@@ -3191,7 +3220,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 <xliff:g id="APPS">%1$s</xliff:g>"</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="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>
@@ -3242,7 +3271,7 @@
     <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 v zariadení"</string>
+    <string name="show_all_apps" msgid="1512506948197818534">"Zobraziť úplné využitie zariadenia"</string>
     <string name="hide_extra_apps" msgid="5016497281322459633">"Zobraziť využitie aplikácií"</string>
     <string name="power_high_usage_title" msgid="6027369425057347826">"Vysoká spotreba"</string>
     <plurals name="power_high_usage_summary" formatted="false" msgid="467347882627862744">
@@ -3294,6 +3323,7 @@
     <string name="usb_summary_file_transfers" msgid="6435943692610175111">"Prenos súborov"</string>
     <string name="usb_summary_photo_transfers" msgid="8440204169576585250">"Prenos fotiek (PTP)"</string>
     <string name="usb_summary_MIDI" msgid="5687906612187885908">"Zariadenie sa používa v režime MIDI"</string>
+    <string name="sms_mirroring_pref" msgid="6475043279147376031">"Zrkadlenie SMS"</string>
     <string name="background_check_pref" msgid="7550258400138010979">"Kontrola na pozadí"</string>
     <string name="background_check_title" msgid="4534254315824525593">"Úplný prístup na pozadí"</string>
     <string name="assist_access_context_title" msgid="2269032346698890257">"Použiť text z obrazovky"</string>
@@ -3362,7 +3392,7 @@
     <string name="write_settings_title" msgid="4232152481902542284">"Môže upravovať nastavenia systému"</string>
     <string name="write_system_settings" msgid="3482913590601096763">"Úprava nastavení systému"</string>
     <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="permit_write_settings" msgid="658555006453212691">"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>
@@ -3428,16 +3458,16 @@
     <string name="condition_expand_show" msgid="608202020023489939">"Zobraziť"</string>
     <string name="condition_expand_hide" msgid="948507739223760667">"Skryť"</string>
     <string name="condition_hotspot_title" msgid="7778958849468560027">"Hotspot je zapnutý"</string>
-    <string name="condition_hotspot_summary" msgid="3433182779269409683">"Prenosný hotspot Wi-Fi <xliff:g id="ID_1">%1$s</xliff:g> je aktívny, pripojenie Wi-Fi pre toto zariadenie je vypnuté."</string>
+    <string name="condition_hotspot_summary" msgid="3433182779269409683">"Prenosný hotspot Wi‑Fi <xliff:g id="ID_1">%1$s</xliff:g> je aktívny, pripojenie Wi‑Fi pre toto zariadenie je vypnuté."</string>
     <string name="condition_airplane_title" msgid="287356299107070503">"Režim v lietadle je zapnutý"</string>
-    <string name="condition_airplane_summary" msgid="5561586417832393666">"Siete Wi-Fi, Bluetooth a mobilná sieť sú vypnuté. Nemôžete telefonovať ani sa pripojiť k internetu."</string>
+    <string name="condition_airplane_summary" msgid="5561586417832393666">"Siete Wi‑Fi, Bluetooth a mobilná sieť sú vypnuté. Nemôžete telefonovať ani sa pripojiť k internetu."</string>
     <string name="condition_zen_title" msgid="2679168532600816392">"Nastavenie Nerušiť je zapnuté (<xliff:g id="ID_1">%1$s</xliff:g>)"</string>
     <string name="condition_battery_title" msgid="3272131008388575349">"Šetrič batérie je zapnutý"</string>
     <string name="condition_battery_summary" msgid="4418839236027977450">"Znížený výkon. Služby určovania polohy a dáta na pozadí sú vypnuté."</string>
     <string name="condition_cellular_title" msgid="1327317003797575735">"Mobilné dáta sú vypnuté"</string>
-    <string name="condition_cellular_summary" msgid="1818046558419658463">"Internet je k dispozícii len prostredníctvom siete Wi-Fi"</string>
+    <string name="condition_cellular_summary" msgid="1818046558419658463">"Internet je k dispozícii len prostredníctvom siete Wi‑Fi"</string>
     <string name="condition_bg_data_title" msgid="2483860304802846542">"Šetrič dát je zapnutý"</string>
-    <string name="condition_bg_data_summary" msgid="656957852895282228">"Dáta na pozadí sú dostupné iba prostredníctvom siete Wi-Fi. Môže to ovplyvniť niektoré aplikácie či služby, keď sieť Wi-Fi nie je dostupná."</string>
+    <string name="condition_bg_data_summary" msgid="656957852895282228">"Dáta na pozadí sú dostupné iba prostredníctvom siete Wi‑Fi. Môže to ovplyvniť niektoré aplikácie či služby, keď sieť Wi‑Fi nie je dostupná."</string>
     <string name="condition_work_title" msgid="7293722361184366648">"Pracovný profil je vypnutý"</string>
     <string name="condition_work_summary" msgid="7543202177571590378">"Aplikácie, synchronizácia na pozadí a ďalšie funkcie súvisiace s pracovným profilom sú vypnuté."</string>
     <string name="night_display_suggestion_title" msgid="6602129097059325291">"Nastavenie harmonogramu Nočného režimu"</string>
@@ -3463,18 +3493,21 @@
     <string name="color_temperature" msgid="2070126836910615605">"Studená teplota farby"</string>
     <string name="color_temperature_desc" msgid="4793729830226404052">"Používať studenšie farby obrazovky"</string>
     <string name="color_temperature_toast" msgid="4974218172133854827">"Ak chcete použiť zmenu farby, vypnite obrazovku"</string>
-    <string name="telephony_monitor_toast" msgid="7003764250271195384">"Ak chcete použiť zmenu monitorovania telefonických služieb, reštartujte zariadenie"</string>
+    <string name="connectivity_monitor_switch" msgid="9059759348648583421">"Monitorovanie pripojenia"</string>
+    <string name="connectivity_monitor_switch_summary" msgid="2828658652378866401">"Keď monitorovanie pripojenia zistí problém s pripojením, bude zhromažďovať denníky a zobrazí používateľovi upozornenie s výzvou na nahlásenie chyby"</string>
+    <string name="connectivity_monitor_toast" msgid="5551859612881173028">"Ak chcete použiť zmenu monitorovania pripojenia, reštartujte zariadenie"</string>
     <string name="camera_hal_hdrplus_switch" msgid="8377365197105267466">"Režim HAL HDR+ fotoaparátu"</string>
     <string name="camera_hal_hdrplus_toast" msgid="2063703797270055299">"Ak chcete uplatniť zmenu režimu HAL HDR+ fotoaparátu, reštartujte zariadenie"</string>
+    <string name="camera_laser_sensor_switch" msgid="8913588990743234440">"Laserový snímač fotoaparátu"</string>
     <string name="ota_disable_automatic_update" msgid="2319639631655915050">"Automatické aktualizácie systému"</string>
     <string name="usage" msgid="2977875522080448986">"Spotreba"</string>
     <string name="cellular_data_usage" msgid="2155683719898158203">"Spotreba mobilných dát"</string>
-    <string name="wifi_data_usage" msgid="686754111095324306">"Spotreba dát cez Wi-Fi"</string>
+    <string name="wifi_data_usage" msgid="686754111095324306">"Spotreba dát cez Wi‑Fi"</string>
     <string name="ethernet_data_usage" msgid="5108764537574354616">"Spotreba dát prostredníctvom ethernetu"</string>
-    <string name="wifi" msgid="1081550856200013637">"Wi-Fi"</string>
+    <string name="wifi" msgid="1081550856200013637">"Wi‑Fi"</string>
     <string name="ethernet" msgid="6600095783781389720">"Ethernet"</string>
     <string name="cell_data_template" msgid="405684854174361041">"<xliff:g id="AMOUNT">^1</xliff:g> mobilných dát"</string>
-    <string name="wifi_data_template" msgid="6265570748799357386">"Dáta Wi-Fi: <xliff:g id="AMOUNT">^1</xliff:g>"</string>
+    <string name="wifi_data_template" msgid="6265570748799357386">"Dáta Wi‑Fi: <xliff:g id="AMOUNT">^1</xliff:g>"</string>
     <string name="ethernet_data_template" msgid="5782476509881033590">"Ethernetové dáta: <xliff:g id="AMOUNT">^1</xliff:g>"</string>
     <string name="cell_warning_only" msgid="763147658209027140">"Dátové upozornenie <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="cell_warning_and_limit" msgid="2273413629267437470">"Dátové upozornenie <xliff:g id="ID_1">%1$s</xliff:g> / dátový limit <xliff:g id="ID_2">%2$s</xliff:g>"</string>
@@ -3488,12 +3521,12 @@
       <item quantity="one">1 obmedzenie</item>
     </plurals>
     <string name="operator_warning" msgid="1862988028996859195">"Účtovanie dát operátorom sa môže líšiť od účtovania na zariadení"</string>
-    <string name="data_used_template" msgid="3245919669966296505">"Využité <xliff:g id="ID_1">%1$s</xliff:g>"</string>
+    <string name="data_used_template" msgid="3245919669966296505">"Spotreba <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="set_data_warning" msgid="6115364758236594593">"Nastaviť dátové upozornenie"</string>
     <string name="data_warning" msgid="209133958008062117">"Dátové upozornenie"</string>
     <string name="set_data_limit" msgid="2901526323210516923">"Nastaviť dátový limit"</string>
     <string name="data_limit" msgid="1885406964934590552">"Dátový limit"</string>
-    <string name="data_usage_template" msgid="392191945602400904">"<xliff:g id="ID_2">%2$s</xliff:g> ste spotrebovali <xliff:g id="ID_1">%1$s</xliff:g>"</string>
+    <string name="data_usage_template" msgid="2923744765873163859">"<xliff:g id="ID_2">%2$s</xliff:g> spotreba <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="configure" msgid="1029654422228677273">"Konfigurovať"</string>
     <string name="data_usage_other_apps" msgid="3272872663517382050">"Iné aplikácie zahrnuté v prehľade spotreby dát"</string>
     <plurals name="data_saver_unrestricted_summary" formatted="false" msgid="2635267833484232703">
@@ -3515,7 +3548,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">"Pridanie ďalšieho odtlačku"</string>
+    <string name="suggestion_additional_fingerprints" msgid="2214281455363797037">"Pridať ďalší odtlačok"</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>
@@ -3566,7 +3599,7 @@
     <string name="button_confirm_convert_fbe" msgid="7101855374850373091">"Vymazať a konvertovať"</string>
     <string name="reset_shortcut_manager_throttling" msgid="6495066467198668994">"Resetovať obmedzovanie frekvencie žiadostí v službe ShortcutManager"</string>
     <string name="reset_shortcut_manager_throttling_complete" msgid="1826770872063707900">"Obmedzovanie frekvencie žiadostí v službe ShortcutManager bolo resetované"</string>
-    <string name="notification_suggestion_title" msgid="4506524937307816475">"Ovládajte upozornenia na zamk. obrazovke"</string>
+    <string name="notification_suggestion_title" msgid="387052719462473500">"Ovládajte informácie na uzamknutej obrazovke"</string>
     <string name="notification_suggestion_summary" msgid="8521159741445416875">"Zobrazujte si obsah upozornení alebo ho skryte"</string>
     <string name="page_tab_title_summary" msgid="4070309266374993258">"Všetko"</string>
     <string name="page_tab_title_support" msgid="8483187649355540109">"Podpora a tipy"</string>
@@ -3574,7 +3607,7 @@
     <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>
     <string name="premium_sms_access" msgid="4660047004791638305">"Prístup k prémiovým správam SMS"</string>
-    <string name="bluetooth_disabled" msgid="2456198532288640046">"Neviditeľné pre ostatné zariadenia"</string>
+    <string name="bluetooth_disabled" msgid="6244000672828617410">"Vypnuté"</string>
     <string name="bluetooth_connected_summary" msgid="7672528674593152862">"Pripojené k zariadeniu <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="bluetooth_connected_multiple_devices_summary" msgid="9173661896296663932">"Pripojené k viacerým zariadeniam"</string>
     <string name="demo_mode" msgid="2798762752209330277">"Ukážka používateľského rozhrania systému"</string>
@@ -3682,7 +3715,7 @@
     <string name="web_action_enable_title" msgid="4051513950976670853">"Okamžité aplikácie"</string>
     <string name="web_action_enable_summary" msgid="3108127559723396382">"Otvárajte odkazy v aplikáciách, aj keď nie sú nainštalované"</string>
     <string name="web_action_section_title" msgid="7364647086538399136">"Okamžité aplikácie"</string>
-    <string name="instant_apps_account" msgid="1433620209791992528">"Účet okamžitých aplikácií"</string>
+    <string name="instant_apps_settings" msgid="8827777916518348213">"Predvoľby okamžitých aplikácií"</string>
     <string name="domain_url_section_title" msgid="7046835219056428883">"Nainštalované aplikácie"</string>
     <string name="automatic_storage_manager_activation_warning" msgid="6353100011690933254">"Vaše úložisko odteraz riadi správca úložiska"</string>
     <string name="account_for_section_header" msgid="5356566418548737121">"Účty používateľa <xliff:g id="USER_NAME">%1$s</xliff:g>"</string>
@@ -3733,7 +3766,9 @@
     <string name="enterprise_privacy_always_on_vpn_personal" msgid="9217774730260037434">"Trvalé pripojenie k sieti VPN je zapnuté vo vašom osobnom profile"</string>
     <string name="enterprise_privacy_always_on_vpn_work" msgid="7244472958208315814">"Trvalé pripojenie k sieti VPN je zapnuté vo vašom pracovnom profile"</string>
     <string name="enterprise_privacy_global_http_proxy" msgid="7936664553416257333">"Bol nastavený globálny proxy server protokolu HTTP"</string>
-    <string name="enterprise_privacy_ca_certs" msgid="5885892204903688909">"Dôveryhodné poverenia"</string>
+    <string name="enterprise_privacy_ca_certs_device" msgid="2019652712782510262">"Dôveryhodné poverenia"</string>
+    <string name="enterprise_privacy_ca_certs_personal" msgid="2279084820904076599">"Dôveryhodné poverenia vo vašom osobnom profile"</string>
+    <string name="enterprise_privacy_ca_certs_work" msgid="6187377647815301809">"Dôveryhodné poverenia vo vašom pracovnom profile"</string>
     <plurals name="enterprise_privacy_number_ca_certs" formatted="false" msgid="526375234629534165">
       <item quantity="few">Minimálne <xliff:g id="COUNT_1">%d</xliff:g> certifikáty CA</item>
       <item quantity="many">Minimálne <xliff:g id="COUNT_1">%d</xliff:g> certifikátu CA</item>
@@ -3806,6 +3841,8 @@
     <string name="carrier_provisioning" msgid="4398683675591893169">"Informácie o poskytovaní služieb operátorom"</string>
     <string name="trigger_carrier_provisioning" msgid="3434865918009286187">"Spustiť poskytovanie služieb operátorom"</string>
     <string name="new_device_suggestion_title" msgid="698847081680980774">"Aké sú najaktuálnejšie novinky?"</string>
-    <string name="new_device_suggestion_summary" msgid="7172709269203435870">"Prezrite si 5 najlepších funkcií"</string>
+    <string name="new_device_suggestion_summary" product="default" msgid="206396571522515855">"Pozrite si prehliadku nového telefónu"</string>
+    <string name="new_device_suggestion_summary" product="tablet" msgid="393751455688210956">"Pozrite si prehliadku nového tabletu"</string>
+    <string name="new_device_suggestion_summary" product="device" msgid="2939870049868336652">"Pozrite si prehliadku nového zariadenia"</string>
     <string name="disabled_low_ram_device" msgid="3751578499721173344">"Táto funkcia nie je v zariadení k dispozícii"</string>
 </resources>
diff --git a/res/values-sl/arrays.xml b/res/values-sl/arrays.xml
index 4e034f3..ed58a76 100644
--- a/res/values-sl/arrays.xml
+++ b/res/values-sl/arrays.xml
@@ -100,8 +100,6 @@
     <!-- no translation found for wifi_security_no_eap:0 (2084555984818107151) -->
     <!-- no translation found for wifi_security_no_eap:1 (397579322683471524) -->
     <!-- no translation found for wifi_security_no_eap:2 (1968820975358150484) -->
-    <!-- no translation found for wifi_ap_security:0 (5251664683198623324) -->
-    <!-- no translation found for wifi_ap_security:1 (7989073072260294673) -->
   <string-array name="wifi_eap_method">
     <item msgid="1160193392455075561">"PEAP"</item>
     <item msgid="7981731051382306293">"TLS"</item>
diff --git a/res/values-sl/strings.xml b/res/values-sl/strings.xml
index e0ece49..419625c 100644
--- a/res/values-sl/strings.xml
+++ b/res/values-sl/strings.xml
@@ -168,7 +168,7 @@
     <string name="bluetooth_map_acceptance_dialog_text" msgid="8712508202081143737">"%1$s želi dostopati do vaših sporočil. Želite omogočiti dostop za %2$s?"</string>
     <string name="bluetooth_sap_request" msgid="2669762224045354417">"Zahteva za dostop do kartice SIM"</string>
     <string name="bluetooth_sap_acceptance_dialog_text" msgid="4414253873553608690">"<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g> želi dostopati do vaše kartice SIM. Z omogočanjem dostopa do kartice SIM bodo v napravi za čas trajanja povezave onemogočene podatkovne povezave. Omogočite dostop za <xliff:g id="DEVICE_NAME_1">%2$s?</xliff:g>"</string>
-    <string name="bluetooth_device_name_summary" msgid="4757990010751789977">"Drugim napravam vidno kot »<xliff:g id="DEVICE_NAME">^1</xliff:g>«"</string>
+    <string name="bluetooth_device_name_summary" msgid="522235742194965734">"Drugim napravam vidno kot »<xliff:g id="DEVICE_NAME">^1</xliff:g>«"</string>
     <string name="bluetooth_paired_device_title" msgid="8638994696317952019">"Vaše naprave"</string>
     <string name="bluetooth_pairing_page_title" msgid="7712127387361962608">"Seznanitev nove naprave"</string>
     <string name="date_and_time" msgid="9062980487860757694">"Datum in ura"</string>
@@ -316,6 +316,8 @@
     <string name="zone_auto" msgid="334783869352026648">"Samodejni časovni pas"</string>
     <string name="zone_auto_summaryOn" msgid="6142830927278458314">"Uporabi časovni pas omrežja"</string>
     <string name="zone_auto_summaryOff" msgid="2597745783162041390">"Uporabi časovni pas omrežja"</string>
+    <string name="date_time_24hour_auto" msgid="2117383168985653422">"Samodejna 24-urna oblika"</string>
+    <string name="date_time_24hour_auto_summary" msgid="6351812925651480277">"Uporabi privzete območne nastavitve"</string>
     <string name="date_time_24hour_title" msgid="3203537578602803850">"24-urna oblika"</string>
     <string name="date_time_24hour" msgid="1193032284921000063">"Uporabljaj 24-urno obliko"</string>
     <string name="date_time_set_time_title" msgid="6296795651349047016">"Čas"</string>
@@ -378,6 +380,9 @@
     <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="1961957425135180242">"Naprej"</string>
+    <string name="setup_fingerprint_enroll_skip_title" msgid="362050541117362034">"Preskok nast. prstnega odtisa?"</string>
+    <string name="setup_fingerprint_enroll_skip_after_adding_lock_text" msgid="958990414356204763">"Nastavitev prstnega odtisa vam bo vzela le minuto ali dve. Če nastavitev preskočite, lahko prstni odtis dodate pozneje v nastavitvah."</string>
+    <string name="lock_screen_intro_skip_title" msgid="4988210105913705679">"Preskok zaklepanja zaslona?"</string>
     <string name="lock_screen_intro_skip_dialog_text_frp" product="tablet" msgid="1581834104051243425">"Funkcije za zaščito naprave ne bodo vklopljene. Če tablični računalnik izgubite, vam ga ukradejo ali ponastavijo na tovarniške nastavitve, drugim osebam ne boste mogli preprečiti njegove uporabe."</string>
     <string name="lock_screen_intro_skip_dialog_text_frp" product="device" msgid="4629503416877189572">"Funkcije za zaščito naprave ne bodo vklopljene. Če napravo izgubite, vam jo ukradejo ali ponastavijo na tovarniške nastavitve, drugim osebam ne boste mogli preprečiti njene uporabe."</string>
     <string name="lock_screen_intro_skip_dialog_text_frp" product="default" msgid="2423428240245737909">"Funkcije za zaščito naprave ne bodo vklopljene. Če telefon izgubite, vam ga ukradejo ali ponastavijo na tovarniške nastavitve, drugim osebam ne boste mogli preprečiti njegove uporabe."</string>
@@ -463,7 +468,7 @@
     <string name="setup_lock_settings_picker_title" product="tablet" msgid="90329443364067215">"Zaščita tablič. račun."</string>
     <string name="setup_lock_settings_picker_title" product="device" msgid="2399952075134938929">"Zaščita naprave"</string>
     <string name="setup_lock_settings_picker_title" product="default" msgid="1572244299605153324">"Zaščita telefona"</string>
-    <string name="setup_lock_settings_picker_fingerprint_message" msgid="5585650064305600578">"Zaradi večje varnosti nastavite nadomestno zaklepanje zaslona."</string>
+    <string name="lock_settings_picker_fingerprint_added_security_message" msgid="5768002109707648463">"Zaradi večje varnosti nastavite nadomestno zaklepanje zaslona."</string>
     <string name="setup_lock_settings_picker_message" product="tablet" msgid="8919671129189936210">"Vklopite zaščitne funkcije naprave, da drugim preprečite uporabo tega tabličnega računalnika brez vašega dovoljenja. Izberite zaklepanje zaslona, ki ga želite uporabljati."</string>
     <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>
@@ -505,29 +510,37 @@
     <string name="unlock_disable_frp_warning_title" msgid="264008934468492550">"Želite odstraniti zaščito naprave?"</string>
     <string name="unlock_disable_frp_warning_title_profile" msgid="5507136301904313583">"Želite odstraniti zaščito profila?"</string>
     <string name="unlock_disable_frp_warning_content_pattern" msgid="8869767290771023461">"Funkcije za zaščito naprave ne bodo delovale brez vzorca."</string>
-    <!-- no translation found for unlock_disable_frp_warning_content_pattern_fingerprint (2986105377420905314) -->
-    <skip />
+    <string name="unlock_disable_frp_warning_content_pattern_fingerprint" msgid="2986105377420905314">"Funkcije za zaščito naprave ne bodo delovale brez vzorca.<xliff:g id="EMPTY_LINE">
+
+</xliff:g>Iz naprave bodo prav tako odstranjeni shranjeni prstni odtisi, tako da z njimi ne boste mogli odkleniti telefona, odobriti nakupov ali se prijaviti v aplikacije."</string>
     <string name="unlock_disable_frp_warning_content_pin" msgid="586996206210265131">"Funkcije za zaščito naprave ne bodo delovale brez kode PIN."</string>
-    <!-- no translation found for unlock_disable_frp_warning_content_pin_fingerprint (3370462835533123695) -->
-    <skip />
+    <string name="unlock_disable_frp_warning_content_pin_fingerprint" msgid="3370462835533123695">"Funkcije za zaščito naprave ne bodo delovale brez kode PIN.<xliff:g id="EMPTY_LINE">
+
+</xliff:g>Iz naprave bodo prav tako odstranjeni shranjeni prstni odtisi, tako da z njimi ne boste mogli odkleniti telefona, odobriti nakupov ali se prijaviti v aplikacije."</string>
     <string name="unlock_disable_frp_warning_content_password" msgid="5420612686852555537">"Funkcije za zaščito naprave ne bodo delovale brez gesla."</string>
-    <!-- no translation found for unlock_disable_frp_warning_content_password_fingerprint (3595476296430536798) -->
-    <skip />
+    <string name="unlock_disable_frp_warning_content_password_fingerprint" msgid="3595476296430536798">"Funkcije za zaščito naprave ne bodo delovale brez gesla.<xliff:g id="EMPTY_LINE">
+
+</xliff:g>Iz naprave bodo prav tako odstranjeni shranjeni prstni odtisi, tako da z njimi ne boste mogli odkleniti telefona, odobriti nakupov ali se prijaviti v aplikacije."</string>
     <string name="unlock_disable_frp_warning_content_unknown" msgid="1550718040483548220">"Funkcije za zaščito naprave ne bodo delovale brez zaklepanja zaslona."</string>
-    <!-- no translation found for unlock_disable_frp_warning_content_unknown_fingerprint (3679351662094349506) -->
-    <skip />
+    <string name="unlock_disable_frp_warning_content_unknown_fingerprint" msgid="3679351662094349506">"Funkcije za zaščito naprave ne bodo delovale brez zaklepanja zaslona.<xliff:g id="EMPTY_LINE">
+
+</xliff:g>Iz naprave bodo prav tako odstranjeni shranjeni prstni odtisi, tako da z njimi ne boste mogli odkleniti telefona, odobriti nakupov ali se prijaviti v aplikacije."</string>
     <string name="unlock_disable_frp_warning_content_pattern_profile" msgid="8682200103576359918">"Funkcije za zaščito profila ne bodo delovale brez vzorca."</string>
-    <!-- no translation found for unlock_disable_frp_warning_content_pattern_fingerprint_profile (6718155854303231675) -->
-    <skip />
+    <string name="unlock_disable_frp_warning_content_pattern_fingerprint_profile" msgid="6718155854303231675">"Funkcije za zaščito profila ne bodo delovale brez vzorca.<xliff:g id="EMPTY_LINE">
+
+</xliff:g>Iz profila bodo prav tako odstranjeni shranjeni prstni odtisi, tako da z njimi ne boste mogli odkleniti profila, odobriti nakupov ali se prijaviti v aplikacije."</string>
     <string name="unlock_disable_frp_warning_content_pin_profile" msgid="7790688070593867767">"Funkcije za zaščito profila ne bodo delovale brez kode PIN."</string>
-    <!-- no translation found for unlock_disable_frp_warning_content_pin_fingerprint_profile (4209564603132870532) -->
-    <skip />
+    <string name="unlock_disable_frp_warning_content_pin_fingerprint_profile" msgid="4209564603132870532">"Funkcije za zaščito profila ne bodo delovale brez kode PIN.<xliff:g id="EMPTY_LINE">
+
+</xliff:g>Iz profila bodo prav tako odstranjeni shranjeni prstni odtisi, tako da z njimi ne boste mogli odkleniti profila, odobriti nakupov ali se prijaviti v aplikacije."</string>
     <string name="unlock_disable_frp_warning_content_password_profile" msgid="7569285520567674461">"Funkcije za zaščito profila ne bodo delovale brez gesla."</string>
-    <!-- no translation found for unlock_disable_frp_warning_content_password_fingerprint_profile (2994300676764706047) -->
-    <skip />
+    <string name="unlock_disable_frp_warning_content_password_fingerprint_profile" msgid="2994300676764706047">"Funkcije za zaščito profila ne bodo delovale brez gesla.<xliff:g id="EMPTY_LINE">
+
+</xliff:g>Iz profila bodo prav tako odstranjeni shranjeni prstni odtisi, tako da z njimi ne boste mogli odkleniti profila, odobriti nakupov ali se prijaviti v aplikacije."</string>
     <string name="unlock_disable_frp_warning_content_unknown_profile" msgid="6984215718701688202">"Funkcije za zaščito profila ne bodo delovale brez zaklepanja zaslona."</string>
-    <!-- no translation found for unlock_disable_frp_warning_content_unknown_fingerprint_profile (4994062501123299418) -->
-    <skip />
+    <string name="unlock_disable_frp_warning_content_unknown_fingerprint_profile" msgid="4994062501123299418">"Funkcije za zaščito profila ne bodo delovale brez zaklepanja zaslona.<xliff:g id="EMPTY_LINE">
+
+</xliff:g>Iz profila bodo prav tako odstranjeni shranjeni prstni odtisi, tako da z njimi ne boste mogli odkleniti profila, odobriti nakupov ali se prijaviti v aplikacije."</string>
     <string name="unlock_disable_frp_warning_ok" msgid="7075138677177748705">"Da, odstrani"</string>
     <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>
@@ -598,6 +611,7 @@
     <string name="lockpassword_pin_no_sequential_digits" msgid="680765285206990584">"Naraščajoč, padajoč ali ponavljajoč se niz števk je prepovedan."</string>
     <string name="lockpassword_ok_label" msgid="313822574062553672">"V redu"</string>
     <string name="lockpassword_cancel_label" msgid="8818529276331121899">"Prekliči"</string>
+    <string name="lockpassword_clear_label" msgid="5724429464960458155">"Izbriši"</string>
     <string name="lockpattern_tutorial_cancel_label" msgid="6431583477570493261">"Prekliči"</string>
     <string name="lockpattern_tutorial_continue_label" msgid="3559793618653400434">"Naprej"</string>
     <string name="lock_setup" msgid="3355847066343753943">"Namestitev je končana."</string>
@@ -795,6 +809,7 @@
     <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>
@@ -831,6 +846,8 @@
     <string name="wifi_wps_available_first_item" msgid="4422547079984583502">"WPS je na voljo"</string>
     <string name="wifi_wps_available_second_item" msgid="8427520131718215301">" (WPS je na voljo)"</string>
     <string name="wifi_wps_nfc_enter_password" msgid="2288214226916117159">"Vnesite geslo za omrežje"</string>
+    <string name="wifi_carrier_connect" msgid="8174696557882299911">"Omrežje Wi‑Fi operaterja"</string>
+    <string name="wifi_carrier_content" msgid="4634077285415851933">"Povezava prek omrežja <xliff:g id="NAME">%1%s</xliff:g>"</string>
     <string name="wifi_scan_always_turnon_message" msgid="203123538572122989">"Za izboljšanje natančnosti lokacijskih podatkov in druge namene želi <xliff:g id="APP_NAME">%1$s</xliff:g> vklopiti iskanje omrežij, tudi ko je Wi-Fi izklopljen.\n\nŽelite to dovoliti vsem aplikacijam, ki želijo iskati omrežja?"</string>
     <string name="wifi_scan_always_turnoff_message" msgid="5538901671131941043">"Če želite to možnost izklopiti, v meniju z dodatnimi elementi odprite »Dodatno«."</string>
     <string name="wifi_scan_always_confirm_allow" msgid="5355973075896817232">"Dovoli"</string>
@@ -848,6 +865,7 @@
     <string name="wifi_connect" msgid="1076622875777072845">"Vzpostavi povezavo"</string>
     <string name="wifi_failed_connect_message" msgid="8491902558970292871">"Vzpostavljanje povezave z omrežjem ni uspelo"</string>
     <string name="wifi_forget" msgid="8168174695608386644">"Pozabi"</string>
+    <string name="wifi_modify" msgid="6100248070440710782">"Spremeni"</string>
     <string name="wifi_failed_forget_message" msgid="1348172929201654986">"Pozabljanje omrežja ni uspelo"</string>
     <string name="wifi_save" msgid="3331121567988522826">"Shrani"</string>
     <string name="wifi_failed_save_message" msgid="6650004874143815692">"Shranjevanje omrežja ni uspelo"</string>
@@ -862,6 +880,7 @@
     <string name="wifi_advanced_titlebar" msgid="4485841401774142908">"Dodatne nast. za 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_title" msgid="3471132676909349382">"Podatki o omrežju"</string>
     <string name="wifi_details_subnet_mask" msgid="6720279144174924410">"Maska podomrežja"</string>
     <string name="wifi_details_dns" msgid="8648826607751830768">"DNS"</string>
     <string name="wifi_details_ipv6_address_header" msgid="6734119149106422148">"Naslovi IPv6"</string>
@@ -894,16 +913,15 @@
     <string name="wifi_p2p_cancel_connect_title" msgid="255267538099324413">"Želite preklicati povabilo?"</string>
     <string name="wifi_p2p_cancel_connect_message" msgid="7477756213423749402">"Ali želite preklicati povabilo za povezavo z napravo <xliff:g id="PEER_NAME">%1$s</xliff:g>?"</string>
     <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_off_subtext" msgid="5466126533609394170">"Internetna povezava ali vsebina ni v skupni rabi z drugimi napravami"</string>
     <string name="wifi_hotspot_tethering_on_subtext" product="tablet" msgid="5752490509369962007">"Skupna raba internetne povezave tega tabličnega računalnika prek dostopne točke"</string>
     <string name="wifi_hotspot_tethering_on_subtext" product="default" msgid="6461075246164300670">"Skupna raba internetne povezave tega telefona prek dostopne točke"</string>
     <string name="wifi_hotspot_on_local_only_subtext" msgid="2068110388011294735">"Aplikacija daje vsebino v skupno rabo. Če želite omogočiti skupno rabo internetne povezave, dostopno točko izklopite in znova vklopite."</string>
-    <string name="wifi_hotspot_name_title" msgid="1341735529132128887">"Ime dostopne točke Wi‑Fi"</string>
+    <string name="wifi_hotspot_name_title" msgid="8237000746618636778">"Ime dostopne točke"</string>
     <string name="wifi_hotspot_name_summary_connecting" msgid="3378299995508671967">"Vklapljanje dostopne točke <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>..."</string>
     <string name="wifi_hotspot_name_summary_connected" msgid="3888672084861445362">"Druge naprave se lahko povežejo z dostopno točko <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>"</string>
-    <string name="wifi_hotspot_password_title" msgid="1955592302902091281">"Geslo za Wi-Fi"</string>
+    <string name="wifi_hotspot_password_title" msgid="8676859981917573801">"Geslo za dostopno točko"</string>
     <string name="wifi_hotspot_ap_band_title" msgid="1165801173359290681">"Pas dostopne točke"</string>
     <string name="wifi_hotspot_footer_info_regular" msgid="1203489406068036455">"Uporabite dostopno točko, da ustvarite omrežje Wi‑Fi za druge svoje naprave. Dostopna točka omogoča uporabo interneta prek mobilne podatkovne povezave, zato lahko nastanejo dodatni stroški prenosa podatkov po mobilnem omrežju."</string>
     <string name="wifi_hotspot_footer_info_local_only" msgid="857988412470694109">"Aplikacije lahko ustvarijo dostopno točko za skupno rabo vsebin z napravami v bližini."</string>
@@ -914,7 +932,6 @@
     <string name="wifi_tether_configure_ap_text" msgid="7974681394041609308">"Nastavitev dostopne točke Wi-Fi"</string>
     <string name="wifi_hotspot_configure_ap_text" msgid="5478614731464220432">"Nastavitev dostopne toč. Wi‑Fi"</string>
     <string name="wifi_hotspot_configure_ap_text_summary" msgid="5560680057727007011">"Dostopna točka AndroidAP WPA2 PSK"</string>
-    <string name="wifi_tether_configure_subtext" msgid="2050196439900426456">"Dostopna točka <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">"Klicanje prek Wi-Fi-ja"</string>
     <string name="wifi_calling_suggestion_title" msgid="9008010480466359578">"Vklop klicanja prek Wi-Fi-ja"</string>
@@ -955,7 +972,7 @@
     <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="emergency_address_summary" msgid="3266760199681945746">"Naslov, ki ga intervencijske službe uporabijo kot vašo lokacijo, če opravite klic v sili prek omrežja Wi‑Fi"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"Zaslon"</string>
     <string name="sound_settings" msgid="5534671337768745343">"Zvok"</string>
     <string name="all_volume_title" msgid="4296957391257836961">"Glasnost"</string>
@@ -1009,6 +1026,7 @@
     <string name="search_settings" msgid="1910951467596035063">"Iskanje"</string>
     <string name="search_settings_summary" msgid="9205656546570654169">"Upravljaj nastavitve iskanja in zgodovine"</string>
     <string name="search_settings_no_results" msgid="8799027492641230999">"Ni rezultatov"</string>
+    <string name="search_clear_history" msgid="4196658962573162457">"Počisti zgodovino"</string>
     <string name="display_settings" msgid="7965901687241669598">"Zaslon"</string>
     <string name="accelerometer_title" msgid="7854608399547349157">"Samodejno zasukaj zaslon"</string>
     <string name="color_mode_title" msgid="3159275920408338215">"Intenzivne barve"</string>
@@ -1061,33 +1079,31 @@
     <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">"Spreminjanje ozadja"</string>
+    <string name="wallpaper_suggestion_title" msgid="8583988696513822528">"Spremenite ozadje"</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 napajanjem"</string>
-    <string name="screensaver_settings_summary_dock" msgid="2072657401664633283">"V stojalu"</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_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 zagnati"</string>
+    <string name="screensaver_settings_when_to_dream" msgid="7262410541382890146">"Kdaj naj se zažene"</string>
     <string name="screensaver_settings_current" msgid="4663846038247130023">"Trenutni ohranjevalnik zaslona"</string>
-    <string name="screensaver_settings_dream_start" msgid="4998187847985120168">"Začnite zdaj"</string>
+    <string name="screensaver_settings_dream_start" msgid="4998187847985120168">"Zaženi 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="ambient_display_screen_title" msgid="4252755516328775766">"Prikaz na podlagi okolja"</string>
-    <!-- no translation found for ambient_display_screen_summary_always_on (7337555569694794132) -->
-    <skip />
+    <string name="ambient_display_screen_summary_always_on" msgid="7337555569694794132">"Vedno vključeno/višja poraba energije akumulatorja"</string>
     <string name="ambient_display_screen_summary_notifications" msgid="1449570742600868654">"Nova obvestila"</string>
     <string name="ambient_display_category_triggers" msgid="4359289754456268573">"Nastavitve prikaza"</string>
     <string name="doze_title" msgid="2375510714460456687">"Nova obvestila"</string>
     <string name="doze_summary" msgid="3846219936142814032">"Preklop zaslona iz stanja pripravljenosti, ko prejmete obvestila"</string>
     <string name="doze_always_on_title" msgid="1046222370442629646">"Vedno vklopljeno"</string>
-    <!-- no translation found for doze_always_on_summary (6978257596231155345) -->
-    <skip />
+    <string name="doze_always_on_summary" msgid="6978257596231155345">"Prikaz ure, ikon obvestil in drugih informacij. Višja poraba energije akumulatorja."</string>
     <string name="title_font_size" msgid="4405544325522105222">"Velikost pisave"</string>
     <string name="short_summary_font_size" msgid="6819778801232989076">"Pomanjšava ali povečava besedila"</string>
     <string name="sim_lock_settings" msgid="3392331196873564292">"Nastavitve zaklepanja kartice SIM"</string>
@@ -1142,13 +1158,12 @@
     <string name="baseband_version" msgid="1848990160763524801">"Različica radijske programske opreme"</string>
     <string name="kernel_version" msgid="9192574954196167602">"Različica jedra"</string>
     <string name="build_number" msgid="3075795840572241758">"Delovna različica"</string>
-    <string name="selinux_status" msgid="6212165375172061672">"Stanje za SELinux"</string>
     <string name="device_info_not_available" msgid="8062521887156825182">"Ni na voljo"</string>
     <string name="device_status_activity_title" msgid="1411201799384697904">"Stanje"</string>
     <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">"Pomnilnik"</string>
+    <string name="storage_settings" msgid="4211799979832404953">"Shramba"</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>
@@ -1170,7 +1185,6 @@
     <string name="status_wifi_mac_address" msgid="2202206684020765378">"Naslov MAC vmesnika Wi‑Fi"</string>
     <string name="status_bt_address" msgid="4195174192087439720">"Naslov Bluetooth"</string>
     <string name="status_serial_number" msgid="2257111183374628137">"Serijska številka"</string>
-    <string name="status_unavailable" msgid="7862009036663793314">"Ni na voljo"</string>
     <string name="status_up_time" msgid="7294859476816760399">"Čas delovanja"</string>
     <string name="status_awake_time" msgid="2393949909051183652">"Čas delovanja"</string>
     <string name="internal_memory" msgid="9129595691484260784">"Notranja shramba"</string>
@@ -1269,7 +1283,7 @@
     <string name="storage_detail_system" msgid="4629506366064709687">"Sistem"</string>
     <string name="storage_detail_explore" msgid="7911344011431568294">"Razišči: <xliff:g id="NAME">^1</xliff:g>"</string>
     <string name="storage_detail_dialog_other" msgid="8907101974576694793">"Med druge datoteke spadajo datoteke v skupni rabi, ki jih shranijo aplikacije, datoteke, ki jih prenesete iz interneta ali prek Bluetootha, datoteke sistema Android in druge. \n\nČe si želite ogledati vidno vsebino te naprave za shranjevanje <xliff:g id="NAME">^1</xliff:g>, se dotaknite »Razišči«."</string>
-    <string name="storage_detail_dialog_system" msgid="862835644848361569">"Sistem vključuje datoteke, ki se uporabljajo za izvajanje Androida različice <xliff:g id="VERSION">%s</xliff:g>"</string>
+    <string name="storage_detail_dialog_system" msgid="862835644848361569">"Sistem vključuje datoteke, ki se uporabljajo za izvajanje Androida različice <xliff:g id="VERSION">%s</xliff:g>."</string>
     <string name="storage_detail_dialog_user" msgid="3267254783294197804">"Uporabnik <xliff:g id="USER_0">^1</xliff:g> je morda shranil fotografije, glasbo, aplikacije ali druge podatke, za kar je porabil <xliff:g id="SIZE">^2</xliff:g> shrambe. \n\nČe si želite ogledati podrobnosti, preklopite na uporabnika <xliff:g id="USER_1">^1</xliff:g>."</string>
     <string name="storage_wizard_init_title" msgid="5085400514028585772">"Nastavitev imena za: <xliff:g id="NAME">^1</xliff:g>"</string>
     <string name="storage_wizard_init_external_title" msgid="4867326438945303598">"Uporaba kot prenosna shramba"</string>
@@ -1346,6 +1360,7 @@
     <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>
     <string name="reset_dashboard_title" msgid="6254873816990678620">"Ponastavi možnosti"</string>
+    <string name="reset_dashboard_summary" msgid="4851012632493522755">"Ponastavite lahko omrežje, aplikacije ali napravo"</string>
     <string name="reset_network_title" msgid="6166025966016873843">"Ponastavi Wi-Fi, prenos podatkov v mobilnem omrežju in Bluetooth"</string>
     <string name="reset_network_desc" msgid="5547979398298881406">"S tem boste ponastavili vse omrežne nastavitve, vključno s temi:\n\n"<li>"Wi‑Fi"</li>\n<li>"Prenos podatkov v mobilnih omrežjih"</li>\n<li>"Bluetooth"</li></string>
     <string name="reset_network_button_text" msgid="2035676527471089853">"Ponastavi nastavitve"</string>
@@ -1354,19 +1369,14 @@
     <string name="reset_network_confirm_title" msgid="1759888886976962773">"Želite ponastaviti?"</string>
     <string name="network_reset_not_available" msgid="7188610385577164676">"Ponastavitev omrežnih nastavitev ni na voljo za tega uporabnika"</string>
     <string name="reset_network_complete_toast" msgid="787829973559541880">"Omrežne nastavitve so ponastavljene"</string>
-    <string name="master_clear_title" msgid="6617679904229218425">"Izbriši vse podatke (ponastavitev na tovarniške nastavitve)"</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 bo ponastavljen</item>
-      <item quantity="two"><xliff:g id="ACCOUNT_COUNT">%1$d</xliff:g> računa bosta ponastavljena</item>
-      <item quantity="few"><xliff:g id="ACCOUNT_COUNT">%1$d</xliff:g> računi bodo ponastavljeni</item>
-      <item quantity="other"><xliff:g id="ACCOUNT_COUNT">%1$d</xliff:g> računov bo ponastavljenih</item>
-    </plurals>
-    <string name="master_clear_summary" msgid="6902443944660426951">"Notranji pomnilnik in vsi podatki bodo ponastavljeni"</string>
+    <string name="master_clear_title" msgid="3531267871084279512">"Izbriši vse podatke (ponastavitev na tovarniške nastavitve)"</string>
     <string name="master_clear_desc" product="tablet" msgid="9146059417023157222">"S tem boste iz "<b>"notranjega pomnilnika"</b>" tabličnega računalnika izbrisali vse podatke:\n\n"<li>"Google Račun"</li>\n<li>"Podatke in nastavitve sistema in aplikacij"</li>\n<li>"Prenesene aplikacije"</li></string>
     <string name="master_clear_desc" product="default" msgid="4800386183314202571">"S tem boste iz "<b>"notranjega pomnilnika"</b>" telefona izbrisali vse podatke:\n\n"<li>"Google Račun"</li>\n<li>"Podatke in nastavitve sistema in aplikacij"</li>\n<li>"Prenesene aplikacije"</li></string>
     <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"Trenutno ste prijavljeni v te račune:\n"</string>
     <string name="master_clear_other_users_present" product="default" msgid="5161423070702470742">\n\n"V napravi so prisotni drugi uporabniki.\n"</string>
     <string name="master_clear_desc_also_erases_external" msgid="1903185203791274237"><li>"Glasba"</li>\n<li>"Fotografije"</li>\n<li>"Drugi uporabniški podatki"</li></string>
+    <string name="master_clear_desc_also_erases_esim" msgid="312352697653096008"><li>"Operaterji na digitalni kartici e-SIM"</li></string>
+    <string name="master_clear_desc_no_cancel_mobile_plan" msgid="5460926449093211144">\n\n"S tem ne boste prekinili naročniškega paketa za mobilno telefonijo."</string>
     <string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="7744115866662613411">\n\n"Če želite izbrisati glasbo, slike in druge uporabniške podatke, morate izbrisati "<b>"pomnilnik USB"</b>"."</string>
     <string name="master_clear_desc_erase_external_storage" product="default" msgid="4801026652617377093">\n\n"Če želite izbrisati glasbo, slike in druge uporabniške podatke, morate izbrisati "<b>"kartico SD"</b>"."</string>
     <string name="erase_external_storage" product="nosdcard" msgid="969364037450286809">"Izbriši pomnilnik USB"</string>
@@ -1483,15 +1493,16 @@
     <string name="settings_safetylegal_activity_title" msgid="6901214628496951727">"Informacije o varnosti"</string>
     <string name="settings_safetylegal_activity_unreachable" msgid="250674109915859456">"Nimate podatkovne povezave. Če si želite te podatke ogledati zdaj, odprite %s iz katerega koli računalnika z internetno povezavo."</string>
     <string name="settings_safetylegal_activity_loading" msgid="8059022597639516348">"Nalaganje …"</string>
-    <string name="lockpassword_choose_your_password_header" msgid="8624900666929394990">"Izberite geslo"</string>
-    <string name="lockpassword_choose_your_password_header_for_fingerprint" msgid="6624409510609085450">"Nastavite geslo za prstni odtis"</string>
-    <string name="lockpassword_choose_your_pattern_header" msgid="6949761069941694050">"Izberite vzorec"</string>
-    <string name="lockpassword_choose_your_pattern_header_for_fingerprint" msgid="5901096361617543819">"Nastavite vzorec za prstni odtis"</string>
-    <string name="lockpassword_choose_your_pin_header" msgid="7598849519816138302">"Izberite kodo PIN"</string>
-    <string name="lockpassword_choose_your_pin_header_for_fingerprint" msgid="765344692615917183">"Nastavite kodo PIN za prstni odtis"</string>
-    <string name="lockpassword_confirm_your_password_header" msgid="6308478184889846633">"Potrdite geslo"</string>
+    <string name="lockpassword_choose_your_screen_lock_header" msgid="3872462096767152394">"Nastavitev zaklepanja zaslona"</string>
+    <string name="lockpassword_choose_your_password_message" msgid="1197569283524841412">"Zaradi varnosti nastavite geslo"</string>
+    <string name="lockpassword_choose_your_password_header_for_fingerprint" msgid="2541818487015343503">"Nastavite geslo za prstni odtis"</string>
+    <string name="lockpassword_choose_your_pattern_header_for_fingerprint" msgid="7709785406243556723">"Nastavite vzorec za prstni odtis"</string>
+    <string name="lockpassword_choose_your_pin_message" msgid="1875420718677275646">"Zaradi varnosti nastavite kodo PIN"</string>
+    <string name="lockpassword_choose_your_pin_header_for_fingerprint" msgid="1549639053195796674">"Nastavite kodo PIN za prstni odtis"</string>
+    <string name="lockpassword_choose_your_pattern_message" msgid="5986983400689720015">"Nastavite vzorec za večjo varnost"</string>
+    <string name="lockpassword_confirm_your_password_header" msgid="1266027268220850931">"Znova vnesite geslo"</string>
     <string name="lockpassword_confirm_your_pattern_header" msgid="7543433733032330821">"Potrdite vzorec"</string>
-    <string name="lockpassword_confirm_your_pin_header" msgid="49038294648213197">"Potrdite kodo PIN"</string>
+    <string name="lockpassword_confirm_your_pin_header" msgid="7744513791910572550">"Znova vnesite kodo PIN"</string>
     <string name="lockpassword_confirm_passwords_dont_match" msgid="5140892109439191415">"Gesli se ne ujemata"</string>
     <string name="lockpassword_confirm_pins_dont_match" msgid="7226244811505606217">"Kodi PIN se ne ujemata"</string>
     <string name="lockpassword_choose_lock_generic_header" msgid="3811438094903786145">"Izbira načina odklepanja"</string>
@@ -1504,18 +1515,18 @@
     <string name="lockpassword_confirm_your_pattern_generic_profile" msgid="4435638308193361861">"Če želite nadaljevati, uporabite vzorec za delovni profil"</string>
     <string name="lockpassword_confirm_your_pin_generic_profile" msgid="3730141667547002246">"Če želite nadaljevati, vnesite kodo PIN za delovni profil"</string>
     <string name="lockpassword_confirm_your_password_generic_profile" msgid="4250642723467019894">"Če želite nadaljevati, vnesite geslo za delovni profil"</string>
-    <!-- no translation found for lockpassword_strong_auth_required_device_pattern (530802132223800623) -->
-    <skip />
-    <!-- no translation found for lockpassword_strong_auth_required_device_pin (7829294830078036417) -->
-    <skip />
-    <!-- no translation found for lockpassword_strong_auth_required_device_password (3552644641574796973) -->
-    <skip />
-    <!-- no translation found for lockpassword_strong_auth_required_work_pattern (3003781907040522053) -->
-    <skip />
-    <!-- no translation found for lockpassword_strong_auth_required_work_pin (3367491332598821552) -->
-    <skip />
-    <!-- no translation found for lockpassword_strong_auth_required_work_password (8159775129968582940) -->
-    <skip />
+    <string name="lockpassword_strong_auth_required_device_pattern" msgid="530802132223800623">"Zaradi večje varnosti vnesite vzorec za to napravo"</string>
+    <string name="lockpassword_strong_auth_required_device_pin" msgid="7829294830078036417">"Zaradi večje varnosti vnesite kodo PIN za to napravo"</string>
+    <string name="lockpassword_strong_auth_required_device_password" msgid="3552644641574796973">"Zaradi večje varnosti vnesite geslo za to napravo"</string>
+    <string name="lockpassword_strong_auth_required_work_pattern" msgid="3003781907040522053">"Zaradi večje varnosti vnesite vzorec za delovni profil"</string>
+    <string name="lockpassword_strong_auth_required_work_pin" msgid="3367491332598821552">"Zaradi večje varnosti vnesite kodo PIN za delovni profil"</string>
+    <string name="lockpassword_strong_auth_required_work_password" msgid="8159775129968582940">"Zaradi večje varnosti vnesite geslo za delovni profil"</string>
+    <string name="lockpassword_confirm_your_pattern_details_frp" msgid="6757336656791723193">"Telefon je bil ponastavljen na tovarniške nastavitve. Če želite uporabljati ta telefon, vnesite prejšnji vzorec."</string>
+    <string name="lockpassword_confirm_your_pin_details_frp" msgid="826520613445990470">"Telefon je bil ponastavljen na tovarniške nastavitve. Če želite uporabljati ta telefon, vnesite prejšnjo kodo PIN."</string>
+    <string name="lockpassword_confirm_your_password_details_frp" msgid="8944081074615739040">"Telefon je bil ponastavljen na tovarniške nastavitve. Če želite uporabljati ta telefon, vnesite prejšnje geslo."</string>
+    <string name="lockpassword_confirm_your_pattern_header_frp" msgid="2898036091609128286">"Potrdite vzorec"</string>
+    <string name="lockpassword_confirm_your_pin_header_frp" msgid="4141601774778898803">"Potrdite PIN"</string>
+    <string name="lockpassword_confirm_your_password_header_frp" msgid="3762615419295360480">"Potrdite geslo"</string>
     <string name="lockpassword_invalid_pin" msgid="15588049067548470">"Napačna koda PIN"</string>
     <string name="lockpassword_invalid_password" msgid="4038507398784975200">"Napačno geslo"</string>
     <string name="lockpattern_need_to_unlock_wrong" msgid="1745247595356012176">"Napačen vzorec"</string>
@@ -1564,8 +1575,7 @@
     <string name="install_applications" msgid="4872012136210802181">"Neznani viri"</string>
     <string name="install_applications_title" msgid="4987712352256508946">"Dovoli vse vire aplikacij"</string>
     <string name="recent_app_category_title" msgid="6673071268966003928">"Nedavno odprte aplikacije"</string>
-    <string name="see_all_apps_title" msgid="1317153498074308438">"Prikaži vse (<xliff:g id="COUNT">%1$d</xliff:g>) aplikacije"</string>
-    <string name="recent_app_summary" msgid="3366446669844932300">"pred <xliff:g id="TIME">^1</xliff:g>"</string>
+    <string name="see_all_apps_title" msgid="1317153498074308438">"Prikaži vse aplikacije (<xliff:g id="COUNT">%1$d</xliff:g>)"</string>
     <string name="install_all_warning" product="tablet" msgid="8310489909586138165">"Neznane aplikacije lažje napadejo tablični računalnik in osebne podatke v njem. Če namestite aplikacije iz tega vira, se strinjate, da ste sami odgovorni za morebitno škodo, nastalo v tabličnem računalniku, ali izgubo podatkov, ki je lahko posledica uporabe teh aplikacij."</string>
     <string name="install_all_warning" product="default" msgid="1952257127370115988">"Neznane aplikacije lažje napadejo telefon in osebne podatke v njem. Če namestite aplikacije iz tega vira, se strinjate, da ste sami odgovorni za morebitno škodo, nastalo v telefonu, ali izgubo podatkov, ki je lahko posledica uporabe teh aplikacij."</string>
     <string name="advanced_settings" msgid="1777249286757067969">"Dodatne nastavitve"</string>
@@ -1828,10 +1838,10 @@
     <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">"Kontrolniki za bralnike zaslona, prikaz in interakcije"</string>
+    <string name="accessibility_settings_summary" msgid="981260486011624939">"Bralniki zaslona, prikaz, interakcija"</string>
     <string name="vision_settings_title" msgid="4204111425716868288">"Nastavitve vidnosti"</string>
     <string name="vision_settings_description" msgid="5679491180156408260">"To napravo lahko prilagodite svojim potrebam. Te funkcije za ljudi s posebnimi potrebami lahko pozneje spremenite v nastavitvah."</string>
-    <string name="vision_settings_suggestion_title" msgid="917294957154878441">"Povečanje velikosti pisave"</string>
+    <string name="vision_settings_suggestion_title" msgid="8058794060304707004">"Spremenite velikost pisave"</string>
     <string name="screen_reader_category_title" msgid="7739154903913400641">"Bralniki zaslona"</string>
     <string name="audio_and_captions_category_title" msgid="3420727114421447524">"Zvok in besedilo na zaslonu"</string>
     <string name="display_category_title" msgid="685461049938269166">"Zaslon"</string>
@@ -1868,7 +1878,6 @@
     <string name="accessibility_display_inversion_preference_subtitle" msgid="7052959202195368109">"Lahko vpliva na učinkovitost delovanja"</string>
     <string name="accessibility_autoclick_preference_title" msgid="7014499339068449623">"Klik, ko se kazalec ustavi"</string>
     <string name="accessibility_autoclick_delay_preference_title" msgid="3962261178385106006">"Zakasnitev pred klikom"</string>
-    <string name="preference_summary_default_combination" msgid="8532964268242666060">"<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">"VKLOPLJENO"</string>
     <string name="accessibility_summary_state_disabled" msgid="2241315620132005595">"IZKLOPLJENO"</string>
     <string name="enable_quick_setting" msgid="2366999897816894536">"Prikaži v »Hitrih nastavitvah«"</string>
@@ -2001,12 +2010,14 @@
     <string name="background_activity_summary_on" msgid="649282072540085599">"Ko aplikacija ni v uporabi, se lahko izvaja v ozadju"</string>
     <string name="background_activity_summary_off" msgid="7666330699090632040">"Ko aplikacija ni v uporabi, je njena dejavnost v ozadju omejena"</string>
     <string name="background_activity_summary_disabled" msgid="3710669050484599847">"Aplikaciji ni dovoljeno izvajanje v ozadju"</string>
+    <string name="background_activity_summary_whitelisted" msgid="7375400051141016808">"Aplikacija ne omogoča optimizacije porabe energije akumulatorja"</string>
+    <string name="background_activity_warning_dialog_title" msgid="2216249969149568871">"Želite omejiti dejavnost v ozadju?"</string>
+    <string name="background_activity_warning_dialog_text" msgid="7049624449246121981">"Če boste omejili dejavnost aplikacije v ozadju, morda ne bo pravilno delovala"</string>
     <string name="device_screen_usage" msgid="3386088035570409683">"Poraba zaslona od polne napolnjenosti"</string>
     <string name="device_screen_consumption" msgid="4607589286438986687">"Poraba zaslona"</string>
     <string name="device_cellular_network" msgid="4724773411762382950">"Pregledovanje mobilnih omrežij"</string>
-    <string name="power_last_full_charge_summary" msgid="532845389094620657">"pred <xliff:g id="TIME">^1</xliff:g>"</string>
-    <string name="power_usage_list_summary" msgid="6775339745194635000">"Poraba aplik. od napol. akumul. (pred <xliff:g id="TIME">^1</xliff:g>)"</string>
-    <string name="power_usage_list_summary_device" msgid="7036566616386864302">"Uporaba naprave od polne napolnjenosti akumulatorja (pred <xliff:g id="TIME">^1</xliff:g>)"</string>
+    <string name="power_usage_list_summary" msgid="6393929085382334341">"Poraba aplikacij od polne napolnjenosti akumulatorja (<xliff:g id="RELATIVE_TIME">^1</xliff:g>)"</string>
+    <string name="power_usage_list_summary_device" msgid="4461926045610455423">"Poraba naprave od polne napolnjenosti akumulatorja (<xliff:g id="RELATIVE_TIME">^1</xliff:g>)"</string>
     <string name="screen_usage_summary" msgid="6687403051423153550">"Trajanje vklopljenosti zaslona od polne napolnjenosti akumulatorja"</string>
     <string name="device_usage_list_summary" msgid="5623036661468763251">"Poraba naprave od polne napolnjenosti akumulatorja"</string>
     <string name="battery_since_unplugged" msgid="338073389740738437">"Uporaba akumulatorja po odklopu"</string>
@@ -2063,7 +2074,7 @@
     <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">"Telefon je nedejaven"</string>
+    <string name="power_idle" product="default" msgid="9055659695602194990">"Nedejaven telefon"</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>
@@ -2123,10 +2134,10 @@
     <string name="battery_used_for" msgid="2690821851327075443">"Trajanje uporabe: <xliff:g id="TIME">^1</xliff:g>"</string>
     <string name="battery_active_for" msgid="2964359540508103032">"Čas dejavnosti: <xliff:g id="TIME">^1</xliff:g>"</string>
     <string name="battery_screen_usage" msgid="6537658662149713585">"Uporaba zaslona: <xliff:g id="TIME">^1</xliff:g>"</string>
-    <string name="battery_used_by" msgid="1135316757755282999">"<xliff:g id="PERCENT">%1$s</xliff:g> uporablja <xliff:g id="APP">%2$s</xliff:g>"</string>
+    <string name="battery_used_by" msgid="1135316757755282999">"<xliff:g id="PERCENT">%1$s</xliff:g> porabil: <xliff:g id="APP">%2$s</xliff:g>"</string>
     <string name="battery_overall_usage" msgid="2093409063297375436">"<xliff:g id="PERCENT">%1$s</xliff:g> celotne napolnjenosti akumulatorja"</string>
-    <string name="battery_detail_since_full_charge" msgid="7515347842046955855">"Razčlenitev od zadnje napol. akumulatorja"</string>
-    <string name="battery_last_full_charge" msgid="7151251641099019361">"Zadnja polna napolnjenost akumulatorja"</string>
+    <string name="battery_detail_since_full_charge" msgid="7515347842046955855">"Razčlenitev od zadnje napolnjenosti akumulatorja"</string>
+    <string name="battery_last_full_charge" msgid="7151251641099019361">"Zadnja polna napolnjenost"</string>
     <string name="battery_footer_summary" msgid="67169726550144016">"Podatki o uporabi akumulatorja so približni in se lahko spremenijo glede na uporabo naprave"</string>
     <string name="battery_detail_foreground" msgid="3350401514602032183">"Med aktivno uporabo"</string>
     <string name="battery_detail_background" msgid="1929644393553768999">"Med izvajanjem v ozadju"</string>
@@ -2252,14 +2263,14 @@
     <string name="credentials_unlock_hint" msgid="2301301378040499348">"Vnesite geslo za shrambo poverilnic."</string>
     <string name="credentials_old_password" msgid="7553393815538684028">"Trenutno geslo:"</string>
     <string name="credentials_reset_hint" msgid="6297256880896133631">"Želite odstraniti vso vsebino?"</string>
-    <string name="credentials_password_too_short" msgid="7502749986405522663">"Geslo mora imeti vsaj 8 znakov."</string>
     <string name="credentials_wrong_password" msgid="2541932597104054807">"Napačno geslo."</string>
     <string name="credentials_reset_warning" msgid="5320653011511797600">"Napačno geslo. Poskusite lahko še enkrat, preden se shramba poverilnic izbriše."</string>
     <string name="credentials_reset_warning_plural" msgid="6514085665301095279">"Napačno geslo. Poskusite lahko še <xliff:g id="NUMBER">%1$d</xliff:g>-krat, preden se shramba poverilnic izbriše."</string>
     <string name="credentials_erased" msgid="2907836028586342969">"Shramba poverilnic je izbrisana."</string>
     <string name="credentials_not_erased" msgid="7685932772284216097">"Shrambe pover. ni mogoče izbr."</string>
     <string name="credentials_enabled" msgid="7588607413349978930">"Shramba poverilnic je omogočena."</string>
-    <string name="credentials_configure_lock_screen_hint" msgid="6757119179588664966">"Preden lahko uporabite shrambo poverilnic, morate nastaviti kodo PIN ali geslo za zaklepanje zaslona."</string>
+    <string name="credentials_configure_lock_screen_hint" msgid="8058230497337529036">"Preden lahko uporabite shrambo poverilnic, morate v napravi nastaviti varno zaklepanje zaslona."</string>
+    <string name="credentials_configure_lock_screen_button" msgid="253239765216055321">"NASTAVITEV ZAKLEPANJA"</string>
     <string name="usage_access_title" msgid="332333405495457839">"Apl. z dost. do pod. o uporabi"</string>
     <string name="emergency_tone_title" msgid="1055954530111587114">"Ton v sili"</string>
     <string name="emergency_tone_summary" msgid="722259232924572153">"Nastavi način delovanja ob klicanju v sili"</string>
@@ -2379,8 +2390,6 @@
     <skip />
     <string name="cant_sync_dialog_title" msgid="2777238588398046285">"Ročna sinhronizacija ni mogoča"</string>
     <string name="cant_sync_dialog_message" msgid="1938380442159016449">"Sinhronizacija za ta element je trenutno onemogočena. Če želite spremeniti nastavitev, vklopite podatke v ozadju in samodejno sinhronizacijo."</string>
-    <string name="wimax_settings" msgid="2655139497028469039">"4G"</string>
-    <string name="status_wimax_mac_address" msgid="8390791848661413416">"Naslov 4G MAC"</string>
     <string name="enter_password" msgid="8035706727471334122">"Če želite zagnati Android, vnesite geslo"</string>
     <string name="enter_pin" msgid="5305333588093263790">"Če želite zagnati Android, vnesite PIN"</string>
     <string name="enter_pattern" msgid="4187435713036808566">"Če želite zagnati Android, narišite vzorec"</string>
@@ -2394,6 +2403,7 @@
     <string name="misc_files_selected_count" msgid="4647048020823912088">"izbrano: <xliff:g id="NUMBER">%1$d</xliff:g> od <xliff:g id="TOTAL">%2$d</xliff:g>"</string>
     <string name="misc_files_selected_count_bytes" msgid="2876232009069114352">"<xliff:g id="NUMBER">%1$s</xliff:g> od skupaj <xliff:g id="TOTAL">%2$s</xliff:g>"</string>
     <string name="select_all" msgid="1562774643280376715">"Izberi vse"</string>
+    <string name="data_plan_usage_manage_plans_button_text" msgid="8997761990902708162">"Upravljanje paketov"</string>
     <string name="data_usage_summary_title" msgid="3804110657238092929">"Podatkovni promet"</string>
     <string name="data_usage_app_summary_title" msgid="4147258989837459172">"Prenos podatk. aplikacije"</string>
     <string name="data_usage_accounting" msgid="7170028915873577387">"Operaterjeve meritve porabe podatkov so morda drugačne kot v napravi."</string>
@@ -2455,10 +2465,10 @@
     <string name="data_usage_auto_sync_off_dialog_title" msgid="9013139130490125793">"Želite izklopiti samodejno sinhroniziranje podatkov?"</string>
     <string name="data_usage_auto_sync_off_dialog" msgid="4025938250775413864">"S tem zmanjšate količino prenesenih podatkov in porabo akumulatorja, vendar boste morali vsak posamezen račun sinhronizirati ročno, da dobite najnovejše podatke. Prav tako ne boste dobili obvestil o posodobitvah."</string>
     <string name="data_usage_cycle_editor_title" msgid="1373797281540188533">"Datum ponastavitve cikla porabe"</string>
-    <string name="data_usage_cycle_editor_subtitle" msgid="5512903797979928416">"Datum vsakega meseca:"</string>
+    <string name="data_usage_cycle_editor_subtitle" msgid="5512903797979928416">"Datum v posameznem mesecu:"</string>
     <string name="data_usage_cycle_editor_positive" msgid="8821760330497941117">"Nastavi"</string>
     <string name="data_usage_warning_editor_title" msgid="3704136912240060339">"Nastavi opozorilo o uporabi podatkov"</string>
-    <string name="data_usage_limit_editor_title" msgid="9153595142385030015">"Nastavitev omejitve količine prenesenih podatkov"</string>
+    <string name="data_usage_limit_editor_title" msgid="9153595142385030015">"Nastavi omejitve količine prenesenih podatkov"</string>
     <string name="data_usage_limit_dialog_title" msgid="3023111643632996097">"Omejitev porabe podatkov"</string>
     <string name="data_usage_limit_dialog_mobile" product="tablet" msgid="4983487893343645667">"Tablični računalnik bo izklopil prenos podatkov v mobilnih omrežjih, ko bo dosežena nastavljena omejitev.\n\nKer količino prenesenih podatkov meri tablični računalnik, operater pa jo morda drugače, priporočamo, da nastavite nekoliko manjšo omejitev."</string>
     <string name="data_usage_limit_dialog_mobile" product="default" msgid="3926320594049434225">"Telefon bo izklopil prenos podatkov v mobilnih omrežjih, ko bo dosežena nastavljena omejitev.\n\nKer količino prenesenih podatkov meri telefon, operater pa jo morda drugače, priporočamo, da nastavite nekoliko manjšo omejitev."</string>
@@ -2479,6 +2489,9 @@
     <string name="data_usage_metered_mobile" msgid="5423305619126978393">"Mobilna omrežja"</string>
     <string name="data_usage_metered_wifi" msgid="1761738002328299714">"Wi‑Fi z omejeno količ. prenosa"</string>
     <string name="data_usage_metered_wifi_disabled" msgid="727808462375941567">"Če želite izbrati omrežje z omej. kol. prenosa, vklopite Wi-Fi."</string>
+    <string name="data_usage_metered_auto" msgid="1262028400911918865">"Samodejno"</string>
+    <string name="data_usage_metered_yes" msgid="9217539611385225894">"Z omejenim prenosom podatkov"</string>
+    <string name="data_usage_metered_no" msgid="4025232961929071789">"Z neomejenim prenosom podatkov"</string>
     <string name="data_usage_disclaimer" msgid="6887858149980673444">"Operaterjeve meritve porabe podatkov so morda drugačne kot v napravi."</string>
     <string name="cryptkeeper_emergency_call" msgid="198578731586097145">"Klic v sili"</string>
     <string name="cryptkeeper_return_to_call" msgid="5613717339452772491">"Nazaj na klic"</string>
@@ -2570,9 +2583,6 @@
     <string name="backup_pw_set_button_text" msgid="2387480910044648795">"Nastavi geslo za varnostno kopijo"</string>
     <string name="backup_pw_cancel_button_text" msgid="8845630125391744615">"Prekliči"</string>
     <string name="additional_system_update_settings_list_item_title" msgid="214987609894661992">"Dodatne posodobitve sistema"</string>
-    <string name="selinux_status_disabled" msgid="924551035552323327">"Onemogočeno"</string>
-    <string name="selinux_status_permissive" msgid="6004965534713398778">"Dopuščajoče"</string>
-    <string name="selinux_status_enforcing" msgid="2252703756208463329">"Uveljavljajoče"</string>
     <string name="ssl_ca_cert_warning" msgid="2045866713601984673">"Omrežje je lahko nadzorovano"</string>
     <string name="done_button" msgid="1991471253042622230">"Končano"</string>
     <plurals name="ssl_ca_cert_dialog_title" formatted="false" msgid="7145092748045794650">
@@ -2623,7 +2633,7 @@
     <string name="user_add_user_message_long" msgid="8562152293752222985">"To napravo lahko daste v skupno rabo z drugimi, tako da ustvarite dodatne uporabnike. Vsak ima svoj prostor, ki ga lahko prilagodi z aplikacijami, ozadji in drugim. Uporabniki lahko tudi prilagodijo nastavitve naprave, ki vplivajo na vse, na primer nastavitve omrežja Wi-Fi.\n\nKo dodate novega uporabnika, mora ta nastaviti svoj prostor.\n\nVsak uporabnik lahko posodobi aplikacije za vse druge uporabnike."</string>
     <string name="user_add_user_message_short" msgid="1511354412249044381">"Ko dodate novega uporabnika, mora ta nastaviti svoj prostor.\n\nVsak uporabnik lahko posodobi aplikacije za vse druge uporabnike."</string>
     <string name="user_setup_dialog_title" msgid="1765794166801864563">"Želite uporabnika nastaviti zdaj?"</string>
-    <string name="user_setup_dialog_message" msgid="1004068621380867148">"Prepričajte se, da ima oseba čas za nastavitev svojega prostora v napravi"</string>
+    <string name="user_setup_dialog_message" msgid="1004068621380867148">"Prepričajte se, da ima oseba čas za nastavitev svojega prostora v napravi."</string>
     <string name="user_setup_profile_dialog_message" msgid="3896568553327558731">"Želite zdaj nastaviti profil?"</string>
     <string name="user_setup_button_setup_now" msgid="3391388430158437629">"Želim nastaviti zdaj"</string>
     <string name="user_setup_button_setup_later" msgid="3068729597269172401">"Ne zdaj"</string>
@@ -2780,6 +2790,7 @@
       <item quantity="few">Pokaži %d skrite elemente</item>
       <item quantity="other">Pokaži %d skritih elementov</item>
     </plurals>
+    <string name="dashboard_suggestion_condition_footer_content_description" msgid="2898588191174845961">"Strni"</string>
     <string name="network_dashboard_title" msgid="4771589228992391573">"Omrežje in internet"</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>
@@ -2839,8 +2850,7 @@
     <string name="keywords_gesture" msgid="3526905012224714078">"poteze"</string>
     <string name="keywords_payment_settings" msgid="5220104934130446416">"plačaj, dotakni se, plačevanje z dotikom, plačila"</string>
     <string name="keywords_backup" msgid="470070289135403022">"varnostna kopija, varnostno kopiranje, varnostno kopirati"</string>
-    <!-- no translation found for keywords_assist_gesture_launch (813968759791342591) -->
-    <skip />
+    <string name="keywords_assist_gesture_launch" msgid="813968759791342591">"poteza"</string>
     <string name="setup_wifi_nfc_tag" msgid="9028353016222911016">"Nastavitev brezžič. oznake NFC"</string>
     <string name="write_tag" msgid="8571858602896222537">"Zapiši"</string>
     <string name="status_awaiting_tap" msgid="2130145523773160617">"Dotaknite se oznake za zapisovanje ..."</string>
@@ -2885,8 +2895,14 @@
       <item quantity="few"><xliff:g id="ON_COUNT">%d</xliff:g> samodejna pravila so vklopljena</item>
       <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 predn.« dovoljuje"</string>
+    <string name="zen_mode_settings_title" msgid="1066226840983908121">"Ne moti"</string>
+    <string name="zen_mode_behavior_settings_title" msgid="1463303933529313969">"Vedenje"</string>
+    <string name="zen_mode_behavior_allow_title" msgid="3845615648136218141">"Dovoli te zvoke in vibriranja:"</string>
+    <string name="zen_mode_behavior_no_sound" msgid="1219626004723208056">"Brez zvoka"</string>
+    <string name="zen_mode_behavior_total_silence" msgid="6716603819806610626">"Brez zvoka (Popolna tišina)"</string>
+    <string name="zen_mode_behavior_no_sound_except" msgid="4968477585788243114">"Brez zvoka razen: <xliff:g id="CATEGORIES">%1$s</xliff:g>"</string>
+    <!-- no translation found for zen_mode_behavior_alarms_only (2423480992071472963) -->
+    <skip />
     <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>
@@ -2916,31 +2932,33 @@
     <string name="notification_pulse_title" msgid="1905382958860387030">"Utripajoča lučka"</string>
     <string name="lock_screen_notifications_title" msgid="6173076173408887213">"Na zaklenjenem zaslonu"</string>
     <string name="lock_screen_notifications_summary_show" msgid="6407527697810672847">"Pokaži vso vsebino obvestil"</string>
-    <string name="lock_screen_notifications_summary_hide" msgid="7891552853357258782">"Skrij občutljivo vsebino obvestil"</string>
-    <string name="lock_screen_notifications_summary_disable" msgid="859628910427886715">"Ne prikazuj obvestil"</string>
+    <string name="lock_screen_notifications_summary_hide" msgid="7891552853357258782">"Skrij vsebino občutljivih obvestil"</string>
+    <string name="lock_screen_notifications_summary_disable" msgid="859628910427886715">"Sploh ne prikazuj obvestil"</string>
     <string name="lock_screen_notifications_interstitial_message" msgid="6164532459432182244">"Kako naj se obvestila prikazujejo, ko je naprava zaklenjena?"</string>
     <string name="lock_screen_notifications_interstitial_title" msgid="1416589393106326972">"Obvestila"</string>
     <string name="lock_screen_notifications_summary_show_profile" msgid="835870815661120772">"Pokaži vso vsebino obvestil za delovni profil"</string>
-    <string name="lock_screen_notifications_summary_hide_profile" msgid="256116258285695645">"Skrij občutljivo vsebino obvest. za delovni profil"</string>
+    <string name="lock_screen_notifications_summary_hide_profile" msgid="256116258285695645">"Skrij vsebino občutljivih obvest. za delovni profil"</string>
     <string name="lock_screen_notifications_summary_disable_profile" msgid="4080720698960233358">"Ne prikazuj obvestil za delovni profil"</string>
     <string name="lock_screen_notifications_interstitial_message_profile" msgid="8307705621027472346">"Kako naj se obvestila o profilu prikazujejo, ko je naprava zaklenjena?"</string>
     <string name="lock_screen_notifications_interstitial_title_profile" msgid="3169806586032521333">"Obvestila o profilu"</string>
     <string name="notifications_title" msgid="8086372779371204971">"Obvestila"</string>
     <string name="app_notifications_title" msgid="5810577805218003760">"Obvestila aplikacij"</string>
     <string name="notification_channel_title" msgid="2260666541030178452">"Kategorija obvestil"</string>
+    <string name="notification_group_title" msgid="7180506440133859601">"Skupina kategorij obvestil"</string>
     <string name="notification_importance_title" msgid="848692592679312666">"Pomembnost"</string>
-    <string name="notification_importance_unspecified" msgid="2196023702875112081">"Dovoli, da se aplikacija sama odloči"</string>
+    <string name="notification_importance_unspecified" msgid="6622173510486113958">"Omogoči zvok"</string>
     <string name="notification_importance_blocked" msgid="7938180808339386300">"Nikoli ne pokaži obvestil"</string>
     <string name="notification_importance_min" msgid="5455049524984686275">"Brez zvočne ali vizualne prekinitve"</string>
     <string name="notification_importance_low" msgid="8881468429453766553">"Brez zvoka"</string>
     <string name="notification_importance_default" msgid="5958338024601957516">"Predvajaj zvok"</string>
     <string name="notification_importance_high" msgid="2082429479238228527">"Predvajaj zvok in prikaži na zaslonu"</string>
+    <string name="notification_importance_high_silent" msgid="2667033773703765252">"Prikaži na zaslonu"</string>
     <string name="notification_importance_min_title" msgid="6974673091137544803">"Nizka pomembnost"</string>
     <string name="notification_importance_low_title" msgid="8131254047772814309">"Srednja pomembnost"</string>
     <string name="notification_importance_default_title" msgid="9120383978536089489">"Visoka pomembnost"</string>
     <string name="notification_importance_high_title" msgid="3058778300264746473">"Nujno"</string>
     <string name="allow_interruption" msgid="7136150018111848721">"Dovoli prekinitve"</string>
-    <string name="allow_interruption_summary" msgid="7870159391333957050">"Omogočite aplikaciji, da predvaja zvok, vibrira in/ali prikaže obvestila na zaslonu"</string>
+    <string name="allow_interruption_summary" msgid="7870159391333957050">"Dovoli aplikaciji, da predvaja zvok, vibrira in/ali prikaže obvestila na zaslonu"</string>
     <string name="notification_channel_summary_min" msgid="5401718014765921892">"Nizka pomembnost"</string>
     <string name="notification_channel_summary_low" msgid="322317684244981244">"Srednja pomembnost"</string>
     <string name="notification_channel_summary_default" msgid="1111749130423589931">"Visoka pomembnost"</string>
@@ -2973,15 +2991,21 @@
     <string name="picture_in_picture_keywords" msgid="8361318686701764690">"pip slika v sliki"</string>
     <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>
-    <!-- no translation found for picture_in_picture_app_detail_summary (1264019085827708920) -->
-    <skip />
+    <string name="picture_in_picture_app_detail_summary" msgid="1264019085827708920">"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="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>
     <string name="app_notifications_off_desc" msgid="4882445501376722969">"Prikazovanje obvestil te aplikacije je izklopljeno v tej napravi Android."</string>
     <string name="channel_notifications_off_desc" msgid="5899225298718840635">"Prikazovanje obvestil te kategorije je izklopljeno v tej napravi Android."</string>
+    <string name="channel_group_notifications_off_desc" msgid="1620950416247316370">"Prikazovanje te skupine obvestil je blokirano v tej napravi Android"</string>
     <string name="notification_channels" msgid="5346841743182627500">"Kategorije"</string>
     <string name="notification_channels_other" msgid="5645317113885788226">"Drugo"</string>
+    <plurals name="notification_group_summary" formatted="false" msgid="3420621520561455358">
+      <item quantity="one"><xliff:g id="COUNT_1">%d</xliff:g> kategorija</item>
+      <item quantity="two"><xliff:g id="COUNT_1">%d</xliff:g> kategoriji</item>
+      <item quantity="few"><xliff:g id="COUNT_1">%d</xliff:g> kategorije</item>
+      <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> kategorij</item>
+    </plurals>
     <string name="no_channels" msgid="3077375508177744586">"Ta aplikacija ni objavila nobenih obvestil"</string>
     <string name="app_settings_link" msgid="8894946007543660906">"Dodatne nastavitve v aplikaciji"</string>
     <string name="app_notification_listing_summary_zero" msgid="6482582965081108108">"Vklopljeno za vse aplikacije"</string>
@@ -3006,7 +3030,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">"Naj se ta obvestila prikazujejo tudi, ko je način »Ne moti« nastavljen na »Samo prednostno«"</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_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>
@@ -3021,9 +3045,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">"Dodaj več"</string>
+    <string name="zen_mode_add_rule" msgid="7459154136384467057">"Dodajte več"</string>
     <string name="zen_mode_delete_rule" msgid="2985902330199039533">"Izbris pravila"</string>
-    <string name="zen_mode_choose_rule_type" msgid="5423746638871953459">"Izbira vrste pravila"</string>
+    <string name="zen_mode_choose_rule_type" msgid="5423746638871953459">"Izberite vrsto 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>
@@ -3060,14 +3084,16 @@
     <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">"Brez"</string>
+    <string name="zen_mode_from_none" msgid="8219706639954614136">"Nič"</string>
     <string name="zen_mode_alarms" msgid="2165302777886552926">"Alarmi"</string>
+    <!-- no translation found for zen_mode_media_system_other (8900209390529859777) -->
+    <skip />
     <string name="zen_mode_reminders" msgid="5458502056440485730">"Opomniki"</string>
     <string name="zen_mode_events" msgid="7914446030988618264">"Dogodki"</string>
     <string name="zen_mode_all_callers" msgid="584186167367236922">"Vsi klicatelji"</string>
     <string name="zen_mode_selected_callers" msgid="3127598874060615742">"Izbrani klicatelji"</string>
     <string name="zen_mode_repeat_callers" msgid="5019521886428322131">"Klicatelji, ki večkrat kličejo"</string>
-    <string name="zen_mode_repeat_callers_summary" msgid="7192713032364140137">"Dovoljeno, če ista oseba kliče že drugič v <xliff:g id="MINUTES">%d</xliff:g> min."</string>
+    <string name="zen_mode_repeat_callers_summary" msgid="239685342222975733">"Če ista oseba kliče že drugič v <xliff:g id="MINUTES">%d</xliff:g> min."</string>
     <string name="zen_mode_when" msgid="2767193283311106373">"Samodejni vklop"</string>
     <string name="zen_mode_when_never" msgid="8809494351918405602">"Nikoli"</string>
     <string name="zen_mode_when_every_night" msgid="3122486110091921009">"Vsako noč"</string>
@@ -3100,6 +3126,7 @@
     <string name="zen_mode_screen_off_visual_interruptions" msgid="4850792880144382633">"Ko je zaslon izklopljen"</string>
     <string name="zen_mode_no_visual_interruptions" msgid="8742776003822778472">"Ko je zaslon vklopljen ali izklopljen"</string>
     <string name="notification_app_settings_button" msgid="6685640230371477485">"Nastavitve obvestil"</string>
+    <string name="suggestion_button_text" msgid="3275010948381252006">"V redu"</string>
     <string name="device_feedback" msgid="3238056036766293294">"Pošlji povratne info. o tej napravi"</string>
     <string name="restr_pin_enter_admin_pin" msgid="1085834515677448072">"Vnos skrbniške kode PIN"</string>
     <string name="switch_on_text" msgid="1124106706920572386">"Vklopljeno"</string>
@@ -3143,7 +3170,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">"Porabljeno <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">"Preneseno <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>
@@ -3192,7 +3219,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 aplik."</string>
+    <string name="app_permissions" msgid="4148222031991883874">"Dovoljenja za aplikacije"</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>
@@ -3289,13 +3316,14 @@
     <string name="usb_use_photo_transfers_desc" msgid="2963034811151325996">"Prenos fotografij ali datotek, če MTP ni podprt (PTP)"</string>
     <string name="usb_use_MIDI" msgid="870922185938298263">"Uporaba naprave kot vmesnik MIDI"</string>
     <string name="usb_use_MIDI_desc" msgid="8473936990076693175">"Uporaba te naprave kot vmesnik MIDI"</string>
-    <string name="usb_use" msgid="3256040963685055320">"Uporaba povezave USB za:"</string>
+    <string name="usb_use" msgid="3256040963685055320">"Povezavo USB uporabi za:"</string>
     <string name="usb_pref" msgid="1400617804525116158">"USB"</string>
     <string name="usb_summary_charging_only" msgid="7544327009143659751">"Polnjenje te naprave"</string>
     <string name="usb_summary_power_only" msgid="3629517713817003738">"Napajanje"</string>
     <string name="usb_summary_file_transfers" msgid="6435943692610175111">"Prenašanje datotek"</string>
     <string name="usb_summary_photo_transfers" msgid="8440204169576585250">"Prenašanje fotografij (PTP)"</string>
     <string name="usb_summary_MIDI" msgid="5687906612187885908">"Uporaba naprave kot vmesnika MIDI"</string>
+    <string name="sms_mirroring_pref" msgid="6475043279147376031">"Zrcaljenje sporočil SMS"</string>
     <string name="background_check_pref" msgid="7550258400138010979">"Preverjanje ozadja"</string>
     <string name="background_check_title" msgid="4534254315824525593">"Poln dostop do ozadja"</string>
     <string name="assist_access_context_title" msgid="2269032346698890257">"Uporaba besedila na zaslonu"</string>
@@ -3354,7 +3382,7 @@
     <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="app_permission_summary_allowed" msgid="1505409933012886711">"Dovoljene"</string>
-    <string name="app_permission_summary_not_allowed" msgid="2592617058101882802">"Nedovoljene"</string>
+    <string name="app_permission_summary_not_allowed" msgid="2592617058101882802">"Ni dovoljeno"</string>
     <string name="keywords_install_other_apps" msgid="761078076051006558">"nameščanje aplikacij neznani viri"</string>
     <string name="write_settings" msgid="4797457275727195681">"Spreminjanje sist. nastavitev"</string>
     <string name="keywords_write_settings" msgid="6415597272561105138">"zapisovanje spreminjanje sistemske nastavitve"</string>
@@ -3364,7 +3392,7 @@
     <string name="write_settings_title" msgid="4232152481902542284">"Lahko spreminjajo sistemske nastavitve"</string>
     <string name="write_system_settings" msgid="3482913590601096763">"Spreminjanje sist. nastavitev"</string>
     <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="permit_write_settings" msgid="658555006453212691">"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>
@@ -3465,9 +3493,12 @@
     <string name="color_temperature" msgid="2070126836910615605">"Hladnejša barvna temperatura"</string>
     <string name="color_temperature_desc" msgid="4793729830226404052">"Uporaba hladnejših barv zaslona"</string>
     <string name="color_temperature_toast" msgid="4974218172133854827">"Če želite uveljaviti spremembo barv, izklopite zaslon"</string>
-    <string name="telephony_monitor_toast" msgid="7003764250271195384">"Če želite uveljaviti spremembo nadziranja telefonije, znova zaženite napravo"</string>
+    <string name="connectivity_monitor_switch" msgid="9059759348648583421">"Nadziranje povezljivosti"</string>
+    <string name="connectivity_monitor_switch_summary" msgid="2828658652378866401">"Funkcija Nadziranje povezljivosti pridobi dnevnike, ko zazna težavo s povezljivostjo, in uporabnika z obvestilom pozove, naj prijavi napako."</string>
+    <string name="connectivity_monitor_toast" msgid="5551859612881173028">"Če želite uveljaviti spremembo nadziranja povezljivosti, znova zaženite napravo"</string>
     <string name="camera_hal_hdrplus_switch" msgid="8377365197105267466">"HDR+ za HAL kamere"</string>
     <string name="camera_hal_hdrplus_toast" msgid="2063703797270055299">"Če želite uveljaviti spremembo nastavitve HDR+ za HAL kamere, znova zaženite napravo"</string>
+    <string name="camera_laser_sensor_switch" msgid="8913588990743234440">"Lasersko tipalo fotoaparata"</string>
     <string name="ota_disable_automatic_update" msgid="2319639631655915050">"Samodejne sistemske posodobitve"</string>
     <string name="usage" msgid="2977875522080448986">"Poraba"</string>
     <string name="cellular_data_usage" msgid="2155683719898158203">"Poraba mobilnih podatkov"</string>
@@ -3493,9 +3524,9 @@
     <string name="data_used_template" msgid="3245919669966296505">"Porabljeno: <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="set_data_warning" msgid="6115364758236594593">"Nastavi opozorilo za prenos podatkov"</string>
     <string name="data_warning" msgid="209133958008062117">"Opozorilo za prenos podatkov"</string>
-    <string name="set_data_limit" msgid="2901526323210516923">"Nastavitev omej. prenosa pod."</string>
+    <string name="set_data_limit" msgid="2901526323210516923">"Nastavi omej. prenosa pod."</string>
     <string name="data_limit" msgid="1885406964934590552">"Omejitev prenosa podatkov"</string>
-    <string name="data_usage_template" msgid="392191945602400904">"Porabljeno: <xliff:g id="ID_1">%1$s</xliff:g> v obdobju <xliff:g id="ID_2">%2$s</xliff:g>"</string>
+    <string name="data_usage_template" msgid="2923744765873163859">"<xliff:g id="ID_1">%1$s</xliff:g> uporabljeno v obdobju <xliff:g id="ID_2">%2$s</xliff:g>"</string>
     <string name="configure" msgid="1029654422228677273">"Konfiguriranje"</string>
     <string name="data_usage_other_apps" msgid="3272872663517382050">"Druge aplikacije, vključene v prikaz porabe"</string>
     <plurals name="data_saver_unrestricted_summary" formatted="false" msgid="2635267833484232703">
@@ -3557,7 +3588,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 do aplikacije"</string>
+    <string name="special_access" msgid="3458780842491881155">"Posebni dostop za 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>
@@ -3568,7 +3599,7 @@
     <string name="button_confirm_convert_fbe" msgid="7101855374850373091">"Izbriši in preklopi"</string>
     <string name="reset_shortcut_manager_throttling" msgid="6495066467198668994">"Ponastavitev omejevanja hitrosti za ShortcutManager"</string>
     <string name="reset_shortcut_manager_throttling_complete" msgid="1826770872063707900">"Omejevanje hitrosti za ShortcutManager je ponastavljeno"</string>
-    <string name="notification_suggestion_title" msgid="4506524937307816475">"Nadzor obvestil na zaklenjenem zaslonu"</string>
+    <string name="notification_suggestion_title" msgid="387052719462473500">"Upravljanje podatkov na zaklenjenem zaslonu"</string>
     <string name="notification_suggestion_summary" msgid="8521159741445416875">"Prikaz ali skrivanje vsebine obvestil"</string>
     <string name="page_tab_title_summary" msgid="4070309266374993258">"Vse"</string>
     <string name="page_tab_title_support" msgid="8483187649355540109">"Podpora in nasveti"</string>
@@ -3576,7 +3607,7 @@
     <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>
     <string name="premium_sms_access" msgid="4660047004791638305">"Dostop za plačljiva sporočila SMS"</string>
-    <string name="bluetooth_disabled" msgid="2456198532288640046">"Ni vidno drugim napravam"</string>
+    <string name="bluetooth_disabled" msgid="6244000672828617410">"Izklopljeno"</string>
     <string name="bluetooth_connected_summary" msgid="7672528674593152862">"Povezan z napravo <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="bluetooth_connected_multiple_devices_summary" msgid="9173661896296663932">"Povezan z več napravami"</string>
     <string name="demo_mode" msgid="2798762752209330277">"Predstavitveni način uporabniškega vmesnika sistema"</string>
@@ -3661,10 +3692,10 @@
     <string name="ambient_display_title" product="device" msgid="3423781975742145894">"Dvakrat se dotaknite, da preverite napravo"</string>
     <string name="ambient_display_summary" msgid="525662960806416373">"Če želite preveriti uro, ikone obvestil in druge informacije, se dvakrat dotaknite zaslona."</string>
     <string name="ambient_display_suggestion_summary" msgid="5987443721392571847">"Preverjanje obvestil pri izklopljenem zaslonu"</string>
-    <string name="ambient_display_pickup_title" product="default" msgid="818688002837687268">"Primite telefon, da ga preverite"</string>
+    <string name="ambient_display_pickup_title" product="default" msgid="818688002837687268">"Preverjanje telefona z dvigom"</string>
     <string name="ambient_display_pickup_title" product="tablet" msgid="4455864282995698097">"Primite tablični računalnik, da ga preverite"</string>
     <string name="ambient_display_pickup_title" product="device" msgid="5380534405773531175">"Primite napravo, da jo preverite"</string>
-    <string name="ambient_display_pickup_summary" product="default" msgid="4567020486787561873">"Če želite preveriti uro, ikone obvestil in druge informacije, primite telefon."</string>
+    <string name="ambient_display_pickup_summary" product="default" msgid="4567020486787561873">"Če želite preveriti uro, ikone obvestil in druge informacije, dvignite telefon."</string>
     <string name="ambient_display_pickup_summary" product="tablet" msgid="5435283849947236648">"Če želite preveriti uro, ikone obvestil in druge informacije, primite tablični računalnik."</string>
     <string name="ambient_display_pickup_summary" product="device" msgid="8256669101643381568">"Če želite preveriti uro, ikone obvestil in druge informacije, primite napravo."</string>
     <string name="ambient_display_pickup_suggestion_summary" msgid="7014700589991761035">"Preverjanje obvestil pri izklopljenem zaslonu"</string>
@@ -3684,7 +3715,7 @@
     <string name="web_action_enable_title" msgid="4051513950976670853">"Nenamestljive aplikacije"</string>
     <string name="web_action_enable_summary" msgid="3108127559723396382">"Odpri povezave v aplikacijah, tudi če niso nameščene"</string>
     <string name="web_action_section_title" msgid="7364647086538399136">"Nenamestljive aplikacije"</string>
-    <string name="instant_apps_account" msgid="1433620209791992528">"Račun za nenamestljive aplikacije"</string>
+    <string name="instant_apps_settings" msgid="8827777916518348213">"Nastavitve nenamestljivih aplikacij"</string>
     <string name="domain_url_section_title" msgid="7046835219056428883">"Nameščene aplikacije"</string>
     <string name="automatic_storage_manager_activation_warning" msgid="6353100011690933254">"Shrambo zdaj upravlja upravitelj shrambe"</string>
     <string name="account_for_section_header" msgid="5356566418548737121">"Računi uporabnika <xliff:g id="USER_NAME">%1$s</xliff:g>"</string>
@@ -3735,7 +3766,9 @@
     <string name="enterprise_privacy_always_on_vpn_personal" msgid="9217774730260037434">"Stalno vklopljen VPN je vklopljen v vašem osebnem profilu"</string>
     <string name="enterprise_privacy_always_on_vpn_work" msgid="7244472958208315814">"Stalno vklopljen VPN je vklopljen v vašem delovnem profilu"</string>
     <string name="enterprise_privacy_global_http_proxy" msgid="7936664553416257333">"Globalni strežnik proxy za HTTP je nastavljen"</string>
-    <string name="enterprise_privacy_ca_certs" msgid="5885892204903688909">"Preverjene poverilnice"</string>
+    <string name="enterprise_privacy_ca_certs_device" msgid="2019652712782510262">"Zaupanja vredne poverilnice"</string>
+    <string name="enterprise_privacy_ca_certs_personal" msgid="2279084820904076599">"Zaupanja vredne poverilnice v vašem osebnem profilu"</string>
+    <string name="enterprise_privacy_ca_certs_work" msgid="6187377647815301809">"Zaupanja vredne poverilnice v vašem delovnem profilu"</string>
     <plurals name="enterprise_privacy_number_ca_certs" formatted="false" msgid="526375234629534165">
       <item quantity="one">Najmanj <xliff:g id="COUNT_1">%d</xliff:g> potrdilo overitelja potrdil</item>
       <item quantity="two">Najmanj <xliff:g id="COUNT_1">%d</xliff:g> potrdili overitelja potrdil</item>
@@ -3785,7 +3818,7 @@
     <string name="storage_other_apps" msgid="5524321740031718083">"Druge aplikacije"</string>
     <string name="storage_files" msgid="8581083146777364063">"Datoteke"</string>
     <string name="storage_size_large_alternate" msgid="3550744227788333060">"<xliff:g id="NUMBER">^1</xliff:g>"<small>" <xliff:g id="UNIT">^2</xliff:g>"</small>""</string>
-    <string name="storage_volume_total" msgid="3499221850532701342">"Uporabljeno od <xliff:g id="TOTAL">%1$s</xliff:g>"</string>
+    <string name="storage_volume_total" msgid="3499221850532701342">"uporabljeno od <xliff:g id="TOTAL">%1$s</xliff:g>"</string>
     <string name="storage_percent_full" msgid="6095012055875077036">"uporab."</string>
     <string name="clear_instant_app_data" msgid="2004222610585890909">"Počisti aplikacijo"</string>
     <string name="clear_instant_app_confirmation" msgid="7451671214898856857">"Ali želite odstraniti to nenamestljivo aplikacijo?"</string>
@@ -3808,6 +3841,8 @@
     <string name="carrier_provisioning" msgid="4398683675591893169">"Podatki o omogočanju uporabe operaterja"</string>
     <string name="trigger_carrier_provisioning" msgid="3434865918009286187">"Sproži omogočanje uporabe operaterja"</string>
     <string name="new_device_suggestion_title" msgid="698847081680980774">"Odkrijte zanimive novosti"</string>
-    <string name="new_device_suggestion_summary" msgid="7172709269203435870">"Spoznajte pet najuporabnejših funkcij"</string>
+    <string name="new_device_suggestion_summary" product="default" msgid="206396571522515855">"Oglejte si predstavitev novega telefona"</string>
+    <string name="new_device_suggestion_summary" product="tablet" msgid="393751455688210956">"Oglejte si predstavitev novega tabličnega računalnika"</string>
+    <string name="new_device_suggestion_summary" product="device" msgid="2939870049868336652">"Oglejte si predstavitev nove naprave"</string>
     <string name="disabled_low_ram_device" msgid="3751578499721173344">"Ta funkcija ni na voljo v tej napravi."</string>
 </resources>
diff --git a/res/values-sq/arrays.xml b/res/values-sq/arrays.xml
index 7324054..b40152d 100644
--- a/res/values-sq/arrays.xml
+++ b/res/values-sq/arrays.xml
@@ -100,8 +100,6 @@
     <!-- no translation found for wifi_security_no_eap:0 (2084555984818107151) -->
     <!-- no translation found for wifi_security_no_eap:1 (397579322683471524) -->
     <!-- no translation found for wifi_security_no_eap:2 (1968820975358150484) -->
-    <!-- no translation found for wifi_ap_security:0 (5251664683198623324) -->
-    <!-- no translation found for wifi_ap_security:1 (7989073072260294673) -->
   <string-array name="wifi_eap_method">
     <item msgid="1160193392455075561">"PEAP"</item>
     <item msgid="7981731051382306293">"TLS"</item>
diff --git a/res/values-sq/strings.xml b/res/values-sq/strings.xml
index aeaf624..0d6e187 100644
--- a/res/values-sq/strings.xml
+++ b/res/values-sq/strings.xml
@@ -166,7 +166,7 @@
     <string name="bluetooth_map_acceptance_dialog_text" msgid="8712508202081143737">"%1$s kërkon të ketë qasje te mesazhet e tua. Të lejohet qasja për %2$s?"</string>
     <string name="bluetooth_sap_request" msgid="2669762224045354417">"Kërkesa për qasje në kartën SIM"</string>
     <string name="bluetooth_sap_acceptance_dialog_text" msgid="4414253873553608690">"Pajisja <xliff:g id="DEVICE_NAME_0">%1$s</xliff:g> dëshiron të ketë qasje në kartën tënde SIM. Dhënia e të drejtës për qasje në kartën SIM do të çaktivizojë lidhjen e të dhënave në pajisjen tënde gjatë kohëzgjatjes së lidhjes. Jepi qasje pajisjes <xliff:g id="DEVICE_NAME_1">%2$s?</xliff:g>"</string>
-    <string name="bluetooth_device_name_summary" msgid="4757990010751789977">"E dukshme si \"<xliff:g id="DEVICE_NAME">^1</xliff:g>\" për pajisjet e tjera"</string>
+    <string name="bluetooth_device_name_summary" msgid="522235742194965734">"E dukshme si \"<xliff:g id="DEVICE_NAME">^1</xliff:g>\" për pajisjet e tjera"</string>
     <string name="bluetooth_paired_device_title" msgid="8638994696317952019">"Pajisjet e tua"</string>
     <string name="bluetooth_pairing_page_title" msgid="7712127387361962608">"Çifto pajisjen e re"</string>
     <string name="date_and_time" msgid="9062980487860757694">"Data dhe ora"</string>
@@ -312,6 +312,8 @@
     <string name="zone_auto" msgid="334783869352026648">"Brezi orar, automatik"</string>
     <string name="zone_auto_summaryOn" msgid="6142830927278458314">"Përdor brezin orar të ofruar nga rrjeti"</string>
     <string name="zone_auto_summaryOff" msgid="2597745783162041390">"Përdor brezin orar të ofruar nga rrjeti"</string>
+    <string name="date_time_24hour_auto" msgid="2117383168985653422">"Formati automatik 24‑orësh"</string>
+    <string name="date_time_24hour_auto_summary" msgid="6351812925651480277">"Përdor parazgjedhjen e lokalitetit"</string>
     <string name="date_time_24hour_title" msgid="3203537578602803850">"Formati \"24 orë\""</string>
     <string name="date_time_24hour" msgid="1193032284921000063">"Përdor formatin 24 orë"</string>
     <string name="date_time_set_time_title" msgid="6296795651349047016">"Ora"</string>
@@ -341,8 +343,7 @@
     <string name="Accounts_settings_title" msgid="1643879107901699406">"Llogaritë"</string>
     <string name="location_settings_title" msgid="1369675479310751735">"Vendndodhja"</string>
     <string name="account_settings_title" msgid="626177544686329806">"Llogaritë"</string>
-    <!-- no translation found for security_settings_title (4918904614964215087) -->
-    <skip />
+    <string name="security_settings_title" msgid="4918904614964215087">"Siguria dhe vendndodhja"</string>
     <string name="encryption_and_credential_settings_title" msgid="6514904533438791561">"Enkriptimi dhe kredencialet"</string>
     <string name="encryption_and_credential_settings_summary" product="default" msgid="8721883002237981248">"Telefoni është i enkriptuar"</string>
     <string name="encryption_and_credential_settings_summary" product="tablet" msgid="7200428573872395685">"Pajisja është e enkriptuar"</string>
@@ -373,6 +374,9 @@
     <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="1961957425135180242">"Përpara"</string>
+    <string name="setup_fingerprint_enroll_skip_title" msgid="362050541117362034">"Të kapërcehet gjurma e gishtit?"</string>
+    <string name="setup_fingerprint_enroll_skip_after_adding_lock_text" msgid="958990414356204763">"Konfigurimi i gjurmëve të gishtave zgjat vetëm një ose dy minuta. Nëse e kapërcen këtë, mund të shtosh gjurmën tënde të gishtit më vonë te cilësimet."</string>
+    <string name="lock_screen_intro_skip_title" msgid="4988210105913705679">"Të kapërcehet kyçja e ekranit?"</string>
     <string name="lock_screen_intro_skip_dialog_text_frp" product="tablet" msgid="1581834104051243425">"Funksionet e mbrojtjes së pajisjes nuk do të aktivizohen. Ti nuk do mund të parandalosh që të tjerët të mos e përdorin këtë tablet nëse ai humb, vidhet ose rivendoset."</string>
     <string name="lock_screen_intro_skip_dialog_text_frp" product="device" msgid="4629503416877189572">"Funksionet e mbrojtjes së pajisjes nuk do të aktivizohen. Ti nuk do mund të parandalosh që të tjerët të mos e përdorin këtë pajisje nëse ajo humb, vidhet ose rivendoset."</string>
     <string name="lock_screen_intro_skip_dialog_text_frp" product="default" msgid="2423428240245737909">"Funksionet e mbrojtjes së pajisjes nuk do të aktivizohen. Ti nuk do mund të parandalosh që të tjerët të mos e përdorin këtë telefon nëse ai humb, vidhet ose rivendoset."</string>
@@ -458,7 +462,7 @@
     <string name="setup_lock_settings_picker_title" product="tablet" msgid="90329443364067215">"Mbroje tabletin tënd"</string>
     <string name="setup_lock_settings_picker_title" product="device" msgid="2399952075134938929">"Mbroje pajisjen tënde"</string>
     <string name="setup_lock_settings_picker_title" product="default" msgid="1572244299605153324">"Mbroje telefonin tënd"</string>
-    <string name="setup_lock_settings_picker_fingerprint_message" msgid="5585650064305600578">"Për më shumë siguri, konfiguro një kyçje rezervë për ekranin."</string>
+    <string name="lock_settings_picker_fingerprint_added_security_message" msgid="5768002109707648463">"Për më shumë siguri, cakto një kyçje rezervë për ekranin."</string>
     <string name="setup_lock_settings_picker_message" product="tablet" msgid="8919671129189936210">"Parandalo që të tjerët ta përdorin këtë tablet 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="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>
@@ -589,6 +593,7 @@
     <string name="lockpassword_pin_no_sequential_digits" msgid="680765285206990584">"Nuk lejohet një sekuencë shifrash në rritje, në zbritje ose me përsëritje"</string>
     <string name="lockpassword_ok_label" msgid="313822574062553672">"Në rregull"</string>
     <string name="lockpassword_cancel_label" msgid="8818529276331121899">"Anulo"</string>
+    <string name="lockpassword_clear_label" msgid="5724429464960458155">"Pastro"</string>
     <string name="lockpattern_tutorial_cancel_label" msgid="6431583477570493261">"Anulo"</string>
     <string name="lockpattern_tutorial_continue_label" msgid="3559793618653400434">"Përpara"</string>
     <string name="lock_setup" msgid="3355847066343753943">"Konfigurimi përfundoi."</string>
@@ -782,6 +787,7 @@
     <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>
@@ -818,6 +824,8 @@
     <string name="wifi_wps_available_first_item" msgid="4422547079984583502">"Ofrohet WPS"</string>
     <string name="wifi_wps_available_second_item" msgid="8427520131718215301">" (Ofrohet WPS)"</string>
     <string name="wifi_wps_nfc_enter_password" msgid="2288214226916117159">"Fut fjalëkalimin e rrjetit"</string>
+    <string name="wifi_carrier_connect" msgid="8174696557882299911">"Rrjeti Wi-Fi i operatorit celular"</string>
+    <string name="wifi_carrier_content" msgid="4634077285415851933">"E lidhur përmes <xliff:g id="NAME">%1%s</xliff:g>"</string>
     <string name="wifi_scan_always_turnon_message" msgid="203123538572122989">"Për të përmirësuar saktësinë e vendndodhjes dhe për qëllime të tjera, <xliff:g id="APP_NAME">%1$s</xliff:g> dëshiron të aktivizojë skanimin e rrjetit, edhe kur Wi-Fi është joaktiv.\n\nTë lejohet kjo për të gjitha aplikacionet që dëshirojnë të skanojnë?"</string>
     <string name="wifi_scan_always_turnoff_message" msgid="5538901671131941043">"Për ta çaktivizuar këtë, shko te \"Të përparuara\" në menynë e tejkalimit."</string>
     <string name="wifi_scan_always_confirm_allow" msgid="5355973075896817232">"Lejo"</string>
@@ -835,6 +843,7 @@
     <string name="wifi_connect" msgid="1076622875777072845">"Lidh"</string>
     <string name="wifi_failed_connect_message" msgid="8491902558970292871">"Lidhja me rrjetin dështoi"</string>
     <string name="wifi_forget" msgid="8168174695608386644">"Harro"</string>
+    <string name="wifi_modify" msgid="6100248070440710782">"Modifiko"</string>
     <string name="wifi_failed_forget_message" msgid="1348172929201654986">"Dështoi në harrimin e rrjetit"</string>
     <string name="wifi_save" msgid="3331121567988522826">"Ruaj"</string>
     <string name="wifi_failed_save_message" msgid="6650004874143815692">"Dështoi në ruajtjen e rrjetit"</string>
@@ -847,6 +856,7 @@
     <string name="wifi_advanced_titlebar" msgid="4485841401774142908">"Cilësimet e 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_title" msgid="3471132676909349382">"Informacioni i rrjetit"</string>
     <string name="wifi_details_subnet_mask" msgid="6720279144174924410">"Maska e nënrrjetit"</string>
     <string name="wifi_details_dns" msgid="8648826607751830768">"DNS"</string>
     <string name="wifi_details_ipv6_address_header" msgid="6734119149106422148">"Adresat IPv6"</string>
@@ -879,16 +889,15 @@
     <string name="wifi_p2p_cancel_connect_title" msgid="255267538099324413">"Të anulohet ftesa?"</string>
     <string name="wifi_p2p_cancel_connect_message" msgid="7477756213423749402">"Dëshiron të anulosh ftesën për t\'u lidhur me <xliff:g id="PEER_NAME">%1$s</xliff:g>?"</string>
     <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_off_subtext" msgid="5466126533609394170">"Nuk po ndan internetin ose përmbajtje me pajisjet e tjera"</string>
     <string name="wifi_hotspot_tethering_on_subtext" product="tablet" msgid="5752490509369962007">"Po ndan lidhjen e internetit të këtij tableti nëpërmjet zonës së qasjes së internetit"</string>
     <string name="wifi_hotspot_tethering_on_subtext" product="default" msgid="6461075246164300670">"Po ndan lidhjen e internetit të këtij telefoni nëpërmjet zonës së qasjes së internetit"</string>
     <string name="wifi_hotspot_on_local_only_subtext" msgid="2068110388011294735">"Aplikacioni po ndan përmbajtje. Për të ndarë lidhjen e internetit, çaktivizo zonën e qasjes së internetit dhe më pas aktivizoje përsëri."</string>
-    <string name="wifi_hotspot_name_title" msgid="1341735529132128887">"Emri i Wi‑Fi"</string>
+    <string name="wifi_hotspot_name_title" msgid="8237000746618636778">"Emri i zonës së qasjes për internet"</string>
     <string name="wifi_hotspot_name_summary_connecting" msgid="3378299995508671967">"<xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g> po aktivizohet..."</string>
     <string name="wifi_hotspot_name_summary_connected" msgid="3888672084861445362">"Pajisjet e tjera mund të lidhen me <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>"</string>
-    <string name="wifi_hotspot_password_title" msgid="1955592302902091281">"Fjalëkalimi i Wi-Fi"</string>
+    <string name="wifi_hotspot_password_title" msgid="8676859981917573801">"Fjalëkalimi i zonës së qasjes për internet"</string>
     <string name="wifi_hotspot_ap_band_title" msgid="1165801173359290681">"Brezi AP"</string>
     <string name="wifi_hotspot_footer_info_regular" msgid="1203489406068036455">"Përdor zonën e qasjes së internetit për të krijuar një rrjet Wi‑Fi për pajisjet e tua të tjera. Zona e qasjes e internetit ofron internet duke përdorur lidhjen e të dhënave celulare. Mund të zbatohen tarifa shtesë për të dhënat celulare."</string>
     <string name="wifi_hotspot_footer_info_local_only" msgid="857988412470694109">"Aplikacionet mund të krijojnë një zonë qasjeje të internetit për të ndarë përmbajtje me pajisjet në afërsi."</string>
@@ -899,7 +908,6 @@
     <string name="wifi_tether_configure_ap_text" msgid="7974681394041609308">"Konfiguro zonën e qasjes Wi‑Fi"</string>
     <string name="wifi_hotspot_configure_ap_text" msgid="5478614731464220432">"Konfigurimi i zonës së qasjes Wi‑Fi"</string>
     <string name="wifi_hotspot_configure_ap_text_summary" msgid="5560680057727007011">"Zona e qasjes e AndroidAP WPA2 PSK"</string>
-    <string name="wifi_tether_configure_subtext" msgid="2050196439900426456">"Zona e qasjes <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">"Zona Android e qasjes së lirë për internet"</string>
     <string name="wifi_calling_settings_title" msgid="4102921303993404577">"Telefonata me Wi-Fi"</string>
     <string name="wifi_calling_suggestion_title" msgid="9008010480466359578">"Aktivizo \"Telefonatën me Wi-Fi\""</string>
@@ -940,7 +948,7 @@
     <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="emergency_address_summary" msgid="3266760199681945746">"Adresa përdoret nga shërbimet e urgjencës si vendndodhja jote nëse kryen një telefonatë urgjence me WiFi"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"Paraqitja"</string>
     <string name="sound_settings" msgid="5534671337768745343">"Tingulli"</string>
     <string name="all_volume_title" msgid="4296957391257836961">"Volumet"</string>
@@ -994,6 +1002,7 @@
     <string name="search_settings" msgid="1910951467596035063">"Kërko"</string>
     <string name="search_settings_summary" msgid="9205656546570654169">"Menaxho cilësimet dhe historikun e kërkimit"</string>
     <string name="search_settings_no_results" msgid="8799027492641230999">"Nuk ka rezultate"</string>
+    <string name="search_clear_history" msgid="4196658962573162457">"Pastro historikun"</string>
     <string name="display_settings" msgid="7965901687241669598">"Ekrani"</string>
     <string name="accelerometer_title" msgid="7854608399547349157">"Ekran me rrotullim automatik"</string>
     <string name="color_mode_title" msgid="3159275920408338215">"Ngjyra të gjalla"</string>
@@ -1123,7 +1132,6 @@
     <string name="baseband_version" msgid="1848990160763524801">"Versioni i brezit të bazës"</string>
     <string name="kernel_version" msgid="9192574954196167602">"Versioni i bërthamës"</string>
     <string name="build_number" msgid="3075795840572241758">"Numri i ndërtimit"</string>
-    <string name="selinux_status" msgid="6212165375172061672">"Statusi i SELinux"</string>
     <string name="device_info_not_available" msgid="8062521887156825182">"Nuk ofrohet"</string>
     <string name="device_status_activity_title" msgid="1411201799384697904">"Statusi"</string>
     <string name="device_status" msgid="607405385799807324">"Statusi"</string>
@@ -1151,7 +1159,6 @@
     <string name="status_wifi_mac_address" msgid="2202206684020765378">"Adresa MAC e Wi‑Fi"</string>
     <string name="status_bt_address" msgid="4195174192087439720">"Adresa e Bluetooth-it"</string>
     <string name="status_serial_number" msgid="2257111183374628137">"Numri i serisë"</string>
-    <string name="status_unavailable" msgid="7862009036663793314">"Nuk ofrohet"</string>
     <string name="status_up_time" msgid="7294859476816760399">"Koha aktive"</string>
     <string name="status_awake_time" msgid="2393949909051183652">"Koha e zgjimit"</string>
     <string name="internal_memory" msgid="9129595691484260784">"Hapësira e brendshme për ruajtje"</string>
@@ -1327,6 +1334,7 @@
     <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>
     <string name="reset_dashboard_title" msgid="6254873816990678620">"Opsionet e rivendosjes"</string>
+    <string name="reset_dashboard_summary" msgid="4851012632493522755">"Rrjeti, aplikacionet ose pajisja mund të rivendosen"</string>
     <string name="reset_network_title" msgid="6166025966016873843">"Rivendos Wi-Fi, lidhjen celulare dhe Bluetooth"</string>
     <string name="reset_network_desc" msgid="5547979398298881406">"Kjo do të rivendosë të gjitha cilësimet e rrjetit, duke përfshirë:\n\n"<li>"Wi‑Fi"</li>\n<li>"Të dhënat celulare"</li>\n<li>"Bluetooth"</li></string>
     <string name="reset_network_button_text" msgid="2035676527471089853">"Rivendos cilësimet"</string>
@@ -1335,17 +1343,14 @@
     <string name="reset_network_confirm_title" msgid="1759888886976962773">"Të rivendosen?"</string>
     <string name="network_reset_not_available" msgid="7188610385577164676">"Rivendosja e rrjetit nuk është e disponueshme për këtë përdorues"</string>
     <string name="reset_network_complete_toast" msgid="787829973559541880">"Cilësimet e rrjetit janë rivendosur"</string>
-    <string name="master_clear_title" msgid="6617679904229218425">"Spastro të gjitha të dhënat (rivendosja e fabrikës)"</string>
-    <plurals name="master_clear_with_account_summary" formatted="false" msgid="5911377203778818712">
-      <item quantity="other"><xliff:g id="ACCOUNT_COUNT">%1$d</xliff:g> llogari do të rivendosen</item>
-      <item quantity="one">1 llogari do të rivendoset</item>
-    </plurals>
-    <string name="master_clear_summary" msgid="6902443944660426951">"Hapësira ruajtëse e brendshme dhe të gjitha të dhënat do të rivendosen"</string>
+    <string name="master_clear_title" msgid="3531267871084279512">"Spastro të gjitha të dhënat (rivendosja e fabrikës)"</string>
     <string name="master_clear_desc" product="tablet" msgid="9146059417023157222">"Kjo do t\'i fshijë të gjitha të dhënat nga "<b>"hapësira e brendshme për ruajtje"</b>" e tabletit, përfshirë:\n\n"<li>"Llogarinë e Google"</li>\n<li>"Të dhënat e sistemit dhe aplikacioneve si dhe cilësimet"</li>\n<li>"Aplikacionet e shkarkuara"</li></string>
     <string name="master_clear_desc" product="default" msgid="4800386183314202571">"Kjo do t\'i fshijë të gjitha të dhënat nga "<b>"hapësira e brendshme për ruajtje"</b>" e telefonit, përfshirë:\n\n"<li>"Llogarinë e Google"</li>\n<li>"Të dhënat e sistemit dhe aplikacioneve si dhe cilësimet"</li>\n<li>"Aplikacionet e shkarkuara"</li></string>
     <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"Je i identifikuar aktualisht në llogaritë e mëposhtme:\n"</string>
     <string name="master_clear_other_users_present" product="default" msgid="5161423070702470742">\n\n"Ka përdorues të tjerë të pranishëm në këtë pajisje.\n"</string>
     <string name="master_clear_desc_also_erases_external" msgid="1903185203791274237"><li>"Muzika"</li>\n<li>"Fotografitë"</li>\n<li>"Të dhëna të tjera të përdoruesit"</li></string>
+    <string name="master_clear_desc_also_erases_esim" msgid="312352697653096008"><li>"Operatorët celularë në eSIM"</li></string>
+    <string name="master_clear_desc_no_cancel_mobile_plan" msgid="5460926449093211144">\n\n"Kjo nuk do ta anulojë planin tënd të shërbimit celular."</string>
     <string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="7744115866662613411">\n\n"Për të hequr muzikën, fotografitë dhe të dhëna të tjera të përdoruesit, "<b>"hapësira ruajtëse e USB-së"</b>" duhet të spastrohet."</string>
     <string name="master_clear_desc_erase_external_storage" product="default" msgid="4801026652617377093">\n\n"Për të hequr muzikën, fotografitë dhe të dhëna të tjera të përdoruesit, "<b>"karta SD"</b>" duhet të spastrohet."</string>
     <string name="erase_external_storage" product="nosdcard" msgid="969364037450286809">"Fshi hapësirën ruajtëse të USB-së"</string>
@@ -1462,15 +1467,16 @@
     <string name="settings_safetylegal_activity_title" msgid="6901214628496951727">"Informacioni i sigurisë"</string>
     <string name="settings_safetylegal_activity_unreachable" msgid="250674109915859456">"Nuk ke një lidhje të dhënash. Për të parë këtë informacion tani, shko te %s nga një kompjuter i lidhur me internetin."</string>
     <string name="settings_safetylegal_activity_loading" msgid="8059022597639516348">"Po ngarkon..."</string>
-    <string name="lockpassword_choose_your_password_header" msgid="8624900666929394990">"Zgjidh fjalëkalimin"</string>
-    <string name="lockpassword_choose_your_password_header_for_fingerprint" msgid="6624409510609085450">"Për të përdorur gjurmën e gishtit, vendos fjalëkalimin"</string>
-    <string name="lockpassword_choose_your_pattern_header" msgid="6949761069941694050">"Zgjidh motivin"</string>
-    <string name="lockpassword_choose_your_pattern_header_for_fingerprint" msgid="5901096361617543819">"Për të përdorur gjurmën e gishtit, vendos motivin"</string>
-    <string name="lockpassword_choose_your_pin_header" msgid="7598849519816138302">"Zgjidh kodin PIN"</string>
-    <string name="lockpassword_choose_your_pin_header_for_fingerprint" msgid="765344692615917183">"Për të përdorur gjurmën e gishtit, vendos kodin PIN"</string>
-    <string name="lockpassword_confirm_your_password_header" msgid="6308478184889846633">"Konfirmo fjalëkalimin"</string>
+    <string name="lockpassword_choose_your_screen_lock_header" msgid="3872462096767152394">"Cakto një kyçje të ekranit"</string>
+    <string name="lockpassword_choose_your_password_message" msgid="1197569283524841412">"Për siguri, cakto një fjalëkalim"</string>
+    <string name="lockpassword_choose_your_password_header_for_fingerprint" msgid="2541818487015343503">"Cakto një rezervë për gjurmën e gishtit"</string>
+    <string name="lockpassword_choose_your_pattern_header_for_fingerprint" msgid="7709785406243556723">"Cakto një rezervë për gjurmën e gishtit"</string>
+    <string name="lockpassword_choose_your_pin_message" msgid="1875420718677275646">"Për siguri, cakto një kod PIN"</string>
+    <string name="lockpassword_choose_your_pin_header_for_fingerprint" msgid="1549639053195796674">"Cakto një rezervë për gjurmën e gishtit"</string>
+    <string name="lockpassword_choose_your_pattern_message" msgid="5986983400689720015">"Për siguri, cakto një motiv"</string>
+    <string name="lockpassword_confirm_your_password_header" msgid="1266027268220850931">"Fut përsëri fjalëkalimin"</string>
     <string name="lockpassword_confirm_your_pattern_header" msgid="7543433733032330821">"Konfirmo motivin"</string>
-    <string name="lockpassword_confirm_your_pin_header" msgid="49038294648213197">"Konfirmo kodin tënd PIN"</string>
+    <string name="lockpassword_confirm_your_pin_header" msgid="7744513791910572550">"Fut përsëri kodin PIN"</string>
     <string name="lockpassword_confirm_passwords_dont_match" msgid="5140892109439191415">"Fjalëkalimet nuk përputhen"</string>
     <string name="lockpassword_confirm_pins_dont_match" msgid="7226244811505606217">"Kodet PIN nuk përputhen"</string>
     <string name="lockpassword_choose_lock_generic_header" msgid="3811438094903786145">"Përzgjedhja e shkyçjes"</string>
@@ -1489,6 +1495,12 @@
     <string name="lockpassword_strong_auth_required_work_pattern" msgid="3003781907040522053">"Për më shumë siguri, përdor motivin e punës"</string>
     <string name="lockpassword_strong_auth_required_work_pin" msgid="3367491332598821552">"Për më shumë siguri, fut kodin PIN të punës"</string>
     <string name="lockpassword_strong_auth_required_work_password" msgid="8159775129968582940">"Për më shumë siguri, fut fjalëkalimin e punës"</string>
+    <string name="lockpassword_confirm_your_pattern_details_frp" msgid="6757336656791723193">"Telefoni u vendos në cilësimet e fabrikës. Për ta përdorur këtë telefon, fut motivin e mëparshëm."</string>
+    <string name="lockpassword_confirm_your_pin_details_frp" msgid="826520613445990470">"Telefoni u vendos në cilësimet e fabrikës. Për ta përdorur këtë telefon, fut kodin PIN të mëparshëm."</string>
+    <string name="lockpassword_confirm_your_password_details_frp" msgid="8944081074615739040">"Telefoni u vendos në cilësimet e fabrikës. Për ta përdorur këtë telefon, fut fjalëkalimin e mëparshëm."</string>
+    <string name="lockpassword_confirm_your_pattern_header_frp" msgid="2898036091609128286">"Verifiko motivin"</string>
+    <string name="lockpassword_confirm_your_pin_header_frp" msgid="4141601774778898803">"Verifiko kodin PIN"</string>
+    <string name="lockpassword_confirm_your_password_header_frp" msgid="3762615419295360480">"Verifiko fjalëkalimin"</string>
     <string name="lockpassword_invalid_pin" msgid="15588049067548470">"Kod PIN i gabuar"</string>
     <string name="lockpassword_invalid_password" msgid="4038507398784975200">"Fjalëkalim i gabuar"</string>
     <string name="lockpattern_need_to_unlock_wrong" msgid="1745247595356012176">"Motiv i gabuar"</string>
@@ -1538,7 +1550,6 @@
     <string name="install_applications_title" msgid="4987712352256508946">"Lejo të gjitha burimet e apl."</string>
     <string name="recent_app_category_title" msgid="6673071268966003928">"Aplikacionet e hapura së fundi"</string>
     <string name="see_all_apps_title" msgid="1317153498074308438">"Shiko të <xliff:g id="COUNT">%1$d</xliff:g> aplikacionet"</string>
-    <string name="recent_app_summary" msgid="3366446669844932300">"<xliff:g id="TIME">^1</xliff:g> më parë"</string>
     <string name="install_all_warning" product="tablet" msgid="8310489909586138165">"Tableti dhe të dhënat e tua personale janë më të cenueshme për t\'u sulmuar nga aplikacione të panjohura. Duke instaluar aplikacionet nga ky burim, ti pranon se je plotësisht përgjegjës për çdo dëm ndaj tabletit ose çdo humbje të dhënash që mund të rezultojë nga përdorimi i tyre."</string>
     <string name="install_all_warning" product="default" msgid="1952257127370115988">"Telefoni dhe të dhënat e tua personale janë më të cenueshme për t\'u sulmuar nga aplikacione të panjohura. Duke instaluar aplikacionet nga ky burim, ti pranon se je plotësisht përgjegjës për çdo dëm ndaj telefonit ose çdo humbje të dhënash që mund të rezultojë nga përdorimi i tyre."</string>
     <string name="advanced_settings" msgid="1777249286757067969">"Cilësimet e përparuara"</string>
@@ -1802,7 +1813,7 @@
     <string name="accessibility_settings_summary" msgid="981260486011624939">"Lexues ekrani, ekran, kontrolle interaktive"</string>
     <string name="vision_settings_title" msgid="4204111425716868288">"Cilësimet e shikimit"</string>
     <string name="vision_settings_description" msgid="5679491180156408260">"Mund ta personalizosh këtë pajisje për t\'iu përshtatur nevojave të tua. Këto funksione të qasjes mund të ndryshohen më vonë te \"Cilësimet\"."</string>
-    <string name="vision_settings_suggestion_title" msgid="917294957154878441">"Rrit madhësinë e fontit"</string>
+    <string name="vision_settings_suggestion_title" msgid="8058794060304707004">"Ndrysho madhësinë e shkrimit"</string>
     <string name="screen_reader_category_title" msgid="7739154903913400641">"Lexuesit e ekranit"</string>
     <string name="audio_and_captions_category_title" msgid="3420727114421447524">"Audioja dhe teksti në ekran"</string>
     <string name="display_category_title" msgid="685461049938269166">"Ekrani"</string>
@@ -1839,7 +1850,6 @@
     <string name="accessibility_display_inversion_preference_subtitle" msgid="7052959202195368109">"Mund të ndikojë te cilësia e funksionimit"</string>
     <string name="accessibility_autoclick_preference_title" msgid="7014499339068449623">"Kliko pasi kursori të ndalojë së lëvizuri"</string>
     <string name="accessibility_autoclick_delay_preference_title" msgid="3962261178385106006">"Vonesa përpara klikimit"</string>
-    <string name="preference_summary_default_combination" msgid="8532964268242666060">"<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">"AKTIVE"</string>
     <string name="accessibility_summary_state_disabled" msgid="2241315620132005595">"JOAKTIVE"</string>
     <string name="enable_quick_setting" msgid="2366999897816894536">"Shfaq në Cilësimet e shpejta"</string>
@@ -1958,12 +1968,14 @@
     <string name="background_activity_summary_on" msgid="649282072540085599">"Aplikacioni mund të ekzekutohet në sfond kur nuk është në përdorim."</string>
     <string name="background_activity_summary_off" msgid="7666330699090632040">"Aktiviteti në sfond i aplikacionit është i kufizuar kur nuk është në përdorim"</string>
     <string name="background_activity_summary_disabled" msgid="3710669050484599847">"Nuk lejohet që aplikacioni të ekzekutohet në sfond"</string>
+    <string name="background_activity_summary_whitelisted" msgid="7375400051141016808">"Aplikacioni nuk mund të optimizohet për përdorimin e baterisë"</string>
+    <string name="background_activity_warning_dialog_title" msgid="2216249969149568871">"Të kufizohet aktiviteti në sfond?"</string>
+    <string name="background_activity_warning_dialog_text" msgid="7049624449246121981">"Nëse e kufizon aktivitetin në sfond për një aplikacion, mund të ketë çrregullime në funksionimin e tij"</string>
     <string name="device_screen_usage" msgid="3386088035570409683">"Përdorimi i ekranit që nga ngarkimi i plotë"</string>
     <string name="device_screen_consumption" msgid="4607589286438986687">"Konsumi i ekranit"</string>
     <string name="device_cellular_network" msgid="4724773411762382950">"Skanimi i rrjetit celular"</string>
-    <string name="power_last_full_charge_summary" msgid="532845389094620657">"<xliff:g id="TIME">^1</xliff:g> më parë"</string>
-    <string name="power_usage_list_summary" msgid="6775339745194635000">"Përdorimi i apl. që nga ngarkimi i plotë (<xliff:g id="TIME">^1</xliff:g> më parë)"</string>
-    <string name="power_usage_list_summary_device" msgid="7036566616386864302">"Përdorimi i pajisjes që nga ngarkimi i plotë (<xliff:g id="TIME">^1</xliff:g> më parë)"</string>
+    <string name="power_usage_list_summary" msgid="6393929085382334341">"Përdorimi i aplikacionit që nga ngarkimi i plotë (<xliff:g id="RELATIVE_TIME">^1</xliff:g>)"</string>
+    <string name="power_usage_list_summary_device" msgid="4461926045610455423">"Përdorimi i pajisjes që nga ngarkimi i plotë (<xliff:g id="RELATIVE_TIME">^1</xliff:g>)"</string>
     <string name="screen_usage_summary" msgid="6687403051423153550">"Sasia e kohës për të cilën ekrani ka qenë aktiv që nga ngarkimi i plotë"</string>
     <string name="device_usage_list_summary" msgid="5623036661468763251">"Përdorimi i pajisjes që nga ngarkimi i plotë"</string>
     <string name="battery_since_unplugged" msgid="338073389740738437">"Përdorimi i baterisë që nga heqja nga ngarkimi"</string>
@@ -2209,14 +2221,14 @@
     <string name="credentials_unlock_hint" msgid="2301301378040499348">"Shkruaj fjalëkalimin për hapësirën ruajtjëse të kredencialeve."</string>
     <string name="credentials_old_password" msgid="7553393815538684028">"Fjalëkalimi aktual:"</string>
     <string name="credentials_reset_hint" msgid="6297256880896133631">"Të hiqen të gjitha përmbajtjet?"</string>
-    <string name="credentials_password_too_short" msgid="7502749986405522663">"Fjalëkalimi duhet të ketë të paktën 8 karaktere."</string>
     <string name="credentials_wrong_password" msgid="2541932597104054807">"Fjalëkalim i pasaktë."</string>
     <string name="credentials_reset_warning" msgid="5320653011511797600">"Fjalëkalim i pasaktë. Ke edhe një mundësi tjetër para se hapësira ruajtëse e kredencialeve të fshihet."</string>
     <string name="credentials_reset_warning_plural" msgid="6514085665301095279">"Fjalëkalim i pasaktë. Ke edhe <xliff:g id="NUMBER">%1$d</xliff:g> mundësi të tjera para se hapësira ruajtëse e kredencialeve të spastrohet."</string>
     <string name="credentials_erased" msgid="2907836028586342969">"Hapësira ruajtëse e kredencialeve është spastruar."</string>
     <string name="credentials_not_erased" msgid="7685932772284216097">"Ruajtja e kred. s\'mund të fshihej."</string>
     <string name="credentials_enabled" msgid="7588607413349978930">"Është aktivizuar hapësira për ruajtjen e kredencialeve."</string>
-    <string name="credentials_configure_lock_screen_hint" msgid="6757119179588664966">"Duhet të caktosh një PIN të ekranit të kyçjes para se të mund të përdorësh hapësirën ruajtëse të kredencialeve."</string>
+    <string name="credentials_configure_lock_screen_hint" msgid="8058230497337529036">"Përpara se të mund të përdorësh hapësirën ruajtëse të kredencialeve, pajisja jote duhet të ketë një ekran kyçjeje të sigurt"</string>
+    <string name="credentials_configure_lock_screen_button" msgid="253239765216055321">"CAKTO KYÇJEN"</string>
     <string name="usage_access_title" msgid="332333405495457839">"Aplikacionet me qasje përdorimi"</string>
     <string name="emergency_tone_title" msgid="1055954530111587114">"Toni i urgjencës"</string>
     <string name="emergency_tone_summary" msgid="722259232924572153">"Cakto sjelljen kur kryhet një telefonatë urgjence"</string>
@@ -2336,8 +2348,6 @@
     <skip />
     <string name="cant_sync_dialog_title" msgid="2777238588398046285">"Nuk mund të sinkronizojë manualisht"</string>
     <string name="cant_sync_dialog_message" msgid="1938380442159016449">"Sinkronizimi për këtë artikull është aktualisht i çaktivizuar. Për ta ndryshuar këtë cilësim, aktivizo përkohësisht të dhënat në sfond dhe sinkronizimin automatik."</string>
-    <string name="wimax_settings" msgid="2655139497028469039">"4G"</string>
-    <string name="status_wimax_mac_address" msgid="8390791848661413416">"Adresa 4G MAC"</string>
     <string name="enter_password" msgid="8035706727471334122">"Për të nisur Androidin, fut fjalëkalimin"</string>
     <string name="enter_pin" msgid="5305333588093263790">"Për të nisur Androidin, fut kodin PIN"</string>
     <string name="enter_pattern" msgid="4187435713036808566">"Për të nisur Androidin, vizato motivin tënd"</string>
@@ -2351,6 +2361,7 @@
     <string name="misc_files_selected_count" msgid="4647048020823912088">"u zgjodhën <xliff:g id="NUMBER">%1$d</xliff:g> nga <xliff:g id="TOTAL">%2$d</xliff:g> në total"</string>
     <string name="misc_files_selected_count_bytes" msgid="2876232009069114352">"<xliff:g id="NUMBER">%1$s</xliff:g> nga <xliff:g id="TOTAL">%2$s</xliff:g>"</string>
     <string name="select_all" msgid="1562774643280376715">"Përzgjidhi të gjtiha"</string>
+    <string name="data_plan_usage_manage_plans_button_text" msgid="8997761990902708162">"Menaxho planet"</string>
     <string name="data_usage_summary_title" msgid="3804110657238092929">"Përdorimi i të dhënave"</string>
     <string name="data_usage_app_summary_title" msgid="4147258989837459172">"Përdorimi i të dhënave"</string>
     <string name="data_usage_accounting" msgid="7170028915873577387">"Llogaritja e të dhënave nga operatori mund të ndryshojë nga ajo e pajisjes tënde."</string>
@@ -2436,6 +2447,9 @@
     <string name="data_usage_metered_mobile" msgid="5423305619126978393">"Rrjetet celulare"</string>
     <string name="data_usage_metered_wifi" msgid="1761738002328299714">"Rrjetet Wi‑Fi me konsum të kufizuar"</string>
     <string name="data_usage_metered_wifi_disabled" msgid="727808462375941567">"Për të zgjedhur rrjetet me konsum të kufizuar, aktivizo Wi‑Fi."</string>
+    <string name="data_usage_metered_auto" msgid="1262028400911918865">"Automatike"</string>
+    <string name="data_usage_metered_yes" msgid="9217539611385225894">"Me matje"</string>
+    <string name="data_usage_metered_no" msgid="4025232961929071789">"Pa matje"</string>
     <string name="data_usage_disclaimer" msgid="6887858149980673444">"Llogaritja e të dhënave nga operatori mund të ndryshojë nga ajo e pajisjes tënde."</string>
     <string name="cryptkeeper_emergency_call" msgid="198578731586097145">"Telefonata e urgjencës"</string>
     <string name="cryptkeeper_return_to_call" msgid="5613717339452772491">"Kthehu te telefonata"</string>
@@ -2527,9 +2541,6 @@
     <string name="backup_pw_set_button_text" msgid="2387480910044648795">"Vendos fjalëkalimin"</string>
     <string name="backup_pw_cancel_button_text" msgid="8845630125391744615">"Anulo"</string>
     <string name="additional_system_update_settings_list_item_title" msgid="214987609894661992">"Përditësime të sistemit"</string>
-    <string name="selinux_status_disabled" msgid="924551035552323327">"Çaktivizuar"</string>
-    <string name="selinux_status_permissive" msgid="6004965534713398778">"Tolerant"</string>
-    <string name="selinux_status_enforcing" msgid="2252703756208463329">"Po zbaton"</string>
     <string name="ssl_ca_cert_warning" msgid="2045866713601984673">"Rrjeti mund të jetë i monitoruar"</string>
     <string name="done_button" msgid="1991471253042622230">"U krye!"</string>
     <plurals name="ssl_ca_cert_dialog_title" formatted="false" msgid="7145092748045794650">
@@ -2727,6 +2738,7 @@
       <item quantity="other">Shfaq %d artikuj të fshehur</item>
       <item quantity="one">Shfaq %d artikull të fshehur</item>
     </plurals>
+    <string name="dashboard_suggestion_condition_footer_content_description" msgid="2898588191174845961">"Palos"</string>
     <string name="network_dashboard_title" msgid="4771589228992391573">"Rrjeti dhe interneti"</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>
@@ -2829,8 +2841,14 @@
       <item quantity="other"><xliff:g id="ON_COUNT">%d</xliff:g> rregulla automatike të aktivizuara</item>
       <item quantity="one">1 rregull automatik i aktivizuar</item>
     </plurals>
-    <string name="zen_mode_settings_title" msgid="842308776768942600">"Preferencat për \"Mos shqetëso\""</string>
-    <string name="zen_mode_priority_settings_title" msgid="2623117023031824309">"Vetëm njoftimet me prioritet"</string>
+    <string name="zen_mode_settings_title" msgid="1066226840983908121">"Mos shqetëso"</string>
+    <string name="zen_mode_behavior_settings_title" msgid="1463303933529313969">"Sjellja"</string>
+    <string name="zen_mode_behavior_allow_title" msgid="3845615648136218141">"Lejo tingujt dhe dridhjet nga"</string>
+    <string name="zen_mode_behavior_no_sound" msgid="1219626004723208056">"Asnjë tingull"</string>
+    <string name="zen_mode_behavior_total_silence" msgid="6716603819806610626">"Asnjë tingull (Heshtje e plotë)"</string>
+    <string name="zen_mode_behavior_no_sound_except" msgid="4968477585788243114">"Asnjë tingull përveç <xliff:g id="CATEGORIES">%1$s</xliff:g>"</string>
+    <!-- no translation found for zen_mode_behavior_alarms_only (2423480992071472963) -->
+    <skip />
     <string name="zen_mode_automation_settings_title" msgid="4228995740594063774">"Rregullat automatike"</string>
     <string name="zen_mode_automation_suggestion_title" msgid="5105443455143476201">"Cakto rregullat për \"Mos shqetëso\""</string>
     <string name="zen_mode_automation_suggestion_summary" msgid="4732808039946935657">"Kufizo tingujt dhe dridhjet në kohë të caktuara"</string>
@@ -2872,13 +2890,15 @@
     <string name="notifications_title" msgid="8086372779371204971">"Njoftimet"</string>
     <string name="app_notifications_title" msgid="5810577805218003760">"Njoftimet e apl."</string>
     <string name="notification_channel_title" msgid="2260666541030178452">"Kategoria e njoftimeve"</string>
+    <string name="notification_group_title" msgid="7180506440133859601">"Grupi i kategorisë së njoftimeve"</string>
     <string name="notification_importance_title" msgid="848692592679312666">"Rëndësia"</string>
-    <string name="notification_importance_unspecified" msgid="2196023702875112081">"Lejoje aplikacionin të vendosë"</string>
+    <string name="notification_importance_unspecified" msgid="6622173510486113958">"Lejo tingullin"</string>
     <string name="notification_importance_blocked" msgid="7938180808339386300">"Mos i shfaq asnjëherë njoftimet"</string>
     <string name="notification_importance_min" msgid="5455049524984686275">"Asnjë tingull apo ndërprerje vizuale"</string>
     <string name="notification_importance_low" msgid="8881468429453766553">"Nuk ka tingull"</string>
     <string name="notification_importance_default" msgid="5958338024601957516">"Bëj tingull"</string>
     <string name="notification_importance_high" msgid="2082429479238228527">"Bëj një tingull dhe shfaq në ekran"</string>
+    <string name="notification_importance_high_silent" msgid="2667033773703765252">"Shfaq në ekran"</string>
     <string name="notification_importance_min_title" msgid="6974673091137544803">"E ulët"</string>
     <string name="notification_importance_low_title" msgid="8131254047772814309">"Mesatare"</string>
     <string name="notification_importance_default_title" msgid="9120383978536089489">"E lartë"</string>
@@ -2921,8 +2941,13 @@
     <string name="loading_notification_apps" msgid="5031818677010335895">"Po ngarkon aplikacionet..."</string>
     <string name="app_notifications_off_desc" msgid="4882445501376722969">"Android po bllokon shfaqjen e njoftimeve të këtij aplikacioni në këtë pajisje"</string>
     <string name="channel_notifications_off_desc" msgid="5899225298718840635">"Android po bllokon shfaqjen e kësaj kategorie njoftimesh në këtë pajisje"</string>
+    <string name="channel_group_notifications_off_desc" msgid="1620950416247316370">"Android po bllokon shfaqjen e këtij grupi njoftimesh në këtë pajisje"</string>
     <string name="notification_channels" msgid="5346841743182627500">"Kategoritë"</string>
     <string name="notification_channels_other" msgid="5645317113885788226">"Të tjera"</string>
+    <plurals name="notification_group_summary" formatted="false" msgid="3420621520561455358">
+      <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> kategori</item>
+      <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> kategori</item>
+    </plurals>
     <string name="no_channels" msgid="3077375508177744586">"Ky aplikacion nuk ka postuar asnjë njoftim"</string>
     <string name="app_settings_link" msgid="8894946007543660906">"Cilësime shtesë në aplikacion"</string>
     <string name="app_notification_listing_summary_zero" msgid="6482582965081108108">"Aktivizo për të gjitha aplikacionet"</string>
@@ -2999,12 +3024,14 @@
     <string name="zen_mode_from_starred" msgid="2678345811950997027">"Vetëm nga kontaktet me yll"</string>
     <string name="zen_mode_from_none" msgid="8219706639954614136">"Asnjë"</string>
     <string name="zen_mode_alarms" msgid="2165302777886552926">"Alarmet"</string>
+    <!-- no translation found for zen_mode_media_system_other (8900209390529859777) -->
+    <skip />
     <string name="zen_mode_reminders" msgid="5458502056440485730">"Alarmet rikujtuese"</string>
     <string name="zen_mode_events" msgid="7914446030988618264">"Ngjarjet"</string>
     <string name="zen_mode_all_callers" msgid="584186167367236922">"Të gjithë telefonuesit"</string>
     <string name="zen_mode_selected_callers" msgid="3127598874060615742">"Telefonuesit e zgjedhur"</string>
     <string name="zen_mode_repeat_callers" msgid="5019521886428322131">"Telefonuesit e përsëritur"</string>
-    <string name="zen_mode_repeat_callers_summary" msgid="7192713032364140137">"Nëse telefonon i njëjti person për herë të dytë në një periudhë prej <xliff:g id="MINUTES">%d</xliff:g> minutash, lejoje"</string>
+    <string name="zen_mode_repeat_callers_summary" msgid="239685342222975733">"Nëse telefonon i njëjti person për herë të dytë në një periudhë prej <xliff:g id="MINUTES">%d</xliff:g> minutash, lejoje"</string>
     <string name="zen_mode_when" msgid="2767193283311106373">"Aktivizo automatikisht"</string>
     <string name="zen_mode_when_never" msgid="8809494351918405602">"Asnjëherë!"</string>
     <string name="zen_mode_when_every_night" msgid="3122486110091921009">"Çdo natë"</string>
@@ -3033,6 +3060,7 @@
     <string name="zen_mode_screen_off_visual_interruptions" msgid="4850792880144382633">"Kur ekrani është joaktiv"</string>
     <string name="zen_mode_no_visual_interruptions" msgid="8742776003822778472">"Kur ekrani është aktiv ose joaktiv"</string>
     <string name="notification_app_settings_button" msgid="6685640230371477485">"Cilësimet e njoftimeve"</string>
+    <string name="suggestion_button_text" msgid="3275010948381252006">"Në rregull"</string>
     <string name="device_feedback" msgid="3238056036766293294">"Dërgo përshtypjet për këtë pajisje"</string>
     <string name="restr_pin_enter_admin_pin" msgid="1085834515677448072">"Fut kodin PIN të administratorit"</string>
     <string name="switch_on_text" msgid="1124106706920572386">"Aktivizuar"</string>
@@ -3203,7 +3231,7 @@
     <string name="usb_use_charging_only" msgid="2180443097365214467">"Karikuar këtë pajisje"</string>
     <string name="usb_use_charging_only_desc" msgid="3066256793008540627">"Vetëm karikoje këtë pajisje"</string>
     <string name="usb_use_power_only" msgid="6426550616883919530">"Furnizuar me energji elektrike"</string>
-    <string name="usb_use_power_only_desc" msgid="3461232831015575152">"Ngarkoje pajisjen e lidhur. Funksionon vetëm me pajisjet që mbështesin ngarkimin me USB."</string>
+    <string name="usb_use_power_only_desc" msgid="3461232831015575152">"Karikoje pajisjen e lidhur. Funksionon vetëm me pajisjet që mbështesin ngarkimin me USB."</string>
     <string name="usb_use_file_transfers" msgid="7409600791007250137">"Transferuar skedarë"</string>
     <string name="usb_use_file_transfers_desc" msgid="4235764784331804488">"Transfero skedarët te një pajisje tjetër"</string>
     <string name="usb_use_photo_transfers" msgid="7794775645350330454">"Transferuar fotografi (PTP)"</string>
@@ -3217,6 +3245,7 @@
     <string name="usb_summary_file_transfers" msgid="6435943692610175111">"Transferimi i skedarëve"</string>
     <string name="usb_summary_photo_transfers" msgid="8440204169576585250">"Transferimi i fotografive (PTP)"</string>
     <string name="usb_summary_MIDI" msgid="5687906612187885908">"Përdorimi i pajisjes si MIDI"</string>
+    <string name="sms_mirroring_pref" msgid="6475043279147376031">"Pasqyrimi i SMS-ve"</string>
     <string name="background_check_pref" msgid="7550258400138010979">"Kontrolli i sfondit"</string>
     <string name="background_check_title" msgid="4534254315824525593">"Qasje e plotë në sfond"</string>
     <string name="assist_access_context_title" msgid="2269032346698890257">"Përdor tekstin nga ekrani"</string>
@@ -3283,7 +3312,7 @@
     <string name="write_settings_title" msgid="4232152481902542284">"Mund të modifikojë cilësimet e sistemit"</string>
     <string name="write_system_settings" msgid="3482913590601096763">"Modifiko cilësimet e sistemit"</string>
     <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="permit_write_settings" msgid="658555006453212691">"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>
@@ -3378,9 +3407,12 @@
     <string name="color_temperature" msgid="2070126836910615605">"Temperatura e ftohtë e ngjyrës"</string>
     <string name="color_temperature_desc" msgid="4793729830226404052">"Përdor ngjyra të ftohta të ekranit"</string>
     <string name="color_temperature_toast" msgid="4974218172133854827">"Për të zbatuar ndryshimin e ngjyrës, çaktivizoje ekranin"</string>
-    <string name="telephony_monitor_toast" msgid="7003764250271195384">"Për të zbatuar ndryshimin e monitorit të telefonisë, rindizni pajisjen"</string>
+    <string name="connectivity_monitor_switch" msgid="9059759348648583421">"Monitori i lidhshmërisë"</string>
+    <string name="connectivity_monitor_switch_summary" msgid="2828658652378866401">"\"Monitori i lidhshmërisë\" do të mbledhë regjistrat kur të zbulojë një problem të lidhshmërisë dhe do t\'i paraqesë një njoftim përdoruesit që të regjistrojë një defekt në kod"</string>
+    <string name="connectivity_monitor_toast" msgid="5551859612881173028">"Për të zbatuar ndryshimin e monitorit të lidhshmërisë, rindiz pajisjen"</string>
     <string name="camera_hal_hdrplus_switch" msgid="8377365197105267466">"HAL HDR+ i kamerës"</string>
     <string name="camera_hal_hdrplus_toast" msgid="2063703797270055299">"Për të zbatuar ndryshimin e HAL HDR+ të kamerës, rindiz pajisjen"</string>
+    <string name="camera_laser_sensor_switch" msgid="8913588990743234440">"Sensori me laser i kamerës"</string>
     <string name="ota_disable_automatic_update" msgid="2319639631655915050">"Përditësimet automatike të sistemit"</string>
     <string name="usage" msgid="2977875522080448986">"Përdorimi"</string>
     <string name="cellular_data_usage" msgid="2155683719898158203">"Përdorimi i të dhënave celulare"</string>
@@ -3406,7 +3438,7 @@
     <string name="data_warning" msgid="209133958008062117">"Paralajmërimi i të dhënave"</string>
     <string name="set_data_limit" msgid="2901526323210516923">"Cakto kufirin e të dhënave"</string>
     <string name="data_limit" msgid="1885406964934590552">"Kufiri i të dhënave"</string>
-    <string name="data_usage_template" msgid="392191945602400904">"<xliff:g id="ID_1">%1$s</xliff:g> të përdorura mes datave <xliff:g id="ID_2">%2$s</xliff:g>"</string>
+    <string name="data_usage_template" msgid="2923744765873163859">"<xliff:g id="ID_1">%1$s</xliff:g> të përdorura në <xliff:g id="ID_2">%2$s</xliff:g>"</string>
     <string name="configure" msgid="1029654422228677273">"Konfiguro"</string>
     <string name="data_usage_other_apps" msgid="3272872663517382050">"Aplikacionet e tjera të përfshira në përdorim"</string>
     <plurals name="data_saver_unrestricted_summary" formatted="false" msgid="2635267833484232703">
@@ -3475,7 +3507,7 @@
     <string name="button_confirm_convert_fbe" msgid="7101855374850373091">"Pastro dhe konverto"</string>
     <string name="reset_shortcut_manager_throttling" msgid="6495066467198668994">"Rivendos kufizimin e normës së ShortcutManager"</string>
     <string name="reset_shortcut_manager_throttling_complete" msgid="1826770872063707900">"Është rivendosur kufizimi i normës së ShortcutManager"</string>
-    <string name="notification_suggestion_title" msgid="4506524937307816475">"Kontrollo njoftimet e ekranit të kyçjes"</string>
+    <string name="notification_suggestion_title" msgid="387052719462473500">"Informacioni i kontrollit në ekranin e kyçjes"</string>
     <string name="notification_suggestion_summary" msgid="8521159741445416875">"Shfaq ose fshih përmbajtjet e njoftimeve"</string>
     <string name="page_tab_title_summary" msgid="4070309266374993258">"Të gjitha"</string>
     <string name="page_tab_title_support" msgid="8483187649355540109">"Mbështetja dhe këshillat"</string>
@@ -3483,7 +3515,7 @@
     <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>
     <string name="premium_sms_access" msgid="4660047004791638305">"Qasja te mesazhet SMS premium"</string>
-    <string name="bluetooth_disabled" msgid="2456198532288640046">"Nuk është e dukshme për pajisjet e tjera"</string>
+    <string name="bluetooth_disabled" msgid="6244000672828617410">"Joaktiv"</string>
     <string name="bluetooth_connected_summary" msgid="7672528674593152862">"Lidhur me <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="bluetooth_connected_multiple_devices_summary" msgid="9173661896296663932">"Lidhur me shumë pajisje"</string>
     <string name="demo_mode" msgid="2798762752209330277">"Modaliteti i demonstrimit i ndërfaqes së përdoruesit të sistemit"</string>
@@ -3565,7 +3597,7 @@
     <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="4567020486787561873">"Për të kontrolluar orën, ikonat e njoftimeve dhe informacione të tjera, merre në duar telefonin tënd."</string>
+    <string name="ambient_display_pickup_summary" product="default" msgid="4567020486787561873">"Për të kontrolluar orën, ikonat e njoftimeve dhe informacione të tjera, merre telefonin në dorë."</string>
     <string name="ambient_display_pickup_summary" product="tablet" msgid="5435283849947236648">"Për të kontrolluar orën, ikonat e njoftimeve dhe informacione të tjera, merre në duar tabletin tënd."</string>
     <string name="ambient_display_pickup_summary" product="device" msgid="8256669101643381568">"Për të kontrolluar orën, ikonat e njoftimeve dhe informacione të tjera, merre në duar pajisjen tënde."</string>
     <string name="ambient_display_pickup_suggestion_summary" msgid="7014700589991761035">"Kontrollo njoftimet kur ekrani është joaktiv"</string>
@@ -3585,7 +3617,7 @@
     <string name="web_action_enable_title" msgid="4051513950976670853">"Aplikacionet e çastit"</string>
     <string name="web_action_enable_summary" msgid="3108127559723396382">"Hap lidhjet në aplikacione, edhe nëse nuk janë të instaluara"</string>
     <string name="web_action_section_title" msgid="7364647086538399136">"Aplikacionet e çastit"</string>
-    <string name="instant_apps_account" msgid="1433620209791992528">"Llogaria e aplikacioneve të çastit"</string>
+    <string name="instant_apps_settings" msgid="8827777916518348213">"Preferencat për \"Aplikacionet e çastit\""</string>
     <string name="domain_url_section_title" msgid="7046835219056428883">"Aplikacionet e instaluara"</string>
     <string name="automatic_storage_manager_activation_warning" msgid="6353100011690933254">"Hapësira jote ruajtëse tani po menaxhohet nga menaxheri i hapësirës ruajtëse"</string>
     <string name="account_for_section_header" msgid="5356566418548737121">"Llogaritë për <xliff:g id="USER_NAME">%1$s</xliff:g>"</string>
@@ -3632,7 +3664,9 @@
     <string name="enterprise_privacy_always_on_vpn_personal" msgid="9217774730260037434">"Rrjeti VPN gjithmonë aktiv i aktivizuar në profilin tënd personal"</string>
     <string name="enterprise_privacy_always_on_vpn_work" msgid="7244472958208315814">"Rrjeti VPN gjithmonë aktiv i aktivizuar në profilin tënd të punës"</string>
     <string name="enterprise_privacy_global_http_proxy" msgid="7936664553416257333">"Përfaqësuesi global HTTP i caktuar"</string>
-    <string name="enterprise_privacy_ca_certs" msgid="5885892204903688909">"Kredencialet e besuara"</string>
+    <string name="enterprise_privacy_ca_certs_device" msgid="2019652712782510262">"Kredencialet e besuara"</string>
+    <string name="enterprise_privacy_ca_certs_personal" msgid="2279084820904076599">"Kredencialet e besuara në profilin tënd personal"</string>
+    <string name="enterprise_privacy_ca_certs_work" msgid="6187377647815301809">"Kredencialet e besuara në profilin tënd të punës"</string>
     <plurals name="enterprise_privacy_number_ca_certs" formatted="false" msgid="526375234629534165">
       <item quantity="other">Minimumi <xliff:g id="COUNT_1">%d</xliff:g> certifikata CA</item>
       <item quantity="one">Minimumi <xliff:g id="COUNT_0">%d</xliff:g> certifikatë CA</item>
@@ -3695,6 +3729,8 @@
     <string name="carrier_provisioning" msgid="4398683675591893169">"Informacionet e përgatitjes së operatorit celular"</string>
     <string name="trigger_carrier_provisioning" msgid="3434865918009286187">"Aktivizo përgatitjen e operatorit celular"</string>
     <string name="new_device_suggestion_title" msgid="698847081680980774">"Çfarë ka të reja dhe emocionuese?"</string>
-    <string name="new_device_suggestion_summary" msgid="7172709269203435870">"Shiko 5 funksionet kryesore"</string>
+    <string name="new_device_suggestion_summary" product="default" msgid="206396571522515855">"Zhvillo një turne të telefonit tënd të ri"</string>
+    <string name="new_device_suggestion_summary" product="tablet" msgid="393751455688210956">"Zhvillo një turne të tabletit tënd të ri"</string>
+    <string name="new_device_suggestion_summary" product="device" msgid="2939870049868336652">"Zhvillo një turne të pajisjes sate të re"</string>
     <string name="disabled_low_ram_device" msgid="3751578499721173344">"Ky funksion nuk ofrohet në këtë pajisje"</string>
 </resources>
diff --git a/res/values-sr/arrays.xml b/res/values-sr/arrays.xml
index 3085397..9fc3581 100644
--- a/res/values-sr/arrays.xml
+++ b/res/values-sr/arrays.xml
@@ -100,8 +100,6 @@
     <!-- no translation found for wifi_security_no_eap:0 (2084555984818107151) -->
     <!-- no translation found for wifi_security_no_eap:1 (397579322683471524) -->
     <!-- no translation found for wifi_security_no_eap:2 (1968820975358150484) -->
-    <!-- no translation found for wifi_ap_security:0 (5251664683198623324) -->
-    <!-- no translation found for wifi_ap_security:1 (7989073072260294673) -->
   <string-array name="wifi_eap_method">
     <item msgid="1160193392455075561">"PEAP"</item>
     <item msgid="7981731051382306293">"TLS"</item>
diff --git a/res/values-sr/strings.xml b/res/values-sr/strings.xml
index 98f4eaa..69adde3 100644
--- a/res/values-sr/strings.xml
+++ b/res/values-sr/strings.xml
@@ -167,7 +167,7 @@
     <string name="bluetooth_map_acceptance_dialog_text" msgid="8712508202081143737">"%1$s жели да приступи порукама. Желите ли да одобрите приступ за %2$s?"</string>
     <string name="bluetooth_sap_request" msgid="2669762224045354417">"Захтев за приступ SIM картици"</string>
     <string name="bluetooth_sap_acceptance_dialog_text" msgid="4414253873553608690">"<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g> жели да приступа SIM картици. Одобравање приступа SIM картици ће онемогућити везу за пренос података на уређају док траје повезивање. Дајте приступ уређају <xliff:g id="DEVICE_NAME_1">%2$s?</xliff:g>"</string>
-    <string name="bluetooth_device_name_summary" msgid="4757990010751789977">"Другим уређајима видљив као „<xliff:g id="DEVICE_NAME">^1</xliff:g>“"</string>
+    <string name="bluetooth_device_name_summary" msgid="522235742194965734">"Другим уређајима видљив као „<xliff:g id="DEVICE_NAME">^1</xliff:g>“"</string>
     <string name="bluetooth_paired_device_title" msgid="8638994696317952019">"Уређаји"</string>
     <string name="bluetooth_pairing_page_title" msgid="7712127387361962608">"Упарите нови уређај"</string>
     <string name="date_and_time" msgid="9062980487860757694">"Датум и време"</string>
@@ -314,6 +314,8 @@
     <string name="zone_auto" msgid="334783869352026648">"Аутоматска временска зона"</string>
     <string name="zone_auto_summaryOn" msgid="6142830927278458314">"Користи временску зону мреже"</string>
     <string name="zone_auto_summaryOff" msgid="2597745783162041390">"Користи временску зону мреже"</string>
+    <string name="date_time_24hour_auto" msgid="2117383168985653422">"Аутоматски 24-часовни формат"</string>
+    <string name="date_time_24hour_auto_summary" msgid="6351812925651480277">"Користи подразумевану вредност за локалитет"</string>
     <string name="date_time_24hour_title" msgid="3203537578602803850">"24-часовни формат"</string>
     <string name="date_time_24hour" msgid="1193032284921000063">"Користи 24-часовни формат"</string>
     <string name="date_time_set_time_title" msgid="6296795651349047016">"Време"</string>
@@ -361,7 +363,7 @@
     <string name="fingerprint_add_title" msgid="1926752654454033904">"Додај отисак прста"</string>
     <string name="fingerprint_enable_keyguard_toggle_title" msgid="5078060939636911795">"закључавање екрана"</string>
     <plurals name="security_settings_fingerprint_preference_summary" formatted="false" msgid="624961700033979880">
-      <item quantity="one">Подешен је <xliff:g id="COUNT_1">%1$d</xliff:g> отисак прстију </item>
+      <item quantity="one">Подешен је <xliff:g id="COUNT_1">%1$d</xliff:g> отисак прста </item>
       <item quantity="few">Подешена су <xliff:g id="COUNT_1">%1$d</xliff:g> отиска прстију</item>
       <item quantity="other">Подешено је <xliff:g id="COUNT_1">%1$d</xliff:g> отисака прстију</item>
     </plurals>
@@ -375,6 +377,9 @@
     <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="1961957425135180242">"Даље"</string>
+    <string name="setup_fingerprint_enroll_skip_title" msgid="362050541117362034">"Прескачете отиске прстију?"</string>
+    <string name="setup_fingerprint_enroll_skip_after_adding_lock_text" msgid="958990414356204763">"Подешавање отисака прстију траје свега минут-два. Ако прескочите ово, можете да додате отисак прста касније у подешавањима."</string>
+    <string name="lock_screen_intro_skip_title" msgid="4988210105913705679">"Прескачете закључавање екрана?"</string>
     <string name="lock_screen_intro_skip_dialog_text_frp" product="tablet" msgid="1581834104051243425">"Функције заштите уређаја неће бити укључене. Нећете моћи да спречите друге људе да користе овај таблет ако буде изгубљен, украден или ресетован."</string>
     <string name="lock_screen_intro_skip_dialog_text_frp" product="device" msgid="4629503416877189572">"Функције заштите уређаја неће бити укључене. Нећете моћи да спречите друге људе да користе овај уређај ако буде изгубљен, украден или ресетован."</string>
     <string name="lock_screen_intro_skip_dialog_text_frp" product="default" msgid="2423428240245737909">"Функције заштите уређаја неће бити укључене. Нећете моћи да спречите друге људе да користе овај телефон ако буде изгубљен, украден или ресетован."</string>
@@ -460,7 +465,7 @@
     <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="lock_settings_picker_fingerprint_added_security_message" msgid="5768002109707648463">"Ради додатне безбедности подесите резервни метод за закључавање екрана."</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>
@@ -597,6 +602,7 @@
     <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="lockpassword_clear_label" msgid="5724429464960458155">"Обриши"</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>
@@ -792,6 +798,7 @@
     <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>
@@ -828,6 +835,8 @@
     <string name="wifi_wps_available_first_item" msgid="4422547079984583502">"WPS је доступан"</string>
     <string name="wifi_wps_available_second_item" msgid="8427520131718215301">" (WPS је доступан)"</string>
     <string name="wifi_wps_nfc_enter_password" msgid="2288214226916117159">"Унесите лозинку за мрежу"</string>
+    <string name="wifi_carrier_connect" msgid="8174696557882299911">"Wi‑Fi мрежа мобилног оператера"</string>
+    <string name="wifi_carrier_content" msgid="4634077285415851933">"Повежите се преко <xliff:g id="NAME">%1%s</xliff:g>"</string>
     <string name="wifi_scan_always_turnon_message" msgid="203123538572122989">"Због побољшања прецизности локације и у друге сврхе, <xliff:g id="APP_NAME">%1$s</xliff:g> жели да укључи скенирање мреже чак и када је Wi-Fi искључен.\n\nЖелите ли да дозволите ово за све апликације које желе да скенирају?"</string>
     <string name="wifi_scan_always_turnoff_message" msgid="5538901671131941043">"Да бисте ово искључили, идите на Напредно у преклопном менију."</string>
     <string name="wifi_scan_always_confirm_allow" msgid="5355973075896817232">"Дозволи"</string>
@@ -845,6 +854,7 @@
     <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_modify" msgid="6100248070440710782">"Измени"</string>
     <string name="wifi_failed_forget_message" msgid="1348172929201654986">"Брисање мреже није успело"</string>
     <string name="wifi_save" msgid="3331121567988522826">"Сачувај"</string>
     <string name="wifi_failed_save_message" msgid="6650004874143815692">"Чување мреже није успело"</string>
@@ -858,6 +868,7 @@
     <string name="wifi_advanced_titlebar" msgid="4485841401774142908">"Напредна 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_title" msgid="3471132676909349382">"Информације о мрежи"</string>
     <string name="wifi_details_subnet_mask" msgid="6720279144174924410">"Маска подмреже"</string>
     <string name="wifi_details_dns" msgid="8648826607751830768">"DNS"</string>
     <string name="wifi_details_ipv6_address_header" msgid="6734119149106422148">"IPv6 адресе"</string>
@@ -890,16 +901,15 @@
     <string name="wifi_p2p_cancel_connect_title" msgid="255267538099324413">"Желите ли да откажете позивницу?"</string>
     <string name="wifi_p2p_cancel_connect_message" msgid="7477756213423749402">"Желите ли да откажете позивницу за повезивање са уређајем <xliff:g id="PEER_NAME">%1$s</xliff:g>?"</string>
     <string name="wifi_p2p_delete_group_message" msgid="834559380069647086">"Желите ли да заборавите ову групу?"</string>
-    <string name="wifi_tether_checkbox_text" msgid="1847167643625779136">"Преносни Wi-Fi хотспот"</string>
     <string name="wifi_hotspot_checkbox_text" msgid="7763495093333664887">"Wi-Fi хотспот"</string>
     <string name="wifi_hotspot_off_subtext" msgid="5466126533609394170">"Ни интернет ни садржај се не деле са другим уређајима"</string>
     <string name="wifi_hotspot_tethering_on_subtext" product="tablet" msgid="5752490509369962007">"Интернет веза овог таблета се дели преко хотспота"</string>
     <string name="wifi_hotspot_tethering_on_subtext" product="default" msgid="6461075246164300670">"Интернет веза овог телефона се дели преко хотспота"</string>
     <string name="wifi_hotspot_on_local_only_subtext" msgid="2068110388011294735">"Апликација дели садржај. Да бисте делили интернет везу, искључите, па укључите хотспот"</string>
-    <string name="wifi_hotspot_name_title" msgid="1341735529132128887">"Назив Wi‑Fi хотспота"</string>
+    <string name="wifi_hotspot_name_title" msgid="8237000746618636778">"Назив хотспота"</string>
     <string name="wifi_hotspot_name_summary_connecting" msgid="3378299995508671967">"<xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g> се укључује..."</string>
     <string name="wifi_hotspot_name_summary_connected" msgid="3888672084861445362">"Други уређаји могу да се повежу са хотспотом <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>"</string>
-    <string name="wifi_hotspot_password_title" msgid="1955592302902091281">"Лозинка за Wi-Fi"</string>
+    <string name="wifi_hotspot_password_title" msgid="8676859981917573801">"Лозинка хотспота"</string>
     <string name="wifi_hotspot_ap_band_title" msgid="1165801173359290681">"Опсег приступне тачке"</string>
     <string name="wifi_hotspot_footer_info_regular" msgid="1203489406068036455">"Користите хотспот да бисте направили Wi‑Fi мрежу за друге уређаје. Хотспот пружа интернет помоћу мреже за мобилне податке. Можда ће важити додатне тарифе за мобилне податке."</string>
     <string name="wifi_hotspot_footer_info_local_only" msgid="857988412470694109">"Апликације могу да праве хотспотове за дељење садржаја са оближњим уређајима."</string>
@@ -910,7 +920,6 @@
     <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">"Позивање преко Wi-Fi-ја"</string>
     <string name="wifi_calling_suggestion_title" msgid="9008010480466359578">"Позивање преко Wi-Fi-ја"</string>
@@ -951,7 +960,7 @@
     <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="emergency_address_summary" msgid="3266760199681945746">"Адреса коју користе хитне службе као вашу локацију ако упутите хитни позив помоћу Wi-Fi-ја"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"Приказ"</string>
     <string name="sound_settings" msgid="5534671337768745343">"Звук"</string>
     <string name="all_volume_title" msgid="4296957391257836961">"Јачине звука"</string>
@@ -1005,6 +1014,7 @@
     <string name="search_settings" msgid="1910951467596035063">"Претрага"</string>
     <string name="search_settings_summary" msgid="9205656546570654169">"Управљање подешавањима претраге и историјом"</string>
     <string name="search_settings_no_results" msgid="8799027492641230999">"Нема резултата"</string>
+    <string name="search_clear_history" msgid="4196658962573162457">"Обриши историју"</string>
     <string name="display_settings" msgid="7965901687241669598">"Екран"</string>
     <string name="accelerometer_title" msgid="7854608399547349157">"Аутоматско ротирање екрана"</string>
     <string name="color_mode_title" msgid="3159275920408338215">"Живописне боје"</string>
@@ -1016,7 +1026,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>
@@ -1061,14 +1071,14 @@
     <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>
@@ -1079,7 +1089,7 @@
     <string name="ambient_display_screen_summary_notifications" msgid="1449570742600868654">"Нова обавештења"</string>
     <string name="ambient_display_category_triggers" msgid="4359289754456268573">"Када да се приказује"</string>
     <string name="doze_title" msgid="2375510714460456687">"Нова обавештења"</string>
-    <string name="doze_summary" msgid="3846219936142814032">"Пробудите екран када примите обавештења"</string>
+    <string name="doze_summary" msgid="3846219936142814032">"Пробуди екран када примим обавештења"</string>
     <string name="doze_always_on_title" msgid="1046222370442629646">"Увек укључено"</string>
     <string name="doze_always_on_summary" msgid="6978257596231155345">"Приказује време, иконе обавештења и друге информације. Већа потрошња батерије."</string>
     <string name="title_font_size" msgid="4405544325522105222">"Величина фонта"</string>
@@ -1135,7 +1145,6 @@
     <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>
     <string name="device_status_activity_title" msgid="1411201799384697904">"Статус"</string>
     <string name="device_status" msgid="607405385799807324">"Статус"</string>
@@ -1163,7 +1172,6 @@
     <string name="status_wifi_mac_address" msgid="2202206684020765378">"Wi-Fi MAC адреса"</string>
     <string name="status_bt_address" msgid="4195174192087439720">"Bluetooth адреса"</string>
     <string name="status_serial_number" msgid="2257111183374628137">"Серијски број"</string>
-    <string name="status_unavailable" msgid="7862009036663793314">"Недоступно"</string>
     <string name="status_up_time" msgid="7294859476816760399">"Време рада"</string>
     <string name="status_awake_time" msgid="2393949909051183652">"Време буђења"</string>
     <string name="internal_memory" msgid="9129595691484260784">"Интерно складиште"</string>
@@ -1339,6 +1347,7 @@
     <string name="menu_restore" msgid="8260067415075573273">"Ресетуј подразумевано"</string>
     <string name="restore_default_apn_completed" msgid="2824775307377604897">"Поновно постављање подразумеваних подешавања назива приступне тачке је завршено"</string>
     <string name="reset_dashboard_title" msgid="6254873816990678620">"Опције за ресетовање"</string>
+    <string name="reset_dashboard_summary" msgid="4851012632493522755">"Мрежа, апликацијe или уређај могу да се ресетују"</string>
     <string name="reset_network_title" msgid="6166025966016873843">"Ресетуј Wi-Fi, мобилну мрежу и Bluetooth"</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>
@@ -1347,18 +1356,14 @@
     <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="6617679904229218425">"Избриши све податке (ресетовање на фабричка подешавања)"</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="other"><xliff:g id="ACCOUNT_COUNT">%1$d</xliff:g> налога ће бити ресетовано</item>
-    </plurals>
-    <string name="master_clear_summary" msgid="6902443944660426951">"Интерна меморија и сви подаци ће бити ресетовани"</string>
+    <string name="master_clear_title" msgid="3531267871084279512">"Избриши све податке (ресетовање на фабричка подешавања)"</string>
     <string name="master_clear_desc" product="tablet" msgid="9146059417023157222">"Овим бришете све податке из "<b>"интерне меморије"</b>" таблета, укључујући:\n\n"<li>"Google налог"</li>\n<li>"Податке и подешавања система и апликација"</li>\n<li>"Преузете апликације"</li></string>
     <string name="master_clear_desc" product="default" msgid="4800386183314202571">"Овим бришете све податке из "<b>"интерне меморије"</b>" телефона, укључујући:\n\n"<li>"Google налог"</li>\n<li>"Податке и подешавања система и апликација"</li>\n<li>"Преузете апликације"</li></string>
     <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"Тренутно сте пријављени на следеће налоге:\n"</string>
     <string name="master_clear_other_users_present" product="default" msgid="5161423070702470742">\n\n"На овом уређају су присутни и други корисници.\n"</string>
     <string name="master_clear_desc_also_erases_external" msgid="1903185203791274237"><li>"Музика"</li>\n<li>"Фотографије"</li>\n<li>"Други кориснички подаци"</li></string>
+    <string name="master_clear_desc_also_erases_esim" msgid="312352697653096008"><li>"Мобилни оператери на eSIM-у"</li></string>
+    <string name="master_clear_desc_no_cancel_mobile_plan" msgid="5460926449093211144">\n\n"На тај начин нећете отказати мобилни тарифни пакет."</string>
     <string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="7744115866662613411">\n\n"Да бисте обрисали музику, слике и друге корисничке податке, треба да избришете "<b>"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>
@@ -1475,15 +1480,16 @@
     <string name="settings_safetylegal_activity_title" msgid="6901214628496951727">"Безбедносне информације"</string>
     <string name="settings_safetylegal_activity_unreachable" msgid="250674109915859456">"Немате везу за пренос података. Да бисте одмах погледали ове информације, идите на %s са било ког рачунара који је повезан са интернетом."</string>
     <string name="settings_safetylegal_activity_loading" msgid="8059022597639516348">"Учитава се…"</string>
-    <string name="lockpassword_choose_your_password_header" msgid="8624900666929394990">"Одаберите лозинку"</string>
-    <string name="lockpassword_choose_your_password_header_for_fingerprint" msgid="6624409510609085450">"Подесите лозинку да бисте користили отисак"</string>
-    <string name="lockpassword_choose_your_pattern_header" msgid="6949761069941694050">"Изаберите шаблон"</string>
-    <string name="lockpassword_choose_your_pattern_header_for_fingerprint" msgid="5901096361617543819">"Подесите шаблон да бисте користили отисак"</string>
-    <string name="lockpassword_choose_your_pin_header" msgid="7598849519816138302">"Одаберите PIN"</string>
-    <string name="lockpassword_choose_your_pin_header_for_fingerprint" msgid="765344692615917183">"Подесите PIN да бисте користили отисак"</string>
-    <string name="lockpassword_confirm_your_password_header" msgid="6308478184889846633">"Потврдите лозинку"</string>
+    <string name="lockpassword_choose_your_screen_lock_header" msgid="3872462096767152394">"Подесите закључавање екрана"</string>
+    <string name="lockpassword_choose_your_password_message" msgid="1197569283524841412">"Подесите лозинку из безбедносних разлога"</string>
+    <string name="lockpassword_choose_your_password_header_for_fingerprint" msgid="2541818487015343503">"Подесите лозинку ради коришћења отиска"</string>
+    <string name="lockpassword_choose_your_pattern_header_for_fingerprint" msgid="7709785406243556723">"Подесите шаблон ради коришћења отиска"</string>
+    <string name="lockpassword_choose_your_pin_message" msgid="1875420718677275646">"Подесите PIN из безбедносних разлога"</string>
+    <string name="lockpassword_choose_your_pin_header_for_fingerprint" msgid="1549639053195796674">"Подесите PIN да бисте користили отисак"</string>
+    <string name="lockpassword_choose_your_pattern_message" msgid="5986983400689720015">"Подесите шаблон из безбедносних разлога"</string>
+    <string name="lockpassword_confirm_your_password_header" msgid="1266027268220850931">"Поново унесите лозинку"</string>
     <string name="lockpassword_confirm_your_pattern_header" msgid="7543433733032330821">"Потврдите шаблон"</string>
-    <string name="lockpassword_confirm_your_pin_header" msgid="49038294648213197">"Потврдите PIN"</string>
+    <string name="lockpassword_confirm_your_pin_header" msgid="7744513791910572550">"Поново унесите PIN"</string>
     <string name="lockpassword_confirm_passwords_dont_match" msgid="5140892109439191415">"Лозинке се не подударају"</string>
     <string name="lockpassword_confirm_pins_dont_match" msgid="7226244811505606217">"PIN-ови се не подударају"</string>
     <string name="lockpassword_choose_lock_generic_header" msgid="3811438094903786145">"Избор начина откључавања"</string>
@@ -1502,6 +1508,12 @@
     <string name="lockpassword_strong_auth_required_work_pattern" msgid="3003781907040522053">"Ради веће безбедности користите шаблон за Work"</string>
     <string name="lockpassword_strong_auth_required_work_pin" msgid="3367491332598821552">"Ради веће безбедности унесите PIN за Work"</string>
     <string name="lockpassword_strong_auth_required_work_password" msgid="8159775129968582940">"Ради веће безбедности унесите лозинку за Work"</string>
+    <string name="lockpassword_confirm_your_pattern_details_frp" msgid="6757336656791723193">"Телефон је ресетован на фабричка подешавања. Да бисте га користили, унесите претходни шаблон."</string>
+    <string name="lockpassword_confirm_your_pin_details_frp" msgid="826520613445990470">"Телефон је ресетован на фабричка подешавања. Да бисте га користили, унесите претходни PIN."</string>
+    <string name="lockpassword_confirm_your_password_details_frp" msgid="8944081074615739040">"Телефон је ресетован на фабричка подешавања. Да бисте га користили, унесите претходну лозинку."</string>
+    <string name="lockpassword_confirm_your_pattern_header_frp" msgid="2898036091609128286">"Верификујте шаблон"</string>
+    <string name="lockpassword_confirm_your_pin_header_frp" msgid="4141601774778898803">"Верификујте PIN"</string>
+    <string name="lockpassword_confirm_your_password_header_frp" msgid="3762615419295360480">"Верификујте лозинку"</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>
@@ -1551,7 +1563,6 @@
     <string name="install_applications_title" msgid="4987712352256508946">"Дозволи све изворе апликација"</string>
     <string name="recent_app_category_title" msgid="6673071268966003928">"Недавно отваране апликације"</string>
     <string name="see_all_apps_title" msgid="1317153498074308438">"Прикажи све апликације: <xliff:g id="COUNT">%1$d</xliff:g>"</string>
-    <string name="recent_app_summary" msgid="3366446669844932300">"пре <xliff:g id="TIME">^1</xliff:g>"</string>
     <string name="install_all_warning" product="tablet" msgid="8310489909586138165">"Таблет и лични подаци су подложнији нападу непознатих апликација. Инсталирањем апликација из овог извора прихватате да сте одговорни за оштећења телефона или губитак података до којих може да дође због њиховог коришћења."</string>
     <string name="install_all_warning" product="default" msgid="1952257127370115988">"Телефон и лични подаци су подложнији нападу непознатих апликација. Инсталирањем апликација из овог извора прихватате да сте одговорни за оштећења телефона или губитак података до којих може да дође због њиховог коришћења."</string>
     <string name="advanced_settings" msgid="1777249286757067969">"Напредна подешавања"</string>
@@ -1816,7 +1827,7 @@
     <string name="accessibility_settings_summary" msgid="981260486011624939">"Читачи екрана, екран, контроле интеракције"</string>
     <string name="vision_settings_title" msgid="4204111425716868288">"Подешавања за вид"</string>
     <string name="vision_settings_description" msgid="5679491180156408260">"Можете да прилагодите овај уређај према потребама. Те функције приступачности можете касније да промените у Подешавањима."</string>
-    <string name="vision_settings_suggestion_title" msgid="917294957154878441">"Повећај величину фонта"</string>
+    <string name="vision_settings_suggestion_title" msgid="8058794060304707004">"Промените величину фонта"</string>
     <string name="screen_reader_category_title" msgid="7739154903913400641">"Читачи екрана"</string>
     <string name="audio_and_captions_category_title" msgid="3420727114421447524">"Звук и текст на екрану"</string>
     <string name="display_category_title" msgid="685461049938269166">"Приказ"</string>
@@ -1853,7 +1864,6 @@
     <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="preference_summary_default_combination" msgid="8532964268242666060">"<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>
@@ -1958,7 +1968,7 @@
     <string name="print_service_disabled" msgid="7739452396114245222">"Услуга је онемогућена"</string>
     <string name="print_print_jobs" msgid="3582094777756968793">"Задаци за штампање"</string>
     <string name="print_print_job" msgid="7563741676053287211">"Задатак за штампање"</string>
-    <string name="print_restart" msgid="8373999687329384202">"Поново покрени"</string>
+    <string name="print_restart" msgid="8373999687329384202">"Рестартуј"</string>
     <string name="print_cancel" msgid="3621199386568672235">"Откажи"</string>
     <string name="print_job_summary" msgid="8472427347192930694">"<xliff:g id="PRINTER">%1$s</xliff:g>\n<xliff:g id="TIME">%2$s</xliff:g>"</string>
     <string name="print_printing_state_title_template" msgid="5736107667714582025">"Штампа се <xliff:g id="PRINT_JOB_NAME">%1$s</xliff:g>"</string>
@@ -1979,12 +1989,14 @@
     <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_whitelisted" msgid="7375400051141016808">"Апликација не може да се оптимизује за коришћење батерије"</string>
+    <string name="background_activity_warning_dialog_title" msgid="2216249969149568871">"Желите ли да ограничите активности у позадини?"</string>
+    <string name="background_activity_warning_dialog_text" msgid="7049624449246121981">"Ако ограничите активности апликације у позадини, можда ће се понашати неочекивано."</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" msgid="6393929085382334341">"Коришћење апликације од потпуног пуњења (<xliff:g id="RELATIVE_TIME">^1</xliff:g>)"</string>
+    <string name="power_usage_list_summary_device" msgid="4461926045610455423">"Коришћење уређаја од потпуног пуњења (<xliff:g id="RELATIVE_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>
@@ -2002,8 +2014,8 @@
     <!-- no translation found for battery_stats_last_duration (1535831453827905957) -->
     <skip />
     <string name="awake" msgid="387122265874485088">"Време буђења уређаја"</string>
-    <string name="wifi_on_time" msgid="3208518458663637035">"Wi-Fi на време"</string>
-    <string name="bluetooth_on_time" msgid="3056108148042308690">"Wi-Fi на време"</string>
+    <string name="wifi_on_time" msgid="3208518458663637035">"Време од укључивања Wi-Fi мреже"</string>
+    <string name="bluetooth_on_time" msgid="3056108148042308690">"Време од укључивања Wi-Fi мреже"</string>
     <string name="advanced_battery_title" msgid="2068039111517508622">"Напредна потрошња батерије"</string>
     <string name="history_details_title" msgid="3608240585315506067">"Детаљи историје"</string>
     <string name="battery_details_title" msgid="6101394441569858580">"Потрошња батерије"</string>
@@ -2127,7 +2139,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>
@@ -2230,14 +2242,14 @@
     <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">"Није могуће oбрисати складиште акредитива."</string>
     <string name="credentials_enabled" msgid="7588607413349978930">"Складиште акредитива је омогућено."</string>
-    <string name="credentials_configure_lock_screen_hint" msgid="6757119179588664966">"Треба да подесите PIN или лозинку за закључавање екрана да бисте могли да користите складиште акредитива."</string>
+    <string name="credentials_configure_lock_screen_hint" msgid="8058230497337529036">"Да бисте могли да користите складиште акредитива, уређај мора да има безбедну опцију за закључавање екрана"</string>
+    <string name="credentials_configure_lock_screen_button" msgid="253239765216055321">"ПОДЕСИТЕ ЗАКЉУЧАВАЊЕ"</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>
@@ -2357,8 +2369,6 @@
     <skip />
     <string name="cant_sync_dialog_title" msgid="2777238588398046285">"Ручно синхронизовање није могуће"</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, унесите PIN"</string>
     <string name="enter_pattern" msgid="4187435713036808566">"Да бисте покренули Android, нацртајте шаблон"</string>
@@ -2372,6 +2382,7 @@
     <string name="misc_files_selected_count" msgid="4647048020823912088">"изабрано је <xliff:g id="NUMBER">%1$d</xliff:g> од <xliff:g id="TOTAL">%2$d</xliff:g>"</string>
     <string name="misc_files_selected_count_bytes" msgid="2876232009069114352">"<xliff:g id="NUMBER">%1$s</xliff:g> од <xliff:g id="TOTAL">%2$s</xliff:g>"</string>
     <string name="select_all" msgid="1562774643280376715">"Изабери све"</string>
+    <string name="data_plan_usage_manage_plans_button_text" msgid="8997761990902708162">"Управљај пакетима"</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>
@@ -2427,9 +2438,9 @@
     <string name="data_usage_app_restrict_dialog_title" msgid="1613108390242737923">"Желите ли да ограничите позадинске податке?"</string>
     <string name="data_usage_app_restrict_dialog" msgid="1466689968707308512">"Ова функција може да заустави апликацију која зависи од позадинских података када су доступне само мобилне мреже.\n\nАдекватније контроле за коришћење података можете да пронађете у подешавањима доступним у оквиру апликације."</string>
     <string name="data_usage_restrict_denied_dialog" msgid="55012417305745608">"Ограничавање позадинских података је могуће само када будете подесили ограничење за мобилне податке."</string>
-    <string name="data_usage_auto_sync_on_dialog_title" msgid="2438617846762244389">"Укључити аутом. синх. података?"</string>
-    <string name="data_usage_auto_sync_on_dialog" product="tablet" msgid="8581983093524041669">"Све промене које унесете у налоге на вебу ће аутоматски бити копиране на таблет.\n\nНеки налози могу и аутоматски да копирају на веб све промене које унесете на таблету. Тако функционише Google налог."</string>
-    <string name="data_usage_auto_sync_on_dialog" product="default" msgid="8651376294887142858">"Све промене које унесете у налоге на вебу ће аутоматски бити копиране на телефон.\n\nНеки налози могу и аутоматски да копирају на веб све промене које унесете на телефону. Тако функционише Google налог."</string>
+    <string name="data_usage_auto_sync_on_dialog_title" msgid="2438617846762244389">"Укључујете ауто. синхронизацију?"</string>
+    <string name="data_usage_auto_sync_on_dialog" product="tablet" msgid="8581983093524041669">"Све промене које унесете на налоге на вебу ће аутоматски бити копиране на таблет.\n\nНеки налози могу и аутоматски да копирају на веб све промене које унесете на таблету. Тако функционише Google налог."</string>
+    <string name="data_usage_auto_sync_on_dialog" product="default" msgid="8651376294887142858">"Све промене које унесете на налоге на вебу ће аутоматски бити копиране на телефон.\n\nНеки налози могу и аутоматски да копирају на веб све промене које унесете на телефону. Тако функционише Google налог."</string>
     <string name="data_usage_auto_sync_off_dialog_title" msgid="9013139130490125793">"Искључујете ауто-синх. података?"</string>
     <string name="data_usage_auto_sync_off_dialog" msgid="4025938250775413864">"То ће се смањити потрошњу података и батерије, али биће потребно да ручно синхронизујете сваки налог да бисте прикупили недавне информације. Нећете примати ни обавештења када дође до ажурирања."</string>
     <string name="data_usage_cycle_editor_title" msgid="1373797281540188533">"Датум враћања циклуса потрошње на почетне вредности"</string>
@@ -2457,6 +2468,9 @@
     <string name="data_usage_metered_mobile" msgid="5423305619126978393">"Мобилне мреже"</string>
     <string name="data_usage_metered_wifi" msgid="1761738002328299714">"Wi‑Fi мреже са ограничењем"</string>
     <string name="data_usage_metered_wifi_disabled" msgid="727808462375941567">"Да бисте изабрали мреже са ограничењем, укључите Wi-Fi."</string>
+    <string name="data_usage_metered_auto" msgid="1262028400911918865">"Аутоматски"</string>
+    <string name="data_usage_metered_yes" msgid="9217539611385225894">"Са ограничењем"</string>
+    <string name="data_usage_metered_no" msgid="4025232961929071789">"Без ограничења"</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>
@@ -2548,9 +2562,6 @@
     <string name="backup_pw_set_button_text" msgid="2387480910044648795">"Постави лозинку резервне копије"</string>
     <string name="backup_pw_cancel_button_text" msgid="8845630125391744615">"Откажи"</string>
     <string name="additional_system_update_settings_list_item_title" msgid="214987609894661992">"Додатна ажурирања система"</string>
-    <string name="selinux_status_disabled" msgid="924551035552323327">"Онемогућено"</string>
-    <string name="selinux_status_permissive" msgid="6004965534713398778">"Омогућено"</string>
-    <string name="selinux_status_enforcing" msgid="2252703756208463329">"Спровођење"</string>
     <string name="ssl_ca_cert_warning" msgid="2045866713601984673">"Мрежа се можда надгледа"</string>
     <string name="done_button" msgid="1991471253042622230">"Готово"</string>
     <plurals name="ssl_ca_cert_dialog_title" formatted="false" msgid="7145092748045794650">
@@ -2596,10 +2607,10 @@
     <string name="user_add_user_title" msgid="2108112641783146007">"Додајете новог корисника?"</string>
     <string name="user_add_user_message_long" msgid="8562152293752222985">"Овај уређај са можете да делите другим људима ако направите још корисника. Сваки корисник има сопствени простор, који може да прилагођава помоћу апликација, позадине и тако даље. Корисници могу да прилагођавају и подешавања уређаја која утичу на свакога, попут Wi‑Fi-ја.\n\nКада додате новог корисника, та особа треба да подеси сопствени простор.\n\nСваки корисник може да ажурира апликације за све остале кориснике."</string>
     <string name="user_add_user_message_short" msgid="1511354412249044381">"Када додате новог корисника, та особа треба да подеси сопствени простор.\n\nСваки корисник може да ажурира апликације за све остале кориснике."</string>
-    <string name="user_setup_dialog_title" msgid="1765794166801864563">"Подешавате корисника одмах?"</string>
-    <string name="user_setup_dialog_message" msgid="1004068621380867148">"Проверите да ли је особа доступна да узме уређај и подеси свој простор"</string>
+    <string name="user_setup_dialog_title" msgid="1765794166801864563">"Подешавате корисника?"</string>
+    <string name="user_setup_dialog_message" msgid="1004068621380867148">"Та особа треба да узме уређај и подеси свој простор"</string>
     <string name="user_setup_profile_dialog_message" msgid="3896568553327558731">"Желите ли да одмах подесите профил?"</string>
-    <string name="user_setup_button_setup_now" msgid="3391388430158437629">"Подеси одмах"</string>
+    <string name="user_setup_button_setup_now" msgid="3391388430158437629">"Подеси"</string>
     <string name="user_setup_button_setup_later" msgid="3068729597269172401">"Не сада"</string>
     <string name="user_cannot_manage_message" product="tablet" msgid="7153048188252553320">"Само власник таблета може да управља корисницима."</string>
     <string name="user_cannot_manage_message" product="default" msgid="959315813089950649">"Само власник телефона може да управља корисницима."</string>
@@ -2753,6 +2764,7 @@
       <item quantity="few">Прикажи %d скривене ставке</item>
       <item quantity="other">Прикажи %d скривених ставки</item>
     </plurals>
+    <string name="dashboard_suggestion_condition_footer_content_description" msgid="2898588191174845961">"Скупи"</string>
     <string name="network_dashboard_title" msgid="4771589228992391573">"Мрежа и интернет"</string>
     <string name="network_dashboard_summary_mobile" msgid="3851083934739500429">"мобилна мрежа"</string>
     <string name="network_dashboard_summary_data_usage" msgid="3843261364705042212">"потрошња података"</string>
@@ -2835,7 +2847,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>
@@ -2856,8 +2868,14 @@
       <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_priority_settings_title" msgid="2623117023031824309">"Дозвољени су само приоритети"</string>
+    <string name="zen_mode_settings_title" msgid="1066226840983908121">"Не узнемиравај"</string>
+    <string name="zen_mode_behavior_settings_title" msgid="1463303933529313969">"Понашање"</string>
+    <string name="zen_mode_behavior_allow_title" msgid="3845615648136218141">"Дозволи звуке и вибрације од:"</string>
+    <string name="zen_mode_behavior_no_sound" msgid="1219626004723208056">"Без звука"</string>
+    <string name="zen_mode_behavior_total_silence" msgid="6716603819806610626">"Без звука (потпуна тишина)"</string>
+    <string name="zen_mode_behavior_no_sound_except" msgid="4968477585788243114">"Без звука осим за: <xliff:g id="CATEGORIES">%1$s</xliff:g>"</string>
+    <!-- no translation found for zen_mode_behavior_alarms_only (2423480992071472963) -->
+    <skip />
     <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>
@@ -2899,13 +2917,15 @@
     <string name="notifications_title" msgid="8086372779371204971">"Обавештења"</string>
     <string name="app_notifications_title" msgid="5810577805218003760">"Обавештења апликација"</string>
     <string name="notification_channel_title" msgid="2260666541030178452">"Категорија обавештења"</string>
+    <string name="notification_group_title" msgid="7180506440133859601">"Група категорија обавештења"</string>
     <string name="notification_importance_title" msgid="848692592679312666">"Важност"</string>
-    <string name="notification_importance_unspecified" msgid="2196023702875112081">"Нека апликација одлучи"</string>
+    <string name="notification_importance_unspecified" msgid="6622173510486113958">"Дозволи звук"</string>
     <string name="notification_importance_blocked" msgid="7938180808339386300">"Никада не приказуј обавештења"</string>
     <string name="notification_importance_min" msgid="5455049524984686275">"Без звучног сигнала или визуелног обавештења"</string>
     <string name="notification_importance_low" msgid="8881468429453766553">"Без звука"</string>
     <string name="notification_importance_default" msgid="5958338024601957516">"Емитује се звучни сигнал"</string>
     <string name="notification_importance_high" msgid="2082429479238228527">"Емитује се звучни сигнал и приказује се на екрану"</string>
+    <string name="notification_importance_high_silent" msgid="2667033773703765252">"Искачуће обавештење на екрану"</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>
@@ -2949,8 +2969,14 @@
     <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="channel_group_notifications_off_desc" msgid="1620950416247316370">"Android блокира приказивање ове групе обавештења на овом уређају"</string>
     <string name="notification_channels" msgid="5346841743182627500">"Категорије"</string>
     <string name="notification_channels_other" msgid="5645317113885788226">"Другo"</string>
+    <plurals name="notification_group_summary" formatted="false" msgid="3420621520561455358">
+      <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="no_channels" msgid="3077375508177744586">"Ова апликација није поставила ниједно обавештење"</string>
     <string name="app_settings_link" msgid="8894946007543660906">"Додатна подешавања у апликацији"</string>
     <string name="app_notification_listing_summary_zero" msgid="6482582965081108108">"Укључено за све апликације"</string>
@@ -3027,14 +3053,16 @@
     <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>
+    <!-- no translation found for zen_mode_media_system_other (8900209390529859777) -->
+    <skip />
     <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="239685342222975733">"Ако иста особа позове по други пут у периоду од <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>
@@ -3065,6 +3093,7 @@
     <string name="zen_mode_screen_off_visual_interruptions" msgid="4850792880144382633">"Када је екран искључен"</string>
     <string name="zen_mode_no_visual_interruptions" msgid="8742776003822778472">"Када је екран укључен или искључен"</string>
     <string name="notification_app_settings_button" msgid="6685640230371477485">"Подешавања обавештења"</string>
+    <string name="suggestion_button_text" msgid="3275010948381252006">"Потврди"</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>
@@ -3084,7 +3113,7 @@
     <string name="encryption_interstitial_message_pattern" msgid="7081249914068568570">"Можете додатно да заштитите овај уређај тако што ћете га подесити да тражи шаблон пре покретања. Док се уређај не покрене, не може да прима позиве, поруке нити обавештења, укључујући аларме. \n\nTо омогућава заштиту података на изгубљеним или украденим уређајима. Захтевати шаблон при покретању уређаја?"</string>
     <string name="encryption_interstitial_message_password" msgid="7796567133897436443">"Можете додатно да заштитите уређај тако што ћете га подесити да тражи лозинку пре покретања. Док се уређај не покрене, не може да прима позиве, поруке или обавештења, укључујући аларме. \n\nТо омогућава заштиту података на изгубљеним или украденим уређајима. Захтевати лозинку при покретању уређаја?"</string>
     <string name="encryption_interstitial_message_pin_for_fingerprint" msgid="4550632760119547492">"Поред тога што можете да откључавате уређај отиском прста, можете додатно да га заштитите тако што ћете га подесити да тражи PIN пре покретања. Док се уређај не покрене, не може да прима позиве, поруке нити обавештења, укључујући аларме.\n\nTо омогућава заштиту података на изгубљеним или украденим уређајима. Желите захтев за PIN при покретању уређаја?"</string>
-    <string name="encryption_interstitial_message_pattern_for_fingerprint" msgid="932184823193006087">"Поред тога што можете да откључавате уређај отиском прста, можете додатно да га заштитите тако што ћете га подесити да тражи шаблон пре покретања. Док се уређај не покрене, не може да прима позиве, поруке нити обавештења, укључујући аларме.\n\nTо омогућава заштиту података на изгубљеним или украденим уређајима. Захтевати шаблон при покретању уређаја?"</string>
+    <string name="encryption_interstitial_message_pattern_for_fingerprint" msgid="932184823193006087">"Поред тога што можете да откључавате уређај отиском прста, можете додатно да га заштитите тако што ћете га подесити да тражи шаблон пре покретања. Док се уређај не покрене, не може да прима позиве, поруке нити обавештења, укључујући аларме.\n\nTо омогућава заштиту података на изгубљеним или украденим уређајима. Желите ли захтев шаблона при покретању уређаја?"</string>
     <string name="encryption_interstitial_message_password_for_fingerprint" msgid="5560954719370251702">"Поред тога што можете да откључавате уређај отиском прста, можете додатно да га заштитите тако што ћете га подесити да тражи лозинке пре покретања. Док се уређај не покрене, не може да прима позиве, поруке нити обавештења, укључујући аларме.\n\nTо омогућава заштиту података на изгубљеним или украденим уређајима. Захтевати лозинку при покретању уређаја?"</string>
     <string name="encryption_interstitial_yes" msgid="4439509435889513411">"Да"</string>
     <string name="encryption_interstitial_no" msgid="8935031349097025137">"Не"</string>
@@ -3205,7 +3234,7 @@
     <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">
@@ -3255,6 +3284,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="sms_mirroring_pref" msgid="6475043279147376031">"Пресликавање SMS-ова"</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>
@@ -3322,7 +3352,7 @@
     <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="permit_write_settings" msgid="658555006453212691">"Дозволи мењање подешавања система"</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>
@@ -3420,9 +3450,12 @@
     <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">"Рестартујте уређај да бисте применили промену TelephonyMonitor-а"</string>
+    <string name="connectivity_monitor_switch" msgid="9059759348648583421">"ConnectivityMonitor"</string>
+    <string name="connectivity_monitor_switch_summary" msgid="2828658652378866401">"ConnectivityMonitor ће прикупљати евиденцију када открије проблем са повезивањем и затражиће од корисника да пријави грешку"</string>
+    <string name="connectivity_monitor_toast" msgid="5551859612881173028">"Рестартујте уређај да бисте применили промену ConnectivityMonitor-а"</string>
     <string name="camera_hal_hdrplus_switch" msgid="8377365197105267466">"Камера HAL HDR+"</string>
     <string name="camera_hal_hdrplus_toast" msgid="2063703797270055299">"Да бисте применили промену на камеру HAL HDR+, рестартујте уређај"</string>
+    <string name="camera_laser_sensor_switch" msgid="8913588990743234440">"Сензор ласера Камере"</string>
     <string name="ota_disable_automatic_update" msgid="2319639631655915050">"Аутоматска ажурирања система"</string>
     <string name="usage" msgid="2977875522080448986">"Потрошња"</string>
     <string name="cellular_data_usage" msgid="2155683719898158203">"Потрошња мобил. података"</string>
@@ -3449,7 +3482,7 @@
     <string name="data_warning" msgid="209133958008062117">"Упозорење за потрошњу података"</string>
     <string name="set_data_limit" msgid="2901526323210516923">"Подеси ограничење за податке"</string>
     <string name="data_limit" msgid="1885406964934590552">"Ограничење за потрошњу података"</string>
-    <string name="data_usage_template" msgid="392191945602400904">"Потрошили сте <xliff:g id="ID_1">%1$s</xliff:g> у периоду <xliff:g id="ID_2">%2$s</xliff:g>"</string>
+    <string name="data_usage_template" msgid="2923744765873163859">"Искористили сте <xliff:g id="ID_1">%1$s</xliff:g> у периоду <xliff:g id="ID_2">%2$s</xliff:g>"</string>
     <string name="configure" msgid="1029654422228677273">"Конфигуришите"</string>
     <string name="data_usage_other_apps" msgid="3272872663517382050">"Друге апликације укључене у употребу"</string>
     <plurals name="data_saver_unrestricted_summary" formatted="false" msgid="2635267833484232703">
@@ -3520,7 +3553,7 @@
     <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="387052719462473500">"Контролишите информације на закључаном екрану"</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="8483187649355540109">"Подршка и савети"</string>
@@ -3528,7 +3561,7 @@
     <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>
+    <string name="bluetooth_disabled" msgid="6244000672828617410">"Искључено"</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>
@@ -3633,7 +3666,7 @@
     <string name="web_action_enable_title" msgid="4051513950976670853">"Инстант апликације"</string>
     <string name="web_action_enable_summary" msgid="3108127559723396382">"Отварајте линкове у апликацијама, чак и ако нису инсталиране"</string>
     <string name="web_action_section_title" msgid="7364647086538399136">"Инстант апликације"</string>
-    <string name="instant_apps_account" msgid="1433620209791992528">"Налог за инстант апликације"</string>
+    <string name="instant_apps_settings" msgid="8827777916518348213">"Подешавања инстант апликација"</string>
     <string name="domain_url_section_title" msgid="7046835219056428883">"Инсталиране апликације"</string>
     <string name="automatic_storage_manager_activation_warning" msgid="6353100011690933254">"Меморијским простором сада управља Менаџер меморијског простора"</string>
     <string name="account_for_section_header" msgid="5356566418548737121">"Налози за корисника <xliff:g id="USER_NAME">%1$s</xliff:g>"</string>
@@ -3682,7 +3715,9 @@
     <string name="enterprise_privacy_always_on_vpn_personal" msgid="9217774730260037434">"Стално укључени VPN је укључен на личном профилу"</string>
     <string name="enterprise_privacy_always_on_vpn_work" msgid="7244472958208315814">"Стално укључени VPN је укључен на профилу за Work"</string>
     <string name="enterprise_privacy_global_http_proxy" msgid="7936664553416257333">"Глобални HTTP прокси је подешен"</string>
-    <string name="enterprise_privacy_ca_certs" msgid="5885892204903688909">"Поуздани акредитиви"</string>
+    <string name="enterprise_privacy_ca_certs_device" msgid="2019652712782510262">"Поуздани акредитиви"</string>
+    <string name="enterprise_privacy_ca_certs_personal" msgid="2279084820904076599">"Поуздани акредитиви на личном профилу"</string>
+    <string name="enterprise_privacy_ca_certs_work" msgid="6187377647815301809">"Поуздани акредитиви на профилу за Work"</string>
     <plurals name="enterprise_privacy_number_ca_certs" formatted="false" msgid="526375234629534165">
       <item quantity="one">Најмање <xliff:g id="COUNT_1">%d</xliff:g> CA сертификат</item>
       <item quantity="few">Најмање <xliff:g id="COUNT_1">%d</xliff:g> CA сертификата</item>
@@ -3750,6 +3785,8 @@
     <string name="carrier_provisioning" msgid="4398683675591893169">"Информације о додели мобилног оператера"</string>
     <string name="trigger_carrier_provisioning" msgid="3434865918009286187">"Покретање доделе мобилног оператера"</string>
     <string name="new_device_suggestion_title" msgid="698847081680980774">"Шта је ново и узбудљиво?"</string>
-    <string name="new_device_suggestion_summary" msgid="7172709269203435870">"Погледајте 5 најпопуларнијих функција"</string>
+    <string name="new_device_suggestion_summary" product="default" msgid="206396571522515855">"Упознајте нови телефон"</string>
+    <string name="new_device_suggestion_summary" product="tablet" msgid="393751455688210956">"Упознајте нови таблет"</string>
+    <string name="new_device_suggestion_summary" product="device" msgid="2939870049868336652">"Упознајте нови уређај"</string>
     <string name="disabled_low_ram_device" msgid="3751578499721173344">"Ова функција није доступна на овом уређају."</string>
 </resources>
diff --git a/res/values-sv/arrays.xml b/res/values-sv/arrays.xml
index 7f3847c..b0582d7 100644
--- a/res/values-sv/arrays.xml
+++ b/res/values-sv/arrays.xml
@@ -100,8 +100,6 @@
     <!-- no translation found for wifi_security_no_eap:0 (2084555984818107151) -->
     <!-- no translation found for wifi_security_no_eap:1 (397579322683471524) -->
     <!-- no translation found for wifi_security_no_eap:2 (1968820975358150484) -->
-    <!-- no translation found for wifi_ap_security:0 (5251664683198623324) -->
-    <!-- no translation found for wifi_ap_security:1 (7989073072260294673) -->
   <string-array name="wifi_eap_method">
     <item msgid="1160193392455075561">"PEAP"</item>
     <item msgid="7981731051382306293">"TLS"</item>
diff --git a/res/values-sv/strings.xml b/res/values-sv/strings.xml
index 3458d30..816df7b 100644
--- a/res/values-sv/strings.xml
+++ b/res/values-sv/strings.xml
@@ -74,8 +74,8 @@
     <string name="radioInfo_display_asu" msgid="1422248392727818082">"asu"</string>
     <string name="radioInfo_lac" msgid="8415219164758307156">"LAC"</string>
     <string name="radioInfo_cid" msgid="4362599198392643138">"CID"</string>
-    <string name="sdcard_unmount" product="nosdcard" msgid="6325292633327972272">"Demontera USB-enhet"</string>
-    <string name="sdcard_unmount" product="default" msgid="3364184561355611897">"Montera bort SD-kort"</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_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>
@@ -114,7 +114,7 @@
     <string name="bluetooth_disconnect_all_profiles" product="device" msgid="3995834526315103965">"Enheten kopplas bort från <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
     <string name="bluetooth_disconnect_dialog_ok" msgid="3308586619539119106">"Frånkoppla"</string>
     <string name="bluetooth_empty_list_user_restricted" msgid="603521233563983689">"Du saknar behörighet att ändra Bluetooth-inställningarna."</string>
-    <string name="bluetooth_pairing_pref_title" msgid="7429413067477968637">"Koppla en ny enhet"</string>
+    <string name="bluetooth_pairing_pref_title" msgid="7429413067477968637">"Parkoppla en ny enhet"</string>
     <string name="bluetooth_is_visible_message" msgid="6222396240776971862">"Enheter i närheten kan se <xliff:g id="DEVICE_NAME">%1$s</xliff:g> när Bluetooth är på."</string>
     <string name="bluetooth_footer_mac_message" product="default" msgid="1109366350000220283">"Mobilens Bluetooth-adress: <xliff:g id="BLUETOOTH_MAC_ADDRESS">%1$s</xliff:g>"</string>
     <string name="bluetooth_footer_mac_message" product="tablet" msgid="6807634484499166486">"Surfplattans Bluetooth-adress: <xliff:g id="BLUETOOTH_MAC_ADDRESS">%1$s</xliff:g>"</string>
@@ -129,7 +129,7 @@
     <string name="bluetooth_no_devices_found" msgid="1085232930277181436">"Hittade inga Bluetooth-enheter i närheten."</string>
     <string name="bluetooth_notif_ticker" msgid="4726721390078512173">"Begäran om parkoppling för Bluetooth"</string>
     <string name="bluetooth_notif_title" msgid="2485175521845371514">"Begäran om parkoppling"</string>
-    <string name="bluetooth_notif_message" msgid="5057417127600942904">"Tryck om du vill koppla till <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
+    <string name="bluetooth_notif_message" msgid="5057417127600942904">"Tryck om du vill parkoppla med <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
     <string name="bluetooth_show_received_files" msgid="3144149432555230410">"Mottagna filer"</string>
     <string name="device_picker" msgid="4978696506172252813">"Välj Bluetooth-enhet"</string>
     <string name="bluetooth_ask_enablement" msgid="3387222809404177525">"<xliff:g id="APP_NAME">%1$s</xliff:g> vill aktivera Bluetooth"</string>
@@ -166,9 +166,9 @@
     <string name="bluetooth_map_acceptance_dialog_text" msgid="8712508202081143737">"%1$s vill ha åtkomst till dina meddelanden. Vill du ge %2$s åtkomst?"</string>
     <string name="bluetooth_sap_request" msgid="2669762224045354417">"Begäran om åtkomst till SIM-kort"</string>
     <string name="bluetooth_sap_acceptance_dialog_text" msgid="4414253873553608690">"<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g> vill ha åtkomst till ditt SIM-kort. Om du ger den åtkomst till SIM-kortet inaktiveras dataanslutningen på enheten under tiden som anslutningen är upprättad. Ge <xliff:g id="DEVICE_NAME_1">%2$s?</xliff:g> åtkomst"</string>
-    <string name="bluetooth_device_name_summary" msgid="4757990010751789977">"Synlig för andra enheter som <xliff:g id="DEVICE_NAME">^1</xliff:g>"</string>
+    <string name="bluetooth_device_name_summary" msgid="522235742194965734">"Synlig för andra enheter som <xliff:g id="DEVICE_NAME">^1</xliff:g>"</string>
     <string name="bluetooth_paired_device_title" msgid="8638994696317952019">"Dina enheter"</string>
-    <string name="bluetooth_pairing_page_title" msgid="7712127387361962608">"Koppla en ny enhet"</string>
+    <string name="bluetooth_pairing_page_title" msgid="7712127387361962608">"Parkoppla en ny enhet"</string>
     <string name="date_and_time" msgid="9062980487860757694">"Datum och tid"</string>
     <string name="choose_timezone" msgid="1362834506479536274">"Välj tidszon"</string>
     <!-- no translation found for intent_sender_data_label (6332324780477289261) -->
@@ -312,6 +312,8 @@
     <string name="zone_auto" msgid="334783869352026648">"Automatisk tidszon"</string>
     <string name="zone_auto_summaryOn" msgid="6142830927278458314">"Använd nätverkets tidszon"</string>
     <string name="zone_auto_summaryOff" msgid="2597745783162041390">"Använd nätverkets tidszon"</string>
+    <string name="date_time_24hour_auto" msgid="2117383168985653422">"Automatiskt 24‑timmarsformat"</string>
+    <string name="date_time_24hour_auto_summary" msgid="6351812925651480277">"Använd lokal standard"</string>
     <string name="date_time_24hour_title" msgid="3203537578602803850">"24-timmarsformat"</string>
     <string name="date_time_24hour" msgid="1193032284921000063">"Använd 24-timmarsformat"</string>
     <string name="date_time_set_time_title" msgid="6296795651349047016">"Tid"</string>
@@ -372,6 +374,9 @@
     <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="1961957425135180242">"Nästa"</string>
+    <string name="setup_fingerprint_enroll_skip_title" msgid="362050541117362034">"Ska fingeravtryck hoppas över?"</string>
+    <string name="setup_fingerprint_enroll_skip_after_adding_lock_text" msgid="958990414356204763">"Det tar bara ett par minuter att konfigurera fingeravtrycket. Hoppar du över det kan du lägga till fingeravtryck i inställningarna senare."</string>
+    <string name="lock_screen_intro_skip_title" msgid="4988210105913705679">"Vill du hoppa över skärmlås?"</string>
     <string name="lock_screen_intro_skip_dialog_text_frp" product="tablet" msgid="1581834104051243425">"Enhetens skyddsfunktioner aktiveras inte. Du kan inte hindra andra från att använda surfplattan om den blir stulen, tappas bort eller återställs."</string>
     <string name="lock_screen_intro_skip_dialog_text_frp" product="device" msgid="4629503416877189572">"Enhetens skyddsfunktioner aktiveras inte. Du kan inte hindra andra från att använda enheten om den blir stulen, tappas bort eller återställs."</string>
     <string name="lock_screen_intro_skip_dialog_text_frp" product="default" msgid="2423428240245737909">"Enhetens skyddsfunktioner aktiveras inte. Du kan inte hindra andra från att använda mobilen om den blir stulen, tappas bort eller återställs."</string>
@@ -457,7 +462,7 @@
     <string name="setup_lock_settings_picker_title" product="tablet" msgid="90329443364067215">"Skydda surfplattan"</string>
     <string name="setup_lock_settings_picker_title" product="device" msgid="2399952075134938929">"Skydda enheten"</string>
     <string name="setup_lock_settings_picker_title" product="default" msgid="1572244299605153324">"Skydda mobilen"</string>
-    <string name="setup_lock_settings_picker_fingerprint_message" msgid="5585650064305600578">"Konfigurera ett skärmlås för ytterligare skydd."</string>
+    <string name="lock_settings_picker_fingerprint_added_security_message" msgid="5768002109707648463">"Ställ in ett skärmlås för ytterligare skydd."</string>
     <string name="setup_lock_settings_picker_message" product="tablet" msgid="8919671129189936210">"Hindra andra från att använda surfplattan 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="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>
@@ -496,7 +501,7 @@
     <string name="unlock_set_unlock_mode_password" msgid="1203938057264146610">"Lösenord"</string>
     <string name="unlock_setup_wizard_fingerprint_details" msgid="7893457665921363009">"När du har konfigurerat skärmlåset kan du även registrera ditt fingeravtryck i Inställningar &gt; Säkerhet."</string>
     <string name="unlock_disable_lock_title" msgid="1427036227416979120">"Inaktivera skärmlås"</string>
-    <string name="unlock_disable_frp_warning_title" msgid="264008934468492550">"Vill du ta bort enhetsskydd?"</string>
+    <string name="unlock_disable_frp_warning_title" msgid="264008934468492550">"Vill du ta bort enhetsskyddet?"</string>
     <string name="unlock_disable_frp_warning_title_profile" msgid="5507136301904313583">"Vill du ta bort profilens säkerhetsfunktioner?"</string>
     <string name="unlock_disable_frp_warning_content_pattern" msgid="8869767290771023461">"Funktionerna för enhetsskydd fungerar inte utan det grafiska lösenordet."</string>
     <string name="unlock_disable_frp_warning_content_pattern_fingerprint" msgid="2986105377420905314">"Enhetens säkerhetsfunktioner fungerar inte utan ett grafiskt lösenord.<xliff:g id="EMPTY_LINE">
@@ -588,6 +593,7 @@
     <string name="lockpassword_pin_no_sequential_digits" msgid="680765285206990584">"En stigande, fallande eller upprepad siffersekvens är inte tillåten"</string>
     <string name="lockpassword_ok_label" msgid="313822574062553672">"OK"</string>
     <string name="lockpassword_cancel_label" msgid="8818529276331121899">"Avbryt"</string>
+    <string name="lockpassword_clear_label" msgid="5724429464960458155">"Rensa"</string>
     <string name="lockpattern_tutorial_cancel_label" msgid="6431583477570493261">"Avbryt"</string>
     <string name="lockpattern_tutorial_continue_label" msgid="3559793618653400434">"Nästa"</string>
     <string name="lock_setup" msgid="3355847066343753943">"Installationen är klar."</string>
@@ -648,7 +654,7 @@
     <string name="bluetooth_menu_advanced" msgid="8572178316357220524">"Avancerat"</string>
     <string name="bluetooth_advanced_titlebar" msgid="2142159726881547669">"Avancerad Bluetooth"</string>
     <string name="bluetooth_empty_list_bluetooth_off" msgid="6351930724051893423">"När Bluetooth har aktiverats kan enheten kommunicera med andra Bluetooth-enheter i närheten."</string>
-    <string name="ble_scan_notify_text" msgid="1295915006005700650">"I syfte att förbättra platsangivelserna kan systemtjänster och -appar fortfarande upptäcka Bluetooth-enheter. Du kan ändra detta i <xliff:g id="LINK_BEGIN_0">LINK_BEGIN</xliff:g>sökinställningarna<xliff:g id="LINK_END_1">LINK_END</xliff:g>."</string>
+    <string name="ble_scan_notify_text" msgid="1295915006005700650">"För att förbättra platsangivelserna kan systemtjänster och -appar fortfarande upptäcka Bluetooth-enheter. Du kan ändra detta i <xliff:g id="LINK_BEGIN_0">LINK_BEGIN</xliff:g>sökinställningarna<xliff:g id="LINK_END_1">LINK_END</xliff:g>."</string>
     <string name="bluetooth_connect_failed" msgid="4500234659813241053">"Det gick inte att ansluta. Försök igen."</string>
     <string name="device_details_title" msgid="6576953269221085300">"Enhetsinformation"</string>
     <string name="bluetooth_device_mac_address" msgid="2513724313558236181">"Enhetens Bluetooth-adress: <xliff:g id="ADDRESS">%1$s</xliff:g>"</string>
@@ -731,7 +737,7 @@
     <string name="use_open_wifi_automatically_summary_scoring_disabled" msgid="593964217679325831">"Du måste välja en leverantör av nätverksbetyg om du vill använda nätverket"</string>
     <string name="use_open_wifi_automatically_summary_scorer_unsupported_disabled" msgid="8472122600853650258">"Du måste välja en kompatibel leverantör av nätverksbetyg om du vill använda nätverket"</string>
     <string name="wifi_install_credentials" msgid="3551143317298272860">"Installera certifikat"</string>
-    <string name="wifi_scan_notify_text" msgid="5593805423071186757">"I syfte att förbättra platsangivelserna kan systemtjänster och -appar fortfarande söka efter Wi-Fi-nätverk. Du kan ändra detta i <xliff:g id="LINK_BEGIN_0">LINK_BEGIN</xliff:g>sökinställningarna<xliff:g id="LINK_END_1">LINK_END</xliff:g>."</string>
+    <string name="wifi_scan_notify_text" msgid="5593805423071186757">"För att förbättra platsangivelserna kan systemtjänster och -appar fortfarande söka efter Wi-Fi-nätverk. Du kan ändra detta i <xliff:g id="LINK_BEGIN_0">LINK_BEGIN</xliff:g>sökinställningarna<xliff:g id="LINK_END_1">LINK_END</xliff:g>."</string>
     <string name="wifi_scan_notify_text_scanning_off" msgid="3426075479272242098">"Platsangivelsen kan göras mer exakt om du aktiverar sökning efter Wi-Fi-nätverk i <xliff:g id="LINK_BEGIN_0">LINK_BEGIN</xliff:g>genomsökningsinställningarna<xliff:g id="LINK_END_1">LINK_END</xliff:g>."</string>
     <string name="wifi_scan_notify_remember_choice" msgid="7104867814641144485">"Visa inte igen"</string>
     <string name="wifi_setting_sleep_policy_title" msgid="5149574280392680092">"Behåll Wi-Fi på i viloläge"</string>
@@ -781,6 +787,7 @@
     <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>
@@ -817,6 +824,8 @@
     <string name="wifi_wps_available_first_item" msgid="4422547079984583502">"WPS tillgängligt"</string>
     <string name="wifi_wps_available_second_item" msgid="8427520131718215301">" (WPS tillgängligt)"</string>
     <string name="wifi_wps_nfc_enter_password" msgid="2288214226916117159">"Ange nätverkslösenordet"</string>
+    <string name="wifi_carrier_connect" msgid="8174696557882299911">"Wi‑Fi-nätverk från operatör"</string>
+    <string name="wifi_carrier_content" msgid="4634077285415851933">"Anslut via <xliff:g id="NAME">%1%s</xliff:g>"</string>
     <string name="wifi_scan_always_turnon_message" msgid="203123538572122989">"<xliff:g id="APP_NAME">%1$s</xliff:g> vill aktivera nätverkssökning även när Wi-Fi är avstängt för att kunna förbättra positionens exakthet och andra ändamål.\n\nVill du tillåta detta för alla appar som vill söka efter nätverk?"</string>
     <string name="wifi_scan_always_turnoff_message" msgid="5538901671131941043">"Välj Avancerat under fler menyalternativ om du vill inaktivera."</string>
     <string name="wifi_scan_always_confirm_allow" msgid="5355973075896817232">"Tillåt"</string>
@@ -834,6 +843,7 @@
     <string name="wifi_connect" msgid="1076622875777072845">"Anslut"</string>
     <string name="wifi_failed_connect_message" msgid="8491902558970292871">"Det gick inte att ansluta till nätverket."</string>
     <string name="wifi_forget" msgid="8168174695608386644">"Glöm"</string>
+    <string name="wifi_modify" msgid="6100248070440710782">"Ändra"</string>
     <string name="wifi_failed_forget_message" msgid="1348172929201654986">"Det gick inte att glömma nätverket"</string>
     <string name="wifi_save" msgid="3331121567988522826">"Spara"</string>
     <string name="wifi_failed_save_message" msgid="6650004874143815692">"Det gick inte att spara närverket"</string>
@@ -844,8 +854,9 @@
       <item quantity="one">1 nätverk</item>
     </plurals>
     <string name="wifi_advanced_titlebar" msgid="4485841401774142908">"Avancerat för Wi-Fi"</string>
-    <string name="wifi_advanced_mac_address_title" msgid="6571335466330978393">"Mac-adress"</string>
+    <string name="wifi_advanced_mac_address_title" msgid="6571335466330978393">"MAC-adress"</string>
     <string name="wifi_advanced_ip_address_title" msgid="6215297094363164846">"IP-adress"</string>
+    <string name="wifi_details_title" msgid="3471132676909349382">"Nätverksinformation"</string>
     <string name="wifi_details_subnet_mask" msgid="6720279144174924410">"Nätmask"</string>
     <string name="wifi_details_dns" msgid="8648826607751830768">"DNS"</string>
     <string name="wifi_details_ipv6_address_header" msgid="6734119149106422148">"IPv6-adresser"</string>
@@ -878,27 +889,25 @@
     <string name="wifi_p2p_cancel_connect_title" msgid="255267538099324413">"Avvisa inbjudan?"</string>
     <string name="wifi_p2p_cancel_connect_message" msgid="7477756213423749402">"Vill du avvisa inbjudan att ansluta till <xliff:g id="PEER_NAME">%1$s</xliff:g>?"</string>
     <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_off_subtext" msgid="5466126533609394170">"Varken internet eller innehåll delas med andra enheter"</string>
-    <string name="wifi_hotspot_tethering_on_subtext" product="tablet" msgid="5752490509369962007">"Surfplattans internetanslutning delas via en trådlös surfzon"</string>
-    <string name="wifi_hotspot_tethering_on_subtext" product="default" msgid="6461075246164300670">"Mobilens internetanslutning delas via en trådlös surfzon"</string>
-    <string name="wifi_hotspot_on_local_only_subtext" msgid="2068110388011294735">"Appen delar innehåll. Om du vill dela internetanslutningen inaktiverar du den trådlösa surfzonen och aktiverar den igen"</string>
-    <string name="wifi_hotspot_name_title" msgid="1341735529132128887">"Wi-Fi-namn"</string>
+    <string name="wifi_hotspot_tethering_on_subtext" product="tablet" msgid="5752490509369962007">"Surfplattans internetanslutning delas via en surfzon"</string>
+    <string name="wifi_hotspot_tethering_on_subtext" product="default" msgid="6461075246164300670">"Mobilens internetanslutning delas via en surfzon"</string>
+    <string name="wifi_hotspot_on_local_only_subtext" msgid="2068110388011294735">"Appen delar innehåll. Om du vill dela internetanslutningen inaktiverar du surfzonen och aktiverar den igen"</string>
+    <string name="wifi_hotspot_name_title" msgid="8237000746618636778">"Namn på surfzon"</string>
     <string name="wifi_hotspot_name_summary_connecting" msgid="3378299995508671967">"Aktiverar <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g> …"</string>
     <string name="wifi_hotspot_name_summary_connected" msgid="3888672084861445362">"Andra enheter kan ansluta till <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>"</string>
-    <string name="wifi_hotspot_password_title" msgid="1955592302902091281">"Wi-Fi-lösenord"</string>
+    <string name="wifi_hotspot_password_title" msgid="8676859981917573801">"Lösenord för surfzon"</string>
     <string name="wifi_hotspot_ap_band_title" msgid="1165801173359290681">"AP-band"</string>
-    <string name="wifi_hotspot_footer_info_regular" msgid="1203489406068036455">"Använd trådlösa surfzoner för att skapa ett Wi-Fi-nätverk för andra enheter. Med hjälp av surfzonerna ansluts enheterna till internet via din mobils dataanslutning. Ytterligare dataavgifter kan tillkomma."</string>
-    <string name="wifi_hotspot_footer_info_local_only" msgid="857988412470694109">"Trådlösa surfzoner kan också skapas i appar för att dela innehåll med enheter i närheten."</string>
-    <string name="wifi_tether_starting" msgid="1322237938998639724">"Aktiverar trådlös surfzon ..."</string>
-    <string name="wifi_tether_stopping" msgid="4835852171686388107">"Trådlös surfzon inaktiveras ..."</string>
+    <string name="wifi_hotspot_footer_info_regular" msgid="1203489406068036455">"Använd surfzoner för att skapa ett Wi-Fi-nätverk för andra enheter. Med hjälp av surfzonerna ansluts enheterna till internet via din mobils dataanslutning. Ytterligare dataavgifter kan tillkomma."</string>
+    <string name="wifi_hotspot_footer_info_local_only" msgid="857988412470694109">"Surfzoner kan också skapas i appar för att dela innehåll med enheter i närheten."</string>
+    <string name="wifi_tether_starting" msgid="1322237938998639724">"Aktiverar surfzon ..."</string>
+    <string name="wifi_tether_stopping" msgid="4835852171686388107">"Surfzon inaktiveras ..."</string>
     <string name="wifi_tether_enabled_subtext" msgid="7842111748046063857">"<xliff:g id="NETWORK_SSID">%1$s</xliff:g> är aktiv"</string>
     <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 trådlös surfzon via Wi-Fi"</string>
+    <string name="wifi_tether_configure_ap_text" msgid="7974681394041609308">"Konfigurera 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">"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_hotspot_configure_ap_text_summary" msgid="5560680057727007011">"AndroidAP WPA2 PSK-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>
@@ -939,7 +948,7 @@
     <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="emergency_address_summary" msgid="3266760199681945746">"Adress som används som din plats om du ringer ett nödsamtal via Wi-Fi"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"Skärm"</string>
     <string name="sound_settings" msgid="5534671337768745343">"Ljud"</string>
     <string name="all_volume_title" msgid="4296957391257836961">"Volymer"</string>
@@ -993,6 +1002,7 @@
     <string name="search_settings" msgid="1910951467596035063">"Sök"</string>
     <string name="search_settings_summary" msgid="9205656546570654169">"Hantera sökinställningar och historik"</string>
     <string name="search_settings_no_results" msgid="8799027492641230999">"Inga resultat"</string>
+    <string name="search_clear_history" msgid="4196658962573162457">"Rensa historik"</string>
     <string name="display_settings" msgid="7965901687241669598">"Skärm"</string>
     <string name="accelerometer_title" msgid="7854608399547349157">"Rotera skärmen automatiskt"</string>
     <string name="color_mode_title" msgid="3159275920408338215">"Starka färger"</string>
@@ -1049,20 +1059,20 @@
     <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">"När enheten laddas eller dockas"</string>
+    <string name="screensaver_settings_summary_either_long" msgid="7302740999250873332">"Vid laddning eller dockning"</string>
     <string name="screensaver_settings_summary_either_short" msgid="6140527286137331478">"Båda"</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_sleep" msgid="9086186698140423493">"Vid laddning"</string>
+    <string name="screensaver_settings_summary_dock" msgid="2072657401664633283">"Vid dockning"</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">"Vid start"</string>
+    <string name="screensaver_settings_when_to_dream" msgid="7262410541382890146">"Startas"</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="ambient_display_screen_title" msgid="4252755516328775766">"Inaktiv låsskärm"</string>
+    <string name="ambient_display_screen_title" msgid="4252755516328775766">"Aktiv låsskärm"</string>
     <string name="ambient_display_screen_summary_always_on" msgid="7337555569694794132">"Alltid på/Batterianvändningen ökar"</string>
     <string name="ambient_display_screen_summary_notifications" msgid="1449570742600868654">"Nya aviseringar"</string>
     <string name="ambient_display_category_triggers" msgid="4359289754456268573">"När den ska visas"</string>
@@ -1122,7 +1132,6 @@
     <string name="baseband_version" msgid="1848990160763524801">"Basbandsversion"</string>
     <string name="kernel_version" msgid="9192574954196167602">"Kernel-version"</string>
     <string name="build_number" msgid="3075795840572241758">"Version"</string>
-    <string name="selinux_status" msgid="6212165375172061672">"SELinux-status"</string>
     <string name="device_info_not_available" msgid="8062521887156825182">"Inte tillgänglig"</string>
     <string name="device_status_activity_title" msgid="1411201799384697904">"Status"</string>
     <string name="device_status" msgid="607405385799807324">"Status"</string>
@@ -1131,8 +1140,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">"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="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="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>
@@ -1150,7 +1159,6 @@
     <string name="status_wifi_mac_address" msgid="2202206684020765378">"Wi-Fi MAC-adress"</string>
     <string name="status_bt_address" msgid="4195174192087439720">"Bluetooth-adress"</string>
     <string name="status_serial_number" msgid="2257111183374628137">"Serienummer"</string>
-    <string name="status_unavailable" msgid="7862009036663793314">"Inte tillgängligt"</string>
     <string name="status_up_time" msgid="7294859476816760399">"Tid sedan systemstart"</string>
     <string name="status_awake_time" msgid="2393949909051183652">"Aktiveringstid"</string>
     <string name="internal_memory" msgid="9129595691484260784">"Intern lagring"</string>
@@ -1167,10 +1175,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">"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_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_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>
@@ -1190,12 +1198,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 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="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="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">"Monterar bort"</string>
-    <string name="sd_ejecting_summary" msgid="2028753069184908491">"Monterar bort"</string>
+    <string name="sd_ejecting_title" msgid="8824572198034365468">"Avmonterar"</string>
+    <string name="sd_ejecting_summary" msgid="2028753069184908491">"Avmonterar"</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>
@@ -1326,6 +1334,7 @@
     <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="6254873816990678620">"Återställningsalternativ"</string>
+    <string name="reset_dashboard_summary" msgid="4851012632493522755">"Nätverk, appar och enheter kan återställas"</string>
     <string name="reset_network_title" msgid="6166025966016873843">"Återställ inställningarna för Wi-Fi, mobildata och Bluetooth"</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>
@@ -1333,18 +1342,15 @@
     <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 inte återställts"</string>
-    <string name="master_clear_title" msgid="6617679904229218425">"Rensa all data (återställ standardinställningar)"</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>
-      <item quantity="one">1 konto återställs</item>
-    </plurals>
-    <string name="master_clear_summary" msgid="6902443944660426951">"Det interna lagringsutrymmet och all data återställs"</string>
-    <string name="master_clear_desc" product="tablet" msgid="9146059417023157222">"Detta raderar all data från enhetens "<b>"interna lagringsutrymme"</b>", bland annat:\n\n"<li>"ditt Google-konto"</li>\n<li>"system- och appdata och inställningar"</li>\n<li>"hämtade appar"</li></string>
-    <string name="master_clear_desc" product="default" msgid="4800386183314202571">"Detta raderar all data från enhetens "<b>"interna lagringsutrymme"</b>", bland annat:\n\n"<li>"ditt Google-konto"</li>\n<li>"system- och appdata och inställningar"</li>\n<li>"hämtade appar"</li></string>
+    <string name="reset_network_complete_toast" msgid="787829973559541880">"Nätverksinställningarna har återställts"</string>
+    <string name="master_clear_title" msgid="3531267871084279512">"Rensa all data (återställ standardinställningar)"</string>
+    <string name="master_clear_desc" product="tablet" msgid="9146059417023157222">"Detta raderar all data från enhetens "<b>"interna lagringsutrymme"</b>", bland annat:\n\n"<li>"Ditt Google-konto"</li>\n<li>"System- och appdata och inställningar"</li>\n<li>"Hämtade appar"</li></string>
+    <string name="master_clear_desc" product="default" msgid="4800386183314202571">"Detta raderar all data från enhetens "<b>"interna lagringsutrymme"</b>", bland annat:\n\n"<li>"Ditt Google-konto"</li>\n<li>"System- och appdata och inställningar"</li>\n<li>"Hämtade appar"</li></string>
     <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"Du är inloggad på följande konton:\n"</string>
     <string name="master_clear_other_users_present" product="default" msgid="5161423070702470742">\n\n"Det finns andra användare på enheten.\n"</string>
     <string name="master_clear_desc_also_erases_external" msgid="1903185203791274237"><li>"Musik"</li>\n<li>"Foton"</li>\n<li>"Andra användardata"</li></string>
+    <string name="master_clear_desc_also_erases_esim" msgid="312352697653096008"><li>"Operatörer på eSIM-kortet"</li></string>
+    <string name="master_clear_desc_no_cancel_mobile_plan" msgid="5460926449093211144">\n\n"Detta innebär inte att serviceavtalet avslutas."</string>
     <string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="7744115866662613411">\n\n"Om du vill ta bort musik, bilder och annan användardata måste du radera "<b>"USB-lagringsenheten"</b>"."</string>
     <string name="master_clear_desc_erase_external_storage" product="default" msgid="4801026652617377093">\n\n"Om du vill ta bort musik, bilder och annan användardata måste du radera "<b>"SD-kortet"</b>"."</string>
     <string name="erase_external_storage" product="nosdcard" msgid="969364037450286809">"Radera USB-lagring"</string>
@@ -1366,16 +1372,16 @@
     <string name="call_settings_title" msgid="5188713413939232801">"Samtalsinställningar"</string>
     <string name="call_settings_summary" msgid="7291195704801002886">"Ställ in röstbrevlåda, vidarekoppla samtal, samtal väntar, nummerpres."</string>
     <string name="tether_settings_title_usb" msgid="6688416425801386511">"Internetdelning via USB"</string>
-    <string name="tether_settings_title_wifi" msgid="3277144155960302049">"Mobil surfpunkt"</string>
+    <string name="tether_settings_title_wifi" msgid="3277144155960302049">"Mobil surfzon"</string>
     <string name="tether_settings_title_bluetooth" msgid="355855408317564420">"Delning via Bluetooth"</string>
     <string name="tether_settings_title_usb_bluetooth" msgid="5355828977109785001">"Internetdelning"</string>
-    <string name="tether_settings_title_all" msgid="3058586928118801157">"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_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_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_button_text" msgid="585829947108007917">"Delning via USB"</string>
     <string name="usb_tethering_subtext" product="default" msgid="5991482890033484794">"Dela mobilens internetanslutning via USB"</string>
     <string name="usb_tethering_subtext" product="tablet" msgid="5988796139573211318">"Dela surfplattans internetanslutning via USB"</string>
     <string name="bluetooth_tether_checkbox_text" msgid="2379175828878753652">"Delning via Bluetooth"</string>
@@ -1384,7 +1390,7 @@
     <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_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="1308462275952345985">"Med hjälp av trådlösa surfzoner och internetdelning kan andra enheter anslutas till internet via mobildataanslutningen. Trådlösa surfzoner kan också skapas i appar för att dela innehåll med enheter i närheten."</string>
+    <string name="tethering_footer_info" msgid="1308462275952345985">"Med hjälp av surfzoner och internetdelning kan andra enheter anslutas till internet via mobildataanslutningen. Surfzoner kan också skapas i appar för att dela innehåll med enheter i närheten."</string>
     <string name="tethering_help_button_text" msgid="656117495547173630">"Hjälp"</string>
     <string name="network_settings_title" msgid="2876509814832830757">"Mobilnätverk"</string>
     <string name="manage_mobile_plan_title" msgid="7630170375010107744">"Mobilplan"</string>
@@ -1461,15 +1467,16 @@
     <string name="settings_safetylegal_activity_title" msgid="6901214628496951727">"Säkerhetsinformation"</string>
     <string name="settings_safetylegal_activity_unreachable" msgid="250674109915859456">"Du har inte någon dataanslutning. Besök %s på en dator som är ansluten till Internet om du vill visa informationen nu."</string>
     <string name="settings_safetylegal_activity_loading" msgid="8059022597639516348">"Läser in …"</string>
-    <string name="lockpassword_choose_your_password_header" msgid="8624900666929394990">"Välj ett lösenord"</string>
-    <string name="lockpassword_choose_your_password_header_for_fingerprint" msgid="6624409510609085450">"Lösenord krävs för fingeravtryck"</string>
-    <string name="lockpassword_choose_your_pattern_header" msgid="6949761069941694050">"Välj grafiskt lösenord"</string>
-    <string name="lockpassword_choose_your_pattern_header_for_fingerprint" msgid="5901096361617543819">"Grafiskt lösenord krävs för fingeravtryck"</string>
-    <string name="lockpassword_choose_your_pin_header" msgid="7598849519816138302">"Välj en PIN-kod"</string>
-    <string name="lockpassword_choose_your_pin_header_for_fingerprint" msgid="765344692615917183">"Pinkod krävs för fingeravtryck"</string>
-    <string name="lockpassword_confirm_your_password_header" msgid="6308478184889846633">"Bekräfta ditt lösenord"</string>
+    <string name="lockpassword_choose_your_screen_lock_header" msgid="3872462096767152394">"Ange ett skärmlås"</string>
+    <string name="lockpassword_choose_your_password_message" msgid="1197569283524841412">"Av säkerhetsskäl måste du ange ett lösenord"</string>
+    <string name="lockpassword_choose_your_password_header_for_fingerprint" msgid="2541818487015343503">"Ange lösenord för fingeravtryck"</string>
+    <string name="lockpassword_choose_your_pattern_header_for_fingerprint" msgid="7709785406243556723">"Ange grafiskt lösenord för fingeravtryck"</string>
+    <string name="lockpassword_choose_your_pin_message" msgid="1875420718677275646">"Av säkerhetsskäl måste du ange en pinkod"</string>
+    <string name="lockpassword_choose_your_pin_header_for_fingerprint" msgid="1549639053195796674">"Pinkod krävs för fingeravtryck"</string>
+    <string name="lockpassword_choose_your_pattern_message" msgid="5986983400689720015">"Av säkerhetsskäl måste du ange ett grafiskt lösenord"</string>
+    <string name="lockpassword_confirm_your_password_header" msgid="1266027268220850931">"Ange ditt lösenord igen"</string>
     <string name="lockpassword_confirm_your_pattern_header" msgid="7543433733032330821">"Bekräfta grafiskt lösenord"</string>
-    <string name="lockpassword_confirm_your_pin_header" msgid="49038294648213197">"Bekräfta din PIN-kod"</string>
+    <string name="lockpassword_confirm_your_pin_header" msgid="7744513791910572550">"Ange din pinkod igen"</string>
     <string name="lockpassword_confirm_passwords_dont_match" msgid="5140892109439191415">"Lösenorden matchar inte"</string>
     <string name="lockpassword_confirm_pins_dont_match" msgid="7226244811505606217">"PIN-koderna matchar inte"</string>
     <string name="lockpassword_choose_lock_generic_header" msgid="3811438094903786145">"Upplåsningsalternativ"</string>
@@ -1488,6 +1495,12 @@
     <string name="lockpassword_strong_auth_required_work_pattern" msgid="3003781907040522053">"Använd det grafiska lösenordet för jobbprofilen för att öka säkerheten"</string>
     <string name="lockpassword_strong_auth_required_work_pin" msgid="3367491332598821552">"Ange pinkoden för jobbprofilen för att öka säkerheten"</string>
     <string name="lockpassword_strong_auth_required_work_password" msgid="8159775129968582940">"Ange lösenordet för jobbprofilen för att öka säkerheten"</string>
+    <string name="lockpassword_confirm_your_pattern_details_frp" msgid="6757336656791723193">"Mobilen återställdes till standardinställningarna. Ange det tidigare grafiska lösenordet."</string>
+    <string name="lockpassword_confirm_your_pin_details_frp" msgid="826520613445990470">"Mobilen återställdes till standardinställningarna. Ange den tidigare pinkoden."</string>
+    <string name="lockpassword_confirm_your_password_details_frp" msgid="8944081074615739040">"Mobilen återställdes till standardinställningarna. Ange det tidigare lösenordet."</string>
+    <string name="lockpassword_confirm_your_pattern_header_frp" msgid="2898036091609128286">"Bekräfta det grafiska lösenordet"</string>
+    <string name="lockpassword_confirm_your_pin_header_frp" msgid="4141601774778898803">"Bekräfta pinkoden"</string>
+    <string name="lockpassword_confirm_your_password_header_frp" msgid="3762615419295360480">"Bekräfta lösenordet"</string>
     <string name="lockpassword_invalid_pin" msgid="15588049067548470">"Fel pinkod"</string>
     <string name="lockpassword_invalid_password" msgid="4038507398784975200">"Fel lösenord"</string>
     <string name="lockpattern_need_to_unlock_wrong" msgid="1745247595356012176">"Fel grafiskt lösenord"</string>
@@ -1537,7 +1550,6 @@
     <string name="install_applications_title" msgid="4987712352256508946">"Tillåt alla appkällor"</string>
     <string name="recent_app_category_title" msgid="6673071268966003928">"Senast öppnade apparna"</string>
     <string name="see_all_apps_title" msgid="1317153498074308438">"Visa alla <xliff:g id="COUNT">%1$d</xliff:g> appar"</string>
-    <string name="recent_app_summary" msgid="3366446669844932300">"<xliff:g id="TIME">^1</xliff:g> sedan"</string>
     <string name="install_all_warning" product="tablet" msgid="8310489909586138165">"Surfplattan och dina personliga uppgifter är mer sårbara när attackerna kommer från okända appar. Genom att installera appar från den här källan accepterar du att du är ansvarig för eventuella skador på surfplattan eller förlust av data som kan uppstå när du använder dessa appar."</string>
     <string name="install_all_warning" product="default" msgid="1952257127370115988">"Mobilen och dina personliga uppgifter är mer sårbara när attackerna kommer från okända appar. Genom att installera appar från den här källan accepterar du att du är ansvarig för eventuella skador på mobilen eller förlust av data som kan uppstå när du använder dessa appar."</string>
     <string name="advanced_settings" msgid="1777249286757067969">"Avancerade inställningar"</string>
@@ -1616,8 +1628,8 @@
     <string name="clear_failed_dlg_text" msgid="5464475937929941008">"Det gick inte att ta bort data för appen."</string>
     <string name="security_settings_desc" product="tablet" msgid="1292421279262430109">"Appen har åtkomst till följande på surfplattan:"</string>
     <string name="security_settings_desc" product="default" msgid="61749028818785244">"Appen har åtkomst till följande på mobilen:"</string>
-    <string name="security_settings_desc_multi" product="tablet" msgid="7300932212437084403">"Den här appen har åtkomst till följande på din surfplatta. I syfte att förbättra prestandan och minska minnesanvändningen är några av dessa behörigheter tillgängliga för <xliff:g id="BASE_APP_NAME">%1$s</xliff:g>, eftersom den körs i samma process som <xliff:g id="ADDITIONAL_APPS_LIST">%2$s</xliff:g> :"</string>
-    <string name="security_settings_desc_multi" product="default" msgid="6610268420793984752">"Den här appen har åtkomst till följande på din mobil. I syfte att förbättra prestandan och minska minnesanvändningen är några av dessa behörigheter tillgängliga för <xliff:g id="BASE_APP_NAME">%1$s</xliff:g>, eftersom den körs i samma process som <xliff:g id="ADDITIONAL_APPS_LIST">%2$s</xliff:g>:"</string>
+    <string name="security_settings_desc_multi" product="tablet" msgid="7300932212437084403">"Den här appen har åtkomst till följande på din surfplatta. För att förbättra prestandan och minska minnesanvändningen är några av dessa behörigheter tillgängliga för <xliff:g id="BASE_APP_NAME">%1$s</xliff:g>, eftersom den körs i samma process som <xliff:g id="ADDITIONAL_APPS_LIST">%2$s</xliff:g> :"</string>
+    <string name="security_settings_desc_multi" product="default" msgid="6610268420793984752">"Den här appen har åtkomst till följande på din mobil. För att förbättra prestandan och minska minnesanvändningen är några av dessa behörigheter tillgängliga för <xliff:g id="BASE_APP_NAME">%1$s</xliff:g>, eftersom den körs i samma process som <xliff:g id="ADDITIONAL_APPS_LIST">%2$s</xliff:g>:"</string>
     <string name="join_two_items" msgid="1336880355987539064">"<xliff:g id="FIRST_ITEM">%1$s</xliff:g> och <xliff:g id="SECOND_ITEM">%2$s</xliff:g>"</string>
     <string name="join_two_unrelated_items" msgid="1873827777191260824">"<xliff:g id="FIRST_ITEM">%1$s</xliff:g>, <xliff:g id="SECOND_ITEM">%2$s</xliff:g>"</string>
     <string name="join_many_items_last" msgid="5925635036718502724">"<xliff:g id="ALL_BUT_LAST_ITEM">%1$s</xliff:g> och <xliff:g id="LAST_ITEM_0">%2$s</xliff:g>"</string>
@@ -1735,7 +1747,7 @@
     <string name="keyboard_assistance_category" msgid="5843634175231134014">"Hjälp med tangentbord"</string>
     <string name="physical_keyboard_title" msgid="8285149877925752042">"Fysiskt tangentbord"</string>
     <string name="show_ime" msgid="2658582193437188227">"Visa virtuellt tangentbord"</string>
-    <string name="show_ime_summary" msgid="8164993045923240698">"Ha kvar den på skärmen när det fysiska tangentbordet används"</string>
+    <string name="show_ime_summary" msgid="8164993045923240698">"Ha kvar det på skärmen när det fysiska tangentbordet används"</string>
     <string name="keyboard_shortcuts_helper" msgid="4839453720463798145">"Hjälp med kortkommandon"</string>
     <string name="keyboard_shortcuts_helper_summary" msgid="5871299901459743288">"Visa tillgängliga genvägar"</string>
     <string name="default_keyboard_layout" msgid="4172606673510531271">"Standard"</string>
@@ -1801,7 +1813,7 @@
     <string name="accessibility_settings_summary" msgid="981260486011624939">"Skärmläsningsprogram, visning och interaktionsinställningar"</string>
     <string name="vision_settings_title" msgid="4204111425716868288">"Syninställningar"</string>
     <string name="vision_settings_description" msgid="5679491180156408260">"Du kan anpassa enheten efter dina behov. Tillgänglighetsfunktionerna kan ändras senare under Inställningar."</string>
-    <string name="vision_settings_suggestion_title" msgid="917294957154878441">"Öka textstorlek"</string>
+    <string name="vision_settings_suggestion_title" msgid="8058794060304707004">"Ändra teckenstorlek"</string>
     <string name="screen_reader_category_title" msgid="7739154903913400641">"Skärmläsningsprogram"</string>
     <string name="audio_and_captions_category_title" msgid="3420727114421447524">"Ljud och text på skärmen"</string>
     <string name="display_category_title" msgid="685461049938269166">"Skärm"</string>
@@ -1838,7 +1850,6 @@
     <string name="accessibility_display_inversion_preference_subtitle" msgid="7052959202195368109">"Kan påverka prestandan"</string>
     <string name="accessibility_autoclick_preference_title" msgid="7014499339068449623">"Klicka när muspekaren slutat röra sig"</string>
     <string name="accessibility_autoclick_delay_preference_title" msgid="3962261178385106006">"Fördröjning före klick"</string>
-    <string name="preference_summary_default_combination" msgid="8532964268242666060">"<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">"PÅ"</string>
     <string name="accessibility_summary_state_disabled" msgid="2241315620132005595">"AV"</string>
     <string name="enable_quick_setting" msgid="2366999897816894536">"Visa i Snabbinställningar"</string>
@@ -1957,12 +1968,14 @@
     <string name="background_activity_summary_on" msgid="649282072540085599">"Appen får köras i bakgrunden när den används"</string>
     <string name="background_activity_summary_off" msgid="7666330699090632040">"Appens bakgrundsaktivitet är begränsad när den inte används"</string>
     <string name="background_activity_summary_disabled" msgid="3710669050484599847">"Appen får inte köras i bakgrunden"</string>
+    <string name="background_activity_summary_whitelisted" msgid="7375400051141016808">"Det går inte att optimera appen för batteriförbrukning"</string>
+    <string name="background_activity_warning_dialog_title" msgid="2216249969149568871">"Vill du begränsa bakgrundsaktivitet?"</string>
+    <string name="background_activity_warning_dialog_text" msgid="7049624449246121981">"Om du begränsar bakgrundaktiviteten för en app kanske den inte fungerar som den ska"</string>
     <string name="device_screen_usage" msgid="3386088035570409683">"Skärmanvändning sedan fulladdning"</string>
     <string name="device_screen_consumption" msgid="4607589286438986687">"Skärmens förbrukning"</string>
     <string name="device_cellular_network" msgid="4724773411762382950">"Genomsökning av mobilnätverk"</string>
-    <string name="power_last_full_charge_summary" msgid="532845389094620657">"<xliff:g id="TIME">^1</xliff:g> sedan"</string>
-    <string name="power_usage_list_summary" msgid="6775339745194635000">"Appanvändning sedan fulladdning (<xliff:g id="TIME">^1</xliff:g> sedan)"</string>
-    <string name="power_usage_list_summary_device" msgid="7036566616386864302">"Enhetsanvändning sedan fulladdning (<xliff:g id="TIME">^1</xliff:g> sedan)"</string>
+    <string name="power_usage_list_summary" msgid="6393929085382334341">"Appanvändning sedan fulladdning (<xliff:g id="RELATIVE_TIME">^1</xliff:g>)"</string>
+    <string name="power_usage_list_summary_device" msgid="4461926045610455423">"Enhetsanvändning sedan fulladdning (<xliff:g id="RELATIVE_TIME">^1</xliff:g>)"</string>
     <string name="screen_usage_summary" msgid="6687403051423153550">"Den totala tidsperiod skärmen har varit på sedan den senaste fulladdningen"</string>
     <string name="device_usage_list_summary" msgid="5623036661468763251">"Enhetsanvändning sedan batteriet var fulladdat"</string>
     <string name="battery_since_unplugged" msgid="338073389740738437">"Batteriförbrukning sedan bortkoppling"</string>
@@ -2208,14 +2221,14 @@
     <string name="credentials_unlock_hint" msgid="2301301378040499348">"Ange lösenordet för uppgiftslagring."</string>
     <string name="credentials_old_password" msgid="7553393815538684028">"Nuvarande lösenord:"</string>
     <string name="credentials_reset_hint" msgid="6297256880896133631">"Vill du ta bort allt innehåll?"</string>
-    <string name="credentials_password_too_short" msgid="7502749986405522663">"Lösenordet måste innehålla minst 8 tecken."</string>
     <string name="credentials_wrong_password" msgid="2541932597104054807">"Fel lösenord."</string>
     <string name="credentials_reset_warning" msgid="5320653011511797600">"Fel lösenord. Du har ett försök till att ange rätt lösenord, därefter raderas uppgiftslagringen"</string>
     <string name="credentials_reset_warning_plural" msgid="6514085665301095279">"Fel lösenord. Du har <xliff:g id="NUMBER">%1$d</xliff:g> försök på dig att ange rätt lösenord, därefter raderas uppgiftslagringen."</string>
     <string name="credentials_erased" msgid="2907836028586342969">"Uppgiftslagringen raderades."</string>
     <string name="credentials_not_erased" msgid="7685932772284216097">"Uppgiftslagringen kunde inte raderas."</string>
     <string name="credentials_enabled" msgid="7588607413349978930">"Uppgiftslagring är aktiverat."</string>
-    <string name="credentials_configure_lock_screen_hint" msgid="6757119179588664966">"Du måste ange en PIN-kod eller ett lösenord för skärmlåset för att kunna använda uppgiftslagring."</string>
+    <string name="credentials_configure_lock_screen_hint" msgid="8058230497337529036">"Enheten måste ha en säker låsskärm innan du kan använda uppgiftslagring"</string>
+    <string name="credentials_configure_lock_screen_button" msgid="253239765216055321">"KONFIGURERA LÅS"</string>
     <string name="usage_access_title" msgid="332333405495457839">"Appar med åtkomst"</string>
     <string name="emergency_tone_title" msgid="1055954530111587114">"Nödsignal"</string>
     <string name="emergency_tone_summary" msgid="722259232924572153">"Ange beteende vid nödsamtal"</string>
@@ -2335,8 +2348,6 @@
     <skip />
     <string name="cant_sync_dialog_title" msgid="2777238588398046285">"Det går inte att synkronisera manuellt"</string>
     <string name="cant_sync_dialog_message" msgid="1938380442159016449">"Synkronisering är inaktiverad för det här objektet. Om du vill ändra inställningen aktiverar du bakgrundsdata och automatisk synkronisering tillfälligt."</string>
-    <string name="wimax_settings" msgid="2655139497028469039">"4G"</string>
-    <string name="status_wimax_mac_address" msgid="8390791848661413416">"4G Mac-adress"</string>
     <string name="enter_password" msgid="8035706727471334122">"Starta Android genom att ange ditt lösenord"</string>
     <string name="enter_pin" msgid="5305333588093263790">"Starta Android genom att ange din pinkod"</string>
     <string name="enter_pattern" msgid="4187435713036808566">"Starta Android genom att rita ditt grafiska lösenord"</string>
@@ -2350,6 +2361,7 @@
     <string name="misc_files_selected_count" msgid="4647048020823912088">"<xliff:g id="NUMBER">%1$d</xliff:g> av <xliff:g id="TOTAL">%2$d</xliff:g> har valts"</string>
     <string name="misc_files_selected_count_bytes" msgid="2876232009069114352">"<xliff:g id="NUMBER">%1$s</xliff:g> av <xliff:g id="TOTAL">%2$s</xliff:g>"</string>
     <string name="select_all" msgid="1562774643280376715">"Markera alla"</string>
+    <string name="data_plan_usage_manage_plans_button_text" msgid="8997761990902708162">"Hantera abonnemang"</string>
     <string name="data_usage_summary_title" msgid="3804110657238092929">"Dataanvändning"</string>
     <string name="data_usage_app_summary_title" msgid="4147258989837459172">"Appens dataanvändning"</string>
     <string name="data_usage_accounting" msgid="7170028915873577387">"Operatörens dataredovisning kan skilja sig från din enhets dataredovisning."</string>
@@ -2435,6 +2447,9 @@
     <string name="data_usage_metered_mobile" msgid="5423305619126978393">"Mobila nätverk"</string>
     <string name="data_usage_metered_wifi" msgid="1761738002328299714">"Wi-Fi-nätverk med datapriser"</string>
     <string name="data_usage_metered_wifi_disabled" msgid="727808462375941567">"Slå på Wi-Fi om du vill välja nätverk med datapriser."</string>
+    <string name="data_usage_metered_auto" msgid="1262028400911918865">"Automatisk"</string>
+    <string name="data_usage_metered_yes" msgid="9217539611385225894">"Med datapriser"</string>
+    <string name="data_usage_metered_no" msgid="4025232961929071789">"Utan datapriser"</string>
     <string name="data_usage_disclaimer" msgid="6887858149980673444">"Operatörens dataredovisning kan skilja sig från din enhets dataredovisning."</string>
     <string name="cryptkeeper_emergency_call" msgid="198578731586097145">"Nödsamtal"</string>
     <string name="cryptkeeper_return_to_call" msgid="5613717339452772491">"Tillbaka till samtal"</string>
@@ -2526,9 +2541,6 @@
     <string name="backup_pw_set_button_text" msgid="2387480910044648795">"Ange lösenord för säkerhetskopia"</string>
     <string name="backup_pw_cancel_button_text" msgid="8845630125391744615">"Avbryt"</string>
     <string name="additional_system_update_settings_list_item_title" msgid="214987609894661992">"Ytterligare systemuppdateringar"</string>
-    <string name="selinux_status_disabled" msgid="924551035552323327">"Inaktiverad"</string>
-    <string name="selinux_status_permissive" msgid="6004965534713398778">"Tillåtande"</string>
-    <string name="selinux_status_enforcing" msgid="2252703756208463329">"Genomdrivande"</string>
     <string name="ssl_ca_cert_warning" msgid="2045866713601984673">"Nätverket kan vara övervakat"</string>
     <string name="done_button" msgid="1991471253042622230">"Klart"</string>
     <plurals name="ssl_ca_cert_dialog_title" formatted="false" msgid="7145092748045794650">
@@ -2571,7 +2583,7 @@
     <string name="user_add_user_message_long" msgid="8562152293752222985">"Du kan dela enheten med andra om du skapar flera användare. Alla användare får sitt eget utrymme som de kan anpassa som de vill med appar, bakgrund och så vidare. Användarna kan även ändra enhetsinställningar som påverkar alla, till exempel Wi‑Fi.\n\nNär du lägger till en ny användare måste han eller hon konfigurera sitt utrymme.\n\nAlla användare kan uppdatera appar för samtliga användares räkning."</string>
     <string name="user_add_user_message_short" msgid="1511354412249044381">"När du lägger till en ny användare måste den personen konfigurera sitt utrymme.\n\nAlla användare kan uppdatera appar för samtliga användares räkning."</string>
     <string name="user_setup_dialog_title" msgid="1765794166801864563">"Konfigurera användare nu?"</string>
-    <string name="user_setup_dialog_message" msgid="1004068621380867148">"Kontrollera att personen har möjlighet att ta enheten och konfigurera sitt utrymme"</string>
+    <string name="user_setup_dialog_message" msgid="1004068621380867148">"Kontrollera att personen finns tillgänglig för att konfigurera sitt utrymme på enheten"</string>
     <string name="user_setup_profile_dialog_message" msgid="3896568553327558731">"Vill du konfigurera en profil nu?"</string>
     <string name="user_setup_button_setup_now" msgid="3391388430158437629">"Konfigurera nu"</string>
     <string name="user_setup_button_setup_later" msgid="3068729597269172401">"Inte nu"</string>
@@ -2729,7 +2741,7 @@
     <string name="network_dashboard_title" msgid="4771589228992391573">"Nätverk och internet"</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="network_dashboard_summary_hotspot" msgid="8494210248613254574">"surfzon"</string>
     <string name="connected_devices_dashboard_title" msgid="2355264951438890709">"Anslutna enheter"</string>
     <string name="connected_devices_dashboard_summary" msgid="2390582103384791904">"Bluetooth, casta, NFC"</string>
     <string name="connected_devices_dashboard_no_nfc_summary" msgid="9106040742715366495">"Bluetooth, casta"</string>
@@ -2803,7 +2815,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">"Telefonens ringsignal"</string>
+    <string name="ringtone_title" msgid="5379026328015343686">"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>
@@ -2871,13 +2883,15 @@
     <string name="notifications_title" msgid="8086372779371204971">"Aviseringar"</string>
     <string name="app_notifications_title" msgid="5810577805218003760">"Appaviseringar"</string>
     <string name="notification_channel_title" msgid="2260666541030178452">"Aviseringskategori"</string>
+    <string name="notification_group_title" msgid="7180506440133859601">"Grupp av aviseringskategorier"</string>
     <string name="notification_importance_title" msgid="848692592679312666">"Relevans"</string>
-    <string name="notification_importance_unspecified" msgid="2196023702875112081">"Låt appen bestämma"</string>
+    <string name="notification_importance_unspecified" msgid="6622173510486113958">"Tillåt ljud"</string>
     <string name="notification_importance_blocked" msgid="7938180808339386300">"Visa aldrig aviseringar"</string>
     <string name="notification_importance_min" msgid="5455049524984686275">"Spela inte upp ljud och visa inte"</string>
     <string name="notification_importance_low" msgid="8881468429453766553">"Inget ljud."</string>
     <string name="notification_importance_default" msgid="5958338024601957516">"Spela upp ljud"</string>
     <string name="notification_importance_high" msgid="2082429479238228527">"Spela upp ljud och visa på skärmen"</string>
+    <string name="notification_importance_high_silent" msgid="2667033773703765252">"Visa på skärmen"</string>
     <string name="notification_importance_min_title" msgid="6974673091137544803">"Låg"</string>
     <string name="notification_importance_low_title" msgid="8131254047772814309">"Medelhög"</string>
     <string name="notification_importance_default_title" msgid="9120383978536089489">"Hög"</string>
@@ -2920,8 +2934,13 @@
     <string name="loading_notification_apps" msgid="5031818677010335895">"Läser in appar ..."</string>
     <string name="app_notifications_off_desc" msgid="4882445501376722969">"Appens aviseringar blockeras av Android och visas inte på enheten"</string>
     <string name="channel_notifications_off_desc" msgid="5899225298718840635">"Denna aviseringskategori blockeras av Android och visas inte på enheten"</string>
+    <string name="channel_group_notifications_off_desc" msgid="1620950416247316370">"Denna aviseringsgrupp blockeras i Android och visas inte på enheten"</string>
     <string name="notification_channels" msgid="5346841743182627500">"Kategorier"</string>
     <string name="notification_channels_other" msgid="5645317113885788226">"Övrigt"</string>
+    <plurals name="notification_group_summary" formatted="false" msgid="3420621520561455358">
+      <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> kategorier</item>
+      <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> kategori</item>
+    </plurals>
     <string name="no_channels" msgid="3077375508177744586">"Den här appen har inte skickat några aviseringar"</string>
     <string name="app_settings_link" msgid="8894946007543660906">"Fler inställningar i appen"</string>
     <string name="app_notification_listing_summary_zero" msgid="6482582965081108108">"Aktiverat för alla appar"</string>
@@ -2998,6 +3017,7 @@
     <string name="zen_mode_from_starred" msgid="2678345811950997027">"Endast från stjärnmärkta kontakter"</string>
     <string name="zen_mode_from_none" msgid="8219706639954614136">"Ingen"</string>
     <string name="zen_mode_alarms" msgid="2165302777886552926">"Alarm"</string>
+    <string name="zen_mode_alarms_summary" msgid="3774926045611788635">"Alarm är alltid prioriterade och ljuder"</string>
     <string name="zen_mode_reminders" msgid="5458502056440485730">"Påminnelser"</string>
     <string name="zen_mode_events" msgid="7914446030988618264">"Händelser"</string>
     <string name="zen_mode_all_callers" msgid="584186167367236922">"Alla ringande"</string>
@@ -3032,6 +3052,7 @@
     <string name="zen_mode_screen_off_visual_interruptions" msgid="4850792880144382633">"När skärmen är avstängd"</string>
     <string name="zen_mode_no_visual_interruptions" msgid="8742776003822778472">"När skärmen är påslagen eller avstängd"</string>
     <string name="notification_app_settings_button" msgid="6685640230371477485">"Aviseringsinställningar"</string>
+    <string name="suggestion_button_text" msgid="3275010948381252006">"OK"</string>
     <string name="device_feedback" msgid="3238056036766293294">"Skicka feedback om den här enheten"</string>
     <string name="restr_pin_enter_admin_pin" msgid="1085834515677448072">"Ange administratörens pinkod:"</string>
     <string name="switch_on_text" msgid="1124106706920572386">"På"</string>
@@ -3066,7 +3087,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">"Länköppning"</string>
+    <string name="app_launch_domain_links_title" msgid="1160925981363706090">"Öppnar länkar"</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>
@@ -3122,7 +3143,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">"Länköppning"</string>
+    <string name="domain_urls_title" msgid="3132983644568821250">"Öppna länkar"</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>
@@ -3146,7 +3167,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">"Appen Telefon"</string>
+    <string name="default_phone_title" msgid="282005908059637350">"Telefonapp"</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>
@@ -3216,6 +3237,7 @@
     <string name="usb_summary_file_transfers" msgid="6435943692610175111">"Filer överförs"</string>
     <string name="usb_summary_photo_transfers" msgid="8440204169576585250">"Foton överförs (PTP)"</string>
     <string name="usb_summary_MIDI" msgid="5687906612187885908">"Enheten används som MIDI"</string>
+    <string name="sms_mirroring_pref" msgid="6475043279147376031">"Sms-spegling"</string>
     <string name="background_check_pref" msgid="7550258400138010979">"Bakgrundskontroll"</string>
     <string name="background_check_title" msgid="4534254315824525593">"Fullständig bakgrundsåtkomst"</string>
     <string name="assist_access_context_title" msgid="2269032346698890257">"Använda text från skärmen"</string>
@@ -3282,7 +3304,7 @@
     <string name="write_settings_title" msgid="4232152481902542284">"Kan ändra systeminställningar"</string>
     <string name="write_system_settings" msgid="3482913590601096763">"Ändra systeminställningar"</string>
     <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="permit_write_settings" msgid="658555006453212691">"Tillåt att systeminställningar ändras"</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>
@@ -3377,9 +3399,12 @@
     <string name="color_temperature" msgid="2070126836910615605">"Sval färgtemperatur"</string>
     <string name="color_temperature_desc" msgid="4793729830226404052">"Använd svalare färger på skärmen"</string>
     <string name="color_temperature_toast" msgid="4974218172133854827">"Stäng av skärmen om du vill tillämpa färgändringen"</string>
-    <string name="telephony_monitor_toast" msgid="7003764250271195384">"Starta om enheten om du vill tillämpa ändringen för Telephony Monitor"</string>
+    <string name="connectivity_monitor_switch" msgid="9059759348648583421">"Connectivity Monitor"</string>
+    <string name="connectivity_monitor_switch_summary" msgid="2828658652378866401">"ConnectivityMonitor samlar in loggar när ett anslutningsproblem upptäcks och uppmanar användaren att skicka in en felrapport"</string>
+    <string name="connectivity_monitor_toast" msgid="5551859612881173028">"Starta om enheten om du vill tillämpa ändringen för Connectivity Monitor"</string>
     <string name="camera_hal_hdrplus_switch" msgid="8377365197105267466">"HAL HDR+ för kamera"</string>
     <string name="camera_hal_hdrplus_toast" msgid="2063703797270055299">"Starta om enheten om du vill tillämpa ändringen HAL HDR+ för kamera"</string>
+    <string name="camera_laser_sensor_switch" msgid="8913588990743234440">"Lasersensor för kamera"</string>
     <string name="ota_disable_automatic_update" msgid="2319639631655915050">"Automatiska systemuppdateringar"</string>
     <string name="usage" msgid="2977875522080448986">"Användning"</string>
     <string name="cellular_data_usage" msgid="2155683719898158203">"Användning av mobildata"</string>
@@ -3401,11 +3426,11 @@
     </plurals>
     <string name="operator_warning" msgid="1862988028996859195">"Operatörens dataredovisning kan skilja sig från enhetens dataredovisning."</string>
     <string name="data_used_template" msgid="3245919669966296505">"<xliff:g id="ID_1">%1$s</xliff:g> har använts"</string>
-    <string name="set_data_warning" msgid="6115364758236594593">"Konfigurera en datavarning"</string>
+    <string name="set_data_warning" msgid="6115364758236594593">"Ställ in en datavarning"</string>
     <string name="data_warning" msgid="209133958008062117">"Datavarning"</string>
     <string name="set_data_limit" msgid="2901526323210516923">"Ange datagräns"</string>
     <string name="data_limit" msgid="1885406964934590552">"Datagräns"</string>
-    <string name="data_usage_template" msgid="392191945602400904">"<xliff:g id="ID_1">%1$s</xliff:g> har använts mellan <xliff:g id="ID_2">%2$s</xliff:g>"</string>
+    <string name="data_usage_template" msgid="2923744765873163859">"<xliff:g id="ID_1">%1$s</xliff:g> användes <xliff:g id="ID_2">%2$s</xliff:g>"</string>
     <string name="configure" msgid="1029654422228677273">"Konfigurera"</string>
     <string name="data_usage_other_apps" msgid="3272872663517382050">"Andra appar som är inkluderade i användningen"</string>
     <plurals name="data_saver_unrestricted_summary" formatted="false" msgid="2635267833484232703">
@@ -3474,7 +3499,7 @@
     <string name="button_confirm_convert_fbe" msgid="7101855374850373091">"Rensa och konvertera"</string>
     <string name="reset_shortcut_manager_throttling" msgid="6495066467198668994">"Återställ anropsbegränsning för ShortcutManager"</string>
     <string name="reset_shortcut_manager_throttling_complete" msgid="1826770872063707900">"Anropsbegränsningen för ShortcutManager har återställts"</string>
-    <string name="notification_suggestion_title" msgid="4506524937307816475">"Hantera aviseringar på låsskärmen"</string>
+    <string name="notification_suggestion_title" msgid="387052719462473500">"Kontrolluppgifter på låsskärm"</string>
     <string name="notification_suggestion_summary" msgid="8521159741445416875">"Visa eller dölja innehåll i aviseringar"</string>
     <string name="page_tab_title_summary" msgid="4070309266374993258">"Alla"</string>
     <string name="page_tab_title_support" msgid="8483187649355540109">"Support och tips"</string>
@@ -3482,7 +3507,7 @@
     <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>
     <string name="premium_sms_access" msgid="4660047004791638305">"Åtkomst till premium-sms"</string>
-    <string name="bluetooth_disabled" msgid="2456198532288640046">"Inte synlig för andra enheter"</string>
+    <string name="bluetooth_disabled" msgid="6244000672828617410">"Av"</string>
     <string name="bluetooth_connected_summary" msgid="7672528674593152862">"Ansluten till <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="bluetooth_connected_multiple_devices_summary" msgid="9173661896296663932">"Ansluten till flera enheter"</string>
     <string name="demo_mode" msgid="2798762752209330277">"Demoläge för systemgränssnitt"</string>
@@ -3568,7 +3593,7 @@
     <string name="ambient_display_pickup_summary" product="tablet" msgid="5435283849947236648">"Visa tid, aviseringsikoner och annan information genom att plocka upp surfplattan."</string>
     <string name="ambient_display_pickup_summary" product="device" msgid="8256669101643381568">"Visa tid, aviseringsikoner och annan information genom att plocka upp enheten."</string>
     <string name="ambient_display_pickup_suggestion_summary" msgid="7014700589991761035">"Kolla aviseringar när skärmen är avstängd"</string>
-    <string name="fingerprint_swipe_for_notifications_title" msgid="5816346492253270243">"Visa aviseringar genom att svepa med fingret"</string>
+    <string name="fingerprint_swipe_for_notifications_title" msgid="5816346492253270243">"Svep med fingret för aviseringar"</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="default" msgid="1770661868393713922">"Visa aviseringar genom att svepa nedåt på fingeravtryckssensorn på baksidan av mobilen."</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="tablet" msgid="902719947767712895">"Visa aviseringar genom att svepa nedåt på fingeravtryckssensorn på baksidan av surfplattan."</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="device" msgid="5372926094116306647">"Visa aviseringar genom att svepa nedåt på fingeravtryckssensorn på baksidan av enheten."</string>
@@ -3584,7 +3609,7 @@
     <string name="web_action_enable_title" msgid="4051513950976670853">"Snabbappar"</string>
     <string name="web_action_enable_summary" msgid="3108127559723396382">"Öppna länkar i appar, även om de inte har installerats"</string>
     <string name="web_action_section_title" msgid="7364647086538399136">"Snabbappar"</string>
-    <string name="instant_apps_account" msgid="1433620209791992528">"Konto för snabbappar"</string>
+    <string name="instant_apps_settings" msgid="8827777916518348213">"Inställningar för Instant Apps"</string>
     <string name="domain_url_section_title" msgid="7046835219056428883">"Installerade appar"</string>
     <string name="automatic_storage_manager_activation_warning" msgid="6353100011690933254">"Ditt lagringsutrymme hanteras nu av lagringshanteraren"</string>
     <string name="account_for_section_header" msgid="5356566418548737121">"Konton som tillhör <xliff:g id="USER_NAME">%1$s</xliff:g>"</string>
@@ -3631,7 +3656,9 @@
     <string name="enterprise_privacy_always_on_vpn_personal" msgid="9217774730260037434">"Always-on för VPN har aktiverats i din personliga profil"</string>
     <string name="enterprise_privacy_always_on_vpn_work" msgid="7244472958208315814">"Always-on för VPN har aktiverats i jobbprofilen"</string>
     <string name="enterprise_privacy_global_http_proxy" msgid="7936664553416257333">"Global HTTP-proxy har angetts"</string>
-    <string name="enterprise_privacy_ca_certs" msgid="5885892204903688909">"Tillförlitlig autentisering"</string>
+    <string name="enterprise_privacy_ca_certs_device" msgid="2019652712782510262">"Tillförlitlig autentisering"</string>
+    <string name="enterprise_privacy_ca_certs_personal" msgid="2279084820904076599">"Tillförlitlig autentisering i din personliga profil"</string>
+    <string name="enterprise_privacy_ca_certs_work" msgid="6187377647815301809">"Tillförlitlig autentisering i din jobbprofil"</string>
     <plurals name="enterprise_privacy_number_ca_certs" formatted="false" msgid="526375234629534165">
       <item quantity="other">Minst <xliff:g id="COUNT_1">%d</xliff:g> CA-certifikat</item>
       <item quantity="one">Minst <xliff:g id="COUNT_0">%d</xliff:g> CA-certifikat</item>
@@ -3690,10 +3717,12 @@
     <string name="storage_manager_indicator_on" msgid="8625551710194584733">"Aktiverat"</string>
     <string name="install_type_instant" msgid="3174425974536078647">"Snabbapp"</string>
     <string name="automatic_storage_manager_deactivation_warning" msgid="5605210730828410482">"Vill du inaktivera lagringshanteraren?"</string>
-    <string name="storage_movies_tv" msgid="5498394447562086890">"Fil- och TV-appar"</string>
+    <string name="storage_movies_tv" msgid="5498394447562086890">"Film- och TV-appar"</string>
     <string name="carrier_provisioning" msgid="4398683675591893169">"Information om operatörsadministration"</string>
     <string name="trigger_carrier_provisioning" msgid="3434865918009286187">"Aktivera operatörsadministration"</string>
     <string name="new_device_suggestion_title" msgid="698847081680980774">"Vad är nytt?"</string>
-    <string name="new_device_suggestion_summary" msgid="7172709269203435870">"Kolla in de fem populäraste funktionerna"</string>
+    <string name="new_device_suggestion_summary" product="default" msgid="206396571522515855">"Ta en rundtur på din nya mobil"</string>
+    <string name="new_device_suggestion_summary" product="tablet" msgid="393751455688210956">"Ta en rundtur på din nya surfplatta"</string>
+    <string name="new_device_suggestion_summary" product="device" msgid="2939870049868336652">"Ta en rundtur på din nya enhet"</string>
     <string name="disabled_low_ram_device" msgid="3751578499721173344">"Den här funktionen är inte tillgänglig på den här enheten."</string>
 </resources>
diff --git a/res/values-sw/arrays.xml b/res/values-sw/arrays.xml
index 3a04de1..4374d27 100644
--- a/res/values-sw/arrays.xml
+++ b/res/values-sw/arrays.xml
@@ -100,8 +100,6 @@
     <!-- no translation found for wifi_security_no_eap:0 (2084555984818107151) -->
     <!-- no translation found for wifi_security_no_eap:1 (397579322683471524) -->
     <!-- no translation found for wifi_security_no_eap:2 (1968820975358150484) -->
-    <!-- no translation found for wifi_ap_security:0 (5251664683198623324) -->
-    <!-- no translation found for wifi_ap_security:1 (7989073072260294673) -->
   <string-array name="wifi_eap_method">
     <item msgid="1160193392455075561">"PEAP"</item>
     <item msgid="7981731051382306293">"TLS"</item>
@@ -232,7 +230,7 @@
   <string-array name="app_ops_categories">
     <item msgid="6358963769537892925">"Eneo"</item>
     <item msgid="255608127647030286">"Binafsi"</item>
-    <item msgid="4588829735729884491">"Utumaji ujumbe"</item>
+    <item msgid="4588829735729884491">"Kutuma ujumbe"</item>
     <item msgid="886742181977884584">"Vyombo vya Habari"</item>
     <item msgid="7924928667052300589">"Kifaa"</item>
   </string-array>
@@ -273,7 +271,7 @@
     <item msgid="2603878814882344450">"sauti kuu"</item>
     <item msgid="7136963238377062018">"kiwango cha sauti"</item>
     <item msgid="4270236897655923007">"sauti ya mlio"</item>
-    <item msgid="6325739889222559394">"sauti ya midia"</item>
+    <item msgid="6325739889222559394">"sauti ya faili"</item>
     <item msgid="5762123934816216821">"sauti ya kengele"</item>
     <item msgid="785049718065337473">"sauti ya arifa"</item>
     <item msgid="6700305533746877052">"sauti ya bluetooth"</item>
diff --git a/res/values-sw/strings.xml b/res/values-sw/strings.xml
index 7655373..dc86aa0 100644
--- a/res/values-sw/strings.xml
+++ b/res/values-sw/strings.xml
@@ -107,7 +107,7 @@
     <string name="bluetooth_name_not_set" msgid="2653752006416027426">"Hakuna jina lililowekwa, inatumia jina la akaunti"</string>
     <string name="bluetooth_scan_for_devices" msgid="9214184305566815727">"Chuja kupata vifaa"</string>
     <string name="bluetooth_rename_device" msgid="4352483834491958740">"Badilisha jina la kifaa hiki"</string>
-    <string name="bluetooth_rename_button" msgid="1648028693822994566">"Ipe jina jipya"</string>
+    <string name="bluetooth_rename_button" msgid="1648028693822994566">"Hifadhi jina jipya"</string>
     <string name="bluetooth_disconnect_title" msgid="7830252930348734303">"Ungependa kuondoa kifaa?"</string>
     <string name="bluetooth_disconnect_all_profiles" product="default" msgid="8208712728668714199">"Muunganisho wa simu yako utaondolewa kwenye <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
     <string name="bluetooth_disconnect_all_profiles" product="tablet" msgid="6611038575213485336">"Muunganisho wa kompyuta yako kibao utaondolewa kwenye <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
@@ -129,7 +129,7 @@
     <string name="bluetooth_no_devices_found" msgid="1085232930277181436">"Hakuna vifaa vya Bluetooth vilivyopatikana karibu."</string>
     <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_notif_message" msgid="5057417127600942904">"Gusa ili uoanishe na <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
     <string name="bluetooth_show_received_files" msgid="3144149432555230410">"Faili zilizopokelewa"</string>
     <string name="device_picker" msgid="4978696506172252813">"Chagua kifaa cha Bluetooth"</string>
     <string name="bluetooth_ask_enablement" msgid="3387222809404177525">"<xliff:g id="APP_NAME">%1$s</xliff:g> inataka kuwasha Bluetooth"</string>
@@ -156,7 +156,7 @@
     <string name="bluetooth_turning_off" msgid="2337747302892025192">"Inazima Bluetooth..."</string>
     <string name="bluetooth_auto_connect" msgid="40711424456733571">"Unganisha-kiotomatiki"</string>
     <string name="bluetooth_connection_permission_request" msgid="4747918249032890077">"Muunganisho wa Bluetooth umeombwa"</string>
-    <string name="bluetooth_connection_notif_message" msgid="3603316575471431846">"Gonga ili uunganishe kwenye \"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>\"."</string>
+    <string name="bluetooth_connection_notif_message" msgid="3603316575471431846">"Gusa ili uunganishe kwenye \"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>\"."</string>
     <string name="bluetooth_connection_dialog_text" msgid="8455427559949998023">"Unataka kuunganishwa kwa\"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>\"?"</string>
     <string name="bluetooth_phonebook_request" msgid="3951420080540915279">"Ombi la kufikia anwani kwenye simu"</string>
     <string name="bluetooth_pb_acceptance_dialog_text" msgid="8930347091018455505">"<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g> inataka kufikia anwani zako na rekodi ya simu zilizopigwa. Ungependa kuipa <xliff:g id="DEVICE_NAME_1">%2$s</xliff:g> idhini ya kufikia?"</string>
@@ -166,7 +166,7 @@
     <string name="bluetooth_map_acceptance_dialog_text" msgid="8712508202081143737">"%1$s inataka kufikia ujumbe wako. Ruhusu ufikiaji kwa %2$s?"</string>
     <string name="bluetooth_sap_request" msgid="2669762224045354417">"Ombi la idhini ya kufikia SIM"</string>
     <string name="bluetooth_sap_acceptance_dialog_text" msgid="4414253873553608690">"<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g> inataka idhini ya kufikia kadi yako ya SIM. Ukiipa idhini ya kufikia kadi ya SIM, itazima muunganisho wa data kwenye kifaa chako katika kipindi ambacho imeunganishwa. Ipe <xliff:g id="DEVICE_NAME_1">%2$s?</xliff:g> idhini ya ufikiaji"</string>
-    <string name="bluetooth_device_name_summary" msgid="4757990010751789977">"Inaonekana kama \'<xliff:g id="DEVICE_NAME">^1</xliff:g>\' kwenye vifaa vingine"</string>
+    <string name="bluetooth_device_name_summary" msgid="522235742194965734">"Inaonekana kama \'<xliff:g id="DEVICE_NAME">^1</xliff:g>\' kwenye vifaa vingine"</string>
     <string name="bluetooth_paired_device_title" msgid="8638994696317952019">"Vifaa vyako"</string>
     <string name="bluetooth_pairing_page_title" msgid="7712127387361962608">"Oanisha kifaa kipya"</string>
     <string name="date_and_time" msgid="9062980487860757694">"Tarehe na saa"</string>
@@ -244,7 +244,7 @@
     <string name="sdcard_settings_bad_removal_status" product="default" msgid="5145797653495907970">"Kadi ya SD iliondolewa ikiwa ingali inatumika!"</string>
     <string name="sdcard_settings_used_bytes_label" msgid="8820289486001170836">"Baiti zilizotumika:"</string>
     <string name="sdcard_settings_scanning_status" product="nosdcard" msgid="7503429447676219564">"Inachanganua hifadhi ya USB ya media..."</string>
-    <string name="sdcard_settings_scanning_status" product="default" msgid="2763464949274455656">"Inakagua ikiwa kadi ya SD ina midia..."</string>
+    <string name="sdcard_settings_scanning_status" product="default" msgid="2763464949274455656">"Inakagua ikiwa kadi ya SD ina faili mpya..."</string>
     <string name="sdcard_settings_read_only_status" product="nosdcard" msgid="3624143937437417788">"Hifadhi ya USB imepachikwa kusoma-tu."</string>
     <string name="sdcard_settings_read_only_status" product="default" msgid="4518291824764698112">"Hifadhi ya SD imepachikwa kusoma-tu."</string>
     <string name="skip_label" msgid="47510779345218297">"Ruka"</string>
@@ -252,7 +252,7 @@
     <string name="language_picker_title" msgid="3596315202551687690">"Lugha"</string>
     <string name="pref_title_lang_selection" msgid="2014920136978776034">"Mapendeleo ya lugha"</string>
     <string name="locale_remove_menu" msgid="7651301406723638854">"Ondoa"</string>
-    <string name="add_a_language" msgid="2330538812283783022">"Ongeza lugha"</string>
+    <string name="add_a_language" msgid="2330538812283783022">"Ongeza lugha nyingine"</string>
     <plurals name="dlg_remove_locales_title" formatted="false" msgid="4276642359346122396">
       <item quantity="other">Ungependa kuondoa lugha zilizochaguliwa?</item>
       <item quantity="one">Ungependa kuondoa lugha iliyochaguliwa?</item>
@@ -297,7 +297,7 @@
     <string name="roaming_disable" msgid="1295279574370898378">"Unganisha huduma ya data wakati niko nje ya mtandao wangu wa kawaida"</string>
     <string name="roaming_reenable_message" msgid="9141007271031717369">"Umepoteza muunganisho wa data kwa sababu uliondoka kwenye mtandao wako wa kawaida ukiwa umezima utumiaji data nje ya mtandao wa kawaida."</string>
     <string name="roaming_turn_it_on_button" msgid="4387601818162120589">"Iwashe"</string>
-    <string name="roaming_warning" msgid="4275443317524544705">"Unaweza kutozwa gharama kubwa."</string>
+    <string name="roaming_warning" msgid="4275443317524544705">"Huenda ukatozwa gharama kubwa."</string>
     <string name="roaming_warning_multiuser" product="tablet" msgid="6458990250829214777">"Unaporuhusu data kupitia mitandao mingine, huenda ukatozwa gharama kubwa za matumizi ya nje!\n\nMpangilio huu unaathiri watumiaji wote kwenye kompyuta hii ndogo."</string>
     <string name="roaming_warning_multiuser" product="default" msgid="6368421100292355440">"Unaporuhusu data kupitia mitandao mingine, huenda ukatozwa gharama kubwa za matumizi ya nje!\n\nMpangilio huu unaathiri watumiaji wote kwenye simu hii."</string>
     <string name="roaming_reenable_title" msgid="6068100976707316772">"Ruhusu data kupitia mitandao mingine?"</string>
@@ -312,6 +312,8 @@
     <string name="zone_auto" msgid="334783869352026648">"Saa za eneo, kiotomatiki"</string>
     <string name="zone_auto_summaryOn" msgid="6142830927278458314">"Tumia saa za eneo kutoka kwa mtandao"</string>
     <string name="zone_auto_summaryOff" msgid="2597745783162041390">"Tumia saa za eneo kutoka kwa mtandao"</string>
+    <string name="date_time_24hour_auto" msgid="2117383168985653422">"Muundo wa saa 24 kiotomatiki"</string>
+    <string name="date_time_24hour_auto_summary" msgid="6351812925651480277">"Tumia mipangilio chaguo-msingi ya eneo la lugha"</string>
     <string name="date_time_24hour_title" msgid="3203537578602803850">"Mfumo wa saa 24"</string>
     <string name="date_time_24hour" msgid="1193032284921000063">"Tumia mpangilio wa saa 24"</string>
     <string name="date_time_set_time_title" msgid="6296795651349047016">"Muda"</string>
@@ -341,7 +343,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="4918904614964215087">"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>
@@ -356,7 +358,7 @@
     <string name="security_settings_fingerprint_preference_title" msgid="2488725232406204350">"Kitambulisho"</string>
     <string name="fingerprint_manage_category_title" msgid="8293801041700001681">"Dhibiti vitambulisho"</string>
     <string name="fingerprint_usage_category_title" msgid="8438526918999536619">"Tumia kitambulisho kwa"</string>
-    <string name="fingerprint_add_title" msgid="1926752654454033904">"Ongeza kitambulisho"</string>
+    <string name="fingerprint_add_title" msgid="1926752654454033904">"Ongeza alama nyingine"</string>
     <string name="fingerprint_enable_keyguard_toggle_title" msgid="5078060939636911795">"kufunga skrini"</string>
     <plurals name="security_settings_fingerprint_preference_summary" formatted="false" msgid="624961700033979880">
       <item quantity="other">Vitambulisho <xliff:g id="COUNT_1">%1$d</xliff:g> vimewekwa</item>
@@ -372,6 +374,9 @@
     <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="1961957425135180242">"Endelea"</string>
+    <string name="setup_fingerprint_enroll_skip_title" msgid="362050541117362034">"Ungependa kuruka hatua ya kuweka alama ya kidole?"</string>
+    <string name="setup_fingerprint_enroll_skip_after_adding_lock_text" msgid="958990414356204763">"Itachukua dakika moja au mbili kuweka mipangilio ya alama ya kidole. Kama utaruka hatua hii, unaweza kuongeza alama ya kidole baadaye katika mipangilio."</string>
+    <string name="lock_screen_intro_skip_title" msgid="4988210105913705679">"Ungependa kuruka hatua ya kufunga skrini?"</string>
     <string name="lock_screen_intro_skip_dialog_text_frp" product="tablet" msgid="1581834104051243425">"Vipengele vya ulinzi wa kifaa havitawashwa. Hutaweza kuwazuia watu wengine kutumia kompyuta kibao hii ikiwa itapotea, itaibiwa au itawekewa mipangilio iliyotoka nayo kiwandani."</string>
     <string name="lock_screen_intro_skip_dialog_text_frp" product="device" msgid="4629503416877189572">"Vipengele vya ulinzi wa kifaa havitawashwa. Hutakuwa na uwezo wa kuzuia watu wengine kutumia kifaa hiki iwapo kitapotea, kitaibiwa au kitawekewa mipangilio kilichotoka nayo kiwandani."</string>
     <string name="lock_screen_intro_skip_dialog_text_frp" product="default" msgid="2423428240245737909">"Vipengele vya ulinzi wa kifaa havitawashwa. Hutaweza kuzuia watu wengine kutumia simu hii iwapo itapotea, itaibiwa au itawekewa mipangilio iliyotoka nayo kiwandani"</string>
@@ -457,7 +462,7 @@
     <string name="setup_lock_settings_picker_title" product="tablet" msgid="90329443364067215">"Linda kompyuta yako kibao"</string>
     <string name="setup_lock_settings_picker_title" product="device" msgid="2399952075134938929">"Linda kifaa chako"</string>
     <string name="setup_lock_settings_picker_title" product="default" msgid="1572244299605153324">"Linda simu yako"</string>
-    <string name="setup_lock_settings_picker_fingerprint_message" msgid="5585650064305600578">"Weka mbinu mbadala ya kufunga skrini ili uimarishe usalama."</string>
+    <string name="lock_settings_picker_fingerprint_added_security_message" msgid="5768002109707648463">"Weka mbinu mbadala ya kufunga skrini ili uimarishe usalama."</string>
     <string name="setup_lock_settings_picker_message" product="tablet" msgid="8919671129189936210">"Wazuie watu wengine kutumia kompyuta kibao hii bila ruhusa yako kwa kuwasha vipengele vya ulinzi wa kifaa. Chagua skrini iliyofungwa unayotaka kutumia."</string>
     <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>
@@ -501,35 +506,35 @@
     <string name="unlock_disable_frp_warning_content_pattern" msgid="8869767290771023461">"Vipengele vya kulinda kifaa havitafanya kazi bila mchoro wako."</string>
     <string name="unlock_disable_frp_warning_content_pattern_fingerprint" msgid="2986105377420905314">"Vipengele vya ulinzi wa kifaa havitafanya kazi bila mchoro wako.<xliff:g id="EMPTY_LINE">
 
-</xliff:g>Alama zako za vidole zilizohifadhiwa pia zitaondolewa kwenye kifaa hiki na hutaweza kufungua simu yako, kuidhinisha ununuzi au kuingia katika akaunti ya programu bila kuvitumia."</string>
+</xliff:g>Alama zako za vidole zilizohifadhiwa pia zitaondolewa kwenye kifaa hiki na hutaweza kufungua simu yako, kuidhinisha ununuzi au kuingia katika akaunti ya programu bila kuzitumia."</string>
     <string name="unlock_disable_frp_warning_content_pin" msgid="586996206210265131">"Vipengele vya ulinzi wa kifaa havitafanya kazi bila PIN yako."</string>
     <string name="unlock_disable_frp_warning_content_pin_fingerprint" msgid="3370462835533123695">"Vipengele vya ulinzi wa kifaa havitafanya kazi bila PIN yako.<xliff:g id="EMPTY_LINE">
 
-</xliff:g>Alama zako za vidole zilizohifadhiwa pia zitaondolewa kwenye kifaa hiki na hutaweza kufungua simu yako, kuidhinisha ununuzi au kuingia katika akaunti ya programu bila kuvitumia."</string>
+</xliff:g>Alama zako za vidole zilizohifadhiwa pia zitaondolewa kwenye kifaa hiki na hutaweza kufungua simu yako, kuidhinisha ununuzi au kuingia katika akaunti ya programu bila kuzitumia."</string>
     <string name="unlock_disable_frp_warning_content_password" msgid="5420612686852555537">"Vipengele vya ulinzi wa kifaa havitafanya kazi bila nenosiri lako."</string>
     <string name="unlock_disable_frp_warning_content_password_fingerprint" msgid="3595476296430536798">"Vipengele vya ulinzi wa kifaa havitafanya kazi bila nenosiri lako.<xliff:g id="EMPTY_LINE">
 
-</xliff:g>Alama zako za vidole zilizohifadhiwa pia zitaondolewa kwenye kifaa hiki na hutaweza kufungua simu yako, kuidhinisha ununuzi au kuingia katika akaunti ya programu bila kuvitumia."</string>
+</xliff:g>Alama zako za vidole zilizohifadhiwa pia zitaondolewa kwenye kifaa hiki na hutaweza kufungua simu yako, kuidhinisha ununuzi au kuingia katika akaunti ya programu bila kuzitumia."</string>
     <string name="unlock_disable_frp_warning_content_unknown" msgid="1550718040483548220">"Vipengele vya ulinzi wa kifaa havitafanya kazi bila kipengele chako cha kufunga skrini."</string>
     <string name="unlock_disable_frp_warning_content_unknown_fingerprint" msgid="3679351662094349506">"Vipengele vya ulinzi wa kifaa havitafanya kazi bila mbinu yako ya kufunga skrini.<xliff:g id="EMPTY_LINE">
 
-</xliff:g>Alama zako za vidole zilizohifadhiwa pia zitaondolewa kwenye kifaa hiki na hutaweza kufungua simu yako, kuidhinisha ununuzi au kuingia katika akaunti ya programu bila kuvitumia."</string>
+</xliff:g>Alama zako za vidole zilizohifadhiwa pia zitaondolewa kwenye kifaa hiki na hutaweza kufungua simu yako, kuidhinisha ununuzi au kuingia katika akaunti ya programu bila kuzitumia."</string>
     <string name="unlock_disable_frp_warning_content_pattern_profile" msgid="8682200103576359918">"Vipengele vya kulinda wasifu havitafanya kazi bila mchoro wako."</string>
     <string name="unlock_disable_frp_warning_content_pattern_fingerprint_profile" msgid="6718155854303231675">"Vipengele vya ulinzi wa wasifu havitafanya kazi bila mchoro wako.<xliff:g id="EMPTY_LINE">
 
-</xliff:g>Alama zako za vidole zilizohifadhiwa pia zitaondolewa kwenye kifaa hiki na hutaweza kufungua simu yako, kuidhinisha ununuzi au kuingia katika akaunti ya programu bila kuvitumia."</string>
+</xliff:g>Alama zako za vidole zilizohifadhiwa pia zitaondolewa kwenye kifaa hiki na hutaweza kufungua wasifu wako, kuidhinisha ununuzi au kuingia katika akaunti ya programu bila kuzitumia."</string>
     <string name="unlock_disable_frp_warning_content_pin_profile" msgid="7790688070593867767">"Vipengele vya kulinda wasifu havitafanya kazi bila PIN yako."</string>
     <string name="unlock_disable_frp_warning_content_pin_fingerprint_profile" msgid="4209564603132870532">"Vipengele vya ulinzi wa wasifu havitafanya kazi bila PIN yako.<xliff:g id="EMPTY_LINE">
 
-</xliff:g>Alama zako za vidole zilizohifadhiwa pia zitaondolewa kwenye kifaa hiki na hutaweza kufungua simu yako, kuidhinisha ununuzi au kuingia katika akaunti ya programu bila kuvitumia."</string>
+</xliff:g>Alama zako za vidole zilizohifadhiwa pia zitaondolewa kwenye kifaa hiki na hutaweza kufungua wasifu wako, kuidhinisha ununuzi au kuingia katika akaunti ya programu bila kuzitumia."</string>
     <string name="unlock_disable_frp_warning_content_password_profile" msgid="7569285520567674461">"Vipengele vya kulinda wasifu havitafanya kazi bila nenosiri lako."</string>
     <string name="unlock_disable_frp_warning_content_password_fingerprint_profile" msgid="2994300676764706047">"Vipengele vya ulinzi wa wasifu havitafanya kazi bila nenosiri lako.<xliff:g id="EMPTY_LINE">
 
-</xliff:g>Alama zako za vidole zilizohifadhiwa pia zitaondolewa kwenye kifaa hiki na hutaweza kufungua simu yako, kuidhinisha ununuzi au kuingia katika akaunti ya programu bila kuvitumia."</string>
+</xliff:g>Alama zako za vidole zilizohifadhiwa pia zitaondolewa kwenye kifaa hiki na hutaweza kufungua wasifu wako, kuidhinisha ununuzi au kuingia katika akaunti ya programu bila kuzitumia."</string>
     <string name="unlock_disable_frp_warning_content_unknown_profile" msgid="6984215718701688202">"Vipengele vya kulinda wasifu havitafanya kazi bila kipengele chako cha kufunga skrini."</string>
     <string name="unlock_disable_frp_warning_content_unknown_fingerprint_profile" msgid="4994062501123299418">"Vipengele vya ulinzi wa wasifu havitafanya kazi bila mbinu yako ya kufunga skrini.<xliff:g id="EMPTY_LINE">
 
-</xliff:g>Alama zako za vidole zilizohifadhiwa pia zitaondolewa kwenye kifaa hiki na hutaweza kufungua simu yako, kuidhinisha ununuzi au kuingia katika akaunti ya programu bila kuvitumia."</string>
+</xliff:g>Alama zako za vidole zilizohifadhiwa pia zitaondolewa kwenye kifaa hiki na hutaweza kufungua wasifu wako, kuidhinisha ununuzi au kuingia katika akaunti ya programu bila kuzitumia."</string>
     <string name="unlock_disable_frp_warning_ok" msgid="7075138677177748705">"Ndiyo, ondoa"</string>
     <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>
@@ -586,8 +591,9 @@
     </plurals>
     <string name="lockpassword_password_recently_used" msgid="942665351220525547">"Msimamizi wa kifaa haruhusu kutumia nenosiri ulilotumia hivi majuzi"</string>
     <string name="lockpassword_pin_no_sequential_digits" msgid="680765285206990584">"Haturuhusi mpangilio wa kupanda, kushuka au kujirudia kwa tarakimu"</string>
-    <string name="lockpassword_ok_label" msgid="313822574062553672">"Sawa"</string>
+    <string name="lockpassword_confirm_label" msgid="8176726201389902380">"Thibitisha"</string>
     <string name="lockpassword_cancel_label" msgid="8818529276331121899">"Ghairi"</string>
+    <string name="lockpassword_clear_label" msgid="5724429464960458155">"Futa"</string>
     <string name="lockpattern_tutorial_cancel_label" msgid="6431583477570493261">"Ghairi"</string>
     <string name="lockpattern_tutorial_continue_label" msgid="3559793618653400434">"Ifuatayo"</string>
     <string name="lock_setup" msgid="3355847066343753943">"Usanidi umekamilika."</string>
@@ -647,7 +653,7 @@
     <string name="bluetooth_device_context_connect_advanced" msgid="2643129703569788771">"Chaguo…"</string>
     <string name="bluetooth_menu_advanced" msgid="8572178316357220524">"Mipangilio ya kina"</string>
     <string name="bluetooth_advanced_titlebar" msgid="2142159726881547669">"Bluetooth mahiri"</string>
-    <string name="bluetooth_empty_list_bluetooth_off" msgid="6351930724051893423">"Bluetooth ikiwa imewashwa, kifaa chako kinaweza kuwasiliana na vifaa vingine vyenye Bluetooth vilivyo karibu."</string>
+    <string name="bluetooth_empty_list_bluetooth_off" msgid="6351930724051893423">"Wakati Bluetooth imewashwa, kifaa chako kinaweza kuwasiliana na vifaa vingine vyenye Bluetooth vilivyo karibu."</string>
     <string name="ble_scan_notify_text" msgid="1295915006005700650">"Ili kuboresha usahihi wa kutambua mahali, programu na huduma za mfumo bado zinaweza kutambua vifaa vyenye Bluetooth. Unaweza kubadilisha hali hii katika <xliff:g id="LINK_BEGIN_0">LINK_BEGIN</xliff:g>mipangilio ya kutafuta<xliff:g id="LINK_END_1">LINK_END</xliff:g>."</string>
     <string name="bluetooth_connect_failed" msgid="4500234659813241053">"Imeshindwa kuunganisha. Jaribu tena."</string>
     <string name="device_details_title" msgid="6576953269221085300">"Maelezo ya kifaa"</string>
@@ -662,20 +668,20 @@
     <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>
     <string name="bluetooth_disconnect_hid_profile" msgid="3282295189719352075">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> itatenganishwa kutoka kwa kifaa cha kuingiza."</string>
     <string name="bluetooth_disconnect_pan_user_profile" msgid="8037627994382458698">"Ufikivu wa mtandao kupitia <xliff:g id="DEVICE_NAME">%1$s</xliff:g>utakatishwa."</string>
-    <string name="bluetooth_disconnect_pan_nap_profile" product="tablet" msgid="1262792320446274407">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> itakakatishwa muunganisho wa kushiriki muunganisho wa simu ya Mtandao."</string>
-    <string name="bluetooth_disconnect_pan_nap_profile" product="default" msgid="5700332050175684571">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> itakakatishwa muunganisho wa kushiriki muunganisho wa simu ya Mtandao."</string>
+    <string name="bluetooth_disconnect_pan_nap_profile" product="tablet" msgid="8355910926439312604">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> itaondolewa kwenye muunganisho wa intaneti wa kompyuta hii kibao."</string>
+    <string name="bluetooth_disconnect_pan_nap_profile" product="default" msgid="6251611115860359886">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> itaondolewa kwenye muunganisho wa intaneti wa simu hii."</string>
     <string name="bluetooth_device_advanced_title" msgid="6066342531927499308">"Kifaa cha Bluetooth kilicholinganishwa"</string>
     <string name="bluetooth_device_advanced_online_mode_title" msgid="3689050071425683114">"Unganisha"</string>
     <string name="bluetooth_device_advanced_online_mode_summary" msgid="1204424107263248336">"Unganisha kwa kifaa cha Bluetooth"</string>
     <string name="bluetooth_device_advanced_profile_header_title" msgid="102745381968579605">"Tumia kwa"</string>
-    <string name="bluetooth_device_advanced_rename_device" msgid="5148578059584955791">"Ipe jina jipya"</string>
+    <string name="bluetooth_device_advanced_rename_device" msgid="5148578059584955791">"Badilisha jina"</string>
     <string name="bluetooth_device_advanced_enable_opp_title" msgid="8222550640371627365">"Ruhusu mahamisho ya faili inayoingia"</string>
-    <string name="bluetooth_pan_user_profile_summary_connected" msgid="4602294638909590612">"Umeunganishwa kwa kifaa cha ufikia Mtandao"</string>
-    <string name="bluetooth_pan_nap_profile_summary_connected" msgid="1561383706411975199">"Kushiriki muunganisho wa mtandao wa nyumbani na kifaa"</string>
+    <string name="bluetooth_pan_user_profile_summary_connected" msgid="6436258151814414028">"Imeunganishwa kwenye kifaa ili kufikia intaneti"</string>
+    <string name="bluetooth_pan_nap_profile_summary_connected" msgid="1322694224800769308">"Inashiriki muunganisho wa intaneti wa kifaa na kifaa kingine"</string>
     <string name="bluetooth_dock_settings" msgid="3218335822716052885">"Mipangilio ya Gati"</string>
     <string name="bluetooth_dock_settings_title" msgid="5543069893044375188">"Tumia dock ya sauti"</string>
     <string name="bluetooth_dock_settings_headset" msgid="1001821426078644650">"Kama simu ya spika"</string>
-    <string name="bluetooth_dock_settings_a2dp" msgid="8791004998846630574">"Kwa muziki na midia"</string>
+    <string name="bluetooth_dock_settings_a2dp" msgid="8791004998846630574">"lli kupata muziki na faili zingine"</string>
     <string name="bluetooth_dock_settings_remember" msgid="5551459057010609115">"Kumbuka mipangilio"</string>
     <string name="wifi_display_settings_title" msgid="8740852850033480136">"Tuma"</string>
     <string name="wifi_display_enable_menu_item" msgid="4883036464138167674">"Washa kuonyesha skrini bila kutumia waya"</string>
@@ -702,9 +708,9 @@
     <string name="android_beam_settings_title" msgid="7832812974600338649">"Android Beam"</string>
     <string name="android_beam_on_summary" msgid="3618057099355636830">"Programu iko tayari kusambaza maudhui kupitia NFC"</string>
     <string name="android_beam_off_summary" msgid="4663095428454779138">"Imezimwa"</string>
-    <string name="android_beam_disabled_summary" msgid="1737782116894793393">"Hazipatikani kwa sababu NFC imezimwa"</string>
+    <string name="android_beam_disabled_summary" msgid="1737782116894793393">"Haipatikani kwa sababu NFC imezimwa"</string>
     <string name="android_beam_label" msgid="6257036050366775040">"Android Beam"</string>
-    <string name="android_beam_explained" msgid="1810540319385192758">"Unapowasha kipengele hiki, unaweza kutuma maudhui ya programu kwenye kifaa kingine kinachoweza kutumia NFC kwa kuviweka vifaa pamoja. Kwa mfano, unaweza kutuma kurasa za wavuti, video za YouTube, anwani na mengineyo.\n\nWeka tu vifaa pamoja (kwa kuvigusisha sehemu za nyuma) na ugonge skrini yako. Programu itabaini ni nini kitatumwa."</string>
+    <string name="android_beam_explained" msgid="1810540319385192758">"Unapowasha kipengele hiki, unaweza kutuma maudhui ya programu kwenye kifaa kingine kinachoweza kutumia NFC kwa kuviweka vifaa pamoja. Kwa mfano, unaweza kutuma kurasa za wavuti, video za YouTube, anwani na mengineyo.\n\nWeka tu vifaa pamoja (kwa kuvigusisha sehemu za nyuma) na uguse skrini yako. Programu itabaini kile kitatumwa."</string>
     <string name="wifi_quick_toggle_title" msgid="8850161330437693895">"Wi-Fi"</string>
     <string name="wifi_quick_toggle_summary" msgid="2696547080481267642">"Washa Wi-Fi"</string>
     <string name="wifi_settings" msgid="29722149822540994">"Wi-Fi"</string>
@@ -724,14 +730,14 @@
     <string name="wifi_wakeup_summary_scanning_disabled" msgid="7247227922074840445">"Hakipatikani kwa sababu utafutaji wa mitandao ya Wi-Fi umezimwa"</string>
     <string name="wifi_wakeup_summary_scoring_disabled" msgid="108339002136866897">"Chagua mtoa huduma wa ukadiriaji wa mtandao ili utumie kipengele hiki"</string>
     <string name="wifi_poor_network_detection" msgid="4925789238170207169">"Epuka miunganisho mibovu"</string>
-    <string name="wifi_poor_network_detection_summary" msgid="2784135142239546291">"Usitumie mtandao wa Wi-Fi ambao hauna muunganisho mzuri wa Intaneti"</string>
-    <string name="wifi_avoid_poor_network_detection_summary" msgid="4674423884870027498">"Tumia mitandao yenye muunganisho bora wa Intaneti pekee"</string>
+    <string name="wifi_poor_network_detection_summary" msgid="7016103106105907127">"Usitumie mtandao wa Wi-Fi isipokuwa uwe na muunganisho thabiti wa intaneti"</string>
+    <string name="wifi_avoid_poor_network_detection_summary" msgid="1644292503152790501">"Tumia tu mitandao yenye muunganisho thabiti wa intaneti"</string>
     <string name="use_open_wifi_automatically_title" msgid="6851951242903078588">"Unganisha kwenye mitandao wazi"</string>
     <string name="use_open_wifi_automatically_summary" msgid="2982091714252931713">"Unganisha kiotomatiki kwenye mitandao ya umma ya ubora wa juu"</string>
     <string name="use_open_wifi_automatically_summary_scoring_disabled" msgid="593964217679325831">"Chagua mtoa huduma wa ukadiriaji wa mtandao ili utumie kipengele hiki"</string>
     <string name="use_open_wifi_automatically_summary_scorer_unsupported_disabled" msgid="8472122600853650258">"Chagua mtoa huduma wa ukadiriaji wa mtandao anayeruhusiwa ili utumie kipengele hiki"</string>
     <string name="wifi_install_credentials" msgid="3551143317298272860">"Sakinisha vyeti"</string>
-    <string name="wifi_scan_notify_text" msgid="5593805423071186757">"Ili kuboresha usahihi wa kutambua mahali, programu na huduma za mifumo bado zinaweza kutafuta mitandao ya Wi-Fi. Unaweza kubadilisha hali hii katika <xliff:g id="LINK_BEGIN_0">LINK_BEGIN</xliff:g>mipangilio ya kutafuta<xliff:g id="LINK_END_1">LINK_END</xliff:g>."</string>
+    <string name="wifi_scan_notify_text" msgid="5593805423071186757">"Ili kuboresha usahihi wa kutambua mahali, programu na huduma za mfumo bado zinaweza kutafuta mitandao ya Wi-Fi. Unaweza kubadilisha hali hii katika <xliff:g id="LINK_BEGIN_0">LINK_BEGIN</xliff:g>mipangilio ya kutafuta<xliff:g id="LINK_END_1">LINK_END</xliff:g>."</string>
     <string name="wifi_scan_notify_text_scanning_off" msgid="3426075479272242098">"Ili kuboresha usahihi wa data ya mahali, washa utafutaji wa Wi-Fi katika <xliff:g id="LINK_BEGIN_0">LINK_BEGIN</xliff:g>mipangilio ya utafutaji<xliff:g id="LINK_END_1">LINK_END</xliff:g>."</string>
     <string name="wifi_scan_notify_remember_choice" msgid="7104867814641144485">"Usionyeshe tena"</string>
     <string name="wifi_setting_sleep_policy_title" msgid="5149574280392680092">"Wi-Fi ikae ikiwa imewashwa wakati kifaa kiko katika hali tuli"</string>
@@ -741,9 +747,9 @@
     <string name="wifi_suspend_optimizations" msgid="1220174276403689487">"Uboreshaji wa Wi-Fi"</string>
     <string name="wifi_suspend_optimizations_summary" msgid="4151428966089116856">"Punguza matumizi ya betri wakati Wi-Fi imewashwa"</string>
     <string name="wifi_limit_optimizations_summary" msgid="9000801068363468950">"Dhibiti betri inayotumiwa na Wi-Fi"</string>
-    <string name="wifi_switch_away_when_unvalidated" msgid="1707247692180853058">"Tumia data ya mtandao wa simu muunganisho wa Wi-Fi ukipotea."</string>
+    <string name="wifi_switch_away_when_unvalidated" msgid="8593144541347373394">"Tumia data ya mtandao wa simu wakati muunganisho wa Wi-Fi umekatika."</string>
     <string name="wifi_cellular_data_fallback_title" msgid="8753386877755616476">"Tumia data ya mtandao wa simu kiotomatiki"</string>
-    <string name="wifi_cellular_data_fallback_summary" msgid="6375399280719867214">"Tumia data ya mtandao wa simu wakati Wi-Fi haina muunganisho wa Intaneti. Huenda ukalipia data utakayotumia."</string>
+    <string name="wifi_cellular_data_fallback_summary" msgid="1403505355490119307">"Tumia data ya mtandao wa simu wakati Wi-Fi haina muunganisho wa intaneti. Huenda ukalipia data utakayotumia."</string>
     <string name="wifi_add_network" msgid="6234851776910938957">"Ongeza mtandao"</string>
     <string name="wifi_configure_settings_preference_title" msgid="2913345003906899146">"Mapendeleo ya Wi‑Fi"</string>
     <string name="wifi_configure_settings_preference_summary_wakeup_on" msgid="646393113104367290">"Wi‑Fi hutumika tena kiotomatiki"</string>
@@ -767,8 +773,8 @@
     <string name="wifi_more" msgid="3195296805089107950">"Zaidi"</string>
     <string name="wifi_setup_wps" msgid="8128702488486283957">"Usanidi kiotomatiki (WPS)"</string>
     <string name="wifi_show_advanced" msgid="3409422789616520979">"Chaguo za kina"</string>
-    <string name="wifi_advanced_toggle_description_expanded" msgid="2380600578544493084">"Orodha ya menyu kunjuzi ya Chaguo za Kina. Gonga mara mbili ili ukunje."</string>
-    <string name="wifi_advanced_toggle_description_collapsed" msgid="1463812308429197263">"Orodha ya menyu kunjuzi ya Chaguo za Kina. Gonga mara mbili ili upanue."</string>
+    <string name="wifi_advanced_toggle_description_expanded" msgid="2380600578544493084">"Orodha ya menyu kunjuzi ya Chaguo za Kina. Gusa mara mbili ili ukunje."</string>
+    <string name="wifi_advanced_toggle_description_collapsed" msgid="1463812308429197263">"Orodha ya menyu kunjuzi ya Chaguo za Kina. Gusa mara mbili ili upanue."</string>
     <string name="wifi_wps_setup_title" msgid="8207552222481570175">"Usanidi Uliolindwa na Wi-Fi"</string>
     <string name="wifi_wps_setup_msg" msgid="315174329121275092">"Inaanzisha WPS ..."</string>
     <string name="wifi_wps_onstart_pbc" msgid="817003360936932340">"Bonyeza kitufe cha Wi‑Fi Protected Setup kwenye ruta yako. Inaweza kuitwa \'\'WPS\'\' au kuwekwa alama hii:"</string>
@@ -781,6 +787,7 @@
     <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>
@@ -817,6 +824,8 @@
     <string name="wifi_wps_available_first_item" msgid="4422547079984583502">"WPS inapatikana"</string>
     <string name="wifi_wps_available_second_item" msgid="8427520131718215301">" WPS inapatikana"</string>
     <string name="wifi_wps_nfc_enter_password" msgid="2288214226916117159">"Weka nenosiri la mtandao wako"</string>
+    <string name="wifi_carrier_connect" msgid="8174696557882299911">"Mtandao wa mtoa huduma wa Wi‑Fi"</string>
+    <string name="wifi_carrier_content" msgid="4634077285415851933">"Unganisha kupitia <xliff:g id="NAME">%1%s</xliff:g>"</string>
     <string name="wifi_scan_always_turnon_message" msgid="203123538572122989">"Ili kuboresha usahihi wa mahali na kwa madhumuni mengine, <xliff:g id="APP_NAME">%1$s</xliff:g> inataka kuwasha ukaguaji mitandao, hata wakati Wi-Fi imezimwa.\n\nJe, ungependa kuruhusu programu zote ambazo zingependa kukagua ziweza kufanya hivyo?"</string>
     <string name="wifi_scan_always_turnoff_message" msgid="5538901671131941043">"Ili uzime hii, nenda kwenye Mahiri katika menyu ya vipengee vya ziada."</string>
     <string name="wifi_scan_always_confirm_allow" msgid="5355973075896817232">"Ruhusu"</string>
@@ -824,9 +833,9 @@
     <string name="wifi_hotspot_title" msgid="7726205804813286950">"ngependa kuingia katika akaunti ili uunganishe?"</string>
     <string name="wifi_hotspot_message" msgid="3673833421453455747">"<xliff:g id="APP_NAME">%1$s</xliff:g> inahitaji uingie katika akaunti mtandaoni kabla ya kuunganisha mtandao."</string>
     <string name="wifi_hotspot_connect" msgid="5065506390164939225">"UNGANISHA"</string>
-    <string name="no_internet_access_text" msgid="7133561752896706392">"Mtandao huu hauna Intaneti. Ungetaka kuunganishwa?"</string>
+    <string name="no_internet_access_text" msgid="5926979351959279577">"Mtandao huu hauna intaneti. Utaendelea kuutumia?"</string>
     <string name="no_internet_access_remember" msgid="4697314331614625075">"Usiulizie mtandao huu tena"</string>
-    <string name="lost_internet_access_title" msgid="6228530645663584505">"Wi-Fi haijaunganishwa kwenye Intaneti"</string>
+    <string name="lost_internet_access_title" msgid="5779478650636392426">"Muunganisho wa Wi-Fi umekatika"</string>
     <string name="lost_internet_access_text" msgid="9029649339816197345">"Unaweza kutumia data ya mtandao wa simu wakati wowote Wi-Fi inapokuwa na muunganisho dhaifu. Huenda ukalipia ada ya kutumia data."</string>
     <string name="lost_internet_access_switch" msgid="2262459569601190039">"Tumia data ya mtandao wa simu"</string>
     <string name="lost_internet_access_cancel" msgid="338273139419871110">"Endelea kutumia Wi-Fi"</string>
@@ -834,6 +843,7 @@
     <string name="wifi_connect" msgid="1076622875777072845">"Unganisha"</string>
     <string name="wifi_failed_connect_message" msgid="8491902558970292871">"Imeshindwa kuunganisha kwa mtandao"</string>
     <string name="wifi_forget" msgid="8168174695608386644">"Sahau"</string>
+    <string name="wifi_modify" msgid="6100248070440710782">"Rekebisha"</string>
     <string name="wifi_failed_forget_message" msgid="1348172929201654986">"Imeshindwa kusahau mtandao"</string>
     <string name="wifi_save" msgid="3331121567988522826">"Hifadhi"</string>
     <string name="wifi_failed_save_message" msgid="6650004874143815692">"Imeshindwa kuhifadhi mtandao"</string>
@@ -846,6 +856,7 @@
     <string name="wifi_advanced_titlebar" msgid="4485841401774142908">"Wi-Fi mahiri"</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_title" msgid="8954667664081737098">"Maelezo ya mtandao"</string>
     <string name="wifi_details_subnet_mask" msgid="6720279144174924410">"Mfano wa kijimtandao"</string>
     <string name="wifi_details_dns" msgid="8648826607751830768">"DNS"</string>
     <string name="wifi_details_ipv6_address_header" msgid="6734119149106422148">"Anwani za IPv6"</string>
@@ -878,18 +889,17 @@
     <string name="wifi_p2p_cancel_connect_title" msgid="255267538099324413">"Ghairi mwaliko?"</string>
     <string name="wifi_p2p_cancel_connect_message" msgid="7477756213423749402">"Je, unataka kughairi mwaliko wa kuungana na <xliff:g id="PEER_NAME">%1$s</xliff:g>?"</string>
     <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_off_subtext" msgid="5466126533609394170">"Haishiriki Intaneti au maudhui na vifaa vingine"</string>
-    <string name="wifi_hotspot_tethering_on_subtext" product="tablet" msgid="5752490509369962007">"Inashiriki muunganisho wa Intaneti wa kompyuta hii kibao kupitia mtandao-hewa"</string>
-    <string name="wifi_hotspot_tethering_on_subtext" product="default" msgid="6461075246164300670">"Inashiriki muunganisho wa Intaneti wa simu hii kupitia mtandao-hewa"</string>
-    <string name="wifi_hotspot_on_local_only_subtext" msgid="2068110388011294735">"Programu inashiriki maudhui. Ili kushiriki muunganisho wa Intaneti, zima mtandao-hewa, kisha uuwashe"</string>
-    <string name="wifi_hotspot_name_title" msgid="1341735529132128887">"Jina la WiFi"</string>
+    <string name="wifi_hotspot_off_subtext" msgid="2199911382555864644">"Haishiriki intaneti au maudhui na vifaa vingine"</string>
+    <string name="wifi_hotspot_tethering_on_subtext" product="tablet" msgid="5936710887156133458">"Inashiriki muunganisho wa intaneti wa kompyuta hii kibao kupitia kipengele cha mtandao pepe"</string>
+    <string name="wifi_hotspot_tethering_on_subtext" product="default" msgid="5556202634866621632">"Inashiriki muunganisho wa intaneti wa simu hii kupitia mtandao pepe"</string>
+    <string name="wifi_hotspot_on_local_only_subtext" msgid="5017191966153008">"Programu inashiriki maudhui. Ili ushiriki muunganisho wa intaneti, zima mtandao pepe, kisha uuwashe"</string>
+    <string name="wifi_hotspot_name_title" msgid="8237000746618636778">"Jina la mtandao-hewa"</string>
     <string name="wifi_hotspot_name_summary_connecting" msgid="3378299995508671967">"Inawasha <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>..."</string>
     <string name="wifi_hotspot_name_summary_connected" msgid="3888672084861445362">"Vifaa vingine vinaweza kuunganisha kwenye <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>"</string>
-    <string name="wifi_hotspot_password_title" msgid="1955592302902091281">"Nenosiri la Wi-Fi"</string>
+    <string name="wifi_hotspot_password_title" msgid="8676859981917573801">"Nenosiri la mtandao-hewa"</string>
     <string name="wifi_hotspot_ap_band_title" msgid="1165801173359290681">"Bendi ya AP"</string>
-    <string name="wifi_hotspot_footer_info_regular" msgid="1203489406068036455">"Tumia kipengele cha mtandao-hewa kuunda mtandao wa Wi-Fi kwa vifaa vyako vingine. Mtandao-hewa hutoa huduma ya Intaneti ikitumia muunganisho wako wa  mtandao wa simu za mkononi. Unaweza kutozwa ada za ziada za kutumia data ya mtandao wa simu."</string>
+    <string name="wifi_hotspot_footer_info_regular" msgid="4789553667374849566">"Tumia kipengele cha mtandao pepe kuunda mtandao wa Wi-Fi kwa ajili ya vifaa vyako vingine. Mtandao pepe hutoa huduma ya intaneti ikitumia muunganisho wa data kwa simu za mkononi. Huenda ukalipia ada za kutumia data ya mtandao wa simu."</string>
     <string name="wifi_hotspot_footer_info_local_only" msgid="857988412470694109">"Programu zinaweza kuunda mtandao-hewa ili kushiriki maudhui na vifaa vilivyo karibu."</string>
     <string name="wifi_tether_starting" msgid="1322237938998639724">"Inawezesha mtandao-hewa…"</string>
     <string name="wifi_tether_stopping" msgid="4835852171686388107">"Inazima intaneti..."</string>
@@ -898,7 +908,6 @@
     <string name="wifi_tether_configure_ap_text" msgid="7974681394041609308">"Weka intaneti ya Wi-Fi ya kusambazwa"</string>
     <string name="wifi_hotspot_configure_ap_text" msgid="5478614731464220432">"Sanidi mtandao-hewa wa Wi-Fi"</string>
     <string name="wifi_hotspot_configure_ap_text_summary" msgid="5560680057727007011">"Mtandao pepe wa AndroidAP WPA2 PSK"</string>
-    <string name="wifi_tether_configure_subtext" msgid="2050196439900426456">"Mtandao-hewa wa <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">"Upigaji simu kwa Wi-Fi"</string>
     <string name="wifi_calling_suggestion_title" msgid="9008010480466359578">"Washa kipengele cha Kupiga Simu Kupitia Wi-Fi"</string>
@@ -938,8 +947,8 @@
   </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="emergency_address_title" msgid="932729250447887545">"Anwani ya Dharura"</string>
+    <string name="emergency_address_summary" msgid="7751971156196115129">"Inatumika kama anwani ya mahali ulipo ikiwa utapiga simu ukitumia Wi‑Fi"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"Skrini"</string>
     <string name="sound_settings" msgid="5534671337768745343">"Sauti"</string>
     <string name="all_volume_title" msgid="4296957391257836961">"Sauti"</string>
@@ -966,7 +975,7 @@
     <string name="volume_notification_description" msgid="5810902320215328321">"Arifa"</string>
     <string name="volume_alarm_description" msgid="8322615148532654841">"Kengele"</string>
     <string name="volume_ring_mute" msgid="3018992671608737202">"Zima mlio wa simu na arifa"</string>
-    <string name="volume_media_mute" msgid="3399059928695998166">"Zima sauti ya muziki na midia nyingine"</string>
+    <string name="volume_media_mute" msgid="3399059928695998166">"Zima sauti ya muziki na maudhui mengine"</string>
     <string name="volume_notification_mute" msgid="7955193480006444159">"Puuza arifa"</string>
     <string name="volume_alarm_mute" msgid="4452239420351035936">"Zima kengele"</string>
     <string name="dock_settings" msgid="1820107306693002541">"Gati"</string>
@@ -992,10 +1001,14 @@
     <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">"Haikupata matokeo"</string>
+    <string name="search_settings_no_results" msgid="8799027492641230999">"Hakuna matokeo yoyote yaliyopatikana"</string>
+    <string name="search_clear_history" msgid="4196658962573162457">"Futa historia"</string>
     <string name="display_settings" msgid="7965901687241669598">"Kwenye Skrini"</string>
     <string name="accelerometer_title" msgid="7854608399547349157">"Skrini ijizungushe kiotomatiki"</string>
-    <string name="color_mode_title" msgid="3159275920408338215">"Rangi dhahiri"</string>
+    <string name="color_mode_title" msgid="9186249332902370471">"Rangi"</string>
+    <string name="color_mode_option_natural" msgid="5013837483986772758">"Asili"</string>
+    <string name="color_mode_option_boosted" msgid="8588223970257287524">"Imeongezwa Rangi"</string>
+    <string name="color_mode_option_saturated" msgid="4569683960058798843">"Imekolezwa"</string>
     <string name="accelerometer_summary_on" product="tablet" msgid="429982132339828942">"Badilisha uelekezo kiotomatiki wakati unazungusha kompyuta ndogo"</string>
     <string name="accelerometer_summary_on" product="default" msgid="1133737282813048021">"Badili uelekezaji kiotomatiki wakati wa kuzungusha simu"</string>
     <string name="accelerometer_summary_off" product="tablet" msgid="4781734213242521682">"Badilisha uelekezo kiotomatiki wakati unazungusha kompyuta ndogo"</string>
@@ -1049,14 +1062,14 @@
     <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 ikiwa imeambatishwa"</string>
+    <string name="screensaver_settings_summary_either_long" msgid="7302740999250873332">"Inapochaji au wakati 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">"Haijawahi"</string>
+    <string name="screensaver_settings_summary_never" msgid="5165622985174349585">"Isiwahi"</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">"Wakati wa kuanza"</string>
+    <string name="screensaver_settings_when_to_dream" msgid="7262410541382890146">"Ianze lini?"</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>
@@ -1114,15 +1127,16 @@
     <string name="system_update_settings_list_item_title" msgid="3342887311059985961">"Masasisho ya mfumo"</string>
     <string name="system_update_settings_list_item_summary" msgid="3853057315907710747"></string>
     <string name="firmware_version" msgid="4801135784886859972">"Toleo la Android"</string>
+    <string name="firmware_title" msgid="5203122368389157877">"Android"</string>
     <string name="security_patch" msgid="8438384045870296634">"Kiwango cha kuzuia athari za usalama kwenye Android"</string>
     <string name="model_info" msgid="1952009518045740889">"Muundo"</string>
+    <string name="model_summary" msgid="8306235877567782987">"Muundo: %1$s"</string>
     <string name="hardware_info" msgid="2605080746512527805">"Muundo na maunzi"</string>
     <string name="hardware_revision" msgid="8893547686367095527">"Toleo la maunzi"</string>
     <string name="fcc_equipment_id" msgid="149114368246356737">"Kitambulisho cha Kifaa"</string>
     <string name="baseband_version" msgid="1848990160763524801">"Toleo la Baseband"</string>
     <string name="kernel_version" msgid="9192574954196167602">"Toleo la kiini"</string>
     <string name="build_number" msgid="3075795840572241758">"Nambari ya muundo"</string>
-    <string name="selinux_status" msgid="6212165375172061672">"Hali ya SELinux"</string>
     <string name="device_info_not_available" msgid="8062521887156825182">"Haipatikani"</string>
     <string name="device_status_activity_title" msgid="1411201799384697904">"Hali"</string>
     <string name="device_status" msgid="607405385799807324">"Hali"</string>
@@ -1133,11 +1147,21 @@
     <string name="storage_settings_title" msgid="8746016738388094064">"Hifadhi mipangilio"</string>
     <string name="storage_settings_summary" product="nosdcard" msgid="3543813623294870759">"Ondoa hifadhi ya USB, angalia hifadhi inayopatikana"</string>
     <string name="storage_settings_summary" product="default" msgid="9176693537325988610">"Ondoa SIM kadi, angalia hifadhi iliyopo"</string>
+    <!-- no translation found for imei_multi_sim (6387012961838800539) -->
+    <skip />
     <string name="status_number" product="tablet" msgid="1138837891091222272">"MDN"</string>
-    <string name="status_number" product="default" msgid="5123197324870153205">"Nambari yangu ya simu"</string>
+    <string name="status_number" product="default" msgid="5948892105546651296">"Nambari ya simu"</string>
+    <!-- no translation found for status_number_sim_slot (2755592991367858860) -->
+    <skip />
+    <!-- no translation found for status_number_sim_slot (1898212200138025729) -->
+    <skip />
+    <string name="status_number_sim_status" product="tablet" msgid="1367110147304523864">"MDN kwenye SIM"</string>
+    <string name="status_number_sim_status" product="default" msgid="9123351360569466330">"Nambari ya simu kwenye SIM"</string>
     <string name="status_min_number" msgid="3519504522179420597">"NDOGO"</string>
     <string name="status_msid_number" msgid="909010114445780530">"MSID"</string>
     <string name="status_prl_version" msgid="1007470446618081441">"Toleo la PRL"</string>
+    <!-- no translation found for meid_multi_sim (748999971744491771) -->
+    <skip />
     <string name="status_meid_number" msgid="1751442889111731088">"MEID"</string>
     <string name="status_icc_id" msgid="943368755577172747">"ICCID"</string>
     <string name="status_network_type" msgid="3279383550222116235">"Aina ya mtandao wa simu ya mkononi"</string>
@@ -1150,8 +1174,7 @@
     <string name="status_wifi_mac_address" msgid="2202206684020765378">"Anwani ya Wi-Fi ya MAC"</string>
     <string name="status_bt_address" msgid="4195174192087439720">"Anwani ya Bluetooth"</string>
     <string name="status_serial_number" msgid="2257111183374628137">"Nambari ya Ufuatiliaji"</string>
-    <string name="status_unavailable" msgid="7862009036663793314">"Hapatikani"</string>
-    <string name="status_up_time" msgid="7294859476816760399">"juu saa"</string>
+    <string name="status_up_time" msgid="7294859476816760399">"Muda wa matumizi tangu mwisho ilipozimwa"</string>
     <string name="status_awake_time" msgid="2393949909051183652">"Saa ya kuamka"</string>
     <string name="internal_memory" msgid="9129595691484260784">"Hifadhi ya ndani"</string>
     <string name="sd_memory" product="nosdcard" msgid="2510246194083052841">"Hifadhi ya USB"</string>
@@ -1248,7 +1271,7 @@
     <string name="storage_detail_other" msgid="8404938385075638238">"Nyingine"</string>
     <string name="storage_detail_system" msgid="4629506366064709687">"Mfumo"</string>
     <string name="storage_detail_explore" msgid="7911344011431568294">"Gundua <xliff:g id="NAME">^1</xliff:g>"</string>
-    <string name="storage_detail_dialog_other" msgid="8907101974576694793">"Faili nyingine zilizopo ni kama vile faili zilizohifadhiwa na programu, faili zilizopakuliwa kutoka kwenye Intaneti au Bluetooth, faili za Android, na kadhalika.\n\nIli kuona maudhui ya <xliff:g id="NAME">^1</xliff:g> yanayoweza kuonekana, gonga Gundua."</string>
+    <string name="storage_detail_dialog_other" msgid="8845766044697204852">"Faili nyingine zilizopo ni pamoja na faili zilizohifadhiwa na programu, faili zilizopakuliwa kutoka kwenye intaneti au Bluetooth, faili za Android na nyinginezo. \n\nIli kuona maudhui ya <xliff:g id="NAME">^1</xliff:g>, gusa Gundua."</string>
     <string name="storage_detail_dialog_system" msgid="862835644848361569">"Mfumo unajumuisha faili zinazotumika katika toleo la Android la <xliff:g id="VERSION">%s</xliff:g>"</string>
     <string name="storage_detail_dialog_user" msgid="3267254783294197804">"Huenda <xliff:g id="USER_0">^1</xliff:g> amehifadhi picha, muziki, programu au data, kwa kutumia <xliff:g id="SIZE">^2</xliff:g> ya hifadhi. \n\nIli kuona maelezo, tumia <xliff:g id="USER_1">^1</xliff:g>."</string>
     <string name="storage_wizard_init_title" msgid="5085400514028585772">"Sanidi <xliff:g id="NAME">^1</xliff:g> yako"</string>
@@ -1317,7 +1340,7 @@
     <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">"Sehemu hii haiwezi kuachwa ikiwa haijajazwa."</string>
+    <string name="error_name_empty" msgid="5508155943840201232">"Huwezi kuacha sehemu hii 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>
@@ -1326,25 +1349,23 @@
     <string name="menu_restore" msgid="8260067415075573273">"Rudisha kwenye chaguo-msingi"</string>
     <string name="restore_default_apn_completed" msgid="2824775307377604897">"Kuweka upya kwa mipangilio mbadala ya APN kumekamilika"</string>
     <string name="reset_dashboard_title" msgid="6254873816990678620">"Chaguo za kubadilisha mipangilio"</string>
+    <string name="reset_dashboard_summary" msgid="4851012632493522755">"Unaweza kubadilisha mipangilio ya mtandao, programu au kifaa"</string>
     <string name="reset_network_title" msgid="6166025966016873843">"Badilisha mipangilio ya Wi-Fi, data ya simu na Bluetooth"</string>
     <string name="reset_network_desc" msgid="5547979398298881406">"Hatua itabadilisha mipangilio yote ya mtandao ikiwa ni pamoja:\n\n"<li>"Wi‑Fi"</li>\n<li>"Data ya simu"</li>\n<li>"Bluetooth"</li></string>
-    <string name="reset_network_button_text" msgid="2035676527471089853">"Weka upya mipangilio"</string>
+    <string name="reset_network_button_text" msgid="2035676527471089853">"Badilisha mipangilio"</string>
     <string name="reset_network_final_desc" msgid="6388371121099245116">"Ungependa kuweka upya mipangilio yote ya mtandao? Huwezi kutendua kitendo hiki."</string>
-    <string name="reset_network_final_button_text" msgid="1797434793741744635">"Weka upya mipangilio"</string>
+    <string name="reset_network_final_button_text" msgid="1797434793741744635">"Badilisha mipangilio"</string>
     <string name="reset_network_confirm_title" msgid="1759888886976962773">"Iwekwe upya?"</string>
     <string name="network_reset_not_available" msgid="7188610385577164676">"Kuweka upya mtandao hakupatikani kwa mtumiaji huyu"</string>
     <string name="reset_network_complete_toast" msgid="787829973559541880">"Mipangilio ya mtandao imewekwa upya"</string>
-    <string name="master_clear_title" msgid="6617679904229218425">"Futa data yote (Rejesha mipangilio ya kiwandani)"</string>
-    <plurals name="master_clear_with_account_summary" formatted="false" msgid="5911377203778818712">
-      <item quantity="other">Akaunti <xliff:g id="ACCOUNT_COUNT">%1$d</xliff:g> zitarejeshwa kwenye mipangilio zilizotoka nazo kiwandani</item>
-      <item quantity="one">Akaunti 1 itarejeshwa kwenye mipangilio iliyotoka nayo kiwandani</item>
-    </plurals>
-    <string name="master_clear_summary" msgid="6902443944660426951">"Itabadilisha mipangilio ya hifadhi ya ndani na data yote"</string>
+    <string name="master_clear_title" msgid="3531267871084279512">"Futa data yote (rejesha mipangilio ambayo kifaa kilitoka nayo kiwandani)"</string>
     <string name="master_clear_desc" product="tablet" msgid="9146059417023157222">"Hii itafuta data yote kutoka hifadhi yako iliyo "<b>"ndani ya kompyuta kibao"</b>", pamoja na:\n \n"<li>"Akaunti yako ya Google"</li>\n<li>"Data na mipangilio ya mfumo na programu"</li>\n<li>"Programu zilizopakuliwa"</li></string>
     <string name="master_clear_desc" product="default" msgid="4800386183314202571">"Hii itafuta data yote kutoka hifadhi yako iliyo "<b>"ndani ya simu"</b>", pamoja na:\n \n"<li>"Akaunti yako ya Google"</li>\n<li>"Data na mipangilio ya mfumo na programu"</li>\n<li>"Programu zilizopakuliwa"</li></string>
     <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"Kwa sasa umeingia kwenye akaunti zifuatazo:\n"</string>
     <string name="master_clear_other_users_present" product="default" msgid="5161423070702470742">\n\n"Kuna watumiaji wengine waliopo kwenye kifaa hiki.\n"</string>
     <string name="master_clear_desc_also_erases_external" msgid="1903185203791274237"><li>"Muziki"</li>\n<li>"Picha"</li>\n<li>"data nyingine ya mtumiaji"</li></string>
+    <string name="master_clear_desc_also_erases_esim" msgid="312352697653096008"><li>"Vipengee vilivyo kwenye eSIM"</li></string>
+    <string name="master_clear_desc_no_cancel_mobile_plan" msgid="5460926449093211144">\n\n"Hatua hii haitaghairi mpango wako wa huduma ya simu ya mkononi."</string>
     <string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="7744115866662613411">\n\n"Ili kufuta pia muziki, picha, na data zingine za mtumiaji, "<b>" hifadhi ya "</b>" inahitaji kufutwa."</string>
     <string name="master_clear_desc_erase_external_storage" product="default" msgid="4801026652617377093">\n\n"Ili kufuta muziki, picha, na data zingine za mtumiaji, "<b>"kadi ya"</b>" inahitaji kufutwa."</string>
     <string name="erase_external_storage" product="nosdcard" msgid="969364037450286809">"Futa hifadhi ya USB"</string>
@@ -1376,15 +1397,15 @@
     <string name="tether_settings_disabled_on_data_saver" msgid="1576908608463904152">"Haiwezi kusambaza mtandao au kutumia mitandao hewa wakati umewasha Kiokoa Data"</string>
     <string name="usb_title" msgid="7483344855356312510">"USB"</string>
     <string name="usb_tethering_button_text" msgid="585829947108007917">"Shiriki intaneti kwa USB"</string>
-    <string name="usb_tethering_subtext" product="default" msgid="5991482890033484794">"Shiriki muunganisho wa Intaneti ya simu yako kupitia USB"</string>
-    <string name="usb_tethering_subtext" product="tablet" msgid="5988796139573211318">"Shiriki muunganisho wa Intaneti ya kompyuta kibao kupitia USB"</string>
+    <string name="usb_tethering_subtext" product="default" msgid="3711893746716442706">"Shiriki muunganisho wa intaneti wa simu yako kupitia USB"</string>
+    <string name="usb_tethering_subtext" product="tablet" msgid="2292916486612255069">"Shiriki muunganisho wa intaneti wa kompyuta kibao kupitia USB"</string>
     <string name="bluetooth_tether_checkbox_text" msgid="2379175828878753652">"Shiriki intaneti kwa Bluetooth"</string>
-    <string name="bluetooth_tethering_subtext" product="tablet" msgid="4558227863463153412">"Shiriki muunganisho wa Intaneti ya kompyuta kibao kupitia Bluetooth"</string>
-    <string name="bluetooth_tethering_subtext" product="default" msgid="1055197887836203595">"Shiriki muunganisho wa Intaneti ya simu kupitia Bluetooth"</string>
-    <string name="bluetooth_tethering_off_subtext_config" msgid="6326877798974938021">"Inashiriki muunganisho wa Intaneti wa <xliff:g id="DEVICE_NAME">%1$d</xliff:g> hii kupitia Bluetooth"</string>
+    <string name="bluetooth_tethering_subtext" product="tablet" msgid="8828883800511737077">"Shiriki muunganisho wa intaneti ya kompyuta kibao kupitia Bluetooth"</string>
+    <string name="bluetooth_tethering_subtext" product="default" msgid="1904667146601254812">"Shiriki muunganisho wa intaneti ya simu kupitia Bluetooth"</string>
+    <string name="bluetooth_tethering_off_subtext_config" msgid="376389105752995580">"Inashiriki muunganisho wa intaneti wa <xliff:g id="DEVICE_NAME">%1$d</xliff:g> hii kupitia Bluetooth"</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="1308462275952345985">"Tumia kipengele cha mtandao-hewa na kusambaza mtandao ili usambazie vifaa vingine intaneti kutoka kwenye mtandao wako wa simu za mkononi. Programu pia zinaweza kuunda mtandao-hewa ili kushiriki maudhui na vifaa vilivyo karibu."</string>
+    <string name="tethering_footer_info" msgid="7112228674056306147">"Tumia mtandao pepe na kipengele cha kusambaza mtandao ili ushiriki intaneti na vifaa vingine kupitia muunganisho wa data kwa simu za mkononi. Programu pia zinaweza kuunda mtandao pepe ili kushiriki maudhui na vifaa vilivyo karibu."</string>
     <string name="tethering_help_button_text" msgid="656117495547173630">"Usaidizi"</string>
     <string name="network_settings_title" msgid="2876509814832830757">"Mtandao wa simu"</string>
     <string name="manage_mobile_plan_title" msgid="7630170375010107744">"Mpango wa vifaa vya mkononi"</string>
@@ -1392,7 +1413,7 @@
     <string name="sms_change_default_dialog_title" msgid="1958688831875804286">"Ungependa kubadilisha programu ya SMS?"</string>
     <string name="sms_change_default_dialog_text" msgid="1522783933230274787">"Ungependa kutumia <xliff:g id="NEW_APP">%1$s</xliff:g> badala ya <xliff:g id="CURRENT_APP">%2$s</xliff:g> kama programu yako ya SMS?"</string>
     <string name="sms_change_default_no_previous_dialog_text" msgid="602683880284921998">"Ungependa kutumia <xliff:g id="NEW_APP">%s</xliff:g> kama programu yako ya SMS?"</string>
-    <string name="network_scorer_picker_title" msgid="6383879578279046456">"Mtoa huduma za ukadiriaji wa mtandao"</string>
+    <string name="network_scorer_picker_title" msgid="6383879578279046456">"Mtoa huduma anayekadiria mtandao"</string>
     <string name="network_scorer_picker_none_preference" msgid="9028375117241790936">"Hamna"</string>
     <string name="network_scorer_change_active_dialog_title" msgid="3776301550387574975">"Ungependa kubadili kisaidizi cha Wi-Fi?"</string>
     <string name="network_scorer_change_active_dialog_text" msgid="8035173880322990715">"Ungependa kutumia <xliff:g id="NEW_APP">%1$s</xliff:g> badala ya <xliff:g id="CURRENT_APP">%2$s</xliff:g> kusimamia miunganisho yako ya mtandao?"</string>
@@ -1459,17 +1480,18 @@
     <string name="settings_license_activity_loading" msgid="3337535809093591740">"Inapakia…"</string>
     <string name="settings_safetylegal_title" msgid="1289483965535937431">"Maelezo ya usalama"</string>
     <string name="settings_safetylegal_activity_title" msgid="6901214628496951727">"Maelezo ya usalama"</string>
-    <string name="settings_safetylegal_activity_unreachable" msgid="250674109915859456">"Hauna muunganisho wa data. Ili kutazama taarifa hii sasa, nenda kwa %s kutoka kwa kompyuta yoyote iliyounganishwa kwa mtandao."</string>
+    <string name="settings_safetylegal_activity_unreachable" msgid="142307697309858185">"Huna muunganisho wa data. Ili kuona maelezo haya sasa, nenda kwenye %s ukitumia kompyuta yoyote iliyounganishwa kwenye intaneti."</string>
     <string name="settings_safetylegal_activity_loading" msgid="8059022597639516348">"Inapakia…"</string>
-    <string name="lockpassword_choose_your_password_header" msgid="8624900666929394990">"Chagua nenosiri lako"</string>
-    <string name="lockpassword_choose_your_password_header_for_fingerprint" msgid="6624409510609085450">"Weka nenosiri ili utumie alama ya kidole"</string>
-    <string name="lockpassword_choose_your_pattern_header" msgid="6949761069941694050">"Chagua mchoro wako"</string>
-    <string name="lockpassword_choose_your_pattern_header_for_fingerprint" msgid="5901096361617543819">"Weka mchoro ili utumie alama ya kidole"</string>
-    <string name="lockpassword_choose_your_pin_header" msgid="7598849519816138302">"Chagua PIN yako"</string>
-    <string name="lockpassword_choose_your_pin_header_for_fingerprint" msgid="765344692615917183">"Weka PIN ili utumie alama ya kidole"</string>
-    <string name="lockpassword_confirm_your_password_header" msgid="6308478184889846633">"Thibitisha nenosiri lako"</string>
+    <string name="lockpassword_choose_your_screen_lock_header" msgid="3872462096767152394">"Weka mbinu ya kufunga skrini"</string>
+    <string name="lockpassword_choose_your_password_message" msgid="1197569283524841412">"Kwa sababu za usalama, weka nenosiri"</string>
+    <string name="lockpassword_choose_your_password_header_for_fingerprint" msgid="2541818487015343503">"Weka nenosiri ili utumie alama ya kidole"</string>
+    <string name="lockpassword_choose_your_pattern_header_for_fingerprint" msgid="7709785406243556723">"Weka mchoro ili utumie alama ya kidole"</string>
+    <string name="lockpassword_choose_your_pin_message" msgid="1875420718677275646">"Kwa sababu za usalama, weka PIN"</string>
+    <string name="lockpassword_choose_your_pin_header_for_fingerprint" msgid="1549639053195796674">"Weka PIN ili utumie alama ya kidole"</string>
+    <string name="lockpassword_choose_your_pattern_message" msgid="5986983400689720015">"Kwa sababu za usalama, weka mchoro"</string>
+    <string name="lockpassword_confirm_your_password_header" msgid="1266027268220850931">"Weka nenosiri lako tena"</string>
     <string name="lockpassword_confirm_your_pattern_header" msgid="7543433733032330821">"Thibitisha mchoro wako"</string>
-    <string name="lockpassword_confirm_your_pin_header" msgid="49038294648213197">"Thibitisha PIN yako"</string>
+    <string name="lockpassword_confirm_your_pin_header" msgid="7744513791910572550">"Weka PIN yako tena"</string>
     <string name="lockpassword_confirm_passwords_dont_match" msgid="5140892109439191415">"Nenosiri halilingani"</string>
     <string name="lockpassword_confirm_pins_dont_match" msgid="7226244811505606217">"PIN hailingani"</string>
     <string name="lockpassword_choose_lock_generic_header" msgid="3811438094903786145">"Chaguo zilizomo"</string>
@@ -1488,6 +1510,12 @@
     <string name="lockpassword_strong_auth_required_work_pattern" msgid="3003781907040522053">"Ili kuimarisha usalama, weka mchoro wa wasifu wako wa kazini"</string>
     <string name="lockpassword_strong_auth_required_work_pin" msgid="3367491332598821552">"Ili kuimarisha usalama, weka PIN ya wasifu wako wa kazini"</string>
     <string name="lockpassword_strong_auth_required_work_password" msgid="8159775129968582940">"Ili kuimarisha usalama, weka nenosiri la wasifu wako wa kazini"</string>
+    <string name="lockpassword_confirm_your_pattern_details_frp" msgid="6757336656791723193">"Tumerejesha mipangilio ya kiwandani ya simu yako. Ili kutumia simu hii, weka mchoro wako wa awali."</string>
+    <string name="lockpassword_confirm_your_pin_details_frp" msgid="826520613445990470">"Tumerejesha mipangilio ya kiwandani ya simu yako. Ili kutumia simu hii, weka PIN yako ya awali."</string>
+    <string name="lockpassword_confirm_your_password_details_frp" msgid="8944081074615739040">"Tumerejesha mipangilio ya kiwandani ya simu yako. Ili kutumia simu hii, weka nenosiri lako la awali."</string>
+    <string name="lockpassword_confirm_your_pattern_header_frp" msgid="2898036091609128286">"Thibitisha mchoro"</string>
+    <string name="lockpassword_confirm_your_pin_header_frp" msgid="4141601774778898803">"Thibitisha PIN"</string>
+    <string name="lockpassword_confirm_your_password_header_frp" msgid="3762615419295360480">"Thibitisha nenosiri"</string>
     <string name="lockpassword_invalid_pin" msgid="15588049067548470">"Nambari ya PIN si sahihi"</string>
     <string name="lockpassword_invalid_password" msgid="4038507398784975200">"Nenosiri si sahihi"</string>
     <string name="lockpattern_need_to_unlock_wrong" msgid="1745247595356012176">"Mchoro huo si sahihi"</string>
@@ -1535,19 +1563,18 @@
     <string name="applications_settings_header" msgid="1014813055054356646">"Mipangilio ya programu"</string>
     <string name="install_applications" msgid="4872012136210802181">"Vyanzo visivyojulikana"</string>
     <string name="install_applications_title" msgid="4987712352256508946">"Ruhusu vyanzo vyote vya programu"</string>
-    <string name="recent_app_category_title" msgid="6673071268966003928">"Programu zilizofunguliwa hivi majuzi"</string>
+    <string name="recent_app_category_title" msgid="6673071268966003928">"Programu zilizofunguliwa hivi karibuni"</string>
     <string name="see_all_apps_title" msgid="1317153498074308438">"Angalia programu zote <xliff:g id="COUNT">%1$d</xliff:g>"</string>
-    <string name="recent_app_summary" msgid="3366446669844932300">"<xliff:g id="TIME">^1</xliff:g> zilizopita"</string>
     <string name="install_all_warning" product="tablet" msgid="8310489909586138165">"Data yako ya binafsi na ya kompyuta kibao yako zinaweza kuathiriwa na programu ambazo hazijulikani. Kwa kusakinisha programu kutoka chanzo hiki, unakubali kuwajibika kila wakati kutokana na uharibifu wowote kwenye simu yako au kupotea kwa data kutokana na matumizi yake."</string>
     <string name="install_all_warning" product="default" msgid="1952257127370115988">"Data yako ya binafsi na ya simu yako zinaweza kuathiriwa na programu ambazo hazijulikani. Kwa kusakinisha programu kutoka chanzo hiki, unakubali kuwajibika kila wakati kutokana na uharibifu wowote kwenye simu yako au kupotea kwa data kutokana na matumizi yake."</string>
     <string name="advanced_settings" msgid="1777249286757067969">"Mipangilio ya kina"</string>
     <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 kwa chaguo-msingi"</string>
+    <string name="auto_launch_label" msgid="2669236885531442195">"Fungua moja kwa moja"</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">"Idhini"</string>
+    <string name="permissions_label" msgid="2605296874922726203">"Ruhusa"</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>
@@ -1557,7 +1584,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">"Komesha kwa lazima"</string>
+    <string name="force_stop" msgid="7435006169872876756">"Ilazimishe ikome"</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>
@@ -1584,7 +1611,7 @@
     <string name="show_running_services" msgid="5736278767975544570">"Onyesha huduma zinazoendeshwa"</string>
     <string name="show_background_processes" msgid="2009840211972293429">"Onyesha michakato iliyoakibishwa"</string>
     <string name="default_emergency_app" msgid="1951760659640369980">"Programu ya dharura"</string>
-    <string name="reset_app_preferences" msgid="1321050641018356925">"Weka upya mapendeleo ya programu"</string>
+    <string name="reset_app_preferences" msgid="1321050641018356925">"Badilisha mapendeleo ya programu"</string>
     <string name="reset_app_preferences_title" msgid="6093179367325336662">"Ungependa kuweka upya mapendeleo ya programu?"</string>
     <string name="reset_app_preferences_desc" msgid="4822447731869201512">"Hii itaweka upya mapendeleo yote ya: \n\n "<li>"Programu zilizozimwa"</li>\n" "<li>" Arifa za programu zilizozimwa"</li>\n" "<li>"Programu chaguo-msingi kwa vitendo"</li>\n" "<li>"Vikwazo vya chinichini vya data ya programu"</li>\n" "<li>"Vikwazo vyovyote vya ruhusa"</li>\n\n"Hutapoteza data yoyote ya programu."</string>
     <string name="reset_app_preferences_button" msgid="2559089511841281242">"Weka upya"</string>
@@ -1659,7 +1686,6 @@
     <string name="app_install_details_title" msgid="6905279702654975207">"Maelezo ya programu"</string>
     <string name="app_install_details_summary" msgid="6464796332049327547">"Programu imesakinishwa kutoka <xliff:g id="APP_STORE">%1$s</xliff:g>"</string>
     <string name="instant_app_details_summary" msgid="4529934403276907045">"Maelezo zaidi kwenye <xliff:g id="APP_STORE">%1$s</xliff:g>"</string>
-    <string name="app_ops_settings" msgid="5108481883575527511">"Oparesheni ya programu"</string>
     <string name="app_ops_running" msgid="7706949900637284122">"Inatumika"</string>
     <string name="app_ops_never_used" msgid="9114608022906887802">"(Haijawahi kutumiwa)"</string>
     <string name="no_default_apps" msgid="2915315663141025400">"Hakuna programu chaguo-msingi."</string>
@@ -1699,7 +1725,7 @@
     <string name="service_stop_description" msgid="9146619928198961643">"Huduma hii ilianzishwa na programu yake. Kuisitisha kunaweza kuifanya programu iache kufanya kazi."</string>
     <string name="heavy_weight_stop_description" msgid="6050413065144035971">"Programu hii haiwezi kusitishwa kwa usalama. Ukiisitisha, unaweza kupoteza baadhi ya kazi yako ya sasa."</string>
     <string name="background_process_stop_description" msgid="3834163804031287685">"Hii ni utaratibu wa zamani ya programu ambayo bado inaendeshwa iwapo itahitajika tena. Huwa hakuna sababu ya kuisitisha."</string>
-    <string name="service_manage_description" msgid="479683614471552426">"<xliff:g id="CLIENT_NAME">%1$s</xliff:g>: inatumika kwa sasa. Gonga Mipangilio ili uidhibiti."</string>
+    <string name="service_manage_description" msgid="479683614471552426">"<xliff:g id="CLIENT_NAME">%1$s</xliff:g>: inatumika kwa sasa. Gusa Mipangilio ili uidhibiti."</string>
     <string name="main_running_process_description" msgid="1130702347066340890">"Utaratibu kuu ambao unatumika."</string>
     <string name="process_service_in_use_description" msgid="8993335064403217080">"Huduma inatumika <xliff:g id="COMP_NAME">%1$s</xliff:g>"</string>
     <string name="process_provider_in_use_description" msgid="5586603325677678940">"Mtoaji huduma <xliff:g id="COMP_NAME">%1$s</xliff:g> anatumika"</string>
@@ -1711,6 +1737,7 @@
     <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_empty_list_user_restricted" msgid="5984015900102140696">"Huna ruhusa ya kubadilisha lugha inayotumika kwenye kifaa."</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>
     <string name="keyboard_settings_category" msgid="8275523930352487827">"Kibodi na mbinu za kuingiza hoja"</string>
@@ -1764,7 +1791,7 @@
     <string name="user_dict_settings_edit_dialog_title" msgid="8967476444840548674">"Hariri Neno"</string>
     <string name="user_dict_settings_context_menu_edit_title" msgid="2210564879320004837">"Hariri"</string>
     <string name="user_dict_settings_context_menu_delete_title" msgid="9140703913776549054">"Futa"</string>
-    <string name="user_dict_settings_empty_text" msgid="1971969756133074922">"Huna maneno yoyote katika kamusi ya mtumiaji. Gonga kitufe cha Ongeza (+) ili uongeze neno."</string>
+    <string name="user_dict_settings_empty_text" msgid="1971969756133074922">"Huna maneno yoyote katika kamusi ya mtumiaji. Gusa kitufe cha Ongeza (+) ili uongeze neno."</string>
     <string name="user_dict_settings_all_languages" msgid="6742000040975959247">"Ya lugha zote"</string>
     <string name="user_dict_settings_more_languages" msgid="7316375944684977910">"Lugha zaidi..."</string>
     <string name="testing" msgid="6584352735303604146">"Majaribio"</string>
@@ -1801,7 +1828,7 @@
     <string name="accessibility_settings_summary" msgid="981260486011624939">"Vidhibiti vya mawasiliano, maonyesho na visoma skrini"</string>
     <string name="vision_settings_title" msgid="4204111425716868288">"Mipangilio ya Kuona"</string>
     <string name="vision_settings_description" msgid="5679491180156408260">"Unaweza kubadilisha mipangilio ya kifaa hiki kulingana na mahitaji yako. Vipengele hivi vya zana za walio na matatizo ya kuona au kusikia vinaweza kubadilishwa baadaye kwenye Mipangilio."</string>
-    <string name="vision_settings_suggestion_title" msgid="917294957154878441">"Ongeza ukubwa wa fonti"</string>
+    <string name="vision_settings_suggestion_title" msgid="8058794060304707004">"Badilisha ukubwa wa fonti"</string>
     <string name="screen_reader_category_title" msgid="7739154903913400641">"Visoma skrini"</string>
     <string name="audio_and_captions_category_title" msgid="3420727114421447524">"Maandishi kwenye skrini na sauti"</string>
     <string name="display_category_title" msgid="685461049938269166">"Onyesho"</string>
@@ -1810,17 +1837,17 @@
     <string name="experimental_category_title" msgid="5272318666666893547">"Ya majaribio"</string>
     <string name="talkback_title" msgid="7912059827205988080">"Talkback"</string>
     <string name="talkback_summary" msgid="8331244650729024963">"Kisoma skrini hasa kwa watu wenye upofu na wenye matatizo ya kuona"</string>
-    <string name="select_to_speak_summary" msgid="4282846695497544515">"Gonga vipengee kwenye skrini yako ili usikie vikisoma kwa sauti"</string>
+    <string name="select_to_speak_summary" msgid="4282846695497544515">"Gusa vipengee kwenye skrini yako ili usikie vikisoma kwa sauti"</string>
     <string name="accessibility_captioning_title" msgid="7589266662024836291">"Manukuu"</string>
     <string name="accessibility_screen_magnification_title" msgid="6001128808776506021">"Ukuzaji"</string>
     <string name="accessibility_screen_magnification_gestures_title" msgid="3719929521571489913">"Kuza kwa kugonga mara tatu"</string>
     <string name="accessibility_screen_magnification_navbar_title" msgid="7141753038957538230">"Kuza ukitumia kitufe"</string>
     <string name="accessibility_screen_magnification_state_navbar_gesture" msgid="2760906043221923793">"Kuza ukitumia kitufe na kugonga mara tatu"</string>
     <string name="accessibility_preference_magnification_summary" msgid="5867883657521404509">"Vuta karibu kwenye skrini"</string>
-    <string name="accessibility_screen_magnification_short_summary" msgid="3411979839172752057">"Gonga mara 3 ili ukuze"</string>
-    <string name="accessibility_screen_magnification_navbar_short_summary" msgid="3693116360267980492">"Gonga kitufe ili ukuze"</string>
-    <string name="accessibility_screen_magnification_summary" msgid="5258868553337478505"><b>"Ili kukuza"</b>", gonga skrini mara 3 haraka.\n"<ul><li>"Buruta vidole 2 au zaidi ili usogeze"</li>\n<li>"Bana vidole 2 au zaidi ili ubadilishe ukuzaji"</li></ul>\n\n<b>"Ili kukuza kwa muda mfupi"</b>", gonga skrini mara 3 kwa haraka na ukifika mara ya tatu, usiondoe kidole.\n"<ul><li>"Buruta ili usogeze kwenye skrini"</li>\n<li>"Inua kidole ili uvute mbali"</li></ul>\n\n"Huwezi kukuza ukitumia kibodi au sehemu ya viungo muhimu."</string>
-    <string name="accessibility_screen_magnification_navbar_summary" msgid="1996584694050087161">"Ukiwasha kipengele cha ukuzaji, tumia Kitufe cha zana za walio na matatizo ya kuona au kusikia hapo chini ya skrini ili ukuze haraka.\n\n"<b>"Ili kukuza"</b>", gonga Kitufe cha zana za walio na matatizo ya kuona au kusikia, kisha ugonge mahali popote kwenye skrini.\n"<ul><li>"Buruta kwa kutumia vidole 2 au zaidi ili usogeze"</li>\n<li>"Bana vidole 2 au zaidi ili ubadilishe ukuzaji"</li></ul>\n\n<b>"Ili kukuza kwa muda mfupi"</b>", gonga Kitufe cha zana za walio na matatizo ya kuona au kusikia, kisha uguse na ushikilie mahali popote kwenye skrini.\n"<ul><li>"Buruta ili usogeze kwenye skrini"</li>\n<li>"Inua kidole ili usogeze mbali"</li></ul>\n\n"Huwezi kuvuta karibu kwenye kibodi au sehemu ya viungo muhimu."</string>
+    <string name="accessibility_screen_magnification_short_summary" msgid="3411979839172752057">"Gusa mara 3 ili ukuze"</string>
+    <string name="accessibility_screen_magnification_navbar_short_summary" msgid="3693116360267980492">"Gusa kitufe ili ukuze"</string>
+    <string name="accessibility_screen_magnification_summary" msgid="5258868553337478505"><b>"Ili kukuza"</b>", gusa skrini mara 3 haraka.\n"<ul><li>"Buruta vidole 2 au zaidi ili usogeze"</li>\n<li>"Bana vidole 2 au zaidi ili ubadilishe ukuzaji"</li></ul>\n\n<b>"Ili kukuza kwa muda mfupi"</b>", gusa skrini mara 3 kwa haraka na ukifika mara ya tatu, usiondoe kidole.\n"<ul><li>"Buruta ili usogeze kwenye skrini"</li>\n<li>"Inua kidole ili uvute mbali"</li></ul>\n\n"Huwezi kukuza ukitumia kibodi au sehemu ya viungo muhimu."</string>
+    <string name="accessibility_screen_magnification_navbar_summary" msgid="1996584694050087161">"Ukiwasha kipengele cha ukuzaji, tumia Kitufe cha zana za walio na matatizo ya kuona au kusikia hapo chini ya skrini ili ukuze haraka.\n\n"<b>"Ili kukuza"</b>", gusa Kitufe cha zana za walio na matatizo ya kuona au kusikia, kisha uguse mahali popote kwenye skrini.\n"<ul><li>"Buruta kwa kutumia vidole 2 au zaidi ili usogeze"</li>\n<li>"Bana vidole 2 au zaidi ili ubadilishe ukuzaji"</li></ul>\n\n<b>"Ili kukuza kwa muda mfupi"</b>", gusa Kitufe cha zana za walio na matatizo ya kuona au kusikia, kisha uguse na ushikilie mahali popote kwenye skrini.\n"<ul><li>"Buruta ili usogeze kwenye skrini"</li>\n<li>"Inua kidole ili usogeze mbali"</li></ul>\n\n"Huwezi kuvuta karibu kwenye kibodi au sehemu ya viungo muhimu."</string>
     <string name="accessibility_screen_magnification_navbar_configuration_warning" msgid="70533120652758190">"Kitufe cha zana za walio na matatizo ya kuona au kusikia kimewekwa kuwa <xliff:g id="SERVICE">%1$s</xliff:g>. Gusa na ushikilie Kitufe cha zana za walio na matatizo ya kuona au kusikia, kisha uchague ukuzaji ili utumie kipengele cha ukuzaji."</string>
     <string name="accessibility_global_gesture_preference_title" msgid="2048884356166982714">"Njia ya mkato ya kitufe cha sauti"</string>
     <string name="accessibility_shortcut_service_title" msgid="4779360749706905640">"Huduma ya njia ya mkato"</string>
@@ -1838,7 +1865,6 @@
     <string name="accessibility_display_inversion_preference_subtitle" msgid="7052959202195368109">"Huenda ikaathiri utendaji"</string>
     <string name="accessibility_autoclick_preference_title" msgid="7014499339068449623">"Bofya kiashiria kikiacha kusonga"</string>
     <string name="accessibility_autoclick_delay_preference_title" msgid="3962261178385106006">"Muda wa kusubiri kabla ya kubofya"</string>
-    <string name="preference_summary_default_combination" msgid="8532964268242666060">"<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">"IMEWASHWA"</string>
     <string name="accessibility_summary_state_disabled" msgid="2241315620132005595">"IMEZIMWA"</string>
     <string name="enable_quick_setting" msgid="2366999897816894536">"Onyesha katika Mipangilio ya Haraka"</string>
@@ -1957,12 +1983,14 @@
     <string name="background_activity_summary_on" msgid="649282072540085599">"Programu inaweza kutumika chini chini wakati huitumii"</string>
     <string name="background_activity_summary_off" msgid="7666330699090632040">"Shughuli za programu kutumika chini chini ni chache wakati huitumii"</string>
     <string name="background_activity_summary_disabled" msgid="3710669050484599847">"Programu hairuhusiwi kutumika chini chini"</string>
+    <string name="background_activity_summary_whitelisted" msgid="7375400051141016808">"Huwezi kuboresha programu ili itumie betri kwa ufanisi zaidi"</string>
+    <string name="background_activity_warning_dialog_title" msgid="2216249969149568871">"Ungependa kudhibiti shughuli za chini chini?"</string>
+    <string name="background_activity_warning_dialog_text" msgid="7049624449246121981">"Ikiwa utadhibiti shughuli za chini chini za programu, huenda isifanye kazi vizuri"</string>
     <string name="device_screen_usage" msgid="3386088035570409683">"Matumizi ya skrini tangu mwisho ilipokuwa imejaa chaji"</string>
     <string name="device_screen_consumption" msgid="4607589286438986687">"Kutumia skrini"</string>
     <string name="device_cellular_network" msgid="4724773411762382950">"Kutafuta mitandao ya simu"</string>
-    <string name="power_last_full_charge_summary" msgid="532845389094620657">"<xliff:g id="TIME">^1</xliff:g> zilizopita"</string>
-    <string name="power_usage_list_summary" msgid="6775339745194635000">"Matumizi ya programu tangu ilipojaa chaji (<xliff:g id="TIME">^1</xliff:g> zilizopita)"</string>
-    <string name="power_usage_list_summary_device" msgid="7036566616386864302">"Matumizi ya kifaa tangu kilipojaa chaji (<xliff:g id="TIME">^1</xliff:g> zilizopita)"</string>
+    <string name="power_usage_list_summary" msgid="6393929085382334341">"Programu zilizofunguliwa tangu betri ilipojaa chaji <xliff:g id="RELATIVE_TIME">^1</xliff:g>"</string>
+    <string name="power_usage_list_summary_device" msgid="4461926045610455423">"Matumizi ya kifaa tangu betri ilipojaa chaji <xliff:g id="RELATIVE_TIME">^1</xliff:g>"</string>
     <string name="screen_usage_summary" msgid="6687403051423153550">"Muda ambao skrini imekuwa ikiwaka tangu chaji ilipojaa"</string>
     <string name="device_usage_list_summary" msgid="5623036661468763251">"Matumizi ya kifaa tangu ilipojaa chaji"</string>
     <string name="battery_since_unplugged" msgid="338073389740738437">"Utumizi wa betri tangu kuchopolewa"</string>
@@ -2047,7 +2075,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">"Komesha kwa lazima"</string>
+    <string name="battery_action_stop" msgid="649958863744041872">"Ilazimishe ikome"</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>
@@ -2126,14 +2154,6 @@
     <string name="services_subtitle" msgid="4296402367067266425">"Huduma"</string>
     <string name="menu_proc_stats_duration" msgid="2323483592994720196">"Muda"</string>
     <string name="mem_details_title" msgid="6548392825497290498">"Maelezo ya kumbukumbu"</string>
-    <string name="mem_state_subtitle" msgid="2407238869781011933">"Hali za kumbukumbu"</string>
-    <string name="mem_use_subtitle" msgid="7319468770222422412">"Kumbukumbu iliyotumika"</string>
-    <string name="mem_use_kernel_type" msgid="8698327165935012484">"Kernel"</string>
-    <string name="mem_use_native_type" msgid="5976704902328347400">"Asili"</string>
-    <string name="mem_use_kernel_cache_type" msgid="6411475064463957513">"Akiba za Kernel"</string>
-    <string name="mem_use_zram_type" msgid="9087217476795358232">"Mabadiliko ya ZRam"</string>
-    <string name="mem_use_free_type" msgid="717708548454880840">"Haijatumika"</string>
-    <string name="mem_use_total" msgid="6308786055749777934">"Jumla"</string>
     <string name="menu_duration_3h" msgid="4714866438374738385">"Saa 3"</string>
     <string name="menu_duration_6h" msgid="1940846763432184132">"Saa 6"</string>
     <string name="menu_duration_12h" msgid="7890465404584356294">"Saa 12"</string>
@@ -2208,14 +2228,14 @@
     <string name="credentials_unlock_hint" msgid="2301301378040499348">"Weka nenosiri ili stakabadhi zihifadhiwe"</string>
     <string name="credentials_old_password" msgid="7553393815538684028">"Nenosiri la sasa:"</string>
     <string name="credentials_reset_hint" msgid="6297256880896133631">"Ondoa maudhui yote?"</string>
-    <string name="credentials_password_too_short" msgid="7502749986405522663">"Lazima nenosiri liwe na angalau herufi 8."</string>
     <string name="credentials_wrong_password" msgid="2541932597104054807">"Nenosiri hilo si sahihi."</string>
     <string name="credentials_reset_warning" msgid="5320653011511797600">"Nenosiri si sahihi. Una nafasi nyingine moja ya kujaribu kabla hifadhi ya stakabadhi ifutwe."</string>
     <string name="credentials_reset_warning_plural" msgid="6514085665301095279">"Nenosiri si sahihi. Una nafasi zingine <xliff:g id="NUMBER">%1$d</xliff:g> za kujaribu kabla hifadhi ya stakabadhi ifutwe."</string>
     <string name="credentials_erased" msgid="2907836028586342969">"Hifadhi ya stakabadhi imefutwa"</string>
     <string name="credentials_not_erased" msgid="7685932772284216097">"Hifadhi ya stakabadhi haikuweza kufutwa."</string>
     <string name="credentials_enabled" msgid="7588607413349978930">"Hifadhi ya hati-tambulishi imewezeshwa."</string>
-    <string name="credentials_configure_lock_screen_hint" msgid="6757119179588664966">"Unahitaji kuweka PIN au nenosiri la kufunga skrini kabla ya kutumia hifadhi ya hati za uthibitisho."</string>
+    <string name="credentials_configure_lock_screen_hint" msgid="8058230497337529036">"Kabla ya kutumia hifadhi ya hati, unahitaji kuwa na njia salama ya kufunga skrini ya kifaa chako."</string>
+    <string name="credentials_configure_lock_screen_button" msgid="253239765216055321">"FUNGA SKRINI"</string>
     <string name="usage_access_title" msgid="332333405495457839">"Zenye idhini ya kufikia maelezo"</string>
     <string name="emergency_tone_title" msgid="1055954530111587114">"Mlio wa dharura"</string>
     <string name="emergency_tone_summary" msgid="722259232924572153">"Weka tabia wakati simu ya dharura imepigwa"</string>
@@ -2275,7 +2295,7 @@
     <string name="wifi_setup_save" msgid="3659235094218508211">"Hifadhi"</string>
     <string name="wifi_setup_cancel" msgid="3185216020264410239">"Ghairi"</string>
     <string name="wifi_setup_status_scanning" msgid="5317003416385428036">"Inatambaza mitandao..."</string>
-    <string name="wifi_setup_status_select_network" msgid="3960480613544747397">"Gonga mtandao ili uunganishe"</string>
+    <string name="wifi_setup_status_select_network" msgid="3960480613544747397">"Gusa mtandao ili uunganishe"</string>
     <string name="wifi_setup_status_existing_network" msgid="6394925174802598186">"Unganisha kwa mtandao uliopo"</string>
     <string name="wifi_setup_status_unsecured_network" msgid="8143046977328718252">"Unganisha kwenye mtandao usio salama"</string>
     <string name="wifi_setup_status_edit_network" msgid="4765340816724760717">"Andika usanidi wa mtandao"</string>
@@ -2285,7 +2305,7 @@
     <string name="wifi_setup_status_eap_not_supported" msgid="6796317704783144190">"EAP haiauniwi."</string>
     <string name="wifi_setup_eap_not_supported" msgid="6812710317883658843">"Huwezi kusanidi muunganisho wa EAP Wi-Fi wakati wa usanidi. Baada ya kusanidi, unaweza kufanya hivyo katika Mipangilio &gt; mitandao isiyotumia waya."</string>
     <string name="wifi_setup_description_connecting" msgid="2793554932006756795">"Kuunganisha kunaweza kuchukua dakika chache..."</string>
-    <string name="wifi_setup_description_connected" msgid="6649168170073219153">"Gonga "<b>"Inayofuata"</b>" ili uendelee kuweka mipangilio.\n\nGonga "<b>"Nyuma"</b>" ili uunganishe kwenye mtandao tofauti wa Wi-Fi."</string>
+    <string name="wifi_setup_description_connected" msgid="6649168170073219153">"Gusa "<b>"Inayofuata"</b>" ili uendelee kuweka mipangilio.\n\nGusa "<b>"Nyuma"</b>" ili uunganishe kwenye mtandao tofauti wa Wi-Fi."</string>
     <string name="accessibility_sync_enabled" msgid="558480439730263116">"Kusawazisha kumelemazwa"</string>
     <string name="accessibility_sync_disabled" msgid="1741194106479011384">"Kusawazisha kumelemazwa"</string>
     <string name="accessibility_sync_in_progress" msgid="4501160520879902723">"Inasawazisha sasa"</string>
@@ -2313,7 +2333,7 @@
     <string name="settings_backup_summary" msgid="7916877705938054035">"Hifadhi nakala za mipangilio yangu"</string>
     <string name="sync_menu_sync_now" msgid="6154608350395805683">"Sawazisha sasa"</string>
     <string name="sync_menu_sync_cancel" msgid="8292379009626966949">"Ghairi usawazishaji"</string>
-    <string name="sync_one_time_sync" msgid="3733796114909082260">"Gonga ili usawazishe<xliff:g id="LAST_SYNC_TIME">
+    <string name="sync_one_time_sync" msgid="3733796114909082260">"Gusa ili usawazishe<xliff:g id="LAST_SYNC_TIME">
 %1$s</xliff:g> sasa"</string>
     <string name="sync_gmail" msgid="714886122098006477">"Gmail"</string>
     <string name="sync_calendar" msgid="9056527206714733735">"Kalenda"</string>
@@ -2335,8 +2355,6 @@
     <skip />
     <string name="cant_sync_dialog_title" msgid="2777238588398046285">"Huwezi kusawazisha mwenyewe"</string>
     <string name="cant_sync_dialog_message" msgid="1938380442159016449">"Kwa sasa usawazishaji wa kipengee hiki umezimwa. Kubadilisha mpangilio huu, washa kwa muda data ya usuli na usawazishaji kiotomatiki."</string>
-    <string name="wimax_settings" msgid="2655139497028469039">"4G"</string>
-    <string name="status_wimax_mac_address" msgid="8390791848661413416">"Anwani ya 4G MAC"</string>
     <string name="enter_password" msgid="8035706727471334122">"Ili uanzishe Android, weka nenosiri lako"</string>
     <string name="enter_pin" msgid="5305333588093263790">"Ili uanzishe Android, weka PIN yako"</string>
     <string name="enter_pattern" msgid="4187435713036808566">"Ili uanzishe Android, chora mchoro wako"</string>
@@ -2350,6 +2368,7 @@
     <string name="misc_files_selected_count" msgid="4647048020823912088">"Imechaguliwa <xliff:g id="NUMBER">%1$d</xliff:g> juu ya <xliff:g id="TOTAL">%2$d</xliff:g>"</string>
     <string name="misc_files_selected_count_bytes" msgid="2876232009069114352">"<xliff:g id="NUMBER">%1$s</xliff:g> juu ya <xliff:g id="TOTAL">%2$s</xliff:g>"</string>
     <string name="select_all" msgid="1562774643280376715">"Chagua zote"</string>
+    <string name="data_plan_usage_manage_plans_button_text" msgid="8997761990902708162">"Dhibiti mipango"</string>
     <string name="data_usage_summary_title" msgid="3804110657238092929">"Matumizi ya data"</string>
     <string name="data_usage_app_summary_title" msgid="4147258989837459172">"Matumizi data ya programu"</string>
     <string name="data_usage_accounting" msgid="7170028915873577387">"Hesabu ya data ya mtoa huduma huenda ikatofautiana na inayofanyika katika kifaa chako."</string>
@@ -2393,7 +2412,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 simu"</string>
+    <string name="data_usage_enable_mobile" msgid="986782622560157977">"Data ya mtandao wa 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>
@@ -2435,6 +2454,9 @@
     <string name="data_usage_metered_mobile" msgid="5423305619126978393">"Mitandao ya simu"</string>
     <string name="data_usage_metered_wifi" msgid="1761738002328299714">"Mitandao ya Wi-Fi inayopima data"</string>
     <string name="data_usage_metered_wifi_disabled" msgid="727808462375941567">"Ili uchague mitandao inayopima matumizi ya data, washa Wi-Fi."</string>
+    <string name="data_usage_metered_auto" msgid="1262028400911918865">"Otomatiki"</string>
+    <string name="data_usage_metered_yes" msgid="9217539611385225894">"Mtandao unapima data"</string>
+    <string name="data_usage_metered_no" msgid="4025232961929071789">"Mtandao haupimi data"</string>
     <string name="data_usage_disclaimer" msgid="6887858149980673444">"Hesabu ya data ya mtoa huduma huenda ikatofautiana na ya kifaa chako."</string>
     <string name="cryptkeeper_emergency_call" msgid="198578731586097145">"Simu ya dharura"</string>
     <string name="cryptkeeper_return_to_call" msgid="5613717339452772491">"Rudi kwa kupiga simu"</string>
@@ -2477,8 +2499,8 @@
     <string name="vpn_forget_long" msgid="2232239391189465752">"Ondoa VPN"</string>
     <string name="vpn_replace_vpn_title" msgid="2963898301277610248">"Ungependa kubadilisha VPN iliyopo?"</string>
     <string name="vpn_set_vpn_title" msgid="4009987321156037267">"Ungependa kuweka VPN iliyowashwa kila mara?"</string>
-    <string name="vpn_first_always_on_vpn_message" msgid="3025322109743675467">"Kwa kuwasha mIpangilio hii, hutapata muunganisho wa Intaneti hadi VPN itakapounganishwa"</string>
-    <string name="vpn_replace_always_on_vpn_enable_message" msgid="2577928591361606641">"Programu itaondoa VPN iliyopo, na hutaweza kuwa na muunganisho wa Intaneti hadi  VPN itakapounganishwa"</string>
+    <string name="vpn_first_always_on_vpn_message" msgid="7144543717673197102">"Wakati mipangilio hii imewashwa, hutapata muunganisho wa intaneti hadi VPN itakapounganishwa"</string>
+    <string name="vpn_replace_always_on_vpn_enable_message" msgid="798121133114824006">"Programu itaondoa VPN iliyopo na hutaweza kuwa na muunganisho wa intaneti hadi VPN itakapounganishwa"</string>
     <string name="vpn_replace_always_on_vpn_disable_message" msgid="3011818750025879902">"Tayari umeunganisha kwenye VPN ambayo imewashwa kila mara. Ikiwa utaunganisha kwenye programu tofauti, programu hiyo itaondoa VPN iliyopo na kuzima hali ya imewashwa kila mara."</string>
     <string name="vpn_replace_vpn_message" msgid="5611635724578812860">"Tayari umeunganisha kwenye VPN. Ikiwa utaunganisha kwenye programu tofauti, programu hiyo itaondoa VPN iliyopo."</string>
     <string name="vpn_turn_on" msgid="2363136869284273872">"Washa"</string>
@@ -2526,9 +2548,6 @@
     <string name="backup_pw_set_button_text" msgid="2387480910044648795">"Weka nenosiri mbadala"</string>
     <string name="backup_pw_cancel_button_text" msgid="8845630125391744615">"Ghairi"</string>
     <string name="additional_system_update_settings_list_item_title" msgid="214987609894661992">"sasisho za ziada za mfumo"</string>
-    <string name="selinux_status_disabled" msgid="924551035552323327">"Imezimwa"</string>
-    <string name="selinux_status_permissive" msgid="6004965534713398778">"Ya kuruhusu"</string>
-    <string name="selinux_status_enforcing" msgid="2252703756208463329">"Inatekeleza"</string>
     <string name="ssl_ca_cert_warning" msgid="2045866713601984673">"Huenda mtandao unafuatiliwa"</string>
     <string name="done_button" msgid="1991471253042622230">"Nimemaliza"</string>
     <plurals name="ssl_ca_cert_dialog_title" formatted="false" msgid="7145092748045794650">
@@ -2573,7 +2592,7 @@
     <string name="user_setup_dialog_title" msgid="1765794166801864563">"Mtumiaji aongezwe sasa?"</string>
     <string name="user_setup_dialog_message" msgid="1004068621380867148">"Hakikisha kuwa mtu huyu anaweza kuchukua kifaa na kuweka mapendeleo yake"</string>
     <string name="user_setup_profile_dialog_message" msgid="3896568553327558731">"Ungependa kuweka wasifu sasa?"</string>
-    <string name="user_setup_button_setup_now" msgid="3391388430158437629">"Ongeza sasa"</string>
+    <string name="user_setup_button_setup_now" msgid="3391388430158437629">"Mwongeze sasa"</string>
     <string name="user_setup_button_setup_later" msgid="3068729597269172401">"Siyo sasa"</string>
     <string name="user_cannot_manage_message" product="tablet" msgid="7153048188252553320">"Mmiliki wa kompyuta kibao pekee ndiye anayeweza kudhibiti watumiaji."</string>
     <string name="user_cannot_manage_message" product="default" msgid="959315813089950649">"Mmiliki wa simu pekee ndiye anayeweza kudhibiti watumiaji."</string>
@@ -2624,14 +2643,14 @@
     <string name="nfc_payment_use_default" msgid="3234730182120288495">"Tumia chaguo-msingi"</string>
     <string name="nfc_payment_favor_default" msgid="5743781166099608372">"Kila wakati"</string>
     <string name="nfc_payment_favor_open" msgid="1923314062109977944">"Isipokuwa wakati programu nyingine ya malipo imefunguliwa"</string>
-    <string name="nfc_payment_pay_with" msgid="7524904024378144072">"Unapolipa ukitumia chaguo la Gonga na ulipe, tumia:"</string>
+    <string name="nfc_payment_pay_with" msgid="7524904024378144072">"Unapolipa ukitumia chaguo la Gusisha ili ulipe, tumia:"</string>
     <string name="nfc_how_it_works_title" msgid="1984068457698797207">"Kulipa katika kituo"</string>
     <string name="nfc_how_it_works_content" msgid="4749007806393224934">"Sanidi programu ya malipo. Shikilia tu upande wa nyuma wa simu yako kwenye kituo chochote cha malipo chenye alama ya kulipa bila kugusa."</string>
     <string name="nfc_how_it_works_got_it" msgid="259653300203217402">"Nimeelewa"</string>
     <string name="nfc_more_title" msgid="815910943655133280">"Zaidi..."</string>
     <string name="nfc_payment_set_default_label" msgid="7315817259485674542">"Ungependa kuweka kama mapendeleo yako?"</string>
-    <string name="nfc_payment_set_default" msgid="8532426406310833489">"Ungependa kutumia <xliff:g id="APP">%1$s</xliff:g> unapotumia Gonga na ulipe?"</string>
-    <string name="nfc_payment_set_default_instead_of" msgid="6993301165940432743">"Ungependa kutumia <xliff:g id="APP_0">%1$s</xliff:g> badala ya <xliff:g id="APP_1">%2$s</xliff:g> unapotumia Gonga na ulipe?"</string>
+    <string name="nfc_payment_set_default" msgid="8532426406310833489">"Ungependa kutumia <xliff:g id="APP">%1$s</xliff:g> unapogusisha ili ulipe?"</string>
+    <string name="nfc_payment_set_default_instead_of" msgid="6993301165940432743">"Ungependa kutumia <xliff:g id="APP_0">%1$s</xliff:g> badala ya <xliff:g id="APP_1">%2$s</xliff:g> unapotumia chaguo la kugusisha ili ulipe?"</string>
     <string name="restriction_settings_title" msgid="4233515503765879736">"Vikwazo"</string>
     <string name="restriction_menu_reset" msgid="2067644523489568173">"Ondoa vikwazo"</string>
     <string name="restriction_menu_change_pin" msgid="740081584044302775">"Badilisha PIN"</string>
@@ -2652,9 +2671,9 @@
     <string name="call_manager_title" msgid="4479949569744516457">"Kidhibiti cha Simu"</string>
     <!-- no translation found for call_manager_summary (5918261959486952674) -->
     <skip />
-    <string name="cell_broadcast_settings" msgid="4124461751977706019">"Arifa za tahadhari"</string>
+    <string name="cell_broadcast_settings" msgid="4124461751977706019">"Arifa za dharura"</string>
     <string name="network_operators_settings" msgid="2583178259504630435">"Kampuni zinazotoa huduma za mitandao"</string>
-    <string name="access_point_names" msgid="1381602020438634481">"Majina ya Lango la Mtandao"</string>
+    <string name="access_point_names" msgid="1381602020438634481">"Majina ya milango ya Mtandao"</string>
     <string name="enhanced_4g_lte_mode_title" msgid="5808043757309522392">"Hali Iliyoimarishwa ya 4G LTE"</string>
     <string name="enhanced_4g_lte_mode_summary" msgid="1376589643017218924">"Tumia data ya LTE ili uongeze ubora wa sauti na mawasiliano (Inapendekezwa)"</string>
     <string name="preferred_network_type_title" msgid="3431041717309776341">"Aina ya mtandao unaoupendelea"</string>
@@ -2687,9 +2706,9 @@
     <string name="sim_settings_title" msgid="6822745211458959756">"SIM kadi"</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">"SIM kadi zimebadilika"</string>
-    <string name="sim_cards_changed_message_summary" msgid="8258058274989383204">"Gonga ili uweke mipangilio ya shughuli"</string>
+    <string name="sim_cards_changed_message_summary" msgid="8258058274989383204">"Gusa ili uweke mipangilio ya shughuli"</string>
     <string name="sim_cellular_data_unavailable" msgid="9109302537004566098">"Data ya mtandao wa simu haipatikani"</string>
-    <string name="sim_cellular_data_unavailable_summary" msgid="5416535001368135327">"Gonga ili uchague SIM ya data"</string>
+    <string name="sim_cellular_data_unavailable_summary" msgid="5416535001368135327">"Gusa ili uchague SIM ya data"</string>
     <string name="sim_calls_always_use" msgid="7936774751250119715">"Tumia hii kwa simu wakati wote"</string>
     <string name="select_sim_for_data" msgid="2366081042162853044">"Chagua SIM ya data"</string>
     <string name="data_switch_started" msgid="2040761479817166311">"Inabadili SIM ya data, hii inaweza kuchukua hadi dakika moja..."</string>
@@ -2708,6 +2727,8 @@
     <string name="color_purple" msgid="3888532466427762504">"Zambarau"</string>
     <string name="sim_no_inserted_msg" msgid="210316755353227087">"Hakuna SIM kadi zilizoingizwa"</string>
     <string name="sim_status_title" msgid="6744870675182447160">"Hali ya SIM"</string>
+    <!-- no translation found for sim_status_title_sim_slot (5725659316463979194) -->
+    <skip />
     <string name="sim_call_back_title" msgid="5181549885999280334">"Piga simu kwa kutumia SIM kadi chaguo-msingi"</string>
     <string name="sim_outgoing_call_title" msgid="1019763076116874255">"SIM ya kutumia kupiga simu"</string>
     <string name="sim_other_call_settings" msgid="8247802316114482477">"Mipangilio mingine ya simu"</string>
@@ -2717,16 +2738,19 @@
     <string name="preferred_network_offload_popup" msgid="2252915199889604600">"Zima Utangazaji wa Jina la Mtandao itazuia uunganishaji otomatiki kwenye mitandao iliyofichika."</string>
     <string name="sim_signal_strength" msgid="9144010043784767984">"dBm <xliff:g id="DBM">%1$d</xliff:g> asu <xliff:g id="ASU">%2$d</xliff:g>"</string>
     <string name="sim_notification_title" msgid="6272913297433198340">"SIM kadi zimebadilishwa."</string>
-    <string name="sim_notification_summary" msgid="8858043655706669772">"Gonga ili uweke mipangilio"</string>
+    <string name="sim_notification_summary" msgid="8858043655706669772">"Gusa ili uweke mipangilio"</string>
     <string name="sim_pref_divider" msgid="6778907671867621874">"SIM inayopendelewa kwa"</string>
     <string name="sim_calls_ask_first_prefs_title" msgid="7941299533514115976">"Uliza kila wakati"</string>
     <string name="sim_selection_required_pref" msgid="3446721423206414652">"Uteuzi unahitajika"</string>
+    <!-- no translation found for sim_selection_channel_title (2760909074892782589) -->
+    <skip />
     <string name="dashboard_title" msgid="5453710313046681820">"Mipangilio"</string>
     <plurals name="settings_suggestion_header_summary_hidden_items" formatted="false" msgid="5597356221942118048">
       <item quantity="other">Onyesha vipengee %d vilivyofichwa</item>
       <item quantity="one">Onyesha kipengee %d kilichofichwa</item>
     </plurals>
-    <string name="network_dashboard_title" msgid="4771589228992391573">"Mtandao na Intaneti"</string>
+    <string name="dashboard_suggestion_condition_footer_content_description" msgid="2898588191174845961">"Kunja"</string>
+    <string name="network_dashboard_title" msgid="3135144174846753758">"Mtandao na intaneti"</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>
@@ -2783,12 +2807,20 @@
     <string name="keywords_profile_challenge" msgid="789611397846512845">"mashindano kazini, kazi, wasifu"</string>
     <string name="keywords_unification" msgid="1922900767659821025">"wasifu wa kazini, wasifu uliodhibitiwa, unganisha, uunganishaji, kazi, wasifu"</string>
     <string name="keywords_gesture" msgid="3526905012224714078">"ishara"</string>
-    <string name="keywords_payment_settings" msgid="5220104934130446416">"lipa, gonga, malipo"</string>
+    <string name="keywords_payment_settings" msgid="5220104934130446416">"lipa, gusa, malipo"</string>
     <string name="keywords_backup" msgid="470070289135403022">"hifadhi rudufu, hifadhi nakala"</string>
     <string name="keywords_assist_gesture_launch" msgid="813968759791342591">"ishara"</string>
+    <!-- no translation found for keywords_imei_info (7230982940217544527) -->
+    <skip />
+    <!-- no translation found for keywords_sim_status (1474422416860990564) -->
+    <skip />
+    <!-- no translation found for keywords_model_and_hardware (1459248377212829642) -->
+    <skip />
+    <!-- no translation found for keywords_android_version (5591055570309015111) -->
+    <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>
+    <string name="status_awaiting_tap" msgid="2130145523773160617">"Gusa tagi ya NFC ili uandike..."</string>
     <string name="status_invalid_password" msgid="2575271864572897406">"Nenosiri si sahihi, jaribu tena."</string>
     <string name="status_write_success" msgid="5228419086308251169">"Imefanikiwa!"</string>
     <string name="status_failed_to_write" msgid="8072752734686294718">"Haiwezi kuandika data kwenye tagi ya NFC. Kama tatizo litaendelea, jaribu tagi tofauti"</string>
@@ -2820,17 +2852,23 @@
     <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">"Tahadhari"</string>
+    <string name="emergency_tone_alert" msgid="8941852695428130667">"Arifu"</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>
-    <plurals name="zen_mode_settings_summary_on" formatted="false" msgid="1216562765753405784">
-      <item quantity="other">Imewasha sheria <xliff:g id="ON_COUNT">%d</xliff:g> za kiotomatiki</item>
-      <item quantity="one">Imewasha sheria 1 ya kiotomatiki</item>
+    <string name="zen_mode_settings_summary_off" msgid="6119891445378113334">"Kamwe"</string>
+    <plurals name="zen_mode_settings_summary_on" formatted="false" msgid="7346979080337117366">
+      <item quantity="other">Amri <xliff:g id="ON_COUNT">%d</xliff:g></item>
+      <item quantity="one">Amri 1</item>
     </plurals>
-    <string name="zen_mode_settings_title" msgid="842308776768942600">"Mapendeleo ya hali ya Usinisumbue"</string>
-    <string name="zen_mode_priority_settings_title" msgid="2623117023031824309">"Yanayopewa kipaumbele ni"</string>
-    <string name="zen_mode_automation_settings_title" msgid="4228995740594063774">"Sheria otomatiki"</string>
+    <string name="zen_mode_settings_title" msgid="1066226840983908121">"Usisumbue"</string>
+    <string name="zen_mode_behavior_settings_title" msgid="1463303933529313969">"Tabia"</string>
+    <string name="zen_mode_behavior_allow_title" msgid="3845615648136218141">"Ruhusu sauti na mitetemo kutoka"</string>
+    <string name="zen_mode_behavior_no_sound" msgid="1219626004723208056">"Hakuna sauti"</string>
+    <string name="zen_mode_behavior_total_silence" msgid="6716603819806610626">"Hakuna sauti (Kimya Kabisa)"</string>
+    <string name="zen_mode_behavior_no_sound_except" msgid="4968477585788243114">"Hakuna sauti ila <xliff:g id="CATEGORIES">%1$s</xliff:g>"</string>
+    <string name="zen_mode_behavior_alarms_only" msgid="2423480992071472963">"Inaruhusu tu sauti za kengele, maudhui na mfumo (Kengele pekee)"</string>
+    <string name="zen_mode_automation_settings_title" msgid="2517800938791944915">"Washa kiotomatiki"</string>
+    <string name="zen_mode_automation_settings_page_title" msgid="7069221762714457987">"Sheria otomatiki"</string>
     <string name="zen_mode_automation_suggestion_title" msgid="5105443455143476201">"Weka sheria za Usinisumbue"</string>
     <string name="zen_mode_automation_suggestion_summary" msgid="4732808039946935657">"Dhibiti sauti na mitetemo wakati fulani"</string>
     <string name="zen_mode_option_important_interruptions" msgid="3903928008177972500">"Kipaumbele tu"</string>
@@ -2838,6 +2876,22 @@
     <string name="zen_mode_option_no_interruptions" msgid="8107126344850276878">"Kimya kabisa"</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">"Zuia ukatizaji wa maonyesho"</string>
+    <string name="zen_mode_visual_signals_settings_subtitle" msgid="6308824824208120508">"Ruhusu ishara zinazoonekena"</string>
+    <string name="zen_mode_add" msgid="90014394953272517">"Ongeza"</string>
+    <!-- no translation found for zen_mode_button_turn_on (5074744714613374902) -->
+    <skip />
+    <!-- no translation found for zen_mode_button_turn_off (1995551537320422792) -->
+    <skip />
+    <!-- no translation found for zen_mode_settings_dnd_manual_end_time_next_day (3090599225533484203) -->
+    <skip />
+    <!-- no translation found for zen_mode_settings_dnd_manual_indefinite (2746903915016850399) -->
+    <skip />
+    <!-- no translation found for zen_mode_settings_dnd_automatic_rule (3856133183910726786) -->
+    <skip />
+    <!-- no translation found for zen_mode_settings_dnd_automatic_rule_app (7112871101701453067) -->
+    <skip />
+    <!-- no translation found for zen_mode_settings_dnd_automatic_rule_multiple (5792308957602984360) -->
+    <skip />
     <string name="sound_work_settings" msgid="6774324553228566442">"Sauti za wasifu wa kazi"</string>
     <string name="work_use_personal_sounds_title" msgid="1148331221338458874">"Tumia sauti za wasifu wako binafsi"</string>
     <string name="work_use_personal_sounds_summary" msgid="6207040454949823153">"Sauti za wasifu wa binafsi na wa kazini ni sawa"</string>
@@ -2871,13 +2925,15 @@
     <string name="notifications_title" msgid="8086372779371204971">"Arifa"</string>
     <string name="app_notifications_title" msgid="5810577805218003760">"Arifa za programu"</string>
     <string name="notification_channel_title" msgid="2260666541030178452">"Aina ya arifa"</string>
+    <string name="notification_group_title" msgid="7180506440133859601">"Kikundi cha aina za arifa"</string>
     <string name="notification_importance_title" msgid="848692592679312666">"Umuhimu"</string>
-    <string name="notification_importance_unspecified" msgid="2196023702875112081">"Ruhusu programu iamue"</string>
+    <string name="notification_importance_unspecified" msgid="6622173510486113958">"Ruhusu sauti"</string>
     <string name="notification_importance_blocked" msgid="7938180808339386300">"Usawahi kuonyesha arifa"</string>
     <string name="notification_importance_min" msgid="5455049524984686275">"Hakuna kukatizwa kwa sauti au maonyesho"</string>
     <string name="notification_importance_low" msgid="8881468429453766553">"Hakuna sauti"</string>
     <string name="notification_importance_default" msgid="5958338024601957516">"Toa sauti"</string>
     <string name="notification_importance_high" msgid="2082429479238228527">"Toa sauti na ibukizi kwenye skrini"</string>
+    <string name="notification_importance_high_silent" msgid="2667033773703765252">"Ichomoze kwenye skrini"</string>
     <string name="notification_importance_min_title" msgid="6974673091137544803">"Chini"</string>
     <string name="notification_importance_low_title" msgid="8131254047772814309">"Wastani"</string>
     <string name="notification_importance_default_title" msgid="9120383978536089489">"Juu"</string>
@@ -2920,8 +2976,13 @@
     <string name="loading_notification_apps" msgid="5031818677010335895">"Inapakia programu ..."</string>
     <string name="app_notifications_off_desc" msgid="4882445501376722969">"Android inazuia arifa za programu hii ili zisionekane kwenye kifaa hiki"</string>
     <string name="channel_notifications_off_desc" msgid="5899225298718840635">"Android inazuia aina hizi za arifa ili zisionekane kwenye kifaa hiki"</string>
+    <string name="channel_group_notifications_off_desc" msgid="1620950416247316370">"Android inazuia kikundi hiki cha arifa ili zisionekane kwenye kifaa hiki"</string>
     <string name="notification_channels" msgid="5346841743182627500">"Aina"</string>
     <string name="notification_channels_other" msgid="5645317113885788226">"Nyingine"</string>
+    <plurals name="notification_group_summary" formatted="false" msgid="3420621520561455358">
+      <item quantity="other">Aina <xliff:g id="COUNT_1">%d</xliff:g></item>
+      <item quantity="one">Aina <xliff:g id="COUNT_0">%d</xliff:g></item>
+    </plurals>
     <string name="no_channels" msgid="3077375508177744586">"Programu hii haijachapisha arifa zozote"</string>
     <string name="app_settings_link" msgid="8894946007543660906">"Mipangilio ya ziada katika programu"</string>
     <string name="app_notification_listing_summary_zero" msgid="6482582965081108108">"Imewashwa katika programu zote"</string>
@@ -2941,8 +3002,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">"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_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_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>
@@ -2955,19 +3016,21 @@
     <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">"Ingiza jina la sheria"</string>
+    <string name="zen_mode_rule_name_hint" msgid="3781174510556433384">"Andika 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 zaidi"</string>
+    <string name="zen_mode_add_rule" msgid="9100929184624317193">"Ongeza sheria"</string>
+    <string name="zen_mode_add_event_rule" msgid="3997335103633946552">"Ongeza amri ya tukio"</string>
+    <string name="zen_mode_add_time_rule" msgid="5002080000597838703">"Ongeza amri ya wakati"</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 kufuta \"<xliff:g id="RULE">%1$s</xliff:g>\" 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_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>
     <string name="zen_mode_configure_rule" msgid="8865785428056490305">"Sanidi sheria"</string>
-    <string name="zen_schedule_rule_type_name" msgid="142936744435271449">"Sheria ya wakati"</string>
+    <string name="zen_schedule_rule_type_name" msgid="6163149826036287324">"Saa"</string>
     <string name="zen_schedule_rule_enabled_toast" msgid="3379499360390382259">"Sheria ya kiotomatiki imewekwa kuwasha kipengee cha Usinisumbue katika nyakati maalum"</string>
-    <string name="zen_event_rule_type_name" msgid="2645981990973086797">"Sheria ya tukio"</string>
+    <string name="zen_event_rule_type_name" msgid="6503468472212606158">"Tukio"</string>
     <string name="zen_event_rule_enabled_toast" msgid="6910577623330811480">"Sheria ya kiotomatiki imewekwa kuonyesha kipengee cha Usinisumbue wakati wa matukio maalum"</string>
     <string name="zen_mode_event_rule_calendar" msgid="8787906563769067418">"Wakati wa matukio ya"</string>
     <string name="zen_mode_event_rule_summary_calendar_template" msgid="5135844750232403975">"Wakati wa matukio ya <xliff:g id="CALENDAR">%1$s</xliff:g>"</string>
@@ -2975,7 +3038,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 Hakuna jibu"</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_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>
@@ -2984,13 +3047,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 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="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="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">"Barua pepe"</string>
+    <string name="zen_mode_messages" msgid="5886440273537510894">"Ujumbe"</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>
@@ -2998,12 +3061,13 @@
     <string name="zen_mode_from_starred" msgid="2678345811950997027">"Kutoka kwa anwani zenye nyota pekee"</string>
     <string name="zen_mode_from_none" msgid="8219706639954614136">"Hamna"</string>
     <string name="zen_mode_alarms" msgid="2165302777886552926">"Kengele"</string>
+    <string name="zen_mode_media_system_other" msgid="8900209390529859777">"Sauti za mfumo na maudhui"</string>
     <string name="zen_mode_reminders" msgid="5458502056440485730">"Vikumbusho"</string>
     <string name="zen_mode_events" msgid="7914446030988618264">"Matukio"</string>
     <string name="zen_mode_all_callers" msgid="584186167367236922">"Wapiga simu wote"</string>
     <string name="zen_mode_selected_callers" msgid="3127598874060615742">"Wale uliowachagua"</string>
     <string name="zen_mode_repeat_callers" msgid="5019521886428322131">"Wanaorudia kupiga simu"</string>
-    <string name="zen_mode_repeat_callers_summary" msgid="7192713032364140137">"Mtu yule yule akipiga simu mara ya pili ndani ya kipindi cha dakika <xliff:g id="MINUTES">%d</xliff:g>, mruhusu"</string>
+    <string name="zen_mode_repeat_callers_summary" msgid="239685342222975733">"Mtu yule yule akipiga simu mara ya pili katika kipindi cha dakika <xliff:g id="MINUTES">%d</xliff:g>"</string>
     <string name="zen_mode_when" msgid="2767193283311106373">"Washa kiotomatiki"</string>
     <string name="zen_mode_when_never" msgid="8809494351918405602">"Katu"</string>
     <string name="zen_mode_when_every_night" msgid="3122486110091921009">"Kila usiku"</string>
@@ -3022,22 +3086,19 @@
     </plurals>
     <string name="zen_mode_summary_alarms_only_by_time" msgid="7465525754879341907">"Badilisha utumie kengele pekee hadi <xliff:g id="FORMATTEDTIME">%1$s</xliff:g>"</string>
     <string name="zen_mode_summary_always" msgid="6172985102689237703">"Badilisha utumie hali ya katiza wakati wote"</string>
-    <string name="zen_mode_screen_on" msgid="7712038508173845101">"Zuia wakati skrini imewashwa"</string>
-    <string name="zen_mode_screen_on_summary" msgid="6444425984146305149">"Zuia arifa zilizozuiwa na kipengele cha Usinisumbue zisijitokeze kwa vyovyote vile kwenye skrini"</string>
-    <string name="zen_mode_screen_off" msgid="5026854939192419879">"Zuia wakati skrini imezimwa"</string>
-    <string name="zen_mode_screen_off_summary" msgid="6490932947651798094">"Zuia arifa zilizozuiwa na kipengele cha Usinisumbue zisiwashe skrini wala mwangaza wa arifa"</string>
-    <string name="zen_mode_screen_off_summary_no_led" msgid="3758698381956461866">"Zuia arifa zilizozuiwa na kipengele cha Usinisumbue zisiwashe skrini"</string>
-    <string name="zen_mode_all_visual_interruptions" msgid="2851308980832487411">"Imezimwa"</string>
-    <string name="zen_mode_screen_on_visual_interruptions" msgid="7373348148129140528">"Wakati skrini imewashwa"</string>
-    <string name="zen_mode_screen_off_visual_interruptions" msgid="4850792880144382633">"Wakati skrini imezimwa"</string>
-    <string name="zen_mode_no_visual_interruptions" msgid="8742776003822778472">"Wakati skrini imezimwa au imewashwa"</string>
+    <string name="zen_mode_screen_on" msgid="8774571998575673502">"Wakati skrini imewashwa"</string>
+    <string name="zen_mode_screen_on_summary" msgid="5385338884695802115">"Ruhusu arifa zilizozuiwa na kipengele cha Usinisimbue zichomoze kwenye skrini"</string>
+    <string name="zen_mode_screen_off" msgid="3144446765110327937">"Wakati skrini imezimwa"</string>
+    <string name="zen_mode_screen_off_summary" msgid="7430034620565812258">"Ruhusu arifa zilizozuiwa na kipengele cha Usinisumbue ziwashe skrini na kutoa mweko"</string>
+    <string name="zen_mode_screen_off_summary_no_led" msgid="2826121465026642017">"Ruhusu arifa zilizozuiwa na kipengele cha Usinisumbue ziwashe skrini"</string>
     <string name="notification_app_settings_button" msgid="6685640230371477485">"Mipangilio ya arifa"</string>
+    <string name="suggestion_button_text" msgid="3275010948381252006">"Sawa"</string>
     <string name="device_feedback" msgid="3238056036766293294">"Tuma maoni kuhusu kifaa hiki"</string>
     <string name="restr_pin_enter_admin_pin" msgid="1085834515677448072">"Weka PIN ya msimamizi"</string>
     <string name="switch_on_text" msgid="1124106706920572386">"Imewashwa"</string>
     <string name="switch_off_text" msgid="1139356348100829659">"Imezimwa"</string>
     <string name="screen_pinning_title" msgid="2292573232264116542">"Kudumisha programu moja"</string>
-    <string name="screen_pinning_description" msgid="3360904523688769289">"Wakati mipangilio hii imewashwa, unaweza kutumia kipengele cha kudumisha programu moja ili uweze kutumia skrini ya sasa hadi utakapokiondoa.\n\nIli kudumisha programu moja:\n\n1. Hakikisha kuwa umewasha kipengele cha kudumisha programu moja.\n\n2. Fungua skrini unayotaka kutumia.\n\n3. Gonga Muhtasari.\n\n4. Telezesha kidole juu kisha ugonge aikoni ya kubandika."</string>
+    <string name="screen_pinning_description" msgid="3360904523688769289">"Wakati mipangilio hii imewashwa, unaweza kutumia kipengele cha kudumisha programu moja ili uweze kutumia skrini ya sasa hadi utakapokiondoa.\n\nIli kudumisha programu moja:\n\n1. Hakikisha kuwa umewasha kipengele cha kudumisha programu moja.\n\n2. Fungua skrini unayotaka kutumia.\n\n3. Gusa Muhtasari.\n\n4. Telezesha kidole juu kisha uguse aikoni ya kubandika."</string>
     <string name="screen_pinning_unlock_pattern" msgid="8282268570060313339">"Omba mchoro wa kufungua kabla hujabandua"</string>
     <string name="screen_pinning_unlock_pin" msgid="8757588350454795286">"Itisha PIN kabla hujabandua"</string>
     <string name="screen_pinning_unlock_password" msgid="2514079566873826434">"Omba nenosiri kabla hujabandua"</string>
@@ -3048,10 +3109,10 @@
     <string name="encryption_interstitial_header" msgid="468015813904595613">"Uanzishaji salama"</string>
     <string name="encryption_continue_button" msgid="1121880322636992402">"Endelea"</string>
     <string name="encryption_interstitial_message_pin" msgid="2317181134653424679">"Unaweza kulinda kifaa hiki zaidi kwa kuweka mipangilio ya kuomba PIN yako kabla ya kukiwasha. Kifaa hakitaweza kupokea simu, ujumbe au arifa, zikiwemo kengele, hadi utakapokiwasha. \n\nHali hii itasaidia kulinda data yako ikiwa kifaa kitapotea au kuibwa. Ungependa kifaa kiombe PIN kabla ya kufunguka?"</string>
-    <string name="encryption_interstitial_message_pattern" msgid="7081249914068568570">"Unaweza kulinda kifaa hiki zaidi kwa kuweka mipangilio ya kuomba mchoro wako kabla ya kukiwasha. Kifaa hakitaweza kupokea simu, ujumbe au arifa, zikiwemo kengele, hadi utakapokiwasha. \n\nHali hii itasaidia kulinda data yako ikiwa kifaa kitapotea au kuibwa. Ungependa kifaa kiombe mchoro kabla ya kufunguka?"</string>
+    <string name="encryption_interstitial_message_pattern" msgid="7081249914068568570">"Unaweza kulinda kifaa hiki zaidi kwa kuweka mipangilio ya kukuhitaji uongeze mchoro wako kabla ya kukiwasha. Kifaa hakitaweza kupokea simu, ujumbe au arifa, zikiwemo kengele, hadi utakapokiwasha. \n\nHali hii itasaidia kulinda data yako ikiwa kifaa kitapotea au kuibwa. Ungependa kifaa kiitishe mchoro kabla ya kufunguka?"</string>
     <string name="encryption_interstitial_message_password" msgid="7796567133897436443">"Unaweza kulinda kifaa hiki zaidi kwa kuweka mipangilio ya kuomba nenosiri lako kabla ya kukiwasha. Kifaa hakitaweza kupokea simu, ujumbe au arifa, zikiwemo kengele, hadi utakapokiwasha. \n\nHali hii itasaidia kulinda data yako ikiwa kifaa kitapotea au kuibwa. Ungependa kifaa kiombe nenosiri kabla ya kufunguka?"</string>
     <string name="encryption_interstitial_message_pin_for_fingerprint" msgid="4550632760119547492">"Mbali na kutumia alama yako ya kidole, unaweza kukilinda zaidi kwa kuweka mipangilio ya kuomba PIN yako kabla ya kukiwasha. Kifaa hakitaweza kupokea simu, ujumbe au arifa, zikiwemo kengele, hadi utakapokiwasha. \n\nHali hii itasaidia kulinda data yako ikiwa kifaa kitapotea au kuibwa. Ungependa kifaa kiombe PIN kabla ya kufunguka?"</string>
-    <string name="encryption_interstitial_message_pattern_for_fingerprint" msgid="932184823193006087">"Mbali na kutumia alama yako ya kidole kufungua kifaa chako, unaweza kukilinda zaidi kwa kuweka mipangilio ya kuomba mchoro wako kabla ya kukiwasha. Kifaa hakitaweza kupokea simu, ujumbe au arifa, zikiwemo kengele, hadi utakapokiwasha. \n\nHali hii itasaidia kulinda data yako ikiwa kifaa kitapotea au kuibwa. Ungependa kifaa kiombe mchoro kabla ya kufunguka?"</string>
+    <string name="encryption_interstitial_message_pattern_for_fingerprint" msgid="932184823193006087">"Mbali na kutumia alama yako ya kidole kufungua kifaa chako, unaweza kukilinda zaidi kwa kuweka mipangilio itakayokuhitaji kuweka mchoro wako kabla ya kukiwasha. Kifaa hakitaweza kupokea simu, ujumbe au arifa, zikiwemo kengele, hadi utakapokiwasha. \n\nHali hii itasaidia kulinda data yako ikiwa kifaa kitapotea au kuibwa. Ungependa kifaa kiitishe mchoro kabla ya kufunguka?"</string>
     <string name="encryption_interstitial_message_password_for_fingerprint" msgid="5560954719370251702">"Mbali na kutumia alama ya kidole chako kufungua kifaa, unaweza kulinda kifaa hiki zaidi kwa kuweka nenosiri lako kabla ya kukifungua. Kifaa hakiwezi kupokea simu, ujumbe au arifa, ikiwa ni pamoja na kengele, hadi utakapokifungua.\n\nHii husaidia kulinda data kwenye vifaa vilivyopotea au vilivyoibwa. Ungependa kifaa kiombe nenosiri kabla ya kuanza kukitumia?"</string>
     <string name="encryption_interstitial_yes" msgid="4439509435889513411">"Ndiyo"</string>
     <string name="encryption_interstitial_no" msgid="8935031349097025137">"Hapana"</string>
@@ -3065,13 +3126,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 kwa chaguo-msingi"</string>
+    <string name="launch_by_default" msgid="1840761193189009248">"Fungua moja kwa moja"</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> imetumika 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> zimetumika 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>
@@ -3120,8 +3181,8 @@
     <string name="unknown_app" msgid="5275921288718717656">"Programu isiyojulikana"</string>
     <string name="app_permissions" msgid="4148222031991883874">"Ruhusa za programu"</string>
     <string name="app_permissions_summary" msgid="5163974162150406324">"Programu zinazotumia <xliff:g id="APPS">%1$s</xliff:g>"</string>
-    <string name="tap_to_wake" msgid="7211944147196888807">"Gonga ili uanze kutumia"</string>
-    <string name="tap_to_wake_summary" msgid="4341387904987585616">"Gonga mara mbili mahali popote kwenye skrini ili uanze kutumia kifaa"</string>
+    <string name="tap_to_wake" msgid="7211944147196888807">"Gusa ili uanze kutumia"</string>
+    <string name="tap_to_wake_summary" msgid="4341387904987585616">"Gusa mara mbili mahali popote kwenye skrini ili uanze kutumia kifaa"</string>
     <string name="domain_urls_title" msgid="3132983644568821250">"Viungo vya kufungua"</string>
     <string name="domain_urls_summary_none" msgid="2639588015479657864">"Usifungue viungo vinavyoweza kutumika"</string>
     <string name="domain_urls_summary_one" msgid="3704934031930978405">"Fungua <xliff:g id="DOMAIN">%s</xliff:g>"</string>
@@ -3182,11 +3243,11 @@
     <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 halipatikani"</string>
+    <string name="high_power_system" msgid="7362862974428225301">"Chaguo la kuboresha matumizi ya betri halipo"</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 ilipojazwa chaji mara ya mwisho"</string>
+    <string name="battery_summary" msgid="8044042095190688654">"Imetumia <xliff:g id="PERCENTAGE">%1$s</xliff:g> tangu mwisho ilipojazwa chaji"</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>
@@ -3199,15 +3260,15 @@
     <string name="sharing_remote_bugreport_dialog_message" msgid="5859287696666024466">"Ripoti hii ya hitilafu inashirikiwa na msimamizi wako wa TEHAMA. Wasiliana naye kwa maelezo zaidi."</string>
     <string name="share_remote_bugreport_action" msgid="532226159318779397">"Shiriki"</string>
     <string name="decline_remote_bugreport_action" msgid="518720235407565134">"Kataa"</string>
-    <string name="usb_use_charging_only" msgid="2180443097365214467">"Chaji kifaa hiki"</string>
+    <string name="usb_use_charging_only" msgid="2180443097365214467">"Kuchaji kifaa hiki"</string>
     <string name="usb_use_charging_only_desc" msgid="3066256793008540627">"Chaji tu kifaa hiki"</string>
-    <string name="usb_use_power_only" msgid="6426550616883919530">"Sambaza nishati"</string>
+    <string name="usb_use_power_only" msgid="6426550616883919530">"Kusambaza nishati"</string>
     <string name="usb_use_power_only_desc" msgid="3461232831015575152">"Chaji kifaa kilichounganishwa. Hufanya kazi kwenye vifaa vinavyotumia chaja za USB pekee."</string>
     <string name="usb_use_file_transfers" msgid="7409600791007250137">"Kuhamisha faili"</string>
     <string name="usb_use_file_transfers_desc" msgid="4235764784331804488">"Hamishia faili kwenye kifaa kingine"</string>
     <string name="usb_use_photo_transfers" msgid="7794775645350330454">"Kuhamisha picha (PTP)"</string>
     <string name="usb_use_photo_transfers_desc" msgid="2963034811151325996">"Hamisha picha au faili ikiwa MPT haiwezi kutumika (PTP)"</string>
-    <string name="usb_use_MIDI" msgid="870922185938298263">"Tumia kifaa kama MIDI"</string>
+    <string name="usb_use_MIDI" msgid="870922185938298263">"Kutumia kifaa kama MIDI"</string>
     <string name="usb_use_MIDI_desc" msgid="8473936990076693175">"Tumia kifaa hiki kama MIDI"</string>
     <string name="usb_use" msgid="3256040963685055320">"Tumia USB"</string>
     <string name="usb_pref" msgid="1400617804525116158">"USB"</string>
@@ -3216,6 +3277,7 @@
     <string name="usb_summary_file_transfers" msgid="6435943692610175111">"Kuhamisha faili"</string>
     <string name="usb_summary_photo_transfers" msgid="8440204169576585250">"Kuhamisha picha (PTP)"</string>
     <string name="usb_summary_MIDI" msgid="5687906612187885908">"Kutumia kifaa kama MIDI"</string>
+    <string name="sms_mirroring_pref" msgid="6475043279147376031">"Uakisi wa SMS"</string>
     <string name="background_check_pref" msgid="7550258400138010979">"Ukaguzi wa chini chini"</string>
     <string name="background_check_title" msgid="4534254315824525593">"Idhini ya kufikia chini chini"</string>
     <string name="assist_access_context_title" msgid="2269032346698890257">"Tumia maandishi kutoka skrini"</string>
@@ -3282,7 +3344,7 @@
     <string name="write_settings_title" msgid="4232152481902542284">"Inaweza kubadilisha mipangilio ya mfumo"</string>
     <string name="write_system_settings" msgid="3482913590601096763">"Badilisha mipangilio ya mfumo"</string>
     <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="permit_write_settings" msgid="658555006453212691">"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>
@@ -3309,12 +3371,12 @@
     <string name="screen_zoom_conversation_timestamp_3" msgid="3785674344762707688">"Jumanne saa 12:02 jioni"</string>
     <string name="screen_zoom_conversation_timestamp_4" msgid="2511469395448561259">"Jumanne saa 12:03 jioni"</string>
     <string name="disconnected" msgid="4836600637485526329">"Haijaunganishwa"</string>
-    <string name="data_usage_summary_format" msgid="7507047900192160585">"<xliff:g id="AMOUNT">%1$s</xliff:g> ya data imetumika"</string>
+    <string name="data_usage_summary_format" msgid="7507047900192160585">"<xliff:g id="AMOUNT">%1$s</xliff:g> za data zimetumika"</string>
     <plurals name="notification_summary" formatted="false" msgid="3941492005316143599">
       <item quantity="other">Zimezimwa katika programu <xliff:g id="COUNT">%d</xliff:g></item>
       <item quantity="one">Zimezimwa katika programu 1</item>
     </plurals>
-    <string name="notification_summary_none" msgid="4586376436702610">"Iwashwe katika programu zote"</string>
+    <string name="notification_summary_none" msgid="4586376436702610">"Zimewashwa 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>
@@ -3329,7 +3391,7 @@
     <string name="location_on_summary" msgid="5127631544018313587">"WASHA / <xliff:g id="LOCATION_MODE">%1$s</xliff:g>"</string>
     <string name="location_off_summary" msgid="6474350053215707957">"IMEZIMWA"</string>
     <string name="backup_disabled" msgid="485189128759595412">"Kipengee cha kuhifadhi nakala kimezimwa"</string>
-    <string name="about_summary" msgid="924181828102801010">"Imesasishwa na sasa inatumia Android <xliff:g id="VERSION">%1$s</xliff:g>"</string>
+    <string name="about_summary" msgid="924181828102801010">"Umesasishwa na sasa unatumia Android <xliff:g id="VERSION">%1$s</xliff:g>"</string>
     <string name="disabled_by_policy_title" msgid="627023216027648534">"Kitendo hakiruhusiwi"</string>
     <string name="disabled_by_policy_title_adjust_volume" msgid="7399450998356045023">"Haiwezi kubadilisha sauti"</string>
     <string name="disabled_by_policy_title_outgoing_calls" msgid="7919816644946067058">"Huruhusiwi kupiga simu"</string>
@@ -3348,7 +3410,7 @@
     <string name="condition_hotspot_title" msgid="7778958849468560027">"Mtandao-hewa umewashwa"</string>
     <string name="condition_hotspot_summary" msgid="3433182779269409683">"Mtandao-hewa wa Wi-Fi wa vifaa vya mkononi <xliff:g id="ID_1">%1$s</xliff:g> umewashwa, Wi-Fi imezimwa kwenye kifaa hiki."</string>
     <string name="condition_airplane_title" msgid="287356299107070503">"Hali ya ndegeni imewashwa"</string>
-    <string name="condition_airplane_summary" msgid="5561586417832393666">"Umezima Wi-Fi, Bluetooth na mitandao ya simu. Huwezi kupiga simu au kuunganisha kwenye Intaneti."</string>
+    <string name="condition_airplane_summary" msgid="3738805058182535606">"Umezima Wi-Fi, Bluetooth na mtandao wa simu. Huwezi kupiga simu au kuunganisha kwenye intaneti."</string>
     <string name="condition_zen_title" msgid="2679168532600816392">"Usinisumbue imewashwa (<xliff:g id="ID_1">%1$s</xliff:g>)"</string>
     <string name="condition_battery_title" msgid="3272131008388575349">"Kiokoa Betri kimewashwa"</string>
     <string name="condition_battery_summary" msgid="4418839236027977450">"Utendaji umepunguzwa. Huduma za Mahali na data ya chini chini zimezimwa."</string>
@@ -3377,9 +3439,10 @@
     <string name="color_temperature" msgid="2070126836910615605">"Halijoto ya rangi ya baridi"</string>
     <string name="color_temperature_desc" msgid="4793729830226404052">"Tumia rangi yenye halijoto ya baridi zaidi kwenye onyesho"</string>
     <string name="color_temperature_toast" msgid="4974218172133854827">"Zima skrini ili uweze kutekeleza ubadilishaji wa rangi"</string>
-    <string name="telephony_monitor_toast" msgid="7003764250271195384">"Ili kuweka mabadiliko ya kichunguzi cha shughuli za simu, washa kifaa tena"</string>
-    <string name="camera_hal_hdrplus_switch" msgid="8377365197105267466">"HAL HDR+ ya Kamera"</string>
-    <string name="camera_hal_hdrplus_toast" msgid="2063703797270055299">"Ili kutekeleza mabadiliko ya HAL HDR+ ya Kamera, washa kifaa tena"</string>
+    <string name="connectivity_monitor_switch" msgid="9059759348648583421">"Kichunguzi cha Muunganisho"</string>
+    <string name="connectivity_monitor_switch_summary" msgid="2828658652378866401">"Kichunguzi cha Muunganisho hukusanya kumbukumbu wakati kinatambua tatizo la muunganisho na kumwarifu mtumiaji kuwasilisha ripoti ya hitilafu"</string>
+    <string name="connectivity_monitor_toast" msgid="5551859612881173028">"Ili kuweka mabadiliko ya kichunguzi cha muunganisho, washa kifaa tena"</string>
+    <string name="camera_laser_sensor_switch" msgid="8913588990743234440">"Kitambuzi cha Leza ya Kamera"</string>
     <string name="ota_disable_automatic_update" msgid="2319639631655915050">"Masasisho ya mfumo kiotomatiki"</string>
     <string name="usage" msgid="2977875522080448986">"Matumizi"</string>
     <string name="cellular_data_usage" msgid="2155683719898158203">"Matumizi ya data ya mtandao wa simu"</string>
@@ -3405,7 +3468,7 @@
     <string name="data_warning" msgid="209133958008062117">"Onyo kuhusu data"</string>
     <string name="set_data_limit" msgid="2901526323210516923">"Weka kikomo cha data"</string>
     <string name="data_limit" msgid="1885406964934590552">"Kikomo cha data"</string>
-    <string name="data_usage_template" msgid="392191945602400904">"<xliff:g id="ID_1">%1$s</xliff:g> zilitumiwa kati ya <xliff:g id="ID_2">%2$s</xliff:g>"</string>
+    <string name="data_usage_template" msgid="2923744765873163859">"<xliff:g id="ID_1">%1$s</xliff:g> zimetumika kuanzia <xliff:g id="ID_2">%2$s</xliff:g>"</string>
     <string name="configure" msgid="1029654422228677273">"Weka mipangilio"</string>
     <string name="data_usage_other_apps" msgid="3272872663517382050">"Programu zingine zilizojumuishwa katika matumizi"</string>
     <plurals name="data_saver_unrestricted_summary" formatted="false" msgid="2635267833484232703">
@@ -3413,7 +3476,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="952796077540228711">"Data isiyo na kikomo"</string>
+    <string name="unrestricted_data_saver" msgid="952796077540228711">"Data bila kipimo"</string>
     <string name="restrict_background_blacklisted" msgid="3995443391711013068">"Data ya chini chini imezimwa"</string>
     <string name="data_saver_on" msgid="6774217590237934709">"Kimewashwa"</string>
     <string name="data_saver_off" msgid="6892309031162738794">"Kimezimwa"</string>
@@ -3429,7 +3492,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 kuwashwa kiotomatiki"</string>
+    <string name="battery_saver_desc_turn_on_auto_never" msgid="6715896635178578813">"Kisiwahi kujiwasha 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>
@@ -3474,7 +3537,7 @@
     <string name="button_confirm_convert_fbe" msgid="7101855374850373091">"Futa na ugeuze"</string>
     <string name="reset_shortcut_manager_throttling" msgid="6495066467198668994">"Weka upya mipangilio ya udhibiti wa ukadiriaji katika Kidhibiti cha Njia za Mkato"</string>
     <string name="reset_shortcut_manager_throttling_complete" msgid="1826770872063707900">"Imeweka upya mipangilio ya udhibiti wa ukadiriaji katika Kidhibiti cha Njia za Mkato"</string>
-    <string name="notification_suggestion_title" msgid="4506524937307816475">"Dhibiti arifa za kufunga skrini"</string>
+    <string name="notification_suggestion_title" msgid="387052719462473500">"Dhibiti maelezo kwenye skrini iliyofungwa"</string>
     <string name="notification_suggestion_summary" msgid="8521159741445416875">"Onyesha au ufiche maudhui ya arifa"</string>
     <string name="page_tab_title_summary" msgid="4070309266374993258">"Zote"</string>
     <string name="page_tab_title_support" msgid="8483187649355540109">"Usaidizi na vidokezo"</string>
@@ -3482,7 +3545,7 @@
     <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>
     <string name="premium_sms_access" msgid="4660047004791638305">"Kufikia huduma ya SMS zinazolipiwa"</string>
-    <string name="bluetooth_disabled" msgid="2456198532288640046">"Vifaa vingine haviioni"</string>
+    <string name="bluetooth_disabled" msgid="6244000672828617410">"Imezimwa"</string>
     <string name="bluetooth_connected_summary" msgid="7672528674593152862">"Imeunganishwa kwenye <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="bluetooth_connected_multiple_devices_summary" msgid="9173661896296663932">"Imeunganishwa kwenye vifaa vingi"</string>
     <string name="demo_mode" msgid="2798762752209330277">"Hali ya onyesho la kiolesura cha mfumo"</string>
@@ -3528,13 +3591,6 @@
       <item quantity="one">Sekunde 1</item>
     </plurals>
     <string name="support_estimated_wait_time" msgid="6523081420029378051">"Subiri kwa ~<xliff:g id="ESTIMATE">%1$s</xliff:g>"</string>
-    <string name="bluetooth_talkback_computer" msgid="4875089335641234463">"Kompyuta"</string>
-    <string name="bluetooth_talkback_headset" msgid="5140152177885220949">"Vifaa vya sauti"</string>
-    <string name="bluetooth_talkback_phone" msgid="4260255181240622896">"Simu"</string>
-    <string name="bluetooth_talkback_imaging" msgid="551146170554589119">"Kupiga picha"</string>
-    <string name="bluetooth_talkback_headphone" msgid="26580326066627664">"Kifaa cha sauti"</string>
-    <string name="bluetooth_talkback_input_peripheral" msgid="5165842622743212268">"Vifaa vya Ziada vya Kuingiza Data"</string>
-    <string name="bluetooth_talkback_bluetooth" msgid="5615463912185280812">"Bluetooth"</string>
     <string name="automatic_storage_manager_settings" msgid="7819434542155181607">"Dhibiti hifadhi"</string>
     <string name="automatic_storage_manager_text" msgid="4562950476680600604">"Ili kuongeza nafasi ya hifadhi, kidhibiti cha hifadhi huondoa picha na video zilizohifadhiwa nakala kwenye kifaa chako."</string>
     <string name="automatic_storage_manager_days_title" msgid="2017913896160914647">"Ondoa picha na video"</string>
@@ -3556,10 +3612,10 @@
     <string name="double_twist_for_camera_suggestion_summary" product="default" msgid="447403641027147153">"Geuza simu mara mbili ili uweke picha ya kujipiga mwenyewe"</string>
     <string name="double_twist_for_camera_suggestion_summary" product="tablet" msgid="1724660290703318739">"Geuza kompyuta kibao mara mbili ili uweke picha ya kujipiga mwenyewe"</string>
     <string name="double_twist_for_camera_suggestion_summary" product="device" msgid="5980398380988039489">"Geuza kifaa mara mbili ili uweke picha ya kujipiga mwenyewe"</string>
-    <string name="ambient_display_title" product="default" msgid="5144814600610448504">"Gonga mara mbili ili uangalie simu"</string>
-    <string name="ambient_display_title" product="tablet" msgid="8688795028609563837">"Gonga mara mbili ili uangalie kompyuta kibao"</string>
-    <string name="ambient_display_title" product="device" msgid="3423781975742145894">"Gonga mara mbili ili uangalie kifaa"</string>
-    <string name="ambient_display_summary" msgid="525662960806416373">"Ili uangalie saa, aikoni za arifa na maelezo mengine, gonga skrini yako mara mbili."</string>
+    <string name="ambient_display_title" product="default" msgid="5144814600610448504">"Gusa mara mbili ili uangalie simu"</string>
+    <string name="ambient_display_title" product="tablet" msgid="8688795028609563837">"Gusa mara mbili ili uangalie kompyuta kibao"</string>
+    <string name="ambient_display_title" product="device" msgid="3423781975742145894">"Gusa mara mbili ili uangalie kifaa"</string>
+    <string name="ambient_display_summary" msgid="525662960806416373">"Ili uangalie saa, aikoni za arifa na maelezo mengine, gusa skrini yako mara mbili."</string>
     <string name="ambient_display_suggestion_summary" msgid="5987443721392571847">"Angalia arifa wakati skrini imezimwa"</string>
     <string name="ambient_display_pickup_title" product="default" msgid="818688002837687268">"Inua ili uangalie simu"</string>
     <string name="ambient_display_pickup_title" product="tablet" msgid="4455864282995698097">"Inua ili uangalie kompyuta kibao"</string>
@@ -3569,6 +3625,7 @@
     <string name="ambient_display_pickup_summary" product="device" msgid="8256669101643381568">"Ili uangalie saa, aikoni za arifa na maelezo mengine, chukua kifaa chako."</string>
     <string name="ambient_display_pickup_suggestion_summary" msgid="7014700589991761035">"Angalia arifa wakati skrini imezimwa"</string>
     <string name="fingerprint_swipe_for_notifications_title" msgid="5816346492253270243">"Telezesha kidole ili upate arifa"</string>
+    <string name="fingerprint_gesture_screen_title" msgid="8562169633234041196">"Telezesha alama ya kidole"</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>
@@ -3577,14 +3634,15 @@
     <string name="gesture_setting_on" msgid="3455094265233870280">"Imewashwa"</string>
     <string name="gesture_setting_off" msgid="5230169535435881894">"Imezimwa"</string>
     <string name="oem_unlock_enable_disabled_summary_bootloader_unlocked" msgid="4265541229765635629">"Tayari kipakiaji cha mfumo wa uendeshaji kimefunguliwa"</string>
-    <string name="oem_unlock_enable_disabled_summary_connectivity" msgid="415954951226204461">"Unganisha kwenye Intaneti kwanza"</string>
-    <string name="oem_unlock_enable_disabled_summary_connectivity_or_locked" msgid="5884723935668892613">"Unganisha kwenye Intaneti au wasiliana na mtoa huduma wako"</string>
+    <string name="oem_unlock_enable_disabled_summary_connectivity" msgid="3361344735430813695">"Unganisha kwenye intaneti kwanza"</string>
+    <string name="oem_unlock_enable_disabled_summary_connectivity_or_locked" msgid="2479038689567925511">"Unganisha kwenye intaneti au uwasiliane na mtoa huduma wako"</string>
     <string name="oem_unlock_enable_disabled_summary_sim_locked_device" msgid="4149387448213399630">"Haipatikani kwenye baadhi ya vifaa vilivyofungwa na mtoa huduma"</string>
+    <string name="oem_lock_info_message" msgid="9218313722236417510">"Tafadhali zima kisha uwashe kifaa ili kuwasha kipengele cha ulinzi wa kifaa."</string>
     <string name="automatic_storage_manager_freed_bytes" msgid="7517560170441007788">"Imepata <xliff:g id="SIZE">%1$s</xliff:g>\n\nIlitumika mara ya mwisho tarehe <xliff:g id="DATE">%2$s</xliff:g>"</string>
     <string name="web_action_enable_title" msgid="4051513950976670853">"Programu zinazofunguka papo hapo"</string>
     <string name="web_action_enable_summary" msgid="3108127559723396382">"Fungua viungo katika programu, hata kama programu hazijasakinishwa"</string>
     <string name="web_action_section_title" msgid="7364647086538399136">"Programu zinazofunguka papo hapo"</string>
-    <string name="instant_apps_account" msgid="1433620209791992528">"Akaunti ya programu zinazofunguka papo hapo"</string>
+    <string name="instant_apps_settings" msgid="8827777916518348213">"Mapendeleo ya Programu Zinazofunguka Papo Hapo"</string>
     <string name="domain_url_section_title" msgid="7046835219056428883">"Programu zilizosakinishwa"</string>
     <string name="automatic_storage_manager_activation_warning" msgid="6353100011690933254">"Hifadhi yako sasa inasimamiwa na kidhibiti cha hifadhi"</string>
     <string name="account_for_section_header" msgid="5356566418548737121">"Akaunti za <xliff:g id="USER_NAME">%1$s</xliff:g>"</string>
@@ -3631,7 +3689,9 @@
     <string name="enterprise_privacy_always_on_vpn_personal" msgid="9217774730260037434">"Kila mara VPN iwe imewashwa kwenye wasifu wako wa binafsi"</string>
     <string name="enterprise_privacy_always_on_vpn_work" msgid="7244472958208315814">"Kila mara VPN iwe imewashwa kwenye wasifu wako wa kazini"</string>
     <string name="enterprise_privacy_global_http_proxy" msgid="7936664553416257333">"Seva mbadala ya HTTP ya jumla iwekekwa"</string>
-    <string name="enterprise_privacy_ca_certs" msgid="5885892204903688909">"Stakabadhi zinazoaminika"</string>
+    <string name="enterprise_privacy_ca_certs_device" msgid="2019652712782510262">"Stakabadhi zinazoaminika"</string>
+    <string name="enterprise_privacy_ca_certs_personal" msgid="2279084820904076599">"Kitambulisho cha kuaminika katika wasifu wako wa binafsi"</string>
+    <string name="enterprise_privacy_ca_certs_work" msgid="6187377647815301809">"Kitambulisho cha kuaminika katika wasifu wako wa kazini"</string>
     <plurals name="enterprise_privacy_number_ca_certs" formatted="false" msgid="526375234629534165">
       <item quantity="other">Angalau vyeti <xliff:g id="COUNT_1">%d</xliff:g> vya CA</item>
       <item quantity="one">Angalau cheti <xliff:g id="COUNT_0">%d</xliff:g> cha CA</item>
@@ -3685,6 +3745,8 @@
     <string name="autofill_confirmation_message" msgid="2784869528908005194">"&lt;b&gt;Hakikisha kuwa unaamini programu hii&lt;/b&gt; &lt;br/&gt; &lt;br/&gt; &lt;xliff:g id=app_name example=Google Autofill&gt;%1$s&lt;/xliff:g&gt; hutumia kilicho kwenye skrini yako kubaini kinachoweza kujazwa kiotomatiki."</string>
     <string name="device_theme" msgid="4571803018917608588">"Mandhari ya kifaa"</string>
     <string name="default_theme" msgid="7085644992078579076">"Chaguo-msingi"</string>
+    <string name="show_operator_name_title" msgid="805135053530442951">"Jina la mtandao"</string>
+    <string name="show_operator_name_summary" msgid="5962567590205757550">"Onyesha jina la mtandao kwenye sehemu ya arifa"</string>
     <string name="storage_manager_indicator" msgid="1516810749625915020">"Kidhibiti Hifadhi: <xliff:g id="STATUS">^1</xliff:g>"</string>
     <string name="storage_manager_indicator_off" msgid="7488057587180724388">"Kimezimwa"</string>
     <string name="storage_manager_indicator_on" msgid="8625551710194584733">"Kimewashwa"</string>
@@ -3694,6 +3756,8 @@
     <string name="carrier_provisioning" msgid="4398683675591893169">"Maelezo ya Utaratibu wa Mtoa Huduma"</string>
     <string name="trigger_carrier_provisioning" msgid="3434865918009286187">"Anzisha Utaratibu wa Mtoa Huduma"</string>
     <string name="new_device_suggestion_title" msgid="698847081680980774">"Nini kipya na cha kusisimua?"</string>
-    <string name="new_device_suggestion_summary" msgid="7172709269203435870">"Angalia vipengele 5 vikuu"</string>
+    <string name="new_device_suggestion_summary" product="default" msgid="206396571522515855">"Kagua simu yako mpya"</string>
+    <string name="new_device_suggestion_summary" product="tablet" msgid="393751455688210956">"Kagua kompyuta yako kibao mpya"</string>
+    <string name="new_device_suggestion_summary" product="device" msgid="2939870049868336652">"Kagua kifaa chako kipya"</string>
     <string name="disabled_low_ram_device" msgid="3751578499721173344">"Kipengele hiki hakipatikani kwenye kifaa hiki"</string>
 </resources>
diff --git a/res/values-sw600dp/dimens.xml b/res/values-sw600dp/dimens.xml
index 4d30969..1f78abd 100755
--- a/res/values-sw600dp/dimens.xml
+++ b/res/values-sw600dp/dimens.xml
@@ -60,6 +60,7 @@
     <dimen name="switchbar_subsettings_margin_end">24dp</dimen>
 
     <dimen name="search_bar_height">64dp</dimen>
+    <dimen name="search_bar_half_height">32dp</dimen>
 
     <!-- Dimensions for Wifi Assistant Card -->
     <dimen name="wifi_assistant_padding_top_bottom">24dp</dimen>
diff --git a/res/values-ta/arrays.xml b/res/values-ta/arrays.xml
index e9fe8f7..8115916 100644
--- a/res/values-ta/arrays.xml
+++ b/res/values-ta/arrays.xml
@@ -100,8 +100,6 @@
     <!-- no translation found for wifi_security_no_eap:0 (2084555984818107151) -->
     <!-- no translation found for wifi_security_no_eap:1 (397579322683471524) -->
     <!-- no translation found for wifi_security_no_eap:2 (1968820975358150484) -->
-    <!-- no translation found for wifi_ap_security:0 (5251664683198623324) -->
-    <!-- no translation found for wifi_ap_security:1 (7989073072260294673) -->
   <string-array name="wifi_eap_method">
     <item msgid="1160193392455075561">"PEAP"</item>
     <item msgid="7981731051382306293">"TLS"</item>
@@ -293,7 +291,7 @@
     <item msgid="7222837656938871633">"sipஐப் பயன்படுத்து"</item>
     <item msgid="6108267038969274380">"வெளிச்செல்லும் அழைப்பைச் செயலாக்கு"</item>
     <item msgid="4823402479973873358">"கைரேகை"</item>
-    <item msgid="5895843015407713543">"உடல் உணர்விகள்"</item>
+    <item msgid="5895843015407713543">"உடல் சென்சார்கள்"</item>
     <item msgid="1436446526955010826">"செல் பிராட்காஸ்ட்களைப் படி"</item>
     <item msgid="884172201575690484">"போலியான இருப்பிடம்"</item>
     <item msgid="3591971310048485247">"சேமிப்பகத்தைப் படி"</item>
@@ -360,7 +358,7 @@
     <item msgid="864565065016166003">"sipஐப் பயன்படுத்து"</item>
     <item msgid="1958009349883195116">"வெளிச்செல்லும் அழைப்பைச் செயலாக்கு"</item>
     <item msgid="8526563410140613458">"கைரேகை"</item>
-    <item msgid="7864822459293570891">"உடல் உணர்விகள்"</item>
+    <item msgid="7864822459293570891">"உடல் சென்சார்கள்"</item>
     <item msgid="6798698496904810960">"செல் பிராட்காஸ்ட்களைப் படி"</item>
     <item msgid="5242052845700875820">"போலியான இருப்பிடம்"</item>
     <item msgid="1246296877820358565">"சேமிப்பகத்தைப் படி"</item>
diff --git a/res/values-ta/strings.xml b/res/values-ta/strings.xml
index f326e1f..7a40f5a 100644
--- a/res/values-ta/strings.xml
+++ b/res/values-ta/strings.xml
@@ -36,7 +36,7 @@
     <string name="header_category_device" msgid="4544026001618307754">"சாதனம்"</string>
     <string name="header_category_personal" msgid="3310195187905720823">"தனிப்பட்டவை"</string>
     <string name="header_category_access" msgid="7580499097416970962">"அணுகல்"</string>
-    <string name="header_category_system" msgid="2816866961183068977">"முறைமை"</string>
+    <string name="header_category_system" msgid="2816866961183068977">"சிஸ்டம்"</string>
     <string name="radio_info_data_connection_enable" msgid="8656750679353982712">"தரவு இணைப்பை இயக்கு"</string>
     <string name="radio_info_data_connection_disable" msgid="8541302390883231216">"தரவு இணைப்பை முடக்கு"</string>
     <string name="volte_provisioned_switch_string" msgid="7979882929810283786">"VoLTE ஒதுக்கீட்டுக் கொடி இயக்கத்தில்"</string>
@@ -106,7 +106,7 @@
     <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="7830252930348734303">"சாதனத்தைத் துண்டிக்கவா?"</string>
     <string name="bluetooth_disconnect_all_profiles" product="default" msgid="8208712728668714199">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> இலிருந்து உங்கள் மொபைலின் இணைப்பு துண்டிக்கப்படும்."</string>
@@ -130,7 +130,7 @@
     <string name="bluetooth_notif_ticker" msgid="4726721390078512173">"புளூடூத் இணைப்பிற்கான கோரிக்கை"</string>
     <string name="bluetooth_notif_title" msgid="2485175521845371514">"இணைப்பிற்கான கோரிக்கை"</string>
     <string name="bluetooth_notif_message" msgid="5057417127600942904">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> உடன் இணைக்க, தட்டவும்."</string>
-    <string name="bluetooth_show_received_files" msgid="3144149432555230410">"பெற்ற கோப்புகள்"</string>
+    <string name="bluetooth_show_received_files" msgid="3144149432555230410">"புளூடூத்தில் வந்த ஃபைல்கள்"</string>
     <string name="device_picker" msgid="4978696506172252813">"புளூடூத் சாதனத்தைத் தேர்வுசெய்க"</string>
     <string name="bluetooth_ask_enablement" msgid="3387222809404177525">"புளூடூத்தை இயக்க <xliff:g id="APP_NAME">%1$s</xliff:g> விரும்புகிறது"</string>
     <string name="bluetooth_ask_disablement" msgid="5890386255790160573">"புளூடூத்தை முடக்க <xliff:g id="APP_NAME">%1$s</xliff:g> விரும்புகிறது"</string>
@@ -166,7 +166,7 @@
     <string name="bluetooth_map_acceptance_dialog_text" msgid="8712508202081143737">"உங்கள் செய்திகளை %1$s அணுக விரும்புகிறது. %2$s க்கு அணுகலை வழங்கவா?"</string>
     <string name="bluetooth_sap_request" msgid="2669762224045354417">"SIM அணுகல் கோரிக்கை"</string>
     <string name="bluetooth_sap_acceptance_dialog_text" msgid="4414253873553608690">"<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g> உங்கள் சிம் கார்டை அணுக விரும்புகிறது. சிம் கார்டிற்கு அணுகல் வழங்குவது இணைப்பின் போது, உங்கள் சாதனத்தின் தரவு இணைப்பை முடக்கும். <xliff:g id="DEVICE_NAME_1">%2$s?</xliff:g>க்கு அணுகல் வழங்கவும்"</string>
-    <string name="bluetooth_device_name_summary" msgid="4757990010751789977">"பிற சாதனங்களில் \'<xliff:g id="DEVICE_NAME">^1</xliff:g>\' எனத் தெரியும்"</string>
+    <string name="bluetooth_device_name_summary" msgid="522235742194965734">"பிற சாதனங்களில் “<xliff:g id="DEVICE_NAME">^1</xliff:g>” எனத் தெரியும்"</string>
     <string name="bluetooth_paired_device_title" msgid="8638994696317952019">"உங்கள் சாதனங்கள்"</string>
     <string name="bluetooth_pairing_page_title" msgid="7712127387361962608">"புதிய சாதனத்தை இணை"</string>
     <string name="date_and_time" msgid="9062980487860757694">"தேதி &amp; நேரம்"</string>
@@ -287,20 +287,20 @@
     <string name="radio_controls_title" msgid="3447085191369779032">"மேலும்"</string>
     <string name="wireless_networks_settings_title" msgid="3643009077742794212">"வயர்லெஸ் &amp; நெட்வொர்க்குகள்"</string>
     <string name="radio_controls_summary" msgid="1838624369870907268">"வைஃபை, புளூடூத், விமானப் பயன்முறை, மொபைல் நெட்வொர்க்குகள், &amp; VPNகள் ஆகியவற்றை நிர்வகி"</string>
-    <string name="cellular_data_title" msgid="6835451574385496662">"மொபைல் தரவு"</string>
+    <string name="cellular_data_title" msgid="6835451574385496662">"மொபைல் டேட்டா"</string>
     <string name="calls_title" msgid="3544471959217176768">"அழைப்புகள்"</string>
     <string name="sms_messages_title" msgid="1778636286080572535">"SMS செய்திகள்"</string>
     <string name="cellular_data_summary" msgid="4660351864416939504">"செல் நெட்வொர்க்கில் தரவு உபயோகத்தை அனுமதி"</string>
     <string name="allow_data_usage_title" msgid="2238205944729213062">"ரோமிங்கின் போது தரவுப் பயன்பாட்டை அனுமதி"</string>
     <string name="roaming" msgid="3596055926335478572">"தரவு ரோமிங்"</string>
-    <string name="roaming_enable" msgid="3737380951525303961">"ரோமிங்கின்போது தரவு சேவைகளுடன் இணை"</string>
-    <string name="roaming_disable" msgid="1295279574370898378">"ரோமிங்கின் போது தரவு சேவைகளுடன் இணை"</string>
+    <string name="roaming_enable" msgid="3737380951525303961">"ரோமிங்கின் போது டேட்டா சேவைகளுடன் இணை"</string>
+    <string name="roaming_disable" msgid="1295279574370898378">"ரோமிங்கின் போது டேட்டா சேவைகளுடன் இணை"</string>
     <string name="roaming_reenable_message" msgid="9141007271031717369">"உங்களுடைய உள்ளூர் நெட்வொர்க்கில் தரவு ரோமிங்கை முடக்கியுள்ளதால் உங்கள் தரவு இணைப்பை இழந்துவிட்டீர்கள்."</string>
     <string name="roaming_turn_it_on_button" msgid="4387601818162120589">"இதை இயக்கவும்"</string>
-    <string name="roaming_warning" msgid="4275443317524544705">"குறிப்பிடத்தக்க கட்டணங்கள் இருக்கலாம்."</string>
+    <string name="roaming_warning" msgid="4275443317524544705">"கட்டணம் விதிக்கப்படலாம்."</string>
     <string name="roaming_warning_multiuser" product="tablet" msgid="6458990250829214777">"நீங்கள் தரவு ரோமிங்கை அனுமதிக்கும்போது, குறிப்பிட்ட ரோமிங் கட்டணங்கள் உங்களுக்கு விதிக்கப்படலாம்!\n\nஅமைப்பானது, டேப்லெட்டில் உள்ள அனைவரையும் பாதிக்கும்."</string>
     <string name="roaming_warning_multiuser" product="default" msgid="6368421100292355440">"நீங்கள் தரவு ரோமிங்கை அனுமதிக்கும்போது, குறிப்பிட்ட ரோமிங் கட்டணங்கள் உங்களுக்கு விதிக்கப்படலாம்!\n\nஅமைப்பானது, தொலைபேசியில் உள்ள அனைவரையும் பாதிக்கும்."</string>
-    <string name="roaming_reenable_title" msgid="6068100976707316772">"தரவு ரோமிங்கை அனுமதிக்கவா?"</string>
+    <string name="roaming_reenable_title" msgid="6068100976707316772">"டேட்டா ரோமிங்கை அனுமதிக்கவா?"</string>
     <string name="networks" msgid="6333316876545927039">"ஆபரேட்டர் தேர்வு"</string>
     <string name="sum_carrier_select" msgid="3616956422251879163">"நெட்வொர்க் ஆபரேட்டரைத் தேர்வுசெய்யவும்"</string>
     <string name="date_and_time_settings_title" msgid="3350640463596716780">"தேதி &amp; நேரம்"</string>
@@ -312,6 +312,8 @@
     <string name="zone_auto" msgid="334783869352026648">"தானியங்கு நேர மண்டலம்"</string>
     <string name="zone_auto_summaryOn" msgid="6142830927278458314">"நெட்வொர்க் வழங்கும் நேர மண்டலத்தைப் பயன்படுத்து"</string>
     <string name="zone_auto_summaryOff" msgid="2597745783162041390">"நெட்வொர்க் வழங்கும் நேர மண்டலத்தைப் பயன்படுத்து"</string>
+    <string name="date_time_24hour_auto" msgid="2117383168985653422">"தானியங்கி 24 மணிநேர வடிவமைப்பு"</string>
+    <string name="date_time_24hour_auto_summary" msgid="6351812925651480277">"இயல்பாக உள்ளூர் நேரத்தைப் பயன்படுத்தும்"</string>
     <string name="date_time_24hour_title" msgid="3203537578602803850">"24 மணிநேர வடிவம்"</string>
     <string name="date_time_24hour" msgid="1193032284921000063">"24-மணிநேர வடிவமைப்பில்"</string>
     <string name="date_time_set_time_title" msgid="6296795651349047016">"நேரம்"</string>
@@ -327,32 +329,31 @@
     <string name="lock_after_timeout" msgid="4590337686681194648">"தானாகவே பூட்டு"</string>
     <string name="lock_after_timeout_summary" msgid="6128431871360905631">"உறக்கநிலைக்குச் சென்ற பிறகு <xliff:g id="TIMEOUT_STRING">%1$s</xliff:g>"</string>
     <string name="lock_immediately_summary_with_exception" msgid="9119632173886172690">"<xliff:g id="TRUST_AGENT_NAME">%1$s</xliff:g> ஆல் திறக்கப்பட்டிருக்கும் சூழல்கள் தவிர, பிற சூழல்களில் உடனடியாக உறக்கத்திற்குச் செல்லும்"</string>
-    <string name="lock_after_timeout_summary_with_exception" msgid="5579064842797188409">"<xliff:g id="TRUST_AGENT_NAME">%2$s</xliff:g> பயன்படுத்தாத போது, <xliff:g id="TIMEOUT_STRING">%1$s</xliff:g>க்குப் பின் உறக்கநிலையில் வை"</string>
+    <string name="lock_after_timeout_summary_with_exception" msgid="5579064842797188409">"உறங்கியதற்குப் பின் <xliff:g id="TIMEOUT_STRING">%1$s</xliff:g> முடிந்த பிறகு பூட்டிக்கொள்ளும்; <xliff:g id="TRUST_AGENT_NAME">%2$s</xliff:g> பயன்படுத்தினால் இவ்வாறு நிகழாது."</string>
     <string name="show_owner_info_on_lockscreen_label" msgid="5074906168357568434">"பூட்டுத் திரையில் உரிமையாளர் தகவலைக் காட்டு"</string>
-    <string name="owner_info_settings_title" msgid="5530285568897386122">"பூட்டுத் திரை செய்தி"</string>
+    <string name="owner_info_settings_title" msgid="5530285568897386122">"லாக் ஸ்கிரீன் செய்தி"</string>
     <string name="security_enable_widgets_title" msgid="2754833397070967846">"விட்ஜெட்களை இயக்கு"</string>
     <string name="security_enable_widgets_disabled_summary" msgid="6392489775303464905">"நிர்வாகி முடக்கியுள்ளார்"</string>
     <string name="owner_info_settings_summary" msgid="7472393443779227052">"ஏதுமில்லை"</string>
     <string name="owner_info_settings_status" msgid="120407527726476378">"<xliff:g id="COUNT_0">%1$d</xliff:g> / <xliff:g id="COUNT_1">%2$d</xliff:g>"</string>
-    <string name="owner_info_settings_edit_text_hint" msgid="7591869574491036360">"எ.கா., ஜோவின் அண்ட்ராய்டு."</string>
+    <string name="owner_info_settings_edit_text_hint" msgid="7591869574491036360">"எ.கா., சந்திராவின் ஆண்ட்ராய்டு."</string>
     <string name="user_info_settings_title" msgid="1195015434996724736">"பயனர் தகவல்"</string>
     <string name="show_profile_info_on_lockscreen_label" msgid="2741208907263877990">"பூட்டு திரையில் சுயவிவரத் தகவலைக் காட்டு"</string>
     <string name="profile_info_settings_title" msgid="3518603215935346604">"சுயவிவரத் தகவல்"</string>
     <string name="Accounts_settings_title" msgid="1643879107901699406">"கணக்குகள்"</string>
     <string name="location_settings_title" msgid="1369675479310751735">"இருப்பிடம்"</string>
     <string name="account_settings_title" msgid="626177544686329806">"கணக்குகள்"</string>
-    <!-- no translation found for security_settings_title (4918904614964215087) -->
-    <skip />
+    <string name="security_settings_title" msgid="4918904614964215087">"பாதுகாப்பு &amp; இருப்பிடம்"</string>
     <string name="encryption_and_credential_settings_title" msgid="6514904533438791561">"என்கிரிப்ஷன் &amp; அனுமதிச் சான்றுகள்"</string>
     <string name="encryption_and_credential_settings_summary" product="default" msgid="8721883002237981248">"ஃபோன் என்கிரிப்ட் செய்யப்பட்டது"</string>
     <string name="encryption_and_credential_settings_summary" product="tablet" msgid="7200428573872395685">"சாதனம் என்கிரிப்ட் செய்யப்பட்டது"</string>
-    <string name="lockscreen_settings_title" msgid="3922976395527087455">"பூட்டுத் திரை விருப்பத்தேர்வுகள்"</string>
+    <string name="lockscreen_settings_title" msgid="3922976395527087455">"லாக் ஸ்கிரீன் விருப்பத்தேர்வுகள்"</string>
     <string name="security_settings_summary" msgid="967393342537986570">"எனது இருப்பிடம், திரை திற, சிம் கார்டு பூட்டு, நற்சான்று சேமிப்பிட பூட்டு ஆகியவற்றை அமைக்கவும்"</string>
     <string name="cdma_security_settings_summary" msgid="6068799952798901542">"எனது இருப்பிடம், திரையைத் திற, நற்சான்று சேமிப்பிடப் பூட்டு ஆகியவற்றை அமைக்கவும்"</string>
     <string name="security_passwords_title" msgid="2881269890053568809">"தனியுரிமை"</string>
     <string name="disabled_by_administrator_summary" msgid="1601828700318996341">"நிர்வாகி முடக்கியுள்ளார்"</string>
     <string name="security_status_title" msgid="5848766673665944640">"பாதுகாப்பு நிலை"</string>
-    <string name="security_dashboard_summary" msgid="6757421634477554939">"திரைப் பூட்டு, கைரேகை"</string>
+    <string name="security_dashboard_summary" msgid="6757421634477554939">"ஸ்கிரீன் லாக், கைரேகை"</string>
     <string name="security_dashboard_summary_no_fingerprint" msgid="8129641548372335540">"திரைப் பூட்டு"</string>
     <string name="security_settings_fingerprint_preference_title" msgid="2488725232406204350">"கைரேகை"</string>
     <string name="fingerprint_manage_category_title" msgid="8293801041700001681">"கைரேகைகளை நிர்வகிக்கவும்"</string>
@@ -366,40 +367,43 @@
     <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" msgid="3508870672887336095">"மொபைலைத் திறக்க, வாங்குவதை அங்கீகரிக்க அல்லது பயன்பாடுகளில் உள்நுழைய, கைரேகை உணர்வியைத் தொட்டால் போதும். கைரேகையைப் பயன்படுத்தி மேலே குறிப்பிட்டுள்ளவற்றைச் செய்ய முடியும் என்பதால், அனைவரின் கைரேகைகளையும் இதில் சேர்க்க வேண்டாம்.\n\nகுறிப்பு: எளிதில் ஊகிக்க முடியாத வடிவம் அல்லது பின்னைப் பயன்படுத்தும் போது கிடைக்கும் பாதுகாப்பை விட, கைரேகையைப் பயன்படுத்தும் போது குறைவான பாதுகாப்பே கிடைக்கும்."</string>
     <string name="security_settings_fingerprint_enroll_introduction_message_unlock_disabled" msgid="1550756694054944874">"மொபைலைத் திறக்க அல்லது வாங்குவதை அங்கீகரிக்க, உங்கள் கைரேகையைப் பயன்படுத்தவும்.\n\n குறிப்பு: இந்தச் சாதனத்தைத் திறக்க, கைரேகையைப் பயன்படுத்த முடியாது. மேலும் தகவலுக்கு, உங்கள் நிறுவனத்தின் நிர்வாகியைத் தொடர்புகொள்ளவும்."</string>
-    <string name="security_settings_fingerprint_enroll_introduction_message_setup" msgid="6817326798834882531">"மொபைலைத் திறக்க அல்லது வாங்குவதை அங்கீகரிக்க, உங்கள் கைரேகையைப் பயன்படுத்தவும்.\nகுறிப்பு: உங்கள் கைரேகையானது வலுவான பேட்டர்ன் அல்லது பின்னை விட குறைந்த பாதுகாப்புடையதாக இருக்கக்கூடும்.\n"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_message_setup" msgid="6817326798834882531">"மொபைலைத் திறக்க அல்லது வாங்குவதை அங்கீகரிக்க, உங்கள் கைரேகையைப் பயன்படுத்தவும்.\nகுறிப்பு: எளிதில் ஊகிக்க முடியாத வடிவம் அல்லது பின்னைப் பயன்படுத்தும் போது கிடைக்கும் பாதுகாப்பை விட, கைரேகையைப் பயன்படுத்தும் போது குறைவான பாதுகாப்பே கிடைக்கும்.\n"</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel" msgid="3199351118385606526">"ரத்துசெய்"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue" msgid="7472492858148162530">"தொடரவும்"</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel_setup" msgid="5021369420474432665">"தவிர்"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue_setup" msgid="1961957425135180242">"அடுத்து"</string>
+    <string name="setup_fingerprint_enroll_skip_title" msgid="362050541117362034">"கைரேகையை அமைக்க வேண்டாமா?"</string>
+    <string name="setup_fingerprint_enroll_skip_after_adding_lock_text" msgid="958990414356204763">"கைரேகையை அமைப்பதற்கு ஒன்று அல்லது இரண்டு நிமிடங்கள் மட்டுமே ஆகும். தவிர்த்தால், பிறகு அமைப்புகளுக்குச் சென்று கைரேகையைச் சேர்க்கலாம்."</string>
+    <string name="lock_screen_intro_skip_title" msgid="4988210105913705679">"திரைப் பூட்டைத் தவிர்க்கவா?"</string>
     <string name="lock_screen_intro_skip_dialog_text_frp" product="tablet" msgid="1581834104051243425">"சாதனப் பாதுகாப்பு அம்சங்களை இயக்க முடியாது. இந்த டேப்லெட்டைத் தொலைத்தாலோ, திருடப்பட்டாலோ அல்லது மீட்டமைத்தாலோ, பிறர் இதைப் பயன்படுத்துவதைத் தடுக்க முடியாது."</string>
     <string name="lock_screen_intro_skip_dialog_text_frp" product="device" msgid="4629503416877189572">"சாதனப் பாதுகாப்பு அம்சங்களை இயக்க முடியாது. இந்தச் சாதனத்தைத் தொலைத்தாலோ, திருடப்பட்டாலோ அல்லது மீட்டமைத்தாலோ, பிறர் இதைப் பயன்படுத்துவதைத் தடுக்க முடியாது."</string>
     <string name="lock_screen_intro_skip_dialog_text_frp" product="default" msgid="2423428240245737909">"சாதனப் பாதுகாப்பு அம்சங்களை இயக்க முடியாது. இந்த மொபைலைத் தொலைத்தாலோ, திருடப்பட்டாலோ அல்லது மீட்டமைத்தாலோ, பிறர் இதைப் பயன்படுத்துவதைத் தடுக்க முடியாது."</string>
     <string name="lock_screen_intro_skip_dialog_text" product="tablet" msgid="5219287483885558525">"சாதனப் பாதுகாப்பு அம்சங்களை இயக்க முடியாது. இந்த டேப்லெட்டைத் தொலைத்தாலோ அல்லது திருடப்பட்டாலோ, பிறர் இதைப் பயன்படுத்துவதைத் தடுக்க முடியாது."</string>
     <string name="lock_screen_intro_skip_dialog_text" product="device" msgid="1466238255429527112">"சாதனப் பாதுகாப்பு அம்சங்களை இயக்க முடியாது. இந்தச் சாதனத்தைத் தொலைத்தாலோ அல்லது திருடப்பட்டாலோ, பிறர் இதைப் பயன்படுத்துவதைத் தடுக்க முடியாது."</string>
     <string name="lock_screen_intro_skip_dialog_text" product="default" msgid="3008526710555416125">"சாதனப் பாதுகாப்பு அம்சங்களை இயக்க முடியாது. இந்த மொபைலைத் தொலைத்தாலோ அல்லது திருடப்பட்டாலோ, பிறர் இதைப் பயன்படுத்துவதைத் தடுக்க முடியாது."</string>
-    <string name="skip_anyway_button_label" msgid="2323522873558834513">"பரவாயில்லை, தவிர்"</string>
+    <string name="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="3051496861358227199">"உணர்வியைத் தொடவும்"</string>
+    <string name="security_settings_fingerprint_enroll_find_sensor_title" msgid="3051496861358227199">"சென்சாரைத் தொடவும்"</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_message" msgid="8793966374365960368">"இது மொபைலின் பின்புறம் இருக்கும். ஆள்காட்டி விரலைப் பயன்படுத்தவும்."</string>
-    <string name="security_settings_fingerprint_enroll_find_sensor_content_description" msgid="2058830032070449160">"சாதனத்தில் கைரேகை உணர்வி அமைந்துள்ள இடத்தின் விளக்கப்படம்"</string>
+    <string name="security_settings_fingerprint_enroll_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="2068961812439460133">"உணர்வியைத் தொடவும்"</string>
+    <string name="security_settings_fingerprint_enroll_start_title" msgid="2068961812439460133">"சென்சாரைத் தொடவும்"</string>
     <string name="security_settings_fingerprint_enroll_start_message" msgid="3909929328942564524">"விரலை உணர்வியில் வைத்து, அதிர்வை உணர்ந்த பின்னர் விரலை எடுக்கவும்"</string>
-    <string name="security_settings_fingerprint_enroll_repeat_title" msgid="2819679722403209778">"விரலை தூக்கி, மீண்டும் தொடுக"</string>
-    <string name="security_settings_fingerprint_enroll_repeat_message" msgid="6158989350522518586">"கைரேகையின் வெவ்வேறு பகுதிகளைச் சேர்க்க, விரலைத் தூக்கவும்"</string>
+    <string name="security_settings_fingerprint_enroll_repeat_title" msgid="2819679722403209778">"விரலை எடுத்துவிட்டு, மீண்டும் தொடுக"</string>
+    <string name="security_settings_fingerprint_enroll_repeat_message" msgid="6158989350522518586">"கைரேகையின் பகுதிகளைச் சேர்க்க, விரலை எடுக்கவும்"</string>
     <string name="security_settings_fingerprint_enroll_finish_title" msgid="7567276170287972230">"கைரேகை சேர்க்கப்பட்டது"</string>
-    <string name="security_settings_fingerprint_enroll_finish_message" msgid="4796715961273420536">"இந்த ஐகானைப் பார்க்கும் போது, அடையாளப்படுத்தலுக்கு அல்லது வாங்குவதை அங்கீகரிக்க, உங்கள் கைரேகையைப் பயன்படுத்தவும்."</string>
+    <string name="security_settings_fingerprint_enroll_finish_message" msgid="4796715961273420536">"திரையில் இந்த ஐகானை நீங்கள் பார்க்கும் போது, உங்களை அடையாளப்படுத்துவதற்கு அல்லது ஆன்லைனில் வாங்குவதை அங்கீகரிக்க, உங்கள் கைரேகையைப் பயன்படுத்தவும்."</string>
     <string name="security_settings_fingerprint_enroll_enrolling_skip" msgid="3710211704052369752">"பின்னர் செய்"</string>
-    <string name="setup_fingerprint_enroll_enrolling_skip_title" msgid="6808422329107426923">"கைரேகை அமைவைத் தவிர்க்கவா?"</string>
-    <string name="setup_fingerprint_enroll_enrolling_skip_message" msgid="274849306857859783">"கைரேகையை மட்டும் பயன்படுத்தி மொபைலைத் திறக்கும் முறையைத் தேர்வுசெய்துள்ளீர்கள். இப்போது தவிர்த்தால், இதைப் பின்னர் அமைக்க வேண்டியிருக்கும். அமைவுக்குத் தோராயமாக ஒரு நிமிடம் மட்டுமே எடுக்கும்."</string>
+    <string name="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="2989019978041986175">"ஆள்காட்டி விரலால், பின்புற உணர்வியை தொடவும்."</string>
+    <string name="security_settings_fingerprint_enroll_touch_dialog_title" msgid="1863561601428695160">"அச்சச்சோ, அது சென்சார் இல்லை"</string>
+    <string name="security_settings_fingerprint_enroll_touch_dialog_message" msgid="2989019978041986175">"ஆள்காட்டி விரலால் சென்சாரைத் தொடவும்."</string>
     <string name="security_settings_fingerprint_enroll_error_dialog_title" msgid="3618021988442639280">"பதிவுசெய்ய முடியவில்லை"</string>
     <string name="security_settings_fingerprint_enroll_error_timeout_dialog_message" msgid="2942551158278899627">"கைரேகையைப் பதிவுசெய்வதற்கான நேரம் முடிந்தது. மீண்டும் முயற்சிக்கவும்."</string>
     <string name="security_settings_fingerprint_enroll_error_generic_dialog_message" msgid="3624760637222239293">"கைரேகையைப் பதிவுசெய்ய முடியவில்லை. மீண்டும் முயற்சிக்கவும் அல்லது வேறு விரலைப் பயன்படுத்தவும்."</string>
@@ -458,7 +462,7 @@
     <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="lock_settings_picker_fingerprint_added_security_message" msgid="5768002109707648463">"கூடுதல் பாதுகாப்பிற்கு, மாற்றுத் திரைப் பூட்டை அமைக்கவும்."</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>
@@ -589,21 +593,22 @@
     <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="lockpassword_clear_label" msgid="5724429464960458155">"அழி"</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="other"><xliff:g id="COUNT_1">%d</xliff:g> பயன்பாடுகள் செயலில் உள்ளன</item>
-      <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> பயன்பாடு செயலில் உள்ளது</item>
+      <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> பயன்பாடுகள் இயங்குகின்றன</item>
+      <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> பயன்பாடு இயங்குகிறது</item>
     </plurals>
     <string name="manage_trust_agents" msgid="4629279457536987768">"நம்பகமான ஏஜென்ட்கள்"</string>
     <string name="disabled_because_no_backup_security" msgid="6877660253409580377">"பயன்படுத்த, முதலில் திரைப்பூட்டை அமைக்கவும்"</string>
     <string name="manage_trust_agents_summary" msgid="1475819820389620546">"ஏதுமில்லை"</string>
     <plurals name="manage_trust_agents_summary_on" formatted="false" msgid="3935182396726101824">
-      <item quantity="other">செயலில் உள்ள <xliff:g id="COUNT">%d</xliff:g> நம்பக ஏஜென்ட்டுகள்</item>
-      <item quantity="one">செயலில் உள்ள 1 நம்பக ஏஜென்ட்</item>
+      <item quantity="other"><xliff:g id="COUNT">%d</xliff:g> நம்பக ஏஜென்ட்டுகள் இயங்குகின்றன</item>
+      <item quantity="one">1 நம்பக ஏஜென்ட் இயங்குகிறது</item>
     </plurals>
     <string name="bluetooth_quick_toggle_title" msgid="1037056952714061893">"புளூடூத்"</string>
     <string name="bluetooth_quick_toggle_summary" msgid="5293641680139873341">"புளூடூத்தை இயக்கு"</string>
@@ -649,7 +654,7 @@
     <string name="bluetooth_menu_advanced" msgid="8572178316357220524">"மேம்பட்டவை"</string>
     <string name="bluetooth_advanced_titlebar" msgid="2142159726881547669">"மேம்பட்ட புளூடூத்"</string>
     <string name="bluetooth_empty_list_bluetooth_off" msgid="6351930724051893423">"புளூடூத் இயக்கத்தில் இருக்கும்போது, உங்கள் சாதனம் அருகிலுள்ள பிற புளூடூத் சாதனங்களைத் தொடர்புகொள்ளலாம்."</string>
-    <string name="ble_scan_notify_text" msgid="1295915006005700650">"இருப்பிடத்தைத் துல்லியமாக அறிவதை மேம்படுத்த, முறைமையின் பயன்பாடுகளும் சேவைகளும் புளூடூத் முடக்கத்தில் இருக்கும் போதும் புளூடூத் சாதனங்களைக் கண்டறியும். இதை <xliff:g id="LINK_BEGIN_0">LINK_BEGIN</xliff:g>ஸ்கேன் செய்தல் அமைப்புகளில்<xliff:g id="LINK_END_1">LINK_END</xliff:g> மாற்றலாம்."</string>
+    <string name="ble_scan_notify_text" msgid="1295915006005700650">"இருப்பிடத்தை மேலும் துல்லியமாக அறிய, சாதனத்தின் ஆப்ஸ் மற்றும் சேவைகள் புளூடூத் சாதனங்களைக் கண்டறியும். இதை <xliff:g id="LINK_BEGIN_0">LINK_BEGIN</xliff:g>ஸ்கேனிங் அமைப்புகளில்<xliff:g id="LINK_END_1">LINK_END</xliff:g> மாற்றிக் கொள்ளலாம்."</string>
     <string name="bluetooth_connect_failed" msgid="4500234659813241053">"இணைக்க முடியவில்லை. மீண்டும் முயலவும்."</string>
     <string name="device_details_title" msgid="6576953269221085300">"சாதன விவரங்கள்"</string>
     <string name="bluetooth_device_mac_address" msgid="2513724313558236181">"சாதனத்தின் புளூடூத் முகவரி: <xliff:g id="ADDRESS">%1$s</xliff:g>"</string>
@@ -678,7 +683,7 @@
     <string name="bluetooth_dock_settings_headset" msgid="1001821426078644650">"ஸ்பீக்கர் ஃபோனாக"</string>
     <string name="bluetooth_dock_settings_a2dp" msgid="8791004998846630574">"இசை மற்றும் மீடியாவிற்காக"</string>
     <string name="bluetooth_dock_settings_remember" msgid="5551459057010609115">"அமைப்புகளை நினைவில்கொள்"</string>
-    <string name="wifi_display_settings_title" msgid="8740852850033480136">"அனுப்புதல்"</string>
+    <string name="wifi_display_settings_title" msgid="8740852850033480136">"Cast"</string>
     <string name="wifi_display_enable_menu_item" msgid="4883036464138167674">"வயர்லெஸ் காட்சியை இயக்கு"</string>
     <string name="wifi_display_no_devices_found" msgid="1382012407154143453">"அருகில் சாதனங்கள் எதுவுமில்லை."</string>
     <string name="wifi_display_status_connecting" msgid="5688608834000748607">"இணைக்கிறது"</string>
@@ -696,16 +701,16 @@
     <string name="wifi_ask_enable" msgid="2795469717302060104">"வைஃபையை இயக்க <xliff:g id="REQUESTER">%s</xliff:g> விரும்புகிறது"</string>
     <string name="wifi_ask_disable" msgid="728366570145493573">"வைஃபையை முடக்க <xliff:g id="REQUESTER">%s</xliff:g> விரும்புகிறது"</string>
     <string name="nfc_quick_toggle_title" msgid="6769159366307299004">"NFC"</string>
-    <string name="nfc_quick_toggle_summary" product="tablet" msgid="8302974395787498915">"டேப்லெட்டானது வேறொரு சாதனத்தைத் தொடும்போது தரவு பரிமாற்றத்தை அனுமதி"</string>
-    <string name="nfc_quick_toggle_summary" product="default" msgid="5237208142892767592">"மொபைலானது வேறொரு சாதனத்தைத் தொடும்போது தரவு பரிமாற்றத்தை அனுமதிக்கவும்"</string>
+    <string name="nfc_quick_toggle_summary" product="tablet" msgid="8302974395787498915">"டேப்லெட்டானது வேறொரு சாதனத்தைத் தொடும்போது தரவுப் பரிமாற்றத்தை அனுமதி"</string>
+    <string name="nfc_quick_toggle_summary" product="default" msgid="5237208142892767592">"வேறொரு சாதனத்தைத் தொடும்போது டேட்டா பரிமாற்றத்தை அனுமதி"</string>
     <string name="nfc_disclaimer_title" msgid="4364003873202264039">"NFCஐ இயக்கு"</string>
     <string name="nfc_disclaimer_content" msgid="5566907911915158075">"NFC ஆனது இந்தச் சாதனம் மற்றும் அருகிலுள்ள பிற சாதனங்கள் அல்லது இலக்குகளுக்கு இடையே (எ.கா: கட்டண முனையங்கள், ஆக்சஸ் ரீடர்கள், ஊடாடத்தக்க விளம்பரங்கள் அல்லது குறிகள்) தரவைப் பரிமாற்றும்."</string>
     <string name="android_beam_settings_title" msgid="7832812974600338649">"Android பீம்"</string>
-    <string name="android_beam_on_summary" msgid="3618057099355636830">"NFC வழியாகப் பயன்பாட்டின் உள்ளடக்கத்தைப் பரிமாற்றுவதை அனுமதிக்கும்"</string>
+    <string name="android_beam_on_summary" msgid="3618057099355636830">"NFC வழியாக ஆப்ஸ் உள்ளடக்கத்தைப் பரிமாற்றும்"</string>
     <string name="android_beam_off_summary" msgid="4663095428454779138">"முடக்கப்பட்டுள்ளது"</string>
     <string name="android_beam_disabled_summary" msgid="1737782116894793393">"NFC முடக்கப்பட்டுள்ளதால் கிடைக்கவில்லை"</string>
     <string name="android_beam_label" msgid="6257036050366775040">"Android பீம்"</string>
-    <string name="android_beam_explained" msgid="1810540319385192758">"இந்த அம்சம் இயக்கப்பட்டிருக்கும் போது, சாதனங்களை ஒன்றுக்கொன்று அருகில் வைத்துப் பிடிப்பதன் மூலம் பயன்பாட்டு உள்ளடக்கத்தை மற்றொரு NFC திறன் வாய்ந்த சாதனத்திற்குப் பீம் செய்யலாம். எடுத்துக்காட்டாக, உங்கள் உலாவிப் பக்கங்கள், YouTube வீடியோக்கள், தொடர்புகள், மேலும் பலவற்றைப் பீம் செய்யலாம்.\n\nசாதனங்களை ஒன்றுக்கொன்று மிகவும் அருகில் கொண்டுவந்து (அவற்றின் பின்பக்கம் சேர்ந்தார்போல்), உங்கள் திரையைத் தட்டவும். எதைப் பகிர வேண்டும் என்பதைப் பயன்பாடு தீர்மானிக்கும்."</string>
+    <string name="android_beam_explained" msgid="1810540319385192758">"இந்த அம்சம் இயக்கப்பட்டிருக்கும் போது, சாதனங்களை அருகில் வைத்துப் பிடித்து, ஆப்ஸ் உள்ளடக்கத்தை மற்றொரு NFC திறன் வாய்ந்த சாதனத்தில் தெரியுமாறு புரொஜக்ட் செய்யலாம். எடுத்துக்காட்டாக, உங்கள் இணையப் பக்கங்கள், YouTube வீடியோக்கள், தொடர்புகள், மேலும் பலவற்றை மற்றொரு சாதனத்தில் தெரியுமாறு புரொஜக்ட் செய்யலாம்.\n\nசாதனங்களின் பின்புறத்தை அருகில் கொண்டுவந்து, உங்கள் திரையில் தட்டவும். புரொஜக்ட் செய்ய வேண்டிய உள்ளடக்கத்தை மற்றொரு சாதனத்தில் இந்த அம்சம் காட்டும்."</string>
     <string name="wifi_quick_toggle_title" msgid="8850161330437693895">"வைஃபை"</string>
     <string name="wifi_quick_toggle_summary" msgid="2696547080481267642">"வைஃபையை இயக்கு"</string>
     <string name="wifi_settings" msgid="29722149822540994">"வைஃபை"</string>
@@ -718,7 +723,7 @@
     <string name="wifi_error" msgid="3207971103917128179">"பிழை"</string>
     <string name="wifi_sap_no_channel_error" msgid="3108445199311817111">"இந்த நாட்டில் 5 GHz அலைவரிசை இல்லை"</string>
     <string name="wifi_in_airplane_mode" msgid="8652520421778203796">"விமானப் பயன்முறையில்"</string>
-    <string name="wifi_notify_open_networks" msgid="76298880708051981">"நெட்வொர்க் அறிவிப்பைத் திற"</string>
+    <string name="wifi_notify_open_networks" msgid="76298880708051981">"கடவுச்சொல் கேட்காத நெட்வொர்க்குகளின் அறிவிப்புகள்"</string>
     <string name="wifi_notify_open_networks_summary" msgid="2761326999921366960">"உயர்தரமான பொது நெட்வொர்க் கிடைக்கும் போது தெரிவி"</string>
     <string name="wifi_wakeup" msgid="8815640989361538036">"தானாகவே வைஃபையை இயக்கு"</string>
     <string name="wifi_wakeup_summary" msgid="2530814331062997163">"உயர்தரம் எனச் சேமிக்கப்பட்ட நெட்வொர்க்குகளுக்கு (எடுத்துக்காட்டு: உங்கள் வீட்டு நெட்வொர்க்) அருகில் இருக்கும் போது, வைஃபை இயக்கப்படும்"</string>
@@ -727,12 +732,12 @@
     <string name="wifi_poor_network_detection" msgid="4925789238170207169">"வேகம் குறைந்த இணைப்புகளைத் தவிர்"</string>
     <string name="wifi_poor_network_detection_summary" msgid="2784135142239546291">"சிறப்பான இணைய இணைப்பைப் பெறும் வரை வைஃபை நெட்வொர்க்கைப் பயன்படுத்தாதே"</string>
     <string name="wifi_avoid_poor_network_detection_summary" msgid="4674423884870027498">"நல்ல இணைய இணைப்பு கொண்ட நெட்வொர்க்குகளை மட்டும் பயன்படுத்து"</string>
-    <string name="use_open_wifi_automatically_title" msgid="6851951242903078588">"திறந்த நெட்வொர்க்குகளுடன் இணை"</string>
+    <string name="use_open_wifi_automatically_title" msgid="6851951242903078588">"கடவுச்சொல் கேட்காத நெட்வொர்க்குகளுடன் இணை"</string>
     <string name="use_open_wifi_automatically_summary" msgid="2982091714252931713">"உயர்தரமான பொது நெட்வொர்க்குகளுடன் தானாக இணை"</string>
     <string name="use_open_wifi_automatically_summary_scoring_disabled" msgid="593964217679325831">"அம்சத்தைப் பயன்படுத்த, நெட்வொர்க் மதிப்பீட்டு வழங்குநரைத் தேர்ந்தெடுக்கவும்"</string>
     <string name="use_open_wifi_automatically_summary_scorer_unsupported_disabled" msgid="8472122600853650258">"அம்சத்தைப் பயன்படுத்த, இணங்கும் நெட்வொர்க் மதிப்பீட்டு வழங்குநரைத் தேர்ந்தெடுக்கவும்"</string>
-    <string name="wifi_install_credentials" msgid="3551143317298272860">"சான்றிதழ்களை நிறுவு"</string>
-    <string name="wifi_scan_notify_text" msgid="5593805423071186757">"இருப்பிடத்தைத் துல்லியமாக அறிவதை மேம்படுத்த, முறைமையின் பயன்பாடுகளும் சேவைகளும் வைஃபை முடக்கத்தில் இருக்கும் போதும் வைஃபை நெட்வொர்க்குகளை ஸ்கேன் செய்யும். இதை <xliff:g id="LINK_BEGIN_0">LINK_BEGIN</xliff:g>ஸ்கேன் செய்தல் அமைப்புகளில்<xliff:g id="LINK_END_1">LINK_END</xliff:g> மாற்ற முடியும்."</string>
+    <string name="wifi_install_credentials" msgid="3551143317298272860">"சான்றிதழ்களை நிறுவுதல்"</string>
+    <string name="wifi_scan_notify_text" msgid="5593805423071186757">"இருப்பிடத்தை மேலும் துல்லியமாக அறிய, சாதனத்தின் ஆப்ஸ் மற்றும் சேவைகள் வைஃபை நெட்வொர்க்குகளை ஸ்கேன் செய்யும். இதை <xliff:g id="LINK_BEGIN_0">LINK_BEGIN</xliff:g>ஸ்கேனிங் அமைப்புகளில்<xliff:g id="LINK_END_1">LINK_END</xliff:g> மாற்றிக் கொள்ளலாம்."</string>
     <string name="wifi_scan_notify_text_scanning_off" msgid="3426075479272242098">"இருப்பிடத்தின் துல்லியத்தன்மையை மேம்படுத்த, <xliff:g id="LINK_BEGIN_0">LINK_BEGIN</xliff:g>ஸ்கேனிங் அமைப்புகளில்<xliff:g id="LINK_END_1">LINK_END</xliff:g> வைஃபை ஸ்கேனிங்கை இயக்கவும்."</string>
     <string name="wifi_scan_notify_remember_choice" msgid="7104867814641144485">"மீண்டும் காட்டாதே"</string>
     <string name="wifi_setting_sleep_policy_title" msgid="5149574280392680092">"உறக்கநிலையில் Wi-Fi இயக்கு"</string>
@@ -742,9 +747,9 @@
     <string name="wifi_suspend_optimizations" msgid="1220174276403689487">"வைஃபையை மேம்படுத்துதல்"</string>
     <string name="wifi_suspend_optimizations_summary" msgid="4151428966089116856">"வைஃபையை இயக்கத்தில் இருக்கும்போது பேட்டரி பயன்பாட்டைக் குறை"</string>
     <string name="wifi_limit_optimizations_summary" msgid="9000801068363468950">"வைஃபை இன் பேட்டரி பயன்பாட்டை வரம்பிடு"</string>
-    <string name="wifi_switch_away_when_unvalidated" msgid="1707247692180853058">"வைஃபையில் இணைய அணுகல் இல்லை எனில், மொபைல் தரவிற்கு மாறவும்."</string>
-    <string name="wifi_cellular_data_fallback_title" msgid="8753386877755616476">"தானாகவே மொபைல் தரவிற்கு மாறு"</string>
-    <string name="wifi_cellular_data_fallback_summary" msgid="6375399280719867214">"வைஃபையில் இணைய அணுகல் இல்லாத போது, மொபைல் தரவைப் பயன்படுத்தும். தரவு உபயோகத்திற்குக் கட்டணம் விதிக்கப்படலாம்."</string>
+    <string name="wifi_switch_away_when_unvalidated" msgid="1707247692180853058">"வைஃபையில் இணைய அணுகல் இல்லை எனில், மொபைல் டேட்டாவிற்கு மாறவும்."</string>
+    <string name="wifi_cellular_data_fallback_title" msgid="8753386877755616476">"தானாகவே மொபைல் டேட்டாவிற்கு மாறு"</string>
+    <string name="wifi_cellular_data_fallback_summary" msgid="6375399280719867214">"வைஃபையில் இணைய அணுகல் இல்லாத போது, மொபைல் டேட்டாவைப் பயன்படுத்தும். தரவு உபயோகத்திற்குக் கட்டணம் விதிக்கப்படலாம்."</string>
     <string name="wifi_add_network" msgid="6234851776910938957">"நெட்வொர்க்கைச் சேர்"</string>
     <string name="wifi_configure_settings_preference_title" msgid="2913345003906899146">"வைஃபை விருப்பத்தேர்வுகள்"</string>
     <string name="wifi_configure_settings_preference_summary_wakeup_on" msgid="646393113104367290">"வைஃபை தானாக இயக்கப்படும்"</string>
@@ -752,7 +757,7 @@
     <string name="wifi_access_points" msgid="7053990007031968609">"வைஃபை நெட்வொர்க்குகள்"</string>
     <string name="wifi_menu_wps_pbc" msgid="2668564692207863017">"WPS புஷ் பொத்தான்"</string>
     <string name="wifi_menu_more_options" msgid="2448097861752719396">"மேலும் விருப்பங்கள்"</string>
-    <string name="wifi_menu_wps_pin" msgid="6426448256268695933">"WPS Pin உள்ளீடு"</string>
+    <string name="wifi_menu_wps_pin" msgid="6426448256268695933">"WPS பின் உள்ளீடு"</string>
     <string name="wifi_menu_p2p" msgid="7619851399250896797">"வைஃபை டைரக்ட்"</string>
     <string name="wifi_menu_scan" msgid="1470911530412095868">"ஸ்கேன் செய்"</string>
     <string name="wifi_menu_advanced" msgid="7522252991919573664">"மேம்பட்டவை"</string>
@@ -762,7 +767,7 @@
     <string name="wifi_menu_forget" msgid="8736964302477327114">"நெட்வொர்க்கை நீக்கு"</string>
     <string name="wifi_menu_modify" msgid="2068554918652440105">"நெட்வொர்க்கை மாற்று"</string>
     <string name="wifi_menu_write_to_nfc" msgid="7692881642188240324">"NFC குறியில் எழுது"</string>
-    <string name="wifi_empty_list_wifi_off" msgid="8056223875951079463">"கிடைக்கும் நெட்வொர்க்குகளைப் பார்க்க, வைஃபையை இயக்கவும்."</string>
+    <string name="wifi_empty_list_wifi_off" msgid="8056223875951079463">"இருக்கும் நெட்வொர்க்குகளைப் பார்க்க, வைஃபையை இயக்கவும்."</string>
     <string name="wifi_empty_list_wifi_on" msgid="8746108031587976356">"வைஃபை நெட்வொர்க்கைத் தேடுகிறது…"</string>
     <string name="wifi_empty_list_user_restricted" msgid="7322372065475939129">"வைஃபை நெட்வொர்க்கை மாற்றுவதற்கான அனுமதி உங்களுக்கு இல்லை."</string>
     <string name="wifi_more" msgid="3195296805089107950">"மேலும்"</string>
@@ -782,6 +787,7 @@
     <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>
@@ -818,6 +824,8 @@
     <string name="wifi_wps_available_first_item" msgid="4422547079984583502">"WPS கிடைக்கிறது"</string>
     <string name="wifi_wps_available_second_item" msgid="8427520131718215301">" (WPS கிடைக்கிறது)"</string>
     <string name="wifi_wps_nfc_enter_password" msgid="2288214226916117159">"நெட்வொர்க் கடவுச்சொல்லை உள்ளிடவும்"</string>
+    <string name="wifi_carrier_connect" msgid="8174696557882299911">"தொலைத்தொடர்பு நிறுவன வைஃபை நெட்வொர்க்"</string>
+    <string name="wifi_carrier_content" msgid="4634077285415851933">"<xliff:g id="NAME">%1%s</xliff:g> மூலம் இணை"</string>
     <string name="wifi_scan_always_turnon_message" msgid="203123538572122989">"இருப்பிடத்தைத் துல்லியமாக அறிவதற்கு மேம்படுத்த மற்றும் பிற காரணங்களுக்காக, வைஃபை முடக்கத்தில் இருக்கும்போதும் நெட்வொர்க்கை ஸ்கேன் செய்வதை இயக்கத்தில் வைக்க <xliff:g id="APP_NAME">%1$s</xliff:g> விரும்புகிறது.\n\nஸ்கேன் செய்ய விரும்பும் எல்லா பயன்பாடுகளுக்கும் இதை அனுமதிக்கவா?"</string>
     <string name="wifi_scan_always_turnoff_message" msgid="5538901671131941043">"இதனை முடக்க, கூடுதல் உருப்படி மெனுவில் மேம்பட்டவை என்பதற்குச் செல்லவும்."</string>
     <string name="wifi_scan_always_confirm_allow" msgid="5355973075896817232">"அனுமதி"</string>
@@ -835,6 +843,7 @@
     <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_modify" msgid="6100248070440710782">"மாற்று"</string>
     <string name="wifi_failed_forget_message" msgid="1348172929201654986">"நெட்வொர்க்கை நீக்குவதில் தோல்வி"</string>
     <string name="wifi_save" msgid="3331121567988522826">"சேமி"</string>
     <string name="wifi_failed_save_message" msgid="6650004874143815692">"நெட்வொர்க்கைச் சேமிப்பதில் தோல்வி"</string>
@@ -847,6 +856,7 @@
     <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_title" msgid="3471132676909349382">"நெட்வொர்க் தகவல்"</string>
     <string name="wifi_details_subnet_mask" msgid="6720279144174924410">"சப்நெட் மாஸ்க்"</string>
     <string name="wifi_details_dns" msgid="8648826607751830768">"DNS"</string>
     <string name="wifi_details_ipv6_address_header" msgid="6734119149106422148">"IPv6 முகவரிகள்"</string>
@@ -879,18 +889,17 @@
     <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_off_subtext" msgid="5466126533609394170">"பிற சாதனங்களுடன் இணையம் அல்லது உள்ளடக்கத்தைப் பகிரவில்லை"</string>
+    <string name="wifi_hotspot_off_subtext" msgid="5466126533609394170">"பிற சாதனங்களுடன் இன்டர்நெட் அல்லது உள்ளடக்கத்தைப் பகிரவில்லை"</string>
     <string name="wifi_hotspot_tethering_on_subtext" product="tablet" msgid="5752490509369962007">"ஹாட்ஸ்பாட் மூலம் டேப்லெட்டின் இணைய இணைப்பைப் பகிர்கிறது"</string>
     <string name="wifi_hotspot_tethering_on_subtext" product="default" msgid="6461075246164300670">"ஹாட்ஸ்பாட் மூலம் மொபைலின் இணைய இணைப்பைப் பகிர்கிறது"</string>
     <string name="wifi_hotspot_on_local_only_subtext" msgid="2068110388011294735">"பயன்பாடானது உள்ளடக்கத்தைப் பகிர்கிறது. இணைய இணைப்பைப் பகிர, ஹாட்ஸ்பாட்டை முடக்கி, பின்னர் இயக்கவும்"</string>
-    <string name="wifi_hotspot_name_title" msgid="1341735529132128887">"வைஃபையின் பெயர்"</string>
+    <string name="wifi_hotspot_name_title" msgid="8237000746618636778">"ஹாட்ஸ்பாட் பெயர்"</string>
     <string name="wifi_hotspot_name_summary_connecting" msgid="3378299995508671967">"<xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>ஐ இயக்குகிறது..."</string>
     <string name="wifi_hotspot_name_summary_connected" msgid="3888672084861445362">"<xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g> உடன் பிற சாதனங்களை இணைக்கலாம்"</string>
-    <string name="wifi_hotspot_password_title" msgid="1955592302902091281">"வைஃபை கடவுச்சொல்"</string>
-    <string name="wifi_hotspot_ap_band_title" msgid="1165801173359290681">"AP பேண்ட்"</string>
-    <string name="wifi_hotspot_footer_info_regular" msgid="1203489406068036455">"உங்கள் பிற சாதனங்களுக்கு வைஃபை நெட்வொர்க்கை உருவாக்க, ஹாட்ஸ்பாட்டைப் பயன்படுத்தவும். ஹாட்ஸ்பாட்டானது உங்கள் மொபைல் தரவு இணைப்பைப் பயன்படுத்தி இணையத்தை வழங்கும். கூடுதல் மொபைல் தரவுக் கட்டணங்கள் விதிக்கப்படலாம்."</string>
+    <string name="wifi_hotspot_password_title" msgid="8676859981917573801">"ஹாட்ஸ்பாட் கடவுச்சொல்"</string>
+    <string name="wifi_hotspot_ap_band_title" msgid="1165801173359290681">"AP அலைவரிசை"</string>
+    <string name="wifi_hotspot_footer_info_regular" msgid="1203489406068036455">"உங்கள் பிற சாதனங்களுக்கு வைஃபை நெட்வொர்க்கை உருவாக்க, ஹாட்ஸ்பாட்டைப் பயன்படுத்தவும். ஹாட்ஸ்பாட்டானது உங்கள் மொபைல் டேட்டா இணைப்பைப் பயன்படுத்தி இணையத்தை வழங்கும். கூடுதல் மொபைல் டேட்டா கட்டணங்கள் விதிக்கப்படலாம்."</string>
     <string name="wifi_hotspot_footer_info_local_only" msgid="857988412470694109">"அருகிலுள்ள சாதனங்களுடன் உள்ளடக்கத்தைப் பகிர, பயன்பாடுகள் ஹாட்ஸ்பாட்டையும் உருவாக்கலாம்."</string>
     <string name="wifi_tether_starting" msgid="1322237938998639724">"ஹாட்ஸ்பாட்டை இயக்குகிறது…"</string>
     <string name="wifi_tether_stopping" msgid="4835852171686388107">"ஹாட்ஸ்பாட்டை முடக்குகிறது…"</string>
@@ -899,7 +908,6 @@
     <string name="wifi_tether_configure_ap_text" msgid="7974681394041609308">"வைஃபை ஹாட்ஸ்பாட்டை அமை"</string>
     <string name="wifi_hotspot_configure_ap_text" msgid="5478614731464220432">"வைஃபை ஹாட்ஸ்பாட் அமைவு"</string>
     <string name="wifi_hotspot_configure_ap_text_summary" msgid="5560680057727007011">"AndroidAP WPA2 PSK ஹாட்ஸ்பாட்"</string>
-    <string name="wifi_tether_configure_subtext" msgid="2050196439900426456">"<xliff:g id="NETWORK_SSID">%1$s</xliff:g> <xliff:g id="NETWORK_SECURITY">%2$s</xliff:g> ஹாட்ஸ்பாட்"</string>
     <string name="wifi_tether_configure_ssid_default" msgid="8467525402622138547">"AndroidHotspot"</string>
     <string name="wifi_calling_settings_title" msgid="4102921303993404577">"வைஃபை அழைப்பு"</string>
     <string name="wifi_calling_suggestion_title" msgid="9008010480466359578">"வைஃபை அழைப்பை இயக்கு"</string>
@@ -940,8 +948,8 @@
     <string name="wifi_calling_off_explanation" msgid="2597566001655908391">"வைஃபை அழைப்பு இயக்கத்தில் இருக்கும் போது, முன்னுரிமை மற்றும் வலிமையாக இருக்கிற சிக்னலைப் பொறுத்து வைஃபை நெட்வொர்க்குகள் அல்லது மொபைல் நிறுவன நெட்வொர்க்குக்கு அழைப்புகளை உங்கள் ஃபோன் திசைதிருப்பும். இந்த அம்சத்தை இயக்குவதற்கு முன், கட்டணங்கள் மற்றும் பிற விவரங்கள் குறித்து உங்கள் மொபைல் நிறுவனத்திடமிருந்து தெரிந்துகொள்ளவும்."</string>
     <string name="wifi_calling_off_explanation_2" msgid="2329334487851497223"></string>
     <string name="emergency_address_title" msgid="3571902448699714454">"எமர்ஜென்சி முகவரியை மாற்று"</string>
-    <string name="emergency_address_summary" msgid="306028701568728126">"வைஃபையைப் பயன்படுத்தி 911 என்ற எண்ணிற்கு அழைத்தால், அவசர சேவைகள் உங்கள் இருப்பிடத்தை முகவரியாகப் பயன்படுத்தும்"</string>
-    <string name="display_settings_title" msgid="1708697328627382561">"தோற்றம்"</string>
+    <string name="emergency_address_summary" msgid="3266760199681945746">"வைஃபையைப் பயன்படுத்தி அவசர அழைப்பைச் செய்தால், அவசரச் சேவைகள் இந்த முகவரியைப் பயன்படுத்தும்"</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>
@@ -962,7 +970,7 @@
     <string name="lock_sounds_enable_title" msgid="450098505659399520">"திரைப் பூட்டின் ஒலி"</string>
     <string name="haptic_feedback_enable_title" msgid="7152163068278526530">"தட்டும் போது அதிர்வுறு"</string>
     <string name="audio_record_proc_title" msgid="4271091199976457534">"இரைச்சலை நீக்குதல்"</string>
-    <string name="volume_media_description" msgid="7949355934788807863">"இசை, வீடியோ, கேம்கள், &amp; பிற மீடியா"</string>
+    <string name="volume_media_description" msgid="7949355934788807863">"இசை, வீடியோ, கேம்ஸ் &amp; பிற மீடியா"</string>
     <string name="volume_ring_description" msgid="5936851631698298989">"ரிங்டோன் &amp; அறிவிப்புகள்"</string>
     <string name="volume_notification_description" msgid="5810902320215328321">"அறிவிப்புகள்"</string>
     <string name="volume_alarm_description" msgid="8322615148532654841">"அலாரங்கள்"</string>
@@ -994,7 +1002,8 @@
     <string name="search_settings" msgid="1910951467596035063">"தேடு"</string>
     <string name="search_settings_summary" msgid="9205656546570654169">"தேடல் அமைப்பு மற்றும் வரலாற்றை நிர்வகிக்கவும்"</string>
     <string name="search_settings_no_results" msgid="8799027492641230999">"முடிவுகள் இல்லை"</string>
-    <string name="display_settings" msgid="7965901687241669598">"தோற்றம்"</string>
+    <string name="search_clear_history" msgid="4196658962573162457">"வரலாற்றை அழி"</string>
+    <string name="display_settings" msgid="7965901687241669598">"திரை அமைப்பு"</string>
     <string name="accelerometer_title" msgid="7854608399547349157">"திரையைத் தானாகச் சுழற்று"</string>
     <string name="color_mode_title" msgid="3159275920408338215">"ஒளிமிக்க நிறங்கள்"</string>
     <string name="accelerometer_summary_on" product="tablet" msgid="429982132339828942">"டேப்லெட்டைச் சுழற்றும்போது திசையமைவையும் தானாக மாற்று"</string>
@@ -1012,7 +1021,7 @@
     <string name="auto_brightness_summary_default" msgid="7225666614394726845">"விரும்பும் ஒளிர்வு இயல்பு நிலையாகும்"</string>
     <string name="auto_brightness_summary_high" msgid="7172304165631136027">"விரும்பும் ஒளிர்வு அதிகமாகும்"</string>
     <string name="auto_brightness_summary_very_high" msgid="979277812582279078">"விரும்பும் ஒளிர்வு மிகவும் அதிகமாகும்"</string>
-    <string name="auto_brightness_off_title" msgid="2996864829946190795">"முடக்கு"</string>
+    <string name="auto_brightness_off_title" msgid="2996864829946190795">"ஆஃப்"</string>
     <string name="auto_brightness_very_low_title" msgid="8252988638614126320">"மிகவும் குறைவு"</string>
     <string name="auto_brightness_low_title" msgid="1632186441514863377">"குறைவு"</string>
     <string name="auto_brightness_default_title" msgid="936771997353506620">"இயல்பு"</string>
@@ -1032,7 +1041,7 @@
     <string name="night_display_end_time_title" msgid="8286061578083519350">"முடிவு நேரம்"</string>
     <string name="night_display_status_title" msgid="1784041143360286267">"நிலை"</string>
     <string name="night_display_temperature_title" msgid="1435292789272017136">"ஒளிச்செறிவு"</string>
-    <string name="night_display_summary_off" msgid="1792750041697946539">"முடக்கத்தில் / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
+    <string name="night_display_summary_off" msgid="1792750041697946539">"ஆஃப் / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="night_display_summary_off_auto_mode_never" msgid="3583590137322963513">"ஒருபோதும் தானாக இயக்கப்படாது"</string>
     <string name="night_display_summary_off_auto_mode_custom" msgid="6365668239253173208">"<xliff:g id="ID_1">%1$s</xliff:g>க்குத் தானாக இயக்கப்படும்"</string>
     <string name="night_display_summary_off_auto_mode_twilight" msgid="3596291693781757392">"சூரிய அஸ்தமனத்தின் போது தானாக இயக்கப்படும்"</string>
@@ -1040,7 +1049,7 @@
     <string name="night_display_summary_on_auto_mode_never" msgid="9117830821363119835">"ஒருபோதும் தானாக முடக்கப்படாது"</string>
     <string name="night_display_summary_on_auto_mode_custom" msgid="5510753572245577263">"<xliff:g id="ID_1">%1$s</xliff:g>க்குத் தானாக முடக்கப்படும்"</string>
     <string name="night_display_summary_on_auto_mode_twilight" msgid="852270120144683507">"சூரிய உதயத்தின் போது தானாக முடக்கப்படும்"</string>
-    <string name="screen_timeout" msgid="4351334843529712571">"உறக்கநிலையிலிரு"</string>
+    <string name="screen_timeout" 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>
@@ -1050,12 +1059,12 @@
     <string name="wallpaper_suggestion_summary" msgid="1579144009898110491">"திரையைத் தனிப்பயனாக்கு"</string>
     <string name="wallpaper_settings_fragment_title" msgid="519078346877860129">"வால்பேப்பர் தேர்வு"</string>
     <string name="screensaver_settings_title" msgid="1770575686476851778">"ஸ்கிரீன் சேவர்"</string>
-    <string name="screensaver_settings_summary_either_long" msgid="7302740999250873332">"சார்ஜ் ஆகும் போது அல்லது டாக்கில் இருக்கும் போது"</string>
+    <string name="screensaver_settings_summary_either_long" msgid="7302740999250873332">"சார்ஜ் ஆகும் போது அல்லது சாதனத்தில் இணைந்திருக்கும்போது"</string>
     <string name="screensaver_settings_summary_either_short" msgid="6140527286137331478">"இவற்றில் ஒன்று"</string>
     <string name="screensaver_settings_summary_sleep" msgid="9086186698140423493">"சார்ஜ் செய்யப்படும்போது"</string>
     <string name="screensaver_settings_summary_dock" msgid="2072657401664633283">"சாதனத்தில் இணைந்திருக்கும்போது"</string>
     <string name="screensaver_settings_summary_never" msgid="5165622985174349585">"ஒருபோதும் வேண்டாம்"</string>
-    <string name="screensaver_settings_summary_off" msgid="2481581696365146473">"முடக்கத்தில்"</string>
+    <string name="screensaver_settings_summary_off" msgid="2481581696365146473">"ஆஃப்"</string>
     <string name="screensaver_settings_disabled_prompt" msgid="1239088321034437608">"மொபைல் உறக்கநிலையில் அல்லது சார்ஜாகும்போது, நிகழ்வுகளைக் கட்டுப்படுத்த பகல்கனாவை இயக்கு."</string>
     <string name="screensaver_settings_when_to_dream" msgid="7262410541382890146">"தொடங்க வேண்டிய நேரம்"</string>
     <string name="screensaver_settings_current" msgid="4663846038247130023">"தற்போதைய ஸ்கிரீன் சேவர்"</string>
@@ -1099,11 +1108,11 @@
     <string name="sim_enter_ok" msgid="6475946836899218919">"சரி"</string>
     <string name="sim_enter_cancel" msgid="6240422158517208036">"ரத்துசெய்"</string>
     <string name="sim_multi_sims_title" msgid="9159427879911231239">"பல SIMகள் உள்ளன"</string>
-    <string name="sim_multi_sims_summary" msgid="2698176447067691396">"மொபைல் தரவிற்கான சிம்மைத் தேர்வுசெய்யவும்."</string>
+    <string name="sim_multi_sims_summary" msgid="2698176447067691396">"மொபைல் டேட்டாவிற்கான சிம்மைத் தேர்வுசெய்யவும்."</string>
     <string name="sim_change_data_title" msgid="294357201685244532">"தரவு சிம்மினை மாற்றவா?"</string>
-    <string name="sim_change_data_message" msgid="5854582807996717811">"<xliff:g id="OLD_SIM">%2$s</xliff:g>க்குப் பதிலாக <xliff:g id="NEW_SIM">%1$s</xliff:g> இன் மொபைல் தரவைப் பயன்படுத்தவா?"</string>
+    <string name="sim_change_data_message" msgid="5854582807996717811">"<xliff:g id="OLD_SIM">%2$s</xliff:g>க்குப் பதிலாக <xliff:g id="NEW_SIM">%1$s</xliff:g> இன் மொபைல் டேட்டாவைப் பயன்படுத்தவா?"</string>
     <string name="sim_preferred_title" msgid="5567909634636045268">"விருப்ப சிம் கார்டை மாற்றவா?"</string>
-    <string name="sim_preferred_message" msgid="8466930554330635780">"உங்கள் சாதனத்தில் <xliff:g id="NEW_SIM">%1$s</xliff:g> சிம் மட்டுமே உள்ளது. மொபைல் தரவு, அழைப்புகள் மற்றும் SMS செய்திகளுக்கு இந்தச் சிம்மையே பயன்படுத்தவா?"</string>
+    <string name="sim_preferred_message" msgid="8466930554330635780">"உங்கள் சாதனத்தில் <xliff:g id="NEW_SIM">%1$s</xliff:g> சிம் மட்டுமே உள்ளது. மொபைல் டேட்டா, அழைப்புகள் மற்றும் SMS செய்திகளுக்கு இந்தச் சிம்மையே பயன்படுத்தவா?"</string>
     <string name="wrong_pin_code_pukked" msgid="4003655226832658066">"சிம் பின் குறியீடு தவறானது, உங்கள் சாதனத்தைத் திறக்க, உங்கள் மொபைல் நிறுவனத்தைத் தொடர்புகொள்ள வேண்டும்."</string>
     <plurals name="wrong_pin_code" formatted="false" msgid="1582398808893048097">
       <item quantity="other">சிம்மின் பின் குறியீடு தவறானது, உங்களிடம் <xliff:g id="NUMBER_1">%d</xliff:g> முயற்சிகள் மீதமுள்ளன.</item>
@@ -1123,7 +1132,6 @@
     <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>
     <string name="device_status_activity_title" msgid="1411201799384697904">"நிலை"</string>
     <string name="device_status" msgid="607405385799807324">"நிலை"</string>
@@ -1151,7 +1159,6 @@
     <string name="status_wifi_mac_address" msgid="2202206684020765378">"வைஃபை MAC முகவரி"</string>
     <string name="status_bt_address" msgid="4195174192087439720">"புளூடூத் முகவரி"</string>
     <string name="status_serial_number" msgid="2257111183374628137">"வரிசை எண்"</string>
-    <string name="status_unavailable" msgid="7862009036663793314">"கிடைக்கவில்லை"</string>
     <string name="status_up_time" msgid="7294859476816760399">"இயங்கிய நேரம்"</string>
     <string name="status_awake_time" msgid="2393949909051183652">"விழிப்பு நேரம்"</string>
     <string name="internal_memory" msgid="9129595691484260784">"அகச் சேமிப்பிடம்"</string>
@@ -1161,7 +1168,7 @@
     <string name="memory_available_read_only" msgid="6497534390167920206">"கிடைக்கிறது (படிக்க மட்டும்)"</string>
     <string name="memory_size" msgid="6629067715017232195">"மொத்த இடம்"</string>
     <string name="memory_calculating_size" msgid="2188358544203768588">"கணக்கிடுகிறது..."</string>
-    <string name="memory_apps_usage" msgid="5128673488173839077">"பயன்பாடுகள் &amp; பயன்பாட்டுத் தரவு"</string>
+    <string name="memory_apps_usage" msgid="5128673488173839077">"ஆப்ஸ் &amp; ஆப்ஸ் டேட்டா"</string>
     <string name="memory_media_usage" msgid="3738830697707880405">"மீடியா"</string>
     <string name="memory_downloads_usage" msgid="3755173051677533027">"பதிவிறக்கங்கள்"</string>
     <string name="memory_dcim_usage" msgid="558887013613822577">"படங்கள், வீடியோக்கள்"</string>
@@ -1241,16 +1248,16 @@
     <string name="storage_internal_forget_details" msgid="9028875424669047327">"<xliff:g id="NAME">^1</xliff:g> இல் உள்ள பயன்பாடுகள், படங்கள் அல்லது தரவைப் பயன்படுத்த, அதை மீண்டும் செருகவும். \n\nசாதனம் இல்லையெனில், இந்தச் சேமிப்பகத்தை அகற்றிவிடவும். \n\nஅவ்வாறு அகற்றினால், அதிலுள்ள தரவு இனி கிடைக்காது. \n\nபயன்பாடுகளை மீண்டும் நிறுவிக்கொள்ளலாம், எனினும் அவற்றின் தரவு மீண்டும் கிடைக்காது."</string>
     <string name="storage_internal_forget_confirm_title" msgid="1370847944388479245">"<xliff:g id="NAME">^1</xliff:g>ஐ அகற்றவா?"</string>
     <string name="storage_internal_forget_confirm" msgid="1148446041396902905">"<xliff:g id="NAME">^1</xliff:g> இல் சேமிக்கப்பட்ட அனைத்து பயன்பாடுகள், படங்கள் மற்றும் தரவு ஆகியவற்றை நிரந்தரமாக இழப்பீர்கள்."</string>
-    <string name="storage_detail_apps" msgid="6141154016753507490">"பயன்பாடுகள்"</string>
+    <string name="storage_detail_apps" msgid="6141154016753507490">"ஆப்ஸ்"</string>
     <string name="storage_detail_images" msgid="6950678857740634769">"படங்கள்"</string>
     <string name="storage_detail_videos" msgid="2919743464827110953">"வீடியோக்கள்"</string>
     <string name="storage_detail_audio" msgid="1197685141676483213">"ஆடியோ"</string>
     <string name="storage_detail_cached" msgid="8547136365247818567">"தற்காலிகத் தரவு"</string>
     <string name="storage_detail_other" msgid="8404938385075638238">"பிற"</string>
-    <string name="storage_detail_system" msgid="4629506366064709687">"முறைமை"</string>
+    <string name="storage_detail_system" msgid="4629506366064709687">"சிஸ்டம்"</string>
     <string name="storage_detail_explore" msgid="7911344011431568294">"<xliff:g id="NAME">^1</xliff:g> இல் உலாவு"</string>
     <string name="storage_detail_dialog_other" msgid="8907101974576694793">"பயன்பாடுகள் சேமித்த பகிர்ந்த கோப்புகள், இணையம் அல்லது புளூடூத்திலிருந்து இறக்கிய கோப்புகள், Android கோப்புகள் போன்றவை மற்றவையில் அடங்கும். \n\n<xliff:g id="NAME">^1</xliff:g> இன் பார்க்கக்கூடிய உள்ளடக்கத்தைப் பார்க்க, உலாவுக என்பதைத் தட்டவும்."</string>
-    <string name="storage_detail_dialog_system" msgid="862835644848361569">"Android <xliff:g id="VERSION">%s</xliff:g> பதிப்பை இயக்குவதற்குப் பயன்படுத்தப்படும் கோப்புகளும் இயங்குதளத்தில் அடங்கும்"</string>
+    <string name="storage_detail_dialog_system" msgid="862835644848361569">"Android <xliff:g id="VERSION">%s</xliff:g> பதிப்பை இயக்குவதற்குப் பயன்படுத்தப்படும் ஃபைல்களும் இயங்குதளத்தில் அடங்கும்"</string>
     <string name="storage_detail_dialog_user" msgid="3267254783294197804">"<xliff:g id="USER_0">^1</xliff:g> சேமிப்பகத்தின் <xliff:g id="SIZE">^2</xliff:g> அளவைப் பயன்படுத்தி, படங்கள், இசை, பயன்பாடுகள் அல்லது பிற தரவைச் சேமித்திருக்கலாம். \n\nவிவரங்களைப் பார்க்க, <xliff:g id="USER_1">^1</xliff:g>க்கு மாறவும்."</string>
     <string name="storage_wizard_init_title" msgid="5085400514028585772">"<xliff:g id="NAME">^1</xliff:g>ஐ அமைக்கவும்"</string>
     <string name="storage_wizard_init_external_title" msgid="4867326438945303598">"கையடக்க சேமிப்பகமாகப் பயன்படுத்தவும்"</string>
@@ -1275,7 +1282,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>
@@ -1284,7 +1291,7 @@
     <string name="storage_wizard_slow_body" msgid="8010127667184768025">"இந்த <xliff:g id="NAME_0">^1</xliff:g> வேகம் குறைவானது போல் தெரிகிறது. \n\nநீங்கள் தொடரலாம், இந்த இடத்திற்கு நகர்த்தப்பட்ட பயன்பாடுகள் தடங்கல்களுடன் இயங்கலாம் மற்றும் தரவைப் பரிமாற்றுவதற்கு அதிக நேரம் எடுக்கலாம். \n\nசிறந்த செயல்திறனுக்கு, வேகமான <xliff:g id="NAME_1">^1</xliff:g>ஐப் பயன்படுத்தவும்."</string>
     <string name="battery_status_title" msgid="9159414319574976203">"பேட்டரி நிலை"</string>
     <string name="battery_level_title" msgid="2965679202786873272">"பேட்டரி நிலை"</string>
-    <string name="apn_settings" msgid="3743170484827528406">"APNகள்"</string>
+    <string name="apn_settings" msgid="3743170484827528406">"APN பட்டியல்"</string>
     <string name="apn_edit" msgid="1354715499708424718">"ஆக்சஸ் பாயிண்ட்டைத் திருத்து"</string>
     <string name="apn_not_set" msgid="4974192007399968164">"அமைக்கப்படவில்லை"</string>
     <string name="apn_name" msgid="4115580098369824123">"பெயர்"</string>
@@ -1327,6 +1334,7 @@
     <string name="menu_restore" msgid="8260067415075573273">"இயல்புநிலைக்கு மீட்டமை"</string>
     <string name="restore_default_apn_completed" msgid="2824775307377604897">"இயல்புநிலை APN அமைப்புகளை மீட்டமைப்பது முடிந்தது."</string>
     <string name="reset_dashboard_title" msgid="6254873816990678620">"மீட்டமைவு விருப்பங்கள்"</string>
+    <string name="reset_dashboard_summary" msgid="4851012632493522755">"நெட்வொர்க், ஆப்ஸ் அல்லது சாதனத்தை மீட்டமைக்கலாம்"</string>
     <string name="reset_network_title" msgid="6166025966016873843">"வைஃபை, மொபைல் &amp; புளூடூத்தை மீட்டமை"</string>
     <string name="reset_network_desc" msgid="5547979398298881406">"பின்வருபவை உட்பட, எல்லா நெட்வொர்க் அமைப்புகளையும் இது மீட்டமைக்கும்:\n\n"<li>"வைஃபை"</li>\n<li>"மொபைல் தரவு"</li>\n<li>"புளூடூத்"</li></string>
     <string name="reset_network_button_text" msgid="2035676527471089853">"அமைப்புகளை மீட்டமை"</string>
@@ -1335,17 +1343,14 @@
     <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="6617679904229218425">"எல்லாத் தரவையும் அழி (ஆரம்பநிலை மீட்டமைவு)"</string>
-    <plurals name="master_clear_with_account_summary" formatted="false" msgid="5911377203778818712">
-      <item quantity="other"><xliff:g id="ACCOUNT_COUNT">%1$d</xliff:g> கணக்குகள் மீட்டமைக்கப்படும்</item>
-      <item quantity="one">1 கணக்கு மீட்டமைக்கப்படும்</item>
-    </plurals>
-    <string name="master_clear_summary" msgid="6902443944660426951">"சாதனச் சேமிப்பகமும் எல்லாத் தரவும் மீட்டமைக்கப்படும்"</string>
-    <string name="master_clear_desc" product="tablet" msgid="9146059417023157222">"இது, உங்கள் டேப்லெடின் "<b>"அகச் சேமிப்பிடத்தில்"</b>" உள்ள எல்லா தரவையும் அழித்துவிடும், இவற்றில் உள்ளடங்குவன:\n\n"<li>"உங்கள் Google கணக்கு"</li>\n<li>"அமைப்பு மற்றும் பயன்பாட்டுத் தரவு, மற்றும் அமைப்புகள்"</li>\n<li>"பதிவிறக்கப்பட்ட பயன்பாடுகள்"</li></string>
-    <string name="master_clear_desc" product="default" msgid="4800386183314202571">"இது, உங்கள் மொபைலின் "<b>"அகச் சேமிப்பிடத்தில்"</b>" உள்ள பின்வரும் எல்லா தரவையும் அழித்துவிடும்:\n\n"<li>"உங்கள் Google கணக்கு"</li>\n<li>"கணினி, பயன்பாட்டுத் தரவு மற்றும் அமைப்புகள்"</li>\n<li>"பதிவிறக்கிய பயன்பாடுகள்"</li></string>
+    <string name="master_clear_title" msgid="3531267871084279512">"எல்லாத் டேட்டாவையும் அழி (ஆரம்பநிலை மீட்டமைவு)"</string>
+    <string name="master_clear_desc" product="tablet" msgid="9146059417023157222">"இது, உங்கள் டேப்லெடின் "<b>"அகச் சேமிப்பிடத்தில்"</b>" உள்ள எல்லா டேட்டாவையும் அழித்துவிடும், இவற்றில் உள்ளடங்குவன:\n\n"<li>"உங்கள் Google கணக்கு"</li>\n<li>"சிஸ்டம் மற்றும் ஆப்ஸ் டேட்டா, மற்றும் அமைப்புகள்"</li>\n<li>"பதிவிறக்கப்பட்ட பயன்பாடுகள்"</li></string>
+    <string name="master_clear_desc" product="default" msgid="4800386183314202571">"இது, உங்கள் மொபைலின் "<b>"அகச் சேமிப்பிடத்தில்"</b>" உள்ள பின்வரும் எல்லா டேட்டாவையும் அழித்துவிடும்:\n\n"<li>"உங்கள் Google கணக்கு"</li>\n<li>"சிஸ்டம், ஆப்ஸ் டேட்டா மற்றும் அமைப்புகள்"</li>\n<li>"பதிவிறக்கிய பயன்பாடுகள்"</li></string>
     <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"தற்போது, பின்வரும் கணக்குகளில் உள்நுழைந்துள்ளீர்கள்:\n"</string>
     <string name="master_clear_other_users_present" product="default" msgid="5161423070702470742">\n\n"இந்தச் சாதனத்தில் பிற பயனர்கள் உள்ளனர்.\n"</string>
     <string name="master_clear_desc_also_erases_external" msgid="1903185203791274237"><li>"இசை"</li>\n<li>"படங்கள்"</li>\n<li>"பிற பயனர் தரவு"</li></string>
+    <string name="master_clear_desc_also_erases_esim" msgid="312352697653096008"><li>"இ-சிம்மை ஆதரிக்கும் தொலைத்தொடர்பு நிறுவனங்கள்"</li></string>
+    <string name="master_clear_desc_no_cancel_mobile_plan" msgid="5460926449093211144">\n\n"இதைச் செய்வதால், உங்கள் மொபைல் சேவைத் திட்டம் ரத்துசெய்யப்படாது."</string>
     <string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="7744115866662613411">\n\n"இசை, படங்கள் மற்றும் பிற பயனர் தரவை அழிப்பதற்கு, "<b>"USB சேமிப்பிடத்தை"</b>" அழிக்க வேண்டியிருக்கும்."</string>
     <string name="master_clear_desc_erase_external_storage" product="default" msgid="4801026652617377093">\n\n"இசை, படங்கள் மற்றும் பிற பயனர் தரவை அழிக்க "<b>"SD கார்டு"</b>" அழிக்கப்பட வேண்டும்."</string>
     <string name="erase_external_storage" product="nosdcard" msgid="969364037450286809">"USB சேமிப்பிடத்தை அழி"</string>
@@ -1370,11 +1375,11 @@
     <string name="tether_settings_title_wifi" msgid="3277144155960302049">"போர்ட்டபிள் ஹாட்ஸ்பாட்"</string>
     <string name="tether_settings_title_bluetooth" msgid="355855408317564420">"புளூடூத் டெதெரிங்"</string>
     <string name="tether_settings_title_usb_bluetooth" msgid="5355828977109785001">"டெதெரிங்"</string>
-    <string name="tether_settings_title_all" msgid="3058586928118801157">"ஹாட்ஸ்பாட்டும் இணைப்பு முறையும்"</string>
+    <string name="tether_settings_title_all" msgid="3058586928118801157">"ஹாட்ஸ்பாட் &amp; டெதெரிங்"</string>
     <string name="tether_settings_summary_hotspot_on_tether_on" msgid="930464462687425777">"ஹாட்ஸ்பாட்டும் இணைப்பு முறையும் இயக்கத்திலுள்ளன"</string>
     <string name="tether_settings_summary_hotspot_on_tether_off" msgid="3473671453891735907">"ஹாட்ஸ்பாட் இயக்கத்திலுள்ளது"</string>
     <string name="tether_settings_summary_hotspot_off_tether_on" msgid="1618256180720077354">"இணைப்பு முறை"</string>
-    <string name="tether_settings_disabled_on_data_saver" msgid="1576908608463904152">"தரவு சேமிப்பான் இயக்கப்பட்டிருக்கும் போது, இணைக்கவோ போர்ட்டபிள் ஹாட்ஸ்பாட்டுகளைப் பயன்படுத்தவோ முடியாது"</string>
+    <string name="tether_settings_disabled_on_data_saver" msgid="1576908608463904152">"டேட்டா சேமிப்பான் இயக்கப்பட்டிருக்கும் போது, இணைக்கவோ போர்ட்டபிள் ஹாட்ஸ்பாட்டுகளைப் பயன்படுத்தவோ முடியாது"</string>
     <string name="usb_title" msgid="7483344855356312510">"USB"</string>
     <string name="usb_tethering_button_text" msgid="585829947108007917">"USB டெதெரிங்"</string>
     <string name="usb_tethering_subtext" product="default" msgid="5991482890033484794">"USB மூலம் மொபைலின் இணைய இணைப்பைப் பகிர்"</string>
@@ -1385,11 +1390,11 @@
     <string name="bluetooth_tethering_off_subtext_config" msgid="6326877798974938021">"புளூடூத் மூலம் <xliff:g id="DEVICE_NAME">%1$d</xliff:g> இன் இணைய இணைப்பைப் பகிரவில்லை"</string>
     <string name="bluetooth_tethering_overflow_error" msgid="2135590598511178690">"<xliff:g id="MAXCONNECTION">%1$d</xliff:g> சாதனங்களுக்கு மேல் இணைக்க முடியாது."</string>
     <string name="bluetooth_untether_blank" msgid="2871192409329334813">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> இன் இணைப்புமுறை நீக்கப்படும்."</string>
-    <string name="tethering_footer_info" msgid="1308462275952345985">"மொபைல் தரவு இணைப்பு மூலமாக, பிற சாதனங்களுக்கு இணைப்பை வழங்க, ஹாட்ஸ்பாட்டையும் இணைப்பு முறையையும் பயன்படுத்தவும். அருகிலுள்ள சாதனங்களுடன் உள்ளடக்கத்தைப் பகிர, பயன்பாடுகள் ஹாட்ஸ்பாட்டையும் உருவாக்கலாம்."</string>
+    <string name="tethering_footer_info" msgid="1308462275952345985">"மொபைல் டேட்டா இணைப்பு மூலமாக, பிற சாதனங்களுக்கு இணைப்பை வழங்க, ஹாட்ஸ்பாட் மற்றும் டெதெரிங்கைப் பயன்படுத்தவும். அருகிலுள்ள சாதனங்களுடன் உள்ளடக்கத்தைப் பகிர, ஹாட்ஸ்பாட்டையும் ஆப்ஸ் வழியாக உருவாக்கலாம்."</string>
     <string name="tethering_help_button_text" msgid="656117495547173630">"உதவி"</string>
     <string name="network_settings_title" msgid="2876509814832830757">"மொபைல் நெட்வொர்க்"</string>
     <string name="manage_mobile_plan_title" msgid="7630170375010107744">"மொபைல் திட்டம்"</string>
-    <string name="sms_application_title" msgid="4903928270533250448">"SMS பயன்பாடு"</string>
+    <string name="sms_application_title" msgid="4903928270533250448">"SMS"</string>
     <string name="sms_change_default_dialog_title" msgid="1958688831875804286">"SMS பயன்பாட்டை மாற்றவா?"</string>
     <string name="sms_change_default_dialog_text" msgid="1522783933230274787">"<xliff:g id="CURRENT_APP">%2$s</xliff:g> க்குப் பதிலாக <xliff:g id="NEW_APP">%1$s</xliff:g> ஐ உங்கள் SMS பயன்பாடாகப் பயன்படுத்தவா?"</string>
     <string name="sms_change_default_no_previous_dialog_text" msgid="602683880284921998">"<xliff:g id="NEW_APP">%s</xliff:g> ஐ உங்கள் SMS பயன்பாடாகப் பயன்படுத்தவா?"</string>
@@ -1405,7 +1410,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>
@@ -1462,18 +1467,19 @@
     <string name="settings_safetylegal_activity_title" msgid="6901214628496951727">"பாதுகாப்பு தகவல்"</string>
     <string name="settings_safetylegal_activity_unreachable" msgid="250674109915859456">"உங்களுக்குத் தரவு இணைப்பு இல்லை. இப்போது இந்தத் தகவலைப் பார்க்க இணையத்துடன் இணைக்கப்பட்ட எந்தக் கணினியிலிருந்தும் %s க்குச் செல்லவும்."</string>
     <string name="settings_safetylegal_activity_loading" msgid="8059022597639516348">"ஏற்றுகிறது..."</string>
-    <string name="lockpassword_choose_your_password_header" msgid="8624900666929394990">"உங்கள் கடவுச்சொல்லைத் தேர்வுசெய்க"</string>
-    <string name="lockpassword_choose_your_password_header_for_fingerprint" msgid="6624409510609085450">"கைரேகைக்கு, கடவுச்சொல்லை அமை"</string>
-    <string name="lockpassword_choose_your_pattern_header" msgid="6949761069941694050">"உங்கள் வடிவத்தைத் தேர்வுசெய்யவும்"</string>
-    <string name="lockpassword_choose_your_pattern_header_for_fingerprint" msgid="5901096361617543819">"கைரேகைக்கு, பேட்டர்னை அமை"</string>
-    <string name="lockpassword_choose_your_pin_header" msgid="7598849519816138302">"உங்கள் பின் ஐத் தேர்வுசெய்யவும்"</string>
-    <string name="lockpassword_choose_your_pin_header_for_fingerprint" msgid="765344692615917183">"கைரேகைக்கு, பின்னை அமை"</string>
-    <string name="lockpassword_confirm_your_password_header" msgid="6308478184889846633">"உங்கள் கடவுச்சொல்லை உறுதிப்படுத்தவும்"</string>
+    <string name="lockpassword_choose_your_screen_lock_header" msgid="3872462096767152394">"திரைப் பூட்டை அமைக்கவும்"</string>
+    <string name="lockpassword_choose_your_password_message" msgid="1197569283524841412">"பாதுகாப்பிற்கு, கடவுச்சொல்லை அமைக்கவும்"</string>
+    <string name="lockpassword_choose_your_password_header_for_fingerprint" msgid="2541818487015343503">"கைரேகையைப் பயன்படுத்த, கடவுச்சொல்லை அமை"</string>
+    <string name="lockpassword_choose_your_pattern_header_for_fingerprint" msgid="7709785406243556723">"கைரேகையைப் பயன்படுத்த, வடிவத்தை அமை"</string>
+    <string name="lockpassword_choose_your_pin_message" msgid="1875420718677275646">"பாதுகாப்பிற்கு, பின்னை அமைக்கவும்"</string>
+    <string name="lockpassword_choose_your_pin_header_for_fingerprint" msgid="1549639053195796674">"கைரேகையைப் பயன்படுத்த, பின்னை அமைக்கவும்"</string>
+    <string name="lockpassword_choose_your_pattern_message" msgid="5986983400689720015">"பாதுகாப்பிற்காக, பேட்டர்னை அமைக்கவும்"</string>
+    <string name="lockpassword_confirm_your_password_header" msgid="1266027268220850931">"கடவுச்சொல்லை மீண்டும் உள்ளிடவும்"</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="7744513791910572550">"பின்னை மீண்டும் உள்ளிடவும்"</string>
     <string name="lockpassword_confirm_passwords_dont_match" msgid="5140892109439191415">"கடவுச்சொற்கள் பொருந்தவில்லை"</string>
     <string name="lockpassword_confirm_pins_dont_match" msgid="7226244811505606217">"பின்கள் பொருந்தவில்லை"</string>
-    <string name="lockpassword_choose_lock_generic_header" msgid="3811438094903786145">"திறப்பதற்கான தேர்வு"</string>
+    <string name="lockpassword_choose_lock_generic_header" msgid="3811438094903786145">"எப்படித் திறக்க வேண்டும்?"</string>
     <string name="lockpassword_password_set_toast" msgid="4875050283108629383">"கடவுச்சொல் அமைக்கப்பட்டது"</string>
     <string name="lockpassword_pin_set_toast" msgid="6011826444725291475">"பின் அமைக்கப்பட்டது"</string>
     <string name="lockpassword_pattern_set_toast" msgid="6867259621331406236">"வடிவம் அமைக்கப்பட்டது"</string>
@@ -1489,6 +1495,12 @@
     <string name="lockpassword_strong_auth_required_work_pattern" msgid="3003781907040522053">"கூடுதல் பாதுகாப்பிற்கு, பணிப் பேட்டர்னை வரையவும்"</string>
     <string name="lockpassword_strong_auth_required_work_pin" msgid="3367491332598821552">"கூடுதல் பாதுகாப்பிற்கு, பணிப் பின்னை உள்ளிடவும்"</string>
     <string name="lockpassword_strong_auth_required_work_password" msgid="8159775129968582940">"கூடுதல் பாதுகாப்பிற்கு, பணிக் கடவுச்சொல்லை உள்ளிடவும்"</string>
+    <string name="lockpassword_confirm_your_pattern_details_frp" msgid="6757336656791723193">"ஆரம்பநிலை அமைப்புகளுக்கு மீட்டமைக்கப்பட்டது. மொபைலைப் பயன்படுத்த, முந்தைய பேட்டர்னை உள்ளிடவும்."</string>
+    <string name="lockpassword_confirm_your_pin_details_frp" msgid="826520613445990470">"ஆரம்பநிலை அமைப்புகளுக்கு மீட்டமைக்கப்பட்டது. மொபைலைப் பயன்படுத்த, முந்தைய பின்னை உள்ளிடவும்."</string>
+    <string name="lockpassword_confirm_your_password_details_frp" msgid="8944081074615739040">"ஆரம்பநிலை அமைப்புகளுக்கு மீட்டமைக்கப்பட்டது. மொபைலைப் பயன்படுத்த, முந்தைய கடவுச்சொல்லை உள்ளிடவும்."</string>
+    <string name="lockpassword_confirm_your_pattern_header_frp" msgid="2898036091609128286">"பேட்டர்னைச் சரிபார்க்கவும்"</string>
+    <string name="lockpassword_confirm_your_pin_header_frp" msgid="4141601774778898803">"பின்னைச் சரிபார்க்கவும்"</string>
+    <string name="lockpassword_confirm_your_password_header_frp" msgid="3762615419295360480">"கடவுச்சொல்லைச் சரிபார்க்கவும்"</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>
@@ -1511,9 +1523,9 @@
     <string name="lockpattern_settings_enable_summary" msgid="1165707416664252167">"திரையைத் திறப்பதற்கான வடிவத்தை வரைய வேண்டும்"</string>
     <string name="lockpattern_settings_enable_visible_pattern_title" msgid="2615606088906120711">"வடிவத்தைக் காணும்படி செய்"</string>
     <string name="lockpattern_settings_enable_visible_pattern_title_profile" msgid="4864525074768391381">"சுயவிவரப் பேட்டர்னை வரையும் போது காட்டு"</string>
-    <string name="lockpattern_settings_enable_tactile_feedback_title" msgid="4389015658335522989">"தட்டும் போது அதிர்வுறு"</string>
-    <string name="lockpattern_settings_enable_power_button_instantly_locks" msgid="5735444062633666327">"பவர் பொத்தான் உடனே பூட்டும்"</string>
-    <string name="lockpattern_settings_power_button_instantly_locks_summary" msgid="8196258755143711694">"<xliff:g id="TRUST_AGENT_NAME">%1$s</xliff:g> பயன்படுத்தாத போது"</string>
+    <string name="lockpattern_settings_enable_tactile_feedback_title" msgid="4389015658335522989">"தட்டும் போது அதிர்வது"</string>
+    <string name="lockpattern_settings_enable_power_button_instantly_locks" msgid="5735444062633666327">"பவர் அழுத்தினால் பூட்டும் சூழல்"</string>
+    <string name="lockpattern_settings_power_button_instantly_locks_summary" msgid="8196258755143711694">"<xliff:g id="TRUST_AGENT_NAME">%1$s</xliff:g> வழியாகத் திறக்காத நேரங்களில்"</string>
     <string name="lockpattern_settings_choose_lock_pattern" msgid="1652352830005653447">"திறப்பதற்கான வடிவத்தை அமை"</string>
     <string name="lockpattern_settings_change_lock_pattern" msgid="1123908306116495545">"திறப்பதற்கான வடிவத்தை மாற்று"</string>
     <string name="lockpattern_settings_help_how_to_record" msgid="2614673439060830433">"திறப்பதற்கான வடிவத்தை எப்படி வரைவது"</string>
@@ -1531,19 +1543,18 @@
     <string name="lock_settings_profile_unified_summary" msgid="9008819078132993492">"சாதனத் திரைப் பூட்டைப் போன்றது"</string>
     <string name="manageapplications_settings_title" msgid="7041951105633616745">"பயன்பாடுகளை நிர்வகி"</string>
     <string name="manageapplications_settings_summary" msgid="1794401500935451259">"நிறுவப்பட்ட பயன்பாடுகளை நிர்வகி மற்றும் அகற்று"</string>
-    <string name="applications_settings" msgid="5281808652705396152">"பயன்பாட்டுத் தகவல்"</string>
+    <string name="applications_settings" msgid="5281808652705396152">"ஆப்ஸ் தகவல்"</string>
     <string name="applications_settings_summary" msgid="6683465446264515367">"அமைப்புகளை நிர்வகிக்கும், விரைவு துவக்கத்திற்கான குறுக்குவழிகளை அமைக்கும்"</string>
     <string name="applications_settings_header" msgid="1014813055054356646">"பயன்பாட்டு அமைப்பு"</string>
     <string name="install_applications" msgid="4872012136210802181">"அறியப்படாத மூலங்கள்"</string>
     <string name="install_applications_title" msgid="4987712352256508946">"எல்லா பயன்பாட்டு ஆதாரங்களையும் அனுமதி"</string>
-    <string name="recent_app_category_title" msgid="6673071268966003928">"சமீபத்தில் திறந்த பயன்பாடுகள்"</string>
+    <string name="recent_app_category_title" msgid="6673071268966003928">"சமீபத்தில் திறந்தவை"</string>
     <string name="see_all_apps_title" msgid="1317153498074308438">"<xliff:g id="COUNT">%1$d</xliff:g> பயன்பாடுகளையும் பார்க்கவும்"</string>
-    <string name="recent_app_summary" msgid="3366446669844932300">"<xliff:g id="TIME">^1</xliff:g> முன்பு"</string>
     <string name="install_all_warning" product="tablet" msgid="8310489909586138165">"அறியப்படாத பயன்பாடுகளால் உங்கள் டேப்லெட்டும் தனிப்பட்ட தரவும் அதிகம் பாதிப்பிற்கு உள்ளாகும். இந்த மூலத்திலிருந்து பயன்பாடுகளை நிறுவுவதால், அவற்றைப் பயன்படுத்தும் போது உங்கள் டேப்லெட்டுக்கு ஏதேனும் சேதம் ஏற்பட்டாலோ அல்லது தரவை இழந்தாலோ, அதற்கு நீங்கள்தான் பொறுப்பாவீர்கள் என்பதை ஏற்கிறீர்கள்."</string>
     <string name="install_all_warning" product="default" msgid="1952257127370115988">"அறியப்படாத பயன்பாடுககளால் உங்கள் மொபைலும் தனிப்பட்ட தரவும் அதிகம் பாதிப்பிற்கு உள்ளாகும். இந்த மூலத்திலிருந்து பயன்பாடுகளை நிறுவுவதால், அவற்றைப் பயன்படுத்தும் போது உங்கள் மொபைலுக்கு ஏதேனும் சேதம் ஏற்பட்டாலோ அல்லது தரவை இழந்தாலோ, அதற்கு நீங்கள்தான் பொறுப்பாவீர்கள் என்பதை ஏற்கிறீர்கள்."</string>
     <string name="advanced_settings" msgid="1777249286757067969">"மேம்பட்ட அமைப்பு"</string>
     <string name="advanced_settings_summary" msgid="4016682978071086747">"மேலும் அமைப்பு விருப்பங்களை இயக்கு"</string>
-    <string name="application_info_label" msgid="5736524913065714880">"பயன்பாட்டுத் தகவல்"</string>
+    <string name="application_info_label" msgid="5736524913065714880">"ஆப்ஸ் தகவல்"</string>
     <string name="storage_label" msgid="8700867073480107253">"சேமிப்பிடம்"</string>
     <string name="auto_launch_label" msgid="2669236885531442195">"இயல்பாகத் திற"</string>
     <string name="auto_launch_label_generic" msgid="3230569852551968694">"இயல்புநிலைகள்"</string>
@@ -1585,10 +1596,10 @@
     <string name="show_running_services" msgid="5736278767975544570">"இயங்கும் சேவைகளைக் காட்டு"</string>
     <string name="show_background_processes" msgid="2009840211972293429">"தற்காலிகச் சேமிப்பின் செயல்முறைகளைக் காட்டு"</string>
     <string name="default_emergency_app" msgid="1951760659640369980">"அவசரப் பயன்பாடு"</string>
-    <string name="reset_app_preferences" msgid="1321050641018356925">"பயன்பாட்டு அமைப்பை மீட்டமை"</string>
+    <string name="reset_app_preferences" msgid="1321050641018356925">"ஆப்ஸ் அமைப்பை மீட்டமை"</string>
     <string name="reset_app_preferences_title" msgid="6093179367325336662">"அமைப்பை மீட்டமைக்கவா?"</string>
-    <string name="reset_app_preferences_desc" msgid="4822447731869201512">"இது, பின்வருபவற்றின் எல்லா விருப்பத்தேர்வுகளையும் மீட்டமைக்கும்:\n\n "<li>"முடக்கப்பட்ட பயன்பாடுகள்"</li>\n" "<li>"முடக்கப்பட்ட பயன்பாட்டின் அறிவிப்புகள்"</li>\n" "<li>"செயல்பாடுகளுக்கான இயல்புநிலைப் பயன்பாடுகள்"</li>\n" "<li>"பயன்பாடுகளுக்கான பின்புலத் தரவின் வரையறைகள்"</li>\n" "<li>"ஏதேனும் அனுமதி வரையறைகள்"</li>\n\n" எந்தப் பயன்பாட்டுத் தரவையும் இழக்கமாட்டீர்கள்."</string>
-    <string name="reset_app_preferences_button" msgid="2559089511841281242">"பயன்பாடுகளை மீட்டமை"</string>
+    <string name="reset_app_preferences_desc" msgid="4822447731869201512">"இது, பின்வருபவற்றின் எல்லா விருப்பத்தேர்வுகளையும் மீட்டமைக்கும்:\n\n "<li>"முடக்கப்பட்ட ஆப்ஸ்"</li>\n" "<li>"முடக்கப்பட்ட ஆப்ஸின் அறிவிப்புகள்"</li>\n" "<li>"செயல்பாடுகளுக்கான இயல்புநிலைப் பயன்பாடுகள்"</li>\n" "<li>"ஆப்ஸ்களுக்கான பின்புல டேட்டாவின் கட்டுப்பாடுகள்"</li>\n" "<li>"ஏதேனும் அனுமதிக் கட்டுப்பாடுகள்"</li>\n\n" எந்த ஆப்ஸ் டேட்டாவையும் இழக்கமாட்டீர்கள்."</string>
+    <string name="reset_app_preferences_button" msgid="2559089511841281242">"ஆப்ஸை மீட்டமை"</string>
     <string name="manage_space_text" msgid="8852711522447794676">"காலி இடத்தை நிர்வகி"</string>
     <string name="filter" msgid="2018011724373033887">"வடிகட்டு"</string>
     <string name="filter_dlg_title" msgid="8693024463731076091">"வடிப்பான் விருப்பங்களைத் தேர்வுசெய்யவும்"</string>
@@ -1606,13 +1617,13 @@
     <string name="sd_card_storage" product="nosdcard" msgid="2673203150465132465">"USB சேமிப்பிடம்"</string>
     <string name="sd_card_storage" product="default" msgid="7623513618171928235">"SD கார்டின் சேமிப்பிடம்"</string>
     <string name="recompute_size" msgid="7722567982831691718">"அளவை மீண்டும் கணக்கிடுகிறது…"</string>
-    <string name="clear_data_dlg_title" msgid="5605258400134511197">"பயன்பாட்டுத் தரவை நீக்கவா?"</string>
-    <string name="clear_data_dlg_text" msgid="3951297329833822490">"பயன்பாட்டின் எல்லா தகவலும் நிரந்தரமாக நீக்கப்படும். இதில் எல்லா கோப்புகளும், அமைப்புகளும், கணக்குகளும், தரவுத்தளங்களும், மேலும் பலவும் அடங்கும்."</string>
+    <string name="clear_data_dlg_title" msgid="5605258400134511197">"ஆப்ஸ் டேட்டாவை நீக்கவா?"</string>
+    <string name="clear_data_dlg_text" msgid="3951297329833822490">"பயன்பாட்டின் எல்லா தகவலும் நிரந்தரமாக நீக்கப்படும். இதில் எல்லா ஃபைல்களும், அமைப்புகளும், கணக்குகளும், தரவுத்தளங்களும், மேலும் பலவும் அடங்கும்."</string>
     <string name="dlg_ok" msgid="2402639055725653590">"சரி"</string>
     <string name="dlg_cancel" msgid="1674753358972975911">"ரத்துசெய்"</string>
     <string name="app_not_found_dlg_title" msgid="3127123411738434964"></string>
     <string name="app_not_found_dlg_text" msgid="4893589904687340011">"நிறுவிய பயன்பாடுகளின் பட்டியலில் பயன்பாடு இல்லை."</string>
-    <string name="clear_data_failed" msgid="7214074331627422248">"பயன்பாட்டுத் தரவை அழிக்க முடியவில்லை."</string>
+    <string name="clear_data_failed" msgid="7214074331627422248">"ஆப்ஸ் டேட்டாவை அழிக்க முடியவில்லை."</string>
     <string name="clear_failed_dlg_title" msgid="2387060805294783175">"தரவை அழி"</string>
     <string name="clear_failed_dlg_text" msgid="5464475937929941008">"பயன்பாட்டிற்கான தரவை அழிக்க முடியவில்லை."</string>
     <string name="security_settings_desc" product="tablet" msgid="1292421279262430109">"உங்கள் டேப்லெடில் பின்வருவனவற்றை இந்தப் பயன்பாடு அணுகலாம்:"</string>
@@ -1685,8 +1696,8 @@
     <string name="running_processes_item_description_p_p" msgid="1607384595790852782">"<xliff:g id="NUMPROCESS">%1$d</xliff:g> செயல்முறைகள், <xliff:g id="NUMSERVICES">%2$d</xliff:g> சேவை"</string>
     <string name="running_processes_header_title" msgid="6588371727640789560">"சாதன நினைவகம்"</string>
     <string name="running_processes_header_footer" msgid="723908176275428442">"பயன்பாட்டின் RAM பயன்பாடு"</string>
-    <string name="running_processes_header_system_prefix" msgid="6104153299581682047">"முறைமை"</string>
-    <string name="running_processes_header_apps_prefix" msgid="5787594452716832727">"பயன்பாடுகள்"</string>
+    <string name="running_processes_header_system_prefix" msgid="6104153299581682047">"சிஸ்டம்"</string>
+    <string name="running_processes_header_apps_prefix" msgid="5787594452716832727">"ஆப்ஸ்"</string>
     <string name="running_processes_header_free_prefix" msgid="4620613031737078415">"காலி"</string>
     <string name="running_processes_header_used_prefix" msgid="5924288703085123978">"பயன்படுத்தப்பட்டது"</string>
     <string name="running_processes_header_cached_prefix" msgid="7950853188089434987">"தற்காலிகச் சேமிப்பு"</string>
@@ -1725,7 +1736,7 @@
     <string name="hardkeyboard_category" msgid="5957168411305769899">"கைமுறை விசைப்பலகை அமைப்பு"</string>
     <string name="auto_punctuate_summary" msgid="4372126865670574837">"\".\" ஐச் செருக Space விசையை இருமுறை அழுத்தவும்"</string>
     <string name="show_password" msgid="4837897357002495384">"கடவுச்சொற்களைக் காட்டு"</string>
-    <string name="show_password_summary" msgid="3365397574784829969">"உள்ளிடும் போதே எழுத்துக்குறிகளைச் சற்று நேரம் காட்டும்"</string>
+    <string name="show_password_summary" msgid="3365397574784829969">"உள்ளிடும் போதே எழுத்துகளைச் சற்று நேரம் காட்டும்"</string>
     <string name="spellchecker_security_warning" msgid="9060897418527708922">"கடவுச்சொற்கள் மற்றும் கிரெடிட் கார்டு எண்கள் போன்ற தனிப்பட்ட தரவு உள்பட நீங்கள் உள்ளிடும் எல்லா உரையையும் இந்த பிழைத்திருத்தி சேகரிக்கலாம். இது <xliff:g id="SPELLCHECKER_APPLICATION_NAME">%1$s</xliff:g> பயன்பாட்டிலிருந்து வந்ததாகும். பிழைத்திருத்தியைப் பயன்படுத்தவா?"</string>
     <string name="spellchecker_quick_settings" msgid="246728645150092058">"அமைப்பு"</string>
     <string name="spellchecker_language" msgid="6041050114690541437">"மொழி"</string>
@@ -1802,10 +1813,10 @@
     <string name="accessibility_settings_summary" msgid="981260486011624939">"திரைப் படிப்பான்கள், திரை, ஊடாடல் கட்டுப்பாடுகள்"</string>
     <string name="vision_settings_title" msgid="4204111425716868288">"காட்சி அமைப்புகள்"</string>
     <string name="vision_settings_description" msgid="5679491180156408260">"உங்கள் தேவைகளுக்கேற்ப இந்தச் சாதனத்தைத் தனிப்பயனாக்கலாம். இந்த அணுகல்தன்மை அம்சங்களை அமைப்புகளுக்குச் சென்று மாற்றலாம்."</string>
-    <string name="vision_settings_suggestion_title" msgid="917294957154878441">"எழுத்துரு அளவை அதிகரிக்கவும்"</string>
+    <string name="vision_settings_suggestion_title" msgid="8058794060304707004">"எழுத்தின் அளவை மாற்று"</string>
     <string name="screen_reader_category_title" msgid="7739154903913400641">"திரைப் படிப்பான்கள்"</string>
     <string name="audio_and_captions_category_title" msgid="3420727114421447524">"ஆடியோ &amp; திரையில் காட்டப்படும் உரை"</string>
-    <string name="display_category_title" msgid="685461049938269166">"காட்சி"</string>
+    <string name="display_category_title" msgid="685461049938269166">"திரை அமைப்பு"</string>
     <string name="interaction_control_category_title" msgid="7836591031872839151">"ஊடாடல் கட்டுப்பாடுகள்"</string>
     <string name="user_installed_services_category_title" msgid="6426376488922158647">"பதிவிறக்கிய சேவைகள்"</string>
     <string name="experimental_category_title" msgid="5272318666666893547">"சோதனை முயற்சி"</string>
@@ -1839,8 +1850,7 @@
     <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="preference_summary_default_combination" msgid="8532964268242666060">"<xliff:g id="STATE">%1$s</xliff:g> / <xliff:g id="DESCRIPTION">%2$s</xliff:g>"</string>
-    <string name="accessibility_summary_state_enabled" msgid="8359913912320966304">"இயக்கப்பட்டுள்ளது"</string>
+    <string name="accessibility_summary_state_enabled" msgid="8359913912320966304">"ஆன்"</string>
     <string name="accessibility_summary_state_disabled" msgid="2241315620132005595">"முடக்கப்பட்டுள்ளது"</string>
     <string name="enable_quick_setting" msgid="2366999897816894536">"விரைவு அமைப்புகளில் காட்டு"</string>
     <string name="daltonizer_type" msgid="1124178250809091080">"சரிப்படுத்தும் முறை"</string>
@@ -1865,8 +1875,8 @@
       <item quantity="one">மிக அதிக தாமதம் (<xliff:g id="CLICK_DELAY_LABEL_0">%1$d</xliff:g> மிவி)</item>
     </plurals>
     <string name="accessibility_menu_item_settings" msgid="3344942964710773365">"அமைப்பு"</string>
-    <string name="accessibility_feature_state_on" msgid="2864292320042673806">"இயக்கத்தில்"</string>
-    <string name="accessibility_feature_state_off" msgid="4172584906487070211">"முடக்கத்தில்"</string>
+    <string name="accessibility_feature_state_on" msgid="2864292320042673806">"ஆன்"</string>
+    <string name="accessibility_feature_state_off" msgid="4172584906487070211">"ஆஃப்"</string>
     <string name="captioning_preview_title" msgid="1234015253497016890">"முன்னோட்டம்"</string>
     <string name="captioning_standard_options_title" msgid="3284211791180335844">"நிலையான விருப்பங்கள்"</string>
     <string name="captioning_locale" msgid="4559155661018823503">"மொழி"</string>
@@ -1923,12 +1933,12 @@
       <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_settings_title" msgid="3685449667822217816">"அச்சிடுதல் சேவைகள்"</string>
     <string name="print_no_services_installed" msgid="8443039625463872294">"சேவைகள் எதுவும் நிறுவப்படவில்லை"</string>
     <string name="print_no_printers_found" msgid="989018646884973683">"அச்சுப்பொறிகள் எதுவுமில்லை"</string>
     <string name="print_menu_item_settings" msgid="6591330373682227082">"அமைப்பு"</string>
     <string name="print_menu_item_add_printers" msgid="2890738028215834012">"அச்சுப்பொறிகளைச் சேர்"</string>
-    <string name="print_feature_state_on" msgid="8098901852502441048">"இயக்கத்தில்"</string>
+    <string name="print_feature_state_on" msgid="8098901852502441048">"ஆன்"</string>
     <string name="print_feature_state_off" msgid="7294876968403966040">"முடக்கப்பட்டுள்ளது"</string>
     <string name="print_menu_item_add_service" msgid="3811645167869797802">"சேவையைச் சேர்"</string>
     <string name="print_menu_item_add_printer" msgid="8251218970577291032">"அச்சுப்பொறியைச் சேர்"</string>
@@ -1958,19 +1968,21 @@
     <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="background_activity_summary_whitelisted" msgid="7375400051141016808">"பேட்டரியின் முழு திறனையும் இந்தப் பயன்பாடு உபயோகிக்கும்"</string>
+    <string name="background_activity_warning_dialog_title" msgid="2216249969149568871">"பின்னணி செயல்பாட்டைக் கட்டுப்படுத்தவா?"</string>
+    <string name="background_activity_warning_dialog_text" msgid="7049624449246121981">"பயன்பாட்டின் பின்னணி செயல்பாட்டைக் கட்டுப்படுத்தினால், சரியாக வேலை செய்யாது."</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" msgid="6393929085382334341">"பேட்டரியைக் கடைசியாக முழு சார்ஜ் செய்ததிலிருந்து, பயன்பாட்டை உபயோகப்படுத்தியது (<xliff:g id="RELATIVE_TIME">^1</xliff:g>)"</string>
+    <string name="power_usage_list_summary_device" msgid="4461926045610455423">"பேட்டரியைக் கடைசியாக முழு சார்ஜ் செய்ததிலிருந்து, சாதனத்தை உபயோகப்படுத்தியது (<xliff:g id="RELATIVE_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>
     <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>
@@ -1983,9 +1995,9 @@
     <string name="awake" msgid="387122265874485088">"சாதனம் விழித்திருக்கும் நேரம்"</string>
     <string name="wifi_on_time" msgid="3208518458663637035">"வைஃபை இயக்க நேரம்"</string>
     <string name="bluetooth_on_time" msgid="3056108148042308690">"வைஃபை இயக்க நேரம்"</string>
-    <string name="advanced_battery_title" msgid="2068039111517508622">"மேம்பட்ட பேட்டரி உபயோகம்"</string>
+    <string name="advanced_battery_title" msgid="2068039111517508622">"மேம்பட்ட பேட்டரி பயன்பாடு"</string>
     <string name="history_details_title" msgid="3608240585315506067">"வரலாறு விவரங்கள்"</string>
-    <string name="battery_details_title" msgid="6101394441569858580">"பேட்டரி உபயோகம்"</string>
+    <string name="battery_details_title" msgid="6101394441569858580">"பேட்டரி பயன்பாடு"</string>
     <string name="details_subtitle" msgid="32593908269911734">"விவரங்களைப் பயன்படுத்து"</string>
     <string name="controls_subtitle" msgid="390468421138288702">"ஆற்றல் பயன்பாட்டைச் சரிசெய்க"</string>
     <string name="packages_subtitle" msgid="4736416171658062768">"உள்ளடங்கும் தொகுப்புகள்"</string>
@@ -2023,9 +2035,9 @@
     <string name="power_idle" product="default" msgid="9055659695602194990">"மொபைலின் செயல்படாநிலை"</string>
     <string name="power_unaccounted" msgid="709925017022660740">"இதர அமைப்பு"</string>
     <string name="power_overcounted" msgid="2762354976171358445">"அதிகமாகப் பயன்படுத்தப்பட்டது"</string>
-    <string name="power_apps" msgid="2043554781293951327">"பயன்பாடுகள்"</string>
+    <string name="power_apps" msgid="2043554781293951327">"ஆப்ஸ்"</string>
     <string name="power_service" msgid="1599661212370831780">"சேவைகள்"</string>
-    <string name="power_system" msgid="8290455327965307383">"சாதனம்"</string>
+    <string name="power_system" msgid="8290455327965307383">"சிஸ்டம்"</string>
     <string name="power_user" msgid="3706143225319881667">"பிற பயனர்கள்"</string>
     <string name="usage_type_cpu" msgid="715162150698338714">"CPU மொத்தம்"</string>
     <string name="usage_type_cpu_foreground" msgid="6500579611933211831">"CPU முன்புறம்"</string>
@@ -2049,7 +2061,7 @@
     <string name="usage_type_computed_power" msgid="5862792259009981479">"கணக்கிடப்பட்ட ஆற்றல் பயன்பாடு"</string>
     <string name="usage_type_actual_power" msgid="7047814738685578335">"உண்மையில் பயன்படுத்திய ஆற்றல்"</string>
     <string name="battery_action_stop" msgid="649958863744041872">"உடனே நிறுத்து"</string>
-    <string name="battery_action_app_details" msgid="7861051816778419018">"பயன்பாட்டுத் தகவல்"</string>
+    <string name="battery_action_app_details" msgid="7861051816778419018">"ஆப்ஸ் தகவல்"</string>
     <string name="battery_action_app_settings" msgid="4570481408106287454">"பயன்பாட்டு அமைப்பு"</string>
     <string name="battery_action_display" msgid="7338551244519110831">"திரை அமைப்பு"</string>
     <string name="battery_action_wifi" msgid="8181553479021841207">"வைஃபை அமைப்பு"</string>
@@ -2082,15 +2094,15 @@
     <string name="battery_screen_usage" msgid="6537658662149713585">"திரை உபயோகம்: <xliff:g id="TIME">^1</xliff:g>"</string>
     <string name="battery_used_by" msgid="1135316757755282999">"<xliff:g id="APP">%2$s</xliff:g> பயன்படுத்துவது: <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
     <string name="battery_overall_usage" msgid="2093409063297375436">"ஒட்டுமொத்த பேட்டரியில் <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
-    <string name="battery_detail_since_full_charge" msgid="7515347842046955855">"கடைசியாக முழுவதும் சார்ஜ் ஆனதிலிருந்து பிரேக் டவுன்"</string>
+    <string name="battery_detail_since_full_charge" msgid="7515347842046955855">"விரிவான தகவல் (கடைசியாக முழு சார்ஜ் ஆன பிறகு)"</string>
     <string name="battery_last_full_charge" msgid="7151251641099019361">"கடைசியாக முழு சார்ஜ் செய்தது:"</string>
-    <string name="battery_footer_summary" msgid="67169726550144016">"பேட்டரியின் உபயோகத் தரவு தோராயமானதாகும். இது பயன்படுத்துவதன் அடிப்படையில் மாறலாம்"</string>
+    <string name="battery_footer_summary" msgid="67169726550144016">"மேலே உள்ள பேட்டரி பயன்பாட்டுத் தகவல் தோராயமானதே. பயன்படுத்துவதன் அடிப்படையில் இந்தத் தகவல் மாறலாம்"</string>
     <string name="battery_detail_foreground" msgid="3350401514602032183">"உபயோகத்தில் இருக்கும் போது"</string>
     <string name="battery_detail_background" msgid="1929644393553768999">"பின்னணியில் இருக்கும் போது"</string>
-    <string name="battery_detail_power_usage" msgid="6485766868610469101">"பேட்டரி உபயோகம்"</string>
+    <string name="battery_detail_power_usage" msgid="6485766868610469101">"பேட்டரி பயன்பாடு"</string>
     <string name="battery_detail_power_percentage" msgid="8064814503316094497">"மொத்தப் பயன்பாட்டு உபயோகத்தில் <xliff:g id="PERCENT">%1$s</xliff:g> (<xliff:g id="POWER">%2$d</xliff:g>mAh)"</string>
     <string name="battery_detail_info_title" msgid="8227822131405620369">"முழு சார்ஜ் ஆனதிலிருந்து"</string>
-    <string name="battery_detail_manage_title" msgid="9094314252105828014">"பேட்டரி உபயோகத்தை நிர்வகி"</string>
+    <string name="battery_detail_manage_title" msgid="9094314252105828014">"பேட்டரி பயன்பாட்டை நிர்வகி"</string>
     <string name="estimated_time_left" msgid="7514194472683370877">"கணக்கிடப்பட்ட மீதமுள்ள நேரம்"</string>
     <string name="estimated_charging_time_left" msgid="5614442409326164691">"முழு சார்ஜ் ஆக"</string>
     <string name="estimated_time_description" msgid="8760210909000037089">"உபயோகத்தின் அடிப்படையில் கணிப்பு நேரம் மாறலாம்"</string>
@@ -2103,7 +2115,7 @@
     <string name="process_dex2oat_label" msgid="2592408651060518226">"பயன்பாட்டிற்கான மேம்படுத்தல்"</string>
     <string name="battery_saver" msgid="1426682272004907982">"பேட்டரி சேமிப்பான்"</string>
     <string name="battery_saver_turn_on_automatically_title" msgid="9023847300114669426">"தானாகவே இயக்கு"</string>
-    <string name="battery_saver_turn_on_automatically_never" msgid="6610846456314373">"எப்போதும் வேண்டாம்"</string>
+    <string name="battery_saver_turn_on_automatically_never" msgid="6610846456314373">"ஒருபோதும் வேண்டாம்"</string>
     <string name="battery_saver_turn_on_automatically_pct" msgid="8665950426992057191">"<xliff:g id="PERCENT">%1$s</xliff:g> பேட்டரி இருக்கும் போது"</string>
     <string name="battery_percentage" msgid="723291197508049369">"பேட்டரி சதவீதம்"</string>
     <string name="battery_percentage_description" msgid="8511658577507384014">"பேட்டரி சதவீதத்தை நிலைப் பட்டியில் காட்டும்"</string>
@@ -2139,7 +2151,7 @@
     <string name="menu_duration_6h" msgid="1940846763432184132">"6 மணிநேரம்"</string>
     <string name="menu_duration_12h" msgid="7890465404584356294">"12 மணிநேரம்"</string>
     <string name="menu_duration_1d" msgid="3393631127622285458">"1 நாள்"</string>
-    <string name="menu_show_system" msgid="8864603400415567635">"அமைப்பைக் காட்டு"</string>
+    <string name="menu_show_system" msgid="8864603400415567635">"எல்லாம் காட்டு"</string>
     <string name="menu_hide_system" msgid="4106826741703745733">"சிஸ்டத்திற்கு உரியவற்றை மறை"</string>
     <string name="menu_show_percentage" msgid="4717204046118199806">"சதவீதத்தில் காட்டு"</string>
     <string name="menu_use_uss" msgid="467765290771543089">"Uss ஐப் பயன்படுத்து"</string>
@@ -2173,8 +2185,8 @@
     <string name="gadget_toggle_wifi" msgid="319262861956544493">"வைஃபை அமைப்பைப் புதுப்பிக்கிறது"</string>
     <string name="gadget_toggle_bluetooth" msgid="7538903239807020826">"புளூடூத் அமைப்புகளைப் புதுப்பிக்கிறது"</string>
     <string name="gadget_state_template" msgid="5156935629902649932">"<xliff:g id="ID_1">%1$s</xliff:g> <xliff:g id="ID_2">%2$s</xliff:g>"</string>
-    <string name="gadget_state_on" msgid="6909119593004937688">"இயக்கத்தில்"</string>
-    <string name="gadget_state_off" msgid="5220212352953066317">"முடக்கத்தில்"</string>
+    <string name="gadget_state_on" msgid="6909119593004937688">"ஆன்"</string>
+    <string name="gadget_state_off" msgid="5220212352953066317">"ஆஃப்"</string>
     <string name="gadget_state_turning_on" msgid="3395992057029439039">"இயக்குகிறது"</string>
     <string name="gadget_state_turning_off" msgid="2395546048102176157">"முடக்குகிறது"</string>
     <string name="gadget_wifi" msgid="4712584536500629417">"வைஃபை"</string>
@@ -2209,14 +2221,14 @@
     <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_configure_lock_screen_hint" msgid="8058230497337529036">"அனுமதிச் சான்றுகள் சேமிப்பகத்தைப் பயன்படுத்தும் முன்னர், உங்கள் சாதனத்தில் பாதுகாப்பான பூட்டுத் திரையை அமைக்க வேண்டும்"</string>
+    <string name="credentials_configure_lock_screen_button" msgid="253239765216055321">"லாக்கை அமை"</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>
@@ -2224,23 +2236,23 @@
     <string name="backup_section_title" msgid="7952232291452882740">"காப்புப் பிரதி &amp; மீட்டெடுத்தல்"</string>
     <string name="personal_data_section_title" msgid="7815209034443782061">"தனிப்பட்ட தரவு"</string>
     <string name="backup_data_title" msgid="1239105919852668016">"தரவை காப்புப்பிரதியெடு"</string>
-    <string name="backup_data_summary" msgid="708773323451655666">"பயன்பாட்டுத் தரவு, வைஃபை கடவுச்சொற்கள் மற்றும் Google சேவையகங்களுக்கான பிற அமைப்புகளைக் காப்புப் பிரதியெடு"</string>
+    <string name="backup_data_summary" msgid="708773323451655666">"ஆப்ஸ் டேட்டா, வைஃபை கடவுச்சொற்கள் மற்றும் Google சேவையகங்களுக்கான பிற அமைப்புகளைக் காப்புப் பிரதியெடு"</string>
     <string name="backup_configure_account_title" msgid="3790872965773196615">"காப்புப்பிரதி கணக்கு"</string>
-    <string name="include_app_data_title" msgid="2829970132260278394">"பயன்பாட்டுத் தரவு உட்பட"</string>
+    <string name="include_app_data_title" msgid="2829970132260278394">"ஆப்ஸ் டேட்டா உட்பட"</string>
     <string name="auto_restore_title" msgid="5397528966329126506">"தானியங்கு மீட்டெடுப்பு"</string>
     <string name="auto_restore_summary" msgid="4235615056371993807">"பயன்பாட்டை மீண்டும் நிறுவும்போது, காப்புப் பிரதி எடுத்த அமைப்புகளையும் தரவையும் மீட்டெடு"</string>
     <string name="backup_inactive_title" msgid="685838037986644604">"காப்புப் பிரதிச் சேவை செயலில் இல்லை"</string>
     <string name="backup_configure_account_default_summary" msgid="2436933224764745553">"தற்போது எந்தக் கணக்கும் காப்புப் பிரதி எடுக்கப்பட்ட தரவைச் சேமிப்பதில்லை"</string>
     <string name="backup_erase_dialog_title" msgid="1027640829482174106"></string>
-    <string name="backup_erase_dialog_message" msgid="5221011285568343155">"உங்கள் வைஃபை கடவுச்சொற்கள், புத்தகக்குறிகள், பிற அமைப்புகள் மற்றும் பயன்பாட்டுத் தரவைக் காப்புப் பிரதியெடுப்பதை நிறுத்துவதுடன், Google சேவையகங்களில் உள்ள எல்லா நகல்களையும் அழித்துவிட வேண்டுமா?"</string>
-    <string name="fullbackup_erase_dialog_message" msgid="694766389396659626">"சாதனத் தரவையும் (வைஃபை கடவுச்சொற்கள் மற்றும் அழைப்பு பதிவு போன்றவை) பயன்பாட்டுத் தரவையும் (பயன்பாடுகளில் சேமிக்கப்பட்டிருக்கும் அமைப்புகள் மற்றும் கோப்புகள் போன்றவை) காப்புப் பிரதி எடுப்பதை நிறுத்தி, தொலைநிலை சேவையகங்களில் உள்ள எல்லா நகல்களையும் அழிக்கவா?"</string>
-    <string name="fullbackup_data_summary" msgid="960850365007767734">"சாதனத் தரவையும் (வைஃபை கடவுச்சொற்கள், அழைப்பு பதிவு போன்றவை) பயன்பாட்டுத் தரவையும் (பயன்பாடுகளில் சேமிக்கப்பட்டிருக்கும் அமைப்புகள், கோப்புகள் போன்றவை) தொலைநிலையில் தானாகக் காப்புப் பிரதி எடுக்கும்.\n\nதானியங்கு காப்புப் பிரதியை இயக்கும் போது, சாதனம் மற்றும் பயன்பாட்டுத் தரவானது குறிப்பிட்ட கால இடைவெளியில் தொலைநிலையில் சேமிக்கப்படும். பயன்பாட்டுத் தரவு என்பது, தொடர்புகள், செய்திகள், படங்கள் போன்ற மிகவும் முக்கிய தரவு உட்பட, பயன்பாடு சேமித்த (டெவெலப்பர் அமைப்புகளைப் பொறுத்து) எந்தத் தரவாகவும் இருக்கலாம்."</string>
+    <string name="backup_erase_dialog_message" msgid="5221011285568343155">"உங்கள் வைஃபை கடவுச்சொற்கள், புத்தகக்குறிகள், பிற அமைப்புகள் மற்றும் ஆப்ஸ் டேட்டாவைக் காப்புப் பிரதியெடுப்பதை நிறுத்துவதுடன், Google சேவையகங்களில் உள்ள எல்லா நகல்களையும் அழித்துவிட வேண்டுமா?"</string>
+    <string name="fullbackup_erase_dialog_message" msgid="694766389396659626">"சாதனத் தரவையும் (வைஃபை கடவுச்சொற்கள் மற்றும் அழைப்பு பதிவு போன்றவை) ஆப்ஸ் டேட்டாவையும் (பயன்பாடுகளில் சேமிக்கப்பட்டிருக்கும் அமைப்புகள் மற்றும் கோப்புகள் போன்றவை) காப்புப் பிரதி எடுப்பதை நிறுத்தி, தொலைநிலை சேவையகங்களில் உள்ள எல்லா நகல்களையும் அழிக்கவா?"</string>
+    <string name="fullbackup_data_summary" msgid="960850365007767734">"சாதனத் தரவையும் (வைஃபை கடவுச்சொற்கள், அழைப்பு பதிவு போன்றவை) ஆப்ஸ் டேட்டாவையும் (பயன்பாடுகளில் சேமிக்கப்பட்டிருக்கும் அமைப்புகள், கோப்புகள் போன்றவை) தொலைநிலையில் தானாகக் காப்புப் பிரதி எடுக்கும்.\n\nதானியங்கு காப்புப் பிரதியை இயக்கும் போது, சாதனம் மற்றும் ஆப்ஸ் டேட்டாவானது குறிப்பிட்ட கால இடைவெளியில் தொலைநிலையில் சேமிக்கப்படும். ஆப்ஸ் டேட்டா என்பது, தொடர்புகள், செய்திகள், படங்கள் போன்ற மிகவும் முக்கிய தரவு உட்பட, பயன்பாடு சேமித்த (டெவெலப்பர் அமைப்புகளைப் பொறுத்து) எந்தத் தரவாகவும் இருக்கலாம்."</string>
     <string name="device_admin_settings_title" msgid="4960761799560705902">"சாதன நிர்வாகி அமைப்புகள்"</string>
     <string name="active_device_admin_msg" msgid="578748451637360192">"சாதன நிர்வாகிப் பயன்பாடு"</string>
     <string name="remove_device_admin" msgid="9207368982033308173">"இந்தச் சாதன நிர்வாகிப் பயன்பாட்டைச் செயலற்றதாக்கு"</string>
     <string name="uninstall_device_admin" msgid="271120195128542165">"பயன்பாட்டை நிறுவல் நீக்கு"</string>
     <string name="remove_and_uninstall_device_admin" msgid="3837625952436169878">"செயலற்றதாக்கி, நிறுவல் நீக்கு"</string>
-    <string name="select_device_admin_msg" msgid="7347389359013278077">"சாதன நிர்வாகிப் பயன்பாடுகள்"</string>
+    <string name="select_device_admin_msg" msgid="7347389359013278077">"சாதன நிர்வாகி ஆப்ஸ்"</string>
     <string name="no_device_admins" msgid="4846602835339095768">"சாதன நிர்வாகிப் பயன்பாடுகள் எதுவுமில்லை"</string>
     <string name="personal_device_admin_title" msgid="2849617316347669861">"தனிப்பட்டவை"</string>
     <string name="managed_device_admin_title" msgid="7853955652864478435">"பணியிடம்"</string>
@@ -2258,7 +2270,7 @@
     <string name="sound_category_sound_title" msgid="1488759370067953996">"பொதுவானவை"</string>
     <string name="notification_log_title" msgid="3766148588239398464">"அறிவிப்பு பதிவு"</string>
     <string name="sound_category_call_ringtone_vibrate_title" msgid="1543777228646645163">"அழைப்பின் ரிங்டோன் &amp; அதிர்வு"</string>
-    <string name="sound_category_system_title" msgid="1480844520622721141">"அமைப்பு"</string>
+    <string name="sound_category_system_title" msgid="1480844520622721141">"சிஸ்டம்"</string>
     <string name="wifi_setup_title" msgid="2970260757780025029">"வைஃபை அமைவு"</string>
     <string name="wifi_setup_title_editing_network" msgid="6020614644556717979">"வைஃபை நெட்வொர்க் <xliff:g id="NETWORK_NAME">%s</xliff:g> உடன் இணை"</string>
     <string name="wifi_setup_title_connecting_network" msgid="5572226790101017822">"வைஃபை நெட்வொர்க் <xliff:g id="NETWORK_NAME">%s</xliff:g> உடன் இணைக்கிறது…"</string>
@@ -2304,7 +2316,7 @@
     <string name="background_data_summary" msgid="8328521479872763452">"பயன்பாடுகளால் எந்நேரத்திலும் தரவை ஒத்திசைக்கவும், அனுப்பவும் பெறவும் முடியும்"</string>
     <string name="background_data_dialog_title" msgid="6059217698124786537">"பின்புலத் தரவை முடக்கவா?"</string>
     <string name="background_data_dialog_message" msgid="6981661606680941633">"பின்புலத் தரவை முடக்குவது பேட்டரியின் ஆயுளை நீட்டிக்கிறது மற்றும் தரவு பயன்பாட்டைக் குறைக்கிறது. சில பயன்பாடுகள் தொடர்ந்து பின்புலத் தரவு இணைப்பைப் பயன்படுத்தலாம்."</string>
-    <string name="sync_automatically" msgid="1682730255435062059">"பயன்பாட்டின் தரவைத் தானாக ஒத்திசை"</string>
+    <string name="sync_automatically" msgid="1682730255435062059">"பயன்பாட்டின் டேட்டாவைத் தானாக ஒத்திசை"</string>
     <string name="sync_enabled" msgid="4551148952179416813">"ஒத்திசைவு முடக்கத்தில்"</string>
     <string name="sync_disabled" msgid="8511659877596511991">"ஒத்திசைவு முடக்கத்தில்"</string>
     <string name="sync_error" msgid="5060969083117872149">"ஒத்திசைவுப் பிழை"</string>
@@ -2336,8 +2348,6 @@
     <skip />
     <string name="cant_sync_dialog_title" msgid="2777238588398046285">"கைமுறையாக ஒத்திசைக்க முடியாது"</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ஐத் தொடங்க, PINஐ உள்ளிடவும்"</string>
     <string name="enter_pattern" msgid="4187435713036808566">"Androidஐத் தொடங்க, வடிவத்தை வரையவும்"</string>
@@ -2351,13 +2361,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_plan_usage_manage_plans_button_text" msgid="8997761990902708162">"திட்டங்களை நிர்வகி"</string>
+    <string name="data_usage_summary_title" msgid="3804110657238092929">"டேட்டா பயன்பாடு"</string>
+    <string name="data_usage_app_summary_title" msgid="4147258989837459172">"டேட்டா பயன்பாடு"</string>
+    <string name="data_usage_accounting" msgid="7170028915873577387">"மொபைல் நிறுவனம் கணக்கிடும் டேட்டா அளவும், சாதனம் கணக்கிடும் டேட்டா அளவும் மாறுபடலாம்."</string>
     <string name="data_usage_app" msgid="4970478397515423303">"பயன்பாட்டின் பயன்பாடு"</string>
-    <string name="data_usage_app_info_label" msgid="3409931235687866706">"பயன்பாட்டுத் தகவல்"</string>
-    <string name="data_usage_cellular_data" msgid="9168928285122125137">"மொபைல் தரவு"</string>
-    <string name="data_usage_data_limit" msgid="1193930999713192703">"தரவு வரம்பை அமை"</string>
+    <string name="data_usage_app_info_label" msgid="3409931235687866706">"ஆப்ஸ் தகவல்"</string>
+    <string name="data_usage_cellular_data" msgid="9168928285122125137">"மொபைல் டேட்டா"</string>
+    <string name="data_usage_data_limit" msgid="1193930999713192703">"டேட்டா வரம்பை அமை"</string>
     <string name="data_usage_cycle" msgid="5652529796195787949">"தரவு பயன்பாட்டு சுழற்சி"</string>
     <string name="data_usage_app_items_header_text" msgid="5017850810459372828">"பயன்பாட்டின் பயன்பாடு"</string>
     <string name="data_usage_menu_roaming" msgid="8042359966835203296">"தரவு ரோமிங்"</string>
@@ -2369,21 +2380,21 @@
     <string name="data_usage_menu_show_ethernet" msgid="5181361208532314097">"ஈதர்நெட் பயன்பாட்டைக் காட்டு"</string>
     <string name="data_usage_menu_hide_ethernet" msgid="3326702187179943681">"ஈதர்நெட் பயன்பாட்டை மறை"</string>
     <string name="data_usage_menu_metered" msgid="6235119991372755026">"நெட்வொர்க் கட்டுப்பாடுகள்"</string>
-    <string name="data_usage_menu_auto_sync" msgid="8203999775948778560">"தரவைத் தானாக ஒத்திசை"</string>
+    <string name="data_usage_menu_auto_sync" msgid="8203999775948778560">"டேட்டாவைத் தானாக ஒத்திசை"</string>
     <string name="data_usage_menu_sim_cards" msgid="6410498422797244073">"சிம் கார்டுகள்"</string>
     <string name="data_usage_menu_cellular_networks" msgid="8339835014751511300">"மொபைல் நெட்வொர்க்குகள்"</string>
     <string name="data_usage_cellular_data_summary" msgid="8413357481361268285">"வரம்பில் நிறுத்தப்பட்டது"</string>
-    <string name="account_settings_menu_auto_sync" msgid="6243013719753700377">"தரவைத் தானாக ஒத்திசை"</string>
-    <string name="account_settings_menu_auto_sync_personal" msgid="785541379617346438">"தனிப்பட்ட தரவைத் தானாக ஒத்திசை"</string>
-    <string name="account_settings_menu_auto_sync_work" msgid="329565580969147026">"பணித் தரவைத் தானாக ஒத்திசை"</string>
+    <string name="account_settings_menu_auto_sync" msgid="6243013719753700377">"டேட்டாவைத் தானாக ஒத்திசை"</string>
+    <string name="account_settings_menu_auto_sync_personal" msgid="785541379617346438">"தனிப்பட்ட டேட்டாவைத் தானாக ஒத்திசை"</string>
+    <string name="account_settings_menu_auto_sync_work" msgid="329565580969147026">"பணி டேட்டாவைத் தானாக ஒத்திசை"</string>
     <string name="data_usage_change_cycle" msgid="7776556448920114866">"சுழற்சியை மாற்று…"</string>
     <string name="data_usage_pick_cycle_day" msgid="4470796861757050966">"தரவு பயன்பாட்டின் சுழற்சியை மீட்டமைப்பதற்கான மாதத்தின் நாள்:"</string>
     <string name="data_usage_empty" msgid="8621855507876539282">"இந்தக் கால நேரத்தில், எந்தப் பயன்பாடுகளும் தரவைப் பயன்படுத்தவில்லை."</string>
     <string name="data_usage_label_foreground" msgid="4938034231928628164">"முன்புலம்"</string>
     <string name="data_usage_label_background" msgid="3225844085975764519">"பின்புலம்"</string>
     <string name="data_usage_app_restricted" msgid="3568465218866589705">"வரையறுக்கப்பட்டது"</string>
-    <string name="data_usage_disable_mobile" msgid="8656552431969276305">"மொபைல் தரவை முடக்கவா?"</string>
-    <string name="data_usage_disable_mobile_limit" msgid="4644364396844393848">"மொபைல் தரவு வரம்பை அமை"</string>
+    <string name="data_usage_disable_mobile" msgid="8656552431969276305">"மொபைல் டேட்டாவை முடக்கவா?"</string>
+    <string name="data_usage_disable_mobile_limit" msgid="4644364396844393848">"மொபைல் டேட்டா வரம்பை அமை"</string>
     <string name="data_usage_disable_4g_limit" msgid="6233554774946681175">"4G தரவு வரம்பை அமை"</string>
     <string name="data_usage_disable_3g_limit" msgid="2558557840444266906">"2G-3G தரவு வரம்பை அமை"</string>
     <string name="data_usage_disable_wifi_limit" msgid="1394901415264660888">"வைஃபை தரவின் வரம்பை அமை"</string>
@@ -2394,35 +2405,35 @@
     <string name="data_usage_tab_3g" msgid="6092169523081538718">"2G-3G"</string>
     <string name="data_usage_list_mobile" msgid="5588685410495019866">"மொபைல்"</string>
     <string name="data_usage_list_none" msgid="3933892774251050735">"ஏதுமில்லை"</string>
-    <string name="data_usage_enable_mobile" msgid="986782622560157977">"மொபைல் தரவு"</string>
+    <string name="data_usage_enable_mobile" msgid="986782622560157977">"மொபைல் டேட்டா"</string>
     <string name="data_usage_enable_3g" msgid="6304006671869578254">"2G-3G தரவு"</string>
     <string name="data_usage_enable_4g" msgid="3635854097335036738">"4G தரவு"</string>
     <string name="data_usage_forground_label" msgid="7654319010655983591">"முன்புலம்:"</string>
     <string name="data_usage_background_label" msgid="2722008379947694926">"பின்புலம்:"</string>
     <string name="data_usage_app_settings" msgid="2279171379771253165">"பயன்பாட்டு அமைப்பு"</string>
     <string name="data_usage_app_restrict_background" msgid="7359227831562303223">"பின்புலத் தரவு"</string>
-    <string name="data_usage_app_restrict_background_summary" msgid="5853552187570622572">"பின்னணியில் மொபைல் தரவைப் பயன்படுத்துவதை இயக்கு"</string>
-    <string name="data_usage_app_restrict_background_summary_disabled" msgid="7401927377070755054">"இந்தப் பயன்பாட்டிற்கான பின்புலத் தரவை வரம்பிட, முதலில் மொபைல் தரவு வரம்பை அமைக்கவும்."</string>
+    <string name="data_usage_app_restrict_background_summary" msgid="5853552187570622572">"பின்னணியில் மொபைல் டேட்டாவைப் பயன்படுத்துவதை இயக்கு"</string>
+    <string name="data_usage_app_restrict_background_summary_disabled" msgid="7401927377070755054">"இந்தப் பயன்பாட்டிற்கான பின்புலத் தரவை வரம்பிட, முதலில் மொபைல் டேட்டா வரம்பை அமைக்கவும்."</string>
     <string name="data_usage_app_restrict_dialog_title" msgid="1613108390242737923">"பின்புலத் தரவை வரம்பிடவா?"</string>
     <string name="data_usage_app_restrict_dialog" msgid="1466689968707308512">"மொபைல் நெட்வொர்க்குகள் மட்டும் கிடைக்கும்போது பின்புலத் தரவைச் சார்ந்திருக்கும் பயன்பாட்டின் வேலையை இந்த அம்சம் நிறுத்தலாம்.\n\nபயன்பாட்டில் மிகவும் பொருத்தமான தரவு பயன்பாட்டின் கட்டுப்பாடுகளை அமைப்புகளில் கண்டறியலாம்."</string>
-    <string name="data_usage_restrict_denied_dialog" msgid="55012417305745608">"மொபைல் தரவு வரம்பை அமைத்தால் மட்டுமே, பின்னணித் தரவைக் கட்டுப்படுத்த முடியும்."</string>
-    <string name="data_usage_auto_sync_on_dialog_title" msgid="2438617846762244389">"தரவைத் தானாக ஒத்திசைப்பதை இயக்கவா?"</string>
+    <string name="data_usage_restrict_denied_dialog" msgid="55012417305745608">"மொபைல் டேட்டா வரம்பை அமைத்தால் மட்டுமே, பின்னணித் தரவைக் கட்டுப்படுத்த முடியும்."</string>
+    <string name="data_usage_auto_sync_on_dialog_title" msgid="2438617846762244389">"டேட்டாவைத் தானாக ஒத்திசைப்பதை இயக்கவா?"</string>
     <string name="data_usage_auto_sync_on_dialog" product="tablet" msgid="8581983093524041669">"இணையத்தில் உங்கள் கணக்குகளில் நீங்கள் செய்யும் எந்த மாற்றங்களும் தானாகவே டேப்லெட்டில் நகலெடுக்கப்படும்.\n\nசில கணக்குகள், டேப்லெட்டில் செய்யும் எந்த மாற்றங்களையும் தானாகவே இணையத்தில் நகலெடுக்கலாம். Google கணக்கு இப்படிதான் செயல்படுகிறது."</string>
     <string name="data_usage_auto_sync_on_dialog" product="default" msgid="8651376294887142858">"இணையத்தில் உங்கள் கணக்குகளில் நீங்கள் செய்யும் எந்த மாற்றங்களும் தானாகவே மொபைலில் நகலெடுக்கப்படும்.\n\nசில கணக்குகள், மொபைலில் செய்யும் எந்த மாற்றங்களையும் தானாகவே இணையத்தில் நகலெடுக்கலாம். Google கணக்கு இப்படிதான் செயல்படுகிறது."</string>
-    <string name="data_usage_auto_sync_off_dialog_title" msgid="9013139130490125793">"தரவைத் தானாக ஒத்திசைப்பதை முடக்கவா?"</string>
-    <string name="data_usage_auto_sync_off_dialog" msgid="4025938250775413864">"இது தரவு மற்றும் பேட்டரியின் பயன்பாட்டைச் சேமிக்கும், ஆனால் சமீபத்திய தகவலைச் சேகரிக்க ஒவ்வொரு கணக்கையும் கைமுறையாக நீங்கள் ஒத்திசைக்க வேண்டும். புதுப்பிக்கப்படும்போது அறிவிப்புகளைப் பெற மாட்டீர்கள்."</string>
+    <string name="data_usage_auto_sync_off_dialog_title" msgid="9013139130490125793">"டேட்டாவைத் தானாக ஒத்திசைப்பதை முடக்கவா?"</string>
+    <string name="data_usage_auto_sync_off_dialog" msgid="4025938250775413864">"இவ்வாறு செய்வதால் டேட்டா மற்றும் பேட்டரியின் பயன்பாட்டைக் குறைக்கும், ஆனால் சமீபத்திய தகவலைச் சேகரிக்க ஒவ்வொரு கணக்கையும் கைமுறையாக ஒத்திசைக்க வேண்டும். புதுப்பிக்கப்படும்போது அறிவிப்புகளைப் பெற மாட்டீர்கள்."</string>
     <string name="data_usage_cycle_editor_title" msgid="1373797281540188533">"பயன்பாட்டு சுழற்சியை மீட்டமைப்பதற்கான தேதி"</string>
-    <string name="data_usage_cycle_editor_subtitle" msgid="5512903797979928416">"ஒவ்வொரு மாதத்தின் தேதி:"</string>
+    <string name="data_usage_cycle_editor_subtitle" msgid="5512903797979928416">"ஒவ்வொரு மாதமும்:"</string>
     <string name="data_usage_cycle_editor_positive" msgid="8821760330497941117">"அமை"</string>
-    <string name="data_usage_warning_editor_title" msgid="3704136912240060339">"தரவு பயன்பாட்டு எச்சரிக்கையை அமை"</string>
-    <string name="data_usage_limit_editor_title" msgid="9153595142385030015">"தரவு பயன்பாட்டு வரம்பை அமை"</string>
+    <string name="data_usage_warning_editor_title" msgid="3704136912240060339">"டேட்டா பயன்பாட்டு எச்சரிக்கையை அமை"</string>
+    <string name="data_usage_limit_editor_title" msgid="9153595142385030015">"டேட்டா பயன்பாட்டு வரம்பை அமை"</string>
     <string name="data_usage_limit_dialog_title" msgid="3023111643632996097">"தரவு பயன்பாட்டை வரம்பிடுக"</string>
-    <string name="data_usage_limit_dialog_mobile" product="tablet" msgid="4983487893343645667">"நீங்கள் அமைத்துள்ள வரம்பை அடைந்ததும், மொபைல் தரவை டேப்லெட் முடக்கும்.\n\nதரவு உபயோகத்தை டேப்லெட் அளவிட்டாலும், உங்கள் தொலைத்தொடர்பு நிறுவனம் வேறுவிதமாக அளவிடலாம். எனவே, பாதுகாப்பான அளவில் வரம்பை அமைக்கவும்."</string>
-    <string name="data_usage_limit_dialog_mobile" product="default" msgid="3926320594049434225">"நீங்கள் அமைத்துள்ள வரம்பை அடைந்ததும், மொபைல் தரவை மொபைல் முடக்கும்.\n\nதரவு உபயோகத்தை மொபைல் அளவிட்டாலும், உங்கள் தொலைத்தொடர்பு நிறுவனம் வேறுவிதமாக அளவிடலாம். எனவே, பாதுகாப்பான அளவில் வரம்பை அமைக்கவும்."</string>
+    <string name="data_usage_limit_dialog_mobile" product="tablet" msgid="4983487893343645667">"நீங்கள் அமைத்துள்ள வரம்பை அடைந்ததும், மொபைல் டேட்டாவை டேப்லெட் முடக்கும்.\n\nதரவு உபயோகத்தை டேப்லெட் அளவிட்டாலும், உங்கள் தொலைத்தொடர்பு நிறுவனம் வேறுவிதமாக அளவிடலாம். எனவே, பாதுகாப்பான அளவில் வரம்பை அமைக்கவும்."</string>
+    <string name="data_usage_limit_dialog_mobile" product="default" msgid="3926320594049434225">"நீங்கள் அமைத்துள்ள வரம்பை அடைந்ததும், மொபைல் டேட்டாவை மொபைல் முடக்கும்.\n\nதரவு உபயோகத்தை மொபைல் அளவிட்டாலும், உங்கள் தொலைத்தொடர்பு நிறுவனம் வேறுவிதமாக அளவிடலாம். எனவே, பாதுகாப்பான அளவில் வரம்பை அமைக்கவும்."</string>
     <string name="data_usage_restrict_background_title" msgid="2201315502223035062">"பின்புலத் தரவை வரம்பிடவா?"</string>
-    <string name="data_usage_restrict_background" msgid="434093644726734586">"பின்னணி மொபைல் தரவைக் கட்டுப்படுத்தினால், வைஃபையுடன் இணைக்கும் வரை சில பயன்பாடுகளும் சேவைகளும் வேலை செய்யாது."</string>
-    <string name="data_usage_restrict_background_multiuser" product="tablet" msgid="7096707497743363380">"பின்னணி மொபைல் தரவைக் கட்டுப்படுத்தினால், வைஃபையுடன் இணைக்கும் வரை சில பயன்பாடுகளும் சேவைகளும் வேலை செய்யாது.\n\nஇதனால் இந்த டேப்லெட்டைப் பயன்படுத்தும் எல்லாப் பயனர்களும் பாதிக்கப்படுவார்கள்."</string>
-    <string name="data_usage_restrict_background_multiuser" product="default" msgid="7910798414964288424">"பின்னணி மொபைல் தரவைக் கட்டுப்படுத்தினால், வைஃபையுடன் இணைக்கும் வரை சில பயன்பாடுகளும் சேவைகளும் வேலை செய்யாது.\n\nஇதனால் இந்த மொபைலைப் பயன்படுத்தும் எல்லாப் பயனர்களும் பாதிக்கப்படுவார்கள்."</string>
+    <string name="data_usage_restrict_background" msgid="434093644726734586">"பின்னணி மொபைல் டேட்டாவைக் கட்டுப்படுத்தினால், வைஃபையுடன் இணைக்கும் வரை சில பயன்பாடுகளும் சேவைகளும் வேலை செய்யாது."</string>
+    <string name="data_usage_restrict_background_multiuser" product="tablet" msgid="7096707497743363380">"பின்னணி மொபைல் டேட்டாவைக் கட்டுப்படுத்தினால், வைஃபையுடன் இணைக்கும் வரை சில பயன்பாடுகளும் சேவைகளும் வேலை செய்யாது.\n\nஇதனால் இந்த டேப்லெட்டைப் பயன்படுத்தும் எல்லாப் பயனர்களும் பாதிக்கப்படுவார்கள்."</string>
+    <string name="data_usage_restrict_background_multiuser" product="default" msgid="7910798414964288424">"பின்னணி மொபைல் டேட்டாவைக் கட்டுப்படுத்தினால், வைஃபையுடன் இணைக்கும் வரை சில பயன்பாடுகளும் சேவைகளும் வேலை செய்யாது.\n\nஇதனால் இந்த மொபைலைப் பயன்படுத்தும் எல்லாப் பயனர்களும் பாதிக்கப்படுவார்கள்."</string>
     <string name="data_usage_sweep_warning" msgid="6387081852568846982"><font size="18">"<xliff:g id="NUMBER">^1</xliff:g>"</font>" "<font size="9">"<xliff:g id="UNIT">^2</xliff:g>"</font>\n<font size="12">"எச்சரிக்கை"</font></string>
     <string name="data_usage_sweep_limit" msgid="860566507375933039"><font size="18">"<xliff:g id="NUMBER">^1</xliff:g>"</font>" "<font size="9">"<xliff:g id="UNIT">^2</xliff:g>"</font>\n<font size="12">"வரம்பு"</font></string>
     <string name="data_usage_uninstalled_apps" msgid="614263770923231598">"அகற்றப்பட்ட பயன்பாடுகள்"</string>
@@ -2432,11 +2443,14 @@
     <string name="data_usage_total_during_range_mobile" product="tablet" msgid="1925687342154538972">"<xliff:g id="RANGE">%2$s</xliff:g>: உங்கள் டேப்லெட் அளவீட்டின் படி <xliff:g id="TOTAL">%1$s</xliff:g> பயன்படுத்தப்பட்டுள்ளது. உங்கள் மொபைல் நிறுவனத்தின் தரவு பயன்பாட்டின் கணக்கு மாறுபடலாம்."</string>
     <string name="data_usage_total_during_range_mobile" product="default" msgid="5063981061103812900">"<xliff:g id="RANGE">%2$s</xliff:g>: உங்கள் தொலைபேசி அளவீட்டின் படி, <xliff:g id="TOTAL">%1$s</xliff:g> பயன்படுத்தப்பட்டுள்ளது. உங்கள் மொபைல் நிறுவனத்தின் தரவு பயன்பாட்டின் கணக்கு மாறுபடலாம்."</string>
     <string name="data_usage_metered_title" msgid="7383175371006596441">"நெட்வொர்க் கட்டுப்பாடுகள்"</string>
-    <string name="data_usage_metered_body" msgid="7655851702771342507">"பின்னணித் தரவு கட்டுப்படுத்தப்பட்டிருக்கும் போது, கட்டண நெட்வொர்க்குகள் மொபைல் நெட்வொர்க்குகள் போன்று கருதப்படும். இந்த நெட்வொர்க்குகளைப் பயன்படுத்திப் பெரிய அளவிலான கோப்புகளைப் பதிவிறக்கும் முன், பயன்பாடுகள் எச்சரிக்கக்கூடும்."</string>
+    <string name="data_usage_metered_body" msgid="7655851702771342507">"பின்னணி டேட்டா கட்டுப்படுத்தப்பட்டிருக்கும் போது, கட்டண நெட்வொர்க்குகள் மொபைல் நெட்வொர்க்குகள் போன்று கருதப்படும். இந்த நெட்வொர்க்குகளைப் பயன்படுத்திப் பெரிய அளவிலான ஃபைல்களைப் பதிவிறக்கும் முன், அறிவிப்புகளை ஆப்ஸ் வழங்கும்."</string>
     <string name="data_usage_metered_mobile" msgid="5423305619126978393">"மொபைல் நெட்வொர்க்குகள்"</string>
     <string name="data_usage_metered_wifi" msgid="1761738002328299714">"கட்டண வைஃபை நெட்வொர்க்குகள்"</string>
     <string name="data_usage_metered_wifi_disabled" msgid="727808462375941567">"கட்டண நெட்வொர்க்குகளைத் தேர்வுசெய்ய, வைஃபையை இயக்கவும்."</string>
-    <string name="data_usage_disclaimer" msgid="6887858149980673444">"மொபைல் நிறுவனத்தின் தரவு கணக்கிடலும் சாதனத்தின் கணக்கிடலும் வேறுபடலாம்."</string>
+    <string name="data_usage_metered_auto" msgid="1262028400911918865">"தானியங்கு"</string>
+    <string name="data_usage_metered_yes" msgid="9217539611385225894">"கட்டணம் அதிகமான நெட்வொர்க்"</string>
+    <string name="data_usage_metered_no" msgid="4025232961929071789">"கட்டணம் குறைவான நெட்வொர்க்"</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>
@@ -2490,7 +2504,7 @@
     <string name="vpn_menu_edit" msgid="408275284159243490">"சுயவிவரத்தை மாற்று"</string>
     <string name="vpn_menu_delete" msgid="8098021690546891414">"சுயவிவரத்தை நீக்கு"</string>
     <string name="vpn_menu_lockdown" msgid="7863024538064268139">"VPN ஐ எப்போதும் இயக்கத்தில் வை"</string>
-    <string name="vpn_no_vpns_added" msgid="5002741367858707244">"VPNகள் எதுவும் சேர்க்கப்படவில்லை"</string>
+    <string name="vpn_no_vpns_added" msgid="5002741367858707244">"VPN எதுவும் சேர்க்கப்படவில்லை"</string>
     <string name="vpn_always_on_summary" msgid="2821344524094363617">"VPNஐ எப்போதும் இணைத்தே வைத்திருக்கும்"</string>
     <string name="vpn_always_on_summary_not_supported" msgid="592304911378771510">"இந்தப் பயன்பாடு ஆதரிக்கவில்லை"</string>
     <string name="vpn_always_on_summary_active" msgid="8800736191241875669">"\"எப்போதும் இயக்கத்தில்\" செயலிலுள்ளது"</string>
@@ -2503,7 +2517,7 @@
     <string name="vpn_disconnected" msgid="280531508768927471">"VPN இலிருந்து துண்டிக்கப்பட்டது"</string>
     <string name="vpn_disconnected_summary" msgid="3082851661207900606">"ஏதுமில்லை"</string>
     <string name="vpn_missing_cert" msgid="5357192202207234745">"சான்றிதழ் இல்லை. சுயவிவரத்தைத் திருத்தவும்."</string>
-    <string name="trusted_credentials_system_tab" msgid="3984284264816924534">"அமைப்பு"</string>
+    <string name="trusted_credentials_system_tab" msgid="3984284264816924534">"சிஸ்டம்"</string>
     <string name="trusted_credentials_user_tab" msgid="2244732111398939475">"பயனர்"</string>
     <string name="trusted_credentials_disable_label" msgid="3864493185845818506">"முடக்கு"</string>
     <string name="trusted_credentials_enable_label" msgid="2498444573635146913">"இயக்கு"</string>
@@ -2527,9 +2541,6 @@
     <string name="backup_pw_set_button_text" msgid="2387480910044648795">"காப்புப்பிரதி கடவுச்சொல் அமை"</string>
     <string name="backup_pw_cancel_button_text" msgid="8845630125391744615">"ரத்துசெய்"</string>
     <string name="additional_system_update_settings_list_item_title" msgid="214987609894661992">"அதிக சிஸ்டம் புதுப்பிப்புகள்"</string>
-    <string name="selinux_status_disabled" msgid="924551035552323327">"முடக்கப்பட்டது"</string>
-    <string name="selinux_status_permissive" msgid="6004965534713398778">"அனுமதி"</string>
-    <string name="selinux_status_enforcing" msgid="2252703756208463329">"செயற்படுத்துதல்"</string>
     <string name="ssl_ca_cert_warning" msgid="2045866713601984673">"நெட்வொர்க் கண்காணிக்கப்படலாம்"</string>
     <string name="done_button" msgid="1991471253042622230">"முடிந்தது"</string>
     <plurals name="ssl_ca_cert_dialog_title" formatted="false" msgid="7145092748045794650">
@@ -2569,10 +2580,10 @@
     <string name="user_add_user_item_title" msgid="8212199632466198969">"பயனர்"</string>
     <string name="user_add_profile_item_title" msgid="8353515490730363621">"கட்டுப்படுத்தப்பட்ட சுயவிவரம்"</string>
     <string name="user_add_user_title" msgid="2108112641783146007">"புதியவரைச் சேர்க்கவா?"</string>
-    <string name="user_add_user_message_long" msgid="8562152293752222985">"கூடுதல் பயனர்களை உருவாக்கி, சாதனத்தைப் பிறருடன் பகிரலாம். ஒவ்வொரு பயனருக்கும் பயன்பாடுகள், வால்பேப்பர் மற்றும் பலவற்றைத் தனிப்பயனாக்கத் தனி இடம் இருக்கும். ஒவ்வொருவருக்கும் பயன்படக்கூடிய வைஃபை போன்ற சாதன அமைப்புகளையும் அவர்கள் சரிசெய்யலாம்.\n\nபுதியவரைச் சேர்க்கும் போது, அவர் தனக்கான இடத்தை அமைக்க வேண்டும்.\n\nஇருக்கும் பயன்பாடுகளை எவரும் புதுப்பிக்கலாம்."</string>
+    <string name="user_add_user_message_long" msgid="8562152293752222985">"கூடுதல் பயனர்களை உருவாக்கி, சாதனத்தைப் பிறருடன் பகிரலாம். ஒவ்வொரு பயனருக்கும் ஆப்ஸ், வால்பேப்பர் மற்றும் பலவற்றைத் தனிப்பயனாக்கத் தனி இடம் இருக்கும். ஒவ்வொருவருக்கும் பயன்படக்கூடிய வைஃபை போன்ற சாதன அமைப்புகளையும் அவர்கள் சரிசெய்யலாம்.\n\nபுதியவரைச் சேர்க்கும் போது, அவர் தனக்கான இடத்தை அமைக்க வேண்டும்.\n\nஇருக்கும் பயன்பாடுகளை எவரும் புதுப்பிக்கலாம்."</string>
     <string name="user_add_user_message_short" msgid="1511354412249044381">"புதியவரைச் சேர்க்கும் போது, அவர் தனக்கான இடத்தை அமைக்க வேண்டும்.\n\nஇருக்கும் பயன்பாடுகளை எவரும் புதுப்பிக்கலாம்."</string>
     <string name="user_setup_dialog_title" msgid="1765794166801864563">"இப்போது பயனரை அமைக்கவா?"</string>
-    <string name="user_setup_dialog_message" msgid="1004068621380867148">"இவர் சாதனத்தில் இருப்பதை உறுதிசெய்து, அவருக்கான இடத்தை அமைக்கவும்"</string>
+    <string name="user_setup_dialog_message" msgid="1004068621380867148">"இந்தச் சாதனத்தை இவர் பயன்படுத்தும் நிலையிலும், அவருக்கான அமைப்புகளை அவரே செய்து கொள்பவராகவும் இருக்க வேண்டும்."</string>
     <string name="user_setup_profile_dialog_message" msgid="3896568553327558731">"இப்போது சுயவிவரத்தை அமைக்கவா?"</string>
     <string name="user_setup_button_setup_now" msgid="3391388430158437629">"இப்போது அமை"</string>
     <string name="user_setup_button_setup_later" msgid="3068729597269172401">"இப்போது இல்லை"</string>
@@ -2580,7 +2591,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 +2607,7 @@
     <string name="user_adding_new_user" msgid="1521674650874241407">"புதிய பயனரைச் சேர்க்கிறது…"</string>
     <string name="user_delete_user_description" msgid="3158592592118767056">"பயனரை நீக்கு"</string>
     <string name="user_delete_button" msgid="5131259553799403201">"நீக்கு"</string>
-    <string name="user_guest" msgid="8475274842845401871">"கெஸ்ட்"</string>
+    <string name="user_guest" msgid="8475274842845401871">"வேறொருவர்"</string>
     <string name="user_exit_guest_title" msgid="5613997155527410675">"அழைக்கப்பட்டவரை அகற்று"</string>
     <string name="user_exit_guest_confirm_title" msgid="3405527634738147409">"அழைக்கப்பட்டவரை அகற்றவா?"</string>
     <string name="user_exit_guest_confirm_message" msgid="2194459201944413257">"இந்த அமர்வின் எல்லா பயன்பாடுகளும், தரவும் நீக்கப்படும்."</string>
@@ -2616,7 +2627,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>
@@ -2673,8 +2684,8 @@
     <string name="restriction_bluetooth_config_summary" msgid="8372319681287562506">"புளூடூத் இணைத்தல் மற்றும் அமைப்புகளின் மாற்றத்தை அனுமதி"</string>
     <string name="restriction_nfc_enable_title" msgid="5888100955212267941">"NFC"</string>
     <string name="restriction_nfc_enable_summary_config" msgid="3232480757215851738">"மற்றொரு NFC சாதனத்தை <xliff:g id="DEVICE_NAME">%1$s</xliff:g> தொடும்போது தரவுப் பரிமாற்றத்தை அனுமதி"</string>
-    <string name="restriction_nfc_enable_summary" product="tablet" msgid="3891097373396149915">"டேப்லெட்டானது வேறொரு சாதனத்தைத் தொடும்போது தரவு பரிமாற்றத்தை அனுமதி"</string>
-    <string name="restriction_nfc_enable_summary" product="default" msgid="825331120501418592">"தொலைபேசியானது வேறொரு சாதனத்தைத் தொடும்போது தரவு பரிமாற்றத்தை அனுமதி"</string>
+    <string name="restriction_nfc_enable_summary" product="tablet" msgid="3891097373396149915">"டேப்லெட்டானது வேறொரு சாதனத்தைத் தொடும்போது தரவுப் பரிமாற்றத்தை அனுமதி"</string>
+    <string name="restriction_nfc_enable_summary" product="default" msgid="825331120501418592">"வேறொரு சாதனத்தைத் தொடும்போது டேட்டா பரிமாற்றத்தை அனுமதி"</string>
     <string name="restriction_location_enable_title" msgid="5020268888245775164">"இருப்பிடம்"</string>
     <string name="restriction_location_enable_summary" msgid="3489765572281788755">"பயன்பாடுகள் உங்கள் இருப்பிடத் தகவலைப் பயன்படுத்தலாம்"</string>
     <string name="wizard_back" msgid="5567007959434765743">"பின் செல்"</string>
@@ -2689,7 +2700,7 @@
     <string name="sim_settings_summary" msgid="4050372057097516088">"<xliff:g id="SIM_NAME">%1$s</xliff:g> - <xliff:g id="SIM_NUMBER">%2$s</xliff:g>"</string>
     <string name="sim_cards_changed_message" msgid="7900721153345139783">"சிம் கார்டுகள் மாற்றப்பட்டன"</string>
     <string name="sim_cards_changed_message_summary" msgid="8258058274989383204">"செயல்பாடுகளை அமைக்க, தட்டவும்"</string>
-    <string name="sim_cellular_data_unavailable" msgid="9109302537004566098">"மொபைல் தரவு இல்லை"</string>
+    <string name="sim_cellular_data_unavailable" msgid="9109302537004566098">"மொபைல் டேட்டா இல்லை"</string>
     <string name="sim_cellular_data_unavailable_summary" msgid="5416535001368135327">"தரவு சிம்மைத் தேர்ந்தெடுக்க, தட்டவும்"</string>
     <string name="sim_calls_always_use" msgid="7936774751250119715">"அழைப்புகளுக்கு எப்போதும் இதை பயன்படுத்து"</string>
     <string name="select_sim_for_data" msgid="2366081042162853044">"தரவுக்கான SIMஐத் தேர்ந்தெடுக்கவும்"</string>
@@ -2727,15 +2738,16 @@
       <item quantity="other">மறைந்துள்ள %d உருப்படிகளைக் காட்டு</item>
       <item quantity="one">மறைந்துள்ள %d உருப்படியைக் காட்டு</item>
     </plurals>
-    <string name="network_dashboard_title" msgid="4771589228992391573">"நெட்வொர்க் &amp; இணையம்"</string>
+    <string name="dashboard_suggestion_condition_footer_content_description" msgid="2898588191174845961">"சுருக்கும்"</string>
+    <string name="network_dashboard_title" msgid="4771589228992391573">"நெட்வொர்க் &amp; இன்டர்நெட்"</string>
     <string name="network_dashboard_summary_mobile" msgid="3851083934739500429">"மொபைல்"</string>
-    <string name="network_dashboard_summary_data_usage" msgid="3843261364705042212">"தரவு உபயோகம்"</string>
+    <string name="network_dashboard_summary_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="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>
@@ -2796,7 +2808,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>
@@ -2809,14 +2821,14 @@
     <string name="notification_unknown_sound_title" msgid="2535027767851838335">"பயன்பாடு வழங்கும் ஒலி"</string>
     <string name="notification_sound_default" msgid="565135733949733766">"இயல்பு அறிவிப்பு ஒலி"</string>
     <string name="alarm_ringtone_title" msgid="6344025478514311386">"இயல்பு அலார ஒலி"</string>
-    <string name="vibrate_when_ringing_title" msgid="3806079144545849032">"அழைப்பு வருகையில் அதிர்வுறு"</string>
+    <string name="vibrate_when_ringing_title" msgid="3806079144545849032">"அழைப்பு வருகையில் அதிர்வது"</string>
     <string name="other_sound_settings" msgid="3151004537006844718">"பிற ஒலிகள்"</string>
     <string name="dial_pad_tones_title" msgid="1999293510400911558">"டயல்பேடு டோன்கள்"</string>
     <string name="screen_locking_sounds_title" msgid="1340569241625989837">"திரையைப் பூட்டும் போது"</string>
     <string name="charging_sounds_title" msgid="1132272552057504251">"சார்ஜிங்கின் போது"</string>
     <string name="docking_sounds_title" msgid="155236288949940607">"டாக்கிங் ஒலிகள்"</string>
     <string name="touch_sounds_title" msgid="5326587106892390176">"தொடுதலின் போது"</string>
-    <string name="vibrate_on_touch_title" msgid="5388579924689395023">"தட்டும் போது அதிர்வுறு"</string>
+    <string name="vibrate_on_touch_title" msgid="5388579924689395023">"தட்டும் போது அதிர்வது"</string>
     <string name="dock_audio_media_title" msgid="1346838179626123900">"சார்ஜ் ஸ்பீக்கரை இயக்கு"</string>
     <string name="dock_audio_media_disabled" msgid="3430953622491538080">"எல்லா ஆடியோவும்"</string>
     <string name="dock_audio_media_enabled" msgid="667849382924908673">"மீடியா ஆடியோ மட்டும்"</string>
@@ -2829,8 +2841,14 @@
       <item quantity="other"><xliff:g id="ON_COUNT">%d</xliff:g> தானியங்கு விதிகள் இயக்கப்பட்டன</item>
       <item quantity="one">1 தானியங்கு விதி இயக்கப்பட்டது</item>
     </plurals>
-    <string name="zen_mode_settings_title" msgid="842308776768942600">"தொந்தரவு செய்ய வேண்டாம் விருப்பத்தேர்வுகள்"</string>
-    <string name="zen_mode_priority_settings_title" msgid="2623117023031824309">"முதன்மை அனுமதிப்பவை:"</string>
+    <string name="zen_mode_settings_title" msgid="1066226840983908121">"தொந்தரவு செய்யாதே"</string>
+    <string name="zen_mode_behavior_settings_title" msgid="1463303933529313969">"செயல்பாடு"</string>
+    <string name="zen_mode_behavior_allow_title" msgid="3845615648136218141">"இந்த ஒலிகள்/அதிர்வுகளை அனுமதி"</string>
+    <string name="zen_mode_behavior_no_sound" msgid="1219626004723208056">"ஒலியெழுப்ப வேண்டாம்"</string>
+    <string name="zen_mode_behavior_total_silence" msgid="6716603819806610626">"ஒலியெழுப்ப வேண்டாம் (அமைதி)"</string>
+    <string name="zen_mode_behavior_no_sound_except" msgid="4968477585788243114">"<xliff:g id="CATEGORIES">%1$s</xliff:g> தவிர்த்து ஒலியெழுப்ப வேண்டாம்"</string>
+    <!-- no translation found for zen_mode_behavior_alarms_only (2423480992071472963) -->
+    <skip />
     <string name="zen_mode_automation_settings_title" msgid="4228995740594063774">"தானியங்கு விதிகள்"</string>
     <string name="zen_mode_automation_suggestion_title" msgid="5105443455143476201">"டிஎன்டி விதிகளை அமை"</string>
     <string name="zen_mode_automation_suggestion_summary" msgid="4732808039946935657">"ஒலி &amp; அதிர்வுகளை வரம்பிடு"</string>
@@ -2856,12 +2874,12 @@
     <string name="configure_notification_settings" msgid="7616737397127242615">"அறிவிப்புகள்"</string>
     <string name="advanced_section_header" msgid="8833934850242546903">"மேம்பட்டவை"</string>
     <string name="profile_section_header" msgid="2320848161066912001">"பணி அறிவிப்புகள்"</string>
-    <string name="notification_badging_title" msgid="5938709971403474078">"அறிவிப்புப் புள்ளிகளை அனுமதி"</string>
+    <string name="notification_badging_title" msgid="5938709971403474078">"அறிவிப்புப் புள்ளிகளைக் காட்டு"</string>
     <string name="notification_pulse_title" msgid="1905382958860387030">"ஒளியைச் சிமிட்டு"</string>
-    <string name="lock_screen_notifications_title" msgid="6173076173408887213">"பூட்டுத் திரையில்"</string>
+    <string name="lock_screen_notifications_title" msgid="6173076173408887213">"திரை பூட்டியிருக்கும்போது"</string>
     <string name="lock_screen_notifications_summary_show" msgid="6407527697810672847">"எல்லா அறிவிப்பு விவரத்தையும் காட்டு"</string>
-    <string name="lock_screen_notifications_summary_hide" msgid="7891552853357258782">"முக்கிய அறிவிப்பு உள்ளடக்கத்தை மறை"</string>
-    <string name="lock_screen_notifications_summary_disable" msgid="859628910427886715">"ஒருபோதும் அறிவிப்புகளைக் காட்டாதே"</string>
+    <string name="lock_screen_notifications_summary_hide" msgid="7891552853357258782">"முக்கியத் தகவலை மறை"</string>
+    <string name="lock_screen_notifications_summary_disable" msgid="859628910427886715">"அறிவிப்புகளை ஒருபோதும் காட்டாதே"</string>
     <string name="lock_screen_notifications_interstitial_message" msgid="6164532459432182244">"சாதனம் பூட்டப்பட்டிருக்கும் போது, எப்படி அறிவிப்புகளைக் காட்ட வேண்டும்?"</string>
     <string name="lock_screen_notifications_interstitial_title" msgid="1416589393106326972">"அறிவிப்புகள்"</string>
     <string name="lock_screen_notifications_summary_show_profile" msgid="835870815661120772">"எல்லா பணி அறிவிப்பு விவரத்தையும் காட்டு"</string>
@@ -2870,21 +2888,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="notifications_title" msgid="8086372779371204971">"அறிவிப்புகள்"</string>
-    <string name="app_notifications_title" msgid="5810577805218003760">"பயன்பாடு அறிவிப்புகள்"</string>
+    <string name="app_notifications_title" msgid="5810577805218003760">"ஆப்ஸ் அறிவிப்புகள்"</string>
     <string name="notification_channel_title" msgid="2260666541030178452">"அறிவிப்பு வகை"</string>
+    <string name="notification_group_title" msgid="7180506440133859601">"அறிவிப்புப் பிரிவின் குழு"</string>
     <string name="notification_importance_title" msgid="848692592679312666">"முக்கியத்துவம்"</string>
-    <string name="notification_importance_unspecified" msgid="2196023702875112081">"பயன்பாடு முடிவு செய்யட்டும்"</string>
+    <string name="notification_importance_unspecified" msgid="6622173510486113958">"ஒலியை அனுமதிக்கவும்"</string>
     <string name="notification_importance_blocked" msgid="7938180808339386300">"அறிவிப்புகளை ஒருபோதும் காட்டாது"</string>
     <string name="notification_importance_min" msgid="5455049524984686275">"ஒலியெழுப்பாது அல்லது காட்சிக் குறுக்கீடு செய்யாது"</string>
     <string name="notification_importance_low" msgid="8881468429453766553">"ஒலியெழுப்பாது"</string>
     <string name="notification_importance_default" msgid="5958338024601957516">"ஒலியெழுப்பும்"</string>
     <string name="notification_importance_high" msgid="2082429479238228527">"ஒலியெழுப்பி, திரையில் காட்டும்"</string>
+    <string name="notification_importance_high_silent" msgid="2667033773703765252">"திரையில் பாப் அப் செய்யும்"</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_interruption" msgid="7136150018111848721">"குறுக்கீடுகளை அனுமதி"</string>
-    <string name="allow_interruption_summary" msgid="7870159391333957050">"அறிவிப்புகள் வரும் போது ஒலி, அதிர்வை ஏற்படுத்தவும் மற்றும்/அல்லது அறிவிப்புகளைத் திரையில் காட்டவும் பயன்பாட்டை அனுமதிக்கும்"</string>
+    <string name="allow_interruption_summary" msgid="7870159391333957050">"திரையில் ஒலியுடன் அறிவிப்புகள் மற்றும்/அல்லது அதிர்வுடன் அறிவிப்புகளைக் காட்டும்"</string>
     <string name="notification_channel_summary_min" msgid="5401718014765921892">"குறைவான முக்கியத்துவம்"</string>
     <string name="notification_channel_summary_low" msgid="322317684244981244">"நடுத்தர முக்கியத்துவம்"</string>
     <string name="notification_channel_summary_default" msgid="1111749130423589931">"அதிக முக்கியத்துவம்"</string>
@@ -2900,7 +2920,7 @@
     <string name="no_notification_listeners" msgid="3487091564454192821">"அறிவிப்பு அணுகலைக் கோரும் பயன்பாடுகள் எதுவும் நிறுவப்படவில்லை."</string>
     <string name="notification_listener_security_warning_title" msgid="5522924135145843279">"<xliff:g id="SERVICE">%1$s</xliff:g>க்கான அறிவிப்பு அணுகலை அனுமதிக்கவா?"</string>
     <string name="notification_listener_security_warning_summary" msgid="119203147791040151">"தொடர்புப் பெயர்கள், நீங்கள் பெறும் செய்திகள் போன்ற தனிப்பட்ட தகவல் உட்பட எல்லா அறிவிப்புகளையும் <xliff:g id="NOTIFICATION_LISTENER_NAME">%1$s</xliff:g> ஆல் படிக்க முடியும். இந்தப் பயன்பாட்டினால் அறிவிப்புகளை நிராகரிக்கவோ அல்லது அறிவிப்புகளில் உள்ள செயல் பொத்தான்களைத் தூண்டவோ முடியும். \n\nஇது தொந்தரவு செய்ய வேண்டாம் எனும் விருப்பத்தை இயக்க அல்லது முடக்குவதற்கான அனுமதியையும், தொடர்புடையை அமைப்புகளை மாற்றுவதற்கான அனுமதியையும் பயன்பாட்டிற்கு அளிக்கும்."</string>
-    <string name="notification_listener_disable_warning_summary" msgid="6738915379642948000">"<xliff:g id="NOTIFICATION_LISTENER_NAME">%1$s</xliff:g>க்கு அறிவிப்பு அணுகலை முடக்கினால், தொந்தரவு செய்ய வேண்டாம் என்பதற்கான அணுகலும் முடக்கப்படலாம்."</string>
+    <string name="notification_listener_disable_warning_summary" msgid="6738915379642948000">"<xliff:g id="NOTIFICATION_LISTENER_NAME">%1$s</xliff:g>க்கு அறிவிப்பு அணுகலை முடக்கினால், \'தொந்தரவு செய்யாதே\' அணுகலும் முடக்கப்படலாம்."</string>
     <string name="notification_listener_disable_warning_confirm" msgid="8333442186428083057">"முடக்கு"</string>
     <string name="notification_listener_disable_warning_cancel" msgid="8586417377104211584">"ரத்துசெய்"</string>
     <string name="vr_listeners_title" msgid="1318901577754715777">"VR உதவிச் சேவைகள்"</string>
@@ -2916,16 +2936,21 @@
     <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="1264019085827708920">"பயன்பாடு திறந்திருக்கும் போது அல்லது அதிலிருந்து நீங்கள் வெளியேறும் போது (எடுத்துக்காட்டாக, வீடியோவைத் தொடர்ந்து பார்க்க), பிக்ச்சர்-இன்-பிக்ச்சர் சாளரத்தை உருவாக்க, இந்தப் பயன்பாட்டை அனுமதிக்கும். இந்தச் சாளரம் நீங்கள் பயன்படுத்தும் பிற பயன்பாடுகளின் மேல் காட்டப்படும்."</string>
-    <string name="manage_zen_access_title" msgid="2611116122628520522">"தொந்தரவு செய்ய வேண்டாம் என்பதன் அணுகல்"</string>
-    <string name="zen_access_empty_text" msgid="8772967285742259540">"தொந்தரவு செய்ய வேண்டாம் என்பதன் அணுகலை நிறுவப்பட்ட பயன்பாடுகள் எதுவும் கோரவில்லை"</string>
+    <string name="manage_zen_access_title" msgid="2611116122628520522">"\'தொந்தரவு செய்யாதே\' அணுகல்"</string>
+    <string name="zen_access_empty_text" msgid="8772967285742259540">"\'தொந்தரவு செய்யாதே\' அணுகலை நிறுவப்பட்ட பயன்பாடுகள் எதுவும் கோரவில்லை"</string>
     <string name="loading_notification_apps" msgid="5031818677010335895">"பயன்பாடுகளை ஏற்றுகிறது..."</string>
-    <string name="app_notifications_off_desc" msgid="4882445501376722969">"இந்தச் சாதனத்தில் இந்தப் பயன்பாட்டின் அறிவிப்புகள் தோன்றுவதை Android தடுக்கிறது"</string>
+    <string name="app_notifications_off_desc" msgid="4882445501376722969">"இந்தப் பயன்பாட்டின் அறிவிப்புகளை Android இயங்குதளம் இந்தச் சாதனத்தில் காட்டாது"</string>
     <string name="channel_notifications_off_desc" msgid="5899225298718840635">"இந்தச் சாதனத்தில் இந்த வகையிலான அறிவிப்புகள் தோன்றுவதை Android தடுக்கிறது"</string>
+    <string name="channel_group_notifications_off_desc" msgid="1620950416247316370">"சாதனத்தில், இந்தக் குழு அறிவிப்புகள் தோன்றுவதை Android தடுக்கிறது"</string>
     <string name="notification_channels" msgid="5346841743182627500">"வகைகள்"</string>
     <string name="notification_channels_other" msgid="5645317113885788226">"மற்றவை"</string>
+    <plurals name="notification_group_summary" formatted="false" msgid="3420621520561455358">
+      <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="no_channels" msgid="3077375508177744586">"இந்தப் பயன்பாடு எந்த அறிவிப்புகளையும் இடுகையிடவில்லை"</string>
     <string name="app_settings_link" msgid="8894946007543660906">"பயன்பாட்டில் உள்ள கூடுதல் அமைப்புகள்"</string>
-    <string name="app_notification_listing_summary_zero" msgid="6482582965081108108">"எல்லாப் பயன்பாடுகளுக்கும் இயக்கப்பட்டது"</string>
+    <string name="app_notification_listing_summary_zero" msgid="6482582965081108108">"அனைத்திற்கும் இயக்கப்பட்டுள்ளது"</string>
     <plurals name="app_notification_listing_summary_others" formatted="false" msgid="5668835155965827890">
       <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> பயன்பாடுகளுக்கு முடக்கப்பட்டுள்ளது</item>
       <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> பயன்பாட்டிற்கு முடக்கப்பட்டுள்ளது</item>
@@ -2934,17 +2959,17 @@
       <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> வகைகள் நீக்கப்பட்டன</item>
       <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> வகை நீக்கப்பட்டது</item>
     </plurals>
-    <string name="notification_toggle_on" msgid="650145396718191048">"இயக்கப்பட்டுள்ளது"</string>
+    <string name="notification_toggle_on" msgid="650145396718191048">"ஆன்"</string>
     <string name="notification_toggle_off" msgid="2142010737190671762">"முடக்கப்பட்டுள்ளது"</string>
     <string name="app_notification_block_title" msgid="4069351066849087649">"எல்லாம் தடு"</string>
     <string name="app_notification_block_summary" msgid="4744020456943215352">"இந்த அறிவிப்புகளை ஒருபோதும் காட்டாது"</string>
     <string name="notification_content_block_title" msgid="5854232570963006360">"அறிவிப்புகளைக் காட்டு"</string>
     <string name="notification_content_block_summary" msgid="7746185794438882389">"ஷேட்டில் அல்லது துணைச் சாதனங்களில் அறிவிப்புகளை ஒருபோதும் காட்டாது"</string>
-    <string name="notification_badge_title" msgid="6370122441168519809">"அறிவிப்புப் புள்ளியை அனுமதி"</string>
+    <string name="notification_badge_title" msgid="6370122441168519809">"அறிவிப்புப் புள்ளியைக் காட்டு"</string>
     <string name="notification_channel_badge_title" msgid="2240827899882847087">"அறிவிப்புப் புள்ளியைக் காட்டு"</string>
-    <string name="app_notification_override_dnd_title" msgid="7867458246395884830">"தொந்தரவு செய்ய வேண்டாம் அமைப்பை மாற்றவும்"</string>
-    <string name="app_notification_override_dnd_summary" msgid="3516007157020189746">"தொந்தரவு செய்ய வேண்டாம் என்பது முன்னுரிமை மட்டும் என்பதாக அமைக்கப்படும் போது இந்த அறிவிப்புகளைத் தொடர்ந்து குறுக்கிட அனுமதிக்கவும்"</string>
-    <string name="app_notification_visibility_override_title" msgid="2187232730902430718">"பூட்டுத் திரையில்"</string>
+    <string name="app_notification_override_dnd_title" msgid="7867458246395884830">"\'தொந்தரவு செய்யாதே\' எனும் அமைப்பைப் புறக்கணி"</string>
+    <string name="app_notification_override_dnd_summary" msgid="3516007157020189746">"முக்கியச் செய்திகளை மட்டும் காட்டுமாறு அமைக்கப்பட்டிருந்தால், இந்த அறிவிப்புகளை அனுமதிக்கும்"</string>
+    <string name="app_notification_visibility_override_title" msgid="2187232730902430718">"திரை பூட்டியிருக்கும்போது"</string>
     <string name="app_notification_row_banned" msgid="5983655258784814773">"தடுக்கப்பட்டது"</string>
     <string name="app_notification_row_priority" msgid="7723839972982746568">"முன்னுரிமை"</string>
     <string name="app_notification_row_sensitive" msgid="1809610030432329940">"முக்கியமானவை"</string>
@@ -2956,7 +2981,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>
@@ -2985,7 +3010,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>
@@ -2994,19 +3019,21 @@
     <string name="zen_mode_messages" msgid="5886440273537510894">"செய்திகள்"</string>
     <string name="zen_mode_all_messages" msgid="6449223378976743208">"எல்லா செய்திகளும்"</string>
     <string name="zen_mode_selected_messages" msgid="8245990149599142281">"தேர்ந்தெடுத்த செய்திகள்"</string>
-    <string name="zen_mode_from_anyone" msgid="2638322015361252161">"எவரிடமிருந்தும்"</string>
+    <string name="zen_mode_from_anyone" msgid="2638322015361252161">"அனைவரிடமிருந்தும்"</string>
     <string name="zen_mode_from_contacts" msgid="2232335406106711637">"தொடர்புகளிலிருந்து மட்டுமே"</string>
     <string name="zen_mode_from_starred" msgid="2678345811950997027">"நட்சத்திரமிட்ட தொடர்புகளிலிருந்து மட்டுமே"</string>
     <string name="zen_mode_from_none" msgid="8219706639954614136">"ஏதுமில்லை"</string>
     <string name="zen_mode_alarms" msgid="2165302777886552926">"அலாரங்கள்"</string>
+    <!-- no translation found for zen_mode_media_system_other (8900209390529859777) -->
+    <skip />
     <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="239685342222975733">"<xliff:g id="MINUTES">%d</xliff:g> நிமிடத்திற்குள் இரண்டாவது முறையாக அதே எண்ணிலிருந்து அழைப்பு வந்தால், அனுமதி"</string>
     <string name="zen_mode_when" msgid="2767193283311106373">"தானாகவே இயக்கு"</string>
-    <string name="zen_mode_when_never" msgid="8809494351918405602">"எப்போதும் வேண்டாம்"</string>
+    <string name="zen_mode_when_never" msgid="8809494351918405602">"ஒருபோதும் வேண்டாம்"</string>
     <string name="zen_mode_when_every_night" msgid="3122486110091921009">"ஒவ்வொரு இரவும்"</string>
     <string name="zen_mode_when_weeknights" msgid="8354070633893273783">"வார இறுதிநாட்கள்"</string>
     <string name="zen_mode_start_time" msgid="8102602297273744441">"தொடக்க நேரம்"</string>
@@ -3024,20 +3051,21 @@
     <string name="zen_mode_summary_alarms_only_by_time" msgid="7465525754879341907">"<xliff:g id="FORMATTEDTIME">%1$s</xliff:g> வரை அலாரங்கள் மட்டும் என மாற்று"</string>
     <string name="zen_mode_summary_always" msgid="6172985102689237703">"எப்போதும் குறுக்கிடு என மாற்று"</string>
     <string name="zen_mode_screen_on" msgid="7712038508173845101">"திரை இயக்கப்பட்டிருக்கும் போது தடு"</string>
-    <string name="zen_mode_screen_on_summary" msgid="6444425984146305149">"தொந்தரவு செய்ய வேண்டாம் என்பதன் மூலம் நிசப்தமாக்கப்பட்ட அறிவிப்புகள், திரையில் குறுக்கிடுவதை அல்லது தோன்றுவதைத் தடு"</string>
+    <string name="zen_mode_screen_on_summary" msgid="6444425984146305149">"\'தொந்தரவு செய்யாதே\' மூலம் நிசப்தமாக்கப்பட்ட அறிவிப்புகள், திரையில் குறுக்கிடுவதை அல்லது தோன்றுவதைத் தடு"</string>
     <string name="zen_mode_screen_off" msgid="5026854939192419879">"திரை முடக்கப்பட்டிருக்கும் போது தடு"</string>
-    <string name="zen_mode_screen_off_summary" msgid="6490932947651798094">"தொந்தரவு செய்ய வேண்டாம் என்பதன் மூலம் நிசப்தமாக்கப்பட்ட அறிவிப்புகள் வரும் போது, திரையை இயக்குவதை அல்லது அறிவிப்பு ஒளி ஒளிர்வதைத் தடு"</string>
-    <string name="zen_mode_screen_off_summary_no_led" msgid="3758698381956461866">"தொந்தரவு செய்ய வேண்டாம் என்பதன் மூலம் நிசப்தமாக்கப்பட்ட அறிவிப்புகள் வரும் போது, திரையை இயக்குவதைத் தடுக்கும்"</string>
-    <string name="zen_mode_all_visual_interruptions" msgid="2851308980832487411">"முடக்கத்தில்"</string>
+    <string name="zen_mode_screen_off_summary" msgid="6490932947651798094">"\'தொந்தரவு செய்யாதே\' மூலம் நிசப்தமாக்கப்பட்ட அறிவிப்புகள் வரும் போது, திரையை இயக்குவதை அல்லது அறிவிப்பு ஒளி ஒளிர்வதைத் தடு"</string>
+    <string name="zen_mode_screen_off_summary_no_led" msgid="3758698381956461866">"\'தொந்தரவு செய்யாதே\' மூலம் நிசப்தமாக்கப்பட்ட அறிவிப்புகள் வரும் போது, திரையை இயக்குவதைத் தடுக்கும்"</string>
+    <string name="zen_mode_all_visual_interruptions" msgid="2851308980832487411">"ஆஃப்"</string>
     <string name="zen_mode_screen_on_visual_interruptions" msgid="7373348148129140528">"திரை இயக்கப்பட்டிருக்கும் போது"</string>
     <string name="zen_mode_screen_off_visual_interruptions" msgid="4850792880144382633">"திரை முடக்கப்பட்டிருக்கும் போது"</string>
     <string name="zen_mode_no_visual_interruptions" msgid="8742776003822778472">"திரை இயக்கத்தில் அல்லது முடக்கத்தில் உள்ள போது"</string>
     <string name="notification_app_settings_button" msgid="6685640230371477485">"அறிவிப்பு அமைப்பு"</string>
+    <string name="suggestion_button_text" msgid="3275010948381252006">"சரி"</string>
     <string name="device_feedback" msgid="3238056036766293294">"சாதனம் பற்றி கருத்தை அனுப்பு"</string>
     <string name="restr_pin_enter_admin_pin" msgid="1085834515677448072">"நிர்வாகிப் பின்னை உள்ளிடவும்"</string>
-    <string name="switch_on_text" msgid="1124106706920572386">"இயக்கு"</string>
-    <string name="switch_off_text" msgid="1139356348100829659">"முடக்கு"</string>
-    <string name="screen_pinning_title" msgid="2292573232264116542">"திரையைப் பொருத்துதல்"</string>
+    <string name="switch_on_text" msgid="1124106706920572386">"ஆன்"</string>
+    <string name="switch_off_text" msgid="1139356348100829659">"ஆஃப்"</string>
+    <string name="screen_pinning_title" msgid="2292573232264116542">"திரையில் பொருத்துதல்"</string>
     <string name="screen_pinning_description" msgid="3360904523688769289">"இந்த அமைப்பு இயக்கப்பட்டிருக்கும் போது, நடப்புத் திரையைக் காட்சியில் வைத்திருக்க, திரையைப் பின்செய்தல் அம்சத்தைப் பயன்படுத்தலாம், பின் செய்ததை விலக்கும் வரை நடப்புத் திரை காட்சியில் தோன்றும்.\n\nதிரையைப் பின்செய்தல் அம்சத்தைப் பயன்படுத்த:\n\n1. திரையைப் பின்செய்தல் இயக்கத்தில் இருப்பதை உறுதிப்படுத்தவும்.\n\n2. பின் செய்ய விரும்பும் திரையைத் திறக்கவும்.\n\n3. மேலோட்டப் பார்வை என்பதைத் தட்டவும்.\n\n4. மேலே ஸ்வைப் செய்து, பின் செய் எனும் ஐகானைத் தட்டவும்."</string>
     <string name="screen_pinning_unlock_pattern" msgid="8282268570060313339">"அகற்றும் முன் திறத்தல் வடிவத்தைக் கேள்"</string>
     <string name="screen_pinning_unlock_pin" msgid="8757588350454795286">"அகற்றும் முன் பின்னைக் கேள்"</string>
@@ -3048,12 +3076,12 @@
     <string name="experimental_preference" msgid="7083015446690681376">"(சோதனை முயற்சி)"</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="5560954719370251702">"சாதனத்தைத் திறக்க உங்கள் கைரேகையைப் பயன்படுத்துவதுடன் சேர்த்து, இந்தச் சாதனத்தைத் தொடங்கும் முன், கடவுச்சொல் கேட்குமாறு அமைத்து, மேலும் பாதுகாக்கலாம். சாதனம் தொடங்கும் வரை, அழைப்புகள், செய்திகள் அல்லது அலாரங்கள் உள்ளிட்ட அறிவிப்புகளை இதில் பெற முடியாது. \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>
@@ -3067,21 +3095,21 @@
     <string name="imei_information_summary" msgid="2074095606556565233">"IMEI தொடர்புடைய தகவல்"</string>
     <string name="slot_number" msgid="3762676044904653577">"(ஸ்லாட்<xliff:g id="SLOT_NUM">%1$d</xliff:g>)"</string>
     <string name="launch_by_default" msgid="1840761193189009248">"இயல்பாகத் திற"</string>
-    <string name="app_launch_domain_links_title" msgid="1160925981363706090">"திறக்கும் இணைப்புகள்"</string>
+    <string name="app_launch_domain_links_title" msgid="1160925981363706090">"இணைப்புகளைத் திறக்க"</string>
     <string name="app_launch_open_domain_urls_title" msgid="8914721351596745701">"ஆதரிக்கப்படும் இணைப்புகளைத் திறத்தல்"</string>
     <string name="app_launch_open_domain_urls_summary" msgid="5367573364240712217">"கேட்காமலே திறக்கும்"</string>
     <string name="app_launch_supported_domain_urls_title" msgid="8250695258211477480">"ஆதரிக்கப்படும் இணைப்புகள்"</string>
     <string name="app_launch_other_defaults_title" msgid="2516812499807835178">"பிற இயல்புகள்"</string>
-    <string name="storage_summary_format" msgid="5419902362347539755">"<xliff:g id="STORAGE_TYPE">%2$s</xliff:g> இல் <xliff:g id="SIZE">%1$s</xliff:g> பயன்படுத்தப்பட்டது"</string>
+    <string name="storage_summary_format" msgid="5419902362347539755">"<xliff:g id="STORAGE_TYPE">%2$s</xliff:g>: <xliff:g id="SIZE">%1$s</xliff:g> பயன்படுத்தப்பட்டது"</string>
     <string name="storage_type_internal" msgid="6042049833565674948">"அகச் சேமிப்பிடம்"</string>
     <string name="storage_type_external" msgid="7738894330670001898">"வெளிப்புறச் சேமிப்பிடம்"</string>
-    <string name="app_data_usage" msgid="7942375313697452803">"தரவுப் பயன்பாடு"</string>
+    <string name="app_data_usage" msgid="7942375313697452803">"டேட்டா பயன்பாடு"</string>
     <string name="data_summary_format" msgid="6213211533341068366">"உபயோகம்: <xliff:g id="DATE">%2$s</xliff:g> முதல், <xliff:g id="SIZE">%1$s</xliff:g>"</string>
     <string name="storage_used" msgid="7128074132917008743">"பயன்படுத்திய சேமிப்பிடம்"</string>
     <string name="change" msgid="6657848623929839991">"மாற்று"</string>
     <string name="change_storage" msgid="600475265207060436">"சேமிப்பிடத்தை மாற்றவும்"</string>
-    <string name="notifications_label" msgid="8543457911148619898">"பயன்பாடு அறிவிப்புகள்"</string>
-    <string name="notifications_enabled" msgid="6983396130566021385">"இயக்கத்தில்"</string>
+    <string name="notifications_label" msgid="8543457911148619898">"ஆப்ஸ் அறிவிப்புகள்"</string>
+    <string name="notifications_enabled" msgid="6983396130566021385">"ஆன்"</string>
     <string name="notifications_disabled" msgid="334416731283131597">"எல்லாம் முடக்கப்பட்டன"</string>
     <string name="notifications_partly_blocked" msgid="592071133950126656">"<xliff:g id="COUNT_1">%2$d</xliff:g> வகைகளில் <xliff:g id="COUNT_0">%1$d</xliff:g> முடக்கப்பட்டது"</string>
     <string name="notifications_silenced" msgid="4728603513072110381">"தடுக்கப்பட்டுள்ளன"</string>
@@ -3111,7 +3139,7 @@
     <string name="filter_personal_apps" msgid="3277727374174355971">"தனிப்பட்டவை"</string>
     <string name="filter_work_apps" msgid="24519936790795574">"பணியிடம்"</string>
     <string name="filter_notif_all_apps" msgid="2299049859443680242">"பயன்பாடுகள்: எல்லாம்"</string>
-    <string name="filter_notif_blocked_apps" msgid="3300375727887991342">"பயன்பாடுகள்: முடக்கப்பட்டன"</string>
+    <string name="filter_notif_blocked_apps" msgid="3300375727887991342">"ஆப்ஸ்: ஆஃப் செய்தவை"</string>
     <string name="filter_notif_urgent_channels" msgid="3972473613117159653">"வகைகள்: அதிக முக்கியத்துவம்"</string>
     <string name="filter_notif_low_channels" msgid="4128487387390004604">"வகைகள்: குறைந்த முக்கியத்துவம்"</string>
     <string name="filter_notif_blocked_channels" msgid="5880190882221644289">"வகைகள்: முடக்கப்பட்டன"</string>
@@ -3120,10 +3148,10 @@
     <string name="configure_apps" msgid="6685680790825882528">"பயன்பாடுகளை உள்ளமை"</string>
     <string name="unknown_app" msgid="5275921288718717656">"அறியப்படாத பயன்பாடு"</string>
     <string name="app_permissions" msgid="4148222031991883874">"பயன்பாட்டு அனுமதிகள்"</string>
-    <string name="app_permissions_summary" msgid="5163974162150406324">"<xliff:g id="APPS">%1$s</xliff:g>ஐப் பயன்படுத்தும் பயன்பாடுகள்"</string>
+    <string name="app_permissions_summary" msgid="5163974162150406324">"<xliff:g id="APPS">%1$s</xliff:g> ஆகியவற்றைப் பயன்படுத்தும் பயன்பாடுகள்"</string>
     <string name="tap_to_wake" msgid="7211944147196888807">"இயக்க, தட்டவும்"</string>
     <string name="tap_to_wake_summary" msgid="4341387904987585616">"சாதனத்தை இயக்க, திரையின் எந்த இடத்திலும் இருமுறை தட்டவும்"</string>
-    <string name="domain_urls_title" msgid="3132983644568821250">"திறக்கும் இணைப்புகள்"</string>
+    <string name="domain_urls_title" msgid="3132983644568821250">"இணைப்புகளைத் திறக்க"</string>
     <string name="domain_urls_summary_none" msgid="2639588015479657864">"ஆதரிக்கப்படும் இணைப்புகளைத் திறக்காது"</string>
     <string name="domain_urls_summary_one" msgid="3704934031930978405">"<xliff:g id="DOMAIN">%s</xliff:g>ஐ மட்டும் திறக்கும்"</string>
     <string name="domain_urls_summary_some" msgid="3950089361819428455">"<xliff:g id="DOMAIN">%s</xliff:g> மற்றும் பிற URLகளைத் திறக்கக்கூடியவை"</string>
@@ -3145,13 +3173,13 @@
     <string name="assistant_security_warning_agree" msgid="7710290206928033908">"ஏற்கிறேன்"</string>
     <string name="assistant_security_warning_disagree" msgid="877419950830205913">"ஏற்கவில்லை"</string>
     <string name="choose_voice_input_title" msgid="975471367067718019">"குரல் உள்ளீட்டைத் தேர்வுசெய்க"</string>
-    <string name="default_browser_title" msgid="8101772675085814670">"உலாவி பயன்பாடு"</string>
+    <string name="default_browser_title" msgid="8101772675085814670">"உலாவி"</string>
     <string name="default_browser_title_none" msgid="2124785489953628553">"இயல்பு உலாவி இல்லை"</string>
-    <string name="default_phone_title" msgid="282005908059637350">"ஃபோன் பயன்பாடு"</string>
+    <string name="default_phone_title" msgid="282005908059637350">"ஃபோன்"</string>
     <string name="default_app" msgid="6864503001385843060">"(இயல்பு)"</string>
-    <string name="system_app" msgid="9068313769550747372">"(முறைமை)"</string>
+    <string name="system_app" msgid="9068313769550747372">"(சிஸ்டம்)"</string>
     <string name="system_default_app" msgid="3091113402349739037">"(முறைமை இயல்பு)"</string>
-    <string name="apps_storage" msgid="4353308027210435513">"பயன்பாட்டுச் சேமிப்பகம்"</string>
+    <string name="apps_storage" msgid="4353308027210435513">"ஆப்ஸ் சேமிப்பகம்"</string>
     <string name="usage_access" msgid="5479504953931038165">"பயன்பாட்டு அணுகல்"</string>
     <string name="permit_usage_access" msgid="4012876269445832300">"பயன்பாட்டு அணுகல் அனுமதி"</string>
     <string name="app_usage_preference" msgid="7065701732733134991">"பயன்பாட்டு உபயோக விருப்பத்தேர்வுகள்"</string>
@@ -3167,9 +3195,9 @@
     <string name="memory_avg_desc" msgid="1551240906596518412">"சராசரியாக <xliff:g id="MEMORY">%1$s</xliff:g>"</string>
     <string name="memory_use_running_format" msgid="4172488041800743760">"<xliff:g id="MEMORY">%1$s</xliff:g> / <xliff:g id="RUNNING">%2$s</xliff:g>"</string>
     <string name="process_format" msgid="77905604092541454">"<xliff:g id="APP_NAME">%1$s</xliff:g> (<xliff:g id="COUNT">%2$d</xliff:g>)"</string>
-    <string name="high_power_apps" msgid="3459065925679828230">"பேட்டரி மேம்படுத்தல்"</string>
+    <string name="high_power_apps" msgid="3459065925679828230">"பேட்டரி சேமிப்பு"</string>
     <string name="additional_battery_info" msgid="4754099329165411970">"உபயோகம் குறித்த எச்சரிக்கைகள்"</string>
-    <string name="show_all_apps" msgid="1512506948197818534">"சாதனத்தின் முழு உபயோகத்தைக் காட்டு"</string>
+    <string name="show_all_apps" msgid="1512506948197818534">"முழு பயன்பாட்டைக் காட்டு"</string>
     <string name="hide_extra_apps" msgid="5016497281322459633">"பயன்பாட்டின் உபயோகத்தை காட்டு"</string>
     <string name="power_high_usage_title" msgid="6027369425057347826">"அதிக உபயோகம்"</string>
     <plurals name="power_high_usage_summary" formatted="false" msgid="467347882627862744">
@@ -3180,10 +3208,10 @@
       <item quantity="other">பேட்டரியை அதிகமாகப் பயன்படுத்தும் பயன்பாடுகள்</item>
       <item quantity="one">பேட்டரியை அதிகமாகப் பயன்படுத்தும் <xliff:g id="APP">%1$s</xliff:g> பயன்பாடு</item>
     </plurals>
-    <string name="high_power_filter_on" msgid="3222265297576680099">"மேம்படுத்தப்படாதவை"</string>
-    <string name="high_power_on" msgid="6216293998227583810">"மேம்படுத்தப்படாதது"</string>
+    <string name="high_power_filter_on" msgid="3222265297576680099">"பவர் சேமிக்காதவை"</string>
+    <string name="high_power_on" msgid="6216293998227583810">"பவர் சேமிக்காதவை"</string>
     <string name="high_power_off" msgid="3393904131961263278">"பேட்டரி உபயோகத்தை மேம்படுத்தும்"</string>
-    <string name="high_power_system" msgid="7362862974428225301">"பேட்டரி மேம்படுத்தல் இல்லை"</string>
+    <string name="high_power_system" msgid="7362862974428225301">"பேட்டரியைச் சேமிக்காது"</string>
     <string name="high_power_desc" msgid="6283926163708585760">"பேட்டரி மேம்படுத்தலைப் பயன்படுத்தவில்லை எனில், உங்கள் பேட்டரி மிக விரைவில் தீர்ந்துவிடக்கூடும்."</string>
     <string name="high_power_prompt_title" msgid="6358673688590282655">"எப்போதும் பின்னணியில் இயங்க, பயன்பாட்டை அனுமதிக்கவா?"</string>
     <string name="high_power_prompt_body" msgid="1031422980602565049">"எப்போதும் பின்னணியில் இயங்குவதற்கு <xliff:g id="APP_NAME">%1$s</xliff:g>ஐ அனுமதிப்பதால், பேட்டரி நிலை குறையக்கூடும். \n\nஇதை அமைப்புகள் &gt; பயன்பாடுகள் &amp; அறிவிப்புகள் என்பதற்குச் சென்று, மாற்றலாம்."</string>
@@ -3200,23 +3228,24 @@
     <string name="sharing_remote_bugreport_dialog_message" msgid="5859287696666024466">"இந்தப் பிழை அறிக்கை உங்கள் ஐடி நிர்வாகியுடன் பகிரப்படுகிறது. மேலும் விவரங்களுக்கு அவரைத் தொடர்புகொள்ளவும்."</string>
     <string name="share_remote_bugreport_action" msgid="532226159318779397">"பகிர்"</string>
     <string name="decline_remote_bugreport_action" msgid="518720235407565134">"வேண்டாம்"</string>
-    <string name="usb_use_charging_only" msgid="2180443097365214467">"இந்தச் சாதனத்தை சார்ஜ் செய்"</string>
+    <string name="usb_use_charging_only" msgid="2180443097365214467">"இந்தச் சாதனத்தை சார்ஜ் செய்ய"</string>
     <string name="usb_use_charging_only_desc" msgid="3066256793008540627">"இந்தச் சாதனத்தைச் சார்ஜ் செய்யும்"</string>
-    <string name="usb_use_power_only" msgid="6426550616883919530">"பவரை சப்ளை செய்"</string>
+    <string name="usb_use_power_only" msgid="6426550616883919530">"பவர் சப்ளை செய்ய"</string>
     <string name="usb_use_power_only_desc" msgid="3461232831015575152">"இணைத்துள்ள சாதனம் சார்ஜாகும். இது USB சார்ஜிங்கை ஆதரிக்கும் சாதனங்களில் மட்டுமே வேலை செய்யும்."</string>
-    <string name="usb_use_file_transfers" msgid="7409600791007250137">"கோப்புகளை இடமாற்று"</string>
+    <string name="usb_use_file_transfers" msgid="7409600791007250137">"ஃபைல்களைப் பரிமாற்ற"</string>
     <string name="usb_use_file_transfers_desc" msgid="4235764784331804488">"கோப்புகளை மற்றொரு சாதனத்திற்கு இடமாற்றும்"</string>
-    <string name="usb_use_photo_transfers" msgid="7794775645350330454">"படங்கள் பரிமாற்றம் (PTP)"</string>
+    <string name="usb_use_photo_transfers" msgid="7794775645350330454">"படங்களைப் பரிமாற்ற (PTP)"</string>
     <string name="usb_use_photo_transfers_desc" msgid="2963034811151325996">"MTP ஆதரிக்கப்படவில்லை எனில், படங்கள் அல்லது கோப்புகளைப் பரிமாற்றும் (PTP)"</string>
-    <string name="usb_use_MIDI" msgid="870922185938298263">"சாதனத்தை MIDI ஆகப் பயன்படுத்து"</string>
+    <string name="usb_use_MIDI" msgid="870922185938298263">"சாதனத்தை MIDIயாகப் பயன்படுத்த"</string>
     <string name="usb_use_MIDI_desc" msgid="8473936990076693175">"இந்தச் சாதனத்தை MIDI ஆகப் பயன்படுத்தும்"</string>
     <string name="usb_use" msgid="3256040963685055320">"USBஐ இதற்குப் பயன்படுத்து:"</string>
     <string name="usb_pref" msgid="1400617804525116158">"USB"</string>
-    <string name="usb_summary_charging_only" msgid="7544327009143659751">"இந்தச் சாதனம் சார்ஜாகிறது"</string>
+    <string name="usb_summary_charging_only" msgid="7544327009143659751">"இந்தச் சாதனத்தைச் சார்ஜ் செய்வதற்கு"</string>
     <string name="usb_summary_power_only" msgid="3629517713817003738">"பவரைச் சப்ளை செய்கிறது"</string>
     <string name="usb_summary_file_transfers" msgid="6435943692610175111">"கோப்புகளை இடமாற்றுகிறது"</string>
     <string name="usb_summary_photo_transfers" msgid="8440204169576585250">"படங்களை இடமாற்றுகிறது (PTP)"</string>
     <string name="usb_summary_MIDI" msgid="5687906612187885908">"சாதனத்தை MIDI ஆகப் பயன்படுத்துகிறது"</string>
+    <string name="sms_mirroring_pref" msgid="6475043279147376031">"SMS மிரரிங்"</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>
@@ -3260,30 +3289,30 @@
     <string name="app_list_preference_none" msgid="108006867520327904">"ஏதுமில்லை"</string>
     <string name="work_profile_usage_access_warning" msgid="2918050775124911939">"இந்தப் பயன்பாட்டின் உபயோக அணுகலை முடக்குவதால், பணி விவரத்தில் உள்ள பயன்பாடுகளுக்கான தரவுப் பயன்பாட்டைக் கண்காணிப்பதிலிருந்து உங்கள் நிர்வாகியைத் தடுக்க முடியாது"</string>
     <string name="accessibility_lock_screen_progress" msgid="2408292742980383166">"<xliff:g id="COUNT_1">%2$d</xliff:g> இல் <xliff:g id="COUNT_0">%1$d</xliff:g> எழுத்துக்குறிகள் பயன்படுத்தப்பட்டன"</string>
-    <string name="draw_overlay" msgid="6564116025404257047">"பிற பயன்பாடுகளின் மேலே காட்டு"</string>
-    <string name="system_alert_window_settings" msgid="8466613169103527868">"பிற பயன்பாடுகளின் மேலே காட்டு"</string>
-    <string name="system_alert_window_apps_title" msgid="7005760279028569491">"பயன்பாடுகள்"</string>
-    <string name="system_alert_window_access_title" msgid="6297115362542361241">"பிற பயன்பாடுகளின் மேலே காட்டு"</string>
+    <string name="draw_overlay" msgid="6564116025404257047">"பிற ஆப்ஸின் மேலே காட்டு"</string>
+    <string name="system_alert_window_settings" msgid="8466613169103527868">"பிற ஆப்ஸின் மேலே காட்டு"</string>
+    <string name="system_alert_window_apps_title" msgid="7005760279028569491">"ஆப்ஸ்"</string>
+    <string name="system_alert_window_access_title" msgid="6297115362542361241">"பிற ஆப்ஸின் மேலே காட்டு"</string>
     <string name="permit_draw_overlay" msgid="7456536798718633432">"பிற பயன்பாடுகளின் மேலே காட்டுவதை அனுமதி"</string>
     <string name="app_overlay_permission_preference" msgid="9039432222453006038">"பிற பயன்பாடுகளின் மேலே காட்டுவதற்கான அனுமதி"</string>
     <string name="allow_overlay_description" msgid="8961670023925421358">"நீங்கள் பயன்படுத்தும் பிற பயன்பாடுகளின் மேலே உள்ளடக்கத்தைக் காட்ட, இந்தப் பயன்பாட்டை அனுமதிக்கும். மேலும், அந்தப் பயன்பாடுகளை நீங்கள் பயன்படுத்தும் போது இது குறுக்கிடக்கூடும் அல்லது அவை தோன்றும் அல்லது செயல்படும் விதத்தை மாற்றக்கூடும்."</string>
     <string name="keywords_vr_listener" msgid="7441221822576384680">"vr விர்ச்சுவல் ரியாலிட்டி லிஷனர் ஸ்டீரியோ உதவிச் சேவை"</string>
     <string name="keywords_system_alert_window" msgid="5049498015597864850">"சாதனம் விழிப்பூட்டல் சாளரம் உரையாடல் காட்டு பிற பயன்பாடுகளின் மேல்"</string>
-    <string name="overlay_settings" msgid="6930854109449524280">"பிற பயன்பாடுகளின் மேலே காட்டு"</string>
+    <string name="overlay_settings" msgid="6930854109449524280">"பிற ஆப்ஸின் மேலே காட்டு"</string>
     <string name="system_alert_window_summary" msgid="602892301318324492">"பிற பயன்பாடுகளின் மேலே காட்டுவதற்கு <xliff:g id="COUNT_1">%2$d</xliff:g> இல் <xliff:g id="COUNT_0">%1$d</xliff:g> பயன்பாடுகள் அனுமதிக்கப்பட்டுள்ளன"</string>
     <string name="filter_overlay_apps" msgid="6965969283342557573">"அனுமதி பெற்ற பயன்பாடுகள்"</string>
     <string name="app_permission_summary_allowed" msgid="1505409933012886711">"அனுமதிக்கப்பட்டது"</string>
     <string name="app_permission_summary_not_allowed" msgid="2592617058101882802">"அனுமதிக்கப்படவில்லை"</string>
     <string name="keywords_install_other_apps" msgid="761078076051006558">"நிறுவு பயன்பாடுகள் அறியப்படாத மூலங்கள்"</string>
-    <string name="write_settings" msgid="4797457275727195681">"முறைமை அமைப்புகளை மாற்று"</string>
+    <string name="write_settings" msgid="4797457275727195681">"சாதன அமைப்புகளை மாற்று"</string>
     <string name="keywords_write_settings" msgid="6415597272561105138">"முறைமை அமைப்புகளை எழுது மாற்று"</string>
     <string name="write_settings_summary" msgid="4302268998611412696">"<xliff:g id="COUNT_1">%2$d</xliff:g> இல் <xliff:g id="COUNT_0">%1$d</xliff:g> பயன்பாடுகள் முறைமை அமைப்புகளை மாற்ற அனுமதிக்கப்பட்டுள்ளன"</string>
     <string name="filter_install_sources_apps" msgid="3102976274848199118">"பிற பயன்பாடுகளை நிறுவலாம்"</string>
     <string name="filter_write_settings_apps" msgid="2914615026197322551">"முறைமை அமைப்புகளை மாற்றலாம்"</string>
     <string name="write_settings_title" msgid="4232152481902542284">"முறைமை அமைப்புகளை மாற்றலாம்"</string>
-    <string name="write_system_settings" msgid="3482913590601096763">"முறைமை அமைப்புகளை மாற்று"</string>
+    <string name="write_system_settings" msgid="3482913590601096763">"சாதன அமைப்புகளை மாற்று"</string>
     <string name="write_settings_preference" msgid="3407383041273067448">"பயன்பாடானது முறைமை அமைப்புகளை மாற்றுவதற்கான அனுமதி"</string>
-    <string name="permit_write_settings" msgid="6393779336656870080">"முறைமை அமைப்புகளை மாற்ற அனுமதி"</string>
+    <string name="permit_write_settings" msgid="658555006453212691">"சிஸ்டம் அமைப்புகளை மாற்றுவதற்கு அனுமதி"</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>
@@ -3310,25 +3339,25 @@
     <string name="screen_zoom_conversation_timestamp_3" msgid="3785674344762707688">"செவ் 6:02PM"</string>
     <string name="screen_zoom_conversation_timestamp_4" msgid="2511469395448561259">"செவ் 6:03PM"</string>
     <string name="disconnected" msgid="4836600637485526329">"இணைக்கப்படவில்லை"</string>
-    <string name="data_usage_summary_format" msgid="7507047900192160585">"<xliff:g id="AMOUNT">%1$s</xliff:g> தரவு பயன்படுத்தப்பட்டுள்ளது"</string>
+    <string name="data_usage_summary_format" msgid="7507047900192160585">"பயன்படுத்திய டேட்டா: <xliff:g id="AMOUNT">%1$s</xliff:g>"</string>
     <plurals name="notification_summary" formatted="false" msgid="3941492005316143599">
       <item quantity="other"><xliff:g id="COUNT">%d</xliff:g> பயன்பாடுகளுக்கு முடக்கப்பட்டுள்ளது</item>
       <item quantity="one">1 பயன்பாட்டிற்கு முடக்கப்பட்டுள்ளது</item>
     </plurals>
-    <string name="notification_summary_none" msgid="4586376436702610">"எல்லாப் பயன்பாடுகளுக்கும் இயக்கப்பட்டது"</string>
+    <string name="notification_summary_none" msgid="4586376436702610">"அனைத்திற்கும் இயக்கப்பட்டுள்ளது"</string>
     <string name="apps_summary" msgid="193158055537070092">"<xliff:g id="COUNT">%1$d</xliff:g> பயன்பாடுகள் நிறுவப்பட்டுள்ளன"</string>
     <string name="apps_summary_example" msgid="2118896966712746139">"24 பயன்பாடுகள் நிறுவப்பட்டன"</string>
-    <string name="storage_summary" msgid="3801281635351732202">"<xliff:g id="PERCENTAGE">%1$s</xliff:g> பயன்படுத்தப்பட்டுள்ளது - <xliff:g id="FREE_SPACE">%2$s</xliff:g> மீதமுள்ளது"</string>
+    <string name="storage_summary" msgid="3801281635351732202">"பயன்படுத்தியது: <xliff:g id="PERCENTAGE">%1$s</xliff:g>, காலியிடம்: <xliff:g id="FREE_SPACE">%2$s</xliff:g>"</string>
     <string name="storage_summary_with_sdcard" msgid="3290457009629490121">"சாதனச் சேமிப்பகம்: <xliff:g id="PERCENTAGE">%1$s</xliff:g> பயன்படுத்தப்பட்டது - <xliff:g id="FREE_SPACE">%2$s</xliff:g> பயன்படுத்துவதற்கு உள்ளது"</string>
     <string name="display_summary" msgid="6737806235882127328">"<xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> நிமிடங்களாக எந்தச் செயல்பாடும் இல்லை எனில், உறக்கநிலைக்குச் செல்லும்"</string>
-    <string name="display_dashboard_summary" msgid="4145888780290131488">"வால்பேப்பர், உறக்கநிலை, எழுத்துரு அளவு"</string>
+    <string name="display_dashboard_summary" msgid="4145888780290131488">"வால்பேப்பர், உறக்கம், எழுத்தின் அளவு"</string>
     <string name="display_summary_example" msgid="9102633726811090523">"10 நிமிடங்களாக எந்தச் செயல்பாடும் இல்லை எனில், உறக்கநிலைக்குச் செல்லும்"</string>
     <string name="memory_summary" msgid="8080825904671961872">"<xliff:g id="TOTAL_MEMORY">%2$s</xliff:g> இல் சராசரியாக <xliff:g id="USED_MEMORY">%1$s</xliff:g> நினைவகம் பயன்படுத்தப்பட்டுள்ளது"</string>
     <string name="users_and_accounts_summary" msgid="245282689646897882">"தற்போதைய பயனர்: <xliff:g id="USER_NAME">%1$s</xliff:g>"</string>
     <string name="users_summary" msgid="1674864467098487328">"உள்நுழைந்துள்ள முகவரி: <xliff:g id="USER_NAME">%1$s</xliff:g>"</string>
     <string name="payment_summary" msgid="3472482669588561110">"<xliff:g id="APP_NAME">%1$s</xliff:g> இயல்பு பயன்பாடாகும்"</string>
-    <string name="location_on_summary" msgid="5127631544018313587">"இயக்கு / <xliff:g id="LOCATION_MODE">%1$s</xliff:g>"</string>
-    <string name="location_off_summary" msgid="6474350053215707957">"முடக்கு"</string>
+    <string name="location_on_summary" msgid="5127631544018313587">"ஆன் / <xliff:g id="LOCATION_MODE">%1$s</xliff:g>"</string>
+    <string name="location_off_summary" msgid="6474350053215707957">"ஆஃப்"</string>
     <string name="backup_disabled" msgid="485189128759595412">"காப்புப் பிரதி முடக்கப்பட்டுள்ளது"</string>
     <string name="about_summary" msgid="924181828102801010">"Android <xliff:g id="VERSION">%1$s</xliff:g>க்குப் புதுப்பிக்கப்பட்டது"</string>
     <string name="disabled_by_policy_title" msgid="627023216027648534">"செயல் அனுமதிக்கப்படவில்லை"</string>
@@ -3353,9 +3382,9 @@
     <string name="condition_zen_title" msgid="2679168532600816392">"தொந்தரவு செய்யவேண்டாம்: இயக்கத்தில்(<xliff:g id="ID_1">%1$s</xliff:g>)"</string>
     <string name="condition_battery_title" msgid="3272131008388575349">"பேட்டரிசேமிப்பான்: இயக்கத்தில்"</string>
     <string name="condition_battery_summary" msgid="4418839236027977450">"செயல்திறன் குறைக்கப்பட்டது. இருப்பிடச் சேவைகளும் பின்புலத் தரவும் முடக்கப்பட்டுள்ளன."</string>
-    <string name="condition_cellular_title" msgid="1327317003797575735">"மொபைல் தரவு முடக்கப்பட்டுள்ளது"</string>
+    <string name="condition_cellular_title" msgid="1327317003797575735">"மொபைல் டேட்டா முடக்கப்பட்டுள்ளது"</string>
     <string name="condition_cellular_summary" msgid="1818046558419658463">"வைஃபை மூலம் மட்டுமே இணையம் கிடைக்கும்"</string>
-    <string name="condition_bg_data_title" msgid="2483860304802846542">"தரவு சேமிப்பான் இயக்கப்பட்டது"</string>
+    <string name="condition_bg_data_title" msgid="2483860304802846542">"டேட்டா சேமிப்பான் இயக்கப்பட்டது"</string>
     <string name="condition_bg_data_summary" msgid="656957852895282228">"வைஃபை மூலம் மட்டுமே பின்புலத் தரவு செயல்படும். இதனால் வைஃபை கிடைக்காத போது சில பயன்பாடுகள் அல்லது சேவைகள் பாதிக்கப்படலாம்."</string>
     <string name="condition_work_title" msgid="7293722361184366648">"பணி சுயவிவரம் முடக்கப்பட்டது"</string>
     <string name="condition_work_summary" msgid="7543202177571590378">"உங்கள் பணி சுயவிவரத்துடன் தொடர்புடைய பயன்பாடுகள், பின்புல ஒத்திசைவு மற்றும் பிற அம்சங்கள் ஆகியவை முடக்கப்பட்டன."</string>
@@ -3378,21 +3407,24 @@
     <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="connectivity_monitor_switch" msgid="9059759348648583421">"இணைப்புக் கண்காணிப்பான்"</string>
+    <string name="connectivity_monitor_switch_summary" msgid="2828658652378866401">"இணைப்புக் கண்காணிப்பான், இணைப்பில் உள்ள சிக்கலைக் கண்டறிந்தவுடன், பதிவுகளைச் சேகரித்து, பிழையைப் புகாரளிக்கும்படி பயனருக்கு அறிவிக்கும்"</string>
+    <string name="connectivity_monitor_toast" msgid="5551859612881173028">"இணைப்புக் கண்காணிப்பானில் செய்த மாற்றத்தைச் செயல்படுத்த, சாதனத்தை மறுதொடக்கம் செய்யவும்"</string>
     <string name="camera_hal_hdrplus_switch" msgid="8377365197105267466">"கேமரா HAL HDR+"</string>
     <string name="camera_hal_hdrplus_toast" msgid="2063703797270055299">"கேமரா HAL HDR+ இல் செய்த மாற்றத்தைப் பயன்படுத்த, சாதனத்தை மறுதொடக்கம் செய்யவும்"</string>
+    <string name="camera_laser_sensor_switch" msgid="8913588990743234440">"கேமராவின் லேசர் சென்சார்"</string>
     <string name="ota_disable_automatic_update" msgid="2319639631655915050">"தானியங்கு முறைமை புதுப்பிப்புகள்"</string>
     <string name="usage" msgid="2977875522080448986">"பயன்பாடு"</string>
-    <string name="cellular_data_usage" msgid="2155683719898158203">"மொபைல் தரவு உபயோகம்"</string>
-    <string name="wifi_data_usage" msgid="686754111095324306">"வைஃபை தரவுப் பயன்பாடு"</string>
+    <string name="cellular_data_usage" msgid="2155683719898158203">"மொபைல் டேட்டா பயன்பாடு"</string>
+    <string name="wifi_data_usage" msgid="686754111095324306">"வைஃபை டேட்டா பயன்பாடு"</string>
     <string name="ethernet_data_usage" msgid="5108764537574354616">"ஈதர்நெட் தரவுப் பயன்பாடு"</string>
     <string name="wifi" msgid="1081550856200013637">"வைஃபை"</string>
     <string name="ethernet" msgid="6600095783781389720">"ஈதர்நெட்"</string>
-    <string name="cell_data_template" msgid="405684854174361041">"<xliff:g id="AMOUNT">^1</xliff:g> மொபைல் தரவு"</string>
+    <string name="cell_data_template" msgid="405684854174361041">"<xliff:g id="AMOUNT">^1</xliff:g> மொபைல் டேட்டா"</string>
     <string name="wifi_data_template" msgid="6265570748799357386">"<xliff:g id="AMOUNT">^1</xliff:g> வைஃபை தரவு"</string>
     <string name="ethernet_data_template" msgid="5782476509881033590">"<xliff:g id="AMOUNT">^1</xliff:g> ஈதர்நெட் தரவு"</string>
-    <string name="cell_warning_only" msgid="763147658209027140">"<xliff:g id="ID_1">%1$s</xliff:g> தரவு எச்சரிக்கை"</string>
-    <string name="cell_warning_and_limit" msgid="2273413629267437470">"<xliff:g id="ID_1">%1$s</xliff:g> தரவு எச்சரிக்கை / <xliff:g id="ID_2">%2$s</xliff:g> தரவு வரம்பு"</string>
+    <string name="cell_warning_only" msgid="763147658209027140">"<xliff:g id="ID_1">%1$s</xliff:g> டேட்டா பயன்பாட்டு எச்சரிக்கை"</string>
+    <string name="cell_warning_and_limit" msgid="2273413629267437470">"<xliff:g id="ID_1">%1$s</xliff:g> டேட்டா பயன்பாட்டு எச்சரிக்கை / <xliff:g id="ID_2">%2$s</xliff:g> டேட்டா வரம்பு"</string>
     <string name="billing_cycle" msgid="5169909190811133499">"பில்லிங் சுழற்சி"</string>
     <string name="billing_cycle_fragment_summary" msgid="8231066353654583106">"மாதந்தோறும், <xliff:g id="ID_1">%1$s</xliff:g>வது நாள்"</string>
     <string name="network_restrictions" msgid="8234695294536675380">"நெட்வொர்க் கட்டுப்பாடுகள்"</string>
@@ -3400,27 +3432,27 @@
       <item quantity="other"><xliff:g id="COUNT">%1$d</xliff:g> கட்டுப்பாடுகள்</item>
       <item quantity="one">1 கட்டுப்பாடு</item>
     </plurals>
-    <string name="operator_warning" msgid="1862988028996859195">"மொபைல் நிறுவனத்தின் தரவு கணக்கிடலானது சாதனத்தின் கணக்கிடலிலிருந்து வேறுபடலாம்"</string>
+    <string name="operator_warning" msgid="1862988028996859195">"மொபைல் நிறுவனம் கணக்கிடும் டேட்டா அளவும், சாதனம் கணக்கிடும் டேட்டா அளவும் மாறுபடலாம்"</string>
     <string name="data_used_template" msgid="3245919669966296505">"<xliff:g id="ID_1">%1$s</xliff:g> பயன்படுத்தப்பட்டது"</string>
-    <string name="set_data_warning" msgid="6115364758236594593">"தரவு எச்சரிக்கையை அமை"</string>
-    <string name="data_warning" msgid="209133958008062117">"தரவு எச்சரிக்கை"</string>
-    <string name="set_data_limit" msgid="2901526323210516923">"தரவு வரம்பை அமை"</string>
-    <string name="data_limit" msgid="1885406964934590552">"தரவு வரம்பு"</string>
-    <string name="data_usage_template" msgid="392191945602400904">"<xliff:g id="ID_1">%1$s</xliff:g> பயன்படுத்தப்பட்டது: <xliff:g id="ID_2">%2$s</xliff:g>"</string>
+    <string name="set_data_warning" msgid="6115364758236594593">"டேட்டா பயன்பாட்டு எச்சரிக்கையை அமை"</string>
+    <string name="data_warning" msgid="209133958008062117">"டேட்டா பயன்பாட்டு எச்சரிக்கை"</string>
+    <string name="set_data_limit" msgid="2901526323210516923">"டேட்டா வரம்பை அமை"</string>
+    <string name="data_limit" msgid="1885406964934590552">"டேட்டா வரம்பு"</string>
+    <string name="data_usage_template" msgid="2923744765873163859">"<xliff:g id="ID_1">%1$s</xliff:g> பயன்படுத்தியது: <xliff:g id="ID_2">%2$s</xliff:g>"</string>
     <string name="configure" msgid="1029654422228677273">"உள்ளமை"</string>
     <string name="data_usage_other_apps" msgid="3272872663517382050">"தரவு உபயோகத்தில் உள்ளடங்கும் பிற பயன்பாடுகள்"</string>
     <plurals name="data_saver_unrestricted_summary" formatted="false" msgid="2635267833484232703">
-      <item quantity="other">தரவு சேமிப்பான் இயக்கப்பட்டிருக்கும் போது, வரம்பற்ற தரவைப் பயன்படுத்த <xliff:g id="COUNT">%1$d</xliff:g> பயன்பாடுகள் அனுமதிக்கப்பட்டன</item>
-      <item quantity="one">தரவு சேமிப்பான் இயக்கப்பட்டிருக்கும் போது, வரம்பற்ற தரவைப் பயன்படுத்த 1 பயன்பாடு அனுமதிக்கப்பட்டது</item>
+      <item quantity="other">டேட்டா சேமிப்பான் இயக்கப்பட்டிருக்கும் போது, பயனரின் எல்லா தகவலையும் பயன்படுத்த <xliff:g id="COUNT">%1$d</xliff:g> பயன்பாடுகள் அனுமதிக்கப்பட்டுள்ளன</item>
+      <item quantity="one">டேட்டா சேமிப்பான் இயக்கப்பட்டிருக்கும் போது, பயனரின் எல்லா தகவலையும் பயன்படுத்த 1 பயன்பாடு அனுமதிக்கப்பட்டுள்ளது</item>
     </plurals>
-    <string name="data_saver_title" msgid="398458827917495765">"தரவுச் சேமிப்பான்"</string>
-    <string name="unrestricted_data_saver" msgid="952796077540228711">"வரம்பற்ற தரவு"</string>
+    <string name="data_saver_title" msgid="398458827917495765">"டேட்டா சேமிப்பான்"</string>
+    <string name="unrestricted_data_saver" msgid="952796077540228711">"பயனரின் எல்லா தகவலும்"</string>
     <string name="restrict_background_blacklisted" msgid="3995443391711013068">"பின்புலத் தரவு முடக்கப்பட்டது"</string>
-    <string name="data_saver_on" msgid="6774217590237934709">"இயக்கத்தில்"</string>
-    <string name="data_saver_off" msgid="6892309031162738794">"முடக்கத்தில்"</string>
+    <string name="data_saver_on" msgid="6774217590237934709">"ஆன்"</string>
+    <string name="data_saver_off" msgid="6892309031162738794">"ஆஃப்"</string>
     <string name="unrestricted_app_title" msgid="4465437191723332066">"வரம்பற்ற தரவு பயன்பாடு"</string>
-    <string name="unrestricted_app_summary" msgid="6458008993501723912">"தரவு சேமிப்பான் இயக்கப்பட்டிருக்கும் போது வரம்பற்ற தரவை அணுக அனுமதி"</string>
-    <string name="home_app" msgid="4066188520886810030">"முகப்புப் பயன்பாடு"</string>
+    <string name="unrestricted_app_summary" msgid="6458008993501723912">"டேட்டா சேமிப்பான் இயக்கப்பட்டிருக்கும் போது வரம்பற்ற தரவை அணுக அனுமதி"</string>
+    <string name="home_app" msgid="4066188520886810030">"முகப்பு"</string>
     <string name="no_default_home" msgid="7184117487704520238">"இயல்பு முகப்பு இல்லை"</string>
     <string name="lockpattern_settings_require_cred_before_startup" msgid="3832020101401318248">"பாதுகாப்பான தொடக்கம்"</string>
     <string name="lockpattern_settings_require_pattern_before_startup_summary" msgid="7873036097628404476">"சாதனத்தைத் தொடங்க, வடிவம் தேவை. முடக்கப்பட்டிருக்கும் போது, இந்தச் சாதனம் அழைப்புகள், செய்திகள், அறிவிப்புகள் அல்லது அலாரங்கள் ஆகியவற்றைப் பெற முடியாது."</string>
@@ -3429,7 +3461,7 @@
     <string name="suggestion_additional_fingerprints" msgid="2214281455363797037">"மற்றொரு கைரேகையைச் சேர்க்கவும்"</string>
     <string name="suggestion_additional_fingerprints_summary" msgid="5471253233176471245">"வேறு விரலைப் பயன்படுத்தித் திறக்கவும்"</string>
     <string name="battery_saver_on_summary" msgid="9072203872401530722">"இயக்கத்தில் / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="battery_saver_off_summary" msgid="8309471955051162327">"முடக்கத்தில் / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
+    <string name="battery_saver_off_summary" msgid="8309471955051162327">"ஆஃப் / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="battery_saver_desc_turn_on_auto_never" msgid="6715896635178578813">"ஒருபோதும் தானாக இயக்காதே"</string>
     <string name="battery_saver_desc_turn_on_auto_pct" msgid="7472323223085636533">"%1$s பேட்டரியில் தானாகவே இயக்கு"</string>
     <string name="not_battery_optimizing" msgid="5362861851864837617">"பேட்டரி மேம்படுத்தலைப் பயன்படுத்தவில்லை"</string>
@@ -3466,16 +3498,16 @@
     <string name="notification_log_details_none" msgid="184131801230614059">"எதுவுமில்லை"</string>
     <string name="notification_log_details_ranking_null" msgid="244660392058720919">"மதிப்பீட்டுத் தகவல் இல்லை."</string>
     <string name="notification_log_details_ranking_none" msgid="599607025882587844">"மதிப்பீட்டுத் தகவலில் இந்த விசை இல்லை."</string>
-    <string name="special_access" msgid="3458780842491881155">"சிறப்புப் பயன்பாட்டு அணுகல்"</string>
+    <string name="special_access" msgid="3458780842491881155">"பயன்பாட்டின் சிறப்பு அணுகல்"</string>
     <plurals name="special_access_summary" formatted="false" msgid="260765309935675867">
-      <item quantity="other"><xliff:g id="COUNT">%d</xliff:g> பயன்பாடுகளால் வரம்பற்ற தரவைப் பயன்படுத்த முடியும்</item>
-      <item quantity="one">1 பயன்பாட்டால் வரம்பற்ற தரவைப் பயன்படுத்த முடியும்</item>
+      <item quantity="other"><xliff:g id="COUNT">%d</xliff:g> பயன்பாடுகளால் எல்லா தகவலையும் பயன்படுத்த முடியும்</item>
+      <item quantity="one">1 பயன்பாட்டால் எல்லா தகவலையும் பயன்படுத்த முடியும்</item>
     </plurals>
     <string name="confirm_convert_to_fbe_warning" msgid="1487005506049137659">"பயனர் தரவை அழித்து, கோப்பு முறைமையாக்கத்திற்கு மாற்ற வேண்டுமா?"</string>
     <string name="button_confirm_convert_fbe" msgid="7101855374850373091">"அழித்து, மாற்று"</string>
     <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="387052719462473500">"பூட்டுத் திரையில் தகவலைக் கட்டுப்படுத்தவும்"</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="8483187649355540109">"ஆதரவு &amp; டிப்ஸ்"</string>
@@ -3483,7 +3515,7 @@
     <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>
+    <string name="bluetooth_disabled" msgid="6244000672828617410">"முடக்கப்பட்டுள்ளது"</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>
@@ -3547,7 +3579,7 @@
     <string name="gesture_preference_summary" product="default" msgid="8627850388011956901">"உங்கள் மொபைலைக் கட்டுப்படுத்துவதற்கான உடனடி சைகைகள்"</string>
     <string name="gesture_preference_summary" product="tablet" msgid="4717535378272065510">"டேப்லெட்டைக் கட்டுப்படுத்துவதற்கான உடனடி சைகைகள்"</string>
     <string name="gesture_preference_summary" product="device" msgid="4205941452664950852">"சாதனத்தைக் கட்டுப்படுத்துவதற்கான உடனடி சைகைகள்"</string>
-    <string name="double_tap_power_for_camera_title" msgid="64716226816032800">"கேமராவிற்கு மாறவும்"</string>
+    <string name="double_tap_power_for_camera_title" msgid="64716226816032800">"கேமராவிற்குச் செல்லுதல்"</string>
     <string name="double_tap_power_for_camera_summary" msgid="242037150983277829">"கேமராவை விரைவாகத் திறக்க, பவர் பொத்தானை இருமுறை அழுத்தவும். எந்தத் திரையிலும் கேமரா இயங்கும்."</string>
     <string name="double_tap_power_for_camera_suggestion_title" msgid="6500405261202883589">"கேமராவை உடனடியாகத் திறக்கவும்"</string>
     <string name="double_tap_power_for_camera_suggestion_summary" msgid="7010153544554016996">"கேமராவைத் திறக்க, பவர் பொத்தானை இருமுறை அழுத்தவும்"</string>
@@ -3569,14 +3601,14 @@
     <string name="ambient_display_pickup_summary" product="tablet" msgid="5435283849947236648">"நேரம், அறிவிப்பு ஐகான்கள் மற்றும் பிற தகவலைப் பார்க்க, டேப்லெட்டைக் கையில் எடுக்கவும்."</string>
     <string name="ambient_display_pickup_summary" product="device" msgid="8256669101643381568">"நேரம், அறிவிப்பு ஐகான்கள் மற்றும் பிற தகவலைப் பார்க்க, சாதனத்தைக் கையில் எடுக்கவும்."</string>
     <string name="ambient_display_pickup_suggestion_summary" msgid="7014700589991761035">"திரை அணைக்கப்பட்டிருக்கும் போது, அறிவிப்புகளைப் பார்க்கலாம்"</string>
-    <string name="fingerprint_swipe_for_notifications_title" msgid="5816346492253270243">"அறிவிப்புகளுக்கு, உணர்வியின் மீது ஸ்வைப் செய்க"</string>
-    <string name="fingerprint_swipe_for_notifications_summary" product="default" msgid="1770661868393713922">"அறிவிப்புகளைப் பார்க்க, மொபைலின் பின்புறத்தில் உள்ள கைரேகை உணர்வியில் கீழே ஸ்வைப் செய்யவும்."</string>
+    <string name="fingerprint_swipe_for_notifications_title" msgid="5816346492253270243">"அறிவிப்புகளைப் பெற சென்சாரில் ஸ்வைப் செய்தல்"</string>
+    <string name="fingerprint_swipe_for_notifications_summary" product="default" msgid="1770661868393713922">"அறிவிப்புகளைப் பார்க்க, மொபைலின் பின்புறத்தில் உள்ள கைரேகை சென்சாரில் கீழ் நோக்கி ஸ்வைப் செய்தல்."</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="tablet" msgid="902719947767712895">"அறிவிப்புகளைப் பார்க்க, டேப்லெட்டின் பின்புறத்தில் உள்ள கைரேகை உணர்வியில் கீழே ஸ்வைப் செய்யவும்."</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="device" msgid="5372926094116306647">"அறிவிப்புகளைப் பார்க்க, சாதனத்தின் பின்புறத்தில் உள்ள கைரேகை உணர்வியில் கீழே ஸ்வைப் செய்யவும்."</string>
     <string name="fingerprint_swipe_for_notifications_suggestion_title" msgid="1677291167470357802">"அறிவிப்புகளை உடனடியாகப் பார்க்கவும்"</string>
     <string name="fingerprint_swipe_for_notifications_suggestion_summary" msgid="127592803294414082">"கைரேகை உணர்வியில் கீழே ஸ்வைப் செய்யவும்"</string>
-    <string name="gesture_setting_on" msgid="3455094265233870280">"இயக்கு"</string>
-    <string name="gesture_setting_off" msgid="5230169535435881894">"முடக்கு"</string>
+    <string name="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>
@@ -3585,15 +3617,15 @@
     <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="instant_apps_settings" msgid="8827777916518348213">"இன்ஸ்டண்ட் ஆப்ஸ் விருப்பத்தேர்வுகள்"</string>
     <string name="domain_url_section_title" msgid="7046835219056428883">"நிறுவிய பயன்பாடுகள்"</string>
     <string name="automatic_storage_manager_activation_warning" msgid="6353100011690933254">"உங்கள் சேமிப்பகம் இப்போது சேமிப்பக நிர்வாகியால் நிர்வகிக்கப்படுகிறது"</string>
     <string name="account_for_section_header" msgid="5356566418548737121">"<xliff:g id="USER_NAME">%1$s</xliff:g> இன் கணக்குகள்"</string>
     <string name="configure_section_header" msgid="7391183586410814450">"உள்ளமைக்கவும்"</string>
-    <string name="auto_sync_account_title" msgid="898796354710116383">"தரவைத் தானாக ஒத்திசை"</string>
-    <string name="auto_sync_personal_account_title" msgid="8496263182646100610">"தனிப்பட்ட தரவைத் தானாக ஒத்திசை"</string>
-    <string name="auto_sync_work_account_title" msgid="4489172450037434152">"பணித் தரவைத் தானாக ஒத்திசை"</string>
-    <string name="auto_sync_account_summary" msgid="692499211629185107">"பயன்பாடுகள் தானாகவே தரவைப் புதுப்பிக்க அனுமதி"</string>
+    <string name="auto_sync_account_title" msgid="898796354710116383">"டேட்டாவைத் தானாக ஒத்திசை"</string>
+    <string name="auto_sync_personal_account_title" msgid="8496263182646100610">"தனிப்பட்ட டேட்டாவைத் தானாக ஒத்திசை"</string>
+    <string name="auto_sync_work_account_title" msgid="4489172450037434152">"பணி டேட்டாவைத் தானாக ஒத்திசை"</string>
+    <string name="auto_sync_account_summary" msgid="692499211629185107">"பயன்பாடுகள் தானாகவே டேட்டாவைப் புதுப்பிக்க அனுமதி"</string>
     <string name="account_sync_title" msgid="7214747784136106491">"கணக்கு ஒத்திசைவு"</string>
     <string name="account_sync_summary_some_on" msgid="3375930757891381175">"<xliff:g id="ID_2">%2$d</xliff:g> இல் <xliff:g id="ID_1">%1$d</xliff:g>க்கு ஒத்திசைவை முடக்கு"</string>
     <string name="account_sync_summary_all_on" msgid="570431636622254156">"எல்லாவற்றுக்கும் ஒத்திசைவை இயக்கு"</string>
@@ -3632,7 +3664,9 @@
     <string name="enterprise_privacy_always_on_vpn_personal" msgid="9217774730260037434">"\"VPNஐ எப்போதும் இயக்கத்தில் வை\" என்பது உங்கள் தனிப்பட்ட சுயவிவரத்தில் இயக்கப்பட்டுள்ளது"</string>
     <string name="enterprise_privacy_always_on_vpn_work" msgid="7244472958208315814">"\"VPNஐ எப்போதும் இயக்கத்தில் வை\" என்பது உங்கள் பணி விவரத்தில் இயக்கப்பட்டுள்ளது"</string>
     <string name="enterprise_privacy_global_http_proxy" msgid="7936664553416257333">"குளோபல் HTTP ப்ராக்ஸி அமைக்கப்பட்டுள்ளது"</string>
-    <string name="enterprise_privacy_ca_certs" msgid="5885892204903688909">"நம்பகமான அனுமதிச் சான்றுகள்"</string>
+    <string name="enterprise_privacy_ca_certs_device" msgid="2019652712782510262">"நம்பகமான அனுமதிச் சான்றுகள்"</string>
+    <string name="enterprise_privacy_ca_certs_personal" msgid="2279084820904076599">"உங்கள் தனிப்பட்ட சுயவிவரத்தில் நம்பகமான அனுமதிச் சான்றுகள்"</string>
+    <string name="enterprise_privacy_ca_certs_work" msgid="6187377647815301809">"உங்கள் பணி விவரத்தில் நம்பகமான அனுமதிச் சான்றுகள்"</string>
     <plurals name="enterprise_privacy_number_ca_certs" formatted="false" msgid="526375234629534165">
       <item quantity="other">குறைந்தபட்சம் <xliff:g id="COUNT_1">%d</xliff:g> CA சான்றிதழ்கள்</item>
       <item quantity="one">குறைந்தபட்சம் <xliff:g id="COUNT_0">%d</xliff:g> CA சான்றிதழ்</item>
@@ -3668,16 +3702,16 @@
     <string name="app_names_concatenation_template_3" msgid="8949045544491604376">"<xliff:g id="FIRST_APP_NAME">%1$s</xliff:g>, <xliff:g id="SECOND_APP_NAME">%2$s</xliff:g>, <xliff:g id="THIRD_APP_NAME">%3$s</xliff:g>"</string>
     <string name="storage_photos_videos" msgid="319854636702241898">"படங்களும் வீடியோக்களும்"</string>
     <string name="storage_music_audio" msgid="789779084825206838">"இசையும் ஆடியோவும்"</string>
-    <string name="storage_games" msgid="7703159201697117621">"கேம்கள்"</string>
-    <string name="storage_other_apps" msgid="5524321740031718083">"பிற பயன்பாடுகள்"</string>
-    <string name="storage_files" msgid="8581083146777364063">"கோப்புகள்"</string>
+    <string name="storage_games" msgid="7703159201697117621">"கேம்ஸ்"</string>
+    <string name="storage_other_apps" msgid="5524321740031718083">"பிற ஆப்ஸ்"</string>
+    <string name="storage_files" msgid="8581083146777364063">"ஃபைல்கள்"</string>
     <string name="storage_size_large_alternate" msgid="3550744227788333060">"<xliff:g id="NUMBER">^1</xliff:g>"<small>" <xliff:g id="UNIT">^2</xliff:g>"</small>""</string>
     <string name="storage_volume_total" msgid="3499221850532701342">"<xliff:g id="TOTAL">%1$s</xliff:g> இல் பயன்படுத்தியது:"</string>
-    <string name="storage_percent_full" msgid="6095012055875077036">"உபயோகம்"</string>
+    <string name="storage_percent_full" msgid="6095012055875077036">"பயன்பாடு"</string>
     <string name="clear_instant_app_data" msgid="2004222610585890909">"பயன்பாட்டை அழி"</string>
     <string name="clear_instant_app_confirmation" msgid="7451671214898856857">"இந்த இன்ஸ்டண்ட் பயன்பாட்டை அகற்றவா?"</string>
-    <string name="game_storage_settings" msgid="3410689937046696557">"கேம்கள்"</string>
-    <string name="audio_files_title" msgid="4777048870657911307">"ஆடியோ கோப்புகள்"</string>
+    <string name="game_storage_settings" msgid="3410689937046696557">"கேம்ஸ்"</string>
+    <string name="audio_files_title" msgid="4777048870657911307">"ஆடியோ ஃபைல்கள்"</string>
     <string name="app_info_storage_title" msgid="5554719444625611987">"பயன்படுத்திய இட அளவு"</string>
     <string name="webview_uninstalled_for_user" msgid="1819903169194420983">"(<xliff:g id="USER">%s</xliff:g>க்கு நிறுவல்நீக்கப்பட்டது)"</string>
     <string name="webview_disabled_for_user" msgid="1216426047631256825">"(<xliff:g id="USER">%s</xliff:g>க்கு முடக்கப்பட்டது)"</string>
@@ -3691,10 +3725,12 @@
     <string name="storage_manager_indicator_on" msgid="8625551710194584733">"ஆன்"</string>
     <string name="install_type_instant" msgid="3174425974536078647">"இன்ஸ்டண்ட் பயன்பாடு"</string>
     <string name="automatic_storage_manager_deactivation_warning" msgid="5605210730828410482">"சேமிப்பக நிர்வாகியை முடக்கவா?"</string>
-    <string name="storage_movies_tv" msgid="5498394447562086890">"திரைப்படம் &amp; டிவி பயன்பாடுகள்"</string>
+    <string name="storage_movies_tv" msgid="5498394447562086890">"மூவி &amp; டிவி ஆப்ஸ்"</string>
     <string name="carrier_provisioning" msgid="4398683675591893169">"Carrier Provisioning Info"</string>
     <string name="trigger_carrier_provisioning" msgid="3434865918009286187">"Trigger Carrier Provisioning"</string>
     <string name="new_device_suggestion_title" msgid="698847081680980774">"புதியதாகவும் உற்சாகமூட்டும் விதமாகவும் என்ன உள்ளது?"</string>
-    <string name="new_device_suggestion_summary" msgid="7172709269203435870">"சிறந்த 5 அம்சங்களைப் பார்க்கவும்"</string>
+    <string name="new_device_suggestion_summary" product="default" msgid="206396571522515855">"உங்கள் புதிய மொபைலைப் பற்றி அறிக"</string>
+    <string name="new_device_suggestion_summary" product="tablet" msgid="393751455688210956">"உங்கள் புதிய டேப்லெட்டைப் பற்றி அறிக"</string>
+    <string name="new_device_suggestion_summary" product="device" msgid="2939870049868336652">"உங்கள் புதிய சாதனத்தைப் பற்றி அறிக"</string>
     <string name="disabled_low_ram_device" msgid="3751578499721173344">"இந்தச் சாதனத்தில் இந்த அம்சம் இல்லை"</string>
 </resources>
diff --git a/res/values-te/arrays.xml b/res/values-te/arrays.xml
index d0c965a..4e33f6b 100644
--- a/res/values-te/arrays.xml
+++ b/res/values-te/arrays.xml
@@ -100,8 +100,6 @@
     <!-- no translation found for wifi_security_no_eap:0 (2084555984818107151) -->
     <!-- no translation found for wifi_security_no_eap:1 (397579322683471524) -->
     <!-- no translation found for wifi_security_no_eap:2 (1968820975358150484) -->
-    <!-- no translation found for wifi_ap_security:0 (5251664683198623324) -->
-    <!-- no translation found for wifi_ap_security:1 (7989073072260294673) -->
   <string-array name="wifi_eap_method">
     <item msgid="1160193392455075561">"PEAP"</item>
     <item msgid="7981731051382306293">"TLS"</item>
@@ -122,8 +120,8 @@
     <!-- no translation found for wifi_ap_band_config_2G_only:0 (7006771583217001015) -->
   <string-array name="wifi_p2p_wps_setup">
     <item msgid="5085064298144493867">"పుష్ బటన్"</item>
-    <item msgid="1624323946324499595">"పీర్ పరికరం నుండి పిన్‌"</item>
-    <item msgid="5366790421523328066">"ఈ పరికరం నుండి పిన్‌"</item>
+    <item msgid="1624323946324499595">"పీర్ డివైజ్ నుండి పిన్‌"</item>
+    <item msgid="5366790421523328066">"ఈ డివైజ్ నుండి పిన్‌"</item>
   </string-array>
   <string-array name="wifi_p2p_status">
     <item msgid="1701505390737218306">"కనెక్ట్ చేయబడింది"</item>
@@ -152,7 +150,7 @@
   <string-array name="usage_stats_display_order_types">
     <item msgid="2100172576767439288">"వినియోగ సమయం"</item>
     <item msgid="4796160515314745154">"చివరిగా ఉపయోగించినది"</item>
-    <item msgid="2502754479975776899">"అనువర్తనం పేరు"</item>
+    <item msgid="2502754479975776899">"యాప్ పేరు"</item>
   </string-array>
   <string-array name="wifi_eap_entries">
     <item msgid="8615575908717909498">"PEAP"</item>
@@ -262,7 +260,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>
@@ -301,7 +299,7 @@
     <item msgid="6628873315024166197">"స్క్రీన్‌ను ఆన్ చేయడం"</item>
     <item msgid="3253368931113490863">"ఖాతాలను పొందడం"</item>
     <item msgid="780392378084812901">"నేపథ్యంలో అమలు చేయడం"</item>
-    <item msgid="2629748510881309577">"ప్రాప్యత వాల్యూమ్"</item>
+    <item msgid="2629748510881309577">"యాక్సెస్ సామర్థ్య వాల్యూమ్"</item>
   </string-array>
   <string-array name="app_ops_labels">
     <item msgid="6602854600289714121">"స్థానం"</item>
@@ -329,7 +327,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>
@@ -368,7 +366,7 @@
     <item msgid="5832543806893763620">"స్క్రీన్‌ను ఆన్ చేయడం"</item>
     <item msgid="5258373962467495905">"ఖాతాలను పొందడం"</item>
     <item msgid="334625385979270703">"నేపథ్యంలో అమలు చేయడం"</item>
-    <item msgid="9039213578110332702">"ప్రాప్యత వాల్యూమ్"</item>
+    <item msgid="9039213578110332702">"యాక్సెస్ సామర్థ్య వాల్యూమ్"</item>
   </string-array>
   <string-array name="long_press_timeout_selector_titles">
     <item msgid="3511504869290423954">"తక్కువ సేపు"</item>
@@ -451,7 +449,7 @@
   </string-array>
   <string-array name="proc_stats_process_states">
     <item msgid="5069825997142785829">"స్థిరం"</item>
-    <item msgid="5779398140277006695">"అధిక కార్యాచరణ"</item>
+    <item msgid="5779398140277006695">"ప్రముఖ కార్యకలాపం"</item>
     <item msgid="1439598363694578255">"ముఖ్యం (ముందుభాగం)"</item>
     <item msgid="3396458970745718652">"ముఖ్యం (నేపథ్యం)"</item>
     <item msgid="5214825238247511992">"బ్యాకప్"</item>
@@ -460,9 +458,9 @@
     <item msgid="918687422516982498">"సేవ (పునఃప్రారంభమవుతోంది)"</item>
     <item msgid="6807727069641853029">"రిసీవర్"</item>
     <item msgid="6782857406100845127">"హోమ్"</item>
-    <item msgid="2860945127596974299">"చివరి కార్యాచరణ"</item>
-    <item msgid="8610560843693675830">"కాష్ చేసినవి (కార్యాచరణ)"</item>
-    <item msgid="4338089220026248848">"కాష్ చేసినవి (కార్యాచరణ క్లయింట్)"</item>
+    <item msgid="2860945127596974299">"చివరి కార్యకలాపం"</item>
+    <item msgid="8610560843693675830">"కాష్ చేసినవి (కార్యకలాపం)"</item>
+    <item msgid="4338089220026248848">"కాష్ చేసినవి (కార్యకలాపం క్లయింట్)"</item>
     <item msgid="6652164677254579050">"కాష్ చేసినవి (ఖాళీ)"</item>
   </string-array>
   <string-array name="color_picker">
diff --git a/res/values-te/strings.xml b/res/values-te/strings.xml
index 09c24f6..53a16ff 100644
--- a/res/values-te/strings.xml
+++ b/res/values-te/strings.xml
@@ -35,7 +35,7 @@
     <string name="header_category_connections" msgid="6471513040815680662">"కనెక్షన్‌లు"</string>
     <string name="header_category_device" msgid="4544026001618307754">"పరికరం"</string>
     <string name="header_category_personal" msgid="3310195187905720823">"వ్యక్తిగతం"</string>
-    <string name="header_category_access" msgid="7580499097416970962">"ప్రాప్యత"</string>
+    <string name="header_category_access" msgid="7580499097416970962">"యాక్సెస్"</string>
     <string name="header_category_system" msgid="2816866961183068977">"సిస్టమ్"</string>
     <string name="radio_info_data_connection_enable" msgid="8656750679353982712">"డేటా కనెక్షన్‌ను ప్రారంభించండి"</string>
     <string name="radio_info_data_connection_disable" msgid="8541302390883231216">"డేటా కనెక్షన్‌ను నిలిపివేయండి"</string>
@@ -134,39 +134,39 @@
     <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>
     <string name="bluetooth_connection_permission_request" msgid="4747918249032890077">"బ్లూటూత్ కనెక్షన్ అభ్యర్థన"</string>
     <string name="bluetooth_connection_notif_message" msgid="3603316575471431846">"\"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>\"కి కనెక్ట్ చేయడానికి నొక్కండి."</string>
     <string name="bluetooth_connection_dialog_text" msgid="8455427559949998023">"మీరు \"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>\"కు కనెక్ట్ చేయాలనుకుంటున్నారా?"</string>
-    <string name="bluetooth_phonebook_request" msgid="3951420080540915279">"ఫోన్ పుస్తకం ప్రాప్యత అభ్యర్థన"</string>
-    <string name="bluetooth_pb_acceptance_dialog_text" msgid="8930347091018455505">"<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g> మీ పరిచయాలు మరియు కాల్ చరిత్రకు ప్రాప్యత కోరుతోంది. <xliff:g id="DEVICE_NAME_1">%2$s</xliff:g>కి ప్రాప్యత ఇవ్వాలా?"</string>
+    <string name="bluetooth_phonebook_request" msgid="3951420080540915279">"ఫోన్ పుస్తకం యాక్సెస్ అభ్యర్థన"</string>
+    <string name="bluetooth_pb_acceptance_dialog_text" msgid="8930347091018455505">"<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g> మీ పరిచయాలు మరియు కాల్ చరిత్రకు యాక్సెస్ కోరుతోంది. <xliff:g id="DEVICE_NAME_1">%2$s</xliff:g>కి యాక్సెస్ ఇవ్వాలా?"</string>
     <string name="bluetooth_remember_choice" msgid="6919682671787049800">"మళ్లీ అడగవద్దు"</string>
     <string name="bluetooth_pb_remember_choice" msgid="3622898084442402071">"మళ్లీ అడగవద్దు"</string>
-    <string name="bluetooth_map_request" msgid="4595727689513143902">"సందేశ ప్రాప్యత అభ్యర్థన"</string>
-    <string name="bluetooth_map_acceptance_dialog_text" msgid="8712508202081143737">"%1$s మీ సందేశాలను ప్రాప్యత చేయాలనుకుంటోంది. %2$sకు ప్రాప్యత అందించాలా?"</string>
-    <string name="bluetooth_sap_request" msgid="2669762224045354417">"SIM ప్రాప్యత అభ్యర్థన"</string>
-    <string name="bluetooth_sap_acceptance_dialog_text" msgid="4414253873553608690">"<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g> మీ SIM కార్డ్‌ను ప్రాప్యత చేయాలనుకుంటోంది. SIM కార్డ్‌కి ప్రాప్యత మంజూరు చేయడం వలన మీ పరికరంలో కనెక్షన్ కాలంలో డేటా కనెక్టివిటీ నిలిపివేయబడుతుంది. <xliff:g id="DEVICE_NAME_1">%2$s?</xliff:g>కి ప్రాప్యత మంజూరు చేయండి"</string>
-    <string name="bluetooth_device_name_summary" msgid="4757990010751789977">"ఇతర పరికరాలకు \'<xliff:g id="DEVICE_NAME">^1</xliff:g>\' వలె కనిపిస్తుంది"</string>
+    <string name="bluetooth_map_request" msgid="4595727689513143902">"సందేశ యాక్సెస్ అభ్యర్థన"</string>
+    <string name="bluetooth_map_acceptance_dialog_text" msgid="8712508202081143737">"%1$s మీ సందేశాలను యాక్సెస్ చేయాలనుకుంటోంది. %2$sకు యాక్సెస్ అందించాలా?"</string>
+    <string name="bluetooth_sap_request" msgid="2669762224045354417">"SIM యాక్సెస్ అభ్యర్థన"</string>
+    <string name="bluetooth_sap_acceptance_dialog_text" msgid="4414253873553608690">"<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g> మీ SIM కార్డ్‌ను యాక్సెస్ చేయాలనుకుంటోంది. SIM కార్డ్‌కి యాక్సెస్ మంజూరు చేయడం వలన మీ పరికరంలో కనెక్షన్ కాలంలో డేటా కనెక్టివిటీ నిలిపివేయబడుతుంది. <xliff:g id="DEVICE_NAME_1">%2$s?</xliff:g>కి యాక్సెస్ మంజూరు చేయండి"</string>
+    <string name="bluetooth_device_name_summary" msgid="522235742194965734">"ఇతర పరికరాలకు “<xliff:g id="DEVICE_NAME">^1</xliff:g>” వలె కనిపిస్తుంది"</string>
     <string name="bluetooth_paired_device_title" msgid="8638994696317952019">"మీ పరికరాలు"</string>
     <string name="bluetooth_pairing_page_title" msgid="7712127387361962608">"కొత్త పరికరాన్ని జత చేయండి"</string>
     <string name="date_and_time" msgid="9062980487860757694">"తేదీ &amp; సమయం"</string>
@@ -248,7 +248,7 @@
     <string name="sdcard_settings_read_only_status" product="nosdcard" msgid="3624143937437417788">"USB నిల్వ చదవడానికి-మాత్రమే మౌంట్ చేయబడింది."</string>
     <string name="sdcard_settings_read_only_status" product="default" msgid="4518291824764698112">"SD కార్డు చదవడానికి-మాత్రమే మౌంట్ చేయబడింది."</string>
     <string name="skip_label" msgid="47510779345218297">"దాటవేయి"</string>
-    <string name="next_label" msgid="4693520878012668114">"తదుపరి"</string>
+    <string name="next_label" msgid="4693520878012668114">"తర్వాత"</string>
     <string name="language_picker_title" msgid="3596315202551687690">"భాషలు"</string>
     <string name="pref_title_lang_selection" msgid="2014920136978776034">"భాషా ప్రాధాన్యతలు"</string>
     <string name="locale_remove_menu" msgid="7651301406723638854">"తీసివేయి"</string>
@@ -281,9 +281,9 @@
     <string name="done" msgid="6942539184162713160">"పూర్తయింది"</string>
     <string name="settings_label" msgid="1626402585530130914">"సెట్టింగ్‌లు"</string>
     <string name="settings_label_launcher" msgid="8344735489639482340">"సెట్టింగ్‌లు"</string>
-    <string name="settings_shortcut" msgid="3936651951364030415">"సెట్టింగ్‌ల సత్వరమార్గం"</string>
+    <string name="settings_shortcut" msgid="3936651951364030415">"సెట్టింగ్‌ల షార్ట్‌కట్"</string>
     <string name="activity_list_empty" msgid="6428823323471264836">"సరిపోలే కార్యాచరణలు కనుగొనబడలేదు."</string>
-    <string name="airplane_mode" msgid="8837269988154128601">"ఎయిర్‌ప్లైన్ మోడ్"</string>
+    <string name="airplane_mode" msgid="8837269988154128601">"ఎయిర్‌ప్లేన్ మోడ్"</string>
     <string name="radio_controls_title" msgid="3447085191369779032">"మరిన్ని"</string>
     <string name="wireless_networks_settings_title" msgid="3643009077742794212">"వైర్‌లెస్ &amp; నెట్‌వర్క్‌లు"</string>
     <string name="radio_controls_summary" msgid="1838624369870907268">"Wi‑Fi, బ్లూటూత్, ఎయిర్‌ప్లేన్ మోడ్, మొబైల్ నెట్‌వర్క్‌లు &amp; VPNలను నిర్వహించు"</string>
@@ -312,6 +312,8 @@
     <string name="zone_auto" msgid="334783869352026648">"స్వయంచాలక సమయ మండలి"</string>
     <string name="zone_auto_summaryOn" msgid="6142830927278458314">"నెట్‌వర్క్ అందించిన సమయ మండలిని ఉపయోగించు"</string>
     <string name="zone_auto_summaryOff" msgid="2597745783162041390">"నెట్‌వర్క్ అందించిన సమయ మండలిని ఉపయోగించు"</string>
+    <string name="date_time_24hour_auto" msgid="2117383168985653422">"స్వయంచాలక 24-గంటల ఆకృతి"</string>
+    <string name="date_time_24hour_auto_summary" msgid="6351812925651480277">"లొకేల్ డిఫాల్ట్‌ని ఉపయోగించు"</string>
     <string name="date_time_24hour_title" msgid="3203537578602803850">"24‑గంటల ఆకృతి"</string>
     <string name="date_time_24hour" msgid="1193032284921000063">"24-గంటల ఆకృతిని ఉపయోగించు"</string>
     <string name="date_time_set_time_title" msgid="6296795651349047016">"సమయం"</string>
@@ -325,8 +327,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>
@@ -341,9 +343,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>
-    <!-- no translation found for security_settings_title (4918904614964215087) -->
-    <skip />
-    <string name="encryption_and_credential_settings_title" msgid="6514904533438791561">"గుప్తీకరణ &amp; ఆధారాలు"</string>
+    <string name="security_settings_title" msgid="4918904614964215087">"భద్రత &amp; స్థానం"</string>
+    <string name="encryption_and_credential_settings_title" msgid="6514904533438791561">"ఎన్‌క్రిప్షన్ &amp; ఆధారాలు"</string>
     <string name="encryption_and_credential_settings_summary" product="default" msgid="8721883002237981248">"ఫోన్ గుప్తీకరించబడింది"</string>
     <string name="encryption_and_credential_settings_summary" product="tablet" msgid="7200428573872395685">"డివైజ్ గుప్తీకరించబడింది"</string>
     <string name="lockscreen_settings_title" msgid="3922976395527087455">"లాక్ స్క్రీన్ ప్రాధాన్యతలు"</string>
@@ -366,13 +367,16 @@
     <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="1550756694054944874">"మీ ఫోన్‌ని అన్‌లాక్ చేయడం లేదా కొనుగోళ్లను ఆమోదించడం కోసం మీ వేలిముద్రను ఉపయోగించండి.\n\nగమనించండి: మీరు మీ వేలిముద్రను ఉపయోగించి ఈ పరికరాన్ని అన్‌లాక్ చేయలేరు. మరింత సమాచారం కావాలంటే మీ నిర్వాహకులను సంప్రదించండి."</string>
+    <string name="security_settings_fingerprint_enroll_introduction_message" msgid="3508870672887336095">"మీ ఫోన్‌ను అన్‌లాక్ చేయడానికి, కొనుగోళ్లను ప్రామాణీకరించడానికి లేదా యాప్‌లకు సైన్ ఇన్ చేయడానికి వేలిముద్ర సెన్సార్‌ను తాకండి. మీరు ఎవరి వేలిముద్రలు జోడిస్తున్నారనే విషయంలో జాగ్రత్త వహించండి. వేలిముద్ర జోడించబడిన ఎవరైనా వీటిని చేయగలరు.\n\nగమనిక: మీ వేలిముద్ర శక్తివంతమైన ఆకృతి లేదా పిన్ కంటే తక్కువ సురక్షితం కావచ్చు."</string>
+    <string name="security_settings_fingerprint_enroll_introduction_message_unlock_disabled" msgid="1550756694054944874">"మీ ఫోన్‌ని అన్‌లాక్ చేయడం లేదా కొనుగోళ్లను ఆమోదించడం కోసం మీ వేలిముద్రను ఉపయోగించండి.\n\nగమనించండి: మీరు మీ వేలిముద్రను ఉపయోగించి ఈ డివైజ్‌ను అన్‌లాక్ చేయలేరు. మరింత సమాచారం కావాలంటే మీ నిర్వాహకులను సంప్రదించండి."</string>
     <string name="security_settings_fingerprint_enroll_introduction_message_setup" msgid="6817326798834882531">"మీ ఫోన్‌ని అన్‌లాక్ చేయడం లేదా కొనుగోళ్లను ఆమోదించడం కోసం మీ వేలిముద్రను ఉపయోగించండి.\n\nగమనిక: నమూనా లేదా పిన్ కంటే మీ వేలిముద్ర తక్కువ సురక్షితం కావచ్చు."</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel" msgid="3199351118385606526">"రద్దు చేయి"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue" msgid="7472492858148162530">"కొనసాగించు"</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel_setup" msgid="5021369420474432665">"దాటవేయి"</string>
-    <string name="security_settings_fingerprint_enroll_introduction_continue_setup" msgid="1961957425135180242">"తదుపరి"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_continue_setup" msgid="1961957425135180242">"తర్వాత"</string>
+    <string name="setup_fingerprint_enroll_skip_title" msgid="362050541117362034">"వేలిముద్రను దాటవేయాలా?"</string>
+    <string name="setup_fingerprint_enroll_skip_after_adding_lock_text" msgid="958990414356204763">"కేవలం నిమిషం లేదా రెండు నిమిషాల్లో వేలిముద్రను సెటప్ చేయవచ్చు. మీరు దీనిని దాటవేస్తే, మీరు తర్వాత సెట్టింగ్‌లలో మీ వేలిముద్రను జోడించవచ్చు."</string>
+    <string name="lock_screen_intro_skip_title" msgid="4988210105913705679">"స్క్రీన్ లాక్‌ని దాటవేయాలా?"</string>
     <string name="lock_screen_intro_skip_dialog_text_frp" product="tablet" msgid="1581834104051243425">"పరికర రక్షణ ఫీచర్‌లు ఆన్ చేయబడవు. ఈ టాబ్లెట్ పోయినా, దొంగిలించబడినా లేదా రీసెట్ చేయబడినా, దీనిని ఉపయోగించకుండా మీరు ఇతరులను నివారించలేరు."</string>
     <string name="lock_screen_intro_skip_dialog_text_frp" product="device" msgid="4629503416877189572">"పరికర రక్షణ ఫీచర్‌లు ఆన్ చేయబడవు. ఈ పరికరం పోయినా, దొంగిలించబడినా లేదా రీసెట్ చేయబడినా, దీనిని ఉపయోగించకుండా మీరు ఇతరులను నివారించలేరు."</string>
     <string name="lock_screen_intro_skip_dialog_text_frp" product="default" msgid="2423428240245737909">"పరికర రక్షణ ఫీచర్‌లు ఆన్ చేయబడవు. ఈ ఫోన్ పోయినా, దొంగిలించబడినా లేదా రీసెట్ చేయబడినా, దీనిని ఉపయోగించకుండా మీరు ఇతరులను నివారించలేరు."</string>
@@ -404,9 +408,9 @@
     <string name="security_settings_fingerprint_enroll_error_timeout_dialog_message" msgid="2942551158278899627">"వేలిముద్ర నమోదు సమయ పరిమితి చేరుకుంది. మళ్లీ ప్రయత్నించండి."</string>
     <string name="security_settings_fingerprint_enroll_error_generic_dialog_message" msgid="3624760637222239293">"వేలిముద్ర నమోదు పని చేయలేదు. మళ్లీ ప్రయత్నించండి లేదా మరొక వేలిని ఉపయోగించండి."</string>
     <string name="fingerprint_enroll_button_add" msgid="6317978977419045463">"మరొకటి జోడించు"</string>
-    <string name="fingerprint_enroll_button_next" msgid="6247009337616342759">"తదుపరి"</string>
-    <string name="security_settings_fingerprint_enroll_disclaimer" msgid="2624905914239271751">"మీ ఫోన్‌ను అన్‌లాక్ చేయడంతో పాటుగా, కొనుగోళ్లు మరియు అనువర్తనం ప్రాప్యతను అనుమతించడానికి కూడా మీ వేలిముద్రను ఉపయోగించవచ్చు. "<annotation id="url">"మరింత తెలుసుకోండి"</annotation></string>
-    <string name="security_settings_fingerprint_enroll_disclaimer_lockscreen_disabled" msgid="7846871823167357942">" స్క్రీన్ లాక్ ఎంపిక నిలిపివేయబడింది. మరింత తెలుసుకోవాలంటే, మీ సంస్థ యొక్క నిర్వాహకులను సంప్రదించండి. "<annotation id="admin_details">"మరిన్ని వివరాలు"</annotation>\n\n"ఇప్పటికీ మీరు మీ వేలిముద్రను ఉపయోగించి కొనుగోళ్లను ప్రమాణీకరించవచ్చు మరియు అనువర్తనాన్ని ప్రాప్యత చేయవచ్చు. "<annotation id="url">"మరింత తెలుసుకోండి"</annotation></string>
+    <string name="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="fingerprint_add_max" msgid="1020927549936895822">"మీరు గరిష్టంగా <xliff:g id="COUNT">%d</xliff:g> వేలిముద్రలను జోడించవచ్చు"</string>
     <string name="fingerprint_intro_error_max" msgid="6864066984678078441">"మీరు గరిష్ట సంఖ్యలో వేలిముద్రలను జోడించారు"</string>
@@ -418,21 +422,21 @@
     <string name="fingerprint_last_delete_message_profile_challenge" msgid="6521520787746771912">"మీరు మీ కార్యాలయ ప్రొఫైల్‌ని అన్‌లాక్ చేయడానికి, కొనుగోళ్లను ప్రమాణీకరించడానికి లేదా కార్యాలయ అనువర్తనాలకు సైన్ ఇన్ చేయడానికి మీ వేలిముద్రలను ఉపయోగించలేరు"</string>
     <string name="fingerprint_last_delete_confirm" msgid="2634726361059274289">"అవును, తీసివేయి"</string>
     <string name="confirm_fingerprint_icon_content_description" msgid="5255544532157079096">"కొనసాగడానికి మీ వేలిముద్రను ఉపయోగించండి."</string>
-    <string name="crypt_keeper_settings_title" msgid="4219233835490520414">"గుప్తీకరణ"</string>
+    <string name="crypt_keeper_settings_title" msgid="4219233835490520414">"ఎన్‌క్రిప్షన్"</string>
     <string name="crypt_keeper_encrypt_title" product="tablet" msgid="1060273569887301457">"టాబ్లెట్‌ను గుప్తీకరించండి"</string>
     <string name="crypt_keeper_encrypt_title" product="default" msgid="1878996487755806122">"ఫోన్‌ను గుప్తీకరించండి"</string>
     <string name="crypt_keeper_encrypted_summary" msgid="1868233637888132906">"గుప్తీకరించబడింది"</string>
-    <string name="crypt_keeper_desc" product="tablet" msgid="503014594435731275">"మీరు మీ ఖాతాలను, సెట్టింగ్‌లను, డౌన్‌లోడ్ చేసిన అనువర్తనాలను మరియు వాటి డేటాను, మీడియాను మరియు ఇతర ఫైల్‌లను గుప్తీకరించవచ్చు. మీరు మీ టాబ్లెట్‍ను గుప్తీకరించిన తర్వాత ఒకవేళ స్క్రీన్ లాక్‌ను సెటప్ చేసినట్లయితే (అంటే, నమూనా లేదా సంఖ్యాత్మక పిన్‌ లేదా పాస్‌వర్డ్), టాబ్లెట్‌ను పవర్ ఆన్ చేసే ప్రతిసారి దాన్ని డీక్రిప్ట్ చేయడానికి స్క్రీన్‍ను అన్‌లాక్ చేయాలి. డీక్రిప్ట్ చేయడానికి గల ఇంకొక మార్గం ఫ్యాక్టరీ డేటా రీసెట్‌ను అమలు చేయడం మాత్రమే, అలా చేస్తే మీ మొత్తం డేటా తొలగించబడుతుంది.\n\nగుప్తీకరణకు ఒక గంట లేదా అంతకంటే ఎక్కువ సమయం పడుతుంది. మీరు తప్పనిసరిగా ఛార్జ్ చేసిన బ్యాటరీతో ప్రారంభించాలి మరియు ప్రాసెస్ అంతటా మీ టాబ్లెట్‌ను ప్లగిన్ చేసి ఉంచాలి. మీరు అంతరాయం కలిగిస్తే, మీ డేటాలో కొంత భాగాన్ని లేదా అంతటినీ కోల్పోతారు"</string>
-    <string name="crypt_keeper_desc" product="default" msgid="2579929266645543631">"మీరు మీ ఖాతాలను, సెట్టింగ్‌లను, డౌన్‌లోడ్ చేసిన అనువర్తనాలను మరియు వాటి డేటాను, మీడియాను మరియు ఇతర ఫైల్‌లను గుప్తీకరించవచ్చు. మీరు మీ ఫోన్‌ను గుప్తీకరించిన తర్వాత ఒకవేళ స్క్రీన్ లాక్‌ను సెటప్ చేసినట్లయితే (అంటే, నమూనా లేదా సంఖ్యాత్మక పిన్‌ లేదా పాస్‌వర్డ్), ఫోన్‌ను పవర్ ఆన్ చేసే ప్రతిసారి దాన్ని డీక్రిప్ట్ చేయడానికి స్క్రీన్‍ను అన్‌లాక్ చేయాలి. డీక్రిప్ట్ చేయడానికి గల ఇంకొక మార్గం ఫ్యాక్టరీ డేటా రీసెట్‌ను అమలు చేయడం మాత్రమే, అలా చేస్తే మీ మొత్తం డేటా తొలగించబడుతుంది.\n\nగుప్తీకరణకు ఒక గంట లేదా అంతకంటే ఎక్కువ సమయం పడుతుంది. మీరు తప్పనిసరిగా ఛార్జ్ చేసిన బ్యాటరీతో ప్రారంభించాలి మరియు ప్రాసెస్ అంతటా మీ ఫోన్‌ను ప్లగిన్ చేసి ఉంచాలి. మీరు అంతరాయం కలిగిస్తే, మీ డేటాలో కొంత భాగాన్ని లేదా అంతటినీ కోల్పోతారు."</string>
-    <string name="crypt_keeper_button_text" product="tablet" msgid="1189623490604750854">"టాబ్లెట్‌ను గుప్తీకరించు"</string>
-    <string name="crypt_keeper_button_text" product="default" msgid="2008346408473255519">"ఫోన్‌ను గుప్తీకరించు"</string>
+    <string name="crypt_keeper_desc" product="tablet" msgid="503014594435731275">"మీరు మీ ఖాతాలను, సెట్టింగ్‌లను, డౌన్‌లోడ్ చేసిన యాప్‌లను మరియు వాటి డేటాను, మీడియాను మరియు ఇతర ఫైల్‌లను గుప్తీకరించవచ్చు. మీరు మీ టాబ్లెట్‍ను గుప్తీకరించిన తర్వాత ఒకవేళ స్క్రీన్ లాక్‌ను సెటప్ చేసినట్లయితే (అంటే, ఆకృతి లేదా సంఖ్యాత్మక పిన్‌ లేదా పాస్‌వర్డ్), టాబ్లెట్‌ను పవర్ ఆన్ చేసే ప్రతిసారి దాన్ని డీక్రిప్ట్ చేయడానికి స్క్రీన్‍ను అన్‌లాక్ చేయాలి. డీక్రిప్ట్ చేయడానికి గల ఇంకొక మార్గం ఫ్యాక్టరీ డేటా రీసెట్‌ను అమలు చేయడం మాత్రమే, అలా చేస్తే మీ మొత్తం డేటా తొలగించబడుతుంది.\n\nగుప్తీకరణకు ఒక గంట లేదా అంతకంటే ఎక్కువ సమయం పడుతుంది. మీరు తప్పనిసరిగా ఛార్జ్ చేసిన బ్యాటరీతో ప్రారంభించాలి మరియు ప్రాసెస్ అంతటా మీ టాబ్లెట్‌ను ప్లగిన్ చేసి ఉంచాలి. మీరు అంతరాయం కలిగిస్తే, మీ డేటాలో కొంత భాగాన్ని లేదా అంతటినీ కోల్పోతారు"</string>
+    <string name="crypt_keeper_desc" product="default" msgid="2579929266645543631">"మీరు మీ ఖాతాలను, సెట్టింగ్‌లను, డౌన్‌లోడ్ చేసిన యాప్‌లను మరియు వాటి డేటాను, మీడియాను మరియు ఇతర ఫైల్‌లను గుప్తీకరించవచ్చు. మీరు మీ ఫోన్‌ను గుప్తీకరించిన తర్వాత ఒకవేళ స్క్రీన్ లాక్‌ను సెటప్ చేసినట్లయితే (అంటే, ఆకృతి లేదా సంఖ్యాత్మక పిన్‌ లేదా పాస్‌వర్డ్), ఫోన్‌ను పవర్ ఆన్ చేసే ప్రతిసారి దాన్ని డీక్రిప్ట్ చేయడానికి స్క్రీన్‍ను అన్‌లాక్ చేయాలి. డీక్రిప్ట్ చేయడానికి గల ఇంకొక మార్గం ఫ్యాక్టరీ డేటా రీసెట్‌ను అమలు చేయడం మాత్రమే, అలా చేస్తే మీ మొత్తం డేటా తొలగించబడుతుంది.\n\nగుప్తీకరణకు ఒక గంట లేదా అంతకంటే ఎక్కువ సమయం పడుతుంది. మీరు తప్పనిసరిగా ఛార్జ్ చేసిన బ్యాటరీతో ప్రారంభించాలి మరియు ప్రాసెస్ అంతటా మీ ఫోన్‌ను ప్లగిన్ చేసి ఉంచాలి. మీరు అంతరాయం కలిగిస్తే, మీ డేటాలో కొంత భాగాన్ని లేదా అంతటినీ కోల్పోతారు."</string>
+    <string name="crypt_keeper_button_text" product="tablet" msgid="1189623490604750854">"టాబ్లెట్‌ను ఎన్‌క్రిప్ట్ చేయి"</string>
+    <string name="crypt_keeper_button_text" product="default" msgid="2008346408473255519">"ఫోన్‌ను ఎన్‌క్రిప్ట్ చేయి"</string>
     <string name="crypt_keeper_low_charge_text" msgid="2029407131227814893">"మీ బ్యాటరీని ఛార్జ్ చేసి, మళ్లీ ప్రయత్నించండి."</string>
     <string name="crypt_keeper_unplugged_text" msgid="4785376766063053901">"మీ ఛార్జర్‌ను ప్లగిన్ చేసి, మళ్లీ ప్రయత్నించండి."</string>
     <string name="crypt_keeper_dialog_need_password_title" msgid="4058971800557767">"లాక్ స్క్రీన్ పిన్‌ లేదా పాస్‌వర్డ్ లేదు"</string>
     <string name="crypt_keeper_dialog_need_password_message" msgid="4071395977297369642">"మీరు గుప్తీకరణను ప్రారంభించడానికి ముందు లాక్ స్క్రీన్ పిన్‌ లేదా పాస్‌వర్డ్‌ను సెట్ చేయాల్సి ఉంటుంది."</string>
     <string name="crypt_keeper_confirm_title" msgid="5100339496381875522">"గుప్తీకరించాలా?"</string>
-    <string name="crypt_keeper_final_desc" product="tablet" msgid="517662068757620756">"గుప్తీకరణ చర్య స్థిరమైనది మరియు మీరు దీనికి అంతరాయం కలిగిస్తే, డేటాను కోల్పోతారు. గుప్తీకరణకు గంట లేదా అంతకంటే ఎక్కువ సమయం పడుతుంది, ఈ సమయంలో టాబ్లెట్ అనేకసార్లు పునఃప్రారంభించబడుతుంది."</string>
-    <string name="crypt_keeper_final_desc" product="default" msgid="287503113671320916">"గుప్తీకరణ చర్య తిరిగి రద్దు చేయలేనిది మరియు మీరు దీనికి అంతరాయం కలిగిస్తే, డేటాను కోల్పోతారు. గుప్తీకరణకు గంట లేదా అంతకంటే ఎక్కువ సమయం పడుతుంది, ఈ సమయంలో ఫోన్ అనేకసార్లు పునఃప్రారంభించబడుతుంది."</string>
+    <string name="crypt_keeper_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>
@@ -442,9 +446,9 @@
     <string name="crypt_keeper_force_power_cycle" product="default" msgid="1794353635603020327">"మీ ఫోన్‌ను అన్‌లాక్ చేయడానికి దాన్ని ఆఫ్ చేసి, ఆపై ఆన్ చేయండి."</string>
     <string name="crypt_keeper_warn_wipe" msgid="2738374897337991667">"హెచ్చరిక: మీరు అన్‌లాక్ చేయడానికి చేసే ప్రయత్నాల్లో మరో <xliff:g id="COUNT">^1</xliff:g> సార్లు విఫలమైతే మీ పరికరం తొలగించబడుతుంది!"</string>
     <string name="crypt_keeper_enter_password" msgid="2223340178473871064">"మీ పాస్‌వర్డ్‌ను టైప్ చేయండి"</string>
-    <string name="crypt_keeper_failed_title" msgid="7133499413023075961">"గుప్తీకరణ విఫలమైంది"</string>
-    <string name="crypt_keeper_failed_summary" product="tablet" msgid="8219375738445017266">"గుప్తీకరణకు అంతరాయం ఏర్పడింది మరియు పూర్తి చేయడం సాధ్యం కాదు. దీని ఫలితంగా, మీ టాబ్లెట్‌లోని డేటాకు ఇకపై ప్రాప్యత ఉండదు. \n\n మీ టాబ్లెట్‌ను ఉపయోగించడాన్ని పునఃప్రారంభించడానికి, మీరు ఫ్యాక్టరీ రీసెట్‌ను అమలు చేయాల్సి ఉంటుంది. మీరు రీసెట్ తర్వాత మీ టాబ్లెట్‌ను సెటప్ చేసేటప్పుడు, మీరు మీ Google ఖాతాకు బ్యాకప్ చేయబడిన ఏదైనా డేటాను పునరుద్ధరించడానికి మీకు అవకాశం ఉంటుంది."</string>
-    <string name="crypt_keeper_failed_summary" product="default" msgid="3270131542549577953">"గుప్తీకరణ ఆటంకపరచబడింది అందువల్ల పూర్తి చేయడం సాధ్యం కాదు. ఫలితంగా, మీ ఫోన్‌లోని డేటాకు ఇకపై ప్రాప్యత ఉండదు. \n\nమీ ఫోన్‌ను ఉపయోగించడాన్ని పునఃప్రారంభించడానికి, మీరు ఫ్యాక్టరీ రీసెట్‌ను అమలు చేయాల్సి ఉంటుంది. మీరు రీసెట్ తర్వాత మీ ఫోన్‌ను సెటప్ చేసేటప్పుడు, మీ Google ఖాతాకు బ్యాకప్ చేయబడిన ఏదైనా డేటాను పునరుద్ధరించడానికి మీకు అవకాశం ఉంటుంది."</string>
+    <string name="crypt_keeper_failed_title" msgid="7133499413023075961">"ఎన్‌క్రిప్షన్ విఫలమైంది"</string>
+    <string name="crypt_keeper_failed_summary" product="tablet" msgid="8219375738445017266">"గుప్తీకరణకు అంతరాయం ఏర్పడింది మరియు పూర్తి చేయడం సాధ్యం కాదు. దీని ఫలితంగా, మీ టాబ్లెట్‌లోని డేటాకు ఇకపై యాక్సెస్ ఉండదు. \n\n మీ టాబ్లెట్‌ను ఉపయోగించడాన్ని పునఃప్రారంభించడానికి, మీరు ఫ్యాక్టరీ రీసెట్‌ను అమలు చేయాల్సి ఉంటుంది. మీరు రీసెట్ తర్వాత మీ టాబ్లెట్‌ను సెటప్ చేసేటప్పుడు, మీరు మీ Google ఖాతాకు బ్యాకప్ చేయబడిన ఏదైనా డేటాను పునరుద్ధరించడానికి మీకు అవకాశం ఉంటుంది."</string>
+    <string name="crypt_keeper_failed_summary" product="default" msgid="3270131542549577953">"ఎన్‌క్రిప్షన్ ఆటంకపరచబడింది అందువల్ల పూర్తి చేయడం సాధ్యం కాదు. ఫలితంగా, మీ ఫోన్‌లోని డేటాకు ఇకపై యాక్సెస్ ఉండదు. \n\nమీ ఫోన్‌ను ఉపయోగించడాన్ని పునఃప్రారంభించడానికి, మీరు ఫ్యాక్టరీ రీసెట్‌ను అమలు చేయాల్సి ఉంటుంది. మీరు రీసెట్ తర్వాత మీ ఫోన్‌ను సెటప్ చేసేటప్పుడు, మీ Google ఖాతాకు బ్యాకప్ చేయబడిన ఏదైనా డేటాను పునరుద్ధరించడానికి మీకు అవకాశం ఉంటుంది."</string>
     <string name="crypt_keeper_data_corrupt_title" msgid="8759119849089795751">"డిక్రిప్షన్ విజయవంతం కాలేదు"</string>
     <string name="crypt_keeper_data_corrupt_summary" product="tablet" msgid="840107296925798402">"మీరు నమోదు చేసిన పాస్‌వర్డ్ సరైనది, కానీ దురదృష్టవశాత్తూ మీ డేటా పాడైంది. \n\nమీ టాబ్లెట్‌ను ఉపయోగించడం పునఃప్రారంభించడానికి, మీరు ఫ్యాక్టరీ రీసెట్‌ను అమలు చేయాలి. మీరు రీసెట్ చేసిన తర్వాత మీ టాబ్లెట్‌ను సెటప్ చేసినప్పుడు, మీ Google ఖాతాకు బ్యాకప్ చేసిన ఏదైనా డేటాను పునరుద్ధరించుకునే అవకాశం మీకు అందించబడుతుంది."</string>
     <string name="crypt_keeper_data_corrupt_summary" product="default" msgid="8843311420059663824">"మీరు నమోదు చేసిన పాస్‌వర్డ్ సరైనది, కానీ దురదృష్టవశాత్తూ మీ డేటా పాడైంది. \n\nమీ ఫోన్‌ను ఉపయోగించడం పునఃప్రారంభించడానికి, మీరు ఫ్యాక్టరీ రీసెట్‌ను అమలు చేయాలి. మీరు రీసెట్ చేసిన తర్వాత మీ ఫోన్‌ను సెటప్ చేసినప్పుడు, మీ Google ఖాతాకు బ్యాకప్ చేసిన ఏదైనా డేటాను పునరుద్ధరించుకునే అవకాశం మీకు అందించబడుతుంది."</string>
@@ -458,7 +462,7 @@
     <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="lock_settings_picker_fingerprint_added_security_message" msgid="5768002109707648463">"అదనపు భద్రత కోసం బ్యాకప్ స్క్రీన్ లాక్‌ను సెట్ చేయండి."</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>
@@ -470,13 +474,13 @@
     <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>
@@ -484,60 +488,68 @@
     <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>
     <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>
-    <!-- no translation found for unlock_disable_frp_warning_content_pattern_fingerprint (2986105377420905314) -->
-    <skip />
-    <string name="unlock_disable_frp_warning_content_pin" msgid="586996206210265131">"పరికర సంరక్షణ లక్షణాలు మీ పిన్ లేకుండా పని చేయవు."</string>
-    <!-- no translation found for unlock_disable_frp_warning_content_pin_fingerprint (3370462835533123695) -->
-    <skip />
+    <string name="unlock_disable_frp_warning_content_pattern" msgid="8869767290771023461">"డివైజ్ సంరక్షణ ఫీచర్‌లు మీ ఆకృతి లేకుండా పని చేయవు."</string>
+    <string name="unlock_disable_frp_warning_content_pattern_fingerprint" msgid="2986105377420905314">"డివైజ్ సంరక్షణ ఫీచర్‌లు మీ ఆకృతి లేకుండా పని చేయవు.<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="3370462835533123695">"డివైజ్ సంరక్షణ ఫీచర్‌లు మీ పిన్ లేకుండా పని చేయవు.<xliff:g id="EMPTY_LINE">
+
+</xliff:g>అలాగే మీ సేవ్ చేయబడిన వేలిముద్రలు ఈ డివైజ్ నుండి తీసివేయబడతాయి, ఆపై మీరు వాటితో మీ ఫోన్‌ను అన్‌లాక్ చేయలేరు, కొనుగోళ్లను ప్రామాణీకరించలేరు లేదా యాప్‌లకు సైన్ ఇన్ చేయలేరు."</string>
     <string name="unlock_disable_frp_warning_content_password" msgid="5420612686852555537">"పరికర సంరక్షణ లక్షణాలు మీ పాస్‌వర్డ్ లేకుండా పని చేయవు."</string>
-    <!-- no translation found for unlock_disable_frp_warning_content_password_fingerprint (3595476296430536798) -->
-    <skip />
+    <string name="unlock_disable_frp_warning_content_password_fingerprint" msgid="3595476296430536798">"పరికర సంరక్షణ ఫీచర్‌లు మీ పాస్‌వర్డ్ లేకుండా పని చేయవు.<xliff:g id="EMPTY_LINE">
+
+</xliff:g>అలాగే మీ సేవ్ చేయబడిన వేలిముద్రలు ఈ పరికరం నుండి తీసివేయబడతాయి, ఆపై మీరు వాటితో మీ ఫోన్‌ను అన్‌లాక్ చేయలేరు, కొనుగోళ్లను ప్రామాణీకరించలేరు లేదా యాప్‌లకు సైన్ ఇన్ చేయలేరు."</string>
     <string name="unlock_disable_frp_warning_content_unknown" msgid="1550718040483548220">"పరికర సంరక్షణ లక్షణాలు మీ స్క్రీన్ లాక్ లేకుండా పని చేయవు."</string>
-    <!-- no translation found for unlock_disable_frp_warning_content_unknown_fingerprint (3679351662094349506) -->
-    <skip />
-    <string name="unlock_disable_frp_warning_content_pattern_profile" msgid="8682200103576359918">"ప్రొఫైల్ సంరక్షణ లక్షణాలు మీ నమూనా లేకుండా పని చేయవు."</string>
-    <!-- no translation found for unlock_disable_frp_warning_content_pattern_fingerprint_profile (6718155854303231675) -->
-    <skip />
-    <string name="unlock_disable_frp_warning_content_pin_profile" msgid="7790688070593867767">"ప్రొఫైల్ సంరక్షణ లక్షణాలు మీ పిన్ లేకుండా పని చేయవు."</string>
-    <!-- no translation found for unlock_disable_frp_warning_content_pin_fingerprint_profile (4209564603132870532) -->
-    <skip />
+    <string name="unlock_disable_frp_warning_content_unknown_fingerprint" msgid="3679351662094349506">"పరికర సంరక్షణ ఫీచర్‌లు మీ స్క్రీన్ లాక్ లేకుండా పని చేయవు.<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="6718155854303231675">"ప్రొఫైల్ సంరక్షణ ఫీచర్‌లు మీ ఆకృతి లేకుండా పని చేయవు.<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="4209564603132870532">"ప్రొఫైల్ సంరక్షణ ఫీచర్‌లు మీ పిన్ లేకుండా పని చేయవు.<xliff:g id="EMPTY_LINE">
+
+</xliff:g>అలాగే మీ సేవ్ చేయబడిన వేలిముద్రలు ఈ ప్రొఫైల్ నుండి తీసివేయబడతాయి, ఆపై మీరు వాటితో మీ ప్రొఫైల్‌ను అన్‌లాక్ చేయలేరు, కొనుగోళ్లను ప్రామాణీకరించలేరు లేదా యాప్‌లకు సైన్ ఇన్ చేయలేరు."</string>
     <string name="unlock_disable_frp_warning_content_password_profile" msgid="7569285520567674461">"ప్రొఫైల్ సంరక్షణ లక్షణాలు మీ పాస్‌వర్డ్ లేకుండా పని చేయవు."</string>
-    <!-- no translation found for unlock_disable_frp_warning_content_password_fingerprint_profile (2994300676764706047) -->
-    <skip />
+    <string name="unlock_disable_frp_warning_content_password_fingerprint_profile" msgid="2994300676764706047">"ప్రొఫైల్ సంరక్షణ ఫీచర్‌లు మీ పాస్‌వర్డ్ లేకుండా పని చేయవు.<xliff:g id="EMPTY_LINE">
+
+</xliff:g>అలాగే మీ సేవ్ చేయబడిన వేలిముద్రలు ఈ ప్రొఫైల్ నుండి తీసివేయబడతాయి, ఆపై మీరు వాటితో మీ ప్రొఫైల్‌ను అన్‌లాక్ చేయలేరు, కొనుగోళ్లను ప్రామాణీకరించలేరు లేదా యాప్‌లకు సైన్ ఇన్ చేయలేరు."</string>
     <string name="unlock_disable_frp_warning_content_unknown_profile" msgid="6984215718701688202">"ప్రొఫైల్ సంరక్షణ లక్షణాలు మీ స్క్రీన్ లాక్ లేకుండా పని చేయవు."</string>
-    <!-- no translation found for unlock_disable_frp_warning_content_unknown_fingerprint_profile (4994062501123299418) -->
-    <skip />
+    <string name="unlock_disable_frp_warning_content_unknown_fingerprint_profile" msgid="4994062501123299418">"ప్రొఫైల్ సంరక్షణ ఫీచర్‌లు మీ స్క్రీన్ లాక్ లేకుండా పని చేయవు.<xliff:g id="EMPTY_LINE">
+
+</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_failed_attempts_before_wipe" msgid="2219711062197089783">"మళ్లీ ప్రయత్నించండి. <xliff:g id="TOTAL_ATTEMPTS">%2$d</xliff:g>లో <xliff:g id="CURRENT_ATTEMPTS">%1$d</xliff:g> ప్రయత్నం చేసారు."</string>
     <string name="lock_last_attempt_before_wipe_warning_title" msgid="4277765862798876826">"మీ డేటా తొలగించబడుతుంది"</string>
-    <string name="lock_last_pattern_attempt_before_wipe_device" msgid="1688030823464420974">"మీరు తదుపరి ప్రయత్నంలో తప్పు నమూనాను నమోదు చేస్తే, ఈ పరికరం యొక్క డేటా తొలగించబడుతుంది"</string>
-    <string name="lock_last_pin_attempt_before_wipe_device" msgid="5350785938296254352">"మీరు తదుపరి ప్రయత్నంలో తప్పు PINను నమోదు చేస్తే, ఈ పరికరం యొక్క డేటా తొలగించబడుతుంది"</string>
-    <string name="lock_last_password_attempt_before_wipe_device" msgid="6208035114731421034">"మీరు తదుపరి ప్రయత్నంలో తప్పు పాస్‌వర్డ్‌ను నమోదు చేస్తే, ఈ పరికరం యొక్క డేటా తొలగించబడుతుంది"</string>
-    <string name="lock_last_pattern_attempt_before_wipe_user" msgid="7851504071368235547">"మీరు తదుపరి ప్రయత్నంలో తప్పు నమూనాను నమోదు చేస్తే, ఈ వినియోగదారు తొలగించబడతారు"</string>
-    <string name="lock_last_pin_attempt_before_wipe_user" msgid="4049024921333961715">"మీరు తదుపరి ప్రయత్నంలో తప్పు PINను నమోదు చేస్తే, ఈ వినియోగదారు తొలగించబడతారు"</string>
-    <string name="lock_last_password_attempt_before_wipe_user" msgid="4660886542496781672">"మీరు తదుపరి ప్రయత్నంలో తప్పు పాస్‌వర్డ్‌ను నమోదు చేస్తే, ఈ వినియోగదారు తొలగించబడతారు"</string>
-    <string name="lock_last_pattern_attempt_before_wipe_profile" msgid="2437716252059050291">"మీరు తదుపరి ప్రయత్నంలో తప్పు నమూనాను నమోదు చేస్తే, మీ కార్యాలయ ప్రొఫైల్‌ మరియు దీని డేటా తొలగించబడతాయి"</string>
-    <string name="lock_last_pin_attempt_before_wipe_profile" msgid="5799931839127476913">"మీరు తదుపరి ప్రయత్నంలో తప్పు PINను నమోదు చేస్తే, మీ కార్యాలయ ప్రొఫైల్‌ మరియు దీని డేటా తొలగించబడతాయి"</string>
-    <string name="lock_last_password_attempt_before_wipe_profile" msgid="6786586046975042158">"మీరు తదుపరి ప్రయత్నంలో తప్పు పాస్‌వర్డ్‌ను నమోదు చేస్తే, మీ కార్యాలయ ప్రొఫైల్‌ మరియు దీని డేటా తొలగించబడతాయి"</string>
+    <string name="lock_last_pattern_attempt_before_wipe_device" msgid="1688030823464420974">"మీరు తర్వాత ప్రయత్నంలో తప్పు నమూనాను నమోదు చేస్తే, ఈ పరికరం యొక్క డేటా తొలగించబడుతుంది"</string>
+    <string name="lock_last_pin_attempt_before_wipe_device" msgid="5350785938296254352">"మీరు తర్వాత ప్రయత్నంలో తప్పు పిన్‌ను నమోదు చేస్తే, ఈ పరికరం యొక్క డేటా తొలగించబడుతుంది"</string>
+    <string name="lock_last_password_attempt_before_wipe_device" msgid="6208035114731421034">"మీరు తర్వాత ప్రయత్నంలో తప్పు పాస్‌వర్డ్‌ను నమోదు చేస్తే, ఈ పరికరం యొక్క డేటా తొలగించబడుతుంది"</string>
+    <string name="lock_last_pattern_attempt_before_wipe_user" msgid="7851504071368235547">"మీరు తర్వాత ప్రయత్నంలో తప్పు నమూనాను నమోదు చేస్తే, ఈ వినియోగదారు తొలగించబడతారు"</string>
+    <string name="lock_last_pin_attempt_before_wipe_user" msgid="4049024921333961715">"మీరు తర్వాత ప్రయత్నంలో తప్పు పిన్‌ను నమోదు చేస్తే, ఈ వినియోగదారు తొలగించబడతారు"</string>
+    <string name="lock_last_password_attempt_before_wipe_user" msgid="4660886542496781672">"మీరు తర్వాత ప్రయత్నంలో తప్పు పాస్‌వర్డ్‌ను నమోదు చేస్తే, ఈ వినియోగదారు తొలగించబడతారు"</string>
+    <string name="lock_last_pattern_attempt_before_wipe_profile" msgid="2437716252059050291">"మీరు తర్వాత ప్రయత్నంలో తప్పు నమూనాను నమోదు చేస్తే, మీ కార్యాలయ ప్రొఫైల్‌ మరియు దీని డేటా తొలగించబడతాయి"</string>
+    <string name="lock_last_pin_attempt_before_wipe_profile" msgid="5799931839127476913">"మీరు తర్వాత ప్రయత్నంలో తప్పు పిన్‌ను నమోదు చేస్తే, మీ కార్యాలయ ప్రొఫైల్‌ మరియు దీని డేటా తొలగించబడతాయి"</string>
+    <string name="lock_last_password_attempt_before_wipe_profile" msgid="6786586046975042158">"మీరు తర్వాత ప్రయత్నంలో తప్పు పాస్‌వర్డ్‌ను నమోదు చేస్తే, మీ కార్యాలయ ప్రొఫైల్‌ మరియు దీని డేటా తొలగించబడతాయి"</string>
     <string name="lock_failed_attempts_now_wiping_device" msgid="5047439819181833824">"చాలా ఎక్కువ తప్పు ప్రయత్నాలు చేసారు. ఈ పరికరం యొక్క డేటా తొలగించబడుతుంది."</string>
     <string name="lock_failed_attempts_now_wiping_user" msgid="6188180643494518001">"చాలా ఎక్కువ తప్పు ప్రయత్నాలు చేసారు. ఈ వినియోగదారు తొలగించబడతారు."</string>
     <string name="lock_failed_attempts_now_wiping_profile" msgid="1745475043685915442">"చాలా ఎక్కువ తప్పు ప్రయత్నాలు చేసారు. ఈ కార్యాలయ ప్రొఫైల్ మరియు దీని డేటా తొలగించబడతాయి."</string>
@@ -548,7 +560,7 @@
     <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>
@@ -581,14 +593,15 @@
     <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="lockpassword_clear_label" msgid="5724429464960458155">"తీసివేయండి"</string>
     <string name="lockpattern_tutorial_cancel_label" msgid="6431583477570493261">"రద్దు చేయి"</string>
-    <string name="lockpattern_tutorial_continue_label" msgid="3559793618653400434">"తదుపరి"</string>
+    <string name="lockpattern_tutorial_continue_label" msgid="3559793618653400434">"తర్వాత"</string>
     <string name="lock_setup" msgid="3355847066343753943">"సెటప్ పూర్తయింది."</string>
-    <string name="manage_device_admin" msgid="537804979483211453">"పరికర నిర్వాహకుల అనువర్తనాలు"</string>
+    <string name="manage_device_admin" msgid="537804979483211453">"పరికర నిర్వాహకుల యాప్‌లు"</string>
     <string name="number_of_device_admins_none" msgid="7185056721919496069">"సక్రియ అనువర్తనాలు లేవు"</string>
     <plurals name="number_of_device_admins" formatted="false" msgid="3361891840111523393">
-      <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> అనువర్తనాలు సక్రియంగా ఉన్నాయి</item>
-      <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>
@@ -608,12 +621,12 @@
     <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>
     <string name="bluetooth_display_passkey_pin_msg" msgid="2796550001376088433">"దీనితో జత చేయడానికి:<xliff:g id="BOLD1_0">&lt;br&gt;&lt;b&gt;</xliff:g><xliff:g id="DEVICE_NAME">%1$s</xliff:g><xliff:g id="END_BOLD1">&lt;/b&gt;&lt;br&gt;&lt;br&gt;</xliff:g>దీనిలో టైప్ చేయండి:<xliff:g id="BOLD2_1">&lt;br&gt;&lt;b&gt;</xliff:g><xliff:g id="PASSKEY">%2$s</xliff:g><xliff:g id="END_BOLD2">&lt;/b&gt;</xliff:g>, ఆపై తిరిగి వెళ్లు లేదా Enter నొక్కండి."</string>
-    <string name="bluetooth_pairing_shares_phonebook" msgid="2277931851483023208">"మీ పరిచయాలు మరియు కాల్ చరిత్రను ప్రాప్యత చేయడానికి <xliff:g id="DEVICE_NAME">%1$s</xliff:g>ని అనుమతించండి"</string>
+    <string name="bluetooth_pairing_shares_phonebook" msgid="2277931851483023208">"మీ పరిచయాలు మరియు కాల్ చరిత్రను యాక్సెస్ చేయడానికి <xliff:g id="DEVICE_NAME">%1$s</xliff:g>ని అనుమతించండి"</string>
     <string name="bluetooth_error_title" msgid="6850384073923533096"></string>
     <string name="bluetooth_connecting_error_message" msgid="1397388344342081090">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>కి కనెక్ట్ చేయడం సాధ్యపడలేదు."</string>
     <string name="bluetooth_preference_scan_title" msgid="2277464653118896016">"పరికరాల కోసం స్కాన్ చేయి"</string>
@@ -627,7 +640,7 @@
     <string name="bluetooth_preference_paired_dialog_contacts_option" msgid="7747163316331917594">"పరిచయాలు మరియు కాల్ చరిత్ర"</string>
     <string name="bluetooth_pairing_dialog_title" msgid="1417255032435317301">"ఈ పరికరంతో జత చేయాలా?"</string>
     <string name="bluetooth_pairing_dialog_sharing_phonebook_title" msgid="7664141669886358618">"ఫోన్ పుస్తకాన్ని భాగస్వామ్యం చేయాలా?"</string>
-    <string name="bluetooth_pairing_dialog_contants_request" msgid="5531109163573611348">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> మీ పరిచయాలను మరియు కాల్ చరిత్రను ప్రాప్యత చేయాలనుకుంటోంది."</string>
+    <string name="bluetooth_pairing_dialog_contants_request" msgid="5531109163573611348">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> మీ పరిచయాలను మరియు కాల్ చరిత్రను యాక్సెస్ చేయాలనుకుంటోంది."</string>
     <string name="bluetooth_pairing_dialog_paring_request" msgid="8451248193517851958">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> బ్లూటూత్‌తో జత చేయాలనుకుంటోంది. కనెక్ట్ చేసినప్పుడు, ఇది మీ పరిచయాలు మరియు కాల్ చరిత్రకి ప్రాప్యతని కలిగి ఉంటుంది."</string>
     <string name="bluetooth_preference_paired_devices" msgid="1970524193086791964">"జత చేసిన పరికరాలు"</string>
     <string name="bluetooth_preference_found_devices" msgid="1647983835063249680">"అందుబాటులో ఉన్న పరికరాలు"</string>
@@ -654,7 +667,7 @@
     <string name="bluetooth_disconnect_a2dp_profile" msgid="3524648279150937177">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> మీడియా ఆడియో నుండి డిస్‌కనెక్ట్ చేయబడుతుంది."</string>
     <string name="bluetooth_disconnect_headset_profile" msgid="8635908811168780720">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> హ్యాండ్స్‌ఫ్రీ ఆడియో నుండి డిస్‌కనెక్ట్ చేయబడుతుంది."</string>
     <string name="bluetooth_disconnect_hid_profile" msgid="3282295189719352075">"ఇన్‌పుట్ పరికరం నుండి <xliff:g id="DEVICE_NAME">%1$s</xliff:g> డిస్‌కనెక్ట్ చేయబడుతుంది."</string>
-    <string name="bluetooth_disconnect_pan_user_profile" msgid="8037627994382458698">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> ద్వారా ఇంటర్నెట్ ప్రాప్యత డిస్‌కనెక్ట్ చేయబడుతుంది."</string>
+    <string name="bluetooth_disconnect_pan_user_profile" msgid="8037627994382458698">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> ద్వారా ఇంటర్నెట్ యాక్సెస్ డిస్‌కనెక్ట్ చేయబడుతుంది."</string>
     <string name="bluetooth_disconnect_pan_nap_profile" product="tablet" msgid="1262792320446274407">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> ఈ టాబ్లెట్ ఇంటర్నెట్ కనెక్షన్ భాగస్వామ్యం నుండి డిస్‌కనెక్ట్ చేయబడుతుంది."</string>
     <string name="bluetooth_disconnect_pan_nap_profile" product="default" msgid="5700332050175684571">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> ఈ ఫోన్ ఇంటర్నెట్ కనెక్షన్‌ను భాగస్వామ్యం నుండి డిస్‌కనెక్ట్ చేయబడుతుంది."</string>
     <string name="bluetooth_device_advanced_title" msgid="6066342531927499308">"జత చేయబడిన బ్లూటూత్ పరికరం"</string>
@@ -663,7 +676,7 @@
     <string name="bluetooth_device_advanced_profile_header_title" msgid="102745381968579605">"దీని కోసం ఉపయోగించు"</string>
     <string name="bluetooth_device_advanced_rename_device" msgid="5148578059584955791">"పేరు మార్చు"</string>
     <string name="bluetooth_device_advanced_enable_opp_title" msgid="8222550640371627365">"ఇన్‌కమింగ్ ఫైల్ బదిలీలను అనుమతించు"</string>
-    <string name="bluetooth_pan_user_profile_summary_connected" msgid="4602294638909590612">"ఇంటర్నెట్ ప్రాప్యత కోసం పరికరానికి కనెక్ట్ చేయబడింది"</string>
+    <string name="bluetooth_pan_user_profile_summary_connected" msgid="4602294638909590612">"ఇంటర్నెట్ యాక్సెస్ కోసం పరికరానికి కనెక్ట్ చేయబడింది"</string>
     <string name="bluetooth_pan_nap_profile_summary_connected" msgid="1561383706411975199">"స్థానిక ఇంటర్నెట్ కనెక్షన్‌ను పరికరంతో భాగస్వామ్యం చేయడం"</string>
     <string name="bluetooth_dock_settings" msgid="3218335822716052885">"డాక్ సెట్టింగ్‌లు"</string>
     <string name="bluetooth_dock_settings_title" msgid="5543069893044375188">"ఆడియో కోసం డాక్‌ను ఉపయోగించు"</string>
@@ -691,25 +704,25 @@
     <string name="nfc_quick_toggle_summary" product="tablet" msgid="8302974395787498915">"టాబ్లెట్ మరో పరికరాన్ని తాకినప్పుడు డేటా మార్పిడిని అనుమతించు"</string>
     <string name="nfc_quick_toggle_summary" product="default" msgid="5237208142892767592">"ఫోన్ మరో పరికరాన్ని తాకినప్పుడు డేటా పరస్పర మార్పిడికి అనుమతించండి"</string>
     <string name="nfc_disclaimer_title" msgid="4364003873202264039">"NFCని ఆన్ చేయండి"</string>
-    <string name="nfc_disclaimer_content" msgid="5566907911915158075">"NFC ఈ పరికరం మరియు ఇతర సమీప పరికరాలు లేదా చెల్లింపు టెర్మినల్‌లు, ప్రాప్యత రీడర్‌లు మరియు పరస్పర చర్య కలిగి ఉండే ప్రకటనలు లేదా ట్యాగ్‌ల వంటి లక్ష్యాల మధ్య డేటా మార్పిడి చేస్తుంది."</string>
+    <string name="nfc_disclaimer_content" msgid="5566907911915158075">"NFC ఈ పరికరం మరియు ఇతర సమీప పరికరాలు లేదా చెల్లింపు టెర్మినల్‌లు, యాక్సెస్ రీడర్‌లు మరియు పరస్పర చర్య కలిగి ఉండే ప్రకటనలు లేదా ట్యాగ్‌ల వంటి లక్ష్యాల మధ్య డేటా మార్పిడి చేస్తుంది."</string>
     <string name="android_beam_settings_title" msgid="7832812974600338649">"Android Beam"</string>
-    <string name="android_beam_on_summary" msgid="3618057099355636830">"అనువర్తన కంటెంట్‌ను NFC ద్వారా పంపడానికి సిద్ధంగా ఉంది"</string>
+    <string name="android_beam_on_summary" msgid="3618057099355636830">"యాప్ కంటెంట్‌ను NFC ద్వారా పంపడానికి సిద్ధంగా ఉంది"</string>
     <string name="android_beam_off_summary" msgid="4663095428454779138">"ఆఫ్‌లో ఉంది"</string>
     <string name="android_beam_disabled_summary" msgid="1737782116894793393">"NFC ఆఫ్ చేయబడినందున అందుబాటులో లేదు"</string>
     <string name="android_beam_label" msgid="6257036050366775040">"Android Beam"</string>
-    <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>
     <string name="wifi_settings_category" msgid="8719175790520448014">"Wi‑Fi సెట్టింగ్‌లు"</string>
     <string name="wifi_settings_title" msgid="3103415012485692233">"Wi‑Fi"</string>
-    <string name="wifi_settings_summary" msgid="668767638556052820">"వైర్‌లెస్ ప్రాప్యత స్థానాలను సెటప్ చేయండి &amp; నిర్వహించండి"</string>
+    <string name="wifi_settings_summary" msgid="668767638556052820">"వైర్‌లెస్ యాక్సెస్ స్థానాలను సెటప్ చేయండి &amp; నిర్వహించండి"</string>
     <string name="wifi_select_network" msgid="4210954938345463209">"Wi‑Fiను ఎంచుకోండి"</string>
     <string name="wifi_starting" msgid="6732377932749942954">"Wi‑Fiను ప్రారంభిస్తోంది…"</string>
     <string name="wifi_stopping" msgid="8952524572499500804">"Wi‑Fiని ఆపివేస్తోంది…"</string>
-    <string name="wifi_error" msgid="3207971103917128179">"లోపం"</string>
+    <string name="wifi_error" msgid="3207971103917128179">"ఎర్రర్"</string>
     <string name="wifi_sap_no_channel_error" msgid="3108445199311817111">"ఈ దేశంలో 5 GHz బ్యాండ్ అందుబాటులో లేదు"</string>
-    <string name="wifi_in_airplane_mode" msgid="8652520421778203796">"ఎయిర్‌ప్లైన్ మోడ్‌లో"</string>
+    <string name="wifi_in_airplane_mode" msgid="8652520421778203796">"ఎయిర్‌ప్లేన్ మోడ్‌లో"</string>
     <string name="wifi_notify_open_networks" msgid="76298880708051981">"ఓపెన్ నెట్‌వర్క్ నోటిఫికేషన్"</string>
     <string name="wifi_notify_open_networks_summary" msgid="2761326999921366960">"అధిక నాణ్యత ఉన్న పబ్లిక్ నెట్‌వర్క్ అందుబాటులో ఉన్నప్పుడు తెలియజేస్తుంది"</string>
     <string name="wifi_wakeup" msgid="8815640989361538036">"Wi‑Fiని స్వయంచాలకంగా ఆన్ చేయి"</string>
@@ -723,8 +736,8 @@
     <string name="use_open_wifi_automatically_summary" msgid="2982091714252931713">"అధిక నాణ్యత గల పబ్లిక్ నెట్‌వర్క్‌లకు స్వయంచాలకంగా కనెక్ట్ చేస్తుంది"</string>
     <string name="use_open_wifi_automatically_summary_scoring_disabled" msgid="593964217679325831">"ఉపయోగించడానికి, నెట్‌వర్క్ రేటింగ్ ప్రదాతను ఎంచుకోండి"</string>
     <string name="use_open_wifi_automatically_summary_scorer_unsupported_disabled" msgid="8472122600853650258">"ఉపయోగించడానికి, అనుకూల నెట్‌వర్క్ రేటింగ్ ప్రదాతను ఎంచుకోండి"</string>
-    <string name="wifi_install_credentials" msgid="3551143317298272860">"ప్రమాణపత్రాలను ఇన్‌స్టాల్ చేయి"</string>
-    <string name="wifi_scan_notify_text" msgid="5593805423071186757">"స్థాన ఖచ్చితత్వాన్ని మెరుగుపరచడానికి, సిస్టమ్ అనువర్తనాలు మరియు సేవలు ఇప్పటికీ Wi‑Fi నెట్‌వర్క్‌ల కోసం స్కాన్ చేయగలవు. మీరు దీన్ని <xliff:g id="LINK_BEGIN_0">LINK_BEGIN</xliff:g>స్కానింగ్ సెట్టింగ్‌లు<xliff:g id="LINK_END_1">LINK_END</xliff:g>లో మార్చవచ్చు."</string>
+    <string name="wifi_install_credentials" msgid="3551143317298272860">"సర్టిఫికెట్లను ఇన్‌స్టాల్ చేయి"</string>
+    <string name="wifi_scan_notify_text" msgid="5593805423071186757">"స్థాన ఖచ్చితత్వాన్ని మెరుగుపరచడానికి, సిస్టమ్ యాప్‌లు మరియు సేవలు ఇప్పటికీ Wi‑Fi నెట్‌వర్క్‌ల కోసం స్కాన్ చేయగలవు. మీరు దీన్ని <xliff:g id="LINK_BEGIN_0">LINK_BEGIN</xliff:g>స్కానింగ్ సెట్టింగ్‌లు<xliff:g id="LINK_END_1">LINK_END</xliff:g>లో మార్చవచ్చు."</string>
     <string name="wifi_scan_notify_text_scanning_off" msgid="3426075479272242098">"స్థాన ఖచ్చితత్వాన్ని మెరుగుపరచాలంటే, <xliff:g id="LINK_BEGIN_0">LINK_BEGIN</xliff:g>స్కానింగ్ సెట్టింగ్‌లు<xliff:g id="LINK_END_1">LINK_END</xliff:g>లో Wi-Fi స్కానింగ్‌ని ఆన్ చేయండి."</string>
     <string name="wifi_scan_notify_remember_choice" msgid="7104867814641144485">"మళ్లీ చూపవద్దు"</string>
     <string name="wifi_setting_sleep_policy_title" msgid="5149574280392680092">"నిద్రావస్థలో ఉన్నప్పుడు Wi‑Fiని ఆన్‌లో ఉంచు"</string>
@@ -734,9 +747,9 @@
     <string name="wifi_suspend_optimizations" msgid="1220174276403689487">"Wi‑Fi అనుకూలీకరణ"</string>
     <string name="wifi_suspend_optimizations_summary" msgid="4151428966089116856">"Wi‑Fi ఆన్‌లో ఉన్నప్పుడు బ్యాటరీ వినియోగాన్ని కనిష్టీకరించు"</string>
     <string name="wifi_limit_optimizations_summary" msgid="9000801068363468950">"Wi‑Fi విని. బ్యాటరీ పరి. చేయి"</string>
-    <string name="wifi_switch_away_when_unvalidated" msgid="1707247692180853058">"Wi‑Fiకి ఇంటర్నెట్ ప్రాప్యత లేకపోతే మొబైల్ డేటాకు మారండి."</string>
+    <string name="wifi_switch_away_when_unvalidated" msgid="1707247692180853058">"Wi‑Fiకి ఇంటర్నెట్ యాక్సెస్ లేకపోతే మొబైల్ డేటాకు మారండి."</string>
     <string name="wifi_cellular_data_fallback_title" msgid="8753386877755616476">"స్వయంచాలకంగా మొబైల్ డేటాకి మార్చు"</string>
-    <string name="wifi_cellular_data_fallback_summary" msgid="6375399280719867214">"Wi‑Fiకి ఇంటర్నెట్ ప్రాప్యత లేనప్పుడు మొబైల్ డేటాను ఉపయోగిస్తుంది. డేటా వినియోగ ఛార్జీలు వర్తించవచ్చు."</string>
+    <string name="wifi_cellular_data_fallback_summary" msgid="6375399280719867214">"Wi‑Fiకి ఇంటర్నెట్ యాక్సెస్ లేనప్పుడు మొబైల్ డేటాను ఉపయోగిస్తుంది. డేటా వినియోగ ఛార్జీలు వర్తించవచ్చు."</string>
     <string name="wifi_add_network" msgid="6234851776910938957">"నెట్‌వర్క్‌ను జోడించండి"</string>
     <string name="wifi_configure_settings_preference_title" msgid="2913345003906899146">"Wi‑Fi ప్రాధాన్యతలు"</string>
     <string name="wifi_configure_settings_preference_summary_wakeup_on" msgid="646393113104367290">"Wi‑Fi స్వయంచాలకంగా తిరిగి ఆన్ చేయబడుతుంది"</string>
@@ -774,6 +787,7 @@
     <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>
@@ -786,9 +800,9 @@
     <string name="passpoint_content" msgid="8447207162397870483">"<xliff:g id="NAME">%1$s</xliff:g> ఆధారాలు"</string>
     <string name="wifi_eap_method" msgid="8529436133640730382">"EAP పద్ధతి"</string>
     <string name="please_select_phase2" msgid="5231074529772044898">"2వ దశ ప్రామాణీకరణ"</string>
-    <string name="wifi_eap_ca_cert" msgid="3521574865488892851">"CA ప్రమాణపత్రం"</string>
+    <string name="wifi_eap_ca_cert" msgid="3521574865488892851">"CA సర్టిఫికెట్"</string>
     <string name="wifi_eap_domain" msgid="8471124344218082064">"డొమైన్"</string>
-    <string name="wifi_eap_user_cert" msgid="1291089413368160789">"వినియోగదారు ప్రమాణపత్రం"</string>
+    <string name="wifi_eap_user_cert" msgid="1291089413368160789">"వినియోగదారు సర్టిఫికెట్"</string>
     <string name="wifi_eap_identity" msgid="4359453783379679103">"గుర్తింపు"</string>
     <string name="wifi_eap_anonymous" msgid="2989469344116577955">"అనామక గుర్తింపు"</string>
     <string name="wifi_password" msgid="5948219759936151048">"పాస్‌వర్డ్"</string>
@@ -804,12 +818,14 @@
     <string name="wifi_use_system_certs" msgid="5270879895056893783">"సిస్టమ్ ప్రమాణపత్రాలను ఉపయోగించు"</string>
     <string name="wifi_do_not_provide_eap_user_cert" msgid="5160499244977160665">"అందించవద్దు"</string>
     <string name="wifi_do_not_validate_eap_server" msgid="4266754430576348471">"ప్రామాణీకరించవద్దు"</string>
-    <string name="wifi_do_not_validate_eap_server_warning" msgid="1787190245542586660">"ప్రమాణపత్రం ఏదీ పేర్కొనబడలేదు. మీ కనెక్షన్ ప్రైవేట్‌గా ఉండదు."</string>
+    <string name="wifi_do_not_validate_eap_server_warning" msgid="1787190245542586660">"సర్టిఫికెట్ ఏదీ పేర్కొనబడలేదు. మీ కనెక్షన్ ప్రైవేట్‌గా ఉండదు."</string>
     <string name="wifi_ssid_too_long" msgid="3474753269579895244">"నెట్‌వర్క్ పేరు చాలా పొడవుగా ఉంది."</string>
     <string name="wifi_no_domain_warning" msgid="5223011964091727376">"తప్పనిసరిగా డొమైన్‌ను పేర్కొనాలి."</string>
     <string name="wifi_wps_available_first_item" msgid="4422547079984583502">"WPS అందుబాటులో ఉంది"</string>
     <string name="wifi_wps_available_second_item" msgid="8427520131718215301">" (WPS అందుబాటులో ఉంది)"</string>
     <string name="wifi_wps_nfc_enter_password" msgid="2288214226916117159">"మీ నెట్‌వర్క్ పాస్‌వర్డ్‌ను నమోదు చేయండి"</string>
+    <string name="wifi_carrier_connect" msgid="8174696557882299911">"క్యారియర్ Wi‑Fi నెట్‌వర్క్"</string>
+    <string name="wifi_carrier_content" msgid="4634077285415851933">"<xliff:g id="NAME">%1%s</xliff:g> ద్వారా కనెక్ట్ చేయండి"</string>
     <string name="wifi_scan_always_turnon_message" msgid="203123538572122989">"స్థాన ఖచ్చితత్వాన్ని మెరుగుపరచడానికి మరియు ఇతర ప్రయోజనాల దృష్ట్యా, <xliff:g id="APP_NAME">%1$s</xliff:g> Wi-Fi ఆఫ్‌లో ఉన్నప్పటికీ, నెట్‌వర్క్‌ను స్కాన్ చేయడం ప్రారంభించాలనుకుంటుంది.\n\nస్కాన్ చేయాలనుకునే అన్ని అనువర్తనాల కోసం దీన్ని అనుమతించాలా?"</string>
     <string name="wifi_scan_always_turnoff_message" msgid="5538901671131941043">"దీన్ని ఆఫ్ చేయడానికి, ఓవర్‌ఫ్లో మెనులో అధునాతనంకి వెళ్లండి."</string>
     <string name="wifi_scan_always_confirm_allow" msgid="5355973075896817232">"అనుమతించు"</string>
@@ -817,7 +833,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>
@@ -827,6 +843,7 @@
     <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_modify" msgid="6100248070440710782">"సవరించు"</string>
     <string name="wifi_failed_forget_message" msgid="1348172929201654986">"నెట్‌వర్క్‌ను ఉపేక్షించడంలో విఫలమైంది"</string>
     <string name="wifi_save" msgid="3331121567988522826">"సేవ్ చేయి"</string>
     <string name="wifi_failed_save_message" msgid="6650004874143815692">"నెట్‌వర్క్‌ను సేవ్ చేయడం విఫలమైంది"</string>
@@ -839,6 +856,7 @@
     <string name="wifi_advanced_titlebar" msgid="4485841401774142908">"అధునాతన 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_title" msgid="3471132676909349382">"నెట్‌వర్క్ సమాచారం"</string>
     <string name="wifi_details_subnet_mask" msgid="6720279144174924410">"సబ్‌నెట్ మాస్క్"</string>
     <string name="wifi_details_dns" msgid="8648826607751830768">"DNS"</string>
     <string name="wifi_details_ipv6_address_header" msgid="6734119149106422148">"IPv6 చిరునామాలు"</string>
@@ -858,7 +876,7 @@
     <string name="wifi_p2p_settings_title" msgid="5444461191435291082">"Wi‑Fi Direct"</string>
     <string name="wifi_p2p_device_info" msgid="3191876744469364173">"పరికర సమాచారం"</string>
     <string name="wifi_p2p_persist_network" msgid="1646424791818168590">"ఈ కనెక్షన్‌ను గుర్తుంచుకో"</string>
-    <string name="wifi_p2p_menu_search" msgid="3436429984738771974">"పరికరాల కోసం శోధించు"</string>
+    <string name="wifi_p2p_menu_search" msgid="3436429984738771974">"పరికరాల కోసం వెతుకు"</string>
     <string name="wifi_p2p_menu_searching" msgid="2396704492143633876">"శోధిస్తోంది..."</string>
     <string name="wifi_p2p_menu_rename" msgid="8448896306960060415">"పరికరం పేరు మార్చు"</string>
     <string name="wifi_p2p_peer_devices" msgid="299526878463303432">"పీర్ పరికరాలు"</string>
@@ -871,27 +889,25 @@
     <string name="wifi_p2p_cancel_connect_title" msgid="255267538099324413">"ఆహ్వానాన్ని రద్దు చేయాలా?"</string>
     <string name="wifi_p2p_cancel_connect_message" msgid="7477756213423749402">"మీరు <xliff:g id="PEER_NAME">%1$s</xliff:g>తో కనెక్ట్ కావాల్సిందిగా వచ్చిన ఆహ్వానాన్ని రద్దు చేయాలనుకుంటున్నారా?"</string>
     <string name="wifi_p2p_delete_group_message" msgid="834559380069647086">"ఈ సమూహాన్ని ఉపేక్షించాలా?"</string>
-    <string name="wifi_tether_checkbox_text" msgid="1847167643625779136">"పోర్టబుల్ Wi‑Fi హాట్‌స్పాట్"</string>
     <string name="wifi_hotspot_checkbox_text" msgid="7763495093333664887">"Wi‑Fi హాట్‌స్పాట్"</string>
     <string name="wifi_hotspot_off_subtext" msgid="5466126533609394170">"ఇంటర్నెట్ లేదా కంటెంట్‌ని ఇతర పరికరాలతో షేర్ చేయడం లేదు"</string>
     <string name="wifi_hotspot_tethering_on_subtext" product="tablet" msgid="5752490509369962007">"హాట్‌స్పాట్ ద్వారా ఈ టాబ్లెట్ యొక్క ఇంటర్నెట్ కనెక్షన్ షేర్ చేయబడుతోంది"</string>
     <string name="wifi_hotspot_tethering_on_subtext" product="default" msgid="6461075246164300670">"హాట్‌స్పాట్ ద్వారా ఈ ఫోన్ యొక్క ఇంటర్నెట్ కనెక్షన్ షేర్ చేయబడుతోంది"</string>
     <string name="wifi_hotspot_on_local_only_subtext" msgid="2068110388011294735">"యాప్ కంటెంట్‌ని షేర్ చేస్తోంది. ఇంటర్నెట్ కనెక్షన్‌ని షేర్ చేయాలంటే, హాట్‌స్పాట్‌ని ఆఫ్ చేసి, ఆన్ చేయండి"</string>
-    <string name="wifi_hotspot_name_title" msgid="1341735529132128887">"Wi‑Fi పేరు"</string>
+    <string name="wifi_hotspot_name_title" msgid="8237000746618636778">"హాట్‌స్పాట్ పేరు"</string>
     <string name="wifi_hotspot_name_summary_connecting" msgid="3378299995508671967">"<xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>ని ఆన్ చేస్తోంది..."</string>
     <string name="wifi_hotspot_name_summary_connected" msgid="3888672084861445362">"ఇతర పరికరాలు <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>కు కనెక్ట్ కావచ్చు"</string>
-    <string name="wifi_hotspot_password_title" msgid="1955592302902091281">"Wi-Fi పాస్‌వర్డ్"</string>
+    <string name="wifi_hotspot_password_title" msgid="8676859981917573801">"హాట్‌స్పాట్ పాస్‌వర్డ్‌"</string>
     <string name="wifi_hotspot_ap_band_title" msgid="1165801173359290681">"AP బ్యాండ్"</string>
     <string name="wifi_hotspot_footer_info_regular" msgid="1203489406068036455">"మీ ఇతర పరికరాల కోసం Wi-Fi నెట్‌వర్క్‌ని సృష్టించడానికి హాట్‌స్పాట్‌ని ఉపయోగించండి. హాట్‌స్పాట్ అనేది మీ మొబైల్ డేటా కనెక్షన్‌ని ఉపయోగించి ఇంటర్నెట్‌ని అందిస్తుంది. అదనపు మొబైల్ డేటా ఛార్జీలు చెల్లించాల్సి రావచ్చు."</string>
     <string name="wifi_hotspot_footer_info_local_only" msgid="857988412470694109">"యాప్‌లు సమీప పరికరాలతో కంటెంట్‌ని షేర్ చేయడం కోసం హాట్‌స్పాట్‌ని సృష్టించవచ్చు."</string>
     <string name="wifi_tether_starting" msgid="1322237938998639724">"హాట్‌స్పాట్‌ను ప్రారంభిస్తోంది…"</string>
     <string name="wifi_tether_stopping" msgid="4835852171686388107">"హాట్‌స్పాట్‌ను ఆపివేస్తోంది…"</string>
     <string name="wifi_tether_enabled_subtext" msgid="7842111748046063857">"<xliff:g id="NETWORK_SSID">%1$s</xliff:g> సక్రియంగా ఉంది"</string>
-    <string name="wifi_tether_failed_subtext" msgid="1484941858530919002">"పోర్టబుల్ Wi‑Fi హాట్‌స్పాట్ లోపం"</string>
+    <string name="wifi_tether_failed_subtext" msgid="1484941858530919002">"పోర్టబుల్ Wi‑Fi హాట్‌స్పాట్ ఎర్రర్"</string>
     <string name="wifi_tether_configure_ap_text" msgid="7974681394041609308">"Wi‑Fi హాట్‌స్పాట్‌ను సెటప్ చేయండి"</string>
     <string name="wifi_hotspot_configure_ap_text" msgid="5478614731464220432">"Wi‑Fi హాట్‌స్పాట్ సెటప్"</string>
     <string name="wifi_hotspot_configure_ap_text_summary" msgid="5560680057727007011">"AndroidAP WPA2 PSK హాట్‌స్పాట్"</string>
-    <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">"Android హాట్‌స్పాట్"</string>
     <string name="wifi_calling_settings_title" msgid="4102921303993404577">"Wi-Fi కాలింగ్"</string>
     <string name="wifi_calling_suggestion_title" msgid="9008010480466359578">"Wi-Fi కాలింగ్‌ను ఆన్ చేయండి"</string>
@@ -932,7 +948,7 @@
     <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="emergency_address_summary" msgid="3266760199681945746">"మీరు WiFiని ఉపయోగించి అత్యవసర కాల్ చేస్తే, అత్యవసర సేవలు మీ స్థానంగా వినియోగించే చిరునామా"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"ప్రదర్శన"</string>
     <string name="sound_settings" msgid="5534671337768745343">"ధ్వని"</string>
     <string name="all_volume_title" msgid="4296957391257836961">"వాల్యూమ్‌లు"</string>
@@ -983,9 +999,10 @@
     <string name="accessibility_category_personal" msgid="1263518850905945594">"వ్యక్తిగత ప్రొఫైల్ ఖాతాలు"</string>
     <string name="accessibility_work_account_title" msgid="1231830766637939527">"కార్యాలయ ఖాతా - <xliff:g id="MANAGED_BY">%s</xliff:g>"</string>
     <string name="accessibility_personal_account_title" msgid="2169071663029067826">"వ్యక్తిగత ఖాతా - <xliff:g id="MANAGED_BY">%s</xliff:g>"</string>
-    <string name="search_settings" msgid="1910951467596035063">"శోధించు"</string>
+    <string name="search_settings" msgid="1910951467596035063">"వెతుకు"</string>
     <string name="search_settings_summary" msgid="9205656546570654169">"శోధన సెట్టింగ్‌లను మరియు చరిత్రను నిర్వహించు"</string>
     <string name="search_settings_no_results" msgid="8799027492641230999">"ఫలితాలు లేవు"</string>
+    <string name="search_clear_history" msgid="4196658962573162457">"చరిత్రను తీసివేయి"</string>
     <string name="display_settings" msgid="7965901687241669598">"ప్రదర్శన"</string>
     <string name="accelerometer_title" msgid="7854608399547349157">"స్క్రీన్‌ను స్వయంచాలకంగా తిప్పు"</string>
     <string name="color_mode_title" msgid="3159275920408338215">"ప్రకాశవంతమైన రంగులు"</string>
@@ -1032,7 +1049,7 @@
     <string name="night_display_summary_on_auto_mode_never" msgid="9117830821363119835">"ఎప్పటికీ స్వయంచాలకంగా ఆఫ్ కాదు"</string>
     <string name="night_display_summary_on_auto_mode_custom" msgid="5510753572245577263">"<xliff:g id="ID_1">%1$s</xliff:g>కి స్వయంచాలకంగా ఆఫ్ అవుతుంది"</string>
     <string name="night_display_summary_on_auto_mode_twilight" msgid="852270120144683507">"సూర్యోదయ సమయానికి స్వయంచాలకంగా ఆఫ్ అవుతుంది"</string>
-    <string name="screen_timeout" msgid="4351334843529712571">"నిద్రావస్థ"</string>
+    <string name="screen_timeout" 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>
@@ -1056,15 +1073,13 @@
     <string name="automatic_brightness" msgid="5014143533884135461">"స్వయంచాలక ప్రకాశం"</string>
     <string name="lift_to_wake_title" msgid="4555378006856277635">"సక్రియం చేయడానికి వేళ్లను తీసివేయండి"</string>
     <string name="ambient_display_screen_title" msgid="4252755516328775766">"యాంబియంట్ డిస్‌ప్లే"</string>
-    <!-- no translation found for ambient_display_screen_summary_always_on (7337555569694794132) -->
-    <skip />
+    <string name="ambient_display_screen_summary_always_on" msgid="7337555569694794132">"ఎల్లప్పుడూ ఆన్‌లో ఉంచు / బ్యాటరీ వినియోగం పెరుగుతుంది"</string>
     <string name="ambient_display_screen_summary_notifications" msgid="1449570742600868654">"కొత్త నోటిఫికేషన్‌లు"</string>
     <string name="ambient_display_category_triggers" msgid="4359289754456268573">"ఎప్పుడు చూపాలి"</string>
     <string name="doze_title" msgid="2375510714460456687">"కొత్త నోటిఫికేషన్‌లు"</string>
     <string name="doze_summary" msgid="3846219936142814032">"మీరు నోటిఫికేషన్‌లను స్వీకరించినప్పుడు స్క్రీన్‌ను సక్రియం చేస్తుంది"</string>
     <string name="doze_always_on_title" msgid="1046222370442629646">"ఎల్లప్పుడూ ఆన్‌లో ఉంచు"</string>
-    <!-- no translation found for doze_always_on_summary (6978257596231155345) -->
-    <skip />
+    <string name="doze_always_on_summary" msgid="6978257596231155345">"ప్రదర్శన సమయం, నోటిఫికేషన్ చిహ్నాలు మరియు ఇతర సమాచారం. బ్యాటరీ వినియోగం పెరుగుతుంది."</string>
     <string name="title_font_size" msgid="4405544325522105222">"ఫాంట్ పరిమాణం"</string>
     <string name="short_summary_font_size" msgid="6819778801232989076">"వచనాన్ని పెద్దదిగా లేదా చిన్నదిగా చేస్తుంది"</string>
     <string name="sim_lock_settings" msgid="3392331196873564292">"సిమ్ కార్డు లాక్ సెట్టింగ్‌లు"</string>
@@ -1098,26 +1113,25 @@
     <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>
     <string name="device_info_settings" product="default" msgid="475872867864762157">"ఫోన్ స్థితి"</string>
-    <string name="system_update_settings_list_item_title" msgid="3342887311059985961">"సిస్టమ్ నవీకరణలు"</string>
+    <string name="system_update_settings_list_item_title" msgid="3342887311059985961">"సిస్టమ్ అప్‌డేట్‌లు"</string>
     <string name="system_update_settings_list_item_summary" msgid="3853057315907710747"></string>
-    <string name="firmware_version" msgid="4801135784886859972">"Android సంస్కరణ"</string>
+    <string name="firmware_version" msgid="4801135784886859972">"Android వెర్షన్"</string>
     <string name="security_patch" msgid="8438384045870296634">"Android భద్రతా అతికింపు స్థాయి"</string>
     <string name="model_info" msgid="1952009518045740889">"మోడల్"</string>
     <string name="hardware_info" msgid="2605080746512527805">"మోడల్ &amp; హార్డ్‌వేర్"</string>
-    <string name="hardware_revision" msgid="8893547686367095527">"హార్డ్‌వేర్ సంస్కరణ"</string>
+    <string name="hardware_revision" msgid="8893547686367095527">"హార్డ్‌వేర్ వెర్షన్"</string>
     <string name="fcc_equipment_id" msgid="149114368246356737">"ఉపకరణం ID"</string>
-    <string name="baseband_version" msgid="1848990160763524801">"బేస్‌బ్యాండ్ సంస్కరణ"</string>
-    <string name="kernel_version" msgid="9192574954196167602">"కెర్నల్ సంస్కరణ"</string>
+    <string name="baseband_version" msgid="1848990160763524801">"బేస్‌బ్యాండ్ వెర్షన్"</string>
+    <string name="kernel_version" msgid="9192574954196167602">"కెర్నల్ వెర్షన్"</string>
     <string name="build_number" msgid="3075795840572241758">"బిల్డ్ సంఖ్య"</string>
-    <string name="selinux_status" msgid="6212165375172061672">"SELinux స్థితి"</string>
     <string name="device_info_not_available" msgid="8062521887156825182">"అందుబాటులో లేదు"</string>
     <string name="device_status_activity_title" msgid="1411201799384697904">"స్థితి"</string>
     <string name="device_status" msgid="607405385799807324">"స్థితి"</string>
@@ -1132,7 +1146,7 @@
     <string name="status_number" product="default" msgid="5123197324870153205">"నా ఫోన్ నంబర్"</string>
     <string name="status_min_number" msgid="3519504522179420597">"MIN"</string>
     <string name="status_msid_number" msgid="909010114445780530">"MSID"</string>
-    <string name="status_prl_version" msgid="1007470446618081441">"PRL సంస్కరణ"</string>
+    <string name="status_prl_version" msgid="1007470446618081441">"PRL వెర్షన్"</string>
     <string name="status_meid_number" msgid="1751442889111731088">"MEID"</string>
     <string name="status_icc_id" msgid="943368755577172747">"ICCID"</string>
     <string name="status_network_type" msgid="3279383550222116235">"మొబైల్ నెట్‌వర్క్ రకం"</string>
@@ -1145,7 +1159,6 @@
     <string name="status_wifi_mac_address" msgid="2202206684020765378">"Wi‑Fi MAC చిరునామా"</string>
     <string name="status_bt_address" msgid="4195174192087439720">"బ్లూటూత్ చిరునామా"</string>
     <string name="status_serial_number" msgid="2257111183374628137">"క్రమ సంఖ్య"</string>
-    <string name="status_unavailable" msgid="7862009036663793314">"అందుబాటులో లేదు"</string>
     <string name="status_up_time" msgid="7294859476816760399">"గడిచిన సమయం"</string>
     <string name="status_awake_time" msgid="2393949909051183652">"మేల్కొని ఉన్న సమయం"</string>
     <string name="internal_memory" msgid="9129595691484260784">"అంతర్గత నిల్వ"</string>
@@ -1235,7 +1248,7 @@
     <string name="storage_internal_forget_details" msgid="9028875424669047327">"ఈ <xliff:g id="NAME">^1</xliff:g> కలిగి ఉన్న అనువర్తనాలు, ఫోటోలు లేదా డేటాను ఉపయోగించడానికి, దాన్ని మళ్లీ చొప్పించండి. \n\nపరికరం అందుబాటులో లేకపోతే ప్రత్యామ్నాయంగా మీరు ఈ నిల్వను విస్మరించేలా ఎంచుకోవచ్చు. \n\nమీరు విస్మరించాలని ఎంచుకుంటే, పరికరంలో ఉన్న మొత్తం డేటాను శాశ్వతంగా కోల్పోతారు. \n\nమీరు తర్వాత అనువర్తనాలను మళ్లీ ఇన్‌స్టాల్ చేయవచ్చు, కానీ ఈ పరికరంలో నిల్వ చేసిన వాటి డేటాను కోల్పోతారు."</string>
     <string name="storage_internal_forget_confirm_title" msgid="1370847944388479245">"<xliff:g id="NAME">^1</xliff:g>ని విస్మరించాలా?"</string>
     <string name="storage_internal_forget_confirm" msgid="1148446041396902905">"ఈ <xliff:g id="NAME">^1</xliff:g>లో నిల్వ చేయబడిన అన్ని అనువర్తనాలు, ఫోటోలు మరియు డేటాను శాశ్వతంగా కోల్పోతారు."</string>
-    <string name="storage_detail_apps" msgid="6141154016753507490">"అనువర్తనాలు"</string>
+    <string name="storage_detail_apps" msgid="6141154016753507490">"యాప్‌లు"</string>
     <string name="storage_detail_images" msgid="6950678857740634769">"చిత్రాలు"</string>
     <string name="storage_detail_videos" msgid="2919743464827110953">"వీడియోలు"</string>
     <string name="storage_detail_audio" msgid="1197685141676483213">"ఆడియో"</string>
@@ -1244,7 +1257,7 @@
     <string name="storage_detail_system" msgid="4629506366064709687">"సిస్టమ్"</string>
     <string name="storage_detail_explore" msgid="7911344011431568294">"<xliff:g id="NAME">^1</xliff:g>ని అన్వేషించండి"</string>
     <string name="storage_detail_dialog_other" msgid="8907101974576694793">"ఇతరంలో అనువర్తనాల ద్వారా సేవ్ చేయబడిన భాగస్వామ్య ఫైల్‌లు, ఇంటర్నెట్ లేదా బ్లూటూత్ నుండి డౌన్‌లోడ్ చేసిన ఫైల్‌లు, Android ఫైల్‌లు మొదలైనవి ఉంటాయి. \n\nఈ <xliff:g id="NAME">^1</xliff:g> మొత్తం కంటెంట్‌లను చూడటానికి, విశ్లేషించు నొక్కండి."</string>
-    <string name="storage_detail_dialog_system" msgid="862835644848361569">"సిస్టమ్‌లో Android సంస్కరణ <xliff:g id="VERSION">%s</xliff:g>ని అమలు చేయడానికి అవసరమైన ఫైల్‌లు ఉంటాయి"</string>
+    <string name="storage_detail_dialog_system" msgid="862835644848361569">"సిస్టమ్‌లో Android వెర్షన్ <xliff:g id="VERSION">%s</xliff:g>ని అమలు చేయడానికి అవసరమైన ఫైల్‌లు ఉంటాయి"</string>
     <string name="storage_detail_dialog_user" msgid="3267254783294197804">"<xliff:g id="USER_0">^1</xliff:g> <xliff:g id="SIZE">^2</xliff:g> నిల్వను ఉపయోగించి ఫోటోలు, సంగీతం, అనువర్తనాలు లేదా ఇతర డేటాని సేవ్ చేసి ఉండవచ్చు. \n\nవివరాలు వీక్షించాలంటే, <xliff:g id="USER_1">^1</xliff:g>కు మారండి."</string>
     <string name="storage_wizard_init_title" msgid="5085400514028585772">"మీ <xliff:g id="NAME">^1</xliff:g> సెటప్ చేయండి"</string>
     <string name="storage_wizard_init_external_title" msgid="4867326438945303598">"పోర్టబుల్ నిల్వగా ఉపయోగించు"</string>
@@ -1273,13 +1286,13 @@
     <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>
     <string name="battery_level_title" msgid="2965679202786873272">"బ్యాటరీ స్థాయి"</string>
     <string name="apn_settings" msgid="3743170484827528406">"APNలు"</string>
-    <string name="apn_edit" msgid="1354715499708424718">"ప్రాప్యత స్థానాన్ని సవరించండి"</string>
+    <string name="apn_edit" msgid="1354715499708424718">"యాక్సెస్ స్థానాన్ని సవరించండి"</string>
     <string name="apn_not_set" msgid="4974192007399968164">"సెట్ చేయలేదు"</string>
     <string name="apn_name" msgid="4115580098369824123">"పేరు"</string>
     <string name="apn_apn" msgid="2479425126733513353">"APN"</string>
@@ -1321,6 +1334,7 @@
     <string name="menu_restore" msgid="8260067415075573273">"డిఫాల్ట్‌కు రీసెట్ చేయి"</string>
     <string name="restore_default_apn_completed" msgid="2824775307377604897">"డిఫాల్ట్ APN సెట్టింగ్‌లను రీసెట్ చేయడం పూర్తయింది."</string>
     <string name="reset_dashboard_title" msgid="6254873816990678620">"రీసెట్ ఎంపికలు"</string>
+    <string name="reset_dashboard_summary" msgid="4851012632493522755">"నెట్‌వర్క్, యాప్‌లు లేదా పరికరాన్ని రీసెట్ చేయవచ్చు"</string>
     <string name="reset_network_title" msgid="6166025966016873843">"Wi-Fi, మొబైల్ &amp; బ్లూటూత్‌ని రీసెట్ చేయండి"</string>
     <string name="reset_network_desc" msgid="5547979398298881406">"ఇది అన్ని నెట్‌వర్క్ సెట్టింగ్‌లను రీసెట్ చేస్తుంది, వీటితో సహా:\n\n"<li>"Wi‑Fi"</li>\n<li>"మొబైల్ డేటా"</li>\n<li>"బ్లూటూత్"</li></string>
     <string name="reset_network_button_text" msgid="2035676527471089853">"సెట్టింగ్‌లను రీసెట్ చేయి"</string>
@@ -1329,17 +1343,14 @@
     <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="6617679904229218425">"మొత్తం డేటాను తొలగించండి (ఫ్యాక్టరీ రీసెట్)"</string>
-    <plurals name="master_clear_with_account_summary" formatted="false" msgid="5911377203778818712">
-      <item quantity="other"><xliff:g id="ACCOUNT_COUNT">%1$d</xliff:g> ఖాతాలు రీసెట్ చేయబడతాయి</item>
-      <item quantity="one">1 ఖాతా రీసెట్ చేయబడుతుంది</item>
-    </plurals>
-    <string name="master_clear_summary" msgid="6902443944660426951">"అంతర్గత నిల్వను &amp; మొత్తం డేటాని రీసెట్ చేస్తుంది"</string>
+    <string name="master_clear_title" msgid="3531267871084279512">"మొత్తం డేటాను తొలగించండి (ఫ్యాక్టరీ రీసెట్)"</string>
     <string name="master_clear_desc" product="tablet" msgid="9146059417023157222">"ఇందువలన మీ టాబ్లెట్ యొక్క "<b>"అంతర్గత నిల్వ"</b>" నుండి వీటితో సహా, మొత్తం డేటా ఎరేజ్ చేయబడుతుంది:\n\n"<li>"మీ Google ఖాతా"</li>\n<li>"సిస్టమ్ మరియు అనువర్తన డేటా మరియు సెట్టింగ్‌లు"</li>\n<li>"డౌన్‌లోడ్ చేయబడిన అనువర్తనాలు"</li></string>
-    <string name="master_clear_desc" product="default" msgid="4800386183314202571">"ఇందువలన మీ ఫోన్ "<b>"అంతర్గత నిల్వ"</b>" నుండి వీటితో సహా మొత్తం డేటా ఎరేజ్ చేయబడుతుంది:\n\n"<li>"Google ఖాతా"</li>\n<li>"సిస్టమ్ మరియు అనువర్తన డేటా మరియు సెట్టింగ్‌లు"</li>\n<li>"డౌన్‌లోడ్ చేయబడిన అనువర్తనాలు"</li></string>
+    <string name="master_clear_desc" product="default" msgid="4800386183314202571">"ఇందువలన మీ ఫోన్ "<b>"అంతర్గత నిల్వ"</b>" నుండి వీటితో సహా మొత్తం డేటా ఎరేజ్ చేయబడుతుంది:\n\n"<li>"Google ఖాతా"</li>\n<li>"సిస్టమ్ మరియు యాప్ డేటా మరియు సెట్టింగ్‌లు"</li>\n<li>"డౌన్‌లోడ్ చేయబడిన యాప్‌లు"</li></string>
     <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"మీరు ప్రస్తుతం క్రింది ఖాతాలకు సైన్ ఇన్ చేసారు:\n"</string>
     <string name="master_clear_other_users_present" product="default" msgid="5161423070702470742">\n\n"ఈ పరికరంలో ఇతర వినియోగదారులు ఉన్నారు.\n"</string>
     <string name="master_clear_desc_also_erases_external" msgid="1903185203791274237"><li>"సంగీతం"</li>\n<li>"ఫోటోలు"</li>\n<li>"ఇతర వినియోగదారు డేటా"</li></string>
+    <string name="master_clear_desc_also_erases_esim" msgid="312352697653096008"><li>"eSIMలో క్యారియర్‌లు"</li></string>
+    <string name="master_clear_desc_no_cancel_mobile_plan" msgid="5460926449093211144">\n\n"ఇది మొబైల్ సేవా ప్లాన్‌ని రద్దు చేయదు."</string>
     <string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="7744115866662613411">\n\n"సంగీతం, చిత్రాలు మరియు ఇతర వినియోగదారు డేటాను క్లియర్ చేయడానికి, "<b>"USB నిల్వ"</b>"ను ఎరేజ్ చేయాల్సి ఉంటుంది."</string>
     <string name="master_clear_desc_erase_external_storage" product="default" msgid="4801026652617377093">\n\n"సంగీతం, చిత్రాలు మరియు ఇతర వినియోగదారు డేటాను క్లియర్ చేయడానికి, "<b>"SD కార్డు"</b>"ను ఎరేజ్ చేయాల్సి ఉంటుంది."</string>
     <string name="erase_external_storage" product="nosdcard" msgid="969364037450286809">"USB నిల్వను ఎరేజ్ చేయి"</string>
@@ -1365,9 +1376,9 @@
     <string name="tether_settings_title_bluetooth" msgid="355855408317564420">"బ్లూటూత్ టీథరింగ్"</string>
     <string name="tether_settings_title_usb_bluetooth" msgid="5355828977109785001">"టీథరింగ్"</string>
     <string name="tether_settings_title_all" msgid="3058586928118801157">"హాట్‌స్పాట్ &amp; టీథరింగ్"</string>
-    <string name="tether_settings_summary_hotspot_on_tether_on" msgid="930464462687425777">"హాట్‌స్పాట్ ఆన్, టీథెరింగ్"</string>
+    <string name="tether_settings_summary_hotspot_on_tether_on" msgid="930464462687425777">"హాట్‌స్పాట్ ఆన్, టెథెరింగ్"</string>
     <string name="tether_settings_summary_hotspot_on_tether_off" msgid="3473671453891735907">"హాట్‌స్పాట్ ఆన్"</string>
-    <string name="tether_settings_summary_hotspot_off_tether_on" msgid="1618256180720077354">"టీథెరింగ్"</string>
+    <string name="tether_settings_summary_hotspot_off_tether_on" msgid="1618256180720077354">"టెథెరింగ్"</string>
     <string name="tether_settings_disabled_on_data_saver" msgid="1576908608463904152">"డేటా సేవర్ ఆన్‌లో ఉన్నప్పుడు టీథర్ చేయలేరు లేదా పోర్టబుల్ హాట్‌స్పాట్‌లను ఉపయోగించలేరు"</string>
     <string name="usb_title" msgid="7483344855356312510">"USB"</string>
     <string name="usb_tethering_button_text" msgid="585829947108007917">"USB టీథరింగ్"</string>
@@ -1383,7 +1394,7 @@
     <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>
@@ -1399,7 +1410,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>
@@ -1429,7 +1440,7 @@
     <string name="assisted_gps_disabled" msgid="6982698333968010748">"GPSకి సహాయంగా సర్వర్‌ను ఉపయోగించు (GPS పనితీరుని మెరుగుపరచడానికి ఎంపిక తీసియండి)"</string>
     <string name="use_location_title" msgid="5206937465504979977">"స్థానం &amp; Google శోధన"</string>
     <string name="use_location_summary" msgid="3978805802386162520">"శోధన ఫలితాలు మరియు ఇతర సేవలను మెరుగుపరచడం కోసం మీ స్థానాన్ని ఉపయోగించడానికి Googleని అనుమతించండి"</string>
-    <string name="location_access_title" msgid="7064108942964081243">"నా స్థానానికి ప్రాప్యత"</string>
+    <string name="location_access_title" msgid="7064108942964081243">"నా స్థానానికి యాక్సెస్"</string>
     <string name="location_access_summary" msgid="69031404093194341">"మీ స్థాన సమాచారాన్ని ఉపయోగించడానికి మీ అనుమతిని అడిగిన అనువర్తనాలను అనుమతించండి"</string>
     <string name="location_sources_heading" msgid="1278732419851088319">"స్థానం మూలాలు"</string>
     <string name="about_settings" product="tablet" msgid="593457295516533765">"టాబ్లెట్ పరిచయం"</string>
@@ -1456,42 +1467,43 @@
     <string name="settings_safetylegal_activity_title" msgid="6901214628496951727">"భద్రతా సమాచారం"</string>
     <string name="settings_safetylegal_activity_unreachable" msgid="250674109915859456">"మీకు డేటా కనెక్షన్ లేదు. ఈ సమాచారాన్ని ఇప్పుడే వీక్షించడానికి, ఇంటర్నెట్ కనెక్షన్ సౌకర్యం ఉన్న ఏదైనా కంప్యూటర్ నుండి %sకి వెళ్లండి."</string>
     <string name="settings_safetylegal_activity_loading" msgid="8059022597639516348">"లోడ్ చేస్తోంది…"</string>
-    <string name="lockpassword_choose_your_password_header" msgid="8624900666929394990">"మీ పాస్‌వర్డ్‌ను ఎంచుకోండి"</string>
-    <string name="lockpassword_choose_your_password_header_for_fingerprint" msgid="6624409510609085450">"వేలిముద్రను ఉపయోగించడానికి, పాస్‌వర్డ్‌ని సెట్ చేయండి"</string>
-    <string name="lockpassword_choose_your_pattern_header" msgid="6949761069941694050">"మీ నమూనాను ఎంచుకోండి"</string>
-    <string name="lockpassword_choose_your_pattern_header_for_fingerprint" msgid="5901096361617543819">"వేలిముద్రను ఉపయోగించడానికి, నమూనాని సెట్ చేయండి"</string>
-    <string name="lockpassword_choose_your_pin_header" msgid="7598849519816138302">"మీ పిన్‌ను ఎంచుకోండి"</string>
-    <string name="lockpassword_choose_your_pin_header_for_fingerprint" msgid="765344692615917183">"వేలిముద్రను ఉపయోగించడానికి, PINని సెట్ చేయండి"</string>
-    <string name="lockpassword_confirm_your_password_header" msgid="6308478184889846633">"మీ పాస్‌వర్డ్‌ను నిర్ధారించండి"</string>
+    <string name="lockpassword_choose_your_screen_lock_header" msgid="3872462096767152394">"స్క్రీన్ లాక్‌ను సెట్ చేయండి"</string>
+    <string name="lockpassword_choose_your_password_message" msgid="1197569283524841412">"భద్రత కోసం, పాస్‌వర్డ్‌ను సెట్ చేయండి"</string>
+    <string name="lockpassword_choose_your_password_header_for_fingerprint" msgid="2541818487015343503">"వేలిముద్రను ఉపయోగించడానికి, పాస్‌వర్డ్‌ను సెట్ చేయండి"</string>
+    <string name="lockpassword_choose_your_pattern_header_for_fingerprint" msgid="7709785406243556723">"వేలిముద్రను ఉపయోగించడానికి, ఆకృతి సెట్ చేయండి"</string>
+    <string name="lockpassword_choose_your_pin_message" msgid="1875420718677275646">"భద్రత కోసం, పిన్‌ను సెట్ చేయండి"</string>
+    <string name="lockpassword_choose_your_pin_header_for_fingerprint" msgid="1549639053195796674">"వేలిముద్రను ఉపయోగించడానికి, PINగా సెట్ చేయండి"</string>
+    <string name="lockpassword_choose_your_pattern_message" msgid="5986983400689720015">"భద్రత కోసం, నమూనాను సెట్ చేయండి"</string>
+    <string name="lockpassword_confirm_your_password_header" msgid="1266027268220850931">"మీ పాస్‌వర్డ్‌ను మళ్ళీ నమోదు చేయండి"</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="7744513791910572550">"మీ పిన్‌ను మళ్లీ నమోదు చేయండి"</string>
     <string name="lockpassword_confirm_passwords_dont_match" msgid="5140892109439191415">"పాస్‌‌వర్డ్‌లు సరిపోలలేదు"</string>
     <string name="lockpassword_confirm_pins_dont_match" msgid="7226244811505606217">"పిన్‌లు సరిపోలలేదు"</string>
     <string name="lockpassword_choose_lock_generic_header" msgid="3811438094903786145">"అన్‌లాక్ ఎంపిక"</string>
     <string name="lockpassword_password_set_toast" msgid="4875050283108629383">"పాస్‌వర్డ్ సెట్ చేయబడింది"</string>
     <string name="lockpassword_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>
-    <!-- no translation found for lockpassword_strong_auth_required_device_pattern (530802132223800623) -->
-    <skip />
-    <!-- no translation found for lockpassword_strong_auth_required_device_pin (7829294830078036417) -->
-    <skip />
-    <!-- no translation found for lockpassword_strong_auth_required_device_password (3552644641574796973) -->
-    <skip />
-    <!-- no translation found for lockpassword_strong_auth_required_work_pattern (3003781907040522053) -->
-    <skip />
-    <!-- no translation found for lockpassword_strong_auth_required_work_pin (3367491332598821552) -->
-    <skip />
-    <!-- no translation found for lockpassword_strong_auth_required_work_password (8159775129968582940) -->
-    <skip />
+    <string name="lockpassword_strong_auth_required_device_pattern" msgid="530802132223800623">"అదనపు భద్రత కోసం, మీ పరికరం నమూనాను ఉపయోగించండి"</string>
+    <string name="lockpassword_strong_auth_required_device_pin" msgid="7829294830078036417">"అదనపు భద్రత కోసం, మీ డివైజ్ పిన్‌ను నమోదు చేయండి"</string>
+    <string name="lockpassword_strong_auth_required_device_password" msgid="3552644641574796973">"అదనపు భద్రత కోసం, మీ పరికరం పాస్‌వర్డ్‌ను నమోదు చేయండి"</string>
+    <string name="lockpassword_strong_auth_required_work_pattern" msgid="3003781907040522053">"అదనపు భద్రత కోసం, మీ కార్యాలయ నమూనాను ఉపయోగించండి"</string>
+    <string name="lockpassword_strong_auth_required_work_pin" msgid="3367491332598821552">"అదనపు భద్రత కోసం, మీ కార్యాలయ పిన్‌ను నమోదు చేయండి"</string>
+    <string name="lockpassword_strong_auth_required_work_password" msgid="8159775129968582940">"అదనపు భద్రత కోసం, మీ కార్యాలయ పాస్‌వర్డ్‌ను నమోదు చేయండి"</string>
+    <string name="lockpassword_confirm_your_pattern_details_frp" msgid="6757336656791723193">"మీ ఫోన్ ఫ్యాక్టరీ సెట్టింగ్‌లకు రీసెట్ అయింది. ఈ ఫోన్‌ని ఉపయోగించాలంటే, మీ గత నమూనాను నమోదు చేయండి."</string>
+    <string name="lockpassword_confirm_your_pin_details_frp" msgid="826520613445990470">"మీ ఫోన్ ఫ్యాక్టరీ సెట్టింగ్‌లకు రీసెట్ అయింది. ఈ ఫోన్‌ని ఉపయోగించాలంటే, మీ గత పిన్‌ని నమోదు చేయండి."</string>
+    <string name="lockpassword_confirm_your_password_details_frp" msgid="8944081074615739040">"మీ ఫోన్ ఫ్యాక్టరీ సెట్టింగ్‌లకు రీసెట్ అయింది. ఈ ఫోన్‌ని ఉపయోగించాలంటే, మీ గత పాస్‌వర్డ్ నమోదు చేయండి."</string>
+    <string name="lockpassword_confirm_your_pattern_header_frp" msgid="2898036091609128286">"నమూనాను ధృవీకరించండి"</string>
+    <string name="lockpassword_confirm_your_pin_header_frp" msgid="4141601774778898803">"పిన్‌ని ధృవీకరించండి"</string>
+    <string name="lockpassword_confirm_your_password_header_frp" msgid="3762615419295360480">"పాస్‌వర్డ్‌ని ధృవీకరించండి"</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>
@@ -1499,15 +1511,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>
@@ -1518,7 +1530,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>
@@ -1530,20 +1542,19 @@
     <string name="lock_settings_profile_unification_dialog_uncompliant_confirm" msgid="5943758576756482777">"ఒకే లాక్‌ని ఉపయోగించండి"</string>
     <string name="lock_settings_profile_unified_summary" msgid="9008819078132993492">"పరికర స్క్రీన్ లాక్ లాంటిది"</string>
     <string name="manageapplications_settings_title" msgid="7041951105633616745">"అనువర్తనాలను నిర్వహించు"</string>
-    <string name="manageapplications_settings_summary" msgid="1794401500935451259">"ఇన్‌స్టాల్ చేయబడిన అనువర్తనాలను నిర్వహించు మరియు తీసివేయి"</string>
-    <string name="applications_settings" msgid="5281808652705396152">"అనువర్తన సమాచారం"</string>
+    <string name="manageapplications_settings_summary" msgid="1794401500935451259">"ఇన్‌స్టాల్ చేయబడిన యాప్‌లను నిర్వహించండి మరియు తీసివేయండి"</string>
+    <string name="applications_settings" msgid="5281808652705396152">"యాప్ సమాచారం"</string>
     <string name="applications_settings_summary" msgid="6683465446264515367">"అనువర్తనాలను నిర్వహించండి, శీఘ్ర ప్రారంభ సత్వరమార్గాలను సెటప్ చేయండి"</string>
     <string name="applications_settings_header" msgid="1014813055054356646">"అనువర్తన సెట్టింగ్‌లు"</string>
     <string name="install_applications" msgid="4872012136210802181">"తెలియని మూలాలు"</string>
     <string name="install_applications_title" msgid="4987712352256508946">"అన్ని అనువ. మూలాలను అనుమతించు"</string>
     <string name="recent_app_category_title" msgid="6673071268966003928">"ఇటీవల తెరిచిన యాప్‌లు"</string>
     <string name="see_all_apps_title" msgid="1317153498074308438">"మొత్తం <xliff:g id="COUNT">%1$d</xliff:g> అనువర్తనాలను చూడండి"</string>
-    <string name="recent_app_summary" msgid="3366446669844932300">"<xliff:g id="TIME">^1</xliff:g> క్రితం"</string>
     <string name="install_all_warning" product="tablet" msgid="8310489909586138165">"మీ టాబ్లెట్ మరియు వ్యక్తిగత డేటా తెలియని మూలాల్లోని అనువర్తనాల ద్వారా దాడికి గురి కావడానికి ఎక్కువ అవకాశం ఉంటుంది. ఈ మూలం నుండి అనువర్తనాలను ఇన్‌స్టాల్ చేయడం ద్వారా, ఈ అనువర్తనాలను ఉపయోగించడం ద్వారా మీ టాబ్లెట్‌కు సంభవించే ఏదైనా నష్టానికి లేదా కోల్పోయే డేటాకి బాధ్యత వహించడానికి మీరు అంగీకరిస్తున్నారు."</string>
     <string name="install_all_warning" product="default" msgid="1952257127370115988">"మీ ఫోన్ మరియు వ్యక్తిగత డేటా తెలియని మూలాల్లోని అనువర్తనాల ద్వారా దాడికి గురి కావడానికి ఎక్కువ అవకాశం ఉంటుంది. ఈ మూలం నుండి అనువర్తనాలను ఇన్‌స్టాల్ చేయడం ద్వారా, ఈ అనువర్తనాలను ఉపయోగించడం వలన మీ ఫోన్‌కు సంభవించే ఏదైనా నష్టానికి లేదా కోల్పోయే డేటాకి బాధ్యత వహించడానికి మీరు అంగీకరిస్తున్నారు."</string>
     <string name="advanced_settings" msgid="1777249286757067969">"అధునాతన సెట్టింగ్‌లు"</string>
     <string name="advanced_settings_summary" msgid="4016682978071086747">"మరిన్ని సెట్టింగ్‌ల ఎంపికలను ప్రారంభించు"</string>
-    <string name="application_info_label" msgid="5736524913065714880">"అనువర్తన సమాచారం"</string>
+    <string name="application_info_label" msgid="5736524913065714880">"యాప్ సమాచారం"</string>
     <string name="storage_label" msgid="8700867073480107253">"నిల్వ"</string>
     <string name="auto_launch_label" msgid="2669236885531442195">"డిఫాల్ట్‌గా తెరువు"</string>
     <string name="auto_launch_label_generic" msgid="3230569852551968694">"డిఫాల్ట్‌లు"</string>
@@ -1556,12 +1567,12 @@
       <item quantity="other">%d అంశాలు</item>
       <item quantity="one">1 అంశం</item>
     </plurals>
-    <string name="clear_uri_btn_text" msgid="8575655132961012158">"ప్రాప్యతను తీసివేయి"</string>
+    <string name="clear_uri_btn_text" msgid="8575655132961012158">"యాక్సెస్‌ను తీసివేయి"</string>
     <string name="controls_label" msgid="7611113077086853799">"నియంత్రణలు"</string>
-    <string name="force_stop" msgid="7435006169872876756">"నిర్బంధ ఆపివేత"</string>
+    <string name="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>
@@ -1571,28 +1582,28 @@
     <string name="disable_text" msgid="6544054052049395202">"నిలిపివేయి"</string>
     <string name="enable_text" msgid="9217362512327828987">"ప్రారంభించు"</string>
     <string name="clear_user_data_text" msgid="5597622864770098388">"డేటాను క్లియర్ చేయి"</string>
-    <string name="app_factory_reset" msgid="6635744722502563022">"నవీకరణలను అన్‌ఇన్‌స్టాల్ చేయండి"</string>
+    <string name="app_factory_reset" msgid="6635744722502563022">"అప్‌డేట్‌లను అన్‌ఇన్‌స్టాల్ చేయండి"</string>
     <string name="auto_launch_enable_text" msgid="4275746249511874845">"మీరు కొన్ని చర్యల కోసం ఈ అనువర్తనాన్ని డిఫాల్ట్‌గా ప్రారంభించడానికి ఎంచుకున్నారు."</string>
-    <string name="always_allow_bind_appwidgets_text" msgid="566822577792032925">"మీరు విడ్జెట్‌లను సృష్టించడానికి మరియు వాటి డేటాను ప్రాప్యత చేయడానికి ఈ అనువర్తనాన్ని అనుమతించడాన్ని ఎంచుకున్నారు."</string>
+    <string name="always_allow_bind_appwidgets_text" msgid="566822577792032925">"మీరు విడ్జెట్‌లను సృష్టించడానికి మరియు వాటి డేటాను యాక్సెస్ చేయడానికి ఈ యాప్‌ను ఎంచుకున్నారు."</string>
     <string name="auto_launch_disable_text" msgid="7800385822185540166">"డిఫాల్ట్‌లు సెట్ చేయబడలేదు."</string>
     <string name="clear_activities" msgid="7408923511535174430">"డిఫాల్ట్‌లను క్లియర్ చేయి"</string>
-    <string name="screen_compatibility_text" msgid="1616155457673106022">"ఈ అనువర్తనం మీ స్క్రీన్ కోసం రూపొందించబడి ఉండకపోవచ్చు. మీరు దీన్ని మీ స్క్రీన్‌కు ఎలా సర్దుబాటు చేయాలనేదాన్ని ఇక్కడ నియంత్రించవచ్చు."</string>
+    <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="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="default_emergency_app" msgid="1951760659640369980">"అత్యవసర యాప్"</string>
+    <string name="reset_app_preferences" msgid="1321050641018356925">"యాప్ ప్రాధాన్యతలను రీసెట్ చేయి"</string>
+    <string name="reset_app_preferences_title" msgid="6093179367325336662">"యాప్ ప్రాధాన్యతలను రీసెట్ చేయాలా?"</string>
+    <string name="reset_app_preferences_desc" msgid="4822447731869201512">"ఇది వీటి కోసం అన్ని ప్రాధాన్యతలను రీసెట్ చేస్తుంది:\n\n "<li>"నిలిపివేయబడిన యాప్‌లు"</li>\n" "<li>"నిలిపివేయబడిన యాప్ నోటిఫికేషన్‌లు"</li>\n" "<li>"చర్యల కోసం డిఫాల్ట్ యాప్‌లు"</li>\n" "<li>"యాప్‌ల కోసం నేపథ్య డేటా పరిమితులు"</li>\n" "<li>"ఏవైనా అనుమతి పరిమితులు"</li>\n\n" మీరు యాప్‌ డేటాను కోల్పోరు."</string>
     <string name="reset_app_preferences_button" msgid="2559089511841281242">"అనువర్తనాలను రీసెట్ చేయి"</string>
     <string name="manage_space_text" msgid="8852711522447794676">"నిల్వ ఖాళీని నిర్వహించు"</string>
     <string name="filter" msgid="2018011724373033887">"ఫిల్టర్ చేయి"</string>
     <string name="filter_dlg_title" msgid="8693024463731076091">"ఫిల్టర్ ఎంపికలను ఎంచుకోండి"</string>
-    <string name="filter_apps_all" msgid="8899612398848280352">"అన్ని అనువర్తనాలు"</string>
+    <string name="filter_apps_all" msgid="8899612398848280352">"అన్ని యాప్‌లు"</string>
     <string name="filter_apps_disabled" msgid="5862632369555319938">"నిలిపివేయబడిన అనువర్తనాలు"</string>
     <string name="filter_apps_third_party" msgid="7786348047690140979">"డౌన్‌లోడ్ చేయబడినవి"</string>
     <string name="filter_apps_running" msgid="7767071454371350486">"అమలయ్యేవి"</string>
@@ -1611,25 +1622,25 @@
     <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>
     <string name="empty_list_msg" msgid="3552095537348807772">"మీరు ఇన్‌స్టాల్ చేయబడిన మూడవ-పక్ష అనువర్తనాలు ఏవీ కలిగి లేరు."</string>
-    <string name="version_text" msgid="9189073826278676425">"సంస్కరణ <xliff:g id="VERSION_NUM">%1$s</xliff:g>"</string>
+    <string name="version_text" msgid="9189073826278676425">"వెర్షన్ <xliff:g id="VERSION_NUM">%1$s</xliff:g>"</string>
     <string name="move_app" msgid="5042838441401731346">"తరలించు"</string>
     <string name="move_app_to_internal" product="tablet" msgid="2299714147283854957">"టాబ్లెట్‌కు తరలించు"</string>
     <string name="move_app_to_internal" product="default" msgid="3895430471913858185">"ఫోన్‌కు తరలించు"</string>
@@ -1638,10 +1649,10 @@
     <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="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>
@@ -1655,12 +1666,12 @@
     <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_title" msgid="6905279702654975207">"యాప్ వివరాలు"</string>
+    <string name="app_install_details_summary" msgid="6464796332049327547">"యాప్ <xliff:g id="APP_STORE">%1$s</xliff:g> నుండి ఇన్‌స్టాల్ చేయబడింది"</string>
     <string name="instant_app_details_summary" msgid="4529934403276907045">"<xliff:g id="APP_STORE">%1$s</xliff:g>లో మరింత సమాచారం"</string>
-    <string name="app_ops_settings" msgid="5108481883575527511">"అనువర్తనం చర్యలు"</string>
+    <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>
@@ -1669,7 +1680,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>
@@ -1684,20 +1695,20 @@
     <string name="running_processes_item_description_p_s" msgid="744424668287252915">"<xliff:g id="NUMPROCESS">%1$d</xliff:g> ప్రాసెస్‌లు మరియు <xliff:g id="NUMSERVICES">%2$d</xliff:g> సేవ"</string>
     <string name="running_processes_item_description_p_p" msgid="1607384595790852782">"<xliff:g id="NUMPROCESS">%1$d</xliff:g> ప్రాసెస్‌లు మరియు <xliff:g id="NUMSERVICES">%2$d</xliff:g> సేవలు"</string>
     <string name="running_processes_header_title" msgid="6588371727640789560">"పరికర మెమరీ"</string>
-    <string name="running_processes_header_footer" msgid="723908176275428442">"అనువర్తన RAM వినియోగం"</string>
+    <string name="running_processes_header_footer" msgid="723908176275428442">"యాప్ RAM వినియోగం"</string>
     <string name="running_processes_header_system_prefix" msgid="6104153299581682047">"సిస్టమ్"</string>
-    <string name="running_processes_header_apps_prefix" msgid="5787594452716832727">"అనువర్తనాలు"</string>
+    <string name="running_processes_header_apps_prefix" msgid="5787594452716832727">"యాప్‌లు"</string>
     <string name="running_processes_header_free_prefix" msgid="4620613031737078415">"ఖాళీ"</string>
     <string name="running_processes_header_used_prefix" msgid="5924288703085123978">"ఉపయోగించబడినది"</string>
     <string name="running_processes_header_cached_prefix" msgid="7950853188089434987">"కాష్ చేయబడినది"</string>
     <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>
@@ -1726,7 +1737,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>
@@ -1758,10 +1769,10 @@
     <string name="user_dict_settings_add_dialog_less_options" msgid="2441785268726036101">"తక్కువ ఎంపికలు"</string>
     <string name="user_dict_settings_add_dialog_confirm" msgid="6225823625332416144">"సరే"</string>
     <string name="user_dict_settings_add_word_option_name" msgid="7868879174905963135">"పదం:"</string>
-    <string name="user_dict_settings_add_shortcut_option_name" msgid="660089258866063925">"సత్వరమార్గం:"</string>
+    <string name="user_dict_settings_add_shortcut_option_name" msgid="660089258866063925">"షార్ట్‌కట్:"</string>
     <string name="user_dict_settings_add_locale_option_name" msgid="5696358317061318532">"భాష:"</string>
     <string name="user_dict_settings_add_word_hint" msgid="5725254076556821247">"పదాన్ని టైప్ చేయండి"</string>
-    <string name="user_dict_settings_add_shortcut_hint" msgid="7333763456561873445">"ఐచ్ఛిక సత్వరమార్గం"</string>
+    <string name="user_dict_settings_add_shortcut_hint" msgid="7333763456561873445">"ఐచ్ఛిక షార్ట్‌కట్"</string>
     <string name="user_dict_settings_edit_dialog_title" msgid="8967476444840548674">"పదాన్ని సవరించు"</string>
     <string name="user_dict_settings_context_menu_edit_title" msgid="2210564879320004837">"సవరించు"</string>
     <string name="user_dict_settings_context_menu_delete_title" msgid="9140703913776549054">"తొలగించు"</string>
@@ -1789,20 +1800,20 @@
     <string name="gadget_picker_title" msgid="98374951396755811">"గాడ్జెట్‌ను ఎంచుకోండి"</string>
     <string name="widget_picker_title" msgid="9130684134213467557">"విడ్జెట్‌ను ఎంచుకోండి"</string>
     <string name="allow_bind_app_widget_activity_allow_bind_title" msgid="2538303018392590627">"విడ్జెట్‌ను సృష్టించి ప్రాప్యతను అనుమతించాలా?"</string>
-    <string name="allow_bind_app_widget_activity_allow_bind" msgid="1584388129273282080">"మీరు విడ్జెట్‌ను సృష్టించిన తర్వాత, ఇది ప్రదర్శించే మొత్తం డేటాను <xliff:g id="WIDGET_HOST_NAME">%1$s</xliff:g> ప్రాప్యత చేయవచ్చు."</string>
-    <string name="allow_bind_app_widget_activity_always_allow_bind" msgid="7037503685859688034">"విడ్జెట్‌లను సృష్టించి, వాటి డేటాను ప్రాప్యత చేయడానికి <xliff:g id="WIDGET_HOST_NAME">%1$s</xliff:g>ని ఎల్లప్పుడూ అనుమతించండి"</string>
+    <string name="allow_bind_app_widget_activity_allow_bind" msgid="1584388129273282080">"మీరు విడ్జెట్‌ను సృష్టించిన తర్వాత, ఇది ప్రదర్శించే మొత్తం డేటాను <xliff:g id="WIDGET_HOST_NAME">%1$s</xliff:g> యాక్సెస్ చేయవచ్చు."</string>
+    <string name="allow_bind_app_widget_activity_always_allow_bind" msgid="7037503685859688034">"విడ్జెట్‌లను సృష్టించి, వాటి డేటాను యాక్సెస్ చేయడానికి <xliff:g id="WIDGET_HOST_NAME">%1$s</xliff:g>ని ఎల్లప్పుడూ అనుమతించండి"</string>
     <string name="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>
-    <string name="accessibility_settings_title" msgid="2130492524656204459">"ప్రాప్యత సామర్థ్య సెట్టింగ్‌లు"</string>
+    <string name="accessibility_settings" msgid="3975902491934816215">"యాక్సెస్ సామర్థ్యం"</string>
+    <string name="accessibility_settings_title" msgid="2130492524656204459">"యాక్సెస్ సామర్థ్య సెట్టింగ్‌లు"</string>
     <string name="accessibility_settings_summary" msgid="981260486011624939">"స్క్రీన్ రీడర్‌లు, ప్రదర్శన, పరస్పర చర్య నియంత్రణలు"</string>
     <string name="vision_settings_title" msgid="4204111425716868288">"దృశ్యత సెట్టింగ్‌లు"</string>
-    <string name="vision_settings_description" msgid="5679491180156408260">"మీరు మీ అవసరాలకు అనుగుణంగా ఈ పరికరాన్ని అనుకూలీకరించవచ్చు. ఈ ప్రాప్యత లక్షణాలను సెట్టింగ్‌ల్లో తర్వాత మార్చవచ్చు."</string>
-    <string name="vision_settings_suggestion_title" msgid="917294957154878441">"ఫాంట్ పరిమాణాన్ని పెంచండి"</string>
+    <string name="vision_settings_description" msgid="5679491180156408260">"మీరు మీ అవసరాలకు అనుగుణంగా ఈ పరికరాన్ని అనుకూలీకరించవచ్చు. ఈ యాక్సెస్ పీచర్లను సెట్టింగ్‌ల్లో తర్వాత మార్చవచ్చు."</string>
+    <string name="vision_settings_suggestion_title" msgid="8058794060304707004">"ఫాంట్ ఆకృతిని మార్చండి"</string>
     <string name="screen_reader_category_title" msgid="7739154903913400641">"స్క్రీన్ రీడర్‌లు"</string>
     <string name="audio_and_captions_category_title" msgid="3420727114421447524">"ఆడియో &amp; స్క్రీన్‌పై ఉన్న వచనం"</string>
     <string name="display_category_title" msgid="685461049938269166">"డిస్‌ప్లే"</string>
@@ -1821,12 +1832,12 @@
     <string name="accessibility_screen_magnification_short_summary" msgid="3411979839172752057">"జూమ్ చేయడానికి 3 సార్లు నొక్కండి"</string>
     <string name="accessibility_screen_magnification_navbar_short_summary" msgid="3693116360267980492">"జూమ్ చేయడం కోసం బటన్‌ని నొక్కండి"</string>
     <string name="accessibility_screen_magnification_summary" msgid="5258868553337478505"><b>"జూమ్ చేయాలంటే"</b>", స్క్రీన్‌పై 3 సార్లు వెంటవెంటనే నొక్కండి.\n"<ul><li>"స్క్రోల్ చేయాలంటే 2 లేదా అంతకంటే ఎక్కువ వేళ్లతో లాగండి"</li>\n<li>"జూమ్‌ని సర్దుబాటు చేయాలంటే 2 లేదా అంతకంటే ఎక్కువ వేళ్లను స్క్రీన్‌పై ఉంచి ఆ వేళ్లను దగ్గరకు లేదా దూరానికి లాగండి"</li></ul>\n\n<b>"తాత్కాలికంగా జూమ్ చేయాలంటే"</b>", స్క్రీన్‌పై 3 సార్లు వెంటవెంటనే నొక్కి, మూడవసారి మీ వేలిని అలాగే పైకెత్తకుండా ఉంచండి.\n"<ul><li>"స్క్రీన్‌ని కదిలించడానికి దానిని ఎటువైపు కావాలంటే అటువైపు లాగండి"</li>\n<li>"దూరంగా జూమ్ చేయాలంటే వేలిని పైకి ఎత్తండి"</li></ul>\n\n"కీబోర్డ్ లేదా నావిగేషన్ పట్టీలో మీరు దగ్గరకు జూమ్ చేయలేరు."</string>
-    <string name="accessibility_screen_magnification_navbar_summary" msgid="1996584694050087161">"మాగ్నిఫికేషన్ ఆన్ చేయబడినప్పుడు, స్క్రీన్ దిగువన ఉన్న ప్రాప్యత బటన్‌ని ఉపయోగించి త్వరగా మాగ్నిఫై చేయండి.\n\n"<b>"జూమ్ చేయాలంటే"</b>", ప్రాప్యత బటన్‌ని నొక్కిన తర్వాత స్క్రీన్‌లో ఎక్కడైనా నొక్కండి.\n"<ul><li>"స్క్రోల్ చేయాలంటే 2 లేదా అంతకంటే ఎక్కువ వేళ్లతో లాగండి"</li>\n<li>"జూమ్‌ని సర్దుబాటు చేయాలంటే 2 లేదా అంతకంటే ఎక్కువ వేళ్లను స్క్రీన్‌పై ఉంచి ఆ వేళ్లను దగ్గరకు లేదా దూరానికి లాగండి"</li></ul>\n\n<b>"తాత్కాలికంగా జూమ్ చేయాలంటే"</b>", ప్రాప్యత బటన్‌ని నొక్కిన తర్వాత స్క్రీన్‌పై ఎక్కడైనా తాకి, ఉంచండి.\n"<ul><li>"స్క్రీన్‌ని కదిలించడానికి దానిని ఎటువైపు కావాలంటే అటువైపు లాగండి"</li>\n<li>"దూరంగా జూమ్ చేయాలంటే వేలిని పైకి ఎత్తండి"</li></ul>\n\n"కీబోర్డ్ లేదా నావిగేషన్ పట్టీలో మీరు దగ్గరకు జూమ్ చేయలేరు."</string>
-    <string name="accessibility_screen_magnification_navbar_configuration_warning" msgid="70533120652758190">"ప్రాప్యత బటన్ <xliff:g id="SERVICE">%1$s</xliff:g>కు సెట్ చేయబడింది. మాగ్నిఫికేషన్‌ని ఉపయోగించాలంటే, ప్రాప్యత బటన్‌ని తాకి, ఉంచి, ఆపై మాగ్నిఫికేషన్‌ని ఎంచుకోండి."</string>
-    <string name="accessibility_global_gesture_preference_title" msgid="2048884356166982714">"వాల్యూమ్ కీ సత్వరమార్గం"</string>
-    <string name="accessibility_shortcut_service_title" msgid="4779360749706905640">"సత్వరమార్గం సేవ"</string>
+    <string name="accessibility_screen_magnification_navbar_summary" msgid="1996584694050087161">"మాగ్నిఫికేషన్ ఆన్ చేయబడినప్పుడు, స్క్రీన్ దిగువన ఉన్న యాక్సెస్ సామర్థ్య బటన్‌ని ఉపయోగించి త్వరగా మాగ్నిఫై చేయండి.\n\n"<b>"జూమ్ చేయాలంటే"</b>", యాక్సెస్ సామర్థ్య బటన్‌ని నొక్కిన తర్వాత స్క్రీన్‌లో ఎక్కడైనా నొక్కండి.\n"<ul><li>"స్క్రోల్ చేయాలంటే 2 లేదా అంతకంటే ఎక్కువ వేళ్లతో లాగండి"</li>\n<li>"జూమ్‌ని సర్దుబాటు చేయాలంటే 2 లేదా అంతకంటే ఎక్కువ వేళ్లను స్క్రీన్‌పై ఉంచి ఆ వేళ్లను దగ్గరకు లేదా దూరానికి లాగండి"</li></ul>\n\n<b>"తాత్కాలికంగా జూమ్ చేయాలంటే"</b>", యాక్సెస్ సామర్థ్య బటన్‌ని నొక్కిన తర్వాత స్క్రీన్‌పై ఎక్కడైనా తాకి, ఉంచండి.\n"<ul><li>"స్క్రీన్‌ని కదిలించడానికి దానిని ఎటువైపు కావాలంటే అటువైపు లాగండి"</li>\n<li>"దూరంగా జూమ్ చేయాలంటే వేలిని పైకి ఎత్తండి"</li></ul>\n\n"కీబోర్డ్ లేదా నావిగేషన్ పట్టీలో మీరు దగ్గరకు జూమ్ చేయలేరు."</string>
+    <string name="accessibility_screen_magnification_navbar_configuration_warning" msgid="70533120652758190">"యాక్సెస్ సామర్థ్య బటన్ <xliff:g id="SERVICE">%1$s</xliff:g>కు సెట్ చేయబడింది. మాగ్నిఫికేషన్‌ని ఉపయోగించాలంటే, యాక్సెస్ సామర్ధ్య బటన్‌ని తాకి, ఉంచి, ఆపై మాగ్నిఫికేషన్‌ని ఎంచుకోండి."</string>
+    <string name="accessibility_global_gesture_preference_title" msgid="2048884356166982714">"వాల్యూమ్ కీ షార్ట్‌కట్"</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="1765853731190717372">"సత్వరమార్గం ఆన్ చేయబడినప్పుడు, మీరు వాల్యూమ్ కీలు రెండింటినీ 3 సెకన్లు నొక్కి ఉంచడం ద్వారా ప్రాప్యత లక్షణాన్ని ప్రారంభించవచ్చు."</string>
+    <string name="accessibility_shortcut_description" msgid="1765853731190717372">"షార్ట్‌కట్ ఆన్ చేయబడినప్పుడు, మీరు వాల్యూమ్ కీలు రెండింటినీ 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>
@@ -1839,7 +1850,6 @@
     <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="preference_summary_default_combination" msgid="8532964268242666060">"<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>
@@ -1899,12 +1909,12 @@
     <string name="color_magenta" msgid="5059212823607815549">"మెజెంటా"</string>
     <string name="enable_service_title" msgid="3061307612673835592">"<xliff:g id="SERVICE">%1$s</xliff:g>ని ఉపయోగించాలా?"</string>
     <string name="capabilities_list_title" msgid="86713361724771971">"<xliff:g id="SERVICE">%1$s</xliff:g> ఇవి చేయాల్సి ఉంటుంది:"</string>
-    <string name="touch_filtered_warning" msgid="8644034725268915030">"అనుమతి అభ్యర్థనకు ఒక అనువర్తనం అడ్డు తగులుతున్నందున సెట్టింగ్‌లు మీ ప్రతిస్పందనను ధృవీకరించలేకపోయాయి."</string>
+    <string name="touch_filtered_warning" msgid="8644034725268915030">"అనుమతి అభ్యర్థనకు ఒక యాప్ అడ్డు తగులుతున్నందున సెట్టింగ్‌లు మీ ప్రతిస్పందనను ధృవీకరించలేకపోయాయి."</string>
     <string name="enable_service_encryption_warning" msgid="3064686622453974606">"మీరు <xliff:g id="SERVICE">%1$s</xliff:g>ని ఆన్ చేస్తే, డేటా గుప్తీకరణను మెరుగుపరచడానికి మీ పరికరం మీ స్క్రీన్ లాక్‌ను ఉపయోగించదు."</string>
-    <string name="secure_lock_encryption_warning" msgid="460911459695077779">"మీరు ప్రాప్యత సేవను ఆన్ చేసినందున, డేటా గుప్తీకరణను మెరుగుపరచడానికి మీ పరికరం మీ స్క్రీన్ లాక్‌ను ఉపయోగించదు."</string>
-    <string name="enable_service_pattern_reason" msgid="777577618063306751">"<xliff:g id="SERVICE">%1$s</xliff:g>ని ఆన్‌ చేయడం వలన డేటా గుప్తీకరణ ప్రభావితమవుతుంది, కనుక మీరు మీ నమూనాను నిర్ధారించడం అవసరం."</string>
-    <string name="enable_service_pin_reason" msgid="7882035264853248228">"<xliff:g id="SERVICE">%1$s</xliff:g>ని ఆన్‌ చేయడం వలన డేటా గుప్తీకరణ ప్రభావితమవుతుంది, కనుక మీరు మీ పిన్‌ను నిర్ధారించడం అవసరం."</string>
-    <string name="enable_service_password_reason" msgid="1224075277603097951">"<xliff:g id="SERVICE">%1$s</xliff:g>ని ఆన్‌ చేయడం వలన డేటా గుప్తీకరణ ప్రభావితమవుతుంది, కనుక మీరు మీ పాస్‌వర్డ్‌ను నిర్ధారించడం అవసరం."</string>
+    <string name="secure_lock_encryption_warning" msgid="460911459695077779">"మీరు యాక్సెస్ సేవను ఆన్ చేసినందున, డేటా గుప్తీకరణను మెరుగుపరచడానికి మీ పరికరం మీ స్క్రీన్ లాక్‌ను ఉపయోగించదు."</string>
+    <string name="enable_service_pattern_reason" msgid="777577618063306751">"<xliff:g id="SERVICE">%1$s</xliff:g>ని ఆన్‌ చేయడం వలన డేటా ఎన్‌క్రిప్షన్ ప్రభావితమవుతుంది, కనుక మీరు మీ నమూనాను నిర్ధారించడం అవసరం."</string>
+    <string name="enable_service_pin_reason" msgid="7882035264853248228">"<xliff:g id="SERVICE">%1$s</xliff:g>ని ఆన్‌ చేయడం వలన డేటా ఎన్‌క్రిప్షన్ ప్రభావితమవుతుంది, కనుక మీరు మీ పిన్‌ను నిర్ధారించడం అవసరం."</string>
+    <string name="enable_service_password_reason" msgid="1224075277603097951">"<xliff:g id="SERVICE">%1$s</xliff:g>ని ఆన్‌ చేయడం వలన డేటా ఎన్‌క్రిప్షన్ ప్రభావితమవుతుంది, కనుక మీరు మీ పాస్‌వర్డ్‌ను నిర్ధారించడం అవసరం."</string>
     <string name="capability_title_receiveAccessibilityEvents" msgid="1869032063969970755">"మీ చర్యలను గమనిస్తుంది"</string>
     <string name="capability_desc_receiveAccessibilityEvents" msgid="6640333613848713883">"మీరు అనువర్తనంతో పరస్పర చర్య చేస్తున్నప్పుడు నోటిఫికేషన్‌లను స్వీకరిస్తుంది."</string>
     <string name="disable_service_title" msgid="3624005212728512896">"<xliff:g id="SERVICE">%1$s</xliff:g>ను ఆపివేయాలా?"</string>
@@ -1932,7 +1942,7 @@
     <string name="print_feature_state_off" msgid="7294876968403966040">"ఆఫ్‌లో ఉంది"</string>
     <string name="print_menu_item_add_service" msgid="3811645167869797802">"సేవను జోడించు"</string>
     <string name="print_menu_item_add_printer" msgid="8251218970577291032">"ప్రింటర్‌ను జోడించు"</string>
-    <string name="print_menu_item_search" msgid="7025589328240514553">"శోధించు"</string>
+    <string name="print_menu_item_search" msgid="7025589328240514553">"వెతుకు"</string>
     <string name="print_searching_for_printers" msgid="4680248496457576358">"ప్రింటర్‌ల కోసం శోధిస్తోంది"</string>
     <string name="print_service_disabled" msgid="7739452396114245222">"సేవ నిలిపివేయబడింది"</string>
     <string name="print_print_jobs" msgid="3582094777756968793">"ముద్రణ జాబ్‌లు"</string>
@@ -1942,7 +1952,7 @@
     <string name="print_job_summary" msgid="8472427347192930694">"<xliff:g id="PRINTER">%1$s</xliff:g>\n<xliff:g id="TIME">%2$s</xliff:g>"</string>
     <string name="print_printing_state_title_template" msgid="5736107667714582025">"<xliff:g id="PRINT_JOB_NAME">%1$s</xliff:g> ముద్రించబడుతోంది"</string>
     <string name="print_cancelling_state_title_template" msgid="7102968925358219875">"<xliff:g id="PRINT_JOB_NAME">%1$s</xliff:g>ను రద్దు చేస్తోంది"</string>
-    <string name="print_failed_state_title_template" msgid="1436099128973357969">"ప్రింటర్ లోపం <xliff:g id="PRINT_JOB_NAME">%1$s</xliff:g>"</string>
+    <string name="print_failed_state_title_template" msgid="1436099128973357969">"ప్రింటర్ ఎర్రర్ <xliff:g id="PRINT_JOB_NAME">%1$s</xliff:g>"</string>
     <string name="print_blocked_state_title_template" msgid="9065391617425962424">"ప్రింటర్ <xliff:g id="PRINT_JOB_NAME">%1$s</xliff:g> బ్లాక్ చేయబడింది"</string>
     <string name="print_search_box_shown_utterance" msgid="7730361832020726951">"శోధన పెట్టె చూపబడింది"</string>
     <string name="print_search_box_hidden_utterance" msgid="7980832833405818400">"శోధన పెట్టె దాచబడింది"</string>
@@ -1953,17 +1963,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_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="background_activity_summary_whitelisted" msgid="7375400051141016808">"బ్యాటరీ వినియోగం కోసం యాప్ అనుకూలీకరించబడదు"</string>
+    <string name="background_activity_warning_dialog_title" msgid="2216249969149568871">"నేపథ్య కార్యకలాపాన్ని పరిమితం చేయాలా?"</string>
+    <string name="background_activity_warning_dialog_text" msgid="7049624449246121981">"మీరు యాప్ నేపథ్య కార్యకలాపాన్ని పరిమితం చేస్తే, అది సరిగ్గా పని చేయకపోవచ్చు."</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" msgid="6393929085382334341">"పూర్తిగా ఛార్జ్ చేసిన తర్వాత యాప్ వినియోగం (<xliff:g id="RELATIVE_TIME">^1</xliff:g>)"</string>
+    <string name="power_usage_list_summary_device" msgid="4461926045610455423">"పూర్తిగా ఛార్జ్ చేసిన తర్వాత పరికర వినియోగం (<xliff:g id="RELATIVE_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>
@@ -2023,7 +2035,7 @@
     <string name="power_idle" product="default" msgid="9055659695602194990">"ఫోన్ నిష్క్రియం"</string>
     <string name="power_unaccounted" msgid="709925017022660740">"నానావిధమైనవి"</string>
     <string name="power_overcounted" msgid="2762354976171358445">"అధిక గణన"</string>
-    <string name="power_apps" msgid="2043554781293951327">"అనువర్తనాలు"</string>
+    <string name="power_apps" msgid="2043554781293951327">"యాప్‌లు"</string>
     <string name="power_service" msgid="1599661212370831780">"సేవలు"</string>
     <string name="power_system" msgid="8290455327965307383">"సిస్టమ్"</string>
     <string name="power_user" msgid="3706143225319881667">"ఇతర వినియోగదారులు"</string>
@@ -2048,8 +2060,8 @@
     <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_app_details" msgid="7861051816778419018">"అనువర్తన సమాచారం"</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">"Wi‑Fi సెట్టింగ్‌లు"</string>
@@ -2058,7 +2070,7 @@
     <string name="battery_desc_standby" product="tablet" msgid="6284747418668280364">"టాబ్లెట్ నిష్క్రియంగా ఉన్నప్పుడు వినియోగించబడిన బ్యాటరీ"</string>
     <string name="battery_desc_standby" product="default" msgid="3009080001948091424">"ఫోన్ నిష్క్రియంగా ఉన్నప్పుడు వినియోగించబడిన బ్యాటరీ"</string>
     <string name="battery_desc_radio" msgid="5479196477223185367">"సెల్ రేడియో ద్వారా వినియోగించబడిన బ్యాటరీ"</string>
-    <string name="battery_sugg_radio" msgid="8211336978326295047">"సెల్ కవరేజ్ లేని ప్రాంతాల్లో విద్యుత్ శక్తిని ఆదా చేయడానికి ఎయిర్‌ప్లైన్ మోడ్‌కు మార్చండి"</string>
+    <string name="battery_sugg_radio" msgid="8211336978326295047">"సెల్ కవరేజ్ లేని ప్రాంతాల్లో విద్యుత్ శక్తిని ఆదా చేయడానికి ఎయిర్‌ప్లేన్ మోడ్‌కు మార్చండి"</string>
     <string name="battery_desc_flashlight" msgid="2908579430841025494">"ఫ్లాష్‌లైట్ ద్వారా వినియోగించబడే బ్యాటరీ"</string>
     <string name="battery_desc_camera" msgid="7375389919760613499">"కెమెరా వినియోగించిన బ్యాటరీ"</string>
     <string name="battery_desc_display" msgid="5432795282958076557">"డిస్‌ప్లే మరియు బ్యాక్‌లైట్ ద్వారా వినియోగించబడిన బ్యాటరీ"</string>
@@ -2068,10 +2080,10 @@
     <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>
@@ -2156,7 +2168,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>
@@ -2209,15 +2221,15 @@
     <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="usage_access_title" msgid="332333405495457839">"వినియోగ ప్రాప్యత గల అనువర్తనాలు"</string>
+    <string name="credentials_configure_lock_screen_hint" msgid="8058230497337529036">"మీరు ఆధారాల నిల్వను ఉపయోగించే ముందు, మీ పరికరం సురక్షిత లాక్ స్క్రీన్‌ను కలిగి ఉండాలి"</string>
+    <string name="credentials_configure_lock_screen_button" msgid="253239765216055321">"లాక్‌ను సెట్ చేయి"</string>
+    <string name="usage_access_title" msgid="332333405495457839">"వినియోగ యాక్సెస్ గల యాప్‌లు"</string>
     <string name="emergency_tone_title" msgid="1055954530111587114">"అత్యవసర టోన్"</string>
     <string name="emergency_tone_summary" msgid="722259232924572153">"అత్యవసర కాల్ వచ్చినప్పుడు చేయాల్సిన విధిని సెట్ చేయండి"</string>
     <string name="privacy_settings_title" msgid="2978878794187459190">"బ్యాకప్"</string>
@@ -2234,13 +2246,13 @@
     <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>
-    <string name="select_device_admin_msg" msgid="7347389359013278077">"పరికర నిర్వాహకుల అనువర్తనాలు"</string>
+    <string name="select_device_admin_msg" msgid="7347389359013278077">"పరికర నిర్వాహకుల యాప్‌లు"</string>
     <string name="no_device_admins" msgid="4846602835339095768">"పరికర నిర్వాహకుల అనువర్తనాలు అందుబాటులో లేవు"</string>
     <string name="personal_device_admin_title" msgid="2849617316347669861">"వ్యక్తిగతం"</string>
     <string name="managed_device_admin_title" msgid="7853955652864478435">"కార్యాలయం"</string>
@@ -2248,10 +2260,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>
@@ -2268,7 +2280,7 @@
     <string name="wifi_setup_add_network" msgid="5939624680150051807">"నెట్‌వర్క్‌ను జోడించు"</string>
     <string name="wifi_setup_refresh_list" msgid="3411615711486911064">"జాబితాను రిఫ్రెష్ చేయి"</string>
     <string name="wifi_setup_skip" msgid="6661541841684895522">"దాటవేయి"</string>
-    <string name="wifi_setup_next" msgid="3388694784447820477">"తదుపరి"</string>
+    <string name="wifi_setup_next" msgid="3388694784447820477">"తర్వాత"</string>
     <string name="wifi_setup_back" msgid="144777383739164044">"వెనుకకు"</string>
     <string name="wifi_setup_detail" msgid="2336990478140503605">"నెట్‌వర్క్ వివరాలు"</string>
     <string name="wifi_setup_connect" msgid="7954456989590237049">"కనెక్ట్ చేయి"</string>
@@ -2282,15 +2294,15 @@
     <string name="wifi_setup_status_edit_network" msgid="4765340816724760717">"నెట్‌వర్క్ కాన్ఫిగరేషన్‌ను టైప్ చేయండి"</string>
     <string name="wifi_setup_status_new_network" msgid="7468952850452301083">"కొత్త నెట్‌వర్క్‌కు కనెక్ట్ చేయండి"</string>
     <string name="wifi_setup_status_connecting" msgid="4971421484401530740">"కనెక్ట్ చేస్తోంది..."</string>
-    <string name="wifi_setup_status_proceed_to_next" msgid="6708250000342940031">"తదుపరి దశకు వెళ్లండి"</string>
+    <string name="wifi_setup_status_proceed_to_next" msgid="6708250000342940031">"తర్వాత దశకు వెళ్లండి"</string>
     <string name="wifi_setup_status_eap_not_supported" msgid="6796317704783144190">"EAPకి మద్దతు లేదు."</string>
     <string name="wifi_setup_eap_not_supported" msgid="6812710317883658843">"మీరు సెటప్ సమయంలో EAP Wi‑Fi కనెక్షన్‌ను కాన్ఫిగర్ చేయలేరు. సెటప్ చేసిన తర్వాత, మీరు దీన్ని సెట్టింగ్‌లు &gt; వైర్‌లెస్ &amp; నెట్‌వర్క్‌ల్లో కాన్ఫిగర్ చేయవచ్చు."</string>
     <string name="wifi_setup_description_connecting" msgid="2793554932006756795">"కనెక్ట్ చేయడానికి కొన్ని నిమిషాలు పట్టవచ్చు…"</string>
-    <string name="wifi_setup_description_connected" msgid="6649168170073219153">"సెటప్‌ను కొనసాగించడానికి "<b>"తదుపరి"</b>" నొక్కండి.\n\nవేరే Wi‑Fi నెట్‌వర్క్‌కు కనెక్ట్ చేయడానికి "<b>"వెనుకకు"</b>" నొక్కండి."</string>
+    <string name="wifi_setup_description_connected" msgid="6649168170073219153">"సెటప్‌ను కొనసాగించడానికి "<b>"తర్వాత"</b>" నొక్కండి.\n\nవేరే Wi‑Fi నెట్‌వర్క్‌కు కనెక్ట్ చేయడానికి "<b>"వెనుకకు"</b>" నొక్కండి."</string>
     <string name="accessibility_sync_enabled" msgid="558480439730263116">"సమకాలీకరణ ప్రారంభించబడింది"</string>
     <string name="accessibility_sync_disabled" msgid="1741194106479011384">"సమకాలీకరణ నిలిపివేయబడింది"</string>
     <string name="accessibility_sync_in_progress" msgid="4501160520879902723">"ఇప్పుడు సమకాలీకరిస్తోంది"</string>
-    <string name="accessibility_sync_error" msgid="8703299118794272041">"సమకాలీకరణ లోపం."</string>
+    <string name="accessibility_sync_error" msgid="8703299118794272041">"సమకాలీకరణ ఎర్రర్."</string>
     <string name="sync_failed" msgid="1696499856374109647">"సమకాలీకరణ విఫలమైంది"</string>
     <string name="sync_active" msgid="8476943765960863040">"సమకాలీకరణ సక్రియంగా ఉంది"</string>
     <string name="account_sync_settings_title" msgid="5131314922423053588">"సమకాలీకరణ"</string>
@@ -2303,11 +2315,11 @@
     <string name="background_data" msgid="5779592891375473817">"నేపథ్య డేటా"</string>
     <string name="background_data_summary" msgid="8328521479872763452">"అనువర్తనాలు ఏ సమయంలోనైనా డేటాను సమకాలీకరించవచ్చు, పంపవచ్చు మరియు స్వీకరించవచ్చు"</string>
     <string name="background_data_dialog_title" msgid="6059217698124786537">"నేపథ్య డేటాను నిలిపివేయాలా?"</string>
-    <string name="background_data_dialog_message" msgid="6981661606680941633">"నేపథ్య డేటాను నిలిపివేయడం వలన బ్యాటరీ జీవితకాలం పెరుగుతుంది మరియు డేటా వినియోగం తగ్గుతుంది. కొన్ని అనువర్తనాలు అప్పటికీ నేపథ్య డేటా కనెక్షన్‌ను ఉపయోగించవచ్చు."</string>
+    <string name="background_data_dialog_message" msgid="6981661606680941633">"నేపథ్య డేటాను నిలిపివేయడం వలన బ్యాటరీ జీవితకాలం పెరుగుతుంది మరియు డేటా వినియోగం తగ్గుతుంది. కొన్ని యాప్‌లు అప్పటికీ నేపథ్య డేటా కనెక్షన్‌ను ఉపయోగించవచ్చు."</string>
     <string name="sync_automatically" msgid="1682730255435062059">"అనువర్తన డేటాను స్వయంచాలకంగా సమకాలీకరించు"</string>
     <string name="sync_enabled" msgid="4551148952179416813">"సమకాలీకరణ ఆన్‌లో ఉంది"</string>
     <string name="sync_disabled" msgid="8511659877596511991">"సమకాలీకరణ ఆఫ్‌లో ఉంది"</string>
-    <string name="sync_error" msgid="5060969083117872149">"సమకాలీకరణ లోపం"</string>
+    <string name="sync_error" msgid="5060969083117872149">"సమకాలీకరణ ఎర్రర్"</string>
     <string name="last_synced" msgid="4242919465367022234">"చివరిగా సమకాలీకరించినది <xliff:g id="LAST_SYNC_TIME">%1$s</xliff:g>"</string>
     <string name="sync_in_progress" msgid="5151314196536070569">"ఇప్పుడు సమకాలీకరిస్తోంది…"</string>
     <string name="settings_backup" msgid="2274732978260797031">"బ్యాకప్ సెట్టింగ్‌లు"</string>
@@ -2336,12 +2348,10 @@
     <skip />
     <string name="cant_sync_dialog_title" msgid="2777238588398046285">"మాన్యువల్‌గా సమకాలీకరించడం సాధ్యపడదు"</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>
@@ -2351,15 +2361,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_plan_usage_manage_plans_button_text" msgid="8997761990902708162">"ప్లాన్‌లను నిర్వహించు"</string>
     <string name="data_usage_summary_title" msgid="3804110657238092929">"డేటా వినియోగం"</string>
-    <string name="data_usage_app_summary_title" msgid="4147258989837459172">"అనువర్తన డేటా వినియోగం"</string>
+    <string name="data_usage_app_summary_title" msgid="4147258989837459172">"యాప్ డేటా వినియోగం"</string>
     <string name="data_usage_accounting" msgid="7170028915873577387">"క్యారియర్ డేటా అకౌంటింగ్ మీ పరికరాన్ని బట్టి మారుతుంది."</string>
-    <string name="data_usage_app" msgid="4970478397515423303">"అనువర్తన వినియోగం"</string>
-    <string name="data_usage_app_info_label" msgid="3409931235687866706">"అనువర్తన సమాచారం"</string>
+    <string name="data_usage_app" msgid="4970478397515423303">"యాప్‌ వినియోగం"</string>
+    <string name="data_usage_app_info_label" msgid="3409931235687866706">"యాప్ సమాచారం"</string>
     <string name="data_usage_cellular_data" msgid="9168928285122125137">"మొబైల్ డేటా"</string>
     <string name="data_usage_data_limit" msgid="1193930999713192703">"డేటా పరిమితిని సెట్ చేయి"</string>
     <string name="data_usage_cycle" msgid="5652529796195787949">"డేటా వినియోగ సైకిల్"</string>
-    <string name="data_usage_app_items_header_text" msgid="5017850810459372828">"అనువర్తన వినియోగం"</string>
+    <string name="data_usage_app_items_header_text" msgid="5017850810459372828">"యాప్‌ వినియోగం"</string>
     <string name="data_usage_menu_roaming" msgid="8042359966835203296">"డేటా రోమింగ్"</string>
     <string name="data_usage_menu_restrict_background" msgid="1989394568592253331">"నేపథ్య డేటాను పరిమితం చేయి"</string>
     <string name="data_usage_menu_allow_background" msgid="2694761978633359223">"నేపథ్య డేటాను అనుమతించు"</string>
@@ -2402,7 +2413,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 +2421,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>
@@ -2430,25 +2441,28 @@
     <string name="data_usage_received_sent" msgid="5039699009276621757">"<xliff:g id="RECEIVED">%1$s</xliff:g> స్వీకరించబడింది, <xliff:g id="SENT">%2$s</xliff:g> పంపబడింది"</string>
     <string name="data_usage_total_during_range" msgid="4091294280619255237">"<xliff:g id="RANGE">%2$s</xliff:g>: సుమారు <xliff:g id="TOTAL">%1$s</xliff:g> ఉపయోగించబడింది."</string>
     <string name="data_usage_total_during_range_mobile" product="tablet" msgid="1925687342154538972">"<xliff:g id="RANGE">%2$s</xliff:g>: మీ టాబ్లెట్ గణించినట్లుగా దాదాపు <xliff:g id="TOTAL">%1$s</xliff:g> ఉపయోగించబడింది. మీ క్యారియర్ డేటా వినియోగం భిన్నంగా లెక్కించబడవచ్చు."</string>
-    <string name="data_usage_total_during_range_mobile" product="default" msgid="5063981061103812900">"<xliff:g id="RANGE">%2$s</xliff:g>: సుమారు <xliff:g id="TOTAL">%1$s</xliff:g> ఉపయోగించబడింది, మీ ఫోన్ ద్వారా లెక్కించబడింది. మీ క్యారియర్ డేటా వినియోగం భిన్నంగా లెక్కించబడవచ్చు."</string>
+    <string name="data_usage_total_during_range_mobile" product="default" msgid="5063981061103812900">"<xliff:g id="RANGE">%2$s</xliff:g> సుమారు <xliff:g id="TOTAL">%1$s</xliff:g> ఉపయోగించబడింది, మీ ఫోన్ ద్వారా లెక్కించబడింది. మీ క్యారియర్ డేటా వినియోగం భిన్నంగా లెక్కించబడవచ్చు."</string>
     <string name="data_usage_metered_title" msgid="7383175371006596441">"నెట్‌వర్క్ పరిమితులు"</string>
     <string name="data_usage_metered_body" msgid="7655851702771342507">"నేపథ్య డేటా పరిమితం చేయబడినప్పుడు గణించబడే నెట్‌వర్క్‌లు మొబైల్ నెట్‌వర్క్‌ల వలె పరిగణించబడతాయి. అనువర్తనాలు ఎక్కువ పరిమాణ డౌన్‌లోడ్‌ల కోసం ఈ నెట్‌వర్క్‌లను ఉపయోగించడానికి ముందు మిమ్మల్ని హెచ్చరించవచ్చు."</string>
     <string name="data_usage_metered_mobile" msgid="5423305619126978393">"మొబైల్ నెట్‌వర్క్‌లు"</string>
     <string name="data_usage_metered_wifi" msgid="1761738002328299714">"గణించబడే Wi‑Fi నెట్‌వర్క్‌లు"</string>
     <string name="data_usage_metered_wifi_disabled" msgid="727808462375941567">"గణించబడే నెట్‌వర్క్‌లను ఎంచుకోవడానికి, Wi‑Fi ఆన్ చేయండి."</string>
+    <string name="data_usage_metered_auto" msgid="1262028400911918865">"స్వయంచాలకం"</string>
+    <string name="data_usage_metered_yes" msgid="9217539611385225894">"గణించబడింది"</string>
+    <string name="data_usage_metered_no" msgid="4025232961929071789">"గణించబడదు"</string>
     <string name="data_usage_disclaimer" msgid="6887858149980673444">"క్యారియర్ డేటా లెక్కింపు మీ పరికరాన్ని బట్టి మారవచ్చు."</string>
     <string name="cryptkeeper_emergency_call" msgid="198578731586097145">"అత్యవసర కాల్"</string>
     <string name="cryptkeeper_return_to_call" msgid="5613717339452772491">"కాల్‌కు తిరిగి వెళ్లు"</string>
     <string name="vpn_name" msgid="4689699885361002297">"పేరు"</string>
     <string name="vpn_type" msgid="5435733139514388070">"రకం"</string>
     <string name="vpn_server" msgid="2123096727287421913">"సర్వర్ చిరునామా"</string>
-    <string name="vpn_mppe" msgid="6639001940500288972">"PPP గుప్తీకరణ (MPPE)"</string>
+    <string name="vpn_mppe" msgid="6639001940500288972">"PPP ఎన్‌క్రిప్షన్ (MPPE)"</string>
     <string name="vpn_l2tp_secret" msgid="529359749677142076">"L2TP రహస్యం"</string>
     <string name="vpn_ipsec_identifier" msgid="4098175859460006296">"IPSec ఐడెంటిఫైయర్"</string>
     <string name="vpn_ipsec_secret" msgid="4526453255704888704">"IPSec పూర్వ-భాగస్వామ్య కీ"</string>
-    <string name="vpn_ipsec_user_cert" msgid="6880651510020187230">"IPSec వినియోగదారు ప్రమాణపత్రం"</string>
-    <string name="vpn_ipsec_ca_cert" msgid="91338213449148229">"IPSec CA ప్రమాణపత్రం"</string>
-    <string name="vpn_ipsec_server_cert" msgid="6599276718456935010">"IPSec సర్వర్ ప్రమాణపత్రం"</string>
+    <string name="vpn_ipsec_user_cert" msgid="6880651510020187230">"IPSec వినియోగదారు సర్టిఫికెట్"</string>
+    <string name="vpn_ipsec_ca_cert" msgid="91338213449148229">"IPSec CA సర్టిఫికెట్"</string>
+    <string name="vpn_ipsec_server_cert" msgid="6599276718456935010">"IPSec సర్వర్ సర్టిఫికెట్"</string>
     <string name="vpn_show_options" msgid="7182688955890457003">"అధునాతన ఎంపికలను చూపు"</string>
     <string name="vpn_search_domains" msgid="5391995501541199624">"DNS శోధన డొమైన్‌లు"</string>
     <string name="vpn_dns_servers" msgid="5570715561245741829">"DNS సర్వర్‌లు (ఉదా. 8.8.8.8)"</string>
@@ -2474,7 +2488,7 @@
     <string name="vpn_connect_to" msgid="5965299358485793260">"<xliff:g id="PROFILE">%s</xliff:g>కి కనెక్ట్ చేయండి"</string>
     <string name="vpn_disconnect_confirm" msgid="3743970132487505659">"ఈ VPNను డిస్‌కనెక్ట్ చేయాలా?"</string>
     <string name="vpn_disconnect" msgid="7426570492642111171">"డిస్‌కనెక్ట్ చేయి"</string>
-    <string name="vpn_version" msgid="1939804054179766249">"సంస్కరణ <xliff:g id="VERSION">%s</xliff:g>"</string>
+    <string name="vpn_version" msgid="1939804054179766249">"వెర్షన్ <xliff:g id="VERSION">%s</xliff:g>"</string>
     <string name="vpn_forget_long" msgid="2232239391189465752">"VPNని విస్మరించు"</string>
     <string name="vpn_replace_vpn_title" msgid="2963898301277610248">"ఇప్పటికే ఉన్న VPNని భర్తీ చేయాలా?"</string>
     <string name="vpn_set_vpn_title" msgid="4009987321156037267">"ఎల్లప్పుడూ ఆన్‌లో ఉండే VPNని సెట్ చేయాలా?"</string>
@@ -2484,7 +2498,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>
@@ -2492,7 +2506,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>
@@ -2502,7 +2516,7 @@
     <string name="vpn_no_network" msgid="3050233675132726155">"నెట్‌వర్క్ కనెక్షన్ లేదు. దయచేసి తర్వాత మళ్లీ ప్రయత్నించండి."</string>
     <string name="vpn_disconnected" msgid="280531508768927471">"VPN నుండి డిస్‌కనెక్ట్ చేయబడింది"</string>
     <string name="vpn_disconnected_summary" msgid="3082851661207900606">"దేనికీ కనెక్ట్ కాలేదు"</string>
-    <string name="vpn_missing_cert" msgid="5357192202207234745">"ఒక ప్రమాణపత్రం లేదు. ప్రొఫైల్‌ని సవరించడానికి ప్రయత్నించండి."</string>
+    <string name="vpn_missing_cert" msgid="5357192202207234745">"ఒక సర్టిఫికెట్ లేదు. ప్రొఫైల్‌ని సవరించడానికి ప్రయత్నించండి."</string>
     <string name="trusted_credentials_system_tab" msgid="3984284264816924534">"సిస్టమ్"</string>
     <string name="trusted_credentials_user_tab" msgid="2244732111398939475">"వినియోగదారు"</string>
     <string name="trusted_credentials_disable_label" msgid="3864493185845818506">"నిలిపివేయి"</string>
@@ -2514,8 +2528,8 @@
     <string name="trusted_credentials_remove_confirmation" msgid="443561923016852941">"వినియోగదారు CA ప్రమాణపత్రాన్ని శాశ్వతంగా తీసివేయాలా?"</string>
     <string name="credential_contains" msgid="3984922924723974084">"ఈ నమోదులో ఇవి ఉంటాయి:"</string>
     <string name="one_userkey" msgid="6034020579534914349">"ఒక వినియోగదారు కీ"</string>
-    <string name="one_usercrt" msgid="2150319011101639509">"ఒక వినియోగదారు ప్రమాణపత్రం"</string>
-    <string name="one_cacrt" msgid="6844397037970164809">"ఒక CA ప్రమాణపత్రం"</string>
+    <string name="one_usercrt" msgid="2150319011101639509">"ఒక వినియోగదారు సర్టిఫికెట్"</string>
+    <string name="one_cacrt" msgid="6844397037970164809">"ఒక CA సర్టిఫికెట్"</string>
     <string name="n_cacrts" msgid="5979300323482053820">"%d CA ప్రమాణపత్రాలు"</string>
     <string name="user_credential_title" msgid="1954061209643070652">"ఆధార వివరాలు"</string>
     <string name="user_credential_removed" msgid="6514189495799401838">"తీసివేయబడిన ఆధారం: <xliff:g id="CREDENTIAL_NAME">%s</xliff:g>"</string>
@@ -2526,10 +2540,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="selinux_status_disabled" msgid="924551035552323327">"నిలిపివేయబడింది"</string>
-    <string name="selinux_status_permissive" msgid="6004965534713398778">"అనుమోదక అంశము"</string>
-    <string name="selinux_status_enforcing" msgid="2252703756208463329">"అమలు చేయడం"</string>
+    <string name="additional_system_update_settings_list_item_title" msgid="214987609894661992">"అదనపు సిస్టమ్ అప్‌డేట్‌లు"</string>
     <string name="ssl_ca_cert_warning" msgid="2045866713601984673">"నెట్‌వర్క్ పర్యవేక్షించబడవచ్చు"</string>
     <string name="done_button" msgid="1991471253042622230">"పూర్తయింది"</string>
     <plurals name="ssl_ca_cert_dialog_title" formatted="false" msgid="7145092748045794650">
@@ -2537,12 +2548,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">
@@ -2569,7 +2580,7 @@
     <string name="user_add_user_item_title" msgid="8212199632466198969">"వినియోగదారు"</string>
     <string name="user_add_profile_item_title" msgid="8353515490730363621">"పరిమితం చేయబడిన ప్రొఫైల్"</string>
     <string name="user_add_user_title" msgid="2108112641783146007">"కొత్త వినియోగదారుని జోడించాలా?"</string>
-    <string name="user_add_user_message_long" msgid="8562152293752222985">"మీరు అదనపు వినియోగదారులను సృష్టించడం ద్వారా ఈ పరికరాన్ని ఇతర వ్యక్తులు కూడా ఉపయోగించుకునే సదుపాయం కల్పించవచ్చు. ప్రతి వినియోగదారుకు వారికంటూ ప్రత్యేక స్థలం ఉంటుంది, వారు ఆ స్థలాన్ని అనువర్తనాలు, వాల్‌పేపర్ మొదలైనవాటితో అనుకూలీకరించవచ్చు. వినియోగదారులు ప్రతి ఒక్కరిపై ప్రభావం చూపే Wi‑Fi వంటి పరికర సెట్టింగ్‌లను కూడా సర్దుబాటు చేయవచ్చు.\n\nమీరు కొత్త వినియోగదారును జోడించినప్పుడు, ఆ వ్యక్తి వారికంటూ స్వంత స్థలం సెట్ చేసుకోవాలి.\n\nఏ వినియోగదారు అయినా మిగిలిన అందరు వినియోగదారుల కోసం అనువర్తనాలను నవీకరించవచ్చు."</string>
+    <string name="user_add_user_message_long" msgid="8562152293752222985">"మీరు అదనపు వినియోగదారులను సృష్టించడం ద్వారా ఈ పరికరాన్ని ఇతర వ్యక్తులు కూడా ఉపయోగించుకునే సదుపాయం కల్పించవచ్చు. ప్రతి వినియోగదారుకు వారికంటూ ప్రత్యేక స్థలం ఉంటుంది, వారు ఆ స్థలాన్ని యాప్‌లు, వాల్‌పేపర్ మొదలైనవాటితో అనుకూలీకరించవచ్చు. వినియోగదారులు ప్రతి ఒక్కరిపై ప్రభావం చూపే Wi‑Fi వంటి పరికర సెట్టింగ్‌లను కూడా సర్దుబాటు చేయవచ్చు.\n\nమీరు కొత్త వినియోగదారును జోడించినప్పుడు, ఆ వ్యక్తి వారికంటూ స్వంత స్థలం సెట్ చేసుకోవాలి.\n\nఏ వినియోగదారు అయినా మిగిలిన అందరు వినియోగదారుల కోసం యాప్‌లను అప్‌డేట్ చేయవచ్చు."</string>
     <string name="user_add_user_message_short" msgid="1511354412249044381">"మీరు కొత్త వినియోగదారుని జోడించినప్పుడు, ఆ వ్యక్తి తన స్థలాన్ని సెటప్ చేసుకోవాలి.\n\nఏ వినియోగదారు అయినా మిగతా అందరు వినియోగదారుల కోసం అనువర్తనాలను నవీకరించగలరు."</string>
     <string name="user_setup_dialog_title" msgid="1765794166801864563">"ఇప్పుడు వినియోగదారుని సెటప్ చేయాలా?"</string>
     <string name="user_setup_dialog_message" msgid="1004068621380867148">"పరికరాన్ని తీసుకోవడానికి వ్యక్తి అందుబాటులో ఉన్నారని నిర్ధారించుకొని, ఆపై వారికి స్థలాన్ని సెటప్ చేయండి"</string>
@@ -2597,7 +2608,7 @@
     <string name="user_delete_user_description" msgid="3158592592118767056">"వినియోగదారుని తొలగించండి"</string>
     <string name="user_delete_button" msgid="5131259553799403201">"తొలగించు"</string>
     <string name="user_guest" msgid="8475274842845401871">"అతిథి"</string>
-    <string name="user_exit_guest_title" msgid="5613997155527410675">"అతిథిని తీసివేయి"</string>
+    <string name="user_exit_guest_title" msgid="5613997155527410675">"అతిథిని తీసివేయండి"</string>
     <string name="user_exit_guest_confirm_title" msgid="3405527634738147409">"అతిథిని తీసివేయాలా?"</string>
     <string name="user_exit_guest_confirm_message" msgid="2194459201944413257">"ఈ సెషన్‌లోని అన్ని అనువర్తనాలు మరియు డేటా తొలగించబడతాయి."</string>
     <string name="user_exit_guest_dialog_remove" msgid="6351370829952745350">"తీసివేయి"</string>
@@ -2624,10 +2635,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>
@@ -2655,18 +2666,18 @@
     <skip />
     <string name="cell_broadcast_settings" msgid="4124461751977706019">"అత్యవసర హెచ్చరికలు"</string>
     <string name="network_operators_settings" msgid="2583178259504630435">"నెట్‌వర్క్ ఆపరేటర్‌లు"</string>
-    <string name="access_point_names" msgid="1381602020438634481">"ప్రాప్యత స్థానం పేర్లు"</string>
+    <string name="access_point_names" msgid="1381602020438634481">"యాక్సెస్ స్థానం పేర్లు"</string>
     <string name="enhanced_4g_lte_mode_title" msgid="5808043757309522392">"మెరుగుపరచబడిన 4G LTE మోడ్"</string>
     <string name="enhanced_4g_lte_mode_summary" msgid="1376589643017218924">"వాయిస్ మరియు కమ్యూనికేషన్‌లను (సిఫార్సు చేయబడినవి) మెరుగుపరచడానికి LTE డేటాను ఉపయోగించండి"</string>
     <string name="preferred_network_type_title" msgid="3431041717309776341">"ప్రాధాన్య నెట్‌వర్క్ రకం"</string>
     <string name="preferred_network_type_summary" msgid="6564884693884755019">"LTE (సిఫార్సు చేయబడింది)"</string>
     <string name="work_sim_title" msgid="4843322164662606891">"కార్యాలయ సిమ్"</string>
-    <string name="user_restrictions_title" msgid="5794473784343434273">"అనువర్తనం &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>
@@ -2678,7 +2689,7 @@
     <string name="restriction_location_enable_title" msgid="5020268888245775164">"స్థానం"</string>
     <string name="restriction_location_enable_summary" msgid="3489765572281788755">"మీ స్థాన సమాచారాన్ని ఉపయోగించడానికి అనువర్తనాలను అనుమతించండి"</string>
     <string name="wizard_back" msgid="5567007959434765743">"వెనుకకు"</string>
-    <string name="wizard_next" msgid="3606212602795100640">"తదుపరి"</string>
+    <string name="wizard_next" msgid="3606212602795100640">"తర్వాత"</string>
     <string name="wizard_finish" msgid="3286109692700083252">"ముగించు"</string>
     <string name="user_image_take_photo" msgid="1280274310152803669">"ఫోటో తీయండి"</string>
     <string name="user_image_choose_photo" msgid="7940990613897477057">"గ్యాలరీ నుండి ఫోటోను ఎంచుకోండి"</string>
@@ -2714,7 +2725,7 @@
     <string name="sim_other_call_settings" msgid="8247802316114482477">"ఇతర కాల్ సెట్టింగ్‌లు"</string>
     <string name="preferred_network_offload_title" msgid="1605829724169550275">"ఫ్రాధాన్య నెట్‌వర్క్ ఆఫ్‌లోడ్"</string>
     <string name="preferred_network_offload_header" msgid="2321173571529106767">"నెట్‌వర్క్ పేరు ప్రసారాన్ని నిలిపివేయండి"</string>
-    <string name="preferred_network_offload_footer" msgid="5857279426054744020">"మీ నెట్‌వర్క్ సమాచారానికి ప్రాప్యత పొందే మూడవ పార్టీల నుండి రక్షించబడే నెట్‌వర్క్ పేరు ప్రసారాన్ని నిలిపివేయండి."</string>
+    <string name="preferred_network_offload_footer" msgid="5857279426054744020">"మీ నెట్‌వర్క్ సమాచారానికి యాక్సెస్ పొందే మూడవ పార్టీల నుండి రక్షించబడే నెట్‌వర్క్ పేరు ప్రసారాన్ని నిలిపివేయండి."</string>
     <string name="preferred_network_offload_popup" msgid="2252915199889604600">"నెట్‌వర్క్ పేరు ప్రసారం నిలిపివేయడం వలన దాచబడిన నెట్‌వర్క్‌లకు స్వయంచాలక కనెక్షన్ నిరోధించబడుతుంది."</string>
     <string name="sim_signal_strength" msgid="9144010043784767984">"<xliff:g id="DBM">%1$d</xliff:g> dBm <xliff:g id="ASU">%2$d</xliff:g> asu"</string>
     <string name="sim_notification_title" msgid="6272913297433198340">"SIM కార్డ్‌లు మార్చబడ్డాయి."</string>
@@ -2727,6 +2738,7 @@
       <item quantity="other">%d దాచబడిన అంశాలను చూపుతుంది</item>
       <item quantity="one">%d దాచబడిన అంశాన్ని చూపుతుంది</item>
     </plurals>
+    <string name="dashboard_suggestion_condition_footer_content_description" msgid="2898588191174845961">"కుదించండి"</string>
     <string name="network_dashboard_title" msgid="4771589228992391573">"నెట్‌వర్క్ &amp; ఇంటర్నెట్"</string>
     <string name="network_dashboard_summary_mobile" msgid="3851083934739500429">"మొబైల్‌"</string>
     <string name="network_dashboard_summary_data_usage" msgid="3843261364705042212">"డేటా వినియోగం"</string>
@@ -2734,13 +2746,13 @@
     <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="app_and_notification_dashboard_title" msgid="7838365599185397539">"యాప్‌లు &amp; నోటిఫికేషన్‌లు"</string>
+    <string name="app_and_notification_dashboard_summary" msgid="2363314178802548682">"అనుమతులు, డిఫాల్ట్ యాప్‌లు"</string>
     <string name="account_dashboard_title" msgid="4936890821712178853">"వినియోగదారులు &amp; ఖాతాలు"</string>
-    <string name="app_default_dashboard_title" msgid="7342549305933047317">"డిఫాల్ట్ అనువర్తనాలు"</string>
-    <string name="system_dashboard_summary" msgid="5797743225249766685">"భాషలు, సమయం, బ్యాకప్, నవీకరణలు"</string>
+    <string name="app_default_dashboard_title" msgid="7342549305933047317">"డిఫాల్ట్ యాప్‌లు"</string>
+    <string name="system_dashboard_summary" msgid="5797743225249766685">"భాషలు, సమయం, బ్యాకప్, అప్‌డేట్‌లు"</string>
     <string name="search_results_title" msgid="1796252422574886932">"సెట్టింగ్‌లు"</string>
-    <string name="search_menu" msgid="6283419262313758339">"సెట్టింగ్‌లను శోధించు"</string>
+    <string name="search_menu" msgid="6283419262313758339">"సెట్టింగ్‌లను వెతుకు"</string>
     <string name="query_hint_text" msgid="3350700807437473939">"శోధన సెట్టింగ్‌లు"</string>
     <string name="keywords_wifi" msgid="1395786161993828719">"wifi, wi-fi, నెట్‌వర్క్ కనెక్షన్"</string>
     <string name="keywords_more_default_sms_app" msgid="2265154063220360784">"వచన సందేశం, వచనం పంపడం, సందేశాలు, సందేశం పంపడం"</string>
@@ -2756,9 +2768,9 @@
     <string name="keywords_display_cast_screen" msgid="7684618996741933067">"ప్రదర్శన, ప్రసారం"</string>
     <string name="keywords_storage" msgid="3299217909546089225">"స్థలం, డిస్క్, హార్డ్ డ్రైవ్, పరికర వినియోగం"</string>
     <string name="keywords_battery" msgid="1173830745699768388">"శక్తి వినియోగం, ఛార్జ్"</string>
-    <string name="keywords_spell_checker" msgid="1399641226370605729">"అక్షరక్రమం, నిఘంటువు, అక్షరక్రమ తనిఖీ, స్వీయ-దిద్దుబాటు"</string>
+    <string name="keywords_spell_checker" msgid="1399641226370605729">"అక్షరక్రమం, నిఘంటువు, స్పెల్ చెక్, స్వీయ-దిద్దుబాటు"</string>
     <string name="keywords_voice_input" msgid="769778245192531102">"గుర్తింపు, ఇన్‌పుట్, ప్రసంగం, మాట్లాడటం, భాష, హ్యాండ్స్-ఫ్రీ, హ్యాండ్ ఫ్రీ, గుర్తింపు, అభ్యంతరకరం, పదం, ఆడియో, చరిత్ర, బ్లూటూత్ హెడ్‌సెట్"</string>
-    <string name="keywords_text_to_speech_output" msgid="5150660047085754699">"రేటు, భాష, డిఫాల్ట్, చదివి వినిపించు, చదివి వినిపించడం, tts, ప్రాప్యత, స్క్రీన్ రీడర్, అంధులు"</string>
+    <string name="keywords_text_to_speech_output" msgid="5150660047085754699">"రేటు, భాష, డిఫాల్ట్, చదివి వినిపించు, చదివి వినిపించడం, tts, యాక్సెస్, స్క్రీన్ రీడర్, అంధులు"</string>
     <string name="keywords_date_and_time" msgid="758325881602648204">"గడియారం, మిలిటరీ"</string>
     <string name="keywords_network_reset" msgid="6024276007080940820">"రీసెట్ చేయి, పునరుద్ధరించు, ఫ్యాక్టరీ"</string>
     <string name="keywords_factory_data_reset" msgid="5894970373671252165">"తుడిచివేయి, తొలగించు, పునరుద్ధరించు, క్లియర్ చేయి, తీసివేయి"</string>
@@ -2772,22 +2784,21 @@
     <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="3526905012224714078">"సంజ్ఞలు"</string>
     <string name="keywords_payment_settings" msgid="5220104934130446416">"చెల్లించడం, నొక్కడం, చెల్లింపులు"</string>
     <string name="keywords_backup" msgid="470070289135403022">"బ్యాకప్, బ్యాకప్"</string>
-    <!-- no translation found for keywords_assist_gesture_launch (813968759791342591) -->
-    <skip />
+    <string name="keywords_assist_gesture_launch" msgid="813968759791342591">"సంజ్ఞ"</string>
     <string name="setup_wifi_nfc_tag" msgid="9028353016222911016">"Wi-Fi NFC ట్యాగ్‌ను సెటప్ చేయండి"</string>
     <string name="write_tag" msgid="8571858602896222537">"వ్రాయి"</string>
     <string name="status_awaiting_tap" msgid="2130145523773160617">"వ్రాయడానికి ట్యాగ్‌ను నొక్కండి..."</string>
@@ -2807,7 +2818,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>
@@ -2830,8 +2841,14 @@
       <item quantity="other"><xliff:g id="ON_COUNT">%d</xliff:g> స్వయంచాలక నియమాలు ఆన్ చేయబడ్డాయి</item>
       <item quantity="one">1 స్వయంచాలక నియమం ఆన్ చేయబడింది</item>
     </plurals>
-    <string name="zen_mode_settings_title" msgid="842308776768942600">"అంతరాయం కలిగించవద్దు ప్రాధాన్యతలు"</string>
-    <string name="zen_mode_priority_settings_title" msgid="2623117023031824309">"కేవలం ప్రాధాన్యమైనవి అనుమతించ."</string>
+    <string name="zen_mode_settings_title" msgid="1066226840983908121">"అంతరాయం కలిగించవద్దు"</string>
+    <string name="zen_mode_behavior_settings_title" msgid="1463303933529313969">"ప్రవర్తన"</string>
+    <string name="zen_mode_behavior_allow_title" msgid="3845615648136218141">"దీని నుండి అన్ని ధ్వనులు మరియు వైబ్రేషన్‌లు"</string>
+    <string name="zen_mode_behavior_no_sound" msgid="1219626004723208056">"ధ్వని చేయదు"</string>
+    <string name="zen_mode_behavior_total_silence" msgid="6716603819806610626">"ధ్వని చేయదు (మొత్తం నిశ్శబ్దం)"</string>
+    <string name="zen_mode_behavior_no_sound_except" msgid="4968477585788243114">"<xliff:g id="CATEGORIES">%1$s</xliff:g> మినహా ధ్వని చేయదు"</string>
+    <!-- no translation found for zen_mode_behavior_alarms_only (2423480992071472963) -->
+    <skip />
     <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>
@@ -2871,37 +2888,39 @@
     <string name="lock_screen_notifications_interstitial_message_profile" msgid="8307705621027472346">"మీరు మీ పరికరాన్ని లాక్ చేసినప్పుడు, ప్రొఫైల్ నోటిఫికేషన్‌లు ఎలా కనిపించాలనుకుంటున్నారు?"</string>
     <string name="lock_screen_notifications_interstitial_title_profile" msgid="3169806586032521333">"ప్రొఫైల్ నోటిఫికేషన్‌లు"</string>
     <string name="notifications_title" msgid="8086372779371204971">"నోటిఫికేషన్‌లు"</string>
-    <string name="app_notifications_title" msgid="5810577805218003760">"అనువర్తన నోటిఫికేషన్‌లు"</string>
+    <string name="app_notifications_title" msgid="5810577805218003760">"యాప్ నోటిఫికేషన్‌లు"</string>
     <string name="notification_channel_title" msgid="2260666541030178452">"నోటిఫికేషన్ వర్గం"</string>
+    <string name="notification_group_title" msgid="7180506440133859601">"నోటిఫికేషన్ వర్గం సమూహం"</string>
     <string name="notification_importance_title" msgid="848692592679312666">"ప్రాముఖ్యత"</string>
-    <string name="notification_importance_unspecified" msgid="2196023702875112081">"నిర్ణయం తీసుకోవడానికి అనువర్తనాన్ని అనుమతించు"</string>
+    <string name="notification_importance_unspecified" msgid="6622173510486113958">"ధ్వనిని అనుమతించండి"</string>
     <string name="notification_importance_blocked" msgid="7938180808339386300">"ఎన్నడూ నోటిఫికేషన్‌లను చూపవద్దు"</string>
     <string name="notification_importance_min" msgid="5455049524984686275">"శబ్ద లేదా దృశ్య అంతరాయం కలిగించవద్దు"</string>
     <string name="notification_importance_low" msgid="8881468429453766553">"ధ్వని చేయదు"</string>
     <string name="notification_importance_default" msgid="5958338024601957516">"శబ్దం చేయి"</string>
     <string name="notification_importance_high" msgid="2082429479238228527">"శబ్దం చేసి, స్క్రీన్‌పై చూపు"</string>
+    <string name="notification_importance_high_silent" msgid="2667033773703765252">"స్క్రీన్‌పై పాప్ అవుతుంది"</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_interruption" msgid="7136150018111848721">"అంతరాయాలను అనుమతించండి"</string>
-    <string name="allow_interruption_summary" msgid="7870159391333957050">"అనువర్తనాన్ని శబ్దం, వైబ్రేట్ చేయనివ్వండి మరియు/లేదా స్క్రీన్‌పై నోటిఫికేషన్‌లను చూపనివ్వండి"</string>
+    <string name="allow_interruption_summary" msgid="7870159391333957050">"యాప్‌ను శబ్దం, వైబ్రేట్ చేయనివ్వండి మరియు/లేదా స్క్రీన్‌పై నోటిఫికేషన్‌లను చూపనివ్వండి"</string>
     <string name="notification_channel_summary_min" msgid="5401718014765921892">"తక్కువ ప్రాముఖ్యత"</string>
     <string name="notification_channel_summary_low" msgid="322317684244981244">"మధ్యస్థ ప్రాముఖ్యత"</string>
     <string name="notification_channel_summary_default" msgid="1111749130423589931">"అధిక ప్రాముఖ్యత"</string>
     <string name="notification_channel_summary_high" msgid="2085017556511003283">"అత్యవసర ప్రాముఖ్యత"</string>
     <string name="default_notification_assistant" msgid="7631945224761430146">"నోటిఫికేషన్ సహాయకం"</string>
-    <string name="manage_notification_access_title" msgid="7510080164564944891">"నోటిఫికేషన్ ప్రాప్యత"</string>
-    <string name="work_profile_notification_access_blocked_summary" msgid="8748026238701253040">"కార్యాలయ ప్రొఫైల్‌ నోటిఫికేషన్‌లకు ప్రాప్యత బ్లాక్ చేయబడింది"</string>
+    <string name="manage_notification_access_title" msgid="7510080164564944891">"నోటిఫికేషన్ యాక్సెస్"</string>
+    <string name="work_profile_notification_access_blocked_summary" msgid="8748026238701253040">"కార్యాలయ ప్రొఫైల్‌ నోటిఫికేషన్‌లకు యాక్సెస్ బ్లాక్ చేయబడింది"</string>
     <string name="manage_notification_access_summary_zero" msgid="2409912785614953348">"అనువర్తనాలు నోటిఫికేషన్‌లను చదవలేవు"</string>
     <plurals name="manage_notification_access_summary_nonzero" formatted="false" msgid="7930130030691218387">
-      <item quantity="other">%d అనువర్తనాలు నోటిఫికేషన్‌లను చదవగలవు</item>
-      <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>
     <string name="notification_listener_security_warning_summary" msgid="119203147791040151">"<xliff:g id="NOTIFICATION_LISTENER_NAME">%1$s</xliff:g> పరిచయ పేర్లు మరియు మీరు స్వీకరించే సందేశాల వచనం వంటి వ్యక్తిగత సమాచారంతో సహా అన్ని నోటిఫికేషన్‌లను చదవగలదు. అలాగే, ఇది నోటిఫికేషన్‌లను తీసివేయడం లేదా అవి కలిగి ఉండే చర్య బటన్‌లను సక్రియం చేయడం కూడా చేయగలదు. \n\nఇది అనువర్తనానికి అంతరాయం కలిగించవద్దు ఎంపికను ఆన్ చేయగల లేదా ఆఫ్ చేయగల సామర్థ్యాన్ని కూడా ఇస్తుంది మరియు సంబంధిత సెట్టింగ్‌లను కూడా మారుస్తుంది."</string>
-    <string name="notification_listener_disable_warning_summary" msgid="6738915379642948000">"మీరు <xliff:g id="NOTIFICATION_LISTENER_NAME">%1$s</xliff:g> కోసం నోటిఫికేషన్ ప్రాప్యతను ఆఫ్ చేస్తే, అంతరాయం కలిగించవద్దు ఎంపిక ప్రాప్యత కూడా ఆఫ్ చేయబడవచ్చు."</string>
+    <string name="notification_listener_disable_warning_summary" msgid="6738915379642948000">"మీరు <xliff:g id="NOTIFICATION_LISTENER_NAME">%1$s</xliff:g> కోసం నోటిఫికేషన్ యాక్సెస్‌ను ఆఫ్ చేస్తే, అంతరాయం కలిగించవద్దు ఎంపిక యాక్సెస్ కూడా ఆఫ్ చేయబడవచ్చు."</string>
     <string name="notification_listener_disable_warning_confirm" msgid="8333442186428083057">"ఆఫ్ చేయండి"</string>
     <string name="notification_listener_disable_warning_cancel" msgid="8586417377104211584">"రద్దు చేయి"</string>
     <string name="vr_listeners_title" msgid="1318901577754715777">"VR సహాయక సేవలు"</string>
@@ -2916,18 +2935,22 @@
     <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>
-    <!-- no translation found for picture_in_picture_app_detail_summary (1264019085827708920) -->
-    <skip />
-    <string name="manage_zen_access_title" msgid="2611116122628520522">"అంతరాయం కలిగించవద్దు ప్రాప్యత"</string>
-    <string name="zen_access_empty_text" msgid="8772967285742259540">"ఇన్‌స్టాల్ చేసిన అనువర్తనాలేవీ అంతరాయం కలిగించవద్దు ప్రాప్యత అభ్యర్థించలేదు"</string>
+    <string name="picture_in_picture_app_detail_summary" msgid="1264019085827708920">"యాప్ తెరవబడి ఉన్నప్పుడు లేదా మీరు దాని నుండి నిష్క్రమించినప్పుడు (ఉదాహరణకు, వీడియోని చూడటం కొనసాగించడానికి) చిత్రంలో చిత్రం విండోని సృష్టించడానికి ఈ యాప్‌ని అనుమతించండి. మీరు ఉపయోగించే ఇతర యాప్‌‌ల ఎగువన ఈ విండో ప్రదర్శితమవుతుంది."</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="channel_group_notifications_off_desc" msgid="1620950416247316370">"Android ఈ పరికరంలో ఈ సమూహం యొక్క నోటిఫికేషన్‌లను కనిపించకుండా బ్లాక్ చేస్తోంది"</string>
     <string name="notification_channels" msgid="5346841743182627500">"వర్గాలు"</string>
     <string name="notification_channels_other" msgid="5645317113885788226">"ఇతరం"</string>
-    <string name="no_channels" msgid="3077375508177744586">"ఈ అనువర్తనం ఏ నోటిఫికేషన్‌లను పోస్ట్ చేయలేదు"</string>
+    <plurals name="notification_group_summary" formatted="false" msgid="3420621520561455358">
+      <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="no_channels" msgid="3077375508177744586">"ఈ యాప్ ఏ నోటిఫికేషన్‌లను పోస్ట్ చేయలేదు"</string>
     <string name="app_settings_link" msgid="8894946007543660906">"అనువర్తనంలో అదనపు సెట్టింగ్‌లు"</string>
-    <string name="app_notification_listing_summary_zero" msgid="6482582965081108108">"అన్ని అనువర్తనాలలో ఆన్ చేయబడింది"</string>
+    <string name="app_notification_listing_summary_zero" msgid="6482582965081108108">"అన్ని యాప్‌లలో ఆన్ చేయబడింది"</string>
     <plurals name="app_notification_listing_summary_others" formatted="false" msgid="5668835155965827890">
       <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> అనువర్తనాలలో ఆఫ్ చేయబడింది</item>
       <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> అనువర్తనంలో ఆఫ్ చేయబడింది</item>
@@ -2945,7 +2968,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>
@@ -2988,7 +3011,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>
@@ -3001,19 +3024,21 @@
     <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>
+    <!-- no translation found for zen_mode_media_system_other (8900209390529859777) -->
+    <skip />
     <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="239685342222975733">"<xliff:g id="MINUTES">%d</xliff:g> నిమిషం వ్యవధిలో అదే వ్యక్తి రెండో సారి కాల్ చేస్తే"</string>
     <string name="zen_mode_when" msgid="2767193283311106373">"స్వయంచాలకంగా ఆన్ చేయి"</string>
     <string name="zen_mode_when_never" msgid="8809494351918405602">"ఎప్పటికీ వద్దు"</string>
     <string name="zen_mode_when_every_night" msgid="3122486110091921009">"ప్రతి రాత్రి"</string>
     <string name="zen_mode_when_weeknights" msgid="8354070633893273783">"వారపురాత్రులు"</string>
     <string name="zen_mode_start_time" msgid="8102602297273744441">"ప్రారంభ సమయం"</string>
     <string name="zen_mode_end_time" msgid="8774327885892705505">"ముగింపు సమయం"</string>
-    <string name="zen_mode_end_time_next_day_summary_format" msgid="4201521691238728701">"తదుపరి రోజు <xliff:g id="FORMATTED_TIME">%s</xliff:g>"</string>
+    <string name="zen_mode_end_time_next_day_summary_format" msgid="4201521691238728701">"<xliff:g id="FORMATTED_TIME">%s</xliff:g> తర్వాత రోజు"</string>
     <string name="zen_mode_summary_alarms_only_indefinite" msgid="2061973221027570123">"నిరవధికంగా అలారాలు మాత్రమే ఎంపికకు మార్చుతుంది"</string>
     <plurals name="zen_mode_summary_alarms_only_by_minute" formatted="false" msgid="6122003583875424601">
       <item quantity="other"><xliff:g id="DURATION">%1$d</xliff:g> నిమిషాల పాటు అనగా (<xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g> వరకు) అలారాలు మాత్రమే ఎంపికకు మారుతుంది</item>
@@ -3035,13 +3060,14 @@
     <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="suggestion_button_text" msgid="3275010948381252006">"సరే"</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>
@@ -3050,23 +3076,22 @@
     <string name="experimental_preference" msgid="7083015446690681376">"(ప్రయోగాత్మకం)"</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>
-    <!-- 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_pin_for_fingerprint" msgid="4550632760119547492">"మీ డివైజ్‌ను అన్‌లాక్ చేయడానికి మీ వేలిముద్రను ఉపయోగించడంతో పాటు, దీనిని ప్రారంభించిన వెంటనే మీ పిన్‌ని అడిగే విధంగా సెట్ చేయడం ద్వారా మీరు దీనికి అదనపు రక్షణను అందించవచ్చు. డివైజ్‌ను ప్రారంభించే వరకు, అది అలారాలతో సహా కాల్‌లు, సందేశాలు లేదా నోటిఫికేషన్‌లను స్వీకరించదు. \n\nకోల్పోయిన లేదా దొంగిలించబడిన డివైజ్‌లలో ఉన్న డేటాని రక్షించడంలో ఇది సహాయపడుతుంది. మీ డివైజ్‌ను ప్రారంభించడం కోసం పిన్‌ని అడగాలా&amp;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_pattern" msgid="1499790256154146639">"ఆకృతి అవసరమా?"</string>
     <string name="encrypt_talkback_dialog_require_password" msgid="8841994614218049215">"పాస్‌వర్డ్ అవసరమా?"</string>
-    <string name="encrypt_talkback_dialog_message_pin" msgid="7582096542997635316">"మీరు ఈ పరికరాన్ని ప్రారంభించడానికి మీ పిన్‌ను నమోదు చేసినప్పుడు, <xliff:g id="SERVICE">%1$s</xliff:g> వంటి ప్రాప్యత సేవలు అప్పటికి అందుబాటులో ఉండవు."</string>
-    <string name="encrypt_talkback_dialog_message_pattern" msgid="2020083142199612743">"మీరు ఈ పరికరాన్ని ప్రారంభించడానికి మీ నమూనాను నమోదు చేసినప్పుడు, <xliff:g id="SERVICE">%1$s</xliff:g> వంటి ప్రాప్యత సేవలు అప్పటికి అందుబాటులో ఉండవు."</string>
-    <string name="encrypt_talkback_dialog_message_password" msgid="4155875981789127796">"మీరు ఈ పరికరాన్ని ప్రారంభించడానికి మీ పాస్‌వర్డ్‌ను నమోదు చేసినప్పుడు, <xliff:g id="SERVICE">%1$s</xliff:g> వంటి ప్రాప్యత సేవలు అప్పటికి అందుబాటులో ఉండవు."</string>
-    <string name="direct_boot_unaware_dialog_message" msgid="7870273558547549125">"గమనిక: రీబూట్ చేసాక, మీరు మీ ఫోన్‌ను అన్‌లాక్ చేసే వరకు ఈ అనువర్తనం ప్రారంభం కాదు"</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="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>
@@ -3079,12 +3104,12 @@
     <string name="storage_summary_format" msgid="5419902362347539755">"<xliff:g id="STORAGE_TYPE">%2$s</xliff:g>లో <xliff:g id="SIZE">%1$s</xliff:g> ఉపయోగించబడింది"</string>
     <string name="storage_type_internal" msgid="6042049833565674948">"అంతర్గత నిల్వ"</string>
     <string name="storage_type_external" msgid="7738894330670001898">"బాహ్య నిల్వ"</string>
-    <string name="app_data_usage" msgid="7942375313697452803">"అనువర్తన డేటా వినియోగం"</string>
+    <string name="app_data_usage" msgid="7942375313697452803">"యాప్‌ డేటా వినియోగం"</string>
     <string name="data_summary_format" msgid="6213211533341068366">"<xliff:g id="DATE">%2$s</xliff:g> నుండి <xliff:g id="SIZE">%1$s</xliff:g> ఉపయోగించబడింది"</string>
     <string name="storage_used" msgid="7128074132917008743">"వినియోగించిన నిల్వ"</string>
     <string name="change" msgid="6657848623929839991">"మార్చు"</string>
     <string name="change_storage" msgid="600475265207060436">"నిల్వను మార్చండి"</string>
-    <string name="notifications_label" msgid="8543457911148619898">"అనువర్తన నోటిఫికేషన్‌లు"</string>
+    <string name="notifications_label" msgid="8543457911148619898">"యాప్ నోటిఫికేషన్‌లు"</string>
     <string name="notifications_enabled" msgid="6983396130566021385">"ఆన్‌లో ఉన్నాయి"</string>
     <string name="notifications_disabled" msgid="334416731283131597">"అన్నీ ఆఫ్ చేయబడ్డాయి"</string>
     <string name="notifications_partly_blocked" msgid="592071133950126656">"<xliff:g id="COUNT_1">%2$d</xliff:g> వర్గాలలో <xliff:g id="COUNT_0">%1$d</xliff:g> ఆఫ్ చేయబడ్డాయి"</string>
@@ -3109,21 +3134,21 @@
     </plurals>
     <string name="runtime_permissions_summary_no_permissions_granted" msgid="1679758182657005375">"అనుమతులు మంజూరు కాలేదు"</string>
     <string name="runtime_permissions_summary_no_permissions_requested" msgid="7655100570513818534">"అనుమతులను అభ్యర్థించలేదు"</string>
-    <string name="filter_all_apps" msgid="1988403195820688644">"అన్ని అనువర్తనాలు"</string>
+    <string name="filter_all_apps" msgid="1988403195820688644">"అన్ని యాప్‌లు"</string>
     <string name="filter_enabled_apps" msgid="5395727306799456250">"ఇన్‌స్టాల్ చేయబడిన అనువర్తనాలు"</string>
     <string name="filter_instant_apps" msgid="574277769963965565">"తక్షణ అనువర్తనాలు"</string>
     <string name="filter_personal_apps" msgid="3277727374174355971">"వ్యక్తిగతం"</string>
     <string name="filter_work_apps" msgid="24519936790795574">"కార్యాలయం"</string>
     <string name="filter_notif_all_apps" msgid="2299049859443680242">"అనువర్తనాలు: అన్నీ"</string>
-    <string name="filter_notif_blocked_apps" msgid="3300375727887991342">"అనువర్తనాలు: ఆఫ్ చేయబడినవి"</string>
+    <string name="filter_notif_blocked_apps" msgid="3300375727887991342">"యాప్‌లు: ఆఫ్ చేయబడినవి"</string>
     <string name="filter_notif_urgent_channels" msgid="3972473613117159653">"వర్గాలు: అత్యవసర ప్రాధాన్యత"</string>
     <string name="filter_notif_low_channels" msgid="4128487387390004604">"వర్గాలు: తక్కువ ప్రాధాన్యత"</string>
     <string name="filter_notif_blocked_channels" msgid="5880190882221644289">"వర్గాలు: ఆఫ్ చేయబడినవి"</string>
     <string name="filter_notif_dnd_channels" msgid="1817930848881696728">"వర్గాలు: అంతరాయం కలిగించవద్దు నియమం పాటించనివి"</string>
     <string name="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="unknown_app" msgid="5275921288718717656">"తెలియని యాప్"</string>
+    <string name="app_permissions" msgid="4148222031991883874">"యాప్ అనుమతులు"</string>
     <string name="app_permissions_summary" msgid="5163974162150406324">"అనువర్తనాలు <xliff:g id="APPS">%1$s</xliff:g>ని ఉపయోగిస్తున్నాయి"</string>
     <string name="tap_to_wake" msgid="7211944147196888807">"సక్రియం చేయడానికి నొక్కండి"</string>
     <string name="tap_to_wake_summary" msgid="4341387904987585616">"పరికరాన్ని సక్రియం చేయడానికి స్క్రీన్‌పై ఎక్కడైనా రెండుసార్లు నొక్కండి"</string>
@@ -3143,23 +3168,23 @@
     <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" 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>
-    <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>
+    <string name="app_usage_preference" msgid="7065701732733134991">"యాప్ వినియోగ ప్రాధాన్యతలు"</string>
+    <string name="usage_access_description" msgid="1352111094596416795">"వినియోగ యాక్సెస్‌తో ఒక యాప్ మీరు ఉపయోగించే ఇతర యాప్‌ల గురించి మరియు వాటిని ఎంత తరచుగా ఉపయోగిస్తున్నారనే దాని గురించి అలాగే మీ క్యారియర్, భాష సెట్టింగ్‌లు మరియు ఇతర వివరాలను ట్రాక్ చేయగలదు."</string>
     <string name="memory_settings_title" msgid="7490541005204254222">"మెమరీ"</string>
     <string name="memory_details_title" msgid="8542565326053693320">"మెమరీ వివరాలు"</string>
     <string name="always_running" msgid="6042448320077429656">"ఎల్లప్పుడూ అమలు చేయబడుతోంది (<xliff:g id="PERCENTAGE">%s</xliff:g>)"</string>
@@ -3190,7 +3215,7 @@
     <string name="high_power_system" msgid="7362862974428225301">"బ్యాటరీ అనుకూలీకరణ అందుబాటులో లేదు"</string>
     <string name="high_power_desc" msgid="6283926163708585760">"బ్యాటరీ అనుకూలీకరణను వర్తింపజేయదు. మీ బ్యాటరీ మరింత శీఘ్రంగా వినియోగించబడవచ్చు."</string>
     <string name="high_power_prompt_title" msgid="6358673688590282655">"ఎల్లప్పుడూ నేపథ్యంలో అమలు కావడానికి అనువర్తనాన్ని అనుమతించాలా?"</string>
-    <string name="high_power_prompt_body" msgid="1031422980602565049">"ఎల్లప్పుడూ నేపథ్యంలో అమలు కావడానికి <xliff:g id="APP_NAME">%1$s</xliff:g>ని అనుమతిస్తే బ్యాటరీ జీవితకాలం తగ్గిపోవచ్చు. \n\nమీరు తర్వాత సెట్టింగ్‌లు &gt; అనువర్తనాలు &amp; నోటిఫికేషన్‌లలోకి వెళ్లి దీనిని మార్చవచ్చు."</string>
+    <string name="high_power_prompt_body" msgid="1031422980602565049">"ఎల్లప్పుడూ నేపథ్యంలో అమలు కావడానికి <xliff:g id="APP_NAME">%1$s</xliff:g>ని అనుమతిస్తే బ్యాటరీ జీవితకాలం తగ్గిపోవచ్చు. \n\nమీరు తర్వాత సెట్టింగ్‌లు &gt; యాప్‌లు &amp; నోటిఫికేషన్‌లలోకి వెళ్లి దీనిని మార్చవచ్చు."</string>
     <string name="battery_summary" msgid="8044042095190688654">"చివరిగా పూర్తి ఛార్జింగ్ చేసినప్పటి నుండి <xliff:g id="PERCENTAGE">%1$s</xliff:g> వినియోగించబడింది"</string>
     <string name="battery_power_management" msgid="5571519699679107523">"పవర్ నిర్వహణ"</string>
     <string name="no_battery_summary" msgid="3528036835462846814">"చివరిగా పూర్తి ఛార్జింగ్ చేేసినప్పటి నుండి బ్యాటరీని అసలు వినియోగించలేదు"</string>
@@ -3221,19 +3246,20 @@
     <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="sms_mirroring_pref" msgid="6475043279147376031">"SMS మిర్రరింగ్"</string>
     <string name="background_check_pref" msgid="7550258400138010979">"నేపథ్య తనిఖీ"</string>
-    <string name="background_check_title" msgid="4534254315824525593">"పూర్తి నేపథ్య ప్రాప్యత"</string>
+    <string name="background_check_title" msgid="4534254315824525593">"పూర్తి నేపథ్య యాక్సెస్"</string>
     <string name="assist_access_context_title" msgid="2269032346698890257">"స్క్రీన్‌లోని వచనాన్ని ఉపయోగించండి"</string>
-    <string name="assist_access_context_summary" msgid="1991421283142279560">"స్క్రీన్ కంటెంట్‌లను వచన రూపంలో ప్రాప్యత చేయడానికి సహాయక అనువర్తనాన్ని అనుమతిస్తుంది"</string>
+    <string name="assist_access_context_summary" msgid="1991421283142279560">"స్క్రీన్ కంటెంట్‌లను వచన రూపంలో యాక్సెస్ చేయడానికి సహాయక యాప్‌ను అనుమతిస్తుంది"</string>
     <string name="assist_access_screenshot_title" msgid="4034721336291215819">"స్క్రీన్‌షాట్‌ను ఉపయోగించండి"</string>
-    <string name="assist_access_screenshot_summary" msgid="6761636689013259901">"స్క్రీన్ చిత్రాన్ని ప్రాప్యత చేయడానికి సహాయక అనువర్తనాన్ని అనుమతిస్తుంది"</string>
+    <string name="assist_access_screenshot_summary" msgid="6761636689013259901">"స్క్రీన్ చిత్రాన్ని యాక్సెస్ చేయడానికి సహాయక యాప్‌ను అనుమతిస్తుంది"</string>
     <string name="assist_flash_title" msgid="506661221230034891">"స్క్రీన్‌ను ఫ్లాష్ చేయడం"</string>
-    <string name="assist_flash_summary" msgid="9160668468824099262">"సహాయకం అనువర్తనం స్క్రీన్ లేదా స్క్రీన్‌షాట్‌లోని వచనాన్ని ప్రాప్యత చేసినప్పుడు స్క్రీన్ అంచులను ఫ్లాష్ చేస్తుంది"</string>
+    <string name="assist_flash_summary" msgid="9160668468824099262">"సహాయక యాప్ స్క్రీన్ లేదా స్క్రీన్‌షాట్‌లోని వచనాన్ని యాక్సెస్ చేసినప్పుడు స్క్రీన్ అంచులను ఫ్లాష్ చేస్తుంది"</string>
     <string name="assist_footer" msgid="1982791172085896864">"సహాయక అనువర్తనాలు మీరు వీక్షిస్తున్న స్క్రీన్‌లోని సమాచారం ఆధారంగా మీకు సహాయపడగలవు. కొన్ని అనువర్తనాలు మీకు సమగ్రమైన సహాయాన్ని అందించడానికి లాంచర్ మరియు వాయిస్ ఇన్‌పుట్ సేవలు రెండింటికీ మద్దతిస్తాయి."</string>
     <string name="average_memory_use" msgid="829566450150198512">"సగటు మెమరీ వినియోగం"</string>
     <string name="maximum_memory_use" msgid="7493720799710132496">"గరిష్ట మెమరీ వినియోగం"</string>
     <string name="memory_usage" msgid="1781358557214390033">"మెమరీ వినియోగం"</string>
-    <string name="app_list_memory_use" msgid="6987417883876419338">"అనువర్తన వినియోగం"</string>
+    <string name="app_list_memory_use" msgid="6987417883876419338">"యాప్‌ వినియోగం"</string>
     <string name="memory_details" msgid="5943436005716991782">"వివరాలు"</string>
     <string name="memory_use_summary" msgid="5608257211903075754">"గత 3 గంటల్లో <xliff:g id="SIZE">%1$s</xliff:g> సగటు మెమరీ వినియోగించబడింది"</string>
     <string name="no_memory_use_summary" msgid="2016900536806235588">"గత 3 గంటల్లో మెమరీ ఏదీ వినియోగించలేదు"</string>
@@ -3245,17 +3271,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_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_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="ignore_optimizations_on" msgid="6915689518016285116">"అనుకూలీకరించవద్దు"</string>
     <string name="ignore_optimizations_off" msgid="6153196256410296835">"అనుకూలీకరించు"</string>
     <string name="ignore_optimizations_on_desc" msgid="2321398930330555815">"మీ బ్యాటరీ మరింత శీఘ్రంగా వినియోగించబడవచ్చు"</string>
@@ -3264,12 +3290,12 @@
     <string name="app_list_preference_none" msgid="108006867520327904">"ఏదీ వద్దు"</string>
     <string name="work_profile_usage_access_warning" msgid="2918050775124911939">"ఈ అనువర్తనంలో వినియోగ ప్రాప్యతను ఆఫ్ చేసినా కూడా మీ కార్యాలయ ప్రొఫైల్‌లోని అనువర్తన డేటా వినియోగాన్ని ట్రాక్ చేయకుండా మీ నిర్వాహకులు నివారించబడరు"</string>
     <string name="accessibility_lock_screen_progress" msgid="2408292742980383166">"<xliff:g id="COUNT_1">%2$d</xliff:g>లో <xliff:g id="COUNT_0">%1$d</xliff:g> అక్షరాలు ఉపయోగించబడ్డాయి"</string>
-    <string name="draw_overlay" msgid="6564116025404257047">"ఇతర అనువర్తనాల ఎగువన ప్రదర్శన"</string>
+    <string name="draw_overlay" msgid="6564116025404257047">"ఇతర యాప్‌ల ఎగువన ప్రదర్శన"</string>
     <string name="system_alert_window_settings" msgid="8466613169103527868">"ఇతర అనువర్తనాల ఎగువన ప్రదర్శన"</string>
-    <string name="system_alert_window_apps_title" msgid="7005760279028569491">"అనువర్తనాలు"</string>
+    <string name="system_alert_window_apps_title" msgid="7005760279028569491">"యాప్‌లు"</string>
     <string name="system_alert_window_access_title" msgid="6297115362542361241">"ఇతర అనువర్తనాల ఎగువన ప్రదర్శన"</string>
     <string name="permit_draw_overlay" msgid="7456536798718633432">"ఇతర అనువర్తనాల ఎగువన కనిపించడానికి అనుమతించు"</string>
-    <string name="app_overlay_permission_preference" msgid="9039432222453006038">"అనువర్తనం ఎగువన కనిపించడానికి అనుమతి"</string>
+    <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>
@@ -3278,7 +3304,7 @@
     <string name="filter_overlay_apps" msgid="6965969283342557573">"అనుమతి ఉన్న అనువర్తనాలు"</string>
     <string name="app_permission_summary_allowed" msgid="1505409933012886711">"అనుమతించబడింది"</string>
     <string name="app_permission_summary_not_allowed" msgid="2592617058101882802">"అనుమతించబడలేదు"</string>
-    <string name="keywords_install_other_apps" msgid="761078076051006558">"తెలియని అనువర్తనాలను ఇన్‌స్టాల్ చేయి"</string>
+    <string name="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>
@@ -3286,14 +3312,14 @@
     <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_preference" msgid="3407383041273067448">"యాప్ సిస్టమ్ సెట్టింగ్‌లను సవరించడానికి అనుమతి"</string>
+    <string name="permit_write_settings" msgid="658555006453212691">"సిస్టమ్ సెట్టింగ్‌ల సవరణను అనుమతించండి"</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>
@@ -3319,7 +3345,7 @@
       <item quantity="other"><xliff:g id="COUNT">%d</xliff:g> అనువర్తనాలలో ఆఫ్ చేయబడింది</item>
       <item quantity="one">1 అనువర్తనంలో ఆఫ్ చేయబడింది</item>
     </plurals>
-    <string name="notification_summary_none" msgid="4586376436702610">"అన్ని అనువర్తనాలలో ఆన్ చేయబడ్డాయి"</string>
+    <string name="notification_summary_none" msgid="4586376436702610">"అన్ని యాప్‌లలో ఆన్ చేయబడ్డాయి"</string>
     <string name="apps_summary" msgid="193158055537070092">"<xliff:g id="COUNT">%1$d</xliff:g> అనువర్తనాలు ఇన్‌స్టాల్ చేయబడ్డాయి"</string>
     <string name="apps_summary_example" msgid="2118896966712746139">"24 అనువర్తనాలు ఇన్‌స్టాల్ చేయబడ్డాయి"</string>
     <string name="storage_summary" msgid="3801281635351732202">"<xliff:g id="PERCENTAGE">%1$s</xliff:g> ఉపయోగించబడింది - <xliff:g id="FREE_SPACE">%2$s</xliff:g> ఖాళీగా ఉంది"</string>
@@ -3343,16 +3369,16 @@
     <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">"పోర్టబుల్ Wi-Fi హాట్‌స్పాట్ <xliff:g id="ID_1">%1$s</xliff:g> సక్రియంగా ఉంది, ఈ పరికర Wi-Fi ఆఫ్ చేయబడింది."</string>
-    <string name="condition_airplane_title" msgid="287356299107070503">"ఎయిర్‌ప్లైన్ మోడ్ ఆన్‌లో ఉంది"</string>
+    <string name="condition_airplane_title" msgid="287356299107070503">"ఎయిర్‌ప్లేన్ మోడ్ ఆన్‌లో ఉంది"</string>
     <string name="condition_airplane_summary" msgid="5561586417832393666">"Wi-Fi, బ్లూటూత్ మరియు మొబైల్ నెట్‌వర్క్ ఆఫ్ చేయబడ్డాయి. మీరు ఫోన్ కాల్‌లు చేయలేరు లేదా ఇంటర్నెట్‌కు కనెక్ట్ చేయలేరు."</string>
     <string name="condition_zen_title" msgid="2679168532600816392">"అంతరాయం వద్దు ఆన్‌లో ఉంది (<xliff:g id="ID_1">%1$s</xliff:g>)"</string>
     <string name="condition_battery_title" msgid="3272131008388575349">"బ్యాటరీ సేవర్ ఆన్‌లో ఉంది"</string>
@@ -3378,14 +3404,17 @@
       <item quantity="other">+<xliff:g id="COUNT">%1$d</xliff:g> సూచనలు</item>
       <item quantity="one">+1 సూచన</item>
     </plurals>
-    <string name="suggestion_remove" msgid="904627293892092439">"తీసివేయి"</string>
+    <string name="suggestion_remove" msgid="904627293892092439">"తీసివేయండి"</string>
     <string name="color_temperature" msgid="2070126836910615605">"ప్రశాంత వర్ణము ఉష్ణోగ్రత"</string>
     <string name="color_temperature_desc" msgid="4793729830226404052">"ప్రశాంత భావనను కలిగించే ప్రదర్శన రంగులను ఉపయోగిస్తుంది"</string>
     <string name="color_temperature_toast" msgid="4974218172133854827">"రంగు మార్పును వర్తింపజేయడానికి, స్క్రీన్‌ను ఆఫ్ చేయండి"</string>
-    <string name="telephony_monitor_toast" msgid="7003764250271195384">"టెలిఫోనీ మానిటర్ మార్పును వర్తింపజేయాలంటే, పరికరాన్ని రీబూట్ చేయండి"</string>
+    <string name="connectivity_monitor_switch" msgid="9059759348648583421">"కనెక్టివిటీ మానిటర్"</string>
+    <string name="connectivity_monitor_switch_summary" msgid="2828658652378866401">"కనెక్టివిటీ మానిటర్ కనెక్టివిటీ సమస్యను గుర్తించినప్పుడు లాగ్‌లను సేకరిస్తుంది మరియు ఒక బగ్‌ను ఫైల్ చేయడానికి వినియోగదారుకి నోటిఫికేషన్‌ను ప్రాంప్ట్ చేస్తుంది"</string>
+    <string name="connectivity_monitor_toast" msgid="5551859612881173028">"కనెక్టివిటీ మానిటర్ మార్పును వర్తింపజేయాలంటే, పరికరాన్ని రీబూట్ చేయండి"</string>
     <string name="camera_hal_hdrplus_switch" msgid="8377365197105267466">"కెమెరా HAL HDR+"</string>
     <string name="camera_hal_hdrplus_toast" msgid="2063703797270055299">"కెమెరా HAL HDR+ మార్పును వర్తింపజేయడానికి, పరికరాన్ని రీబూట్ చేయండి"</string>
-    <string name="ota_disable_automatic_update" msgid="2319639631655915050">"స్వయంచాలక సిస్టమ్ నవీకరణలు"</string>
+    <string name="camera_laser_sensor_switch" msgid="8913588990743234440">"కెమెరా లేజర్ సెన్సార్"</string>
+    <string name="ota_disable_automatic_update" msgid="2319639631655915050">"స్వయంచాలక సిస్టమ్ అప్‌డేట్‌లు"</string>
     <string name="usage" msgid="2977875522080448986">"వినియోగం"</string>
     <string name="cellular_data_usage" msgid="2155683719898158203">"మొబైల్ డేటా వినియోగం"</string>
     <string name="wifi_data_usage" msgid="686754111095324306">"Wi-Fi డేటా వినియోగం"</string>
@@ -3410,12 +3439,12 @@
     <string name="data_warning" msgid="209133958008062117">"డేటా హెచ్చరిక"</string>
     <string name="set_data_limit" msgid="2901526323210516923">"డేటా పరిమితిని సెట్ చేయి"</string>
     <string name="data_limit" msgid="1885406964934590552">"డేటా పరిమితి"</string>
-    <string name="data_usage_template" msgid="392191945602400904">"<xliff:g id="ID_2">%2$s</xliff:g> వ్యవధిలో <xliff:g id="ID_1">%1$s</xliff:g> వినియోగించబడింది"</string>
+    <string name="data_usage_template" msgid="2923744765873163859">"<xliff:g id="ID_1">%1$s</xliff:g> <xliff:g id="ID_2">%2$s</xliff:g> కాలంలో ఉపయోగించబడింది"</string>
     <string name="configure" msgid="1029654422228677273">"కాన్ఫిగర్ చేయి"</string>
     <string name="data_usage_other_apps" msgid="3272872663517382050">"వినియోగంలో చేర్చబడిన ఇతర అనువర్తనాలు"</string>
     <plurals name="data_saver_unrestricted_summary" formatted="false" msgid="2635267833484232703">
-      <item quantity="other">డేటా సేవర్ ఆన్‌లో ఉన్నప్పుడు అనియంత్రిత డేటాను ఉపయోగించడానికి <xliff:g id="COUNT">%1$d</xliff:g> అనువర్తనాలు అనుమతించబడ్డాయి</item>
-      <item quantity="one">డేటా సేవర్ ఆన్‌లో ఉన్నప్పుడు అనియంత్రిత డేటాను ఉపయోగించడానికి 1 అనువర్తనం అనుమతించబడింది</item>
+      <item quantity="other">డేటా సేవర్ ఆన్‌లో ఉన్నప్పుడు అనియంత్రిత డేటాను ఉపయోగించడానికి <xliff:g id="COUNT">%1$d</xliff:g> యాప్‌లు అనుమతించబడ్డాయి</item>
+      <item quantity="one">డేటా సేవర్ ఆన్‌లో ఉన్నప్పుడు అనియంత్రిత డేటాను ఉపయోగించడానికి 1 యాప్ అనుమతించబడింది</item>
     </plurals>
     <string name="data_saver_title" msgid="398458827917495765">"డేటా సేవర్"</string>
     <string name="unrestricted_data_saver" msgid="952796077540228711">"అనియంత్రిత డేటా"</string>
@@ -3424,11 +3453,11 @@
     <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>
@@ -3438,7 +3467,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>
@@ -3448,7 +3477,7 @@
     <string name="notification_log_details_group" msgid="2430467015200368698">"సమూహం"</string>
     <string name="notification_log_details_group_summary" msgid="7945543958255585829">"(సారాంశం)"</string>
     <string name="notification_log_details_visibility" msgid="2552873780715930971">"దృశ్యమానత"</string>
-    <string name="notification_log_details_public_version" msgid="4247242364605495240">"పబ్లిక్‌ సంస్కరణ"</string>
+    <string name="notification_log_details_public_version" msgid="4247242364605495240">"పబ్లిక్‌ వెర్షన్"</string>
     <string name="notification_log_details_priority" msgid="8371354971235991398">"ప్రాధాన్యత"</string>
     <string name="notification_log_details_importance" msgid="2153168790791683139">"ప్రాముఖ్యత"</string>
     <string name="notification_log_details_explanation" msgid="1914295130775393551">"వివరణ"</string>
@@ -3470,24 +3499,24 @@
     <string name="notification_log_details_none" msgid="184131801230614059">"ఏదీ లేదు"</string>
     <string name="notification_log_details_ranking_null" msgid="244660392058720919">"ర్యాంకింగ్ ఆబ్జెక్ట్ లేదు."</string>
     <string name="notification_log_details_ranking_none" msgid="599607025882587844">"ర్యాంకింగ్ ఆబ్జెక్ట్‌లో ఈ కీ లేదు."</string>
-    <string name="special_access" msgid="3458780842491881155">"ప్రత్యేక అనువర్తన ప్రాప్యత"</string>
+    <string name="special_access" msgid="3458780842491881155">"ప్రత్యేక యాప్ యాక్సెస్"</string>
     <plurals name="special_access_summary" formatted="false" msgid="260765309935675867">
-      <item quantity="other"><xliff:g id="COUNT">%d</xliff:g> అనువర్తనాలు అనియంత్రిత డేటాని ఉపయోగించగలవు</item>
-      <item quantity="one">1 అనువర్తనం అనియంత్రిత డేటాని ఉపయోగించగలదు</item>
+      <item quantity="other"><xliff:g id="COUNT">%d</xliff:g> యాప్‌లు అనియంత్రిత డేటాని ఉపయోగించగలవు</item>
+      <item quantity="one">1 యాప్ అనియంత్రిత డేటాని ఉపయోగించగలదు</item>
     </plurals>
     <string name="confirm_convert_to_fbe_warning" msgid="1487005506049137659">"నిజంగా వినియోగదారు డేటాను తొలగించి, ఫైల్ గుప్తీకరణకు మార్చాలా?"</string>
     <string name="button_confirm_convert_fbe" msgid="7101855374850373091">"తొలగించి, మార్చు"</string>
     <string name="reset_shortcut_manager_throttling" msgid="6495066467198668994">"సత్వరమార్గ నిర్వాహికి రేట్-పరిమిత ప్రక్రియను రీసెట్ చేయండి"</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="387052719462473500">"లాక్ స్క్రీన్‌పై నియంత్రణ సమాచారం"</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="8483187649355540109">"మద్దతు &amp; చిట్కాలు"</string>
     <string name="developer_smallest_width" msgid="7516950434587313360">"అతితక్కువ వెడల్పు"</string>
     <string name="premium_sms_none" msgid="8268105565738040566">"ఇన్‌స్టాల్ చేసిన అనువర్తనాలు ఏవీ ప్రీమియం SMS ప్రాప్యతను అభ్యర్థించలేదు"</string>
     <string name="premium_sms_warning" msgid="9086859595338944882">"ప్రీమియం SMSతో మీకు డబ్బు ఖర్చు కావచ్చు, ఈ ఛార్జీ మీ క్యారియర్ బిల్లుల్లో విధించబడుతుంది. మీరు ఒక అనువర్తనానికి అనుమతిని అందిస్తే, ఆ అనువర్తనాన్ని ఉపయోగించి ప్రీమియం SMSను పంపగలరు."</string>
-    <string name="premium_sms_access" msgid="4660047004791638305">"ప్రీమియం SMS ప్రాప్యత"</string>
-    <string name="bluetooth_disabled" msgid="2456198532288640046">"ఇతర పరికరాలకు కనిపించదు"</string>
+    <string name="premium_sms_access" msgid="4660047004791638305">"ప్రీమియం SMS యాక్సెస్"</string>
+    <string name="bluetooth_disabled" msgid="6244000672828617410">"ఆఫ్"</string>
     <string name="bluetooth_connected_summary" msgid="7672528674593152862">"<xliff:g id="ID_1">%1$s</xliff:g>కి కనెక్ట్ చేయబడింది"</string>
     <string name="bluetooth_connected_multiple_devices_summary" msgid="9173661896296663932">"బహుళ పరికరాలకు కనెక్ట్ చేయబడింది"</string>
     <string name="demo_mode" msgid="2798762752209330277">"సిస్టమ్ UI డెమో మోడ్"</string>
@@ -3589,7 +3618,7 @@
     <string name="web_action_enable_title" msgid="4051513950976670853">"తక్షణ అనువర్తనాలు"</string>
     <string name="web_action_enable_summary" msgid="3108127559723396382">"లింక్‌లను అనువర్తనాలలో తెరవండి, వాటిని ఇన్‌స్టాల్ చేయకపోయినా ఫర్వాలేదు"</string>
     <string name="web_action_section_title" msgid="7364647086538399136">"తక్షణ అనువర్తనాలు"</string>
-    <string name="instant_apps_account" msgid="1433620209791992528">"తక్షణ అనువర్తనాల ఖాతా"</string>
+    <string name="instant_apps_settings" msgid="8827777916518348213">"తక్షణ యాప్‌ల ప్రాధాన్యతలు"</string>
     <string name="domain_url_section_title" msgid="7046835219056428883">"ఇన్‌స్టాల్ చేయబడిన అనువర్తనాలు"</string>
     <string name="automatic_storage_manager_activation_warning" msgid="6353100011690933254">"మీ నిల్వ ఇప్పుడు నిల్వ నిర్వాహికి ద్వారా నిర్వహించబడుతోంది"</string>
     <string name="account_for_section_header" msgid="5356566418548737121">"<xliff:g id="USER_NAME">%1$s</xliff:g> యొక్క ఖాతాలు"</string>
@@ -3597,7 +3626,7 @@
     <string name="auto_sync_account_title" msgid="898796354710116383">"డేటాని స్వయంచాలకంగా సమకాలీకరించు"</string>
     <string name="auto_sync_personal_account_title" msgid="8496263182646100610">"వ్యక్తిగత డేటాని స్వయంచాలకంగా సమకాలీకరించు"</string>
     <string name="auto_sync_work_account_title" msgid="4489172450037434152">"కార్యాలయ డేటాని స్వయంచాలకంగా సమకాలీకరించు"</string>
-    <string name="auto_sync_account_summary" msgid="692499211629185107">"డేటాని స్వయంచాలకంగా రీఫ్రెష్ చేసేలా అనువర్తనాలు అనుమతించబడతాయి"</string>
+    <string name="auto_sync_account_summary" msgid="692499211629185107">"డేటాని స్వయంచాలకంగా రీఫ్రెష్ చేసేలా యాప్‌లు అనుమతించబడతాయి"</string>
     <string name="account_sync_title" msgid="7214747784136106491">"ఖాతా సమకాలీకరణ"</string>
     <string name="account_sync_summary_some_on" msgid="3375930757891381175">"<xliff:g id="ID_2">%2$d</xliff:g>లో <xliff:g id="ID_1">%1$d</xliff:g> అంశాలకు సమకాలీకరణ ఆన్‌లో ఉంది"</string>
     <string name="account_sync_summary_all_on" msgid="570431636622254156">"అన్ని అంశాలకు సమకాలీకరణ ఆన్‌లో ఉంది"</string>
@@ -3608,7 +3637,7 @@
     <string name="enterprise_privacy_header" msgid="7402406406883832509">"మీ కార్యాలయ డేటాకు ప్రాప్యతను అందించడం కోసం, మీ సంస్థ మీ పరికరంలో సెట్టింగ్‌లను మార్చవచ్చు మరియు సాఫ్ట్‌వేర్‌ని ఇన్‌స్టాల్ చేయవచ్చు.\n\nమరిన్ని వివరాలు కావాలంటే, మీ సంస్థ యొక్క నిర్వాహకులను సంప్రదించండి."</string>
     <string name="enterprise_privacy_exposure_category" msgid="7313392680107938517">"మీ సంస్థ చూడగల సమాచార రకాలు"</string>
     <string name="enterprise_privacy_exposure_changes_category" msgid="9079283547182933771">"మీ సంస్థ యొక్క నిర్వాహకులు చేసిన మార్పులు"</string>
-    <string name="enterprise_privacy_device_access_category" msgid="5423434164248819058">"ఈ పరికరానికి మీ ప్రాప్యత"</string>
+    <string name="enterprise_privacy_device_access_category" msgid="5423434164248819058">"ఈ పరికరానికి మీ యాక్సెస్"</string>
     <string name="enterprise_privacy_enterprise_data" msgid="2773968662865848413">"మీ కార్యాలయ ఖాతాతో అనుబంధించబడిన డేటా, ఇమెయిల్ మరియు క్యాలెండర్ వంటివి"</string>
     <string name="enterprise_privacy_installed_packages" msgid="2313698828178764590">"మీ పరికరంలో ఉన్న అనువర్తనాల జాబితా"</string>
     <string name="enterprise_privacy_usage_stats" msgid="4398411405572759370">"ప్రతి అనువర్తనంలో గడిపిన సమయం మరియు ఉపయోగించిన డేటా"</string>
@@ -3625,10 +3654,10 @@
     <string name="enterprise_privacy_location_access" msgid="4158197200885270634">"స్థాన అనుమతులు"</string>
     <string name="enterprise_privacy_microphone_access" msgid="5717375623568864441">"మైక్రోఫోన్ అనుమతులు"</string>
     <string name="enterprise_privacy_camera_access" msgid="4858146118537519375">"కెమెరా అనుమతులు"</string>
-    <string name="enterprise_privacy_enterprise_set_default_apps" msgid="3288495615791128724">"డిఫాల్ట్ అనువర్తనాలు"</string>
+    <string name="enterprise_privacy_enterprise_set_default_apps" msgid="3288495615791128724">"డిఫాల్ట్ యాప్‌లు"</string>
     <plurals name="enterprise_privacy_number_packages" formatted="false" msgid="2765037387436064893">
-      <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> అనువర్తనాలు</item>
-      <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> అనువర్తనం</item>
+      <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>
@@ -3636,7 +3665,9 @@
     <string name="enterprise_privacy_always_on_vpn_personal" msgid="9217774730260037434">"మీ వ్యక్తిగత ప్రొఫైల్‌లో VPNని ఎల్లప్పుడూ-ఆన్ చేయి ఎంపిక ఆన్ చేయబడింది"</string>
     <string name="enterprise_privacy_always_on_vpn_work" msgid="7244472958208315814">"మీ కార్యాలయ ప్రొఫైల్‌లో VPNని ఎల్లప్పుడూ-ఆన్ చేయి ఎంపిక ఆన్ చేయబడింది"</string>
     <string name="enterprise_privacy_global_http_proxy" msgid="7936664553416257333">"గ్లోబల్ HTTP ప్రాక్సీ సెట్ చేయబడింది"</string>
-    <string name="enterprise_privacy_ca_certs" msgid="5885892204903688909">"విశ్వసనీయ ఆధారాలు"</string>
+    <string name="enterprise_privacy_ca_certs_device" msgid="2019652712782510262">"విశ్వసనీయ ఆధారాలు"</string>
+    <string name="enterprise_privacy_ca_certs_personal" msgid="2279084820904076599">"మీ వ్యక్తిగత ప్రొఫైల్‌‌లో విశ్వసనీయ ఆధారాలు"</string>
+    <string name="enterprise_privacy_ca_certs_work" msgid="6187377647815301809">"మీ కార్యాలయ ప్రొఫైల్‌‌లో విశ్వసనీయ ఆధారాలు"</string>
     <plurals name="enterprise_privacy_number_ca_certs" formatted="false" msgid="526375234629534165">
       <item quantity="other">కనీసం <xliff:g id="COUNT_1">%d</xliff:g> CA ప్రమాణపత్రాలు</item>
       <item quantity="one">కనీసం <xliff:g id="COUNT_0">%d</xliff:g> CA ప్రమాణపత్రం</item>
@@ -3657,13 +3688,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>
@@ -3673,12 +3704,12 @@
     <string name="storage_photos_videos" msgid="319854636702241898">"ఫోటోలు &amp; వీడియోలు"</string>
     <string name="storage_music_audio" msgid="789779084825206838">"సంగీతం &amp; ఆడియో"</string>
     <string name="storage_games" msgid="7703159201697117621">"గేమ్‌లు"</string>
-    <string name="storage_other_apps" msgid="5524321740031718083">"ఇతర అనువర్తనాలు"</string>
+    <string name="storage_other_apps" msgid="5524321740031718083">"ఇతర యాప్‌లు"</string>
     <string name="storage_files" msgid="8581083146777364063">"ఫైల్‌లు"</string>
     <string name="storage_size_large_alternate" msgid="3550744227788333060">"<xliff:g id="NUMBER">^1</xliff:g>"<small>" <xliff:g id="UNIT">^2</xliff:g>"</small>""</string>
     <string name="storage_volume_total" msgid="3499221850532701342">"<xliff:g id="TOTAL">%1$s</xliff:g>లో ఉపయోగించబడింది"</string>
     <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>
@@ -3693,12 +3724,14 @@
     <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="storage_movies_tv" msgid="5498394447562086890">"చలన చిత్రం &amp; టీవీ యాప్‌లు"</string>
     <string name="carrier_provisioning" msgid="4398683675591893169">"క్యారియర్ కేటాయింపు సమాచారం"</string>
     <string name="trigger_carrier_provisioning" msgid="3434865918009286187">"క్యారియర్ కేటాయింపు సక్రియం చేయండి"</string>
     <string name="new_device_suggestion_title" msgid="698847081680980774">"కొత్తవి మరియు అద్భుతమైనవి ఏమిటి?"</string>
-    <string name="new_device_suggestion_summary" msgid="7172709269203435870">"అగ్ర 5 ఫీచర్‌‌లను పరిశీలించండి"</string>
+    <string name="new_device_suggestion_summary" product="default" msgid="206396571522515855">"మీ కొత్త ఫోన్ గురించి తెలుసుకోండి"</string>
+    <string name="new_device_suggestion_summary" product="tablet" msgid="393751455688210956">"మీ కొత్త టాబ్లెట్ గురించి తెలుసుకోండి"</string>
+    <string name="new_device_suggestion_summary" product="device" msgid="2939870049868336652">"మీ కొత్త పరికరం గురించి తెలుసుకోండి"</string>
     <string name="disabled_low_ram_device" msgid="3751578499721173344">"ఈ లక్షణం ఈ పరికరంలో అందుబాటులో లేదు"</string>
 </resources>
diff --git a/res/values-th/arrays.xml b/res/values-th/arrays.xml
index 2e88fe9..79acde8 100644
--- a/res/values-th/arrays.xml
+++ b/res/values-th/arrays.xml
@@ -100,8 +100,6 @@
     <!-- no translation found for wifi_security_no_eap:0 (2084555984818107151) -->
     <!-- no translation found for wifi_security_no_eap:1 (397579322683471524) -->
     <!-- no translation found for wifi_security_no_eap:2 (1968820975358150484) -->
-    <!-- no translation found for wifi_ap_security:0 (5251664683198623324) -->
-    <!-- no translation found for wifi_ap_security:1 (7989073072260294673) -->
   <string-array name="wifi_eap_method">
     <item msgid="1160193392455075561">"PEAP"</item>
     <item msgid="7981731051382306293">"TLS"</item>
diff --git a/res/values-th/strings.xml b/res/values-th/strings.xml
index 317f97d..5d110af 100644
--- a/res/values-th/strings.xml
+++ b/res/values-th/strings.xml
@@ -40,7 +40,7 @@
     <string name="radio_info_data_connection_enable" msgid="8656750679353982712">"เปิดใช้การเชื่อมต่ออินเทอร์เน็ต"</string>
     <string name="radio_info_data_connection_disable" msgid="8541302390883231216">"ปิดใช้การเชื่อมต่ออินเทอร์เน็ต"</string>
     <string name="volte_provisioned_switch_string" msgid="7979882929810283786">"VoLTE ที่จัดสรรแล้ว"</string>
-    <string name="vt_provisioned_switch_string" msgid="7876998291744854759">"จัดสรรแฮงเอาท์วิดีโอแล้ว"</string>
+    <string name="vt_provisioned_switch_string" msgid="7876998291744854759">"จัดสรร Hangouts วิดีโอแล้ว"</string>
     <string name="wfc_provisioned_switch_string" msgid="3985406545172898078">"จัดสรรการโทรผ่าน Wi-Fi แล้ว"</string>
     <string name="eab_provisioned_switch_string" msgid="3482272907448592975">"จัดสรร EAB/Presence แล้ว"</string>
     <string name="radio_info_radio_power" msgid="7187666084867419643">"กำลังส่งของวิทยุเครือข่ายมือถือ"</string>
@@ -166,7 +166,7 @@
     <string name="bluetooth_map_acceptance_dialog_text" msgid="8712508202081143737">"%1$s ต้องการเข้าถึงข้อความของคุณ ให้สิทธิ์เข้าถึงแก่ %2$s ไหม"</string>
     <string name="bluetooth_sap_request" msgid="2669762224045354417">"ส่งคำขอการเข้าถึงซิม"</string>
     <string name="bluetooth_sap_acceptance_dialog_text" msgid="4414253873553608690">"<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g> ต้องการเข้าถึงซิมการ์ด การให้สิทธิ์เข้าถึงซิมการ์ดจะปิดการเชื่อมต่อข้อมูลบนอุปกรณ์ในระหว่างที่มีการเชื่อมต่อ โปรดให้สิทธิ์เข้าถึงแก่ <xliff:g id="DEVICE_NAME_1">%2$s?</xliff:g>"</string>
-    <string name="bluetooth_device_name_summary" msgid="4757990010751789977">"อุปกรณ์อื่นๆ จะเห็นเป็นชื่อ \"<xliff:g id="DEVICE_NAME">^1</xliff:g>\""</string>
+    <string name="bluetooth_device_name_summary" msgid="522235742194965734">"อุปกรณ์อื่นๆ จะเห็นเป็นชื่อ “<xliff:g id="DEVICE_NAME">^1</xliff:g>”"</string>
     <string name="bluetooth_paired_device_title" msgid="8638994696317952019">"อุปกรณ์ของคุณ"</string>
     <string name="bluetooth_pairing_page_title" msgid="7712127387361962608">"จับคู่อุปกรณ์ใหม่"</string>
     <string name="date_and_time" msgid="9062980487860757694">"วันที่และเวลา"</string>
@@ -312,6 +312,8 @@
     <string name="zone_auto" msgid="334783869352026648">"เขตเวลาอัตโนมัติ"</string>
     <string name="zone_auto_summaryOn" msgid="6142830927278458314">"ใช้เขตเวลาที่ระบุโดยเครือข่าย"</string>
     <string name="zone_auto_summaryOff" msgid="2597745783162041390">"ใช้เขตเวลาที่ระบุโดยเครือข่าย"</string>
+    <string name="date_time_24hour_auto" msgid="2117383168985653422">"รูปแบบ 24 ชั่วโมงแบบอัตโนมัติ"</string>
+    <string name="date_time_24hour_auto_summary" msgid="6351812925651480277">"ตามเวลาท้องถิ่น"</string>
     <string name="date_time_24hour_title" msgid="3203537578602803850">"รูปแบบ 24 ชั่วโมง"</string>
     <string name="date_time_24hour" msgid="1193032284921000063">"ใช้รูปแบบ 24 ชั่วโมง"</string>
     <string name="date_time_set_time_title" msgid="6296795651349047016">"เวลา"</string>
@@ -372,6 +374,9 @@
     <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="1961957425135180242">"ถัดไป"</string>
+    <string name="setup_fingerprint_enroll_skip_title" msgid="362050541117362034">"ข้ามการตั้งค่าลายนิ้วมือไหม"</string>
+    <string name="setup_fingerprint_enroll_skip_after_adding_lock_text" msgid="958990414356204763">"การตั้งค่าลายนิ้วมือใช้เวลาเพียง 1-2 นาทีเท่านั้น หากข้ามขั้นตอนนี้ คุณสามารถเพิ่มลายนิ้วมือภายหลังได้ใน \"การตั้งค่า\""</string>
+    <string name="lock_screen_intro_skip_title" msgid="4988210105913705679">"ข้ามการล็อกหน้าจอไหม"</string>
     <string name="lock_screen_intro_skip_dialog_text_frp" product="tablet" msgid="1581834104051243425">"ระบบจะไม่เปิดฟีเจอร์การปกป้องอุปกรณ์ คุณจะไม่สามารถป้องกันไม่ให้ผู้อื่นใช้แท็บเล็ตนี้หากทำอุปกรณ์หาย ถูกขโมย หรือถูกรีเซ็ต"</string>
     <string name="lock_screen_intro_skip_dialog_text_frp" product="device" msgid="4629503416877189572">"ระบบจะไม่เปิดฟีเจอร์การปกป้องอุปกรณ์ คุณจะไม่สามารถป้องกันไม่ให้ผู้อื่นใช้อุปกรณ์นี้หากทำอุปกรณ์หาย ถูกขโมย หรือถูกรีเซ็ต"</string>
     <string name="lock_screen_intro_skip_dialog_text_frp" product="default" msgid="2423428240245737909">"ระบบจะไม่เปิดฟีเจอร์การปกป้องอุปกรณ์ คุณจะไม่สามารถป้องกันไม่ให้ผู้อื่นใช้โทรศัพท์นี้หากทำอุปกรณ์หาย ถูกขโมย หรือถูกรีเซ็ต"</string>
@@ -389,7 +394,7 @@
     <string name="security_settings_fingerprint_enroll_start_title" msgid="2068961812439460133">"แตะเซ็นเซอร์"</string>
     <string name="security_settings_fingerprint_enroll_start_message" msgid="3909929328942564524">"วางนิ้วบนเซ็นเซอร์และยกขึ้นหลังจากรู้สึกถึงการสั่น"</string>
     <string name="security_settings_fingerprint_enroll_repeat_title" msgid="2819679722403209778">"ยกนิ้วขึ้นแล้วแตะอีกครั้ง"</string>
-    <string name="security_settings_fingerprint_enroll_repeat_message" msgid="6158989350522518586">"ยกนิ้วมือเรื่อยๆ เพิ่มส่วนต่างๆ ของลายนิ้วมือ"</string>
+    <string name="security_settings_fingerprint_enroll_repeat_message" msgid="6158989350522518586">"ยกนิ้วมือเรื่อยๆ เพื่อเพิ่มส่วนอื่นๆ ของลายนิ้วมือ"</string>
     <string name="security_settings_fingerprint_enroll_finish_title" msgid="7567276170287972230">"เพิ่มลายนิ้วมือแล้ว"</string>
     <string name="security_settings_fingerprint_enroll_finish_message" msgid="4796715961273420536">"เมื่อเห็นไอคอนนี้ ให้ใช้ลายนิ้วมือเพื่อระบุตัวตนหรือเพื่ออนุมัติการซื้อ"</string>
     <string name="security_settings_fingerprint_enroll_enrolling_skip" msgid="3710211704052369752">"ข้ามไปก่อน"</string>
@@ -457,7 +462,7 @@
     <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="lock_settings_picker_fingerprint_added_security_message" msgid="5768002109707648463">"เพื่อความปลอดภัยยิ่งขึ้น ให้ตั้งค่าการล็อกหน้าจอสำรอง"</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>
@@ -586,8 +591,9 @@
     </plurals>
     <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_confirm_label" msgid="8176726201389902380">"ยืนยัน"</string>
     <string name="lockpassword_cancel_label" msgid="8818529276331121899">"ยกเลิก"</string>
+    <string name="lockpassword_clear_label" msgid="5724429464960458155">"ล้าง"</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>
@@ -662,16 +668,16 @@
     <string name="bluetooth_disconnect_headset_profile" msgid="8635908811168780720">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> จะถูกตัดการเชื่อมต่อจากเสียงแฮนด์ฟรี"</string>
     <string name="bluetooth_disconnect_hid_profile" msgid="3282295189719352075">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> จะถูกตัดการเชื่อมต่อจากอุปกรณ์อินพุต"</string>
     <string name="bluetooth_disconnect_pan_user_profile" msgid="8037627994382458698">"การเข้าถึงอินเทอร์เน็ตผ่าน <xliff:g id="DEVICE_NAME">%1$s</xliff:g> จะถูกยกเลิกการเชื่อมต่อ"</string>
-    <string name="bluetooth_disconnect_pan_nap_profile" product="tablet" msgid="1262792320446274407">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> จะยกเลิกการเชื่อมต่อจากการแชร์การเชื่อมต่ออินเทอร์เน็ตของแท็บเล็ตนี้"</string>
-    <string name="bluetooth_disconnect_pan_nap_profile" product="default" msgid="5700332050175684571">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> จะยกเลิกการเชื่อมต่อจากการแชร์การเชื่อมต่ออินเทอร์เน็ตของโทรศัพท์นี้"</string>
+    <string name="bluetooth_disconnect_pan_nap_profile" product="tablet" msgid="8355910926439312604">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> จะยกเลิกการเชื่อมต่อจากการแชร์อินเทอร์เน็ตของแท็บเล็ตนี้"</string>
+    <string name="bluetooth_disconnect_pan_nap_profile" product="default" msgid="6251611115860359886">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> จะยกเลิกการเชื่อมต่อจากการแชร์อินเทอร์เน็ตของโทรศัพท์นี้"</string>
     <string name="bluetooth_device_advanced_title" msgid="6066342531927499308">"อุปกรณ์บลูทูธที่จับคู่"</string>
     <string name="bluetooth_device_advanced_online_mode_title" msgid="3689050071425683114">"เชื่อมต่อ"</string>
     <string name="bluetooth_device_advanced_online_mode_summary" msgid="1204424107263248336">"เชื่อมต่อกับอุปกรณ์บลูทูธ"</string>
     <string name="bluetooth_device_advanced_profile_header_title" msgid="102745381968579605">"ใช้สำหรับ"</string>
     <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="6436258151814414028">"เชื่อมต่ออินเทอร์เน็ตแล้ว"</string>
+    <string name="bluetooth_pan_nap_profile_summary_connected" msgid="1322694224800769308">"กำลังแชร์อินเทอร์เน็ตกับอุปกรณ์"</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>
@@ -705,11 +711,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">"WiFi"</string>
+    <string name="wifi_quick_toggle_title" msgid="8850161330437693895">"Wi-Fi"</string>
     <string name="wifi_quick_toggle_summary" msgid="2696547080481267642">"เปิด WiFi"</string>
-    <string name="wifi_settings" msgid="29722149822540994">"WiFi"</string>
+    <string name="wifi_settings" msgid="29722149822540994">"Wi-Fi"</string>
     <string name="wifi_settings_category" msgid="8719175790520448014">"การตั้งค่า WiFi"</string>
-    <string name="wifi_settings_title" msgid="3103415012485692233">"WiFi"</string>
+    <string name="wifi_settings_title" msgid="3103415012485692233">"Wi-Fi"</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>
@@ -724,14 +730,14 @@
     <string name="wifi_wakeup_summary_scanning_disabled" msgid="7247227922074840445">"ไม่พร้อมใช้งานเพราะการสแกนหา Wi‑Fi ปิดอยู่"</string>
     <string name="wifi_wakeup_summary_scoring_disabled" msgid="108339002136866897">"ในการใช้งาน ให้เลือกผู้ให้บริการจัดอันดับเครือข่าย"</string>
     <string name="wifi_poor_network_detection" msgid="4925789238170207169">"หลีกเลี่ยงการเชื่อมต่อที่สัญญาณไม่แรงพอ"</string>
-    <string name="wifi_poor_network_detection_summary" msgid="2784135142239546291">"อย่าใช้เครือข่าย WiFi หากไม่มีการเชื่อมต่ออินเทอร์เน็ตที่ดีเพียงพอ"</string>
-    <string name="wifi_avoid_poor_network_detection_summary" msgid="4674423884870027498">"ใช้เครือข่ายที่มีการเชื่อมต่ออินเทอร์เน็ตสัญญาณแรงเท่านั้น"</string>
+    <string name="wifi_poor_network_detection_summary" msgid="7016103106105907127">"อย่าใช้เครือข่าย WiFi หากไม่มีการเชื่อมต่ออินเทอร์เน็ตที่สัญญาณแรงพอ"</string>
+    <string name="wifi_avoid_poor_network_detection_summary" msgid="1644292503152790501">"ใช้เครือข่ายที่มีการเชื่อมต่ออินเทอร์เน็ตสัญญาณแรงเท่านั้น"</string>
     <string name="use_open_wifi_automatically_title" msgid="6851951242903078588">"เชื่อมต่อเครือข่ายแบบเปิด"</string>
     <string name="use_open_wifi_automatically_summary" msgid="2982091714252931713">"เชื่อมต่อเครือข่ายสาธารณะคุณภาพสูงโดยอัตโนมัติ"</string>
     <string name="use_open_wifi_automatically_summary_scoring_disabled" msgid="593964217679325831">"เลือกผู้ให้บริการจัดอันดับเครือข่ายเพื่อใช้งาน"</string>
     <string name="use_open_wifi_automatically_summary_scorer_unsupported_disabled" msgid="8472122600853650258">"เลือกผู้ให้บริการจัดอันดับเครือข่ายที่ใช้งานร่วมกันได้เพื่อใช้งาน"</string>
     <string name="wifi_install_credentials" msgid="3551143317298272860">"ติดตั้งใบรับรอง"</string>
-    <string name="wifi_scan_notify_text" msgid="5593805423071186757">"หากต้องการปรับปรุงความแม่นยำของตำแหน่ง แอปและบริการของระบบจะยังคงสามารถสแกนหาเครือข่าย Wi-Fi ได้ คุณสามารถเปลี่ยนแปลงฟีเจอร์นี้ได้ใน<xliff:g id="LINK_BEGIN_0">LINK_BEGIN</xliff:g>การตั้งค่าการสแกน<xliff:g id="LINK_END_1">LINK_END</xliff:g>"</string>
+    <string name="wifi_scan_notify_text" msgid="5593805423071186757">"เพื่อปรับปรุงความแม่นยำของตำแหน่ง แอปและบริการของระบบจะยังคงสามารถสแกนหาเครือข่าย Wi-Fi ได้ คุณสามารถเปลี่ยนแปลงฟีเจอร์นี้ได้ใน<xliff:g id="LINK_BEGIN_0">LINK_BEGIN</xliff:g>การตั้งค่าการสแกน<xliff:g id="LINK_END_1">LINK_END</xliff:g>"</string>
     <string name="wifi_scan_notify_text_scanning_off" msgid="3426075479272242098">"เปิดการสแกน Wi-Fi ใน<xliff:g id="LINK_BEGIN_0">LINK_BEGIN</xliff:g>การตั้งค่าการสแกน<xliff:g id="LINK_END_1">LINK_END</xliff:g>เพื่อปรับปรุงความแม่นยำของตำแหน่ง"</string>
     <string name="wifi_scan_notify_remember_choice" msgid="7104867814641144485">"ไม่ต้องแสดงข้อความนี้อีก"</string>
     <string name="wifi_setting_sleep_policy_title" msgid="5149574280392680092">"เปิด WiFi ขณะอยู่ในโหมดสลีป"</string>
@@ -741,9 +747,9 @@
     <string name="wifi_suspend_optimizations" msgid="1220174276403689487">"การเพิ่มประสิทธิภาพ WiFi"</string>
     <string name="wifi_suspend_optimizations_summary" msgid="4151428966089116856">"ลดการใช้แบตเตอรี่เมื่อ WiFi เปิดอยู่"</string>
     <string name="wifi_limit_optimizations_summary" msgid="9000801068363468950">"จำกัดแบตเตอรี่ที่ใช้โดย Wi-Fi"</string>
-    <string name="wifi_switch_away_when_unvalidated" msgid="1707247692180853058">"สลับไปใช้อินเทอร์เน็ตมือถือหาก Wi-Fi เชื่อมต่ออินเทอร์เน็ตไม่ได้"</string>
+    <string name="wifi_switch_away_when_unvalidated" msgid="8593144541347373394">"สลับไปใช้เน็ตมือถือหาก Wi-Fi เชื่อมต่ออินเทอร์เน็ตไม่ได้"</string>
     <string name="wifi_cellular_data_fallback_title" msgid="8753386877755616476">"สลับไปใช้อินเทอร์เน็ตมือถือโดยอัตโนมัติ"</string>
-    <string name="wifi_cellular_data_fallback_summary" msgid="6375399280719867214">"ใช้อินเทอร์เน็ตมือถือเมื่อ Wi‑Fi เชื่อมต่ออินเทอร์เน็ตไม่ได้ อาจมีค่าบริการจากการใช้อินเทอร์เน็ต"</string>
+    <string name="wifi_cellular_data_fallback_summary" msgid="1403505355490119307">"ใช้เน็ตมือถือเมื่อ 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>
@@ -781,6 +787,7 @@
     <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,6 +824,8 @@
     <string name="wifi_wps_available_first_item" msgid="4422547079984583502">"WPS ใช้งานได้"</string>
     <string name="wifi_wps_available_second_item" msgid="8427520131718215301">" (WPS ใช้งานได้)"</string>
     <string name="wifi_wps_nfc_enter_password" msgid="2288214226916117159">"ป้อนรหัสผ่านเครือข่าย"</string>
+    <string name="wifi_carrier_connect" msgid="8174696557882299911">"เครือข่าย Wi‑Fi ของผู้ให้บริการ"</string>
+    <string name="wifi_carrier_content" msgid="4634077285415851933">"เชื่อมต่อผ่านทาง <xliff:g id="NAME">%1%s</xliff:g>"</string>
     <string name="wifi_scan_always_turnon_message" msgid="203123538572122989">"เพื่อปรับปรุงความแม่นยำของตำแหน่ง และเพื่อวัตถุประสงค์อื่น ๆ <xliff:g id="APP_NAME">%1$s</xliff:g> ต้องการเปิดการสแกนเครือข่าย แม้ในขณะที่ไม่มี WiFi \n \n อนุญาตให้ดำเนินการนี้สำหรับแอปทั้งหมดที่ต้องการสแกนหรือไม่"</string>
     <string name="wifi_scan_always_turnoff_message" msgid="5538901671131941043">"หากต้องการปิด ให้ไปที่ \"ขั้นสูง\" ในเมนูรายการเพิ่มเติม"</string>
     <string name="wifi_scan_always_confirm_allow" msgid="5355973075896817232">"อนุญาต"</string>
@@ -824,9 +833,9 @@
     <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="5926979351959279577">"เครือข่ายนี้ไม่มีการเข้าถึงอินเทอร์เน็ต ยังต้องการเชื่อมต่ออยู่ไหม"</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_title" msgid="5779478650636392426">"Wi-Fi ไม่ได้เชื่อมต่ออินเทอร์เน็ต"</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>
@@ -834,6 +843,7 @@
     <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_modify" msgid="6100248070440710782">"แก้ไข"</string>
     <string name="wifi_failed_forget_message" msgid="1348172929201654986">"ไม่สามารถเลิกการจดจำเครือข่าย"</string>
     <string name="wifi_save" msgid="3331121567988522826">"บันทึก"</string>
     <string name="wifi_failed_save_message" msgid="6650004874143815692">"ไม่สามารถบันทึกเครือข่าย"</string>
@@ -846,6 +856,7 @@
     <string name="wifi_advanced_titlebar" msgid="4485841401774142908">"WiFi ขั้นสูง"</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_title" msgid="8954667664081737098">"รายละเอียดเครือข่าย"</string>
     <string name="wifi_details_subnet_mask" msgid="6720279144174924410">"ซับเน็ตมาสก์"</string>
     <string name="wifi_details_dns" msgid="8648826607751830768">"DNS"</string>
     <string name="wifi_details_ipv6_address_header" msgid="6734119149106422148">"ที่อยู่ IPv6"</string>
@@ -878,18 +889,17 @@
     <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">"WiFi ฮอตสปอตแบบพกพา"</string>
     <string name="wifi_hotspot_checkbox_text" msgid="7763495093333664887">"Wi-Fi ฮอตสปอต"</string>
-    <string name="wifi_hotspot_off_subtext" msgid="5466126533609394170">"ไม่ได้แชร์อินเทอร์เน็ตหรือเนื้อหากับอุปกรณ์อื่นๆ อยู่"</string>
-    <string name="wifi_hotspot_tethering_on_subtext" product="tablet" msgid="5752490509369962007">"กำลังแชร์การเชื่อมต่ออินเทอร์เน็ตของแท็บเล็ตนี้ผ่านฮอตสปอตอยู่"</string>
-    <string name="wifi_hotspot_tethering_on_subtext" product="default" msgid="6461075246164300670">"กำลังแชร์การเชื่อมต่ออินเทอร์เน็ตของโทรศัพท์นี้ผ่านฮอตสปอตอยู่"</string>
-    <string name="wifi_hotspot_on_local_only_subtext" msgid="2068110388011294735">"แอปไม่ได้แชร์เนื้อหาอยู่ หากต้องการแชร์การเชื่อมต่ออินเทอร์เน็ต ให้ปิดฮอตสปอตแล้วเปิดใหม่"</string>
-    <string name="wifi_hotspot_name_title" msgid="1341735529132128887">"ชื่อ Wi‑Fi"</string>
+    <string name="wifi_hotspot_off_subtext" msgid="2199911382555864644">"ไม่ได้แชร์อินเทอร์เน็ตหรือเนื้อหากับอุปกรณ์อื่น"</string>
+    <string name="wifi_hotspot_tethering_on_subtext" product="tablet" msgid="5936710887156133458">"กำลังแชร์การเชื่อมต่ออินเทอร์เน็ตของแท็บเล็ตนี้ผ่านฮอตสปอต"</string>
+    <string name="wifi_hotspot_tethering_on_subtext" product="default" msgid="5556202634866621632">"กำลังแชร์การเชื่อมต่ออินเทอร์เน็ตของโทรศัพท์นี้ผ่านฮอตสปอต"</string>
+    <string name="wifi_hotspot_on_local_only_subtext" msgid="5017191966153008">"แอปไม่ได้แชร์เนื้อหา หากต้องการแชร์การเชื่อมต่ออินเทอร์เน็ต ให้ปิดฮอตสปอตแล้วเปิดใหม่"</string>
+    <string name="wifi_hotspot_name_title" msgid="8237000746618636778">"ชื่อฮอตสปอต"</string>
     <string name="wifi_hotspot_name_summary_connecting" msgid="3378299995508671967">"กำลังเปิด <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>..."</string>
     <string name="wifi_hotspot_name_summary_connected" msgid="3888672084861445362">"อุปกรณ์อื่นๆ สามารถเชื่อมต่อกับ <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>"</string>
-    <string name="wifi_hotspot_password_title" msgid="1955592302902091281">"รหัสผ่าน Wi-Fi"</string>
+    <string name="wifi_hotspot_password_title" msgid="8676859981917573801">"รหัสผ่านฮอตสปอต"</string>
     <string name="wifi_hotspot_ap_band_title" msgid="1165801173359290681">"ย่านความถี่ AP"</string>
-    <string name="wifi_hotspot_footer_info_regular" msgid="1203489406068036455">"ใช้ฮอตสปอตเพื่อสร้างเครือข่าย Wi‑Fi สำหรับอุปกรณ์อื่นๆ ของคุณ ฮอตสปอตสามารถให้บริการอินเทอร์เน็ตโดยใช้การเชื่อมต่ออินเทอร์เน็ตมือถือ อาจมีค่าบริการอินเทอร์เน็ตมือถือเพิ่มเติม"</string>
+    <string name="wifi_hotspot_footer_info_regular" msgid="4789553667374849566">"ใช้ฮอตสปอตเพื่อสร้างเครือข่าย Wi‑Fi สำหรับอุปกรณ์อื่นๆ ฮอตสปอตจะแชร์อินเทอร์เน็ตโดยใช้การเชื่อมต่อข้อมูลผ่านมือถือ อาจมีค่าบริการเน็ตมือถือเพิ่มเติม"</string>
     <string name="wifi_hotspot_footer_info_local_only" msgid="857988412470694109">"แอปสามารถสร้างฮอตสปอตเพื่อแชร์เนื้อหากับอุปกรณ์ที่อยู่ใกล้"</string>
     <string name="wifi_tether_starting" msgid="1322237938998639724">"กำลังเปิดฮอตสปอต…"</string>
     <string name="wifi_tether_stopping" msgid="4835852171686388107">"กำลังปิดฮอตสปอต…"</string>
@@ -898,7 +908,6 @@
     <string name="wifi_tether_configure_ap_text" msgid="7974681394041609308">"ตั้งค่า WiFi ฮอตสปอต"</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">"การโทรผ่าน Wi-Fi"</string>
     <string name="wifi_calling_suggestion_title" msgid="9008010480466359578">"เปิดการโทรผ่าน Wi-Fi"</string>
@@ -938,8 +947,8 @@
   </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="emergency_address_title" msgid="932729250447887545">"ที่อยู่ฉุกเฉิน"</string>
+    <string name="emergency_address_summary" msgid="7751971156196115129">"ใช้เป็นตำแหน่งของคุณเมื่อโทรหาหมายเลขฉุกเฉินผ่าน Wi-Fi"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"แสดง"</string>
     <string name="sound_settings" msgid="5534671337768745343">"เสียง"</string>
     <string name="all_volume_title" msgid="4296957391257836961">"ระดับเสียง"</string>
@@ -993,9 +1002,13 @@
     <string name="search_settings" msgid="1910951467596035063">"ค้นหา"</string>
     <string name="search_settings_summary" msgid="9205656546570654169">"จัดการการตั้งค่าและประวัติการค้นหา"</string>
     <string name="search_settings_no_results" msgid="8799027492641230999">"ไม่พบผลลัพธ์"</string>
+    <string name="search_clear_history" msgid="4196658962573162457">"ล้างประวัติ"</string>
     <string name="display_settings" msgid="7965901687241669598">"การแสดงผล"</string>
     <string name="accelerometer_title" msgid="7854608399547349157">"หมุนหน้าจออัตโนมัติ"</string>
-    <string name="color_mode_title" msgid="3159275920408338215">"สีสันสดใส"</string>
+    <string name="color_mode_title" msgid="9186249332902370471">"สี"</string>
+    <string name="color_mode_option_natural" msgid="5013837483986772758">"ธรรมชาติ"</string>
+    <string name="color_mode_option_boosted" msgid="8588223970257287524">"บูสต์"</string>
+    <string name="color_mode_option_saturated" msgid="4569683960058798843">"อิ่มตัว"</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>
@@ -1065,7 +1078,7 @@
     <string name="ambient_display_screen_title" msgid="4252755516328775766">"หน้าจอแอมเบียนท์"</string>
     <string name="ambient_display_screen_summary_always_on" msgid="7337555569694794132">"เปิดเสมอ/ใช้แบตเตอรี่เพิ่มขึ้น"</string>
     <string name="ambient_display_screen_summary_notifications" msgid="1449570742600868654">"การแจ้งเตือนใหม่"</string>
-    <string name="ambient_display_category_triggers" msgid="4359289754456268573">"แสดงเมื่อใด"</string>
+    <string name="ambient_display_category_triggers" msgid="4359289754456268573">"แสดงเมื่อ"</string>
     <string name="doze_title" msgid="2375510714460456687">"การแจ้งเตือนใหม่"</string>
     <string name="doze_summary" msgid="3846219936142814032">"เปิดหน้าจอเมื่อได้รับการแจ้งเตือน"</string>
     <string name="doze_always_on_title" msgid="1046222370442629646">"เปิดใช้เสมอ"</string>
@@ -1114,15 +1127,16 @@
     <string name="system_update_settings_list_item_title" msgid="3342887311059985961">"การอัปเดตระบบ"</string>
     <string name="system_update_settings_list_item_summary" msgid="3853057315907710747"></string>
     <string name="firmware_version" msgid="4801135784886859972">"เวอร์ชันของ Android"</string>
+    <string name="firmware_title" msgid="5203122368389157877">"Android"</string>
     <string name="security_patch" msgid="8438384045870296634">"ระดับแพตช์ความปลอดภัยของ Android"</string>
     <string name="model_info" msgid="1952009518045740889">"โมเดล"</string>
-    <string name="hardware_info" msgid="2605080746512527805">"สื่อและฮาร์ดแวร์"</string>
+    <string name="model_summary" msgid="8306235877567782987">"รุ่น: %1$s"</string>
+    <string name="hardware_info" msgid="2605080746512527805">"โมเดลและฮาร์ดแวร์"</string>
     <string name="hardware_revision" msgid="8893547686367095527">"เวอร์ชันฮาร์ดแวร์"</string>
     <string name="fcc_equipment_id" msgid="149114368246356737">"รหัสอุปกรณ์"</string>
     <string name="baseband_version" msgid="1848990160763524801">"เวอร์ชันเบสแบนด์"</string>
     <string name="kernel_version" msgid="9192574954196167602">"เวอร์ชันเคอร์เนล"</string>
     <string name="build_number" msgid="3075795840572241758">"หมายเลขบิลด์"</string>
-    <string name="selinux_status" msgid="6212165375172061672">"สถานะ SELinux"</string>
     <string name="device_info_not_available" msgid="8062521887156825182">"ใช้งานไม่ได้"</string>
     <string name="device_status_activity_title" msgid="1411201799384697904">"สถานะ"</string>
     <string name="device_status" msgid="607405385799807324">"สถานะ"</string>
@@ -1133,11 +1147,21 @@
     <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>
+    <!-- no translation found for imei_multi_sim (6387012961838800539) -->
+    <skip />
     <string name="status_number" product="tablet" msgid="1138837891091222272">"MDN"</string>
-    <string name="status_number" product="default" msgid="5123197324870153205">"หมายเลขโทรศัพท์ของฉัน"</string>
+    <string name="status_number" product="default" msgid="5948892105546651296">"หมายเลขโทรศัพท์"</string>
+    <!-- no translation found for status_number_sim_slot (2755592991367858860) -->
+    <skip />
+    <!-- no translation found for status_number_sim_slot (1898212200138025729) -->
+    <skip />
+    <string name="status_number_sim_status" product="tablet" msgid="1367110147304523864">"MDN ในซิม"</string>
+    <string name="status_number_sim_status" product="default" msgid="9123351360569466330">"หมายเลขโทรศัพท์ในซิม"</string>
     <string name="status_min_number" msgid="3519504522179420597">"นาที"</string>
     <string name="status_msid_number" msgid="909010114445780530">"MSID"</string>
     <string name="status_prl_version" msgid="1007470446618081441">"รุ่น PRL"</string>
+    <!-- no translation found for meid_multi_sim (748999971744491771) -->
+    <skip />
     <string name="status_meid_number" msgid="1751442889111731088">"MEID"</string>
     <string name="status_icc_id" msgid="943368755577172747">"ICCID"</string>
     <string name="status_network_type" msgid="3279383550222116235">"ประเภทเครือข่ายมือถือ"</string>
@@ -1150,7 +1174,6 @@
     <string name="status_wifi_mac_address" msgid="2202206684020765378">"ที่อยู่ MAC ของ WiFi"</string>
     <string name="status_bt_address" msgid="4195174192087439720">"ที่อยู่บลูทูธ"</string>
     <string name="status_serial_number" msgid="2257111183374628137">"หมายเลขซีเรียล"</string>
-    <string name="status_unavailable" msgid="7862009036663793314">"ไม่ว่าง"</string>
     <string name="status_up_time" msgid="7294859476816760399">"เวลาใช้งาน"</string>
     <string name="status_awake_time" msgid="2393949909051183652">"เวลาการทำงาน"</string>
     <string name="internal_memory" msgid="9129595691484260784">"ที่เก็บข้อมูลภายใน"</string>
@@ -1248,7 +1271,7 @@
     <string name="storage_detail_other" msgid="8404938385075638238">"อื่นๆ"</string>
     <string name="storage_detail_system" msgid="4629506366064709687">"ระบบ"</string>
     <string name="storage_detail_explore" msgid="7911344011431568294">"สำรวจ <xliff:g id="NAME">^1</xliff:g>"</string>
-    <string name="storage_detail_dialog_other" msgid="8907101974576694793">"ไฟล์อื่นๆ ได้แก่ ไฟล์ที่แชร์ซึ่งแอปบันทึกไว้, ไฟล์ที่ดาวน์โหลดจากอินเทอร์เน็ตหรือบลูทูธ, ไฟล์ Android และอื่นๆ \n\nหากต้องการดูเนื้อหาที่มองเห็นได้ของ <xliff:g id="NAME">^1</xliff:g> นี้ ให้แตะ \"สำรวจ\""</string>
+    <string name="storage_detail_dialog_other" msgid="8845766044697204852">"ไฟล์อื่นๆ ได้แก่ ไฟล์ที่แชร์ซึ่งแอปบันทึกไว้ ไฟล์ที่ดาวน์โหลดจากอินเทอร์เน็ตหรือบลูทูธ ไฟล์ Android และอื่นๆ \n\nหากต้องการดูเนื้อหาที่มองเห็นได้ของ <xliff:g id="NAME">^1</xliff:g> นี้ ให้แตะ \"สำรวจ\""</string>
     <string name="storage_detail_dialog_system" msgid="862835644848361569">"ระบบมีไฟล์ที่ใช้เพื่อเรียกใช้ Android เวอร์ชัน <xliff:g id="VERSION">%s</xliff:g>"</string>
     <string name="storage_detail_dialog_user" msgid="3267254783294197804">"<xliff:g id="USER_0">^1</xliff:g> อาจมีการบันทึกรูปภาพ เพลง แอป หรือข้อมูลอื่นๆ โดยใช้พื้นที่เก็บข้อมูลไป <xliff:g id="SIZE">^2</xliff:g> \n\nหากต้องการดูรายละเอียด ให้สลับไปที่ <xliff:g id="USER_1">^1</xliff:g>"</string>
     <string name="storage_wizard_init_title" msgid="5085400514028585772">"ตั้งค่า <xliff:g id="NAME">^1</xliff:g> ของคุณ"</string>
@@ -1326,7 +1349,8 @@
     <string name="menu_restore" msgid="8260067415075573273">"รีเซ็ตเป็นค่าเริ่มต้น"</string>
     <string name="restore_default_apn_completed" msgid="2824775307377604897">"รีเซ็ตการตั้งค่า APN กลับเป็นค่าเริ่มต้นเรียบร้อยแล้ว"</string>
     <string name="reset_dashboard_title" msgid="6254873816990678620">"ตัวเลือกการรีเซ็ต"</string>
-    <string name="reset_network_title" msgid="6166025966016873843">"รีเซ็ต Wi-Fi อุปกรณ์เคลื่อนที่ และบลูทูธ"</string>
+    <string name="reset_dashboard_summary" msgid="4851012632493522755">"สามารถรีเซ็ตเครือข่าย แอป หรืออุปกรณ์ได้"</string>
+    <string name="reset_network_title" msgid="6166025966016873843">"รีเซ็ต Wi-Fi เน็ตมือถือและบลูทูธ"</string>
     <string name="reset_network_desc" msgid="5547979398298881406">"การดำเนินการนี้จะรีเซ็ตการตั้งค่าเครือข่ายทั้งหมด รวมถึง:\n\n"<li>"Wi‑Fi"</li>\n<li>"อินเทอร์เน็ตมือถือ"</li>\n<li>"บลูทูธ"</li></string>
     <string name="reset_network_button_text" msgid="2035676527471089853">"รีเซ็ตการตั้งค่า"</string>
     <string name="reset_network_final_desc" msgid="6388371121099245116">"หากรีเซ็ตการตั้งค่าเครือข่ายทั้งหมด คุณจะไม่สามารถยกเลิกการทำงานนี้ได้"</string>
@@ -1334,17 +1358,14 @@
     <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="6617679904229218425">"ลบข้อมูลทั้งหมด (รีเซ็ตเป็นค่าเริ่มต้นจากโรงงาน)"</string>
-    <plurals name="master_clear_with_account_summary" formatted="false" msgid="5911377203778818712">
-      <item quantity="other">ระบบจะรีเซ็ต <xliff:g id="ACCOUNT_COUNT">%1$d</xliff:g> บัญชี</item>
-      <item quantity="one">ระบบจะรีเซ็ต 1 บัญชี</item>
-    </plurals>
-    <string name="master_clear_summary" msgid="6902443944660426951">"ระบบจะรีเซ็ตพื้นที่เก็บข้อมูลภายในและข้อมูลทั้งหมด"</string>
+    <string name="master_clear_title" msgid="3531267871084279512">"ลบข้อมูลทั้งหมด (รีเซ็ตเป็นค่าเริ่มต้น)"</string>
     <string name="master_clear_desc" product="tablet" msgid="9146059417023157222">"การดำเนินการนี้จะลบข้อมูลทั้งหมดออกจาก"<b>"ที่จัดเก็บข้อมูลภายใน"</b>"ของแท็บเล็ตของคุณ ซึ่งประกอบด้วย\n\n"<li>"บัญชี Google ของคุณ"</li>\n<li>"ข้อมูลและการตั้งค่าของระบบและแอปพลิเคชัน"</li>\n<li>"แอปพลิเคชันที่ดาวน์โหลด"</li></string>
     <string name="master_clear_desc" product="default" msgid="4800386183314202571">"การดำเนินการนี้จะลบข้อมูลทั้งหมดออกจาก"<b>"ที่จัดเก็บข้อมูลภายใน"</b>"ของโทรศัพท์ของคุณ ซึ่งประกอบด้วย\n\n"<li>"บัญชี Google ของคุณ"</li>\n<li>"ข้อมูลและการตั้งค่าของระบบและแอปพลิเคชัน"</li>\n<li>"แอปพลิเคชันที่ดาวน์โหลด"</li></string>
     <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"ขณะนี้คุณได้ลงชื่อเข้าใช้บัญชีต่อไปนี้แล้ว:\n"</string>
     <string name="master_clear_other_users_present" product="default" msgid="5161423070702470742">\n\n"มีผู้ใช้รายอื่นอยู่บนอุปกรณ์เครื่องนี้\n"</string>
     <string name="master_clear_desc_also_erases_external" msgid="1903185203791274237"><li>"เพลง"</li>\n<li>"รูปภาพ"</li>\n<li>"ข้อมูลผู้ใช้อื่นๆ"</li></string>
+    <string name="master_clear_desc_also_erases_esim" msgid="312352697653096008"><li>"ผู้ให้บริการใน eSIM"</li></string>
+    <string name="master_clear_desc_no_cancel_mobile_plan" msgid="5460926449093211144">\n\n"การดำเนินการนี้จะไม่ยกเลิกแพ็กเกจมือถือของคุณ"</string>
     <string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="7744115866662613411">\n\n"หากต้องการล้างข้อมูลเพลง รูปภาพ และข้อมูลผู้ใช้อื่นๆ จะต้องลบ"<b>"ที่จัดเก็บข้อมูล 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>
@@ -1376,18 +1397,18 @@
     <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_subtext" product="default" msgid="5991482890033484794">"แชร์การเชื่อมต่ออินเทอร์เน็ตของโทรศัพท์ผ่าน USB"</string>
-    <string name="usb_tethering_subtext" product="tablet" msgid="5988796139573211318">"แชร์การเชื่อมต่ออินเทอร์เน็ตของแท็บเล็ตผ่าน USB"</string>
+    <string name="usb_tethering_subtext" product="default" msgid="3711893746716442706">"แชร์การเชื่อมต่ออินเทอร์เน็ตของโทรศัพท์ผ่าน USB"</string>
+    <string name="usb_tethering_subtext" product="tablet" msgid="2292916486612255069">"แชร์การเชื่อมต่ออินเทอร์เน็ตของแท็บเล็ตผ่าน USB"</string>
     <string name="bluetooth_tether_checkbox_text" msgid="2379175828878753652">"ปล่อยสัญญาณบลูทูธ"</string>
-    <string name="bluetooth_tethering_subtext" product="tablet" msgid="4558227863463153412">"แชร์การเชื่อมต่ออินเทอร์เน็ตของแท็บเล็ตผ่านบลูทูธ"</string>
-    <string name="bluetooth_tethering_subtext" product="default" msgid="1055197887836203595">"แชร์การเชื่อมต่ออินเทอร์เน็ตของโทรศัพท์ผ่านบลูทูธ"</string>
-    <string name="bluetooth_tethering_off_subtext_config" msgid="6326877798974938021">"กำลังแชร์อินเทอร์เน็ตของ <xliff:g id="DEVICE_NAME">%1$d</xliff:g> นี้ผ่านบลูทูธ"</string>
+    <string name="bluetooth_tethering_subtext" product="tablet" msgid="8828883800511737077">"แชร์การเชื่อมต่ออินเทอร์เน็ตของแท็บเล็ตผ่านบลูทูธ"</string>
+    <string name="bluetooth_tethering_subtext" product="default" msgid="1904667146601254812">"แชร์การเชื่อมต่ออินเทอร์เน็ตของโทรศัพท์ผ่านบลูทูธ"</string>
+    <string name="bluetooth_tethering_off_subtext_config" msgid="376389105752995580">"กำลังแชร์การเชื่อมต่ออินเทอร์เน็ตของ <xliff:g id="DEVICE_NAME">%1$d</xliff:g> นี้ผ่านบลูทูธ"</string>
     <string name="bluetooth_tethering_overflow_error" msgid="2135590598511178690">"ไม่สามารถปล่อยการเชื่อมต่อมากกว่า <xliff:g id="MAXCONNECTION">%1$d</xliff:g> อุปกรณ์"</string>
     <string name="bluetooth_untether_blank" msgid="2871192409329334813">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> จะถูกยกเลิกการปล่อยสัญญาณ"</string>
-    <string name="tethering_footer_info" msgid="1308462275952345985">"ใช้ฮอตสปอตและการเชื่อมต่อผ่านมือถือเพื่อให้อุปกรณ์อื่นๆ ใช้อินเทอร์เน็ตผ่านการเชื่อมต่ออินเทอร์เน็ตมือถือได้ แอปสามารถสร้างฮอตสปอตเพื่อแชร์เนื้อหากับอุปกรณ์ที่อยู่ใกล้ได้ด้วย"</string>
+    <string name="tethering_footer_info" msgid="7112228674056306147">"ใช้ฮอตสปอตและการเชื่อมต่ออินเทอร์เน็ตผ่านมือถือ เพื่อให้อุปกรณ์อื่นๆ ใช้อินเทอร์เน็ตจากการเชื่อมต่อข้อมูลผ่านมือถือได้ และแอปยังสามารถสร้างฮอตสปอตเพื่อแชร์เนื้อหากับอุปกรณ์ที่อยู่ใกล้เคียงได้อีกด้วย"</string>
     <string name="tethering_help_button_text" msgid="656117495547173630">"ความช่วยเหลือ"</string>
     <string name="network_settings_title" msgid="2876509814832830757">"เครือข่ายมือถือ"</string>
-    <string name="manage_mobile_plan_title" msgid="7630170375010107744">"แพคเกจอินเทอร์เน็ต"</string>
+    <string name="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>
@@ -1459,17 +1480,18 @@
     <string name="settings_license_activity_loading" msgid="3337535809093591740">"กำลังโหลด…"</string>
     <string name="settings_safetylegal_title" msgid="1289483965535937431">"ข้อมูลความปลอดภัย"</string>
     <string name="settings_safetylegal_activity_title" msgid="6901214628496951727">"ข้อมูลความปลอดภัย"</string>
-    <string name="settings_safetylegal_activity_unreachable" msgid="250674109915859456">"คุณไม่มีการเชื่อมต่อข้อมูล หากต้องการดูข้อมูลนี้ในขณะนี้ ให้ไปที่ %s จากคอมพิวเตอร์เครื่องใดก็ได้ที่เชื่อมต่อกับอินเทอร์เน็ต"</string>
+    <string name="settings_safetylegal_activity_unreachable" msgid="142307697309858185">"คุณไม่มีการเชื่อมต่อข้อมูล หากต้องการดูข้อมูลตอนนี้ ให้ไปที่ %s จากคอมพิวเตอร์ที่เชื่อมต่อกับอินเทอร์เน็ต"</string>
     <string name="settings_safetylegal_activity_loading" msgid="8059022597639516348">"กำลังโหลด…"</string>
-    <string name="lockpassword_choose_your_password_header" msgid="8624900666929394990">"เลือกรหัสผ่านของคุณ"</string>
-    <string name="lockpassword_choose_your_password_header_for_fingerprint" msgid="6624409510609085450">"หากต้องการใช้ลายนิ้วมือ ให้ตั้งรหัสผ่าน"</string>
-    <string name="lockpassword_choose_your_pattern_header" msgid="6949761069941694050">"เลือกรูปแบบของคุณ"</string>
-    <string name="lockpassword_choose_your_pattern_header_for_fingerprint" msgid="5901096361617543819">"หากต้องการใช้ลายนิ้วมือ ให้ตั้งค่ารูปแบบ"</string>
-    <string name="lockpassword_choose_your_pin_header" msgid="7598849519816138302">"เลือก PIN ของคุณ"</string>
-    <string name="lockpassword_choose_your_pin_header_for_fingerprint" msgid="765344692615917183">"หากต้องการใช้ลายนิ้วมือ ให้ตั้งค่า PIN"</string>
-    <string name="lockpassword_confirm_your_password_header" msgid="6308478184889846633">"ยืนยันรหัสผ่านของคุณ"</string>
+    <string name="lockpassword_choose_your_screen_lock_header" msgid="3872462096767152394">"ตั้งค่าการล็อกหน้าจอ"</string>
+    <string name="lockpassword_choose_your_password_message" msgid="1197569283524841412">"ตั้งรหัสผ่านเพื่อความปลอดภัย"</string>
+    <string name="lockpassword_choose_your_password_header_for_fingerprint" msgid="2541818487015343503">"หากต้องการใช้ลายนิ้วมือ ให้ตั้งรหัสผ่าน"</string>
+    <string name="lockpassword_choose_your_pattern_header_for_fingerprint" msgid="7709785406243556723">"หากต้องการใช้ลายนิ้วมือ ให้ตั้งรูปแบบ"</string>
+    <string name="lockpassword_choose_your_pin_message" msgid="1875420718677275646">"ตั้ง PIN เพื่อความปลอดภัย"</string>
+    <string name="lockpassword_choose_your_pin_header_for_fingerprint" msgid="1549639053195796674">"หากต้องการใช้ลายนิ้วมือ ให้ตั้งค่า PIN"</string>
+    <string name="lockpassword_choose_your_pattern_message" msgid="5986983400689720015">"ตั้งรูปแบบเพื่อความปลอดภัย"</string>
+    <string name="lockpassword_confirm_your_password_header" msgid="1266027268220850931">"ป้อนรหัสผ่านอีกครั้ง"</string>
     <string name="lockpassword_confirm_your_pattern_header" msgid="7543433733032330821">"ยืนยันรูปแบบของคุณ"</string>
-    <string name="lockpassword_confirm_your_pin_header" msgid="49038294648213197">"ยืนยัน PIN"</string>
+    <string name="lockpassword_confirm_your_pin_header" msgid="7744513791910572550">"ป้อน PIN อีกครั้ง"</string>
     <string name="lockpassword_confirm_passwords_dont_match" msgid="5140892109439191415">"รหัสผ่านไม่ตรงกัน"</string>
     <string name="lockpassword_confirm_pins_dont_match" msgid="7226244811505606217">"PIN ไม่ตรงกัน"</string>
     <string name="lockpassword_choose_lock_generic_header" msgid="3811438094903786145">"ตัวเลือกปลดล็อก"</string>
@@ -1488,6 +1510,12 @@
     <string name="lockpassword_strong_auth_required_work_pattern" msgid="3003781907040522053">"ใช้รูปแบบของงานเพื่อเพิ่มความปลอดภัย"</string>
     <string name="lockpassword_strong_auth_required_work_pin" msgid="3367491332598821552">"ป้อน PIN ของงานเพื่อเพิ่มความปลอดภัย"</string>
     <string name="lockpassword_strong_auth_required_work_password" msgid="8159775129968582940">"ป้อนรหัสผ่านของงานเพื่อเพิ่มความปลอดภัย"</string>
+    <string name="lockpassword_confirm_your_pattern_details_frp" msgid="6757336656791723193">"โทรศัพท์รีเซ็ตเป็นเป็นค่าเริ่มต้น ป้อนรูปแบบก่อนหน้าเพื่อใช้โทรศัพท์เครื่องนี้"</string>
+    <string name="lockpassword_confirm_your_pin_details_frp" msgid="826520613445990470">"โทรศัพท์รีเซ็ตเป็นเป็นค่าเริ่มต้น ป้อน PIN ก่อนหน้าเพื่อใช้โทรศัพท์เครื่องนี้"</string>
+    <string name="lockpassword_confirm_your_password_details_frp" msgid="8944081074615739040">"โทรศัพท์รีเซ็ตเป็นเป็นค่าเริ่มต้น ป้อนรหัสผ่านก่อนหน้าเพื่อใช้โทรศัพท์เครื่องนี้"</string>
+    <string name="lockpassword_confirm_your_pattern_header_frp" msgid="2898036091609128286">"ยืนยันรูปแบบ"</string>
+    <string name="lockpassword_confirm_your_pin_header_frp" msgid="4141601774778898803">"ยืนยัน PIN"</string>
+    <string name="lockpassword_confirm_your_password_header_frp" msgid="3762615419295360480">"ยืนยันรหัสผ่าน"</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>
@@ -1537,7 +1565,6 @@
     <string name="install_applications_title" msgid="4987712352256508946">"อนุญาตให้ติดตั้งแอปจากทุกแห่ง"</string>
     <string name="recent_app_category_title" msgid="6673071268966003928">"แอปที่เปิดล่าสุด"</string>
     <string name="see_all_apps_title" msgid="1317153498074308438">"ดูทั้ง <xliff:g id="COUNT">%1$d</xliff:g> แอป"</string>
-    <string name="recent_app_summary" msgid="3366446669844932300">"<xliff:g id="TIME">^1</xliff:g>ที่ผ่านมา"</string>
     <string name="install_all_warning" product="tablet" msgid="8310489909586138165">"แท็บเล็ตและข้อมูลส่วนตัวของคุณมีความเสี่ยงมากขึ้นที่จะถูกโจมตีจากแอปที่ไม่รู้จัก การติดตั้งแอปจากแหล่งที่มานี้แสดงว่าคุณยอมรับว่าจะรับผิดชอบต่อความเสียหายใดๆ ที่มีต่อแท็บเล็ตหรือการสูญเสียข้อมูลที่อาจเกิดจากการใช้งานแอปดังกล่าว"</string>
     <string name="install_all_warning" product="default" msgid="1952257127370115988">"โทรศัพท์และข้อมูลส่วนตัวของคุณมีความเสี่ยงมากขึ้นที่จะถูกโจมตีจากแอปที่ไม่รู้จัก การติดตั้งแอปจากแหล่งที่มานี้แสดงว่าคุณยอมรับว่าจะรับผิดชอบต่อความเสียหายใดๆ ที่มีต่อโทรศัพท์หรือการสูญเสียข้อมูลที่อาจเกิดจากการใช้งานแอปดังกล่าว"</string>
     <string name="advanced_settings" msgid="1777249286757067969">"การตั้งค่าขั้นสูง"</string>
@@ -1655,11 +1682,10 @@
     <string name="app_special_disable_dlg_text" msgid="5832078825810635913">"หากคุณปิดใช้แอปนี้ Android และแอปอื่นๆ อาจไม่ทำงานตามที่ควรจะเป็นอีกต่อไป และระบบจะลบข้อมูลของคุณด้วย"</string>
     <string name="app_disable_notifications_dlg_title" msgid="7669264654851761857">"ปิดการแจ้งเตือนหรือไม่"</string>
     <string name="app_disable_notifications_dlg_text" msgid="5088484670924769845">"หากคุณปิดการแจ้งเตือนสำหรับแอปพลิเคชันนี้ คุณอาจพลาดการแจ้งเตือนและการอัปเดตที่สำคัญ"</string>
-    <string name="app_install_details_group_title" msgid="7084623031296083574">"สโตร์"</string>
+    <string name="app_install_details_group_title" msgid="7084623031296083574">"Store"</string>
     <string name="app_install_details_title" msgid="6905279702654975207">"รายละเอียดแอป"</string>
     <string name="app_install_details_summary" msgid="6464796332049327547">"ติดตั้งแอปจาก <xliff:g id="APP_STORE">%1$s</xliff:g>"</string>
     <string name="instant_app_details_summary" msgid="4529934403276907045">"ดูข้อมูลเพิ่มเติมใน <xliff:g id="APP_STORE">%1$s</xliff:g>"</string>
-    <string name="app_ops_settings" msgid="5108481883575527511">"การทำงานของแอป"</string>
     <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>
@@ -1711,6 +1737,7 @@
     <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_empty_list_user_restricted" msgid="5984015900102140696">"คุณไม่มีสิทธิ์เปลี่ยนภาษาของอุปกรณ์"</string>
     <string name="language_keyboard_settings_title" msgid="3709159207482544398">"ภาษาและการป้อนข้อมูล"</string>
     <string name="input_assistance" msgid="7577795275222555487">"ความช่วยเหลือในการป้อนข้อมูล"</string>
     <string name="keyboard_settings_category" msgid="8275523930352487827">"แป้นพิมพ์และวิธีการป้อนข้อมูล"</string>
@@ -1801,7 +1828,7 @@
     <string name="accessibility_settings_summary" msgid="981260486011624939">"โปรแกรมอ่านหน้าจอ การแสดงผล ส่วนควบคุมการโต้ตอบ"</string>
     <string name="vision_settings_title" msgid="4204111425716868288">"การตั้งค่าการมองเห็น"</string>
     <string name="vision_settings_description" msgid="5679491180156408260">"คุณสามารถปรับแต่งอุปกรณ์นี้ให้ตรงกับความต้องการของคุณ และเปลี่ยนฟีเจอร์การเข้าถึงเหล่านี้ได้ภายหลังในการตั้งค่า"</string>
-    <string name="vision_settings_suggestion_title" msgid="917294957154878441">"เพิ่มขนาดอักษร"</string>
+    <string name="vision_settings_suggestion_title" msgid="8058794060304707004">"เปลี่ยนขนาดแบบอักษร"</string>
     <string name="screen_reader_category_title" msgid="7739154903913400641">"โปรแกรมอ่านหน้าจอ"</string>
     <string name="audio_and_captions_category_title" msgid="3420727114421447524">"เสียงและข้อความบนหน้าจอ"</string>
     <string name="display_category_title" msgid="685461049938269166">"การแสดงผล"</string>
@@ -1838,7 +1865,6 @@
     <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="preference_summary_default_combination" msgid="8532964268242666060">"<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>
@@ -1957,12 +1983,14 @@
     <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_whitelisted" msgid="7375400051141016808">"เพิ่มประสิทธิภาพแอปสำหรับการใช้งานแบตเตอรี่ไม่ได้"</string>
+    <string name="background_activity_warning_dialog_title" msgid="2216249969149568871">"จำกัดกิจกรรมในพื้นหลังใช่ไหม"</string>
+    <string name="background_activity_warning_dialog_text" msgid="7049624449246121981">"แอปอาจทำงานผิดพลาดหากคุณจำกัดกิจกรรมในพื้นหลัง"</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" msgid="6393929085382334341">"การใช้งานแอปตั้งแต่ชาร์จจนเต็ม (<xliff:g id="RELATIVE_TIME">^1</xliff:g>)"</string>
+    <string name="power_usage_list_summary_device" msgid="4461926045610455423">"การใช้งานอุปกรณ์ตั้งแต่ชาร์จจนเต็ม (<xliff:g id="RELATIVE_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>
@@ -1974,7 +2002,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">"WiFi"</string>
+    <string name="battery_stats_wifi_running_label" msgid="1845839195549226252">"Wi-Fi"</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) -->
@@ -2014,7 +2042,7 @@
     <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">"WiFi"</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_phone" msgid="5392641106474567277">"การโทรด้วยเสียง"</string>
@@ -2126,14 +2154,6 @@
     <string name="services_subtitle" msgid="4296402367067266425">"บริการ"</string>
     <string name="menu_proc_stats_duration" msgid="2323483592994720196">"ระยะเวลา"</string>
     <string name="mem_details_title" msgid="6548392825497290498">"รายละเอียดหน่วยความจำ"</string>
-    <string name="mem_state_subtitle" msgid="2407238869781011933">"สถานะหน่วยความจำ"</string>
-    <string name="mem_use_subtitle" msgid="7319468770222422412">"การใช้หน่วยความจำ"</string>
-    <string name="mem_use_kernel_type" msgid="8698327165935012484">"เคอร์เนล"</string>
-    <string name="mem_use_native_type" msgid="5976704902328347400">"ในเครื่อง"</string>
-    <string name="mem_use_kernel_cache_type" msgid="6411475064463957513">"แคชของเคอร์เนล"</string>
-    <string name="mem_use_zram_type" msgid="9087217476795358232">"การสลับ ZRam"</string>
-    <string name="mem_use_free_type" msgid="717708548454880840">"ว่าง"</string>
-    <string name="mem_use_total" msgid="6308786055749777934">"รวม"</string>
     <string name="menu_duration_3h" msgid="4714866438374738385">"3 ชั่วโมง"</string>
     <string name="menu_duration_6h" msgid="1940846763432184132">"6 ชั่วโมง"</string>
     <string name="menu_duration_12h" msgid="7890465404584356294">"12 ชั่วโมง"</string>
@@ -2176,7 +2196,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">"WiFi"</string>
+    <string name="gadget_wifi" msgid="4712584536500629417">"Wi-Fi"</string>
     <string name="gadget_bluetooth" msgid="8998572807378694410">"บลูทูธ"</string>
     <string name="gadget_location" msgid="2974757497945178165">"ตำแหน่ง"</string>
     <string name="gadget_sync" msgid="858895763714222152">"ซิงค์"</string>
@@ -2208,14 +2228,14 @@
     <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">"คุณต้องตั้ง PIN หรือรหัสผ่านสำหรับการล็อกหน้าจอก่อนจึงจะสามารถใช้ที่เก็บข้อมูลรับรองได้"</string>
+    <string name="credentials_configure_lock_screen_hint" msgid="8058230497337529036">"อุปกรณ์ต้องมีหน้าจอล็อกที่ปลอดภัยก่อน คุณจึงจะสามารถใช้ที่เก็บข้อมูลที่เชื่อถือได้"</string>
+    <string name="credentials_configure_lock_screen_button" msgid="253239765216055321">"ตั้งค่าล็อก"</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>
@@ -2335,8 +2355,6 @@
     <skip />
     <string name="cant_sync_dialog_title" msgid="2777238588398046285">"ซิงค์ด้วยตนเองไม่ได้"</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">"ที่อยู่ MAC ใน 4G"</string>
     <string name="enter_password" msgid="8035706727471334122">"ป้อนรหัสผ่านเพื่อเริ่มต้นใช้งาน Android"</string>
     <string name="enter_pin" msgid="5305333588093263790">"ป้อน PIN เพื่อเริ่มต้นใช้งาน Android"</string>
     <string name="enter_pattern" msgid="4187435713036808566">"วาดรูปแบบเพื่อเริ่มต้นใช้งาน Android"</string>
@@ -2350,6 +2368,7 @@
     <string name="misc_files_selected_count" msgid="4647048020823912088">"เลือก <xliff:g id="NUMBER">%1$d</xliff:g> จาก <xliff:g id="TOTAL">%2$d</xliff:g>"</string>
     <string name="misc_files_selected_count_bytes" msgid="2876232009069114352">"<xliff:g id="NUMBER">%1$s</xliff:g> จาก <xliff:g id="TOTAL">%2$s</xliff:g>"</string>
     <string name="select_all" msgid="1562774643280376715">"เลือกทั้งหมด"</string>
+    <string name="data_plan_usage_manage_plans_button_text" msgid="8997761990902708162">"จัดการแพ็กเกจอินเทอร์เน็ต"</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>
@@ -2386,7 +2405,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">"WiFi"</string>
+    <string name="data_usage_tab_wifi" msgid="481146038146585749">"Wi-Fi"</string>
     <string name="data_usage_tab_ethernet" msgid="7298064366282319911">"อีเทอร์เน็ต"</string>
     <string name="data_usage_tab_mobile" msgid="454140350007299045">"มือถือ"</string>
     <string name="data_usage_tab_4g" msgid="1301978716067512235">"4G"</string>
@@ -2412,7 +2431,7 @@
     <string name="data_usage_auto_sync_off_dialog" msgid="4025938250775413864">"การกระทำดังกล่าวจะเป็นการประหยัดปริมาณการใช้อินเทอร์เน็ตและแบตเตอรี่ แต่คุณจะต้องซิงค์แต่ละบัญชีด้วยตนเองเพื่อรวบรวมข้อมูลล่าสุด และคุณจะไม่ได้รับการแจ้งเตือนเมื่อมีการอัปเดต"</string>
     <string name="data_usage_cycle_editor_title" msgid="1373797281540188533">"วันที่รีเซ็ตรอบการใช้"</string>
     <string name="data_usage_cycle_editor_subtitle" msgid="5512903797979928416">"วันที่ของแต่ละเดือน:"</string>
-    <string name="data_usage_cycle_editor_positive" msgid="8821760330497941117">"ตั้งค่าแล้ว"</string>
+    <string name="data_usage_cycle_editor_positive" msgid="8821760330497941117">"ตั้งค่า"</string>
     <string name="data_usage_warning_editor_title" msgid="3704136912240060339">"ตั้งค่าเตือนการใช้ข้อมูล"</string>
     <string name="data_usage_limit_editor_title" msgid="9153595142385030015">"ตั้งค่าขีดจำกัดการใช้ข้อมูล"</string>
     <string name="data_usage_limit_dialog_title" msgid="3023111643632996097">"การจำกัดการใช้ข้อมูล"</string>
@@ -2431,10 +2450,13 @@
     <string name="data_usage_total_during_range_mobile" product="tablet" msgid="1925687342154538972">"<xliff:g id="RANGE">%2$s</xliff:g>: ใช้แล้วประมาณ <xliff:g id="TOTAL">%1$s</xliff:g> ตามที่แท็บเล็ตวัดได้ ผู้ให้บริการอาจมีรายละเอียดการใช้ต่างจากนี้"</string>
     <string name="data_usage_total_during_range_mobile" product="default" msgid="5063981061103812900">"<xliff:g id="RANGE">%2$s</xliff:g>: ใช้แล้วประมาณ <xliff:g id="TOTAL">%1$s</xliff:g> ตามที่โทรศัพท์วัดได้ ผู้ให้บริการอาจมีรายละเอียดการใช้ต่างจากนี้"</string>
     <string name="data_usage_metered_title" msgid="7383175371006596441">"ข้อจำกัดของเครือข่าย"</string>
-    <string name="data_usage_metered_body" msgid="7655851702771342507">"ระบบจะดำเนินการกับเครือข่ายที่มีการวัดปริมาณอินเทอร์เน็ตเหมือนกับเครือข่ายมือถือเมื่อมีการจำกัดอินเทอร์เน็ตในพื้นหลัง แอปอาจแจ้งเตือนคุณก่อนใช้เครือข่ายเหล่านี้ดาวน์โหลดไฟล์ขนาดใหญ่"</string>
+    <string name="data_usage_metered_body" msgid="7655851702771342507">"ระบบจะดำเนินการกับเครือข่ายที่มีการวัดปริมาณอินเทอร์เน็ตเหมือนกับเครือข่ายมือถือเมื่อมีการจำกัดอินเทอร์เน็ตในการทำงานเบื้องหลัง แอปอาจแจ้งเตือนคุณก่อนใช้เครือข่ายเหล่านี้เพื่อดาวน์โหลดไฟล์ขนาดใหญ่"</string>
     <string name="data_usage_metered_mobile" msgid="5423305619126978393">"เครือข่ายมือถือ"</string>
     <string name="data_usage_metered_wifi" msgid="1761738002328299714">"เครือข่าย Wi-Fi ที่วัดข้อมูล"</string>
     <string name="data_usage_metered_wifi_disabled" msgid="727808462375941567">"เปิด Wi‑Fi เพื่อเลือกเครือข่ายที่มีการวัดปริมาณข้อมูล"</string>
+    <string name="data_usage_metered_auto" msgid="1262028400911918865">"อัตโนมัติ"</string>
+    <string name="data_usage_metered_yes" msgid="9217539611385225894">"มีการวัดปริมาณอินเทอร์เน็ต"</string>
+    <string name="data_usage_metered_no" msgid="4025232961929071789">"ไม่มีการวัดปริมาณอินเทอร์เน็ต"</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>
@@ -2477,8 +2499,8 @@
     <string name="vpn_forget_long" msgid="2232239391189465752">"ลืม VPN"</string>
     <string name="vpn_replace_vpn_title" msgid="2963898301277610248">"แทนที่ VPN ที่มีอยู่หรือไม่"</string>
     <string name="vpn_set_vpn_title" msgid="4009987321156037267">"ตั้งค่า VPN แบบเปิดตลอดเวลาหรือไม่"</string>
-    <string name="vpn_first_always_on_vpn_message" msgid="3025322109743675467">"เมื่อเปิดการตั้งค่านี้ คุณจะไม่มีการเชื่อมต่ออินเทอร์เน็ตจนกว่า VPN จะเชื่อมต่อสำเร็จ"</string>
-    <string name="vpn_replace_always_on_vpn_enable_message" msgid="2577928591361606641">"ระบบจะแทนที่ VPN ที่มีอยู่และคุณจะไม่มีการเชื่อมต่ออินเทอร์เน็ตจนกว่า VPN จะเชื่อมต่อสำเร็จ"</string>
+    <string name="vpn_first_always_on_vpn_message" msgid="7144543717673197102">"เมื่อเปิดการตั้งค่านี้ คุณจะไม่มีการเชื่อมต่ออินเทอร์เน็ตจนกว่า VPN จะเชื่อมต่อสำเร็จ"</string>
+    <string name="vpn_replace_always_on_vpn_enable_message" msgid="798121133114824006">"ระบบจะแทนที่ VPN ที่มีอยู่และคุณจะไม่มีการเชื่อมต่ออินเทอร์เน็ตจนกว่า VPN จะเชื่อมต่อสำเร็จ"</string>
     <string name="vpn_replace_always_on_vpn_disable_message" msgid="3011818750025879902">"คุณเชื่อมต่ออยู่กับ VPN แบบเปิดตลอดเวลาแล้ว หากเชื่อมต่อรายการอื่น ระบบจะแทนที่ VPN ที่มีอยู่และปิดโหมดเปิดตลอดเวลา"</string>
     <string name="vpn_replace_vpn_message" msgid="5611635724578812860">"คุณเชื่อมต่ออยู่กับ VPN แล้ว หากเชื่อมต่อรายการอื่น ระบบจะแทนที่ VPN ที่มีอยู่"</string>
     <string name="vpn_turn_on" msgid="2363136869284273872">"เปิด"</string>
@@ -2526,9 +2548,6 @@
     <string name="backup_pw_set_button_text" msgid="2387480910044648795">"ตั้งค่ารหัสผ่านสำรอง"</string>
     <string name="backup_pw_cancel_button_text" msgid="8845630125391744615">"ยกเลิก"</string>
     <string name="additional_system_update_settings_list_item_title" msgid="214987609894661992">"การอัปเดตระบบอื่นๆ"</string>
-    <string name="selinux_status_disabled" msgid="924551035552323327">"ปิดอยู่"</string>
-    <string name="selinux_status_permissive" msgid="6004965534713398778">"อนุญาต"</string>
-    <string name="selinux_status_enforcing" msgid="2252703756208463329">"บังคับใช้งาน"</string>
     <string name="ssl_ca_cert_warning" msgid="2045866713601984673">"เครือข่ายอาจถูกตรวจสอบ"</string>
     <string name="done_button" msgid="1991471253042622230">"เสร็จสิ้น"</string>
     <plurals name="ssl_ca_cert_dialog_title" formatted="false" msgid="7145092748045794650">
@@ -2708,6 +2727,8 @@
     <string name="color_purple" msgid="3888532466427762504">"ม่วง"</string>
     <string name="sim_no_inserted_msg" msgid="210316755353227087">"ไม่ได้เสียบซิมการ์ด"</string>
     <string name="sim_status_title" msgid="6744870675182447160">"สถานะซิม"</string>
+    <!-- no translation found for sim_status_title_sim_slot (5725659316463979194) -->
+    <skip />
     <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>
@@ -2721,12 +2742,15 @@
     <string name="sim_pref_divider" msgid="6778907671867621874">"ซิมที่แนะนำสำหรับ"</string>
     <string name="sim_calls_ask_first_prefs_title" msgid="7941299533514115976">"ถามทุกครั้ง"</string>
     <string name="sim_selection_required_pref" msgid="3446721423206414652">"ต้องเลือก"</string>
+    <!-- no translation found for sim_selection_channel_title (2760909074892782589) -->
+    <skip />
     <string name="dashboard_title" msgid="5453710313046681820">"การตั้งค่า"</string>
     <plurals name="settings_suggestion_header_summary_hidden_items" formatted="false" msgid="5597356221942118048">
       <item quantity="other">แสดงรายการที่ซ่อน %d รายการ</item>
       <item quantity="one">แสดงรายการที่ซ่อน %d รายการ</item>
     </plurals>
-    <string name="network_dashboard_title" msgid="4771589228992391573">"เครือข่ายและอินเทอร์เน็ต"</string>
+    <string name="dashboard_suggestion_condition_footer_content_description" msgid="2898588191174845961">"ยุบ"</string>
+    <string name="network_dashboard_title" msgid="3135144174846753758">"เครือข่ายและอินเทอร์เน็ต"</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>
@@ -2786,6 +2810,14 @@
     <string name="keywords_payment_settings" msgid="5220104934130446416">"ชำระเงิน แตะ การชำระเงิน"</string>
     <string name="keywords_backup" msgid="470070289135403022">"ข้อมูลสำรอง, สำรองข้อมูล"</string>
     <string name="keywords_assist_gesture_launch" msgid="813968759791342591">"ท่าทางสัมผัส"</string>
+    <!-- no translation found for keywords_imei_info (7230982940217544527) -->
+    <skip />
+    <!-- no translation found for keywords_sim_status (1474422416860990564) -->
+    <skip />
+    <!-- no translation found for keywords_model_and_hardware (1459248377212829642) -->
+    <skip />
+    <!-- no translation found for keywords_android_version (5591055570309015111) -->
+    <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>
@@ -2823,14 +2855,20 @@
     <string name="emergency_tone_alert" msgid="8941852695428130667">"การแจ้งเตือน"</string>
     <string name="emergency_tone_vibrate" msgid="8281126443204950847">"สั่น"</string>
     <string name="boot_sounds_title" msgid="567029107382343709">"เสียงเปิดเครื่อง"</string>
-    <string name="zen_mode_settings_summary_off" msgid="1857165567766351925">"ไม่ได้เปิดกฎอัตโนมัติ"</string>
-    <plurals name="zen_mode_settings_summary_on" formatted="false" msgid="1216562765753405784">
-      <item quantity="other">เปิดกฎอัตโนมัติแล้ว <xliff:g id="ON_COUNT">%d</xliff:g> รายการ</item>
-      <item quantity="one">เปิดกฎอัตโนมัติแล้ว 1 รายการ</item>
+    <string name="zen_mode_settings_summary_off" msgid="6119891445378113334">"ไม่เลย"</string>
+    <plurals name="zen_mode_settings_summary_on" formatted="false" msgid="7346979080337117366">
+      <item quantity="other">กฎ <xliff:g id="ON_COUNT">%d</xliff:g> ข้อ</item>
+      <item quantity="one">กฎ 1 ข้อ</item>
     </plurals>
-    <string name="zen_mode_settings_title" msgid="842308776768942600">"ค่ากำหนดห้ามรบกวน"</string>
-    <string name="zen_mode_priority_settings_title" msgid="2623117023031824309">"อนุญาตเฉพาะเรื่องสำคัญ"</string>
-    <string name="zen_mode_automation_settings_title" msgid="4228995740594063774">"กฎอัตโนมัติ"</string>
+    <string name="zen_mode_settings_title" msgid="1066226840983908121">"ห้ามรบกวน"</string>
+    <string name="zen_mode_behavior_settings_title" msgid="1463303933529313969">"ลักษณะการทำงาน"</string>
+    <string name="zen_mode_behavior_allow_title" msgid="3845615648136218141">"อนุญาตให้มีเสียงและการสั่นจาก"</string>
+    <string name="zen_mode_behavior_no_sound" msgid="1219626004723208056">"ไม่มีเสียง"</string>
+    <string name="zen_mode_behavior_total_silence" msgid="6716603819806610626">"ไม่มีเสียง (ปิดเสียงทั้งหมด)"</string>
+    <string name="zen_mode_behavior_no_sound_except" msgid="4968477585788243114">"ไม่มีเสียง ยกเว้น<xliff:g id="CATEGORIES">%1$s</xliff:g>"</string>
+    <string name="zen_mode_behavior_alarms_only" msgid="2423480992071472963">"ไม่มีเสียง ยกเว้นการปลุก สื่อ และเสียงของระบบ (เฉพาะปลุกเท่านั้น)"</string>
+    <string name="zen_mode_automation_settings_title" msgid="2517800938791944915">"เปิดอัตโนมัติ"</string>
+    <string name="zen_mode_automation_settings_page_title" msgid="7069221762714457987">"กฎอัตโนมัติ"</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>
@@ -2838,6 +2876,22 @@
     <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_signals_settings_subtitle" msgid="6308824824208120508">"อนุญาตสัญญาณที่มองเห็น"</string>
+    <string name="zen_mode_add" msgid="90014394953272517">"เพิ่ม"</string>
+    <!-- no translation found for zen_mode_button_turn_on (5074744714613374902) -->
+    <skip />
+    <!-- no translation found for zen_mode_button_turn_off (1995551537320422792) -->
+    <skip />
+    <!-- no translation found for zen_mode_settings_dnd_manual_end_time_next_day (3090599225533484203) -->
+    <skip />
+    <!-- no translation found for zen_mode_settings_dnd_manual_indefinite (2746903915016850399) -->
+    <skip />
+    <!-- no translation found for zen_mode_settings_dnd_automatic_rule (3856133183910726786) -->
+    <skip />
+    <!-- no translation found for zen_mode_settings_dnd_automatic_rule_app (7112871101701453067) -->
+    <skip />
+    <!-- no translation found for zen_mode_settings_dnd_automatic_rule_multiple (5792308957602984360) -->
+    <skip />
     <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>
@@ -2871,13 +2925,15 @@
     <string name="notifications_title" msgid="8086372779371204971">"การแจ้งเตือน"</string>
     <string name="app_notifications_title" msgid="5810577805218003760">"การแจ้งเตือนของแอป"</string>
     <string name="notification_channel_title" msgid="2260666541030178452">"หมวดหมู่การแจ้งเตือน"</string>
+    <string name="notification_group_title" msgid="7180506440133859601">"กลุ่มหมวดหมู่การแจ้งเตือน"</string>
     <string name="notification_importance_title" msgid="848692592679312666">"ความสำคัญ"</string>
-    <string name="notification_importance_unspecified" msgid="2196023702875112081">"ให้แอปตัดสินใจ"</string>
+    <string name="notification_importance_unspecified" msgid="6622173510486113958">"อนุญาตให้ส่งเสียง"</string>
     <string name="notification_importance_blocked" msgid="7938180808339386300">"ไม่ต้องแสดงการแจ้งเตือน"</string>
     <string name="notification_importance_min" msgid="5455049524984686275">"ไม่มีภาพหรือเสียงรบกวน"</string>
     <string name="notification_importance_low" msgid="8881468429453766553">"ไม่มีเสียง"</string>
     <string name="notification_importance_default" msgid="5958338024601957516">"ส่งเสียง"</string>
     <string name="notification_importance_high" msgid="2082429479238228527">"ส่งเสียงและแสดงในหน้าจอ"</string>
+    <string name="notification_importance_high_silent" msgid="2667033773703765252">"แสดงบนหน้าจอ"</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>
@@ -2909,19 +2965,24 @@
     <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="1264019085827708920">"อนุญาตให้แอปนี้สร้างหน้าต่างการแสดงผลหลายแหล่งพร้อมกันในขณะที่แอปเปิดอยู่หรือหลังจากที่คุณปล่อยทิ้งไว้ (เช่น เพื่อดูวิดีโอต่อ) หน้าต่างนี้จะแสดงทับแอปอื่นๆ ที่คุณกำลังใช้"</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="1264019085827708920">"อนุญาตให้แอปนี้สร้างหน้าต่างการแสดงภาพซ้อนภาพในขณะที่แอปเปิดอยู่หรือหลังจากที่คุณปล่อยทิ้งไว้ (เช่น เพื่อดูวิดีโอต่อ) หน้าต่างนี้จะแสดงทับแอปอื่นๆ ที่คุณกำลังใช้"</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="channel_group_notifications_off_desc" msgid="1620950416247316370">"Android กำลังบล็อกไม่ให้การแจ้งเตือนกลุ่มนี้ปรากฏในอุปกรณ์นี้"</string>
     <string name="notification_channels" msgid="5346841743182627500">"หมวดหมู่"</string>
     <string name="notification_channels_other" msgid="5645317113885788226">"อื่นๆ"</string>
+    <plurals name="notification_group_summary" formatted="false" msgid="3420621520561455358">
+      <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="no_channels" msgid="3077375508177744586">"แอปนี้ไม่ได้โพสต์การแจ้งเตือนใดๆ"</string>
     <string name="app_settings_link" msgid="8894946007543660906">"การตั้งค่าเพิ่มเติมในแอป"</string>
     <string name="app_notification_listing_summary_zero" msgid="6482582965081108108">"เปิดแล้วสำหรับแอปทั้งหมด"</string>
@@ -2957,7 +3018,9 @@
     <string name="zen_mode_rule_name" msgid="5149068059383837549">"ชื่อกฎ"</string>
     <string name="zen_mode_rule_name_hint" msgid="3781174510556433384">"ป้อนชื่อกฎ"</string>
     <string name="zen_mode_rule_name_warning" msgid="4517805381294494314">"มีการใช้ชื่อกฎนี้แล้ว"</string>
-    <string name="zen_mode_add_rule" msgid="7459154136384467057">"เพิ่มอีก"</string>
+    <string name="zen_mode_add_rule" msgid="9100929184624317193">"เพิ่มกฎ"</string>
+    <string name="zen_mode_add_event_rule" msgid="3997335103633946552">"เพิ่มกฎของกิจกรรม"</string>
+    <string name="zen_mode_add_time_rule" msgid="5002080000597838703">"เพิ่มกฎเวลา"</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>
@@ -2965,9 +3028,9 @@
     <string name="zen_mode_rule_type" msgid="2289413469580142888">"ประเภทของกฎ"</string>
     <string name="zen_mode_rule_type_unknown" msgid="3049377282766700600">"ไม่ทราบ"</string>
     <string name="zen_mode_configure_rule" msgid="8865785428056490305">"กำหนดค่ากฎ"</string>
-    <string name="zen_schedule_rule_type_name" msgid="142936744435271449">"กฎเวลา"</string>
+    <string name="zen_schedule_rule_type_name" msgid="6163149826036287324">"เวลา"</string>
     <string name="zen_schedule_rule_enabled_toast" msgid="3379499360390382259">"ตั้งค่ากฎอัตโนมัติเพื่อเปิดสถานะ \"ห้ามรบกวน\" ในช่วงเวลาที่ระบุ"</string>
-    <string name="zen_event_rule_type_name" msgid="2645981990973086797">"กฎเหตุการณ์"</string>
+    <string name="zen_event_rule_type_name" msgid="6503468472212606158">"กิจกรรม"</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>
@@ -2998,12 +3061,13 @@
     <string name="zen_mode_from_starred" msgid="2678345811950997027">"จากรายชื่อติดต่อที่ติดดาวเท่านั้น"</string>
     <string name="zen_mode_from_none" msgid="8219706639954614136">"ไม่มี"</string>
     <string name="zen_mode_alarms" msgid="2165302777886552926">"การปลุก"</string>
+    <string name="zen_mode_media_system_other" msgid="8900209390529859777">"เสียงของสื่อและระบบ"</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">"อนุญาตถ้าผู้โทรคนเดิมโทรเป็นครั้งที่ 2 ภายใน <xliff:g id="MINUTES">%d</xliff:g> นาที"</string>
+    <string name="zen_mode_repeat_callers_summary" msgid="239685342222975733">"ถ้าผู้โทรคนเดิมโทรเป็นครั้งที่ 2 ภายใน <xliff:g id="MINUTES">%d</xliff:g> นาที"</string>
     <string name="zen_mode_when" msgid="2767193283311106373">"เปิดโดยอัตโนมัติ"</string>
     <string name="zen_mode_when_never" msgid="8809494351918405602">"ไม่ใช้"</string>
     <string name="zen_mode_when_every_night" msgid="3122486110091921009">"ทุกคืน"</string>
@@ -3022,16 +3086,13 @@
     </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_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="zen_mode_screen_on" msgid="8774571998575673502">"เมื่อหน้าจอเปิดอยู่"</string>
+    <string name="zen_mode_screen_on_summary" msgid="5385338884695802115">"อนุญาตให้การแจ้งเตือนที่ปิดเสียงโดย \"ห้ามรบกวน\" ปรากฏขึ้นในหน้าจอ"</string>
+    <string name="zen_mode_screen_off" msgid="3144446765110327937">"เมื่อหน้าจอปิดอยู่"</string>
+    <string name="zen_mode_screen_off_summary" msgid="7430034620565812258">"อนุญาตให้การแจ้งเตือนที่ปิดเสียงโดย \"ห้ามรบกวน\" เปิดหน้าจอและกะพริบไฟ"</string>
+    <string name="zen_mode_screen_off_summary_no_led" msgid="2826121465026642017">"อนุญาตให้การแจ้งเตือนที่ปิดเสียงโดย \"ห้ามรบกวน\" เปิดหน้าจอ"</string>
     <string name="notification_app_settings_button" msgid="6685640230371477485">"การตั้งค่าการแจ้งเตือน"</string>
+    <string name="suggestion_button_text" msgid="3275010948381252006">"ตกลง"</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>
@@ -3071,7 +3132,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>
@@ -3119,7 +3180,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">"แตะที่ใดก็ได้บนหน้าจอ 2 ครั้งเพื่อปลุกอุปกรณ์"</string>
     <string name="domain_urls_title" msgid="3132983644568821250">"ลิงก์สำหรับเปิด"</string>
@@ -3216,6 +3277,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="sms_mirroring_pref" msgid="6475043279147376031">"การมิเรอร์ SMS"</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>
@@ -3282,7 +3344,7 @@
     <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="permit_write_settings" msgid="658555006453212691">"อนุญาตให้แก้ไขการตั้งค่าระบบ"</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>
@@ -3348,7 +3410,7 @@
     <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, บลูทูธ และเครือข่ายมือถือปิดอยู่ คุณไม่สามารถโทรออกหรือเชื่อมต่ออินเทอร์เน็ต"</string>
+    <string name="condition_airplane_summary" msgid="3738805058182535606">"Wi-Fi, บลูทูธ และเครือข่ายมือถือปิดอยู่ คุณจะโทรออกหรือเชื่อมต่ออินเทอร์เน็ตไม่ได้"</string>
     <string name="condition_zen_title" msgid="2679168532600816392">"เปิดการห้ามรบกวนอยู่ (<xliff:g id="ID_1">%1$s</xliff:g>)"</string>
     <string name="condition_battery_title" msgid="3272131008388575349">"เปิดโหมดประหยัดแบตเตอรี่อยู่"</string>
     <string name="condition_battery_summary" msgid="4418839236027977450">"ประสิทธิภาพลดลง ปิดบริการตำแหน่งและข้อมูลแบ็กกราวด์แล้ว"</string>
@@ -3377,15 +3439,16 @@
     <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="camera_hal_hdrplus_switch" msgid="8377365197105267466">"HAL HDR+ ของกล้อง"</string>
-    <string name="camera_hal_hdrplus_toast" msgid="2063703797270055299">"เริ่มต้นอุปกรณ์ใหม่เพื่อให้การเปลี่ยนแปลง HAL HDR+ ของกล้องมีผล"</string>
+    <string name="connectivity_monitor_switch" msgid="9059759348648583421">"การตรวจสอบการเชื่อมต่อ"</string>
+    <string name="connectivity_monitor_switch_summary" msgid="2828658652378866401">"การตรวจสอบการเชื่อมต่อจะรวบรวมบันทึกเมื่อตรวจพบปัญหาด้านการเชื่อมต่อและแจ้งเตือนให้ผู้ใช้ส่งข้อบกพร่อง"</string>
+    <string name="connectivity_monitor_toast" msgid="5551859612881173028">"เริ่มต้นอุปกรณ์ใหม่เพื่อให้การเปลี่ยนแปลงการตรวจสอบการเชื่อมต่อมีผล"</string>
+    <string name="camera_laser_sensor_switch" msgid="8913588990743234440">"เซ็นเซอร์เลเซอร์ของกล้อง"</string>
     <string name="ota_disable_automatic_update" msgid="2319639631655915050">"การอัปเดตระบบอัตโนมัติ"</string>
     <string name="usage" msgid="2977875522080448986">"การใช้งาน"</string>
     <string name="cellular_data_usage" msgid="2155683719898158203">"ปริมาณการใช้อินเทอร์เน็ตมือถือ"</string>
     <string name="wifi_data_usage" msgid="686754111095324306">"การใช้อินเทอร์เน็ตผ่าน Wi-Fi"</string>
     <string name="ethernet_data_usage" msgid="5108764537574354616">"ปริมาณการใช้อีเทอร์เน็ต"</string>
-    <string name="wifi" msgid="1081550856200013637">"WiFi"</string>
+    <string name="wifi" msgid="1081550856200013637">"Wi-Fi"</string>
     <string name="ethernet" msgid="6600095783781389720">"อีเทอร์เน็ต"</string>
     <string name="cell_data_template" msgid="405684854174361041">"ใช้อินเทอร์เน็ตมือถือไป <xliff:g id="AMOUNT">^1</xliff:g>"</string>
     <string name="wifi_data_template" msgid="6265570748799357386">"ข้อมูล Wi-Fi <xliff:g id="AMOUNT">^1</xliff:g>"</string>
@@ -3405,7 +3468,7 @@
     <string name="data_warning" msgid="209133958008062117">"เตือนปริมาณอินเทอร์เน็ต"</string>
     <string name="set_data_limit" msgid="2901526323210516923">"ตั้งค่าขีดจำกัดอินเทอร์เน็ต"</string>
     <string name="data_limit" msgid="1885406964934590552">"ขีดจำกัดอินเทอร์เน็ต"</string>
-    <string name="data_usage_template" msgid="392191945602400904">"ใช้ไป <xliff:g id="ID_1">%1$s</xliff:g> ระหว่าง <xliff:g id="ID_2">%2$s</xliff:g>"</string>
+    <string name="data_usage_template" msgid="2923744765873163859">"ใช้ไป <xliff:g id="ID_1">%1$s</xliff:g> ช่วงวันที่ <xliff:g id="ID_2">%2$s</xliff:g>"</string>
     <string name="configure" msgid="1029654422228677273">"กำหนดค่า"</string>
     <string name="data_usage_other_apps" msgid="3272872663517382050">"แอปอื่นๆ ที่รวมอยู่ในการใช้งาน"</string>
     <plurals name="data_saver_unrestricted_summary" formatted="false" msgid="2635267833484232703">
@@ -3474,7 +3537,7 @@
     <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="387052719462473500">"ควบคุมข้อมูลในหน้าจอล็อก"</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="8483187649355540109">"การสนับสนุนและเคล็ดลับ"</string>
@@ -3482,7 +3545,7 @@
     <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>
+    <string name="bluetooth_disabled" msgid="6244000672828617410">"ปิด"</string>
     <string name="bluetooth_connected_summary" msgid="7672528674593152862">"เชื่อมต่อกับ <xliff:g id="ID_1">%1$s</xliff:g> แล้ว"</string>
     <string name="bluetooth_connected_multiple_devices_summary" msgid="9173661896296663932">"เชื่อมต่อหลายอุปกรณ์แล้ว"</string>
     <string name="demo_mode" msgid="2798762752209330277">"โหมดสาธิต UI ของระบบ"</string>
@@ -3528,13 +3591,6 @@
       <item quantity="one">1 วินาที</item>
     </plurals>
     <string name="support_estimated_wait_time" msgid="6523081420029378051">"รอ ~<xliff:g id="ESTIMATE">%1$s</xliff:g>"</string>
-    <string name="bluetooth_talkback_computer" msgid="4875089335641234463">"คอมพิวเตอร์"</string>
-    <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>
-    <string name="bluetooth_talkback_input_peripheral" msgid="5165842622743212268">"อุปกรณ์อินพุต"</string>
-    <string name="bluetooth_talkback_bluetooth" msgid="5615463912185280812">"บลูทูธ"</string>
     <string name="automatic_storage_manager_settings" msgid="7819434542155181607">"จัดการพื้นที่เก็บข้อมูล"</string>
     <string name="automatic_storage_manager_text" msgid="4562950476680600604">"ตัวจัดการพื้นที่เก็บข้อมูลจะนำรูปภาพและวิดีโอที่สำรองไว้ออกจากอุปกรณ์ของคุณ เพื่อช่วยเพิ่มพื้นที่เก็บข้อมูล"</string>
     <string name="automatic_storage_manager_days_title" msgid="2017913896160914647">"นำรูปภาพและวิดีโอออก"</string>
@@ -3569,6 +3625,7 @@
     <string name="ambient_display_pickup_summary" product="device" msgid="8256669101643381568">"หากต้องการดูเวลา ไอคอนการแจ้งเตือน และข้อมูลอื่นๆ ให้หยิบอุปกรณ์ขึ้นมา"</string>
     <string name="ambient_display_pickup_suggestion_summary" msgid="7014700589991761035">"ดูการแจ้งเตือนเมื่อหน้าจอปิดอยู่"</string>
     <string name="fingerprint_swipe_for_notifications_title" msgid="5816346492253270243">"ใช้ลายนิ้วมือแสดงการแจ้งเตือน"</string>
+    <string name="fingerprint_gesture_screen_title" msgid="8562169633234041196">"ลากนิ้วสแกนลายนิ้วมือ"</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>
@@ -3577,14 +3634,15 @@
     <string name="gesture_setting_on" msgid="3455094265233870280">"เปิด"</string>
     <string name="gesture_setting_off" msgid="5230169535435881894">"ปิด"</string>
     <string name="oem_unlock_enable_disabled_summary_bootloader_unlocked" msgid="4265541229765635629">"ปลดล็อก Bootloader แล้ว"</string>
-    <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" msgid="3361344735430813695">"เชื่อมต่ออินเทอร์เน็ตก่อน"</string>
+    <string name="oem_unlock_enable_disabled_summary_connectivity_or_locked" msgid="2479038689567925511">"เชื่อมต่ออินเทอร์เน็ตหรือติดต่อผู้ให้บริการ"</string>
     <string name="oem_unlock_enable_disabled_summary_sim_locked_device" msgid="4149387448213399630">"ไม่พร้อมให้บริการสำหรับอุปกรณ์ที่ล็อกผู้ให้บริการไว้"</string>
+    <string name="oem_lock_info_message" msgid="9218313722236417510">"โปรดรีสตาร์ทอุปกรณ์เพื่อเปิดใช้ฟีเจอร์การคุ้มครองอุปกรณ์"</string>
     <string name="automatic_storage_manager_freed_bytes" msgid="7517560170441007788">"มีพื้นที่เพิ่มขึ้น <xliff:g id="SIZE">%1$s</xliff:g>\n\n ใช้ล่าสุดเมื่อวันที่ <xliff:g id="DATE">%2$s</xliff:g>"</string>
     <string name="web_action_enable_title" msgid="4051513950976670853">"Instant Apps"</string>
     <string name="web_action_enable_summary" msgid="3108127559723396382">"เปิดลิงก์ในแอป แม้ไม่ได้ติดตั้งแอปไว้"</string>
     <string name="web_action_section_title" msgid="7364647086538399136">"Instant Apps"</string>
-    <string name="instant_apps_account" msgid="1433620209791992528">"บัญชี Instant Apps"</string>
+    <string name="instant_apps_settings" msgid="8827777916518348213">"ค่ากำหนดของ Instant App"</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>
@@ -3631,7 +3689,9 @@
     <string name="enterprise_privacy_always_on_vpn_personal" msgid="9217774730260037434">"การเชื่อมต่อ VPN ตลอดเวลาเปิดอยู่ในโปรไฟล์ส่วนตัวของคุณ"</string>
     <string name="enterprise_privacy_always_on_vpn_work" msgid="7244472958208315814">"การเชื่อมต่อ VPN ตลอดเวลาเปิดอยู่ในโปรไฟล์งานของคุณ"</string>
     <string name="enterprise_privacy_global_http_proxy" msgid="7936664553416257333">"ตั้งค่าพร็อกซี HTTP ส่วนกลางแล้ว"</string>
-    <string name="enterprise_privacy_ca_certs" msgid="5885892204903688909">"ข้อมูลรับรองที่เชื่อถือได้"</string>
+    <string name="enterprise_privacy_ca_certs_device" msgid="2019652712782510262">"ข้อมูลรับรองที่เชื่อถือได้"</string>
+    <string name="enterprise_privacy_ca_certs_personal" msgid="2279084820904076599">"ข้อมูลรับรองที่เชื่อถือได้ในโปรไฟล์ส่วนตัวของคุณ"</string>
+    <string name="enterprise_privacy_ca_certs_work" msgid="6187377647815301809">"ข้อมูลรับรองที่เชื่อถือได้ในโปรไฟล์งานของคุณ"</string>
     <plurals name="enterprise_privacy_number_ca_certs" formatted="false" msgid="526375234629534165">
       <item quantity="other">มีใบรับรอง CA อย่างน้อย <xliff:g id="COUNT_1">%d</xliff:g> รายการ</item>
       <item quantity="one">มีใบรับรอง CA อย่างน้อย <xliff:g id="COUNT_0">%d</xliff:g> รายการ</item>
@@ -3672,7 +3732,7 @@
     <string name="storage_files" msgid="8581083146777364063">"ไฟล์"</string>
     <string name="storage_size_large_alternate" msgid="3550744227788333060">"<xliff:g id="NUMBER">^1</xliff:g>"<small>" <xliff:g id="UNIT">^2</xliff:g>"</small>""</string>
     <string name="storage_volume_total" msgid="3499221850532701342">"ที่ใช้ไปจากทั้งหมด <xliff:g id="TOTAL">%1$s</xliff:g>"</string>
-    <string name="storage_percent_full" msgid="6095012055875077036">"ใช้อยู่"</string>
+    <string name="storage_percent_full" msgid="6095012055875077036">"ที่ใช้ไป"</string>
     <string name="clear_instant_app_data" msgid="2004222610585890909">"ล้างแอป"</string>
     <string name="clear_instant_app_confirmation" msgid="7451671214898856857">"คุณต้องการนำ Instant App นี้ออกไหม"</string>
     <string name="game_storage_settings" msgid="3410689937046696557">"เกม"</string>
@@ -3685,15 +3745,19 @@
     <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="show_operator_name_title" msgid="805135053530442951">"ชื่อเครือข่าย"</string>
+    <string name="show_operator_name_summary" msgid="5962567590205757550">"แสดงชื่อเครือข่ายในแถบสถานะ"</string>
     <string name="storage_manager_indicator" msgid="1516810749625915020">"ตัวจัดการพื้นที่เก็บข้อมูล: <xliff:g id="STATUS">^1</xliff:g>"</string>
     <string name="storage_manager_indicator_off" msgid="7488057587180724388">"ปิด"</string>
     <string name="storage_manager_indicator_on" msgid="8625551710194584733">"เปิด"</string>
     <string name="install_type_instant" msgid="3174425974536078647">"Instant App"</string>
     <string name="automatic_storage_manager_deactivation_warning" msgid="5605210730828410482">"ปิดตัวจัดการพื้นที่เก็บข้อมูลใช่ไหม"</string>
-    <string name="storage_movies_tv" msgid="5498394447562086890">"แอป Movie &amp; TV"</string>
+    <string name="storage_movies_tv" msgid="5498394447562086890">"แอปภาพยนตร์และทีวี"</string>
     <string name="carrier_provisioning" msgid="4398683675591893169">"ข้อมูลการจัดสรรผู้ให้บริการ"</string>
     <string name="trigger_carrier_provisioning" msgid="3434865918009286187">"ทริกเกอร์การจัดสรรผู้ให้บริการ"</string>
     <string name="new_device_suggestion_title" msgid="698847081680980774">"มีอะไรใหม่และน่าสนใจบ้าง"</string>
-    <string name="new_device_suggestion_summary" msgid="7172709269203435870">"ดูฟีเจอร์เด่น 5 อันดับแรก"</string>
+    <string name="new_device_suggestion_summary" product="default" msgid="206396571522515855">"ทัวร์ชมโทรศัพท์เครื่องใหม่"</string>
+    <string name="new_device_suggestion_summary" product="tablet" msgid="393751455688210956">"ทัวร์ชมแท็บเล็ตเครื่องใหม่"</string>
+    <string name="new_device_suggestion_summary" product="device" msgid="2939870049868336652">"ทัวร์ชมอุปกรณ์ใหม่"</string>
     <string name="disabled_low_ram_device" msgid="3751578499721173344">"ฟีเจอร์นี้ไม่สามารถใช้ได้บนอุปกรณ์นี้"</string>
 </resources>
diff --git a/res/values-tl/arrays.xml b/res/values-tl/arrays.xml
index 23b0c1a..30ec9fb 100644
--- a/res/values-tl/arrays.xml
+++ b/res/values-tl/arrays.xml
@@ -100,8 +100,6 @@
     <!-- no translation found for wifi_security_no_eap:0 (2084555984818107151) -->
     <!-- no translation found for wifi_security_no_eap:1 (397579322683471524) -->
     <!-- no translation found for wifi_security_no_eap:2 (1968820975358150484) -->
-    <!-- no translation found for wifi_ap_security:0 (5251664683198623324) -->
-    <!-- no translation found for wifi_ap_security:1 (7989073072260294673) -->
   <string-array name="wifi_eap_method">
     <item msgid="1160193392455075561">"PEAP"</item>
     <item msgid="7981731051382306293">"TLS"</item>
diff --git a/res/values-tl/strings.xml b/res/values-tl/strings.xml
index 52b45ff..a39e2fd 100644
--- a/res/values-tl/strings.xml
+++ b/res/values-tl/strings.xml
@@ -166,7 +166,7 @@
     <string name="bluetooth_map_acceptance_dialog_text" msgid="8712508202081143737">"Gustong i-access ni %1$s ang iyong mga mensahe. Bigyan ng access si %2$s?"</string>
     <string name="bluetooth_sap_request" msgid="2669762224045354417">"Kahilingan sa pag-access sa SIM"</string>
     <string name="bluetooth_sap_acceptance_dialog_text" msgid="4414253873553608690">"Gustong i-access ng <xliff:g id="DEVICE_NAME_0">%1$s</xliff:g> ang iyong SIM card. Idi-disable ng pagbibigay ng access sa SIM ang connectivity ng data sa iyong device habang nakakonekta. Bigyan ng access ang <xliff:g id="DEVICE_NAME_1">%2$s?</xliff:g>"</string>
-    <string name="bluetooth_device_name_summary" msgid="4757990010751789977">"Nakikita bilang \'<xliff:g id="DEVICE_NAME">^1</xliff:g>\' sa iba pang device"</string>
+    <string name="bluetooth_device_name_summary" msgid="522235742194965734">"Nakikita bilang “<xliff:g id="DEVICE_NAME">^1</xliff:g>” sa iba pang device"</string>
     <string name="bluetooth_paired_device_title" msgid="8638994696317952019">"Ang iyong mga device"</string>
     <string name="bluetooth_pairing_page_title" msgid="7712127387361962608">"Magpares ng bagong device"</string>
     <string name="date_and_time" msgid="9062980487860757694">"Petsa at oras"</string>
@@ -293,8 +293,8 @@
     <string name="cellular_data_summary" msgid="4660351864416939504">"Payagan ang paggamit ng data sa mobile network"</string>
     <string name="allow_data_usage_title" msgid="2238205944729213062">"Payagan data usage pag roaming"</string>
     <string name="roaming" msgid="3596055926335478572">"Roaming ng data"</string>
-    <string name="roaming_enable" msgid="3737380951525303961">"Kumonekta sa mga serbisyo ng data kapag nagro-roam"</string>
-    <string name="roaming_disable" msgid="1295279574370898378">"Kumonekta sa mga serbisyo ng data kapag nagro-roam"</string>
+    <string name="roaming_enable" msgid="3737380951525303961">"Kumonekta sa mga serbisyo ng data kapag naka-roaming"</string>
+    <string name="roaming_disable" msgid="1295279574370898378">"Kumonekta sa mga serbisyo ng data kapag naka-roaming"</string>
     <string name="roaming_reenable_message" msgid="9141007271031717369">"Nawala ang koneksyon ng data dahil iniwan mo ang iyong home network na naka-off ang roaming ng data."</string>
     <string name="roaming_turn_it_on_button" msgid="4387601818162120589">"I-on ito"</string>
     <string name="roaming_warning" msgid="4275443317524544705">"Maaari kang magkaroon ng malaking bayarin."</string>
@@ -306,12 +306,14 @@
     <string name="date_and_time_settings_title" msgid="3350640463596716780">"Petsa &amp; oras"</string>
     <string name="date_and_time_settings_title_setup_wizard" msgid="2391530758339384324">"I-set ang petsa at oras"</string>
     <string name="date_and_time_settings_summary" msgid="7095318986757583584">"Itakda ang petsa, oras, time zone, &amp; mga format"</string>
-    <string name="date_time_auto" msgid="7076906458515908345">"Awto na petsa at oras"</string>
+    <string name="date_time_auto" msgid="7076906458515908345">"Awtomatikong petsa at oras"</string>
     <string name="date_time_auto_summaryOn" msgid="4609619490075140381">"Gamitin ang oras na ibinigay ng network"</string>
     <string name="date_time_auto_summaryOff" msgid="8698762649061882791">"Gamitin ang oras na ibinigay ng network"</string>
     <string name="zone_auto" msgid="334783869352026648">"Awtomatikong time zone"</string>
     <string name="zone_auto_summaryOn" msgid="6142830927278458314">"Gamitin ang time zone na ibinigay ng network"</string>
     <string name="zone_auto_summaryOff" msgid="2597745783162041390">"Gamitin ang time zone na ibinigay ng network"</string>
+    <string name="date_time_24hour_auto" msgid="2117383168985653422">"Automatikong 24-hour na format"</string>
+    <string name="date_time_24hour_auto_summary" msgid="6351812925651480277">"Gamitin ang lokal na default"</string>
     <string name="date_time_24hour_title" msgid="3203537578602803850">"24-oras na format"</string>
     <string name="date_time_24hour" msgid="1193032284921000063">"Gamitin ang format na 24-oras"</string>
     <string name="date_time_set_time_title" msgid="6296795651349047016">"Oras"</string>
@@ -324,7 +326,7 @@
     <string name="zone_list_menu_sort_by_timezone" msgid="2720190443744884114">"Uriin ayon sa time zone"</string>
     <string name="date_picker_title" msgid="1338210036394128512">"Petsa"</string>
     <string name="time_picker_title" msgid="483460752287255019">"Oras"</string>
-    <string name="lock_after_timeout" msgid="4590337686681194648">"Awtomatikong nagla-lock"</string>
+    <string name="lock_after_timeout" msgid="4590337686681194648">"Awtomatikong i-lock"</string>
     <string name="lock_after_timeout_summary" msgid="6128431871360905631">"<xliff:g id="TIMEOUT_STRING">%1$s</xliff:g> pagkatapos ng sleep"</string>
     <string name="lock_immediately_summary_with_exception" msgid="9119632173886172690">"Pagkatapos mismo ng pag-sleep, maliban na lang kung pinanatiling naka-unlock ng <xliff:g id="TRUST_AGENT_NAME">%1$s</xliff:g>"</string>
     <string name="lock_after_timeout_summary_with_exception" msgid="5579064842797188409">"<xliff:g id="TIMEOUT_STRING">%1$s</xliff:g> pagkatapos ng pag-sleep, maliban na lang kung pinanatiling naka-unlock ng <xliff:g id="TRUST_AGENT_NAME">%2$s</xliff:g>"</string>
@@ -359,8 +361,8 @@
     <string name="fingerprint_add_title" msgid="1926752654454033904">"Magdagdag ng fingerprint"</string>
     <string name="fingerprint_enable_keyguard_toggle_title" msgid="5078060939636911795">"screen lock"</string>
     <plurals name="security_settings_fingerprint_preference_summary" formatted="false" msgid="624961700033979880">
-      <item quantity="one">Pag-set up ng <xliff:g id="COUNT_1">%1$d</xliff:g> fingerprint</item>
-      <item quantity="other">Pag-set up ng <xliff:g id="COUNT_1">%1$d</xliff:g> na fingerprint</item>
+      <item quantity="one"><xliff:g id="COUNT_1">%1$d</xliff:g> fingerprint ang naka-set up</item>
+      <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> na fingerprint ang naka-set up</item>
     </plurals>
     <string name="security_settings_fingerprint_preference_summary_none" msgid="1507739327565151923"></string>
     <string name="security_settings_fingerprint_enroll_introduction_title" msgid="3201556857492526098">"I-unlock ng fingerprint"</string>
@@ -372,6 +374,9 @@
     <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="1961957425135180242">"Susunod"</string>
+    <string name="setup_fingerprint_enroll_skip_title" msgid="362050541117362034">"Laktawan ang fingerprint?"</string>
+    <string name="setup_fingerprint_enroll_skip_after_adding_lock_text" msgid="958990414356204763">"Aabutin lang nang isa o dalawang minuto ang pag-set up ng fingerprint. Kung lalaktawan mo ito, maaari mong idagdag ang iyong fingerprint sa mga setting sa ibang pagkakataon."</string>
+    <string name="lock_screen_intro_skip_title" msgid="4988210105913705679">"Laktawan ang lock ng screen?"</string>
     <string name="lock_screen_intro_skip_dialog_text_frp" product="tablet" msgid="1581834104051243425">"Hindi mao-on ang mga feature sa pagprotekta ng device. Hindi mo mapipigilan ang ibang tao na gamitin ang tablet na ito kung mawala, manakaw, o ma-reset ito."</string>
     <string name="lock_screen_intro_skip_dialog_text_frp" product="device" msgid="4629503416877189572">"Hindi mao-on ang mga feature sa pagprotekta ng device. Hindi mo mapipigilan ang ibang tao na gamitin ang device na ito kung mawala, manakaw, o ma-reset ito."</string>
     <string name="lock_screen_intro_skip_dialog_text_frp" product="default" msgid="2423428240245737909">"Hindi mao-on ang mga feature sa pagprotekta ng device. Hindi mo mapipigilan ang ibang tao na gamitin ang teleponong ito kung mawala, manakaw, o ma-reset ito."</string>
@@ -387,10 +392,10 @@
     <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="2068961812439460133">"Pindutin ang sensor"</string>
-    <string name="security_settings_fingerprint_enroll_start_message" msgid="3909929328942564524">"Ilagay ang iyong daliri sa sensor at iangat pagkatapos mong makaramdam ng pag-vibrate"</string>
+    <string name="security_settings_fingerprint_enroll_start_message" msgid="3909929328942564524">"Ilagay ang iyong daliri sa sensor at iangat ito pagkatapos mong makaramdam ng pag-vibrate"</string>
     <string name="security_settings_fingerprint_enroll_repeat_title" msgid="2819679722403209778">"Iangat, pinduting muli"</string>
-    <string name="security_settings_fingerprint_enroll_repeat_message" msgid="6158989350522518586">"Panatilihing nakaangat ang iyong daliri upang idagdag ang iba\'t ibang bahagi ng fingerprint mo"</string>
-    <string name="security_settings_fingerprint_enroll_finish_title" msgid="7567276170287972230">"Naidagdag ang fingerprint"</string>
+    <string name="security_settings_fingerprint_enroll_repeat_message" msgid="6158989350522518586">"Iangat nang iangat ang iyong daliri upang idagdag ang iba\'t ibang bahagi ng fingerprint mo"</string>
+    <string name="security_settings_fingerprint_enroll_finish_title" msgid="7567276170287972230">"Naidagdag na ang fingerprint"</string>
     <string name="security_settings_fingerprint_enroll_finish_message" msgid="4796715961273420536">"Kapag nakita mo ang icon na ito, gamitin ang iyong fingerprint para sa pagkakakilanlan o upang aprubahan ang mga pagbili."</string>
     <string name="security_settings_fingerprint_enroll_enrolling_skip" msgid="3710211704052369752">"Gawin ito sa ibang pagkakataon"</string>
     <string name="setup_fingerprint_enroll_enrolling_skip_title" msgid="6808422329107426923">"Laktawan ang pag-set up ng fingerprint?"</string>
@@ -457,7 +462,7 @@
     <string name="setup_lock_settings_picker_title" product="tablet" msgid="90329443364067215">"Protektahan ang tablet mo"</string>
     <string name="setup_lock_settings_picker_title" product="device" msgid="2399952075134938929">"Protektahan ang device"</string>
     <string name="setup_lock_settings_picker_title" product="default" msgid="1572244299605153324">"Protektahan phone mo"</string>
-    <string name="setup_lock_settings_picker_fingerprint_message" msgid="5585650064305600578">"Para sa karagdagang seguridad, mag-set up ng backup na lock ng screen."</string>
+    <string name="lock_settings_picker_fingerprint_added_security_message" msgid="5768002109707648463">"Para sa karagdagang seguridad, magtakda ng backup na lock ng screen."</string>
     <string name="setup_lock_settings_picker_message" product="tablet" msgid="8919671129189936210">"Pigilan ang ibang taong magamit ang tablet 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="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>
@@ -503,7 +508,7 @@
 
 </xliff:g>Aalisin din ang iyong mga naka-save na fingerprint sa device na ito at hindi ka makakapag-unlock ng iyong telepono, makakapagbigay ng pahintulot para sa mga pagbili, o makakapag-sign in sa mga app sa pamamagitan ng mga ito."</string>
     <string name="unlock_disable_frp_warning_content_pin" msgid="586996206210265131">"Hindi gagana ang mga feature sa pagprotekta sa device nang wala ang iyong PIN."</string>
-    <string name="unlock_disable_frp_warning_content_pin_fingerprint" msgid="3370462835533123695">"Hindi gagana ang mga feature sa pagprotekta ng device nang wala ang iyong PIN.<xliff:g id="EMPTY_LINE">
+    <string name="unlock_disable_frp_warning_content_pin_fingerprint" msgid="3370462835533123695">"Hindi gagana ang mga feature sa pagprotekta sa device nang wala ang iyong PIN.<xliff:g id="EMPTY_LINE">
 
 </xliff:g>Aalisin din ang iyong mga naka-save na fingerprint sa device na ito at hindi ka makakapag-unlock ng iyong telepono, makakapagbigay ng pahintulot para sa mga pagbili, o makakapag-sign in sa mga app sa pamamagitan ng mga ito."</string>
     <string name="unlock_disable_frp_warning_content_password" msgid="5420612686852555537">"Hindi gagana ang mga feature sa pagprotekta sa device nang wala ang iyong password."</string>
@@ -588,6 +593,7 @@
     <string name="lockpassword_pin_no_sequential_digits" msgid="680765285206990584">"Hindi pinapayagan ang pataas, pababa, o paulit-ulit na pagkakasunod-sunod ng mga digit"</string>
     <string name="lockpassword_ok_label" msgid="313822574062553672">"OK"</string>
     <string name="lockpassword_cancel_label" msgid="8818529276331121899">"Kanselahin"</string>
+    <string name="lockpassword_clear_label" msgid="5724429464960458155">"I-clear"</string>
     <string name="lockpattern_tutorial_cancel_label" msgid="6431583477570493261">"Kanselahin"</string>
     <string name="lockpattern_tutorial_continue_label" msgid="3559793618653400434">"Susunod"</string>
     <string name="lock_setup" msgid="3355847066343753943">"Kumpleto na ang pag-setup."</string>
@@ -648,7 +654,7 @@
     <string name="bluetooth_menu_advanced" msgid="8572178316357220524">"Advanced"</string>
     <string name="bluetooth_advanced_titlebar" msgid="2142159726881547669">"Advanced na Bluetooth"</string>
     <string name="bluetooth_empty_list_bluetooth_off" msgid="6351930724051893423">"Kapag naka-on ang Bluetooth, maaaring makipag-ugnayan ang device mo sa ibang kalapit na Bluetooth device."</string>
-    <string name="ble_scan_notify_text" msgid="1295915006005700650">"Upang pahusayin ang katumpakan ng lokasyon, maaari pa ring tumukoy ng mga Bluetooth device ang mga app at serbisyo ng system. Maaari mo itong baguhin sa <xliff:g id="LINK_BEGIN_0">LINK_BEGIN</xliff:g>mga setting ng pag-i-scan<xliff:g id="LINK_END_1">LINK_END</xliff:g>."</string>
+    <string name="ble_scan_notify_text" msgid="1295915006005700650">"Upang pahusayin ang katumpakan ng lokasyon, maaari pa ring mag-detect ng mga Bluetooth device ang mga app at serbisyo ng system. Maaari mo itong baguhin sa <xliff:g id="LINK_BEGIN_0">LINK_BEGIN</xliff:g>mga setting ng pag-scan<xliff:g id="LINK_END_1">LINK_END</xliff:g>."</string>
     <string name="bluetooth_connect_failed" msgid="4500234659813241053">"Hindi makakonekta. Subukang muli."</string>
     <string name="device_details_title" msgid="6576953269221085300">"Mga detalye ng device"</string>
     <string name="bluetooth_device_mac_address" msgid="2513724313558236181">"Bluetooth address ng device: <xliff:g id="ADDRESS">%1$s</xliff:g>"</string>
@@ -704,7 +710,7 @@
     <string name="android_beam_off_summary" msgid="4663095428454779138">"I-off"</string>
     <string name="android_beam_disabled_summary" msgid="1737782116894793393">"Hindi available dahil naka-off ang NFC"</string>
     <string name="android_beam_label" msgid="6257036050366775040">"Android Beam"</string>
-    <string name="android_beam_explained" msgid="1810540319385192758">"Kapag naka-on ang feature na ito, maaari mong i-beam ang content ng app sa iba pang device na may NFC sa pamamagitan ng paglalapit sa mga device. Halimbawa, maaari kang mag-beam ng mga web page, video sa YouTube, contact at higit pa.\n\nPaglapitin lang ang mga device (karaniwang magkatalikuran) at pagkatapos ay i-tap ang iyong screen. Tutukuyin ng app kung ano ang ibi-beam."</string>
+    <string name="android_beam_explained" msgid="1810540319385192758">"Kapag naka-on ang feature na ito, maaari mong i-beam ang content ng app sa iba pang device na may NFC sa pamamagitan ng paglalapit sa mga device. Halimbawa, maaari kang mag-beam ng mga web page, video sa YouTube, contact, at higit pa.\n\nPaglapitin lang ang mga device (karaniwang magkatalikuran) at pagkatapos ay i-tap ang iyong screen. Tutukuyin ng app kung ano ang ibi-beam."</string>
     <string name="wifi_quick_toggle_title" msgid="8850161330437693895">"Wi‑Fi"</string>
     <string name="wifi_quick_toggle_summary" msgid="2696547080481267642">"I-on ang Wi-Fi"</string>
     <string name="wifi_settings" msgid="29722149822540994">"Wi‑Fi"</string>
@@ -731,7 +737,7 @@
     <string name="use_open_wifi_automatically_summary_scoring_disabled" msgid="593964217679325831">"Upang magamit, pumili ng provider ng rating ng network"</string>
     <string name="use_open_wifi_automatically_summary_scorer_unsupported_disabled" msgid="8472122600853650258">"Upang magamit, pumili ng tugmang provider ng rating ng network"</string>
     <string name="wifi_install_credentials" msgid="3551143317298272860">"Mag-install ng mga certificate"</string>
-    <string name="wifi_scan_notify_text" msgid="5593805423071186757">"Upang pahusayin ang katumpakan ng lokasyon, maaari pa ring tumukoy ng mga Wi-Fi network ang mga app at serbisyo ng system. Maaari mo itong baguhin sa <xliff:g id="LINK_BEGIN_0">LINK_BEGIN</xliff:g>mga setting ng pag-i-scan<xliff:g id="LINK_END_1">LINK_END</xliff:g>."</string>
+    <string name="wifi_scan_notify_text" msgid="5593805423071186757">"Upang pahusayin ang katumpakan ng lokasyon, maaari pa ring mag-scan ang mga app at serbisyo ng system para sa mga Wi-Fi network. Maaari mo itong baguhin sa <xliff:g id="LINK_BEGIN_0">LINK_BEGIN</xliff:g>mga setting ng pag-scan<xliff:g id="LINK_END_1">LINK_END</xliff:g>."</string>
     <string name="wifi_scan_notify_text_scanning_off" msgid="3426075479272242098">"Upang pahusayin ang katumpakan ng lokasyon, i-on ang pag-scan ng Wi-Fi sa <xliff:g id="LINK_BEGIN_0">LINK_BEGIN</xliff:g>mga setting ng pag-scan<xliff:g id="LINK_END_1">LINK_END</xliff:g>."</string>
     <string name="wifi_scan_notify_remember_choice" msgid="7104867814641144485">"Huwag ipakitang muli"</string>
     <string name="wifi_setting_sleep_policy_title" msgid="5149574280392680092">"Panatilihing naka-on ang Wi-Fi habang naka-sleep"</string>
@@ -761,7 +767,7 @@
     <string name="wifi_menu_forget" msgid="8736964302477327114">"Kalimutan ang network"</string>
     <string name="wifi_menu_modify" msgid="2068554918652440105">"Baguhin ang network"</string>
     <string name="wifi_menu_write_to_nfc" msgid="7692881642188240324">"Isulat sa tag ng NFC"</string>
-    <string name="wifi_empty_list_wifi_off" msgid="8056223875951079463">"Para makita ang available network, i-on ang Wi-Fi."</string>
+    <string name="wifi_empty_list_wifi_off" msgid="8056223875951079463">"Para sa mga available na network, i-on ang Wi-Fi."</string>
     <string name="wifi_empty_list_wifi_on" msgid="8746108031587976356">"Naghahanap ng mga Wi-Fi network..."</string>
     <string name="wifi_empty_list_user_restricted" msgid="7322372065475939129">"Wala kang pahintulot na baguhin ang Wi‑Fi network."</string>
     <string name="wifi_more" msgid="3195296805089107950">"Higit pa"</string>
@@ -781,6 +787,7 @@
     <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>
@@ -817,6 +824,8 @@
     <string name="wifi_wps_available_first_item" msgid="4422547079984583502">"Available ang WPS"</string>
     <string name="wifi_wps_available_second_item" msgid="8427520131718215301">" (Available ang WPS)"</string>
     <string name="wifi_wps_nfc_enter_password" msgid="2288214226916117159">"Ilagay ang iyong password sa network"</string>
+    <string name="wifi_carrier_connect" msgid="8174696557882299911">"Carrier ng Wi-Fi network"</string>
+    <string name="wifi_carrier_content" msgid="4634077285415851933">"Kumonekta sa pamamagitan ng <xliff:g id="NAME">%1%s</xliff:g>"</string>
     <string name="wifi_scan_always_turnon_message" msgid="203123538572122989">"Upang mapahusay ang katumpakan ng lokasyon at para sa iba pang mga layunin, gustong i-on ng <xliff:g id="APP_NAME">%1$s</xliff:g> ang pag-scan ng network, kahit na naka-off ang Wi-Fi.\n\nPayagan ito para sa lahat ng apps na gustong mag-scan?"</string>
     <string name="wifi_scan_always_turnoff_message" msgid="5538901671131941043">"Upang i-off ito, pumunta sa Advanced sa overflow menu."</string>
     <string name="wifi_scan_always_confirm_allow" msgid="5355973075896817232">"Payagan"</string>
@@ -834,6 +843,7 @@
     <string name="wifi_connect" msgid="1076622875777072845">"Kumonekta"</string>
     <string name="wifi_failed_connect_message" msgid="8491902558970292871">"Nabigong kumonekta sa network."</string>
     <string name="wifi_forget" msgid="8168174695608386644">"Kalimutan"</string>
+    <string name="wifi_modify" msgid="6100248070440710782">"Baguhin"</string>
     <string name="wifi_failed_forget_message" msgid="1348172929201654986">"Nabigong kalimutan ang network"</string>
     <string name="wifi_save" msgid="3331121567988522826">"I-save"</string>
     <string name="wifi_failed_save_message" msgid="6650004874143815692">"Nabigong i-save ang network"</string>
@@ -846,6 +856,7 @@
     <string name="wifi_advanced_titlebar" msgid="4485841401774142908">"Advanced na 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_title" msgid="3471132676909349382">"Impormasyon ng network"</string>
     <string name="wifi_details_subnet_mask" msgid="6720279144174924410">"Subnet mask"</string>
     <string name="wifi_details_dns" msgid="8648826607751830768">"DNS"</string>
     <string name="wifi_details_ipv6_address_header" msgid="6734119149106422148">"Mga IPv6 address"</string>
@@ -878,16 +889,15 @@
     <string name="wifi_p2p_cancel_connect_title" msgid="255267538099324413">"Kanselahin ang imbitasyon?"</string>
     <string name="wifi_p2p_cancel_connect_message" msgid="7477756213423749402">"Nais mo bang kanselahin ang imbitasyong kumonekta kay <xliff:g id="PEER_NAME">%1$s</xliff:g>?"</string>
     <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_off_subtext" msgid="5466126533609394170">"Hindi nagbabahagi ng Internet o content sa iba pang device"</string>
     <string name="wifi_hotspot_tethering_on_subtext" product="tablet" msgid="5752490509369962007">"Ibinabahagi ang koneksyon sa Internet ng tablet na ito sa pamamagitan ng hotspot"</string>
     <string name="wifi_hotspot_tethering_on_subtext" product="default" msgid="6461075246164300670">"Ibinabahagi ang koneksyon sa Internet ng teleponong ito sa pamamagitan ng hotspot"</string>
     <string name="wifi_hotspot_on_local_only_subtext" msgid="2068110388011294735">"Nagbabahagi ng content ang app. Upang magbahagi ng koneksyon sa Internet, i-off ang hotspot, pagkatapos ay i-on"</string>
-    <string name="wifi_hotspot_name_title" msgid="1341735529132128887">"Pangalan ng Wi‑Fi"</string>
+    <string name="wifi_hotspot_name_title" msgid="8237000746618636778">"Pangalan ng hotspot"</string>
     <string name="wifi_hotspot_name_summary_connecting" msgid="3378299995508671967">"Ino-on ang <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>..."</string>
     <string name="wifi_hotspot_name_summary_connected" msgid="3888672084861445362">"Maaaring kumonekta ang iba pang device sa <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>"</string>
-    <string name="wifi_hotspot_password_title" msgid="1955592302902091281">"Password ng Wi‑Fi"</string>
+    <string name="wifi_hotspot_password_title" msgid="8676859981917573801">"Password ng hotspot"</string>
     <string name="wifi_hotspot_ap_band_title" msgid="1165801173359290681">"AP Band"</string>
     <string name="wifi_hotspot_footer_info_regular" msgid="1203489406068036455">"Gamitin ang hotspot upang gumawa ng Wi-Fi network para sa iyong iba pang device. Nagbibigay ang Hotspot ng Internet gamit ang iyong koneksyon sa mobile data. May nalalapat na mga karagdagang singil sa mobile data."</string>
     <string name="wifi_hotspot_footer_info_local_only" msgid="857988412470694109">"Maaaring gumawa ang mga app ng hotspot upang magbahagi ng content sa mga kalapit na device."</string>
@@ -898,7 +908,6 @@
     <string name="wifi_tether_configure_ap_text" msgid="7974681394041609308">"I-set up ang Wi-Fi hotspot"</string>
     <string name="wifi_hotspot_configure_ap_text" msgid="5478614731464220432">"Pag-setup ng Wi‑Fi hotspot"</string>
     <string name="wifi_hotspot_configure_ap_text_summary" msgid="5560680057727007011">"AndroidAP WPA2 PSK na 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> na hotspot"</string>
     <string name="wifi_tether_configure_ssid_default" msgid="8467525402622138547">"AndroidHotspot"</string>
     <string name="wifi_calling_settings_title" msgid="4102921303993404577">"Pagtawag gamit ang Wi-Fi"</string>
     <string name="wifi_calling_suggestion_title" msgid="9008010480466359578">"I-on ang Pagtawag gamit ang Wi-Fi"</string>
@@ -939,7 +948,7 @@
     <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="emergency_address_summary" msgid="3266760199681945746">"Address na ginagamit ng mga serbisyong pang-emergency bilang iyong lokasyon kung magsasagawa ka ng emergency na tawag gamit ang Wi-Fi"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"Ipakita"</string>
     <string name="sound_settings" msgid="5534671337768745343">"Tunog"</string>
     <string name="all_volume_title" msgid="4296957391257836961">"Mga Volume"</string>
@@ -993,6 +1002,7 @@
     <string name="search_settings" msgid="1910951467596035063">"Paghahanap"</string>
     <string name="search_settings_summary" msgid="9205656546570654169">"Pamahalaan ang mga setting at kasaysayan ng paghahanap"</string>
     <string name="search_settings_no_results" msgid="8799027492641230999">"Walang resulta"</string>
+    <string name="search_clear_history" msgid="4196658962573162457">"I-clear ang history"</string>
     <string name="display_settings" msgid="7965901687241669598">"Display"</string>
     <string name="accelerometer_title" msgid="7854608399547349157">"I-auto rotate ang screen"</string>
     <string name="color_mode_title" msgid="3159275920408338215">"Matitingkad na kulay"</string>
@@ -1122,7 +1132,6 @@
     <string name="baseband_version" msgid="1848990160763524801">"Bersyon ng baseband"</string>
     <string name="kernel_version" msgid="9192574954196167602">"Bersyon ng Kernel"</string>
     <string name="build_number" msgid="3075795840572241758">"Numero ng build"</string>
-    <string name="selinux_status" msgid="6212165375172061672">"Katayuan ng SELinux"</string>
     <string name="device_info_not_available" msgid="8062521887156825182">"Hindi available"</string>
     <string name="device_status_activity_title" msgid="1411201799384697904">"Status"</string>
     <string name="device_status" msgid="607405385799807324">"Katayuan"</string>
@@ -1150,7 +1159,6 @@
     <string name="status_wifi_mac_address" msgid="2202206684020765378">"MAC address ng Wi-Fi"</string>
     <string name="status_bt_address" msgid="4195174192087439720">"Address ng bluetooth"</string>
     <string name="status_serial_number" msgid="2257111183374628137">"Serial number"</string>
-    <string name="status_unavailable" msgid="7862009036663793314">"Hindi available"</string>
     <string name="status_up_time" msgid="7294859476816760399">"Oras na naka-up"</string>
     <string name="status_awake_time" msgid="2393949909051183652">"Oras ng gising"</string>
     <string name="internal_memory" msgid="9129595691484260784">"Panloob na storage"</string>
@@ -1326,6 +1334,7 @@
     <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>
     <string name="reset_dashboard_title" msgid="6254873816990678620">"I-reset ang mga opsyon"</string>
+    <string name="reset_dashboard_summary" msgid="4851012632493522755">"Maaaring i-reset ang network, mga app, o device"</string>
     <string name="reset_network_title" msgid="6166025966016873843">"I-reset ang Wi-Fi, mobile, at Bluetooth"</string>
     <string name="reset_network_desc" msgid="5547979398298881406">"Ire-reset nito ang lahat ng setting ng network, kasama ang:\n\n"<li>"Wi‑Fi"</li>\n<li>"Mobile data"</li>\n<li>"Bluetooth"</li></string>
     <string name="reset_network_button_text" msgid="2035676527471089853">"I-reset ang mga setting"</string>
@@ -1334,17 +1343,14 @@
     <string name="reset_network_confirm_title" msgid="1759888886976962773">"I-reset?"</string>
     <string name="network_reset_not_available" msgid="7188610385577164676">"Hindi available ang pag-reset ng network para sa user na ito"</string>
     <string name="reset_network_complete_toast" msgid="787829973559541880">"Na-reset na ang mga network setting"</string>
-    <string name="master_clear_title" msgid="6617679904229218425">"Burahin ang lahat ng data (I-factory reset)"</string>
-    <plurals name="master_clear_with_account_summary" formatted="false" msgid="5911377203778818712">
-      <item quantity="one"><xliff:g id="ACCOUNT_COUNT">%1$d</xliff:g> account ang mare-reset</item>
-      <item quantity="other"><xliff:g id="ACCOUNT_COUNT">%1$d</xliff:g> na account ang mare-reset</item>
-    </plurals>
-    <string name="master_clear_summary" msgid="6902443944660426951">"Mare-reset ang internal storage at lahat ng data"</string>
+    <string name="master_clear_title" msgid="3531267871084279512">"Burahin ang lahat ng data (factory reset)"</string>
     <string name="master_clear_desc" product="tablet" msgid="9146059417023157222">"Buburahin nito ang lahat ng data mula sa "<b>"internal storage"</b>" ng iyong tablet, kabilang ang:\n\n"<li>"Iyong Google account"</li>\n<li>"System at data ng app at mga setting"</li>\n<li>"Na-download na apps"</li></string>
     <string name="master_clear_desc" product="default" msgid="4800386183314202571">"Buburahin nito ang lahat ng data mula sa "<b>"internal storage"</b>" ng iyong telepono, kabilang ang:\n\n"<li>"Iyong Google account"</li>\n<li>"Data at mga setting ng system at app"</li>\n<li>"Na-download na mga app"</li></string>
     <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"Kasalukuyan kang naka-sign in sa mga sumusunod na account:\n"</string>
     <string name="master_clear_other_users_present" product="default" msgid="5161423070702470742">\n\n"May iba pang mga user sa device na ito.\n"</string>
     <string name="master_clear_desc_also_erases_external" msgid="1903185203791274237"><li>"Musika"</li>\n<li>"Mga Larawan"</li>\n<li>"Ibang data ng user"</li></string>
+    <string name="master_clear_desc_also_erases_esim" msgid="312352697653096008"><li>"Mga carrier sa eSIM"</li></string>
+    <string name="master_clear_desc_no_cancel_mobile_plan" msgid="5460926449093211144">\n\n"Hindi nito kakanselahin ang iyong plano ng serbisyo sa mobile."</string>
     <string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="7744115866662613411">\n\n"Upang i-clear ang musika, mga larawan at iba pang data ng user, kailangang mabura ang "<b>"USB storage"</b>"."</string>
     <string name="master_clear_desc_erase_external_storage" product="default" msgid="4801026652617377093">\n\n"Upang i-clear ang musika, mga larawan at ibang data ng user, kailangang mabura ang "<b>"SD card"</b>"."</string>
     <string name="erase_external_storage" product="nosdcard" msgid="969364037450286809">"Burahin ang storage na USB"</string>
@@ -1461,15 +1467,16 @@
     <string name="settings_safetylegal_activity_title" msgid="6901214628496951727">"Impormasyon sa kaligtasan"</string>
     <string name="settings_safetylegal_activity_unreachable" msgid="250674109915859456">"Wala kang koneksyon ng data. Upang tingnan ang impormasyong ito ngayon, pumunta sa %s mula sa anumang computer na nakakonekta sa Internet."</string>
     <string name="settings_safetylegal_activity_loading" msgid="8059022597639516348">"Naglo-load…"</string>
-    <string name="lockpassword_choose_your_password_header" msgid="8624900666929394990">"Piliin ang iyong password"</string>
-    <string name="lockpassword_choose_your_password_header_for_fingerprint" msgid="6624409510609085450">"Para magamit ang fingerprint, i-set ang pw"</string>
-    <string name="lockpassword_choose_your_pattern_header" msgid="6949761069941694050">"Piliin ang iyong pattern"</string>
-    <string name="lockpassword_choose_your_pattern_header_for_fingerprint" msgid="5901096361617543819">"Para magamit ang fingerprint, i-set ang pattern"</string>
-    <string name="lockpassword_choose_your_pin_header" msgid="7598849519816138302">"Piliin ang iyong PIN"</string>
-    <string name="lockpassword_choose_your_pin_header_for_fingerprint" msgid="765344692615917183">"Para magamit ang fingerprint, i-set ang PIN"</string>
-    <string name="lockpassword_confirm_your_password_header" msgid="6308478184889846633">"Kumpirmahin ang iyong password"</string>
+    <string name="lockpassword_choose_your_screen_lock_header" msgid="3872462096767152394">"Magtakda ng lock ng screen"</string>
+    <string name="lockpassword_choose_your_password_message" msgid="1197569283524841412">"Para sa seguridad, magtakda ng password"</string>
+    <string name="lockpassword_choose_your_password_header_for_fingerprint" msgid="2541818487015343503">"Magtakda ng backup ng fingerprint"</string>
+    <string name="lockpassword_choose_your_pattern_header_for_fingerprint" msgid="7709785406243556723">"Magtakda ng backup ng fingerprint"</string>
+    <string name="lockpassword_choose_your_pin_message" msgid="1875420718677275646">"Para sa seguridad, magtakda ng PIN"</string>
+    <string name="lockpassword_choose_your_pin_header_for_fingerprint" msgid="1549639053195796674">"Magtakda ng backup ng fingerprint"</string>
+    <string name="lockpassword_choose_your_pattern_message" msgid="5986983400689720015">"Para sa seguridad, magtakda ng pattern"</string>
+    <string name="lockpassword_confirm_your_password_header" msgid="1266027268220850931">"Ilagay muli ang iyong password"</string>
     <string name="lockpassword_confirm_your_pattern_header" msgid="7543433733032330821">"Kumpirmahin ang iyong pattern"</string>
-    <string name="lockpassword_confirm_your_pin_header" msgid="49038294648213197">"Kumpirmahin ang iyong PIN"</string>
+    <string name="lockpassword_confirm_your_pin_header" msgid="7744513791910572550">"Ilagay muli ang iyong PIN"</string>
     <string name="lockpassword_confirm_passwords_dont_match" msgid="5140892109439191415">"Hindi tugma ang mga password"</string>
     <string name="lockpassword_confirm_pins_dont_match" msgid="7226244811505606217">"Hindi tugma ang mga PIN"</string>
     <string name="lockpassword_choose_lock_generic_header" msgid="3811438094903786145">"Pagpipilian sa pag-unlock"</string>
@@ -1488,6 +1495,12 @@
     <string name="lockpassword_strong_auth_required_work_pattern" msgid="3003781907040522053">"Para sa karagdagang seguridad, gamitin ang iyong pattern sa trabaho"</string>
     <string name="lockpassword_strong_auth_required_work_pin" msgid="3367491332598821552">"Para sa karagdagang seguridad, ilagay ang iyong PIN sa trabaho"</string>
     <string name="lockpassword_strong_auth_required_work_password" msgid="8159775129968582940">"Para sa karagdagang seguridad, ilagay ang iyong password sa trabaho"</string>
+    <string name="lockpassword_confirm_your_pattern_details_frp" msgid="6757336656791723193">"Na-reset sa mga factory setting ang iyong telepono. Ilagay ang dati mong pattern upang magamit ito."</string>
+    <string name="lockpassword_confirm_your_pin_details_frp" msgid="826520613445990470">"Na-reset sa mga factory setting ang iyong telepono. Ilagay ang dati mong PIN upang magamit ito."</string>
+    <string name="lockpassword_confirm_your_password_details_frp" msgid="8944081074615739040">"Na-reset sa mga factory setting ang iyong telepono. Ilagay ang dati mong password upang magamit ito."</string>
+    <string name="lockpassword_confirm_your_pattern_header_frp" msgid="2898036091609128286">"I-verify ang pattern"</string>
+    <string name="lockpassword_confirm_your_pin_header_frp" msgid="4141601774778898803">"I-verify ang PIN"</string>
+    <string name="lockpassword_confirm_your_password_header_frp" msgid="3762615419295360480">"I-verify ang password"</string>
     <string name="lockpassword_invalid_pin" msgid="15588049067548470">"Maling PIN"</string>
     <string name="lockpassword_invalid_password" msgid="4038507398784975200">"Maling password"</string>
     <string name="lockpattern_need_to_unlock_wrong" msgid="1745247595356012176">"Maling pattern"</string>
@@ -1496,7 +1509,7 @@
     <string name="lockpattern_change_lock_pin_label" msgid="266707138486731661">"Baguhin ang naka-unlock na PIN"</string>
     <string name="lockpattern_recording_intro_header" msgid="308287052221942814">"Gumawa ng pattern sa pag-unlock"</string>
     <string name="lockpattern_recording_intro_footer" msgid="1118579101409152113">"Pindutin ang Menu para sa tulong."</string>
-    <string name="lockpattern_recording_inprogress" msgid="6667844062721656773">"I-angat ang daliri kapag tapos na"</string>
+    <string name="lockpattern_recording_inprogress" msgid="6667844062721656773">"Iangat ang daliri kapag tapos na"</string>
     <string name="lockpattern_recording_incorrect_too_short" msgid="1348234155120957561">"Pagdugtungin ang hindi bababa sa <xliff:g id="NUMBER">%d</xliff:g> (na) tuldok. Subukang muli."</string>
     <string name="lockpattern_pattern_entered_header" msgid="4316818983675591604">"Na-record na ang pattern"</string>
     <string name="lockpattern_need_to_confirm" msgid="8054853451639221265">"Muling iguhit ang pattern upang kumpirmahin"</string>
@@ -1537,7 +1550,6 @@
     <string name="install_applications_title" msgid="4987712352256508946">"Payagan lahat ng source ng app"</string>
     <string name="recent_app_category_title" msgid="6673071268966003928">"Mga app na binuksan kamakailan"</string>
     <string name="see_all_apps_title" msgid="1317153498074308438">"Tingnan ang lahat ng <xliff:g id="COUNT">%1$d</xliff:g> (na) app"</string>
-    <string name="recent_app_summary" msgid="3366446669844932300">"<xliff:g id="TIME">^1</xliff:g> na ang nakalipas"</string>
     <string name="install_all_warning" product="tablet" msgid="8310489909586138165">"Mas nanganganib ang iyong tablet at personal na data sa pag-atake ng mga hindi alam na app. Sa pamamagitan ng pag-install ng mga app mula sa pinagmulang ito, sumasang-ayon kang ikaw ang mananagot para sa anumang pinsala sa iyong tablet o pagkawala ng data na maaaring maging resulta ng paggamit sa mga ito."</string>
     <string name="install_all_warning" product="default" msgid="1952257127370115988">"Mas nanganganib ang iyong telepono at personal na data sa pag-atake ng mga hindi alam na app. Sa pamamagitan ng pag-install ng mga app mula sa pinagmulang ito, sumasang-ayon kang ikaw ang mananagot para sa anumang pinsala sa iyong telepono o pagkawala ng data na maaaring maging resulta ng paggamit sa mga ito."</string>
     <string name="advanced_settings" msgid="1777249286757067969">"Mga advanced na setting"</string>
@@ -1748,10 +1760,10 @@
     <string name="keyboard_layout_dialog_switch_hint" msgid="3889961090676293795">"Para palit, pindot Control-Spacebar"</string>
     <string name="keyboard_layout_default_label" msgid="2952672513543482165">"Default"</string>
     <string name="keyboard_layout_picker_title" msgid="556081931972771610">"Mga layout ng keyboard"</string>
-    <string name="user_dict_settings_title" msgid="3427169369758733521">"Personal na diksyunaryo"</string>
+    <string name="user_dict_settings_title" msgid="3427169369758733521">"Personal na diksyonaryo"</string>
     <string name="user_dict_settings_summary" msgid="7965571192902870454"></string>
     <string name="user_dict_settings_add_menu_title" msgid="4056762757149923551">"Magdagdag"</string>
-    <string name="user_dict_settings_add_dialog_title" msgid="4702613990174126482">"Idagdag sa diksyunaryo"</string>
+    <string name="user_dict_settings_add_dialog_title" msgid="4702613990174126482">"Idagdag sa diksyonaryo"</string>
     <string name="user_dict_settings_add_screen_title" msgid="742580720124344291">"Parirala"</string>
     <string name="user_dict_settings_add_dialog_more_options" msgid="8848798370746019825">"Higit pang mga pagpipilian"</string>
     <string name="user_dict_settings_add_dialog_less_options" msgid="2441785268726036101">"Mas kaunting pagpipilian"</string>
@@ -1764,7 +1776,7 @@
     <string name="user_dict_settings_edit_dialog_title" msgid="8967476444840548674">"I-edit ang salita"</string>
     <string name="user_dict_settings_context_menu_edit_title" msgid="2210564879320004837">"I-edit"</string>
     <string name="user_dict_settings_context_menu_delete_title" msgid="9140703913776549054">"I-delete"</string>
-    <string name="user_dict_settings_empty_text" msgid="1971969756133074922">"Wala kang anumang mga salita sa diksyunaryo ng user. Upang magdagdag ng salita, i-tap ang button na Magdagdag (+)."</string>
+    <string name="user_dict_settings_empty_text" msgid="1971969756133074922">"Wala kang anumang mga salita sa diksyonaryo ng user. Upang magdagdag ng salita, i-tap ang button na Magdagdag (+)."</string>
     <string name="user_dict_settings_all_languages" msgid="6742000040975959247">"Para sa lahat ng wika"</string>
     <string name="user_dict_settings_more_languages" msgid="7316375944684977910">"Higit pang mga wika..."</string>
     <string name="testing" msgid="6584352735303604146">"Pagsubok"</string>
@@ -1801,7 +1813,7 @@
     <string name="accessibility_settings_summary" msgid="981260486011624939">"Mga screen reader, display, kontrol sa pakikipag-ugnayan"</string>
     <string name="vision_settings_title" msgid="4204111425716868288">"Mga Setting ng Paningin"</string>
     <string name="vision_settings_description" msgid="5679491180156408260">"Maaari mong i-customize ang device na ito upang maging angkop sa iyong mga pangangailangan. Maaaring baguhin ang mga feature sa accessibility na ito sa ibang pagkakataon sa Mga Setting."</string>
-    <string name="vision_settings_suggestion_title" msgid="917294957154878441">"Lakihan ang font"</string>
+    <string name="vision_settings_suggestion_title" msgid="8058794060304707004">"Baguhin ang laki ng font"</string>
     <string name="screen_reader_category_title" msgid="7739154903913400641">"Mga screen reader"</string>
     <string name="audio_and_captions_category_title" msgid="3420727114421447524">"Audio at text sa screen"</string>
     <string name="display_category_title" msgid="685461049938269166">"Display"</string>
@@ -1838,7 +1850,6 @@
     <string name="accessibility_display_inversion_preference_subtitle" msgid="7052959202195368109">"Maaaring makaapekto sa performance"</string>
     <string name="accessibility_autoclick_preference_title" msgid="7014499339068449623">"I-click kapag huminto ang pointer"</string>
     <string name="accessibility_autoclick_delay_preference_title" msgid="3962261178385106006">"Pagkaantala bago ang pag-click"</string>
-    <string name="preference_summary_default_combination" msgid="8532964268242666060">"<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">"NAKA-ON"</string>
     <string name="accessibility_summary_state_disabled" msgid="2241315620132005595">"NAKA-OFF"</string>
     <string name="enable_quick_setting" msgid="2366999897816894536">"Ipakita sa Mga Mabilisang Setting"</string>
@@ -1912,7 +1923,7 @@
     <string name="accessibility_no_service_selected" msgid="2840969718780083998">"Walang serbisyong napili"</string>
     <string name="accessibility_service_default_description" msgid="1072730037861494125">"Walang ibinigay na paglalarawan."</string>
     <string name="settings_button" msgid="3006713718908152930">"Mga Setting"</string>
-    <string name="print_settings" msgid="4742428530112487843">"Pagpi-print"</string>
+    <string name="print_settings" msgid="4742428530112487843">"Pag-print"</string>
     <string name="print_settings_summary_no_service" msgid="6354322414246865875">"Naka-off"</string>
     <plurals name="print_settings_summary" formatted="false" msgid="6005468025646083029">
       <item quantity="one">May <xliff:g id="COUNT">%1$d</xliff:g> serbisyo ng pag-print na naka-on</item>
@@ -1922,7 +1933,7 @@
       <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_settings_title" msgid="3685449667822217816">"Mga serbisyo sa pag-print"</string>
     <string name="print_no_services_installed" msgid="8443039625463872294">"Walang mga naka-install na serbisyo"</string>
     <string name="print_no_printers_found" msgid="989018646884973683">"Walang mga natagpuang printer"</string>
     <string name="print_menu_item_settings" msgid="6591330373682227082">"Mga Setting"</string>
@@ -1957,12 +1968,14 @@
     <string name="background_activity_summary_on" msgid="649282072540085599">"Maaaring tumakbo ang app sa background kapag hindi ginagamit"</string>
     <string name="background_activity_summary_off" msgid="7666330699090632040">"Limitado ang aktibidad ng app sa background kapag hindi ginagamit"</string>
     <string name="background_activity_summary_disabled" msgid="3710669050484599847">"Hindi pinapahintulutan ang app na tumakbo sa background"</string>
+    <string name="background_activity_summary_whitelisted" msgid="7375400051141016808">"Hindi mao-optimize ang app para sa paggamit ng baterya"</string>
+    <string name="background_activity_warning_dialog_title" msgid="2216249969149568871">"Limitahan ang aktibidad sa background?"</string>
+    <string name="background_activity_warning_dialog_text" msgid="7049624449246121981">"Kung lilimitahan mo ang aktibidad sa background ng app, maaari itong gumana nang hindi tama"</string>
     <string name="device_screen_usage" msgid="3386088035570409683">"Paggamit ng screen mula noong napuno ang baterya"</string>
     <string name="device_screen_consumption" msgid="4607589286438986687">"Pagkonsumo ng screen"</string>
     <string name="device_cellular_network" msgid="4724773411762382950">"Pag-scan ng mobile network"</string>
-    <string name="power_last_full_charge_summary" msgid="532845389094620657">"<xliff:g id="TIME">^1</xliff:g> na ang nakalipas"</string>
-    <string name="power_usage_list_summary" msgid="6775339745194635000">"Paggamit ng app mula noong napuno ang baterya (<xliff:g id="TIME">^1</xliff:g> na ang nakalipas)"</string>
-    <string name="power_usage_list_summary_device" msgid="7036566616386864302">"Paggamit ng device mula noong napuno ang baterya (<xliff:g id="TIME">^1</xliff:g> na ang nakalipas)"</string>
+    <string name="power_usage_list_summary" msgid="6393929085382334341">"Paggamit ng app mula noong napuno ang baterya (<xliff:g id="RELATIVE_TIME">^1</xliff:g>)"</string>
+    <string name="power_usage_list_summary_device" msgid="4461926045610455423">"Paggamit ng device mula noong napuno ang baterya (<xliff:g id="RELATIVE_TIME">^1</xliff:g>)"</string>
     <string name="screen_usage_summary" msgid="6687403051423153550">"Haba ng oras na naka-on ang screen mula noong napuno ang baterya"</string>
     <string name="device_usage_list_summary" msgid="5623036661468763251">"Paggamit ng device mula noong napuno ang baterya"</string>
     <string name="battery_since_unplugged" msgid="338073389740738437">"Paggamit ng baterya mula nang hindi nakasaksak"</string>
@@ -2208,14 +2221,14 @@
     <string name="credentials_unlock_hint" msgid="2301301378040499348">"I-type ang password para sa storage ng kredensyal."</string>
     <string name="credentials_old_password" msgid="7553393815538684028">"Kasalukuyang password:"</string>
     <string name="credentials_reset_hint" msgid="6297256880896133631">"Alisin ang lahat ng content"</string>
-    <string name="credentials_password_too_short" msgid="7502749986405522663">"Dapat na may hindi bababa sa 8 character ang password."</string>
     <string name="credentials_wrong_password" msgid="2541932597104054807">"Hindi tamang password."</string>
     <string name="credentials_reset_warning" msgid="5320653011511797600">"Hindi tamang password. Mayroon kang isa pang pagkakataon bago mabura ang storage ng kredensyal."</string>
     <string name="credentials_reset_warning_plural" msgid="6514085665301095279">"Hindi tamang password. Mayroon kang <xliff:g id="NUMBER">%1$d</xliff:g> pang pagkakataon bago mabura ang storage ng kredensyal."</string>
     <string name="credentials_erased" msgid="2907836028586342969">"Binura: storage ng kredensyal."</string>
     <string name="credentials_not_erased" msgid="7685932772284216097">"Di mbura storage ng krednsyal."</string>
     <string name="credentials_enabled" msgid="7588607413349978930">"Pinagana ang storage ng kredensyal."</string>
-    <string name="credentials_configure_lock_screen_hint" msgid="6757119179588664966">"Kailangan mong magtakda ng PIN o password ng lock screen bago mo magamit ang storage ng kredensyal."</string>
+    <string name="credentials_configure_lock_screen_hint" msgid="8058230497337529036">"Bago mo magamit ang storage ng kredensyal, kailangang may secure na lock screen ang iyong device"</string>
+    <string name="credentials_configure_lock_screen_button" msgid="253239765216055321">"ITAKDA ANG LOCK"</string>
     <string name="usage_access_title" msgid="332333405495457839">"App na may access sa paggamit"</string>
     <string name="emergency_tone_title" msgid="1055954530111587114">"Tonong pang-emergency"</string>
     <string name="emergency_tone_summary" msgid="722259232924572153">"Itakda ang pag-uugali kapag naganap ang isang pang-emergency na tawag"</string>
@@ -2335,8 +2348,6 @@
     <skip />
     <string name="cant_sync_dialog_title" msgid="2777238588398046285">"Hindi makapag-sync nang manu-mano"</string>
     <string name="cant_sync_dialog_message" msgid="1938380442159016449">"Kasalukuyang naka-disable ang pag-sync para sa item na ito. Upang baguhin ang setting na ito, pansamantalang i-on ang data ng background at awtomatikong pag-sync."</string>
-    <string name="wimax_settings" msgid="2655139497028469039">"4G"</string>
-    <string name="status_wimax_mac_address" msgid="8390791848661413416">"4G MAC address"</string>
     <string name="enter_password" msgid="8035706727471334122">"Upang magsimula sa Android, ilagay ang iyong password"</string>
     <string name="enter_pin" msgid="5305333588093263790">"Upang magsimula sa Android, ilagay ang iyong PIN"</string>
     <string name="enter_pattern" msgid="4187435713036808566">"Upang magsimula sa Android, iguhit ang iyong pattern"</string>
@@ -2350,6 +2361,7 @@
     <string name="misc_files_selected_count" msgid="4647048020823912088">"pinili <xliff:g id="NUMBER">%1$d</xliff:g> sa <xliff:g id="TOTAL">%2$d</xliff:g>"</string>
     <string name="misc_files_selected_count_bytes" msgid="2876232009069114352">"<xliff:g id="NUMBER">%1$s</xliff:g> sa <xliff:g id="TOTAL">%2$s</xliff:g>"</string>
     <string name="select_all" msgid="1562774643280376715">"Piliin lahat"</string>
+    <string name="data_plan_usage_manage_plans_button_text" msgid="8997761990902708162">"Pamahalaan ang mga plano"</string>
     <string name="data_usage_summary_title" msgid="3804110657238092929">"Paggamit ng data"</string>
     <string name="data_usage_app_summary_title" msgid="4147258989837459172">"Paggamit ng data ng app"</string>
     <string name="data_usage_accounting" msgid="7170028915873577387">"Ang accounting ng data ng carrier ay maaaring naiiba sa iyong device."</string>
@@ -2393,7 +2405,7 @@
     <string name="data_usage_tab_3g" msgid="6092169523081538718">"2G-3G"</string>
     <string name="data_usage_list_mobile" msgid="5588685410495019866">"Mobile"</string>
     <string name="data_usage_list_none" msgid="3933892774251050735">"Wala"</string>
-    <string name="data_usage_enable_mobile" msgid="986782622560157977">"Data ng Mobile"</string>
+    <string name="data_usage_enable_mobile" msgid="986782622560157977">"Mobile data"</string>
     <string name="data_usage_enable_3g" msgid="6304006671869578254">"data ng 2G-3G"</string>
     <string name="data_usage_enable_4g" msgid="3635854097335036738">"data ng 4G"</string>
     <string name="data_usage_forground_label" msgid="7654319010655983591">"Foreground:"</string>
@@ -2406,11 +2418,11 @@
     <string name="data_usage_app_restrict_dialog" msgid="1466689968707308512">"Ang tampok na ito ay maaaring maging sanhi ng pagtigil ng app na nakadepende sa data ng background kapag mga mobile network lang ang available.\n\nMaaari kang makahanap ng higit pang naaangkop na mga kontrol sa paggamit ng data sa mga setting na available sa loob ng app."</string>
     <string name="data_usage_restrict_denied_dialog" msgid="55012417305745608">"Malilimitahan mo lang ang data ng background kung nagtakda ka ng limitasyon sa mobile data."</string>
     <string name="data_usage_auto_sync_on_dialog_title" msgid="2438617846762244389">"I-on ang pag-auto sync ng data?"</string>
-    <string name="data_usage_auto_sync_on_dialog" product="tablet" msgid="8581983093524041669">"Ang anumang mga pagbabagong gagawin mo sa iyong mga account sa web ay awtomatikong makokopya sa iyong tablet.\n\nMaaari ding awtomatikong kopyahin ng ilang account sa web ang anumang mga pagbabagong gagawin mo sa tablet. Gumagana sa ganitong paraan ang isang Google Account."</string>
-    <string name="data_usage_auto_sync_on_dialog" product="default" msgid="8651376294887142858">"Ang anumang mga pagbabagong gagawin mo sa iyong mga account sa web ay awtomatikong makokopya sa iyong telepono.\n\nMaaari ding awtomatikong kopyahin ng ilang account sa web ang anumang mga pagbabagong gagawin mo sa telepono. Gumagana sa ganitong paraan ang isang Google Account."</string>
+    <string name="data_usage_auto_sync_on_dialog" product="tablet" msgid="8581983093524041669">"Ang anumang mga pagbabagong gagawin mo sa iyong mga account sa web ay awtomatikong makokopya sa tablet mo.\n\nMaaari ding awtomatikong kopyahin ng ilang account sa web ang anumang mga pagbabagong gagawin mo sa tablet. Ganito gumagana ang Google Account."</string>
+    <string name="data_usage_auto_sync_on_dialog" product="default" msgid="8651376294887142858">"Ang anumang mga pagbabagong gagawin mo sa iyong mga account sa web ay awtomatikong makokopya sa telepono mo.\n\nMaaari ding awtomatikong kopyahin ng ilang account sa web ang anumang mga pagbabagong gagawin mo sa telepono. Ganito gumagana ang Google Account."</string>
     <string name="data_usage_auto_sync_off_dialog_title" msgid="9013139130490125793">"I-off ang pag-auto sync ng data?"</string>
-    <string name="data_usage_auto_sync_off_dialog" msgid="4025938250775413864">"Mababawasan nito ang paggamit ng data at baterya, ngunit kakailanganin mong manual na i-sync ang bawat account upang kumolekta ng kamakailang impormasyon. At hindi ka makakatanggap ng mga notification kapag naganap ang mga pag-update."</string>
-    <string name="data_usage_cycle_editor_title" msgid="1373797281540188533">"Petsa ng pag-reset ng cycle sa paggamit"</string>
+    <string name="data_usage_auto_sync_off_dialog" msgid="4025938250775413864">"Mababawasan nito ang paggamit ng data at baterya, pero kakailanganin mong manual na i-sync ang bawat account para kumolekta ng kamakailang impormasyon. Hindi ka rin makakatanggap ng notifications kapag may updates."</string>
+    <string name="data_usage_cycle_editor_title" msgid="1373797281540188533">"Petsa ng pag-reset ng yugto ng paggamit"</string>
     <string name="data_usage_cycle_editor_subtitle" msgid="5512903797979928416">"Petsa ng bawat buwan:"</string>
     <string name="data_usage_cycle_editor_positive" msgid="8821760330497941117">"Itakda"</string>
     <string name="data_usage_warning_editor_title" msgid="3704136912240060339">"Itakda ang babala sa paggamit ng data"</string>
@@ -2431,10 +2443,13 @@
     <string name="data_usage_total_during_range_mobile" product="tablet" msgid="1925687342154538972">"<xliff:g id="RANGE">%2$s</xliff:g>: <xliff:g id="TOTAL">%1$s</xliff:g> gamit, sinukat ng tablet mo. Maaaring iba kwenta sa gamit ng data ng carrier."</string>
     <string name="data_usage_total_during_range_mobile" product="default" msgid="5063981061103812900">"<xliff:g id="RANGE">%2$s</xliff:g>: <xliff:g id="TOTAL">%1$s</xliff:g> gamit, sinukat ng tel mo. Maaaring iba kwenta sa paggamit ng data ng carrier."</string>
     <string name="data_usage_metered_title" msgid="7383175371006596441">"Paghihigpit sa network"</string>
-    <string name="data_usage_metered_body" msgid="7655851702771342507">"Ang mga nakametrong network ay itinuturing na parang mga mobile network kapag pinaghihigpitan ang data ng background. Maaaring magbigay ng babala ang mga app bago gamitin ang mga network na ito para sa malalaking download."</string>
+    <string name="data_usage_metered_body" msgid="7655851702771342507">"Ang mga nakametrong network ay itinuturing na parang mga mobile network kapag pinaghihigpitan ang data sa background. Maaaring magbigay ng babala ang mga app bago gamitin ang mga network na ito para sa malalaking download."</string>
     <string name="data_usage_metered_mobile" msgid="5423305619126978393">"Mga mobile network"</string>
     <string name="data_usage_metered_wifi" msgid="1761738002328299714">"Mga nakametrong Wi‑Fi network"</string>
     <string name="data_usage_metered_wifi_disabled" msgid="727808462375941567">"Upang pumili ng mga nakametrong network, i-on ang Wi-FI."</string>
+    <string name="data_usage_metered_auto" msgid="1262028400911918865">"Awtomatiko"</string>
+    <string name="data_usage_metered_yes" msgid="9217539611385225894">"Nakametro"</string>
+    <string name="data_usage_metered_no" msgid="4025232961929071789">"Hindi nakametro"</string>
     <string name="data_usage_disclaimer" msgid="6887858149980673444">"Ang accounting ng data ng carrier ay maaaring naiiba sa iyong device."</string>
     <string name="cryptkeeper_emergency_call" msgid="198578731586097145">"Emergency na tawag"</string>
     <string name="cryptkeeper_return_to_call" msgid="5613717339452772491">"Balikan ang tawag"</string>
@@ -2526,9 +2541,6 @@
     <string name="backup_pw_set_button_text" msgid="2387480910044648795">"Itakda ang backup na password"</string>
     <string name="backup_pw_cancel_button_text" msgid="8845630125391744615">"Kanselahin"</string>
     <string name="additional_system_update_settings_list_item_title" msgid="214987609894661992">"Mga karagdagang pag-update sa system"</string>
-    <string name="selinux_status_disabled" msgid="924551035552323327">"Hindi pinagana"</string>
-    <string name="selinux_status_permissive" msgid="6004965534713398778">"Nagpapahintulot"</string>
-    <string name="selinux_status_enforcing" msgid="2252703756208463329">"Nagpapatupad"</string>
     <string name="ssl_ca_cert_warning" msgid="2045866713601984673">"Maaaring sinusubaybayan ang network"</string>
     <string name="done_button" msgid="1991471253042622230">"Tapos na"</string>
     <plurals name="ssl_ca_cert_dialog_title" formatted="false" msgid="7145092748045794650">
@@ -2571,7 +2583,7 @@
     <string name="user_add_user_message_long" msgid="8562152293752222985">"Maaari mong ibahagi ang device na ito sa iba pang mga tao sa pamamagitan ng paggawa ng mga karagdagang user. Ang bawat user ay may sariling espasyo, na mako-customize niya gamit ang mga app, wallpaper at iba pa. Maaari ding isaayos ng mga user ang mga setting ng device tulad ng Wi‑Fi na makakaapekto sa lahat.\n\nKapag nagdagdag ka ng bagong user, kailangang i-set up ng taong iyon ang kanyang espasyo.\n\nAng sinumang user ay maaaring mag-update ng mga app para sa lahat ng iba pang user."</string>
     <string name="user_add_user_message_short" msgid="1511354412249044381">"Kapag nagdagdag ka ng bagong user, kailangang i-set up ng taong iyon ang kanyang espasyo.\n\nAng sinumang user ay maaaring mag-update ng mga app para sa lahat ng iba pang user."</string>
     <string name="user_setup_dialog_title" msgid="1765794166801864563">"I-set up ang user ngayon?"</string>
-    <string name="user_setup_dialog_message" msgid="1004068621380867148">"Tiyaking available ang tao na kunin ang device at i-set up ang kanyang espasyo"</string>
+    <string name="user_setup_dialog_message" msgid="1004068621380867148">"Tiyaking available ang tao na kunin ang device at i-set up ang kanyang space"</string>
     <string name="user_setup_profile_dialog_message" msgid="3896568553327558731">"Mag-set up ng profile ngayon?"</string>
     <string name="user_setup_button_setup_now" msgid="3391388430158437629">"I-set up ngayon"</string>
     <string name="user_setup_button_setup_later" msgid="3068729597269172401">"Huwag ngayon"</string>
@@ -2726,6 +2738,7 @@
       <item quantity="one">Ipakita ang %d nakatagong item</item>
       <item quantity="other">Ipakita ang %d na nakatagong item</item>
     </plurals>
+    <string name="dashboard_suggestion_condition_footer_content_description" msgid="2898588191174845961">"I-collapse"</string>
     <string name="network_dashboard_title" msgid="4771589228992391573">"Network at Internet"</string>
     <string name="network_dashboard_summary_mobile" msgid="3851083934739500429">"mobile"</string>
     <string name="network_dashboard_summary_data_usage" msgid="3843261364705042212">"paggamit ng data"</string>
@@ -2755,7 +2768,7 @@
     <string name="keywords_display_cast_screen" msgid="7684618996741933067">"i-project, i-cast"</string>
     <string name="keywords_storage" msgid="3299217909546089225">"espasyo, disk, hard drive, paggamit ng device"</string>
     <string name="keywords_battery" msgid="1173830745699768388">"paggamit ng baterya, pag-charge"</string>
-    <string name="keywords_spell_checker" msgid="1399641226370605729">"pagbabaybay, diksyunaryo, spellcheck, auto-correct"</string>
+    <string name="keywords_spell_checker" msgid="1399641226370605729">"pagbabaybay, diksyonaryo, spellcheck, auto-correct"</string>
     <string name="keywords_voice_input" msgid="769778245192531102">"pangkilala, input, pananalita, bigkasin, wika, hands-free, hand free, pagkilala, nakakapanakit, salita, audio, history, bluetooth headset"</string>
     <string name="keywords_text_to_speech_output" msgid="5150660047085754699">"rate, wika, default, sambitin, pagsasalita, tts, pagiging naa-access, screen reader, blind"</string>
     <string name="keywords_date_and_time" msgid="758325881602648204">"orasan, military"</string>
@@ -2804,7 +2817,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, tunog ng notification"</string>
+    <string name="notification_ringtone_title" msgid="4468722874617061231">"Default na notification sound"</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>
@@ -2828,8 +2841,14 @@
       <item quantity="one">May <xliff:g id="ON_COUNT">%d</xliff:g> awtomatikong panuntunang naka-on</item>
       <item quantity="other">May <xliff:g id="ON_COUNT">%d</xliff:g> na awtomatikong panuntunang naka-on</item>
     </plurals>
-    <string name="zen_mode_settings_title" msgid="842308776768942600">"Mga kagustuhan sa Huwag Istorbohin"</string>
-    <string name="zen_mode_priority_settings_title" msgid="2623117023031824309">"Pinapayagan lang ng prioridad"</string>
+    <string name="zen_mode_settings_title" msgid="1066226840983908121">"Huwag Istorbohin"</string>
+    <string name="zen_mode_behavior_settings_title" msgid="1463303933529313969">"Gawi"</string>
+    <string name="zen_mode_behavior_allow_title" msgid="3845615648136218141">"Payagan ang mga tunog at pag-vibrate mula sa"</string>
+    <string name="zen_mode_behavior_no_sound" msgid="1219626004723208056">"Walang tunog"</string>
+    <string name="zen_mode_behavior_total_silence" msgid="6716603819806610626">"Walang tunog (Ganap na Katahimikan)"</string>
+    <string name="zen_mode_behavior_no_sound_except" msgid="4968477585788243114">"Walang tunog maliban sa <xliff:g id="CATEGORIES">%1$s</xliff:g>"</string>
+    <!-- no translation found for zen_mode_behavior_alarms_only (2423480992071472963) -->
+    <skip />
     <string name="zen_mode_automation_settings_title" msgid="4228995740594063774">"Mga awtomatikong panuntunan"</string>
     <string name="zen_mode_automation_suggestion_title" msgid="5105443455143476201">"Magtakda ng panuntunan ng Huwag Istorbohin"</string>
     <string name="zen_mode_automation_suggestion_summary" msgid="4732808039946935657">"Limitahan ang tunog at pag-vibrate sa partikular na oras"</string>
@@ -2837,7 +2856,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 mga visual na abala"</string>
+    <string name="zen_mode_visual_interruptions_settings_title" msgid="6751708745442997940">"I-block ang 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>
@@ -2851,7 +2870,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 mga tunog at pag-vibrate"</string>
+    <string name="other_sound_category_preference_title" msgid="2521096636124314015">"Iba pang 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>
@@ -2871,13 +2890,15 @@
     <string name="notifications_title" msgid="8086372779371204971">"Mga Notification"</string>
     <string name="app_notifications_title" msgid="5810577805218003760">"Notification sa app"</string>
     <string name="notification_channel_title" msgid="2260666541030178452">"Kategorya ng notification"</string>
+    <string name="notification_group_title" msgid="7180506440133859601">"Grupo ng kategorya ng notification"</string>
     <string name="notification_importance_title" msgid="848692592679312666">"Kahalagahan"</string>
-    <string name="notification_importance_unspecified" msgid="2196023702875112081">"Hayaang ang app ang magpasya"</string>
+    <string name="notification_importance_unspecified" msgid="6622173510486113958">"Payagan ang tunog"</string>
     <string name="notification_importance_blocked" msgid="7938180808339386300">"Huwag kailanman magpakita ng mga notification"</string>
     <string name="notification_importance_min" msgid="5455049524984686275">"Walang tunog o visual na pag-abala"</string>
     <string name="notification_importance_low" msgid="8881468429453766553">"Walang tunog"</string>
     <string name="notification_importance_default" msgid="5958338024601957516">"Gumawa ng tunog"</string>
     <string name="notification_importance_high" msgid="2082429479238228527">"Gumawa ng tunog at mag-pop up sa screen"</string>
+    <string name="notification_importance_high_silent" msgid="2667033773703765252">"Mag-pop sa screen"</string>
     <string name="notification_importance_min_title" msgid="6974673091137544803">"Mababa"</string>
     <string name="notification_importance_low_title" msgid="8131254047772814309">"Katamtaman"</string>
     <string name="notification_importance_default_title" msgid="9120383978536089489">"Mataas"</string>
@@ -2920,8 +2941,13 @@
     <string name="loading_notification_apps" msgid="5031818677010335895">"Naglo-load ng mga app..."</string>
     <string name="app_notifications_off_desc" msgid="4882445501376722969">"Pinipigilan ng Android na lumabas ang mga notification ng app na ito sa device na ito"</string>
     <string name="channel_notifications_off_desc" msgid="5899225298718840635">"Pinipigilan ng Android na lumabas ang ganitong kategorya ng mga notification sa device na ito"</string>
+    <string name="channel_group_notifications_off_desc" msgid="1620950416247316370">"Pinipigilan ng Android na lumabas ang grupong ito ng mga notification sa device na ito"</string>
     <string name="notification_channels" msgid="5346841743182627500">"Mga Kategorya"</string>
     <string name="notification_channels_other" msgid="5645317113885788226">"Iba Pa"</string>
+    <plurals name="notification_group_summary" formatted="false" msgid="3420621520561455358">
+      <item quantity="one"><xliff:g id="COUNT_1">%d</xliff:g> kategorya</item>
+      <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> na kategorya</item>
+    </plurals>
     <string name="no_channels" msgid="3077375508177744586">"Walang anumang notification para sa app na ito"</string>
     <string name="app_settings_link" msgid="8894946007543660906">"Mga karagdagang setting sa app"</string>
     <string name="app_notification_listing_summary_zero" msgid="6482582965081108108">"Naka-on para sa lahat ng app"</string>
@@ -2959,7 +2985,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">"Pumili ng uri ng panuntunan"</string>
+    <string name="zen_mode_choose_rule_type" msgid="5423746638871953459">"Piliin ang 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>
@@ -2998,12 +3024,14 @@
     <string name="zen_mode_from_starred" msgid="2678345811950997027">"Mula sa mga contact na may star lang"</string>
     <string name="zen_mode_from_none" msgid="8219706639954614136">"Wala"</string>
     <string name="zen_mode_alarms" msgid="2165302777886552926">"Mga Alarm"</string>
+    <!-- no translation found for zen_mode_media_system_other (8900209390529859777) -->
+    <skip />
     <string name="zen_mode_reminders" msgid="5458502056440485730">"Mga Paalala"</string>
     <string name="zen_mode_events" msgid="7914446030988618264">"Mga Kaganapan"</string>
     <string name="zen_mode_all_callers" msgid="584186167367236922">"Lahat ng tumatawag"</string>
     <string name="zen_mode_selected_callers" msgid="3127598874060615742">"Mga napiling tumatawag"</string>
     <string name="zen_mode_repeat_callers" msgid="5019521886428322131">"Mga umulit na tumatawag"</string>
-    <string name="zen_mode_repeat_callers_summary" msgid="7192713032364140137">"Kung tumawag ang iisang tao sa pangalawang pagkakataon sa loob ng <xliff:g id="MINUTES">%d</xliff:g> (na) minuto, payagan ito"</string>
+    <string name="zen_mode_repeat_callers_summary" msgid="239685342222975733">"Kung muling tumawag ang isang tao sa loob ng <xliff:g id="MINUTES">%d</xliff:g> (na) minuto"</string>
     <string name="zen_mode_when" msgid="2767193283311106373">"Awtomatikong i-on"</string>
     <string name="zen_mode_when_never" msgid="8809494351918405602">"Hindi Kailanman"</string>
     <string name="zen_mode_when_every_night" msgid="3122486110091921009">"Bawat gabi"</string>
@@ -3032,11 +3060,12 @@
     <string name="zen_mode_screen_off_visual_interruptions" msgid="4850792880144382633">"Kapag naka-off ang screen"</string>
     <string name="zen_mode_no_visual_interruptions" msgid="8742776003822778472">"Kapag naka-on o naka-off ang screen"</string>
     <string name="notification_app_settings_button" msgid="6685640230371477485">"Mga setting ng notification"</string>
+    <string name="suggestion_button_text" msgid="3275010948381252006">"Ok"</string>
     <string name="device_feedback" msgid="3238056036766293294">"Feedback tungkol sa device"</string>
     <string name="restr_pin_enter_admin_pin" msgid="1085834515677448072">"Ilagay ang PIN ng admin"</string>
     <string name="switch_on_text" msgid="1124106706920572386">"Naka-on"</string>
     <string name="switch_off_text" msgid="1139356348100829659">"Naka-off"</string>
-    <string name="screen_pinning_title" msgid="2292573232264116542">"Pagpi-pin ng screen"</string>
+    <string name="screen_pinning_title" msgid="2292573232264116542">"Pag-pin ng screen"</string>
     <string name="screen_pinning_description" msgid="3360904523688769289">"Kapag na-on setting na ito, makakapag-pin ka ng screen para patuloy na makita kasalukuyang screen hanggang sa i-unpin mo ito.\n\nPara magamit pagpi-pin sa screen:\n\n1. Tiyaking naka-on pagpi-pin sa screen.\n\n2. Buksan screen na ipi-pin.\n\n3. I-tap Pangkalahatang-ideya.\n\n4. Mag-swipe pataas at i-tap icon ng pin."</string>
     <string name="screen_pinning_unlock_pattern" msgid="8282268570060313339">"Humingi ng pattern sa pag-unlock bago mag-unpin"</string>
     <string name="screen_pinning_unlock_pin" msgid="8757588350454795286">"Humingi ng PIN bago mag-unpin"</string>
@@ -3051,7 +3080,7 @@
     <string name="encryption_interstitial_message_pattern" msgid="7081249914068568570">"Mas mapoprotektahan mo ang device na ito sa pamamagitan ng paghingi ng iyong pattern bago ito magsimula. Hanggang magsimula ang device, hindi ito makakatanggap ng mga tawag, mensahe, o notification, kabilang ang mga alarm. \n\nNakakatulong ito na protektahan ang data ng mga nawawala o ninakaw na device. Humingi ng pattern upang simulan ang device mo?"</string>
     <string name="encryption_interstitial_message_password" msgid="7796567133897436443">"Mas mapoprotektahan mo ang device na ito sa pamamagitan ng paghingi ng iyong password bago ito magsimula. Hanggang magsimula ang device, hindi ito makakatanggap ng mga tawag, mensahe, o notification, kabilang ang mga alarm. \n\nNakakatulong ito na protektahan ang data ng mga nawawala o ninakaw na device. Humingi ng password upang simulan ang device mo?"</string>
     <string name="encryption_interstitial_message_pin_for_fingerprint" msgid="4550632760119547492">"Bukod sa paggamit ng iyong fingerprint upang i-unlock ang device mo, mas mapoprotektahan mo ang device na ito sa pamamagitan ng paghingi ng PIN mo bago ito magsimula. Hanggang magsimula ang device, hindi ito makakatanggap ng mga tawag, mensahe, o notification, kabilang ang mga alarm.\n\nNakakatulong ito na protektahan data ng mga nawawala o ninakaw na device. Humingi ng PIN upang simulan ang iyong device?"</string>
-    <string name="encryption_interstitial_message_pattern_for_fingerprint" msgid="932184823193006087">"Bukod sa paggamit ng iyong fingerprint upang i-unlock ang device mo, mas mapoprotektahan mo ang device na ito sa pamamagitan ng paghingi ng pattern mo bago ito magsimula. Hanggang magsimula ang device, hindi ito makakatanggap ng mga tawag, mensahe, o notification, kabilang ang mga alarm.\n\nNakakatulong ito na protektahan data ng mga nawawala o ninakaw na device. Humingi ng pattern upang simulan ang iyong device?"</string>
+    <string name="encryption_interstitial_message_pattern_for_fingerprint" msgid="932184823193006087">"Bukod sa paggamit sa iyong fingerprint upang i-unlock ang device mo, mas mapoprotektahan mo ang device na ito sa pamamagitan ng paghingi ng pattern mo bago ito magsimula. Hanggang sa magsimula ang device, hindi ito makakatanggap ng mga tawag, mensahe, o notification, kabilang ang mga alarm.\n\nNakakatulong itong maprotektahan ang data sa mga nawawala o nanakaw na device. Humingi ng pattern upang simulan ang iyong device?"</string>
     <string name="encryption_interstitial_message_password_for_fingerprint" msgid="5560954719370251702">"Bukod pa sa paggamit ng iyong fingerprint sa pag-unlock ng device mo, maaari mong higit pang protektahan ang device na ito sa pamamagitan ng paghingi ng iyong password bago ito magsimula. Hangga\'t hindi nakakapagsimula ang device, hindi ito makakatanggap ng mga tawag, mensahe, o notification, kabilang ang mga alarm.\n\nNakakatulong ito sa pagprotekta ng data sa mga nawawala o nanakaw na device. Humingi ng password sa pagsisimula ng iyong device?"</string>
     <string name="encryption_interstitial_yes" msgid="4439509435889513411">"Oo"</string>
     <string name="encryption_interstitial_no" msgid="8935031349097025137">"Huwag"</string>
@@ -3168,7 +3197,7 @@
     <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 kumpletong paggamit ng device"</string>
+    <string name="show_all_apps" msgid="1512506948197818534">"Ipakita ang paggamit ng device"</string>
     <string name="hide_extra_apps" msgid="5016497281322459633">"Ipakita ang paggamit ng app"</string>
     <string name="power_high_usage_title" msgid="6027369425057347826">"Malakas gumamit ng baterya"</string>
     <plurals name="power_high_usage_summary" formatted="false" msgid="467347882627862744">
@@ -3216,6 +3245,7 @@
     <string name="usb_summary_file_transfers" msgid="6435943692610175111">"Paglilipat ng mga file"</string>
     <string name="usb_summary_photo_transfers" msgid="8440204169576585250">"Paglilipat ng mga larawan (PTP)"</string>
     <string name="usb_summary_MIDI" msgid="5687906612187885908">"Paggamit ng device bilang MIDI"</string>
+    <string name="sms_mirroring_pref" msgid="6475043279147376031">"Pag-mirror ng SMS"</string>
     <string name="background_check_pref" msgid="7550258400138010979">"Pagsusuri sa background"</string>
     <string name="background_check_title" msgid="4534254315824525593">"Kumpletong access sa background"</string>
     <string name="assist_access_context_title" msgid="2269032346698890257">"Gamitin ang text mula sa screen"</string>
@@ -3282,7 +3312,7 @@
     <string name="write_settings_title" msgid="4232152481902542284">"Maaaring magbago ng mga setting ng system"</string>
     <string name="write_system_settings" msgid="3482913590601096763">"Baguhin ang setting ng system"</string>
     <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="permit_write_settings" msgid="658555006453212691">"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>
@@ -3309,7 +3339,7 @@
     <string name="screen_zoom_conversation_timestamp_3" msgid="3785674344762707688">"Mar 6:02PM"</string>
     <string name="screen_zoom_conversation_timestamp_4" msgid="2511469395448561259">"Mar 6:03PM"</string>
     <string name="disconnected" msgid="4836600637485526329">"Hindi nakakonekta"</string>
-    <string name="data_usage_summary_format" msgid="7507047900192160585">"<xliff:g id="AMOUNT">%1$s</xliff:g> ng data ang ginamit"</string>
+    <string name="data_usage_summary_format" msgid="7507047900192160585">"<xliff:g id="AMOUNT">%1$s</xliff:g> ng data ang nagamit"</string>
     <plurals name="notification_summary" formatted="false" msgid="3941492005316143599">
       <item quantity="one">Naka-off para sa <xliff:g id="COUNT">%d</xliff:g> app</item>
       <item quantity="other">Naka-off para sa <xliff:g id="COUNT">%d</xliff:g> na app</item>
@@ -3377,9 +3407,12 @@
     <string name="color_temperature" msgid="2070126836910615605">"Malamig na temperatura ng kulay"</string>
     <string name="color_temperature_desc" msgid="4793729830226404052">"Gumamit ng mas malalamig na kulay ng display"</string>
     <string name="color_temperature_toast" msgid="4974218172133854827">"Upang ilapat ang pagbabago sa kulay, i-off ang screen"</string>
-    <string name="telephony_monitor_toast" msgid="7003764250271195384">"Upang ilapat ang pagbabago sa telephony monitor, i-reboot ang device"</string>
+    <string name="connectivity_monitor_switch" msgid="9059759348648583421">"Connectivity Monitor"</string>
+    <string name="connectivity_monitor_switch_summary" msgid="2828658652378866401">"Mangongolekta ang ConnectivityMonitor ng mga log kapag nakatukoy ito ng problema sa koneksyon at magpo-prompt ito ng notification sa user na mag-file ng bug"</string>
+    <string name="connectivity_monitor_toast" msgid="5551859612881173028">"Upang ilapat ang pagbabago sa connectivity monitor, i-reboot ang device"</string>
     <string name="camera_hal_hdrplus_switch" msgid="8377365197105267466">"Camera HAL HDR+"</string>
     <string name="camera_hal_hdrplus_toast" msgid="2063703797270055299">"Upang mailapat ang pagbabago sa Camera HAL HDR+, i-reboot ang device"</string>
+    <string name="camera_laser_sensor_switch" msgid="8913588990743234440">"Sensor ng Laser ng Camera"</string>
     <string name="ota_disable_automatic_update" msgid="2319639631655915050">"Mga awtomatikong pag-update ng system"</string>
     <string name="usage" msgid="2977875522080448986">"Paggamit"</string>
     <string name="cellular_data_usage" msgid="2155683719898158203">"Paggamit ng mobile data"</string>
@@ -3405,7 +3438,7 @@
     <string name="data_warning" msgid="209133958008062117">"Babala sa paggamit ng data"</string>
     <string name="set_data_limit" msgid="2901526323210516923">"Itakda ang limitasyon ng data"</string>
     <string name="data_limit" msgid="1885406964934590552">"Limitasyon ng data"</string>
-    <string name="data_usage_template" msgid="392191945602400904">"<xliff:g id="ID_1">%1$s</xliff:g> ang nagamit noong <xliff:g id="ID_2">%2$s</xliff:g>"</string>
+    <string name="data_usage_template" msgid="2923744765873163859">"<xliff:g id="ID_1">%1$s</xliff:g> ang nagamit noong <xliff:g id="ID_2">%2$s</xliff:g>"</string>
     <string name="configure" msgid="1029654422228677273">"I-configure"</string>
     <string name="data_usage_other_apps" msgid="3272872663517382050">"Iba pang mga app na kasama sa paggamit"</string>
     <plurals name="data_saver_unrestricted_summary" formatted="false" msgid="2635267833484232703">
@@ -3474,7 +3507,7 @@
     <string name="button_confirm_convert_fbe" msgid="7101855374850373091">"I-wipe at i-convert"</string>
     <string name="reset_shortcut_manager_throttling" msgid="6495066467198668994">"I-reset ang ShortcutManager na naglilimita ng rate"</string>
     <string name="reset_shortcut_manager_throttling_complete" msgid="1826770872063707900">"Na-reset na ang ShortcutManager na naglilimita ng rate"</string>
-    <string name="notification_suggestion_title" msgid="4506524937307816475">"Kontrolin ang notification sa lockscreen"</string>
+    <string name="notification_suggestion_title" msgid="387052719462473500">"Kontrolin ang impormasyon sa lock screen"</string>
     <string name="notification_suggestion_summary" msgid="8521159741445416875">"Ipakita o itago ang content ng notification"</string>
     <string name="page_tab_title_summary" msgid="4070309266374993258">"Lahat"</string>
     <string name="page_tab_title_support" msgid="8483187649355540109">"Suporta at mga tip"</string>
@@ -3482,7 +3515,7 @@
     <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>
     <string name="premium_sms_access" msgid="4660047004791638305">"Access sa Premium SMS"</string>
-    <string name="bluetooth_disabled" msgid="2456198532288640046">"Hindi nakikita sa iba pang device"</string>
+    <string name="bluetooth_disabled" msgid="6244000672828617410">"Naka-off"</string>
     <string name="bluetooth_connected_summary" msgid="7672528674593152862">"Nakakonekta sa <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="bluetooth_connected_multiple_devices_summary" msgid="9173661896296663932">"Nakakonekta sa maraming device"</string>
     <string name="demo_mode" msgid="2798762752209330277">"Demo mode ng System UI"</string>
@@ -3561,7 +3594,7 @@
     <string name="ambient_display_title" product="device" msgid="3423781975742145894">"Mag-double tap upang suriin ang device"</string>
     <string name="ambient_display_summary" msgid="525662960806416373">"Upang tingnan ang oras, mga icon ng notification, at iba pang impormasyon, i-double tap ang iyong screen."</string>
     <string name="ambient_display_suggestion_summary" msgid="5987443721392571847">"Tingnan ang mga notification kapag naka-off ang screen"</string>
-    <string name="ambient_display_pickup_title" product="default" msgid="818688002837687268">"Kunin upang suriin ang telepono"</string>
+    <string name="ambient_display_pickup_title" product="default" msgid="818688002837687268">"Hawakan para i-check ang phone"</string>
     <string name="ambient_display_pickup_title" product="tablet" msgid="4455864282995698097">"Kunin upang suriin ang tablet"</string>
     <string name="ambient_display_pickup_title" product="device" msgid="5380534405773531175">"Kunin upang suriin ang device"</string>
     <string name="ambient_display_pickup_summary" product="default" msgid="4567020486787561873">"Upang tingnan ang oras, mga icon ng notification, at iba pang impormasyon, kunin ang iyong telepono."</string>
@@ -3584,7 +3617,7 @@
     <string name="web_action_enable_title" msgid="4051513950976670853">"Mga instant na app"</string>
     <string name="web_action_enable_summary" msgid="3108127559723396382">"Magbukas ng mga link sa mga app, kahit na hindi naka-install ang mga ito"</string>
     <string name="web_action_section_title" msgid="7364647086538399136">"Mga instant na app"</string>
-    <string name="instant_apps_account" msgid="1433620209791992528">"Account ng mga instant na app"</string>
+    <string name="instant_apps_settings" msgid="8827777916518348213">"Mga kagustuhan sa Instant Apps"</string>
     <string name="domain_url_section_title" msgid="7046835219056428883">"Mga naka-install na app"</string>
     <string name="automatic_storage_manager_activation_warning" msgid="6353100011690933254">"Pinamamahalaan na ngayon ng storage manager ang iyong storage"</string>
     <string name="account_for_section_header" msgid="5356566418548737121">"Mga account para kay <xliff:g id="USER_NAME">%1$s</xliff:g>"</string>
@@ -3631,7 +3664,9 @@
     <string name="enterprise_privacy_always_on_vpn_personal" msgid="9217774730260037434">"Naka-on ang palaging naka-on na VPN sa iyong personal na profile"</string>
     <string name="enterprise_privacy_always_on_vpn_work" msgid="7244472958208315814">"Naka-on ang palaging naka-on na VPN sa iyong profile sa trabaho"</string>
     <string name="enterprise_privacy_global_http_proxy" msgid="7936664553416257333">"Naitakda na ang pangkalahatang HTTP proxy"</string>
-    <string name="enterprise_privacy_ca_certs" msgid="5885892204903688909">"Mga pinagkakatiwalaang kredensyal"</string>
+    <string name="enterprise_privacy_ca_certs_device" msgid="2019652712782510262">"Mga pinagkakatiwalaang kredensyal"</string>
+    <string name="enterprise_privacy_ca_certs_personal" msgid="2279084820904076599">"Mga pinagkakatiwalaang kredensyal sa iyong personal na profile"</string>
+    <string name="enterprise_privacy_ca_certs_work" msgid="6187377647815301809">"Mga pinagkakatiwalaang kredensyal sa iyong profile sa trabaho"</string>
     <plurals name="enterprise_privacy_number_ca_certs" formatted="false" msgid="526375234629534165">
       <item quantity="one">Minimum na <xliff:g id="COUNT_1">%d</xliff:g> CA certificate</item>
       <item quantity="other">Minimum na <xliff:g id="COUNT_1">%d</xliff:g> na CA certificate</item>
@@ -3694,6 +3729,8 @@
     <string name="carrier_provisioning" msgid="4398683675591893169">"Impormasyon sa Provisioning ng Carrier"</string>
     <string name="trigger_carrier_provisioning" msgid="3434865918009286187">"I-trigger ang Provisioning ng Carrier"</string>
     <string name="new_device_suggestion_title" msgid="698847081680980774">"Ano ang bago at kapana-panabik?"</string>
-    <string name="new_device_suggestion_summary" msgid="7172709269203435870">"Tingnan ang nangungunang 5 feature"</string>
+    <string name="new_device_suggestion_summary" product="default" msgid="206396571522515855">"Maglibot sa iyong bagong telepono"</string>
+    <string name="new_device_suggestion_summary" product="tablet" msgid="393751455688210956">"Maglibot sa iyong bagong tablet"</string>
+    <string name="new_device_suggestion_summary" product="device" msgid="2939870049868336652">"Maglibot sa iyong bagong device"</string>
     <string name="disabled_low_ram_device" msgid="3751578499721173344">"Hindi available ang feature na ito sa device na ito"</string>
 </resources>
diff --git a/res/values-tr/arrays.xml b/res/values-tr/arrays.xml
index b84b724..9f3b95c 100644
--- a/res/values-tr/arrays.xml
+++ b/res/values-tr/arrays.xml
@@ -100,8 +100,6 @@
     <!-- no translation found for wifi_security_no_eap:0 (2084555984818107151) -->
     <!-- no translation found for wifi_security_no_eap:1 (397579322683471524) -->
     <!-- no translation found for wifi_security_no_eap:2 (1968820975358150484) -->
-    <!-- no translation found for wifi_ap_security:0 (5251664683198623324) -->
-    <!-- no translation found for wifi_ap_security:1 (7989073072260294673) -->
   <string-array name="wifi_eap_method">
     <item msgid="1160193392455075561">"PEAP"</item>
     <item msgid="7981731051382306293">"TLS"</item>
diff --git a/res/values-tr/strings.xml b/res/values-tr/strings.xml
index 3955667..a33be49 100644
--- a/res/values-tr/strings.xml
+++ b/res/values-tr/strings.xml
@@ -166,7 +166,7 @@
     <string name="bluetooth_map_acceptance_dialog_text" msgid="8712508202081143737">"%1$s, iletilerinize erişmek istiyor. %2$s için erişim izni veriyor musunuz?"</string>
     <string name="bluetooth_sap_request" msgid="2669762224045354417">"SIM\'e erişim isteği"</string>
     <string name="bluetooth_sap_acceptance_dialog_text" msgid="4414253873553608690">"<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g>, SIM kartınıza erişmek istiyor. SIM karta erişim vermek, bağlantı süresince cihazınızın veri bağlantısını devre dışı bırakır. <xliff:g id="DEVICE_NAME_1">%2$s?</xliff:g> adlı cihaza bağlantı verin"</string>
-    <string name="bluetooth_device_name_summary" msgid="4757990010751789977">"Diğer cihazlar tarafından \"<xliff:g id="DEVICE_NAME">^1</xliff:g>\" olarak görülüyor"</string>
+    <string name="bluetooth_device_name_summary" msgid="522235742194965734">"Diğer cihazlar tarafından \"<xliff:g id="DEVICE_NAME">^1</xliff:g>\" olarak görülür"</string>
     <string name="bluetooth_paired_device_title" msgid="8638994696317952019">"Cihazlarınız"</string>
     <string name="bluetooth_pairing_page_title" msgid="7712127387361962608">"Yeni cihaz eşle"</string>
     <string name="date_and_time" msgid="9062980487860757694">"Tarih ve saat"</string>
@@ -312,6 +312,8 @@
     <string name="zone_auto" msgid="334783869352026648">"Otomatik saat dilimi"</string>
     <string name="zone_auto_summaryOn" msgid="6142830927278458314">"Ağ tarafından sağlanan saat dilimini kullan"</string>
     <string name="zone_auto_summaryOff" msgid="2597745783162041390">"Ağ tarafından sağlanan saat dilimini kullan"</string>
+    <string name="date_time_24hour_auto" msgid="2117383168985653422">"Otomatik 24 saat biçimi"</string>
+    <string name="date_time_24hour_auto_summary" msgid="6351812925651480277">"Yerel ayar varsayılanını kullan"</string>
     <string name="date_time_24hour_title" msgid="3203537578602803850">"24 saat biçimi"</string>
     <string name="date_time_24hour" msgid="1193032284921000063">"24 saat biçimini kullan"</string>
     <string name="date_time_set_time_title" msgid="6296795651349047016">"Saat"</string>
@@ -372,6 +374,9 @@
     <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="1961957425135180242">"İleri"</string>
+    <string name="setup_fingerprint_enroll_skip_title" msgid="362050541117362034">"Parmak izi atlansın mı?"</string>
+    <string name="setup_fingerprint_enroll_skip_after_adding_lock_text" msgid="958990414356204763">"Parmak izi kurulumu yalnızca birkaç dakika sürer. Bu adımı atlarsanız parmak izinizi daha sonra ayarlardan ekleyebilirsiniz."</string>
+    <string name="lock_screen_intro_skip_title" msgid="4988210105913705679">"Ekran kilidi atlansın mı?"</string>
     <string name="lock_screen_intro_skip_dialog_text_frp" product="tablet" msgid="1581834104051243425">"Cihaz koruma özellikleri etkinleştirilmeyecek. Dolayısıyla tablet kaybolduğunda, çalındığında veya sıfırlandığında başkalarının bu tableti kullanmasını önleyemeyeceksiniz."</string>
     <string name="lock_screen_intro_skip_dialog_text_frp" product="device" msgid="4629503416877189572">"Cihaz koruma özellikleri etkinleştirilmeyecek. Dolayısıyla cihaz kaybolduğunda, çalındığında veya sıfırlandığında başkalarının bu cihazı kullanmasını önleyemeyeceksiniz."</string>
     <string name="lock_screen_intro_skip_dialog_text_frp" product="default" msgid="2423428240245737909">"Cihaz koruma özellikleri etkinleştirilmeyecek. Dolayısıyla telefon kaybolduğunda, çalındığında veya sıfırlandığında başkalarının bu telefonu kullanmasını önleyemeyeceksiniz."</string>
@@ -389,7 +394,7 @@
     <string name="security_settings_fingerprint_enroll_start_title" msgid="2068961812439460133">"Sensöre dokunun"</string>
     <string name="security_settings_fingerprint_enroll_start_message" msgid="3909929328942564524">"Parmağınızı sensörün üzerine koyun ve bir titreşim hissettiğinizde kaldırın"</string>
     <string name="security_settings_fingerprint_enroll_repeat_title" msgid="2819679722403209778">"Kaldırın, tekrar dokunun"</string>
-    <string name="security_settings_fingerprint_enroll_repeat_message" msgid="6158989350522518586">"Parmak izinizin tüm farklı noktalarını eklemek için parmağınızı sürekli kaldırıp dokunun"</string>
+    <string name="security_settings_fingerprint_enroll_repeat_message" msgid="6158989350522518586">"Parmak izinizin tüm farklı noktalarını eklemek için parmağınızı kaldırıp dokundurmaya devam edin"</string>
     <string name="security_settings_fingerprint_enroll_finish_title" msgid="7567276170287972230">"Parmak izi eklendi"</string>
     <string name="security_settings_fingerprint_enroll_finish_message" msgid="4796715961273420536">"Bu simgeyi gördüğünüzde, kimlik belirlemek veya bir satın alma işlemine onay vermek için parmak izinizi kullanın."</string>
     <string name="security_settings_fingerprint_enroll_enrolling_skip" msgid="3710211704052369752">"Daha sonra yap"</string>
@@ -457,7 +462,7 @@
     <string name="setup_lock_settings_picker_title" product="tablet" msgid="90329443364067215">"Tabletinizi koruyun"</string>
     <string name="setup_lock_settings_picker_title" product="device" msgid="2399952075134938929">"Cihazınızı koruyun"</string>
     <string name="setup_lock_settings_picker_title" product="default" msgid="1572244299605153324">"Telefonunuzu koruyun"</string>
-    <string name="setup_lock_settings_picker_fingerprint_message" msgid="5585650064305600578">"Daha fazla güvenlik için yedek ekran kilidi ayarlayın."</string>
+    <string name="lock_settings_picker_fingerprint_added_security_message" msgid="5768002109707648463">"Daha fazla güvenlik için yedek ekran kilidi ayarlayın."</string>
     <string name="setup_lock_settings_picker_message" product="tablet" msgid="8919671129189936210">"Cihaz koruma özelliklerini etkinleştirerek, izniniz olmadan başkalarının bu tableti kullanmasını engelleyin. Kullanmak istediğiniz ekran kilidini seçin."</string>
     <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>
@@ -588,6 +593,7 @@
     <string name="lockpassword_pin_no_sequential_digits" msgid="680765285206990584">"Artan, azalan veya tekrar eden rakam dizisine izin verilmiyor"</string>
     <string name="lockpassword_ok_label" msgid="313822574062553672">"Tamam"</string>
     <string name="lockpassword_cancel_label" msgid="8818529276331121899">"İptal"</string>
+    <string name="lockpassword_clear_label" msgid="5724429464960458155">"Temizle"</string>
     <string name="lockpattern_tutorial_cancel_label" msgid="6431583477570493261">"İptal"</string>
     <string name="lockpattern_tutorial_continue_label" msgid="3559793618653400434">"İleri"</string>
     <string name="lock_setup" msgid="3355847066343753943">"Kurulum tamamlandı."</string>
@@ -727,7 +733,7 @@
     <string name="wifi_poor_network_detection_summary" msgid="2784135142239546291">"İnternet bağlantısı iyi olmadıkça Kablosuz ağı kullanma"</string>
     <string name="wifi_avoid_poor_network_detection_summary" msgid="4674423884870027498">"Yalnızca iyi İnternet bağlantısı olan ağları kullanın"</string>
     <string name="use_open_wifi_automatically_title" msgid="6851951242903078588">"Açık ağlara bağlan"</string>
-    <string name="use_open_wifi_automatically_summary" msgid="2982091714252931713">"Yüksek kaliteli genel ağlara otomatik olarak bağlan"</string>
+    <string name="use_open_wifi_automatically_summary" msgid="2982091714252931713">"Herkese açık yüksek kaliteli ağlara otomatik olarak bağlan"</string>
     <string name="use_open_wifi_automatically_summary_scoring_disabled" msgid="593964217679325831">"Bu özelliği kullanmak için ağ derecelendirme sağlayıcısı seçin"</string>
     <string name="use_open_wifi_automatically_summary_scorer_unsupported_disabled" msgid="8472122600853650258">"Bu özelliği kullanmak için uygun bir ağ derecelendirme sağlayıcısı seçin"</string>
     <string name="wifi_install_credentials" msgid="3551143317298272860">"Sertifika yükle"</string>
@@ -781,6 +787,7 @@
     <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>
@@ -817,6 +824,8 @@
     <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_carrier_connect" msgid="8174696557882299911">"Operatör kablosuz ağı"</string>
+    <string name="wifi_carrier_content" msgid="4634077285415851933">"<xliff:g id="NAME">%1%s</xliff:g> üzerinden bağlanın"</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_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>
@@ -834,6 +843,7 @@
     <string name="wifi_connect" msgid="1076622875777072845">"Bağlan"</string>
     <string name="wifi_failed_connect_message" msgid="8491902558970292871">"Ağa bağlanılamadı"</string>
     <string name="wifi_forget" msgid="8168174695608386644">"Unut"</string>
+    <string name="wifi_modify" msgid="6100248070440710782">"Değiştir"</string>
     <string name="wifi_failed_forget_message" msgid="1348172929201654986">"Ağ unutulamadı"</string>
     <string name="wifi_save" msgid="3331121567988522826">"Kaydet"</string>
     <string name="wifi_failed_save_message" msgid="6650004874143815692">"Ağ kaydedilemedi"</string>
@@ -846,6 +856,7 @@
     <string name="wifi_advanced_titlebar" msgid="4485841401774142908">"Gelişmiş Kablosuz"</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_title" msgid="3471132676909349382">"Ağ bilgisi"</string>
     <string name="wifi_details_subnet_mask" msgid="6720279144174924410">"Alt ağ maskesi"</string>
     <string name="wifi_details_dns" msgid="8648826607751830768">"DNS"</string>
     <string name="wifi_details_ipv6_address_header" msgid="6734119149106422148">"IPv6 adresleri"</string>
@@ -878,16 +889,15 @@
     <string name="wifi_p2p_cancel_connect_title" msgid="255267538099324413">"Davetiye iptal edilsin mi?"</string>
     <string name="wifi_p2p_cancel_connect_message" msgid="7477756213423749402">"<xliff:g id="PEER_NAME">%1$s</xliff:g> cihazına bağlanma davetiyesini iptal etmek istiyor musunuz?"</string>
     <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_off_subtext" msgid="5466126533609394170">"Diğer cihazlarla içerik veya internet paylaşılmıyor"</string>
     <string name="wifi_hotspot_tethering_on_subtext" product="tablet" msgid="5752490509369962007">"Bu tabletin internet bağlantısı hotspot üzerinden paylaşılıyor"</string>
     <string name="wifi_hotspot_tethering_on_subtext" product="default" msgid="6461075246164300670">"Bu telefonun internet bağlantısı hotspot üzerinden paylaşılıyor"</string>
     <string name="wifi_hotspot_on_local_only_subtext" msgid="2068110388011294735">"Uygulama içerik paylaşıyor. İnternet bağlantısını paylaşmak için hotspot\'u kapatıp tekrar açın"</string>
-    <string name="wifi_hotspot_name_title" msgid="1341735529132128887">"Kablosuz ağ adı"</string>
+    <string name="wifi_hotspot_name_title" msgid="8237000746618636778">"Hotspot adı"</string>
     <string name="wifi_hotspot_name_summary_connecting" msgid="3378299995508671967">"<xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g> etkinleştiriliyor..."</string>
     <string name="wifi_hotspot_name_summary_connected" msgid="3888672084861445362">"Diğer cihazlar şuna bağlanabilir: <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>"</string>
-    <string name="wifi_hotspot_password_title" msgid="1955592302902091281">"Kablosuz ağ şifresi"</string>
+    <string name="wifi_hotspot_password_title" msgid="8676859981917573801">"Hotspot şifresi"</string>
     <string name="wifi_hotspot_ap_band_title" msgid="1165801173359290681">"Erişim Noktası Bandı"</string>
     <string name="wifi_hotspot_footer_info_regular" msgid="1203489406068036455">"Diğer cihazlarınıza yönelik kablosuz ağ oluşturmak için hotspot\'u kullanın. Hotspot, mobil veri bağlantınızı kullanarak internet bağlantısı sağlar. Bunun için ek mobil veri ücretleri uygulanabilir."</string>
     <string name="wifi_hotspot_footer_info_local_only" msgid="857988412470694109">"Uygulamalar yakınlardaki cihazlarla içerik paylaşmak için bir hotspot oluşturabilir."</string>
@@ -898,7 +908,6 @@
     <string name="wifi_tether_configure_ap_text" msgid="7974681394041609308">"Kablosuz hotspot kurulumu yap"</string>
     <string name="wifi_hotspot_configure_ap_text" msgid="5478614731464220432">"Kablosuz hotspot kurulumu"</string>
     <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">"Android Ortak Erişim Noktası"</string>
     <string name="wifi_calling_settings_title" msgid="4102921303993404577">"Kablosuz çağrı"</string>
     <string name="wifi_calling_suggestion_title" msgid="9008010480466359578">"Kablosuz Çağrı\'yı açın"</string>
@@ -939,7 +948,7 @@
     <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="emergency_address_summary" msgid="3266760199681945746">"Kablosuz bağlantı kullanarak acil durum çağrısı yaparsanız, acil durum hizmetleri tarafından konumunuz olarak kullanılan adres"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"Ekran"</string>
     <string name="sound_settings" msgid="5534671337768745343">"Ses"</string>
     <string name="all_volume_title" msgid="4296957391257836961">"Ses Düzeyleri"</string>
@@ -993,6 +1002,7 @@
     <string name="search_settings" msgid="1910951467596035063">"Ara"</string>
     <string name="search_settings_summary" msgid="9205656546570654169">"Arama ayarlarını ve geçmişi yönet"</string>
     <string name="search_settings_no_results" msgid="8799027492641230999">"Sonuç yok"</string>
+    <string name="search_clear_history" msgid="4196658962573162457">"Geçmişi temizle"</string>
     <string name="display_settings" msgid="7965901687241669598">"Ekran"</string>
     <string name="accelerometer_title" msgid="7854608399547349157">"Ekranı otomatik döndür"</string>
     <string name="color_mode_title" msgid="3159275920408338215">"Canlı renkler"</string>
@@ -1122,7 +1132,6 @@
     <string name="baseband_version" msgid="1848990160763524801">"Ana bant sürümü"</string>
     <string name="kernel_version" msgid="9192574954196167602">"Çekirdek sürümü"</string>
     <string name="build_number" msgid="3075795840572241758">"Derleme numarası"</string>
-    <string name="selinux_status" msgid="6212165375172061672">"SELinux durumu"</string>
     <string name="device_info_not_available" msgid="8062521887156825182">"Uygun değil"</string>
     <string name="device_status_activity_title" msgid="1411201799384697904">"Durum"</string>
     <string name="device_status" msgid="607405385799807324">"Durum"</string>
@@ -1150,7 +1159,6 @@
     <string name="status_wifi_mac_address" msgid="2202206684020765378">"Kablosuz MAC adresi"</string>
     <string name="status_bt_address" msgid="4195174192087439720">"Bluetooth adresi"</string>
     <string name="status_serial_number" msgid="2257111183374628137">"Seri numara"</string>
-    <string name="status_unavailable" msgid="7862009036663793314">"Kullanılamıyor"</string>
     <string name="status_up_time" msgid="7294859476816760399">"Açık kalma süresi"</string>
     <string name="status_awake_time" msgid="2393949909051183652">"Uyanık geçen süre"</string>
     <string name="internal_memory" msgid="9129595691484260784">"Dahili dep birm"</string>
@@ -1325,8 +1333,9 @@
     <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>
-    <string name="reset_dashboard_title" msgid="6254873816990678620">"Seçenekleri sıfırlayın"</string>
-    <string name="reset_network_title" msgid="6166025966016873843">"Kablosuz, mobil ve Bluetooth\'u sıfırla"</string>
+    <string name="reset_dashboard_title" msgid="6254873816990678620">"Seçenekleri sıfırla"</string>
+    <string name="reset_dashboard_summary" msgid="4851012632493522755">"Ağ uygulamaları veya cihaz sıfırlanabilir"</string>
+    <string name="reset_network_title" msgid="6166025966016873843">"Kablosuz, mobil, Bluetooth\'u sıfırla"</string>
     <string name="reset_network_desc" msgid="5547979398298881406">"Bu sıfırlama işlemi, aşağıdakiler de dahil olmak üzere tüm ağ ayarlarınızı sıfırlayacaktır:\n\n"<li>"Kablosuz ağ"</li>\n<li>"Mobil veri"</li>\n<li>"Bluetooth"</li></string>
     <string name="reset_network_button_text" msgid="2035676527471089853">"Ayarları sıfırla"</string>
     <string name="reset_network_final_desc" msgid="6388371121099245116">"Tüm ağ ayarlarınız sıfırlansın mı? Bu işlemi geri alamazsınız!"</string>
@@ -1334,17 +1343,14 @@
     <string name="reset_network_confirm_title" msgid="1759888886976962773">"Sıfırlansın mı?"</string>
     <string name="network_reset_not_available" msgid="7188610385577164676">"Bu kullanıcı için ağ ayarlarına sıfırlama işlevi kullanılamıyor"</string>
     <string name="reset_network_complete_toast" msgid="787829973559541880">"Ağ ayarları sıfırlandı"</string>
-    <string name="master_clear_title" msgid="6617679904229218425">"Tüm verileri sil (Fabrika ayarlarına sıfırla)"</string>
-    <plurals name="master_clear_with_account_summary" formatted="false" msgid="5911377203778818712">
-      <item quantity="other"><xliff:g id="ACCOUNT_COUNT">%1$d</xliff:g> hesap sıfırlanacak</item>
-      <item quantity="one">1 hesap sıfırlanacak</item>
-    </plurals>
-    <string name="master_clear_summary" msgid="6902443944660426951">"Dahili depolama alanı ve tüm veriler sıfırlanacak"</string>
+    <string name="master_clear_title" msgid="3531267871084279512">"Tüm verileri sil (fabrika ayarlarına sıfırla)"</string>
     <string name="master_clear_desc" product="tablet" msgid="9146059417023157222">"Bu işlem tablet bilgisayarınızın "<b>"dahili depolama alanından"</b>"şu verilerin tümünü siler:\n\n"<li>"Google hesabınız"</li>\n<li>"Sistem ve uygulama verileri ile ayarları"</li>\n<li>"İndirilen uygulamalar"</li></string>
     <string name="master_clear_desc" product="default" msgid="4800386183314202571">"Bu işlem, telefonunuzun "<b>"dahili depolama alanından"</b>" şu verilerin tümünü siler:\n\n"<li>"Google hesabınız"</li>\n<li>"Sistem ve uygulama verileri ile ayarları"</li>\n<li>"İndirilen uygulamalar"</li></string>
     <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"Şu anda aşağıdaki hesaplarda oturum açmış durumdasınız:\n"</string>
     <string name="master_clear_other_users_present" product="default" msgid="5161423070702470742">\n\n"Bu cihazda başka kullanıcılar da var.\n"</string>
     <string name="master_clear_desc_also_erases_external" msgid="1903185203791274237"><li>"Müzik"</li>\n<li>"Fotoğraflar"</li>\n<li>"Diğer kullanıcı verileri"</li></string>
+    <string name="master_clear_desc_also_erases_esim" msgid="312352697653096008"><li>"eSIM\'deki operatörler"</li></string>
+    <string name="master_clear_desc_no_cancel_mobile_plan" msgid="5460926449093211144">\n\n"Bu işlem mobil hizmet planınızı iptal etmeyecektir."</string>
     <string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="7744115866662613411">\n\n"Müzik, resimler ve diğer kullanıcı verilerinin temizlenmesi için "<b>"USB belleğin"</b>" silinmesi gerekir."</string>
     <string name="master_clear_desc_erase_external_storage" product="default" msgid="4801026652617377093">\n\n"Müzik, resimler ve diğer kullanıcı verilerinin temizlenmesi için "<b>"SD kartın"</b>" silinmesi gerekir."</string>
     <string name="erase_external_storage" product="nosdcard" msgid="969364037450286809">"USB belleği sil"</string>
@@ -1461,15 +1467,16 @@
     <string name="settings_safetylegal_activity_title" msgid="6901214628496951727">"Güvenlik bilgileri"</string>
     <string name="settings_safetylegal_activity_unreachable" msgid="250674109915859456">"Veri bağlantınız yok. Bu bilgileri şimdi görüntülemek için İnternet\'e bağlı herhangi bir bilgisayardan %s adresine gidin."</string>
     <string name="settings_safetylegal_activity_loading" msgid="8059022597639516348">"Yükleniyor…"</string>
-    <string name="lockpassword_choose_your_password_header" msgid="8624900666929394990">"Şifrenizi seçin"</string>
-    <string name="lockpassword_choose_your_password_header_for_fingerprint" msgid="6624409510609085450">"Parmak izi için şifre ayarlayın"</string>
-    <string name="lockpassword_choose_your_pattern_header" msgid="6949761069941694050">"Deseninizi seçin"</string>
-    <string name="lockpassword_choose_your_pattern_header_for_fingerprint" msgid="5901096361617543819">"Parmak izi için desen ayarlayın"</string>
-    <string name="lockpassword_choose_your_pin_header" msgid="7598849519816138302">"PIN\'inizi seçin"</string>
-    <string name="lockpassword_choose_your_pin_header_for_fingerprint" msgid="765344692615917183">"Parmak izi için PIN ayarlayın"</string>
-    <string name="lockpassword_confirm_your_password_header" msgid="6308478184889846633">"Şifrenizi onaylayın"</string>
+    <string name="lockpassword_choose_your_screen_lock_header" msgid="3872462096767152394">"Ekran kilidi ayarlayın"</string>
+    <string name="lockpassword_choose_your_password_message" msgid="1197569283524841412">"Güvenlik için şifre ayarlayın"</string>
+    <string name="lockpassword_choose_your_password_header_for_fingerprint" msgid="2541818487015343503">"Parmak izi kullanmak için şifre ayarlayın"</string>
+    <string name="lockpassword_choose_your_pattern_header_for_fingerprint" msgid="7709785406243556723">"Parmak izi kullanmak için desen ayarlayın"</string>
+    <string name="lockpassword_choose_your_pin_message" msgid="1875420718677275646">"Güvenlik için PIN ayarlayın"</string>
+    <string name="lockpassword_choose_your_pin_header_for_fingerprint" msgid="1549639053195796674">"Parmak izini kullanmak için PIN ayarlayın"</string>
+    <string name="lockpassword_choose_your_pattern_message" msgid="5986983400689720015">"Güvenlik için desen oluşturun"</string>
+    <string name="lockpassword_confirm_your_password_header" msgid="1266027268220850931">"Şifrenizi yeniden girin"</string>
     <string name="lockpassword_confirm_your_pattern_header" msgid="7543433733032330821">"Deseninizi onaylayın"</string>
-    <string name="lockpassword_confirm_your_pin_header" msgid="49038294648213197">"PIN\'inizi onaylayın"</string>
+    <string name="lockpassword_confirm_your_pin_header" msgid="7744513791910572550">"PIN\'inizi yeniden girin"</string>
     <string name="lockpassword_confirm_passwords_dont_match" msgid="5140892109439191415">"Şifreler eşleşmiyor"</string>
     <string name="lockpassword_confirm_pins_dont_match" msgid="7226244811505606217">"PIN\'ler eşleşmiyor"</string>
     <string name="lockpassword_choose_lock_generic_header" msgid="3811438094903786145">"Kilit açma seçeneği"</string>
@@ -1488,6 +1495,12 @@
     <string name="lockpassword_strong_auth_required_work_pattern" msgid="3003781907040522053">"Daha fazla güvenlik için iş deseninizi kullanın"</string>
     <string name="lockpassword_strong_auth_required_work_pin" msgid="3367491332598821552">"Daha fazla güvenlik için iş PIN\'inizi girin"</string>
     <string name="lockpassword_strong_auth_required_work_password" msgid="8159775129968582940">"Daha fazla güvenlik için iş şifrenizi girin"</string>
+    <string name="lockpassword_confirm_your_pattern_details_frp" msgid="6757336656791723193">"Telefonunuz fabrika ayarlarına sıfırlandı. Bu telefonu kullanmak için önceki deseninizi girin."</string>
+    <string name="lockpassword_confirm_your_pin_details_frp" msgid="826520613445990470">"Telefonunuz fabrika ayarlarına sıfırlandı. Bu telefonu kullanmak için önceki PIN\'inizi girin."</string>
+    <string name="lockpassword_confirm_your_password_details_frp" msgid="8944081074615739040">"Telefonunuz fabrika ayarlarına sıfırlandı. Bu telefonu kullanmak için önceki şifrenizi girin."</string>
+    <string name="lockpassword_confirm_your_pattern_header_frp" msgid="2898036091609128286">"Deseni doğrulayın"</string>
+    <string name="lockpassword_confirm_your_pin_header_frp" msgid="4141601774778898803">"PIN\'i doğrulayın"</string>
+    <string name="lockpassword_confirm_your_password_header_frp" msgid="3762615419295360480">"Şifreyi doğrulayın"</string>
     <string name="lockpassword_invalid_pin" msgid="15588049067548470">"Yanlış PIN"</string>
     <string name="lockpassword_invalid_password" msgid="4038507398784975200">"Yanlış şifre"</string>
     <string name="lockpattern_need_to_unlock_wrong" msgid="1745247595356012176">"Yanlış desen"</string>
@@ -1537,7 +1550,6 @@
     <string name="install_applications_title" msgid="4987712352256508946">"Tüm uyg. kaynaklarına izin ver"</string>
     <string name="recent_app_category_title" msgid="6673071268966003928">"Son açılan uygulamalar"</string>
     <string name="see_all_apps_title" msgid="1317153498074308438">"<xliff:g id="COUNT">%1$d</xliff:g> uygulamanın tümünü görün"</string>
-    <string name="recent_app_summary" msgid="3366446669844932300">"<xliff:g id="TIME">^1</xliff:g> önce"</string>
     <string name="install_all_warning" product="tablet" msgid="8310489909586138165">"Tabletiniz ve kişisel verileriniz, bilinmeyen uygulamalardan gelen saldırılara karşı daha savunmasızdır. Bu kaynaktan uygulama yükleyerek, bu uygulamaları kullanmanız sonucunda tabletinizin başına gelebilecek her tür hasardan ve veri kaybından kendinizin sorumlu olduğunu kabul etmiş olursunuz."</string>
     <string name="install_all_warning" product="default" msgid="1952257127370115988">"Telefonunuz ve kişisel verileriniz, bilinmeyen uygulamalardan gelen saldırılara karşı daha savunmasızdır. Bu kaynaktan uygulama yükleyerek, bu uygulamaları kullanmanız sonucunda telefonunuzun başına gelebilecek her tür hasardan ve veri kaybından kendinizin sorumlu olduğunu kabul etmiş olursunuz."</string>
     <string name="advanced_settings" msgid="1777249286757067969">"Gelişmiş ayarlar"</string>
@@ -1801,7 +1813,7 @@
     <string name="accessibility_settings_summary" msgid="981260486011624939">"Ekran okuyucular, ekran, etkileşim kontrolleri"</string>
     <string name="vision_settings_title" msgid="4204111425716868288">"Görüş Ayarları"</string>
     <string name="vision_settings_description" msgid="5679491180156408260">"Bu cihazı gereksinimlerinize uygun şekilde özelleştirebilirsiniz. Bu erişilebilirlik özellikleri daha sonra Ayarlar\'dan değiştirilebilir."</string>
-    <string name="vision_settings_suggestion_title" msgid="917294957154878441">"Yazı tipi boyutunu büyüt"</string>
+    <string name="vision_settings_suggestion_title" msgid="8058794060304707004">"Yazı tipi boyutunu değiştir"</string>
     <string name="screen_reader_category_title" msgid="7739154903913400641">"Ekran okuyucular"</string>
     <string name="audio_and_captions_category_title" msgid="3420727114421447524">"Ses ve ekran metni"</string>
     <string name="display_category_title" msgid="685461049938269166">"Ekran"</string>
@@ -1838,7 +1850,6 @@
     <string name="accessibility_display_inversion_preference_subtitle" msgid="7052959202195368109">"Performansı etkileyebilir"</string>
     <string name="accessibility_autoclick_preference_title" msgid="7014499339068449623">"İşaretçinin hareketi durduktan sonra tıkla"</string>
     <string name="accessibility_autoclick_delay_preference_title" msgid="3962261178385106006">"Tıklamadan önce gecikme süresi"</string>
-    <string name="preference_summary_default_combination" msgid="8532964268242666060">"<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">"AÇ"</string>
     <string name="accessibility_summary_state_disabled" msgid="2241315620132005595">"KAPAT"</string>
     <string name="enable_quick_setting" msgid="2366999897816894536">"Hızlı Ayarlar\'da göster"</string>
@@ -1957,12 +1968,14 @@
     <string name="background_activity_summary_on" msgid="649282072540085599">"Uygulamalar kullanılmadıklarında arka planda çalıştırılabilir"</string>
     <string name="background_activity_summary_off" msgid="7666330699090632040">"Kullanılmadığında uygulamanın arka plan etkinliği sınırlandı"</string>
     <string name="background_activity_summary_disabled" msgid="3710669050484599847">"Uygulamanın arka planda çalıştırılmasına izin verilmiyor"</string>
+    <string name="background_activity_summary_whitelisted" msgid="7375400051141016808">"Uygulama pil kullanımı için optimize edilemez"</string>
+    <string name="background_activity_warning_dialog_title" msgid="2216249969149568871">"Arka plan etkinliği sınırlansın mı?"</string>
+    <string name="background_activity_warning_dialog_text" msgid="7049624449246121981">"Uygulama için arka plan etkinliğini sınırlarsanız hatalı davranabilir"</string>
     <string name="device_screen_usage" msgid="3386088035570409683">"Tam şarj sonrası ekran kullanımı"</string>
     <string name="device_screen_consumption" msgid="4607589286438986687">"Ekranın pil tüketimi"</string>
     <string name="device_cellular_network" msgid="4724773411762382950">"Mobil ağ tarama"</string>
-    <string name="power_last_full_charge_summary" msgid="532845389094620657">"<xliff:g id="TIME">^1</xliff:g> önce"</string>
-    <string name="power_usage_list_summary" msgid="6775339745194635000">"Tam şarj sonrası uygulama kullanımı (<xliff:g id="TIME">^1</xliff:g> önce)"</string>
-    <string name="power_usage_list_summary_device" msgid="7036566616386864302">"Tam şarjdan sonra (<xliff:g id="TIME">^1</xliff:g> önce) cihaz kullanımı"</string>
+    <string name="power_usage_list_summary" msgid="6393929085382334341">"Tam şarj sonrası uygulama kullanımı (<xliff:g id="RELATIVE_TIME">^1</xliff:g>)"</string>
+    <string name="power_usage_list_summary_device" msgid="4461926045610455423">"Tam şarjdan beri cihaz kullanımı (<xliff:g id="RELATIVE_TIME">^1</xliff:g>)"</string>
     <string name="screen_usage_summary" msgid="6687403051423153550">"Tam şarjdan sonra ekranın açık olduğu süre"</string>
     <string name="device_usage_list_summary" msgid="5623036661468763251">"Tam şarj sonrası cihaz kullanımı"</string>
     <string name="battery_since_unplugged" msgid="338073389740738437">"Fişten çekildikten sonra pil kullanımı"</string>
@@ -2208,14 +2221,14 @@
     <string name="credentials_unlock_hint" msgid="2301301378040499348">"Kimlik bilgileri deposu için şifreyi yazın."</string>
     <string name="credentials_old_password" msgid="7553393815538684028">"Geçerli şifre:"</string>
     <string name="credentials_reset_hint" msgid="6297256880896133631">"Tüm içerik kaldırılsın mı?"</string>
-    <string name="credentials_password_too_short" msgid="7502749986405522663">"Şifre, en az 8 karakterden oluşmalıdır."</string>
     <string name="credentials_wrong_password" msgid="2541932597104054807">"Yanlış şifre."</string>
     <string name="credentials_reset_warning" msgid="5320653011511797600">"Yanlış şifre. Kimlik bilgileri deposu silinmeden önce tek bir şansınız kaldı."</string>
     <string name="credentials_reset_warning_plural" msgid="6514085665301095279">"Yanlış şifre. Kimlik bilgileri deposu silinmeden önce <xliff:g id="NUMBER">%1$d</xliff:g> şansınız kaldı."</string>
     <string name="credentials_erased" msgid="2907836028586342969">"Kimlik bilgileri deposu silindi."</string>
     <string name="credentials_not_erased" msgid="7685932772284216097">"Kimlik bilgileri deposu silinemedi."</string>
     <string name="credentials_enabled" msgid="7588607413349978930">"Kimlik bilgileri deposu etkin."</string>
-    <string name="credentials_configure_lock_screen_hint" msgid="6757119179588664966">"Kimlik bilgileri depolamasını kullanabilmek için öncelikle bir ekran PIN\'i veya şifre ayarlamanız gerekir."</string>
+    <string name="credentials_configure_lock_screen_hint" msgid="8058230497337529036">"Kimlik bilgileri deposunu kullanabilmek için öncelikle cihazınızda bir güvenli kilit ekranı olması gerekir"</string>
+    <string name="credentials_configure_lock_screen_button" msgid="253239765216055321">"KİLİDİ AYARLA"</string>
     <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>
@@ -2224,7 +2237,7 @@
     <string name="personal_data_section_title" msgid="7815209034443782061">"Kişisel veriler"</string>
     <string name="backup_data_title" msgid="1239105919852668016">"Verilerimi yedekle"</string>
     <string name="backup_data_summary" msgid="708773323451655666">"Uygulama verilerini, Kablosuz şifrelerini ve diğer ayarları Google sunucularına yedekle"</string>
-    <string name="backup_configure_account_title" msgid="3790872965773196615">"Yedek hesap"</string>
+    <string name="backup_configure_account_title" msgid="3790872965773196615">"Yedekleme hesabı"</string>
     <string name="include_app_data_title" msgid="2829970132260278394">"Uygulama verilerini dahil et"</string>
     <string name="auto_restore_title" msgid="5397528966329126506">"Otomatik geri yükle"</string>
     <string name="auto_restore_summary" msgid="4235615056371993807">"Bir uygulama yeniden yüklendiğinde, yedeklenen ayarlarını ve verilerini geri yükle"</string>
@@ -2335,8 +2348,6 @@
     <skip />
     <string name="cant_sync_dialog_title" msgid="2777238588398046285">"El ile senkronize edilemez"</string>
     <string name="cant_sync_dialog_message" msgid="1938380442159016449">"Bu öğe için senkronizasyon şu anda devre dışı bırakılmış durumdadır. Bu ayarı değiştirmek için geçici olarak arka plan verilerini ve otomatik senkronizasyonu açın."</string>
-    <string name="wimax_settings" msgid="2655139497028469039">"4G"</string>
-    <string name="status_wimax_mac_address" msgid="8390791848661413416">"4G MAC adresi"</string>
     <string name="enter_password" msgid="8035706727471334122">"Android\'i başlatmak için şifrenizi girin"</string>
     <string name="enter_pin" msgid="5305333588093263790">"Android\'i başlatmak için PIN\'inizi girin"</string>
     <string name="enter_pattern" msgid="4187435713036808566">"Android\'i başlatmak için deseninizi çizin"</string>
@@ -2350,6 +2361,7 @@
     <string name="misc_files_selected_count" msgid="4647048020823912088">"toplam <xliff:g id="TOTAL">%2$d</xliff:g> dosyadan <xliff:g id="NUMBER">%1$d</xliff:g> tanesi seçildi"</string>
     <string name="misc_files_selected_count_bytes" msgid="2876232009069114352">"<xliff:g id="NUMBER">%1$s</xliff:g> / <xliff:g id="TOTAL">%2$s</xliff:g>"</string>
     <string name="select_all" msgid="1562774643280376715">"Tümünü seç"</string>
+    <string name="data_plan_usage_manage_plans_button_text" msgid="8997761990902708162">"Planları yönet"</string>
     <string name="data_usage_summary_title" msgid="3804110657238092929">"Veri kullanımı"</string>
     <string name="data_usage_app_summary_title" msgid="4147258989837459172">"Uygulama veri kullanımı"</string>
     <string name="data_usage_accounting" msgid="7170028915873577387">"Operatörünüzün veri hesaplaması, cihazınızınkinden farklı olabilir."</string>
@@ -2422,7 +2434,7 @@
     <string name="data_usage_restrict_background" msgid="434093644726734586">"Arka plan mobil veri kullanımını kısıtlarsanız kablosuz ağa bağlanmadığınız sürece bazı uygulamalar ve hizmetler çalışmaz."</string>
     <string name="data_usage_restrict_background_multiuser" product="tablet" msgid="7096707497743363380">"Arka plan mobil veri kullanımını kısıtlarsanız kablosuz ağa bağlanmadığınız sürece bazı uygulamalar ve hizmetler çalışmaz.\n\nBu ayar, bu tabletteki tüm kullanıcıları etkiler."</string>
     <string name="data_usage_restrict_background_multiuser" product="default" msgid="7910798414964288424">"Arka plan mobil veri kullanımını kısıtlarsanız kablosuz ağa bağlanmadığınız sürece bazı uygulamalar ve hizmetler çalışmaz.\n\nBu ayar, bu telefondaki tüm kullanıcıları etkiler."</string>
-    <string name="data_usage_sweep_warning" msgid="6387081852568846982"><font size="18">"<xliff:g id="NUMBER">^1</xliff:g>"</font>" "<font size="9">"<xliff:g id="UNIT">^2</xliff:g>"</font>\n<font size="12">"uyarı"</font></string>
+    <string name="data_usage_sweep_warning" msgid="6387081852568846982"><font size="18">"<xliff:g id="NUMBER">^1</xliff:g>"</font>" "<font size="9">"<xliff:g id="UNIT">^2</xliff:g>"</font>\n<font size="12">"uyarısı"</font></string>
     <string name="data_usage_sweep_limit" msgid="860566507375933039"><font size="18">"<xliff:g id="NUMBER">^1</xliff:g>"</font>" "<font size="9">"<xliff:g id="UNIT">^2</xliff:g>"</font>\n<font size="12">"sınır"</font></string>
     <string name="data_usage_uninstalled_apps" msgid="614263770923231598">"Kaldırılan uygulamalar"</string>
     <string name="data_usage_uninstalled_apps_users" msgid="7986294489899813194">"Kaldırılmış kullanıcılar ve uygulamalar"</string>
@@ -2435,6 +2447,9 @@
     <string name="data_usage_metered_mobile" msgid="5423305619126978393">"Mobil ağlar"</string>
     <string name="data_usage_metered_wifi" msgid="1761738002328299714">"Sınırlı Kablosuz ağlar"</string>
     <string name="data_usage_metered_wifi_disabled" msgid="727808462375941567">"Sınırlı ağları seçmek için Kablosuz bağlantıyı açın."</string>
+    <string name="data_usage_metered_auto" msgid="1262028400911918865">"Otomatik"</string>
+    <string name="data_usage_metered_yes" msgid="9217539611385225894">"Sınırlı"</string>
+    <string name="data_usage_metered_no" msgid="4025232961929071789">"Sınırsız"</string>
     <string name="data_usage_disclaimer" msgid="6887858149980673444">"Operatörünüzün veri hesaplaması, cihazınızınkinden farklı olabilir."</string>
     <string name="cryptkeeper_emergency_call" msgid="198578731586097145">"Acil durum çağrısı"</string>
     <string name="cryptkeeper_return_to_call" msgid="5613717339452772491">"Çağrıya dön"</string>
@@ -2489,7 +2504,7 @@
     <string name="vpn_menu_edit" msgid="408275284159243490">"Profili düzenle"</string>
     <string name="vpn_menu_delete" msgid="8098021690546891414">"Profili sil"</string>
     <string name="vpn_menu_lockdown" msgid="7863024538064268139">"Her zaman açık VPN"</string>
-    <string name="vpn_no_vpns_added" msgid="5002741367858707244">"VPN eklenmedi"</string>
+    <string name="vpn_no_vpns_added" msgid="5002741367858707244">"Henüz VPN eklenmedi"</string>
     <string name="vpn_always_on_summary" msgid="2821344524094363617">"VPN\'ye her zaman bağlı kal"</string>
     <string name="vpn_always_on_summary_not_supported" msgid="592304911378771510">"Bu uygulama tarafından desteklenmiyor"</string>
     <string name="vpn_always_on_summary_active" msgid="8800736191241875669">"Her zaman açık ayarı etkin"</string>
@@ -2526,9 +2541,6 @@
     <string name="backup_pw_set_button_text" msgid="2387480910044648795">"Yedekleme şifresi ayarla"</string>
     <string name="backup_pw_cancel_button_text" msgid="8845630125391744615">"İptal"</string>
     <string name="additional_system_update_settings_list_item_title" msgid="214987609894661992">"Ek sistem güncellemeleri"</string>
-    <string name="selinux_status_disabled" msgid="924551035552323327">"Disabled (Devre dışı)"</string>
-    <string name="selinux_status_permissive" msgid="6004965534713398778">"Permissive (Serbest)"</string>
-    <string name="selinux_status_enforcing" msgid="2252703756208463329">"Enforcing (Zorunlu)"</string>
     <string name="ssl_ca_cert_warning" msgid="2045866713601984673">"Ağ etkinliği izlenebilir"</string>
     <string name="done_button" msgid="1991471253042622230">"Tamam"</string>
     <plurals name="ssl_ca_cert_dialog_title" formatted="false" msgid="7145092748045794650">
@@ -2644,7 +2656,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">"SARI uyarılar"</string>
+    <string name="amber_alerts_title" msgid="2772220337031146529">"AMBER 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>
@@ -2726,6 +2738,7 @@
       <item quantity="other">Gizli %d öğeyi göster</item>
       <item quantity="one">Gizli %d öğeyi göster</item>
     </plurals>
+    <string name="dashboard_suggestion_condition_footer_content_description" msgid="2898588191174845961">"Daralt"</string>
     <string name="network_dashboard_title" msgid="4771589228992391573">"Ağ ve İnternet"</string>
     <string name="network_dashboard_summary_mobile" msgid="3851083934739500429">"mobil"</string>
     <string name="network_dashboard_summary_data_usage" msgid="3843261364705042212">"veri kullanımı"</string>
@@ -2828,8 +2841,14 @@
       <item quantity="other"><xliff:g id="ON_COUNT">%d</xliff:g> otomatik kural açıldı</item>
       <item quantity="one">1 otomatik kural açıldı</item>
     </plurals>
-    <string name="zen_mode_settings_title" msgid="842308776768942600">"Rahatsız Etmeyin tercihleri"</string>
-    <string name="zen_mode_priority_settings_title" msgid="2623117023031824309">"Öncelikli olanlar"</string>
+    <string name="zen_mode_settings_title" msgid="1066226840983908121">"Rahatsız Etmeyin"</string>
+    <string name="zen_mode_behavior_settings_title" msgid="1463303933529313969">"Davranış"</string>
+    <string name="zen_mode_behavior_allow_title" msgid="3845615648136218141">"Şu seslere ve titreşimlere izin ver:"</string>
+    <string name="zen_mode_behavior_no_sound" msgid="1219626004723208056">"Sessiz"</string>
+    <string name="zen_mode_behavior_total_silence" msgid="6716603819806610626">"Hiç ses yok (Tamamen Sessiz)"</string>
+    <string name="zen_mode_behavior_no_sound_except" msgid="4968477585788243114">"<xliff:g id="CATEGORIES">%1$s</xliff:g> dışında ses yok"</string>
+    <!-- no translation found for zen_mode_behavior_alarms_only (2423480992071472963) -->
+    <skip />
     <string name="zen_mode_automation_settings_title" msgid="4228995740594063774">"Otomatik kurallar"</string>
     <string name="zen_mode_automation_suggestion_title" msgid="5105443455143476201">"Rahatsız Etmeyin kurallarını ayarla"</string>
     <string name="zen_mode_automation_suggestion_summary" msgid="4732808039946935657">"Belirli zamanlarda sesleri ve titreşimleri sınırlandır"</string>
@@ -2871,13 +2890,15 @@
     <string name="notifications_title" msgid="8086372779371204971">"Bildirimler"</string>
     <string name="app_notifications_title" msgid="5810577805218003760">"Uygulama bildirimleri"</string>
     <string name="notification_channel_title" msgid="2260666541030178452">"Bildirim kategorisi"</string>
+    <string name="notification_group_title" msgid="7180506440133859601">"Bildirim kategorisi grubu"</string>
     <string name="notification_importance_title" msgid="848692592679312666">"Önem"</string>
-    <string name="notification_importance_unspecified" msgid="2196023702875112081">"Uygulama karar versin"</string>
+    <string name="notification_importance_unspecified" msgid="6622173510486113958">"Sese izin ver"</string>
     <string name="notification_importance_blocked" msgid="7938180808339386300">"Bildirimleri hiçbir zaman gösterme"</string>
     <string name="notification_importance_min" msgid="5455049524984686275">"Ses veya görsel kesme yok"</string>
     <string name="notification_importance_low" msgid="8881468429453766553">"Sessiz"</string>
     <string name="notification_importance_default" msgid="5958338024601957516">"Ses çıkar"</string>
     <string name="notification_importance_high" msgid="2082429479238228527">"Ses çıkar ve ekranda göster"</string>
+    <string name="notification_importance_high_silent" msgid="2667033773703765252">"Ekranda pop-up pencerede göster"</string>
     <string name="notification_importance_min_title" msgid="6974673091137544803">"Düşük"</string>
     <string name="notification_importance_low_title" msgid="8131254047772814309">"Orta"</string>
     <string name="notification_importance_default_title" msgid="9120383978536089489">"Yüksek"</string>
@@ -2920,8 +2941,13 @@
     <string name="loading_notification_apps" msgid="5031818677010335895">"Uygulamalar yükleniyor..."</string>
     <string name="app_notifications_off_desc" msgid="4882445501376722969">"Android, bu uygulamanın bildirimlerinin bu cihazda görünmesini engelliyor"</string>
     <string name="channel_notifications_off_desc" msgid="5899225298718840635">"Android, bu kategorideki bildirimlerin bu cihazda görünmesini engelliyor"</string>
+    <string name="channel_group_notifications_off_desc" msgid="1620950416247316370">"Android, bu bildirim grubunun bu cihazda görünmesini engelliyor"</string>
     <string name="notification_channels" msgid="5346841743182627500">"Kategoriler"</string>
     <string name="notification_channels_other" msgid="5645317113885788226">"Diğer"</string>
+    <plurals name="notification_group_summary" formatted="false" msgid="3420621520561455358">
+      <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> kategori</item>
+      <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> kategori</item>
+    </plurals>
     <string name="no_channels" msgid="3077375508177744586">"Bu uygulama herhangi bir bildirim yayınlamadı"</string>
     <string name="app_settings_link" msgid="8894946007543660906">"Uygulamadaki ek ayarlar"</string>
     <string name="app_notification_listing_summary_zero" msgid="6482582965081108108">"Tüm uygulamalar için açıldı"</string>
@@ -2957,7 +2983,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 fotoğraf ekle"</string>
+    <string name="zen_mode_add_rule" msgid="7459154136384467057">"Daha fazla 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>
@@ -2998,12 +3024,14 @@
     <string name="zen_mode_from_starred" msgid="2678345811950997027">"Yalnızca yıldızlı kişilerden"</string>
     <string name="zen_mode_from_none" msgid="8219706639954614136">"Hiçbiri"</string>
     <string name="zen_mode_alarms" msgid="2165302777886552926">"Alarmlar"</string>
+    <!-- no translation found for zen_mode_media_system_other (8900209390529859777) -->
+    <skip />
     <string name="zen_mode_reminders" msgid="5458502056440485730">"Hatırlatıcılar"</string>
     <string name="zen_mode_events" msgid="7914446030988618264">"Etkinlikler"</string>
     <string name="zen_mode_all_callers" msgid="584186167367236922">"Tüm arayanlar"</string>
     <string name="zen_mode_selected_callers" msgid="3127598874060615742">"Seçili arayanlar"</string>
     <string name="zen_mode_repeat_callers" msgid="5019521886428322131">"Tekrar arayanlar"</string>
-    <string name="zen_mode_repeat_callers_summary" msgid="7192713032364140137">"Aynı kişi <xliff:g id="MINUTES">%d</xliff:g> dakika içinde ikinci defa ararsa izin ver"</string>
+    <string name="zen_mode_repeat_callers_summary" msgid="239685342222975733">"Aynı kişi <xliff:g id="MINUTES">%d</xliff:g> dakika içinde ikinci defa ararsa"</string>
     <string name="zen_mode_when" msgid="2767193283311106373">"Otomatik olarak aç"</string>
     <string name="zen_mode_when_never" msgid="8809494351918405602">"Hiçbir zaman"</string>
     <string name="zen_mode_when_every_night" msgid="3122486110091921009">"Her gece"</string>
@@ -3032,6 +3060,7 @@
     <string name="zen_mode_screen_off_visual_interruptions" msgid="4850792880144382633">"Ekran kapalıyken"</string>
     <string name="zen_mode_no_visual_interruptions" msgid="8742776003822778472">"Ekran kapalıyken veya açıkken"</string>
     <string name="notification_app_settings_button" msgid="6685640230371477485">"Bildirim ayarları"</string>
+    <string name="suggestion_button_text" msgid="3275010948381252006">"Tamam"</string>
     <string name="device_feedback" msgid="3238056036766293294">"Bu cihazla ilgili geri bildirim gönder"</string>
     <string name="restr_pin_enter_admin_pin" msgid="1085834515677448072">"Yönetici PIN\'ini girin"</string>
     <string name="switch_on_text" msgid="1124106706920572386">"Açık"</string>
@@ -3066,12 +3095,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">"Açılış bağlantıları"</string>
+    <string name="app_launch_domain_links_title" msgid="1160925981363706090">"Bağlantıları açma"</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="STORAGE_TYPE">%2$s</xliff:g> <xliff:g id="SIZE">%1$s</xliff:g> kullanılıyor"</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_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>
@@ -3122,7 +3151,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">"Açılış bağlantıları"</string>
+    <string name="domain_urls_title" msgid="3132983644568821250">"Bağlantıları açma"</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>
@@ -3211,11 +3240,12 @@
     <string name="usb_use_MIDI_desc" msgid="8473936990076693175">"Bu cihazı MIDI olarak kullanın"</string>
     <string name="usb_use" msgid="3256040963685055320">"USB bağlantısının kullanım amacı:"</string>
     <string name="usb_pref" msgid="1400617804525116158">"USB"</string>
-    <string name="usb_summary_charging_only" msgid="7544327009143659751">"Bu cihazı şarj etme"</string>
+    <string name="usb_summary_charging_only" msgid="7544327009143659751">"Bu cihazı şarj et"</string>
     <string name="usb_summary_power_only" msgid="3629517713817003738">"Güç sağlama"</string>
     <string name="usb_summary_file_transfers" msgid="6435943692610175111">"Dosya aktarma"</string>
     <string name="usb_summary_photo_transfers" msgid="8440204169576585250">"Fotoğraf aktarma (PTP)"</string>
     <string name="usb_summary_MIDI" msgid="5687906612187885908">"Cihazı MIDI olarak kullanma"</string>
+    <string name="sms_mirroring_pref" msgid="6475043279147376031">"SMS Yansıtma"</string>
     <string name="background_check_pref" msgid="7550258400138010979">"Arka plan kontrolü"</string>
     <string name="background_check_title" msgid="4534254315824525593">"Tam arka plan erişimi"</string>
     <string name="assist_access_context_title" msgid="2269032346698890257">"Ekrandaki metni kullan"</string>
@@ -3282,7 +3312,7 @@
     <string name="write_settings_title" msgid="4232152481902542284">"Sistem ayarlarını değiştirebilir"</string>
     <string name="write_system_settings" msgid="3482913590601096763">"Sistem ayarlarını değiştir"</string>
     <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="permit_write_settings" msgid="658555006453212691">"Sistem ayarlarının değiştirilmesine 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>
@@ -3377,9 +3407,12 @@
     <string name="color_temperature" msgid="2070126836910615605">"Soğuk renk sıcaklığı"</string>
     <string name="color_temperature_desc" msgid="4793729830226404052">"Daha soğuk ekran renkleri kullan"</string>
     <string name="color_temperature_toast" msgid="4974218172133854827">"Renk değişikliğini uygulamak için ekranı kapatın"</string>
-    <string name="telephony_monitor_toast" msgid="7003764250271195384">"Telephony monitor değişikliğini uygulamak için cihazı yeniden başlatın"</string>
+    <string name="connectivity_monitor_switch" msgid="9059759348648583421">"Bağlantı İzleyiciler:"</string>
+    <string name="connectivity_monitor_switch_summary" msgid="2828658652378866401">"ConnectivityMonitor bağlantı sorunu algıladığında günlükleri toplar ve kullanıcılara bir hata bildiriminde bulunmalarını söyler"</string>
+    <string name="connectivity_monitor_toast" msgid="5551859612881173028">"Bağlantı izleyici değişikliğini uygulamak için cihazı yeniden başlatın"</string>
     <string name="camera_hal_hdrplus_switch" msgid="8377365197105267466">"Kamera HAL HDR+"</string>
     <string name="camera_hal_hdrplus_toast" msgid="2063703797270055299">"Kamera HAL HDR+ değişikliğini uygulamak için cihazı yeniden başlatın"</string>
+    <string name="camera_laser_sensor_switch" msgid="8913588990743234440">"Kamera Lazer Sensörü"</string>
     <string name="ota_disable_automatic_update" msgid="2319639631655915050">"Otomatik sistem güncellemeleri"</string>
     <string name="usage" msgid="2977875522080448986">"Kullanım"</string>
     <string name="cellular_data_usage" msgid="2155683719898158203">"Mobil veri kullanımı"</string>
@@ -3401,11 +3434,11 @@
     </plurals>
     <string name="operator_warning" msgid="1862988028996859195">"Operatörünüzün veri kullanımı hesaplaması, cihazdaki hesaplamadan farklı olabilir"</string>
     <string name="data_used_template" msgid="3245919669966296505">"<xliff:g id="ID_1">%1$s</xliff:g> kullanıldı"</string>
-    <string name="set_data_warning" msgid="6115364758236594593">"Veri uyarısı oluşturun"</string>
+    <string name="set_data_warning" msgid="6115364758236594593">"Veri uyarısı oluştur"</string>
     <string name="data_warning" msgid="209133958008062117">"Veri uyarısı"</string>
     <string name="set_data_limit" msgid="2901526323210516923">"Veri sınırı ayarla"</string>
     <string name="data_limit" msgid="1885406964934590552">"Veri sınırı"</string>
-    <string name="data_usage_template" msgid="392191945602400904">"<xliff:g id="ID_2">%2$s</xliff:g> tarihleri arasında <xliff:g id="ID_1">%1$s</xliff:g> kullanıldı"</string>
+    <string name="data_usage_template" msgid="2923744765873163859">"<xliff:g id="ID_2">%2$s</xliff:g> arasında <xliff:g id="ID_1">%1$s</xliff:g> kullanıldı"</string>
     <string name="configure" msgid="1029654422228677273">"Yapılandır"</string>
     <string name="data_usage_other_apps" msgid="3272872663517382050">"Kullanıma dahil olan diğer uygulamalar"</string>
     <plurals name="data_saver_unrestricted_summary" formatted="false" msgid="2635267833484232703">
@@ -3474,7 +3507,7 @@
     <string name="button_confirm_convert_fbe" msgid="7101855374850373091">"Sil ve dönüştür"</string>
     <string name="reset_shortcut_manager_throttling" msgid="6495066467198668994">"ShortcutManager hız sınırlamasını sıfırla"</string>
     <string name="reset_shortcut_manager_throttling_complete" msgid="1826770872063707900">"ShortcutManager hız sınırlaması sıfırlandı"</string>
-    <string name="notification_suggestion_title" msgid="4506524937307816475">"Kilit ekranı bildirimlerini kontrol edin"</string>
+    <string name="notification_suggestion_title" msgid="387052719462473500">"Kilit ekranınızdaki bilgileri kontrol edin"</string>
     <string name="notification_suggestion_summary" msgid="8521159741445416875">"Bildirim içeriğini gösterin veya gizleyin"</string>
     <string name="page_tab_title_summary" msgid="4070309266374993258">"Tümü"</string>
     <string name="page_tab_title_support" msgid="8483187649355540109">"Destek ve ipuçları"</string>
@@ -3482,7 +3515,7 @@
     <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>
     <string name="premium_sms_access" msgid="4660047004791638305">"Premium SMS erişimi"</string>
-    <string name="bluetooth_disabled" msgid="2456198532288640046">"Diğer cihazlar tarafından görülemez"</string>
+    <string name="bluetooth_disabled" msgid="6244000672828617410">"Kapalı"</string>
     <string name="bluetooth_connected_summary" msgid="7672528674593152862">"<xliff:g id="ID_1">%1$s</xliff:g> cihazına bağlı"</string>
     <string name="bluetooth_connected_multiple_devices_summary" msgid="9173661896296663932">"Birden çok cihaza bağlı"</string>
     <string name="demo_mode" msgid="2798762752209330277">"Sistem Kullanıcı Arayüzü demo modu"</string>
@@ -3561,7 +3594,7 @@
     <string name="ambient_display_title" product="device" msgid="3423781975742145894">"Cihazı kontrol etmek için iki kez dokunun"</string>
     <string name="ambient_display_summary" msgid="525662960806416373">"Saati, bildirim simgelerini ve diğer bilgileri kontrol etmek için ekranınıza iki kez dokunun."</string>
     <string name="ambient_display_suggestion_summary" msgid="5987443721392571847">"Ekran kapalıyken bildirimleri kontrol edin"</string>
-    <string name="ambient_display_pickup_title" product="default" msgid="818688002837687268">"Telefonu kontrol etmek için kaldırın"</string>
+    <string name="ambient_display_pickup_title" product="default" msgid="818688002837687268">"Bakmak için telefonu kaldır"</string>
     <string name="ambient_display_pickup_title" product="tablet" msgid="4455864282995698097">"Tableti kontrol etmek için kaldırın"</string>
     <string name="ambient_display_pickup_title" product="device" msgid="5380534405773531175">"Cihazı kontrol etmek için kaldırın"</string>
     <string name="ambient_display_pickup_summary" product="default" msgid="4567020486787561873">"Saati, bildirim simgelerini ve diğer bilgileri kontrol etmek için telefonunuzu elinize alın."</string>
@@ -3584,7 +3617,7 @@
     <string name="web_action_enable_title" msgid="4051513950976670853">"Hazır uygulamalar"</string>
     <string name="web_action_enable_summary" msgid="3108127559723396382">"Yüklü olmasalar bile uygulamalardaki bağlantıları açın"</string>
     <string name="web_action_section_title" msgid="7364647086538399136">"Hazır uygulamalar"</string>
-    <string name="instant_apps_account" msgid="1433620209791992528">"Hazır uygulama hesabı"</string>
+    <string name="instant_apps_settings" msgid="8827777916518348213">"Hazır Uygulama tercihleri"</string>
     <string name="domain_url_section_title" msgid="7046835219056428883">"Yüklü uygulamalar"</string>
     <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>
@@ -3631,7 +3664,9 @@
     <string name="enterprise_privacy_always_on_vpn_personal" msgid="9217774730260037434">"Her zaman açık VPN kişisel profilinizde açılmış"</string>
     <string name="enterprise_privacy_always_on_vpn_work" msgid="7244472958208315814">"Her zaman açık VPN iş profilinizde açılmış"</string>
     <string name="enterprise_privacy_global_http_proxy" msgid="7936664553416257333">"Genel HTTP proxy\'si ayarlanmış"</string>
-    <string name="enterprise_privacy_ca_certs" msgid="5885892204903688909">"Güvenilir kimlik bilgileri"</string>
+    <string name="enterprise_privacy_ca_certs_device" msgid="2019652712782510262">"Güvenilir kimlik bilgileri"</string>
+    <string name="enterprise_privacy_ca_certs_personal" msgid="2279084820904076599">"Kişisel profilinizde güvenilir kimlik bilgileri"</string>
+    <string name="enterprise_privacy_ca_certs_work" msgid="6187377647815301809">"İş profilinizde güvenilir kimlik bilgileri"</string>
     <plurals name="enterprise_privacy_number_ca_certs" formatted="false" msgid="526375234629534165">
       <item quantity="other">Minimum <xliff:g id="COUNT_1">%d</xliff:g> CA sertifikası</item>
       <item quantity="one">Minimum <xliff:g id="COUNT_0">%d</xliff:g> CA sertifikası</item>
@@ -3694,6 +3729,8 @@
     <string name="carrier_provisioning" msgid="4398683675591893169">"Operatör Temel Hazırlık Bilgileri"</string>
     <string name="trigger_carrier_provisioning" msgid="3434865918009286187">"Tetikleyici Operatör Temel Hazırlığı"</string>
     <string name="new_device_suggestion_title" msgid="698847081680980774">"Yeni ve heyecan verici neler var?"</string>
-    <string name="new_device_suggestion_summary" msgid="7172709269203435870">"En önemli 5 özelliği inceleyin"</string>
+    <string name="new_device_suggestion_summary" product="default" msgid="206396571522515855">"Yeni telefonunuzu tanıyın"</string>
+    <string name="new_device_suggestion_summary" product="tablet" msgid="393751455688210956">"Yeni tabletinizi tanıyın"</string>
+    <string name="new_device_suggestion_summary" product="device" msgid="2939870049868336652">"Yeni cihazınızı tanıyın"</string>
     <string name="disabled_low_ram_device" msgid="3751578499721173344">"Bu özellik bu cihazda kullanılamıyor"</string>
 </resources>
diff --git a/res/values-uk/arrays.xml b/res/values-uk/arrays.xml
index 20f0141..ad34e20 100644
--- a/res/values-uk/arrays.xml
+++ b/res/values-uk/arrays.xml
@@ -52,7 +52,7 @@
     <item msgid="8929270399652145290">"Одразу"</item>
     <item msgid="6736512735606834431">"5 секунд"</item>
     <item msgid="8044619388267891375">"15 секунд"</item>
-    <item msgid="1822002388249545488">"30 сек."</item>
+    <item msgid="1822002388249545488">"30 секунд"</item>
     <item msgid="8538071621211916519">"1 хвилина"</item>
     <item msgid="5663439580228932882">"2 хвилини"</item>
     <item msgid="49888496216106852">"5 хвилин"</item>
@@ -100,8 +100,6 @@
     <!-- no translation found for wifi_security_no_eap:0 (2084555984818107151) -->
     <!-- no translation found for wifi_security_no_eap:1 (397579322683471524) -->
     <!-- no translation found for wifi_security_no_eap:2 (1968820975358150484) -->
-    <!-- no translation found for wifi_ap_security:0 (5251664683198623324) -->
-    <!-- no translation found for wifi_ap_security:1 (7989073072260294673) -->
   <string-array name="wifi_eap_method">
     <item msgid="1160193392455075561">"PEAP"</item>
     <item msgid="7981731051382306293">"TLS"</item>
@@ -476,6 +474,6 @@
   <string-array name="automatic_storage_management_days">
     <item msgid="687318592238852312">"Старіші за 30 днів"</item>
     <item msgid="2900554746706302178">"Старіші за 60 днів"</item>
-    <item msgid="5692284879054004388">"Старіші за 90 днів"</item>
+    <item msgid="5692284879054004388">"Додані понад 90 днів тому"</item>
   </string-array>
 </resources>
diff --git a/res/values-uk/strings.xml b/res/values-uk/strings.xml
index 2056954..38bc1b1 100644
--- a/res/values-uk/strings.xml
+++ b/res/values-uk/strings.xml
@@ -168,7 +168,7 @@
     <string name="bluetooth_map_acceptance_dialog_text" msgid="8712508202081143737">"%1$s хоче отримати доступ до ваших повідомлень. Надати %2$s доступ?"</string>
     <string name="bluetooth_sap_request" msgid="2669762224045354417">"Запит на доступ до SIM-карти"</string>
     <string name="bluetooth_sap_acceptance_dialog_text" msgid="4414253873553608690">"Пристрою <xliff:g id="DEVICE_NAME_0">%1$s</xliff:g> потрібен доступ до вашої SIM-карти. Коли він використовуватиме SIM-карту, ви не зможете передавати дані. Надати доступ пристрою <xliff:g id="DEVICE_NAME_1">%2$s?</xliff:g>"</string>
-    <string name="bluetooth_device_name_summary" msgid="4757990010751789977">"Видно як \"<xliff:g id="DEVICE_NAME">^1</xliff:g>\" для інших пристроїв"</string>
+    <string name="bluetooth_device_name_summary" msgid="522235742194965734">"Видно як \"<xliff:g id="DEVICE_NAME">^1</xliff:g>\" для інших пристроїв"</string>
     <string name="bluetooth_paired_device_title" msgid="8638994696317952019">"Ваші пристрої"</string>
     <string name="bluetooth_pairing_page_title" msgid="7712127387361962608">"Підключити новий пристрій"</string>
     <string name="date_and_time" msgid="9062980487860757694">"Дата й час"</string>
@@ -316,6 +316,8 @@
     <string name="zone_auto" msgid="334783869352026648">"Автоматичний часовий пояс"</string>
     <string name="zone_auto_summaryOn" msgid="6142830927278458314">"Використовувати часовий пояс, наданий мережею"</string>
     <string name="zone_auto_summaryOff" msgid="2597745783162041390">"Використовувати часовий пояс, наданий мережею"</string>
+    <string name="date_time_24hour_auto" msgid="2117383168985653422">"24-годинний формат (авто)"</string>
+    <string name="date_time_24hour_auto_summary" msgid="6351812925651480277">"Використовувати налаштування пристрою за умовчанням"</string>
     <string name="date_time_24hour_title" msgid="3203537578602803850">"24-годинний формат"</string>
     <string name="date_time_24hour" msgid="1193032284921000063">"24-годинний формат"</string>
     <string name="date_time_set_time_title" msgid="6296795651349047016">"Час"</string>
@@ -378,6 +380,9 @@
     <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="1961957425135180242">"Далі"</string>
+    <string name="setup_fingerprint_enroll_skip_title" msgid="362050541117362034">"Пропустити?"</string>
+    <string name="setup_fingerprint_enroll_skip_after_adding_lock_text" msgid="958990414356204763">"Налаштування відбитка пальця триває кілька хвилин. Якщо ви пропустите цей крок, відбиток пальця можна додати пізніше в налаштуваннях."</string>
+    <string name="lock_screen_intro_skip_title" msgid="4988210105913705679">"Пропустити?"</string>
     <string name="lock_screen_intro_skip_dialog_text_frp" product="tablet" msgid="1581834104051243425">"Функції захисту пристрою не буде ввімкнено. Ви не зможете завадити іншим користуватися цим планшетом, якщо його буде втрачено, викрадено чи скинуто до заводських налаштувань."</string>
     <string name="lock_screen_intro_skip_dialog_text_frp" product="device" msgid="4629503416877189572">"Функції захисту пристрою не буде ввімкнено. Ви не зможете завадити іншим користуватися цим пристроєм, якщо його буде втрачено, викрадено чи скинуто до заводських налаштувань."</string>
     <string name="lock_screen_intro_skip_dialog_text_frp" product="default" msgid="2423428240245737909">"Функції захисту пристрою не буде ввімкнено. Ви не зможете завадити іншим користуватися цим телефоном, якщо його буде втрачено, викрадено чи скинуто до заводських налаштувань."</string>
@@ -396,7 +401,7 @@
     <string name="security_settings_fingerprint_enroll_start_message" msgid="3909929328942564524">"Покладіть палець на датчик і заберіть його, коли відчуєте вібрацію"</string>
     <string name="security_settings_fingerprint_enroll_repeat_title" msgid="2819679722403209778">"Підніміть і знову торкніться"</string>
     <string name="security_settings_fingerprint_enroll_repeat_message" msgid="6158989350522518586">"Піднімайте палець, щоб додати різні частини відбитка"</string>
-    <string name="security_settings_fingerprint_enroll_finish_title" msgid="7567276170287972230">"Відбиток пальця додано"</string>
+    <string name="security_settings_fingerprint_enroll_finish_title" msgid="7567276170287972230">"Відбиток додано"</string>
     <string name="security_settings_fingerprint_enroll_finish_message" msgid="4796715961273420536">"Коли ви бачите цей значок, підтвердьте свою особу або покупку за допомогою відбитка пальця."</string>
     <string name="security_settings_fingerprint_enroll_enrolling_skip" msgid="3710211704052369752">"Пізніше"</string>
     <string name="setup_fingerprint_enroll_enrolling_skip_title" msgid="6808422329107426923">"Пропустити налаштування відбитка?"</string>
@@ -463,7 +468,7 @@
     <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="lock_settings_picker_fingerprint_added_security_message" msgid="5768002109707648463">"Щоб підвищити рівень безпеки, налаштуйте резервний спосіб блокування екрана."</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>
@@ -606,6 +611,7 @@
     <string name="lockpassword_pin_no_sequential_digits" msgid="680765285206990584">"Цифри в порядку зростання чи спадання та повторювані цифри заборонені"</string>
     <string name="lockpassword_ok_label" msgid="313822574062553672">"OK"</string>
     <string name="lockpassword_cancel_label" msgid="8818529276331121899">"Скасувати"</string>
+    <string name="lockpassword_clear_label" msgid="5724429464960458155">"Очистити"</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>
@@ -661,7 +667,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>
@@ -687,7 +693,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>
@@ -803,6 +809,7 @@
     <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>
@@ -821,7 +828,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>
@@ -839,6 +846,8 @@
     <string name="wifi_wps_available_first_item" msgid="4422547079984583502">"Є доступ до WPS"</string>
     <string name="wifi_wps_available_second_item" msgid="8427520131718215301">" Є доступ до WPS"</string>
     <string name="wifi_wps_nfc_enter_password" msgid="2288214226916117159">"Введіть пароль своєї мережі"</string>
+    <string name="wifi_carrier_connect" msgid="8174696557882299911">"Мережа Wi-Fi оператора"</string>
+    <string name="wifi_carrier_content" msgid="4634077285415851933">"Під’єднатися через мережу оператора <xliff:g id="NAME">%1%s</xliff:g>"</string>
     <string name="wifi_scan_always_turnon_message" msgid="203123538572122989">"Щоб покращити точність даних про місцезнаходження, а також для інших цілей, програма <xliff:g id="APP_NAME">%1$s</xliff:g> хоче вмикати сканування мережі, навіть коли Wi-Fi вимкнено.\n\nДозволити це для всіх програм, які потребують сканування?"</string>
     <string name="wifi_scan_always_turnoff_message" msgid="5538901671131941043">"Щоб вимкнути, у додатковому меню виберіть \"Додатково\"."</string>
     <string name="wifi_scan_always_confirm_allow" msgid="5355973075896817232">"Дозволити"</string>
@@ -853,9 +862,10 @@
     <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_modify" msgid="6100248070440710782">"Змінити"</string>
     <string name="wifi_failed_forget_message" msgid="1348172929201654986">"Помилка видалення мережі"</string>
     <string name="wifi_save" msgid="3331121567988522826">"Зберегти"</string>
     <string name="wifi_failed_save_message" msgid="6650004874143815692">"Помилка збереження мережі"</string>
@@ -870,6 +880,7 @@
     <string name="wifi_advanced_titlebar" msgid="4485841401774142908">"Розширені налаштування 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_title" msgid="3471132676909349382">"Інформація про мережу"</string>
     <string name="wifi_details_subnet_mask" msgid="6720279144174924410">"Маска підмережі"</string>
     <string name="wifi_details_dns" msgid="8648826607751830768">"DNS"</string>
     <string name="wifi_details_ipv6_address_header" msgid="6734119149106422148">"Адреси IPv6"</string>
@@ -902,16 +913,15 @@
     <string name="wifi_p2p_cancel_connect_title" msgid="255267538099324413">"Скасувати запрошення?"</string>
     <string name="wifi_p2p_cancel_connect_message" msgid="7477756213423749402">"Скасувати запрошення під’єднатися до пристрою <xliff:g id="PEER_NAME">%1$s</xliff:g>?"</string>
     <string name="wifi_p2p_delete_group_message" msgid="834559380069647086">"Видалити цю групу?"</string>
-    <string name="wifi_tether_checkbox_text" msgid="1847167643625779136">"Портативна точка доступу Wi‑Fi"</string>
     <string name="wifi_hotspot_checkbox_text" msgid="7763495093333664887">"Точка доступу Wi‑Fi"</string>
     <string name="wifi_hotspot_off_subtext" msgid="5466126533609394170">"Інші пристрої не матимуть доступу до Інтернету чи вмісту"</string>
     <string name="wifi_hotspot_tethering_on_subtext" product="tablet" msgid="5752490509369962007">"Надається доступ до інтернет-з’єднання на цьому планшеті через точку доступу"</string>
     <string name="wifi_hotspot_tethering_on_subtext" product="default" msgid="6461075246164300670">"Надається доступ до інтернет-з’єднання на цьому телефоні через точку доступу"</string>
     <string name="wifi_hotspot_on_local_only_subtext" msgid="2068110388011294735">"Додаток ділиться вмістом. Щоб надати доступ до інтернет-з’єднання, вимкніть і знову ввімкніть точку доступу"</string>
-    <string name="wifi_hotspot_name_title" msgid="1341735529132128887">"Назва Wi‑Fi"</string>
+    <string name="wifi_hotspot_name_title" msgid="8237000746618636778">"Назва точки доступу"</string>
     <string name="wifi_hotspot_name_summary_connecting" msgid="3378299995508671967">"Увімкнення точки доступу \"<xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>\"…"</string>
     <string name="wifi_hotspot_name_summary_connected" msgid="3888672084861445362">"Інші пристрої можуть підключитися до точки доступу \"<xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>\""</string>
-    <string name="wifi_hotspot_password_title" msgid="1955592302902091281">"Пароль Wi-Fi"</string>
+    <string name="wifi_hotspot_password_title" msgid="8676859981917573801">"Пароль точки доступу"</string>
     <string name="wifi_hotspot_ap_band_title" msgid="1165801173359290681">"Діапазон частот точки доступу"</string>
     <string name="wifi_hotspot_footer_info_regular" msgid="1203489406068036455">"Створювати мережу Wi‑Fi для інших пристроїв за допомогою точки доступу. Точка доступу надає Інтернет, використовуючи мобільну мережу. Може стягуватися додаткова плата за мобільний Інтернет."</string>
     <string name="wifi_hotspot_footer_info_local_only" msgid="857988412470694109">"Додатки можуть створювати точку доступу, щоб ділитися вмістом із пристроями поруч."</string>
@@ -922,7 +932,6 @@
     <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">"Дзвінки через Wi-Fi"</string>
     <string name="wifi_calling_suggestion_title" msgid="9008010480466359578">"Увімкнути дзвінки через Wi-Fi"</string>
@@ -963,7 +972,7 @@
     <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="emergency_address_summary" msgid="3266760199681945746">"Адреса, яку знатимуть екстрені служби у вашій місцевості, коли ви екстрено телефонуватимете через Wi-Fi"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"Екран"</string>
     <string name="sound_settings" msgid="5534671337768745343">"Звук"</string>
     <string name="all_volume_title" msgid="4296957391257836961">"Гучність"</string>
@@ -1017,6 +1026,7 @@
     <string name="search_settings" msgid="1910951467596035063">"Пошук"</string>
     <string name="search_settings_summary" msgid="9205656546570654169">"Керуйте налаштув. пошуку та історією"</string>
     <string name="search_settings_no_results" msgid="8799027492641230999">"Результатів немає"</string>
+    <string name="search_clear_history" msgid="4196658962573162457">"Очистити історію"</string>
     <string name="display_settings" msgid="7965901687241669598">"Екран"</string>
     <string name="accelerometer_title" msgid="7854608399547349157">"Автоповорот екрана"</string>
     <string name="color_mode_title" msgid="3159275920408338215">"Яскраві кольори"</string>
@@ -1148,7 +1158,6 @@
     <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>
     <string name="device_status_activity_title" msgid="1411201799384697904">"Стан"</string>
     <string name="device_status" msgid="607405385799807324">"Стан"</string>
@@ -1176,7 +1185,6 @@
     <string name="status_wifi_mac_address" msgid="2202206684020765378">"MAC-адреса Wi-Fi"</string>
     <string name="status_bt_address" msgid="4195174192087439720">"Адреса Bluetooth"</string>
     <string name="status_serial_number" msgid="2257111183374628137">"Серійний номер"</string>
-    <string name="status_unavailable" msgid="7862009036663793314">"Недоступно"</string>
     <string name="status_up_time" msgid="7294859476816760399">"Час із моменту ввімкнення"</string>
     <string name="status_awake_time" msgid="2393949909051183652">"Час активн."</string>
     <string name="internal_memory" msgid="9129595691484260784">"Внутрішня пам\'ять"</string>
@@ -1352,6 +1360,7 @@
     <string name="menu_restore" msgid="8260067415075573273">"Скинути налаштування"</string>
     <string name="restore_default_apn_completed" msgid="2824775307377604897">"Налаштування за умовчанням відновлено."</string>
     <string name="reset_dashboard_title" msgid="6254873816990678620">"Скинути параметри"</string>
+    <string name="reset_dashboard_summary" msgid="4851012632493522755">"Можна скинути налаштування мережі, додатків або пристрою"</string>
     <string name="reset_network_title" msgid="6166025966016873843">"Скинути параметри Wi-Fi, мобільного передавання даних і Bluetooth"</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>
@@ -1360,19 +1369,14 @@
     <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="6617679904229218425">"Стерти всі дані (відновити заводські налаштування)"</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_title" msgid="3531267871084279512">"Стерти всі дані (відновити заводські налаштування)"</string>
     <string name="master_clear_desc" product="tablet" msgid="9146059417023157222">"Буде видалено всі дані з "<b>"внутрішньої пам’яті"</b>" вашого планшета, зокрема:\n\n"<li>"ваш обліковий запис Google"</li>\n<li>"дані й налаштування системи та додатків"</li>\n<li>"завантажені додатки"</li>"."</string>
     <string name="master_clear_desc" product="default" msgid="4800386183314202571">"Буде видалено всі дані з "<b>"внутрішньої пам’яті"</b>" вашого телефона, зокрема:\n\n"<li>"Ваш обліковий запис Google"</li>\n<li>"Дані й налаштування системи та додатків"</li>\n<li>"Завантажені додатки"</li></string>
     <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"Наразі ви ввійшли в такі облікові записи:\n"</string>
     <string name="master_clear_other_users_present" product="default" msgid="5161423070702470742">\n\n"На цьому пристрої є інші користувачі.\n"</string>
     <string name="master_clear_desc_also_erases_external" msgid="1903185203791274237"><li>"Музика"</li>\n<li>"Фото"</li>\n<li>"Інші дані користувача"</li></string>
+    <string name="master_clear_desc_also_erases_esim" msgid="312352697653096008"><li>"Оператори eSIM-карт"</li></string>
+    <string name="master_clear_desc_no_cancel_mobile_plan" msgid="5460926449093211144">\n\n"Ваш тарифний план не буде скасовано."</string>
     <string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="7744115866662613411">\n\n"Щоб видалити музику, зображення й інші дані користувача, треба стерти "<b>"носій 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>
@@ -1393,9 +1397,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>
@@ -1403,10 +1407,10 @@
     <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_button_text" msgid="585829947108007917">"USB-модем"</string>
     <string name="usb_tethering_subtext" product="default" msgid="5991482890033484794">"Надавати доступ до інтернет-з’єднання на телефоні через USB"</string>
     <string name="usb_tethering_subtext" product="tablet" msgid="5988796139573211318">"Надавати доступ до інтернет-з’єднання на планшеті через USB"</string>
-    <string name="bluetooth_tether_checkbox_text" msgid="2379175828878753652">"Прив\'язка Bluetooth"</string>
+    <string name="bluetooth_tether_checkbox_text" msgid="2379175828878753652">"Bluetooth-модем"</string>
     <string name="bluetooth_tethering_subtext" product="tablet" msgid="4558227863463153412">"Надавати доступ до інтернет-з’єднання на планшеті через Bluetooth"</string>
     <string name="bluetooth_tethering_subtext" product="default" msgid="1055197887836203595">"Надавати доступ до інтернет-з’єднання на телефоні через Bluetooth"</string>
     <string name="bluetooth_tethering_off_subtext_config" msgid="6326877798974938021">"Доступ до Інтернету через Bluetooth на пристрої <xliff:g id="DEVICE_NAME">%1$d</xliff:g>"</string>
@@ -1489,15 +1493,16 @@
     <string name="settings_safetylegal_activity_title" msgid="6901214628496951727">"Інф-я про безпеку"</string>
     <string name="settings_safetylegal_activity_unreachable" msgid="250674109915859456">"Відсутнє з’єднання з мережею. Щоб переглянути цю інформацію зараз, перейдіть на %s з будь-якого комп’ютера, під’єднаного до Інтернету."</string>
     <string name="settings_safetylegal_activity_loading" msgid="8059022597639516348">"Завантаження…"</string>
-    <string name="lockpassword_choose_your_password_header" msgid="8624900666929394990">"Виберіть пароль"</string>
-    <string name="lockpassword_choose_your_password_header_for_fingerprint" msgid="6624409510609085450">"Щоб користуватися відбитком пальця, налаштуйте пароль"</string>
-    <string name="lockpassword_choose_your_pattern_header" msgid="6949761069941694050">"Створіть ключ"</string>
-    <string name="lockpassword_choose_your_pattern_header_for_fingerprint" msgid="5901096361617543819">"Щоб користуватися відбитком пальця, налаштуйте ключ"</string>
-    <string name="lockpassword_choose_your_pin_header" msgid="7598849519816138302">"Виберіть свій PIN"</string>
-    <string name="lockpassword_choose_your_pin_header_for_fingerprint" msgid="765344692615917183">"Щоб користуватися відбитком пальця, налаштуйте PIN-код"</string>
-    <string name="lockpassword_confirm_your_password_header" msgid="6308478184889846633">"Підтвердьте свій пароль"</string>
+    <string name="lockpassword_choose_your_screen_lock_header" msgid="3872462096767152394">"Налаштуйте блокування екрана"</string>
+    <string name="lockpassword_choose_your_password_message" msgid="1197569283524841412">"З міркувань безпеки налаштуйте пароль"</string>
+    <string name="lockpassword_choose_your_password_header_for_fingerprint" msgid="2541818487015343503">"Для відбитка пальця потрібен пароль"</string>
+    <string name="lockpassword_choose_your_pattern_header_for_fingerprint" msgid="7709785406243556723">"Для відбитка пальця потрібен ключ"</string>
+    <string name="lockpassword_choose_your_pin_message" msgid="1875420718677275646">"З міркувань безпеки налаштуйте PIN-код"</string>
+    <string name="lockpassword_choose_your_pin_header_for_fingerprint" msgid="1549639053195796674">"Для відбитка пальця потрібен PIN-код"</string>
+    <string name="lockpassword_choose_your_pattern_message" msgid="5986983400689720015">"З міркувань безпеки налаштуйте ключ"</string>
+    <string name="lockpassword_confirm_your_password_header" msgid="1266027268220850931">"Введіть пароль ще раз"</string>
     <string name="lockpassword_confirm_your_pattern_header" msgid="7543433733032330821">"Підтвердьте ключ розблокування"</string>
-    <string name="lockpassword_confirm_your_pin_header" msgid="49038294648213197">"Підтвердьте свій PIN"</string>
+    <string name="lockpassword_confirm_your_pin_header" msgid="7744513791910572550">"Введіть PIN-код ще раз"</string>
     <string name="lockpassword_confirm_passwords_dont_match" msgid="5140892109439191415">"Паролі не збігаються"</string>
     <string name="lockpassword_confirm_pins_dont_match" msgid="7226244811505606217">"PIN-коди не збігаються"</string>
     <string name="lockpassword_choose_lock_generic_header" msgid="3811438094903786145">"Вибір методу розблокування"</string>
@@ -1516,6 +1521,12 @@
     <string name="lockpassword_strong_auth_required_work_pattern" msgid="3003781907040522053">"З міркувань безпеки введіть ключ робочого профілю"</string>
     <string name="lockpassword_strong_auth_required_work_pin" msgid="3367491332598821552">"З міркувань безпеки введіть PIN-код робочого профілю"</string>
     <string name="lockpassword_strong_auth_required_work_password" msgid="8159775129968582940">"З міркувань безпеки введіть пароль робочого профілю"</string>
+    <string name="lockpassword_confirm_your_pattern_details_frp" msgid="6757336656791723193">"Налаштування телефона скинуто. Щоб користуватися цим телефоном, введіть попередній ключ."</string>
+    <string name="lockpassword_confirm_your_pin_details_frp" msgid="826520613445990470">"Налаштування телефона скинуто. Щоб користуватися цим телефоном, введіть попередній PIN-код."</string>
+    <string name="lockpassword_confirm_your_password_details_frp" msgid="8944081074615739040">"Налаштування телефона скинуто. Щоб користуватися цим телефоном, введіть попередній пароль."</string>
+    <string name="lockpassword_confirm_your_pattern_header_frp" msgid="2898036091609128286">"Підтвердьте ключ"</string>
+    <string name="lockpassword_confirm_your_pin_header_frp" msgid="4141601774778898803">"Підтвердьте PIN-код"</string>
+    <string name="lockpassword_confirm_your_password_header_frp" msgid="3762615419295360480">"Підтвердьте пароль"</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>
@@ -1565,7 +1576,6 @@
     <string name="install_applications_title" msgid="4987712352256508946">"Дозволити всі джерела додатків"</string>
     <string name="recent_app_category_title" msgid="6673071268966003928">"Нещодавно відкриті додатки"</string>
     <string name="see_all_apps_title" msgid="1317153498074308438">"Переглянути всі додатки: <xliff:g id="COUNT">%1$d</xliff:g>"</string>
-    <string name="recent_app_summary" msgid="3366446669844932300">"<xliff:g id="TIME">^1</xliff:g> тому"</string>
     <string name="install_all_warning" product="tablet" msgid="8310489909586138165">"Ваш планшет і особисті дані більш уразливі до атак із боку додатків із невідомих джерел Установлюючи додатки з цього джерела, ви погоджуєтеся, що несете відповідальність за будь-яку шкоду, заподіяну вашому планшету, чи втрату даних унаслідок використання таких додатків."</string>
     <string name="install_all_warning" product="default" msgid="1952257127370115988">"Ваш телефон і особисті дані більш уразливі до атак із боку додатків із невідомих джерел Установлюючи додатки з цього джерела, ви погоджуєтеся, що несете відповідальність за будь-яку шкоду, заподіяну вашому телефону, чи втрату даних унаслідок використання таких додатків."</string>
     <string name="advanced_settings" msgid="1777249286757067969">"Розширені налаштування"</string>
@@ -1609,7 +1619,7 @@
     <string name="ask_compatibility" msgid="7225195569089607846">"Запитувати під час запуску"</string>
     <string name="enable_compatibility" msgid="5806819252068617811">"Масштабувати програму"</string>
     <string name="unknown" msgid="1592123443519355854">"Невідомо"</string>
-    <string name="sort_order_alpha" msgid="1410278099123670628">"Сортувати за іменем"</string>
+    <string name="sort_order_alpha" msgid="1410278099123670628">"Сортувати за назвою"</string>
     <string name="sort_order_size" msgid="7024513286636502362">"Сортувати за розміром"</string>
     <string name="show_running_services" msgid="5736278767975544570">"Показати запущені служби"</string>
     <string name="show_background_processes" msgid="2009840211972293429">"Показати кешовані процеси"</string>
@@ -1829,9 +1839,9 @@
     <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="vision_settings_suggestion_title" msgid="917294957154878441">"Збільшити розмір шрифту"</string>
+    <string name="vision_settings_suggestion_title" msgid="8058794060304707004">"Змінити розмір шрифту"</string>
     <string name="screen_reader_category_title" msgid="7739154903913400641">"Програми зчитування з екрана"</string>
     <string name="audio_and_captions_category_title" msgid="3420727114421447524">"Аудіо та текст на екрані"</string>
     <string name="display_category_title" msgid="685461049938269166">"Дисплей"</string>
@@ -1868,7 +1878,6 @@
     <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="preference_summary_default_combination" msgid="8532964268242666060">"<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>
@@ -2001,12 +2010,14 @@
     <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_whitelisted" msgid="7375400051141016808">"Неможливо оптимізувати використання заряду акумулятора додатком"</string>
+    <string name="background_activity_warning_dialog_title" msgid="2216249969149568871">"Обмежити фонову активність?"</string>
+    <string name="background_activity_warning_dialog_text" msgid="7049624449246121981">"Якщо обмежити фонову активність, додаток може працювати неналежним чином"</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" msgid="6393929085382334341">"Використання додатками після повного заряджання (<xliff:g id="RELATIVE_TIME">^1</xliff:g>)"</string>
+    <string name="power_usage_list_summary_device" msgid="4461926045610455423">"Використання пристроєм після повного заряджання (<xliff:g id="RELATIVE_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>
@@ -2252,14 +2263,14 @@
     <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">"Щоб використовувати сховище облікових даних, потрібно встановити PIN-код або пароль для блокування екрана."</string>
+    <string name="credentials_configure_lock_screen_hint" msgid="8058230497337529036">"Щоб користуватися сховищем облікових даних, налаштуйте надійне блокування екрана"</string>
+    <string name="credentials_configure_lock_screen_button" msgid="253239765216055321">"ВИБРАТИ БЛОКУВАННЯ"</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>
@@ -2379,8 +2390,6 @@
     <skip />
     <string name="cant_sync_dialog_title" msgid="2777238588398046285">"Неможливо синхронізувати вручну"</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">"Введіть PIN-код, щоб запустити пристрій Android"</string>
     <string name="enter_pattern" msgid="4187435713036808566">"Намалюйте ключ, щоб запустити пристрій Android"</string>
@@ -2394,11 +2403,12 @@
     <string name="misc_files_selected_count" msgid="4647048020823912088">"вибрано <xliff:g id="NUMBER">%1$d</xliff:g> з <xliff:g id="TOTAL">%2$d</xliff:g>"</string>
     <string name="misc_files_selected_count_bytes" msgid="2876232009069114352">"<xliff:g id="NUMBER">%1$s</xliff:g> з <xliff:g id="TOTAL">%2$s</xliff:g>"</string>
     <string name="select_all" msgid="1562774643280376715">"Вибрати всі"</string>
+    <string name="data_plan_usage_manage_plans_button_text" msgid="8997761990902708162">"Керувати планами"</string>
     <string name="data_usage_summary_title" msgid="3804110657238092929">"Використання даних"</string>
     <string name="data_usage_app_summary_title" msgid="4147258989837459172">"Використ. даних додатком"</string>
     <string name="data_usage_accounting" msgid="7170028915873577387">"Ваш оператор може по-іншому облікувати дані."</string>
     <string name="data_usage_app" msgid="4970478397515423303">"Використання додатка"</string>
-    <string name="data_usage_app_info_label" msgid="3409931235687866706">"ІНФОРМАЦІЯ ПРО ДОДАТОК"</string>
+    <string name="data_usage_app_info_label" msgid="3409931235687866706">"ПРО ДОДАТОК"</string>
     <string name="data_usage_cellular_data" msgid="9168928285122125137">"Мобільний трафік"</string>
     <string name="data_usage_data_limit" msgid="1193930999713192703">"Установити ліміт даних"</string>
     <string name="data_usage_cycle" msgid="5652529796195787949">"Цикл використання даних"</string>
@@ -2479,6 +2489,9 @@
     <string name="data_usage_metered_mobile" msgid="5423305619126978393">"Мобільні мережі"</string>
     <string name="data_usage_metered_wifi" msgid="1761738002328299714">"Мережі Wi‑Fi із тарифік. трафіку"</string>
     <string name="data_usage_metered_wifi_disabled" msgid="727808462375941567">"Щоб вибрати мережі з тарифікацією трафіку, увімкніть Wi‑Fi."</string>
+    <string name="data_usage_metered_auto" msgid="1262028400911918865">"Автоматично"</string>
+    <string name="data_usage_metered_yes" msgid="9217539611385225894">"З тарифікацією трафіку"</string>
+    <string name="data_usage_metered_no" msgid="4025232961929071789">"Без тарифікації трафіку"</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>
@@ -2570,9 +2583,6 @@
     <string name="backup_pw_set_button_text" msgid="2387480910044648795">"Зберегти пароль"</string>
     <string name="backup_pw_cancel_button_text" msgid="8845630125391744615">"Скасувати"</string>
     <string name="additional_system_update_settings_list_item_title" msgid="214987609894661992">"Додаткові оновлення системи"</string>
-    <string name="selinux_status_disabled" msgid="924551035552323327">"Вимкнено"</string>
-    <string name="selinux_status_permissive" msgid="6004965534713398778">"Дозволено"</string>
-    <string name="selinux_status_enforcing" msgid="2252703756208463329">"Застосовано"</string>
     <string name="ssl_ca_cert_warning" msgid="2045866713601984673">"Мережа може відстежуватися"</string>
     <string name="done_button" msgid="1991471253042622230">"Готово"</string>
     <plurals name="ssl_ca_cert_dialog_title" formatted="false" msgid="7145092748045794650">
@@ -2743,7 +2753,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>
@@ -2780,6 +2790,7 @@
       <item quantity="many">Показати %d схованих елементів</item>
       <item quantity="other">Показати %d схованого елемента</item>
     </plurals>
+    <string name="dashboard_suggestion_condition_footer_content_description" msgid="2898588191174845961">"Згорнути"</string>
     <string name="network_dashboard_title" msgid="4771589228992391573">"Мережа й Інтернет"</string>
     <string name="network_dashboard_summary_mobile" msgid="3851083934739500429">"мобільна мережа"</string>
     <string name="network_dashboard_summary_data_usage" msgid="3843261364705042212">"використання трафіку"</string>
@@ -2884,8 +2895,14 @@
       <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_settings_title" msgid="1066226840983908121">"Не турбувати"</string>
+    <string name="zen_mode_behavior_settings_title" msgid="1463303933529313969">"Поведінка"</string>
+    <string name="zen_mode_behavior_allow_title" msgid="3845615648136218141">"Дозволити звуки й вібросигнали:"</string>
+    <string name="zen_mode_behavior_no_sound" msgid="1219626004723208056">"Без звуку"</string>
+    <string name="zen_mode_behavior_total_silence" msgid="6716603819806610626">"Без звуку (сигнали вимкнено)"</string>
+    <string name="zen_mode_behavior_no_sound_except" msgid="4968477585788243114">"Без звуку, винятки: <xliff:g id="CATEGORIES">%1$s</xliff:g>"</string>
+    <!-- no translation found for zen_mode_behavior_alarms_only (2423480992071472963) -->
+    <skip />
     <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>
@@ -2927,13 +2944,15 @@
     <string name="notifications_title" msgid="8086372779371204971">"Сповіщення"</string>
     <string name="app_notifications_title" msgid="5810577805218003760">"Сповіщення з додатків"</string>
     <string name="notification_channel_title" msgid="2260666541030178452">"Категорія сповіщень"</string>
+    <string name="notification_group_title" msgid="7180506440133859601">"Група категорій сповіщень"</string>
     <string name="notification_importance_title" msgid="848692592679312666">"Пріоритет"</string>
-    <string name="notification_importance_unspecified" msgid="2196023702875112081">"Дозволити додатку вирішувати"</string>
+    <string name="notification_importance_unspecified" msgid="6622173510486113958">"Дозволити звуковий сигнал"</string>
     <string name="notification_importance_blocked" msgid="7938180808339386300">"Ніколи не показувати сповіщення"</string>
     <string name="notification_importance_min" msgid="5455049524984686275">"Без звуку та візуальних сповіщень"</string>
     <string name="notification_importance_low" msgid="8881468429453766553">"Без звуку"</string>
     <string name="notification_importance_default" msgid="5958338024601957516">"Зі звуком"</string>
     <string name="notification_importance_high" msgid="2082429479238228527">"Зі звуком і спливаючими вікнами"</string>
+    <string name="notification_importance_high_silent" msgid="2667033773703765252">"Спливають на екрані"</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>
@@ -2978,8 +2997,15 @@
     <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="channel_group_notifications_off_desc" msgid="1620950416247316370">"Android блокує цю групу сповіщень на цьому пристрої"</string>
     <string name="notification_channels" msgid="5346841743182627500">"Категорії"</string>
     <string name="notification_channels_other" msgid="5645317113885788226">"Інше"</string>
+    <plurals name="notification_group_summary" formatted="false" msgid="3420621520561455358">
+      <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="no_channels" msgid="3077375508177744586">"Цей додаток не надсилав сповіщень"</string>
     <string name="app_settings_link" msgid="8894946007543660906">"Додаткові налаштування в додатку"</string>
     <string name="app_notification_listing_summary_zero" msgid="6482582965081108108">"Увімкнено для всіх додатків"</string>
@@ -3060,12 +3086,14 @@
     <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>
+    <!-- no translation found for zen_mode_media_system_other (8900209390529859777) -->
+    <skip />
     <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="239685342222975733">"Якщо та сама людина телефонує вдруге протягом <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>
@@ -3098,6 +3126,7 @@
     <string name="zen_mode_screen_off_visual_interruptions" msgid="4850792880144382633">"Коли екран вимкнено"</string>
     <string name="zen_mode_no_visual_interruptions" msgid="8742776003822778472">"Коли екран увімкнено або вимкнено"</string>
     <string name="notification_app_settings_button" msgid="6685640230371477485">"Налаштування сповіщень"</string>
+    <string name="suggestion_button_text" msgid="3275010948381252006">"ОK"</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>
@@ -3191,7 +3220,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>
@@ -3294,6 +3323,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="sms_mirroring_pref" msgid="6475043279147376031">"Дзеркалювання SMS"</string>
     <string name="background_check_pref" msgid="7550258400138010979">"Перевірка у фоновому режимі"</string>
     <string name="background_check_title" msgid="4534254315824525593">"Повний доступ у фоновому режиміj"</string>
     <string name="assist_access_context_title" msgid="2269032346698890257">"Використовувати текст з екрана"</string>
@@ -3362,7 +3392,7 @@
     <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="permit_write_settings" msgid="658555006453212691">"Дозволити змінювати налаштування системи"</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>
@@ -3371,7 +3401,7 @@
     <string name="camera_gesture_desc" msgid="1831390075255870960">"Додаток Камера відкриється, якщо двічі покрутити зап’ястям"</string>
     <string name="camera_double_tap_power_gesture_title" msgid="1651873760405034645">"Камера: двічі натиснути кнопку живлення"</string>
     <string name="camera_double_tap_power_gesture_desc" msgid="7355664631775680376">"Швидко запускайте камеру, не розблоковуючи екран"</string>
-    <string name="screen_zoom_title" msgid="5233515303733473927">"Розмір елементів"</string>
+    <string name="screen_zoom_title" msgid="5233515303733473927">"Масштаб"</string>
     <string name="screen_zoom_short_summary" msgid="7291960817349834688">"Збільшуйте або зменшуйте елементи на екрані"</string>
     <string name="screen_zoom_keywords" msgid="9176477565403352552">"щільність дисплея, масштаб екрана, масштабувати, масштабування"</string>
     <string name="screen_zoom_summary" msgid="6445488991799015407">"Збільшуйте або зменшуйте всі елементи на екрані. Деякі додатки можуть переміститися."</string>
@@ -3463,12 +3493,15 @@
     <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">"Щоб застосувати зміни у функції Telephony Monitor, перезапустіть пристрій"</string>
+    <string name="connectivity_monitor_switch" msgid="9059759348648583421">"Connectivity Monitor"</string>
+    <string name="connectivity_monitor_switch_summary" msgid="2828658652378866401">"Коли Connectivity Monitor виявить проблему зі з’єднанням, він збере журнали та запропонує користувачу повідомити про помилку"</string>
+    <string name="connectivity_monitor_toast" msgid="5551859612881173028">"Щоб застосувати зміни в Connectivity Monitor, перезапустіть пристрій"</string>
     <string name="camera_hal_hdrplus_switch" msgid="8377365197105267466">"Режим HDR+ на рівні HAL камери"</string>
     <string name="camera_hal_hdrplus_toast" msgid="2063703797270055299">"Щоб зміна режиму HDR+ на рівні HAL камери почала діяти, перезапустіть пристрій"</string>
+    <string name="camera_laser_sensor_switch" msgid="8913588990743234440">"Лазерний датчик камери"</string>
     <string name="ota_disable_automatic_update" msgid="2319639631655915050">"Автоматичне оновлення системи"</string>
     <string name="usage" msgid="2977875522080448986">"Використання"</string>
-    <string name="cellular_data_usage" msgid="2155683719898158203">"Використання мобільного трафіку"</string>
+    <string name="cellular_data_usage" msgid="2155683719898158203">"Мобільний трафік"</string>
     <string name="wifi_data_usage" msgid="686754111095324306">"Використання трафіку Wi-Fi"</string>
     <string name="ethernet_data_usage" msgid="5108764537574354616">"Використання трафіку Ethernet"</string>
     <string name="wifi" msgid="1081550856200013637">"Wi-Fi"</string>
@@ -3493,7 +3526,7 @@
     <string name="data_warning" msgid="209133958008062117">"Застереження про трафік"</string>
     <string name="set_data_limit" msgid="2901526323210516923">"Установити ліміт трафіку"</string>
     <string name="data_limit" msgid="1885406964934590552">"Ліміт трафіку"</string>
-    <string name="data_usage_template" msgid="392191945602400904">"<xliff:g id="ID_2">%2$s</xliff:g> використано <xliff:g id="ID_1">%1$s</xliff:g>"</string>
+    <string name="data_usage_template" msgid="2923744765873163859">"<xliff:g id="ID_1">%1$s</xliff:g> використано <xliff:g id="ID_2">%2$s</xliff:g>"</string>
     <string name="configure" msgid="1029654422228677273">"Налаштувати"</string>
     <string name="data_usage_other_apps" msgid="3272872663517382050">"Інші додатки, які використовуються"</string>
     <plurals name="data_saver_unrestricted_summary" formatted="false" msgid="2635267833484232703">
@@ -3510,7 +3543,7 @@
     <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>
@@ -3566,7 +3599,7 @@
     <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="387052719462473500">"Керуйте інформацією на заблокованому екрані"</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="8483187649355540109">"Підтримка та поради"</string>
@@ -3574,7 +3607,7 @@
     <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>
+    <string name="bluetooth_disabled" msgid="6244000672828617410">"Вимкнено"</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>
@@ -3682,7 +3715,7 @@
     <string name="web_action_enable_title" msgid="4051513950976670853">"Додатки з миттєвим запуском"</string>
     <string name="web_action_enable_summary" msgid="3108127559723396382">"Відкривати посилання в додатках, навіть якщо їх не встановлено"</string>
     <string name="web_action_section_title" msgid="7364647086538399136">"Додатки з миттєвим запуском"</string>
-    <string name="instant_apps_account" msgid="1433620209791992528">"Обліковий запис додатків із миттєвим запуском"</string>
+    <string name="instant_apps_settings" msgid="8827777916518348213">"Параметри додатків із миттєвим запуском"</string>
     <string name="domain_url_section_title" msgid="7046835219056428883">"Установлені додатки"</string>
     <string name="automatic_storage_manager_activation_warning" msgid="6353100011690933254">"Зараз пам’яттю керує диспетчер пам’яті"</string>
     <string name="account_for_section_header" msgid="5356566418548737121">"Облікові записи користувача <xliff:g id="USER_NAME">%1$s</xliff:g>"</string>
@@ -3733,7 +3766,9 @@
     <string name="enterprise_privacy_always_on_vpn_personal" msgid="9217774730260037434">"Постійну мережу VPN увімкнено у вашому особистому профілі"</string>
     <string name="enterprise_privacy_always_on_vpn_work" msgid="7244472958208315814">"Постійну мережу VPN увімкнено у вашому робочому профілі"</string>
     <string name="enterprise_privacy_global_http_proxy" msgid="7936664553416257333">"Установлено глобальний проксі-сервер HTTP"</string>
-    <string name="enterprise_privacy_ca_certs" msgid="5885892204903688909">"Надійні облікові дані"</string>
+    <string name="enterprise_privacy_ca_certs_device" msgid="2019652712782510262">"Надійні облікові дані"</string>
+    <string name="enterprise_privacy_ca_certs_personal" msgid="2279084820904076599">"Надійні облікові дані в особистому профілі"</string>
+    <string name="enterprise_privacy_ca_certs_work" msgid="6187377647815301809">"Надійні облікові дані в робочому профілі"</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>
@@ -3792,7 +3827,7 @@
     <string name="app_info_storage_title" msgid="5554719444625611987">"Використано місця"</string>
     <string name="webview_uninstalled_for_user" msgid="1819903169194420983">"(видалено для користувача <xliff:g id="USER">%s</xliff:g>)"</string>
     <string name="webview_disabled_for_user" msgid="1216426047631256825">"(вимкнено для користувача <xliff:g id="USER">%s</xliff:g>)"</string>
-    <string name="autofill_app" msgid="7338387238377914374">"Служба автозаповнення"</string>
+    <string name="autofill_app" msgid="7338387238377914374">"Автозаповнення"</string>
     <string name="autofill_keywords" msgid="7485591824120812710">"автоматично, заповнювати, автозаповнення"</string>
     <string name="autofill_confirmation_message" msgid="2784869528908005194">"&lt;b&gt;Переконайтеся, що додаток надійний&lt;/b&gt; &lt;br/&gt; &lt;br/&gt; &lt;xliff:g id=app_name example=Функція Автозаповнення Google&gt;%1$s&lt;/xliff:g&gt; використовує інформацію на екрані, щоб визначати поля для автозаповнення."</string>
     <string name="device_theme" msgid="4571803018917608588">"Тема пристрою"</string>
@@ -3802,10 +3837,12 @@
     <string name="storage_manager_indicator_on" msgid="8625551710194584733">"Увімкнено"</string>
     <string name="install_type_instant" msgid="3174425974536078647">"Додаток із миттєвим запуском"</string>
     <string name="automatic_storage_manager_deactivation_warning" msgid="5605210730828410482">"Вимкнути диспетчер пам’яті?"</string>
-    <string name="storage_movies_tv" msgid="5498394447562086890">"Додатки для перегляду фільмів"</string>
+    <string name="storage_movies_tv" msgid="5498394447562086890">"Фільми й серіали"</string>
     <string name="carrier_provisioning" msgid="4398683675591893169">"Інформація про ініціалізацію оператора"</string>
     <string name="trigger_carrier_provisioning" msgid="3434865918009286187">"Активатор ініціалізації оператора"</string>
     <string name="new_device_suggestion_title" msgid="698847081680980774">"Що нового та цікавого?"</string>
-    <string name="new_device_suggestion_summary" msgid="7172709269203435870">"Перегляньте 5 найкращих функцій"</string>
+    <string name="new_device_suggestion_summary" product="default" msgid="206396571522515855">"Ознайомтеся зі своїм новим телефоном"</string>
+    <string name="new_device_suggestion_summary" product="tablet" msgid="393751455688210956">"Ознайомтеся зі своїм новим планшетом"</string>
+    <string name="new_device_suggestion_summary" product="device" msgid="2939870049868336652">"Ознайомтеся зі своїм новим пристроєм"</string>
     <string name="disabled_low_ram_device" msgid="3751578499721173344">"Ця функція недоступна на цьому пристрої"</string>
 </resources>
diff --git a/res/values-ur/arrays.xml b/res/values-ur/arrays.xml
index 27a2b63..5ec72cd 100644
--- a/res/values-ur/arrays.xml
+++ b/res/values-ur/arrays.xml
@@ -100,8 +100,6 @@
     <!-- no translation found for wifi_security_no_eap:0 (2084555984818107151) -->
     <!-- no translation found for wifi_security_no_eap:1 (397579322683471524) -->
     <!-- no translation found for wifi_security_no_eap:2 (1968820975358150484) -->
-    <!-- no translation found for wifi_ap_security:0 (5251664683198623324) -->
-    <!-- no translation found for wifi_ap_security:1 (7989073072260294673) -->
   <string-array name="wifi_eap_method">
     <item msgid="1160193392455075561">"PEAP"</item>
     <item msgid="7981731051382306293">"TLS"</item>
@@ -474,8 +472,8 @@
     <item msgid="6131821495505931173">"سرخ"</item>
   </string-array>
   <string-array name="automatic_storage_management_days">
-    <item msgid="687318592238852312">"30 دن سے زیادہ پرانا"</item>
-    <item msgid="2900554746706302178">"60 دن سے زیادہ پرانا"</item>
-    <item msgid="5692284879054004388">"90 دن سے زیادہ پرانا"</item>
+    <item msgid="687318592238852312">"30 دن سے زیادہ پرانی"</item>
+    <item msgid="2900554746706302178">"60 دن سے زیادہ پرانی"</item>
+    <item msgid="5692284879054004388">"90 دن سے زیادہ پرانی"</item>
   </string-array>
 </resources>
diff --git a/res/values-ur/strings.xml b/res/values-ur/strings.xml
index acd05a9..478b61a 100644
--- a/res/values-ur/strings.xml
+++ b/res/values-ur/strings.xml
@@ -166,7 +166,7 @@
     <string name="bluetooth_map_acceptance_dialog_text" msgid="8712508202081143737">"‏%1$s آپ کے پیغامات تک رسائی حاصل کرنا چاہتا ہے۔ ‎%2$s کو رسائی دیں؟"</string>
     <string name="bluetooth_sap_request" msgid="2669762224045354417">"‏SIM تک رسائی کی درخواست"</string>
     <string name="bluetooth_sap_acceptance_dialog_text" msgid="4414253873553608690">"‏<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g> آپ کے SIM کارڈ تک رسائی حاصل کرنا چاہتا ہے۔ SIM کارڈ تک رسائی دینے سے کنکشن کے دورانیہ تک کیلئے آپ کے آلہ پر ڈیٹا کنیکٹیوٹی غیر فعال ہو جائے گی۔ <xliff:g id="DEVICE_NAME_1">%2$s?</xliff:g> تک رسائی دیں"</string>
-    <string name="bluetooth_device_name_summary" msgid="4757990010751789977">"دیگر آلات کے لیے بطور \'<xliff:g id="DEVICE_NAME">^1</xliff:g>\' مرئی ہے"</string>
+    <string name="bluetooth_device_name_summary" msgid="522235742194965734">"دیگر آلات کیلئے بطور ’<xliff:g id="DEVICE_NAME">^1</xliff:g>‘ مرئی ہے"</string>
     <string name="bluetooth_paired_device_title" msgid="8638994696317952019">"آپ کے آلات"</string>
     <string name="bluetooth_pairing_page_title" msgid="7712127387361962608">"نئے آلہ کا جوڑا بنائیں"</string>
     <string name="date_and_time" msgid="9062980487860757694">"تاریخ اور وقت"</string>
@@ -312,6 +312,8 @@
     <string name="zone_auto" msgid="334783869352026648">"خود کار ٹائم زون"</string>
     <string name="zone_auto_summaryOn" msgid="6142830927278458314">"نیٹ ورک کے ذریعے فراہم کردہ ٹائم زون استعمال کریں"</string>
     <string name="zone_auto_summaryOff" msgid="2597745783162041390">"نیٹ ورک کے ذریعے فراہم کردہ ٹائم زون استعمال کریں"</string>
+    <string name="date_time_24hour_auto" msgid="2117383168985653422">"24 گھنٹے کا خودکار فارمیٹ"</string>
+    <string name="date_time_24hour_auto_summary" msgid="6351812925651480277">"مقامی ڈیفالٹ کا استعمال کریں"</string>
     <string name="date_time_24hour_title" msgid="3203537578602803850">"24 گھنٹے کا فارمیٹ"</string>
     <string name="date_time_24hour" msgid="1193032284921000063">"24 گھنٹے کا فارمیٹ استعمال کریں"</string>
     <string name="date_time_set_time_title" msgid="6296795651349047016">"وقت"</string>
@@ -341,8 +343,7 @@
     <string name="Accounts_settings_title" msgid="1643879107901699406">"اکاؤنٹس"</string>
     <string name="location_settings_title" msgid="1369675479310751735">"مقام"</string>
     <string name="account_settings_title" msgid="626177544686329806">"اکاؤنٹس"</string>
-    <!-- no translation found for security_settings_title (4918904614964215087) -->
-    <skip />
+    <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>
@@ -373,6 +374,9 @@
     <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="1961957425135180242">"آگے جائیں"</string>
+    <string name="setup_fingerprint_enroll_skip_title" msgid="362050541117362034">"فنگر پرنٹ کو نظر انداز کریں؟"</string>
+    <string name="setup_fingerprint_enroll_skip_after_adding_lock_text" msgid="958990414356204763">"فنگر پرنٹ سیٹ اپ میں صرف ایک یا دو منٹ لگتے ہیں۔ اگر آپ اسے نظر انداز کرتے ہیں، تو آپ بعد میں ترتیبات میں اپنی فنگر پرنٹ شامل کرسکتے ہیں۔"</string>
+    <string name="lock_screen_intro_skip_title" msgid="4988210105913705679">"اسکرین لاک کو نظر انداز کریں؟"</string>
     <string name="lock_screen_intro_skip_dialog_text_frp" product="tablet" msgid="1581834104051243425">"آلہ کے تحفظ کی خصوصیات آن نہیں ہوں گی۔ اس کے ضائع، چوری یا دوبارہ ترتیب دئے جانے پر آپ دوسروں کو اس ٹیبلیٹ کے استعمال سے نہیں روک پائیں گے۔"</string>
     <string name="lock_screen_intro_skip_dialog_text_frp" product="device" msgid="4629503416877189572">"آلہ کے تحفظ کی خصوصیات آن نہیں ہوں گی۔ اس کے ضائع، چوری یا دوبارہ ترتیب دئے جانے پر آپ دوسروں کو اس آلہ کے استعمال سے نہیں روک پائیں گے۔"</string>
     <string name="lock_screen_intro_skip_dialog_text_frp" product="default" msgid="2423428240245737909">"آلہ کے تحفظ کی خصوصیات آن نہیں ہوں گی۔ اس کے ضائع، چوری یا دوبارہ ترتیب دئے جانے پر آپ دوسروں کو اس فون کے استعمال سے نہیں روک پائیں گے۔"</string>
@@ -382,7 +386,7 @@
     <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="3051496861358227199">"سنسر کو ٹچ کریں"</string>
-    <string name="security_settings_fingerprint_enroll_find_sensor_message" msgid="8793966374365960368">"یہ آپ کے فون کے پشت پر ہے۔ اپنے انڈیکس فنگر کا استعمال کریں۔"</string>
+    <string name="security_settings_fingerprint_enroll_find_sensor_message" msgid="8793966374365960368">"یہ آپ کے فون کے پشت پر ہے۔ اپنی انڈیکس فنگر کا استعمال کریں۔"</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_content_description" msgid="2058830032070449160">"آلہ اور فنگر پرنٹ سینسر کے مقام کا خاکہ"</string>
     <string name="security_settings_fingerprint_enroll_dialog_name_label" msgid="7086763077909041106">"نام"</string>
     <string name="security_settings_fingerprint_enroll_dialog_ok" msgid="4150384963879569750">"ٹھیک ہے"</string>
@@ -399,7 +403,7 @@
     <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="2989019978041986175">"اپنے فون کے پشت پر سینسر کو ٹچ کریں۔ اپنے انڈیکس فنگر کا استعمال کریں۔"</string>
+    <string name="security_settings_fingerprint_enroll_touch_dialog_message" msgid="2989019978041986175">"اپنے فون کے پشت پر سینسر کو ٹچ کریں۔ اپنی انڈیکس فنگر کا استعمال کریں۔"</string>
     <string name="security_settings_fingerprint_enroll_error_dialog_title" msgid="3618021988442639280">"اندراج مکمل نہیں ہوا تھا"</string>
     <string name="security_settings_fingerprint_enroll_error_timeout_dialog_message" msgid="2942551158278899627">"فنگر پرنٹ اندراج کی حدِ وقت پوری ہو گئی۔ دوبارہ کوشش کریں۔"</string>
     <string name="security_settings_fingerprint_enroll_error_generic_dialog_message" msgid="3624760637222239293">"فنگر پرنٹ اندراج نہیں ہوا۔ دوبارہ کوشش کریں یا مختلف انگلی استعمال کریں۔"</string>
@@ -458,7 +462,7 @@
     <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="lock_settings_picker_fingerprint_added_security_message" msgid="5768002109707648463">"اضافی سیکیورٹی کے لئے ایک بیک اپ اسکرین لاک سیٹ کریں۔"</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>
@@ -500,29 +504,37 @@
     <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>
-    <!-- no translation found for unlock_disable_frp_warning_content_pattern_fingerprint (2986105377420905314) -->
-    <skip />
+    <string name="unlock_disable_frp_warning_content_pattern_fingerprint" msgid="2986105377420905314">"آلہ کے تحفظ کی خصوصیات آپ کے پیٹرن کے بغیر کام نہیں کریں گی۔<xliff:g id="EMPTY_LINE">
+
+</xliff:g>آپ کے محفوظ کردہ فنگر پرنٹس بھی اس آلہ سے ہٹا دیے جائیں گے اور آپ ان سے اپنے فون کو غیر مقفل، خریداریوں کی اجازت یا ایپس میں سائن ان نہیں کر پائیں گے۔"</string>
     <string name="unlock_disable_frp_warning_content_pin" msgid="586996206210265131">"‏آلہ کے تحفظ کی خصوصیات آپ کی PIN کے بغیر کام نہیں کریں گی۔"</string>
-    <!-- no translation found for unlock_disable_frp_warning_content_pin_fingerprint (3370462835533123695) -->
-    <skip />
+    <string name="unlock_disable_frp_warning_content_pin_fingerprint" msgid="3370462835533123695">"‏آلہ کے تحفظ کی خصوصیات آپ کے PIN کے بغیر کام نہیں کریں گی۔<xliff:g id="EMPTY_LINE">
+
+</xliff:g>آپ کے محفوظ کردہ فنگر پرنٹس بھی اس آلہ سے ہٹا دیے جائیں گے اور آپ ان سے اپنے فون کو غیر مقفل، خریداریوں کی اجازت یا ایپس میں سائن ان نہیں کر پائیں گے۔"</string>
     <string name="unlock_disable_frp_warning_content_password" msgid="5420612686852555537">"آلہ کے تحفظ کی خصوصیات آپ کے پاس ورڈ کے بغیر کام نہیں کریں گی۔"</string>
-    <!-- no translation found for unlock_disable_frp_warning_content_password_fingerprint (3595476296430536798) -->
-    <skip />
+    <string name="unlock_disable_frp_warning_content_password_fingerprint" msgid="3595476296430536798">"آلہ کے تحفظ کی خصوصیات آپ کے پاس ورڈ کے بغیر کام نہیں کریں گی۔<xliff:g id="EMPTY_LINE">
+
+</xliff:g>آپ کے محفوظ کردہ فنگر پرنٹس بھی اس آلہ سے ہٹا دیے جائیں گے اور آپ ان سے اپنے فون کو غیر مقفل، خریداریوں کی اجازت یا ایپس میں سائن ان نہیں کر پائیں گے۔"</string>
     <string name="unlock_disable_frp_warning_content_unknown" msgid="1550718040483548220">"آلہ کے تحفظ کی خصوصیات آپ کے اسکرین قفل کے بغیر کام نہیں کریں گی۔"</string>
-    <!-- no translation found for unlock_disable_frp_warning_content_unknown_fingerprint (3679351662094349506) -->
-    <skip />
+    <string name="unlock_disable_frp_warning_content_unknown_fingerprint" msgid="3679351662094349506">"آلہ کے تحفظ کی خصوصیات آپ کے اسکرین لاک کے بغیر کام نہیں کریں گی۔<xliff:g id="EMPTY_LINE">
+
+</xliff:g>آپ کے محفوظ کردہ فنگر پرنٹس بھی اس آلہ سے ہٹا دیے جائیں گے اور آپ ان سے اپنے فون کو غیر مقفل، خریداریوں کی اجازت یا ایپس میں سائن ان نہیں کر پائیں گے۔"</string>
     <string name="unlock_disable_frp_warning_content_pattern_profile" msgid="8682200103576359918">"پروفائل کے تحفظ کی خصوصیات آپ کے پیٹرن کے بغیر کام نہیں کریں گی۔"</string>
-    <!-- no translation found for unlock_disable_frp_warning_content_pattern_fingerprint_profile (6718155854303231675) -->
-    <skip />
+    <string name="unlock_disable_frp_warning_content_pattern_fingerprint_profile" msgid="6718155854303231675">"پروفائل کے تحفظ کی خصوصیات آپ کے پیٹرن کے بغیر کام نہیں کریں گی۔<xliff:g id="EMPTY_LINE">
+
+</xliff:g>آپ کے محفوظ کردہ فنگر پرنٹس بھی اس پروفائل سے ہٹا دیے جائیں گے اور آپ ان سے اپنے پروفائل کو غیر مقفل، خریداریوں کی اجازت یا ایپس میں سائن ان نہیں کر پائیں گے۔"</string>
     <string name="unlock_disable_frp_warning_content_pin_profile" msgid="7790688070593867767">"‏پروفائل کے تحفظ کی خصوصیات آپ کی PIN کے بغیر کام نہیں کریں گی۔"</string>
-    <!-- no translation found for unlock_disable_frp_warning_content_pin_fingerprint_profile (4209564603132870532) -->
-    <skip />
+    <string name="unlock_disable_frp_warning_content_pin_fingerprint_profile" msgid="4209564603132870532">"‏پروفائل کے تحفظ کی خصوصیات آپ کے PIN کے بغیر کام نہیں کریں گی۔<xliff:g id="EMPTY_LINE">
+
+</xliff:g>آپ کے محفوظ کردہ فنگر پرنٹس بھی اس پروفائل سے ہٹا دیے جائیں گے اور آپ ان سے اپنے پروفائل کو غیر مقفل، خریداریوں کی اجازت یا ایپس میں سائن ان نہیں کر پائیں گے۔"</string>
     <string name="unlock_disable_frp_warning_content_password_profile" msgid="7569285520567674461">"پروفائل کے تحفظ کی خصوصیات آپ کے پاسورڈ کے بغیر کام نہیں کریں گی۔"</string>
-    <!-- no translation found for unlock_disable_frp_warning_content_password_fingerprint_profile (2994300676764706047) -->
-    <skip />
+    <string name="unlock_disable_frp_warning_content_password_fingerprint_profile" msgid="2994300676764706047">"پروفائل کے تحفظ کی خصوصیات آپ کے پاسورڈ کے بغیر کام نہیں کریں گی۔<xliff:g id="EMPTY_LINE">
+
+</xliff:g>آپ کے محفوظ کردہ فنگر پرنٹس بھی اس پروفائل سے ہٹا دیے جائیں گے اور آپ ان سے اپنے پروفائل کو غیر مقفل، خریداریوں کی اجازت یا ایپس میں سائن ان نہیں کر پائیں گے۔"</string>
     <string name="unlock_disable_frp_warning_content_unknown_profile" msgid="6984215718701688202">"پروفائل کے تحفظ کی خصوصیات آپ کے اسکرین قفل کے بغیر کام نہیں کریں گی۔"</string>
-    <!-- no translation found for unlock_disable_frp_warning_content_unknown_fingerprint_profile (4994062501123299418) -->
-    <skip />
+    <string name="unlock_disable_frp_warning_content_unknown_fingerprint_profile" msgid="4994062501123299418">"پروفائل کے تحفظ کی خصوصیات آپ کے اسکرین لاک کے بغیر کام نہیں کریں گی۔<xliff:g id="EMPTY_LINE">
+
+</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">"‏غیر مقفل کرنے کا PIN تبدیل کریں"</string>
@@ -581,6 +593,7 @@
     <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="lockpassword_clear_label" msgid="5724429464960458155">"صاف کریں"</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>
@@ -774,6 +787,7 @@
     <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,6 +824,8 @@
     <string name="wifi_wps_available_first_item" msgid="4422547079984583502">"‏WPS دستیاب ہے"</string>
     <string name="wifi_wps_available_second_item" msgid="8427520131718215301">" ‏ (WPS دستیاب ہے)"</string>
     <string name="wifi_wps_nfc_enter_password" msgid="2288214226916117159">"اپنا نیٹ ورک پاس ورڈ درج کریں"</string>
+    <string name="wifi_carrier_connect" msgid="8174696557882299911">"‏کیریئر Wi‑Fi نیٹ ورک"</string>
+    <string name="wifi_carrier_content" msgid="4634077285415851933">"منسلک ہوں بذریعہ <xliff:g id="NAME">%1%s</xliff:g>"</string>
     <string name="wifi_scan_always_turnon_message" msgid="203123538572122989">"‏مقام کی قطعیت کو بہتر بنانے اور دوسرے مقاصد کیلئے، <xliff:g id="APP_NAME">%1$s</xliff:g> Wi-Fi بند ہونے پر بھی نیٹ ورک اسکیننگ آن کرنا چاہتی ہے۔\n\nاسکین کرنے کی خواہاں سبھی ایپس کیلئے اس کی اجازت دیں؟"</string>
     <string name="wifi_scan_always_turnoff_message" msgid="5538901671131941043">"اسے آف کرنے کیلئے، اوور فلو مینو میں ایڈوانسڈ پر جائیں۔"</string>
     <string name="wifi_scan_always_confirm_allow" msgid="5355973075896817232">"اجازت دیں"</string>
@@ -827,6 +843,7 @@
     <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_modify" msgid="6100248070440710782">"ترمیم کریں"</string>
     <string name="wifi_failed_forget_message" msgid="1348172929201654986">"نیٹ ورک کو بھولنے میں ناکام ہوگیا"</string>
     <string name="wifi_save" msgid="3331121567988522826">"محفوظ کریں"</string>
     <string name="wifi_failed_save_message" msgid="6650004874143815692">"نیٹ ورک محفوظ کرنے میں ناکام ہوگیا"</string>
@@ -839,6 +856,7 @@
     <string name="wifi_advanced_titlebar" msgid="4485841401774142908">"‏جدید 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_title" msgid="3471132676909349382">"نیٹ ورک کی معلومات"</string>
     <string name="wifi_details_subnet_mask" msgid="6720279144174924410">"سب نیٹ ماسک"</string>
     <string name="wifi_details_dns" msgid="8648826607751830768">"DNS"</string>
     <string name="wifi_details_ipv6_address_header" msgid="6734119149106422148">"‏IPv6  پتے"</string>
@@ -871,16 +889,15 @@
     <string name="wifi_p2p_cancel_connect_title" msgid="255267538099324413">"دعوت منسوخ کریں؟"</string>
     <string name="wifi_p2p_cancel_connect_message" msgid="7477756213423749402">"کیا آپ <xliff:g id="PEER_NAME">%1$s</xliff:g> کے ساتھ مربوط ہونے کی دعوت منسوخ کرنا چاہتے ہیں؟"</string>
     <string name="wifi_p2p_delete_group_message" msgid="834559380069647086">"اس گروپ کو بھول جائیں؟"</string>
-    <string name="wifi_tether_checkbox_text" msgid="1847167643625779136">"‏پورٹیبل Wi‑Fi ہاٹ اسپاٹ"</string>
     <string name="wifi_hotspot_checkbox_text" msgid="7763495093333664887">"‏Wi‑Fi ہاٹ اسپاٹ"</string>
     <string name="wifi_hotspot_off_subtext" msgid="5466126533609394170">"دیگر آلات کے ساتھ انٹرنیٹ یا مواد کا اشتراک نہیں ہو رہا ہے"</string>
     <string name="wifi_hotspot_tethering_on_subtext" product="tablet" msgid="5752490509369962007">"ہاٹ اسپاٹ کے ذریعے اس ٹیبلیٹ کے انٹرنیٹ کنکشن کا اشتراک ہو رہا ہے"</string>
     <string name="wifi_hotspot_tethering_on_subtext" product="default" msgid="6461075246164300670">"ہاٹ اسپاٹ کے ذریعے اس فون کے انٹرنیٹ کنکشن کا اشتراک ہو رہا ہے"</string>
     <string name="wifi_hotspot_on_local_only_subtext" msgid="2068110388011294735">"ایپ مواد کا اشتراک کر رہی ہے۔ انٹرنیٹ کنکشن کا اشتراک کرنے کے لیے، ہاٹ اسپاٹ آف کر کے آن کریں"</string>
-    <string name="wifi_hotspot_name_title" msgid="1341735529132128887">"‏Wi‑Fi کا نام"</string>
+    <string name="wifi_hotspot_name_title" msgid="8237000746618636778">"ہاٹ اسپاٹ کا نام"</string>
     <string name="wifi_hotspot_name_summary_connecting" msgid="3378299995508671967">"<xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g> آن ہو رہا ہے..."</string>
     <string name="wifi_hotspot_name_summary_connected" msgid="3888672084861445362">"دیگر آلات <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g> سے منسلک ہو سکتی ہیں"</string>
-    <string name="wifi_hotspot_password_title" msgid="1955592302902091281">"‏Wi-Fi پاس ورڈ"</string>
+    <string name="wifi_hotspot_password_title" msgid="8676859981917573801">"ہاٹ اسپاٹ کا پاس ورڈ"</string>
     <string name="wifi_hotspot_ap_band_title" msgid="1165801173359290681">"‏AP بینڈ"</string>
     <string name="wifi_hotspot_footer_info_regular" msgid="1203489406068036455">"‏اپنے دیگر آلات کیلئے Wi‑Fi نیٹ ورک بنانے کی خاطر ہاٹ اسپاٹ کا استعمال کریں۔ ہاٹ اسپاٹ آپ کے موبائل ڈیٹا کنکشن کا استعمال کر کے انٹرنیٹ فراہم کرتا ہے۔ اضافی موبائل ڈیٹا کے چارجز عائد ہو سکتے ہیں۔"</string>
     <string name="wifi_hotspot_footer_info_local_only" msgid="857988412470694109">"قریبی آلات کے ساتھ مواد کا اشتراک کرنے کے لیے ایپس ایک ہاٹ اسپاٹ بنا سکتی ہیں۔"</string>
@@ -891,7 +908,6 @@
     <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">"‏Wi-Fi کالنگ"</string>
     <string name="wifi_calling_suggestion_title" msgid="9008010480466359578">"‏Wi-Fi کالنگ آن کریں"</string>
@@ -932,7 +948,7 @@
     <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="emergency_address_summary" msgid="3266760199681945746">"‏اگر آپ Wi-Fi استعمال کر کے ایمرجنسی کال کرتے ہیں تو ایمرجنسی سروسز کی جانب آپ کا پتہ آپ کے مقام کے طور پر استعمال ہوتا ہے"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"ڈسپلے"</string>
     <string name="sound_settings" msgid="5534671337768745343">"آواز"</string>
     <string name="all_volume_title" msgid="4296957391257836961">"والیومز"</string>
@@ -986,6 +1002,7 @@
     <string name="search_settings" msgid="1910951467596035063">"تلاش کریں"</string>
     <string name="search_settings_summary" msgid="9205656546570654169">"تلاش کی ترتیبات اور سرگزشت کا نظم کریں"</string>
     <string name="search_settings_no_results" msgid="8799027492641230999">"کوئی نتائج نہیں"</string>
+    <string name="search_clear_history" msgid="4196658962573162457">"سرگزشت صاف کریں"</string>
     <string name="display_settings" msgid="7965901687241669598">"ڈسپلے"</string>
     <string name="accelerometer_title" msgid="7854608399547349157">"اسکرین کو خود کار طور پر گھمائیں"</string>
     <string name="color_mode_title" msgid="3159275920408338215">"بھڑکیلے رنگ"</string>
@@ -1056,15 +1073,13 @@
     <string name="automatic_brightness" msgid="5014143533884135461">"خود کار چمک"</string>
     <string name="lift_to_wake_title" msgid="4555378006856277635">"جگانے کیلئے اٹھائیں"</string>
     <string name="ambient_display_screen_title" msgid="4252755516328775766">"ايمبيئنٹ ڈسپلے"</string>
-    <!-- no translation found for ambient_display_screen_summary_always_on (7337555569694794132) -->
-    <skip />
+    <string name="ambient_display_screen_summary_always_on" msgid="7337555569694794132">"ہمیشہ آن/اضافی بیٹری کا استعمال"</string>
     <string name="ambient_display_screen_summary_notifications" msgid="1449570742600868654">"نئی اطلاعات"</string>
     <string name="ambient_display_category_triggers" msgid="4359289754456268573">"دکھانے کا وقت"</string>
     <string name="doze_title" msgid="2375510714460456687">"نئی اطلاعات"</string>
     <string name="doze_summary" msgid="3846219936142814032">"اطلاعات موصول ہونے پر اسکرین کو جگائیں"</string>
     <string name="doze_always_on_title" msgid="1046222370442629646">"ہمیشہ آن"</string>
-    <!-- no translation found for doze_always_on_summary (6978257596231155345) -->
-    <skip />
+    <string name="doze_always_on_summary" msgid="6978257596231155345">"وقت، اطلاعاتی آئیکنز اور دیگر معلومات دکھائیں۔ اضافی بیٹری کا استعمال۔"</string>
     <string name="title_font_size" msgid="4405544325522105222">"فونٹ سائز"</string>
     <string name="short_summary_font_size" msgid="6819778801232989076">"متن کو چھوٹا یا بڑا کریں"</string>
     <string name="sim_lock_settings" msgid="3392331196873564292">"‏SIM کارڈ لاک کی ترتیبات"</string>
@@ -1117,7 +1132,6 @@
     <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>
     <string name="device_status_activity_title" msgid="1411201799384697904">"اسٹیٹس"</string>
     <string name="device_status" msgid="607405385799807324">"اسٹیٹس"</string>
@@ -1145,7 +1159,6 @@
     <string name="status_wifi_mac_address" msgid="2202206684020765378">"‏Wi‑Fi MAC پتہ"</string>
     <string name="status_bt_address" msgid="4195174192087439720">"بلوٹوتھ پتہ"</string>
     <string name="status_serial_number" msgid="2257111183374628137">"سیریل نمبر"</string>
-    <string name="status_unavailable" msgid="7862009036663793314">"غیر دستیاب"</string>
     <string name="status_up_time" msgid="7294859476816760399">"چلنے کا وقت"</string>
     <string name="status_awake_time" msgid="2393949909051183652">"بیداری کا وقت"</string>
     <string name="internal_memory" msgid="9129595691484260784">"داخلی اسٹوریج"</string>
@@ -1321,6 +1334,7 @@
     <string name="menu_restore" msgid="8260067415075573273">"ڈیفالٹ پر دوبارہ ترتیب دیں"</string>
     <string name="restore_default_apn_completed" msgid="2824775307377604897">"‏ڈیفالٹ APN ترتیبات کو دوبارہ ترتیب دینے کا عمل مکمل ہو گیا۔"</string>
     <string name="reset_dashboard_title" msgid="6254873816990678620">"ری سیٹ کے اختیارات"</string>
+    <string name="reset_dashboard_summary" msgid="4851012632493522755">"نیٹ ورک، ایپس، یا آلہ کو ری سیٹ کیا جا سکتا ہے"</string>
     <string name="reset_network_title" msgid="6166025966016873843">"‏Wi-Fi، موبائل اور بلوٹوتھ کو دوبارہ ترتیب دیں"</string>
     <string name="reset_network_desc" msgid="5547979398298881406">"‏یہ نیٹ ورک کی سبھی ترتیبات کو دوبارہ ترتیب دے گا، بشمول:\n\n"<li>"Wi‑Fi"</li>\n<li>"موبائل ڈیٹا"</li>\n<li>"بلوٹوتھ"</li></string>
     <string name="reset_network_button_text" msgid="2035676527471089853">"ترتیبات دوبارہ ترتیب دیں"</string>
@@ -1329,17 +1343,14 @@
     <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="6617679904229218425">"سبھی ڈیٹا (فیکٹری ری سیٹ) کو حذف کریں"</string>
-    <plurals name="master_clear_with_account_summary" formatted="false" msgid="5911377203778818712">
-      <item quantity="other"><xliff:g id="ACCOUNT_COUNT">%1$d</xliff:g> اکاؤنٹس ری سیٹ کئے جائیں گے</item>
-      <item quantity="one">1 اکاؤنٹ ری سیٹ کیا جائے گا</item>
-    </plurals>
-    <string name="master_clear_summary" msgid="6902443944660426951">"داخلی اسٹوریج اور تمام ڈیٹا ری سیٹ کئے جائیں گے"</string>
+    <string name="master_clear_title" msgid="3531267871084279512">"تمام ڈیٹا (فیکٹری ری سیٹ) حذف کریں"</string>
     <string name="master_clear_desc" product="tablet" msgid="9146059417023157222">"‏یہ آپ کے ٹیبلٹ کے "<b>"داخلی اسٹوریج"</b>" سے سبھی ڈیٹا کو حذف کر دے گا، بشمول:\n\n"<li>"آپ کا Google اکاؤنٹ"</li>\n<li>"سسٹم اور ایپ ڈیٹا اور ترتیبات"</li>\n<li>"ڈاؤن لوڈ کردہ ایپس"</li></string>
     <string name="master_clear_desc" product="default" msgid="4800386183314202571">"‏یہ آپ کے فون کے "<b>"داخلی اسٹوریج"</b>" سے سبھی ڈیٹا کو حذف کر دے گا، بشمول:\n\n"<li>"آپ کا Google اکاؤنٹ"</li>\n<li>"سسٹم اور ایپ ڈیٹا اور ترتیبات"</li>\n<li>"ڈاؤن لوڈ کردہ ایپس"</li></string>
     <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"آپ فی الحال مندرجہ ذیل اکاؤنٹس میں سائن ان ہیں:\n"</string>
     <string name="master_clear_other_users_present" product="default" msgid="5161423070702470742">\n\n"اس آلہ پر دوسرے صارفین موجود ہیں۔\n"</string>
     <string name="master_clear_desc_also_erases_external" msgid="1903185203791274237"><li>"موسیقی"</li>\n<li>"تصاویر"</li>\n<li>"صارف کا دیگر ڈیٹا"</li></string>
+    <string name="master_clear_desc_also_erases_esim" msgid="312352697653096008">"‏"<li>"eSIM پر موجود کیریئرس"</li></string>
+    <string name="master_clear_desc_no_cancel_mobile_plan" msgid="5460926449093211144">\n\n"اس سے آپ کے موبائل سروس کا پلان منسوخ نہیں ہوگا۔"</string>
     <string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="7744115866662613411">"‏\n\nموسیقی، تصاویر اور صارف کا دیگر ڈیٹا، "<b>"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>
@@ -1360,26 +1371,26 @@
     <string name="master_clear_progress_text" msgid="6559096229480527510">"براہ کرم انتظار کریں…"</string>
     <string name="call_settings_title" msgid="5188713413939232801">"کال کی ترتیبات"</string>
     <string name="call_settings_summary" msgid="7291195704801002886">"‏صوتی میل، کال فاورڈنگ، کال ویٹنگ، کالر ID کو ترتیب دیں"</string>
-    <string name="tether_settings_title_usb" msgid="6688416425801386511">"‏USB ٹیتھرنگ"</string>
+    <string name="tether_settings_title_usb" msgid="6688416425801386511">"‏USB ٹیدرنگ"</string>
     <string name="tether_settings_title_wifi" msgid="3277144155960302049">"پورٹیبل ہاٹ اسپاٹ"</string>
-    <string name="tether_settings_title_bluetooth" msgid="355855408317564420">"بلوٹوتھ ٹیتھرنگ"</string>
-    <string name="tether_settings_title_usb_bluetooth" msgid="5355828977109785001">"ٹیتھرنگ"</string>
-    <string name="tether_settings_title_all" msgid="3058586928118801157">"ہاٹ اسپاٹ اور ٹیتھرنگ"</string>
-    <string name="tether_settings_summary_hotspot_on_tether_on" msgid="930464462687425777">"ہاٹ اسپاٹ آن، ٹیتھرنگ"</string>
+    <string name="tether_settings_title_bluetooth" msgid="355855408317564420">"بلوٹوتھ ٹیدرنگ"</string>
+    <string name="tether_settings_title_usb_bluetooth" msgid="5355828977109785001">"ٹیدرنگ"</string>
+    <string name="tether_settings_title_all" msgid="3058586928118801157">"ہاٹ اسپاٹ اور ٹیدرنگ"</string>
+    <string name="tether_settings_summary_hotspot_on_tether_on" msgid="930464462687425777">"ہاٹ اسپاٹ آن، ٹیدرنگ"</string>
     <string name="tether_settings_summary_hotspot_on_tether_off" msgid="3473671453891735907">"ہاٹ اسپاٹ آن ہے"</string>
-    <string name="tether_settings_summary_hotspot_off_tether_on" msgid="1618256180720077354">"ٹیتھرنگ"</string>
+    <string name="tether_settings_summary_hotspot_off_tether_on" msgid="1618256180720077354">"ٹیدرنگ"</string>
     <string name="tether_settings_disabled_on_data_saver" msgid="1576908608463904152">"ڈیٹا سیور آن ہوتے ہوئے ربط نہیں بنایا جا سکتا یا پورٹیبل ہاٹ اسپاٹس استعمال نہیں ہو سکتے"</string>
     <string name="usb_title" msgid="7483344855356312510">"USB"</string>
-    <string name="usb_tethering_button_text" msgid="585829947108007917">"‏USB ٹیتھرنگ"</string>
+    <string name="usb_tethering_button_text" msgid="585829947108007917">"‏USB ٹیدرنگ"</string>
     <string name="usb_tethering_subtext" product="default" msgid="5991482890033484794">"‏USB کے ذریعے فون کے انٹرنیٹ کنیکشن کا اشتراک کریں"</string>
     <string name="usb_tethering_subtext" product="tablet" msgid="5988796139573211318">"‏USB کے ذریعے ٹیبلیٹ کے انٹرنیٹ کنیکشن کا اشتراک کریں"</string>
-    <string name="bluetooth_tether_checkbox_text" msgid="2379175828878753652">"بلوٹوتھ ٹیتھرنگ"</string>
+    <string name="bluetooth_tether_checkbox_text" msgid="2379175828878753652">"بلوٹوتھ ٹیدرنگ"</string>
     <string name="bluetooth_tethering_subtext" product="tablet" msgid="4558227863463153412">"بلوٹوتھ کے ذریعے ٹیبلیٹ کے انٹرنیٹ کنکشن کا اشتراک کریں"</string>
     <string name="bluetooth_tethering_subtext" product="default" msgid="1055197887836203595">"بلوٹوتھ کے ذریعے فون کے انٹرنیٹ کنکشن کا اشتراک کریں"</string>
     <string name="bluetooth_tethering_off_subtext_config" msgid="6326877798974938021">"اس <xliff:g id="DEVICE_NAME">%1$d</xliff:g> کے انٹرنیٹ کنکشن کا بلوٹوتھ کے ذریعے اشتراک کیا جا رہا ہے"</string>
     <string name="bluetooth_tethering_overflow_error" msgid="2135590598511178690">"<xliff:g id="MAXCONNECTION">%1$d</xliff:g> سے زیادہ آلات کو مربوط نہیں کر سکتے۔"</string>
     <string name="bluetooth_untether_blank" msgid="2871192409329334813">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> کا ربط ختم کر دیا جائے گا۔"</string>
-    <string name="tethering_footer_info" msgid="1308462275952345985">"اپنے موبائل ڈیٹا کنکشن کے ذریعے دیگر آلات کو انٹرنیٹ فراہم کرنے کیلئے ہاٹ اسپاٹ اور ٹیتھرنگ کا استعمال کریں۔ قریبی آلات کے ساتھ مواد کا اشتراک کرنے کے لیے ایپس ایک ہاٹ اسپاٹ بھی بنا سکتی ہیں۔"</string>
+    <string name="tethering_footer_info" msgid="1308462275952345985">"اپنے موبائل ڈیٹا کنکشن کے ذریعے دیگر آلات کو انٹرنیٹ فراہم کرنے کیلئے ہاٹ اسپاٹ اور ٹیدرنگ کا استعمال کریں۔ قریبی آلات کے ساتھ مواد کا اشتراک کرنے کے لیے ایپس ایک ہاٹ اسپاٹ بھی بنا سکتی ہیں۔"</string>
     <string name="tethering_help_button_text" msgid="656117495547173630">"مدد"</string>
     <string name="network_settings_title" msgid="2876509814832830757">"موبائل نیٹ ورک"</string>
     <string name="manage_mobile_plan_title" msgid="7630170375010107744">"موبائل پلان"</string>
@@ -1439,7 +1450,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>
@@ -1456,15 +1467,16 @@
     <string name="settings_safetylegal_activity_title" msgid="6901214628496951727">"حفاظت سے متعلق معلومات"</string>
     <string name="settings_safetylegal_activity_unreachable" msgid="250674109915859456">"‏آپ کے پاس ڈيٹا کنکشن نہيں ہے۔ اس معلومات کو ابھی دیکھنے کیلئے، انٹرنیٹ سے مربوط کسی بھی کمپیوٹر سے ‎%s پر جائیں۔"</string>
     <string name="settings_safetylegal_activity_loading" msgid="8059022597639516348">"لوڈ ہو رہا ہے…"</string>
-    <string name="lockpassword_choose_your_password_header" msgid="8624900666929394990">"اپنا پاس ورڈ منتخب کریں"</string>
-    <string name="lockpassword_choose_your_password_header_for_fingerprint" msgid="6624409510609085450">"فنگر پرنٹ کے استعمال کے لیے پاسورڈ سیٹ کریں"</string>
-    <string name="lockpassword_choose_your_pattern_header" msgid="6949761069941694050">"اپنا پیٹرن منتخب کریں"</string>
-    <string name="lockpassword_choose_your_pattern_header_for_fingerprint" msgid="5901096361617543819">"فنگر پرنٹ کے استعمال کے لیے پیٹرن سیٹ کریں"</string>
-    <string name="lockpassword_choose_your_pin_header" msgid="7598849519816138302">"‏اپنا PIN منتخب کریں"</string>
-    <string name="lockpassword_choose_your_pin_header_for_fingerprint" msgid="765344692615917183">"‏فنگر پرنٹ کے استعمال کے لیے PIN سیٹ کریں"</string>
-    <string name="lockpassword_confirm_your_password_header" msgid="6308478184889846633">"اپنے پاس ورڈ کی توثیق کریں"</string>
+    <string name="lockpassword_choose_your_screen_lock_header" msgid="3872462096767152394">"اسکرین لاک سیٹ کریں"</string>
+    <string name="lockpassword_choose_your_password_message" msgid="1197569283524841412">"سیکیورٹی کیلئے پاسورڈ سیٹ کریں"</string>
+    <string name="lockpassword_choose_your_password_header_for_fingerprint" msgid="2541818487015343503">"فنگر پرنٹ کے لئے پاس ورڈ سیٹ کریں"</string>
+    <string name="lockpassword_choose_your_pattern_header_for_fingerprint" msgid="7709785406243556723">"فنگر پرنٹ کے لئے پیٹرن سیٹ کریں"</string>
+    <string name="lockpassword_choose_your_pin_message" msgid="1875420718677275646">"‏سیکیورٹی کیلئے PIN سیٹ کریں"</string>
+    <string name="lockpassword_choose_your_pin_header_for_fingerprint" msgid="1549639053195796674">"‏فنگر پرنٹ کے استعمال کے لیے PIN سیٹ کریں"</string>
+    <string name="lockpassword_choose_your_pattern_message" msgid="5986983400689720015">"سیکیورٹی کیلئے پیٹرن سیٹ کریں"</string>
+    <string name="lockpassword_confirm_your_password_header" msgid="1266027268220850931">"اپنا پاس ورڈ دوبارہ درج کریں"</string>
     <string name="lockpassword_confirm_your_pattern_header" msgid="7543433733032330821">"اپنے پیٹرن کی توثیق کریں"</string>
-    <string name="lockpassword_confirm_your_pin_header" msgid="49038294648213197">"‏اپنے PIN کی توثیق کریں"</string>
+    <string name="lockpassword_confirm_your_pin_header" msgid="7744513791910572550">"‏اپنا PIN دوبارہ درج کریں"</string>
     <string name="lockpassword_confirm_passwords_dont_match" msgid="5140892109439191415">"پاس ورڈز مماثل نہیں ہیں"</string>
     <string name="lockpassword_confirm_pins_dont_match" msgid="7226244811505606217">"‏PINs مماثل نہیں ہیں"</string>
     <string name="lockpassword_choose_lock_generic_header" msgid="3811438094903786145">"غیر مقفل کرنے کیلئے انتخاب"</string>
@@ -1477,18 +1489,18 @@
     <string name="lockpassword_confirm_your_pattern_generic_profile" msgid="4435638308193361861">"جاری رکھنے کیلئے اپنا دفتری پیٹرن استعمال کریں"</string>
     <string name="lockpassword_confirm_your_pin_generic_profile" msgid="3730141667547002246">"‏جاری رکھنے کیلئے اپنا دفتری PIN درج کریں"</string>
     <string name="lockpassword_confirm_your_password_generic_profile" msgid="4250642723467019894">"جاری رکھنے کیلئے اپنا دفتری پاسورڈ درج کریں"</string>
-    <!-- no translation found for lockpassword_strong_auth_required_device_pattern (530802132223800623) -->
-    <skip />
-    <!-- no translation found for lockpassword_strong_auth_required_device_pin (7829294830078036417) -->
-    <skip />
-    <!-- no translation found for lockpassword_strong_auth_required_device_password (3552644641574796973) -->
-    <skip />
-    <!-- no translation found for lockpassword_strong_auth_required_work_pattern (3003781907040522053) -->
-    <skip />
-    <!-- no translation found for lockpassword_strong_auth_required_work_pin (3367491332598821552) -->
-    <skip />
-    <!-- no translation found for lockpassword_strong_auth_required_work_password (8159775129968582940) -->
-    <skip />
+    <string name="lockpassword_strong_auth_required_device_pattern" msgid="530802132223800623">"اضافی سیکیورٹی کیلئے اپنے آلہ کا پیٹرن استعمال کریں"</string>
+    <string name="lockpassword_strong_auth_required_device_pin" msgid="7829294830078036417">"‏اضافی سیکیورٹی کیلئے اپنے آلہ کا PIN درج کریں"</string>
+    <string name="lockpassword_strong_auth_required_device_password" msgid="3552644641574796973">"اضافی سیکیورٹی کیلئے، اپنے آلہ کا پاس ورڈ درج کریں"</string>
+    <string name="lockpassword_strong_auth_required_work_pattern" msgid="3003781907040522053">"اضافی سیکیورٹی کیلئے اپنا دفتری پیٹرن استعمال کریں"</string>
+    <string name="lockpassword_strong_auth_required_work_pin" msgid="3367491332598821552">"‏اضافی سیکیورٹی کیلئے اپنا دفتری PIN درج کریں"</string>
+    <string name="lockpassword_strong_auth_required_work_password" msgid="8159775129968582940">"اضافی سیکیورٹی کیلئے اپنا دفتری پاس ورڈ درج کریں"</string>
+    <string name="lockpassword_confirm_your_pattern_details_frp" msgid="6757336656791723193">"آپ کے فون کو فیکٹری ترتیبات پر ری سیٹ کر دیا گیا تھا۔ اس فون کا استعمال کرنے کیلئے، اپنا پچھلا پیٹرن درج کریں۔"</string>
+    <string name="lockpassword_confirm_your_pin_details_frp" msgid="826520613445990470">"‏آپ کے فون کو فیکٹری ترتیبات پر ری سیٹ کر دیا گیا تھا۔ اس فون کا استعمال کرنے کیلئے، اپنا پچھلا PIN درج کریں۔"</string>
+    <string name="lockpassword_confirm_your_password_details_frp" msgid="8944081074615739040">"آپ کے فون کو فیکٹری ترتیبات پر ری سیٹ کر دیا گیا تھا۔ اس فون کا استعمال کرنے کیلئے، اپنا پچھلا پاس ورڈ درج کریں۔"</string>
+    <string name="lockpassword_confirm_your_pattern_header_frp" msgid="2898036091609128286">"پیٹرن کی توثیق کریں"</string>
+    <string name="lockpassword_confirm_your_pin_header_frp" msgid="4141601774778898803">"‏PIN کی توثیق کریں"</string>
+    <string name="lockpassword_confirm_your_password_header_frp" msgid="3762615419295360480">"پاس ورڈ کی توثیق کریں"</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>
@@ -1538,7 +1550,6 @@
     <string name="install_applications_title" msgid="4987712352256508946">"ایپ کے سبھی مآخذ کی اجازت دیں"</string>
     <string name="recent_app_category_title" msgid="6673071268966003928">"حال ہی میں کھولی گئی ایپس"</string>
     <string name="see_all_apps_title" msgid="1317153498074308438">"سبھی <xliff:g id="COUNT">%1$d</xliff:g> ایپس دیکھیں"</string>
-    <string name="recent_app_summary" msgid="3366446669844932300">"<xliff:g id="TIME">^1</xliff:g> قبل"</string>
     <string name="install_all_warning" product="tablet" msgid="8310489909586138165">"آپ کے ٹیبلیٹ اور ذاتی ڈیٹا کو نامعلوم ایپس کی جانب سے حملے کا زیادہ خطرہ ہے۔ اس ذریعے سے ایپس ڈاؤن لوڈ کر کے، آپ اس بات سے اتفاق کرتے ہیں کہ آپ ان ایپس سے اپنے ٹیبلیٹ کو ہونے والے کسی بھی نقصان یا ڈیٹا کے نقصان کیلئے تنہا خود ذمہ دار ہوں گے۔"</string>
     <string name="install_all_warning" product="default" msgid="1952257127370115988">"آپ کے فون اور ذاتی ڈیٹا کو نامعلوم ایپس کی جانب سے حملے کا زیادہ خطرہ ہے۔ اس ذریعے سے ایپس ڈاؤن لوڈ کر کے، آپ اس بات سے اتفاق کرتے ہیں کہ آپ ان ایپس سے اپنے فون کو ہونے والے کسی بھی نقصان یا ڈیٹا کے نقصان کیلئے تنہا خود ذمہ دار ہوں گے۔"</string>
     <string name="advanced_settings" msgid="1777249286757067969">"جدید ترین ترتیبات"</string>
@@ -1599,7 +1610,7 @@
     <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="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>
@@ -1802,7 +1813,7 @@
     <string name="accessibility_settings_summary" msgid="981260486011624939">"اسکرین قارئین، ڈسپلے، تعامل کے کنٹرولز"</string>
     <string name="vision_settings_title" msgid="4204111425716868288">"بصارتی ترتیبات"</string>
     <string name="vision_settings_description" msgid="5679491180156408260">"آپ اس آلہ کو اپنی ضروریات کے مطابق حسب ضرورت بنا سکتے ہیں۔ یہ ایکسیسبیلٹی خصوصیات بعد میں ترتیبات میں تبدیل ہو سکتی ہیں۔"</string>
-    <string name="vision_settings_suggestion_title" msgid="917294957154878441">"فونٹ سائز بڑھائیں"</string>
+    <string name="vision_settings_suggestion_title" msgid="8058794060304707004">"فونٹ سائز تبدیل کریں"</string>
     <string name="screen_reader_category_title" msgid="7739154903913400641">"قارئین اسکرین"</string>
     <string name="audio_and_captions_category_title" msgid="3420727114421447524">"آڈیو اور اسکرین پر موجود ٹیکسٹ"</string>
     <string name="display_category_title" msgid="685461049938269166">"ڈسپلے"</string>
@@ -1839,7 +1850,6 @@
     <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="preference_summary_default_combination" msgid="8532964268242666060">"<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>
@@ -1958,12 +1968,14 @@
     <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_whitelisted" msgid="7375400051141016808">"بیٹری کے استعمال کے لئے ایپس کو بہتر نہیں بنایا جا سکتا"</string>
+    <string name="background_activity_warning_dialog_title" msgid="2216249969149568871">"پس منظر کی سرگرمی کو محدود کریں؟"</string>
+    <string name="background_activity_warning_dialog_text" msgid="7049624449246121981">"اگر آپ کسی ایپ کی پس منظر کی سرگرمی کو محدود کرتے ہیں تو یہ غلط برتاؤ کر سکتی ہے"</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" msgid="6393929085382334341">"مکمل چارج کے بعد سے ایپ کا استعمال (<xliff:g id="RELATIVE_TIME">^1</xliff:g>)"</string>
+    <string name="power_usage_list_summary_device" msgid="4461926045610455423">"مکمل چارج کے بعد سے آلہ کا استعمال (<xliff:g id="RELATIVE_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>
@@ -2209,14 +2221,14 @@
     <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">"‏اس سے پہلے کہ آپ اسنادات اسٹوریج کا استعمال کر سکیں آپ کو اسکرین مقفل کرنے کا ایک PIN یا پاس ورڈ سیٹ کرنا ہوگا۔"</string>
+    <string name="credentials_configure_lock_screen_hint" msgid="8058230497337529036">"آپ کے اسنادات اسٹوریج استعمال کرنے سے پہلے، آپ کے آلہ میں ایک محفوظ مقفل انسکرین ہونا ضروری ہے"</string>
+    <string name="credentials_configure_lock_screen_button" msgid="253239765216055321">"لاک سیٹ کریں"</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>
@@ -2336,8 +2348,6 @@
     <skip />
     <string name="cant_sync_dialog_title" msgid="2777238588398046285">"دستی طور پر مطابقت پذیری نہيں کر سکتے"</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 کو شروع کرنے کیلئے، اپنا PIN درج کریں"</string>
     <string name="enter_pattern" msgid="4187435713036808566">"‏Android کو شروع کرنے کیلئے، اپنا پیٹرن ڈرا کریں"</string>
@@ -2351,6 +2361,7 @@
     <string name="misc_files_selected_count" msgid="4647048020823912088">"<xliff:g id="NUMBER">%1$d</xliff:g> از <xliff:g id="TOTAL">%2$d</xliff:g> کو منتخب کیا گیا"</string>
     <string name="misc_files_selected_count_bytes" msgid="2876232009069114352">"<xliff:g id="NUMBER">%1$s</xliff:g> از <xliff:g id="TOTAL">%2$s</xliff:g>"</string>
     <string name="select_all" msgid="1562774643280376715">"سبھی کو منتخب کریں"</string>
+    <string name="data_plan_usage_manage_plans_button_text" msgid="8997761990902708162">"پلانز کا نظم کریں"</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>
@@ -2436,6 +2447,9 @@
     <string name="data_usage_metered_mobile" msgid="5423305619126978393">"موبائل نیٹ ورکس"</string>
     <string name="data_usage_metered_wifi" msgid="1761738002328299714">"‏میٹرڈ Wi‑Fi نیٹ ورکس"</string>
     <string name="data_usage_metered_wifi_disabled" msgid="727808462375941567">"‏میٹرڈ نیٹ ورکس منتخب کرنے کیلئے، Wi‑Fi کو آن کریں۔"</string>
+    <string name="data_usage_metered_auto" msgid="1262028400911918865">"خودکار"</string>
+    <string name="data_usage_metered_yes" msgid="9217539611385225894">"میٹرڈ ہے"</string>
+    <string name="data_usage_metered_no" msgid="4025232961929071789">"میٹرڈ نہیں ہے"</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>
@@ -2527,9 +2541,6 @@
     <string name="backup_pw_set_button_text" msgid="2387480910044648795">"بیک اپ پاس ورڈ سیٹ کریں"</string>
     <string name="backup_pw_cancel_button_text" msgid="8845630125391744615">"منسوخ کریں"</string>
     <string name="additional_system_update_settings_list_item_title" msgid="214987609894661992">"سسٹم کے اضافی اپ ڈیٹس"</string>
-    <string name="selinux_status_disabled" msgid="924551035552323327">"غیر فعال"</string>
-    <string name="selinux_status_permissive" msgid="6004965534713398778">"اجازت دینے والا"</string>
-    <string name="selinux_status_enforcing" msgid="2252703756208463329">"نافذ کر رہا ہے"</string>
     <string name="ssl_ca_cert_warning" msgid="2045866713601984673">"نیٹ ورک کو مانیٹر کیا جا سکتا ہے"</string>
     <string name="done_button" msgid="1991471253042622230">"ہو گیا"</string>
     <plurals name="ssl_ca_cert_dialog_title" formatted="false" msgid="7145092748045794650">
@@ -2725,6 +2736,7 @@
     <string name="dashboard_title" msgid="5453710313046681820">"ترتیبات"</string>
     <!-- String.format failed for translation -->
     <!-- no translation found for settings_suggestion_header_summary_hidden_items (5597356221942118048) -->
+    <string name="dashboard_suggestion_condition_footer_content_description" msgid="2898588191174845961">"سکیڑیں"</string>
     <string name="network_dashboard_title" msgid="4771589228992391573">"نیٹ ورک اور انٹرنیٹ"</string>
     <string name="network_dashboard_summary_mobile" msgid="3851083934739500429">"موبائل"</string>
     <string name="network_dashboard_summary_data_usage" msgid="3843261364705042212">"ڈیٹا کا استعمال"</string>
@@ -2784,8 +2796,7 @@
     <string name="keywords_gesture" msgid="3526905012224714078">"اشارے"</string>
     <string name="keywords_payment_settings" msgid="5220104934130446416">"ادائیگی کریں، تھپتھپائیں، ادائیگیاں"</string>
     <string name="keywords_backup" msgid="470070289135403022">"بیک اپ، بیک اپ لیں"</string>
-    <!-- no translation found for keywords_assist_gesture_launch (813968759791342591) -->
-    <skip />
+    <string name="keywords_assist_gesture_launch" msgid="813968759791342591">"اشارہ"</string>
     <string name="setup_wifi_nfc_tag" msgid="9028353016222911016">"‏Wi-Fi NFC ٹیگ ترتیب دیں"</string>
     <string name="write_tag" msgid="8571858602896222537">"تحریر کریں"</string>
     <string name="status_awaiting_tap" msgid="2130145523773160617">"لکھنے کیلئے ایک ٹیگ کو تھپتھپائیں…"</string>
@@ -2828,8 +2839,14 @@
       <item quantity="other"><xliff:g id="ON_COUNT">%d</xliff:g> خود کار اصول آن ہیں</item>
       <item quantity="one">1 خود کار اصول آن ہے</item>
     </plurals>
-    <string name="zen_mode_settings_title" msgid="842308776768942600">"ڈسٹرب نہ کریں کی ترجیحات"</string>
-    <string name="zen_mode_priority_settings_title" msgid="2623117023031824309">"صرف ترجیحی اجازتیں"</string>
+    <string name="zen_mode_settings_title" msgid="1066226840983908121">"ڈسٹرب نہ کریں"</string>
+    <string name="zen_mode_behavior_settings_title" msgid="1463303933529313969">"برتاؤ"</string>
+    <string name="zen_mode_behavior_allow_title" msgid="3845615648136218141">"اس سے آوازیں اور وائبریشنز کی اجازت دیں"</string>
+    <string name="zen_mode_behavior_no_sound" msgid="1219626004723208056">"کوئی آواز نہیں ہے"</string>
+    <string name="zen_mode_behavior_total_silence" msgid="6716603819806610626">"کوئی آواز نہیں ہے (مکمل خاموشی)"</string>
+    <string name="zen_mode_behavior_no_sound_except" msgid="4968477585788243114">"<xliff:g id="CATEGORIES">%1$s</xliff:g> کے سوا کوئی آواز نہیں ہے"</string>
+    <!-- no translation found for zen_mode_behavior_alarms_only (2423480992071472963) -->
+    <skip />
     <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>
@@ -2871,13 +2888,15 @@
     <string name="notifications_title" msgid="8086372779371204971">"اطلاعات"</string>
     <string name="app_notifications_title" msgid="5810577805218003760">"ایپ کی اطلاعات"</string>
     <string name="notification_channel_title" msgid="2260666541030178452">"اطلاع کا زمرہ"</string>
+    <string name="notification_group_title" msgid="7180506440133859601">"اطلاع کے زمرہ کا گروپ"</string>
     <string name="notification_importance_title" msgid="848692592679312666">"اہمیت"</string>
-    <string name="notification_importance_unspecified" msgid="2196023702875112081">"ایپ کو فیصلہ کرنے دیں"</string>
+    <string name="notification_importance_unspecified" msgid="6622173510486113958">"آواز کی اجازت دیں"</string>
     <string name="notification_importance_blocked" msgid="7938180808339386300">"کبھی اطلاعات نہ دکھائیں"</string>
     <string name="notification_importance_min" msgid="5455049524984686275">"کوئی صوتی یا بصری مداخلت نہیں"</string>
     <string name="notification_importance_low" msgid="8881468429453766553">"کوئی آواز نہیں ہے"</string>
     <string name="notification_importance_default" msgid="5958338024601957516">"آواز نکالیں"</string>
     <string name="notification_importance_high" msgid="2082429479238228527">"آواز نکالیں اور اسکرین پر پاپ کریں"</string>
+    <string name="notification_importance_high_silent" msgid="2667033773703765252">"اسکرین پر دکھائیں"</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>
@@ -2914,15 +2933,19 @@
     <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>
-    <!-- no translation found for picture_in_picture_app_detail_summary (1264019085827708920) -->
-    <skip />
+    <string name="picture_in_picture_app_detail_summary" msgid="1264019085827708920">"ایپ کے کھلے رہنے پر یا آپ کے اسے چھوڑنے کے بعد اس ایپ کو تصویر میں تصویر ونڈو بنانے کی اجازت دیں (مثال کے طور پر، ویڈیو دیکھنا جاری رکھنے کیلئے)۔ یہ ونڈو آپ کے ذریعے استعمال کی جانے والی دیگر ایپس کے اوپری حصے پر ڈسپلے ہوتی ہے۔"</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="channel_group_notifications_off_desc" msgid="1620950416247316370">"‏Android اطلاعات کے اس گروپ کو اس آلہ پر ظاہر ہونے سے مسدود کر رہا ہے"</string>
     <string name="notification_channels" msgid="5346841743182627500">"زمرے"</string>
     <string name="notification_channels_other" msgid="5645317113885788226">"دیگر"</string>
+    <plurals name="notification_group_summary" formatted="false" msgid="3420621520561455358">
+      <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="no_channels" msgid="3077375508177744586">"اس ایپ نے کوئی اطلاعات شائع نہیں کیا ہے"</string>
     <string name="app_settings_link" msgid="8894946007543660906">"ایپ میں اضافی ترتیبات"</string>
     <string name="app_notification_listing_summary_zero" msgid="6482582965081108108">"سبھی ایپس کیلئے آن ہے"</string>
@@ -2999,12 +3022,14 @@
     <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>
+    <!-- no translation found for zen_mode_media_system_other (8900209390529859777) -->
+    <skip />
     <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="239685342222975733">"ایک ہی شخص کے <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>
@@ -3033,6 +3058,7 @@
     <string name="zen_mode_screen_off_visual_interruptions" msgid="4850792880144382633">"جب اسکرین آف ہو"</string>
     <string name="zen_mode_no_visual_interruptions" msgid="8742776003822778472">"جب اسکرین آن یا آف ہو"</string>
     <string name="notification_app_settings_button" msgid="6685640230371477485">"اطلاع کی ترتیبات"</string>
+    <string name="suggestion_button_text" msgid="3275010948381252006">"ٹھیک ہے"</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>
@@ -3212,11 +3238,12 @@
     <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="sms_mirroring_pref" msgid="6475043279147376031">"‏SMS مررنگ"</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>
@@ -3283,7 +3310,7 @@
     <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="permit_write_settings" msgid="658555006453212691">"سسٹم کی ترتیبات میں ترمیم کرنے کی اجازت دیں"</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>
@@ -3378,9 +3405,12 @@
     <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="connectivity_monitor_switch" msgid="9059759348648583421">"کنیکٹوٹی مانیٹر"</string>
+    <string name="connectivity_monitor_switch_summary" msgid="2828658652378866401">"کنیکٹوٹی کے ساتھ در پیش مسئلہ کا پتہ چلنے پر کنیکٹوٹی مانیٹر لاگز اکٹھا کر کے بگ دائر کرنے کیلئے صارف کو اطلاع بھیجے گا"</string>
+    <string name="connectivity_monitor_toast" msgid="5551859612881173028">"کنیکٹوٹی مانیٹر کی تبدیلی لاگو کرنے کیلئے، آلہ ریبوٹ کریں"</string>
     <string name="camera_hal_hdrplus_switch" msgid="8377365197105267466">"‏کیمرا HAL HDR+‎"</string>
     <string name="camera_hal_hdrplus_toast" msgid="2063703797270055299">"‏کیمرا HAL HDR+‎ کی تبدیلی لاگو کرنے کے لیے، آلہ ریبوٹ کریں"</string>
+    <string name="camera_laser_sensor_switch" msgid="8913588990743234440">"کیمرا لیزر سینسر"</string>
     <string name="ota_disable_automatic_update" msgid="2319639631655915050">"خودکار سسٹم اپ ڈیٹس"</string>
     <string name="usage" msgid="2977875522080448986">"استعمال"</string>
     <string name="cellular_data_usage" msgid="2155683719898158203">"موبائل ڈیٹا کا استعمال"</string>
@@ -3394,7 +3424,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_fragment_summary" msgid="8231066353654583106">"ماہانہ <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>
@@ -3403,10 +3433,10 @@
     <string name="operator_warning" msgid="1862988028996859195">"کیریئر ڈیٹا کا حساب آپ کے آلہ کے حساب سے مختلف ہو سکتا ہے"</string>
     <string name="data_used_template" msgid="3245919669966296505">"<xliff:g id="ID_1">%1$s</xliff:g> استعمال ہوا"</string>
     <string name="set_data_warning" msgid="6115364758236594593">"ڈیٹا وارننگ سیٹ کریں"</string>
-    <string name="data_warning" msgid="209133958008062117">"ڈیٹا انتباہ"</string>
+    <string name="data_warning" msgid="209133958008062117">"ڈیٹا وارننگ"</string>
     <string name="set_data_limit" msgid="2901526323210516923">"ڈیٹا کی حد سیٹ کریں"</string>
     <string name="data_limit" msgid="1885406964934590552">"ڈیٹا کی حد"</string>
-    <string name="data_usage_template" msgid="392191945602400904">"<xliff:g id="ID_2">%2$s</xliff:g> کے درمیان <xliff:g id="ID_1">%1$s</xliff:g> استعمال ہوا"</string>
+    <string name="data_usage_template" msgid="2923744765873163859">"<xliff:g id="ID_2">%2$s</xliff:g> کو <xliff:g id="ID_1">%1$s</xliff:g> استعمال ہوا"</string>
     <string name="configure" msgid="1029654422228677273">"کنفیگر کریں"</string>
     <string name="data_usage_other_apps" msgid="3272872663517382050">"استعمال میں شامل دیگر ایپس"</string>
     <plurals name="data_saver_unrestricted_summary" formatted="false" msgid="2635267833484232703">
@@ -3475,7 +3505,7 @@
     <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="387052719462473500">"مقفل اسکرین پر معلومات کنٹرول کریں"</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="8483187649355540109">"سپورٹ اور تجاویز"</string>
@@ -3483,7 +3513,7 @@
     <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>
+    <string name="bluetooth_disabled" msgid="6244000672828617410">"آف"</string>
     <string name="bluetooth_connected_summary" msgid="7672528674593152862">"<xliff:g id="ID_1">%1$s</xliff:g> سے منسلک کردہ"</string>
     <string name="bluetooth_connected_multiple_devices_summary" msgid="9173661896296663932">"متعدد آلات سے منسلک کردہ"</string>
     <string name="demo_mode" msgid="2798762752209330277">"‏سسٹم UI ڈیمو موڈ"</string>
@@ -3585,7 +3615,7 @@
     <string name="web_action_enable_title" msgid="4051513950976670853">"فوری ایپس"</string>
     <string name="web_action_enable_summary" msgid="3108127559723396382">"جو ایپس انسٹال نہیں ہیں، ان میں بھی لنکس کھولیں"</string>
     <string name="web_action_section_title" msgid="7364647086538399136">"فوری ایپس"</string>
-    <string name="instant_apps_account" msgid="1433620209791992528">"فوری ایپس کا اکاؤنٹ"</string>
+    <string name="instant_apps_settings" msgid="8827777916518348213">"فوری ایپس کی ترجیحات"</string>
     <string name="domain_url_section_title" msgid="7046835219056428883">"انسٹال کردہ ایپس"</string>
     <string name="automatic_storage_manager_activation_warning" msgid="6353100011690933254">"آپ کی اسٹوریج کا نظم اب اسٹوریج مینیجر کی جانب سے کیا جا رہا ہے"</string>
     <string name="account_for_section_header" msgid="5356566418548737121">"<xliff:g id="USER_NAME">%1$s</xliff:g> کے لیے اکاؤنٹس"</string>
@@ -3632,7 +3662,9 @@
     <string name="enterprise_privacy_always_on_vpn_personal" msgid="9217774730260037434">"‏ہمیشہ آن VPN آپ کی ذاتی پروفائل میں آن ہو گيا"</string>
     <string name="enterprise_privacy_always_on_vpn_work" msgid="7244472958208315814">"‏ہمیشہ آن VPN آپ کی دفتری پروفائل میں آن ہو گيا"</string>
     <string name="enterprise_privacy_global_http_proxy" msgid="7936664553416257333">"‏عالمی HTTP پراکسی سیٹ ہے"</string>
-    <string name="enterprise_privacy_ca_certs" msgid="5885892204903688909">"بھروسہ مند اسناد"</string>
+    <string name="enterprise_privacy_ca_certs_device" msgid="2019652712782510262">"بھروسہ مند اسناد"</string>
+    <string name="enterprise_privacy_ca_certs_personal" msgid="2279084820904076599">"آپ کے ذاتی پروفائل میں بھروسہ مند اسناد"</string>
+    <string name="enterprise_privacy_ca_certs_work" msgid="6187377647815301809">"آپ کے دفتری پروفائل میں بھروسہ مند اسناد"</string>
     <plurals name="enterprise_privacy_number_ca_certs" formatted="false" msgid="526375234629534165">
       <item quantity="other">‏کم از کم <xliff:g id="COUNT_1">%d</xliff:g> CA سرٹیفکیٹس</item>
       <item quantity="one">‏کم از کم <xliff:g id="COUNT_0">%d</xliff:g> CA سرٹیفکیٹ</item>
@@ -3695,6 +3727,8 @@
     <string name="carrier_provisioning" msgid="4398683675591893169">"کیرئیر فراہمی معلومات"</string>
     <string name="trigger_carrier_provisioning" msgid="3434865918009286187">"ٹرگر کیرئیر فراہمی"</string>
     <string name="new_device_suggestion_title" msgid="698847081680980774">"نیا اور دلچسپ کیا ہے؟"</string>
-    <string name="new_device_suggestion_summary" msgid="7172709269203435870">"سرفہرست 5 خصوصیات دیکھیں"</string>
+    <string name="new_device_suggestion_summary" product="default" msgid="206396571522515855">"اپنے نئے فون کا ایک ٹؤر لیں"</string>
+    <string name="new_device_suggestion_summary" product="tablet" msgid="393751455688210956">"اپنے نئے ٹیبلیٹ کا ایک ٹؤر لیں"</string>
+    <string name="new_device_suggestion_summary" product="device" msgid="2939870049868336652">"اپنے نئے آلے کا ایک ٹؤر لیں"</string>
     <string name="disabled_low_ram_device" msgid="3751578499721173344">"یہ خصوصیت اس آلہ میں دستیاب نہیں ہے"</string>
 </resources>
diff --git a/res/values-uz/arrays.xml b/res/values-uz/arrays.xml
index 31c1102..6acd7c4 100644
--- a/res/values-uz/arrays.xml
+++ b/res/values-uz/arrays.xml
@@ -100,8 +100,6 @@
     <!-- no translation found for wifi_security_no_eap:0 (2084555984818107151) -->
     <!-- no translation found for wifi_security_no_eap:1 (397579322683471524) -->
     <!-- no translation found for wifi_security_no_eap:2 (1968820975358150484) -->
-    <!-- no translation found for wifi_ap_security:0 (5251664683198623324) -->
-    <!-- no translation found for wifi_ap_security:1 (7989073072260294673) -->
   <string-array name="wifi_eap_method">
     <item msgid="1160193392455075561">"PEAP"</item>
     <item msgid="7981731051382306293">"TLS"</item>
diff --git a/res/values-uz/strings.xml b/res/values-uz/strings.xml
index 9b941b4..1ef0005 100644
--- a/res/values-uz/strings.xml
+++ b/res/values-uz/strings.xml
@@ -166,7 +166,7 @@
     <string name="bluetooth_map_acceptance_dialog_text" msgid="8712508202081143737">"%1$s xabarlaringizni ochmoqchi. %2$s‘ga ruxsat berilsinmi?"</string>
     <string name="bluetooth_sap_request" msgid="2669762224045354417">"SIM karta ma’lumotlariga kirish so‘rovi"</string>
     <string name="bluetooth_sap_acceptance_dialog_text" msgid="4414253873553608690">"“<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g>” qurilmasi SIM karta ma’lumotlarini ko‘rmoqchi. SIM karta ma’lumotlarini ko‘rishga ruxsat bersangiz, qurilmangizdagi ulanishlar vaqtincha o‘chib qoladi. “<xliff:g id="DEVICE_NAME_1">%2$s?</xliff:g>” qurilmasiga ruxsat berish."</string>
-    <string name="bluetooth_device_name_summary" msgid="4757990010751789977">"Boshqa qurilmalarga “<xliff:g id="DEVICE_NAME">^1</xliff:g>” sifatida ko‘rinadi"</string>
+    <string name="bluetooth_device_name_summary" msgid="522235742194965734">"Boshqa qurilmalarga “<xliff:g id="DEVICE_NAME">^1</xliff:g>” sifatida ko‘rinadi"</string>
     <string name="bluetooth_paired_device_title" msgid="8638994696317952019">"Qurilmalaringiz"</string>
     <string name="bluetooth_pairing_page_title" msgid="7712127387361962608">"Yangi qurilmani ulash"</string>
     <string name="date_and_time" msgid="9062980487860757694">"Sana va vaqt"</string>
@@ -260,7 +260,7 @@
     <string name="dlg_remove_locales_message" msgid="1361354927342876114">"Matn boshqa tilda ko‘rsatiladi."</string>
     <string name="dlg_remove_locales_error_title" msgid="2653242337224911425">"Barcha tillarni o‘chirib tashlash mumkin emas"</string>
     <string name="dlg_remove_locales_error_message" msgid="6697381512654262821">"Kamida bitta tilni qoldiring"</string>
-    <string name="locale_not_translated" msgid="516862628177166755">"Ba’zi ilovalarda mavjud bo‘lmasligi mumkin"</string>
+    <string name="locale_not_translated" msgid="516862628177166755">"Ayrim ilovalarda mavjud bo‘lmasligi mumkin"</string>
     <string name="action_drag_label_move_up" msgid="9052210023727612540">"Tepaga siljitish"</string>
     <string name="action_drag_label_move_down" msgid="7448713844582912157">"Pastga siljitish"</string>
     <string name="action_drag_label_move_top" msgid="557081389352288310">"Tepaga o‘tkazish"</string>
@@ -312,6 +312,8 @@
     <string name="zone_auto" msgid="334783869352026648">"Avtomatik vaqt mintaqasi"</string>
     <string name="zone_auto_summaryOn" msgid="6142830927278458314">"Tarmoq vaqt mintaqasidan foydalanish"</string>
     <string name="zone_auto_summaryOff" msgid="2597745783162041390">"Tarmoq vaqt mintaqasidan foydalanish"</string>
+    <string name="date_time_24hour_auto" msgid="2117383168985653422">"Avtomatik 24 soatlik format"</string>
+    <string name="date_time_24hour_auto_summary" msgid="6351812925651480277">"Birlamchi hududiy sozlamalar"</string>
     <string name="date_time_24hour_title" msgid="3203537578602803850">"24 soatlik format"</string>
     <string name="date_time_24hour" msgid="1193032284921000063">"24 soatlik format"</string>
     <string name="date_time_set_time_title" msgid="6296795651349047016">"Vaqt"</string>
@@ -341,8 +343,7 @@
     <string name="Accounts_settings_title" msgid="1643879107901699406">"Hisoblar"</string>
     <string name="location_settings_title" msgid="1369675479310751735">"Joylashuv"</string>
     <string name="account_settings_title" msgid="626177544686329806">"Hisoblar"</string>
-    <!-- no translation found for security_settings_title (4918904614964215087) -->
-    <skip />
+    <string name="security_settings_title" msgid="4918904614964215087">"Xavfsizlik va joylashuv"</string>
     <string name="encryption_and_credential_settings_title" msgid="6514904533438791561">"Shifrlash va hisob ma’lumotlari"</string>
     <string name="encryption_and_credential_settings_summary" product="default" msgid="8721883002237981248">"Telefon shifrlangan"</string>
     <string name="encryption_and_credential_settings_summary" product="tablet" msgid="7200428573872395685">"Qurilma shifrlangan"</string>
@@ -373,6 +374,9 @@
     <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="1961957425135180242">"Keyingisi"</string>
+    <string name="setup_fingerprint_enroll_skip_title" msgid="362050541117362034">"Barmoq izi sozlanmasinmi?"</string>
+    <string name="setup_fingerprint_enroll_skip_after_adding_lock_text" msgid="958990414356204763">"Barmoq izini sozlash bir yoki ikki daqiqa vaqt oladi. Ularni keyinchalik qurilma sozlamalari orqali kiritishingiz mumkin."</string>
+    <string name="lock_screen_intro_skip_title" msgid="4988210105913705679">"Ekran qulfi sozlanmasinmi?"</string>
     <string name="lock_screen_intro_skip_dialog_text_frp" product="tablet" msgid="1581834104051243425">"Qurilmani himoyalash funksiyalari yoqilmaydi. Agar planshetingiz yo‘qolsa, o‘g‘irlansa yoki asliga qaytarilsa, siz boshqalarning undan foydalanishiga to‘sqinlik qila olmaysiz."</string>
     <string name="lock_screen_intro_skip_dialog_text_frp" product="device" msgid="4629503416877189572">"Qurilmani himoyalash funksiyasi yoqilmaydi. Agar qurilmangiz yo‘qolib qolsa, o‘g‘irlansa yoki asliga qaytarilsa, siz boshqalarning undan foydalanishiga to‘sqinlik qila olmaysiz."</string>
     <string name="lock_screen_intro_skip_dialog_text_frp" product="default" msgid="2423428240245737909">"Qurilmani himoyalash funksiyasi yoqilmaydi. Agar telefoningiz yo‘qolib qolsa, o‘g‘irlansa yoki asliga qaytarilsa, siz boshqalarning undan foydalanishiga to‘sqinlik qila olmaysiz."</string>
@@ -458,7 +462,7 @@
     <string name="setup_lock_settings_picker_title" product="tablet" msgid="90329443364067215">"Planshetingizni himoyalang"</string>
     <string name="setup_lock_settings_picker_title" product="device" msgid="2399952075134938929">"Qurilmangizni himoyalang"</string>
     <string name="setup_lock_settings_picker_title" product="default" msgid="1572244299605153324">"Telefoningizni himoyalang"</string>
-    <string name="setup_lock_settings_picker_fingerprint_message" msgid="5585650064305600578">"Ekran qulfi uchun muqobil usulni ham tanlang."</string>
+    <string name="lock_settings_picker_fingerprint_added_security_message" msgid="5768002109707648463">"Ekran qulfi uchun muqobil usulni ham tanlang."</string>
     <string name="setup_lock_settings_picker_message" product="tablet" msgid="8919671129189936210">"Qurilmani himoyalash funksiyalarini faollashtirish orqali boshqalarning ushbu planshetdan sizning ruxsatingizsiz foydalanishining oldini oling. Ekran qulfini tanlang."</string>
     <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>
@@ -589,6 +593,7 @@
     <string name="lockpassword_pin_no_sequential_digits" msgid="680765285206990584">"Oshib boruvchi, kamayib boruvchi yoki qaytarilgan ketma-ket raqamlarga ruxsat berilmaydi"</string>
     <string name="lockpassword_ok_label" msgid="313822574062553672">"OK"</string>
     <string name="lockpassword_cancel_label" msgid="8818529276331121899">"Bekor qilish"</string>
+    <string name="lockpassword_clear_label" msgid="5724429464960458155">"Tozalash"</string>
     <string name="lockpattern_tutorial_cancel_label" msgid="6431583477570493261">"Bekor qilish"</string>
     <string name="lockpattern_tutorial_continue_label" msgid="3559793618653400434">"Keyingisi"</string>
     <string name="lock_setup" msgid="3355847066343753943">"O‘rnatildi."</string>
@@ -648,8 +653,8 @@
     <string name="bluetooth_device_context_connect_advanced" msgid="2643129703569788771">"Sozlamalar…"</string>
     <string name="bluetooth_menu_advanced" msgid="8572178316357220524">"Qo‘shimcha"</string>
     <string name="bluetooth_advanced_titlebar" msgid="2142159726881547669">"Bluetooth kengaytmalari"</string>
-    <string name="bluetooth_empty_list_bluetooth_off" msgid="6351930724051893423">"Yaqin-atrofdagi Bluetooth-qurilmalarga ulanish uchun Bluetooth funksiyasini yoqing."</string>
-    <string name="ble_scan_notify_text" msgid="1295915006005700650">"Bluetooth tarmoqlari o‘chirilgan bo‘lsa-da, joylashuv aniqligini oshirish maqsadida tizimga oid ilova va xizmatlar yaqin-atrofdagi Bluetooth qurilmalarni qidirishda davom etadi. Buni <xliff:g id="LINK_BEGIN_0">LINK_BEGIN</xliff:g>tekshirish sozlamalari<xliff:g id="LINK_END_1">LINK_END</xliff:g> orqali o‘chirib qo‘yish mumkin."</string>
+    <string name="bluetooth_empty_list_bluetooth_off" msgid="6351930724051893423">"Yaqin-atrofdagi Bluetooth qurilmalarga ulanish uchun Bluetooth aloqasini yoqing."</string>
+    <string name="ble_scan_notify_text" msgid="1295915006005700650">"Joylashuv axborotining aniqligini oshirish maqsadida tizimga oid ilova va xizmatlar yaqin-atrofdagi Bluetooh qurilmalarni qidiraveradi. Buni <xliff:g id="LINK_BEGIN_0">LINK_BEGIN</xliff:g>tarmoqlarni qidirish sozlamalari<xliff:g id="LINK_END_1">LINK_END</xliff:g> orqali bekor qilishingiz mumkin."</string>
     <string name="bluetooth_connect_failed" msgid="4500234659813241053">"Ulanilmadi. Qaytadan urining."</string>
     <string name="device_details_title" msgid="6576953269221085300">"Qurilma tafsilotlari"</string>
     <string name="bluetooth_device_mac_address" msgid="2513724313558236181">"Qurilmaning Bluetooth manzili: <xliff:g id="ADDRESS">%1$s</xliff:g>"</string>
@@ -703,7 +708,7 @@
     <string name="android_beam_settings_title" msgid="7832812974600338649">"Android Beam"</string>
     <string name="android_beam_on_summary" msgid="3618057099355636830">"NFC orqali axborot almashish"</string>
     <string name="android_beam_off_summary" msgid="4663095428454779138">"O‘chiq"</string>
-    <string name="android_beam_disabled_summary" msgid="1737782116894793393">"NFC o‘chiqligi tufayli bajarilmadi"</string>
+    <string name="android_beam_disabled_summary" msgid="1737782116894793393">"Faol emas, chunki NFC yoqilmagan"</string>
     <string name="android_beam_label" msgid="6257036050366775040">"Android Beam"</string>
     <string name="android_beam_explained" msgid="1810540319385192758">"Bu funksiya qurilmalarni bir-biriga tekkizib, axborot almashish imkonini beradi. Deyarli hamma narsani, jumladan, kontaktlar, veb-sahifa va videolarni uzatish mumkin.\n\nQurilmalarni bir-biriga (odatda, orqama-orqa qilib) yaqinlashtiring va keyin ekran ustiga bosing. Nimani yuborish mumkinligini ilova aniqlaydi."</string>
     <string name="wifi_quick_toggle_title" msgid="8850161330437693895">"Wi‑Fi"</string>
@@ -718,7 +723,7 @@
     <string name="wifi_error" msgid="3207971103917128179">"Xatolik"</string>
     <string name="wifi_sap_no_channel_error" msgid="3108445199311817111">"Siz joylashgan mamlakatda 5 GGs chastota qo‘llab-quvvatlanmaydi"</string>
     <string name="wifi_in_airplane_mode" msgid="8652520421778203796">"Uchish rejimida"</string>
-    <string name="wifi_notify_open_networks" msgid="76298880708051981">"Tarmoq bildirishnomasini oching"</string>
+    <string name="wifi_notify_open_networks" msgid="76298880708051981">"Ochiq tarmoqlar haqida bildirishnoma"</string>
     <string name="wifi_notify_open_networks_summary" msgid="2761326999921366960">"Yuqori sifatli ochiq tarmoqlar haqida xabar qilinsin"</string>
     <string name="wifi_wakeup" msgid="8815640989361538036">"Wi‑Fi tarmoqni avtomatik yoqish"</string>
     <string name="wifi_wakeup_summary" msgid="2530814331062997163">"Saqlab olingan tarmoqlar (m-n, uy) ichidan signali yaxshisi chiqsa, Wi-Fi qayta yoqilsin"</string>
@@ -732,8 +737,8 @@
     <string name="use_open_wifi_automatically_summary_scoring_disabled" msgid="593964217679325831">"Foydalanish uchun tarmoqlar reytingi muallifini tanlang"</string>
     <string name="use_open_wifi_automatically_summary_scorer_unsupported_disabled" msgid="8472122600853650258">"Foydalanish uchun mos tarmoqlar reytingi muallifini tanlang"</string>
     <string name="wifi_install_credentials" msgid="3551143317298272860">"Sertifikatlarni o‘rnatish"</string>
-    <string name="wifi_scan_notify_text" msgid="5593805423071186757">"Wi-Fi tarmoqlari o‘chirilgan bo‘lsa-da, joylashuv aniqligini oshirish maqsadida tizimga oid ilova va xizmatlar Wi-Fi tarmoqlarini qidirishda davom etadi. Buni <xliff:g id="LINK_BEGIN_0">LINK_BEGIN</xliff:g>tekshirish sozlamalari<xliff:g id="LINK_END_1">LINK_END</xliff:g> orqali o‘chirib qo‘yish mumkin."</string>
-    <string name="wifi_scan_notify_text_scanning_off" msgid="3426075479272242098">"Joylashuv aniqligini oshirish uchun <xliff:g id="LINK_BEGIN_0">LINK_BEGIN</xliff:g>sozlamalar<xliff:g id="LINK_END_1">LINK_END</xliff:g> orqali Wi-Fi tarmoqlarni qidirishni yoqing."</string>
+    <string name="wifi_scan_notify_text" msgid="5593805423071186757">"Joylashuv axborotining aniqligini oshirish maqsadida tizimga oid ilova va xizmatlar Wi-Fi tarmoqlarni qidiraveradi. Buni <xliff:g id="LINK_BEGIN_0">LINK_BEGIN</xliff:g>tarmoqlarni qidirish sozlamalari<xliff:g id="LINK_END_1">LINK_END</xliff:g> orqali bekor qilishingiz mumkin."</string>
+    <string name="wifi_scan_notify_text_scanning_off" msgid="3426075479272242098">"Joylashuv axborotining aniqligini oshirish uchun <xliff:g id="LINK_BEGIN_0">LINK_BEGIN</xliff:g>sozlamalar<xliff:g id="LINK_END_1">LINK_END</xliff:g> orqali Wi-Fi tarmoqlarni qidirish xususiyatini yoqing."</string>
     <string name="wifi_scan_notify_remember_choice" msgid="7104867814641144485">"Boshqa ko‘rsatilmasin"</string>
     <string name="wifi_setting_sleep_policy_title" msgid="5149574280392680092">"Uyqu rejimida Wi-Fi"</string>
     <string name="wifi_setting_on_during_sleep_title" msgid="8308975500029751565">"Uyqu rejimida Wi-Fi yoniq tursin"</string>
@@ -782,6 +787,7 @@
     <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>
@@ -818,6 +824,8 @@
     <string name="wifi_wps_available_first_item" msgid="4422547079984583502">"WPS mavjud"</string>
     <string name="wifi_wps_available_second_item" msgid="8427520131718215301">" (WPS mavjud)"</string>
     <string name="wifi_wps_nfc_enter_password" msgid="2288214226916117159">"Tarmoqqa ulanish uchun parolni kiriting"</string>
+    <string name="wifi_carrier_connect" msgid="8174696557882299911">"Aloqa operatorining Wi‑Fi tarmog‘i"</string>
+    <string name="wifi_carrier_content" msgid="4634077285415851933">"<xliff:g id="NAME">%1%s</xliff:g> orqali ulanish"</string>
     <string name="wifi_scan_always_turnon_message" msgid="203123538572122989">"Joylashuv aniqligini yana ham yaxshilash va boshqa maqsadlar uchun, Wi-Fi o‘chirilgan bo‘lsada <xliff:g id="APP_NAME">%1$s</xliff:g> tarmoqlarni qidirish vazifasini yoqmoqchi.\n\nBu ruxsat tarmoqlarni qidirishni istagan barcha ilovalarga berilsinmi?"</string>
     <string name="wifi_scan_always_turnoff_message" msgid="5538901671131941043">"Uni o‘chirish uchun menyudan “Qo‘shimcha” bandiga o‘ting."</string>
     <string name="wifi_scan_always_confirm_allow" msgid="5355973075896817232">"Ruxsat berish"</string>
@@ -835,6 +843,7 @@
     <string name="wifi_connect" msgid="1076622875777072845">"Ulanish"</string>
     <string name="wifi_failed_connect_message" msgid="8491902558970292871">"Tarmoqqa ulanmadi"</string>
     <string name="wifi_forget" msgid="8168174695608386644">"O‘chirish"</string>
+    <string name="wifi_modify" msgid="6100248070440710782">"O‘zgartirish"</string>
     <string name="wifi_failed_forget_message" msgid="1348172929201654986">"Tarmoqni unutmadi"</string>
     <string name="wifi_save" msgid="3331121567988522826">"Saqlash"</string>
     <string name="wifi_failed_save_message" msgid="6650004874143815692">"Tarmoqni saqlamadi"</string>
@@ -847,6 +856,7 @@
     <string name="wifi_advanced_titlebar" msgid="4485841401774142908">"Qo‘shimcha funksiyalar"</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_title" msgid="3471132676909349382">"Tarmoqqa oid ma’lumot"</string>
     <string name="wifi_details_subnet_mask" msgid="6720279144174924410">"Quyi tarmoq niqobi"</string>
     <string name="wifi_details_dns" msgid="8648826607751830768">"DNS"</string>
     <string name="wifi_details_ipv6_address_header" msgid="6734119149106422148">"IPv6 manzillar"</string>
@@ -879,16 +889,15 @@
     <string name="wifi_p2p_cancel_connect_title" msgid="255267538099324413">"Taklif bekor qilinsinmi?"</string>
     <string name="wifi_p2p_cancel_connect_message" msgid="7477756213423749402">"<xliff:g id="PEER_NAME">%1$s</xliff:g> bilan ulanishga sizga yuborilgan taklifni bekor qilmoqchimisiz?"</string>
     <string name="wifi_p2p_delete_group_message" msgid="834559380069647086">"Bu guruh unitilsinmi?"</string>
-    <string name="wifi_tether_checkbox_text" msgid="1847167643625779136">"Wi‑Fi ulanish nuqtasi"</string>
-    <string name="wifi_hotspot_checkbox_text" msgid="7763495093333664887">"Wi‑Fi ulanish nuqtasi"</string>
+    <string name="wifi_hotspot_checkbox_text" msgid="7763495093333664887">"Wi‑Fi hotspot"</string>
     <string name="wifi_hotspot_off_subtext" msgid="5466126533609394170">"Internet yoki kontent boshqa qurilmalarga ulashilmayapti"</string>
     <string name="wifi_hotspot_tethering_on_subtext" product="tablet" msgid="5752490509369962007">"Bu planshet internet aloqasi hotspot orqali tarqatilmoqda"</string>
     <string name="wifi_hotspot_tethering_on_subtext" product="default" msgid="6461075246164300670">"Bu telefon internet aloqasi hotspot orqali tarqatilmoqda"</string>
     <string name="wifi_hotspot_on_local_only_subtext" msgid="2068110388011294735">"Ilova kontent ulashmoqda. Internet tarqatish uchun hotspotni o‘chirib, keyin qayta yoqing"</string>
-    <string name="wifi_hotspot_name_title" msgid="1341735529132128887">"Wi‑Fi nomi"</string>
+    <string name="wifi_hotspot_name_title" msgid="8237000746618636778">"Hotspot nomi"</string>
     <string name="wifi_hotspot_name_summary_connecting" msgid="3378299995508671967">"<xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g> yoqilmoqda…"</string>
     <string name="wifi_hotspot_name_summary_connected" msgid="3888672084861445362">"Boshqa qurilmalar <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g> tarmog‘iga ulanishi mumkin"</string>
-    <string name="wifi_hotspot_password_title" msgid="1955592302902091281">"Wi-Fi paroli"</string>
+    <string name="wifi_hotspot_password_title" msgid="8676859981917573801">"Hotspot paroli"</string>
     <string name="wifi_hotspot_ap_band_title" msgid="1165801173359290681">"Wi-Fi chastotalari diapazoni"</string>
     <string name="wifi_hotspot_footer_info_regular" msgid="1203489406068036455">"Boshqa qurilmalaringiz uchun Wi-Fi tarmoq yaratish uchun hotspotdan foydalaning. Hotspot mobil internetingizni tarqatadi. Qo‘shimcha mobil internet uchun to‘lovlar olinishi mumkin."</string>
     <string name="wifi_hotspot_footer_info_local_only" msgid="857988412470694109">"Ilovalar yaqin-atrofdagi qurilmalarga kontent ulashish uchun hotspot yarata oladi."</string>
@@ -899,7 +908,6 @@
     <string name="wifi_tether_configure_ap_text" msgid="7974681394041609308">"Wi‑Fi ulanish nuqtasini sozlash"</string>
     <string name="wifi_hotspot_configure_ap_text" msgid="5478614731464220432">"Wi‑Fi ulanish nuqtasini sozlash"</string>
     <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">"Wi-Fi qo‘ng‘iroq"</string>
     <string name="wifi_calling_suggestion_title" msgid="9008010480466359578">"Wi-Fi qo‘ng‘iroqni yoqing"</string>
@@ -940,19 +948,19 @@
     <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="emergency_address_summary" msgid="3266760199681945746">"Wi-Fi orqali favqulodda chaqiruvni amalga oshirganingizda, favqulodda xizmatlar sizning joylashuvingiz sifatida foydalanadigan manzil"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"Ekran"</string>
-    <string name="sound_settings" msgid="5534671337768745343">"Ovoz"</string>
+    <string name="sound_settings" msgid="5534671337768745343">"Tovush"</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 signali"</string>
+    <string name="notification_sound_title" msgid="5137483249425507572">"Standart bildirishnoma tovushi"</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 signali"</string>
+    <string name="notification_sound_dialog_title" msgid="3805140135741385667">"Standart bildirishnoma tovushi"</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>
@@ -994,8 +1002,9 @@
     <string name="search_settings" msgid="1910951467596035063">"Qidiruv"</string>
     <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="search_clear_history" msgid="4196658962573162457">"Jurnalni tozalash"</string>
     <string name="display_settings" msgid="7965901687241669598">"Ekran"</string>
-    <string name="accelerometer_title" msgid="7854608399547349157">"Ekranni avtomatik burish"</string>
+    <string name="accelerometer_title" msgid="7854608399547349157">"Ekranning avtomatik burilishi"</string>
     <string name="color_mode_title" msgid="3159275920408338215">"Yorqin ranglar"</string>
     <string name="accelerometer_summary_on" product="tablet" msgid="429982132339828942">"Planshet aylantirilganda ekran joylashuvini avtomatik almashtirish"</string>
     <string name="accelerometer_summary_on" product="default" msgid="1133737282813048021">"Ekran joylashuvini telefon burilganda avtomatik almashtirish"</string>
@@ -1046,9 +1055,9 @@
     <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‘zgartiring"</string>
+    <string name="wallpaper_suggestion_title" msgid="8583988696513822528">"Fon rasmini o‘zgartirish"</string>
     <string name="wallpaper_suggestion_summary" msgid="1579144009898110491">"Ekran uchun fon rasmini tanlang"</string>
-    <string name="wallpaper_settings_fragment_title" msgid="519078346877860129">"Fon rasmini tanlang"</string>
+    <string name="wallpaper_settings_fragment_title" msgid="519078346877860129">"Fon rasmi qayerdan tanlansin"</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>
@@ -1063,12 +1072,12 @@
     <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="ambient_display_screen_title" msgid="4252755516328775766">"Sezgir ekran"</string>
+    <string name="ambient_display_screen_title" msgid="4252755516328775766">"Ekranning avtomatik yonishi"</string>
     <string name="ambient_display_screen_summary_always_on" msgid="7337555569694794132">"Doim yoniq (batareya tezroq sarflanadi)"</string>
     <string name="ambient_display_screen_summary_notifications" msgid="1449570742600868654">"Yangi bildirishnomalar"</string>
-    <string name="ambient_display_category_triggers" msgid="4359289754456268573">"Qachon ko‘rsatilsin"</string>
+    <string name="ambient_display_category_triggers" msgid="4359289754456268573">"Ekran qachon yonadi"</string>
     <string name="doze_title" msgid="2375510714460456687">"Yangi bildirishnomalar"</string>
-    <string name="doze_summary" msgid="3846219936142814032">"Bildirishnoma kelganda ekran yonadi"</string>
+    <string name="doze_summary" msgid="3846219936142814032">"Bildirishnoma kelsa, ekran yonadi"</string>
     <string name="doze_always_on_title" msgid="1046222370442629646">"Har doim yoniq"</string>
     <string name="doze_always_on_summary" msgid="6978257596231155345">"Vaqt, bildirishnoma belgilari va boshqa ma’lumotlarni ko‘rsatish (batareya tezroq sarflanadi)"</string>
     <string name="title_font_size" msgid="4405544325522105222">"Shrift o‘lchami"</string>
@@ -1123,7 +1132,6 @@
     <string name="baseband_version" msgid="1848990160763524801">"Aloqa moduli versiyasi"</string>
     <string name="kernel_version" msgid="9192574954196167602">"Yadro versiyasi"</string>
     <string name="build_number" msgid="3075795840572241758">"Nashr raqami"</string>
-    <string name="selinux_status" msgid="6212165375172061672">"SELinux holati"</string>
     <string name="device_info_not_available" msgid="8062521887156825182">"Mavjud emas"</string>
     <string name="device_status_activity_title" msgid="1411201799384697904">"Umumiy ma’lumot"</string>
     <string name="device_status" msgid="607405385799807324">"Umumiy ma’lumot"</string>
@@ -1151,7 +1159,6 @@
     <string name="status_wifi_mac_address" msgid="2202206684020765378">"Wi‑Fi MAC-manzili"</string>
     <string name="status_bt_address" msgid="4195174192087439720">"Bluetooth manzili"</string>
     <string name="status_serial_number" msgid="2257111183374628137">"Seriya raqami"</string>
-    <string name="status_unavailable" msgid="7862009036663793314">"Mavjud emas"</string>
     <string name="status_up_time" msgid="7294859476816760399">"Faollik vaqti"</string>
     <string name="status_awake_time" msgid="2393949909051183652">"Uyg‘oqlik vaqti"</string>
     <string name="internal_memory" msgid="9129595691484260784">"Ichki xotira"</string>
@@ -1326,7 +1333,8 @@
     <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>
-    <string name="reset_dashboard_title" msgid="6254873816990678620">"Parametrlarni asl holatiga qaytarish"</string>
+    <string name="reset_dashboard_title" msgid="6254873816990678620">"Asliga qaytarish"</string>
+    <string name="reset_dashboard_summary" msgid="4851012632493522755">"Tarmoq, ilova yoki qurilma sozlamalarini asliga qaytarishingiz mumkin"</string>
     <string name="reset_network_title" msgid="6166025966016873843">"Wi-Fi, mobil internet va Bluetooth parametrlarini tiklash"</string>
     <string name="reset_network_desc" msgid="5547979398298881406">"Bu barcha tarmoq sozlamalarini, jumladan, mazkur sozlamalarni asliga qaytaradi:\n\n"<li>"Wi‑Fi"</li>\n<li>"Mobil internet"</li>\n<li>"Bluetooth"</li></string>
     <string name="reset_network_button_text" msgid="2035676527471089853">"Sozlamalarni tiklash"</string>
@@ -1335,17 +1343,14 @@
     <string name="reset_network_confirm_title" msgid="1759888886976962773">"Asliga qaytarilsinmi?"</string>
     <string name="network_reset_not_available" msgid="7188610385577164676">"Bu foydalanuvchi tarmoq sozlamalarini tiklay olmaydi"</string>
     <string name="reset_network_complete_toast" msgid="787829973559541880">"Tarmoq sozlamalari qayta tiklandi"</string>
-    <string name="master_clear_title" msgid="6617679904229218425">"Barcha ma’lumotlarni o‘chirish (Zavod sozlamalarini tiklash)"</string>
-    <plurals name="master_clear_with_account_summary" formatted="false" msgid="5911377203778818712">
-      <item quantity="other"><xliff:g id="ACCOUNT_COUNT">%1$d</xliff:g> ta hisob asliga qaytariladi</item>
-      <item quantity="one">1 ta hisob asliga qaytariladi</item>
-    </plurals>
-    <string name="master_clear_summary" msgid="6902443944660426951">"Ichki xotira va barcha ma’lumotlar tozalanadi"</string>
+    <string name="master_clear_title" msgid="3531267871084279512">"Barcha ma’lumotlarni o‘chirish (zavod sozlamalarini tiklash)"</string>
     <string name="master_clear_desc" product="tablet" msgid="9146059417023157222">"Planshetning "<b>"ichki xotirasidagi"</b>" barcha ma’lumotlar o‘chib ketadi, jumladan:\n\n"<li>" Google hisobingiz"</li>\n<li>"Tizim va ilovalarning ma’lumotlari/sozlamalari"</li>\n<li>"Yuklab olingan ilovalar"</li></string>
     <string name="master_clear_desc" product="default" msgid="4800386183314202571">"Telefonning "<b>"ichki xotirasidagi"</b>" barcha ma’lumotlar o‘chib ketadi, jumladan:\n\n"<li>" Google hisobingiz"</li>\n<li>"Tizim va ilovalarning ma’lumotlari/sozlamalari"</li>\n<li>"Yuklab olingan ilovalar"</li></string>
     <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"Siz hozir tizimga quyidagi hisoblardan kirgansiz:\n"</string>
     <string name="master_clear_other_users_present" product="default" msgid="5161423070702470742">\n\n"Bu qurilmada boshqa foydalanuvchilar ham bor.\n"</string>
     <string name="master_clear_desc_also_erases_external" msgid="1903185203791274237"><li>"Musiqa"</li>\n<li>"Rasmlar"</li>\n<li>"Foydalanuvchining boshqa ma\'lumotlari"</li></string>
+    <string name="master_clear_desc_also_erases_esim" msgid="312352697653096008"><li>"eSIM uchun aloqa operatorlari"</li></string>
+    <string name="master_clear_desc_no_cancel_mobile_plan" msgid="5460926449093211144">\n\n"Bu mobil xizmatining tarif rejasini bekor qilmaydi."</string>
     <string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="7744115866662613411">\n\n"Musiqa, rasm va boshqa ma’lumotlarni o\'chirish uchun "<b>"USB xotirani"</b>" ham tozalash kerak."</string>
     <string name="master_clear_desc_erase_external_storage" product="default" msgid="4801026652617377093">\n\n"Musiqa, rasm va boshqa ma’lumotlarni o‘chirish uchun "<b>"SD kartani"</b>" ham tozalash kerak."</string>
     <string name="erase_external_storage" product="nosdcard" msgid="969364037450286809">"USB xotirani tozalash"</string>
@@ -1377,11 +1382,11 @@
     <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_subtext" product="default" msgid="5991482890033484794">"Telefon internetini USB orqali tarqarish"</string>
+    <string name="usb_tethering_subtext" product="default" msgid="5991482890033484794">"Telefondagi internetni USB orqali tarqatish"</string>
     <string name="usb_tethering_subtext" product="tablet" msgid="5988796139573211318">"Planshet internetini USB orqali tarqatish"</string>
     <string name="bluetooth_tether_checkbox_text" msgid="2379175828878753652">"Bluetooth modem"</string>
     <string name="bluetooth_tethering_subtext" product="tablet" msgid="4558227863463153412">"Planshet internetini Bluetooth orqali tarqatish"</string>
-    <string name="bluetooth_tethering_subtext" product="default" msgid="1055197887836203595">"Telefon internetini Bluetooth orqali tarqarish"</string>
+    <string name="bluetooth_tethering_subtext" product="default" msgid="1055197887836203595">"Telefondagi internetni Bluetooth orqali tarqatish"</string>
     <string name="bluetooth_tethering_off_subtext_config" msgid="6326877798974938021">"<xliff:g id="DEVICE_NAME">%1$d</xliff:g> interneti Bluetooth orqali tarqatilmoqda"</string>
     <string name="bluetooth_tethering_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>
@@ -1462,15 +1467,16 @@
     <string name="settings_safetylegal_activity_title" msgid="6901214628496951727">"Xavfsizlik qoidalari"</string>
     <string name="settings_safetylegal_activity_unreachable" msgid="250674109915859456">"Sizda internet ulanish yo‘q. Bu ma‘lumotni ko‘rish uchun, internetga ulangan kompyuterda %s manziliga kiring."</string>
     <string name="settings_safetylegal_activity_loading" msgid="8059022597639516348">"Yuklanmoqda…"</string>
-    <string name="lockpassword_choose_your_password_header" msgid="8624900666929394990">"Parol tanlang"</string>
-    <string name="lockpassword_choose_your_password_header_for_fingerprint" msgid="6624409510609085450">"Barmoq izidan foydalanish uchun parol o‘rnating"</string>
-    <string name="lockpassword_choose_your_pattern_header" msgid="6949761069941694050">"Grafik kalit yarating"</string>
-    <string name="lockpassword_choose_your_pattern_header_for_fingerprint" msgid="5901096361617543819">"Barmoq izidan foydalanish uchun grafik kalit o‘rnating"</string>
-    <string name="lockpassword_choose_your_pin_header" msgid="7598849519816138302">"PIN kod kiriting"</string>
-    <string name="lockpassword_choose_your_pin_header_for_fingerprint" msgid="765344692615917183">"Barmoq izidan foydalanish uchun PIN kod o‘rnating"</string>
-    <string name="lockpassword_confirm_your_password_header" msgid="6308478184889846633">"Parolni tasdiqlang"</string>
+    <string name="lockpassword_choose_your_screen_lock_header" msgid="3872462096767152394">"Ekran qulfini sozlang"</string>
+    <string name="lockpassword_choose_your_password_message" msgid="1197569283524841412">"Xavfsizlik uchun parol o‘rnating"</string>
+    <string name="lockpassword_choose_your_password_header_for_fingerprint" msgid="2541818487015343503">"Barmoq izi uchun parollang"</string>
+    <string name="lockpassword_choose_your_pattern_header_for_fingerprint" msgid="7709785406243556723">"Barmoq izi uchun grafik kalit o‘rnating"</string>
+    <string name="lockpassword_choose_your_pin_message" msgid="1875420718677275646">"Xavfsizlik uchun PIN kod o‘rnating"</string>
+    <string name="lockpassword_choose_your_pin_header_for_fingerprint" msgid="1549639053195796674">"Barmoq izi uchun PIN kod o‘rnating"</string>
+    <string name="lockpassword_choose_your_pattern_message" msgid="5986983400689720015">"Xavfsizlik uchun grafik kalit o‘rnating"</string>
+    <string name="lockpassword_confirm_your_password_header" msgid="1266027268220850931">"Parolni qayta kiriting"</string>
     <string name="lockpassword_confirm_your_pattern_header" msgid="7543433733032330821">"Grafik kalitni tasdiqlang"</string>
-    <string name="lockpassword_confirm_your_pin_header" msgid="49038294648213197">"PIN kodni kiriting"</string>
+    <string name="lockpassword_confirm_your_pin_header" msgid="7744513791910572550">"PIN kodni qayta kiriting"</string>
     <string name="lockpassword_confirm_passwords_dont_match" msgid="5140892109439191415">"Parol mos kelmadi"</string>
     <string name="lockpassword_confirm_pins_dont_match" msgid="7226244811505606217">"PIN-kod mos kelmadi"</string>
     <string name="lockpassword_choose_lock_generic_header" msgid="3811438094903786145">"Qulfni ochish usuli"</string>
@@ -1489,6 +1495,12 @@
     <string name="lockpassword_strong_auth_required_work_pattern" msgid="3003781907040522053">"Ishchi profil grafik kalitini kiriting"</string>
     <string name="lockpassword_strong_auth_required_work_pin" msgid="3367491332598821552">"Ishchi profil PIN kodini kiriting"</string>
     <string name="lockpassword_strong_auth_required_work_password" msgid="8159775129968582940">"Ishchi profil parolini kiriting"</string>
+    <string name="lockpassword_confirm_your_pattern_details_frp" msgid="6757336656791723193">"Telefoningiz zavod sozlamalariga qaytarildi. Bu telefondan foydalanish uchun avvalgi grafik kalitni kiriting."</string>
+    <string name="lockpassword_confirm_your_pin_details_frp" msgid="826520613445990470">"Telefoningiz zavod sozlamalariga qaytarildi. Bu telefondan foydalanish uchun avvalgi PIN kodni kiriting."</string>
+    <string name="lockpassword_confirm_your_password_details_frp" msgid="8944081074615739040">"Telefoningiz zavod sozlamalariga qaytarildi. Bu telefondan foydalanish uchun avvalgi parolni kiriting."</string>
+    <string name="lockpassword_confirm_your_pattern_header_frp" msgid="2898036091609128286">"Grafik kalitni tasdiqlash"</string>
+    <string name="lockpassword_confirm_your_pin_header_frp" msgid="4141601774778898803">"PIN kodni tasdiqlash"</string>
+    <string name="lockpassword_confirm_your_password_header_frp" msgid="3762615419295360480">"Parolni tasdiqlash"</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>
@@ -1537,8 +1549,7 @@
     <string name="install_applications" msgid="4872012136210802181">"Noma’lum manbalar"</string>
     <string name="install_applications_title" msgid="4987712352256508946">"Barcha manbalarga ruxsat"</string>
     <string name="recent_app_category_title" msgid="6673071268966003928">"Yaqinda ochilgan ilovalar"</string>
-    <string name="see_all_apps_title" msgid="1317153498074308438">"Barcha ilovalarni (<xliff:g id="COUNT">%1$d</xliff:g>) ko‘rish"</string>
-    <string name="recent_app_summary" msgid="3366446669844932300">"<xliff:g id="TIME">^1</xliff:g> oldin"</string>
+    <string name="see_all_apps_title" msgid="1317153498074308438">"Barcha ilovalar (<xliff:g id="COUNT">%1$d</xliff:g>)"</string>
     <string name="install_all_warning" product="tablet" msgid="8310489909586138165">"Planshetingiz va shaxsiy ma‘lumotlaringiz notanish ilovalar xujumiga zaif bo‘ladi. Bunday ilovalarni ushbu manbadan o‘rnatish bilan ularning planshetizga yetkazadigan shikast va ma‘lumotlaringizni o‘chirib yuborishiga javobgarlikni o‘z zimmangizga olasiz."</string>
     <string name="install_all_warning" product="default" msgid="1952257127370115988">"Telefoningiz va shaxsiy ma‘lumotlaringiz notanish ilovalar xujumiga zaif bo‘ladi. Bunday ilovalarni ushbu manbadan o‘rnatish bilan ularning telefoningizga yetkazadigan shikast va ma‘lumotlaringizni o‘chirib yuborishiga javobgarlikni o‘z zimmangizga olasiz."</string>
     <string name="advanced_settings" msgid="1777249286757067969">"Kengaytirilgan sozlamalar"</string>
@@ -1802,7 +1813,7 @@
     <string name="accessibility_settings_summary" msgid="981260486011624939">"Ekrandan o‘qish vositalari, displey, o‘zaro aloqa boshqaruv elementlari"</string>
     <string name="vision_settings_title" msgid="4204111425716868288">"Maxsus imkoniyatlar"</string>
     <string name="vision_settings_description" msgid="5679491180156408260">"Qurilmangizdan qulay foydalanish uchun maxsus imkoniyatlardan foydalaning. Bu parametrlarni keyinroq sozlamalar orqali o‘zgartirish mumkin."</string>
-    <string name="vision_settings_suggestion_title" msgid="917294957154878441">"Shrift o‘lchamini kattalashtirish"</string>
+    <string name="vision_settings_suggestion_title" msgid="8058794060304707004">"Shrift o‘lchamini o‘zgartirish"</string>
     <string name="screen_reader_category_title" msgid="7739154903913400641">"Ekrandan o‘qish vositalari"</string>
     <string name="audio_and_captions_category_title" msgid="3420727114421447524">"Audio va ekrandagi matn"</string>
     <string name="display_category_title" msgid="685461049938269166">"Ekran"</string>
@@ -1839,7 +1850,6 @@
     <string name="accessibility_display_inversion_preference_subtitle" msgid="7052959202195368109">"Unumdorligiga ta’sir qilishi mumkin"</string>
     <string name="accessibility_autoclick_preference_title" msgid="7014499339068449623">"Kursor harakatlanishdan to‘xtagandan keyin bosing"</string>
     <string name="accessibility_autoclick_delay_preference_title" msgid="3962261178385106006">"Bosishdan oldin biroz kuting"</string>
-    <string name="preference_summary_default_combination" msgid="8532964268242666060">"<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">"YONIQ"</string>
     <string name="accessibility_summary_state_disabled" msgid="2241315620132005595">"O‘CHIQ"</string>
     <string name="enable_quick_setting" msgid="2366999897816894536">"Tezkor sozlamalarda ko‘rsatish"</string>
@@ -1958,17 +1968,19 @@
     <string name="background_activity_summary_on" msgid="649282072540085599">"Bu ilova ochilmagan vaqtda ham fonda ishlayveradi"</string>
     <string name="background_activity_summary_off" msgid="7666330699090632040">"Ilova ishlatilmaganda, fondagi harakati cheklanadi"</string>
     <string name="background_activity_summary_disabled" msgid="3710669050484599847">"Ilovaga fonda ishlashiga ruxsat berilmagan"</string>
+    <string name="background_activity_summary_whitelisted" msgid="7375400051141016808">"Ilova uchun batareya quvvati sarfini optimallashtirish imkonsiz"</string>
+    <string name="background_activity_warning_dialog_title" msgid="2216249969149568871">"Fonda ishlashi cheklansinmi?"</string>
+    <string name="background_activity_warning_dialog_text" msgid="7049624449246121981">"Bu ilovaning ishlashiga ta’sir ko‘rsatishi mumkin"</string>
     <!-- String.format failed for translation -->
     <!-- no translation found for device_screen_usage (3386088035570409683) -->
     <skip />
     <string name="device_screen_consumption" msgid="4607589286438986687">"Ekran sarfi"</string>
     <string name="device_cellular_network" msgid="4724773411762382950">"Mobil tarmoqni tekshirish"</string>
-    <string name="power_last_full_charge_summary" msgid="532845389094620657">"<xliff:g id="TIME">^1</xliff:g> oldin"</string>
     <!-- String.format failed for translation -->
-    <!-- no translation found for power_usage_list_summary (6775339745194635000) -->
+    <!-- no translation found for power_usage_list_summary (6393929085382334341) -->
     <skip />
     <!-- String.format failed for translation -->
-    <!-- no translation found for power_usage_list_summary_device (7036566616386864302) -->
+    <!-- no translation found for power_usage_list_summary_device (4461926045610455423) -->
     <skip />
     <string name="screen_usage_summary" msgid="6687403051423153550">"To‘liq quvvat olganidan beri ekran yoniq turgan vaqt miqdori"</string>
     <string name="device_usage_list_summary" msgid="5623036661468763251">"To‘liq quvvat olganidan beri qurilmaning quvvat sarfi"</string>
@@ -2221,14 +2233,14 @@
     <string name="credentials_unlock_hint" msgid="2301301378040499348">"Hisob ma’lumotlari ombori uchun parol tering."</string>
     <string name="credentials_old_password" msgid="7553393815538684028">"Joriy parol:"</string>
     <string name="credentials_reset_hint" msgid="6297256880896133631">"Hamma narsa o‘chirib tashlansinmi?"</string>
-    <string name="credentials_password_too_short" msgid="7502749986405522663">"Parol kamida 8 ta belgidan iborat bo‘lishi lozim."</string>
     <string name="credentials_wrong_password" msgid="2541932597104054807">"Noto‘g‘ri parol."</string>
     <string name="credentials_reset_warning" msgid="5320653011511797600">"Parol noto‘g‘ri terildi. Sizda hisob ma‘lumotlari ombori tozalanishidan avval yana bir urinish mavjud."</string>
     <string name="credentials_reset_warning_plural" msgid="6514085665301095279">"Parol noto‘g‘ri terildi. Sizda hisob ma‘lumotlari ombori tozalanishidan avval yana <xliff:g id="NUMBER">%1$d</xliff:g> urinish mavjud."</string>
     <string name="credentials_erased" msgid="2907836028586342969">"Hisob ma‘lumotlari ombori tozalandi."</string>
     <string name="credentials_not_erased" msgid="7685932772284216097">"Hisob ma’lumotlari omborini o‘chirib bo‘lmaydi."</string>
     <string name="credentials_enabled" msgid="7588607413349978930">"Hisob ma’lumotlari ombori yoqilgan."</string>
-    <string name="credentials_configure_lock_screen_hint" msgid="6757119179588664966">"Hisob ma’lumotlari omboridan foydalanishdan oldin ekran qulfi uchun PIN-kod yoki parol o‘rnatish lozim."</string>
+    <string name="credentials_configure_lock_screen_hint" msgid="8058230497337529036">"Hisob ma’lumotlari omboridan foydalanishdan oldin qurilmaning ekraniga qulf o‘rnatishingiz lozim"</string>
+    <string name="credentials_configure_lock_screen_button" msgid="253239765216055321">"QULF O‘RNATISH"</string>
     <string name="usage_access_title" msgid="332333405495457839">"Ruxsati bor ilovalar"</string>
     <string name="emergency_tone_title" msgid="1055954530111587114">"Favqulodda vaziyat tovushi"</string>
     <string name="emergency_tone_summary" msgid="722259232924572153">"Favqulodda qo‘ng‘iroq uchun xususiyat o‘rnatish"</string>
@@ -2348,8 +2360,6 @@
     <skip />
     <string name="cant_sync_dialog_title" msgid="2777238588398046285">"Qo‘lbola sinxronlanmadi"</string>
     <string name="cant_sync_dialog_message" msgid="1938380442159016449">"Ushbu narsani sinxronlash hozir o‘chirilgan. Bu sozlamani o‘zgartirish uchun vaqtincha fonda trafik yuklashni yoqib, keyin avtomatik sinx-lashga o‘ting."</string>
-    <string name="wimax_settings" msgid="2655139497028469039">"4G tarmog‘i"</string>
-    <string name="status_wimax_mac_address" msgid="8390791848661413416">"4G MAC manzili"</string>
     <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>
@@ -2363,13 +2373,14 @@
     <string name="misc_files_selected_count" msgid="4647048020823912088">"Tanlandi: <xliff:g id="NUMBER">%1$d</xliff:g>/<xliff:g id="TOTAL">%2$d</xliff:g>"</string>
     <string name="misc_files_selected_count_bytes" msgid="2876232009069114352">"<xliff:g id="TOTAL">%2$s</xliff:g>dan <xliff:g id="NUMBER">%1$s</xliff:g>tasi"</string>
     <string name="select_all" msgid="1562774643280376715">"Hammasini belgilash"</string>
+    <string name="data_plan_usage_manage_plans_button_text" msgid="8997761990902708162">"Tarif rejalarini boshqarish"</string>
     <string name="data_usage_summary_title" msgid="3804110657238092929">"Trafik sarfi"</string>
     <string name="data_usage_app_summary_title" msgid="4147258989837459172">"Ilova sarflagan trafik"</string>
     <string name="data_usage_accounting" msgid="7170028915873577387">"Aloqa operatorining hisob-kitobi qurilmanikidan farq qilishi mumkin."</string>
     <string name="data_usage_app" msgid="4970478397515423303">"Ilovalar"</string>
     <string name="data_usage_app_info_label" msgid="3409931235687866706">"ILOVA HAQIDA"</string>
     <string name="data_usage_cellular_data" msgid="9168928285122125137">"Mobil internet"</string>
-    <string name="data_usage_data_limit" msgid="1193930999713192703">"Internet uchun cheklov o‘rnatish"</string>
+    <string name="data_usage_data_limit" msgid="1193930999713192703">"Trafik cheklovini belgilash"</string>
     <string name="data_usage_cycle" msgid="5652529796195787949">"Trafik sarfi davri"</string>
     <string name="data_usage_app_items_header_text" msgid="5017850810459372828">"Ilovalar"</string>
     <string name="data_usage_menu_roaming" msgid="8042359966835203296">"Internet-rouming"</string>
@@ -2426,8 +2437,8 @@
     <string name="data_usage_cycle_editor_title" msgid="1373797281540188533">"Trafik sarfini yangilash sanasi"</string>
     <string name="data_usage_cycle_editor_subtitle" msgid="5512903797979928416">"Har oylik sana:"</string>
     <string name="data_usage_cycle_editor_positive" msgid="8821760330497941117">"Saqlash"</string>
-    <string name="data_usage_warning_editor_title" msgid="3704136912240060339">"Trafik sarfiga ogohlantirish o‘rnatish"</string>
-    <string name="data_usage_limit_editor_title" msgid="9153595142385030015">"Trafik sarfiga cheklov o‘rnatish"</string>
+    <string name="data_usage_warning_editor_title" msgid="3704136912240060339">"Trafik sarfiga oid ogohlantirish"</string>
+    <string name="data_usage_limit_editor_title" msgid="9153595142385030015">"Trafik cheklovini belgilash"</string>
     <string name="data_usage_limit_dialog_title" msgid="3023111643632996097">"Trafik sarfini cheklash"</string>
     <string name="data_usage_limit_dialog_mobile" product="tablet" msgid="4983487893343645667">"Siz o‘rnatgan cheklovga yetib kelgach, planshetingizdagi mobil internet o‘chadi.\n\nBunda, internetdan foydalanish miqdori telefoningiz tomonidan hisoblangani uchun aloqa operatoringizning hisob-kitoblari undan farq qilishi mumkin. Shuning uchun, cheklov qo‘yishda zaxira miqdorini ham e’tiborga oling."</string>
     <string name="data_usage_limit_dialog_mobile" product="default" msgid="3926320594049434225">"Siz o‘rnatgan cheklovga yetib kelgach, telefoningizdagi mobil internet o‘chadi.\n\nBunda, internetdan foydalanish miqdori telefoningiz tomonidan hisoblangani uchun aloqa operatoringizning hisob-kitoblari undan farq qilishi mumkin. Shuning uchun, cheklov qo‘yishda zaxira miqdorini ham e’tiborga oling."</string>
@@ -2448,6 +2459,9 @@
     <string name="data_usage_metered_mobile" msgid="5423305619126978393">"Mobil tarmoqlar"</string>
     <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_metered_auto" msgid="1262028400911918865">"Avtomatik"</string>
+    <string name="data_usage_metered_yes" msgid="9217539611385225894">"Pulli"</string>
+    <string name="data_usage_metered_no" msgid="4025232961929071789">"Bepul"</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_return_to_call" msgid="5613717339452772491">"Chaqiruvga qaytish"</string>
@@ -2539,9 +2553,6 @@
     <string name="backup_pw_set_button_text" msgid="2387480910044648795">"Parolni saqlash"</string>
     <string name="backup_pw_cancel_button_text" msgid="8845630125391744615">"Bekor qilish"</string>
     <string name="additional_system_update_settings_list_item_title" msgid="214987609894661992">"Qo‘shimcha tizim yangilanishlari"</string>
-    <string name="selinux_status_disabled" msgid="924551035552323327">"O‘chiq"</string>
-    <string name="selinux_status_permissive" msgid="6004965534713398778">"Ruxsatli"</string>
-    <string name="selinux_status_enforcing" msgid="2252703756208463329">"Majburlanmoqda"</string>
     <string name="ssl_ca_cert_warning" msgid="2045866713601984673">"Tarmoq kuzatilishi mumkin"</string>
     <string name="done_button" msgid="1991471253042622230">"Tayyor"</string>
     <plurals name="ssl_ca_cert_dialog_title" formatted="false" msgid="7145092748045794650">
@@ -2739,6 +2750,7 @@
       <item quantity="other">%d ta yashirin elementni ko‘rsatish</item>
       <item quantity="one">%d ta yashirin elementni ko‘rsatish</item>
     </plurals>
+    <string name="dashboard_suggestion_condition_footer_content_description" msgid="2898588191174845961">"Yig‘ish"</string>
     <string name="network_dashboard_title" msgid="4771589228992391573">"Tarmoq va Internet"</string>
     <string name="network_dashboard_summary_mobile" msgid="3851083934739500429">"mobil"</string>
     <string name="network_dashboard_summary_data_usage" msgid="3843261364705042212">"trafik sarfi"</string>
@@ -2817,9 +2829,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 signali"</string>
+    <string name="notification_ringtone_title" msgid="4468722874617061231">"Standart bildirishnoma tovushi"</string>
     <string name="notification_unknown_sound_title" msgid="2535027767851838335">"Ilova tovushi"</string>
-    <string name="notification_sound_default" msgid="565135733949733766">"Standart bildirishnoma signali"</string>
+    <string name="notification_sound_default" msgid="565135733949733766">"Standart bildirishnoma tovushi"</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>
@@ -2841,8 +2853,14 @@
       <item quantity="other"><xliff:g id="ON_COUNT">%d</xliff:g> ta avtomatik qoida yoniq</item>
       <item quantity="one">1 ta avtomatik qoida yoniq</item>
     </plurals>
-    <string name="zen_mode_settings_title" msgid="842308776768942600">"Bezovta qilmaslik parametrlari"</string>
-    <string name="zen_mode_priority_settings_title" msgid="2623117023031824309">"Faqat muhimlari"</string>
+    <string name="zen_mode_settings_title" msgid="1066226840983908121">"Bezovta qilinmasin"</string>
+    <string name="zen_mode_behavior_settings_title" msgid="1463303933529313969">"Hatti-xarakatlar"</string>
+    <string name="zen_mode_behavior_allow_title" msgid="3845615648136218141">"Ovoz va tebranishlarga ruxsat:"</string>
+    <string name="zen_mode_behavior_no_sound" msgid="1219626004723208056">"Ovozsiz"</string>
+    <string name="zen_mode_behavior_total_silence" msgid="6716603819806610626">"Ovozsiz (jimjitlik)"</string>
+    <string name="zen_mode_behavior_no_sound_except" msgid="4968477585788243114">"Ovozsiz (istisno: <xliff:g id="CATEGORIES">%1$s</xliff:g>)"</string>
+    <!-- no translation found for zen_mode_behavior_alarms_only (2423480992071472963) -->
+    <skip />
     <string name="zen_mode_automation_settings_title" msgid="4228995740594063774">"Avtomatik qoidalar"</string>
     <string name="zen_mode_automation_suggestion_title" msgid="5105443455143476201">"Bezovta qilmaslik qoidalari"</string>
     <string name="zen_mode_automation_suggestion_summary" msgid="4732808039946935657">"Tovush va tebranishlarni muayyan vaqtga cheklash"</string>
@@ -2850,7 +2868,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">"Visual bildirishnomalarni bloklash"</string>
+    <string name="zen_mode_visual_interruptions_settings_title" msgid="6751708745442997940">"Vizual 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>
@@ -2868,7 +2886,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 nuqtalarini ko‘rsatish"</string>
+    <string name="notification_badging_title" msgid="5938709971403474078">"Bildirishnoma belgisi"</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>
@@ -2884,13 +2902,15 @@
     <string name="notifications_title" msgid="8086372779371204971">"Bildirishnomalar"</string>
     <string name="app_notifications_title" msgid="5810577805218003760">"Ilova bildirishnomalari"</string>
     <string name="notification_channel_title" msgid="2260666541030178452">"Bildirishnomalar turkumi"</string>
+    <string name="notification_group_title" msgid="7180506440133859601">"Bildirishnomalar turkumi guruhi"</string>
     <string name="notification_importance_title" msgid="848692592679312666">"Muhimligi"</string>
-    <string name="notification_importance_unspecified" msgid="2196023702875112081">"Ilovaning ixtiyorida qoldiring"</string>
+    <string name="notification_importance_unspecified" msgid="6622173510486113958">"Ovozga ruxsat berish"</string>
     <string name="notification_importance_blocked" msgid="7938180808339386300">"Bildirishnomalar hech qachon ko‘rsatilmasin"</string>
     <string name="notification_importance_min" msgid="5455049524984686275">"Bildirishnomalarsiz"</string>
     <string name="notification_importance_low" msgid="8881468429453766553">"Ovozsiz"</string>
     <string name="notification_importance_default" msgid="5958338024601957516">"Ovozli"</string>
     <string name="notification_importance_high" msgid="2082429479238228527">"Ovoz va qalqib chiquvchi oyna"</string>
+    <string name="notification_importance_high_silent" msgid="2667033773703765252">"Ekranga qalqib chiqish"</string>
     <string name="notification_importance_min_title" msgid="6974673091137544803">"Past"</string>
     <string name="notification_importance_low_title" msgid="8131254047772814309">"O‘rtacha"</string>
     <string name="notification_importance_default_title" msgid="9120383978536089489">"Yuqori"</string>
@@ -2902,7 +2922,7 @@
     <string name="notification_channel_summary_default" msgid="1111749130423589931">"Juda muhim"</string>
     <string name="notification_channel_summary_high" msgid="2085017556511003283">"Favqulodda muhim"</string>
     <string name="default_notification_assistant" msgid="7631945224761430146">"Bildirishnoma yordamchisi"</string>
-    <string name="manage_notification_access_title" msgid="7510080164564944891">"Bildirishnomalarga kirish"</string>
+    <string name="manage_notification_access_title" msgid="7510080164564944891">"Bildirishnomalarga ruxsat"</string>
     <string name="work_profile_notification_access_blocked_summary" msgid="8748026238701253040">"Ishchi profil bildirishnomalariga kirish taqiqlangan"</string>
     <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">
@@ -2928,13 +2948,18 @@
     <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="1264019085827708920">"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="manage_zen_access_title" msgid="2611116122628520522">"Bezovta qilinmasin rejimi"</string>
     <string name="zen_access_empty_text" msgid="8772967285742259540">"Hech qaysi ilova “Bezovta qilinmasin” funksiyasiga ruxsat so‘ramagan"</string>
     <string name="loading_notification_apps" msgid="5031818677010335895">"Ilovalar yuklanmoqda…"</string>
-    <string name="app_notifications_off_desc" msgid="4882445501376722969">"Android bu qurilmada ushbu ilova bildirishnomasini bloklamoqda"</string>
+    <string name="app_notifications_off_desc" msgid="4882445501376722969">"Android bu qurilmada ushbu ilova bildirishnomalarini bloklamoqda"</string>
     <string name="channel_notifications_off_desc" msgid="5899225298718840635">"Android bu qurilmada ushbu turkum bildirishnomalarini bloklamoqda"</string>
+    <string name="channel_group_notifications_off_desc" msgid="1620950416247316370">"Android bu qurilmada ushbu bildirishnomalar guruhini bloklamoqda"</string>
     <string name="notification_channels" msgid="5346841743182627500">"Turkumlar"</string>
     <string name="notification_channels_other" msgid="5645317113885788226">"Boshqa"</string>
+    <plurals name="notification_group_summary" formatted="false" msgid="3420621520561455358">
+      <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> ta turkum</item>
+      <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> ta turkum</item>
+    </plurals>
     <string name="no_channels" msgid="3077375508177744586">"Bu ilova hech qanday bildirishnoma joylamagan"</string>
     <string name="app_settings_link" msgid="8894946007543660906">"Ilova ichidagi qo‘shimcha sozlamalar"</string>
     <string name="app_notification_listing_summary_zero" msgid="6482582965081108108">"Barcha ilovalar uchun yoqilgan"</string>
@@ -2952,8 +2977,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 nuqtasini ko‘rsatish"</string>
-    <string name="notification_channel_badge_title" msgid="2240827899882847087">"Bildirishnoma nuqtasini ko‘rsatish"</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="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>
@@ -2997,7 +3022,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">"Keyingi signal avvalgisining to‘xtash vaqtini o‘zgartirishi mumkin"</string>
+    <string name="zen_mode_schedule_alarm_title" msgid="767054141267122030">"Signal bilan tugatish"</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>
@@ -3008,15 +3033,17 @@
     <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 sevimli kontaktlardan"</string>
+    <string name="zen_mode_from_starred" msgid="2678345811950997027">"Faqat yulduzchali kontaktlardan"</string>
     <string name="zen_mode_from_none" msgid="8219706639954614136">"Hech kimdan"</string>
     <string name="zen_mode_alarms" msgid="2165302777886552926">"Signallar"</string>
+    <!-- no translation found for zen_mode_media_system_other (8900209390529859777) -->
+    <skip />
     <string name="zen_mode_reminders" msgid="5458502056440485730">"Eslatmalar"</string>
     <string name="zen_mode_events" msgid="7914446030988618264">"Tadbirlar"</string>
     <string name="zen_mode_all_callers" msgid="584186167367236922">"Barcha abonentlar"</string>
     <string name="zen_mode_selected_callers" msgid="3127598874060615742">"Saralangan abonentlar"</string>
     <string name="zen_mode_repeat_callers" msgid="5019521886428322131">"Qayta chaqiruvlar"</string>
-    <string name="zen_mode_repeat_callers_summary" msgid="7192713032364140137">"Agar abonent <xliff:g id="MINUTES">%d</xliff:g> daqiqa ichida qayta qo‘ng‘iroq qilsa, qo‘ng‘iroq haqida xabar qilinsin"</string>
+    <string name="zen_mode_repeat_callers_summary" msgid="239685342222975733">"Agar abonent <xliff:g id="MINUTES">%d</xliff:g> daqiqa ichida qayta qo‘ng‘iroq qilsa, qo‘ng‘iroq haqida xabar qilinsin"</string>
     <string name="zen_mode_when" msgid="2767193283311106373">"Avtomatik yoqish"</string>
     <string name="zen_mode_when_never" msgid="8809494351918405602">"Hech qachon"</string>
     <string name="zen_mode_when_every_night" msgid="3122486110091921009">"Har kuni kechasi"</string>
@@ -3035,9 +3062,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 yoniq bo‘lganda bloklash"</string>
+    <string name="zen_mode_screen_on" msgid="7712038508173845101">"Ekran yoniqligida"</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‘chiq bo‘lganda bloklash"</string>
+    <string name="zen_mode_screen_off" msgid="5026854939192419879">"Ekran o‘chiqligida"</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>
@@ -3045,6 +3072,7 @@
     <string name="zen_mode_screen_off_visual_interruptions" msgid="4850792880144382633">"Agar ekran o‘chiq bo‘lsa"</string>
     <string name="zen_mode_no_visual_interruptions" msgid="8742776003822778472">"Agar ekran yoniq yoki o‘chiq bo‘lsa"</string>
     <string name="notification_app_settings_button" msgid="6685640230371477485">"Bildirishnoma sozlamalari"</string>
+    <string name="suggestion_button_text" msgid="3275010948381252006">"OK"</string>
     <string name="device_feedback" msgid="3238056036766293294">"Qurilma haqida fikr-mulohaza"</string>
     <string name="restr_pin_enter_admin_pin" msgid="1085834515677448072">"Administrator PIN kodini kiriting"</string>
     <string name="switch_on_text" msgid="1124106706920572386">"YONIQ"</string>
@@ -3079,7 +3107,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">"Ishga tushirish uchun havolalar"</string>
+    <string name="app_launch_domain_links_title" msgid="1160925981363706090">"Havolalarni ochish"</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>
@@ -3132,10 +3160,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">"Ruxsat berilgan ilovalar (<xliff:g id="APPS">%1$s</xliff:g>)"</string>
+    <string name="app_permissions_summary" msgid="5163974162150406324">"<xliff:g id="APPS">%1$s</xliff:g> ruxsatnomasiga ega ilovalar"</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">"Ishga tushirish uchun havolalar"</string>
+    <string name="domain_urls_title" msgid="3132983644568821250">"Havolalarni ochish"</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>
@@ -3163,7 +3191,7 @@
     <string name="default_app" msgid="6864503001385843060">"(birlamchi)"</string>
     <string name="system_app" msgid="9068313769550747372">"(tizim)"</string>
     <string name="system_default_app" msgid="3091113402349739037">"(birlamchi)"</string>
-    <string name="apps_storage" msgid="4353308027210435513">"Ilovalar xotirasi"</string>
+    <string name="apps_storage" msgid="4353308027210435513">"Ilovalar egallagan joy"</string>
     <string name="usage_access" msgid="5479504953931038165">"Foydalanish tarixiga kirish"</string>
     <string name="permit_usage_access" msgid="4012876269445832300">"Foydalanish tarixiga kirishga ruxsat berish"</string>
     <string name="app_usage_preference" msgid="7065701732733134991">"Ilovadan foydalanish sozlamalari"</string>
@@ -3210,15 +3238,15 @@
     <string name="share_remote_bugreport_dialog_message_finished" msgid="4973886976504823801">"Administratoringiz bu qurilma nosozliklarini tuzatish uchun xatoliklar hisobotini so‘ramoqda. Ilova va ma’lumotlardan foydalanilishi mumkin."</string>
     <string name="share_remote_bugreport_dialog_message" msgid="3495929560689435496">"Administratoringiz bu qurilma nosozliklarini tuzatish uchun xatoliklar hisobotini so‘ramoqda. Ilova va ma’lumotlardan foydalanilishi va bu vaqtincha qurilmangizni sekinlashtirishi ham mumkin."</string>
     <string name="sharing_remote_bugreport_dialog_message" msgid="5859287696666024466">"Ushbu xatoliklar hisoboti administratoringiz tomonidan yuborilmoqda. Batafsil ma’lumot olish uchun administratoringiz bilan bog‘laning."</string>
-    <string name="share_remote_bugreport_action" msgid="532226159318779397">"Baham ko‘rish"</string>
+    <string name="share_remote_bugreport_action" msgid="532226159318779397">"Ulashish"</string>
     <string name="decline_remote_bugreport_action" msgid="518720235407565134">"Rad etish"</string>
     <string name="usb_use_charging_only" msgid="2180443097365214467">"Shu qurilmani quvvatlash"</string>
     <string name="usb_use_charging_only_desc" msgid="3066256793008540627">"Faqat shu qurilmani quvvatlash"</string>
     <string name="usb_use_power_only" msgid="6426550616883919530">"Quvvat uzatish"</string>
     <string name="usb_use_power_only_desc" msgid="3461232831015575152">"Boshqa ulangan qurilmani quvvatlash. Faqat USB orqali quvvatlash mumkin bo‘lgan qurilmalarda ishlaydi."</string>
-    <string name="usb_use_file_transfers" msgid="7409600791007250137">"Fayl o‘tkazish"</string>
+    <string name="usb_use_file_transfers" msgid="7409600791007250137">"Fayl uzatish"</string>
     <string name="usb_use_file_transfers_desc" msgid="4235764784331804488">"Boshqa qurilmaga fayl o‘tkazish"</string>
-    <string name="usb_use_photo_transfers" msgid="7794775645350330454">"Suratlarni o‘tkazish (PTP)"</string>
+    <string name="usb_use_photo_transfers" msgid="7794775645350330454">"Rasm uzatish (PTP)"</string>
     <string name="usb_use_photo_transfers_desc" msgid="2963034811151325996">"Agar MTP qo‘llab-quvvatlanmasa, surat yoki fayllarni o‘tkazish (PTP)"</string>
     <string name="usb_use_MIDI" msgid="870922185938298263">"MIDI sifatida foydalanish"</string>
     <string name="usb_use_MIDI_desc" msgid="8473936990076693175">"Bu qurilmadan MIDI sifatida foydalanish"</string>
@@ -3227,8 +3255,9 @@
     <string name="usb_summary_charging_only" msgid="7544327009143659751">"Shu qurilmani quvvatlash"</string>
     <string name="usb_summary_power_only" msgid="3629517713817003738">"Quvvat uzatish"</string>
     <string name="usb_summary_file_transfers" msgid="6435943692610175111">"Fayllarni o‘tkazish"</string>
-    <string name="usb_summary_photo_transfers" msgid="8440204169576585250">"Suratlarni o‘tkazish (PTP)"</string>
+    <string name="usb_summary_photo_transfers" msgid="8440204169576585250">"Rasm uzatish (PTP)"</string>
     <string name="usb_summary_MIDI" msgid="5687906612187885908">"MIDI sifatida foydalanish"</string>
+    <string name="sms_mirroring_pref" msgid="6475043279147376031">"SMS translatsiyasi"</string>
     <string name="background_check_pref" msgid="7550258400138010979">"Fonda tekshirish"</string>
     <string name="background_check_title" msgid="4534254315824525593">"Butun fonga ruxsat"</string>
     <string name="assist_access_context_title" msgid="2269032346698890257">"Ekrandagi matndan foydalanish"</string>
@@ -3272,22 +3301,22 @@
     <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 oynalar ustidan ochish"</string>
-    <string name="system_alert_window_settings" msgid="8466613169103527868">"Boshqa oynalar ustidan ochish"</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="system_alert_window_apps_title" msgid="7005760279028569491">"Ilovalar"</string>
-    <string name="system_alert_window_access_title" msgid="6297115362542361241">"Boshqa oynalar ustidan ochish"</string>
+    <string name="system_alert_window_access_title" msgid="6297115362542361241">"Boshqa ilovalar ustidan ochilish"</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 oynalar ustidan ochish"</string>
+    <string name="overlay_settings" msgid="6930854109449524280">"Boshqa ilovalar ustidan ochilish"</string>
     <string name="system_alert_window_summary" msgid="602892301318324492">"<xliff:g id="COUNT_0">%1$d</xliff:g> ta ilova boshqa oynalar ustidan ochilishi mumkin (jami: <xliff:g id="COUNT_1">%2$d</xliff:g>)"</string>
     <string name="filter_overlay_apps" msgid="6965969283342557573">"Ruxsatga ega ilovalar"</string>
     <string name="app_permission_summary_allowed" msgid="1505409933012886711">"Ruxsat berilgan"</string>
     <string name="app_permission_summary_not_allowed" msgid="2592617058101882802">"Ruxsat berilmagan"</string>
     <string name="keywords_install_other_apps" msgid="761078076051006558">"notanish manbalar ilovalar o‘rnatish"</string>
-    <string name="write_settings" msgid="4797457275727195681">"Tizim sozlamalarini o‘zgar-sh"</string>
+    <string name="write_settings" msgid="4797457275727195681">"Tizim sozlamalarini o‘zgartirish"</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>
@@ -3295,7 +3324,7 @@
     <string name="write_settings_title" msgid="4232152481902542284">"Tizim sozlamalarini o‘zgartirishi mumkin"</string>
     <string name="write_system_settings" msgid="3482913590601096763">"Tizim sozlamalarini o‘zgartirish"</string>
     <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="permit_write_settings" msgid="658555006453212691">"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>
@@ -3390,22 +3419,25 @@
     <string name="color_temperature" msgid="2070126836910615605">"Salqin rang harorati"</string>
     <string name="color_temperature_desc" msgid="4793729830226404052">"Salqin displey ranglaridan foydalanish"</string>
     <string name="color_temperature_toast" msgid="4974218172133854827">"Rangni o‘zgartirish uchun ekranni o‘chiring"</string>
-    <string name="telephony_monitor_toast" msgid="7003764250271195384">"Telefoniya nazoratiga o‘zgartirish kiritish uchun qurilmani o‘chirib yoqing"</string>
+    <string name="connectivity_monitor_switch" msgid="9059759348648583421">"Aloqa nazorati"</string>
+    <string name="connectivity_monitor_switch_summary" msgid="2828658652378866401">"Aloqa nazorati aloqa bilan bog‘liq muammolar aniqlansa va foydalanuvchiga xatolikni yuborishi uchun bildirishnoma yuborib, jurnallarni to‘playdi"</string>
+    <string name="connectivity_monitor_toast" msgid="5551859612881173028">"Aloqa nazoratiga o‘zgartirish kiritish uchun qurilmani o‘chirib yoqing"</string>
     <string name="camera_hal_hdrplus_switch" msgid="8377365197105267466">"Kamera HAL HDR+"</string>
     <string name="camera_hal_hdrplus_toast" msgid="2063703797270055299">"Kamera HAL HDR+ qilib o‘zgartirish uchun qurilmani qayta ishga tushiring"</string>
+    <string name="camera_laser_sensor_switch" msgid="8913588990743234440">"Kameraning lazer sensori"</string>
     <string name="ota_disable_automatic_update" msgid="2319639631655915050">"Avtomatik tizim yangilanishlari"</string>
     <string name="usage" msgid="2977875522080448986">"Trafik sarfi"</string>
-    <string name="cellular_data_usage" msgid="2155683719898158203">"Mobil internet trafigi sarfi"</string>
+    <string name="cellular_data_usage" msgid="2155683719898158203">"Mobil internet-trafik"</string>
     <string name="wifi_data_usage" msgid="686754111095324306">"Wi-Fi trafik sarfi"</string>
     <string name="ethernet_data_usage" msgid="5108764537574354616">"Ethernet ma’lumotlari sarfi"</string>
     <string name="wifi" msgid="1081550856200013637">"Wi-Fi"</string>
     <string name="ethernet" msgid="6600095783781389720">"Ethernet"</string>
-    <string name="cell_data_template" msgid="405684854174361041">"<xliff:g id="AMOUNT">^1</xliff:g> mobil internet trafigi"</string>
+    <string name="cell_data_template" msgid="405684854174361041">"<xliff:g id="AMOUNT">^1</xliff:g> mobil trafik"</string>
     <string name="wifi_data_template" msgid="6265570748799357386">"Wi-Fi orqali sarflangan trafik: <xliff:g id="AMOUNT">^1</xliff:g>"</string>
     <string name="ethernet_data_template" msgid="5782476509881033590">"Ethernet orqali sarflangan trafik: <xliff:g id="AMOUNT">^1</xliff:g>"</string>
     <string name="cell_warning_only" msgid="763147658209027140">"Ma’lumotlarni uzatishdagi ogohlantirishlar: <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="cell_warning_and_limit" msgid="2273413629267437470">"Ma’lumotlarni uzatishdagi ogohlantirishlar: <xliff:g id="ID_1">%1$s</xliff:g> / Ma’lumotlarni uzatish cheklovi: <xliff:g id="ID_2">%2$s</xliff:g>"</string>
-    <string name="billing_cycle" msgid="5169909190811133499">"To‘lov davriyligi"</string>
+    <string name="billing_cycle" msgid="5169909190811133499">"Hisob-kitob davri"</string>
     <string name="billing_cycle_fragment_summary" msgid="8231066353654583106">"Har oyda (<xliff:g id="ID_1">%1$s</xliff:g>-kuni)"</string>
     <string name="network_restrictions" msgid="8234695294536675380">"Tarmoq cheklovlari"</string>
     <plurals name="network_restrictions_summary" formatted="false" msgid="4301618027244595839">
@@ -3414,11 +3446,11 @@
     </plurals>
     <string name="operator_warning" msgid="1862988028996859195">"Aloqa operatorining hisob-kitobi qurilmanikidan farq qilishi mumkin"</string>
     <string name="data_used_template" msgid="3245919669966296505">"<xliff:g id="ID_1">%1$s</xliff:g> sarflandi"</string>
-    <string name="set_data_warning" msgid="6115364758236594593">"Trafik sarfiga ogohlantirish o‘rnatish"</string>
+    <string name="set_data_warning" msgid="6115364758236594593">"Trafik sarfiga oid ogohlantirish"</string>
     <string name="data_warning" msgid="209133958008062117">"Ogohlantirishlar"</string>
-    <string name="set_data_limit" msgid="2901526323210516923">"Trafik cheklovini o‘rnatish"</string>
-    <string name="data_limit" msgid="1885406964934590552">"Trafik cheklovini o‘rnatish"</string>
-    <string name="data_usage_template" msgid="392191945602400904">"<xliff:g id="ID_2">%2$s</xliff:g> oraliqda <xliff:g id="ID_1">%1$s</xliff:g> sarflandi"</string>
+    <string name="set_data_limit" msgid="2901526323210516923">"Trafik cheklovini belgilash"</string>
+    <string name="data_limit" msgid="1885406964934590552">"Trafik cheklovi"</string>
+    <string name="data_usage_template" msgid="2923744765873163859">"<xliff:g id="ID_1">%1$s</xliff:g> ishlatilgan (<xliff:g id="ID_2">%2$s</xliff:g>)"</string>
     <string name="configure" msgid="1029654422228677273">"Sozlash"</string>
     <string name="data_usage_other_apps" msgid="3272872663517382050">"Foydalanilayotgan boshqa ilovalar"</string>
     <plurals name="data_saver_unrestricted_summary" formatted="false" msgid="2635267833484232703">
@@ -3426,19 +3458,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="952796077540228711">"Ma’lumotlarga cheksiz ruxsat"</string>
+    <string name="unrestricted_data_saver" msgid="952796077540228711">"Cheklanmagan mobil internet"</string>
     <string name="restrict_background_blacklisted" msgid="3995443391711013068">"Fondagi internet o‘chiq"</string>
     <string name="data_saver_on" msgid="6774217590237934709">"Yoniq"</string>
     <string name="data_saver_off" msgid="6892309031162738794">"O‘chiq"</string>
     <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 ilova"</string>
+    <string name="home_app" msgid="4066188520886810030">"Bosh ekran ilovasi"</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 bitta barmoq izi qo‘shing"</string>
+    <string name="suggestion_additional_fingerprints" msgid="2214281455363797037">"Yana barmoq izi qo‘shish"</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>
@@ -3472,7 +3504,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">"ovoz"</string>
+    <string name="notification_log_details_sound" msgid="5506232879598808099">"tovush"</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>
@@ -3487,15 +3519,15 @@
     <string name="button_confirm_convert_fbe" msgid="7101855374850373091">"O‘chirib tashlash va o‘girish"</string>
     <string name="reset_shortcut_manager_throttling" msgid="6495066467198668994">"ShortcutManager hisoblagichini qaytadan boshlash"</string>
     <string name="reset_shortcut_manager_throttling_complete" msgid="1826770872063707900">"ShortcutManager hisoblagichi qaytadan boshlandi"</string>
-    <string name="notification_suggestion_title" msgid="4506524937307816475">"Ekran qulfi bildirishnomalarini boshqaring"</string>
+    <string name="notification_suggestion_title" msgid="387052719462473500">"Ekran qulfidagi ma’lumotlarni boshqaring"</string>
     <string name="notification_suggestion_summary" msgid="8521159741445416875">"Bildirishnomani ko‘rsatish yoki berkitish"</string>
     <string name="page_tab_title_summary" msgid="4070309266374993258">"Hammasi"</string>
     <string name="page_tab_title_support" msgid="8483187649355540109">"Yordam va maslahatlar"</string>
     <string name="developer_smallest_width" msgid="7516950434587313360">"Eng kichik eni"</string>
     <string name="premium_sms_none" msgid="8268105565738040566">"O‘rnatilgan ilovalardan hech biri SMSdan foydalanish uchun ruxsat so‘ramagan."</string>
     <string name="premium_sms_warning" msgid="9086859595338944882">"SMS uchun sizdan haq olinishi va operatorga qo‘shimcha to‘lov amalga oshirilishi mumkin. Agar ilova uchun ruxsatnoma taqdim etsangiz, o‘sha ilovadan SMS yuborishingiz mumkin bo‘ladi."</string>
-    <string name="premium_sms_access" msgid="4660047004791638305">"SMSdan foydalanish"</string>
-    <string name="bluetooth_disabled" msgid="2456198532288640046">"Boshqa qurilmalarga ko‘rinmaydi"</string>
+    <string name="premium_sms_access" msgid="4660047004791638305">"Pulli SMS xabarlarga ruxsat"</string>
+    <string name="bluetooth_disabled" msgid="6244000672828617410">"O‘chiq"</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>
     <string name="demo_mode" msgid="2798762752209330277">"Tizim interfeysi demo rejimi"</string>
@@ -3519,7 +3551,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 kirib bo‘lmadimi?"</string>
+    <string name="support_sign_in_required_help" msgid="5200654782405538114">"Hisobingizga kira olmayapsizmi?"</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>
@@ -3574,7 +3606,7 @@
     <string name="ambient_display_title" product="device" msgid="3423781975742145894">"Qurilmani tekshirish uchun ekranni ikki marta bosing"</string>
     <string name="ambient_display_summary" msgid="525662960806416373">"Vaqt, bildirishnoma belgilari va boshqa ma’lumotlarni tekshirish uchun ekranni ikki marta bosing."</string>
     <string name="ambient_display_suggestion_summary" msgid="5987443721392571847">"Ekran o‘chiqligida bildirishnomalarni tekshirish"</string>
-    <string name="ambient_display_pickup_title" product="default" msgid="818688002837687268">"Tekshirish uchun telefonni yuqoriga ko‘taring"</string>
+    <string name="ambient_display_pickup_title" product="default" msgid="818688002837687268">"Bildirishnomalarni tekshirish uchun ko‘tarish"</string>
     <string name="ambient_display_pickup_title" product="tablet" msgid="4455864282995698097">"Tekshirish uchun planshetni yuqoriga ko‘taring"</string>
     <string name="ambient_display_pickup_title" product="device" msgid="5380534405773531175">"Tekshirish uchun qurilmani yuqoriga ko‘taring"</string>
     <string name="ambient_display_pickup_summary" product="default" msgid="4567020486787561873">"Vaqt, bildirishnoma belgilari va boshqa ma’lumotlarni tekshirish uchun telefonni qo‘lingizga oling."</string>
@@ -3597,7 +3629,7 @@
     <string name="web_action_enable_title" msgid="4051513950976670853">"Darhol ochiladigan ilovalar"</string>
     <string name="web_action_enable_summary" msgid="3108127559723396382">"Havolalarni ilovalarda (hatto ular o‘rnatilmagan bo‘lsa ham) ochish"</string>
     <string name="web_action_section_title" msgid="7364647086538399136">"Darhol ochiladigan ilovalar"</string>
-    <string name="instant_apps_account" msgid="1433620209791992528">"Darhol ochiladigan ilovalar uchun hisob"</string>
+    <string name="instant_apps_settings" msgid="8827777916518348213">"Darhol ochiladigan ilovalar sozlamalari"</string>
     <string name="domain_url_section_title" msgid="7046835219056428883">"O‘rnatilgan ilovalar"</string>
     <string name="automatic_storage_manager_activation_warning" msgid="6353100011690933254">"Xotirangiz hozirda xotira boshqaruvi tomonidan boshqarilmoqda"</string>
     <string name="account_for_section_header" msgid="5356566418548737121">"<xliff:g id="USER_NAME">%1$s</xliff:g> uchun hisoblar"</string>
@@ -3644,7 +3676,9 @@
     <string name="enterprise_privacy_always_on_vpn_personal" msgid="9217774730260037434">"Doimiy VPN shaxsiy profilingizda yoqildi"</string>
     <string name="enterprise_privacy_always_on_vpn_work" msgid="7244472958208315814">"Doimiy VPN ishchi profilingizda yoqildi"</string>
     <string name="enterprise_privacy_global_http_proxy" msgid="7936664553416257333">"Global HTTP proksi-serveri sozlandi"</string>
-    <string name="enterprise_privacy_ca_certs" msgid="5885892204903688909">"Ishonchli sertifikatlar"</string>
+    <string name="enterprise_privacy_ca_certs_device" msgid="2019652712782510262">"Ishonchli sertifikatlar"</string>
+    <string name="enterprise_privacy_ca_certs_personal" msgid="2279084820904076599">"Shaxsiy profilingizdagi ishonchli sertifikatlar"</string>
+    <string name="enterprise_privacy_ca_certs_work" msgid="6187377647815301809">"Ishchi profilingizdagi ishonchli sertifikatlar"</string>
     <plurals name="enterprise_privacy_number_ca_certs" formatted="false" msgid="526375234629534165">
       <item quantity="other">Kamida <xliff:g id="COUNT_1">%d</xliff:g> ta CA sertifikati</item>
       <item quantity="one">Kamida <xliff:g id="COUNT_0">%d</xliff:g> ta CA sertifikati</item>
@@ -3678,7 +3712,7 @@
     </plurals>
     <string name="app_names_concatenation_template_2" msgid="4309216198909946380">"<xliff:g id="FIRST_APP_NAME">%1$s</xliff:g>, <xliff:g id="SECOND_APP_NAME">%2$s</xliff:g>"</string>
     <string name="app_names_concatenation_template_3" msgid="8949045544491604376">"<xliff:g id="FIRST_APP_NAME">%1$s</xliff:g>, <xliff:g id="SECOND_APP_NAME">%2$s</xliff:g>, <xliff:g id="THIRD_APP_NAME">%3$s</xliff:g>"</string>
-    <string name="storage_photos_videos" msgid="319854636702241898">"Surat va videolar"</string>
+    <string name="storage_photos_videos" msgid="319854636702241898">"Suratlar va videolar"</string>
     <string name="storage_music_audio" msgid="789779084825206838">"Musiqa va audio"</string>
     <string name="storage_games" msgid="7703159201697117621">"O‘yinlar"</string>
     <string name="storage_other_apps" msgid="5524321740031718083">"Boshqa ilovalar"</string>
@@ -3707,6 +3741,8 @@
     <string name="carrier_provisioning" msgid="4398683675591893169">"Operator haqida"</string>
     <string name="trigger_carrier_provisioning" msgid="3434865918009286187">"Operator ta’minotini yoqish/o‘chirish"</string>
     <string name="new_device_suggestion_title" msgid="698847081680980774">"Nima yangi va qiziqarli narsalar bor?"</string>
-    <string name="new_device_suggestion_summary" msgid="7172709269203435870">"Eng sara 5 ta xususiyati bilan tanishing"</string>
+    <string name="new_device_suggestion_summary" product="default" msgid="206396571522515855">"Yangi telefoningiz bilan tanishib chiqing"</string>
+    <string name="new_device_suggestion_summary" product="tablet" msgid="393751455688210956">"Yangi planshetingiz bilan tanishib chiqing"</string>
+    <string name="new_device_suggestion_summary" product="device" msgid="2939870049868336652">"Yangi qurilmangiz bilan tanishib chiqing"</string>
     <string name="disabled_low_ram_device" msgid="3751578499721173344">"Bu funksiya ushbu qurilmada ishlamaydi"</string>
 </resources>
diff --git a/res/values-vi/arrays.xml b/res/values-vi/arrays.xml
index 641f6ed..5c8e09b 100644
--- a/res/values-vi/arrays.xml
+++ b/res/values-vi/arrays.xml
@@ -100,8 +100,6 @@
     <!-- no translation found for wifi_security_no_eap:0 (2084555984818107151) -->
     <!-- no translation found for wifi_security_no_eap:1 (397579322683471524) -->
     <!-- no translation found for wifi_security_no_eap:2 (1968820975358150484) -->
-    <!-- no translation found for wifi_ap_security:0 (5251664683198623324) -->
-    <!-- no translation found for wifi_ap_security:1 (7989073072260294673) -->
   <string-array name="wifi_eap_method">
     <item msgid="1160193392455075561">"PEAP"</item>
     <item msgid="7981731051382306293">"TLS"</item>
diff --git a/res/values-vi/strings.xml b/res/values-vi/strings.xml
index 4cf3010..7c32d82 100644
--- a/res/values-vi/strings.xml
+++ b/res/values-vi/strings.xml
@@ -166,7 +166,7 @@
     <string name="bluetooth_map_acceptance_dialog_text" msgid="8712508202081143737">"%1$s muốn truy cập tin nhắn của bạn. Bạn có muốn cấp quyền truy cập cho %2$s không?"</string>
     <string name="bluetooth_sap_request" msgid="2669762224045354417">"Yêu cầu truy cập SIM"</string>
     <string name="bluetooth_sap_acceptance_dialog_text" msgid="4414253873553608690">"<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g> muốn truy cập vào thẻ SIM của bạn. Cấp quyền truy cập vào thẻ SIM sẽ vô hiệu hóa khả năng kết nối dữ liệu trên thiết bị của bạn trong suốt thời gian kết nối. Cấp quyền truy cập vào <xliff:g id="DEVICE_NAME_1">%2$s?</xliff:g>"</string>
-    <string name="bluetooth_device_name_summary" msgid="4757990010751789977">"Hiển thị là <xliff:g id="DEVICE_NAME">^1</xliff:g> với các thiết bị khác"</string>
+    <string name="bluetooth_device_name_summary" msgid="522235742194965734">"Hiển thị là <xliff:g id="DEVICE_NAME">^1</xliff:g> với các thiết bị khác"</string>
     <string name="bluetooth_paired_device_title" msgid="8638994696317952019">"Thiết bị của bạn"</string>
     <string name="bluetooth_pairing_page_title" msgid="7712127387361962608">"Ghép nối thiết bị mới"</string>
     <string name="date_and_time" msgid="9062980487860757694">"Ngày và giờ"</string>
@@ -215,7 +215,7 @@
     <string name="radio_info_band_mode_label" msgid="8730871744887454509">"Chọn dải tần số"</string>
     <string name="radio_info_voice_network_type_label" msgid="1443496502370667071">"Loại mạng thoại:"</string>
     <string name="radio_info_data_network_type_label" msgid="7094323145105149312">"Loại mạng dữ liệu:"</string>
-    <string name="radio_info_set_perferred_label" msgid="3511830813500105512">"Đặt loại mạng ưa thích:"</string>
+    <string name="radio_info_set_perferred_label" msgid="3511830813500105512">"Đặt loại mạng ưu tiên:"</string>
     <string name="radio_info_ping_hostname_v4" msgid="7045103377818314709">"Tên máy chủ Ping (www.google.com) IPv4:"</string>
     <string name="radio_info_ping_hostname_v6" msgid="1130906124160553954">"Tên máy chủ Ping (www.google.com) IPv6:"</string>
     <string name="radio_info_http_client_test" msgid="2382286093023138339">"Kiểm tra máy khách HTTP:"</string>
@@ -306,12 +306,14 @@
     <string name="date_and_time_settings_title" msgid="3350640463596716780">"Ngày &amp; giờ"</string>
     <string name="date_and_time_settings_title_setup_wizard" msgid="2391530758339384324">"Đặt ngày giờ"</string>
     <string name="date_and_time_settings_summary" msgid="7095318986757583584">"Đặt ngày, giờ, múi giờ &amp; định dạng"</string>
-    <string name="date_time_auto" msgid="7076906458515908345">"Ngày &amp; giờ tự động"</string>
+    <string name="date_time_auto" msgid="7076906458515908345">"Ngày và giờ tự động"</string>
     <string name="date_time_auto_summaryOn" msgid="4609619490075140381">"Sử dụng thời gian do mạng cung cấp"</string>
     <string name="date_time_auto_summaryOff" msgid="8698762649061882791">"Sử dụng thời gian do mạng cung cấp"</string>
     <string name="zone_auto" msgid="334783869352026648">"Múi giờ tự động"</string>
     <string name="zone_auto_summaryOn" msgid="6142830927278458314">"Sử dụng múi giờ do mạng cung cấp"</string>
     <string name="zone_auto_summaryOff" msgid="2597745783162041390">"Sử dụng múi giờ do mạng cung cấp"</string>
+    <string name="date_time_24hour_auto" msgid="2117383168985653422">"Định dạng 24 giờ tự động"</string>
+    <string name="date_time_24hour_auto_summary" msgid="6351812925651480277">"Sử dụng ngôn ngữ mặc định"</string>
     <string name="date_time_24hour_title" msgid="3203537578602803850">"Định dạng 24 giờ"</string>
     <string name="date_time_24hour" msgid="1193032284921000063">"Sử dụng định dạng 24 giờ"</string>
     <string name="date_time_set_time_title" msgid="6296795651349047016">"Thời gian"</string>
@@ -326,24 +328,24 @@
     <string name="time_picker_title" msgid="483460752287255019">"Thời gian"</string>
     <string name="lock_after_timeout" msgid="4590337686681194648">"Tự động khóa"</string>
     <string name="lock_after_timeout_summary" msgid="6128431871360905631">"<xliff:g id="TIMEOUT_STRING">%1$s</xliff:g> sau khi ngủ"</string>
-    <string name="lock_immediately_summary_with_exception" msgid="9119632173886172690">"Ngay sau khi ngủ, trừ khi được <xliff:g id="TRUST_AGENT_NAME">%1$s</xliff:g> mở khóa"</string>
-    <string name="lock_after_timeout_summary_with_exception" msgid="5579064842797188409">"<xliff:g id="TIMEOUT_STRING">%1$s</xliff:g> sau khi ngủ, trừ khi vẫn mở khóa bởi <xliff:g id="TRUST_AGENT_NAME">%2$s</xliff:g>"</string>
+    <string name="lock_immediately_summary_with_exception" msgid="9119632173886172690">"Ngay sau khi chuyển sang chế độ ngủ, trừ khi vẫn được <xliff:g id="TRUST_AGENT_NAME">%1$s</xliff:g> mở khóa"</string>
+    <string name="lock_after_timeout_summary_with_exception" msgid="5579064842797188409">"<xliff:g id="TIMEOUT_STRING">%1$s</xliff:g> sau khi sang chế độ ngủ, trừ khi vẫn được <xliff:g id="TRUST_AGENT_NAME">%2$s</xliff:g> mở khóa"</string>
     <string name="show_owner_info_on_lockscreen_label" msgid="5074906168357568434">"Hiển thị thông tin chủ sở hữu trên màn hình khóa"</string>
     <string name="owner_info_settings_title" msgid="5530285568897386122">"Thông báo màn hình khóa"</string>
     <string name="security_enable_widgets_title" msgid="2754833397070967846">"Bật tiện ích con"</string>
     <string name="security_enable_widgets_disabled_summary" msgid="6392489775303464905">"Bị quản trị viên vô hiệu hóa"</string>
     <string name="owner_info_settings_summary" msgid="7472393443779227052">"Không có"</string>
     <string name="owner_info_settings_status" msgid="120407527726476378">"<xliff:g id="COUNT_0">%1$d</xliff:g> / <xliff:g id="COUNT_1">%2$d</xliff:g>"</string>
-    <string name="owner_info_settings_edit_text_hint" msgid="7591869574491036360">"Ví dụ: Android của Joe."</string>
+    <string name="owner_info_settings_edit_text_hint" msgid="7591869574491036360">"Ví dụ: Android của Huy."</string>
     <string name="user_info_settings_title" msgid="1195015434996724736">"Thông tin người dùng"</string>
     <string name="show_profile_info_on_lockscreen_label" msgid="2741208907263877990">"Hiển thị thông tin tiểu sử trên màn hình khóa"</string>
     <string name="profile_info_settings_title" msgid="3518603215935346604">"Thông tin hồ sơ"</string>
     <string name="Accounts_settings_title" msgid="1643879107901699406">"Tài khoản"</string>
     <string name="location_settings_title" msgid="1369675479310751735">"Vị trí"</string>
     <string name="account_settings_title" msgid="626177544686329806">"Tài khoản"</string>
-    <string name="security_settings_title" msgid="4918904614964215087">"Bảo mật &amp; vị trí"</string>
+    <string name="security_settings_title" msgid="4918904614964215087">"Bảo mật và vị trí"</string>
     <string name="encryption_and_credential_settings_title" msgid="6514904533438791561">"Mã hóa và thông tin đăng nhập"</string>
-    <string name="encryption_and_credential_settings_summary" product="default" msgid="8721883002237981248">"Điện thoại được mã hóa"</string>
+    <string name="encryption_and_credential_settings_summary" product="default" msgid="8721883002237981248">"Đã mã hóa điện thoại"</string>
     <string name="encryption_and_credential_settings_summary" product="tablet" msgid="7200428573872395685">"Thiết bị được mã hóa"</string>
     <string name="lockscreen_settings_title" msgid="3922976395527087455">"Tùy chọn màn hình khóa"</string>
     <string name="security_settings_summary" msgid="967393342537986570">"Đặt Vị trí của tôi, mở khóa màn hình, khóa thẻ SIM, khóa bộ nhớ thông tin xác thực"</string>
@@ -372,6 +374,9 @@
     <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="1961957425135180242">"Tiếp theo"</string>
+    <string name="setup_fingerprint_enroll_skip_title" msgid="362050541117362034">"Bạn muốn bỏ qua vân tay?"</string>
+    <string name="setup_fingerprint_enroll_skip_after_adding_lock_text" msgid="958990414356204763">"Bạn chỉ mất một hoặc hai phút để thiết lập vân tay. Nếu bỏ qua bước này, bạn có thể thêm vân tay vào lúc khác trong cài đặt."</string>
+    <string name="lock_screen_intro_skip_title" msgid="4988210105913705679">"Bạn muốn bỏ qua khóa màn hình?"</string>
     <string name="lock_screen_intro_skip_dialog_text_frp" product="tablet" msgid="1581834104051243425">"Các tính năng bảo vệ thiết bị sẽ không được bật. Bạn sẽ không thể ngăn người khác sử dụng máy tính bảng này nếu máy tính bảng bị mất, bị đánh cắp hoặc bị đặt lại."</string>
     <string name="lock_screen_intro_skip_dialog_text_frp" product="device" msgid="4629503416877189572">"Các tính năng bảo vệ thiết bị sẽ không được bật. Bạn sẽ không thể ngăn người khác sử dụng thiết bị này nếu thiết bị bị mất, bị đánh cắp hoặc bị đặt lại."</string>
     <string name="lock_screen_intro_skip_dialog_text_frp" product="default" msgid="2423428240245737909">"Các tính năng bảo vệ thiết bị sẽ không được bật. Bạn sẽ không thể ngăn người khác sử dụng điện thoại này nếu điện thoại bị mất, bị đánh cắp hoặc bị đặt lại."</string>
@@ -381,7 +386,7 @@
     <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="3051496861358227199">"Chạm vào cảm biến"</string>
-    <string name="security_settings_fingerprint_enroll_find_sensor_message" msgid="8793966374365960368">"Ở mặt sau của điện thoại. Sử dụng ngón tay trỏ của bạn."</string>
+    <string name="security_settings_fingerprint_enroll_find_sensor_message" msgid="8793966374365960368">"Cảm biến nằm ở mặt sau của điện thoại. Hãy dùng ngón tay trỏ của bạn."</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_content_description" msgid="2058830032070449160">"Hình minh họa với vị trí cảm biến vân tay và thiết bị"</string>
     <string name="security_settings_fingerprint_enroll_dialog_name_label" msgid="7086763077909041106">"Tên"</string>
     <string name="security_settings_fingerprint_enroll_dialog_ok" msgid="4150384963879569750">"OK"</string>
@@ -391,7 +396,7 @@
     <string name="security_settings_fingerprint_enroll_repeat_title" msgid="2819679722403209778">"Nhấc ngón tay, rồi chạm lại"</string>
     <string name="security_settings_fingerprint_enroll_repeat_message" msgid="6158989350522518586">"Tiếp tục nhấc ngón tay để thêm các phần khác nhau của vân tay"</string>
     <string name="security_settings_fingerprint_enroll_finish_title" msgid="7567276170287972230">"Đã thêm vân tay"</string>
-    <string name="security_settings_fingerprint_enroll_finish_message" msgid="4796715961273420536">"Khi bạn nhìn thấy biểu tượng này, hãy sử dụng vân tay của bạn để nhận dạng hoặc phê duyệt các giao dịch mua."</string>
+    <string name="security_settings_fingerprint_enroll_finish_message" msgid="4796715961273420536">"Khi bạn nhìn thấy biểu tượng này, hãy sử dụng vân tay của bạn để nhận dạng hoặc phê duyệt mua hàng."</string>
     <string name="security_settings_fingerprint_enroll_enrolling_skip" msgid="3710211704052369752">"Thực hiện sau"</string>
     <string name="setup_fingerprint_enroll_enrolling_skip_title" msgid="6808422329107426923">"Bỏ qua thiết lập vân tay?"</string>
     <string name="setup_fingerprint_enroll_enrolling_skip_message" msgid="274849306857859783">"Bạn đã chọn sử dụng vân tay là cách mở khóa điện thoại của mình. Nếu bỏ qua ngay bây giờ, bạn sẽ cần thiết lập cài đặt này sau. Thiết lập sẽ chỉ mất ít phút."</string>
@@ -402,7 +407,7 @@
     <string name="security_settings_fingerprint_enroll_error_dialog_title" msgid="3618021988442639280">"Đăng ký chưa hoàn tất"</string>
     <string name="security_settings_fingerprint_enroll_error_timeout_dialog_message" msgid="2942551158278899627">"Đã đến giới hạn thời gian đăng ký dấu vân tay. Hãy thử lại."</string>
     <string name="security_settings_fingerprint_enroll_error_generic_dialog_message" msgid="3624760637222239293">"Đăng ký dấu vân tay không hoạt động. Hãy thử lại hoặc sử dụng ngón tay khác."</string>
-    <string name="fingerprint_enroll_button_add" msgid="6317978977419045463">"Thêm khác"</string>
+    <string name="fingerprint_enroll_button_add" msgid="6317978977419045463">"Thêm vân tay khác"</string>
     <string name="fingerprint_enroll_button_next" msgid="6247009337616342759">"Tiếp theo"</string>
     <string name="security_settings_fingerprint_enroll_disclaimer" msgid="2624905914239271751">"Ngoài việc mở khóa điện thoại, bạn còn có thể sử dụng vân tay của mình để ủy quyền mua và truy cập ứng dụng. "<annotation id="url">"Tìm hiểu thêm"</annotation></string>
     <string name="security_settings_fingerprint_enroll_disclaimer_lockscreen_disabled" msgid="7846871823167357942">" Tùy chọn khóa màn hình đã bị tắt. Hãy liên hệ với quản trị viên của tổ chức bạn để tìm hiểu thêm. "<annotation id="admin_details">"Thông tin chi tiết khác"</annotation>\n\n"Bạn vẫn có thể sử dụng vân tay của mình để ủy quyền mua hàng và truy cập ứng dụng. "<annotation id="url">"Tìm hiểu thêm"</annotation></string>
@@ -457,7 +462,7 @@
     <string name="setup_lock_settings_picker_title" product="tablet" msgid="90329443364067215">"Bảo vệ máy tính bảng của bạn"</string>
     <string name="setup_lock_settings_picker_title" product="device" msgid="2399952075134938929">"Bảo vệ thiết bị của bạn"</string>
     <string name="setup_lock_settings_picker_title" product="default" msgid="1572244299605153324">"Bảo vệ điện thoại của bạn"</string>
-    <string name="setup_lock_settings_picker_fingerprint_message" msgid="5585650064305600578">"Để tăng cường bảo mật, hãy thiết lập khóa màn hình dự phòng."</string>
+    <string name="lock_settings_picker_fingerprint_added_security_message" msgid="5768002109707648463">"Để tăng cường bảo mật, hãy đặt khóa màn hình dự phòng."</string>
     <string name="setup_lock_settings_picker_message" product="tablet" msgid="8919671129189936210">"Ngăn người khác sử dụng máy tính bảng 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="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>
@@ -588,14 +593,15 @@
     <string name="lockpassword_pin_no_sequential_digits" msgid="680765285206990584">"Không cho phép thứ tự chữ số tăng dần, giảm dần hoặc lặp lại"</string>
     <string name="lockpassword_ok_label" msgid="313822574062553672">"OK"</string>
     <string name="lockpassword_cancel_label" msgid="8818529276331121899">"Hủy"</string>
+    <string name="lockpassword_clear_label" msgid="5724429464960458155">"Xóa"</string>
     <string name="lockpattern_tutorial_cancel_label" msgid="6431583477570493261">"Hủy"</string>
     <string name="lockpattern_tutorial_continue_label" msgid="3559793618653400434">"Tiếp theo"</string>
     <string name="lock_setup" msgid="3355847066343753943">"Đã hoàn tất thiết lập."</string>
     <string name="manage_device_admin" msgid="537804979483211453">"Ư.dụng cho quản trị viên th.bị"</string>
     <string name="number_of_device_admins_none" msgid="7185056721919496069">"Không có ứng dụng nào hiện hoạt"</string>
     <plurals name="number_of_device_admins" formatted="false" msgid="3361891840111523393">
-      <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> ứng dụng hiện hoạt</item>
-      <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> ứng dụng hiện hoạt</item>
+      <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> ứng dụng đang hoạt động</item>
+      <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> ứng dụng đang hoạt động</item>
     </plurals>
     <string name="manage_trust_agents" msgid="4629279457536987768">"Tác nhân đáng tin cậy"</string>
     <string name="disabled_because_no_backup_security" msgid="6877660253409580377">"Để sử dụng, trước tiên hãy đặt khóa màn hình"</string>
@@ -702,9 +708,9 @@
     <string name="android_beam_settings_title" msgid="7832812974600338649">"Android Beam"</string>
     <string name="android_beam_on_summary" msgid="3618057099355636830">"Sẵn sàng truyền tải nội dung ứng dụng qua NFC"</string>
     <string name="android_beam_off_summary" msgid="4663095428454779138">"Tắt"</string>
-    <string name="android_beam_disabled_summary" msgid="1737782116894793393">"Không khả dụng vì NFC bị tắt"</string>
+    <string name="android_beam_disabled_summary" msgid="1737782116894793393">"Không sử dụng được vì NFC bị tắt"</string>
     <string name="android_beam_label" msgid="6257036050366775040">"Android Beam"</string>
-    <string name="android_beam_explained" msgid="1810540319385192758">"Khi tính năng này được bật, bạn có thể chiếu nội dung ứng dụng tới thiết bị hỗ trợ NFC khác bằng cách giữ các thiết bị gần nhau. Ví dụ: bạn có thể chiếu các trang web, video trên YouTube, danh bạ và nhiều nội dung khác.\n\nBạn chỉ cần đưa các thiết bị lại gần nhau (thường quay lưng vào nhau) rồi nhấn vào màn hình. Ứng dụng sẽ quyết định nội dung nào được chiếu."</string>
+    <string name="android_beam_explained" msgid="1810540319385192758">"Khi tính năng này được bật, bạn có thể truyền nội dung ứng dụng tới một thiết bị hỗ trợ NFC khác bằng cách giữ các thiết bị gần nhau. Ví dụ: bạn có thể truyền các trang web, video trên YouTube, liên hệ và nhiều nội dung khác.\n\nBạn chỉ cần đưa các thiết bị lại gần nhau (thường là chạm lưng vào nhau) rồi nhấn vào màn hình. Ứng dụng sẽ quyết định nội dung nào được truyền."</string>
     <string name="wifi_quick_toggle_title" msgid="8850161330437693895">"Wi‑Fi"</string>
     <string name="wifi_quick_toggle_summary" msgid="2696547080481267642">"Bật Wi‑Fi"</string>
     <string name="wifi_settings" msgid="29722149822540994">"Wi‑Fi"</string>
@@ -749,7 +755,7 @@
     <string name="wifi_configure_settings_preference_summary_wakeup_on" msgid="646393113104367290">"Wi-Fi bật lại tự động"</string>
     <string name="wifi_configure_settings_preference_summary_wakeup_off" msgid="2782566279864356713">"Wi-Fi không bật lại tự động"</string>
     <string name="wifi_access_points" msgid="7053990007031968609">"Mạng Wi‑Fi"</string>
-    <string name="wifi_menu_wps_pbc" msgid="2668564692207863017">"Nút Đẩy WPS"</string>
+    <string name="wifi_menu_wps_pbc" msgid="2668564692207863017">"Nút nhấn WPS"</string>
     <string name="wifi_menu_more_options" msgid="2448097861752719396">"Tùy chọn khác"</string>
     <string name="wifi_menu_wps_pin" msgid="6426448256268695933">"Nhập mã pin WPS"</string>
     <string name="wifi_menu_p2p" msgid="7619851399250896797">"Wi‑Fi Direct"</string>
@@ -761,7 +767,7 @@
     <string name="wifi_menu_forget" msgid="8736964302477327114">"Bỏ qua mạng"</string>
     <string name="wifi_menu_modify" msgid="2068554918652440105">"Sửa đổi mạng"</string>
     <string name="wifi_menu_write_to_nfc" msgid="7692881642188240324">"Ghi vào thẻ NFC"</string>
-    <string name="wifi_empty_list_wifi_off" msgid="8056223875951079463">"Để xem các mạng khả dụng, hãy bật Wi-Fi."</string>
+    <string name="wifi_empty_list_wifi_off" msgid="8056223875951079463">"Để xem các mạng có thể kết nối, hãy bật Wi-Fi."</string>
     <string name="wifi_empty_list_wifi_on" msgid="8746108031587976356">"Đang tìm kiếm mạng Wi‑Fi..."</string>
     <string name="wifi_empty_list_user_restricted" msgid="7322372065475939129">"Bạn không có quyền thay đổi mạng Wi‑Fi."</string>
     <string name="wifi_more" msgid="3195296805089107950">"Thêm"</string>
@@ -781,6 +787,7 @@
     <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>
@@ -817,6 +824,8 @@
     <string name="wifi_wps_available_first_item" msgid="4422547079984583502">"Có WPS"</string>
     <string name="wifi_wps_available_second_item" msgid="8427520131718215301">" (Có WPS)"</string>
     <string name="wifi_wps_nfc_enter_password" msgid="2288214226916117159">"Nhập mật khẩu mạng của bạn"</string>
+    <string name="wifi_carrier_connect" msgid="8174696557882299911">"Mạng Wi‑Fi của nhà cung cấp dịch vụ"</string>
+    <string name="wifi_carrier_content" msgid="4634077285415851933">"Kết nối qua <xliff:g id="NAME">%1%s</xliff:g>"</string>
     <string name="wifi_scan_always_turnon_message" msgid="203123538572122989">"Để nâng cao độ chính xác vị trí và phục vụ các mục đích khác, <xliff:g id="APP_NAME">%1$s</xliff:g> muốn bật tính năng quét mạng ngay cả khi Wi-Fi đang tắt.\n\nCho phép cài đặt này đối với tất cả ứng dụng muốn quét?"</string>
     <string name="wifi_scan_always_turnoff_message" msgid="5538901671131941043">"Để tắt tính năng này, đi tới phần Nâng cao trong trình đơn mục bổ sung."</string>
     <string name="wifi_scan_always_confirm_allow" msgid="5355973075896817232">"Cho phép"</string>
@@ -834,6 +843,7 @@
     <string name="wifi_connect" msgid="1076622875777072845">"Kết nối"</string>
     <string name="wifi_failed_connect_message" msgid="8491902558970292871">"Không thể kết nối với mạng"</string>
     <string name="wifi_forget" msgid="8168174695608386644">"Quên"</string>
+    <string name="wifi_modify" msgid="6100248070440710782">"Sửa đổi"</string>
     <string name="wifi_failed_forget_message" msgid="1348172929201654986">"Không thể bỏ qua mạng"</string>
     <string name="wifi_save" msgid="3331121567988522826">"Lưu"</string>
     <string name="wifi_failed_save_message" msgid="6650004874143815692">"Không thể lưu mạng"</string>
@@ -846,6 +856,7 @@
     <string name="wifi_advanced_titlebar" msgid="4485841401774142908">"Wi‑Fi nâng cao"</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_title" msgid="3471132676909349382">"Thông tin về mạng"</string>
     <string name="wifi_details_subnet_mask" msgid="6720279144174924410">"Mặt nạ mạng con"</string>
     <string name="wifi_details_dns" msgid="8648826607751830768">"DNS"</string>
     <string name="wifi_details_ipv6_address_header" msgid="6734119149106422148">"Địa chỉ IPv6"</string>
@@ -878,16 +889,15 @@
     <string name="wifi_p2p_cancel_connect_title" msgid="255267538099324413">"Hủy lời mời?"</string>
     <string name="wifi_p2p_cancel_connect_message" msgid="7477756213423749402">"Bạn có muốn hủy lời mời kết nối với <xliff:g id="PEER_NAME">%1$s</xliff:g> không?"</string>
     <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_off_subtext" msgid="5466126533609394170">"Không chia sẻ Internet hoặc nội dung với các thiết bị khác"</string>
     <string name="wifi_hotspot_tethering_on_subtext" product="tablet" msgid="5752490509369962007">"Chia sẻ kết nối Internet của máy tính bảng này qua điểm phát sóng"</string>
     <string name="wifi_hotspot_tethering_on_subtext" product="default" msgid="6461075246164300670">"Chia sẻ kết nối Internet của điện thoại này qua điểm phát sóng"</string>
     <string name="wifi_hotspot_on_local_only_subtext" msgid="2068110388011294735">"Ứng dụng đang chia sẻ nội dung. Để chia sẻ kết nối Internet, hãy tắt điểm phát sóng, rồi bật lại"</string>
-    <string name="wifi_hotspot_name_title" msgid="1341735529132128887">"Tên Wi-Fi"</string>
+    <string name="wifi_hotspot_name_title" msgid="8237000746618636778">"Tên điểm phát sóng"</string>
     <string name="wifi_hotspot_name_summary_connecting" msgid="3378299995508671967">"Đang bật <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>..."</string>
     <string name="wifi_hotspot_name_summary_connected" msgid="3888672084861445362">"Các thiết bị khác có thể kết nối với <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>"</string>
-    <string name="wifi_hotspot_password_title" msgid="1955592302902091281">"Mật khẩu Wi-Fi"</string>
+    <string name="wifi_hotspot_password_title" msgid="8676859981917573801">"Mật khẩu điểm phát sóng"</string>
     <string name="wifi_hotspot_ap_band_title" msgid="1165801173359290681">"Băng tần AP"</string>
     <string name="wifi_hotspot_footer_info_regular" msgid="1203489406068036455">"Sử dụng điểm phát sóng để tạo mạng Wi-Fi cho các thiết bị khác của bạn. Điểm phát sóng cung cấp kết nối Internet bằng kết nối dữ liệu di động của bạn. Bạn có thể mất thêm phí dữ liệu di động."</string>
     <string name="wifi_hotspot_footer_info_local_only" msgid="857988412470694109">"Ứng dụng có thể tạo một điểm phát sóng để chia sẻ nội dung với các thiết bị lân cận."</string>
@@ -898,7 +908,6 @@
     <string name="wifi_tether_configure_ap_text" msgid="7974681394041609308">"Thiết lập điểm phát sóng Wi‑Fi"</string>
     <string name="wifi_hotspot_configure_ap_text" msgid="5478614731464220432">"Thiết lập điểm phát sóng Wi‑Fi"</string>
     <string name="wifi_hotspot_configure_ap_text_summary" msgid="5560680057727007011">"Điểm phát sóng AndroidAP WPA2 PSK"</string>
-    <string name="wifi_tether_configure_subtext" msgid="2050196439900426456">"Điểm phát sóng <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">"Gọi qua Wi-Fi"</string>
     <string name="wifi_calling_suggestion_title" msgid="9008010480466359578">"Bật Gọi qua Wi-Fi"</string>
@@ -939,7 +948,7 @@
     <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="emergency_address_summary" msgid="3266760199681945746">"Địa chỉ sẽ đượ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 dịch vụ khẩn cấp qua Wi-Fi"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"Hiển thị"</string>
     <string name="sound_settings" msgid="5534671337768745343">"Âm thanh"</string>
     <string name="all_volume_title" msgid="4296957391257836961">"Âm lượng"</string>
@@ -993,6 +1002,7 @@
     <string name="search_settings" msgid="1910951467596035063">"Tìm kiếm"</string>
     <string name="search_settings_summary" msgid="9205656546570654169">"Quản lý cài đặt và lịch sử tìm kiếm"</string>
     <string name="search_settings_no_results" msgid="8799027492641230999">"Không có kết quả nào"</string>
+    <string name="search_clear_history" msgid="4196658962573162457">"Xóa lịch sử"</string>
     <string name="display_settings" msgid="7965901687241669598">"Hiển thị"</string>
     <string name="accelerometer_title" msgid="7854608399547349157">"Tự động xoay màn hình"</string>
     <string name="color_mode_title" msgid="3159275920408338215">"Màu sắc rực rỡ"</string>
@@ -1056,7 +1066,7 @@
     <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 khởi động"</string>
+    <string name="screensaver_settings_when_to_dream" msgid="7262410541382890146">"Khi nào 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>
@@ -1115,14 +1125,13 @@
     <string name="system_update_settings_list_item_summary" msgid="3853057315907710747"></string>
     <string name="firmware_version" msgid="4801135784886859972">"Phiên bản Android"</string>
     <string name="security_patch" msgid="8438384045870296634">"Mức bản vá bảo mật của Android"</string>
-    <string name="model_info" msgid="1952009518045740889">"Kiểu"</string>
-    <string name="hardware_info" msgid="2605080746512527805">"Kiểu máy &amp; phần cứng"</string>
+    <string name="model_info" msgid="1952009518045740889">"Kiểu máy"</string>
+    <string name="hardware_info" msgid="2605080746512527805">"Kiểu máy và phần cứng"</string>
     <string name="hardware_revision" msgid="8893547686367095527">"Phiên bản phần cứng"</string>
     <string name="fcc_equipment_id" msgid="149114368246356737">"ID thiết bị"</string>
     <string name="baseband_version" msgid="1848990160763524801">"Phiên bản dải tần cơ sở"</string>
     <string name="kernel_version" msgid="9192574954196167602">"Phiên bản Kernel"</string>
-    <string name="build_number" msgid="3075795840572241758">"Số phiên bản"</string>
-    <string name="selinux_status" msgid="6212165375172061672">"Trạng thái SELinux"</string>
+    <string name="build_number" msgid="3075795840572241758">"Số bản dựng"</string>
     <string name="device_info_not_available" msgid="8062521887156825182">"Không khả dụng"</string>
     <string name="device_status_activity_title" msgid="1411201799384697904">"Trạng thái"</string>
     <string name="device_status" msgid="607405385799807324">"Trạng thái"</string>
@@ -1150,7 +1159,6 @@
     <string name="status_wifi_mac_address" msgid="2202206684020765378">"Địa chỉ MAC của Wi‑Fi"</string>
     <string name="status_bt_address" msgid="4195174192087439720">"Địa chỉ Bluetooth"</string>
     <string name="status_serial_number" msgid="2257111183374628137">"Số sê-ri"</string>
-    <string name="status_unavailable" msgid="7862009036663793314">"Không có"</string>
     <string name="status_up_time" msgid="7294859476816760399">"Thời gian hoạt động"</string>
     <string name="status_awake_time" msgid="2393949909051183652">"Thời gian thức"</string>
     <string name="internal_memory" msgid="9129595691484260784">"Bộ nhớ trong"</string>
@@ -1326,25 +1334,23 @@
     <string name="menu_restore" msgid="8260067415075573273">"Đặt lại về mặc định"</string>
     <string name="restore_default_apn_completed" msgid="2824775307377604897">"Đặt lại cài đặt APN mặc định đã hoàn tất."</string>
     <string name="reset_dashboard_title" msgid="6254873816990678620">"Tùy chọn đặt lại"</string>
-    <string name="reset_network_title" msgid="6166025966016873843">"Đặt lại Wi-Fi, thiết bị di động và Bluetooth"</string>
-    <string name="reset_network_desc" msgid="5547979398298881406">"Tác vụ này sẽ đặt lại tất cả cài đặt mạng, bao gồm:\n\n"<li>"Wi‑Fi"</li>\n<li>"Dữ liệu di động"</li>\n<li>"Bluetooth"</li></string>
+    <string name="reset_dashboard_summary" msgid="4851012632493522755">"Có thể đặt lại mạng, ứng dụng hoặc thiết bị"</string>
+    <string name="reset_network_title" msgid="6166025966016873843">"Đặt lại Wi-Fi, di động và Bluetooth"</string>
+    <string name="reset_network_desc" msgid="5547979398298881406">"Thao tác này sẽ đặt lại tất cả cài đặt mạng, bao gồm:\n\n"<li>"Wi‑Fi"</li>\n<li>"Dữ liệu di động"</li>\n<li>"Bluetooth"</li></string>
     <string name="reset_network_button_text" msgid="2035676527471089853">"Đặt lại cài đặt"</string>
     <string name="reset_network_final_desc" msgid="6388371121099245116">"Đặt lại tất cả cài đặt mạng? Bạn không thể hoàn tác thao tác này!"</string>
     <string name="reset_network_final_button_text" msgid="1797434793741744635">"Đặt lại cài đặt"</string>
     <string name="reset_network_confirm_title" msgid="1759888886976962773">"Đặt lại?"</string>
     <string name="network_reset_not_available" msgid="7188610385577164676">"Đặt lại mạng không khả dụng cho người dùng này"</string>
     <string name="reset_network_complete_toast" msgid="787829973559541880">"Cài đặt mạng đã được đặt lại"</string>
-    <string name="master_clear_title" msgid="6617679904229218425">"Xóa tất cả dữ liệu (Khôi phục cài đặt gốc)"</string>
-    <plurals name="master_clear_with_account_summary" formatted="false" msgid="5911377203778818712">
-      <item quantity="other"><xliff:g id="ACCOUNT_COUNT">%1$d</xliff:g> tài khoản sẽ được đặt lại</item>
-      <item quantity="one">1 tài khoản sẽ được đặt lại</item>
-    </plurals>
-    <string name="master_clear_summary" msgid="6902443944660426951">"Bộ nhớ trong và tất cả các dữ liệu sẽ được đặt lại"</string>
+    <string name="master_clear_title" msgid="3531267871084279512">"Xóa mọi dữ liệu (đặt lại thiết bị)"</string>
     <string name="master_clear_desc" product="tablet" msgid="9146059417023157222">"Tác vụ này sẽ xóa tất cả dữ liệu từ "<b>"bộ nhớ trong"</b>" của máy tính bảng, bao gồm:\n\n"<li>"Tài khoản Google của bạn"</li>\n<li>"Dữ liệu và cài đặt hệ thống và ứng dụng"</li>\n<li>"Ứng dụng đã tải xuống"</li></string>
     <string name="master_clear_desc" product="default" msgid="4800386183314202571">"Tác vụ này sẽ xóa tất cả dữ liệu từ "<b>"bộ nhớ trong"</b>" của điện thoại, bao gồm:\n\n"<li>"Tài khoản Google của bạn"</li>\n<li>"Dữ liệu và cài đặt hệ thống và ứng dụng"</li>\n<li>"Ứng dụng đã tải xuống"</li></string>
     <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"Bạn hiện đã đăng nhập vào các tài khoản sau đây:\n"</string>
     <string name="master_clear_other_users_present" product="default" msgid="5161423070702470742">\n\n"Có người dùng khác trên thiết bị này.\n"</string>
     <string name="master_clear_desc_also_erases_external" msgid="1903185203791274237"><li>"Nhạc"</li>\n<li>"Ảnh"</li>\n<li>"Dữ liệu người dùng khác"</li></string>
+    <string name="master_clear_desc_also_erases_esim" msgid="312352697653096008"><li>"Nhà cung cấp dịch vụ trên eSIM"</li></string>
+    <string name="master_clear_desc_no_cancel_mobile_plan" msgid="5460926449093211144">\n\n"Điều này sẽ không hủy gói dịch vụ di động của bạn."</string>
     <string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="7744115866662613411">\n\n"Để xóa nhạc, hình ảnh và dữ liệu người dùng khác, cần xóa "<b>"bộ lưu trữ USB"</b>"."</string>
     <string name="master_clear_desc_erase_external_storage" product="default" msgid="4801026652617377093">\n\n"Đồng thời, để xóa nhạc, hình ảnh và dữ liệu người dùng khác, cần xóa "<b>"thẻ SD"</b>"."</string>
     <string name="erase_external_storage" product="nosdcard" msgid="969364037450286809">"Xóa bộ nhớ USB"</string>
@@ -1384,7 +1390,7 @@
     <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_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="1308462275952345985">"Sử dụng điểm phát sóng và chia sẻ kết nối để cung cấp kết nối Internet cho các thiết bị khác thông qua kết nối dữ liệu di động của bạn. Ứng dụng cũng có thể tạo một điểm phát sóng để chia sẻ nội dung với các thiết bị lân cận."</string>
+    <string name="tethering_footer_info" msgid="1308462275952345985">"Sử dụng điểm phát sóng và chia sẻ kết nối để cung cấp kết nối Internet cho các thiết bị khác thông qua kết nối dữ liệu di động của bạn. Các ứng dụng cũng có thể tạo một điểm phát sóng để chia sẻ nội dung với các thiết bị lân cận."</string>
     <string name="tethering_help_button_text" msgid="656117495547173630">"Trợ giúp"</string>
     <string name="network_settings_title" msgid="2876509814832830757">"Mạng di động"</string>
     <string name="manage_mobile_plan_title" msgid="7630170375010107744">"Gói dịch vụ di động"</string>
@@ -1461,15 +1467,16 @@
     <string name="settings_safetylegal_activity_title" msgid="6901214628496951727">"Thông tin an toàn"</string>
     <string name="settings_safetylegal_activity_unreachable" msgid="250674109915859456">"Bạn chưa có kết nối dữ liệu. Để xem thông tin này ngay bây giờ, hãy truy cập %s từ bất kỳ máy tính nào đã kết nối với Internet."</string>
     <string name="settings_safetylegal_activity_loading" msgid="8059022597639516348">"Đang tải…"</string>
-    <string name="lockpassword_choose_your_password_header" msgid="8624900666929394990">"Chọn mật khẩu của bạn"</string>
-    <string name="lockpassword_choose_your_password_header_for_fingerprint" msgid="6624409510609085450">"Để dùng vân tay, đặt mật khẩu"</string>
-    <string name="lockpassword_choose_your_pattern_header" msgid="6949761069941694050">"Chọn hình của bạn"</string>
-    <string name="lockpassword_choose_your_pattern_header_for_fingerprint" msgid="5901096361617543819">"Để dùng vân tay, đặt hình m.khóa"</string>
-    <string name="lockpassword_choose_your_pin_header" msgid="7598849519816138302">"Chọn mã PIN của bạn"</string>
-    <string name="lockpassword_choose_your_pin_header_for_fingerprint" msgid="765344692615917183">"Để dùng vân tay, đặt mã PIN"</string>
-    <string name="lockpassword_confirm_your_password_header" msgid="6308478184889846633">"Xác nhận mật khẩu của bạn"</string>
+    <string name="lockpassword_choose_your_screen_lock_header" msgid="3872462096767152394">"Đặt khóa màn hình"</string>
+    <string name="lockpassword_choose_your_password_message" msgid="1197569283524841412">"Để bảo mật, hãy đặt mật khẩu"</string>
+    <string name="lockpassword_choose_your_password_header_for_fingerprint" msgid="2541818487015343503">"Để sử dụng vân tay, hãy đặt mật khẩu"</string>
+    <string name="lockpassword_choose_your_pattern_header_for_fingerprint" msgid="7709785406243556723">"Để sử dụng vân tay, hãy đặt hình mở khóa"</string>
+    <string name="lockpassword_choose_your_pin_message" msgid="1875420718677275646">"Để bảo mật, hãy đặt mã PIN"</string>
+    <string name="lockpassword_choose_your_pin_header_for_fingerprint" msgid="1549639053195796674">"Để sử dụng vân tay, hãy đặt mã PIN"</string>
+    <string name="lockpassword_choose_your_pattern_message" msgid="5986983400689720015">"Vì lý do bảo mật, hãy thiết lập một hình mở khóa"</string>
+    <string name="lockpassword_confirm_your_password_header" msgid="1266027268220850931">"Nhập lại mật khẩu của bạn"</string>
     <string name="lockpassword_confirm_your_pattern_header" msgid="7543433733032330821">"Xác nhận hình của bạn"</string>
-    <string name="lockpassword_confirm_your_pin_header" msgid="49038294648213197">"Xác nhận mã PIN của bạn"</string>
+    <string name="lockpassword_confirm_your_pin_header" msgid="7744513791910572550">"Nhập lại mã PIN của bạn"</string>
     <string name="lockpassword_confirm_passwords_dont_match" msgid="5140892109439191415">"Mật khẩu không khớp"</string>
     <string name="lockpassword_confirm_pins_dont_match" msgid="7226244811505606217">"Mã PIN không khớp"</string>
     <string name="lockpassword_choose_lock_generic_header" msgid="3811438094903786145">"Chọn phương thức mở khóa"</string>
@@ -1488,6 +1495,12 @@
     <string name="lockpassword_strong_auth_required_work_pattern" msgid="3003781907040522053">"Để tăng cường bảo mật, hãy sử dụng hình mở khóa công việc của bạn"</string>
     <string name="lockpassword_strong_auth_required_work_pin" msgid="3367491332598821552">"Để tăng cường bảo mật, hãy nhập mã PIN công việc của bạn"</string>
     <string name="lockpassword_strong_auth_required_work_password" msgid="8159775129968582940">"Để tăng cường bảo mật, hãy nhập mật khẩu công việc của bạn"</string>
+    <string name="lockpassword_confirm_your_pattern_details_frp" msgid="6757336656791723193">"Điện thoại đã được đặt lại về cài đặt gốc. Để sử dụng điện thoại này, hãy nhập hình mở khóa trước."</string>
+    <string name="lockpassword_confirm_your_pin_details_frp" msgid="826520613445990470">"Điện thoại đã được đặt lại về cài đặt gốc. Để sử dụng điện thoại này, hãy nhập mã PIN trước đó."</string>
+    <string name="lockpassword_confirm_your_password_details_frp" msgid="8944081074615739040">"Điện thoại đã được đặt lại về cài đặt gốc. Để sử dụng điện thoại này, hãy nhập mật khẩu trước đó."</string>
+    <string name="lockpassword_confirm_your_pattern_header_frp" msgid="2898036091609128286">"Xác minh hình mở khóa"</string>
+    <string name="lockpassword_confirm_your_pin_header_frp" msgid="4141601774778898803">"Xác minh mã PIN"</string>
+    <string name="lockpassword_confirm_your_password_header_frp" msgid="3762615419295360480">"Xác minh mật khẩu"</string>
     <string name="lockpassword_invalid_pin" msgid="15588049067548470">"Mã PIN sai"</string>
     <string name="lockpassword_invalid_password" msgid="4038507398784975200">"Mật khẩu sai"</string>
     <string name="lockpattern_need_to_unlock_wrong" msgid="1745247595356012176">"Hình sai"</string>
@@ -1512,7 +1525,7 @@
     <string name="lockpattern_settings_enable_visible_pattern_title_profile" msgid="4864525074768391381">"Hiển thị hình mở khóa hồ sơ"</string>
     <string name="lockpattern_settings_enable_tactile_feedback_title" msgid="4389015658335522989">"Rung khi nhấn"</string>
     <string name="lockpattern_settings_enable_power_button_instantly_locks" msgid="5735444062633666327">"Nút Nguồn khóa tức thì"</string>
-    <string name="lockpattern_settings_power_button_instantly_locks_summary" msgid="8196258755143711694">"Trừ khi vẫn mở khóa bởi <xliff:g id="TRUST_AGENT_NAME">%1$s</xliff:g>"</string>
+    <string name="lockpattern_settings_power_button_instantly_locks_summary" msgid="8196258755143711694">"Trừ khi vẫn được <xliff:g id="TRUST_AGENT_NAME">%1$s</xliff:g> mở khóa"</string>
     <string name="lockpattern_settings_choose_lock_pattern" msgid="1652352830005653447">"Đặt hình mở khóa"</string>
     <string name="lockpattern_settings_change_lock_pattern" msgid="1123908306116495545">"Thay đổi hình mở khóa"</string>
     <string name="lockpattern_settings_help_how_to_record" msgid="2614673439060830433">"Cách vẽ hình mở khóa"</string>
@@ -1537,7 +1550,6 @@
     <string name="install_applications_title" msgid="4987712352256508946">"Cho phép tất cả các nguồn ƯD"</string>
     <string name="recent_app_category_title" msgid="6673071268966003928">"Ứng dụng đã mở gần đây"</string>
     <string name="see_all_apps_title" msgid="1317153498074308438">"Xem tất cả <xliff:g id="COUNT">%1$d</xliff:g> ứng dụng"</string>
-    <string name="recent_app_summary" msgid="3366446669844932300">"cách đây <xliff:g id="TIME">^1</xliff:g>"</string>
     <string name="install_all_warning" product="tablet" msgid="8310489909586138165">"Máy tính bảng và dữ liệu cá nhân của bạn dễ bị các ứng dụng không xác định tấn công hơn. Bằng cách cài đặt ứng dụng từ nguồn này, bạn đồng ý tự chịu trách nhiệm cho mọi hỏng hóc đối với máy tính bảng của mình hoặc mất mát dữ liệu có thể phát sinh do sử dụng những ứng dụng này."</string>
     <string name="install_all_warning" product="default" msgid="1952257127370115988">"Điện thoại và dữ liệu cá nhân của bạn dễ bị các ứng dụng không xác định tấn công hơn. Bằng cách cài đặt ứng dụng từ nguồn này, bạn đồng ý tự chịu trách nhiệm cho mọi hỏng hóc đối với điện thoại của mình hoặc mất mát dữ liệu có thể phát sinh do sử dụng những ứng dụng này."</string>
     <string name="advanced_settings" msgid="1777249286757067969">"Cài đặt nâng cao"</string>
@@ -1798,10 +1810,10 @@
     <string name="usage_time_label" msgid="295954901452833058">"Thời gian sử dụng"</string>
     <string name="accessibility_settings" msgid="3975902491934816215">"Trợ năng"</string>
     <string name="accessibility_settings_title" msgid="2130492524656204459">"Cài đặt trợ năng"</string>
-    <string name="accessibility_settings_summary" msgid="981260486011624939">"Trình đọc màn hình, màn hình, điều khiển tương tác"</string>
+    <string name="accessibility_settings_summary" msgid="981260486011624939">"Trình đọc màn hình, màn hình, tương tác"</string>
     <string name="vision_settings_title" msgid="4204111425716868288">"Cài đặt hiển thị"</string>
     <string name="vision_settings_description" msgid="5679491180156408260">"Bạn có thể tùy chỉnh thiết bị này cho phù hợp với nhu cầu của mình. Bạn có thể thay đổi các tính năng trợ năng này sau trong Cài đặt."</string>
-    <string name="vision_settings_suggestion_title" msgid="917294957154878441">"Tăng kích thước phông chữ"</string>
+    <string name="vision_settings_suggestion_title" msgid="8058794060304707004">"Thay đổi cỡ chữ"</string>
     <string name="screen_reader_category_title" msgid="7739154903913400641">"Trình đọc màn hình"</string>
     <string name="audio_and_captions_category_title" msgid="3420727114421447524">"Âm thanh và văn bản trên màn hình"</string>
     <string name="display_category_title" msgid="685461049938269166">"Màn hình"</string>
@@ -1813,9 +1825,9 @@
     <string name="select_to_speak_summary" msgid="4282846695497544515">"Nhấn vào mục trên màn hình của bạn để nghe mục được đọc to"</string>
     <string name="accessibility_captioning_title" msgid="7589266662024836291">"Phụ đề"</string>
     <string name="accessibility_screen_magnification_title" msgid="6001128808776506021">"Phóng to"</string>
-    <string name="accessibility_screen_magnification_gestures_title" msgid="3719929521571489913">"Phóng đại bằng cách nhấn 3 lần"</string>
+    <string name="accessibility_screen_magnification_gestures_title" msgid="3719929521571489913">"Phóng to bằng cách nhấn 3 lần"</string>
     <string name="accessibility_screen_magnification_navbar_title" msgid="7141753038957538230">"Phóng đại bằng nút"</string>
-    <string name="accessibility_screen_magnification_state_navbar_gesture" msgid="2760906043221923793">"Phóng đại bằng nút và nhấn ba lần"</string>
+    <string name="accessibility_screen_magnification_state_navbar_gesture" msgid="2760906043221923793">"Phóng to bằng nút và nhấn ba lần"</string>
     <string name="accessibility_preference_magnification_summary" msgid="5867883657521404509">"Phóng to trên màn hình"</string>
     <string name="accessibility_screen_magnification_short_summary" msgid="3411979839172752057">"Nhấn 3 lần để thu phóng"</string>
     <string name="accessibility_screen_magnification_navbar_short_summary" msgid="3693116360267980492">"Nhấn vào nút để thu phóng"</string>
@@ -1838,7 +1850,6 @@
     <string name="accessibility_display_inversion_preference_subtitle" msgid="7052959202195368109">"Có thể ảnh hưởng đến hiệu suất"</string>
     <string name="accessibility_autoclick_preference_title" msgid="7014499339068449623">"Nhấp sau khi con trỏ ngừng di chuyển"</string>
     <string name="accessibility_autoclick_delay_preference_title" msgid="3962261178385106006">"Trì hoãn trước khi nhấp"</string>
-    <string name="preference_summary_default_combination" msgid="8532964268242666060">"<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">"BẬT"</string>
     <string name="accessibility_summary_state_disabled" msgid="2241315620132005595">"TẮT"</string>
     <string name="enable_quick_setting" msgid="2366999897816894536">"Hiển thị trong Cài đặt nhanh"</string>
@@ -1915,8 +1926,8 @@
     <string name="print_settings" msgid="4742428530112487843">"In"</string>
     <string name="print_settings_summary_no_service" msgid="6354322414246865875">"Tắt"</string>
     <plurals name="print_settings_summary" formatted="false" msgid="6005468025646083029">
-      <item quantity="other"><xliff:g id="COUNT">%1$d</xliff:g> dịch vụ in bật</item>
-      <item quantity="one">1 dịch vụ in bật</item>
+      <item quantity="other"><xliff:g id="COUNT">%1$d</xliff:g> dịch vụ in đang bật</item>
+      <item quantity="one">1 dịch vụ in đang bật</item>
     </plurals>
     <plurals name="print_jobs_summary" formatted="false" msgid="5810106725778525400">
       <item quantity="other"><xliff:g id="COUNT">%1$d</xliff:g> lệnh in</item>
@@ -1957,12 +1968,14 @@
     <string name="background_activity_summary_on" msgid="649282072540085599">"Ứng dụng có thể chạy trong nền khi không được sử dụng"</string>
     <string name="background_activity_summary_off" msgid="7666330699090632040">"Hoạt động nền của ứng dụng bị giới hạn khi không được sử dụng"</string>
     <string name="background_activity_summary_disabled" msgid="3710669050484599847">"Ứng dụng không được phép chạy trong nền"</string>
+    <string name="background_activity_summary_whitelisted" msgid="7375400051141016808">"Không thể tối ưu hóa ứng dụng cho việc sử dụng pin"</string>
+    <string name="background_activity_warning_dialog_title" msgid="2216249969149568871">"Giới hạn hoạt động nền?"</string>
+    <string name="background_activity_warning_dialog_text" msgid="7049624449246121981">"Nếu bạn giới hạn hoạt động nền cho một ứng dụng, ứng dụng đó có thể hoạt động sai"</string>
     <string name="device_screen_usage" msgid="3386088035570409683">"Mức sử dụng màn hình kể từ lần sạc đầy"</string>
     <string name="device_screen_consumption" msgid="4607589286438986687">"Mức tiêu thụ của màn hình"</string>
     <string name="device_cellular_network" msgid="4724773411762382950">"Quét mạng di động"</string>
-    <string name="power_last_full_charge_summary" msgid="532845389094620657">"cách đây <xliff:g id="TIME">^1</xliff:g>"</string>
-    <string name="power_usage_list_summary" msgid="6775339745194635000">"Mức sử dụng ứng dụng kể từ khi sạc đầy (cách đây <xliff:g id="TIME">^1</xliff:g>)"</string>
-    <string name="power_usage_list_summary_device" msgid="7036566616386864302">"Sử dụng thiết bị kể từ khi sạc đầy (<xliff:g id="TIME">^1</xliff:g> trước)"</string>
+    <string name="power_usage_list_summary" msgid="6393929085382334341">"Mức sử dụng ứng dụng kể từ khi sạc đầy (<xliff:g id="RELATIVE_TIME">^1</xliff:g>)"</string>
+    <string name="power_usage_list_summary_device" msgid="4461926045610455423">"Sử dụng thiết bị kể từ khi sạc đầy (<xliff:g id="RELATIVE_TIME">^1</xliff:g>)"</string>
     <string name="screen_usage_summary" msgid="6687403051423153550">"Lượng thời gian sử dụng màn hình kể từ khi sạc đầy"</string>
     <string name="device_usage_list_summary" msgid="5623036661468763251">"Mức sử dụng thiết bị kể từ lần sạc đầy"</string>
     <string name="battery_since_unplugged" msgid="338073389740738437">"Sử dụng pin từ khi tháo đầu cắm"</string>
@@ -2016,7 +2029,7 @@
     <string name="power_camera" msgid="4976286950934622605">"Máy ảnh"</string>
     <string name="power_wifi" msgid="1135085252964054957">"Wi‑Fi"</string>
     <string name="power_bluetooth" msgid="4373329044379008289">"Bluetooth"</string>
-    <string name="power_cell" msgid="3392999761958982492">"Chờ mạng di động"</string>
+    <string name="power_cell" msgid="3392999761958982492">"Mạng di động ở chế độ chờ"</string>
     <string name="power_phone" msgid="5392641106474567277">"Cuộc gọi thoại"</string>
     <string name="power_idle" product="tablet" msgid="4612478572401640759">"Máy tính bảng ở chế độ rảnh"</string>
     <string name="power_idle" product="default" msgid="9055659695602194990">"Điện thoại ở chế độ rảnh"</string>
@@ -2208,14 +2221,14 @@
     <string name="credentials_unlock_hint" msgid="2301301378040499348">"Nhập mật khẩu cho vùng lưu trữ thông tin xác thực."</string>
     <string name="credentials_old_password" msgid="7553393815538684028">"Mật khẩu hiện tại:"</string>
     <string name="credentials_reset_hint" msgid="6297256880896133631">"Xóa tất cả nội dung?"</string>
-    <string name="credentials_password_too_short" msgid="7502749986405522663">"Mật khẩu phải có ít nhất 8 ký tự."</string>
     <string name="credentials_wrong_password" msgid="2541932597104054807">"Mật khẩu không chính xác."</string>
     <string name="credentials_reset_warning" msgid="5320653011511797600">"Mật khẩu không chính xác. Bạn còn một cơ hội nữa trước khi bộ nhớ thông tin xác thực bị xóa."</string>
     <string name="credentials_reset_warning_plural" msgid="6514085665301095279">"Mật khẩu không chính xác. Bạn có <xliff:g id="NUMBER">%1$d</xliff:g> cơ hội nữa trước khi bộ nhớ thông tin xác thực bị xóa."</string>
     <string name="credentials_erased" msgid="2907836028586342969">"Bộ nhớ thông tin xác thực đã bị xóa."</string>
     <string name="credentials_not_erased" msgid="7685932772284216097">"Ko thể xóa b.nhớ t.tin x.thực."</string>
     <string name="credentials_enabled" msgid="7588607413349978930">"Bộ nhớ thông tin xác thực đã bật."</string>
-    <string name="credentials_configure_lock_screen_hint" msgid="6757119179588664966">"Bạn cần đặt mã PIN hoặc mật khẩu khóa màn hình trước khi có thể sử dụng vùng lưu trữ thông tin xác thực."</string>
+    <string name="credentials_configure_lock_screen_hint" msgid="8058230497337529036">"Trước khi bạn có thể sử dụng vùng lưu trữ thông tin xác thực, thiết bị của bạn cần có màn hình khóa bản mật"</string>
+    <string name="credentials_configure_lock_screen_button" msgid="253239765216055321">"THIẾT LẬP KHÓA"</string>
     <string name="usage_access_title" msgid="332333405495457839">"ƯD có quyền tr.cập s.dụng"</string>
     <string name="emergency_tone_title" msgid="1055954530111587114">"Âm khẩn cấp"</string>
     <string name="emergency_tone_summary" msgid="722259232924572153">"Đặt chế độ khi cuộc gọi khẩn cấp được thực hiện"</string>
@@ -2335,8 +2348,6 @@
     <skip />
     <string name="cant_sync_dialog_title" msgid="2777238588398046285">"Không thể đồng bộ hóa theo cách thủ công"</string>
     <string name="cant_sync_dialog_message" msgid="1938380442159016449">"Đồng bộ hóa cho mục này hiện đã bị vô hiệu hóa. Để thay đổi cài đặt này, hãy tạm thời bật dữ liệu nền và đồng bộ hóa tự động."</string>
-    <string name="wimax_settings" msgid="2655139497028469039">"4G"</string>
-    <string name="status_wimax_mac_address" msgid="8390791848661413416">"Địa chỉ MAC 4G"</string>
     <string name="enter_password" msgid="8035706727471334122">"Để bắt đầu sử dụng thiết bị Android, hãy nhập mật khẩu của bạn"</string>
     <string name="enter_pin" msgid="5305333588093263790">"Để bắt đầu sử dụng thiết bị Android, hãy nhập mã PIN của bạn"</string>
     <string name="enter_pattern" msgid="4187435713036808566">"Để bắt đầu sử dụng thiết bị Android, hãy vẽ hình mẫu của bạn"</string>
@@ -2350,6 +2361,7 @@
     <string name="misc_files_selected_count" msgid="4647048020823912088">"đã chọn <xliff:g id="NUMBER">%1$d</xliff:g> trong tổng số <xliff:g id="TOTAL">%2$d</xliff:g>"</string>
     <string name="misc_files_selected_count_bytes" msgid="2876232009069114352">"<xliff:g id="NUMBER">%1$s</xliff:g> trong tổng số <xliff:g id="TOTAL">%2$s</xliff:g>"</string>
     <string name="select_all" msgid="1562774643280376715">"Chọn tất cả"</string>
+    <string name="data_plan_usage_manage_plans_button_text" msgid="8997761990902708162">"Quản lý gói dữ liệu"</string>
     <string name="data_usage_summary_title" msgid="3804110657238092929">"Sử dụng dữ liệu"</string>
     <string name="data_usage_app_summary_title" msgid="4147258989837459172">"Dữ liệu ứng dụng"</string>
     <string name="data_usage_accounting" msgid="7170028915873577387">"Cách tính dữ liệu của nhà cung cấp dịch vụ có thể khác với thiết bị của bạn."</string>
@@ -2409,12 +2421,12 @@
     <string name="data_usage_auto_sync_on_dialog" product="tablet" msgid="8581983093524041669">"Mọi thay đổi bạn thực hiện đối với các tài khoản trên web sẽ được tự động sao chép sang máy tính bảng của bạn.\n\nMột số tài khoản cũng có thể tự động đồng bộ hóa lên web mọi thay đổi bạn thực hiện trên máy tính bảng. Tài khoản Google hoạt động theo cách này."</string>
     <string name="data_usage_auto_sync_on_dialog" product="default" msgid="8651376294887142858">"Mọi thay đổi bạn thực hiện đối với các tài khoản trên web sẽ được tự động sao chép sang điện thoại của bạn.\n\nMột số tài khoản cũng có thể tự động đồng bộ hóa lên web mọi thay đổi bạn thực hiện trên điện thoại. Tài khoản Google hoạt động theo cách này."</string>
     <string name="data_usage_auto_sync_off_dialog_title" msgid="9013139130490125793">"Tắt tính năng tự động đồng bộ hóa dữ liệu?"</string>
-    <string name="data_usage_auto_sync_off_dialog" msgid="4025938250775413864">"Việc này sẽ bảo toàn mức sử dụng dữ liệu và pin, tuy nhiên bạn sẽ cần phải đồng bộ hóa từng tài khoản theo cách thủ công để thu thập thông tin gần đây. Và bạn sẽ không nhận được thông báo khi có cập nhật."</string>
+    <string name="data_usage_auto_sync_off_dialog" msgid="4025938250775413864">"Việc này sẽ bảo toàn mức sử dụng dữ liệu và pin, tuy nhiên bạn sẽ cần phải đồng bộ hóa từng tài khoản theo cách thủ công để thu thập thông tin gần đây. Ngoài ra, bạn sẽ không nhận được thông báo khi có cập nhật."</string>
     <string name="data_usage_cycle_editor_title" msgid="1373797281540188533">"Ngày đặt lại chu kỳ sử dụng"</string>
     <string name="data_usage_cycle_editor_subtitle" msgid="5512903797979928416">"Ngày của từng tháng:"</string>
     <string name="data_usage_cycle_editor_positive" msgid="8821760330497941117">"Thiết lập"</string>
-    <string name="data_usage_warning_editor_title" msgid="3704136912240060339">"Thiết lập cảnh báo sử dụng dữ liệu"</string>
-    <string name="data_usage_limit_editor_title" msgid="9153595142385030015">"Thiết lập giới hạn sử dụng dữ liệu"</string>
+    <string name="data_usage_warning_editor_title" msgid="3704136912240060339">"Đặt cảnh báo sử dụng dữ liệu"</string>
+    <string name="data_usage_limit_editor_title" msgid="9153595142385030015">"Đặt giới hạn sử dụng dữ liệu"</string>
     <string name="data_usage_limit_dialog_title" msgid="3023111643632996097">"Giới hạn sử dụng dữ liệu"</string>
     <string name="data_usage_limit_dialog_mobile" product="tablet" msgid="4983487893343645667">"Máy tính bảng của bạn sẽ tắt dữ liệu di động khi đạt đến giới hạn bạn đặt.\n\nDo việc sử dụng dữ liệu được máy tính bảng của bạn tính và nhà cung cấp dịch vụ có thể tính mức sử dụng khác nhau nên hãy xem xét việc đặt giới hạn vừa phải."</string>
     <string name="data_usage_limit_dialog_mobile" product="default" msgid="3926320594049434225">"Điện thoại của bạn sẽ tắt dữ liệu di động khi đạt đến giới hạn bạn đặt.\n\nDo việc sử dụng dữ liệu được điện thoại của bạn tính và nhà cung cấp dịch vụ có thể tính mức sử dụng khác nhau nên hãy xem xét việc đặt giới hạn vừa phải."</string>
@@ -2431,10 +2443,13 @@
     <string name="data_usage_total_during_range_mobile" product="tablet" msgid="1925687342154538972">"<xliff:g id="RANGE">%2$s</xliff:g>: khoảng <xliff:g id="TOTAL">%1$s</xliff:g> đã được sử dụng, giá trị này được máy tính bảng của bạn đo. Việc tính mức sử dụng dữ liệu của nhà cung cấp dịch vụ của bạn có thể khác nhau."</string>
     <string name="data_usage_total_during_range_mobile" product="default" msgid="5063981061103812900">"<xliff:g id="RANGE">%2$s</xliff:g>: khoảng <xliff:g id="TOTAL">%1$s</xliff:g> đã được sử dụng, giá trị này được điện thoại của bạn đo. Việc tính mức sử dụng dữ liệu của nhà cung cấp dịch vụ của bạn có thể khác nhau."</string>
     <string name="data_usage_metered_title" msgid="7383175371006596441">"Hạn chế của mạng"</string>
-    <string name="data_usage_metered_body" msgid="7655851702771342507">"Mạng được kiểm soát được coi như mạng di động khi dữ liệu nền bị hạn chế. Các ứng dụng có thể cảnh báo trước khi sử dụng các mạng này để tải xuống dung lượng lớn."</string>
+    <string name="data_usage_metered_body" msgid="7655851702771342507">"Mạng có đo lượng dữ liệu được coi như mạng di động khi dữ liệu nền bị hạn chế. Các ứng dụng có thể cảnh báo trước khi sử dụng các mạng này để tải xuống dung lượng lớn."</string>
     <string name="data_usage_metered_mobile" msgid="5423305619126978393">"Mạng di động"</string>
-    <string name="data_usage_metered_wifi" msgid="1761738002328299714">"Mạng Wi‑Fi được kiểm soát"</string>
-    <string name="data_usage_metered_wifi_disabled" msgid="727808462375941567">"Để chọn mạng được kiểm soát, hãy bật Wi‑Fi."</string>
+    <string name="data_usage_metered_wifi" msgid="1761738002328299714">"Mạng Wi‑Fi có đo lượng dữ liệu"</string>
+    <string name="data_usage_metered_wifi_disabled" msgid="727808462375941567">"Để chọn mạng có đo lượng dữ liệu, hãy bật Wi‑Fi."</string>
+    <string name="data_usage_metered_auto" msgid="1262028400911918865">"Tự động"</string>
+    <string name="data_usage_metered_yes" msgid="9217539611385225894">"Đo lượng dữ liệu"</string>
+    <string name="data_usage_metered_no" msgid="4025232961929071789">"Không đo lượng dữ liệu"</string>
     <string name="data_usage_disclaimer" msgid="6887858149980673444">"Cách tính dữ liệu của nhà cung cấp dịch vụ có thể khác với thiết bị của bạn."</string>
     <string name="cryptkeeper_emergency_call" msgid="198578731586097145">"Cuộc gọi khẩn cấp"</string>
     <string name="cryptkeeper_return_to_call" msgid="5613717339452772491">"Quay lại cuộc gọi"</string>
@@ -2526,9 +2541,6 @@
     <string name="backup_pw_set_button_text" msgid="2387480910044648795">"Đặt mật khẩu sao lưu"</string>
     <string name="backup_pw_cancel_button_text" msgid="8845630125391744615">"Hủy"</string>
     <string name="additional_system_update_settings_list_item_title" msgid="214987609894661992">"Bản cập nhật hệ thống bổ sung"</string>
-    <string name="selinux_status_disabled" msgid="924551035552323327">"Đã tắt"</string>
-    <string name="selinux_status_permissive" msgid="6004965534713398778">"Cho phép"</string>
-    <string name="selinux_status_enforcing" msgid="2252703756208463329">"Thực thi"</string>
     <string name="ssl_ca_cert_warning" msgid="2045866713601984673">"Mạng có thể được giám sát"</string>
     <string name="done_button" msgid="1991471253042622230">"Xong"</string>
     <plurals name="ssl_ca_cert_dialog_title" formatted="false" msgid="7145092748045794650">
@@ -2652,12 +2664,12 @@
     <string name="call_manager_title" msgid="4479949569744516457">"Trình quản lý cuộc gọi"</string>
     <!-- no translation found for call_manager_summary (5918261959486952674) -->
     <skip />
-    <string name="cell_broadcast_settings" msgid="4124461751977706019">"Thông báo khẩn cấp"</string>
+    <string name="cell_broadcast_settings" msgid="4124461751977706019">"Cảnh báo khẩn cấp"</string>
     <string name="network_operators_settings" msgid="2583178259504630435">"Nhà cung cấp dịch vụ mạng"</string>
     <string name="access_point_names" msgid="1381602020438634481">"Tên điểm truy cập"</string>
     <string name="enhanced_4g_lte_mode_title" msgid="5808043757309522392">"Chế độ 4G LTE được tăng cường"</string>
     <string name="enhanced_4g_lte_mode_summary" msgid="1376589643017218924">"Sử dụng dữ liệu LTE để cải thiện giọng nói và thông tin liên lạc (Được đề xuất)"</string>
-    <string name="preferred_network_type_title" msgid="3431041717309776341">"Loại mạng ưa thích"</string>
+    <string name="preferred_network_type_title" msgid="3431041717309776341">"Loại mạng ưu tiên"</string>
     <string name="preferred_network_type_summary" msgid="6564884693884755019">"LTE (được đề xuất)"</string>
     <string name="work_sim_title" msgid="4843322164662606891">"SIM công việc"</string>
     <string name="user_restrictions_title" msgid="5794473784343434273">"Quyền truy cập nội dung và ứng dụng"</string>
@@ -2726,6 +2738,7 @@
       <item quantity="other">Hiển thị %d mục ẩn</item>
       <item quantity="one">Hiển thị %d mục ẩn</item>
     </plurals>
+    <string name="dashboard_suggestion_condition_footer_content_description" msgid="2898588191174845961">"Thu gọn"</string>
     <string name="network_dashboard_title" msgid="4771589228992391573">"Mạng và Internet"</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>
@@ -2828,8 +2841,14 @@
       <item quantity="other"><xliff:g id="ON_COUNT">%d</xliff:g> quy tắc tự động được bật</item>
       <item quantity="one">1 quy tắc tự động được bật</item>
     </plurals>
-    <string name="zen_mode_settings_title" msgid="842308776768942600">"Tùy chọn Không làm phiền"</string>
-    <string name="zen_mode_priority_settings_title" msgid="2623117023031824309">"Chỉ cho phép ưu tiên"</string>
+    <string name="zen_mode_settings_title" msgid="1066226840983908121">"Không làm phiền"</string>
+    <string name="zen_mode_behavior_settings_title" msgid="1463303933529313969">"Hành vi"</string>
+    <string name="zen_mode_behavior_allow_title" msgid="3845615648136218141">"Cho phép âm thanh và rung từ"</string>
+    <string name="zen_mode_behavior_no_sound" msgid="1219626004723208056">"Không có âm báo"</string>
+    <string name="zen_mode_behavior_total_silence" msgid="6716603819806610626">"Hoàn toàn im lặng"</string>
+    <string name="zen_mode_behavior_no_sound_except" msgid="4968477585788243114">"Không có âm báo ngoại trừ <xliff:g id="CATEGORIES">%1$s</xliff:g>"</string>
+    <!-- no translation found for zen_mode_behavior_alarms_only (2423480992071472963) -->
+    <skip />
     <string name="zen_mode_automation_settings_title" msgid="4228995740594063774">"Quy tắc tự động"</string>
     <string name="zen_mode_automation_suggestion_title" msgid="5105443455143476201">"Đặt quy tắc Không làm phiền"</string>
     <string name="zen_mode_automation_suggestion_summary" msgid="4732808039946935657">"Hạn chế âm thanh và rung tại một số thời điểm"</string>
@@ -2871,13 +2890,15 @@
     <string name="notifications_title" msgid="8086372779371204971">"Thông báo"</string>
     <string name="app_notifications_title" msgid="5810577805218003760">"Thông báo ứng dụng"</string>
     <string name="notification_channel_title" msgid="2260666541030178452">"Loại thông báo"</string>
+    <string name="notification_group_title" msgid="7180506440133859601">"Nhóm các loại thông báo"</string>
     <string name="notification_importance_title" msgid="848692592679312666">"Mức độ quan trọng"</string>
-    <string name="notification_importance_unspecified" msgid="2196023702875112081">"Để ứng dụng quyết định"</string>
+    <string name="notification_importance_unspecified" msgid="6622173510486113958">"Cho phép âm thanh"</string>
     <string name="notification_importance_blocked" msgid="7938180808339386300">"Không bao giờ hiển thị thông báo"</string>
     <string name="notification_importance_min" msgid="5455049524984686275">"Không làm gián đoạn bằng âm báo hoặc hình ảnh"</string>
     <string name="notification_importance_low" msgid="8881468429453766553">"Không có âm báo"</string>
     <string name="notification_importance_default" msgid="5958338024601957516">"Phát âm báo"</string>
     <string name="notification_importance_high" msgid="2082429479238228527">"Phát âm báo và hiển thị trên màn hình"</string>
+    <string name="notification_importance_high_silent" msgid="2667033773703765252">"Hiển thị trên màn hình"</string>
     <string name="notification_importance_min_title" msgid="6974673091137544803">"Thấp"</string>
     <string name="notification_importance_low_title" msgid="8131254047772814309">"Trung bình"</string>
     <string name="notification_importance_default_title" msgid="9120383978536089489">"Cao"</string>
@@ -2915,13 +2936,18 @@
     <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="1264019085827708920">"Cho phép ứng dụng này tạo cửa sổ ảnh trong ảnh khi ứng dụng đang mở hoặc sau khi bạn rời khỏi ứng dụng đó (chẳng hạn như để 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="manage_zen_access_title" msgid="2611116122628520522">"Không làm phiền"</string>
+    <string name="manage_zen_access_title" msgid="2611116122628520522">"Truy cập Không làm phiền"</string>
     <string name="zen_access_empty_text" msgid="8772967285742259540">"Không có ứng dụng được cài đặt nào yêu cầu quyền truy cập Không làm phiền"</string>
     <string name="loading_notification_apps" msgid="5031818677010335895">"Đang tải ứng dụng..."</string>
     <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>
     <string name="channel_notifications_off_desc" msgid="5899225298718840635">"Android đang chặn hiển thị loại thông báo này trên thiết bị này"</string>
+    <string name="channel_group_notifications_off_desc" msgid="1620950416247316370">"Android đang chặn hiển thị nhóm thông báo này trên thiết bị này"</string>
     <string name="notification_channels" msgid="5346841743182627500">"Danh mục"</string>
     <string name="notification_channels_other" msgid="5645317113885788226">"Khác"</string>
+    <plurals name="notification_group_summary" formatted="false" msgid="3420621520561455358">
+      <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> loại</item>
+      <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> loại</item>
+    </plurals>
     <string name="no_channels" msgid="3077375508177744586">"Ứng dụng chưa đăng bất kỳ thông báo nào"</string>
     <string name="app_settings_link" msgid="8894946007543660906">"Cài đặt bổ sung trong ứng dụng"</string>
     <string name="app_notification_listing_summary_zero" msgid="6482582965081108108">"Đã bật cho tất cả ứng dụng"</string>
@@ -2957,7 +2983,7 @@
     <string name="zen_mode_rule_name" msgid="5149068059383837549">"Tên quy tắc"</string>
     <string name="zen_mode_rule_name_hint" msgid="3781174510556433384">"Nhập tên quy tắc"</string>
     <string name="zen_mode_rule_name_warning" msgid="4517805381294494314">"Tên quy tắc đã được sử dụng"</string>
-    <string name="zen_mode_add_rule" msgid="7459154136384467057">"Thêm tùy chọn khác"</string>
+    <string name="zen_mode_add_rule" msgid="7459154136384467057">"Thêm quy tắc khác"</string>
     <string name="zen_mode_delete_rule" msgid="2985902330199039533">"Xóa quy tắc"</string>
     <string name="zen_mode_choose_rule_type" msgid="5423746638871953459">"Chọn loại quy tắc"</string>
     <string name="zen_mode_delete_rule_confirmation" msgid="6237882294348570283">"Xóa quy tắc \"<xliff:g id="RULE">%1$s</xliff:g>\"?"</string>
@@ -2998,12 +3024,14 @@
     <string name="zen_mode_from_starred" msgid="2678345811950997027">"Chỉ từ các liên hệ có gắn dấu sao"</string>
     <string name="zen_mode_from_none" msgid="8219706639954614136">"Không có"</string>
     <string name="zen_mode_alarms" msgid="2165302777886552926">"Báo thức"</string>
+    <!-- no translation found for zen_mode_media_system_other (8900209390529859777) -->
+    <skip />
     <string name="zen_mode_reminders" msgid="5458502056440485730">"Lời nhắc"</string>
     <string name="zen_mode_events" msgid="7914446030988618264">"Sự kiện"</string>
     <string name="zen_mode_all_callers" msgid="584186167367236922">"Tất cả người gọi"</string>
     <string name="zen_mode_selected_callers" msgid="3127598874060615742">"Người gọi được chọn"</string>
     <string name="zen_mode_repeat_callers" msgid="5019521886428322131">"Người gọi lặp lại"</string>
-    <string name="zen_mode_repeat_callers_summary" msgid="7192713032364140137">"Nếu cùng một người gọi hai lần trong vòng <xliff:g id="MINUTES">%d</xliff:g> phút, hãy cho phép cuộc gọi này"</string>
+    <string name="zen_mode_repeat_callers_summary" msgid="239685342222975733">"Nếu cùng một người gọi hai lần trong vòng <xliff:g id="MINUTES">%d</xliff:g> phút"</string>
     <string name="zen_mode_when" msgid="2767193283311106373">"Tự động bật"</string>
     <string name="zen_mode_when_never" msgid="8809494351918405602">"Không bao giờ"</string>
     <string name="zen_mode_when_every_night" msgid="3122486110091921009">"Hàng đêm"</string>
@@ -3032,6 +3060,7 @@
     <string name="zen_mode_screen_off_visual_interruptions" msgid="4850792880144382633">"Khi màn hình đang tắt"</string>
     <string name="zen_mode_no_visual_interruptions" msgid="8742776003822778472">"Khi màn hình đang bật hoặc tắt"</string>
     <string name="notification_app_settings_button" msgid="6685640230371477485">"Cài đặt thông báo"</string>
+    <string name="suggestion_button_text" msgid="3275010948381252006">"Ok"</string>
     <string name="device_feedback" msgid="3238056036766293294">"Gửi phản hồi về thiết bị này"</string>
     <string name="restr_pin_enter_admin_pin" msgid="1085834515677448072">"Nhập mã PIN quản trị"</string>
     <string name="switch_on_text" msgid="1124106706920572386">"Bật"</string>
@@ -3051,7 +3080,7 @@
     <string name="encryption_interstitial_message_pattern" msgid="7081249914068568570">"Bạn có thể bảo vệ thiết bị này hơn nữa bằng cách yêu cầu hình mở khóa trước khi thiết bị khởi động. Cho đến khi khởi động, thiết bị không thể nhận cuộc gọi, tin nhắn hoặc thông báo, bao gồm cả báo thức. \n\nĐiều này giúp bảo vệ dữ liệu trên các thiết bị bị mất hoặc bị đánh cắp. Yêu cầu hình mở khóa để khởi động thiết bị của bạn?"</string>
     <string name="encryption_interstitial_message_password" msgid="7796567133897436443">"Bạn có thể bảo vệ thiết bị này hơn nữa bằng cách yêu cầu mật khẩu trước khi thiết bị khởi động. Cho đến khi khởi động, thiết bị không thể nhận cuộc gọi, tin nhắn hoặc thông báo, bao gồm cả báo thức. \n\nĐiều này giúp bảo vệ dữ liệu trên các thiết bị bị mất hoặc bị đánh cắp. Yêu cầu mật khẩu để khởi động thiết bị của bạn?"</string>
     <string name="encryption_interstitial_message_pin_for_fingerprint" msgid="4550632760119547492">"Ngoài việc sử dụng vân tay để mở khóa thiết bị, bạn có thể bảo vệ thiết bị này hơn nữa bằng cách yêu cầu mã PIN trước khi thiết bị khởi động. Cho đến khi khởi động, thiết bị không thể nhận cuộc gọi, tin nhắn hoặc thông báo, bao gồm cả báo thức.\n\nĐiều này giúp bảo vệ dữ liệu trên các thiết bị bị mất hoặc bị đánh cắp. Yêu cầu mã PIN để khởi động thiết bị của bạn?"</string>
-    <string name="encryption_interstitial_message_pattern_for_fingerprint" msgid="932184823193006087">"Ngoài việc sử dụng vân tay để mở khóa thiết bị, bạn có thể bảo vệ thiết bị này hơn nữa bằng cách yêu cầu hình mở khóa trước khi thiết bị khởi động. Cho đến khi khởi động, thiết bị không thể nhận cuộc gọi, tin nhắn hoặc thông báo, bao gồm cả báo thức.\n\nĐiều này giúp bảo vệ dữ liệu trên các thiết bị bị mất hoặc bị đánh cắp. Yêu cầu hình mở khóa để khởi động thiết bị của bạn?"</string>
+    <string name="encryption_interstitial_message_pattern_for_fingerprint" msgid="932184823193006087">"Ngoài việc sử dụng vân tay để mở khóa thiết bị, bạn có thể bảo vệ thiết bị này hơn nữa bằng cách yêu cầu hình mở khóa trước khi thiết bị khởi động. Thiết bị không thể nhận cuộc gọi, tin nhắn hoặc thông báo, bao gồm cả báo thức cho đến khi khởi động.\n\nĐiều này giúp bảo vệ dữ liệu trên các thiết bị bị mất hoặc bị đánh cắp. Yêu cầu hình mở khóa để khởi động thiết bị của bạn?"</string>
     <string name="encryption_interstitial_message_password_for_fingerprint" msgid="5560954719370251702">"Ngoài việc sử dụng vân tay để mở khóa thiết bị, bạn có thể bảo vệ thiết bị này hơn nữa bằng cách yêu cầu mật khẩu trước khi thiết bị khởi động. Thiết bị không thể nhận cuộc gọi, tin nhắn hoặc thông báo bao gồm cả báo thức cho đến khi khởi động.\n\nĐiều này giúp bảo vệ dữ liệu trên các thiết bị bị mất hoặc bị đánh cắp. Yêu cầu mật khẩu để khởi động thiết bị của bạn?"</string>
     <string name="encryption_interstitial_yes" msgid="4439509435889513411">"Có"</string>
     <string name="encryption_interstitial_no" msgid="8935031349097025137">"Không"</string>
@@ -3137,7 +3166,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 liệu"</string>
+    <string name="assist_and_voice_input_title" msgid="1733165754793221197">"Trợ lý và nhập bằng giọng nói"</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>
@@ -3150,7 +3179,7 @@
     <string name="default_app" msgid="6864503001385843060">"(Mặc định)"</string>
     <string name="system_app" msgid="9068313769550747372">"(Hệ thống)"</string>
     <string name="system_default_app" msgid="3091113402349739037">"(Mặc định của hệ thống)"</string>
-    <string name="apps_storage" msgid="4353308027210435513">"Bộ nhớ Apps"</string>
+    <string name="apps_storage" msgid="4353308027210435513">"Bộ nhớ ứng dụng"</string>
     <string name="usage_access" msgid="5479504953931038165">"Quyền truy cập sử dụng"</string>
     <string name="permit_usage_access" msgid="4012876269445832300">"Cho phép quyền truy cập sử dụng"</string>
     <string name="app_usage_preference" msgid="7065701732733134991">"Tùy chọn sử dụng ứng dụng"</string>
@@ -3182,7 +3211,7 @@
     <string name="high_power_filter_on" msgid="3222265297576680099">"Không được tối ưu hóa"</string>
     <string name="high_power_on" msgid="6216293998227583810">"Không được tối ưu hóa"</string>
     <string name="high_power_off" msgid="3393904131961263278">"Tối ưu hóa mức sử dụng pin"</string>
-    <string name="high_power_system" msgid="7362862974428225301">"Tối ưu hóa pin không khả dụng"</string>
+    <string name="high_power_system" msgid="7362862974428225301">"Không tối ưu hóa pin"</string>
     <string name="high_power_desc" msgid="6283926163708585760">"Không áp dụng tối ưu hóa pin. Pin của bạn có thể hết nhanh hơn."</string>
     <string name="high_power_prompt_title" msgid="6358673688590282655">"Cho phép ứng dụng luôn chạy trong nền?"</string>
     <string name="high_power_prompt_body" msgid="1031422980602565049">"Cho phép <xliff:g id="APP_NAME">%1$s</xliff:g> luôn chạy trong nền có thể làm giảm thời lượng pin. \n\nBạn có thể thay đổi điều này sau đó từ Cài đặt &gt; Ứng dụng và thông báo."</string>
@@ -3216,6 +3245,7 @@
     <string name="usb_summary_file_transfers" msgid="6435943692610175111">"Chuyển tệp"</string>
     <string name="usb_summary_photo_transfers" msgid="8440204169576585250">"Chuyển ảnh (PTP)"</string>
     <string name="usb_summary_MIDI" msgid="5687906612187885908">"Sử dụng thiết bị làm MIDI"</string>
+    <string name="sms_mirroring_pref" msgid="6475043279147376031">"Phản chiếu SMS"</string>
     <string name="background_check_pref" msgid="7550258400138010979">"Kiểm tra nền"</string>
     <string name="background_check_title" msgid="4534254315824525593">"Toàn quyền truy cập nền"</string>
     <string name="assist_access_context_title" msgid="2269032346698890257">"Sử dụng văn bản từ màn hình"</string>
@@ -3282,7 +3312,7 @@
     <string name="write_settings_title" msgid="4232152481902542284">"Có thể sửa đổi cài đặt hệ thống"</string>
     <string name="write_system_settings" msgid="3482913590601096763">"Sửa đổi cài đặt hệ thống"</string>
     <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="permit_write_settings" msgid="658555006453212691">"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>
@@ -3377,9 +3407,12 @@
     <string name="color_temperature" msgid="2070126836910615605">"Nhiệt độ màu lạnh"</string>
     <string name="color_temperature_desc" msgid="4793729830226404052">"Sử dụng màu hiển thị lạnh hơn"</string>
     <string name="color_temperature_toast" msgid="4974218172133854827">"Để áp dụng thay đổi màu, hãy tắt màn hình"</string>
-    <string name="telephony_monitor_toast" msgid="7003764250271195384">"Để áp dụng thay đổi với giám sát điện thoại, hãy khởi động lại thiết bị"</string>
+    <string name="connectivity_monitor_switch" msgid="9059759348648583421">"Công cụ giám sát kết nối"</string>
+    <string name="connectivity_monitor_switch_summary" msgid="2828658652378866401">"Công cụ ConnectivityMonitor sẽ thu thập nhật ký khi phát hiện thấy sự cố kết nối và gửi thông báo khẩn cấp tới người dùng để gửi lỗi"</string>
+    <string name="connectivity_monitor_toast" msgid="5551859612881173028">"Để áp dụng thay đổi công cụ giám sát kết nối, hãy khởi động lại thiết bị"</string>
     <string name="camera_hal_hdrplus_switch" msgid="8377365197105267466">"Máy ảnh HAL HDR+"</string>
     <string name="camera_hal_hdrplus_toast" msgid="2063703797270055299">"Để áp dụng thay đổi Máy ảnh HAL HDR+, hãy khởi động lại thiết bị"</string>
+    <string name="camera_laser_sensor_switch" msgid="8913588990743234440">"Cảm biến laser của máy ảnh"</string>
     <string name="ota_disable_automatic_update" msgid="2319639631655915050">"Cập nhật hệ thống tự động"</string>
     <string name="usage" msgid="2977875522080448986">"Sử dụng"</string>
     <string name="cellular_data_usage" msgid="2155683719898158203">"Sử dụng dữ liệu di động"</string>
@@ -3405,7 +3438,7 @@
     <string name="data_warning" msgid="209133958008062117">"Cảnh báo dữ liệu"</string>
     <string name="set_data_limit" msgid="2901526323210516923">"Đặt giới hạn dữ liệu"</string>
     <string name="data_limit" msgid="1885406964934590552">"Giới hạn dữ liệu"</string>
-    <string name="data_usage_template" msgid="392191945602400904">"Đã sử dụng <xliff:g id="ID_1">%1$s</xliff:g> trong khoảng thời gian từ <xliff:g id="ID_2">%2$s</xliff:g>"</string>
+    <string name="data_usage_template" msgid="2923744765873163859">"Đã sử dụng <xliff:g id="ID_1">%1$s</xliff:g> từ <xliff:g id="ID_2">%2$s</xliff:g>"</string>
     <string name="configure" msgid="1029654422228677273">"Định cấu hình"</string>
     <string name="data_usage_other_apps" msgid="3272872663517382050">"Những ứng dụng khác được bao gồm trong mức sử dụng"</string>
     <plurals name="data_saver_unrestricted_summary" formatted="false" msgid="2635267833484232703">
@@ -3474,7 +3507,7 @@
     <string name="button_confirm_convert_fbe" msgid="7101855374850373091">"Xóa và chuyển đổi"</string>
     <string name="reset_shortcut_manager_throttling" msgid="6495066467198668994">"Đặt lại giới hạn tốc độ trong ShortcutManager"</string>
     <string name="reset_shortcut_manager_throttling_complete" msgid="1826770872063707900">"Đã đặt lại giới hạn tốc độ trong ShortcutManager"</string>
-    <string name="notification_suggestion_title" msgid="4506524937307816475">"Kiểm soát thông báo trên màn hình khóa"</string>
+    <string name="notification_suggestion_title" msgid="387052719462473500">"Kiểm soát thông tin trên màn hình khóa"</string>
     <string name="notification_suggestion_summary" msgid="8521159741445416875">"Hiển thị hoặc ẩn nội dung thông báo"</string>
     <string name="page_tab_title_summary" msgid="4070309266374993258">"Tất cả"</string>
     <string name="page_tab_title_support" msgid="8483187649355540109">"Hỗ trợ và mẹo"</string>
@@ -3482,7 +3515,7 @@
     <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>
     <string name="premium_sms_access" msgid="4660047004791638305">"Quyền truy cập SMS cao cấp"</string>
-    <string name="bluetooth_disabled" msgid="2456198532288640046">"Không hiển thị với các thiết bị khác"</string>
+    <string name="bluetooth_disabled" msgid="6244000672828617410">"Tắt"</string>
     <string name="bluetooth_connected_summary" msgid="7672528674593152862">"Được kết nối với <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="bluetooth_connected_multiple_devices_summary" msgid="9173661896296663932">"Được kết nối với nhiều thiết bị"</string>
     <string name="demo_mode" msgid="2798762752209330277">"Chế độ trình diễn giao diện người dùng hệ thống"</string>
@@ -3547,7 +3580,7 @@
     <string name="gesture_preference_summary" product="tablet" msgid="4717535378272065510">"Cử chỉ nhanh để điều khiển máy tính bảng của bạn"</string>
     <string name="gesture_preference_summary" product="device" msgid="4205941452664950852">"Cử chỉ nhanh để điều khiển thiết bị của bạn"</string>
     <string name="double_tap_power_for_camera_title" msgid="64716226816032800">"Chuyển đến máy ảnh"</string>
-    <string name="double_tap_power_for_camera_summary" msgid="242037150983277829">"Để mở nhanh máy ảnh, hãy nhấn vào nút nguồn 2 lần. Hoạt động từ mọi màn hình."</string>
+    <string name="double_tap_power_for_camera_summary" msgid="242037150983277829">"Để mở nhanh máy ảnh, hãy nhấn vào nút nguồn 2 lần. Thao tác này hoạt động từ mọi màn hình."</string>
     <string name="double_tap_power_for_camera_suggestion_title" msgid="6500405261202883589">"Mở nhanh máy ảnh"</string>
     <string name="double_tap_power_for_camera_suggestion_summary" msgid="7010153544554016996">"Nhấn nút nguồn hai lần để mở máy ảnh"</string>
     <string name="double_twist_for_camera_mode_title" msgid="4877834147983530479">"Chuyển máy ảnh"</string>
@@ -3568,7 +3601,7 @@
     <string name="ambient_display_pickup_summary" product="tablet" msgid="5435283849947236648">"Để kiểm tra thời gian, biểu tượng thông báo và thông tin khác, hãy nhấc máy tính bảng lên."</string>
     <string name="ambient_display_pickup_summary" product="device" msgid="8256669101643381568">"Để kiểm tra thời gian, biểu tượng thông báo và thông tin khác, hãy nhấc thiết bị lên."</string>
     <string name="ambient_display_pickup_suggestion_summary" msgid="7014700589991761035">"Kiểm tra thông báo khi màn hình tắt"</string>
-    <string name="fingerprint_swipe_for_notifications_title" msgid="5816346492253270243">"Vuốt dấu vân tay để xem thông báo"</string>
+    <string name="fingerprint_swipe_for_notifications_title" msgid="5816346492253270243">"Vuốt vân tay để xem thông báo"</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="default" msgid="1770661868393713922">"Để kiểm tra thông báo, hãy vuốt xuống trên cảm biến vân tay ở mặt sau điện thoại."</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="tablet" msgid="902719947767712895">"Để kiểm tra thông báo, hãy vuốt xuống trên cảm biến vân tay ở mặt sau máy tính bảng."</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="device" msgid="5372926094116306647">"Để kiểm tra thông báo, hãy vuốt xuống trên cảm biến vân tay ở mặt sau thiết bị."</string>
@@ -3584,7 +3617,7 @@
     <string name="web_action_enable_title" msgid="4051513950976670853">"Ứng dụng tức thì"</string>
     <string name="web_action_enable_summary" msgid="3108127559723396382">"Mở liên kết trong ứng dụng ngay cả khi ứng dụng không được cài đặt"</string>
     <string name="web_action_section_title" msgid="7364647086538399136">"Ứng dụng tức thì"</string>
-    <string name="instant_apps_account" msgid="1433620209791992528">"Tài khoản ứng dụng tức thì"</string>
+    <string name="instant_apps_settings" msgid="8827777916518348213">"Tùy chọn Ứng dụng tức thì"</string>
     <string name="domain_url_section_title" msgid="7046835219056428883">"Ứng dụng đã cài đặt"</string>
     <string name="automatic_storage_manager_activation_warning" msgid="6353100011690933254">"Bộ nhớ của bạn hiện đang được quản lý bởi trình quản lý bộ nhớ"</string>
     <string name="account_for_section_header" msgid="5356566418548737121">"Tài khoản cho <xliff:g id="USER_NAME">%1$s</xliff:g>"</string>
@@ -3631,7 +3664,9 @@
     <string name="enterprise_privacy_always_on_vpn_personal" msgid="9217774730260037434">"Đã bật tùy chọn luôn bật VPN trong hồ sơ cá nhân của bạn"</string>
     <string name="enterprise_privacy_always_on_vpn_work" msgid="7244472958208315814">"Đã bật tùy chọn luôn bật VPN trong hồ sơ công việc của bạn"</string>
     <string name="enterprise_privacy_global_http_proxy" msgid="7936664553416257333">"Đặt proxy HTTP chung"</string>
-    <string name="enterprise_privacy_ca_certs" msgid="5885892204903688909">"Chứng chỉ tin cậy"</string>
+    <string name="enterprise_privacy_ca_certs_device" msgid="2019652712782510262">"Thông tin xác thực đáng tin cậy"</string>
+    <string name="enterprise_privacy_ca_certs_personal" msgid="2279084820904076599">"Thông tin xác thực đáng tin cậy trong hồ sơ cá nhân của bạn"</string>
+    <string name="enterprise_privacy_ca_certs_work" msgid="6187377647815301809">"Thông tin xác thực đáng tin cậy trong hồ sơ công việc của bạn"</string>
     <plurals name="enterprise_privacy_number_ca_certs" formatted="false" msgid="526375234629534165">
       <item quantity="other">Tối thiểu <xliff:g id="COUNT_1">%d</xliff:g> chứng chỉ CA</item>
       <item quantity="one">Tối thiểu <xliff:g id="COUNT_0">%d</xliff:g> chứng chỉ CA</item>
@@ -3694,6 +3729,8 @@
     <string name="carrier_provisioning" msgid="4398683675591893169">"Thông tin cấp phép của nhà cung cấp dịch vụ"</string>
     <string name="trigger_carrier_provisioning" msgid="3434865918009286187">"Kích hoạt cấp phép của nhà cung cấp dịch vụ"</string>
     <string name="new_device_suggestion_title" msgid="698847081680980774">"Thông tin mới và thú vị?"</string>
-    <string name="new_device_suggestion_summary" msgid="7172709269203435870">"Dùng thử 5 tính năng hàng đầu"</string>
+    <string name="new_device_suggestion_summary" product="default" msgid="206396571522515855">"Tham quan điện thoại mới của bạn"</string>
+    <string name="new_device_suggestion_summary" product="tablet" msgid="393751455688210956">"Tham quan máy tính bảng mới của bạn"</string>
+    <string name="new_device_suggestion_summary" product="device" msgid="2939870049868336652">"Tham quan thiết bị mới của bạn"</string>
     <string name="disabled_low_ram_device" msgid="3751578499721173344">"Không sử dụng được tính năng này trên thiết bị này"</string>
 </resources>
diff --git a/res/values-zh-rCN/arrays.xml b/res/values-zh-rCN/arrays.xml
index cf3af7a..f912756 100644
--- a/res/values-zh-rCN/arrays.xml
+++ b/res/values-zh-rCN/arrays.xml
@@ -100,8 +100,6 @@
     <!-- no translation found for wifi_security_no_eap:0 (2084555984818107151) -->
     <!-- no translation found for wifi_security_no_eap:1 (397579322683471524) -->
     <!-- no translation found for wifi_security_no_eap:2 (1968820975358150484) -->
-    <!-- no translation found for wifi_ap_security:0 (5251664683198623324) -->
-    <!-- no translation found for wifi_ap_security:1 (7989073072260294673) -->
   <string-array name="wifi_eap_method">
     <item msgid="1160193392455075561">"PEAP"</item>
     <item msgid="7981731051382306293">"TLS"</item>
diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
index ee00f89..8b367b0 100644
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml
@@ -166,7 +166,7 @@
     <string name="bluetooth_map_acceptance_dialog_text" msgid="8712508202081143737">"“%1$s”想要查看您的消息。要向“%2$s”授予权限吗？"</string>
     <string name="bluetooth_sap_request" msgid="2669762224045354417">"SIM 访问权限请求"</string>
     <string name="bluetooth_sap_acceptance_dialog_text" msgid="4414253873553608690">"<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g>想要访问您的 SIM 卡。如果授权该设备访问 SIM 卡，您设备的数据连接功能在蓝牙连接期间将停用。将访问权限授予<xliff:g id="DEVICE_NAME_1">%2$s?</xliff:g>"</string>
-    <string name="bluetooth_device_name_summary" msgid="4757990010751789977">"向其他设备显示为“<xliff:g id="DEVICE_NAME">^1</xliff:g>”"</string>
+    <string name="bluetooth_device_name_summary" msgid="522235742194965734">"向其他设备显示为“<xliff:g id="DEVICE_NAME">^1</xliff:g>”"</string>
     <string name="bluetooth_paired_device_title" msgid="8638994696317952019">"您的设备"</string>
     <string name="bluetooth_pairing_page_title" msgid="7712127387361962608">"与新设备配对"</string>
     <string name="date_and_time" msgid="9062980487860757694">"日期和时间"</string>
@@ -312,6 +312,8 @@
     <string name="zone_auto" msgid="334783869352026648">"自动确定时区"</string>
     <string name="zone_auto_summaryOn" msgid="6142830927278458314">"使用网络提供的时区"</string>
     <string name="zone_auto_summaryOff" msgid="2597745783162041390">"使用网络提供的时区"</string>
+    <string name="date_time_24hour_auto" msgid="2117383168985653422">"自动使用 24 小时制"</string>
+    <string name="date_time_24hour_auto_summary" msgid="6351812925651480277">"使用默认语言区域"</string>
     <string name="date_time_24hour_title" msgid="3203537578602803850">"24小时制"</string>
     <string name="date_time_24hour" msgid="1193032284921000063">"使用 24 小时制"</string>
     <string name="date_time_set_time_title" msgid="6296795651349047016">"时间"</string>
@@ -341,11 +343,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="4918904614964215087">"安全性和位置"</string>
+    <string name="security_settings_title" msgid="4918904614964215087">"安全性和位置信息"</string>
     <string name="encryption_and_credential_settings_title" msgid="6514904533438791561">"加密与凭据"</string>
     <string name="encryption_and_credential_settings_summary" product="default" msgid="8721883002237981248">"手机已加密"</string>
     <string name="encryption_and_credential_settings_summary" product="tablet" msgid="7200428573872395685">"设备已加密"</string>
-    <string name="lockscreen_settings_title" msgid="3922976395527087455">"锁定屏幕偏好设置"</string>
+    <string name="lockscreen_settings_title" msgid="3922976395527087455">"锁屏时的偏好设置"</string>
     <string name="security_settings_summary" msgid="967393342537986570">"设置我的位置、屏幕解锁、SIM卡锁定和凭据存储锁定"</string>
     <string name="cdma_security_settings_summary" msgid="6068799952798901542">"设置我的位置、屏幕解锁和凭据存储锁定"</string>
     <string name="security_passwords_title" msgid="2881269890053568809">"隐私设置"</string>
@@ -372,6 +374,9 @@
     <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="1961957425135180242">"下一屏幕"</string>
+    <string name="setup_fingerprint_enroll_skip_title" msgid="362050541117362034">"要跳过指纹设置？"</string>
+    <string name="setup_fingerprint_enroll_skip_after_adding_lock_text" msgid="958990414356204763">"指纹设置只需片刻时间。如果您跳过此设置，之后可以在设置中添加您的指纹。"</string>
+    <string name="lock_screen_intro_skip_title" msgid="4988210105913705679">"要跳过屏幕锁定吗？"</string>
     <string name="lock_screen_intro_skip_dialog_text_frp" product="tablet" msgid="1581834104051243425">"系统将不会启用设备保护功能。如果您的平板电脑丢失、被盗或被重置，您将无法防止他人使用此平板电脑。"</string>
     <string name="lock_screen_intro_skip_dialog_text_frp" product="device" msgid="4629503416877189572">"系统将不会启用设备保护功能。如果您的设备丢失、被盗或被重置，您将无法防止他人使用此设备。"</string>
     <string name="lock_screen_intro_skip_dialog_text_frp" product="default" msgid="2423428240245737909">"系统将不会启用设备保护功能。如果您的手机丢失、被盗或被重置，您将无法防止他人使用此手机。"</string>
@@ -457,7 +462,7 @@
     <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="lock_settings_picker_fingerprint_added_security_message" msgid="5768002109707648463">"为提升安全性，请设置备用屏幕锁定方式。"</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>
@@ -515,21 +520,21 @@
 
 </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="6718155854303231675">"移除您的解锁图案后，工作资料保护功能将无法使用。<xliff:g id="EMPTY_LINE">
+    <string name="unlock_disable_frp_warning_content_pattern_fingerprint_profile" msgid="6718155854303231675">"移除您的解锁图案后，资料保护功能将无法使用。<xliff:g id="EMPTY_LINE">
 
-</xliff:g>您保存的指纹也将从此工作资料中移除，因此您将无法通过指纹解锁工作资料、授权购买交易或登录应用。"</string>
+</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="4209564603132870532">"移除您的 PIN 码后，工作资料保护功能将无法使用。<xliff:g id="EMPTY_LINE">
+    <string name="unlock_disable_frp_warning_content_pin_fingerprint_profile" msgid="4209564603132870532">"移除您的 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="2994300676764706047">"移除您的密码后，工作资料保护功能将无法使用。<xliff:g id="EMPTY_LINE">
+    <string name="unlock_disable_frp_warning_content_password_fingerprint_profile" msgid="2994300676764706047">"移除您的密码后，资料保护功能将无法使用。<xliff:g id="EMPTY_LINE">
 
-</xliff:g>您保存的指纹也将从此工作资料中移除，因此您将无法通过指纹解锁您的工作资料、授权购买交易或登录应用。"</string>
+</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="4994062501123299418">"移除您的屏幕锁定方式后，工作资料保护功能将无法使用。<xliff:g id="EMPTY_LINE">
+    <string name="unlock_disable_frp_warning_content_unknown_fingerprint_profile" msgid="4994062501123299418">"移除您的屏幕锁定方式后，资料保护功能将无法使用。<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">"更改解锁PIN码"</string>
@@ -588,6 +593,7 @@
     <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="lockpassword_clear_label" msgid="5724429464960458155">"清除"</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>
@@ -749,10 +755,10 @@
     <string name="wifi_configure_settings_preference_summary_wakeup_on" msgid="646393113104367290">"WLAN 会自动重新开启"</string>
     <string name="wifi_configure_settings_preference_summary_wakeup_off" msgid="2782566279864356713">"WLAN 不会自动重新开启"</string>
     <string name="wifi_access_points" msgid="7053990007031968609">"WLAN网络"</string>
-    <string name="wifi_menu_wps_pbc" msgid="2668564692207863017">"WPS按钮"</string>
+    <string name="wifi_menu_wps_pbc" msgid="2668564692207863017">"WPS 按钮"</string>
     <string name="wifi_menu_more_options" msgid="2448097861752719396">"更多选项"</string>
-    <string name="wifi_menu_wps_pin" msgid="6426448256268695933">"WPS PIN码输入"</string>
-    <string name="wifi_menu_p2p" msgid="7619851399250896797">"WLAN直连"</string>
+    <string name="wifi_menu_wps_pin" msgid="6426448256268695933">"WPS PIN 码输入"</string>
+    <string name="wifi_menu_p2p" msgid="7619851399250896797">"WLAN 直连"</string>
     <string name="wifi_menu_scan" msgid="1470911530412095868">"扫描"</string>
     <string name="wifi_menu_advanced" msgid="7522252991919573664">"高级"</string>
     <string name="wifi_menu_configure" msgid="6150926852602171938">"配置"</string>
@@ -781,6 +787,7 @@
     <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>
@@ -817,6 +824,8 @@
     <string name="wifi_wps_available_first_item" msgid="4422547079984583502">"可使用 WPS"</string>
     <string name="wifi_wps_available_second_item" msgid="8427520131718215301">" （可使用 WPS）"</string>
     <string name="wifi_wps_nfc_enter_password" msgid="2288214226916117159">"请输入您的网络密码"</string>
+    <string name="wifi_carrier_connect" msgid="8174696557882299911">"运营商 WLAN 网络"</string>
+    <string name="wifi_carrier_content" msgid="4634077285415851933">"通过<xliff:g id="NAME">%1%s</xliff:g>连接"</string>
     <string name="wifi_scan_always_turnon_message" msgid="203123538572122989">"为了提高位置信息精确度以及其他目的，“<xliff:g id="APP_NAME">%1$s</xliff:g>”请求启用网络扫描功能（在关闭了WLAN时也可进行扫描）。\n\n是否对所有需要进行扫描的应用批准这项请求？"</string>
     <string name="wifi_scan_always_turnoff_message" msgid="5538901671131941043">"要关闭此功能，请转到菜单下的“高级”。"</string>
     <string name="wifi_scan_always_confirm_allow" msgid="5355973075896817232">"允许"</string>
@@ -834,6 +843,7 @@
     <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_modify" msgid="6100248070440710782">"修改"</string>
     <string name="wifi_failed_forget_message" msgid="1348172929201654986">"无法取消保存网络"</string>
     <string name="wifi_save" msgid="3331121567988522826">"保存"</string>
     <string name="wifi_failed_save_message" msgid="6650004874143815692">"无法保存网络"</string>
@@ -844,8 +854,9 @@
       <item quantity="one">1 个网络</item>
     </plurals>
     <string name="wifi_advanced_titlebar" msgid="4485841401774142908">"高级WLAN"</string>
-    <string name="wifi_advanced_mac_address_title" msgid="6571335466330978393">"MAC地址"</string>
+    <string name="wifi_advanced_mac_address_title" msgid="6571335466330978393">"MAC 地址"</string>
     <string name="wifi_advanced_ip_address_title" msgid="6215297094363164846">"IP 地址"</string>
+    <string name="wifi_details_title" msgid="3471132676909349382">"网络信息"</string>
     <string name="wifi_details_subnet_mask" msgid="6720279144174924410">"子网掩码"</string>
     <string name="wifi_details_dns" msgid="8648826607751830768">"DNS"</string>
     <string name="wifi_details_ipv6_address_header" msgid="6734119149106422148">"IPv6 地址"</string>
@@ -862,7 +873,7 @@
     <string name="wifi_dns2" msgid="1368601006824882659">"DNS 2"</string>
     <string name="wifi_gateway" msgid="163914742461092086">"网关"</string>
     <string name="wifi_network_prefix_length" msgid="3028785234245085998">"网络前缀长度"</string>
-    <string name="wifi_p2p_settings_title" msgid="5444461191435291082">"WLAN直连"</string>
+    <string name="wifi_p2p_settings_title" msgid="5444461191435291082">"WLAN 直连"</string>
     <string name="wifi_p2p_device_info" msgid="3191876744469364173">"设备信息"</string>
     <string name="wifi_p2p_persist_network" msgid="1646424791818168590">"记住该连接"</string>
     <string name="wifi_p2p_menu_search" msgid="3436429984738771974">"搜索设备"</string>
@@ -878,16 +889,15 @@
     <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">"便携式WLAN热点"</string>
-    <string name="wifi_hotspot_checkbox_text" msgid="7763495093333664887">"WLAN热点"</string>
+    <string name="wifi_hotspot_checkbox_text" msgid="7763495093333664887">"WLAN 热点"</string>
     <string name="wifi_hotspot_off_subtext" msgid="5466126533609394170">"目前没有与其他设备共享互联网连接或内容"</string>
     <string name="wifi_hotspot_tethering_on_subtext" product="tablet" msgid="5752490509369962007">"正在通过热点共享此平板电脑的互联网连接"</string>
     <string name="wifi_hotspot_tethering_on_subtext" product="default" msgid="6461075246164300670">"正在通过热点共享此手机的互联网连接"</string>
     <string name="wifi_hotspot_on_local_only_subtext" msgid="2068110388011294735">"应用正在共享内容。要共享互联网连接，请先关闭热点，然后重新打开"</string>
-    <string name="wifi_hotspot_name_title" msgid="1341735529132128887">"WLAN 名称"</string>
+    <string name="wifi_hotspot_name_title" msgid="8237000746618636778">"热点名称"</string>
     <string name="wifi_hotspot_name_summary_connecting" msgid="3378299995508671967">"正在打开<xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>…"</string>
     <string name="wifi_hotspot_name_summary_connected" msgid="3888672084861445362">"其他设备可以连接到<xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>"</string>
-    <string name="wifi_hotspot_password_title" msgid="1955592302902091281">"WLAN 密码"</string>
+    <string name="wifi_hotspot_password_title" msgid="8676859981917573801">"热点密码"</string>
     <string name="wifi_hotspot_ap_band_title" msgid="1165801173359290681">"AP 频段"</string>
     <string name="wifi_hotspot_footer_info_regular" msgid="1203489406068036455">"使用热点创建 WLAN 网络供其他设备使用。热点会使用您的移动数据连接提供互联网连接。这可能会产生额外的移动数据流量费用。"</string>
     <string name="wifi_hotspot_footer_info_local_only" msgid="857988412470694109">"应用可以通过创建热点，与附近的设备共享内容。"</string>
@@ -898,7 +908,6 @@
     <string name="wifi_tether_configure_ap_text" msgid="7974681394041609308">"设置WLAN热点"</string>
     <string name="wifi_hotspot_configure_ap_text" msgid="5478614731464220432">"WLAN热点设置"</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">"Android热点"</string>
     <string name="wifi_calling_settings_title" msgid="4102921303993404577">"WLAN 通话"</string>
     <string name="wifi_calling_suggestion_title" msgid="9008010480466359578">"开启 WLAN 通话功能"</string>
@@ -939,7 +948,7 @@
     <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="emergency_address_summary" msgid="3266760199681945746">"当您通过 WLAN 网络拨打紧急呼救电话时，紧急服务会将该地址视为您所在位置的地址"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"显示"</string>
     <string name="sound_settings" msgid="5534671337768745343">"声音"</string>
     <string name="all_volume_title" msgid="4296957391257836961">"音量"</string>
@@ -993,6 +1002,7 @@
     <string name="search_settings" msgid="1910951467596035063">"搜索"</string>
     <string name="search_settings_summary" msgid="9205656546570654169">"管理搜索设置和历史记录"</string>
     <string name="search_settings_no_results" msgid="8799027492641230999">"没有结果"</string>
+    <string name="search_clear_history" msgid="4196658962573162457">"清除历史记录"</string>
     <string name="display_settings" msgid="7965901687241669598">"显示"</string>
     <string name="accelerometer_title" msgid="7854608399547349157">"自动旋转屏幕"</string>
     <string name="color_mode_title" msgid="3159275920408338215">"鲜明的色彩"</string>
@@ -1122,7 +1132,6 @@
     <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>
     <string name="device_status_activity_title" msgid="1411201799384697904">"状态信息"</string>
     <string name="device_status" msgid="607405385799807324">"状态信息"</string>
@@ -1147,10 +1156,9 @@
     <string name="status_signal_strength" msgid="3732655254188304547">"信号强度"</string>
     <string name="status_roaming" msgid="2638800467430913403">"漫游"</string>
     <string name="status_operator" msgid="2274875196954742087">"网络"</string>
-    <string name="status_wifi_mac_address" msgid="2202206684020765378">"WLANMAC 地址"</string>
+    <string name="status_wifi_mac_address" msgid="2202206684020765378">"WLAN MAC 地址"</string>
     <string name="status_bt_address" msgid="4195174192087439720">"蓝牙地址"</string>
     <string name="status_serial_number" msgid="2257111183374628137">"序列号"</string>
-    <string name="status_unavailable" msgid="7862009036663793314">"无法获取"</string>
     <string name="status_up_time" msgid="7294859476816760399">"已开机时间"</string>
     <string name="status_awake_time" msgid="2393949909051183652">"唤醒时间"</string>
     <string name="internal_memory" msgid="9129595691484260784">"内部存储空间"</string>
@@ -1326,6 +1334,7 @@
     <string name="menu_restore" msgid="8260067415075573273">"重置为默认设置"</string>
     <string name="restore_default_apn_completed" msgid="2824775307377604897">"已重置默认APN设置。"</string>
     <string name="reset_dashboard_title" msgid="6254873816990678620">"重置选项"</string>
+    <string name="reset_dashboard_summary" msgid="4851012632493522755">"网络、应用或设备可以重置"</string>
     <string name="reset_network_title" msgid="6166025966016873843">"重置 WLAN、移动数据网络和蓝牙设置"</string>
     <string name="reset_network_desc" msgid="5547979398298881406">"此操作会重置所有网络设置，包括：\n\n"<li>"WLAN"</li>\n<li>"移动数据网络"</li>\n<li>"蓝牙"</li></string>
     <string name="reset_network_button_text" msgid="2035676527471089853">"重置设置"</string>
@@ -1334,17 +1343,14 @@
     <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="6617679904229218425">"清空所有数据（恢复出厂设置）"</string>
-    <plurals name="master_clear_with_account_summary" formatted="false" msgid="5911377203778818712">
-      <item quantity="other"><xliff:g id="ACCOUNT_COUNT">%1$d</xliff:g> 个帐号将会重置</item>
-      <item quantity="one">1 个帐号将会重置</item>
-    </plurals>
-    <string name="master_clear_summary" msgid="6902443944660426951">"内部存储空间和所有数据都将被重置"</string>
+    <string name="master_clear_title" msgid="3531267871084279512">"清除所有数据（恢复出厂设置）"</string>
     <string name="master_clear_desc" product="tablet" msgid="9146059417023157222">"此操作会清除您平板电脑"<b>"内部存储设备"</b>"中的所有数据，包括：\n\n"<li>"您的Google帐号"</li>\n<li>"系统和应用的数据和设置"</li>\n<li>"下载的应用"</li></string>
-    <string name="master_clear_desc" product="default" msgid="4800386183314202571">"此操作会清除您手机"<b>"内部存储设备"</b>"中的所有数据，包括：\n\n"<li>"您的Google帐号"</li>\n<li>"系统和应用的数据和设置"</li>\n<li>"下载的应用"</li></string>
+    <string name="master_clear_desc" product="default" msgid="4800386183314202571">"此操作会清除您手机"<b>"内部存储空间"</b>"中的所有数据，包括：\n\n"<li>"您的 Google 帐号"</li>\n<li>"系统和应用的数据和设置"</li>\n<li>"已下载的应用"</li></string>
     <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"目前，您已登录以下帐号：\n"</string>
     <string name="master_clear_other_users_present" product="default" msgid="5161423070702470742">\n\n"此设备上目前还有其他用户。\n"</string>
     <string name="master_clear_desc_also_erases_external" msgid="1903185203791274237"><li>"音乐"</li>\n<li>"照片"</li>\n<li>"其他的用户数据"</li></string>
+    <string name="master_clear_desc_also_erases_esim" msgid="312352697653096008"><li>"eSIM 卡中的运营商"</li></string>
+    <string name="master_clear_desc_no_cancel_mobile_plan" msgid="5460926449093211144">\n\n"这样并不会取消您的移动服务套餐。"</string>
     <string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="7744115866662613411">\n\n"要清除音乐、照片和其他用户数据，请清空该 "<b>"USB存储设备"</b>"。"</string>
     <string name="master_clear_desc_erase_external_storage" product="default" msgid="4801026652617377093">\n\n"要清除音乐、图片和其他用户数据，您需要清空该 "<b>"SD卡"</b>"。"</string>
     <string name="erase_external_storage" product="nosdcard" msgid="969364037450286809">"格式化USB存储设备"</string>
@@ -1461,15 +1467,16 @@
     <string name="settings_safetylegal_activity_title" msgid="6901214628496951727">"安全信息"</string>
     <string name="settings_safetylegal_activity_unreachable" msgid="250674109915859456">"您没有数据连接。要立即查看此信息，请使用联网的计算机访问%s。"</string>
     <string name="settings_safetylegal_activity_loading" msgid="8059022597639516348">"正在加载..."</string>
-    <string name="lockpassword_choose_your_password_header" msgid="8624900666929394990">"选择您的密码"</string>
-    <string name="lockpassword_choose_your_password_header_for_fingerprint" msgid="6624409510609085450">"要使用指纹，请设置密码"</string>
-    <string name="lockpassword_choose_your_pattern_header" msgid="6949761069941694050">"选择您的图案"</string>
-    <string name="lockpassword_choose_your_pattern_header_for_fingerprint" msgid="5901096361617543819">"要使用指纹，请设置解锁图案"</string>
-    <string name="lockpassword_choose_your_pin_header" msgid="7598849519816138302">"选择PIN码"</string>
-    <string name="lockpassword_choose_your_pin_header_for_fingerprint" msgid="765344692615917183">"要使用指纹，请设置 PIN 码"</string>
-    <string name="lockpassword_confirm_your_password_header" msgid="6308478184889846633">"确认您的密码"</string>
+    <string name="lockpassword_choose_your_screen_lock_header" msgid="3872462096767152394">"设置屏幕锁定"</string>
+    <string name="lockpassword_choose_your_password_message" msgid="1197569283524841412">"为了安全起见，请设置密码"</string>
+    <string name="lockpassword_choose_your_password_header_for_fingerprint" msgid="2541818487015343503">"要使用指纹，请设置密码"</string>
+    <string name="lockpassword_choose_your_pattern_header_for_fingerprint" msgid="7709785406243556723">"要使用指纹，请设置解锁图案"</string>
+    <string name="lockpassword_choose_your_pin_message" msgid="1875420718677275646">"为了安全起见，请设置 PIN 码"</string>
+    <string name="lockpassword_choose_your_pin_header_for_fingerprint" msgid="1549639053195796674">"要使用指纹，请设置 PIN 码"</string>
+    <string name="lockpassword_choose_your_pattern_message" msgid="5986983400689720015">"为了安全起见，请设置图案"</string>
+    <string name="lockpassword_confirm_your_password_header" msgid="1266027268220850931">"重新输入密码"</string>
     <string name="lockpassword_confirm_your_pattern_header" msgid="7543433733032330821">"确认您的图案"</string>
-    <string name="lockpassword_confirm_your_pin_header" msgid="49038294648213197">"确认 PIN 码"</string>
+    <string name="lockpassword_confirm_your_pin_header" msgid="7744513791910572550">"重新输入 PIN 码"</string>
     <string name="lockpassword_confirm_passwords_dont_match" msgid="5140892109439191415">"密码不匹配"</string>
     <string name="lockpassword_confirm_pins_dont_match" msgid="7226244811505606217">"PIN码不匹配！"</string>
     <string name="lockpassword_choose_lock_generic_header" msgid="3811438094903786145">"选择解锁方式"</string>
@@ -1488,6 +1495,12 @@
     <string name="lockpassword_strong_auth_required_work_pattern" msgid="3003781907040522053">"为了提升安全性，请绘制您的工作资料解锁图案"</string>
     <string name="lockpassword_strong_auth_required_work_pin" msgid="3367491332598821552">"为了提升安全性，请输入您的工作资料 PIN 码"</string>
     <string name="lockpassword_strong_auth_required_work_password" msgid="8159775129968582940">"为了提升安全性，请输入您的工作资料密码"</string>
+    <string name="lockpassword_confirm_your_pattern_details_frp" msgid="6757336656791723193">"您的手机已恢复出厂设置。要使用此手机，请输入您以前的解锁图案。"</string>
+    <string name="lockpassword_confirm_your_pin_details_frp" msgid="826520613445990470">"您的手机已恢复出厂设置。要使用此手机，请输入您以前的 PIN 码。"</string>
+    <string name="lockpassword_confirm_your_password_details_frp" msgid="8944081074615739040">"您的手机已恢复出厂设置。要使用此手机，请输入您以前的密码。"</string>
+    <string name="lockpassword_confirm_your_pattern_header_frp" msgid="2898036091609128286">"验证图案"</string>
+    <string name="lockpassword_confirm_your_pin_header_frp" msgid="4141601774778898803">"验证 PIN 码"</string>
+    <string name="lockpassword_confirm_your_password_header_frp" msgid="3762615419295360480">"验证密码"</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>
@@ -1537,13 +1550,12 @@
     <string name="install_applications_title" msgid="4987712352256508946">"允许所有应用来源"</string>
     <string name="recent_app_category_title" msgid="6673071268966003928">"最近打开的应用"</string>
     <string name="see_all_apps_title" msgid="1317153498074308438">"查看全部 <xliff:g id="COUNT">%1$d</xliff:g> 个应用"</string>
-    <string name="recent_app_summary" msgid="3366446669844932300">"<xliff:g id="TIME">^1</xliff:g>前"</string>
     <string name="install_all_warning" product="tablet" msgid="8310489909586138165">"您的平板电脑和个人数据更容易受到未知应用的攻击。安装来自该来源的应用即表示，您同意对因使用这些应用可能导致的平板电脑损坏或数据丢失承担责任。"</string>
     <string name="install_all_warning" product="default" msgid="1952257127370115988">"您的手机和个人数据更容易受到未知应用的攻击。安装来自该来源的应用即表示，您同意对因使用这些应用可能导致的手机损坏或数据丢失承担责任。"</string>
     <string name="advanced_settings" msgid="1777249286757067969">"高级设置"</string>
     <string name="advanced_settings_summary" msgid="4016682978071086747">"启用更多设置选项"</string>
     <string name="application_info_label" msgid="5736524913065714880">"应用信息"</string>
-    <string name="storage_label" msgid="8700867073480107253">"存储空间"</string>
+    <string name="storage_label" msgid="8700867073480107253">"存储"</string>
     <string name="auto_launch_label" msgid="2669236885531442195">"默认打开"</string>
     <string name="auto_launch_label_generic" msgid="3230569852551968694">"默认操作"</string>
     <string name="screen_compatibility_label" msgid="663250687205465394">"屏幕兼容性"</string>
@@ -1724,7 +1736,7 @@
     <string name="hardkeyboard_category" msgid="5957168411305769899">"物理键盘设置"</string>
     <string name="auto_punctuate_summary" msgid="4372126865670574837">"按空格键两次可插入句号"</string>
     <string name="show_password" msgid="4837897357002495384">"显示密码"</string>
-    <string name="show_password_summary" msgid="3365397574784829969">"输入字符时短暂显示这些字符"</string>
+    <string name="show_password_summary" msgid="3365397574784829969">"输入时短暂显示这些字符"</string>
     <string name="spellchecker_security_warning" msgid="9060897418527708922">"此拼写检查工具可能会收集您键入的所有文字，包括密码和信用卡号等个人数据。它源自应用“<xliff:g id="SPELLCHECKER_APPLICATION_NAME">%1$s</xliff:g>”。要使用此拼写检查工具吗？"</string>
     <string name="spellchecker_quick_settings" msgid="246728645150092058">"设置"</string>
     <string name="spellchecker_language" msgid="6041050114690541437">"语言"</string>
@@ -1801,7 +1813,7 @@
     <string name="accessibility_settings_summary" msgid="981260486011624939">"屏幕阅读器、显示、互动控件"</string>
     <string name="vision_settings_title" msgid="4204111425716868288">"阅读辅助设置"</string>
     <string name="vision_settings_description" msgid="5679491180156408260">"您可以根据自己的需求对此设备进行自定义。以后，您可以在“设置”中更改这些辅助功能设置。"</string>
-    <string name="vision_settings_suggestion_title" msgid="917294957154878441">"放大字体"</string>
+    <string name="vision_settings_suggestion_title" msgid="8058794060304707004">"更改字体大小"</string>
     <string name="screen_reader_category_title" msgid="7739154903913400641">"屏幕阅读器"</string>
     <string name="audio_and_captions_category_title" msgid="3420727114421447524">"音频和屏幕上的文字"</string>
     <string name="display_category_title" msgid="685461049938269166">"显示"</string>
@@ -1838,7 +1850,6 @@
     <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="preference_summary_default_combination" msgid="8532964268242666060">"<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>
@@ -1957,12 +1968,14 @@
     <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_whitelisted" msgid="7375400051141016808">"无法针对此应用优化用电量"</string>
+    <string name="background_activity_warning_dialog_title" msgid="2216249969149568871">"要限制后台活动吗？"</string>
+    <string name="background_activity_warning_dialog_text" msgid="7049624449246121981">"如果您限制某个应用的后台活动，可能会导致该应用出现异常"</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" msgid="6393929085382334341">"充满电（<xliff:g id="RELATIVE_TIME">^1</xliff:g>）后的应用用电量"</string>
+    <string name="power_usage_list_summary_device" msgid="4461926045610455423">"充满电（<xliff:g id="RELATIVE_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>
@@ -2083,7 +2096,7 @@
     <string name="battery_overall_usage" msgid="2093409063297375436">"整体用电量的 <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
     <string name="battery_detail_since_full_charge" msgid="7515347842046955855">"自上次充满电后的用电明细"</string>
     <string name="battery_last_full_charge" msgid="7151251641099019361">"上次充满电"</string>
-    <string name="battery_footer_summary" msgid="67169726550144016">"电池用量数据为大致数据，可能会因使用情形而变化"</string>
+    <string name="battery_footer_summary" msgid="67169726550144016">"电池消耗量为大致值，可能会因使用情形而变化"</string>
     <string name="battery_detail_foreground" msgid="3350401514602032183">"在前台运行时"</string>
     <string name="battery_detail_background" msgid="1929644393553768999">"在后台运行时"</string>
     <string name="battery_detail_power_usage" msgid="6485766868610469101">"电池用量"</string>
@@ -2208,14 +2221,14 @@
     <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">"您需要先设置锁屏 PIN 码或密码，才能使用凭据存储。"</string>
+    <string name="credentials_configure_lock_screen_hint" msgid="8058230497337529036">"您的设备必须启用安全锁定屏幕功能，才能使用凭据存储"</string>
+    <string name="credentials_configure_lock_screen_button" msgid="253239765216055321">"设置锁定方式"</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>
@@ -2335,8 +2348,6 @@
     <skip />
     <string name="cant_sync_dialog_title" msgid="2777238588398046285">"无法手动同步"</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，请输入您的PIN码"</string>
     <string name="enter_pattern" msgid="4187435713036808566">"要启动Android，请绘制您的解锁图案"</string>
@@ -2350,6 +2361,7 @@
     <string name="misc_files_selected_count" msgid="4647048020823912088">"已选择 <xliff:g id="NUMBER">%1$d</xliff:g> 个，共 <xliff:g id="TOTAL">%2$d</xliff:g> 个"</string>
     <string name="misc_files_selected_count_bytes" msgid="2876232009069114352">"<xliff:g id="NUMBER">%1$s</xliff:g>，共 <xliff:g id="TOTAL">%2$s</xliff:g>"</string>
     <string name="select_all" msgid="1562774643280376715">"全选"</string>
+    <string name="data_plan_usage_manage_plans_button_text" msgid="8997761990902708162">"管理套餐"</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>
@@ -2406,8 +2418,8 @@
     <string name="data_usage_app_restrict_dialog" msgid="1466689968707308512">"只能连接到移动网络时，此功能可能会导致需要使用后台流量的应用无法正常运行。\n\n您可以在相关应用的设置中为其设定更合适的数据流量控制选项。"</string>
     <string name="data_usage_restrict_denied_dialog" msgid="55012417305745608">"您必须先设置移动数据流量上限，才能限制后台数据流量。"</string>
     <string name="data_usage_auto_sync_on_dialog_title" msgid="2438617846762244389">"要打开自动同步数据功能吗？"</string>
-    <string name="data_usage_auto_sync_on_dialog" product="tablet" msgid="8581983093524041669">"您在网络上对自己的帐号进行的所有更改都会自动同步到您的平板电脑。\n\n有些帐号还可以将您在平板电脑上进行的所有更改自动同步到网络上。Google帐号就支持此类双向同步。"</string>
-    <string name="data_usage_auto_sync_on_dialog" product="default" msgid="8651376294887142858">"您在网络上对自己的帐号进行的所有更改都会自动同步到您的手机。\n\n有些帐号还可以将您在手机上进行的所有更改自动同步到网络上。Google帐号就支持此类双向同步。"</string>
+    <string name="data_usage_auto_sync_on_dialog" product="tablet" msgid="8581983093524041669">"您在网络上对自己的帐号进行的所有更改都会自动同步到您的平板电脑。\n\n有些帐号还可以将您在平板电脑上进行的所有更改自动同步到网络上。Google 帐号就支持此类双向同步。"</string>
+    <string name="data_usage_auto_sync_on_dialog" product="default" msgid="8651376294887142858">"您在网络上对自己的帐号进行的所有更改都会自动同步到您的手机。\n\n有些帐号还可以将您在手机上进行的所有更改自动同步到网络上。Google 帐号就支持此类双向同步。"</string>
     <string name="data_usage_auto_sync_off_dialog_title" msgid="9013139130490125793">"要关闭自动同步数据功能吗？"</string>
     <string name="data_usage_auto_sync_off_dialog" msgid="4025938250775413864">"这样可以节省数据流量和电池电量，但您需要手动同步每个帐号才能获得最新信息，并且在有更新时不会收到通知。"</string>
     <string name="data_usage_cycle_editor_title" msgid="1373797281540188533">"流量重置日期"</string>
@@ -2435,6 +2447,9 @@
     <string name="data_usage_metered_mobile" msgid="5423305619126978393">"移动网络"</string>
     <string name="data_usage_metered_wifi" msgid="1761738002328299714">"按流量计费的WLAN网络"</string>
     <string name="data_usage_metered_wifi_disabled" msgid="727808462375941567">"要选择按流量计费的网络，请开启WLAN网络。"</string>
+    <string name="data_usage_metered_auto" msgid="1262028400911918865">"自动"</string>
+    <string name="data_usage_metered_yes" msgid="9217539611385225894">"按流量计费"</string>
+    <string name="data_usage_metered_no" msgid="4025232961929071789">"不按流量计费"</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>
@@ -2526,9 +2541,6 @@
     <string name="backup_pw_set_button_text" msgid="2387480910044648795">"设置备份密码"</string>
     <string name="backup_pw_cancel_button_text" msgid="8845630125391744615">"取消"</string>
     <string name="additional_system_update_settings_list_item_title" msgid="214987609894661992">"其他系统更新"</string>
-    <string name="selinux_status_disabled" msgid="924551035552323327">"已停用"</string>
-    <string name="selinux_status_permissive" msgid="6004965534713398778">"许可"</string>
-    <string name="selinux_status_enforcing" msgid="2252703756208463329">"执行中"</string>
     <string name="ssl_ca_cert_warning" msgid="2045866713601984673">"网络可能会受到监控"</string>
     <string name="done_button" msgid="1991471253042622230">"完成"</string>
     <plurals name="ssl_ca_cert_dialog_title" formatted="false" msgid="7145092748045794650">
@@ -2626,7 +2638,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>
@@ -2726,6 +2738,7 @@
       <item quantity="other">显示 %d 项隐藏内容</item>
       <item quantity="one">显示 %d 项隐藏内容</item>
     </plurals>
+    <string name="dashboard_suggestion_condition_footer_content_description" msgid="2898588191174845961">"收起"</string>
     <string name="network_dashboard_title" msgid="4771589228992391573">"网络和互联网"</string>
     <string name="network_dashboard_summary_mobile" msgid="3851083934739500429">"移动网络"</string>
     <string name="network_dashboard_summary_data_usage" msgid="3843261364705042212">"流量使用"</string>
@@ -2828,8 +2841,14 @@
       <item quantity="other">已启用 <xliff:g id="ON_COUNT">%d</xliff:g> 个自动规则</item>
       <item quantity="one">已启用 1 个自动规则</item>
     </plurals>
-    <string name="zen_mode_settings_title" msgid="842308776768942600">"“勿扰”偏好设置"</string>
-    <string name="zen_mode_priority_settings_title" msgid="2623117023031824309">"仅允许指定的优先事项打扰"</string>
+    <string name="zen_mode_settings_title" msgid="1066226840983908121">"勿扰模式"</string>
+    <string name="zen_mode_behavior_settings_title" msgid="1463303933529313969">"行为"</string>
+    <string name="zen_mode_behavior_allow_title" msgid="3845615648136218141">"允许以下类型的提示音和振动："</string>
+    <string name="zen_mode_behavior_no_sound" msgid="1219626004723208056">"不发出提示音"</string>
+    <string name="zen_mode_behavior_total_silence" msgid="6716603819806610626">"不发出提示音（完全阻止）"</string>
+    <string name="zen_mode_behavior_no_sound_except" msgid="4968477585788243114">"不发出提示音（<xliff:g id="CATEGORIES">%1$s</xliff:g>除外）"</string>
+    <!-- no translation found for zen_mode_behavior_alarms_only (2423480992071472963) -->
+    <skip />
     <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>
@@ -2871,13 +2890,15 @@
     <string name="notifications_title" msgid="8086372779371204971">"通知"</string>
     <string name="app_notifications_title" msgid="5810577805218003760">"应用通知"</string>
     <string name="notification_channel_title" msgid="2260666541030178452">"通知类别"</string>
+    <string name="notification_group_title" msgid="7180506440133859601">"通知类别组"</string>
     <string name="notification_importance_title" msgid="848692592679312666">"重要程度"</string>
-    <string name="notification_importance_unspecified" msgid="2196023702875112081">"让应用决定"</string>
+    <string name="notification_importance_unspecified" msgid="6622173510486113958">"允许发出提示音"</string>
     <string name="notification_importance_blocked" msgid="7938180808339386300">"一律不显示通知"</string>
     <string name="notification_importance_min" msgid="5455049524984686275">"不发出提示音，也不在屏幕上弹出通知"</string>
     <string name="notification_importance_low" msgid="8881468429453766553">"不发出提示音"</string>
     <string name="notification_importance_default" msgid="5958338024601957516">"发出提示音"</string>
     <string name="notification_importance_high" msgid="2082429479238228527">"发出提示音并在屏幕上弹出通知"</string>
+    <string name="notification_importance_high_silent" msgid="2667033773703765252">"在屏幕上弹出"</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>
@@ -2920,8 +2941,13 @@
     <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="channel_group_notifications_off_desc" msgid="1620950416247316370">"Android 会阻止这组通知显示在此设备上"</string>
     <string name="notification_channels" msgid="5346841743182627500">"类别"</string>
     <string name="notification_channels_other" msgid="5645317113885788226">"其他"</string>
+    <plurals name="notification_group_summary" formatted="false" msgid="3420621520561455358">
+      <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="no_channels" msgid="3077375508177744586">"此应用未发布任何通知"</string>
     <string name="app_settings_link" msgid="8894946007543660906">"应用中的其他设置"</string>
     <string name="app_notification_listing_summary_zero" msgid="6482582965081108108">"已开启所有应用的通知"</string>
@@ -2984,8 +3010,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>
@@ -2998,12 +3024,14 @@
     <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>
+    <!-- no translation found for zen_mode_media_system_other (8900209390529859777) -->
+    <skip />
     <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="239685342222975733">"如果同一个人在 <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>
@@ -3032,6 +3060,7 @@
     <string name="zen_mode_screen_off_visual_interruptions" msgid="4850792880144382633">"屏幕关闭时"</string>
     <string name="zen_mode_no_visual_interruptions" msgid="8742776003822778472">"屏幕开启或关闭时"</string>
     <string name="notification_app_settings_button" msgid="6685640230371477485">"通知设置"</string>
+    <string name="suggestion_button_text" msgid="3275010948381252006">"确定"</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>
@@ -3216,6 +3245,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="sms_mirroring_pref" msgid="6475043279147376031">"短信镜像"</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>
@@ -3282,7 +3312,7 @@
     <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="permit_write_settings" msgid="658555006453212691">"允许修改系统设置"</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>
@@ -3309,7 +3339,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>
@@ -3377,9 +3407,12 @@
     <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="connectivity_monitor_switch" msgid="9059759348648583421">"连接监控器"</string>
+    <string name="connectivity_monitor_switch_summary" msgid="2828658652378866401">"连接监控器会在检测到连接问题时收集相关日志，并向用户发出通知，提醒用户提交错误报告"</string>
+    <string name="connectivity_monitor_toast" msgid="5551859612881173028">"要应用连接监控器的变更内容，请重新启动设备"</string>
     <string name="camera_hal_hdrplus_switch" msgid="8377365197105267466">"相机 HAL HDR+"</string>
     <string name="camera_hal_hdrplus_toast" msgid="2063703797270055299">"要应用对“相机 HAL HDR+”设置所做的更改，请重新启动设备"</string>
+    <string name="camera_laser_sensor_switch" msgid="8913588990743234440">"相机激光传感器"</string>
     <string name="ota_disable_automatic_update" msgid="2319639631655915050">"自动系统更新"</string>
     <string name="usage" msgid="2977875522080448986">"流量消耗"</string>
     <string name="cellular_data_usage" msgid="2155683719898158203">"移动数据用量"</string>
@@ -3387,7 +3420,7 @@
     <string name="ethernet_data_usage" msgid="5108764537574354616">"以太网流量消耗"</string>
     <string name="wifi" msgid="1081550856200013637">"WLAN"</string>
     <string name="ethernet" msgid="6600095783781389720">"以太网"</string>
-    <string name="cell_data_template" msgid="405684854174361041">"<xliff:g id="AMOUNT">^1</xliff:g> 移动数据"</string>
+    <string name="cell_data_template" msgid="405684854174361041">"<xliff:g id="AMOUNT">^1</xliff:g>（移动数据流量）"</string>
     <string name="wifi_data_template" msgid="6265570748799357386">"<xliff:g id="AMOUNT">^1</xliff:g> WLAN 流量"</string>
     <string name="ethernet_data_template" msgid="5782476509881033590">"<xliff:g id="AMOUNT">^1</xliff:g> 以太网流量"</string>
     <string name="cell_warning_only" msgid="763147658209027140">"流量警告：<xliff:g id="ID_1">%1$s</xliff:g>"</string>
@@ -3401,11 +3434,11 @@
     </plurals>
     <string name="operator_warning" msgid="1862988028996859195">"运营商的流量计算方式可能与您设备的计算方式不同"</string>
     <string name="data_used_template" msgid="3245919669966296505">"已使用 <xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="set_data_warning" msgid="6115364758236594593">"设置数据用量警告"</string>
+    <string name="set_data_warning" msgid="6115364758236594593">"设置数据流量消耗警告"</string>
     <string name="data_warning" msgid="209133958008062117">"流量警告"</string>
     <string name="set_data_limit" msgid="2901526323210516923">"设置流量上限"</string>
     <string name="data_limit" msgid="1885406964934590552">"流量上限"</string>
-    <string name="data_usage_template" msgid="392191945602400904">"<xliff:g id="ID_2">%2$s</xliff:g>使用了 <xliff:g id="ID_1">%1$s</xliff:g>"</string>
+    <string name="data_usage_template" msgid="2923744765873163859">"<xliff:g id="ID_2">%2$s</xliff:g>期间已使用 <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="configure" msgid="1029654422228677273">"配置"</string>
     <string name="data_usage_other_apps" msgid="3272872663517382050">"其他消耗流量的应用"</string>
     <plurals name="data_saver_unrestricted_summary" formatted="false" msgid="2635267833484232703">
@@ -3474,7 +3507,7 @@
     <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="387052719462473500">"控制锁定屏幕上显示的信息"</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="8483187649355540109">"支持和提示"</string>
@@ -3482,7 +3515,7 @@
     <string name="premium_sms_none" msgid="8268105565738040566">"没有任何已安装的应用申请付费短信权限"</string>
     <string name="premium_sms_warning" msgid="9086859595338944882">"“付费短信”可能会产生费用，而且相关费用将计入您的运营商帐单。如果您为某个应用启用该权限，那么您将能够使用该应用发送付费短信。"</string>
     <string name="premium_sms_access" msgid="4660047004791638305">"付费短信权限"</string>
-    <string name="bluetooth_disabled" msgid="2456198532288640046">"其他设备无法检测到"</string>
+    <string name="bluetooth_disabled" msgid="6244000672828617410">"关闭"</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>
@@ -3561,7 +3594,7 @@
     <string name="ambient_display_title" product="device" msgid="3423781975742145894">"点按两次即可查看设备"</string>
     <string name="ambient_display_summary" msgid="525662960806416373">"点按两次屏幕即可查看时间、通知图标和其他信息。"</string>
     <string name="ambient_display_suggestion_summary" msgid="5987443721392571847">"屏幕关闭时查看通知"</string>
-    <string name="ambient_display_pickup_title" product="default" msgid="818688002837687268">"触碰即主动显示"</string>
+    <string name="ambient_display_pickup_title" product="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="4567020486787561873">"拿起您的手机即可查看时间、通知图标和其他信息。"</string>
@@ -3580,11 +3613,11 @@
     <string name="oem_unlock_enable_disabled_summary_connectivity" msgid="415954951226204461">"请先连接到互联网"</string>
     <string name="oem_unlock_enable_disabled_summary_connectivity_or_locked" msgid="5884723935668892613">"请连接到互联网或与您的运营商联系"</string>
     <string name="oem_unlock_enable_disabled_summary_sim_locked_device" msgid="4149387448213399630">"在与运营商绑定的设备上无法使用"</string>
-    <string name="automatic_storage_manager_freed_bytes" msgid="7517560170441007788">"已释放共 <xliff:g id="SIZE">%1$s</xliff:g>\n\n上次运行日期：<xliff:g id="DATE">%2$s</xliff:g>"</string>
+    <string name="automatic_storage_manager_freed_bytes" msgid="7517560170441007788">"总共释放空间：<xliff:g id="SIZE">%1$s</xliff:g>\n\n上次执行日期：<xliff:g id="DATE">%2$s</xliff:g>"</string>
     <string name="web_action_enable_title" msgid="4051513950976670853">"免安装应用"</string>
     <string name="web_action_enable_summary" msgid="3108127559723396382">"在应用中打开链接（即使未安装相关应用也无妨）"</string>
     <string name="web_action_section_title" msgid="7364647086538399136">"免安装应用"</string>
-    <string name="instant_apps_account" msgid="1433620209791992528">"免安装应用帐号"</string>
+    <string name="instant_apps_settings" msgid="8827777916518348213">"免安装应用偏好设置"</string>
     <string name="domain_url_section_title" msgid="7046835219056428883">"已安装的应用"</string>
     <string name="automatic_storage_manager_activation_warning" msgid="6353100011690933254">"您的存储空间目前是由存储空间管理器管理"</string>
     <string name="account_for_section_header" msgid="5356566418548737121">"<xliff:g id="USER_NAME">%1$s</xliff:g>的帐号"</string>
@@ -3631,7 +3664,9 @@
     <string name="enterprise_privacy_always_on_vpn_personal" msgid="9217774730260037434">"已在您的个人资料中开启“始终开启的 VPN”"</string>
     <string name="enterprise_privacy_always_on_vpn_work" msgid="7244472958208315814">"已在您的工作资料中开启“始终开启的 VPN”"</string>
     <string name="enterprise_privacy_global_http_proxy" msgid="7936664553416257333">"已设置全局 HTTP 代理"</string>
-    <string name="enterprise_privacy_ca_certs" msgid="5885892204903688909">"可信凭据"</string>
+    <string name="enterprise_privacy_ca_certs_device" msgid="2019652712782510262">"可信凭据"</string>
+    <string name="enterprise_privacy_ca_certs_personal" msgid="2279084820904076599">"您个人资料中的可信凭据"</string>
+    <string name="enterprise_privacy_ca_certs_work" msgid="6187377647815301809">"您工作资料中的可信凭据"</string>
     <plurals name="enterprise_privacy_number_ca_certs" formatted="false" msgid="526375234629534165">
       <item quantity="other">至少 <xliff:g id="COUNT_1">%d</xliff:g> 个 CA 证书</item>
       <item quantity="one">至少 <xliff:g id="COUNT_0">%d</xliff:g> 个 CA 证书</item>
@@ -3694,6 +3729,8 @@
     <string name="carrier_provisioning" msgid="4398683675591893169">"运营商配置信息"</string>
     <string name="trigger_carrier_provisioning" msgid="3434865918009286187">"触发运营商配置"</string>
     <string name="new_device_suggestion_title" msgid="698847081680980774">"新增了哪些精彩功能？"</string>
-    <string name="new_device_suggestion_summary" msgid="7172709269203435870">"查看前 5 大热门功能"</string>
+    <string name="new_device_suggestion_summary" product="default" msgid="206396571522515855">"新手机功能导览"</string>
+    <string name="new_device_suggestion_summary" product="tablet" msgid="393751455688210956">"新平板电脑功能导览"</string>
+    <string name="new_device_suggestion_summary" product="device" msgid="2939870049868336652">"新设备功能导览"</string>
     <string name="disabled_low_ram_device" msgid="3751578499721173344">"该设备不支持此功能"</string>
 </resources>
diff --git a/res/values-zh-rHK/arrays.xml b/res/values-zh-rHK/arrays.xml
index ba1fe3a..ba0e45f 100644
--- a/res/values-zh-rHK/arrays.xml
+++ b/res/values-zh-rHK/arrays.xml
@@ -67,7 +67,7 @@
   </string-array>
   <string-array name="wifi_status">
     <item msgid="1922181315419294640"></item>
-    <item msgid="8934131797783724664">"掃瞄中…"</item>
+    <item msgid="8934131797783724664">"掃描中…"</item>
     <item msgid="8513729475867537913">"正在連線..."</item>
     <item msgid="515055375277271756">"正在驗證…"</item>
     <item msgid="1943354004029184381">"正在取得 IP 位址…"</item>
@@ -81,7 +81,7 @@
   </string-array>
   <string-array name="wifi_status_with_ssid">
     <item msgid="7714855332363650812"></item>
-    <item msgid="8878186979715711006">"掃瞄中…"</item>
+    <item msgid="8878186979715711006">"掃描中…"</item>
     <item msgid="355508996603873860">"正在連線到 <xliff:g id="NETWORK_NAME">%1$s</xliff:g>…"</item>
     <item msgid="554971459996405634">"正在取得 <xliff:g id="NETWORK_NAME">%1$s</xliff:g> 的授權…"</item>
     <item msgid="7928343808033020343">"正在從 <xliff:g id="NETWORK_NAME">%1$s</xliff:g> 取得 IP 位址…"</item>
@@ -100,8 +100,6 @@
     <!-- no translation found for wifi_security_no_eap:0 (2084555984818107151) -->
     <!-- no translation found for wifi_security_no_eap:1 (397579322683471524) -->
     <!-- no translation found for wifi_security_no_eap:2 (1968820975358150484) -->
-    <!-- no translation found for wifi_ap_security:0 (5251664683198623324) -->
-    <!-- no translation found for wifi_ap_security:1 (7989073072260294673) -->
   <string-array name="wifi_eap_method">
     <item msgid="1160193392455075561">"PEAP"</item>
     <item msgid="7981731051382306293">"TLS"</item>
@@ -247,9 +245,9 @@
     <item msgid="6546959730920410907">"修改通話記錄"</item>
     <item msgid="446877710771379667">"讀取日曆"</item>
     <item msgid="7674458294386319722">"修改日曆"</item>
-    <item msgid="8281201165558093009">"Wi-Fi 掃瞄"</item>
+    <item msgid="8281201165558093009">"Wi-Fi 掃描"</item>
     <item msgid="8694611243479480497">"通知"</item>
-    <item msgid="7776439107987345446">"手機掃瞄"</item>
+    <item msgid="7776439107987345446">"手機掃描"</item>
     <item msgid="514615766544675057">"撥打電話"</item>
     <item msgid="8181415497109310680">"讀取 SMS"</item>
     <item msgid="6816551144382117307">"寫入 SMS"</item>
diff --git a/res/values-zh-rHK/strings.xml b/res/values-zh-rHK/strings.xml
index 4a4bda1..5b20f66 100644
--- a/res/values-zh-rHK/strings.xml
+++ b/res/values-zh-rHK/strings.xml
@@ -105,7 +105,7 @@
     <string name="bluetooth_device_details" msgid="4594773497930028085">"裝置設定"</string>
     <string name="bluetooth_profile_details" msgid="6823621790324933337">"個人資料設定"</string>
     <string name="bluetooth_name_not_set" msgid="2653752006416027426">"名稱未設定，改用帳戶名稱"</string>
-    <string name="bluetooth_scan_for_devices" msgid="9214184305566815727">"掃瞄裝置"</string>
+    <string name="bluetooth_scan_for_devices" msgid="9214184305566815727">"掃描裝置"</string>
     <string name="bluetooth_rename_device" msgid="4352483834491958740">"重新命名這部裝置"</string>
     <string name="bluetooth_rename_button" msgid="1648028693822994566">"重新命名"</string>
     <string name="bluetooth_disconnect_title" msgid="7830252930348734303">"要解除連結裝置嗎？"</string>
@@ -166,7 +166,7 @@
     <string name="bluetooth_map_acceptance_dialog_text" msgid="8712508202081143737">"%1$s 想存取您的訊息，要授予 %2$s 存取權嗎？"</string>
     <string name="bluetooth_sap_request" msgid="2669762224045354417">"SIM 卡存取權要求"</string>
     <string name="bluetooth_sap_acceptance_dialog_text" msgid="4414253873553608690">"<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g> 要存取您的 SIM 卡。如果允許存取 SIM 卡，您裝置上的數據連線將於連線期間停用。允許 <xliff:g id="DEVICE_NAME_1">%2$s?</xliff:g> 存取"</string>
-    <string name="bluetooth_device_name_summary" msgid="4757990010751789977">"向其他裝置顯示為「<xliff:g id="DEVICE_NAME">^1</xliff:g>」"</string>
+    <string name="bluetooth_device_name_summary" msgid="522235742194965734">"向其他裝置顯示為「<xliff:g id="DEVICE_NAME">^1</xliff:g>」"</string>
     <string name="bluetooth_paired_device_title" msgid="8638994696317952019">"您的裝置"</string>
     <string name="bluetooth_pairing_page_title" msgid="7712127387361962608">"配對新裝置"</string>
     <string name="date_and_time" msgid="9062980487860757694">"日期和時間"</string>
@@ -243,8 +243,8 @@
     <string name="sdcard_settings_bad_removal_status" product="nosdcard" msgid="7761390725880773697">"USB 儲存裝置在使用期間被移除！"</string>
     <string name="sdcard_settings_bad_removal_status" product="default" msgid="5145797653495907970">"SD 卡在使用期間被移除！"</string>
     <string name="sdcard_settings_used_bytes_label" msgid="8820289486001170836">"已用空間 (位元組)："</string>
-    <string name="sdcard_settings_scanning_status" product="nosdcard" msgid="7503429447676219564">"正在掃瞄 USB 儲存裝置中的媒體..."</string>
-    <string name="sdcard_settings_scanning_status" product="default" msgid="2763464949274455656">"正在掃瞄 SD 卡中的媒體..."</string>
+    <string name="sdcard_settings_scanning_status" product="nosdcard" msgid="7503429447676219564">"正在掃描 USB 儲存裝置中的媒體..."</string>
+    <string name="sdcard_settings_scanning_status" product="default" msgid="2763464949274455656">"正在掃描 SD 卡中的媒體..."</string>
     <string name="sdcard_settings_read_only_status" product="nosdcard" msgid="3624143937437417788">"USB 儲存裝置已掛接為唯讀裝置。"</string>
     <string name="sdcard_settings_read_only_status" product="default" msgid="4518291824764698112">"SD 記憶卡已掛接為唯讀裝置。"</string>
     <string name="skip_label" msgid="47510779345218297">"略過"</string>
@@ -312,6 +312,8 @@
     <string name="zone_auto" msgid="334783869352026648">"自動設定時區"</string>
     <string name="zone_auto_summaryOn" msgid="6142830927278458314">"使用網絡提供的時區"</string>
     <string name="zone_auto_summaryOff" msgid="2597745783162041390">"使用網絡提供的時區"</string>
+    <string name="date_time_24hour_auto" msgid="2117383168985653422">"自動使用 24 小時制"</string>
+    <string name="date_time_24hour_auto_summary" msgid="6351812925651480277">"使用地區設定預設值"</string>
     <string name="date_time_24hour_title" msgid="3203537578602803850">"24 小時格式"</string>
     <string name="date_time_24hour" msgid="1193032284921000063">"使用 24 小時格式"</string>
     <string name="date_time_set_time_title" msgid="6296795651349047016">"時間"</string>
@@ -326,8 +328,8 @@
     <string name="time_picker_title" msgid="483460752287255019">"時間"</string>
     <string name="lock_after_timeout" msgid="4590337686681194648">"自動鎖定"</string>
     <string name="lock_after_timeout_summary" msgid="6128431871360905631">"休眠 <xliff:g id="TIMEOUT_STRING">%1$s</xliff:g> 後"</string>
-    <string name="lock_immediately_summary_with_exception" msgid="9119632173886172690">"休眠後隨即啟用 (由<xliff:g id="TRUST_AGENT_NAME">%1$s</xliff:g>維持解鎖狀態時除外)"</string>
-    <string name="lock_after_timeout_summary_with_exception" msgid="5579064842797188409">"休眠 <xliff:g id="TIMEOUT_STRING">%1$s</xliff:g>後 (由「<xliff:g id="TRUST_AGENT_NAME">%2$s</xliff:g>」維持解鎖狀態時除外)"</string>
+    <string name="lock_immediately_summary_with_exception" msgid="9119632173886172690">"休眠後立即上鎖 (<xliff:g id="TRUST_AGENT_NAME">%1$s</xliff:g>保持解鎖狀態時除外)"</string>
+    <string name="lock_after_timeout_summary_with_exception" msgid="5579064842797188409">"休眠 <xliff:g id="TIMEOUT_STRING">%1$s</xliff:g>後 (<xliff:g id="TRUST_AGENT_NAME">%2$s</xliff:g>保持解鎖狀態時除外)"</string>
     <string name="show_owner_info_on_lockscreen_label" msgid="5074906168357568434">"在鎖定畫面上顯示擁有者資訊"</string>
     <string name="owner_info_settings_title" msgid="5530285568897386122">"螢幕鎖定訊息"</string>
     <string name="security_enable_widgets_title" msgid="2754833397070967846">"啟用小工具"</string>
@@ -372,6 +374,9 @@
     <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="1961957425135180242">"下一個畫面"</string>
+    <string name="setup_fingerprint_enroll_skip_title" msgid="362050541117362034">"要略過指紋設定程序嗎？"</string>
+    <string name="setup_fingerprint_enroll_skip_after_adding_lock_text" msgid="958990414356204763">"指紋設定程序只需一至兩分鐘。如果您略過此程序，稍後可以在設定中自行新增您的指紋。"</string>
+    <string name="lock_screen_intro_skip_title" msgid="4988210105913705679">"要略過螢幕鎖定設定程序嗎？"</string>
     <string name="lock_screen_intro_skip_dialog_text_frp" product="tablet" msgid="1581834104051243425">"系統將不會開啟裝置保護功能。如果您的平板電腦遺失、被盜或被重設，您將無法防止他人使用此平板電腦。"</string>
     <string name="lock_screen_intro_skip_dialog_text_frp" product="device" msgid="4629503416877189572">"系統將不會開啟裝置保護功能。如果您的裝置遺失、被盜或被重設，您將無法防止他人使用此裝置。"</string>
     <string name="lock_screen_intro_skip_dialog_text_frp" product="default" msgid="2423428240245737909">"系統將不會開啟裝置保護功能。如果您的手機遺失、被盜或被重設，您將無法防止他人使用此手機。"</string>
@@ -381,7 +386,7 @@
     <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="3051496861358227199">"輕觸感應器"</string>
-    <string name="security_settings_fingerprint_enroll_find_sensor_message" msgid="8793966374365960368">"指紋感應器位於手機背面。請使用食指輕觸感應器。"</string>
+    <string name="security_settings_fingerprint_enroll_find_sensor_message" msgid="8793966374365960368">"指紋感應器在手機背面。請使用食指輕觸感應器。"</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_content_description" msgid="2058830032070449160">"裝置和指紋感應器位置圖示"</string>
     <string name="security_settings_fingerprint_enroll_dialog_name_label" msgid="7086763077909041106">"名稱"</string>
     <string name="security_settings_fingerprint_enroll_dialog_ok" msgid="4150384963879569750">"確定"</string>
@@ -389,10 +394,10 @@
     <string name="security_settings_fingerprint_enroll_start_title" msgid="2068961812439460133">"輕觸感應器"</string>
     <string name="security_settings_fingerprint_enroll_start_message" msgid="3909929328942564524">"將手指放在感應器上，直至感到震動時放開"</string>
     <string name="security_settings_fingerprint_enroll_repeat_title" msgid="2819679722403209778">"提起手指，然後再次輕觸感應器"</string>
-    <string name="security_settings_fingerprint_enroll_repeat_message" msgid="6158989350522518586">"重覆按壓指紋感應器，即可加入各個部分的指紋"</string>
+    <string name="security_settings_fingerprint_enroll_repeat_message" msgid="6158989350522518586">"重覆按壓指紋感應器，加入指紋的不同部分"</string>
     <string name="security_settings_fingerprint_enroll_finish_title" msgid="7567276170287972230">"已加入指紋"</string>
     <string name="security_settings_fingerprint_enroll_finish_message" msgid="4796715961273420536">"看到此圖示時，請使用您的指紋識別身份或核准購物交易。"</string>
-    <string name="security_settings_fingerprint_enroll_enrolling_skip" msgid="3710211704052369752">"稍後註冊"</string>
+    <string name="security_settings_fingerprint_enroll_enrolling_skip" msgid="3710211704052369752">"稍後再做"</string>
     <string name="setup_fingerprint_enroll_enrolling_skip_title" msgid="6808422329107426923">"略過指紋設定？"</string>
     <string name="setup_fingerprint_enroll_enrolling_skip_message" msgid="274849306857859783">"您已選擇使用指紋作為唯一的手機解鎖方式。如果您現在略過，將需要稍後設定。設定過程只需約一分鐘。"</string>
     <string name="security_settings_fingerprint_enroll_setup_screen_lock" msgid="1195743489835505376">"設定螢幕鎖定"</string>
@@ -457,7 +462,7 @@
     <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="lock_settings_picker_fingerprint_added_security_message" msgid="5768002109707648463">"為提升安全性，請設定後備螢幕鎖定方式。"</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>
@@ -588,6 +593,7 @@
     <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="lockpassword_clear_label" msgid="5724429464960458155">"清除"</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>
@@ -623,7 +629,7 @@
     <string name="bluetooth_pairing_shares_phonebook" msgid="2277931851483023208">"允許<xliff:g id="DEVICE_NAME">%1$s</xliff:g>存取您的聯絡人和通話記錄"</string>
     <string name="bluetooth_error_title" msgid="6850384073923533096"></string>
     <string name="bluetooth_connecting_error_message" msgid="1397388344342081090">"無法連接「<xliff:g id="DEVICE_NAME">%1$s</xliff:g>」。"</string>
-    <string name="bluetooth_preference_scan_title" msgid="2277464653118896016">"掃瞄裝置"</string>
+    <string name="bluetooth_preference_scan_title" msgid="2277464653118896016">"掃描裝置"</string>
     <string name="bluetooth_search_for_devices" msgid="2754007356491461674">"重新整理"</string>
     <string name="bluetooth_searching_for_devices" msgid="9203739709307871727">"正在搜尋..."</string>
     <string name="bluetooth_preference_device_settings" msgid="907776049862799122">"裝置設定"</string>
@@ -648,7 +654,7 @@
     <string name="bluetooth_menu_advanced" msgid="8572178316357220524">"進階設定"</string>
     <string name="bluetooth_advanced_titlebar" msgid="2142159726881547669">"藍牙進階設定"</string>
     <string name="bluetooth_empty_list_bluetooth_off" msgid="6351930724051893423">"當啟用藍牙功能後，您的裝置可以與其他附近的藍牙裝置通訊。"</string>
-    <string name="ble_scan_notify_text" msgid="1295915006005700650">"為提高定位準確度，系統應用程式和服務仍可偵測藍牙裝置。您可以在<xliff:g id="LINK_BEGIN_0">LINK_BEGIN</xliff:g>掃瞄設定<xliff:g id="LINK_END_1">LINK_END</xliff:g>中更改此設定。"</string>
+    <string name="ble_scan_notify_text" msgid="1295915006005700650">"為提高定位準確度，系統應用程式和服務仍可偵測藍牙裝置。您可以在<xliff:g id="LINK_BEGIN_0">LINK_BEGIN</xliff:g>掃描設定<xliff:g id="LINK_END_1">LINK_END</xliff:g>中更改此設定。"</string>
     <string name="bluetooth_connect_failed" msgid="4500234659813241053">"無法連線，請再試一次。"</string>
     <string name="device_details_title" msgid="6576953269221085300">"裝置詳情"</string>
     <string name="bluetooth_device_mac_address" msgid="2513724313558236181">"裝置的藍牙位址：<xliff:g id="ADDRESS">%1$s</xliff:g>"</string>
@@ -721,7 +727,7 @@
     <string name="wifi_notify_open_networks_summary" msgid="2761326999921366960">"有高品質的公共網絡時通知我"</string>
     <string name="wifi_wakeup" msgid="8815640989361538036">"自動開啟 Wi‑Fi"</string>
     <string name="wifi_wakeup_summary" msgid="2530814331062997163">"附近有已儲存的高品質網絡 (例如家用網絡) 時再開啟 Wi-Fi"</string>
-    <string name="wifi_wakeup_summary_scanning_disabled" msgid="7247227922074840445">"Wi‑Fi 掃瞄功能已關閉，因此無法使用"</string>
+    <string name="wifi_wakeup_summary_scanning_disabled" msgid="7247227922074840445">"Wi‑Fi 掃描功能已關閉，因此無法使用"</string>
     <string name="wifi_wakeup_summary_scoring_disabled" msgid="108339002136866897">"如要使用，請選擇網絡評分供應商"</string>
     <string name="wifi_poor_network_detection" msgid="4925789238170207169">"已避免欠佳的連線"</string>
     <string name="wifi_poor_network_detection_summary" msgid="2784135142239546291">"除非互聯網連線穩定，否則不要使用 Wi-Fi 網絡"</string>
@@ -731,8 +737,8 @@
     <string name="use_open_wifi_automatically_summary_scoring_disabled" msgid="593964217679325831">"如要使用該功能，請選擇一個網絡評分供應商"</string>
     <string name="use_open_wifi_automatically_summary_scorer_unsupported_disabled" msgid="8472122600853650258">"如要使用該功能，請選擇一個兼容的網絡評分供應商"</string>
     <string name="wifi_install_credentials" msgid="3551143317298272860">"安裝憑證"</string>
-    <string name="wifi_scan_notify_text" msgid="5593805423071186757">"為提高定位準確度，系統應用程式和服務仍可掃瞄 Wi-Fi 網絡。您可以在<xliff:g id="LINK_BEGIN_0">LINK_BEGIN</xliff:g>掃瞄設定<xliff:g id="LINK_END_1">LINK_END</xliff:g>中更改此設定。"</string>
-    <string name="wifi_scan_notify_text_scanning_off" msgid="3426075479272242098">"為提高定位準確度，請前往「<xliff:g id="LINK_BEGIN_0">LINK_BEGIN</xliff:g>掃瞄設定<xliff:g id="LINK_END_1">LINK_END</xliff:g>」開啟 Wi-Fi 掃瞄功能。"</string>
+    <string name="wifi_scan_notify_text" msgid="5593805423071186757">"為提高定位準確度，系統應用程式和服務仍可掃描 Wi-Fi 網絡。您可以在<xliff:g id="LINK_BEGIN_0">LINK_BEGIN</xliff:g>掃描設定<xliff:g id="LINK_END_1">LINK_END</xliff:g>中更改此設定。"</string>
+    <string name="wifi_scan_notify_text_scanning_off" msgid="3426075479272242098">"為提高定位準確度，請前往「<xliff:g id="LINK_BEGIN_0">LINK_BEGIN</xliff:g>掃描設定<xliff:g id="LINK_END_1">LINK_END</xliff:g>」開啟 Wi-Fi 掃描功能。"</string>
     <string name="wifi_scan_notify_remember_choice" msgid="7104867814641144485">"不用再顯示"</string>
     <string name="wifi_setting_sleep_policy_title" msgid="5149574280392680092">"休眠時繼續連接 Wi-Fi 網絡"</string>
     <string name="wifi_setting_on_during_sleep_title" msgid="8308975500029751565">"休眠狀態仍保持 Wi-Fi 連線"</string>
@@ -753,7 +759,7 @@
     <string name="wifi_menu_more_options" msgid="2448097861752719396">"更多選項"</string>
     <string name="wifi_menu_wps_pin" msgid="6426448256268695933">"輸入 WPS PIN"</string>
     <string name="wifi_menu_p2p" msgid="7619851399250896797">"Wi-Fi Direct"</string>
-    <string name="wifi_menu_scan" msgid="1470911530412095868">"掃瞄"</string>
+    <string name="wifi_menu_scan" msgid="1470911530412095868">"掃描"</string>
     <string name="wifi_menu_advanced" msgid="7522252991919573664">"進階設定"</string>
     <string name="wifi_menu_configure" msgid="6150926852602171938">"設定"</string>
     <string name="wifi_menu_connect" msgid="4996220309848349408">"連線至網絡"</string>
@@ -781,6 +787,7 @@
     <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>
@@ -800,7 +807,7 @@
     <string name="wifi_eap_anonymous" msgid="2989469344116577955">"匿名身分"</string>
     <string name="wifi_password" msgid="5948219759936151048">"密碼"</string>
     <string name="wifi_show_password" msgid="6461249871236968884">"顯示密碼"</string>
-    <string name="wifi_ap_band_config" msgid="1611826705989117930">"選擇 AP 頻段"</string>
+    <string name="wifi_ap_band_config" msgid="1611826705989117930">"選擇存取點頻段"</string>
     <string name="wifi_ap_choose_2G" msgid="8724267386885036210">"2.4 GHz 頻段"</string>
     <string name="wifi_ap_choose_5G" msgid="8137061170937978040">"5 GHz 頻段"</string>
     <string name="wifi_ip_settings" msgid="3359331401377059481">"IP 設定"</string>
@@ -817,7 +824,9 @@
     <string name="wifi_wps_available_first_item" msgid="4422547079984583502">"有 WPS 可供使用"</string>
     <string name="wifi_wps_available_second_item" msgid="8427520131718215301">" (有 WPS 可供使用)"</string>
     <string name="wifi_wps_nfc_enter_password" msgid="2288214226916117159">"輸入您的網絡密碼"</string>
-    <string name="wifi_scan_always_turnon_message" msgid="203123538572122989">"「<xliff:g id="APP_NAME">%1$s</xliff:g>」要求開啟網絡掃瞄功能 (即使 Wi-Fi 已關閉)，以提升定位精確度及用於其他用途。\n\n您要允許所有需要掃瞄的應用程式這項要求嗎？"</string>
+    <string name="wifi_carrier_connect" msgid="8174696557882299911">"流動網絡供應商 Wi‑Fi 網絡"</string>
+    <string name="wifi_carrier_content" msgid="4634077285415851933">"透過 <xliff:g id="NAME">%1%s</xliff:g> 連線"</string>
+    <string name="wifi_scan_always_turnon_message" msgid="203123538572122989">"「<xliff:g id="APP_NAME">%1$s</xliff:g>」要求開啟網絡掃描功能 (即使 Wi-Fi 已關閉)，以提升定位精確度及用於其他用途。\n\n您要允許所有需要掃描的應用程式這項要求嗎？"</string>
     <string name="wifi_scan_always_turnoff_message" msgid="5538901671131941043">"如要關閉這項功能，請在展開式選單中選取 [進階]。"</string>
     <string name="wifi_scan_always_confirm_allow" msgid="5355973075896817232">"允許"</string>
     <string name="wifi_scan_always_confirm_deny" msgid="4463982053823520710">"拒絕"</string>
@@ -834,6 +843,7 @@
     <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_modify" msgid="6100248070440710782">"修改"</string>
     <string name="wifi_failed_forget_message" msgid="1348172929201654986">"無法刪除網絡"</string>
     <string name="wifi_save" msgid="3331121567988522826">"儲存"</string>
     <string name="wifi_failed_save_message" msgid="6650004874143815692">"無法儲存網絡"</string>
@@ -846,6 +856,7 @@
     <string name="wifi_advanced_titlebar" msgid="4485841401774142908">"進階 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_title" msgid="3471132676909349382">"網絡資料"</string>
     <string name="wifi_details_subnet_mask" msgid="6720279144174924410">"子網絡遮罩"</string>
     <string name="wifi_details_dns" msgid="8648826607751830768">"網域名稱系統 (DNS)"</string>
     <string name="wifi_details_ipv6_address_header" msgid="6734119149106422148">"IPv6 位址"</string>
@@ -878,16 +889,15 @@
     <string name="wifi_p2p_cancel_connect_title" msgid="255267538099324413">"取消邀請？"</string>
     <string name="wifi_p2p_cancel_connect_message" msgid="7477756213423749402">"您要取消連接「<xliff:g id="PEER_NAME">%1$s</xliff:g>」的邀請嗎？"</string>
     <string name="wifi_p2p_delete_group_message" msgid="834559380069647086">"刪除這個群組？"</string>
-    <string name="wifi_tether_checkbox_text" msgid="1847167643625779136">"可攜式 Wi-Fi 熱點"</string>
     <string name="wifi_hotspot_checkbox_text" msgid="7763495093333664887">"Wi‑Fi 熱點"</string>
     <string name="wifi_hotspot_off_subtext" msgid="5466126533609394170">"目前沒有與其他裝置分享互聯網或內容"</string>
     <string name="wifi_hotspot_tethering_on_subtext" product="tablet" msgid="5752490509369962007">"正在透過熱點分享此平板電腦的互聯網連線"</string>
     <string name="wifi_hotspot_tethering_on_subtext" product="default" msgid="6461075246164300670">"正在透過熱點分享此手機的互聯網連線"</string>
     <string name="wifi_hotspot_on_local_only_subtext" msgid="2068110388011294735">"應用程式正在分享內容。如要分享互聯網連線，請關閉熱點並重新開啟"</string>
-    <string name="wifi_hotspot_name_title" msgid="1341735529132128887">"Wi‑Fi 名稱"</string>
+    <string name="wifi_hotspot_name_title" msgid="8237000746618636778">"熱點名稱"</string>
     <string name="wifi_hotspot_name_summary_connecting" msgid="3378299995508671967">"正在開啟 <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>…"</string>
     <string name="wifi_hotspot_name_summary_connected" msgid="3888672084861445362">"其他裝置可以連線至 <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>"</string>
-    <string name="wifi_hotspot_password_title" msgid="1955592302902091281">"Wi-Fi 密碼"</string>
+    <string name="wifi_hotspot_password_title" msgid="8676859981917573801">"熱點密碼"</string>
     <string name="wifi_hotspot_ap_band_title" msgid="1165801173359290681">"存取點頻段"</string>
     <string name="wifi_hotspot_footer_info_regular" msgid="1203489406068036455">"使用熱點為其他裝置建立 Wi-Fi 網絡。熱點會使用流動數據連線提供互聯網服務。可能需要支付額外流動數據費用。"</string>
     <string name="wifi_hotspot_footer_info_local_only" msgid="857988412470694109">"應用程式可以建立熱點，與附近的裝置分享內容。"</string>
@@ -898,7 +908,6 @@
     <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">"Android 熱點"</string>
     <string name="wifi_calling_settings_title" msgid="4102921303993404577">"Wi-Fi 通話"</string>
     <string name="wifi_calling_suggestion_title" msgid="9008010480466359578">"開啟「Wi-Fi 通話」功能"</string>
@@ -939,7 +948,7 @@
     <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="emergency_address_summary" msgid="3266760199681945746">"當您使用 Wi-Fi 撥打緊急電話時，緊急服務會將該地址視作您所在位置的地址"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"顯示"</string>
     <string name="sound_settings" msgid="5534671337768745343">"音效"</string>
     <string name="all_volume_title" msgid="4296957391257836961">"音量"</string>
@@ -993,6 +1002,7 @@
     <string name="search_settings" msgid="1910951467596035063">"搜尋"</string>
     <string name="search_settings_summary" msgid="9205656546570654169">"管理搜尋設定和記錄"</string>
     <string name="search_settings_no_results" msgid="8799027492641230999">"找不到結果"</string>
+    <string name="search_clear_history" msgid="4196658962573162457">"清除記錄"</string>
     <string name="display_settings" msgid="7965901687241669598">"顯示"</string>
     <string name="accelerometer_title" msgid="7854608399547349157">"自動旋轉螢幕"</string>
     <string name="color_mode_title" msgid="3159275920408338215">"鮮豔顏色"</string>
@@ -1052,7 +1062,7 @@
     <string name="screensaver_settings_summary_either_long" msgid="7302740999250873332">"充電或放上插座時"</string>
     <string name="screensaver_settings_summary_either_short" msgid="6140527286137331478">"任何一個狀態"</string>
     <string name="screensaver_settings_summary_sleep" msgid="9086186698140423493">"充電時"</string>
-    <string name="screensaver_settings_summary_dock" msgid="2072657401664633283">"安放在插座上時"</string>
+    <string name="screensaver_settings_summary_dock" msgid="2072657401664633283">"放上插座時"</string>
     <string name="screensaver_settings_summary_never" msgid="5165622985174349585">"永不"</string>
     <string name="screensaver_settings_summary_off" msgid="2481581696365146473">"關閉"</string>
     <string name="screensaver_settings_disabled_prompt" msgid="1239088321034437608">"如要控制手機在插座上和/或休眠時的操作，請開啟螢幕保護程式。"</string>
@@ -1122,7 +1132,6 @@
     <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>
     <string name="device_status_activity_title" msgid="1411201799384697904">"狀態"</string>
     <string name="device_status" msgid="607405385799807324">"狀態"</string>
@@ -1150,7 +1159,6 @@
     <string name="status_wifi_mac_address" msgid="2202206684020765378">"Wi-Fi MAC 位址"</string>
     <string name="status_bt_address" msgid="4195174192087439720">"藍牙位址"</string>
     <string name="status_serial_number" msgid="2257111183374628137">"序號"</string>
-    <string name="status_unavailable" msgid="7862009036663793314">"無法使用"</string>
     <string name="status_up_time" msgid="7294859476816760399">"開機時間"</string>
     <string name="status_awake_time" msgid="2393949909051183652">"啟用時間"</string>
     <string name="internal_memory" msgid="9129595691484260784">"內部儲存空間"</string>
@@ -1327,6 +1335,7 @@
     <string name="menu_restore" msgid="8260067415075573273">"重設回預設值"</string>
     <string name="restore_default_apn_completed" msgid="2824775307377604897">"重設預設 APN 設定已完成。"</string>
     <string name="reset_dashboard_title" msgid="6254873816990678620">"重設選項"</string>
+    <string name="reset_dashboard_summary" msgid="4851012632493522755">"網絡、應用程式或裝置可以重設"</string>
     <string name="reset_network_title" msgid="6166025966016873843">"重設 Wi-Fi、流動數據和藍牙"</string>
     <string name="reset_network_desc" msgid="5547979398298881406">"此操作會重設所有網絡設定，包括：\n\n"<li>"Wi‑Fi"</li>\n<li>"流動數據"</li>\n<li>"藍牙"</li></string>
     <string name="reset_network_button_text" msgid="2035676527471089853">"重設設定"</string>
@@ -1335,17 +1344,14 @@
     <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="6617679904229218425">"清除所有資料 (回復原廠設定)"</string>
-    <plurals name="master_clear_with_account_summary" formatted="false" msgid="5911377203778818712">
-      <item quantity="other"><xliff:g id="ACCOUNT_COUNT">%1$d</xliff:g> 個帳戶將會重設</item>
-      <item quantity="one">1 個帳戶將會重設</item>
-    </plurals>
-    <string name="master_clear_summary" msgid="6902443944660426951">"內部儲存空間和所有資料將會重設"</string>
+    <string name="master_clear_title" msgid="3531267871084279512">"清除所有資料 (回復原廠設定)"</string>
     <string name="master_clear_desc" product="tablet" msgid="9146059417023157222">"這會清除您平板電腦"<b>"內部儲存裝置"</b>"中的所有資料，包括：\n\n"<li>"您的 Google 帳戶"</li>\n<li>"系統和應用程式資料及設定"</li>\n<li>"已下載的應用程式"</li></string>
     <string name="master_clear_desc" product="default" msgid="4800386183314202571">"這會清除您手機"<b>"內部儲存裝置"</b>"中的所有資料，包括：\n\n"<li>"您的 Google 帳戶"</li>\n<li>"系統和應用程式資料及設定"</li>\n<li>"已下載的應用程式"</li></string>
     <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"您目前已登入下列帳戶：\n"</string>
     <string name="master_clear_other_users_present" product="default" msgid="5161423070702470742">\n\n"這部裝置上還有其他使用者。\n"</string>
     <string name="master_clear_desc_also_erases_external" msgid="1903185203791274237"><li>"音樂"</li>\n<li>"相片"</li>\n<li>"其他使用者資料"</li></string>
+    <string name="master_clear_desc_also_erases_esim" msgid="312352697653096008"><li>"eSIM 卡上的流動網絡供應商"</li></string>
+    <string name="master_clear_desc_no_cancel_mobile_plan" msgid="5460926449093211144">\n\n"此操作不會取消您的流動服務計劃。"</string>
     <string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="7744115866662613411">\n\n"如要一併清除音樂、圖片及其他使用者資料，則需清除 "<b>"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>
@@ -1419,10 +1425,10 @@
     <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="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_screen_title" msgid="4408076862929611554">"掃描"</string>
+    <string name="location_scanning_wifi_always_scanning_title" msgid="6216705505621183645">"Wi-Fi 掃描"</string>
     <string name="location_scanning_wifi_always_scanning_description" msgid="8036382029606868081">"允許系統應用程式和服務隨時偵測 Wi-Fi 網絡，以提高位置資訊的準確度。"</string>
-    <string name="location_scanning_bluetooth_always_scanning_title" msgid="5444989508204520019">"藍牙掃瞄"</string>
+    <string name="location_scanning_bluetooth_always_scanning_title" msgid="5444989508204520019">"藍牙掃描"</string>
     <string name="location_scanning_bluetooth_always_scanning_description" msgid="8602726521250591852">"允許系統應用程式和服務隨時偵測藍牙裝置，以提高位置資訊的準確度。"</string>
     <string name="location_network_based" msgid="9134175479520582215">"Wi-Fi 和流動網絡位置"</string>
     <string name="location_neighborhood_level" msgid="5141318121229984788">"允許應用程式使用 Google 的位置資訊服務，藉此更快確定您的約略位置。系統會收集匿名的位置資料傳送給 Google。"</string>
@@ -1462,15 +1468,16 @@
     <string name="settings_safetylegal_activity_title" msgid="6901214628496951727">"安全資訊"</string>
     <string name="settings_safetylegal_activity_unreachable" msgid="250674109915859456">"您沒有數據連線，如要立即查看這項資訊，請使用任何已連接互聯網的電腦前往 %s。"</string>
     <string name="settings_safetylegal_activity_loading" msgid="8059022597639516348">"載入中…"</string>
-    <string name="lockpassword_choose_your_password_header" msgid="8624900666929394990">"選擇密碼"</string>
-    <string name="lockpassword_choose_your_password_header_for_fingerprint" msgid="6624409510609085450">"如要使用指紋，請設定密碼"</string>
-    <string name="lockpassword_choose_your_pattern_header" msgid="6949761069941694050">"選擇圖形"</string>
-    <string name="lockpassword_choose_your_pattern_header_for_fingerprint" msgid="5901096361617543819">"如要使用指紋，請設定上鎖圖案"</string>
-    <string name="lockpassword_choose_your_pin_header" msgid="7598849519816138302">"選擇 PIN"</string>
-    <string name="lockpassword_choose_your_pin_header_for_fingerprint" msgid="765344692615917183">"如要使用指紋，請設定 PIN"</string>
-    <string name="lockpassword_confirm_your_password_header" msgid="6308478184889846633">"確認密碼"</string>
+    <string name="lockpassword_choose_your_screen_lock_header" msgid="3872462096767152394">"設定螢幕鎖定"</string>
+    <string name="lockpassword_choose_your_password_message" msgid="1197569283524841412">"為安全起見，請設定密碼"</string>
+    <string name="lockpassword_choose_your_password_header_for_fingerprint" msgid="2541818487015343503">"如要使用指紋，請設定密碼"</string>
+    <string name="lockpassword_choose_your_pattern_header_for_fingerprint" msgid="7709785406243556723">"如要使用指紋，請設定上鎖圖案"</string>
+    <string name="lockpassword_choose_your_pin_message" msgid="1875420718677275646">"為安全起見，請設定 PIN"</string>
+    <string name="lockpassword_choose_your_pin_header_for_fingerprint" msgid="1549639053195796674">"如要使用指紋，請設定 PIN"</string>
+    <string name="lockpassword_choose_your_pattern_message" msgid="5986983400689720015">"為安全起見，請設定上鎖圖案"</string>
+    <string name="lockpassword_confirm_your_password_header" msgid="1266027268220850931">"請重新輸入密碼"</string>
     <string name="lockpassword_confirm_your_pattern_header" msgid="7543433733032330821">"確認圖形"</string>
-    <string name="lockpassword_confirm_your_pin_header" msgid="49038294648213197">"確認 PIN"</string>
+    <string name="lockpassword_confirm_your_pin_header" msgid="7744513791910572550">"請重新輸入 PIN"</string>
     <string name="lockpassword_confirm_passwords_dont_match" msgid="5140892109439191415">"密碼不符"</string>
     <string name="lockpassword_confirm_pins_dont_match" msgid="7226244811505606217">"PIN 不符"</string>
     <string name="lockpassword_choose_lock_generic_header" msgid="3811438094903786145">"選擇解鎖方式"</string>
@@ -1489,6 +1496,12 @@
     <string name="lockpassword_strong_auth_required_work_pattern" msgid="3003781907040522053">"為提升安全性，請畫出您的工作設定檔上鎖圖案"</string>
     <string name="lockpassword_strong_auth_required_work_pin" msgid="3367491332598821552">"為提升安全性，請輸入您的工作設定檔 PIN"</string>
     <string name="lockpassword_strong_auth_required_work_password" msgid="8159775129968582940">"為提升安全性，請輸入您的工作設定檔密碼"</string>
+    <string name="lockpassword_confirm_your_pattern_details_frp" msgid="6757336656791723193">"您的手機已回復原廠設定。如要使用這部手機，請畫出先前的上鎖圖案。"</string>
+    <string name="lockpassword_confirm_your_pin_details_frp" msgid="826520613445990470">"您的手機已回復原廠設定。如要使用這部手機，請輸入先前的 PIN。"</string>
+    <string name="lockpassword_confirm_your_password_details_frp" msgid="8944081074615739040">"您的手機已回復原廠設定。如要使用這部手機，請輸入先前的密碼。"</string>
+    <string name="lockpassword_confirm_your_pattern_header_frp" msgid="2898036091609128286">"驗證上鎖圖案"</string>
+    <string name="lockpassword_confirm_your_pin_header_frp" msgid="4141601774778898803">"驗證 PIN"</string>
+    <string name="lockpassword_confirm_your_password_header_frp" msgid="3762615419295360480">"驗證密碼"</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>
@@ -1513,7 +1526,7 @@
     <string name="lockpattern_settings_enable_visible_pattern_title_profile" msgid="4864525074768391381">"顯示設定檔的解鎖圖案"</string>
     <string name="lockpattern_settings_enable_tactile_feedback_title" msgid="4389015658335522989">"輕按時震動"</string>
     <string name="lockpattern_settings_enable_power_button_instantly_locks" msgid="5735444062633666327">"電源按鈕立即上鎖"</string>
-    <string name="lockpattern_settings_power_button_instantly_locks_summary" msgid="8196258755143711694">"由「<xliff:g id="TRUST_AGENT_NAME">%1$s</xliff:g>」維持解鎖狀態時除外"</string>
+    <string name="lockpattern_settings_power_button_instantly_locks_summary" msgid="8196258755143711694">"<xliff:g id="TRUST_AGENT_NAME">%1$s</xliff:g>保持解鎖狀態時除外"</string>
     <string name="lockpattern_settings_choose_lock_pattern" msgid="1652352830005653447">"設定解鎖圖形"</string>
     <string name="lockpattern_settings_change_lock_pattern" msgid="1123908306116495545">"更改解鎖圖形"</string>
     <string name="lockpattern_settings_help_how_to_record" msgid="2614673439060830433">"如何畫出解鎖圖形"</string>
@@ -1538,7 +1551,6 @@
     <string name="install_applications_title" msgid="4987712352256508946">"允許安裝所有來源的應用程式"</string>
     <string name="recent_app_category_title" msgid="6673071268966003928">"最近開啟的應用程式"</string>
     <string name="see_all_apps_title" msgid="1317153498074308438">"查看全部 <xliff:g id="COUNT">%1$d</xliff:g> 個應用程式"</string>
-    <string name="recent_app_summary" msgid="3366446669844932300">"<xliff:g id="TIME">^1</xliff:g>前"</string>
     <string name="install_all_warning" product="tablet" msgid="8310489909586138165">"來源不明的應用程式可能會侵害您的平板電腦和個人資料。安裝來自此來源的應用程式，即表示您同意承擔因使用這些應用程式而導致平板電腦損壞或資料遺失的責任。"</string>
     <string name="install_all_warning" product="default" msgid="1952257127370115988">"來源不明的應用程式可能會侵害您的手機和個人資料。安裝來自此來源的應用程式，即表示您同意承擔因使用這些應用程式而導致手機損壞或資料遺失的責任。"</string>
     <string name="advanced_settings" msgid="1777249286757067969">"進階設定"</string>
@@ -1802,7 +1814,7 @@
     <string name="accessibility_settings_summary" msgid="981260486011624939">"螢幕閱讀器、顯示、互動控制項"</string>
     <string name="vision_settings_title" msgid="4204111425716868288">"視覺輔助設定"</string>
     <string name="vision_settings_description" msgid="5679491180156408260">"您可視乎個人需要自訂此裝置。這些無障礙功能可在 [設定] 中變更。"</string>
-    <string name="vision_settings_suggestion_title" msgid="917294957154878441">"放大字型"</string>
+    <string name="vision_settings_suggestion_title" msgid="8058794060304707004">"變更字型大小"</string>
     <string name="screen_reader_category_title" msgid="7739154903913400641">"螢幕閱讀器"</string>
     <string name="audio_and_captions_category_title" msgid="3420727114421447524">"音訊和螢幕上的文字"</string>
     <string name="display_category_title" msgid="685461049938269166">"螢幕"</string>
@@ -1839,7 +1851,6 @@
     <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="preference_summary_default_combination" msgid="8532964268242666060">"<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>
@@ -1958,12 +1969,14 @@
     <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_whitelisted" msgid="7375400051141016808">"無法優化應用程式電池用量"</string>
+    <string name="background_activity_warning_dialog_title" msgid="2216249969149568871">"要限制背景活動嗎？"</string>
+    <string name="background_activity_warning_dialog_text" msgid="7049624449246121981">"如果您限制應用程式的背景活動，應用程式可能無法正常運作"</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="device_cellular_network" msgid="4724773411762382950">"流動網絡掃描"</string>
+    <string name="power_usage_list_summary" msgid="6393929085382334341">"自上次完全充電後的應用程式使用情況 (<xliff:g id="RELATIVE_TIME">^1</xliff:g>)"</string>
+    <string name="power_usage_list_summary_device" msgid="4461926045610455423">"自上次完全充電後的裝置使用情況 (<xliff:g id="RELATIVE_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>
@@ -2211,14 +2224,14 @@
     <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">"密碼不正確。您還有 1 次輸入密碼的機會，如果輸入錯誤，系統就會清除憑證儲存空間。"</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="credentials_configure_lock_screen_hint" msgid="8058230497337529036">"您的裝置必須設有安全螢幕鎖定功能，才能使用認證儲存空間"</string>
+    <string name="credentials_configure_lock_screen_button" msgid="253239765216055321">"設定上鎖方式"</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>
@@ -2277,7 +2290,7 @@
     <string name="wifi_setup_forget" msgid="2562847595567347526">"刪除"</string>
     <string name="wifi_setup_save" msgid="3659235094218508211">"儲存"</string>
     <string name="wifi_setup_cancel" msgid="3185216020264410239">"取消"</string>
-    <string name="wifi_setup_status_scanning" msgid="5317003416385428036">"正在掃瞄網絡..."</string>
+    <string name="wifi_setup_status_scanning" msgid="5317003416385428036">"正在掃描網絡..."</string>
     <string name="wifi_setup_status_select_network" msgid="3960480613544747397">"輕按所需網絡即可連線"</string>
     <string name="wifi_setup_status_existing_network" msgid="6394925174802598186">"連線至現有網絡"</string>
     <string name="wifi_setup_status_unsecured_network" msgid="8143046977328718252">"連線至無安全保護措施的網絡"</string>
@@ -2338,8 +2351,6 @@
     <skip />
     <string name="cant_sync_dialog_title" msgid="2777238588398046285">"無法手動同步處理"</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，請輸入您的 PIN"</string>
     <string name="enter_pattern" msgid="4187435713036808566">"如要啟動 Android，請畫出解鎖圖案"</string>
@@ -2347,12 +2358,13 @@
     <string name="cryptkeeper_wrong_password" msgid="5200857195368904047">"密碼錯誤"</string>
     <string name="cryptkeeper_wrong_pin" msgid="755720788765259382">"PIN 錯誤"</string>
     <string name="checking_decryption" msgid="8287458611802609493">"正在檢查…"</string>
-    <string name="starting_android" msgid="4001324195902252681">"正在啟動 Andriod…"</string>
+    <string name="starting_android" msgid="4001324195902252681">"正在啟動 Android…"</string>
     <string name="delete" msgid="4219243412325163003">"刪除"</string>
     <string name="misc_files" msgid="6720680815969643497">"其他檔案"</string>
     <string name="misc_files_selected_count" msgid="4647048020823912088">"已選取 <xliff:g id="NUMBER">%1$d</xliff:g> 個，共 <xliff:g id="TOTAL">%2$d</xliff:g> 個"</string>
     <string name="misc_files_selected_count_bytes" msgid="2876232009069114352">"<xliff:g id="NUMBER">%1$s</xliff:g>，總共 <xliff:g id="TOTAL">%2$s</xliff:g>"</string>
     <string name="select_all" msgid="1562774643280376715">"全部選取"</string>
+    <string name="data_plan_usage_manage_plans_button_text" msgid="8997761990902708162">"管理計劃"</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>
@@ -2362,7 +2374,7 @@
     <string name="data_usage_data_limit" msgid="1193930999713192703">"設定數據上限"</string>
     <string name="data_usage_cycle" msgid="5652529796195787949">"資料用量週期"</string>
     <string name="data_usage_app_items_header_text" msgid="5017850810459372828">"應用程式數據用量"</string>
-    <string name="data_usage_menu_roaming" msgid="8042359966835203296">"數據漫遊服務"</string>
+    <string name="data_usage_menu_roaming" msgid="8042359966835203296">"數據漫遊"</string>
     <string name="data_usage_menu_restrict_background" msgid="1989394568592253331">"限制背景資料"</string>
     <string name="data_usage_menu_allow_background" msgid="2694761978633359223">"允許背景數據"</string>
     <string name="data_usage_menu_split_4g" msgid="5322857680792601899">"分開顯示 4G 用量"</string>
@@ -2438,6 +2450,9 @@
     <string name="data_usage_metered_mobile" msgid="5423305619126978393">"流動網絡"</string>
     <string name="data_usage_metered_wifi" msgid="1761738002328299714">"按用量收費的 Wi-Fi 網絡"</string>
     <string name="data_usage_metered_wifi_disabled" msgid="727808462375941567">"如要選取按用量收費的網絡，請開啟 Wi-Fi。"</string>
+    <string name="data_usage_metered_auto" msgid="1262028400911918865">"自動"</string>
+    <string name="data_usage_metered_yes" msgid="9217539611385225894">"按用量收費"</string>
+    <string name="data_usage_metered_no" msgid="4025232961929071789">"非按用量收費"</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>
@@ -2529,9 +2544,6 @@
     <string name="backup_pw_set_button_text" msgid="2387480910044648795">"設定備份密碼"</string>
     <string name="backup_pw_cancel_button_text" msgid="8845630125391744615">"取消"</string>
     <string name="additional_system_update_settings_list_item_title" msgid="214987609894661992">"其他系統更新"</string>
-    <string name="selinux_status_disabled" msgid="924551035552323327">"已停用"</string>
-    <string name="selinux_status_permissive" msgid="6004965534713398778">"許可"</string>
-    <string name="selinux_status_enforcing" msgid="2252703756208463329">"執行中"</string>
     <string name="ssl_ca_cert_warning" msgid="2045866713601984673">"網絡可能會受到監管"</string>
     <string name="done_button" msgid="1991471253042622230">"完成"</string>
     <plurals name="ssl_ca_cert_dialog_title" formatted="false" msgid="7145092748045794650">
@@ -2647,7 +2659,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">"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>
@@ -2729,6 +2741,7 @@
       <item quantity="other">顯示 %d 個隱藏項目</item>
       <item quantity="one">顯示 %d 個隱藏項目</item>
     </plurals>
+    <string name="dashboard_suggestion_condition_footer_content_description" msgid="2898588191174845961">"收合"</string>
     <string name="network_dashboard_title" msgid="4771589228992391573">"網絡和互聯網"</string>
     <string name="network_dashboard_summary_mobile" msgid="3851083934739500429">"流動網絡"</string>
     <string name="network_dashboard_summary_data_usage" msgid="3843261364705042212">"數據用量"</string>
@@ -2748,7 +2761,7 @@
     <string name="keywords_more_default_sms_app" msgid="2265154063220360784">"短訊, 發短訊, 訊息, 傳送短訊"</string>
     <string name="keywords_more_mobile_networks" msgid="8995946622054642367">"流動網絡, 流動裝置, 流動網絡供應商, 無線, 數據, 4G, 3G, 2G, LTE"</string>
     <string name="keywords_wifi_calling" msgid="1784064367330122679">"WiFi, Wi-Fi, 通話, 撥號中"</string>
-    <string name="keywords_home" msgid="3626170808219458848">"應用程式啟動器"</string>
+    <string name="keywords_home" msgid="3626170808219458848">"啟動器"</string>
     <string name="keywords_display" msgid="8910345814565493016">"螢幕, 觸控螢幕"</string>
     <string name="keywords_display_brightness_level" msgid="3891383826236015854">"螢幕變暗, 觸控螢幕, 電池"</string>
     <string name="keywords_display_auto_brightness" msgid="3325150824507953765">"螢幕變暗, 觸控螢幕, 電池"</string>
@@ -2831,8 +2844,14 @@
       <item quantity="other">已開啟 <xliff:g id="ON_COUNT">%d</xliff:g> 個自動規則</item>
       <item quantity="one">已開啟 1 個自動規則</item>
     </plurals>
-    <string name="zen_mode_settings_title" msgid="842308776768942600">"請勿騷擾偏好設定"</string>
-    <string name="zen_mode_priority_settings_title" msgid="2623117023031824309">"優先設定只允許："</string>
+    <string name="zen_mode_settings_title" msgid="1066226840983908121">"請勿打擾"</string>
+    <string name="zen_mode_behavior_settings_title" msgid="1463303933529313969">"行為"</string>
+    <string name="zen_mode_behavior_allow_title" msgid="3845615648136218141">"允許發出下列類型的音效和震動"</string>
+    <string name="zen_mode_behavior_no_sound" msgid="1219626004723208056">"不發出音效"</string>
+    <string name="zen_mode_behavior_total_silence" msgid="6716603819806610626">"不發出音效 (完全靜音)"</string>
+    <string name="zen_mode_behavior_no_sound_except" msgid="4968477585788243114">"不發出音效 (<xliff:g id="CATEGORIES">%1$s</xliff:g>除外)"</string>
+    <!-- no translation found for zen_mode_behavior_alarms_only (2423480992071472963) -->
+    <skip />
     <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>
@@ -2874,19 +2893,21 @@
     <string name="notifications_title" msgid="8086372779371204971">"通知"</string>
     <string name="app_notifications_title" msgid="5810577805218003760">"應用程式通知"</string>
     <string name="notification_channel_title" msgid="2260666541030178452">"通知類別"</string>
+    <string name="notification_group_title" msgid="7180506440133859601">"通知類別群組"</string>
     <string name="notification_importance_title" msgid="848692592679312666">"重要性"</string>
-    <string name="notification_importance_unspecified" msgid="2196023702875112081">"讓應用程式決定"</string>
+    <string name="notification_importance_unspecified" msgid="6622173510486113958">"允許發出音效"</string>
     <string name="notification_importance_blocked" msgid="7938180808339386300">"永不顯示通知"</string>
     <string name="notification_importance_min" msgid="5455049524984686275">"不發出音效或顯示通知"</string>
     <string name="notification_importance_low" msgid="8881468429453766553">"不發出音效"</string>
     <string name="notification_importance_default" msgid="5958338024601957516">"發出音效"</string>
     <string name="notification_importance_high" msgid="2082429479238228527">"發出音效並在螢幕上彈出通知"</string>
+    <string name="notification_importance_high_silent" msgid="2667033773703765252">"在螢幕上彈出"</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_interruption" msgid="7136150018111848721">"允許打擾"</string>
-    <string name="allow_interruption_summary" msgid="7870159391333957050">"允許應用程式發出音效、震動，及/或在螢幕上彈出通知"</string>
+    <string name="allow_interruption_summary" msgid="7870159391333957050">"允許應用程式發出音效、震動以及/或在螢幕上彈出通知"</string>
     <string name="notification_channel_summary_min" msgid="5401718014765921892">"重要性：低"</string>
     <string name="notification_channel_summary_low" msgid="322317684244981244">"重要性：中"</string>
     <string name="notification_channel_summary_default" msgid="1111749130423589931">"重要性：高"</string>
@@ -2923,8 +2944,13 @@
     <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="channel_group_notifications_off_desc" msgid="1620950416247316370">"Android 已禁止在此裝置上顯示這組通知"</string>
     <string name="notification_channels" msgid="5346841743182627500">"類別"</string>
     <string name="notification_channels_other" msgid="5645317113885788226">"其他"</string>
+    <plurals name="notification_group_summary" formatted="false" msgid="3420621520561455358">
+      <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="no_channels" msgid="3077375508177744586">"此應用程式未發佈任何通知"</string>
     <string name="app_settings_link" msgid="8894946007543660906">"應用程式中的其他設定"</string>
     <string name="app_notification_listing_summary_zero" msgid="6482582965081108108">"已開啟所有應用程式的通知"</string>
@@ -3001,12 +3027,14 @@
     <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>
+    <!-- no translation found for zen_mode_media_system_other (8900209390529859777) -->
+    <skip />
     <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="239685342222975733">"如果同一人在 <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>
@@ -3035,6 +3063,7 @@
     <string name="zen_mode_screen_off_visual_interruptions" msgid="4850792880144382633">"螢幕關閉時"</string>
     <string name="zen_mode_no_visual_interruptions" msgid="8742776003822778472">"螢幕開啟或關閉時"</string>
     <string name="notification_app_settings_button" msgid="6685640230371477485">"通知設定"</string>
+    <string name="suggestion_button_text" msgid="3275010948381252006">"確定"</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>
@@ -3122,7 +3151,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>
@@ -3219,6 +3248,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="sms_mirroring_pref" msgid="6475043279147376031">"短訊鏡像輸出"</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>
@@ -3227,7 +3257,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>
@@ -3271,7 +3301,7 @@
     <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="app_permission_summary_allowed" msgid="1505409933012886711">"允許"</string>
@@ -3285,7 +3315,7 @@
     <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="permit_write_settings" msgid="658555006453212691">"允許修改系統設定"</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>
@@ -3312,7 +3342,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>
@@ -3380,9 +3410,12 @@
     <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="connectivity_monitor_switch" msgid="9059759348648583421">"連線監控工具"</string>
+    <string name="connectivity_monitor_switch_summary" msgid="2828658652378866401">"「連線監控工具」會在偵測到連線問題時收集記錄，並通知使用者提交報告錯誤"</string>
+    <string name="connectivity_monitor_toast" msgid="5551859612881173028">"如要套用「連線監控工具」的變更內容，請重新啟動裝置"</string>
     <string name="camera_hal_hdrplus_switch" msgid="8377365197105267466">"相機 HAL HDR+"</string>
     <string name="camera_hal_hdrplus_toast" msgid="2063703797270055299">"如要套用「相機 HAL HDR+」的變更內容，請重新啟動裝置"</string>
+    <string name="camera_laser_sensor_switch" msgid="8913588990743234440">"相機鐳射感應器"</string>
     <string name="ota_disable_automatic_update" msgid="2319639631655915050">"自動系統更新"</string>
     <string name="usage" msgid="2977875522080448986">"用量"</string>
     <string name="cellular_data_usage" msgid="2155683719898158203">"流動數據用量"</string>
@@ -3402,13 +3435,13 @@
       <item quantity="other"><xliff:g id="COUNT">%1$d</xliff:g> 個限制</item>
       <item quantity="one">1 個限制</item>
     </plurals>
-    <string name="operator_warning" msgid="1862988028996859195">"流動網絡供應商的資料可能有別於裝置上的資料"</string>
+    <string name="operator_warning" msgid="1862988028996859195">"流動網絡供應商的數據計算方式可能與裝置有所不同"</string>
     <string name="data_used_template" msgid="3245919669966296505">"使用了 <xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="set_data_warning" msgid="6115364758236594593">"設定數據警告"</string>
+    <string name="set_data_warning" msgid="6115364758236594593">"設定數據用量警告"</string>
     <string name="data_warning" msgid="209133958008062117">"數據用量警告"</string>
     <string name="set_data_limit" msgid="2901526323210516923">"設定數據上限"</string>
     <string name="data_limit" msgid="1885406964934590552">"數據上限"</string>
-    <string name="data_usage_template" msgid="392191945602400904">"<xliff:g id="ID_2">%2$s</xliff:g>期間使用了 <xliff:g id="ID_1">%1$s</xliff:g>"</string>
+    <string name="data_usage_template" msgid="2923744765873163859">"<xliff:g id="ID_2">%2$s</xliff:g>期間使用了 <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="configure" msgid="1029654422228677273">"設定"</string>
     <string name="data_usage_other_apps" msgid="3272872663517382050">"其他使用數據的應用程式"</string>
     <plurals name="data_saver_unrestricted_summary" formatted="false" msgid="2635267833484232703">
@@ -3416,7 +3449,7 @@
       <item quantity="one">「數據節省模式」開啟時，允許 1 個應用程式使用無限制數據</item>
     </plurals>
     <string name="data_saver_title" msgid="398458827917495765">"數據節省模式"</string>
-    <string name="unrestricted_data_saver" msgid="952796077540228711">"數據用量不限"</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>
@@ -3477,7 +3510,7 @@
     <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="387052719462473500">"控制上鎖畫面上顯示的資料"</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="8483187649355540109">"支援和提示"</string>
@@ -3485,7 +3518,7 @@
     <string name="premium_sms_none" msgid="8268105565738040566">"沒有已安裝的應用程式要求發送付費短訊的權限"</string>
     <string name="premium_sms_warning" msgid="9086859595338944882">"付費短訊的費用可能高昂，並會增加您流動網絡供應商帳單的款項。如果您為應用程式開放權限，將可以透過該應用程式發送付費短訊。"</string>
     <string name="premium_sms_access" msgid="4660047004791638305">"發送付費短訊的權限"</string>
-    <string name="bluetooth_disabled" msgid="2456198532288640046">"其他裝置無法偵測到"</string>
+    <string name="bluetooth_disabled" msgid="6244000672828617410">"關閉"</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>
@@ -3571,8 +3604,8 @@
     <string name="ambient_display_pickup_summary" product="tablet" msgid="5435283849947236648">"拿起您的平板電腦即可查看時間、通知圖示和其他資訊。"</string>
     <string name="ambient_display_pickup_summary" product="device" msgid="8256669101643381568">"拿起您的裝置即可查看時間、通知圖示和其他資訊。"</string>
     <string name="ambient_display_pickup_suggestion_summary" msgid="7014700589991761035">"螢幕關閉時查看通知"</string>
-    <string name="fingerprint_swipe_for_notifications_title" msgid="5816346492253270243">"快速滑動指紋以查看通知"</string>
-    <string name="fingerprint_swipe_for_notifications_summary" product="default" msgid="1770661868393713922">"向下快速滑動手機背面的指紋感應器，即可查看通知。"</string>
+    <string name="fingerprint_swipe_for_notifications_title" msgid="5816346492253270243">"在指紋感應器滑動以查看通知"</string>
+    <string name="fingerprint_swipe_for_notifications_summary" product="default" msgid="1770661868393713922">"在手機背面的指紋感應器向下快速滑動，即可查看通知。"</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="tablet" msgid="902719947767712895">"向下快速滑動平板電腦背面的指紋感應器，即可查看通知。"</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="device" msgid="5372926094116306647">"向下快速滑動裝置背面的指紋感應器，即可查看通知。"</string>
     <string name="fingerprint_swipe_for_notifications_suggestion_title" msgid="1677291167470357802">"快速查看通知"</string>
@@ -3587,7 +3620,7 @@
     <string name="web_action_enable_title" msgid="4051513950976670853">"即時應用程式"</string>
     <string name="web_action_enable_summary" msgid="3108127559723396382">"即使您沒有安裝應用程式，亦可在應用程式內開啟連結"</string>
     <string name="web_action_section_title" msgid="7364647086538399136">"即時應用程式"</string>
-    <string name="instant_apps_account" msgid="1433620209791992528">"即時應用程式帳戶"</string>
+    <string name="instant_apps_settings" msgid="8827777916518348213">"即時應用程式偏好設定"</string>
     <string name="domain_url_section_title" msgid="7046835219056428883">"已安裝的應用程式"</string>
     <string name="automatic_storage_manager_activation_warning" msgid="6353100011690933254">"您的儲存空間即將由儲存空間管理員管理"</string>
     <string name="account_for_section_header" msgid="5356566418548737121">"<xliff:g id="USER_NAME">%1$s</xliff:g>的帳戶"</string>
@@ -3634,7 +3667,9 @@
     <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 Proxy"</string>
-    <string name="enterprise_privacy_ca_certs" msgid="5885892204903688909">"信任的憑證"</string>
+    <string name="enterprise_privacy_ca_certs_device" msgid="2019652712782510262">"信任的憑證"</string>
+    <string name="enterprise_privacy_ca_certs_personal" msgid="2279084820904076599">"您個人設定檔中信任的憑證"</string>
+    <string name="enterprise_privacy_ca_certs_work" msgid="6187377647815301809">"您工作設定檔中信任的憑證"</string>
     <plurals name="enterprise_privacy_number_ca_certs" formatted="false" msgid="526375234629534165">
       <item quantity="other">最少 <xliff:g id="COUNT_1">%d</xliff:g> 個 CA 憑證</item>
       <item quantity="one">最少 <xliff:g id="COUNT_0">%d</xliff:g> 個 CA 憑證</item>
@@ -3697,6 +3732,8 @@
     <string name="carrier_provisioning" msgid="4398683675591893169">"流動網絡供應商佈建資料"</string>
     <string name="trigger_carrier_provisioning" msgid="3434865918009286187">"觸發流動網絡供應商佈建程序"</string>
     <string name="new_device_suggestion_title" msgid="698847081680980774">"新增了哪些精彩功能？"</string>
-    <string name="new_device_suggestion_summary" msgid="7172709269203435870">"查看 5 大功能"</string>
+    <string name="new_device_suggestion_summary" product="default" msgid="206396571522515855">"探索您的新手機"</string>
+    <string name="new_device_suggestion_summary" product="tablet" msgid="393751455688210956">"探索您的新平板電腦"</string>
+    <string name="new_device_suggestion_summary" product="device" msgid="2939870049868336652">"探索您的新裝置"</string>
     <string name="disabled_low_ram_device" msgid="3751578499721173344">"這部裝置不支援此功能"</string>
 </resources>
diff --git a/res/values-zh-rTW/arrays.xml b/res/values-zh-rTW/arrays.xml
index 181ea93..e29b113 100644
--- a/res/values-zh-rTW/arrays.xml
+++ b/res/values-zh-rTW/arrays.xml
@@ -100,8 +100,6 @@
     <!-- no translation found for wifi_security_no_eap:0 (2084555984818107151) -->
     <!-- no translation found for wifi_security_no_eap:1 (397579322683471524) -->
     <!-- no translation found for wifi_security_no_eap:2 (1968820975358150484) -->
-    <!-- no translation found for wifi_ap_security:0 (5251664683198623324) -->
-    <!-- no translation found for wifi_ap_security:1 (7989073072260294673) -->
   <string-array name="wifi_eap_method">
     <item msgid="1160193392455075561">"PEAP"</item>
     <item msgid="7981731051382306293">"TLS"</item>
diff --git a/res/values-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml
index 058de6e..f586a1d 100644
--- a/res/values-zh-rTW/strings.xml
+++ b/res/values-zh-rTW/strings.xml
@@ -166,7 +166,7 @@
     <string name="bluetooth_map_acceptance_dialog_text" msgid="8712508202081143737">"%1$s 要求存取你的訊息。要將存取權授予 %2$s 嗎？"</string>
     <string name="bluetooth_sap_request" msgid="2669762224045354417">"SIM 存取權請求"</string>
     <string name="bluetooth_sap_acceptance_dialog_text" msgid="4414253873553608690">"「<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g>」想要存取你的 SIM 卡。如果授權該裝置存取 SIM 卡，你裝置的數據連線功能在藍牙連線期間將暫時停用。將存取權授予「<xliff:g id="DEVICE_NAME_1">%2$s?</xliff:g>」"</string>
-    <string name="bluetooth_device_name_summary" msgid="4757990010751789977">"向其他裝置顯示為「<xliff:g id="DEVICE_NAME">^1</xliff:g>」"</string>
+    <string name="bluetooth_device_name_summary" msgid="522235742194965734">"向其他裝置顯示為「<xliff:g id="DEVICE_NAME">^1</xliff:g>」"</string>
     <string name="bluetooth_paired_device_title" msgid="8638994696317952019">"你的裝置"</string>
     <string name="bluetooth_pairing_page_title" msgid="7712127387361962608">"配對新裝置"</string>
     <string name="date_and_time" msgid="9062980487860757694">"日期和時間"</string>
@@ -312,6 +312,8 @@
     <string name="zone_auto" msgid="334783869352026648">"自動判定時區"</string>
     <string name="zone_auto_summaryOn" msgid="6142830927278458314">"使用網路提供的時區"</string>
     <string name="zone_auto_summaryOff" msgid="2597745783162041390">"使用網路提供的時區"</string>
+    <string name="date_time_24hour_auto" msgid="2117383168985653422">"自動使用 24 小時制"</string>
+    <string name="date_time_24hour_auto_summary" msgid="6351812925651480277">"使用地區設定預設值"</string>
     <string name="date_time_24hour_title" msgid="3203537578602803850">"24 小時制"</string>
     <string name="date_time_24hour" msgid="1193032284921000063">"使用 24 小時格式"</string>
     <string name="date_time_set_time_title" msgid="6296795651349047016">"時間"</string>
@@ -372,6 +374,9 @@
     <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="1961957425135180242">"繼續"</string>
+    <string name="setup_fingerprint_enroll_skip_title" msgid="362050541117362034">"要略過指紋設定程序嗎？"</string>
+    <string name="setup_fingerprint_enroll_skip_after_adding_lock_text" msgid="958990414356204763">"指紋設定程序只需一兩分鐘即可完成。如果略過這個程序，稍後可以在設定中自行新增你的指紋。"</string>
+    <string name="lock_screen_intro_skip_title" msgid="4988210105913705679">"要略過螢幕鎖定設定程序嗎？"</string>
     <string name="lock_screen_intro_skip_dialog_text_frp" product="tablet" msgid="1581834104051243425">"裝置保護功能將不會開啟。在這種情況下，你無法在這部平板電腦遺失、遭竊或重設時，防止其他人使用平板電腦。"</string>
     <string name="lock_screen_intro_skip_dialog_text_frp" product="device" msgid="4629503416877189572">"裝置保護功能將不會開啟。在這種情況下，你無法在這個裝置遺失、遭竊或重設時，防止其他人使用裝置。"</string>
     <string name="lock_screen_intro_skip_dialog_text_frp" product="default" msgid="2423428240245737909">"裝置保護功能將不會開啟。在這種情況下，你無法在這支手機遺失、遭竊或重設時，防止其他人使用手機。"</string>
@@ -457,7 +462,7 @@
     <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="lock_settings_picker_fingerprint_added_security_message" msgid="5768002109707648463">"為了進一步提升安全性，請設定備用螢幕鎖定方式。"</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>
@@ -586,8 +591,9 @@
     </plurals>
     <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_confirm_label" msgid="8176726201389902380">"確認"</string>
     <string name="lockpassword_cancel_label" msgid="8818529276331121899">"取消"</string>
+    <string name="lockpassword_clear_label" msgid="5724429464960458155">"清除"</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>
@@ -662,16 +668,16 @@
     <string name="bluetooth_disconnect_headset_profile" msgid="8635908811168780720">"即將中斷 <xliff:g id="DEVICE_NAME">%1$s</xliff:g> 與免持聽筒音訊的連線。"</string>
     <string name="bluetooth_disconnect_hid_profile" msgid="3282295189719352075">"即將中斷 <xliff:g id="DEVICE_NAME">%1$s</xliff:g> 與輸入裝置的連線。"</string>
     <string name="bluetooth_disconnect_pan_user_profile" msgid="8037627994382458698">"即將中斷透過 <xliff:g id="DEVICE_NAME">%1$s</xliff:g> 取得的網際網路連線。"</string>
-    <string name="bluetooth_disconnect_pan_nap_profile" product="tablet" msgid="1262792320446274407">"即將中斷 <xliff:g id="DEVICE_NAME">%1$s</xliff:g> 透過這個平板電腦取得的網際網路連線。"</string>
-    <string name="bluetooth_disconnect_pan_nap_profile" product="default" msgid="5700332050175684571">"即將中斷 <xliff:g id="DEVICE_NAME">%1$s</xliff:g> 透過這支手機取得的網際網路連線。"</string>
+    <string name="bluetooth_disconnect_pan_nap_profile" product="tablet" msgid="8355910926439312604">"即將中斷「<xliff:g id="DEVICE_NAME">%1$s</xliff:g>」透過這部平板電腦取得的網際網路連線。"</string>
+    <string name="bluetooth_disconnect_pan_nap_profile" product="default" msgid="6251611115860359886">"即將中斷「<xliff:g id="DEVICE_NAME">%1$s</xliff:g>」透過這支手機取得的網際網路連線。"</string>
     <string name="bluetooth_device_advanced_title" msgid="6066342531927499308">"已配對的藍牙裝置"</string>
     <string name="bluetooth_device_advanced_online_mode_title" msgid="3689050071425683114">"連線"</string>
     <string name="bluetooth_device_advanced_online_mode_summary" msgid="1204424107263248336">"連接至藍牙裝置"</string>
     <string name="bluetooth_device_advanced_profile_header_title" msgid="102745381968579605">"用於"</string>
     <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="6436258151814414028">"已連線至裝置並取得網際網路連線"</string>
+    <string name="bluetooth_pan_nap_profile_summary_connected" msgid="1322694224800769308">"與裝置分享本地網際網路連線"</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>
@@ -704,7 +710,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>
@@ -724,8 +730,8 @@
     <string name="wifi_wakeup_summary_scanning_disabled" msgid="7247227922074840445">"Wi-Fi 掃描已關閉，因此無法使用"</string>
     <string name="wifi_wakeup_summary_scoring_disabled" msgid="108339002136866897">"如要使用這項功能，請選取網路評分供應商"</string>
     <string name="wifi_poor_network_detection" msgid="4925789238170207169">"避開品質不佳的連線"</string>
-    <string name="wifi_poor_network_detection_summary" msgid="2784135142239546291">"除非 Wi-Fi 網路連線狀態良好，否則不使用"</string>
-    <string name="wifi_avoid_poor_network_detection_summary" msgid="4674423884870027498">"僅使用網際網路連線品質穩定的網路"</string>
+    <string name="wifi_poor_network_detection_summary" msgid="7016103106105907127">"除非 Wi-Fi 網路連線狀態良好，否則不使用"</string>
+    <string name="wifi_avoid_poor_network_detection_summary" msgid="1644292503152790501">"僅使用網際網路連線品質穩定的網路"</string>
     <string name="use_open_wifi_automatically_title" msgid="6851951242903078588">"連線至開放網路"</string>
     <string name="use_open_wifi_automatically_summary" msgid="2982091714252931713">"自動連線至高品質的公用網路"</string>
     <string name="use_open_wifi_automatically_summary_scoring_disabled" msgid="593964217679325831">"如要使用這項功能，請選取網路評分供應商"</string>
@@ -741,9 +747,9 @@
     <string name="wifi_suspend_optimizations" msgid="1220174276403689487">"Wi-Fi 最佳化"</string>
     <string name="wifi_suspend_optimizations_summary" msgid="4151428966089116856">"開啟 Wi-Fi 時儘可能節約電池用量"</string>
     <string name="wifi_limit_optimizations_summary" msgid="9000801068363468950">"限制 Wi-Fi 用電量"</string>
-    <string name="wifi_switch_away_when_unvalidated" msgid="1707247692180853058">"Wi-Fi 網路無法連線時，切換到行動數據。"</string>
+    <string name="wifi_switch_away_when_unvalidated" msgid="8593144541347373394">"Wi-Fi 網路無法連線時，切換到行動數據。"</string>
     <string name="wifi_cellular_data_fallback_title" msgid="8753386877755616476">"自動切換到行動網路"</string>
-    <string name="wifi_cellular_data_fallback_summary" msgid="6375399280719867214">"當 Wi-Fi 功能無法連上網際網路時，使用行動數據 (可能會增加數據用量)。"</string>
+    <string name="wifi_cellular_data_fallback_summary" msgid="1403505355490119307">"當 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>
@@ -781,6 +787,7 @@
     <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,6 +824,8 @@
     <string name="wifi_wps_available_first_item" msgid="4422547079984583502">"可使用 WPS"</string>
     <string name="wifi_wps_available_second_item" msgid="8427520131718215301">" (可使用 WPS)"</string>
     <string name="wifi_wps_nfc_enter_password" msgid="2288214226916117159">"輸入你的網路密碼"</string>
+    <string name="wifi_carrier_connect" msgid="8174696557882299911">"電信業者 Wi‑Fi 網路"</string>
+    <string name="wifi_carrier_content" msgid="4634077285415851933">"透過「<xliff:g id="NAME">%1%s</xliff:g>」連線"</string>
     <string name="wifi_scan_always_turnon_message" msgid="203123538572122989">"<xliff:g id="APP_NAME">%1$s</xliff:g> 要求開啟網路掃描功能 (即使 Wi-Fi 已關閉)，藉此提升定位精確度及用於其他用途。\n\n你要對所有需要執行掃描的應用程式允許這項要求嗎？"</string>
     <string name="wifi_scan_always_turnoff_message" msgid="5538901671131941043">"如要關閉這項功能，請在溢位選單中選取 [進階]。"</string>
     <string name="wifi_scan_always_confirm_allow" msgid="5355973075896817232">"允許"</string>
@@ -824,9 +833,9 @@
     <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="5926979351959279577">"這個網路沒有網際網路連線。要繼續保持連線嗎？"</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_title" msgid="5779478650636392426">"Wi-Fi 無法連上網際網路"</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>
@@ -834,6 +843,7 @@
     <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_modify" msgid="6100248070440710782">"修改"</string>
     <string name="wifi_failed_forget_message" msgid="1348172929201654986">"無法刪除網路"</string>
     <string name="wifi_save" msgid="3331121567988522826">"儲存"</string>
     <string name="wifi_failed_save_message" msgid="6650004874143815692">"無法儲存網路"</string>
@@ -846,6 +856,7 @@
     <string name="wifi_advanced_titlebar" msgid="4485841401774142908">"進階 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_title" msgid="8954667664081737098">"網路詳細資料"</string>
     <string name="wifi_details_subnet_mask" msgid="6720279144174924410">"子網路遮罩"</string>
     <string name="wifi_details_dns" msgid="8648826607751830768">"DNS"</string>
     <string name="wifi_details_ipv6_address_header" msgid="6734119149106422148">"IPv6 位址"</string>
@@ -878,18 +889,17 @@
     <string name="wifi_p2p_cancel_connect_title" msgid="255267538099324413">"取消邀請？"</string>
     <string name="wifi_p2p_cancel_connect_message" msgid="7477756213423749402">"你要取消 <xliff:g id="PEER_NAME">%1$s</xliff:g> 的連線邀請？"</string>
     <string name="wifi_p2p_delete_group_message" msgid="834559380069647086">"刪除這個群組？"</string>
-    <string name="wifi_tether_checkbox_text" msgid="1847167643625779136">"可攜式 Wi-Fi 無線基地台"</string>
     <string name="wifi_hotspot_checkbox_text" msgid="7763495093333664887">"Wi‑Fi 無線基地台"</string>
-    <string name="wifi_hotspot_off_subtext" msgid="5466126533609394170">"目前沒有與其他裝置分享網際網路或內容"</string>
-    <string name="wifi_hotspot_tethering_on_subtext" product="tablet" msgid="5752490509369962007">"正在透過無線基地台分享這部平板電腦的網際網路連線"</string>
-    <string name="wifi_hotspot_tethering_on_subtext" product="default" msgid="6461075246164300670">"正在透過無線基地台分享這支手機的網際網路連線"</string>
-    <string name="wifi_hotspot_on_local_only_subtext" msgid="2068110388011294735">"應用程式正在分享內容。如要分享網際網路連線，請關閉無線基地台並重新開啟"</string>
-    <string name="wifi_hotspot_name_title" msgid="1341735529132128887">"Wi‑Fi 名稱"</string>
+    <string name="wifi_hotspot_off_subtext" msgid="2199911382555864644">"目前沒有與其他裝置分享網際網路或內容"</string>
+    <string name="wifi_hotspot_tethering_on_subtext" product="tablet" msgid="5936710887156133458">"正在透過無線基地台分享這部平板電腦的網際網路連線"</string>
+    <string name="wifi_hotspot_tethering_on_subtext" product="default" msgid="5556202634866621632">"正在透過無線基地台分享這支手機的網際網路連線"</string>
+    <string name="wifi_hotspot_on_local_only_subtext" msgid="5017191966153008">"應用程式正在分享內容。如要分享網際網路連線，請關閉無線基地台並重新開啟"</string>
+    <string name="wifi_hotspot_name_title" msgid="8237000746618636778">"無線基地台名稱"</string>
     <string name="wifi_hotspot_name_summary_connecting" msgid="3378299995508671967">"正在開啟 <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>..."</string>
     <string name="wifi_hotspot_name_summary_connected" msgid="3888672084861445362">"其他裝置可連線至 <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>"</string>
-    <string name="wifi_hotspot_password_title" msgid="1955592302902091281">"Wi-Fi 密碼"</string>
+    <string name="wifi_hotspot_password_title" msgid="8676859981917573801">"無線基地台密碼"</string>
     <string name="wifi_hotspot_ap_band_title" msgid="1165801173359290681">"存取點頻帶"</string>
-    <string name="wifi_hotspot_footer_info_regular" msgid="1203489406068036455">"使用無線基地台建立 Wi‑Fi 網路供其他裝置使用。無線基地台會使用你的行動數據連線提供網際網路。可能需支付額外的行動數據傳輸費用。"</string>
+    <string name="wifi_hotspot_footer_info_regular" msgid="4789553667374849566">"使用無線基地台建立 Wi‑Fi 網路供其他裝置使用。無線基地台會使用你的行動數據連線提供網際網路。可能需支付額外的行動數據傳輸費用。"</string>
     <string name="wifi_hotspot_footer_info_local_only" msgid="857988412470694109">"應用程式可以建立無線基地台來和鄰近的裝置分享內容。"</string>
     <string name="wifi_tether_starting" msgid="1322237938998639724">"正在開啟無線基地台…"</string>
     <string name="wifi_tether_stopping" msgid="4835852171686388107">"正在關閉無線基地台…"</string>
@@ -898,7 +908,6 @@
     <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">"Android 無線基地台"</string>
     <string name="wifi_calling_settings_title" msgid="4102921303993404577">"Wi-Fi 通話"</string>
     <string name="wifi_calling_suggestion_title" msgid="9008010480466359578">"開啟 Wi-Fi 通話功能"</string>
@@ -938,8 +947,8 @@
   </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="emergency_address_title" msgid="932729250447887545">"緊急地址"</string>
+    <string name="emergency_address_summary" msgid="7751971156196115129">"當你透過 Wi‑Fi 網路撥打緊急電話時，系統會判定你位於這個地址"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"顯示"</string>
     <string name="sound_settings" msgid="5534671337768745343">"音效"</string>
     <string name="all_volume_title" msgid="4296957391257836961">"音量"</string>
@@ -993,9 +1002,13 @@
     <string name="search_settings" msgid="1910951467596035063">"搜尋"</string>
     <string name="search_settings_summary" msgid="9205656546570654169">"管理搜尋設定和記錄"</string>
     <string name="search_settings_no_results" msgid="8799027492641230999">"找不到相符的搜尋結果"</string>
+    <string name="search_clear_history" msgid="4196658962573162457">"清除紀錄"</string>
     <string name="display_settings" msgid="7965901687241669598">"顯示"</string>
     <string name="accelerometer_title" msgid="7854608399547349157">"自動旋轉螢幕"</string>
-    <string name="color_mode_title" msgid="3159275920408338215">"鮮明色彩"</string>
+    <string name="color_mode_title" msgid="9186249332902370471">"色彩"</string>
+    <string name="color_mode_option_natural" msgid="5013837483986772758">"自然"</string>
+    <string name="color_mode_option_boosted" msgid="8588223970257287524">"增強"</string>
+    <string name="color_mode_option_saturated" msgid="4569683960058798843">"飽和"</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>
@@ -1114,15 +1127,16 @@
     <string name="system_update_settings_list_item_title" msgid="3342887311059985961">"系統更新"</string>
     <string name="system_update_settings_list_item_summary" msgid="3853057315907710747"></string>
     <string name="firmware_version" msgid="4801135784886859972">"Android 版本"</string>
+    <string name="firmware_title" msgid="5203122368389157877">"Android"</string>
     <string name="security_patch" msgid="8438384045870296634">"Android 安全性修補程式等級"</string>
     <string name="model_info" msgid="1952009518045740889">"型號"</string>
+    <string name="model_summary" msgid="8306235877567782987">"型號：%1$s"</string>
     <string name="hardware_info" msgid="2605080746512527805">"型號與硬體"</string>
     <string name="hardware_revision" msgid="8893547686367095527">"硬體版本"</string>
     <string name="fcc_equipment_id" msgid="149114368246356737">"設備 ID"</string>
     <string name="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>
     <string name="device_status_activity_title" msgid="1411201799384697904">"狀態"</string>
     <string name="device_status" msgid="607405385799807324">"狀態"</string>
@@ -1133,11 +1147,21 @@
     <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>
+    <!-- no translation found for imei_multi_sim (6387012961838800539) -->
+    <skip />
     <string name="status_number" product="tablet" msgid="1138837891091222272">"MDN"</string>
-    <string name="status_number" product="default" msgid="5123197324870153205">"我的電話號碼"</string>
+    <string name="status_number" product="default" msgid="5948892105546651296">"電話號碼"</string>
+    <!-- no translation found for status_number_sim_slot (2755592991367858860) -->
+    <skip />
+    <!-- no translation found for status_number_sim_slot (1898212200138025729) -->
+    <skip />
+    <string name="status_number_sim_status" product="tablet" msgid="1367110147304523864">"SIM 卡上的 MDN"</string>
+    <string name="status_number_sim_status" product="default" msgid="9123351360569466330">"SIM 卡上的電話號碼"</string>
     <string name="status_min_number" msgid="3519504522179420597">"MIN"</string>
     <string name="status_msid_number" msgid="909010114445780530">"MSID"</string>
     <string name="status_prl_version" msgid="1007470446618081441">"PRL 版本"</string>
+    <!-- no translation found for meid_multi_sim (748999971744491771) -->
+    <skip />
     <string name="status_meid_number" msgid="1751442889111731088">"MEID"</string>
     <string name="status_icc_id" msgid="943368755577172747">"ICCID"</string>
     <string name="status_network_type" msgid="3279383550222116235">"行動網路類型"</string>
@@ -1150,7 +1174,6 @@
     <string name="status_wifi_mac_address" msgid="2202206684020765378">"Wi-Fi MAC 位址"</string>
     <string name="status_bt_address" msgid="4195174192087439720">"藍牙位址"</string>
     <string name="status_serial_number" msgid="2257111183374628137">"序號"</string>
-    <string name="status_unavailable" msgid="7862009036663793314">"無法取得"</string>
     <string name="status_up_time" msgid="7294859476816760399">"開機累計時間"</string>
     <string name="status_awake_time" msgid="2393949909051183652">"清醒時間"</string>
     <string name="internal_memory" msgid="9129595691484260784">"內部儲存空間"</string>
@@ -1248,8 +1271,8 @@
     <string name="storage_detail_other" msgid="8404938385075638238">"其他"</string>
     <string name="storage_detail_system" msgid="4629506366064709687">"系統"</string>
     <string name="storage_detail_explore" msgid="7911344011431568294">"探索「<xliff:g id="NAME">^1</xliff:g>」"</string>
-    <string name="storage_detail_dialog_other" msgid="8907101974576694793">"其他檔案包括應用程式所儲存的共用檔案、透過網際網路或藍牙下載的檔案以及 Android 檔案等。\n\n如要查看這個「<xliff:g id="NAME">^1</xliff:g>」中可供檢視的內容，請輕觸 [探索]。"</string>
-    <string name="storage_detail_dialog_system" msgid="862835644848361569">"系統包括用於執行 Android <xliff:g id="VERSION">%s</xliff:g> 版的檔案"</string>
+    <string name="storage_detail_dialog_other" msgid="8845766044697204852">"其他檔案包括應用程式所儲存的共用檔案、透過網際網路或藍牙下載的檔案以及 Android 檔案等。\n\n如要查看這個「<xliff:g id="NAME">^1</xliff:g>」中可供檢視的內容，請輕觸 [探索]。"</string>
+    <string name="storage_detail_dialog_system" msgid="862835644848361569">"「系統」中包含用來執行 Android <xliff:g id="VERSION">%s</xliff:g> 版的檔案"</string>
     <string name="storage_detail_dialog_user" msgid="3267254783294197804">"<xliff:g id="USER_0">^1</xliff:g> 可能儲存了相片、音樂、應用程式或其他資料 (儲存空間使用量：<xliff:g id="SIZE">^2</xliff:g>)。\n\n如要查看詳細資料，請切換至 <xliff:g id="USER_1">^1</xliff:g>。"</string>
     <string name="storage_wizard_init_title" msgid="5085400514028585772">"設定你的「<xliff:g id="NAME">^1</xliff:g>」"</string>
     <string name="storage_wizard_init_external_title" msgid="4867326438945303598">"使用可攜式儲存空間"</string>
@@ -1326,6 +1349,7 @@
     <string name="menu_restore" msgid="8260067415075573273">"還原為預設狀態"</string>
     <string name="restore_default_apn_completed" msgid="2824775307377604897">"重設預設 APN 設定已完成。"</string>
     <string name="reset_dashboard_title" msgid="6254873816990678620">"重設選項"</string>
+    <string name="reset_dashboard_summary" msgid="4851012632493522755">"網路、應用程式或裝置可以重設"</string>
     <string name="reset_network_title" msgid="6166025966016873843">"重設 Wi-Fi、行動網路和藍牙"</string>
     <string name="reset_network_desc" msgid="5547979398298881406">"這項操作會重設所有網路設定，包括：\n\n"<li>"Wi‑Fi"</li>\n<li>"行動數據"</li>\n<li>"藍牙"</li></string>
     <string name="reset_network_button_text" msgid="2035676527471089853">"重設設定"</string>
@@ -1334,17 +1358,14 @@
     <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="6617679904229218425">"清除所有資料 (恢復原廠設定)"</string>
-    <plurals name="master_clear_with_account_summary" formatted="false" msgid="5911377203778818712">
-      <item quantity="other">系統將重設 <xliff:g id="ACCOUNT_COUNT">%1$d</xliff:g> 個帳戶</item>
-      <item quantity="one">系統將重設 1 個帳戶</item>
-    </plurals>
-    <string name="master_clear_summary" msgid="6902443944660426951">"內部儲存空間與所有資料都將重設"</string>
+    <string name="master_clear_title" msgid="3531267871084279512">"清除所有資料 (恢復原廠設定)"</string>
     <string name="master_clear_desc" product="tablet" msgid="9146059417023157222">"這會清除你平板電腦"<b>"內部儲存裝置"</b>"中的所有資料，包括：\n\n"<li>"你的 Google 帳戶"</li>\n<li>"系統和應用程式資料及設定"</li>\n<li>"已下載的應用程式"</li></string>
     <string name="master_clear_desc" product="default" msgid="4800386183314202571">"這會清除你手機"<b>"內部儲存裝置"</b>"中的所有資料，包括：\n\n"<li>"你的 Google 帳戶"</li>\n<li>"系統和應用程式資料及設定"</li>\n<li>"已下載的應用程式"</li></string>
     <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"你目前已登入下列帳戶：\n"</string>
     <string name="master_clear_other_users_present" product="default" msgid="5161423070702470742">\n\n"這個裝置上還有其他使用者。\n"</string>
     <string name="master_clear_desc_also_erases_external" msgid="1903185203791274237"><li>"音樂"</li>\n<li>"相片"</li>\n<li>"其他使用者資料"</li></string>
+    <string name="master_clear_desc_also_erases_esim" msgid="312352697653096008"><li>"eSIM 卡中的電信業者"</li></string>
+    <string name="master_clear_desc_no_cancel_mobile_plan" msgid="5460926449093211144">\n\n"這項操作並不會取消你的行動服務方案。"</string>
     <string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="7744115866662613411">\n\n"如要一併清除音樂、圖片及其他用戶資料，則需清除 "<b>"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>
@@ -1376,23 +1397,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_subtext" product="default" msgid="5991482890033484794">"透過 USB 分享手機的網際網路連線"</string>
-    <string name="usb_tethering_subtext" product="tablet" msgid="5988796139573211318">"透過 USB 分享平板電腦的網際網路連線"</string>
+    <string name="usb_tethering_subtext" product="default" msgid="3711893746716442706">"透過 USB 分享手機的網際網路連線"</string>
+    <string name="usb_tethering_subtext" product="tablet" msgid="2292916486612255069">"透過 USB 分享平板電腦的網際網路連線"</string>
     <string name="bluetooth_tether_checkbox_text" msgid="2379175828878753652">"藍牙網路共用"</string>
-    <string name="bluetooth_tethering_subtext" product="tablet" msgid="4558227863463153412">"透過藍牙分享平板電腦的網際網路連線"</string>
-    <string name="bluetooth_tethering_subtext" product="default" msgid="1055197887836203595">"透過藍牙分享手機的網際網路連線"</string>
-    <string name="bluetooth_tethering_off_subtext_config" msgid="6326877798974938021">"透過藍牙分享這個<xliff:g id="DEVICE_NAME">%1$d</xliff:g>的網際網路連線"</string>
+    <string name="bluetooth_tethering_subtext" product="tablet" msgid="8828883800511737077">"透過藍牙分享平板電腦的網際網路連線"</string>
+    <string name="bluetooth_tethering_subtext" product="default" msgid="1904667146601254812">"透過藍牙分享手機的網際網路連線"</string>
+    <string name="bluetooth_tethering_off_subtext_config" msgid="376389105752995580">"透過藍牙分享這個「<xliff:g id="DEVICE_NAME">%1$d</xliff:g>」的網際網路連線"</string>
     <string name="bluetooth_tethering_overflow_error" msgid="2135590598511178690">"最多只能有 <xliff:g id="MAXCONNECTION">%1$d</xliff:g> 個裝置共用網路。"</string>
     <string name="bluetooth_untether_blank" msgid="2871192409329334813">"將中斷 <xliff:g id="DEVICE_NAME">%1$s</xliff:g> 的網路共用。"</string>
-    <string name="tethering_footer_info" msgid="1308462275952345985">"使用無線基地台和網路共用功能，透過你的行動數據連線提供網際網路給其他裝置。應用程式也可以建立無線基地台來和鄰近的裝置分享內容。"</string>
+    <string name="tethering_footer_info" msgid="7112228674056306147">"使用無線基地台和網路共用功能，透過你的行動數據連線提供網際網路給其他裝置。應用程式也可以建立無線基地台來和鄰近的裝置分享內容。"</string>
     <string name="tethering_help_button_text" msgid="656117495547173630">"說明"</string>
     <string name="network_settings_title" msgid="2876509814832830757">"行動網路"</string>
     <string name="manage_mobile_plan_title" msgid="7630170375010107744">"行動數據傳輸資費方案"</string>
     <string name="sms_application_title" msgid="4903928270533250448">"簡訊應用程式"</string>
     <string name="sms_change_default_dialog_title" msgid="1958688831875804286">"變更簡訊應用程式？"</string>
-    <string name="sms_change_default_dialog_text" msgid="1522783933230274787">"你要改用 <xliff:g id="NEW_APP">%1$s</xliff:g> 而不再使用 <xliff:g id="CURRENT_APP">%2$s</xliff:g> 做為簡訊應用程式嗎？"</string>
+    <string name="sms_change_default_dialog_text" msgid="1522783933230274787">"你要改用「<xliff:g id="NEW_APP">%1$s</xliff:g>」而不再使用「<xliff:g id="CURRENT_APP">%2$s</xliff:g>」做為簡訊應用程式嗎？"</string>
     <string name="sms_change_default_no_previous_dialog_text" msgid="602683880284921998">"使用 <xliff:g id="NEW_APP">%s</xliff:g> 做為簡訊應用程式嗎？"</string>
-    <string name="network_scorer_picker_title" msgid="6383879578279046456">"網路評分供應商"</string>
+    <string name="network_scorer_picker_title" msgid="6383879578279046456">"網路評分服務供應商"</string>
     <string name="network_scorer_picker_none_preference" msgid="9028375117241790936">"無"</string>
     <string name="network_scorer_change_active_dialog_title" msgid="3776301550387574975">"變更 Wi‑Fi Assistant？"</string>
     <string name="network_scorer_change_active_dialog_text" msgid="8035173880322990715">"改以「<xliff:g id="NEW_APP">%1$s</xliff:g>」取代「<xliff:g id="CURRENT_APP">%2$s</xliff:g>」管理你的網路連線？"</string>
@@ -1459,17 +1480,18 @@
     <string name="settings_license_activity_loading" msgid="3337535809093591740">"載入中…"</string>
     <string name="settings_safetylegal_title" msgid="1289483965535937431">"安全資訊"</string>
     <string name="settings_safetylegal_activity_title" msgid="6901214628496951727">"安全資訊"</string>
-    <string name="settings_safetylegal_activity_unreachable" msgid="250674109915859456">"你沒有數據連線，如要立即查看這項資訊，請使用任何已連上網際網路的電腦前往 %s。"</string>
+    <string name="settings_safetylegal_activity_unreachable" msgid="142307697309858185">"你沒有數據連線，如要立即查看這項資訊，請使用任何已連上網際網路的電腦前往 %s。"</string>
     <string name="settings_safetylegal_activity_loading" msgid="8059022597639516348">"載入中…"</string>
-    <string name="lockpassword_choose_your_password_header" msgid="8624900666929394990">"選擇密碼"</string>
-    <string name="lockpassword_choose_your_password_header_for_fingerprint" msgid="6624409510609085450">"如要使用指紋，請設定密碼"</string>
-    <string name="lockpassword_choose_your_pattern_header" msgid="6949761069941694050">"選擇圖案"</string>
-    <string name="lockpassword_choose_your_pattern_header_for_fingerprint" msgid="5901096361617543819">"如要使用指紋，請設定解鎖圖案"</string>
-    <string name="lockpassword_choose_your_pin_header" msgid="7598849519816138302">"選擇 PIN 碼"</string>
-    <string name="lockpassword_choose_your_pin_header_for_fingerprint" msgid="765344692615917183">"如要使用指紋，請設定 PIN 碼"</string>
-    <string name="lockpassword_confirm_your_password_header" msgid="6308478184889846633">"確認密碼"</string>
+    <string name="lockpassword_choose_your_screen_lock_header" msgid="3872462096767152394">"設定螢幕鎖定"</string>
+    <string name="lockpassword_choose_your_password_message" msgid="1197569283524841412">"為了安全起見，請設定密碼"</string>
+    <string name="lockpassword_choose_your_password_header_for_fingerprint" msgid="2541818487015343503">"如要使用指紋，請設定密碼"</string>
+    <string name="lockpassword_choose_your_pattern_header_for_fingerprint" msgid="7709785406243556723">"如要使用指紋，請設定解鎖圖案"</string>
+    <string name="lockpassword_choose_your_pin_message" msgid="1875420718677275646">"為了安全起見，請設定 PIN 碼"</string>
+    <string name="lockpassword_choose_your_pin_header_for_fingerprint" msgid="1549639053195796674">"如要使用指紋，請設定 PIN 碼"</string>
+    <string name="lockpassword_choose_your_pattern_message" msgid="5986983400689720015">"為了安全起見，請設定圖案"</string>
+    <string name="lockpassword_confirm_your_password_header" msgid="1266027268220850931">"請重新輸入你的密碼"</string>
     <string name="lockpassword_confirm_your_pattern_header" msgid="7543433733032330821">"確認圖案"</string>
-    <string name="lockpassword_confirm_your_pin_header" msgid="49038294648213197">"確認你的 PIN 碼"</string>
+    <string name="lockpassword_confirm_your_pin_header" msgid="7744513791910572550">"請重新輸入你的 PIN 碼"</string>
     <string name="lockpassword_confirm_passwords_dont_match" msgid="5140892109439191415">"密碼不符"</string>
     <string name="lockpassword_confirm_pins_dont_match" msgid="7226244811505606217">"PIN 碼不符"</string>
     <string name="lockpassword_choose_lock_generic_header" msgid="3811438094903786145">"選擇解鎖方式"</string>
@@ -1488,6 +1510,12 @@
     <string name="lockpassword_strong_auth_required_work_pattern" msgid="3003781907040522053">"為了提升安全性，請使用 Work 解鎖圖案"</string>
     <string name="lockpassword_strong_auth_required_work_pin" msgid="3367491332598821552">"為了提升安全性，請輸入 Work PIN 碼"</string>
     <string name="lockpassword_strong_auth_required_work_password" msgid="8159775129968582940">"為了提升安全性，請輸入 Work 密碼"</string>
+    <string name="lockpassword_confirm_your_pattern_details_frp" msgid="6757336656791723193">"你的手機已恢復原廠設定。如要使用這支手機，請輸入先前設定的解鎖圖案。"</string>
+    <string name="lockpassword_confirm_your_pin_details_frp" msgid="826520613445990470">"你的手機已恢復原廠設定。如要使用這支手機，請輸入先前設定的 PIN 碼。"</string>
+    <string name="lockpassword_confirm_your_password_details_frp" msgid="8944081074615739040">"你的手機已恢復原廠設定。如要使用這支手機，請輸入先前設定的密碼。"</string>
+    <string name="lockpassword_confirm_your_pattern_header_frp" msgid="2898036091609128286">"驗證解鎖圖案"</string>
+    <string name="lockpassword_confirm_your_pin_header_frp" msgid="4141601774778898803">"驗證 PIN 碼"</string>
+    <string name="lockpassword_confirm_your_password_header_frp" msgid="3762615419295360480">"驗證密碼"</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>
@@ -1537,7 +1565,6 @@
     <string name="install_applications_title" msgid="4987712352256508946">"允許安裝所有來源的應用程式"</string>
     <string name="recent_app_category_title" msgid="6673071268966003928">"最近開啟的應用程式"</string>
     <string name="see_all_apps_title" msgid="1317153498074308438">"查看全部共 <xliff:g id="COUNT">%1$d</xliff:g> 個應用程式"</string>
-    <string name="recent_app_summary" msgid="3366446669844932300">"<xliff:g id="TIME">^1</xliff:g>前"</string>
     <string name="install_all_warning" product="tablet" msgid="8310489909586138165">"來歷不明的應用程式可能會損害你的平板電腦和個人資料。安裝這個來源提供的應用程式集表示你同意，如因使用這些應用程式導致你的平板電腦受損或資料遺失，須自行負責。"</string>
     <string name="install_all_warning" product="default" msgid="1952257127370115988">"來歷不明的應用程式可能會損害你的手機和個人資料。安裝這個來源提供的應用程式即表示你同意，如因使用這些應用程式導致你的手機受損或資料遺失，須自行負責。"</string>
     <string name="advanced_settings" msgid="1777249286757067969">"進階設定"</string>
@@ -1659,7 +1686,6 @@
     <string name="app_install_details_title" msgid="6905279702654975207">"應用程式詳細資料"</string>
     <string name="app_install_details_summary" msgid="6464796332049327547">"應用程式安裝來源：<xliff:g id="APP_STORE">%1$s</xliff:g>"</string>
     <string name="instant_app_details_summary" msgid="4529934403276907045">"前往「<xliff:g id="APP_STORE">%1$s</xliff:g>」查看詳細資訊"</string>
-    <string name="app_ops_settings" msgid="5108481883575527511">"應用程式作業"</string>
     <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>
@@ -1711,6 +1737,7 @@
     <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_empty_list_user_restricted" msgid="5984015900102140696">"你沒有變更裝置語言的權限。"</string>
     <string name="language_keyboard_settings_title" msgid="3709159207482544398">"語言與輸入設定"</string>
     <string name="input_assistance" msgid="7577795275222555487">"輸入輔助"</string>
     <string name="keyboard_settings_category" msgid="8275523930352487827">"鍵盤與輸入法"</string>
@@ -1801,7 +1828,7 @@
     <string name="accessibility_settings_summary" msgid="981260486011624939">"螢幕閱讀器、顯示、互動控制項"</string>
     <string name="vision_settings_title" msgid="4204111425716868288">"視覺輔助設定"</string>
     <string name="vision_settings_description" msgid="5679491180156408260">"你可以根據個人需求自訂這個裝置，日後，你可以前往 [設定] 變更這些無障礙功能。"</string>
-    <string name="vision_settings_suggestion_title" msgid="917294957154878441">"放大字型"</string>
+    <string name="vision_settings_suggestion_title" msgid="8058794060304707004">"變更字型大小"</string>
     <string name="screen_reader_category_title" msgid="7739154903913400641">"螢幕閱讀器"</string>
     <string name="audio_and_captions_category_title" msgid="3420727114421447524">"音訊和畫面上的文字"</string>
     <string name="display_category_title" msgid="685461049938269166">"螢幕"</string>
@@ -1838,7 +1865,6 @@
     <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="preference_summary_default_combination" msgid="8532964268242666060">"<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>
@@ -1957,12 +1983,14 @@
     <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_whitelisted" msgid="7375400051141016808">"無法最佳化應用程式用電量"</string>
+    <string name="background_activity_warning_dialog_title" msgid="2216249969149568871">"要限制背景活動嗎？"</string>
+    <string name="background_activity_warning_dialog_text" msgid="7049624449246121981">"如果你限制應用程式的背景活動，應用程式可能無法正常運作"</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" msgid="6393929085382334341">"充飽電 (<xliff:g id="RELATIVE_TIME">^1</xliff:g>) 後的應用程式用電量"</string>
+    <string name="power_usage_list_summary_device" msgid="4461926045610455423">"充飽電 (<xliff:g id="RELATIVE_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>
@@ -2126,14 +2154,6 @@
     <string name="services_subtitle" msgid="4296402367067266425">"服務"</string>
     <string name="menu_proc_stats_duration" msgid="2323483592994720196">"時間長度"</string>
     <string name="mem_details_title" msgid="6548392825497290498">"記憶體詳細資料"</string>
-    <string name="mem_state_subtitle" msgid="2407238869781011933">"記憶體狀態"</string>
-    <string name="mem_use_subtitle" msgid="7319468770222422412">"記憶體用量"</string>
-    <string name="mem_use_kernel_type" msgid="8698327165935012484">"核心"</string>
-    <string name="mem_use_native_type" msgid="5976704902328347400">"本機"</string>
-    <string name="mem_use_kernel_cache_type" msgid="6411475064463957513">"核心快取"</string>
-    <string name="mem_use_zram_type" msgid="9087217476795358232">"ZRam 切換"</string>
-    <string name="mem_use_free_type" msgid="717708548454880840">"可用"</string>
-    <string name="mem_use_total" msgid="6308786055749777934">"總計"</string>
     <string name="menu_duration_3h" msgid="4714866438374738385">"3 小時"</string>
     <string name="menu_duration_6h" msgid="1940846763432184132">"6 小時"</string>
     <string name="menu_duration_12h" msgid="7890465404584356294">"12 小時"</string>
@@ -2212,14 +2232,14 @@
     <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">"密碼不正確。你還有 1 次輸入密碼的機會，如果輸入錯誤，憑證儲存空間將遭到清除。"</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="credentials_configure_lock_screen_hint" msgid="8058230497337529036">"你必須啟用裝置的安全螢幕鎖定功能，才能使用憑證儲存空間"</string>
+    <string name="credentials_configure_lock_screen_button" msgid="253239765216055321">"設定鎖定功能"</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>
@@ -2339,8 +2359,6 @@
     <skip />
     <string name="cant_sync_dialog_title" msgid="2777238588398046285">"無法手動同步處理"</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，請輸入你的 PIN"</string>
     <string name="enter_pattern" msgid="4187435713036808566">"如要啟動 Android，請畫出解鎖圖案"</string>
@@ -2354,6 +2372,7 @@
     <string name="misc_files_selected_count" msgid="4647048020823912088">"已選取 <xliff:g id="NUMBER">%1$d</xliff:g> 個，共 <xliff:g id="TOTAL">%2$d</xliff:g> 個"</string>
     <string name="misc_files_selected_count_bytes" msgid="2876232009069114352">"<xliff:g id="NUMBER">%1$s</xliff:g>，總共 <xliff:g id="TOTAL">%2$s</xliff:g>"</string>
     <string name="select_all" msgid="1562774643280376715">"全選"</string>
+    <string name="data_plan_usage_manage_plans_button_text" msgid="8997761990902708162">"管理方案"</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>
@@ -2439,6 +2458,9 @@
     <string name="data_usage_metered_mobile" msgid="5423305619126978393">"行動網路"</string>
     <string name="data_usage_metered_wifi" msgid="1761738002328299714">"計量付費 Wi‑Fi 網路"</string>
     <string name="data_usage_metered_wifi_disabled" msgid="727808462375941567">"如要選取計量付費網路，請開啟 Wi‑Fi。"</string>
+    <string name="data_usage_metered_auto" msgid="1262028400911918865">"自動"</string>
+    <string name="data_usage_metered_yes" msgid="9217539611385225894">"按傳輸量計費"</string>
+    <string name="data_usage_metered_no" msgid="4025232961929071789">"非按傳輸量計費"</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>
@@ -2481,8 +2503,8 @@
     <string name="vpn_forget_long" msgid="2232239391189465752">"清除 VPN 設定檔"</string>
     <string name="vpn_replace_vpn_title" msgid="2963898301277610248">"要取代現有的 VPN 嗎？"</string>
     <string name="vpn_set_vpn_title" msgid="4009987321156037267">"要設定永久連線的 VPN 嗎？"</string>
-    <string name="vpn_first_always_on_vpn_message" msgid="3025322109743675467">"開啟這項設定後，在 VPN 成功連線之前，你將無法連上網際網路"</string>
-    <string name="vpn_replace_always_on_vpn_enable_message" msgid="2577928591361606641">"現有的 VPN 會遭到取代，而且在 VPN 成功連線之前，你將無法連上網際網路"</string>
+    <string name="vpn_first_always_on_vpn_message" msgid="7144543717673197102">"開啟這項設定後，在 VPN 成功連線之前，你將無法連上網際網路"</string>
+    <string name="vpn_replace_always_on_vpn_enable_message" msgid="798121133114824006">"現有的 VPN 會遭到取代，而且在 VPN 成功連線之前，你將無法連上網際網路"</string>
     <string name="vpn_replace_always_on_vpn_disable_message" msgid="3011818750025879902">"你已連線至特定的永久連線 VPN。連線至其他 VPN 將會取代現有的 VPN，並關閉永久連線模式。"</string>
     <string name="vpn_replace_vpn_message" msgid="5611635724578812860">"你已連線至特定 VPN。連線至其他 VPN 將會取代現有的 VPN。"</string>
     <string name="vpn_turn_on" msgid="2363136869284273872">"開啟"</string>
@@ -2530,9 +2552,6 @@
     <string name="backup_pw_set_button_text" msgid="2387480910044648795">"設定備份密碼"</string>
     <string name="backup_pw_cancel_button_text" msgid="8845630125391744615">"取消"</string>
     <string name="additional_system_update_settings_list_item_title" msgid="214987609894661992">"其他系統更新"</string>
-    <string name="selinux_status_disabled" msgid="924551035552323327">"已停用"</string>
-    <string name="selinux_status_permissive" msgid="6004965534713398778">"許可"</string>
-    <string name="selinux_status_enforcing" msgid="2252703756208463329">"執行中"</string>
     <string name="ssl_ca_cert_warning" msgid="2045866713601984673">"網路可能會受到監控"</string>
     <string name="done_button" msgid="1991471253042622230">"完成"</string>
     <plurals name="ssl_ca_cert_dialog_title" formatted="false" msgid="7145092748045794650">
@@ -2712,6 +2731,8 @@
     <string name="color_purple" msgid="3888532466427762504">"紫色"</string>
     <string name="sim_no_inserted_msg" msgid="210316755353227087">"尚未插入 SIM 卡"</string>
     <string name="sim_status_title" msgid="6744870675182447160">"SIM 卡狀態"</string>
+    <!-- no translation found for sim_status_title_sim_slot (5725659316463979194) -->
+    <skip />
     <string name="sim_call_back_title" msgid="5181549885999280334">"使用預設 SIM 卡回撥"</string>
     <string name="sim_outgoing_call_title" msgid="1019763076116874255">"用於撥出電話的 SIM 卡"</string>
     <string name="sim_other_call_settings" msgid="8247802316114482477">"其他通話設定"</string>
@@ -2725,12 +2746,15 @@
     <string name="sim_pref_divider" msgid="6778907671867621874">"適用於以下用途的偏好 SIM 卡"</string>
     <string name="sim_calls_ask_first_prefs_title" msgid="7941299533514115976">"每次都詢問"</string>
     <string name="sim_selection_required_pref" msgid="3446721423206414652">"請選取偏好設定"</string>
+    <!-- no translation found for sim_selection_channel_title (2760909074892782589) -->
+    <skip />
     <string name="dashboard_title" msgid="5453710313046681820">"設定"</string>
     <plurals name="settings_suggestion_header_summary_hidden_items" formatted="false" msgid="5597356221942118048">
       <item quantity="other">顯示 %d 個隱藏項目</item>
       <item quantity="one">顯示 %d 個隱藏項目</item>
     </plurals>
-    <string name="network_dashboard_title" msgid="4771589228992391573">"網路和網際網路"</string>
+    <string name="dashboard_suggestion_condition_footer_content_description" msgid="2898588191174845961">"收合"</string>
+    <string name="network_dashboard_title" msgid="3135144174846753758">"網路和網際網路"</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>
@@ -2790,6 +2814,14 @@
     <string name="keywords_payment_settings" msgid="5220104934130446416">"支付、輕觸、付款"</string>
     <string name="keywords_backup" msgid="470070289135403022">"備份內容, 備份"</string>
     <string name="keywords_assist_gesture_launch" msgid="813968759791342591">"手勢"</string>
+    <!-- no translation found for keywords_imei_info (7230982940217544527) -->
+    <skip />
+    <!-- no translation found for keywords_sim_status (1474422416860990564) -->
+    <skip />
+    <!-- no translation found for keywords_model_and_hardware (1459248377212829642) -->
+    <skip />
+    <!-- no translation found for keywords_android_version (5591055570309015111) -->
+    <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 +2859,20 @@
     <string name="emergency_tone_alert" msgid="8941852695428130667">"警示"</string>
     <string name="emergency_tone_vibrate" msgid="8281126443204950847">"震動"</string>
     <string name="boot_sounds_title" msgid="567029107382343709">"啟動音效"</string>
-    <string name="zen_mode_settings_summary_off" msgid="1857165567766351925">"沒有開啟任何自動規則"</string>
-    <plurals name="zen_mode_settings_summary_on" formatted="false" msgid="1216562765753405784">
-      <item quantity="other"><xliff:g id="ON_COUNT">%d</xliff:g> 個自動規則已開啟</item>
-      <item quantity="one">1 個自動規則已開啟</item>
+    <string name="zen_mode_settings_summary_off" msgid="6119891445378113334">"永不"</string>
+    <plurals name="zen_mode_settings_summary_on" formatted="false" msgid="7346979080337117366">
+      <item quantity="other"><xliff:g id="ON_COUNT">%d</xliff:g> 項規則</item>
+      <item quantity="one">1 項規則</item>
     </plurals>
-    <string name="zen_mode_settings_title" msgid="842308776768942600">"「零打擾」偏好設定"</string>
-    <string name="zen_mode_priority_settings_title" msgid="2623117023031824309">"僅允許優先通知"</string>
-    <string name="zen_mode_automation_settings_title" msgid="4228995740594063774">"自動規則"</string>
+    <string name="zen_mode_settings_title" msgid="1066226840983908121">"零打擾"</string>
+    <string name="zen_mode_behavior_settings_title" msgid="1463303933529313969">"行為"</string>
+    <string name="zen_mode_behavior_allow_title" msgid="3845615648136218141">"只允許下列類型的音效與震動："</string>
+    <string name="zen_mode_behavior_no_sound" msgid="1219626004723208056">"不發出音效"</string>
+    <string name="zen_mode_behavior_total_silence" msgid="6716603819806610626">"不發出音效 (完全靜音)"</string>
+    <string name="zen_mode_behavior_no_sound_except" msgid="4968477585788243114">"除了<xliff:g id="CATEGORIES">%1$s</xliff:g>以外一律不發出音效"</string>
+    <string name="zen_mode_behavior_alarms_only" msgid="2423480992071472963">"除了鬧鐘、媒體和系統以外一律不發出音效 (僅限鬧鐘)"</string>
+    <string name="zen_mode_automation_settings_title" msgid="2517800938791944915">"自動開啟"</string>
+    <string name="zen_mode_automation_settings_page_title" msgid="7069221762714457987">"自動規則"</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>
@@ -2842,6 +2880,22 @@
     <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_signals_settings_subtitle" msgid="6308824824208120508">"允許視覺信號"</string>
+    <string name="zen_mode_add" msgid="90014394953272517">"新增"</string>
+    <!-- no translation found for zen_mode_button_turn_on (5074744714613374902) -->
+    <skip />
+    <!-- no translation found for zen_mode_button_turn_off (1995551537320422792) -->
+    <skip />
+    <!-- no translation found for zen_mode_settings_dnd_manual_end_time_next_day (3090599225533484203) -->
+    <skip />
+    <!-- no translation found for zen_mode_settings_dnd_manual_indefinite (2746903915016850399) -->
+    <skip />
+    <!-- no translation found for zen_mode_settings_dnd_automatic_rule (3856133183910726786) -->
+    <skip />
+    <!-- no translation found for zen_mode_settings_dnd_automatic_rule_app (7112871101701453067) -->
+    <skip />
+    <!-- no translation found for zen_mode_settings_dnd_automatic_rule_multiple (5792308957602984360) -->
+    <skip />
     <string name="sound_work_settings" msgid="6774324553228566442">"Work 設定檔音效"</string>
     <string name="work_use_personal_sounds_title" msgid="1148331221338458874">"使用個人設定檔音效"</string>
     <string name="work_use_personal_sounds_summary" msgid="6207040454949823153">"Work 設定檔和個人設定檔使用相同的音效"</string>
@@ -2875,13 +2929,15 @@
     <string name="notifications_title" msgid="8086372779371204971">"通知"</string>
     <string name="app_notifications_title" msgid="5810577805218003760">"應用程式通知"</string>
     <string name="notification_channel_title" msgid="2260666541030178452">"通知類別"</string>
+    <string name="notification_group_title" msgid="7180506440133859601">"通知類別群組"</string>
     <string name="notification_importance_title" msgid="848692592679312666">"重要性"</string>
-    <string name="notification_importance_unspecified" msgid="2196023702875112081">"讓應用程式決定"</string>
+    <string name="notification_importance_unspecified" msgid="6622173510486113958">"開啟音效"</string>
     <string name="notification_importance_blocked" msgid="7938180808339386300">"一律不顯示通知"</string>
     <string name="notification_importance_min" msgid="5455049524984686275">"不發出音效或顯示通知"</string>
     <string name="notification_importance_low" msgid="8881468429453766553">"不發出音效"</string>
     <string name="notification_importance_default" msgid="5958338024601957516">"發出音效"</string>
     <string name="notification_importance_high" msgid="2082429479238228527">"發出音效並在畫面上彈出通知"</string>
+    <string name="notification_importance_high_silent" msgid="2667033773703765252">"在畫面上彈出通知"</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>
@@ -2924,8 +2980,13 @@
     <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="channel_group_notifications_off_desc" msgid="1620950416247316370">"Android 已設定封鎖，不讓這個群組的通知顯示在這個裝置上"</string>
     <string name="notification_channels" msgid="5346841743182627500">"類別"</string>
     <string name="notification_channels_other" msgid="5645317113885788226">"其他"</string>
+    <plurals name="notification_group_summary" formatted="false" msgid="3420621520561455358">
+      <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="no_channels" msgid="3077375508177744586">"這個應用程式未發佈任何通知"</string>
     <string name="app_settings_link" msgid="8894946007543660906">"應用程式中的其他設定"</string>
     <string name="app_notification_listing_summary_zero" msgid="6482582965081108108">"已開啟所有應用程式的通知"</string>
@@ -2961,7 +3022,9 @@
     <string name="zen_mode_rule_name" msgid="5149068059383837549">"規則名稱"</string>
     <string name="zen_mode_rule_name_hint" msgid="3781174510556433384">"輸入規則名稱"</string>
     <string name="zen_mode_rule_name_warning" msgid="4517805381294494314">"規則名稱已在使用中"</string>
-    <string name="zen_mode_add_rule" msgid="7459154136384467057">"新增更多"</string>
+    <string name="zen_mode_add_rule" msgid="9100929184624317193">"新增規則"</string>
+    <string name="zen_mode_add_event_rule" msgid="3997335103633946552">"新增活動規則"</string>
+    <string name="zen_mode_add_time_rule" msgid="5002080000597838703">"新增時間規則"</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>
@@ -2969,9 +3032,9 @@
     <string name="zen_mode_rule_type" msgid="2289413469580142888">"規則類型"</string>
     <string name="zen_mode_rule_type_unknown" msgid="3049377282766700600">"不明"</string>
     <string name="zen_mode_configure_rule" msgid="8865785428056490305">"設定規則"</string>
-    <string name="zen_schedule_rule_type_name" msgid="142936744435271449">"時間規則"</string>
+    <string name="zen_schedule_rule_type_name" msgid="6163149826036287324">"時間"</string>
     <string name="zen_schedule_rule_enabled_toast" msgid="3379499360390382259">"可在指定時間開啟「零打擾」設定的自動規則集"</string>
-    <string name="zen_event_rule_type_name" msgid="2645981990973086797">"活動規則"</string>
+    <string name="zen_event_rule_type_name" msgid="6503468472212606158">"活動"</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>
@@ -3002,12 +3065,13 @@
     <string name="zen_mode_from_starred" msgid="2678345811950997027">"來自已加星號的聯絡人"</string>
     <string name="zen_mode_from_none" msgid="8219706639954614136">"無"</string>
     <string name="zen_mode_alarms" msgid="2165302777886552926">"鬧鐘"</string>
+    <string name="zen_mode_media_system_other" msgid="8900209390529859777">"媒體和系統音效"</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="239685342222975733">"如果同一個人在 <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>
@@ -3026,16 +3090,13 @@
     </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_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="zen_mode_screen_on" msgid="8774571998575673502">"螢幕開啟時"</string>
+    <string name="zen_mode_screen_on_summary" msgid="5385338884695802115">"允許「零打擾」模式設為靜音的通知在畫面上彈出通知"</string>
+    <string name="zen_mode_screen_off" msgid="3144446765110327937">"螢幕關閉時"</string>
+    <string name="zen_mode_screen_off_summary" msgid="7430034620565812258">"允許「零打擾」模式設為靜音的通知開啟螢幕及閃爍燈光"</string>
+    <string name="zen_mode_screen_off_summary_no_led" msgid="2826121465026642017">"允許「零打擾」模式設為靜音的通知開啟螢幕"</string>
     <string name="notification_app_settings_button" msgid="6685640230371477485">"通知設定"</string>
+    <string name="suggestion_button_text" msgid="3275010948381252006">"確定"</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>
@@ -3220,6 +3281,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="sms_mirroring_pref" msgid="6475043279147376031">"簡訊鏡像"</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>
@@ -3286,7 +3348,7 @@
     <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="permit_write_settings" msgid="658555006453212691">"允許修改系統設定"</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>
@@ -3313,7 +3375,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>
@@ -3352,7 +3414,7 @@
     <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、藍牙和行動網路都已關閉。你無法撥打電話或連線到網際網路。"</string>
+    <string name="condition_airplane_summary" msgid="3738805058182535606">"Wi-Fi、藍牙和行動網路都已關閉。你無法撥打電話或連線到網際網路。"</string>
     <string name="condition_zen_title" msgid="2679168532600816392">"「零打擾」設定已開啟 (<xliff:g id="ID_1">%1$s</xliff:g>)"</string>
     <string name="condition_battery_title" msgid="3272131008388575349">"節約耗電量模式已開啟"</string>
     <string name="condition_battery_summary" msgid="4418839236027977450">"已降低執行效能，並停用定位服務和背景資料功能。"</string>
@@ -3381,9 +3443,10 @@
     <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">"如要套用 Telephony Monitor 的變更內容，請重新啟動裝置"</string>
-    <string name="camera_hal_hdrplus_switch" msgid="8377365197105267466">"相機 HAL HDR+"</string>
-    <string name="camera_hal_hdrplus_toast" msgid="2063703797270055299">"如要套用你對「相機 HAL HDR+」設定所做的變更，請重新啟動裝置"</string>
+    <string name="connectivity_monitor_switch" msgid="9059759348648583421">"Connectivity Monitor"</string>
+    <string name="connectivity_monitor_switch_summary" msgid="2828658652378866401">"Connectivity Monitor 會在偵測到連線問題時收集相關紀錄，並顯示通知方便使用者回報錯誤"</string>
+    <string name="connectivity_monitor_toast" msgid="5551859612881173028">"如要套用 Connectivity Monitor 的變更內容，請重新啟動裝置"</string>
+    <string name="camera_laser_sensor_switch" msgid="8913588990743234440">"相機雷射感應器"</string>
     <string name="ota_disable_automatic_update" msgid="2319639631655915050">"自動系統更新"</string>
     <string name="usage" msgid="2977875522080448986">"使用情況"</string>
     <string name="cellular_data_usage" msgid="2155683719898158203">"行動數據用量"</string>
@@ -3409,7 +3472,7 @@
     <string name="data_warning" msgid="209133958008062117">"數據用量警告"</string>
     <string name="set_data_limit" msgid="2901526323210516923">"設定數據用量上限"</string>
     <string name="data_limit" msgid="1885406964934590552">"數據用量上限"</string>
-    <string name="data_usage_template" msgid="392191945602400904">"<xliff:g id="ID_2">%2$s</xliff:g>這段期間已使用 <xliff:g id="ID_1">%1$s</xliff:g>"</string>
+    <string name="data_usage_template" msgid="2923744765873163859">"<xliff:g id="ID_2">%2$s</xliff:g>期間已使用 <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="configure" msgid="1029654422228677273">"設定"</string>
     <string name="data_usage_other_apps" msgid="3272872663517382050">"計入數據用量的其他應用程式"</string>
     <plurals name="data_saver_unrestricted_summary" formatted="false" msgid="2635267833484232703">
@@ -3478,7 +3541,7 @@
     <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="387052719462473500">"控制鎖定畫面上顯示的資訊"</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="8483187649355540109">"支援和提示"</string>
@@ -3486,7 +3549,7 @@
     <string name="premium_sms_none" msgid="8268105565738040566">"沒有任何已安裝的應用程式要求「付費簡訊」存取權"</string>
     <string name="premium_sms_warning" msgid="9086859595338944882">"「付費簡訊」需要額外計費，相關費用會併入你的電信費帳單。如果你為某個應用程式啟用權限，即可利用該應用程式傳送付費簡訊。"</string>
     <string name="premium_sms_access" msgid="4660047004791638305">"付費簡訊存取權"</string>
-    <string name="bluetooth_disabled" msgid="2456198532288640046">"其他裝置無法偵測到"</string>
+    <string name="bluetooth_disabled" msgid="6244000672828617410">"關閉"</string>
     <string name="bluetooth_connected_summary" msgid="7672528674593152862">"已連線到「<xliff:g id="ID_1">%1$s</xliff:g>」"</string>
     <string name="bluetooth_connected_multiple_devices_summary" msgid="9173661896296663932">"已連線到多個裝置"</string>
     <string name="demo_mode" msgid="2798762752209330277">"系統 UI 示範模式"</string>
@@ -3532,13 +3595,6 @@
       <item quantity="one">1 秒</item>
     </plurals>
     <string name="support_estimated_wait_time" msgid="6523081420029378051">"大約需等候 <xliff:g id="ESTIMATE">%1$s</xliff:g>"</string>
-    <string name="bluetooth_talkback_computer" msgid="4875089335641234463">"電腦"</string>
-    <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>
-    <string name="bluetooth_talkback_input_peripheral" msgid="5165842622743212268">"周邊輸入裝置"</string>
-    <string name="bluetooth_talkback_bluetooth" msgid="5615463912185280812">"藍牙"</string>
     <string name="automatic_storage_manager_settings" msgid="7819434542155181607">"管理儲存空間"</string>
     <string name="automatic_storage_manager_text" msgid="4562950476680600604">"儲存空間管理員會將已備份的相片和影片從裝置中移除，藉此釋出儲存空間。"</string>
     <string name="automatic_storage_manager_days_title" msgid="2017913896160914647">"移除相片和影片"</string>
@@ -3573,6 +3629,7 @@
     <string name="ambient_display_pickup_summary" product="device" msgid="8256669101643381568">"拿起裝置即可查看時間、通知圖示和其他資訊。"</string>
     <string name="ambient_display_pickup_suggestion_summary" msgid="7014700589991761035">"在螢幕關閉時查看通知"</string>
     <string name="fingerprint_swipe_for_notifications_title" msgid="5816346492253270243">"滑動感應指紋以查看通知"</string>
+    <string name="fingerprint_gesture_screen_title" msgid="8562169633234041196">"滑動手指"</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>
@@ -3581,14 +3638,15 @@
     <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_connectivity" msgid="3361344735430813695">"請先連上網際網路"</string>
+    <string name="oem_unlock_enable_disabled_summary_connectivity_or_locked" msgid="2479038689567925511">"請連上網際網路或與你的電信業者聯絡"</string>
     <string name="oem_unlock_enable_disabled_summary_sim_locked_device" msgid="4149387448213399630">"綁定特定電信業者服務的裝置無法使用"</string>
+    <string name="oem_lock_info_message" msgid="9218313722236417510">"請重新啟動裝置以啟用裝置保護功能。"</string>
     <string name="automatic_storage_manager_freed_bytes" msgid="7517560170441007788">"總共釋出 <xliff:g id="SIZE">%1$s</xliff:g>\n\n上次執行日期：<xliff:g id="DATE">%2$s</xliff:g>"</string>
     <string name="web_action_enable_title" msgid="4051513950976670853">"免安裝應用程式"</string>
     <string name="web_action_enable_summary" msgid="3108127559723396382">"即使未安裝應用程式，也能在當中開啟連結"</string>
     <string name="web_action_section_title" msgid="7364647086538399136">"免安裝應用程式"</string>
-    <string name="instant_apps_account" msgid="1433620209791992528">"免安裝應用程式帳戶"</string>
+    <string name="instant_apps_settings" msgid="8827777916518348213">"免安裝應用程式偏好設定"</string>
     <string name="domain_url_section_title" msgid="7046835219056428883">"已安裝的應用程式"</string>
     <string name="automatic_storage_manager_activation_warning" msgid="6353100011690933254">"你的儲存空間目前是由儲存空間管理員管理"</string>
     <string name="account_for_section_header" msgid="5356566418548737121">"<xliff:g id="USER_NAME">%1$s</xliff:g>的帳戶"</string>
@@ -3635,7 +3693,9 @@
     <string name="enterprise_privacy_always_on_vpn_personal" msgid="9217774730260037434">"已開啟你個人設定檔中的「永久連線的 VPN」"</string>
     <string name="enterprise_privacy_always_on_vpn_work" msgid="7244472958208315814">"已開啟你 Work 設定檔中的「永久連線的 VPN」"</string>
     <string name="enterprise_privacy_global_http_proxy" msgid="7936664553416257333">"已設定全域 HTTP Proxy"</string>
-    <string name="enterprise_privacy_ca_certs" msgid="5885892204903688909">"信任的憑證"</string>
+    <string name="enterprise_privacy_ca_certs_device" msgid="2019652712782510262">"信任的憑證"</string>
+    <string name="enterprise_privacy_ca_certs_personal" msgid="2279084820904076599">"你的個人設定檔中安裝的信任的憑證"</string>
+    <string name="enterprise_privacy_ca_certs_work" msgid="6187377647815301809">"你的 Work 設定檔中安裝的信任的憑證"</string>
     <plurals name="enterprise_privacy_number_ca_certs" formatted="false" msgid="526375234629534165">
       <item quantity="other">最少有 <xliff:g id="COUNT_1">%d</xliff:g> 個 CA 憑證</item>
       <item quantity="one">最少有 <xliff:g id="COUNT_0">%d</xliff:g> 個 CA 憑證</item>
@@ -3689,6 +3749,8 @@
     <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="show_operator_name_title" msgid="805135053530442951">"網路名稱"</string>
+    <string name="show_operator_name_summary" msgid="5962567590205757550">"在狀態列顯示網路名稱"</string>
     <string name="storage_manager_indicator" msgid="1516810749625915020">"儲存空間管理員：<xliff:g id="STATUS">^1</xliff:g>"</string>
     <string name="storage_manager_indicator_off" msgid="7488057587180724388">"關閉"</string>
     <string name="storage_manager_indicator_on" msgid="8625551710194584733">"開啟"</string>
@@ -3698,6 +3760,8 @@
     <string name="carrier_provisioning" msgid="4398683675591893169">"電信業者佈建資訊"</string>
     <string name="trigger_carrier_provisioning" msgid="3434865918009286187">"觸發電信業者佈建程序"</string>
     <string name="new_device_suggestion_title" msgid="698847081680980774">"有什麼新奇功能？"</string>
-    <string name="new_device_suggestion_summary" msgid="7172709269203435870">"查看前 5 大熱門功能"</string>
+    <string name="new_device_suggestion_summary" product="default" msgid="206396571522515855">"認識你的新手機"</string>
+    <string name="new_device_suggestion_summary" product="tablet" msgid="393751455688210956">"認識你的新平板電腦"</string>
+    <string name="new_device_suggestion_summary" product="device" msgid="2939870049868336652">"認識你的新裝置"</string>
     <string name="disabled_low_ram_device" msgid="3751578499721173344">"這個裝置不支援此功能"</string>
 </resources>
diff --git a/res/values-zu/arrays.xml b/res/values-zu/arrays.xml
index df1e995..20534f9 100644
--- a/res/values-zu/arrays.xml
+++ b/res/values-zu/arrays.xml
@@ -100,8 +100,6 @@
     <!-- no translation found for wifi_security_no_eap:0 (2084555984818107151) -->
     <!-- no translation found for wifi_security_no_eap:1 (397579322683471524) -->
     <!-- no translation found for wifi_security_no_eap:2 (1968820975358150484) -->
-    <!-- no translation found for wifi_ap_security:0 (5251664683198623324) -->
-    <!-- no translation found for wifi_ap_security:1 (7989073072260294673) -->
   <string-array name="wifi_eap_method">
     <item msgid="1160193392455075561">"I-PEAP"</item>
     <item msgid="7981731051382306293">"i-TLS"</item>
diff --git a/res/values-zu/strings.xml b/res/values-zu/strings.xml
index c5ab981..473dfcf 100644
--- a/res/values-zu/strings.xml
+++ b/res/values-zu/strings.xml
@@ -166,7 +166,7 @@
     <string name="bluetooth_map_acceptance_dialog_text" msgid="8712508202081143737">"I-%1$s ifuna ukufinyelela kumilayezo yakho. Nikeza ukufinyelela ku-%2$s?"</string>
     <string name="bluetooth_sap_request" msgid="2669762224045354417">"Isicelo sokufinyelela ku-SIM"</string>
     <string name="bluetooth_sap_acceptance_dialog_text" msgid="4414253873553608690">"I-<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g> ifuna ukufinyelela kukhadi lakho le-SIM. Ukunikeza ukufinyelela kukhadi le-SIM kuzokhubaza ukuxhumeka kwedatha kudivayisi yakho ngesikhathi sokuxhumeka. Nikeza ukufinyelela ku-<xliff:g id="DEVICE_NAME_1">%2$s?</xliff:g>"</string>
-    <string name="bluetooth_device_name_summary" msgid="4757990010751789977">"Kubonakala njenge-\'<xliff:g id="DEVICE_NAME">^1</xliff:g>\' kwamanye amadivayisi"</string>
+    <string name="bluetooth_device_name_summary" msgid="522235742194965734">"Kubonakala njenge-\"<xliff:g id="DEVICE_NAME">^1</xliff:g>\" kwamanye amadivayisi"</string>
     <string name="bluetooth_paired_device_title" msgid="8638994696317952019">"Amadivayisi akho"</string>
     <string name="bluetooth_pairing_page_title" msgid="7712127387361962608">"Bhanqa idivayisi entsha"</string>
     <string name="date_and_time" msgid="9062980487860757694">"Idethi nesikhathi"</string>
@@ -312,6 +312,8 @@
     <string name="zone_auto" msgid="334783869352026648">"Umkhawulo wesikhathi ozenzakalelayo"</string>
     <string name="zone_auto_summaryOn" msgid="6142830927278458314">"Sebenzisa umkhawulo wesikhathi esinikeziwe senethiwekhi"</string>
     <string name="zone_auto_summaryOff" msgid="2597745783162041390">"Sebenzisa isikhathi somkhawulo esinikeziwe senethiwekhi"</string>
+    <string name="date_time_24hour_auto" msgid="2117383168985653422">"Ifomethi ezenzakalelayo yamahora angu-24"</string>
+    <string name="date_time_24hour_auto_summary" msgid="6351812925651480277">"Sebenzisa okuzenzakalelayo kwasendaweni"</string>
     <string name="date_time_24hour_title" msgid="3203537578602803850">"24‑ihora ngefomethi"</string>
     <string name="date_time_24hour" msgid="1193032284921000063">"Sebenzisa ifomethi ye-24 amahora"</string>
     <string name="date_time_set_time_title" msgid="6296795651349047016">"Isikhathi"</string>
@@ -372,6 +374,9 @@
     <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="1961957425135180242">"Okulandelayo"</string>
+    <string name="setup_fingerprint_enroll_skip_title" msgid="362050541117362034">"Yeqa izigxivizo zeminwe?"</string>
+    <string name="setup_fingerprint_enroll_skip_after_adding_lock_text" msgid="958990414356204763">"Ukusethwa kwezigxivizo zeminwe kuthatha iminithi noma amabili kuphela. Uma weqa lokhu, ungangeza izigxivizo zakho zeminwe ngemuva kwesikhathi kuzilungiselelo."</string>
+    <string name="lock_screen_intro_skip_title" msgid="4988210105913705679">"Yeqa ukukhiya isikrini?"</string>
     <string name="lock_screen_intro_skip_dialog_text_frp" product="tablet" msgid="1581834104051243425">"Izici zokuvikela idivayisi ngeke zivulwe. Ngeke ukwazi ukugwema abanye ukuthi bangasebenzisi le thebhulethi uma ilahlekile, itshontshiwe noma ilele."</string>
     <string name="lock_screen_intro_skip_dialog_text_frp" product="device" msgid="4629503416877189572">"Izici zokuvikela idivayisi ngeke zivulwe. Ngeke ukwazi ukugwema abanye ukuthi bangasebenzisi le divayisi uma ilahlekile, itshontshiwe noma ilele."</string>
     <string name="lock_screen_intro_skip_dialog_text_frp" product="default" msgid="2423428240245737909">"Izici zokuvikela idivayisi ngeke zivulwe. Ngeke ukwazi ukugwema abanye ukuthi bangasebenzisi le foni uma ilahlekile, itshontshiwe noma ilele."</string>
@@ -457,7 +462,7 @@
     <string name="setup_lock_settings_picker_title" product="tablet" msgid="90329443364067215">"Vikela ithebulethi yakho"</string>
     <string name="setup_lock_settings_picker_title" product="device" msgid="2399952075134938929">"Vikela idivayisi yakho"</string>
     <string name="setup_lock_settings_picker_title" product="default" msgid="1572244299605153324">"Vikela ifoni yakho"</string>
-    <string name="setup_lock_settings_picker_fingerprint_message" msgid="5585650064305600578">"Ngokuvikela okungeziwe, setha isikrini sokukhiya."</string>
+    <string name="lock_settings_picker_fingerprint_added_security_message" msgid="5768002109707648463">"Ngokuvikela okungeziwe, setha isipele sesikrini sokukhiya."</string>
     <string name="setup_lock_settings_picker_message" product="tablet" msgid="8919671129189936210">"Vimbela abanye kusukela ekusebenziseni le thebulethi ngaphandle kwemvume yakho ngokwenza kusebenze izici zokuvikela idivayisi. Khetha ukukhiya isikrini ofuna ukusisebenzisa."</string>
     <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>
@@ -588,6 +593,7 @@
     <string name="lockpassword_pin_no_sequential_digits" msgid="680765285206990584">"Ukwenyuka, ukwehla, noma uchungechunge olwehlayo lamadijithi alivunyewe"</string>
     <string name="lockpassword_ok_label" msgid="313822574062553672">"KULUNGILE"</string>
     <string name="lockpassword_cancel_label" msgid="8818529276331121899">"Khansela"</string>
+    <string name="lockpassword_clear_label" msgid="5724429464960458155">"Sula"</string>
     <string name="lockpattern_tutorial_cancel_label" msgid="6431583477570493261">"Khansela"</string>
     <string name="lockpattern_tutorial_continue_label" msgid="3559793618653400434">"Okulandelayo"</string>
     <string name="lock_setup" msgid="3355847066343753943">"Ukusetha kuphelile."</string>
@@ -781,6 +787,7 @@
     <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>
@@ -817,6 +824,8 @@
     <string name="wifi_wps_available_first_item" msgid="4422547079984583502">"i-WPS iyatholakala"</string>
     <string name="wifi_wps_available_second_item" msgid="8427520131718215301">" (i-WPS iyatholakala)"</string>
     <string name="wifi_wps_nfc_enter_password" msgid="2288214226916117159">"Faka iphasiwedi yakho yenethiwekhi"</string>
+    <string name="wifi_carrier_connect" msgid="8174696557882299911">"Inethiwekhi ye-Wi-Fi yenkampani yenethiwekhi"</string>
+    <string name="wifi_carrier_content" msgid="4634077285415851933">"Xhuma nge-<xliff:g id="NAME">%1%s</xliff:g>"</string>
     <string name="wifi_scan_always_turnon_message" msgid="203123538572122989">"Ukuze kuthuthukiswe ukufaneleka kwendawo nezinye izinjongo, i-<xliff:g id="APP_NAME">%1$s</xliff:g> ifuna ukuvula ukuskena kwenethiwekhi, noma ngabe i-Wi-Fi ivaliwe.\n\nVumela lokhu ngazo zonke izinhlelo zokusebenza ezifuna ukuskena?"</string>
     <string name="wifi_scan_always_turnoff_message" msgid="5538901671131941043">"Ukuze uvale lokhu, iya ku-Okuthuthukile kwimenyu yokuningi."</string>
     <string name="wifi_scan_always_confirm_allow" msgid="5355973075896817232">"Vumela"</string>
@@ -834,6 +843,7 @@
     <string name="wifi_connect" msgid="1076622875777072845">"Xhuma kwi-inthanethi"</string>
     <string name="wifi_failed_connect_message" msgid="8491902558970292871">"Yehlulekile ukuxhuma kunethiwekhi"</string>
     <string name="wifi_forget" msgid="8168174695608386644">"Khohlwa"</string>
+    <string name="wifi_modify" msgid="6100248070440710782">"Lungisa"</string>
     <string name="wifi_failed_forget_message" msgid="1348172929201654986">"Yehlulekile ukukhohlwa inethiwekhi"</string>
     <string name="wifi_save" msgid="3331121567988522826">"Londoloza"</string>
     <string name="wifi_failed_save_message" msgid="6650004874143815692">"Yehlulekile ukulondoloza inethiwekhi"</string>
@@ -846,6 +856,7 @@
     <string name="wifi_advanced_titlebar" msgid="4485841401774142908">"Ukuxhumana kungenazintambo okuphambili"</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_title" msgid="3471132676909349382">"Ulwazi lwenethiwekhi"</string>
     <string name="wifi_details_subnet_mask" msgid="6720279144174924410">"Imaski ye-subnet"</string>
     <string name="wifi_details_dns" msgid="8648826607751830768">"I-DNS"</string>
     <string name="wifi_details_ipv6_address_header" msgid="6734119149106422148">"Amakheli e-IPv6"</string>
@@ -878,16 +889,15 @@
     <string name="wifi_p2p_cancel_connect_title" msgid="255267538099324413">"Khansela isimemo?"</string>
     <string name="wifi_p2p_cancel_connect_message" msgid="7477756213423749402">"Ingabe ufuna ukukhansela isimemo ukuze uxhume ne-<xliff:g id="PEER_NAME">%1$s</xliff:g>?"</string>
     <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_off_subtext" msgid="5466126533609394170">"Akukho ukwabelana kwe-inthanethi noma okuqukethwe namanye amadivayisi"</string>
     <string name="wifi_hotspot_tethering_on_subtext" product="tablet" msgid="5752490509369962007">"Ukwabiwa ukuxhumeka kwe-inthanethi kwale thebulethi nge-hotspot"</string>
     <string name="wifi_hotspot_tethering_on_subtext" product="default" msgid="6461075246164300670">"Ukwabiwa ukuxhumeka kwe-inthanethi kwale foni nge-hotspot"</string>
     <string name="wifi_hotspot_on_local_only_subtext" msgid="2068110388011294735">"Uhlelo lokusebenza labelana ngokuqukethwe. Ukuze wabelane ngoxhumo lwe-inthanethi, vala i-hotspot, bese uyivule"</string>
-    <string name="wifi_hotspot_name_title" msgid="1341735529132128887">"Igama le-Wi‑Fi"</string>
+    <string name="wifi_hotspot_name_title" msgid="8237000746618636778">"Igama le-Hotspot"</string>
     <string name="wifi_hotspot_name_summary_connecting" msgid="3378299995508671967">"Ivula i-<xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>..."</string>
     <string name="wifi_hotspot_name_summary_connected" msgid="3888672084861445362">"Amanye amadivayisi angaxhuma ku-<xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>"</string>
-    <string name="wifi_hotspot_password_title" msgid="1955592302902091281">"Iphasiwedi ye-Wi-Fi"</string>
+    <string name="wifi_hotspot_password_title" msgid="8676859981917573801">"Iphasiwedi ye-Hotspot"</string>
     <string name="wifi_hotspot_ap_band_title" msgid="1165801173359290681">"I-AP Band"</string>
     <string name="wifi_hotspot_footer_info_regular" msgid="1203489406068036455">"Sebenzisa i-hotspot ukudala inethiwekhi ye-Wi‑Fi yamanye amadivayisi akho. I-Hotspot inikezela nge-inthanethi isebenzisa uxhumo lwedatha yakho yeselula. Amashaji edatha yeselula angeziwe angasebenza."</string>
     <string name="wifi_hotspot_footer_info_local_only" msgid="857988412470694109">"Izinhlelo zokusebenza zingadala i-hotspot ukwabelana ngokuqukethwe namadivayisi aseduze."</string>
@@ -898,7 +908,6 @@
     <string name="wifi_tether_configure_ap_text" msgid="7974681394041609308">"Setha i-Wi-Fi hotspot"</string>
     <string name="wifi_hotspot_configure_ap_text" msgid="5478614731464220432">"Ukusetha i-Wi‑Fi hotspot"</string>
     <string name="wifi_hotspot_configure_ap_text_summary" msgid="5560680057727007011">"I-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> i-hotspot"</string>
     <string name="wifi_tether_configure_ssid_default" msgid="8467525402622138547">"Indawo ye-Android"</string>
     <string name="wifi_calling_settings_title" msgid="4102921303993404577">"Ukushaya kwe-Wi-Fi"</string>
     <string name="wifi_calling_suggestion_title" msgid="9008010480466359578">"Vula ukushaya kwe-Wi-Fi"</string>
@@ -939,7 +948,7 @@
     <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="emergency_address_summary" msgid="3266760199681945746">"Ikheli elisetshenziswa amasevisi esimo esiphuthumayo njengendawo yakho uma wenza ikholi yesimo esiphuthumayo usebenzisa i-Wi-Fi"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"Ukubukeka"</string>
     <string name="sound_settings" msgid="5534671337768745343">"Umsindo"</string>
     <string name="all_volume_title" msgid="4296957391257836961">"Amavolumu"</string>
@@ -993,6 +1002,7 @@
     <string name="search_settings" msgid="1910951467596035063">"Sesha"</string>
     <string name="search_settings_summary" msgid="9205656546570654169">"Phatha izilungiselelo zokusesha nomlando"</string>
     <string name="search_settings_no_results" msgid="8799027492641230999">"Akukho miphumela"</string>
+    <string name="search_clear_history" msgid="4196658962573162457">"Sula umlando"</string>
     <string name="display_settings" msgid="7965901687241669598">"Ukubukeka"</string>
     <string name="accelerometer_title" msgid="7854608399547349157">"Phendula iskrini ngokuzenzakalela"</string>
     <string name="color_mode_title" msgid="3159275920408338215">"Imibala ekhanya kakhulu"</string>
@@ -1122,7 +1132,6 @@
     <string name="baseband_version" msgid="1848990160763524801">"Inguqulo ye-Baseband"</string>
     <string name="kernel_version" msgid="9192574954196167602">"Inguqulo ye-Kernel"</string>
     <string name="build_number" msgid="3075795840572241758">"Inombolo yesakhi"</string>
-    <string name="selinux_status" msgid="6212165375172061672">"Isimo se-SELinux"</string>
     <string name="device_info_not_available" msgid="8062521887156825182">"Akutholakali"</string>
     <string name="device_status_activity_title" msgid="1411201799384697904">"Isimo"</string>
     <string name="device_status" msgid="607405385799807324">"Isimo"</string>
@@ -1150,7 +1159,6 @@
     <string name="status_wifi_mac_address" msgid="2202206684020765378">"Ikheli le-Wi-Fi MAC"</string>
     <string name="status_bt_address" msgid="4195174192087439720">"Ikheli le-Bluetooth"</string>
     <string name="status_serial_number" msgid="2257111183374628137">"Inombolo yomkhiqizo"</string>
-    <string name="status_unavailable" msgid="7862009036663793314">"Ayitholakali"</string>
     <string name="status_up_time" msgid="7294859476816760399">"Isikhathi esiphezulu"</string>
     <string name="status_awake_time" msgid="2393949909051183652">"Isikhathi sokuphaphama"</string>
     <string name="internal_memory" msgid="9129595691484260784">"Isitoreji sangaphakathi"</string>
@@ -1327,6 +1335,7 @@
     <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>
     <string name="reset_dashboard_title" msgid="6254873816990678620">"Izinketho zokusetha kabusha"</string>
+    <string name="reset_dashboard_summary" msgid="4851012632493522755">"Inethiwekhi, izinhlelo zokusebenza, noma idivayisi ingasethwa kabusha"</string>
     <string name="reset_network_title" msgid="6166025966016873843">"Setha kabusha i-Wi-Fi, iselula ne-Bluetooth"</string>
     <string name="reset_network_desc" msgid="5547979398298881406">"Lokhu kuzosetha kabusha zonke izilungiselelo zenethiwekhi ezifaka:\n\n"<li>"i-Wi‑Fi"</li>\n<li>"Idatha yeselula"</li>\n<li>"ne-Bluetooth"</li></string>
     <string name="reset_network_button_text" msgid="2035676527471089853">"Setha kabusha izilungiselelo"</string>
@@ -1335,17 +1344,14 @@
     <string name="reset_network_confirm_title" msgid="1759888886976962773">"Setha kabusha?"</string>
     <string name="network_reset_not_available" msgid="7188610385577164676">"Ukusetha kabusha inethiwekhi akutholakali kulo msebenzisi"</string>
     <string name="reset_network_complete_toast" msgid="787829973559541880">"Izilungiselelo zenethiwekhi zisethwe kabusha"</string>
-    <string name="master_clear_title" msgid="6617679904229218425">"Sula yonke idatha (Ukusetha kabusha njengasekuqaleni)"</string>
-    <plurals name="master_clear_with_account_summary" formatted="false" msgid="5911377203778818712">
-      <item quantity="one"><xliff:g id="ACCOUNT_COUNT">%1$d</xliff:g> ama-akhawunti azosethwa kabusha</item>
-      <item quantity="other"><xliff:g id="ACCOUNT_COUNT">%1$d</xliff:g> ama-akhawunti azosethwa kabusha</item>
-    </plurals>
-    <string name="master_clear_summary" msgid="6902443944660426951">"Isitoreji sangaphakathi nayo yonke idatha kuzosethwa kabusha"</string>
+    <string name="master_clear_title" msgid="3531267871084279512">"Sula yonke idatha (ukusethwa kabusha kwasekuqaleni)"</string>
     <string name="master_clear_desc" product="tablet" msgid="9146059417023157222">"Lokhu kuzosusa yonke idatha "<b>"ekwistoreji sangaphakathi kuthebhulethi yakho"</b>", ehlanganisa:\n\n"<li>"I-akhawunti yakho ye-Google"</li>\n<li>"Uhlelo lokusebenza kanye nezilungiselelo"</li>\n<li>"Izinhlelo zokusebenza ezilayishiwe"</li></string>
     <string name="master_clear_desc" product="default" msgid="4800386183314202571">"Lokhu kuzosusa yonke idatha "<b>"ekwisitoreji sangaphakathi sefoni yakho"</b>", ehlanganisa:\n\n"<li>"I-akhawunti yakho ye-Google"</li>\n<li>"Uhlelo lokusebenza kanye nezilungiselelo"</li>\n<li>"Izinhlelo zokusebenza ezilayishiwe"</li></string>
     <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n"Okwamanje ungene ngemvume kuma-akhawunti alandelayo:\n\n"</string>
     <string name="master_clear_other_users_present" product="default" msgid="5161423070702470742">\n\n"Kukhona abanye abasebenzisi abakhona kule divayisi.\n"</string>
     <string name="master_clear_desc_also_erases_external" msgid="1903185203791274237"><li>"Umculo"</li>\n<li>"Izithombe"</li>\n<li>"Enye idatha yomsebenzisi"</li></string>
+    <string name="master_clear_desc_also_erases_esim" msgid="312352697653096008"><li>"Izinkampani zenethiwekhi ku-eSIM"</li></string>
+    <string name="master_clear_desc_no_cancel_mobile_plan" msgid="5460926449093211144">\n\n"Lokhu ngeke kukhansele uhlelo lwakho lwesevisi yefoni."</string>
     <string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="7744115866662613411">\n\n"Ukusula futhi umculo, izithombe, nenye idatha yomsebenzisi, "<b>" indawo yokugcina ye-USB"</b>"idinga ukusulwa."</string>
     <string name="master_clear_desc_erase_external_storage" product="default" msgid="4801026652617377093">\n\n"Ukusula umculo, izithombe, nenye imininingo yomsebenzisi, "<b>"ikhadi le-SD"</b>"kumele lisuswe."</string>
     <string name="erase_external_storage" product="nosdcard" msgid="969364037450286809">"Susa isitoreji se-USB"</string>
@@ -1462,15 +1468,16 @@
     <string name="settings_safetylegal_activity_title" msgid="6901214628496951727">"Ulwazi lokuvikeleka"</string>
     <string name="settings_safetylegal_activity_unreachable" msgid="250674109915859456">"Awunalo uxhumano lwedatha. Ukubuka lokhu kwaziswa manje, iya ku-%s kunoma iyiphi ikhompuyutha exhunywe kwi-Inthanethi."</string>
     <string name="settings_safetylegal_activity_loading" msgid="8059022597639516348">"Iyalayisha…"</string>
-    <string name="lockpassword_choose_your_password_header" msgid="8624900666929394990">"Khetha iphasiwedi yakho"</string>
-    <string name="lockpassword_choose_your_password_header_for_fingerprint" msgid="6624409510609085450">"Ukuze usebenzise izigxivizo zeminwe, setha iphasiwedi"</string>
-    <string name="lockpassword_choose_your_pattern_header" msgid="6949761069941694050">"Khetha iphathini yakho"</string>
-    <string name="lockpassword_choose_your_pattern_header_for_fingerprint" msgid="5901096361617543819">"Ukuze usebenzise izigxivizo zeminwe, setha iphethini"</string>
-    <string name="lockpassword_choose_your_pin_header" msgid="7598849519816138302">"Khetha i-PIN yakho"</string>
-    <string name="lockpassword_choose_your_pin_header_for_fingerprint" msgid="765344692615917183">"Ukuze usebenzise izigxivizo zeminwe, setha iphinikhodi"</string>
-    <string name="lockpassword_confirm_your_password_header" msgid="6308478184889846633">"Qinisekisa iphasiwedi yakho"</string>
+    <string name="lockpassword_choose_your_screen_lock_header" msgid="3872462096767152394">"Setha ukukhiya kwesikrini"</string>
+    <string name="lockpassword_choose_your_password_message" msgid="1197569283524841412">"Ngokuphepha, setha iphasiwedi"</string>
+    <string name="lockpassword_choose_your_password_header_for_fingerprint" msgid="2541818487015343503">"Ukuze usebenzise izigxivizo zeminwe, setha iphasiwedi"</string>
+    <string name="lockpassword_choose_your_pattern_header_for_fingerprint" msgid="7709785406243556723">"Ukuze usebenzise izigxivizo zeminwe, setha iphethini"</string>
+    <string name="lockpassword_choose_your_pin_message" msgid="1875420718677275646">"Ngokuphepha, setha i-PIN"</string>
+    <string name="lockpassword_choose_your_pin_header_for_fingerprint" msgid="1549639053195796674">"Ukuze usebenzise isigxivizo somunwe, setha i-PIN"</string>
+    <string name="lockpassword_choose_your_pattern_message" msgid="5986983400689720015">"Ngokuphepha, setha iphethini"</string>
+    <string name="lockpassword_confirm_your_password_header" msgid="1266027268220850931">"Faka kabusha iphasiwedi yakho"</string>
     <string name="lockpassword_confirm_your_pattern_header" msgid="7543433733032330821">"Qinisekisa iphathini yakho"</string>
-    <string name="lockpassword_confirm_your_pin_header" msgid="49038294648213197">"Qinisekisa i-PIN yakho"</string>
+    <string name="lockpassword_confirm_your_pin_header" msgid="7744513791910572550">"Faka kabusha i-PIN yakho"</string>
     <string name="lockpassword_confirm_passwords_dont_match" msgid="5140892109439191415">"Amaphasiwedi awafani"</string>
     <string name="lockpassword_confirm_pins_dont_match" msgid="7226244811505606217">"Ama-PIN awafani"</string>
     <string name="lockpassword_choose_lock_generic_header" msgid="3811438094903786145">"Okukhethwa kukho kokuvula"</string>
@@ -1489,6 +1496,12 @@
     <string name="lockpassword_strong_auth_required_work_pattern" msgid="3003781907040522053">"Ngokuphepha okungeziwe, faka iphethini yakho yomsebenzi"</string>
     <string name="lockpassword_strong_auth_required_work_pin" msgid="3367491332598821552">"Ngokuphepha okungeziwe, faka i-PIN yakho yomsebenzi"</string>
     <string name="lockpassword_strong_auth_required_work_password" msgid="8159775129968582940">"Ngokuphepha okungeziwe, faka iphasiwedi yakho yomsebenzi"</string>
+    <string name="lockpassword_confirm_your_pattern_details_frp" msgid="6757336656791723193">"Ifoni yakho isethwe kabusha yaya kuzilungiselelo zasekuqaleni. Ukuze usebenzise le foni, faka iphethini yangaphambilini."</string>
+    <string name="lockpassword_confirm_your_pin_details_frp" msgid="826520613445990470">"Ifoni yakho isethwe kabusha yaya kuzilungiselelo zasekuqaleni. Ukuze usebenzise le foni, faka iphinikhodi yakho yangaphambilini."</string>
+    <string name="lockpassword_confirm_your_password_details_frp" msgid="8944081074615739040">"Ifoni yakho isethwe kabusha yaya kuzilungiselelo zasekuqaleni. Ukuze usebenzise le foni, sicela ufake iphasiwedi yakho yangaphambilini."</string>
+    <string name="lockpassword_confirm_your_pattern_header_frp" msgid="2898036091609128286">"Qinisekisa iphethini"</string>
+    <string name="lockpassword_confirm_your_pin_header_frp" msgid="4141601774778898803">"Qinisekisa iphinikhodi"</string>
+    <string name="lockpassword_confirm_your_password_header_frp" msgid="3762615419295360480">"Qinisekisa iphasiwedi"</string>
     <string name="lockpassword_invalid_pin" msgid="15588049067548470">"Iphinikhodi engalungile"</string>
     <string name="lockpassword_invalid_password" msgid="4038507398784975200">"Iphasiwedi engalungile"</string>
     <string name="lockpattern_need_to_unlock_wrong" msgid="1745247595356012176">"Iphethini engalungile"</string>
@@ -1538,7 +1551,6 @@
     <string name="install_applications_title" msgid="4987712352256508946">"Vumela yonke imithombo yohlelo lokusebenza"</string>
     <string name="recent_app_category_title" msgid="6673071268966003928">"Izinhlelo zokusebenze ezisanda kuvuleka"</string>
     <string name="see_all_apps_title" msgid="1317153498074308438">"Bona zonke izinhlelo zokusebenza ezingu-<xliff:g id="COUNT">%1$d</xliff:g>"</string>
-    <string name="recent_app_summary" msgid="3366446669844932300">"<xliff:g id="TIME">^1</xliff:g> okwedlule"</string>
     <string name="install_all_warning" product="tablet" msgid="8310489909586138165">"Ithebulethi yakho nedatha yomuntu siqu kusengcupheni enkulu ukuthi kungahlaselwa izinhlelo zokusebenza ezingaziwa. Ngokufaka izinhlelo zokusebenza kusukela kulo mthombo, uyavuma ukuthi unesibopho sanoma ikuphi ukonakala kuthebulethi yakho noma ukulahlekelwa idatha okungabangelwa ukusetshenziswa kwazo."</string>
     <string name="install_all_warning" product="default" msgid="1952257127370115988">"Ifoni yakho nedatha yomuntu siqu kusengcupheni enkulu ukuthi kungahlaselwa izinhlelo zokusebenza ezingaziwa. Ngokufaka izinhlelo zokusebenza kusukela kulo mthombo, uyavuma ukuthi unesibopho sanoma ikuphi ukonakala kufoni yakho noma ukulahlekelwa idatha okungabangelwa ukusetshenziswa kwazo."</string>
     <string name="advanced_settings" msgid="1777249286757067969">"Izilungiselelo ezithuthukisiwe"</string>
@@ -1802,7 +1814,7 @@
     <string name="accessibility_settings_summary" msgid="981260486011624939">"Izifundi zesikrini, ukuboniswa nezilawuli zokuzibandakanya"</string>
     <string name="vision_settings_title" msgid="4204111425716868288">"Izilungiselelo zokubonakala"</string>
     <string name="vision_settings_description" msgid="5679491180156408260">"Ungenza ngendlela oyifisayo le divayisi ukuze ihlangabezane nezidingo zakho. Lezi zici ezingafinyeleleka zingashintshwa ngemuva kwesikhathi kuzilungiselelo."</string>
-    <string name="vision_settings_suggestion_title" msgid="917294957154878441">"Khulisa usayizi wombhalo"</string>
+    <string name="vision_settings_suggestion_title" msgid="8058794060304707004">"Shintsha usayizi wefonti"</string>
     <string name="screen_reader_category_title" msgid="7739154903913400641">"Izifundi zesikrini"</string>
     <string name="audio_and_captions_category_title" msgid="3420727114421447524">"Umsindo nombhalo okusikrini"</string>
     <string name="display_category_title" msgid="685461049938269166">"Bonisa"</string>
@@ -1839,7 +1851,6 @@
     <string name="accessibility_display_inversion_preference_subtitle" msgid="7052959202195368109">"Ingaphazamisa ukusebenza"</string>
     <string name="accessibility_autoclick_preference_title" msgid="7014499339068449623">"Chofoza ngemuva kokuthi isikhombisi siyeke ukuhamba"</string>
     <string name="accessibility_autoclick_delay_preference_title" msgid="3962261178385106006">"Bambezela ngaphambi kokuchofoza"</string>
-    <string name="preference_summary_default_combination" msgid="8532964268242666060">"<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">"VULIWE"</string>
     <string name="accessibility_summary_state_disabled" msgid="2241315620132005595">"VALIWE"</string>
     <string name="enable_quick_setting" msgid="2366999897816894536">"Bonisa Kuzilungiselelo Ezisheshayo"</string>
@@ -1958,12 +1969,14 @@
     <string name="background_activity_summary_on" msgid="649282072540085599">"Uhlelo lokusebenza lingasebenza ngasemuva uma lingasebenzi"</string>
     <string name="background_activity_summary_off" msgid="7666330699090632040">"Umsebenzi wangasemuva wohlelo lokusebenza ukhawulelwe uma ungasebenzi"</string>
     <string name="background_activity_summary_disabled" msgid="3710669050484599847">"Uhlelo lokusebenza alivunyelwe ukubuyela ngasemuva"</string>
+    <string name="background_activity_summary_whitelisted" msgid="7375400051141016808">"Uhlelo lokusebenza alukwazi ukuthuthukiselwa ukusetshenziswa kwebhethri"</string>
+    <string name="background_activity_warning_dialog_title" msgid="2216249969149568871">"Khawulela umsebenzi wasemuva?"</string>
+    <string name="background_activity_warning_dialog_text" msgid="7049624449246121981">"Uma ukhawulela umsebenzi wangasemuva wohlelo lokusebenza, lungahle lungasebenzi kahle"</string>
     <string name="device_screen_usage" msgid="3386088035570409683">"Ukusebenzisa kwesikrini kusuka ekushajeni okuphelele"</string>
     <string name="device_screen_consumption" msgid="4607589286438986687">"Ukusetshenziswa kwesikrini"</string>
     <string name="device_cellular_network" msgid="4724773411762382950">"Ukuskena kwenethiwekhi yeselula"</string>
-    <string name="power_last_full_charge_summary" msgid="532845389094620657">"<xliff:g id="TIME">^1</xliff:g> okwedlule"</string>
-    <string name="power_usage_list_summary" msgid="6775339745194635000">"Ukusebenza kohlelo lokusebenza kusuka ekushajeni okuphelele (<xliff:g id="TIME">^1</xliff:g> okwedlule)"</string>
-    <string name="power_usage_list_summary_device" msgid="7036566616386864302">"Ukusetshenziswa kwedivayisi kusukela ngemuva kokushajwa kugcwale (<xliff:g id="TIME">^1</xliff:g> edlule)"</string>
+    <string name="power_usage_list_summary" msgid="6393929085382334341">"Ukusetshenziswa kohlelo lokusebenza kusuka ekushajeni okugcwele (<xliff:g id="RELATIVE_TIME">^1</xliff:g>)"</string>
+    <string name="power_usage_list_summary_device" msgid="4461926045610455423">"Ukusetshenziswa kwedivayisi kusuka ekushajeni okugcwele (<xliff:g id="RELATIVE_TIME">^1</xliff:g>)"</string>
     <string name="screen_usage_summary" msgid="6687403051423153550">"Inani lesikhathi isikrini sivuliwe kusuka ekushijeni okuphelele"</string>
     <string name="device_usage_list_summary" msgid="5623036661468763251">"Ukusebenza kwedivayisi kusuka ekushajeni okuphelele"</string>
     <string name="battery_since_unplugged" msgid="338073389740738437">"Ukusebenzisa ibhethri kusukela inqamuliwe"</string>
@@ -2209,14 +2222,14 @@
     <string name="credentials_unlock_hint" msgid="2301301378040499348">"Thayipha iphasiwedi yokulondoloza ukufakazela ubuqiniso"</string>
     <string name="credentials_old_password" msgid="7553393815538684028">"Iphasiwedi yamanje:"</string>
     <string name="credentials_reset_hint" msgid="6297256880896133631">"Susa konke okuqukethwe?"</string>
-    <string name="credentials_password_too_short" msgid="7502749986405522663">"Okungenani iphasiwedi kumele ibe nezinhlamvu ezingu-8."</string>
     <string name="credentials_wrong_password" msgid="2541932597104054807">"Iphasiwedi engalungile."</string>
     <string name="credentials_reset_warning" msgid="5320653011511797600">"Iphasiwedi engalungile. Unethuba lokugcina ngaphambi kokuba isitoreji sokufakazela ubuqiniso sisuswe."</string>
     <string name="credentials_reset_warning_plural" msgid="6514085665301095279">"Iphasiwedi engalungile. Unamathuba angu-<xliff:g id="NUMBER">%1$d</xliff:g> asele ngaphambi kokuba isitoreji sokufakazela ubuqiniso kusulwe."</string>
     <string name="credentials_erased" msgid="2907836028586342969">"Isitoreji sokuqinisekisa sisuliwe."</string>
     <string name="credentials_not_erased" msgid="7685932772284216097">"Ukulonda kokuqinisekia akwazanga ukusulwa."</string>
     <string name="credentials_enabled" msgid="7588607413349978930">"Isitoreji sokuqinisekisa sivunyelwe."</string>
-    <string name="credentials_configure_lock_screen_hint" msgid="6757119179588664966">"Kumele usethe iphinikhodi noma iphasiwedi yokukhiya isikrini ngaphambi kokusebenzisa ukugcina kokuqinisekisa."</string>
+    <string name="credentials_configure_lock_screen_hint" msgid="8058230497337529036">"Ngaphambi kokuthi usebenzise isitoreji sezitifiketi, idivayisi yakho kumele ibe nokukhiya isikrini okuvikelekile"</string>
+    <string name="credentials_configure_lock_screen_button" msgid="253239765216055321">"SETHA UKUKHIYA"</string>
     <string name="usage_access_title" msgid="332333405495457839">"Izinhlelo zokusebenza ezinokufinyelela kokusebenza"</string>
     <string name="emergency_tone_title" msgid="1055954530111587114">"Ithoni ephuthumayo"</string>
     <string name="emergency_tone_summary" msgid="722259232924572153">"Hlela ukuziphatha lapho ikholi oluphuthumayo lwenziwa"</string>
@@ -2336,8 +2349,6 @@
     <skip />
     <string name="cant_sync_dialog_title" msgid="2777238588398046285">"Ayikwazi ukuvumelanisa ngesandla"</string>
     <string name="cant_sync_dialog_message" msgid="1938380442159016449">"Ukuvumelanisa kwalentwana kuvimbelwe okwamanje. Ukushintsha okukhethwayo kwakho, vula idatha yasemuva nokuvumelanisa okuzenzakalelayo."</string>
-    <string name="wimax_settings" msgid="2655139497028469039">"4G"</string>
-    <string name="status_wimax_mac_address" msgid="8390791848661413416">"Ikheli le-4G MAC"</string>
     <string name="enter_password" msgid="8035706727471334122">"Ukuze uqale i-Android, faka iphasiwedi yakho"</string>
     <string name="enter_pin" msgid="5305333588093263790">"Ukuze uqale i-Android, faka iphinikhodi yakho"</string>
     <string name="enter_pattern" msgid="4187435713036808566">"Ukuze uqale i-Android, dweba iphethini yakho"</string>
@@ -2351,6 +2362,7 @@
     <string name="misc_files_selected_count" msgid="4647048020823912088">"kukhethwe <xliff:g id="NUMBER">%1$d</xliff:g> kokuyi <xliff:g id="TOTAL">%2$d</xliff:g>"</string>
     <string name="misc_files_selected_count_bytes" msgid="2876232009069114352">"<xliff:g id="NUMBER">%1$s</xliff:g> kwayi-<xliff:g id="TOTAL">%2$s</xliff:g>"</string>
     <string name="select_all" msgid="1562774643280376715">"Khetha konke"</string>
+    <string name="data_plan_usage_manage_plans_button_text" msgid="8997761990902708162">"Phatha izinhlelo"</string>
     <string name="data_usage_summary_title" msgid="3804110657238092929">"Ukusebenzisa idatha"</string>
     <string name="data_usage_app_summary_title" msgid="4147258989837459172">"Ukusetshenziswa kwedatha yohlelo lokusebenza"</string>
     <string name="data_usage_accounting" msgid="7170028915873577387">"Ukubalwa kwedatha yenkampani kungahluka kudivayisi yakho."</string>
@@ -2436,6 +2448,9 @@
     <string name="data_usage_metered_mobile" msgid="5423305619126978393">"Amanethiwekhi eselula"</string>
     <string name="data_usage_metered_wifi" msgid="1761738002328299714">"Amanethiwekhi we-Wi-Fi akaliwe"</string>
     <string name="data_usage_metered_wifi_disabled" msgid="727808462375941567">"Ukuze ukhethe amanethiwekhi akaliwe, vula i-Wi‑Fi."</string>
+    <string name="data_usage_metered_auto" msgid="1262028400911918865">"Okuzenzakalelayo"</string>
+    <string name="data_usage_metered_yes" msgid="9217539611385225894">"Kulinganisiwe"</string>
+    <string name="data_usage_metered_no" msgid="4025232961929071789">"Akulinganisiwe"</string>
     <string name="data_usage_disclaimer" msgid="6887858149980673444">"Ukubalwa kwedatha yenkampani kungahluka kudivayisi yakho."</string>
     <string name="cryptkeeper_emergency_call" msgid="198578731586097145">"Ikholi ephuthmayo"</string>
     <string name="cryptkeeper_return_to_call" msgid="5613717339452772491">"Buyela ekholini"</string>
@@ -2527,9 +2542,6 @@
     <string name="backup_pw_set_button_text" msgid="2387480910044648795">"Misa iphasiwedi yokusekela ngokulondoloza"</string>
     <string name="backup_pw_cancel_button_text" msgid="8845630125391744615">"Khansela"</string>
     <string name="additional_system_update_settings_list_item_title" msgid="214987609894661992">"Ukubuyekeza kwesistimu okwengeziwe"</string>
-    <string name="selinux_status_disabled" msgid="924551035552323327">"Kukhutshaziwe"</string>
-    <string name="selinux_status_permissive" msgid="6004965534713398778">"Kunemvume"</string>
-    <string name="selinux_status_enforcing" msgid="2252703756208463329">"Ukuphoqelela"</string>
     <string name="ssl_ca_cert_warning" msgid="2045866713601984673">"Inethiwekhi kungenzeka iqashiwe"</string>
     <string name="done_button" msgid="1991471253042622230">"Kwenziwe"</string>
     <plurals name="ssl_ca_cert_dialog_title" formatted="false" msgid="7145092748045794650">
@@ -2872,13 +2884,15 @@
     <string name="notifications_title" msgid="8086372779371204971">"Izaziso"</string>
     <string name="app_notifications_title" msgid="5810577805218003760">"Izaziso zohlelo lokusebenza"</string>
     <string name="notification_channel_title" msgid="2260666541030178452">"Isigaba sezaziso"</string>
+    <string name="notification_group_title" msgid="7180506440133859601">"Iqembu lesigaba sesaziso"</string>
     <string name="notification_importance_title" msgid="848692592679312666">"Ukubaluleka"</string>
-    <string name="notification_importance_unspecified" msgid="2196023702875112081">"Vumela uhlelo lokusebenza lunqume"</string>
+    <string name="notification_importance_unspecified" msgid="6622173510486113958">"Vumela umsindo"</string>
     <string name="notification_importance_blocked" msgid="7938180808339386300">"Ungalokothi ubonise izaziso"</string>
     <string name="notification_importance_min" msgid="5455049524984686275">"Awukho umsindo noma ukuphazamiseka okubukwayo"</string>
     <string name="notification_importance_low" msgid="8881468429453766553">"Awukho umsindo"</string>
     <string name="notification_importance_default" msgid="5958338024601957516">"Yenza umsindo"</string>
     <string name="notification_importance_high" msgid="2082429479238228527">"Yenza umsindo ne-pop kusikrini"</string>
+    <string name="notification_importance_high_silent" msgid="2667033773703765252">"I-pop kusikrini"</string>
     <string name="notification_importance_min_title" msgid="6974673091137544803">"Okuphansi"</string>
     <string name="notification_importance_low_title" msgid="8131254047772814309">"Okumaphakathi"</string>
     <string name="notification_importance_default_title" msgid="9120383978536089489">"Okuphezulu"</string>
@@ -2921,8 +2935,13 @@
     <string name="loading_notification_apps" msgid="5031818677010335895">"Ilayisha izinhlelo zokusebenza..."</string>
     <string name="app_notifications_off_desc" msgid="4882445501376722969">"I-Android ivimbela izaziso zalolu hlelo lokusebenza kusukela ekuveleni kule divayisi"</string>
     <string name="channel_notifications_off_desc" msgid="5899225298718840635">"I-Android ivimbela lesi sigaba sezaziso kusukela ekuveleni kule divayisi"</string>
+    <string name="channel_group_notifications_off_desc" msgid="1620950416247316370">"I-Android ivimbela leli qembu lezaziso kusukela ekuveleni kule divayisi"</string>
     <string name="notification_channels" msgid="5346841743182627500">"Izigaba"</string>
     <string name="notification_channels_other" msgid="5645317113885788226">"Okunye"</string>
+    <plurals name="notification_group_summary" formatted="false" msgid="3420621520561455358">
+      <item quantity="one"><xliff:g id="COUNT_1">%d</xliff:g> izigaba</item>
+      <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> izigaba</item>
+    </plurals>
     <string name="no_channels" msgid="3077375508177744586">"Lolu hlelo lokusebenza aluzange luthumele noma iziphi izaziso"</string>
     <string name="app_settings_link" msgid="8894946007543660906">"Izilungiselelo ezingeziwe kuhlelo lokusebenza"</string>
     <string name="app_notification_listing_summary_zero" msgid="6482582965081108108">"Kuvuliwe kuzo zonke izinhlelo zokusebenza"</string>
@@ -2999,6 +3018,7 @@
     <string name="zen_mode_from_starred" msgid="2678345811950997027">"Kusukela koxhumana nabo abanenkanyezi kuphela"</string>
     <string name="zen_mode_from_none" msgid="8219706639954614136">"Lutho"</string>
     <string name="zen_mode_alarms" msgid="2165302777886552926">"Ama-alamu"</string>
+    <string name="zen_mode_alarms_summary" msgid="3774926045611788635">"Ama-alamu ahlala abalulekile futhi enza umsindo"</string>
     <string name="zen_mode_reminders" msgid="5458502056440485730">"Izikhumbuzi"</string>
     <string name="zen_mode_events" msgid="7914446030988618264">"Imibuthano"</string>
     <string name="zen_mode_all_callers" msgid="584186167367236922">"Bonke abafonayo"</string>
@@ -3033,6 +3053,7 @@
     <string name="zen_mode_screen_off_visual_interruptions" msgid="4850792880144382633">"Uma isikrini sivaliwe"</string>
     <string name="zen_mode_no_visual_interruptions" msgid="8742776003822778472">"Uma isikrini sivuliwe noma sivaliwe"</string>
     <string name="notification_app_settings_button" msgid="6685640230371477485">"Izilungiselelo zesaziso"</string>
+    <string name="suggestion_button_text" msgid="3275010948381252006">"Kulungile"</string>
     <string name="device_feedback" msgid="3238056036766293294">"Thumela impendulo mayelana nale divayisi"</string>
     <string name="restr_pin_enter_admin_pin" msgid="1085834515677448072">"Faka iphinikhodi yomlawuli"</string>
     <string name="switch_on_text" msgid="1124106706920572386">"Vuliwe"</string>
@@ -3217,6 +3238,7 @@
     <string name="usb_summary_file_transfers" msgid="6435943692610175111">"Idlulisela amafayela"</string>
     <string name="usb_summary_photo_transfers" msgid="8440204169576585250">"Idlulisela izithombe (i-PTP)"</string>
     <string name="usb_summary_MIDI" msgid="5687906612187885908">"Isebenzisa idivayisi njenge-MIDI"</string>
+    <string name="sms_mirroring_pref" msgid="6475043279147376031">"Ukufanisela i-SMS"</string>
     <string name="background_check_pref" msgid="7550258400138010979">"Ukuhlola kwangasemuva"</string>
     <string name="background_check_title" msgid="4534254315824525593">"Ukufinyelela kwangasemuva okuphele"</string>
     <string name="assist_access_context_title" msgid="2269032346698890257">"Sebenzisa umbhalo kusukela kusikrini"</string>
@@ -3283,7 +3305,7 @@
     <string name="write_settings_title" msgid="4232152481902542284">"Ingashintsha izilungiselelo zesistimu"</string>
     <string name="write_system_settings" msgid="3482913590601096763">"Shintsha izilungiselelo zesistimu"</string>
     <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="permit_write_settings" msgid="658555006453212691">"Vumela izilungiselelo zesistimu yokushintsha"</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>
@@ -3378,9 +3400,12 @@
     <string name="color_temperature" msgid="2070126836910615605">"Ithempelesha yombala opholile"</string>
     <string name="color_temperature_desc" msgid="4793729830226404052">"Sebenzisa imibala yesibonisi esipholile"</string>
     <string name="color_temperature_toast" msgid="4974218172133854827">"Ukuze usebenzise ukushintshwa kombala, vala isikrini"</string>
-    <string name="telephony_monitor_toast" msgid="7003764250271195384">"Ukuze usebenzise ushintsho lokuqapha ifoni, qalisa kabusha idivayisi"</string>
+    <string name="connectivity_monitor_switch" msgid="9059759348648583421">"Isingameli sokuxhuma"</string>
+    <string name="connectivity_monitor_switch_summary" msgid="2828658652378866401">"I-ConnectivityMonitor izoqoqa amalogo uma ithola inkinga yokuxhuma nesaziso somyalo kumsebenzisi ukufayela sesiphazamisi"</string>
+    <string name="connectivity_monitor_toast" msgid="5551859612881173028">"Ukuze usebenzise ushintsho lokuqapha ifoni, qalisa kabusha idivayisi"</string>
     <string name="camera_hal_hdrplus_switch" msgid="8377365197105267466">"Ikhamera ye-HAL HDR+"</string>
     <string name="camera_hal_hdrplus_toast" msgid="2063703797270055299">"Ukuze usebenzise ikhamera ye-HAL HDR+ ushintsho, qalisa idivayisi"</string>
+    <string name="camera_laser_sensor_switch" msgid="8913588990743234440">"Inzwa ye-Laser yekhamera"</string>
     <string name="ota_disable_automatic_update" msgid="2319639631655915050">"Izibuyekezo zesistimu ezenzakalelayo"</string>
     <string name="usage" msgid="2977875522080448986">"Ukusetshenziswa"</string>
     <string name="cellular_data_usage" msgid="2155683719898158203">"Ukusetshenziswa kwedatha yeselula"</string>
@@ -3406,7 +3431,7 @@
     <string name="data_warning" msgid="209133958008062117">"Isexwayiso sedatha"</string>
     <string name="set_data_limit" msgid="2901526323210516923">"Setha umkhawulo wedatha"</string>
     <string name="data_limit" msgid="1885406964934590552">"Umkhawulo wedatha"</string>
-    <string name="data_usage_template" msgid="392191945602400904">"<xliff:g id="ID_1">%1$s</xliff:g> okusetshenziswe phakathi kokungu-<xliff:g id="ID_2">%2$s</xliff:g>"</string>
+    <string name="data_usage_template" msgid="2923744765873163859">"<xliff:g id="ID_1">%1$s</xliff:g> esetsenzisiwe ngomhla ka-<xliff:g id="ID_2">%2$s</xliff:g>"</string>
     <string name="configure" msgid="1029654422228677273">"Lungiselela"</string>
     <string name="data_usage_other_apps" msgid="3272872663517382050">"Ezinye izinhlelo zokusebenza ezifakwe ekusetshenzisweni"</string>
     <plurals name="data_saver_unrestricted_summary" formatted="false" msgid="2635267833484232703">
@@ -3475,7 +3500,7 @@
     <string name="button_confirm_convert_fbe" msgid="7101855374850373091">"Sula uphinde uguqule"</string>
     <string name="reset_shortcut_manager_throttling" msgid="6495066467198668994">"Setha kabusha ukukhawulela kokulinganisela kwe-ShortcutManager"</string>
     <string name="reset_shortcut_manager_throttling_complete" msgid="1826770872063707900">"Ukukhawulela kokulinganisela kwe-ShortcutManager kusethwe kabusha"</string>
-    <string name="notification_suggestion_title" msgid="4506524937307816475">"Lawula izaziso zesikrini sokukhiya"</string>
+    <string name="notification_suggestion_title" msgid="387052719462473500">"Lawula ulwazi ekukhiyeni isikrini"</string>
     <string name="notification_suggestion_summary" msgid="8521159741445416875">"Bonisa noma fihla okuqukethwe kwesaziso"</string>
     <string name="page_tab_title_summary" msgid="4070309266374993258">"Konke"</string>
     <string name="page_tab_title_support" msgid="8483187649355540109">"Usekelo namathiphu"</string>
@@ -3483,7 +3508,7 @@
     <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>
     <string name="premium_sms_access" msgid="4660047004791638305">"Ukufinyelela ku-Premium SMS"</string>
-    <string name="bluetooth_disabled" msgid="2456198532288640046">"Akubonakali kwamanye amadivayisi"</string>
+    <string name="bluetooth_disabled" msgid="6244000672828617410">"Valiwe"</string>
     <string name="bluetooth_connected_summary" msgid="7672528674593152862">"Ixhumeke ku-<xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="bluetooth_connected_multiple_devices_summary" msgid="9173661896296663932">"Ixhumeke kumadivayisi amaningi"</string>
     <string name="demo_mode" msgid="2798762752209330277">"Imodi yedemo ye-UI yesistimu"</string>
@@ -3585,7 +3610,7 @@
     <string name="web_action_enable_title" msgid="4051513950976670853">"Izinhlelo zokusebenza ezisheshayo"</string>
     <string name="web_action_enable_summary" msgid="3108127559723396382">"Vula izixhumanisi kuzinhlelo zokusebenza, nanoma zingafakiwe"</string>
     <string name="web_action_section_title" msgid="7364647086538399136">"Izinhlelo zokusebenza ezisheshayo"</string>
-    <string name="instant_apps_account" msgid="1433620209791992528">"I-akhawunti yezinhlelo zokusebenza ezisheshayo"</string>
+    <string name="instant_apps_settings" msgid="8827777916518348213">"Okuncamelayo kwezinhlelo zokusebenza ezisheshayo"</string>
     <string name="domain_url_section_title" msgid="7046835219056428883">"Izinhlelo zokusebenza ezifakiwe"</string>
     <string name="automatic_storage_manager_activation_warning" msgid="6353100011690933254">"Isitoreji sakho manje siphethwe umphathi wesitoreji"</string>
     <string name="account_for_section_header" msgid="5356566418548737121">"Ama-akhawunti e-<xliff:g id="USER_NAME">%1$s</xliff:g>"</string>
@@ -3632,7 +3657,9 @@
     <string name="enterprise_privacy_always_on_vpn_personal" msgid="9217774730260037434">"I-VPN ehlala ivuliwe ivuliwe kuphrofayela yakho yomuntu siqu"</string>
     <string name="enterprise_privacy_always_on_vpn_work" msgid="7244472958208315814">"I-VPN ehlala ivuliwe ivuliwe kuphrofayela yakho yomsebenzi"</string>
     <string name="enterprise_privacy_global_http_proxy" msgid="7936664553416257333">"Ummeleli we-Global HTTP usethiwe"</string>
-    <string name="enterprise_privacy_ca_certs" msgid="5885892204903688909">"Ukuqinisekisa okuthenjwayo"</string>
+    <string name="enterprise_privacy_ca_certs_device" msgid="2019652712782510262">"Izifakazeli ezithenjwayo"</string>
+    <string name="enterprise_privacy_ca_certs_personal" msgid="2279084820904076599">"Ukuqinisekisa okwethembekile kuphrofayela yomuntu siqu"</string>
+    <string name="enterprise_privacy_ca_certs_work" msgid="6187377647815301809">"Ukuqinisekisa okwethembekile kuphrofayela yakho yomsebenzi"</string>
     <plurals name="enterprise_privacy_number_ca_certs" formatted="false" msgid="526375234629534165">
       <item quantity="one">Izitifiketi ze-CA ezingu-<xliff:g id="COUNT_1">%d</xliff:g></item>
       <item quantity="other">Izitifiketi ze-CA ezingu-<xliff:g id="COUNT_1">%d</xliff:g></item>
@@ -3695,6 +3722,8 @@
     <string name="carrier_provisioning" msgid="4398683675591893169">"Ulwazi lokuhlinzeka lenkampani yenethiwekhi"</string>
     <string name="trigger_carrier_provisioning" msgid="3434865918009286187">"Cupha ukunikezwa kwenkampani yenethiwekhi"</string>
     <string name="new_device_suggestion_title" msgid="698847081680980774">"Yini okusha nokujabulisayo?"</string>
-    <string name="new_device_suggestion_summary" msgid="7172709269203435870">"Hlola izici ezingu-5 eziphezulu"</string>
+    <string name="new_device_suggestion_summary" product="default" msgid="206396571522515855">"Thatha uhambo lwefoni yakho entsha"</string>
+    <string name="new_device_suggestion_summary" product="tablet" msgid="393751455688210956">"Thatha uhambo kuthebulethi yakho entsha"</string>
+    <string name="new_device_suggestion_summary" product="device" msgid="2939870049868336652">"Thatha uhambo lwedivayisi yakho entsha"</string>
     <string name="disabled_low_ram_device" msgid="3751578499721173344">"Lesi sici asitholakali kule divayisi"</string>
 </resources>
diff --git a/res/values/arrays.xml b/res/values/arrays.xml
index 5e1a468..aa8a586 100644
--- a/res/values/arrays.xml
+++ b/res/values/arrays.xml
@@ -235,13 +235,6 @@
         <item>@string/wifi_security_psk_generic</item>
     </string-array>
 
-   <!-- Wi-Fi AP settings.  The type of security a Wi-Fi AP supports. -->
-   <!-- Note that adding/removing/moving the items will need wifi settings code change. -->
-    <string-array name="wifi_ap_security">
-        <item>@string/wifi_security_none</item>
-        <item>@string/wifi_security_wpa2</item>
-    </string-array>
-
     <!-- Match this with the constants in WifiDialog. --> <skip />
     <!-- Wi-Fi settings.  The type of EAP method a Wi-Fi network has. -->
     <string-array name="wifi_eap_method">
@@ -1038,4 +1031,18 @@
         <item>never</item>
     </string-array>
 
+    <string-array name="zen_mode_contacts_entries" translatable="false">
+        <item>@string/zen_mode_from_anyone</item>
+        <item>@string/zen_mode_from_contacts</item>
+        <item>@string/zen_mode_from_starred</item>
+        <item>@string/zen_mode_from_none</item>
+    </string-array>
+
+    <string-array name="zen_mode_contacts_values" translatable="false">
+        <item>zen_mode_from_anyone</item>
+        <item>zen_mode_from_contacts</item>
+        <item>zen_mode_from_starred</item>
+        <item>zen_mode_from_none</item>
+    </string-array>
+
 </resources>
diff --git a/res/values/attrs.xml b/res/values/attrs.xml
index cc677a2..2ba7919 100644
--- a/res/values/attrs.xml
+++ b/res/values/attrs.xml
@@ -133,11 +133,6 @@
         <attr name="forWork" format="boolean" />
     </declare-styleable>
 
-    <declare-styleable name="DividerPreference">
-        <attr name="allowDividerAbove" format="boolean" />
-        <attr name="allowDividerBelow" format="boolean" />
-    </declare-styleable>
-
     <declare-styleable name="VideoPreference">
         <attr name="animation" format="reference" />
         <attr name="preview" format="reference" />
@@ -148,10 +143,6 @@
         <attr name="aspectRatio" format="float" />
     </declare-styleable>
 
-    <declare-styleable name="TintablePreference">
-        <attr name="android:tint" format="color|reference" />
-    </declare-styleable>
-
     <!-- For UsageView -->
     <declare-styleable name="UsageView">
         <attr name="android:colorAccent" />
diff --git a/res/values/config.xml b/res/values/config.xml
index 18a8264..097350b 100755
--- a/res/values/config.xml
+++ b/res/values/config.xml
@@ -38,8 +38,8 @@
     <!-- When true enable color temperature setting. -->
     <bool name="config_enableColorTemperature">false</bool>
 
-    <!-- Whether to show TelphonyMonitor switch in Developer Options -->
-    <bool name="config_show_telephony_monitor">false</bool>
+    <!-- Whether to show Connectivity Monitor switch in Developer Options -->
+    <bool name="config_show_connectivity_monitor">false</bool>
 
     <!-- Whether to show Camera laser sensor switch in Developer Options -->
     <bool name="config_show_camera_laser_sensor">false</bool>
@@ -70,6 +70,9 @@
     <!-- If the support features are enabled. -->
     <bool name="config_support_enabled">false</bool>
 
+    <!-- Whether to enable "show operator name in the status bar" setting -->
+    <bool name="config_showOperatorNameInStatusBar">false</bool>
+
     <!-- List containing the component names of pre-installed screen reader services. -->
     <string-array name="config_preinstalled_screen_reader_services" translatable="false">
         <!--
diff --git a/res/values/dimens.xml b/res/values/dimens.xml
index fdb9c32..ef4d269 100755
--- a/res/values/dimens.xml
+++ b/res/values/dimens.xml
@@ -22,6 +22,7 @@
     <dimen name="action_bar_switch_padding">16dip</dimen>
 
     <dimen name="app_icon_size">40dip</dimen>
+    <dimen name="secondary_app_icon_size">24dp</dimen>
     <dimen name="min_tap_target_size">48dp</dimen>
     <dimen name="screen_margin_sides">64dip</dimen>
     <dimen name="screen_margin_top">72dip</dimen>
@@ -120,6 +121,7 @@
     <dimen name="search_bar_negative_margin">-8dp</dimen>
 
     <dimen name="search_bar_height">48dp</dimen>
+    <dimen name="search_bar_corner_radius">2dp</dimen>
     <dimen name="search_bar_text_size">16dp</dimen>
 
     <!-- Dimensions for Wifi Assistant Card -->
diff --git a/res/values/strings.xml b/res/values/strings.xml
index c4f71b0..40152f7 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -394,6 +394,17 @@
     <!-- Title for pairing bluetooth device page [CHAR LIMIT=none] -->
     <string name="bluetooth_pairing_page_title">Pair new device</string>
 
+    <!-- Title for connected device group [CHAR LIMIT=none]-->
+    <string name="connected_device_connected_title">Currently connected</string>
+    <!-- Title for connected device group [CHAR LIMIT=none]-->
+    <string name="connected_device_saved_title">Saved devices</string>
+    <!-- Title for preference to add a device [CHAR LIMIT=none]-->
+    <string name="connected_device_add_device_title">Add device</string>
+    <!-- Summary for preference to add a device [CHAR LIMIT=none]-->
+    <string name="connected_device_add_device_summary">Bluetooth will turn on to enable pairing</string>
+    <!-- Title for other connection preferences [CHAR LIMIT=none]-->
+    <string name="connected_device_connections_title">Connection preferences</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. -->
@@ -710,6 +721,10 @@
     <!-- Date & time setting screen setting option summary text when Automatic time zone check box is clear
         [CHAR LIMIT=100] -->
     <string name="zone_auto_summaryOff">Use network-provided time zone</string>
+    <!-- Date & time setting screen setting check box title if the 24 hour setting should be determined automatically [CHAR LIMIT=30] -->
+    <string name="date_time_24hour_auto">Automatic 24\u2011hour format</string>
+    <!-- Date & time setting screen setting option summary text for the automatic 24 hour setting checkbox [CHAR LIMIT=100] -->
+    <string name="date_time_24hour_auto_summary">Use locale default</string>
     <!-- Date & time setting screen setting check box title [CHAR LIMIT=30] -->
     <string name="date_time_24hour_title">24\u2011hour format</string>
     <!-- Date & time setting screen setting check box title -->
@@ -1106,7 +1121,7 @@
     <string name="setup_lock_settings_picker_title" product="default">Protect your phone</string>
 
     <!-- Message shown when setting up screen lock, prompting user to choose the their backup screen lock method [CHAR LIMIT=NONE] -->
-    <string name="lock_settings_picker_fingerprint_added_security_message">For added security, set up a backup screen lock.</string>
+    <string name="lock_settings_picker_fingerprint_added_security_message">For added security, set a backup screen lock.</string>
 
     <!-- Description text for screen in setup wizard asking user to set up screen lock, explaining to the user how setting up a screen lock protect them from losing data. (tablet) [CHAR LIMIT=NONE] -->
     <string name="setup_lock_settings_picker_message" product="tablet">Prevent others from using this tablet without your permission by activating device protection features. Choose the screen lock you want to use.</string>
@@ -1375,8 +1390,8 @@
     <string name="lockpassword_pin_no_sequential_digits">Ascending, descending, or repeated sequence
         of digits isn\'t allowed</string>
 
-    <!-- Label for ChoosePassword/PIN OK button -->
-    <string name="lockpassword_ok_label">OK</string>
+    <!-- Label for Confirm button when entering PIN / password the second time. [CHAR LIMIT=30] -->
+    <string name="lockpassword_confirm_label">Confirm</string>
 
     <!-- Label for ChoosePassword/PIN OK button -->
     <string name="lockpassword_cancel_label">Cancel</string>
@@ -1568,9 +1583,9 @@
     <!-- Bluetooth settings.  Message for disconnecting from the PAN profile (user role). [CHAR LIMIT=80] -->
     <string name="bluetooth_disconnect_pan_user_profile">Internet access via <xliff:g id="device_name">%1$s</xliff:g> will be disconnected.</string>
     <!-- Bluetooth settings.  Message for disconnecting from the PAN profile (NAP role). [CHAR LIMIT=80] -->
-    <string name="bluetooth_disconnect_pan_nap_profile" product="tablet"><xliff:g id="device_name">%1$s</xliff:g> will be disconnected from sharing this tablet\u2019s Internet connection.</string>
+    <string name="bluetooth_disconnect_pan_nap_profile" product="tablet"><xliff:g id="device_name">%1$s</xliff:g> will be disconnected from sharing this tablet\u2019s internet connection.</string>
     <!-- Bluetooth settings.  Message for disconnecting from the PAN profile (NAP role). [CHAR LIMIT=80] -->
-    <string name="bluetooth_disconnect_pan_nap_profile" product="default"><xliff:g id="device_name">%1$s</xliff:g> will be disconnected from sharing this phone\u2019s Internet connection.</string>
+    <string name="bluetooth_disconnect_pan_nap_profile" product="default"><xliff:g id="device_name">%1$s</xliff:g> will be disconnected from sharing this phone\u2019s internet connection.</string>
 
     <!-- Bluetooth settings.  Connection options screen.  The title of the screen. [CHAR LIMIT=40] -->
     <string name="bluetooth_device_advanced_title">Paired Bluetooth device</string>
@@ -1586,9 +1601,9 @@
     <!-- Bluetooth settings. Connection options screen. Title for checkbox to enable incoming file transfers [CHAR LIMIT=30] -->
     <string name="bluetooth_device_advanced_enable_opp_title">Allow incoming file transfers</string>
     <!-- Bluetooth settings. Connection options screen. The summary for the checkbox preference when PAN is connected (user role). [CHAR LIMIT=25]-->
-    <string name="bluetooth_pan_user_profile_summary_connected">Connected to device for Internet access</string>
+    <string name="bluetooth_pan_user_profile_summary_connected">Connected to device for internet access</string>
     <!-- Bluetooth settings. Connection options screen. The summary for the checkbox preference when PAN is connected (NAP role). [CHAR LIMIT=25]-->
-    <string name="bluetooth_pan_nap_profile_summary_connected">Sharing local Internet connection with device</string>
+    <string name="bluetooth_pan_nap_profile_summary_connected">Sharing local internet connection with device</string>
 
     <!-- Bluetooth settings.  Dock Setting Title -->
     <string name="bluetooth_dock_settings">Dock Settings</string>
@@ -1722,9 +1737,9 @@
     <!-- 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 -->
-    <string name="wifi_poor_network_detection_summary">Don\u2019t use a Wi\u2011Fi network unless it has a good Internet connection</string>
+    <string name="wifi_poor_network_detection_summary">Don\u2019t use a Wi\u2011Fi network unless it has a good internet connection</string>
     <!-- Checkbox summary for option to toggle poor network detection [CHAR LIMIT=60] -->
-    <string name="wifi_avoid_poor_network_detection_summary">Only use networks that have a good Internet connection</string>
+    <string name="wifi_avoid_poor_network_detection_summary">Only use networks that have a good internet connection</string>
     <!-- Checkbox title for option to connect to open Wi-Fi automatically [CHAR LIMIT=40] -->
     <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] -->
@@ -1766,11 +1781,11 @@
     <!-- Checkbox summary for option to toggle suspend power optimizations [CHAR LIMIT=30] -->
     <string name="wifi_limit_optimizations_summary">Limit battery used by Wi\u2011Fi</string>
     <!-- Checkbox title. Should we switch to using cellular data if Wi-Fi is still connected but the Wi-Fi network we're connected to no longer has Internet access (e.g., due to an outage)? -->
-    <string name="wifi_switch_away_when_unvalidated">Switch to mobile data if Wi\u2011Fi loses Internet access.</string>
+    <string name="wifi_switch_away_when_unvalidated">Switch to mobile data if Wi\u2011Fi loses internet access.</string>
     <!-- Preference title for option to automatically switch away from bad wifi networks [CHAR LIMIT=60]-->
     <string name="wifi_cellular_data_fallback_title">Switch to mobile data automatically</string>
     <!-- Preference summary to automatically switch away from bad wifi networks [CHAR LIMIT=None]-->
-    <string name="wifi_cellular_data_fallback_summary">Use mobile data when Wi\u2011Fi has no Internet access. Data usage may apply.</string>
+    <string name="wifi_cellular_data_fallback_summary">Use mobile data when Wi\u2011Fi has no internet access. Data usage charges may apply.</string>
     <!-- Action bar text message to manually add a wifi network [CHAR LIMIT=20]-->
     <string name="wifi_add_network">Add network</string>
     <!-- Action bar title to open additional Wi-Fi settings-->
@@ -1944,11 +1959,11 @@
     <string name="wifi_hotspot_connect">CONNECT</string>
 
     <!-- Dialog text to tell the user that the selected network does not have Internet access. -->
-    <string name="no_internet_access_text">This network has no Internet access. Stay connected?</string>
+    <string name="no_internet_access_text">This network has no internet access. Stay connected?</string>
     <string name="no_internet_access_remember">Don\u2019t ask again for this network</string>
 
     <!-- Dialog text to tell the user that the selected network has lost Internet access, and asking the user whether they want to avoid this network. -->
-    <string name="lost_internet_access_title">Wi\u2011Fi is not connected to the Internet</string>
+    <string name="lost_internet_access_title">Wi\u2011Fi is not connected to the internet</string>
     <string name="lost_internet_access_text">You can switch to the mobile network whenever Wi\u2011Fi has a bad connection. Data usage charges may apply.</string>
     <!-- Button text to let user switch to mobile data -->
     <string name="lost_internet_access_switch">Switch to mobile</string>
@@ -1990,7 +2005,7 @@
 
     <!-- Wifi Network Details -->
     <!-- Wifi details title-->
-    <string name="wifi_details_title">Network info</string>
+    <string name="wifi_details_title">Network details</string>
     <!-- Wifi details preference title to display router IP subnet mask -->
     <string name="wifi_details_subnet_mask">Subnet mask</string>
     <!-- Wifi details preference title to display router DNS info -->
@@ -2061,13 +2076,13 @@
     <!-- Label for Wifi tether checkbox. Toggles Access Point on/off  [CHAR LIMIT=30] -->
     <string name="wifi_hotspot_checkbox_text">Wi\u2011Fi hotspot</string>
     <!-- Summary text when turning hotspot off -->
-    <string name="wifi_hotspot_off_subtext">Not sharing Internet or content with other devices</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>
+    <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>
+    <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>
+    <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. -->
@@ -2081,7 +2096,7 @@
     <!-- 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>
+    <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>
 
@@ -2099,8 +2114,6 @@
     <string name="wifi_hotspot_configure_ap_text">Wi\u2011Fi hotspot setup</string>
     <!-- Summary Used to open the ssid and security dialog for Wifi Access Point.  [CHAR LIMIT=60] -->
     <string name="wifi_hotspot_configure_ap_text_summary">AndroidAP WPA2 PSK hotspot</string>
-    <!-- Subtext on configuration preference to indicate SSID and security chosen -->
-    <string name="wifi_tether_configure_subtext"><xliff:g id="network_ssid">%1$s</xliff:g> <xliff:g id="network_security">%2$s</xliff:g> hotspot</string>
     <!-- Default access point SSID used for tethering -->
     <string name="wifi_tether_configure_ssid_default">AndroidHotspot</string>
 
@@ -2235,9 +2248,9 @@
     <!-- 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>
+    <string name="emergency_address_title">Emergency Address</string>
     <!-- Summary of Update Emergency Address preference, explaining usage of emergency address [CHAR LIMIT=NONE] -->
-    <string name="emergency_address_summary">Address used by emergency services as your location if you make an emergency call using Wi\u2011Fi</string>
+    <string name="emergency_address_summary">Used as your location when you make an emergency call over Wi\u2011Fi</string>
 
 
     <!-- Sound and alerts settings -->
@@ -2249,9 +2262,6 @@
     <string name="summary_placeholder" translatable="false">&#160;</string>
     <!-- DO NOT TRANSLATE Summary placeholder reserving 2 lines -->
     <string name="summary_two_lines_placeholder" translatable="false">&#160;\n&#160;</string>
-
-    <!-- DO NOT TRANSLATE Empty summary for dynamic preferences -->
-    <string name="summary_empty" translatable="false"></string>
     <!-- Sound settings screen, volume title -->
     <string name="all_volume_title">Volumes</string>
     <!-- Sound settings screen, music effects title [CHAR LIMIT=30]-->
@@ -2623,10 +2633,14 @@
 
     <!-- About phone screen, status item label  [CHAR LIMIT=40] -->
     <string name="firmware_version">Android version</string>
+    <!-- About phone screen, dialog title for showing device software information such as android version, security patch level, etc  [CHAR LIMIT=60] -->
+    <string name="firmware_title">Android</string>
     <!-- About phone screen, status item label  [CHAR LIMIT=60] -->
     <string name="security_patch">Android security patch level</string>
     <!-- About phone screen, status item label  [CHAR LIMIT=40] -->
     <string name="model_info">Model</string>
+    <!-- About phone screen, status item summary  [CHAR LIMIT=40] -->
+    <string name="model_summary">Model&#58; %1$s</string>
     <!-- About phone screen, dialog title for showing hardware information such as model, serial number, etc.[CHAR LIMIT=60] -->
     <string name="hardware_info">Model &amp; hardware</string>
     <!-- Label for device's hardware revision value [CHAR LIMIT=40] -->
@@ -2639,8 +2653,6 @@
     <string name="kernel_version">Kernel version</string>
     <!-- About phone screen,  setting option name  [CHAR LIMIT=40] -->
     <string name="build_number">Build number</string>
-    <!-- About phone screen,  setting option name  [CHAR LIMIT=40] -->
-    <string name="selinux_status">SELinux status</string>
 
     <!-- About phone screen, show when a value of some status item is unavailable. -->
     <string name="device_info_not_available">Not available</string>
@@ -2662,22 +2674,34 @@
     <string name="storage_settings_summary" product="nosdcard">Unmount USB storage, view available storage</string>
     <!-- [CHAR LIMIT=100] Main settings screen item's summary for the SD card and storage settings -->
     <string name="storage_settings_summary" product="default">Unmount SD card, view available storage</string>
+    <!-- About phone screen, title for IMEI for multi-sim devices -->
+    <string name="imei_multi_sim">IMEI (sim slot %1$d)</string>
     <!-- Do not translate. About phone, status item title -->
     <string name="status_imei">IMEI</string>
     <!-- Do not translate. About phone, status item title -->
     <string name="status_imei_sv">IMEI SV</string>
     <!-- Do not translate. About phone, status item title -->
     <string name="status_iccid">ICCID</string>
-    <!-- About tablet, status item title.  The Mobile Directory Number [CHAR LIMIT=30] -->
+    <!-- About tablet, status item title.  The Mobile Directory Number [CHAR LIMIT=40] -->
     <string name="status_number" product="tablet">MDN</string>
+    <!-- About phone, status item title.  The phone number of the current device [CHAR LIMIT=40] -->
+    <string name="status_number" product="default">Phone number</string>
+    <!-- About tablet, status item title for multi-sim devices.  The Mobile Directory Number [CHAR LIMIT=40] -->
+    <string name="status_number_sim_slot" product="tablet">MDN (sim slot %1$d)</string>
+    <!-- About phone, status item title for multi-sim devices.  The phone number of the current device [CHAR LIMIT=40] -->
+    <string name="status_number_sim_slot" product="default">Phone number (sim slot %1$d)</string>
+    <!-- About tablet, status item title.  The Mobile Directory Number [CHAR LIMIT=30] -->
+    <string name="status_number_sim_status" product="tablet">MDN on SIM</string>
     <!-- About phone, status item title.  The phone number of the current device [CHAR LIMIT=30] -->
-    <string name="status_number" product="default">My phone number</string>
+    <string name="status_number_sim_status" product="default">Phone number on SIM</string>
     <!-- About phone, status item title.  The phone MIN number of the current device.-->
     <string name="status_min_number">MIN</string>
     <!-- About phone, status item title.  The phone MSID number of the current device.-->
     <string name="status_msid_number">MSID</string>
     <!-- About phone, status item title.  The phone PRL Version of the current device.-->
     <string name="status_prl_version">PRL version</string>
+    <!-- About phone screen, title for MEID for multi-sim devices -->
+    <string name="meid_multi_sim">MEID (sim slot %1$d)</string>
     <!-- About phone, status item title.  The phone MEID number of the current LTE/CDMA device. [CHAR LIMIT=30] -->
     <string name="status_meid_number">MEID</string>
     <!-- About phone, status item title.  The ICCID of the current LTE device. [CHAR LIMIT=30] -->
@@ -2702,8 +2726,6 @@
     <string name="status_bt_address">Bluetooth address</string>
     <!-- About phone, status item title.  The hardware serial number. [CHAR LIMIT=30]-->
     <string name="status_serial_number">Serial number</string>
-    <!-- About phone, status item value if the actual value is not available. -->
-    <string name="status_unavailable">Unavailable</string>
     <!-- About phone, status item title.  How long the device has been running since its last reboot. -->
     <string name="status_up_time">Up time</string>
     <!-- About phone, status item title.  How much time the device has had its main CPU awake. -->
@@ -2938,7 +2960,7 @@
     <string name="storage_detail_explore">Explore <xliff:g id="name" example="SD card">^1</xliff:g></string>
 
     <!-- Body of dialog informing user about other files on a storage device [CHAR LIMIT=NONE]-->
-    <string name="storage_detail_dialog_other">Other includes shared files saved by apps, files downloaded from the Internet or Bluetooth, Android files, and so on.
+    <string name="storage_detail_dialog_other">Other includes shared files saved by apps, files downloaded from the internet or Bluetooth, Android files, and so on.
 \n\nTo see the visible contents of this <xliff:g id="name" example="SD card">^1</xliff:g>, tap Explore.</string>
 
     <!-- Body of dialog informing user about the storage used by the Android System [CHAR LIMIT=NONE]-->
@@ -3241,25 +3263,25 @@
     <!-- USB Tethering options -->
     <string name="usb_title">USB</string>
     <string name="usb_tethering_button_text">USB tethering</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>
+    <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 Tethering subtext [CHAR LIMIT=70]-->
-    <string name="bluetooth_tethering_subtext" product="tablet">Share tablet\u2019s Internet connection via Bluetooth</string>
+    <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>
+    <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>
+    <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 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. Apps can also create a hotspot to share content with nearby devices.</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>
@@ -3431,7 +3453,7 @@
     <!-- About phone settings, Safety Legal information setting option name and title of dialog box holding safety legal info -->
     <string name="settings_safetylegal_activity_title">Safety information</string>
     <!-- About phone settings screen, Safety legal dialog message when data network is not connected -->
-    <string name="settings_safetylegal_activity_unreachable">You don\u2019t have a data connection. To view this information now, go to %s from any computer connected to the Internet.</string>
+    <string name="settings_safetylegal_activity_unreachable">You don\u2019t have a data connection. To view this information now, go to %s from any computer connected to the internet.</string>
     <!-- About phone settings screen, Safety Legal dialog title until the link is fully loaded -->
     <string name="settings_safetylegal_activity_loading">Loading\u2026</string>
 
@@ -3440,16 +3462,16 @@
     <string name="lockpassword_choose_your_screen_lock_header">Set a screen lock</string>
     <!-- Message on first screen of choose password flow [CHAR LIMIT=NONE] -->
     <string name="lockpassword_choose_your_password_message">For security, set a 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 as backup for fingerprint flow. If this string cannot be translated in under 40 characters, please translate "Set fingerprint backup" [CHAR LIMIT=40] -->
+    <string name="lockpassword_choose_your_password_header_for_fingerprint">To use fingerprint, set a password</string>
+    <!-- Header on first screen of choose pattern as backup for fingerprint flow. If this string cannot be translated in under 40 characters, please translate "Set fingerprint backup" [CHAR LIMIT=40] -->
+    <string name="lockpassword_choose_your_pattern_header_for_fingerprint">To use fingerprint, set a pattern</string>
     <!-- Message on first screen of choose PIN flow [CHAR LIMIT=NONE] -->
     <string name="lockpassword_choose_your_pin_message">For security, set a 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 first screen of choose password/PIN as backup for fingerprint flow. If this string cannot be translated in under 40 characters, please translate "Set fingerprint backup" [CHAR LIMIT=40] -->
+    <string name="lockpassword_choose_your_pin_header_for_fingerprint">To use fingerprint, set a PIN</string>
+    <!-- Message on first screen of choose pattern flow [CHAR LIMIT=NONE] -->
+    <string name="lockpassword_choose_your_pattern_message">For security, set a pattern</string>
     <!-- Header on password confirm screen [CHAR LIMIT=40] -->
     <string name="lockpassword_confirm_your_password_header">Re-enter your password</string>
     <!-- Header on pattern confirm screen [CHAR LIMIT=30] -->
@@ -3638,8 +3660,6 @@
     <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">
@@ -3921,8 +3941,6 @@
     <string name="instant_app_details_summary">More info on <xliff:g id="app_store">%1$s</xliff:g></string>
 
     <!-- App Ops Settings --> <skip />
-    <!-- [CHAR LIMIT=NONE] App ops settings title, on main settings screen. If clicked, the user is taken to a settings screen for app operations -->
-    <string name="app_ops_settings">App ops</string>
     <!-- [CHAR LIMIT=NONE] Time label for an operation that is currently running. -->
     <string name="app_ops_running">Running</string>
     <!-- [CHAR LIMIT=NONE] Time label for an operation that has never executed. -->
@@ -4050,6 +4068,8 @@
 
     <!-- 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>
+    <!-- Text displayed when user has restriction DISALLOW_CONFIG_LOCALE [CHAR LIMIT=NONE]-->
+    <string name="language_empty_list_user_restricted">You don\u2019t have permission to change the device language.</string>
     <!-- Title of Languages & input settings screen -->
     <string name="language_keyboard_settings_title">Languages&#160;&amp; input</string>
     <!-- Title of preference category that lists all settings about helping user text input such as spell checker [CHAR LIMIT=60]-->
@@ -4281,6 +4301,8 @@
     <string name="user_installed_services_category_title">Downloaded services</string>
     <!-- Title for the accessibility preference category of settings considered to be experimental, meaning they might be changed or removed in the future. [CHAR LIMIT=50] -->
     <string name="experimental_category_title">Experimental</string>
+    <!-- Title for feature flags dashboard DO NOT TRANSLATE -->
+    <string name="feature_flags_dashboard_title" translatable="false">Feature flags</string>
     <!-- Title for the Talkback Accessibility Service. Displayed on the Accessibility Settings screen in Setup Wizard. [CHAR_LIMIT=25] -->
     <string name="talkback_title">Talkback</string>
     <!-- Summary for the Talkback Accessibility Service. Lets the user know that Talkback is a screenreader and that it is usually most helpful to blind and low vision users and whether the service is on. [CHAR_LIMIT=none] -->
@@ -4633,6 +4655,12 @@
     <string name="background_activity_summary_off">App\'s background activity is limited when not in use</string>
     <!-- Summary for the background activity when it is disabled [CHAR_LIMIT=120] -->
     <string name="background_activity_summary_disabled">App not allowed to run in background</string>
+    <!-- TODO: Pending UX review. Summary for the background activity when it is whitlisted [CHAR_LIMIT=120] -->
+    <string name="background_activity_summary_whitelisted">App can not be optimized for battery use</string>
+    <!-- TODO: Pending UX review. Title for the warning dialog to show to the user when limiting background activity for an app -->
+    <string name="background_activity_warning_dialog_title">Limit background activity?</string>
+    <!-- TODO: Pending UX review. Text for the warning dialog to show to the user when limiting background activity for an app -->
+    <string name="background_activity_warning_dialog_text">If you limit background activity for an app, it may misbehave</string>
 
     <!-- Title for the screen usage in power use UI [CHAR_LIMIT=60] -->
     <string name="device_screen_usage">Screen usage since full charge</string>
@@ -4641,12 +4669,10 @@
     <!-- Title for the cellular network in power use UI(i.e. Mobile network scanning: 30% of battery usage) [CHAR_LIMIT=40] -->
     <string name="device_cellular_network">Mobile network scanning</string>
 
-    <!-- Label for time since last full charge in power use UI, i.e. "7 h 20 min ago". Note: ^1 should be used in all translations [CHAR_LIMIT=60] -->
-    <string name="power_last_full_charge_summary"><xliff:g id="time">^1</xliff:g> ago</string>
     <!-- Label for list of apps using battery in power use UI. Note: ^1 should be used in all translations[CHAR_LIMIT=120] -->
-    <string name="power_usage_list_summary">App usage since full charge (<xliff:g id="time">^1</xliff:g> ago)</string>
+    <string name="power_usage_list_summary">App usage since full charge (<xliff:g id="relative_time">^1</xliff:g>)</string>
     <!-- Label for device components using battery in power use UI. Note: ^1 should be used in all translations[CHAR_LIMIT=120] -->
-    <string name="power_usage_list_summary_device">Device usage since full charge (<xliff:g id="time">^1</xliff:g> ago)</string>
+    <string name="power_usage_list_summary_device">Device usage since full charge (<xliff:g id="relative_time">^1</xliff:g>)</string>
     <!-- Description for the screen usage item [CHAR_LIMIT=120] -->
     <string name="screen_usage_summary">Amount of time screen has been on since full charge</string>
     <!-- Label for list of different types using battery in power use UI [CHAR_LIMIT=60] -->
@@ -4955,7 +4981,7 @@
     <string name="process_dex2oat_label">App optimization</string>
 
     <!-- [CHAR_LIMIT=40] Battery saver: Label for feature, title + menu item -->
-    <string name="battery_saver">Battery saver</string>
+    <string name="battery_saver">Battery Saver</string>
 
     <!-- [CHAR_LIMIT=40] Battery saver: Title for automatic entry option -->
     <string name="battery_saver_turn_on_automatically_title">Turn on automatically</string>
@@ -5020,22 +5046,6 @@
     <string name="menu_proc_stats_duration">Duration</string>
     <!-- [CHAR LIMIT=NONE] Activity title for process stats details on overall memory state -->
     <string name="mem_details_title">Memory details</string>
-    <!-- [CHAR LIMIT=NONE] Subtitle for process stats memory state details for list of memory states -->
-    <string name="mem_state_subtitle">Memory states</string>
-    <!-- [CHAR LIMIT=NONE] Subtitle for process stats memory state details for list of memory use -->
-    <string name="mem_use_subtitle">Memory use</string>
-    <!-- [CHAR LIMIT=NONE] Type of memory use associated with the kernel -->
-    <string name="mem_use_kernel_type">Kernel</string>
-    <!-- [CHAR LIMIT=NONE] Type of memory use associated with native processes -->
-    <string name="mem_use_native_type">Native</string>
-    <!-- [CHAR LIMIT=NONE] Type of memory use associated with kernel caches -->
-    <string name="mem_use_kernel_cache_type">Kernel caches</string>
-    <!-- [CHAR LIMIT=NONE] Type of memory use associated with kernel zram swap -->
-    <string name="mem_use_zram_type">ZRam swap</string>
-    <!-- [CHAR LIMIT=NONE] Type of memory use that is available/free -->
-    <string name="mem_use_free_type">Free</string>
-    <!-- [CHAR LIMIT=NONE] Total of all memory use -->
-    <string name="mem_use_total">Total</string>
     <!-- [CHAR LIMIT=NONE] Menu for process stats to show 3 hours of data -->
     <string name="menu_duration_3h">3 hours</string>
     <!-- [CHAR LIMIT=NONE] Menu for process stats to show 3 hours of data -->
@@ -5209,7 +5219,6 @@
     <string name="credentials_old_password">Current password:</string>
     <!-- Description of dialog to reset credential storage [CHAR LIMIT=NONE] -->
     <string name="credentials_reset_hint">Remove all the contents?</string>
-    <string name="credentials_password_too_short">The password must have at least 8 characters.</string>
     <!-- Error message [CHAR LIMIT=NONE] -->
     <string name="credentials_wrong_password">Incorrect password.</string>
     <!-- Error message [CHAR LIMIT=NONE] -->
@@ -5222,9 +5231,10 @@
     <string name="credentials_not_erased">Credential storage couldn\u2019t be erased.</string>
     <!-- Toast message [CHAR LIMIT=30] -->
     <string name="credentials_enabled">Credential storage is enabled.</string>
-    <!-- Description of dialog to explain that a lock screen password is required to use credential storage [CHAR LIMIT=NONE] -->
-    <string name="credentials_configure_lock_screen_hint">You need to set a lock screen PIN or password before you can use credential storage.</string>
-
+    <!-- This string is in a dialog, and the dialog shows up on a device that's managed by a user's company. It lets the user know that they need to have a secure lock screen (PIN, password, or pattern) before they can use credential storage [CHAR LIMIT=NONE] -->
+    <string name="credentials_configure_lock_screen_hint">Before you can use credential storage, your device need to have a secure lock screen</string>
+    <!-- This string is for the content of the button that leads user to lock screen settings  [CHAR LIMIT=20] -->
+    <string name="credentials_configure_lock_screen_button">SET LOCK</string>
     <!-- Title of Usage Access preference item [CHAR LIMIT=30] -->
     <string name="usage_access_title">Apps with usage access</string>
 
@@ -5535,8 +5545,6 @@
     <!-- Messaage shown in dialog when you can't manually sync -->
     <string name="cant_sync_dialog_message">Sync for this item is currently disabled. To change this setting, temporarily turn on background data and automatic sync.</string>
 
-    <string name="wimax_settings">4G</string>
-    <string name="status_wimax_mac_address">4G MAC address</string>
     <!-- This is displayed to the user when the device needs to be decrypted -->
     <string name="enter_password">To start Android, enter your password</string>
     <!-- Informational text on the pin entry screen prompting the user for their pin -->
@@ -5866,9 +5874,9 @@
     <!-- Dialog message title to set always-on VPN when another app was not already set. -->
     <string name="vpn_set_vpn_title">Set always-on VPN?</string>
     <!-- Dialog message body to explain that always-on VPN will disable network traffic while the VPN is connecting. -->
-    <string name="vpn_first_always_on_vpn_message">By turning on this setting, you won\'t have an Internet connection until the VPN successfully connects</string>
+    <string name="vpn_first_always_on_vpn_message">When this setting is on, you won\'t have an internet connection until the VPN successfully connects</string>
     <!-- Dialog message body to explain that always-on VPN will disable network traffic while the VPN is connecting, and that this will replace the current VPN. -->
-    <string name="vpn_replace_always_on_vpn_enable_message">Your existing VPN will be replaced, and you won\'t have an Internet connection until the VPN successfully connects</string>
+    <string name="vpn_replace_always_on_vpn_enable_message">Your existing VPN will be replaced, and you won\'t have an internet connection until the VPN successfully connects</string>
     <!-- Dialog message body to connect a VPN app, replacing another VPN app that is already always-on [CHAR LIMIT=NONE] -->
     <string name="vpn_replace_always_on_vpn_disable_message">You\'re already connected to an always-on VPN. If you connect to a different one, your existing VPN will be replaced, and always-on mode will turn off.</string>
     <!-- Dialog message body to set another VPN app to be always-on [CHAR LIMIT=NONE] -->
@@ -5975,11 +5983,6 @@
     from their cell phone carrier. The use of the string is similar to the string
     "system_update_settings_list_item_title" in this project. [CHAR LIMIT=25] -->
     <string name="additional_system_update_settings_list_item_title">Additional system updates</string>
-    <!-- These statuses are displayed when a device was built with SE Android supoprt.
-    These are displayed by the settings app in the about section. -->
-    <string name="selinux_status_disabled">Disabled</string>
-    <string name="selinux_status_permissive">Permissive</string>
-    <string name="selinux_status_enforcing">Enforcing</string>
 
     <!-- Notification of installed CA Certs --> <skip/>
 
@@ -6454,6 +6457,8 @@
     <string name="sim_no_inserted_msg">No SIM cards inserted</string>
     <!-- SIM status title  [CHAR LIMIT=40] -->
     <string name="sim_status_title">SIM status</string>
+    <!-- SIM status title  [CHAR LIMIT=40] -->
+    <string name="sim_status_title_sim_slot">SIM status (sim slot %1$d)</string>
     <!-- Title for call back. [CHAR LIMIT=60] -->
     <string name="sim_call_back_title">Call back from default SIM</string>
     <!-- Title for outgoing back. [CHAR LIMIT=60] -->
@@ -6493,8 +6498,11 @@
         <item quantity="other">Show %d hidden items</item>
     </plurals>
 
+    <!-- Content description for suggestion footer button. Double tapping will cause suggestion list to collapse [CHAR LIMIT=NONE]-->
+    <string name="dashboard_suggestion_condition_footer_content_description">Collapse</string>
+
     <!-- Title for setting tile leading to network and Internet settings [CHAR LIMIT=40]-->
-    <string name="network_dashboard_title">Network &amp; Internet</string>
+    <string name="network_dashboard_title">Network &amp; internet</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]-->
@@ -6578,6 +6586,10 @@
     <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>
+    <string name="keywords_imei_info">imei, meid, min, prl version, imei sv</string>
+    <string name="keywords_sim_status">network, mobile network state, service state, signal strength, mobile network type, roaming, iccid</string>
+    <string name="keywords_model_and_hardware">serial number, hardware version</string>
+    <string name="keywords_android_version">android security patch level, baseband version, kernel version</string>
 
     <!-- NFC Wi-Fi pairing/setup strings-->
 
@@ -6694,22 +6706,40 @@
     <string name="boot_sounds_title">Power on sounds</string>
 
     <!-- Sound: Summary for the Do not Disturb option when there is no automatic rules turned on. [CHAR LIMIT=NONE]-->
-    <string name="zen_mode_settings_summary_off">No automatic rules turned on</string>
+    <string name="zen_mode_settings_summary_off">Never</string>
 
     <!-- Sound: Summary for the Do not Disturb option when at least one automatic rules turned on. [CHAR LIMIT=NONE]-->
     <plurals name="zen_mode_settings_summary_on">
-        <item quantity="one">1 automatic rule turned on</item>
-        <item quantity="other"><xliff:g id="on_count" example="10">%d</xliff:g> automatic rules turned on</item>
+        <item quantity="one">1 rule</item>
+        <item quantity="other"><xliff:g id="on_count" example="10">%d</xliff:g> rules</item>
     </plurals>
 
     <!-- Sound: Title for the Do not Disturb option and associated settings page. [CHAR LIMIT=50]-->
-    <string name="zen_mode_settings_title">Do Not Disturb preferences</string>
+    <string name="zen_mode_settings_title">Do Not Disturb</string>
 
-    <!-- Do not disturb: Title for the Priority interruptions option and associated settings page. [CHAR LIMIT=30] -->
-    <string name="zen_mode_priority_settings_title">Priority only allows</string>
+    <!-- Do not disturb: Title for the behaviors option and associated settings page. [CHAR LIMIT=30] -->
+    <string name="zen_mode_behavior_settings_title">Behavior</string>
 
-    <!--  Do not disturb: Title for the zen mode automation listing. [CHAR LIMIT=30] -->
-    <string name="zen_mode_automation_settings_title">Automatic rules</string>
+    <!-- Do not disturb: Instructions indicating what types of sounds can bypass DND. [CHAR LIMIT=52] -->
+    <string name="zen_mode_behavior_allow_title">Allow sounds and vibrations from</string>
+
+    <!-- Do not disturb: Subtitle for DND behavior indicating no sound will get past DND. [CHAR LIMIT=30] -->
+    <string name="zen_mode_behavior_no_sound">No sound</string>
+
+    <!-- Do not disturb: Subtitle for DND behavior indicating no sound will get past DND due to user and/or API-invoked Total Silence mode. [CHAR LIMIT=40] -->
+    <string name="zen_mode_behavior_total_silence">No sound (Total Silence)</string>
+
+    <!-- Do not disturb: Used before specifying which sounds can bypass DND (ie: No sound except alarms and reminders). [CHAR LIMIT=40] -->
+    <string name="zen_mode_behavior_no_sound_except">No sound except <xliff:g id="categories" example="alarms, media and system feedback">%1$s</xliff:g></string>
+
+    <!-- Do not disturb: Specifies sounds that can bypass DND in user and/or API-invoked Alarms Only mode.  [CHAR LIMIT=100] -->
+    <string name="zen_mode_behavior_alarms_only">No sound except alarms, media and system feedback (Alarms only)</string>
+
+    <!--  Do not disturb: Title for the zen mode automation option in Settings. [CHAR LIMIT=40] -->
+    <string name="zen_mode_automation_settings_title">Turn on automatically</string>
+
+    <!--  Do not disturb: Title for the zen mode automatic rules page in settings. [CHAR LIMIT=30] -->
+    <string name="zen_mode_automation_settings_page_title">Automatic rules</string>
 
     <!--  Do not disturb: Title for the zen mode automation option Suggestion. [CHAR LIMIT=50] -->
     <string name="zen_mode_automation_suggestion_title">Set Do Not Disturb rules</string>
@@ -6732,6 +6762,33 @@
     <!--  Do not disturb: Title for the Visual interruptions option and associated settings page. [CHAR LIMIT=30] -->
     <string name="zen_mode_visual_interruptions_settings_title">Block visual disturbances</string>
 
+    <!--  Do not disturb: Subtitle for the Visual signals option to toggle on/off visual signals/alerts when the screen is on/when screen is off. [CHAR LIMIT=30] -->
+    <string name="zen_mode_visual_signals_settings_subtitle">Allow visual signals</string>
+
+    <!--  Do not disturb: Button to add new automatic rule to DND. [CHAR LIMIT=30] -->
+    <string name="zen_mode_add">Add</string>
+
+    <!--  Do not disturb: Label for button that will turn on zen mode. [CHAR LIMIT=30] -->
+    <string name="zen_mode_button_turn_on">TURN ON NOW</string>
+
+    <!--  Do not disturb: Label for button that will turn off zen mode. [CHAR LIMIT=30] -->
+    <string name="zen_mode_button_turn_off">TURN OFF NOW</string>
+
+    <!-- [CHAR LIMIT=110] Zen mode settings footer: Footer showing end time of DND -->
+    <string name="zen_mode_settings_dnd_manual_end_time_next_day">Do Not Disturb is on until <xliff:g id="formatted_time" example="7:00 AM">%s</xliff:g></string>
+
+    <!-- [CHAR LIMIT=110] Zen mode settings footer: Footer showing length of DND -->
+    <string name="zen_mode_settings_dnd_manual_indefinite">Do Not Disturb will stay on until you turn it off.</string>
+
+    <!-- [CHAR LIMIT=110] Zen mode settings footer: Footer showing how DND was triggered by an automatic DND rule -->
+    <string name="zen_mode_settings_dnd_automatic_rule">Do Not Disturb was automatically turned on by a rule <xliff:g id="rule_name" example="Weeknights">%s</xliff:g></string>
+
+    <!-- [CHAR LIMIT=110] Zen mode settings footer: Footer how DND was triggered by an app -->
+    <string name="zen_mode_settings_dnd_automatic_rule_app">Do Not Disturb was automatically turned on by an app <xliff:g id="app_name" example="Pixel Services">%s</xliff:g></string>
+
+    <!-- [CHAR LIMIT=110] Zen mode settings footer: Footer how DND was triggered by multiple rules and/or apps -->
+    <string name="zen_mode_settings_dnd_automatic_rule_multiple">Do Not Disturb was automatically turned on by a rule or app</string>
+
     <!-- Work Sounds: Work sound settings section header.  [CHAR LIMIT=50] -->
     <string name="sound_work_settings">Work profile sounds</string>
 
@@ -6841,6 +6898,9 @@
     <!-- [CHAR LIMIT=100] Notification channel title -->
     <string name="notification_channel_title">Notification category</string>
 
+    <!-- [CHAR LIMIT=200] Notification channel group title -->
+    <string name="notification_group_title">Notification category group</string>
+
     <!-- [CHAR LIMIT=100] Notification importance screen title -->
     <string name="notification_importance_title">Importance</string>
 
@@ -7008,12 +7068,21 @@
     <!-- [CHAR LIMIT=NONE] Text appearing when channel notifications are off -->
     <string name="channel_notifications_off_desc">Android is blocking this category of notifications from appearing on this device</string>
 
+    <!-- [CHAR LIMIT=NONE] Text appearing when channel group notifications are off -->
+    <string name="channel_group_notifications_off_desc">Android is blocking this group of notifications from appearing on this device</string>
+
     <!-- [CHAR LIMIT=NONE] App notification settings: channels title -->
     <string name="notification_channels">Categories</string>
 
     <!-- [CHAR LIMIT=NONE] App notification settings: non-grouped-channels title -->
     <string name="notification_channels_other">Other</string>
 
+    <!-- [CHAR LIMIT=45] App notification settings, group summary-->
+    <plurals name="notification_group_summary">
+        <item quantity="one"><xliff:g id="count" example="1">%d</xliff:g> category</item>
+        <item quantity="other"><xliff:g id="count" example="10">%d</xliff:g> categories</item>
+    </plurals>
+
     <!-- [CHAR LIMIT=NONE] App notification settings: no channels -->
     <string name="no_channels">This app has not posted any notifications</string>
 
@@ -7107,7 +7176,13 @@
     <string name="zen_mode_rule_name_warning">Rule name already in use</string>
 
     <!-- [CHAR LIMIT=40] Zen mode settings: Add rule menu option name -->
-    <string name="zen_mode_add_rule">Add more</string>
+    <string name="zen_mode_add_rule">Add rule</string>
+
+    <!-- [CHAR LIMIT=40] Zen mode settings: Add event-based rule, set rule name title -->
+    <string name="zen_mode_add_event_rule">Add event rule</string>
+
+    <!-- [CHAR LIMIT=40] Zen mode settings: Add time-based rule, set rule name title -->
+    <string name="zen_mode_add_time_rule">Add time rule</string>
 
     <!-- [CHAR LIMIT=40] Zen mode settings: Delete rule menu option name -->
     <string name="zen_mode_delete_rule">Delete rule</string>
@@ -7131,13 +7206,13 @@
     <string name="zen_mode_configure_rule">Configure rule</string>
 
     <!-- [CHAR LIMIT=40] Zen mode settings: Schedule rule type name -->
-    <string name="zen_schedule_rule_type_name">Time rule</string>
+    <string name="zen_schedule_rule_type_name">Time</string>
 
     <!-- [CHAR LIMIT=NONE] Zen mode settings: Schedule rule toast hint when enabled -->
     <string name="zen_schedule_rule_enabled_toast">Automatic rule set to turn on Do Not Disturb during specified times</string>
 
     <!-- [CHAR LIMIT=40] Zen mode settings: Event rule type name -->
-    <string name="zen_event_rule_type_name">Event rule</string>
+    <string name="zen_event_rule_type_name">Event</string>
 
     <!-- [CHAR LIMIT=NONE] Zen mode settings: Event rule toast hint when enabled -->
     <string name="zen_event_rule_enabled_toast">Automatic rule set to turn on Do Not Disturb during specified events</string>
@@ -7229,8 +7304,8 @@
     <!-- [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: Media and system sounds option -->
+    <string name="zen_mode_media_system_other">Media and system feedback</string>
 
     <!-- [CHAR LIMIT=50] Zen mode settings: Reminders option -->
     <string name="zen_mode_reminders">Reminders</string>
@@ -7248,7 +7323,7 @@
     <string name="zen_mode_repeat_callers">Repeat callers</string>
 
     <!-- [CHAR LIMIT=200] Zen mode settings: Repeat callers option summary -->
-    <string name="zen_mode_repeat_callers_summary">If the same person calls a second time within a <xliff:g id="minutes">%d</xliff:g> minute period, allow it</string>
+    <string name="zen_mode_repeat_callers_summary">If the same person calls a second time within a <xliff:g id="minutes">%d</xliff:g> minute period</string>
 
     <!-- [CHAR LIMIT=20] Zen mode settings: When option -->
     <string name="zen_mode_when">Automatically turn on</string>
@@ -7292,33 +7367,23 @@
     <!-- [CHAR LIMIT=NONE] Zen mode summary spoken when changing mode by voice: Turn on all notifications. -->
     <string name="zen_mode_summary_always">Change to always interrupt</string>
 
-    <!-- [CHAR LIMIT=40] Zen mode settings: visual interruptions: screen is on: title -->
-    <string name="zen_mode_screen_on">Block when screen is on</string>
-
-    <!-- [CHAR LIMIT=130] Zen mode settings:  visual interruptions: screen is on: summary -->
-    <string name="zen_mode_screen_on_summary">Prevent notifications silenced by Do Not Disturb from peeking or popping on screen</string>
-
-    <!-- [CHAR LIMIT=40] Zen mode settings: visual interruptions: screen is off: title -->
-    <string name="zen_mode_screen_off">Block when screen is off</string>
-
+    <!-- [CHAR LIMIT=40] Zen mode settings: visual signals: screen is on: title -->
+    <string name="zen_mode_screen_on">When the screen is on</string>
+    <!-- [CHAR LIMIT=130] Zen mode settings:  visual signals: screen is on: summary -->
+    <string name="zen_mode_screen_on_summary">Let notifications silenced by Do Not Disturb pop on screen</string>
+    <!-- [CHAR LIMIT=40] Zen mode settings: visual signals: screen is off: title -->
+    <string name="zen_mode_screen_off">When the screen is off</string>
     <!-- [CHAR LIMIT=130] Zen mode settings:  visual interruptions: screen is off: summary -->
-    <string name="zen_mode_screen_off_summary">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">Let notifications silenced by Do Not Disturb turn on the screen and blink the light</string>
     <!-- [CHAR LIMIT=130] Zen mode settings:  visual interruptions: screen is off: summary -->
-    <string name="zen_mode_screen_off_summary_no_led">Prevent notifications silenced by Do Not Disturb from turning on the screen</string>
-
-    <!-- [CHAR LIMIT=130] Zen mode settings:  visual interruptions summary -->
-    <string name="zen_mode_all_visual_interruptions">Off</string>
-    <!-- [CHAR LIMIT=130] Zen mode settings:  visual interruptions summary -->
-    <string name="zen_mode_screen_on_visual_interruptions">When screen is on</string>
-    <!-- [CHAR LIMIT=130] Zen mode settings:  visual interruptions summary -->
-    <string name="zen_mode_screen_off_visual_interruptions">When screen is off</string>
-    <!-- [CHAR LIMIT=130] Zen mode settings:  visual interruptions summary -->
-    <string name="zen_mode_no_visual_interruptions">When screen is on or off</string>
+    <string name="zen_mode_screen_off_summary_no_led">Let notifications silenced by Do Not Disturb turn on the screen</string>
 
     <!-- [CHAR LIMIT=NONE] Content description for per-app notification
          settings button -->
     <string name="notification_app_settings_button">Notification settings</string>
 
+    <!-- Generic label for suggestion card's ok button [CHAR LIMIT=20] -->
+    <string name="suggestion_button_text">Ok</string>
 
     <!-- [CHAR LIMIT=35] Feedback on the device -->
     <string name="device_feedback">Send feedback about this device</string>
@@ -7994,7 +8059,7 @@
     <!-- Link to the apps page for WRITE_SETTINGS settings [CHAR LIMIT=52] -->
     <string name="write_settings_preference">App modify system settings permission</string>
     <!-- Label for setting which controls whether app can write system settings [CHAR LIMIT=45] -->
-    <string name="permit_write_settings">Allow modify system settings</string>
+    <string name="permit_write_settings">Allow modifying system settings</string>
     <!-- Description of the write system settings [CHAR LIMIT=NONE] -->
     <string name="write_settings_description">This permission allows an app to modify system settings.</string>
     <!-- Summary of app allowed to write system settings [CHAR LIMIT=45] -->
@@ -8161,7 +8226,7 @@
     <string name="condition_airplane_title">Airplane mode is on</string>
 
     <!-- Summary of condition that airplane mode is on [CHAR LIMIT=NONE] -->
-    <string name="condition_airplane_summary">Wi-Fi, Bluetooth, and mobile network are turned off. You can\'t make phone calls or connect to the Internet.</string>
+    <string name="condition_airplane_summary">Wi-Fi, Bluetooth, and mobile network are turned off. You can\'t make phone calls or connect to the internet.</string>
 
     <!-- Title of condition that do not disturb is on [CHAR LIMIT=30] -->
     <string name="condition_zen_title">Do not disturb is on (<xliff:g name="zen_mode_type" example="Alarms only">%1$s</xliff:g>)</string>
@@ -8238,8 +8303,14 @@
     <!-- Toast message letting the user know the color temperature setting is not immediate -->
     <string name="color_temperature_toast">To apply color change, turn off screen</string>
 
-    <!-- Toast message letting the user know the how to trigger telephony monitor -->
-    <string name="telephony_monitor_toast">To apply telephony monitor change, reboot device</string>
+    <!-- UI debug setting: title for ConnectivityMonitor switch [CHAR LIMIT=50] -->
+    <string name="connectivity_monitor_switch">Connectivity Monitor</string>
+
+    <!-- UI debug setting: summary for switch of ConnectivityMonitor [CHAR LIMIT=500] -->
+    <string name="connectivity_monitor_switch_summary">ConnectivityMonitor will collect logs when it detects a connectivity problem and prompt notification to user to file a bug</string>
+
+    <!-- Toast message letting the user know the how to apply connectivity monitor change -->
+    <string name="connectivity_monitor_toast">To apply connectivity monitor change, reboot device</string>
 
     <!-- Title for Camera laser sensor switch [CHAR LIMIT=NONE] -->
     <string name="camera_laser_sensor_switch">Camera Laser Sensor</string>
@@ -8637,27 +8708,6 @@
     <!-- Estimated wait time range for real time supports -->
     <string name="support_estimated_wait_time">~<xliff:g id="ESTIMATE" example="2 minutes">%1$s</xliff:g> wait</string>
 
-    <!-- Message for telling the user the kind of BT device being displayed in list. -->
-    <string name="bluetooth_talkback_computer">Computer</string>
-
-    <!-- Message for telling the user the kind of BT device being displayed in list. -->
-    <string name="bluetooth_talkback_headset">Headset</string>
-
-    <!-- Message for telling the user the kind of BT device being displayed in list. -->
-    <string name="bluetooth_talkback_phone">Phone</string>
-
-    <!-- Message for telling the user the kind of BT device being displayed in list. -->
-    <string name="bluetooth_talkback_imaging">Imaging</string>
-
-    <!-- Message for telling the user the kind of BT device being displayed in list. -->
-    <string name="bluetooth_talkback_headphone">Headphone</string>
-
-    <!-- Message for telling the user the kind of BT device being displayed in list. -->
-    <string name="bluetooth_talkback_input_peripheral">Input Peripheral</string>
-
-    <!-- Message for telling the user the kind of BT device being displayed in list. -->
-    <string name="bluetooth_talkback_bluetooth">Bluetooth</string>
-
     <!-- Used as title on the automatic storage manager settings. [CHAR LIMIT=60] -->
     <string name="automatic_storage_manager_settings">Manage storage</string>
 
@@ -8749,6 +8799,8 @@
 
     <!-- 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>
+    <!-- Title text for fingerprint gesture preference screen [CHAR LIMIT=25] -->
+    <string name="fingerprint_gesture_screen_title">Swipe fingerprint</string>
 
     <!-- Summary text for fingerprint swipe for notifications (phone) [CHAR LIMIT=160]-->
     <string name="fingerprint_swipe_for_notifications_summary" product="default">To check your notifications, swipe down on the fingerprint sensor on the back of your phone.</string>
@@ -8773,12 +8825,13 @@
     <!-- setting enable OEM unlock Checkbox's summary to explain this Checkbox is disabled because the bootloader has been unlocked [CHAR_LIMIT=60] -->
     <string name="oem_unlock_enable_disabled_summary_bootloader_unlocked">Bootloader is already unlocked</string>
     <!-- setting enable OEM unlock Checkbox's summary to explain this Checkbox is disabled because there is no connectivity. [CHAR_LIMIT=60] -->
-    <string name="oem_unlock_enable_disabled_summary_connectivity">Connect to the Internet first</string>
+    <string name="oem_unlock_enable_disabled_summary_connectivity">Connect to the internet first</string>
     <!-- setting enable OEM unlock Checkbox's summary to explain this Checkbox is disabled because there is no connectivity or the device is locked by the carrier [CHAR_LIMIT=60] -->
-    <string name="oem_unlock_enable_disabled_summary_connectivity_or_locked">Connect to the Internet or contact your carrier</string>
+    <string name="oem_unlock_enable_disabled_summary_connectivity_or_locked">Connect to the internet or contact your carrier</string>
     <!-- setting enable OEM unlock Checkbox's summary to explain this Checkbox is disabled because this setting is unavailable on sim-locked devices. [CHAR_LIMIT=60] -->
     <string name="oem_unlock_enable_disabled_summary_sim_locked_device">Unavailable on carrier-locked devices</string>
-
+    <!-- Information displayed after user locks OEM lock [Char Limit=None]-->
+    <string name="oem_lock_info_message">Please restart the device to enable device protection feature.</string>
     <string name="automatic_storage_manager_freed_bytes"><xliff:g id="size" example="3.25MB">%1$s</xliff:g> total made available\n\nLast ran on <xliff:g id="date" example="Jan 12">%2$s</xliff:g></string>
 
     <!-- Title text for enabling web actions. [CHAR_LIMIT=60] -->
@@ -9013,6 +9066,11 @@
     <!-- Temporary reboot string, will be removed -->
     <string name="change_theme_reboot" translatable="false">Changing the theme requires a restart.</string>
 
+    <!-- Switch label to show operator name in the status bar [CHAR LIMIT=60] -->
+    <string name="show_operator_name_title">Network name</string>
+    <!-- Switch summary to show operator name in the status bar [CHAR LIMIT=NONE] -->
+    <string name="show_operator_name_summary">Display network name in status bar</string>
+
     <!-- Indicates if the automatic storage manager is enabled or not. [CHAR_LIMIT=40] -->
     <string name="storage_manager_indicator">Storage Manager: <xliff:g id="status" example="on">^1</xliff:g></string>
 
@@ -9057,10 +9115,4 @@
     <!-- Note displayed when certain features are not available on low ram devices. [CHAR LIMIT=NONE] -->
     <string name="disabled_low_ram_device">This feature is not available on this device</string>
 
-    <!--Label of IMS registration header -->
-    <string name="ims_reg_title">"IMS registration state"</string>
-    <!--Used when IMS registration state is registered -->
-    <string name="ims_reg_status_registered">"Registered"</string>
-    <!--Used when IMS registration state is not registered -->
-    <string name="ims_reg_status_not_registered">"Not registered"</string>
 </resources>
diff --git a/res/values/styles.xml b/res/values/styles.xml
index f3e16bf..c68eb72 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -218,6 +218,7 @@
         <item name="android:paddingStart">4dip</item>
         <item name="android:layout_marginStart">4dip</item>
         <item name="android:textSize">18sp</item>
+        <item name="android:textAlignment">viewStart</item>
     </style>
 
     <style name="wifi_section">
@@ -318,7 +319,10 @@
     <style name="TextAppearance.SuggestionTitle"
            parent="@android:style/TextAppearance.Material.Subhead">
         <item name="android:fontFamily">sans-serif-medium</item>
-        <item name="android:textSize">14sp</item>
+    </style>
+
+    <style name="TextAppearance.SuggestionSummary" parent="TextAppearance.Small">
+        <item name="android:textColor">?android:attr/textColorSecondary</item>
     </style>
 
     <style name="TextAppearance.FingerprintErrorText"
@@ -334,10 +338,8 @@
 
     <style name="TextAppearance.SupportSummary" parent="TextAppearance.CategoryTitle"/>
 
-    <style name="SupportPrimaryButton" parent="android:Widget.Material.Button.Colored"/>
-
     <style name="SupportSecondaryButton"
-           parent="android:Widget.Material.Button.Borderless.Colored">
+           parent="android:Widget.DeviceDefault.Button.Borderless.Colored">
         <item name="android:textSize">12sp</item>
     </style>
 
@@ -421,9 +423,11 @@
         <item name="android:textSize">16sp</item>
     </style>
 
-    <style name="AppActionPrimaryButton" parent="android:Widget.Material.Button.Colored"/>
+    <style name="ActionPrimaryButton" parent="android:Widget.DeviceDefault.Button.Colored"/>
 
-    <style name="DreamStartButton" parent="android:Widget.Material.Button" />
+    <style name="ActionSecondaryButton" parent="android:Widget.DeviceDefault.Button"/>
+
+    <style name="DreamStartButton" parent="android:Widget.DeviceDefault.Button" />
 
     <style name="LockPatternContainerStyle">
         <item name="android:maxHeight">400dp</item>
@@ -473,4 +477,16 @@
         <item name="android:textSize">@dimen/search_bar_text_size</item>
     </style>
 
+    <style name="device_info_dialog_label">
+        <item name="android:textAlignment">viewStart</item>
+        <item name="android:textAppearance">@android:style/TextAppearance.Material.Body1</item>
+        <item name="android:textColor">?android:attr/textColorSecondary</item>
+    </style>
+
+    <style name="device_info_dialog_value">
+        <item name="android:textAlignment">viewStart</item>
+        <item name="android:textAppearance">@android:style/TextAppearance.Material.Body2</item>
+        <item name="android:paddingBottom">24dp</item>
+    </style>
+
 </resources>
diff --git a/res/values/styles_preference.xml b/res/values/styles_preference.xml
index 056d55a..b8b9eb3 100644
--- a/res/values/styles_preference.xml
+++ b/res/values/styles_preference.xml
@@ -20,19 +20,19 @@
 <resources>
 
     <!-- Fragment style -->
-    <style name="SettingsPreferenceFragmentStyle" parent="@style/PreferenceFragmentStyle.SettingsBase">
+    <style name="SettingsPreferenceFragmentStyle" parent="@style/PreferenceFragment.Material">
         <item name="android:layout">@layout/preference_list_fragment</item>
     </style>
 
-    <style name="ApnPreference" parent="Preference.SettingsBase">
+    <style name="ApnPreference" parent="@style/Preference.Material">
         <item name="android:layout">@layout/apn_preference_layout</item>
     </style>
 
-    <style name="SettingsSeekBarPreference" parent="Preference.SettingsBase">
+    <style name="SettingsSeekBarPreference" parent="@style/Preference.Material">
         <item name="android:layout">@layout/preference_widget_seekbar_settings</item>
     </style>
 
-    <style name="SyncSwitchPreference" parent="Preference.SettingsBase">
+    <style name="SyncSwitchPreference" parent="@style/Preference.Material">
         <item name="android:widgetLayout">@layout/preference_widget_sync_toggle</item>
     </style>
 
diff --git a/res/xml/accessibility_settings.xml b/res/xml/accessibility_settings.xml
index 02b9949..7728a07 100644
--- a/res/xml/accessibility_settings.xml
+++ b/res/xml/accessibility_settings.xml
@@ -15,6 +15,7 @@
 -->
 
 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
+        android:key="accessibility_settings_screen"
         android:title="@string/accessibility_settings"
         android:persistent="true">
 
@@ -43,13 +44,14 @@
             android:title="@string/display_category_title">
 
         <Preference
-                android:fragment="com.android.settings.accessibility.ToggleFontSizePreferenceFragment"
-                android:key="font_size_preference_screen"
-                android:title="@string/title_font_size"/>
+            android:fragment="com.android.settings.accessibility.ToggleFontSizePreferenceFragment"
+            android:key="font_size_preference_screen"
+            android:title="@string/title_font_size" />
 
         <com.android.settings.display.ScreenZoomPreference
-                android:key="screen_zoom"
-                android:title="@string/screen_zoom_title"/>
+            android:key="accessibility_settings_screen_zoom"
+            android:fragment="com.android.settings.display.ScreenZoomSettings"
+            android:title="@string/screen_zoom_title" />
 
         <Preference
             android:fragment="com.android.settings.accessibility.MagnificationPreferenceFragment"
diff --git a/res/xml/accessibility_shortcut_service_settings.xml b/res/xml/accessibility_shortcut_service_settings.xml
new file mode 100644
index 0000000..573939a
--- /dev/null
+++ b/res/xml/accessibility_shortcut_service_settings.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.
+  -->
+
+<PreferenceScreen
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:title="@string/accessibility_shortcut_service_title" />
diff --git a/res/xml/account_type_settings.xml b/res/xml/account_type_settings.xml
index 31f3f69..29f92ea 100644
--- a/res/xml/account_type_settings.xml
+++ b/res/xml/account_type_settings.xml
@@ -15,7 +15,7 @@
 -->
 
 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
-                  xmlns:settings="http://schemas.android.com/apk/res/com.android.settings"
+                  xmlns:settings="http://schemas.android.com/apk/res-auto"
         android:title="@string/account_settings_title"
         settings:keywords="@string/keywords_accounts">
 
diff --git a/res/xml/ambient_display_settings.xml b/res/xml/ambient_display_settings.xml
index 47fed8a..a8ded0d 100644
--- a/res/xml/ambient_display_settings.xml
+++ b/res/xml/ambient_display_settings.xml
@@ -16,11 +16,13 @@
   -->
 
 <PreferenceScreen
-        xmlns:android="http://schemas.android.com/apk/res/android"
-        android:title="@string/ambient_display_screen_title">
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:key="ambient_display_preference_screen"
+    android:title="@string/ambient_display_screen_title">
 
     <PreferenceCategory
-            android:title="@string/ambient_display_category_triggers">
+        android:key="ambient_display_category_when_to_show"
+        android:title="@string/ambient_display_category_triggers">
 
         <SwitchPreference
             android:key="ambient_display_always_on"
@@ -39,7 +41,8 @@
 
     </PreferenceCategory>
 
-    <PreferenceCategory>
+    <PreferenceCategory
+        android:key="ambient_display_category_notification">
 
         <SwitchPreference
             android:key="ambient_display_notification"
diff --git a/res/xml/apn_settings.xml b/res/xml/apn_settings.xml
index 86a336c..98b45a1 100644
--- a/res/xml/apn_settings.xml
+++ b/res/xml/apn_settings.xml
@@ -15,6 +15,6 @@
 -->
 
 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
-        xmlns:settings="http://schemas.android.com/apk/res/com.android.settings"
+        xmlns:settings="http://schemas.android.com/apk/res-auto"
         android:title="@string/apn_settings" android:key="apn_list">
 </PreferenceScreen>
diff --git a/res/xml/app_and_notification.xml b/res/xml/app_and_notification.xml
index 15048c7..f08afa8 100644
--- a/res/xml/app_and_notification.xml
+++ b/res/xml/app_and_notification.xml
@@ -17,8 +17,10 @@
 
 <PreferenceScreen
     xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:settings="http://schemas.android.com/apk/res/com.android.settings"
-    android:title="@string/app_and_notification_dashboard_title">
+    xmlns:settings="http://schemas.android.com/apk/res-auto"
+    android:key="apps_and_notification_screen"
+    android:title="@string/app_and_notification_dashboard_title"
+    settings:initialExpandedChildrenCount="4">
 
     <PreferenceCategory
         android:key="recent_apps_category"
@@ -70,12 +72,8 @@
 
     <Preference
         android:key="special_access"
+        android:fragment="com.android.settings.applications.SpecialAccessSettings"
         android:title="@string/special_access"
-        android:order="20" >
-        <intent
-            android:action="android.intent.action.MAIN"
-            android:targetPackage="com.android.settings"
-            android:targetClass="com.android.settings.Settings$SpecialAccessSettingsActivity" />
-    </Preference>
+        android:order="20" />
 
 </PreferenceScreen>
\ No newline at end of file
diff --git a/res/xml/app_data_usage.xml b/res/xml/app_data_usage.xml
index 26a339a..3e94135 100644
--- a/res/xml/app_data_usage.xml
+++ b/res/xml/app_data_usage.xml
@@ -14,8 +14,9 @@
      limitations under the License.
 -->
 
-<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
-                  android:title="@string/data_usage_summary_title">
+<PreferenceScreen
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:title="@string/data_usage_app_summary_title">
 
     <com.android.settings.datausage.SpinnerPreference
         android:key="cycle" />
diff --git a/res/xml/app_default_settings.xml b/res/xml/app_default_settings.xml
index 196ed9f..698ab0c 100644
--- a/res/xml/app_default_settings.xml
+++ b/res/xml/app_default_settings.xml
@@ -17,82 +17,83 @@
 
 <PreferenceScreen
     xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:settings="http://schemas.android.com/apk/res/com.android.settings"
+    xmlns:settings="http://schemas.android.com/apk/res-auto"
+    android:key="app_default_settings_screen"
     android:title="@string/app_default_dashboard_title">
 
-    <Preference
+    <com.android.settings.widget.AppPreference
         android:key="assist_and_voice_input"
         android:title="@string/assist_and_voice_input_title"
         android:fragment="com.android.settings.applications.assist.ManageAssist" />
 
-    <Preference
+    <com.android.settings.widget.AppPreference
         android:key="default_browser"
         android:title="@string/default_browser_title"
         android:fragment="com.android.settings.applications.defaultapps.DefaultBrowserPicker">
         <extra android:name="for_work" android:value="false" />
-    </Preference>
+    </com.android.settings.widget.AppPreference>
 
-    <Preference
+    <com.android.settings.widget.GearPreference
         android:key="default_home"
         android:title="@string/home_app"
         android:fragment="com.android.settings.applications.defaultapps.DefaultHomePicker"
         settings:keywords="@string/keywords_home" />
 
-    <Preference
+    <com.android.settings.widget.AppPreference
         android:key="default_phone_app"
         android:title="@string/default_phone_title"
         android:fragment="com.android.settings.applications.defaultapps.DefaultPhonePicker"
         settings:keywords="@string/keywords_default_phone_app" />
 
-    <Preference
+    <com.android.settings.widget.AppPreference
         android:key="default_sms_app"
         android:title="@string/sms_application_title"
         android:fragment="com.android.settings.applications.defaultapps.DefaultSmsPicker"
         settings:keywords="@string/keywords_more_default_sms_app" />
 
-    <Preference
+    <com.android.settings.widget.AppPreference
         android:key="default_payment_app"
         android:title="@string/nfc_payment_settings_title"
         android:summary="@string/summary_placeholder"
         android:fragment="com.android.settings.nfc.PaymentSettings" />
 
-    <Preference
+    <com.android.settings.widget.AppPreference
         android:key="default_emergency_app"
         android:title="@string/default_emergency_app"
         settings:keywords="@string/keywords_emergency_app" />
 
     <!--
-    <Preference
+    <com.android.settings.widget.AppPreference
         android:key="default_notification_asst_app"
         android:title="@string/default_notification_assistant"
         android:fragment="com.android.settings.applications.defaultapps.DefaultNotificationAssistantPicker"
         />
      -->
 
-    <Preference
+    <com.android.settings.widget.AppPreference
         android:key="domain_urls"
         android:title="@string/domain_urls_title"
         android:fragment="com.android.settings.applications.ManageDomainUrls" />
 
-    <com.android.settings.WorkOnlyCategory
-        android:key="work_defaults"
+    <com.android.settings.widget.WorkOnlyCategory
+        android:key="work_app_defaults"
         android:title="@string/default_for_work">
 
-        <Preference
+        <com.android.settings.widget.AppPreference
             android:key="work_default_browser"
             android:title="@string/default_browser_title"
             android:fragment="com.android.settings.applications.defaultapps.DefaultBrowserPicker">
             <extra android:name="for_work" android:value="true" />
-        </Preference>
+        </com.android.settings.widget.AppPreference>
 
-        <Preference
+        <com.android.settings.widget.AppPreference
             android:key="work_default_phone_app"
             android:title="@string/default_phone_title"
             android:fragment="com.android.settings.applications.defaultapps.DefaultPhonePicker"
             settings:keywords="@string/keywords_default_phone_app">
             <extra android:name="for_work" android:value="true" />
-        </Preference>
+        </com.android.settings.widget.AppPreference>
 
-    </com.android.settings.WorkOnlyCategory>
+    </com.android.settings.widget.WorkOnlyCategory>
 
 </PreferenceScreen>
diff --git a/res/xml/app_info_settings.xml b/res/xml/app_info_settings.xml
new file mode 100644
index 0000000..e2fb2e4
--- /dev/null
+++ b/res/xml/app_info_settings.xml
@@ -0,0 +1,113 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  Copyright (C) 2017 The Android Open Source Project
+
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+  -->
+
+<PreferenceScreen
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:key="installed_app_detail_settings_screen"
+    app:initialExpandedChildrenCount="6">
+
+    <com.android.settings.applications.LayoutPreference
+        android:key="header_view"
+        android:layout="@layout/settings_entity_header"
+        android:selectable="false"
+        android:order="-10000"/>
+
+    <com.android.settings.applications.LayoutPreference
+        android:key="instant_app_buttons"
+        android:layout="@layout/instant_app_buttons"
+        android:selectable="false"
+        android:order="-9999"/>
+
+    <com.android.settings.widget.ActionButtonPreference
+        android:key="action_buttons"
+        android:order="-9998" />
+
+    <Preference
+        android:key="notification_settings"
+        android:title="@string/notifications_label"/>
+
+    <com.android.settings.widget.FixedLineSummaryPreference
+        android:key="permission_settings"
+        android:title="@string/permissions_label"
+        android:summary="@string/summary_placeholder"
+        app:summaryLineCount="1" />
+
+    <Preference
+        android:key="storage_settings"
+        android:title="@string/storage_settings"
+        android:summary="@string/summary_placeholder"/>
+
+    <com.android.settings.applications.AppDomainsPreference
+        android:key="instant_app_launch_supported_domain_urls"
+        android:title="@string/app_launch_supported_domain_urls_title"
+        android:selectable="true" />
+
+    <Preference
+        android:key="data_settings"
+        android:title="@string/data_usage_summary_title"
+        android:summary="@string/summary_placeholder"/>
+
+    <Preference
+        android:key="battery"
+        android:title="@string/power_usage_summary_title"
+        android:summary="@string/summary_placeholder"/>
+
+    <Preference
+        android:key="preferred_settings"
+        android:title="@string/launch_by_default"
+        android:summary="@string/summary_placeholder"
+        android:selectable="true"/>
+
+    <Preference
+        android:key="memory"
+        android:title="@string/memory_settings_title"
+        android:summary="@string/summary_placeholder"
+        android:enabled="false"/>
+
+    <!-- Default apps shortcuts -->
+    <Preference
+        android:key="default_home"
+        android:title="@string/home_app"
+        android:summary="@string/summary_placeholder" />
+
+    <Preference
+        android:key="default_browser"
+        android:title="@string/default_browser_title"
+        android:summary="@string/summary_placeholder" />
+
+    <Preference
+        android:key="default_phone_app"
+        android:title="@string/default_phone_title"
+        android:summary="@string/default_phone_title" />
+
+    <Preference
+        android:key="default_emergency_app"
+        android:title="@string/default_emergency_app"
+        android:summary="@string/summary_placeholder" />
+
+    <Preference
+        android:key="default_sms_app"
+        android:title="@string/sms_application_title"
+        android:summary="@string/summary_placeholder" />
+
+    <Preference
+        android:key="app_version"
+        android:selectable="false"
+        android:order="9999"/>
+
+</PreferenceScreen>
\ No newline at end of file
diff --git a/res/xml/app_list_disclosure_settings.xml b/res/xml/app_list_disclosure_settings.xml
index 1daf15d..0874407 100644
--- a/res/xml/app_list_disclosure_settings.xml
+++ b/res/xml/app_list_disclosure_settings.xml
@@ -16,7 +16,7 @@
   -->
 
 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
-                  xmlns:settings="http://schemas.android.com/apk/res/com.android.settings"
+                  xmlns:settings="http://schemas.android.com/apk/res-auto"
                   android:key="app_list_disclosure_settings">
     <PreferenceCategory
             android:key="dashboard_tile_placeholder"/>
diff --git a/res/xml/app_notification_settings.xml b/res/xml/app_notification_settings.xml
new file mode 100644
index 0000000..b21d168
--- /dev/null
+++ b/res/xml/app_notification_settings.xml
@@ -0,0 +1,55 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2017 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
+        xmlns:settings="http://schemas.android.com/apk/res-auto">
+
+    <com.android.settings.applications.LayoutPreference
+        android:key="pref_app_header"
+        android:layout="@layout/settings_entity_header" />
+
+    <com.android.settings.applications.LayoutPreference
+        android:key="block"
+        android:layout="@layout/styled_switch_bar" />
+
+    <!-- Show badge -->
+    <com.android.settingslib.RestrictedSwitchPreference
+        android:key="badge"
+        android:title="@string/notification_badge_title"
+        settings:useAdditionalSummary="true"
+        settings:restrictedSwitchSummary="@string/enabled_by_admin" />
+
+    <!-- Channels/Channel groups added here -->
+
+    <Preference
+        android:key="app_link"
+        android:title="@string/app_settings_link"
+        android:order="500"
+        settings:allowDividerAbove="true"/>
+
+    <com.android.settings.notification.NotificationFooterPreference
+        android:key="block_desc"
+        android:order="1000" />
+
+    <com.android.settings.notification.NotificationFooterPreference
+        android:key="desc"
+        android:order="5000" />
+
+    <com.android.settings.notification.NotificationFooterPreference
+        android:key="deleted"
+        android:order="8000" />
+
+</PreferenceScreen>
diff --git a/res/xml/app_ops_permissions_details.xml b/res/xml/app_ops_permissions_details.xml
index c36f44e..743090f 100644
--- a/res/xml/app_ops_permissions_details.xml
+++ b/res/xml/app_ops_permissions_details.xml
@@ -15,7 +15,7 @@
 -->
 
 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:settings="http://schemas.android.com/apk/res/com.android.settings">
+    xmlns:settings="http://schemas.android.com/apk/res-auto">
 
     <SwitchPreference
         android:key="app_ops_settings_switch" />
diff --git a/res/xml/app_restrictions.xml b/res/xml/app_restrictions.xml
index ddc911d..3515fc1 100644
--- a/res/xml/app_restrictions.xml
+++ b/res/xml/app_restrictions.xml
@@ -16,7 +16,7 @@
 
 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
         android:title="@string/application_restrictions"
-        xmlns:settings="http://schemas.android.com/apk/res/com.android.settings">
+        xmlns:settings="http://schemas.android.com/apk/res-auto">
 
     <Preference
         android:key="user_info"
diff --git a/res/xml/app_storage_settings.xml b/res/xml/app_storage_settings.xml
index b96afbf..ba18b1f 100644
--- a/res/xml/app_storage_settings.xml
+++ b/res/xml/app_storage_settings.xml
@@ -14,14 +14,13 @@
      limitations under the License.
 -->
 
-<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
-                  xmlns:settings="http://schemas.android.com/apk/res-auto"
-                  android:title="@string/application_info_label">
+<PreferenceScreen
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:settings="http://schemas.android.com/apk/res-auto"
+    android:title="@string/storage_label">
 
-    <com.android.settings.applications.LayoutPreference
-        android:key="header_view"
-        android:layout="@layout/app_action_buttons"
-        android:selectable="false" />
+    <com.android.settings.widget.ActionButtonPreference
+        android:key="header_view" />
 
     <com.android.settings.applications.SpacePreference
         android:key="storage_space"
diff --git a/res/xml/application_settings.xml b/res/xml/application_settings.xml
deleted file mode 100644
index 9987fc2..0000000
--- a/res/xml/application_settings.xml
+++ /dev/null
@@ -1,64 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2008 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-  
-          http://www.apache.org/licenses/LICENSE-2.0
-  
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<!--
-
-      This code is deprecated. This screen is no longer used in Settings.
-      The ApplicationSettings class is kept in case an external app references it directly.
-
--->
-
-<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
-        android:title="@string/applications_settings"
-        android:summary="@string/applications_settings_summary"
-        android:key="applications_settings">
-
-    <Preference
-            android:fragment="com.android.settings.applications.ManageApplications"
-            android:title="@string/manageapplications_settings_title"
-            android:summary="@string/manageapplications_settings_summary">
-    </Preference>
-
-    <Preference
-            android:fragment="com.android.settings.applications.ManageApplications"
-            android:title="@string/runningservices_settings_title"
-            android:summary="@string/runningservices_settings_summary">
-        <extra android:name="classname" android:value="com.android.settings.Settings$RunningServicesActivity" />
-    </Preference>
-
-    <Preference
-            android:fragment="com.android.settings.applications.ManageApplications"
-            android:title="@string/storageuse_settings_title"
-            android:summary="@string/storageuse_settings_summary">
-        <extra android:name="classname"
-                android:value="com.android.settings.Settings$StorageUseActivity" />
-    </Preference>
-
-    <CheckBoxPreference
-            android:key="toggle_advanced_settings"
-            android:title="@string/advanced_settings"
-            android:summaryOff="@string/advanced_settings_summary"
-            android:summaryOn="@string/advanced_settings_summary" />
-
-    <ListPreference
-        android:key="app_install_location"
-        android:title="@string/app_install_location_title"
-        android:summary="@string/app_install_location_summary"
-        android:entries="@array/app_install_location_entries"
-        android:entryValues="@array/app_install_location_values"/>
-
-</PreferenceScreen>
-
diff --git a/res/xml/backup_settings.xml b/res/xml/backup_settings.xml
index 30792bc..523c2dc 100644
--- a/res/xml/backup_settings.xml
+++ b/res/xml/backup_settings.xml
@@ -16,7 +16,7 @@
   -->
 
 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:settings="http://schemas.android.com/apk/res/com.android.settings"
+    xmlns:settings="http://schemas.android.com/apk/res-auto"
     android:title="@string/privacy_settings_title">
 
     <!-- Backup settings provided by the backup transport or the default settings -->
diff --git a/res/xml/billing_cycle.xml b/res/xml/billing_cycle.xml
index 8c77ad6..7b61979 100644
--- a/res/xml/billing_cycle.xml
+++ b/res/xml/billing_cycle.xml
@@ -14,8 +14,9 @@
      limitations under the License.
 -->
 
-<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
-    android:title="@string/data_usage_summary_title">
+<PreferenceScreen
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:title="@string/billing_cycle">
 
     <Preference
         android:key="billing_cycle"
diff --git a/res/xml/bluetooth_device_details_fragment.xml b/res/xml/bluetooth_device_details_fragment.xml
index 952ec1a..c8f5c1b 100644
--- a/res/xml/bluetooth_device_details_fragment.xml
+++ b/res/xml/bluetooth_device_details_fragment.xml
@@ -16,17 +16,15 @@
   -->
 <PreferenceScreen
     xmlns:android="http://schemas.android.com/apk/res/android"
-    android:title="@string/bluetooth_device_advanced_title">
+    android:title="@string/device_details_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"/>
+    <com.android.settings.widget.ActionButtonPreference
+        android:key="action_buttons" />
 
     <PreferenceCategory
         android:key="bluetooth_profiles"/>
diff --git a/res/xml/bluetooth_pairing_detail.xml b/res/xml/bluetooth_pairing_detail.xml
index 30eaf09..e60da75 100644
--- a/res/xml/bluetooth_pairing_detail.xml
+++ b/res/xml/bluetooth_pairing_detail.xml
@@ -16,7 +16,7 @@
 
 <PreferenceScreen
     xmlns:android="http://schemas.android.com/apk/res/android"
-    android:title="@string/bluetooth_settings">
+    android:title="@string/bluetooth_pairing_pref_title">
 
     <Preference
         android:key="device_name"/>
diff --git a/res/xml/captioning_settings.xml b/res/xml/captioning_settings.xml
index 5ba89cf..3129738 100644
--- a/res/xml/captioning_settings.xml
+++ b/res/xml/captioning_settings.xml
@@ -16,7 +16,7 @@
 -->
 
 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:settings="http://schemas.android.com/apk/res/com.android.settings"
+    xmlns:settings="http://schemas.android.com/apk/res-auto"
     android:fragment="com.android.settings.accessibility.CaptionPropertiesFragment"
     android:key="captioning_preference_screen"
     android:title="@string/accessibility_captioning_title" >
diff --git a/res/xml/channel_notification_settings.xml b/res/xml/channel_notification_settings.xml
new file mode 100644
index 0000000..fb2705a
--- /dev/null
+++ b/res/xml/channel_notification_settings.xml
@@ -0,0 +1,90 @@
+<?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.
+-->
+
+<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
+        xmlns:settings="http://schemas.android.com/apk/res-auto" >
+
+    <com.android.settings.applications.LayoutPreference
+        android:key="pref_app_header"
+        android:layout="@layout/settings_entity_header" />
+
+    <com.android.settings.applications.LayoutPreference
+        android:key="block"
+        android:layout="@layout/styled_switch_bar" />
+
+    <!-- Importance -->
+    <Preference
+        android:key="importance"
+        android:title="@string/notification_importance_title" />
+
+    <!-- Importance toggle -->
+    <com.android.settingslib.RestrictedSwitchPreference
+        android:key="allow_sound"
+        android:title="@string/allow_interruption"
+        android:summary="@string/allow_interruption_summary" />
+
+    <!-- Default ringtone -->
+    <com.android.settings.notification.NotificationSoundPreference
+        android:key="ringtone"
+        android:title="@string/notification_channel_sound_title"
+        android:dialogTitle="@string/notification_channel_sound_title"
+        android:showSilent="true"
+        android:showDefault="true"
+        android:ringtoneType="notification" />
+
+    <!-- Vibration -->
+    <com.android.settingslib.RestrictedSwitchPreference
+        android:key="vibrate"
+        android:title="@string/notification_vibrate_title"
+        settings:useAdditionalSummary="true" />
+
+    <!-- Visibility Override -->
+    <com.android.settings.notification.RestrictedDropDownPreference
+        android:key="visibility_override"
+        android:title="@string/app_notification_visibility_override_title"/>
+
+    <!-- Lights -->
+    <com.android.settingslib.RestrictedSwitchPreference
+        android:key="lights"
+        android:title="@string/notification_show_lights_title"
+        settings:useAdditionalSummary="true"/>
+
+    <!-- Show badge -->
+    <com.android.settingslib.RestrictedSwitchPreference
+        android:key="badge"
+        android:title="@string/notification_channel_badge_title"
+        settings:useAdditionalSummary="true"
+        settings:restrictedSwitchSummary="@string/enabled_by_admin"/>
+
+    <!-- Bypass DND -->
+    <com.android.settingslib.RestrictedSwitchPreference
+        android:key="bypass_dnd"
+        android:title="@string/app_notification_override_dnd_title"
+        android:summary="@string/app_notification_override_dnd_summary"
+        settings:useAdditionalSummary="true"/>
+
+    <Preference
+        android:key="app_link"
+        android:title="@string/app_settings_link"
+        settings:allowDividerAbove="true"/>
+
+    <com.android.settings.notification.NotificationFooterPreference
+        android:key="desc" />
+
+    <com.android.settings.notification.NotificationFooterPreference
+        android:key="block_desc" />
+
+</PreferenceScreen>
diff --git a/res/xml/color_mode_settings.xml b/res/xml/color_mode_settings.xml
new file mode 100644
index 0000000..b7f58d2
--- /dev/null
+++ b/res/xml/color_mode_settings.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.
+  -->
+
+<PreferenceScreen
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:key="color_mode_settings_screen"
+    android:title="@string/color_mode_title" />
diff --git a/res/xml/connected_devices.xml b/res/xml/connected_devices.xml
index 1099672..227dee2 100644
--- a/res/xml/connected_devices.xml
+++ b/res/xml/connected_devices.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.
@@ -16,47 +16,29 @@
 
 <PreferenceScreen
     xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:settings="http://schemas.android.com/apk/res-auto"
+    android:key="connected_devices_screen"
     android:title="@string/connected_devices_dashboard_title">
 
-    <com.android.settings.widget.MasterSwitchPreference
-      android:key="toggle_bluetooth"
-      android:title="@string/bluetooth_settings_title"
-      android:icon="@drawable/ic_settings_bluetooth"
-      android:order="-7"/>
-
-    <SwitchPreference
-        android:key="toggle_nfc"
-        android:title="@string/nfc_quick_toggle_title"
-        android:icon="@drawable/ic_nfc"
-        android:summary="@string/nfc_quick_toggle_summary"
-        android:order="-5"/>
-
-    <com.android.settingslib.RestrictedPreference
-        android:fragment="com.android.settings.nfc.AndroidBeam"
-        android:key="android_beam_settings"
-        android:title="@string/android_beam_settings_title"
-        android:icon="@drawable/ic_android"
-        android:order="-4"/>
-
-    <Preference
-        android:key="sms_mirroring"
-        android:title="@string/sms_mirroring_pref"
-        android:icon="@drawable/ic_sms_mirroring_24dp"
-        android:summary="@string/summary_placeholder"
-        android:order="-3"/>
-
-    <Preference
-        android:key="usb_mode"
-        android:title="@string/usb_pref"
-        android:icon="@drawable/ic_usb"
-        android:order="-2">
-        <intent android:action="android.intent.action.MAIN"
-                android:targetPackage="com.android.settings"
-                android:targetClass="com.android.settings.deviceinfo.UsbModeChooserActivity"/>
-    </Preference>
+    <PreferenceCategory
+        android:key="connected_device_list"
+        android:title="@string/connected_device_connected_title"/>
 
     <PreferenceCategory
-        android:key="dashboard_tile_placeholder"
-        android:order="50"/>
+        android:key="saved_device_list"
+        android:title="@string/connected_device_saved_title"/>
 
+    <Preference
+        android:fragment="com.android.settings.bluetooth.BluetoothPairingDetail"
+        android:key="add_bt_devices"
+        android:title="@string/connected_device_add_device_title"
+        android:icon="@drawable/ic_menu_add"
+        android:summary="@string/connected_device_add_device_summary"
+        settings:allowDividerAbove="true"/>
+
+    <Preference
+        android:fragment="com.android.settings.connecteddevice.AdvancedConnectedDeviceDashboardFragment"
+        android:key="connection_preferences"
+        android:title="@string/connected_device_connections_title"
+        settings:allowDividerAbove="true"/>
 </PreferenceScreen>
diff --git a/res/xml/connected_devices_advanced.xml b/res/xml/connected_devices_advanced.xml
new file mode 100644
index 0000000..946151f
--- /dev/null
+++ b/res/xml/connected_devices_advanced.xml
@@ -0,0 +1,68 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2017 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT 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:key="connected_devices_screen"
+    android:title="@string/connected_devices_dashboard_title">
+
+    <com.android.settings.widget.MasterSwitchPreference
+      android:key="toggle_bluetooth"
+      android:title="@string/bluetooth_settings_title"
+      android:icon="@drawable/ic_settings_bluetooth"
+      android:order="-7"/>
+
+    <SwitchPreference
+        android:key="toggle_nfc"
+        android:title="@string/nfc_quick_toggle_title"
+        android:icon="@drawable/ic_nfc"
+        android:summary="@string/nfc_quick_toggle_summary"
+        android:order="-5"/>
+
+    <com.android.settingslib.RestrictedPreference
+        android:fragment="com.android.settings.nfc.AndroidBeam"
+        android:key="android_beam_settings"
+        android:title="@string/android_beam_settings_title"
+        android:icon="@drawable/ic_android"
+        android:order="-4"/>
+
+    <Preference
+        android:key="sms_mirroring"
+        android:title="@string/sms_mirroring_pref"
+        android:icon="@drawable/ic_sms_mirroring_24dp"
+        android:summary="@string/summary_placeholder"
+        android:order="-3"/>
+
+    <Preference
+        android:key="usb_mode"
+        android:title="@string/usb_pref"
+        android:icon="@drawable/ic_usb"
+        android:order="-2">
+        <intent android:action="android.intent.action.MAIN"
+                android:targetPackage="com.android.settings"
+                android:targetClass="com.android.settings.deviceinfo.UsbModeChooserActivity"/>
+    </Preference>
+
+    <Preference
+        android:key="bt_received_files"
+        android:icon="@drawable/ic_folder_vd_theme_24"
+        android:title="@string/bluetooth_show_received_files" />
+
+    <PreferenceCategory
+        android:key="dashboard_tile_placeholder"
+        android:order="50"/>
+
+</PreferenceScreen>
diff --git a/res/xml/connected_devices_old.xml b/res/xml/connected_devices_old.xml
new file mode 100644
index 0000000..3eb62ea
--- /dev/null
+++ b/res/xml/connected_devices_old.xml
@@ -0,0 +1,63 @@
+<?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.
+-->
+
+<PreferenceScreen
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:key="connected_devices_screen"
+    android:title="@string/connected_devices_dashboard_title">
+
+    <com.android.settings.widget.MasterSwitchPreference
+      android:key="toggle_bluetooth"
+      android:title="@string/bluetooth_settings_title"
+      android:icon="@drawable/ic_settings_bluetooth"
+      android:order="-7"/>
+
+    <SwitchPreference
+        android:key="toggle_nfc"
+        android:title="@string/nfc_quick_toggle_title"
+        android:icon="@drawable/ic_nfc"
+        android:summary="@string/nfc_quick_toggle_summary"
+        android:order="-5"/>
+
+    <com.android.settingslib.RestrictedPreference
+        android:fragment="com.android.settings.nfc.AndroidBeam"
+        android:key="android_beam_settings"
+        android:title="@string/android_beam_settings_title"
+        android:icon="@drawable/ic_android"
+        android:order="-4"/>
+
+    <Preference
+        android:key="sms_mirroring"
+        android:title="@string/sms_mirroring_pref"
+        android:icon="@drawable/ic_sms_mirroring_24dp"
+        android:summary="@string/summary_placeholder"
+        android:order="-3"/>
+
+    <Preference
+        android:key="usb_mode"
+        android:title="@string/usb_pref"
+        android:icon="@drawable/ic_usb"
+        android:order="-2">
+        <intent android:action="android.intent.action.MAIN"
+                android:targetPackage="com.android.settings"
+                android:targetClass="com.android.settings.deviceinfo.UsbModeChooserActivity"/>
+    </Preference>
+
+    <PreferenceCategory
+        android:key="dashboard_tile_placeholder"
+        android:order="50"/>
+
+</PreferenceScreen>
diff --git a/res/xml/current_dream_settings.xml b/res/xml/current_dream_settings.xml
new file mode 100644
index 0000000..d95e830
--- /dev/null
+++ b/res/xml/current_dream_settings.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.
+  -->
+
+<PreferenceScreen
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:title="@string/screensaver_settings_current" />
diff --git a/res/xml/data_usage.xml b/res/xml/data_usage.xml
index f7c66bc..958459c 100644
--- a/res/xml/data_usage.xml
+++ b/res/xml/data_usage.xml
@@ -14,18 +14,21 @@
      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:settings="http://schemas.android.com/apk/res-auto"
+    android:key="data_usage_screen"
     android:title="@string/data_usage_summary_title">
 
     <PreferenceCategory
+        android:key="data_usage_category"
         android:title="@string/usage">
 
         <com.android.settings.SummaryPreference
             android:key="status_header"
             android:selectable="false" />
 
-        <com.android.settings.DividerPreference
+        <Preference
             android:key="limit_summary"
             android:selectable="false"
             settings:allowDividerBelow="true" />
diff --git a/res/xml/data_usage_cellular.xml b/res/xml/data_usage_cellular.xml
index a5aa316..0c1e014 100644
--- a/res/xml/data_usage_cellular.xml
+++ b/res/xml/data_usage_cellular.xml
@@ -16,6 +16,7 @@
 
 <PreferenceScreen
     xmlns:android="http://schemas.android.com/apk/res/android"
+    android:key="data_usage_cellular_screen"
     android:title="@string/data_usage_summary_title">
 
     <com.android.settings.datausage.TemplatePreferenceCategory
diff --git a/res/xml/data_usage_list.xml b/res/xml/data_usage_list.xml
index 64df9c3..41fbff8 100644
--- a/res/xml/data_usage_list.xml
+++ b/res/xml/data_usage_list.xml
@@ -14,8 +14,7 @@
      limitations under the License.
 -->
 
-<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
-    android:title="@string/data_usage_summary_title">
+<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
 
     <PreferenceCategory
         android:key="usage_amount">
diff --git a/res/xml/data_usage_metered_prefs.xml b/res/xml/data_usage_metered_prefs.xml
index aca87fb..9764ad3 100644
--- a/res/xml/data_usage_metered_prefs.xml
+++ b/res/xml/data_usage_metered_prefs.xml
@@ -14,8 +14,10 @@
      limitations under the License.
 -->
 
-<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
-                  android:title="@string/display_settings">
+<PreferenceScreen
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:key="data_usage_metered_prefs"
+    android:title="@string/network_restrictions">
 
     <PreferenceCategory
         android:key="mobile"
@@ -37,6 +39,7 @@
 
     <com.android.settingslib.widget.FooterPreference
         android:title="@string/data_usage_metered_body"
+        android:key="footer_preference"
         android:selectable="false" />
 
 </PreferenceScreen>
diff --git a/res/xml/data_usage_wifi.xml b/res/xml/data_usage_wifi.xml
index ceb5fc8..607cee1 100644
--- a/res/xml/data_usage_wifi.xml
+++ b/res/xml/data_usage_wifi.xml
@@ -16,6 +16,7 @@
 
 <PreferenceScreen
     xmlns:android="http://schemas.android.com/apk/res/android"
+    android:key="data_usage_wifi_screen"
     android:title="@string/data_usage_summary_title">
 
     <com.android.settings.datausage.TemplatePreferenceCategory
diff --git a/res/xml/date_time_prefs.xml b/res/xml/date_time_prefs.xml
index c9ad0dd..5219caa 100644
--- a/res/xml/date_time_prefs.xml
+++ b/res/xml/date_time_prefs.xml
@@ -16,42 +16,63 @@
 
 <PreferenceScreen
     xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:settings="http://schemas.android.com/apk/res/com.android.settings"
+    xmlns:settings="http://schemas.android.com/apk/res-auto"
+    android:key="date_time_settings_screen"
     android:title="@string/date_and_time"
     settings:keywords="@string/keywords_date_and_time">
 
-    <com.android.settingslib.RestrictedSwitchPreference
-        android:key="auto_time"
-        android:title="@string/date_time_auto"
-        android:summaryOn="@string/date_time_auto_summaryOn"
-        android:summaryOff="@string/date_time_auto_summaryOff"
-        settings:useAdditionalSummary="true"
-        settings:restrictedSwitchSummary="@string/enabled_by_admin" />
+    <PreferenceCategory
+        android:key="date_time_preference_category">
+        <com.android.settingslib.RestrictedSwitchPreference
+            android:key="auto_time"
+            android:title="@string/date_time_auto"
+            android:summaryOn="@string/date_time_auto_summaryOn"
+            android:summaryOff="@string/date_time_auto_summaryOff"
+            settings:useAdditionalSummary="true"
+            settings:restrictedSwitchSummary="@string/enabled_by_admin"
+            settings:userRestriction="no_config_date_time" />
 
-    <SwitchPreference
-        android:key="auto_zone"
-        android:title="@string/zone_auto"
-        android:summaryOn="@string/zone_auto_summaryOn"
-        android:summaryOff="@string/zone_auto_summaryOff" />
+        <com.android.settingslib.RestrictedPreference
+            android:key="date"
+            android:title="@string/date_time_set_date"
+            android:summary="@string/summary_placeholder"
+            settings:userRestriction="no_config_date_time" />
 
-    <Preference
-        android:key="date"
-        android:title="@string/date_time_set_date"
-        android:summary="@string/summary_placeholder" />
+        <com.android.settingslib.RestrictedPreference
+            android:key="time"
+            android:title="@string/date_time_set_time"
+            android:summary="@string/summary_placeholder"
+            settings:userRestriction="no_config_date_time" />
+    </PreferenceCategory>
 
-    <Preference
-        android:key="time"
-        android:title="@string/date_time_set_time"
-        android:summary="@string/summary_placeholder" />
+    <PreferenceCategory
+        android:key="time_zone_preference_category">
+        <com.android.settingslib.RestrictedSwitchPreference
+            android:key="auto_zone"
+            android:title="@string/zone_auto"
+            android:summaryOn="@string/zone_auto_summaryOn"
+            android:summaryOff="@string/zone_auto_summaryOff"
+            settings:userRestriction="no_config_date_time" />
 
-    <Preference
-        android:fragment="com.android.settings.datetime.ZonePicker"
-        android:key="timezone"
-        android:title="@string/date_time_set_timezone"
-        android:summary="GMT-8:00" />
+        <com.android.settingslib.RestrictedPreference
+            android:fragment="com.android.settings.datetime.ZonePicker"
+            android:key="timezone"
+            android:title="@string/date_time_set_timezone"
+            android:summary="GMT-8:00"
+            settings:userRestriction="no_config_date_time" />
+    </PreferenceCategory>
 
-    <SwitchPreference
-        android:key="24 hour"
-        android:title="@string/date_time_24hour" />
+    <PreferenceCategory
+        android:key="time_format_preference_category">
+        <SwitchPreference
+            android:key="auto_24hour"
+            android:title="@string/date_time_24hour_auto"
+            android:summaryOn="@string/date_time_24hour_auto_summary"
+            android:summaryOff="@string/date_time_24hour_auto_summary" />
+
+        <SwitchPreference
+            android:key="24 hour"
+            android:title="@string/date_time_24hour" />
+    </PreferenceCategory>
 
 </PreferenceScreen>
diff --git a/res/xml/default_assist_settings.xml b/res/xml/default_assist_settings.xml
new file mode 100644
index 0000000..e1f5900
--- /dev/null
+++ b/res/xml/default_assist_settings.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.
+  -->
+
+<PreferenceScreen
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:title="@string/default_assist_title" />
diff --git a/res/xml/default_autofill_settings.xml b/res/xml/default_autofill_settings.xml
new file mode 100644
index 0000000..ecf0877
--- /dev/null
+++ b/res/xml/default_autofill_settings.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.
+  -->
+
+<PreferenceScreen
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:title="@string/autofill_app" />
diff --git a/res/xml/default_browser_settings.xml b/res/xml/default_browser_settings.xml
new file mode 100644
index 0000000..a319a7c
--- /dev/null
+++ b/res/xml/default_browser_settings.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.
+  -->
+
+<PreferenceScreen
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:title="@string/default_browser_title" />
diff --git a/res/xml/default_emergency_settings.xml b/res/xml/default_emergency_settings.xml
new file mode 100644
index 0000000..db418eb
--- /dev/null
+++ b/res/xml/default_emergency_settings.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.
+  -->
+
+<PreferenceScreen
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:title="@string/default_emergency_app" />
diff --git a/res/xml/default_home_settings.xml b/res/xml/default_home_settings.xml
new file mode 100644
index 0000000..136f8cc
--- /dev/null
+++ b/res/xml/default_home_settings.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.
+  -->
+
+<PreferenceScreen
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:title="@string/home_app" />
diff --git a/res/xml/default_phone_settings.xml b/res/xml/default_phone_settings.xml
new file mode 100644
index 0000000..1ae3ab1
--- /dev/null
+++ b/res/xml/default_phone_settings.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.
+  -->
+
+<PreferenceScreen
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:title="@string/default_phone_title" />
diff --git a/res/xml/default_sms_settings.xml b/res/xml/default_sms_settings.xml
new file mode 100644
index 0000000..0a8bcc3
--- /dev/null
+++ b/res/xml/default_sms_settings.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.
+  -->
+
+<PreferenceScreen
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:title="@string/sms_application_title" />
diff --git a/res/xml/default_voice_settings.xml b/res/xml/default_voice_settings.xml
new file mode 100644
index 0000000..f75b5ed
--- /dev/null
+++ b/res/xml/default_voice_settings.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.
+  -->
+
+<PreferenceScreen
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:title="@string/voice_input_settings_title" />
diff --git a/res/xml/development_prefs.xml b/res/xml/development_prefs.xml
deleted file mode 100644
index aec72bc..0000000
--- a/res/xml/development_prefs.xml
+++ /dev/null
@@ -1,478 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2008 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT 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:key="development_prefs_screen"
-        android:title="@string/development_settings_title">
-    <com.android.settings.BugreportPreference
-            android:key="bugreport"
-            android:title="@*android:string/bugreport_title"
-            android:dialogTitle="@*android:string/bugreport_title" />
-
-    <Preference
-            android:key="local_backup_password"
-            android:title="@string/local_backup_password_title"
-            android:summary="@string/local_backup_password_summary_none"
-            android:persistent="false" >
-        <intent
-                android:action="android.settings.privacy.SET_FULL_BACKUP_PASSWORD"
-                android:targetPackage="com.android.settings"
-                android:targetClass="com.android.settings.SetFullBackupPassword" />
-    </Preference>
-
-    <com.android.settingslib.RestrictedSwitchPreference
-        android:key="keep_screen_on"
-        android:title="@string/keep_screen_on"
-        android:summary="@string/keep_screen_on_summary"
-        settings:useAdditionalSummary="true" />
-
-    <ListPreference
-        android:key="hdcp_checking"
-        android:title="@string/hdcp_checking_title"
-        android:dialogTitle="@string/hdcp_checking_dialog_title"
-        android:entries="@array/hdcp_checking_titles"
-        android:entryValues="@array/hdcp_checking_values" />
-
-    <SwitchPreference
-        android:key="bt_hci_snoop_log"
-        android:title="@string/bt_hci_snoop_log"
-        android:summary="@string/bt_hci_snoop_log_summary"/>
-
-    <com.android.settingslib.RestrictedSwitchPreference
-        android:key="oem_unlock_enable"
-        android:title="@string/oem_unlock_enable"
-        android:summary="@string/oem_unlock_enable_summary"
-        settings:useAdditionalSummary="true"/>
-
-    <Preference
-        android:key="running_apps"
-        android:title="@string/runningservices_settings_title"
-        android:summary="@string/runningservices_settings_summary"
-        android:fragment="com.android.settings.applications.RunningServices" />
-
-    <Preference
-        android:key="convert_to_file_encryption"
-        android:title="@string/convert_to_file_encryption"
-        android:summary="@string/convert_to_file_encryption_enabled"
-        android:fragment="com.android.settings.applications.ConvertToFbe" />
-
-    <com.android.settings.development.ColorModePreference
-        android:key="picture_color_mode"
-        android:title="@string/picture_color_mode"
-        android:summary="@string/picture_color_mode_desc" />
-
-    <Preference android:key="select_webview_provider"
-        android:title="@string/select_webview_provider_title"
-        android:dialogTitle="@string/select_webview_provider_dialog_title"
-        android:fragment="com.android.settings.webview.WebViewAppPicker" />
-
-    <SwitchPreference
-        android:key="color_temperature"
-        android:title="@string/color_temperature"
-        android:summary="@string/color_temperature_desc" />
-
-    <SwitchPreference
-        android:key="ota_disable_automatic_update"
-        android:title="@string/ota_disable_automatic_update" />
-
-    <Preference
-        android:key="demo_mode"
-        android:title="@string/demo_mode">
-        <intent android:action="com.android.settings.action.DEMO_MODE" />
-    </Preference>
-
-    <Preference
-        android:key="quick_settings_tiles"
-        android:title="@string/quick_settings_developer_tiles">
-        <intent
-            android:targetPackage="com.android.settings"
-            android:targetClass="com.android.settings.qstile.DevelopmentTileConfigActivity" />
-    </Preference>
-
-    <PreferenceCategory android:key="debug_debugging_category"
-            android:title="@string/debug_debugging_category">
-
-        <SwitchPreference
-            android:key="enable_adb"
-            android:title="@string/enable_adb"
-            android:summary="@string/enable_adb_summary"/>
-
-        <Preference android:key="clear_adb_keys"
-                android:title="@string/clear_adb_keys" />
-
-        <SwitchPreference
-            android:key="enable_terminal"
-            android:title="@string/enable_terminal_title"
-            android:summary="@string/enable_terminal_summary" />
-
-        <SwitchPreference
-            android:key="bugreport_in_power"
-            android:title="@string/bugreport_in_power"
-            android:summary="@string/bugreport_in_power_summary"/>
-
-        <Preference android:key="mock_location_app"
-            android:title="@string/mock_location_app" />
-
-        <SwitchPreference
-                android:key="debug_view_attributes"
-                android:title="@string/debug_view_attributes" />
-
-        <Preference android:key="debug_app"
-                android:title="@string/debug_app" />
-
-        <SwitchPreference
-            android:key="wait_for_debugger"
-            android:title="@string/wait_for_debugger"
-            android:summary="@string/wait_for_debugger_summary"/>
-
-        <com.android.settingslib.RestrictedSwitchPreference
-            android:key="verify_apps_over_usb"
-            android:title="@string/verify_apps_over_usb_title"
-            android:summary="@string/verify_apps_over_usb_summary"/>
-
-        <ListPreference
-            android:key="select_logd_size"
-            android:title="@string/select_logd_size_title"
-            android:dialogTitle="@string/select_logd_size_dialog_title"
-            android:entries="@array/select_logd_size_titles"
-            android:entryValues="@array/select_logd_size_values" />
-
-        <ListPreference
-            android:key="select_logpersist"
-            android:title="@string/select_logpersist_title"
-            android:dialogTitle="@string/select_logpersist_dialog_title"
-            android:entries="@array/select_logpersist_titles"
-            android:entryValues="@array/select_logpersist_values" />
-
-        <SwitchPreference
-            android:key="telephony_monitor_switch"
-            android:title="@string/telephony_monitor_switch"
-            android:summary="@string/telephony_monitor_switch_summary"/>
-
-        <SwitchPreference
-            android:key="camera_laser_sensor_switch"
-            android:title="@string/camera_laser_sensor_switch" />
-
-    </PreferenceCategory>
-
-    <PreferenceCategory android:key="debug_networking_category"
-            android:title="@string/debug_networking_category">
-
-        <SwitchPreference
-            android:key="wifi_display_certification"
-            android:title="@string/wifi_display_certification"
-            android:summary="@string/wifi_display_certification_summary"/>
-
-        <SwitchPreference
-            android:key="wifi_verbose_logging"
-            android:title="@string/wifi_verbose_logging"
-            android:summary="@string/wifi_verbose_logging_summary"/>
-
-        <SwitchPreference
-            android:key="wifi_aggressive_handover"
-            android:title="@string/wifi_aggressive_handover"
-            android:summary="@string/wifi_aggressive_handover_summary"/>
-
-        <SwitchPreference
-            android:key="wifi_allow_scan_with_traffic"
-            android:title="@string/wifi_allow_scan_with_traffic"
-            android:summary="@string/wifi_allow_scan_with_traffic_summary"/>
-
-        <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"
-            android:dialogTitle="@string/select_usb_configuration_dialog_title"
-            android:entries="@array/usb_configuration_titles"
-            android:entryValues="@array/usb_configuration_values" />
-
-        <SwitchPreference
-            android:key="bluetooth_show_devices_without_names"
-            android:title="@string/bluetooth_show_devices_without_names"
-            android:summary="@string/bluetooth_show_devices_without_names_summary"/>
-
-        <SwitchPreference
-            android:key="bluetooth_disable_absolute_volume"
-            android:title="@string/bluetooth_disable_absolute_volume"
-            android:summary="@string/bluetooth_disable_absolute_volume_summary"/>
-
-        <SwitchPreference
-            android:key="bluetooth_enable_inband_ringing"
-            android:title="@string/bluetooth_enable_inband_ringing"
-            android:summary="@string/bluetooth_enable_inband_ringing_summary"/>
-
-        <ListPreference
-            android:key="bluetooth_select_avrcp_version"
-            android:title="@string/bluetooth_select_avrcp_version_string"
-            android:dialogTitle="@string/bluetooth_select_avrcp_version_dialog_title"
-            android:entries="@array/bluetooth_avrcp_versions"
-            android:entryValues="@array/bluetooth_avrcp_version_values" />
-
-        <ListPreference
-            android:key="bluetooth_select_a2dp_codec"
-            android:title="@string/bluetooth_select_a2dp_codec_type"
-            android:dialogTitle="@string/bluetooth_select_a2dp_codec_type_dialog_title"
-            android:entries="@array/bluetooth_a2dp_codec_titles"
-            android:entryValues="@array/bluetooth_a2dp_codec_values" />
-
-        <ListPreference
-            android:key="bluetooth_select_a2dp_sample_rate"
-            android:title="@string/bluetooth_select_a2dp_codec_sample_rate"
-            android:dialogTitle="@string/bluetooth_select_a2dp_codec_sample_rate_dialog_title"
-            android:entries="@array/bluetooth_a2dp_codec_sample_rate_titles"
-            android:entryValues="@array/bluetooth_a2dp_codec_sample_rate_values" />
-
-        <ListPreference
-            android:key="bluetooth_select_a2dp_bits_per_sample"
-            android:title="@string/bluetooth_select_a2dp_codec_bits_per_sample"
-            android:dialogTitle="@string/bluetooth_select_a2dp_codec_bits_per_sample_dialog_title"
-            android:entries="@array/bluetooth_a2dp_codec_bits_per_sample_titles"
-            android:entryValues="@array/bluetooth_a2dp_codec_bits_per_sample_values" />
-
-        <ListPreference
-            android:key="bluetooth_select_a2dp_channel_mode"
-            android:title="@string/bluetooth_select_a2dp_codec_channel_mode"
-            android:dialogTitle="@string/bluetooth_select_a2dp_codec_channel_mode_dialog_title"
-            android:entries="@array/bluetooth_a2dp_codec_channel_mode_titles"
-            android:entryValues="@array/bluetooth_a2dp_codec_channel_mode_values" />
-
-        <ListPreference
-            android:key="bluetooth_select_a2dp_ldac_playback_quality"
-            android:title="@string/bluetooth_select_a2dp_codec_ldac_playback_quality"
-            android:dialogTitle="@string/bluetooth_select_a2dp_codec_ldac_playback_quality_dialog_title"
-            android:entries="@array/bluetooth_a2dp_codec_ldac_playback_quality_titles"
-            android:entryValues="@array/bluetooth_a2dp_codec_ldac_playback_quality_values" />
-
-        <com.android.settings.development.PrivateDnsModeDialogPreference
-            android:key="select_private_dns_configuration"
-            android:title="@string/select_private_dns_configuration_title"
-            android:dialogTitle="@string/select_private_dns_configuration_dialog_title"
-            android:dialogLayout="@layout/private_dns_mode_dialog"
-            android:positiveButtonText="@string/save"
-            android:negativeButtonText="@string/cancel" />
-
-    </PreferenceCategory>
-
-    <PreferenceCategory android:key="debug_input_category"
-            android:title="@string/debug_input_category">
-
-        <SwitchPreference
-            android:key="show_touches"
-            android:title="@string/show_touches"
-            android:summary="@string/show_touches_summary"/>
-
-        <SwitchPreference
-            android:key="pointer_location"
-            android:title="@string/pointer_location"
-            android:summary="@string/pointer_location_summary"/>
-
-    </PreferenceCategory>
-
-    <PreferenceCategory android:key="debug_drawing_category"
-            android:title="@string/debug_drawing_category">
-
-        <SwitchPreference
-            android:key="show_screen_updates"
-            android:title="@string/show_screen_updates"
-            android:summary="@string/show_screen_updates_summary"/>
-
-        <SwitchPreference
-            android:key="debug_layout"
-            android:title="@string/debug_layout"
-            android:summary="@string/debug_layout_summary"/>
-
-        <SwitchPreference
-            android:key="force_rtl_layout_all_locales"
-            android:title="@string/force_rtl_layout_all_locales"
-            android:summary="@string/force_rtl_layout_all_locales_summary"/>
-
-        <ListPreference
-            android:key="window_animation_scale"
-            android:title="@string/window_animation_scale_title"
-            android:entries="@array/window_animation_scale_entries"
-            android:entryValues="@array/window_animation_scale_values" />
-
-        <ListPreference
-            android:key="transition_animation_scale"
-            android:title="@string/transition_animation_scale_title"
-            android:entries="@array/transition_animation_scale_entries"
-            android:entryValues="@array/transition_animation_scale_values" />
-
-        <ListPreference
-            android:key="animator_duration_scale"
-            android:title="@string/animator_duration_scale_title"
-            android:entries="@array/animator_duration_scale_entries"
-            android:entryValues="@array/animator_duration_scale_values" />
-
-        <ListPreference
-            android:key="overlay_display_devices"
-            android:title="@string/overlay_display_devices_title"
-            android:entries="@array/overlay_display_devices_entries"
-            android:entryValues="@array/overlay_display_devices_values" />
-
-        <com.android.settings.display.DensityPreference
-            android:key="density"
-            android:title="@string/developer_smallest_width" />
-
-    </PreferenceCategory>
-
-    <PreferenceCategory android:key="debug_hw_drawing_category"
-            android:title="@string/debug_hw_drawing_category">
-
-        <SwitchPreference
-                android:key="force_hw_ui"
-                android:title="@string/force_hw_ui"
-                android:summary="@string/force_hw_ui_summary"/>
-
-        <SwitchPreference
-                android:key="show_hw_screen_udpates"
-                android:title="@string/show_hw_screen_updates"
-                android:summary="@string/show_hw_screen_updates_summary"/>
-
-        <SwitchPreference
-                android:key="show_hw_layers_udpates"
-                android:title="@string/show_hw_layers_updates"
-                android:summary="@string/show_hw_layers_updates_summary"/>
-
-        <ListPreference
-                android:key="debug_hw_overdraw"
-                android:title="@string/debug_hw_overdraw"
-                android:entries="@array/debug_hw_overdraw_entries"
-                android:entryValues="@array/debug_hw_overdraw_values" />
-
-        <ListPreference
-                android:key="show_non_rect_clip"
-                android:title="@string/show_non_rect_clip"
-                android:entries="@array/show_non_rect_clip_entries"
-                android:entryValues="@array/show_non_rect_clip_values" />
-
-        <SwitchPreference
-                android:key="force_msaa"
-                android:title="@string/force_msaa"
-                android:summary="@string/force_msaa_summary"/>
-
-        <SwitchPreference
-                android:key="disable_overlays"
-                android:title="@string/disable_overlays"
-                android:summary="@string/disable_overlays_summary"/>
-
-        <ListPreference
-                android:entries="@array/simulate_color_space_entries"
-                android:entryValues="@array/simulate_color_space_values"
-                android:key="simulate_color_space"
-                android:summary="%s"
-                android:title="@string/simulate_color_space" />
-
-        <ListPreference
-                android:key="debug_hw_renderer"
-                android:title="@string/debug_hw_renderer"
-                android:entries="@array/debug_hw_renderer_entries"
-                android:entryValues="@array/debug_hw_renderer_values" />
-
-    </PreferenceCategory>
-
-    <PreferenceCategory android:key="media_category"
-            android:title="@string/media_category">
-
-        <SwitchPreference
-                android:key="usb_audio"
-                android:title="@string/usb_audio_disable_routing"
-                android:summary="@string/usb_audio_disable_routing_summary" />
-
-    </PreferenceCategory>
-
-    <PreferenceCategory android:key="debug_monitoring_category"
-            android:title="@string/debug_monitoring_category">
-
-        <SwitchPreference
-            android:key="strict_mode"
-            android:title="@string/strict_mode"
-            android:summary="@string/strict_mode_summary"/>
-
-        <ListPreference
-            android:key="track_frame_time"
-            android:title="@string/track_frame_time"
-            android:entries="@array/track_frame_time_entries"
-            android:entryValues="@array/track_frame_time_values" />
-
-    </PreferenceCategory>
-
-    <PreferenceCategory android:key="debug_applications_category"
-            android:title="@string/debug_applications_category">
-
-        <SwitchPreference
-            android:key="immediately_destroy_activities"
-            android:title="@string/immediately_destroy_activities"
-            android:summary="@string/immediately_destroy_activities_summary"/>
-
-        <ListPreference
-            android:key="app_process_limit"
-            android:title="@string/app_process_limit_title"
-            android:entries="@array/app_process_limit_entries"
-            android:entryValues="@array/app_process_limit_values" />
-
-
-        <Preference
-                android:key="background_check"
-                android:fragment="com.android.settings.applications.BackgroundCheckSummary"
-                android:title="@string/background_check_pref" />
-
-
-        <SwitchPreference
-            android:key="show_all_anrs"
-            android:title="@string/show_all_anrs"
-            android:summary="@string/show_all_anrs_summary"/>
-
-        <SwitchPreference
-            android:key="show_notification_channel_warnings"
-            android:title="@string/show_notification_channel_warnings"
-            android:summary="@string/show_notification_channel_warnings_summary"/>
-
-        <Preference
-                android:key="inactive_apps"
-                android:title="@string/inactive_apps_title"
-                android:fragment="com.android.settings.fuelgauge.InactiveApps"/>
-
-        <SwitchPreference
-            android:key="force_allow_on_external"
-            android:title="@string/force_allow_on_external"
-            android:summary="@string/force_allow_on_external_summary"/>
-
-        <SwitchPreference
-            android:key="force_resizable_activities"
-            android:title="@string/force_resizable_activities"
-            android:summary="@string/force_resizable_activities_summary"/>
-
-        <Preference
-            android:key="reset_shortcut_manager_throttling"
-            android:title="@string/reset_shortcut_manager_throttling" />
-     </PreferenceCategory>
-
-    <PreferenceCategory
-      android:key="dashboard_tile_placeholder"
-      android:order="200"/>
-
-</PreferenceScreen>
diff --git a/res/xml/development_settings.xml b/res/xml/development_settings.xml
new file mode 100644
index 0000000..d1eb366
--- /dev/null
+++ b/res/xml/development_settings.xml
@@ -0,0 +1,490 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2008 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
+        xmlns:settings="http://schemas.android.com/apk/res-auto"
+        android:key="development_prefs_screen"
+        android:title="@string/development_settings_title">
+
+    <Preference
+        android:key="memory"
+        android:icon="@drawable/ic_settings_memory"
+        android:title="@string/memory_settings_title"
+        android:summary="@string/summary_placeholder"
+        android:fragment="com.android.settings.applications.ProcessStatsSummary" />
+
+    <com.android.settings.BugreportPreference
+            android:key="bugreport"
+            android:title="@*android:string/bugreport_title"
+            android:dialogTitle="@*android:string/bugreport_title" />
+
+    <Preference
+            android:key="local_backup_password"
+            android:title="@string/local_backup_password_title"
+            android:summary="@string/local_backup_password_summary_none"
+            android:persistent="false" >
+        <intent
+                android:action="android.settings.privacy.SET_FULL_BACKUP_PASSWORD"
+                android:targetPackage="com.android.settings"
+                android:targetClass="com.android.settings.SetFullBackupPassword" />
+    </Preference>
+
+    <com.android.settingslib.RestrictedSwitchPreference
+        android:key="keep_screen_on"
+        android:title="@string/keep_screen_on"
+        android:summary="@string/keep_screen_on_summary"
+        settings:useAdditionalSummary="true" />
+
+    <ListPreference
+        android:key="hdcp_checking"
+        android:title="@string/hdcp_checking_title"
+        android:dialogTitle="@string/hdcp_checking_dialog_title"
+        android:entries="@array/hdcp_checking_titles"
+        android:entryValues="@array/hdcp_checking_values" />
+
+    <SwitchPreference
+        android:key="bt_hci_snoop_log"
+        android:title="@string/bt_hci_snoop_log"
+        android:summary="@string/bt_hci_snoop_log_summary"/>
+
+    <com.android.settingslib.RestrictedSwitchPreference
+        android:key="oem_unlock_enable"
+        android:title="@string/oem_unlock_enable"
+        android:summary="@string/oem_unlock_enable_summary"
+        settings:useAdditionalSummary="true"/>
+
+    <Preference
+        android:key="running_apps"
+        android:title="@string/runningservices_settings_title"
+        android:summary="@string/runningservices_settings_summary"
+        android:fragment="com.android.settings.applications.RunningServices" />
+
+    <Preference
+        android:key="convert_to_file_encryption"
+        android:title="@string/convert_to_file_encryption"
+        android:summary="@string/convert_to_file_encryption_enabled"
+        android:fragment="com.android.settings.applications.ConvertToFbe" />
+
+    <com.android.settings.development.ColorModePreference
+        android:key="picture_color_mode"
+        android:title="@string/picture_color_mode"
+        android:summary="@string/picture_color_mode_desc" />
+
+    <Preference android:key="select_webview_provider"
+        android:title="@string/select_webview_provider_title"
+        android:dialogTitle="@string/select_webview_provider_dialog_title"
+        android:fragment="com.android.settings.webview.WebViewAppPicker" />
+
+    <SwitchPreference
+        android:key="color_temperature"
+        android:title="@string/color_temperature"
+        android:summary="@string/color_temperature_desc" />
+
+    <SwitchPreference
+        android:key="ota_disable_automatic_update"
+        android:title="@string/ota_disable_automatic_update" />
+
+    <Preference
+        android:key="demo_mode"
+        android:title="@string/demo_mode">
+        <intent android:action="com.android.settings.action.DEMO_MODE" />
+    </Preference>
+
+    <Preference
+        android:key="quick_settings_tiles"
+        android:title="@string/quick_settings_developer_tiles"
+        android:fragment="com.android.settings.development.qstile.DevelopmentTileConfigFragment" />
+
+    <PreferenceCategory android:key="debug_debugging_category"
+            android:title="@string/debug_debugging_category">
+
+        <SwitchPreference
+            android:key="enable_adb"
+            android:title="@string/enable_adb"
+            android:summary="@string/enable_adb_summary"/>
+
+        <Preference android:key="clear_adb_keys"
+                android:title="@string/clear_adb_keys" />
+
+        <SwitchPreference
+            android:key="enable_terminal"
+            android:title="@string/enable_terminal_title"
+            android:summary="@string/enable_terminal_summary" />
+
+        <SwitchPreference
+            android:key="bugreport_in_power"
+            android:title="@string/bugreport_in_power"
+            android:summary="@string/bugreport_in_power_summary"/>
+
+        <Preference android:key="mock_location_app"
+            android:title="@string/mock_location_app" />
+
+        <SwitchPreference
+                android:key="debug_view_attributes"
+                android:title="@string/debug_view_attributes" />
+
+        <Preference android:key="debug_app"
+                android:title="@string/debug_app" />
+
+        <SwitchPreference
+            android:key="wait_for_debugger"
+            android:title="@string/wait_for_debugger"
+            android:summary="@string/wait_for_debugger_summary"/>
+
+        <com.android.settingslib.RestrictedSwitchPreference
+            android:key="verify_apps_over_usb"
+            android:title="@string/verify_apps_over_usb_title"
+            android:summary="@string/verify_apps_over_usb_summary"/>
+
+        <ListPreference
+            android:key="select_logd_size"
+            android:title="@string/select_logd_size_title"
+            android:dialogTitle="@string/select_logd_size_dialog_title"
+            android:entries="@array/select_logd_size_titles"
+            android:entryValues="@array/select_logd_size_values" />
+
+        <ListPreference
+            android:key="select_logpersist"
+            android:title="@string/select_logpersist_title"
+            android:dialogTitle="@string/select_logpersist_dialog_title"
+            android:entries="@array/select_logpersist_titles"
+            android:entryValues="@array/select_logpersist_values" />
+
+        <SwitchPreference
+            android:key="connectivity_monitor_switch"
+            android:title="@string/connectivity_monitor_switch"
+            android:summary="@string/connectivity_monitor_switch_summary"/>
+
+        <SwitchPreference
+            android:key="camera_laser_sensor_switch"
+            android:title="@string/camera_laser_sensor_switch" />
+
+        <Preference
+            android:key="feature_flags_dashboard"
+            android:title="@string/feature_flags_dashboard_title"
+            android:fragment="com.android.settings.development.featureflags.FeatureFlagsDashboard"/>
+
+        <SwitchPreference
+            android:key="enable_gpu_debug_layers"
+            android:title="@string/enable_gpu_debug_layers"
+            android:summary="@string/enable_gpu_debug_layers_summary"/>
+
+    </PreferenceCategory>
+
+    <PreferenceCategory android:key="debug_networking_category"
+            android:title="@string/debug_networking_category">
+
+        <SwitchPreference
+            android:key="wifi_display_certification"
+            android:title="@string/wifi_display_certification"
+            android:summary="@string/wifi_display_certification_summary"/>
+
+        <SwitchPreference
+            android:key="wifi_verbose_logging"
+            android:title="@string/wifi_verbose_logging"
+            android:summary="@string/wifi_verbose_logging_summary"/>
+
+        <SwitchPreference
+            android:key="wifi_aggressive_handover"
+            android:title="@string/wifi_aggressive_handover"
+            android:summary="@string/wifi_aggressive_handover_summary"/>
+
+        <SwitchPreference
+            android:key="wifi_allow_scan_with_traffic"
+            android:title="@string/wifi_allow_scan_with_traffic"
+            android:summary="@string/wifi_allow_scan_with_traffic_summary"/>
+
+        <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"
+            android:dialogTitle="@string/select_usb_configuration_dialog_title"
+            android:entries="@array/usb_configuration_titles"
+            android:entryValues="@array/usb_configuration_values" />
+
+        <SwitchPreference
+            android:key="bluetooth_show_devices_without_names"
+            android:title="@string/bluetooth_show_devices_without_names"
+            android:summary="@string/bluetooth_show_devices_without_names_summary"/>
+
+        <SwitchPreference
+            android:key="bluetooth_disable_absolute_volume"
+            android:title="@string/bluetooth_disable_absolute_volume"
+            android:summary="@string/bluetooth_disable_absolute_volume_summary"/>
+
+        <SwitchPreference
+            android:key="bluetooth_enable_inband_ringing"
+            android:title="@string/bluetooth_enable_inband_ringing"
+            android:summary="@string/bluetooth_enable_inband_ringing_summary"/>
+
+        <ListPreference
+            android:key="bluetooth_select_avrcp_version"
+            android:title="@string/bluetooth_select_avrcp_version_string"
+            android:dialogTitle="@string/bluetooth_select_avrcp_version_dialog_title"
+            android:entries="@array/bluetooth_avrcp_versions"
+            android:entryValues="@array/bluetooth_avrcp_version_values" />
+
+        <ListPreference
+            android:key="bluetooth_select_a2dp_codec"
+            android:title="@string/bluetooth_select_a2dp_codec_type"
+            android:dialogTitle="@string/bluetooth_select_a2dp_codec_type_dialog_title"
+            android:entries="@array/bluetooth_a2dp_codec_titles"
+            android:entryValues="@array/bluetooth_a2dp_codec_values" />
+
+        <ListPreference
+            android:key="bluetooth_select_a2dp_sample_rate"
+            android:title="@string/bluetooth_select_a2dp_codec_sample_rate"
+            android:dialogTitle="@string/bluetooth_select_a2dp_codec_sample_rate_dialog_title"
+            android:entries="@array/bluetooth_a2dp_codec_sample_rate_titles"
+            android:entryValues="@array/bluetooth_a2dp_codec_sample_rate_values" />
+
+        <ListPreference
+            android:key="bluetooth_select_a2dp_bits_per_sample"
+            android:title="@string/bluetooth_select_a2dp_codec_bits_per_sample"
+            android:dialogTitle="@string/bluetooth_select_a2dp_codec_bits_per_sample_dialog_title"
+            android:entries="@array/bluetooth_a2dp_codec_bits_per_sample_titles"
+            android:entryValues="@array/bluetooth_a2dp_codec_bits_per_sample_values" />
+
+        <ListPreference
+            android:key="bluetooth_select_a2dp_channel_mode"
+            android:title="@string/bluetooth_select_a2dp_codec_channel_mode"
+            android:dialogTitle="@string/bluetooth_select_a2dp_codec_channel_mode_dialog_title"
+            android:entries="@array/bluetooth_a2dp_codec_channel_mode_titles"
+            android:entryValues="@array/bluetooth_a2dp_codec_channel_mode_values" />
+
+        <ListPreference
+            android:key="bluetooth_select_a2dp_ldac_playback_quality"
+            android:title="@string/bluetooth_select_a2dp_codec_ldac_playback_quality"
+            android:dialogTitle="@string/bluetooth_select_a2dp_codec_ldac_playback_quality_dialog_title"
+            android:entries="@array/bluetooth_a2dp_codec_ldac_playback_quality_titles"
+            android:entryValues="@array/bluetooth_a2dp_codec_ldac_playback_quality_values" />
+
+    </PreferenceCategory>
+
+    <PreferenceCategory android:key="debug_input_category"
+            android:title="@string/debug_input_category">
+
+        <SwitchPreference
+            android:key="show_touches"
+            android:title="@string/show_touches"
+            android:summary="@string/show_touches_summary"/>
+
+        <SwitchPreference
+            android:key="pointer_location"
+            android:title="@string/pointer_location"
+            android:summary="@string/pointer_location_summary"/>
+
+    </PreferenceCategory>
+
+    <PreferenceCategory android:key="debug_drawing_category"
+            android:title="@string/debug_drawing_category">
+
+        <SwitchPreference
+            android:key="show_screen_updates"
+            android:title="@string/show_screen_updates"
+            android:summary="@string/show_screen_updates_summary"/>
+
+        <SwitchPreference
+            android:key="debug_layout"
+            android:title="@string/debug_layout"
+            android:summary="@string/debug_layout_summary"/>
+
+        <SwitchPreference
+            android:key="force_rtl_layout_all_locales"
+            android:title="@string/force_rtl_layout_all_locales"
+            android:summary="@string/force_rtl_layout_all_locales_summary"/>
+
+        <ListPreference
+            android:key="window_animation_scale"
+            android:title="@string/window_animation_scale_title"
+            android:entries="@array/window_animation_scale_entries"
+            android:entryValues="@array/window_animation_scale_values" />
+
+        <ListPreference
+            android:key="transition_animation_scale"
+            android:title="@string/transition_animation_scale_title"
+            android:entries="@array/transition_animation_scale_entries"
+            android:entryValues="@array/transition_animation_scale_values" />
+
+        <ListPreference
+            android:key="animator_duration_scale"
+            android:title="@string/animator_duration_scale_title"
+            android:entries="@array/animator_duration_scale_entries"
+            android:entryValues="@array/animator_duration_scale_values" />
+
+        <ListPreference
+            android:key="overlay_display_devices"
+            android:title="@string/overlay_display_devices_title"
+            android:entries="@array/overlay_display_devices_entries"
+            android:entryValues="@array/overlay_display_devices_values" />
+
+        <com.android.settings.display.DensityPreference
+            android:key="density"
+            android:title="@string/developer_smallest_width" />
+
+    </PreferenceCategory>
+
+    <PreferenceCategory android:key="debug_hw_drawing_category"
+            android:title="@string/debug_hw_drawing_category">
+
+        <SwitchPreference
+                android:key="force_hw_ui"
+                android:title="@string/force_hw_ui"
+                android:summary="@string/force_hw_ui_summary"/>
+
+        <SwitchPreference
+                android:key="show_hw_screen_updates"
+                android:title="@string/show_hw_screen_updates"
+                android:summary="@string/show_hw_screen_updates_summary"/>
+
+        <SwitchPreference
+                android:key="show_hw_layers_updates"
+                android:title="@string/show_hw_layers_updates"
+                android:summary="@string/show_hw_layers_updates_summary"/>
+
+        <ListPreference
+                android:key="debug_hw_overdraw"
+                android:title="@string/debug_hw_overdraw"
+                android:entries="@array/debug_hw_overdraw_entries"
+                android:entryValues="@array/debug_hw_overdraw_values" />
+
+        <ListPreference
+                android:key="show_non_rect_clip"
+                android:title="@string/show_non_rect_clip"
+                android:entries="@array/show_non_rect_clip_entries"
+                android:entryValues="@array/show_non_rect_clip_values" />
+
+        <SwitchPreference
+                android:key="force_msaa"
+                android:title="@string/force_msaa"
+                android:summary="@string/force_msaa_summary"/>
+
+        <SwitchPreference
+                android:key="disable_overlays"
+                android:title="@string/disable_overlays"
+                android:summary="@string/disable_overlays_summary"/>
+
+        <ListPreference
+                android:entries="@array/simulate_color_space_entries"
+                android:entryValues="@array/simulate_color_space_values"
+                android:key="simulate_color_space"
+                android:summary="%s"
+                android:title="@string/simulate_color_space" />
+
+        <ListPreference
+                android:key="debug_hw_renderer"
+                android:title="@string/debug_hw_renderer"
+                android:entries="@array/debug_hw_renderer_entries"
+                android:entryValues="@array/debug_hw_renderer_values" />
+
+    </PreferenceCategory>
+
+    <PreferenceCategory android:key="media_category"
+            android:title="@string/media_category">
+
+        <SwitchPreference
+                android:key="usb_audio"
+                android:title="@string/usb_audio_disable_routing"
+                android:summary="@string/usb_audio_disable_routing_summary" />
+
+    </PreferenceCategory>
+
+    <PreferenceCategory android:key="debug_monitoring_category"
+            android:title="@string/debug_monitoring_category">
+
+        <SwitchPreference
+            android:key="strict_mode"
+            android:title="@string/strict_mode"
+            android:summary="@string/strict_mode_summary"/>
+
+        <ListPreference
+            android:key="track_frame_time"
+            android:title="@string/track_frame_time"
+            android:entries="@array/track_frame_time_entries"
+            android:entryValues="@array/track_frame_time_values" />
+
+    </PreferenceCategory>
+
+    <PreferenceCategory android:key="debug_applications_category"
+            android:title="@string/debug_applications_category">
+
+        <SwitchPreference
+            android:key="immediately_destroy_activities"
+            android:title="@string/immediately_destroy_activities"
+            android:summary="@string/immediately_destroy_activities_summary"/>
+
+        <ListPreference
+            android:key="app_process_limit"
+            android:title="@string/app_process_limit_title"
+            android:entries="@array/app_process_limit_entries"
+            android:entryValues="@array/app_process_limit_values" />
+
+
+        <Preference
+                android:key="background_check"
+                android:fragment="com.android.settings.applications.appops.BackgroundCheckSummary"
+                android:title="@string/background_check_pref" />
+
+
+        <SwitchPreference
+            android:key="show_all_anrs"
+            android:title="@string/show_all_anrs"
+            android:summary="@string/show_all_anrs_summary"/>
+
+        <SwitchPreference
+            android:key="show_notification_channel_warnings"
+            android:title="@string/show_notification_channel_warnings"
+            android:summary="@string/show_notification_channel_warnings_summary"/>
+
+        <Preference
+                android:key="inactive_apps"
+                android:title="@string/inactive_apps_title"
+                android:fragment="com.android.settings.fuelgauge.InactiveApps"/>
+
+        <SwitchPreference
+            android:key="force_allow_on_external"
+            android:title="@string/force_allow_on_external"
+            android:summary="@string/force_allow_on_external_summary"/>
+
+        <SwitchPreference
+            android:key="force_resizable_activities"
+            android:title="@string/force_resizable_activities"
+            android:summary="@string/force_resizable_activities_summary"/>
+
+        <SwitchPreference
+                android:key="enable_freeform_support"
+                android:title="@string/enable_freeform_support"
+                android:summary="@string/enable_freeform_support_summary"/>
+
+        <Preference
+            android:key="reset_shortcut_manager_throttling"
+            android:title="@string/reset_shortcut_manager_throttling" />
+     </PreferenceCategory>
+
+    <PreferenceCategory
+      android:key="dashboard_tile_placeholder"
+      android:order="200"/>
+
+</PreferenceScreen>
diff --git a/res/xml/development_tile_settings.xml b/res/xml/development_tile_settings.xml
new file mode 100644
index 0000000..f0f71c0
--- /dev/null
+++ b/res/xml/development_tile_settings.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.
+  -->
+
+<PreferenceScreen
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:title="@string/quick_settings_developer_tiles" />
diff --git a/res/xml/device_info_settings.xml b/res/xml/device_info_settings.xml
index b094175..af1fb70 100644
--- a/res/xml/device_info_settings.xml
+++ b/res/xml/device_info_settings.xml
@@ -15,16 +15,9 @@
 -->
 
 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
+        android:key="device_info_pref_screen"
         android:title="@string/about_settings">
 
-        <!-- System update settings - launches activity -->
-        <Preference android:key="additional_system_update_settings"
-                    android:title="@string/additional_system_update_settings_list_item_title">
-            <intent android:action="android.intent.action.MAIN"
-                    android:targetPackage="@string/additional_system_update"
-                    android:targetClass="@string/additional_system_update_menu" />
-        </Preference>
-
         <!-- Device status - launches activity -->
         <Preference android:key="status_info"
                 android:title="@string/device_status"
@@ -103,10 +96,4 @@
                 android:title="@string/build_number"
                 android:summary="@string/summary_placeholder"/>
 
-        <!-- SELinux status information -->
-        <Preference
-                android:key="selinux_status"
-                android:title="@string/selinux_status"
-                android:summary="@string/selinux_status_enforcing"/>
-
 </PreferenceScreen>
diff --git a/res/xml/device_info_settings_v2.xml b/res/xml/device_info_settings_v2.xml
new file mode 100644
index 0000000..9110131
--- /dev/null
+++ b/res/xml/device_info_settings_v2.xml
@@ -0,0 +1,146 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  Copyright (C) 2017 The Android Open Source Project
+
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+  -->
+
+<PreferenceScreen
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:settings="http://schemas.android.com/apk/res-auto"
+    android:key="device_info_pref_screen"
+    android:title="@string/about_settings">
+
+    <!-- Phone number -->
+    <Preference
+        android:key="phone_number"
+        android:order="0"
+        android:title="@string/status_number"
+        android:summary="@string/summary_placeholder"/>
+
+    <!-- SIM status -->
+    <Preference
+        android:key="sim_status"
+        android:order="10"
+        android:title="@string/sim_status_title"
+        settings:keywords="@string/keywords_sim_status"
+        android:summary="@string/summary_placeholder"/>
+
+    <!-- Model & hardware -->
+    <Preference
+        android:key="device_model"
+        android:order="21"
+        android:title="@string/hardware_info"
+        settings:keywords="@string/keywords_model_and_hardware"
+        android:summary="@string/summary_placeholder"/>
+
+    <!-- IMEI -->
+    <Preference
+        android:key="imei_info"
+        android:order="22"
+        android:title="@string/status_imei"
+        settings:keywords="@string/keywords_imei_info"
+        android:summary="@string/summary_placeholder"/>
+
+    <!-- Android version -->
+    <Preference
+        android:key="firmware_version"
+        android:order="32"
+        android:title="@string/firmware_version"
+        settings:keywords="@string/keywords_android_version"
+        android:summary="@string/summary_placeholder"/>
+
+    <!-- IMS registration -->
+    <Preference
+        android:key="ims_reg_state"
+        android:order="33"
+        android:title="@string/ims_reg_title"
+        android:summary="@string/summary_placeholder"/>
+
+    <!--IP address -->
+    <Preference
+        android:key="wifi_ip_address"
+        android:order="34"
+        android:title="@string/wifi_ip_address"
+        android:summary="@string/summary_placeholder"
+        settings:allowDividerAbove="true"/>
+
+    <!-- Wi-Fi MAC address -->
+    <Preference
+        android:key="wifi_mac_address"
+        android:order="35"
+        android:title="@string/status_wifi_mac_address"
+        android:summary="@string/summary_placeholder"/>
+
+    <!-- Bluetooth address -->
+    <Preference
+        android:key="bt_address"
+        android:order="36"
+        android:title="@string/status_bt_address"
+        android:summary="@string/summary_placeholder"/>
+
+
+    <!-- Legal information -->
+    <Preference
+        android:key="legal_container"
+        android:order="37"
+        android:title="@string/legal_information"
+        android:fragment="com.android.settings.LegalSettings"
+        settings:allowDividerAbove="true"/>
+
+    <!-- Regulatory labels -->
+    <Preference
+        android:key="regulatory_info"
+        android:order="38"
+        android:title="@string/regulatory_labels">
+        <intent android:action="android.settings.SHOW_REGULATORY_INFO"/>
+    </Preference>
+
+    <!-- Safety & regulatory manual -->
+    <Preference
+        android:key="safety_info"
+        android:order="39"
+        android:title="@string/safety_and_regulatory_info">
+        <intent android:action="android.settings.SHOW_SAFETY_AND_REGULATORY_INFO"/>
+    </Preference>
+
+    <!-- Manual -->
+    <Preference
+        android:key="manual"
+        android:order="40"
+        android:title="@string/manual">
+        <intent android:action="android.settings.SHOW_MANUAL"/>
+    </Preference>
+
+    <!-- Feedback on the device -->
+    <Preference
+        android:key="device_feedback"
+        android:order="41"
+        android:title="@string/device_feedback"/>
+
+    <!-- Device FCC equipment id -->
+    <Preference
+        android:key="fcc_equipment_id"
+        android:order="42"
+        android:title="@string/fcc_equipment_id"
+        android:summary="@string/summary_placeholder"/>
+
+    <!-- Build number -->
+    <Preference
+        android:key="build_number"
+        android:order="43"
+        android:title="@string/build_number"
+        android:summary="@string/summary_placeholder"
+        settings:allowDividerAbove="true"/>
+
+</PreferenceScreen>
\ No newline at end of file
diff --git a/res/xml/device_info_status.xml b/res/xml/device_info_status.xml
index 3456f91..a784ed9 100644
--- a/res/xml/device_info_status.xml
+++ b/res/xml/device_info_status.xml
@@ -16,6 +16,7 @@
 
 <PreferenceScreen
     xmlns:android="http://schemas.android.com/apk/res/android"
+    android:key="device_status_screen"
     android:title="@string/device_status_activity_title">
 
     <Preference
@@ -83,13 +84,6 @@
         android:summary="@string/summary_placeholder"
         android:persistent="false" />
     <Preference
-        android:key="wimax_mac_address"
-        android:enabled="false"
-        android:shouldDisableView="false"
-        android:title="@string/status_wimax_mac_address"
-        android:summary="@string/summary_placeholder"
-        android:persistent="false" />
-    <Preference
         android:key="ims_reg_state"
         android:enabled="false"
         android:shouldDisableView="false"
diff --git a/res/xml/device_info_storage.xml b/res/xml/device_info_storage.xml
index 19c5982..d5cce39 100644
--- a/res/xml/device_info_storage.xml
+++ b/res/xml/device_info_storage.xml
@@ -16,7 +16,7 @@
 
 <PreferenceScreen
     xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:settings="http://schemas.android.com/apk/res/com.android.settings"
+    xmlns:settings="http://schemas.android.com/apk/res-auto"
     android:title="@string/storage_settings"
     settings:keywords="@string/keywords_storage">
 
diff --git a/res/xml/device_info_storage_volume.xml b/res/xml/device_info_storage_volume.xml
index 35435d7..cb02d9a 100644
--- a/res/xml/device_info_storage_volume.xml
+++ b/res/xml/device_info_storage_volume.xml
@@ -16,7 +16,7 @@
 
 <PreferenceScreen
     xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:settings="http://schemas.android.com/apk/res/com.android.settings"
+    xmlns:settings="http://schemas.android.com/apk/res-auto"
     android:title="@string/storage_settings"
     settings:keywords="@string/keywords_storage">
 
diff --git a/res/xml/display_settings.xml b/res/xml/display_settings.xml
index 87d3e5e..f9f5d2b 100644
--- a/res/xml/display_settings.xml
+++ b/res/xml/display_settings.xml
@@ -16,9 +16,11 @@
 
 <PreferenceScreen
     xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:settings="http://schemas.android.com/apk/res/com.android.settings"
+    xmlns:settings="http://schemas.android.com/apk/res-auto"
+    android:key="display_settings_screen"
     android:title="@string/display_settings"
-    settings:keywords="@string/keywords_display">
+    settings:keywords="@string/keywords_display"
+    settings:initialExpandedChildrenCount="4">
 
     <Preference
         android:key="brightness"
@@ -77,10 +79,16 @@
         settings:keywords="@string/keywords_display_font_size" />
 
     <com.android.settings.display.ScreenZoomPreference
-        android:key="screen_zoom"
+        android:key="display_settings_screen_zoom"
         android:title="@string/screen_zoom_title"
+        android:fragment="com.android.settings.display.ScreenZoomSettings"
         settings:keywords="@string/screen_zoom_keywords" />
 
+    <SwitchPreference
+        android:key="show_operator_name"
+        android:title="@string/show_operator_name_title"
+        android:summary="@string/show_operator_name_summary" />
+
     <Preference
         android:key="screensaver"
         android:title="@string/screensaver_settings_title"
diff --git a/res/xml/double_tap_power_settings.xml b/res/xml/double_tap_power_settings.xml
index 4d89de6..26d0415 100644
--- a/res/xml/double_tap_power_settings.xml
+++ b/res/xml/double_tap_power_settings.xml
@@ -15,9 +15,11 @@
   limitations under the License.
   -->
 
-<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
-                  xmlns:app="http://schemas.android.com/apk/res-auto"
-                  android:title="@string/double_tap_power_for_camera_title">
+<PreferenceScreen
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:key="gesture_double_tap_power_screen"
+    android:title="@string/double_tap_power_for_camera_title">
 
     <com.android.settings.widget.VideoPreference
         android:key="gesture_double_tap_power_video"
diff --git a/res/xml/double_tap_screen_settings.xml b/res/xml/double_tap_screen_settings.xml
index 1601aae..d40602e 100644
--- a/res/xml/double_tap_screen_settings.xml
+++ b/res/xml/double_tap_screen_settings.xml
@@ -15,19 +15,21 @@
   limitations under the License.
   -->
 
-<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
-                  xmlns:app="http://schemas.android.com/apk/res-auto"
-                  android:title="@string/ambient_display_title">
+<PreferenceScreen
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:key="gesture_double_tap_screen_screen"
+    android:title="@string/ambient_display_title">
 
     <com.android.settings.widget.VideoPreference
         android:key="gesture_double_tap_screen_video"
         app:animation="@raw/gesture_ambient_tap"
-        app:preview="@drawable/gesture_ambient_tap"/>
+        app:preview="@drawable/gesture_ambient_tap" />
 
     <SwitchPreference
         android:key="gesture_double_tap_screen"
         android:title="@string/ambient_display_title"
         android:summary="@string/ambient_display_summary"
-        app:keywords="@string/keywords_gesture"/>
+        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 94d9782..a2af1e4 100644
--- a/res/xml/double_twist_gesture_settings.xml
+++ b/res/xml/double_twist_gesture_settings.xml
@@ -15,19 +15,21 @@
   limitations under the License.
   -->
 
-<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
-                  xmlns:app="http://schemas.android.com/apk/res-auto"
-                  android:title="@string/double_twist_for_camera_mode_title">
+<PreferenceScreen
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:key="gesture_double_twist_screen"
+    android:title="@string/double_twist_for_camera_mode_title">
 
     <com.android.settings.widget.VideoPreference
         android:key="gesture_double_twist_video"
         app:animation="@raw/gesture_twist"
-        app:preview="@drawable/gesture_twist"/>
+        app:preview="@drawable/gesture_twist" />
 
     <SwitchPreference
         android:key="gesture_double_twist"
         android:title="@string/double_twist_for_camera_mode_title"
         android:summary="@string/double_twist_for_camera_mode_summary"
-        app:keywords="@string/keywords_gesture"/>
+        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
index d27a6e3..ba689c7 100644
--- a/res/xml/dream_fragment_overview.xml
+++ b/res/xml/dream_fragment_overview.xml
@@ -16,7 +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="dream_overview_screen"
     android:title="@string/screensaver_settings_title" >
 
     <com.android.settings.widget.GearPreference
@@ -31,7 +31,8 @@
 
 
     <!-- Layout preference doesn't obey allowDividerAbove, so put it in a PreferenceCategory -->
-    <PreferenceCategory>
+    <PreferenceCategory
+        android:key="dream_start_now_category">
         <com.android.settings.applications.LayoutPreference
             android:key="dream_start_now_button_container"
             android:selectable="false"
diff --git a/res/xml/encryption_and_credential.xml b/res/xml/encryption_and_credential.xml
index 715ea14..c60c5b5 100644
--- a/res/xml/encryption_and_credential.xml
+++ b/res/xml/encryption_and_credential.xml
@@ -14,45 +14,72 @@
      limitations under the License.
 -->
 
-<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
-        android:title="@string/encryption_and_credential_settings_title"
-        android:key="encryption_and_credentials_screen">
+<PreferenceScreen
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:settings="http://schemas.android.com/apk/res-auto"
+    android:title="@string/encryption_and_credential_settings_title"
+    android:key="encryption_and_credentials_screen">
 
-    <PreferenceCategory android:key="credentials_management"
-            android:title="@string/credentials_title"
-            android:persistent="false"
-            android:order="100">
+    <PreferenceCategory
+        android:key="encryption_and_credentials_status_category"
+        android:title="@string/crypt_keeper_settings_title">
 
-        <com.android.settingslib.RestrictedPreference android:key="credential_storage_type"
-                android:title="@string/credential_storage_type" />
+        <Preference
+            android:key="encryption_and_credentials_encryption_status"
+            android:title="@string/crypt_keeper_encrypt_title"
+            android:fragment="com.android.settings.security.CryptKeeperSettings"
+            android:summary="@string/summary_placeholder" />
 
-        <Preference android:key="trusted_credentials"
-                android:title="@string/trusted_credentials"
-                android:summary="@string/trusted_credentials_summary"
-                android:fragment="com.android.settings.TrustedCredentialsSettings"/>
+    </PreferenceCategory>
 
-        <com.android.settingslib.RestrictedPreference android:key="user_credentials"
-                android:title="@string/user_credentials"
-                android:summary="@string/user_credentials_summary"
-                android:fragment="com.android.settings.UserCredentialsSettings"/>
+    <PreferenceCategory
+        android:key="credentials_management"
+        android:title="@string/credentials_title"
+        android:persistent="false"
+        android:order="100">
 
-        <com.android.settingslib.RestrictedPreference android:key="credentials_install"
-                android:title="@string/credentials_install"
-                android:summary="@string/credentials_install_summary">
+        <com.android.settingslib.RestrictedPreference
+            android:key="credential_storage_type"
+            android:title="@string/credential_storage_type"
+            android:summary="@string/summary_placeholder"
+            settings:userRestriction="no_config_credentials" />
 
-            <intent android:action="android.credentials.INSTALL"
-                    android:targetPackage="com.android.certinstaller"
-                    android:targetClass="com.android.certinstaller.CertInstallerMain"/>
+        <Preference
+            android:key="trusted_credentials"
+            android:title="@string/trusted_credentials"
+            android:summary="@string/trusted_credentials_summary"
+            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:fragment="com.android.settings.UserCredentialsSettings"
+            settings:userRestriction="no_config_credentials" />
+
+        <com.android.settingslib.RestrictedPreference
+            android:key="credentials_install"
+            android:title="@string/credentials_install"
+            android:summary="@string/credentials_install_summary"
+            settings:userRestriction="no_config_credentials">
+
+            <intent
+                android:action="android.credentials.INSTALL"
+                android:targetPackage="com.android.certinstaller"
+                android:targetClass="com.android.certinstaller.CertInstallerMain" />
 
         </com.android.settingslib.RestrictedPreference>
 
-        <com.android.settingslib.RestrictedPreference android:key="credentials_reset"
-                android:title="@string/credentials_reset"
-                android:summary="@string/credentials_reset_summary">
+        <com.android.settingslib.RestrictedPreference
+            android:key="credentials_reset"
+            android:title="@string/credentials_reset"
+            android:summary="@string/credentials_reset_summary"
+            settings:userRestriction="no_config_credentials">
 
-            <intent android:action="com.android.credentials.RESET"
-                    android:targetPackage="com.android.settings"
-                    android:targetClass="com.android.settings.CredentialStorage"/>
+            <intent
+                android:action="com.android.credentials.RESET"
+                android:targetPackage="com.android.settings"
+                android:targetClass="com.android.settings.CredentialStorage" />
 
         </com.android.settingslib.RestrictedPreference>
 
diff --git a/res/xml/enterprise_privacy_settings.xml b/res/xml/enterprise_privacy_settings.xml
index ffdf630..4fa50e7 100644
--- a/res/xml/enterprise_privacy_settings.xml
+++ b/res/xml/enterprise_privacy_settings.xml
@@ -15,7 +15,7 @@
 -->
 
 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
-                  xmlns:settings="http://schemas.android.com/apk/res/com.android.settings"
+                  xmlns:settings="http://schemas.android.com/apk/res-auto"
                   android:key="enterprise_privacy_settings"
                   android:title="@string/enterprise_privacy_settings">
 
diff --git a/res/xml/enterprise_set_default_apps_settings.xml b/res/xml/enterprise_set_default_apps_settings.xml
index b006f46..474a5c9 100644
--- a/res/xml/enterprise_set_default_apps_settings.xml
+++ b/res/xml/enterprise_set_default_apps_settings.xml
@@ -16,7 +16,7 @@
   -->
 
 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
-                  xmlns:settings="http://schemas.android.com/apk/res/com.android.settings"
+                  xmlns:settings="http://schemas.android.com/apk/res-auto"
                   android:key="enterprise_set_default_apps_settings">
     <PreferenceCategory
             android:key="dashboard_tile_placeholder"/>
diff --git a/res/xml/external_sources_details.xml b/res/xml/external_sources_details.xml
index 6bc7390..9e79c10 100644
--- a/res/xml/external_sources_details.xml
+++ b/res/xml/external_sources_details.xml
@@ -15,7 +15,7 @@
 -->
 
 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
-        xmlns:settings="http://schemas.android.com/apk/res/com.android.settings"
+        xmlns:settings="http://schemas.android.com/apk/res-auto"
         android:title="@string/install_other_apps">
 
     <com.android.settingslib.RestrictedSwitchPreference
diff --git a/res/xml/feature_flags_settings.xml b/res/xml/feature_flags_settings.xml
new file mode 100644
index 0000000..db652ff
--- /dev/null
+++ b/res/xml/feature_flags_settings.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.
+  -->
+
+<PreferenceScreen
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:title="@string/feature_flags_dashboard_title" />
diff --git a/res/xml/gestures.xml b/res/xml/gestures.xml
index 7f8df1b..f136ec7 100644
--- a/res/xml/gestures.xml
+++ b/res/xml/gestures.xml
@@ -17,6 +17,7 @@
 
 <PreferenceScreen
     xmlns:android="http://schemas.android.com/apk/res/android"
+    android:key="gesture_settings_screen"
     android:title="@string/gesture_preference_title" >
 
     <Preference
diff --git a/res/xml/high_power_details.xml b/res/xml/high_power_details.xml
index d0aae54..6eba78e 100644
--- a/res/xml/high_power_details.xml
+++ b/res/xml/high_power_details.xml
@@ -15,7 +15,7 @@
 -->
 
 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:settings="http://schemas.android.com/apk/res/com.android.settings"
+    xmlns:settings="http://schemas.android.com/apk/res-auto"
     android:title="@string/high_power_apps">
 
     <SwitchPreference
diff --git a/res/xml/inactive_apps.xml b/res/xml/inactive_apps.xml
index 27fda55..6f93bdb 100644
--- a/res/xml/inactive_apps.xml
+++ b/res/xml/inactive_apps.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,7 +14,9 @@
      limitations under the License.
 -->
 
-<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
+<PreferenceScreen
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:title="@string/inactive_apps_title">
 
 </PreferenceScreen>
 
diff --git a/res/xml/installed_app_details.xml b/res/xml/installed_app_details.xml
index df7027c..42822c0 100644
--- a/res/xml/installed_app_details.xml
+++ b/res/xml/installed_app_details.xml
@@ -17,7 +17,9 @@
 
 <PreferenceScreen
     xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto">
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:key="installed_app_detail_settings_screen"
+    app:initialExpandedChildrenCount="6">
 
     <com.android.settings.applications.LayoutPreference
         android:key="header_view"
@@ -31,11 +33,9 @@
         android:selectable="false"
         android:order="-9999"/>
 
-    <com.android.settings.applications.LayoutPreference
-      android:key="action_buttons"
-      android:layout="@layout/app_action_buttons"
-      android:selectable="false"
-      android:order="-9998"/>
+    <com.android.settings.widget.ActionButtonPreference
+        android:key="action_buttons"
+        android:order="-9998" />
 
     <Preference
         android:key="notification_settings"
diff --git a/res/xml/installed_app_launch_settings.xml b/res/xml/installed_app_launch_settings.xml
index ac77be1..a2a0ca4 100644
--- a/res/xml/installed_app_launch_settings.xml
+++ b/res/xml/installed_app_launch_settings.xml
@@ -14,8 +14,9 @@
      limitations under the License.
 -->
 
-<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
-                  android:title="@string/application_info_label">
+<PreferenceScreen
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:title="@string/launch_by_default">
 
     <PreferenceCategory android:key="app_launch_domain_links"
                         android:title="@string/app_launch_domain_links_title">
diff --git a/res/xml/language_and_input.xml b/res/xml/language_and_input.xml
index e9c9737..d5bb29c 100644
--- a/res/xml/language_and_input.xml
+++ b/res/xml/language_and_input.xml
@@ -17,8 +17,10 @@
 
 <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_settings" >
+    xmlns:settings="http://schemas.android.com/apk/res-auto"
+    android:key="language_and_input_settings_screen"
+    android:title="@string/language_settings"
+    settings:initialExpandedChildrenCount="3" >
 
     <Preference
         android:key="phone_language"
@@ -27,6 +29,7 @@
         android:fragment="com.android.settings.localepicker.LocaleListEditor"/>
 
     <PreferenceCategory
+        android:key="keyboards_category"
         android:title="@string/keyboard_and_input_methods_category">
         <Preference
             android:key="virtual_keyboard_pref"
@@ -40,6 +43,7 @@
     </PreferenceCategory>
 
     <PreferenceCategory
+        android:key="input_assistance_category"
         android:title="@string/input_assistance">
         <!-- Spell checker preference title, summary and fragment will be set programmatically. -->
         <!-- Note: Mark this as persistent="false" to remove unnecessarily saved shared preference.
@@ -62,7 +66,8 @@
             android:title="@string/user_dict_settings_title"/>
     </PreferenceCategory>
 
-    <PreferenceCategory>
+    <PreferenceCategory
+        android:key="pointer_and_tts_category">
 
         <com.android.settings.PointerSpeedPreference
             android:key="pointer_speed"
diff --git a/res/xml/legacy_channel_notification_settings.xml b/res/xml/legacy_channel_notification_settings.xml
deleted file mode 100644
index 519bf5d..0000000
--- a/res/xml/legacy_channel_notification_settings.xml
+++ /dev/null
@@ -1,45 +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.
--->
-
-<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
-                  xmlns:settings="http://schemas.android.com/apk/res/com.android.settings" >
-
-    <!-- Show badge -->
-    <com.android.settingslib.RestrictedSwitchPreference
-        android:key="badge"
-        android:title="@string/notification_badge_title"
-        settings:useAdditionalSummary="true"
-        settings:restrictedSwitchSummary="@string/enabled_by_admin" />
-
-    <!-- Importance toggle -->
-    <com.android.settingslib.RestrictedSwitchPreference
-        android:key="allow_sound"
-        android:title="@string/allow_interruption"
-	android:summary="@string/allow_interruption_summary"/>
-
-    <!-- Visibility Override -->
-    <com.android.settings.notification.RestrictedDropDownPreference
-        android:key="visibility_override"
-        android:title="@string/app_notification_visibility_override_title" />
-
-    <!-- Bypass DND -->
-    <com.android.settingslib.RestrictedSwitchPreference
-        android:key="bypass_dnd"
-        android:title="@string/app_notification_override_dnd_title"
-        android:summary="@string/app_notification_override_dnd_summary"
-        settings:useAdditionalSummary="true" />
-
-</PreferenceScreen>
diff --git a/res/xml/location_mode.xml b/res/xml/location_mode.xml
index e6dc067..ac8e584 100644
--- a/res/xml/location_mode.xml
+++ b/res/xml/location_mode.xml
@@ -14,20 +14,22 @@
      limitations under the License.
 -->
 
-<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
-        android:title="@string/location_mode_screen_title">
+<PreferenceScreen
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:key="location_mode_settings"
+    android:title="@string/location_mode_screen_title">
 
-        <com.android.settings.widget.RadioButtonPreference
-            android:key="high_accuracy"
-            android:title="@string/location_mode_high_accuracy_title"
-            android:summary="@string/location_mode_high_accuracy_description" />
-        <com.android.settings.widget.RadioButtonPreference
-            android:key="battery_saving"
-            android:title="@string/location_mode_battery_saving_title"
-            android:summary="@string/location_mode_battery_saving_description" />
-        <com.android.settings.widget.RadioButtonPreference
-            android:key="sensors_only"
-            android:title="@string/location_mode_sensors_only_title"
-            android:summary="@string/location_mode_sensors_only_description" />
+    <com.android.settings.widget.RadioButtonPreference
+        android:key="high_accuracy"
+        android:title="@string/location_mode_high_accuracy_title"
+        android:summary="@string/location_mode_high_accuracy_description" />
+    <com.android.settings.widget.RadioButtonPreference
+        android:key="battery_saving"
+        android:title="@string/location_mode_battery_saving_title"
+        android:summary="@string/location_mode_battery_saving_description" />
+    <com.android.settings.widget.RadioButtonPreference
+        android:key="sensors_only"
+        android:title="@string/location_mode_sensors_only_title"
+        android:summary="@string/location_mode_sensors_only_description" />
 
 </PreferenceScreen>
diff --git a/res/xml/location_settings.xml b/res/xml/location_settings.xml
index 77063bd..96fe905 100644
--- a/res/xml/location_settings.xml
+++ b/res/xml/location_settings.xml
@@ -15,7 +15,7 @@
 -->
 
 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
-                  xmlns:settings="http://schemas.android.com/apk/res/com.android.settings"
+                  xmlns:settings="http://schemas.android.com/apk/res-auto"
         android:key="location_settings"
         android:title="@string/location_settings_title"
         settings:keywords="@string/keywords_location">
diff --git a/res/xml/manage_assist.xml b/res/xml/manage_assist.xml
index a96fb6b..047f1ca 100644
--- a/res/xml/manage_assist.xml
+++ b/res/xml/manage_assist.xml
@@ -17,12 +17,13 @@
 
 <PreferenceScreen
     xmlns:android="http://schemas.android.com/apk/res/android"
+    android:key="manage_assist_screen"
     android:title="@string/assist_and_voice_input_title">
 
     <com.android.settings.widget.GearPreference
         android:key="default_assist"
         android:title="@string/default_assist_title"
-        android:summary="@string/app_list_preference_none"
+        android:summary="@string/summary_placeholder"
         android:fragment="com.android.settings.applications.assist.DefaultAssistPicker"/>
 
     <Preference
diff --git a/res/xml/manage_domain_url_settings.xml b/res/xml/manage_domain_url_settings.xml
new file mode 100644
index 0000000..e4e4e47
--- /dev/null
+++ b/res/xml/manage_domain_url_settings.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.
+  -->
+
+<PreferenceScreen
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:title="@string/domain_urls_title" />
diff --git a/res/xml/managed_profile_settings.xml b/res/xml/managed_profile_settings.xml
index db3eb41..58fcd88 100644
--- a/res/xml/managed_profile_settings.xml
+++ b/res/xml/managed_profile_settings.xml
@@ -15,7 +15,7 @@
 -->
 
 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
-                  xmlns:settings="http://schemas.android.com/apk/res/com.android.settings"
+                  xmlns:settings="http://schemas.android.com/apk/res-auto"
                   android:title="@string/managed_profile_settings_title">
 
     <SwitchPreference
diff --git a/res/xml/network_and_internet.xml b/res/xml/network_and_internet.xml
index ee25bee..bc027d3 100644
--- a/res/xml/network_and_internet.xml
+++ b/res/xml/network_and_internet.xml
@@ -16,7 +16,8 @@
 
 <PreferenceScreen
     xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:settings="http://schemas.android.com/apk/res/com.android.settings"
+    xmlns:settings="http://schemas.android.com/apk/res-auto"
+    android:key="network_and_internet_screen"
     android:title="@string/network_dashboard_title">
 
     <com.android.settings.widget.MasterSwitchPreference
@@ -28,7 +29,7 @@
         android:order="-30">
         <intent
             android:action="android.settings.WIFI_SETTINGS"
-            android:targetClass="Settings$WifiSettingsActivity"/>
+            android:targetClass="Settings$WifiSettingsActivity" />
     </com.android.settings.widget.MasterSwitchPreference>
 
     <com.android.settingslib.RestrictedPreference
@@ -44,7 +45,7 @@
         <intent
             android:action="android.intent.action.MAIN"
             android:targetPackage="com.android.phone"
-            android:targetClass="com.android.phone.MobileNetworkSettings"/>
+            android:targetClass="com.android.phone.MobileNetworkSettings" />
     </com.android.settingslib.RestrictedPreference>
 
     <com.android.settingslib.RestrictedPreference
@@ -55,7 +56,7 @@
         android:order="-5"
         android:summary="@string/summary_placeholder"
         settings:userRestriction="no_config_tethering"
-        settings:useAdminDisabledSummary="true"/>
+        settings:useAdminDisabledSummary="true" />
 
     <com.android.settingslib.RestrictedPreference
         android:fragment="com.android.settings.vpn2.VpnSettings"
@@ -65,25 +66,25 @@
         android:order="0"
         android:summary="@string/summary_placeholder"
         settings:userRestriction="no_config_vpn"
-        settings:useAdminDisabledSummary="true"/>
+        settings:useAdminDisabledSummary="true" />
 
     <com.android.settingslib.RestrictedPreference
         android:key="manage_mobile_plan"
         android:title="@string/manage_mobile_plan_title"
         android:persistent="false"
         settings:userRestriction="no_config_mobile_networks"
-        settings:useAdminDisabledSummary="true"/>
+        settings:useAdminDisabledSummary="true" />
 
     <SwitchPreference
         android:key="toggle_airplane"
         android:title="@string/airplane_mode"
         android:icon="@drawable/ic_airplanemode_active"
         android:disableDependentsState="true"
-        android:order="5"/>
+        android:order="5" />
 
     <Preference
         android:fragment="com.android.settings.ProxySelector"
         android:key="proxy_settings"
-        android:title="@string/proxy_settings_title"/>
+        android:title="@string/proxy_settings_title" />
 
 </PreferenceScreen>
\ No newline at end of file
diff --git a/res/xml/nfc_payment_settings.xml b/res/xml/nfc_payment_settings.xml
index 9b47dda..9a5185c 100644
--- a/res/xml/nfc_payment_settings.xml
+++ b/res/xml/nfc_payment_settings.xml
@@ -14,5 +14,7 @@
      limitations under the License.
 -->
 
-<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
+<PreferenceScreen
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:title="@string/nfc_payment_settings_title">
 </PreferenceScreen>
diff --git a/res/xml/night_display_settings.xml b/res/xml/night_display_settings.xml
index dc4fecd..8f2bb97 100644
--- a/res/xml/night_display_settings.xml
+++ b/res/xml/night_display_settings.xml
@@ -16,7 +16,8 @@
 
 <PreferenceScreen
         xmlns:android="http://schemas.android.com/apk/res/android"
-        android:title="@string/night_display_title">
+        android:title="@string/night_display_title"
+        android:key="night_display_title">
 
     <DropDownPreference
             android:key="night_display_auto_mode"
diff --git a/res/xml/notification_access_settings.xml b/res/xml/notification_access_settings.xml
new file mode 100644
index 0000000..1300140
--- /dev/null
+++ b/res/xml/notification_access_settings.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.
+  -->
+
+<PreferenceScreen
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:title="@string/manage_notification_access_title" />
diff --git a/res/xml/notification_group_settings.xml b/res/xml/notification_group_settings.xml
new file mode 100644
index 0000000..0d4184d
--- /dev/null
+++ b/res/xml/notification_group_settings.xml
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2017 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
+        xmlns:settings="http://schemas.android.com/apk/res-auto">
+
+    <com.android.settings.applications.LayoutPreference
+        android:key="pref_app_header"
+        android:layout="@layout/settings_entity_header" />
+
+    <com.android.settings.applications.LayoutPreference
+        android:key="block"
+        android:layout="@layout/styled_switch_bar" />
+
+    <!-- Channels added here -->
+
+    <Preference
+        android:key="app_link"
+        android:title="@string/app_settings_link"
+        settings:allowDividerAbove="true"/>
+
+    <com.android.settings.notification.NotificationFooterPreference
+        android:key="desc" />
+
+    <com.android.settings.notification.NotificationFooterPreference
+        android:key="block_desc" />
+</PreferenceScreen>
diff --git a/res/xml/notification_settings.xml b/res/xml/notification_settings.xml
index b2f1d3d..144bef6 100644
--- a/res/xml/notification_settings.xml
+++ b/res/xml/notification_settings.xml
@@ -15,6 +15,7 @@
 -->
 
 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
-        xmlns:settings="http://schemas.android.com/apk/res/com.android.settings">
+        xmlns:settings="http://schemas.android.com/apk/res-auto"
+        android:title="@string/app_notifications_title">
 
 </PreferenceScreen>
diff --git a/res/xml/other_sound_settings.xml b/res/xml/other_sound_settings.xml
index da67d03..6eca62c 100644
--- a/res/xml/other_sound_settings.xml
+++ b/res/xml/other_sound_settings.xml
@@ -17,7 +17,7 @@
 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
         android:title="@string/other_sound_settings"
         android:key="other_sound_settings"
-        xmlns:settings="http://schemas.android.com/apk/res/com.android.settings">
+        xmlns:settings="http://schemas.android.com/apk/res-auto">
 
     <!-- Dial pad tones -->
     <SwitchPreference
diff --git a/res/xml/physical_keyboard_settings.xml b/res/xml/physical_keyboard_settings.xml
index 974ba98..a2d9a6b 100644
--- a/res/xml/physical_keyboard_settings.xml
+++ b/res/xml/physical_keyboard_settings.xml
@@ -13,7 +13,9 @@
      See the License for the specific language governing permissions and
      limitations under the License.
 -->
-<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
+<PreferenceScreen
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:key="physical_keyboard_screen"
     android:title="@string/physical_keyboard_title">
     <!-- Additional preference screens are inserted here programmatically
          with low order values to set the key map of each attached keyboard. -->
diff --git a/res/xml/pick_up_gesture_settings.xml b/res/xml/pick_up_gesture_settings.xml
index 0b4a1de..e1414cd 100644
--- a/res/xml/pick_up_gesture_settings.xml
+++ b/res/xml/pick_up_gesture_settings.xml
@@ -18,6 +18,7 @@
 <PreferenceScreen
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:key="gesture_pick_up_screen"
     android:title="@string/ambient_display_pickup_title">
 
     <com.android.settings.widget.VideoPreference
diff --git a/res/xml/picture_in_picture_settings.xml b/res/xml/picture_in_picture_settings.xml
new file mode 100644
index 0000000..b7091df
--- /dev/null
+++ b/res/xml/picture_in_picture_settings.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.
+  -->
+
+<PreferenceScreen
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:title="@string/picture_in_picture_title" />
diff --git a/res/xml/power_usage_advanced.xml b/res/xml/power_usage_advanced.xml
index 3deec09..b31eb40 100644
--- a/res/xml/power_usage_advanced.xml
+++ b/res/xml/power_usage_advanced.xml
@@ -16,7 +16,8 @@
 
 <PreferenceScreen
     xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:settings="http://schemas.android.com/apk/res/com.android.settings"
+    xmlns:settings="http://schemas.android.com/apk/res-auto"
+    android:key="power_usage_advanced_screen"
     android:title="@string/advanced_battery_title"
     settings:keywords="@string/keywords_battery">
 
diff --git a/res/xml/power_usage_detail.xml b/res/xml/power_usage_detail.xml
index 919f321..acd6367 100644
--- a/res/xml/power_usage_detail.xml
+++ b/res/xml/power_usage_detail.xml
@@ -23,10 +23,8 @@
         android:selectable="false"
         android:order="-10000"/>
 
-    <com.android.settings.applications.LayoutPreference
+    <com.android.settings.widget.ActionButtonPreference
         android:key="action_buttons"
-        android:layout="@layout/app_action_buttons"
-        android:selectable="false"
         android:order="-9999"/>
 
     <Preference
diff --git a/res/xml/power_usage_details.xml b/res/xml/power_usage_details.xml
index 86aa4f5..85a2ce7 100644
--- a/res/xml/power_usage_details.xml
+++ b/res/xml/power_usage_details.xml
@@ -15,7 +15,7 @@
 -->
 
 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:settings="http://schemas.android.com/apk/res/com.android.settings">
+    xmlns:settings="http://schemas.android.com/apk/res-auto">
 
         <com.android.settings.applications.LayoutPreference
             android:key="two_buttons"
diff --git a/res/xml/power_usage_summary.xml b/res/xml/power_usage_summary.xml
index efdae92..80179c0 100644
--- a/res/xml/power_usage_summary.xml
+++ b/res/xml/power_usage_summary.xml
@@ -16,7 +16,8 @@
 
 <PreferenceScreen
     xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:settings="http://schemas.android.com/apk/res/com.android.settings"
+    xmlns:settings="http://schemas.android.com/apk/res-auto"
+    android:key="power_usage_summary_screen"
     android:title="@string/power_usage_summary_title"
     settings:keywords="@string/keywords_battery">
 
diff --git a/res/xml/premium_sms_settings.xml b/res/xml/premium_sms_settings.xml
new file mode 100644
index 0000000..7bcf11e
--- /dev/null
+++ b/res/xml/premium_sms_settings.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.
+  -->
+
+<PreferenceScreen
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:title="@string/premium_sms_access" />
diff --git a/res/xml/print_job_settings.xml b/res/xml/print_job_settings.xml
index 5550478..32a80a7 100644
--- a/res/xml/print_job_settings.xml
+++ b/res/xml/print_job_settings.xml
@@ -15,7 +15,7 @@
 -->
 
 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
-        xmlns:settings="http://schemas.android.com/apk/res/com.android.settings"
+        xmlns:settings="http://schemas.android.com/apk/res-auto"
         android:title="@string/print_print_job">
 
     <Preference
diff --git a/res/xml/print_settings.xml b/res/xml/print_settings.xml
index 3a00f71..75a767a 100644
--- a/res/xml/print_settings.xml
+++ b/res/xml/print_settings.xml
@@ -14,21 +14,21 @@
      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"
+<PreferenceScreen
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:settings="http://schemas.android.com/apk/res-auto"
+    android:key="print_settings_screen"
+    android:title="@string/print_settings_title"
+    settings:keywords="@string/keywords_printing">
+
+    <PreferenceCategory
+        android:key="print_jobs_category"
+        android:title="@string/print_print_jobs"
+        android:order="0" />
+
+    <PreferenceCategory
+        android:key="print_services_category"
         android:title="@string/print_settings_title"
-        settings:keywords="@string/keywords_printing">
-
-    <PreferenceCategory
-            android:key="print_jobs_category"
-            android:title="@string/print_print_jobs"
-            android:order="0">
-    </PreferenceCategory>
-
-    <PreferenceCategory
-            android:key="print_services_category"
-            android:title="@string/print_settings_title"
-            android:order="1">
-    </PreferenceCategory>
+        android:order="1" />
 
 </PreferenceScreen>
diff --git a/res/xml/privacy_settings.xml b/res/xml/privacy_settings.xml
index 715f33b..a25933b 100644
--- a/res/xml/privacy_settings.xml
+++ b/res/xml/privacy_settings.xml
@@ -15,7 +15,7 @@
 -->
 
 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:settings="http://schemas.android.com/apk/res/com.android.settings"
+    xmlns:settings="http://schemas.android.com/apk/res-auto"
     android:title="@string/privacy_settings_title">
 
     <!-- Backup settings -->
diff --git a/res/xml/process_stats_ui.xml b/res/xml/process_stats_ui.xml
index ba9066e..84dccab 100644
--- a/res/xml/process_stats_ui.xml
+++ b/res/xml/process_stats_ui.xml
@@ -16,7 +16,7 @@
 
 <PreferenceScreen
     xmlns:android="http://schemas.android.com/apk/res/android"
-    android:title="@string/app_memory_use">
+    android:title="@string/memory_usage_apps">
 
     <PreferenceCategory
         android:key="app_list"
diff --git a/res/xml/reset_dashboard_fragment.xml b/res/xml/reset_dashboard_fragment.xml
index 2761496..1b8dc68 100644
--- a/res/xml/reset_dashboard_fragment.xml
+++ b/res/xml/reset_dashboard_fragment.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"
+    xmlns:settings="http://schemas.android.com/apk/res-auto"
     android:title="@string/reset_dashboard_title"
     android:key="reset_dashboard_fragment_screen">
 
diff --git a/res/xml/screen_lock_settings.xml b/res/xml/screen_lock_settings.xml
new file mode 100644
index 0000000..3bd8255
--- /dev/null
+++ b/res/xml/screen_lock_settings.xml
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  Copyright (C) 2017 The Android Open Source Project
+
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT 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:key="security_settings_password_sub_screen"
+    android:title="@string/security_settings_title">
+
+    <!-- available in pattern -->
+    <SwitchPreference
+        android:key="visiblepattern"
+        android:title="@string/lockpattern_settings_enable_visible_pattern_title" />
+
+    <!-- available in pin/pattern/password -->
+    <com.android.settings.TimeoutListPreference
+        android:key="lock_after_timeout"
+        android:title="@string/lock_after_timeout"
+        android:summary="@string/summary_placeholder"
+        android:entries="@array/lock_after_timeout_entries"
+        android:entryValues="@array/lock_after_timeout_values" />
+
+    <!-- available in pin/pattern/password -->
+    <SwitchPreference
+        android:key="power_button_instantly_locks"
+        android:title="@string/lockpattern_settings_enable_power_button_instantly_locks" />
+
+    <!-- available in pin/pattern/password/slide -->
+    <com.android.settingslib.RestrictedPreference
+        android:key="owner_info_settings"
+        android:title="@string/owner_info_settings_title" />
+
+</PreferenceScreen>
\ No newline at end of file
diff --git a/res/xml/screen_pinning_settings.xml b/res/xml/screen_pinning_settings.xml
index 229c4ea..f27e4aa 100644
--- a/res/xml/screen_pinning_settings.xml
+++ b/res/xml/screen_pinning_settings.xml
@@ -14,11 +14,13 @@
      limitations under the License.
 -->
 
-<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
-        android:title="@string/screen_pinning_title">
+<PreferenceScreen
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:key="screen_pinning_settings_screen"
+    android:title="@string/screen_pinning_title">
 
-        <SwitchPreference
-                android:key="use_screen_lock"
-                android:title="@string/screen_pinning_unlock_none" />
+    <SwitchPreference
+        android:key="use_screen_lock"
+        android:title="@string/screen_pinning_unlock_none" />
 
 </PreferenceScreen>
diff --git a/res/xml/security_lockscreen_settings.xml b/res/xml/security_lockscreen_settings.xml
index d10440e..7a45bec 100644
--- a/res/xml/security_lockscreen_settings.xml
+++ b/res/xml/security_lockscreen_settings.xml
@@ -16,6 +16,7 @@
 
 <PreferenceScreen
     xmlns:android="http://schemas.android.com/apk/res/android"
+    android:key="security_lockscreen_settings_screen"
     android:title="@string/lockscreen_settings_title">
 
     <com.android.settings.notification.RestrictedDropDownPreference
@@ -24,7 +25,7 @@
         android:summary="@string/summary_placeholder" />
 
     <com.android.settingslib.RestrictedSwitchPreference
-        android:key="add_users_when_locked"
+        android:key="security_lockscreen_add_users_when_locked"
         android:title="@string/user_add_on_lockscreen_menu" />
 
     <com.android.settingslib.RestrictedPreference
diff --git a/res/xml/security_settings.xml b/res/xml/security_settings.xml
index 228b7f1..31f2334 100644
--- a/res/xml/security_settings.xml
+++ b/res/xml/security_settings.xml
@@ -14,7 +14,11 @@
      limitations under the License.
 -->
 
-<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
-        android:title="@string/security_settings_title">
+<PreferenceScreen
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:settings="http://schemas.android.com/apk/res-auto"
+    android:key="security_dashboard_page"
+    android:title="@string/security_settings_title"
+    settings:initialExpandedChildrenCount="9">
 
 </PreferenceScreen>
diff --git a/res/xml/security_settings_chooser.xml b/res/xml/security_settings_chooser.xml
index 067ebab..360e620 100644
--- a/res/xml/security_settings_chooser.xml
+++ b/res/xml/security_settings_chooser.xml
@@ -15,7 +15,8 @@
 -->
 
 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
-                  xmlns:settings="http://schemas.android.com/apk/res/com.android.settings"
+                  xmlns:settings="http://schemas.android.com/apk/res-auto"
+                  android:key="security_settings_chooser_screen"
                   android:title="@string/security_settings_title">
 
     <PreferenceCategory
diff --git a/res/xml/security_settings_encrypted.xml b/res/xml/security_settings_encrypted.xml
deleted file mode 100644
index 0d3fe76..0000000
--- a/res/xml/security_settings_encrypted.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2011 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT 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/security_settings_title">
-
-    <PreferenceCategory
-        android:key="security_category_for_encrypted_device"
-        android:title="@string/crypt_keeper_settings_title">
-
-        <Preference
-            android:key="crypt_keeper_encrypt_title"
-            android:title="@string/crypt_keeper_encrypt_title"
-            android:summary="@string/crypt_keeper_encrypted_summary"/>
-
-    </PreferenceCategory>
-
-
-</PreferenceScreen>
diff --git a/res/xml/security_settings_lockscreen.xml b/res/xml/security_settings_lockscreen.xml
index c141fb7..56410fb 100644
--- a/res/xml/security_settings_lockscreen.xml
+++ b/res/xml/security_settings_lockscreen.xml
@@ -15,7 +15,8 @@
 -->
 
 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
-                  xmlns:settings="http://schemas.android.com/apk/res/com.android.settings"
+                  xmlns:settings="http://schemas.android.com/apk/res-auto"
+                  android:key="security_settings_lockscreen_screen"
                   android:title="@string/security_settings_title">
 
     <PreferenceCategory
diff --git a/res/xml/security_settings_lockscreen_profile.xml b/res/xml/security_settings_lockscreen_profile.xml
index e027c6b..a0c3f02 100644
--- a/res/xml/security_settings_lockscreen_profile.xml
+++ b/res/xml/security_settings_lockscreen_profile.xml
@@ -15,7 +15,8 @@
 -->
 
 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
-                  xmlns:settings="http://schemas.android.com/apk/res/com.android.settings"
+                  xmlns:settings="http://schemas.android.com/apk/res-auto"
+                  android:key="security_settings_lockscreen_profile_screen"
                   android:title="@string/security_settings_title">
 
     <com.android.settingslib.RestrictedPreference
diff --git a/res/xml/security_settings_misc.xml b/res/xml/security_settings_misc.xml
index 7946dd9..730686c 100644
--- a/res/xml/security_settings_misc.xml
+++ b/res/xml/security_settings_misc.xml
@@ -15,10 +15,12 @@
 -->
 
 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
+                  android:key="security_settings_misc_screen"
         android:title="@string/security_settings_title">
 
-    <PreferenceCategory android:title="@string/security_passwords_title"
-            android:persistent="false">
+    <PreferenceCategory
+        android:key="security_settings_misc_category"
+        android:title="@string/security_passwords_title">
 
         <Preference
             android:key="location"
@@ -33,7 +35,8 @@
 
     </PreferenceCategory>
 
-    <PreferenceCategory>
+    <PreferenceCategory
+        android:key="security_settings_device_admin_category">
 
         <Preference android:key="manage_device_admin"
                 android:title="@string/manage_device_admin"
@@ -61,22 +64,22 @@
         android:key="encryption_and_credential"
         android:title="@string/encryption_and_credential_settings_title"
         android:summary="@string/encryption_and_credential_settings_summary"
-        android:fragment="com.android.settings.EncryptionAndCredential"/>
+        android:fragment="com.android.settings.security.EncryptionAndCredential"/>
 
     <Preference android:key="manage_trust_agents"
         android:title="@string/manage_trust_agents"
         android:persistent="false"
-        android:fragment="com.android.settings.TrustAgentSettings"/>
+        android:fragment="com.android.settings.security.trustagent.TrustAgentSettings"/>
 
     <Preference
         android:key="screen_pinning_settings"
         android:title="@string/screen_pinning_title"
         android:summary="@string/switch_off_text"
-        android:fragment="com.android.settings.ScreenPinningSettings"/>
+        android:fragment="com.android.settings.security.ScreenPinningSettings"/>
 
-    <Preference android:key="usage_access"
+    <Preference android:key="security_misc_usage_access"
         android:title="@string/usage_access_title"
-        android:fragment="com.android.settings.applications.ManageApplications">
+        android:fragment="com.android.settings.applications.manageapplications.ManageApplications">
         <extra
             android:name="classname"
             android:value="com.android.settings.Settings$UsageAccessSettingsActivity" />
diff --git a/res/xml/security_settings_password.xml b/res/xml/security_settings_password.xml
index 7de65f7..26077c7 100644
--- a/res/xml/security_settings_password.xml
+++ b/res/xml/security_settings_password.xml
@@ -15,7 +15,8 @@
 -->
 
 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
-                  xmlns:settings="http://schemas.android.com/apk/res/com.android.settings"
+                  xmlns:settings="http://schemas.android.com/apk/res-auto"
+                  android:key="security_settings_password_screen"
                   android:title="@string/lock_settings_picker_title">
 
     <PreferenceCategory
diff --git a/res/xml/security_settings_password_profile.xml b/res/xml/security_settings_password_profile.xml
index 84e1678..257b234 100644
--- a/res/xml/security_settings_password_profile.xml
+++ b/res/xml/security_settings_password_profile.xml
@@ -15,7 +15,8 @@
 -->
 
 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
-                  xmlns:settings="http://schemas.android.com/apk/res/com.android.settings"
+                  xmlns:settings="http://schemas.android.com/apk/res-auto"
+                  android:key="security_settings_password_profile_screen"
                   android:title="@string/security_settings_title">
 
     <com.android.settingslib.RestrictedPreference
diff --git a/res/xml/security_settings_password_sub.xml b/res/xml/security_settings_password_sub.xml
deleted file mode 100644
index c0287c0..0000000
--- a/res/xml/security_settings_password_sub.xml
+++ /dev/null
@@ -1,37 +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
-  -->
-
-<PreferenceScreen
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:title="@string/settings_label">
-
-    <com.android.settings.TimeoutListPreference
-        android:key="lock_after_timeout"
-        android:title="@string/lock_after_timeout"
-        android:summary="@string/summary_placeholder"
-        android:entries="@array/lock_after_timeout_entries"
-        android:entryValues="@array/lock_after_timeout_values" />
-
-    <SwitchPreference
-        android:key="power_button_instantly_locks"
-        android:title="@string/lockpattern_settings_enable_power_button_instantly_locks" />
-
-    <com.android.settingslib.RestrictedPreference
-        android:key="owner_info_settings"
-        android:title="@string/owner_info_settings_title" />
-
-</PreferenceScreen>
diff --git a/res/xml/security_settings_pattern.xml b/res/xml/security_settings_pattern.xml
index 1585f01..9b7482f 100644
--- a/res/xml/security_settings_pattern.xml
+++ b/res/xml/security_settings_pattern.xml
@@ -15,7 +15,8 @@
 -->
 
 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
-                  xmlns:settings="http://schemas.android.com/apk/res/com.android.settings"
+                  xmlns:settings="http://schemas.android.com/apk/res-auto"
+                  android:key="security_settings_pattern_screen"
                   android:title="@string/lock_settings_picker_title">
 
     <PreferenceCategory
diff --git a/res/xml/security_settings_pattern_profile.xml b/res/xml/security_settings_pattern_profile.xml
index b660e4a..e095486 100644
--- a/res/xml/security_settings_pattern_profile.xml
+++ b/res/xml/security_settings_pattern_profile.xml
@@ -15,7 +15,8 @@
 -->
 
 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
-                  xmlns:settings="http://schemas.android.com/apk/res/com.android.settings"
+                  xmlns:settings="http://schemas.android.com/apk/res-auto"
+                  android:key="security_settings_pattern_profile_screen"
                   android:title="@string/security_settings_title">
 
     <com.android.settingslib.RestrictedPreference
diff --git a/res/xml/security_settings_pattern_sub.xml b/res/xml/security_settings_pattern_sub.xml
deleted file mode 100644
index 7de2ba2..0000000
--- a/res/xml/security_settings_pattern_sub.xml
+++ /dev/null
@@ -1,41 +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
-  -->
-
-<PreferenceScreen
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:title="@string/settings_label">
-
-    <SwitchPreference
-        android:key="visiblepattern"
-        android:title="@string/lockpattern_settings_enable_visible_pattern_title" />
-
-    <com.android.settings.TimeoutListPreference
-        android:key="lock_after_timeout"
-        android:title="@string/lock_after_timeout"
-        android:summary="@string/summary_placeholder"
-        android:entries="@array/lock_after_timeout_entries"
-        android:entryValues="@array/lock_after_timeout_values" />
-
-    <SwitchPreference
-        android:key="power_button_instantly_locks"
-        android:title="@string/lockpattern_settings_enable_power_button_instantly_locks" />
-
-    <com.android.settingslib.RestrictedPreference
-        android:key="owner_info_settings"
-        android:title="@string/owner_info_settings_title" />
-
-</PreferenceScreen>
diff --git a/res/xml/security_settings_pin.xml b/res/xml/security_settings_pin.xml
index f7705b7..780ca19 100644
--- a/res/xml/security_settings_pin.xml
+++ b/res/xml/security_settings_pin.xml
@@ -15,7 +15,7 @@
 -->
 
 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
-                  xmlns:settings="http://schemas.android.com/apk/res/com.android.settings"
+                  xmlns:settings="http://schemas.android.com/apk/res-auto"
                   android:title="@string/lock_settings_picker_title">
 
     <PreferenceCategory
diff --git a/res/xml/security_settings_pin_profile.xml b/res/xml/security_settings_pin_profile.xml
index 481a087..071b2f5 100644
--- a/res/xml/security_settings_pin_profile.xml
+++ b/res/xml/security_settings_pin_profile.xml
@@ -15,7 +15,8 @@
 -->
 
 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
-                  xmlns:settings="http://schemas.android.com/apk/res/com.android.settings"
+                  xmlns:settings="http://schemas.android.com/apk/res-auto"
+                  android:key="security_settings_pin_profile_screen"
                   android:title="@string/security_settings_title">
 
     <com.android.settingslib.RestrictedPreference
diff --git a/res/xml/security_settings_pin_sub.xml b/res/xml/security_settings_pin_sub.xml
deleted file mode 100644
index c0287c0..0000000
--- a/res/xml/security_settings_pin_sub.xml
+++ /dev/null
@@ -1,37 +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
-  -->
-
-<PreferenceScreen
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:title="@string/settings_label">
-
-    <com.android.settings.TimeoutListPreference
-        android:key="lock_after_timeout"
-        android:title="@string/lock_after_timeout"
-        android:summary="@string/summary_placeholder"
-        android:entries="@array/lock_after_timeout_entries"
-        android:entryValues="@array/lock_after_timeout_values" />
-
-    <SwitchPreference
-        android:key="power_button_instantly_locks"
-        android:title="@string/lockpattern_settings_enable_power_button_instantly_locks" />
-
-    <com.android.settingslib.RestrictedPreference
-        android:key="owner_info_settings"
-        android:title="@string/owner_info_settings_title" />
-
-</PreferenceScreen>
diff --git a/res/xml/security_settings_profile.xml b/res/xml/security_settings_profile.xml
index 55dd8ef..9870e30 100644
--- a/res/xml/security_settings_profile.xml
+++ b/res/xml/security_settings_profile.xml
@@ -15,7 +15,7 @@
 -->
 
 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
-                  xmlns:settings="http://schemas.android.com/apk/res/com.android.settings"
+                  xmlns:settings="http://schemas.android.com/apk/res-auto"
                   android:title="@string/lock_settings_picker_title">
 
     <PreferenceCategory
diff --git a/res/xml/security_settings_slide_sub.xml b/res/xml/security_settings_slide_sub.xml
deleted file mode 100644
index 88eba8b..0000000
--- a/res/xml/security_settings_slide_sub.xml
+++ /dev/null
@@ -1,27 +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
-  -->
-
-<PreferenceScreen
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:title="@string/settings_label">
-
-    <com.android.settingslib.RestrictedPreference
-        android:key="owner_info_settings"
-        android:title="@string/owner_info_settings_title"
-        android:summary="@string/owner_info_settings_summary" />
-
-</PreferenceScreen>
diff --git a/res/xml/security_settings_unencrypted.xml b/res/xml/security_settings_unencrypted.xml
deleted file mode 100644
index 27dbe96..0000000
--- a/res/xml/security_settings_unencrypted.xml
+++ /dev/null
@@ -1,31 +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.
--->
-
-<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
-                  android:title="@string/crypt_keeper_settings_title">
-
-    <PreferenceCategory
-        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/security_settings_unification.xml b/res/xml/security_settings_unification.xml
index 79b8b7d..43b8b09 100644
--- a/res/xml/security_settings_unification.xml
+++ b/res/xml/security_settings_unification.xml
@@ -15,7 +15,7 @@
 -->
 
 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
-                  xmlns:settings="http://schemas.android.com/apk/res/com.android.settings"
+                  xmlns:settings="http://schemas.android.com/apk/res-auto"
                   android:title="@string/security_settings_title">
 
     <SwitchPreference
diff --git a/res/xml/sim_lock_settings.xml b/res/xml/sim_lock_settings.xml
index 0246ea2..2b823f9 100644
--- a/res/xml/sim_lock_settings.xml
+++ b/res/xml/sim_lock_settings.xml
@@ -15,7 +15,7 @@
 -->
 
 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
-        xmlns:settings="http://schemas.android.com/apk/res/com.android.settings"
+        xmlns:settings="http://schemas.android.com/apk/res-auto"
         android:title="@string/sim_lock_settings">
 
     <SwitchPreference
diff --git a/res/xml/sound_settings.xml b/res/xml/sound_settings.xml
index a764d7a..616a08c 100644
--- a/res/xml/sound_settings.xml
+++ b/res/xml/sound_settings.xml
@@ -16,61 +16,65 @@
 
 <PreferenceScreen
     xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:settings="http://schemas.android.com/apk/res/com.android.settings"
+    xmlns:settings="http://schemas.android.com/apk/res-auto"
     android:title="@string/sound_settings"
     android:key="sound_settings"
-    settings:keywords="@string/keywords_sounds">
+    settings:keywords="@string/keywords_sounds"
+    settings:initialExpandedChildrenCount="6">
 
-    <PreferenceCategory
-        android:order="-100">
-        <!-- Media volume -->
-        <com.android.settings.notification.VolumeSeekBarPreference
-                android:key="media_volume"
-                android:icon="@*android:drawable/ic_audio_media"
-                android:title="@string/media_volume_option_title" />
+    <!-- Media volume -->
+    <com.android.settings.notification.VolumeSeekBarPreference
+        android:key="media_volume"
+        android:icon="@*android:drawable/ic_audio_media"
+        android:title="@string/media_volume_option_title"
+        android:order="-106"/>
 
-        <!-- Alarm volume -->
-        <com.android.settings.notification.VolumeSeekBarPreference
-                android:key="alarm_volume"
-                android:icon="@*android:drawable/ic_audio_alarm"
-                android:title="@string/alarm_volume_option_title" />
+    <!-- Alarm volume -->
+    <com.android.settings.notification.VolumeSeekBarPreference
+        android:key="alarm_volume"
+        android:icon="@*android:drawable/ic_audio_alarm"
+        android:title="@string/alarm_volume_option_title"
+        android:order="-105"/>
 
-        <!-- Ring volume -->
-        <com.android.settings.notification.VolumeSeekBarPreference
-                android:key="ring_volume"
-                android:icon="@*android:drawable/ic_audio_ring_notif"
-                android:title="@string/ring_volume_option_title" />
+    <!-- Ring volume -->
+    <com.android.settings.notification.VolumeSeekBarPreference
+        android:key="ring_volume"
+        android:icon="@*android:drawable/ic_audio_ring_notif"
+        android:title="@string/ring_volume_option_title"
+        android:order="-104"/>
 
-        <!-- Notification volume -->
-        <com.android.settings.notification.VolumeSeekBarPreference
-                android:key="notification_volume"
-                android:icon="@*android:drawable/ic_audio_ring_notif"
-                android:title="@string/notification_volume_option_title" />
+    <!-- Notification volume -->
+    <com.android.settings.notification.VolumeSeekBarPreference
+        android:key="notification_volume"
+        android:icon="@*android:drawable/ic_audio_ring_notif"
+        android:title="@string/notification_volume_option_title"
+        android:order="-103"/>
 
-        <!-- Also vibrate for calls -->
-        <SwitchPreference
-                android:key="vibrate_when_ringing"
-                android:title="@string/vibrate_when_ringing_title" />
+    <!-- Also vibrate for calls -->
+    <SwitchPreference
+        android:key="vibrate_when_ringing"
+        android:title="@string/vibrate_when_ringing_title"
+        android:order="-102"/>
 
-        <!-- Interruptions -->
-        <com.android.settingslib.RestrictedPreference
-                android:key="zen_mode"
-                android:title="@string/zen_mode_settings_title"
-                settings:useAdminDisabledSummary="true"
-                settings:keywords="@string/keywords_sounds_and_notifications_interruptions"
-                android:fragment="com.android.settings.notification.ZenModeSettings"
-                settings:allowDividerAbove="true" />
+    <!-- Interruptions -->
+    <com.android.settingslib.RestrictedPreference
+        android:key="zen_mode"
+        android:title="@string/zen_mode_settings_title"
+        settings:useAdminDisabledSummary="true"
+        settings:keywords="@string/keywords_sounds_and_notifications_interruptions"
+        android:fragment="com.android.settings.notification.ZenModeSettings"
+        settings:allowDividerAbove="true"
+        android:order="-101"/>
 
-        <!-- Phone ringtone -->
-        <com.android.settings.DefaultRingtonePreference
-            android:key="ringtone"
-            android:title="@string/ringtone_title"
-            android:dialogTitle="@string/ringtone_title"
-            android:summary="@string/summary_placeholder"
-            android:ringtoneType="ringtone"
-            settings:allowDividerAbove="true" />
-
-    </PreferenceCategory>
+    <!-- Phone ringtone -->
+    <com.android.settings.DefaultRingtonePreference
+        android:key="ringtone"
+        android:title="@string/ringtone_title"
+        android:dialogTitle="@string/ringtone_title"
+        android:summary="@string/summary_placeholder"
+        android:ringtoneType="ringtone"
+        settings:allowDividerAbove="true"
+        android:order="-100"/>
 
     <!-- Default notification ringtone -->
     <com.android.settings.DefaultRingtonePreference
@@ -93,6 +97,7 @@
 
     <!-- Other sounds -->
     <PreferenceCategory
+          android:key="other_sounds_and_vibrations_category"
           android:title="@string/other_sound_category_preference_title"
           android:order="-50">
 
@@ -156,7 +161,7 @@
               android:targetClass="com.android.cellbroadcastreceiver.CellBroadcastSettings" />
     </com.android.settingslib.RestrictedPreference>
 
-    <com.android.settings.WorkOnlyCategory
+    <com.android.settings.widget.WorkOnlyCategory
         android:key="sound_work_settings_section"
         android:title="@string/sound_work_settings"
         android:order="100">
@@ -193,5 +198,5 @@
                     android:ringtoneType="alarm"
                     android:dependency="work_use_personal_sounds" />
 
-    </com.android.settings.WorkOnlyCategory>
+    </com.android.settings.widget.WorkOnlyCategory>
 </PreferenceScreen>
diff --git a/res/xml/special_access.xml b/res/xml/special_access.xml
index 6eaede9..6adfc93 100644
--- a/res/xml/special_access.xml
+++ b/res/xml/special_access.xml
@@ -16,13 +16,14 @@
 
 <PreferenceScreen
         xmlns:android="http://schemas.android.com/apk/res/android"
-        xmlns:settings="http://schemas.android.com/apk/res/com.android.settings"
+        xmlns:settings="http://schemas.android.com/apk/res-auto"
+        android:key="special_app_access_screen"
         android:title="@string/special_access">
 
     <Preference
         android:key="high_power_apps"
         android:title="@string/high_power_apps"
-        android:fragment="com.android.settings.applications.ManageApplications"
+        android:fragment="com.android.settings.applications.manageapplications.ManageApplications"
         settings:keywords="@string/keywords_ignore_optimizations">
         <extra
             android:name="classname"
@@ -35,14 +36,9 @@
         android:fragment="com.android.settings.DeviceAdminSettings" />
 
     <Preference
-        android:key="zen_access"
-        android:title="@string/manage_zen_access_title"
-        android:fragment="com.android.settings.notification.ZenAccessSettings" />
-
-    <Preference
         android:key="system_alert_window"
         android:title="@string/system_alert_window_settings"
-        android:fragment="com.android.settings.applications.ManageApplications"
+        android:fragment="com.android.settings.applications.manageapplications.ManageApplications"
         settings:keywords="@string/keywords_system_alert_window">
         <extra
             android:name="classname"
@@ -50,19 +46,14 @@
     </Preference>
 
     <Preference
-        android:key="enabled_vr_listeners"
-        android:title="@string/vr_listeners_title"
-        android:fragment="com.android.settings.applications.VrListenerSettings"
-        settings:keywords="@string/keywords_vr_listener">
-        <extra
-            android:name="classname"
-            android:value="com.android.settings.Settings$VrListenersSettingsActivity" />
-    </Preference>
+        android:key="zen_access"
+        android:title="@string/manage_zen_access_title"
+        android:fragment="com.android.settings.notification.ZenAccessSettings" />
 
     <Preference
         android:key="write_settings_apps"
         android:title="@string/write_settings"
-        android:fragment="com.android.settings.applications.ManageApplications"
+        android:fragment="com.android.settings.applications.manageapplications.ManageApplications"
         settings:keywords="@string/keywords_write_settings">
         <extra
             android:name="classname"
@@ -91,9 +82,19 @@
         android:fragment="com.android.settings.datausage.UnrestrictedDataAccess" />
 
     <Preference
-        android:key="usage_access"
+        android:key="manage_external_sources"
+        android:title="@string/install_other_apps"
+        android:fragment="com.android.settings.applications.manageapplications.ManageApplications"
+        settings:keywords="@string/keywords_install_other_apps">
+        <extra
+            android:name="classname"
+            android:value="com.android.settings.Settings$ManageExternalSourcesActivity" />
+    </Preference>
+
+    <Preference
+        android:key="special_app_usage_access"
         android:title="@string/usage_access"
-        android:fragment="com.android.settings.applications.ManageApplications"
+        android:fragment="com.android.settings.applications.manageapplications.ManageApplications"
         settings:keywords="@string/keywords_write_settings">
         <extra
             android:name="classname"
@@ -101,13 +102,13 @@
     </Preference>
 
     <Preference
-        android:key="manage_external_sources"
-        android:title="@string/install_other_apps"
-        android:fragment="com.android.settings.applications.ManageApplications"
-        settings:keywords="@string/keywords_install_other_apps">
+        android:key="enabled_vr_listeners"
+        android:title="@string/vr_listeners_title"
+        android:fragment="com.android.settings.applications.VrListenerSettings"
+        settings:keywords="@string/keywords_vr_listener">
         <extra
             android:name="classname"
-            android:value="com.android.settings.Settings$ManageExternalSourcesActivity" />
+            android:value="com.android.settings.Settings$VrListenersSettingsActivity" />
     </Preference>
 
 </PreferenceScreen>
diff --git a/res/xml/storage_dashboard_fragment.xml b/res/xml/storage_dashboard_fragment.xml
index 54699d3..22d3d4c 100644
--- a/res/xml/storage_dashboard_fragment.xml
+++ b/res/xml/storage_dashboard_fragment.xml
@@ -16,7 +16,8 @@
 
 <PreferenceScreen
     xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:settings="http://schemas.android.com/apk/res/com.android.settings"
+    xmlns:settings="http://schemas.android.com/apk/res-auto"
+    android:key="storage_dashboard_screen"
     android:title="@string/storage_settings"
     android:orderingFromXml="false">
     <com.android.settings.deviceinfo.storage.StorageSummaryDonutPreference
diff --git a/res/xml/swipe_to_notification_settings.xml b/res/xml/swipe_to_notification_settings.xml
index 6269bdc..5b53c10 100644
--- a/res/xml/swipe_to_notification_settings.xml
+++ b/res/xml/swipe_to_notification_settings.xml
@@ -17,7 +17,8 @@
 
 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
                   xmlns:app="http://schemas.android.com/apk/res-auto"
-                  android:title="@string/fingerprint_swipe_for_notifications_title">
+                  android:key="gesture_swipe_down_fingerprint_screen"
+                  android:title="@string/fingerprint_gesture_screen_title">
 
     <com.android.settings.widget.VideoPreference
         android:key="gesture_swipe_down_fingerprint_video"
diff --git a/res/xml/system_dashboard_fragment.xml b/res/xml/system_dashboard_fragment.xml
index a71c7585..8b9d0ca 100644
--- a/res/xml/system_dashboard_fragment.xml
+++ b/res/xml/system_dashboard_fragment.xml
@@ -16,7 +16,10 @@
 
 <PreferenceScreen
     xmlns:android="http://schemas.android.com/apk/res/android"
-    android:title="@string/header_category_system">
+    xmlns:settings="http://schemas.android.com/apk/res-auto"
+    android:key="system_dashboard_screen"
+    android:title="@string/header_category_system"
+    settings:initialExpandedChildrenCount="4">
 
     <Preference
         android:key="gesture_settings"
diff --git a/res/xml/tether_prefs.xml b/res/xml/tether_prefs.xml
index 144cb41..ce22ad7 100644
--- a/res/xml/tether_prefs.xml
+++ b/res/xml/tether_prefs.xml
@@ -14,8 +14,10 @@
      limitations under the License.
 -->
 
-<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
-                  xmlns:settings="http://schemas.android.com/apk/res-auto">
+<PreferenceScreen
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:settings="http://schemas.android.com/apk/res-auto"
+    android:title="@string/tether_settings_title_all">
 
     <com.android.settings.widget.MasterSwitchPreference
         android:key="wifi_tether"
@@ -29,16 +31,6 @@
         android:summary="@string/usb_tethering_subtext" />
 
     <SwitchPreference
-        android:key="enable_wifi_ap"
-        android:title="@string/wifi_hotspot_checkbox_text"
-        android:summary="@string/summary_two_lines_placeholder" />
-
-    <Preference
-        android:key="wifi_ap_ssid_and_security"
-        android:title="@string/wifi_tether_configure_ap_text"
-        android:persistent="false" />
-
-    <SwitchPreference
         android:key="enable_bluetooth_tethering"
         android:title="@string/bluetooth_tether_checkbox_text"
         android:summary="@string/bluetooth_tethering_subtext" />
diff --git a/res/xml/tts_engine_picker.xml b/res/xml/tts_engine_picker.xml
index d7a76d4..92bfede 100644
--- a/res/xml/tts_engine_picker.xml
+++ b/res/xml/tts_engine_picker.xml
@@ -15,7 +15,8 @@
 -->
 
 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
-        android:title="@string/tts_settings_title">
+        android:key="tts_engine_picker_screen"
+        android:title="@string/tts_engine_preference_title">
 
     <PreferenceCategory android:key="tts_engine_preference_category"/>
 
diff --git a/res/xml/tts_settings.xml b/res/xml/tts_settings.xml
index c141dad..be34b28 100644
--- a/res/xml/tts_settings.xml
+++ b/res/xml/tts_settings.xml
@@ -16,6 +16,7 @@
 
 <PreferenceScreen
     xmlns:android="http://schemas.android.com/apk/res/android"
+    android:key="tts_settings_screen"
     android:title="@string/tts_settings_title">
 
     <PreferenceCategory android:key="tts_engine_section">
@@ -51,10 +52,8 @@
             android:defaultValue="100"
             android:max="400"/>
 
-        <com.android.settings.applications.LayoutPreference
-            android:key="action_buttons"
-            android:layout="@layout/tts_action_buttons"
-            android:selectable="false"/>
+        <com.android.settings.widget.ActionButtonPreference
+            android:key="action_buttons" />
 
     </PreferenceCategory>
 </PreferenceScreen>
diff --git a/res/xml/unrestricted_data_access_settings.xml b/res/xml/unrestricted_data_access_settings.xml
new file mode 100644
index 0000000..da8ff0c
--- /dev/null
+++ b/res/xml/unrestricted_data_access_settings.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.
+  -->
+
+<PreferenceScreen
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:title="@string/unrestricted_data_saver" />
diff --git a/res/xml/upgraded_app_notification_settings.xml b/res/xml/upgraded_app_notification_settings.xml
deleted file mode 100644
index f9a3304..0000000
--- a/res/xml/upgraded_app_notification_settings.xml
+++ /dev/null
@@ -1,27 +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.
--->
-
-<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
-        xmlns:settings="http://schemas.android.com/apk/res/com.android.settings">
-
-    <!-- Show badge -->
-    <com.android.settingslib.RestrictedSwitchPreference
-        android:key="badge"
-        android:title="@string/notification_badge_title"
-        settings:useAdditionalSummary="true"
-        settings:restrictedSwitchSummary="@string/enabled_by_admin" />
-
-</PreferenceScreen>
diff --git a/res/xml/upgraded_channel_notification_settings.xml b/res/xml/upgraded_channel_notification_settings.xml
deleted file mode 100644
index ee23435..0000000
--- a/res/xml/upgraded_channel_notification_settings.xml
+++ /dev/null
@@ -1,71 +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.
--->
-
-<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
-        xmlns:settings="http://schemas.android.com/apk/res/com.android.settings" >
-
-    <!-- Importance -->
-    <Preference
-        android:key="importance"
-        android:title="@string/notification_importance_title" />
-
-    <!-- Default ringtone -->
-    <com.android.settings.notification.NotificationSoundPreference
-        android:key="ringtone"
-        android:title="@string/notification_channel_sound_title"
-        android:dialogTitle="@string/notification_channel_sound_title"
-        android:showSilent="true"
-        android:showDefault="true"
-        android:ringtoneType="notification" />
-
-    <!-- Vibration -->
-    <com.android.settingslib.RestrictedSwitchPreference
-        android:key="vibrate"
-        android:title="@string/notification_vibrate_title"
-        settings:useAdditionalSummary="true" />
-
-    <PreferenceCategory
-        android:key="advanced"
-        android:title="@string/advanced_apps">
-
-        <!-- Visibility Override -->
-        <com.android.settings.notification.RestrictedDropDownPreference
-            android:key="visibility_override"
-            android:title="@string/app_notification_visibility_override_title" />
-
-        <!-- Lights -->
-        <com.android.settingslib.RestrictedSwitchPreference
-            android:key="lights"
-            android:title="@string/notification_show_lights_title"
-            settings:useAdditionalSummary="true" />
-
-        <!-- Show badge -->
-        <com.android.settingslib.RestrictedSwitchPreference
-            android:key="badge"
-            android:title="@string/notification_channel_badge_title"
-            settings:useAdditionalSummary="true"
-            settings:restrictedSwitchSummary="@string/enabled_by_admin" />
-
-        <!-- Bypass DND -->
-        <com.android.settingslib.RestrictedSwitchPreference
-            android:key="bypass_dnd"
-            android:title="@string/app_notification_override_dnd_title"
-            android:summary="@string/app_notification_override_dnd_summary"
-            settings:useAdditionalSummary="true" />
-
-    </PreferenceCategory>
-
-</PreferenceScreen>
diff --git a/res/xml/usage_access_settings.xml b/res/xml/usage_access_settings.xml
index cd87be5..4cd4a98 100644
--- a/res/xml/usage_access_settings.xml
+++ b/res/xml/usage_access_settings.xml
@@ -15,5 +15,5 @@
 -->
 
 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
-    android:key="usage_access"
+    android:key="usage_access_screen"
     android:title="@string/usage_access_title"/>
diff --git a/res/xml/user_and_accounts_settings.xml b/res/xml/user_and_accounts_settings.xml
index a62b839..7f82f43 100644
--- a/res/xml/user_and_accounts_settings.xml
+++ b/res/xml/user_and_accounts_settings.xml
@@ -16,7 +16,8 @@
 
 <PreferenceScreen
     xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:settings="http://schemas.android.com/apk/res/com.android.settings"
+    xmlns:settings="http://schemas.android.com/apk/res-auto"
+    android:key="user_and_account_settings_screen"
     android:title="@string/account_dashboard_title"
     settings:keywords="@string/keywords_accounts">
 
@@ -46,7 +47,7 @@
         android:order="104"/>
 
     <com.android.settingslib.RestrictedSwitchPreference
-        android:key="add_users_when_locked"
+        android:key="user_settings_add_users_when_locked"
         android:title="@string/user_add_on_lockscreen_menu"
         android:singleLineTitle="false"
         android:order="105"/>
diff --git a/res/xml/user_details_settings.xml b/res/xml/user_details_settings.xml
index 44ec064..09154c4 100644
--- a/res/xml/user_details_settings.xml
+++ b/res/xml/user_details_settings.xml
@@ -15,7 +15,7 @@
 -->
 
 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
-        xmlns:settings="http://schemas.android.com/apk/res/com.android.settings">
+        xmlns:settings="http://schemas.android.com/apk/res-auto">
 
     <SwitchPreference
             android:key="enable_calling"
diff --git a/res/xml/user_settings.xml b/res/xml/user_settings.xml
index 06b73a0..cf68344 100644
--- a/res/xml/user_settings.xml
+++ b/res/xml/user_settings.xml
@@ -15,7 +15,7 @@
 -->
 
 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
-        xmlns:settings="http://schemas.android.com/apk/res/com.android.settings"
+        xmlns:settings="http://schemas.android.com/apk/res-auto"
         android:title="@string/user_settings_title">
 
     <PreferenceCategory
@@ -23,7 +23,7 @@
             android:title="@string/user_list_title">
     </PreferenceCategory>
 
-    <com.android.settings.DimmableIconPreference
+    <com.android.settingslib.RestrictedPreference
             android:key="user_add"
             android:title="@string/user_add_user_or_profile_menu"
             android:icon="@drawable/ic_menu_add" />
diff --git a/res/xml/virtual_keyboard_settings.xml b/res/xml/virtual_keyboard_settings.xml
index d5f0496..93445f4 100644
--- a/res/xml/virtual_keyboard_settings.xml
+++ b/res/xml/virtual_keyboard_settings.xml
@@ -13,7 +13,9 @@
      See the License for the specific language governing permissions and
      limitations under the License.
 -->
-<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
+<PreferenceScreen
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:key="virtual_keyboard_category"
     android:title="@string/virtual_keyboard_category">
     <!-- Enabled input method list will be populated programmatically here. -->
     <Preference
diff --git a/res/xml/vpn_app_management.xml b/res/xml/vpn_app_management.xml
index c044a58..e18a074 100644
--- a/res/xml/vpn_app_management.xml
+++ b/res/xml/vpn_app_management.xml
@@ -15,8 +15,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/vpn_title">
+        xmlns:settings="http://schemas.android.com/apk/res-auto">
 
         <Preference
                 android:key="version"
@@ -41,7 +40,7 @@
                 settings:useAdditionalSummary="true"
                 settings:restrictedSwitchSummary="@string/disabled_by_admin_summary_text" />
 
-        <com.android.settings.DimmableIconPreference
+        <com.android.settingslib.RestrictedPreference
                 android:key="forget_vpn"
                 android:title="@string/vpn_forget_long"
                 android:icon="@drawable/ic_menu_delete"
diff --git a/res/xml/vr_display_settings.xml b/res/xml/vr_display_settings.xml
new file mode 100644
index 0000000..d04435a
--- /dev/null
+++ b/res/xml/vr_display_settings.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.
+  -->
+
+<PreferenceScreen
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:title="@string/display_vr_pref_title" />
diff --git a/res/xml/vr_listeners_settings.xml b/res/xml/vr_listeners_settings.xml
new file mode 100644
index 0000000..1954596
--- /dev/null
+++ b/res/xml/vr_listeners_settings.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.
+  -->
+
+<PreferenceScreen
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:title="@string/vr_listeners_title" />
diff --git a/res/xml/webview_app_settings.xml b/res/xml/webview_app_settings.xml
new file mode 100644
index 0000000..c7a611a
--- /dev/null
+++ b/res/xml/webview_app_settings.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.
+  -->
+
+<PreferenceScreen
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:title="@string/select_webview_provider_title" />
diff --git a/res/xml/when_to_dream_settings.xml b/res/xml/when_to_dream_settings.xml
new file mode 100644
index 0000000..7b91a34
--- /dev/null
+++ b/res/xml/when_to_dream_settings.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.
+  -->
+
+<PreferenceScreen
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:title="@string/screensaver_settings_when_to_dream" />
diff --git a/res/xml/wifi_configure_settings.xml b/res/xml/wifi_configure_settings.xml
index 1747b63..e58d319 100644
--- a/res/xml/wifi_configure_settings.xml
+++ b/res/xml/wifi_configure_settings.xml
@@ -16,7 +16,8 @@
 
 <PreferenceScreen
         xmlns:android="http://schemas.android.com/apk/res/android"
-        xmlns:settings="http://schemas.android.com/apk/res/com.android.settings"
+        xmlns:settings="http://schemas.android.com/apk/res-auto"
+        android:key="wifi_configure_settings_screen"
         android:title="@string/wifi_configure_settings_preference_title">
 
     <SwitchPreference
diff --git a/res/xml/wifi_display_settings.xml b/res/xml/wifi_display_settings.xml
index 81fb701..7ad214e 100644
--- a/res/xml/wifi_display_settings.xml
+++ b/res/xml/wifi_display_settings.xml
@@ -14,7 +14,9 @@
      limitations under the License.
 -->
 
-<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
-    android:title="@string/wifi_saved_access_points_titlebar">
+<PreferenceScreen
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:key="wifi_display_settings_screen"
+    android:title="@string/wifi_display_settings_title">
 
 </PreferenceScreen>
diff --git a/res/xml/wifi_network_details_fragment.xml b/res/xml/wifi_network_details_fragment.xml
index 443cb88..5407947 100644
--- a/res/xml/wifi_network_details_fragment.xml
+++ b/res/xml/wifi_network_details_fragment.xml
@@ -22,15 +22,14 @@
         android:selectable="false"
         android:order="-10000"/>
 
+    <!-- Buttons -->
+    <com.android.settings.widget.ActionButtonPreference
+        android:key="buttons"
+        android:selectable="false" />
+
     <!-- General Details Category -->
     <PreferenceCategory
             android:key="general_details_category" >
-        <!-- Buttons -->
-        <com.android.settings.applications.LayoutPreference
-            android:key="buttons"
-            android:layout="@layout/wifi_network_details_two_buttons_panel"
-            android:selectable="false" />
-
         <com.android.settings.wifi.WifiDetailPreference
                 android:key="signal_strength"
                 android:title="@string/wifi_signal"
@@ -88,5 +87,4 @@
                 android:key="ipv6_addresses"
                 android:selectable="false"/>
     </PreferenceCategory>
-
 </PreferenceScreen>
diff --git a/res/xml/wifi_p2p_settings.xml b/res/xml/wifi_p2p_settings.xml
index 0bdc1cf..405d081 100644
--- a/res/xml/wifi_p2p_settings.xml
+++ b/res/xml/wifi_p2p_settings.xml
@@ -14,7 +14,9 @@
      limitations under the License.
 -->
 
-<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
+<PreferenceScreen
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:title="@string/wifi_p2p_settings_title">
     <Preference
         android:key="p2p_this_device"
         android:selectable="false" />
diff --git a/res/xml/wifi_settings.xml b/res/xml/wifi_settings.xml
index a33f77b..e391bcd 100644
--- a/res/xml/wifi_settings.xml
+++ b/res/xml/wifi_settings.xml
@@ -16,7 +16,7 @@
 
 <PreferenceScreen
         xmlns:android="http://schemas.android.com/apk/res/android"
-        xmlns:settings="http://schemas.android.com/apk/res/com.android.settings"
+        xmlns:settings="http://schemas.android.com/apk/res-auto"
         android:title="@string/wifi_settings"
         settings:keywords="@string/keywords_wifi">
 
diff --git a/res/xml/wifi_tether_settings.xml b/res/xml/wifi_tether_settings.xml
index feed268..d6b8a25 100644
--- a/res/xml/wifi_tether_settings.xml
+++ b/res/xml/wifi_tether_settings.xml
@@ -15,7 +15,9 @@
   limitations under the License.
   -->
 
-<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
+<PreferenceScreen
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:title="@string/wifi_hotspot_checkbox_text">
 
     <com.android.settings.widget.ValidatedEditTextPreference
         android:key="wifi_tether_network_name"
diff --git a/res/xml/zen_access_settings.xml b/res/xml/zen_access_settings.xml
new file mode 100644
index 0000000..35cfdb8
--- /dev/null
+++ b/res/xml/zen_access_settings.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.
+  -->
+
+<PreferenceScreen
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:title="@string/manage_zen_access_title" />
diff --git a/res/xml/zen_mode_automation_settings.xml b/res/xml/zen_mode_automation_settings.xml
new file mode 100644
index 0000000..99826ea
--- /dev/null
+++ b/res/xml/zen_mode_automation_settings.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+     Copyright (C) 2017 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
+                  android:key="zen_mode_automation_settings_page"
+                  android:title="@string/zen_mode_automation_settings_page_title" >
+
+
+    <PreferenceCategory
+        android:key="zen_mode_automatic_rules">
+        <!-- Rules added at runtime -->
+    </PreferenceCategory>
+
+    <Preference
+        android:key="zen_mode_add_automatic_rule"
+        android:icon="@drawable/ic_menu_add"
+        android:title="@string/zen_mode_add_rule"/>
+
+</PreferenceScreen>
diff --git a/res/xml/zen_mode_behavior_settings.xml b/res/xml/zen_mode_behavior_settings.xml
new file mode 100644
index 0000000..2536828
--- /dev/null
+++ b/res/xml/zen_mode_behavior_settings.xml
@@ -0,0 +1,81 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+     Copyright (C) 2017 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<PreferenceScreen
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:settings="http://schemas.android.com/apk/res-auto"
+    android:key="zen_mode_behavior_settings_page"
+    android:title="@string/zen_mode_behavior_settings_title"
+    settings:initialExpandedChildrenCount="7">
+
+   <PreferenceCategory
+       android:title="@string/zen_mode_behavior_allow_title"
+       android:key="zen_mode_behavior_allow_preferences">
+
+       <!-- Alarms -->
+       <SwitchPreference
+           android:key="zen_mode_alarms"
+           android:title="@string/zen_mode_alarms"/>
+
+       <!-- Media -->
+       <SwitchPreference
+           android:key="zen_mode_media"
+           android:title="@string/zen_mode_media_system_other"/>
+
+       <!-- Reminders -->
+       <SwitchPreference
+           android:key="zen_mode_reminders"
+           android:title="@string/zen_mode_reminders"/>
+
+       <!-- Events -->
+       <SwitchPreference
+           android:key="zen_mode_events"
+           android:title="@string/zen_mode_events"/>
+
+       <Preference
+           android:key="zen_mode_messages"
+           android:title="@string/zen_mode_messages"
+           android:fragment="com.android.settings.notification.ZenModeMessagesSettings" />
+
+       <!-- Calls -->
+       <Preference
+           android:key="zen_mode_calls"
+           android:title="@string/zen_mode_calls"
+           android:fragment="com.android.settings.notification.ZenModeCallsSettings" />
+
+       <!-- Repeat callers -->
+       <SwitchPreference
+           android:key="zen_mode_repeat_callers"
+           android:title="@string/zen_mode_repeat_callers"/>
+
+   </PreferenceCategory>
+
+    <PreferenceCategory
+        android:title="@string/zen_mode_visual_signals_settings_subtitle"
+        android:key="zen_mode_visual_signals_preferences">
+
+        <SwitchPreference android:key="zen_mode_screen_on"
+                          android:title="@string/zen_mode_screen_on"
+                          android:summary="@string/zen_mode_screen_on_summary" />
+
+        <SwitchPreference android:key="zen_mode_screen_off"
+                          android:title="@string/zen_mode_screen_off"
+                          android:summary="@string/zen_mode_screen_off_summary" />
+
+    </PreferenceCategory>
+
+</PreferenceScreen>
diff --git a/res/xml/zen_mode_calls_settings.xml b/res/xml/zen_mode_calls_settings.xml
new file mode 100644
index 0000000..aa84216
--- /dev/null
+++ b/res/xml/zen_mode_calls_settings.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.
+  -->
+
+<PreferenceScreen
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:key="zen_mode_calls_settings"
+    android:title="@string/zen_mode_calls" />
diff --git a/res/xml/zen_mode_messages_settings.xml b/res/xml/zen_mode_messages_settings.xml
new file mode 100644
index 0000000..4b4a1e2
--- /dev/null
+++ b/res/xml/zen_mode_messages_settings.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.
+  -->
+
+<PreferenceScreen
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:key="zen_mode_messages_settings"
+    android:title="@string/zen_mode_messages" />
diff --git a/res/xml/zen_mode_priority_settings.xml b/res/xml/zen_mode_priority_settings.xml
deleted file mode 100644
index e4f8f5e..0000000
--- a/res/xml/zen_mode_priority_settings.xml
+++ /dev/null
@@ -1,57 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-     Copyright (C) 2015 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
-    android:key="zen_mode_priority_settings"
-    android:title="@string/zen_mode_priority_settings_title" >
-
-    <!-- Reminders -->
-    <SwitchPreference
-        android:key="reminders"
-        android:title="@string/zen_mode_reminders"/>
-
-    <!-- Events -->
-    <SwitchPreference
-        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"
-        android:title="@string/zen_mode_messages"
-        android:summary="%s" />
-
-    <!-- Calls -->
-    <DropDownPreference
-        android:key="calls"
-        android:title="@string/zen_mode_calls"
-        android:summary="%s" />
-
-    <!-- Repeat callers -->
-    <SwitchPreference
-        android:key="repeat_callers"
-        android:title="@string/zen_mode_repeat_callers"/>
-
-</PreferenceScreen>
diff --git a/res/xml/zen_mode_settings.xml b/res/xml/zen_mode_settings.xml
index 5fc72aa..dbd1d42 100644
--- a/res/xml/zen_mode_settings.xml
+++ b/res/xml/zen_mode_settings.xml
@@ -17,22 +17,28 @@
 
 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
     android:key="zen_mode_settings"
-    android:title="@string/zen_mode_settings_title" >
+    android:title="@string/zen_mode_settings_title">
 
-    <!-- Priority only allows -->
+    <!-- Priority behavior settings -->
     <Preference
-            android:key="priority_settings"
-            android:title="@string/zen_mode_priority_settings_title"
-            android:fragment="com.android.settings.notification.ZenModePrioritySettings" />
-
-    <!-- Visual interruptions -->
-    <Preference
-            android:key="visual_interruptions_settings"
-            android:title="@string/zen_mode_visual_interruptions_settings_title"
-            android:fragment="com.android.settings.notification.ZenModeVisualInterruptionSettings" />
+            android:key="zen_mode_behavior_settings"
+            android:title="@string/zen_mode_behavior_settings_title"
+            android:fragment="com.android.settings.notification.ZenModeBehaviorSettings" />
 
     <!-- Automatic rules -->
+    <Preference
+        android:key="zen_mode_automation_settings"
+        android:title="@string/zen_mode_automation_settings_title"
+        android:fragment="com.android.settings.notification.ZenModeAutomationSettings" />
+
+    <!-- Turn on DND button -->
+    <!-- Layout preference doesn't obey allowDividerAbove, so put it in a PreferenceCategory -->
     <PreferenceCategory
-        android:key="automatic_rules"
-        android:title="@string/zen_mode_automation_settings_title" />
+        android:key="zen_mode_settings_button_category">
+        <com.android.settings.applications.LayoutPreference
+            android:key="zen_mode_settings_button_container"
+            android:selectable="false"
+            android:layout="@layout/zen_mode_settings_button" />
+    </PreferenceCategory>
+
 </PreferenceScreen>
diff --git a/res/xml/zen_mode_visual_interruptions_settings.xml b/res/xml/zen_mode_visual_interruptions_settings.xml
deleted file mode 100644
index 64c79ec..0000000
--- a/res/xml/zen_mode_visual_interruptions_settings.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2015 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
-                  xmlns:settings="http://schemas.android.com/apk/res/com.android.settings"
-                  android:title="@string/zen_mode_visual_interruptions_settings_title"
-                  android:key="zen_mode_visual_interruptions_screen">
-
-    <SwitchPreference android:key="screenOn"
-                      android:title="@string/zen_mode_screen_on"
-                      android:summary="@string/zen_mode_screen_on_summary" />
-
-    <SwitchPreference android:key="screenOff"
-                      android:title="@string/zen_mode_screen_off"
-                      android:summary="@string/zen_mode_screen_off_summary" />
-
-
-
-</PreferenceScreen>
diff --git a/src/com/android/settings/AppProgressPreference.java b/src/com/android/settings/AppProgressPreference.java
deleted file mode 100644
index 1329878..0000000
--- a/src/com/android/settings/AppProgressPreference.java
+++ /dev/null
@@ -1,45 +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.content.Context;
-import android.support.v7.preference.PreferenceViewHolder;
-import android.util.AttributeSet;
-import android.widget.ProgressBar;
-
-public class AppProgressPreference extends TintablePreference {
-
-    private int mProgress;
-
-    public AppProgressPreference(Context context, AttributeSet attrs) {
-        super(context, attrs);
-        setLayoutResource(R.layout.preference_app);
-        setWidgetLayoutResource(R.layout.widget_progress_bar);
-    }
-
-    public void setProgress(int amount) {
-        mProgress = amount;
-        notifyChanged();
-    }
-
-    @Override
-    public void onBindViewHolder(PreferenceViewHolder view) {
-        super.onBindViewHolder(view);
-
-        final ProgressBar progress = (ProgressBar) view.findViewById(android.R.id.progress);
-        progress.setProgress(mProgress);
-    }
-}
diff --git a/src/com/android/settings/ApplicationSettings.java b/src/com/android/settings/ApplicationSettings.java
deleted file mode 100644
index f005124..0000000
--- a/src/com/android/settings/ApplicationSettings.java
+++ /dev/null
@@ -1,143 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF 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.content.Intent;
-import android.os.Bundle;
-import android.provider.Settings;
-import android.support.v7.preference.CheckBoxPreference;
-import android.support.v7.preference.ListPreference;
-import android.support.v7.preference.Preference;
-import android.support.v7.preference.Preference.OnPreferenceChangeListener;
-
-import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
-
-public class ApplicationSettings extends SettingsPreferenceFragment {
-
-    private static final String KEY_TOGGLE_ADVANCED_SETTINGS = "toggle_advanced_settings";
-    private static final String KEY_APP_INSTALL_LOCATION = "app_install_location";
-
-    // App installation location. Default is ask the user.
-    private static final int APP_INSTALL_AUTO = 0;
-    private static final int APP_INSTALL_DEVICE = 1;
-    private static final int APP_INSTALL_SDCARD = 2;
-
-    private static final String APP_INSTALL_DEVICE_ID = "device";
-    private static final String APP_INSTALL_SDCARD_ID = "sdcard";
-    private static final String APP_INSTALL_AUTO_ID = "auto";
-    
-    private CheckBoxPreference mToggleAdvancedSettings;
-    private ListPreference mInstallLocation;
-
-    @Override
-    public int getMetricsCategory() {
-        return MetricsEvent.APPLICATION;
-    }
-
-    @Override
-    public void onCreate(Bundle icicle) {
-        super.onCreate(icicle);
-
-        addPreferencesFromResource(R.xml.application_settings);
-
-        mToggleAdvancedSettings = (CheckBoxPreference)findPreference(
-                KEY_TOGGLE_ADVANCED_SETTINGS);
-        mToggleAdvancedSettings.setChecked(isAdvancedSettingsEnabled());
-        getPreferenceScreen().removePreference(mToggleAdvancedSettings);
-
-        // not ready for prime time yet
-        if (false) {
-            getPreferenceScreen().removePreference(mInstallLocation);
-        }
-
-        mInstallLocation = (ListPreference) findPreference(KEY_APP_INSTALL_LOCATION);
-        // Is app default install location set?
-        boolean userSetInstLocation = (Settings.Global.getInt(getContentResolver(),
-                Settings.Global.SET_INSTALL_LOCATION, 0) != 0);
-        if (!userSetInstLocation) {
-            getPreferenceScreen().removePreference(mInstallLocation);
-        } else {
-            mInstallLocation.setValue(getAppInstallLocation());
-            mInstallLocation.setOnPreferenceChangeListener(new OnPreferenceChangeListener() {
-                public boolean onPreferenceChange(Preference preference, Object newValue) {
-                    String value = (String) newValue;
-                    handleUpdateAppInstallLocation(value);
-                    return false;
-                }
-            });
-        }
-    }
-
-    protected void handleUpdateAppInstallLocation(final String value) {
-        if(APP_INSTALL_DEVICE_ID.equals(value)) {
-            Settings.Global.putInt(getContentResolver(),
-                    Settings.Global.DEFAULT_INSTALL_LOCATION, APP_INSTALL_DEVICE);
-        } else if (APP_INSTALL_SDCARD_ID.equals(value)) {
-            Settings.Global.putInt(getContentResolver(),
-                    Settings.Global.DEFAULT_INSTALL_LOCATION, APP_INSTALL_SDCARD);
-        } else if (APP_INSTALL_AUTO_ID.equals(value)) {
-            Settings.Global.putInt(getContentResolver(),
-                    Settings.Global.DEFAULT_INSTALL_LOCATION, APP_INSTALL_AUTO);
-        } else {
-            // Should not happen, default to prompt...
-            Settings.Global.putInt(getContentResolver(),
-                    Settings.Global.DEFAULT_INSTALL_LOCATION, APP_INSTALL_AUTO);
-        }
-        mInstallLocation.setValue(value);
-    }
-
-    @Override
-    public boolean onPreferenceTreeClick(Preference preference) {
-        if (preference == mToggleAdvancedSettings) {
-            boolean value = mToggleAdvancedSettings.isChecked();
-            setAdvancedSettingsEnabled(value);
-        }
-
-        return super.onPreferenceTreeClick(preference);
-    }
-
-    private boolean isAdvancedSettingsEnabled() {
-        return Settings.System.getInt(getContentResolver(),
-                                      Settings.System.ADVANCED_SETTINGS,
-                                      Settings.System.ADVANCED_SETTINGS_DEFAULT) > 0;
-    }
-
-    private void setAdvancedSettingsEnabled(boolean enabled) {
-        int value = enabled ? 1 : 0;
-        // Change the system setting
-        Settings.Secure.putInt(getContentResolver(), Settings.System.ADVANCED_SETTINGS, value);
-        // TODO: the settings thing should broadcast this for thread safety purposes.
-        Intent intent = new Intent(Intent.ACTION_ADVANCED_SETTINGS_CHANGED);
-        intent.putExtra("state", value);
-        getActivity().sendBroadcast(intent);
-    }
-
-    private String getAppInstallLocation() {
-        int selectedLocation = Settings.Global.getInt(getContentResolver(),
-                Settings.Global.DEFAULT_INSTALL_LOCATION, APP_INSTALL_AUTO);
-        if (selectedLocation == APP_INSTALL_DEVICE) {
-            return APP_INSTALL_DEVICE_ID;
-        } else if (selectedLocation == APP_INSTALL_SDCARD) {
-            return APP_INSTALL_SDCARD_ID;
-        } else  if (selectedLocation == APP_INSTALL_AUTO) {
-            return APP_INSTALL_AUTO_ID;
-        } else {
-            // Default value, should not happen.
-            return APP_INSTALL_AUTO_ID;
-        }
-    }
-}
diff --git a/src/com/android/settings/CredentialStorage.java b/src/com/android/settings/CredentialStorage.java
index e5d40b7..ffbd2ce 100644
--- a/src/com/android/settings/CredentialStorage.java
+++ b/src/com/android/settings/CredentialStorage.java
@@ -275,6 +275,16 @@
                 Log.e(TAG, "Failed to install " + key + " as uid " + uid);
                 return;
             }
+            // The key was prepended USER_PRIVATE_KEY by the CredentialHelper. However,
+            // KeyChain internally uses the raw alias name and only prepends USER_PRIVATE_KEY
+            // to the key name when interfacing with KeyStore.
+            // This is generally a symptom of CredentialStorage and CredentialHelper relying
+            // on internal implementation details of KeyChain and imitating its functionality
+            // rather than delegating to KeyChain for the certificate installation.
+            if (uid == Process.SYSTEM_UID || uid == KeyStore.UID_SELF) {
+                new MarkKeyAsUserSelectable(
+                        key.replaceFirst("^" + Credentials.USER_PRIVATE_KEY, "")).execute();
+            }
         }
 
         int flags = KeyStore.FLAG_NONE;
@@ -391,6 +401,33 @@
     }
 
     /**
+     * Background task to mark a given key alias as user-selectable, so that
+     * it can be selected by users from the Certificate Selection prompt.
+     */
+    private class MarkKeyAsUserSelectable extends AsyncTask<Void, Void, Boolean> {
+        final String mAlias;
+
+        public MarkKeyAsUserSelectable(String alias) {
+            mAlias = alias;
+        }
+
+        @Override
+        protected Boolean doInBackground(Void... unused) {
+            try (KeyChainConnection keyChainConnection = KeyChain.bind(CredentialStorage.this)) {
+                keyChainConnection.getService().setUserSelectable(mAlias, true);
+                return true;
+            } catch (RemoteException e) {
+                Log.w(TAG, "Failed to mark key " + mAlias + " as user-selectable.");
+                return false;
+            } catch (InterruptedException e) {
+                Log.w(TAG, "Failed to mark key " + mAlias + " as user-selectable.");
+                Thread.currentThread().interrupt();
+                return false;
+            }
+        }
+    }
+
+    /**
      * Check that the caller is either certinstaller or Settings running in a profile of this user.
      */
     private boolean checkCallerIsCertInstallerOrSelfInProfile() {
diff --git a/src/com/android/settings/CryptKeeperSettings.java b/src/com/android/settings/CryptKeeperSettings.java
deleted file mode 100644
index e11bccd..0000000
--- a/src/com/android/settings/CryptKeeperSettings.java
+++ /dev/null
@@ -1,218 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF 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.admin.DevicePolicyManager;
-import android.content.BroadcastReceiver;
-import android.content.Context;
-import android.content.Intent;
-import android.content.IntentFilter;
-import android.content.res.Resources;
-import android.os.BatteryManager;
-import android.os.Bundle;
-import android.os.UserHandle;
-import android.os.storage.StorageManager;
-import android.support.v7.preference.Preference;
-import android.text.TextUtils;
-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.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";
-    private static final String TYPE = "type";
-    private static final String PASSWORD = "password";
-
-    private static final int KEYGUARD_REQUEST = 55;
-
-    // Minimum battery charge level (in percent) to launch encryption.  If the battery charge is
-    // lower than this, encryption should not be activated.
-    private static final int MIN_BATTERY_LEVEL = 80;
-
-    private View mContentView;
-    private Button mInitiateButton;
-    private View mPowerWarning;
-    private View mBatteryWarning;
-    private IntentFilter mIntentFilter;
-
-    private BroadcastReceiver mIntentReceiver = new BroadcastReceiver() {
-        @Override
-        public void onReceive(Context context, Intent intent) {
-            String action = intent.getAction();
-            if (action.equals(Intent.ACTION_BATTERY_CHANGED)) {
-                final int level = intent.getIntExtra(BatteryManager.EXTRA_LEVEL, 0);
-                final int plugged = intent.getIntExtra(BatteryManager.EXTRA_PLUGGED, 0);
-                final int invalidCharger = intent.getIntExtra(
-                    BatteryManager.EXTRA_INVALID_CHARGER, 0);
-
-                final boolean levelOk = level >= MIN_BATTERY_LEVEL;
-                final boolean pluggedOk =
-                    ((plugged & BatteryManager.BATTERY_PLUGGED_ANY) != 0) &&
-                     invalidCharger == 0;
-
-                // Update UI elements based on power/battery status
-                mInitiateButton.setEnabled(levelOk && pluggedOk);
-                mPowerWarning.setVisibility(pluggedOk ? View.GONE : View.VISIBLE );
-                mBatteryWarning.setVisibility(levelOk ? View.GONE : View.VISIBLE);
-            }
-        }
-    };
-
-    /**
-     * 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 prompt the user to set a password.
-     */
-    private Button.OnClickListener mInitiateListener = new Button.OnClickListener() {
-        @Override
-        public void onClick(View v) {
-            if (!runKeyguardConfirmation(KEYGUARD_REQUEST)) {
-                // TODO replace (or follow) this dialog with an explicit launch into password UI
-                new AlertDialog.Builder(getActivity())
-                    .setTitle(R.string.crypt_keeper_dialog_need_password_title)
-                    .setMessage(R.string.crypt_keeper_dialog_need_password_message)
-                    .setPositiveButton(android.R.string.ok, null)
-                    .create()
-                    .show();
-            }
-        }
-    };
-
-    @Override
-    public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedState) {
-        mContentView = inflater.inflate(R.layout.crypt_keeper_settings, null);
-
-        mIntentFilter = new IntentFilter();
-        mIntentFilter.addAction(Intent.ACTION_BATTERY_CHANGED);
-
-        mInitiateButton = (Button) mContentView.findViewById(R.id.initiate_encrypt);
-        mInitiateButton.setOnClickListener(mInitiateListener);
-        mInitiateButton.setEnabled(false);
-
-        mPowerWarning = mContentView.findViewById(R.id.warning_unplugged);
-        mBatteryWarning = mContentView.findViewById(R.id.warning_low_charge);
-
-        return mContentView;
-    }
-
-    @Override
-    public int getMetricsCategory() {
-        return MetricsEvent.CRYPT_KEEPER;
-    }
-
-    @Override
-    public void onResume() {
-        super.onResume();
-        getActivity().registerReceiver(mIntentReceiver, mIntentFilter);
-    }
-
-    @Override
-    public void onPause() {
-        super.onPause();
-        getActivity().unregisterReceiver(mIntentReceiver);
-    }
-
-    /**
-     * If encryption is already started, and this launched via a "start encryption" intent,
-     * then exit immediately - it's already up and running, so there's no point in "starting" it.
-     */
-    @Override
-    public void onActivityCreated(Bundle savedInstanceState) {
-        super.onActivityCreated(savedInstanceState);
-        Activity activity = getActivity();
-        Intent intent = activity.getIntent();
-        if (DevicePolicyManager.ACTION_START_ENCRYPTION.equals(intent.getAction())) {
-            DevicePolicyManager dpm = (DevicePolicyManager)
-                    activity.getSystemService(Context.DEVICE_POLICY_SERVICE);
-            if (dpm != null) {
-                int status = dpm.getStorageEncryptionStatus();
-                if (status != DevicePolicyManager.ENCRYPTION_STATUS_INACTIVE) {
-                    // There is nothing to do here, so simply finish() (which returns to caller)
-                    activity.finish();
-                }
-            }
-        }
-    }
-
-    /**
-     * Keyguard validation is run using the standard {@link ConfirmLockPattern}
-     * component as a subactivity
-     * @param request the request code to be returned once confirmation finishes
-     * @return true if confirmation launched
-     */
-    private boolean runKeyguardConfirmation(int request) {
-        Resources res = getActivity().getResources();
-        ChooseLockSettingsHelper helper = new ChooseLockSettingsHelper(getActivity(), this);
-
-        if (helper.utils().getKeyguardStoredPasswordQuality(UserHandle.myUserId())
-                == DevicePolicyManager.PASSWORD_QUALITY_UNSPECIFIED) {
-            showFinalConfirmation(StorageManager.CRYPT_TYPE_DEFAULT, "");
-            return true;
-        }
-
-        return helper.launchConfirmationActivity(request,
-                res.getText(R.string.crypt_keeper_encrypt_title), true);
-    }
-
-    @Override
-    public void onActivityResult(int requestCode, int resultCode, Intent data) {
-        super.onActivityResult(requestCode, resultCode, data);
-
-        if (requestCode != KEYGUARD_REQUEST) {
-            return;
-        }
-
-        // If the user entered a valid keyguard trace, present the final
-        // confirmation prompt; otherwise, go back to the initial state.
-        if (resultCode == Activity.RESULT_OK && data != null) {
-            int type = data.getIntExtra(ChooseLockSettingsHelper.EXTRA_KEY_TYPE, -1);
-            String password = data.getStringExtra(ChooseLockSettingsHelper.EXTRA_KEY_PASSWORD);
-            if (!TextUtils.isEmpty(password)) {
-                showFinalConfirmation(type, password);
-            }
-        }
-    }
-
-    private void showFinalConfirmation(int type, String password) {
-        Preference preference = new Preference(getPreferenceManager().getContext());
-        preference.setFragment(CryptKeeperConfirm.class.getName());
-        preference.setTitle(R.string.crypt_keeper_confirm_title);
-        addEncryptionInfoToPreference(preference, type, password);
-        ((SettingsActivity) getActivity()).onPreferenceStartFragment(null, preference);
-    }
-
-    private void addEncryptionInfoToPreference(Preference preference, int type, String password) {
-        Activity activity = getActivity();
-        DevicePolicyManager dpm = (DevicePolicyManager)
-                activity.getSystemService(Context.DEVICE_POLICY_SERVICE);
-        if (dpm.getDoNotAskCredentialsOnBoot()) {
-            preference.getExtras().putInt(TYPE, StorageManager.CRYPT_TYPE_DEFAULT);
-            preference.getExtras().putString(PASSWORD, "");
-        } else {
-            preference.getExtras().putInt(TYPE, type);
-            preference.getExtras().putString(PASSWORD, password);
-        }
-    }
-}
diff --git a/src/com/android/settings/DateTimeSettings.java b/src/com/android/settings/DateTimeSettings.java
index 2afbdb2..18a7ee1 100644
--- a/src/com/android/settings/DateTimeSettings.java
+++ b/src/com/android/settings/DateTimeSettings.java
@@ -26,6 +26,7 @@
 import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
 import com.android.settings.dashboard.DashboardFragment;
 import com.android.settings.dashboard.SummaryLoader;
+import com.android.settings.datetime.AutoTimeFormatPreferenceController;
 import com.android.settings.datetime.AutoTimePreferenceController;
 import com.android.settings.datetime.AutoTimeZonePreferenceController;
 import com.android.settings.datetime.DatePreferenceController;
@@ -84,8 +85,12 @@
         final AutoTimePreferenceController autoTimePreferenceController =
                 new AutoTimePreferenceController(
                         activity, this /* UpdateTimeAndDateCallback */);
+        final AutoTimeFormatPreferenceController autoTimeFormatPreferenceController =
+                new AutoTimeFormatPreferenceController(
+                        activity, this /* UpdateTimeAndDateCallback */);
         controllers.add(autoTimeZonePreferenceController);
         controllers.add(autoTimePreferenceController);
+        controllers.add(autoTimeFormatPreferenceController);
 
         controllers.add(new TimeFormatPreferenceController(
                 activity, this /* UpdateTimeAndDateCallback */, isFromSUW));
diff --git a/src/com/android/settings/DeviceAdminSettings.java b/src/com/android/settings/DeviceAdminSettings.java
index 4ae900a..9391439 100644
--- a/src/com/android/settings/DeviceAdminSettings.java
+++ b/src/com/android/settings/DeviceAdminSettings.java
@@ -43,9 +43,9 @@
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.BaseAdapter;
-import android.widget.CheckBox;
 import android.widget.ImageView;
 import android.widget.ListView;
+import android.widget.Switch;
 import android.widget.TextView;
 
 import com.android.internal.logging.nano.MetricsProto;
@@ -136,6 +136,7 @@
         super.onActivityCreated(savedInstanceState);
         setHasOptionsMenu(true);
         Utils.forceCustomPadding(getListView(), true /* additive padding */);
+        getActivity().setTitle(R.string.manage_device_admin);
     }
 
     @Override
@@ -201,7 +202,7 @@
     static class ViewHolder {
         ImageView icon;
         TextView name;
-        CheckBox checkbox;
+        Switch checkbox;
         TextView description;
     }
 
@@ -287,10 +288,10 @@
         private View newDeviceAdminView(ViewGroup parent) {
             View v = mInflater.inflate(R.layout.device_admin_item, parent, false);
             ViewHolder h = new ViewHolder();
-            h.icon = (ImageView) v.findViewById(R.id.icon);
-            h.name = (TextView) v.findViewById(R.id.name);
-            h.checkbox = (CheckBox) v.findViewById(R.id.checkbox);
-            h.description = (TextView) v.findViewById(R.id.description);
+            h.icon = v.findViewById(R.id.icon);
+            h.name = v.findViewById(R.id.name);
+            h.checkbox =  v.findViewById(R.id.checkbox);
+            h.description = v.findViewById(R.id.description);
             v.setTag(h);
             return v;
         }
diff --git a/src/com/android/settings/DeviceInfoSettings.java b/src/com/android/settings/DeviceInfoSettings.java
index 7ca52e2..a5f7c45 100644
--- a/src/com/android/settings/DeviceInfoSettings.java
+++ b/src/com/android/settings/DeviceInfoSettings.java
@@ -16,28 +16,40 @@
 
 package com.android.settings;
 
+import static com.android.settings.core.FeatureFlags.DEVICE_INFO_V2;
+
 import android.app.Activity;
 import android.app.Fragment;
 import android.content.Context;
 import android.content.Intent;
+import android.os.Bundle;
 import android.provider.SearchIndexableResource;
+import android.telephony.TelephonyManager;
+import android.util.FeatureFlagUtils;
+import android.support.annotation.VisibleForTesting;
 
 import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
 import com.android.settings.dashboard.DashboardFragment;
 import com.android.settings.dashboard.SummaryLoader;
-import com.android.settings.deviceinfo.AdditionalSystemUpdatePreferenceController;
 import com.android.settings.deviceinfo.BasebandVersionPreferenceController;
+import com.android.settings.deviceinfo.BluetoothAddressPreferenceController;
 import com.android.settings.deviceinfo.BuildNumberPreferenceController;
 import com.android.settings.deviceinfo.DeviceModelPreferenceController;
 import com.android.settings.deviceinfo.FccEquipmentIdPreferenceController;
 import com.android.settings.deviceinfo.FeedbackPreferenceController;
 import com.android.settings.deviceinfo.FirmwareVersionPreferenceController;
+import com.android.settings.deviceinfo.ImsStatusPreferenceController;
+import com.android.settings.deviceinfo.IpAddressPreferenceController;
 import com.android.settings.deviceinfo.KernelVersionPreferenceController;
 import com.android.settings.deviceinfo.ManualPreferenceController;
+import com.android.settings.deviceinfo.PhoneNumberPreferenceController;
 import com.android.settings.deviceinfo.RegulatoryInfoPreferenceController;
-import com.android.settings.deviceinfo.SELinuxStatusPreferenceController;
 import com.android.settings.deviceinfo.SafetyInfoPreferenceController;
 import com.android.settings.deviceinfo.SecurityPatchPreferenceController;
+import com.android.settings.deviceinfo.WifiMacAddressPreferenceController;
+import com.android.settings.deviceinfo.firmwareversion.FirmwareVersionPreferenceControllerV2;
+import com.android.settings.deviceinfo.imei.ImeiInfoPreferenceControllerV2;
+import com.android.settings.deviceinfo.simstatus.SimStatusPreferenceControllerV2;
 import com.android.settings.search.BaseSearchIndexProvider;
 import com.android.settings.search.Indexable;
 import com.android.settingslib.core.AbstractPreferenceController;
@@ -53,17 +65,37 @@
 
     private static final String KEY_LEGAL_CONTAINER = "legal_container";
 
+    @VisibleForTesting
+    static final int SIM_PREFERENCES_COUNT = 3;
+    @VisibleForTesting
+    static final int NON_SIM_PREFERENCES_COUNT = 2;
+
     @Override
     public int getMetricsCategory() {
         return MetricsEvent.DEVICEINFO;
     }
 
     @Override
-    protected int getHelpResource() {
+    public int getHelpResource() {
         return R.string.help_uri_about;
     }
 
     @Override
+    public void onCreate(Bundle icicle) {
+        super.onCreate(icicle);
+
+        if (FeatureFlagUtils.isEnabled(getContext(), DEVICE_INFO_V2) || true) {
+            // Increase the number of children when the device contains more than 1 sim.
+            final TelephonyManager telephonyManager = (TelephonyManager) getSystemService(
+                    Context.TELEPHONY_SERVICE);
+            final int numberOfChildren = Math.max(SIM_PREFERENCES_COUNT,
+                    SIM_PREFERENCES_COUNT * telephonyManager.getPhoneCount())
+                    + NON_SIM_PREFERENCES_COUNT;
+            getPreferenceScreen().setInitialExpandedChildrenCount(numberOfChildren);
+        }
+    }
+
+    @Override
     public void onActivityResult(int requestCode, int resultCode, Intent data) {
         final BuildNumberPreferenceController buildNumberPreferenceController =
                 getPreferenceController(BuildNumberPreferenceController.class);
@@ -80,7 +112,8 @@
 
     @Override
     protected int getPreferenceScreenResId() {
-        return R.xml.device_info_settings;
+        return FeatureFlagUtils.isEnabled(getContext(), DEVICE_INFO_V2) || true
+                ? R.xml.device_info_settings_v2 : R.xml.device_info_settings;
     }
 
     @Override
@@ -116,10 +149,47 @@
 
     private static List<AbstractPreferenceController> buildPreferenceControllers(Context context,
             Activity activity, Fragment fragment, Lifecycle lifecycle) {
+        if (FeatureFlagUtils.isEnabled(context, DEVICE_INFO_V2) || true) {
+            final List<AbstractPreferenceController> controllers = new ArrayList<>();
+            // Device name
+
+            controllers.add(new PhoneNumberPreferenceController(context));
+
+            controllers.add(new SimStatusPreferenceControllerV2(context, fragment));
+
+            controllers.add(new DeviceModelPreferenceController(context, fragment));
+
+            controllers.add(new ImeiInfoPreferenceControllerV2(context, fragment));
+
+            controllers.add(new FirmwareVersionPreferenceControllerV2(context, fragment));
+
+            controllers.add(new ImsStatusPreferenceController(context, lifecycle));
+
+            controllers.add(new IpAddressPreferenceController(context, lifecycle));
+
+            controllers.add(new WifiMacAddressPreferenceController(context, lifecycle));
+
+            controllers.add(new BluetoothAddressPreferenceController(context, lifecycle));
+
+            controllers.add(new RegulatoryInfoPreferenceController(context));
+
+            controllers.add(new SafetyInfoPreferenceController(context));
+
+            controllers.add(new ManualPreferenceController(context));
+
+            controllers.add(new FeedbackPreferenceController(fragment, context));
+
+            controllers.add(new FccEquipmentIdPreferenceController(context));
+
+            controllers.add(
+                    new BuildNumberPreferenceController(context, activity, fragment, lifecycle));
+
+            return controllers;
+        }
+
         final List<AbstractPreferenceController> controllers = new ArrayList<>();
         controllers.add(
                 new BuildNumberPreferenceController(context, activity, fragment, lifecycle));
-        controllers.add(new AdditionalSystemUpdatePreferenceController(context));
         controllers.add(new ManualPreferenceController(context));
         controllers.add(new FeedbackPreferenceController(fragment, context));
         controllers.add(new KernelVersionPreferenceController(context));
@@ -129,7 +199,6 @@
         controllers.add(new DeviceModelPreferenceController(context, fragment));
         controllers.add(new SecurityPatchPreferenceController(context));
         controllers.add(new FccEquipmentIdPreferenceController(context));
-        controllers.add(new SELinuxStatusPreferenceController(context));
         controllers.add(new SafetyInfoPreferenceController(context));
         return controllers;
     }
@@ -144,12 +213,14 @@
                 public List<SearchIndexableResource> getXmlResourcesToIndex(
                         Context context, boolean enabled) {
                     final SearchIndexableResource sir = new SearchIndexableResource(context);
-                    sir.xmlResId = R.xml.device_info_settings;
+                    sir.xmlResId = FeatureFlagUtils.isEnabled(context, DEVICE_INFO_V2) || true
+                            ? R.xml.device_info_settings_v2 : R.xml.device_info_settings;
                     return Arrays.asList(sir);
                 }
 
                 @Override
-                public List<AbstractPreferenceController> getPreferenceControllers(Context context) {
+                public List<AbstractPreferenceController> getPreferenceControllers(
+                        Context context) {
                     return buildPreferenceControllers(context, null /*activity */,
                             null /* fragment */, null /* lifecycle */);
                 }
diff --git a/src/com/android/settings/DimmableIconPreference.java b/src/com/android/settings/DimmableIconPreference.java
deleted file mode 100644
index 8f09c53..0000000
--- a/src/com/android/settings/DimmableIconPreference.java
+++ /dev/null
@@ -1,73 +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.annotation.Nullable;
-import android.content.Context;
-import android.graphics.drawable.Drawable;
-import android.support.v7.preference.Preference;
-import android.support.v7.preference.PreferenceViewHolder;
-import android.text.TextUtils;
-import android.util.AttributeSet;
-import android.widget.TextView;
-
-import com.android.settingslib.RestrictedPreference;
-
-/**
- * A preference item that can dim the icon when it's disabled, either directly or because its parent
- * is disabled.
- */
-public class DimmableIconPreference extends RestrictedPreference {
-    private static final int ICON_ALPHA_ENABLED = 255;
-    private static final int ICON_ALPHA_DISABLED = 102;
-
-    private final CharSequence mContentDescription;
-
-    public DimmableIconPreference(Context context) {
-        this(context, (AttributeSet) null);
-    }
-
-    public DimmableIconPreference(Context context, AttributeSet attrs) {
-        super(context, attrs);
-        mContentDescription = null;
-        useAdminDisabledSummary(true);
-    }
-
-    public DimmableIconPreference(Context context, @Nullable CharSequence contentDescription) {
-        super(context);
-        mContentDescription = contentDescription;
-        useAdminDisabledSummary(true);
-    }
-
-    private void dimIcon(boolean dimmed) {
-        Drawable icon = getIcon();
-        if (icon != null) {
-            icon.mutate().setAlpha(dimmed ? ICON_ALPHA_DISABLED : ICON_ALPHA_ENABLED);
-            setIcon(icon);
-        }
-    }
-
-    @Override
-    public void onBindViewHolder(PreferenceViewHolder view) {
-        super.onBindViewHolder(view);
-        if (!TextUtils.isEmpty(mContentDescription)) {
-            final TextView titleView = (TextView) view.findViewById(android.R.id.title);
-            titleView.setContentDescription(mContentDescription);
-        }
-        dimIcon(!isEnabled());
-    }
-}
diff --git a/src/com/android/settings/DisplaySettings.java b/src/com/android/settings/DisplaySettings.java
index 86c3da1..e726c63 100644
--- a/src/com/android/settings/DisplaySettings.java
+++ b/src/com/android/settings/DisplaySettings.java
@@ -33,6 +33,7 @@
 import com.android.settings.display.NightDisplayPreferenceController;
 import com.android.settings.display.NightModePreferenceController;
 import com.android.settings.display.ScreenSaverPreferenceController;
+import com.android.settings.display.ShowOperatorNamePreferenceController;
 import com.android.settings.display.TapToWakePreferenceController;
 import com.android.settings.display.ThemePreferenceController;
 import com.android.settings.display.TimeoutPreferenceController;
@@ -50,11 +51,13 @@
     private static final String TAG = "DisplaySettings";
 
     public static final String KEY_AUTO_BRIGHTNESS = "auto_brightness";
-    public static final String KEY_DISPLAY_SIZE = "screen_zoom";
+    public static final String KEY_DISPLAY_SIZE = "display_settings_screen_zoom";
 
     private static final String KEY_SCREEN_TIMEOUT = "screen_timeout";
     private static final String KEY_AMBIENT_DISPLAY = "ambient_display";
 
+    private static final String KEY_NIGHT_DISPLAY = "night_display";
+
     @Override
     public int getMetricsCategory() {
         return MetricsEvent.DISPLAY;
@@ -66,12 +69,6 @@
     }
 
     @Override
-    public void onAttach(Context context) {
-        super.onAttach(context);
-        mProgressiveDisclosureMixin.setTileLimit(4);
-    }
-
-    @Override
     protected int getPreferenceScreenResId() {
         return R.xml.display_settings;
     }
@@ -82,7 +79,7 @@
     }
 
     @Override
-    protected int getHelpResource() {
+    public int getHelpResource() {
         return R.string.help_uri_display;
     }
 
@@ -104,6 +101,7 @@
         controllers.add(new TapToWakePreferenceController(context));
         controllers.add(new TimeoutPreferenceController(context, KEY_SCREEN_TIMEOUT));
         controllers.add(new VrDisplayPreferenceController(context));
+        controllers.add(new ShowOperatorNamePreferenceController(context));
         controllers.add(new WallpaperPreferenceController(context));
         controllers.add(new ThemePreferenceController(context));
         controllers.add(new BrightnessLevelPreferenceController(context, lifecycle));
@@ -130,6 +128,7 @@
                     keys.add(KEY_DISPLAY_SIZE);
                     keys.add(WallpaperPreferenceController.KEY_WALLPAPER);
                     keys.add(KEY_AMBIENT_DISPLAY);
+                    keys.add(KEY_NIGHT_DISPLAY);
                     return keys;
                 }
 
diff --git a/src/com/android/settings/DividerPreference.java b/src/com/android/settings/DividerPreference.java
deleted file mode 100644
index aec7d44..0000000
--- a/src/com/android/settings/DividerPreference.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;
-
-import android.content.Context;
-import android.content.res.TypedArray;
-import android.support.v7.preference.Preference;
-import android.support.v7.preference.PreferenceViewHolder;
-import android.util.AttributeSet;
-
-@Deprecated
-public class DividerPreference extends Preference {
-
-    private Boolean mAllowAbove;
-    private Boolean mAllowBelow;
-
-    public DividerPreference(Context context, AttributeSet attrs) {
-        super(context, attrs);
-        TypedArray a = context.obtainStyledAttributes(attrs, R.styleable.DividerPreference, 0, 0);
-        if (a.hasValue(R.styleable.DividerPreference_allowDividerAbove)) {
-            mAllowAbove = a.getBoolean(R.styleable.DividerPreference_allowDividerAbove, false);
-        }
-        if (a.hasValue(R.styleable.DividerPreference_allowDividerBelow)) {
-            mAllowBelow = a.getBoolean(R.styleable.DividerPreference_allowDividerBelow, false);
-        }
-        a.recycle();
-    }
-
-    public DividerPreference(Context context) {
-        this(context, null /* attrs */);
-    }
-
-    public void setDividerAllowedAbove(boolean allowed) {
-        mAllowAbove = allowed;
-        notifyChanged();
-    }
-
-    public void setDividerAllowedBelow(boolean allowed) {
-        mAllowBelow = allowed;
-        notifyChanged();
-    }
-
-    @Override
-    public void onBindViewHolder(PreferenceViewHolder holder) {
-        super.onBindViewHolder(holder);
-        if (mAllowAbove != null) {
-            holder.setDividerAllowedAbove(mAllowAbove);
-        }
-        if (mAllowBelow != null) {
-            holder.setDividerAllowedBelow(mAllowBelow);
-        }
-    }
-}
diff --git a/src/com/android/settings/EncryptionAndCredential.java b/src/com/android/settings/EncryptionAndCredential.java
deleted file mode 100644
index 4892f7e..0000000
--- a/src/com/android/settings/EncryptionAndCredential.java
+++ /dev/null
@@ -1,239 +0,0 @@
-/*
- * Copyright (C) 2007 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF 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.admin.DevicePolicyManager;
-import android.content.Context;
-import android.content.Intent;
-import android.os.Bundle;
-import android.os.UserHandle;
-import android.os.UserManager;
-import android.provider.SearchIndexableResource;
-import android.security.KeyStore;
-import android.support.v7.preference.PreferenceGroup;
-import android.support.v7.preference.PreferenceScreen;
-
-import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
-import com.android.internal.widget.LockPatternUtils;
-import com.android.settings.dashboard.DashboardFragment;
-import com.android.settings.search.BaseSearchIndexProvider;
-import com.android.settings.search.Indexable;
-import com.android.settingslib.RestrictedLockUtils;
-import com.android.settingslib.RestrictedPreference;
-
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * Encryption and Credential settings.
- * TODO: Extends this from {@link DashboardFragment} instead
- */
-public class EncryptionAndCredential extends SettingsPreferenceFragment implements Indexable {
-
-    private static final String TAG = "EncryptionAndCredential";
-
-    // Misc Settings
-    private static final String KEY_CREDENTIAL_STORAGE_TYPE = "credential_storage_type";
-    private static final String KEY_USER_CREDENTIALS = "user_credentials";
-    private static final String KEY_RESET_CREDENTIALS = "credentials_reset";
-    private static final String KEY_CREDENTIALS_INSTALL = "credentials_install";
-    private static final String KEY_CREDENTIALS_MANAGER = "credentials_management";
-
-    private static final int MY_USER_ID = UserHandle.myUserId();
-
-    private UserManager mUm;
-
-    private KeyStore mKeyStore;
-    private RestrictedPreference mResetCredentials;
-
-    private boolean mIsAdmin;
-
-    @Override
-    public int getMetricsCategory() {
-        return MetricsEvent.ENCRYPTION_AND_CREDENTIAL;
-    }
-
-    @Override
-    public void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-
-        final Activity activity = getActivity();
-
-        mUm = UserManager.get(activity);
-    }
-
-    /**
-     * Important!
-     *
-     * Don't forget to update the SecuritySearchIndexProvider if you are doing any change in the
-     * logic or adding/removing preferences here.
-     */
-    private PreferenceScreen createPreferenceHierarchy() {
-        PreferenceScreen root = getPreferenceScreen();
-        if (root != null) {
-            root.removeAll();
-        }
-        addPreferencesFromResource(R.xml.encryption_and_credential);
-        root = getPreferenceScreen();
-
-        // Add options for device encryption
-        mIsAdmin = mUm.isAdminUser();
-
-        if (mIsAdmin) {
-            if (LockPatternUtils.isDeviceEncryptionEnabled()) {
-                // The device is currently encrypted.
-                addPreferencesFromResource(R.xml.security_settings_encrypted);
-            } else {
-                // This device supports encryption but isn't encrypted.
-                addPreferencesFromResource(R.xml.security_settings_unencrypted);
-            }
-        }
-
-        // Credential storage
-        mKeyStore = KeyStore.getInstance(); // needs to be initialized for onResume()
-
-        if (!RestrictedLockUtils.hasBaseUserRestriction(getActivity(),
-                UserManager.DISALLOW_CONFIG_CREDENTIALS, MY_USER_ID)) {
-            RestrictedPreference userCredentials = (RestrictedPreference) root.findPreference(
-                    KEY_USER_CREDENTIALS);
-            userCredentials.checkRestrictionAndSetDisabled(
-                    UserManager.DISALLOW_CONFIG_CREDENTIALS);
-            RestrictedPreference credentialStorageType = (RestrictedPreference) root.findPreference(
-                    KEY_CREDENTIAL_STORAGE_TYPE);
-            credentialStorageType.checkRestrictionAndSetDisabled(
-                    UserManager.DISALLOW_CONFIG_CREDENTIALS);
-            RestrictedPreference installCredentials = (RestrictedPreference) root.findPreference(
-                    KEY_CREDENTIALS_INSTALL);
-            installCredentials.checkRestrictionAndSetDisabled(
-                    UserManager.DISALLOW_CONFIG_CREDENTIALS);
-            mResetCredentials = (RestrictedPreference) root.findPreference(KEY_RESET_CREDENTIALS);
-            mResetCredentials.checkRestrictionAndSetDisabled(
-                    UserManager.DISALLOW_CONFIG_CREDENTIALS);
-
-            final int storageSummaryRes =
-                    mKeyStore.isHardwareBacked() ? R.string.credential_storage_type_hardware
-                            : R.string.credential_storage_type_software;
-            credentialStorageType.setSummary(storageSummaryRes);
-        } else {
-            PreferenceGroup credentialsManager = (PreferenceGroup)
-                    root.findPreference(KEY_CREDENTIALS_MANAGER);
-            credentialsManager.removePreference(root.findPreference(KEY_RESET_CREDENTIALS));
-            credentialsManager.removePreference(root.findPreference(KEY_CREDENTIALS_INSTALL));
-            credentialsManager.removePreference(root.findPreference(KEY_CREDENTIAL_STORAGE_TYPE));
-            credentialsManager.removePreference(root.findPreference(KEY_USER_CREDENTIALS));
-        }
-
-        return root;
-    }
-
-    @Override
-    public void onResume() {
-        super.onResume();
-
-        // Make sure we reload the preference hierarchy since some of these settings
-        // depend on others...
-        createPreferenceHierarchy();
-
-        if (mResetCredentials != null && !mResetCredentials.isDisabledByAdmin()) {
-            mResetCredentials.setEnabled(!mKeyStore.isEmpty());
-        }
-    }
-
-    /**
-     * see confirmPatternThenDisableAndClear
-     */
-    @Override
-    public void onActivityResult(int requestCode, int resultCode, Intent data) {
-        super.onActivityResult(requestCode, resultCode, data);
-        createPreferenceHierarchy();
-    }
-
-    @Override
-    protected int getHelpResource() {
-        return R.string.help_url_encryption;
-    }
-
-    /**
-     * For Search. Please keep it in sync when updating "createPreferenceHierarchy()"
-     */
-    public static final SearchIndexProvider SEARCH_INDEX_DATA_PROVIDER =
-            new SecuritySearchIndexProvider();
-
-    private static class SecuritySearchIndexProvider extends BaseSearchIndexProvider {
-
-        @Override
-        public List<SearchIndexableResource> getXmlResourcesToIndex(
-                Context context, boolean enabled) {
-            final List<SearchIndexableResource> index = new ArrayList<>();
-
-            // Add everything. We will suppress some of them in getNonIndexableKeys()
-            index.add(getSearchResource(context, R.xml.encryption_and_credential));
-            index.add(getSearchResource(context, R.xml.security_settings_encrypted));
-            index.add(getSearchResource(context, R.xml.security_settings_unencrypted));
-
-            return index;
-        }
-
-        @Override
-        protected boolean isPageSearchEnabled(Context context) {
-            final UserManager um = (UserManager) context.getSystemService(Context.USER_SERVICE);
-            return um.isAdminUser();
-        }
-
-        private SearchIndexableResource getSearchResource(Context context, int xmlResId) {
-            final SearchIndexableResource sir = new SearchIndexableResource(context);
-            sir.xmlResId = xmlResId;
-            return sir;
-        }
-
-        @Override
-        public List<String> getNonIndexableKeys(Context 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/IccLockSettings.java b/src/com/android/settings/IccLockSettings.java
index 0517b13..b9f3b10 100644
--- a/src/com/android/settings/IccLockSettings.java
+++ b/src/com/android/settings/IccLockSettings.java
@@ -295,7 +295,7 @@
     }
 
     @Override
-    protected int getHelpResource() {
+    public int getHelpResource() {
         return R.string.help_url_icc_lock;
     }
 
diff --git a/src/com/android/settings/MasterClear.java b/src/com/android/settings/MasterClear.java
index 2c97018..7a6f966 100644
--- a/src/com/android/settings/MasterClear.java
+++ b/src/com/android/settings/MasterClear.java
@@ -21,6 +21,7 @@
 import android.accounts.Account;
 import android.accounts.AccountManager;
 import android.accounts.AuthenticatorDescription;
+import android.annotation.Nullable;
 import android.app.Activity;
 import android.content.ComponentName;
 import android.content.ContentResolver;
@@ -38,7 +39,6 @@
 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;
@@ -53,6 +53,7 @@
 import android.widget.TextView;
 
 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;
 import com.android.settingslib.RestrictedLockUtils;
@@ -69,7 +70,7 @@
  *
  * This is the initial screen.
  */
-public class MasterClear extends OptionsMenuFragment {
+public class MasterClear extends InstrumentedPreferenceFragment {
     private static final String TAG = "MasterClear";
 
     private static final int KEYGUARD_REQUEST = 55;
@@ -91,6 +92,12 @@
         }
     };
 
+    @Override
+    public void onCreate(@Nullable Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        getActivity().setTitle(R.string.master_clear_title);
+    }
+
     /**
      * Keyguard validation is run using the standard {@link ConfirmLockPattern}
      * component as a subactivity
diff --git a/src/com/android/settings/MasterClearConfirm.java b/src/com/android/settings/MasterClearConfirm.java
index 39bf01a..9b324c3 100644
--- a/src/com/android/settings/MasterClearConfirm.java
+++ b/src/com/android/settings/MasterClearConfirm.java
@@ -33,6 +33,7 @@
 import android.widget.TextView;
 
 import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
+import com.android.settings.core.InstrumentedPreferenceFragment;
 import com.android.settingslib.RestrictedLockUtils;
 
 import static com.android.settingslib.RestrictedLockUtils.EnforcedAdmin;
@@ -47,7 +48,7 @@
  *
  * This is the confirmation screen.
  */
-public class MasterClearConfirm extends OptionsMenuFragment {
+public class MasterClearConfirm extends InstrumentedPreferenceFragment {
 
     private View mContentView;
     private boolean mEraseSdCard;
diff --git a/src/com/android/settings/OptionsMenuFragment.java b/src/com/android/settings/OptionsMenuFragment.java
deleted file mode 100644
index c8dcc8e..0000000
--- a/src/com/android/settings/OptionsMenuFragment.java
+++ /dev/null
@@ -1,35 +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;
-
-import android.os.Bundle;
-
-import com.android.settings.core.InstrumentedPreferenceFragment;
-
-/**
- * Base class for a fragment that has the options menu.
- * SettingsPreferenceFragment automatically sets this, but some activities do not use
- * preferences, and we need to call setHasOptionsMenu(true) for the back button on action bar.
- * For preference fragments, use SettingsPreferenceFragment.
- */
-public abstract class OptionsMenuFragment extends InstrumentedPreferenceFragment {
-
-    @Override
-    public void onActivityCreated(Bundle savedInstanceState) {
-        super.onActivityCreated(savedInstanceState);
-        setHasOptionsMenu(true);
-    }
-}
diff --git a/src/com/android/settings/OwnerInfoSettings.java b/src/com/android/settings/OwnerInfoSettings.java
deleted file mode 100644
index 3128dfe..0000000
--- a/src/com/android/settings/OwnerInfoSettings.java
+++ /dev/null
@@ -1,99 +0,0 @@
-/*
- * Copyright (C) 2010 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings;
-
-import android.app.AlertDialog;
-import android.app.Dialog;
-import android.app.Fragment;
-import android.content.DialogInterface;
-import android.content.DialogInterface.OnClickListener;
-import android.os.Bundle;
-import android.os.UserHandle;
-import android.text.TextUtils;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.widget.EditText;
-
-import com.android.internal.logging.nano.MetricsProto;
-import com.android.internal.widget.LockPatternUtils;
-import com.android.settings.core.instrumentation.InstrumentedDialogFragment;
-import com.android.settings.security.OwnerInfoPreferenceController.OwnerInfoCallback;
-
-public class OwnerInfoSettings extends InstrumentedDialogFragment implements OnClickListener {
-
-    private static final String TAG_OWNER_INFO = "ownerInfo";
-
-    private View mView;
-    private int mUserId;
-    private LockPatternUtils mLockPatternUtils;
-    private EditText mOwnerInfo;
-
-    @Override
-    public void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        mUserId = UserHandle.myUserId();
-        mLockPatternUtils = new LockPatternUtils(getActivity());
-    }
-
-    @Override
-    public Dialog onCreateDialog(Bundle savedInstanceState) {
-        mView = LayoutInflater.from(getActivity()).inflate(R.layout.ownerinfo, null);
-        initView();
-        return new AlertDialog.Builder(getActivity())
-                .setTitle(R.string.owner_info_settings_title)
-                .setView(mView)
-                .setPositiveButton(R.string.save, this)
-                .setNegativeButton(R.string.cancel, this)
-                .show();
-    }
-
-    private void initView() {
-        String info = mLockPatternUtils.getOwnerInfo(mUserId);
-
-        mOwnerInfo = (EditText) mView.findViewById(R.id.owner_info_edit_text);
-        if (!TextUtils.isEmpty(info)) {
-            mOwnerInfo.setText(info);
-            mOwnerInfo.setSelection(info.length());
-        }
-    }
-
-    @Override
-    public void onClick(DialogInterface dialog, int which) {
-        if (which == AlertDialog.BUTTON_POSITIVE) {
-            String info = mOwnerInfo.getText().toString();
-            mLockPatternUtils.setOwnerInfoEnabled(!TextUtils.isEmpty(info), mUserId);
-            mLockPatternUtils.setOwnerInfo(info, mUserId);
-
-            if (getTargetFragment() instanceof OwnerInfoCallback) {
-                ((OwnerInfoCallback) getTargetFragment()).onOwnerInfoUpdated();
-            }
-        }
-    }
-
-    public static void show(Fragment parent) {
-        if (!parent.isAdded()) return;
-
-        final OwnerInfoSettings dialog = new OwnerInfoSettings();
-        dialog.setTargetFragment(parent, 0);
-        dialog.show(parent.getFragmentManager(), TAG_OWNER_INFO);
-    }
-
-    @Override
-    public int getMetricsCategory() {
-        return MetricsProto.MetricsEvent.DIALOG_OWNER_INFO_SETTINGS;
-    }
-}
diff --git a/src/com/android/settings/PrivacySettings.java b/src/com/android/settings/PrivacySettings.java
index e547570..24774e0 100644
--- a/src/com/android/settings/PrivacySettings.java
+++ b/src/com/android/settings/PrivacySettings.java
@@ -220,7 +220,7 @@
     }
 
     @Override
-    protected int getHelpResource() {
+    public int getHelpResource() {
         return R.string.help_url_backup_reset;
     }
 
diff --git a/src/com/android/settings/ResetNetwork.java b/src/com/android/settings/ResetNetwork.java
index 1529e77..0f08c26 100644
--- a/src/com/android/settings/ResetNetwork.java
+++ b/src/com/android/settings/ResetNetwork.java
@@ -16,6 +16,7 @@
 
 package com.android.settings;
 
+import android.annotation.Nullable;
 import android.app.Activity;
 import android.content.Intent;
 import android.content.res.Resources;
@@ -34,6 +35,7 @@
 
 import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
 import com.android.internal.telephony.PhoneConstants;
+import com.android.settings.core.InstrumentedPreferenceFragment;
 import com.android.settings.password.ChooseLockSettingsHelper;
 import com.android.settings.password.ConfirmLockPattern;
 import com.android.settingslib.RestrictedLockUtils;
@@ -51,7 +53,7 @@
  *
  * This is the initial screen.
  */
-public class ResetNetwork extends OptionsMenuFragment {
+public class ResetNetwork extends InstrumentedPreferenceFragment {
     private static final String TAG = "ResetNetwork";
 
     // Arbitrary to avoid conficts
@@ -63,6 +65,12 @@
     private Spinner mSubscriptionSpinner;
     private Button mInitiateButton;
 
+    @Override
+    public void onCreate(@Nullable Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        getActivity().setTitle(R.string.reset_network_title);
+    }
+
     /**
      * Keyguard validation is run using the standard {@link ConfirmLockPattern}
      * component as a subactivity
diff --git a/src/com/android/settings/ResetNetworkConfirm.java b/src/com/android/settings/ResetNetworkConfirm.java
index f70d3c2..58b8289 100644
--- a/src/com/android/settings/ResetNetworkConfirm.java
+++ b/src/com/android/settings/ResetNetworkConfirm.java
@@ -38,6 +38,7 @@
 import com.android.ims.ImsManager;
 import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
 import com.android.internal.telephony.PhoneConstants;
+import com.android.settings.core.InstrumentedPreferenceFragment;
 import com.android.settingslib.RestrictedLockUtils;
 
 import static com.android.settingslib.RestrictedLockUtils.EnforcedAdmin;
@@ -52,7 +53,7 @@
  *
  * This is the confirmation screen.
  */
-public class ResetNetworkConfirm extends OptionsMenuFragment {
+public class ResetNetworkConfirm extends InstrumentedPreferenceFragment {
 
     private View mContentView;
     private int mSubId = SubscriptionManager.INVALID_SUBSCRIPTION_ID;
diff --git a/src/com/android/settings/ScreenPinningSettings.java b/src/com/android/settings/ScreenPinningSettings.java
deleted file mode 100644
index 5209cc7..0000000
--- a/src/com/android/settings/ScreenPinningSettings.java
+++ /dev/null
@@ -1,241 +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.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.provider.Settings;
-import android.support.v14.preference.SwitchPreference;
-import android.support.v7.preference.Preference;
-import android.support.v7.preference.Preference.OnPreferenceChangeListener;
-import android.support.v7.preference.PreferenceScreen;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.Switch;
-
-import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
-import com.android.internal.widget.LockPatternUtils;
-import com.android.settings.password.ChooseLockGeneric;
-import com.android.settings.search.BaseSearchIndexProvider;
-import com.android.settings.search.Indexable;
-import com.android.settings.search.SearchIndexableRaw;
-import com.android.settings.widget.SwitchBar;
-
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * Screen pinning settings.
- */
-public class ScreenPinningSettings extends SettingsPreferenceFragment
-        implements SwitchBar.OnSwitchChangeListener, Indexable {
-
-    private static final CharSequence KEY_USE_SCREEN_LOCK = "use_screen_lock";
-    private static final int CHANGE_LOCK_METHOD_REQUEST = 43;
-
-    private SwitchBar mSwitchBar;
-    private SwitchPreference mUseScreenLock;
-    private LockPatternUtils mLockPatternUtils;
-
-    @Override
-    public int getMetricsCategory() {
-        return MetricsEvent.SCREEN_PINNING;
-    }
-
-    @Override
-    public void onActivityCreated(Bundle savedInstanceState) {
-        super.onActivityCreated(savedInstanceState);
-
-        final SettingsActivity activity = (SettingsActivity) getActivity();
-        mLockPatternUtils = new LockPatternUtils(activity);
-
-
-        mSwitchBar = activity.getSwitchBar();
-        mSwitchBar.addOnSwitchChangeListener(this);
-        mSwitchBar.show();
-        mSwitchBar.setChecked(isLockToAppEnabled(getActivity()));
-    }
-
-    @Override
-    protected int getHelpResource() {
-        return R.string.help_url_screen_pinning;
-    }
-
-    @Override
-    public void onViewCreated(View view, Bundle savedInstanceState) {
-        super.onViewCreated(view, savedInstanceState);
-        ViewGroup parent = (ViewGroup) view.findViewById(android.R.id.list_container);
-        View emptyView = LayoutInflater.from(getContext())
-                .inflate(R.layout.screen_pinning_instructions, parent, false);
-        parent.addView(emptyView);
-        setEmptyView(emptyView);
-    }
-
-    @Override
-    public void onDestroyView() {
-        super.onDestroyView();
-
-        mSwitchBar.removeOnSwitchChangeListener(this);
-        mSwitchBar.hide();
-    }
-
-    private static boolean isLockToAppEnabled(Context context) {
-        return Settings.System.getInt(context.getContentResolver(),
-                Settings.System.LOCK_TO_APP_ENABLED, 0) != 0;
-    }
-
-    private void setLockToAppEnabled(boolean isEnabled) {
-        Settings.System.putInt(getContentResolver(), Settings.System.LOCK_TO_APP_ENABLED,
-                isEnabled ? 1 : 0);
-        if (isEnabled) {
-            // Set the value to match what we have defaulted to in the UI.
-            setScreenLockUsedSetting(isScreenLockUsed());
-        }
-    }
-
-    private boolean isScreenLockUsed() {
-        int def = getCurrentSecurityTitle() != R.string.screen_pinning_unlock_none ? 1 : 0;
-        return Settings.Secure.getInt(getContentResolver(),
-                Settings.Secure.LOCK_TO_APP_EXIT_LOCKED, def) != 0;
-    }
-
-    private boolean setScreenLockUsed(boolean isEnabled) {
-        if (isEnabled) {
-            LockPatternUtils lockPatternUtils = new LockPatternUtils(getActivity());
-            int passwordQuality = lockPatternUtils
-                    .getKeyguardStoredPasswordQuality(UserHandle.myUserId());
-            if (passwordQuality == DevicePolicyManager.PASSWORD_QUALITY_UNSPECIFIED) {
-                Intent chooseLockIntent = new Intent(DevicePolicyManager.ACTION_SET_NEW_PASSWORD);
-                chooseLockIntent.putExtra(
-                        ChooseLockGeneric.ChooseLockGenericFragment.MINIMUM_QUALITY_KEY,
-                        DevicePolicyManager.PASSWORD_QUALITY_SOMETHING);
-                startActivityForResult(chooseLockIntent, CHANGE_LOCK_METHOD_REQUEST);
-                return false;
-            }
-        }
-        setScreenLockUsedSetting(isEnabled);
-        return true;
-    }
-
-    private void setScreenLockUsedSetting(boolean isEnabled) {
-        Settings.Secure.putInt(getContentResolver(), Settings.Secure.LOCK_TO_APP_EXIT_LOCKED,
-                isEnabled ? 1 : 0);
-    }
-
-    @Override
-    public void onActivityResult(int requestCode, int resultCode, Intent data) {
-        super.onActivityResult(requestCode, resultCode, data);
-        if (requestCode == CHANGE_LOCK_METHOD_REQUEST) {
-            LockPatternUtils lockPatternUtils = new LockPatternUtils(getActivity());
-            boolean validPassQuality = lockPatternUtils.getKeyguardStoredPasswordQuality(
-                    UserHandle.myUserId())
-                    != DevicePolicyManager.PASSWORD_QUALITY_UNSPECIFIED;
-            setScreenLockUsed(validPassQuality);
-            // Make sure the screen updates.
-            mUseScreenLock.setChecked(validPassQuality);
-        }
-    }
-
-    private int getCurrentSecurityTitle() {
-        int quality = mLockPatternUtils.getKeyguardStoredPasswordQuality(
-                UserHandle.myUserId());
-        switch (quality) {
-            case DevicePolicyManager.PASSWORD_QUALITY_NUMERIC:
-            case DevicePolicyManager.PASSWORD_QUALITY_NUMERIC_COMPLEX:
-                return R.string.screen_pinning_unlock_pin;
-            case DevicePolicyManager.PASSWORD_QUALITY_ALPHABETIC:
-            case DevicePolicyManager.PASSWORD_QUALITY_ALPHANUMERIC:
-            case DevicePolicyManager.PASSWORD_QUALITY_COMPLEX:
-            case DevicePolicyManager.PASSWORD_QUALITY_MANAGED:
-                return R.string.screen_pinning_unlock_password;
-            case DevicePolicyManager.PASSWORD_QUALITY_SOMETHING:
-                if (mLockPatternUtils.isLockPatternEnabled(UserHandle.myUserId())) {
-                    return R.string.screen_pinning_unlock_pattern;
-                }
-        }
-        return R.string.screen_pinning_unlock_none;
-    }
-
-    /**
-     * Listens to the state change of the lock-to-app master switch.
-     */
-    @Override
-    public void onSwitchChanged(Switch switchView, boolean isChecked) {
-        setLockToAppEnabled(isChecked);
-        updateDisplay();
-    }
-
-    public void updateDisplay() {
-        PreferenceScreen root = getPreferenceScreen();
-        if (root != null) {
-            root.removeAll();
-        }
-        if (isLockToAppEnabled(getActivity())) {
-            addPreferencesFromResource(R.xml.screen_pinning_settings);
-            root = getPreferenceScreen();
-
-            mUseScreenLock = (SwitchPreference) root.findPreference(KEY_USE_SCREEN_LOCK);
-            mUseScreenLock.setOnPreferenceChangeListener(new OnPreferenceChangeListener() {
-                @Override
-                public boolean onPreferenceChange(Preference preference, Object newValue) {
-                    return setScreenLockUsed((boolean) newValue);
-                }
-            });
-            mUseScreenLock.setChecked(isScreenLockUsed());
-            mUseScreenLock.setTitle(getCurrentSecurityTitle());
-        }
-    }
-
-    /**
-     * For search
-     */
-    public static final SearchIndexProvider SEARCH_INDEX_DATA_PROVIDER =
-        new BaseSearchIndexProvider() {
-            @Override
-            public List<SearchIndexableRaw> getRawDataToIndex(Context context, boolean enabled) {
-                final List<SearchIndexableRaw> result = new ArrayList<SearchIndexableRaw>();
-
-                final Resources res = context.getResources();
-
-                // Add fragment title
-                SearchIndexableRaw data = new SearchIndexableRaw(context);
-                data.title = res.getString(R.string.screen_pinning_title);
-                data.screenTitle = res.getString(R.string.screen_pinning_title);
-                result.add(data);
-
-                if (isLockToAppEnabled(context)) {
-                    // Screen lock option
-                    data = new SearchIndexableRaw(context);
-                    data.title = res.getString(R.string.screen_pinning_unlock_none);
-                    data.screenTitle = res.getString(R.string.screen_pinning_title);
-                    result.add(data);
-                } else {
-                    // Screen pinning description.
-                    data = new SearchIndexableRaw(context);
-                    data.title = res.getString(R.string.screen_pinning_description);
-                    data.screenTitle = res.getString(R.string.screen_pinning_title);
-                    result.add(data);
-                }
-
-                return result;
-            }
-        };
-}
diff --git a/src/com/android/settings/SecuritySettings.java b/src/com/android/settings/SecuritySettings.java
deleted file mode 100644
index 55f21fd..0000000
--- a/src/com/android/settings/SecuritySettings.java
+++ /dev/null
@@ -1,1290 +0,0 @@
-/*
- * Copyright (C) 2007 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings;
-
-import static android.provider.Settings.System.SCREEN_OFF_TIMEOUT;
-
-import static com.android.settingslib.RestrictedLockUtils.EnforcedAdmin;
-
-import android.app.Activity;
-import android.app.AlertDialog;
-import android.app.Dialog;
-import android.app.FragmentManager;
-import android.app.admin.DevicePolicyManager;
-import android.content.ComponentName;
-import android.content.Context;
-import android.content.DialogInterface;
-import android.content.Intent;
-import android.content.pm.PackageManager;
-import android.content.pm.ResolveInfo;
-import android.content.res.Resources;
-import android.hardware.fingerprint.FingerprintManager;
-import android.os.Bundle;
-import android.os.PersistableBundle;
-import android.os.UserHandle;
-import android.os.UserManager;
-import android.os.storage.StorageManager;
-import android.provider.SearchIndexableResource;
-import android.provider.Settings;
-import android.service.trust.TrustAgentService;
-import android.support.annotation.VisibleForTesting;
-import android.support.v14.preference.SwitchPreference;
-import android.support.v7.preference.Preference;
-import android.support.v7.preference.Preference.OnPreferenceChangeListener;
-import android.support.v7.preference.PreferenceGroup;
-import android.support.v7.preference.PreferenceScreen;
-import android.telephony.CarrierConfigManager;
-import android.telephony.SubscriptionInfo;
-import android.telephony.SubscriptionManager;
-import android.telephony.TelephonyManager;
-import android.text.TextUtils;
-import android.util.Log;
-
-import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
-import com.android.internal.widget.LockPatternUtils;
-import com.android.settings.TrustAgentUtils.TrustAgentComponentInfo;
-import com.android.settings.core.instrumentation.InstrumentedDialogFragment;
-import com.android.settings.dashboard.DashboardFeatureProvider;
-import com.android.settings.dashboard.SummaryLoader;
-import com.android.settings.enterprise.EnterprisePrivacyPreferenceController;
-import com.android.settings.enterprise.ManageDeviceAdminPreferenceController;
-import com.android.settings.fingerprint.FingerprintSettings;
-import com.android.settings.location.LocationPreferenceController;
-import com.android.settings.notification.LockScreenNotificationPreferenceController;
-import com.android.settings.overlay.FeatureFactory;
-import com.android.settings.password.ChooseLockGeneric.ChooseLockGenericFragment;
-import com.android.settings.password.ChooseLockSettingsHelper;
-import com.android.settings.password.ManagedLockPasswordProvider;
-import com.android.settings.search.BaseSearchIndexProvider;
-import com.android.settings.search.Indexable;
-import com.android.settings.search.SearchIndexableRaw;
-import com.android.settings.security.OwnerInfoPreferenceController;
-import com.android.settings.security.SecurityFeatureProvider;
-import com.android.settings.trustagent.TrustAgentManager;
-import com.android.settings.widget.GearPreference;
-import com.android.settingslib.RestrictedLockUtils;
-import com.android.settingslib.RestrictedPreference;
-import com.android.settingslib.drawer.CategoryKey;
-
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * Gesture lock pattern settings.
- */
-public class SecuritySettings extends SettingsPreferenceFragment
-        implements OnPreferenceChangeListener, Indexable,
-        GearPreference.OnGearClickListener {
-
-    private static final String TAG = "SecuritySettings";
-
-    private static final String TRUST_AGENT_CLICK_INTENT = "trust_agent_click_intent";
-    private static final Intent TRUST_AGENT_INTENT =
-            new Intent(TrustAgentService.SERVICE_INTERFACE);
-
-    // Lock Settings
-    private static final String KEY_UNLOCK_SET_OR_CHANGE = "unlock_set_or_change";
-    private static final String KEY_UNLOCK_SET_OR_CHANGE_PROFILE = "unlock_set_or_change_profile";
-    private static final String KEY_VISIBLE_PATTERN_PROFILE = "visiblepattern_profile";
-    private static final String KEY_SECURITY_CATEGORY = "security_category";
-    @VisibleForTesting
-    static final String KEY_MANAGE_TRUST_AGENTS = "manage_trust_agents";
-    private static final String KEY_UNIFICATION = "unification";
-    @VisibleForTesting
-    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;
-    private static final int SET_OR_CHANGE_LOCK_METHOD_REQUEST_PROFILE = 127;
-    private static final int UNIFY_LOCK_CONFIRM_DEVICE_REQUEST = 128;
-    private static final int UNIFY_LOCK_CONFIRM_PROFILE_REQUEST = 129;
-    private static final int UNUNIFY_LOCK_CONFIRM_DEVICE_REQUEST = 130;
-    private static final String TAG_UNIFICATION_DIALOG = "unification_dialog";
-
-    // Misc Settings
-    private static final String KEY_SIM_LOCK = "sim_lock_settings";
-    private static final String KEY_SHOW_PASSWORD = "show_password";
-    private static final String KEY_TRUST_AGENT = "trust_agent";
-    private static final String KEY_SCREEN_PINNING = "screen_pinning_settings";
-
-    // Security status
-    private static final String KEY_SECURITY_STATUS = "security_status";
-    private static final String SECURITY_STATUS_KEY_PREFIX = "security_status_";
-
-    // Package verifier Settings
-    @VisibleForTesting(otherwise = VisibleForTesting.PRIVATE)
-    static final String KEY_PACKAGE_VERIFIER_STATUS = "security_status_package_verifier";
-    private static final int PACKAGE_VERIFIER_STATE_ENABLED = 1;
-
-    // Device management settings
-    private static final String KEY_ENTERPRISE_PRIVACY = "enterprise_privacy";
-    private static final String KEY_MANAGE_DEVICE_ADMIN = "manage_device_admin";
-
-    // These switch preferences need special handling since they're not all stored in Settings.
-    private static final String SWITCH_PREFERENCE_KEYS[] = {
-            KEY_SHOW_PASSWORD, KEY_UNIFICATION, KEY_VISIBLE_PATTERN_PROFILE
-    };
-
-    // Only allow one trust agent on the platform.
-    private static final boolean ONLY_ONE_TRUST_AGENT = true;
-
-    private static final int MY_USER_ID = UserHandle.myUserId();
-
-    private DashboardFeatureProvider mDashboardFeatureProvider;
-    private DevicePolicyManager mDPM;
-    private SecurityFeatureProvider mSecurityFeatureProvider;
-    private TrustAgentManager mTrustAgentManager;
-    private SubscriptionManager mSubscriptionManager;
-    private UserManager mUm;
-
-    private ChooseLockSettingsHelper mChooseLockSettingsHelper;
-    private LockPatternUtils mLockPatternUtils;
-    private ManagedLockPasswordProvider mManagedPasswordProvider;
-
-    private SwitchPreference mVisiblePatternProfile;
-    private SwitchPreference mUnifyProfile;
-
-    private SwitchPreference mShowPassword;
-
-    private boolean mIsAdmin;
-
-    private Intent mTrustAgentClickIntent;
-
-    private int mProfileChallengeUserId;
-
-    private String mCurrentDevicePassword;
-    private String mCurrentProfilePassword;
-
-    private LocationPreferenceController mLocationcontroller;
-    private ManageDeviceAdminPreferenceController mManageDeviceAdminPreferenceController;
-    private EnterprisePrivacyPreferenceController mEnterprisePrivacyPreferenceController;
-    private LockScreenNotificationPreferenceController mLockScreenNotificationPreferenceController;
-
-    @Override
-    public int getMetricsCategory() {
-        return MetricsEvent.SECURITY;
-    }
-
-    @Override
-    public void onAttach(Context context) {
-        super.onAttach(context);
-        mLocationcontroller = new LocationPreferenceController(context, getLifecycle());
-    }
-
-    @Override
-    public void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-
-        final Activity activity = getActivity();
-
-        mSubscriptionManager = SubscriptionManager.from(activity);
-
-        mLockPatternUtils = new LockPatternUtils(activity);
-
-        mManagedPasswordProvider = ManagedLockPasswordProvider.get(activity, MY_USER_ID);
-
-        mDPM = (DevicePolicyManager)getSystemService(Context.DEVICE_POLICY_SERVICE);
-
-        mUm = UserManager.get(activity);
-
-        mChooseLockSettingsHelper = new ChooseLockSettingsHelper(activity);
-
-        mDashboardFeatureProvider = FeatureFactory.getFactory(activity)
-                .getDashboardFeatureProvider(activity);
-
-        mSecurityFeatureProvider = FeatureFactory.getFactory(activity).getSecurityFeatureProvider();
-
-        mTrustAgentManager = mSecurityFeatureProvider.getTrustAgentManager();
-
-        if (savedInstanceState != null
-                && savedInstanceState.containsKey(TRUST_AGENT_CLICK_INTENT)) {
-            mTrustAgentClickIntent = savedInstanceState.getParcelable(TRUST_AGENT_CLICK_INTENT);
-        }
-
-        mManageDeviceAdminPreferenceController
-                = new ManageDeviceAdminPreferenceController(activity);
-        mEnterprisePrivacyPreferenceController
-                = new EnterprisePrivacyPreferenceController(activity, null /* lifecycle */);
-        mLockScreenNotificationPreferenceController
-                = new LockScreenNotificationPreferenceController(activity);
-    }
-
-    private static int getResIdForLockUnlockScreen(Context context,
-            LockPatternUtils lockPatternUtils, ManagedLockPasswordProvider managedPasswordProvider,
-            int userId) {
-        final boolean isMyUser = userId == MY_USER_ID;
-        int resid = 0;
-        if (!lockPatternUtils.isSecure(userId)) {
-            if (!isMyUser) {
-                resid = R.xml.security_settings_lockscreen_profile;
-            } else if (lockPatternUtils.isLockScreenDisabled(userId)) {
-                resid = R.xml.security_settings_lockscreen;
-            } else {
-                resid = R.xml.security_settings_chooser;
-            }
-        } else {
-            switch (lockPatternUtils.getKeyguardStoredPasswordQuality(userId)) {
-                case DevicePolicyManager.PASSWORD_QUALITY_SOMETHING:
-                    resid = isMyUser ? R.xml.security_settings_pattern
-                            : R.xml.security_settings_pattern_profile;
-                    break;
-                case DevicePolicyManager.PASSWORD_QUALITY_NUMERIC:
-                case DevicePolicyManager.PASSWORD_QUALITY_NUMERIC_COMPLEX:
-                    resid = isMyUser ? R.xml.security_settings_pin
-                            : R.xml.security_settings_pin_profile;
-                    break;
-                case DevicePolicyManager.PASSWORD_QUALITY_ALPHABETIC:
-                case DevicePolicyManager.PASSWORD_QUALITY_ALPHANUMERIC:
-                case DevicePolicyManager.PASSWORD_QUALITY_COMPLEX:
-                    resid = isMyUser ? R.xml.security_settings_password
-                            : R.xml.security_settings_password_profile;
-                    break;
-                case DevicePolicyManager.PASSWORD_QUALITY_MANAGED:
-                    resid = managedPasswordProvider.getResIdForLockUnlockScreen(!isMyUser);
-                    break;
-            }
-        }
-        return resid;
-    }
-
-    /**
-     * Important!
-     *
-     * Don't forget to update the SecuritySearchIndexProvider if you are doing any change in the
-     * logic or adding/removing preferences here.
-     */
-    private PreferenceScreen createPreferenceHierarchy() {
-        PreferenceScreen root = getPreferenceScreen();
-        if (root != null) {
-            root.removeAll();
-        }
-        addPreferencesFromResource(R.xml.security_settings);
-        root = getPreferenceScreen();
-
-        // Add category for security status
-        addPreferencesFromResource(R.xml.security_settings_status);
-
-        // Add options for lock/unlock screen
-        final int resid = getResIdForLockUnlockScreen(getActivity(), mLockPatternUtils,
-                mManagedPasswordProvider, MY_USER_ID);
-        addPreferencesFromResource(resid);
-
-        // DO or PO installed in the user may disallow to change password.
-        disableIfPasswordQualityManaged(KEY_UNLOCK_SET_OR_CHANGE, MY_USER_ID);
-
-        mProfileChallengeUserId = Utils.getManagedProfileId(mUm, MY_USER_ID);
-        if (mProfileChallengeUserId != UserHandle.USER_NULL
-                && mLockPatternUtils.isSeparateProfileChallengeAllowed(mProfileChallengeUserId)) {
-            addPreferencesFromResource(R.xml.security_settings_profile);
-            addPreferencesFromResource(R.xml.security_settings_unification);
-            final int profileResid = getResIdForLockUnlockScreen(
-                    getActivity(), mLockPatternUtils, mManagedPasswordProvider,
-                    mProfileChallengeUserId);
-            addPreferencesFromResource(profileResid);
-            maybeAddFingerprintPreference(root, mProfileChallengeUserId);
-            if (!mLockPatternUtils.isSeparateProfileChallengeEnabled(mProfileChallengeUserId)) {
-                final Preference lockPreference =
-                        root.findPreference(KEY_UNLOCK_SET_OR_CHANGE_PROFILE);
-                final String summary = getContext().getString(
-                        R.string.lock_settings_profile_unified_summary);
-                lockPreference.setSummary(summary);
-                lockPreference.setEnabled(false);
-                // PO may disallow to change password for the profile, but screen lock and managed
-                // profile's lock is the same. Disable main "Screen lock" menu.
-                disableIfPasswordQualityManaged(KEY_UNLOCK_SET_OR_CHANGE, mProfileChallengeUserId);
-            } else {
-                // PO may disallow to change profile password, and the profile's password is
-                // separated from screen lock password. Disable profile specific "Screen lock" menu.
-                disableIfPasswordQualityManaged(KEY_UNLOCK_SET_OR_CHANGE_PROFILE,
-                        mProfileChallengeUserId);
-            }
-        }
-
-        Preference unlockSetOrChange = findPreference(KEY_UNLOCK_SET_OR_CHANGE);
-        if (unlockSetOrChange instanceof GearPreference) {
-            ((GearPreference) unlockSetOrChange).setOnGearClickListener(this);
-        }
-
-        mIsAdmin = mUm.isAdminUser();
-
-        // Fingerprint and trust agents
-        int numberOfTrustAgent = 0;
-        PreferenceGroup securityCategory = (PreferenceGroup)
-                root.findPreference(KEY_SECURITY_CATEGORY);
-        if (securityCategory != null) {
-            maybeAddFingerprintPreference(securityCategory, UserHandle.myUserId());
-            numberOfTrustAgent = addTrustAgentSettings(securityCategory);
-            setLockscreenPreferencesSummary(securityCategory);
-        }
-
-        mVisiblePatternProfile =
-                (SwitchPreference) root.findPreference(KEY_VISIBLE_PATTERN_PROFILE);
-        mUnifyProfile = (SwitchPreference) root.findPreference(KEY_UNIFICATION);
-
-        // Append the rest of the settings
-        addPreferencesFromResource(R.xml.security_settings_misc);
-
-        // Do not display SIM lock for devices without an Icc card
-        TelephonyManager tm = TelephonyManager.getDefault();
-        CarrierConfigManager cfgMgr = (CarrierConfigManager)
-                getActivity().getSystemService(Context.CARRIER_CONFIG_SERVICE);
-        PersistableBundle b = cfgMgr.getConfig();
-        if (!mIsAdmin || !isSimIccReady() ||
-                b.getBoolean(CarrierConfigManager.KEY_HIDE_SIM_LOCK_SETTINGS_BOOL)) {
-            root.removePreference(root.findPreference(KEY_SIM_LOCK));
-        } else {
-            // Disable SIM lock if there is no ready SIM card.
-            root.findPreference(KEY_SIM_LOCK).setEnabled(isSimReady());
-        }
-        if (Settings.System.getInt(getContentResolver(),
-                Settings.System.LOCK_TO_APP_ENABLED, 0) != 0) {
-            root.findPreference(KEY_SCREEN_PINNING).setSummary(
-                    getResources().getString(R.string.switch_on_text));
-        }
-
-        // Encryption status of device
-        if (LockPatternUtils.isDeviceEncryptionEnabled()) {
-            root.findPreference(KEY_ENCRYPTION_AND_CREDENTIALS).setSummary(
-                R.string.encryption_and_credential_settings_summary);
-        } else {
-            root.findPreference(KEY_ENCRYPTION_AND_CREDENTIALS).setSummary(
-                R.string.summary_placeholder);
-        }
-
-        // Show password
-        mShowPassword = (SwitchPreference) root.findPreference(KEY_SHOW_PASSWORD);
-
-        // Credential storage
-        final UserManager um = (UserManager) getActivity().getSystemService(Context.USER_SERVICE);
-
-        // Advanced Security features
-        initTrustAgentPreference(root, numberOfTrustAgent);
-
-        // The above preferences come and go based on security state, so we need to update
-        // the index. This call is expected to be fairly cheap, but we may want to do something
-        // smarter in the future.
-        final Activity activity = getActivity();
-        FeatureFactory.getFactory(activity).getSearchFeatureProvider().getIndexingManager(activity)
-                .updateFromClassNameResource(SecuritySettings.class.getName(),
-                        true /* includeInSearchResults */);
-
-        PreferenceGroup securityStatusPreferenceGroup =
-                (PreferenceGroup) root.findPreference(KEY_SECURITY_STATUS);
-        final List<Preference> tilePrefs = mDashboardFeatureProvider.getPreferencesForCategory(
-            getActivity(), getPrefContext(), getMetricsCategory(),
-            CategoryKey.CATEGORY_SECURITY);
-        int numSecurityStatusPrefs = 0;
-        if (tilePrefs != null && !tilePrefs.isEmpty()) {
-            for (Preference preference : tilePrefs) {
-                if (!TextUtils.isEmpty(preference.getKey())
-                    && preference.getKey().startsWith(SECURITY_STATUS_KEY_PREFIX)) {
-                    // Injected security status settings are placed under the Security status
-                    // category.
-                    securityStatusPreferenceGroup.addPreference(preference);
-                    numSecurityStatusPrefs++;
-                } else {
-                    // Other injected settings are placed under the Security preference screen.
-                    root.addPreference(preference);
-                }
-            }
-        }
-
-        if (numSecurityStatusPrefs == 0) {
-            root.removePreference(securityStatusPreferenceGroup);
-        } else if (numSecurityStatusPrefs > 0) {
-            // Update preference data with tile data. Security feature provider only updates the
-            // data if it actually needs to be changed.
-            mSecurityFeatureProvider.updatePreferences(getActivity(), root,
-                mDashboardFeatureProvider.getTilesForCategory(
-                    CategoryKey.CATEGORY_SECURITY));
-        }
-
-        for (int i = 0; i < SWITCH_PREFERENCE_KEYS.length; i++) {
-            final Preference pref = findPreference(SWITCH_PREFERENCE_KEYS[i]);
-            if (pref != null) pref.setOnPreferenceChangeListener(this);
-        }
-
-        mLocationcontroller.displayPreference(root);
-        mManageDeviceAdminPreferenceController.updateState(
-                root.findPreference(KEY_MANAGE_DEVICE_ADMIN));
-        mEnterprisePrivacyPreferenceController.displayPreference(root);
-        mEnterprisePrivacyPreferenceController.onResume();
-
-        return root;
-    }
-
-    @VisibleForTesting
-    void initTrustAgentPreference(PreferenceScreen root, int numberOfTrustAgent) {
-        Preference manageAgents = root.findPreference(KEY_MANAGE_TRUST_AGENTS);
-        if (manageAgents != null) {
-            if (!mLockPatternUtils.isSecure(MY_USER_ID)) {
-                manageAgents.setEnabled(false);
-                manageAgents.setSummary(R.string.disabled_because_no_backup_security);
-            } else if (numberOfTrustAgent > 0) {
-                manageAgents.setSummary(getActivity().getResources().getQuantityString(
-                    R.plurals.manage_trust_agents_summary_on,
-                    numberOfTrustAgent, numberOfTrustAgent));
-            } else {
-                manageAgents.setSummary(R.string.manage_trust_agents_summary);
-            }
-        }
-    }
-
-    @VisibleForTesting
-    void setLockscreenPreferencesSummary(PreferenceGroup group) {
-        final Preference lockscreenPreferences = group.findPreference(KEY_LOCKSCREEN_PREFERENCES);
-        if (lockscreenPreferences != null) {
-            lockscreenPreferences.setSummary(
-                mLockScreenNotificationPreferenceController.getSummaryResource());
-        }
-    }
-
-    /*
-     * Sets the preference as disabled by admin if PASSWORD_QUALITY_MANAGED is set.
-     * The preference must be a RestrictedPreference.
-     */
-    private void disableIfPasswordQualityManaged(String preferenceKey, int userId) {
-        final EnforcedAdmin admin = RestrictedLockUtils.checkIfPasswordQualityIsSet(
-                getActivity(), userId);
-        if (admin != null && mDPM.getPasswordQuality(admin.component, userId) ==
-                DevicePolicyManager.PASSWORD_QUALITY_MANAGED) {
-            final RestrictedPreference pref =
-                    (RestrictedPreference) getPreferenceScreen().findPreference(preferenceKey);
-            pref.setDisabledByAdmin(admin);
-        }
-    }
-
-    private void maybeAddFingerprintPreference(PreferenceGroup securityCategory, int userId) {
-        Preference fingerprintPreference =
-                FingerprintSettings.getFingerprintPreferenceForUser(
-                        securityCategory.getContext(), userId);
-        if (fingerprintPreference != null) {
-            securityCategory.addPreference(fingerprintPreference);
-        }
-    }
-
-    // Return the number of trust agents being added
-    private int addTrustAgentSettings(PreferenceGroup securityCategory) {
-        final boolean hasSecurity = mLockPatternUtils.isSecure(MY_USER_ID);
-        ArrayList<TrustAgentComponentInfo> agents = getActiveTrustAgents(
-            getActivity(), mTrustAgentManager, mLockPatternUtils, mDPM);
-        for (int i = 0; i < agents.size(); i++) {
-            final TrustAgentComponentInfo agent = agents.get(i);
-            RestrictedPreference trustAgentPreference =
-                    new RestrictedPreference(securityCategory.getContext());
-            trustAgentPreference.setKey(KEY_TRUST_AGENT);
-            trustAgentPreference.setTitle(agent.title);
-            trustAgentPreference.setSummary(agent.summary);
-            // Create intent for this preference.
-            Intent intent = new Intent();
-            intent.setComponent(agent.componentName);
-            intent.setAction(Intent.ACTION_MAIN);
-            trustAgentPreference.setIntent(intent);
-            // Add preference to the settings menu.
-            securityCategory.addPreference(trustAgentPreference);
-
-            trustAgentPreference.setDisabledByAdmin(agent.admin);
-            if (!trustAgentPreference.isDisabledByAdmin() && !hasSecurity) {
-                trustAgentPreference.setEnabled(false);
-                trustAgentPreference.setSummary(R.string.disabled_because_no_backup_security);
-            }
-        }
-        return agents.size();
-    }
-
-    /* Return true if a there is a Slot that has Icc.
-     */
-    private boolean isSimIccReady() {
-        TelephonyManager tm = TelephonyManager.getDefault();
-        final List<SubscriptionInfo> subInfoList =
-                mSubscriptionManager.getActiveSubscriptionInfoList();
-
-        if (subInfoList != null) {
-            for (SubscriptionInfo subInfo : subInfoList) {
-                if (tm.hasIccCard(subInfo.getSimSlotIndex())) {
-                    return true;
-                }
-            }
-        }
-
-        return false;
-    }
-
-    /* Return true if a SIM is ready for locking.
-     * TODO: consider adding to TelephonyManager or SubscritpionManasger.
-     */
-    private boolean isSimReady() {
-        int simState = TelephonyManager.SIM_STATE_UNKNOWN;
-        final List<SubscriptionInfo> subInfoList =
-                mSubscriptionManager.getActiveSubscriptionInfoList();
-        if (subInfoList != null) {
-            for (SubscriptionInfo subInfo : subInfoList) {
-                simState = TelephonyManager.getDefault().getSimState(subInfo.getSimSlotIndex());
-                if((simState != TelephonyManager.SIM_STATE_ABSENT) &&
-                            (simState != TelephonyManager.SIM_STATE_UNKNOWN)){
-                    return true;
-                }
-            }
-        }
-        return false;
-    }
-
-    private static ArrayList<TrustAgentComponentInfo> getActiveTrustAgents(Context context,
-        TrustAgentManager trustAgentManager, LockPatternUtils utils,
-        DevicePolicyManager dpm) {
-        PackageManager pm = context.getPackageManager();
-        ArrayList<TrustAgentComponentInfo> result = new ArrayList<TrustAgentComponentInfo>();
-        List<ResolveInfo> resolveInfos = pm.queryIntentServices(TRUST_AGENT_INTENT,
-                PackageManager.GET_META_DATA);
-        List<ComponentName> enabledTrustAgents = utils.getEnabledTrustAgents(MY_USER_ID);
-
-        EnforcedAdmin admin = RestrictedLockUtils.checkIfKeyguardFeaturesDisabled(context,
-                DevicePolicyManager.KEYGUARD_DISABLE_TRUST_AGENTS, UserHandle.myUserId());
-
-        if (enabledTrustAgents != null && !enabledTrustAgents.isEmpty()) {
-            for (int i = 0; i < resolveInfos.size(); i++) {
-                ResolveInfo resolveInfo = resolveInfos.get(i);
-                if (resolveInfo.serviceInfo == null) continue;
-                if (!trustAgentManager.shouldProvideTrust(resolveInfo, pm)) {
-                    continue;
-                }
-                TrustAgentComponentInfo trustAgentComponentInfo =
-                        TrustAgentUtils.getSettingsComponent(pm, resolveInfo);
-                if (trustAgentComponentInfo.componentName == null ||
-                        !enabledTrustAgents.contains(
-                                TrustAgentUtils.getComponentName(resolveInfo)) ||
-                        TextUtils.isEmpty(trustAgentComponentInfo.title)) continue;
-                if (admin != null && dpm.getTrustAgentConfiguration(
-                        null, TrustAgentUtils.getComponentName(resolveInfo)) == null) {
-                    trustAgentComponentInfo.admin = admin;
-                }
-                result.add(trustAgentComponentInfo);
-                if (ONLY_ONE_TRUST_AGENT) break;
-            }
-        }
-        return result;
-    }
-
-    private static CharSequence getActiveTrustAgentLabel(Context context,
-            TrustAgentManager trustAgentManager, LockPatternUtils utils,
-            DevicePolicyManager dpm) {
-        ArrayList<TrustAgentComponentInfo> agents = getActiveTrustAgents(context,
-                trustAgentManager, utils, dpm);
-        return agents.isEmpty() ? null : agents.get(0).title;
-    }
-
-    @Override
-    public void onGearClick(GearPreference p) {
-        if (KEY_UNLOCK_SET_OR_CHANGE.equals(p.getKey())) {
-            startFragment(this, SecuritySubSettings.class.getName(), 0, 0, null);
-        }
-    }
-
-    @Override
-    public void onSaveInstanceState(Bundle outState) {
-        super.onSaveInstanceState(outState);
-        if (mTrustAgentClickIntent != null) {
-            outState.putParcelable(TRUST_AGENT_CLICK_INTENT, mTrustAgentClickIntent);
-        }
-    }
-
-    @Override
-    public void onResume() {
-        super.onResume();
-
-        // Make sure we reload the preference hierarchy since some of these settings
-        // depend on others...
-        createPreferenceHierarchy();
-
-        if (mVisiblePatternProfile != null) {
-            mVisiblePatternProfile.setChecked(mLockPatternUtils.isVisiblePatternEnabled(
-                    mProfileChallengeUserId));
-        }
-
-        updateUnificationPreference();
-
-        if (mShowPassword != null) {
-            mShowPassword.setChecked(Settings.System.getInt(getContentResolver(),
-                    Settings.System.TEXT_SHOW_PASSWORD, 1) != 0);
-        }
-
-        mLocationcontroller.updateSummary();
-    }
-
-    private void updateUnificationPreference() {
-        if (mUnifyProfile != null) {
-            mUnifyProfile.setChecked(!mLockPatternUtils.isSeparateProfileChallengeEnabled(
-                    mProfileChallengeUserId));
-        }
-    }
-
-    @Override
-    public boolean onPreferenceTreeClick(Preference preference) {
-        final String key = preference.getKey();
-        if (KEY_UNLOCK_SET_OR_CHANGE.equals(key)) {
-            // TODO(b/35930129): Remove once existing password can be passed into vold directly.
-            // Currently we need this logic to ensure that the QUIET_MODE is off for any work
-            // profile with unified challenge on FBE-enabled devices. Otherwise, vold would not be
-            // able to complete the operation due to the lack of (old) encryption key.
-            if (mProfileChallengeUserId != UserHandle.USER_NULL
-                    && !mLockPatternUtils.isSeparateProfileChallengeEnabled(mProfileChallengeUserId)
-                    && StorageManager.isFileEncryptedNativeOnly()) {
-                if (Utils.startQuietModeDialogIfNecessary(this.getActivity(), mUm,
-                        mProfileChallengeUserId)) {
-                    return false;
-                }
-            }
-            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,
-                    mProfileChallengeUserId)) {
-                return false;
-            }
-            Bundle extras = new Bundle();
-            extras.putInt(Intent.EXTRA_USER_ID, mProfileChallengeUserId);
-            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)) {
-            ChooseLockSettingsHelper helper =
-                    new ChooseLockSettingsHelper(this.getActivity(), this);
-            mTrustAgentClickIntent = preference.getIntent();
-            boolean confirmationLaunched = helper.launchConfirmationActivity(
-                    CHANGE_TRUST_AGENT_SETTINGS, preference.getTitle());
-            if (!confirmationLaunched&&  mTrustAgentClickIntent != null) {
-                // If this returns false, it means no password confirmation is required.
-                startActivity(mTrustAgentClickIntent);
-                mTrustAgentClickIntent = null;
-            }
-        } else {
-            // If we didn't handle it, let preferences handle it.
-            return super.onPreferenceTreeClick(preference);
-        }
-        return true;
-    }
-
-    /**
-     * see confirmPatternThenDisableAndClear
-     */
-    @Override
-    public void onActivityResult(int requestCode, int resultCode, Intent data) {
-        super.onActivityResult(requestCode, resultCode, data);
-        if (requestCode == CHANGE_TRUST_AGENT_SETTINGS && resultCode == Activity.RESULT_OK) {
-            if (mTrustAgentClickIntent != null) {
-                startActivity(mTrustAgentClickIntent);
-                mTrustAgentClickIntent = null;
-            }
-            return;
-        } else if (requestCode == UNIFY_LOCK_CONFIRM_DEVICE_REQUEST
-                && resultCode == Activity.RESULT_OK) {
-            mCurrentDevicePassword =
-                    data.getStringExtra(ChooseLockSettingsHelper.EXTRA_KEY_PASSWORD);
-            launchConfirmProfileLockForUnification();
-            return;
-        } else if (requestCode == UNIFY_LOCK_CONFIRM_PROFILE_REQUEST
-                && resultCode == Activity.RESULT_OK) {
-            mCurrentProfilePassword =
-                    data.getStringExtra(ChooseLockSettingsHelper.EXTRA_KEY_PASSWORD);
-            unifyLocks();
-            return;
-        } else if (requestCode == UNUNIFY_LOCK_CONFIRM_DEVICE_REQUEST
-                && resultCode == Activity.RESULT_OK) {
-            ununifyLocks();
-            return;
-        }
-        createPreferenceHierarchy();
-    }
-
-    private void launchConfirmDeviceLockForUnification() {
-        final String title = getActivity().getString(
-                R.string.unlock_set_unlock_launch_picker_title);
-        final ChooseLockSettingsHelper helper =
-                new ChooseLockSettingsHelper(getActivity(), this);
-        if (!helper.launchConfirmationActivity(
-                UNIFY_LOCK_CONFIRM_DEVICE_REQUEST, title, true, MY_USER_ID)) {
-            launchConfirmProfileLockForUnification();
-        }
-    }
-
-    private void launchConfirmProfileLockForUnification() {
-        final String title = getActivity().getString(
-                R.string.unlock_set_unlock_launch_picker_title_profile);
-        final ChooseLockSettingsHelper helper =
-                new ChooseLockSettingsHelper(getActivity(), this);
-        if (!helper.launchConfirmationActivity(
-                UNIFY_LOCK_CONFIRM_PROFILE_REQUEST, title, true, mProfileChallengeUserId)) {
-            unifyLocks();
-            createPreferenceHierarchy();
-        }
-    }
-
-    private void unifyLocks() {
-        int profileQuality =
-                mLockPatternUtils.getKeyguardStoredPasswordQuality(mProfileChallengeUserId);
-        if (profileQuality == DevicePolicyManager.PASSWORD_QUALITY_SOMETHING) {
-            mLockPatternUtils.saveLockPattern(
-                    LockPatternUtils.stringToPattern(mCurrentProfilePassword),
-                    mCurrentDevicePassword, MY_USER_ID);
-        } else {
-            mLockPatternUtils.saveLockPassword(
-                    mCurrentProfilePassword, mCurrentDevicePassword,
-                    profileQuality, MY_USER_ID);
-        }
-        mLockPatternUtils.setSeparateProfileChallengeEnabled(mProfileChallengeUserId, false,
-                mCurrentProfilePassword);
-        final boolean profilePatternVisibility =
-                mLockPatternUtils.isVisiblePatternEnabled(mProfileChallengeUserId);
-        mLockPatternUtils.setVisiblePatternEnabled(profilePatternVisibility, MY_USER_ID);
-        mCurrentDevicePassword = null;
-        mCurrentProfilePassword = null;
-    }
-
-    private void unifyUncompliantLocks() {
-        mLockPatternUtils.setSeparateProfileChallengeEnabled(mProfileChallengeUserId, false,
-                mCurrentProfilePassword);
-        startFragment(this, ChooseLockGenericFragment.class.getName(),
-                R.string.lock_settings_picker_title, SET_OR_CHANGE_LOCK_METHOD_REQUEST, null);
-    }
-
-    private void ununifyLocks() {
-        Bundle extras = new Bundle();
-        extras.putInt(Intent.EXTRA_USER_ID, mProfileChallengeUserId);
-        startFragment(this,
-                ChooseLockGenericFragment.class.getName(),
-                R.string.lock_settings_picker_title_profile,
-                SET_OR_CHANGE_LOCK_METHOD_REQUEST_PROFILE, extras);
-    }
-
-    @Override
-    public boolean onPreferenceChange(Preference preference, Object value) {
-        boolean result = true;
-        final String key = preference.getKey();
-        final LockPatternUtils lockPatternUtils = mChooseLockSettingsHelper.utils();
-        if (KEY_VISIBLE_PATTERN_PROFILE.equals(key)) {
-            if (Utils.startQuietModeDialogIfNecessary(this.getActivity(), mUm,
-                    mProfileChallengeUserId)) {
-                return false;
-            }
-            lockPatternUtils.setVisiblePatternEnabled((Boolean) value, mProfileChallengeUserId);
-        } else if (KEY_UNIFICATION.equals(key)) {
-            if (Utils.startQuietModeDialogIfNecessary(this.getActivity(), mUm,
-                    mProfileChallengeUserId)) {
-                return false;
-            }
-            if ((Boolean) value) {
-                final boolean compliantForDevice =
-                        (mLockPatternUtils.getKeyguardStoredPasswordQuality(mProfileChallengeUserId)
-                                >= DevicePolicyManager.PASSWORD_QUALITY_SOMETHING
-                        && mLockPatternUtils.isSeparateProfileChallengeAllowedToUnify(
-                                mProfileChallengeUserId));
-                UnificationConfirmationDialog dialog =
-                        UnificationConfirmationDialog.newIntance(compliantForDevice);
-                dialog.show(getChildFragmentManager(), TAG_UNIFICATION_DIALOG);
-            } else {
-                final String title = getActivity().getString(
-                        R.string.unlock_set_unlock_launch_picker_title);
-                final ChooseLockSettingsHelper helper =
-                        new ChooseLockSettingsHelper(getActivity(), this);
-                if(!helper.launchConfirmationActivity(
-                        UNUNIFY_LOCK_CONFIRM_DEVICE_REQUEST, title, true, MY_USER_ID)) {
-                    ununifyLocks();
-                }
-            }
-        } else if (KEY_SHOW_PASSWORD.equals(key)) {
-            Settings.System.putInt(getContentResolver(), Settings.System.TEXT_SHOW_PASSWORD,
-                    ((Boolean) value) ? 1 : 0);
-            lockPatternUtils.setVisiblePasswordEnabled((Boolean) value, MY_USER_ID);
-        }
-        return result;
-    }
-
-    @Override
-    protected int getHelpResource() {
-        return R.string.help_url_security;
-    }
-
-    /**
-     * For Search. Please keep it in sync when updating "createPreferenceHierarchy()"
-     */
-    public static final SearchIndexProvider SEARCH_INDEX_DATA_PROVIDER =
-            new SecuritySearchIndexProvider();
-
-    private static class SecuritySearchIndexProvider extends BaseSearchIndexProvider {
-
-        @Override
-        public List<SearchIndexableResource> getXmlResourcesToIndex(
-                Context context, boolean enabled) {
-            final List<SearchIndexableResource> index = new ArrayList<SearchIndexableResource>();
-
-            final LockPatternUtils lockPatternUtils = new LockPatternUtils(context);
-            final ManagedLockPasswordProvider managedPasswordProvider =
-                    ManagedLockPasswordProvider.get(context, MY_USER_ID);
-            final DevicePolicyManager dpm = (DevicePolicyManager)
-                    context.getSystemService(Context.DEVICE_POLICY_SERVICE);
-            final UserManager um = UserManager.get(context);
-            final int profileUserId = Utils.getManagedProfileId(um, MY_USER_ID);
-
-            // To add option for unlock screen, user's password must not be managed and
-            // must not be unified with managed profile, whose password is managed.
-            if (!isPasswordManaged(MY_USER_ID, context, dpm)
-                    && (profileUserId == UserHandle.USER_NULL
-                            || lockPatternUtils.isSeparateProfileChallengeAllowed(profileUserId)
-                            || !isPasswordManaged(profileUserId, context, dpm))) {
-                // Add options for lock/unlock screen
-                final int resId = getResIdForLockUnlockScreen(context, lockPatternUtils,
-                        managedPasswordProvider, MY_USER_ID);
-                index.add(getSearchResource(context, resId));
-            }
-
-            if (profileUserId != UserHandle.USER_NULL
-                    && lockPatternUtils.isSeparateProfileChallengeAllowed(profileUserId)
-                    && !isPasswordManaged(profileUserId, context, dpm)) {
-                index.add(getSearchResource(context, getResIdForLockUnlockScreen(context,
-                        lockPatternUtils, managedPasswordProvider, profileUserId)));
-            }
-
-            final SearchIndexableResource sir = getSearchResource(context,
-                    SecuritySubSettings.getResIdForLockUnlockSubScreen(context, lockPatternUtils,
-                            managedPasswordProvider));
-            sir.className = SecuritySubSettings.class.getName();
-            index.add(sir);
-
-            // Append the rest of the settings
-            index.add(getSearchResource(context, R.xml.security_settings_misc));
-
-            return index;
-        }
-
-        private SearchIndexableResource getSearchResource(Context context, int xmlResId) {
-            final SearchIndexableResource sir = new SearchIndexableResource(context);
-            sir.xmlResId = xmlResId;
-            return sir;
-        }
-
-        private boolean isPasswordManaged(int userId, Context context, DevicePolicyManager dpm) {
-            final EnforcedAdmin admin = RestrictedLockUtils.checkIfPasswordQualityIsSet(
-                    context, userId);
-            return admin != null && dpm.getPasswordQuality(admin.component, userId) ==
-                    DevicePolicyManager.PASSWORD_QUALITY_MANAGED;
-        }
-
-        @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.security_settings_title);
-
-            SearchIndexableRaw data = new SearchIndexableRaw(context);
-            data.title = screenTitle;
-            data.screenTitle = screenTitle;
-            result.add(data);
-
-            final UserManager um = UserManager.get(context);
-
-            // Fingerprint
-            final FingerprintManager fpm = Utils.getFingerprintManagerOrNull(context);
-            if (fpm != null && fpm.isHardwareDetected()) {
-                // This catches the title which can be overloaded in an overlay
-                data = new SearchIndexableRaw(context);
-                data.title = res.getString(R.string.security_settings_fingerprint_preference_title);
-                data.screenTitle = screenTitle;
-                result.add(data);
-                // Fallback for when the above doesn't contain "fingerprint"
-                data = new SearchIndexableRaw(context);
-                data.title = res.getString(R.string.fingerprint_manage_category_title);
-                data.screenTitle = screenTitle;
-                result.add(data);
-            }
-
-            final LockPatternUtils lockPatternUtils = new LockPatternUtils(context);
-            final int profileUserId = Utils.getManagedProfileId(um, MY_USER_ID);
-            if (profileUserId != UserHandle.USER_NULL
-                    && lockPatternUtils.isSeparateProfileChallengeAllowed(profileUserId)) {
-                if (lockPatternUtils.getKeyguardStoredPasswordQuality(profileUserId)
-                        >= DevicePolicyManager.PASSWORD_QUALITY_SOMETHING
-                        && lockPatternUtils.isSeparateProfileChallengeAllowedToUnify(
-                                profileUserId)) {
-                    data = new SearchIndexableRaw(context);
-                    data.title = res.getString(R.string.lock_settings_profile_unification_title);
-                    data.screenTitle = screenTitle;
-                    result.add(data);
-                }
-            }
-
-            // Advanced
-            if (lockPatternUtils.isSecure(MY_USER_ID)) {
-                final TrustAgentManager trustAgentManager =
-                    FeatureFactory.getFactory(context).getSecurityFeatureProvider()
-                        .getTrustAgentManager();
-                final List<TrustAgentComponentInfo> agents =
-                        getActiveTrustAgents(context, trustAgentManager, lockPatternUtils,
-                                context.getSystemService(DevicePolicyManager.class));
-                for (int i = 0; i < agents.size(); i++) {
-                    final TrustAgentComponentInfo agent = agents.get(i);
-                    data = new SearchIndexableRaw(context);
-                    data.title = agent.title;
-                    data.screenTitle = screenTitle;
-                    result.add(data);
-                }
-            }
-            return result;
-        }
-
-        @Override
-        public List<String> getNonIndexableKeys(Context context) {
-            final List<String> keys = super.getNonIndexableKeys(context);
-
-            LockPatternUtils lockPatternUtils = new LockPatternUtils(context);
-
-            // Do not display SIM lock for devices without an Icc card
-            final UserManager um = UserManager.get(context);
-            final TelephonyManager tm = TelephonyManager.from(context);
-            if (!um.isAdminUser() || !tm.hasIccCard()) {
-                keys.add(KEY_SIM_LOCK);
-            }
-
-            // TrustAgent settings disappear when the user has no primary security.
-            if (!lockPatternUtils.isSecure(MY_USER_ID)) {
-                keys.add(KEY_TRUST_AGENT);
-                keys.add(KEY_MANAGE_TRUST_AGENTS);
-            }
-
-            if (!(new EnterprisePrivacyPreferenceController(context, null /* lifecycle */))
-                    .isAvailable()) {
-                keys.add(KEY_ENTERPRISE_PRIVACY);
-            }
-
-            // Duplicate in special app access
-            keys.add(KEY_MANAGE_DEVICE_ADMIN);
-            // Duplicates between parent-child
-            keys.add(KEY_LOCATION);
-            keys.add(KEY_ENCRYPTION_AND_CREDENTIALS);
-            keys.add(KEY_SCREEN_PINNING);
-            keys.add(KEY_LOCATION_SCANNING);
-
-            return keys;
-        }
-    }
-
-    public static class SecuritySubSettings extends SettingsPreferenceFragment
-            implements OnPreferenceChangeListener, OwnerInfoPreferenceController.OwnerInfoCallback {
-
-        private static final String KEY_VISIBLE_PATTERN = "visiblepattern";
-        private static final String KEY_LOCK_AFTER_TIMEOUT = "lock_after_timeout";
-        private static final String KEY_POWER_INSTANTLY_LOCKS = "power_button_instantly_locks";
-
-        // These switch preferences need special handling since they're not all stored in Settings.
-        private static final String SWITCH_PREFERENCE_KEYS[] = { KEY_LOCK_AFTER_TIMEOUT,
-                KEY_VISIBLE_PATTERN, KEY_POWER_INSTANTLY_LOCKS };
-
-        private TimeoutListPreference mLockAfter;
-        private SwitchPreference mVisiblePattern;
-        private SwitchPreference mPowerButtonInstantlyLocks;
-
-        private TrustAgentManager mTrustAgentManager;
-        private LockPatternUtils mLockPatternUtils;
-        private DevicePolicyManager mDPM;
-        private OwnerInfoPreferenceController mOwnerInfoPreferenceController;
-
-        @Override
-        public int getMetricsCategory() {
-            return MetricsEvent.SECURITY;
-        }
-
-        @Override
-        public void onCreate(Bundle icicle) {
-            super.onCreate(icicle);
-            SecurityFeatureProvider securityFeatureProvider =
-                    FeatureFactory.getFactory(getActivity()).getSecurityFeatureProvider();
-            mTrustAgentManager = securityFeatureProvider.getTrustAgentManager();
-            mLockPatternUtils = new LockPatternUtils(getContext());
-            mDPM = getContext().getSystemService(DevicePolicyManager.class);
-            mOwnerInfoPreferenceController =
-                new OwnerInfoPreferenceController(getContext(), this, null /* lifecycle */);
-            createPreferenceHierarchy();
-        }
-
-        @Override
-        public void onResume() {
-            super.onResume();
-
-            createPreferenceHierarchy();
-
-            if (mVisiblePattern != null) {
-                mVisiblePattern.setChecked(mLockPatternUtils.isVisiblePatternEnabled(
-                        MY_USER_ID));
-            }
-            if (mPowerButtonInstantlyLocks != null) {
-                mPowerButtonInstantlyLocks.setChecked(
-                        mLockPatternUtils.getPowerButtonInstantlyLocks(MY_USER_ID));
-            }
-
-            mOwnerInfoPreferenceController.updateSummary();
-        }
-
-        @Override
-        public void onActivityResult(int requestCode, int resultCode, Intent data) {
-            super.onActivityResult(requestCode, resultCode, data);
-
-            createPreferenceHierarchy();
-        }
-
-        private void createPreferenceHierarchy() {
-            PreferenceScreen root = getPreferenceScreen();
-            if (root != null) {
-                root.removeAll();
-            }
-
-            final int resid = getResIdForLockUnlockSubScreen(getActivity(),
-                    new LockPatternUtils(getContext()),
-                    ManagedLockPasswordProvider.get(getContext(), MY_USER_ID));
-            addPreferencesFromResource(resid);
-
-            // lock after preference
-            mLockAfter = (TimeoutListPreference) findPreference(KEY_LOCK_AFTER_TIMEOUT);
-            if (mLockAfter != null) {
-                setupLockAfterPreference();
-                updateLockAfterPreferenceSummary();
-            }
-
-            // visible pattern
-            mVisiblePattern = (SwitchPreference) findPreference(KEY_VISIBLE_PATTERN);
-
-            // lock instantly on power key press
-            mPowerButtonInstantlyLocks = (SwitchPreference) findPreference(
-                    KEY_POWER_INSTANTLY_LOCKS);
-            CharSequence trustAgentLabel = getActiveTrustAgentLabel(getContext(),
-                    mTrustAgentManager, mLockPatternUtils, mDPM);
-            if (mPowerButtonInstantlyLocks != null && !TextUtils.isEmpty(trustAgentLabel)) {
-                mPowerButtonInstantlyLocks.setSummary(getString(
-                        R.string.lockpattern_settings_power_button_instantly_locks_summary,
-                        trustAgentLabel));
-            }
-
-            mOwnerInfoPreferenceController.displayPreference(getPreferenceScreen());
-            mOwnerInfoPreferenceController.updateEnableState();
-
-            for (int i = 0; i < SWITCH_PREFERENCE_KEYS.length; i++) {
-                final Preference pref = findPreference(SWITCH_PREFERENCE_KEYS[i]);
-                if (pref != null) pref.setOnPreferenceChangeListener(this);
-            }
-        }
-
-        private void setupLockAfterPreference() {
-            // Compatible with pre-Froyo
-            long currentTimeout = Settings.Secure.getLong(getContentResolver(),
-                    Settings.Secure.LOCK_SCREEN_LOCK_AFTER_TIMEOUT, 5000);
-            mLockAfter.setValue(String.valueOf(currentTimeout));
-            mLockAfter.setOnPreferenceChangeListener(this);
-            if (mDPM != null) {
-                final EnforcedAdmin admin = RestrictedLockUtils.checkIfMaximumTimeToLockIsSet(
-                        getActivity());
-                final long adminTimeout = mDPM
-                        .getMaximumTimeToLockForUserAndProfiles(UserHandle.myUserId());
-                final long displayTimeout = Math.max(0,
-                        Settings.System.getInt(getContentResolver(), SCREEN_OFF_TIMEOUT, 0));
-                // This setting is a slave to display timeout when a device policy is enforced.
-                // As such, maxLockTimeout = adminTimeout - displayTimeout.
-                // If there isn't enough time, shows "immediately" setting.
-                final long maxTimeout = Math.max(0, adminTimeout - displayTimeout);
-                mLockAfter.removeUnusableTimeouts(maxTimeout, admin);
-            }
-        }
-
-        private void updateLockAfterPreferenceSummary() {
-            final String summary;
-            if (mLockAfter.isDisabledByAdmin()) {
-                summary = getString(R.string.disabled_by_policy_title);
-            } else {
-                // Update summary message with current value
-                long currentTimeout = Settings.Secure.getLong(getContentResolver(),
-                        Settings.Secure.LOCK_SCREEN_LOCK_AFTER_TIMEOUT, 5000);
-                final CharSequence[] entries = mLockAfter.getEntries();
-                final CharSequence[] values = mLockAfter.getEntryValues();
-                int best = 0;
-                for (int i = 0; i < values.length; i++) {
-                    long timeout = Long.valueOf(values[i].toString());
-                    if (currentTimeout >= timeout) {
-                        best = i;
-                    }
-                }
-
-                CharSequence trustAgentLabel = getActiveTrustAgentLabel(getContext(),
-                        mTrustAgentManager, mLockPatternUtils, mDPM);
-                if (!TextUtils.isEmpty(trustAgentLabel)) {
-                    if (Long.valueOf(values[best].toString()) == 0) {
-                        summary = getString(R.string.lock_immediately_summary_with_exception,
-                                trustAgentLabel);
-                    } else {
-                        summary = getString(R.string.lock_after_timeout_summary_with_exception,
-                                entries[best], trustAgentLabel);
-                    }
-                } else {
-                    summary = getString(R.string.lock_after_timeout_summary, entries[best]);
-                }
-            }
-            mLockAfter.setSummary(summary);
-        }
-
-        @Override
-        public void onOwnerInfoUpdated() {
-            mOwnerInfoPreferenceController.updateSummary();
-        }
-
-        private static int getResIdForLockUnlockSubScreen(Context context,
-                LockPatternUtils lockPatternUtils,
-                ManagedLockPasswordProvider managedPasswordProvider) {
-            if (lockPatternUtils.isSecure(MY_USER_ID)) {
-                switch (lockPatternUtils.getKeyguardStoredPasswordQuality(MY_USER_ID)) {
-                    case DevicePolicyManager.PASSWORD_QUALITY_SOMETHING:
-                        return R.xml.security_settings_pattern_sub;
-                    case DevicePolicyManager.PASSWORD_QUALITY_NUMERIC:
-                    case DevicePolicyManager.PASSWORD_QUALITY_NUMERIC_COMPLEX:
-                        return R.xml.security_settings_pin_sub;
-                    case DevicePolicyManager.PASSWORD_QUALITY_ALPHABETIC:
-                    case DevicePolicyManager.PASSWORD_QUALITY_ALPHANUMERIC:
-                    case DevicePolicyManager.PASSWORD_QUALITY_COMPLEX:
-                        return R.xml.security_settings_password_sub;
-                    case DevicePolicyManager.PASSWORD_QUALITY_MANAGED:
-                        return managedPasswordProvider.getResIdForLockUnlockSubScreen();
-                }
-            } else if (!lockPatternUtils.isLockScreenDisabled(MY_USER_ID)) {
-                return R.xml.security_settings_slide_sub;
-            }
-            return 0;
-        }
-
-        @Override
-        public boolean onPreferenceChange(Preference preference, Object value) {
-            String key = preference.getKey();
-            if (KEY_POWER_INSTANTLY_LOCKS.equals(key)) {
-                mLockPatternUtils.setPowerButtonInstantlyLocks((Boolean) value, MY_USER_ID);
-            } else if (KEY_LOCK_AFTER_TIMEOUT.equals(key)) {
-                int timeout = Integer.parseInt((String) value);
-                try {
-                    Settings.Secure.putInt(getContentResolver(),
-                            Settings.Secure.LOCK_SCREEN_LOCK_AFTER_TIMEOUT, timeout);
-                } catch (NumberFormatException e) {
-                    Log.e("SecuritySettings", "could not persist lockAfter timeout setting", e);
-                }
-                setupLockAfterPreference();
-                updateLockAfterPreferenceSummary();
-            } else if (KEY_VISIBLE_PATTERN.equals(key)) {
-                mLockPatternUtils.setVisiblePatternEnabled((Boolean) value, MY_USER_ID);
-            }
-            return true;
-        }
-    }
-
-    public static class UnificationConfirmationDialog extends InstrumentedDialogFragment {
-        private static final String EXTRA_COMPLIANT = "compliant";
-
-        public static UnificationConfirmationDialog newIntance(boolean compliant) {
-            UnificationConfirmationDialog dialog = new UnificationConfirmationDialog();
-            Bundle args = new Bundle();
-            args.putBoolean(EXTRA_COMPLIANT, compliant);
-            dialog.setArguments(args);
-            return dialog;
-        }
-
-        @Override
-        public void show(FragmentManager manager, String tag) {
-            if (manager.findFragmentByTag(tag) == null) {
-                // Prevent opening multiple dialogs if tapped on button quickly
-                super.show(manager, tag);
-            }
-        }
-
-        @Override
-        public Dialog onCreateDialog(Bundle savedInstanceState) {
-            final SecuritySettings parentFragment = ((SecuritySettings) getParentFragment());
-            final boolean compliant = getArguments().getBoolean(EXTRA_COMPLIANT);
-            return new AlertDialog.Builder(getActivity())
-                    .setTitle(R.string.lock_settings_profile_unification_dialog_title)
-                    .setMessage(compliant ? R.string.lock_settings_profile_unification_dialog_body
-                            : R.string.lock_settings_profile_unification_dialog_uncompliant_body)
-                    .setPositiveButton(
-                            compliant ? R.string.lock_settings_profile_unification_dialog_confirm
-                            : R.string.lock_settings_profile_unification_dialog_uncompliant_confirm,
-                            new DialogInterface.OnClickListener() {
-                                @Override
-                                public void onClick(DialogInterface dialog, int whichButton) {
-                                    if (compliant) {
-                                        parentFragment.launchConfirmDeviceLockForUnification();
-                                    }    else {
-                                        parentFragment.unifyUncompliantLocks();
-                                    }
-                                }
-                            }
-                    )
-                    .setNegativeButton(R.string.cancel, null)
-                    .create();
-        }
-
-        @Override
-        public void onDismiss(DialogInterface dialog) {
-            super.onDismiss(dialog);
-            ((SecuritySettings) getParentFragment()).updateUnificationPreference();
-        }
-
-        @Override
-        public int getMetricsCategory() {
-            return MetricsEvent.DIALOG_UNIFICATION_CONFIRMATION;
-        }
-    }
-
-    static class SummaryProvider implements SummaryLoader.SummaryProvider {
-
-        private final Context mContext;
-        private final SummaryLoader mSummaryLoader;
-
-        public SummaryProvider(Context context, SummaryLoader summaryLoader) {
-            mContext = context;
-            mSummaryLoader = summaryLoader;
-        }
-
-        @Override
-        public void setListening(boolean listening) {
-            if (listening) {
-                final FingerprintManager fpm =
-                    Utils.getFingerprintManagerOrNull(mContext);
-                if (fpm != null && fpm.isHardwareDetected()) {
-                    mSummaryLoader.setSummary(this,
-                        mContext.getString(R.string.security_dashboard_summary));
-                } else {
-                    mSummaryLoader.setSummary(this, mContext.getString(
-                        R.string.security_dashboard_summary_no_fingerprint));
-                }
-            }
-        }
-    }
-
-    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);
-        }
-    };
-
-}
diff --git a/src/com/android/settings/Settings.java b/src/com/android/settings/Settings.java
index ee041e8..da35c4b 100644
--- a/src/com/android/settings/Settings.java
+++ b/src/com/android/settings/Settings.java
@@ -16,12 +16,12 @@
 
 package com.android.settings;
 
-import android.os.Bundle;
+import static com.android.settings.core.FeatureFlags.CONNECTED_DEVICE_V2;
 
-import com.android.settings.applications.AppOpsSummary;
+import android.os.Bundle;
+import android.util.FeatureFlagUtils;
+
 import com.android.settings.enterprise.EnterprisePrivacySettings;
-import com.android.settings.fingerprint.FingerprintEnrollIntroduction;
-import com.android.settings.password.ChooseLockGeneric;
 
 /**
  * Top-level Settings activity
@@ -57,20 +57,10 @@
     public static class ApplicationSettingsActivity extends SettingsActivity { /* empty */ }
     public static class ManageApplicationsActivity extends SettingsActivity { /* empty */ }
     public static class ManageAssistActivity extends SettingsActivity { /* empty */ }
-    public static class AllApplicationsActivity extends SettingsActivity { /* empty */ }
     public static class HighPowerApplicationsActivity extends SettingsActivity { /* empty */ }
-    public static class AppOpsSummaryActivity extends SettingsActivity {
-        @Override
-        public boolean isValidFragment(String className) {
-            if (AppOpsSummary.class.getName().equals(className)) {
-                return true;
-            }
-            return super.isValidFragment(className);
-        }
-    }
     public static class BackgroundCheckSummaryActivity extends SettingsActivity { /* empty */ }
     public static class StorageUseActivity extends SettingsActivity { /* empty */ }
-    public static class DevelopmentSettingsActivity extends SettingsActivity { /* empty */ }
+    public static class DevelopmentSettingsDashboardActivity extends SettingsActivity { /* empty */ }
     public static class AccessibilitySettingsActivity extends SettingsActivity { /* empty */ }
     public static class CaptioningSettingsActivity extends SettingsActivity { /* empty */ }
     public static class AccessibilityInversionSettingsActivity extends SettingsActivity { /* empty */ }
@@ -99,7 +89,6 @@
     public static class DreamSettingsActivity extends SettingsActivity { /* empty */ }
     public static class NotificationStationActivity extends SettingsActivity { /* empty */ }
     public static class UserSettingsActivity extends SettingsActivity { /* empty */ }
-    public static class SpecialAccessSettingsActivity extends SettingsActivity { /* empty */ }
     public static class NotificationAccessSettingsActivity extends SettingsActivity { /* empty */ }
     public static class VrListenersSettingsActivity extends SettingsActivity { /* empty */ }
     public static class PictureInPictureSettingsActivity extends SettingsActivity { /* empty */ }
@@ -112,17 +101,17 @@
     public static class PrintSettingsActivity extends SettingsActivity { /* empty */ }
     public static class PrintJobSettingsActivity extends SettingsActivity { /* empty */ }
     public static class ZenModeSettingsActivity extends SettingsActivity { /* empty */ }
-    public static class ZenModePrioritySettingsActivity extends SettingsActivity { /* empty */ }
+    public static class ZenModeBehaviorSettingsActivity extends SettingsActivity { /* empty */ }
     public static class ZenModeAutomationSettingsActivity extends SettingsActivity { /* empty */ }
     public static class ZenModeScheduleRuleSettingsActivity extends SettingsActivity { /* empty */ }
     public static class ZenModeEventRuleSettingsActivity extends SettingsActivity { /* empty */ }
     public static class ZenModeExternalRuleSettingsActivity extends SettingsActivity { /* empty */ }
-    public static class ZenModeVisualInterruptionSettingsActivity extends SettingsActivity { /* empty */}
     public static class SoundSettingsActivity extends SettingsActivity { /* empty */ }
     public static class ConfigureNotificationSettingsActivity extends SettingsActivity { /* empty */ }
     public static class NotificationAppListActivity extends SettingsActivity { /* empty */ }
     public static class AppNotificationSettingsActivity extends SettingsActivity { /* empty */ }
     public static class ChannelNotificationSettingsActivity extends SettingsActivity { /* empty */ }
+    public static class ChannelGroupNotificationSettingsActivity extends SettingsActivity { /* empty */ }
     public static class ManageDomainUrlsActivity extends SettingsActivity { /* empty */ }
     public static class AutomaticStorageManagerSettingsActivity extends SettingsActivity { /* empty */ }
     public static class GamesStorageActivity extends SettingsActivity { /* empty */ }
@@ -145,12 +134,6 @@
     public static class ManageExternalSourcesActivity extends SettingsActivity {
         /* empty */ }
     public static class ManageAppExternalSourcesActivity extends SettingsActivity { /* empty */ }
-
-    public static class WifiCallingSuggestionActivity extends SettingsActivity { /* 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 */ }
@@ -185,7 +168,12 @@
 
     // Top level categories for new IA
     public static class NetworkDashboardActivity extends SettingsActivity {}
-    public static class ConnectedDeviceDashboardActivity extends SettingsActivity {}
+    public static class ConnectedDeviceDashboardActivity extends SettingsActivity {
+        public static final boolean isEnabled() {
+            return FeatureFlagUtils.isEnabled(null /* context */, CONNECTED_DEVICE_V2);
+        }
+    }
+    public static class ConnectedDeviceDashboardActivityOld extends SettingsActivity {}
     public static class AppAndNotificationDashboardActivity extends SettingsActivity {}
     public static class StorageDashboardActivity extends SettingsActivity {}
     public static class UserAndAccountDashboardActivity extends SettingsActivity {}
diff --git a/src/com/android/settings/SettingsActivity.java b/src/com/android/settings/SettingsActivity.java
index 609120d..dc961be 100644
--- a/src/com/android/settings/SettingsActivity.java
+++ b/src/com/android/settings/SettingsActivity.java
@@ -39,6 +39,7 @@
 import android.os.UserManager;
 import android.support.annotation.VisibleForTesting;
 import android.support.v14.preference.PreferenceFragment;
+import android.support.v4.content.LocalBroadcastManager;
 import android.support.v7.preference.Preference;
 import android.support.v7.preference.PreferenceManager;
 import android.text.TextUtils;
@@ -49,21 +50,23 @@
 import android.view.ViewGroup;
 import android.widget.Button;
 import android.widget.Toolbar;
+
 import com.android.internal.util.ArrayUtils;
 import com.android.settings.Settings.WifiSettingsActivity;
+import com.android.settings.applications.manageapplications.ManageApplications;
 import com.android.settings.backup.BackupSettingsActivity;
 import com.android.settings.core.gateway.SettingsGateway;
 import com.android.settings.core.instrumentation.MetricsFeatureProvider;
 import com.android.settings.core.instrumentation.SharedPreferencesLogger;
 import com.android.settings.dashboard.DashboardFeatureProvider;
 import com.android.settings.dashboard.DashboardSummary;
-import com.android.settings.development.DevelopmentSettings;
 import com.android.settings.overlay.FeatureFactory;
-import com.android.settings.search.SearchActivity;
 import com.android.settings.wfd.WifiDisplaySettings;
 import com.android.settings.widget.SwitchBar;
+import com.android.settingslib.development.DevelopmentSettingsEnabler;
 import com.android.settingslib.drawer.DashboardCategory;
 import com.android.settingslib.drawer.SettingsDrawerActivity;
+
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Set;
@@ -71,7 +74,7 @@
 public class SettingsActivity extends SettingsDrawerActivity
         implements PreferenceManager.OnPreferenceTreeClickListener,
         PreferenceFragment.OnPreferenceStartFragmentCallback,
-        ButtonBarHandler, FragmentManager.OnBackStackChangedListener, OnClickListener {
+        ButtonBarHandler, FragmentManager.OnBackStackChangedListener {
 
     private static final String LOG_TAG = "Settings";
 
@@ -161,8 +164,7 @@
             "android.settings.APPLICATION_DETAILS_SETTINGS"
     };
 
-    private SharedPreferences mDevelopmentPreferences;
-    private SharedPreferences.OnSharedPreferenceChangeListener mDevelopmentPreferencesListener;
+    private BroadcastReceiver mDevelopmentSettingsListener;
 
     private boolean mBatteryPresent = true;
     private BroadcastReceiver mBatteryInfoReceiver = new BroadcastReceiver() {
@@ -206,8 +208,7 @@
 
     @Override
     public boolean onPreferenceStartFragment(PreferenceFragment caller, Preference pref) {
-        startPreferencePanel(caller, pref.getFragment(), pref.getExtras(), -1, pref.getTitle(),
-                null, 0);
+        startPreferencePanel(caller, pref.getFragment(), pref.getExtras(), -1, null, null, 0);
         return true;
     }
 
@@ -269,9 +270,6 @@
             getWindow().setUiOptions(intent.getIntExtra(EXTRA_UI_OPTIONS, 0));
         }
 
-        mDevelopmentPreferences = getSharedPreferences(DevelopmentSettings.PREF_FILE,
-                Context.MODE_PRIVATE);
-
         // Getting Intent properties can only be done after the super.onCreate(...)
         final String initialFragmentName = intent.getStringExtra(EXTRA_SHOW_FRAGMENT);
 
@@ -324,8 +322,9 @@
         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);
+            final Toolbar toolbar = findViewById(R.id.search_action_bar);
+            FeatureFactory.getFactory(this).getSearchFeatureProvider()
+                    .initSearchToolbar(this, toolbar);
             setActionBar(toolbar);
 
             // Please forgive me for what I am about to do.
@@ -341,6 +340,7 @@
         if (actionBar != null) {
             actionBar.setDisplayHomeAsUpEnabled(mDisplayHomeAsUpEnabled);
             actionBar.setHomeButtonEnabled(mDisplayHomeAsUpEnabled);
+            actionBar.setDisplayShowTitleEnabled(!mIsShowingDashboard);
         }
         mSwitchBar = findViewById(R.id.switch_bar);
         if (mSwitchBar != null) {
@@ -525,9 +525,14 @@
     protected void onResume() {
         super.onResume();
 
-        mDevelopmentPreferencesListener = (sharedPreferences, key) -> updateTilesList();
-        mDevelopmentPreferences.registerOnSharedPreferenceChangeListener(
-                mDevelopmentPreferencesListener);
+        mDevelopmentSettingsListener = new BroadcastReceiver() {
+            @Override
+            public void onReceive(Context context, Intent intent) {
+                updateTilesList();
+            }
+        };
+        LocalBroadcastManager.getInstance(this).registerReceiver(mDevelopmentSettingsListener,
+                new IntentFilter(DevelopmentSettingsEnabler.DEVELOPMENT_SETTINGS_CHANGED_ACTION));
 
         registerReceiver(mBatteryInfoReceiver, new IntentFilter(Intent.ACTION_BATTERY_CHANGED));
 
@@ -537,9 +542,8 @@
     @Override
     protected void onPause() {
         super.onPause();
-        mDevelopmentPreferences.unregisterOnSharedPreferenceChangeListener(
-                mDevelopmentPreferencesListener);
-        mDevelopmentPreferencesListener = null;
+        LocalBroadcastManager.getInstance(this).unregisterReceiver(mDevelopmentSettingsListener);
+        mDevelopmentSettingsListener = null;
         unregisterReceiver(mBatteryInfoReceiver);
     }
 
@@ -591,11 +595,10 @@
         String intentClass = intent.getComponent().getClassName();
         if (intentClass.equals(getClass().getName())) return null;
 
-        if ("com.android.settings.ManageApplications".equals(intentClass)
-                || "com.android.settings.RunningServices".equals(intentClass)
+        if ("com.android.settings.RunningServices".equals(intentClass)
                 || "com.android.settings.applications.StorageUse".equals(intentClass)) {
             // Old names of manage apps.
-            intentClass = com.android.settings.applications.ManageApplications.class.getName();
+            intentClass = ManageApplications.class.getName();
         }
 
         return intentClass;
@@ -623,13 +626,8 @@
     public void startPreferencePanel(Fragment caller, String fragmentClass, Bundle args,
             int titleRes, CharSequence titleText, Fragment resultTo, int resultRequestCode) {
         String title = null;
-        if (titleRes < 0) {
-            if (titleText != null) {
-                title = titleText.toString();
-            } else {
-                // There not much we can do in that case
-                title = "";
-            }
+        if (titleRes < 0 && titleText != null) {
+            title = titleText.toString();
         }
         Utils.startWithFragment(this, fragmentClass, args, resultTo, resultRequestCode,
                 titleRes, title, mIsShortcut, mMetricsFeatureProvider.getMetricsCategory(caller));
@@ -792,6 +790,21 @@
                 Utils.isBandwidthControlEnabled() /* enabled */,
                 isAdmin) || somethingChanged;
 
+        final boolean isConnectedDeviceV2Enabled =
+                Settings.ConnectedDeviceDashboardActivity.isEnabled();
+        // Enable new connected page if v2 enabled
+        somethingChanged = setTileEnabled(
+                new ComponentName(packageName,
+                        Settings.ConnectedDeviceDashboardActivity.class.getName()),
+                isConnectedDeviceV2Enabled && !UserManager.isDeviceInDemoMode(this) /* enabled */,
+                isAdmin) || somethingChanged;
+        // Enable old connected page if v2 disabled
+        somethingChanged = setTileEnabled(
+                new ComponentName(packageName,
+                        Settings.ConnectedDeviceDashboardActivityOld.class.getName()),
+                !isConnectedDeviceV2Enabled && !UserManager.isDeviceInDemoMode(this) /* enabled */,
+                isAdmin) || somethingChanged;
+
         somethingChanged = setTileEnabled(new ComponentName(packageName,
                         Settings.SimSettingsActivity.class.getName()),
                 Utils.showSimCardTile(this), isAdmin)
@@ -813,11 +826,6 @@
                 || somethingChanged;
 
         somethingChanged = setTileEnabled(new ComponentName(packageName,
-                        Settings.ConnectedDeviceDashboardActivity.class.getName()),
-                !UserManager.isDeviceInDemoMode(this), isAdmin)
-                || somethingChanged;
-
-        somethingChanged = setTileEnabled(new ComponentName(packageName,
                         Settings.DateTimeSettingsActivity.class.getName()),
                 !UserManager.isDeviceInDemoMode(this), isAdmin)
                 || somethingChanged;
@@ -827,11 +835,12 @@
                 pm.hasSystemFeature(PackageManager.FEATURE_PRINTING), isAdmin)
                 || somethingChanged;
 
-        final boolean showDev = mDevelopmentPreferences.getBoolean(
-                DevelopmentSettings.PREF_SHOW, android.os.Build.TYPE.equals("eng"))
-                && !um.hasUserRestriction(UserManager.DISALLOW_DEBUGGING_FEATURES);
+        final boolean showDev = DevelopmentSettingsEnabler.isDevelopmentSettingsEnabled(this)
+                && !um.hasUserRestriction(UserManager.DISALLOW_DEBUGGING_FEATURES)
+                && !Utils.isMonkeyRunning();
+
         somethingChanged = setTileEnabled(new ComponentName(packageName,
-                        Settings.DevelopmentSettingsActivity.class.getName()),
+                        Settings.DevelopmentSettingsDashboardActivity.class.getName()),
                 showDev, isAdmin)
                 || somethingChanged;
 
@@ -945,10 +954,4 @@
 
         return bitmap;
     }
-
-    @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 a3d26af..d9e264b 100644
--- a/src/com/android/settings/SettingsPreferenceFragment.java
+++ b/src/com/android/settings/SettingsPreferenceFragment.java
@@ -39,8 +39,6 @@
 import android.util.ArrayMap;
 import android.util.Log;
 import android.view.LayoutInflater;
-import android.view.Menu;
-import android.view.MenuInflater;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.Button;
@@ -49,10 +47,12 @@
 import com.android.settings.core.InstrumentedPreferenceFragment;
 import com.android.settings.core.instrumentation.Instrumentable;
 import com.android.settings.core.instrumentation.InstrumentedDialogFragment;
+import com.android.settings.search.actionbar.SearchMenuController;
+import com.android.settings.support.actionbar.HelpMenuController;
+import com.android.settings.support.actionbar.HelpResourceProvider;
 import com.android.settings.widget.LoadingViewController;
 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;
@@ -61,13 +61,7 @@
  * Base class for Settings fragments, with some helper functions and dialog management.
  */
 public abstract class SettingsPreferenceFragment extends InstrumentedPreferenceFragment
-        implements DialogCreatable {
-
-    /**
-     * The Help Uri Resource key. This can be passed as an extra argument when creating the
-     * Fragment.
-     **/
-    public static final String HELP_URI_RESOURCE_KEY = "help_uri_resource";
+        implements DialogCreatable, HelpResourceProvider {
 
     private static final String TAG = "SettingsPreference";
 
@@ -79,13 +73,11 @@
     protected final FooterPreferenceMixin mFooterPreferenceMixin =
             new FooterPreferenceMixin(this, getLifecycle());
 
-    private SettingsDialogFragment mDialogFragment;
-
-    private String mHelpUri;
 
     private static final int ORDER_FIRST = -1;
     private static final int ORDER_LAST = Integer.MAX_VALUE -1;
 
+    private SettingsDialogFragment mDialogFragment;
     // Cache the content resolver for async callbacks
     private ContentResolver mContentResolver;
 
@@ -144,21 +136,23 @@
     @Override
     public void onCreate(Bundle icicle) {
         super.onCreate(icicle);
+        SearchMenuController.init(this /* host */);
+        HelpMenuController.init(this /* host */);
 
         if (icicle != null) {
             mPreferenceHighlighted = icicle.getBoolean(SAVE_HIGHLIGHTED_KEY);
         }
+        final Bundle arguments = getArguments();
 
-        // Prepare help url and enable menu if necessary
-        Bundle arguments = getArguments();
-        int helpResource;
-        if (arguments != null && arguments.containsKey(HELP_URI_RESOURCE_KEY)) {
-            helpResource = arguments.getInt(HELP_URI_RESOURCE_KEY);
-        } else {
-            helpResource = getHelpResource();
-        }
-        if (helpResource != 0) {
-            mHelpUri = getResources().getString(helpResource);
+        // Check if we should keep the preferences expanded.
+        if (arguments != null) {
+            mPreferenceKey = arguments.getString(SettingsActivity.EXTRA_FRAGMENT_ARG_KEY);
+            if (!TextUtils.isEmpty(mPreferenceKey)) {
+                final PreferenceScreen screen = getPreferenceScreen();
+                if (screen != null) {
+                    screen.setInitialExpandedChildrenCount(Integer.MAX_VALUE);
+                }
+            }
         }
     }
 
@@ -166,8 +160,8 @@
     public View onCreateView(LayoutInflater inflater, ViewGroup container,
             Bundle savedInstanceState) {
         final View root = super.onCreateView(inflater, container, savedInstanceState);
-        mPinnedHeaderFrameLayout = (ViewGroup) root.findViewById(R.id.pinned_header);
-        mButtonBar = (ViewGroup) root.findViewById(R.id.button_bar);
+        mPinnedHeaderFrameLayout = root.findViewById(R.id.pinned_header);
+        mButtonBar = root.findViewById(R.id.button_bar);
         return root;
     }
 
@@ -224,9 +218,7 @@
     public void onResume() {
         super.onResume();
 
-        final Bundle args = getArguments();
-        if (args != null) {
-            mPreferenceKey = args.getString(SettingsActivity.EXTRA_FRAGMENT_ARG_KEY);
+        if (mPreferenceKey != null) {
             highlightPreferenceIfNeeded();
         }
     }
@@ -456,22 +448,6 @@
         return false;
     }
 
-    /**
-     * Override this if you want to show a help item in the menu, by returning the resource id.
-     * @return the resource id for the help url
-     */
-    protected int getHelpResource() {
-        return R.string.help_uri_default;
-    }
-
-    @Override
-    public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
-        super.onCreateOptionsMenu(menu, inflater);
-        if (mHelpUri != null && getActivity() != null) {
-            HelpUtils.prepareHelpMenuItem(getActivity(), menu, mHelpUri, getClass().getName());
-        }
-    }
-
     /*
      * The name is intentionally made different from Activity#finish(), so that
      * users won't misunderstand its meaning.
diff --git a/src/com/android/settings/SettingsSliceProvider.java b/src/com/android/settings/SettingsSliceProvider.java
new file mode 100644
index 0000000..845dacd
--- /dev/null
+++ b/src/com/android/settings/SettingsSliceProvider.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;
+
+import android.app.PendingIntent;
+import android.app.slice.Slice;
+import android.app.slice.SliceProvider;
+import android.content.ContentResolver;
+import android.content.Context;
+import android.content.Intent;
+import android.graphics.drawable.Icon;
+import android.net.Uri;
+import android.net.wifi.WifiInfo;
+import android.net.wifi.WifiManager;
+
+public class SettingsSliceProvider extends SliceProvider {
+    public static final String SLICE_AUTHORITY = "com.android.settings.slices";
+
+    public static final String PATH_WIFI = "wifi";
+    public static final String ACTION_WIFI_CHANGED =
+            "com.android.settings.slice.action.WIFI_CHANGED";
+    // TODO -- Associate slice URI with search result instead of separate hardcoded thing
+    public static final String[] WIFI_SEARCH_TERMS = {"wi-fi", "wifi", "internet"};
+
+    public static Uri getUri(String path) {
+        return new Uri.Builder()
+                .scheme(ContentResolver.SCHEME_CONTENT)
+                .authority(SLICE_AUTHORITY)
+                .appendPath(path).build();
+    }
+
+    @Override
+    public boolean onCreate() {
+        return true;
+    }
+
+    @Override
+    public Slice onBindSlice(Uri sliceUri) {
+        String path = sliceUri.getPath();
+        switch (path) {
+            case "/" + PATH_WIFI:
+                return createWifi(sliceUri);
+
+        }
+        throw new IllegalArgumentException("Unrecognized slice uri: " + sliceUri);
+    }
+
+    private Slice createWifi(Uri uri) {
+        // Get wifi state
+        String[] toggleHints;
+        WifiManager wifiManager = (WifiManager) getContext().getSystemService(Context.WIFI_SERVICE);
+        int wifiState = wifiManager.getWifiState();
+        boolean wifiEnabled = false;
+        String state;
+        switch (wifiState) {
+            case WifiManager.WIFI_STATE_DISABLED:
+            case WifiManager.WIFI_STATE_DISABLING:
+                state = getContext().getString(R.string.disconnected);
+                break;
+            case WifiManager.WIFI_STATE_ENABLED:
+            case WifiManager.WIFI_STATE_ENABLING:
+                state = wifiManager.getConnectionInfo().getSSID();
+                WifiInfo.removeDoubleQuotes(state);
+                wifiEnabled = true;
+                break;
+            case WifiManager.WIFI_STATE_UNKNOWN:
+            default:
+                state = ""; // just don't show anything?
+                break;
+        }
+        if (wifiEnabled) {
+            toggleHints = new String[] {Slice.HINT_TOGGLE, Slice.HINT_SELECTED};
+        } else {
+            toggleHints = new String[] {Slice.HINT_TOGGLE};
+        }
+        // Construct the slice
+        Slice.Builder b = new Slice.Builder(uri);
+        b.addSubSlice(new Slice.Builder(b)
+                .addAction(getIntent("android.settings.WIFI_SETTINGS"),
+                        new Slice.Builder(b)
+                                .addText(getContext().getString(R.string.wifi_settings), null)
+                                .addText(state, null)
+                                .addIcon(Icon.createWithResource(getContext(),
+                                        R.drawable.ic_settings_wireless), null, Slice.HINT_HIDDEN)
+                                .addHints(Slice.HINT_TITLE)
+                                .build())
+                .addAction(getBroadcastIntent(ACTION_WIFI_CHANGED),
+                        new Slice.Builder(b)
+                                .addHints(toggleHints)
+                                .build())
+                .build());
+        return b.build();
+    }
+
+    private PendingIntent getIntent(String action) {
+        Intent intent = new Intent(action);
+        PendingIntent pi = PendingIntent.getActivity(getContext(), 0, intent, 0);
+        return pi;
+    }
+
+    private PendingIntent getBroadcastIntent(String action) {
+        Intent intent = new Intent(action);
+        intent.setClass(getContext(), SliceBroadcastReceiver.class);
+        return PendingIntent.getBroadcast(getContext(), 0, intent,
+                PendingIntent.FLAG_CANCEL_CURRENT);
+    }
+}
diff --git a/src/com/android/settings/SliceBroadcastReceiver.java b/src/com/android/settings/SliceBroadcastReceiver.java
new file mode 100644
index 0000000..f43e3a3
--- /dev/null
+++ b/src/com/android/settings/SliceBroadcastReceiver.java
@@ -0,0 +1,51 @@
+/*
+ * Copyright (C) 2017 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License
+ */
+
+package com.android.settings;
+
+import static com.android.settings.SettingsSliceProvider.ACTION_WIFI_CHANGED;
+
+import android.app.slice.Slice;
+import android.content.BroadcastReceiver;
+import android.content.Context;
+import android.content.Intent;
+import android.net.Uri;
+import android.net.wifi.WifiManager;
+import android.os.Handler;
+
+/**
+ * Responds to actions performed on slices and notifies slices of updates in state changes.
+ */
+public class SliceBroadcastReceiver extends BroadcastReceiver {
+
+    @Override
+    public void onReceive(Context context, Intent i) {
+        String action = i.getAction();
+        switch (action) {
+            case ACTION_WIFI_CHANGED:
+                WifiManager wm = (WifiManager) context.getSystemService(Context.WIFI_SERVICE);
+                boolean newState = i.getBooleanExtra(Slice.EXTRA_TOGGLE_STATE, wm.isWifiEnabled());
+                wm.setWifiEnabled(newState);
+                // Wait a bit for wifi to update (TODO: is there a better way to do this?)
+                Handler h = new Handler();
+                h.postDelayed(() -> {
+                        Uri uri = SettingsSliceProvider.getUri(SettingsSliceProvider.PATH_WIFI);
+                        context.getContentResolver().notifyChange(uri, null);
+                }, 1000);
+                break;
+        }
+    }
+}
diff --git a/src/com/android/settings/TetherSettings.java b/src/com/android/settings/TetherSettings.java
index 664916a..94c3fb5 100644
--- a/src/com/android/settings/TetherSettings.java
+++ b/src/com/android/settings/TetherSettings.java
@@ -16,95 +16,64 @@
 
 package com.android.settings;
 
+import static android.net.ConnectivityManager.TETHERING_BLUETOOTH;
+import static android.net.ConnectivityManager.TETHERING_USB;
+
 import android.app.Activity;
-import android.app.Dialog;
 import android.bluetooth.BluetoothAdapter;
 import android.bluetooth.BluetoothPan;
 import android.bluetooth.BluetoothProfile;
 import android.content.BroadcastReceiver;
 import android.content.Context;
-import android.content.DialogInterface;
 import android.content.Intent;
 import android.content.IntentFilter;
 import android.content.pm.PackageManager;
 import android.hardware.usb.UsbManager;
 import android.net.ConnectivityManager;
-import android.net.wifi.WifiConfiguration;
-import android.net.wifi.WifiManager;
 import android.os.Bundle;
 import android.os.Environment;
 import android.os.Handler;
 import android.os.UserManager;
 import android.support.v14.preference.SwitchPreference;
 import android.support.v7.preference.Preference;
-import android.util.Log;
 
 import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
 import com.android.settings.datausage.DataSaverBackend;
-import com.android.settings.wifi.WifiApDialog;
-import com.android.settings.wifi.WifiApEnabler;
 import com.android.settings.wifi.tether.WifiTetherPreferenceController;
-import com.android.settings.wifi.tether.WifiTetherSettings;
 import com.android.settingslib.TetherUtil;
 
 import java.lang.ref.WeakReference;
 import java.util.ArrayList;
 import java.util.concurrent.atomic.AtomicReference;
 
-import static android.net.ConnectivityManager.TETHERING_BLUETOOTH;
-import static android.net.ConnectivityManager.TETHERING_USB;
-import static android.net.ConnectivityManager.TETHERING_WIFI;
-
 /*
  * Displays preferences for Tethering.
  */
 public class TetherSettings extends RestrictedSettingsFragment
-        implements DialogInterface.OnClickListener, Preference.OnPreferenceChangeListener,
-        DataSaverBackend.Listener {
+        implements DataSaverBackend.Listener {
 
     private static final String USB_TETHER_SETTINGS = "usb_tether_settings";
-    private static final String ENABLE_WIFI_AP = "enable_wifi_ap";
     private static final String ENABLE_BLUETOOTH_TETHERING = "enable_bluetooth_tethering";
     private static final String DATA_SAVER_FOOTER = "disabled_on_data_saver";
 
-    private static final int DIALOG_AP_SETTINGS = 1;
-
     private static final String TAG = "TetheringSettings";
 
     private SwitchPreference mUsbTether;
 
-    private WifiApEnabler mWifiApEnabler;
-    private SwitchPreference mEnableWifiAp;
-
     private SwitchPreference mBluetoothTether;
 
     private BroadcastReceiver mTetherChangeReceiver;
 
     private String[] mUsbRegexs;
-
-    private String[] mWifiRegexs;
-
     private String[] mBluetoothRegexs;
-    private AtomicReference<BluetoothPan> mBluetoothPan = new AtomicReference<BluetoothPan>();
+    private AtomicReference<BluetoothPan> mBluetoothPan = new AtomicReference<>();
 
     private Handler mHandler = new Handler();
     private OnStartTetheringCallback mStartTetheringCallback;
-
-    private static final String WIFI_AP_SSID_AND_SECURITY = "wifi_ap_ssid_and_security";
-    private static final int CONFIG_SUBTEXT = R.string.wifi_tether_configure_subtext;
-
-    private String[] mSecurityType;
-    private Preference mCreateNetwork;
-
-    private WifiApDialog mDialog;
-    private WifiManager mWifiManager;
-    private WifiConfiguration mWifiConfig = null;
     private ConnectivityManager mCm;
 
     private WifiTetherPreferenceController mWifiTetherPreferenceController;
 
-    private boolean mRestartWifiApAfterConfigChange;
-
     private boolean mUsbConnected;
     private boolean mMassStorageActive;
 
@@ -157,24 +126,17 @@
                     BluetoothProfile.PAN);
         }
 
-        mEnableWifiAp =
-                (SwitchPreference) findPreference(ENABLE_WIFI_AP);
-
-        Preference wifiApSettings = findPreference(WIFI_AP_SSID_AND_SECURITY);
         mUsbTether = (SwitchPreference) findPreference(USB_TETHER_SETTINGS);
         mBluetoothTether = (SwitchPreference) findPreference(ENABLE_BLUETOOTH_TETHERING);
 
         mDataSaverBackend.addListener(this);
 
         mCm = (ConnectivityManager) getSystemService(Context.CONNECTIVITY_SERVICE);
-        mWifiManager = (WifiManager) getSystemService(Context.WIFI_SERVICE);
 
         mUsbRegexs = mCm.getTetherableUsbRegexs();
-        mWifiRegexs = mCm.getTetherableWifiRegexs();
         mBluetoothRegexs = mCm.getTetherableBluetoothRegexs();
 
         final boolean usbAvailable = mUsbRegexs.length != 0;
-        final boolean wifiAvailable = mWifiRegexs.length != 0;
         final boolean bluetoothAvailable = mBluetoothRegexs.length != 0;
 
         if (!usbAvailable || Utils.isMonkeyRunning()) {
@@ -182,18 +144,6 @@
         }
 
         mWifiTetherPreferenceController.displayPreference(getPreferenceScreen());
-        if (WifiTetherSettings.isTetherSettingPageEnabled()) {
-            removePreference(ENABLE_WIFI_AP);
-            removePreference(WIFI_AP_SSID_AND_SECURITY);
-        } else {
-            if (wifiAvailable && !Utils.isMonkeyRunning()) {
-                mWifiApEnabler = new WifiApEnabler(activity, mDataSaverBackend, mEnableWifiAp);
-                initWifiTethering();
-            } else {
-                getPreferenceScreen().removePreference(mEnableWifiAp);
-                getPreferenceScreen().removePreference(wifiApSettings);
-            }
-        }
 
         if (!bluetoothAvailable) {
             getPreferenceScreen().removePreference(mBluetoothTether);
@@ -225,7 +175,6 @@
     @Override
     public void onDataSaverChanged(boolean isDataSaving) {
         mDataSaverEnabled = isDataSaving;
-        mEnableWifiAp.setEnabled(!mDataSaverEnabled);
         mUsbTether.setEnabled(!mDataSaverEnabled);
         mBluetoothTether.setEnabled(!mDataSaverEnabled);
         mDataSaverFooter.setVisible(mDataSaverEnabled);
@@ -239,47 +188,6 @@
     public void onBlacklistStatusChanged(int uid, boolean isBlacklisted)  {
     }
 
-    private void initWifiTethering() {
-        final Activity activity = getActivity();
-        mWifiConfig = mWifiManager.getWifiApConfiguration();
-        mSecurityType = getResources().getStringArray(R.array.wifi_ap_security);
-
-        mCreateNetwork = findPreference(WIFI_AP_SSID_AND_SECURITY);
-
-        mRestartWifiApAfterConfigChange = false;
-
-        if (mWifiConfig == null) {
-            final String s = activity.getString(
-                    com.android.internal.R.string.wifi_tether_configure_ssid_default);
-            mCreateNetwork.setSummary(String.format(activity.getString(CONFIG_SUBTEXT),
-                    s, mSecurityType[WifiApDialog.OPEN_INDEX]));
-        } else {
-            int index = WifiApDialog.getSecurityTypeIndex(mWifiConfig);
-            mCreateNetwork.setSummary(String.format(activity.getString(CONFIG_SUBTEXT),
-                    mWifiConfig.SSID,
-                    mSecurityType[index]));
-        }
-    }
-
-    @Override
-    public Dialog onCreateDialog(int id) {
-        if (id == DIALOG_AP_SETTINGS) {
-            final Activity activity = getActivity();
-            mDialog = new WifiApDialog(activity, this, mWifiConfig);
-            return mDialog;
-        }
-
-        return null;
-    }
-
-    @Override
-    public int getDialogMetricsCategory(int dialogId) {
-        if (dialogId == DIALOG_AP_SETTINGS) {
-            return MetricsEvent.DIALOG_AP_SETTINGS;
-        }
-        return 0;
-    }
-
     private class TetherChangeReceiver extends BroadcastReceiver {
         @Override
         public void onReceive(Context content, Intent intent) {
@@ -295,20 +203,6 @@
                 updateState(available.toArray(new String[available.size()]),
                         active.toArray(new String[active.size()]),
                         errored.toArray(new String[errored.size()]));
-                if (mWifiManager.getWifiApState() == WifiManager.WIFI_AP_STATE_DISABLED
-                        && mRestartWifiApAfterConfigChange) {
-                    mRestartWifiApAfterConfigChange = false;
-                    Log.d(TAG, "Restarting WifiAp due to prior config change.");
-                    startTethering(TETHERING_WIFI);
-                }
-            } else if (action.equals(WifiManager.WIFI_AP_STATE_CHANGED_ACTION)) {
-                int state = intent.getIntExtra(WifiManager.EXTRA_WIFI_AP_STATE, 0);
-                if (state == WifiManager.WIFI_AP_STATE_DISABLED
-                        && mRestartWifiApAfterConfigChange) {
-                    mRestartWifiApAfterConfigChange = false;
-                    Log.d(TAG, "Restarting WifiAp due to prior config change.");
-                    startTethering(TETHERING_WIFI);
-                }
             } else if (action.equals(Intent.ACTION_MEDIA_SHARED)) {
                 mMassStorageActive = true;
                 updateState();
@@ -360,7 +254,6 @@
         mMassStorageActive = Environment.MEDIA_SHARED.equals(Environment.getExternalStorageState());
         mTetherChangeReceiver = new TetherChangeReceiver();
         IntentFilter filter = new IntentFilter(ConnectivityManager.ACTION_TETHER_STATE_CHANGED);
-        filter.addAction(WifiManager.WIFI_AP_STATE_CHANGED_ACTION);
         Intent intent = activity.registerReceiver(mTetherChangeReceiver, filter);
 
         filter = new IntentFilter();
@@ -378,10 +271,6 @@
         activity.registerReceiver(mTetherChangeReceiver, filter);
 
         if (intent != null) mTetherChangeReceiver.onReceive(activity, intent);
-        if (mWifiApEnabler != null) {
-            mEnableWifiAp.setOnPreferenceChangeListener(this);
-            mWifiApEnabler.resume();
-        }
 
         updateState();
     }
@@ -396,10 +285,6 @@
         getActivity().unregisterReceiver(mTetherChangeReceiver);
         mTetherChangeReceiver = null;
         mStartTetheringCallback = null;
-        if (mWifiApEnabler != null) {
-            mEnableWifiAp.setOnPreferenceChangeListener(null);
-            mWifiApEnabler.pause();
-        }
     }
 
     private void updateState() {
@@ -415,7 +300,6 @@
         updateBluetoothState();
     }
 
-
     private void updateUsbState(String[] available, String[] tethered,
             String[] errored) {
         boolean usbAvailable = mUsbConnected && !mMassStorageActive;
@@ -477,18 +361,6 @@
         }
     }
 
-    @Override
-    public boolean onPreferenceChange(Preference preference, Object value) {
-        boolean enable = (Boolean) value;
-
-        if (enable) {
-            startTethering(TETHERING_WIFI);
-        } else {
-            mCm.stopTethering(TETHERING_WIFI);
-        }
-        return false;
-    }
-
     public static boolean isProvisioningNeededButUnavailable(Context context) {
         return (TetherUtil.isProvisioningNeeded(context)
                 && !isIntentAvailable(context));
@@ -541,37 +413,11 @@
                 // connected. Need to update state manually.
                 updateState();
             }
-        } else if (preference == mCreateNetwork) {
-            showDialog(DIALOG_AP_SETTINGS);
         }
 
         return super.onPreferenceTreeClick(preference);
     }
 
-    public void onClick(DialogInterface dialogInterface, int button) {
-        if (button == DialogInterface.BUTTON_POSITIVE) {
-            mWifiConfig = mDialog.getConfig();
-            if (mWifiConfig != null) {
-                /**
-                 * if soft AP is stopped, bring up
-                 * else restart with new config
-                 * TODO: update config on a running access point when framework support is added
-                 */
-                if (mWifiManager.getWifiApState() == WifiManager.WIFI_AP_STATE_ENABLED) {
-                    Log.d("TetheringSettings",
-                            "Wifi AP config changed while enabled, stop and restart");
-                    mRestartWifiApAfterConfigChange = true;
-                    mCm.stopTethering(TETHERING_WIFI);
-                }
-                mWifiManager.setWifiApConfiguration(mWifiConfig);
-                int index = WifiApDialog.getSecurityTypeIndex(mWifiConfig);
-                mCreateNetwork.setSummary(String.format(getActivity().getString(CONFIG_SUBTEXT),
-                        mWifiConfig.SSID,
-                        mSecurityType[index]));
-            }
-        }
-    }
-
     @Override
     public int getHelpResource() {
         return R.string.help_url_tether;
@@ -592,7 +438,7 @@
         final WeakReference<TetherSettings> mTetherSettings;
 
         OnStartTetheringCallback(TetherSettings settings) {
-            mTetherSettings = new WeakReference<TetherSettings>(settings);
+            mTetherSettings = new WeakReference<>(settings);
         }
 
         @Override
diff --git a/src/com/android/settings/TintablePreference.java b/src/com/android/settings/TintablePreference.java
deleted file mode 100644
index 2e1fd3d..0000000
--- a/src/com/android/settings/TintablePreference.java
+++ /dev/null
@@ -1,55 +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.content.Context;
-import android.content.res.ColorStateList;
-import android.content.res.TypedArray;
-import android.support.annotation.ColorInt;
-import android.support.v7.preference.Preference;
-import android.support.v7.preference.PreferenceViewHolder;
-import android.util.AttributeSet;
-import android.widget.ImageView;
-
-public class TintablePreference extends Preference {
-    @ColorInt
-    private int mTintColor;
-
-    public TintablePreference(Context context, AttributeSet attrs) {
-        super(context, attrs);
-
-        TypedArray a = context.obtainStyledAttributes(attrs, R.styleable.TintablePreference);
-        mTintColor = a.getColor(R.styleable.TintablePreference_android_tint, 0);
-        a.recycle();
-    }
-
-    public void setTint(int color) {
-        mTintColor = color;
-        notifyChanged();
-    }
-
-    @Override
-    public void onBindViewHolder(PreferenceViewHolder view) {
-        super.onBindViewHolder(view);
-
-        if (mTintColor != 0) {
-            ((ImageView) view.findViewById(android.R.id.icon)).setImageTintList(
-                    ColorStateList.valueOf(mTintColor));
-        } else {
-            ((ImageView) view.findViewById(android.R.id.icon)).setImageTintList(null);
-        }
-    }
-}
diff --git a/src/com/android/settings/TrustAgentSettings.java b/src/com/android/settings/TrustAgentSettings.java
deleted file mode 100644
index 0e5cd2c..0000000
--- a/src/com/android/settings/TrustAgentSettings.java
+++ /dev/null
@@ -1,204 +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.admin.DevicePolicyManager;
-import android.content.ComponentName;
-import android.content.Context;
-import android.content.Intent;
-import android.content.pm.PackageManager;
-import android.content.pm.ResolveInfo;
-import android.graphics.drawable.Drawable;
-import android.os.Bundle;
-import android.os.UserHandle;
-import android.service.trust.TrustAgentService;
-import android.support.v14.preference.SwitchPreference;
-import android.support.v7.preference.Preference;
-import android.support.v7.preference.PreferenceGroup;
-import android.util.ArrayMap;
-import android.util.ArraySet;
-
-import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
-import com.android.internal.widget.LockPatternUtils;
-import com.android.settings.overlay.FeatureFactory;
-import com.android.settings.trustagent.TrustAgentManager;
-import com.android.settingslib.RestrictedLockUtils;
-import com.android.settingslib.RestrictedSwitchPreference;
-
-import java.util.List;
-
-import static com.android.settingslib.RestrictedLockUtils.EnforcedAdmin;
-
-public class TrustAgentSettings extends SettingsPreferenceFragment implements
-        Preference.OnPreferenceChangeListener {
-    private static final String SERVICE_INTERFACE = TrustAgentService.SERVICE_INTERFACE;
-
-    private ArrayMap<ComponentName, AgentInfo> mAvailableAgents;
-    private final ArraySet<ComponentName> mActiveAgents = new ArraySet<ComponentName>();
-    private LockPatternUtils mLockPatternUtils;
-    private DevicePolicyManager mDpm;
-    private TrustAgentManager mTrustAgentManager;
-
-    public static final class AgentInfo {
-        CharSequence label;
-        ComponentName component; // service that implements ITrustAgent
-        SwitchPreference preference;
-        public Drawable icon;
-
-        @Override
-        public boolean equals(Object other) {
-            if (other instanceof AgentInfo) {
-                return component.equals(((AgentInfo)other).component);
-            }
-            return true;
-        }
-
-        public int compareTo(AgentInfo other) {
-            return component.compareTo(other.component);
-        }
-    }
-
-    @Override
-    public int getMetricsCategory() {
-        return MetricsEvent.TRUST_AGENT;
-    }
-
-    @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);
-        mTrustAgentManager =
-            FeatureFactory.getFactory(getActivity()).getSecurityFeatureProvider()
-                .getTrustAgentManager();
-
-        addPreferencesFromResource(R.xml.trust_agent_settings);
-    }
-
-    public void onResume() {
-        super.onResume();
-        removePreference("dummy_preference");
-        updateAgents();
-    };
-
-    private void updateAgents() {
-        final Context context = getActivity();
-        if (mAvailableAgents == null) {
-            mAvailableAgents = findAvailableTrustAgents();
-        }
-        if (mLockPatternUtils == null) {
-            mLockPatternUtils = new LockPatternUtils(getActivity());
-        }
-        loadActiveAgents();
-        PreferenceGroup category =
-                (PreferenceGroup) getPreferenceScreen().findPreference("trust_agents");
-        category.removeAll();
-
-        final EnforcedAdmin admin = RestrictedLockUtils.checkIfKeyguardFeaturesDisabled(context,
-                DevicePolicyManager.KEYGUARD_DISABLE_TRUST_AGENTS, UserHandle.myUserId());
-
-        final int count = mAvailableAgents.size();
-        for (int i = 0; i < count; i++) {
-            AgentInfo agent = mAvailableAgents.valueAt(i);
-            final RestrictedSwitchPreference preference =
-                    new RestrictedSwitchPreference(getPrefContext());
-            preference.useAdminDisabledSummary(true);
-            agent.preference = preference;
-            preference.setPersistent(false);
-            preference.setTitle(agent.label);
-            preference.setIcon(agent.icon);
-            preference.setPersistent(false);
-            preference.setOnPreferenceChangeListener(this);
-            preference.setChecked(mActiveAgents.contains(agent.component));
-
-            if (admin != null
-                    && mDpm.getTrustAgentConfiguration(null, agent.component) == null) {
-                preference.setChecked(false);
-                preference.setDisabledByAdmin(admin);
-            }
-
-            category.addPreference(agent.preference);
-        }
-    }
-
-    private void loadActiveAgents() {
-        List<ComponentName> activeTrustAgents = mLockPatternUtils.getEnabledTrustAgents(
-                UserHandle.myUserId());
-        if (activeTrustAgents != null) {
-            mActiveAgents.addAll(activeTrustAgents);
-        }
-    }
-
-    private void saveActiveAgents() {
-        mLockPatternUtils.setEnabledTrustAgents(mActiveAgents,
-                UserHandle.myUserId());
-    }
-
-    ArrayMap<ComponentName, AgentInfo> findAvailableTrustAgents() {
-        PackageManager pm = getActivity().getPackageManager();
-        Intent trustAgentIntent = new Intent(SERVICE_INTERFACE);
-        List<ResolveInfo> resolveInfos = pm.queryIntentServices(trustAgentIntent,
-                PackageManager.GET_META_DATA);
-
-        ArrayMap<ComponentName, AgentInfo> agents = new ArrayMap<ComponentName, AgentInfo>();
-        final int count = resolveInfos.size();
-        agents.ensureCapacity(count);
-        for (int i = 0; i < count; i++ ) {
-            ResolveInfo resolveInfo = resolveInfos.get(i);
-            if (resolveInfo.serviceInfo == null) {
-                continue;
-            }
-            if (!mTrustAgentManager.shouldProvideTrust(resolveInfo, pm)) {
-                continue;
-            }
-            ComponentName name = TrustAgentUtils.getComponentName(resolveInfo);
-            AgentInfo agentInfo = new AgentInfo();
-            agentInfo.label = resolveInfo.loadLabel(pm);
-            agentInfo.icon = resolveInfo.loadIcon(pm);
-            agentInfo.component = name;
-            agents.put(name, agentInfo);
-        }
-        return agents;
-    }
-
-    @Override
-    public boolean onPreferenceChange(Preference preference, Object newValue) {
-        if (preference instanceof SwitchPreference) {
-            final int count = mAvailableAgents.size();
-            for (int i = 0; i < count; i++) {
-                AgentInfo agent = mAvailableAgents.valueAt(i);
-                if (agent.preference == preference) {
-                    if ((Boolean) newValue) {
-                        if (!mActiveAgents.contains(agent.component)) {
-                            mActiveAgents.add(agent.component);
-                        }
-                    } else {
-                        mActiveAgents.remove(agent.component);
-                    }
-                    saveActiveAgents();
-                    return true;
-                }
-            }
-        }
-        return false;
-    }
-
-}
diff --git a/src/com/android/settings/TrustAgentUtils.java b/src/com/android/settings/TrustAgentUtils.java
deleted file mode 100644
index b3d560f..0000000
--- a/src/com/android/settings/TrustAgentUtils.java
+++ /dev/null
@@ -1,107 +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.content.ComponentName;
-import android.content.pm.PackageManager;
-import android.content.pm.ResolveInfo;
-import android.content.res.Resources;
-import android.content.res.TypedArray;
-import android.content.res.XmlResourceParser;
-import android.service.trust.TrustAgentService;
-import android.util.AttributeSet;
-import android.util.Slog;
-import android.util.Xml;
-
-import org.xmlpull.v1.XmlPullParser;
-import org.xmlpull.v1.XmlPullParserException;
-
-import java.io.IOException;
-
-import static com.android.settingslib.RestrictedLockUtils.EnforcedAdmin;
-
-// TODO(b/34461256): Refactor TrustAgentUtils into TrustAgentManager.
-public class TrustAgentUtils {
-    static final String TAG = "TrustAgentUtils";
-
-    private static final String TRUST_AGENT_META_DATA = TrustAgentService.TRUST_AGENT_META_DATA;
-
-    public static class TrustAgentComponentInfo {
-        ComponentName componentName;
-        String title;
-        String summary;
-        EnforcedAdmin admin = null;
-    }
-
-    public static ComponentName getComponentName(ResolveInfo resolveInfo) {
-        if (resolveInfo == null || resolveInfo.serviceInfo == null) return null;
-        return new ComponentName(resolveInfo.serviceInfo.packageName, resolveInfo.serviceInfo.name);
-    }
-
-    public static TrustAgentComponentInfo getSettingsComponent(
-            PackageManager pm, ResolveInfo resolveInfo) {
-        if (resolveInfo == null || resolveInfo.serviceInfo == null
-                || resolveInfo.serviceInfo.metaData == null) return null;
-        String cn = null;
-        TrustAgentComponentInfo trustAgentComponentInfo = new TrustAgentComponentInfo();
-        XmlResourceParser parser = null;
-        Exception caughtException = null;
-        try {
-            parser = resolveInfo.serviceInfo.loadXmlMetaData(pm, TRUST_AGENT_META_DATA);
-            if (parser == null) {
-                Slog.w(TAG, "Can't find " + TRUST_AGENT_META_DATA + " meta-data");
-                return null;
-            }
-            Resources res = pm.getResourcesForApplication(resolveInfo.serviceInfo.applicationInfo);
-            AttributeSet attrs = Xml.asAttributeSet(parser);
-            int type;
-            while ((type = parser.next()) != XmlPullParser.END_DOCUMENT
-                    && type != XmlPullParser.START_TAG) {
-            }
-            String nodeName = parser.getName();
-            if (!"trust-agent".equals(nodeName)) {
-                Slog.w(TAG, "Meta-data does not start with trust-agent tag");
-                return null;
-            }
-            TypedArray sa =
-                    res.obtainAttributes(attrs, com.android.internal.R.styleable.TrustAgent);
-            trustAgentComponentInfo.summary =
-                    sa.getString(com.android.internal.R.styleable.TrustAgent_summary);
-            trustAgentComponentInfo.title =
-                    sa.getString(com.android.internal.R.styleable.TrustAgent_title);
-            cn = sa.getString(com.android.internal.R.styleable.TrustAgent_settingsActivity);
-            sa.recycle();
-        } catch (PackageManager.NameNotFoundException e) {
-            caughtException = e;
-        } catch (IOException e) {
-            caughtException = e;
-        } catch (XmlPullParserException e) {
-            caughtException = e;
-        } finally {
-            if (parser != null) parser.close();
-        }
-        if (caughtException != null) {
-            Slog.w(TAG, "Error parsing : " + resolveInfo.serviceInfo.packageName, caughtException);
-            return null;
-        }
-        if (cn != null && cn.indexOf('/') < 0) {
-            cn = resolveInfo.serviceInfo.packageName + "/" + cn;
-        }
-        trustAgentComponentInfo.componentName = (cn == null) ? null : ComponentName.unflattenFromString(cn);
-        return trustAgentComponentInfo;
-    }
-}
diff --git a/src/com/android/settings/TrustedCredentialsSettings.java b/src/com/android/settings/TrustedCredentialsSettings.java
index 587e814..491419a 100644
--- a/src/com/android/settings/TrustedCredentialsSettings.java
+++ b/src/com/android/settings/TrustedCredentialsSettings.java
@@ -65,6 +65,7 @@
 import com.android.internal.app.UnlaunchableAppActivity;
 import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
 import com.android.internal.widget.LockPatternUtils;
+import com.android.settings.core.InstrumentedPreferenceFragment;
 
 import java.security.cert.CertificateEncodingException;
 import java.security.cert.X509Certificate;
@@ -74,7 +75,7 @@
 import java.util.Set;
 import java.util.function.IntConsumer;
 
-public class TrustedCredentialsSettings extends OptionsMenuFragment
+public class TrustedCredentialsSettings extends InstrumentedPreferenceFragment
         implements TrustedCredentialsDialogBuilder.DelegateInterface {
 
     public static final String ARG_SHOW_NEW_FOR_USER = "ARG_SHOW_NEW_FOR_USER";
@@ -176,10 +177,11 @@
     @Override
     public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-        mUserManager = (UserManager) getActivity().getSystemService(Context.USER_SERVICE);
-        mKeyguardManager = (KeyguardManager) getActivity()
+        final Activity activity = getActivity();
+        mUserManager = (UserManager) activity.getSystemService(Context.USER_SERVICE);
+        mKeyguardManager = (KeyguardManager) activity
                 .getSystemService(Context.KEYGUARD_SERVICE);
-        mTrustAllCaUserId = getActivity().getIntent().getIntExtra(ARG_SHOW_NEW_FOR_USER,
+        mTrustAllCaUserId = activity.getIntent().getIntExtra(ARG_SHOW_NEW_FOR_USER,
                 UserHandle.USER_NULL);
         mConfirmedCredentialUsers = new ArraySet<>(2);
         mConfirmingCredentialUser = UserHandle.USER_NULL;
@@ -199,7 +201,9 @@
         filter.addAction(Intent.ACTION_MANAGED_PROFILE_AVAILABLE);
         filter.addAction(Intent.ACTION_MANAGED_PROFILE_UNAVAILABLE);
         filter.addAction(Intent.ACTION_MANAGED_PROFILE_UNLOCKED);
-        getActivity().registerReceiver(mWorkProfileChangedReceiver, filter);
+        activity.registerReceiver(mWorkProfileChangedReceiver, filter);
+
+        activity.setTitle(R.string.trusted_credentials);
     }
 
     @Override
diff --git a/src/com/android/settings/UserCredentialsSettings.java b/src/com/android/settings/UserCredentialsSettings.java
index 6cf1ae0..54e12a8 100644
--- a/src/com/android/settings/UserCredentialsSettings.java
+++ b/src/com/android/settings/UserCredentialsSettings.java
@@ -84,6 +84,12 @@
         }
     }
 
+    @Override
+    public void onCreate(@Nullable Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        getActivity().setTitle(R.string.user_credentials);
+    }
+
     protected void announceRemoval(String alias) {
         if (!isAdded()) {
             return;
diff --git a/src/com/android/settings/Utils.java b/src/com/android/settings/Utils.java
index 417ac0f..cab3139 100644
--- a/src/com/android/settings/Utils.java
+++ b/src/com/android/settings/Utils.java
@@ -25,7 +25,6 @@
 import android.app.ActivityManager;
 import android.app.AlertDialog;
 import android.app.AppGlobals;
-import android.app.AppOpsManager;
 import android.app.Dialog;
 import android.app.Fragment;
 import android.app.IActivityManager;
@@ -49,15 +48,19 @@
 import android.content.res.TypedArray;
 import android.database.Cursor;
 import android.graphics.Bitmap;
-import android.graphics.BitmapFactory;
+import android.graphics.Canvas;
+import android.graphics.drawable.BitmapDrawable;
+import android.graphics.drawable.Drawable;
 import android.hardware.fingerprint.FingerprintManager;
 import android.icu.text.MeasureFormat;
+import android.icu.text.RelativeDateTimeFormatter;
+import android.icu.text.RelativeDateTimeFormatter.RelativeUnit;
 import android.icu.util.Measure;
 import android.icu.util.MeasureUnit;
+import android.icu.util.ULocale;
 import android.net.ConnectivityManager;
 import android.net.LinkProperties;
 import android.net.Network;
-import android.net.Uri;
 import android.net.wifi.WifiManager;
 import android.os.BatteryManager;
 import android.os.Bundle;
@@ -92,27 +95,20 @@
 import android.text.style.TtsSpan;
 import android.util.ArraySet;
 import android.util.Log;
-import android.util.SparseArray;
 import android.util.TypedValue;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
-import android.view.animation.Animation;
-import android.view.animation.Animation.AnimationListener;
-import android.view.animation.AnimationUtils;
+import android.widget.EditText;
 import android.widget.ListView;
 import android.widget.TabWidget;
 
 import com.android.internal.app.UnlaunchableAppActivity;
 import com.android.internal.util.ArrayUtils;
-import com.android.internal.util.UserIcons;
 import com.android.internal.widget.LockPatternUtils;
-import com.android.settings.enterprise.DevicePolicyManagerWrapper;
-import com.android.settings.password.FingerprintManagerWrapper;
-import com.android.settings.password.IFingerprintManager;
+import com.android.settings.wrapper.DevicePolicyManagerWrapper;
+import com.android.settings.wrapper.FingerprintManagerWrapper;
 
-import java.io.IOException;
-import java.io.InputStream;
 import java.net.InetAddress;
 import java.util.ArrayList;
 import java.util.Iterator;
@@ -129,11 +125,6 @@
     public static final int UPDATE_PREFERENCE_FLAG_SET_TITLE_TO_MATCHING_ACTIVITY = 1;
 
     /**
-     * The opacity level of a disabled icon.
-     */
-    public static final float DISABLED_ALPHA = 0.4f;
-
-    /**
      * Color spectrum to use to indicate badness.  0 is completely transparent (no data),
      * 1 is most bad (red), the last value is least bad (green).
      */
@@ -150,8 +141,6 @@
 
     public static final String OS_PKG = "os";
 
-    private static SparseArray<Bitmap> sDarkDefaultUserBitmapCache = new SparseArray<Bitmap>();
-
     /**
      * Finds a matching activity for a preference's intent. If a matching
      * activity is not found, it will remove the preference.
@@ -236,12 +225,6 @@
         return telephony != null && telephony.isVoiceCapable();
     }
 
-    public static boolean isWifiOnly(Context context) {
-        ConnectivityManager cm = (ConnectivityManager)context.getSystemService(
-                Context.CONNECTIVITY_SERVICE);
-        return (cm.isNetworkSupported(ConnectivityManager.TYPE_MOBILE) == false);
-    }
-
     /**
      * Returns the WIFI IP Addresses, if any, taking into account IPv4 and IPv6 style addresses.
      * @param context the application context
@@ -348,46 +331,6 @@
         view.setPaddingRelative(paddingStart, 0, paddingEnd, paddingBottom);
     }
 
-    /* Used by UserSettings as well. Call this on a non-ui thread. */
-    public static void copyMeProfilePhoto(Context context, UserInfo user) {
-        Uri contactUri = Profile.CONTENT_URI;
-
-        int userId = user != null ? user.id : UserHandle.myUserId();
-
-        InputStream avatarDataStream = Contacts.openContactPhotoInputStream(
-                    context.getContentResolver(),
-                    contactUri, true);
-        // If there's no profile photo, assign a default avatar
-        if (avatarDataStream == null) {
-            assignDefaultPhoto(context, userId);
-            return;
-        }
-
-        UserManager um = (UserManager) context.getSystemService(Context.USER_SERVICE);
-        Bitmap icon = BitmapFactory.decodeStream(avatarDataStream);
-        um.setUserIcon(userId, icon);
-        try {
-            avatarDataStream.close();
-        } catch (IOException ioe) { }
-    }
-
-    /**
-     * Assign the default photo to user with {@paramref userId}
-     * @param context used to get the {@link UserManager}
-     * @param userId  used to get the icon bitmap
-     * @return true if assign photo successfully, false if failed
-     */
-    public static boolean assignDefaultPhoto(Context context, int userId) {
-        if (context == null) {
-            return false;
-        }
-        UserManager um = (UserManager) context.getSystemService(Context.USER_SERVICE);
-        Bitmap bitmap = getDefaultUserIconAsBitmap(userId);
-        um.setUserIcon(userId, bitmap);
-
-        return true;
-    }
-
     public static String getMeProfileName(Context context, boolean full) {
         if (full) {
             return getProfileDisplayName(context);
@@ -508,6 +451,26 @@
                 metricsCategory);
     }
 
+
+    /**
+     * Start a new instance of the activity, showing only the given fragment.
+     * When launched in this mode, the given preference fragment will be instantiated and fill the
+     * entire activity.
+     *
+     * @param context The context.
+     * @param fragmentName The name of the fragment to display.
+     * @param titleResId resource id for the String to display for the title of this set
+     *                   of preferences.
+     * @param metricsCategory The current metricsCategory for logging source when fragment starts
+     * @param intentFlags flag that should be added to the intent.
+     */
+    public static void startWithFragment(Context context, String fragmentName, int titleResId,
+            int metricsCategory, int intentFlags) {
+        startWithFragment(context, fragmentName, null, null, 0,
+                null /* titleResPackageName */, titleResId, null, false /* not a shortcut */,
+                metricsCategory, intentFlags);
+    }
+
     /**
      * Start a new instance of the activity, showing only the given fragment.
      * When launched in this mode, the given preference fragment will be instantiated and fill the
@@ -548,8 +511,17 @@
     public static void startWithFragment(Context context, String fragmentName, Bundle args,
             Fragment resultTo, int resultRequestCode, String titleResPackageName, int titleResId,
             CharSequence title, boolean isShortcut, int metricsCategory) {
+        startWithFragment(context, fragmentName, args, resultTo, resultRequestCode,
+                titleResPackageName, titleResId, title, isShortcut, metricsCategory, 0);
+    }
+
+
+    public static void startWithFragment(Context context, String fragmentName, Bundle args,
+            Fragment resultTo, int resultRequestCode, String titleResPackageName, int titleResId,
+            CharSequence title, boolean isShortcut, int metricsCategory, int flags) {
         Intent intent = onBuildStartFragmentIntent(context, fragmentName, args, titleResPackageName,
                 titleResId, title, isShortcut, metricsCategory);
+        intent.addFlags(flags);
         if (resultTo == null) {
             context.startActivity(intent);
         } else {
@@ -861,6 +833,48 @@
     }
 
     /**
+     * Returns relative time for the given millis in the past, in a short format such as "2 days
+     * ago", "5 hr. ago", "40 min. ago", or "29 sec. ago".
+     *
+     * <p>The unit is chosen to have good information value while only using one unit. So 27 hours
+     * and 50 minutes would be formatted as "28 hr. ago", while 50 hours would be formatted as
+     * "2 days ago".
+     *
+     * @param context the application context
+     * @param millis the elapsed time in milli seconds
+     * @param withSeconds include seconds?
+     * @return the formatted elapsed time
+     */
+    public static CharSequence formatRelativeTime(Context context, double millis,
+            boolean withSeconds) {
+        final int seconds = (int) Math.floor(millis / 1000);
+        final RelativeUnit unit;
+        final int value;
+        if (withSeconds && seconds < 2 * SECONDS_PER_MINUTE) {
+            unit = RelativeUnit.SECONDS;
+            value = seconds;
+        } else if (seconds < 2 * SECONDS_PER_HOUR) {
+            unit = RelativeUnit.MINUTES;
+            value = (seconds + SECONDS_PER_MINUTE / 2) / SECONDS_PER_MINUTE;
+        } else if (seconds < 2 * SECONDS_PER_DAY) {
+            unit = RelativeUnit.HOURS;
+            value = (seconds + SECONDS_PER_HOUR / 2) / SECONDS_PER_HOUR;
+        } else {
+            unit = RelativeUnit.DAYS;
+            value = (seconds + SECONDS_PER_DAY / 2) / SECONDS_PER_DAY;
+        }
+
+        final Locale locale = context.getResources().getConfiguration().locale;
+        final RelativeDateTimeFormatter formatter = RelativeDateTimeFormatter.getInstance(
+                ULocale.forLocale(locale),
+                null /* default NumberFormat */,
+                RelativeDateTimeFormatter.Style.SHORT,
+                android.icu.text.DisplayContext.CAPITALIZATION_FOR_MIDDLE_OF_SENTENCE);
+
+        return formatter.format(value, RelativeDateTimeFormatter.Direction.LAST, unit);
+    }
+
+    /**
      * Queries for the UserInfo of a user. Returns null if the user doesn't exist (was removed).
      * @param userManager Instance of UserManager
      * @param checkUser The user to check the existence of.
@@ -898,23 +912,6 @@
         return (sm.getStorageBytesUntilLow(context.getFilesDir()) < 0);
     }
 
-    /**
-     * Returns a default user icon (as a {@link Bitmap}) for the given user.
-     *
-     * Note that for guest users, you should pass in {@code UserHandle.USER_NULL}.
-     * @param userId the user id or {@code UserHandle.USER_NULL} for a non-user specific icon
-     */
-    public static Bitmap getDefaultUserIconAsBitmap(int userId) {
-        Bitmap bitmap = null;
-        // Try finding the corresponding bitmap in the dark bitmap cache
-        bitmap = sDarkDefaultUserBitmapCache.get(userId);
-        if (bitmap == null) {
-            bitmap = UserIcons.convertToBitmap(UserIcons.getDefaultUserIcon(userId, false));
-            // Save it to cache
-            sDarkDefaultUserBitmapCache.put(userId, bitmap);
-        }
-        return bitmap;
-    }
 
     public static boolean hasPreferredActivities(PackageManager pm, String packageName) {
         // Get list of preferred activities
@@ -931,7 +928,7 @@
         List<IntentFilter> filters = pm.getAllIntentFilters(packageName);
 
         ArraySet<String> result = new ArraySet<>();
-        if (iviList.size() > 0) {
+        if (iviList != null && iviList.size() > 0) {
             for (IntentFilterVerificationInfo ivi : iviList) {
                 for (String host : ivi.getDomains()) {
                     result.add(host);
@@ -1213,7 +1210,7 @@
         }
     }
 
-    public static IFingerprintManager getFingerprintManagerWrapperOrNull(Context context) {
+    public static FingerprintManagerWrapper getFingerprintManagerWrapperOrNull(Context context) {
         FingerprintManager fingerprintManager = getFingerprintManagerOrNull(context);
         if (fingerprintManager != null) {
             return new FingerprintManagerWrapper(fingerprintManager);
@@ -1318,4 +1315,53 @@
                 && volume.isMountedReadable();
     }
 
+    public static void setEditTextCursorPosition(EditText editText) {
+        editText.setSelection(editText.getText().length());
+    }
+
+    /**
+     * Sets the preference icon with a drawable that is scaled down to to avoid crashing Settings if
+     * it's too big.
+     */
+    public static void setSafeIcon(Preference pref, Drawable icon) {
+        Drawable safeIcon = icon;
+        if (icon != null) {
+            safeIcon = getSafeDrawable(icon, 500, 500);
+        }
+        pref.setIcon(safeIcon);
+    }
+
+    /**
+     * Gets a drawable with a limited size to avoid crashing Settings if it's too big.
+     *
+     * @param original original drawable, typically an app icon.
+     * @param maxWidth maximum width, in pixels.
+     * @param maxHeight maximum height, in pixels.
+     */
+    public static Drawable getSafeDrawable(Drawable original, int maxWidth, int maxHeight) {
+        final int actualWidth = original.getMinimumWidth();
+        final int actualHeight = original.getMinimumHeight();
+
+        if (actualWidth <= maxWidth && actualHeight <= maxHeight) {
+            return original;
+        }
+
+        float scaleWidth = ((float) maxWidth) / actualWidth;
+        float scaleHeight = ((float) maxHeight) / actualHeight;
+        float scale = Math.min(scaleWidth, scaleHeight);
+        final int width = (int) (actualWidth * scale);
+        final int height = (int) (actualHeight * scale);
+
+        final Bitmap bitmap;
+        if (original instanceof BitmapDrawable) {
+            bitmap = Bitmap.createScaledBitmap(((BitmapDrawable) original).getBitmap(), width,
+                    height, false);
+        } else {
+            bitmap = Bitmap.createBitmap(width, height, Bitmap.Config.ARGB_8888);
+            final Canvas canvas = new Canvas(bitmap);
+            original.setBounds(0, 0, canvas.getWidth(), canvas.getHeight());
+            original.draw(canvas);
+        }
+        return new BitmapDrawable(null, bitmap);
+    }
 }
diff --git a/src/com/android/settings/WifiCallingSettings.java b/src/com/android/settings/WifiCallingSettings.java
index cb661ed..e872fb8 100644
--- a/src/com/android/settings/WifiCallingSettings.java
+++ b/src/com/android/settings/WifiCallingSettings.java
@@ -16,190 +16,38 @@
 
 package com.android.settings;
 
-import android.app.Activity;
-import android.app.AlertDialog;
-import android.content.BroadcastReceiver;
-import android.content.ComponentName;
+import android.app.Fragment;
+import android.app.FragmentManager;
 import android.content.Context;
-import android.content.Intent;
-import android.content.IntentFilter;
 import android.os.Bundle;
-import android.os.PersistableBundle;
-import android.support.v7.preference.ListPreference;
-import android.support.v7.preference.Preference;
-import android.support.v7.preference.Preference.OnPreferenceClickListener;
-import android.support.v7.preference.PreferenceScreen;
-import android.telephony.CarrierConfigManager;
-import android.telephony.PhoneStateListener;
-import android.telephony.TelephonyManager;
-import android.text.TextUtils;
+import android.support.v13.app.FragmentPagerAdapter;
+import android.telephony.SubscriptionInfo;
+import android.telephony.SubscriptionManager;
 import android.util.Log;
-import android.widget.Switch;
-import android.widget.TextView;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
 
 import com.android.ims.ImsConfig;
 import com.android.ims.ImsManager;
 import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
-import com.android.internal.telephony.Phone;
-import com.android.settings.widget.SwitchBar;
+import com.android.settings.widget.RtlCompatibleViewPager;
+import com.android.settings.widget.SlidingTabLayout;
+
+import java.util.List;
 
 /**
- * "Wi-Fi Calling settings" screen.  This preference screen lets you
- * enable/disable Wi-Fi Calling and change Wi-Fi Calling mode.
+ * "Wi-Fi Calling settings" screen. This is the container fragment which holds
+ * {@link WifiCallingSettingsForSub} fragments.
  */
-public class WifiCallingSettings extends SettingsPreferenceFragment
-        implements SwitchBar.OnSwitchChangeListener,
-        Preference.OnPreferenceChangeListener {
-
+public class WifiCallingSettings extends SettingsPreferenceFragment {
     private static final String TAG = "WifiCallingSettings";
-
-    //String keys for preference lookup
-    private static final String BUTTON_WFC_MODE = "wifi_calling_mode";
-    private static final String BUTTON_WFC_ROAMING_MODE = "wifi_calling_roaming_mode";
-    private static final String PREFERENCE_EMERGENCY_ADDRESS = "emergency_address_key";
-
-    private static final int REQUEST_CHECK_WFC_EMERGENCY_ADDRESS = 1;
-
-    public static final String EXTRA_LAUNCH_CARRIER_APP = "EXTRA_LAUNCH_CARRIER_APP";
-
-    public static final int LAUCH_APP_ACTIVATE = 0;
-    public static final int LAUCH_APP_UPDATE = 1;
+    private List<SubscriptionInfo> mSil;
 
     //UI objects
-    private SwitchBar mSwitchBar;
-    private Switch mSwitch;
-    private ListPreference mButtonWfcMode;
-    private ListPreference mButtonWfcRoamingMode;
-    private Preference mUpdateAddress;
-    private TextView mEmptyView;
-
-    private boolean mValidListener = false;
-    private boolean mEditableWfcMode = true;
-    private boolean mEditableWfcRoamingMode = true;
-
-    private final PhoneStateListener mPhoneStateListener = new PhoneStateListener() {
-        /*
-         * Enable/disable controls when in/out of a call and depending on
-         * TTY mode and TTY support over VoLTE.
-         * @see android.telephony.PhoneStateListener#onCallStateChanged(int,
-         * java.lang.String)
-         */
-        @Override
-        public void onCallStateChanged(int state, String incomingNumber) {
-            final SettingsActivity activity = (SettingsActivity) getActivity();
-            boolean isNonTtyOrTtyOnVolteEnabled = ImsManager
-                    .isNonTtyOrTtyOnVolteEnabled(activity);
-            final SwitchBar switchBar = activity.getSwitchBar();
-            boolean isWfcEnabled = switchBar.getSwitch().isChecked()
-                    && isNonTtyOrTtyOnVolteEnabled;
-
-            switchBar.setEnabled((state == TelephonyManager.CALL_STATE_IDLE)
-                    && isNonTtyOrTtyOnVolteEnabled);
-
-            boolean isWfcModeEditable = true;
-            boolean isWfcRoamingModeEditable = false;
-            final CarrierConfigManager configManager = (CarrierConfigManager)
-                    activity.getSystemService(Context.CARRIER_CONFIG_SERVICE);
-            if (configManager != null) {
-                PersistableBundle b = configManager.getConfig();
-                if (b != null) {
-                    isWfcModeEditable = b.getBoolean(
-                            CarrierConfigManager.KEY_EDITABLE_WFC_MODE_BOOL);
-                    isWfcRoamingModeEditable = b.getBoolean(
-                            CarrierConfigManager.KEY_EDITABLE_WFC_ROAMING_MODE_BOOL);
-                }
-            }
-
-            Preference pref = getPreferenceScreen().findPreference(BUTTON_WFC_MODE);
-            if (pref != null) {
-                pref.setEnabled(isWfcEnabled && isWfcModeEditable
-                        && (state == TelephonyManager.CALL_STATE_IDLE));
-            }
-            Preference pref_roam = getPreferenceScreen().findPreference(BUTTON_WFC_ROAMING_MODE);
-            if (pref_roam != null) {
-                pref_roam.setEnabled(isWfcEnabled && isWfcRoamingModeEditable
-                        && (state == TelephonyManager.CALL_STATE_IDLE));
-            }
-        }
-    };
-
-    private final OnPreferenceClickListener mUpdateAddressListener =
-            new OnPreferenceClickListener() {
-                /*
-                 * Launch carrier emergency address managemnent activity
-                 */
-                @Override
-                public boolean onPreferenceClick(Preference preference) {
-                    final Context context = getActivity();
-                    Intent carrierAppIntent = getCarrierActivityIntent(context);
-                    if (carrierAppIntent != null) {
-                        carrierAppIntent.putExtra(EXTRA_LAUNCH_CARRIER_APP, LAUCH_APP_UPDATE);
-                        startActivity(carrierAppIntent);
-                    }
-                    return true;
-                }
-    };
-
-    @Override
-    public void onActivityCreated(Bundle savedInstanceState) {
-        super.onActivityCreated(savedInstanceState);
-
-        final SettingsActivity activity = (SettingsActivity) getActivity();
-
-        mSwitchBar = activity.getSwitchBar();
-        mSwitch = mSwitchBar.getSwitch();
-        mSwitchBar.show();
-
-        mEmptyView = (TextView) getView().findViewById(android.R.id.empty);
-        setEmptyView(mEmptyView);
-        String emptyViewText = activity.getString(R.string.wifi_calling_off_explanation)
-                + activity.getString(R.string.wifi_calling_off_explanation_2);
-        mEmptyView.setText(emptyViewText);
-    }
-
-    @Override
-    public void onDestroyView() {
-        super.onDestroyView();
-        mSwitchBar.hide();
-    }
-
-    private void showAlert(Intent intent) {
-        Context context = getActivity();
-
-        CharSequence title = intent.getCharSequenceExtra(Phone.EXTRA_KEY_ALERT_TITLE);
-        CharSequence message = intent.getCharSequenceExtra(Phone.EXTRA_KEY_ALERT_MESSAGE);
-
-        AlertDialog.Builder builder = new AlertDialog.Builder(context);
-        builder.setMessage(message)
-                .setTitle(title)
-                .setIcon(android.R.drawable.ic_dialog_alert)
-                .setPositiveButton(android.R.string.ok, null);
-        AlertDialog dialog = builder.create();
-        dialog.show();
-    }
-
-    private IntentFilter mIntentFilter;
-
-    private BroadcastReceiver mIntentReceiver = new BroadcastReceiver() {
-        @Override
-        public void onReceive(Context context, Intent intent) {
-            String action = intent.getAction();
-            if (action.equals(ImsManager.ACTION_IMS_REGISTRATION_ERROR)) {
-                // If this fragment is active then we are immediately
-                // showing alert on screen. There is no need to add
-                // notification in this case.
-                //
-                // In order to communicate to ImsPhone that it should
-                // not show notification, we are changing result code here.
-                setResultCode(Activity.RESULT_CANCELED);
-
-                // UX requirement is to disable WFC in case of "permanent" registration failures.
-                mSwitch.setChecked(false);
-
-                showAlert(intent);
-            }
-        }
-    };
+    private RtlCompatibleViewPager mViewPager;
+    private WifiCallingViewPagerAdapter mPagerAdapter;
+    private SlidingTabLayout mTabLayout;
 
     @Override
     public int getMetricsCategory() {
@@ -207,242 +55,81 @@
     }
 
     @Override
-    public void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
+    public View onCreateView(LayoutInflater inflater, ViewGroup container,
+            Bundle savedInstanceState) {
+        final View view = inflater.inflate(R.layout.wifi_calling_settings_tabs, container, false);
 
-        addPreferencesFromResource(R.xml.wifi_calling_settings);
+        mTabLayout = view.findViewById(R.id.sliding_tabs);
+        mViewPager = (RtlCompatibleViewPager) view.findViewById(R.id.view_pager);
 
-        mButtonWfcMode = (ListPreference) findPreference(BUTTON_WFC_MODE);
-        mButtonWfcMode.setOnPreferenceChangeListener(this);
+        mPagerAdapter = new WifiCallingViewPagerAdapter(getChildFragmentManager(), mViewPager);
+        mViewPager.setAdapter(mPagerAdapter);
 
-        mButtonWfcRoamingMode = (ListPreference) findPreference(BUTTON_WFC_ROAMING_MODE);
-        mButtonWfcRoamingMode.setOnPreferenceChangeListener(this);
-
-        mUpdateAddress = (Preference) findPreference(PREFERENCE_EMERGENCY_ADDRESS);
-        mUpdateAddress.setOnPreferenceClickListener(mUpdateAddressListener);
-
-        mIntentFilter = new IntentFilter();
-        mIntentFilter.addAction(ImsManager.ACTION_IMS_REGISTRATION_ERROR);
-
-        CarrierConfigManager configManager = (CarrierConfigManager)
-                getSystemService(Context.CARRIER_CONFIG_SERVICE);
-        boolean isWifiOnlySupported = true;
-        if (configManager != null) {
-            PersistableBundle b = configManager.getConfig();
-            if (b != null) {
-                mEditableWfcMode = b.getBoolean(CarrierConfigManager.KEY_EDITABLE_WFC_MODE_BOOL);
-                mEditableWfcRoamingMode = b.getBoolean(
-                        CarrierConfigManager.KEY_EDITABLE_WFC_ROAMING_MODE_BOOL);
-                isWifiOnlySupported = b.getBoolean(
-                        CarrierConfigManager.KEY_CARRIER_WFC_SUPPORTS_WIFI_ONLY_BOOL, true);
-            }
-        }
-
-        if (!isWifiOnlySupported) {
-            mButtonWfcMode.setEntries(R.array.wifi_calling_mode_choices_without_wifi_only);
-            mButtonWfcMode.setEntryValues(R.array.wifi_calling_mode_values_without_wifi_only);
-            mButtonWfcRoamingMode.setEntries(
-                    R.array.wifi_calling_mode_choices_v2_without_wifi_only);
-            mButtonWfcRoamingMode.setEntryValues(
-                    R.array.wifi_calling_mode_values_without_wifi_only);
-        }
+        return view;
     }
 
     @Override
-    public void onResume() {
-        super.onResume();
-
-        final Context context = getActivity();
-
-        // NOTE: Buttons will be enabled/disabled in mPhoneStateListener
-        boolean wfcEnabled = ImsManager.isWfcEnabledByUser(context)
-                && ImsManager.isNonTtyOrTtyOnVolteEnabled(context);
-        mSwitch.setChecked(wfcEnabled);
-        int wfcMode = ImsManager.getWfcMode(context, false);
-        int wfcRoamingMode = ImsManager.getWfcMode(context, true);
-        mButtonWfcMode.setValue(Integer.toString(wfcMode));
-        mButtonWfcRoamingMode.setValue(Integer.toString(wfcRoamingMode));
-        updateButtonWfcMode(context, wfcEnabled, wfcMode, wfcRoamingMode);
-
-        if (ImsManager.isWfcEnabledByPlatform(context)) {
-            TelephonyManager tm = (TelephonyManager) getSystemService(Context.TELEPHONY_SERVICE);
-            tm.listen(mPhoneStateListener, PhoneStateListener.LISTEN_CALL_STATE);
-
-            mSwitchBar.addOnSwitchChangeListener(this);
-
-            mValidListener = true;
-        }
-
-        context.registerReceiver(mIntentReceiver, mIntentFilter);
-
-        Intent intent = getActivity().getIntent();
-        if (intent.getBooleanExtra(Phone.EXTRA_KEY_ALERT_SHOW, false)) {
-            showAlert(intent);
-        }
+    public void onCreate(Bundle icicle) {
+        super.onCreate(icicle);
+        // TODO: besides in onCreate, we should also update subList when SIM / Sub status
+        // changes.
+        updateSubList();
     }
 
     @Override
-    public void onPause() {
-        super.onPause();
+    public void onStart() {
+        super.onStart();
 
-        final Context context = getActivity();
-
-        if (mValidListener) {
-            mValidListener = false;
-
-            TelephonyManager tm = (TelephonyManager) getSystemService(Context.TELEPHONY_SERVICE);
-            tm.listen(mPhoneStateListener, PhoneStateListener.LISTEN_NONE);
-
-            mSwitchBar.removeOnSwitchChangeListener(this);
-        }
-
-        context.unregisterReceiver(mIntentReceiver);
-    }
-
-    /**
-     * Listens to the state change of the switch.
-     */
-    @Override
-    public void onSwitchChanged(Switch switchView, boolean isChecked) {
-        final Context context = getActivity();
-        Log.d(TAG, "onSwitchChanged(" + isChecked + ")");
-
-        if (!isChecked) {
-            updateWfcMode(context, false);
-            return;
-        }
-
-        // Call address management activity before turning on WFC
-        Intent carrierAppIntent = getCarrierActivityIntent(context);
-        if (carrierAppIntent != null) {
-            carrierAppIntent.putExtra(EXTRA_LAUNCH_CARRIER_APP, LAUCH_APP_ACTIVATE);
-            startActivityForResult(carrierAppIntent, REQUEST_CHECK_WFC_EMERGENCY_ADDRESS);
+        if (mSil != null && mSil.size() > 1) {
+            mTabLayout.setViewPager(mViewPager);
         } else {
-            updateWfcMode(context, true);
+            mTabLayout.setVisibility(View.GONE);
         }
     }
 
-    /*
-     * Get the Intent to launch carrier emergency address management activity.
-     * Return null when no activity found.
-     */
-    private static Intent getCarrierActivityIntent(Context context) {
-        // Retrive component name from carrirt config
-        CarrierConfigManager configManager = context.getSystemService(CarrierConfigManager.class);
-        if (configManager == null) return null;
+    private final class WifiCallingViewPagerAdapter extends FragmentPagerAdapter {
+        private final RtlCompatibleViewPager mViewPager;
 
-        PersistableBundle bundle = configManager.getConfig();
-        if (bundle == null) return null;
-
-        String carrierApp = bundle.getString(
-                CarrierConfigManager.KEY_WFC_EMERGENCY_ADDRESS_CARRIER_APP_STRING);
-        if (TextUtils.isEmpty(carrierApp)) return null;
-
-        ComponentName componentName = ComponentName.unflattenFromString(carrierApp);
-        if (componentName == null) return null;
-
-        // Build and return intent
-        Intent intent = new Intent();
-        intent.setComponent(componentName);
-        return intent;
-    }
-
-    /*
-     * Turn on/off WFC mode with ImsManager and update UI accordingly
-     */
-    private void updateWfcMode(Context context, boolean wfcEnabled) {
-        Log.i(TAG, "updateWfcMode(" + wfcEnabled + ")");
-        ImsManager.setWfcSetting(context, wfcEnabled);
-
-        int wfcMode = ImsManager.getWfcMode(context, false);
-        int wfcRoamingMode = ImsManager.getWfcMode(context, true);
-        updateButtonWfcMode(context, wfcEnabled, wfcMode, wfcRoamingMode);
-        if (wfcEnabled) {
-            mMetricsFeatureProvider.action(getActivity(), getMetricsCategory(), wfcMode);
-        } else {
-            mMetricsFeatureProvider.action(getActivity(), getMetricsCategory(), -1);
+        public WifiCallingViewPagerAdapter(FragmentManager fragmentManager,
+                RtlCompatibleViewPager viewPager) {
+            super(fragmentManager);
+            mViewPager = viewPager;
         }
-    }
 
-    @Override
-    public void onActivityResult(int requestCode, int resultCode, Intent data) {
-        super.onActivityResult(requestCode, resultCode, data);
-
-        final Context context = getActivity();
-
-        if (requestCode == REQUEST_CHECK_WFC_EMERGENCY_ADDRESS) {
-            Log.d(TAG, "WFC emergency address activity result = " + resultCode);
-
-            if (resultCode == Activity.RESULT_OK) {
-                updateWfcMode(context, true);
-            }
+        @Override
+        public CharSequence getPageTitle(int position) {
+            return String.valueOf(mSil.get(position).getDisplayName());
         }
-    }
 
-    private void updateButtonWfcMode(Context context, boolean wfcEnabled,
-                                     int wfcMode, int wfcRoamingMode) {
-        mButtonWfcMode.setSummary(getWfcModeSummary(context, wfcMode));
-        mButtonWfcMode.setEnabled(wfcEnabled && mEditableWfcMode);
-        // mButtonWfcRoamingMode.setSummary is not needed; summary is just selected value.
-        mButtonWfcRoamingMode.setEnabled(wfcEnabled && mEditableWfcRoamingMode);
+        @Override
+        public Fragment getItem(int position) {
+            Log.d(TAG, "Adapter getItem " + position);
+            final Bundle args = new Bundle();
+            args.putInt(WifiCallingSettingsForSub.FRAGMENT_BUNDLE_SUBID,
+                    mSil.get(position).getSubscriptionId());
+            WifiCallingSettingsForSub fragment = new WifiCallingSettingsForSub();
+            fragment.setArguments(args);
 
-        final PreferenceScreen preferenceScreen = getPreferenceScreen();
-        boolean updateAddressEnabled = (getCarrierActivityIntent(context) != null);
-        if (wfcEnabled) {
-            if (mEditableWfcMode) {
-                preferenceScreen.addPreference(mButtonWfcMode);
+            return fragment;
+        }
+
+        @Override
+        public Object instantiateItem(ViewGroup container, int position) {
+            Log.d(TAG, "Adapter instantiateItem " + position);
+            return super.instantiateItem(container,
+                    mViewPager.getRtlAwareIndex(position));
+        }
+
+        @Override
+        public int getCount() {
+            if (mSil == null) {
+                Log.d(TAG, "Adapter getCount null mSil ");
+                return 0;
             } else {
-                // Don't show WFC (home) preference if it's not editable.
-                preferenceScreen.removePreference(mButtonWfcMode);
-            }
-            if (mEditableWfcRoamingMode) {
-                preferenceScreen.addPreference(mButtonWfcRoamingMode);
-            } else {
-                // Don't show WFC roaming preference if it's not editable.
-                preferenceScreen.removePreference(mButtonWfcRoamingMode);
-            }
-            if (updateAddressEnabled) {
-                preferenceScreen.addPreference(mUpdateAddress);
-            } else {
-                preferenceScreen.removePreference(mUpdateAddress);
-            }
-        } else {
-            preferenceScreen.removePreference(mButtonWfcMode);
-            preferenceScreen.removePreference(mButtonWfcRoamingMode);
-            preferenceScreen.removePreference(mUpdateAddress);
-        }
-    }
-
-    @Override
-    public boolean onPreferenceChange(Preference preference, Object newValue) {
-        final Context context = getActivity();
-        if (preference == mButtonWfcMode) {
-            mButtonWfcMode.setValue((String) newValue);
-            int buttonMode = Integer.valueOf((String) newValue);
-            int currentWfcMode = ImsManager.getWfcMode(context, false);
-            if (buttonMode != currentWfcMode) {
-                ImsManager.setWfcMode(context, buttonMode, false);
-                mButtonWfcMode.setSummary(getWfcModeSummary(context, buttonMode));
-                mMetricsFeatureProvider.action(getActivity(), getMetricsCategory(), buttonMode);
-            }
-            if (!mEditableWfcRoamingMode) {
-                int currentWfcRoamingMode = ImsManager.getWfcMode(context, true);
-                if (buttonMode != currentWfcRoamingMode) {
-                    ImsManager.setWfcMode(context, buttonMode, true);
-                    // mButtonWfcRoamingMode.setSummary is not needed; summary is selected value
-                }
-            }
-        } else if (preference == mButtonWfcRoamingMode) {
-            mButtonWfcRoamingMode.setValue((String) newValue);
-            int buttonMode = Integer.valueOf((String) newValue);
-            int currentMode = ImsManager.getWfcMode(context, true);
-            if (buttonMode != currentMode) {
-                ImsManager.setWfcMode(context, buttonMode, true);
-                // mButtonWfcRoamingMode.setSummary is not needed; summary is just selected value.
-                mMetricsFeatureProvider.action(getActivity(), getMetricsCategory(), buttonMode);
+                Log.d(TAG, "Adapter getCount " + mSil.size());
+                return mSil.size();
             }
         }
-        return true;
     }
 
     public static int getWfcModeSummary(Context context, int wfcMode) {
@@ -464,4 +151,22 @@
         }
         return resId;
     }
+
+    private void updateSubList() {
+        mSil = SubscriptionManager.from(getActivity()).getActiveSubscriptionInfoList();
+
+        // Only config Wfc if it's enabled by platform.
+        if (mSil == null) {
+            return;
+        }
+        for (int i = 0; i < mSil.size();) {
+            ImsManager imsManager = ImsManager.getInstance(getActivity(),
+                    mSil.get(i).getSimSlotIndex());
+            if (!imsManager.isWfcEnabledByPlatform()) {
+                mSil.remove(i);
+            } else {
+                i++;
+            }
+        }
+    }
 }
diff --git a/src/com/android/settings/WifiCallingSettingsForSub.java b/src/com/android/settings/WifiCallingSettingsForSub.java
new file mode 100644
index 0000000..ba5ba84
--- /dev/null
+++ b/src/com/android/settings/WifiCallingSettingsForSub.java
@@ -0,0 +1,521 @@
+/*
+ * Copyright (C) 2017 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF 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.content.BroadcastReceiver;
+import android.content.ComponentName;
+import android.content.Context;
+import android.content.Intent;
+import android.content.IntentFilter;
+import android.os.Bundle;
+import android.os.PersistableBundle;
+import android.support.v7.preference.ListPreference;
+import android.support.v7.preference.Preference;
+import android.support.v7.preference.Preference.OnPreferenceClickListener;
+import android.support.v7.preference.PreferenceScreen;
+import android.telephony.CarrierConfigManager;
+import android.telephony.PhoneStateListener;
+import android.telephony.SubscriptionManager;
+import android.telephony.TelephonyManager;
+import android.text.TextUtils;
+import android.util.Log;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.Switch;
+import android.widget.TextView;
+
+import com.android.ims.ImsConfig;
+import com.android.ims.ImsManager;
+import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
+import com.android.internal.telephony.Phone;
+import com.android.settings.widget.SwitchBar;
+
+/**
+ * This is the inner class of {@link WifiCallingSettings} fragment.
+ * The preference screen lets you enable/disable Wi-Fi Calling and change Wi-Fi Calling mode.
+ */
+public class WifiCallingSettingsForSub extends SettingsPreferenceFragment
+        implements SwitchBar.OnSwitchChangeListener,
+        Preference.OnPreferenceChangeListener {
+    private static final String TAG = "WifiCallingSettingsForSub";
+
+    //String keys for preference lookup
+    private static final String BUTTON_WFC_MODE = "wifi_calling_mode";
+    private static final String BUTTON_WFC_ROAMING_MODE = "wifi_calling_roaming_mode";
+    private static final String PREFERENCE_EMERGENCY_ADDRESS = "emergency_address_key";
+
+    private static final int REQUEST_CHECK_WFC_EMERGENCY_ADDRESS = 1;
+
+    public static final String EXTRA_LAUNCH_CARRIER_APP = "EXTRA_LAUNCH_CARRIER_APP";
+
+    protected static final String FRAGMENT_BUNDLE_SUBID = "subId";
+
+    public static final int LAUCH_APP_ACTIVATE = 0;
+    public static final int LAUCH_APP_UPDATE = 1;
+
+    //UI objects
+    private SwitchBar mSwitchBar;
+    private Switch mSwitch;
+    private ListPreference mButtonWfcMode;
+    private ListPreference mButtonWfcRoamingMode;
+    private Preference mUpdateAddress;
+    private TextView mEmptyView;
+
+    private boolean mValidListener = false;
+    private boolean mEditableWfcMode = true;
+    private boolean mEditableWfcRoamingMode = true;
+
+    private int mSubId = SubscriptionManager.INVALID_SUBSCRIPTION_ID;
+    private ImsManager mImsManager;
+
+    private final PhoneStateListener mPhoneStateListener = new PhoneStateListener() {
+        /*
+         * Enable/disable controls when in/out of a call and depending on
+         * TTY mode and TTY support over VoLTE.
+         * @see android.telephony.PhoneStateListener#onCallStateChanged(int,
+         * java.lang.String)
+         */
+        @Override
+        public void onCallStateChanged(int state, String incomingNumber) {
+            final SettingsActivity activity = (SettingsActivity) getActivity();
+            boolean isNonTtyOrTtyOnVolteEnabled = mImsManager.isNonTtyOrTtyOnVolteEnabled();
+            boolean isWfcEnabled = mSwitchBar.isChecked()
+                    && isNonTtyOrTtyOnVolteEnabled;
+
+            mSwitchBar.setEnabled((state == TelephonyManager.CALL_STATE_IDLE)
+                    && isNonTtyOrTtyOnVolteEnabled);
+
+            boolean isWfcModeEditable = true;
+            boolean isWfcRoamingModeEditable = false;
+            final CarrierConfigManager configManager = (CarrierConfigManager)
+                    activity.getSystemService(Context.CARRIER_CONFIG_SERVICE);
+            if (configManager != null) {
+                PersistableBundle b = configManager.getConfigForSubId(mSubId);
+                if (b != null) {
+                    isWfcModeEditable = b.getBoolean(
+                            CarrierConfigManager.KEY_EDITABLE_WFC_MODE_BOOL);
+                    isWfcRoamingModeEditable = b.getBoolean(
+                            CarrierConfigManager.KEY_EDITABLE_WFC_ROAMING_MODE_BOOL);
+                }
+            }
+
+            Preference pref = getPreferenceScreen().findPreference(BUTTON_WFC_MODE);
+            if (pref != null) {
+                pref.setEnabled(isWfcEnabled && isWfcModeEditable
+                        && (state == TelephonyManager.CALL_STATE_IDLE));
+            }
+            Preference pref_roam =
+                    getPreferenceScreen().findPreference(BUTTON_WFC_ROAMING_MODE);
+            if (pref_roam != null) {
+                pref_roam.setEnabled(isWfcEnabled && isWfcRoamingModeEditable
+                        && (state == TelephonyManager.CALL_STATE_IDLE));
+            }
+        }
+    };
+
+    @Override
+    public int getHelpResource() {
+        // Helper resource is already defined in the container fragment.
+        return 0;
+    }
+
+    private final OnPreferenceClickListener mUpdateAddressListener =
+            new OnPreferenceClickListener() {
+                /*
+                 * Launch carrier emergency address managemnent activity
+                 */
+                @Override
+                public boolean onPreferenceClick(Preference preference) {
+                    Intent carrierAppIntent = getCarrierActivityIntent();
+                    if (carrierAppIntent != null) {
+                        carrierAppIntent.putExtra(EXTRA_LAUNCH_CARRIER_APP, LAUCH_APP_UPDATE);
+                        startActivity(carrierAppIntent);
+                    }
+                    return true;
+                }
+            };
+
+    @Override
+    public void onActivityCreated(Bundle savedInstanceState) {
+        super.onActivityCreated(savedInstanceState);
+
+        final SettingsActivity activity = (SettingsActivity) getActivity();
+
+        mEmptyView = (TextView) getView().findViewById(android.R.id.empty);
+        setEmptyView(mEmptyView);
+        String emptyViewText = activity.getString(R.string.wifi_calling_off_explanation)
+                + activity.getString(R.string.wifi_calling_off_explanation_2);
+        mEmptyView.setText(emptyViewText);
+
+        mSwitchBar = getView().findViewById(R.id.switch_bar);
+        mSwitchBar.show();
+        mSwitch = mSwitchBar.getSwitch();
+    }
+
+    @Override
+    public void onDestroyView() {
+        super.onDestroyView();
+        mSwitchBar.hide();
+    }
+
+    private void showAlert(Intent intent) {
+        Context context = getActivity();
+
+        CharSequence title = intent.getCharSequenceExtra(Phone.EXTRA_KEY_ALERT_TITLE);
+        CharSequence message = intent.getCharSequenceExtra(Phone.EXTRA_KEY_ALERT_MESSAGE);
+
+        AlertDialog.Builder builder = new AlertDialog.Builder(context);
+        builder.setMessage(message)
+                .setTitle(title)
+                .setIcon(android.R.drawable.ic_dialog_alert)
+                .setPositiveButton(android.R.string.ok, null);
+        AlertDialog dialog = builder.create();
+        dialog.show();
+    }
+
+    private IntentFilter mIntentFilter;
+
+    private BroadcastReceiver mIntentReceiver = new BroadcastReceiver() {
+        @Override
+        public void onReceive(Context context, Intent intent) {
+            String action = intent.getAction();
+            if (action.equals(ImsManager.ACTION_IMS_REGISTRATION_ERROR)) {
+                // If this fragment is active then we are immediately
+                // showing alert on screen. There is no need to add
+                // notification in this case.
+                //
+                // In order to communicate to ImsPhone that it should
+                // not show notification, we are changing result code here.
+                setResultCode(Activity.RESULT_CANCELED);
+
+                // UX requirement is to disable WFC in case of "permanent" registration failures.
+                mSwitch.setChecked(false);
+
+                showAlert(intent);
+            }
+        }
+    };
+
+    @Override
+    public int getMetricsCategory() {
+        return MetricsEvent.WIFI_CALLING_FOR_SUB;
+    }
+
+    @Override
+    public void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+
+        addPreferencesFromResource(R.xml.wifi_calling_settings);
+
+        // SubId should always be specified when creating this fragment. Either through
+        // fragment.setArguments() or through savedInstanceState.
+        if (getArguments() != null && getArguments().containsKey(FRAGMENT_BUNDLE_SUBID))
+        {
+            mSubId = getArguments().getInt(FRAGMENT_BUNDLE_SUBID);
+        } else if (savedInstanceState != null) {
+            mSubId = savedInstanceState.getInt(
+                    FRAGMENT_BUNDLE_SUBID, SubscriptionManager.INVALID_SUBSCRIPTION_ID);
+        }
+
+        mImsManager = ImsManager.getInstance(
+                getActivity(), SubscriptionManager.getPhoneId(mSubId));
+
+        mButtonWfcMode = (ListPreference) findPreference(BUTTON_WFC_MODE);
+        mButtonWfcMode.setOnPreferenceChangeListener(this);
+
+        mButtonWfcRoamingMode = (ListPreference) findPreference(BUTTON_WFC_ROAMING_MODE);
+        mButtonWfcRoamingMode.setOnPreferenceChangeListener(this);
+
+        mUpdateAddress = (Preference) findPreference(PREFERENCE_EMERGENCY_ADDRESS);
+        mUpdateAddress.setOnPreferenceClickListener(mUpdateAddressListener);
+
+        mIntentFilter = new IntentFilter();
+        mIntentFilter.addAction(ImsManager.ACTION_IMS_REGISTRATION_ERROR);
+    }
+
+    @Override
+    public void onSaveInstanceState(Bundle outState) {
+        outState.putInt(FRAGMENT_BUNDLE_SUBID, mSubId);
+        super.onSaveInstanceState(outState);
+    }
+
+    @Override
+    public View onCreateView(LayoutInflater inflater, ViewGroup container,
+            Bundle savedInstanceState) {
+
+        View view = inflater.inflate(
+                R.layout.wifi_calling_settings_preferences, container, false);
+
+        final ViewGroup prefs_container = view.findViewById(R.id.prefs_container);
+        Utils.prepareCustomPreferencesList(container, view, prefs_container, false);
+        View prefs = super.onCreateView(inflater, prefs_container, savedInstanceState);
+        prefs_container.addView(prefs);
+
+        return view;
+    }
+
+    private void updateBody() {
+        CarrierConfigManager configManager = (CarrierConfigManager)
+                getSystemService(Context.CARRIER_CONFIG_SERVICE);
+        boolean isWifiOnlySupported = true;
+
+        if (configManager != null) {
+            PersistableBundle b = configManager.getConfigForSubId(mSubId);
+            if (b != null) {
+                mEditableWfcMode = b.getBoolean(
+                        CarrierConfigManager.KEY_EDITABLE_WFC_MODE_BOOL);
+                mEditableWfcRoamingMode = b.getBoolean(
+                        CarrierConfigManager.KEY_EDITABLE_WFC_ROAMING_MODE_BOOL);
+                isWifiOnlySupported = b.getBoolean(
+                        CarrierConfigManager.KEY_CARRIER_WFC_SUPPORTS_WIFI_ONLY_BOOL, true);
+            }
+        }
+
+        if (!isWifiOnlySupported) {
+            mButtonWfcMode.setEntries(R.array.wifi_calling_mode_choices_without_wifi_only);
+            mButtonWfcMode.setEntryValues(R.array.wifi_calling_mode_values_without_wifi_only);
+            mButtonWfcRoamingMode.setEntries(
+                    R.array.wifi_calling_mode_choices_v2_without_wifi_only);
+            mButtonWfcRoamingMode.setEntryValues(
+                    R.array.wifi_calling_mode_values_without_wifi_only);
+        }
+
+
+        // NOTE: Buttons will be enabled/disabled in mPhoneStateListener
+        boolean wfcEnabled = mImsManager.isWfcEnabledByUser()
+                && mImsManager.isNonTtyOrTtyOnVolteEnabled();
+        mSwitch.setChecked(wfcEnabled);
+        int wfcMode = mImsManager.getWfcMode(false);
+        int wfcRoamingMode = mImsManager.getWfcMode(true);
+        mButtonWfcMode.setValue(Integer.toString(wfcMode));
+        mButtonWfcRoamingMode.setValue(Integer.toString(wfcRoamingMode));
+        updateButtonWfcMode(wfcEnabled, wfcMode, wfcRoamingMode);
+    }
+
+    @Override
+    public void onResume() {
+        super.onResume();
+
+        final Context context = getActivity();
+
+        updateBody();
+
+        if (mImsManager.isWfcEnabledByPlatform()) {
+            TelephonyManager tm =
+                    (TelephonyManager) getSystemService(Context.TELEPHONY_SERVICE);
+            tm.listen(mPhoneStateListener, PhoneStateListener.LISTEN_CALL_STATE);
+
+            mSwitchBar.addOnSwitchChangeListener(this);
+
+            mValidListener = true;
+        }
+
+        context.registerReceiver(mIntentReceiver, mIntentFilter);
+
+        Intent intent = getActivity().getIntent();
+        if (intent.getBooleanExtra(Phone.EXTRA_KEY_ALERT_SHOW, false)) {
+            showAlert(intent);
+        }
+    }
+
+    @Override
+    public void onPause() {
+        super.onPause();
+
+        final Context context = getActivity();
+
+        if (mValidListener) {
+            mValidListener = false;
+
+            TelephonyManager tm = (TelephonyManager) getSystemService(Context.TELEPHONY_SERVICE);
+            tm.listen(mPhoneStateListener, PhoneStateListener.LISTEN_NONE);
+
+            mSwitchBar.removeOnSwitchChangeListener(this);
+        }
+
+        context.unregisterReceiver(mIntentReceiver);
+    }
+
+    /**
+     * Listens to the state change of the switch.
+     */
+    @Override
+    public void onSwitchChanged(Switch switchView, boolean isChecked) {
+        Log.d(TAG, "onSwitchChanged(" + isChecked + ")");
+
+        if (!isChecked) {
+            updateWfcMode(false);
+            return;
+        }
+
+        // Call address management activity before turning on WFC
+        Intent carrierAppIntent = getCarrierActivityIntent();
+        if (carrierAppIntent != null) {
+            carrierAppIntent.putExtra(EXTRA_LAUNCH_CARRIER_APP, LAUCH_APP_ACTIVATE);
+            startActivityForResult(carrierAppIntent, REQUEST_CHECK_WFC_EMERGENCY_ADDRESS);
+        } else {
+            updateWfcMode(true);
+        }
+    }
+
+    /*
+     * Get the Intent to launch carrier emergency address management activity.
+     * Return null when no activity found.
+     */
+    private Intent getCarrierActivityIntent() {
+        // Retrive component name from carrier config
+        CarrierConfigManager configManager =
+                getActivity().getSystemService(CarrierConfigManager.class);
+        if (configManager == null) return null;
+
+        PersistableBundle bundle = configManager.getConfigForSubId(mSubId);
+        if (bundle == null) return null;
+
+        String carrierApp = bundle.getString(
+                CarrierConfigManager.KEY_WFC_EMERGENCY_ADDRESS_CARRIER_APP_STRING);
+        if (TextUtils.isEmpty(carrierApp)) return null;
+
+        ComponentName componentName = ComponentName.unflattenFromString(carrierApp);
+        if (componentName == null) return null;
+
+        // Build and return intent
+        Intent intent = new Intent();
+        intent.setComponent(componentName);
+        return intent;
+    }
+
+    /*
+     * Turn on/off WFC mode with ImsManager and update UI accordingly
+     */
+    private void updateWfcMode(boolean wfcEnabled) {
+        Log.i(TAG, "updateWfcMode(" + wfcEnabled + ")");
+        mImsManager.setWfcSetting(wfcEnabled);
+
+        int wfcMode = mImsManager.getWfcMode(false);
+        int wfcRoamingMode = mImsManager.getWfcMode(true);
+        updateButtonWfcMode(wfcEnabled, wfcMode, wfcRoamingMode);
+        if (wfcEnabled) {
+            mMetricsFeatureProvider.action(getActivity(), getMetricsCategory(), wfcMode);
+        } else {
+            mMetricsFeatureProvider.action(getActivity(), getMetricsCategory(), -1);
+        }
+    }
+
+    @Override
+    public void onActivityResult(int requestCode, int resultCode, Intent data) {
+        super.onActivityResult(requestCode, resultCode, data);
+
+        final Context context = getActivity();
+
+        if (requestCode == REQUEST_CHECK_WFC_EMERGENCY_ADDRESS) {
+            Log.d(TAG, "WFC emergency address activity result = " + resultCode);
+
+            if (resultCode == Activity.RESULT_OK) {
+                updateWfcMode(true);
+            }
+        }
+    }
+
+    private void updateButtonWfcMode(boolean wfcEnabled,
+            int wfcMode, int wfcRoamingMode) {
+        mButtonWfcMode.setSummary(getWfcModeSummary(wfcMode));
+        mButtonWfcMode.setEnabled(wfcEnabled && mEditableWfcMode);
+        // mButtonWfcRoamingMode.setSummary is not needed; summary is just selected value.
+        mButtonWfcRoamingMode.setEnabled(wfcEnabled && mEditableWfcRoamingMode);
+
+        final PreferenceScreen preferenceScreen = getPreferenceScreen();
+        boolean updateAddressEnabled = (getCarrierActivityIntent() != null);
+        if (wfcEnabled) {
+            if (mEditableWfcMode) {
+                preferenceScreen.addPreference(mButtonWfcMode);
+            } else {
+                // Don't show WFC (home) preference if it's not editable.
+                preferenceScreen.removePreference(mButtonWfcMode);
+            }
+            if (mEditableWfcRoamingMode) {
+                preferenceScreen.addPreference(mButtonWfcRoamingMode);
+            } else {
+                // Don't show WFC roaming preference if it's not editable.
+                preferenceScreen.removePreference(mButtonWfcRoamingMode);
+            }
+            if (updateAddressEnabled) {
+                preferenceScreen.addPreference(mUpdateAddress);
+            } else {
+                preferenceScreen.removePreference(mUpdateAddress);
+            }
+        } else {
+            preferenceScreen.removePreference(mButtonWfcMode);
+            preferenceScreen.removePreference(mButtonWfcRoamingMode);
+            preferenceScreen.removePreference(mUpdateAddress);
+        }
+    }
+
+    @Override
+    public boolean onPreferenceChange(Preference preference, Object newValue) {
+        if (preference == mButtonWfcMode) {
+            Log.d(TAG, "onPreferenceChange mButtonWfcMode " + newValue);
+            mButtonWfcMode.setValue((String) newValue);
+            int buttonMode = Integer.valueOf((String) newValue);
+            int currentWfcMode = mImsManager.getWfcMode(false);
+            if (buttonMode != currentWfcMode) {
+                mImsManager.setWfcMode(buttonMode, false);
+                mButtonWfcMode.setSummary(getWfcModeSummary(buttonMode));
+                mMetricsFeatureProvider.action(getActivity(), getMetricsCategory(), buttonMode);
+            }
+            if (!mEditableWfcRoamingMode) {
+                int currentWfcRoamingMode = mImsManager.getWfcMode(true);
+                if (buttonMode != currentWfcRoamingMode) {
+                    mImsManager.setWfcMode(buttonMode, true);
+                    // mButtonWfcRoamingMode.setSummary is not needed; summary is selected value
+                }
+            }
+        } else if (preference == mButtonWfcRoamingMode) {
+            mButtonWfcRoamingMode.setValue((String) newValue);
+            int buttonMode = Integer.valueOf((String) newValue);
+            int currentMode = mImsManager.getWfcMode(true);
+            if (buttonMode != currentMode) {
+                mImsManager.setWfcMode(buttonMode, true);
+                // mButtonWfcRoamingMode.setSummary is not needed; summary is just selected value.
+                mMetricsFeatureProvider.action(getActivity(), getMetricsCategory(), buttonMode);
+            }
+        }
+        return true;
+    }
+
+    private int getWfcModeSummary(int wfcMode) {
+        int resId = com.android.internal.R.string.wifi_calling_off_summary;
+        if (mImsManager.isWfcEnabledByUser()) {
+            switch (wfcMode) {
+                case ImsConfig.WfcModeFeatureValueConstants.WIFI_ONLY:
+                    resId = com.android.internal.R.string.wfc_mode_wifi_only_summary;
+                    break;
+                case ImsConfig.WfcModeFeatureValueConstants.CELLULAR_PREFERRED:
+                    resId = com.android.internal.R.string.wfc_mode_cellular_preferred_summary;
+                    break;
+                case ImsConfig.WfcModeFeatureValueConstants.WIFI_PREFERRED:
+                    resId = com.android.internal.R.string.wfc_mode_wifi_preferred_summary;
+                    break;
+                default:
+                    Log.e(TAG, "Unexpected WFC mode value: " + wfcMode);
+            }
+        }
+        return resId;
+    }
+}
diff --git a/src/com/android/settings/WorkOnlyCategory.java b/src/com/android/settings/WorkOnlyCategory.java
deleted file mode 100644
index ca4c82d..0000000
--- a/src/com/android/settings/WorkOnlyCategory.java
+++ /dev/null
@@ -1,35 +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;
-
-import android.content.Context;
-import android.os.UserManager;
-import android.support.v7.preference.PreferenceCategory;
-import android.util.AttributeSet;
-
-/**
- * A PreferenceCategory that is only visible when the device has a work profile.
- */
-public class WorkOnlyCategory extends PreferenceCategory implements SelfAvailablePreference {
-
-    public WorkOnlyCategory(Context context, AttributeSet attrs) {
-        super(context, attrs);
-    }
-
-    @Override
-    public boolean isAvailable(Context context) {
-        return Utils.getManagedProfile(UserManager.get(context)) != null;
-    }
-}
diff --git a/src/com/android/settings/accessibility/AccessibilitySettings.java b/src/com/android/settings/accessibility/AccessibilitySettings.java
index 51b676d..0611b09 100644
--- a/src/com/android/settings/accessibility/AccessibilitySettings.java
+++ b/src/com/android/settings/accessibility/AccessibilitySettings.java
@@ -20,6 +20,7 @@
 import android.app.admin.DevicePolicyManager;
 import android.content.ComponentName;
 import android.content.Context;
+import android.content.pm.ResolveInfo;
 import android.content.pm.ServiceInfo;
 import android.content.res.Resources;
 import android.graphics.drawable.Drawable;
@@ -45,7 +46,6 @@
 import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
 import com.android.internal.view.RotationPolicy;
 import com.android.internal.view.RotationPolicy.RotationPolicyListener;
-import com.android.settings.DisplaySettings;
 import com.android.settings.R;
 import com.android.settings.SettingsPreferenceFragment;
 import com.android.settings.Utils;
@@ -80,8 +80,8 @@
     private static final String CATEGORY_DOWNLOADED_SERVICES = "user_installed_services_category";
 
     private static final String[] CATEGORIES = new String[] {
-        CATEGORY_SCREEN_READER, CATEGORY_AUDIO_AND_CAPTIONS, CATEGORY_DISPLAY,
-        CATEGORY_INTERACTION_CONTROL, CATEGORY_EXPERIMENTAL, CATEGORY_DOWNLOADED_SERVICES
+            CATEGORY_SCREEN_READER, CATEGORY_AUDIO_AND_CAPTIONS, CATEGORY_DISPLAY,
+            CATEGORY_INTERACTION_CONTROL, CATEGORY_EXPERIMENTAL, CATEGORY_DOWNLOADED_SERVICES
     };
 
     // Preferences
@@ -107,6 +107,8 @@
             "magnification_preference_screen";
     private static final String FONT_SIZE_PREFERENCE_SCREEN =
             "font_size_preference_screen";
+    private static final String TTS_SETTINGS_PREFERENCE =
+            "tts_settings_preference";
     private static final String AUTOCLICK_PREFERENCE_SCREEN =
             "autoclick_preference_screen";
     private static final String DISPLAY_DALTONIZER_PREFERENCE_SCREEN =
@@ -116,6 +118,8 @@
     static final String EXTRA_PREFERENCE_KEY = "preference_key";
     static final String EXTRA_CHECKED = "checked";
     static final String EXTRA_TITLE = "title";
+    static final String EXTRA_TITLE_RES = "title_res";
+    static final String EXTRA_RESOLVE_INFO = "resolve_info";
     static final String EXTRA_SUMMARY = "summary";
     static final String EXTRA_SETTINGS_TITLE = "settings_title";
     static final String EXTRA_COMPONENT_NAME = "component_name";
@@ -214,7 +218,6 @@
      * on non-accelerated platforms due to the performance implications.
      *
      * @param context The current context
-     * @return
      */
     public static boolean isColorTransformAccelerated(Context context) {
         return context.getResources()
@@ -227,7 +230,7 @@
     }
 
     @Override
-    protected int getHelpResource() {
+    public int getHelpResource() {
         return R.string.help_uri_accessibility;
     }
 
@@ -462,28 +465,28 @@
         }
 
         for (int i = 0, count = installedServices.size(); i < count; ++i) {
-            AccessibilityServiceInfo info = installedServices.get(i);
+            final AccessibilityServiceInfo info = installedServices.get(i);
+            final ResolveInfo resolveInfo = info.getResolveInfo();
 
             RestrictedPreference preference =
                     new RestrictedPreference(downloadedServicesCategory.getContext());
-            String title = info.getResolveInfo().loadLabel(getPackageManager()).toString();
+            final String title = resolveInfo.loadLabel(getPackageManager()).toString();
 
             Drawable icon;
-            if (info.getResolveInfo().getIconResource() == 0) {
+            if (resolveInfo.getIconResource() == 0) {
                 icon = ContextCompat.getDrawable(getContext(), R.mipmap.ic_accessibility_generic);
             } else {
-                icon = info.getResolveInfo().loadIcon(getPackageManager());
+                icon = resolveInfo.loadIcon(getPackageManager());
             }
 
-            ServiceInfo serviceInfo = info.getResolveInfo().serviceInfo;
+            ServiceInfo serviceInfo = resolveInfo.serviceInfo;
             String packageName = serviceInfo.packageName;
             ComponentName componentName = new ComponentName(packageName, serviceInfo.name);
-            String componentNameKey = componentName.flattenToString();
 
             preference.setKey(componentName.flattenToString());
 
             preference.setTitle(title);
-            preference.setIcon(icon);
+            Utils.setSafeIcon(preference, icon);
             final boolean serviceEnabled = accessibilityEnabled
                     && enabledServices.contains(componentName);
             final String serviceState = serviceEnabled ?
@@ -518,6 +521,7 @@
             extras.putString(EXTRA_PREFERENCE_KEY, preference.getKey());
             extras.putBoolean(EXTRA_CHECKED, serviceEnabled);
             extras.putString(EXTRA_TITLE, title);
+            extras.putParcelable(EXTRA_RESOLVE_INFO, resolveInfo);
 
             String description = info.loadDescription(getPackageManager());
             if (TextUtils.isEmpty(description)) {
@@ -726,24 +730,29 @@
     public static final SearchIndexProvider SEARCH_INDEX_DATA_PROVIDER =
             new BaseSearchIndexProvider() {
 
-        @Override
-        public List<SearchIndexableResource> getXmlResourcesToIndex(Context context,
-               boolean enabled) {
-            List<SearchIndexableResource> indexables = new ArrayList<>();
-            SearchIndexableResource indexable = new SearchIndexableResource(context);
-            indexable.xmlResId = R.xml.accessibility_settings;
-            indexables.add(indexable);
-            return indexables;
-        }
+                public static final String KEY_DISPLAY_SIZE = "accessibility_settings_screen_zoom";
 
-        @Override
-        public List<String> getNonIndexableKeys(Context context) {
-            List<String> keys = super.getNonIndexableKeys(context);
-            // Duplicates in Display
-            keys.add(FONT_SIZE_PREFERENCE_SCREEN);
-            keys.add(DisplaySettings.KEY_DISPLAY_SIZE);
+                @Override
+                public List<SearchIndexableResource> getXmlResourcesToIndex(Context context,
+                        boolean enabled) {
+                    List<SearchIndexableResource> indexables = new ArrayList<>();
+                    SearchIndexableResource indexable = new SearchIndexableResource(context);
+                    indexable.xmlResId = R.xml.accessibility_settings;
+                    indexables.add(indexable);
+                    return indexables;
+                }
 
-            return keys;
-        }
-    };
+                @Override
+                public List<String> getNonIndexableKeys(Context context) {
+                    List<String> keys = super.getNonIndexableKeys(context);
+                    // Duplicates in Display
+                    keys.add(FONT_SIZE_PREFERENCE_SCREEN);
+                    keys.add(KEY_DISPLAY_SIZE);
+
+                    // Duplicates in Language & Input
+                    keys.add(TTS_SETTINGS_PREFERENCE);
+
+                    return keys;
+                }
+            };
 }
diff --git a/src/com/android/settings/accessibility/AccessibilitySettingsForSetupWizardActivity.java b/src/com/android/settings/accessibility/AccessibilitySettingsForSetupWizardActivity.java
index b820cc2..f6e044e 100644
--- a/src/com/android/settings/accessibility/AccessibilitySettingsForSetupWizardActivity.java
+++ b/src/com/android/settings/accessibility/AccessibilitySettingsForSetupWizardActivity.java
@@ -17,22 +17,14 @@
 package com.android.settings.accessibility;
 
 import android.app.Fragment;
-import android.app.FragmentTransaction;
 import android.os.Bundle;
 import android.text.TextUtils;
-import android.view.accessibility.AccessibilityEvent;
-import android.view.LayoutInflater;
 import android.view.Menu;
-import android.view.View;
-import android.view.WindowInsets;
-import android.widget.FrameLayout;
-import android.widget.LinearLayout;
+import android.view.accessibility.AccessibilityEvent;
 
-import com.android.settings.R;
 import com.android.settings.SettingsActivity;
-import com.android.settings.SettingsPreferenceFragment;
-import com.android.setupwizardlib.util.SystemBarHelper;
-import com.android.setupwizardlib.view.NavigationBar;
+import com.android.settings.search.actionbar.SearchMenuController;
+import com.android.settings.support.actionbar.HelpResourceProvider;
 
 public class AccessibilitySettingsForSetupWizardActivity extends SettingsActivity {
 
@@ -94,7 +86,8 @@
         }
 
         // Start the new Fragment.
-        args.putInt(SettingsPreferenceFragment.HELP_URI_RESOURCE_KEY, 0);
+        args.putInt(HelpResourceProvider.HELP_URI_RESOURCE_KEY, 0);
+        args.putBoolean(SearchMenuController.NEED_SEARCH_ICON_IN_ACTION_BAR, false);
         startPreferenceFragment(Fragment.instantiate(this, fragmentClass, args), true);
         mSendExtraWindowStateChanged = true;
     }
diff --git a/src/com/android/settings/accessibility/AccessibilityShortcutPreferenceFragment.java b/src/com/android/settings/accessibility/AccessibilityShortcutPreferenceFragment.java
index 4e95cad..db121e2 100644
--- a/src/com/android/settings/accessibility/AccessibilityShortcutPreferenceFragment.java
+++ b/src/com/android/settings/accessibility/AccessibilityShortcutPreferenceFragment.java
@@ -24,7 +24,6 @@
 import android.provider.Settings;
 import android.support.v14.preference.SwitchPreference;
 import android.support.v7.preference.Preference;
-import android.text.TextUtils;
 import android.view.accessibility.AccessibilityManager;
 import android.widget.Switch;
 
@@ -52,7 +51,7 @@
     }
 
     @Override
-    protected int getHelpResource() {
+    public int getHelpResource() {
         return R.string.help_url_accessibility_shortcut;
     }
 
@@ -60,7 +59,6 @@
     public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
 
-        addPreferencesFromResource(R.xml.accessibility_shortcut_settings);
         mServicePreference = findPreference(SHORTCUT_SERVICE_KEY);
         mOnLockScreenSwitchPreference = (SwitchPreference) findPreference(ON_LOCK_SCREEN_KEY);
         mOnLockScreenSwitchPreference.setOnPreferenceChangeListener((Preference p, Object o) -> {
@@ -80,6 +78,11 @@
     }
 
     @Override
+    protected int getPreferenceScreenResId() {
+        return R.xml.accessibility_shortcut_settings;
+    }
+
+    @Override
     protected void onInstallSwitchBarToggleSwitch() {
         super.onInstallSwitchBarToggleSwitch();
         mSwitchBar.addOnSwitchChangeListener((Switch switchView, boolean enabled) -> {
diff --git a/src/com/android/settings/accessibility/MagnificationPreferenceFragment.java b/src/com/android/settings/accessibility/MagnificationPreferenceFragment.java
index 9715559..24e87fc 100644
--- a/src/com/android/settings/accessibility/MagnificationPreferenceFragment.java
+++ b/src/com/android/settings/accessibility/MagnificationPreferenceFragment.java
@@ -66,7 +66,7 @@
     }
 
     @Override
-    protected int getHelpResource() {
+    public int getHelpResource() {
         return R.string.help_url_magnification;
     }
 
@@ -141,6 +141,8 @@
                 Settings.Secure.ACCESSIBILITY_DISPLAY_MAGNIFICATION_NAVBAR_ENABLED);
         extras.putString(AccessibilitySettings.EXTRA_TITLE, getString(
                 R.string.accessibility_screen_magnification_navbar_title));
+        extras.putInt(AccessibilitySettings.EXTRA_TITLE_RES,
+                R.string.accessibility_screen_magnification_navbar_title);
         extras.putCharSequence(AccessibilitySettings.EXTRA_SUMMARY,
                 getActivity().getResources().getText(
                         R.string.accessibility_screen_magnification_navbar_summary));
@@ -190,6 +192,8 @@
                 Settings.Secure.ACCESSIBILITY_DISPLAY_MAGNIFICATION_ENABLED);
         extras.putString(AccessibilitySettings.EXTRA_TITLE, context.getString(
                 R.string.accessibility_screen_magnification_gestures_title));
+        extras.putInt(AccessibilitySettings.EXTRA_TITLE_RES,
+                R.string.accessibility_screen_magnification_gestures_title);
         extras.putCharSequence(AccessibilitySettings.EXTRA_SUMMARY, context.getResources().getText(
                 R.string.accessibility_screen_magnification_summary));
         extras.putBoolean(AccessibilitySettings.EXTRA_CHECKED,
diff --git a/src/com/android/settings/accessibility/OWNERS b/src/com/android/settings/accessibility/OWNERS
index 3394323..28dfdef 100644
--- a/src/com/android/settings/accessibility/OWNERS
+++ b/src/com/android/settings/accessibility/OWNERS
@@ -1,2 +1,3 @@
 # Default reviewers for this and subdirectories.
 pweaver@google.com
+zork@google.com
\ No newline at end of file
diff --git a/src/com/android/settings/accessibility/ShortcutServicePickerFragment.java b/src/com/android/settings/accessibility/ShortcutServicePickerFragment.java
index 07f4c37..5b0e76d 100644
--- a/src/com/android/settings/accessibility/ShortcutServicePickerFragment.java
+++ b/src/com/android/settings/accessibility/ShortcutServicePickerFragment.java
@@ -23,6 +23,7 @@
 import android.app.DialogFragment;
 import android.app.Fragment;
 import android.content.ComponentName;
+import android.content.Context;
 import android.content.DialogInterface;
 import android.os.Binder;
 import android.os.Bundle;
@@ -33,6 +34,7 @@
 import android.view.accessibility.AccessibilityManager;
 
 import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
+import com.android.settings.R;
 import com.android.settings.applications.defaultapps.DefaultAppInfo;
 import com.android.settings.applications.defaultapps.DefaultAppPickerFragment;
 import com.android.settings.core.instrumentation.InstrumentedDialogFragment;
@@ -53,8 +55,14 @@
     }
 
     @Override
+    protected int getPreferenceScreenResId() {
+        return R.xml.accessibility_shortcut_service_settings;
+    }
+
+    @Override
     protected List<? extends DefaultAppInfo> getCandidates() {
-        final AccessibilityManager accessibilityManager = getContext()
+        final Context context = getContext();
+        final AccessibilityManager accessibilityManager = context
                 .getSystemService(AccessibilityManager.class);
         final List<AccessibilityServiceInfo> installedServices =
                 accessibilityManager.getInstalledAccessibilityServiceList();
@@ -63,7 +71,7 @@
         List<DefaultAppInfo> candidates = new ArrayList<>(numInstalledServices);
         for (int i = 0; i < numInstalledServices; i++) {
             AccessibilityServiceInfo installedServiceInfo = installedServices.get(i);
-            candidates.add(new DefaultAppInfo(mPm,
+            candidates.add(new DefaultAppInfo(context, mPm,
                     UserHandle.myUserId(),
                     installedServiceInfo.getComponentName(),
                     (String) installedServiceInfo.loadSummary(mPm.getPackageManager()),
diff --git a/src/com/android/settings/accessibility/ToggleAutoclickPreferenceFragment.java b/src/com/android/settings/accessibility/ToggleAutoclickPreferenceFragment.java
index 16df03e..acb918c 100644
--- a/src/com/android/settings/accessibility/ToggleAutoclickPreferenceFragment.java
+++ b/src/com/android/settings/accessibility/ToggleAutoclickPreferenceFragment.java
@@ -20,7 +20,6 @@
 import android.os.Bundle;
 import android.provider.Settings;
 import android.support.v7.preference.Preference;
-import android.view.View;
 import android.view.accessibility.AccessibilityManager;
 import android.widget.Switch;
 
@@ -29,7 +28,6 @@
 import com.android.settings.widget.SeekBarPreference;
 import com.android.settings.widget.SwitchBar;
 
-
 /**
  * Fragment for preference screen for settings related to Automatically click after mouse stops
  * feature.
@@ -105,16 +103,19 @@
     }
 
     @Override
-    protected int getHelpResource() {
+    public int getHelpResource() {
         return R.string.help_url_autoclick;
     }
 
     @Override
+    protected int getPreferenceScreenResId() {
+        return R.xml.accessibility_autoclick_settings;
+    }
+
+    @Override
     public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
 
-        addPreferencesFromResource(R.xml.accessibility_autoclick_settings);
-
         int delay = Settings.Secure.getInt(
                 getContentResolver(), Settings.Secure.ACCESSIBILITY_AUTOCLICK_DELAY,
                 AccessibilityManager.AUTOCLICK_DELAY_DEFAULT);
@@ -150,13 +151,6 @@
     }
 
     @Override
-    public void onViewCreated(View view, Bundle savedInstanceState) {
-        super.onViewCreated(view, savedInstanceState);
-
-        setTitle(getString(R.string.accessibility_autoclick_preference_title));
-    }
-
-    @Override
     public boolean onPreferenceChange(Preference preference, Object newValue) {
         if (preference == mDelay && newValue instanceof Integer) {
             Settings.Secure.putInt(getContentResolver(),
diff --git a/src/com/android/settings/accessibility/ToggleDaltonizerPreferenceFragment.java b/src/com/android/settings/accessibility/ToggleDaltonizerPreferenceFragment.java
index 64d38af..146f697 100644
--- a/src/com/android/settings/accessibility/ToggleDaltonizerPreferenceFragment.java
+++ b/src/com/android/settings/accessibility/ToggleDaltonizerPreferenceFragment.java
@@ -20,7 +20,6 @@
 import android.provider.Settings;
 import android.support.v7.preference.ListPreference;
 import android.support.v7.preference.Preference;
-import android.view.View;
 import android.view.accessibility.AccessibilityManager;
 import android.widget.Switch;
 
@@ -42,7 +41,7 @@
     }
 
     @Override
-    protected int getHelpResource() {
+    public int getHelpResource() {
         return R.string.help_url_color_correction;
     }
 
@@ -50,8 +49,6 @@
     public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
 
-        addPreferencesFromResource(R.xml.accessibility_daltonizer_settings);
-
         mType = (ListPreference) findPreference("type");
 
         if (!AccessibilitySettings.isColorTransformAccelerated(getActivity())) {
@@ -62,6 +59,11 @@
     }
 
     @Override
+    protected int getPreferenceScreenResId() {
+        return R.xml.accessibility_daltonizer_settings;
+    }
+
+    @Override
     protected void onPreferenceToggled(String preferenceKey, boolean enabled) {
         Settings.Secure.putInt(getContentResolver(), ENABLED, enabled ? 1 : 0);
     }
@@ -77,13 +79,6 @@
     }
 
     @Override
-    public void onViewCreated(View view, Bundle savedInstanceState) {
-        super.onViewCreated(view, savedInstanceState);
-
-        setTitle(getString(R.string.accessibility_display_daltonizer_preference_title));
-    }
-
-    @Override
     protected void onInstallSwitchBarToggleSwitch() {
         super.onInstallSwitchBarToggleSwitch();
 
diff --git a/src/com/android/settings/accessibility/ToggleFeaturePreferenceFragment.java b/src/com/android/settings/accessibility/ToggleFeaturePreferenceFragment.java
index f66fb4d..85d3a2f 100644
--- a/src/com/android/settings/accessibility/ToggleFeaturePreferenceFragment.java
+++ b/src/com/android/settings/accessibility/ToggleFeaturePreferenceFragment.java
@@ -17,26 +17,18 @@
 package com.android.settings.accessibility;
 
 import android.content.Intent;
+import android.content.pm.ResolveInfo;
 import android.os.Bundle;
 import android.support.v7.preference.Preference;
 import android.support.v7.preference.PreferenceScreen;
-import android.support.v7.preference.PreferenceViewHolder;
-import android.view.Menu;
-import android.view.MenuInflater;
-import android.view.MenuItem;
 import android.view.View;
-import android.view.accessibility.AccessibilityEvent;
-import android.view.accessibility.AccessibilityManager;
-import android.widget.TextView;
 
-import com.android.settings.R;
 import com.android.settings.SettingsActivity;
 import com.android.settings.SettingsPreferenceFragment;
 import com.android.settings.widget.SwitchBar;
 import com.android.settings.widget.ToggleSwitch;
 
-public abstract class ToggleFeaturePreferenceFragment
-        extends SettingsPreferenceFragment {
+public abstract class ToggleFeaturePreferenceFragment extends SettingsPreferenceFragment {
 
     protected SwitchBar mSwitchBar;
     protected ToggleSwitch mToggleSwitch;
@@ -49,9 +41,12 @@
     @Override
     public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-        PreferenceScreen preferenceScreen = getPreferenceManager().createPreferenceScreen(
-                getActivity());
-        setPreferenceScreen(preferenceScreen);
+        final int resId = getPreferenceScreenResId();
+        if (resId <= 0) {
+            PreferenceScreen preferenceScreen = getPreferenceManager().createPreferenceScreen(
+                    getActivity());
+            setPreferenceScreen(preferenceScreen);
+        }
     }
 
     @Override
@@ -124,7 +119,10 @@
         }
 
         // Title.
-        if (arguments.containsKey(AccessibilitySettings.EXTRA_TITLE)) {
+        if (arguments.containsKey(AccessibilitySettings.EXTRA_RESOLVE_INFO)) {
+            ResolveInfo info = arguments.getParcelable(AccessibilitySettings.EXTRA_RESOLVE_INFO);
+            getActivity().setTitle(info.loadLabel(getPackageManager()).toString());
+        } else if (arguments.containsKey(AccessibilitySettings.EXTRA_TITLE)) {
             setTitle(arguments.getString(AccessibilitySettings.EXTRA_TITLE));
         }
 
diff --git a/src/com/android/settings/accessibility/ToggleFontSizePreferenceFragment.java b/src/com/android/settings/accessibility/ToggleFontSizePreferenceFragment.java
index c200d17..8c15e5b 100644
--- a/src/com/android/settings/accessibility/ToggleFontSizePreferenceFragment.java
+++ b/src/com/android/settings/accessibility/ToggleFontSizePreferenceFragment.java
@@ -52,6 +52,7 @@
         for (int i = 0; i < strEntryValues.length; ++i) {
             mValues[i] = Float.parseFloat(strEntryValues[i]);
         }
+        getActivity().setTitle(R.string.title_font_size);
     }
 
     @Override
diff --git a/src/com/android/settings/accessibility/ToggleScreenMagnificationPreferenceFragment.java b/src/com/android/settings/accessibility/ToggleScreenMagnificationPreferenceFragment.java
index 033d81b..ecb4b9f 100644
--- a/src/com/android/settings/accessibility/ToggleScreenMagnificationPreferenceFragment.java
+++ b/src/com/android/settings/accessibility/ToggleScreenMagnificationPreferenceFragment.java
@@ -107,8 +107,6 @@
                     videoView.setLayoutParams(videoLp);
                     videoView.invalidate();
                     videoView.start();
-                    mVideoBackgroundView.getViewTreeObserver()
-                            .removeOnGlobalLayoutListener(mLayoutListener);
                 }
             };
 
@@ -217,6 +215,13 @@
         if (arguments.containsKey(AccessibilitySettings.EXTRA_CHECKED)) {
             mInitialSetting = arguments.getBoolean(AccessibilitySettings.EXTRA_CHECKED);
         }
+
+        if (arguments.containsKey(AccessibilitySettings.EXTRA_TITLE_RES)) {
+            final int titleRes = arguments.getInt(AccessibilitySettings.EXTRA_TITLE_RES);
+            if (titleRes > 0) {
+                getActivity().setTitle(titleRes);
+            }
+        }
     }
 
     private void updateConfigurationWarningIfNeeded() {
diff --git a/src/com/android/settings/accounts/AccountDetailDashboardFragment.java b/src/com/android/settings/accounts/AccountDetailDashboardFragment.java
index 53664f5..9239b8e 100644
--- a/src/com/android/settings/accounts/AccountDetailDashboardFragment.java
+++ b/src/com/android/settings/accounts/AccountDetailDashboardFragment.java
@@ -99,7 +99,7 @@
     }
 
     @Override
-    protected int getHelpResource() {
+    public int getHelpResource() {
         return R.string.help_url_account_detail;
     }
 
diff --git a/src/com/android/settings/accounts/AccountPreferenceBase.java b/src/com/android/settings/accounts/AccountPreferenceBase.java
index 7c3b54c..54ddf64 100644
--- a/src/com/android/settings/accounts/AccountPreferenceBase.java
+++ b/src/com/android/settings/accounts/AccountPreferenceBase.java
@@ -23,18 +23,16 @@
 import android.content.SyncStatusObserver;
 import android.graphics.drawable.Drawable;
 import android.os.Bundle;
-import android.os.Handler;
 import android.os.UserHandle;
 import android.os.UserManager;
-import android.support.v7.preference.PreferenceScreen;
 import android.text.format.DateFormat;
 import android.util.Log;
 
 import com.android.settings.SettingsPreferenceFragment;
 import com.android.settings.Utils;
 import com.android.settingslib.accounts.AuthenticatorHelper;
+import com.android.settingslib.utils.ThreadUtils;
 
-import java.util.ArrayList;
 import java.util.Date;
 
 abstract class AccountPreferenceBase extends SettingsPreferenceFragment
@@ -46,8 +44,6 @@
     public static final String AUTHORITIES_FILTER_KEY = "authorities";
     public static final String ACCOUNT_TYPES_FILTER_KEY = "account_types";
 
-    private final Handler mHandler = new Handler();
-
     private UserManager mUm;
     private Object mStatusChangeListenerHandle;
     protected AuthenticatorHelper mAuthenticatorHelper;
@@ -118,29 +114,8 @@
         ContentResolver.removeStatusChangeListener(mStatusChangeListenerHandle);
     }
 
-    private SyncStatusObserver mSyncStatusObserver = new SyncStatusObserver() {
-        public void onStatusChanged(int which) {
-            mHandler.post(new Runnable() {
-                public void run() {
-                    onSyncStateUpdated();
-                }
-            });
-        }
-    };
-
-    public ArrayList<String> getAuthoritiesForAccountType(String type) {
-        return mAuthenticatorHelper.getAuthoritiesForAccountType(type);
-    }
-
-    /**
-     * Gets the preferences.xml file associated with a particular account type.
-     * @param accountType the type of account
-     * @return a PreferenceScreen inflated from accountPreferenceId.
-     */
-    public PreferenceScreen addPreferencesForType(final String accountType,
-            PreferenceScreen parent) {
-        return mAccountTypePreferenceLoader.addPreferencesForType(accountType, parent);
-    }
+    private SyncStatusObserver mSyncStatusObserver =
+            which -> ThreadUtils.postOnMainThread(() -> onSyncStateUpdated());
 
     public void updateAuthDescriptions() {
         mAuthenticatorHelper.updateAuthDescriptions(getActivity());
diff --git a/src/com/android/settings/accounts/AccountPreferenceController.java b/src/com/android/settings/accounts/AccountPreferenceController.java
index 246baff..c0bf7d2 100644
--- a/src/com/android/settings/accounts/AccountPreferenceController.java
+++ b/src/com/android/settings/accounts/AccountPreferenceController.java
@@ -46,7 +46,6 @@
 
 import com.android.internal.annotations.VisibleForTesting;
 import com.android.settings.AccessiblePreferenceCategory;
-import com.android.settings.DimmableIconPreference;
 import com.android.settings.R;
 import com.android.settings.SettingsActivity;
 import com.android.settings.SettingsPreferenceFragment;
@@ -54,7 +53,6 @@
 import com.android.settings.core.PreferenceControllerMixin;
 import com.android.settings.core.instrumentation.MetricsFeatureProvider;
 import com.android.settings.overlay.FeatureFactory;
-import com.android.settings.search.SearchFeatureProviderImpl;
 import com.android.settings.search.SearchIndexableRaw;
 import com.android.settingslib.RestrictedPreference;
 import com.android.settingslib.accounts.AuthenticatorHelper;
@@ -102,7 +100,7 @@
         /**
          * The preference that displays the add account button.
          */
-        public DimmableIconPreference addAccountPreference;
+        public RestrictedPreference addAccountPreference;
         /**
          * The preference that displays the button to remove the managed profile
          */
@@ -324,7 +322,7 @@
             preferenceGroup.setSummary(workGroupSummary);
             preferenceGroup.setContentDescription(
                 mContext.getString(R.string.accessibility_category_work, workGroupSummary));
-            profileData.removeWorkProfilePreference = newRemoveWorkProfilePreference(context);
+            profileData.removeWorkProfilePreference = newRemoveWorkProfilePreference();
             mHelper.enforceRestrictionOnPreference(profileData.removeWorkProfilePreference,
                 DISALLOW_REMOVE_MANAGED_PROFILE, UserHandle.myUserId());
             profileData.managedProfilePreference = newManagedProfileSettings();
@@ -341,18 +339,16 @@
         if (userInfo.isEnabled()) {
             profileData.authenticatorHelper = new AuthenticatorHelper(context,
                     userInfo.getUserHandle(), this);
-            profileData.addAccountPreference = newAddAccountPreference(context);
+            profileData.addAccountPreference = newAddAccountPreference();
             mHelper.enforceRestrictionOnPreference(profileData.addAccountPreference,
                 DISALLOW_MODIFY_ACCOUNTS, userInfo.id);
         }
         mProfiles.put(userInfo.id, profileData);
-        new SearchFeatureProviderImpl().getIndexingManager(mContext).updateFromClassNameResource(
-                UserAndAccountDashboardFragment.class.getName(), true /* includeInSearchResults */);
     }
 
-    private DimmableIconPreference newAddAccountPreference(Context context) {
-        DimmableIconPreference preference =
-            new DimmableIconPreference(mParent.getPreferenceManager().getContext());
+    private RestrictedPreference newAddAccountPreference() {
+        RestrictedPreference preference =
+            new RestrictedPreference(mParent.getPreferenceManager().getContext());
         preference.setTitle(R.string.add_account_label);
         preference.setIcon(R.drawable.ic_menu_add);
         preference.setOnPreferenceClickListener(this);
@@ -360,7 +356,7 @@
         return preference;
     }
 
-    private RestrictedPreference newRemoveWorkProfilePreference(Context context) {
+    private RestrictedPreference newRemoveWorkProfilePreference() {
         RestrictedPreference preference = new RestrictedPreference(
             mParent.getPreferenceManager().getContext());
         preference.setTitle(R.string.remove_managed_profile_label);
diff --git a/src/com/android/settings/accounts/AccountSyncSettings.java b/src/com/android/settings/accounts/AccountSyncSettings.java
index 675de0e..d83694d 100644
--- a/src/com/android/settings/accounts/AccountSyncSettings.java
+++ b/src/com/android/settings/accounts/AccountSyncSettings.java
@@ -573,7 +573,7 @@
     }
 
     @Override
-    protected int getHelpResource() {
+    public int getHelpResource() {
         return R.string.help_url_accounts;
     }
 }
diff --git a/src/com/android/settings/accounts/AccountTypePreference.java b/src/com/android/settings/accounts/AccountTypePreference.java
index 3e869fe..1d39473 100644
--- a/src/com/android/settings/accounts/AccountTypePreference.java
+++ b/src/com/android/settings/accounts/AccountTypePreference.java
@@ -16,6 +16,8 @@
 
 package com.android.settings.accounts;
 
+import static android.content.Intent.EXTRA_USER;
+
 import android.accounts.Account;
 import android.content.Context;
 import android.graphics.drawable.Drawable;
@@ -25,12 +27,10 @@
 import android.support.v7.preference.Preference;
 import android.support.v7.preference.Preference.OnPreferenceClickListener;
 
-import com.android.settings.R;
 import com.android.settings.Utils;
+import com.android.settings.widget.AppPreference;
 
-import static android.content.Intent.EXTRA_USER;
-
-public class AccountTypePreference extends Preference implements OnPreferenceClickListener {
+public class AccountTypePreference extends AppPreference implements OnPreferenceClickListener {
     /**
      * Title of the tile that is shown to the user.
      * @attr ref android.R.styleable#PreferenceHeader_title
diff --git a/src/com/android/settings/accounts/AddUserWhenLockedPreferenceController.java b/src/com/android/settings/accounts/AddUserWhenLockedPreferenceController.java
index f2f2307..c93ef73 100644
--- a/src/com/android/settings/accounts/AddUserWhenLockedPreferenceController.java
+++ b/src/com/android/settings/accounts/AddUserWhenLockedPreferenceController.java
@@ -31,14 +31,13 @@
         implements PreferenceControllerMixin, Preference.OnPreferenceChangeListener,
         LifecycleObserver, OnPause, OnResume {
 
-    private static final String KEY_ADD_USER_WHEN_LOCKED = "add_users_when_locked";
-
-    private RestrictedSwitchPreference mAddUserWhenLocked;
-    private UserCapabilities mUserCaps;
+    private final String mPrefKey;
+    private final UserCapabilities mUserCaps;
     private boolean mShouldUpdateUserList;
 
-    public AddUserWhenLockedPreferenceController(Context context) {
+    public AddUserWhenLockedPreferenceController(Context context, String key) {
         super(context);
+        mPrefKey = key;
         mUserCaps = UserCapabilities.create(context);
     }
 
@@ -80,6 +79,6 @@
 
     @Override
     public String getPreferenceKey() {
-        return KEY_ADD_USER_WHEN_LOCKED;
+        return mPrefKey;
     }
 }
diff --git a/src/com/android/settings/accounts/ProviderPreference.java b/src/com/android/settings/accounts/ProviderPreference.java
index 817c3b6..81e0221 100644
--- a/src/com/android/settings/accounts/ProviderPreference.java
+++ b/src/com/android/settings/accounts/ProviderPreference.java
@@ -16,15 +16,14 @@
 
 package com.android.settings.accounts;
 
+import static com.android.settingslib.RestrictedLockUtils.EnforcedAdmin;
+
 import android.content.Context;
 import android.graphics.drawable.Drawable;
-import android.support.v7.preference.Preference;
 
 import com.android.settingslib.RestrictedLockUtils;
 import com.android.settingslib.RestrictedPreference;
 
-import static com.android.settingslib.RestrictedLockUtils.EnforcedAdmin;
-
 /**
  * ProviderPreference is used to display an image to the left of a provider name.
  * The preference ultimately calls AccountManager.addAccount() for the account type.
@@ -35,6 +34,7 @@
     public ProviderPreference(
             Context context, String accountType, Drawable icon, CharSequence providerName) {
         super(context);
+        setUseSmallIcon(true);
         mAccountType = accountType;
         setIcon(icon);
         setPersistent(false);
diff --git a/src/com/android/settings/accounts/RemoveAccountPreferenceController.java b/src/com/android/settings/accounts/RemoveAccountPreferenceController.java
index b5133d3..068847f 100644
--- a/src/com/android/settings/accounts/RemoveAccountPreferenceController.java
+++ b/src/com/android/settings/accounts/RemoveAccountPreferenceController.java
@@ -43,8 +43,7 @@
 import com.android.settings.applications.LayoutPreference;
 import com.android.settings.core.PreferenceControllerMixin;
 import com.android.settings.core.instrumentation.InstrumentedDialogFragment;
-import com.android.settings.enterprise.DevicePolicyManagerWrapper;
-import com.android.settings.enterprise.DevicePolicyManagerWrapperImpl;
+import com.android.settings.wrapper.DevicePolicyManagerWrapper;
 import com.android.settingslib.core.AbstractPreferenceController;
 
 import java.io.IOException;
@@ -60,7 +59,7 @@
     private DevicePolicyManagerWrapper mDpm;
 
     public RemoveAccountPreferenceController(Context context, Fragment parent) {
-        this(context, parent, new DevicePolicyManagerWrapperImpl(
+        this(context, parent, new DevicePolicyManagerWrapper(
                 (DevicePolicyManager) context.getSystemService(Context.DEVICE_POLICY_SERVICE)));
     }
 
diff --git a/src/com/android/settings/accounts/UserAndAccountDashboardFragment.java b/src/com/android/settings/accounts/UserAndAccountDashboardFragment.java
index f375cf8..37584fc 100644
--- a/src/com/android/settings/accounts/UserAndAccountDashboardFragment.java
+++ b/src/com/android/settings/accounts/UserAndAccountDashboardFragment.java
@@ -20,7 +20,6 @@
 import android.app.Activity;
 import android.content.Context;
 import android.content.pm.UserInfo;
-import android.os.Bundle;
 import android.os.UserHandle;
 import android.os.UserManager;
 import android.provider.SearchIndexableResource;
@@ -31,7 +30,6 @@
 import com.android.settings.dashboard.SummaryLoader;
 import com.android.settings.search.BaseSearchIndexProvider;
 import com.android.settingslib.core.AbstractPreferenceController;
-import com.android.settingslib.drawer.Tile;
 
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -40,7 +38,7 @@
 public class UserAndAccountDashboardFragment extends DashboardFragment {
 
     private static final String TAG = "UserAndAccountDashboard";
-    private static final String METADATA_IA_ACCOUNT = "com.android.settings.ia.account";
+    private static final String KEY_ADD_USER_WHEN_LOCKED = "user_settings_add_users_when_locked";
 
     @Override
     public int getMetricsCategory() {
@@ -58,7 +56,7 @@
     }
 
     @Override
-    protected int getHelpResource() {
+    public int getHelpResource() {
         return R.string.help_url_user_and_account_dashboard;
     }
 
@@ -67,7 +65,8 @@
         final List<AbstractPreferenceController> controllers = new ArrayList<>();
         controllers.add(new EmergencyInfoPreferenceController(context));
         AddUserWhenLockedPreferenceController addUserWhenLockedPrefController =
-                new AddUserWhenLockedPreferenceController(context);
+                new AddUserWhenLockedPreferenceController(
+                        context, KEY_ADD_USER_WHEN_LOCKED);
         controllers.add(addUserWhenLockedPrefController);
         getLifecycle().addObserver(addUserWhenLockedPrefController);
         controllers.add(new AutoSyncDataPreferenceController(context, this));
@@ -97,7 +96,7 @@
                 UserInfo info = mContext.getSystemService(UserManager.class).getUserInfo(
                         UserHandle.myUserId());
                 mSummaryLoader.setSummary(this,
-                    mContext.getString(R.string.users_and_accounts_summary, info.name));
+                        mContext.getString(R.string.users_and_accounts_summary, info.name));
             }
         }
     }
diff --git a/src/com/android/settings/applications/AccessibilityManagerWrapperImpl.java b/src/com/android/settings/applications/AccessibilityManagerWrapperImpl.java
deleted file mode 100644
index 4ebaea7..0000000
--- a/src/com/android/settings/applications/AccessibilityManagerWrapperImpl.java
+++ /dev/null
@@ -1,38 +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.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
deleted file mode 100644
index 6ce0a4a..0000000
--- a/src/com/android/settings/applications/AccessibilityServiceInfoWrapper.java
+++ /dev/null
@@ -1,37 +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.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
deleted file mode 100644
index d0d99ea..0000000
--- a/src/com/android/settings/applications/AccessibilityServiceInfoWrapperImpl.java
+++ /dev/null
@@ -1,39 +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.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/ActivityInfoWrapper.java b/src/com/android/settings/applications/ActivityInfoWrapper.java
deleted file mode 100644
index 4cb6e68..0000000
--- a/src/com/android/settings/applications/ActivityInfoWrapper.java
+++ /dev/null
@@ -1,30 +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.applications;
-
-/**
- * This interface replicates a subset of the android.content.pm.ActivityInfo. The interface
- * exists so that we can use a thin wrapper around the ActivityInfo in production code and a mock in
- * tests.
- */
-public interface ActivityInfoWrapper {
-
-    /**
-     * Returns whether this activity supports picture-in-picture.
-     */
-    boolean supportsPictureInPicture();
-}
diff --git a/src/com/android/settings/applications/ActivityInfoWrapperImpl.java b/src/com/android/settings/applications/ActivityInfoWrapperImpl.java
deleted file mode 100644
index b70a1e8..0000000
--- a/src/com/android/settings/applications/ActivityInfoWrapperImpl.java
+++ /dev/null
@@ -1,33 +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.applications;
-
-import android.content.pm.ActivityInfo;
-
-public class ActivityInfoWrapperImpl implements ActivityInfoWrapper {
-
-    private final ActivityInfo mInfo;
-
-    public ActivityInfoWrapperImpl(ActivityInfo info) {
-        mInfo = info;
-    }
-
-    @Override
-    public boolean supportsPictureInPicture() {
-        return mInfo.supportsPictureInPicture();
-    }
-}
diff --git a/src/com/android/settings/applications/AppAndNotificationDashboardFragment.java b/src/com/android/settings/applications/AppAndNotificationDashboardFragment.java
index d306353..7d6bdbb 100644
--- a/src/com/android/settings/applications/AppAndNotificationDashboardFragment.java
+++ b/src/com/android/settings/applications/AppAndNotificationDashboardFragment.java
@@ -48,13 +48,7 @@
     }
 
     @Override
-    public void onAttach(Context context) {
-        super.onAttach(context);
-        mProgressiveDisclosureMixin.setTileLimit(4);
-    }
-
-    @Override
-    protected int getHelpResource() {
+    public int getHelpResource() {
         return R.string.help_url_apps_and_notifications;
     }
 
diff --git a/src/com/android/settings/applications/AppCounter.java b/src/com/android/settings/applications/AppCounter.java
index 8c7aed7..a02ecfa 100644
--- a/src/com/android/settings/applications/AppCounter.java
+++ b/src/com/android/settings/applications/AppCounter.java
@@ -22,6 +22,8 @@
 import android.os.UserHandle;
 import android.os.UserManager;
 
+import com.android.settingslib.wrapper.PackageManagerWrapper;
+
 import java.util.List;
 
 public abstract class AppCounter extends AsyncTask<Void, Void, Integer> {
diff --git a/src/com/android/settings/applications/AppInfoBase.java b/src/com/android/settings/applications/AppInfoBase.java
index e422076..f20944d 100644
--- a/src/com/android/settings/applications/AppInfoBase.java
+++ b/src/com/android/settings/applications/AppInfoBase.java
@@ -16,6 +16,8 @@
 
 package com.android.settings.applications;
 
+import static com.android.settingslib.RestrictedLockUtils.EnforcedAdmin;
+
 import android.app.Activity;
 import android.app.AlertDialog;
 import android.app.Dialog;
@@ -42,18 +44,16 @@
 import com.android.settings.SettingsActivity;
 import com.android.settings.SettingsPreferenceFragment;
 import com.android.settings.Utils;
+import com.android.settings.applications.manageapplications.ManageApplications;
 import com.android.settings.core.instrumentation.InstrumentedDialogFragment;
-import com.android.settings.enterprise.DevicePolicyManagerWrapper;
-import com.android.settings.enterprise.DevicePolicyManagerWrapperImpl;
 import com.android.settings.overlay.FeatureFactory;
+import com.android.settings.wrapper.DevicePolicyManagerWrapper;
 import com.android.settingslib.RestrictedLockUtils;
 import com.android.settingslib.applications.ApplicationsState;
 import com.android.settingslib.applications.ApplicationsState.AppEntry;
 
 import java.util.ArrayList;
 
-import static com.android.settingslib.RestrictedLockUtils.EnforcedAdmin;
-
 public abstract class AppInfoBase extends SettingsPreferenceFragment
         implements ApplicationsState.Callbacks {
 
@@ -93,8 +93,8 @@
         mApplicationFeatureProvider = FeatureFactory.getFactory(activity)
                 .getApplicationFeatureProvider(activity);
         mState = ApplicationsState.getInstance(activity.getApplication());
-        mSession = mState.newSession(this);
-        mDpm = new DevicePolicyManagerWrapperImpl(
+        mSession = mState.newSession(this, getLifecycle());
+        mDpm = new DevicePolicyManagerWrapper(
                 (DevicePolicyManager) activity.getSystemService(Context.DEVICE_POLICY_SERVICE));
         mUserManager = (UserManager) activity.getSystemService(Context.USER_SERVICE);
         mPm = activity.getPackageManager();
@@ -108,7 +108,6 @@
     @Override
     public void onResume() {
         super.onResume();
-        mSession.resume();
         mAppsControlDisallowedAdmin = RestrictedLockUtils.checkIfRestrictionEnforced(getActivity(),
                 UserManager.DISALLOW_APPS_CONTROL, mUserId);
         mAppsControlDisallowedBySystem = RestrictedLockUtils.hasBaseUserRestriction(getActivity(),
@@ -119,16 +118,10 @@
         }
     }
 
-    @Override
-    public void onPause() {
-        mSession.pause();
-        super.onPause();
-    }
 
     @Override
     public void onDestroy() {
         stopListeningToPackageRemove();
-        mSession.release();
         super.onDestroy();
     }
 
diff --git a/src/com/android/settings/applications/AppInfoDashboardFragment.java b/src/com/android/settings/applications/AppInfoDashboardFragment.java
new file mode 100755
index 0000000..a725781
--- /dev/null
+++ b/src/com/android/settings/applications/AppInfoDashboardFragment.java
@@ -0,0 +1,1286 @@
+/*
+ * Copyright (C) 2017 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not
+ * use this file except in compliance with the License. You may obtain a copy
+ * of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF 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.android.settingslib.RestrictedLockUtils.EnforcedAdmin;
+
+import android.Manifest.permission;
+import android.app.Activity;
+import android.app.ActivityManager;
+import android.app.AlertDialog;
+import android.app.Dialog;
+import android.app.DialogFragment;
+import android.app.Fragment;
+import android.app.admin.DevicePolicyManager;
+import android.content.BroadcastReceiver;
+import android.content.ComponentName;
+import android.content.Context;
+import android.content.DialogInterface;
+import android.content.Intent;
+import android.content.IntentFilter;
+import android.content.pm.ApplicationInfo;
+import android.content.pm.PackageInfo;
+import android.content.pm.PackageManager;
+import android.content.pm.PackageManager.NameNotFoundException;
+import android.content.pm.ResolveInfo;
+import android.content.pm.UserInfo;
+import android.net.Uri;
+import android.os.AsyncTask;
+import android.os.Bundle;
+import android.os.RemoteException;
+import android.os.ServiceManager;
+import android.os.UserHandle;
+import android.os.UserManager;
+import android.support.annotation.VisibleForTesting;
+import android.support.v7.preference.Preference;
+import android.support.v7.preference.Preference.OnPreferenceClickListener;
+import android.support.v7.preference.PreferenceCategory;
+import android.support.v7.preference.PreferenceScreen;
+import android.text.TextUtils;
+import android.util.Log;
+import android.view.Menu;
+import android.view.MenuInflater;
+import android.view.MenuItem;
+import android.view.View;
+import android.webkit.IWebViewUpdateService;
+
+import com.android.internal.logging.nano.MetricsProto;
+import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
+import com.android.settings.DeviceAdminAdd;
+import com.android.settings.R;
+import com.android.settings.SettingsActivity;
+import com.android.settings.SettingsPreferenceFragment;
+import com.android.settings.Utils;
+import com.android.settings.applications.appinfo.AppBatteryPreferenceController;
+import com.android.settings.applications.appinfo.AppDataUsagePreferenceController;
+import com.android.settings.applications.appinfo.AppMemoryPreferenceController;
+import com.android.settings.applications.appinfo.AppNotificationPreferenceController;
+import com.android.settings.applications.appinfo.AppOpenByDefaultPreferenceController;
+import com.android.settings.applications.appinfo.AppPermissionPreferenceController;
+import com.android.settings.applications.appinfo.AppStoragePreferenceController;
+import com.android.settings.applications.appinfo.AppVersionPreferenceController;
+import com.android.settings.applications.appinfo.DefaultBrowserShortcutPreferenceController;
+import com.android.settings.applications.appinfo.DefaultEmergencyShortcutPreferenceController;
+import com.android.settings.applications.appinfo.DefaultHomeShortcutPreferenceController;
+import com.android.settings.applications.appinfo.DefaultPhoneShortcutPreferenceController;
+import com.android.settings.applications.appinfo.DefaultSmsShortcutPreferenceController;
+import com.android.settings.applications.defaultapps.DefaultBrowserPreferenceController;
+import com.android.settings.applications.defaultapps.DefaultEmergencyPreferenceController;
+import com.android.settings.applications.defaultapps.DefaultHomePreferenceController;
+import com.android.settings.applications.defaultapps.DefaultPhonePreferenceController;
+import com.android.settings.applications.defaultapps.DefaultSmsPreferenceController;
+import com.android.settings.applications.instantapps.InstantAppButtonsController;
+import com.android.settings.applications.manageapplications.ManageApplications;
+import com.android.settings.core.instrumentation.InstrumentedDialogFragment;
+import com.android.settings.dashboard.DashboardFragment;
+import com.android.settings.overlay.FeatureFactory;
+import com.android.settings.widget.ActionButtonPreference;
+import com.android.settings.widget.EntityHeaderController;
+import com.android.settings.wrapper.DevicePolicyManagerWrapper;
+import com.android.settingslib.RestrictedLockUtils;
+import com.android.settingslib.applications.AppUtils;
+import com.android.settingslib.applications.ApplicationsState;
+import com.android.settingslib.applications.ApplicationsState.AppEntry;
+import com.android.settingslib.core.AbstractPreferenceController;
+import com.android.settingslib.core.lifecycle.Lifecycle;
+import com.android.settingslib.wrapper.PackageManagerWrapper;
+
+import java.lang.ref.WeakReference;
+import java.util.ArrayList;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+
+/**
+ * Dashboard fragment to display application information from Settings. This activity presents
+ * extended information associated with a package like code, data, total size, permissions
+ * used by the application and also the set of default launchable activities.
+ * For system applications, an option to clear user data is displayed only if data size is > 0.
+ * System applications that do not want clear user data do not have this option.
+ * For non-system applications, there is no option to clear data. Instead there is an option to
+ * uninstall the application.
+ */
+public class AppInfoDashboardFragment extends DashboardFragment
+        implements ApplicationsState.Callbacks {
+
+    private static final String TAG = "AppInfoDashboard";
+
+    // Menu identifiers
+    public static final int UNINSTALL_ALL_USERS_MENU = 1;
+    public static final int UNINSTALL_UPDATES = 2;
+
+    // Result code identifiers
+    public static final int REQUEST_UNINSTALL = 0;
+    private static final int REQUEST_REMOVE_DEVICE_ADMIN = 1;
+
+    public static final int SUB_INFO_FRAGMENT = 1;
+
+    public static final int LOADER_CHART_DATA = 2;
+    public static final int LOADER_STORAGE = 3;
+    @VisibleForTesting
+    public static final int LOADER_BATTERY = 4;
+
+    // Dialog identifiers used in showDialog
+    private static final int DLG_BASE = 0;
+    private static final int DLG_FORCE_STOP = DLG_BASE + 1;
+    private static final int DLG_DISABLE = DLG_BASE + 2;
+    private static final int DLG_SPECIAL_DISABLE = DLG_BASE + 3;
+    private static final String KEY_HEADER = "header_view";
+    private static final String KEY_INSTANT_APP_BUTTONS = "instant_app_buttons";
+    private static final String KEY_ACTION_BUTTONS = "action_buttons";
+    private static final String KEY_INSTANT_APP_SUPPORTED_LINKS =
+            "instant_app_launch_supported_domain_urls";
+
+    public static final String ARG_PACKAGE_NAME = "package";
+    public static final String ARG_PACKAGE_UID = "uid";
+
+    protected static final boolean localLOGV = false;
+
+    private EnforcedAdmin mAppsControlDisallowedAdmin;
+    private boolean mAppsControlDisallowedBySystem;
+
+    private ApplicationFeatureProvider mApplicationFeatureProvider;
+    private ApplicationsState mState;
+    private ApplicationsState.Session mSession;
+    private ApplicationsState.AppEntry mAppEntry;
+    private PackageInfo mPackageInfo;
+    private int mUserId;
+    private String mPackageName;
+
+    private DevicePolicyManagerWrapper mDpm;
+    private UserManager mUserManager;
+    private PackageManager mPm;
+
+    private boolean mFinishing;
+    private boolean mListeningToPackageRemove;
+
+
+    private final HashSet<String> mHomePackages = new HashSet<>();
+
+    private boolean mInitialized;
+    private boolean mShowUninstalled;
+    private LayoutPreference mHeader;
+    private boolean mUpdatedSysApp = false;
+    private AppDomainsPreference mInstantAppDomainsPreference;
+    private boolean mDisableAfterUninstall;
+
+    private List<Callback> mCallbacks = new ArrayList<>();
+
+    @VisibleForTesting
+    ActionButtonPreference mActionButtons;
+
+    private InstantAppButtonsController mInstantAppButtonsController;
+
+    /**
+     * Callback to invoke when app info has been changed.
+     */
+    public interface Callback {
+        void refreshUi();
+    }
+
+    @VisibleForTesting
+    boolean handleDisableable() {
+        boolean disableable = false;
+        // Try to prevent the user from bricking their phone
+        // by not allowing disabling of apps signed with the
+        // system cert and any launcher app in the system.
+        if (mHomePackages.contains(mAppEntry.info.packageName)
+                || Utils.isSystemPackage(getContext().getResources(), mPm, mPackageInfo)) {
+            // Disable button for core system applications.
+            mActionButtons
+                    .setButton1Text(R.string.disable_text)
+                    .setButton1Positive(false);
+        } else if (mAppEntry.info.enabled && !isDisabledUntilUsed()) {
+            mActionButtons
+                    .setButton1Text(R.string.disable_text)
+                    .setButton1Positive(false);
+            disableable = !mApplicationFeatureProvider.getKeepEnabledPackages()
+                    .contains(mAppEntry.info.packageName);
+        } else {
+            mActionButtons
+                    .setButton1Text(R.string.enable_text)
+                    .setButton1Positive(true);
+            disableable = true;
+        }
+
+        return disableable;
+    }
+
+    private boolean isDisabledUntilUsed() {
+        return mAppEntry.info.enabledSetting
+                == PackageManager.COMPONENT_ENABLED_STATE_DISABLED_UNTIL_USED;
+    }
+
+    private void initUninstallButtons() {
+        final boolean isBundled = (mAppEntry.info.flags & ApplicationInfo.FLAG_SYSTEM) != 0;
+        boolean enabled;
+        if (isBundled) {
+            enabled = handleDisableable();
+        } else {
+            enabled = initUninstallButtonForUserApp();
+        }
+        // If this is a device admin, it can't be uninstalled or disabled.
+        // We do this here so the text of the button is still set correctly.
+        if (isBundled && mDpm.packageHasActiveAdmins(mPackageInfo.packageName)) {
+            enabled = false;
+        }
+
+        // We don't allow uninstalling DO/PO on *any* users, because if it's a system app,
+        // "uninstall" is actually "downgrade to the system version + disable", and "downgrade"
+        // will clear data on all users.
+        if (Utils.isProfileOrDeviceOwner(mUserManager, mDpm, mPackageInfo.packageName)) {
+            enabled = false;
+        }
+
+        // Don't allow uninstalling the device provisioning package.
+        if (Utils.isDeviceProvisioningPackage(getResources(), mAppEntry.info.packageName)) {
+            enabled = false;
+        }
+
+        // If the uninstall intent is already queued, disable the uninstall button
+        if (mDpm.isUninstallInQueue(mPackageName)) {
+            enabled = false;
+        }
+
+        // Home apps need special handling.  Bundled ones we don't risk downgrading
+        // because that can interfere with home-key resolution.  Furthermore, we
+        // can't allow uninstallation of the only home app, and we don't want to
+        // allow uninstallation of an explicitly preferred one -- the user can go
+        // to Home settings and pick a different one, after which we'll permit
+        // uninstallation of the now-not-default one.
+        if (enabled && mHomePackages.contains(mPackageInfo.packageName)) {
+            if (isBundled) {
+                enabled = false;
+            } else {
+                ArrayList<ResolveInfo> homeActivities = new ArrayList<ResolveInfo>();
+                ComponentName currentDefaultHome  = mPm.getHomeActivities(homeActivities);
+                if (currentDefaultHome == null) {
+                    // No preferred default, so permit uninstall only when
+                    // there is more than one candidate
+                    enabled = (mHomePackages.size() > 1);
+                } else {
+                    // There is an explicit default home app -- forbid uninstall of
+                    // that one, but permit it for installed-but-inactive ones.
+                    enabled = !mPackageInfo.packageName.equals(currentDefaultHome.getPackageName());
+                }
+            }
+        }
+
+        if (mAppsControlDisallowedBySystem) {
+            enabled = false;
+        }
+
+        try {
+            IWebViewUpdateService webviewUpdateService =
+                IWebViewUpdateService.Stub.asInterface(ServiceManager.getService("webviewupdate"));
+            if (webviewUpdateService.isFallbackPackage(mAppEntry.info.packageName)) {
+                enabled = false;
+            }
+        } catch (RemoteException e) {
+            throw new RuntimeException(e);
+        }
+
+        mActionButtons.setButton1Enabled(enabled);
+        if (enabled) {
+            // Register listener
+            mActionButtons.setButton1OnClickListener(v -> handleUninstallButtonClick());
+        }
+    }
+
+    @VisibleForTesting
+    boolean initUninstallButtonForUserApp() {
+        boolean enabled = true;
+        if ((mPackageInfo.applicationInfo.flags & ApplicationInfo.FLAG_INSTALLED) == 0
+                && mUserManager.getUsers().size() >= 2) {
+            // When we have multiple users, there is a separate menu
+            // to uninstall for all users.
+            enabled = false;
+        } else if (AppUtils.isInstant(mPackageInfo.applicationInfo)) {
+            enabled = false;
+            mActionButtons.setButton1Visible(false);
+        }
+        mActionButtons.setButton1Text(R.string.uninstall_text).setButton1Positive(false);
+        return enabled;
+    }
+
+    /** Called when the activity is first created. */
+    @Override
+    public void onCreate(Bundle icicle) {
+        super.onCreate(icicle);
+        mFinishing = false;
+        final Activity activity = getActivity();
+        mApplicationFeatureProvider = FeatureFactory.getFactory(activity)
+                .getApplicationFeatureProvider(activity);
+        mDpm = new DevicePolicyManagerWrapper(
+                (DevicePolicyManager) activity.getSystemService(Context.DEVICE_POLICY_SERVICE));
+        mUserManager = (UserManager) activity.getSystemService(Context.USER_SERVICE);
+        mPm = activity.getPackageManager();
+
+        retrieveAppEntry();
+        startListeningToPackageRemove();
+
+        if (!ensurePackageInfoAvailable(activity)) {
+            return;
+        }
+
+        setHasOptionsMenu(true);
+
+        addDynamicPrefs();
+    }
+
+    @Override
+    public int getMetricsCategory() {
+        return MetricsEvent.APPLICATIONS_INSTALLED_APP_DETAILS;
+    }
+
+    @Override
+    public void onResume() {
+        super.onResume();
+        mAppsControlDisallowedAdmin = RestrictedLockUtils.checkIfRestrictionEnforced(getActivity(),
+                UserManager.DISALLOW_APPS_CONTROL, mUserId);
+        mAppsControlDisallowedBySystem = RestrictedLockUtils.hasBaseUserRestriction(getActivity(),
+                UserManager.DISALLOW_APPS_CONTROL, mUserId);
+
+        if (!refreshUi()) {
+            setIntentAndFinish(true, true);
+        }
+
+        if (mFinishing) {
+            return;
+        }
+        updateDynamicPrefs();
+    }
+
+    @Override
+    protected int getPreferenceScreenResId() {
+        return R.xml.app_info_settings;
+    }
+
+    @Override
+    protected String getLogTag() {
+        return TAG;
+    }
+
+    @Override
+    protected List<AbstractPreferenceController> getPreferenceControllers(Context context) {
+        final String packageName = getPackageName();
+        final List<AbstractPreferenceController> controllers = new ArrayList<>();
+        final Lifecycle lifecycle = getLifecycle();
+
+        // The following are controllers for preferences that needs to refresh the preference state
+        // when app state changes.
+        controllers.add(new AppStoragePreferenceController(context, this, lifecycle));
+        controllers.add(new AppDataUsagePreferenceController(context, this, lifecycle));
+        controllers.add(new AppNotificationPreferenceController(context, this));
+        controllers.add(new AppOpenByDefaultPreferenceController(context, this));
+        controllers.add(new AppPermissionPreferenceController(context, this, packageName));
+        controllers.add(new AppVersionPreferenceController(context, this));
+
+        for (AbstractPreferenceController controller : controllers) {
+            mCallbacks.add((Callback) controller);
+        }
+
+        // The following are controllers for preferences that don't need to refresh the preference
+        // state when app state changes.
+        controllers.add(new AppBatteryPreferenceController(context, this, packageName, lifecycle));
+        controllers.add(new AppMemoryPreferenceController(context, this, lifecycle));
+        controllers.add(new DefaultHomeShortcutPreferenceController(context, packageName));
+        controllers.add(new DefaultBrowserShortcutPreferenceController(context, packageName));
+        controllers.add(new DefaultPhoneShortcutPreferenceController(context, packageName));
+        controllers.add(new DefaultEmergencyShortcutPreferenceController(context, packageName));
+        controllers.add(new DefaultSmsShortcutPreferenceController(context, packageName));
+
+        return controllers;
+    }
+
+    public ApplicationsState.AppEntry getAppEntry() {
+        if (mAppEntry == null) {
+            retrieveAppEntry();
+        }
+        return mAppEntry;
+    }
+
+    public PackageInfo getPackageInfo() {
+        return mPackageInfo;
+    }
+
+    public void onActivityCreated(Bundle savedInstanceState) {
+        super.onActivityCreated(savedInstanceState);
+        if (mFinishing) {
+            return;
+        }
+        final Activity activity = getActivity();
+        mHeader = (LayoutPreference) findPreference(KEY_HEADER);
+        mActionButtons = ((ActionButtonPreference) findPreference(KEY_ACTION_BUTTONS))
+                .setButton2Text(R.string.force_stop)
+                .setButton2Positive(false)
+                .setButton2Enabled(false);
+        EntityHeaderController.newInstance(activity, this, mHeader.findViewById(R.id.entity_header))
+                .setRecyclerView(getListView(), getLifecycle())
+                .setPackageName(mPackageName)
+                .setHasAppInfoLink(false)
+                .setButtonActions(EntityHeaderController.ActionType.ACTION_APP_PREFERENCE,
+                        EntityHeaderController.ActionType.ACTION_NONE)
+                .styleActionBar(activity)
+                .bindHeaderButtons();
+
+        mInstantAppDomainsPreference =
+                (AppDomainsPreference) findPreference(KEY_INSTANT_APP_SUPPORTED_LINKS);
+    }
+
+    @Override
+    public void onPackageSizeChanged(String packageName) {
+        if (!TextUtils.equals(packageName, mPackageName)) {
+            Log.d(TAG, "Package change irrelevant, skipping");
+          return;
+        }
+        refreshUi();
+    }
+
+    /**
+     * Ensures the {@link PackageInfo} is available to proceed. If it's not available, the fragment
+     * will finish.
+     *
+     * @return true if packageInfo is available.
+     */
+    @VisibleForTesting(otherwise = VisibleForTesting.PRIVATE)
+    boolean ensurePackageInfoAvailable(Activity activity) {
+        if (mPackageInfo == null) {
+            mFinishing = true;
+            Log.w(TAG, "Package info not available. Is this package already uninstalled?");
+            activity.finishAndRemoveTask();
+            return false;
+        }
+        return true;
+    }
+
+    @Override
+    public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
+        super.onCreateOptionsMenu(menu, inflater);
+        menu.add(0, UNINSTALL_UPDATES, 0, R.string.app_factory_reset)
+                .setShowAsAction(MenuItem.SHOW_AS_ACTION_NEVER);
+        menu.add(0, UNINSTALL_ALL_USERS_MENU, 1, R.string.uninstall_all_users_text)
+                .setShowAsAction(MenuItem.SHOW_AS_ACTION_NEVER);
+    }
+
+    @Override
+    public void onPrepareOptionsMenu(Menu menu) {
+        if (mFinishing) {
+            return;
+        }
+        menu.findItem(UNINSTALL_ALL_USERS_MENU).setVisible(shouldShowUninstallForAll(mAppEntry));
+        mUpdatedSysApp = (mAppEntry.info.flags & ApplicationInfo.FLAG_UPDATED_SYSTEM_APP) != 0;
+        MenuItem uninstallUpdatesItem = menu.findItem(UNINSTALL_UPDATES);
+        uninstallUpdatesItem.setVisible(mUpdatedSysApp && !mAppsControlDisallowedBySystem);
+        if (uninstallUpdatesItem.isVisible()) {
+            RestrictedLockUtils.setMenuItemAsDisabledByAdmin(getActivity(),
+                    uninstallUpdatesItem, mAppsControlDisallowedAdmin);
+        }
+    }
+
+    @Override
+    public boolean onOptionsItemSelected(MenuItem item) {
+        switch (item.getItemId()) {
+            case UNINSTALL_ALL_USERS_MENU:
+                uninstallPkg(mAppEntry.info.packageName, true, false);
+                return true;
+            case UNINSTALL_UPDATES:
+                uninstallPkg(mAppEntry.info.packageName, false, false);
+                return true;
+        }
+        return false;
+    }
+
+    @Override
+    public void onActivityResult(int requestCode, int resultCode, Intent data) {
+        super.onActivityResult(requestCode, resultCode, data);
+        switch (requestCode) {
+            case REQUEST_UNINSTALL:
+                // Refresh option menu
+                getActivity().invalidateOptionsMenu();
+
+                if (mDisableAfterUninstall) {
+                    mDisableAfterUninstall = false;
+                    new DisableChanger(this, mAppEntry.info,
+                            PackageManager.COMPONENT_ENABLED_STATE_DISABLED_USER)
+                            .execute((Object)null);
+                }
+                // continue with following operations
+            case REQUEST_REMOVE_DEVICE_ADMIN:
+                if (!refreshUi()) {
+                    setIntentAndFinish(true, true);
+                } else {
+                    startListeningToPackageRemove();
+                }
+                break;
+        }
+    }
+
+    /**
+     * Utility method to hide and show specific preferences based on whether the app being displayed
+     * is an Instant App or an installed app.
+     */
+    @VisibleForTesting
+    void prepareInstantAppPrefs() {
+        final boolean isInstant = AppUtils.isInstant(mPackageInfo.applicationInfo);
+        if (isInstant) {
+            Set<String> handledDomainSet = Utils.getHandledDomains(mPm, mPackageInfo.packageName);
+            String[] handledDomains = handledDomainSet.toArray(new String[handledDomainSet.size()]);
+            mInstantAppDomainsPreference.setTitles(handledDomains);
+            // Dummy values, unused in the implementation
+            mInstantAppDomainsPreference.setValues(new int[handledDomains.length]);
+        } else {
+            getPreferenceScreen().removePreference(mInstantAppDomainsPreference);
+        }
+    }
+
+    // Utility method to set application label and icon.
+    private void setAppLabelAndIcon(PackageInfo pkgInfo) {
+        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));
+        EntityHeaderController.newInstance(activity, this, appSnippet)
+                .setLabel(mAppEntry)
+                .setIcon(mAppEntry)
+                .setSummary(summary)
+                .setIsInstantApp(isInstantApp)
+                .done(activity, false /* rebindActions */);
+    }
+
+    @VisibleForTesting
+    boolean shouldShowUninstallForAll(AppEntry appEntry) {
+        boolean showIt = true;
+        if (mUpdatedSysApp) {
+            showIt = false;
+        } else if (appEntry == null) {
+            showIt = false;
+        } else if ((appEntry.info.flags & ApplicationInfo.FLAG_SYSTEM) != 0) {
+            showIt = false;
+        } else if (mPackageInfo == null || mDpm.packageHasActiveAdmins(mPackageInfo.packageName)) {
+            showIt = false;
+        } else if (UserHandle.myUserId() != 0) {
+            showIt = false;
+        } else if (mUserManager.getUsers().size() < 2) {
+            showIt = false;
+        } else if (PackageUtil.countPackageInUsers(mPm, mUserManager, mPackageName) < 2
+                && (appEntry.info.flags & ApplicationInfo.FLAG_INSTALLED) != 0) {
+            showIt = false;
+        } else if (AppUtils.isInstant(appEntry.info)) {
+            showIt = false;
+        }
+        return showIt;
+    }
+
+    private boolean signaturesMatch(String pkg1, String pkg2) {
+        if (pkg1 != null && pkg2 != null) {
+            try {
+                final int match = mPm.checkSignatures(pkg1, pkg2);
+                if (match >= PackageManager.SIGNATURE_MATCH) {
+                    return true;
+                }
+            } catch (Exception e) {
+                // e.g. named alternate package not found during lookup;
+                // this is an expected case sometimes
+            }
+        }
+        return false;
+    }
+
+    protected boolean refreshUi() {
+        retrieveAppEntry();
+        if (mAppEntry == null) {
+            return false; // onCreate must have failed, make sure to exit
+        }
+
+        if (mPackageInfo == null) {
+            return false; // onCreate must have failed, make sure to exit
+        }
+
+        // Get list of "home" apps and trace through any meta-data references
+        List<ResolveInfo> homeActivities = new ArrayList<ResolveInfo>();
+        mPm.getHomeActivities(homeActivities);
+        mHomePackages.clear();
+        for (int i = 0; i< homeActivities.size(); i++) {
+            ResolveInfo ri = homeActivities.get(i);
+            final String activityPkg = ri.activityInfo.packageName;
+            mHomePackages.add(activityPkg);
+
+            // Also make sure to include anything proxying for the home app
+            final Bundle metadata = ri.activityInfo.metaData;
+            if (metadata != null) {
+                final String metaPkg = metadata.getString(ActivityManager.META_HOME_ALTERNATE);
+                if (signaturesMatch(metaPkg, activityPkg)) {
+                    mHomePackages.add(metaPkg);
+                }
+            }
+        }
+
+        checkForceStop();
+        setAppLabelAndIcon(mPackageInfo);
+        initUninstallButtons();
+        prepareInstantAppPrefs();
+
+        // Update the preference summaries.
+        Activity context = getActivity();
+        for (Callback callback : mCallbacks) {
+            callback.refreshUi();
+        }
+
+        if (!mInitialized) {
+            // First time init: are we displaying an uninstalled app?
+            mInitialized = true;
+            mShowUninstalled = (mAppEntry.info.flags&ApplicationInfo.FLAG_INSTALLED) == 0;
+        } else {
+            // All other times: if the app no longer exists then we want
+            // to go away.
+            try {
+                ApplicationInfo ainfo = context.getPackageManager().getApplicationInfo(
+                        mAppEntry.info.packageName,
+                        PackageManager.MATCH_DISABLED_COMPONENTS
+                        | PackageManager.MATCH_ANY_USER);
+                if (!mShowUninstalled) {
+                    // If we did not start out with the app uninstalled, then
+                    // it transitioning to the uninstalled state for the current
+                    // user means we should go away as well.
+                    return (ainfo.flags&ApplicationInfo.FLAG_INSTALLED) != 0;
+                }
+            } catch (NameNotFoundException e) {
+                return false;
+            }
+        }
+
+        return true;
+    }
+
+    protected AlertDialog createDialog(int id, int errorCode) {
+        switch (id) {
+            case DLG_DISABLE:
+                return new AlertDialog.Builder(getActivity())
+                        .setMessage(getActivity().getText(R.string.app_disable_dlg_text))
+                        .setPositiveButton(R.string.app_disable_dlg_positive,
+                                new DialogInterface.OnClickListener() {
+                            public void onClick(DialogInterface dialog, int which) {
+                                // Disable the app
+                                mMetricsFeatureProvider.action(getContext(),
+                                        MetricsEvent.ACTION_SETTINGS_DISABLE_APP);
+                                new DisableChanger(AppInfoDashboardFragment.this, mAppEntry.info,
+                                        PackageManager.COMPONENT_ENABLED_STATE_DISABLED_USER)
+                                .execute((Object)null);
+                            }
+                        })
+                        .setNegativeButton(R.string.dlg_cancel, null)
+                        .create();
+            case DLG_SPECIAL_DISABLE:
+                return new AlertDialog.Builder(getActivity())
+                        .setMessage(getActivity().getText(R.string.app_disable_dlg_text))
+                        .setPositiveButton(R.string.app_disable_dlg_positive,
+                                new DialogInterface.OnClickListener() {
+                            public void onClick(DialogInterface dialog, int which) {
+                                // Disable the app and ask for uninstall
+                                mMetricsFeatureProvider.action(getContext(),
+                                        MetricsEvent.ACTION_SETTINGS_DISABLE_APP);
+                                uninstallPkg(mAppEntry.info.packageName,
+                                        false, true);
+                            }
+                        })
+                        .setNegativeButton(R.string.dlg_cancel, null)
+                        .create();
+            case DLG_FORCE_STOP:
+                return new AlertDialog.Builder(getActivity())
+                        .setTitle(getActivity().getText(R.string.force_stop_dlg_title))
+                        .setMessage(getActivity().getText(R.string.force_stop_dlg_text))
+                        .setPositiveButton(R.string.dlg_ok, new DialogInterface.OnClickListener() {
+                            public void onClick(DialogInterface dialog, int which) {
+                                // Force stop
+                                forceStopPackage(mAppEntry.info.packageName);
+                            }
+                        })
+                        .setNegativeButton(R.string.dlg_cancel, null)
+                        .create();
+        }
+        if (mInstantAppButtonsController != null) {
+            return mInstantAppButtonsController.createDialog(id);
+        }
+        return null;
+    }
+
+    private void uninstallPkg(String packageName, boolean allUsers, boolean andDisable) {
+        stopListeningToPackageRemove();
+         // Create new intent to launch Uninstaller activity
+        Uri packageURI = Uri.parse("package:"+packageName);
+        Intent uninstallIntent = new Intent(Intent.ACTION_UNINSTALL_PACKAGE, packageURI);
+        uninstallIntent.putExtra(Intent.EXTRA_UNINSTALL_ALL_USERS, allUsers);
+        mMetricsFeatureProvider.action(
+                getContext(), MetricsEvent.ACTION_SETTINGS_UNINSTALL_APP);
+        startActivityForResult(uninstallIntent, REQUEST_UNINSTALL);
+        mDisableAfterUninstall = andDisable;
+    }
+
+    private void forceStopPackage(String pkgName) {
+        mMetricsFeatureProvider.action(getContext(), MetricsEvent.ACTION_APP_FORCE_STOP, pkgName);
+        ActivityManager am = (ActivityManager) getActivity().getSystemService(
+                Context.ACTIVITY_SERVICE);
+        Log.d(TAG, "Stopping package " + pkgName);
+        am.forceStopPackage(pkgName);
+        int userId = UserHandle.getUserId(mAppEntry.info.uid);
+        mState.invalidatePackage(pkgName, userId);
+        AppEntry newEnt = mState.getEntry(pkgName, userId);
+        if (newEnt != null) {
+            mAppEntry = newEnt;
+        }
+        checkForceStop();
+    }
+
+    private void updateForceStopButton(boolean enabled) {
+        mActionButtons
+                .setButton2Enabled(mAppsControlDisallowedBySystem ? false : enabled)
+                .setButton2OnClickListener(mAppsControlDisallowedBySystem
+                        ? null : v -> handleForceStopButtonClick());
+    }
+
+    @VisibleForTesting
+    void checkForceStop() {
+        if (mDpm.packageHasActiveAdmins(mPackageInfo.packageName)) {
+            // User can't force stop device admin.
+            Log.w(TAG, "User can't force stop device admin");
+            updateForceStopButton(false);
+        } else if (AppUtils.isInstant(mPackageInfo.applicationInfo)) {
+            updateForceStopButton(false);
+            mActionButtons.setButton2Visible(false);
+        } else if ((mAppEntry.info.flags & ApplicationInfo.FLAG_STOPPED) == 0) {
+            // If the app isn't explicitly stopped, then always show the
+            // force stop button.
+            Log.w(TAG, "App is not explicitly stopped");
+            updateForceStopButton(true);
+        } else {
+            Intent intent = new Intent(Intent.ACTION_QUERY_PACKAGE_RESTART,
+                    Uri.fromParts("package", mAppEntry.info.packageName, null));
+            intent.putExtra(Intent.EXTRA_PACKAGES, new String[] { mAppEntry.info.packageName });
+            intent.putExtra(Intent.EXTRA_UID, mAppEntry.info.uid);
+            intent.putExtra(Intent.EXTRA_USER_HANDLE, UserHandle.getUserId(mAppEntry.info.uid));
+            Log.d(TAG, "Sending broadcast to query restart status for "
+                    + mAppEntry.info.packageName);
+            getActivity().sendOrderedBroadcastAsUser(intent, UserHandle.CURRENT, null,
+                    mCheckKillProcessesReceiver, null, Activity.RESULT_CANCELED, null, null);
+        }
+    }
+
+    private void startAppInfoFragment(Class<?> fragment, int title) {
+        startAppInfoFragment(fragment, title, this, mAppEntry);
+    }
+
+    public static void startAppInfoFragment(Class<?> fragment, int title,
+            SettingsPreferenceFragment caller, AppEntry appEntry) {
+        // start new fragment to display extended information
+        Bundle args = new Bundle();
+        args.putString(ARG_PACKAGE_NAME, appEntry.info.packageName);
+        args.putInt(ARG_PACKAGE_UID, appEntry.info.uid);
+
+        SettingsActivity sa = (SettingsActivity) caller.getActivity();
+        sa.startPreferencePanel(caller, fragment.getName(), args, title, null, caller,
+                SUB_INFO_FRAGMENT);
+    }
+
+    private void handleUninstallButtonClick() {
+        if (mAppEntry == null) {
+            setIntentAndFinish(true, true);
+            return;
+        }
+        final String packageName = mAppEntry.info.packageName;
+        if (mDpm.packageHasActiveAdmins(mPackageInfo.packageName)) {
+            stopListeningToPackageRemove();
+            Activity activity = getActivity();
+            Intent uninstallDAIntent = new Intent(activity, DeviceAdminAdd.class);
+            uninstallDAIntent.putExtra(DeviceAdminAdd.EXTRA_DEVICE_ADMIN_PACKAGE_NAME,
+                    mPackageName);
+            mMetricsFeatureProvider.action(
+                    activity, MetricsEvent.ACTION_SETTINGS_UNINSTALL_DEVICE_ADMIN);
+            activity.startActivityForResult(uninstallDAIntent, REQUEST_REMOVE_DEVICE_ADMIN);
+            return;
+        }
+        EnforcedAdmin admin = RestrictedLockUtils.checkIfUninstallBlocked(getActivity(),
+                packageName, mUserId);
+        boolean uninstallBlockedBySystem = mAppsControlDisallowedBySystem ||
+                RestrictedLockUtils.hasBaseUserRestriction(getActivity(), packageName, mUserId);
+        if (admin != null && !uninstallBlockedBySystem) {
+            RestrictedLockUtils.sendShowAdminSupportDetailsIntent(getActivity(), admin);
+        } else if ((mAppEntry.info.flags & ApplicationInfo.FLAG_SYSTEM) != 0) {
+            if (mAppEntry.info.enabled && !isDisabledUntilUsed()) {
+                // If the system app has an update and this is the only user on the device,
+                // then offer to downgrade the app, otherwise only offer to disable the
+                // app for this user.
+                if (mUpdatedSysApp && isSingleUser()) {
+                    showDialogInner(DLG_SPECIAL_DISABLE, 0);
+                } else {
+                    showDialogInner(DLG_DISABLE, 0);
+                }
+            } else {
+                mMetricsFeatureProvider.action(
+                        getActivity(),
+                        MetricsEvent.ACTION_SETTINGS_ENABLE_APP);
+                new DisableChanger(this, mAppEntry.info,
+                        PackageManager.COMPONENT_ENABLED_STATE_ENABLED)
+                        .execute((Object) null);
+            }
+        } else if ((mAppEntry.info.flags & ApplicationInfo.FLAG_INSTALLED) == 0) {
+            uninstallPkg(packageName, true, false);
+        } else {
+            uninstallPkg(packageName, false, false);
+        }
+    }
+
+    private void handleForceStopButtonClick() {
+        if (mAppEntry == null) {
+            setIntentAndFinish(true, true);
+            return;
+        }
+        if (mAppsControlDisallowedAdmin != null && !mAppsControlDisallowedBySystem) {
+            RestrictedLockUtils.sendShowAdminSupportDetailsIntent(
+                    getActivity(), mAppsControlDisallowedAdmin);
+        } else {
+            showDialogInner(DLG_FORCE_STOP, 0);
+            //forceStopPackage(mAppInfo.packageName);
+        }
+    }
+
+    /** Returns whether there is only one user on this device, not including the system-only user */
+    private boolean isSingleUser() {
+        final int userCount = mUserManager.getUserCount();
+        return userCount == 1
+                || (mUserManager.isSplitSystemUser() && userCount == 2);
+    }
+
+    private void addDynamicPrefs() {
+        if (UserManager.get(getContext()).isManagedProfile()) {
+            return;
+        }
+        final PreferenceScreen screen = getPreferenceScreen();
+        final Context context = getContext();
+
+        // Get the package info with the activities
+        PackageInfo packageInfoWithActivities = null;
+        try {
+            packageInfoWithActivities = mPm.getPackageInfoAsUser(mPackageName,
+                    PackageManager.GET_ACTIVITIES, UserHandle.myUserId());
+        } catch (NameNotFoundException e) {
+            Log.e(TAG, "Exception while retrieving the package info of " + mPackageName, e);
+        }
+
+        boolean hasDrawOverOtherApps = hasPermission(permission.SYSTEM_ALERT_WINDOW);
+        boolean hasWriteSettings = hasPermission(permission.WRITE_SETTINGS);
+        boolean hasPictureInPictureActivities = (packageInfoWithActivities != null) &&
+                PictureInPictureSettings.checkPackageHasPictureInPictureActivities(
+                        packageInfoWithActivities.packageName,
+                        packageInfoWithActivities.activities);
+        boolean isPotentialAppSource = isPotentialAppSource();
+        if (hasDrawOverOtherApps || hasWriteSettings || hasPictureInPictureActivities ||
+                isPotentialAppSource) {
+            PreferenceCategory category = new PreferenceCategory(getPrefContext());
+            category.setTitle(R.string.advanced_apps);
+            screen.addPreference(category);
+
+            if (hasDrawOverOtherApps) {
+                Preference pref = new Preference(getPrefContext());
+                pref.setTitle(R.string.draw_overlay);
+                pref.setKey("system_alert_window");
+                pref.setOnPreferenceClickListener(new OnPreferenceClickListener() {
+                    @Override
+                    public boolean onPreferenceClick(Preference preference) {
+                        startAppInfoFragment(DrawOverlayDetails.class, R.string.draw_overlay);
+                        return true;
+                    }
+                });
+                category.addPreference(pref);
+            }
+            if (hasWriteSettings) {
+                Preference pref = new Preference(getPrefContext());
+                pref.setTitle(R.string.write_settings);
+                pref.setKey("write_settings_apps");
+                pref.setOnPreferenceClickListener(new OnPreferenceClickListener() {
+                    @Override
+                    public boolean onPreferenceClick(Preference preference) {
+                        startAppInfoFragment(WriteSettingsDetails.class, R.string.write_settings);
+                        return true;
+                    }
+                });
+                category.addPreference(pref);
+            }
+            if (hasPictureInPictureActivities) {
+                Preference pref = new Preference(getPrefContext());
+                pref.setTitle(R.string.picture_in_picture_app_detail_title);
+                pref.setKey("picture_in_picture");
+                pref.setOnPreferenceClickListener(new OnPreferenceClickListener() {
+                    @Override
+                    public boolean onPreferenceClick(Preference preference) {
+                        AppInfoBase.startAppInfoFragment(PictureInPictureDetails.class,
+                                R.string.picture_in_picture_app_detail_title, mPackageName,
+                                mPackageInfo.applicationInfo.uid, AppInfoDashboardFragment.this,
+                                -1, getMetricsCategory());
+                        return true;
+                    }
+                });
+                category.addPreference(pref);
+            }
+            if (isPotentialAppSource) {
+                Preference pref = new Preference(getPrefContext());
+                pref.setTitle(R.string.install_other_apps);
+                pref.setKey("install_other_apps");
+                pref.setOnPreferenceClickListener(new OnPreferenceClickListener() {
+                    @Override
+                    public boolean onPreferenceClick(Preference preference) {
+                        startAppInfoFragment(ExternalSourcesDetails.class,
+                                R.string.install_other_apps);
+                        return true;
+                    }
+                });
+                category.addPreference(pref);
+            }
+        }
+
+        addAppInstallerInfoPref(screen);
+        maybeAddInstantAppButtons();
+    }
+
+    private boolean isPotentialAppSource() {
+        AppStateInstallAppsBridge.InstallAppsState appState =
+                new AppStateInstallAppsBridge(getContext(), null, null)
+                        .createInstallAppsStateFor(mPackageName, mPackageInfo.applicationInfo.uid);
+        return appState.isPotentialAppSource();
+    }
+
+    private void addAppInstallerInfoPref(PreferenceScreen screen) {
+        String installerPackageName =
+                AppStoreUtil.getInstallerPackageName(getContext(), mPackageName);
+
+        final CharSequence installerLabel = Utils.getApplicationLabel(getContext(),
+                installerPackageName);
+        if (installerLabel == null) {
+            return;
+        }
+        final int detailsStringId = AppUtils.isInstant(mPackageInfo.applicationInfo)
+                ? R.string.instant_app_details_summary
+                : R.string.app_install_details_summary;
+        PreferenceCategory category = new PreferenceCategory(getPrefContext());
+        category.setTitle(R.string.app_install_details_group_title);
+        screen.addPreference(category);
+        Preference pref = new Preference(getPrefContext());
+        pref.setTitle(R.string.app_install_details_title);
+        pref.setKey("app_info_store");
+        pref.setSummary(getString(detailsStringId, installerLabel));
+
+        Intent intent =
+                AppStoreUtil.getAppStoreLink(getContext(), installerPackageName, mPackageName);
+        if (intent != null) {
+            pref.setIntent(intent);
+        } else {
+            pref.setEnabled(false);
+        }
+        category.addPreference(pref);
+    }
+
+    @VisibleForTesting
+    void maybeAddInstantAppButtons() {
+        if (AppUtils.isInstant(mPackageInfo.applicationInfo)) {
+            LayoutPreference buttons = (LayoutPreference) findPreference(KEY_INSTANT_APP_BUTTONS);
+            mInstantAppButtonsController = mApplicationFeatureProvider
+                    .newInstantAppButtonsController(this,
+                            buttons.findViewById(R.id.instant_app_button_container),
+                            id -> showDialogInner(id, 0))
+                    .setPackageName(mPackageName)
+                    .show();
+        }
+    }
+
+    private boolean hasPermission(String permission) {
+        if (mPackageInfo == null || mPackageInfo.requestedPermissions == null) {
+            return false;
+        }
+        for (int i = 0; i < mPackageInfo.requestedPermissions.length; i++) {
+            if (mPackageInfo.requestedPermissions[i].equals(permission)) {
+                return true;
+            }
+        }
+        return false;
+    }
+
+    private void updateDynamicPrefs() {
+        final Context context = getContext();
+        Preference pref = findPreference("system_alert_window");
+        if (pref != null) {
+            pref.setSummary(DrawOverlayDetails.getSummary(getContext(), mAppEntry));
+        }
+        pref = findPreference("picture_in_picture");
+        if (pref != null) {
+            pref.setSummary(PictureInPictureDetails.getPreferenceSummary(getContext(),
+                    mPackageInfo.applicationInfo.uid, mPackageName));
+        }
+        pref = findPreference("write_settings_apps");
+        if (pref != null) {
+            pref.setSummary(WriteSettingsDetails.getSummary(getContext(), mAppEntry));
+        }
+        pref = findPreference("install_other_apps");
+        if (pref != null) {
+            pref.setSummary(ExternalSourcesDetails.getPreferenceSummary(getContext(), mAppEntry));
+        }
+    }
+
+    private void onPackageRemoved() {
+        getActivity().finishActivity(SUB_INFO_FRAGMENT);
+        getActivity().finishAndRemoveTask();
+    }
+
+    /**
+     * Elicit this class for testing. Test cannot be done in robolectric because it
+     * invokes the new API.
+     */
+    @VisibleForTesting
+    public static class PackageUtil {
+        /**
+         * Count how many users in device have installed package {@paramref packageName}
+         */
+        public static int countPackageInUsers(PackageManager packageManager, UserManager
+                userManager, String packageName) {
+            final List<UserInfo> userInfos = userManager.getUsers(true);
+            int count = 0;
+
+            for (final UserInfo userInfo : userInfos) {
+                try {
+                    // Use this API to check whether user has this package
+                    final ApplicationInfo info = packageManager.getApplicationInfoAsUser(
+                            packageName, PackageManager.GET_META_DATA, userInfo.id);
+                    if ((info.flags & ApplicationInfo.FLAG_INSTALLED) != 0) {
+                        count++;
+                    }
+                } catch(NameNotFoundException e) {
+                    Log.e(TAG, "Package: " + packageName + " not found for user: " + userInfo.id);
+                }
+            }
+
+            return count;
+        }
+    }
+
+    private static class DisableChanger extends AsyncTask<Object, Object, Object> {
+        final PackageManager mPm;
+        final WeakReference<AppInfoDashboardFragment> mActivity;
+        final ApplicationInfo mInfo;
+        final int mState;
+
+        DisableChanger(AppInfoDashboardFragment activity, ApplicationInfo info, int state) {
+            mPm = activity.mPm;
+            mActivity = new WeakReference<AppInfoDashboardFragment>(activity);
+            mInfo = info;
+            mState = state;
+        }
+
+        @Override
+        protected Object doInBackground(Object... params) {
+            mPm.setApplicationEnabledSetting(mInfo.packageName, mState, 0);
+            return null;
+        }
+    }
+
+    private final BroadcastReceiver mCheckKillProcessesReceiver = new BroadcastReceiver() {
+        @Override
+        public void onReceive(Context context, Intent intent) {
+            final boolean enabled = getResultCode() != Activity.RESULT_CANCELED;
+            Log.d(TAG, "Got broadcast response: Restart status for "
+                    + mAppEntry.info.packageName + " " + enabled);
+            updateForceStopButton(enabled);
+        }
+    };
+
+    private String getPackageName() {
+        if (mPackageName != null) {
+            return mPackageName;
+        }
+        final Bundle args = getArguments();
+        String mPackageName = (args != null) ? args.getString(ARG_PACKAGE_NAME) : null;
+        if (mPackageName == null) {
+            Intent intent = (args == null) ?
+                    getActivity().getIntent() : (Intent) args.getParcelable("intent");
+            if (intent != null) {
+                mPackageName = intent.getData().getSchemeSpecificPart();
+            }
+        }
+        return mPackageName;
+    }
+
+    private void retrieveAppEntry() {
+        final Activity activity = getActivity();
+        if (activity == null) {
+            return;
+        }
+        if (mState == null) {
+            mState = ApplicationsState.getInstance(activity.getApplication());
+            mSession = mState.newSession(this, getLifecycle());
+        }
+        mUserId = UserHandle.myUserId();
+        mAppEntry = mState.getEntry(getPackageName(), UserHandle.myUserId());
+        if (mAppEntry != null) {
+            // Get application info again to refresh changed properties of application
+            try {
+                mPackageInfo = activity.getPackageManager().getPackageInfo(
+                        mAppEntry.info.packageName,
+                        PackageManager.MATCH_DISABLED_COMPONENTS |
+                                PackageManager.MATCH_ANY_USER |
+                                PackageManager.GET_SIGNATURES |
+                                PackageManager.GET_PERMISSIONS);
+            } catch (NameNotFoundException e) {
+                Log.e(TAG, "Exception when retrieving package:" + mAppEntry.info.packageName, e);
+            }
+        } else {
+            Log.w(TAG, "Missing AppEntry; maybe reinstalling?");
+            mPackageInfo = null;
+        }
+    }
+
+    private void setIntentAndFinish(boolean finish, boolean appChanged) {
+        if (localLOGV) Log.i(TAG, "appChanged="+appChanged);
+        Intent intent = new Intent();
+        intent.putExtra(ManageApplications.APP_CHG, appChanged);
+        SettingsActivity sa = (SettingsActivity)getActivity();
+        sa.finishPreferencePanel(this, Activity.RESULT_OK, intent);
+        mFinishing = true;
+    }
+
+    private void showDialogInner(int id, int moveErrorCode) {
+        DialogFragment newFragment =
+                AppInfoBase.MyAlertDialogFragment.newInstance(id, moveErrorCode);
+        newFragment.setTargetFragment(this, 0);
+        newFragment.show(getFragmentManager(), "dialog " + id);
+    }
+
+    @Override
+    public void onRunningStateChanged(boolean running) {
+        // No op.
+    }
+
+    @Override
+    public void onRebuildComplete(ArrayList<AppEntry> apps) {
+        // No op.
+    }
+
+    @Override
+    public void onPackageIconChanged() {
+        // No op.
+    }
+
+    @Override
+    public void onAllSizesComputed() {
+        // No op.
+    }
+
+    @Override
+    public void onLauncherInfoChanged() {
+        // No op.
+    }
+
+    @Override
+    public void onLoadEntriesCompleted() {
+        // No op.
+    }
+
+    @Override
+    public void onPackageListChanged() {
+        if (!refreshUi()) {
+            setIntentAndFinish(true, true);
+        }
+    }
+
+    public static void startAppInfoFragment(Class<?> fragment, int titleRes,
+            String pkg, int uid, Fragment source, int request, int sourceMetricsCategory) {
+        startAppInfoFragment(fragment, titleRes, pkg, uid, source.getActivity(), request,
+                sourceMetricsCategory);
+    }
+
+    public static void startAppInfoFragment(Class<?> fragment, int titleRes,
+            String pkg, int uid, Activity source, int request, int sourceMetricsCategory) {
+        Bundle args = new Bundle();
+        args.putString(AppInfoBase.ARG_PACKAGE_NAME, pkg);
+        args.putInt(AppInfoBase.ARG_PACKAGE_UID, uid);
+
+        Intent intent = Utils.onBuildStartFragmentIntent(source, fragment.getName(),
+                args, null, titleRes, null, false, sourceMetricsCategory);
+        source.startActivityForResultAsUser(intent, request,
+                new UserHandle(UserHandle.getUserId(uid)));
+    }
+
+    public static class MyAlertDialogFragment extends InstrumentedDialogFragment {
+
+        private static final String ARG_ID = "id";
+
+        @Override
+        public int getMetricsCategory() {
+            return MetricsProto.MetricsEvent.DIALOG_APP_INFO_ACTION;
+        }
+
+        @Override
+        public Dialog onCreateDialog(Bundle savedInstanceState) {
+            int id = getArguments().getInt(ARG_ID);
+            int errorCode = getArguments().getInt("moveError");
+            Dialog dialog = ((AppInfoBase) getTargetFragment()).createDialog(id, errorCode);
+            if (dialog == null) {
+                throw new IllegalArgumentException("unknown id " + id);
+            }
+            return dialog;
+        }
+
+        public static AppInfoBase.MyAlertDialogFragment newInstance(int id, int errorCode) {
+            AppInfoBase.MyAlertDialogFragment
+                    dialogFragment = new AppInfoBase.MyAlertDialogFragment();
+            Bundle args = new Bundle();
+            args.putInt(ARG_ID, id);
+            args.putInt("moveError", errorCode);
+            dialogFragment.setArguments(args);
+            return dialogFragment;
+        }
+    }
+
+    private void startListeningToPackageRemove() {
+        if (mListeningToPackageRemove) {
+            return;
+        }
+        mListeningToPackageRemove = true;
+        final IntentFilter filter = new IntentFilter(Intent.ACTION_PACKAGE_REMOVED);
+        filter.addDataScheme("package");
+        getContext().registerReceiver(mPackageRemovedReceiver, filter);
+    }
+
+    private void stopListeningToPackageRemove() {
+        if (!mListeningToPackageRemove) {
+            return;
+        }
+        mListeningToPackageRemove = false;
+        getContext().unregisterReceiver(mPackageRemovedReceiver);
+    }
+
+    private final BroadcastReceiver mPackageRemovedReceiver = new BroadcastReceiver() {
+        @Override
+        public void onReceive(Context context, Intent intent) {
+            String packageName = intent.getData().getSchemeSpecificPart();
+            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 3df81c7..af0cf5b 100644
--- a/src/com/android/settings/applications/AppInfoWithHeader.java
+++ b/src/com/android/settings/applications/AppInfoWithHeader.java
@@ -16,6 +16,8 @@
 
 package com.android.settings.applications;
 
+import static com.android.settings.widget.EntityHeaderController.ActionType;
+
 import android.app.Activity;
 import android.os.Bundle;
 import android.support.v7.preference.Preference;
@@ -25,8 +27,6 @@
 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;
@@ -44,7 +44,7 @@
         final Preference pref = EntityHeaderController
                 .newInstance(activity, this, null /* header */)
                 .setRecyclerView(getListView(), getLifecycle())
-                .setIcon(IconDrawableFactory.newInstance(activity)
+                .setIcon(IconDrawableFactory.newInstance(getContext())
                         .getBadgedIcon(mPackageInfo.applicationInfo))
                 .setLabel(mPackageInfo.applicationInfo.loadLabel(mPm))
                 .setSummary(mPackageInfo)
diff --git a/src/com/android/settings/applications/AppLister.java b/src/com/android/settings/applications/AppLister.java
index 425afa0..f1a3be9 100644
--- a/src/com/android/settings/applications/AppLister.java
+++ b/src/com/android/settings/applications/AppLister.java
@@ -23,6 +23,8 @@
 import android.os.UserHandle;
 import android.os.UserManager;
 
+import com.android.settingslib.wrapper.PackageManagerWrapper;
+
 import java.util.ArrayList;
 import java.util.List;
 
diff --git a/src/com/android/settings/applications/AppOpsCategory.java b/src/com/android/settings/applications/AppOpsCategory.java
deleted file mode 100644
index e27e05b..0000000
--- a/src/com/android/settings/applications/AppOpsCategory.java
+++ /dev/null
@@ -1,412 +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.app.AppOpsManager;
-import android.app.ListFragment;
-import android.app.LoaderManager;
-import android.content.AsyncTaskLoader;
-import android.content.BroadcastReceiver;
-import android.content.Context;
-import android.content.Intent;
-import android.content.IntentFilter;
-import android.content.Loader;
-import android.content.pm.ActivityInfo;
-import android.content.res.Configuration;
-import android.content.res.Resources;
-import android.os.Bundle;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.BaseAdapter;
-import android.widget.ImageView;
-import android.widget.ListView;
-import android.widget.Switch;
-import android.widget.TextView;
-
-import com.android.settings.R;
-import com.android.settings.SettingsActivity;
-import com.android.settings.applications.AppOpsState.AppOpEntry;
-
-import java.util.List;
-
-public class AppOpsCategory extends ListFragment implements
-        LoaderManager.LoaderCallbacks<List<AppOpEntry>> {
-
-    private static final int RESULT_APP_DETAILS = 1;
-
-    AppOpsState mState;
-    boolean mUserControlled;
-
-    // This is the Adapter being used to display the list's data.
-    AppListAdapter mAdapter;
-
-    String mCurrentPkgName;
-
-    public AppOpsCategory() {
-    }
-
-    public AppOpsCategory(AppOpsState.OpsTemplate template) {
-        this(template, false);
-    }
-
-    public AppOpsCategory(AppOpsState.OpsTemplate template, boolean userControlled) {
-        Bundle args = new Bundle();
-        args.putParcelable("template", template);
-        args.putBoolean("userControlled", userControlled);
-        setArguments(args);
-    }
-
-    /**
-     * Helper for determining if the configuration has changed in an interesting
-     * way so we need to rebuild the app list.
-     */
-    public static class InterestingConfigChanges {
-        final Configuration mLastConfiguration = new Configuration();
-        int mLastDensity;
-
-        boolean applyNewConfig(Resources res) {
-            int configChanges = mLastConfiguration.updateFrom(res.getConfiguration());
-            boolean densityChanged = mLastDensity != res.getDisplayMetrics().densityDpi;
-            if (densityChanged || (configChanges&(ActivityInfo.CONFIG_LOCALE
-                    |ActivityInfo.CONFIG_UI_MODE|ActivityInfo.CONFIG_SCREEN_LAYOUT)) != 0) {
-                mLastDensity = res.getDisplayMetrics().densityDpi;
-                return true;
-            }
-            return false;
-        }
-    }
-
-    /**
-     * Helper class to look for interesting changes to the installed apps
-     * so that the loader can be updated.
-     */
-    public static class PackageIntentReceiver extends BroadcastReceiver {
-        final AppListLoader mLoader;
-
-        public PackageIntentReceiver(AppListLoader loader) {
-            mLoader = loader;
-            IntentFilter filter = new IntentFilter(Intent.ACTION_PACKAGE_ADDED);
-            filter.addAction(Intent.ACTION_PACKAGE_REMOVED);
-            filter.addAction(Intent.ACTION_PACKAGE_CHANGED);
-            filter.addDataScheme("package");
-            mLoader.getContext().registerReceiver(this, filter);
-            // Register for events related to sdcard installation.
-            IntentFilter sdFilter = new IntentFilter();
-            sdFilter.addAction(Intent.ACTION_EXTERNAL_APPLICATIONS_AVAILABLE);
-            sdFilter.addAction(Intent.ACTION_EXTERNAL_APPLICATIONS_UNAVAILABLE);
-            mLoader.getContext().registerReceiver(this, sdFilter);
-        }
-
-        @Override public void onReceive(Context context, Intent intent) {
-            // Tell the loader about the change.
-            mLoader.onContentChanged();
-        }
-    }
-
-    /**
-     * A custom Loader that loads all of the installed applications.
-     */
-    public static class AppListLoader extends AsyncTaskLoader<List<AppOpEntry>> {
-        final InterestingConfigChanges mLastConfig = new InterestingConfigChanges();
-        final AppOpsState mState;
-        final AppOpsState.OpsTemplate mTemplate;
-        final boolean mUserControlled;
-
-        List<AppOpEntry> mApps;
-        PackageIntentReceiver mPackageObserver;
-
-        public AppListLoader(Context context, AppOpsState state, AppOpsState.OpsTemplate template,
-                boolean userControlled) {
-            super(context);
-            mState = state;
-            mTemplate = template;
-            mUserControlled = userControlled;
-        }
-
-        @Override public List<AppOpEntry> loadInBackground() {
-            return mState.buildState(mTemplate, 0, null,
-                    mUserControlled ? AppOpsState.LABEL_COMPARATOR : AppOpsState.RECENCY_COMPARATOR);
-        }
-
-        /**
-         * Called when there is new data to deliver to the client.  The
-         * super class will take care of delivering it; the implementation
-         * here just adds a little more logic.
-         */
-        @Override public void deliverResult(List<AppOpEntry> apps) {
-            if (isReset()) {
-                // An async query came in while the loader is stopped.  We
-                // don't need the result.
-                if (apps != null) {
-                    onReleaseResources(apps);
-                }
-            }
-            List<AppOpEntry> oldApps = apps;
-            mApps = apps;
-
-            if (isStarted()) {
-                // If the Loader is currently started, we can immediately
-                // deliver its results.
-                super.deliverResult(apps);
-            }
-
-            // At this point we can release the resources associated with
-            // 'oldApps' if needed; now that the new result is delivered we
-            // know that it is no longer in use.
-            if (oldApps != null) {
-                onReleaseResources(oldApps);
-            }
-        }
-
-        /**
-         * Handles a request to start the Loader.
-         */
-        @Override protected void onStartLoading() {
-            // We don't monitor changed when loading is stopped, so need
-            // to always reload at this point.
-            onContentChanged();
-
-            if (mApps != null) {
-                // If we currently have a result available, deliver it
-                // immediately.
-                deliverResult(mApps);
-            }
-
-            // Start watching for changes in the app data.
-            if (mPackageObserver == null) {
-                mPackageObserver = new PackageIntentReceiver(this);
-            }
-
-            // Has something interesting in the configuration changed since we
-            // last built the app list?
-            boolean configChange = mLastConfig.applyNewConfig(getContext().getResources());
-
-            if (takeContentChanged() || mApps == null || configChange) {
-                // If the data has changed since the last time it was loaded
-                // or is not currently available, start a load.
-                forceLoad();
-            }
-        }
-
-        /**
-         * Handles a request to stop the Loader.
-         */
-        @Override protected void onStopLoading() {
-            // Attempt to cancel the current load task if possible.
-            cancelLoad();
-        }
-
-        /**
-         * Handles a request to cancel a load.
-         */
-        @Override public void onCanceled(List<AppOpEntry> apps) {
-            super.onCanceled(apps);
-
-            // At this point we can release the resources associated with 'apps'
-            // if needed.
-            onReleaseResources(apps);
-        }
-
-        /**
-         * Handles a request to completely reset the Loader.
-         */
-        @Override protected void onReset() {
-            super.onReset();
-
-            // Ensure the loader is stopped
-            onStopLoading();
-
-            // At this point we can release the resources associated with 'apps'
-            // if needed.
-            if (mApps != null) {
-                onReleaseResources(mApps);
-                mApps = null;
-            }
-
-            // Stop monitoring for changes.
-            if (mPackageObserver != null) {
-                getContext().unregisterReceiver(mPackageObserver);
-                mPackageObserver = null;
-            }
-        }
-
-        /**
-         * Helper function to take care of releasing resources associated
-         * with an actively loaded data set.
-         */
-        protected void onReleaseResources(List<AppOpEntry> apps) {
-            // For a simple List<> there is nothing to do.  For something
-            // like a Cursor, we would close it here.
-        }
-    }
-
-    public static class AppListAdapter extends BaseAdapter {
-        private final Resources mResources;
-        private final LayoutInflater mInflater;
-        private final AppOpsState mState;
-        private final boolean mUserControlled;
-
-        List<AppOpEntry> mList;
-
-        public AppListAdapter(Context context, AppOpsState state, boolean userControlled) {
-            mResources = context.getResources();
-            mInflater = (LayoutInflater)context.getSystemService(Context.LAYOUT_INFLATER_SERVICE);
-            mState = state;
-            mUserControlled = userControlled;
-        }
-
-        public void setData(List<AppOpEntry> data) {
-            mList = data;
-            notifyDataSetChanged();
-        }
-
-        @Override
-        public int getCount() {
-            return mList != null ? mList.size() : 0;
-        }
-
-        @Override
-        public AppOpEntry getItem(int position) {
-            return mList.get(position);
-        }
-
-        @Override
-        public long getItemId(int position) {
-            return position;
-        }
-
-        /**
-         * Populate new items in the list.
-         */
-        @Override public View getView(int position, View convertView, ViewGroup parent) {
-            View view;
-
-            if (convertView == null) {
-                view = mInflater.inflate(R.layout.app_ops_item, parent, false);
-            } else {
-                view = convertView;
-            }
-
-            AppOpEntry item = getItem(position);
-            ((ImageView)view.findViewById(R.id.app_icon)).setImageDrawable(
-                    item.getAppEntry().getIcon());
-            ((TextView)view.findViewById(R.id.app_name)).setText(item.getAppEntry().getLabel());
-            if (mUserControlled) {
-                ((TextView) view.findViewById(R.id.op_name)).setText(
-                        item.getTimeText(mResources, false));
-                view.findViewById(R.id.op_time).setVisibility(View.GONE);
-                ((Switch) view.findViewById(R.id.op_switch)).setChecked(
-                        item.getPrimaryOpMode() == AppOpsManager.MODE_ALLOWED);
-            } else {
-                ((TextView) view.findViewById(R.id.op_name)).setText(item.getSummaryText(mState));
-                ((TextView) view.findViewById(R.id.op_time)).setText(
-                        item.getTimeText(mResources, false));
-                view.findViewById(R.id.op_switch).setVisibility(View.GONE);
-            }
-
-            return view;
-        }
-    }
-
-    @Override
-    public void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        mState = new AppOpsState(getActivity());
-        mUserControlled = getArguments().getBoolean("userControlled");
-    }
-
-    @Override public void onActivityCreated(Bundle savedInstanceState) {
-        super.onActivityCreated(savedInstanceState);
-
-        // Give some text to display if there is no data.  In a real
-        // application this would come from a resource.
-        setEmptyText("No applications");
-
-        // We have a menu item to show in action bar.
-        setHasOptionsMenu(true);
-
-        // Create an empty adapter we will use to display the loaded data.
-        mAdapter = new AppListAdapter(getActivity(), mState, mUserControlled);
-        setListAdapter(mAdapter);
-
-        // Start out with a progress indicator.
-        setListShown(false);
-
-        // Prepare the loader.
-        getLoaderManager().initLoader(0, null, this);
-    }
-
-    // utility method used to start sub activity
-    private void startApplicationDetailsActivity() {
-        // start new fragment to display extended information
-        Bundle args = new Bundle();
-        args.putString(AppOpsDetails.ARG_PACKAGE_NAME, mCurrentPkgName);
-
-        SettingsActivity sa = (SettingsActivity) getActivity();
-        sa.startPreferencePanel(this, AppOpsDetails.class.getName(), args,
-                R.string.app_ops_settings, null, this, RESULT_APP_DETAILS);
-    }
-
-    @Override public void onListItemClick(ListView l, View v, int position, long id) {
-        AppOpEntry entry = mAdapter.getItem(position);
-        if (entry != null) {
-            if (mUserControlled) {
-                // We treat this as tapping on the check box, toggling the app op state.
-                Switch sw = ((Switch) v.findViewById(R.id.op_switch));
-                boolean checked = !sw.isChecked();
-                sw.setChecked(checked);
-                AppOpsManager.OpEntry op = entry.getOpEntry(0);
-                int mode = checked ? AppOpsManager.MODE_ALLOWED : AppOpsManager.MODE_IGNORED;
-                mState.getAppOpsManager().setMode(op.getOp(),
-                        entry.getAppEntry().getApplicationInfo().uid,
-                        entry.getAppEntry().getApplicationInfo().packageName,
-                        mode);
-                entry.overridePrimaryOpMode(mode);
-            } else {
-                mCurrentPkgName = entry.getAppEntry().getApplicationInfo().packageName;
-                startApplicationDetailsActivity();
-            }
-        }
-    }
-
-    @Override public Loader<List<AppOpEntry>> onCreateLoader(int id, Bundle args) {
-        Bundle fargs = getArguments();
-        AppOpsState.OpsTemplate template = null;
-        if (fargs != null) {
-            template = (AppOpsState.OpsTemplate)fargs.getParcelable("template");
-        }
-        return new AppListLoader(getActivity(), mState, template, mUserControlled);
-    }
-
-    @Override public void onLoadFinished(Loader<List<AppOpEntry>> loader, List<AppOpEntry> data) {
-        // Set the new data in the adapter.
-        mAdapter.setData(data);
-
-        // The list should now be shown.
-        if (isResumed()) {
-            setListShown(true);
-        } else {
-            setListShownNoAnimation(true);
-        }
-    }
-
-    @Override public void onLoaderReset(Loader<List<AppOpEntry>> loader) {
-        // Clear the data in the adapter.
-        mAdapter.setData(null);
-    }
-}
diff --git a/src/com/android/settings/applications/AppOpsDetails.java b/src/com/android/settings/applications/AppOpsDetails.java
deleted file mode 100644
index b488af6..0000000
--- a/src/com/android/settings/applications/AppOpsDetails.java
+++ /dev/null
@@ -1,222 +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.app.Activity;
-import android.app.AppOpsManager;
-import android.content.Context;
-import android.content.Intent;
-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.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;
-import android.view.ViewGroup;
-import android.widget.CompoundButton;
-import android.widget.ImageView;
-import android.widget.LinearLayout;
-import android.widget.Switch;
-import android.widget.TextView;
-
-import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
-import com.android.settings.core.InstrumentedPreferenceFragment;
-import com.android.settings.R;
-import com.android.settings.SettingsActivity;
-import com.android.settings.Utils;
-import com.android.settings.widget.EntityHeaderController;
-
-import java.util.List;
-
-public class AppOpsDetails extends InstrumentedPreferenceFragment {
-    static final String TAG = "AppOpsDetails";
-
-    public static final String ARG_PACKAGE_NAME = "package";
-
-    private AppOpsState mState;
-    private PackageManager mPm;
-    private AppOpsManager mAppOps;
-    private PackageInfo mPackageInfo;
-    private LayoutInflater mInflater;
-    private View mRootView;
-    private LinearLayout mOperationsSection;
-
-    // Utility method to set application label and icon.
-    private void setAppLabelAndIcon(PackageInfo pkgInfo) {
-        final View appSnippet = mRootView.findViewById(R.id.app_snippet);
-        CharSequence label = mPm.getApplicationLabel(pkgInfo.applicationInfo);
-        Drawable icon = mPm.getApplicationIcon(pkgInfo.applicationInfo);
-        setupAppSnippet(appSnippet, label, icon,
-                pkgInfo != null ? pkgInfo.versionName : null);
-    }
-
-    private String retrieveAppEntry() {
-        final Bundle args = getArguments();
-        String packageName = (args != null) ? args.getString(ARG_PACKAGE_NAME) : null;
-        if (packageName == null) {
-            Intent intent = (args == null) ?
-                    getActivity().getIntent() : (Intent) args.getParcelable("intent");
-            if (intent != null) {
-                packageName = intent.getData().getSchemeSpecificPart();
-            }
-        }
-        try {
-            mPackageInfo = mPm.getPackageInfo(packageName,
-                    PackageManager.MATCH_DISABLED_COMPONENTS |
-                    PackageManager.MATCH_ANY_USER);
-        } catch (NameNotFoundException e) {
-            Log.e(TAG, "Exception when retrieving package:" + packageName, e);
-            mPackageInfo = null;
-        }
-
-        return packageName;
-    }
-
-    private boolean refreshUi() {
-        if (mPackageInfo == null) {
-            return false;
-        }
-
-        setAppLabelAndIcon(mPackageInfo);
-
-        Resources res = getActivity().getResources();
-
-        mOperationsSection.removeAllViews();
-        String lastPermGroup = "";
-        for (AppOpsState.OpsTemplate tpl : AppOpsState.ALL_TEMPLATES) {
-            List<AppOpsState.AppOpEntry> entries = mState.buildState(tpl,
-                    mPackageInfo.applicationInfo.uid, mPackageInfo.packageName);
-            for (final AppOpsState.AppOpEntry entry : entries) {
-                final AppOpsManager.OpEntry firstOp = entry.getOpEntry(0);
-                final View view = mInflater.inflate(R.layout.app_ops_details_item,
-                        mOperationsSection, false);
-                mOperationsSection.addView(view);
-                String perm = AppOpsManager.opToPermission(firstOp.getOp());
-                if (perm != null) {
-                    try {
-                        PermissionInfo pi = mPm.getPermissionInfo(perm, 0);
-                        if (pi.group != null && !lastPermGroup.equals(pi.group)) {
-                            lastPermGroup = pi.group;
-                            PermissionGroupInfo pgi = mPm.getPermissionGroupInfo(pi.group, 0);
-                            if (pgi.icon != 0) {
-                                ((ImageView)view.findViewById(R.id.op_icon)).setImageDrawable(
-                                        pgi.loadIcon(mPm));
-                            }
-                        }
-                    } catch (NameNotFoundException e) {
-                    }
-                }
-                ((TextView)view.findViewById(R.id.op_name)).setText(
-                        entry.getSwitchText(mState));
-                ((TextView)view.findViewById(R.id.op_time)).setText(
-                        entry.getTimeText(res, true));
-                Switch sw = (Switch)view.findViewById(R.id.switchWidget);
-                final int switchOp = AppOpsManager.opToSwitch(firstOp.getOp());
-                sw.setChecked(mAppOps.checkOp(switchOp, entry.getPackageOps().getUid(),
-                        entry.getPackageOps().getPackageName()) == AppOpsManager.MODE_ALLOWED);
-                sw.setOnCheckedChangeListener(new Switch.OnCheckedChangeListener() {
-                    @Override
-                    public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
-                        mAppOps.setMode(switchOp, entry.getPackageOps().getUid(),
-                                entry.getPackageOps().getPackageName(), isChecked
-                                ? AppOpsManager.MODE_ALLOWED : AppOpsManager.MODE_IGNORED);
-                    }
-                });
-            }
-        }
-
-        return true;
-    }
-
-    private void setIntentAndFinish(boolean finish, boolean appChanged) {
-        Intent intent = new Intent();
-        intent.putExtra(ManageApplications.APP_CHG, appChanged);
-        SettingsActivity sa = (SettingsActivity)getActivity();
-        sa.finishPreferencePanel(this, Activity.RESULT_OK, intent);
-    }
-
-    /** Called when the activity is first created. */
-    @Override
-    public void onCreate(Bundle icicle) {
-        super.onCreate(icicle);
-
-        mState = new AppOpsState(getActivity());
-        mPm = getActivity().getPackageManager();
-        mInflater = (LayoutInflater)getActivity().getSystemService(Context.LAYOUT_INFLATER_SERVICE);
-        mAppOps = (AppOpsManager)getActivity().getSystemService(Context.APP_OPS_SERVICE);
-
-        retrieveAppEntry();
-
-        setHasOptionsMenu(true);
-    }
-
-    @Override
-    public View onCreateView(
-            LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
-        final View view = inflater.inflate(R.layout.app_ops_details, container, false);
-        Utils.prepareCustomPreferencesList(container, view, view, false);
-
-        mRootView = view;
-        mOperationsSection = (LinearLayout)view.findViewById(R.id.operations_section);
-        return view;
-    }
-
-    @Override
-    public int getMetricsCategory() {
-        return MetricsEvent.APP_OPS_DETAILS;
-    }
-
-    @Override
-    public void onResume() {
-        super.onResume();
-        if (!refreshUi()) {
-            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/AppOpsState.java b/src/com/android/settings/applications/AppOpsState.java
deleted file mode 100644
index 2a5c49a..0000000
--- a/src/com/android/settings/applications/AppOpsState.java
+++ /dev/null
@@ -1,638 +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.app.AppOpsManager;
-import android.content.Context;
-import android.content.pm.ApplicationInfo;
-import android.content.pm.PackageInfo;
-import android.content.pm.PackageManager;
-import android.content.pm.PackageManager.NameNotFoundException;
-import android.content.res.Resources;
-import android.graphics.drawable.Drawable;
-import android.os.Parcel;
-import android.os.Parcelable;
-import android.text.format.DateUtils;
-import android.util.Log;
-import android.util.SparseArray;
-
-import com.android.settings.R;
-
-import java.io.File;
-import java.text.Collator;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Comparator;
-import java.util.HashMap;
-import java.util.List;
-
-public class AppOpsState {
-    static final String TAG = "AppOpsState";
-    static final boolean DEBUG = false;
-
-    final Context mContext;
-    final AppOpsManager mAppOps;
-    final PackageManager mPm;
-    final CharSequence[] mOpSummaries;
-    final CharSequence[] mOpLabels;
-
-    List<AppOpEntry> mApps;
-
-    public AppOpsState(Context context) {
-        mContext = context;
-        mAppOps = (AppOpsManager)context.getSystemService(Context.APP_OPS_SERVICE);
-        mPm = context.getPackageManager();
-        mOpSummaries = context.getResources().getTextArray(R.array.app_ops_summaries);
-        mOpLabels = context.getResources().getTextArray(R.array.app_ops_labels);
-    }
-
-    public static class OpsTemplate implements Parcelable {
-        public final int[] ops;
-        public final boolean[] showPerms;
-
-        public OpsTemplate(int[] _ops, boolean[] _showPerms) {
-            ops = _ops;
-            showPerms = _showPerms;
-        }
-
-        OpsTemplate(Parcel src) {
-            ops = src.createIntArray();
-            showPerms = src.createBooleanArray();
-        }
-
-        @Override
-        public int describeContents() {
-            return 0;
-        }
-
-        @Override
-        public void writeToParcel(Parcel dest, int flags) {
-            dest.writeIntArray(ops);
-            dest.writeBooleanArray(showPerms);
-        }
-
-        public static final Creator<OpsTemplate> CREATOR = new Creator<OpsTemplate>() {
-            @Override public OpsTemplate createFromParcel(Parcel source) {
-                return new OpsTemplate(source);
-            }
-
-            @Override public OpsTemplate[] newArray(int size) {
-                return new OpsTemplate[size];
-            }
-        };
-    }
-
-    public static final OpsTemplate LOCATION_TEMPLATE = new OpsTemplate(
-            new int[] { AppOpsManager.OP_COARSE_LOCATION,
-                    AppOpsManager.OP_FINE_LOCATION,
-                    AppOpsManager.OP_GPS,
-                    AppOpsManager.OP_WIFI_SCAN,
-                    AppOpsManager.OP_NEIGHBORING_CELLS,
-                    AppOpsManager.OP_MONITOR_LOCATION,
-                    AppOpsManager.OP_MONITOR_HIGH_POWER_LOCATION },
-            new boolean[] { true,
-                    true,
-                    false,
-                    false,
-                    false,
-                    false,
-                    false }
-            );
-
-    public static final OpsTemplate PERSONAL_TEMPLATE = new OpsTemplate(
-            new int[] { AppOpsManager.OP_READ_CONTACTS,
-                    AppOpsManager.OP_WRITE_CONTACTS,
-                    AppOpsManager.OP_READ_CALL_LOG,
-                    AppOpsManager.OP_WRITE_CALL_LOG,
-                    AppOpsManager.OP_READ_CALENDAR,
-                    AppOpsManager.OP_WRITE_CALENDAR,
-                    AppOpsManager.OP_READ_CLIPBOARD,
-                    AppOpsManager.OP_WRITE_CLIPBOARD },
-            new boolean[] { true,
-                    true,
-                    true,
-                    true,
-                    true,
-                    true,
-                    false,
-                    false }
-            );
-
-    public static final OpsTemplate MESSAGING_TEMPLATE = new OpsTemplate(
-            new int[] { AppOpsManager.OP_READ_SMS,
-                    AppOpsManager.OP_RECEIVE_SMS,
-                    AppOpsManager.OP_RECEIVE_EMERGECY_SMS,
-                    AppOpsManager.OP_RECEIVE_MMS,
-                    AppOpsManager.OP_RECEIVE_WAP_PUSH,
-                    AppOpsManager.OP_WRITE_SMS,
-                    AppOpsManager.OP_SEND_SMS,
-                    AppOpsManager.OP_READ_ICC_SMS,
-                    AppOpsManager.OP_WRITE_ICC_SMS },
-            new boolean[] { true,
-                    true,
-                    true,
-                    true,
-                    true,
-                    true,
-                    true,
-                    true,
-                    true }
-            );
-
-    public static final OpsTemplate MEDIA_TEMPLATE = new OpsTemplate(
-            new int[] { AppOpsManager.OP_VIBRATE,
-                    AppOpsManager.OP_CAMERA,
-                    AppOpsManager.OP_RECORD_AUDIO,
-                    AppOpsManager.OP_PLAY_AUDIO,
-                    AppOpsManager.OP_TAKE_MEDIA_BUTTONS,
-                    AppOpsManager.OP_TAKE_AUDIO_FOCUS,
-                    AppOpsManager.OP_AUDIO_MASTER_VOLUME,
-                    AppOpsManager.OP_AUDIO_VOICE_VOLUME,
-                    AppOpsManager.OP_AUDIO_RING_VOLUME,
-                    AppOpsManager.OP_AUDIO_MEDIA_VOLUME,
-                    AppOpsManager.OP_AUDIO_ALARM_VOLUME,
-                    AppOpsManager.OP_AUDIO_NOTIFICATION_VOLUME,
-                    AppOpsManager.OP_AUDIO_BLUETOOTH_VOLUME,
-                    AppOpsManager.OP_AUDIO_ACCESSIBILITY_VOLUME,
-                    AppOpsManager.OP_MUTE_MICROPHONE},
-            new boolean[] { false,
-                    true,
-                    true,
-                    false,
-                    false,
-                    false,
-                    false,
-                    false,
-                    false,
-                    false,
-                    false,
-                    false,
-                    false,
-                    false }
-            );
-
-    public static final OpsTemplate DEVICE_TEMPLATE = new OpsTemplate(
-            new int[] { AppOpsManager.OP_POST_NOTIFICATION,
-                    AppOpsManager.OP_ACCESS_NOTIFICATIONS,
-                    AppOpsManager.OP_CALL_PHONE,
-                    AppOpsManager.OP_WRITE_SETTINGS,
-                    AppOpsManager.OP_SYSTEM_ALERT_WINDOW,
-                    AppOpsManager.OP_WAKE_LOCK,
-                    AppOpsManager.OP_PROJECT_MEDIA,
-                    AppOpsManager.OP_ACTIVATE_VPN,
-                    AppOpsManager.OP_ASSIST_STRUCTURE,
-                    AppOpsManager.OP_ASSIST_SCREENSHOT},
-            new boolean[] { false,
-                    true,
-                    true,
-                    true,
-                    true,
-                    true,
-                    false,
-                    false,
-                    false,
-                    false }
-            );
-
-    public static final OpsTemplate RUN_IN_BACKGROUND_TEMPLATE = new OpsTemplate(
-            new int[] { AppOpsManager.OP_RUN_IN_BACKGROUND },
-            new boolean[] { false }
-            );
-
-    public static final OpsTemplate[] ALL_TEMPLATES = new OpsTemplate[] {
-            LOCATION_TEMPLATE, PERSONAL_TEMPLATE, MESSAGING_TEMPLATE,
-            MEDIA_TEMPLATE, DEVICE_TEMPLATE, RUN_IN_BACKGROUND_TEMPLATE
-    };
-
-    /**
-     * This class holds the per-item data in our Loader.
-     */
-    public static class AppEntry {
-        private final AppOpsState mState;
-        private final ApplicationInfo mInfo;
-        private final File mApkFile;
-        private final SparseArray<AppOpsManager.OpEntry> mOps
-                = new SparseArray<AppOpsManager.OpEntry>();
-        private final SparseArray<AppOpEntry> mOpSwitches
-                = new SparseArray<AppOpEntry>();
-        private String mLabel;
-        private Drawable mIcon;
-        private boolean mMounted;
-
-        public AppEntry(AppOpsState state, ApplicationInfo info) {
-            mState = state;
-            mInfo = info;
-            mApkFile = new File(info.sourceDir);
-        }
-
-        public void addOp(AppOpEntry entry, AppOpsManager.OpEntry op) {
-            mOps.put(op.getOp(), op);
-            mOpSwitches.put(AppOpsManager.opToSwitch(op.getOp()), entry);
-        }
-
-        public boolean hasOp(int op) {
-            return mOps.indexOfKey(op) >= 0;
-        }
-
-        public AppOpEntry getOpSwitch(int op) {
-            return mOpSwitches.get(AppOpsManager.opToSwitch(op));
-        }
-
-        public ApplicationInfo getApplicationInfo() {
-            return mInfo;
-        }
-
-        public String getLabel() {
-            return mLabel;
-        }
-
-        public Drawable getIcon() {
-            if (mIcon == null) {
-                if (mApkFile.exists()) {
-                    mIcon = mInfo.loadIcon(mState.mPm);
-                    return mIcon;
-                } else {
-                    mMounted = false;
-                }
-            } else if (!mMounted) {
-                // If the app wasn't mounted but is now mounted, reload
-                // its icon.
-                if (mApkFile.exists()) {
-                    mMounted = true;
-                    mIcon = mInfo.loadIcon(mState.mPm);
-                    return mIcon;
-                }
-            } else {
-                return mIcon;
-            }
-
-            return mState.mContext.getDrawable(
-                    android.R.drawable.sym_def_app_icon);
-        }
-
-        @Override public String toString() {
-            return mLabel;
-        }
-
-        void loadLabel(Context context) {
-            if (mLabel == null || !mMounted) {
-                if (!mApkFile.exists()) {
-                    mMounted = false;
-                    mLabel = mInfo.packageName;
-                } else {
-                    mMounted = true;
-                    CharSequence label = mInfo.loadLabel(context.getPackageManager());
-                    mLabel = label != null ? label.toString() : mInfo.packageName;
-                }
-            }
-        }
-    }
-
-    /**
-     * This class holds the per-item data in our Loader.
-     */
-    public static class AppOpEntry {
-        private final AppOpsManager.PackageOps mPkgOps;
-        private final ArrayList<AppOpsManager.OpEntry> mOps
-                = new ArrayList<AppOpsManager.OpEntry>();
-        private final ArrayList<AppOpsManager.OpEntry> mSwitchOps
-                = new ArrayList<AppOpsManager.OpEntry>();
-        private final AppEntry mApp;
-        private final int mSwitchOrder;
-        private int mOverriddenPrimaryMode = -1;
-
-        public AppOpEntry(AppOpsManager.PackageOps pkg, AppOpsManager.OpEntry op, AppEntry app,
-                int switchOrder) {
-            mPkgOps = pkg;
-            mApp = app;
-            mSwitchOrder = switchOrder;
-            mApp.addOp(this, op);
-            mOps.add(op);
-            mSwitchOps.add(op);
-        }
-
-        private static void addOp(ArrayList<AppOpsManager.OpEntry> list, AppOpsManager.OpEntry op) {
-            for (int i=0; i<list.size(); i++) {
-                AppOpsManager.OpEntry pos = list.get(i);
-                if (pos.isRunning() != op.isRunning()) {
-                    if (op.isRunning()) {
-                        list.add(i, op);
-                        return;
-                    }
-                    continue;
-                }
-                if (pos.getTime() < op.getTime()) {
-                    list.add(i, op);
-                    return;
-                }
-            }
-            list.add(op);
-        }
-
-        public void addOp(AppOpsManager.OpEntry op) {
-            mApp.addOp(this, op);
-            addOp(mOps, op);
-            if (mApp.getOpSwitch(AppOpsManager.opToSwitch(op.getOp())) == null) {
-                addOp(mSwitchOps, op);
-            }
-        }
-
-        public AppEntry getAppEntry() {
-            return mApp;
-        }
-
-        public int getSwitchOrder() {
-            return mSwitchOrder;
-        }
-
-        public AppOpsManager.PackageOps getPackageOps() {
-            return mPkgOps;
-        }
-
-        public int getNumOpEntry() {
-            return mOps.size();
-        }
-
-        public AppOpsManager.OpEntry getOpEntry(int pos) {
-            return mOps.get(pos);
-        }
-
-        public int getPrimaryOpMode() {
-            return mOverriddenPrimaryMode >= 0 ? mOverriddenPrimaryMode : mOps.get(0).getMode();
-        }
-
-        public void overridePrimaryOpMode(int mode) {
-            mOverriddenPrimaryMode = mode;
-        }
-
-        private CharSequence getCombinedText(ArrayList<AppOpsManager.OpEntry> ops,
-                CharSequence[] items) {
-            if (ops.size() == 1) {
-                return items[ops.get(0).getOp()];
-            } else {
-                StringBuilder builder = new StringBuilder();
-                for (int i=0; i<ops.size(); i++) {
-                    if (i > 0) {
-                        builder.append(", ");
-                    }
-                    builder.append(items[ops.get(i).getOp()]);
-                }
-                return builder.toString();
-            }
-        }
-
-        public CharSequence getSummaryText(AppOpsState state) {
-            return getCombinedText(mOps, state.mOpSummaries);
-        }
-
-        public CharSequence getSwitchText(AppOpsState state) {
-            if (mSwitchOps.size() > 0) {
-                return getCombinedText(mSwitchOps, state.mOpLabels);
-            } else {
-                return getCombinedText(mOps, state.mOpLabels);
-            }
-        }
-
-        public CharSequence getTimeText(Resources res, boolean showEmptyText) {
-            if (isRunning()) {
-                return res.getText(R.string.app_ops_running);
-            }
-            if (getTime() > 0) {
-                return DateUtils.getRelativeTimeSpanString(getTime(),
-                        System.currentTimeMillis(),
-                        DateUtils.MINUTE_IN_MILLIS,
-                        DateUtils.FORMAT_ABBREV_RELATIVE);
-            }
-            return showEmptyText ? res.getText(R.string.app_ops_never_used) : "";
-        }
-
-        public boolean isRunning() {
-            return mOps.get(0).isRunning();
-        }
-
-        public long getTime() {
-            return mOps.get(0).getTime();
-        }
-
-        @Override public String toString() {
-            return mApp.getLabel();
-        }
-    }
-
-    /**
-     * Perform app op state comparison of application entry objects.
-     */
-    public static final Comparator<AppOpEntry> RECENCY_COMPARATOR = new Comparator<AppOpEntry>() {
-        private final Collator sCollator = Collator.getInstance();
-        @Override
-        public int compare(AppOpEntry object1, AppOpEntry object2) {
-            if (object1.getSwitchOrder() != object2.getSwitchOrder()) {
-                return object1.getSwitchOrder() < object2.getSwitchOrder() ? -1 : 1;
-            }
-            if (object1.isRunning() != object2.isRunning()) {
-                // Currently running ops go first.
-                return object1.isRunning() ? -1 : 1;
-            }
-            if (object1.getTime() != object2.getTime()) {
-                // More recent times go first.
-                return object1.getTime() > object2.getTime() ? -1 : 1;
-            }
-            return sCollator.compare(object1.getAppEntry().getLabel(),
-                    object2.getAppEntry().getLabel());
-        }
-    };
-
-    /**
-     * Perform alphabetical comparison of application entry objects.
-     */
-    public static final Comparator<AppOpEntry> LABEL_COMPARATOR = new Comparator<AppOpEntry>() {
-        private final Collator sCollator = Collator.getInstance();
-        @Override
-        public int compare(AppOpEntry object1, AppOpEntry object2) {
-            return sCollator.compare(object1.getAppEntry().getLabel(),
-                    object2.getAppEntry().getLabel());
-        }
-    };
-
-    private void addOp(List<AppOpEntry> entries, AppOpsManager.PackageOps pkgOps,
-            AppEntry appEntry, AppOpsManager.OpEntry opEntry, boolean allowMerge, int switchOrder) {
-        if (allowMerge && entries.size() > 0) {
-            AppOpEntry last = entries.get(entries.size()-1);
-            if (last.getAppEntry() == appEntry) {
-                boolean lastExe = last.getTime() != 0;
-                boolean entryExe = opEntry.getTime() != 0;
-                if (lastExe == entryExe) {
-                    if (DEBUG) Log.d(TAG, "Add op " + opEntry.getOp() + " to package "
-                            + pkgOps.getPackageName() + ": append to " + last);
-                    last.addOp(opEntry);
-                    return;
-                }
-            }
-        }
-        AppOpEntry entry = appEntry.getOpSwitch(opEntry.getOp());
-        if (entry != null) {
-            entry.addOp(opEntry);
-            return;
-        }
-        entry = new AppOpEntry(pkgOps, opEntry, appEntry, switchOrder);
-        if (DEBUG) Log.d(TAG, "Add op " + opEntry.getOp() + " to package "
-                + pkgOps.getPackageName() + ": making new " + entry);
-        entries.add(entry);
-    }
-
-    public AppOpsManager getAppOpsManager() {
-        return mAppOps;
-    }
-
-    public List<AppOpEntry> buildState(OpsTemplate tpl) {
-        return buildState(tpl, 0, null, RECENCY_COMPARATOR);
-    }
-
-    private AppEntry getAppEntry(final Context context, final HashMap<String, AppEntry> appEntries,
-            final String packageName, ApplicationInfo appInfo) {
-        AppEntry appEntry = appEntries.get(packageName);
-        if (appEntry == null) {
-            if (appInfo == null) {
-                try {
-                    appInfo = mPm.getApplicationInfo(packageName,
-                            PackageManager.MATCH_DISABLED_COMPONENTS
-                            | PackageManager.MATCH_ANY_USER);
-                } catch (PackageManager.NameNotFoundException e) {
-                    Log.w(TAG, "Unable to find info for package " + packageName);
-                    return null;
-                }
-            }
-            appEntry = new AppEntry(this, appInfo);
-            appEntry.loadLabel(context);
-            appEntries.put(packageName, appEntry);
-        }
-        return appEntry;
-    }
-
-    public List<AppOpEntry> buildState(OpsTemplate tpl, int uid, String packageName) {
-        return buildState(tpl, uid, packageName, RECENCY_COMPARATOR);
-    }
-
-    public List<AppOpEntry> buildState(OpsTemplate tpl, int uid, String packageName,
-            Comparator<AppOpEntry> comparator) {
-        final Context context = mContext;
-
-        final HashMap<String, AppEntry> appEntries = new HashMap<String, AppEntry>();
-        final List<AppOpEntry> entries = new ArrayList<AppOpEntry>();
-
-        final ArrayList<String> perms = new ArrayList<String>();
-        final ArrayList<Integer> permOps = new ArrayList<Integer>();
-        final int[] opToOrder = new int[AppOpsManager._NUM_OP];
-        for (int i=0; i<tpl.ops.length; i++) {
-            if (tpl.showPerms[i]) {
-                String perm = AppOpsManager.opToPermission(tpl.ops[i]);
-                if (perm != null && !perms.contains(perm)) {
-                    perms.add(perm);
-                    permOps.add(tpl.ops[i]);
-                    opToOrder[tpl.ops[i]] = i;
-                }
-            }
-        }
-
-        List<AppOpsManager.PackageOps> pkgs;
-        if (packageName != null) {
-            pkgs = mAppOps.getOpsForPackage(uid, packageName, tpl.ops);
-        } else {
-            pkgs = mAppOps.getPackagesForOps(tpl.ops);
-        }
-
-        if (pkgs != null) {
-            for (int i=0; i<pkgs.size(); i++) {
-                AppOpsManager.PackageOps pkgOps = pkgs.get(i);
-                AppEntry appEntry = getAppEntry(context, appEntries, pkgOps.getPackageName(), null);
-                if (appEntry == null) {
-                    continue;
-                }
-                for (int j=0; j<pkgOps.getOps().size(); j++) {
-                    AppOpsManager.OpEntry opEntry = pkgOps.getOps().get(j);
-                    addOp(entries, pkgOps, appEntry, opEntry, packageName == null,
-                            packageName == null ? 0 : opToOrder[opEntry.getOp()]);
-                }
-            }
-        }
-
-        List<PackageInfo> apps;
-        if (packageName != null) {
-            apps = new ArrayList<PackageInfo>();
-            try {
-                PackageInfo pi = mPm.getPackageInfo(packageName, PackageManager.GET_PERMISSIONS);
-                apps.add(pi);
-            } catch (NameNotFoundException e) {
-            }
-        } else {
-            String[] permsArray = new String[perms.size()];
-            perms.toArray(permsArray);
-            apps = mPm.getPackagesHoldingPermissions(permsArray, 0);
-        }
-        for (int i=0; i<apps.size(); i++) {
-            PackageInfo appInfo = apps.get(i);
-            AppEntry appEntry = getAppEntry(context, appEntries, appInfo.packageName,
-                    appInfo.applicationInfo);
-            if (appEntry == null) {
-                continue;
-            }
-            List<AppOpsManager.OpEntry> dummyOps = null;
-            AppOpsManager.PackageOps pkgOps = null;
-            if (appInfo.requestedPermissions != null) {
-                for (int j=0; j<appInfo.requestedPermissions.length; j++) {
-                    if (appInfo.requestedPermissionsFlags != null) {
-                        if ((appInfo.requestedPermissionsFlags[j]
-                                & PackageInfo.REQUESTED_PERMISSION_GRANTED) == 0) {
-                            if (DEBUG) Log.d(TAG, "Pkg " + appInfo.packageName + " perm "
-                                    + appInfo.requestedPermissions[j] + " not granted; skipping");
-                            continue;
-                        }
-                    }
-                    if (DEBUG) Log.d(TAG, "Pkg " + appInfo.packageName + ": requested perm "
-                            + appInfo.requestedPermissions[j]);
-                    for (int k=0; k<perms.size(); k++) {
-                        if (!perms.get(k).equals(appInfo.requestedPermissions[j])) {
-                            continue;
-                        }
-                        if (DEBUG) Log.d(TAG, "Pkg " + appInfo.packageName + " perm " + perms.get(k)
-                                + " has op " + permOps.get(k) + ": " + appEntry.hasOp(permOps.get(k)));
-                        if (appEntry.hasOp(permOps.get(k))) {
-                            continue;
-                        }
-                        if (dummyOps == null) {
-                            dummyOps = new ArrayList<AppOpsManager.OpEntry>();
-                            pkgOps = new AppOpsManager.PackageOps(
-                                    appInfo.packageName, appInfo.applicationInfo.uid, dummyOps);
-
-                        }
-                        AppOpsManager.OpEntry opEntry = new AppOpsManager.OpEntry(
-                                permOps.get(k), AppOpsManager.MODE_ALLOWED, 0, 0, 0, -1, null);
-                        dummyOps.add(opEntry);
-                        addOp(entries, pkgOps, appEntry, opEntry, packageName == null,
-                                packageName == null ? 0 : opToOrder[opEntry.getOp()]);
-                    }
-                }
-            }
-        }
-
-        // Sort the list.
-        Collections.sort(entries, comparator);
-
-        // Done!
-        return entries;
-    }
-}
diff --git a/src/com/android/settings/applications/AppOpsSummary.java b/src/com/android/settings/applications/AppOpsSummary.java
deleted file mode 100644
index ba2a3c9..0000000
--- a/src/com/android/settings/applications/AppOpsSummary.java
+++ /dev/null
@@ -1,132 +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.app.Fragment;
-import android.app.FragmentManager;
-import android.content.res.TypedArray;
-import android.os.Bundle;
-import android.preference.PreferenceFrameLayout;
-import android.support.v13.app.FragmentPagerAdapter;
-import android.support.v4.view.PagerTabStrip;
-import android.support.v4.view.ViewPager;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-
-import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
-import com.android.settings.core.InstrumentedPreferenceFragment;
-import com.android.settings.R;
-
-public class AppOpsSummary extends InstrumentedPreferenceFragment {
-    // layout inflater object used to inflate views
-    private LayoutInflater mInflater;
-    
-    private ViewGroup mContentContainer;
-    private View mRootView;
-    private ViewPager mViewPager;
-
-    CharSequence[] mPageNames;
-    static AppOpsState.OpsTemplate[] sPageTemplates = new AppOpsState.OpsTemplate[] {
-        AppOpsState.LOCATION_TEMPLATE,
-        AppOpsState.PERSONAL_TEMPLATE,
-        AppOpsState.MESSAGING_TEMPLATE,
-        AppOpsState.MEDIA_TEMPLATE,
-        AppOpsState.DEVICE_TEMPLATE
-    };
-
-    int mCurPos;
-
-    @Override
-    public int getMetricsCategory() {
-        return MetricsEvent.APP_OPS_SUMMARY;
-    }
-
-    class MyPagerAdapter extends FragmentPagerAdapter implements ViewPager.OnPageChangeListener {
-
-        public MyPagerAdapter(FragmentManager fm) {
-            super(fm);
-        }
-
-        @Override
-        public Fragment getItem(int position) {
-            return new AppOpsCategory(sPageTemplates[position]);
-        }
-
-        @Override
-        public int getCount() {
-            return sPageTemplates.length;
-        }
-
-        @Override
-        public CharSequence getPageTitle(int position) {
-            return mPageNames[position];
-        }
-
-        @Override
-        public void onPageScrolled(int position, float positionOffset, int positionOffsetPixels) {
-        }
-
-        @Override
-        public void onPageSelected(int position) {
-            mCurPos = position;
-        }
-
-        @Override
-        public void onPageScrollStateChanged(int state) {
-            if (state == ViewPager.SCROLL_STATE_IDLE) {
-                //updateCurrentTab(mCurPos);
-            }
-        }
-    }
-
-    @Override
-    public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
-        // initialize the inflater
-        mInflater = inflater;
-
-        View rootView = mInflater.inflate(R.layout.app_ops_summary,
-                container, false);
-        mContentContainer = container;
-        mRootView = rootView;
-
-        mPageNames = getResources().getTextArray(R.array.app_ops_categories);
-
-        mViewPager = (ViewPager) rootView.findViewById(R.id.pager);
-        MyPagerAdapter adapter = new MyPagerAdapter(getChildFragmentManager());
-        mViewPager.setAdapter(adapter);
-        mViewPager.setOnPageChangeListener(adapter);
-        PagerTabStrip tabs = (PagerTabStrip) rootView.findViewById(R.id.tabs);
-
-        // This should be set in the XML layout, but PagerTabStrip lives in
-        // support-v4 and doesn't have styleable attributes.
-        final TypedArray ta = tabs.getContext().obtainStyledAttributes(
-                new int[] { android.R.attr.colorAccent });
-        final int colorAccent = ta.getColor(0, 0);
-        ta.recycle();
-
-        tabs.setTabIndicatorColorResource(colorAccent);
-
-        // We have to do this now because PreferenceFrameLayout looks at it
-        // only when the view is added.
-        if (container instanceof PreferenceFrameLayout) {
-            ((PreferenceFrameLayout.LayoutParams) rootView.getLayoutParams()).removeBorders = true;
-        }
-
-        return rootView;
-    }
-}
diff --git a/src/com/android/settings/applications/AppPermissionsPreferenceController.java b/src/com/android/settings/applications/AppPermissionsPreferenceController.java
index f6a2271..c8ff381 100644
--- a/src/com/android/settings/applications/AppPermissionsPreferenceController.java
+++ b/src/com/android/settings/applications/AppPermissionsPreferenceController.java
@@ -111,7 +111,7 @@
     }
 
     private CharSequence concatSummaryText(CharSequence currentSummary, String permission) {
-        final CharSequence label = getPermissionGroupLabel(permission);
+        final String label = getPermissionGroupLabel(permission).toString().toLowerCase();
         if (TextUtils.isEmpty(currentSummary)) {
             return label;
         }
diff --git a/src/com/android/settings/applications/AppStateAppOpsBridge.java b/src/com/android/settings/applications/AppStateAppOpsBridge.java
index 896102c..6ec32a3 100755
--- a/src/com/android/settings/applications/AppStateAppOpsBridge.java
+++ b/src/com/android/settings/applications/AppStateAppOpsBridge.java
@@ -31,6 +31,7 @@
 
 import com.android.settingslib.applications.ApplicationsState;
 import com.android.settingslib.applications.ApplicationsState.AppEntry;
+import com.android.settings.wrapper.IPackageManagerWrapper;
 
 import java.util.Arrays;
 import java.util.Collection;
@@ -57,7 +58,7 @@
     public AppStateAppOpsBridge(Context context, ApplicationsState appState, Callback callback,
             int appOpsOpCode, String[] permissions) {
         this(context, appState, callback, appOpsOpCode, permissions,
-            new IPackageManagerWrapperImpl(AppGlobals.getPackageManager()));
+            new IPackageManagerWrapper(AppGlobals.getPackageManager()));
     }
 
     @VisibleForTesting(otherwise = VisibleForTesting.NONE)
diff --git a/src/com/android/settings/applications/AppStateBaseBridge.java b/src/com/android/settings/applications/AppStateBaseBridge.java
index d0b8431..2329b44 100644
--- a/src/com/android/settings/applications/AppStateBaseBridge.java
+++ b/src/com/android/settings/applications/AppStateBaseBridge.java
@@ -50,15 +50,15 @@
 
     public void resume() {
         mHandler.sendEmptyMessage(BackgroundHandler.MSG_LOAD_ALL);
-        mAppSession.resume();
+        mAppSession.onResume();
     }
 
     public void pause() {
-        mAppSession.pause();
+        mAppSession.onPause();
     }
 
     public void release() {
-        mAppSession.release();
+        mAppSession.onDestroy();
     }
 
     public void forceUpdate(String pkg, int uid) {
diff --git a/src/com/android/settings/applications/AppStateInstallAppsBridge.java b/src/com/android/settings/applications/AppStateInstallAppsBridge.java
index cc7fb62..0c3582e 100644
--- a/src/com/android/settings/applications/AppStateInstallAppsBridge.java
+++ b/src/com/android/settings/applications/AppStateInstallAppsBridge.java
@@ -135,7 +135,7 @@
         }
     }
 
-    static final AppFilter FILTER_APP_SOURCES = new AppFilter() {
+    public static final AppFilter FILTER_APP_SOURCES = new AppFilter() {
 
         @Override
         public void init() {
diff --git a/src/com/android/settings/applications/AppStorageSettings.java b/src/com/android/settings/applications/AppStorageSettings.java
index e21ab7e..78a5050 100644
--- a/src/com/android/settings/applications/AppStorageSettings.java
+++ b/src/com/android/settings/applications/AppStorageSettings.java
@@ -16,6 +16,9 @@
 
 package com.android.settings.applications;
 
+import static android.content.pm.ApplicationInfo.FLAG_ALLOW_CLEAR_USER_DATA;
+import static android.content.pm.ApplicationInfo.FLAG_SYSTEM;
+
 import android.app.ActivityManager;
 import android.app.AlertDialog;
 import android.app.AppGlobals;
@@ -36,6 +39,7 @@
 import android.os.UserHandle;
 import android.os.storage.StorageManager;
 import android.os.storage.VolumeInfo;
+import android.support.annotation.VisibleForTesting;
 import android.support.v7.preference.Preference;
 import android.support.v7.preference.PreferenceCategory;
 import android.util.Log;
@@ -48,6 +52,7 @@
 import com.android.settings.R;
 import com.android.settings.Utils;
 import com.android.settings.deviceinfo.StorageWizardMoveConfirm;
+import com.android.settings.widget.ActionButtonPreference;
 import com.android.settingslib.RestrictedLockUtils;
 import com.android.settingslib.applications.ApplicationsState.Callbacks;
 import com.android.settingslib.applications.StorageStatsSource;
@@ -59,9 +64,6 @@
 import java.util.Objects;
 import java.util.TreeMap;
 
-import static android.content.pm.ApplicationInfo.FLAG_ALLOW_CLEAR_USER_DATA;
-import static android.content.pm.ApplicationInfo.FLAG_SYSTEM;
-
 public class AppStorageSettings extends AppInfoWithHeader
         implements OnClickListener, Callbacks, DialogInterface.OnClickListener,
         LoaderManager.LoaderCallbacks<AppStorageStats> {
@@ -102,9 +104,8 @@
     private static final String KEY_DATA_CLEARED = "data_cleared";
 
     // Views related to cache info
-    private Preference mCacheSize;
-    private Button mClearDataButton;
-    private Button mClearCacheButton;
+    @VisibleForTesting
+    ActionButtonPreference mButtonsPref;
 
     private Preference mStorageUsed;
     private Button mChangeStorageButton;
@@ -118,7 +119,8 @@
     private boolean mCacheCleared;
     private boolean mDataCleared;
 
-    private AppStorageSizesController mSizeController;
+    @VisibleForTesting
+    AppStorageSizesController mSizeController;
 
     private ClearCacheObserver mClearCacheObserver;
     private ClearUserDataObserver mClearDataObserver;
@@ -164,9 +166,9 @@
                 .setComputingString(R.string.computing_size)
                 .setErrorString(R.string.invalid_size_value)
                 .build();
-
-        mClearDataButton = (Button) ((LayoutPreference) findPreference(KEY_HEADER_BUTTONS))
-                .findViewById(R.id.left_button);
+        mButtonsPref = ((ActionButtonPreference) findPreference(KEY_HEADER_BUTTONS))
+                .setButton1Positive(false)
+                .setButton2Positive(false);
 
         mStorageUsed = findPreference(KEY_STORAGE_USED);
         mChangeStorageButton = (Button) ((LayoutPreference) findPreference(KEY_CHANGE_STORAGE))
@@ -175,10 +177,7 @@
         mChangeStorageButton.setOnClickListener(this);
 
         // Cache section
-        mCacheSize = findPreference(KEY_CACHE_SIZE);
-        mClearCacheButton = (Button) ((LayoutPreference) findPreference(KEY_HEADER_BUTTONS))
-                .findViewById(R.id.right_button);
-        mClearCacheButton.setText(R.string.clear_cache_btn_text);
+        mButtonsPref.setButton2Text(R.string.clear_cache_btn_text);
 
         // URI permissions section
         mUri = (PreferenceCategory) findPreference(KEY_URI_CATEGORY);
@@ -188,34 +187,40 @@
         mClearUriButton.setOnClickListener(this);
     }
 
+    @VisibleForTesting
+    void handleClearCacheClick() {
+        if (mAppsControlDisallowedAdmin != null && !mAppsControlDisallowedBySystem) {
+            RestrictedLockUtils.sendShowAdminSupportDetailsIntent(
+                    getActivity(), mAppsControlDisallowedAdmin);
+            return;
+        } else if (mClearCacheObserver == null) { // Lazy initialization of observer
+            mClearCacheObserver = new ClearCacheObserver();
+        }
+        mMetricsFeatureProvider.action(getContext(),
+                MetricsEvent.ACTION_SETTINGS_CLEAR_APP_CACHE);
+        mPm.deleteApplicationCacheFiles(mPackageName, mClearCacheObserver);
+    }
+
+    @VisibleForTesting
+    void handleClearDataClick() {
+        if (mAppsControlDisallowedAdmin != null && !mAppsControlDisallowedBySystem) {
+            RestrictedLockUtils.sendShowAdminSupportDetailsIntent(
+                    getActivity(), mAppsControlDisallowedAdmin);
+        } else if (mAppEntry.info.manageSpaceActivityName != null) {
+            if (!Utils.isMonkeyRunning()) {
+                Intent intent = new Intent(Intent.ACTION_DEFAULT);
+                intent.setClassName(mAppEntry.info.packageName,
+                        mAppEntry.info.manageSpaceActivityName);
+                startActivityForResult(intent, REQUEST_MANAGE_SPACE);
+            }
+        } else {
+            showDialogInner(DLG_CLEAR_DATA, 0);
+        }
+    }
+
     @Override
     public void onClick(View v) {
-        if (v == mClearCacheButton) {
-            if (mAppsControlDisallowedAdmin != null && !mAppsControlDisallowedBySystem) {
-                RestrictedLockUtils.sendShowAdminSupportDetailsIntent(
-                        getActivity(), mAppsControlDisallowedAdmin);
-                return;
-            } else if (mClearCacheObserver == null) { // Lazy initialization of observer
-                mClearCacheObserver = new ClearCacheObserver();
-            }
-            mMetricsFeatureProvider.action(getContext(),
-                    MetricsEvent.ACTION_SETTINGS_CLEAR_APP_CACHE);
-            mPm.deleteApplicationCacheFiles(mPackageName, mClearCacheObserver);
-        } else if (v == mClearDataButton) {
-            if (mAppsControlDisallowedAdmin != null && !mAppsControlDisallowedBySystem) {
-                RestrictedLockUtils.sendShowAdminSupportDetailsIntent(
-                        getActivity(), mAppsControlDisallowedAdmin);
-            } else if (mAppEntry.info.manageSpaceActivityName != null) {
-                if (!Utils.isMonkeyRunning()) {
-                    Intent intent = new Intent(Intent.ACTION_DEFAULT);
-                    intent.setClassName(mAppEntry.info.packageName,
-                            mAppEntry.info.manageSpaceActivityName);
-                    startActivityForResult(intent, REQUEST_MANAGE_SPACE);
-                }
-            } else {
-                showDialogInner(DLG_CLEAR_DATA, 0);
-            }
-        } else if (v == mChangeStorageButton && mDialogBuilder != null && !isMoveInProgress()) {
+        if (v == mChangeStorageButton && mDialogBuilder != null && !isMoveInProgress()) {
             mDialogBuilder.show();
         } else if (v == mClearUriButton) {
             if (mAppsControlDisallowedAdmin != null && !mAppsControlDisallowedBySystem) {
@@ -296,20 +301,23 @@
 
         if ((!appHasSpaceManagementUI && appRestrictsClearingData)
                 || !isManageSpaceActivityAvailable) {
-            mClearDataButton.setText(R.string.clear_user_data_text);
-            mClearDataButton.setEnabled(false);
+            mButtonsPref
+                    .setButton1Text(R.string.clear_user_data_text)
+                    .setButton1Enabled(false);
             mCanClearData = false;
         } else {
             if (appHasSpaceManagementUI) {
-                mClearDataButton.setText(R.string.manage_space_text);
+                mButtonsPref.setButton1Text(R.string.manage_space_text);
             } else {
-                mClearDataButton.setText(R.string.clear_user_data_text);
+                mButtonsPref.setButton1Text(R.string.clear_user_data_text);
             }
-            mClearDataButton.setOnClickListener(this);
+            mButtonsPref
+                    .setButton1Text(R.string.clear_user_data_text)
+                    .setButton1OnClickListener(v -> handleClearDataClick());
         }
 
         if (mAppsControlDisallowedBySystem) {
-            mClearDataButton.setEnabled(false);
+            mButtonsPref.setButton1Enabled(false);
         }
     }
 
@@ -349,7 +357,7 @@
      */
     private void initiateClearUserData() {
         mMetricsFeatureProvider.action(getContext(), MetricsEvent.ACTION_SETTINGS_CLEAR_APP_DATA);
-        mClearDataButton.setEnabled(false);
+        mButtonsPref.setButton1Enabled(false);
         // Invoke uninstall or clear user data based on sysPackage
         String packageName = mAppEntry.info.packageName;
         Log.i(TAG, "Clearing user data for package : " + packageName);
@@ -361,10 +369,10 @@
         boolean res = am.clearApplicationUserData(packageName, mClearDataObserver);
         if (!res) {
             // Clearing data failed for some obscure reason. Just log error for now
-            Log.i(TAG, "Couldnt clear application user data for package:"+packageName);
+            Log.i(TAG, "Couldnt clear application user data for package:" + packageName);
             showDialogInner(DLG_CANNOT_CLEAR_DATA, 0);
         } else {
-            mClearDataButton.setText(R.string.recompute_size);
+            mButtonsPref.setButton1Text(R.string.recompute_size);
         }
     }
 
@@ -375,12 +383,12 @@
     private void processClearMsg(Message msg) {
         int result = msg.arg1;
         String packageName = mAppEntry.info.packageName;
-        mClearDataButton.setText(R.string.clear_user_data_text);
+        mButtonsPref.setButton1Text(R.string.clear_user_data_text);
         if (result == OP_SUCCESSFUL) {
-            Log.i(TAG, "Cleared user data for package : "+packageName);
+            Log.i(TAG, "Cleared user data for package : " + packageName);
             updateSize();
         } else {
-            mClearDataButton.setEnabled(true);
+            mButtonsPref.setButton1Enabled(true);
         }
     }
 
@@ -482,7 +490,7 @@
                         .setMessage(getActivity().getText(R.string.clear_failed_dlg_text))
                         .setNeutralButton(R.string.dlg_ok, new DialogInterface.OnClickListener() {
                             public void onClick(DialogInterface dialog, int which) {
-                                mClearDataButton.setEnabled(false);
+                                mButtonsPref.setButton1Enabled(false);
                                 //force to recompute changed value
                                 setIntentAndFinish(false, false);
                             }
@@ -528,7 +536,8 @@
         getLoaderManager().restartLoader(1, Bundle.EMPTY, this);
     }
 
-    private void updateUiWithSize(AppStorageStats result) {
+    @VisibleForTesting
+    void updateUiWithSize(AppStorageStats result) {
         if (mCacheCleared) {
             mSizeController.setCacheCleared(true);
         }
@@ -539,29 +548,26 @@
         mSizeController.updateUi(getContext());
 
         if (result == null) {
-            mClearDataButton.setEnabled(false);
-            mClearCacheButton.setEnabled(false);
+            mButtonsPref.setButton1Enabled(false).setButton2Enabled(false);
         } else {
-            long codeSize = result.getCodeBytes();
             long cacheSize = result.getCacheBytes();
             long dataSize = result.getDataBytes() - cacheSize;
 
             if (dataSize <= 0 || !mCanClearData || mDataCleared) {
-                mClearDataButton.setEnabled(false);
+                mButtonsPref.setButton1Enabled(false);
             } else {
-                mClearDataButton.setEnabled(true);
-                mClearDataButton.setOnClickListener(this);
+                mButtonsPref.setButton1Enabled(true)
+                        .setButton1OnClickListener(v -> handleClearDataClick());
             }
             if (cacheSize <= 0 || mCacheCleared) {
-                mClearCacheButton.setEnabled(false);
+                mButtonsPref.setButton2Enabled(false);
             } else {
-                mClearCacheButton.setEnabled(true);
-                mClearCacheButton.setOnClickListener(this);
+                mButtonsPref.setButton2Enabled(true)
+                        .setButton2OnClickListener(v -> handleClearCacheClick());
             }
         }
         if (mAppsControlDisallowedBySystem) {
-            mClearCacheButton.setEnabled(false);
-            mClearDataButton.setEnabled(false);
+            mButtonsPref.setButton1Enabled(false).setButton2Enabled(false);
         }
     }
 
@@ -599,10 +605,10 @@
     }
 
     class ClearUserDataObserver extends IPackageDataObserver.Stub {
-       public void onRemoveCompleted(final String packageName, final boolean succeeded) {
-           final Message msg = mHandler.obtainMessage(MSG_CLEAR_USER_DATA);
-           msg.arg1 = succeeded ? OP_SUCCESSFUL : OP_FAILED;
-           mHandler.sendMessage(msg);
+        public void onRemoveCompleted(final String packageName, final boolean succeeded) {
+            final Message msg = mHandler.obtainMessage(MSG_CLEAR_USER_DATA);
+            msg.arg1 = succeeded ? OP_SUCCESSFUL : OP_FAILED;
+            mHandler.sendMessage(msg);
         }
     }
 }
diff --git a/src/com/android/settings/applications/AppViewHolder.java b/src/com/android/settings/applications/AppViewHolder.java
deleted file mode 100644
index cdb8048..0000000
--- a/src/com/android/settings/applications/AppViewHolder.java
+++ /dev/null
@@ -1,80 +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.applications;
-
-import android.util.Log;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.ImageView;
-import android.widget.TextView;
-
-import com.android.settings.R;
-import com.android.settingslib.applications.ApplicationsState;
-
-// View Holder used when displaying views
-public class AppViewHolder {
-    public ApplicationsState.AppEntry entry;
-    public View rootView;
-    public TextView appName;
-    public ImageView appIcon;
-    public TextView summary;
-    public TextView disabled;
-
-    static public AppViewHolder createOrRecycle(LayoutInflater inflater, View convertView) {
-        if (convertView == null) {
-            convertView = inflater.inflate(R.layout.preference_app, null);
-            inflater.inflate(R.layout.widget_text_views,
-                    (ViewGroup) convertView.findViewById(android.R.id.widget_frame));
-
-            // Creates a ViewHolder and store references to the two children views
-            // we want to bind data to.
-            AppViewHolder holder = new AppViewHolder();
-            holder.rootView = convertView;
-            holder.appName = (TextView) convertView.findViewById(android.R.id.title);
-            holder.appIcon = (ImageView) convertView.findViewById(android.R.id.icon);
-            holder.summary = (TextView) convertView.findViewById(R.id.widget_text1);
-            holder.disabled = (TextView) convertView.findViewById(R.id.widget_text2);
-            convertView.setTag(holder);
-            return holder;
-        } else {
-            // Get the ViewHolder back to get fast access to the TextView
-            // and the ImageView.
-            return (AppViewHolder)convertView.getTag();
-        }
-    }
-
-    void updateSizeText(CharSequence invalidSizeStr, int whichSize) {
-        if (ManageApplications.DEBUG) Log.i(ManageApplications.TAG, "updateSizeText of "
-                + entry.label + " " + entry + ": " + entry.sizeStr);
-        if (entry.sizeStr != null) {
-            switch (whichSize) {
-                case ManageApplications.SIZE_INTERNAL:
-                    summary.setText(entry.internalSizeStr);
-                    break;
-                case ManageApplications.SIZE_EXTERNAL:
-                    summary.setText(entry.externalSizeStr);
-                    break;
-                default:
-                    summary.setText(entry.sizeStr);
-                    break;
-            }
-        } else if (entry.size == ApplicationsState.SIZE_INVALID) {
-            summary.setText(invalidSizeStr);
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/com/android/settings/applications/AppWithAdminGrantedPermissionsCounter.java b/src/com/android/settings/applications/AppWithAdminGrantedPermissionsCounter.java
index c7d0a62..a1bf14e 100644
--- a/src/com/android/settings/applications/AppWithAdminGrantedPermissionsCounter.java
+++ b/src/com/android/settings/applications/AppWithAdminGrantedPermissionsCounter.java
@@ -22,7 +22,9 @@
 import android.os.RemoteException;
 import android.os.UserHandle;
 
-import com.android.settings.enterprise.DevicePolicyManagerWrapper;
+import com.android.settings.wrapper.DevicePolicyManagerWrapper;
+import com.android.settings.wrapper.IPackageManagerWrapper;
+import com.android.settingslib.wrapper.PackageManagerWrapper;
 
 /**
  * Counts installed apps across all users that have been granted one or more specific permissions by
diff --git a/src/com/android/settings/applications/AppWithAdminGrantedPermissionsLister.java b/src/com/android/settings/applications/AppWithAdminGrantedPermissionsLister.java
index b21f31f..dd5a807 100644
--- a/src/com/android/settings/applications/AppWithAdminGrantedPermissionsLister.java
+++ b/src/com/android/settings/applications/AppWithAdminGrantedPermissionsLister.java
@@ -18,7 +18,9 @@
 
 import android.content.pm.ApplicationInfo;
 import android.os.UserManager;
-import com.android.settings.enterprise.DevicePolicyManagerWrapper;
+import com.android.settings.wrapper.DevicePolicyManagerWrapper;
+import com.android.settings.wrapper.IPackageManagerWrapper;
+import com.android.settingslib.wrapper.PackageManagerWrapper;
 
 /**
  * Lists installed apps across all users that have been granted one or more specific permissions by
diff --git a/src/com/android/settings/applications/ApplicationFeatureProviderImpl.java b/src/com/android/settings/applications/ApplicationFeatureProviderImpl.java
index 10b61c5..5323cd5 100644
--- a/src/com/android/settings/applications/ApplicationFeatureProviderImpl.java
+++ b/src/com/android/settings/applications/ApplicationFeatureProviderImpl.java
@@ -29,7 +29,9 @@
 import android.view.View;
 
 import com.android.settings.applications.instantapps.InstantAppButtonsController;
-import com.android.settings.enterprise.DevicePolicyManagerWrapper;
+import com.android.settings.wrapper.DevicePolicyManagerWrapper;
+import com.android.settings.wrapper.IPackageManagerWrapper;
+import com.android.settingslib.wrapper.PackageManagerWrapper;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/src/com/android/settings/applications/AutofillManagerWrapper.java b/src/com/android/settings/applications/AutofillManagerWrapper.java
deleted file mode 100644
index 04091b0..0000000
--- a/src/com/android/settings/applications/AutofillManagerWrapper.java
+++ /dev/null
@@ -1,41 +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.applications;
-
-import android.view.autofill.AutofillManager;
-
-/**
- * This interface replicates a subset of the android.view.autofill.AutofillManager (AFM). The
- * interface exists so that we can use a thin wrapper around the AFM in production code and a mock
- * in tests. We cannot directly mock or shadow the AFM, because some of the methods we rely on are
- * newer than the API version supported by Robolectric.
- */
-public interface AutofillManagerWrapper {
-    /**
-     * Calls {@code AutofillManager.hasAutofillFeature()}.
-     *
-     * @see AutofillManager#hasAutofillFeature
-     */
-    public boolean hasAutofillFeature();
-
-    /**
-     * Calls {@code AutofillManager.isAutofillSupported()}.
-     *
-     * @see AutofillManager#isAutofillSupported
-     */
-    public boolean isAutofillSupported();
-}
diff --git a/src/com/android/settings/applications/AutofillManagerWrapperImpl.java b/src/com/android/settings/applications/AutofillManagerWrapperImpl.java
deleted file mode 100644
index 9dd1b33..0000000
--- a/src/com/android/settings/applications/AutofillManagerWrapperImpl.java
+++ /dev/null
@@ -1,45 +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.applications;
-
-import android.view.autofill.AutofillManager;
-
-public class AutofillManagerWrapperImpl implements AutofillManagerWrapper {
-    private final AutofillManager mAfm;
-
-    public AutofillManagerWrapperImpl(AutofillManager afm) {
-        mAfm = afm;
-    }
-
-    @Override
-    public boolean hasAutofillFeature() {
-        if (mAfm == null) {
-            return false;
-        }
-
-        return mAfm.hasAutofillFeature();
-    }
-
-    @Override
-    public boolean isAutofillSupported() {
-        if (mAfm == null) {
-            return false;
-        }
-
-        return mAfm.isAutofillSupported();
-    }
-}
diff --git a/src/com/android/settings/applications/BackgroundCheckSummary.java b/src/com/android/settings/applications/BackgroundCheckSummary.java
deleted file mode 100644
index dd5c89c..0000000
--- a/src/com/android/settings/applications/BackgroundCheckSummary.java
+++ /dev/null
@@ -1,60 +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.applications;
-
-import android.app.FragmentTransaction;
-import android.os.Bundle;
-import android.preference.PreferenceFrameLayout;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-
-import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
-import com.android.settings.core.InstrumentedPreferenceFragment;
-import com.android.settings.R;
-
-public class BackgroundCheckSummary extends InstrumentedPreferenceFragment {
-    // layout inflater object used to inflate views
-    private LayoutInflater mInflater;
-
-    @Override
-    public int getMetricsCategory() {
-        return MetricsEvent.BACKGROUND_CHECK_SUMMARY;
-    }
-
-    @Override
-    public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
-        // initialize the inflater
-        mInflater = inflater;
-
-        View rootView = mInflater.inflate(R.layout.background_check_summary,
-                container, false);
-
-        // We have to do this now because PreferenceFrameLayout looks at it
-        // only when the view is added.
-        if (container instanceof PreferenceFrameLayout) {
-            ((PreferenceFrameLayout.LayoutParams) rootView.getLayoutParams()).removeBorders = true;
-        }
-
-        FragmentTransaction ft = getChildFragmentManager().beginTransaction();
-        ft.add(R.id.appops_content, new AppOpsCategory(AppOpsState.RUN_IN_BACKGROUND_TEMPLATE,
-                        true), "appops");
-        ft.commitAllowingStateLoss();
-
-        return rootView;
-    }
-}
diff --git a/src/com/android/settings/applications/ConvertToFbe.java b/src/com/android/settings/applications/ConvertToFbe.java
index c5e6d77..5f5ebd9 100644
--- a/src/com/android/settings/applications/ConvertToFbe.java
+++ b/src/com/android/settings/applications/ConvertToFbe.java
@@ -15,6 +15,7 @@
  */
 package com.android.settings.applications;
 
+import android.annotation.Nullable;
 import android.app.Activity;
 import android.content.Intent;
 import android.content.res.Resources;
@@ -45,6 +46,12 @@
     }
 
     @Override
+    public void onCreate(@Nullable Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        getActivity().setTitle(R.string.convert_to_file_encryption);
+    }
+
+    @Override
     public View onCreateView(LayoutInflater inflater, ViewGroup container,
                 Bundle savedInstanceState) {
         View rootView = inflater.inflate(R.layout.convert_fbe, null);
diff --git a/src/com/android/settings/applications/DefaultAppSettings.java b/src/com/android/settings/applications/DefaultAppSettings.java
index 5b15e51..34b635b 100644
--- a/src/com/android/settings/applications/DefaultAppSettings.java
+++ b/src/com/android/settings/applications/DefaultAppSettings.java
@@ -26,15 +26,16 @@
 import com.android.settings.applications.defaultapps.DefaultBrowserPreferenceController;
 import com.android.settings.applications.defaultapps.DefaultEmergencyPreferenceController;
 import com.android.settings.applications.defaultapps.DefaultHomePreferenceController;
+import com.android.settings.applications.defaultapps.DefaultPaymentSettingsPreferenceController;
 import com.android.settings.applications.defaultapps.DefaultPhonePreferenceController;
 import com.android.settings.applications.defaultapps.DefaultSmsPreferenceController;
 import com.android.settings.applications.defaultapps.DefaultWorkBrowserPreferenceController;
 import com.android.settings.applications.defaultapps.DefaultWorkPhonePreferenceController;
-import com.android.settings.applications.defaultapps.DefaultPaymentSettingsPreferenceController;
 import com.android.settings.dashboard.DashboardFragment;
 import com.android.settings.dashboard.SummaryLoader;
 import com.android.settings.search.BaseSearchIndexProvider;
 import com.android.settings.search.Indexable;
+import com.android.settings.widget.PreferenceCategoryController;
 import com.android.settingslib.core.AbstractPreferenceController;
 
 import java.util.ArrayList;
@@ -45,6 +46,7 @@
 
     static final String TAG = "DefaultAppSettings";
 
+    private static final String KEY_DEFAULT_WORK_CATEGORY = "work_app_defaults";
     private static final String KEY_ASSIST_VOICE_INPUT = "assist_and_voice_input";
 
     @Override
@@ -69,12 +71,16 @@
 
     private static List<AbstractPreferenceController> buildPreferenceControllers(Context context) {
         final List<AbstractPreferenceController> controllers = new ArrayList<>();
+        final List<AbstractPreferenceController> workControllers = new ArrayList<>();
+        workControllers.add(new DefaultWorkPhonePreferenceController(context));
+        workControllers.add(new DefaultWorkBrowserPreferenceController(context));
+        controllers.addAll(workControllers);
+        controllers.add(new PreferenceCategoryController(
+                context, KEY_DEFAULT_WORK_CATEGORY, workControllers));
         controllers.add(new DefaultAssistPreferenceController(context, KEY_ASSIST_VOICE_INPUT,
                 false /* showSetting */));
         controllers.add(new DefaultBrowserPreferenceController(context));
-        controllers.add(new DefaultWorkBrowserPreferenceController(context));
         controllers.add(new DefaultPhonePreferenceController(context));
-        controllers.add(new DefaultWorkPhonePreferenceController(context));
         controllers.add(new DefaultSmsPreferenceController(context));
         controllers.add(new DefaultEmergencyPreferenceController(context));
         controllers.add(new DefaultHomePreferenceController(context));
@@ -97,10 +103,8 @@
                     List<String> keys = super.getNonIndexableKeys(context);
                     keys.add(KEY_ASSIST_VOICE_INPUT);
                     // TODO (b/38230148) Remove these keys when we can differentiate work results
-                    keys.add((new DefaultWorkPhonePreferenceController(context))
-                            .getPreferenceKey());
-                    keys.add((new DefaultWorkBrowserPreferenceController(context))
-                            .getPreferenceKey());
+                    keys.add(DefaultWorkPhonePreferenceController.KEY);
+                    keys.add(DefaultWorkBrowserPreferenceController.KEY);
                     return keys;
                 }
 
@@ -133,10 +137,10 @@
                 return;
             }
             CharSequence summary = concatSummaryText(
-                    mDefaultSmsPreferenceController.getDefaultAppLabel(),
-                    mDefaultBrowserPreferenceController.getDefaultAppLabel());
-            summary = concatSummaryText(summary,
+                    mDefaultBrowserPreferenceController.getDefaultAppLabel(),
                     mDefaultPhonePreferenceController.getDefaultAppLabel());
+            summary = concatSummaryText(summary,
+                    mDefaultSmsPreferenceController.getDefaultAppLabel());
             if (!TextUtils.isEmpty(summary)) {
                 mSummaryLoader.setSummary(this, summary);
             }
diff --git a/src/com/android/settings/applications/ExternalSourcesDetails.java b/src/com/android/settings/applications/ExternalSourcesDetails.java
index 36ce8f8..5cd3c44 100644
--- a/src/com/android/settings/applications/ExternalSourcesDetails.java
+++ b/src/com/android/settings/applications/ExternalSourcesDetails.java
@@ -15,6 +15,9 @@
  */
 package com.android.settings.applications;
 
+import static android.app.Activity.RESULT_CANCELED;
+import static android.app.Activity.RESULT_OK;
+
 import android.app.AlertDialog;
 import android.app.AppOpsManager;
 import android.content.Context;
@@ -31,9 +34,6 @@
 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 {
 
@@ -76,7 +76,7 @@
         return false;
     }
 
-    static CharSequence getPreferenceSummary(Context context, AppEntry entry) {
+    public static CharSequence getPreferenceSummary(Context context, AppEntry entry) {
         final UserManager um = UserManager.get(context);
         final int userRestrictionSource = um.getUserRestrictionSource(
                 UserManager.DISALLOW_INSTALL_UNKNOWN_SOURCES,
diff --git a/src/com/android/settings/applications/FileViewHolderController.java b/src/com/android/settings/applications/FileViewHolderController.java
deleted file mode 100644
index e8af722..0000000
--- a/src/com/android/settings/applications/FileViewHolderController.java
+++ /dev/null
@@ -1,48 +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.app.Fragment;
-import android.view.View;
-
-/**
- * FileViewHolderController handles adapting the AppViewHolder to work as a general purpose
- * storage categorization preference in the ManageApplications view.
- */
-public interface FileViewHolderController {
-    /**
-     * Begins a synchronous query for statistics for the files.
-     */
-    void queryStats();
-
-    /**
-     * Returns if the preference should be shown.
-     */
-    boolean shouldShow();
-
-    /**
-     * Initializes the view within an AppViewHolder.
-     * @param holder The holder to use to initialize.
-     */
-    void setupView(AppViewHolder holder);
-
-    /**
-     * Handles the behavior when the view is clicked.
-     * @param fragment Fragment where the click originated.
-     */
-    void onClick(Fragment fragment);
-}
diff --git a/src/com/android/settings/applications/IPackageManagerWrapper.java b/src/com/android/settings/applications/IPackageManagerWrapper.java
deleted file mode 100644
index b4d1b85..0000000
--- a/src/com/android/settings/applications/IPackageManagerWrapper.java
+++ /dev/null
@@ -1,75 +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.applications;
-
-import android.content.Intent;
-import android.content.pm.PackageInfo;
-import android.content.pm.ParceledListSlice;
-import android.content.pm.ResolveInfo;
-import android.os.RemoteException;
-
-/**
- * This interface replicates a subset of the android.content.pm.IPackageManager (PMS). The interface
- * exists so that we can use a thin wrapper around the PMS in production code and a mock in tests.
- * We cannot directly mock or shadow the PMS, because some of the methods we rely on are newer than
- * the API version supported by Robolectric.
- */
-public interface IPackageManagerWrapper {
-
-    /**
-     * Calls {@code IPackageManager.checkUidPermission()}.
-     *
-     * @see android.content.pm.IPackageManager#checkUidPermission
-     */
-    int checkUidPermission(String permName, int uid) throws RemoteException;
-
-    /**
-     * Calls {@code IPackageManager.findPersistentPreferredActivity()}.
-     *
-     * @see android.content.pm.IPackageManager#findPersistentPreferredActivity
-     */
-    ResolveInfo findPersistentPreferredActivity(Intent intent, int userId) throws RemoteException;
-
-    /**
-     * Calls {@code IPackageManager.getPackageInfo()}.
-     *
-     * @see android.content.pm.IPackageManager#getPackageInfo
-     */
-    PackageInfo getPackageInfo(String packageName, int flags, int userId) throws RemoteException;
-
-    /**
-     * Calls {@code IPackageManager.getAppOpPermissionPackages()}.
-     *
-     * @see android.content.pm.IPackageManager#getAppOpPermissionPackages
-     */
-    String[] getAppOpPermissionPackages(String permissionName) throws RemoteException;
-
-    /**
-     * Calls {@code IPackageManager.isPackageAvailable()}.
-     *
-     * @see android.content.pm.IPackageManager#isPackageAvailable
-     */
-    boolean isPackageAvailable(String packageName, int userId) throws RemoteException;
-
-    /**
-     * Calls {@code IPackageManager.getPackagesHoldingPermissions()}.
-     *
-     * @see android.content.pm.IPackageManager#getPackagesHoldingPermissions
-     */
-    ParceledListSlice<PackageInfo> getPackagesHoldingPermissions(
-        String[] permissions, int flags, int userId) throws RemoteException;
-}
diff --git a/src/com/android/settings/applications/IPackageManagerWrapperImpl.java b/src/com/android/settings/applications/IPackageManagerWrapperImpl.java
deleted file mode 100644
index af5f378..0000000
--- a/src/com/android/settings/applications/IPackageManagerWrapperImpl.java
+++ /dev/null
@@ -1,67 +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.applications;
-
-import android.content.Intent;
-import android.content.pm.IPackageManager;
-import android.content.pm.PackageInfo;
-import android.content.pm.ParceledListSlice;
-import android.content.pm.ResolveInfo;
-import android.os.RemoteException;
-
-public class IPackageManagerWrapperImpl implements IPackageManagerWrapper {
-
-    private final IPackageManager mPms;
-
-    public IPackageManagerWrapperImpl(IPackageManager pms) {
-        mPms = pms;
-    }
-
-    @Override
-    public int checkUidPermission(String permName, int uid) throws RemoteException {
-        return mPms.checkUidPermission(permName, uid);
-    }
-
-    @Override
-    public ResolveInfo findPersistentPreferredActivity(Intent intent, int userId)
-            throws RemoteException {
-        return mPms.findPersistentPreferredActivity(intent, userId);
-    }
-
-    @Override
-    public PackageInfo getPackageInfo(String packageName, int flags, int userId)
-            throws RemoteException {
-        return mPms.getPackageInfo(packageName, flags, userId);
-    }
-
-    @Override
-    public String[] getAppOpPermissionPackages(String permissionName) throws RemoteException {
-        return mPms.getAppOpPermissionPackages(permissionName);
-    }
-
-    @Override
-    public boolean isPackageAvailable(String packageName, int userId) throws RemoteException {
-        return mPms.isPackageAvailable(packageName, userId);
-    }
-
-    @Override
-    public ParceledListSlice<PackageInfo> getPackagesHoldingPermissions(
-        String[] permissions, int flags, int userId) throws RemoteException {
-        return mPms.getPackagesHoldingPermissions(permissions, flags, userId);
-    }
-
-}
diff --git a/src/com/android/settings/applications/InstalledAppCounter.java b/src/com/android/settings/applications/InstalledAppCounter.java
index 932face..26372ee 100644
--- a/src/com/android/settings/applications/InstalledAppCounter.java
+++ b/src/com/android/settings/applications/InstalledAppCounter.java
@@ -21,6 +21,8 @@
 import android.content.pm.PackageManager;
 import android.os.UserHandle;
 
+import com.android.settingslib.wrapper.PackageManagerWrapper;
+
 import java.util.List;
 
 public abstract class InstalledAppCounter extends AppCounter {
diff --git a/src/com/android/settings/applications/InstalledAppDetails.java b/src/com/android/settings/applications/InstalledAppDetails.java
index 5421586..6f94015 100755
--- a/src/com/android/settings/applications/InstalledAppDetails.java
+++ b/src/com/android/settings/applications/InstalledAppDetails.java
@@ -24,7 +24,6 @@
 import android.app.AlertDialog;
 import android.app.LoaderManager;
 import android.app.LoaderManager.LoaderCallbacks;
-import android.app.admin.DevicePolicyManager;
 import android.content.ActivityNotFoundException;
 import android.content.BroadcastReceiver;
 import android.content.ComponentName;
@@ -67,7 +66,6 @@
 import android.view.MenuItem;
 import android.view.View;
 import android.webkit.IWebViewUpdateService;
-import android.widget.Button;
 
 import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
 import com.android.internal.os.BatterySipper;
@@ -86,7 +84,6 @@
 import com.android.settings.datausage.AppDataUsage;
 import com.android.settings.datausage.DataUsageList;
 import com.android.settings.datausage.DataUsageUtils;
-import com.android.settings.development.DevelopmentSettingsEnabler;
 import com.android.settings.fuelgauge.AdvancedPowerUsageDetail;
 import com.android.settings.fuelgauge.BatteryEntry;
 import com.android.settings.fuelgauge.BatteryStatsHelperLoader;
@@ -94,6 +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.widget.ActionButtonPreference;
 import com.android.settings.widget.EntityHeaderController;
 import com.android.settingslib.AppItem;
 import com.android.settingslib.RestrictedLockUtils;
@@ -104,8 +102,10 @@
 import com.android.settingslib.applications.PermissionsSummaryHelper.PermissionsResultCallback;
 import com.android.settingslib.applications.StorageStatsSource;
 import com.android.settingslib.applications.StorageStatsSource.AppStorageStats;
+import com.android.settingslib.development.DevelopmentSettingsEnabler;
 import com.android.settingslib.net.ChartData;
 import com.android.settingslib.net.ChartDataLoader;
+import com.android.settingslib.wrapper.PackageManagerWrapper;
 
 import java.lang.ref.WeakReference;
 import java.util.ArrayList;
@@ -121,10 +121,12 @@
  * System applications that do not want clear user data do not have this option.
  * For non-system applications, there is no option to clear data. Instead there is an option to
  * uninstall the application.
+ *
+ * deprecated in favor of {@link AppInfoDashboardFragment}
  */
+@Deprecated
 public class InstalledAppDetails extends AppInfoBase
-        implements View.OnClickListener, OnPreferenceClickListener,
-        LoaderManager.LoaderCallbacks<AppStorageStats> {
+        implements OnPreferenceClickListener, LoaderManager.LoaderCallbacks<AppStorageStats> {
 
     private static final String LOG_TAG = "InstalledAppDetails";
 
@@ -166,10 +168,7 @@
     private boolean mInitialized;
     private boolean mShowUninstalled;
     private LayoutPreference mHeader;
-    private LayoutPreference mActionButtons;
-    private Button mUninstallButton;
     private boolean mUpdatedSysApp = false;
-    private Button mForceStopButton;
     private Preference mNotificationPreference;
     private Preference mStoragePreference;
     private Preference mPermissionsPreference;
@@ -178,7 +177,6 @@
     private Preference mMemoryPreference;
     private Preference mVersionPreference;
     private AppDomainsPreference mInstantAppDomainsPreference;
-    private DevelopmentSettingsEnabler mDevelopmentSettingsEnabler;
     private boolean mDisableAfterUninstall;
 
     // Used for updating notification preference.
@@ -188,6 +186,8 @@
     private INetworkStatsSession mStatsSession;
 
     @VisibleForTesting
+    ActionButtonPreference mActionButtons;
+    @VisibleForTesting
     Preference mBatteryPreference;
     @VisibleForTesting
     BatterySipper mSipper;
@@ -231,7 +231,7 @@
             };
 
     @VisibleForTesting
-    boolean handleDisableable(Button button) {
+    boolean handleDisableable() {
         boolean disableable = false;
         // Try to prevent the user from bricking their phone
         // by not allowing disabling of apps signed with the
@@ -239,13 +239,19 @@
         if (mHomePackages.contains(mAppEntry.info.packageName)
                 || Utils.isSystemPackage(getContext().getResources(), mPm, mPackageInfo)) {
             // Disable button for core system applications.
-            button.setText(R.string.disable_text);
+            mActionButtons
+                    .setButton1Text(R.string.disable_text)
+                    .setButton1Positive(false);
         } else if (mAppEntry.info.enabled && !isDisabledUntilUsed()) {
-            button.setText(R.string.disable_text);
+            mActionButtons
+                    .setButton1Text(R.string.disable_text)
+                    .setButton1Positive(false);
             disableable = !mApplicationFeatureProvider.getKeepEnabledPackages()
                     .contains(mAppEntry.info.packageName);
         } else {
-            button.setText(R.string.enable_text);
+            mActionButtons
+                    .setButton1Text(R.string.enable_text)
+                    .setButton1Positive(true);
             disableable = true;
         }
 
@@ -259,11 +265,11 @@
 
     private void initUninstallButtons() {
         final boolean isBundled = (mAppEntry.info.flags & ApplicationInfo.FLAG_SYSTEM) != 0;
-        boolean enabled = true;
+        boolean enabled;
         if (isBundled) {
-            enabled = handleDisableable(mUninstallButton);
+            enabled = handleDisableable();
         } else {
-            enabled = initUnintsallButtonForUserApp();
+            enabled = initUninstallButtonForUserApp();
         }
         // If this is a device admin, it can't be uninstalled or disabled.
         // We do this here so the text of the button is still set correctly.
@@ -326,15 +332,15 @@
             throw new RuntimeException(e);
         }
 
-        mUninstallButton.setEnabled(enabled);
+        mActionButtons.setButton1Enabled(enabled);
         if (enabled) {
             // Register listener
-            mUninstallButton.setOnClickListener(this);
+            mActionButtons.setButton1OnClickListener(v -> handleUninstallButtonClick());
         }
     }
 
     @VisibleForTesting
-    boolean initUnintsallButtonForUserApp() {
+    boolean initUninstallButtonForUserApp() {
         boolean enabled = true;
         if ((mPackageInfo.applicationInfo.flags & ApplicationInfo.FLAG_INSTALLED) == 0
                 && mUserManager.getUsers().size() >= 2) {
@@ -343,9 +349,9 @@
             enabled = false;
         } else if (AppUtils.isInstant(mPackageInfo.applicationInfo)) {
             enabled = false;
-            mUninstallButton.setVisibility(View.GONE);
+            mActionButtons.setButton1Visible(false);
         }
-        mUninstallButton.setText(R.string.uninstall_text);
+        mActionButtons.setButton1Text(R.string.uninstall_text).setButton1Positive(false);
         return enabled;
     }
 
@@ -375,8 +381,6 @@
             removePreference(KEY_DATA);
         }
         mBatteryUtils = BatteryUtils.getInstance(getContext());
-        mDevelopmentSettingsEnabler = new DevelopmentSettingsEnabler(
-                activity, null /* lifecycle */);
     }
 
     @Override
@@ -400,7 +404,7 @@
             loaderManager.restartLoader(LOADER_STORAGE, Bundle.EMPTY, this);
         }
         restartBatteryStatsLoader();
-        if (mDevelopmentSettingsEnabler.getLastEnabledState()) {
+        if (DevelopmentSettingsEnabler.isDevelopmentSettingsEnabled(getContext())) {
             new MemoryUpdater().execute();
         }
         updateDynamicPrefs();
@@ -430,7 +434,10 @@
         }
         final Activity activity = getActivity();
         mHeader = (LayoutPreference) findPreference(KEY_HEADER);
-        mActionButtons = (LayoutPreference) findPreference(KEY_ACTION_BUTTONS);
+        mActionButtons = ((ActionButtonPreference) findPreference(KEY_ACTION_BUTTONS))
+                .setButton2Text(R.string.force_stop)
+                .setButton2Positive(false)
+                .setButton2Enabled(false);
         EntityHeaderController.newInstance(activity, this, mHeader.findViewById(R.id.entity_header))
                 .setRecyclerView(getListView(), getLifecycle())
                 .setPackageName(mPackageName)
@@ -439,7 +446,6 @@
                         EntityHeaderController.ActionType.ACTION_NONE)
                 .styleActionBar(activity)
                 .bindHeaderButtons();
-        prepareUninstallAndStop();
 
         mNotificationPreference = findPreference(KEY_NOTIFICATION);
         mNotificationPreference.setOnPreferenceClickListener(this);
@@ -456,7 +462,8 @@
         mBatteryPreference.setOnPreferenceClickListener(this);
         mMemoryPreference = findPreference(KEY_MEMORY);
         mMemoryPreference.setOnPreferenceClickListener(this);
-        mMemoryPreference.setVisible(mDevelopmentSettingsEnabler.getLastEnabledState());
+        mMemoryPreference.setVisible(
+                DevelopmentSettingsEnabler.isDevelopmentSettingsEnabled(getContext()));
         mVersionPreference = findPreference(KEY_VERSION);
         mInstantAppDomainsPreference =
                 (AppDomainsPreference) findPreference(KEY_INSTANT_APP_SUPPORTED_LINKS);
@@ -499,15 +506,9 @@
         return true;
     }
 
-    private void prepareUninstallAndStop() {
-        mForceStopButton = (Button) mActionButtons.findViewById(R.id.right_button);
-        mForceStopButton.setText(R.string.force_stop);
-        mUninstallButton = (Button) mActionButtons.findViewById(R.id.left_button);
-        mForceStopButton.setEnabled(false);
-    }
-
     @Override
     public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
+        super.onCreateOptionsMenu(menu, inflater);
         menu.add(0, UNINSTALL_UPDATES, 0, R.string.app_factory_reset)
                 .setShowAsAction(MenuItem.SHOW_AS_ACTION_NEVER);
         menu.add(0, UNINSTALL_ALL_USERS_MENU, 1, R.string.uninstall_all_users_text)
@@ -888,12 +889,10 @@
     }
 
     private void updateForceStopButton(boolean enabled) {
-        if (mAppsControlDisallowedBySystem) {
-            mForceStopButton.setEnabled(false);
-        } else {
-            mForceStopButton.setEnabled(enabled);
-            mForceStopButton.setOnClickListener(this);
-        }
+        mActionButtons
+                .setButton2Enabled(mAppsControlDisallowedBySystem ? false : enabled)
+                .setButton2OnClickListener(mAppsControlDisallowedBySystem
+                        ? null : v -> handleForceStopButtonClick());
     }
 
     @VisibleForTesting
@@ -904,7 +903,7 @@
             updateForceStopButton(false);
         } else if (AppUtils.isInstant(mPackageInfo.applicationInfo)) {
             updateForceStopButton(false);
-            mForceStopButton.setVisibility(View.GONE);
+            mActionButtons.setButton2Visible(false);
         } else if ((mAppEntry.info.flags & ApplicationInfo.FLAG_STOPPED) == 0) {
             // If the app isn't explicitly stopped, then always show the
             // force stop button.
@@ -935,11 +934,11 @@
         }
     }
 
-    private void startAppInfoFragment(Class<?> fragment, CharSequence title) {
+    private void startAppInfoFragment(Class<?> fragment, int title) {
         startAppInfoFragment(fragment, title, this, mAppEntry);
     }
 
-    public static void startAppInfoFragment(Class<?> fragment, CharSequence title,
+    public static void startAppInfoFragment(Class<?> fragment, int title,
             SettingsPreferenceFragment caller, AppEntry appEntry) {
         // start new fragment to display extended information
         Bundle args = new Bundle();
@@ -947,71 +946,69 @@
         args.putInt(ARG_PACKAGE_UID, appEntry.info.uid);
 
         SettingsActivity sa = (SettingsActivity) caller.getActivity();
-        sa.startPreferencePanel(caller, fragment.getName(), args, -1, title, caller,
+        sa.startPreferencePanel(caller, fragment.getName(), args, title, null, caller,
                 SUB_INFO_FRAGMENT);
     }
 
-    /*
-     * Method implementing functionality of buttons clicked
-     * @see android.view.View.OnClickListener#onClick(android.view.View)
-     */
-    public void onClick(View v) {
+    private void handleUninstallButtonClick() {
         if (mAppEntry == null) {
             setIntentAndFinish(true, true);
             return;
         }
-        String packageName = mAppEntry.info.packageName;
-        if (v == mUninstallButton) {
-            if (mDpm.packageHasActiveAdmins(mPackageInfo.packageName)) {
-                stopListeningToPackageRemove();
-                Activity activity = getActivity();
-                Intent uninstallDAIntent = new Intent(activity, DeviceAdminAdd.class);
-                uninstallDAIntent.putExtra(DeviceAdminAdd.EXTRA_DEVICE_ADMIN_PACKAGE_NAME,
-                        mPackageName);
-                mMetricsFeatureProvider.action(
-                        activity, MetricsEvent.ACTION_SETTINGS_UNINSTALL_DEVICE_ADMIN);
-                activity.startActivityForResult(uninstallDAIntent, REQUEST_REMOVE_DEVICE_ADMIN);
-                return;
-            }
-            EnforcedAdmin admin = RestrictedLockUtils.checkIfUninstallBlocked(getActivity(),
-                    packageName, mUserId);
-            boolean uninstallBlockedBySystem = mAppsControlDisallowedBySystem ||
-                    RestrictedLockUtils.hasBaseUserRestriction(getActivity(), packageName, mUserId);
-            if (admin != null && !uninstallBlockedBySystem) {
-                RestrictedLockUtils.sendShowAdminSupportDetailsIntent(getActivity(), admin);
-            } else if ((mAppEntry.info.flags & ApplicationInfo.FLAG_SYSTEM) != 0) {
-                if (mAppEntry.info.enabled && !isDisabledUntilUsed()) {
-                    // If the system app has an update and this is the only user on the device,
-                    // then offer to downgrade the app, otherwise only offer to disable the
-                    // app for this user.
-                    if (mUpdatedSysApp && isSingleUser()) {
-                        showDialogInner(DLG_SPECIAL_DISABLE, 0);
-                    } else {
-                        showDialogInner(DLG_DISABLE, 0);
-                    }
+        final String packageName = mAppEntry.info.packageName;
+        if (mDpm.packageHasActiveAdmins(mPackageInfo.packageName)) {
+            stopListeningToPackageRemove();
+            Activity activity = getActivity();
+            Intent uninstallDAIntent = new Intent(activity, DeviceAdminAdd.class);
+            uninstallDAIntent.putExtra(DeviceAdminAdd.EXTRA_DEVICE_ADMIN_PACKAGE_NAME,
+                    mPackageName);
+            mMetricsFeatureProvider.action(
+                    activity, MetricsEvent.ACTION_SETTINGS_UNINSTALL_DEVICE_ADMIN);
+            activity.startActivityForResult(uninstallDAIntent, REQUEST_REMOVE_DEVICE_ADMIN);
+            return;
+        }
+        EnforcedAdmin admin = RestrictedLockUtils.checkIfUninstallBlocked(getActivity(),
+                packageName, mUserId);
+        boolean uninstallBlockedBySystem = mAppsControlDisallowedBySystem ||
+                RestrictedLockUtils.hasBaseUserRestriction(getActivity(), packageName, mUserId);
+        if (admin != null && !uninstallBlockedBySystem) {
+            RestrictedLockUtils.sendShowAdminSupportDetailsIntent(getActivity(), admin);
+        } else if ((mAppEntry.info.flags & ApplicationInfo.FLAG_SYSTEM) != 0) {
+            if (mAppEntry.info.enabled && !isDisabledUntilUsed()) {
+                // If the system app has an update and this is the only user on the device,
+                // then offer to downgrade the app, otherwise only offer to disable the
+                // app for this user.
+                if (mUpdatedSysApp && isSingleUser()) {
+                    showDialogInner(DLG_SPECIAL_DISABLE, 0);
                 } else {
-                    mMetricsFeatureProvider.action(
-                            getActivity(),
-                            mAppEntry.info.enabled
-                                    ? MetricsEvent.ACTION_SETTINGS_DISABLE_APP
-                                    : MetricsEvent.ACTION_SETTINGS_ENABLE_APP);
-                    new DisableChanger(this, mAppEntry.info,
-                            PackageManager.COMPONENT_ENABLED_STATE_DEFAULT)
-                                    .execute((Object) null);
+                    showDialogInner(DLG_DISABLE, 0);
                 }
-            } else if ((mAppEntry.info.flags & ApplicationInfo.FLAG_INSTALLED) == 0) {
-                uninstallPkg(packageName, true, false);
             } else {
-                uninstallPkg(packageName, false, false);
+                mMetricsFeatureProvider.action(
+                        getActivity(),
+                        MetricsEvent.ACTION_SETTINGS_ENABLE_APP);
+                new DisableChanger(this, mAppEntry.info,
+                        PackageManager.COMPONENT_ENABLED_STATE_ENABLED)
+                        .execute((Object) null);
             }
-        } else if (v == mForceStopButton) {
-            if (mAppsControlDisallowedAdmin != null && !mAppsControlDisallowedBySystem) {
-                RestrictedLockUtils.sendShowAdminSupportDetailsIntent(
-                        getActivity(), mAppsControlDisallowedAdmin);
-            } else {
-                showDialogInner(DLG_FORCE_STOP, 0);
-                //forceStopPackage(mAppInfo.packageName);
-            }
+        } else if ((mAppEntry.info.flags & ApplicationInfo.FLAG_INSTALLED) == 0) {
+            uninstallPkg(packageName, true, false);
+        } else {
+            uninstallPkg(packageName, false, false);
+        }
+    }
+
+    private void handleForceStopButtonClick() {
+        if (mAppEntry == null) {
+            setIntentAndFinish(true, true);
+            return;
+        }
+        if (mAppsControlDisallowedAdmin != null && !mAppsControlDisallowedBySystem) {
+            RestrictedLockUtils.sendShowAdminSupportDetailsIntent(
+                    getActivity(), mAppsControlDisallowedAdmin);
+        } else {
+            showDialogInner(DLG_FORCE_STOP, 0);
+            //forceStopPackage(mAppInfo.packageName);
         }
     }
 
@@ -1025,19 +1022,18 @@
     @Override
     public boolean onPreferenceClick(Preference preference) {
         if (preference == mStoragePreference) {
-            startAppInfoFragment(AppStorageSettings.class, mStoragePreference.getTitle());
+            startAppInfoFragment(AppStorageSettings.class, R.string.storage_settings);
         } else if (preference == mNotificationPreference) {
-            startAppInfoFragment(AppNotificationSettings.class,
-                    getString(R.string.app_notifications_title));
+            startAppInfoFragment(AppNotificationSettings.class, R.string.app_notifications_title);
         } else if (preference == mPermissionsPreference) {
             startManagePermissionsActivity();
         } else if (preference == mLaunchPreference) {
-            startAppInfoFragment(AppLaunchSettings.class, mLaunchPreference.getTitle());
+            startAppInfoFragment(AppLaunchSettings.class, R.string.launch_by_default);
         } else if (preference == mMemoryPreference) {
             ProcessStatsBase.launchMemoryDetail((SettingsActivity) getActivity(),
                     mStatsManager.getMemInfo(), mStats, false);
         } else if (preference == mDataPreference) {
-            startAppInfoFragment(AppDataUsage.class, getString(R.string.app_data_usage));
+            startAppInfoFragment(AppDataUsage.class, R.string.app_data_usage);
         } else if (preference == mBatteryPreference) {
             if (isBatteryStatsAvailable()) {
                 BatteryEntry entry = new BatteryEntry(getContext(), null, mUserManager, mSipper);
@@ -1116,8 +1112,7 @@
                 pref.setOnPreferenceClickListener(new OnPreferenceClickListener() {
                     @Override
                     public boolean onPreferenceClick(Preference preference) {
-                        startAppInfoFragment(DrawOverlayDetails.class,
-                                getString(R.string.draw_overlay));
+                        startAppInfoFragment(DrawOverlayDetails.class, R.string.draw_overlay);
                         return true;
                     }
                 });
@@ -1130,8 +1125,7 @@
                 pref.setOnPreferenceClickListener(new OnPreferenceClickListener() {
                     @Override
                     public boolean onPreferenceClick(Preference preference) {
-                        startAppInfoFragment(WriteSettingsDetails.class,
-                                getString(R.string.write_settings));
+                        startAppInfoFragment(WriteSettingsDetails.class, R.string.write_settings);
                         return true;
                     }
                 });
@@ -1161,7 +1155,7 @@
                     @Override
                     public boolean onPreferenceClick(Preference preference) {
                         startAppInfoFragment(ExternalSourcesDetails.class,
-                                getString(R.string.install_other_apps));
+                                R.string.install_other_apps);
                         return true;
                     }
                 });
@@ -1241,7 +1235,7 @@
 
         if (pref != null) {
             pref.setSummary(DefaultHomePreferenceController.isHomeDefault(mPackageName,
-                    new PackageManagerWrapperImpl(context.getPackageManager()))
+                    new PackageManagerWrapper(context.getPackageManager()))
                     ? R.string.yes : R.string.no);
         }
         pref = findPreference("default_browser");
diff --git a/src/com/android/settings/applications/InstalledAppDetailsTop.java b/src/com/android/settings/applications/InstalledAppDetailsTop.java
index 8072694..174a86a 100644
--- a/src/com/android/settings/applications/InstalledAppDetailsTop.java
+++ b/src/com/android/settings/applications/InstalledAppDetailsTop.java
@@ -17,21 +17,29 @@
 package com.android.settings.applications;
 
 import android.content.Intent;
+import android.util.FeatureFlagUtils;
 
 import com.android.settings.SettingsActivity;
+import com.android.settings.core.FeatureFlags;
 
 public class InstalledAppDetailsTop extends SettingsActivity {
 
     @Override
     public Intent getIntent() {
         Intent modIntent = new Intent(super.getIntent());
-        modIntent.putExtra(EXTRA_SHOW_FRAGMENT, InstalledAppDetails.class.getName());
+        if (FeatureFlagUtils.isEnabled(this, FeatureFlags.APP_INFO_V2)) {
+            modIntent.putExtra(EXTRA_SHOW_FRAGMENT, AppInfoDashboardFragment.class.getName());
+        } else {
+            modIntent.putExtra(EXTRA_SHOW_FRAGMENT, InstalledAppDetails.class.getName());
+        }
         return modIntent;
     }
 
     @Override
     protected boolean isValidFragment(String fragmentName) {
-        if (InstalledAppDetails.class.getName().equals(fragmentName)) return true;
-        return false;
+        if (FeatureFlagUtils.isEnabled(this, FeatureFlags.APP_INFO_V2)) {
+            return AppInfoDashboardFragment.class.getName().equals(fragmentName);
+        }
+        return InstalledAppDetails.class.getName().equals(fragmentName);
     }
 }
diff --git a/src/com/android/settings/applications/InstalledAppLister.java b/src/com/android/settings/applications/InstalledAppLister.java
index d8e7c58..3312d3e 100644
--- a/src/com/android/settings/applications/InstalledAppLister.java
+++ b/src/com/android/settings/applications/InstalledAppLister.java
@@ -20,6 +20,8 @@
 import android.content.pm.PackageManager;
 import android.os.UserManager;
 
+import com.android.settingslib.wrapper.PackageManagerWrapper;
+
 public abstract class InstalledAppLister extends AppLister {
 
     public InstalledAppLister(PackageManagerWrapper packageManager, UserManager userManager) {
diff --git a/src/com/android/settings/applications/ManageApplications.java b/src/com/android/settings/applications/ManageApplications.java
deleted file mode 100644
index deda92a..0000000
--- a/src/com/android/settings/applications/ManageApplications.java
+++ /dev/null
@@ -1,1535 +0,0 @@
-/*
- * Copyright (C) 2006 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF 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.Nullable;
-import android.annotation.StringRes;
-import android.app.Activity;
-import android.content.Context;
-import android.content.Intent;
-import android.content.pm.ApplicationInfo;
-import android.content.pm.PackageItemInfo;
-import android.content.pm.PackageManager;
-import android.icu.text.AlphabeticIndex;
-import android.os.Bundle;
-import android.os.Environment;
-import android.os.Handler;
-import android.os.LocaleList;
-import android.os.UserHandle;
-import android.os.UserManager;
-import android.preference.PreferenceFrameLayout;
-import android.support.annotation.VisibleForTesting;
-import android.text.TextUtils;
-import android.util.ArraySet;
-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.widget.AbsListView;
-import android.widget.AdapterView;
-import android.widget.AdapterView.OnItemClickListener;
-import android.widget.AdapterView.OnItemSelectedListener;
-import android.widget.ArrayAdapter;
-import android.widget.BaseAdapter;
-import android.widget.Filter;
-import android.widget.Filterable;
-import android.widget.FrameLayout;
-import android.widget.ListView;
-import android.widget.SectionIndexer;
-import android.widget.Spinner;
-import android.widget.TextView;
-
-import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
-import com.android.settings.R;
-import com.android.settings.Settings;
-import com.android.settings.Settings.AllApplicationsActivity;
-import com.android.settings.Settings.GamesStorageActivity;
-import com.android.settings.Settings.HighPowerApplicationsActivity;
-import com.android.settings.Settings.ManageExternalSourcesActivity;
-import com.android.settings.Settings.MoviesStorageActivity;
-import com.android.settings.Settings.NotificationAppListActivity;
-import com.android.settings.Settings.OverlaySettingsActivity;
-import com.android.settings.Settings.StorageUseActivity;
-import com.android.settings.Settings.UsageAccessSettingsActivity;
-import com.android.settings.Settings.WriteSettingsActivity;
-import com.android.settings.SettingsActivity;
-import com.android.settings.Utils;
-import com.android.settings.applications.AppStateAppOpsBridge.PermissionState;
-import com.android.settings.applications.AppStateUsageBridge.UsageState;
-import com.android.settings.core.InstrumentedPreferenceFragment;
-import com.android.settings.dashboard.SummaryLoader;
-import com.android.settings.fuelgauge.HighPowerDetail;
-import com.android.settings.fuelgauge.PowerWhitelistBackend;
-import com.android.settings.notification.AppNotificationSettings;
-import com.android.settings.notification.ConfigureNotificationSettings;
-import com.android.settings.notification.NotificationBackend;
-import com.android.settings.notification.NotificationBackend.AppRow;
-import com.android.settings.widget.LoadingViewController;
-import com.android.settingslib.HelpUtils;
-import com.android.settingslib.applications.ApplicationsState;
-import com.android.settingslib.applications.ApplicationsState.AppEntry;
-import com.android.settingslib.applications.ApplicationsState.AppFilter;
-import com.android.settingslib.applications.ApplicationsState.CompoundFilter;
-import com.android.settingslib.applications.ApplicationsState.VolumeFilter;
-import com.android.settingslib.applications.StorageStatsSource;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.Comparator;
-import java.util.Locale;
-import java.util.Set;
-
-/**
- * Activity to pick an application that will be used to display installation information and
- * options to uninstall/delete user data for system applications. This activity
- * can be launched through Settings or via the ACTION_MANAGE_PACKAGE_STORAGE
- * intent.
- */
-public class ManageApplications extends InstrumentedPreferenceFragment
-        implements OnItemClickListener, OnItemSelectedListener {
-
-    static final String TAG = "ManageApplications";
-    static final boolean DEBUG = Log.isLoggable(TAG, Log.DEBUG);
-
-    // Intent extras.
-    public static final String EXTRA_CLASSNAME = "classname";
-    // Used for storage only.
-    public static final String EXTRA_VOLUME_UUID = "volumeUuid";
-    public static final String EXTRA_VOLUME_NAME = "volumeName";
-    public static final String EXTRA_STORAGE_TYPE = "storageType";
-    public static final String EXTRA_WORK_ONLY = "workProfileOnly";
-    public static final String EXTRA_WORK_ID = "workId";
-
-    private static final String EXTRA_SORT_ORDER = "sortOrder";
-    private static final String EXTRA_SHOW_SYSTEM = "showSystem";
-    private static final String EXTRA_HAS_ENTRIES = "hasEntries";
-    private static final String EXTRA_HAS_BRIDGE = "hasBridge";
-
-    // attributes used as keys when passing values to InstalledAppDetails activity
-    public static final String APP_CHG = "chg";
-
-    // constant value that can be used to check return code from sub activity.
-    private static final int INSTALLED_APP_DETAILS = 1;
-    private static final int ADVANCED_SETTINGS = 2;
-
-    public static final int SIZE_TOTAL = 0;
-    public static final int SIZE_INTERNAL = 1;
-    public static final int SIZE_EXTERNAL = 2;
-
-    // Filter options used for displayed list of applications
-    // Filters will appear sorted based on their value defined here.
-    public static final int FILTER_APPS_POWER_WHITELIST = 0;
-    public static final int FILTER_APPS_POWER_WHITELIST_ALL = 1;
-    public static final int FILTER_APPS_ALL = 2;
-    public static final int FILTER_APPS_ENABLED = 3;
-    public static final int FILTER_APPS_INSTANT = 4;
-    public static final int FILTER_APPS_DISABLED = 5;
-    public static final int FILTER_APPS_BLOCKED = 6;
-    public static final int FILTER_APPS_PERSONAL = 7;
-    public static final int FILTER_APPS_WORK = 8;
-    public static final int FILTER_APPS_USAGE_ACCESS = 9;
-    public static final int FILTER_APPS_WITH_OVERLAY = 10;
-    public static final int FILTER_APPS_WRITE_SETTINGS = 11;
-    public static final int FILTER_APPS_INSTALL_SOURCES = 12;
-    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.
-    @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];
-
-    static {
-        // High power whitelist, on
-        FILTER_LABELS[FILTER_APPS_POWER_WHITELIST] = R.string.high_power_filter_on;
-        FILTERS[FILTER_APPS_POWER_WHITELIST] = new CompoundFilter(
-                AppStatePowerBridge.FILTER_POWER_WHITELISTED,
-                ApplicationsState.FILTER_ALL_ENABLED);
-
-        // Without disabled until used
-        FILTER_LABELS[FILTER_APPS_POWER_WHITELIST_ALL] = R.string.filter_all_apps;
-        FILTERS[FILTER_APPS_POWER_WHITELIST_ALL] = new CompoundFilter(
-                ApplicationsState.FILTER_WITHOUT_DISABLED_UNTIL_USED,
-                ApplicationsState.FILTER_ALL_ENABLED);
-
-        // All apps
-        FILTER_LABELS[FILTER_APPS_ALL] = R.string.filter_all_apps;
-        FILTERS[FILTER_APPS_ALL] = ApplicationsState.FILTER_EVERYTHING;
-
-        // Enabled
-        FILTER_LABELS[FILTER_APPS_ENABLED] = R.string.filter_enabled_apps;
-        FILTERS[FILTER_APPS_ENABLED] = ApplicationsState.FILTER_ALL_ENABLED;
-
-        // Disabled
-        FILTER_LABELS[FILTER_APPS_DISABLED] = R.string.filter_apps_disabled;
-        FILTERS[FILTER_APPS_DISABLED] = ApplicationsState.FILTER_DISABLED;
-
-        // Instant
-        FILTER_LABELS[FILTER_APPS_INSTANT] = R.string.filter_instant_apps;
-        FILTERS[FILTER_APPS_INSTANT] = ApplicationsState.FILTER_INSTANT;
-
-        // Blocked Notifications
-        FILTER_LABELS[FILTER_APPS_BLOCKED] = R.string.filter_notif_blocked_apps;
-        FILTERS[FILTER_APPS_BLOCKED] = AppStateNotificationBridge.FILTER_APP_NOTIFICATION_BLOCKED;
-
-        // Personal
-        FILTER_LABELS[FILTER_APPS_PERSONAL] = R.string.filter_personal_apps;
-        FILTERS[FILTER_APPS_PERSONAL] = ApplicationsState.FILTER_PERSONAL;
-
-        // Work
-        FILTER_LABELS[FILTER_APPS_WORK] = R.string.filter_work_apps;
-        FILTERS[FILTER_APPS_WORK] = ApplicationsState.FILTER_WORK;
-
-        // Usage access screen, never displayed.
-        FILTER_LABELS[FILTER_APPS_USAGE_ACCESS] = R.string.filter_all_apps;
-        FILTERS[FILTER_APPS_USAGE_ACCESS] = AppStateUsageBridge.FILTER_APP_USAGE;
-
-        // Apps that can draw overlays
-        FILTER_LABELS[FILTER_APPS_WITH_OVERLAY] = R.string.filter_overlay_apps;
-        FILTERS[FILTER_APPS_WITH_OVERLAY] = AppStateOverlayBridge.FILTER_SYSTEM_ALERT_WINDOW;
-
-        // Apps that can write system settings
-        FILTER_LABELS[FILTER_APPS_WRITE_SETTINGS] = R.string.filter_write_settings_apps;
-        FILTERS[FILTER_APPS_WRITE_SETTINGS] = AppStateWriteSettingsBridge.FILTER_WRITE_SETTINGS;
-
-        // Apps that are trusted sources of apks
-        FILTER_LABELS[FILTER_APPS_INSTALL_SOURCES] = R.string.filter_install_sources_apps;
-        FILTERS[FILTER_APPS_INSTALL_SOURCES] = AppStateInstallAppsBridge.FILTER_APP_SOURCES;
-    }
-
-    // Storage types. Used to determine what the extra item in the list of preferences is.
-    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.
-    public static final int STORAGE_TYPE_PHOTOS_VIDEOS = 3;
-
-    private static final int NO_USER_SPECIFIED = -1;
-
-    // sort order
-    private int mSortOrder = R.id.sort_order_alpha;
-
-    // whether showing system apps.
-    private boolean mShowSystem;
-
-    private ApplicationsState mApplicationsState;
-
-    public int mListType;
-    public int mFilter;
-
-    public ApplicationsAdapter mApplications;
-
-    private View mLoadingContainer;
-
-    private View mListContainer;
-
-    // ListView used to display list
-    private ListView mListView;
-
-    // Size resource used for packages whose size computation failed for some reason
-    CharSequence mInvalidSizeStr;
-
-    // layout inflater object used to inflate views
-    private LayoutInflater mInflater;
-
-    private String mCurrentPkgName;
-    private int mCurrentUid;
-    private boolean mFinishAfterDialog;
-
-    private Menu mOptionsMenu;
-
-    public static final int LIST_TYPE_MAIN = 0;
-    public static final int LIST_TYPE_NOTIFICATION = 1;
-    public static final int LIST_TYPE_STORAGE = 3;
-    public static final int LIST_TYPE_USAGE_ACCESS = 4;
-    public static final int LIST_TYPE_HIGH_POWER = 5;
-    public static final int LIST_TYPE_OVERLAY = 6;
-    public static final int LIST_TYPE_WRITE_SETTINGS = 7;
-    public static final int LIST_TYPE_MANAGE_SOURCES = 8;
-    public static final int LIST_TYPE_GAMES = 9;
-    public static final int LIST_TYPE_MOVIES = 10;
-    public static final int LIST_TYPE_PHOTOGRAPHY = 11;
-
-
-    // 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));
-
-    private View mRootView;
-
-    private View mSpinnerHeader;
-    private Spinner mFilterSpinner;
-    private FilterSpinnerAdapter mFilterAdapter;
-    private NotificationBackend mNotifBackend;
-    private ResetAppsHelper mResetAppsHelper;
-    private String mVolumeUuid;
-    private int mStorageType;
-    private boolean mIsWorkOnly;
-    private int mWorkUserId;
-
-    @Override
-    public void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        setHasOptionsMenu(true);
-        mApplicationsState = ApplicationsState.getInstance(getActivity().getApplication());
-
-        Intent intent = getActivity().getIntent();
-        Bundle args = getArguments();
-        String className = args != null ? args.getString(EXTRA_CLASSNAME) : null;
-        if (className == null) {
-            className = intent.getComponent().getClassName();
-        }
-        if (className.equals(AllApplicationsActivity.class.getName())) {
-            mShowSystem = true;
-        } else if (className.equals(NotificationAppListActivity.class.getName())
-                || this instanceof NotificationApps) {
-            mListType = LIST_TYPE_NOTIFICATION;
-            mNotifBackend = new NotificationBackend();
-        } else if (className.equals(StorageUseActivity.class.getName())) {
-            if (args != null && args.containsKey(EXTRA_VOLUME_UUID)) {
-                mVolumeUuid = args.getString(EXTRA_VOLUME_UUID);
-                mStorageType = args.getInt(EXTRA_STORAGE_TYPE, STORAGE_TYPE_DEFAULT);
-                mListType = LIST_TYPE_STORAGE;
-            } else {
-                // No volume selected, display a normal list, sorted by size.
-                mListType = LIST_TYPE_MAIN;
-            }
-            mSortOrder = R.id.sort_order_size;
-        } else if (className.equals(UsageAccessSettingsActivity.class.getName())) {
-            mListType = LIST_TYPE_USAGE_ACCESS;
-        } else if (className.equals(HighPowerApplicationsActivity.class.getName())) {
-            mListType = LIST_TYPE_HIGH_POWER;
-            // Default to showing system.
-            mShowSystem = true;
-        } else if (className.equals(OverlaySettingsActivity.class.getName())) {
-            mListType = LIST_TYPE_OVERLAY;
-        } else if (className.equals(WriteSettingsActivity.class.getName())) {
-            mListType = LIST_TYPE_WRITE_SETTINGS;
-        } else if (className.equals(ManageExternalSourcesActivity.class.getName())) {
-            mListType = LIST_TYPE_MANAGE_SOURCES;
-        } else if (className.equals(GamesStorageActivity.class.getName())) {
-            mListType = LIST_TYPE_GAMES;
-            mSortOrder = R.id.sort_order_size;
-        } else if (className.equals(MoviesStorageActivity.class.getName())) {
-            mListType = LIST_TYPE_MOVIES;
-            mSortOrder = R.id.sort_order_size;
-        } else if (className.equals(Settings.PhotosStorageActivity.class.getName())) {
-            mListType = LIST_TYPE_PHOTOGRAPHY;
-            mSortOrder = R.id.sort_order_size;
-            mStorageType = args.getInt(EXTRA_STORAGE_TYPE, STORAGE_TYPE_DEFAULT);
-        } else {
-            mListType = LIST_TYPE_MAIN;
-        }
-        mFilter = getDefaultFilter();
-        mIsWorkOnly = args != null ? args.getBoolean(EXTRA_WORK_ONLY) : false;
-        mWorkUserId = args != null ? args.getInt(EXTRA_WORK_ID) : NO_USER_SPECIFIED;
-
-        if (savedInstanceState != null) {
-            mSortOrder = savedInstanceState.getInt(EXTRA_SORT_ORDER, mSortOrder);
-            mShowSystem = savedInstanceState.getBoolean(EXTRA_SHOW_SYSTEM, mShowSystem);
-        }
-
-        mInvalidSizeStr = getActivity().getText(R.string.invalid_size_value);
-
-        mResetAppsHelper = new ResetAppsHelper(getActivity());
-    }
-
-
-    @Override
-    public View onCreateView(LayoutInflater inflater, ViewGroup container,
-            Bundle savedInstanceState) {
-        // initialize the inflater
-        mInflater = inflater;
-
-        mRootView = inflater.inflate(R.layout.manage_applications_apps, null);
-        mLoadingContainer = mRootView.findViewById(R.id.loading_container);
-        mListContainer = mRootView.findViewById(R.id.list_container);
-        if (mListContainer != null) {
-            // Create adapter and list view here
-            View emptyView = mListContainer.findViewById(com.android.internal.R.id.empty);
-            ListView lv = (ListView) mListContainer.findViewById(android.R.id.list);
-            if (emptyView != null) {
-                lv.setEmptyView(emptyView);
-            }
-            lv.setOnItemClickListener(this);
-            lv.setSaveEnabled(true);
-            lv.setItemsCanFocus(true);
-            lv.setTextFilterEnabled(true);
-            mListView = lv;
-            mApplications = new ApplicationsAdapter(mApplicationsState, this, mFilter);
-            if (savedInstanceState != null) {
-                mApplications.mHasReceivedLoadEntries =
-                        savedInstanceState.getBoolean(EXTRA_HAS_ENTRIES, false);
-                mApplications.mHasReceivedBridgeCallback =
-                        savedInstanceState.getBoolean(EXTRA_HAS_BRIDGE, false);
-            }
-            int userId = mIsWorkOnly ? mWorkUserId : UserHandle.getUserId(mCurrentUid);
-            if (mStorageType == STORAGE_TYPE_MUSIC) {
-                Context context = getContext();
-                mApplications.setExtraViewController(
-                        new MusicViewHolderController(
-                                context,
-                                new StorageStatsSource(context),
-                                mVolumeUuid,
-                                UserHandle.of(userId)));
-            } else if (mStorageType == STORAGE_TYPE_PHOTOS_VIDEOS) {
-                Context context = getContext();
-                mApplications.setExtraViewController(
-                        new PhotosViewHolderController(
-                                context,
-                                new StorageStatsSource(context),
-                                mVolumeUuid,
-                                UserHandle.of(userId)));
-            }
-            mListView.setAdapter(mApplications);
-            mListView.setRecyclerListener(mApplications);
-            mListView.setFastScrollEnabled(isFastScrollEnabled());
-
-            Utils.prepareCustomPreferencesList(container, mRootView, mListView, false);
-        }
-
-        // We have to do this now because PreferenceFrameLayout looks at it
-        // only when the view is added.
-        if (container instanceof PreferenceFrameLayout) {
-            ((PreferenceFrameLayout.LayoutParams) mRootView.getLayoutParams()).removeBorders = true;
-        }
-
-        createHeader();
-
-        mResetAppsHelper.onRestoreInstanceState(savedInstanceState);
-
-        return mRootView;
-    }
-
-    @VisibleForTesting
-    void createHeader() {
-        Activity activity = getActivity();
-        FrameLayout pinnedHeader = (FrameLayout) mRootView.findViewById(R.id.pinned_header);
-        mSpinnerHeader = activity.getLayoutInflater()
-                .inflate(R.layout.apps_filter_spinner, pinnedHeader, false);
-        mFilterSpinner = (Spinner) mSpinnerHeader.findViewById(R.id.filter_spinner);
-        mFilterAdapter = new FilterSpinnerAdapter(this);
-        mFilterSpinner.setAdapter(mFilterAdapter);
-        mFilterSpinner.setOnItemSelectedListener(this);
-        pinnedHeader.addView(mSpinnerHeader, 0);
-
-        mFilterAdapter.enableFilter(getDefaultFilter());
-        if (mListType == LIST_TYPE_MAIN) {
-            if (UserManager.get(getActivity()).getUserProfiles().size() > 1) {
-                mFilterAdapter.enableFilter(FILTER_APPS_PERSONAL);
-                mFilterAdapter.enableFilter(FILTER_APPS_WORK);
-            }
-        }
-        if (mListType == LIST_TYPE_NOTIFICATION) {
-            mFilterAdapter.enableFilter(FILTER_APPS_BLOCKED);
-        }
-        if (mListType == LIST_TYPE_HIGH_POWER) {
-            mFilterAdapter.enableFilter(FILTER_APPS_POWER_WHITELIST_ALL);
-        }
-
-        AppFilter compositeFilter = getCompositeFilter(mListType, mStorageType, mVolumeUuid);
-        if (mIsWorkOnly) {
-            compositeFilter = new CompoundFilter(compositeFilter, FILTERS[FILTER_APPS_WORK]);
-        }
-        if (compositeFilter != null) {
-            mApplications.setCompositeFilter(compositeFilter);
-        }
-    }
-
-    @VisibleForTesting
-    @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 if (storageType == STORAGE_TYPE_DEFAULT) {
-                filter = new CompoundFilter(ApplicationsState.FILTER_OTHER_APPS, filter);
-            }
-            return filter;
-        }
-        if (listType == LIST_TYPE_GAMES) {
-            return new CompoundFilter(ApplicationsState.FILTER_GAMES, filter);
-        } else if (listType == LIST_TYPE_MOVIES) {
-            return new CompoundFilter(ApplicationsState.FILTER_MOVIES, filter);
-        } else if (listType == LIST_TYPE_PHOTOGRAPHY) {
-            return new CompoundFilter(ApplicationsState.FILTER_PHOTOS, filter);
-        }
-
-        return null;
-    }
-
-    private int getDefaultFilter() {
-        switch (mListType) {
-            case LIST_TYPE_USAGE_ACCESS:
-                return FILTER_APPS_USAGE_ACCESS;
-            case LIST_TYPE_HIGH_POWER:
-                return FILTER_APPS_POWER_WHITELIST;
-            case LIST_TYPE_OVERLAY:
-                return FILTER_APPS_WITH_OVERLAY;
-            case LIST_TYPE_WRITE_SETTINGS:
-                return FILTER_APPS_WRITE_SETTINGS;
-            case LIST_TYPE_MANAGE_SOURCES:
-                return FILTER_APPS_INSTALL_SOURCES;
-            default:
-                return FILTER_APPS_ALL;
-        }
-    }
-
-    private boolean isFastScrollEnabled() {
-        switch (mListType) {
-            case LIST_TYPE_MAIN:
-            case LIST_TYPE_NOTIFICATION:
-            case LIST_TYPE_STORAGE:
-            case LIST_TYPE_GAMES:
-            case LIST_TYPE_MOVIES:
-            case LIST_TYPE_PHOTOGRAPHY:
-                return mSortOrder == R.id.sort_order_alpha;
-            default:
-                return false;
-        }
-    }
-
-    @Override
-    public int getMetricsCategory() {
-        switch (mListType) {
-            case LIST_TYPE_MAIN:
-                return MetricsEvent.MANAGE_APPLICATIONS;
-            case LIST_TYPE_NOTIFICATION:
-                return MetricsEvent.MANAGE_APPLICATIONS_NOTIFICATIONS;
-            case LIST_TYPE_STORAGE:
-                if (mStorageType == STORAGE_TYPE_MUSIC) {
-                    return MetricsEvent.APPLICATIONS_STORAGE_MUSIC;
-                }
-                return MetricsEvent.APPLICATIONS_STORAGE_APPS;
-            case LIST_TYPE_GAMES:
-                return MetricsEvent.APPLICATIONS_STORAGE_GAMES;
-            case LIST_TYPE_MOVIES:
-                return MetricsEvent.APPLICATIONS_STORAGE_MOVIES;
-            case LIST_TYPE_PHOTOGRAPHY:
-                return MetricsEvent.APPLICATIONS_STORAGE_PHOTOS;
-            case LIST_TYPE_USAGE_ACCESS:
-                return MetricsEvent.USAGE_ACCESS;
-            case LIST_TYPE_HIGH_POWER:
-                return MetricsEvent.APPLICATIONS_HIGH_POWER_APPS;
-            case LIST_TYPE_OVERLAY:
-                return MetricsEvent.SYSTEM_ALERT_WINDOW_APPS;
-            case LIST_TYPE_WRITE_SETTINGS:
-                return MetricsEvent.SYSTEM_ALERT_WINDOW_APPS;
-            case LIST_TYPE_MANAGE_SOURCES:
-                return MetricsEvent.MANAGE_EXTERNAL_SOURCES;
-            default:
-                return MetricsEvent.VIEW_UNKNOWN;
-        }
-    }
-
-    @Override
-    public void onStart() {
-        super.onStart();
-        updateView();
-        if (mApplications != null) {
-            mApplications.resume(mSortOrder);
-            mApplications.updateLoading();
-        }
-    }
-
-    @Override
-    public void onSaveInstanceState(Bundle outState) {
-        super.onSaveInstanceState(outState);
-        mResetAppsHelper.onSaveInstanceState(outState);
-        outState.putInt(EXTRA_SORT_ORDER, mSortOrder);
-        outState.putBoolean(EXTRA_SHOW_SYSTEM, mShowSystem);
-        outState.putBoolean(EXTRA_HAS_ENTRIES, mApplications.mHasReceivedLoadEntries);
-        outState.putBoolean(EXTRA_HAS_BRIDGE, mApplications.mHasReceivedBridgeCallback);
-    }
-
-    @Override
-    public void onStop() {
-        super.onStop();
-        if (mApplications != null) {
-            mApplications.pause();
-        }
-        mResetAppsHelper.stop();
-    }
-
-    @Override
-    public void onDestroyView() {
-        super.onDestroyView();
-
-        if (mApplications != null) {
-            mApplications.release();
-        }
-        mRootView = null;
-    }
-
-    @Override
-    public void onActivityResult(int requestCode, int resultCode, Intent data) {
-        if (requestCode == INSTALLED_APP_DETAILS && mCurrentPkgName != null) {
-            if (mListType == LIST_TYPE_NOTIFICATION) {
-                mApplications.mExtraInfoBridge.forceUpdate(mCurrentPkgName, mCurrentUid);
-            } else if (mListType == LIST_TYPE_HIGH_POWER || mListType == LIST_TYPE_OVERLAY
-                    || mListType == LIST_TYPE_WRITE_SETTINGS) {
-                if (mFinishAfterDialog) {
-                    getActivity().onBackPressed();
-                } else {
-                    mApplications.mExtraInfoBridge.forceUpdate(mCurrentPkgName, mCurrentUid);
-                }
-            } else {
-                mApplicationsState.requestSize(mCurrentPkgName, UserHandle.getUserId(mCurrentUid));
-            }
-        }
-    }
-
-    // utility method used to start sub activity
-    private void startApplicationDetailsActivity() {
-        switch (mListType) {
-            case LIST_TYPE_NOTIFICATION:
-                startAppInfoFragment(AppNotificationSettings.class, R.string.notifications_title);
-                break;
-            case LIST_TYPE_USAGE_ACCESS:
-                startAppInfoFragment(UsageAccessDetails.class, R.string.usage_access);
-                break;
-            case LIST_TYPE_STORAGE:
-                startAppInfoFragment(AppStorageSettings.class, R.string.storage_settings);
-                break;
-            case LIST_TYPE_HIGH_POWER:
-                HighPowerDetail.show(this, mCurrentPkgName, INSTALLED_APP_DETAILS,
-                        mFinishAfterDialog);
-                break;
-            case LIST_TYPE_OVERLAY:
-                startAppInfoFragment(DrawOverlayDetails.class, R.string.overlay_settings);
-                break;
-            case LIST_TYPE_WRITE_SETTINGS:
-                startAppInfoFragment(WriteSettingsDetails.class, R.string.write_system_settings);
-                break;
-            case LIST_TYPE_MANAGE_SOURCES:
-                startAppInfoFragment(ExternalSourcesDetails.class, R.string.install_other_apps);
-                break;
-            case LIST_TYPE_GAMES:
-                startAppInfoFragment(AppStorageSettings.class, R.string.game_storage_settings);
-                break;
-            case LIST_TYPE_MOVIES:
-                startAppInfoFragment(AppStorageSettings.class, R.string.storage_movies_tv);
-                break;
-            case LIST_TYPE_PHOTOGRAPHY:
-                startAppInfoFragment(AppStorageSettings.class, R.string.storage_photos_videos);
-                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.
-            default:
-                startAppInfoFragment(InstalledAppDetails.class, R.string.application_info_label);
-                break;
-        }
-    }
-
-    private void startAppInfoFragment(Class<?> fragment, int titleRes) {
-        AppInfoBase.startAppInfoFragment(fragment, titleRes, mCurrentPkgName, mCurrentUid, this,
-                INSTALLED_APP_DETAILS, getMetricsCategory());
-    }
-
-    @Override
-    public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
-        HelpUtils.prepareHelpMenuItem(getActivity(), menu, getHelpResource(), getClass().getName());
-        mOptionsMenu = menu;
-        inflater.inflate(R.menu.manage_apps, menu);
-        updateOptionsMenu();
-    }
-
-    @Override
-    public void onPrepareOptionsMenu(Menu menu) {
-        updateOptionsMenu();
-    }
-
-    @Override
-    public void onDestroyOptionsMenu() {
-        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;
-        }
-        mOptionsMenu.findItem(R.id.advanced).setVisible(false);
-
-        mOptionsMenu.findItem(R.id.sort_order_alpha).setVisible(mListType == LIST_TYPE_STORAGE
-                && mSortOrder != R.id.sort_order_alpha);
-        mOptionsMenu.findItem(R.id.sort_order_size).setVisible(mListType == LIST_TYPE_STORAGE
-                && mSortOrder != R.id.sort_order_size);
-
-        mOptionsMenu.findItem(R.id.show_system).setVisible(!mShowSystem
-                && 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
-    public boolean onOptionsItemSelected(MenuItem item) {
-        int menuId = item.getItemId();
-        switch (item.getItemId()) {
-            case R.id.sort_order_alpha:
-            case R.id.sort_order_size:
-                mSortOrder = menuId;
-                mListView.setFastScrollEnabled(isFastScrollEnabled());
-                if (mApplications != null) {
-                    mApplications.rebuild(mSortOrder);
-                }
-                break;
-            case R.id.show_system:
-            case R.id.hide_system:
-                mShowSystem = !mShowSystem;
-                mApplications.rebuild(false);
-                break;
-            case R.id.reset_app_preferences:
-                mResetAppsHelper.buildResetDialog();
-                return true;
-            case R.id.advanced:
-                if (mListType == LIST_TYPE_NOTIFICATION) {
-                    ((SettingsActivity) getActivity()).startPreferencePanel(this,
-                            ConfigureNotificationSettings.class.getName(), null,
-                            R.string.configure_notification_settings, null, this,
-                            ADVANCED_SETTINGS);
-                } else {
-                    ((SettingsActivity) getActivity()).startPreferencePanel(this,
-                            DefaultAppSettings.class.getName(), null, R.string.configure_apps,
-                            null, this, ADVANCED_SETTINGS);
-                }
-                return true;
-            default:
-                // Handle the home button
-                return false;
-        }
-        updateOptionsMenu();
-        return true;
-    }
-
-    @Override
-    public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
-        if (mApplications == null) {
-            return;
-        }
-
-        if (mApplications.getApplicationCount() > position) {
-            ApplicationsState.AppEntry entry = mApplications.getAppEntry(position);
-            mCurrentPkgName = entry.info.packageName;
-            mCurrentUid = entry.info.uid;
-            startApplicationDetailsActivity();
-        } else {
-            mApplications.mExtraViewController.onClick(this);
-        }
-    }
-
-    @Override
-    public void onItemSelected(AdapterView<?> parent, View view, int position, long id) {
-        mFilter = mFilterAdapter.getFilter(position);
-        mApplications.setFilter(mFilter);
-        if (DEBUG) Log.d(TAG, "Selecting filter " + mFilter);
-    }
-
-    @Override
-    public void onNothingSelected(AdapterView<?> parent) {
-    }
-
-    public void updateView() {
-        updateOptionsMenu();
-        final Activity host = getActivity();
-        if (host != null) {
-            host.invalidateOptionsMenu();
-        }
-    }
-
-    public void setHasDisabled(boolean hasDisabledApps) {
-        if (mListType != LIST_TYPE_MAIN) {
-            return;
-        }
-        mFilterAdapter.setFilterEnabled(FILTER_APPS_ENABLED, hasDisabledApps);
-        mFilterAdapter.setFilterEnabled(FILTER_APPS_DISABLED, hasDisabledApps);
-    }
-
-    public void setHasInstant(boolean haveInstantApps) {
-        if (LIST_TYPES_WITH_INSTANT.contains(mListType)) {
-            mFilterAdapter.setFilterEnabled(FILTER_APPS_INSTANT, haveInstantApps);
-        }
-    }
-
-    static class FilterSpinnerAdapter extends ArrayAdapter<CharSequence> {
-
-        private final ManageApplications mManageApplications;
-
-        // Use ArrayAdapter for view logic, but have our own list for managing
-        // the options available.
-        private final ArrayList<Integer> mFilterOptions = new ArrayList<>();
-
-        public FilterSpinnerAdapter(ManageApplications manageApplications) {
-            super(manageApplications.mFilterSpinner.getContext(), R.layout.filter_spinner_item);
-            setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item);
-            mManageApplications = manageApplications;
-        }
-
-        public int getFilter(int position) {
-            return mFilterOptions.get(position);
-        }
-
-        public void setFilterEnabled(int filter, boolean enabled) {
-            if (enabled) {
-                enableFilter(filter);
-            } else {
-                disableFilter(filter);
-            }
-        }
-
-        public void enableFilter(int filter) {
-            if (mFilterOptions.contains(filter)) return;
-            if (DEBUG) Log.d(TAG, "Enabling filter " + filter);
-            mFilterOptions.add(filter);
-            Collections.sort(mFilterOptions);
-            mManageApplications.mSpinnerHeader.setVisibility(
-                    mFilterOptions.size() > 1 ? View.VISIBLE : View.GONE);
-            notifyDataSetChanged();
-            if (mFilterOptions.size() == 1) {
-                if (DEBUG) Log.d(TAG, "Auto selecting filter " + filter);
-                mManageApplications.mFilterSpinner.setSelection(0);
-                mManageApplications.onItemSelected(null, null, 0, 0);
-            }
-        }
-
-        public void disableFilter(int filter) {
-            if (!mFilterOptions.remove((Integer) filter)) {
-                return;
-            }
-            if (DEBUG) Log.d(TAG, "Disabling filter " + filter);
-            Collections.sort(mFilterOptions);
-            mManageApplications.mSpinnerHeader.setVisibility(
-                    mFilterOptions.size() > 1 ? View.VISIBLE : View.GONE);
-            notifyDataSetChanged();
-            if (mManageApplications.mFilter == filter) {
-                if (mFilterOptions.size() > 0) {
-                    if (DEBUG) Log.d(TAG, "Auto selecting filter " + mFilterOptions.get(0));
-                    mManageApplications.mFilterSpinner.setSelection(0);
-                    mManageApplications.onItemSelected(null, null, 0, 0);
-                }
-            }
-        }
-
-        @Override
-        public int getCount() {
-            return mFilterOptions.size();
-        }
-
-        @Override
-        public CharSequence getItem(int position) {
-            return getFilterString(mFilterOptions.get(position));
-        }
-
-        private CharSequence getFilterString(int filter) {
-            return mManageApplications.getString(FILTER_LABELS[filter]);
-        }
-
-    }
-
-    /*
-     * Custom adapter implementation for the ListView
-     * This adapter maintains a map for each displayed application and its properties
-     * An index value on each AppInfo object indicates the correct position or index
-     * in the list. If the list gets updated dynamically when the user is viewing the list of
-     * applications, we need to return the correct index of position. This is done by mapping
-     * the getId methods via the package name into the internal maps and indices.
-     * The order of applications in the list is mirrored in mAppLocalList
-     */
-    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;
-        private final ApplicationsState.Session mSession;
-        private final ManageApplications mManageApplications;
-        private final Context mContext;
-        private final ArrayList<View> mActive = new ArrayList<View>();
-        private final AppStateBaseBridge mExtraInfoBridge;
-        private final Handler mBgHandler;
-        private final Handler mFgHandler;
-        private final LoadingViewController mLoadingViewController;
-
-        private int mFilterMode;
-        private ArrayList<ApplicationsState.AppEntry> mBaseEntries;
-        private ArrayList<ApplicationsState.AppEntry> mEntries;
-        private boolean mResumed;
-        private int mLastSortMode = -1;
-        private int mWhichSize = SIZE_TOTAL;
-        CharSequence mCurFilterPrefix;
-        private PackageManager mPm;
-        private AppFilter mCompositeFilter;
-        private boolean mHasReceivedLoadEntries;
-        private boolean mHasReceivedBridgeCallback;
-        private FileViewHolderController mExtraViewController;
-
-        // These two variables are used to remember and restore the last scroll position when this
-        // fragment is paused. We need this special handling because app entries are added gradually
-        // when we rebuild the list after the user made some changes, like uninstalling an app.
-        private int mLastIndex = -1;
-        private int mLastTop;
-
-        private AlphabeticIndex.ImmutableIndex<Locale> mIndex;
-        private SectionInfo[] mSections = EMPTY_SECTIONS;
-        private int[] mPositionToSectionIndex;
-
-        private Filter mFilter = new Filter() {
-            @Override
-            protected FilterResults performFiltering(CharSequence constraint) {
-                ArrayList<ApplicationsState.AppEntry> entries
-                        = applyPrefixFilter(constraint, mBaseEntries);
-                FilterResults fr = new FilterResults();
-                fr.values = entries;
-                fr.count = entries.size();
-                return fr;
-            }
-
-            @Override
-            @SuppressWarnings("unchecked")
-            protected void publishResults(CharSequence constraint, FilterResults results) {
-                mCurFilterPrefix = constraint;
-                mEntries = (ArrayList<ApplicationsState.AppEntry>) results.values;
-                rebuildSections();
-                notifyDataSetChanged();
-            }
-        };
-
-
-        public ApplicationsAdapter(ApplicationsState state, ManageApplications manageApplications,
-                int filterMode) {
-            mState = state;
-            mFgHandler = new Handler();
-            mBgHandler = new Handler(mState.getBackgroundLooper());
-            mSession = state.newSession(this);
-            mManageApplications = manageApplications;
-            mLoadingViewController = new LoadingViewController(
-                    mManageApplications.mLoadingContainer,
-                    mManageApplications.mListContainer
-            );
-            mContext = manageApplications.getActivity();
-            mPm = mContext.getPackageManager();
-            mFilterMode = filterMode;
-            if (mManageApplications.mListType == LIST_TYPE_NOTIFICATION) {
-                mExtraInfoBridge = new AppStateNotificationBridge(mContext, mState, this,
-                        manageApplications.mNotifBackend);
-            } else if (mManageApplications.mListType == LIST_TYPE_USAGE_ACCESS) {
-                mExtraInfoBridge = new AppStateUsageBridge(mContext, mState, this);
-            } else if (mManageApplications.mListType == LIST_TYPE_HIGH_POWER) {
-                mExtraInfoBridge = new AppStatePowerBridge(mState, this);
-            } else if (mManageApplications.mListType == LIST_TYPE_OVERLAY) {
-                mExtraInfoBridge = new AppStateOverlayBridge(mContext, mState, this);
-            } else if (mManageApplications.mListType == LIST_TYPE_WRITE_SETTINGS) {
-                mExtraInfoBridge = new AppStateWriteSettingsBridge(mContext, mState, this);
-            } else if (mManageApplications.mListType == LIST_TYPE_MANAGE_SOURCES) {
-                mExtraInfoBridge = new AppStateInstallAppsBridge(mContext, mState, this);
-            } else {
-                mExtraInfoBridge = null;
-            }
-        }
-
-        public void setCompositeFilter(AppFilter compositeFilter) {
-            mCompositeFilter = compositeFilter;
-            rebuild(true);
-        }
-
-        public void setFilter(int filter) {
-            mFilterMode = filter;
-            rebuild(true);
-        }
-
-        public void setExtraViewController(FileViewHolderController extraViewController) {
-            mExtraViewController = extraViewController;
-            mBgHandler.post(() -> {
-                mExtraViewController.queryStats();
-                mFgHandler.post(() -> {
-                    onExtraViewCompleted();
-                });
-            });
-        }
-
-        public void resume(int sort) {
-            if (DEBUG) Log.i(TAG, "Resume!  mResumed=" + mResumed);
-            if (!mResumed) {
-                mResumed = true;
-                mSession.resume();
-                mLastSortMode = sort;
-                if (mExtraInfoBridge != null) {
-                    mExtraInfoBridge.resume();
-                }
-                rebuild(false);
-            } else {
-                rebuild(sort);
-            }
-        }
-
-        public void pause() {
-            if (mResumed) {
-                mResumed = false;
-                mSession.pause();
-                if (mExtraInfoBridge != null) {
-                    mExtraInfoBridge.pause();
-                }
-            }
-            // 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());
-        }
-
-        public void release() {
-            mSession.release();
-            if (mExtraInfoBridge != null) {
-                mExtraInfoBridge.release();
-            }
-        }
-
-        public void rebuild(int sort) {
-            if (sort == mLastSortMode) {
-                return;
-            }
-            mLastSortMode = sort;
-            rebuild(true);
-        }
-
-        public void rebuild(boolean eraseold) {
-            if (!mHasReceivedLoadEntries
-                    || (mExtraInfoBridge != null && !mHasReceivedBridgeCallback)) {
-                // Don't rebuild the list until all the app entries are loaded.
-                return;
-            }
-            ApplicationsState.AppFilter filterObj;
-            Comparator<AppEntry> comparatorObj;
-            boolean emulated = Environment.isExternalStorageEmulated();
-            if (emulated) {
-                mWhichSize = SIZE_TOTAL;
-            } else {
-                mWhichSize = SIZE_INTERNAL;
-            }
-            filterObj = FILTERS[mFilterMode];
-            if (mCompositeFilter != null) {
-                filterObj = new CompoundFilter(filterObj, mCompositeFilter);
-            }
-            if (!mManageApplications.mShowSystem) {
-                if (LIST_TYPES_WITH_INSTANT.contains(mManageApplications.mListType)) {
-                    filterObj = new CompoundFilter(filterObj,
-                            ApplicationsState.FILTER_DOWNLOADED_AND_LAUNCHER_AND_INSTANT);
-                } else {
-                    filterObj = new CompoundFilter(filterObj,
-                            ApplicationsState.FILTER_DOWNLOADED_AND_LAUNCHER);
-                }
-            }
-            switch (mLastSortMode) {
-                case R.id.sort_order_size:
-                    switch (mWhichSize) {
-                        case SIZE_INTERNAL:
-                            comparatorObj = ApplicationsState.INTERNAL_SIZE_COMPARATOR;
-                            break;
-                        case SIZE_EXTERNAL:
-                            comparatorObj = ApplicationsState.EXTERNAL_SIZE_COMPARATOR;
-                            break;
-                        default:
-                            comparatorObj = ApplicationsState.SIZE_COMPARATOR;
-                            break;
-                    }
-                    break;
-                default:
-                    comparatorObj = ApplicationsState.ALPHA_COMPARATOR;
-                    break;
-            }
-
-            filterObj = new CompoundFilter(filterObj, ApplicationsState.FILTER_NOT_HIDE);
-            AppFilter finalFilterObj = filterObj;
-            mBgHandler.post(() -> {
-                final ArrayList<AppEntry> entries = mSession.rebuild(finalFilterObj,
-                        comparatorObj, false);
-                if (entries != null) {
-                    mFgHandler.post(() -> onRebuildComplete(entries));
-                }
-            });
-        }
-
-
-        static private boolean packageNameEquals(PackageItemInfo info1, PackageItemInfo info2) {
-            if (info1 == null || info2 == null) {
-                return false;
-            }
-            if (info1.packageName == null || info2.packageName == null) {
-                return false;
-            }
-            return info1.packageName.equals(info2.packageName);
-        }
-
-        private ArrayList<ApplicationsState.AppEntry> removeDuplicateIgnoringUser(
-                ArrayList<ApplicationsState.AppEntry> entries) {
-            int size = entries.size();
-            // returnList will not have more entries than entries
-            ArrayList<ApplicationsState.AppEntry> returnEntries = new
-                    ArrayList<ApplicationsState.AppEntry>(size);
-
-            // assume appinfo of same package but different users are grouped together
-            PackageItemInfo lastInfo = null;
-            for (int i = 0; i < size; i++) {
-                AppEntry appEntry = entries.get(i);
-                PackageItemInfo info = appEntry.info;
-                if (!packageNameEquals(lastInfo, appEntry.info)) {
-                    returnEntries.add(appEntry);
-                }
-                lastInfo = info;
-            }
-            returnEntries.trimToSize();
-            return returnEntries;
-        }
-
-        @Override
-        public void onRebuildComplete(ArrayList<AppEntry> entries) {
-            if (mFilterMode == FILTER_APPS_POWER_WHITELIST ||
-                    mFilterMode == FILTER_APPS_POWER_WHITELIST_ALL) {
-                entries = removeDuplicateIgnoringUser(entries);
-            }
-            mBaseEntries = entries;
-            if (mBaseEntries != null) {
-                mEntries = applyPrefixFilter(mCurFilterPrefix, mBaseEntries);
-                rebuildSections();
-            } else {
-                mEntries = null;
-                mSections = EMPTY_SECTIONS;
-                mPositionToSectionIndex = null;
-            }
-
-            notifyDataSetChanged();
-            // Restore the last scroll position if the number of entries added so far is bigger than
-            // it.
-            if (mLastIndex != -1 && getCount() > mLastIndex) {
-                mManageApplications.mListView.setSelectionFromTop(mLastIndex, mLastTop);
-                mLastIndex = -1;
-            }
-
-            if (mSession.getAllApps().size() != 0
-                    && mManageApplications.mListContainer.getVisibility() != View.VISIBLE) {
-                mLoadingViewController.showContent(true /* animate */);
-            }
-            if (mManageApplications.mListType == LIST_TYPE_USAGE_ACCESS) {
-                // No enabled or disabled filters for usage access.
-                return;
-            }
-
-            mManageApplications.setHasDisabled(mState.haveDisabledApps());
-            mManageApplications.setHasInstant(mState.haveInstantApps());
-        }
-
-        private void rebuildSections() {
-            if (mEntries != null && mManageApplications.mListView.isFastScrollEnabled()) {
-                // Rebuild sections
-                if (mIndex == null) {
-                    LocaleList locales = mContext.getResources().getConfiguration().getLocales();
-                    if (locales.size() == 0) {
-                        locales = new LocaleList(Locale.ENGLISH);
-                    }
-                    AlphabeticIndex<Locale> index = new AlphabeticIndex<>(locales.get(0));
-                    int localeCount = locales.size();
-                    for (int i = 1; i < localeCount; i++) {
-                        index.addLabels(locales.get(i));
-                    }
-                    // Ensure we always have some base English locale buckets
-                    index.addLabels(Locale.ENGLISH);
-                    mIndex = index.buildImmutableIndex();
-                }
-
-                ArrayList<SectionInfo> sections = new ArrayList<>();
-                int lastSecId = -1;
-                int totalEntries = mEntries.size();
-                mPositionToSectionIndex = new int[totalEntries];
-
-                for (int pos = 0; pos < totalEntries; pos++) {
-                    String label = mEntries.get(pos).label;
-                    int secId = mIndex.getBucketIndex(TextUtils.isEmpty(label) ? "" : label);
-                    if (secId != lastSecId) {
-                        lastSecId = secId;
-                        sections.add(new SectionInfo(mIndex.getBucket(secId).getLabel(), pos));
-                    }
-                    mPositionToSectionIndex[pos] = sections.size() - 1;
-                }
-                mSections = sections.toArray(EMPTY_SECTIONS);
-            } else {
-                mSections = EMPTY_SECTIONS;
-                mPositionToSectionIndex = null;
-            }
-        }
-
-        @VisibleForTesting
-        void updateLoading() {
-            final boolean appLoaded = mHasReceivedLoadEntries && mSession.getAllApps().size() != 0;
-            if (appLoaded) {
-                mLoadingViewController.showContent(false /* animate */);
-            } else {
-                mLoadingViewController.showLoadingViewDelayed();
-            }
-        }
-
-        ArrayList<ApplicationsState.AppEntry> applyPrefixFilter(CharSequence prefix,
-                ArrayList<ApplicationsState.AppEntry> origEntries) {
-            if (prefix == null || prefix.length() == 0) {
-                return origEntries;
-            } else {
-                String prefixStr = ApplicationsState.normalize(prefix.toString());
-                final String spacePrefixStr = " " + prefixStr;
-                ArrayList<ApplicationsState.AppEntry> newEntries
-                        = new ArrayList<ApplicationsState.AppEntry>();
-                for (int i = 0; i < origEntries.size(); i++) {
-                    ApplicationsState.AppEntry entry = origEntries.get(i);
-                    String nlabel = entry.getNormalizedLabel();
-                    if (nlabel.startsWith(prefixStr) || nlabel.indexOf(spacePrefixStr) != -1) {
-                        newEntries.add(entry);
-                    }
-                }
-                return newEntries;
-            }
-        }
-
-        @Override
-        public void onExtraInfoUpdated() {
-            mHasReceivedBridgeCallback = true;
-            rebuild(false);
-        }
-
-        @Override
-        public void onRunningStateChanged(boolean running) {
-            mManageApplications.getActivity().setProgressBarIndeterminateVisibility(running);
-        }
-
-        @Override
-        public void onPackageListChanged() {
-            rebuild(false);
-        }
-
-        @Override
-        public void onPackageIconChanged() {
-            // We ensure icons are loaded when their item is displayed, so
-            // don't care about icons loaded in the background.
-        }
-
-        @Override
-        public void onLoadEntriesCompleted() {
-            mHasReceivedLoadEntries = true;
-            // We may have been skipping rebuilds until this came in, trigger one now.
-            rebuild(false);
-        }
-
-        @Override
-        public void onPackageSizeChanged(String packageName) {
-            for (int i = 0; i < mActive.size(); i++) {
-                AppViewHolder holder = (AppViewHolder) mActive.get(i).getTag();
-                if (holder == null || holder.entry == null) {
-                    continue;
-                }
-                ApplicationInfo info = holder.entry.info;
-                if (info == null) {
-                    continue;
-                }
-                if (holder.entry.info.packageName.equals(packageName)) {
-                    synchronized (holder.entry) {
-                        updateSummary(holder);
-                    }
-                    if (holder.entry.info.packageName.equals(mManageApplications.mCurrentPkgName)
-                            && mLastSortMode == R.id.sort_order_size) {
-                        // We got the size information for the last app the
-                        // user viewed, and are sorting by size...  they may
-                        // have cleared data, so we immediately want to resort
-                        // the list with the new size to reflect it to the user.
-                        rebuild(false);
-                    }
-                    return;
-                }
-            }
-        }
-
-        @Override
-        public void onLauncherInfoChanged() {
-            if (!mManageApplications.mShowSystem) {
-                rebuild(false);
-            }
-        }
-
-        @Override
-        public void onAllSizesComputed() {
-            if (mLastSortMode == R.id.sort_order_size) {
-                rebuild(false);
-            }
-        }
-
-        public void onExtraViewCompleted() {
-            int size = mActive.size();
-            // If we have no elements, don't do anything.
-            if (size < 1) {
-                return;
-            }
-            AppViewHolder holder = (AppViewHolder) mActive.get(size - 1).getTag();
-
-            // HACK: The extra view has no AppEntry -- and should be the only element without one.
-            // Thus, if the last active element has no AppEntry, it is the extra view.
-            if (holder == null || holder.entry != null) {
-                return;
-            }
-
-            mExtraViewController.setupView(holder);
-        }
-
-        public int getCount() {
-            if (mEntries == null) {
-                return 0;
-            }
-            int extraViewAddition =
-                    (mExtraViewController != null && mExtraViewController.shouldShow()) ? 1 : 0;
-            return mEntries.size() + extraViewAddition;
-        }
-
-        public int getApplicationCount() {
-            return mEntries != null ? mEntries.size() : 0;
-        }
-
-        public Object getItem(int position) {
-            if (position == mEntries.size()) {
-                return mExtraViewController;
-            }
-            return mEntries.get(position);
-        }
-
-        public ApplicationsState.AppEntry getAppEntry(int position) {
-            return mEntries.get(position);
-        }
-
-        public long getItemId(int position) {
-            if (position == mEntries.size()) {
-                return -1;
-            }
-            return mEntries.get(position).id;
-        }
-
-        @Override
-        public boolean areAllItemsEnabled() {
-            return false;
-        }
-
-        @Override
-        public boolean isEnabled(int position) {
-            if (position == mEntries.size() && mExtraViewController != null &&
-                    mExtraViewController.shouldShow()) {
-                return true;
-            }
-
-            if (mManageApplications.mListType != LIST_TYPE_HIGH_POWER) {
-                return true;
-            }
-            ApplicationsState.AppEntry entry = mEntries.get(position);
-            return !PowerWhitelistBackend.getInstance().isSysWhitelisted(entry.info.packageName);
-        }
-
-        public View getView(int position, View convertView, ViewGroup parent) {
-            // A ViewHolder keeps references to children views to avoid unnecessary calls
-            // to findViewById() on each row.
-            AppViewHolder holder = AppViewHolder.createOrRecycle(mManageApplications.mInflater,
-                    convertView);
-            convertView = holder.rootView;
-
-            // Handle the extra view if it is the last entry.
-            if (mEntries != null && mExtraViewController != null && position == mEntries.size()) {
-                mExtraViewController.setupView(holder);
-                convertView.setEnabled(true);
-            } else {
-                // Bind the data efficiently with the holder
-                ApplicationsState.AppEntry entry = mEntries.get(position);
-                synchronized (entry) {
-                    holder.entry = entry;
-                    if (entry.label != null) {
-                        holder.appName.setText(entry.label);
-                    }
-                    mState.ensureIcon(entry);
-                    if (entry.icon != null) {
-                        holder.appIcon.setImageDrawable(entry.icon);
-                    }
-                    updateSummary(holder);
-                    updateDisableView(holder.disabled, entry.info);
-                }
-                convertView.setEnabled(isEnabled(position));
-            }
-
-            mActive.remove(convertView);
-            mActive.add(convertView);
-            return convertView;
-        }
-
-        @VisibleForTesting
-        void updateDisableView(TextView view, ApplicationInfo info) {
-            if ((info.flags & ApplicationInfo.FLAG_INSTALLED) == 0) {
-                view.setVisibility(View.VISIBLE);
-                view.setText(R.string.not_installed);
-            } else if (!info.enabled || info.enabledSetting
-                    == PackageManager.COMPONENT_ENABLED_STATE_DISABLED_UNTIL_USED) {
-                view.setVisibility(View.VISIBLE);
-                view.setText(R.string.disabled);
-            } else {
-                view.setVisibility(View.GONE);
-            }
-        }
-
-        private void updateSummary(AppViewHolder holder) {
-            switch (mManageApplications.mListType) {
-                case LIST_TYPE_NOTIFICATION:
-                    if (holder.entry.extraInfo != null) {
-                        holder.summary.setText(InstalledAppDetails.getNotificationSummary(
-                                (AppRow) holder.entry.extraInfo, mContext));
-                    } else {
-                        holder.summary.setText(null);
-                    }
-                    break;
-
-                case LIST_TYPE_USAGE_ACCESS:
-                    if (holder.entry.extraInfo != null) {
-                        holder.summary.setText((new UsageState((PermissionState) holder.entry
-                                .extraInfo)).isPermissible()
-                                ? R.string.app_permission_summary_allowed
-                                : R.string.app_permission_summary_not_allowed);
-                    } else {
-                        holder.summary.setText(null);
-                    }
-                    break;
-
-                case LIST_TYPE_HIGH_POWER:
-                    holder.summary.setText(HighPowerDetail.getSummary(mContext, holder.entry));
-                    break;
-
-                case LIST_TYPE_OVERLAY:
-                    holder.summary.setText(DrawOverlayDetails.getSummary(mContext, holder.entry));
-                    break;
-
-                case LIST_TYPE_WRITE_SETTINGS:
-                    holder.summary.setText(WriteSettingsDetails.getSummary(mContext,
-                            holder.entry));
-                    break;
-
-                case LIST_TYPE_MANAGE_SOURCES:
-                    holder.summary.setText(ExternalSourcesDetails.getPreferenceSummary(mContext,
-                            holder.entry));
-                    break;
-
-                default:
-                    holder.updateSizeText(mManageApplications.mInvalidSizeStr, mWhichSize);
-                    break;
-            }
-        }
-
-        @Override
-        public Filter getFilter() {
-            return mFilter;
-        }
-
-        @Override
-        public void onMovedToScrapHeap(View view) {
-            mActive.remove(view);
-        }
-
-        @Override
-        public Object[] getSections() {
-            return mSections;
-        }
-
-        @Override
-        public int getPositionForSection(int sectionIndex) {
-            return mSections[sectionIndex].position;
-        }
-
-        @Override
-        public int getSectionForPosition(int position) {
-            return mPositionToSectionIndex[position];
-        }
-    }
-
-    private static class SummaryProvider implements SummaryLoader.SummaryProvider {
-
-        private final Context mContext;
-        private final SummaryLoader mLoader;
-        private ApplicationsState.Session mSession;
-
-        private SummaryProvider(Context context, SummaryLoader loader) {
-            mContext = context;
-            mLoader = loader;
-        }
-
-        @Override
-        public void setListening(boolean listening) {
-            if (listening) {
-                new InstalledAppCounter(mContext, InstalledAppCounter.IGNORE_INSTALL_REASON,
-                        new PackageManagerWrapperImpl(mContext.getPackageManager())) {
-                    @Override
-                    protected void onCountComplete(int num) {
-                        mLoader.setSummary(SummaryProvider.this,
-                                mContext.getString(R.string.apps_summary, num));
-                    }
-                }.execute();
-            }
-        }
-    }
-
-    private static class SectionInfo {
-        final String label;
-        final int position;
-
-        public SectionInfo(String label, int position) {
-            this.label = label;
-            this.position = position;
-        }
-
-        @Override
-        public String toString() {
-            return label;
-        }
-    }
-
-    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);
-        }
-    };
-}
diff --git a/src/com/android/settings/applications/ManageDomainUrls.java b/src/com/android/settings/applications/ManageDomainUrls.java
index 1d325ce..adf406a 100644
--- a/src/com/android/settings/applications/ManageDomainUrls.java
+++ b/src/com/android/settings/applications/ManageDomainUrls.java
@@ -23,6 +23,7 @@
 import android.os.UserHandle;
 import android.provider.Settings;
 import android.provider.Settings.Global;
+import android.support.annotation.VisibleForTesting;
 import android.support.v14.preference.SwitchPreference;
 import android.support.v7.preference.Preference;
 import android.support.v7.preference.Preference.OnPreferenceChangeListener;
@@ -37,6 +38,7 @@
 import com.android.settings.R;
 import com.android.settings.SettingsPreferenceFragment;
 import com.android.settings.Utils;
+import com.android.settings.widget.AppPreference;
 import com.android.settingslib.applications.ApplicationsState;
 import com.android.settingslib.applications.ApplicationsState.AppEntry;
 
@@ -63,37 +65,23 @@
     public void onCreate(Bundle icicle) {
         super.onCreate(icicle);
         setAnimationAllowed(true);
-        setPreferenceScreen(getPreferenceManager().createPreferenceScreen(getContext()));
         mApplicationsState = ApplicationsState.getInstance(
                 (Application) getContext().getApplicationContext());
-        mSession = mApplicationsState.newSession(this);
+        mSession = mApplicationsState.newSession(this, getLifecycle());
         setHasOptionsMenu(true);
     }
 
     @Override
+    protected int getPreferenceScreenResId() {
+        return R.xml.manage_domain_url_settings;
+    }
+
+    @Override
     public void onViewCreated(View view, Bundle savedInstanceState) {
         super.onViewCreated(view, savedInstanceState);
     }
 
     @Override
-    public void onResume() {
-        super.onResume();
-        mSession.resume();
-    }
-
-    @Override
-    public void onPause() {
-        super.onPause();
-        mSession.pause();
-    }
-
-    @Override
-    public void onDestroy() {
-        super.onDestroy();
-        mSession.release();
-    }
-
-    @Override
     public void onRunningStateChanged(boolean running) {
     }
 
@@ -186,7 +174,7 @@
             String key = entry.info.packageName + "|" + entry.info.uid;
             DomainAppPreference preference = (DomainAppPreference) getCachedPreference(key);
             if (preference == null) {
-                preference = new DomainAppPreference(getPrefContext(), entry);
+                preference = new DomainAppPreference(getPrefContext(), mApplicationsState, entry);
                 preference.setKey(key);
                 preference.setOnPreferenceClickListener(this);
                 group.addPreference(preference);
@@ -236,12 +224,16 @@
         return false;
     }
 
-    private class DomainAppPreference extends Preference {
+    @VisibleForTesting
+    static class DomainAppPreference extends AppPreference {
         private final AppEntry mEntry;
         private final PackageManager mPm;
+        private final ApplicationsState mApplicationsState;
 
-        public DomainAppPreference(final Context context, AppEntry entry) {
+        public DomainAppPreference(final Context context, ApplicationsState applicationsState,
+                AppEntry entry) {
             super(context);
+            mApplicationsState = applicationsState;
             mPm = context.getPackageManager();
             mEntry = entry;
             mEntry.ensureLabel(getContext());
diff --git a/src/com/android/settings/applications/MusicViewHolderController.java b/src/com/android/settings/applications/MusicViewHolderController.java
deleted file mode 100644
index af822a0..0000000
--- a/src/com/android/settings/applications/MusicViewHolderController.java
+++ /dev/null
@@ -1,92 +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.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;
-import android.text.format.Formatter;
-import android.util.Log;
-
-import com.android.settings.R;
-import com.android.settings.Utils;
-import com.android.settingslib.applications.StorageStatsSource;
-
-import java.io.IOException;
-
-/**
- * MusicViewHolderController controls an Audio/Music file view in the ManageApplications view.
- */
-public class MusicViewHolderController implements FileViewHolderController {
-    private static final String TAG = "MusicViewHolderController";
-
-    private static final String AUTHORITY_MEDIA = "com.android.providers.media.documents";
-    private static final int INSET_SIZE = 24; // dp
-
-    private Context mContext;
-    private StorageStatsSource mSource;
-    private String mVolumeUuid;
-    private long mMusicSize;
-    private UserHandle mUser;
-
-    public MusicViewHolderController(
-            Context context, StorageStatsSource source, String volumeUuid, UserHandle user) {
-        mContext = context;
-        mSource = source;
-        mVolumeUuid = volumeUuid;
-        mUser = user;
-    }
-
-    @Override
-    @WorkerThread
-    public void queryStats() {
-        try {
-            mMusicSize = mSource.getExternalStorageStats(mVolumeUuid, mUser).audioBytes;
-        } catch (IOException e) {
-            mMusicSize = 0;
-            Log.w(TAG, e);
-        }
-    }
-
-    @Override
-    public boolean shouldShow() {
-        return true;
-    }
-
-    @Override
-    public void setupView(AppViewHolder holder) {
-        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));
-    }
-
-    @Override
-    public void onClick(Fragment fragment) {
-        Intent intent = new Intent(Intent.ACTION_VIEW);
-        intent.setDataAndType(
-                DocumentsContract.buildRootUri(AUTHORITY_MEDIA, "audio_root"),
-                DocumentsContract.Root.MIME_TYPE_ITEM);
-        intent.addCategory(Intent.CATEGORY_DEFAULT);
-        intent.putExtra(Intent.EXTRA_USER_ID, mUser);
-        Utils.launchIntent(fragment, intent);
-    }
-}
diff --git a/src/com/android/settings/applications/NotificationApps.java b/src/com/android/settings/applications/NotificationApps.java
index f290d43..f921092 100644
--- a/src/com/android/settings/applications/NotificationApps.java
+++ b/src/com/android/settings/applications/NotificationApps.java
@@ -19,8 +19,10 @@
 import android.content.pm.ApplicationInfo;
 
 import com.android.settings.R;
+import com.android.settings.applications.manageapplications.ManageApplications;
 import com.android.settings.dashboard.SummaryLoader;
 import com.android.settings.notification.NotificationBackend;
+import com.android.settingslib.wrapper.PackageManagerWrapper;
 
 /**
  * Extension of ManageApplications with no changes other than having its own
@@ -39,7 +41,7 @@
             mContext = context;
             mLoader = loader;
             mNotificationBackend = new NotificationBackend();
-            mPackageManager = new PackageManagerWrapperImpl(mContext.getPackageManager());
+            mPackageManager = new PackageManagerWrapper(mContext.getPackageManager());
         }
 
         @Override
diff --git a/src/com/android/settings/applications/PackageManagerWrapper.java b/src/com/android/settings/applications/PackageManagerWrapper.java
deleted file mode 100644
index b0accdc..0000000
--- a/src/com/android/settings/applications/PackageManagerWrapper.java
+++ /dev/null
@@ -1,122 +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.content.ComponentName;
-import android.content.Intent;
-import android.content.IntentFilter;
-import android.content.pm.ApplicationInfo;
-import android.content.pm.IPackageDeleteObserver;
-import android.content.pm.PackageInfo;
-import android.content.pm.PackageManager;
-import android.content.pm.ResolveInfo;
-import android.os.UserHandle;
-import android.os.storage.VolumeInfo;
-
-import java.util.List;
-
-/**
- * This interface replicates a subset of the android.content.pm.PackageManager (PM). 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 PM, because some of the methods we rely on are newer than
- * the API version supported by Robolectric.
- */
-public interface PackageManagerWrapper {
-
-    /**
-     * Returns the real {@code PackageManager} object.
-     */
-    PackageManager getPackageManager();
-
-    /**
-     * Calls {@code PackageManager.getInstalledApplicationsAsUser()}.
-     *
-     * @see android.content.pm.PackageManager#getInstalledApplicationsAsUser
-     */
-    List<ApplicationInfo> getInstalledApplicationsAsUser(int flags, int userId);
-
-    /**
-     * Calls {@code PackageManager.getInstalledPackagesAsUser}
-     */
-    List<PackageInfo> getInstalledPackagesAsUser(int flags, int userId);
-
-    /**
-     * Calls {@code PackageManager.hasSystemFeature()}.
-     *
-     * @see android.content.pm.PackageManager#hasSystemFeature
-     */
-    boolean hasSystemFeature(String name);
-
-    /**
-     * Calls {@code PackageManager.queryIntentActivitiesAsUser()}.
-     *
-     * @see android.content.pm.PackageManager#queryIntentActivitiesAsUser
-     */
-    List<ResolveInfo> queryIntentActivitiesAsUser(Intent intent, int flags, int userId);
-
-    /**
-     * Calls {@code PackageManager.getInstallReason()}.
-     *
-     * @see android.content.pm.PackageManager#getInstallReason
-     */
-    int getInstallReason(String packageName, UserHandle user);
-
-    /**
-     * Calls {@code PackageManager.getApplicationInfoAsUser}
-     */
-    ApplicationInfo getApplicationInfoAsUser(String packageName, int i, int userId)
-            throws PackageManager.NameNotFoundException;
-
-    /**
-     * Calls {@code PackageManager.setDefaultBrowserPackageNameAsUser}
-     */
-    boolean setDefaultBrowserPackageNameAsUser(String packageName, int userId);
-
-    /**
-     * Calls {@code PackageManager.getDefaultBrowserPackageNameAsUser}
-     */
-    String getDefaultBrowserPackageNameAsUser(int userId);
-
-    /**
-     * Calls {@code PackageManager.getHomeActivities}
-     */
-    ComponentName getHomeActivities(List<ResolveInfo> homeActivities);
-
-    /**
-     * Calls {@code PackageManager.queryIntentServicesAsUser}
-     */
-    List<ResolveInfo> queryIntentServicesAsUser(Intent intent, int i, int user);
-
-    /**
-     * Calls {@code PackageManager.replacePreferredActivity}
-     */
-    void replacePreferredActivity(IntentFilter homeFilter, int matchCategoryEmpty,
-            ComponentName[] componentNames, ComponentName component);
-
-    /**
-     * Calls {@code PackageManager.getPrimaryStorageCurrentVolume}
-     */
-    VolumeInfo getPrimaryStorageCurrentVolume();
-
-    /**
-     * Calls {@code PackageManager.deletePackageAsUser}
-     */
-    void deletePackageAsUser(String packageName, IPackageDeleteObserver observer, int flags,
-            int userId);
-
-    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
deleted file mode 100644
index 021a80a..0000000
--- a/src/com/android/settings/applications/PackageManagerWrapperImpl.java
+++ /dev/null
@@ -1,118 +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.content.ComponentName;
-import android.content.Intent;
-import android.content.IntentFilter;
-import android.content.pm.ApplicationInfo;
-import android.content.pm.IPackageDeleteObserver;
-import android.content.pm.PackageInfo;
-import android.content.pm.PackageManager;
-import android.content.pm.ResolveInfo;
-import android.os.UserHandle;
-import android.os.storage.VolumeInfo;
-
-import java.util.List;
-
-public class PackageManagerWrapperImpl implements PackageManagerWrapper {
-
-    private final PackageManager mPm;
-
-    public PackageManagerWrapperImpl(PackageManager pm) {
-        mPm = pm;
-    }
-
-    @Override
-    public PackageManager getPackageManager() {
-        return mPm;
-    }
-
-    @Override
-    public List<ApplicationInfo> getInstalledApplicationsAsUser(int flags, int userId) {
-        return mPm.getInstalledApplicationsAsUser(flags, userId);
-    }
-
-    @Override
-    public List<PackageInfo> getInstalledPackagesAsUser(int flags, int userId) {
-        return mPm.getInstalledPackagesAsUser(flags, userId);
-    }
-
-    @Override
-    public boolean hasSystemFeature(String name) {
-        return mPm.hasSystemFeature(name);
-    }
-
-    @Override
-    public List<ResolveInfo> queryIntentActivitiesAsUser(Intent intent, int flags, int userId) {
-        return mPm.queryIntentActivitiesAsUser(intent, flags, userId);
-    }
-
-    @Override
-    public int getInstallReason(String packageName, UserHandle user) {
-        return mPm.getInstallReason(packageName, user);
-    }
-
-    @Override
-    public ApplicationInfo getApplicationInfoAsUser(String packageName, int i, int userId)
-            throws PackageManager.NameNotFoundException {
-        return mPm.getApplicationInfoAsUser(packageName, i, userId);
-    }
-
-    @Override
-    public boolean setDefaultBrowserPackageNameAsUser(String packageName, int userId) {
-        return mPm.setDefaultBrowserPackageNameAsUser(packageName, userId);
-    }
-
-    @Override
-    public String getDefaultBrowserPackageNameAsUser(int userId) {
-        return mPm.getDefaultBrowserPackageNameAsUser(userId);
-    }
-
-    @Override
-    public ComponentName getHomeActivities(List<ResolveInfo> homeActivities) {
-        return mPm.getHomeActivities(homeActivities);
-    }
-
-    @Override
-    public List<ResolveInfo> queryIntentServicesAsUser(Intent intent, int i, int user) {
-        return mPm.queryIntentServicesAsUser(intent, i, user);
-    }
-
-    @Override
-    public void replacePreferredActivity(IntentFilter homeFilter, int matchCategoryEmpty,
-            ComponentName[] componentNames, ComponentName component) {
-        mPm.replacePreferredActivity(homeFilter, matchCategoryEmpty, componentNames, component);
-    }
-
-    @Override
-    public VolumeInfo getPrimaryStorageCurrentVolume() {
-        return mPm.getPrimaryStorageCurrentVolume();
-    }
-
-    @Override
-    public void deletePackageAsUser(String packageName, IPackageDeleteObserver observer, int flags,
-            int userId) {
-        mPm.deletePackageAsUser(packageName, observer, flags, userId);
-    }
-
-    @Override
-    public int getPackageUidAsUser(String pkg, int userId)
-            throws PackageManager.NameNotFoundException {
-        return mPm.getPackageUidAsUser(pkg, userId);
-    }
-}
diff --git a/src/com/android/settings/applications/PhotosViewHolderController.java b/src/com/android/settings/applications/PhotosViewHolderController.java
deleted file mode 100644
index a652bb1..0000000
--- a/src/com/android/settings/applications/PhotosViewHolderController.java
+++ /dev/null
@@ -1,90 +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.app.Fragment;
-import android.content.Context;
-import android.content.Intent;
-import android.graphics.drawable.InsetDrawable;
-import android.os.UserHandle;
-import android.support.annotation.WorkerThread;
-import android.text.format.Formatter;
-import android.util.Log;
-
-import com.android.settings.R;
-import com.android.settings.Utils;
-import com.android.settingslib.applications.StorageStatsSource;
-
-import java.io.IOException;
-
-/** PhotosViewHolderController controls an Audio/Music file view in the ManageApplications view. */
-public class PhotosViewHolderController implements FileViewHolderController {
-    private static final String TAG = "PhotosViewHolderController";
-
-    private static final String IMAGE_MIME_TYPE = "image/*";
-    private static final int INSET_SIZE = 24; // dp
-
-    private Context mContext;
-    private StorageStatsSource mSource;
-    private String mVolumeUuid;
-    private long mFilesSize;
-    private UserHandle mUser;
-
-    public PhotosViewHolderController(
-            Context context, StorageStatsSource source, String volumeUuid, UserHandle user) {
-        mContext = context;
-        mSource = source;
-        mVolumeUuid = volumeUuid;
-        mUser = user;
-    }
-
-    @Override
-    @WorkerThread
-    public void queryStats() {
-        try {
-            StorageStatsSource.ExternalStorageStats stats =
-                    mSource.getExternalStorageStats(mVolumeUuid, mUser);
-            mFilesSize = stats.imageBytes + stats.videoBytes;
-        } catch (IOException e) {
-            mFilesSize = 0;
-            Log.w(TAG, e);
-        }
-    }
-
-    @Override
-    public boolean shouldShow() {
-        return true;
-    }
-
-    @Override
-    public void setupView(AppViewHolder holder) {
-        holder.appIcon.setImageDrawable(
-                new InsetDrawable(mContext.getDrawable(R.drawable.ic_photo_library), INSET_SIZE));
-        holder.appName.setText(mContext.getText(R.string.storage_detail_images));
-        holder.summary.setText(Formatter.formatFileSize(mContext, mFilesSize));
-    }
-
-    @Override
-    public void onClick(Fragment fragment) {
-        Intent intent = new Intent();
-        intent.setAction(android.content.Intent.ACTION_VIEW);
-        intent.setFlags(Intent.FLAG_ACTIVITY_NEW_DOCUMENT);
-        intent.setType(IMAGE_MIME_TYPE);
-        intent.putExtra(Intent.EXTRA_FROM_STORAGE, true);
-        Utils.launchIntent(fragment, intent);
-    }
-}
diff --git a/src/com/android/settings/applications/PictureInPictureSettings.java b/src/com/android/settings/applications/PictureInPictureSettings.java
index 79780d6..01d14f4 100644
--- a/src/com/android/settings/applications/PictureInPictureSettings.java
+++ b/src/com/android/settings/applications/PictureInPictureSettings.java
@@ -38,6 +38,10 @@
 import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
 import com.android.settings.R;
 import com.android.settings.notification.EmptyTextSettings;
+import com.android.settings.widget.AppPreference;
+import com.android.settings.wrapper.ActivityInfoWrapper;
+import com.android.settings.wrapper.UserManagerWrapper;
+import com.android.settingslib.wrapper.PackageManagerWrapper;
 
 import java.text.Collator;
 import java.util.ArrayList;
@@ -97,7 +101,7 @@
         if (activities != null) {
             wrappedActivities = new ActivityInfoWrapper[activities.length];
             for (int i = 0; i < activities.length; i++) {
-                wrappedActivities[i] = new ActivityInfoWrapperImpl(activities[i]);
+                wrappedActivities[i] = new ActivityInfoWrapper(activities[i]);
             }
         }
         return checkPackageHasPictureInPictureActivities(packageName, wrappedActivities);
@@ -141,10 +145,9 @@
         super.onCreate(icicle);
 
         mContext = getActivity();
-        mPackageManager = new PackageManagerWrapperImpl(mContext.getPackageManager());
-        mUserManager = new UserManagerWrapperImpl(mContext.getSystemService(UserManager.class));
+        mPackageManager = new PackageManagerWrapper(mContext.getPackageManager());
+        mUserManager = new UserManagerWrapper(mContext.getSystemService(UserManager.class));
         mIconDrawableFactory = IconDrawableFactory.newInstance(mContext);
-        setPreferenceScreen(getPreferenceManager().createPreferenceScreen(mContext));
     }
 
     @Override
@@ -171,7 +174,7 @@
             final String packageName = appInfo.packageName;
             final CharSequence label = appInfo.loadLabel(pm);
 
-            final Preference pref = new Preference(prefContext);
+            final Preference pref = new AppPreference(prefContext);
             pref.setIcon(mIconDrawableFactory.getBadgedIcon(appInfo, userId));
             pref.setTitle(pm.getUserBadgedLabel(label, user));
             pref.setSummary(PictureInPictureDetails.getPreferenceSummary(prefContext,
@@ -196,6 +199,11 @@
     }
 
     @Override
+    protected int getPreferenceScreenResId() {
+        return R.xml.picture_in_picture_settings;
+    }
+
+    @Override
     public int getMetricsCategory() {
         return MetricsEvent.SETTINGS_MANAGE_PICTURE_IN_PICTURE;
     }
diff --git a/src/com/android/settings/applications/PremiumSmsAccess.java b/src/com/android/settings/applications/PremiumSmsAccess.java
index d220a46..ab6ea24 100644
--- a/src/com/android/settings/applications/PremiumSmsAccess.java
+++ b/src/com/android/settings/applications/PremiumSmsAccess.java
@@ -28,17 +28,16 @@
 import com.android.internal.annotations.VisibleForTesting;
 import com.android.internal.logging.nano.MetricsProto;
 import com.android.internal.telephony.SmsUsageMonitor;
-import com.android.settings.DividerPreference;
 import com.android.settings.R;
 import com.android.settings.applications.AppStateBaseBridge.Callback;
 import com.android.settings.applications.AppStateSmsPremBridge.SmsState;
-import com.android.settings.core.instrumentation.MetricsFeatureProvider;
 import com.android.settings.notification.EmptyTextSettings;
 import com.android.settings.overlay.FeatureFactory;
 import com.android.settingslib.applications.ApplicationsState;
 import com.android.settingslib.applications.ApplicationsState.AppEntry;
 import com.android.settingslib.applications.ApplicationsState.Callbacks;
 import com.android.settingslib.applications.ApplicationsState.Session;
+import com.android.settingslib.widget.FooterPreference;
 
 import java.util.ArrayList;
 
@@ -53,7 +52,7 @@
         super.onCreate(icicle);
         mApplicationsState = ApplicationsState.getInstance((Application)
                 getContext().getApplicationContext());
-        mSession = mApplicationsState.newSession(this);
+        mSession = mApplicationsState.newSession(this, getLifecycle());
         mSmsBackend = new AppStateSmsPremBridge(getContext(), mApplicationsState, this);
     }
 
@@ -66,25 +65,27 @@
     @Override
     public void onResume() {
         super.onResume();
-        mSession.resume();
         mSmsBackend.resume();
     }
 
     @Override
     public void onPause() {
         mSmsBackend.pause();
-        mSession.pause();
         super.onPause();
     }
 
     @Override
     public void onDestroy() {
         mSmsBackend.release();
-        mSession.release();
         super.onDestroy();
     }
 
     @Override
+    protected int getPreferenceScreenResId() {
+        return R.xml.premium_sms_settings;
+    }
+
+    @Override
     public int getMetricsCategory() {
         return MetricsProto.MetricsEvent.PREMIUM_SMS_ACCESS;
     }
@@ -123,8 +124,8 @@
         if (apps == null) return;
         setEmptyText(R.string.premium_sms_none);
         setLoading(false, true);
-        final PreferenceScreen screen = getPreferenceManager().createPreferenceScreen(
-                getPrefContext());
+        final PreferenceScreen screen = getPreferenceScreen();
+        screen.removeAll();
         screen.setOrderingAsAdded(true);
 
         for (int i = 0; i < apps.size(); i++) {
@@ -134,14 +135,10 @@
             screen.addPreference(smsPreference);
         }
         if (apps.size() != 0) {
-            DividerPreference summary = new DividerPreference(getPrefContext());
-            summary.setSelectable(false);
-            summary.setSummary(R.string.premium_sms_warning);
-            summary.setDividerAllowedAbove(true);
-            screen.addPreference(summary);
+            FooterPreference footer = new FooterPreference(getPrefContext());
+            footer.setTitle(R.string.premium_sms_warning);
+            screen.addPreference(footer);
         }
-
-        setPreferenceScreen(screen);
     }
 
     private void update() {
diff --git a/src/com/android/settings/applications/ProcStatsData.java b/src/com/android/settings/applications/ProcStatsData.java
index dd85dd2..c1ec070 100644
--- a/src/com/android/settings/applications/ProcStatsData.java
+++ b/src/com/android/settings/applications/ProcStatsData.java
@@ -372,6 +372,10 @@
         double totalScale;
         long memTotalTime;
 
+        public double getWeightToRam() {
+            return weightToRam;
+        }
+
         private MemInfo(Context context, ProcessStats.TotalMemoryUseCollection totalMem,
                 long memTotalTime) {
             this.memTotalTime = memTotalTime;
diff --git a/src/com/android/settings/applications/ProcStatsEntry.java b/src/com/android/settings/applications/ProcStatsEntry.java
index 90ef5d7..2388a04 100644
--- a/src/com/android/settings/applications/ProcStatsEntry.java
+++ b/src/com/android/settings/applications/ProcStatsEntry.java
@@ -297,6 +297,10 @@
         }
     }
 
+    public int getUid() {
+        return mUid;
+    }
+
     public static final Parcelable.Creator<ProcStatsEntry> CREATOR
             = new Parcelable.Creator<ProcStatsEntry>() {
         public ProcStatsEntry createFromParcel(Parcel in) {
diff --git a/src/com/android/settings/applications/ProcStatsPackageEntry.java b/src/com/android/settings/applications/ProcStatsPackageEntry.java
index 39a0042..88d5bd6 100644
--- a/src/com/android/settings/applications/ProcStatsPackageEntry.java
+++ b/src/com/android/settings/applications/ProcStatsPackageEntry.java
@@ -175,4 +175,17 @@
                     Utils.formatPercentage((int) (amount * 100)));
         }
     }
+
+    public double getRunWeight() {
+        return mRunWeight;
+    }
+
+    public double getBgWeight() {
+        return mBgWeight;
+    }
+
+    public ArrayList<ProcStatsEntry> getEntries() {
+        return mEntries;
+    }
+
 }
diff --git a/src/com/android/settings/applications/ProcessStatsBase.java b/src/com/android/settings/applications/ProcessStatsBase.java
index 3f66789..b98d0ba 100644
--- a/src/com/android/settings/applications/ProcessStatsBase.java
+++ b/src/com/android/settings/applications/ProcessStatsBase.java
@@ -44,7 +44,7 @@
     // smaller than the actual time selected instead of bumping up to 3 hours
     // beyond it.
     private static final long DURATION_QUANTUM = ProcessStats.COMMIT_PERIOD;
-    protected static long[] sDurations = new long[] {
+    public  static long[] sDurations = new long[] {
         3 * 60 * 60 * 1000 - DURATION_QUANTUM / 2, 6 * 60 *60 * 1000 - DURATION_QUANTUM / 2,
         12 * 60 * 60 * 1000 - DURATION_QUANTUM / 2, 24 * 60 * 60 * 1000 - DURATION_QUANTUM / 2
     };
diff --git a/src/com/android/settings/applications/ProcessStatsMemDetail.java b/src/com/android/settings/applications/ProcessStatsMemDetail.java
deleted file mode 100644
index b38aaf6..0000000
--- a/src/com/android/settings/applications/ProcessStatsMemDetail.java
+++ /dev/null
@@ -1,160 +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.applications;
-
-import android.os.Bundle;
-import android.text.format.Formatter;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.ProgressBar;
-import android.widget.TextView;
-
-import com.android.internal.app.procstats.ProcessStats;
-import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
-import com.android.settings.core.InstrumentedPreferenceFragment;
-import com.android.settings.R;
-
-import static com.android.settings.Utils.prepareCustomPreferencesList;
-
-public class ProcessStatsMemDetail extends InstrumentedPreferenceFragment {
-    public static final String EXTRA_MEM_TIMES = "mem_times";
-    public static final String EXTRA_MEM_STATE_WEIGHTS = "mem_state_weights";
-    public static final String EXTRA_MEM_CACHED_WEIGHT = "mem_cached_weight";
-    public static final String EXTRA_MEM_FREE_WEIGHT = "mem_free_weight";
-    public static final String EXTRA_MEM_ZRAM_WEIGHT = "mem_zram_weight";
-    public static final String EXTRA_MEM_KERNEL_WEIGHT = "mem_kernel_weight";
-    public static final String EXTRA_MEM_NATIVE_WEIGHT = "mem_native_weight";
-    public static final String EXTRA_MEM_TOTAL_WEIGHT = "mem_total_weight";
-    public static final String EXTRA_USE_USS = "use_uss";
-    public static final String EXTRA_TOTAL_TIME = "total_time";
-
-    long[] mMemTimes;
-    double[] mMemStateWeights;
-    double mMemCachedWeight;
-    double mMemFreeWeight;
-    double mMemZRamWeight;
-    double mMemKernelWeight;
-    double mMemNativeWeight;
-    double mMemTotalWeight;
-    boolean mUseUss;
-    long mTotalTime;
-
-    private View mRootView;
-    private ViewGroup mMemStateParent;
-    private ViewGroup mMemUseParent;
-
-    @Override
-    public void onCreate(Bundle icicle) {
-        super.onCreate(icicle);
-        final Bundle args = getArguments();
-        mMemTimes = args.getLongArray(EXTRA_MEM_TIMES);
-        mMemStateWeights = args.getDoubleArray(EXTRA_MEM_STATE_WEIGHTS);
-        mMemCachedWeight = args.getDouble(EXTRA_MEM_CACHED_WEIGHT);
-        mMemFreeWeight = args.getDouble(EXTRA_MEM_FREE_WEIGHT);
-        mMemZRamWeight = args.getDouble(EXTRA_MEM_ZRAM_WEIGHT);
-        mMemKernelWeight = args.getDouble(EXTRA_MEM_KERNEL_WEIGHT);
-        mMemNativeWeight = args.getDouble(EXTRA_MEM_NATIVE_WEIGHT);
-        mMemTotalWeight = args.getDouble(EXTRA_MEM_TOTAL_WEIGHT);
-        mUseUss = args.getBoolean(EXTRA_USE_USS);
-        mTotalTime = args.getLong(EXTRA_TOTAL_TIME);
-    }
-
-    @Override
-    public View onCreateView(
-            LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
-        final View view = inflater.inflate(R.layout.process_stats_mem_details, container, false);
-        prepareCustomPreferencesList(container, view, view, false);
-
-        mRootView = view;
-        createDetails();
-        return view;
-    }
-
-    @Override
-    public int getMetricsCategory() {
-        return MetricsEvent.APPLICATIONS_PROCESS_STATS_MEM_DETAIL;
-    }
-
-    @Override
-    public void onPause() {
-        super.onPause();
-    }
-
-    private void createDetails() {
-        mMemStateParent = (ViewGroup)mRootView.findViewById(R.id.mem_state);
-        mMemUseParent = (ViewGroup)mRootView.findViewById(R.id.mem_use);
-
-        fillMemStateSection();
-        fillMemUseSection();
-    }
-
-    private void addDetailsItem(ViewGroup parent, CharSequence title,
-            float level, CharSequence value) {
-        LayoutInflater inflater = getActivity().getLayoutInflater();
-        ViewGroup item = (ViewGroup) inflater.inflate(R.layout.app_item, null);
-        inflater.inflate(R.layout.widget_progress_bar,
-                (ViewGroup) item.findViewById(android.R.id.widget_frame));
-        parent.addView(item);
-        item.findViewById(android.R.id.icon).setVisibility(View.GONE);
-        TextView titleView = (TextView) item.findViewById(android.R.id.title);
-        TextView valueView = (TextView) item.findViewById(android.R.id.text1);
-        titleView.setText(title);
-        valueView.setText(value);
-        ProgressBar progress = (ProgressBar) item.findViewById(android.R.id.progress);
-        progress.setProgress(Math.round(level*100));
-    }
-
-    private void fillMemStateSection() {
-        CharSequence[] labels = getResources().getTextArray(R.array.proc_stats_memory_states);
-        for (int i=0; i<ProcessStats.ADJ_MEM_FACTOR_COUNT; i++) {
-            if (mMemTimes[i] > 0) {
-                float level = ((float)mMemTimes[i])/mTotalTime;
-                addDetailsItem(mMemStateParent, labels[i], level,
-                        Formatter.formatShortElapsedTime(getActivity(), mMemTimes[i]));
-            }
-        }
-    }
-
-    private void addMemUseDetailsItem(ViewGroup parent, CharSequence title, double weight) {
-        if (weight > 0) {
-            float level = (float)(weight/mMemTotalWeight);
-            String value = Formatter.formatShortFileSize(getActivity(),
-                    (long)((weight * 1024) / mTotalTime));
-            addDetailsItem(parent, title, level, value);
-        }
-    }
-
-    private void fillMemUseSection() {
-        CharSequence[] labels = getResources().getTextArray(R.array.proc_stats_process_states);
-        addMemUseDetailsItem(mMemUseParent,
-                getResources().getText(R.string.mem_use_kernel_type), mMemKernelWeight);
-        addMemUseDetailsItem(mMemUseParent,
-                getResources().getText(R.string.mem_use_zram_type), mMemZRamWeight);
-        addMemUseDetailsItem(mMemUseParent,
-                getResources().getText(R.string.mem_use_native_type), mMemNativeWeight);
-        for (int i=0; i<ProcessStats.STATE_COUNT; i++) {
-            addMemUseDetailsItem(mMemUseParent, labels[i], mMemStateWeights[i]);
-        }
-        addMemUseDetailsItem(mMemUseParent,
-                getResources().getText(R.string.mem_use_kernel_cache_type), mMemCachedWeight);
-        addMemUseDetailsItem(mMemUseParent,
-                getResources().getText(R.string.mem_use_free_type), mMemFreeWeight);
-        addMemUseDetailsItem(mMemUseParent,
-                getResources().getText(R.string.mem_use_total), mMemTotalWeight);
-    }
-}
diff --git a/src/com/android/settings/applications/ProcessStatsPreference.java b/src/com/android/settings/applications/ProcessStatsPreference.java
index 4ee0a04..034a68d 100644
--- a/src/com/android/settings/applications/ProcessStatsPreference.java
+++ b/src/com/android/settings/applications/ProcessStatsPreference.java
@@ -18,14 +18,13 @@
 
 import android.content.Context;
 import android.content.pm.PackageManager;
-import android.graphics.drawable.ColorDrawable;
 import android.text.TextUtils;
 import android.text.format.Formatter;
 
 import android.util.Log;
-import com.android.settings.AppProgressPreference;
+import com.android.settings.widget.AppPreference;
 
-public class ProcessStatsPreference extends AppProgressPreference {
+public class ProcessStatsPreference extends AppPreference {
     static final String TAG = "ProcessStatsPreference";
 
     private ProcStatsPackageEntry mEntry;
diff --git a/src/com/android/settings/applications/ProcessStatsSummary.java b/src/com/android/settings/applications/ProcessStatsSummary.java
index cdb8a4c..75f8ba6 100644
--- a/src/com/android/settings/applications/ProcessStatsSummary.java
+++ b/src/com/android/settings/applications/ProcessStatsSummary.java
@@ -103,7 +103,7 @@
     }
 
     @Override
-    protected int getHelpResource() {
+    public int getHelpResource() {
         return R.string.help_uri_process_stats_summary;
     }
 
diff --git a/src/com/android/settings/applications/ProcessStatsUi.java b/src/com/android/settings/applications/ProcessStatsUi.java
index 9f76fb2..cb2a1eb 100644
--- a/src/com/android/settings/applications/ProcessStatsUi.java
+++ b/src/com/android/settings/applications/ProcessStatsUi.java
@@ -96,7 +96,7 @@
     }
 
     @Override
-    protected int getHelpResource() {
+    public int getHelpResource() {
         return R.string.help_uri_process_stats_apps;
     }
 
diff --git a/src/com/android/settings/applications/RecentAppsPreferenceController.java b/src/com/android/settings/applications/RecentAppsPreferenceController.java
index d0f7584..c613a7b 100644
--- a/src/com/android/settings/applications/RecentAppsPreferenceController.java
+++ b/src/com/android/settings/applications/RecentAppsPreferenceController.java
@@ -34,14 +34,18 @@
 import android.text.TextUtils;
 import android.util.ArrayMap;
 import android.util.ArraySet;
+import android.util.FeatureFlagUtils;
 import android.util.IconDrawableFactory;
 import android.util.Log;
 
 import com.android.settings.R;
 import com.android.settings.Utils;
+import com.android.settings.core.FeatureFlags;
 import com.android.settings.core.PreferenceControllerMixin;
+import com.android.settings.widget.AppPreference;
 import com.android.settingslib.applications.ApplicationsState;
 import com.android.settingslib.core.AbstractPreferenceController;
+import com.android.settingslib.wrapper.PackageManagerWrapper;
 
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -143,7 +147,7 @@
         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())) {
+                new PackageManagerWrapper(mContext.getPackageManager())) {
             @Override
             protected void onCountComplete(int num) {
                 if (mHasRecentApps) {
@@ -229,22 +233,27 @@
             boolean rebindPref = true;
             Preference pref = appPreferences.remove(pkgName);
             if (pref == null) {
-                pref = new Preference(prefContext);
+                pref = new AppPreference(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.setSummary(Utils.formatRelativeTime(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 (FeatureFlagUtils.isEnabled(mContext, FeatureFlags.APP_INFO_V2)) {
+                    AppInfoBase.startAppInfoFragment(AppInfoDashboardFragment.class,
+                            R.string.application_info_label, pkgName, appEntry.info.uid, mHost,
+                            1001 /*RequestCode*/, SETTINGS_APP_NOTIF_CATEGORY);
+                    return true;
+                } else {
+                    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);
diff --git a/src/com/android/settings/applications/ResetAppPrefPreferenceController.java b/src/com/android/settings/applications/ResetAppPrefPreferenceController.java
deleted file mode 100644
index 2766c59..0000000
--- a/src/com/android/settings/applications/ResetAppPrefPreferenceController.java
+++ /dev/null
@@ -1,72 +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.applications;
-
-import android.content.Context;
-import android.os.Bundle;
-import android.support.v7.preference.Preference;
-import android.text.TextUtils;
-
-import com.android.settings.core.PreferenceControllerMixin;
-import com.android.settingslib.core.AbstractPreferenceController;
-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 AbstractPreferenceController
-        implements PreferenceControllerMixin, LifecycleObserver, OnCreate, OnSaveInstanceState {
-
-    private ResetAppsHelper mResetAppsHelper;
-
-    public ResetAppPrefPreferenceController(Context context, Lifecycle lifecycle) {
-        super(context);
-        mResetAppsHelper = new ResetAppsHelper(context);
-        if (lifecycle != null) {
-            lifecycle.addObserver(this);
-        }
-    }
-
-    @Override
-    public boolean handlePreferenceTreeClick(Preference preference) {
-        if (!TextUtils.equals(preference.getKey(), getPreferenceKey())) {
-            return false;
-        }
-        mResetAppsHelper.buildResetDialog();
-        return true;
-    }
-
-    @Override
-    public boolean isAvailable() {
-        return true;
-    }
-
-    @Override
-    public String getPreferenceKey() {
-        return "reset_app_prefs";
-    }
-
-    @Override
-    public void onCreate(Bundle savedInstanceState) {
-        mResetAppsHelper.onRestoreInstanceState(savedInstanceState);
-    }
-
-    @Override
-    public void onSaveInstanceState(Bundle outState) {
-        mResetAppsHelper.onSaveInstanceState(outState);
-    }
-}
diff --git a/src/com/android/settings/applications/ResetAppsHelper.java b/src/com/android/settings/applications/ResetAppsHelper.java
deleted file mode 100644
index 93d384d..0000000
--- a/src/com/android/settings/applications/ResetAppsHelper.java
+++ /dev/null
@@ -1,157 +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.applications;
-
-import static android.net.NetworkPolicyManager.POLICY_NONE;
-import static android.net.NetworkPolicyManager.POLICY_REJECT_METERED_BACKGROUND;
-
-import android.app.ActivityManager;
-import android.app.AlertDialog;
-import android.app.AppOpsManager;
-import android.app.INotificationManager;
-import android.content.Context;
-import android.content.DialogInterface;
-import android.content.pm.ApplicationInfo;
-import android.content.pm.IPackageManager;
-import android.content.pm.PackageManager;
-import android.net.NetworkPolicyManager;
-import android.os.AsyncTask;
-import android.os.Bundle;
-import android.os.RemoteException;
-import android.os.ServiceManager;
-import android.os.UserHandle;
-import android.webkit.IWebViewUpdateService;
-
-import com.android.settings.R;
-
-import java.util.List;
-
-public class ResetAppsHelper implements DialogInterface.OnClickListener,
-        DialogInterface.OnDismissListener {
-
-    private static final String EXTRA_RESET_DIALOG = "resetDialog";
-
-    private final PackageManager mPm;
-    private final IPackageManager mIPm;
-    private final INotificationManager mNm;
-    private final IWebViewUpdateService mWvus;
-    private final NetworkPolicyManager mNpm;
-    private final AppOpsManager mAom;
-    private final Context mContext;
-
-    private AlertDialog mResetDialog;
-
-    public ResetAppsHelper(Context context) {
-        mContext = context;
-        mPm = context.getPackageManager();
-        mIPm = IPackageManager.Stub.asInterface(ServiceManager.getService("package"));
-        mNm = INotificationManager.Stub.asInterface(
-                ServiceManager.getService(Context.NOTIFICATION_SERVICE));
-        mWvus = IWebViewUpdateService.Stub.asInterface(ServiceManager.getService("webviewupdate"));
-        mNpm = NetworkPolicyManager.from(context);
-        mAom = (AppOpsManager) context.getSystemService(Context.APP_OPS_SERVICE);
-    }
-
-    public void onRestoreInstanceState(Bundle savedInstanceState) {
-        if (savedInstanceState != null && savedInstanceState.getBoolean(EXTRA_RESET_DIALOG)) {
-            buildResetDialog();
-        }
-    }
-
-    public void onSaveInstanceState(Bundle outState) {
-        if (mResetDialog != null) {
-            outState.putBoolean(EXTRA_RESET_DIALOG, true);
-        }
-    }
-
-    public void stop() {
-        if (mResetDialog != null) {
-            mResetDialog.dismiss();
-            mResetDialog = null;
-        }
-    }
-
-    void buildResetDialog() {
-        if (mResetDialog == null) {
-            mResetDialog = new AlertDialog.Builder(mContext)
-                    .setTitle(R.string.reset_app_preferences_title)
-                    .setMessage(R.string.reset_app_preferences_desc)
-                    .setPositiveButton(R.string.reset_app_preferences_button, this)
-                    .setNegativeButton(R.string.cancel, null)
-                    .setOnDismissListener(this)
-                    .show();
-        }
-    }
-
-    @Override
-    public void onDismiss(DialogInterface dialog) {
-        if (mResetDialog == dialog) {
-            mResetDialog = null;
-        }
-    }
-
-    @Override
-    public void onClick(DialogInterface dialog, int which) {
-        if (mResetDialog != dialog) {
-            return;
-        }
-        AsyncTask.execute(new Runnable() {
-            @Override
-            public void run() {
-                List<ApplicationInfo> apps = mPm.getInstalledApplications(
-                        PackageManager.GET_DISABLED_COMPONENTS);
-                for (int i = 0; i < apps.size(); i++) {
-                    ApplicationInfo app = apps.get(i);
-                    try {
-                        mNm.setNotificationsEnabledForPackage(app.packageName, app.uid, true);
-                    } catch (android.os.RemoteException ex) {
-                    }
-                    if (!app.enabled) {
-                        if (mPm.getApplicationEnabledSetting(app.packageName)
-                                == PackageManager.COMPONENT_ENABLED_STATE_DISABLED_USER
-                                && !isNonEnableableFallback(app.packageName)) {
-                            mPm.setApplicationEnabledSetting(app.packageName,
-                                    PackageManager.COMPONENT_ENABLED_STATE_DEFAULT,
-                                    PackageManager.DONT_KILL_APP);
-                        }
-                    }
-                }
-                try {
-                    mIPm.resetApplicationPreferences(UserHandle.myUserId());
-                } catch (RemoteException e) {
-                }
-                mAom.resetAllModes();
-                final int[] restrictedUids = mNpm.getUidsWithPolicy(
-                        POLICY_REJECT_METERED_BACKGROUND);
-                final int currentUserId = ActivityManager.getCurrentUser();
-                for (int uid : restrictedUids) {
-                    // Only reset for current user
-                    if (UserHandle.getUserId(uid) == currentUserId) {
-                        mNpm.setUidPolicy(uid, POLICY_NONE);
-                    }
-                }
-            }
-        });
-    }
-
-    private boolean isNonEnableableFallback(String packageName) {
-        try {
-            return mWvus.isFallbackPackage(packageName);
-        } catch (RemoteException e) {
-            throw new RuntimeException(e);
-        }
-    }
-}
diff --git a/src/com/android/settings/applications/RunningServiceDetails.java b/src/com/android/settings/applications/RunningServiceDetails.java
index 84c2ee5..7e73a9b 100644
--- a/src/com/android/settings/applications/RunningServiceDetails.java
+++ b/src/com/android/settings/applications/RunningServiceDetails.java
@@ -21,7 +21,6 @@
 import android.content.res.Resources;
 import android.os.Bundle;
 import android.os.Debug;
-import android.os.Handler;
 import android.os.SystemClock;
 import android.os.UserHandle;
 import android.provider.Settings;
@@ -37,6 +36,7 @@
 import com.android.settings.Utils;
 import com.android.settings.core.InstrumentedPreferenceFragment;
 import com.android.settings.core.instrumentation.InstrumentedDialogFragment;
+import com.android.settingslib.utils.ThreadUtils;
 
 import java.io.File;
 import java.io.FileInputStream;
@@ -481,15 +481,12 @@
             addDetailViews();
         }
     }
-    
+
     private void finish() {
-        (new Handler()).post(new Runnable() {
-            @Override
-            public void run() {
-                Activity a = getActivity();
-                if (a != null) {
-                    a.onBackPressed();
-                }
+        ThreadUtils.postOnMainThread(() -> {
+            final Activity a = getActivity();
+            if (a != null) {
+                a.onBackPressed();
             }
         });
     }
diff --git a/src/com/android/settings/applications/RunningServices.java b/src/com/android/settings/applications/RunningServices.java
index 634fefd..4e3d629 100644
--- a/src/com/android/settings/applications/RunningServices.java
+++ b/src/com/android/settings/applications/RunningServices.java
@@ -43,6 +43,8 @@
         super.onCreate(savedInstanceState);
 
         setHasOptionsMenu(true);
+
+        getActivity().setTitle(R.string.runningservices_settings_title);
     }
 
     @Override
diff --git a/src/com/android/settings/applications/ShortcutPreference.java b/src/com/android/settings/applications/ShortcutPreference.java
index 91b41b7..9505e89 100644
--- a/src/com/android/settings/applications/ShortcutPreference.java
+++ b/src/com/android/settings/applications/ShortcutPreference.java
@@ -21,7 +21,12 @@
 import com.android.internal.logging.nano.MetricsProto;
 import com.android.settings.SettingsActivity;
 import com.android.settings.Utils;
+import com.android.settings.applications.appinfo.DefaultAppShortcutPreferenceControllerBase;
 
+/**
+ * deprecated in favor of {@link DefaultAppShortcutPreferenceControllerBase}
+ */
+@Deprecated
 public class ShortcutPreference extends Preference {
 
     private final Class mTarget;
diff --git a/src/com/android/settings/applications/UsageAccessDetails.java b/src/com/android/settings/applications/UsageAccessDetails.java
index 253ddfd..c10fb55 100644
--- a/src/com/android/settings/applications/UsageAccessDetails.java
+++ b/src/com/android/settings/applications/UsageAccessDetails.java
@@ -137,9 +137,13 @@
 
     @Override
     protected boolean refreshUi() {
-        if (mPackageInfo == null) {
+        retrieveAppEntry();
+        if (mAppEntry == null) {
             return false;
         }
+        if (mPackageInfo == null) {
+            return false; // onCreate must have failed, make sure to exit
+        }
         mUsageState = mUsageBridge.getUsageInfo(mPackageName,
                 mPackageInfo.applicationInfo.uid);
 
diff --git a/src/com/android/settings/applications/UserManagerWrapper.java b/src/com/android/settings/applications/UserManagerWrapper.java
deleted file mode 100644
index 5a86285..0000000
--- a/src/com/android/settings/applications/UserManagerWrapper.java
+++ /dev/null
@@ -1,33 +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.applications;
-
-import android.content.pm.UserInfo;
-
-import java.util.List;
-
-/**
- * This interface replicates a subset of the android.os.UserManager. The interface
- * exists so that we can use a thin wrapper around the UserManager in production code and a mock in
- * tests. We cannot directly mock or shadow the UserManager, because some of the methods we rely on
- * are newer than the API version supported by Robolectric or are hidden.
- */
-public interface UserManagerWrapper {
-    UserInfo getPrimaryUser();
-    List<UserInfo> getUsers();
-    List<UserInfo> getProfiles(int userHandle);
-}
diff --git a/src/com/android/settings/applications/UserManagerWrapperImpl.java b/src/com/android/settings/applications/UserManagerWrapperImpl.java
deleted file mode 100644
index 26ffc3e..0000000
--- a/src/com/android/settings/applications/UserManagerWrapperImpl.java
+++ /dev/null
@@ -1,45 +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.applications;
-
-import android.content.pm.UserInfo;
-import android.os.UserManager;
-
-import java.util.List;
-
-public class UserManagerWrapperImpl implements UserManagerWrapper {
-    private UserManager mUserManager;
-
-    public UserManagerWrapperImpl(UserManager userManager) {
-        mUserManager = userManager;
-    }
-
-    @Override
-    public UserInfo getPrimaryUser() {
-        return mUserManager.getPrimaryUser();
-    }
-
-    @Override
-    public List<UserInfo> getUsers() {
-        return mUserManager.getUsers();
-    }
-
-    @Override
-    public List<UserInfo> getProfiles(int userHandle) {
-        return mUserManager.getProfiles(userHandle);
-    }
-}
diff --git a/src/com/android/settings/applications/VrListenerSettings.java b/src/com/android/settings/applications/VrListenerSettings.java
index 99340b1..e40e3f9 100644
--- a/src/com/android/settings/applications/VrListenerSettings.java
+++ b/src/com/android/settings/applications/VrListenerSettings.java
@@ -58,6 +58,11 @@
         return super.setEnabled(service, title, enable);
     }
 
+    @Override
+    protected int getPreferenceScreenResId() {
+        return R.xml.vr_listeners_settings;
+    }
+
     @VisibleForTesting
     void logSpecialPermissionChange(boolean enable, String packageName) {
         int logCategory = enable ? MetricsEvent.APP_SPECIAL_PERMISSION_VRHELPER_ALLOW
diff --git a/src/com/android/settings/applications/appinfo/AppBatteryPreferenceController.java b/src/com/android/settings/applications/appinfo/AppBatteryPreferenceController.java
new file mode 100644
index 0000000..d341d53
--- /dev/null
+++ b/src/com/android/settings/applications/appinfo/AppBatteryPreferenceController.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.applications.appinfo;
+
+import android.app.LoaderManager;
+import android.app.slice.Slice;
+import android.content.Context;
+import android.content.Loader;
+import android.content.pm.PackageInfo;
+import android.os.BatteryStats;
+import android.os.Bundle;
+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.os.BatterySipper;
+import com.android.internal.os.BatteryStatsHelper;
+import com.android.settings.R;
+import com.android.settings.SettingsActivity;
+import com.android.settings.Utils;
+import com.android.settings.applications.AppInfoDashboardFragment;
+import com.android.settings.core.BasePreferenceController;
+import com.android.settings.fuelgauge.AdvancedPowerUsageDetail;
+import com.android.settings.fuelgauge.BatteryEntry;
+import com.android.settings.fuelgauge.BatteryStatsHelperLoader;
+import com.android.settings.fuelgauge.BatteryUtils;
+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.ArrayList;
+import java.util.List;
+
+public class AppBatteryPreferenceController extends BasePreferenceController
+        implements LoaderManager.LoaderCallbacks<BatteryStatsHelper>,
+        LifecycleObserver, OnResume, OnPause {
+
+    private static final String KEY_BATTERY = "battery";
+
+    @VisibleForTesting
+    BatterySipper mSipper;
+    @VisibleForTesting
+    BatteryStatsHelper mBatteryHelper;
+    @VisibleForTesting
+    BatteryUtils mBatteryUtils;
+
+    private Preference mPreference;
+    private final AppInfoDashboardFragment mParent;
+    private String mBatteryPercent;
+    private final String mPackageName;
+
+    public AppBatteryPreferenceController(Context context, AppInfoDashboardFragment parent,
+            String packageName, Lifecycle lifecycle) {
+        super(context, KEY_BATTERY);
+        mParent = parent;
+        mBatteryUtils = BatteryUtils.getInstance(mContext);
+        mPackageName = packageName;
+        if (lifecycle != null) {
+            lifecycle.addObserver(this);
+        }
+    }
+
+    @Override
+    public int getAvailabilityStatus() {
+        return AVAILABLE;
+    }
+
+    @Override
+    public Slice getSettingSlice() {
+        return null;
+    }
+
+    @Override
+    public void displayPreference(PreferenceScreen screen) {
+        super.displayPreference(screen);
+        mPreference = screen.findPreference(getPreferenceKey());
+        mPreference.setEnabled(false);
+    }
+
+    @Override
+    public boolean handlePreferenceTreeClick(Preference preference) {
+        if (!KEY_BATTERY.equals(preference.getKey())) {
+            return false;
+        }
+        if (isBatteryStatsAvailable()) {
+            final UserManager userManager =
+                    (UserManager) mContext.getSystemService(Context.USER_SERVICE);
+            final BatteryEntry entry = new BatteryEntry(mContext, null, userManager, mSipper);
+            entry.defaultPackageName = mPackageName;
+            AdvancedPowerUsageDetail.startBatteryDetailPage(
+                    (SettingsActivity) mParent.getActivity(), mParent, mBatteryHelper,
+                    BatteryStats.STATS_SINCE_CHARGED, entry, mBatteryPercent,
+                    null /* mAnomalies */);
+        } else {
+            AdvancedPowerUsageDetail.startBatteryDetailPage(
+                    (SettingsActivity) mParent.getActivity(), mParent, mPackageName);
+        }
+        return true;
+    }
+
+    @Override
+    public void onResume() {
+        mParent.getLoaderManager().restartLoader(
+                mParent.LOADER_BATTERY, Bundle.EMPTY, this);
+    }
+
+    @Override
+    public void onPause() {
+        mParent.getLoaderManager().destroyLoader(mParent.LOADER_BATTERY);
+    }
+
+    @Override
+    public Loader<BatteryStatsHelper> onCreateLoader(int id, Bundle args) {
+        return new BatteryStatsHelperLoader(mContext);
+    }
+
+    @Override
+    public void onLoadFinished(Loader<BatteryStatsHelper> loader,
+            BatteryStatsHelper batteryHelper) {
+        mBatteryHelper = batteryHelper;
+        final PackageInfo packageInfo = mParent.getPackageInfo();
+        if (packageInfo != null) {
+            mSipper = findTargetSipper(batteryHelper, packageInfo.applicationInfo.uid);
+            if (mParent.getActivity() != null) {
+                updateBattery();
+            }
+        }
+    }
+
+    @Override
+    public void onLoaderReset(Loader<BatteryStatsHelper> loader) {
+    }
+
+    @VisibleForTesting
+    void updateBattery() {
+        mPreference.setEnabled(true);
+        if (isBatteryStatsAvailable()) {
+            final int dischargeAmount = mBatteryHelper.getStats().getDischargeAmount(
+                    BatteryStats.STATS_SINCE_CHARGED);
+
+            final List<BatterySipper> usageList = new ArrayList<>(mBatteryHelper.getUsageList());
+            final double hiddenAmount = mBatteryUtils.removeHiddenBatterySippers(usageList);
+            final int percentOfMax = (int) mBatteryUtils.calculateBatteryPercent(
+                    mSipper.totalPowerMah, mBatteryHelper.getTotalPower(), hiddenAmount,
+                    dischargeAmount);
+            mBatteryPercent = Utils.formatPercentage(percentOfMax);
+            mPreference.setSummary(mContext.getString(R.string.battery_summary, mBatteryPercent));
+        } else {
+            mPreference.setSummary(mContext.getString(R.string.no_battery_summary));
+        }
+    }
+
+    @VisibleForTesting
+    boolean isBatteryStatsAvailable() {
+        return mBatteryHelper != null && mSipper != null;
+    }
+
+    @VisibleForTesting
+    BatterySipper findTargetSipper(BatteryStatsHelper batteryHelper, int uid) {
+        final List<BatterySipper> usageList = batteryHelper.getUsageList();
+        for (int i = 0, size = usageList.size(); i < size; i++) {
+            final BatterySipper sipper = usageList.get(i);
+            if (sipper.getUid() == uid) {
+                return sipper;
+            }
+        }
+        return null;
+    }
+
+}
diff --git a/src/com/android/settings/applications/appinfo/AppDataUsagePreferenceController.java b/src/com/android/settings/applications/appinfo/AppDataUsagePreferenceController.java
new file mode 100644
index 0000000..61f3e46
--- /dev/null
+++ b/src/com/android/settings/applications/appinfo/AppDataUsagePreferenceController.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.applications.appinfo;
+
+import android.app.LoaderManager;
+import android.content.Context;
+import android.content.Loader;
+import android.net.INetworkStatsService;
+import android.net.INetworkStatsSession;
+import android.net.NetworkTemplate;
+import android.os.Bundle;
+import android.os.RemoteException;
+import android.os.ServiceManager;
+import android.support.annotation.VisibleForTesting;
+import android.support.v7.preference.Preference;
+import android.support.v7.preference.PreferenceScreen;
+import android.text.format.DateUtils;
+import android.text.format.Formatter;
+
+import com.android.settings.R;
+import com.android.settings.SettingsPreferenceFragment;
+import com.android.settings.Utils;
+import com.android.settings.applications.AppInfoDashboardFragment;
+import com.android.settings.datausage.AppDataUsage;
+import com.android.settings.datausage.DataUsageList;
+import com.android.settings.datausage.DataUsageUtils;
+import com.android.settingslib.AppItem;
+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.net.ChartData;
+import com.android.settingslib.net.ChartDataLoader;
+
+public class AppDataUsagePreferenceController extends AppInfoPreferenceControllerBase
+        implements LoaderManager.LoaderCallbacks<ChartData>, LifecycleObserver, OnResume, OnPause {
+
+    private static final String KEY_DATA = "data_settings";
+    private ChartData mChartData;
+    private INetworkStatsSession mStatsSession;
+
+    public AppDataUsagePreferenceController(Context context, AppInfoDashboardFragment parent,
+            Lifecycle lifecycle) {
+        super(context, parent, KEY_DATA);
+        if (lifecycle != null) {
+            lifecycle.addObserver(this);
+        }
+    }
+
+    @Override
+    public int getAvailabilityStatus() {
+        return isBandwidthControlEnabled() ? AVAILABLE : DISABLED_UNSUPPORTED;
+    }
+
+    @Override
+    public void displayPreference(PreferenceScreen screen) {
+        super.displayPreference(screen);
+        if (isAvailable()) {
+            final INetworkStatsService statsService = INetworkStatsService.Stub.asInterface(
+                    ServiceManager.getService(Context.NETWORK_STATS_SERVICE));
+            try {
+                mStatsSession = statsService.openSession();
+            } catch (RemoteException e) {
+                throw new RuntimeException(e);
+            }
+        }
+    }
+
+    @Override
+    public void updateState(Preference preference) {
+        preference.setSummary(getDataSummary());
+    }
+
+    @Override
+    public void onResume() {
+        if (mStatsSession != null) {
+            final int uid = mParent.getAppEntry().info.uid;
+            final AppItem app = new AppItem(uid);
+            app.addUid(uid);
+            mParent.getLoaderManager().restartLoader(mParent.LOADER_CHART_DATA,
+                    ChartDataLoader.buildArgs(getTemplate(mContext), app),
+                    this);
+        }
+    }
+
+    @Override
+    public void onPause() {
+        mParent.getLoaderManager().destroyLoader(mParent.LOADER_CHART_DATA);
+    }
+
+    @Override
+    public Loader<ChartData> onCreateLoader(int id, Bundle args) {
+        return new ChartDataLoader(mContext, mStatsSession, args);
+    }
+
+    @Override
+    public void onLoadFinished(Loader<ChartData> loader, ChartData data) {
+        mChartData = data;
+        updateState(mPreference);
+    }
+
+    @Override
+    public void onLoaderReset(Loader<ChartData> loader) {
+        // Leave last result.
+    }
+
+    @Override
+    protected Class<? extends SettingsPreferenceFragment> getDetailFragmentClass() {
+        return AppDataUsage.class;
+    }
+
+    private CharSequence getDataSummary() {
+        if (mChartData != null) {
+            final long totalBytes = mChartData.detail.getTotalBytes();
+            if (totalBytes == 0) {
+                return mContext.getString(R.string.no_data_usage);
+            }
+            return mContext.getString(R.string.data_summary_format,
+                    Formatter.formatFileSize(mContext, totalBytes),
+                    DateUtils.formatDateTime(mContext, mChartData.detail.getStart(),
+                            DateUtils.FORMAT_SHOW_DATE | DateUtils.FORMAT_ABBREV_MONTH));
+        }
+        return mContext.getString(R.string.computing_size);
+    }
+
+    private static NetworkTemplate getTemplate(Context context) {
+        if (DataUsageList.hasReadyMobileRadio(context)) {
+            return NetworkTemplate.buildTemplateMobileWildcard();
+        }
+        if (DataUsageUtils.hasWifiRadio(context)) {
+            return NetworkTemplate.buildTemplateWifiWildcard();
+        }
+        return NetworkTemplate.buildTemplateEthernet();
+    }
+
+    @VisibleForTesting
+    boolean isBandwidthControlEnabled() {
+        return Utils.isBandwidthControlEnabled();
+    }
+
+}
diff --git a/src/com/android/settings/applications/appinfo/AppInfoPreferenceControllerBase.java b/src/com/android/settings/applications/appinfo/AppInfoPreferenceControllerBase.java
new file mode 100644
index 0000000..0d6c038
--- /dev/null
+++ b/src/com/android/settings/applications/appinfo/AppInfoPreferenceControllerBase.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.applications.appinfo;
+
+import android.app.slice.Slice;
+import android.content.Context;
+import android.support.v7.preference.Preference;
+import android.support.v7.preference.PreferenceScreen;
+import android.text.TextUtils;
+
+import com.android.settings.SettingsPreferenceFragment;
+import com.android.settings.applications.AppInfoDashboardFragment;
+import com.android.settings.core.BasePreferenceController;
+
+/*
+ * Abstract base controller for the app detail preferences that refresh the state when the app state
+ * changes and launch a specific detail fragment when the preference is clicked.
+ */
+public abstract class AppInfoPreferenceControllerBase extends BasePreferenceController
+        implements AppInfoDashboardFragment.Callback {
+
+    protected final AppInfoDashboardFragment mParent;
+    private final Class<? extends SettingsPreferenceFragment> mDetailFragmenClass;
+
+    protected Preference mPreference;
+
+    public AppInfoPreferenceControllerBase(Context context, AppInfoDashboardFragment parent,
+            String preferenceKey) {
+        super(context, preferenceKey);
+        mParent = parent;
+        mDetailFragmenClass = getDetailFragmentClass();
+    }
+
+    @Override
+    public int getAvailabilityStatus() {
+        return AVAILABLE;
+    }
+
+    @Override
+    public Slice getSettingSlice() {
+        return null;
+    }
+
+    @Override
+    public void displayPreference(PreferenceScreen screen) {
+        super.displayPreference(screen);
+        mPreference = screen.findPreference(getPreferenceKey());
+    }
+
+    @Override
+    public boolean handlePreferenceTreeClick(Preference preference) {
+        if (TextUtils.equals(preference.getKey(), mPreferenceKey) && mDetailFragmenClass != null) {
+            AppInfoDashboardFragment.startAppInfoFragment(
+                    mDetailFragmenClass, -1, mParent, mParent.getAppEntry());
+            return true;
+        }
+        return false;
+    }
+
+    @Override
+    public void refreshUi() {
+        updateState(mPreference);
+    }
+
+    /**
+     * Gets the fragment class to be launched when the preference is clicked.
+     * @return the fragment to launch
+     */
+    protected Class<? extends SettingsPreferenceFragment> getDetailFragmentClass() {
+        return null;
+    }
+
+}
diff --git a/src/com/android/settings/applications/appinfo/AppMemoryPreferenceController.java b/src/com/android/settings/applications/appinfo/AppMemoryPreferenceController.java
new file mode 100644
index 0000000..2a20f80
--- /dev/null
+++ b/src/com/android/settings/applications/appinfo/AppMemoryPreferenceController.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.applications.appinfo;
+
+import android.app.Activity;
+import android.app.slice.Slice;
+import android.content.Context;
+import android.content.pm.PackageInfo;
+import android.os.AsyncTask;
+import android.support.v7.preference.Preference;
+import android.support.v7.preference.PreferenceScreen;
+import android.text.format.Formatter;
+
+import com.android.settings.R;
+import com.android.settings.SettingsActivity;
+import com.android.settings.applications.AppInfoDashboardFragment;
+import com.android.settings.applications.ProcStatsData;
+import com.android.settings.applications.ProcStatsEntry;
+import com.android.settings.applications.ProcStatsPackageEntry;
+import com.android.settings.applications.ProcessStatsBase;
+import com.android.settings.core.BasePreferenceController;
+import com.android.settingslib.core.lifecycle.Lifecycle;
+import com.android.settingslib.core.lifecycle.LifecycleObserver;
+import com.android.settingslib.core.lifecycle.events.OnResume;
+import com.android.settingslib.development.DevelopmentSettingsEnabler;
+
+public class AppMemoryPreferenceController extends BasePreferenceController
+        implements LifecycleObserver, OnResume {
+
+    private static final String KEY_MEMORY = "memory";
+
+    private Preference mPreference;
+    private final AppInfoDashboardFragment mParent;
+    private ProcStatsData mStatsManager;
+    private ProcStatsPackageEntry mStats;
+
+    private class MemoryUpdater extends AsyncTask<Void, Void, ProcStatsPackageEntry> {
+
+        @Override
+        protected ProcStatsPackageEntry doInBackground(Void... params) {
+            final Activity activity = mParent.getActivity();
+            if (activity == null) {
+                return null;
+            }
+            PackageInfo packageInfo = mParent.getPackageInfo();
+            if (packageInfo == null) {
+                return null;
+            }
+            if (mStatsManager == null) {
+                mStatsManager = new ProcStatsData(activity, false);
+                mStatsManager.setDuration(ProcessStatsBase.sDurations[0]);
+            }
+            mStatsManager.refreshStats(true);
+            for (ProcStatsPackageEntry pkgEntry : mStatsManager.getEntries()) {
+                for (ProcStatsEntry entry : pkgEntry.getEntries()) {
+                    if (entry.getUid() == packageInfo.applicationInfo.uid) {
+                        pkgEntry.updateMetrics();
+                        return pkgEntry;
+                    }
+                }
+            }
+            return null;
+        }
+
+        @Override
+        protected void onPostExecute(ProcStatsPackageEntry entry) {
+            if (mParent.getActivity() == null) {
+                return;
+            }
+            if (entry != null) {
+                mStats = entry;
+                mPreference.setEnabled(true);
+                double amount = Math.max(entry.getRunWeight(), entry.getBgWeight())
+                        * mStatsManager.getMemInfo().getWeightToRam();
+                mPreference.setSummary(mContext.getString(R.string.memory_use_summary,
+                        Formatter.formatShortFileSize(mContext, (long) amount)));
+            } else {
+                mPreference.setEnabled(false);
+                mPreference.setSummary(mContext.getString(R.string.no_memory_use_summary));
+            }
+        }
+    }
+
+    public AppMemoryPreferenceController(Context context, AppInfoDashboardFragment parent,
+            Lifecycle lifecycle) {
+        super(context, KEY_MEMORY);
+        mParent = parent;
+        if (lifecycle != null) {
+            lifecycle.addObserver(this);
+        }
+    }
+
+    @Override
+    public int getAvailabilityStatus() {
+        return DevelopmentSettingsEnabler.isDevelopmentSettingsEnabled(mContext)
+                ? AVAILABLE : DISABLED_DEPENDENT_SETTING;
+    }
+
+    @Override
+    public Slice getSettingSlice() {
+        return null;
+    }
+
+    @Override
+    public void displayPreference(PreferenceScreen screen) {
+        super.displayPreference(screen);
+        mPreference = screen.findPreference(getPreferenceKey());
+    }
+
+    @Override
+    public boolean handlePreferenceTreeClick(Preference preference) {
+        if (KEY_MEMORY.equals(preference.getKey())) {
+            ProcessStatsBase.launchMemoryDetail((SettingsActivity) mParent.getActivity(),
+                    mStatsManager.getMemInfo(), mStats, false);
+            return true;
+        }
+        return false;
+    }
+
+    @Override
+    public void onResume() {
+        if (isAvailable()) {
+            new MemoryUpdater().execute();
+        }
+    }
+
+}
diff --git a/src/com/android/settings/applications/appinfo/AppNotificationPreferenceController.java b/src/com/android/settings/applications/appinfo/AppNotificationPreferenceController.java
new file mode 100644
index 0000000..7eef370
--- /dev/null
+++ b/src/com/android/settings/applications/appinfo/AppNotificationPreferenceController.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.applications.appinfo;
+
+import android.content.Context;
+import android.support.v7.preference.Preference;
+
+import com.android.settings.SettingsPreferenceFragment;
+import com.android.settings.applications.AppInfoDashboardFragment;
+import com.android.settings.notification.AppNotificationSettings;
+import com.android.settings.notification.NotificationBackend;
+import com.android.settingslib.applications.ApplicationsState;
+
+public class AppNotificationPreferenceController extends AppInfoPreferenceControllerBase {
+
+    private static final String KEY_NOTIFICATION = "notification_settings";
+
+    // Used for updating notification preference.
+    private final NotificationBackend mBackend = new NotificationBackend();
+
+    public AppNotificationPreferenceController(Context context, AppInfoDashboardFragment parent) {
+        super(context, parent, KEY_NOTIFICATION);
+    }
+
+    @Override
+    public void updateState(Preference preference) {
+        preference.setSummary(getNotificationSummary(mParent.getAppEntry(), mContext, mBackend));
+    }
+
+    @Override
+    protected Class<? extends SettingsPreferenceFragment> getDetailFragmentClass() {
+        return AppNotificationSettings.class;
+    }
+
+    private CharSequence getNotificationSummary(ApplicationsState.AppEntry appEntry,
+            Context context, NotificationBackend backend) {
+        NotificationBackend.AppRow appRow =
+                backend.loadAppRow(context, context.getPackageManager(), appEntry.info);
+        return getNotificationSummary(appRow, context);
+    }
+
+    public static CharSequence getNotificationSummary(NotificationBackend.AppRow appRow,
+            Context context) {
+        // TODO: implement summary when it is known what it should say
+        return "";
+    }
+}
diff --git a/src/com/android/settings/applications/appinfo/AppOpenByDefaultPreferenceController.java b/src/com/android/settings/applications/appinfo/AppOpenByDefaultPreferenceController.java
new file mode 100644
index 0000000..a56e3fb
--- /dev/null
+++ b/src/com/android/settings/applications/appinfo/AppOpenByDefaultPreferenceController.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.applications.appinfo;
+
+import android.content.Context;
+import android.content.pm.ApplicationInfo;
+import android.content.pm.PackageInfo;
+import android.content.pm.PackageManager;
+import android.hardware.usb.IUsbManager;
+import android.os.ServiceManager;
+import android.support.v7.preference.Preference;
+import android.support.v7.preference.PreferenceScreen;
+
+import com.android.settings.SettingsPreferenceFragment;
+import com.android.settings.applications.AppInfoDashboardFragment;
+import com.android.settings.applications.AppLaunchSettings;
+import com.android.settingslib.applications.AppUtils;
+import com.android.settingslib.applications.ApplicationsState;
+
+public class AppOpenByDefaultPreferenceController extends AppInfoPreferenceControllerBase {
+
+    private static final String KEY_LAUNCH = "preferred_settings";
+
+    private IUsbManager mUsbManager;
+    private PackageManager mPackageManager;
+
+    public AppOpenByDefaultPreferenceController(Context context, AppInfoDashboardFragment parent) {
+        super(context, parent, KEY_LAUNCH);
+        mUsbManager = IUsbManager.Stub.asInterface(ServiceManager.getService(Context.USB_SERVICE));
+        mPackageManager = context.getPackageManager();
+    }
+
+    @Override
+    public void displayPreference(PreferenceScreen screen) {
+        super.displayPreference(screen);
+        final ApplicationsState.AppEntry appEntry = mParent.getAppEntry();
+        if (appEntry == null || appEntry.info == null) {
+            mPreference.setEnabled(false);
+        } else if ((appEntry.info.flags& ApplicationInfo.FLAG_INSTALLED) == 0
+                    || !appEntry.info.enabled) {
+                mPreference.setEnabled(false);
+        }
+    }
+
+    @Override
+    public void updateState(Preference preference) {
+        final PackageInfo packageInfo = mParent.getPackageInfo();
+        if (packageInfo != null && !AppUtils.isInstant(packageInfo.applicationInfo)) {
+            preference.setVisible(true);
+            preference.setSummary(AppUtils.getLaunchByDefaultSummary(mParent.getAppEntry(),
+                    mUsbManager, mPackageManager, mContext));
+        } else {
+            preference.setVisible(false);
+        }
+    }
+
+    @Override
+    protected Class<? extends SettingsPreferenceFragment> getDetailFragmentClass() {
+        return AppLaunchSettings.class;
+    }
+
+}
diff --git a/src/com/android/settings/applications/appinfo/AppPermissionPreferenceController.java b/src/com/android/settings/applications/appinfo/AppPermissionPreferenceController.java
new file mode 100644
index 0000000..bd309c6
--- /dev/null
+++ b/src/com/android/settings/applications/appinfo/AppPermissionPreferenceController.java
@@ -0,0 +1,114 @@
+/*
+ * Copyright (C) 2017 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.applications.appinfo;
+
+import android.content.ActivityNotFoundException;
+import android.content.Context;
+import android.content.Intent;
+import android.content.res.Resources;
+import android.icu.text.ListFormatter;
+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.applications.AppInfoDashboardFragment;
+import com.android.settingslib.applications.PermissionsSummaryHelper;
+import com.android.settingslib.core.AbstractPreferenceController;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class AppPermissionPreferenceController extends AppInfoPreferenceControllerBase {
+
+    private static final String TAG = "PermissionPrefControl";
+    private static final String KEY_PERMISSION = "permission_settings";
+    private static final String EXTRA_HIDE_INFO_BUTTON = "hideInfoButton";
+
+    private final String mPackageName;
+
+    @VisibleForTesting
+    final PermissionsSummaryHelper.PermissionsResultCallback mPermissionCallback
+            = new PermissionsSummaryHelper.PermissionsResultCallback() {
+        @Override
+        public void onPermissionSummaryResult(int standardGrantedPermissionCount,
+                int requestedPermissionCount, int additionalGrantedPermissionCount,
+                List<CharSequence> grantedGroupLabels) {
+            if (mParent.getActivity() == null) {
+                return;
+            }
+            final Resources res = mContext.getResources();
+            CharSequence summary = null;
+
+            if (requestedPermissionCount == 0) {
+                summary = res.getString(
+                        R.string.runtime_permissions_summary_no_permissions_requested);
+                mPreference.setEnabled(false);
+            } else {
+                final ArrayList<CharSequence> list = new ArrayList<>(grantedGroupLabels);
+                if (additionalGrantedPermissionCount > 0) {
+                    // N additional permissions.
+                    list.add(res.getQuantityString(
+                            R.plurals.runtime_permissions_additional_count,
+                            additionalGrantedPermissionCount, additionalGrantedPermissionCount));
+                }
+                if (list.size() == 0) {
+                    summary = res.getString(
+                            R.string.runtime_permissions_summary_no_permissions_granted);
+                } else {
+                    summary = ListFormatter.getInstance().format(list);
+                }
+                mPreference.setEnabled(true);
+            }
+            mPreference.setSummary(summary);
+        }
+    };
+
+    public AppPermissionPreferenceController(Context context, AppInfoDashboardFragment parent,
+            String packageName) {
+        super(context, parent, KEY_PERMISSION);
+        mPackageName = packageName;
+    }
+
+    @Override
+    public void updateState(Preference preference) {
+        PermissionsSummaryHelper.getPermissionSummary(mContext, mPackageName, mPermissionCallback);
+    }
+
+    @Override
+    public boolean handlePreferenceTreeClick(Preference preference) {
+        if (KEY_PERMISSION.equals(preference.getKey())) {
+            startManagePermissionsActivity();
+            return true;
+        }
+        return false;
+    }
+
+    private void startManagePermissionsActivity() {
+        // start new activity to manage app permissions
+        final Intent intent = new Intent(Intent.ACTION_MANAGE_APP_PERMISSIONS);
+        intent.putExtra(Intent.EXTRA_PACKAGE_NAME, mParent.getAppEntry().info.packageName);
+        intent.putExtra(EXTRA_HIDE_INFO_BUTTON, true);
+        try {
+            mParent.getActivity().startActivityForResult(intent, mParent.SUB_INFO_FRAGMENT);
+        } catch (ActivityNotFoundException e) {
+            Log.w(TAG, "No app can handle android.intent.action.MANAGE_APP_PERMISSIONS");
+        }
+    }
+
+}
diff --git a/src/com/android/settings/applications/appinfo/AppStoragePreferenceController.java b/src/com/android/settings/applications/appinfo/AppStoragePreferenceController.java
new file mode 100644
index 0000000..d737288
--- /dev/null
+++ b/src/com/android/settings/applications/appinfo/AppStoragePreferenceController.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.applications.appinfo;
+
+import android.app.LoaderManager;
+import android.content.Context;
+import android.content.Loader;
+import android.content.pm.ApplicationInfo;
+import android.os.Bundle;
+import android.os.UserHandle;
+import android.support.annotation.VisibleForTesting;
+import android.support.v7.preference.Preference;
+import android.text.format.Formatter;
+
+import com.android.settings.R;
+import com.android.settings.SettingsPreferenceFragment;
+import com.android.settings.applications.AppInfoDashboardFragment;
+import com.android.settings.applications.AppStorageSettings;
+import com.android.settings.applications.FetchPackageStorageAsyncLoader;
+import com.android.settingslib.applications.StorageStatsSource;
+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 AppStoragePreferenceController extends AppInfoPreferenceControllerBase
+        implements LoaderManager.LoaderCallbacks<StorageStatsSource.AppStorageStats>,
+        LifecycleObserver, OnResume, OnPause {
+
+    private static final String KEY_STORAGE = "storage_settings";
+    private StorageStatsSource.AppStorageStats mLastResult;
+
+    public AppStoragePreferenceController(Context context, AppInfoDashboardFragment parent,
+            Lifecycle lifecycle) {
+        super(context, parent, KEY_STORAGE);
+        if (lifecycle != null) {
+            lifecycle.addObserver(this);
+        }
+    }
+
+    @Override
+    public void updateState(Preference preference) {
+        final boolean isExternal =
+                (mParent.getAppEntry().info.flags & ApplicationInfo.FLAG_EXTERNAL_STORAGE) != 0;
+        preference.setSummary(getStorageSummary(mLastResult, isExternal));
+    }
+
+    @Override
+    public void onResume() {
+        mParent.getLoaderManager().restartLoader(mParent.LOADER_STORAGE, Bundle.EMPTY, this);
+    }
+
+    @Override
+    public void onPause() {
+        mParent.getLoaderManager().destroyLoader(mParent.LOADER_STORAGE);
+    }
+
+    @Override
+    protected Class<? extends SettingsPreferenceFragment> getDetailFragmentClass() {
+        return AppStorageSettings.class;
+    }
+
+    @VisibleForTesting
+    CharSequence getStorageSummary(
+            StorageStatsSource.AppStorageStats stats, boolean isExternal) {
+        if (stats == null) {
+            return mContext.getText(R.string.computing_size);
+        }
+        final CharSequence storageType = mContext.getString(isExternal
+                ? R.string.storage_type_external
+                : R.string.storage_type_internal);
+        return mContext.getString(R.string.storage_summary_format,
+                Formatter.formatFileSize(mContext, stats.getTotalBytes()),
+                storageType.toString().toLowerCase());
+    }
+
+    @Override
+    public Loader<StorageStatsSource.AppStorageStats> onCreateLoader(int id, Bundle args) {
+        return new FetchPackageStorageAsyncLoader(mContext, new StorageStatsSource(mContext),
+                mParent.getAppEntry().info, UserHandle.of(UserHandle.myUserId()));
+    }
+
+    @Override
+    public void onLoadFinished(Loader<StorageStatsSource.AppStorageStats> loader,
+            StorageStatsSource.AppStorageStats result) {
+        mLastResult = result;
+        updateState(mPreference);
+    }
+
+    @Override
+    public void onLoaderReset(Loader<StorageStatsSource.AppStorageStats> loader) {
+    }
+
+}
diff --git a/src/com/android/settings/applications/appinfo/AppVersionPreferenceController.java b/src/com/android/settings/applications/appinfo/AppVersionPreferenceController.java
new file mode 100644
index 0000000..82719f7
--- /dev/null
+++ b/src/com/android/settings/applications/appinfo/AppVersionPreferenceController.java
@@ -0,0 +1,40 @@
+/*
+ * Copyright (C) 2017 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.applications.appinfo;
+
+import android.content.Context;
+import android.support.v7.preference.Preference;
+import android.text.BidiFormatter;
+
+import com.android.settings.R;
+import com.android.settings.applications.AppInfoDashboardFragment;
+
+public class AppVersionPreferenceController extends AppInfoPreferenceControllerBase {
+
+    private static final String KEY_VERSION = "app_version";
+
+    public AppVersionPreferenceController(Context context, AppInfoDashboardFragment parent) {
+        super(context, parent, KEY_VERSION);
+    }
+
+    @Override
+    public void updateState(Preference preference) {
+        preference.setSummary(mContext.getString(R.string.version_text,
+                BidiFormatter.getInstance().unicodeWrap(mParent.getPackageInfo().versionName)));
+    }
+
+}
diff --git a/src/com/android/settings/applications/appinfo/DefaultAppShortcutPreferenceControllerBase.java b/src/com/android/settings/applications/appinfo/DefaultAppShortcutPreferenceControllerBase.java
new file mode 100644
index 0000000..3311daa
--- /dev/null
+++ b/src/com/android/settings/applications/appinfo/DefaultAppShortcutPreferenceControllerBase.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.applications.appinfo;
+
+import android.app.slice.Slice;
+import android.content.Context;
+import android.os.Bundle;
+import android.os.UserManager;
+import android.support.v7.preference.Preference;
+import android.text.TextUtils;
+
+import com.android.internal.logging.nano.MetricsProto;
+import com.android.settings.R;
+import com.android.settings.SettingsActivity;
+import com.android.settings.Utils;
+import com.android.settings.applications.DefaultAppSettings;
+import com.android.settings.core.BasePreferenceController;
+
+/*
+ * Abstract base controller for the default app shortcut preferences that launches the default app
+ * settings with the corresponding default app highlighted.
+ */
+public abstract class DefaultAppShortcutPreferenceControllerBase extends BasePreferenceController {
+
+    protected final String mPackageName;
+
+    public DefaultAppShortcutPreferenceControllerBase(Context context, String preferenceKey,
+            String packageName) {
+        super(context, preferenceKey);
+        mPackageName = packageName;
+    }
+
+    @Override
+    public int getAvailabilityStatus() {
+        if (UserManager.get(mContext).isManagedProfile()) {
+            return DISABLED_FOR_USER;
+        }
+        return hasAppCapability() ? AVAILABLE : DISABLED_UNSUPPORTED;
+    }
+
+    @Override
+    public Slice getSettingSlice() {
+        return null;
+    }
+
+    @Override
+    public void updateState(Preference preference) {
+        preference.setSummary(isDefaultApp() ? R.string.yes : R.string.no);
+    }
+
+    @Override
+    public boolean handlePreferenceTreeClick(Preference preference) {
+        if (TextUtils.equals(mPreferenceKey, preference.getKey())) {
+            Bundle bundle = new Bundle();
+            bundle.putString(SettingsActivity.EXTRA_FRAGMENT_ARG_KEY, mPreferenceKey);
+            Utils.startWithFragment(mContext, DefaultAppSettings.class.getName(), bundle, null, 0,
+                    R.string.configure_apps, null, MetricsProto.MetricsEvent.VIEW_UNKNOWN);
+            return true;
+        }
+        return false;
+    }
+
+    /**
+     * Check whether the app has the default app capability
+     * @return true if the app has the default app capability
+     */
+    protected abstract boolean hasAppCapability();
+
+    /**
+     * Check whether the app is the default app
+     * @return true if the app is the default app
+     */
+    protected abstract boolean isDefaultApp();
+
+}
diff --git a/src/com/android/settings/applications/appinfo/DefaultBrowserShortcutPreferenceController.java b/src/com/android/settings/applications/appinfo/DefaultBrowserShortcutPreferenceController.java
new file mode 100644
index 0000000..64af3c2
--- /dev/null
+++ b/src/com/android/settings/applications/appinfo/DefaultBrowserShortcutPreferenceController.java
@@ -0,0 +1,42 @@
+/*
+ * Copyright (C) 2017 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file
+ * except in compliance with the License. You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the
+ * License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+package com.android.settings.applications.appinfo;
+
+import android.content.Context;
+import android.os.UserHandle;
+
+import com.android.settings.applications.defaultapps.DefaultBrowserPreferenceController;
+
+public class DefaultBrowserShortcutPreferenceController
+        extends DefaultAppShortcutPreferenceControllerBase {
+
+    private static final String KEY = "default_browser";
+
+    public DefaultBrowserShortcutPreferenceController(Context context, String packageName) {
+        super(context, KEY, packageName);
+    }
+
+    @Override
+    protected boolean hasAppCapability() {
+        return DefaultBrowserPreferenceController.hasBrowserPreference(mPackageName, mContext);
+    }
+
+    @Override
+    protected boolean isDefaultApp() {
+        return new DefaultBrowserPreferenceController(mContext)
+                .isBrowserDefault(mPackageName, UserHandle.myUserId());
+    }
+
+}
diff --git a/src/com/android/settings/applications/appinfo/DefaultEmergencyShortcutPreferenceController.java b/src/com/android/settings/applications/appinfo/DefaultEmergencyShortcutPreferenceController.java
new file mode 100644
index 0000000..f0c1b8a
--- /dev/null
+++ b/src/com/android/settings/applications/appinfo/DefaultEmergencyShortcutPreferenceController.java
@@ -0,0 +1,40 @@
+/*
+ * Copyright (C) 2017 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file
+ * except in compliance with the License. You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the
+ * License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+package com.android.settings.applications.appinfo;
+
+import android.content.Context;
+
+import com.android.settings.applications.defaultapps.DefaultEmergencyPreferenceController;
+
+public class DefaultEmergencyShortcutPreferenceController
+        extends DefaultAppShortcutPreferenceControllerBase {
+
+    private static final String KEY = "default_emergency_app";
+
+    public DefaultEmergencyShortcutPreferenceController(Context context, String packageName) {
+        super(context, KEY, packageName);
+    }
+
+    @Override
+    protected boolean hasAppCapability() {
+        return DefaultEmergencyPreferenceController.hasEmergencyPreference(mPackageName, mContext);
+    }
+
+    @Override
+    protected boolean isDefaultApp() {
+        return DefaultEmergencyPreferenceController.isEmergencyDefault(mPackageName, mContext);
+    }
+
+}
diff --git a/src/com/android/settings/applications/appinfo/DefaultHomeShortcutPreferenceController.java b/src/com/android/settings/applications/appinfo/DefaultHomeShortcutPreferenceController.java
new file mode 100644
index 0000000..4ae9083
--- /dev/null
+++ b/src/com/android/settings/applications/appinfo/DefaultHomeShortcutPreferenceController.java
@@ -0,0 +1,42 @@
+/*
+ * Copyright (C) 2017 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file
+ * except in compliance with the License. You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the
+ * License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+package com.android.settings.applications.appinfo;
+
+import android.content.Context;
+
+import com.android.settings.applications.defaultapps.DefaultHomePreferenceController;
+import com.android.settingslib.wrapper.PackageManagerWrapper;
+
+public class DefaultHomeShortcutPreferenceController
+        extends DefaultAppShortcutPreferenceControllerBase {
+
+    private static final String KEY = "default_home";
+
+    public DefaultHomeShortcutPreferenceController(Context context, String packageName) {
+        super(context, KEY, packageName);
+    }
+
+    @Override
+    protected boolean hasAppCapability() {
+        return DefaultHomePreferenceController.hasHomePreference(mPackageName, mContext);
+    }
+
+    @Override
+    protected boolean isDefaultApp() {
+        return DefaultHomePreferenceController.isHomeDefault(mPackageName,
+                new PackageManagerWrapper(mContext.getPackageManager()));
+    }
+
+}
diff --git a/src/com/android/settings/applications/appinfo/DefaultPhoneShortcutPreferenceController.java b/src/com/android/settings/applications/appinfo/DefaultPhoneShortcutPreferenceController.java
new file mode 100644
index 0000000..c968d55
--- /dev/null
+++ b/src/com/android/settings/applications/appinfo/DefaultPhoneShortcutPreferenceController.java
@@ -0,0 +1,40 @@
+/*
+ * Copyright (C) 2017 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file
+ * except in compliance with the License. You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the
+ * License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+package com.android.settings.applications.appinfo;
+
+import android.content.Context;
+
+import com.android.settings.applications.defaultapps.DefaultPhonePreferenceController;
+
+public class DefaultPhoneShortcutPreferenceController
+        extends DefaultAppShortcutPreferenceControllerBase {
+
+    private static final String KEY = "default_phone_app";
+
+    public DefaultPhoneShortcutPreferenceController(Context context, String packageName) {
+        super(context, KEY, packageName);
+    }
+
+    @Override
+    protected boolean hasAppCapability() {
+        return DefaultPhonePreferenceController.hasPhonePreference(mPackageName, mContext);
+    }
+
+    @Override
+    protected boolean isDefaultApp() {
+        return DefaultPhonePreferenceController.isPhoneDefault(mPackageName, mContext);
+    }
+
+}
diff --git a/src/com/android/settings/applications/appinfo/DefaultSmsShortcutPreferenceController.java b/src/com/android/settings/applications/appinfo/DefaultSmsShortcutPreferenceController.java
new file mode 100644
index 0000000..cf8b446
--- /dev/null
+++ b/src/com/android/settings/applications/appinfo/DefaultSmsShortcutPreferenceController.java
@@ -0,0 +1,40 @@
+/*
+ * Copyright (C) 2017 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file
+ * except in compliance with the License. You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the
+ * License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+package com.android.settings.applications.appinfo;
+
+import android.content.Context;
+
+import com.android.settings.applications.defaultapps.DefaultSmsPreferenceController;
+
+public class DefaultSmsShortcutPreferenceController
+        extends DefaultAppShortcutPreferenceControllerBase {
+
+    private static final String KEY = "default_sms_app";
+
+    public DefaultSmsShortcutPreferenceController(Context context, String packageName) {
+        super(context, KEY, packageName);
+    }
+
+    @Override
+    protected boolean hasAppCapability() {
+        return DefaultSmsPreferenceController.hasSmsPreference(mPackageName, mContext);
+    }
+
+    @Override
+    protected boolean isDefaultApp() {
+        return DefaultSmsPreferenceController.isSmsDefault(mPackageName, mContext);
+    }
+
+}
diff --git a/src/com/android/settings/applications/appops/AppOpsCategory.java b/src/com/android/settings/applications/appops/AppOpsCategory.java
new file mode 100644
index 0000000..b506ce0
--- /dev/null
+++ b/src/com/android/settings/applications/appops/AppOpsCategory.java
@@ -0,0 +1,372 @@
+/*
+ * 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.appops;
+
+import android.app.AppOpsManager;
+import android.app.ListFragment;
+import android.app.LoaderManager;
+import android.content.AsyncTaskLoader;
+import android.content.BroadcastReceiver;
+import android.content.Context;
+import android.content.Intent;
+import android.content.IntentFilter;
+import android.content.Loader;
+import android.content.pm.ActivityInfo;
+import android.content.res.Configuration;
+import android.content.res.Resources;
+import android.os.Bundle;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.BaseAdapter;
+import android.widget.ImageView;
+import android.widget.ListView;
+import android.widget.Switch;
+import android.widget.TextView;
+
+import com.android.settings.R;
+import com.android.settings.applications.appops.AppOpsState.AppOpEntry;
+
+import java.util.List;
+
+public class AppOpsCategory extends ListFragment implements
+        LoaderManager.LoaderCallbacks<List<AppOpEntry>> {
+
+    AppOpsState mState;
+
+    // This is the Adapter being used to display the list's data.
+    AppListAdapter mAdapter;
+
+    public AppOpsCategory() {
+    }
+
+    public AppOpsCategory(AppOpsState.OpsTemplate template) {
+        Bundle args = new Bundle();
+        args.putParcelable("template", template);
+        setArguments(args);
+    }
+
+    /**
+     * Helper for determining if the configuration has changed in an interesting
+     * way so we need to rebuild the app list.
+     */
+    public static class InterestingConfigChanges {
+        final Configuration mLastConfiguration = new Configuration();
+        int mLastDensity;
+
+        boolean applyNewConfig(Resources res) {
+            int configChanges = mLastConfiguration.updateFrom(res.getConfiguration());
+            boolean densityChanged = mLastDensity != res.getDisplayMetrics().densityDpi;
+            if (densityChanged || (configChanges&(ActivityInfo.CONFIG_LOCALE
+                    |ActivityInfo.CONFIG_UI_MODE|ActivityInfo.CONFIG_SCREEN_LAYOUT)) != 0) {
+                mLastDensity = res.getDisplayMetrics().densityDpi;
+                return true;
+            }
+            return false;
+        }
+    }
+
+    /**
+     * Helper class to look for interesting changes to the installed apps
+     * so that the loader can be updated.
+     */
+    public static class PackageIntentReceiver extends BroadcastReceiver {
+        final AppListLoader mLoader;
+
+        public PackageIntentReceiver(AppListLoader loader) {
+            mLoader = loader;
+            IntentFilter filter = new IntentFilter(Intent.ACTION_PACKAGE_ADDED);
+            filter.addAction(Intent.ACTION_PACKAGE_REMOVED);
+            filter.addAction(Intent.ACTION_PACKAGE_CHANGED);
+            filter.addDataScheme("package");
+            mLoader.getContext().registerReceiver(this, filter);
+            // Register for events related to sdcard installation.
+            IntentFilter sdFilter = new IntentFilter();
+            sdFilter.addAction(Intent.ACTION_EXTERNAL_APPLICATIONS_AVAILABLE);
+            sdFilter.addAction(Intent.ACTION_EXTERNAL_APPLICATIONS_UNAVAILABLE);
+            mLoader.getContext().registerReceiver(this, sdFilter);
+        }
+
+        @Override public void onReceive(Context context, Intent intent) {
+            // Tell the loader about the change.
+            mLoader.onContentChanged();
+        }
+    }
+
+    /**
+     * A custom Loader that loads all of the installed applications.
+     */
+    public static class AppListLoader extends AsyncTaskLoader<List<AppOpEntry>> {
+        final InterestingConfigChanges mLastConfig = new InterestingConfigChanges();
+        final AppOpsState mState;
+        final AppOpsState.OpsTemplate mTemplate;
+
+        List<AppOpEntry> mApps;
+        PackageIntentReceiver mPackageObserver;
+
+        public AppListLoader(Context context, AppOpsState state, AppOpsState.OpsTemplate template) {
+            super(context);
+            mState = state;
+            mTemplate = template;
+        }
+
+        @Override public List<AppOpEntry> loadInBackground() {
+            return mState.buildState(mTemplate, 0, null, AppOpsState.LABEL_COMPARATOR);
+        }
+
+        /**
+         * Called when there is new data to deliver to the client.  The
+         * super class will take care of delivering it; the implementation
+         * here just adds a little more logic.
+         */
+        @Override public void deliverResult(List<AppOpEntry> apps) {
+            if (isReset()) {
+                // An async query came in while the loader is stopped.  We
+                // don't need the result.
+                if (apps != null) {
+                    onReleaseResources(apps);
+                }
+            }
+            List<AppOpEntry> oldApps = apps;
+            mApps = apps;
+
+            if (isStarted()) {
+                // If the Loader is currently started, we can immediately
+                // deliver its results.
+                super.deliverResult(apps);
+            }
+
+            // At this point we can release the resources associated with
+            // 'oldApps' if needed; now that the new result is delivered we
+            // know that it is no longer in use.
+            if (oldApps != null) {
+                onReleaseResources(oldApps);
+            }
+        }
+
+        /**
+         * Handles a request to start the Loader.
+         */
+        @Override protected void onStartLoading() {
+            // We don't monitor changed when loading is stopped, so need
+            // to always reload at this point.
+            onContentChanged();
+
+            if (mApps != null) {
+                // If we currently have a result available, deliver it
+                // immediately.
+                deliverResult(mApps);
+            }
+
+            // Start watching for changes in the app data.
+            if (mPackageObserver == null) {
+                mPackageObserver = new PackageIntentReceiver(this);
+            }
+
+            // Has something interesting in the configuration changed since we
+            // last built the app list?
+            boolean configChange = mLastConfig.applyNewConfig(getContext().getResources());
+
+            if (takeContentChanged() || mApps == null || configChange) {
+                // If the data has changed since the last time it was loaded
+                // or is not currently available, start a load.
+                forceLoad();
+            }
+        }
+
+        /**
+         * Handles a request to stop the Loader.
+         */
+        @Override protected void onStopLoading() {
+            // Attempt to cancel the current load task if possible.
+            cancelLoad();
+        }
+
+        /**
+         * Handles a request to cancel a load.
+         */
+        @Override public void onCanceled(List<AppOpEntry> apps) {
+            super.onCanceled(apps);
+
+            // At this point we can release the resources associated with 'apps'
+            // if needed.
+            onReleaseResources(apps);
+        }
+
+        /**
+         * Handles a request to completely reset the Loader.
+         */
+        @Override protected void onReset() {
+            super.onReset();
+
+            // Ensure the loader is stopped
+            onStopLoading();
+
+            // At this point we can release the resources associated with 'apps'
+            // if needed.
+            if (mApps != null) {
+                onReleaseResources(mApps);
+                mApps = null;
+            }
+
+            // Stop monitoring for changes.
+            if (mPackageObserver != null) {
+                getContext().unregisterReceiver(mPackageObserver);
+                mPackageObserver = null;
+            }
+        }
+
+        /**
+         * Helper function to take care of releasing resources associated
+         * with an actively loaded data set.
+         */
+        protected void onReleaseResources(List<AppOpEntry> apps) {
+            // For a simple List<> there is nothing to do.  For something
+            // like a Cursor, we would close it here.
+        }
+    }
+
+    public static class AppListAdapter extends BaseAdapter {
+        private final Resources mResources;
+        private final LayoutInflater mInflater;
+        private final AppOpsState mState;
+
+        List<AppOpEntry> mList;
+
+        public AppListAdapter(Context context, AppOpsState state) {
+            mResources = context.getResources();
+            mInflater = (LayoutInflater)context.getSystemService(Context.LAYOUT_INFLATER_SERVICE);
+            mState = state;
+        }
+
+        public void setData(List<AppOpEntry> data) {
+            mList = data;
+            notifyDataSetChanged();
+        }
+
+        @Override
+        public int getCount() {
+            return mList != null ? mList.size() : 0;
+        }
+
+        @Override
+        public AppOpEntry getItem(int position) {
+            return mList.get(position);
+        }
+
+        @Override
+        public long getItemId(int position) {
+            return position;
+        }
+
+        /**
+         * Populate new items in the list.
+         */
+        @Override
+        public View getView(int position, View convertView, ViewGroup parent) {
+            View view;
+
+            if (convertView == null) {
+                view = mInflater.inflate(R.layout.app_ops_item, parent, false);
+            } else {
+                view = convertView;
+            }
+
+            AppOpEntry item = getItem(position);
+            ((ImageView) view.findViewById(R.id.app_icon)).setImageDrawable(
+                    item.getAppEntry().getIcon());
+            ((TextView) view.findViewById(R.id.app_name)).setText(item.getAppEntry().getLabel());
+            ((TextView) view.findViewById(R.id.op_name)).setText(
+                    item.getTimeText(mResources, false));
+            view.findViewById(R.id.op_time).setVisibility(View.GONE);
+            ((Switch) view.findViewById(R.id.op_switch)).setChecked(
+                    item.getPrimaryOpMode() == AppOpsManager.MODE_ALLOWED);
+
+            return view;
+        }
+    }
+
+    @Override
+    public void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        mState = new AppOpsState(getActivity());
+    }
+
+    @Override public void onActivityCreated(Bundle savedInstanceState) {
+        super.onActivityCreated(savedInstanceState);
+
+        // Give some text to display if there is no data.  In a real
+        // application this would come from a resource.
+        setEmptyText("No applications");
+
+        // We have a menu item to show in action bar.
+        setHasOptionsMenu(true);
+
+        // Create an empty adapter we will use to display the loaded data.
+        mAdapter = new AppListAdapter(getActivity(), mState);
+        setListAdapter(mAdapter);
+
+        // Start out with a progress indicator.
+        setListShown(false);
+
+        // Prepare the loader.
+        getLoaderManager().initLoader(0, null, this);
+    }
+
+    @Override public void onListItemClick(ListView l, View v, int position, long id) {
+        AppOpEntry entry = mAdapter.getItem(position);
+        if (entry != null) {
+            // We treat this as tapping on the check box, toggling the app op state.
+            Switch sw = v.findViewById(R.id.op_switch);
+            boolean checked = !sw.isChecked();
+            sw.setChecked(checked);
+            AppOpsManager.OpEntry op = entry.getOpEntry(0);
+            int mode = checked ? AppOpsManager.MODE_ALLOWED : AppOpsManager.MODE_IGNORED;
+            mState.getAppOpsManager().setMode(op.getOp(),
+                    entry.getAppEntry().getApplicationInfo().uid,
+                    entry.getAppEntry().getApplicationInfo().packageName,
+                    mode);
+            entry.overridePrimaryOpMode(mode);
+        }
+    }
+
+    @Override public Loader<List<AppOpEntry>> onCreateLoader(int id, Bundle args) {
+        Bundle fargs = getArguments();
+        AppOpsState.OpsTemplate template = null;
+        if (fargs != null) {
+            template = fargs.getParcelable("template");
+        }
+        return new AppListLoader(getActivity(), mState, template);
+    }
+
+    @Override public void onLoadFinished(Loader<List<AppOpEntry>> loader, List<AppOpEntry> data) {
+        // Set the new data in the adapter.
+        mAdapter.setData(data);
+
+        // The list should now be shown.
+        if (isResumed()) {
+            setListShown(true);
+        } else {
+            setListShownNoAnimation(true);
+        }
+    }
+
+    @Override public void onLoaderReset(Loader<List<AppOpEntry>> loader) {
+        // Clear the data in the adapter.
+        mAdapter.setData(null);
+    }
+}
diff --git a/src/com/android/settings/applications/appops/AppOpsState.java b/src/com/android/settings/applications/appops/AppOpsState.java
new file mode 100644
index 0000000..2686b8c
--- /dev/null
+++ b/src/com/android/settings/applications/appops/AppOpsState.java
@@ -0,0 +1,636 @@
+/*
+ * 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.appops;
+
+import android.app.AppOpsManager;
+import android.content.Context;
+import android.content.pm.ApplicationInfo;
+import android.content.pm.PackageInfo;
+import android.content.pm.PackageManager;
+import android.content.pm.PackageManager.NameNotFoundException;
+import android.content.res.Resources;
+import android.graphics.drawable.Drawable;
+import android.os.Parcel;
+import android.os.Parcelable;
+import android.text.format.DateUtils;
+import android.util.Log;
+import android.util.SparseArray;
+
+import com.android.settings.R;
+
+import java.io.File;
+import java.text.Collator;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.HashMap;
+import java.util.List;
+
+public class AppOpsState {
+    static final String TAG = "AppOpsState";
+    static final boolean DEBUG = false;
+
+    final Context mContext;
+    final AppOpsManager mAppOps;
+    final PackageManager mPm;
+    final CharSequence[] mOpSummaries;
+    final CharSequence[] mOpLabels;
+
+    public AppOpsState(Context context) {
+        mContext = context;
+        mAppOps = (AppOpsManager)context.getSystemService(Context.APP_OPS_SERVICE);
+        mPm = context.getPackageManager();
+        mOpSummaries = context.getResources().getTextArray(R.array.app_ops_summaries);
+        mOpLabels = context.getResources().getTextArray(R.array.app_ops_labels);
+    }
+
+    public static class OpsTemplate implements Parcelable {
+        public final int[] ops;
+        public final boolean[] showPerms;
+
+        public OpsTemplate(int[] _ops, boolean[] _showPerms) {
+            ops = _ops;
+            showPerms = _showPerms;
+        }
+
+        OpsTemplate(Parcel src) {
+            ops = src.createIntArray();
+            showPerms = src.createBooleanArray();
+        }
+
+        @Override
+        public int describeContents() {
+            return 0;
+        }
+
+        @Override
+        public void writeToParcel(Parcel dest, int flags) {
+            dest.writeIntArray(ops);
+            dest.writeBooleanArray(showPerms);
+        }
+
+        public static final Creator<OpsTemplate> CREATOR = new Creator<OpsTemplate>() {
+            @Override public OpsTemplate createFromParcel(Parcel source) {
+                return new OpsTemplate(source);
+            }
+
+            @Override public OpsTemplate[] newArray(int size) {
+                return new OpsTemplate[size];
+            }
+        };
+    }
+
+    public static final OpsTemplate LOCATION_TEMPLATE = new OpsTemplate(
+            new int[] { AppOpsManager.OP_COARSE_LOCATION,
+                    AppOpsManager.OP_FINE_LOCATION,
+                    AppOpsManager.OP_GPS,
+                    AppOpsManager.OP_WIFI_SCAN,
+                    AppOpsManager.OP_NEIGHBORING_CELLS,
+                    AppOpsManager.OP_MONITOR_LOCATION,
+                    AppOpsManager.OP_MONITOR_HIGH_POWER_LOCATION },
+            new boolean[] { true,
+                    true,
+                    false,
+                    false,
+                    false,
+                    false,
+                    false }
+            );
+
+    public static final OpsTemplate PERSONAL_TEMPLATE = new OpsTemplate(
+            new int[] { AppOpsManager.OP_READ_CONTACTS,
+                    AppOpsManager.OP_WRITE_CONTACTS,
+                    AppOpsManager.OP_READ_CALL_LOG,
+                    AppOpsManager.OP_WRITE_CALL_LOG,
+                    AppOpsManager.OP_READ_CALENDAR,
+                    AppOpsManager.OP_WRITE_CALENDAR,
+                    AppOpsManager.OP_READ_CLIPBOARD,
+                    AppOpsManager.OP_WRITE_CLIPBOARD },
+            new boolean[] { true,
+                    true,
+                    true,
+                    true,
+                    true,
+                    true,
+                    false,
+                    false }
+            );
+
+    public static final OpsTemplate MESSAGING_TEMPLATE = new OpsTemplate(
+            new int[] { AppOpsManager.OP_READ_SMS,
+                    AppOpsManager.OP_RECEIVE_SMS,
+                    AppOpsManager.OP_RECEIVE_EMERGECY_SMS,
+                    AppOpsManager.OP_RECEIVE_MMS,
+                    AppOpsManager.OP_RECEIVE_WAP_PUSH,
+                    AppOpsManager.OP_WRITE_SMS,
+                    AppOpsManager.OP_SEND_SMS,
+                    AppOpsManager.OP_READ_ICC_SMS,
+                    AppOpsManager.OP_WRITE_ICC_SMS },
+            new boolean[] { true,
+                    true,
+                    true,
+                    true,
+                    true,
+                    true,
+                    true,
+                    true,
+                    true }
+            );
+
+    public static final OpsTemplate MEDIA_TEMPLATE = new OpsTemplate(
+            new int[] { AppOpsManager.OP_VIBRATE,
+                    AppOpsManager.OP_CAMERA,
+                    AppOpsManager.OP_RECORD_AUDIO,
+                    AppOpsManager.OP_PLAY_AUDIO,
+                    AppOpsManager.OP_TAKE_MEDIA_BUTTONS,
+                    AppOpsManager.OP_TAKE_AUDIO_FOCUS,
+                    AppOpsManager.OP_AUDIO_MASTER_VOLUME,
+                    AppOpsManager.OP_AUDIO_VOICE_VOLUME,
+                    AppOpsManager.OP_AUDIO_RING_VOLUME,
+                    AppOpsManager.OP_AUDIO_MEDIA_VOLUME,
+                    AppOpsManager.OP_AUDIO_ALARM_VOLUME,
+                    AppOpsManager.OP_AUDIO_NOTIFICATION_VOLUME,
+                    AppOpsManager.OP_AUDIO_BLUETOOTH_VOLUME,
+                    AppOpsManager.OP_AUDIO_ACCESSIBILITY_VOLUME,
+                    AppOpsManager.OP_MUTE_MICROPHONE},
+            new boolean[] { false,
+                    true,
+                    true,
+                    false,
+                    false,
+                    false,
+                    false,
+                    false,
+                    false,
+                    false,
+                    false,
+                    false,
+                    false,
+                    false }
+            );
+
+    public static final OpsTemplate DEVICE_TEMPLATE = new OpsTemplate(
+            new int[] { AppOpsManager.OP_POST_NOTIFICATION,
+                    AppOpsManager.OP_ACCESS_NOTIFICATIONS,
+                    AppOpsManager.OP_CALL_PHONE,
+                    AppOpsManager.OP_WRITE_SETTINGS,
+                    AppOpsManager.OP_SYSTEM_ALERT_WINDOW,
+                    AppOpsManager.OP_WAKE_LOCK,
+                    AppOpsManager.OP_PROJECT_MEDIA,
+                    AppOpsManager.OP_ACTIVATE_VPN,
+                    AppOpsManager.OP_ASSIST_STRUCTURE,
+                    AppOpsManager.OP_ASSIST_SCREENSHOT},
+            new boolean[] { false,
+                    true,
+                    true,
+                    true,
+                    true,
+                    true,
+                    false,
+                    false,
+                    false,
+                    false }
+            );
+
+    public static final OpsTemplate RUN_IN_BACKGROUND_TEMPLATE = new OpsTemplate(
+            new int[] { AppOpsManager.OP_RUN_IN_BACKGROUND },
+            new boolean[] { false }
+            );
+
+    public static final OpsTemplate[] ALL_TEMPLATES = new OpsTemplate[] {
+            LOCATION_TEMPLATE, PERSONAL_TEMPLATE, MESSAGING_TEMPLATE,
+            MEDIA_TEMPLATE, DEVICE_TEMPLATE, RUN_IN_BACKGROUND_TEMPLATE
+    };
+
+    /**
+     * This class holds the per-item data in our Loader.
+     */
+    public static class AppEntry {
+        private final AppOpsState mState;
+        private final ApplicationInfo mInfo;
+        private final File mApkFile;
+        private final SparseArray<AppOpsManager.OpEntry> mOps
+                = new SparseArray<AppOpsManager.OpEntry>();
+        private final SparseArray<AppOpEntry> mOpSwitches
+                = new SparseArray<AppOpEntry>();
+        private String mLabel;
+        private Drawable mIcon;
+        private boolean mMounted;
+
+        public AppEntry(AppOpsState state, ApplicationInfo info) {
+            mState = state;
+            mInfo = info;
+            mApkFile = new File(info.sourceDir);
+        }
+
+        public void addOp(AppOpEntry entry, AppOpsManager.OpEntry op) {
+            mOps.put(op.getOp(), op);
+            mOpSwitches.put(AppOpsManager.opToSwitch(op.getOp()), entry);
+        }
+
+        public boolean hasOp(int op) {
+            return mOps.indexOfKey(op) >= 0;
+        }
+
+        public AppOpEntry getOpSwitch(int op) {
+            return mOpSwitches.get(AppOpsManager.opToSwitch(op));
+        }
+
+        public ApplicationInfo getApplicationInfo() {
+            return mInfo;
+        }
+
+        public String getLabel() {
+            return mLabel;
+        }
+
+        public Drawable getIcon() {
+            if (mIcon == null) {
+                if (mApkFile.exists()) {
+                    mIcon = mInfo.loadIcon(mState.mPm);
+                    return mIcon;
+                } else {
+                    mMounted = false;
+                }
+            } else if (!mMounted) {
+                // If the app wasn't mounted but is now mounted, reload
+                // its icon.
+                if (mApkFile.exists()) {
+                    mMounted = true;
+                    mIcon = mInfo.loadIcon(mState.mPm);
+                    return mIcon;
+                }
+            } else {
+                return mIcon;
+            }
+
+            return mState.mContext.getDrawable(
+                    android.R.drawable.sym_def_app_icon);
+        }
+
+        @Override public String toString() {
+            return mLabel;
+        }
+
+        void loadLabel(Context context) {
+            if (mLabel == null || !mMounted) {
+                if (!mApkFile.exists()) {
+                    mMounted = false;
+                    mLabel = mInfo.packageName;
+                } else {
+                    mMounted = true;
+                    CharSequence label = mInfo.loadLabel(context.getPackageManager());
+                    mLabel = label != null ? label.toString() : mInfo.packageName;
+                }
+            }
+        }
+    }
+
+    /**
+     * This class holds the per-item data in our Loader.
+     */
+    public static class AppOpEntry {
+        private final AppOpsManager.PackageOps mPkgOps;
+        private final ArrayList<AppOpsManager.OpEntry> mOps
+                = new ArrayList<AppOpsManager.OpEntry>();
+        private final ArrayList<AppOpsManager.OpEntry> mSwitchOps
+                = new ArrayList<AppOpsManager.OpEntry>();
+        private final AppEntry mApp;
+        private final int mSwitchOrder;
+        private int mOverriddenPrimaryMode = -1;
+
+        public AppOpEntry(AppOpsManager.PackageOps pkg, AppOpsManager.OpEntry op, AppEntry app,
+                int switchOrder) {
+            mPkgOps = pkg;
+            mApp = app;
+            mSwitchOrder = switchOrder;
+            mApp.addOp(this, op);
+            mOps.add(op);
+            mSwitchOps.add(op);
+        }
+
+        private static void addOp(ArrayList<AppOpsManager.OpEntry> list, AppOpsManager.OpEntry op) {
+            for (int i=0; i<list.size(); i++) {
+                AppOpsManager.OpEntry pos = list.get(i);
+                if (pos.isRunning() != op.isRunning()) {
+                    if (op.isRunning()) {
+                        list.add(i, op);
+                        return;
+                    }
+                    continue;
+                }
+                if (pos.getTime() < op.getTime()) {
+                    list.add(i, op);
+                    return;
+                }
+            }
+            list.add(op);
+        }
+
+        public void addOp(AppOpsManager.OpEntry op) {
+            mApp.addOp(this, op);
+            addOp(mOps, op);
+            if (mApp.getOpSwitch(AppOpsManager.opToSwitch(op.getOp())) == null) {
+                addOp(mSwitchOps, op);
+            }
+        }
+
+        public AppEntry getAppEntry() {
+            return mApp;
+        }
+
+        public int getSwitchOrder() {
+            return mSwitchOrder;
+        }
+
+        public AppOpsManager.PackageOps getPackageOps() {
+            return mPkgOps;
+        }
+
+        public int getNumOpEntry() {
+            return mOps.size();
+        }
+
+        public AppOpsManager.OpEntry getOpEntry(int pos) {
+            return mOps.get(pos);
+        }
+
+        public int getPrimaryOpMode() {
+            return mOverriddenPrimaryMode >= 0 ? mOverriddenPrimaryMode : mOps.get(0).getMode();
+        }
+
+        public void overridePrimaryOpMode(int mode) {
+            mOverriddenPrimaryMode = mode;
+        }
+
+        private CharSequence getCombinedText(ArrayList<AppOpsManager.OpEntry> ops,
+                CharSequence[] items) {
+            if (ops.size() == 1) {
+                return items[ops.get(0).getOp()];
+            } else {
+                StringBuilder builder = new StringBuilder();
+                for (int i=0; i<ops.size(); i++) {
+                    if (i > 0) {
+                        builder.append(", ");
+                    }
+                    builder.append(items[ops.get(i).getOp()]);
+                }
+                return builder.toString();
+            }
+        }
+
+        public CharSequence getSummaryText(AppOpsState state) {
+            return getCombinedText(mOps, state.mOpSummaries);
+        }
+
+        public CharSequence getSwitchText(AppOpsState state) {
+            if (mSwitchOps.size() > 0) {
+                return getCombinedText(mSwitchOps, state.mOpLabels);
+            } else {
+                return getCombinedText(mOps, state.mOpLabels);
+            }
+        }
+
+        public CharSequence getTimeText(Resources res, boolean showEmptyText) {
+            if (isRunning()) {
+                return res.getText(R.string.app_ops_running);
+            }
+            if (getTime() > 0) {
+                return DateUtils.getRelativeTimeSpanString(getTime(),
+                        System.currentTimeMillis(),
+                        DateUtils.MINUTE_IN_MILLIS,
+                        DateUtils.FORMAT_ABBREV_RELATIVE);
+            }
+            return showEmptyText ? res.getText(R.string.app_ops_never_used) : "";
+        }
+
+        public boolean isRunning() {
+            return mOps.get(0).isRunning();
+        }
+
+        public long getTime() {
+            return mOps.get(0).getTime();
+        }
+
+        @Override public String toString() {
+            return mApp.getLabel();
+        }
+    }
+
+    /**
+     * Perform app op state comparison of application entry objects.
+     */
+    public static final Comparator<AppOpEntry> RECENCY_COMPARATOR = new Comparator<AppOpEntry>() {
+        private final Collator sCollator = Collator.getInstance();
+        @Override
+        public int compare(AppOpEntry object1, AppOpEntry object2) {
+            if (object1.getSwitchOrder() != object2.getSwitchOrder()) {
+                return object1.getSwitchOrder() < object2.getSwitchOrder() ? -1 : 1;
+            }
+            if (object1.isRunning() != object2.isRunning()) {
+                // Currently running ops go first.
+                return object1.isRunning() ? -1 : 1;
+            }
+            if (object1.getTime() != object2.getTime()) {
+                // More recent times go first.
+                return object1.getTime() > object2.getTime() ? -1 : 1;
+            }
+            return sCollator.compare(object1.getAppEntry().getLabel(),
+                    object2.getAppEntry().getLabel());
+        }
+    };
+
+    /**
+     * Perform alphabetical comparison of application entry objects.
+     */
+    public static final Comparator<AppOpEntry> LABEL_COMPARATOR = new Comparator<AppOpEntry>() {
+        private final Collator sCollator = Collator.getInstance();
+        @Override
+        public int compare(AppOpEntry object1, AppOpEntry object2) {
+            return sCollator.compare(object1.getAppEntry().getLabel(),
+                    object2.getAppEntry().getLabel());
+        }
+    };
+
+    private void addOp(List<AppOpEntry> entries, AppOpsManager.PackageOps pkgOps,
+            AppEntry appEntry, AppOpsManager.OpEntry opEntry, boolean allowMerge, int switchOrder) {
+        if (allowMerge && entries.size() > 0) {
+            AppOpEntry last = entries.get(entries.size()-1);
+            if (last.getAppEntry() == appEntry) {
+                boolean lastExe = last.getTime() != 0;
+                boolean entryExe = opEntry.getTime() != 0;
+                if (lastExe == entryExe) {
+                    if (DEBUG) Log.d(TAG, "Add op " + opEntry.getOp() + " to package "
+                            + pkgOps.getPackageName() + ": append to " + last);
+                    last.addOp(opEntry);
+                    return;
+                }
+            }
+        }
+        AppOpEntry entry = appEntry.getOpSwitch(opEntry.getOp());
+        if (entry != null) {
+            entry.addOp(opEntry);
+            return;
+        }
+        entry = new AppOpEntry(pkgOps, opEntry, appEntry, switchOrder);
+        if (DEBUG) Log.d(TAG, "Add op " + opEntry.getOp() + " to package "
+                + pkgOps.getPackageName() + ": making new " + entry);
+        entries.add(entry);
+    }
+
+    public AppOpsManager getAppOpsManager() {
+        return mAppOps;
+    }
+
+    public List<AppOpEntry> buildState(OpsTemplate tpl) {
+        return buildState(tpl, 0, null, RECENCY_COMPARATOR);
+    }
+
+    private AppEntry getAppEntry(final Context context, final HashMap<String, AppEntry> appEntries,
+            final String packageName, ApplicationInfo appInfo) {
+        AppEntry appEntry = appEntries.get(packageName);
+        if (appEntry == null) {
+            if (appInfo == null) {
+                try {
+                    appInfo = mPm.getApplicationInfo(packageName,
+                            PackageManager.MATCH_DISABLED_COMPONENTS
+                            | PackageManager.MATCH_ANY_USER);
+                } catch (PackageManager.NameNotFoundException e) {
+                    Log.w(TAG, "Unable to find info for package " + packageName);
+                    return null;
+                }
+            }
+            appEntry = new AppEntry(this, appInfo);
+            appEntry.loadLabel(context);
+            appEntries.put(packageName, appEntry);
+        }
+        return appEntry;
+    }
+
+    public List<AppOpEntry> buildState(OpsTemplate tpl, int uid, String packageName) {
+        return buildState(tpl, uid, packageName, RECENCY_COMPARATOR);
+    }
+
+    public List<AppOpEntry> buildState(OpsTemplate tpl, int uid, String packageName,
+            Comparator<AppOpEntry> comparator) {
+        final Context context = mContext;
+
+        final HashMap<String, AppEntry> appEntries = new HashMap<String, AppEntry>();
+        final List<AppOpEntry> entries = new ArrayList<AppOpEntry>();
+
+        final ArrayList<String> perms = new ArrayList<String>();
+        final ArrayList<Integer> permOps = new ArrayList<Integer>();
+        final int[] opToOrder = new int[AppOpsManager._NUM_OP];
+        for (int i=0; i<tpl.ops.length; i++) {
+            if (tpl.showPerms[i]) {
+                String perm = AppOpsManager.opToPermission(tpl.ops[i]);
+                if (perm != null && !perms.contains(perm)) {
+                    perms.add(perm);
+                    permOps.add(tpl.ops[i]);
+                    opToOrder[tpl.ops[i]] = i;
+                }
+            }
+        }
+
+        List<AppOpsManager.PackageOps> pkgs;
+        if (packageName != null) {
+            pkgs = mAppOps.getOpsForPackage(uid, packageName, tpl.ops);
+        } else {
+            pkgs = mAppOps.getPackagesForOps(tpl.ops);
+        }
+
+        if (pkgs != null) {
+            for (int i=0; i<pkgs.size(); i++) {
+                AppOpsManager.PackageOps pkgOps = pkgs.get(i);
+                AppEntry appEntry = getAppEntry(context, appEntries, pkgOps.getPackageName(), null);
+                if (appEntry == null) {
+                    continue;
+                }
+                for (int j=0; j<pkgOps.getOps().size(); j++) {
+                    AppOpsManager.OpEntry opEntry = pkgOps.getOps().get(j);
+                    addOp(entries, pkgOps, appEntry, opEntry, packageName == null,
+                            packageName == null ? 0 : opToOrder[opEntry.getOp()]);
+                }
+            }
+        }
+
+        List<PackageInfo> apps;
+        if (packageName != null) {
+            apps = new ArrayList<PackageInfo>();
+            try {
+                PackageInfo pi = mPm.getPackageInfo(packageName, PackageManager.GET_PERMISSIONS);
+                apps.add(pi);
+            } catch (NameNotFoundException e) {
+            }
+        } else {
+            String[] permsArray = new String[perms.size()];
+            perms.toArray(permsArray);
+            apps = mPm.getPackagesHoldingPermissions(permsArray, 0);
+        }
+        for (int i=0; i<apps.size(); i++) {
+            PackageInfo appInfo = apps.get(i);
+            AppEntry appEntry = getAppEntry(context, appEntries, appInfo.packageName,
+                    appInfo.applicationInfo);
+            if (appEntry == null) {
+                continue;
+            }
+            List<AppOpsManager.OpEntry> dummyOps = null;
+            AppOpsManager.PackageOps pkgOps = null;
+            if (appInfo.requestedPermissions != null) {
+                for (int j=0; j<appInfo.requestedPermissions.length; j++) {
+                    if (appInfo.requestedPermissionsFlags != null) {
+                        if ((appInfo.requestedPermissionsFlags[j]
+                                & PackageInfo.REQUESTED_PERMISSION_GRANTED) == 0) {
+                            if (DEBUG) Log.d(TAG, "Pkg " + appInfo.packageName + " perm "
+                                    + appInfo.requestedPermissions[j] + " not granted; skipping");
+                            continue;
+                        }
+                    }
+                    if (DEBUG) Log.d(TAG, "Pkg " + appInfo.packageName + ": requested perm "
+                            + appInfo.requestedPermissions[j]);
+                    for (int k=0; k<perms.size(); k++) {
+                        if (!perms.get(k).equals(appInfo.requestedPermissions[j])) {
+                            continue;
+                        }
+                        if (DEBUG) Log.d(TAG, "Pkg " + appInfo.packageName + " perm " + perms.get(k)
+                                + " has op " + permOps.get(k) + ": " + appEntry.hasOp(permOps.get(k)));
+                        if (appEntry.hasOp(permOps.get(k))) {
+                            continue;
+                        }
+                        if (dummyOps == null) {
+                            dummyOps = new ArrayList<AppOpsManager.OpEntry>();
+                            pkgOps = new AppOpsManager.PackageOps(
+                                    appInfo.packageName, appInfo.applicationInfo.uid, dummyOps);
+
+                        }
+                        AppOpsManager.OpEntry opEntry = new AppOpsManager.OpEntry(
+                                permOps.get(k), AppOpsManager.MODE_ALLOWED, 0, 0, 0, -1, null);
+                        dummyOps.add(opEntry);
+                        addOp(entries, pkgOps, appEntry, opEntry, packageName == null,
+                                packageName == null ? 0 : opToOrder[opEntry.getOp()]);
+                    }
+                }
+            }
+        }
+
+        // Sort the list.
+        Collections.sort(entries, comparator);
+
+        // Done!
+        return entries;
+    }
+}
diff --git a/src/com/android/settings/applications/appops/BackgroundCheckSummary.java b/src/com/android/settings/applications/appops/BackgroundCheckSummary.java
new file mode 100644
index 0000000..d9db9aa
--- /dev/null
+++ b/src/com/android/settings/applications/appops/BackgroundCheckSummary.java
@@ -0,0 +1,68 @@
+/*
+ * 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.applications.appops;
+
+import android.annotation.Nullable;
+import android.app.FragmentTransaction;
+import android.os.Bundle;
+import android.preference.PreferenceFrameLayout;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+
+import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
+import com.android.settings.core.InstrumentedPreferenceFragment;
+import com.android.settings.R;
+
+public class BackgroundCheckSummary extends InstrumentedPreferenceFragment {
+    // layout inflater object used to inflate views
+    private LayoutInflater mInflater;
+
+    @Override
+    public int getMetricsCategory() {
+        return MetricsEvent.BACKGROUND_CHECK_SUMMARY;
+    }
+
+    @Override
+    public void onCreate(@Nullable Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        getActivity().setTitle(R.string.background_check_pref);
+    }
+
+    @Override
+    public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
+        // initialize the inflater
+        mInflater = inflater;
+
+        View rootView = mInflater.inflate(R.layout.background_check_summary,
+                container, false);
+
+        // We have to do this now because PreferenceFrameLayout looks at it
+        // only when the view is added.
+        if (container instanceof PreferenceFrameLayout) {
+            ((PreferenceFrameLayout.LayoutParams) rootView.getLayoutParams()).removeBorders = true;
+        }
+
+        FragmentTransaction ft = getChildFragmentManager().beginTransaction();
+        ft.add(R.id.appops_content, new AppOpsCategory(AppOpsState.RUN_IN_BACKGROUND_TEMPLATE),
+                "appops");
+        ft.commitAllowingStateLoss();
+
+        return rootView;
+    }
+
+}
diff --git a/src/com/android/settings/applications/assist/AssistSettingObserver.java b/src/com/android/settings/applications/assist/AssistSettingObserver.java
index e4941d1..01a3a7a 100644
--- a/src/com/android/settings/applications/assist/AssistSettingObserver.java
+++ b/src/com/android/settings/applications/assist/AssistSettingObserver.java
@@ -19,8 +19,10 @@
 import android.content.ContentResolver;
 import android.database.ContentObserver;
 import android.net.Uri;
-import android.os.Handler;
 import android.provider.Settings;
+import android.support.annotation.MainThread;
+
+import com.android.settingslib.utils.ThreadUtils;
 
 import java.util.List;
 
@@ -38,8 +40,9 @@
             cr.registerContentObserver(ASSIST_URI, false, this);
             final List<Uri> settingUri = getSettingUris();
             if (settingUri != null) {
-                for (Uri uri : settingUri)
-                cr.registerContentObserver(uri, false, this);
+                for (Uri uri : settingUri) {
+                    cr.registerContentObserver(uri, false, this);
+                }
             }
         } else {
             cr.unregisterContentObserver(this);
@@ -55,11 +58,15 @@
             shouldUpdatePreference = true;
         }
         if (shouldUpdatePreference) {
-            onSettingChange();
+            ThreadUtils.postOnMainThread(() -> {
+                onSettingChange();
+            });
+
         }
     }
 
     protected abstract List<Uri> getSettingUris();
 
+    @MainThread
     public abstract void onSettingChange();
 }
diff --git a/src/com/android/settings/applications/assist/DefaultAssistPicker.java b/src/com/android/settings/applications/assist/DefaultAssistPicker.java
index 51cb677..01ca25a 100644
--- a/src/com/android/settings/applications/assist/DefaultAssistPicker.java
+++ b/src/com/android/settings/applications/assist/DefaultAssistPicker.java
@@ -65,6 +65,11 @@
     }
 
     @Override
+    protected int getPreferenceScreenResId() {
+        return R.xml.default_assist_settings;
+    }
+
+    @Override
     protected List<DefaultAppInfo> getCandidates() {
         mAvailableAssistants.clear();
         addAssistServices();
@@ -79,7 +84,7 @@
                 continue;
             }
             packages.add(packageName);
-            candidates.add(new DefaultAppInfo(mPm, mUserId, info.component));
+            candidates.add(new DefaultAppInfo(getContext(), mPm, mUserId, info.component));
         }
         return candidates;
     }
@@ -88,7 +93,7 @@
     protected String getDefaultKey() {
         final ComponentName cn = getCurrentAssist();
         if (cn != null) {
-            return new DefaultAppInfo(mPm, mUserId, cn).getKey();
+            return new DefaultAppInfo(getContext(), mPm, mUserId, cn).getKey();
         }
         return null;
     }
diff --git a/src/com/android/settings/applications/assist/DefaultAssistPreferenceController.java b/src/com/android/settings/applications/assist/DefaultAssistPreferenceController.java
index 7520155..cba08c8 100644
--- a/src/com/android/settings/applications/assist/DefaultAssistPreferenceController.java
+++ b/src/com/android/settings/applications/assist/DefaultAssistPreferenceController.java
@@ -87,7 +87,7 @@
         if (cn == null) {
             return null;
         }
-        return new DefaultAppInfo(mPackageManager, mUserId, cn);
+        return new DefaultAppInfo(mContext, mPackageManager, mUserId, cn);
     }
 
     @VisibleForTesting
diff --git a/src/com/android/settings/applications/assist/DefaultVoiceInputPicker.java b/src/com/android/settings/applications/assist/DefaultVoiceInputPicker.java
index f51275e..7a5c13d 100644
--- a/src/com/android/settings/applications/assist/DefaultVoiceInputPicker.java
+++ b/src/com/android/settings/applications/assist/DefaultVoiceInputPicker.java
@@ -24,9 +24,10 @@
 
 import com.android.internal.app.AssistUtils;
 import com.android.internal.logging.nano.MetricsProto;
-import com.android.settings.applications.PackageManagerWrapper;
+import com.android.settings.R;
 import com.android.settings.applications.defaultapps.DefaultAppInfo;
 import com.android.settings.applications.defaultapps.DefaultAppPickerFragment;
+import com.android.settingslib.wrapper.PackageManagerWrapper;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -55,19 +56,25 @@
     }
 
     @Override
+    protected int getPreferenceScreenResId() {
+        return R.xml.default_voice_settings;
+    }
+
+    @Override
     protected List<VoiceInputDefaultAppInfo> getCandidates() {
         final List<VoiceInputDefaultAppInfo> candidates = new ArrayList<>();
+        final Context context = getContext();
         boolean hasEnabled = true;
         for (VoiceInputHelper.InteractionInfo info : mHelper.mAvailableInteractionInfos) {
             final boolean enabled = TextUtils.equals(info.key, mAssistRestrict);
             hasEnabled |= enabled;
-            candidates.add(new VoiceInputDefaultAppInfo(mPm, mUserId, info, enabled));
+            candidates.add(new VoiceInputDefaultAppInfo(context, mPm, mUserId, info, enabled));
         }
 
         final boolean assistIsService = !hasEnabled;
         for (VoiceInputHelper.RecognizerInfo info : mHelper.mAvailableRecognizerInfos) {
             final boolean enabled = !assistIsService;
-            candidates.add(new VoiceInputDefaultAppInfo(mPm, mUserId, info, enabled));
+            candidates.add(new VoiceInputDefaultAppInfo(context, mPm, mUserId, info, enabled));
         }
         return candidates;
     }
@@ -132,9 +139,9 @@
 
         public VoiceInputHelper.BaseInfo mInfo;
 
-        public VoiceInputDefaultAppInfo(PackageManagerWrapper pm, int userId,
+        public VoiceInputDefaultAppInfo(Context context, PackageManagerWrapper pm, int userId,
                 VoiceInputHelper.BaseInfo info, boolean enabled) {
-            super(pm, userId, info.componentName, null /* summary */, enabled);
+            super(context, pm, userId, info.componentName, null /* summary */, enabled);
             mInfo = info;
         }
 
diff --git a/src/com/android/settings/applications/assist/DefaultVoiceInputPreferenceController.java b/src/com/android/settings/applications/assist/DefaultVoiceInputPreferenceController.java
index 3443a44..c305ccf 100644
--- a/src/com/android/settings/applications/assist/DefaultVoiceInputPreferenceController.java
+++ b/src/com/android/settings/applications/assist/DefaultVoiceInputPreferenceController.java
@@ -104,15 +104,15 @@
         }
         for (VoiceInputHelper.InteractionInfo info : mHelper.mAvailableInteractionInfos) {
             if (TextUtils.equals(defaultKey, info.key)) {
-                return new DefaultVoiceInputPicker.VoiceInputDefaultAppInfo(mPackageManager,
-                        mUserId, info, true /* enabled */);
+                return new DefaultVoiceInputPicker.VoiceInputDefaultAppInfo(mContext,
+                        mPackageManager, mUserId, info, true /* enabled */);
             }
         }
 
         for (VoiceInputHelper.RecognizerInfo info : mHelper.mAvailableRecognizerInfos) {
             if (TextUtils.equals(defaultKey, info.key)) {
-                return new DefaultVoiceInputPicker.VoiceInputDefaultAppInfo(mPackageManager,
-                        mUserId, info, true /* enabled */);
+                return new DefaultVoiceInputPicker.VoiceInputDefaultAppInfo(mContext,
+                        mPackageManager, mUserId, info, true /* enabled */);
             }
         }
         return null;
diff --git a/src/com/android/settings/applications/defaultapps/DefaultAppInfo.java b/src/com/android/settings/applications/defaultapps/DefaultAppInfo.java
index 12470eb..71b5ec4 100644
--- a/src/com/android/settings/applications/defaultapps/DefaultAppInfo.java
+++ b/src/com/android/settings/applications/defaultapps/DefaultAppInfo.java
@@ -18,6 +18,7 @@
 
 import android.app.AppGlobals;
 import android.content.ComponentName;
+import android.content.Context;
 import android.content.pm.ApplicationInfo;
 import android.content.pm.ComponentInfo;
 import android.content.pm.PackageItemInfo;
@@ -25,9 +26,10 @@
 import android.graphics.drawable.Drawable;
 import android.os.RemoteException;
 import android.os.UserHandle;
+import android.util.IconDrawableFactory;
 
-import com.android.settings.applications.PackageManagerWrapper;
 import com.android.settings.widget.RadioButtonPickerFragment;
+import com.android.settingslib.wrapper.PackageManagerWrapper;
 
 /**
  * Data model representing an app in DefaultAppPicker UI.
@@ -39,18 +41,20 @@
     public final PackageItemInfo packageItemInfo;
     public final String summary;
     protected final PackageManagerWrapper mPm;
+    private final Context mContext;
 
-    public DefaultAppInfo(PackageManagerWrapper pm, int uid, ComponentName cn) {
-        this(pm, uid, cn, null /* summary */);
+    public DefaultAppInfo(Context context, PackageManagerWrapper pm, int uid, ComponentName cn) {
+        this(context, pm, uid, cn, null /* summary */, true /* enabled */);
     }
 
-    public DefaultAppInfo(PackageManagerWrapper pm, int uid, ComponentName cn, String summary) {
-        this(pm, uid, cn, summary, true /* enabled */);
+    public DefaultAppInfo(Context context, PackageManagerWrapper pm, PackageItemInfo info) {
+        this(context, pm, info, null /* summary */, true /* enabled */);
     }
 
-    public DefaultAppInfo(PackageManagerWrapper pm, int uid, ComponentName cn, String summary,
-            boolean enabled) {
+    public DefaultAppInfo(Context context, PackageManagerWrapper pm, int uid, ComponentName cn,
+            String summary, boolean enabled) {
         super(enabled);
+        mContext = context;
         mPm = pm;
         packageItemInfo = null;
         userId = uid;
@@ -58,9 +62,10 @@
         this.summary = summary;
     }
 
-    public DefaultAppInfo(PackageManagerWrapper pm, PackageItemInfo info, String summary,
-            boolean enabled) {
+    public DefaultAppInfo(Context context, PackageManagerWrapper pm, PackageItemInfo info,
+            String summary, boolean enabled) {
         super(enabled);
+        mContext = context;
         mPm = pm;
         userId = UserHandle.myUserId();
         packageItemInfo = info;
@@ -68,10 +73,6 @@
         this.summary = summary;
     }
 
-    public DefaultAppInfo(PackageManagerWrapper pm, PackageItemInfo info) {
-        this(pm, info, null /* summary */, true /* enabled */);
-    }
-
     @Override
     public CharSequence loadLabel() {
         if (componentName != null) {
@@ -97,22 +98,29 @@
 
     @Override
     public Drawable loadIcon() {
+        final IconDrawableFactory factory = IconDrawableFactory.newInstance(mContext);
         if (componentName != null) {
             try {
                 final ComponentInfo componentInfo = getComponentInfo();
+                final ApplicationInfo appInfo = mPm.getApplicationInfoAsUser(
+                        componentName.getPackageName(), 0, userId);
                 if (componentInfo != null) {
-                    return componentInfo.loadIcon(mPm.getPackageManager());
+                    return factory.getBadgedIcon(componentInfo, appInfo, userId);
                 } else {
-                    final ApplicationInfo appInfo = mPm.getApplicationInfoAsUser(
-                            componentName.getPackageName(), 0, userId);
-                    return appInfo.loadIcon(mPm.getPackageManager());
+                    return factory.getBadgedIcon(appInfo);
                 }
             } catch (PackageManager.NameNotFoundException e) {
                 return null;
             }
         }
         if (packageItemInfo != null) {
-            return packageItemInfo.loadIcon(mPm.getPackageManager());
+            try {
+                final ApplicationInfo appInfo = mPm.getApplicationInfoAsUser(
+                        packageItemInfo.packageName, 0, userId);
+                return factory.getBadgedIcon(packageItemInfo, appInfo, userId);
+            } catch (PackageManager.NameNotFoundException e) {
+                return null;
+            }
         } else {
             return null;
         }
diff --git a/src/com/android/settings/applications/defaultapps/DefaultAppPickerFragment.java b/src/com/android/settings/applications/defaultapps/DefaultAppPickerFragment.java
index d3617ef..7b27516 100644
--- a/src/com/android/settings/applications/defaultapps/DefaultAppPickerFragment.java
+++ b/src/com/android/settings/applications/defaultapps/DefaultAppPickerFragment.java
@@ -29,11 +29,10 @@
 
 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;
 import com.android.settings.core.instrumentation.InstrumentedDialogFragment;
 import com.android.settings.widget.RadioButtonPickerFragment;
 import com.android.settings.widget.RadioButtonPreference;
+import com.android.settingslib.wrapper.PackageManagerWrapper;
 
 /**
  * A generic app picker fragment that shows a list of app as radio button group.
@@ -45,7 +44,7 @@
     @Override
     public void onAttach(Context context) {
         super.onAttach(context);
-        mPm = new PackageManagerWrapperImpl(context.getPackageManager());
+        mPm = new PackageManagerWrapper(context.getPackageManager());
     }
 
     @Override
@@ -85,6 +84,11 @@
         }
     }
 
+    @Override
+    protected int getRadioButtonPreferenceCustomLayoutResId() {
+        return R.layout.preference_app;
+    }
+
     protected ConfirmationDialogFragment newConfirmationDialogFragment(String selectedKey,
             CharSequence confirmationMessage) {
         final ConfirmationDialogFragment fragment = new ConfirmationDialogFragment();
diff --git a/src/com/android/settings/applications/defaultapps/DefaultAppPreferenceController.java b/src/com/android/settings/applications/defaultapps/DefaultAppPreferenceController.java
index c7b450e..d016567 100644
--- a/src/com/android/settings/applications/defaultapps/DefaultAppPreferenceController.java
+++ b/src/com/android/settings/applications/defaultapps/DefaultAppPreferenceController.java
@@ -26,11 +26,12 @@
 import android.util.Log;
 
 import com.android.settings.R;
-import com.android.settings.applications.PackageManagerWrapper;
-import com.android.settings.applications.PackageManagerWrapperImpl;
+import com.android.settings.Utils;
 import com.android.settings.core.PreferenceControllerMixin;
 import com.android.settings.widget.GearPreference;
+import com.android.settingslib.TwoTargetPreference;
 import com.android.settingslib.core.AbstractPreferenceController;
+import com.android.settingslib.wrapper.PackageManagerWrapper;
 
 public abstract class DefaultAppPreferenceController extends AbstractPreferenceController
         implements PreferenceControllerMixin {
@@ -44,7 +45,7 @@
 
     public DefaultAppPreferenceController(Context context) {
         super(context);
-        mPackageManager = new PackageManagerWrapperImpl(context.getPackageManager());
+        mPackageManager = new PackageManagerWrapper(context.getPackageManager());
         mUserManager = (UserManager) context.getSystemService(Context.USER_SERVICE);
         mUserId = UserHandle.myUserId();
     }
@@ -53,9 +54,15 @@
     public void updateState(Preference preference) {
         final DefaultAppInfo app = getDefaultAppInfo();
         CharSequence defaultAppLabel = getDefaultAppLabel();
+        if (preference instanceof TwoTargetPreference) {
+            // For use small icon because we are displaying an app preference.
+            // We only need to do this for TwoTargetPreference because the other prefs are
+            // already using AppPreference so their icon is already normalized.
+            ((TwoTargetPreference) preference).setUseSmallIcon(true);
+        }
         if (!TextUtils.isEmpty(defaultAppLabel)) {
             preference.setSummary(defaultAppLabel);
-            preference.setIcon(getDefaultAppIcon());
+            Utils.setSafeIcon(preference, getDefaultAppIcon());
         } else {
             Log.d(TAG, "No default app");
             preference.setSummary(R.string.app_list_preference_none);
diff --git a/src/com/android/settings/applications/defaultapps/DefaultAutofillPicker.java b/src/com/android/settings/applications/defaultapps/DefaultAutofillPicker.java
index d674522..97f6d4b 100644
--- a/src/com/android/settings/applications/defaultapps/DefaultAutofillPicker.java
+++ b/src/com/android/settings/applications/defaultapps/DefaultAutofillPicker.java
@@ -18,9 +18,7 @@
 
 import android.Manifest;
 import android.app.Activity;
-import android.app.Dialog;
 import android.content.ComponentName;
-import android.content.ContentResolver;
 import android.content.Context;
 import android.content.DialogInterface;
 import android.content.Intent;
@@ -29,8 +27,6 @@
 import android.content.pm.ServiceInfo;
 import android.net.Uri;
 import android.os.Bundle;
-import android.os.Handler;
-import android.os.Looper;
 import android.provider.Settings;
 import android.service.autofill.AutofillService;
 import android.service.autofill.AutofillServiceInfo;
@@ -42,6 +38,7 @@
 import com.android.internal.content.PackageMonitor;
 import com.android.internal.logging.nano.MetricsProto;
 import com.android.settings.R;
+import com.android.settingslib.utils.ThreadUtils;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -62,7 +59,6 @@
      * Set when the fragment is implementing ACTION_REQUEST_SET_AUTOFILL_SERVICE.
      */
     private DialogInterface.OnClickListener mCancelListener;
-    private final Handler mHandler = new Handler();
 
     @Override
     public void onCreate(Bundle savedInstanceState) {
@@ -106,6 +102,11 @@
     }
 
     @Override
+    protected int getPreferenceScreenResId() {
+        return R.xml.default_autofill_settings;
+    }
+
+    @Override
     public int getMetricsCategory() {
         return MetricsProto.MetricsEvent.DEFAULT_AUTOFILL_PICKER;
     }
@@ -121,17 +122,17 @@
     private final PackageMonitor mSettingsPackageMonitor = new PackageMonitor() {
         @Override
         public void onPackageAdded(String packageName, int uid) {
-            mHandler.post(() -> update());
+            ThreadUtils.postOnMainThread(() -> update());
         }
 
         @Override
         public void onPackageModified(String packageName) {
-            mHandler.post(() -> update());
+            ThreadUtils.postOnMainThread(() -> update());
         }
 
         @Override
         public void onPackageRemoved(String packageName, int uid) {
-            mHandler.post(() -> update());
+            ThreadUtils.postOnMainThread(() -> update());
         }
     };
 
@@ -187,12 +188,11 @@
         final List<DefaultAppInfo> candidates = new ArrayList<>();
         final List<ResolveInfo> resolveInfos = mPm.getPackageManager()
                 .queryIntentServices(AUTOFILL_PROBE, PackageManager.GET_META_DATA);
+        final Context context = getContext();
         for (ResolveInfo info : resolveInfos) {
             final String permission = info.serviceInfo.permission;
-            // TODO(b/37563972): remove BIND_AUTOFILL once clients use BIND_AUTOFILL_SERVICE
-            if (Manifest.permission.BIND_AUTOFILL_SERVICE.equals(permission)
-                    || Manifest.permission.BIND_AUTOFILL.equals(permission)) {
-                candidates.add(new DefaultAppInfo(mPm, mUserId, new ComponentName(
+            if (Manifest.permission.BIND_AUTOFILL_SERVICE.equals(permission)) {
+                candidates.add(new DefaultAppInfo(context, mPm, mUserId, new ComponentName(
                         info.serviceInfo.packageName, info.serviceInfo.name)));
             }
         }
diff --git a/src/com/android/settings/applications/defaultapps/DefaultAutofillPreferenceController.java b/src/com/android/settings/applications/defaultapps/DefaultAutofillPreferenceController.java
index 1fd10ff..508cc63 100644
--- a/src/com/android/settings/applications/defaultapps/DefaultAutofillPreferenceController.java
+++ b/src/com/android/settings/applications/defaultapps/DefaultAutofillPreferenceController.java
@@ -23,8 +23,7 @@
 import android.text.TextUtils;
 import android.view.autofill.AutofillManager;
 
-import com.android.settings.applications.AutofillManagerWrapper;
-import com.android.settings.applications.AutofillManagerWrapperImpl;
+import com.android.settings.wrapper.AutofillManagerWrapper;
 
 public class DefaultAutofillPreferenceController extends DefaultAppPreferenceController {
     private AutofillManagerWrapper mAutofillManager;
@@ -32,7 +31,7 @@
     public DefaultAutofillPreferenceController(Context context) {
         super(context);
 
-        mAutofillManager = new AutofillManagerWrapperImpl(
+        mAutofillManager = new AutofillManagerWrapper(
                 mContext.getSystemService(AutofillManager.class));
     }
 
@@ -63,7 +62,7 @@
         final String flattenComponent = Settings.Secure.getString(mContext.getContentResolver(),
                 DefaultAutofillPicker.SETTING);
         if (!TextUtils.isEmpty(flattenComponent)) {
-            DefaultAppInfo appInfo = new DefaultAppInfo(mPackageManager,
+            DefaultAppInfo appInfo = new DefaultAppInfo(mContext, mPackageManager,
                     mUserId, ComponentName.unflattenFromString(flattenComponent));
             return appInfo;
         }
diff --git a/src/com/android/settings/applications/defaultapps/DefaultBrowserPicker.java b/src/com/android/settings/applications/defaultapps/DefaultBrowserPicker.java
index e965052..2639c8d 100644
--- a/src/com/android/settings/applications/defaultapps/DefaultBrowserPicker.java
+++ b/src/com/android/settings/applications/defaultapps/DefaultBrowserPicker.java
@@ -16,10 +16,12 @@
 
 package com.android.settings.applications.defaultapps;
 
+import android.content.Context;
 import android.content.pm.PackageManager;
 import android.content.pm.ResolveInfo;
 
 import com.android.internal.logging.nano.MetricsProto;
+import com.android.settings.R;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -30,6 +32,11 @@
 public class DefaultBrowserPicker extends DefaultAppPickerFragment {
 
     @Override
+    protected int getPreferenceScreenResId() {
+        return R.xml.default_browser_settings;
+    }
+
+    @Override
     public int getMetricsCategory() {
         return MetricsProto.MetricsEvent.DEFAULT_BROWSER_PICKER;
     }
@@ -47,7 +54,7 @@
     @Override
     protected List<DefaultAppInfo> getCandidates() {
         final List<DefaultAppInfo> candidates = new ArrayList<>();
-
+        final Context context = getContext();
         // Resolve that intent and check that the handleAllWebDataURI boolean is set
         final List<ResolveInfo> list = mPm.queryIntentActivitiesAsUser(
                 DefaultBrowserPreferenceController.BROWSE_PROBE, PackageManager.MATCH_ALL, mUserId);
@@ -59,7 +66,7 @@
                 continue;
             }
             try {
-                candidates.add(new DefaultAppInfo(mPm,
+                candidates.add(new DefaultAppInfo(context, mPm,
                         mPm.getApplicationInfoAsUser(info.activityInfo.packageName, 0, mUserId)));
             } catch (PackageManager.NameNotFoundException e) {
                 // Skip unknown packages.
diff --git a/src/com/android/settings/applications/defaultapps/DefaultBrowserPreferenceController.java b/src/com/android/settings/applications/defaultapps/DefaultBrowserPreferenceController.java
index a0bf0ca..916f9422 100644
--- a/src/com/android/settings/applications/defaultapps/DefaultBrowserPreferenceController.java
+++ b/src/com/android/settings/applications/defaultapps/DefaultBrowserPreferenceController.java
@@ -18,6 +18,7 @@
 
 import android.content.Context;
 import android.content.Intent;
+import android.content.pm.ApplicationInfo;
 import android.content.pm.ComponentInfo;
 import android.content.pm.PackageManager;
 import android.content.pm.ResolveInfo;
@@ -25,6 +26,7 @@
 import android.net.Uri;
 import android.support.v7.preference.Preference;
 import android.text.TextUtils;
+import android.util.IconDrawableFactory;
 import android.util.Log;
 
 import java.util.List;
@@ -67,7 +69,7 @@
         try {
             final String packageName = mPackageManager.getDefaultBrowserPackageNameAsUser(mUserId);
             Log.d(TAG, "Get default browser package: " + packageName);
-            return new DefaultAppInfo(mPackageManager,
+            return new DefaultAppInfo(mContext, mPackageManager,
                     mPackageManager.getPackageManager().getApplicationInfo(packageName, 0));
         } catch (PackageManager.NameNotFoundException e) {
             return null;
@@ -124,8 +126,19 @@
             final ResolveInfo info = list.get(0);
             final ComponentInfo cn = info.getComponentInfo();
             final String packageName = cn == null ? null : cn.packageName;
+            if (TextUtils.isEmpty(packageName)) {
+                return null;
+            }
+            final ApplicationInfo appInfo;
+            try {
+                appInfo = mPackageManager.getPackageManager().getApplicationInfo(packageName, 0);
+            } catch (PackageManager.NameNotFoundException e) {
+                Log.w(TAG, "Error getting app info for " + packageName);
+                return null;
+            }
             Log.d(TAG, "Getting icon for the only browser app: " + packageName);
-            return info.loadIcon(mPackageManager.getPackageManager());
+            final IconDrawableFactory iconFactory = IconDrawableFactory.newInstance(mContext);
+            return iconFactory.getBadgedIcon(cn, appInfo, mUserId);
         }
         return null;
     }
diff --git a/src/com/android/settings/applications/defaultapps/DefaultEmergencyPicker.java b/src/com/android/settings/applications/defaultapps/DefaultEmergencyPicker.java
index 1d707df..bafd56f 100644
--- a/src/com/android/settings/applications/defaultapps/DefaultEmergencyPicker.java
+++ b/src/com/android/settings/applications/defaultapps/DefaultEmergencyPicker.java
@@ -17,6 +17,7 @@
 package com.android.settings.applications.defaultapps;
 
 import android.content.ContentResolver;
+import android.content.Context;
 import android.content.pm.ApplicationInfo;
 import android.content.pm.PackageInfo;
 import android.content.pm.PackageManager;
@@ -39,17 +40,23 @@
     }
 
     @Override
+    protected int getPreferenceScreenResId() {
+        return R.xml.default_emergency_settings;
+    }
+
+    @Override
     protected List<DefaultAppInfo> getCandidates() {
         final List<DefaultAppInfo> candidates = new ArrayList<>();
         final List<ResolveInfo> infos = mPm.getPackageManager().queryIntentActivities(
                 DefaultEmergencyPreferenceController.QUERY_INTENT, 0);
         PackageInfo bestMatch = null;
+        final Context context = getContext();
         for (ResolveInfo info : infos) {
             try {
                 final PackageInfo packageInfo =
                         mPm.getPackageManager().getPackageInfo(info.activityInfo.packageName, 0);
                 final ApplicationInfo appInfo = packageInfo.applicationInfo;
-                candidates.add(new DefaultAppInfo(mPm, appInfo));
+                candidates.add(new DefaultAppInfo(context, mPm, appInfo));
                 // Get earliest installed system app.
                 if (isSystemApp(appInfo) && (bestMatch == null ||
                         bestMatch.firstInstallTime > packageInfo.firstInstallTime)) {
diff --git a/src/com/android/settings/applications/defaultapps/DefaultHomePicker.java b/src/com/android/settings/applications/defaultapps/DefaultHomePicker.java
index dca7ad1..63efc44 100644
--- a/src/com/android/settings/applications/defaultapps/DefaultHomePicker.java
+++ b/src/com/android/settings/applications/defaultapps/DefaultHomePicker.java
@@ -44,6 +44,11 @@
     }
 
     @Override
+    protected int getPreferenceScreenResId() {
+        return R.xml.default_home_settings;
+    }
+
+    @Override
     public int getMetricsCategory() {
         return MetricsProto.MetricsEvent.DEFAULT_HOME_PICKER;
     }
@@ -53,6 +58,7 @@
         final boolean mustSupportManagedProfile = hasManagedProfile();
         final List<DefaultAppInfo> candidates = new ArrayList<>();
         final List<ResolveInfo> homeActivities = new ArrayList<>();
+        final Context context = getContext();
         mPm.getHomeActivities(homeActivities);
 
         for (ResolveInfo resolveInfo : homeActivities) {
@@ -71,7 +77,7 @@
                 summary = null;
             }
             final DefaultAppInfo candidate =
-                    new DefaultAppInfo(mPm, mUserId, activityName, summary, enabled);
+                    new DefaultAppInfo(context, mPm, mUserId, activityName, summary, enabled);
             candidates.add(candidate);
         }
         return candidates;
diff --git a/src/com/android/settings/applications/defaultapps/DefaultHomePreferenceController.java b/src/com/android/settings/applications/defaultapps/DefaultHomePreferenceController.java
index 88b36b2..a7d65d3 100644
--- a/src/com/android/settings/applications/defaultapps/DefaultHomePreferenceController.java
+++ b/src/com/android/settings/applications/defaultapps/DefaultHomePreferenceController.java
@@ -24,7 +24,7 @@
 import android.content.pm.PackageManager;
 import android.content.pm.ResolveInfo;
 
-import com.android.settings.applications.PackageManagerWrapper;
+import com.android.settingslib.wrapper.PackageManagerWrapper;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -61,17 +61,17 @@
         final ArrayList<ResolveInfo> homeActivities = new ArrayList<>();
         final ComponentName currentDefaultHome = mPackageManager.getHomeActivities(homeActivities);
         if (currentDefaultHome != null) {
-            return new DefaultAppInfo(mPackageManager, mUserId, currentDefaultHome);
+            return new DefaultAppInfo(mContext, mPackageManager, mUserId, currentDefaultHome);
         }
-        final ActivityInfo onlyAppInfo = getOnlyAppInfo();
+        final ActivityInfo onlyAppInfo = getOnlyAppInfo(homeActivities);
         if (onlyAppInfo != null) {
-            return new DefaultAppInfo(mPackageManager, mUserId, onlyAppInfo.getComponentName());
+            return new DefaultAppInfo(mContext, mPackageManager, mUserId,
+                    onlyAppInfo.getComponentName());
         }
         return null;
     }
 
-    private ActivityInfo getOnlyAppInfo() {
-        final List<ResolveInfo> homeActivities = new ArrayList<>();
+    private ActivityInfo getOnlyAppInfo(List<ResolveInfo> homeActivities) {
         final List<ActivityInfo> appLabels = new ArrayList<>();
 
         mPackageManager.getHomeActivities(homeActivities);
@@ -87,6 +87,23 @@
                 : null;
     }
 
+    @Override
+    protected Intent getSettingIntent(DefaultAppInfo info) {
+        final String packageName;
+        if (info.componentName != null) {
+            packageName = info.componentName.getPackageName();
+        } else if (info.packageItemInfo != null) {
+            packageName = info.packageItemInfo.packageName;
+        } else {
+            return null;
+        }
+
+        Intent intent = new Intent(Intent.ACTION_APPLICATION_PREFERENCES)
+                .setPackage(packageName)
+                .addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+        return mPackageManager.queryIntentActivities(intent, 0).size() == 1 ? intent : null;
+    }
+
     public static boolean hasHomePreference(String pkg, Context context) {
         ArrayList<ResolveInfo> homeActivities = new ArrayList<>();
         PackageManager pm = context.getPackageManager();
diff --git a/src/com/android/settings/applications/defaultapps/DefaultPhonePicker.java b/src/com/android/settings/applications/defaultapps/DefaultPhonePicker.java
index fc643c8..6a1d919 100644
--- a/src/com/android/settings/applications/defaultapps/DefaultPhonePicker.java
+++ b/src/com/android/settings/applications/defaultapps/DefaultPhonePicker.java
@@ -23,6 +23,7 @@
 import android.text.TextUtils;
 
 import com.android.internal.logging.nano.MetricsProto;
+import com.android.settings.R;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -44,13 +45,19 @@
     }
 
     @Override
+    protected int getPreferenceScreenResId() {
+        return R.xml.default_phone_settings;
+    }
+
+    @Override
     protected List<DefaultAppInfo> getCandidates() {
         final List<DefaultAppInfo> candidates = new ArrayList<>();
         final List<String> dialerPackages =
                 DefaultDialerManager.getInstalledDialerApplications(getContext(), mUserId);
+        final Context context = getContext();
         for (String packageName : dialerPackages) {
             try {
-                candidates.add(new DefaultAppInfo(mPm,
+                candidates.add(new DefaultAppInfo(context, mPm,
                         mPm.getApplicationInfoAsUser(packageName, 0, mUserId)));
             } catch (PackageManager.NameNotFoundException e) {
                 // Skip unknown packages.
diff --git a/src/com/android/settings/applications/defaultapps/DefaultPhonePreferenceController.java b/src/com/android/settings/applications/defaultapps/DefaultPhonePreferenceController.java
index 712badb..92c9386 100644
--- a/src/com/android/settings/applications/defaultapps/DefaultPhonePreferenceController.java
+++ b/src/com/android/settings/applications/defaultapps/DefaultPhonePreferenceController.java
@@ -57,7 +57,7 @@
     @Override
     protected DefaultAppInfo getDefaultAppInfo() {
         try {
-            return new DefaultAppInfo(mPackageManager,
+            return new DefaultAppInfo(mContext, mPackageManager,
                     mPackageManager.getPackageManager().getApplicationInfo(
                             DefaultDialerManager.getDefaultDialerApplication(mContext, mUserId),
                             0));
diff --git a/src/com/android/settings/applications/defaultapps/DefaultSmsPicker.java b/src/com/android/settings/applications/defaultapps/DefaultSmsPicker.java
index 966cd43..4c6c9ce 100644
--- a/src/com/android/settings/applications/defaultapps/DefaultSmsPicker.java
+++ b/src/com/android/settings/applications/defaultapps/DefaultSmsPicker.java
@@ -40,14 +40,20 @@
     }
 
     @Override
+    protected int getPreferenceScreenResId() {
+        return R.xml.default_sms_settings;
+    }
+
+    @Override
     protected List<DefaultAppInfo> getCandidates() {
+        final Context context = getContext();
         final Collection<SmsApplication.SmsApplicationData> smsApplications =
-                SmsApplication.getApplicationCollection(getContext());
+                SmsApplication.getApplicationCollection(context);
         final List<DefaultAppInfo> candidates = new ArrayList<>(smsApplications.size());
 
         for (SmsApplication.SmsApplicationData smsApplicationData : smsApplications) {
             try {
-                candidates.add(new DefaultAppInfo(mPm,
+                candidates.add(new DefaultAppInfo(context, mPm,
                         mPm.getApplicationInfoAsUser(smsApplicationData.mPackageName, 0, mUserId)));
             } catch (PackageManager.NameNotFoundException e) {
                 // Skip unknown packages.
diff --git a/src/com/android/settings/applications/defaultapps/DefaultSmsPreferenceController.java b/src/com/android/settings/applications/defaultapps/DefaultSmsPreferenceController.java
index 63075b9..c3b7ac4 100644
--- a/src/com/android/settings/applications/defaultapps/DefaultSmsPreferenceController.java
+++ b/src/com/android/settings/applications/defaultapps/DefaultSmsPreferenceController.java
@@ -47,7 +47,7 @@
     protected DefaultAppInfo getDefaultAppInfo() {
         final ComponentName app = SmsApplication.getDefaultSmsApplication(mContext, true);
         if (app != null) {
-            return new DefaultAppInfo(mPackageManager, mUserId, app);
+            return new DefaultAppInfo(mContext, mPackageManager, mUserId, app);
         }
         return null;
     }
diff --git a/src/com/android/settings/applications/defaultapps/DefaultWorkBrowserPreferenceController.java b/src/com/android/settings/applications/defaultapps/DefaultWorkBrowserPreferenceController.java
index 0792ff9..4dc984b 100644
--- a/src/com/android/settings/applications/defaultapps/DefaultWorkBrowserPreferenceController.java
+++ b/src/com/android/settings/applications/defaultapps/DefaultWorkBrowserPreferenceController.java
@@ -23,6 +23,7 @@
 
 public class DefaultWorkBrowserPreferenceController extends DefaultBrowserPreferenceController {
 
+    public static final String KEY = "work_default_browser";
     private final UserHandle mUserHandle;
 
     public DefaultWorkBrowserPreferenceController(Context context) {
@@ -35,7 +36,7 @@
 
     @Override
     public String getPreferenceKey() {
-        return "work_default_browser";
+        return KEY;
     }
 
     @Override
diff --git a/src/com/android/settings/applications/defaultapps/DefaultWorkPhonePreferenceController.java b/src/com/android/settings/applications/defaultapps/DefaultWorkPhonePreferenceController.java
index c6d04fa..decff06 100644
--- a/src/com/android/settings/applications/defaultapps/DefaultWorkPhonePreferenceController.java
+++ b/src/com/android/settings/applications/defaultapps/DefaultWorkPhonePreferenceController.java
@@ -23,6 +23,7 @@
 
 public class DefaultWorkPhonePreferenceController extends DefaultPhonePreferenceController {
 
+    public static final String KEY = "work_default_phone_app";
     private final UserHandle mUserHandle;
 
     public DefaultWorkPhonePreferenceController(Context context) {
@@ -43,6 +44,6 @@
 
     @Override
     public String getPreferenceKey() {
-        return "work_default_phone_app";
+        return KEY;
     }
 }
diff --git a/src/com/android/settings/applications/instantapps/InstantAppButtonsController.java b/src/com/android/settings/applications/instantapps/InstantAppButtonsController.java
index 16956df..28e612c 100644
--- a/src/com/android/settings/applications/instantapps/InstantAppButtonsController.java
+++ b/src/com/android/settings/applications/instantapps/InstantAppButtonsController.java
@@ -29,9 +29,8 @@
 import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
 import com.android.settings.R;
 import com.android.settings.applications.AppStoreUtil;
-import com.android.settings.applications.PackageManagerWrapper;
-import com.android.settings.applications.PackageManagerWrapperImpl;
 import com.android.settings.overlay.FeatureFactory;
+import com.android.settingslib.wrapper.PackageManagerWrapper;
 
 /** Encapsulates a container for buttons relevant to instant apps */
 public class InstantAppButtonsController implements DialogInterface.OnClickListener {
@@ -62,7 +61,7 @@
       mFragment = fragment;
       mView = view;
       mShowDialogDelegate = showDialogDelegate;
-      mPackageManagerWrapper = new PackageManagerWrapperImpl(context.getPackageManager());
+      mPackageManagerWrapper = new PackageManagerWrapper(context.getPackageManager());
     }
 
     public InstantAppButtonsController setPackageName(String packageName) {
diff --git a/src/com/android/settings/applications/manageapplications/AppFilterItem.java b/src/com/android/settings/applications/manageapplications/AppFilterItem.java
new file mode 100644
index 0000000..c6f5639
--- /dev/null
+++ b/src/com/android/settings/applications/manageapplications/AppFilterItem.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.applications.manageapplications;
+
+import android.support.annotation.StringRes;
+
+import com.android.settingslib.applications.ApplicationsState;
+
+import java.util.Objects;
+
+/**
+ * Data model for a displayable app filter.
+ */
+public class AppFilterItem implements Comparable<AppFilterItem> {
+
+    @StringRes
+    private final int mTitle;
+    @AppFilterRegistry.FilterType
+    private final int mFilterType;
+    private final ApplicationsState.AppFilter mFilter;
+
+    public AppFilterItem(ApplicationsState.AppFilter filter,
+            @AppFilterRegistry.FilterType int filterType,
+            @StringRes int title) {
+        mTitle = title;
+        mFilterType = filterType;
+        mFilter = filter;
+    }
+
+    public int getTitle() {
+        return mTitle;
+    }
+
+    public ApplicationsState.AppFilter getFilter() {
+        return mFilter;
+    }
+
+    public int getFilterType() {
+        return mFilterType;
+    }
+
+    @Override
+    public int compareTo(AppFilterItem appFilter) {
+        if (appFilter == null) {
+            return 1;
+        }
+        if (this == appFilter) {
+            return 0;
+        }
+        return mFilterType - appFilter.mFilterType;
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        if (o == null || !(o instanceof AppFilterItem)) {
+            return false;
+        }
+        if (this == o) {
+            return true;
+        }
+        final AppFilterItem other = (AppFilterItem) o;
+        return mTitle == other.mTitle
+                && mFilterType == other.mFilterType
+                && mFilter == other.mFilter;
+    }
+
+    @Override
+    public int hashCode() {
+        return Objects.hash(mFilter, mTitle, mFilterType);
+    }
+}
diff --git a/src/com/android/settings/applications/manageapplications/AppFilterRegistry.java b/src/com/android/settings/applications/manageapplications/AppFilterRegistry.java
new file mode 100644
index 0000000..01d2cb8
--- /dev/null
+++ b/src/com/android/settings/applications/manageapplications/AppFilterRegistry.java
@@ -0,0 +1,188 @@
+/*
+ * Copyright (C) 2017 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF 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.manageapplications;
+
+import android.support.annotation.IntDef;
+
+import com.android.settings.R;
+import com.android.settings.applications.AppStateInstallAppsBridge;
+import com.android.settings.applications.AppStateNotificationBridge;
+import com.android.settings.applications.AppStateOverlayBridge;
+import com.android.settings.applications.AppStatePowerBridge;
+import com.android.settings.applications.AppStateUsageBridge;
+import com.android.settings.applications.AppStateWriteSettingsBridge;
+import com.android.settingslib.applications.ApplicationsState;
+
+/**
+ * A registry and helper class that manages all {@link AppFilterItem}s for ManageApplications UI.
+ */
+public class AppFilterRegistry {
+
+    @IntDef(value = {
+            FILTER_APPS_POWER_WHITELIST,
+            FILTER_APPS_POWER_WHITELIST_ALL,
+            FILTER_APPS_ALL,
+            FILTER_APPS_ENABLED,
+            FILTER_APPS_INSTANT,
+            FILTER_APPS_DISABLED,
+            FILTER_APPS_BLOCKED,
+            FILTER_APPS_PERSONAL,
+            FILTER_APPS_WORK,
+            FILTER_APPS_USAGE_ACCESS,
+            FILTER_APPS_WITH_OVERLAY,
+            FILTER_APPS_WRITE_SETTINGS,
+            FILTER_APPS_INSTALL_SOURCES,
+    })
+    @interface FilterType {
+    }
+
+    // Filter options used for displayed list of applications
+    // Filters will appear sorted based on their value defined here.
+    public static final int FILTER_APPS_POWER_WHITELIST = 0;
+    public static final int FILTER_APPS_POWER_WHITELIST_ALL = 1;
+    public static final int FILTER_APPS_ALL = 2;
+    public static final int FILTER_APPS_ENABLED = 3;
+    public static final int FILTER_APPS_INSTANT = 4;
+    public static final int FILTER_APPS_DISABLED = 5;
+    public static final int FILTER_APPS_BLOCKED = 6;
+    public static final int FILTER_APPS_PERSONAL = 7;
+    public static final int FILTER_APPS_WORK = 8;
+    public static final int FILTER_APPS_USAGE_ACCESS = 9;
+    public static final int FILTER_APPS_WITH_OVERLAY = 10;
+    public static final int FILTER_APPS_WRITE_SETTINGS = 11;
+    public static final int FILTER_APPS_INSTALL_SOURCES = 12;
+    // Next id: 13
+
+    private static AppFilterRegistry sRegistry;
+
+    private final AppFilterItem[] mFilters;
+
+    private AppFilterRegistry() {
+        mFilters = new AppFilterItem[13];
+
+        // High power whitelist, on
+        mFilters[FILTER_APPS_POWER_WHITELIST] = new AppFilterItem(
+                new ApplicationsState.CompoundFilter(
+                        AppStatePowerBridge.FILTER_POWER_WHITELISTED,
+                        ApplicationsState.FILTER_ALL_ENABLED),
+                FILTER_APPS_POWER_WHITELIST,
+                R.string.high_power_filter_on);
+
+        // Without disabled until used
+        mFilters[FILTER_APPS_POWER_WHITELIST_ALL] = new AppFilterItem(
+                new ApplicationsState.CompoundFilter(
+                        ApplicationsState.FILTER_WITHOUT_DISABLED_UNTIL_USED,
+                        ApplicationsState.FILTER_ALL_ENABLED),
+                FILTER_APPS_POWER_WHITELIST_ALL,
+                R.string.filter_all_apps);
+
+        // All apps
+        mFilters[FILTER_APPS_ALL] = new AppFilterItem(
+                ApplicationsState.FILTER_EVERYTHING,
+                FILTER_APPS_ALL,
+                R.string.filter_all_apps);
+
+        // Enabled
+        mFilters[FILTER_APPS_ENABLED] = new AppFilterItem(
+                ApplicationsState.FILTER_ALL_ENABLED,
+                FILTER_APPS_ENABLED,
+                R.string.filter_enabled_apps);
+
+        // Disabled
+        mFilters[FILTER_APPS_DISABLED] = new AppFilterItem(
+                ApplicationsState.FILTER_DISABLED,
+                FILTER_APPS_DISABLED,
+                R.string.filter_apps_disabled);
+
+        // Instant
+        mFilters[FILTER_APPS_INSTANT] = new AppFilterItem(
+                ApplicationsState.FILTER_INSTANT,
+                FILTER_APPS_INSTANT,
+                R.string.filter_instant_apps);
+
+        // Blocked Notifications
+        mFilters[FILTER_APPS_BLOCKED] = new AppFilterItem(
+                AppStateNotificationBridge.FILTER_APP_NOTIFICATION_BLOCKED,
+                FILTER_APPS_BLOCKED,
+                R.string.filter_notif_blocked_apps);
+
+        // Personal
+        mFilters[FILTER_APPS_PERSONAL] = new AppFilterItem(
+                ApplicationsState.FILTER_PERSONAL,
+                FILTER_APPS_PERSONAL,
+                R.string.filter_personal_apps);
+
+        // Work
+        mFilters[FILTER_APPS_WORK] = new AppFilterItem(
+                ApplicationsState.FILTER_WORK,
+                FILTER_APPS_WORK,
+                R.string.filter_work_apps);
+
+        // Usage access screen, never displayed.
+        mFilters[FILTER_APPS_USAGE_ACCESS] = new AppFilterItem(
+                AppStateUsageBridge.FILTER_APP_USAGE,
+                FILTER_APPS_USAGE_ACCESS,
+                R.string.filter_all_apps);
+
+        // Apps that can draw overlays
+        mFilters[FILTER_APPS_WITH_OVERLAY] = new AppFilterItem(
+                AppStateOverlayBridge.FILTER_SYSTEM_ALERT_WINDOW,
+                FILTER_APPS_WITH_OVERLAY,
+                R.string.filter_overlay_apps);
+
+        // Apps that can write system settings
+        mFilters[FILTER_APPS_WRITE_SETTINGS] = new AppFilterItem(
+                AppStateWriteSettingsBridge.FILTER_WRITE_SETTINGS,
+                FILTER_APPS_WRITE_SETTINGS,
+                R.string.filter_write_settings_apps);
+
+        // Apps that are trusted sources of apks
+        mFilters[FILTER_APPS_INSTALL_SOURCES] = new AppFilterItem(
+                AppStateInstallAppsBridge.FILTER_APP_SOURCES,
+                FILTER_APPS_INSTALL_SOURCES,
+                R.string.filter_install_sources_apps);
+    }
+
+    public static AppFilterRegistry getInstance() {
+        if (sRegistry == null) {
+            sRegistry = new AppFilterRegistry();
+        }
+        return sRegistry;
+    }
+
+    @FilterType
+    public int getDefaultFilterType(int listType) {
+        switch (listType) {
+            case ManageApplications.LIST_TYPE_USAGE_ACCESS:
+                return FILTER_APPS_USAGE_ACCESS;
+            case ManageApplications.LIST_TYPE_HIGH_POWER:
+                return FILTER_APPS_POWER_WHITELIST;
+            case ManageApplications.LIST_TYPE_OVERLAY:
+                return FILTER_APPS_WITH_OVERLAY;
+            case ManageApplications.LIST_TYPE_WRITE_SETTINGS:
+                return FILTER_APPS_WRITE_SETTINGS;
+            case ManageApplications.LIST_TYPE_MANAGE_SOURCES:
+                return FILTER_APPS_INSTALL_SOURCES;
+            default:
+                return FILTER_APPS_ALL;
+        }
+    }
+
+    public AppFilterItem get(@FilterType int filterType) {
+        return mFilters[filterType];
+    }
+}
diff --git a/src/com/android/settings/applications/manageapplications/ApplicationViewHolder.java b/src/com/android/settings/applications/manageapplications/ApplicationViewHolder.java
new file mode 100644
index 0000000..e968b1c
--- /dev/null
+++ b/src/com/android/settings/applications/manageapplications/ApplicationViewHolder.java
@@ -0,0 +1,144 @@
+/*
+ * Copyright (C) 2017 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF 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.manageapplications;
+
+import android.content.pm.ApplicationInfo;
+import android.content.pm.PackageManager;
+import android.graphics.drawable.Drawable;
+import android.support.annotation.StringRes;
+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.view.ViewGroup;
+import android.widget.ImageView;
+import android.widget.TextView;
+
+import com.android.settings.R;
+import com.android.settingslib.applications.ApplicationsState;
+import com.android.settingslib.applications.ApplicationsState.AppEntry;
+
+public class ApplicationViewHolder extends RecyclerView.ViewHolder {
+
+    private final TextView mAppName;
+    private final ImageView mAppIcon;
+
+    private final boolean mKeepStableHeight;
+
+    @VisibleForTesting
+    View mSummaryContainer;
+    @VisibleForTesting
+    final TextView mSummary;
+    @VisibleForTesting
+    final TextView mDisabled;
+
+
+    ApplicationViewHolder(View itemView, boolean keepStableHeight) {
+        super(itemView);
+        mAppName = itemView.findViewById(android.R.id.title);
+        mAppIcon = itemView.findViewById(android.R.id.icon);
+        mSummaryContainer = itemView.findViewById(R.id.summary_container);
+        mSummary = itemView.findViewById(android.R.id.summary);
+        mDisabled = itemView.findViewById(R.id.appendix);
+        mKeepStableHeight = keepStableHeight;
+    }
+
+    static View newView(ViewGroup parent) {
+        return LayoutInflater.from(parent.getContext())
+                .inflate(R.layout.preference_app, parent, false);
+    }
+
+    void setSummary(CharSequence summary) {
+        mSummary.setText(summary);
+        updateSummaryContainer();
+    }
+
+    void setSummary(@StringRes int summary) {
+        mSummary.setText(summary);
+        updateSummaryContainer();
+    }
+
+    void setEnabled(boolean isEnabled) {
+        itemView.setEnabled(isEnabled);
+    }
+
+    void setTitle(CharSequence title) {
+        if (title == null) {
+            return;
+        }
+        mAppName.setText(title);
+    }
+
+    void setIcon(int drawableRes) {
+        mAppIcon.setImageResource(drawableRes);
+    }
+
+    void setIcon(Drawable icon) {
+        if (icon == null) {
+            return;
+        }
+        mAppIcon.setImageDrawable(icon);
+    }
+
+    void updateDisableView(ApplicationInfo info) {
+        if ((info.flags & ApplicationInfo.FLAG_INSTALLED) == 0) {
+            mDisabled.setVisibility(View.VISIBLE);
+            mDisabled.setText(R.string.not_installed);
+        } else if (!info.enabled || info.enabledSetting
+                == PackageManager.COMPONENT_ENABLED_STATE_DISABLED_UNTIL_USED) {
+            mDisabled.setVisibility(View.VISIBLE);
+            mDisabled.setText(R.string.disabled);
+        } else {
+            mDisabled.setVisibility(View.GONE);
+        }
+        updateSummaryContainer();
+    }
+
+    void updateSummaryContainer() {
+        if (mKeepStableHeight) {
+            mSummaryContainer.setVisibility(View.VISIBLE);
+            return;
+        }
+        final boolean hasContent =
+                !TextUtils.isEmpty(mDisabled.getText()) || !TextUtils.isEmpty(mSummary.getText());
+        mSummaryContainer.setVisibility(hasContent ? View.VISIBLE : View.GONE);
+    }
+
+    void updateSizeText(AppEntry entry, CharSequence invalidSizeStr, int whichSize) {
+        if (ManageApplications.DEBUG) {
+            Log.d(ManageApplications.TAG, "updateSizeText of "
+                    + entry.label + " " + entry + ": " + entry.sizeStr);
+        }
+        if (entry.sizeStr != null) {
+            switch (whichSize) {
+                case ManageApplications.SIZE_INTERNAL:
+                    setSummary(entry.internalSizeStr);
+                    break;
+                case ManageApplications.SIZE_EXTERNAL:
+                    setSummary(entry.externalSizeStr);
+                    break;
+                default:
+                    setSummary(entry.sizeStr);
+                    break;
+            }
+        } else if (entry.size == ApplicationsState.SIZE_INVALID) {
+            setSummary(invalidSizeStr);
+        }
+    }
+}
diff --git a/src/com/android/settings/applications/manageapplications/FileViewHolderController.java b/src/com/android/settings/applications/manageapplications/FileViewHolderController.java
new file mode 100644
index 0000000..4e6bf26
--- /dev/null
+++ b/src/com/android/settings/applications/manageapplications/FileViewHolderController.java
@@ -0,0 +1,49 @@
+/*
+ * 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.applications.manageapplications;
+
+import android.app.Fragment;
+
+/**
+ * FileViewHolderController handles adapting the AppViewHolder to work as a general purpose
+ * storage categorization preference in the ManageApplications view.
+ */
+public interface FileViewHolderController {
+    /**
+     * Begins a synchronous query for statistics for the files.
+     */
+    void queryStats();
+
+    /**
+     * Returns if the preference should be shown.
+     */
+    boolean shouldShow();
+
+    /**
+     * Initializes the view within an AppViewHolder.
+     *
+     * @param holder The holder to use to initialize.
+     */
+    void setupView(ApplicationViewHolder holder);
+
+    /**
+     * Handles the behavior when the view is clicked.
+     *
+     * @param fragment Fragment where the click originated.
+     */
+    void onClick(Fragment fragment);
+}
diff --git a/src/com/android/settings/applications/manageapplications/ManageApplications.java b/src/com/android/settings/applications/manageapplications/ManageApplications.java
new file mode 100644
index 0000000..e9d105d
--- /dev/null
+++ b/src/com/android/settings/applications/manageapplications/ManageApplications.java
@@ -0,0 +1,1290 @@
+/*
+ * Copyright (C) 2006 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF 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.manageapplications;
+
+import static com.android.settings.applications.manageapplications.AppFilterRegistry
+        .FILTER_APPS_BLOCKED;
+import static com.android.settings.applications.manageapplications.AppFilterRegistry
+        .FILTER_APPS_DISABLED;
+import static com.android.settings.applications.manageapplications.AppFilterRegistry
+        .FILTER_APPS_ENABLED;
+import static com.android.settings.applications.manageapplications.AppFilterRegistry
+        .FILTER_APPS_INSTANT;
+import static com.android.settings.applications.manageapplications.AppFilterRegistry
+        .FILTER_APPS_PERSONAL;
+import static com.android.settings.applications.manageapplications.AppFilterRegistry
+        .FILTER_APPS_POWER_WHITELIST;
+import static com.android.settings.applications.manageapplications.AppFilterRegistry
+        .FILTER_APPS_POWER_WHITELIST_ALL;
+import static com.android.settings.applications.manageapplications.AppFilterRegistry
+        .FILTER_APPS_WORK;
+
+import android.annotation.Nullable;
+import android.annotation.StringRes;
+import android.app.Activity;
+import android.content.Context;
+import android.content.Intent;
+import android.content.pm.ApplicationInfo;
+import android.content.pm.PackageItemInfo;
+import android.os.Bundle;
+import android.os.Environment;
+import android.os.UserHandle;
+import android.os.UserManager;
+import android.preference.PreferenceFrameLayout;
+import android.support.annotation.VisibleForTesting;
+import android.support.v7.widget.LinearLayoutManager;
+import android.support.v7.widget.RecyclerView;
+import android.text.TextUtils;
+import android.util.ArraySet;
+import android.util.FeatureFlagUtils;
+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.widget.AdapterView;
+import android.widget.AdapterView.OnItemSelectedListener;
+import android.widget.ArrayAdapter;
+import android.widget.FrameLayout;
+import android.widget.Spinner;
+
+import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
+import com.android.settings.R;
+import com.android.settings.Settings;
+import com.android.settings.Settings.GamesStorageActivity;
+import com.android.settings.Settings.HighPowerApplicationsActivity;
+import com.android.settings.Settings.ManageExternalSourcesActivity;
+import com.android.settings.Settings.MoviesStorageActivity;
+import com.android.settings.Settings.NotificationAppListActivity;
+import com.android.settings.Settings.OverlaySettingsActivity;
+import com.android.settings.Settings.StorageUseActivity;
+import com.android.settings.Settings.UsageAccessSettingsActivity;
+import com.android.settings.Settings.WriteSettingsActivity;
+import com.android.settings.SettingsActivity;
+import com.android.settings.applications.AppInfoBase;
+import com.android.settings.applications.AppStateAppOpsBridge.PermissionState;
+import com.android.settings.applications.AppStateBaseBridge;
+import com.android.settings.applications.AppStateInstallAppsBridge;
+import com.android.settings.applications.AppStateNotificationBridge;
+import com.android.settings.applications.AppStateOverlayBridge;
+import com.android.settings.applications.AppStatePowerBridge;
+import com.android.settings.applications.AppStateUsageBridge;
+import com.android.settings.applications.AppStateUsageBridge.UsageState;
+import com.android.settings.applications.AppStateWriteSettingsBridge;
+import com.android.settings.applications.AppStorageSettings;
+import com.android.settings.applications.DefaultAppSettings;
+import com.android.settings.applications.DrawOverlayDetails;
+import com.android.settings.applications.ExternalSourcesDetails;
+import com.android.settings.applications.InstalledAppCounter;
+import com.android.settings.applications.InstalledAppDetails;
+import com.android.settings.applications.NotificationApps;
+import com.android.settings.applications.UsageAccessDetails;
+import com.android.settings.applications.WriteSettingsDetails;
+import com.android.settings.applications.AppInfoDashboardFragment;
+import com.android.settings.core.FeatureFlags;
+import com.android.settings.core.InstrumentedPreferenceFragment;
+import com.android.settings.dashboard.SummaryLoader;
+import com.android.settings.fuelgauge.HighPowerDetail;
+import com.android.settings.fuelgauge.PowerWhitelistBackend;
+import com.android.settings.notification.AppNotificationSettings;
+import com.android.settings.notification.ConfigureNotificationSettings;
+import com.android.settings.notification.NotificationBackend;
+import com.android.settings.notification.NotificationBackend.AppRow;
+import com.android.settings.widget.LoadingViewController;
+import com.android.settingslib.HelpUtils;
+import com.android.settingslib.applications.ApplicationsState;
+import com.android.settingslib.applications.ApplicationsState.AppEntry;
+import com.android.settingslib.applications.ApplicationsState.AppFilter;
+import com.android.settingslib.applications.ApplicationsState.CompoundFilter;
+import com.android.settingslib.applications.ApplicationsState.VolumeFilter;
+import com.android.settingslib.applications.StorageStatsSource;
+import com.android.settingslib.utils.ThreadUtils;
+import com.android.settingslib.wrapper.PackageManagerWrapper;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.Set;
+
+/**
+ * Activity to pick an application that will be used to display installation information and
+ * options to uninstall/delete user data for system applications. This activity
+ * can be launched through Settings or via the ACTION_MANAGE_PACKAGE_STORAGE
+ * intent.
+ */
+public class ManageApplications extends InstrumentedPreferenceFragment
+        implements View.OnClickListener, OnItemSelectedListener {
+
+    static final String TAG = "ManageApplications";
+    static final boolean DEBUG = Log.isLoggable(TAG, Log.DEBUG);
+
+    // Intent extras.
+    public static final String EXTRA_CLASSNAME = "classname";
+    // Used for storage only.
+    public static final String EXTRA_VOLUME_UUID = "volumeUuid";
+    public static final String EXTRA_VOLUME_NAME = "volumeName";
+    public static final String EXTRA_STORAGE_TYPE = "storageType";
+    public static final String EXTRA_WORK_ONLY = "workProfileOnly";
+    public static final String EXTRA_WORK_ID = "workId";
+
+    private static final String EXTRA_SORT_ORDER = "sortOrder";
+    private static final String EXTRA_SHOW_SYSTEM = "showSystem";
+    private static final String EXTRA_HAS_ENTRIES = "hasEntries";
+    private static final String EXTRA_HAS_BRIDGE = "hasBridge";
+
+    // attributes used as keys when passing values to InstalledAppDetails activity
+    public static final String APP_CHG = "chg";
+
+    // constant value that can be used to check return code from sub activity.
+    private static final int INSTALLED_APP_DETAILS = 1;
+    private static final int ADVANCED_SETTINGS = 2;
+
+    public static final int SIZE_TOTAL = 0;
+    public static final int SIZE_INTERNAL = 1;
+    public static final int SIZE_EXTERNAL = 2;
+
+    // Storage types. Used to determine what the extra item in the list of preferences is.
+    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.
+    public static final int STORAGE_TYPE_PHOTOS_VIDEOS = 3;
+
+    private static final int NO_USER_SPECIFIED = -1;
+
+    // sort order
+    private int mSortOrder = R.id.sort_order_alpha;
+
+    // whether showing system apps.
+    private boolean mShowSystem;
+
+    private ApplicationsState mApplicationsState;
+
+    public int mListType;
+    private AppFilterItem mFilter;
+    private ApplicationsAdapter mApplications;
+
+    private View mLoadingContainer;
+
+    private View mListContainer;
+    private RecyclerView mRecyclerView;
+
+    // Size resource used for packages whose size computation failed for some reason
+    CharSequence mInvalidSizeStr;
+
+    private String mCurrentPkgName;
+    private int mCurrentUid;
+
+    private Menu mOptionsMenu;
+
+    public static final int LIST_TYPE_MAIN = 0;
+    public static final int LIST_TYPE_NOTIFICATION = 1;
+    public static final int LIST_TYPE_STORAGE = 3;
+    public static final int LIST_TYPE_USAGE_ACCESS = 4;
+    public static final int LIST_TYPE_HIGH_POWER = 5;
+    public static final int LIST_TYPE_OVERLAY = 6;
+    public static final int LIST_TYPE_WRITE_SETTINGS = 7;
+    public static final int LIST_TYPE_MANAGE_SOURCES = 8;
+    public static final int LIST_TYPE_GAMES = 9;
+    public static final int LIST_TYPE_MOVIES = 10;
+    public static final int LIST_TYPE_PHOTOGRAPHY = 11;
+
+    // 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));
+
+    private View mRootView;
+    private View mSpinnerHeader;
+    private Spinner mFilterSpinner;
+    private FilterSpinnerAdapter mFilterAdapter;
+    private NotificationBackend mNotifBackend;
+    private ResetAppsHelper mResetAppsHelper;
+    private String mVolumeUuid;
+    private int mStorageType;
+    private boolean mIsWorkOnly;
+    private int mWorkUserId;
+    private View mEmptyView;
+
+    @Override
+    public void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setHasOptionsMenu(true);
+        final Activity activity = getActivity();
+        mApplicationsState = ApplicationsState.getInstance(activity.getApplication());
+
+        Intent intent = activity.getIntent();
+        Bundle args = getArguments();
+        int screenTitle = intent.getIntExtra(
+                SettingsActivity.EXTRA_SHOW_FRAGMENT_TITLE_RESID, R.string.notifications_label);
+        String className = args != null ? args.getString(EXTRA_CLASSNAME) : null;
+        if (className == null) {
+            className = intent.getComponent().getClassName();
+        }
+        if (className.equals(NotificationAppListActivity.class.getName())
+                || this instanceof NotificationApps) {
+            mListType = LIST_TYPE_NOTIFICATION;
+            mNotifBackend = new NotificationBackend();
+            screenTitle = R.string.app_notifications_title;
+        } else if (className.equals(StorageUseActivity.class.getName())) {
+            if (args != null && args.containsKey(EXTRA_VOLUME_UUID)) {
+                mVolumeUuid = args.getString(EXTRA_VOLUME_UUID);
+                mStorageType = args.getInt(EXTRA_STORAGE_TYPE, STORAGE_TYPE_DEFAULT);
+                mListType = LIST_TYPE_STORAGE;
+            } else {
+                // No volume selected, display a normal list, sorted by size.
+                mListType = LIST_TYPE_MAIN;
+            }
+            mSortOrder = R.id.sort_order_size;
+        } else if (className.equals(UsageAccessSettingsActivity.class.getName())) {
+            mListType = LIST_TYPE_USAGE_ACCESS;
+            screenTitle = R.string.usage_access;
+        } else if (className.equals(HighPowerApplicationsActivity.class.getName())) {
+            mListType = LIST_TYPE_HIGH_POWER;
+            // Default to showing system.
+            mShowSystem = true;
+            screenTitle = R.string.high_power_apps;
+        } else if (className.equals(OverlaySettingsActivity.class.getName())) {
+            mListType = LIST_TYPE_OVERLAY;
+            screenTitle = R.string.system_alert_window_settings;
+        } else if (className.equals(WriteSettingsActivity.class.getName())) {
+            mListType = LIST_TYPE_WRITE_SETTINGS;
+            screenTitle = R.string.write_settings;
+        } else if (className.equals(ManageExternalSourcesActivity.class.getName())) {
+            mListType = LIST_TYPE_MANAGE_SOURCES;
+            screenTitle = R.string.install_other_apps;
+        } else if (className.equals(GamesStorageActivity.class.getName())) {
+            mListType = LIST_TYPE_GAMES;
+            mSortOrder = R.id.sort_order_size;
+        } else if (className.equals(MoviesStorageActivity.class.getName())) {
+            mListType = LIST_TYPE_MOVIES;
+            mSortOrder = R.id.sort_order_size;
+        } else if (className.equals(Settings.PhotosStorageActivity.class.getName())) {
+            mListType = LIST_TYPE_PHOTOGRAPHY;
+            mSortOrder = R.id.sort_order_size;
+            mStorageType = args.getInt(EXTRA_STORAGE_TYPE, STORAGE_TYPE_DEFAULT);
+        } else {
+            mListType = LIST_TYPE_MAIN;
+        }
+        final AppFilterRegistry appFilterRegistry = AppFilterRegistry.getInstance();
+        mFilter = appFilterRegistry.get(appFilterRegistry.getDefaultFilterType(mListType));
+        mIsWorkOnly = args != null ? args.getBoolean(EXTRA_WORK_ONLY) : false;
+        mWorkUserId = args != null ? args.getInt(EXTRA_WORK_ID) : NO_USER_SPECIFIED;
+
+        if (savedInstanceState != null) {
+            mSortOrder = savedInstanceState.getInt(EXTRA_SORT_ORDER, mSortOrder);
+            mShowSystem = savedInstanceState.getBoolean(EXTRA_SHOW_SYSTEM, mShowSystem);
+        }
+
+        mInvalidSizeStr = activity.getText(R.string.invalid_size_value);
+
+        mResetAppsHelper = new ResetAppsHelper(activity);
+
+        if (screenTitle > 0) {
+            activity.setTitle(screenTitle);
+        }
+    }
+
+    @Override
+    public View onCreateView(LayoutInflater inflater, ViewGroup container,
+            Bundle savedInstanceState) {
+        mRootView = inflater.inflate(R.layout.manage_applications_apps, null);
+        mLoadingContainer = mRootView.findViewById(R.id.loading_container);
+        mListContainer = mRootView.findViewById(R.id.list_container);
+        if (mListContainer != null) {
+            // Create adapter and list view here
+            mEmptyView = mListContainer.findViewById(android.R.id.empty);
+            mApplications = new ApplicationsAdapter(mApplicationsState, this, mFilter,
+                    savedInstanceState);
+            if (savedInstanceState != null) {
+                mApplications.mHasReceivedLoadEntries =
+                        savedInstanceState.getBoolean(EXTRA_HAS_ENTRIES, false);
+                mApplications.mHasReceivedBridgeCallback =
+                        savedInstanceState.getBoolean(EXTRA_HAS_BRIDGE, false);
+            }
+            int userId = mIsWorkOnly ? mWorkUserId : UserHandle.getUserId(mCurrentUid);
+            if (mStorageType == STORAGE_TYPE_MUSIC) {
+                Context context = getContext();
+                mApplications.setExtraViewController(
+                        new MusicViewHolderController(
+                                context,
+                                new StorageStatsSource(context),
+                                mVolumeUuid,
+                                UserHandle.of(userId)));
+            } else if (mStorageType == STORAGE_TYPE_PHOTOS_VIDEOS) {
+                Context context = getContext();
+                mApplications.setExtraViewController(
+                        new PhotosViewHolderController(
+                                context,
+                                new StorageStatsSource(context),
+                                mVolumeUuid,
+                                UserHandle.of(userId)));
+            }
+            mRecyclerView = mListContainer.findViewById(R.id.apps_list);
+            mRecyclerView.setLayoutManager(new LinearLayoutManager(
+                    getContext(), RecyclerView.VERTICAL, false /* reverseLayout */));
+            mRecyclerView.setAdapter(mApplications);
+        }
+
+        // We have to do this now because PreferenceFrameLayout looks at it
+        // only when the view is added.
+        if (container instanceof PreferenceFrameLayout) {
+            ((PreferenceFrameLayout.LayoutParams) mRootView.getLayoutParams()).removeBorders = true;
+        }
+
+        createHeader();
+
+        mResetAppsHelper.onRestoreInstanceState(savedInstanceState);
+
+        return mRootView;
+    }
+
+    @VisibleForTesting
+    void createHeader() {
+        final Activity activity = getActivity();
+        final FrameLayout pinnedHeader = mRootView.findViewById(R.id.pinned_header);
+        mSpinnerHeader = activity.getLayoutInflater()
+                .inflate(R.layout.apps_filter_spinner, pinnedHeader, false);
+        mFilterSpinner = mSpinnerHeader.findViewById(R.id.filter_spinner);
+        mFilterAdapter = new FilterSpinnerAdapter(this);
+        mFilterSpinner.setAdapter(mFilterAdapter);
+        mFilterSpinner.setOnItemSelectedListener(this);
+        pinnedHeader.addView(mSpinnerHeader, 0);
+
+        final AppFilterRegistry appFilterRegistry = AppFilterRegistry.getInstance();
+        mFilterAdapter.enableFilter(appFilterRegistry.getDefaultFilterType(mListType));
+        if (mListType == LIST_TYPE_MAIN) {
+            if (UserManager.get(getActivity()).getUserProfiles().size() > 1) {
+                mFilterAdapter.enableFilter(FILTER_APPS_PERSONAL);
+                mFilterAdapter.enableFilter(FILTER_APPS_WORK);
+            }
+        }
+        if (mListType == LIST_TYPE_NOTIFICATION) {
+            mFilterAdapter.enableFilter(FILTER_APPS_BLOCKED);
+        }
+        if (mListType == LIST_TYPE_HIGH_POWER) {
+            mFilterAdapter.enableFilter(FILTER_APPS_POWER_WHITELIST_ALL);
+        }
+
+        AppFilter compositeFilter = getCompositeFilter(mListType, mStorageType, mVolumeUuid);
+        if (mIsWorkOnly) {
+            final AppFilter workFilter = appFilterRegistry.get(FILTER_APPS_WORK).getFilter();
+            compositeFilter = new CompoundFilter(compositeFilter, workFilter);
+        }
+        if (compositeFilter != null) {
+            mApplications.setCompositeFilter(compositeFilter);
+        }
+    }
+
+    @VisibleForTesting
+    @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 if (storageType == STORAGE_TYPE_DEFAULT) {
+                filter = new CompoundFilter(ApplicationsState.FILTER_OTHER_APPS, filter);
+            }
+            return filter;
+        }
+        if (listType == LIST_TYPE_GAMES) {
+            return new CompoundFilter(ApplicationsState.FILTER_GAMES, filter);
+        } else if (listType == LIST_TYPE_MOVIES) {
+            return new CompoundFilter(ApplicationsState.FILTER_MOVIES, filter);
+        } else if (listType == LIST_TYPE_PHOTOGRAPHY) {
+            return new CompoundFilter(ApplicationsState.FILTER_PHOTOS, filter);
+        }
+
+        return null;
+    }
+
+    @Override
+    public int getMetricsCategory() {
+        switch (mListType) {
+            case LIST_TYPE_MAIN:
+                return MetricsEvent.MANAGE_APPLICATIONS;
+            case LIST_TYPE_NOTIFICATION:
+                return MetricsEvent.MANAGE_APPLICATIONS_NOTIFICATIONS;
+            case LIST_TYPE_STORAGE:
+                if (mStorageType == STORAGE_TYPE_MUSIC) {
+                    return MetricsEvent.APPLICATIONS_STORAGE_MUSIC;
+                }
+                return MetricsEvent.APPLICATIONS_STORAGE_APPS;
+            case LIST_TYPE_GAMES:
+                return MetricsEvent.APPLICATIONS_STORAGE_GAMES;
+            case LIST_TYPE_MOVIES:
+                return MetricsEvent.APPLICATIONS_STORAGE_MOVIES;
+            case LIST_TYPE_PHOTOGRAPHY:
+                return MetricsEvent.APPLICATIONS_STORAGE_PHOTOS;
+            case LIST_TYPE_USAGE_ACCESS:
+                return MetricsEvent.USAGE_ACCESS;
+            case LIST_TYPE_HIGH_POWER:
+                return MetricsEvent.APPLICATIONS_HIGH_POWER_APPS;
+            case LIST_TYPE_OVERLAY:
+                return MetricsEvent.SYSTEM_ALERT_WINDOW_APPS;
+            case LIST_TYPE_WRITE_SETTINGS:
+                return MetricsEvent.SYSTEM_ALERT_WINDOW_APPS;
+            case LIST_TYPE_MANAGE_SOURCES:
+                return MetricsEvent.MANAGE_EXTERNAL_SOURCES;
+            default:
+                return MetricsEvent.VIEW_UNKNOWN;
+        }
+    }
+
+    @Override
+    public void onStart() {
+        super.onStart();
+        updateView();
+        if (mApplications != null) {
+            mApplications.resume(mSortOrder);
+            mApplications.updateLoading();
+        }
+    }
+
+    @Override
+    public void onSaveInstanceState(Bundle outState) {
+        super.onSaveInstanceState(outState);
+        mResetAppsHelper.onSaveInstanceState(outState);
+        outState.putInt(EXTRA_SORT_ORDER, mSortOrder);
+        outState.putBoolean(EXTRA_SHOW_SYSTEM, mShowSystem);
+        outState.putBoolean(EXTRA_HAS_ENTRIES, mApplications.mHasReceivedLoadEntries);
+        outState.putBoolean(EXTRA_HAS_BRIDGE, mApplications.mHasReceivedBridgeCallback);
+        if (mApplications != null) {
+            mApplications.onSaveInstanceState(outState);
+        }
+    }
+
+    @Override
+    public void onStop() {
+        super.onStop();
+        if (mApplications != null) {
+            mApplications.pause();
+        }
+        mResetAppsHelper.stop();
+    }
+
+    @Override
+    public void onDestroyView() {
+        super.onDestroyView();
+
+        if (mApplications != null) {
+            mApplications.release();
+        }
+        mRootView = null;
+    }
+
+    @Override
+    public void onActivityResult(int requestCode, int resultCode, Intent data) {
+        if (requestCode == INSTALLED_APP_DETAILS && mCurrentPkgName != null) {
+            if (mListType == LIST_TYPE_NOTIFICATION) {
+                mApplications.mExtraInfoBridge.forceUpdate(mCurrentPkgName, mCurrentUid);
+            } else if (mListType == LIST_TYPE_HIGH_POWER || mListType == LIST_TYPE_OVERLAY
+                    || mListType == LIST_TYPE_WRITE_SETTINGS) {
+                mApplications.mExtraInfoBridge.forceUpdate(mCurrentPkgName, mCurrentUid);
+            } else {
+                mApplicationsState.requestSize(mCurrentPkgName, UserHandle.getUserId(mCurrentUid));
+            }
+        }
+    }
+
+    // utility method used to start sub activity
+    private void startApplicationDetailsActivity() {
+        switch (mListType) {
+            case LIST_TYPE_NOTIFICATION:
+                startAppInfoFragment(AppNotificationSettings.class, R.string.notifications_title);
+                break;
+            case LIST_TYPE_USAGE_ACCESS:
+                startAppInfoFragment(UsageAccessDetails.class, R.string.usage_access);
+                break;
+            case LIST_TYPE_STORAGE:
+                startAppInfoFragment(AppStorageSettings.class, R.string.storage_settings);
+                break;
+            case LIST_TYPE_HIGH_POWER:
+                HighPowerDetail.show(this, mCurrentPkgName, INSTALLED_APP_DETAILS);
+                break;
+            case LIST_TYPE_OVERLAY:
+                startAppInfoFragment(DrawOverlayDetails.class, R.string.overlay_settings);
+                break;
+            case LIST_TYPE_WRITE_SETTINGS:
+                startAppInfoFragment(WriteSettingsDetails.class, R.string.write_system_settings);
+                break;
+            case LIST_TYPE_MANAGE_SOURCES:
+                startAppInfoFragment(ExternalSourcesDetails.class, R.string.install_other_apps);
+                break;
+            case LIST_TYPE_GAMES:
+                startAppInfoFragment(AppStorageSettings.class, R.string.game_storage_settings);
+                break;
+            case LIST_TYPE_MOVIES:
+                startAppInfoFragment(AppStorageSettings.class, R.string.storage_movies_tv);
+                break;
+            case LIST_TYPE_PHOTOGRAPHY:
+                startAppInfoFragment(AppStorageSettings.class, R.string.storage_photos_videos);
+                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.
+            default:
+                if (FeatureFlagUtils.isEnabled(getContext(), FeatureFlags.APP_INFO_V2)) {
+                    startAppInfoFragment(
+                            AppInfoDashboardFragment.class, R.string.application_info_label);
+                } else {
+                    startAppInfoFragment(
+                            InstalledAppDetails.class, R.string.application_info_label);
+                }
+                break;
+        }
+    }
+
+    private void startAppInfoFragment(Class<?> fragment, int titleRes) {
+        AppInfoBase.startAppInfoFragment(fragment, titleRes, mCurrentPkgName, mCurrentUid, this,
+                INSTALLED_APP_DETAILS, getMetricsCategory());
+    }
+
+    @Override
+    public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
+        final Activity activity = getActivity();
+        if (activity == null) {
+            return;
+        }
+        HelpUtils.prepareHelpMenuItem(activity, menu, getHelpResource(), getClass().getName());
+        mOptionsMenu = menu;
+        inflater.inflate(R.menu.manage_apps, menu);
+        updateOptionsMenu();
+    }
+
+    @Override
+    public void onPrepareOptionsMenu(Menu menu) {
+        updateOptionsMenu();
+    }
+
+    @Override
+    public void onDestroyOptionsMenu() {
+        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;
+        }
+        mOptionsMenu.findItem(R.id.advanced).setVisible(false);
+
+        mOptionsMenu.findItem(R.id.sort_order_alpha).setVisible(mListType == LIST_TYPE_STORAGE
+                && mSortOrder != R.id.sort_order_alpha);
+        mOptionsMenu.findItem(R.id.sort_order_size).setVisible(mListType == LIST_TYPE_STORAGE
+                && mSortOrder != R.id.sort_order_size);
+
+        mOptionsMenu.findItem(R.id.show_system).setVisible(!mShowSystem
+                && 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
+    public boolean onOptionsItemSelected(MenuItem item) {
+        int menuId = item.getItemId();
+        switch (item.getItemId()) {
+            case R.id.sort_order_alpha:
+            case R.id.sort_order_size:
+                mSortOrder = menuId;
+                if (mApplications != null) {
+                    mApplications.rebuild(mSortOrder);
+                }
+                break;
+            case R.id.show_system:
+            case R.id.hide_system:
+                mShowSystem = !mShowSystem;
+                mApplications.rebuild();
+                break;
+            case R.id.reset_app_preferences:
+                mResetAppsHelper.buildResetDialog();
+                return true;
+            case R.id.advanced:
+                if (mListType == LIST_TYPE_NOTIFICATION) {
+                    ((SettingsActivity) getActivity()).startPreferencePanel(this,
+                            ConfigureNotificationSettings.class.getName(), null,
+                            R.string.configure_notification_settings, null, this,
+                            ADVANCED_SETTINGS);
+                } else {
+                    ((SettingsActivity) getActivity()).startPreferencePanel(this,
+                            DefaultAppSettings.class.getName(), null, R.string.configure_apps,
+                            null, this, ADVANCED_SETTINGS);
+                }
+                return true;
+            default:
+                // Handle the home button
+                return false;
+        }
+        updateOptionsMenu();
+        return true;
+    }
+
+    @Override
+    public void onClick(View view) {
+        if (mApplications == null) {
+            return;
+        }
+        final int position = mRecyclerView.getChildAdapterPosition(view);
+
+        if (position == RecyclerView.NO_POSITION) {
+            Log.w(TAG, "Cannot find position for child, skipping onClick handling");
+            return;
+        }
+        if (mApplications.getApplicationCount() > position) {
+            ApplicationsState.AppEntry entry = mApplications.getAppEntry(position);
+            mCurrentPkgName = entry.info.packageName;
+            mCurrentUid = entry.info.uid;
+            startApplicationDetailsActivity();
+        } else {
+            mApplications.mExtraViewController.onClick(this);
+        }
+    }
+
+    @Override
+    public void onItemSelected(AdapterView<?> parent, View view, int position, long id) {
+        mFilter = mFilterAdapter.getFilter(position);
+        mApplications.setFilter(mFilter);
+        if (DEBUG) Log.d(TAG, "Selecting filter " + mFilter);
+    }
+
+    @Override
+    public void onNothingSelected(AdapterView<?> parent) {
+    }
+
+    public void updateView() {
+        updateOptionsMenu();
+        final Activity host = getActivity();
+        if (host != null) {
+            host.invalidateOptionsMenu();
+        }
+    }
+
+    public void setHasDisabled(boolean hasDisabledApps) {
+        if (mListType != LIST_TYPE_MAIN) {
+            return;
+        }
+        mFilterAdapter.setFilterEnabled(FILTER_APPS_ENABLED, hasDisabledApps);
+        mFilterAdapter.setFilterEnabled(FILTER_APPS_DISABLED, hasDisabledApps);
+    }
+
+    public void setHasInstant(boolean haveInstantApps) {
+        if (LIST_TYPES_WITH_INSTANT.contains(mListType)) {
+            mFilterAdapter.setFilterEnabled(FILTER_APPS_INSTANT, haveInstantApps);
+        }
+    }
+
+    static class FilterSpinnerAdapter extends ArrayAdapter<CharSequence> {
+
+        private final ManageApplications mManageApplications;
+        private final Context mContext;
+
+        // Use ArrayAdapter for view logic, but have our own list for managing
+        // the options available.
+        private final ArrayList<AppFilterItem> mFilterOptions = new ArrayList<>();
+
+        public FilterSpinnerAdapter(ManageApplications manageApplications) {
+            super(manageApplications.getContext(), R.layout.filter_spinner_item);
+            mContext = manageApplications.getContext();
+            mManageApplications = manageApplications;
+            setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item);
+        }
+
+        public AppFilterItem getFilter(int position) {
+            return mFilterOptions.get(position);
+        }
+
+        public void setFilterEnabled(@AppFilterRegistry.FilterType int filter, boolean enabled) {
+            if (enabled) {
+                enableFilter(filter);
+            } else {
+                disableFilter(filter);
+            }
+        }
+
+        public void enableFilter(@AppFilterRegistry.FilterType int filterType) {
+            final AppFilterItem filter = AppFilterRegistry.getInstance().get(filterType);
+            if (mFilterOptions.contains(filter)) {
+                return;
+            }
+            if (DEBUG) {
+                Log.d(TAG, "Enabling filter " + filter);
+            }
+            mFilterOptions.add(filter);
+            Collections.sort(mFilterOptions);
+            mManageApplications.mSpinnerHeader.setVisibility(
+                    mFilterOptions.size() > 1 ? View.VISIBLE : View.GONE);
+            notifyDataSetChanged();
+            if (mFilterOptions.size() == 1) {
+                if (DEBUG) {
+                    Log.d(TAG, "Auto selecting filter " + filter);
+                }
+                mManageApplications.mFilterSpinner.setSelection(0);
+                mManageApplications.onItemSelected(null, null, 0, 0);
+            }
+        }
+
+        public void disableFilter(@AppFilterRegistry.FilterType int filterType) {
+            final AppFilterItem filter = AppFilterRegistry.getInstance().get(filterType);
+            if (!mFilterOptions.remove(filter)) {
+                return;
+            }
+            if (DEBUG) {
+                Log.d(TAG, "Disabling filter " + filter);
+            }
+            Collections.sort(mFilterOptions);
+            mManageApplications.mSpinnerHeader.setVisibility(
+                    mFilterOptions.size() > 1 ? View.VISIBLE : View.GONE);
+            notifyDataSetChanged();
+            if (mManageApplications.mFilter == filter) {
+                if (mFilterOptions.size() > 0) {
+                    if (DEBUG) {
+                        Log.d(TAG, "Auto selecting filter " + mFilterOptions.get(0));
+                    }
+                    mManageApplications.mFilterSpinner.setSelection(0);
+                    mManageApplications.onItemSelected(null, null, 0, 0);
+                }
+            }
+        }
+
+        @Override
+        public int getCount() {
+            return mFilterOptions.size();
+        }
+
+        @Override
+        public CharSequence getItem(int position) {
+            return mContext.getText(mFilterOptions.get(position).getTitle());
+        }
+    }
+
+    static class ApplicationsAdapter extends RecyclerView.Adapter<ApplicationViewHolder>
+            implements ApplicationsState.Callbacks, AppStateBaseBridge.Callback {
+
+        private static final String STATE_LAST_SCROLL_INDEX = "state_last_scroll_index";
+        private static final int VIEW_TYPE_APP = 0;
+        private static final int VIEW_TYPE_EXTRA_VIEW = 1;
+
+        private final ApplicationsState mState;
+        private final ApplicationsState.Session mSession;
+        private final ManageApplications mManageApplications;
+        private final Context mContext;
+        private final AppStateBaseBridge mExtraInfoBridge;
+        private final LoadingViewController mLoadingViewController;
+
+        private AppFilterItem mAppFilter;
+        private ArrayList<ApplicationsState.AppEntry> mEntries;
+        private boolean mResumed;
+        private int mLastSortMode = -1;
+        private int mWhichSize = SIZE_TOTAL;
+        private AppFilter mCompositeFilter;
+        private boolean mHasReceivedLoadEntries;
+        private boolean mHasReceivedBridgeCallback;
+        private FileViewHolderController mExtraViewController;
+
+        // These two variables are used to remember and restore the last scroll position when this
+        // fragment is paused. We need this special handling because app entries are added gradually
+        // when we rebuild the list after the user made some changes, like uninstalling an app.
+        private int mLastIndex = -1;
+
+        public ApplicationsAdapter(ApplicationsState state, ManageApplications manageApplications,
+                AppFilterItem appFilter, Bundle savedInstanceState) {
+            setHasStableIds(true);
+            mState = state;
+            mSession = state.newSession(this);
+            mManageApplications = manageApplications;
+            mLoadingViewController = new LoadingViewController(
+                    mManageApplications.mLoadingContainer,
+                    mManageApplications.mListContainer
+            );
+            mContext = manageApplications.getActivity();
+            mAppFilter = appFilter;
+            if (mManageApplications.mListType == LIST_TYPE_NOTIFICATION) {
+                mExtraInfoBridge = new AppStateNotificationBridge(mContext, mState, this,
+                        manageApplications.mNotifBackend);
+            } else if (mManageApplications.mListType == LIST_TYPE_USAGE_ACCESS) {
+                mExtraInfoBridge = new AppStateUsageBridge(mContext, mState, this);
+            } else if (mManageApplications.mListType == LIST_TYPE_HIGH_POWER) {
+                mExtraInfoBridge = new AppStatePowerBridge(mState, this);
+            } else if (mManageApplications.mListType == LIST_TYPE_OVERLAY) {
+                mExtraInfoBridge = new AppStateOverlayBridge(mContext, mState, this);
+            } else if (mManageApplications.mListType == LIST_TYPE_WRITE_SETTINGS) {
+                mExtraInfoBridge = new AppStateWriteSettingsBridge(mContext, mState, this);
+            } else if (mManageApplications.mListType == LIST_TYPE_MANAGE_SOURCES) {
+                mExtraInfoBridge = new AppStateInstallAppsBridge(mContext, mState, this);
+            } else {
+                mExtraInfoBridge = null;
+            }
+            if (savedInstanceState != null) {
+                mLastIndex = savedInstanceState.getInt(STATE_LAST_SCROLL_INDEX);
+            }
+        }
+
+        public void setCompositeFilter(AppFilter compositeFilter) {
+            mCompositeFilter = compositeFilter;
+            rebuild();
+        }
+
+        public void setFilter(AppFilterItem appFilter) {
+            mAppFilter = appFilter;
+            rebuild();
+        }
+
+        public void setExtraViewController(FileViewHolderController extraViewController) {
+            mExtraViewController = extraViewController;
+            // Start to query extra view's stats on background, and once done post result to main
+            // thread.
+            ThreadUtils.postOnBackgroundThread(() -> {
+                mExtraViewController.queryStats();
+                ThreadUtils.postOnMainThread(() -> {
+                    onExtraViewCompleted();
+                });
+            });
+        }
+
+        public void resume(int sort) {
+            if (DEBUG) Log.i(TAG, "Resume!  mResumed=" + mResumed);
+            if (!mResumed) {
+                mResumed = true;
+                mSession.onResume();
+                mLastSortMode = sort;
+                if (mExtraInfoBridge != null) {
+                    mExtraInfoBridge.resume();
+                }
+                rebuild();
+            } else {
+                rebuild(sort);
+            }
+        }
+
+        public void pause() {
+            if (mResumed) {
+                mResumed = false;
+                mSession.onPause();
+                if (mExtraInfoBridge != null) {
+                    mExtraInfoBridge.pause();
+                }
+            }
+        }
+
+        public void onSaveInstanceState(Bundle outState) {
+            // Record the current scroll position before pausing.
+            final LinearLayoutManager layoutManager =
+                    (LinearLayoutManager) mManageApplications.mRecyclerView.getLayoutManager();
+            outState.putInt(STATE_LAST_SCROLL_INDEX, layoutManager.findFirstVisibleItemPosition());
+        }
+
+        public void release() {
+            mSession.onDestroy();
+            if (mExtraInfoBridge != null) {
+                mExtraInfoBridge.release();
+            }
+        }
+
+        public void rebuild(int sort) {
+            if (sort == mLastSortMode) {
+                return;
+            }
+            mLastSortMode = sort;
+            rebuild();
+        }
+
+        @Override
+        public ApplicationViewHolder onCreateViewHolder(ViewGroup parent, int viewType) {
+            final View view = ApplicationViewHolder.newView(parent);
+            return new ApplicationViewHolder(view,
+                    shouldUseStableItemHeight(mManageApplications.mListType));
+        }
+
+        @Override
+        public int getItemViewType(int position) {
+            boolean isLastItem = (getItemCount() - 1) == position;
+            return hasExtraView() && isLastItem
+                    ? VIEW_TYPE_EXTRA_VIEW
+                    : VIEW_TYPE_APP;
+        }
+
+        public void rebuild() {
+            if (!mHasReceivedLoadEntries
+                    || (mExtraInfoBridge != null && !mHasReceivedBridgeCallback)) {
+                // Don't rebuild the list until all the app entries are loaded.
+                return;
+            }
+            ApplicationsState.AppFilter filterObj;
+            Comparator<AppEntry> comparatorObj;
+            boolean emulated = Environment.isExternalStorageEmulated();
+            if (emulated) {
+                mWhichSize = SIZE_TOTAL;
+            } else {
+                mWhichSize = SIZE_INTERNAL;
+            }
+            filterObj = mAppFilter.getFilter();
+            if (mCompositeFilter != null) {
+                filterObj = new CompoundFilter(filterObj, mCompositeFilter);
+            }
+            if (!mManageApplications.mShowSystem) {
+                if (LIST_TYPES_WITH_INSTANT.contains(mManageApplications.mListType)) {
+                    filterObj = new CompoundFilter(filterObj,
+                            ApplicationsState.FILTER_DOWNLOADED_AND_LAUNCHER_AND_INSTANT);
+                } else {
+                    filterObj = new CompoundFilter(filterObj,
+                            ApplicationsState.FILTER_DOWNLOADED_AND_LAUNCHER);
+                }
+            }
+            switch (mLastSortMode) {
+                case R.id.sort_order_size:
+                    switch (mWhichSize) {
+                        case SIZE_INTERNAL:
+                            comparatorObj = ApplicationsState.INTERNAL_SIZE_COMPARATOR;
+                            break;
+                        case SIZE_EXTERNAL:
+                            comparatorObj = ApplicationsState.EXTERNAL_SIZE_COMPARATOR;
+                            break;
+                        default:
+                            comparatorObj = ApplicationsState.SIZE_COMPARATOR;
+                            break;
+                    }
+                    break;
+                default:
+                    comparatorObj = ApplicationsState.ALPHA_COMPARATOR;
+                    break;
+            }
+
+            filterObj = new CompoundFilter(filterObj, ApplicationsState.FILTER_NOT_HIDE);
+            AppFilter finalFilterObj = filterObj;
+            ThreadUtils.postOnBackgroundThread(() -> {
+                final ArrayList<AppEntry> entries = mSession.rebuild(finalFilterObj,
+                        comparatorObj, false);
+                if (entries != null) {
+                    ThreadUtils.postOnMainThread(() -> onRebuildComplete(entries));
+                }
+            });
+        }
+
+        @VisibleForTesting
+        static boolean shouldUseStableItemHeight(int listType) {
+            switch (listType) {
+                case LIST_TYPE_NOTIFICATION:
+                    // Most entries in notification type has no summary. Don't use stable height
+                    // so height is short for most entries.
+                    return false;
+                default:
+                    // Other types have non-empty summary, so keep the height as we expect summary
+                    // to fill in.
+                    return true;
+            }
+        }
+
+        private static boolean packageNameEquals(PackageItemInfo info1, PackageItemInfo info2) {
+            if (info1 == null || info2 == null) {
+                return false;
+            }
+            if (info1.packageName == null || info2.packageName == null) {
+                return false;
+            }
+            return info1.packageName.equals(info2.packageName);
+        }
+
+        private ArrayList<ApplicationsState.AppEntry> removeDuplicateIgnoringUser(
+                ArrayList<ApplicationsState.AppEntry> entries) {
+            int size = entries.size();
+            // returnList will not have more entries than entries
+            ArrayList<ApplicationsState.AppEntry> returnEntries = new ArrayList<>(size);
+
+            // assume appinfo of same package but different users are grouped together
+            PackageItemInfo lastInfo = null;
+            for (int i = 0; i < size; i++) {
+                AppEntry appEntry = entries.get(i);
+                PackageItemInfo info = appEntry.info;
+                if (!packageNameEquals(lastInfo, appEntry.info)) {
+                    returnEntries.add(appEntry);
+                }
+                lastInfo = info;
+            }
+            returnEntries.trimToSize();
+            return returnEntries;
+        }
+
+        @Override
+        public void onRebuildComplete(ArrayList<AppEntry> entries) {
+            final int filterType = mAppFilter.getFilterType();
+            if (filterType == FILTER_APPS_POWER_WHITELIST ||
+                    filterType == FILTER_APPS_POWER_WHITELIST_ALL) {
+                entries = removeDuplicateIgnoringUser(entries);
+            }
+            mEntries = entries;
+            notifyDataSetChanged();
+            if (getItemCount() == 0) {
+                mManageApplications.mRecyclerView.setVisibility(View.GONE);
+                mManageApplications.mEmptyView.setVisibility(View.VISIBLE);
+            } else {
+                mManageApplications.mEmptyView.setVisibility(View.GONE);
+                mManageApplications.mRecyclerView.setVisibility(View.VISIBLE);
+            }
+            // Restore the last scroll position if the number of entries added so far is bigger than
+            // it.
+            if (mLastIndex != -1 && getItemCount() > mLastIndex) {
+                mManageApplications.mRecyclerView.getLayoutManager().scrollToPosition(mLastIndex);
+                mLastIndex = -1;
+            }
+
+            if (mSession.getAllApps().size() != 0
+                    && mManageApplications.mListContainer.getVisibility() != View.VISIBLE) {
+                mLoadingViewController.showContent(true /* animate */);
+            }
+            if (mManageApplications.mListType == LIST_TYPE_USAGE_ACCESS) {
+                // No enabled or disabled filters for usage access.
+                return;
+            }
+
+            mManageApplications.setHasDisabled(mState.haveDisabledApps());
+            mManageApplications.setHasInstant(mState.haveInstantApps());
+        }
+
+        @VisibleForTesting
+        void updateLoading() {
+            final boolean appLoaded = mHasReceivedLoadEntries && mSession.getAllApps().size() != 0;
+            if (appLoaded) {
+                mLoadingViewController.showContent(false /* animate */);
+            } else {
+                mLoadingViewController.showLoadingViewDelayed();
+            }
+        }
+
+        @Override
+        public void onExtraInfoUpdated() {
+            mHasReceivedBridgeCallback = true;
+            rebuild();
+        }
+
+        @Override
+        public void onRunningStateChanged(boolean running) {
+            mManageApplications.getActivity().setProgressBarIndeterminateVisibility(running);
+        }
+
+        @Override
+        public void onPackageListChanged() {
+            rebuild();
+        }
+
+        @Override
+        public void onPackageIconChanged() {
+            // We ensure icons are loaded when their item is displayed, so
+            // don't care about icons loaded in the background.
+        }
+
+        @Override
+        public void onLoadEntriesCompleted() {
+            mHasReceivedLoadEntries = true;
+            // We may have been skipping rebuilds until this came in, trigger one now.
+            rebuild();
+        }
+
+        @Override
+        public void onPackageSizeChanged(String packageName) {
+            if (mEntries == null) {
+                return;
+            }
+            final int size = mEntries.size();
+            for (int i = 0; i < size; i++) {
+                final AppEntry entry = mEntries.get(i);
+                final ApplicationInfo info = entry.info;
+                if (info == null && !TextUtils.equals(packageName, info.packageName)) {
+                    continue;
+                }
+                if (TextUtils.equals(mManageApplications.mCurrentPkgName, info.packageName)) {
+                    // We got the size information for the last app the
+                    // user viewed, and are sorting by size...  they may
+                    // have cleared data, so we immediately want to resort
+                    // the list with the new size to reflect it to the user.
+                    rebuild();
+                    return;
+                } else {
+                    notifyItemChanged(i);
+                }
+
+            }
+        }
+
+        @Override
+        public void onLauncherInfoChanged() {
+            if (!mManageApplications.mShowSystem) {
+                rebuild();
+            }
+        }
+
+        @Override
+        public void onAllSizesComputed() {
+            if (mLastSortMode == R.id.sort_order_size) {
+                rebuild();
+            }
+        }
+
+        public void onExtraViewCompleted() {
+            if (!hasExtraView()) {
+                return;
+            }
+            // Update last item - this is assumed to be the extra view.
+            notifyItemChanged(getItemCount() - 1);
+        }
+
+        @Override
+        public int getItemCount() {
+            if (mEntries == null) {
+                return 0;
+            }
+            return mEntries.size() + (hasExtraView() ? 1 : 0);
+        }
+
+        public int getApplicationCount() {
+            return mEntries != null ? mEntries.size() : 0;
+        }
+
+        public AppEntry getAppEntry(int position) {
+            return mEntries.get(position);
+        }
+
+        @Override
+        public long getItemId(int position) {
+            if (position == mEntries.size()) {
+                return -1;
+            }
+            return mEntries.get(position).id;
+        }
+
+        public boolean isEnabled(int position) {
+            if (getItemViewType(position) == VIEW_TYPE_EXTRA_VIEW
+                    || mManageApplications.mListType != LIST_TYPE_HIGH_POWER) {
+                return true;
+            }
+            ApplicationsState.AppEntry entry = mEntries.get(position);
+            return !PowerWhitelistBackend.getInstance().isSysWhitelisted(entry.info.packageName);
+        }
+
+        @Override
+        public void onBindViewHolder(ApplicationViewHolder holder, int position) {
+            if (mEntries != null && mExtraViewController != null && position == mEntries.size()) {
+                // set up view for extra view controller
+                mExtraViewController.setupView(holder);
+            } else {
+                // Bind the data efficiently with the holder
+                ApplicationsState.AppEntry entry = mEntries.get(position);
+                synchronized (entry) {
+                    holder.setTitle(entry.label);
+                    mState.ensureIcon(entry);
+                    holder.setIcon(entry.icon);
+                    updateSummary(holder, entry);
+                    holder.updateDisableView(entry.info);
+                }
+                holder.setEnabled(isEnabled(position));
+            }
+            holder.itemView.setOnClickListener(mManageApplications);
+        }
+
+        private void updateSummary(ApplicationViewHolder holder, AppEntry entry) {
+            switch (mManageApplications.mListType) {
+                case LIST_TYPE_NOTIFICATION:
+                    if (entry.extraInfo != null) {
+                        holder.setSummary(InstalledAppDetails.getNotificationSummary(
+                                (AppRow) entry.extraInfo, mContext));
+                    } else {
+                        holder.setSummary(null);
+                    }
+                    break;
+                case LIST_TYPE_USAGE_ACCESS:
+                    if (entry.extraInfo != null) {
+                        holder.setSummary(
+                                (new UsageState((PermissionState) entry.extraInfo)).isPermissible()
+                                        ? R.string.app_permission_summary_allowed
+                                        : R.string.app_permission_summary_not_allowed);
+                    } else {
+                        holder.setSummary(null);
+                    }
+                    break;
+                case LIST_TYPE_HIGH_POWER:
+                    holder.setSummary(HighPowerDetail.getSummary(mContext, entry));
+                    break;
+                case LIST_TYPE_OVERLAY:
+                    holder.setSummary(DrawOverlayDetails.getSummary(mContext, entry));
+                    break;
+                case LIST_TYPE_WRITE_SETTINGS:
+                    holder.setSummary(WriteSettingsDetails.getSummary(mContext, entry));
+                    break;
+                case LIST_TYPE_MANAGE_SOURCES:
+                    holder.setSummary(ExternalSourcesDetails.getPreferenceSummary(mContext, entry));
+                    break;
+                default:
+                    holder.updateSizeText(entry, mManageApplications.mInvalidSizeStr, mWhichSize);
+                    break;
+            }
+        }
+
+        private boolean hasExtraView() {
+            return mExtraViewController != null
+                    && mExtraViewController.shouldShow();
+        }
+    }
+
+    private static class SummaryProvider implements SummaryLoader.SummaryProvider {
+
+        private final Context mContext;
+        private final SummaryLoader mLoader;
+        private ApplicationsState.Session mSession;
+
+        private SummaryProvider(Context context, SummaryLoader loader) {
+            mContext = context;
+            mLoader = loader;
+        }
+
+        @Override
+        public void setListening(boolean listening) {
+            if (listening) {
+                new InstalledAppCounter(mContext, InstalledAppCounter.IGNORE_INSTALL_REASON,
+                        new PackageManagerWrapper(mContext.getPackageManager())) {
+                    @Override
+                    protected void onCountComplete(int num) {
+                        mLoader.setSummary(SummaryProvider.this,
+                                mContext.getString(R.string.apps_summary, num));
+                    }
+                }.execute();
+            }
+        }
+    }
+
+    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);
+        }
+    };
+}
diff --git a/src/com/android/settings/applications/manageapplications/MusicViewHolderController.java b/src/com/android/settings/applications/manageapplications/MusicViewHolderController.java
new file mode 100644
index 0000000..14d08aa
--- /dev/null
+++ b/src/com/android/settings/applications/manageapplications/MusicViewHolderController.java
@@ -0,0 +1,89 @@
+/*
+ * 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.manageapplications;
+
+import android.app.Fragment;
+import android.content.Context;
+import android.content.Intent;
+import android.os.UserHandle;
+import android.provider.DocumentsContract;
+import android.support.annotation.WorkerThread;
+import android.text.format.Formatter;
+import android.util.Log;
+
+import com.android.settings.R;
+import com.android.settings.Utils;
+import com.android.settingslib.applications.StorageStatsSource;
+
+import java.io.IOException;
+
+/**
+ * MusicViewHolderController controls an Audio/Music file view in the ManageApplications view.
+ */
+public class MusicViewHolderController implements FileViewHolderController {
+    private static final String TAG = "MusicViewHolderCtrl";
+
+    private static final String AUTHORITY_MEDIA = "com.android.providers.media.documents";
+
+    private Context mContext;
+    private StorageStatsSource mSource;
+    private String mVolumeUuid;
+    private long mMusicSize;
+    private UserHandle mUser;
+
+    public MusicViewHolderController(
+            Context context, StorageStatsSource source, String volumeUuid, UserHandle user) {
+        mContext = context;
+        mSource = source;
+        mVolumeUuid = volumeUuid;
+        mUser = user;
+    }
+
+    @Override
+    @WorkerThread
+    public void queryStats() {
+        try {
+            mMusicSize = mSource.getExternalStorageStats(mVolumeUuid, mUser).audioBytes;
+        } catch (IOException e) {
+            mMusicSize = 0;
+            Log.w(TAG, e);
+        }
+    }
+
+    @Override
+    public boolean shouldShow() {
+        return true;
+    }
+
+    @Override
+    public void setupView(ApplicationViewHolder holder) {
+        holder.setIcon(R.drawable.ic_headset_24dp);
+        holder.setTitle(mContext.getText(R.string.audio_files_title));
+        holder.setSummary(Formatter.formatFileSize(mContext, mMusicSize));
+    }
+
+    @Override
+    public void onClick(Fragment fragment) {
+        Intent intent = new Intent(Intent.ACTION_VIEW);
+        intent.setDataAndType(
+                DocumentsContract.buildRootUri(AUTHORITY_MEDIA, "audio_root"),
+                DocumentsContract.Root.MIME_TYPE_ITEM);
+        intent.addCategory(Intent.CATEGORY_DEFAULT);
+        intent.putExtra(Intent.EXTRA_USER_ID, mUser);
+        Utils.launchIntent(fragment, intent);
+    }
+}
diff --git a/src/com/android/settings/applications/manageapplications/PhotosViewHolderController.java b/src/com/android/settings/applications/manageapplications/PhotosViewHolderController.java
new file mode 100644
index 0000000..73330e9
--- /dev/null
+++ b/src/com/android/settings/applications/manageapplications/PhotosViewHolderController.java
@@ -0,0 +1,87 @@
+/*
+ * 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.manageapplications;
+
+import android.app.Fragment;
+import android.content.Context;
+import android.content.Intent;
+import android.os.UserHandle;
+import android.support.annotation.WorkerThread;
+import android.text.format.Formatter;
+import android.util.Log;
+
+import com.android.settings.R;
+import com.android.settings.Utils;
+import com.android.settingslib.applications.StorageStatsSource;
+
+import java.io.IOException;
+
+/** PhotosViewHolderController controls an Audio/Music file view in the ManageApplications view. */
+public class PhotosViewHolderController implements FileViewHolderController {
+    private static final String TAG = "PhotosViewHolderCtrl";
+
+    private static final String IMAGE_MIME_TYPE = "image/*";
+
+    private Context mContext;
+    private StorageStatsSource mSource;
+    private String mVolumeUuid;
+    private long mFilesSize;
+    private UserHandle mUser;
+
+    public PhotosViewHolderController(
+            Context context, StorageStatsSource source, String volumeUuid, UserHandle user) {
+        mContext = context;
+        mSource = source;
+        mVolumeUuid = volumeUuid;
+        mUser = user;
+    }
+
+    @Override
+    @WorkerThread
+    public void queryStats() {
+        try {
+            StorageStatsSource.ExternalStorageStats stats =
+                    mSource.getExternalStorageStats(mVolumeUuid, mUser);
+            mFilesSize = stats.imageBytes + stats.videoBytes;
+        } catch (IOException e) {
+            mFilesSize = 0;
+            Log.w(TAG, e);
+        }
+    }
+
+    @Override
+    public boolean shouldShow() {
+        return true;
+    }
+
+    @Override
+    public void setupView(ApplicationViewHolder holder) {
+        holder.setIcon(R.drawable.ic_photo_library);
+        holder.setTitle(mContext.getText(R.string.storage_detail_images));
+        holder.setSummary(Formatter.formatFileSize(mContext, mFilesSize));
+    }
+
+    @Override
+    public void onClick(Fragment fragment) {
+        Intent intent = new Intent();
+        intent.setAction(android.content.Intent.ACTION_VIEW);
+        intent.setFlags(Intent.FLAG_ACTIVITY_NEW_DOCUMENT);
+        intent.setType(IMAGE_MIME_TYPE);
+        intent.putExtra(Intent.EXTRA_FROM_STORAGE, true);
+        Utils.launchIntent(fragment, intent);
+    }
+}
diff --git a/src/com/android/settings/applications/manageapplications/ResetAppPrefPreferenceController.java b/src/com/android/settings/applications/manageapplications/ResetAppPrefPreferenceController.java
new file mode 100644
index 0000000..d7f6c6e
--- /dev/null
+++ b/src/com/android/settings/applications/manageapplications/ResetAppPrefPreferenceController.java
@@ -0,0 +1,72 @@
+/*
+ * Copyright (C) 2017 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.applications.manageapplications;
+
+import android.content.Context;
+import android.os.Bundle;
+import android.support.v7.preference.Preference;
+import android.text.TextUtils;
+
+import com.android.settings.core.PreferenceControllerMixin;
+import com.android.settingslib.core.AbstractPreferenceController;
+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 AbstractPreferenceController
+        implements PreferenceControllerMixin, LifecycleObserver, OnCreate, OnSaveInstanceState {
+
+    private ResetAppsHelper mResetAppsHelper;
+
+    public ResetAppPrefPreferenceController(Context context, Lifecycle lifecycle) {
+        super(context);
+        mResetAppsHelper = new ResetAppsHelper(context);
+        if (lifecycle != null) {
+            lifecycle.addObserver(this);
+        }
+    }
+
+    @Override
+    public boolean handlePreferenceTreeClick(Preference preference) {
+        if (!TextUtils.equals(preference.getKey(), getPreferenceKey())) {
+            return false;
+        }
+        mResetAppsHelper.buildResetDialog();
+        return true;
+    }
+
+    @Override
+    public boolean isAvailable() {
+        return true;
+    }
+
+    @Override
+    public String getPreferenceKey() {
+        return "reset_app_prefs";
+    }
+
+    @Override
+    public void onCreate(Bundle savedInstanceState) {
+        mResetAppsHelper.onRestoreInstanceState(savedInstanceState);
+    }
+
+    @Override
+    public void onSaveInstanceState(Bundle outState) {
+        mResetAppsHelper.onSaveInstanceState(outState);
+    }
+}
diff --git a/src/com/android/settings/applications/manageapplications/ResetAppsHelper.java b/src/com/android/settings/applications/manageapplications/ResetAppsHelper.java
new file mode 100644
index 0000000..686e027
--- /dev/null
+++ b/src/com/android/settings/applications/manageapplications/ResetAppsHelper.java
@@ -0,0 +1,157 @@
+/*
+ * 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.applications.manageapplications;
+
+import static android.net.NetworkPolicyManager.POLICY_NONE;
+import static android.net.NetworkPolicyManager.POLICY_REJECT_METERED_BACKGROUND;
+
+import android.app.ActivityManager;
+import android.app.AlertDialog;
+import android.app.AppOpsManager;
+import android.app.INotificationManager;
+import android.content.Context;
+import android.content.DialogInterface;
+import android.content.pm.ApplicationInfo;
+import android.content.pm.IPackageManager;
+import android.content.pm.PackageManager;
+import android.net.NetworkPolicyManager;
+import android.os.AsyncTask;
+import android.os.Bundle;
+import android.os.RemoteException;
+import android.os.ServiceManager;
+import android.os.UserHandle;
+import android.webkit.IWebViewUpdateService;
+
+import com.android.settings.R;
+
+import java.util.List;
+
+public class ResetAppsHelper implements DialogInterface.OnClickListener,
+        DialogInterface.OnDismissListener {
+
+    private static final String EXTRA_RESET_DIALOG = "resetDialog";
+
+    private final PackageManager mPm;
+    private final IPackageManager mIPm;
+    private final INotificationManager mNm;
+    private final IWebViewUpdateService mWvus;
+    private final NetworkPolicyManager mNpm;
+    private final AppOpsManager mAom;
+    private final Context mContext;
+
+    private AlertDialog mResetDialog;
+
+    public ResetAppsHelper(Context context) {
+        mContext = context;
+        mPm = context.getPackageManager();
+        mIPm = IPackageManager.Stub.asInterface(ServiceManager.getService("package"));
+        mNm = INotificationManager.Stub.asInterface(
+                ServiceManager.getService(Context.NOTIFICATION_SERVICE));
+        mWvus = IWebViewUpdateService.Stub.asInterface(ServiceManager.getService("webviewupdate"));
+        mNpm = NetworkPolicyManager.from(context);
+        mAom = (AppOpsManager) context.getSystemService(Context.APP_OPS_SERVICE);
+    }
+
+    public void onRestoreInstanceState(Bundle savedInstanceState) {
+        if (savedInstanceState != null && savedInstanceState.getBoolean(EXTRA_RESET_DIALOG)) {
+            buildResetDialog();
+        }
+    }
+
+    public void onSaveInstanceState(Bundle outState) {
+        if (mResetDialog != null) {
+            outState.putBoolean(EXTRA_RESET_DIALOG, true);
+        }
+    }
+
+    public void stop() {
+        if (mResetDialog != null) {
+            mResetDialog.dismiss();
+            mResetDialog = null;
+        }
+    }
+
+    void buildResetDialog() {
+        if (mResetDialog == null) {
+            mResetDialog = new AlertDialog.Builder(mContext)
+                    .setTitle(R.string.reset_app_preferences_title)
+                    .setMessage(R.string.reset_app_preferences_desc)
+                    .setPositiveButton(R.string.reset_app_preferences_button, this)
+                    .setNegativeButton(R.string.cancel, null)
+                    .setOnDismissListener(this)
+                    .show();
+        }
+    }
+
+    @Override
+    public void onDismiss(DialogInterface dialog) {
+        if (mResetDialog == dialog) {
+            mResetDialog = null;
+        }
+    }
+
+    @Override
+    public void onClick(DialogInterface dialog, int which) {
+        if (mResetDialog != dialog) {
+            return;
+        }
+        AsyncTask.execute(new Runnable() {
+            @Override
+            public void run() {
+                List<ApplicationInfo> apps = mPm.getInstalledApplications(
+                        PackageManager.GET_DISABLED_COMPONENTS);
+                for (int i = 0; i < apps.size(); i++) {
+                    ApplicationInfo app = apps.get(i);
+                    try {
+                        mNm.setNotificationsEnabledForPackage(app.packageName, app.uid, true);
+                    } catch (android.os.RemoteException ex) {
+                    }
+                    if (!app.enabled) {
+                        if (mPm.getApplicationEnabledSetting(app.packageName)
+                                == PackageManager.COMPONENT_ENABLED_STATE_DISABLED_USER
+                                && !isNonEnableableFallback(app.packageName)) {
+                            mPm.setApplicationEnabledSetting(app.packageName,
+                                    PackageManager.COMPONENT_ENABLED_STATE_DEFAULT,
+                                    PackageManager.DONT_KILL_APP);
+                        }
+                    }
+                }
+                try {
+                    mIPm.resetApplicationPreferences(UserHandle.myUserId());
+                } catch (RemoteException e) {
+                }
+                mAom.resetAllModes();
+                final int[] restrictedUids = mNpm.getUidsWithPolicy(
+                        POLICY_REJECT_METERED_BACKGROUND);
+                final int currentUserId = ActivityManager.getCurrentUser();
+                for (int uid : restrictedUids) {
+                    // Only reset for current user
+                    if (UserHandle.getUserId(uid) == currentUserId) {
+                        mNpm.setUidPolicy(uid, POLICY_NONE);
+                    }
+                }
+            }
+        });
+    }
+
+    private boolean isNonEnableableFallback(String packageName) {
+        try {
+            return mWvus.isFallbackPackage(packageName);
+        } catch (RemoteException e) {
+            throw new RuntimeException(e);
+        }
+    }
+}
diff --git a/src/com/android/settings/backup/OWNERS b/src/com/android/settings/backup/OWNERS
index 4c4da44..c026a35 100644
--- a/src/com/android/settings/backup/OWNERS
+++ b/src/com/android/settings/backup/OWNERS
@@ -1,4 +1,6 @@
 # Default reviewers for this and subdirectories.
 bryanmawhinney@google.com
 cprins@google.com
+jorlow@google.com
 philippov@google.com
+stefanot@google.com
\ No newline at end of file
diff --git a/src/com/android/settings/bluetooth/BluetoothDetailsButtonsController.java b/src/com/android/settings/bluetooth/BluetoothDetailsButtonsController.java
index bbc8d81..5cd8171 100644
--- a/src/com/android/settings/bluetooth/BluetoothDetailsButtonsController.java
+++ b/src/com/android/settings/bluetooth/BluetoothDetailsButtonsController.java
@@ -19,11 +19,9 @@
 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.settings.widget.ActionButtonPreference;
 import com.android.settingslib.bluetooth.CachedBluetoothDevice;
 import com.android.settingslib.core.lifecycle.Lifecycle;
 
@@ -35,7 +33,8 @@
     private static final String KEY_ACTION_BUTTONS = "action_buttons";
     private boolean mIsConnected;
 
-    private LayoutPreference mActionButtons;
+    private boolean mConnectButtonInitialized;
+    private ActionButtonPreference mActionButtons;
 
     public BluetoothDetailsButtonsController(Context context, PreferenceFragment fragment,
             CachedBluetoothDevice device, Lifecycle lifecycle) {
@@ -51,35 +50,35 @@
 
     @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();
-        });
+        mActionButtons = ((ActionButtonPreference) screen.findPreference(getPreferenceKey()))
+                .setButton1Text(R.string.forget)
+                .setButton1OnClickListener((view) -> onForgetButtonPressed())
+                .setButton1Positive(false)
+                .setButton1Enabled(true);
     }
 
     @Override
     protected void refresh() {
-        Button leftButton = (Button) mActionButtons.findViewById(R.id.left_button);
-        leftButton.setEnabled(!mCachedDevice.isBusy());
-        boolean notInitialized = TextUtils.isEmpty(leftButton.getText());
+        mActionButtons.setButton2Enabled(!mCachedDevice.isBusy());
 
         boolean previouslyConnected = mIsConnected;
         mIsConnected = mCachedDevice.isConnected();
         if (mIsConnected) {
-            if (notInitialized || !previouslyConnected) {
-                leftButton.setText(R.string.bluetooth_device_context_disconnect);
-                leftButton.setOnClickListener((view) -> {
-                    mCachedDevice.disconnect();
-                });
+            if (!mConnectButtonInitialized || !previouslyConnected) {
+                mActionButtons
+                        .setButton2Text(R.string.bluetooth_device_context_disconnect)
+                        .setButton2OnClickListener(view -> mCachedDevice.disconnect())
+                        .setButton2Positive(false);
+                mConnectButtonInitialized = true;
             }
         } else {
-            if (notInitialized || previouslyConnected) {
-                leftButton.setText(R.string.bluetooth_device_context_connect);
-                leftButton.setOnClickListener((view) -> {
-                    mCachedDevice.connect(true);
-                });
+            if (!mConnectButtonInitialized || previouslyConnected) {
+                mActionButtons
+                        .setButton2Text(R.string.bluetooth_device_context_connect)
+                        .setButton2OnClickListener(
+                                view -> mCachedDevice.connect(true /* connectAllProfiles */))
+                        .setButton2Positive(true);
+                mConnectButtonInitialized = true;
             }
         }
     }
@@ -88,4 +87,5 @@
     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
index 265690b..63d7b5c 100644
--- a/src/com/android/settings/bluetooth/BluetoothDetailsController.java
+++ b/src/com/android/settings/bluetooth/BluetoothDetailsController.java
@@ -72,8 +72,8 @@
 
     @Override
     public final void displayPreference(PreferenceScreen screen) {
-        super.displayPreference(screen);
         init(screen);
+        super.displayPreference(screen);
     }
 
     /**
diff --git a/src/com/android/settings/bluetooth/BluetoothDetailsHeaderController.java b/src/com/android/settings/bluetooth/BluetoothDetailsHeaderController.java
index 04e9f5a..df7b601 100644
--- a/src/com/android/settings/bluetooth/BluetoothDetailsHeaderController.java
+++ b/src/com/android/settings/bluetooth/BluetoothDetailsHeaderController.java
@@ -51,8 +51,8 @@
     }
 
     protected void setHeaderProperties() {
-        final Pair<Drawable, String> pair = Utils.getBtClassDrawableWithDescription(
-                mContext, mCachedDevice,
+        final Pair<Drawable, String> pair = com.android.settingslib.bluetooth.Utils
+                .getBtClassDrawableWithDescription(mContext, mCachedDevice,
                 mContext.getResources().getFraction(R.fraction.bt_battery_scale_fraction, 1, 1));
         String summaryText = mCachedDevice.getConnectionSummary();
         mHeaderController.setLabel(mCachedDevice.getName());
diff --git a/src/com/android/settings/bluetooth/BluetoothDevicePreference.java b/src/com/android/settings/bluetooth/BluetoothDevicePreference.java
index 94ba478..a0ce733 100644
--- a/src/com/android/settings/bluetooth/BluetoothDevicePreference.java
+++ b/src/com/android/settings/bluetooth/BluetoothDevicePreference.java
@@ -52,19 +52,19 @@
 
     private final CachedBluetoothDevice mCachedDevice;
     private final UserManager mUserManager;
+    private final boolean mShowDevicesWithoutNames;
 
     private AlertDialog mDisconnectDialog;
     private String contentDescription = null;
-    private DeviceListPreferenceFragment mDeviceListPreferenceFragment;
     /* Talk-back descriptions for various BT icons */
     Resources mResources;
 
     public BluetoothDevicePreference(Context context, CachedBluetoothDevice cachedDevice,
-            DeviceListPreferenceFragment deviceListPreferenceFragment) {
+            boolean showDeviceWithoutNames) {
         super(context, null);
         mResources = getContext().getResources();
         mUserManager = (UserManager) context.getSystemService(Context.USER_SERVICE);
-        mDeviceListPreferenceFragment = deviceListPreferenceFragment;
+        mShowDevicesWithoutNames = showDeviceWithoutNames;
 
         if (sDimAlpha == Integer.MIN_VALUE) {
             TypedValue outValue = new TypedValue();
@@ -122,8 +122,8 @@
         // Null check is done at the framework
         setSummary(mCachedDevice.getConnectionSummary());
 
-        final Pair<Drawable, String> pair = Utils.getBtClassDrawableWithDescription(getContext(),
-                mCachedDevice);
+        final Pair<Drawable, String> pair = com.android.settingslib.bluetooth.Utils
+                .getBtClassDrawableWithDescription(getContext(), mCachedDevice);
         if (pair.first != null) {
             setIcon(pair.first);
             contentDescription = pair.second;
@@ -134,8 +134,7 @@
 
         // Device is only visible in the UI if it has a valid name besides MAC address or when user
         // allows showing devices without user-friendly name in developer settings
-        setVisible(mDeviceListPreferenceFragment.shouldShowDevicesWithoutNames()
-                || mCachedDevice.hasHumanReadableName());
+        setVisible(mShowDevicesWithoutNames || mCachedDevice.hasHumanReadableName());
 
         // This could affect ordering, so notify that
         notifyHierarchyChanged();
diff --git a/src/com/android/settings/bluetooth/BluetoothDeviceUpdater.java b/src/com/android/settings/bluetooth/BluetoothDeviceUpdater.java
new file mode 100644
index 0000000..127730b
--- /dev/null
+++ b/src/com/android/settings/bluetooth/BluetoothDeviceUpdater.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.bluetooth;
+
+import android.bluetooth.BluetoothDevice;
+import android.content.Context;
+import android.os.Bundle;
+import android.os.SystemProperties;
+import android.support.annotation.VisibleForTesting;
+import android.support.v7.preference.Preference;
+
+import com.android.settings.R;
+import com.android.settings.SettingsActivity;
+import com.android.settings.dashboard.DashboardFragment;
+import com.android.settings.connecteddevice.DevicePreferenceCallback;
+import com.android.settings.widget.GearPreference;
+import com.android.settingslib.bluetooth.BluetoothCallback;
+import com.android.settingslib.bluetooth.BluetoothDeviceFilter;
+import com.android.settingslib.bluetooth.CachedBluetoothDevice;
+import com.android.settingslib.bluetooth.LocalBluetoothManager;
+
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * Update the bluetooth devices. It gets bluetooth event from {@link LocalBluetoothManager} using
+ * {@link BluetoothCallback}. It notifies the upper level whether to add/remove the preference
+ * through {@link DevicePreferenceCallback}
+ *
+ * In {@link BluetoothDeviceUpdater}, it uses {@link BluetoothDeviceFilter.Filter} to detect
+ * whether the {@link CachedBluetoothDevice} is relevant.
+ */
+public abstract class BluetoothDeviceUpdater implements BluetoothCallback {
+    private static final String BLUETOOTH_SHOW_DEVICES_WITHOUT_NAMES_PROPERTY =
+            "persist.bluetooth.showdeviceswithoutnames";
+
+    protected final LocalBluetoothManager mLocalManager;
+    protected final DevicePreferenceCallback mDevicePreferenceCallback;
+    protected final Map<BluetoothDevice, Preference> mPreferenceMap;
+    protected Context mPrefContext;
+
+    private final boolean mShowDeviceWithoutNames;
+    private DashboardFragment mFragment;
+
+    @VisibleForTesting
+    final GearPreference.OnGearClickListener mDeviceProfilesListener = pref -> {
+        final CachedBluetoothDevice device =
+                ((BluetoothDevicePreference) pref).getBluetoothDevice();
+        if (device == null) {
+            return;
+        }
+        final Bundle args = new Bundle();
+        args.putString(BluetoothDeviceDetailsFragment.KEY_DEVICE_ADDRESS,
+                device.getDevice().getAddress());
+        final SettingsActivity activity = (SettingsActivity) mFragment.getActivity();
+        activity.startPreferencePanel(mFragment,
+                BluetoothDeviceDetailsFragment.class.getName(), args,
+                R.string.device_details_title, null, null, 0);
+
+    };
+
+    public BluetoothDeviceUpdater(DashboardFragment fragment,
+            DevicePreferenceCallback devicePreferenceCallback) {
+        this(fragment, devicePreferenceCallback, Utils.getLocalBtManager(fragment.getContext()));
+    }
+
+    @VisibleForTesting
+    BluetoothDeviceUpdater(DashboardFragment fragment,
+            DevicePreferenceCallback devicePreferenceCallback, LocalBluetoothManager localManager) {
+        mFragment = fragment;
+        mDevicePreferenceCallback = devicePreferenceCallback;
+        mShowDeviceWithoutNames = SystemProperties.getBoolean(
+                BLUETOOTH_SHOW_DEVICES_WITHOUT_NAMES_PROPERTY, false);
+        mPreferenceMap = new HashMap<>();
+        mLocalManager = localManager;
+    }
+
+    /**
+     * Register the bluetooth event callback and update the list
+     */
+    public void registerCallback() {
+        mLocalManager.setForegroundActivity(mFragment.getContext());
+        mLocalManager.getEventManager().registerCallback(this);
+        forceUpdate();
+    }
+
+    /**
+     * Unregister the bluetooth event callback
+     */
+    public void unregisterCallback() {
+        mLocalManager.setForegroundActivity(null);
+        mLocalManager.getEventManager().unregisterCallback(this);
+    }
+
+    /**
+     * Force to update the list of bluetooth devices
+     */
+    public void forceUpdate() {
+        Collection<CachedBluetoothDevice> cachedDevices =
+                mLocalManager.getCachedDeviceManager().getCachedDevicesCopy();
+        for (CachedBluetoothDevice cachedBluetoothDevice : cachedDevices) {
+            update(cachedBluetoothDevice);
+        }
+    }
+
+    @Override
+    public void onBluetoothStateChanged(int bluetoothState) {
+        forceUpdate();
+    }
+
+    @Override
+    public void onScanningStateChanged(boolean started) {}
+
+    @Override
+    public void onDeviceAdded(CachedBluetoothDevice cachedDevice) {
+        update(cachedDevice);
+    }
+
+    @Override
+    public void onDeviceDeleted(CachedBluetoothDevice cachedDevice) {}
+
+    @Override
+    public void onDeviceBondStateChanged(CachedBluetoothDevice cachedDevice, int bondState) {
+        update(cachedDevice);
+    }
+
+    @Override
+    public void onConnectionStateChanged(CachedBluetoothDevice cachedDevice, int state) {}
+
+    /**
+     * Set the context to generate the {@link Preference}, so it could get the correct theme.
+     */
+    public void setPrefContext(Context context) {
+        mPrefContext = context;
+    }
+
+    /**
+     * Return {@code true} if {@code cachedBluetoothDevice} matches this
+     * {@link BluetoothDeviceUpdater} and should stay in the list, otherwise return {@code false}
+     */
+    public abstract boolean isFilterMatched(CachedBluetoothDevice cachedBluetoothDevice);
+
+    /**
+     * Update whether to show {@cde cachedBluetoothDevice} in the list.
+     */
+    protected void update(CachedBluetoothDevice cachedBluetoothDevice) {
+        if (isFilterMatched(cachedBluetoothDevice)) {
+            // Add the preference if it is new one
+            addPreference(cachedBluetoothDevice);
+        } else {
+            removePreference(cachedBluetoothDevice);
+        }
+    }
+
+    /**
+     * Add the {@link Preference} that represents the {@code cachedDevice}
+     */
+    protected void addPreference(CachedBluetoothDevice cachedDevice) {
+        final BluetoothDevice device = cachedDevice.getDevice();
+        if (!mPreferenceMap.containsKey(device)) {
+            BluetoothDevicePreference btPreference =
+                    new BluetoothDevicePreference(mPrefContext, cachedDevice,
+                            mShowDeviceWithoutNames);
+            btPreference.setOnGearClickListener(mDeviceProfilesListener);
+            mPreferenceMap.put(device, btPreference);
+            mDevicePreferenceCallback.onDeviceAdded(btPreference);
+        }
+    }
+
+    /**
+     * Remove the {@link Preference} that represents the {@code cachedDevice}
+     */
+    protected void removePreference(CachedBluetoothDevice cachedDevice) {
+        final BluetoothDevice device = cachedDevice.getDevice();
+        if (mPreferenceMap.containsKey(device)) {
+            mDevicePreferenceCallback.onDeviceRemoved(mPreferenceMap.get(device));
+            mPreferenceMap.remove(device);
+        }
+    }
+}
diff --git a/src/com/android/settings/bluetooth/BluetoothEnabler.java b/src/com/android/settings/bluetooth/BluetoothEnabler.java
index f95145d..87fa43d 100644
--- a/src/com/android/settings/bluetooth/BluetoothEnabler.java
+++ b/src/com/android/settings/bluetooth/BluetoothEnabler.java
@@ -23,7 +23,6 @@
 import android.content.IntentFilter;
 import android.os.UserManager;
 import android.provider.Settings;
-import android.widget.Switch;
 import android.widget.Toast;
 
 import com.android.internal.annotations.VisibleForTesting;
@@ -41,8 +40,7 @@
  * preference reflects the current state.
  */
 public final class BluetoothEnabler implements SwitchWidgetController.OnSwitchChangeListener {
-    private final Switch mSwitch;
-    private final SwitchWidgetController mSwitchWidget;
+    private final SwitchWidgetController mSwitchController;
     private final MetricsFeatureProvider mMetricsFeatureProvider;
     private Context mContext;
     private boolean mValidListener;
@@ -64,28 +62,27 @@
         }
     };
 
-    public BluetoothEnabler(Context context, SwitchWidgetController switchWidget,
+    public BluetoothEnabler(Context context, SwitchWidgetController switchController,
             MetricsFeatureProvider metricsFeatureProvider, LocalBluetoothManager manager,
             int metricsEvent) {
-        this(context, switchWidget, metricsFeatureProvider, manager, metricsEvent,
+        this(context, switchController, metricsFeatureProvider, manager, metricsEvent,
                 new RestrictionUtils());
     }
 
-    public BluetoothEnabler(Context context, SwitchWidgetController switchWidget,
+    public BluetoothEnabler(Context context, SwitchWidgetController switchController,
             MetricsFeatureProvider metricsFeatureProvider, LocalBluetoothManager manager,
             int metricsEvent, RestrictionUtils restrictionUtils) {
         mContext = context;
         mMetricsFeatureProvider = metricsFeatureProvider;
-        mSwitchWidget = switchWidget;
-        mSwitch = mSwitchWidget.getSwitch();
-        mSwitchWidget.setListener(this);
+        mSwitchController = switchController;
+        mSwitchController.setListener(this);
         mValidListener = false;
         mMetricsEvent = metricsEvent;
 
         if (manager == null) {
             // Bluetooth is not supported
             mLocalAdapter = null;
-            mSwitchWidget.setEnabled(false);
+            mSwitchController.setEnabled(false);
         } else {
             mLocalAdapter = manager.getBluetoothAdapter();
         }
@@ -94,11 +91,11 @@
     }
 
     public void setupSwitchController() {
-        mSwitchWidget.setupView();
+        mSwitchController.setupView();
     }
 
     public void teardownSwitchController() {
-        mSwitchWidget.teardownView();
+        mSwitchController.teardownView();
     }
 
     public void resume(Context context) {
@@ -109,7 +106,7 @@
         final boolean restricted = maybeEnforceRestrictions();
 
         if (mLocalAdapter == null) {
-            mSwitchWidget.setEnabled(false);
+            mSwitchController.setEnabled(false);
             return;
         }
 
@@ -118,7 +115,7 @@
             handleStateChanged(mLocalAdapter.getBluetoothState());
         }
 
-        mSwitchWidget.startListening();
+        mSwitchController.startListening();
         mContext.registerReceiver(mReceiver, mIntentFilter);
         mValidListener = true;
     }
@@ -128,7 +125,7 @@
             return;
         }
         if (mValidListener) {
-            mSwitchWidget.stopListening();
+            mSwitchController.stopListening();
             mContext.unregisterReceiver(mReceiver);
             mValidListener = false;
         }
@@ -137,37 +134,35 @@
     void handleStateChanged(int state) {
         switch (state) {
             case BluetoothAdapter.STATE_TURNING_ON:
-                mSwitchWidget.setEnabled(false);
+                mSwitchController.setEnabled(false);
                 break;
             case BluetoothAdapter.STATE_ON:
                 setChecked(true);
-                mSwitchWidget.setEnabled(true);
+                mSwitchController.setEnabled(true);
                 break;
             case BluetoothAdapter.STATE_TURNING_OFF:
-                mSwitchWidget.setEnabled(false);
+                mSwitchController.setEnabled(false);
                 break;
             case BluetoothAdapter.STATE_OFF:
                 setChecked(false);
-                mSwitchWidget.setEnabled(true);
+                mSwitchController.setEnabled(true);
                 break;
             default:
                 setChecked(false);
-                mSwitchWidget.setEnabled(true);
+                mSwitchController.setEnabled(true);
         }
     }
 
     private void setChecked(boolean isChecked) {
-        final boolean currentState =
-                (mSwitchWidget.getSwitch() != null) && mSwitchWidget.getSwitch().isChecked();
-        if (isChecked != currentState) {
+        if (isChecked != mSwitchController.isChecked()) {
             // set listener to null, so onCheckedChanged won't be called
             // if the checked status on Switch isn't changed by user click
             if (mValidListener) {
-                mSwitchWidget.stopListening();
+                mSwitchController.stopListening();
             }
-            mSwitchWidget.setChecked(isChecked);
+            mSwitchController.setChecked(isChecked);
             if (mValidListener) {
-                mSwitchWidget.startListening();
+                mSwitchController.startListening();
             }
         }
     }
@@ -183,7 +178,7 @@
                 !WirelessUtils.isRadioAllowed(mContext, Settings.Global.RADIO_BLUETOOTH)) {
             Toast.makeText(mContext, R.string.wifi_in_airplane_mode, Toast.LENGTH_SHORT).show();
             // Reset switch to off
-            mSwitch.setChecked(false);
+            mSwitchController.setChecked(false);
             return false;
         }
 
@@ -195,13 +190,13 @@
             // a) The switch should be OFF but it should still be togglable (enabled = True)
             // b) The switch bar should have OFF text.
             if (isChecked && !status) {
-                mSwitch.setChecked(false);
-                mSwitch.setEnabled(true);
-                mSwitchWidget.updateTitle(false);
+                mSwitchController.setChecked(false);
+                mSwitchController.setEnabled(true);
+                mSwitchController.updateTitle(false);
                 return false;
             }
         }
-        mSwitchWidget.setEnabled(false);
+        mSwitchController.setEnabled(false);
         return true;
     }
 
@@ -213,13 +208,10 @@
     @VisibleForTesting
     boolean maybeEnforceRestrictions() {
         EnforcedAdmin admin = getEnforcedAdmin(mRestrictionUtils, mContext);
-        mSwitchWidget.setDisabledByAdmin(admin);
+        mSwitchController.setDisabledByAdmin(admin);
         if (admin != null) {
-            mSwitchWidget.setChecked(false);
-            if (mSwitch != null) {
-                mSwitch.setEnabled(false);
-                mSwitch.setChecked(false);
-            }
+            mSwitchController.setChecked(false);
+            mSwitchController.setEnabled(false);
         }
         return admin != null;
     }
diff --git a/src/com/android/settings/bluetooth/BluetoothFeatureProviderImpl.java b/src/com/android/settings/bluetooth/BluetoothFeatureProviderImpl.java
index 8d9e1c4..c4962d6 100644
--- a/src/com/android/settings/bluetooth/BluetoothFeatureProviderImpl.java
+++ b/src/com/android/settings/bluetooth/BluetoothFeatureProviderImpl.java
@@ -14,4 +14,4 @@
     public boolean isDeviceDetailPageEnabled() {
         return false;
     }
-}
+}
\ No newline at end of file
diff --git a/src/com/android/settings/bluetooth/BluetoothNameDialogFragment.java b/src/com/android/settings/bluetooth/BluetoothNameDialogFragment.java
index 25413fa..576e656 100644
--- a/src/com/android/settings/bluetooth/BluetoothNameDialogFragment.java
+++ b/src/com/android/settings/bluetooth/BluetoothNameDialogFragment.java
@@ -116,6 +116,7 @@
             mDeviceNameView.setSelection(deviceName.length());
         }
         mDeviceNameView.addTextChangedListener(this);
+        com.android.settings.Utils.setEditTextCursorPosition(mDeviceNameView);
         mDeviceNameView.setOnEditorActionListener(new TextView.OnEditorActionListener() {
             @Override
             public boolean onEditorAction(TextView v, int actionId, KeyEvent event) {
diff --git a/src/com/android/settings/bluetooth/BluetoothPairingDetail.java b/src/com/android/settings/bluetooth/BluetoothPairingDetail.java
index 60011f9..a9756a6 100644
--- a/src/com/android/settings/bluetooth/BluetoothPairingDetail.java
+++ b/src/com/android/settings/bluetooth/BluetoothPairingDetail.java
@@ -73,10 +73,20 @@
     public void onStart() {
         super.onStart();
 
-        updateContent(mLocalAdapter.getBluetoothState());
+        updateBluetooth();
         mAvailableDevicesCategory.setProgress(mLocalAdapter.isDiscovering());
     }
 
+    @VisibleForTesting
+    void updateBluetooth() {
+        if (mLocalAdapter.isEnabled()) {
+            updateContent(mLocalAdapter.getBluetoothState());
+        } else {
+            // Turn on bluetooth if it is disabled
+            mLocalAdapter.enable();
+        }
+    }
+
     @Override
     public void onStop() {
         super.onStop();
@@ -169,7 +179,7 @@
     }
 
     @Override
-    protected int getHelpResource() {
+    public int getHelpResource() {
         return R.string.help_url_bluetooth;
     }
 
diff --git a/src/com/android/settings/bluetooth/BluetoothSettings.java b/src/com/android/settings/bluetooth/BluetoothSettings.java
index 9789310..72d8023 100644
--- a/src/com/android/settings/bluetooth/BluetoothSettings.java
+++ b/src/com/android/settings/bluetooth/BluetoothSettings.java
@@ -345,7 +345,7 @@
     }
 
     @Override
-    protected int getHelpResource() {
+    public int getHelpResource() {
         return R.string.help_url_bluetooth;
     }
 
diff --git a/src/com/android/settings/bluetooth/ConnectedBluetoothDeviceUpdater.java b/src/com/android/settings/bluetooth/ConnectedBluetoothDeviceUpdater.java
new file mode 100644
index 0000000..deab29f
--- /dev/null
+++ b/src/com/android/settings/bluetooth/ConnectedBluetoothDeviceUpdater.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.bluetooth.BluetoothAdapter;
+import android.bluetooth.BluetoothDevice;
+import android.support.annotation.VisibleForTesting;
+
+import com.android.settings.connecteddevice.DevicePreferenceCallback;
+import com.android.settings.dashboard.DashboardFragment;
+import com.android.settingslib.bluetooth.CachedBluetoothDevice;
+import com.android.settingslib.bluetooth.LocalBluetoothManager;
+
+/**
+ * Controller to maintain connected bluetooth devices
+ */
+public class ConnectedBluetoothDeviceUpdater extends BluetoothDeviceUpdater {
+
+    public ConnectedBluetoothDeviceUpdater(DashboardFragment fragment,
+            DevicePreferenceCallback devicePreferenceCallback) {
+        super(fragment, devicePreferenceCallback);
+    }
+
+    @VisibleForTesting
+    ConnectedBluetoothDeviceUpdater(DashboardFragment fragment,
+            DevicePreferenceCallback devicePreferenceCallback,
+            LocalBluetoothManager localBluetoothManager) {
+        super(fragment, devicePreferenceCallback, localBluetoothManager);
+    }
+
+    @Override
+    public void onConnectionStateChanged(CachedBluetoothDevice cachedDevice, int state) {
+        if (state == BluetoothAdapter.STATE_CONNECTED) {
+            addPreference(cachedDevice);
+        } else if (state == BluetoothAdapter.STATE_DISCONNECTED) {
+            removePreference(cachedDevice);
+        }
+    }
+
+    @Override
+    public boolean isFilterMatched(CachedBluetoothDevice cachedDevice) {
+        final BluetoothDevice device = cachedDevice.getDevice();
+        return device.getBondState() == BluetoothDevice.BOND_BONDED && device.isConnected();
+    }
+}
diff --git a/src/com/android/settings/bluetooth/DeviceListPreferenceFragment.java b/src/com/android/settings/bluetooth/DeviceListPreferenceFragment.java
index 0485e69..0a90edc 100644
--- a/src/com/android/settings/bluetooth/DeviceListPreferenceFragment.java
+++ b/src/com/android/settings/bluetooth/DeviceListPreferenceFragment.java
@@ -27,8 +27,8 @@
 import android.text.BidiFormatter;
 import android.util.Log;
 
-import com.android.settings.dashboard.RestrictedDashboardFragment;
 import com.android.settings.R;
+import com.android.settings.dashboard.RestrictedDashboardFragment;
 import com.android.settingslib.bluetooth.BluetoothCallback;
 import com.android.settingslib.bluetooth.BluetoothDeviceFilter;
 import com.android.settingslib.bluetooth.CachedBluetoothDevice;
@@ -53,7 +53,7 @@
 
     private static final String KEY_BT_SCAN = "bt_scan";
 
-    // Copied from DevelopmentSettings.java
+    // Copied from BluetoothDeviceNoNamePreferenceController.java
     private static final String BLUETOOTH_SHOW_DEVICES_WITHOUT_NAMES_PROPERTY =
             "persist.bluetooth.showdeviceswithoutnames";
 
@@ -98,6 +98,8 @@
             return;
         }
         mLocalAdapter = mLocalManager.getBluetoothAdapter();
+        mShowDevicesWithoutNames = SystemProperties.getBoolean(
+                BLUETOOTH_SHOW_DEVICES_WITHOUT_NAMES_PROPERTY, false);
 
         initPreferencesFromPreferenceScreen();
 
@@ -110,8 +112,6 @@
     @Override
     public void onStart() {
         super.onStart();
-        mShowDevicesWithoutNames = SystemProperties.getBoolean(
-                BLUETOOTH_SHOW_DEVICES_WITHOUT_NAMES_PROPERTY, false);
         if (mLocalManager == null || isUiRestricted()) return;
 
         mLocalManager.setForegroundActivity(getActivity());
@@ -190,7 +190,8 @@
         BluetoothDevicePreference preference = (BluetoothDevicePreference) getCachedPreference(key);
 
         if (preference == null) {
-            preference = new BluetoothDevicePreference(getPrefContext(), cachedDevice, this);
+            preference = new BluetoothDevicePreference(getPrefContext(), cachedDevice,
+                    mShowDevicesWithoutNames);
             preference.setKey(key);
             mDeviceListGroup.addPreference(preference);
         } else {
diff --git a/src/com/android/settings/bluetooth/DeviceProfilesSettings.java b/src/com/android/settings/bluetooth/DeviceProfilesSettings.java
index a76ed46..eae2f29 100755
--- a/src/com/android/settings/bluetooth/DeviceProfilesSettings.java
+++ b/src/com/android/settings/bluetooth/DeviceProfilesSettings.java
@@ -323,6 +323,7 @@
         final EditText deviceNameField = (EditText) mRootView.findViewById(R.id.name);
         if (deviceNameField != null) {
             deviceNameField.setText(mCachedDevice.getName());
+            com.android.settings.Utils.setEditTextCursorPosition(deviceNameField);
         }
 
         refreshProfiles();
diff --git a/src/com/android/settings/bluetooth/SavedBluetoothDeviceUpdater.java b/src/com/android/settings/bluetooth/SavedBluetoothDeviceUpdater.java
new file mode 100644
index 0000000..da7679a
--- /dev/null
+++ b/src/com/android/settings/bluetooth/SavedBluetoothDeviceUpdater.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.bluetooth.BluetoothAdapter;
+import android.bluetooth.BluetoothDevice;
+import android.support.annotation.VisibleForTesting;
+
+import com.android.settings.connecteddevice.DevicePreferenceCallback;
+import com.android.settings.dashboard.DashboardFragment;
+import com.android.settingslib.bluetooth.CachedBluetoothDevice;
+import com.android.settingslib.bluetooth.LocalBluetoothManager;
+
+/**
+ * Maintain and update saved bluetooth devices(bonded but not connected)
+ */
+public class SavedBluetoothDeviceUpdater extends BluetoothDeviceUpdater {
+
+    public SavedBluetoothDeviceUpdater(DashboardFragment fragment,
+            DevicePreferenceCallback devicePreferenceCallback) {
+        super(fragment, devicePreferenceCallback);
+    }
+
+    @VisibleForTesting
+    SavedBluetoothDeviceUpdater(DashboardFragment fragment,
+            DevicePreferenceCallback devicePreferenceCallback,
+            LocalBluetoothManager localBluetoothManager) {
+        super(fragment, devicePreferenceCallback, localBluetoothManager);
+    }
+
+    @Override
+    public void onConnectionStateChanged(CachedBluetoothDevice cachedDevice, int state) {
+        if (state == BluetoothAdapter.STATE_CONNECTED) {
+            removePreference(cachedDevice);
+        } else if (state == BluetoothAdapter.STATE_DISCONNECTED) {
+            addPreference(cachedDevice);
+        }
+    }
+
+    @Override
+    public boolean isFilterMatched(CachedBluetoothDevice cachedDevice) {
+        final BluetoothDevice device = cachedDevice.getDevice();
+        return device.getBondState() == BluetoothDevice.BOND_BONDED && !device.isConnected();
+    }
+}
diff --git a/src/com/android/settings/bluetooth/Utils.java b/src/com/android/settings/bluetooth/Utils.java
index 0ecf62d..d5d4e50 100755
--- a/src/com/android/settings/bluetooth/Utils.java
+++ b/src/com/android/settings/bluetooth/Utils.java
@@ -17,31 +17,19 @@
 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.graphics.drawable.Drawable;
-import android.support.annotation.DrawableRes;
-import android.support.annotation.IdRes;
 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 com.android.settingslib.graph.BluetoothDeviceLayerDrawable;
-
-import java.util.List;
 
 /**
  * Utils is a helper class that contains constants for various
@@ -57,16 +45,16 @@
 
     public static int getConnectionStateSummary(int connectionState) {
         switch (connectionState) {
-        case BluetoothProfile.STATE_CONNECTED:
-            return R.string.bluetooth_connected;
-        case BluetoothProfile.STATE_CONNECTING:
-            return R.string.bluetooth_connecting;
-        case BluetoothProfile.STATE_DISCONNECTED:
-            return R.string.bluetooth_disconnected;
-        case BluetoothProfile.STATE_DISCONNECTING:
-            return R.string.bluetooth_disconnecting;
-        default:
-            return 0;
+            case BluetoothProfile.STATE_CONNECTED:
+                return R.string.bluetooth_connected;
+            case BluetoothProfile.STATE_CONNECTING:
+                return R.string.bluetooth_connecting;
+            case BluetoothProfile.STATE_DISCONNECTED:
+                return R.string.bluetooth_disconnected;
+            case BluetoothProfile.STATE_DISCONNECTING:
+                return R.string.bluetooth_disconnecting;
+            default:
+                return 0;
         }
     }
 
@@ -154,81 +142,4 @@
         }
     };
 
-    static Pair<Drawable, String> getBtClassDrawableWithDescription(Context context,
-            CachedBluetoothDevice cachedDevice) {
-        return getBtClassDrawableWithDescription(context, cachedDevice, 1 /* iconScale */);
-    }
-
-    static Pair<Drawable, String> getBtClassDrawableWithDescription(Context context,
-            CachedBluetoothDevice cachedDevice, float iconScale) {
-        BluetoothClass btClass = cachedDevice.getBtClass();
-        final int level = cachedDevice.getBatteryLevel();
-        if (btClass != null) {
-            switch (btClass.getMajorDeviceClass()) {
-                case BluetoothClass.Device.Major.COMPUTER:
-                    return new Pair<>(getBluetoothDrawable(context, R.drawable.ic_bt_laptop, level,
-                            iconScale),
-                            context.getString(R.string.bluetooth_talkback_computer));
-
-                case BluetoothClass.Device.Major.PHONE:
-                    return new Pair<>(
-                            getBluetoothDrawable(context, R.drawable.ic_bt_cellphone, level,
-                                    iconScale),
-                            context.getString(R.string.bluetooth_talkback_phone));
-
-                case BluetoothClass.Device.Major.PERIPHERAL:
-                    return new Pair<>(
-                            getBluetoothDrawable(context, HidProfile.getHidClassDrawable(btClass),
-                                    level, iconScale),
-                            context.getString(R.string.bluetooth_talkback_input_peripheral));
-
-                case BluetoothClass.Device.Major.IMAGING:
-                    return new Pair<>(
-                            getBluetoothDrawable(context, R.drawable.ic_settings_print, level,
-                                    iconScale),
-                            context.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<>(getBluetoothDrawable(context, resId, level, iconScale), null);
-            }
-        }
-        if (btClass != null) {
-            if (btClass.doesClassMatch(BluetoothClass.PROFILE_HEADSET)) {
-                return new Pair<>(
-                        getBluetoothDrawable(context, R.drawable.ic_bt_headset_hfp, level,
-                                iconScale),
-                        context.getString(R.string.bluetooth_talkback_headset));
-            }
-            if (btClass.doesClassMatch(BluetoothClass.PROFILE_A2DP)) {
-                return new Pair<>(
-                        getBluetoothDrawable(context, R.drawable.ic_bt_headphones_a2dp, level,
-                                iconScale),
-                        context.getString(R.string.bluetooth_talkback_headphone));
-            }
-        }
-        return new Pair<>(
-                getBluetoothDrawable(context, R.drawable.ic_settings_bluetooth, level, iconScale),
-                context.getString(R.string.bluetooth_talkback_bluetooth));
-    }
-
-    @VisibleForTesting
-    static Drawable getBluetoothDrawable(Context context, @DrawableRes int resId,
-            int batteryLevel, float iconScale) {
-        if (batteryLevel != BluetoothDevice.BATTERY_LEVEL_UNKNOWN) {
-            return BluetoothDeviceLayerDrawable.createLayerDrawable(context, resId, batteryLevel,
-                    iconScale);
-        } else if (resId != 0) {
-            return context.getDrawable(resId);
-        } else {
-            return null;
-        }
-    }
 }
diff --git a/src/com/android/settings/connecteddevice/AdvancedConnectedDeviceDashboardFragment.java b/src/com/android/settings/connecteddevice/AdvancedConnectedDeviceDashboardFragment.java
new file mode 100644
index 0000000..ea93fef
--- /dev/null
+++ b/src/com/android/settings/connecteddevice/AdvancedConnectedDeviceDashboardFragment.java
@@ -0,0 +1,134 @@
+/*
+ * Copyright (C) 2017 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.android.settings.connecteddevice;
+
+import android.content.Context;
+import android.content.pm.PackageManager;
+import android.provider.SearchIndexableResource;
+
+import com.android.internal.logging.nano.MetricsProto;
+import com.android.settings.R;
+import com.android.settings.SettingsActivity;
+import com.android.settings.bluetooth.BluetoothFilesPreferenceController;
+import com.android.settings.bluetooth.BluetoothMasterSwitchPreferenceController;
+import com.android.settings.bluetooth.Utils;
+import com.android.settings.dashboard.DashboardFragment;
+import com.android.settings.deviceinfo.UsbBackend;
+import com.android.settings.nfc.NfcPreferenceController;
+import com.android.settings.overlay.FeatureFactory;
+import com.android.settings.search.BaseSearchIndexProvider;
+import com.android.settingslib.core.AbstractPreferenceController;
+import com.android.settingslib.core.lifecycle.Lifecycle;
+import com.android.settingslib.drawer.CategoryKey;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+
+/**
+ * This fragment contains all the advanced connection preferences(i.e, Bluetooth, NFC, USB..)
+ */
+public class AdvancedConnectedDeviceDashboardFragment extends DashboardFragment {
+
+    private static final String TAG = "AdvancedConnectedDeviceFrag";
+    private UsbModePreferenceController mUsbPrefController;
+
+    @Override
+    public int getMetricsCategory() {
+        return MetricsProto.MetricsEvent.CONNECTION_DEVICE_ADVANCED;
+    }
+
+    @Override
+    protected String getLogTag() {
+        return TAG;
+    }
+
+    @Override
+    public int getHelpResource() {
+        return R.string.help_url_connected_devices;
+    }
+
+    @Override
+    protected int getPreferenceScreenResId() {
+        return R.xml.connected_devices_advanced;
+    }
+
+    @Override
+    public String getCategoryKey() {
+        //TODO(b/69926683): remove this method and change DashboardFragmentRegistry directly for P
+        return CategoryKey.CATEGORY_DEVICE;
+    }
+
+    @Override
+    protected List<AbstractPreferenceController> getPreferenceControllers(Context context) {
+        final List<AbstractPreferenceController> controllers = new ArrayList<>();
+        final Lifecycle lifecycle = getLifecycle();
+        final NfcPreferenceController nfcPreferenceController =
+                new NfcPreferenceController(context);
+        lifecycle.addObserver(nfcPreferenceController);
+        controllers.add(nfcPreferenceController);
+        mUsbPrefController = new UsbModePreferenceController(context, new UsbBackend(context));
+        lifecycle.addObserver(mUsbPrefController);
+        controllers.add(mUsbPrefController);
+        final BluetoothMasterSwitchPreferenceController bluetoothPreferenceController =
+                new BluetoothMasterSwitchPreferenceController(
+                        context, Utils.getLocalBtManager(context), this,
+                        (SettingsActivity) getActivity());
+        lifecycle.addObserver(bluetoothPreferenceController);
+        controllers.add(bluetoothPreferenceController);
+
+        SmsMirroringFeatureProvider smsMirroringFeatureProvider =
+                FeatureFactory.getFactory(context).getSmsMirroringFeatureProvider();
+        AbstractPreferenceController smsMirroringController =
+                smsMirroringFeatureProvider.getController(context);
+        controllers.add(smsMirroringController);
+        controllers.add(new BluetoothFilesPreferenceController(context));
+        return controllers;
+    }
+
+    /**
+     * For Search.
+     */
+    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.connected_devices_advanced;
+                    return Arrays.asList(sir);
+                }
+
+                @Override
+                public List<String> getNonIndexableKeys(Context context) {
+                    final List<String> keys = super.getNonIndexableKeys(context);
+                    PackageManager pm = context.getPackageManager();
+                    if (!pm.hasSystemFeature(PackageManager.FEATURE_NFC)) {
+                        keys.add(NfcPreferenceController.KEY_TOGGLE_NFC);
+                        keys.add(NfcPreferenceController.KEY_ANDROID_BEAM_SETTINGS);
+                    }
+                    keys.add(BluetoothMasterSwitchPreferenceController.KEY_TOGGLE_BLUETOOTH);
+
+                    SmsMirroringFeatureProvider smsMirroringFeatureProvider =
+                            FeatureFactory.getFactory(context).getSmsMirroringFeatureProvider();
+                    SmsMirroringPreferenceController smsMirroringController =
+                            smsMirroringFeatureProvider.getController(context);
+                    smsMirroringController.updateNonIndexableKeys(keys);
+
+                    return keys;
+                }
+            };
+}
diff --git a/src/com/android/settings/connecteddevice/ConnectedDeviceDashboardFragment.java b/src/com/android/settings/connecteddevice/ConnectedDeviceDashboardFragment.java
index 483b00c..e9ae11e 100644
--- a/src/com/android/settings/connecteddevice/ConnectedDeviceDashboardFragment.java
+++ b/src/com/android/settings/connecteddevice/ConnectedDeviceDashboardFragment.java
@@ -17,33 +17,25 @@
 
 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.dashboard.DashboardFragment;
 import com.android.settings.dashboard.SummaryLoader;
-import com.android.settings.deviceinfo.UsbBackend;
 import com.android.settings.nfc.NfcPreferenceController;
-import com.android.settings.overlay.FeatureFactory;
 import com.android.settings.search.BaseSearchIndexProvider;
 import com.android.settings.search.Indexable;
 import com.android.settingslib.core.AbstractPreferenceController;
 import com.android.settingslib.core.lifecycle.Lifecycle;
 
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.List;
 
 public class ConnectedDeviceDashboardFragment extends DashboardFragment {
 
     private static final String TAG = "ConnectedDeviceFrag";
-    private UsbModePreferenceController mUsbPrefController;
 
     @Override
     public int getMetricsCategory() {
@@ -56,7 +48,7 @@
     }
 
     @Override
-    protected int getHelpResource() {
+    public int getHelpResource() {
         return R.string.help_url_connected_devices;
     }
 
@@ -69,25 +61,10 @@
     protected List<AbstractPreferenceController> getPreferenceControllers(Context context) {
         final List<AbstractPreferenceController> controllers = new ArrayList<>();
         final Lifecycle lifecycle = getLifecycle();
-        final NfcPreferenceController nfcPreferenceController =
-                new NfcPreferenceController(context);
-        lifecycle.addObserver(nfcPreferenceController);
-        controllers.add(nfcPreferenceController);
-        mUsbPrefController = new UsbModePreferenceController(context, new UsbBackend(context));
-        lifecycle.addObserver(mUsbPrefController);
-        controllers.add(mUsbPrefController);
-        final BluetoothMasterSwitchPreferenceController bluetoothPreferenceController =
-                new BluetoothMasterSwitchPreferenceController(
-                        context, Utils.getLocalBtManager(context), this,
-                        (SettingsActivity) getActivity());
-        lifecycle.addObserver(bluetoothPreferenceController);
-        controllers.add(bluetoothPreferenceController);
 
-        SmsMirroringFeatureProvider smsMirroringFeatureProvider =
-                FeatureFactory.getFactory(context).getSmsMirroringFeatureProvider();
-        AbstractPreferenceController smsMirroringController =
-                smsMirroringFeatureProvider.getController(context);
-        controllers.add(smsMirroringController);
+        controllers.add(new ConnectedDeviceGroupController(this, lifecycle));
+        controllers.add(new SavedDeviceGroupController(this, lifecycle));
+
         return controllers;
     }
 
@@ -131,33 +108,26 @@
     /**
      * For Search.
      */
+    //TODO(b/69333961): update the index for this new fragment
     public static final Indexable.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.connected_devices;
-                    return Arrays.asList(sir);
+                    return new ArrayList<>();
                 }
 
                 @Override
                 public List<String> getNonIndexableKeys(Context context) {
-                    final List<String> keys = super.getNonIndexableKeys(context);
-                    PackageManager pm = context.getPackageManager();
-                    if (!pm.hasSystemFeature(PackageManager.FEATURE_NFC)) {
-                        keys.add(NfcPreferenceController.KEY_TOGGLE_NFC);
-                        keys.add(NfcPreferenceController.KEY_ANDROID_BEAM_SETTINGS);
-                    }
-                    keys.add(BluetoothMasterSwitchPreferenceController.KEY_TOGGLE_BLUETOOTH);
 
-                    SmsMirroringFeatureProvider smsMirroringFeatureProvider =
-                            FeatureFactory.getFactory(context).getSmsMirroringFeatureProvider();
-                    SmsMirroringPreferenceController smsMirroringController =
-                            smsMirroringFeatureProvider.getController(context);
-                    smsMirroringController.updateNonIndexableKeys(keys);
+                    return new ArrayList<>();
+                }
 
-                    return keys;
+                @Override
+                public List<AbstractPreferenceController> getPreferenceControllers(
+                        Context context) {
+                    //TODO(b/69333961): update the index for controllers
+                    return super.getPreferenceControllers(context);
                 }
             };
 }
diff --git a/src/com/android/settings/connecteddevice/ConnectedDeviceDashboardFragmentOld.java b/src/com/android/settings/connecteddevice/ConnectedDeviceDashboardFragmentOld.java
new file mode 100644
index 0000000..7097b36
--- /dev/null
+++ b/src/com/android/settings/connecteddevice/ConnectedDeviceDashboardFragmentOld.java
@@ -0,0 +1,168 @@
+/*
+ * 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.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.dashboard.DashboardFragment;
+import com.android.settings.dashboard.SummaryLoader;
+import com.android.settings.deviceinfo.UsbBackend;
+import com.android.settings.nfc.NfcPreferenceController;
+import com.android.settings.overlay.FeatureFactory;
+import com.android.settings.search.BaseSearchIndexProvider;
+import com.android.settingslib.core.AbstractPreferenceController;
+import com.android.settingslib.core.lifecycle.Lifecycle;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+
+/**
+ * This is the previous {@link ConnectedDeviceDashboardFragment} in Android O, in Android P the
+ * main entry will be {@link ConnectedDeviceDashboardFragment}
+ *
+ * @deprecated
+ */
+@Deprecated
+public class ConnectedDeviceDashboardFragmentOld extends DashboardFragment {
+
+    private static final String TAG = "ConnectedDeviceFrag2";
+    private UsbModePreferenceController mUsbPrefController;
+
+    @Override
+    public int getMetricsCategory() {
+        return MetricsProto.MetricsEvent.SETTINGS_CONNECTED_DEVICE_CATEGORY;
+    }
+
+    @Override
+    protected String getLogTag() {
+        return TAG;
+    }
+
+    @Override
+    public int getHelpResource() {
+        return R.string.help_url_connected_devices;
+    }
+
+    @Override
+    protected int getPreferenceScreenResId() {
+        return R.xml.connected_devices_old;
+    }
+
+    @Override
+    protected List<AbstractPreferenceController> getPreferenceControllers(Context context) {
+        final List<AbstractPreferenceController> controllers = new ArrayList<>();
+        final Lifecycle lifecycle = getLifecycle();
+        final NfcPreferenceController nfcPreferenceController =
+                new NfcPreferenceController(context);
+        lifecycle.addObserver(nfcPreferenceController);
+        controllers.add(nfcPreferenceController);
+        mUsbPrefController = new UsbModePreferenceController(context, new UsbBackend(context));
+        lifecycle.addObserver(mUsbPrefController);
+        controllers.add(mUsbPrefController);
+        final BluetoothMasterSwitchPreferenceController bluetoothPreferenceController =
+                new BluetoothMasterSwitchPreferenceController(
+                        context, Utils.getLocalBtManager(context), this,
+                        (SettingsActivity) getActivity());
+        lifecycle.addObserver(bluetoothPreferenceController);
+        controllers.add(bluetoothPreferenceController);
+
+        SmsMirroringFeatureProvider smsMirroringFeatureProvider =
+                FeatureFactory.getFactory(context).getSmsMirroringFeatureProvider();
+        AbstractPreferenceController smsMirroringController =
+                smsMirroringFeatureProvider.getController(context);
+        controllers.add(smsMirroringController);
+        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.
+     */
+    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.connected_devices_old;
+                    return Arrays.asList(sir);
+                }
+
+                @Override
+                public List<String> getNonIndexableKeys(Context context) {
+                    final List<String> keys = super.getNonIndexableKeys(context);
+                    PackageManager pm = context.getPackageManager();
+                    if (!pm.hasSystemFeature(PackageManager.FEATURE_NFC)) {
+                        keys.add(NfcPreferenceController.KEY_TOGGLE_NFC);
+                        keys.add(NfcPreferenceController.KEY_ANDROID_BEAM_SETTINGS);
+                    }
+                    keys.add(BluetoothMasterSwitchPreferenceController.KEY_TOGGLE_BLUETOOTH);
+
+                    SmsMirroringFeatureProvider smsMirroringFeatureProvider =
+                            FeatureFactory.getFactory(context).getSmsMirroringFeatureProvider();
+                    SmsMirroringPreferenceController smsMirroringController =
+                            smsMirroringFeatureProvider.getController(context);
+                    smsMirroringController.updateNonIndexableKeys(keys);
+
+                    return keys;
+                }
+            };
+}
diff --git a/src/com/android/settings/connecteddevice/ConnectedDeviceGroupController.java b/src/com/android/settings/connecteddevice/ConnectedDeviceGroupController.java
new file mode 100644
index 0000000..a0b5cb8
--- /dev/null
+++ b/src/com/android/settings/connecteddevice/ConnectedDeviceGroupController.java
@@ -0,0 +1,109 @@
+/*
+ * Copyright (C) 2017 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.android.settings.connecteddevice;
+
+import android.support.annotation.VisibleForTesting;
+import android.support.v7.preference.Preference;
+import android.support.v7.preference.PreferenceGroup;
+import android.support.v7.preference.PreferenceScreen;
+import com.android.settings.core.PreferenceControllerMixin;
+import com.android.settings.bluetooth.BluetoothDeviceUpdater;
+import com.android.settings.bluetooth.ConnectedBluetoothDeviceUpdater;
+import com.android.settingslib.core.AbstractPreferenceController;
+import com.android.settingslib.core.lifecycle.Lifecycle;
+import com.android.settingslib.core.lifecycle.LifecycleObserver;
+import com.android.settings.dashboard.DashboardFragment;
+import com.android.settingslib.core.lifecycle.events.OnStart;
+import com.android.settingslib.core.lifecycle.events.OnStop;
+
+/**
+ * Controller to maintain the {@link android.support.v7.preference.PreferenceGroup} for all
+ * connected devices. It uses {@link DevicePreferenceCallback} to add/remove {@link Preference}
+ */
+public class ConnectedDeviceGroupController extends AbstractPreferenceController
+        implements PreferenceControllerMixin, LifecycleObserver, OnStart, OnStop,
+        DevicePreferenceCallback {
+
+    private static final String KEY = "connected_device_list";
+
+    @VisibleForTesting
+    PreferenceGroup mPreferenceGroup;
+    private BluetoothDeviceUpdater mBluetoothDeviceUpdater;
+
+    public ConnectedDeviceGroupController(DashboardFragment fragment, Lifecycle lifecycle) {
+        super(fragment.getContext());
+        init(lifecycle, new ConnectedBluetoothDeviceUpdater(fragment, this));
+    }
+
+    @VisibleForTesting
+    ConnectedDeviceGroupController(DashboardFragment fragment, Lifecycle lifecycle,
+            BluetoothDeviceUpdater bluetoothDeviceUpdater) {
+        super(fragment.getContext());
+        init(lifecycle, bluetoothDeviceUpdater);
+    }
+
+    @Override
+    public void onStart() {
+        mBluetoothDeviceUpdater.registerCallback();
+    }
+
+    @Override
+    public void onStop() {
+        mBluetoothDeviceUpdater.unregisterCallback();
+    }
+
+    @Override
+    public void displayPreference(PreferenceScreen screen) {
+        super.displayPreference(screen);
+        mPreferenceGroup = (PreferenceGroup) screen.findPreference(KEY);
+        mPreferenceGroup.setVisible(false);
+        mBluetoothDeviceUpdater.setPrefContext(screen.getContext());
+        mBluetoothDeviceUpdater.forceUpdate();
+    }
+
+    @Override
+    public boolean isAvailable() {
+        return true;
+    }
+
+    @Override
+    public String getPreferenceKey() {
+        return KEY;
+    }
+
+    @Override
+    public void onDeviceAdded(Preference preference) {
+        if (mPreferenceGroup.getPreferenceCount() == 0) {
+            mPreferenceGroup.setVisible(true);
+        }
+        mPreferenceGroup.addPreference(preference);
+    }
+
+    @Override
+    public void onDeviceRemoved(Preference preference) {
+        mPreferenceGroup.removePreference(preference);
+        if (mPreferenceGroup.getPreferenceCount() == 0) {
+            mPreferenceGroup.setVisible(false);
+        }
+    }
+
+    private void init(Lifecycle lifecycle, BluetoothDeviceUpdater bluetoothDeviceUpdater) {
+        if (lifecycle != null) {
+            lifecycle.addObserver(this);
+        }
+        mBluetoothDeviceUpdater = bluetoothDeviceUpdater;
+    }
+}
diff --git a/src/com/android/settings/connecteddevice/DevicePreferenceCallback.java b/src/com/android/settings/connecteddevice/DevicePreferenceCallback.java
new file mode 100644
index 0000000..5f04700
--- /dev/null
+++ b/src/com/android/settings/connecteddevice/DevicePreferenceCallback.java
@@ -0,0 +1,36 @@
+/*
+ * Copyright (C) 2017 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.connecteddevice;
+
+import android.support.v7.preference.Preference;
+
+/**
+ * Callback to add or remove {@link Preference} in device group.
+ */
+public interface DevicePreferenceCallback {
+    /**
+     * Called when a device(i.e. bluetooth, usb) is added
+     * @param preference present the device
+     */
+    void onDeviceAdded(Preference preference);
+
+    /**
+     * Called when a device(i.e. bluetooth, usb) is removed
+     * @param preference present the device
+     */
+    void onDeviceRemoved(Preference preference);
+}
diff --git a/src/com/android/settings/connecteddevice/SavedDeviceGroupController.java b/src/com/android/settings/connecteddevice/SavedDeviceGroupController.java
new file mode 100644
index 0000000..7445047
--- /dev/null
+++ b/src/com/android/settings/connecteddevice/SavedDeviceGroupController.java
@@ -0,0 +1,109 @@
+/*
+ * Copyright (C) 2017 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.android.settings.connecteddevice;
+
+import android.support.annotation.VisibleForTesting;
+import android.support.v7.preference.Preference;
+import android.support.v7.preference.PreferenceGroup;
+import android.support.v7.preference.PreferenceScreen;
+
+import com.android.settings.bluetooth.BluetoothDeviceUpdater;
+import com.android.settings.bluetooth.SavedBluetoothDeviceUpdater;
+import com.android.settings.core.PreferenceControllerMixin;
+import com.android.settings.dashboard.DashboardFragment;
+import com.android.settingslib.core.AbstractPreferenceController;
+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 to maintain the {@link PreferenceGroup} for all
+ * saved devices. It uses {@link DevicePreferenceCallback} to add/remove {@link Preference}
+ */
+public class SavedDeviceGroupController extends AbstractPreferenceController
+        implements PreferenceControllerMixin, LifecycleObserver, OnStart, OnStop,
+        DevicePreferenceCallback {
+
+    private static final String KEY = "saved_device_list";
+
+    @VisibleForTesting
+    PreferenceGroup mPreferenceGroup;
+    private BluetoothDeviceUpdater mBluetoothDeviceUpdater;
+
+    public SavedDeviceGroupController(DashboardFragment fragment, Lifecycle lifecycle) {
+        super(fragment.getContext());
+        init(lifecycle, new SavedBluetoothDeviceUpdater(fragment, SavedDeviceGroupController.this));
+    }
+
+    @VisibleForTesting
+    SavedDeviceGroupController(DashboardFragment fragment, Lifecycle lifecycle,
+            BluetoothDeviceUpdater bluetoothDeviceUpdater) {
+        super(fragment.getContext());
+        init(lifecycle, bluetoothDeviceUpdater);
+    }
+
+    @Override
+    public void onStart() {
+        mBluetoothDeviceUpdater.registerCallback();
+    }
+
+    @Override
+    public void onStop() {
+        mBluetoothDeviceUpdater.unregisterCallback();
+    }
+
+    @Override
+    public void displayPreference(PreferenceScreen screen) {
+        mPreferenceGroup = (PreferenceGroup) screen.findPreference(KEY);
+        mPreferenceGroup.setVisible(false);
+        mBluetoothDeviceUpdater.setPrefContext(screen.getContext());
+        mBluetoothDeviceUpdater.forceUpdate();
+    }
+
+    @Override
+    public boolean isAvailable() {
+        return true;
+    }
+
+    @Override
+    public String getPreferenceKey() {
+        return KEY;
+    }
+
+    @Override
+    public void onDeviceAdded(Preference preference) {
+        if (mPreferenceGroup.getPreferenceCount() == 0) {
+            mPreferenceGroup.setVisible(true);
+        }
+        mPreferenceGroup.addPreference(preference);
+    }
+
+    @Override
+    public void onDeviceRemoved(Preference preference) {
+        mPreferenceGroup.removePreference(preference);
+        if (mPreferenceGroup.getPreferenceCount() == 0) {
+            mPreferenceGroup.setVisible(false);
+        }
+    }
+
+    private void init(Lifecycle lifecycle, BluetoothDeviceUpdater bluetoothDeviceUpdater) {
+        if (lifecycle != null) {
+            lifecycle.addObserver(this);
+        }
+        mBluetoothDeviceUpdater = bluetoothDeviceUpdater;
+    }
+}
diff --git a/src/com/android/settings/core/BasePreferenceController.java b/src/com/android/settings/core/BasePreferenceController.java
new file mode 100644
index 0000000..b3d9878
--- /dev/null
+++ b/src/com/android/settings/core/BasePreferenceController.java
@@ -0,0 +1,159 @@
+/*
+ * Copyright (C) 2017 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file
+ * except in compliance with the License. You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the
+ * License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF 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;
+
+import android.annotation.IntDef;
+import android.app.slice.Slice;
+import android.content.Context;
+import android.support.v7.preference.Preference;
+import android.text.TextUtils;
+import android.util.Log;
+
+
+import com.android.settings.core.PreferenceControllerMixin;
+import com.android.settings.search.ResultPayload;
+import com.android.settings.search.SearchIndexableRaw;
+import com.android.settingslib.core.AbstractPreferenceController;
+
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.util.List;
+
+/**
+ * Abstract class to consolidate utility between preference controllers and act as an interface
+ * for Slices. The abstract classes that inherit from this class will act as the direct interfaces
+ * for each type when plugging into Slices.
+ */
+public abstract class BasePreferenceController extends AbstractPreferenceController {
+
+    private static final String TAG = "SettingsPrefController";
+
+    @Retention(RetentionPolicy.SOURCE)
+    @IntDef({AVAILABLE, DISABLED_UNSUPPORTED, DISABLED_FOR_USER, DISABLED_DEPENDENT_SETTING,
+            UNAVAILABLE_UNKNOWN})
+    public @interface AvailabilityStatus {
+    }
+
+    /**
+     * The setting is available.
+     */
+    public static final int AVAILABLE = 0;
+
+    /**
+     * The setting is not supported by the device.
+     */
+    public static final int DISABLED_UNSUPPORTED = 1;
+
+    /**
+     * The setting cannot be changed by the current user.
+     */
+    public static final int DISABLED_FOR_USER = 2;
+
+    /**
+     * The setting has a dependency in the Settings App which is currently blocking access.
+     */
+    public static final int DISABLED_DEPENDENT_SETTING = 3;
+
+    /**
+     * A catch-all case for internal errors and inexplicable unavailability.
+     */
+    public static final int UNAVAILABLE_UNKNOWN = 4;
+
+    protected final String mPreferenceKey;
+
+    public BasePreferenceController(Context context, String preferenceKey) {
+        super(context);
+        mPreferenceKey = preferenceKey;
+    }
+
+    /**
+     * @return {@AvailabilityStatus} for the Setting. This status is used to determine if the
+     * Setting should be shown or disabled in Settings. Further, it can be used to produce
+     * appropriate error / warning Slice in the case of unavailability.
+     * </p>
+     * The status is used for the convenience methods: {@link #isAvailable()},
+     * {@link #isSupported()}
+     */
+    @AvailabilityStatus
+    public abstract int getAvailabilityStatus();
+
+    /**
+     * @return A slice for the corresponding setting.
+     */
+    public abstract Slice getSettingSlice();
+
+    @Override
+    public String getPreferenceKey() {
+        return mPreferenceKey;
+    }
+
+    @Override
+    public final boolean isAvailable() {
+        return getAvailabilityStatus() == AVAILABLE;
+    }
+
+    /**
+     * @return {@code false} if the setting is not applicable to the device. This covers both
+     * settings which were only introduced in future versions of android, or settings that have
+     * hardware dependencies.
+     * </p>
+     * Note that a return value of {@code true} does not mean that the setting is available.
+     */
+    public final boolean isSupported() {
+        return getAvailabilityStatus() != DISABLED_UNSUPPORTED;
+    }
+
+    /**
+     * Updates non-indexable keys for search provider.
+     *
+     * Called by SearchIndexProvider#getNonIndexableKeys
+     */
+    public void updateNonIndexableKeys(List<String> keys) {
+        if (this instanceof AbstractPreferenceController) {
+            if (!isAvailable()) {
+                final String key = getPreferenceKey();
+                if (TextUtils.isEmpty(key)) {
+                    Log.w(TAG,
+                            "Skipping updateNonIndexableKeys due to empty key " + this.toString());
+                    return;
+                }
+                keys.add(key);
+            }
+        }
+    }
+
+    /**
+     * Updates raw data for search provider.
+     *
+     * Called by SearchIndexProvider#getRawDataToIndex
+     */
+    public void updateRawDataToIndex(List<SearchIndexableRaw> rawData) {
+    }
+
+    /**
+     * @return the {@link ResultPayload} corresponding to the search result type for the preference.
+     * TODO (b/69808376) Remove this method.
+     * Do not extend this method. It will not launch with P.
+     */
+    @Deprecated
+    public ResultPayload getResultPayload() {
+        return null;
+    }
+
+    // TODO (b/69380366) Add Method to get preference UI
+
+    // TODO (b/69380464) Add method to get intent
+
+    // TODO (b/69380560) Add method to get broadcast intent
+}
\ No newline at end of file
diff --git a/src/com/android/settings/core/DynamicAvailabilityPreferenceController.java b/src/com/android/settings/core/DynamicAvailabilityPreferenceController.java
deleted file mode 100644
index 04a561c..0000000
--- a/src/com/android/settings/core/DynamicAvailabilityPreferenceController.java
+++ /dev/null
@@ -1,75 +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;
-
-import android.content.Context;
-import android.support.v7.preference.Preference;
-import android.support.v7.preference.PreferenceScreen;
-
-import com.android.settingslib.core.AbstractPreferenceController;
-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 AbstractPreferenceController
-        implements PreferenceControllerMixin, LifecycleObserver, OnResume {
-
-    private Preference mPreference;
-    private PreferenceScreen mScreen;
-    private PreferenceAvailabilityObserver mAvailabilityObserver = null;
-
-    public DynamicAvailabilityPreferenceController(Context context, Lifecycle lifecycle) {
-        super(context);
-        if (lifecycle != null) {
-            lifecycle.addObserver(this);
-        }
-    }
-
-    public void setAvailabilityObserver(PreferenceAvailabilityObserver observer) {
-        mAvailabilityObserver = observer;
-    }
-
-    public PreferenceAvailabilityObserver getAvailabilityObserver() {
-        return mAvailabilityObserver;
-    }
-
-    @Override
-    public void displayPreference(PreferenceScreen screen) {
-        mScreen = screen;
-        mPreference = screen.findPreference(getPreferenceKey());
-        super.displayPreference(screen);
-    }
-
-    @Override
-    public void onResume() {
-        if (!isAvailable()) {
-            removePreference(mScreen, getPreferenceKey());
-            return;
-        }
-
-        updateState(mPreference);
-        if (mScreen.findPreference(getPreferenceKey()) == null) {
-            mScreen.addPreference(mPreference);
-        }
-    }
-
-    protected void notifyOnAvailabilityUpdate(boolean available) {
-        if (mAvailabilityObserver != null) {
-            mAvailabilityObserver.onPreferenceAvailabilityUpdated(getPreferenceKey(), available);
-        }
-    }
-}
diff --git a/src/com/android/settings/core/FeatureFlags.java b/src/com/android/settings/core/FeatureFlags.java
new file mode 100644
index 0000000..547318f
--- /dev/null
+++ b/src/com/android/settings/core/FeatureFlags.java
@@ -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.
+ */
+
+package com.android.settings.core;
+
+/**
+ * This class keeps track of all feature flags in Settings.
+ */
+public class FeatureFlags {
+    public static final String DEVICE_INFO_V2 = "device_info_v2";
+    public static final String SEARCH_V2 = "settings_search_v2";
+    public static final String SUGGESTIONS_V2 = "new_settings_suggestion";
+    public static final String APP_INFO_V2 = "settings_app_info_v2";
+    public static final String CONNECTED_DEVICE_V2 = "settings_connected_device_v2";
+}
diff --git a/src/com/android/settings/core/InstrumentedFragment.java b/src/com/android/settings/core/InstrumentedFragment.java
index 188dbde..45db836 100644
--- a/src/com/android/settings/core/InstrumentedFragment.java
+++ b/src/com/android/settings/core/InstrumentedFragment.java
@@ -49,4 +49,8 @@
         mVisibilityLoggerMixin.setSourceMetricsCategory(getActivity());
         super.onResume();
     }
+
+    protected final VisibilityLoggerMixin getVisibilityLogger() {
+        return mVisibilityLoggerMixin;
+    }
 }
diff --git a/src/com/android/settings/core/InstrumentedPreferenceFragment.java b/src/com/android/settings/core/InstrumentedPreferenceFragment.java
index bfb69e7..7e37115 100644
--- a/src/com/android/settings/core/InstrumentedPreferenceFragment.java
+++ b/src/com/android/settings/core/InstrumentedPreferenceFragment.java
@@ -18,6 +18,10 @@
 
 import android.content.Context;
 import android.os.Bundle;
+import android.support.annotation.XmlRes;
+import android.support.v7.preference.PreferenceScreen;
+import android.text.TextUtils;
+import android.util.Log;
 
 import com.android.settings.core.instrumentation.Instrumentable;
 import com.android.settings.core.instrumentation.MetricsFeatureProvider;
@@ -32,6 +36,9 @@
 public abstract class InstrumentedPreferenceFragment extends ObservablePreferenceFragment
         implements Instrumentable {
 
+    private static final String TAG = "InstrumentedPrefFrag";
+
+
     protected MetricsFeatureProvider mMetricsFeatureProvider;
 
     // metrics placeholder value. Only use this for development.
@@ -60,9 +67,42 @@
 
     @Override
     public void onCreatePreferences(Bundle savedInstanceState, String rootKey) {
+        final int resId = getPreferenceScreenResId();
+        if (resId > 0) {
+            addPreferencesFromResource(resId);
+        }
+    }
+
+    @Override
+    public void addPreferencesFromResource(@XmlRes int preferencesResId) {
+        super.addPreferencesFromResource(preferencesResId);
+        updateActivityTitleWithScreenTitle(getPreferenceScreen());
     }
 
     protected final Context getPrefContext() {
         return getPreferenceManager().getContext();
     }
+
+    protected final VisibilityLoggerMixin getVisibilityLogger() {
+        return mVisibilityLoggerMixin;
+    }
+
+    /**
+     * Get the res id for static preference xml for this fragment.
+     */
+    protected int getPreferenceScreenResId() {
+        return -1;
+    }
+
+    private void updateActivityTitleWithScreenTitle(PreferenceScreen screen) {
+        if (screen != null) {
+            final CharSequence title = screen.getTitle();
+            if (!TextUtils.isEmpty(title)) {
+                getActivity().setTitle(title);
+            } else {
+                Log.w(TAG, "Screen title missing for fragment " + this.getClass().getName());
+            }
+        }
+    }
+
 }
diff --git a/src/com/android/settings/core/PreferenceAvailabilityObserver.java b/src/com/android/settings/core/PreferenceAvailabilityObserver.java
deleted file mode 100644
index 46ff3ba..0000000
--- a/src/com/android/settings/core/PreferenceAvailabilityObserver.java
+++ /dev/null
@@ -1,33 +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;
-
-/**
- * @deprecated This interface allows a {@link android.support.v7.preference.PreferenceGroup}'s
- * controller to observe the availability of the {@link android.support.v7.preference.Preference}s
- * inside it, hiding the group when all preferences become unavailable. In the future,
- * {@link android.support.v7.preference.PreferenceGroup} will have native support for that
- * functionality, removing the need for this interface.
- */
-public interface PreferenceAvailabilityObserver {
-
-    /**
-     * Notifies the observer that the availability of the preference identified by {@code key} has
-     * been updated.
-     */
-    void onPreferenceAvailabilityUpdated(String key, boolean available);
-}
diff --git a/src/com/android/settings/core/PreferenceControllerMixin.java b/src/com/android/settings/core/PreferenceControllerMixin.java
index 0f60210..23facba 100644
--- a/src/com/android/settings/core/PreferenceControllerMixin.java
+++ b/src/com/android/settings/core/PreferenceControllerMixin.java
@@ -15,6 +15,9 @@
  */
 package com.android.settings.core;
 
+import android.text.TextUtils;
+import android.util.Log;
+
 import com.android.settings.search.ResultPayload;
 import com.android.settings.search.SearchIndexableRaw;
 import com.android.settingslib.core.AbstractPreferenceController;
@@ -23,9 +26,12 @@
 
 /**
  * A controller mixin that adds mobile settings specific functionality
+ * TODO (b/69808530) Replace with BasePreferenceController.
  */
 public interface PreferenceControllerMixin {
 
+    String TAG = "PrefControllerMixin";
+
     /**
      * Updates non-indexable keys for search provider.
      *
@@ -34,7 +40,13 @@
     default void updateNonIndexableKeys(List<String> keys) {
         if (this instanceof AbstractPreferenceController) {
             if (!((AbstractPreferenceController) this).isAvailable()) {
-                keys.add(((AbstractPreferenceController) this).getPreferenceKey());
+                final String key = ((AbstractPreferenceController) this).getPreferenceKey();
+                if (TextUtils.isEmpty(key)) {
+                    Log.w(TAG,
+                            "Skipping updateNonIndexableKeys due to empty key " + this.toString());
+                    return;
+                }
+                keys.add(key);
             }
         }
     }
@@ -49,7 +61,11 @@
 
     /**
      * @return the {@link ResultPayload} corresponding to the search result type for the preference.
+     *
+     * Do not rely on this method for intent-based or inline results. It will be removed in the
+     * unbundling effort.
      */
+    @Deprecated
     default ResultPayload getResultPayload() {
         return null;
     }
diff --git a/src/com/android/settings/core/TogglePreferenceController.java b/src/com/android/settings/core/TogglePreferenceController.java
new file mode 100644
index 0000000..03106d3
--- /dev/null
+++ b/src/com/android/settings/core/TogglePreferenceController.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.core;
+
+import android.app.slice.Slice;
+import android.content.Context;
+import android.support.v14.preference.SwitchPreference;
+import android.support.v7.preference.Preference;
+
+/**
+ * Abstract class that consolidates logic for updating toggle controllers.
+ * It automatically handles the getting and setting of the switch UI element.
+ * Children of this class implement methods to get and set the underlying value of the setting.
+ */
+public abstract class TogglePreferenceController extends BasePreferenceController implements
+        Preference.OnPreferenceChangeListener {
+
+    private static final String TAG = "TogglePrefController";
+
+    public TogglePreferenceController(Context context, String preferenceKey) {
+        super(context, preferenceKey);
+    }
+
+    /**
+     * @return {@code true} if the Setting is enabled.
+     */
+    public abstract boolean isChecked();
+
+    /**
+     * Set the Setting to {@param isChecked}
+     *
+     * @param isChecked Is {@true} when the setting should be enabled.
+     */
+    public abstract void setChecked(boolean isChecked);
+
+    @Override
+    public final void updateState(Preference preference) {
+        ((SwitchPreference) preference).setChecked(isChecked());
+    }
+
+    @Override
+    public final boolean onPreferenceChange(Preference preference, Object newValue) {
+        boolean auto = (Boolean) newValue;
+        setChecked(auto);
+        return true;
+    }
+
+    @Override
+    public Slice getSettingSlice() {
+        // TODO
+        return null;
+    }
+}
\ No newline at end of file
diff --git a/src/com/android/settings/core/gateway/SettingsGateway.java b/src/com/android/settings/core/gateway/SettingsGateway.java
index fad4e91..37cd431 100644
--- a/src/com/android/settings/core/gateway/SettingsGateway.java
+++ b/src/com/android/settings/core/gateway/SettingsGateway.java
@@ -18,7 +18,6 @@
 
 import com.android.settings.ApnEditor;
 import com.android.settings.ApnSettings;
-import com.android.settings.CryptKeeperSettings;
 import com.android.settings.DateTimeSettings;
 import com.android.settings.DeviceAdminSettings;
 import com.android.settings.DeviceInfoSettings;
@@ -26,7 +25,6 @@
 import com.android.settings.IccLockSettings;
 import com.android.settings.MasterClear;
 import com.android.settings.PrivacySettings;
-import com.android.settings.SecuritySettings;
 import com.android.settings.Settings;
 import com.android.settings.TestingSettings;
 import com.android.settings.TetherSettings;
@@ -40,32 +38,33 @@
 import com.android.settings.accounts.ChooseAccountActivity;
 import com.android.settings.accounts.ManagedProfileSettings;
 import com.android.settings.accounts.UserAndAccountDashboardFragment;
-import com.android.settings.applications.DefaultAppSettings;
 import com.android.settings.applications.AppAndNotificationDashboardFragment;
+import com.android.settings.applications.DefaultAppSettings;
 import com.android.settings.applications.DrawOverlayDetails;
 import com.android.settings.applications.ExternalSourcesDetails;
 import com.android.settings.applications.InstalledAppDetails;
-import com.android.settings.applications.ManageApplications;
 import com.android.settings.applications.ManageDomainUrls;
 import com.android.settings.applications.NotificationApps;
 import com.android.settings.applications.PictureInPictureDetails;
 import com.android.settings.applications.PictureInPictureSettings;
 import com.android.settings.applications.ProcessStatsSummary;
 import com.android.settings.applications.ProcessStatsUi;
-import com.android.settings.applications.SpecialAccessSettings;
 import com.android.settings.applications.UsageAccessDetails;
 import com.android.settings.applications.VrListenerSettings;
 import com.android.settings.applications.WriteSettingsDetails;
+import com.android.settings.applications.AppInfoDashboardFragment;
 import com.android.settings.applications.assist.ManageAssist;
+import com.android.settings.applications.manageapplications.ManageApplications;
 import com.android.settings.bluetooth.BluetoothDeviceDetailsFragment;
 import com.android.settings.bluetooth.BluetoothSettings;
 import com.android.settings.connecteddevice.ConnectedDeviceDashboardFragment;
+import com.android.settings.connecteddevice.ConnectedDeviceDashboardFragmentOld;
 import com.android.settings.dashboard.SupportFragment;
 import com.android.settings.datausage.DataPlanUsageSummary;
 import com.android.settings.datausage.DataUsageList;
 import com.android.settings.datausage.DataUsageSummary;
 import com.android.settings.deletionhelper.AutomaticStorageManagerSettings;
-import com.android.settings.development.DevelopmentSettings;
+import com.android.settings.development.DevelopmentSettingsDashboardFragment;
 import com.android.settings.deviceinfo.ImeiInformation;
 import com.android.settings.deviceinfo.PrivateVolumeForget;
 import com.android.settings.deviceinfo.PrivateVolumeSettings;
@@ -99,22 +98,25 @@
 import com.android.settings.nfc.AndroidBeam;
 import com.android.settings.nfc.PaymentSettings;
 import com.android.settings.notification.AppNotificationSettings;
+import com.android.settings.notification.ChannelGroupNotificationSettings;
 import com.android.settings.notification.ChannelNotificationSettings;
 import com.android.settings.notification.ConfigureNotificationSettings;
 import com.android.settings.notification.NotificationAccessSettings;
 import com.android.settings.notification.NotificationStation;
 import com.android.settings.notification.SoundSettings;
 import com.android.settings.notification.ZenAccessSettings;
+import com.android.settings.notification.ZenModeAutomationSettings;
+import com.android.settings.notification.ZenModeBehaviorSettings;
 import com.android.settings.notification.ZenModeEventRuleSettings;
-import com.android.settings.notification.ZenModePrioritySettings;
 import com.android.settings.notification.ZenModeScheduleRuleSettings;
 import com.android.settings.notification.ZenModeSettings;
-import com.android.settings.notification.ZenModeVisualInterruptionSettings;
 import com.android.settings.password.ChooseLockPassword;
 import com.android.settings.password.ChooseLockPattern;
 import com.android.settings.print.PrintJobSettingsFragment;
 import com.android.settings.print.PrintSettingsFragment;
+import com.android.settings.security.CryptKeeperSettings;
 import com.android.settings.security.LockscreenDashboardFragment;
+import com.android.settings.security.SecuritySettings;
 import com.android.settings.sim.SimSettings;
 import com.android.settings.support.SupportDashboardActivity;
 import com.android.settings.system.ResetDashboardFragment;
@@ -175,7 +177,7 @@
             PrivateVolumeForget.class.getName(),
             PrivateVolumeSettings.class.getName(),
             PublicVolumeSettings.class.getName(),
-            DevelopmentSettings.class.getName(),
+            DevelopmentSettingsDashboardFragment.class.getName(),
             AndroidBeam.class.getName(),
             WifiDisplaySettings.class.getName(),
             PowerUsageSummary.class.getName(),
@@ -191,9 +193,9 @@
             DataUsageSummary.class.getName(),
             DreamSettings.class.getName(),
             UserSettings.class.getName(),
-            SpecialAccessSettings.class.getName(),
             NotificationAccessSettings.class.getName(),
             ZenAccessSettings.class.getName(),
+            ZenModeAutomationSettings.class.getName(),
             PrintSettingsFragment.class.getName(),
             PrintJobSettingsFragment.class.getName(),
             TrustedCredentialsSettings.class.getName(),
@@ -206,16 +208,17 @@
             ChooseLockPassword.ChooseLockPasswordFragment.class.getName(),
             ChooseLockPattern.ChooseLockPatternFragment.class.getName(),
             InstalledAppDetails.class.getName(),
+            AppInfoDashboardFragment.class.getName(),
             BatterySaverSettings.class.getName(),
             AppNotificationSettings.class.getName(),
             ChannelNotificationSettings.class.getName(),
+            ChannelGroupNotificationSettings.class.getName(),
             ApnSettings.class.getName(),
             ApnEditor.class.getName(),
             WifiCallingSettings.class.getName(),
-            ZenModePrioritySettings.class.getName(),
+            ZenModeBehaviorSettings.class.getName(),
             ZenModeScheduleRuleSettings.class.getName(),
             ZenModeEventRuleSettings.class.getName(),
-            ZenModeVisualInterruptionSettings.class.getName(),
             ProcessStatsUi.class.getName(),
             AdvancedPowerUsageDetail.class.getName(),
             ProcessStatsSummary.class.getName(),
@@ -246,6 +249,7 @@
             SystemDashboardFragment.class.getName(),
             NetworkDashboardFragment.class.getName(),
             ConnectedDeviceDashboardFragment.class.getName(),
+            ConnectedDeviceDashboardFragmentOld.class.getName(),
             AppAndNotificationDashboardFragment.class.getName(),
             UserAndAccountDashboardFragment.class.getName(),
             EnterprisePrivacySettings.class.getName(),
@@ -259,6 +263,7 @@
             // Home page
             Settings.NetworkDashboardActivity.class.getName(),
             Settings.ConnectedDeviceDashboardActivity.class.getName(),
+            Settings.ConnectedDeviceDashboardActivityOld.class.getName(),
             Settings.AppAndNotificationDashboardActivity.class.getName(),
             Settings.DisplaySettingsActivity.class.getName(),
             Settings.SoundSettingsActivity.class.getName(),
diff --git a/src/com/android/settings/core/instrumentation/EventLogWriter.java b/src/com/android/settings/core/instrumentation/EventLogWriter.java
index e7628e8..3196f76 100644
--- a/src/com/android/settings/core/instrumentation/EventLogWriter.java
+++ b/src/com/android/settings/core/instrumentation/EventLogWriter.java
@@ -18,6 +18,7 @@
 
 import android.content.Context;
 import android.metrics.LogMaker;
+import android.util.Log;
 import android.util.Pair;
 
 import com.android.internal.logging.MetricsLogger;
@@ -28,6 +29,8 @@
  */
 public class EventLogWriter implements LogWriter {
 
+    private final MetricsLogger mMetricsLogger = new MetricsLogger();
+
     public void visible(Context context, int source, int category) {
         final LogMaker logMaker = new LogMaker(category)
                 .setType(MetricsProto.MetricsEvent.TYPE_OPEN)
@@ -39,6 +42,24 @@
         MetricsLogger.hidden(context, category);
     }
 
+    public void action(int category, int value, Pair<Integer, Object>... taggedData) {
+        if (taggedData == null || taggedData.length == 0) {
+            mMetricsLogger.action(category, value);
+        } else {
+            final LogMaker logMaker = new LogMaker(category)
+                    .setType(MetricsProto.MetricsEvent.TYPE_ACTION)
+                    .setSubtype(value);
+            for (Pair<Integer, Object> pair : taggedData) {
+                logMaker.addTaggedData(pair.first, pair.second);
+            }
+            mMetricsLogger.write(logMaker);
+        }
+    }
+
+    public void action(int category, boolean value, Pair<Integer, Object>... taggedData) {
+        action(category, value ? 1 : 0, taggedData);
+    }
+
     public void action(Context context, int category, Pair<Integer, Object>... taggedData) {
         action(context, category, "", taggedData);
     }
@@ -52,12 +73,16 @@
         MetricsLogger.action(logMaker);
     }
 
+    /** @deprecated use {@link #action(int, int, Pair[])} */
+    @Deprecated
     public void action(Context context, int category, int value) {
-        MetricsLogger.action(context, category, Integer.toString(value));
+        MetricsLogger.action(context, category, value);
     }
 
+    /** @deprecated use {@link #action(int, boolean, Pair[])} */
+    @Deprecated
     public void action(Context context, int category, boolean value) {
-        MetricsLogger.action(context, category, Boolean.toString(value));
+        MetricsLogger.action(context, category, value);
     }
 
     public void action(Context context, int category, String pkg,
diff --git a/src/com/android/settings/core/instrumentation/LogWriter.java b/src/com/android/settings/core/instrumentation/LogWriter.java
index 584217d..062d46f 100644
--- a/src/com/android/settings/core/instrumentation/LogWriter.java
+++ b/src/com/android/settings/core/instrumentation/LogWriter.java
@@ -34,6 +34,16 @@
     void hidden(Context context, int category);
 
     /**
+     * Logs a user action.
+     */
+    void action(int category, int value, Pair<Integer, Object>... taggedData);
+
+    /**
+     * Logs a user action.
+     */
+    void action(int category, boolean value, Pair<Integer, Object>... taggedData);
+
+    /**
      * Logs an user action.
      */
     void action(Context context, int category, Pair<Integer, Object>... taggedData);
@@ -45,12 +55,16 @@
 
     /**
      * Logs an user action.
+     * @deprecated use {@link #action(int, int, Pair[])}
      */
+    @Deprecated
     void action(Context context, int category, int value);
 
     /**
      * Logs an user action.
+     * @deprecated use {@link #action(int, boolean, Pair[])}
      */
+    @Deprecated
     void action(Context context, int category, boolean value);
 
     /**
diff --git a/src/com/android/settings/core/instrumentation/MetricsFeatureProvider.java b/src/com/android/settings/core/instrumentation/MetricsFeatureProvider.java
index afdec55..532ec66 100644
--- a/src/com/android/settings/core/instrumentation/MetricsFeatureProvider.java
+++ b/src/com/android/settings/core/instrumentation/MetricsFeatureProvider.java
@@ -21,7 +21,7 @@
 import android.text.TextUtils;
 import android.util.Pair;
 
-import com.android.internal.logging.nano.MetricsProto;
+import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -60,18 +60,44 @@
         }
     }
 
+    /**
+     * Logs a user action. Includes the elapsed time since the containing
+     * fragment has been visible.
+     */
+    public void action(VisibilityLoggerMixin visibilityLogger, int category, int value) {
+        for (LogWriter writer : mLoggerWriters) {
+            writer.action(category, value,
+                    sinceVisibleTaggedData(visibilityLogger.elapsedTimeSinceVisible()));
+        }
+    }
+
+    /**
+     * Logs a user action. Includes the elapsed time since the containing
+     * fragment has been visible.
+     */
+    public void action(VisibilityLoggerMixin visibilityLogger, int category, boolean value) {
+        for (LogWriter writer : mLoggerWriters) {
+            writer.action(category, value,
+                    sinceVisibleTaggedData(visibilityLogger.elapsedTimeSinceVisible()));
+        }
+    }
+
     public void action(Context context, int category, Pair<Integer, Object>... taggedData) {
         for (LogWriter writer : mLoggerWriters) {
             writer.action(context, category, taggedData);
         }
     }
 
+    /** @deprecated use {@link #action(VisibilityLoggerMixin, int, int)} */
+    @Deprecated
     public void action(Context context, int category, int value) {
         for (LogWriter writer : mLoggerWriters) {
             writer.action(context, category, value);
         }
     }
 
+    /** @deprecated use {@link #action(VisibilityLoggerMixin, int, boolean)} */
+    @Deprecated
     public void action(Context context, int category, boolean value) {
         for (LogWriter writer : mLoggerWriters) {
             writer.action(context, category, value);
@@ -99,7 +125,7 @@
 
     public int getMetricsCategory(Object object) {
         if (object == null || !(object instanceof Instrumentable)) {
-            return MetricsProto.MetricsEvent.VIEW_UNKNOWN;
+            return MetricsEvent.VIEW_UNKNOWN;
         }
         return ((Instrumentable) object).getMetricsCategory();
     }
@@ -116,15 +142,19 @@
                 // Not loggable
                 return;
             }
-            action(context, MetricsProto.MetricsEvent.ACTION_SETTINGS_TILE_CLICK, action,
-                    Pair.create(MetricsProto.MetricsEvent.FIELD_CONTEXT, sourceMetricsCategory));
+            action(context, MetricsEvent.ACTION_SETTINGS_TILE_CLICK, action,
+                    Pair.create(MetricsEvent.FIELD_CONTEXT, sourceMetricsCategory));
             return;
         } else if (TextUtils.equals(cn.getPackageName(), context.getPackageName())) {
             // Going to a Setting internal page, skip click logging in favor of page's own
             // visibility logging.
             return;
         }
-        action(context, MetricsProto.MetricsEvent.ACTION_SETTINGS_TILE_CLICK, cn.flattenToString(),
-                Pair.create(MetricsProto.MetricsEvent.FIELD_CONTEXT, sourceMetricsCategory));
+        action(context, MetricsEvent.ACTION_SETTINGS_TILE_CLICK, cn.flattenToString(),
+                Pair.create(MetricsEvent.FIELD_CONTEXT, sourceMetricsCategory));
+    }
+
+    private Pair<Integer, Object> sinceVisibleTaggedData(long timestamp) {
+        return Pair.create(MetricsEvent.NOTIFICATION_SINCE_VISIBLE_MILLIS, timestamp);
     }
 }
diff --git a/src/com/android/settings/core/instrumentation/SettingSuggestionsLogWriter.java b/src/com/android/settings/core/instrumentation/SettingSuggestionsLogWriter.java
index bbdf8c9..697f0a3 100644
--- a/src/com/android/settings/core/instrumentation/SettingSuggestionsLogWriter.java
+++ b/src/com/android/settings/core/instrumentation/SettingSuggestionsLogWriter.java
@@ -46,6 +46,14 @@
     }
 
     @Override
+    public void action(int category, int value, Pair<Integer, Object>... taggedData) {
+    }
+
+    @Override
+    public void action(int category, boolean value, Pair<Integer, Object>... taggedData) {
+    }
+
+    @Override
     public void action(Context context, int category, int value) {
     }
 
diff --git a/src/com/android/settings/core/instrumentation/VisibilityLoggerMixin.java b/src/com/android/settings/core/instrumentation/VisibilityLoggerMixin.java
index 8de35ad..2fe2a3b 100644
--- a/src/com/android/settings/core/instrumentation/VisibilityLoggerMixin.java
+++ b/src/com/android/settings/core/instrumentation/VisibilityLoggerMixin.java
@@ -20,6 +20,7 @@
 import android.content.Context;
 import android.content.Intent;
 
+import android.os.SystemClock;
 import com.android.internal.logging.nano.MetricsProto;
 import com.android.settings.SettingsActivity;
 import com.android.settings.overlay.FeatureFactory;
@@ -41,6 +42,7 @@
 
     private MetricsFeatureProvider mMetricsFeature;
     private int mSourceMetricsCategory = MetricsProto.MetricsEvent.VIEW_UNKNOWN;
+    private long mVisibleTimestamp;
 
     public VisibilityLoggerMixin(int metricsCategory) {
         // MetricsFeature will be set during onAttach.
@@ -59,6 +61,7 @@
 
     @Override
     public void onResume() {
+        mVisibleTimestamp = SystemClock.elapsedRealtime();
         if (mMetricsFeature != null && mMetricsCategory != METRICS_CATEGORY_UNKNOWN) {
             mMetricsFeature.visible(null /* context */, mSourceMetricsCategory, mMetricsCategory);
         }
@@ -66,6 +69,7 @@
 
     @Override
     public void onPause() {
+        mVisibleTimestamp = 0;
         if (mMetricsFeature != null && mMetricsCategory != METRICS_CATEGORY_UNKNOWN) {
             mMetricsFeature.hidden(null /* context */, mMetricsCategory);
         }
@@ -85,4 +89,12 @@
         mSourceMetricsCategory = intent.getIntExtra(SettingsActivity.EXTRA_SOURCE_METRICS_CATEGORY,
                 MetricsProto.MetricsEvent.VIEW_UNKNOWN);
     }
+
+    /** Returns elapsed time since onResume() */
+    public long elapsedTimeSinceVisible() {
+        if (mVisibleTimestamp == 0) {
+            return 0;
+        }
+        return SystemClock.elapsedRealtime() - mVisibleTimestamp;
+    }
 }
diff --git a/src/com/android/settings/dashboard/DashboardAdapter.java b/src/com/android/settings/dashboard/DashboardAdapter.java
index 6fee28b..54a1eeb 100644
--- a/src/com/android/settings/dashboard/DashboardAdapter.java
+++ b/src/com/android/settings/dashboard/DashboardAdapter.java
@@ -23,6 +23,7 @@
 import android.graphics.drawable.Drawable;
 import android.graphics.drawable.Icon;
 import android.os.Bundle;
+import android.service.settings.suggestions.Suggestion;
 import android.support.annotation.VisibleForTesting;
 import android.support.v7.util.DiffUtil;
 import android.support.v7.widget.LinearLayoutManager;
@@ -30,7 +31,6 @@
 import android.text.TextUtils;
 import android.util.ArrayMap;
 import android.util.Log;
-import android.util.Pair;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
@@ -46,9 +46,8 @@
 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.dashboard.suggestions.SuggestionControllerMixin;
 import com.android.settings.dashboard.suggestions.SuggestionDismissController;
-import com.android.settings.dashboard.suggestions.SuggestionFeatureProvider;
-import com.android.settings.dashboard.suggestions.SuggestionLogHelper;
 import com.android.settings.overlay.FeatureFactory;
 import com.android.settingslib.Utils;
 import com.android.settingslib.drawer.DashboardCategory;
@@ -62,6 +61,7 @@
         implements SummaryLoader.SummaryConsumer {
     public static final String TAG = "DashboardAdapter";
     private static final String STATE_SUGGESTION_LIST = "suggestion_list";
+    private static final String STATE_SUGGESTION_LIST_V2 = "suggestion_list_v2";
     private static final String STATE_CATEGORY_LIST = "category_list";
     private static final String STATE_SUGGESTIONS_SHOWN_LOGGED = "suggestions_shown_logged";
 
@@ -74,9 +74,9 @@
 
     private final IconCache mCache;
     private final Context mContext;
+    private final SuggestionControllerMixin mSuggestionControllerMixin;
     private final MetricsFeatureProvider mMetricsFeatureProvider;
     private final DashboardFeatureProvider mDashboardFeatureProvider;
-    private final SuggestionFeatureProvider mSuggestionFeatureProvider;
     private final ArrayList<String> mSuggestionsShownLogged;
     private boolean mFirstFrameDrawn;
     private RecyclerView mRecyclerView;
@@ -96,31 +96,22 @@
         }
     };
 
-    private View.OnClickListener mConditionClickListener = new View.OnClickListener() {
-
-        @Override
-        public void onClick(View v) {
-            Condition condition = (Condition) v.getTag();
-            //TODO: get rid of setTag/getTag
-            mMetricsFeatureProvider.action(mContext,
-                    MetricsEvent.ACTION_SETTINGS_CONDITION_CLICK,
-                    condition.getMetricsConstant());
-            condition.onPrimaryClick();
-        }
-    };
-
     public DashboardAdapter(Context context, Bundle savedInstanceState,
             List<Condition> conditions, SuggestionParser suggestionParser,
+            SuggestionControllerMixin suggestionControllerMixin,
             SuggestionDismissController.Callback callback) {
+
+        // @deprecated In favor of suggestionsV2 below.
         List<Tile> suggestions = null;
+        List<Suggestion> suggestionsV2 = null;
         DashboardCategory category = null;
         int suggestionConditionMode = DashboardData.HEADER_MODE_DEFAULT;
 
         mContext = context;
         final FeatureFactory factory = FeatureFactory.getFactory(context);
+        mSuggestionControllerMixin = suggestionControllerMixin;
         mMetricsFeatureProvider = factory.getMetricsFeatureProvider();
         mDashboardFeatureProvider = factory.getDashboardFeatureProvider(context);
-        mSuggestionFeatureProvider = factory.getSuggestionFeatureProvider(context);
         mCache = new IconCache(context);
         mSuggestionParser = suggestionParser;
         mCallback = callback;
@@ -129,6 +120,7 @@
 
         if (savedInstanceState != null) {
             suggestions = savedInstanceState.getParcelableArrayList(STATE_SUGGESTION_LIST);
+            suggestionsV2 = savedInstanceState.getParcelableArrayList(STATE_SUGGESTION_LIST_V2);
             category = savedInstanceState.getParcelable(STATE_CATEGORY_LIST);
             suggestionConditionMode = savedInstanceState.getInt(
                     STATE_SUGGESTION_CONDITION_MODE, suggestionConditionMode);
@@ -141,6 +133,7 @@
         mDashboardData = new DashboardData.Builder()
                 .setConditions(conditions)
                 .setSuggestions(suggestions)
+                .setSuggestionsV2(suggestionsV2)
                 .setCategory(category)
                 .setSuggestionConditionMode(suggestionConditionMode)
                 .build();
@@ -150,8 +143,12 @@
         return mDashboardData.getSuggestions();
     }
 
-    public void setCategoriesAndSuggestions(DashboardCategory category,
-            List<Tile> suggestions) {
+    /**
+     * @deprecated in favor of {@link #setCategory(DashboardCategory)} and
+     * {@link #setSuggestionsV2(List)}.
+     */
+    @Deprecated
+    public void setCategoriesAndSuggestions(DashboardCategory category, List<Tile> suggestions) {
         tintIcons(category, suggestions);
 
         final DashboardData prevData = mDashboardData;
@@ -161,24 +158,15 @@
                 .setCategory(category)
                 .build();
         notifyDashboardDataChanged(prevData);
-        List<Tile> shownSuggestions = null;
-        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) {
-                final String identifier = mSuggestionFeatureProvider.getSuggestionIdentifier(
-                        mContext, suggestion);
-                mMetricsFeatureProvider.action(
-                        mContext, MetricsEvent.ACTION_SHOW_SETTINGS_SUGGESTION, identifier,
-                        getSuggestionTaggedData());
-                mSuggestionsShownLogged.add(identifier);
-            }
-        }
+    }
+
+    public void setSuggestionsV2(List<Suggestion> data) {
+        // TODO: Tint icon
+        final DashboardData prevData = mDashboardData;
+        mDashboardData = new DashboardData.Builder(prevData)
+                .setSuggestionsV2(data)
+                .build();
+        notifyDashboardDataChanged(prevData);
     }
 
     public void setCategory(DashboardCategory category) {
@@ -200,6 +188,10 @@
         notifyDashboardDataChanged(prevData);
     }
 
+    /**
+     * @deprecated in favor of {@link #onSuggestionDismissed(Suggestion)}.
+     */
+    @Deprecated
     public void onSuggestionDismissed(Tile suggestion) {
         final List<Tile> suggestions = mDashboardData.getSuggestions();
         if (suggestions == null || suggestions.isEmpty()) {
@@ -218,6 +210,24 @@
         }
     }
 
+    public void onSuggestionDismissed(Suggestion suggestion) {
+        final List<Suggestion> list = mDashboardData.getSuggestionsV2();
+        if (list == null || list.size() == 0) {
+            return;
+        }
+        if (list.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)
+                    .setSuggestionsV2(null)
+                    .build();
+            notifyDashboardDataChanged(prevData);
+        } else {
+            mSuggestionAdapter.removeSuggestion(suggestion);
+        }
+    }
+
     @Override
     public void notifySummaryChanged(Tile tile) {
         final int position = mDashboardData.getPositionByTile(tile);
@@ -296,30 +306,22 @@
         mRecyclerView = recyclerView;
     }
 
-    public void onPause() {
-        if (mDashboardData.getSuggestions() == null) {
-            return;
-        }
-        for (Tile suggestion : mDashboardData.getSuggestions()) {
-            String suggestionId = mSuggestionFeatureProvider.getSuggestionIdentifier(
-                    mContext, suggestion);
-            if (mSuggestionsShownLogged.contains(suggestionId)) {
-                mMetricsFeatureProvider.action(
-                        mContext, MetricsEvent.ACTION_HIDE_SETTINGS_SUGGESTION, suggestionId,
-                        getSuggestionTaggedData());
-            }
-        }
-        mSuggestionsShownLogged.clear();
-    }
-
     public Object getItem(long itemId) {
         return mDashboardData.getItemEntityById(itemId);
     }
 
+    /**
+     * @deprecated in favor of {@link #getSuggestionV2(int)}.
+     */
+    @Deprecated
     public Tile getSuggestion(int position) {
         return mSuggestionAdapter.getSuggestion(position);
     }
 
+    public Suggestion getSuggestionV2(int position) {
+        return mSuggestionAdapter.getSuggestionsV2(position);
+    }
+
     @VisibleForTesting
     void notifyDashboardDataChanged(DashboardData prevData) {
         if (mFirstFrameDrawn && prevData != null) {
@@ -332,32 +334,16 @@
         }
     }
 
-    private void logSuggestions() {
-        final List<Tile> suggestions = mDashboardData.getSuggestions();
-        if (suggestions == null) {
-            return;
-        }
-        for (Tile suggestion : suggestions) {
-            final String suggestionId = mSuggestionFeatureProvider.getSuggestionIdentifier(
-                    mContext, suggestion);
-            if (!mSuggestionsShownLogged.contains(suggestionId)) {
-                mMetricsFeatureProvider.action(
-                        mContext, MetricsEvent.ACTION_SHOW_SETTINGS_SUGGESTION, suggestionId,
-                        getSuggestionTaggedData());
-                mSuggestionsShownLogged.add(suggestionId);
-            }
-        }
-    }
-
     @VisibleForTesting
     void onBindSuggestionConditionHeader(final SuggestionAndConditionHeaderHolder holder,
             SuggestionConditionHeaderData data) {
         final int curMode = mDashboardData.getSuggestionConditionMode();
-        final int nextMode = data.hiddenSuggestionCount > 0 && data.conditionCount > 0
+        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));
@@ -417,9 +403,7 @@
         holder.itemView.setPadding(0, padding, 0, padding);
 
         holder.itemView.setOnClickListener(v -> {
-            if (moreSuggestions) {
-                logSuggestions();
-            } else if (hasConditions) {
+            if (hasConditions) {
                 mMetricsFeatureProvider.action(mContext,
                         MetricsEvent.ACTION_SETTINGS_CONDITION_EXPAND, true);
             }
@@ -439,15 +423,30 @@
             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<Suggestion> suggestionsV2 = mDashboardData.getSuggestionsV2();
         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 {
+
+        boolean conditionOnly = true;
+        if (position == SUGGESTION_CONDITION_HEADER_POSITION) {
+            if (suggestions != null && suggestions.size() > 0) {
+                conditionOnly = false;
+                mSuggestionAdapter = new SuggestionAdapter(mContext, mSuggestionControllerMixin,
+                        (List<Tile>) mDashboardData.getItemEntityByPosition(position),
+                        null, mSuggestionsShownLogged);
+                mSuggestionDismissHandler = new SuggestionDismissController(mContext,
+                        holder.data, mSuggestionControllerMixin, mSuggestionParser, mCallback);
+                holder.data.setAdapter(mSuggestionAdapter);
+            } else if (suggestionsV2 != null && suggestionsV2.size() > 0) {
+                conditionOnly = false;
+                mSuggestionAdapter = new SuggestionAdapter(mContext, mSuggestionControllerMixin,
+                        null, (List<Suggestion>) mDashboardData.getItemEntityByPosition(position),
+                        mSuggestionsShownLogged);
+                mSuggestionDismissHandler = new SuggestionDismissController(mContext,
+                        holder.data, mSuggestionControllerMixin, null /* parser */, mCallback);
+                holder.data.setAdapter(mSuggestionAdapter);
+            }
+        }
+        if (conditionOnly) {
             ConditionAdapter adapter = new ConditionAdapter(mContext,
                     (List<Condition>) mDashboardData.getItemEntityByPosition(position),
                     mDashboardData.getSuggestionConditionMode());
@@ -458,19 +457,13 @@
     }
 
     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));
+        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.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);
-            }
+            holder.summary.setVisibility(View.GONE);
         }
     }
 
@@ -484,7 +477,7 @@
         final int tintColor = a.getColor(0, mContext.getColor(R.color.fallback_tintColor));
         a.recycle();
         if (category != null) {
-            for (Tile tile : category.tiles) {
+            for (Tile tile : category.getTiles()) {
                 if (tile.isIconTintable) {
                     // If this drawable is tintable, tint it to match the color.
                     tile.icon.setTint(tintColor);
@@ -501,11 +494,16 @@
     }
 
     void onSaveInstanceState(Bundle outState) {
-        final List<Tile> suggestions = mDashboardData.getSuggestions();
         final DashboardCategory category = mDashboardData.getCategory();
+        final List<Tile> suggestions = mDashboardData.getSuggestions();
+        final List<Suggestion> suggestionV2 = mDashboardData.getSuggestionsV2();
         if (suggestions != null) {
             outState.putParcelableArrayList(STATE_SUGGESTION_LIST, new ArrayList<>(suggestions));
         }
+        if (suggestionV2 != null) {
+            outState.putParcelableArrayList(STATE_SUGGESTION_LIST_V2,
+                    new ArrayList<>(suggestionV2));
+        }
         if (category != null) {
             outState.putParcelable(STATE_CATEGORY_LIST, category);
         }
@@ -530,11 +528,6 @@
         parent.setVisibility(View.VISIBLE);
     }
 
-    private Pair<Integer, Object>[] getSuggestionTaggedData() {
-        return SuggestionLogHelper.getSuggestionTaggedData(
-                mSuggestionFeatureProvider.isSmartSuggestionEnabled(mContext));
-    }
-
     public static class IconCache {
         private final Context mContext;
         private final ArrayMap<Icon, Drawable> mMap = new ArrayMap<>();
@@ -544,6 +537,9 @@
         }
 
         public Drawable getIcon(Icon icon) {
+            if (icon == null) {
+                return null;
+            }
             Drawable drawable = mMap.get(icon);
             if (drawable == null) {
                 drawable = icon.loadDrawable(mContext);
diff --git a/src/com/android/settings/dashboard/DashboardData.java b/src/com/android/settings/dashboard/DashboardData.java
index b9941c5..6407960 100644
--- a/src/com/android/settings/dashboard/DashboardData.java
+++ b/src/com/android/settings/dashboard/DashboardData.java
@@ -17,6 +17,7 @@
 
 import android.annotation.IntDef;
 import android.graphics.drawable.Icon;
+import android.service.settings.suggestions.Suggestion;
 import android.support.annotation.VisibleForTesting;
 import android.support.v7.util.DiffUtil;
 import android.text.TextUtils;
@@ -69,6 +70,7 @@
     private final DashboardCategory mCategory;
     private final List<Condition> mConditions;
     private final List<Tile> mSuggestions;
+    private final List<Suggestion> mSuggestionsV2;
     @HeaderMode
     private final int mSuggestionConditionMode;
 
@@ -76,6 +78,7 @@
         mCategory = builder.mCategory;
         mConditions = builder.mConditions;
         mSuggestions = builder.mSuggestions;
+        mSuggestionsV2 = builder.mSuggestionsV2;
         mSuggestionConditionMode = builder.mSuggestionConditionMode;
 
         mItems = new ArrayList<>();
@@ -124,6 +127,10 @@
         return mSuggestions;
     }
 
+    public List<Suggestion> getSuggestionsV2() {
+        return mSuggestionsV2;
+    }
+
     public int getSuggestionConditionMode() {
         return mSuggestionConditionMode;
     }
@@ -172,30 +179,6 @@
     }
 
     /**
-     * Get the count of suggestions to display
-     *
-     * The displayable count mainly depends on the {@link #mSuggestionConditionMode}
-     * and the size of suggestions list.
-     *
-     * When in default mode, displayable count couldn't be larger than
-     * {@link #DEFAULT_SUGGESTION_COUNT}.
-     *
-     * When in expanded mode, display all the suggestions.
-     *
-     * @return the count of suggestions to display
-     */
-    public int getDisplayableSuggestionCount() {
-        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;
-    }
-
-    /**
      * Add item into list when {@paramref add} is true.
      *
      * @param item     maybe {@link Condition}, {@link Tile}, {@link DashboardCategory} or null
@@ -214,13 +197,22 @@
      * and mIsShowingAll, mSuggestionConditionMode flag.
      */
     private void buildItemsData() {
-        final boolean hasSuggestions = sizeOf(mSuggestions) > 0;
+        final boolean useSuggestionV2 = mSuggestionsV2 != null;
+        final boolean hasSuggestions = useSuggestionV2
+                ? sizeOf(mSuggestionsV2) > 0
+                : 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;
+        final List<Suggestion> suggestionsV2 = getSuggestionsV2ToShow(mSuggestionsV2);
+
+        final int hiddenSuggestion;
+        if (useSuggestionV2) {
+            hiddenSuggestion = hasSuggestions ? sizeOf(mSuggestionsV2) - sizeOf(suggestionsV2) : 0;
+        } else {
+            hiddenSuggestion = hasSuggestions ? sizeOf(mSuggestions) - sizeOf(suggestions) : 0;
+        }
 
         final boolean hasSuggestionAndCollapsed = hasSuggestions
                 && mSuggestionConditionMode == HEADER_MODE_COLLAPSED;
@@ -239,10 +231,15 @@
                 R.layout.suggestion_condition_header,
                 STABLE_ID_SUGGESTION_CONDITION_MIDDLE_HEADER, onlyHasConditionAndCollapsed);
 
-        /* Suggestion container. This is the card view that contains the list of suggestions.
-         * This will be added whenever the suggestion list is not empty */
-        addToItemList(suggestions, R.layout.suggestion_condition_container,
-                STABLE_ID_SUGGESTION_CONTAINER, sizeOf(suggestions) > 0);
+        if (useSuggestionV2) {
+            addToItemList(suggestionsV2, R.layout.suggestion_condition_container,
+                    STABLE_ID_SUGGESTION_CONTAINER, sizeOf(suggestionsV2) > 0);
+        } else {
+            /* Suggestion container. This is the card view that contains the list of suggestions.
+             * This will be added whenever the suggestion list is not empty */
+            addToItemList(suggestions, R.layout.suggestion_condition_container,
+                    STABLE_ID_SUGGESTION_CONTAINER, sizeOf(suggestions) > 0);
+        }
 
         /* 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
@@ -270,9 +267,10 @@
                         && !hasConditions
                         && hiddenSuggestion == 0);
 
-        if(mCategory != null) {
-            for (int j = 0; j < mCategory.tiles.size(); j++) {
-                final Tile tile = mCategory.tiles.get(j);
+        if (mCategory != null) {
+            final List<Tile> tiles = mCategory.getTiles();
+            for (int j = 0; j < tiles.size(); j++) {
+                final Tile tile = tiles.get(j);
                 addToItemList(tile, R.layout.dashboard_tile, Objects.hash(tile.title),
                         true /* add */);
             }
@@ -287,7 +285,7 @@
         if (conditions == null) {
             return null;
         }
-        List<Condition> result = new ArrayList<Condition>();
+        List<Condition> result = new ArrayList<>();
         final int size = conditions == null ? 0 : conditions.size();
         for (int i = 0; i < size; i++) {
             final Condition condition = conditions.get(i);
@@ -298,6 +296,10 @@
         return result;
     }
 
+    /**
+     * @deprecated in favor of {@link #getSuggestionsV2ToShow}.
+     */
+    @Deprecated
     private List<Tile> getSuggestionsToShow(List<Tile> suggestions) {
         if (suggestions == null || mSuggestionConditionMode == HEADER_MODE_COLLAPSED) {
             return null;
@@ -309,6 +311,17 @@
         return suggestions.subList(0, DEFAULT_SUGGESTION_COUNT);
     }
 
+    private List<Suggestion> getSuggestionsV2ToShow(List<Suggestion> 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>
@@ -320,7 +333,12 @@
 
         private DashboardCategory mCategory;
         private List<Condition> mConditions;
+        /**
+         * @deprecated in favor of SuggestionList
+         */
+        @Deprecated
         private List<Tile> mSuggestions;
+        private List<Suggestion> mSuggestionsV2;
 
         public Builder() {
         }
@@ -329,6 +347,7 @@
             mCategory = dashboardData.mCategory;
             mConditions = dashboardData.mConditions;
             mSuggestions = dashboardData.mSuggestions;
+            mSuggestionsV2 = dashboardData.mSuggestionsV2;
             mSuggestionConditionMode = dashboardData.mSuggestionConditionMode;
         }
 
@@ -342,11 +361,20 @@
             return this;
         }
 
+        /**
+         * @deprecated in favor of {@link #setSuggestionsV2(List)})}
+         */
+        @Deprecated
         public Builder setSuggestions(List<Tile> suggestions) {
             this.mSuggestions = suggestions;
             return this;
         }
 
+        public Builder setSuggestionsV2(List<Suggestion> suggestions) {
+            this.mSuggestionsV2 = suggestions;
+            return this;
+        }
+
         public Builder setSuggestionConditionMode(@HeaderMode int mode) {
             this.mSuggestionConditionMode = mode;
             return this;
@@ -500,7 +528,7 @@
             conditionCount = sizeOf(conditions);
             this.hiddenSuggestionCount = hiddenSuggestionCount;
             title = conditionCount > 0 ? conditions.get(0).getTitle() : null;
-            conditionIcons = new ArrayList<Icon>();
+            conditionIcons = new ArrayList<>();
             for (int i = 0; conditions != null && i < conditions.size(); i++) {
                 final Condition condition = conditions.get(i);
                 conditionIcons.add(condition.getIcon());
diff --git a/src/com/android/settings/dashboard/DashboardFeatureProvider.java b/src/com/android/settings/dashboard/DashboardFeatureProvider.java
index 15608a2..3ca146b 100644
--- a/src/com/android/settings/dashboard/DashboardFeatureProvider.java
+++ b/src/com/android/settings/dashboard/DashboardFeatureProvider.java
@@ -17,7 +17,6 @@
 
 import android.app.Activity;
 import android.content.Context;
-import android.os.Bundle;
 import android.support.v7.preference.Preference;
 
 import com.android.settingslib.drawer.DashboardCategory;
@@ -80,12 +79,6 @@
             Tile tile, String key, int baseOrder);
 
     /**
-     * Returns a {@link ProgressiveDisclosureMixin} for specified fragment.
-     */
-    ProgressiveDisclosureMixin getProgressiveDisclosureMixin(Context context,
-            DashboardFragment fragment, Bundle args);
-
-    /**
      * Returns additional intent filter action for dashboard tiles
      */
     String getExtraIntentAction();
diff --git a/src/com/android/settings/dashboard/DashboardFeatureProviderImpl.java b/src/com/android/settings/dashboard/DashboardFeatureProviderImpl.java
index 88cf666..9ef38b8 100644
--- a/src/com/android/settings/dashboard/DashboardFeatureProviderImpl.java
+++ b/src/com/android/settings/dashboard/DashboardFeatureProviderImpl.java
@@ -16,16 +16,25 @@
 
 package com.android.settings.dashboard;
 
+import static com.android.settingslib.drawer.TileUtils.META_DATA_PREFERENCE_ICON_URI;
+import static com.android.settingslib.drawer.TileUtils.META_DATA_PREFERENCE_SUMMARY;
+import static com.android.settingslib.drawer.TileUtils.META_DATA_PREFERENCE_SUMMARY_URI;
+
 import android.app.Activity;
 import android.content.ComponentName;
 import android.content.Context;
+import android.content.IContentProvider;
 import android.content.Intent;
 import android.content.pm.PackageManager;
+import android.graphics.drawable.Icon;
 import android.os.Bundle;
 import android.provider.Settings;
+import android.support.annotation.VisibleForTesting;
 import android.support.v7.preference.Preference;
 import android.text.TextUtils;
+import android.util.ArrayMap;
 import android.util.Log;
+import android.util.Pair;
 
 import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
 import com.android.settings.R;
@@ -37,9 +46,12 @@
 import com.android.settingslib.drawer.ProfileSelectDialog;
 import com.android.settingslib.drawer.SettingsDrawerActivity;
 import com.android.settingslib.drawer.Tile;
+import com.android.settingslib.drawer.TileUtils;
+import com.android.settingslib.utils.ThreadUtils;
 
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Map;
 
 /**
  * Impl for {@code DashboardFeatureProvider}.
@@ -50,6 +62,8 @@
 
     private static final String DASHBOARD_TILE_PREF_KEY_PREFIX = "dashboard_tile_pref_";
     private static final String META_DATA_KEY_INTENT_ACTION = "com.android.settings.intent.action";
+    @VisibleForTesting
+    static final String META_DATA_KEY_ORDER = "com.android.settings.order";
 
     protected final Context mContext;
 
@@ -77,7 +91,7 @@
             Log.d(TAG, "NO dashboard tiles for " + TAG);
             return null;
         }
-        final List<Tile> tiles = category.tiles;
+        final List<Tile> tiles = category.getTiles();
         if (tiles == null || tiles.isEmpty()) {
             Log.d(TAG, "tile list is empty, skipping category " + category.title);
             return null;
@@ -125,20 +139,19 @@
         } else {
             pref.setKey(getDashboardKeyForTile(tile));
         }
-        if (tile.summary != null) {
-            pref.setSummary(tile.summary);
-        } else {
-            pref.setSummary(R.string.summary_placeholder);
-        }
-        if (tile.icon != null) {
-            pref.setIcon(tile.icon.loadDrawable(activity));
-        }
+        bindSummary(pref, tile);
+        bindIcon(pref, tile);
         final Bundle metadata = tile.metaData;
         String clsName = null;
         String action = null;
+        Integer order = null;
         if (metadata != null) {
             clsName = metadata.getString(SettingsActivity.META_DATA_KEY_FRAGMENT_CLASS);
             action = metadata.getString(META_DATA_KEY_INTENT_ACTION);
+            if (metadata.containsKey(META_DATA_KEY_ORDER)
+                    && metadata.get(META_DATA_KEY_ORDER) instanceof Integer) {
+                order = metadata.getInt(META_DATA_KEY_ORDER);
+            }
         }
         if (!TextUtils.isEmpty(clsName)) {
             pref.setFragment(clsName);
@@ -154,34 +167,28 @@
             });
         }
         final String skipOffsetPackageName = activity.getPackageName();
-        // Use negated priority for order, because tile priority is based on intent-filter
-        // (larger value has higher priority). However pref order defines smaller value has
-        // higher priority.
-        if (tile.priority != 0) {
+        // If order is set in the meta data, use that order. Otherwise, check the intent priority.
+        if (order == null && tile.priority != 0) {
+            // Use negated priority for order, because tile priority is based on intent-filter
+            // (larger value has higher priority). However pref order defines smaller value has
+            // higher priority.
+            order = -tile.priority;
+        }
+        if (order != null) {
             boolean shouldSkipBaseOrderOffset = false;
             if (tile.intent != null) {
                 shouldSkipBaseOrderOffset = TextUtils.equals(
                         skipOffsetPackageName, tile.intent.getComponent().getPackageName());
             }
             if (shouldSkipBaseOrderOffset || baseOrder == Preference.DEFAULT_ORDER) {
-                pref.setOrder(-tile.priority);
+                pref.setOrder(order);
             } else {
-                pref.setOrder(-tile.priority + baseOrder);
+                pref.setOrder(order + baseOrder);
             }
         }
     }
 
     @Override
-    public ProgressiveDisclosureMixin getProgressiveDisclosureMixin(Context context,
-            DashboardFragment fragment, Bundle args) {
-        boolean keepExpanded = false;
-        if (args != null) {
-            keepExpanded = args.getString(SettingsActivity.EXTRA_FRAGMENT_ARG_KEY) != null;
-        }
-        return new ProgressiveDisclosureMixin(context, fragment, keepExpanded);
-    }
-
-    @Override
     public String getExtraIntentAction() {
         return null;
     }
@@ -206,6 +213,54 @@
         launchIntentOrSelectProfile(activity, tile, intent, MetricsEvent.DASHBOARD_SUMMARY);
     }
 
+    private void bindSummary(Preference preference, Tile tile) {
+        if (tile.summary != null) {
+            preference.setSummary(tile.summary);
+        } else if (tile.metaData != null
+                && tile.metaData.containsKey(META_DATA_PREFERENCE_SUMMARY_URI)) {
+            ThreadUtils.postOnBackgroundThread(() -> {
+                final Map<String, IContentProvider> providerMap = new ArrayMap<>();
+                final String uri = tile.metaData.getString(META_DATA_PREFERENCE_SUMMARY_URI);
+                final String summary = TileUtils.getTextFromUri(
+                        mContext, uri, providerMap, META_DATA_PREFERENCE_SUMMARY);
+                ThreadUtils.postOnMainThread(() -> preference.setSummary(summary));
+            });
+        } else {
+            preference.setSummary(R.string.summary_placeholder);
+        }
+    }
+
+    @VisibleForTesting
+    void bindIcon(Preference preference, Tile tile) {
+        if (tile.icon != null) {
+            preference.setIcon(tile.icon.loadDrawable(preference.getContext()));
+        } else if (tile.metaData != null
+                && tile.metaData.containsKey(META_DATA_PREFERENCE_ICON_URI))
+            ThreadUtils.postOnBackgroundThread(() -> {
+                String packageName = null;
+                if (tile.intent != null) {
+                    Intent intent = tile.intent;
+                    if (!TextUtils.isEmpty(intent.getPackage())) {
+                        packageName = intent.getPackage();
+                    } else if (intent.getComponent() != null) {
+                        packageName = intent.getComponent().getPackageName();
+                    }
+                }
+                final Map<String, IContentProvider> providerMap = new ArrayMap<>();
+                final String uri = tile.metaData.getString(META_DATA_PREFERENCE_ICON_URI);
+                final Pair<String, Integer> iconInfo = TileUtils.getIconFromUri(
+                        mContext, packageName, uri, providerMap);
+                if (iconInfo == null) {
+                    Log.w(TAG, "Failed to get icon from uri " + uri);
+                    return;
+                }
+                tile.icon = Icon.createWithResource(iconInfo.first, iconInfo.second);
+                ThreadUtils.postOnMainThread(() ->
+                        preference.setIcon(tile.icon.loadDrawable(preference.getContext()))
+                );
+            });
+    }
+
     private void launchIntentOrSelectProfile(Activity activity, Tile tile, Intent intent,
             int sourceMetricCategory) {
         if (!isIntentResolvable(intent)) {
diff --git a/src/com/android/settings/dashboard/DashboardFragment.java b/src/com/android/settings/dashboard/DashboardFragment.java
index 8c3ac0d..3e1e881 100644
--- a/src/com/android/settings/dashboard/DashboardFragment.java
+++ b/src/com/android/settings/dashboard/DashboardFragment.java
@@ -58,7 +58,6 @@
             new ArrayMap<>();
     private final Set<String> mDashboardTilePrefKeys = new ArraySet<>();
 
-    protected ProgressiveDisclosureMixin mProgressiveDisclosureMixin;
     protected DashboardFeatureProvider mDashboardFeatureProvider;
     private DashboardTilePlaceholderPreferenceController mPlaceholderPreferenceController;
     private boolean mListeningToCategoryChange;
@@ -69,9 +68,6 @@
         super.onAttach(context);
         mDashboardFeatureProvider =
                 FeatureFactory.getFactory(context).getDashboardFeatureProvider(context);
-        mProgressiveDisclosureMixin = mDashboardFeatureProvider
-                .getProgressiveDisclosureMixin(context, this, getArguments());
-        getLifecycle().addObserver(mProgressiveDisclosureMixin);
 
         List<AbstractPreferenceController> controllers = getPreferenceControllers(context);
         if (controllers == null) {
@@ -91,9 +87,11 @@
         // Set ComparisonCallback so we get better animation when list changes.
         getPreferenceManager().setPreferenceComparisonCallback(
                 new PreferenceManager.SimplePreferenceComparisonCallback());
-        // Upon rotation configuration change we need to update preference states before any
-        // editing dialog is recreated (that would happen before onResume is called).
-        updatePreferenceStates();
+        if (icicle != null) {
+            // Upon rotation configuration change we need to update preference states before any
+            // editing dialog is recreated (that would happen before onResume is called).
+            updatePreferenceStates();
+        }
     }
 
     @Override
@@ -115,7 +113,6 @@
 
     @Override
     public void onCreatePreferences(Bundle savedInstanceState, String rootKey) {
-        super.onCreatePreferences(savedInstanceState, rootKey);
         refreshAllPreferences(getLogTag());
     }
 
@@ -141,8 +138,7 @@
     @Override
     public void notifySummaryChanged(Tile tile) {
         final String key = mDashboardFeatureProvider.getDashboardKeyForTile(tile);
-        final Preference pref = mProgressiveDisclosureMixin.findPreference(
-                getPreferenceScreen(), key);
+        final Preference pref = getPreferenceScreen().findPreference(key);
         if (pref == null) {
             Log.d(getLogTag(),
                     String.format("Can't find pref by key %s, skipping update summary %s/%s",
@@ -189,6 +185,9 @@
         }
     }
 
+    @Override
+    protected abstract int getPreferenceScreenResId();
+
     protected <T extends AbstractPreferenceController> T getPreferenceController(Class<T> clazz) {
         AbstractPreferenceController controller = mPreferenceControllers.get(clazz);
         return (T) controller;
@@ -201,7 +200,7 @@
     /**
      * Returns the CategoryKey for loading {@link DashboardCategory} for this fragment.
      */
-    @VisibleForTesting(otherwise = VisibleForTesting.PRIVATE)
+    @VisibleForTesting
     public String getCategoryKey() {
         return DashboardFragmentRegistry.PARENT_TO_CATEGORY_KEY_MAP.get(getClass().getName());
     }
@@ -212,11 +211,6 @@
     protected abstract String getLogTag();
 
     /**
-     * Get the res id for static preference xml for this fragment.
-     */
-    protected abstract int getPreferenceScreenResId();
-
-    /**
      * Get a list of {@link AbstractPreferenceController} for this fragment.
      */
     protected abstract List<AbstractPreferenceController> getPreferenceControllers(Context context);
@@ -273,7 +267,7 @@
             }
             final String key = controller.getPreferenceKey();
 
-            final Preference preference = mProgressiveDisclosureMixin.findPreference(screen, key);
+            final Preference preference = screen.findPreference(key);
             if (preference == null) {
                 Log.d(TAG, String.format("Cannot find preference with key %s in Controller %s",
                         key, controller.getClass().getSimpleName()));
@@ -296,7 +290,6 @@
 
         // Add resource based tiles.
         displayResourceTiles();
-        mProgressiveDisclosureMixin.collapse(getPreferenceScreen());
 
         refreshDashboardTiles(TAG);
     }
@@ -314,7 +307,7 @@
             Log.d(TAG, "NO dashboard tiles for " + TAG);
             return;
         }
-        List<Tile> tiles = category.tiles;
+        final List<Tile> tiles = category.getTiles();
         if (tiles == null) {
             Log.d(TAG, "tile list is empty, skipping category " + category.title);
             return;
@@ -348,8 +341,7 @@
             }
             if (mDashboardTilePrefKeys.contains(key)) {
                 // Have the key already, will rebind.
-                final Preference preference = mProgressiveDisclosureMixin.findPreference(
-                        screen, key);
+                final Preference preference = screen.findPreference(key);
                 mDashboardFeatureProvider.bindPreferenceToTile(getActivity(), getMetricsCategory(),
                         preference, tile, key, mPlaceholderPreferenceController.getOrder());
             } else {
@@ -357,7 +349,7 @@
                 final Preference pref = new Preference(getPrefContext());
                 mDashboardFeatureProvider.bindPreferenceToTile(getActivity(), getMetricsCategory(),
                         pref, tile, key, mPlaceholderPreferenceController.getOrder());
-                mProgressiveDisclosureMixin.addPreference(screen, pref);
+                screen.addPreference(pref);
                 mDashboardTilePrefKeys.add(key);
             }
             remove.remove(key);
@@ -365,7 +357,10 @@
         // Finally remove tiles that are gone.
         for (String key : remove) {
             mDashboardTilePrefKeys.remove(key);
-            mProgressiveDisclosureMixin.removePreference(screen, key);
+            final Preference preference = screen.findPreference(key);
+            if (preference != null) {
+                screen.removePreference(preference);
+            }
         }
         mSummaryLoader.setListening(true);
     }
diff --git a/src/com/android/settings/dashboard/DashboardFragmentRegistry.java b/src/com/android/settings/dashboard/DashboardFragmentRegistry.java
index fddd522..af00dc6 100644
--- a/src/com/android/settings/dashboard/DashboardFragmentRegistry.java
+++ b/src/com/android/settings/dashboard/DashboardFragmentRegistry.java
@@ -19,13 +19,12 @@
 import android.util.ArrayMap;
 
 import com.android.settings.DisplaySettings;
-import com.android.settings.SecuritySettings;
 import com.android.settings.accounts.AccountDetailDashboardFragment;
 import com.android.settings.accounts.UserAndAccountDashboardFragment;
 import com.android.settings.applications.AppAndNotificationDashboardFragment;
 import com.android.settings.applications.DefaultAppSettings;
-import com.android.settings.connecteddevice.ConnectedDeviceDashboardFragment;
-import com.android.settings.development.DevelopmentSettings;
+import com.android.settings.connecteddevice.ConnectedDeviceDashboardFragmentOld;
+import com.android.settings.development.DevelopmentSettingsDashboardFragment;
 import com.android.settings.deviceinfo.StorageDashboardFragment;
 import com.android.settings.fuelgauge.PowerUsageSummary;
 import com.android.settings.language.LanguageAndInputSettings;
@@ -33,6 +32,7 @@
 import com.android.settings.notification.ConfigureNotificationSettings;
 import com.android.settings.notification.SoundSettings;
 import com.android.settings.security.LockscreenDashboardFragment;
+import com.android.settings.security.SecuritySettings;
 import com.android.settings.system.SystemDashboardFragment;
 import com.android.settingslib.drawer.CategoryKey;
 
@@ -59,7 +59,8 @@
         PARENT_TO_CATEGORY_KEY_MAP = new ArrayMap<>();
         PARENT_TO_CATEGORY_KEY_MAP.put(
                 NetworkDashboardFragment.class.getName(), CategoryKey.CATEGORY_NETWORK);
-        PARENT_TO_CATEGORY_KEY_MAP.put(ConnectedDeviceDashboardFragment.class.getName(),
+        //TODO(b/69471219): update ConnectedDeviceDashboardFragment once new feature is done.
+        PARENT_TO_CATEGORY_KEY_MAP.put(ConnectedDeviceDashboardFragmentOld.class.getName(),
                 CategoryKey.CATEGORY_DEVICE);
         PARENT_TO_CATEGORY_KEY_MAP.put(AppAndNotificationDashboardFragment.class.getName(),
                 CategoryKey.CATEGORY_APPS);
@@ -83,7 +84,7 @@
                 SystemDashboardFragment.class.getName(), CategoryKey.CATEGORY_SYSTEM);
         PARENT_TO_CATEGORY_KEY_MAP.put(LanguageAndInputSettings.class.getName(),
                 CategoryKey.CATEGORY_SYSTEM_LANGUAGE);
-        PARENT_TO_CATEGORY_KEY_MAP.put(DevelopmentSettings.class.getName(),
+        PARENT_TO_CATEGORY_KEY_MAP.put(DevelopmentSettingsDashboardFragment.class.getName(),
                 CategoryKey.CATEGORY_SYSTEM_DEVELOPMENT);
         PARENT_TO_CATEGORY_KEY_MAP.put(ConfigureNotificationSettings.class.getName(),
                 CategoryKey.CATEGORY_NOTIFICATIONS);
diff --git a/src/com/android/settings/dashboard/DashboardSummary.java b/src/com/android/settings/dashboard/DashboardSummary.java
index be5fbdf..8f66b67 100644
--- a/src/com/android/settings/dashboard/DashboardSummary.java
+++ b/src/com/android/settings/dashboard/DashboardSummary.java
@@ -17,11 +17,14 @@
 package com.android.settings.dashboard;
 
 import android.app.Activity;
+import android.app.LoaderManager;
 import android.content.Context;
 import android.os.AsyncTask;
 import android.os.Bundle;
 import android.os.Handler;
+import android.service.settings.suggestions.Suggestion;
 import android.support.annotation.VisibleForTesting;
+import android.support.annotation.WorkerThread;
 import android.support.v7.widget.LinearLayoutManager;
 import android.util.Log;
 import android.view.LayoutInflater;
@@ -36,9 +39,9 @@
 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.SuggestionControllerMixin;
 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.settings.widget.ActionBarShadowController;
 import com.android.settingslib.drawer.CategoryKey;
@@ -48,19 +51,20 @@
 import com.android.settingslib.drawer.Tile;
 import com.android.settingslib.suggestions.SuggestionList;
 import com.android.settingslib.suggestions.SuggestionParser;
+import com.android.settingslib.utils.ThreadUtils;
 
 import java.util.ArrayList;
 import java.util.List;
 
 public class DashboardSummary extends InstrumentedFragment
         implements CategoryListener, ConditionListener,
-        FocusListener, SuggestionDismissController.Callback {
+        FocusListener, SuggestionDismissController.Callback,
+        SuggestionControllerMixin.SuggestionControllerHost {
     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 EXTRA_SCROLL_POSITION = "scroll_position";
 
     private final Handler mHandler = new Handler();
@@ -71,7 +75,7 @@
     private ConditionManager mConditionManager;
     private SuggestionParser mSuggestionParser;
     private LinearLayoutManager mLayoutManager;
-    private SuggestionsChecks mSuggestionsChecks;
+    private SuggestionControllerMixin mSuggestionControllerMixin;
     private DashboardFeatureProvider mDashboardFeatureProvider;
     private SuggestionFeatureProvider mSuggestionFeatureProvider;
     private boolean isOnCategoriesChangedCalled;
@@ -83,14 +87,32 @@
     }
 
     @Override
+    public void onAttach(Context context) {
+        super.onAttach(context);
+        mSuggestionFeatureProvider = FeatureFactory.getFactory(context)
+                .getSuggestionFeatureProvider(context);
+        if (mSuggestionFeatureProvider.isSuggestionV2Enabled(context)) {
+            Log.d(TAG, "Suggestion v2 is enabled, creating SuggestionControllerMixin");
+            mSuggestionControllerMixin = new SuggestionControllerMixin(context, this /* host */,
+                    getLifecycle());
+        }
+    }
+
+    @Override
+    public LoaderManager getLoaderManager() {
+        if (!isAdded()) {
+            return null;
+        }
+        return super.getLoaderManager();
+    }
+
+    @Override
     public void onCreate(Bundle savedInstanceState) {
         long startTime = System.currentTimeMillis();
         super.onCreate(savedInstanceState);
         final Activity activity = getActivity();
         mDashboardFeatureProvider = FeatureFactory.getFactory(activity)
                 .getDashboardFeatureProvider(activity);
-        mSuggestionFeatureProvider = FeatureFactory.getFactory(activity)
-                .getSuggestionFeatureProvider(activity);
 
         mSummaryLoader = new SummaryLoader(activity, CategoryKey.CATEGORY_HOMEPAGE);
 
@@ -99,11 +121,9 @@
         if (mSuggestionFeatureProvider.isSuggestionEnabled(activity)) {
             mSuggestionParser = new SuggestionParser(activity,
                     mSuggestionFeatureProvider.getSharedPrefs(activity), R.xml.suggestion_ordering);
-            mSuggestionsChecks = new SuggestionsChecks(getContext());
         }
         if (DEBUG_TIMING) {
-            Log.d(TAG, "onCreate took " + (System.currentTimeMillis() - startTime)
-                    + " ms");
+            Log.d(TAG, "onCreate took " + (System.currentTimeMillis() - startTime) + " ms");
         }
     }
 
@@ -143,9 +163,6 @@
                 mMetricsFeatureProvider.hidden(getContext(), c.getMetricsConstant());
             }
         }
-        if (!getActivity().isChangingConfigurations()) {
-            mAdapter.onPause();
-        }
     }
 
     @Override
@@ -167,12 +184,6 @@
     }
 
     @Override
-    public View onCreateView(LayoutInflater inflater, ViewGroup container,
-            Bundle savedInstanceState) {
-        return inflater.inflate(R.layout.dashboard, container, false);
-    }
-
-    @Override
     public void onSaveInstanceState(Bundle outState) {
         super.onSaveInstanceState(outState);
         if (mLayoutManager == null) return;
@@ -183,9 +194,10 @@
     }
 
     @Override
-    public void onViewCreated(View view, Bundle bundle) {
+    public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle bundle) {
         long startTime = System.currentTimeMillis();
-        mDashboard = view.findViewById(R.id.dashboard_container);
+        final View root = inflater.inflate(R.layout.dashboard, container, false);
+        mDashboard = root.findViewById(R.id.dashboard_container);
         mLayoutManager = new LinearLayoutManager(getContext());
         mLayoutManager.setOrientation(LinearLayoutManager.VERTICAL);
         if (bundle != null) {
@@ -196,30 +208,31 @@
         mDashboard.setHasFixedSize(true);
         mDashboard.setListener(this);
         mAdapter = new DashboardAdapter(getContext(), bundle, mConditionManager.getConditions(),
-            mSuggestionParser, this /* SuggestionDismissController.Callback */);
+                mSuggestionParser, mSuggestionControllerMixin,
+                this /* SuggestionDismissController.Callback */);
         mDashboard.setAdapter(mAdapter);
         mDashboard.setItemAnimator(new DashboardItemAnimator());
         mSummaryLoader.setSummaryConsumer(mAdapter);
         ActionBarShadowController.attachToRecyclerView(
                 getActivity().findViewById(R.id.search_bar_container), getLifecycle(), mDashboard);
-
+        rebuildUI();
         if (DEBUG_TIMING) {
-            Log.d(TAG, "onViewCreated took "
+            Log.d(TAG, "onCreateView took "
                     + (System.currentTimeMillis() - startTime) + " ms");
         }
-        rebuildUI();
+        return root;
     }
 
     @VisibleForTesting
     void rebuildUI() {
         if (!mSuggestionFeatureProvider.isSuggestionEnabled(getContext())) {
-            Log.d(TAG, "Suggestion feature is disabled, skipping suggestion entirely");
-            updateCategoryAndSuggestion(null /* tiles */);
+            Log.d(TAG, "Suggestion v1 feature is disabled, skipping suggestion v1");
+            ThreadUtils.postOnBackgroundThread(() -> updateCategory());
         } else {
             new SuggestionLoader().execute();
             // Set categories on their own if loading suggestions takes too long.
             mHandler.postDelayed(() -> {
-                updateCategoryAndSuggestion(null /* tiles */);
+                updateCategory();
             }, MAX_WAIT_MILLIS);
         }
     }
@@ -257,6 +270,11 @@
     }
 
     @Override
+    public Suggestion getSuggestionAt(int position) {
+        return mAdapter.getSuggestionV2(position);
+    }
+
+    @Override
     public Tile getSuggestionForPosition(int position) {
         return mAdapter.getSuggestion(position);
     }
@@ -266,6 +284,20 @@
         mAdapter.onSuggestionDismissed(suggestion);
     }
 
+    @Override
+    public void onSuggestionDismissed(Suggestion suggestion) {
+        mAdapter.onSuggestionDismissed(suggestion);
+    }
+
+    @Override
+    public void onSuggestionReady(List<Suggestion> suggestions) {
+        mAdapter.setSuggestionsV2(suggestions);
+    }
+
+    /**
+     * @deprecated in favor of {@link #mSuggestionControllerMixin}.
+     */
+    @Deprecated
     private class SuggestionLoader extends AsyncTask<Void, Void, List<Tile>> {
         @Override
         protected List<Tile> doInBackground(Void... params) {
@@ -286,7 +318,8 @@
             }
             for (int i = 0; i < suggestions.size(); i++) {
                 Tile suggestion = suggestions.get(i);
-                if (mSuggestionsChecks.isSuggestionComplete(suggestion)) {
+                if (mSuggestionFeatureProvider.isSuggestionComplete(context,
+                        suggestion.intent.getComponent())) {
                     suggestions.remove(i--);
                 }
             }
@@ -304,6 +337,18 @@
         }
     }
 
+    @WorkerThread
+    void updateCategory() {
+        final DashboardCategory category = mDashboardFeatureProvider.getTilesForCategory(
+                CategoryKey.CATEGORY_HOMEPAGE);
+        mSummaryLoader.updateSummaryToCache(category);
+        ThreadUtils.postOnMainThread(() -> mAdapter.setCategory(category));
+    }
+
+    /**
+     * @deprecated in favor of {@link #mSuggestionControllerMixin}.
+     */
+    @Deprecated
     @VisibleForTesting
     void updateCategoryAndSuggestion(List<Tile> suggestions) {
         final Activity activity = getActivity();
diff --git a/src/com/android/settings/dashboard/ExpandPreference.java b/src/com/android/settings/dashboard/ExpandPreference.java
deleted file mode 100644
index 3939e74..0000000
--- a/src/com/android/settings/dashboard/ExpandPreference.java
+++ /dev/null
@@ -1,61 +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.dashboard;
-
-import android.content.Context;
-import android.support.v7.preference.Preference;
-import android.support.v7.preference.PreferenceViewHolder;
-import android.util.AttributeSet;
-
-import com.android.settings.R;
-
-public class ExpandPreference extends Preference {
-
-    public ExpandPreference(Context context, AttributeSet attrs,
-            int defStyleAttr, int defStyleRes) {
-        super(context, attrs, defStyleAttr, defStyleRes);
-        init();
-    }
-
-    public ExpandPreference(Context context, AttributeSet attrs, int defStyleAttr) {
-        super(context, attrs, defStyleAttr);
-        init();
-    }
-
-    public ExpandPreference(Context context, AttributeSet attrs) {
-        super(context, attrs);
-        init();
-    }
-
-    public ExpandPreference(Context context) {
-        super(context);
-        init();
-    }
-
-    private void init() {
-        setLayoutResource(R.layout.expand_preference);
-        setIcon(R.drawable.ic_arrow_down_24dp);
-        setTitle(R.string.advanced_section_header);
-        setOrder(999);
-    }
-
-    @Override
-    public void onBindViewHolder(PreferenceViewHolder holder) {
-        super.onBindViewHolder(holder);
-        holder.setDividerAllowedAbove(false);
-    }
-}
diff --git a/src/com/android/settings/dashboard/ProgressiveDisclosureMixin.java b/src/com/android/settings/dashboard/ProgressiveDisclosureMixin.java
deleted file mode 100644
index 92055be..0000000
--- a/src/com/android/settings/dashboard/ProgressiveDisclosureMixin.java
+++ /dev/null
@@ -1,269 +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.dashboard;
-
-import android.content.Context;
-import android.os.Bundle;
-import android.support.annotation.VisibleForTesting;
-import android.support.v14.preference.PreferenceFragment;
-import android.support.v7.preference.Preference;
-import android.support.v7.preference.PreferenceGroup;
-import android.support.v7.preference.PreferenceScreen;
-import android.text.TextUtils;
-import android.util.Log;
-
-import com.android.internal.logging.nano.MetricsProto;
-import com.android.settings.R;
-import com.android.settings.core.instrumentation.Instrumentable;
-import com.android.settings.core.instrumentation.MetricsFeatureProvider;
-import com.android.settings.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;
-import java.util.List;
-
-public class ProgressiveDisclosureMixin implements Preference.OnPreferenceClickListener,
-        LifecycleObserver, OnCreate, OnSaveInstanceState {
-
-    private static final String TAG = "ProgressiveDisclosure";
-    private static final String STATE_USER_EXPANDED = "state_user_expanded";
-    private static final int DEFAULT_TILE_LIMIT = 300;
-
-    private final Context mContext;
-    // Collapsed preference sorted by order.
-    private final List<Preference> mCollapsedPrefs = new ArrayList<>();
-    private final MetricsFeatureProvider mMetricsFeatureProvider;
-    private final PreferenceFragment mFragment;
-    private /* final */ ExpandPreference mExpandButton;
-
-    private int mTileLimit = DEFAULT_TILE_LIMIT;
-    private boolean mUserExpanded;
-
-    public ProgressiveDisclosureMixin(Context context,
-            PreferenceFragment fragment, boolean keepExpanded) {
-        mContext = context;
-        mFragment = fragment;
-        mExpandButton = new ExpandPreference(context);
-        mExpandButton.setOnPreferenceClickListener(this);
-        mMetricsFeatureProvider = FeatureFactory.getFactory(context).getMetricsFeatureProvider();
-        mUserExpanded = keepExpanded;
-    }
-
-    @Override
-    public void onCreate(Bundle savedInstanceState) {
-        if (savedInstanceState != null) {
-            mUserExpanded = savedInstanceState.getBoolean(STATE_USER_EXPANDED, false);
-        }
-    }
-
-    @Override
-    public void onSaveInstanceState(Bundle outState) {
-        outState.putBoolean(STATE_USER_EXPANDED, mUserExpanded);
-    }
-
-    @Override
-    public boolean onPreferenceClick(Preference preference) {
-        if (preference instanceof ExpandPreference) {
-            final PreferenceScreen screen = mFragment.getPreferenceScreen();
-            if (screen != null) {
-                screen.removePreference(preference);
-                for (Preference pref : mCollapsedPrefs) {
-                    screen.addPreference(pref);
-                }
-                mCollapsedPrefs.clear();
-                mUserExpanded = true;
-                final int metricsCategory;
-                if (mFragment instanceof Instrumentable) {
-                    metricsCategory = ((Instrumentable) mFragment).getMetricsCategory();
-                } else {
-                    metricsCategory = MetricsProto.MetricsEvent.VIEW_UNKNOWN;
-                }
-                mMetricsFeatureProvider.actionWithSource(mContext, metricsCategory,
-                        MetricsProto.MetricsEvent.ACTION_SETTINGS_ADVANCED_BUTTON_EXPAND);
-            }
-        }
-        return false;
-    }
-
-    /**
-     * Sets the threshold to start collapsing preferences when there are too many.
-     */
-    public void setTileLimit(int limit) {
-        mTileLimit = limit;
-    }
-
-    /**
-     * Whether the controller is in collapsed state.
-     */
-    public boolean isCollapsed() {
-        return !mCollapsedPrefs.isEmpty();
-    }
-
-    /**
-     * Whether the screen should be collapsed.
-     */
-    public boolean shouldCollapse(PreferenceScreen screen) {
-        return !mUserExpanded && screen.getPreferenceCount() > mTileLimit;
-    }
-
-    /**
-     * Collapse extra preferences and show a "More" button
-     */
-    public void collapse(PreferenceScreen screen) {
-        final int itemCount = screen.getPreferenceCount();
-        if (!shouldCollapse(screen)) {
-            return;
-        }
-        if (!mCollapsedPrefs.isEmpty()) {
-            Log.w(TAG, "collapsed list should ALWAYS BE EMPTY before collapsing!");
-        }
-
-        for (int i = itemCount - 1; i >= mTileLimit; i--) {
-            final Preference preference = screen.getPreference(i);
-            addToCollapsedList(preference);
-            screen.removePreference(preference);
-        }
-        screen.addPreference(mExpandButton);
-    }
-
-    /**
-     * Adds preference to screen. If there are too many preference on screen, adds it to
-     * collapsed list instead.
-     */
-    public void addPreference(PreferenceScreen screen, Preference pref) {
-        // Either add to screen, or to collapsed list.
-        if (isCollapsed()) {
-            // insert the preference to right position.
-            final int lastPreferenceIndex = screen.getPreferenceCount() - 2;
-            if (lastPreferenceIndex >= 0) {
-                final Preference lastPreference = screen.getPreference(lastPreferenceIndex);
-                if (lastPreference.getOrder() > pref.getOrder()) {
-                    // insert to screen and move the last pref to collapsed list.
-                    screen.removePreference(lastPreference);
-                    screen.addPreference(pref);
-                    addToCollapsedList(lastPreference);
-                } else {
-                    // Insert to collapsed list.
-                    addToCollapsedList(pref);
-                }
-            } else {
-                // Couldn't find last preference on screen, just add to collapsed list.
-                addToCollapsedList(pref);
-            }
-        } else if (shouldCollapse(screen)) {
-            // About to have too many tiles on scree, collapse and add pref to collapsed list.
-            screen.addPreference(pref);
-            collapse(screen);
-        } else {
-            // No need to collapse, add to screen directly.
-            screen.addPreference(pref);
-        }
-    }
-
-    /**
-     * Removes preference. If the preference is on screen, remove it from screen. If the
-     * preference is in collapsed list, remove it from list.
-     */
-    public void removePreference(PreferenceScreen screen, String key) {
-        // Try removing from screen.
-        final Preference preference = screen.findPreference(key);
-        if (preference != null) {
-            screen.removePreference(preference);
-            return;
-        }
-        // Didn't find on screen, try removing from collapsed list.
-        for (int i = 0; i < mCollapsedPrefs.size(); i++) {
-            final Preference pref = mCollapsedPrefs.get(i);
-            if (TextUtils.equals(key, pref.getKey())) {
-                mCollapsedPrefs.remove(pref);
-                if (mCollapsedPrefs.isEmpty()) {
-                    // Removed last element, remove expand button too.
-                    screen.removePreference(mExpandButton);
-                } else {
-                    updateExpandButtonSummary();
-                }
-                return;
-            }
-        }
-    }
-
-    /**
-     * Finds preference by key, either from screen or from collapsed list.
-     */
-    public Preference findPreference(PreferenceScreen screen, CharSequence key) {
-        Preference preference = screen.findPreference(key);
-        if (preference != null) {
-            return preference;
-        }
-        for (int i = 0; i < mCollapsedPrefs.size(); i++) {
-            final Preference pref = mCollapsedPrefs.get(i);
-            if (TextUtils.equals(key, pref.getKey())) {
-                return pref;
-            }
-            if (pref instanceof PreferenceGroup) {
-                final Preference returnedPreference = ((PreferenceGroup) pref).findPreference(key);
-                if (returnedPreference != null) {
-                    return returnedPreference;
-                }
-            }
-        }
-        Log.d(TAG, "Cannot find preference with key " + key);
-        return null;
-    }
-
-    /**
-     * Add preference to collapsed list.
-     */
-    @VisibleForTesting
-    void addToCollapsedList(Preference preference) {
-        // Insert preference based on it's order.
-        int insertionIndex = Collections.binarySearch(mCollapsedPrefs, preference);
-        if (insertionIndex < 0) {
-            insertionIndex = insertionIndex * -1 - 1;
-        }
-        mCollapsedPrefs.add(insertionIndex, preference);
-        updateExpandButtonSummary();
-    }
-
-    @VisibleForTesting
-    List<Preference> getCollapsedPrefs() {
-        return mCollapsedPrefs;
-    }
-
-    @VisibleForTesting
-    void updateExpandButtonSummary() {
-        final int size = mCollapsedPrefs.size();
-        if (size == 0) {
-            mExpandButton.setSummary(null);
-        } else if (size == 1) {
-            mExpandButton.setSummary(mCollapsedPrefs.get(0).getTitle());
-        } else {
-            CharSequence summary = mCollapsedPrefs.get(0).getTitle();
-            for (int i = 1; i < size; i++) {
-                final CharSequence nextSummary = mCollapsedPrefs.get(i).getTitle();
-                if (!TextUtils.isEmpty(nextSummary)) {
-                    summary = mContext.getString(R.string.join_many_items_middle, summary,
-                            nextSummary);
-                }
-            }
-            mExpandButton.setSummary(summary);
-        }
-    }
-}
diff --git a/src/com/android/settings/dashboard/SiteMapManager.java b/src/com/android/settings/dashboard/SiteMapManager.java
index 3144398..b54e061 100644
--- a/src/com/android/settings/dashboard/SiteMapManager.java
+++ b/src/com/android/settings/dashboard/SiteMapManager.java
@@ -16,11 +16,16 @@
 
 package com.android.settings.dashboard;
 
+import static android.provider.SearchIndexablesContract.SITE_MAP_COLUMNS;
+import static com.android.settings.dashboard.DashboardFragmentRegistry.CATEGORY_KEY_TO_PARENT_MAP;
+
 import android.content.Context;
 import android.database.Cursor;
 import android.database.sqlite.SQLiteDatabase;
+import android.provider.SearchIndexablesContract.SiteMapColumns;
 import android.support.annotation.VisibleForTesting;
 import android.support.annotation.WorkerThread;
+import android.support.v4.util.ArrayMap;
 import android.text.TextUtils;
 import android.util.Log;
 
@@ -28,17 +33,13 @@
 import com.android.settings.overlay.FeatureFactory;
 import com.android.settings.search.IndexDatabaseHelper;
 import com.android.settings.search.IndexDatabaseHelper.IndexColumns;
-import com.android.settings.search.IndexDatabaseHelper.SiteMapColumns;
 import com.android.settingslib.drawer.DashboardCategory;
 import com.android.settingslib.drawer.Tile;
 
 import java.util.ArrayList;
-import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
-import static com.android.settings.dashboard.DashboardFragmentRegistry.CATEGORY_KEY_TO_PARENT_MAP;
-
 /**
  * A manager class that maintains a "site map" and look up breadcrumb for a certain page on demand.
  * <p/>
@@ -49,14 +50,6 @@
     private static final String TAG = "SiteMapManager";
     private static final boolean DEBUG_TIMING = false;
 
-    @VisibleForTesting(otherwise = VisibleForTesting.PRIVATE)
-    public static final String[] SITE_MAP_COLUMNS = {
-            SiteMapColumns.PARENT_CLASS,
-            SiteMapColumns.PARENT_TITLE,
-            SiteMapColumns.CHILD_CLASS,
-            SiteMapColumns.CHILD_TITLE
-    };
-
     private static final String[] CLASS_TO_SCREEN_TITLE_COLUMNS = {
             IndexColumns.CLASS_NAME,
             IndexColumns.SCREEN_TITLE,
@@ -110,7 +103,7 @@
      * 2. IA: We know from {@link DashboardFeatureProvider} which page can be dynamically
      * injected to where.
      */
-    @VisibleForTesting(otherwise = VisibleForTesting.PRIVATE)
+    @VisibleForTesting
     @WorkerThread
     synchronized void init(Context context) {
         if (mInitialized) {
@@ -135,7 +128,7 @@
 
         // Then prepare a local map that contains class name -> screen title mapping. This is needed
         // to figure out the display name for any fragment if it's injected dynamically through IA.
-        final Map<String, String> classToTitleMap = new HashMap<>();
+        final Map<String, String> classToTitleMap = new ArrayMap<>();
         final Cursor titleQuery = db.query(IndexDatabaseHelper.Tables.TABLE_PREFS_INDEX,
                 CLASS_TO_SCREEN_TITLE_COLUMNS, null, null, null, null, null);
         while (titleQuery.moveToNext()) {
@@ -161,7 +154,7 @@
                 continue;
             }
             // Build parent-child mPairs for all children listed under this key.
-            for (Tile tile : category.tiles) {
+            for (Tile tile : category.getTiles()) {
                 final String childTitle = tile.title.toString();
                 String childClass = null;
                 if (tile.metaData != null) {
diff --git a/src/com/android/settings/dashboard/SummaryLoader.java b/src/com/android/settings/dashboard/SummaryLoader.java
index 4586a55..5af276c 100644
--- a/src/com/android/settings/dashboard/SummaryLoader.java
+++ b/src/com/android/settings/dashboard/SummaryLoader.java
@@ -35,6 +35,7 @@
 import com.android.settings.overlay.FeatureFactory;
 import com.android.settingslib.drawer.DashboardCategory;
 import com.android.settingslib.drawer.Tile;
+import com.android.settingslib.utils.ThreadUtils;
 
 import java.lang.reflect.Field;
 import java.util.List;
@@ -52,7 +53,6 @@
     private final String mCategoryKey;
 
     private final Worker mWorker;
-    private final Handler mHandler;
     private final HandlerThread mWorkerThread;
 
     private SummaryConsumer mSummaryConsumer;
@@ -60,44 +60,14 @@
     private boolean mWorkerListening;
     private ArraySet<BroadcastReceiver> mReceivers = new ArraySet<>();
 
-    public SummaryLoader(Activity activity, List<DashboardCategory> categories) {
-        mDashboardFeatureProvider = FeatureFactory.getFactory(activity)
-                .getDashboardFeatureProvider(activity);
-        mCategoryKey = null;
-        mHandler = new Handler();
-        mWorkerThread = new HandlerThread("SummaryLoader", Process.THREAD_PRIORITY_BACKGROUND);
-        mWorkerThread.start();
-        mWorker = new Worker(mWorkerThread.getLooper());
-        mActivity = activity;
-        for (int i = 0; i < categories.size(); i++) {
-            List<Tile> tiles = categories.get(i).tiles;
-            for (int j = 0; j < tiles.size(); j++) {
-                Tile tile = tiles.get(j);
-                mWorker.obtainMessage(Worker.MSG_GET_PROVIDER, tile).sendToTarget();
-            }
-        }
-    }
-
     public SummaryLoader(Activity activity, String categoryKey) {
         mDashboardFeatureProvider = FeatureFactory.getFactory(activity)
                 .getDashboardFeatureProvider(activity);
         mCategoryKey = categoryKey;
-        mHandler = new Handler();
         mWorkerThread = new HandlerThread("SummaryLoader", Process.THREAD_PRIORITY_BACKGROUND);
         mWorkerThread.start();
         mWorker = new Worker(mWorkerThread.getLooper());
         mActivity = activity;
-
-        final DashboardCategory category =
-                mDashboardFeatureProvider.getTilesForCategory(categoryKey);
-        if (category == null || category.tiles == null) {
-            return;
-        }
-
-        List<Tile> tiles = category.tiles;
-        for (Tile tile : tiles) {
-            mWorker.obtainMessage(Worker.MSG_GET_PROVIDER, tile).sendToTarget();
-        }
     }
 
     public void release() {
@@ -112,25 +82,22 @@
 
     public void setSummary(SummaryProvider provider, final CharSequence summary) {
         final ComponentName component = mSummaryProviderMap.get(provider);
-        mHandler.post(new Runnable() {
-            @Override
-            public void run() {
+        ThreadUtils.postOnMainThread(() -> {
 
-                final Tile tile = getTileFromCategory(
-                        mDashboardFeatureProvider.getTilesForCategory(mCategoryKey), component);
+            final Tile tile = getTileFromCategory(
+                    mDashboardFeatureProvider.getTilesForCategory(mCategoryKey), component);
 
-                if (tile == null) {
-                    if (DEBUG) {
-                        Log.d(TAG, "Can't find tile for " + component);
-                    }
-                    return;
-                }
+            if (tile == null) {
                 if (DEBUG) {
-                    Log.d(TAG, "setSummary " + tile.title + " - " + summary);
+                    Log.d(TAG, "Can't find tile for " + component);
                 }
-
-                updateSummaryIfNeeded(tile, summary);
+                return;
             }
+            if (DEBUG) {
+                Log.d(TAG, "setSummary " + tile.title + " - " + summary);
+            }
+
+            updateSummaryIfNeeded(tile, summary);
         });
     }
 
@@ -158,15 +125,32 @@
      * Only call from the main thread.
      */
     public void setListening(boolean listening) {
-        if (mListening == listening) return;
+        if (mListening == listening) {
+            return;
+        }
         mListening = listening;
         // Unregister listeners immediately.
         for (int i = 0; i < mReceivers.size(); i++) {
             mActivity.unregisterReceiver(mReceivers.valueAt(i));
         }
         mReceivers.clear();
+
         mWorker.removeMessages(Worker.MSG_SET_LISTENING);
-        mWorker.obtainMessage(Worker.MSG_SET_LISTENING, listening ? 1 : 0, 0).sendToTarget();
+        if (!listening) {
+            // Stop listen
+            mWorker.obtainMessage(Worker.MSG_SET_LISTENING, 0 /* listening */).sendToTarget();
+        } else {
+            // Start listen
+            if (mSummaryProviderMap.isEmpty()) {
+                // Category not initialized yet, init before starting to listen
+                if (!mWorker.hasMessages(Worker.MSG_GET_CATEGORY_TILES_AND_SET_LISTENING)) {
+                    mWorker.sendEmptyMessage(Worker.MSG_GET_CATEGORY_TILES_AND_SET_LISTENING);
+                }
+            } else {
+                // Category already initialized, start listening immediately
+                mWorker.obtainMessage(Worker.MSG_SET_LISTENING, 1 /* listening */).sendToTarget();
+            }
+        }
     }
 
     private SummaryProvider getSummaryProvider(Tile tile) {
@@ -232,7 +216,7 @@
         if (category == null) {
             return;
         }
-        for (Tile tile : category.tiles) {
+        for (Tile tile : category.getTiles()) {
             final String key = mDashboardFeatureProvider.getDashboardKeyForTile(tile);
             if (mSummaryTextMap.containsKey(key)) {
                 tile.summary = mSummaryTextMap.get(key);
@@ -241,9 +225,13 @@
     }
 
     private synchronized void setListeningW(boolean listening) {
-        if (mWorkerListening == listening) return;
+        if (mWorkerListening == listening) {
+            return;
+        }
         mWorkerListening = listening;
-        if (DEBUG) Log.d(TAG, "Listening " + listening);
+        if (DEBUG) {
+            Log.d(TAG, "Listening " + listening);
+        }
         for (SummaryProvider p : mSummaryProviderMap.keySet()) {
             try {
                 p.setListening(listening);
@@ -262,12 +250,13 @@
     }
 
     private Tile getTileFromCategory(DashboardCategory category, ComponentName component) {
-        if (category == null || category.tiles == null) {
+        if (category == null || category.getTilesCount() == 0) {
             return null;
         }
-        final int tileCount = category.tiles.size();
+        final List<Tile> tiles = category.getTiles();
+        final int tileCount = tiles.size();
         for (int j = 0; j < tileCount; j++) {
-            final Tile tile = category.tiles.get(j);
+            final Tile tile = tiles.get(j);
             if (component.equals(tile.intent.getComponent())) {
                 return tile;
             }
@@ -276,7 +265,6 @@
     }
 
 
-
     public interface SummaryProvider {
         void setListening(boolean listening);
     }
@@ -290,8 +278,9 @@
     }
 
     private class Worker extends Handler {
-        private static final int MSG_GET_PROVIDER = 1;
-        private static final int MSG_SET_LISTENING = 2;
+        private static final int MSG_GET_CATEGORY_TILES_AND_SET_LISTENING = 1;
+        private static final int MSG_GET_PROVIDER = 2;
+        private static final int MSG_SET_LISTENING = 3;
 
         public Worker(Looper looper) {
             super(looper);
@@ -300,6 +289,18 @@
         @Override
         public void handleMessage(Message msg) {
             switch (msg.what) {
+                case MSG_GET_CATEGORY_TILES_AND_SET_LISTENING:
+                    final DashboardCategory category =
+                            mDashboardFeatureProvider.getTilesForCategory(mCategoryKey);
+                    if (category == null || category.getTilesCount() == 0) {
+                        return;
+                    }
+                    final List<Tile> tiles = category.getTiles();
+                    for (Tile tile : tiles) {
+                        makeProviderW(tile);
+                    }
+                    setListeningW(true);
+                    break;
                 case MSG_GET_PROVIDER:
                     Tile tile = (Tile) msg.obj;
                     makeProviderW(tile);
diff --git a/src/com/android/settings/dashboard/SupportFragment.java b/src/com/android/settings/dashboard/SupportFragment.java
index 8a1a79b..fcc9f78 100644
--- a/src/com/android/settings/dashboard/SupportFragment.java
+++ b/src/com/android/settings/dashboard/SupportFragment.java
@@ -27,8 +27,6 @@
 import android.net.NetworkInfo;
 import android.net.NetworkRequest;
 import android.os.Bundle;
-import android.os.Handler;
-import android.os.Looper;
 import android.support.v7.widget.LinearLayoutManager;
 import android.support.v7.widget.RecyclerView;
 import android.view.LayoutInflater;
@@ -40,6 +38,7 @@
 import com.android.settings.core.InstrumentedFragment;
 import com.android.settings.overlay.FeatureFactory;
 import com.android.settings.overlay.SupportFeatureProvider;
+import com.android.settingslib.utils.ThreadUtils;
 
 /**
  * Fragment for support tab in SettingsGoogle.
@@ -47,7 +46,6 @@
 public final class SupportFragment extends InstrumentedFragment implements View.OnClickListener,
         OnAccountsUpdateListener {
 
-    private final Handler mHandler = new Handler(Looper.getMainLooper());
     private final ConnectivityManager.NetworkCallback mNetworkCallback =
             new ConnectivityManager.NetworkCallback() {
 
@@ -152,12 +150,9 @@
     }
 
     private void postConnectivityChanged() {
-        mHandler.post(new Runnable() {
-            @Override
-            public void run() {
-                if (mSupportItemAdapter != null) {
-                    mSupportItemAdapter.setHasInternet(hasInternet());
-                }
+        ThreadUtils.postOnMainThread(() -> {
+            if (mSupportItemAdapter != null) {
+                mSupportItemAdapter.setHasInternet(hasInternet());
             }
         });
     }
diff --git a/src/com/android/settings/dashboard/conditional/NightDisplayCondition.java b/src/com/android/settings/dashboard/conditional/NightDisplayCondition.java
index bfcab7f..4d885ae 100644
--- a/src/com/android/settings/dashboard/conditional/NightDisplayCondition.java
+++ b/src/com/android/settings/dashboard/conditional/NightDisplayCondition.java
@@ -18,20 +18,20 @@
 
 import android.graphics.drawable.Icon;
 
-import com.android.internal.app.NightDisplayController;
+import com.android.internal.app.ColorDisplayController;
 import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
 import com.android.settings.R;
 import com.android.settings.Utils;
 import com.android.settings.display.NightDisplaySettings;
 
 public final class NightDisplayCondition extends Condition
-        implements NightDisplayController.Callback {
+        implements ColorDisplayController.Callback {
 
-    private NightDisplayController mController;
+    private ColorDisplayController mController;
 
     NightDisplayCondition(ConditionManager manager) {
         super(manager);
-        mController = new NightDisplayController(manager.getContext());
+        mController = new ColorDisplayController(manager.getContext());
         mController.setListener(this);
     }
 
diff --git a/src/com/android/settings/dashboard/suggestions/SuggestionAdapter.java b/src/com/android/settings/dashboard/suggestions/SuggestionAdapter.java
index 9182945..293c95a 100644
--- a/src/com/android/settings/dashboard/suggestions/SuggestionAdapter.java
+++ b/src/com/android/settings/dashboard/suggestions/SuggestionAdapter.java
@@ -15,13 +15,16 @@
  */
 package com.android.settings.dashboard.suggestions;
 
+import android.app.PendingIntent;
 import android.content.Context;
+import android.service.settings.suggestions.Suggestion;
 import android.support.v7.widget.RecyclerView;
 import android.text.TextUtils;
-import android.util.Pair;
+import android.util.Log;
 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;
@@ -40,14 +43,20 @@
     private final Context mContext;
     private final MetricsFeatureProvider mMetricsFeatureProvider;
     private final SuggestionFeatureProvider mSuggestionFeatureProvider;
-    private List<Tile> mSuggestions;
+    @Deprecated // in favor of mSuggestionsV2
+    private final List<Tile> mSuggestions;
+    private final List<Suggestion> mSuggestionsV2;
     private final IconCache mCache;
     private final List<String> mSuggestionsShownLogged;
+    private final SuggestionControllerMixin mSuggestionControllerMixin;
 
-    public SuggestionAdapter(Context context, List<Tile> suggestions,
+    public SuggestionAdapter(Context context, SuggestionControllerMixin suggestionControllerMixin,
+            List<Tile> suggestions, List<Suggestion> suggestionsV2,
             List<String> suggestionsShownLogged) {
         mContext = context;
+        mSuggestionControllerMixin = suggestionControllerMixin;
         mSuggestions = suggestions;
+        mSuggestionsV2 = suggestionsV2;
         mSuggestionsShownLogged = suggestionsShownLogged;
         mCache = new IconCache(context);
         final FeatureFactory factory = FeatureFactory.getFactory(context);
@@ -65,6 +74,58 @@
 
     @Override
     public void onBindViewHolder(DashboardItemHolder holder, int position) {
+        if (mSuggestions != null) {
+            bindSuggestionTile(holder, position);
+        } else {
+            bindSuggestion(holder, position);
+        }
+    }
+
+    private void bindSuggestion(DashboardItemHolder holder, int position) {
+        final Suggestion suggestion = mSuggestionsV2.get(position);
+        final String id = suggestion.getId();
+        if (!mSuggestionsShownLogged.contains(id)) {
+            mMetricsFeatureProvider.action(
+                    mContext, MetricsEvent.ACTION_SHOW_SETTINGS_SUGGESTION, id);
+            mSuggestionsShownLogged.add(id);
+        }
+
+        holder.icon.setImageDrawable(mCache.getIcon(suggestion.getIcon()));
+        holder.title.setText(suggestion.getTitle());
+        final CharSequence summary = suggestion.getSummary();
+        if (!TextUtils.isEmpty(summary)) {
+            holder.summary.setText(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 < mSuggestionsV2.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;
+        }
+        clickHandler.setOnClickListener(v -> {
+            mMetricsFeatureProvider.action(mContext, MetricsEvent.ACTION_SETTINGS_SUGGESTION, id);
+            try {
+                suggestion.getPendingIntent().send();
+                mSuggestionControllerMixin.launchSuggestion(suggestion);
+            } catch (PendingIntent.CanceledException e) {
+                Log.w(TAG, "Failed to start suggestion " + suggestion.getTitle());
+            }
+        });
+    }
+
+    /**
+     * @deprecated in favor {@link #bindSuggestion(DashboardItemHolder, int)}.
+     */
+    @Deprecated
+    private void bindSuggestionTile(DashboardItemHolder holder, int position) {
         final Tile suggestion = (Tile) mSuggestions.get(position);
         final String suggestionId = mSuggestionFeatureProvider.getSuggestionIdentifier(
                 mContext, suggestion);
@@ -72,7 +133,7 @@
         if (!mSuggestionsShownLogged.contains(suggestionId)) {
             mMetricsFeatureProvider.action(
                     mContext, MetricsEvent.ACTION_SHOW_SETTINGS_SUGGESTION, suggestionId,
-                    getSuggestionTaggedData());
+                    mSuggestionFeatureProvider.getLoggingTaggedData(mContext));
             mSuggestionsShownLogged.add(suggestionId);
         }
         if (suggestion.remoteViews != null) {
@@ -104,31 +165,52 @@
         clickHandler.setOnClickListener(v -> {
             mMetricsFeatureProvider.action(mContext,
                     MetricsEvent.ACTION_SETTINGS_SUGGESTION, suggestionId,
-                    getSuggestionTaggedData());
+                    mSuggestionFeatureProvider.getLoggingTaggedData(mContext));
             ((SettingsActivity) mContext).startSuggestion(suggestion.intent);
         });
     }
 
     @Override
     public long getItemId(int position) {
-        return Objects.hash(mSuggestions.get(position).title);
+        if (mSuggestions != null) {
+            return Objects.hash(mSuggestions.get(position).title);
+        } else {
+            return Objects.hash(mSuggestionsV2.get(position).getId());
+        }
     }
 
     @Override
     public int getItemViewType(int position) {
-        Tile suggestion = getSuggestion(position);
-        return suggestion.remoteViews != null
-                ? R.layout.suggestion_tile_remote_container
-                : R.layout.suggestion_tile;
+        if (mSuggestions != null) {
+            Tile suggestion = getSuggestion(position);
+
+            return suggestion.remoteViews != null
+                    ? R.layout.suggestion_tile_remote_container
+                    : R.layout.suggestion_tile;
+        } else {
+            final Suggestion suggestion = getSuggestionsV2(position);
+            if ((suggestion.getFlags() & Suggestion.FLAG_HAS_BUTTON) != 0) {
+                return R.layout.suggestion_tile_with_button;
+            } else {
+                return R.layout.suggestion_tile;
+            }
+        }
     }
 
     @Override
     public int getItemCount() {
-        return mSuggestions.size();
+        if (mSuggestions != null) {
+            return mSuggestions.size();
+        } else {
+            return mSuggestionsV2.size();
+        }
     }
 
     public Tile getSuggestion(int position) {
         final long itemId = getItemId(position);
+        if (mSuggestions == null) {
+            return null;
+        }
         for (Tile tile : mSuggestions) {
             if (Objects.hash(tile.title) == itemId) {
                 return tile;
@@ -137,14 +219,26 @@
         return null;
     }
 
+    public Suggestion getSuggestionsV2(int position) {
+        final long itemId = getItemId(position);
+        if (mSuggestionsV2 == null) {
+            return null;
+        }
+        for (Suggestion suggestion : mSuggestionsV2) {
+            if (Objects.hash(suggestion.getId()) == itemId) {
+                return suggestion;
+            }
+        }
+        return null;
+    }
+
     public void removeSuggestion(Tile suggestion) {
         mSuggestions.remove(suggestion);
         notifyDataSetChanged();
     }
 
-    private Pair<Integer, Object>[] getSuggestionTaggedData() {
-        return SuggestionLogHelper.getSuggestionTaggedData(
-                mSuggestionFeatureProvider.isSmartSuggestionEnabled(mContext));
+    public void removeSuggestion(Suggestion suggestion) {
+        mSuggestionsV2.remove(suggestion);
+        notifyDataSetChanged();
     }
-
 }
diff --git a/src/com/android/settings/dashboard/suggestions/SuggestionController.java b/src/com/android/settings/dashboard/suggestions/SuggestionController.java
new file mode 100644
index 0000000..ef57d83
--- /dev/null
+++ b/src/com/android/settings/dashboard/suggestions/SuggestionController.java
@@ -0,0 +1,171 @@
+/*
+ * Copyright (C) 2017 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.dashboard.suggestions;
+
+import android.content.ComponentName;
+import android.content.Context;
+import android.content.Intent;
+import android.content.ServiceConnection;
+import android.os.IBinder;
+import android.os.RemoteException;
+import android.service.settings.suggestions.ISuggestionService;
+import android.service.settings.suggestions.Suggestion;
+import android.support.annotation.Nullable;
+import android.support.annotation.WorkerThread;
+import android.util.Log;
+
+import java.util.List;
+
+/**
+ * A controller class to access suggestion data.
+ */
+public class SuggestionController {
+
+    /**
+     * Callback interface when service is connected/disconnected.
+     */
+    public interface ServiceConnectionListener {
+        /**
+         * Called when service is connected.
+         */
+        void onServiceConnected();
+
+        /**
+         * Called when service is disconnected.
+         */
+        void onServiceDisconnected();
+    }
+
+    private static final String TAG = "SuggestionController";
+    private static final boolean DEBUG = false;
+
+    private final Context mContext;
+    private final Intent mServiceIntent;
+
+    private ServiceConnection mServiceConnection;
+    private ISuggestionService mRemoteService;
+    private ServiceConnectionListener mConnectionListener;
+
+    /**
+     * Create a new controller instance.
+     *
+     * @param context  caller context
+     * @param service  The component name for service.
+     * @param listener listener to receive service connected/disconnected event.
+     */
+    public SuggestionController(Context context, ComponentName service,
+            ServiceConnectionListener listener) {
+        mContext = context.getApplicationContext();
+        mConnectionListener = listener;
+        mServiceIntent = new Intent().setComponent(service);
+        mServiceConnection = createServiceConnection();
+    }
+
+    /**
+     * Start the controller.
+     */
+    public void start() {
+        mContext.bindServiceAsUser(mServiceIntent, mServiceConnection, Context.BIND_AUTO_CREATE,
+                android.os.Process.myUserHandle());
+    }
+
+    /**
+     * Stop the controller.
+     */
+    public void stop() {
+        if (mRemoteService != null) {
+            mRemoteService = null;
+            mContext.unbindService(mServiceConnection);
+        }
+    }
+
+    /**
+     * Get setting suggestions.
+     */
+    @Nullable
+    @WorkerThread
+    public List<Suggestion> getSuggestions() {
+        if (!isReady()) {
+            return null;
+        }
+        try {
+            return mRemoteService.getSuggestions();
+        } catch (RemoteException e) {
+            Log.w(TAG, "Error when calling getSuggestion()", e);
+            return null;
+        }
+    }
+
+    public void dismissSuggestions(Suggestion suggestion) {
+        if (!isReady()) {
+            Log.w(TAG, "SuggestionController not ready, cannot dismiss " + suggestion.getId());
+            return;
+        }
+        try {
+            mRemoteService.dismissSuggestion(suggestion);
+        } catch (RemoteException e) {
+            Log.w(TAG, "Error when calling dismissSuggestion()", e);
+        }
+    }
+
+    public void launchSuggestion(Suggestion suggestion) {
+        if (!isReady()) {
+            Log.w(TAG, "SuggestionController not ready, cannot launch " + suggestion.getId());
+            return;
+        }
+
+        try {
+            mRemoteService.launchSuggestion(suggestion);
+        } catch (RemoteException e) {
+            Log.w(TAG, "Error when calling launchSuggestion()", e);
+        }
+    }
+
+    /**
+     * Whether or not the manager is ready
+     */
+    private boolean isReady() {
+        return mRemoteService != null;
+    }
+
+    /**
+     * Create a new {@link ServiceConnection} object to handle service connect/disconnect event.
+     */
+    private ServiceConnection createServiceConnection() {
+        return new ServiceConnection() {
+
+            @Override
+            public void onServiceConnected(ComponentName name, IBinder service) {
+                if (DEBUG) {
+                    Log.d(TAG, "Service is connected");
+                }
+                mRemoteService = ISuggestionService.Stub.asInterface(service);
+                if (mConnectionListener != null) {
+                    mConnectionListener.onServiceConnected();
+                }
+            }
+
+            @Override
+            public void onServiceDisconnected(ComponentName name) {
+                if (mConnectionListener != null) {
+                    mRemoteService = null;
+                    mConnectionListener.onServiceDisconnected();
+                }
+            }
+        };
+    }
+}
diff --git a/src/com/android/settings/dashboard/suggestions/SuggestionControllerMixin.java b/src/com/android/settings/dashboard/suggestions/SuggestionControllerMixin.java
new file mode 100644
index 0000000..71bf107
--- /dev/null
+++ b/src/com/android/settings/dashboard/suggestions/SuggestionControllerMixin.java
@@ -0,0 +1,131 @@
+/*
+ * Copyright (C) 2017 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.dashboard.suggestions;
+
+import android.app.LoaderManager;
+import android.content.Context;
+import android.content.Loader;
+import android.os.Bundle;
+import android.service.settings.suggestions.Suggestion;
+import android.support.annotation.Nullable;
+import android.util.Log;
+
+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.OnStart;
+import com.android.settingslib.core.lifecycle.events.OnStop;
+
+import java.util.List;
+
+/**
+ * Manages IPC communication to SettingsIntelligence for suggestion related services.
+ */
+public class SuggestionControllerMixin implements SuggestionController.ServiceConnectionListener,
+        LifecycleObserver, OnStart, OnStop, LoaderManager.LoaderCallbacks<List<Suggestion>> {
+
+    public interface SuggestionControllerHost {
+        /**
+         * Called when suggestion data fetching is ready.
+         */
+        void onSuggestionReady(List<Suggestion> data);
+
+        /**
+         * Returns {@link LoaderManager} associated with the host. If host is not attached to
+         * activity then return null.
+         */
+        @Nullable
+        LoaderManager getLoaderManager();
+    }
+
+    private static final String TAG = "SuggestionCtrlMixin";
+    private static final boolean DEBUG = false;
+
+    private final Context mContext;
+    private final SuggestionController mSuggestionController;
+    private final SuggestionControllerHost mHost;
+
+    public SuggestionControllerMixin(Context context, SuggestionControllerHost host,
+            Lifecycle lifecycle) {
+        mContext = context.getApplicationContext();
+        mHost = host;
+        mSuggestionController = new SuggestionController(mContext,
+                FeatureFactory.getFactory(mContext)
+                        .getSuggestionFeatureProvider(mContext)
+                        .getSuggestionServiceComponent(),
+                this /* serviceConnectionListener */);
+        if (lifecycle != null) {
+            lifecycle.addObserver(this);
+        }
+    }
+
+    @Override
+    public void onStart() {
+        mSuggestionController.start();
+    }
+
+    @Override
+    public void onStop() {
+        mSuggestionController.stop();
+    }
+
+    @Override
+    public void onServiceConnected() {
+        final LoaderManager loaderManager = mHost.getLoaderManager();
+        if (loaderManager != null) {
+            loaderManager.restartLoader(SuggestionLoader.LOADER_ID_SUGGESTIONS,
+                    null /* args */, this /* callback */);
+        }
+    }
+
+    @Override
+    public void onServiceDisconnected() {
+        if (DEBUG) {
+            Log.d(TAG, "SuggestionService disconnected");
+        }
+        final LoaderManager loaderManager = mHost.getLoaderManager();
+        if (loaderManager != null) {
+            loaderManager.destroyLoader(SuggestionLoader.LOADER_ID_SUGGESTIONS);
+        }
+    }
+
+    @Override
+    public Loader<List<Suggestion>> onCreateLoader(int id, Bundle args) {
+        if (id == SuggestionLoader.LOADER_ID_SUGGESTIONS) {
+            return new SuggestionLoader(mContext, mSuggestionController);
+        }
+        throw new IllegalArgumentException("This loader id is not supported " + id);
+    }
+
+    @Override
+    public void onLoadFinished(Loader<List<Suggestion>> loader, List<Suggestion> data) {
+        mHost.onSuggestionReady(data);
+    }
+
+    @Override
+    public void onLoaderReset(Loader<List<Suggestion>> loader) {
+
+    }
+
+    public void dismissSuggestion(Suggestion suggestion) {
+        mSuggestionController.dismissSuggestions(suggestion);
+    }
+
+    public void launchSuggestion(Suggestion suggestion) {
+        mSuggestionController.launchSuggestion(suggestion);
+    }
+}
diff --git a/src/com/android/settings/dashboard/suggestions/SuggestionDismissController.java b/src/com/android/settings/dashboard/suggestions/SuggestionDismissController.java
index 100c955..f269f69 100644
--- a/src/com/android/settings/dashboard/suggestions/SuggestionDismissController.java
+++ b/src/com/android/settings/dashboard/suggestions/SuggestionDismissController.java
@@ -17,6 +17,7 @@
 package com.android.settings.dashboard.suggestions;
 
 import android.content.Context;
+import android.service.settings.suggestions.Suggestion;
 import android.support.v7.widget.RecyclerView;
 import android.support.v7.widget.helper.ItemTouchHelper;
 
@@ -30,24 +31,45 @@
     public interface Callback {
 
         /**
+         * @deprecated in favor of {@link #getSuggestionAt(int)}
          * Returns suggestion tile data from the callback
          */
+        @Deprecated
         Tile getSuggestionForPosition(int position);
 
         /**
+         * @deprecated in favor of {@link #onSuggestionDismissed(Suggestion)}
+         * Called when a suggestion is dismissed.
+         */
+        @Deprecated
+        void onSuggestionDismissed(Tile suggestion);
+
+        /**
+         * Returns suggestion tile data from the callback
+         */
+        Suggestion getSuggestionAt(int position);
+
+        /**
          * Called when a suggestion is dismissed.
          */
-        void onSuggestionDismissed(Tile suggestion);
+        void onSuggestionDismissed(Suggestion suggestion);
     }
 
     private final Context mContext;
     private final SuggestionFeatureProvider mSuggestionFeatureProvider;
+    private final SuggestionControllerMixin mSuggestionMixin;
+
+    /**
+     * @deprecated in favor of the new Suggestion backend.
+     */
+    @Deprecated
     private final SuggestionParser mSuggestionParser;
     private final Callback mCallback;
 
     public SuggestionDismissController(Context context, RecyclerView recyclerView,
-            SuggestionParser parser, Callback callback) {
+            SuggestionControllerMixin suggestionMixin, SuggestionParser parser, Callback callback) {
         super(0, ItemTouchHelper.START | ItemTouchHelper.END);
+        mSuggestionMixin = suggestionMixin;
         mContext = context;
         mSuggestionParser = parser;
         mSuggestionFeatureProvider = FeatureFactory.getFactory(context)
@@ -67,7 +89,7 @@
     public int getSwipeDirs(RecyclerView recyclerView, RecyclerView.ViewHolder viewHolder) {
         final int layoutId = viewHolder.getItemViewType();
         if (layoutId == R.layout.suggestion_tile
-                || layoutId == R.layout.suggestion_tile_remote_container) {
+                || layoutId == R.layout.suggestion_tile_with_button) {
             // Only return swipe direction for suggestion tiles. All other types are not swipeable.
             return super.getSwipeDirs(recyclerView, viewHolder);
         }
@@ -79,8 +101,15 @@
         if (mCallback == null) {
             return;
         }
-        final Tile suggestion = mCallback.getSuggestionForPosition(viewHolder.getAdapterPosition());
-        mSuggestionFeatureProvider.dismissSuggestion(mContext, mSuggestionParser, suggestion);
-        mCallback.onSuggestionDismissed(suggestion);
+        final int position = viewHolder.getAdapterPosition();
+        final Suggestion suggestionV2 = mCallback.getSuggestionAt(position);
+        if (suggestionV2 != null) {
+            mSuggestionFeatureProvider.dismissSuggestion(mContext, mSuggestionMixin, suggestionV2);
+            mCallback.onSuggestionDismissed(suggestionV2);
+        } else {
+            final Tile suggestion = mCallback.getSuggestionForPosition(position);
+            mSuggestionFeatureProvider.dismissSuggestion(mContext, mSuggestionParser, suggestion);
+            mCallback.onSuggestionDismissed(suggestion);
+        }
     }
 }
diff --git a/src/com/android/settings/dashboard/suggestions/SuggestionFeatureProvider.java b/src/com/android/settings/dashboard/suggestions/SuggestionFeatureProvider.java
index d19a778..f911401 100644
--- a/src/com/android/settings/dashboard/suggestions/SuggestionFeatureProvider.java
+++ b/src/com/android/settings/dashboard/suggestions/SuggestionFeatureProvider.java
@@ -19,7 +19,9 @@
 import android.content.ComponentName;
 import android.content.Context;
 import android.content.SharedPreferences;
+import android.service.settings.suggestions.Suggestion;
 import android.support.annotation.NonNull;
+import android.util.Pair;
 
 import com.android.settingslib.drawer.Tile;
 import com.android.settingslib.suggestions.SuggestionParser;
@@ -31,16 +33,29 @@
 
     /**
      * Whether or not the whole suggestion feature is enabled.
+     *
+     * @deprecated in favor of {@link #isSuggestionV2Enabled(Context)}
      */
+    @Deprecated
     boolean isSuggestionEnabled(Context context);
 
     /**
+     * Whether or not the suggestion v2 feature is enabled.
+     */
+    boolean isSuggestionV2Enabled(Context context);
+
+    /**
+     * Returns the component name for SuggestionService.
+     */
+    ComponentName getSuggestionServiceComponent();
+
+    /**
      * Returns true if smart suggestion should be used instead of xml based SuggestionParser.
      */
     boolean isSmartSuggestionEnabled(Context context);
 
     /** Return true if the suggestion has already been completed and does not need to be shown */
-    boolean isSuggestionCompleted(Context context, @NonNull ComponentName suggestion);
+    boolean isSuggestionComplete(Context context, @NonNull ComponentName suggestion);
 
     /**
      * Returns the {@link SharedPreferences} that holds metadata for suggestions.
@@ -52,7 +67,9 @@
      *
      * @param suggestions   List of suggestion Tiles
      * @param suggestionIds List of suggestion ids corresponding to the suggestion tiles.
+     * @deprecated in favor of SettingsIntelligence
      */
+    @Deprecated
     void rankSuggestions(final List<Tile> suggestions, List<String> suggestionIds);
 
     /**
@@ -62,11 +79,29 @@
 
     /**
      * Dismisses a suggestion.
+     *
+     * @deprecated in favor of {@link #dismissSuggestion(Context, SuggestionControllerMixin,
+     * Suggestion)}
      */
+    @Deprecated
     void dismissSuggestion(Context context, SuggestionParser parser, Tile suggestion);
 
     /**
-     * Returns an identifier for the suggestion
+     * Dismisses a suggestion.
      */
+    void dismissSuggestion(Context context, SuggestionControllerMixin suggestionMixin,
+            Suggestion suggestion);
+
+    /**
+     * Returns an identifier for the suggestion
+     *
+     * @deprecated in favor or {@link Suggestion#getId()}
+     */
+    @Deprecated
     String getSuggestionIdentifier(Context context, Tile suggestion);
+
+    /**
+     * Returns common tagged data for suggestion logging.
+     */
+    Pair<Integer, Object>[] getLoggingTaggedData(Context context);
 }
diff --git a/src/com/android/settings/dashboard/suggestions/SuggestionFeatureProviderImpl.java b/src/com/android/settings/dashboard/suggestions/SuggestionFeatureProviderImpl.java
index 347e165..4f4753a 100644
--- a/src/com/android/settings/dashboard/suggestions/SuggestionFeatureProviderImpl.java
+++ b/src/com/android/settings/dashboard/suggestions/SuggestionFeatureProviderImpl.java
@@ -16,6 +16,8 @@
 
 package com.android.settings.dashboard.suggestions;
 
+import static com.android.settings.core.FeatureFlags.SUGGESTIONS_V2;
+
 import android.app.ActivityManager;
 import android.content.ComponentName;
 import android.content.ContentResolver;
@@ -23,11 +25,14 @@
 import android.content.SharedPreferences;
 import android.content.pm.PackageManager;
 import android.provider.Settings.Secure;
+import android.service.settings.suggestions.Suggestion;
 import android.support.annotation.NonNull;
 import android.support.annotation.VisibleForTesting;
+import android.util.FeatureFlagUtils;
 import android.util.Log;
 import android.util.Pair;
 
+import com.android.internal.logging.nano.MetricsProto;
 import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
 import com.android.settings.Settings.AmbientDisplayPickupSuggestionActivity;
 import com.android.settings.Settings.AmbientDisplaySuggestionActivity;
@@ -36,17 +41,21 @@
 import com.android.settings.Settings.NightDisplaySuggestionActivity;
 import com.android.settings.Settings.SwipeToNotificationSuggestionActivity;
 import com.android.settings.core.instrumentation.MetricsFeatureProvider;
+import com.android.settings.fingerprint.FingerprintEnrollSuggestionActivity;
+import com.android.settings.fingerprint.FingerprintSuggestionActivity;
 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.settings.password.ScreenLockSuggestionActivity;
 import com.android.settings.support.NewDeviceIntroSuggestionActivity;
+import com.android.settings.wallpaper.WallpaperSuggestionActivity;
+import com.android.settings.wifi.WifiCallingSuggestionActivity;
 import com.android.settingslib.drawer.Tile;
 import com.android.settingslib.suggestions.SuggestionParser;
 
-import java.util.ArrayList;
 import java.util.List;
 
 public class SuggestionFeatureProviderImpl implements SuggestionFeatureProvider {
@@ -63,7 +72,27 @@
     public boolean isSuggestionEnabled(Context context) {
         final ActivityManager am =
                 (ActivityManager) context.getSystemService(Context.ACTIVITY_SERVICE);
-        return !am.isLowRamDevice();
+        boolean isLowRamDevice = am.isLowRamDevice();
+        return !isLowRamDevice && !isV2Enabled(context);
+    }
+
+    @Override
+    public boolean isSuggestionV2Enabled(Context context) {
+        final ActivityManager am =
+                (ActivityManager) context.getSystemService(Context.ACTIVITY_SERVICE);
+        boolean isLowRamDevice = am.isLowRamDevice();
+        return !isLowRamDevice && isV2Enabled(context);
+    }
+
+    @Override
+    public ComponentName getSuggestionServiceComponent() {
+        return new ComponentName(
+                "com.android.settings.intelligence",
+                "com.android.settings.intelligence.suggestions.SuggestionService");
+    }
+
+    private static boolean isV2Enabled(Context context) {
+        return FeatureFlagUtils.isEnabled(context, SUGGESTIONS_V2) || true;
     }
 
     @Override
@@ -72,12 +101,21 @@
     }
 
     @Override
-    public boolean isSuggestionCompleted(Context context, @NonNull ComponentName component) {
+    public boolean isSuggestionComplete(Context context, @NonNull ComponentName component) {
         final String className = component.getClassName();
-        if (className.equals(NightDisplaySuggestionActivity.class.getName())) {
+        if (className.equals(WallpaperSuggestionActivity.class.getName())) {
+            return WallpaperSuggestionActivity.isSuggestionComplete(context);
+        } else if (className.equals(FingerprintSuggestionActivity.class.getName())) {
+            return FingerprintSuggestionActivity.isSuggestionComplete(context);
+        } else if (className.equals(FingerprintEnrollSuggestionActivity.class.getName())) {
+            return FingerprintEnrollSuggestionActivity.isSuggestionComplete(context);
+        } else if (className.equals(ScreenLockSuggestionActivity.class.getName())) {
+            return ScreenLockSuggestionActivity.isSuggestionComplete(context);
+        } else if (className.equals(WifiCallingSuggestionActivity.class.getName())) {
+            return WifiCallingSuggestionActivity.isSuggestionComplete(context);
+        } else if (className.equals(NightDisplaySuggestionActivity.class.getName())) {
             return hasUsedNightDisplay(context);
-        }
-        if (className.equals(NewDeviceIntroSuggestionActivity.class.getName())) {
+        } else if (className.equals(NewDeviceIntroSuggestionActivity.class.getName())) {
             return NewDeviceIntroSuggestionActivity.isSuggestionComplete(context);
         } else if (className.equals(DoubleTapPowerSuggestionActivity.class.getName())) {
             return DoubleTapPowerPreferenceController
@@ -132,8 +170,7 @@
         if (parser == null || suggestion == null || context == null) {
             return;
         }
-        final Pair<Integer, Object>[] taggedData =
-                SuggestionLogHelper.getSuggestionTaggedData(isSmartSuggestionEnabled(context));
+        final Pair<Integer, Object>[] taggedData = getLoggingTaggedData(context);
 
         mMetricsFeatureProvider.action(
                 context, MetricsEvent.ACTION_SETTINGS_DISMISS_SUGGESTION,
@@ -149,6 +186,18 @@
     }
 
     @Override
+    public void dismissSuggestion(Context context, SuggestionControllerMixin mixin,
+            Suggestion suggestion) {
+        if (mixin == null || suggestion == null || context == null) {
+            return;
+        }
+        mMetricsFeatureProvider.action(
+                context, MetricsProto.MetricsEvent.ACTION_SETTINGS_DISMISS_SUGGESTION,
+                suggestion.getId());
+        mixin.dismissSuggestion(suggestion);
+    }
+
+    @Override
     public String getSuggestionIdentifier(Context context, Tile suggestion) {
         if (suggestion.intent == null || suggestion.intent.getComponent() == null
                 || context == null) {
@@ -163,6 +212,14 @@
         return packageName;
     }
 
+    @Override
+    public Pair<Integer, Object>[] getLoggingTaggedData(Context context) {
+        final boolean isSmartSuggestionEnabled = isSmartSuggestionEnabled(context);
+        return new Pair[]{Pair.create(
+                MetricsEvent.FIELD_SETTINGS_SMART_SUGGESTIONS_ENABLED,
+                isSmartSuggestionEnabled ? 1 : 0)};
+    }
+
     @VisibleForTesting
     boolean hasUsedNightDisplay(Context context) {
         final ContentResolver cr = context.getContentResolver();
diff --git a/src/com/android/settings/dashboard/suggestions/SuggestionLoader.java b/src/com/android/settings/dashboard/suggestions/SuggestionLoader.java
new file mode 100644
index 0000000..b9d51ce
--- /dev/null
+++ b/src/com/android/settings/dashboard/suggestions/SuggestionLoader.java
@@ -0,0 +1,54 @@
+/*
+ * Copyright (C) 2017 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF 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.service.settings.suggestions.Suggestion;
+import android.util.Log;
+
+import com.android.settings.utils.AsyncLoader;
+
+import java.util.List;
+
+public class SuggestionLoader extends AsyncLoader<List<Suggestion>> {
+
+    public static final int LOADER_ID_SUGGESTIONS = 42;
+    private static final String TAG = "SuggestionLoader";
+
+    private final SuggestionController mSuggestionController;
+
+    public SuggestionLoader(Context context, SuggestionController controller) {
+        super(context);
+        mSuggestionController = controller;
+    }
+
+    @Override
+    protected void onDiscardResult(List<Suggestion> result) {
+
+    }
+
+    @Override
+    public List<Suggestion> loadInBackground() {
+        final List<Suggestion> data = mSuggestionController.getSuggestions();
+        if (data == null) {
+            Log.d(TAG, "data is null");
+        } else {
+            Log.d(TAG, "data size " + data.size());
+        }
+        return data;
+    }
+}
diff --git a/src/com/android/settings/dashboard/suggestions/SuggestionLogHelper.java b/src/com/android/settings/dashboard/suggestions/SuggestionLogHelper.java
deleted file mode 100644
index 339392f..0000000
--- a/src/com/android/settings/dashboard/suggestions/SuggestionLogHelper.java
+++ /dev/null
@@ -1,29 +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.dashboard.suggestions;
-
-import android.util.Pair;
-
-import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
-
-public class SuggestionLogHelper {
-
-    public static Pair<Integer, Object>[] getSuggestionTaggedData(boolean enabled) {
-        return new Pair[]{
-                Pair.create(
-                        MetricsEvent.FIELD_SETTINGS_SMART_SUGGESTIONS_ENABLED, enabled ? 1 : 0)};
-    }
-}
diff --git a/src/com/android/settings/dashboard/suggestions/SuggestionStateProvider.java b/src/com/android/settings/dashboard/suggestions/SuggestionStateProvider.java
new file mode 100644
index 0000000..86011ec
--- /dev/null
+++ b/src/com/android/settings/dashboard/suggestions/SuggestionStateProvider.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.dashboard.suggestions;
+
+import static android.content.Intent.EXTRA_COMPONENT_NAME;
+
+import android.content.ComponentName;
+import android.content.ContentProvider;
+import android.content.ContentValues;
+import android.content.Context;
+import android.database.Cursor;
+import android.net.Uri;
+import android.os.Bundle;
+import android.support.annotation.VisibleForTesting;
+import android.util.Log;
+
+import com.android.settings.overlay.FeatureFactory;
+
+public class SuggestionStateProvider extends ContentProvider {
+
+    private static final String TAG = "SugstStatusProvider";
+
+    @VisibleForTesting
+    static final String METHOD_GET_SUGGESTION_STATE = "getSuggestionState";
+    @VisibleForTesting
+    static final String EXTRA_CANDIDATE_ID = "candidate_id";
+    private static final String RESULT_IS_COMPLETE = "candidate_is_complete";
+
+    @Override
+    public boolean onCreate() {
+        return true;
+    }
+
+    @Override
+    public Cursor query(Uri uri, String[] projection, String selection, String[] selectionArgs,
+            String sortOrder) {
+        throw new UnsupportedOperationException("query operation not supported currently.");
+    }
+
+    @Override
+    public String getType(Uri uri) {
+        throw new UnsupportedOperationException("getType operation not supported currently.");
+    }
+
+    @Override
+    public Uri insert(Uri uri, ContentValues values) {
+        throw new UnsupportedOperationException("insert operation not supported currently.");
+    }
+
+    @Override
+    public int delete(Uri uri, String selection, String[] selectionArgs) {
+        throw new UnsupportedOperationException("delete operation not supported currently.");
+    }
+
+    @Override
+    public int update(Uri uri, ContentValues values, String selection, String[] selectionArgs) {
+        throw new UnsupportedOperationException("update operation not supported currently.");
+    }
+
+    @Override
+    public Bundle call(String method, String arg, Bundle extras) {
+        final Bundle bundle = new Bundle();
+        if (METHOD_GET_SUGGESTION_STATE.equals(method)) {
+            final String id = extras.getString(EXTRA_CANDIDATE_ID);
+            final ComponentName cn = extras.getParcelable(EXTRA_COMPONENT_NAME);
+            final boolean isComplete;
+            if (cn == null) {
+                isComplete = true;
+            } else {
+                final Context context = getContext();
+                isComplete = FeatureFactory.getFactory(context)
+                        .getSuggestionFeatureProvider(context)
+                        .isSuggestionComplete(context, cn);
+            }
+            Log.d(TAG, "Suggestion " + id + " complete: " + isComplete);
+            bundle.putBoolean(RESULT_IS_COMPLETE, isComplete);
+        }
+        return bundle;
+    }
+}
diff --git a/src/com/android/settings/dashboard/suggestions/SuggestionsChecks.java b/src/com/android/settings/dashboard/suggestions/SuggestionsChecks.java
deleted file mode 100644
index 4bed89b..0000000
--- a/src/com/android/settings/dashboard/suggestions/SuggestionsChecks.java
+++ /dev/null
@@ -1,110 +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.dashboard.suggestions;
-
-import android.app.KeyguardManager;
-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.ScreenLockSuggestionActivity;
-import com.android.settings.Settings.WifiCallingSuggestionActivity;
-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;
-
-/**
- * The Home of all stupidly dynamic Settings Suggestions checks.
- */
-public class SuggestionsChecks {
-
-    private static final String TAG = "SuggestionsChecks";
-    private final Context mContext;
-
-    private final WallpaperManagerWrapper mWallpaperManager;
-
-    public SuggestionsChecks(Context context) {
-        mContext = context.getApplicationContext();
-        mWallpaperManager = new WallpaperManagerWrapper(mContext);
-    }
-
-    public boolean isSuggestionComplete(Tile suggestion) {
-        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 !Utils.hasFingerprintHardware(mContext) || !isFingerprintEnabled()
-                    || isNotSingleFingerprintEnrolled();
-        } else if (className.equals(ScreenLockSuggestionActivity.class.getName())) {
-            return isDeviceSecured();
-        } else if (className.equals(FingerprintEnrollSuggestionActivity.class.getName())) {
-            final FingerprintManager manager = Utils.getFingerprintManagerOrNull(mContext);
-            if (manager == null || !isFingerprintEnabled()
-                    || !Utils.hasFingerprintHardware(mContext)) {
-                return true;
-            }
-            return manager.hasEnrolledFingerprints();
-        }
-
-        final SuggestionFeatureProvider provider =
-                FeatureFactory.getFactory(mContext).getSuggestionFeatureProvider(mContext);
-
-        return provider.isSuggestionCompleted(mContext, component);
-    }
-
-    private boolean isDeviceSecured() {
-        KeyguardManager km = mContext.getSystemService(KeyguardManager.class);
-        return km.isKeyguardSecure();
-    }
-
-    private boolean isNotSingleFingerprintEnrolled() {
-        FingerprintManager manager = Utils.getFingerprintManagerOrNull(mContext);
-        return manager == null || manager.getEnrolledFingerprints().size() != 1;
-    }
-
-    public boolean isWifiCallingUnavailableOrEnabled() {
-        if (!ImsManager.isWfcEnabledByPlatform(mContext) ||
-                !ImsManager.isWfcProvisionedOnDevice(mContext)) {
-            return true;
-        }
-        return ImsManager.isWfcEnabledByUser(mContext)
-                && ImsManager.isNonTtyOrTtyOnVolteEnabled(mContext);
-    }
-
-    @VisibleForTesting
-    boolean hasWallpaperSet() {
-        return mWallpaperManager.getWallpaperId(WallpaperManager.FLAG_SYSTEM) > 0;
-    }
-
-    private boolean isFingerprintEnabled() {
-        DevicePolicyManager dpManager =
-                (DevicePolicyManager) mContext.getSystemService(Context.DEVICE_POLICY_SERVICE);
-        final int dpmFlags = dpManager.getKeyguardDisabledFeatures(null, /* admin */
-                mContext.getUserId());
-        return (dpmFlags & DevicePolicyManager.KEYGUARD_DISABLE_FINGERPRINT) == 0;
-    }
-}
diff --git a/src/com/android/settings/dashboard/suggestions/WallpaperManagerWrapper.java b/src/com/android/settings/dashboard/suggestions/WallpaperManagerWrapper.java
deleted file mode 100644
index 9efe4fe..0000000
--- a/src/com/android/settings/dashboard/suggestions/WallpaperManagerWrapper.java
+++ /dev/null
@@ -1,33 +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.dashboard.suggestions;
-
-import android.app.WallpaperManager;
-import android.content.Context;
-
-public class WallpaperManagerWrapper {
-
-    private final WallpaperManager mWallpaperManager;
-
-    public WallpaperManagerWrapper(Context context) {
-        mWallpaperManager = (WallpaperManager) context.getSystemService(Context.WALLPAPER_SERVICE);
-    }
-
-    public int getWallpaperId(int which) {
-        return mWallpaperManager.getWallpaperId(which);
-    }
-}
diff --git a/src/com/android/settings/datausage/AppDataUsage.java b/src/com/android/settings/datausage/AppDataUsage.java
index 36d9d0f..5470e63 100644
--- a/src/com/android/settings/datausage/AppDataUsage.java
+++ b/src/com/android/settings/datausage/AppDataUsage.java
@@ -46,14 +46,13 @@
 import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
 import com.android.settings.R;
 import com.android.settings.applications.AppInfoBase;
-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.net.ChartData;
 import com.android.settingslib.net.ChartDataLoader;
 import com.android.settingslib.net.UidDetail;
 import com.android.settingslib.net.UidDetailProvider;
+import com.android.settingslib.wrapper.PackageManagerWrapper;
 
 public class AppDataUsage extends DataUsageBase implements Preference.OnPreferenceChangeListener,
         DataSaverBackend.Listener {
@@ -104,7 +103,7 @@
     @Override
     public void onCreate(Bundle icicle) {
         super.onCreate(icicle);
-        mPackageManagerWrapper = new PackageManagerWrapperImpl(getPackageManager());
+        mPackageManagerWrapper = new PackageManagerWrapper(getPackageManager());
         final Bundle args = getArguments();
 
         try {
diff --git a/src/com/android/settings/datausage/AppDataUsagePreference.java b/src/com/android/settings/datausage/AppDataUsagePreference.java
index 6770e9e..f0fd755 100644
--- a/src/com/android/settings/datausage/AppDataUsagePreference.java
+++ b/src/com/android/settings/datausage/AppDataUsagePreference.java
@@ -15,44 +15,48 @@
 package com.android.settings.datausage;
 
 import android.content.Context;
-import android.os.AsyncTask;
-import android.support.v7.preference.Preference;
 import android.support.v7.preference.PreferenceViewHolder;
 import android.text.format.Formatter;
 import android.view.View;
 import android.widget.ProgressBar;
+
+import com.android.settings.widget.AppPreference;
 import com.android.settingslib.AppItem;
 import com.android.settingslib.net.UidDetail;
 import com.android.settingslib.net.UidDetailProvider;
+import com.android.settingslib.utils.ThreadUtils;
 
-import static com.android.internal.util.Preconditions.checkNotNull;
-
-public class AppDataUsagePreference extends Preference {
+public class AppDataUsagePreference extends AppPreference {
 
     private final AppItem mItem;
     private final int mPercent;
+    private UidDetail mDetail;
 
     public AppDataUsagePreference(Context context, AppItem item, int percent,
             UidDetailProvider provider) {
         super(context);
         mItem = item;
         mPercent = percent;
-        setLayoutResource(com.android.settings.R.layout.data_usage_item);
-        setWidgetLayoutResource(com.android.settings.R.layout.widget_progress_bar);
+
         if (item.restricted && item.total <= 0) {
             setSummary(com.android.settings.R.string.data_usage_app_restricted);
         } else {
             setSummary(Formatter.formatFileSize(context, item.total));
         }
-
-        // kick off async load of app details
-        UidDetailTask.bindView(provider, item, this);
+        mDetail = provider.getUidDetail(item.key, false /* blocking */);
+        if (mDetail != null) {
+            setAppInfo();
+        } else {
+            ThreadUtils.postOnBackgroundThread(() -> {
+                mDetail = provider.getUidDetail(mItem.key, true /* blocking */);
+                ThreadUtils.postOnMainThread(() -> setAppInfo());
+            });
+        }
     }
 
     @Override
     public void onBindViewHolder(PreferenceViewHolder holder) {
         super.onBindViewHolder(holder);
-
         final ProgressBar progress = (ProgressBar) holder.findViewById(
                 android.R.id.progress);
 
@@ -64,59 +68,17 @@
         progress.setProgress(mPercent);
     }
 
-    public AppItem getItem() {
-        return mItem;
+    private void setAppInfo() {
+        if (mDetail != null) {
+            setIcon(mDetail.icon);
+            setTitle(mDetail.label);
+        } else {
+            setIcon(null);
+            setTitle(null);
+        }
     }
 
-    /**
-     * Background task that loads {@link UidDetail}, binding to
-     * {@link DataUsageAdapter} row item when finished.
-     */
-    private static class UidDetailTask extends AsyncTask<Void, Void, UidDetail> {
-        private final UidDetailProvider mProvider;
-        private final AppItem mItem;
-        private final AppDataUsagePreference mTarget;
-
-        private UidDetailTask(UidDetailProvider provider, AppItem item,
-                AppDataUsagePreference target) {
-            mProvider = checkNotNull(provider);
-            mItem = checkNotNull(item);
-            mTarget = checkNotNull(target);
-        }
-
-        public static void bindView(UidDetailProvider provider, AppItem item,
-                AppDataUsagePreference target) {
-            final UidDetail cachedDetail = provider.getUidDetail(item.key, false);
-            if (cachedDetail != null) {
-                bindView(cachedDetail, target);
-            } else {
-                new UidDetailTask(provider, item, target).execute();
-            }
-        }
-
-        private static void bindView(UidDetail detail, Preference target) {
-            if (detail != null) {
-                target.setIcon(detail.icon);
-                target.setTitle(detail.label);
-            } else {
-                target.setIcon(null);
-                target.setTitle(null);
-            }
-        }
-
-        @Override
-        protected void onPreExecute() {
-            bindView(null, mTarget);
-        }
-
-        @Override
-        protected UidDetail doInBackground(Void... params) {
-            return mProvider.getUidDetail(mItem.key, true);
-        }
-
-        @Override
-        protected void onPostExecute(UidDetail result) {
-            bindView(result, mTarget);
-        }
+    public AppItem getItem() {
+        return mItem;
     }
 }
diff --git a/src/com/android/settings/datausage/DataPlanUsageSummary.java b/src/com/android/settings/datausage/DataPlanUsageSummary.java
index 912db0a..a56bfa1 100644
--- a/src/com/android/settings/datausage/DataPlanUsageSummary.java
+++ b/src/com/android/settings/datausage/DataPlanUsageSummary.java
@@ -74,7 +74,7 @@
     private NetworkPolicyEditor mPolicyEditor;
 
     @Override
-    protected int getHelpResource() {
+    public int getHelpResource() {
         return R.string.help_url_data_usage;
     }
 
diff --git a/src/com/android/settings/datausage/DataSaverBackend.java b/src/com/android/settings/datausage/DataSaverBackend.java
index f37a3c3..041a81f 100644
--- a/src/com/android/settings/datausage/DataSaverBackend.java
+++ b/src/com/android/settings/datausage/DataSaverBackend.java
@@ -14,24 +14,23 @@
 
 package com.android.settings.datausage;
 
+import static android.net.NetworkPolicyManager.POLICY_ALLOW_METERED_BACKGROUND;
+import static android.net.NetworkPolicyManager.POLICY_NONE;
+import static android.net.NetworkPolicyManager.POLICY_REJECT_METERED_BACKGROUND;
+
 import android.content.Context;
 import android.net.INetworkPolicyListener;
 import android.net.NetworkPolicyManager;
-import android.os.Handler;
-import android.os.Looper;
 import android.os.RemoteException;
 import android.util.SparseIntArray;
 
 import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
 import com.android.settings.core.instrumentation.MetricsFeatureProvider;
 import com.android.settings.overlay.FeatureFactory;
+import com.android.settingslib.utils.ThreadUtils;
 
 import java.util.ArrayList;
 
-import static android.net.NetworkPolicyManager.POLICY_ALLOW_METERED_BACKGROUND;
-import static android.net.NetworkPolicyManager.POLICY_NONE;
-import static android.net.NetworkPolicyManager.POLICY_REJECT_METERED_BACKGROUND;
-
 public class DataSaverBackend {
 
     private static final String TAG = "DataSaverBackend";
@@ -39,7 +38,6 @@
     private final Context mContext;
     private final MetricsFeatureProvider mMetricsFeatureProvider;
 
-    private final Handler mHandler = new Handler(Looper.getMainLooper());
     private final NetworkPolicyManager mPolicyManager;
     private final ArrayList<Listener> mListeners = new ArrayList<>();
     private SparseIntArray mUidPolicies = new SparseIntArray();
@@ -195,7 +193,7 @@
 
         @Override
         public void onUidPoliciesChanged(final int uid, final int uidPolicies) {
-            mHandler.post(() -> handleUidPoliciesChanged(uid, uidPolicies));
+            ThreadUtils.postOnMainThread(() -> handleUidPoliciesChanged(uid, uidPolicies));
         }
 
         @Override
@@ -204,7 +202,7 @@
 
         @Override
         public void onRestrictBackgroundChanged(final boolean isDataSaving) throws RemoteException {
-            mHandler.post(() -> handleRestrictBackgroundChanged(isDataSaving));
+            ThreadUtils.postOnMainThread(() -> handleRestrictBackgroundChanged(isDataSaving));
         }
     };
 
diff --git a/src/com/android/settings/datausage/DataSaverSummary.java b/src/com/android/settings/datausage/DataSaverSummary.java
index b424fa2..4ada3af 100644
--- a/src/com/android/settings/datausage/DataSaverSummary.java
+++ b/src/com/android/settings/datausage/DataSaverSummary.java
@@ -61,7 +61,7 @@
                 (Application) getContext().getApplicationContext());
         mDataSaverBackend = new DataSaverBackend(getContext());
         mDataUsageBridge = new AppStateDataUsageBridge(mApplicationsState, this, mDataSaverBackend);
-        mSession = mApplicationsState.newSession(this);
+        mSession = mApplicationsState.newSession(this, getLifecycle());
     }
 
     @Override
@@ -78,7 +78,6 @@
         mDataSaverBackend.refreshWhitelist();
         mDataSaverBackend.refreshBlacklist();
         mDataSaverBackend.addListener(this);
-        mSession.resume();
         mDataUsageBridge.resume();
     }
 
@@ -87,7 +86,6 @@
         super.onPause();
         mDataSaverBackend.remListener(this);
         mDataUsageBridge.pause();
-        mSession.pause();
     }
 
     @Override
@@ -107,7 +105,7 @@
     }
 
     @Override
-    protected int getHelpResource() {
+    public int getHelpResource() {
         return R.string.help_url_data_saver;
     }
 
diff --git a/src/com/android/settings/datausage/DataUsageMeteredSettings.java b/src/com/android/settings/datausage/DataUsageMeteredSettings.java
index 0afb894..8bc7e04 100644
--- a/src/com/android/settings/datausage/DataUsageMeteredSettings.java
+++ b/src/com/android/settings/datausage/DataUsageMeteredSettings.java
@@ -14,27 +14,26 @@
 
 package com.android.settings.datausage;
 
-import static android.net.wifi.WifiInfo.removeDoubleQuotes;
-
 import android.app.backup.BackupManager;
 import android.content.Context;
-import android.content.res.Resources;
 import android.net.NetworkPolicyManager;
 import android.net.wifi.WifiConfiguration;
 import android.net.wifi.WifiManager;
 import android.os.Bundle;
+import android.provider.SearchIndexableResource;
 import android.support.v7.preference.DropDownPreference;
 import android.support.v7.preference.Preference;
 import android.support.v7.preference.PreferenceCategory;
 import android.text.TextUtils;
+
 import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
 import com.android.settings.R;
 import com.android.settings.SettingsPreferenceFragment;
 import com.android.settings.search.BaseSearchIndexProvider;
 import com.android.settings.search.Indexable;
-import com.android.settings.search.SearchIndexableRaw;
 import com.android.settingslib.NetworkPolicyEditor;
-import java.util.ArrayList;
+
+import java.util.Arrays;
 import java.util.List;
 
 /**
@@ -134,49 +133,11 @@
     public static final Indexable.SearchIndexProvider SEARCH_INDEX_DATA_PROVIDER =
         new BaseSearchIndexProvider() {
             @Override
-            public List<SearchIndexableRaw> getRawDataToIndex(Context context, boolean enabled) {
-                final List<SearchIndexableRaw> result = new ArrayList<SearchIndexableRaw>();
-                final Resources res = context.getResources();
-
-                // Add fragment title
-                SearchIndexableRaw data = new SearchIndexableRaw(context);
-                data.title = res.getString(R.string.data_usage_menu_metered);
-                data.screenTitle = res.getString(R.string.data_usage_menu_metered);
-                result.add(data);
-
-                // Body
-                data = new SearchIndexableRaw(context);
-                data.title = res.getString(R.string.data_usage_metered_body);
-                data.screenTitle = res.getString(R.string.data_usage_menu_metered);
-                result.add(data);
-
-                // Wi-Fi networks category
-                data = new SearchIndexableRaw(context);
-                data.title = res.getString(R.string.data_usage_metered_wifi);
-                data.screenTitle = res.getString(R.string.data_usage_menu_metered);
-                result.add(data);
-
-                final WifiManager wifiManager =
-                        (WifiManager) context.getSystemService(Context.WIFI_SERVICE);
-                if (DataUsageUtils.hasWifiRadio(context) && wifiManager.isWifiEnabled()) {
-                    for (WifiConfiguration config : wifiManager.getConfiguredNetworks()) {
-                        if (config.SSID != null) {
-                            final String networkId = config.SSID;
-
-                            data = new SearchIndexableRaw(context);
-                            data.title = removeDoubleQuotes(networkId);
-                            data.screenTitle = res.getString(R.string.data_usage_menu_metered);
-                            result.add(data);
-                        }
-                    }
-                } else {
-                    data = new SearchIndexableRaw(context);
-                    data.title = res.getString(R.string.data_usage_metered_wifi_disabled);
-                    data.screenTitle = res.getString(R.string.data_usage_menu_metered);
-                    result.add(data);
-                }
-
-                return result;
+            public List<SearchIndexableResource> getXmlResourcesToIndex(Context context,
+                    boolean enabled) {
+                final SearchIndexableResource sir = new SearchIndexableResource(context);
+                sir.xmlResId = R.xml.data_usage_metered_prefs;
+                return Arrays.asList(sir);
             }
 
             @Override
diff --git a/src/com/android/settings/datausage/DataUsagePreference.java b/src/com/android/settings/datausage/DataUsagePreference.java
index 63f6054..32c7011 100644
--- a/src/com/android/settings/datausage/DataUsagePreference.java
+++ b/src/com/android/settings/datausage/DataUsagePreference.java
@@ -16,23 +16,34 @@
 
 import android.content.Context;
 import android.content.Intent;
+import android.content.res.TypedArray;
 import android.net.NetworkTemplate;
 import android.os.Bundle;
+import android.support.v4.content.res.TypedArrayUtils;
 import android.support.v7.preference.Preference;
 import android.text.format.Formatter;
 import android.util.AttributeSet;
 import com.android.internal.logging.nano.MetricsProto;
 import com.android.settings.R;
 import com.android.settings.Utils;
+import com.android.settings.core.InstrumentedPreferenceFragment;
 import com.android.settingslib.net.DataUsageController;
 
 public class DataUsagePreference extends Preference implements TemplatePreference {
 
     private NetworkTemplate mTemplate;
     private int mSubId;
+    private int mTitleRes;
 
     public DataUsagePreference(Context context, AttributeSet attrs) {
         super(context, attrs);
+        final TypedArray a = context.obtainStyledAttributes(
+                attrs, new int[] { com.android.internal.R.attr.title },
+                TypedArrayUtils.getAttr(
+                        context, android.support.v7.preference.R.attr.preferenceStyle,
+                        android.R.attr.preferenceStyle), 0);
+        mTitleRes = a.getResourceId(0, 0);
+        a.recycle();
     }
 
     @Override
@@ -52,6 +63,11 @@
         Bundle args = new Bundle();
         args.putParcelable(DataUsageList.EXTRA_NETWORK_TEMPLATE, mTemplate);
         args.putInt(DataUsageList.EXTRA_SUB_ID, mSubId);
+        if (mTitleRes > 0) {
+            return Utils.onBuildStartFragmentIntent(getContext(), DataUsageList.class.getName(),
+                    args, getContext().getPackageName(), mTitleRes, null, false,
+                    MetricsProto.MetricsEvent.VIEW_UNKNOWN);
+        }
         return Utils.onBuildStartFragmentIntent(getContext(), DataUsageList.class.getName(), args,
                 getContext().getPackageName(), 0, getTitle(), false,
                 MetricsProto.MetricsEvent.VIEW_UNKNOWN);
diff --git a/src/com/android/settings/datausage/DataUsageSummary.java b/src/com/android/settings/datausage/DataUsageSummary.java
index e37cc4a..fe22022 100644
--- a/src/com/android/settings/datausage/DataUsageSummary.java
+++ b/src/com/android/settings/datausage/DataUsageSummary.java
@@ -14,22 +14,15 @@
 
 package com.android.settings.datausage;
 
-import static android.net.ConnectivityManager.TYPE_ETHERNET;
-
 import android.app.Activity;
 import android.content.ComponentName;
 import android.content.Context;
 import android.content.Intent;
-import android.net.ConnectivityManager;
-import android.net.INetworkStatsSession;
 import android.net.NetworkPolicyManager;
 import android.net.NetworkTemplate;
-import android.net.TrafficStats;
 import android.net.wifi.WifiConfiguration;
 import android.net.wifi.WifiManager;
 import android.os.Bundle;
-import android.os.RemoteException;
-import android.os.SystemProperties;
 import android.os.UserManager;
 import android.provider.SearchIndexableResource;
 import android.support.annotation.VisibleForTesting;
@@ -46,6 +39,7 @@
 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.SummaryPreference;
@@ -55,6 +49,7 @@
 import com.android.settings.search.Indexable;
 import com.android.settingslib.NetworkPolicyEditor;
 import com.android.settingslib.net.DataUsageController;
+
 import java.util.ArrayList;
 import java.util.List;
 
@@ -96,7 +91,7 @@
     private NetworkPolicyEditor mPolicyEditor;
 
     @Override
-    protected int getHelpResource() {
+    public int getHelpResource() {
         return R.string.help_url_data_usage;
     }
 
@@ -244,13 +239,14 @@
         updateState();
     }
 
-    private static CharSequence formatTitle(Context context, String template, long usageLevel) {
+    @VisibleForTesting
+    static CharSequence formatUsage(Context context, String template, long usageLevel) {
         final float LARGER_SIZE = 1.25f * 1.25f;  // (1/0.8)^2
         final float SMALLER_SIZE = 1.0f / LARGER_SIZE;  // 0.8^2
         final int FLAGS = Spannable.SPAN_INCLUSIVE_INCLUSIVE;
 
         final Formatter.BytesResult usedResult = Formatter.formatBytes(context.getResources(),
-                usageLevel, Formatter.FLAG_SHORTER);
+                usageLevel, Formatter.FLAG_CALCULATE_ROUNDED);
         final SpannableString enlargedValue = new SpannableString(usedResult.value);
         enlargedValue.setSpan(new RelativeSizeSpan(LARGER_SIZE), 0, enlargedValue.length(), FLAGS);
 
@@ -263,7 +259,7 @@
         final SpannableString fullTemplate = new SpannableString(template);
         fullTemplate.setSpan(new RelativeSizeSpan(SMALLER_SIZE), 0, fullTemplate.length(), FLAGS);
         return TextUtils.expandTemplate(fullTemplate,
-                BidiFormatter.getInstance().unicodeWrap(formattedUsage));
+                BidiFormatter.getInstance().unicodeWrap(formattedUsage.toString()));
     }
 
     private void updateState() {
@@ -275,10 +271,9 @@
 
         if (mSummaryPreference != null) {
             mSummaryPreference.setTitle(
-                    formatTitle(context, getString(mDataUsageTemplate), info.usageLevel));
-            long limit = mDataInfoController.getSummaryLimit(info);
+                    formatUsage(context, getString(mDataUsageTemplate), info.usageLevel));
+            final long limit = mDataInfoController.getSummaryLimit(info);
             mSummaryPreference.setSummary(info.period);
-
             if (limit <= 0) {
                 mSummaryPreference.setChartEnabled(false);
             } else {
diff --git a/src/com/android/settings/datausage/UnrestrictedDataAccess.java b/src/com/android/settings/datausage/UnrestrictedDataAccess.java
index 58a34b9..5b55ada 100644
--- a/src/com/android/settings/datausage/UnrestrictedDataAccess.java
+++ b/src/com/android/settings/datausage/UnrestrictedDataAccess.java
@@ -18,9 +18,9 @@
 import android.content.Context;
 import android.os.Bundle;
 import android.os.UserHandle;
-import android.support.v14.preference.SwitchPreference;
 import android.support.v7.preference.Preference;
 import android.support.v7.preference.PreferenceViewHolder;
+import android.util.FeatureFlagUtils;
 import android.view.Menu;
 import android.view.MenuInflater;
 import android.view.MenuItem;
@@ -32,8 +32,11 @@
 import com.android.settings.SettingsPreferenceFragment;
 import com.android.settings.applications.AppStateBaseBridge;
 import com.android.settings.applications.InstalledAppDetails;
+import com.android.settings.applications.AppInfoDashboardFragment;
+import com.android.settings.core.FeatureFlags;
 import com.android.settings.datausage.AppStateDataUsageBridge.DataUsageState;
 import com.android.settings.overlay.FeatureFactory;
+import com.android.settings.widget.AppSwitchPreference;
 import com.android.settingslib.applications.ApplicationsState;
 import com.android.settingslib.applications.ApplicationsState.AppEntry;
 import com.android.settingslib.applications.ApplicationsState.AppFilter;
@@ -59,12 +62,11 @@
     public void onCreate(Bundle icicle) {
         super.onCreate(icicle);
         setAnimationAllowed(true);
-        setPreferenceScreen(getPreferenceManager().createPreferenceScreen(getContext()));
         mApplicationsState = ApplicationsState.getInstance(
                 (Application) getContext().getApplicationContext());
         mDataSaverBackend = new DataSaverBackend(getContext());
         mDataUsageBridge = new AppStateDataUsageBridge(mApplicationsState, this, mDataSaverBackend);
-        mSession = mApplicationsState.newSession(this);
+        mSession = mApplicationsState.newSession(this, getLifecycle());
         mShowSystem = icicle != null && icicle.getBoolean(EXTRA_SHOW_SYSTEM);
         mFilter = mShowSystem ? ApplicationsState.FILTER_ALL_ENABLED
                 : ApplicationsState.FILTER_DOWNLOADED_AND_LAUNCHER;
@@ -109,7 +111,6 @@
     @Override
     public void onResume() {
         super.onResume();
-        mSession.resume();
         mDataUsageBridge.resume();
     }
 
@@ -117,13 +118,11 @@
     public void onPause() {
         super.onPause();
         mDataUsageBridge.pause();
-        mSession.pause();
     }
 
     @Override
     public void onDestroy() {
         super.onDestroy();
-        mSession.release();
         mDataUsageBridge.release();
     }
 
@@ -134,7 +133,7 @@
     }
 
     @Override
-    protected int getHelpResource() {
+    public int getHelpResource() {
         return R.string.help_url_unrestricted_data_access;
     }
 
@@ -212,6 +211,11 @@
     }
 
     @Override
+    protected int getPreferenceScreenResId() {
+        return R.xml.unrestricted_data_access_settings;
+    }
+
+    @Override
     public boolean onPreferenceChange(Preference preference, Object newValue) {
         if (preference instanceof AccessPreference) {
             AccessPreference accessPreference = (AccessPreference) preference;
@@ -238,7 +242,8 @@
         return app != null && UserHandle.isApp(app.info.uid);
     }
 
-    private class AccessPreference extends SwitchPreference implements DataSaverBackend.Listener {
+    private class AccessPreference extends AppSwitchPreference
+            implements DataSaverBackend.Listener {
         private final AppEntry mEntry;
         private final DataUsageState mState;
 
@@ -269,10 +274,17 @@
         protected void onClick() {
             if (mState.isDataSaverBlacklisted) {
                 // app is blacklisted, launch App Data Usage screen
-                InstalledAppDetails.startAppInfoFragment(AppDataUsage.class,
-                        getContext().getString(R.string.app_data_usage),
-                        UnrestrictedDataAccess.this,
-                        mEntry);
+                if (FeatureFlagUtils.isEnabled(getContext(), FeatureFlags.APP_INFO_V2)) {
+                    AppInfoDashboardFragment.startAppInfoFragment(AppDataUsage.class,
+                            R.string.app_data_usage,
+                            UnrestrictedDataAccess.this,
+                            mEntry);
+                } else {
+                    InstalledAppDetails.startAppInfoFragment(AppDataUsage.class,
+                            R.string.app_data_usage,
+                            UnrestrictedDataAccess.this,
+                            mEntry);
+                }
             } else {
                 // app is not blacklisted, let superclass handle toggle switch
                 super.onClick();
diff --git a/src/com/android/settings/datetime/AutoTimeFormatPreferenceController.java b/src/com/android/settings/datetime/AutoTimeFormatPreferenceController.java
new file mode 100644
index 0000000..15b7402
--- /dev/null
+++ b/src/com/android/settings/datetime/AutoTimeFormatPreferenceController.java
@@ -0,0 +1,86 @@
+/*
+ * Copyright (C) 2017 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.datetime;
+
+import android.content.Context;
+import android.provider.Settings;
+import android.provider.Settings.System;
+import android.support.v14.preference.SwitchPreference;
+import android.support.v7.preference.Preference;
+import android.support.v7.preference.TwoStatePreference;
+import android.text.TextUtils;
+import android.text.format.DateFormat;
+import com.android.settings.core.PreferenceControllerMixin;
+import com.android.settingslib.core.AbstractPreferenceController;
+import java.util.Locale;
+
+public class AutoTimeFormatPreferenceController extends AbstractPreferenceController
+          implements PreferenceControllerMixin {
+
+    private static final String KEY_AUTO_24_HOUR = "auto_24hour";
+
+    public AutoTimeFormatPreferenceController(Context context, UpdateTimeAndDateCallback callback) {
+        super(context);
+    }
+
+    @Override
+    public boolean isAvailable() {
+        return true;
+    }
+
+    @Override
+    public String getPreferenceKey() {
+        return KEY_AUTO_24_HOUR;
+    }
+
+    @Override
+    public void updateState(Preference preference) {
+        if (!(preference instanceof SwitchPreference)) {
+            return;
+        }
+        ((SwitchPreference) preference).setChecked(isAutoTimeFormatSelection(mContext));
+    }
+
+    @Override
+    public boolean handlePreferenceTreeClick(Preference preference) {
+        if (!(preference instanceof TwoStatePreference)
+            || !TextUtils.equals(KEY_AUTO_24_HOUR, preference.getKey())) {
+            return false;
+        }
+        boolean auto24HourEnabled = ((SwitchPreference) preference).isChecked();
+        Boolean is24Hour;
+        if (auto24HourEnabled) {
+            is24Hour = null;
+        } else {
+            is24Hour = is24HourLocale(mContext.getResources().getConfiguration().locale);
+        }
+        TimeFormatPreferenceController.update24HourFormat(mContext, is24Hour);
+        return true;
+    }
+
+    boolean is24HourLocale(Locale locale) {
+        return DateFormat.is24HourLocale(locale);
+    }
+
+    /**
+     * Returns if the system is currently configured to pick the time format automatically based on
+     * the locale.
+     */
+    static boolean isAutoTimeFormatSelection(Context context) {
+        return Settings.System.getString(context.getContentResolver(), System.TIME_12_24) == null;
+    }
+}
diff --git a/src/com/android/settings/datetime/AutoTimePreferenceController.java b/src/com/android/settings/datetime/AutoTimePreferenceController.java
index 0b70f45..3da712a 100644
--- a/src/com/android/settings/datetime/AutoTimePreferenceController.java
+++ b/src/com/android/settings/datetime/AutoTimePreferenceController.java
@@ -46,8 +46,10 @@
         if (!(preference instanceof RestrictedSwitchPreference)) {
             return;
         }
-        ((RestrictedSwitchPreference) preference).setDisabledByAdmin(
-                getEnforcedAdminProperty());
+        if (!((RestrictedSwitchPreference) preference).isDisabledByAdmin()) {
+            ((RestrictedSwitchPreference) preference).setDisabledByAdmin(
+                    getEnforcedAdminProperty());
+        }
         ((RestrictedSwitchPreference) preference).setChecked(isEnabled());
     }
 
diff --git a/src/com/android/settings/datetime/AutoTimeZonePreferenceController.java b/src/com/android/settings/datetime/AutoTimeZonePreferenceController.java
index 8a9568a..d4bd59b 100644
--- a/src/com/android/settings/datetime/AutoTimeZonePreferenceController.java
+++ b/src/com/android/settings/datetime/AutoTimeZonePreferenceController.java
@@ -21,8 +21,8 @@
 import android.support.v14.preference.SwitchPreference;
 import android.support.v7.preference.Preference;
 
-import com.android.settings.Utils;
 import com.android.settings.core.PreferenceControllerMixin;
+import com.android.settingslib.Utils;
 import com.android.settingslib.core.AbstractPreferenceController;
 
 public class AutoTimeZonePreferenceController extends AbstractPreferenceController
diff --git a/src/com/android/settings/datetime/DatePreferenceController.java b/src/com/android/settings/datetime/DatePreferenceController.java
index 9582e9e..d2a8686 100644
--- a/src/com/android/settings/datetime/DatePreferenceController.java
+++ b/src/com/android/settings/datetime/DatePreferenceController.java
@@ -27,6 +27,7 @@
 import android.widget.DatePicker;
 
 import com.android.settings.core.PreferenceControllerMixin;
+import com.android.settingslib.RestrictedPreference;
 import com.android.settingslib.core.AbstractPreferenceController;
 
 import java.util.Calendar;
@@ -59,9 +60,14 @@
 
     @Override
     public void updateState(Preference preference) {
+        if (!(preference instanceof RestrictedPreference)) {
+            return;
+        }
         final Calendar now = Calendar.getInstance();
         preference.setSummary(DateFormat.getLongDateFormat(mContext).format(now.getTime()));
-        preference.setEnabled(!mAutoTimePreferenceController.isEnabled());
+        if (!((RestrictedPreference) preference).isDisabledByAdmin()) {
+            preference.setEnabled(!mAutoTimePreferenceController.isEnabled());
+        }
     }
 
     @Override
diff --git a/src/com/android/settings/datetime/TimeFormatPreferenceController.java b/src/com/android/settings/datetime/TimeFormatPreferenceController.java
index 92b3716..302c624 100644
--- a/src/com/android/settings/datetime/TimeFormatPreferenceController.java
+++ b/src/com/android/settings/datetime/TimeFormatPreferenceController.java
@@ -63,6 +63,8 @@
         if (!(preference instanceof TwoStatePreference)) {
             return;
         }
+        preference.setEnabled(
+            !AutoTimeFormatPreferenceController.isAutoTimeFormatSelection(mContext));
         ((TwoStatePreference) preference).setChecked(is24Hour());
         final Calendar now = Calendar.getInstance();
         mDummyDate.setTimeZone(now.getTimeZone());
@@ -80,8 +82,7 @@
             return false;
         }
         final boolean is24Hour = ((SwitchPreference) preference).isChecked();
-        set24Hour(is24Hour);
-        timeUpdated(is24Hour);
+        update24HourFormat(mContext, is24Hour);
         mUpdateTimeAndDateCallback.updateTimeAndDateDisplay(mContext);
         return true;
     }
@@ -95,18 +96,29 @@
         return DateFormat.is24HourFormat(mContext);
     }
 
-    private void timeUpdated(boolean is24Hour) {
-        Intent timeChanged = new Intent(Intent.ACTION_TIME_CHANGED);
-        int timeFormatPreference =
-                is24Hour ? Intent.EXTRA_TIME_PREF_VALUE_USE_24_HOUR
-                        : Intent.EXTRA_TIME_PREF_VALUE_USE_12_HOUR;
-        timeChanged.putExtra(Intent.EXTRA_TIME_PREF_24_HOUR_FORMAT, timeFormatPreference);
-        mContext.sendBroadcast(timeChanged);
+    static void update24HourFormat(Context context, Boolean is24Hour) {
+        set24Hour(context, is24Hour);
+        timeUpdated(context, is24Hour);
     }
 
-    private void set24Hour(boolean is24Hour) {
-        Settings.System.putString(mContext.getContentResolver(),
-                Settings.System.TIME_12_24,
-                is24Hour ? HOURS_24 : HOURS_12);
+    static void timeUpdated(Context context, Boolean is24Hour) {
+        Intent timeChanged = new Intent(Intent.ACTION_TIME_CHANGED);
+        timeChanged.addFlags(Intent.FLAG_RECEIVER_INCLUDE_BACKGROUND);
+        int timeFormatPreference;
+        if (is24Hour == null) {
+            timeFormatPreference = Intent.EXTRA_TIME_PREF_VALUE_USE_LOCALE_DEFAULT;
+        } else {
+            timeFormatPreference = is24Hour ? Intent.EXTRA_TIME_PREF_VALUE_USE_24_HOUR
+                : Intent.EXTRA_TIME_PREF_VALUE_USE_12_HOUR;
+        }
+        timeChanged.putExtra(Intent.EXTRA_TIME_PREF_24_HOUR_FORMAT, timeFormatPreference);
+        context.sendBroadcast(timeChanged);
+    }
+
+    static void set24Hour(Context context, Boolean is24Hour) {
+        String value = is24Hour == null ? null :
+            is24Hour ? HOURS_24 : HOURS_12;
+        Settings.System.putString(context.getContentResolver(),
+                Settings.System.TIME_12_24, value);
     }
 }
diff --git a/src/com/android/settings/datetime/TimePreferenceController.java b/src/com/android/settings/datetime/TimePreferenceController.java
index 9bb5689..684ad0c 100644
--- a/src/com/android/settings/datetime/TimePreferenceController.java
+++ b/src/com/android/settings/datetime/TimePreferenceController.java
@@ -26,6 +26,7 @@
 import android.widget.TimePicker;
 
 import com.android.settings.core.PreferenceControllerMixin;
+import com.android.settingslib.RestrictedPreference;
 import com.android.settingslib.core.AbstractPreferenceController;
 
 import java.util.Calendar;
@@ -60,9 +61,14 @@
 
     @Override
     public void updateState(Preference preference) {
+        if (!(preference instanceof RestrictedPreference)) {
+            return;
+        }
         final Calendar now = Calendar.getInstance();
         preference.setSummary(DateFormat.getTimeFormat(mContext).format(now.getTime()));
-        preference.setEnabled(!mAutoTimePreferenceController.isEnabled());
+        if (!((RestrictedPreference) preference).isDisabledByAdmin()) {
+            preference.setEnabled(!mAutoTimePreferenceController.isEnabled());
+        }
     }
 
     @Override
diff --git a/src/com/android/settings/datetime/TimeZonePreferenceController.java b/src/com/android/settings/datetime/TimeZonePreferenceController.java
index 987132b..435b1fe 100644
--- a/src/com/android/settings/datetime/TimeZonePreferenceController.java
+++ b/src/com/android/settings/datetime/TimeZonePreferenceController.java
@@ -21,6 +21,7 @@
 import android.support.v7.preference.Preference;
 
 import com.android.settings.core.PreferenceControllerMixin;
+import com.android.settingslib.RestrictedPreference;
 import com.android.settingslib.core.AbstractPreferenceController;
 import com.android.settingslib.datetime.ZoneGetter;
 
@@ -41,8 +42,13 @@
 
     @Override
     public void updateState(Preference preference) {
+        if (!(preference instanceof RestrictedPreference)) {
+            return;
+        }
         preference.setSummary(getTimeZoneOffsetAndName());
-        preference.setEnabled(!mAutoTimeZonePreferenceController.isEnabled());
+        if( !((RestrictedPreference) preference).isDisabledByAdmin()) {
+            preference.setEnabled(!mAutoTimeZonePreferenceController.isEnabled());
+        }
     }
 
     @Override
diff --git a/src/com/android/settings/datetime/ZonePicker.java b/src/com/android/settings/datetime/ZonePicker.java
index 87f2b75..57c340c 100644
--- a/src/com/android/settings/datetime/ZonePicker.java
+++ b/src/com/android/settings/datetime/ZonePicker.java
@@ -166,6 +166,7 @@
         // Sets the adapter
         setSorting(true);
         setHasOptionsMenu(true);
+        activity.setTitle(R.string.date_time_set_timezone);
     }
 
     @Override
diff --git a/src/com/android/settings/deletionhelper/AutomaticStorageManagerSettings.java b/src/com/android/settings/deletionhelper/AutomaticStorageManagerSettings.java
index e38317a..cb9e750 100644
--- a/src/com/android/settings/deletionhelper/AutomaticStorageManagerSettings.java
+++ b/src/com/android/settings/deletionhelper/AutomaticStorageManagerSettings.java
@@ -137,7 +137,7 @@
     }
 
     @Override
-    protected int getHelpResource() {
+    public int getHelpResource() {
         return R.string.help_uri_storage;
     }
 
diff --git a/src/com/android/settings/development/AbstractBluetoothA2dpPreferenceController.java b/src/com/android/settings/development/AbstractBluetoothA2dpPreferenceController.java
new file mode 100644
index 0000000..e4e6493
--- /dev/null
+++ b/src/com/android/settings/development/AbstractBluetoothA2dpPreferenceController.java
@@ -0,0 +1,198 @@
+/*
+ * Copyright (C) 2017 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF 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.bluetooth.BluetoothA2dp;
+import android.bluetooth.BluetoothCodecConfig;
+import android.content.Context;
+import android.support.annotation.VisibleForTesting;
+import android.support.v7.preference.ListPreference;
+import android.support.v7.preference.Preference;
+import android.support.v7.preference.PreferenceScreen;
+
+import com.android.settings.R;
+import com.android.settings.core.PreferenceControllerMixin;
+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.development.DeveloperOptionsPreferenceController;
+
+public abstract class AbstractBluetoothA2dpPreferenceController extends
+        DeveloperOptionsPreferenceController implements Preference.OnPreferenceChangeListener,
+        PreferenceControllerMixin, BluetoothServiceConnectionListener, LifecycleObserver,
+        OnDestroy {
+
+    @VisibleForTesting
+    static final int STREAMING_LABEL_ID = R.string.bluetooth_select_a2dp_codec_streaming_label;
+
+    protected final BluetoothA2dpConfigStore mBluetoothA2dpConfigStore;
+    protected BluetoothA2dp mBluetoothA2dp;
+    protected ListPreference mPreference;
+    private final String[] mListValues;
+    private final String[] mListSummaries;
+
+    public AbstractBluetoothA2dpPreferenceController(Context context, Lifecycle lifecycle,
+            BluetoothA2dpConfigStore store) {
+        super(context);
+
+        mBluetoothA2dpConfigStore = store;
+        mListValues = getListValues();
+        mListSummaries = getListSummaries();
+
+        if (lifecycle != null) {
+            lifecycle.addObserver(this);
+        }
+    }
+
+    @Override
+    public void displayPreference(PreferenceScreen screen) {
+        super.displayPreference(screen);
+
+        mPreference = (ListPreference) screen.findPreference(getPreferenceKey());
+
+        // Set a default value because BluetoothCodecConfig is null initially.
+        mPreference.setValue(mListValues[getDefaultIndex()]);
+        mPreference.setSummary(mListSummaries[getDefaultIndex()]);
+    }
+
+    @Override
+    public boolean onPreferenceChange(Preference preference, Object newValue) {
+        if (mBluetoothA2dp == null) {
+            return false;
+        }
+
+        writeConfigurationValues(newValue);
+
+        final BluetoothCodecConfig codecConfig = mBluetoothA2dpConfigStore.createCodecConfig();
+        synchronized (mBluetoothA2dpConfigStore) {
+            if (mBluetoothA2dp != null) {
+                setCodecConfigPreference(codecConfig);
+            }
+        }
+        // Because the setting is not persisted into permanent storage, we cannot call update state
+        // here to update the preference.
+        // Instead, we just assume it was set and update the preference here.
+        final int index = mPreference.findIndexOfValue(newValue.toString());
+        // We only want to append "Streaming" if not using default
+        if (index == getDefaultIndex()) {
+            mPreference.setSummary(mListSummaries[index]);
+        } else {
+            mPreference.setSummary(
+                    mContext.getResources().getString(STREAMING_LABEL_ID, mListSummaries[index]));
+        }
+        return true;
+    }
+
+    @Override
+    public void updateState(Preference preference) {
+        if (getCodecConfig() == null || mPreference == null) {
+            return;
+        }
+
+        BluetoothCodecConfig codecConfig;
+        synchronized (mBluetoothA2dpConfigStore) {
+            codecConfig = getCodecConfig();
+        }
+
+        final int index = getCurrentA2dpSettingIndex(codecConfig);
+        mPreference.setValue(mListValues[index]);
+
+        // We only want to append "Streaming" if not using default
+        if (index == getDefaultIndex()) {
+            mPreference.setSummary(mListSummaries[index]);
+        } else {
+            mPreference.setSummary(
+                    mContext.getResources().getString(STREAMING_LABEL_ID, mListSummaries[index]));
+        }
+
+        writeConfigurationValues(mListValues[index]);
+    }
+
+    @Override
+    public void onBluetoothServiceConnected(BluetoothA2dp bluetoothA2dp) {
+        mBluetoothA2dp = bluetoothA2dp;
+        updateState(mPreference);
+    }
+
+    @Override
+    public void onBluetoothCodecUpdated() {
+        // intentional no-op
+        // We do not want to call update state here because the setting is not persisted in
+        // permanent storage.
+    }
+
+    @Override
+    public void onBluetoothServiceDisconnected() {
+        mBluetoothA2dp = null;
+    }
+
+    @Override
+    public void onDestroy() {
+        mBluetoothA2dp = null;
+    }
+
+    @Override
+    protected void onDeveloperOptionsSwitchEnabled() {
+        mPreference.setEnabled(true);
+    }
+
+    @Override
+    protected void onDeveloperOptionsSwitchDisabled() {
+        mPreference.setEnabled(false);
+    }
+
+    /**
+     * @return an array of string values that correspond to the current {@link ListPreference}.
+     */
+    protected abstract String[] getListValues();
+
+    /**
+     * @return an array of string summaries that correspond to the current {@link ListPreference}.
+     */
+    protected abstract String[] getListSummaries();
+
+    /**
+     * Updates the new value to the {@link BluetoothA2dpConfigStore} and the {@link BluetoothA2dp}.
+     *
+     * @param newValue the new setting value
+     */
+    protected abstract void writeConfigurationValues(Object newValue);
+
+    /**
+     * @return the current selected index for the {@link ListPreference}.
+     */
+    protected abstract int getCurrentA2dpSettingIndex(BluetoothCodecConfig config);
+
+    /**
+     * @return default setting index for the {@link ListPreference}.
+     */
+    protected abstract int getDefaultIndex();
+
+    @VisibleForTesting
+    void setCodecConfigPreference(BluetoothCodecConfig config) {
+        mBluetoothA2dp.setCodecConfigPreference(config);
+    }
+
+    @VisibleForTesting
+    BluetoothCodecConfig getCodecConfig() {
+        if (mBluetoothA2dp == null || mBluetoothA2dp.getCodecStatus() == null) {
+            return null;
+        }
+
+        return mBluetoothA2dp.getCodecStatus().getCodecConfig();
+    }
+}
diff --git a/src/com/android/settings/development/AdbClearKeysDialogHost.java b/src/com/android/settings/development/AdbClearKeysDialogHost.java
new file mode 100644
index 0000000..7f69f76
--- /dev/null
+++ b/src/com/android/settings/development/AdbClearKeysDialogHost.java
@@ -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.
+ */
+
+package com.android.settings.development;
+
+/**
+ * Interface for AdbClearKeysDialogFragment callbacks.
+ */
+public interface AdbClearKeysDialogHost {
+
+    /**
+     * Called when the user presses ok on the warning dialog.
+     */
+    void onAdbClearKeysDialogConfirmed();
+}
diff --git a/src/com/android/settings/development/AdbDialogHost.java b/src/com/android/settings/development/AdbDialogHost.java
new file mode 100644
index 0000000..3288ab3
--- /dev/null
+++ b/src/com/android/settings/development/AdbDialogHost.java
@@ -0,0 +1,33 @@
+/*
+ * Copyright (C) 2017 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF 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;
+
+/**
+ * Interface for EnableAdbWarningDialog callbacks.
+ */
+public interface AdbDialogHost {
+    /**
+     * Called when the user presses enable on the warning dialog.
+     */
+    void onEnableAdbDialogConfirmed();
+
+    /**
+     * Called when the user dismisses or cancels the warning dialog.
+     */
+    void onEnableAdbDialogDismissed();
+}
diff --git a/src/com/android/settings/development/AdbOnChangeListener.java b/src/com/android/settings/development/AdbOnChangeListener.java
new file mode 100644
index 0000000..8069270
--- /dev/null
+++ b/src/com/android/settings/development/AdbOnChangeListener.java
@@ -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.
+ */
+
+package com.android.settings.development;
+
+/**
+ * Interface for callbacks in Adb setting changes.
+ */
+public interface AdbOnChangeListener {
+
+    /**
+     * Called when the global Adb setting changes
+     */
+    void onAdbSettingChanged();
+}
diff --git a/src/com/android/settings/development/AdbPreferenceController.java b/src/com/android/settings/development/AdbPreferenceController.java
new file mode 100644
index 0000000..cf23fe0
--- /dev/null
+++ b/src/com/android/settings/development/AdbPreferenceController.java
@@ -0,0 +1,72 @@
+/*
+ * Copyright (C) 2017 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.development;
+
+
+import android.content.Context;
+import android.support.annotation.Nullable;
+import android.support.v7.preference.Preference;
+
+import com.android.settings.core.PreferenceControllerMixin;
+import com.android.settingslib.development.AbstractEnableAdbPreferenceController;
+
+public class AdbPreferenceController extends AbstractEnableAdbPreferenceController implements
+        PreferenceControllerMixin {
+
+    private final DevelopmentSettingsDashboardFragment mFragment;
+
+    public AdbPreferenceController(Context context, DevelopmentSettingsDashboardFragment fragment) {
+        super(context);
+        mFragment = fragment;
+    }
+
+    public void onAdbDialogConfirmed() {
+        writeAdbSetting(true);
+    }
+
+    public void onAdbDialogDismissed() {
+        updateState(mPreference);
+    }
+
+    @Override
+    public void showConfirmationDialog(@Nullable Preference preference) {
+        EnableAdbWarningDialog.show(mFragment);
+    }
+
+    @Override
+    public void dismissConfirmationDialog() {
+        // intentional no-op
+    }
+
+    @Override
+    public boolean isConfirmationDialogShowing() {
+        // intentional no-op
+        return false;
+    }
+
+    @Override
+    protected void onDeveloperOptionsSwitchEnabled() {
+        mPreference.setEnabled(true);
+    }
+
+    @Override
+    protected void onDeveloperOptionsSwitchDisabled() {
+        writeAdbSetting(false);
+        mPreference.setEnabled(false);
+        mPreference.setChecked(false);
+    }
+}
diff --git a/src/com/android/settings/development/AllowAppsOnExternalPreferenceController.java b/src/com/android/settings/development/AllowAppsOnExternalPreferenceController.java
new file mode 100644
index 0000000..c3b527f
--- /dev/null
+++ b/src/com/android/settings/development/AllowAppsOnExternalPreferenceController.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.development;
+
+import android.content.Context;
+import android.provider.Settings;
+import android.support.annotation.VisibleForTesting;
+import android.support.v14.preference.SwitchPreference;
+import android.support.v7.preference.Preference;
+import android.support.v7.preference.PreferenceScreen;
+
+import com.android.settings.core.PreferenceControllerMixin;
+import com.android.settingslib.development.DeveloperOptionsPreferenceController;
+
+public class AllowAppsOnExternalPreferenceController extends
+        DeveloperOptionsPreferenceController implements Preference.OnPreferenceChangeListener,
+        PreferenceControllerMixin {
+
+    private static final String FORCE_ALLOW_ON_EXTERNAL_KEY = "force_allow_on_external";
+
+    @VisibleForTesting
+    static final int SETTING_VALUE_OFF = 0;
+    @VisibleForTesting
+    static final int SETTING_VALUE_ON = 1;
+
+    private SwitchPreference mPreference;
+
+    public AllowAppsOnExternalPreferenceController(Context context) {
+        super(context);
+    }
+
+    @Override
+    public String getPreferenceKey() {
+        return FORCE_ALLOW_ON_EXTERNAL_KEY;
+    }
+
+    @Override
+    public void displayPreference(PreferenceScreen screen) {
+        super.displayPreference(screen);
+
+        mPreference = (SwitchPreference) screen.findPreference(getPreferenceKey());
+    }
+
+    @Override
+    public boolean onPreferenceChange(Preference preference, Object newValue) {
+        final boolean isEnabled = (Boolean) newValue;
+        Settings.Global.putInt(mContext.getContentResolver(),
+                Settings.Global.FORCE_ALLOW_ON_EXTERNAL,
+                isEnabled ? SETTING_VALUE_ON : SETTING_VALUE_OFF);
+        return true;
+    }
+
+    @Override
+    public void updateState(Preference preference) {
+        final int mode = Settings.Global.getInt(mContext.getContentResolver(),
+                Settings.Global.FORCE_ALLOW_ON_EXTERNAL, SETTING_VALUE_OFF);
+
+        mPreference.setChecked(mode != SETTING_VALUE_OFF);
+    }
+
+    @Override
+    protected void onDeveloperOptionsSwitchEnabled() {
+        mPreference.setEnabled(true);
+    }
+
+    @Override
+    protected void onDeveloperOptionsSwitchDisabled() {
+        Settings.Global.putInt(mContext.getContentResolver(),
+                Settings.Global.FORCE_ALLOW_ON_EXTERNAL, SETTING_VALUE_OFF);
+        mPreference.setEnabled(false);
+        mPreference.setChecked(false);
+    }
+}
diff --git a/src/com/android/settings/development/AnimatorDurationScalePreferenceController.java b/src/com/android/settings/development/AnimatorDurationScalePreferenceController.java
new file mode 100644
index 0000000..4d8d4ee
--- /dev/null
+++ b/src/com/android/settings/development/AnimatorDurationScalePreferenceController.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.development;
+
+import android.content.Context;
+import android.os.RemoteException;
+import android.os.ServiceManager;
+import android.support.annotation.VisibleForTesting;
+import android.support.v7.preference.ListPreference;
+import android.support.v7.preference.Preference;
+import android.support.v7.preference.PreferenceScreen;
+import android.view.IWindowManager;
+
+import com.android.settings.R;
+import com.android.settings.core.PreferenceControllerMixin;
+import com.android.settingslib.development.DeveloperOptionsPreferenceController;
+
+public class AnimatorDurationScalePreferenceController extends
+        DeveloperOptionsPreferenceController implements Preference.OnPreferenceChangeListener,
+        PreferenceControllerMixin {
+
+    private static final String ANIMATOR_DURATION_SCALE_KEY = "animator_duration_scale";
+
+    @VisibleForTesting
+    static final int ANIMATOR_DURATION_SCALE_SELECTOR = 2;
+    @VisibleForTesting
+    static final float DEFAULT_VALUE = 1;
+
+    private final IWindowManager mWindowManager;
+    private final String[] mListValues;
+    private final String[] mListSummaries;
+
+    private ListPreference mPreference;
+
+    public AnimatorDurationScalePreferenceController(Context context) {
+        super(context);
+
+        mWindowManager = IWindowManager.Stub.asInterface(
+                ServiceManager.getService(Context.WINDOW_SERVICE));
+        mListValues = context.getResources().getStringArray(R.array.animator_duration_scale_values);
+        mListSummaries = context.getResources().getStringArray(
+                R.array.animator_duration_scale_entries);
+    }
+
+    @Override
+    public String getPreferenceKey() {
+        return ANIMATOR_DURATION_SCALE_KEY;
+    }
+
+    @Override
+    public void displayPreference(PreferenceScreen screen) {
+        super.displayPreference(screen);
+
+        mPreference = (ListPreference) screen.findPreference(getPreferenceKey());
+    }
+
+    @Override
+    public boolean onPreferenceChange(Preference preference, Object newValue) {
+        writeAnimationScaleOption(newValue);
+        return true;
+    }
+
+    @Override
+    public void updateState(Preference preference) {
+        updateAnimationScaleValue();
+    }
+
+    @Override
+    protected void onDeveloperOptionsSwitchEnabled() {
+        mPreference.setEnabled(true);
+    }
+
+    @Override
+    protected void onDeveloperOptionsSwitchDisabled() {
+        writeAnimationScaleOption(null);
+        mPreference.setEnabled(false);
+    }
+
+    private void writeAnimationScaleOption(Object newValue) {
+        try {
+            float scale = newValue != null ? Float.parseFloat(newValue.toString()) : DEFAULT_VALUE;
+            mWindowManager.setAnimationScale(ANIMATOR_DURATION_SCALE_SELECTOR, scale);
+            updateAnimationScaleValue();
+        } catch (RemoteException e) {
+            // intentional no-op
+        }
+    }
+
+    private void updateAnimationScaleValue() {
+        try {
+            final float scale = mWindowManager.getAnimationScale(ANIMATOR_DURATION_SCALE_SELECTOR);
+            int index = 0; // default
+            for (int i = 0; i < mListValues.length; i++) {
+                float val = Float.parseFloat(mListValues[i]);
+                if (scale <= val) {
+                    index = i;
+                    break;
+                }
+            }
+            mPreference.setValue(mListValues[index]);
+            mPreference.setSummary(mListSummaries[index]);
+        } catch (RemoteException e) {
+            // intentional no-op
+        }
+    }
+}
diff --git a/src/com/android/settings/development/AppPicker.java b/src/com/android/settings/development/AppPicker.java
index 480a0ec..433f31a 100644
--- a/src/com/android/settings/development/AppPicker.java
+++ b/src/com/android/settings/development/AppPicker.java
@@ -32,7 +32,6 @@
 import android.widget.ListView;
 
 import com.android.settings.R;
-import com.android.settings.applications.AppViewHolder;
 
 import java.text.Collator;
 import java.util.ArrayList;
diff --git a/src/com/android/settings/development/AppViewHolder.java b/src/com/android/settings/development/AppViewHolder.java
new file mode 100644
index 0000000..1082efe
--- /dev/null
+++ b/src/com/android/settings/development/AppViewHolder.java
@@ -0,0 +1,56 @@
+/*
+ * 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.development;
+
+import android.view.LayoutInflater;
+import android.view.View;
+import android.widget.ImageView;
+import android.widget.TextView;
+
+import com.android.settings.R;
+import com.android.settingslib.applications.ApplicationsState;
+
+// View Holder used when displaying views
+public class AppViewHolder {
+    public ApplicationsState.AppEntry entry;
+    public View rootView;
+    public TextView appName;
+    public ImageView appIcon;
+    public TextView summary;
+    public TextView disabled;
+
+    static public AppViewHolder createOrRecycle(LayoutInflater inflater, View convertView) {
+        if (convertView == null) {
+            convertView = inflater.inflate(R.layout.preference_app, null);
+
+            // Creates a ViewHolder and store references to the two children views
+            // we want to bind data to.
+            AppViewHolder holder = new AppViewHolder();
+            holder.rootView = convertView;
+            holder.appName = convertView.findViewById(android.R.id.title);
+            holder.appIcon = convertView.findViewById(android.R.id.icon);
+            holder.summary = convertView.findViewById(android.R.id.summary);
+            holder.disabled = convertView.findViewById(R.id.appendix);
+            convertView.setTag(holder);
+            return holder;
+        } else {
+            // Get the ViewHolder back to get fast access to the TextView
+            // and the ImageView.
+            return (AppViewHolder) convertView.getTag();
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/com/android/settings/development/AppsNotRespondingPreferenceController.java b/src/com/android/settings/development/AppsNotRespondingPreferenceController.java
new file mode 100644
index 0000000..98d7fa5
--- /dev/null
+++ b/src/com/android/settings/development/AppsNotRespondingPreferenceController.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.development;
+
+import android.content.Context;
+import android.provider.Settings;
+import android.support.annotation.VisibleForTesting;
+import android.support.v14.preference.SwitchPreference;
+import android.support.v7.preference.Preference;
+import android.support.v7.preference.PreferenceScreen;
+
+import com.android.settings.core.PreferenceControllerMixin;
+import com.android.settingslib.development.DeveloperOptionsPreferenceController;
+
+public class AppsNotRespondingPreferenceController extends
+        DeveloperOptionsPreferenceController implements Preference.OnPreferenceChangeListener,
+        PreferenceControllerMixin {
+
+    private static final String SHOW_ALL_ANRS_KEY = "show_all_anrs";
+
+    @VisibleForTesting
+    static final int SETTING_VALUE_ON = 1;
+    @VisibleForTesting
+    static final int SETTING_VALUE_OFF = 0;
+
+    private SwitchPreference mPreference;
+
+    public AppsNotRespondingPreferenceController(Context context) {
+        super(context);
+    }
+
+    @Override
+    public String getPreferenceKey() {
+        return SHOW_ALL_ANRS_KEY;
+    }
+
+    @Override
+    public void displayPreference(PreferenceScreen screen) {
+        super.displayPreference(screen);
+
+        mPreference = (SwitchPreference) screen.findPreference(getPreferenceKey());
+    }
+
+    @Override
+    public boolean onPreferenceChange(Preference preference, Object newValue) {
+        final boolean isEnabled = (Boolean) newValue;
+        Settings.Secure.putInt(mContext.getContentResolver(),
+                Settings.Secure.ANR_SHOW_BACKGROUND,
+                isEnabled ? SETTING_VALUE_ON : SETTING_VALUE_OFF);
+        return true;
+    }
+
+    @Override
+    public void updateState(Preference preference) {
+        final int mode = Settings.Secure.getInt(mContext.getContentResolver(),
+                Settings.Secure.ANR_SHOW_BACKGROUND, SETTING_VALUE_OFF);
+        mPreference.setChecked(mode != SETTING_VALUE_OFF);
+    }
+
+    @Override
+    protected void onDeveloperOptionsSwitchEnabled() {
+        mPreference.setEnabled(true);
+    }
+
+    @Override
+    protected void onDeveloperOptionsSwitchDisabled() {
+        Settings.Secure.putInt(mContext.getContentResolver(),
+                Settings.Secure.ANR_SHOW_BACKGROUND, SETTING_VALUE_OFF);
+        mPreference.setEnabled(false);
+        mPreference.setChecked(false);
+    }
+}
diff --git a/src/com/android/settings/development/BackgroundProcessLimitPreferenceController.java b/src/com/android/settings/development/BackgroundProcessLimitPreferenceController.java
new file mode 100644
index 0000000..9f962ca
--- /dev/null
+++ b/src/com/android/settings/development/BackgroundProcessLimitPreferenceController.java
@@ -0,0 +1,116 @@
+/*
+ * Copyright (C) 2017 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF 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.app.ActivityManager;
+import android.app.IActivityManager;
+import android.content.Context;
+import android.os.RemoteException;
+import android.support.annotation.VisibleForTesting;
+import android.support.v7.preference.ListPreference;
+import android.support.v7.preference.Preference;
+import android.support.v7.preference.PreferenceScreen;
+
+import com.android.settings.R;
+import com.android.settings.core.PreferenceControllerMixin;
+import com.android.settingslib.development.DeveloperOptionsPreferenceController;
+
+public class BackgroundProcessLimitPreferenceController extends
+        DeveloperOptionsPreferenceController implements Preference.OnPreferenceChangeListener,
+        PreferenceControllerMixin {
+
+    private static final String APP_PROCESS_LIMIT_KEY = "app_process_limit";
+
+    private final String[] mListValues;
+    private final String[] mListSummaries;
+    private ListPreference mPreference;
+
+    public BackgroundProcessLimitPreferenceController(Context context) {
+        super(context);
+
+        mListValues = context.getResources().getStringArray(R.array.app_process_limit_values);
+        mListSummaries = context.getResources().getStringArray(R.array.app_process_limit_entries);
+    }
+
+    @Override
+    public String getPreferenceKey() {
+        return APP_PROCESS_LIMIT_KEY;
+    }
+
+    @Override
+    public void displayPreference(PreferenceScreen screen) {
+        super.displayPreference(screen);
+
+        mPreference = (ListPreference) screen.findPreference(getPreferenceKey());
+    }
+
+    @Override
+    public boolean onPreferenceChange(Preference preference, Object newValue) {
+        writeAppProcessLimitOptions(newValue);
+        updateAppProcessLimitOptions();
+        return true;
+    }
+
+    @Override
+    public void updateState(Preference preference) {
+        updateAppProcessLimitOptions();
+    }
+
+    @Override
+    protected void onDeveloperOptionsSwitchEnabled() {
+        mPreference.setEnabled(true);
+    }
+
+    @Override
+    protected void onDeveloperOptionsSwitchDisabled() {
+        writeAppProcessLimitOptions(null);
+        mPreference.setEnabled(false);
+    }
+
+    private void updateAppProcessLimitOptions() {
+        try {
+            final int limit = getActivityManagerService().getProcessLimit();
+            int index = 0; // default
+            for (int i = 0; i < mListValues.length; i++) {
+                int val = Integer.parseInt(mListValues[i]);
+                if (val >= limit) {
+                    index = i;
+                    break;
+                }
+            }
+            mPreference.setValue(mListValues[index]);
+            mPreference.setSummary(mListSummaries[index]);
+        } catch (RemoteException e) {
+            // intentional no-op
+        }
+    }
+
+    private void writeAppProcessLimitOptions(Object newValue) {
+        try {
+            final int limit = newValue != null ? Integer.parseInt(newValue.toString()) : -1;
+            getActivityManagerService().setProcessLimit(limit);
+            updateAppProcessLimitOptions();
+        } catch (RemoteException e) {
+            // intentional no-op
+        }
+    }
+
+    @VisibleForTesting
+    IActivityManager getActivityManagerService() {
+        return ActivityManager.getService();
+    }
+}
diff --git a/src/com/android/settings/development/BluetoothA2dpConfigStore.java b/src/com/android/settings/development/BluetoothA2dpConfigStore.java
new file mode 100644
index 0000000..edf74e3
--- /dev/null
+++ b/src/com/android/settings/development/BluetoothA2dpConfigStore.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.development;
+
+import android.bluetooth.BluetoothCodecConfig;
+
+/**
+ * Utility class for storing current Bluetooth A2DP profile values
+ */
+public class BluetoothA2dpConfigStore {
+
+    // init default values
+    private int mCodecType = BluetoothCodecConfig.SOURCE_CODEC_TYPE_INVALID;
+    private int mCodecPriority = BluetoothCodecConfig.CODEC_PRIORITY_DEFAULT;
+    private int mSampleRate = BluetoothCodecConfig.SAMPLE_RATE_NONE;
+    private int mBitsPerSample = BluetoothCodecConfig.BITS_PER_SAMPLE_NONE;
+    private int mChannelMode = BluetoothCodecConfig.CHANNEL_MODE_NONE;
+    private long mCodecSpecific1Value;
+    private long mCodecSpecific2Value;
+    private long mCodecSpecific3Value;
+    private long mCodecSpecific4Value;
+
+    public void setCodecType(int codecType) {
+        mCodecType = codecType;
+    }
+
+    public void setCodecPriority(int codecPriority) {
+        mCodecPriority = codecPriority;
+    }
+
+    public void setSampleRate(int sampleRate) {
+        mSampleRate = sampleRate;
+    }
+
+    public void setBitsPerSample(int bitsPerSample) {
+        mBitsPerSample = bitsPerSample;
+    }
+
+    public void setChannelMode(int channelMode) {
+        mChannelMode = channelMode;
+    }
+
+    public void setCodecSpecific1Value(int codecSpecific1Value) {
+        mCodecSpecific1Value = codecSpecific1Value;
+    }
+
+    public void setCodecSpecific2Value(int codecSpecific2Value) {
+        mCodecSpecific2Value = codecSpecific2Value;
+    }
+
+    public void setCodecSpecific3Value(int codecSpecific3Value) {
+        mCodecSpecific3Value = codecSpecific3Value;
+    }
+
+    public void setCodecSpecific4Value(int codecSpecific4Value) {
+        mCodecSpecific4Value = codecSpecific4Value;
+    }
+
+    public BluetoothCodecConfig createCodecConfig() {
+        return new BluetoothCodecConfig(mCodecType, mCodecPriority,
+                mSampleRate, mBitsPerSample,
+                mChannelMode, mCodecSpecific1Value,
+                mCodecSpecific2Value, mCodecSpecific3Value,
+                mCodecSpecific4Value);
+    }
+}
diff --git a/src/com/android/settings/development/BluetoothA2dpLock.java b/src/com/android/settings/development/BluetoothA2dpLock.java
new file mode 100644
index 0000000..7058665
--- /dev/null
+++ b/src/com/android/settings/development/BluetoothA2dpLock.java
@@ -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.
+ */
+
+package com.android.settings.development;
+
+import android.bluetooth.BluetoothA2dp;
+
+/**
+ * Utility class to provide synchronization locks for {@link BluetoothA2dp}
+ */
+public class BluetoothA2dpLock {
+}
diff --git a/src/com/android/settings/development/BluetoothAbsoluteVolumePreferenceController.java b/src/com/android/settings/development/BluetoothAbsoluteVolumePreferenceController.java
new file mode 100644
index 0000000..64f6440
--- /dev/null
+++ b/src/com/android/settings/development/BluetoothAbsoluteVolumePreferenceController.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.development;
+
+import android.content.Context;
+import android.os.SystemProperties;
+import android.support.annotation.VisibleForTesting;
+import android.support.v14.preference.SwitchPreference;
+import android.support.v7.preference.Preference;
+import android.support.v7.preference.PreferenceScreen;
+
+import com.android.settings.core.PreferenceControllerMixin;
+import com.android.settingslib.development.DeveloperOptionsPreferenceController;
+
+public class BluetoothAbsoluteVolumePreferenceController extends
+        DeveloperOptionsPreferenceController implements Preference.OnPreferenceChangeListener,
+        PreferenceControllerMixin {
+
+    private static final String BLUETOOTH_DISABLE_ABSOLUTE_VOLUME_KEY =
+            "bluetooth_disable_absolute_volume";
+    @VisibleForTesting
+    static final String BLUETOOTH_DISABLE_ABSOLUTE_VOLUME_PROPERTY =
+            "persist.bluetooth.disableabsvol";
+
+    private SwitchPreference mPreference;
+
+    public BluetoothAbsoluteVolumePreferenceController(Context context) {
+        super(context);
+    }
+
+    @Override
+    public String getPreferenceKey() {
+        return BLUETOOTH_DISABLE_ABSOLUTE_VOLUME_KEY;
+    }
+
+    @Override
+    public void displayPreference(PreferenceScreen screen) {
+        super.displayPreference(screen);
+
+        mPreference = (SwitchPreference) screen.findPreference(getPreferenceKey());
+    }
+
+    @Override
+    public boolean onPreferenceChange(Preference preference, Object newValue) {
+        final boolean isEnabled = (Boolean) newValue;
+        SystemProperties.set(BLUETOOTH_DISABLE_ABSOLUTE_VOLUME_PROPERTY,
+                isEnabled ? "true" : "false");
+        return true;
+    }
+
+    @Override
+    public void updateState(Preference preference) {
+        final boolean isEnabled = SystemProperties.getBoolean(
+                BLUETOOTH_DISABLE_ABSOLUTE_VOLUME_PROPERTY, false /* default */);
+        mPreference.setChecked(isEnabled);
+    }
+
+    @Override
+    protected void onDeveloperOptionsSwitchEnabled() {
+        mPreference.setEnabled(true);
+    }
+
+    @Override
+    protected void onDeveloperOptionsSwitchDisabled() {
+        SystemProperties.set(BLUETOOTH_DISABLE_ABSOLUTE_VOLUME_PROPERTY, "false");
+        mPreference.setChecked(false);
+        mPreference.setEnabled(false);
+    }
+}
diff --git a/src/com/android/settings/development/BluetoothAudioBitsPerSamplePreferenceController.java b/src/com/android/settings/development/BluetoothAudioBitsPerSamplePreferenceController.java
new file mode 100644
index 0000000..f237ac1
--- /dev/null
+++ b/src/com/android/settings/development/BluetoothAudioBitsPerSamplePreferenceController.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.development;
+
+import android.bluetooth.BluetoothCodecConfig;
+import android.content.Context;
+
+import com.android.settings.R;
+import com.android.settingslib.core.lifecycle.Lifecycle;
+
+public class BluetoothAudioBitsPerSamplePreferenceController extends
+        AbstractBluetoothA2dpPreferenceController {
+
+    private static final int DEFAULT_INDEX = 0;
+    private static final String BLUETOOTH_SELECT_A2DP_BITS_PER_SAMPLE_KEY =
+            "bluetooth_select_a2dp_bits_per_sample";
+
+    public BluetoothAudioBitsPerSamplePreferenceController(Context context, Lifecycle lifecycle,
+            BluetoothA2dpConfigStore store) {
+        super(context, lifecycle, store);
+    }
+
+    @Override
+    public String getPreferenceKey() {
+        return BLUETOOTH_SELECT_A2DP_BITS_PER_SAMPLE_KEY;
+    }
+
+    @Override
+    protected String[] getListValues() {
+        return mContext.getResources().getStringArray(
+                R.array.bluetooth_a2dp_codec_bits_per_sample_values);
+    }
+
+    @Override
+    protected String[] getListSummaries() {
+        return mContext.getResources().getStringArray(
+                R.array.bluetooth_a2dp_codec_bits_per_sample_summaries);
+    }
+
+    @Override
+    protected int getDefaultIndex() {
+        return DEFAULT_INDEX;
+    }
+
+    @Override
+    protected void writeConfigurationValues(Object newValue) {
+        final int index = mPreference.findIndexOfValue(newValue.toString());
+        int bitsPerSampleValue = BluetoothCodecConfig.BITS_PER_SAMPLE_NONE; // default
+        switch (index) {
+            case 0:
+                // Reset to default
+                break;
+            case 1:
+                bitsPerSampleValue = BluetoothCodecConfig.BITS_PER_SAMPLE_16;
+                break;
+            case 2:
+                bitsPerSampleValue = BluetoothCodecConfig.BITS_PER_SAMPLE_24;
+                break;
+            case 3:
+                bitsPerSampleValue = BluetoothCodecConfig.BITS_PER_SAMPLE_32;
+                break;
+            default:
+                break;
+        }
+        mBluetoothA2dpConfigStore.setBitsPerSample(bitsPerSampleValue);
+    }
+
+    @Override
+    protected int getCurrentA2dpSettingIndex(BluetoothCodecConfig config) {
+        final int bitsPerSample = config.getBitsPerSample();
+        int index = DEFAULT_INDEX;
+        switch (bitsPerSample) {
+            case BluetoothCodecConfig.BITS_PER_SAMPLE_16:
+                index = 1;
+                break;
+            case BluetoothCodecConfig.BITS_PER_SAMPLE_24:
+                index = 2;
+                break;
+            case BluetoothCodecConfig.BITS_PER_SAMPLE_32:
+                index = 3;
+                break;
+            case BluetoothCodecConfig.BITS_PER_SAMPLE_NONE:
+            default:
+                break;
+        }
+        return index;
+    }
+}
diff --git a/src/com/android/settings/development/BluetoothAudioChannelModePreferenceController.java b/src/com/android/settings/development/BluetoothAudioChannelModePreferenceController.java
new file mode 100644
index 0000000..a58c675
--- /dev/null
+++ b/src/com/android/settings/development/BluetoothAudioChannelModePreferenceController.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.development;
+
+import android.bluetooth.BluetoothCodecConfig;
+import android.content.Context;
+
+import com.android.settings.R;
+import com.android.settingslib.core.lifecycle.Lifecycle;
+
+public class BluetoothAudioChannelModePreferenceController extends
+        AbstractBluetoothA2dpPreferenceController {
+
+    private static final int DEFAULT_INDEX = 0;
+    private static final String BLUETOOTH_SELECT_A2DP_CHANNEL_MODE_KEY =
+            "bluetooth_select_a2dp_channel_mode";
+
+    public BluetoothAudioChannelModePreferenceController(Context context, Lifecycle lifecycle,
+            BluetoothA2dpConfigStore store) {
+        super(context, lifecycle, store);
+    }
+
+    @Override
+    public String getPreferenceKey() {
+        return BLUETOOTH_SELECT_A2DP_CHANNEL_MODE_KEY;
+    }
+
+    @Override
+    protected String[] getListValues() {
+        return mContext.getResources().getStringArray(
+                R.array.bluetooth_a2dp_codec_channel_mode_values);
+    }
+
+    @Override
+    protected String[] getListSummaries() {
+        return mContext.getResources().getStringArray(
+                R.array.bluetooth_a2dp_codec_channel_mode_summaries);
+    }
+
+    @Override
+    protected int getDefaultIndex() {
+        return DEFAULT_INDEX;
+    }
+
+    @Override
+    protected void writeConfigurationValues(Object newValue) {
+        final int index = mPreference.findIndexOfValue(newValue.toString());
+        int channelModeValue = BluetoothCodecConfig.CHANNEL_MODE_NONE; // default
+        switch (index) {
+            case 0:
+                // Reset to default
+                break;
+            case 1:
+                channelModeValue = BluetoothCodecConfig.CHANNEL_MODE_MONO;
+                break;
+            case 2:
+                channelModeValue = BluetoothCodecConfig.CHANNEL_MODE_STEREO;
+                break;
+            default:
+                break;
+        }
+        mBluetoothA2dpConfigStore.setChannelMode(channelModeValue);
+    }
+
+    @Override
+    protected int getCurrentA2dpSettingIndex(BluetoothCodecConfig config) {
+        final int channelMode = config.getChannelMode();
+        int index = DEFAULT_INDEX;
+        switch (channelMode) {
+            case BluetoothCodecConfig.CHANNEL_MODE_MONO:
+                index = 1;
+                break;
+            case BluetoothCodecConfig.CHANNEL_MODE_STEREO:
+                index = 2;
+                break;
+            case BluetoothCodecConfig.CHANNEL_MODE_NONE:
+            default:
+                break;
+        }
+        return index;
+    }
+}
diff --git a/src/com/android/settings/development/BluetoothAudioCodecPreferenceController.java b/src/com/android/settings/development/BluetoothAudioCodecPreferenceController.java
new file mode 100644
index 0000000..2163a70
--- /dev/null
+++ b/src/com/android/settings/development/BluetoothAudioCodecPreferenceController.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.development;
+
+import android.bluetooth.BluetoothCodecConfig;
+import android.content.Context;
+
+import com.android.settings.R;
+import com.android.settingslib.core.lifecycle.Lifecycle;
+
+public class BluetoothAudioCodecPreferenceController extends
+        AbstractBluetoothA2dpPreferenceController {
+
+    private static final int DEFAULT_INDEX = 0;
+    private static final String BLUETOOTH_SELECT_A2DP_CODEC_KEY = "bluetooth_select_a2dp_codec";
+
+    public BluetoothAudioCodecPreferenceController(Context context, Lifecycle lifecycle,
+            BluetoothA2dpConfigStore store) {
+        super(context, lifecycle, store);
+    }
+
+    @Override
+    public String getPreferenceKey() {
+        return BLUETOOTH_SELECT_A2DP_CODEC_KEY;
+    }
+
+    @Override
+    protected String[] getListValues() {
+        return mContext.getResources().getStringArray(
+                R.array.bluetooth_a2dp_codec_values);
+    }
+
+    @Override
+    protected String[] getListSummaries() {
+        return mContext.getResources().getStringArray(
+                R.array.bluetooth_a2dp_codec_summaries);
+    }
+
+    @Override
+    protected int getDefaultIndex() {
+        return DEFAULT_INDEX;
+    }
+
+    @Override
+    protected void writeConfigurationValues(Object newValue) {
+        final int index = mPreference.findIndexOfValue(newValue.toString());
+        int codecTypeValue = BluetoothCodecConfig.SAMPLE_RATE_NONE; // default
+        int codecPriorityValue = BluetoothCodecConfig.CODEC_PRIORITY_DEFAULT;
+        switch (index) {
+            case 0:
+                // Reset the priority of the current codec to default
+                final String oldValue = mPreference.getValue();
+                switch (mPreference.findIndexOfValue(oldValue)) {
+                    case 0:
+                        break;      // No current codec
+                    case 1:
+                        codecTypeValue = BluetoothCodecConfig.SOURCE_CODEC_TYPE_SBC;
+                        break;
+                    case 2:
+                        codecTypeValue = BluetoothCodecConfig.SOURCE_CODEC_TYPE_AAC;
+                        break;
+                    case 3:
+                        codecTypeValue = BluetoothCodecConfig.SOURCE_CODEC_TYPE_APTX;
+                        break;
+                    case 4:
+                        codecTypeValue = BluetoothCodecConfig.SOURCE_CODEC_TYPE_APTX_HD;
+                        break;
+                    case 5:
+                        codecTypeValue = BluetoothCodecConfig.SOURCE_CODEC_TYPE_LDAC;
+                        break;
+                    default:
+                        break;
+                }
+                break;
+            case 1:
+                codecTypeValue = BluetoothCodecConfig.SOURCE_CODEC_TYPE_SBC;
+                codecPriorityValue = BluetoothCodecConfig.CODEC_PRIORITY_HIGHEST;
+                break;
+            case 2:
+                codecTypeValue = BluetoothCodecConfig.SOURCE_CODEC_TYPE_AAC;
+                codecPriorityValue = BluetoothCodecConfig.CODEC_PRIORITY_HIGHEST;
+                break;
+            case 3:
+                codecTypeValue = BluetoothCodecConfig.SOURCE_CODEC_TYPE_APTX;
+                codecPriorityValue = BluetoothCodecConfig.CODEC_PRIORITY_HIGHEST;
+                break;
+            case 4:
+                codecTypeValue = BluetoothCodecConfig.SOURCE_CODEC_TYPE_APTX_HD;
+                codecPriorityValue = BluetoothCodecConfig.CODEC_PRIORITY_HIGHEST;
+                break;
+            case 5:
+                codecTypeValue = BluetoothCodecConfig.SOURCE_CODEC_TYPE_LDAC;
+                codecPriorityValue = BluetoothCodecConfig.CODEC_PRIORITY_HIGHEST;
+                break;
+            case 6:
+                synchronized (mBluetoothA2dpConfigStore) {
+                    if (mBluetoothA2dp != null) {
+                        mBluetoothA2dp.enableOptionalCodecs();
+                    }
+                }
+                return;
+            case 7:
+                synchronized (mBluetoothA2dpConfigStore) {
+                    if (mBluetoothA2dp != null) {
+                        mBluetoothA2dp.disableOptionalCodecs();
+                    }
+                }
+                return;
+            default:
+                break;
+        }
+        mBluetoothA2dpConfigStore.setCodecType(codecTypeValue);
+        mBluetoothA2dpConfigStore.setCodecPriority(codecPriorityValue);
+    }
+
+    @Override
+    protected int getCurrentA2dpSettingIndex(BluetoothCodecConfig config) {
+        final int codecType = config.getCodecType();
+        int index = DEFAULT_INDEX;
+        switch (codecType) {
+            case BluetoothCodecConfig.SOURCE_CODEC_TYPE_SBC:
+                index = 1;
+                break;
+            case BluetoothCodecConfig.SOURCE_CODEC_TYPE_AAC:
+                index = 2;
+                break;
+            case BluetoothCodecConfig.SOURCE_CODEC_TYPE_APTX:
+                index = 3;
+                break;
+            case BluetoothCodecConfig.SOURCE_CODEC_TYPE_APTX_HD:
+                index = 4;
+                break;
+            case BluetoothCodecConfig.SOURCE_CODEC_TYPE_LDAC:
+                index = 5;
+                break;
+            case BluetoothCodecConfig.SOURCE_CODEC_TYPE_INVALID:
+            default:
+                break;
+        }
+        return index;
+    }
+}
diff --git a/src/com/android/settings/development/BluetoothAudioQualityPreferenceController.java b/src/com/android/settings/development/BluetoothAudioQualityPreferenceController.java
new file mode 100644
index 0000000..7adf8e6
--- /dev/null
+++ b/src/com/android/settings/development/BluetoothAudioQualityPreferenceController.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.development;
+
+import android.bluetooth.BluetoothCodecConfig;
+import android.content.Context;
+
+import com.android.settings.R;
+import com.android.settingslib.core.lifecycle.Lifecycle;
+
+public class BluetoothAudioQualityPreferenceController extends
+        AbstractBluetoothA2dpPreferenceController {
+
+    private static final int DEFAULT_INDEX = 3;
+    private static final String BLUETOOTH_SELECT_A2DP_LDAC_PLAYBACK_QUALITY_KEY =
+            "bluetooth_select_a2dp_ldac_playback_quality";
+
+    public BluetoothAudioQualityPreferenceController(Context context, Lifecycle lifecycle,
+            BluetoothA2dpConfigStore store) {
+        super(context, lifecycle, store);
+    }
+
+    @Override
+    public String getPreferenceKey() {
+        return BLUETOOTH_SELECT_A2DP_LDAC_PLAYBACK_QUALITY_KEY;
+    }
+
+    @Override
+    protected String[] getListValues() {
+        return mContext.getResources().getStringArray(
+                R.array.bluetooth_a2dp_codec_ldac_playback_quality_values);
+    }
+
+    @Override
+    protected String[] getListSummaries() {
+        return mContext.getResources().getStringArray(
+                R.array.bluetooth_a2dp_codec_ldac_playback_quality_summaries);
+    }
+
+    @Override
+    protected int getDefaultIndex() {
+        return DEFAULT_INDEX;
+    }
+
+    @Override
+    protected void writeConfigurationValues(Object newValue) {
+        final int index = mPreference.findIndexOfValue(newValue.toString());
+        int codecSpecific1Value = 0; // default
+        switch (index) {
+            case 0:
+            case 1:
+            case 2:
+            case 3:
+                codecSpecific1Value = 1000 + index;
+                break;
+            default:
+                break;
+        }
+        mBluetoothA2dpConfigStore.setCodecSpecific1Value(codecSpecific1Value);
+    }
+
+    @Override
+    protected int getCurrentA2dpSettingIndex(BluetoothCodecConfig config) {
+        // The actual values are 0, 1, 2 - those are extracted
+        // as mod-10 remainders of a larger value.
+        // The reason is because within BluetoothCodecConfig we cannot use
+        // a codec-specific value of zero.
+        int index = (int) config.getCodecSpecific1();
+        if (index > 0) {
+            index %= 10;
+        } else {
+            index = DEFAULT_INDEX;
+        }
+        switch (index) {
+            case 0:
+            case 1:
+            case 2:
+            case 3:
+                break;
+            default:
+                index = DEFAULT_INDEX;
+                break;
+        }
+        return index;
+    }
+}
diff --git a/src/com/android/settings/development/BluetoothAudioSampleRatePreferenceController.java b/src/com/android/settings/development/BluetoothAudioSampleRatePreferenceController.java
new file mode 100644
index 0000000..35b449e
--- /dev/null
+++ b/src/com/android/settings/development/BluetoothAudioSampleRatePreferenceController.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.development;
+
+import android.bluetooth.BluetoothCodecConfig;
+import android.content.Context;
+
+import com.android.settings.R;
+import com.android.settingslib.core.lifecycle.Lifecycle;
+
+public class BluetoothAudioSampleRatePreferenceController extends
+        AbstractBluetoothA2dpPreferenceController {
+
+    private static final int DEFAULT_INDEX = 0;
+    private static final String BLUETOOTH_SELECT_A2DP_SAMPLE_RATE_KEY =
+            "bluetooth_select_a2dp_sample_rate";
+
+    public BluetoothAudioSampleRatePreferenceController(Context context, Lifecycle lifecycle,
+            BluetoothA2dpConfigStore store) {
+        super(context, lifecycle, store);
+    }
+
+    @Override
+    public String getPreferenceKey() {
+        return BLUETOOTH_SELECT_A2DP_SAMPLE_RATE_KEY;
+    }
+
+    @Override
+    protected String[] getListValues() {
+        return mContext.getResources().getStringArray(
+                R.array.bluetooth_a2dp_codec_sample_rate_values);
+    }
+
+    @Override
+    protected String[] getListSummaries() {
+        return mContext.getResources().getStringArray(
+                R.array.bluetooth_a2dp_codec_sample_rate_summaries);
+    }
+
+    @Override
+    protected int getDefaultIndex() {
+        return DEFAULT_INDEX;
+    }
+
+    @Override
+    protected void writeConfigurationValues(Object newValue) {
+        final int index = mPreference.findIndexOfValue(newValue.toString());
+        int sampleRateValue = BluetoothCodecConfig.SAMPLE_RATE_NONE; // default
+        switch (index) {
+            case 0:
+                sampleRateValue = BluetoothCodecConfig.SAMPLE_RATE_NONE;
+                break;
+            case 1:
+                sampleRateValue = BluetoothCodecConfig.SAMPLE_RATE_44100;
+                break;
+            case 2:
+                sampleRateValue = BluetoothCodecConfig.SAMPLE_RATE_48000;
+                break;
+            case 3:
+                sampleRateValue = BluetoothCodecConfig.SAMPLE_RATE_88200;
+                break;
+            case 4:
+                sampleRateValue = BluetoothCodecConfig.SAMPLE_RATE_96000;
+                break;
+            default:
+                break;
+        }
+        mBluetoothA2dpConfigStore.setSampleRate(sampleRateValue);
+    }
+
+    @Override
+    protected int getCurrentA2dpSettingIndex(BluetoothCodecConfig config) {
+        final int sampleRate = config.getSampleRate();
+        int index = DEFAULT_INDEX;
+        switch (sampleRate) {
+            case BluetoothCodecConfig.SAMPLE_RATE_44100:
+                index = 1;
+                break;
+            case BluetoothCodecConfig.SAMPLE_RATE_48000:
+                index = 2;
+                break;
+            case BluetoothCodecConfig.SAMPLE_RATE_88200:
+                index = 3;
+                break;
+            case BluetoothCodecConfig.SAMPLE_RATE_96000:
+                index = 4;
+                break;
+            case BluetoothCodecConfig.SAMPLE_RATE_176400:
+            case BluetoothCodecConfig.SAMPLE_RATE_192000:
+            case BluetoothCodecConfig.SAMPLE_RATE_NONE:
+            default:
+                break;
+        }
+        return index;
+    }
+}
diff --git a/src/com/android/settings/development/BluetoothAvrcpVersionPreferenceController.java b/src/com/android/settings/development/BluetoothAvrcpVersionPreferenceController.java
new file mode 100644
index 0000000..a56f5ea
--- /dev/null
+++ b/src/com/android/settings/development/BluetoothAvrcpVersionPreferenceController.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.development;
+
+import android.content.Context;
+import android.os.SystemProperties;
+import android.support.annotation.VisibleForTesting;
+import android.support.v7.preference.ListPreference;
+import android.support.v7.preference.Preference;
+import android.support.v7.preference.PreferenceScreen;
+import android.text.TextUtils;
+
+import com.android.settings.R;
+import com.android.settings.core.PreferenceControllerMixin;
+import com.android.settingslib.development.DeveloperOptionsPreferenceController;
+
+public class BluetoothAvrcpVersionPreferenceController extends
+        DeveloperOptionsPreferenceController implements Preference.OnPreferenceChangeListener,
+        PreferenceControllerMixin {
+
+    private static final String BLUETOOTH_SELECT_AVRCP_VERSION_KEY =
+            "bluetooth_select_avrcp_version";
+
+    @VisibleForTesting
+    static final String BLUETOOTH_AVRCP_VERSION_PROPERTY = "persist.bluetooth.avrcpversion";
+
+    private final String[] mListValues;
+    private final String[] mListSummaries;
+    private ListPreference mPreference;
+
+    public BluetoothAvrcpVersionPreferenceController(Context context) {
+        super(context);
+
+        mListValues = context.getResources().getStringArray(R.array.bluetooth_avrcp_version_values);
+        mListSummaries = context.getResources().getStringArray(R.array.bluetooth_avrcp_versions);
+    }
+
+    @Override
+    public String getPreferenceKey() {
+        return BLUETOOTH_SELECT_AVRCP_VERSION_KEY;
+    }
+
+    @Override
+    public void displayPreference(PreferenceScreen screen) {
+        super.displayPreference(screen);
+
+        mPreference = (ListPreference) screen.findPreference(getPreferenceKey());
+    }
+
+    @Override
+    public boolean onPreferenceChange(Preference preference, Object newValue) {
+        SystemProperties.set(BLUETOOTH_AVRCP_VERSION_PROPERTY, newValue.toString());
+        updateState(mPreference);
+        return true;
+    }
+
+    @Override
+    public void updateState(Preference preference) {
+        final String currentValue = SystemProperties.get(BLUETOOTH_AVRCP_VERSION_PROPERTY);
+        int index = 0; // Defaults to AVRCP 1.4
+        for (int i = 0; i < mListValues.length; i++) {
+            if (TextUtils.equals(currentValue, mListValues[i])) {
+                index = i;
+                break;
+            }
+        }
+        mPreference.setValue(mListValues[index]);
+        mPreference.setSummary(mListSummaries[index]);
+    }
+
+    @Override
+    protected void onDeveloperOptionsSwitchEnabled() {
+        mPreference.setEnabled(true);
+    }
+
+    @Override
+    protected void onDeveloperOptionsSwitchDisabled() {
+        mPreference.setEnabled(false);
+    }
+}
diff --git a/src/com/android/settings/development/BluetoothDeviceNoNamePreferenceController.java b/src/com/android/settings/development/BluetoothDeviceNoNamePreferenceController.java
new file mode 100644
index 0000000..654a531
--- /dev/null
+++ b/src/com/android/settings/development/BluetoothDeviceNoNamePreferenceController.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.development;
+
+import android.content.Context;
+import android.os.SystemProperties;
+import android.support.annotation.VisibleForTesting;
+import android.support.v14.preference.SwitchPreference;
+import android.support.v7.preference.Preference;
+import android.support.v7.preference.PreferenceScreen;
+
+import com.android.settings.core.PreferenceControllerMixin;
+import com.android.settingslib.development.DeveloperOptionsPreferenceController;
+
+public class BluetoothDeviceNoNamePreferenceController extends
+        DeveloperOptionsPreferenceController implements Preference.OnPreferenceChangeListener,
+        PreferenceControllerMixin {
+
+    private static final String BLUETOOTH_SHOW_DEVICES_WITHOUT_NAMES_KEY =
+            "bluetooth_show_devices_without_names";
+    @VisibleForTesting
+    static final String BLUETOOTH_SHOW_DEVICES_WITHOUT_NAMES_PROPERTY =
+            "persist.bluetooth.showdeviceswithoutnames";
+
+    private SwitchPreference mPreference;
+
+    public BluetoothDeviceNoNamePreferenceController(Context context) {
+        super(context);
+    }
+
+    @Override
+    public String getPreferenceKey() {
+        return BLUETOOTH_SHOW_DEVICES_WITHOUT_NAMES_KEY;
+    }
+
+    @Override
+    public void displayPreference(PreferenceScreen screen) {
+        super.displayPreference(screen);
+
+        mPreference = (SwitchPreference) screen.findPreference(getPreferenceKey());
+    }
+
+    @Override
+    public boolean onPreferenceChange(Preference preference, Object newValue) {
+        final boolean isEnabled = (Boolean) newValue;
+        SystemProperties.set(BLUETOOTH_SHOW_DEVICES_WITHOUT_NAMES_PROPERTY,
+                isEnabled ? "true" : "false");
+        return true;
+    }
+
+    @Override
+    public void updateState(Preference preference) {
+        final boolean isEnabled = SystemProperties.getBoolean(
+                BLUETOOTH_SHOW_DEVICES_WITHOUT_NAMES_PROPERTY, false /* default */);
+        mPreference.setChecked(isEnabled);
+    }
+
+    @Override
+    protected void onDeveloperOptionsSwitchEnabled() {
+        mPreference.setEnabled(true);
+    }
+
+    @Override
+    protected void onDeveloperOptionsSwitchDisabled() {
+        SystemProperties.set(BLUETOOTH_SHOW_DEVICES_WITHOUT_NAMES_PROPERTY, "false");
+        mPreference.setChecked(false);
+        mPreference.setEnabled(false);
+    }
+}
diff --git a/src/com/android/settings/development/BluetoothInbandRingingPreferenceController.java b/src/com/android/settings/development/BluetoothInbandRingingPreferenceController.java
new file mode 100644
index 0000000..db5a881
--- /dev/null
+++ b/src/com/android/settings/development/BluetoothInbandRingingPreferenceController.java
@@ -0,0 +1,95 @@
+/*
+ * Copyright (C) 2017 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF 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.bluetooth.BluetoothHeadset;
+import android.content.Context;
+import android.os.SystemProperties;
+import android.support.annotation.VisibleForTesting;
+import android.support.v14.preference.SwitchPreference;
+import android.support.v7.preference.Preference;
+import android.support.v7.preference.PreferenceScreen;
+
+import com.android.settings.core.PreferenceControllerMixin;
+import com.android.settingslib.development.DeveloperOptionsPreferenceController;
+
+public class BluetoothInbandRingingPreferenceController extends
+        DeveloperOptionsPreferenceController implements Preference.OnPreferenceChangeListener,
+        PreferenceControllerMixin {
+
+    private static final String BLUETOOTH_ENABLE_INBAND_RINGING_KEY =
+            "bluetooth_enable_inband_ringing";
+    @VisibleForTesting
+    static final String BLUETOOTH_ENABLE_INBAND_RINGING_PROPERTY =
+            "persist.bluetooth.enableinbandringing";
+
+    private SwitchPreference mPreference;
+
+    public BluetoothInbandRingingPreferenceController(Context context) {
+        super(context);
+    }
+
+    @Override
+    public boolean isAvailable() {
+        return isInbandRingingSupported();
+    }
+
+    @Override
+    public String getPreferenceKey() {
+        return BLUETOOTH_ENABLE_INBAND_RINGING_KEY;
+    }
+
+    @Override
+    public void displayPreference(PreferenceScreen screen) {
+        super.displayPreference(screen);
+
+        mPreference = (SwitchPreference) screen.findPreference(getPreferenceKey());
+    }
+
+    @Override
+    public boolean onPreferenceChange(Preference preference, Object newValue) {
+        final boolean isEnabled = (Boolean) newValue;
+        SystemProperties.set(BLUETOOTH_ENABLE_INBAND_RINGING_PROPERTY,
+                isEnabled ? "true" : "false");
+        return true;
+    }
+
+    @Override
+    public void updateState(Preference preference) {
+        final boolean isEnabled = SystemProperties.getBoolean(
+                BLUETOOTH_ENABLE_INBAND_RINGING_PROPERTY, true /* default */);
+        mPreference.setChecked(isEnabled);
+    }
+
+    @Override
+    protected void onDeveloperOptionsSwitchEnabled() {
+        mPreference.setEnabled(true);
+    }
+
+    @Override
+    protected void onDeveloperOptionsSwitchDisabled() {
+        mPreference.setEnabled(false);
+        // the default setting for this preference is the enabled state
+        mPreference.setChecked(true);
+        SystemProperties.set(BLUETOOTH_ENABLE_INBAND_RINGING_PROPERTY, "true");
+    }
+
+    @VisibleForTesting
+    boolean isInbandRingingSupported() {
+        return BluetoothHeadset.isInbandRingingSupported(mContext);
+    }
+}
diff --git a/src/com/android/settings/development/BluetoothServiceConnectionListener.java b/src/com/android/settings/development/BluetoothServiceConnectionListener.java
new file mode 100644
index 0000000..9dcd3b7
--- /dev/null
+++ b/src/com/android/settings/development/BluetoothServiceConnectionListener.java
@@ -0,0 +1,41 @@
+/*
+ * Copyright (C) 2017 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF 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.bluetooth.BluetoothA2dp;
+
+/**
+ * Interface for callbacks about bluetooth connectivity.
+ */
+public interface BluetoothServiceConnectionListener {
+
+    /**
+     * Called when the bluetooth service is connected.
+     * @param bluetoothA2dp controller for Bluetooth A2DP profile.
+     */
+    void onBluetoothServiceConnected(BluetoothA2dp bluetoothA2dp);
+
+    /**
+     * Called when the bluetooth codec configuration is changed.
+     */
+    void onBluetoothCodecUpdated();
+
+    /**
+     * Called with the bluetooth service is disconnected.
+     */
+    void onBluetoothServiceDisconnected();
+}
diff --git a/src/com/android/settings/development/BluetoothSnoopLogPreferenceController.java b/src/com/android/settings/development/BluetoothSnoopLogPreferenceController.java
new file mode 100644
index 0000000..56cfd73
--- /dev/null
+++ b/src/com/android/settings/development/BluetoothSnoopLogPreferenceController.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.development;
+
+import android.content.Context;
+import android.os.SystemProperties;
+import android.support.annotation.VisibleForTesting;
+import android.support.v14.preference.SwitchPreference;
+import android.support.v7.preference.Preference;
+import android.support.v7.preference.PreferenceScreen;
+
+import com.android.settings.core.PreferenceControllerMixin;
+import com.android.settingslib.development.DeveloperOptionsPreferenceController;
+
+public class BluetoothSnoopLogPreferenceController extends
+        DeveloperOptionsPreferenceController implements Preference.OnPreferenceChangeListener,
+        PreferenceControllerMixin {
+
+    private static final String PREFERENCE_KEY = "bt_hci_snoop_log";
+    @VisibleForTesting
+    static final String BLUETOOTH_BTSNOOP_ENABLE_PROPERTY =
+            "persist.bluetooth.btsnoopenable";
+
+    private SwitchPreference mPreference;
+
+    public BluetoothSnoopLogPreferenceController(Context context) {
+        super(context);
+    }
+
+    @Override
+    public String getPreferenceKey() {
+        return PREFERENCE_KEY;
+    }
+
+    @Override
+    public void displayPreference(PreferenceScreen screen) {
+        super.displayPreference(screen);
+        mPreference = (SwitchPreference) screen.findPreference(getPreferenceKey());
+    }
+
+    @Override
+    public boolean onPreferenceChange(Preference preference, Object newValue) {
+        final boolean enableBtSnoopLog = (Boolean) newValue;
+        SystemProperties.set(BLUETOOTH_BTSNOOP_ENABLE_PROPERTY, Boolean.toString(enableBtSnoopLog));
+        return true;
+    }
+
+    @Override
+    public void updateState(Preference preference) {
+        super.updateState(preference);
+        final boolean enableBtSnoopLog = SystemProperties.getBoolean(
+                BLUETOOTH_BTSNOOP_ENABLE_PROPERTY, false /* def */);
+        mPreference.setChecked(enableBtSnoopLog);
+    }
+
+    @Override
+    protected void onDeveloperOptionsSwitchEnabled() {
+        mPreference.setEnabled(true);
+    }
+
+    @Override
+    protected void onDeveloperOptionsSwitchDisabled() {
+        SystemProperties.set(BLUETOOTH_BTSNOOP_ENABLE_PROPERTY, Boolean.toString(false));
+        mPreference.setChecked(false);
+        mPreference.setEnabled(false);
+    }
+}
diff --git a/src/com/android/settings/development/BugReportInPowerPreferenceController.java b/src/com/android/settings/development/BugReportInPowerPreferenceController.java
index 4032826..31b618b 100644
--- a/src/com/android/settings/development/BugReportInPowerPreferenceController.java
+++ b/src/com/android/settings/development/BugReportInPowerPreferenceController.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2016 The Android Open Source Project
+ * Copyright (C) 2017 The Android Open Source Project
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -21,50 +21,37 @@
 import android.content.pm.PackageManager;
 import android.os.UserManager;
 import android.provider.Settings;
+import android.support.annotation.VisibleForTesting;
 import android.support.v14.preference.SwitchPreference;
 import android.support.v7.preference.Preference;
 import android.support.v7.preference.PreferenceScreen;
 
 import com.android.settings.core.PreferenceControllerMixin;
-import com.android.settingslib.core.AbstractPreferenceController;
+import com.android.settingslib.development.DeveloperOptionsPreferenceController;
+import com.android.settingslib.wrapper.PackageManagerWrapper;
 
-public class BugReportInPowerPreferenceController extends AbstractPreferenceController
-        implements PreferenceControllerMixin {
+public class BugReportInPowerPreferenceController extends
+        DeveloperOptionsPreferenceController implements Preference.OnPreferenceChangeListener,
+        PreferenceControllerMixin {
 
     private static final String KEY_BUGREPORT_IN_POWER = "bugreport_in_power";
 
-    private UserManager mUserManager;
+    @VisibleForTesting
+    static final ComponentName COMPONENT_NAME = new ComponentName("com.android.shell",
+            "com.android.shell.BugreportStorageProvider");
+    @VisibleForTesting
+    static int SETTING_VALUE_ON = 1;
+    @VisibleForTesting
+    static int SETTING_VALUE_OFF = 0;
+
+    private final PackageManagerWrapper mPackageManager;
+    private final UserManager mUserManager;
     private SwitchPreference mPreference;
 
     public BugReportInPowerPreferenceController(Context context) {
         super(context);
         mUserManager = (UserManager) context.getSystemService(Context.USER_SERVICE);
-    }
-
-    @Override
-    public boolean handlePreferenceTreeClick(Preference preference) {
-        if (KEY_BUGREPORT_IN_POWER.equals(preference.getKey())) {
-            final SwitchPreference switchPreference = (SwitchPreference) preference;
-            Settings.Secure.putInt(mContext.getContentResolver(),
-                Settings.Global.BUGREPORT_IN_POWER_MENU,
-                switchPreference.isChecked() ? 1 : 0);
-            setBugreportStorageProviderStatus();
-            return true;
-        }
-        return false;
-    }
-
-    @Override
-    public void displayPreference(PreferenceScreen screen) {
-        super.displayPreference(screen);
-        if (isAvailable()) {
-            mPreference = (SwitchPreference) screen.findPreference(KEY_BUGREPORT_IN_POWER);
-        }
-    }
-
-    @Override
-    public String getPreferenceKey() {
-        return KEY_BUGREPORT_IN_POWER;
+        mPackageManager = new PackageManagerWrapper(context.getPackageManager());
     }
 
     @Override
@@ -73,49 +60,50 @@
     }
 
     @Override
+    public String getPreferenceKey() {
+        return KEY_BUGREPORT_IN_POWER;
+    }
+
+    @Override
+    public void displayPreference(PreferenceScreen screen) {
+        super.displayPreference(screen);
+
+        mPreference = (SwitchPreference) screen.findPreference(KEY_BUGREPORT_IN_POWER);
+    }
+
+    @Override
+    public boolean onPreferenceChange(Preference preference, Object newValue) {
+        final boolean isEnabled = (Boolean) newValue;
+        Settings.Secure.putInt(mContext.getContentResolver(),
+                Settings.Global.BUGREPORT_IN_POWER_MENU,
+                isEnabled ? SETTING_VALUE_ON : SETTING_VALUE_OFF);
+        setBugreportStorageProviderStatus(isEnabled);
+        return true;
+    }
+
+    @Override
     public void updateState(Preference preference) {
-        updatePreference();
+        final int mode = Settings.Secure.getInt(mContext.getContentResolver(),
+                Settings.Global.BUGREPORT_IN_POWER_MENU, SETTING_VALUE_OFF);
+        mPreference.setChecked(mode != SETTING_VALUE_OFF);
     }
 
-    public void enablePreference(boolean enabled) {
-        if (isAvailable()) {
-            mPreference.setEnabled(enabled);
-        }
+    @Override
+    protected void onDeveloperOptionsSwitchEnabled() {
+        // no-op because this preference can never be disabled
     }
 
-    public void resetPreference() {
-        if (mPreference.isChecked()) {
-            mPreference.setChecked(false);
-            handlePreferenceTreeClick(mPreference);
-        }
+    @Override
+    protected void onDeveloperOptionsSwitchDisabled() {
+        Settings.Secure.putInt(mContext.getContentResolver(),
+                Settings.Global.BUGREPORT_IN_POWER_MENU, SETTING_VALUE_OFF);
+        setBugreportStorageProviderStatus(false);
+        mPreference.setChecked(false);
     }
 
-    public boolean updatePreference() {
-        if (!isAvailable()) {
-            return false;
-        }
-        final boolean enabled = Settings.Secure.getInt(
-            mContext.getContentResolver(), Settings.Global.BUGREPORT_IN_POWER_MENU, 0) != 0;
-        mPreference.setChecked(enabled);
-        return enabled;
+    private void setBugreportStorageProviderStatus(boolean isEnabled) {
+        mPackageManager.setComponentEnabledSetting(COMPONENT_NAME,
+                isEnabled ? PackageManager.COMPONENT_ENABLED_STATE_ENABLED
+                        : PackageManager.COMPONENT_ENABLED_STATE_DEFAULT, 0 /* flags */);
     }
-
-    public void updateBugreportOptions() {
-        if (!isAvailable()) {
-            return;
-        }
-        mPreference.setEnabled(true);
-        setBugreportStorageProviderStatus();
-    }
-
-    private void setBugreportStorageProviderStatus() {
-        final ComponentName componentName = new ComponentName("com.android.shell",
-            "com.android.shell.BugreportStorageProvider");
-        final boolean enabled = mPreference.isChecked();
-        mContext.getPackageManager().setComponentEnabledSetting(componentName,
-            enabled ? PackageManager.COMPONENT_ENABLED_STATE_ENABLED
-                : PackageManager.COMPONENT_ENABLED_STATE_DEFAULT,
-            0);
-    }
-
 }
diff --git a/src/com/android/settings/development/BugReportPreferenceController.java b/src/com/android/settings/development/BugReportPreferenceController.java
index 015071f..ac2ae0d 100644
--- a/src/com/android/settings/development/BugReportPreferenceController.java
+++ b/src/com/android/settings/development/BugReportPreferenceController.java
@@ -18,47 +18,30 @@
 
 import android.content.Context;
 import android.os.UserManager;
-import android.support.v7.preference.Preference;
-import android.support.v7.preference.PreferenceScreen;
 
 import com.android.settings.core.PreferenceControllerMixin;
-import com.android.settingslib.core.AbstractPreferenceController;
+import com.android.settingslib.development.DeveloperOptionsPreferenceController;
 
-public class BugReportPreferenceController extends AbstractPreferenceController implements
+public class BugReportPreferenceController extends DeveloperOptionsPreferenceController implements
         PreferenceControllerMixin {
 
     private static final String KEY_BUGREPORT = "bugreport";
 
-    private UserManager mUserManager;
-    private Preference mPreference;
+    private final UserManager mUserManager;
 
     public BugReportPreferenceController(Context context) {
         super(context);
+
         mUserManager = (UserManager) context.getSystemService(Context.USER_SERVICE);
     }
 
     @Override
-    public void displayPreference(PreferenceScreen screen) {
-        super.displayPreference(screen);
-        if (isAvailable()) {
-            mPreference = screen.findPreference(KEY_BUGREPORT);
-        }
-    }
-
-    @Override
-    public String getPreferenceKey() {
-        return KEY_BUGREPORT;
-    }
-
-    @Override
     public boolean isAvailable() {
         return !mUserManager.hasUserRestriction(UserManager.DISALLOW_DEBUGGING_FEATURES);
     }
 
-    public void enablePreference(boolean enabled) {
-        if (isAvailable()) {
-            mPreference.setEnabled(enabled);
-        }
+    @Override
+    public String getPreferenceKey() {
+        return KEY_BUGREPORT;
     }
-
 }
diff --git a/src/com/android/settings/development/CameraLaserSensorPreferenceController.java b/src/com/android/settings/development/CameraLaserSensorPreferenceController.java
index 26bfc80..41a7983 100644
--- a/src/com/android/settings/development/CameraLaserSensorPreferenceController.java
+++ b/src/com/android/settings/development/CameraLaserSensorPreferenceController.java
@@ -14,6 +14,7 @@
  * limitations under the License.
  */
 
+
 package com.android.settings.development;
 
 import android.content.Context;
@@ -21,15 +22,16 @@
 import android.support.v14.preference.SwitchPreference;
 import android.support.v7.preference.Preference;
 import android.support.v7.preference.PreferenceScreen;
-import android.widget.Toast;
+import android.text.TextUtils;
 
 import com.android.internal.annotations.VisibleForTesting;
 import com.android.settings.R;
 import com.android.settings.core.PreferenceControllerMixin;
-import com.android.settingslib.core.AbstractPreferenceController;
+import com.android.settingslib.development.DeveloperOptionsPreferenceController;
 
-public class CameraLaserSensorPreferenceController extends AbstractPreferenceController
-        implements PreferenceControllerMixin {
+public class CameraLaserSensorPreferenceController extends
+        DeveloperOptionsPreferenceController implements
+        Preference.OnPreferenceChangeListener, PreferenceControllerMixin {
 
     private static final String KEY_CAMERA_LASER_SENSOR_SWITCH = "camera_laser_sensor_switch";
     @VisibleForTesting
@@ -40,6 +42,12 @@
     static final int ENABLED = 0;
     @VisibleForTesting
     static final int DISABLED = 2;
+    @VisibleForTesting
+    static final String USERDEBUG_BUILD = "userdebug";
+    @VisibleForTesting
+    static final String ENG_BUILD = "eng";
+    @VisibleForTesting
+    static final String USER_BUILD = "user";
 
     private SwitchPreference mPreference;
 
@@ -48,10 +56,11 @@
     }
 
     @Override
-    public void displayPreference(PreferenceScreen screen) {
-        super.displayPreference(screen);
-        mPreference = (SwitchPreference) screen.findPreference(KEY_CAMERA_LASER_SENSOR_SWITCH);
-        updatePreference();
+    public boolean isAvailable() {
+        final String buildType = SystemProperties.get(BUILD_TYPE);
+        return mContext.getResources().getBoolean(R.bool.config_show_camera_laser_sensor) &&
+                (TextUtils.equals(USERDEBUG_BUILD, buildType) || TextUtils.equals(ENG_BUILD,
+                        buildType));
     }
 
     @Override
@@ -60,45 +69,42 @@
     }
 
     @Override
-    public boolean isAvailable() {
-        String buildType = SystemProperties.get(BUILD_TYPE);
-        return mContext.getResources().getBoolean(R.bool.config_show_camera_laser_sensor) &&
-               (buildType.equals("userdebug") || buildType.equals("eng"));
+    public void displayPreference(PreferenceScreen screen) {
+        super.displayPreference(screen);
+
+        mPreference = (SwitchPreference) screen.findPreference(getPreferenceKey());
+    }
+
+    @Override
+    public boolean onPreferenceChange(Preference preference, Object newValue) {
+        final boolean isEnabled = (Boolean) newValue;
+        String value = Integer.toString(isEnabled ? ENABLED : DISABLED);
+        SystemProperties.set(PROPERTY_CAMERA_LASER_SENSOR, value);
+        return true;
     }
 
     @Override
     public void updateState(Preference preference) {
-        updatePreference();
+        final boolean enabled = isLaserSensorEnabled();
+        mPreference.setChecked(enabled);
     }
 
     @Override
-    public boolean handlePreferenceTreeClick(Preference preference) {
-        if (KEY_CAMERA_LASER_SENSOR_SWITCH.equals(preference.getKey())) {
-            final SwitchPreference switchPreference = (SwitchPreference)preference;
-            String value = Integer.toString(switchPreference.isChecked() ? ENABLED : DISABLED);
-            SystemProperties.set(PROPERTY_CAMERA_LASER_SENSOR, value);
-            return true;
-        }
-        return false;
+    protected void onDeveloperOptionsSwitchEnabled() {
+        mPreference.setEnabled(true);
     }
 
-    public void enablePreference(boolean enabled) {
-        if (isAvailable()) {
-            mPreference.setEnabled(enabled);
-        }
-    }
-
-    public boolean updatePreference() {
-        if (!isAvailable()) {
-            return false;
-        }
-        final boolean enabled = isLaserSensorEnabled();
-        mPreference.setChecked(enabled);
-        return enabled;
+    @Override
+    protected void onDeveloperOptionsSwitchDisabled() {
+        SystemProperties.set(PROPERTY_CAMERA_LASER_SENSOR, Integer.toString(DISABLED));
+        mPreference.setChecked(false);
+        mPreference.setEnabled(false);
     }
 
     private boolean isLaserSensorEnabled() {
-        String prop = SystemProperties.get(PROPERTY_CAMERA_LASER_SENSOR, Integer.toString(ENABLED));
-        return prop.equals(Integer.toString(ENABLED));
+        final String prop = SystemProperties.get(PROPERTY_CAMERA_LASER_SENSOR,
+                Integer.toString(ENABLED));
+        return TextUtils.equals(Integer.toString(ENABLED), prop);
     }
+
 }
diff --git a/src/com/android/settings/development/ClearAdbKeysPreferenceController.java b/src/com/android/settings/development/ClearAdbKeysPreferenceController.java
new file mode 100644
index 0000000..b512757
--- /dev/null
+++ b/src/com/android/settings/development/ClearAdbKeysPreferenceController.java
@@ -0,0 +1,114 @@
+/*
+ * Copyright (C) 2017 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.development;
+
+import android.content.Context;
+import android.hardware.usb.IUsbManager;
+import android.os.RemoteException;
+import android.os.ServiceManager;
+import android.os.SystemProperties;
+import android.os.UserManager;
+import android.support.annotation.VisibleForTesting;
+import android.support.v7.preference.Preference;
+import android.support.v7.preference.PreferenceScreen;
+import android.text.TextUtils;
+import android.util.Log;
+
+import com.android.settings.Utils;
+import com.android.settings.core.PreferenceControllerMixin;
+import com.android.settingslib.development.DeveloperOptionsPreferenceController;
+
+public class ClearAdbKeysPreferenceController extends
+        DeveloperOptionsPreferenceController implements PreferenceControllerMixin {
+
+    private static final String TAG = "ClearAdbPrefCtrl";
+    private static final String CLEAR_ADB_KEYS = "clear_adb_keys";
+
+    @VisibleForTesting
+    static final String RO_ADB_SECURE_PROPERTY_KEY = "ro.adb.secure";
+
+    private final IUsbManager mUsbManager;
+    private final DevelopmentSettingsDashboardFragment mFragment;
+
+    private Preference mPreference;
+
+    public ClearAdbKeysPreferenceController(Context context,
+            DevelopmentSettingsDashboardFragment fragment) {
+        super(context);
+
+        mFragment = fragment;
+        mUsbManager = IUsbManager.Stub.asInterface(ServiceManager.getService(Context.USB_SERVICE));
+    }
+
+    @Override
+    public boolean isAvailable() {
+        return SystemProperties.getBoolean(RO_ADB_SECURE_PROPERTY_KEY, false /* default */);
+    }
+
+    @Override
+    public String getPreferenceKey() {
+        return CLEAR_ADB_KEYS;
+    }
+
+    @Override
+    public void displayPreference(PreferenceScreen screen) {
+        super.displayPreference(screen);
+
+        mPreference = screen.findPreference(getPreferenceKey());
+        if (mPreference != null && !isAdminUser()) {
+            mPreference.setEnabled(false);
+        }
+    }
+
+    @Override
+    public boolean handlePreferenceTreeClick(Preference preference) {
+        if (Utils.isMonkeyRunning()) {
+            return false;
+        }
+
+        if (TextUtils.equals(preference.getKey(), getPreferenceKey())) {
+            ClearAdbKeysWarningDialog.show(mFragment);
+            return true;
+        }
+        return false;
+    }
+
+    @Override
+    protected void onDeveloperOptionsSwitchEnabled() {
+        if (isAdminUser()) {
+            mPreference.setEnabled(true);
+        }
+    }
+
+    @Override
+    protected void onDeveloperOptionsSwitchDisabled() {
+        mPreference.setEnabled(false);
+    }
+
+    public void onClearAdbKeysConfirmed() {
+        try {
+            mUsbManager.clearUsbDebuggingKeys();
+        } catch (RemoteException e) {
+            Log.e(TAG, "Unable to clear adb keys", e);
+        }
+    }
+
+    @VisibleForTesting
+    boolean isAdminUser() {
+        return ((UserManager) mContext.getSystemService(Context.USER_SERVICE)).isAdminUser();
+    }
+}
diff --git a/src/com/android/settings/development/ClearAdbKeysWarningDialog.java b/src/com/android/settings/development/ClearAdbKeysWarningDialog.java
new file mode 100644
index 0000000..61b55a0
--- /dev/null
+++ b/src/com/android/settings/development/ClearAdbKeysWarningDialog.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.development;
+
+import android.app.AlertDialog;
+import android.app.Dialog;
+import android.app.Fragment;
+import android.app.FragmentManager;
+import android.content.DialogInterface;
+import android.os.Bundle;
+
+import com.android.internal.logging.nano.MetricsProto;
+import com.android.settings.R;
+import com.android.settings.core.instrumentation.InstrumentedDialogFragment;
+
+public class ClearAdbKeysWarningDialog extends InstrumentedDialogFragment implements
+        DialogInterface.OnClickListener, DialogInterface.OnDismissListener {
+
+    public static final String TAG = "ClearAdbKeysDlg";
+
+    public static void show(Fragment host) {
+        final FragmentManager manager = host.getActivity().getFragmentManager();
+        if (manager.findFragmentByTag(TAG) == null) {
+            final ClearAdbKeysWarningDialog dialog =
+                    new ClearAdbKeysWarningDialog();
+            dialog.setTargetFragment(host, 0 /* requestCode */);
+            dialog.show(manager, TAG);
+        }
+    }
+
+    @Override
+    public int getMetricsCategory() {
+        return MetricsProto.MetricsEvent.DIALOG_CLEAR_ADB_KEYS;
+    }
+
+    @Override
+    public Dialog onCreateDialog(Bundle savedInstanceState) {
+        return new AlertDialog.Builder(getActivity())
+                .setMessage(R.string.adb_keys_warning_message)
+                .setPositiveButton(android.R.string.ok, this /* onClickListener */)
+                .setNegativeButton(android.R.string.cancel, null /* onClickListener */)
+                .create();
+    }
+
+    @Override
+    public void onClick(DialogInterface dialog, int which) {
+        final AdbClearKeysDialogHost host = (AdbClearKeysDialogHost) getTargetFragment();
+        if (host == null) {
+            return;
+        }
+        host.onAdbClearKeysDialogConfirmed();
+    }
+}
diff --git a/src/com/android/settings/development/ColorModePreference.java b/src/com/android/settings/development/ColorModePreference.java
index e0b0837..20af2c6 100644
--- a/src/com/android/settings/development/ColorModePreference.java
+++ b/src/com/android/settings/development/ColorModePreference.java
@@ -28,6 +28,7 @@
 import com.android.settings.R;
 
 import java.util.ArrayList;
+import java.util.List;
 
 public class ColorModePreference extends SwitchPreference implements DisplayListener {
 
@@ -35,7 +36,28 @@
     private Display mDisplay;
 
     private int mCurrentIndex;
-    private ArrayList<ColorModeDescription> mDescriptions;
+    private List<ColorModeDescription> mDescriptions;
+
+    public static List<ColorModeDescription> getColorModeDescriptions(Context context) {
+
+        List<ColorModeDescription> colorModeDescriptions = new ArrayList<>();
+        Resources resources = context.getResources();
+        int[] colorModes = resources.getIntArray(R.array.color_mode_ids);
+        String[] titles = resources.getStringArray(R.array.color_mode_names);
+        String[] descriptions = resources.getStringArray(R.array.color_mode_descriptions);
+        // Map the resource information describing color modes.
+        for (int i = 0; i < colorModes.length; i++) {
+            if (colorModes[i] != -1 && i != 1 /* Skip Natural for now. */) {
+                ColorModeDescription desc = new ColorModeDescription();
+                desc.colorMode = colorModes[i];
+                desc.title = titles[i];
+                desc.summary = descriptions[i];
+                colorModeDescriptions.add(desc);
+            }
+        }
+
+        return colorModeDescriptions;
+    }
 
     public ColorModePreference(Context context, AttributeSet attrs) {
         super(context, attrs);
@@ -75,22 +97,7 @@
     public void updateCurrentAndSupported() {
         mDisplay = mDisplayManager.getDisplay(Display.DEFAULT_DISPLAY);
 
-        mDescriptions = new ArrayList<>();
-
-        Resources resources = getContext().getResources();
-        int[] colorModes = resources.getIntArray(R.array.color_mode_ids);
-        String[] titles = resources.getStringArray(R.array.color_mode_names);
-        String[] descriptions = resources.getStringArray(R.array.color_mode_descriptions);
-        // Map the resource information describing color modes.
-        for (int i = 0; i < colorModes.length; i++) {
-            if (colorModes[i] != -1 && i != 1 /* Skip Natural for now. */) {
-                ColorModeDescription desc = new ColorModeDescription();
-                desc.colorMode = colorModes[i];
-                desc.title = titles[i];
-                desc.summary = descriptions[i];
-                mDescriptions.add(desc);
-            }
-        }
+        mDescriptions = getColorModeDescriptions(getContext());
 
         int currentColorMode = mDisplay.getColorMode();
         mCurrentIndex = -1;
diff --git a/src/com/android/settings/development/ConnectivityMonitorPreferenceController.java b/src/com/android/settings/development/ConnectivityMonitorPreferenceController.java
new file mode 100644
index 0000000..075af2b
--- /dev/null
+++ b/src/com/android/settings/development/ConnectivityMonitorPreferenceController.java
@@ -0,0 +1,116 @@
+/*
+ * Copyright (C) 2017 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF 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.SystemProperties;
+import android.support.v14.preference.SwitchPreference;
+import android.support.v7.preference.Preference;
+import android.support.v7.preference.PreferenceScreen;
+import android.text.TextUtils;
+import android.widget.Toast;
+
+import com.android.internal.annotations.VisibleForTesting;
+import com.android.settings.R;
+import com.android.settings.core.PreferenceControllerMixin;
+import com.android.settingslib.development.DeveloperOptionsPreferenceController;
+
+public class ConnectivityMonitorPreferenceController extends
+        DeveloperOptionsPreferenceController implements Preference.OnPreferenceChangeListener,
+        PreferenceControllerMixin {
+
+    private static final String KEY_CONNECTIVITY_MONITOR_SWITCH = "connectivity_monitor_switch";
+    @VisibleForTesting
+    static final String BUILD_TYPE = "ro.build.type";
+    @VisibleForTesting
+    static final String PROPERTY_CONNECTIVITY_MONITOR = "persist.radio.enable_tel_mon";
+
+    @VisibleForTesting
+    static final String ENABLED_STATUS = "enabled";
+    @VisibleForTesting
+    static final String DISABLED_STATUS = "disabled";
+    @VisibleForTesting
+    static final String USER_ENABLED_STATUS = "user_enabled";
+    @VisibleForTesting
+    static final String USER_DISABLED_STATUS = "user_disabled";
+
+    @VisibleForTesting
+    static final String USERDEBUG_BUILD = "userdebug";
+    @VisibleForTesting
+    static final String ENG_BUILD = "eng";
+
+    private SwitchPreference mPreference;
+
+    public ConnectivityMonitorPreferenceController(Context context) {
+        super(context);
+    }
+
+    @Override
+    public void displayPreference(PreferenceScreen screen) {
+        super.displayPreference(screen);
+
+        mPreference = (SwitchPreference) screen.findPreference(KEY_CONNECTIVITY_MONITOR_SWITCH);
+    }
+
+    @Override
+    public String getPreferenceKey() {
+        return KEY_CONNECTIVITY_MONITOR_SWITCH;
+    }
+
+    @Override
+    public boolean isAvailable() {
+        final String buildType = SystemProperties.get(BUILD_TYPE);
+        return mContext.getResources().getBoolean(R.bool.config_show_connectivity_monitor)
+                && (TextUtils.equals(buildType, USERDEBUG_BUILD)
+                || TextUtils.equals(buildType, ENG_BUILD));
+    }
+
+    @Override
+    public boolean onPreferenceChange(Preference preference, Object newValue) {
+        final boolean isEnabled = (Boolean) newValue;
+        SystemProperties.set(PROPERTY_CONNECTIVITY_MONITOR,
+                isEnabled ? USER_ENABLED_STATUS : USER_DISABLED_STATUS);
+        Toast.makeText(mContext, R.string.connectivity_monitor_toast,
+                Toast.LENGTH_LONG).show();
+        return true;
+    }
+
+    @Override
+    public void updateState(Preference preference) {
+        final boolean enabled = isConnectivityMonitorEnabled();
+        mPreference.setChecked(enabled);
+    }
+
+    @Override
+    protected void onDeveloperOptionsSwitchEnabled() {
+        mPreference.setEnabled(true);
+    }
+
+    @Override
+    protected void onDeveloperOptionsSwitchDisabled() {
+        SystemProperties.set(PROPERTY_CONNECTIVITY_MONITOR, USER_DISABLED_STATUS);
+        mPreference.setChecked(false);
+        mPreference.setEnabled(false);
+    }
+
+    private boolean isConnectivityMonitorEnabled() {
+        final String cmStatus = SystemProperties.get(PROPERTY_CONNECTIVITY_MONITOR,
+                DISABLED_STATUS);
+        return TextUtils.equals(ENABLED_STATUS, cmStatus) || TextUtils.equals(USER_ENABLED_STATUS,
+                cmStatus);
+    }
+}
diff --git a/src/com/android/settings/development/CoolColorTemperaturePreferenceController.java b/src/com/android/settings/development/CoolColorTemperaturePreferenceController.java
new file mode 100644
index 0000000..aa954c0
--- /dev/null
+++ b/src/com/android/settings/development/CoolColorTemperaturePreferenceController.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.development;
+
+import android.content.Context;
+import android.os.SystemProperties;
+import android.support.annotation.VisibleForTesting;
+import android.support.v14.preference.SwitchPreference;
+import android.support.v7.preference.Preference;
+import android.support.v7.preference.PreferenceScreen;
+import android.widget.Toast;
+
+import com.android.settings.R;
+import com.android.settings.core.PreferenceControllerMixin;
+import com.android.settingslib.development.DeveloperOptionsPreferenceController;
+import com.android.settingslib.development.SystemPropPoker;
+
+public class CoolColorTemperaturePreferenceController extends
+        DeveloperOptionsPreferenceController implements
+        Preference.OnPreferenceChangeListener, PreferenceControllerMixin {
+
+    private static final String COLOR_TEMPERATURE_KEY = "color_temperature";
+
+    @VisibleForTesting
+    static final String COLOR_TEMPERATURE_PROPERTY = "persist.sys.debug.color_temp";
+
+    private SwitchPreference mPreference;
+
+    public CoolColorTemperaturePreferenceController(Context context) {
+        super(context);
+    }
+
+    @Override
+    public boolean isAvailable() {
+        return mContext.getResources().getBoolean(R.bool.config_enableColorTemperature);
+    }
+
+    @Override
+    public String getPreferenceKey() {
+        return COLOR_TEMPERATURE_KEY;
+    }
+
+    @Override
+    public void displayPreference(PreferenceScreen screen) {
+        super.displayPreference(screen);
+        mPreference = (SwitchPreference) screen.findPreference(getPreferenceKey());
+    }
+
+    @Override
+    public boolean onPreferenceChange(Preference preference, Object newValue) {
+        final boolean isColorTemperatureEnabled = (Boolean) newValue;
+        SystemProperties.set(COLOR_TEMPERATURE_PROPERTY,
+                Boolean.toString(isColorTemperatureEnabled));
+        SystemPropPoker.getInstance().poke();
+        displayColorTemperatureToast();
+        return true;
+    }
+
+    @Override
+    public void updateState(Preference preference) {
+        final boolean enableColorTemperature = SystemProperties.getBoolean(
+                COLOR_TEMPERATURE_PROPERTY, false /* default */);
+        mPreference.setChecked(enableColorTemperature);
+    }
+
+    @Override
+    protected void onDeveloperOptionsSwitchEnabled() {
+        mPreference.setEnabled(true);
+    }
+
+    @Override
+    protected void onDeveloperOptionsSwitchDisabled() {
+        SystemProperties.set(COLOR_TEMPERATURE_PROPERTY, Boolean.toString(false));
+        mPreference.setChecked(false);
+        mPreference.setEnabled(false);
+    }
+
+    @VisibleForTesting
+    void displayColorTemperatureToast() {
+        Toast.makeText(mContext, R.string.color_temperature_toast, Toast.LENGTH_LONG).show();
+    }
+}
diff --git a/src/com/android/settings/development/DebugGpuOverdrawPreferenceController.java b/src/com/android/settings/development/DebugGpuOverdrawPreferenceController.java
new file mode 100644
index 0000000..5e0baa8
--- /dev/null
+++ b/src/com/android/settings/development/DebugGpuOverdrawPreferenceController.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.development;
+
+import android.content.Context;
+import android.os.SystemProperties;
+import android.support.v7.preference.ListPreference;
+import android.support.v7.preference.Preference;
+import android.support.v7.preference.PreferenceScreen;
+import android.text.TextUtils;
+import android.view.ThreadedRenderer;
+
+import com.android.settings.R;
+import com.android.settings.core.PreferenceControllerMixin;
+import com.android.settingslib.development.DeveloperOptionsPreferenceController;
+import com.android.settingslib.development.SystemPropPoker;
+
+public class DebugGpuOverdrawPreferenceController extends
+        DeveloperOptionsPreferenceController implements Preference.OnPreferenceChangeListener,
+        PreferenceControllerMixin {
+
+    private static final String DEBUG_HW_OVERDRAW_KEY = "debug_hw_overdraw";
+
+    private final String[] mListValues;
+    private final String[] mListSummaries;
+    private ListPreference mPreference;
+
+    public DebugGpuOverdrawPreferenceController(Context context) {
+        super(context);
+
+        mListValues = context.getResources().getStringArray(R.array.debug_hw_overdraw_values);
+        mListSummaries = context.getResources().getStringArray(R.array.debug_hw_overdraw_entries);
+    }
+
+    @Override
+    public String getPreferenceKey() {
+        return DEBUG_HW_OVERDRAW_KEY;
+    }
+
+    @Override
+    public void displayPreference(PreferenceScreen screen) {
+        super.displayPreference(screen);
+
+        mPreference = (ListPreference) screen.findPreference(getPreferenceKey());
+    }
+
+    @Override
+    public boolean onPreferenceChange(Preference preference, Object newValue) {
+        writeDebugHwOverdrawOptions(newValue);
+        updateDebugHwOverdrawOptions();
+        return true;
+    }
+
+    @Override
+    public void updateState(Preference preference) {
+        updateDebugHwOverdrawOptions();
+    }
+
+    @Override
+    protected void onDeveloperOptionsSwitchEnabled() {
+        mPreference.setEnabled(true);
+    }
+
+    @Override
+    protected void onDeveloperOptionsSwitchDisabled() {
+        mPreference.setEnabled(false);
+    }
+
+    private void writeDebugHwOverdrawOptions(Object newValue) {
+        SystemProperties.set(ThreadedRenderer.DEBUG_OVERDRAW_PROPERTY,
+                newValue == null ? "" : newValue.toString());
+        SystemPropPoker.getInstance().poke();
+    }
+
+    private void updateDebugHwOverdrawOptions() {
+        final String value = SystemProperties.get(
+                ThreadedRenderer.DEBUG_OVERDRAW_PROPERTY, "" /* default */);
+
+        int index = 0; // default
+        for (int i = 0; i < mListValues.length; i++) {
+            if (TextUtils.equals(value, mListValues[i])) {
+                index = i;
+                break;
+            }
+        }
+        mPreference.setValue(mListValues[index]);
+        mPreference.setSummary(mListSummaries[index]);
+    }
+}
diff --git a/src/com/android/settings/development/DebugNonRectClipOperationsPreferenceController.java b/src/com/android/settings/development/DebugNonRectClipOperationsPreferenceController.java
new file mode 100644
index 0000000..bd4577a
--- /dev/null
+++ b/src/com/android/settings/development/DebugNonRectClipOperationsPreferenceController.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.development;
+
+import android.content.Context;
+import android.os.SystemProperties;
+import android.support.v7.preference.ListPreference;
+import android.support.v7.preference.Preference;
+import android.support.v7.preference.PreferenceScreen;
+import android.text.TextUtils;
+import android.view.ThreadedRenderer;
+
+import com.android.settings.R;
+import com.android.settings.core.PreferenceControllerMixin;
+import com.android.settingslib.development.DeveloperOptionsPreferenceController;
+import com.android.settingslib.development.SystemPropPoker;
+
+public class DebugNonRectClipOperationsPreferenceController extends
+        DeveloperOptionsPreferenceController implements Preference.OnPreferenceChangeListener,
+        PreferenceControllerMixin {
+
+    private static final String SHOW_NON_RECTANGULAR_CLIP_KEY = "show_non_rect_clip";
+
+    private final String[] mListValues;
+    private final String[] mListSummaries;
+    private ListPreference mPreference;
+
+    public DebugNonRectClipOperationsPreferenceController(Context context) {
+        super(context);
+
+        mListValues = context.getResources().getStringArray(R.array.show_non_rect_clip_values);
+        mListSummaries = context.getResources().getStringArray(R.array.show_non_rect_clip_entries);
+    }
+
+    @Override
+    public String getPreferenceKey() {
+        return SHOW_NON_RECTANGULAR_CLIP_KEY;
+    }
+
+    @Override
+    public void displayPreference(PreferenceScreen screen) {
+        super.displayPreference(screen);
+
+        mPreference = (ListPreference) screen.findPreference(getPreferenceKey());
+    }
+
+    @Override
+    public boolean onPreferenceChange(Preference preference, Object newValue) {
+        writeShowNonRectClipOptions(newValue);
+        updateShowNonRectClipOptions();
+        return true;
+    }
+
+    @Override
+    public void updateState(Preference preference) {
+        updateShowNonRectClipOptions();
+    }
+
+    @Override
+    protected void onDeveloperOptionsSwitchEnabled() {
+        mPreference.setEnabled(true);
+    }
+
+    @Override
+    protected void onDeveloperOptionsSwitchDisabled() {
+        mPreference.setEnabled(false);
+    }
+
+    private void writeShowNonRectClipOptions(Object newValue) {
+        SystemProperties.set(ThreadedRenderer.DEBUG_SHOW_NON_RECTANGULAR_CLIP_PROPERTY,
+                newValue == null ? "" : newValue.toString());
+        SystemPropPoker.getInstance().poke();
+    }
+
+    private void updateShowNonRectClipOptions() {
+        final String value = SystemProperties.get(
+                ThreadedRenderer.DEBUG_SHOW_NON_RECTANGULAR_CLIP_PROPERTY, "hide" /* default */);
+
+        int index = 0; // default
+        for (int i = 0; i < mListValues.length; i++) {
+            if (TextUtils.equals(value, mListValues[i])) {
+                index = i;
+                break;
+            }
+        }
+        mPreference.setValue(mListValues[index]);
+        mPreference.setSummary(mListSummaries[index]);
+    }
+}
diff --git a/src/com/android/settings/development/DebugViewAttributesPreferenceController.java b/src/com/android/settings/development/DebugViewAttributesPreferenceController.java
new file mode 100644
index 0000000..caf23fa
--- /dev/null
+++ b/src/com/android/settings/development/DebugViewAttributesPreferenceController.java
@@ -0,0 +1,86 @@
+/*
+ * Copyright (C) 2017 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.development;
+
+import android.content.Context;
+import android.provider.Settings;
+import android.support.annotation.VisibleForTesting;
+import android.support.v14.preference.SwitchPreference;
+import android.support.v7.preference.Preference;
+import android.support.v7.preference.PreferenceScreen;
+
+import com.android.settings.core.PreferenceControllerMixin;
+import com.android.settingslib.development.DeveloperOptionsPreferenceController;
+
+public class DebugViewAttributesPreferenceController extends
+        DeveloperOptionsPreferenceController implements Preference.OnPreferenceChangeListener,
+        PreferenceControllerMixin {
+
+    private static final String DEBUG_VIEW_ATTRIBUTES_KEY = "debug_view_attributes";
+
+    @VisibleForTesting
+    static final int SETTING_VALUE_ON = 1;
+    @VisibleForTesting
+    static final int SETTING_VALUE_OFF = 0;
+
+    private SwitchPreference mPreference;
+
+    public DebugViewAttributesPreferenceController(Context context) {
+        super(context);
+    }
+
+    @Override
+    public String getPreferenceKey() {
+        return DEBUG_VIEW_ATTRIBUTES_KEY;
+    }
+
+    @Override
+    public void displayPreference(PreferenceScreen screen) {
+        super.displayPreference(screen);
+
+        mPreference = (SwitchPreference) screen.findPreference(getPreferenceKey());
+    }
+
+    @Override
+    public boolean onPreferenceChange(Preference preference, Object newValue) {
+        final boolean showViewAttr = (Boolean) newValue;
+        Settings.Global.putInt(mContext.getContentResolver(),
+                Settings.Global.DEBUG_VIEW_ATTRIBUTES,
+                showViewAttr ? SETTING_VALUE_ON : SETTING_VALUE_OFF);
+        return true;
+    }
+
+    @Override
+    public void updateState(Preference preference) {
+        final int debugViewAttrMode = Settings.Global.getInt(mContext.getContentResolver(),
+                Settings.Global.DEBUG_VIEW_ATTRIBUTES, 0 /* default */);
+        mPreference.setChecked(debugViewAttrMode != SETTING_VALUE_OFF);
+    }
+
+    @Override
+    protected void onDeveloperOptionsSwitchEnabled() {
+        mPreference.setEnabled(true);
+    }
+
+    @Override
+    protected void onDeveloperOptionsSwitchDisabled() {
+        Settings.Global.putInt(mContext.getContentResolver(),
+                Settings.Global.DEBUG_VIEW_ATTRIBUTES, SETTING_VALUE_OFF);
+        mPreference.setChecked(false);
+        mPreference.setEnabled(false);
+    }
+}
diff --git a/src/com/android/settings/development/DevelopmentOptionsActivityRequestCodes.java b/src/com/android/settings/development/DevelopmentOptionsActivityRequestCodes.java
new file mode 100644
index 0000000..b7b2759
--- /dev/null
+++ b/src/com/android/settings/development/DevelopmentOptionsActivityRequestCodes.java
@@ -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.
+ */
+
+package com.android.settings.development;
+
+/**
+ * Interface for storing Activity request codes in development options
+ */
+public interface DevelopmentOptionsActivityRequestCodes {
+    int REQUEST_CODE_ENABLE_OEM_UNLOCK = 0;
+
+    int REQUEST_CODE_DEBUG_APP = 1;
+
+    int REQUEST_MOCK_LOCATION_APP = 2;
+}
diff --git a/src/com/android/settings/development/DevelopmentSettings.java b/src/com/android/settings/development/DevelopmentSettings.java
deleted file mode 100644
index cbc3959..0000000
--- a/src/com/android/settings/development/DevelopmentSettings.java
+++ /dev/null
@@ -1,2888 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF 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.Manifest;
-import android.app.Activity;
-import android.app.ActivityManager;
-import android.app.AlertDialog;
-import android.app.AppOpsManager;
-import android.app.AppOpsManager.PackageOps;
-import android.app.Dialog;
-import android.app.backup.IBackupManager;
-import android.bluetooth.BluetoothA2dp;
-import android.bluetooth.BluetoothAdapter;
-import android.bluetooth.BluetoothCodecConfig;
-import android.bluetooth.BluetoothCodecStatus;
-import android.bluetooth.BluetoothHeadset;
-import android.bluetooth.BluetoothProfile;
-import android.content.BroadcastReceiver;
-import android.content.ContentResolver;
-import android.content.Context;
-import android.content.DialogInterface;
-import android.content.Intent;
-import android.content.IntentFilter;
-import android.content.pm.ApplicationInfo;
-import android.content.pm.IShortcutService;
-import android.content.pm.PackageManager;
-import android.content.pm.PackageManager.NameNotFoundException;
-import android.content.res.Resources;
-import android.hardware.usb.IUsbManager;
-import android.hardware.usb.UsbManager;
-import android.net.wifi.WifiManager;
-import android.os.AsyncTask;
-import android.os.BatteryManager;
-import android.os.Build;
-import android.os.Bundle;
-import android.os.IBinder;
-import android.os.Parcel;
-import android.os.RemoteException;
-import android.os.ServiceManager;
-import android.os.StrictMode;
-import android.os.SystemProperties;
-import android.os.UserHandle;
-import android.os.UserManager;
-import android.os.storage.IStorageManager;
-import android.provider.SearchIndexableResource;
-import android.provider.Settings;
-import android.service.oemlock.OemLockManager;
-import android.support.annotation.VisibleForTesting;
-import android.support.v14.preference.SwitchPreference;
-import android.support.v4.content.LocalBroadcastManager;
-import android.support.v7.preference.ListPreference;
-import android.support.v7.preference.Preference;
-import android.support.v7.preference.Preference.OnPreferenceChangeListener;
-import android.support.v7.preference.PreferenceGroup;
-import android.support.v7.preference.PreferenceScreen;
-import android.telephony.TelephonyManager;
-import android.text.TextUtils;
-import android.util.Log;
-import android.view.IWindowManager;
-import android.view.LayoutInflater;
-import android.view.ThreadedRenderer;
-import android.view.View;
-import android.view.ViewGroup;
-import android.view.accessibility.AccessibilityManager;
-import android.webkit.IWebViewUpdateService;
-import android.webkit.WebViewFactory;
-import android.widget.Switch;
-import android.widget.Toast;
-
-import com.android.internal.app.LocalePicker;
-import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
-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;
-import com.android.settings.widget.SwitchBar;
-import com.android.settingslib.RestrictedLockUtils;
-import com.android.settingslib.RestrictedLockUtils.EnforcedAdmin;
-import com.android.settingslib.RestrictedSwitchPreference;
-import com.android.settingslib.development.AbstractEnableAdbPreferenceController;
-import com.android.settingslib.drawer.CategoryKey;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.HashSet;
-import java.util.List;
-
-/*
- * Displays preferences for application developers.
- */
-public class DevelopmentSettings extends RestrictedSettingsFragment
-        implements DialogInterface.OnClickListener, DialogInterface.OnDismissListener,
-        OnPreferenceChangeListener, SwitchBar.OnSwitchChangeListener, Indexable {
-    private static final String TAG = "DevelopmentSettings";
-
-    /**
-     * Preference file were development settings prefs are stored.
-     */
-    public static final String PREF_FILE = "development";
-
-    /**
-     * Whether to show the development settings to the user.  Default is false.
-     */
-    public static final String PREF_SHOW = "show";
-
-    private static final String CLEAR_ADB_KEYS = "clear_adb_keys";
-    private static final String ENABLE_TERMINAL = "enable_terminal";
-    private static final String KEEP_SCREEN_ON = "keep_screen_on";
-    private static final String BT_HCI_SNOOP_LOG = "bt_hci_snoop_log";
-    private static final String ENABLE_OEM_UNLOCK = "oem_unlock_enable";
-    private static final String HDCP_CHECKING_KEY = "hdcp_checking";
-    private static final String HDCP_CHECKING_PROPERTY = "persist.sys.hdcp_checking";
-    private static final String LOCAL_BACKUP_PASSWORD = "local_backup_password";
-    private static final String HARDWARE_UI_PROPERTY = "persist.sys.ui.hw";
-    private static final String MSAA_PROPERTY = "debug.egl.force_msaa";
-    private static final String OPENGL_TRACES_PROPERTY = "debug.egl.trace";
-    private static final String TUNER_UI_KEY = "tuner_ui";
-    private static final String COLOR_TEMPERATURE_PROPERTY = "persist.sys.debug.color_temp";
-
-    private static final String DEBUG_APP_KEY = "debug_app";
-    private static final String WAIT_FOR_DEBUGGER_KEY = "wait_for_debugger";
-    private static final String MOCK_LOCATION_APP_KEY = "mock_location_app";
-    private static final String DEBUG_VIEW_ATTRIBUTES = "debug_view_attributes";
-    private static final String FORCE_ALLOW_ON_EXTERNAL_KEY = "force_allow_on_external";
-    private static final String STRICT_MODE_KEY = "strict_mode";
-    private static final String POINTER_LOCATION_KEY = "pointer_location";
-    private static final String SHOW_TOUCHES_KEY = "show_touches";
-    private static final String SHOW_SCREEN_UPDATES_KEY = "show_screen_updates";
-    private static final String DISABLE_OVERLAYS_KEY = "disable_overlays";
-    private static final String SIMULATE_COLOR_SPACE = "simulate_color_space";
-    private static final String USB_AUDIO_KEY = "usb_audio";
-    private static final String FORCE_HARDWARE_UI_KEY = "force_hw_ui";
-    private static final String FORCE_MSAA_KEY = "force_msaa";
-    private static final String TRACK_FRAME_TIME_KEY = "track_frame_time";
-    private static final String SHOW_NON_RECTANGULAR_CLIP_KEY = "show_non_rect_clip";
-    private static final String SHOW_HW_SCREEN_UPDATES_KEY = "show_hw_screen_udpates";
-    private static final String SHOW_HW_LAYERS_UPDATES_KEY = "show_hw_layers_udpates";
-    private static final String DEBUG_HW_OVERDRAW_KEY = "debug_hw_overdraw";
-    private static final String DEBUG_HW_RENDERER_KEY = "debug_hw_renderer";
-    private static final String DEBUG_LAYOUT_KEY = "debug_layout";
-    private static final String FORCE_RTL_LAYOUT_KEY = "force_rtl_layout_all_locales";
-    private static final String WINDOW_ANIMATION_SCALE_KEY = "window_animation_scale";
-    private static final String TRANSITION_ANIMATION_SCALE_KEY = "transition_animation_scale";
-    private static final String ANIMATOR_DURATION_SCALE_KEY = "animator_duration_scale";
-    private static final String OVERLAY_DISPLAY_DEVICES_KEY = "overlay_display_devices";
-    private static final String DEBUG_DEBUGGING_CATEGORY_KEY = "debug_debugging_category";
-    private static final String SELECT_LOGD_SIZE_KEY = "select_logd_size";
-    private static final String SELECT_LOGD_SIZE_PROPERTY = "persist.logd.size";
-    private static final String SELECT_LOGD_TAG_PROPERTY = "persist.log.tag";
-    // Tricky, isLoggable only checks for first character, assumes silence
-    private static final String SELECT_LOGD_TAG_SILENCE = "Settings";
-    private static final String SELECT_LOGD_SNET_TAG_PROPERTY = "persist.log.tag.snet_event_log";
-    private static final String SELECT_LOGD_RUNTIME_SNET_TAG_PROPERTY = "log.tag.snet_event_log";
-    private static final String SELECT_LOGD_DEFAULT_SIZE_PROPERTY = "ro.logd.size";
-    private static final String SELECT_LOGD_DEFAULT_SIZE_VALUE = "262144";
-    private static final String SELECT_LOGD_SVELTE_DEFAULT_SIZE_VALUE = "65536";
-    // 32768 is merely a menu marker, 64K is our lowest log buffer size we replace it with.
-    private static final String SELECT_LOGD_MINIMUM_SIZE_VALUE = "65536";
-    private static final String SELECT_LOGD_OFF_SIZE_MARKER_VALUE = "32768";
-    private static final String SELECT_LOGPERSIST_KEY = "select_logpersist";
-    private static final String SELECT_LOGPERSIST_PROPERTY = "persist.logd.logpersistd";
-    private static final String ACTUAL_LOGPERSIST_PROPERTY = "logd.logpersistd";
-    private static final String SELECT_LOGPERSIST_PROPERTY_SERVICE = "logcatd";
-    private static final String SELECT_LOGPERSIST_PROPERTY_CLEAR = "clear";
-    private static final String SELECT_LOGPERSIST_PROPERTY_STOP = "stop";
-    private static final String SELECT_LOGPERSIST_PROPERTY_BUFFER =
-            "persist.logd.logpersistd.buffer";
-    private static final String ACTUAL_LOGPERSIST_PROPERTY_BUFFER = "logd.logpersistd.buffer";
-    private static final String ACTUAL_LOGPERSIST_PROPERTY_ENABLE = "logd.logpersistd.enable";
-
-    private static final String WIFI_DISPLAY_CERTIFICATION_KEY = "wifi_display_certification";
-    private static final String WIFI_VERBOSE_LOGGING_KEY = "wifi_verbose_logging";
-    private static final String WIFI_AGGRESSIVE_HANDOVER_KEY = "wifi_aggressive_handover";
-    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 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";
-
-    private static final String BLUETOOTH_SHOW_DEVICES_WITHOUT_NAMES_KEY =
-            "bluetooth_show_devices_without_names";
-    private static final String BLUETOOTH_SHOW_DEVICES_WITHOUT_NAMES_PROPERTY =
-            "persist.bluetooth.showdeviceswithoutnames";
-    private static final String BLUETOOTH_DISABLE_ABSOLUTE_VOLUME_KEY =
-            "bluetooth_disable_absolute_volume";
-    private static final String BLUETOOTH_DISABLE_ABSOLUTE_VOLUME_PROPERTY =
-            "persist.bluetooth.disableabsvol";
-    private static final String BLUETOOTH_AVRCP_VERSION_PROPERTY =
-                                    "persist.bluetooth.avrcpversion";
-    private static final String BLUETOOTH_ENABLE_INBAND_RINGING_PROPERTY =
-                                    "persist.bluetooth.enableinbandringing";
-    private static final String BLUETOOTH_BTSNOOP_ENABLE_PROPERTY =
-                                    "persist.bluetooth.btsnoopenable";
-
-    private static final String BLUETOOTH_ENABLE_INBAND_RINGING_KEY = "bluetooth_enable_inband_ringing";
-    private static final String BLUETOOTH_SELECT_AVRCP_VERSION_KEY = "bluetooth_select_avrcp_version";
-    private static final String BLUETOOTH_SELECT_A2DP_CODEC_KEY = "bluetooth_select_a2dp_codec";
-    private static final String BLUETOOTH_SELECT_A2DP_SAMPLE_RATE_KEY = "bluetooth_select_a2dp_sample_rate";
-    private static final String BLUETOOTH_SELECT_A2DP_BITS_PER_SAMPLE_KEY = "bluetooth_select_a2dp_bits_per_sample";
-    private static final String BLUETOOTH_SELECT_A2DP_CHANNEL_MODE_KEY = "bluetooth_select_a2dp_channel_mode";
-    private static final String BLUETOOTH_SELECT_A2DP_LDAC_PLAYBACK_QUALITY_KEY = "bluetooth_select_a2dp_ldac_playback_quality";
-
-    private static final String PRIVATE_DNS_PREF_KEY = "select_private_dns_configuration";
-
-    private static final String INACTIVE_APPS_KEY = "inactive_apps";
-
-    private static final String IMMEDIATELY_DESTROY_ACTIVITIES_KEY
-            = "immediately_destroy_activities";
-    private static final String APP_PROCESS_LIMIT_KEY = "app_process_limit";
-
-    private static final String BACKGROUND_CHECK_KEY = "background_check";
-
-    private static final String SHOW_ALL_ANRS_KEY = "show_all_anrs";
-
-    private static final String SHOW_NOTIFICATION_CHANNEL_WARNINGS_KEY = "show_notification_channel_warnings";
-
-    private static final String TERMINAL_APP_PACKAGE = "com.android.terminal";
-
-    private static final String KEY_CONVERT_FBE = "convert_to_file_encryption";
-
-    private static final String OTA_DISABLE_AUTOMATIC_UPDATE_KEY = "ota_disable_automatic_update";
-
-    private static final int RESULT_DEBUG_APP = 1000;
-    private static final int RESULT_MOCK_LOCATION_APP = 1001;
-
-    private static final String FLASH_LOCKED_PROP = "ro.boot.flash.locked";
-
-    private static final String SHORTCUT_MANAGER_RESET_KEY = "reset_shortcut_manager_throttling";
-
-    private static final int REQUEST_CODE_ENABLE_OEM_UNLOCK = 0;
-
-    private static final int[] MOCK_LOCATION_APP_OPS = new int[]{AppOpsManager.OP_MOCK_LOCATION};
-
-    private IWindowManager mWindowManager;
-    private IBackupManager mBackupManager;
-    private IWebViewUpdateService mWebViewUpdateService;
-    private UserManager mUm;
-    private WifiManager mWifiManager;
-    private OemLockManager mOemLockManager;
-    private TelephonyManager mTelephonyManager;
-
-    private SwitchBar mSwitchBar;
-
-    private boolean mHaveDebugSettings;
-    private boolean mDontPokeProperties;
-    private EnableAdbPreferenceController mEnableAdbController;
-    private Preference mClearAdbKeys;
-    private SwitchPreference mEnableTerminal;
-    private RestrictedSwitchPreference mKeepScreenOn;
-    private SwitchPreference mBtHciSnoopLog;
-    private RestrictedSwitchPreference mEnableOemUnlock;
-    private SwitchPreference mDebugViewAttributes;
-    private SwitchPreference mForceAllowOnExternal;
-
-    private Preference mPassword;
-    private String mDebugApp;
-    private Preference mDebugAppPref;
-
-    private String mMockLocationApp;
-    private Preference mMockLocationAppPref;
-
-    private SwitchPreference mWaitForDebugger;
-    private VerifyAppsOverUsbPreferenceController mVerifyAppsOverUsbController;
-    private SwitchPreference mWifiDisplayCertification;
-    private SwitchPreference mWifiVerboseLogging;
-    private SwitchPreference mWifiAggressiveHandover;
-    private SwitchPreference mMobileDataAlwaysOn;
-    private SwitchPreference mTetheringHardwareOffload;
-    private SwitchPreference mBluetoothShowDevicesWithoutNames;
-    private SwitchPreference mBluetoothDisableAbsVolume;
-    private SwitchPreference mBluetoothEnableInbandRinging;
-
-    private BluetoothA2dp mBluetoothA2dp;
-    private final Object mBluetoothA2dpLock = new Object();
-    private ListPreference mBluetoothSelectAvrcpVersion;
-    private ListPreference mBluetoothSelectA2dpCodec;
-    private ListPreference mBluetoothSelectA2dpSampleRate;
-    private ListPreference mBluetoothSelectA2dpBitsPerSample;
-    private ListPreference mBluetoothSelectA2dpChannelMode;
-    private ListPreference mBluetoothSelectA2dpLdacPlaybackQuality;
-
-    private SwitchPreference mOtaDisableAutomaticUpdate;
-    private SwitchPreference mWifiAllowScansWithTraffic;
-    private SwitchPreference mStrictMode;
-    private SwitchPreference mPointerLocation;
-    private SwitchPreference mShowTouches;
-    private SwitchPreference mShowScreenUpdates;
-    private SwitchPreference mDisableOverlays;
-    private SwitchPreference mForceHardwareUi;
-    private SwitchPreference mForceMsaa;
-    private SwitchPreference mShowHwScreenUpdates;
-    private SwitchPreference mShowHwLayersUpdates;
-    private SwitchPreference mDebugLayout;
-    private SwitchPreference mForceRtlLayout;
-    private ListPreference mDebugHwOverdraw;
-    private ListPreference mDebugHwRenderer;
-    private ListPreference mLogdSize;
-    private ListPreference mLogpersist;
-    private ListPreference mUsbConfiguration;
-    private ListPreference mTrackFrameTime;
-    private ListPreference mShowNonRectClip;
-    private ListPreference mWindowAnimationScale;
-    private ListPreference mTransitionAnimationScale;
-    private ListPreference mAnimatorDurationScale;
-    private ListPreference mOverlayDisplayDevices;
-
-    private WebViewAppPreferenceController mWebViewAppPrefController;
-
-    private ListPreference mSimulateColorSpace;
-
-    private SwitchPreference mUSBAudio;
-    private SwitchPreference mImmediatelyDestroyActivities;
-
-    private ListPreference mAppProcessLimit;
-
-    private SwitchPreference mShowAllANRs;
-
-    private SwitchPreference mShowNotificationChannelWarnings;
-
-    private ColorModePreference mColorModePreference;
-
-    private SwitchPreference mForceResizable;
-
-    private SwitchPreference mColorTemperaturePreference;
-
-    private final ArrayList<Preference> mAllPrefs = new ArrayList<>();
-
-    private final ArrayList<SwitchPreference> mResetSwitchPrefs = new ArrayList<>();
-
-    private final HashSet<Preference> mDisabledPrefs = new HashSet<>();
-    // To track whether a confirmation dialog was clicked.
-    private boolean mDialogClicked;
-    private Dialog mEnableDialog;
-
-    private Dialog mAdbKeysDialog;
-    private boolean mUnavailable;
-
-    private boolean mLogpersistCleared;
-    private Dialog mLogpersistClearDialog;
-    private DashboardFeatureProvider mDashboardFeatureProvider;
-    private DevelopmentSettingsEnabler mSettingsEnabler;
-    private DevelopmentSwitchBarController mSwitchBarController;
-    private BugReportPreferenceController mBugReportController;
-    private BugReportInPowerPreferenceController mBugReportInPowerController;
-    private TelephonyMonitorPreferenceController mTelephonyMonitorController;
-    private CameraLaserSensorPreferenceController mCameraLaserSensorController;
-
-    private BroadcastReceiver mEnableAdbReceiver;
-
-    public DevelopmentSettings() {
-        super(UserManager.DISALLOW_DEBUGGING_FEATURES);
-    }
-
-    @Override
-    public int getMetricsCategory() {
-        return MetricsEvent.DEVELOPMENT;
-    }
-
-    @Override
-    public void onAttach(Context context) {
-        super.onAttach(context);
-        mSettingsEnabler = new DevelopmentSettingsEnabler(context, getLifecycle());
-        mDashboardFeatureProvider = FeatureFactory.getFactory(context)
-                .getDashboardFeatureProvider(context);
-    }
-
-    @Override
-    public void onCreate(Bundle icicle) {
-        super.onCreate(icicle);
-
-        mWindowManager = IWindowManager.Stub.asInterface(ServiceManager.getService("window"));
-        mBackupManager = IBackupManager.Stub.asInterface(
-                ServiceManager.getService(Context.BACKUP_SERVICE));
-        mWebViewUpdateService = WebViewFactory.getUpdateService();
-        mOemLockManager = (OemLockManager) getSystemService(Context.OEM_LOCK_SERVICE);
-        mTelephonyManager = (TelephonyManager) getSystemService(Context.TELEPHONY_SERVICE);
-
-        mUm = (UserManager) getSystemService(Context.USER_SERVICE);
-
-        mWifiManager = (WifiManager) getSystemService(Context.WIFI_SERVICE);
-
-        mBugReportController = new BugReportPreferenceController(getActivity());
-        mBugReportInPowerController = new BugReportInPowerPreferenceController(getActivity());
-        mTelephonyMonitorController = new TelephonyMonitorPreferenceController(getActivity());
-        mWebViewAppPrefController = new WebViewAppPreferenceController(getActivity());
-        mVerifyAppsOverUsbController = new VerifyAppsOverUsbPreferenceController(getActivity());
-        mCameraLaserSensorController = new CameraLaserSensorPreferenceController(getActivity());
-
-        setIfOnlyAvailableForAdmins(true);
-        if (isUiRestricted() || !Utils.isDeviceProvisioned(getActivity())) {
-            // 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.placeholder_prefs);
-            return;
-        }
-
-        addPreferencesFromResource(R.xml.development_prefs);
-
-        final PreferenceGroup debugDebuggingCategory = (PreferenceGroup)
-                findPreference(DEBUG_DEBUGGING_CATEGORY_KEY);
-        mEnableAdbController = new EnableAdbPreferenceController(getActivity());
-        mClearAdbKeys = findPreference(CLEAR_ADB_KEYS);
-        if (!SystemProperties.getBoolean("ro.adb.secure", false)) {
-            if (debugDebuggingCategory != null) {
-                debugDebuggingCategory.removePreference(mClearAdbKeys);
-            }
-        }
-        mAllPrefs.add(mClearAdbKeys);
-        mEnableTerminal = findAndInitSwitchPref(ENABLE_TERMINAL);
-        if (!isPackageInstalled(getActivity(), TERMINAL_APP_PACKAGE)) {
-            debugDebuggingCategory.removePreference(mEnableTerminal);
-            mEnableTerminal = null;
-        }
-
-        mBugReportController.displayPreference(getPreferenceScreen());
-        mBugReportInPowerController.displayPreference(getPreferenceScreen());
-        mTelephonyMonitorController.displayPreference(getPreferenceScreen());
-        mWebViewAppPrefController.displayPreference(getPreferenceScreen());
-        mEnableAdbController.displayPreference(getPreferenceScreen());
-
-        mCameraLaserSensorController.displayPreference(getPreferenceScreen());
-
-        mKeepScreenOn = (RestrictedSwitchPreference) findAndInitSwitchPref(KEEP_SCREEN_ON);
-        mBtHciSnoopLog = findAndInitSwitchPref(BT_HCI_SNOOP_LOG);
-        mEnableOemUnlock = (RestrictedSwitchPreference) findAndInitSwitchPref(ENABLE_OEM_UNLOCK);
-        if (!showEnableOemUnlockPreference(getActivity())) {
-            removePreference(mEnableOemUnlock);
-            mEnableOemUnlock = null;
-        }
-
-        mDebugViewAttributes = findAndInitSwitchPref(DEBUG_VIEW_ATTRIBUTES);
-        mForceAllowOnExternal = findAndInitSwitchPref(FORCE_ALLOW_ON_EXTERNAL_KEY);
-        mPassword = findPreference(LOCAL_BACKUP_PASSWORD);
-        mAllPrefs.add(mPassword);
-
-        if (!mUm.isAdminUser()) {
-            disableForUser(mClearAdbKeys);
-            disableForUser(mEnableTerminal);
-            disableForUser(mPassword);
-        }
-
-        mDebugAppPref = findPreference(DEBUG_APP_KEY);
-        mAllPrefs.add(mDebugAppPref);
-        mWaitForDebugger = findAndInitSwitchPref(WAIT_FOR_DEBUGGER_KEY);
-
-        mMockLocationAppPref = findPreference(MOCK_LOCATION_APP_KEY);
-        mAllPrefs.add(mMockLocationAppPref);
-
-        mVerifyAppsOverUsbController.displayPreference(getPreferenceScreen());
-
-        mStrictMode = findAndInitSwitchPref(STRICT_MODE_KEY);
-        mPointerLocation = findAndInitSwitchPref(POINTER_LOCATION_KEY);
-        mShowTouches = findAndInitSwitchPref(SHOW_TOUCHES_KEY);
-        mShowScreenUpdates = findAndInitSwitchPref(SHOW_SCREEN_UPDATES_KEY);
-        mDisableOverlays = findAndInitSwitchPref(DISABLE_OVERLAYS_KEY);
-        mForceHardwareUi = findAndInitSwitchPref(FORCE_HARDWARE_UI_KEY);
-        mForceMsaa = findAndInitSwitchPref(FORCE_MSAA_KEY);
-        mTrackFrameTime = addListPreference(TRACK_FRAME_TIME_KEY);
-        mShowNonRectClip = addListPreference(SHOW_NON_RECTANGULAR_CLIP_KEY);
-        mShowHwScreenUpdates = findAndInitSwitchPref(SHOW_HW_SCREEN_UPDATES_KEY);
-        mShowHwLayersUpdates = findAndInitSwitchPref(SHOW_HW_LAYERS_UPDATES_KEY);
-        mDebugLayout = findAndInitSwitchPref(DEBUG_LAYOUT_KEY);
-        mForceRtlLayout = findAndInitSwitchPref(FORCE_RTL_LAYOUT_KEY);
-        mDebugHwOverdraw = addListPreference(DEBUG_HW_OVERDRAW_KEY);
-        mDebugHwRenderer = addListPreference(DEBUG_HW_RENDERER_KEY);
-        mWifiDisplayCertification = findAndInitSwitchPref(WIFI_DISPLAY_CERTIFICATION_KEY);
-        mWifiVerboseLogging = findAndInitSwitchPref(WIFI_VERBOSE_LOGGING_KEY);
-        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);
-        } else {
-            mLogpersist = (ListPreference) findPreference(SELECT_LOGPERSIST_KEY);
-            if (mLogpersist != null) {
-                mLogpersist.setEnabled(false);
-                if (debugDebuggingCategory != null) {
-                    debugDebuggingCategory.removePreference(mLogpersist);
-                }
-            }
-            mLogpersist = null;
-        }
-        mUsbConfiguration = addListPreference(USB_CONFIGURATION_KEY);
-        mBluetoothShowDevicesWithoutNames =
-                findAndInitSwitchPref(BLUETOOTH_SHOW_DEVICES_WITHOUT_NAMES_KEY);
-        mBluetoothDisableAbsVolume = findAndInitSwitchPref(BLUETOOTH_DISABLE_ABSOLUTE_VOLUME_KEY);
-        mBluetoothEnableInbandRinging = findAndInitSwitchPref(BLUETOOTH_ENABLE_INBAND_RINGING_KEY);
-        if (!BluetoothHeadset.isInbandRingingSupported(getContext())) {
-            removePreference(mBluetoothEnableInbandRinging);
-            mBluetoothEnableInbandRinging = null;
-        }
-
-        mBluetoothSelectAvrcpVersion = addListPreference(BLUETOOTH_SELECT_AVRCP_VERSION_KEY);
-        mBluetoothSelectA2dpCodec = addListPreference(BLUETOOTH_SELECT_A2DP_CODEC_KEY);
-        mBluetoothSelectA2dpSampleRate = addListPreference(BLUETOOTH_SELECT_A2DP_SAMPLE_RATE_KEY);
-        mBluetoothSelectA2dpBitsPerSample = addListPreference(BLUETOOTH_SELECT_A2DP_BITS_PER_SAMPLE_KEY);
-        mBluetoothSelectA2dpChannelMode = addListPreference(BLUETOOTH_SELECT_A2DP_CHANNEL_MODE_KEY);
-        mBluetoothSelectA2dpLdacPlaybackQuality = addListPreference(BLUETOOTH_SELECT_A2DP_LDAC_PLAYBACK_QUALITY_KEY);
-        initBluetoothConfigurationValues();
-
-        updatePrivateDnsSummary();
-
-        mWindowAnimationScale = addListPreference(WINDOW_ANIMATION_SCALE_KEY);
-        mTransitionAnimationScale = addListPreference(TRANSITION_ANIMATION_SCALE_KEY);
-        mAnimatorDurationScale = addListPreference(ANIMATOR_DURATION_SCALE_KEY);
-        mOverlayDisplayDevices = addListPreference(OVERLAY_DISPLAY_DEVICES_KEY);
-        mSimulateColorSpace = addListPreference(SIMULATE_COLOR_SPACE);
-        mUSBAudio = findAndInitSwitchPref(USB_AUDIO_KEY);
-        mForceResizable = findAndInitSwitchPref(FORCE_RESIZABLE_KEY);
-
-        mImmediatelyDestroyActivities = (SwitchPreference) findPreference(
-                IMMEDIATELY_DESTROY_ACTIVITIES_KEY);
-        mAllPrefs.add(mImmediatelyDestroyActivities);
-        mResetSwitchPrefs.add(mImmediatelyDestroyActivities);
-
-        mAppProcessLimit = addListPreference(APP_PROCESS_LIMIT_KEY);
-
-        mShowAllANRs = (SwitchPreference) findPreference(
-                SHOW_ALL_ANRS_KEY);
-        mAllPrefs.add(mShowAllANRs);
-        mResetSwitchPrefs.add(mShowAllANRs);
-
-        mShowNotificationChannelWarnings = (SwitchPreference) findPreference(
-                SHOW_NOTIFICATION_CHANNEL_WARNINGS_KEY);
-        mAllPrefs.add(mShowNotificationChannelWarnings);
-        mResetSwitchPrefs.add(mShowNotificationChannelWarnings);
-
-        Preference hdcpChecking = findPreference(HDCP_CHECKING_KEY);
-        if (hdcpChecking != null) {
-            mAllPrefs.add(hdcpChecking);
-            removePreferenceForProduction(hdcpChecking);
-        }
-
-        Preference convertFbePreference = findPreference(KEY_CONVERT_FBE);
-
-        try {
-            IBinder service = ServiceManager.getService("mount");
-            IStorageManager storageManager = IStorageManager.Stub.asInterface(service);
-            if (!storageManager.isConvertibleToFBE()) {
-                removePreference(KEY_CONVERT_FBE);
-            } else if ("file".equals(SystemProperties.get("ro.crypto.type", "none"))) {
-                convertFbePreference.setEnabled(false);
-                convertFbePreference.setSummary(getResources()
-                        .getString(R.string.convert_to_file_encryption_done));
-            }
-        } catch (RemoteException e) {
-            removePreference(KEY_CONVERT_FBE);
-        }
-
-        mOtaDisableAutomaticUpdate = findAndInitSwitchPref(OTA_DISABLE_AUTOMATIC_UPDATE_KEY);
-
-        mColorModePreference = (ColorModePreference) findPreference(KEY_COLOR_MODE);
-        mColorModePreference.updateCurrentAndSupported();
-        if (mColorModePreference.getColorModeCount() < 2 ||
-                getContext().getResources().getConfiguration().isScreenWideColorGamut()) {
-            removePreference(KEY_COLOR_MODE);
-            mColorModePreference = null;
-        }
-
-        mColorTemperaturePreference = (SwitchPreference) findPreference(COLOR_TEMPERATURE_KEY);
-        if (getResources().getBoolean(R.bool.config_enableColorTemperature)) {
-            mAllPrefs.add(mColorTemperaturePreference);
-            mResetSwitchPrefs.add(mColorTemperaturePreference);
-        } else {
-            removePreference(COLOR_TEMPERATURE_KEY);
-            mColorTemperaturePreference = null;
-        }
-
-        addDashboardCategoryPreferences();
-    }
-
-    @VisibleForTesting
-    void addDashboardCategoryPreferences() {
-        final PreferenceScreen screen = getPreferenceScreen();
-        final List<Preference> tilePrefs = mDashboardFeatureProvider.getPreferencesForCategory(
-                getActivity(), getPrefContext(), getMetricsCategory(),
-                CategoryKey.CATEGORY_SYSTEM_DEVELOPMENT);
-        if (tilePrefs != null) {
-            for (Preference preference : tilePrefs) {
-                screen.addPreference(preference);
-            }
-        }
-    }
-
-    private ListPreference addListPreference(String prefKey) {
-        ListPreference pref = (ListPreference) findPreference(prefKey);
-        mAllPrefs.add(pref);
-        pref.setOnPreferenceChangeListener(this);
-        return pref;
-    }
-
-    private void disableForUser(Preference pref) {
-        if (pref != null) {
-            pref.setEnabled(false);
-            mDisabledPrefs.add(pref);
-        }
-    }
-
-    private SwitchPreference findAndInitSwitchPref(String key) {
-        SwitchPreference pref = (SwitchPreference) findPreference(key);
-        if (pref == null) {
-            throw new IllegalArgumentException("Cannot find preference with key = " + key);
-        }
-        mAllPrefs.add(pref);
-        mResetSwitchPrefs.add(pref);
-        return pref;
-    }
-
-    @Override
-    public void onActivityCreated(Bundle savedInstanceState) {
-        super.onActivityCreated(savedInstanceState);
-
-        mSwitchBar = ((SettingsActivity) getActivity()).getSwitchBar();
-        mSwitchBarController = new DevelopmentSwitchBarController(
-                this /* DevelopmentSettings */, mSwitchBar, !mUnavailable,  getLifecycle());
-    }
-
-    private boolean removePreferenceForProduction(Preference preference) {
-        if ("user".equals(Build.TYPE)) {
-            removePreference(preference);
-            return true;
-        }
-        return false;
-    }
-
-    private void removePreference(Preference preference) {
-        getPreferenceScreen().removePreference(preference);
-        mAllPrefs.remove(preference);
-        mResetSwitchPrefs.remove(preference);
-    }
-
-    private void setPrefsEnabledState(boolean enabled) {
-        for (int i = 0; i < mAllPrefs.size(); i++) {
-            Preference pref = mAllPrefs.get(i);
-            pref.setEnabled(enabled && !mDisabledPrefs.contains(pref));
-        }
-        mEnableAdbController.enablePreference(enabled);
-        mBugReportInPowerController.enablePreference(enabled);
-        mTelephonyMonitorController.enablePreference(enabled);
-        mWebViewAppPrefController.enablePreference(enabled);
-        mCameraLaserSensorController.enablePreference(enabled);
-        updateAllOptions();
-    }
-
-    @Override
-    public void onResume() {
-        super.onResume();
-
-        if (mUnavailable) {
-            // Show error message
-            if (!isUiRestrictedByOnlyAdmin()) {
-                getEmptyTextView().setText(R.string.development_settings_not_available);
-            }
-            getPreferenceScreen().removeAll();
-            return;
-        }
-
-        // A DeviceAdmin has specified a maximum time until the device
-        // will lock...  in this case we can't allow the user to turn
-        // on "stay awake when plugged in" because that would defeat the
-        // restriction.
-        final EnforcedAdmin admin = RestrictedLockUtils.checkIfMaximumTimeToLockIsSet(
-                getActivity());
-        mKeepScreenOn.setDisabledByAdmin(admin);
-        if (admin == null) {
-            mDisabledPrefs.remove(mKeepScreenOn);
-        } else {
-            mDisabledPrefs.add(mKeepScreenOn);
-        }
-
-        final boolean lastEnabledState = mSettingsEnabler.getLastEnabledState();
-        mSwitchBar.setChecked(lastEnabledState);
-        setPrefsEnabledState(lastEnabledState);
-
-        if (mHaveDebugSettings && !lastEnabledState) {
-            // Overall debugging is disabled, but there are some debug
-            // settings that are enabled.  This is an invalid state.  Switch
-            // to debug settings being enabled, so the user knows there is
-            // stuff enabled and can turn it all off if they want.
-            mSettingsEnabler.enableDevelopmentSettings();
-            mSwitchBar.setChecked(lastEnabledState);
-            setPrefsEnabledState(lastEnabledState);
-        }
-        mSwitchBar.show();
-
-        if (mColorModePreference != null) {
-            mColorModePreference.startListening();
-            mColorModePreference.updateCurrentAndSupported();
-        }
-    }
-
-    @Override
-    public void onPause() {
-        super.onPause();
-        if (mColorModePreference != null) {
-            mColorModePreference.stopListening();
-        }
-    }
-
-    @Override
-    public View onCreateView(LayoutInflater inflater, ViewGroup container,
-            Bundle savedInstanceState) {
-        IntentFilter filter = new IntentFilter();
-        filter.addAction(UsbManager.ACTION_USB_STATE);
-        if (getActivity().registerReceiver(mUsbReceiver, filter) == null) {
-            updateUsbConfigurationValues();
-        }
-
-        BluetoothAdapter adapter = BluetoothAdapter.getDefaultAdapter();
-        if (adapter != null) {
-            adapter.getProfileProxy(getActivity(),
-                                    mBluetoothA2dpServiceListener,
-                                    BluetoothProfile.A2DP);
-        }
-        filter = new IntentFilter();
-        filter.addAction(BluetoothA2dp.ACTION_CODEC_CONFIG_CHANGED);
-        if (getActivity().registerReceiver(mBluetoothA2dpReceiver, filter) == null) {
-            updateBluetoothA2dpConfigurationValues();
-        }
-
-        mEnableAdbReceiver = new BroadcastReceiver() {
-            @Override
-            public void onReceive(Context context, Intent intent) {
-                mVerifyAppsOverUsbController.updatePreference();
-                updateBugreportOptions();
-            }
-        };
-        LocalBroadcastManager.getInstance(getContext())
-                .registerReceiver(mEnableAdbReceiver, new IntentFilter(
-                        AbstractEnableAdbPreferenceController.ACTION_ENABLE_ADB_STATE_CHANGED));
-
-        return super.onCreateView(inflater, container, savedInstanceState);
-    }
-
-    @Override
-    public void onDestroyView() {
-        super.onDestroyView();
-
-        if (mUnavailable) {
-            return;
-        }
-        getActivity().unregisterReceiver(mUsbReceiver);
-        getActivity().unregisterReceiver(mBluetoothA2dpReceiver);
-        BluetoothAdapter adapter = BluetoothAdapter.getDefaultAdapter();
-        if (adapter != null) {
-            adapter.closeProfileProxy(BluetoothProfile.A2DP, mBluetoothA2dp);
-            mBluetoothA2dp = null;
-        }
-
-        if (mEnableAdbReceiver != null) {
-            LocalBroadcastManager.getInstance(getContext()).unregisterReceiver(mEnableAdbReceiver);
-            mEnableAdbReceiver = null;
-        }
-    }
-
-    void updateSwitchPreference(SwitchPreference switchPreference, boolean value) {
-        switchPreference.setChecked(value);
-        mHaveDebugSettings |= value;
-    }
-
-    private void updateAllOptions() {
-        final Context context = getActivity();
-        final ContentResolver cr = context.getContentResolver();
-        mHaveDebugSettings = false;
-        final Preference enableAdb = findPreference(mEnableAdbController.getPreferenceKey());
-        mEnableAdbController.updateState(enableAdb);
-        mHaveDebugSettings |= mEnableAdbController.haveDebugSettings();
-        if (mEnableTerminal != null) {
-            updateSwitchPreference(mEnableTerminal,
-                    context.getPackageManager().getApplicationEnabledSetting(TERMINAL_APP_PACKAGE)
-                            == PackageManager.COMPONENT_ENABLED_STATE_ENABLED);
-        }
-        mHaveDebugSettings |= mBugReportInPowerController.updatePreference();
-        mHaveDebugSettings |= mTelephonyMonitorController.updatePreference();
-        mHaveDebugSettings |= mCameraLaserSensorController.updatePreference();
-        updateSwitchPreference(mKeepScreenOn, Settings.Global.getInt(cr,
-                Settings.Global.STAY_ON_WHILE_PLUGGED_IN, 0) != 0);
-        updateSwitchPreference(mBtHciSnoopLog, SystemProperties.getBoolean(
-                BLUETOOTH_BTSNOOP_ENABLE_PROPERTY, false));
-        updateSwitchPreference(mDebugViewAttributes, Settings.Global.getInt(cr,
-                Settings.Global.DEBUG_VIEW_ATTRIBUTES, 0) != 0);
-        updateSwitchPreference(mForceAllowOnExternal, Settings.Global.getInt(cr,
-                Settings.Global.FORCE_ALLOW_ON_EXTERNAL, 0) != 0);
-        updateHdcpValues();
-        updatePasswordSummary();
-        updateDebuggerOptions();
-        updateMockLocation();
-        updateStrictModeVisualOptions();
-        updatePointerLocationOptions();
-        updateShowTouchesOptions();
-        updateFlingerOptions();
-        updateHardwareUiOptions();
-        updateMsaaOptions();
-        updateTrackFrameTimeOptions();
-        updateShowNonRectClipOptions();
-        updateShowHwScreenUpdatesOptions();
-        updateShowHwLayersUpdatesOptions();
-        updateDebugHwOverdrawOptions();
-        updateDebugHwRendererOptions();
-        updateDebugLayoutOptions();
-        updateAnimationScaleOptions();
-        updateOverlayDisplayDevicesOptions();
-        updateImmediatelyDestroyActivitiesOptions();
-        updateAppProcessLimitOptions();
-        updateShowAllANRsOptions();
-        updateShowNotificationChannelWarningsOptions();
-        mVerifyAppsOverUsbController.updatePreference();
-        updateOtaDisableAutomaticUpdateOptions();
-        updateBugreportOptions();
-        updateForceRtlOptions();
-        updateLogdSizeValues();
-        updateLogpersistValues();
-        updateWifiDisplayCertificationOptions();
-        updateWifiVerboseLoggingOptions();
-        updateWifiAggressiveHandoverOptions();
-        updateWifiAllowScansWithTrafficOptions();
-        updateMobileDataAlwaysOnOptions();
-        updateTetheringHardwareOffloadOptions();
-        updateSimulateColorSpace();
-        updateUSBAudioOptions();
-        updateForceResizableOptions();
-        Preference webViewAppPref = findPreference(mWebViewAppPrefController.getPreferenceKey());
-        mWebViewAppPrefController.updateState(webViewAppPref);
-        updateOemUnlockOptions();
-        if (mColorTemperaturePreference != null) {
-            updateColorTemperature();
-        }
-        updateBluetoothShowDevicesWithoutUserFriendlyNameOptions();
-        updateBluetoothDisableAbsVolumeOptions();
-        updateBluetoothEnableInbandRingingOptions();
-        updateBluetoothA2dpConfigurationValues();
-        updatePrivateDnsSummary();
-    }
-
-    private void resetDangerousOptions() {
-        mDontPokeProperties = true;
-        for (int i = 0; i < mResetSwitchPrefs.size(); i++) {
-            SwitchPreference cb = mResetSwitchPrefs.get(i);
-            if (cb.isChecked()) {
-                cb.setChecked(false);
-                onPreferenceTreeClick(cb);
-            }
-        }
-        if (mBluetoothEnableInbandRinging != null) {
-            mBluetoothEnableInbandRinging.setChecked(true);
-            onPreferenceTreeClick(mBluetoothEnableInbandRinging);
-        }
-        mBugReportInPowerController.resetPreference();
-        mEnableAdbController.resetPreference();
-        resetDebuggerOptions();
-        writeLogpersistOption(null, true);
-        writeLogdSizeOption(null);
-        writeAnimationScaleOption(0, mWindowAnimationScale, null);
-        writeAnimationScaleOption(1, mTransitionAnimationScale, null);
-        writeAnimationScaleOption(2, mAnimatorDurationScale, null);
-        // Only poke the color space setting if we control it.
-        if (usingDevelopmentColorSpace()) {
-            writeSimulateColorSpace(-1);
-        }
-        writeOverlayDisplayDevicesOptions(null);
-        writeAppProcessLimitOptions(null);
-        mHaveDebugSettings = false;
-        updateAllOptions();
-        mDontPokeProperties = false;
-        pokeSystemProperties();
-    }
-
-    private void updateHdcpValues() {
-        ListPreference hdcpChecking = (ListPreference) findPreference(HDCP_CHECKING_KEY);
-        if (hdcpChecking != null) {
-            String currentValue = SystemProperties.get(HDCP_CHECKING_PROPERTY);
-            String[] values = getResources().getStringArray(R.array.hdcp_checking_values);
-            String[] summaries = getResources().getStringArray(R.array.hdcp_checking_summaries);
-            int index = 1; // Defaults to drm-only. Needs to match with R.array.hdcp_checking_values
-            for (int i = 0; i < values.length; i++) {
-                if (currentValue.equals(values[i])) {
-                    index = i;
-                    break;
-                }
-            }
-            hdcpChecking.setValue(values[index]);
-            hdcpChecking.setSummary(summaries[index]);
-            hdcpChecking.setOnPreferenceChangeListener(this);
-        }
-    }
-
-    private void updatePasswordSummary() {
-        mPassword.setEnabled(mBackupManager != null);
-        if (mBackupManager != null) {
-            try {
-                if (mBackupManager.hasBackupPassword()) {
-                    mPassword.setSummary(R.string.local_backup_password_summary_change);
-                } else {
-                    mPassword.setSummary(R.string.local_backup_password_summary_none);
-                }
-            } catch (RemoteException e) {
-                // Not much we can do here
-            }
-        }
-    }
-
-    private void writeBtHciSnoopLogOptions() {
-        BluetoothAdapter adapter = BluetoothAdapter.getDefaultAdapter();
-        SystemProperties.set(BLUETOOTH_BTSNOOP_ENABLE_PROPERTY,
-                Boolean.toString(mBtHciSnoopLog.isChecked()));
-    }
-
-    private void writeDebuggerOptions() {
-        try {
-            ActivityManager.getService().setDebugApp(
-                    mDebugApp, mWaitForDebugger.isChecked(), true);
-        } catch (RemoteException ex) {
-        }
-    }
-
-    private void writeMockLocation() {
-        AppOpsManager appOpsManager = (AppOpsManager) getSystemService(Context.APP_OPS_SERVICE);
-
-        // Disable the app op of the previous mock location app if such.
-        List<PackageOps> packageOps = appOpsManager.getPackagesForOps(MOCK_LOCATION_APP_OPS);
-        if (packageOps != null) {
-            // Should be one but in case we are in a bad state due to use of command line tools.
-            for (PackageOps packageOp : packageOps) {
-                if (packageOp.getOps().get(0).getMode() != AppOpsManager.MODE_ERRORED) {
-                    String oldMockLocationApp = packageOp.getPackageName();
-                    try {
-                        ApplicationInfo ai = getActivity().getPackageManager().getApplicationInfo(
-                                oldMockLocationApp, PackageManager.GET_DISABLED_COMPONENTS);
-                        appOpsManager.setMode(AppOpsManager.OP_MOCK_LOCATION, ai.uid,
-                                oldMockLocationApp, AppOpsManager.MODE_ERRORED);
-                    } catch (NameNotFoundException e) {
-                        /* ignore */
-                    }
-                }
-            }
-        }
-
-        // Enable the app op of the new mock location app if such.
-        if (!TextUtils.isEmpty(mMockLocationApp)) {
-            try {
-                ApplicationInfo ai = getActivity().getPackageManager().getApplicationInfo(
-                        mMockLocationApp, PackageManager.GET_DISABLED_COMPONENTS);
-                appOpsManager.setMode(AppOpsManager.OP_MOCK_LOCATION, ai.uid,
-                        mMockLocationApp, AppOpsManager.MODE_ALLOWED);
-            } catch (NameNotFoundException e) {
-                /* ignore */
-            }
-        }
-    }
-
-    private static void resetDebuggerOptions() {
-        try {
-            ActivityManager.getService().setDebugApp(
-                    null, false, true);
-        } catch (RemoteException ex) {
-        }
-    }
-
-    private void updateDebuggerOptions() {
-        mDebugApp = Settings.Global.getString(
-                getActivity().getContentResolver(), Settings.Global.DEBUG_APP);
-        updateSwitchPreference(mWaitForDebugger, Settings.Global.getInt(
-                getActivity().getContentResolver(), Settings.Global.WAIT_FOR_DEBUGGER, 0) != 0);
-        if (mDebugApp != null && mDebugApp.length() > 0) {
-            String label;
-            try {
-                ApplicationInfo ai = getActivity().getPackageManager().getApplicationInfo(mDebugApp,
-                        PackageManager.GET_DISABLED_COMPONENTS);
-                CharSequence lab = getActivity().getPackageManager().getApplicationLabel(ai);
-                label = lab != null ? lab.toString() : mDebugApp;
-            } catch (PackageManager.NameNotFoundException e) {
-                label = mDebugApp;
-            }
-            mDebugAppPref.setSummary(getResources().getString(R.string.debug_app_set, label));
-            mWaitForDebugger.setEnabled(true);
-            mHaveDebugSettings = true;
-        } else {
-            mDebugAppPref.setSummary(getResources().getString(R.string.debug_app_not_set));
-            mWaitForDebugger.setEnabled(false);
-        }
-    }
-
-    private void updateMockLocation() {
-        AppOpsManager appOpsManager = (AppOpsManager) getSystemService(Context.APP_OPS_SERVICE);
-
-        List<PackageOps> packageOps = appOpsManager.getPackagesForOps(MOCK_LOCATION_APP_OPS);
-        if (packageOps != null) {
-            for (PackageOps packageOp : packageOps) {
-                if (packageOp.getOps().get(0).getMode() == AppOpsManager.MODE_ALLOWED) {
-                    mMockLocationApp = packageOps.get(0).getPackageName();
-                    break;
-                }
-            }
-        }
-
-        if (!TextUtils.isEmpty(mMockLocationApp)) {
-            String label = mMockLocationApp;
-            try {
-                ApplicationInfo ai = getActivity().getPackageManager().getApplicationInfo(
-                        mMockLocationApp, PackageManager.GET_DISABLED_COMPONENTS);
-                CharSequence appLabel = getPackageManager().getApplicationLabel(ai);
-                if (appLabel != null) {
-                    label = appLabel.toString();
-                }
-            } catch (PackageManager.NameNotFoundException e) {
-                /* ignore */
-            }
-
-            mMockLocationAppPref.setSummary(getString(R.string.mock_location_app_set, label));
-            mHaveDebugSettings = true;
-        } else {
-            mMockLocationAppPref.setSummary(getString(R.string.mock_location_app_not_set));
-        }
-    }
-
-    private void updateOtaDisableAutomaticUpdateOptions() {
-        // We use the "disabled status" in code, but show the opposite text
-        // "Automatic system updates" on screen. So a value 0 indicates the
-        // automatic update is enabled.
-        updateSwitchPreference(mOtaDisableAutomaticUpdate, Settings.Global.getInt(
-                getActivity().getContentResolver(),
-                Settings.Global.OTA_DISABLE_AUTOMATIC_UPDATE, 0) != 1);
-    }
-
-    private void writeOtaDisableAutomaticUpdateOptions() {
-        // We use the "disabled status" in code, but show the opposite text
-        // "Automatic system updates" on screen. So a value 0 indicates the
-        // automatic update is enabled.
-        Settings.Global.putInt(getActivity().getContentResolver(),
-                Settings.Global.OTA_DISABLE_AUTOMATIC_UPDATE,
-                mOtaDisableAutomaticUpdate.isChecked() ? 0 : 1);
-    }
-
-    private static boolean showEnableOemUnlockPreference(Context context) {
-        return context.getSystemService(Context.OEM_LOCK_SERVICE) != null;
-    }
-
-    /**
-     * Returns whether OEM unlock is allowed by the user and carrier.
-     *
-     * This does not take into account any restrictions imposed by the device policy.
-     */
-    private boolean isOemUnlockAllowedByUserAndCarrier() {
-        final UserHandle userHandle = UserHandle.of(UserHandle.myUserId());
-        return mOemLockManager.isOemUnlockAllowedByCarrier()
-                && !mUm.hasBaseUserRestriction(UserManager.DISALLOW_FACTORY_RESET, userHandle);
-    }
-
-    private boolean enableOemUnlockPreference() {
-        return !isBootloaderUnlocked() && isOemUnlockAllowedByUserAndCarrier();
-    }
-
-    private void updateOemUnlockOptions() {
-        if (mEnableOemUnlock != null) {
-            updateSwitchPreference(mEnableOemUnlock, mOemLockManager.isOemUnlockAllowed());
-            updateOemUnlockSettingDescription();
-            // Showing mEnableOemUnlock preference as device has persistent data block.
-            mEnableOemUnlock.setDisabledByAdmin(null);
-            mEnableOemUnlock.setEnabled(enableOemUnlockPreference());
-            if (mEnableOemUnlock.isEnabled()) {
-                // Check restriction, disable mEnableOemUnlock and apply policy transparency.
-                mEnableOemUnlock.checkRestrictionAndSetDisabled(UserManager.DISALLOW_FACTORY_RESET);
-            }
-        }
-    }
-
-    private void updateBugreportOptions() {
-        mBugReportController.enablePreference(true);
-        mBugReportInPowerController.updateBugreportOptions();
-    }
-
-    // Returns the current state of the system property that controls
-    // strictmode flashes.  One of:
-    //    0: not explicitly set one way or another
-    //    1: on
-    //    2: off
-    private static int currentStrictModeActiveIndex() {
-        if (TextUtils.isEmpty(SystemProperties.get(StrictMode.VISUAL_PROPERTY))) {
-            return 0;
-        }
-        boolean enabled = SystemProperties.getBoolean(StrictMode.VISUAL_PROPERTY, false);
-        return enabled ? 1 : 2;
-    }
-
-    private void writeStrictModeVisualOptions() {
-        try {
-            mWindowManager.setStrictModeVisualIndicatorPreference(mStrictMode.isChecked()
-                    ? "1" : "");
-        } catch (RemoteException e) {
-        }
-    }
-
-    private void updateStrictModeVisualOptions() {
-        updateSwitchPreference(mStrictMode, currentStrictModeActiveIndex() == 1);
-    }
-
-    private void writePointerLocationOptions() {
-        Settings.System.putInt(getActivity().getContentResolver(),
-                Settings.System.POINTER_LOCATION, mPointerLocation.isChecked() ? 1 : 0);
-    }
-
-    private void updatePointerLocationOptions() {
-        updateSwitchPreference(mPointerLocation,
-                Settings.System.getInt(getActivity().getContentResolver(),
-                        Settings.System.POINTER_LOCATION, 0) != 0);
-    }
-
-    private void writeShowTouchesOptions() {
-        Settings.System.putInt(getActivity().getContentResolver(),
-                Settings.System.SHOW_TOUCHES, mShowTouches.isChecked() ? 1 : 0);
-    }
-
-    private void updateShowTouchesOptions() {
-        updateSwitchPreference(mShowTouches,
-                Settings.System.getInt(getActivity().getContentResolver(),
-                        Settings.System.SHOW_TOUCHES, 0) != 0);
-    }
-
-    private void updateFlingerOptions() {
-        // magic communication with surface flinger.
-        try {
-            IBinder flinger = ServiceManager.getService("SurfaceFlinger");
-            if (flinger != null) {
-                Parcel data = Parcel.obtain();
-                Parcel reply = Parcel.obtain();
-                data.writeInterfaceToken("android.ui.ISurfaceComposer");
-                flinger.transact(1010, data, reply, 0);
-                @SuppressWarnings("unused")
-                int showCpu = reply.readInt();
-                @SuppressWarnings("unused")
-                int enableGL = reply.readInt();
-                int showUpdates = reply.readInt();
-                updateSwitchPreference(mShowScreenUpdates, showUpdates != 0);
-                @SuppressWarnings("unused")
-                int showBackground = reply.readInt();
-                int disableOverlays = reply.readInt();
-                updateSwitchPreference(mDisableOverlays, disableOverlays != 0);
-                reply.recycle();
-                data.recycle();
-            }
-        } catch (RemoteException ex) {
-        }
-    }
-
-    private void writeShowUpdatesOption() {
-        try {
-            IBinder flinger = ServiceManager.getService("SurfaceFlinger");
-            if (flinger != null) {
-                Parcel data = Parcel.obtain();
-                data.writeInterfaceToken("android.ui.ISurfaceComposer");
-                final int showUpdates = mShowScreenUpdates.isChecked() ? 1 : 0;
-                data.writeInt(showUpdates);
-                flinger.transact(1002, data, null, 0);
-                data.recycle();
-
-                updateFlingerOptions();
-            }
-        } catch (RemoteException ex) {
-        }
-    }
-
-    private void writeDisableOverlaysOption() {
-        try {
-            IBinder flinger = ServiceManager.getService("SurfaceFlinger");
-            if (flinger != null) {
-                Parcel data = Parcel.obtain();
-                data.writeInterfaceToken("android.ui.ISurfaceComposer");
-                final int disableOverlays = mDisableOverlays.isChecked() ? 1 : 0;
-                data.writeInt(disableOverlays);
-                flinger.transact(1008, data, null, 0);
-                data.recycle();
-
-                updateFlingerOptions();
-            }
-        } catch (RemoteException ex) {
-        }
-    }
-
-    private void updateHardwareUiOptions() {
-        updateSwitchPreference(mForceHardwareUi,
-                SystemProperties.getBoolean(HARDWARE_UI_PROPERTY, false));
-    }
-
-    private void writeHardwareUiOptions() {
-        SystemProperties.set(HARDWARE_UI_PROPERTY, mForceHardwareUi.isChecked() ? "true" : "false");
-        pokeSystemProperties();
-    }
-
-    private void updateMsaaOptions() {
-        updateSwitchPreference(mForceMsaa, SystemProperties.getBoolean(MSAA_PROPERTY, false));
-    }
-
-    private void writeMsaaOptions() {
-        SystemProperties.set(MSAA_PROPERTY, mForceMsaa.isChecked() ? "true" : "false");
-        pokeSystemProperties();
-    }
-
-    private void updateTrackFrameTimeOptions() {
-        String value = SystemProperties.get(ThreadedRenderer.PROFILE_PROPERTY);
-        if (value == null) {
-            value = "";
-        }
-
-        CharSequence[] values = mTrackFrameTime.getEntryValues();
-        for (int i = 0; i < values.length; i++) {
-            if (value.contentEquals(values[i])) {
-                mTrackFrameTime.setValueIndex(i);
-                mTrackFrameTime.setSummary(mTrackFrameTime.getEntries()[i]);
-                return;
-            }
-        }
-        mTrackFrameTime.setValueIndex(0);
-        mTrackFrameTime.setSummary(mTrackFrameTime.getEntries()[0]);
-    }
-
-    private void writeTrackFrameTimeOptions(Object newValue) {
-        SystemProperties.set(ThreadedRenderer.PROFILE_PROPERTY,
-                newValue == null ? "" : newValue.toString());
-        pokeSystemProperties();
-        updateTrackFrameTimeOptions();
-    }
-
-    private void updateShowNonRectClipOptions() {
-        String value = SystemProperties.get(
-                ThreadedRenderer.DEBUG_SHOW_NON_RECTANGULAR_CLIP_PROPERTY);
-        if (value == null) {
-            value = "hide";
-        }
-
-        CharSequence[] values = mShowNonRectClip.getEntryValues();
-        for (int i = 0; i < values.length; i++) {
-            if (value.contentEquals(values[i])) {
-                mShowNonRectClip.setValueIndex(i);
-                mShowNonRectClip.setSummary(mShowNonRectClip.getEntries()[i]);
-                return;
-            }
-        }
-        mShowNonRectClip.setValueIndex(0);
-        mShowNonRectClip.setSummary(mShowNonRectClip.getEntries()[0]);
-    }
-
-    private void writeShowNonRectClipOptions(Object newValue) {
-        SystemProperties.set(ThreadedRenderer.DEBUG_SHOW_NON_RECTANGULAR_CLIP_PROPERTY,
-                newValue == null ? "" : newValue.toString());
-        pokeSystemProperties();
-        updateShowNonRectClipOptions();
-    }
-
-    private void updateShowHwScreenUpdatesOptions() {
-        updateSwitchPreference(mShowHwScreenUpdates,
-                SystemProperties.getBoolean(ThreadedRenderer.DEBUG_DIRTY_REGIONS_PROPERTY, false));
-    }
-
-    private void writeShowHwScreenUpdatesOptions() {
-        SystemProperties.set(ThreadedRenderer.DEBUG_DIRTY_REGIONS_PROPERTY,
-                mShowHwScreenUpdates.isChecked() ? "true" : null);
-        pokeSystemProperties();
-    }
-
-    private void updateShowHwLayersUpdatesOptions() {
-        updateSwitchPreference(mShowHwLayersUpdates, SystemProperties.getBoolean(
-                ThreadedRenderer.DEBUG_SHOW_LAYERS_UPDATES_PROPERTY, false));
-    }
-
-    private void writeShowHwLayersUpdatesOptions() {
-        SystemProperties.set(ThreadedRenderer.DEBUG_SHOW_LAYERS_UPDATES_PROPERTY,
-                mShowHwLayersUpdates.isChecked() ? "true" : null);
-        pokeSystemProperties();
-    }
-
-    private void updateDebugHwOverdrawOptions() {
-        String value = SystemProperties.get(ThreadedRenderer.DEBUG_OVERDRAW_PROPERTY);
-        if (value == null) {
-            value = "";
-        }
-
-        CharSequence[] values = mDebugHwOverdraw.getEntryValues();
-        for (int i = 0; i < values.length; i++) {
-            if (value.contentEquals(values[i])) {
-                mDebugHwOverdraw.setValueIndex(i);
-                mDebugHwOverdraw.setSummary(mDebugHwOverdraw.getEntries()[i]);
-                return;
-            }
-        }
-        mDebugHwOverdraw.setValueIndex(0);
-        mDebugHwOverdraw.setSummary(mDebugHwOverdraw.getEntries()[0]);
-    }
-
-    private void writeDebugHwOverdrawOptions(Object newValue) {
-        SystemProperties.set(ThreadedRenderer.DEBUG_OVERDRAW_PROPERTY,
-                newValue == null ? "" : newValue.toString());
-        pokeSystemProperties();
-        updateDebugHwOverdrawOptions();
-    }
-
-    private void updateDebugHwRendererOptions() {
-        String value = SystemProperties.get(ThreadedRenderer.DEBUG_RENDERER_PROPERTY);
-        if (value == null) {
-            value = "";
-        }
-
-        CharSequence[] values = mDebugHwRenderer.getEntryValues();
-        for (int i = 0; i < values.length; i++) {
-            if (value.contentEquals(values[i])) {
-                mDebugHwRenderer.setValueIndex(i);
-                mDebugHwRenderer.setSummary(mDebugHwRenderer.getEntries()[i]);
-                return;
-            }
-        }
-        mDebugHwRenderer.setValueIndex(0);
-        mDebugHwRenderer.setSummary(mDebugHwRenderer.getEntries()[0]);
-    }
-
-    private void writeDebugHwRendererOptions(Object newValue) {
-        SystemProperties.set(ThreadedRenderer.DEBUG_RENDERER_PROPERTY,
-                newValue == null ? "" : newValue.toString());
-        pokeSystemProperties();
-        updateDebugHwRendererOptions();
-    }
-
-    private void updateDebugLayoutOptions() {
-        updateSwitchPreference(mDebugLayout,
-                SystemProperties.getBoolean(View.DEBUG_LAYOUT_PROPERTY, false));
-    }
-
-    private void writeDebugLayoutOptions() {
-        SystemProperties.set(View.DEBUG_LAYOUT_PROPERTY,
-                mDebugLayout.isChecked() ? "true" : "false");
-        pokeSystemProperties();
-    }
-
-    private void updateSimulateColorSpace() {
-        final ContentResolver cr = getContentResolver();
-        final boolean enabled = Settings.Secure.getInt(
-                cr, Settings.Secure.ACCESSIBILITY_DISPLAY_DALTONIZER_ENABLED, 0) != 0;
-        if (enabled) {
-            final String mode = Integer.toString(Settings.Secure.getInt(
-                    cr, Settings.Secure.ACCESSIBILITY_DISPLAY_DALTONIZER,
-                    AccessibilityManager.DALTONIZER_DISABLED));
-            mSimulateColorSpace.setValue(mode);
-            final int index = mSimulateColorSpace.findIndexOfValue(mode);
-            if (index < 0) {
-                // We're using a mode controlled by accessibility preferences.
-                mSimulateColorSpace.setSummary(getString(R.string.daltonizer_type_overridden,
-                        getString(R.string.accessibility_display_daltonizer_preference_title)));
-            } else {
-                mSimulateColorSpace.setSummary("%s");
-            }
-        } else {
-            mSimulateColorSpace.setValue(
-                    Integer.toString(AccessibilityManager.DALTONIZER_DISABLED));
-        }
-    }
-
-    /**
-     * @return <code>true</code> if the color space preference is currently
-     * controlled by development settings
-     */
-    private boolean usingDevelopmentColorSpace() {
-        final ContentResolver cr = getContentResolver();
-        final boolean enabled = Settings.Secure.getInt(
-                cr, Settings.Secure.ACCESSIBILITY_DISPLAY_DALTONIZER_ENABLED, 0) != 0;
-        if (enabled) {
-            final String mode = Integer.toString(Settings.Secure.getInt(
-                    cr, Settings.Secure.ACCESSIBILITY_DISPLAY_DALTONIZER,
-                    AccessibilityManager.DALTONIZER_DISABLED));
-            final int index = mSimulateColorSpace.findIndexOfValue(mode);
-            if (index >= 0) {
-                // We're using a mode controlled by developer preferences.
-                return true;
-            }
-        }
-        return false;
-    }
-
-    private void writeSimulateColorSpace(Object value) {
-        final ContentResolver cr = getContentResolver();
-        final int newMode = Integer.parseInt(value.toString());
-        if (newMode < 0) {
-            Settings.Secure.putInt(cr, Settings.Secure.ACCESSIBILITY_DISPLAY_DALTONIZER_ENABLED, 0);
-        } else {
-            Settings.Secure.putInt(cr, Settings.Secure.ACCESSIBILITY_DISPLAY_DALTONIZER_ENABLED, 1);
-            Settings.Secure.putInt(cr, Settings.Secure.ACCESSIBILITY_DISPLAY_DALTONIZER, newMode);
-        }
-    }
-
-    private void updateColorTemperature() {
-        updateSwitchPreference(mColorTemperaturePreference,
-                SystemProperties.getBoolean(COLOR_TEMPERATURE_PROPERTY, false));
-    }
-
-    private void writeColorTemperature() {
-        SystemProperties.set(COLOR_TEMPERATURE_PROPERTY,
-                mColorTemperaturePreference.isChecked() ? "1" : "0");
-        pokeSystemProperties();
-        Toast.makeText(getActivity(), R.string.color_temperature_toast, Toast.LENGTH_LONG).show();
-    }
-
-    private void updateUSBAudioOptions() {
-        updateSwitchPreference(mUSBAudio, Settings.Secure.getInt(getContentResolver(),
-                Settings.Secure.USB_AUDIO_AUTOMATIC_ROUTING_DISABLED, 0) != 0);
-    }
-
-    private void writeUSBAudioOptions() {
-        Settings.Secure.putInt(getContentResolver(),
-                Settings.Secure.USB_AUDIO_AUTOMATIC_ROUTING_DISABLED,
-                mUSBAudio.isChecked() ? 1 : 0);
-    }
-
-    private void updateForceResizableOptions() {
-        updateSwitchPreference(mForceResizable, Settings.Global.getInt(getContentResolver(),
-                Settings.Global.DEVELOPMENT_FORCE_RESIZABLE_ACTIVITIES, 0) != 0);
-    }
-
-    private void writeForceResizableOptions() {
-        Settings.Global.putInt(getContentResolver(),
-                Settings.Global.DEVELOPMENT_FORCE_RESIZABLE_ACTIVITIES,
-                mForceResizable.isChecked() ? 1 : 0);
-    }
-
-    private void updateForceRtlOptions() {
-        updateSwitchPreference(mForceRtlLayout,
-                Settings.Global.getInt(getActivity().getContentResolver(),
-                        Settings.Global.DEVELOPMENT_FORCE_RTL, 0) != 0);
-    }
-
-    private void writeForceRtlOptions() {
-        boolean value = mForceRtlLayout.isChecked();
-        Settings.Global.putInt(getActivity().getContentResolver(),
-                Settings.Global.DEVELOPMENT_FORCE_RTL, value ? 1 : 0);
-        SystemProperties.set(Settings.Global.DEVELOPMENT_FORCE_RTL, value ? "1" : "0");
-        LocalePicker.updateLocales(getActivity().getResources().getConfiguration().getLocales());
-    }
-
-    private void updateWifiDisplayCertificationOptions() {
-        updateSwitchPreference(mWifiDisplayCertification, Settings.Global.getInt(
-                getActivity().getContentResolver(),
-                Settings.Global.WIFI_DISPLAY_CERTIFICATION_ON, 0) != 0);
-    }
-
-    private void writeWifiDisplayCertificationOptions() {
-        Settings.Global.putInt(getActivity().getContentResolver(),
-                Settings.Global.WIFI_DISPLAY_CERTIFICATION_ON,
-                mWifiDisplayCertification.isChecked() ? 1 : 0);
-    }
-
-    private void updateWifiVerboseLoggingOptions() {
-        boolean enabled = mWifiManager.getVerboseLoggingLevel() > 0;
-        updateSwitchPreference(mWifiVerboseLogging, enabled);
-    }
-
-    private void writeWifiVerboseLoggingOptions() {
-        mWifiManager.enableVerboseLogging(mWifiVerboseLogging.isChecked() ? 1 : 0);
-    }
-
-    private void updateWifiAggressiveHandoverOptions() {
-        boolean enabled = mWifiManager.getAggressiveHandover() > 0;
-        updateSwitchPreference(mWifiAggressiveHandover, enabled);
-    }
-
-    private void writeWifiAggressiveHandoverOptions() {
-        mWifiManager.enableAggressiveHandover(mWifiAggressiveHandover.isChecked() ? 1 : 0);
-    }
-
-    private void updateWifiAllowScansWithTrafficOptions() {
-        boolean enabled = mWifiManager.getAllowScansWithTraffic() > 0;
-        updateSwitchPreference(mWifiAllowScansWithTraffic, enabled);
-    }
-
-    private void writeWifiAllowScansWithTrafficOptions() {
-        mWifiManager.setAllowScansWithTraffic(mWifiAllowScansWithTraffic.isChecked() ? 1 : 0);
-    }
-
-    private void updateBluetoothShowDevicesWithoutUserFriendlyNameOptions() {
-        updateSwitchPreference(mBluetoothShowDevicesWithoutNames,
-                SystemProperties.getBoolean(
-                        BLUETOOTH_SHOW_DEVICES_WITHOUT_NAMES_PROPERTY, false));
-    }
-
-    private void writeBluetoothShowDevicesWithoutUserFriendlyNameOptions() {
-        SystemProperties.set(BLUETOOTH_SHOW_DEVICES_WITHOUT_NAMES_PROPERTY,
-                mBluetoothShowDevicesWithoutNames.isChecked() ? "true" : "false");
-    }
-
-    private void updateBluetoothDisableAbsVolumeOptions() {
-        updateSwitchPreference(mBluetoothDisableAbsVolume,
-                SystemProperties.getBoolean(BLUETOOTH_DISABLE_ABSOLUTE_VOLUME_PROPERTY, false));
-    }
-
-    private void writeBluetoothDisableAbsVolumeOptions() {
-        SystemProperties.set(BLUETOOTH_DISABLE_ABSOLUTE_VOLUME_PROPERTY,
-                mBluetoothDisableAbsVolume.isChecked() ? "true" : "false");
-    }
-
-    private void updateBluetoothEnableInbandRingingOptions() {
-        if (mBluetoothEnableInbandRinging != null) {
-            updateSwitchPreference(mBluetoothEnableInbandRinging,
-                SystemProperties.getBoolean(BLUETOOTH_ENABLE_INBAND_RINGING_PROPERTY, true));
-        }
-    }
-
-    private void writeBluetoothEnableInbandRingingOptions() {
-        if (mBluetoothEnableInbandRinging != null) {
-            SystemProperties.set(BLUETOOTH_ENABLE_INBAND_RINGING_PROPERTY,
-                mBluetoothEnableInbandRinging.isChecked() ? "true" : "false");
-        }
-    }
-
-    private void updateMobileDataAlwaysOnOptions() {
-        updateSwitchPreference(mMobileDataAlwaysOn, Settings.Global.getInt(
-                getActivity().getContentResolver(),
-                Settings.Global.MOBILE_DATA_ALWAYS_ON, 1) != 0);
-    }
-
-    private void writeMobileDataAlwaysOnOptions() {
-        Settings.Global.putInt(getActivity().getContentResolver(),
-                Settings.Global.MOBILE_DATA_ALWAYS_ON,
-                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)) {
-            if (SystemProperties.get("ro.config.low_ram").equals("true")) {
-                defaultValue = SELECT_LOGD_SVELTE_DEFAULT_SIZE_VALUE;
-            } else {
-                defaultValue = SELECT_LOGD_DEFAULT_SIZE_VALUE;
-            }
-        }
-        return defaultValue;
-    }
-
-    private void updateLogdSizeValues() {
-        if (mLogdSize != null) {
-            String currentTag = SystemProperties.get(SELECT_LOGD_TAG_PROPERTY);
-            String currentValue = SystemProperties.get(SELECT_LOGD_SIZE_PROPERTY);
-            if ((currentTag != null) && currentTag.startsWith(SELECT_LOGD_TAG_SILENCE)) {
-                currentValue = SELECT_LOGD_OFF_SIZE_MARKER_VALUE;
-            }
-            if (mLogpersist != null) {
-                String currentLogpersistEnable
-                        = SystemProperties.get(ACTUAL_LOGPERSIST_PROPERTY_ENABLE);
-                if ((currentLogpersistEnable == null)
-                        || !currentLogpersistEnable.equals("true")
-                        || currentValue.equals(SELECT_LOGD_OFF_SIZE_MARKER_VALUE)) {
-                    writeLogpersistOption(null, true);
-                    mLogpersist.setEnabled(false);
-                } else if (mSettingsEnabler.getLastEnabledState()) {
-                    mLogpersist.setEnabled(true);
-                }
-            }
-            if ((currentValue == null) || (currentValue.length() == 0)) {
-                currentValue = defaultLogdSizeValue();
-            }
-            String[] values = getResources().getStringArray(R.array.select_logd_size_values);
-            String[] titles = getResources().getStringArray(R.array.select_logd_size_titles);
-            int index = 2; // punt to second entry if not found
-            if (SystemProperties.get("ro.config.low_ram").equals("true")) {
-                mLogdSize.setEntries(R.array.select_logd_size_lowram_titles);
-                titles = getResources().getStringArray(R.array.select_logd_size_lowram_titles);
-                index = 1;
-            }
-            String[] summaries = getResources().getStringArray(R.array.select_logd_size_summaries);
-            for (int i = 0; i < titles.length; i++) {
-                if (currentValue.equals(values[i])
-                        || currentValue.equals(titles[i])) {
-                    index = i;
-                    break;
-                }
-            }
-            mLogdSize.setValue(values[index]);
-            mLogdSize.setSummary(summaries[index]);
-            mLogdSize.setOnPreferenceChangeListener(this);
-        }
-    }
-
-    private void writeLogdSizeOption(Object newValue) {
-        boolean disable = (newValue != null) &&
-                (newValue.toString().equals(SELECT_LOGD_OFF_SIZE_MARKER_VALUE));
-        String currentTag = SystemProperties.get(SELECT_LOGD_TAG_PROPERTY);
-        if (currentTag == null) {
-            currentTag = "";
-        }
-        // filter clean and unstack all references to our setting
-        String newTag = currentTag.replaceAll(
-                ",+" + SELECT_LOGD_TAG_SILENCE, "").replaceFirst(
-                "^" + SELECT_LOGD_TAG_SILENCE + ",*", "").replaceAll(
-                ",+", ",").replaceFirst(
-                ",+$", "");
-        if (disable) {
-            newValue = SELECT_LOGD_MINIMUM_SIZE_VALUE;
-            // Make sure snet_event_log get through first, but do not override
-            String snetValue = SystemProperties.get(SELECT_LOGD_SNET_TAG_PROPERTY);
-            if ((snetValue == null) || (snetValue.length() == 0)) {
-                snetValue = SystemProperties.get(SELECT_LOGD_RUNTIME_SNET_TAG_PROPERTY);
-                if ((snetValue == null) || (snetValue.length() == 0)) {
-                    SystemProperties.set(SELECT_LOGD_SNET_TAG_PROPERTY, "I");
-                }
-            }
-            // Silence all log sources, security logs notwithstanding
-            if (newTag.length() != 0) {
-                newTag = "," + newTag;
-            }
-            // Stack settings, stack to help preserve original value
-            newTag = SELECT_LOGD_TAG_SILENCE + newTag;
-        }
-        if (!newTag.equals(currentTag)) {
-            SystemProperties.set(SELECT_LOGD_TAG_PROPERTY, newTag);
-        }
-        String defaultValue = defaultLogdSizeValue();
-        final String size = ((newValue != null) && (newValue.toString().length() != 0)) ?
-                newValue.toString() : defaultValue;
-        SystemProperties.set(SELECT_LOGD_SIZE_PROPERTY, defaultValue.equals(size) ? "" : size);
-        SystemProperties.set("ctl.start", "logd-reinit");
-        pokeSystemProperties();
-        updateLogdSizeValues();
-    }
-
-    private void updateLogpersistValues() {
-        if (mLogpersist == null) {
-            return;
-        }
-        String currentValue = SystemProperties.get(ACTUAL_LOGPERSIST_PROPERTY);
-        if (currentValue == null) {
-            currentValue = "";
-        }
-        String currentBuffers = SystemProperties.get(ACTUAL_LOGPERSIST_PROPERTY_BUFFER);
-        if ((currentBuffers == null) || (currentBuffers.length() == 0)) {
-            currentBuffers = "all";
-        }
-        int index = 0;
-        if (currentValue.equals(SELECT_LOGPERSIST_PROPERTY_SERVICE)) {
-            index = 1;
-            if (currentBuffers.equals("kernel")) {
-                index = 3;
-            } else if (!currentBuffers.equals("all") &&
-                    !currentBuffers.contains("radio") &&
-                    currentBuffers.contains("security") &&
-                    currentBuffers.contains("kernel")) {
-                index = 2;
-                if (!currentBuffers.contains("default")) {
-                    String[] contains = {"main", "events", "system", "crash"};
-                    for (int i = 0; i < contains.length; i++) {
-                        if (!currentBuffers.contains(contains[i])) {
-                            index = 1;
-                            break;
-                        }
-                    }
-                }
-            }
-        }
-        mLogpersist.setValue(
-                getResources().getStringArray(R.array.select_logpersist_values)[index]);
-        mLogpersist.setSummary(
-                getResources().getStringArray(R.array.select_logpersist_summaries)[index]);
-        mLogpersist.setOnPreferenceChangeListener(this);
-        if (index != 0) {
-            mLogpersistCleared = false;
-        } else if (!mLogpersistCleared) {
-            // would File.delete() directly but need to switch uid/gid to access
-            SystemProperties.set(ACTUAL_LOGPERSIST_PROPERTY, SELECT_LOGPERSIST_PROPERTY_CLEAR);
-            pokeSystemProperties();
-            mLogpersistCleared = true;
-        }
-    }
-
-    private void setLogpersistOff(boolean update) {
-        SystemProperties.set(SELECT_LOGPERSIST_PROPERTY_BUFFER, "");
-        // deal with trampoline of empty properties
-        SystemProperties.set(ACTUAL_LOGPERSIST_PROPERTY_BUFFER, "");
-        SystemProperties.set(SELECT_LOGPERSIST_PROPERTY, "");
-        SystemProperties.set(ACTUAL_LOGPERSIST_PROPERTY,
-                update ? "" : SELECT_LOGPERSIST_PROPERTY_STOP);
-        pokeSystemProperties();
-        if (update) {
-            updateLogpersistValues();
-        } else {
-            for (int i = 0; i < 3; i++) {
-                String currentValue = SystemProperties.get(ACTUAL_LOGPERSIST_PROPERTY);
-                if ((currentValue == null) || currentValue.equals("")) {
-                    break;
-                }
-                try {
-                    Thread.sleep(100);
-                } catch (InterruptedException e) {
-                }
-            }
-        }
-    }
-
-    private void writeLogpersistOption(Object newValue, boolean skipWarning) {
-        if (mLogpersist == null) {
-            return;
-        }
-        String currentTag = SystemProperties.get(SELECT_LOGD_TAG_PROPERTY);
-        if ((currentTag != null) && currentTag.startsWith(SELECT_LOGD_TAG_SILENCE)) {
-            newValue = null;
-            skipWarning = true;
-        }
-
-        if ((newValue == null) || newValue.toString().equals("")) {
-            if (skipWarning) {
-                mLogpersistCleared = false;
-            } else if (!mLogpersistCleared) {
-                // if transitioning from on to off, pop up an are you sure?
-                String currentValue = SystemProperties.get(ACTUAL_LOGPERSIST_PROPERTY);
-                if ((currentValue != null) &&
-                        currentValue.equals(SELECT_LOGPERSIST_PROPERTY_SERVICE)) {
-                    if (mLogpersistClearDialog != null) dismissDialogs();
-                    mLogpersistClearDialog = new AlertDialog.Builder(getActivity()).setMessage(
-                            getActivity().getResources().getString(
-                                    R.string.dev_logpersist_clear_warning_message))
-                            .setTitle(R.string.dev_logpersist_clear_warning_title)
-                            .setPositiveButton(android.R.string.yes, this)
-                            .setNegativeButton(android.R.string.no, this)
-                            .show();
-                    mLogpersistClearDialog.setOnDismissListener(this);
-                    return;
-                }
-            }
-            setLogpersistOff(true);
-            return;
-        }
-
-        String currentBuffer = SystemProperties.get(ACTUAL_LOGPERSIST_PROPERTY_BUFFER);
-        if ((currentBuffer != null) && !currentBuffer.equals(newValue.toString())) {
-            setLogpersistOff(false);
-        }
-        SystemProperties.set(SELECT_LOGPERSIST_PROPERTY_BUFFER, newValue.toString());
-        SystemProperties.set(SELECT_LOGPERSIST_PROPERTY, SELECT_LOGPERSIST_PROPERTY_SERVICE);
-        pokeSystemProperties();
-        for (int i = 0; i < 3; i++) {
-            String currentValue = SystemProperties.get(ACTUAL_LOGPERSIST_PROPERTY);
-            if ((currentValue != null)
-                    && currentValue.equals(SELECT_LOGPERSIST_PROPERTY_SERVICE)) {
-                break;
-            }
-            try {
-                Thread.sleep(100);
-            } catch (InterruptedException e) {
-            }
-        }
-        updateLogpersistValues();
-    }
-
-    private void updateUsbConfigurationValues() {
-        if (mUsbConfiguration != null) {
-            UsbManager manager = (UsbManager) getSystemService(Context.USB_SERVICE);
-
-            String[] values = getResources().getStringArray(R.array.usb_configuration_values);
-            String[] titles = getResources().getStringArray(R.array.usb_configuration_titles);
-            int index = 0;
-            for (int i = 0; i < titles.length; i++) {
-                if (manager.isFunctionEnabled(values[i])) {
-                    index = i;
-                    break;
-                }
-            }
-            mUsbConfiguration.setValue(values[index]);
-            mUsbConfiguration.setSummary(titles[index]);
-            mUsbConfiguration.setOnPreferenceChangeListener(this);
-        }
-    }
-
-    private void writeUsbConfigurationOption(Object newValue) {
-        UsbManager manager = (UsbManager) getActivity().getSystemService(Context.USB_SERVICE);
-        String function = newValue.toString();
-        if (function.equals("none")) {
-            manager.setCurrentFunction(function, false);
-        } else {
-            manager.setCurrentFunction(function, true);
-        }
-    }
-
-    private void initBluetoothConfigurationValues() {
-        String[] values;
-        String[] summaries;
-        int index;
-
-        // Init the AVRCP Version - Default
-        values = getResources().getStringArray(R.array.bluetooth_avrcp_version_values);
-        summaries = getResources().getStringArray(R.array.bluetooth_avrcp_versions);
-        String value = SystemProperties.get(BLUETOOTH_AVRCP_VERSION_PROPERTY, values[0]);
-        index = mBluetoothSelectAvrcpVersion.findIndexOfValue(value);
-        mBluetoothSelectAvrcpVersion.setValue(values[index]);
-        mBluetoothSelectAvrcpVersion.setSummary(summaries[index]);
-
-        // Init the Codec Type - Default
-        values = getResources().getStringArray(R.array.bluetooth_a2dp_codec_values);
-        summaries = getResources().getStringArray(R.array.bluetooth_a2dp_codec_summaries);
-        index = 0;
-        mBluetoothSelectA2dpCodec.setValue(values[index]);
-        mBluetoothSelectA2dpCodec.setSummary(summaries[index]);
-
-        // Init the Sample Rate - Default
-        values = getResources().getStringArray(R.array.bluetooth_a2dp_codec_sample_rate_values);
-        summaries = getResources().getStringArray(R.array.bluetooth_a2dp_codec_sample_rate_summaries);
-        index = 0;
-        mBluetoothSelectA2dpSampleRate.setValue(values[index]);
-        mBluetoothSelectA2dpSampleRate.setSummary(summaries[index]);
-
-        // Init the Bits Per Sample - Default
-        values = getResources().getStringArray(R.array.bluetooth_a2dp_codec_bits_per_sample_values);
-        summaries = getResources().getStringArray(R.array.bluetooth_a2dp_codec_bits_per_sample_summaries);
-        index = 0;
-        mBluetoothSelectA2dpBitsPerSample.setValue(values[index]);
-        mBluetoothSelectA2dpBitsPerSample.setSummary(summaries[index]);
-
-        // Init the Channel Mode - Default
-        values = getResources().getStringArray(R.array.bluetooth_a2dp_codec_channel_mode_values);
-        summaries = getResources().getStringArray(R.array.bluetooth_a2dp_codec_channel_mode_summaries);
-        index = 0;
-        mBluetoothSelectA2dpChannelMode.setValue(values[index]);
-        mBluetoothSelectA2dpChannelMode.setSummary(summaries[index]);
-
-        // Init the LDAC Playback Quality - ABR
-        values = getResources().getStringArray(R.array.bluetooth_a2dp_codec_ldac_playback_quality_values);
-        summaries = getResources().getStringArray(R.array.bluetooth_a2dp_codec_ldac_playback_quality_summaries);
-        index = 3;
-        mBluetoothSelectA2dpLdacPlaybackQuality.setValue(values[index]);
-        mBluetoothSelectA2dpLdacPlaybackQuality.setSummary(summaries[index]);
-    }
-
-    private void writeBluetoothAvrcpVersion(Object newValue) {
-        SystemProperties.set(BLUETOOTH_AVRCP_VERSION_PROPERTY, newValue.toString());
-        int index = mBluetoothSelectAvrcpVersion.findIndexOfValue(newValue.toString());
-        if (index >= 0) {
-            String[] titles = getResources().getStringArray(R.array.bluetooth_avrcp_versions);
-            mBluetoothSelectAvrcpVersion.setSummary(titles[index]);
-        }
-    }
-
-    private void updateBluetoothA2dpConfigurationValues() {
-        int index;
-        String[] summaries;
-        BluetoothCodecStatus codecStatus = null;
-        BluetoothCodecConfig codecConfig = null;
-        BluetoothCodecConfig[] codecsLocalCapabilities = null;
-        BluetoothCodecConfig[] codecsSelectableCapabilities = null;
-        String streaming;
-        Resources resources = null;
-
-        synchronized (mBluetoothA2dpLock) {
-            if (mBluetoothA2dp != null) {
-                codecStatus = mBluetoothA2dp.getCodecStatus();
-                if (codecStatus != null) {
-                    codecConfig = codecStatus.getCodecConfig();
-                    codecsLocalCapabilities = codecStatus.getCodecsLocalCapabilities();
-                    codecsSelectableCapabilities = codecStatus.getCodecsSelectableCapabilities();
-                }
-            }
-        }
-        if (codecConfig == null) {
-            return;
-        }
-
-        try {
-            resources = getResources();
-        } catch (IllegalStateException e) {
-            return;
-        }
-        if (resources == null) {
-            return;
-        }
-
-        // Update the Codec Type
-        index = -1;
-        switch (codecConfig.getCodecType()) {
-        case BluetoothCodecConfig.SOURCE_CODEC_TYPE_SBC:
-            index = 1;
-            break;
-        case BluetoothCodecConfig.SOURCE_CODEC_TYPE_AAC:
-            index = 2;
-            break;
-        case BluetoothCodecConfig.SOURCE_CODEC_TYPE_APTX:
-            index = 3;
-            break;
-        case BluetoothCodecConfig.SOURCE_CODEC_TYPE_APTX_HD:
-            index = 4;
-            break;
-        case BluetoothCodecConfig.SOURCE_CODEC_TYPE_LDAC:
-            index = 5;
-            break;
-        case BluetoothCodecConfig.SOURCE_CODEC_TYPE_INVALID:
-        default:
-            break;
-        }
-        if (index >= 0 && mBluetoothSelectA2dpCodec != null) {
-            summaries = resources.getStringArray(R.array.bluetooth_a2dp_codec_summaries);
-            streaming = resources.getString(R.string.bluetooth_select_a2dp_codec_streaming_label, summaries[index]);
-            mBluetoothSelectA2dpCodec.setSummary(streaming);
-        }
-
-        // Update the Sample Rate
-        index = -1;
-        switch (codecConfig.getSampleRate()) {
-        case BluetoothCodecConfig.SAMPLE_RATE_44100:
-            index = 1;
-            break;
-        case BluetoothCodecConfig.SAMPLE_RATE_48000:
-            index = 2;
-            break;
-        case BluetoothCodecConfig.SAMPLE_RATE_88200:
-            index = 3;
-            break;
-        case BluetoothCodecConfig.SAMPLE_RATE_96000:
-            index = 4;
-            break;
-        case BluetoothCodecConfig.SAMPLE_RATE_176400:
-        case BluetoothCodecConfig.SAMPLE_RATE_192000:
-        case BluetoothCodecConfig.SAMPLE_RATE_NONE:
-        default:
-            break;
-        }
-        if (index >= 0 && mBluetoothSelectA2dpSampleRate != null) {
-            summaries = resources.getStringArray(R.array.bluetooth_a2dp_codec_sample_rate_summaries);
-            streaming = resources.getString(R.string.bluetooth_select_a2dp_codec_streaming_label, summaries[index]);
-             mBluetoothSelectA2dpSampleRate.setSummary(streaming);
-        }
-
-        // Update the Bits Per Sample
-        index = -1;
-        switch (codecConfig.getBitsPerSample()) {
-        case BluetoothCodecConfig.BITS_PER_SAMPLE_16:
-            index = 1;
-            break;
-        case BluetoothCodecConfig.BITS_PER_SAMPLE_24:
-            index = 2;
-            break;
-        case BluetoothCodecConfig.BITS_PER_SAMPLE_32:
-            index = 3;
-            break;
-        case BluetoothCodecConfig.BITS_PER_SAMPLE_NONE:
-        default:
-            break;
-        }
-        if (index >= 0 && mBluetoothSelectA2dpBitsPerSample != null) {
-            summaries = resources.getStringArray(R.array.bluetooth_a2dp_codec_bits_per_sample_summaries);
-            streaming = resources.getString(R.string.bluetooth_select_a2dp_codec_streaming_label, summaries[index]);
-            mBluetoothSelectA2dpBitsPerSample.setSummary(streaming);
-        }
-
-        // Update the Channel Mode
-        index = -1;
-        switch (codecConfig.getChannelMode()) {
-        case BluetoothCodecConfig.CHANNEL_MODE_MONO:
-            index = 1;
-            break;
-        case BluetoothCodecConfig.CHANNEL_MODE_STEREO:
-            index = 2;
-            break;
-        case BluetoothCodecConfig.CHANNEL_MODE_NONE:
-        default:
-            break;
-        }
-        if (index >= 0 && mBluetoothSelectA2dpChannelMode != null) {
-            summaries = resources.getStringArray(R.array.bluetooth_a2dp_codec_channel_mode_summaries);
-            streaming = resources.getString(R.string.bluetooth_select_a2dp_codec_streaming_label, summaries[index]);
-             mBluetoothSelectA2dpChannelMode.setSummary(streaming);
-        }
-
-        // Update the LDAC Playback Quality
-        // The actual values are 0, 1, 2 - those are extracted
-        // as mod-10 remainders of a larger value.
-        // The reason is because within BluetoothCodecConfig we cannot use
-        // a codec-specific value of zero.
-        index = (int)codecConfig.getCodecSpecific1();
-        if (index > 0) {
-            index %= 10;
-        } else {
-            index = -1;
-        }
-        switch (index) {
-        case 0:
-        case 1:
-        case 2:
-        case 3:
-            break;
-        default:
-            index = -1;
-            break;
-        }
-        if (index >= 0 && mBluetoothSelectA2dpLdacPlaybackQuality != null) {
-            summaries = resources.getStringArray(R.array.bluetooth_a2dp_codec_ldac_playback_quality_summaries);
-            streaming = resources.getString(R.string.bluetooth_select_a2dp_codec_streaming_label, summaries[index]);
-            mBluetoothSelectA2dpLdacPlaybackQuality.setSummary(streaming);
-        }
-    }
-
-    private void writeBluetoothConfigurationOption(Preference preference,
-                                                   Object newValue) {
-        String[] summaries;
-        int index;
-        int codecTypeValue = BluetoothCodecConfig.SOURCE_CODEC_TYPE_INVALID;
-        int codecPriorityValue = BluetoothCodecConfig.CODEC_PRIORITY_DEFAULT;
-        int sampleRateValue = BluetoothCodecConfig.SAMPLE_RATE_NONE;
-        int bitsPerSampleValue = BluetoothCodecConfig.BITS_PER_SAMPLE_NONE;
-        int channelModeValue = BluetoothCodecConfig.CHANNEL_MODE_NONE;
-        long codecSpecific1Value = 0;
-        long codecSpecific2Value = 0;
-        long codecSpecific3Value = 0;
-        long codecSpecific4Value = 0;
-
-        // Codec Type
-        String codecType = mBluetoothSelectA2dpCodec.getValue();
-        if (preference == mBluetoothSelectA2dpCodec) {
-            codecType = newValue.toString();
-            index = mBluetoothSelectA2dpCodec.findIndexOfValue(newValue.toString());
-            if (index >= 0) {
-                summaries = getResources().getStringArray(R.array.bluetooth_a2dp_codec_summaries);
-                mBluetoothSelectA2dpCodec.setSummary(summaries[index]);
-            }
-        }
-        index = mBluetoothSelectA2dpCodec.findIndexOfValue(codecType);
-        switch (index) {
-        case 0:
-            // Reset the priority of the current codec to default
-            String oldValue = mBluetoothSelectA2dpCodec.getValue();
-            switch (mBluetoothSelectA2dpCodec.findIndexOfValue(oldValue)) {
-            case 0:
-                break;      // No current codec
-            case 1:
-                codecTypeValue = BluetoothCodecConfig.SOURCE_CODEC_TYPE_SBC;
-                break;
-            case 2:
-                codecTypeValue = BluetoothCodecConfig.SOURCE_CODEC_TYPE_AAC;
-                break;
-            case 3:
-                codecTypeValue = BluetoothCodecConfig.SOURCE_CODEC_TYPE_APTX;
-                break;
-            case 4:
-                codecTypeValue = BluetoothCodecConfig.SOURCE_CODEC_TYPE_APTX_HD;
-                break;
-            case 5:
-                codecTypeValue = BluetoothCodecConfig.SOURCE_CODEC_TYPE_LDAC;
-                break;
-            default:
-                break;
-            }
-            break;
-        case 1:
-            codecTypeValue = BluetoothCodecConfig.SOURCE_CODEC_TYPE_SBC;
-            codecPriorityValue = BluetoothCodecConfig.CODEC_PRIORITY_HIGHEST;
-            break;
-        case 2:
-            codecTypeValue = BluetoothCodecConfig.SOURCE_CODEC_TYPE_AAC;
-            codecPriorityValue = BluetoothCodecConfig.CODEC_PRIORITY_HIGHEST;
-            break;
-        case 3:
-            codecTypeValue = BluetoothCodecConfig.SOURCE_CODEC_TYPE_APTX;
-            codecPriorityValue = BluetoothCodecConfig.CODEC_PRIORITY_HIGHEST;
-            break;
-        case 4:
-            codecTypeValue = BluetoothCodecConfig.SOURCE_CODEC_TYPE_APTX_HD;
-            codecPriorityValue = BluetoothCodecConfig.CODEC_PRIORITY_HIGHEST;
-            break;
-        case 5:
-            codecTypeValue = BluetoothCodecConfig.SOURCE_CODEC_TYPE_LDAC;
-            codecPriorityValue = BluetoothCodecConfig.CODEC_PRIORITY_HIGHEST;
-            break;
-        case 6:
-        synchronized (mBluetoothA2dpLock) {
-            if (mBluetoothA2dp != null) {
-                mBluetoothA2dp.enableOptionalCodecs();
-            }
-        }
-        return;
-        case 7:
-        synchronized (mBluetoothA2dpLock) {
-            if (mBluetoothA2dp != null) {
-                mBluetoothA2dp.disableOptionalCodecs();
-            }
-        }
-        return;
-        default:
-            break;
-        }
-
-        // Sample Rate
-        String sampleRate = mBluetoothSelectA2dpSampleRate.getValue();
-        if (preference == mBluetoothSelectA2dpSampleRate) {
-            sampleRate = newValue.toString();
-            index = mBluetoothSelectA2dpSampleRate.findIndexOfValue(newValue.toString());
-            if (index >= 0) {
-                summaries = getResources().getStringArray(R.array.bluetooth_a2dp_codec_sample_rate_summaries);
-                mBluetoothSelectA2dpSampleRate.setSummary(summaries[index]);
-            }
-        }
-        index = mBluetoothSelectA2dpSampleRate.findIndexOfValue(sampleRate);
-        switch (index) {
-        case 0:
-            // Reset to default
-            break;
-        case 1:
-            sampleRateValue = BluetoothCodecConfig.SAMPLE_RATE_44100;
-            break;
-        case 2:
-            sampleRateValue = BluetoothCodecConfig.SAMPLE_RATE_48000;
-            break;
-        case 3:
-            sampleRateValue = BluetoothCodecConfig.SAMPLE_RATE_88200;
-            break;
-        case 4:
-            sampleRateValue = BluetoothCodecConfig.SAMPLE_RATE_96000;
-            break;
-        default:
-            break;
-        }
-
-        // Bits Per Sample
-        String bitsPerSample = mBluetoothSelectA2dpBitsPerSample.getValue();
-        if (preference == mBluetoothSelectA2dpBitsPerSample) {
-            bitsPerSample = newValue.toString();
-            index = mBluetoothSelectA2dpBitsPerSample.findIndexOfValue(newValue.toString());
-            if (index >= 0) {
-                summaries = getResources().getStringArray(R.array.bluetooth_a2dp_codec_bits_per_sample_summaries);
-                mBluetoothSelectA2dpBitsPerSample.setSummary(summaries[index]);
-            }
-        }
-        index = mBluetoothSelectA2dpBitsPerSample.findIndexOfValue(bitsPerSample);
-        switch (index) {
-        case 0:
-            // Reset to default
-            break;
-        case 1:
-            bitsPerSampleValue = BluetoothCodecConfig.BITS_PER_SAMPLE_16;
-            break;
-        case 2:
-            bitsPerSampleValue = BluetoothCodecConfig.BITS_PER_SAMPLE_24;
-            break;
-        case 3:
-            bitsPerSampleValue = BluetoothCodecConfig.BITS_PER_SAMPLE_32;
-            break;
-        default:
-            break;
-        }
-
-        // Channel Mode
-        String channelMode = mBluetoothSelectA2dpChannelMode.getValue();
-        if (preference == mBluetoothSelectA2dpChannelMode) {
-            channelMode = newValue.toString();
-            index = mBluetoothSelectA2dpChannelMode.findIndexOfValue(newValue.toString());
-            if (index >= 0) {
-                summaries = getResources().getStringArray(R.array.bluetooth_a2dp_codec_channel_mode_summaries);
-                mBluetoothSelectA2dpChannelMode.setSummary(summaries[index]);
-            }
-        }
-        index = mBluetoothSelectA2dpChannelMode.findIndexOfValue(channelMode);
-        switch (index) {
-        case 0:
-            // Reset to default
-            break;
-        case 1:
-            channelModeValue = BluetoothCodecConfig.CHANNEL_MODE_MONO;
-            break;
-        case 2:
-            channelModeValue = BluetoothCodecConfig.CHANNEL_MODE_STEREO;
-            break;
-        default:
-            break;
-        }
-
-        // LDAC Playback Quality
-        String ldacPlaybackQuality = mBluetoothSelectA2dpLdacPlaybackQuality.getValue();
-        if (preference == mBluetoothSelectA2dpLdacPlaybackQuality) {
-            ldacPlaybackQuality = newValue.toString();
-            index = mBluetoothSelectA2dpLdacPlaybackQuality.findIndexOfValue(newValue.toString());
-            if (index >= 0) {
-                summaries = getResources().getStringArray(R.array.bluetooth_a2dp_codec_ldac_playback_quality_summaries);
-                mBluetoothSelectA2dpLdacPlaybackQuality.setSummary(summaries[index]);
-            }
-        }
-        index = mBluetoothSelectA2dpLdacPlaybackQuality.findIndexOfValue(ldacPlaybackQuality);
-        switch (index) {
-        case 0:
-        case 1:
-        case 2:
-        case 3:
-            codecSpecific1Value = 1000 + index;
-            break;
-        default:
-            break;
-        }
-
-        BluetoothCodecConfig codecConfig =
-            new BluetoothCodecConfig(codecTypeValue, codecPriorityValue,
-                                     sampleRateValue, bitsPerSampleValue,
-                                     channelModeValue, codecSpecific1Value,
-                                     codecSpecific2Value, codecSpecific3Value,
-                                     codecSpecific4Value);
-
-        synchronized (mBluetoothA2dpLock) {
-            if (mBluetoothA2dp != null) {
-                mBluetoothA2dp.setCodecConfigPreference(codecConfig);
-            }
-        }
-    }
-
-    private void updatePrivateDnsSummary() {
-        final String summary = PrivateDnsModeDialogPreference.getSummaryStringForModeFromSettings(
-                getActivity().getContentResolver(), getActivity().getResources());
-        final Preference pref = findPreference(PRIVATE_DNS_PREF_KEY);
-        pref.setSummary(summary);
-    }
-
-    private void writeImmediatelyDestroyActivitiesOptions() {
-        try {
-            ActivityManager.getService().setAlwaysFinish(
-                    mImmediatelyDestroyActivities.isChecked());
-        } catch (RemoteException ex) {
-        }
-    }
-
-    private void updateImmediatelyDestroyActivitiesOptions() {
-        updateSwitchPreference(mImmediatelyDestroyActivities, Settings.Global.getInt(
-                getActivity().getContentResolver(), Settings.Global.ALWAYS_FINISH_ACTIVITIES, 0)
-                != 0);
-    }
-
-    private void updateAnimationScaleValue(int which, ListPreference pref) {
-        try {
-            float scale = mWindowManager.getAnimationScale(which);
-            if (scale != 1) {
-                mHaveDebugSettings = true;
-            }
-            CharSequence[] values = pref.getEntryValues();
-            for (int i = 0; i < values.length; i++) {
-                float val = Float.parseFloat(values[i].toString());
-                if (scale <= val) {
-                    pref.setValueIndex(i);
-                    pref.setSummary(pref.getEntries()[i]);
-                    return;
-                }
-            }
-            pref.setValueIndex(values.length - 1);
-            pref.setSummary(pref.getEntries()[0]);
-        } catch (RemoteException e) {
-        }
-    }
-
-    private void updateAnimationScaleOptions() {
-        updateAnimationScaleValue(0, mWindowAnimationScale);
-        updateAnimationScaleValue(1, mTransitionAnimationScale);
-        updateAnimationScaleValue(2, mAnimatorDurationScale);
-    }
-
-    private void writeAnimationScaleOption(int which, ListPreference pref, Object newValue) {
-        try {
-            float scale = newValue != null ? Float.parseFloat(newValue.toString()) : 1;
-            mWindowManager.setAnimationScale(which, scale);
-            updateAnimationScaleValue(which, pref);
-        } catch (RemoteException e) {
-        }
-    }
-
-    private void updateOverlayDisplayDevicesOptions() {
-        String value = Settings.Global.getString(getActivity().getContentResolver(),
-                Settings.Global.OVERLAY_DISPLAY_DEVICES);
-        if (value == null) {
-            value = "";
-        }
-
-        CharSequence[] values = mOverlayDisplayDevices.getEntryValues();
-        for (int i = 0; i < values.length; i++) {
-            if (value.contentEquals(values[i])) {
-                mOverlayDisplayDevices.setValueIndex(i);
-                mOverlayDisplayDevices.setSummary(mOverlayDisplayDevices.getEntries()[i]);
-                return;
-            }
-        }
-        mOverlayDisplayDevices.setValueIndex(0);
-        mOverlayDisplayDevices.setSummary(mOverlayDisplayDevices.getEntries()[0]);
-    }
-
-    private void writeOverlayDisplayDevicesOptions(Object newValue) {
-        Settings.Global.putString(getActivity().getContentResolver(),
-                Settings.Global.OVERLAY_DISPLAY_DEVICES, (String) newValue);
-        updateOverlayDisplayDevicesOptions();
-    }
-
-    private void updateAppProcessLimitOptions() {
-        try {
-            int limit = ActivityManager.getService().getProcessLimit();
-            CharSequence[] values = mAppProcessLimit.getEntryValues();
-            for (int i = 0; i < values.length; i++) {
-                int val = Integer.parseInt(values[i].toString());
-                if (val >= limit) {
-                    if (i != 0) {
-                        mHaveDebugSettings = true;
-                    }
-                    mAppProcessLimit.setValueIndex(i);
-                    mAppProcessLimit.setSummary(mAppProcessLimit.getEntries()[i]);
-                    return;
-                }
-            }
-            mAppProcessLimit.setValueIndex(0);
-            mAppProcessLimit.setSummary(mAppProcessLimit.getEntries()[0]);
-        } catch (RemoteException e) {
-        }
-    }
-
-    private void writeAppProcessLimitOptions(Object newValue) {
-        try {
-            int limit = newValue != null ? Integer.parseInt(newValue.toString()) : -1;
-            ActivityManager.getService().setProcessLimit(limit);
-            updateAppProcessLimitOptions();
-        } catch (RemoteException e) {
-        }
-    }
-
-    private void writeShowAllANRsOptions() {
-        Settings.Secure.putInt(getActivity().getContentResolver(),
-                Settings.Secure.ANR_SHOW_BACKGROUND,
-                mShowAllANRs.isChecked() ? 1 : 0);
-    }
-
-    private void updateShowAllANRsOptions() {
-        updateSwitchPreference(mShowAllANRs, Settings.Secure.getInt(
-                getActivity().getContentResolver(), Settings.Secure.ANR_SHOW_BACKGROUND, 0) != 0);
-    }
-
-    private void writeShowNotificationChannelWarningsOptions() {
-        Settings.Global.putInt(getActivity().getContentResolver(),
-                Settings.Global.SHOW_NOTIFICATION_CHANNEL_WARNINGS,
-                mShowNotificationChannelWarnings.isChecked() ? 1 : 0);
-    }
-
-    private void updateShowNotificationChannelWarningsOptions() {
-        final int defaultWarningEnabled = Build.IS_DEBUGGABLE ? 1 : 0;
-        updateSwitchPreference(mShowNotificationChannelWarnings, Settings.Global.getInt(
-                getActivity().getContentResolver(),
-                Settings.Global.SHOW_NOTIFICATION_CHANNEL_WARNINGS, defaultWarningEnabled) != 0);
-    }
-
-    private void confirmEnableOemUnlock() {
-        DialogInterface.OnClickListener onClickListener = new DialogInterface.OnClickListener() {
-            @Override
-            public void onClick(DialogInterface dialog, int which) {
-                if (which == DialogInterface.BUTTON_POSITIVE) {
-                    mOemLockManager.setOemUnlockAllowedByUser(true);
-                }
-            }
-        };
-
-        DialogInterface.OnDismissListener onDismissListener =
-                new DialogInterface.OnDismissListener() {
-                    @Override
-                    public void onDismiss(DialogInterface dialog) {
-                        if (getActivity() == null) {
-                            return;
-                        }
-                        updateAllOptions();
-                    }
-                };
-
-        new AlertDialog.Builder(getActivity())
-                .setTitle(R.string.confirm_enable_oem_unlock_title)
-                .setMessage(R.string.confirm_enable_oem_unlock_text)
-                .setPositiveButton(R.string.enable_text, onClickListener)
-                .setNegativeButton(android.R.string.cancel, null)
-                .setOnDismissListener(onDismissListener)
-                .create()
-                .show();
-    }
-
-    @Override
-    public void onSwitchChanged(Switch switchView, boolean isChecked) {
-        if (switchView != mSwitchBar.getSwitch()) {
-            return;
-        }
-        final boolean lastEnabledState = mSettingsEnabler.getLastEnabledState();
-        if (isChecked != lastEnabledState) {
-            if (isChecked) {
-                mDialogClicked = false;
-                if (mEnableDialog != null) dismissDialogs();
-                mEnableDialog = new AlertDialog.Builder(getActivity()).setMessage(
-                        getActivity().getResources().getString(
-                                R.string.dev_settings_warning_message))
-                        .setTitle(R.string.dev_settings_warning_title)
-                        .setPositiveButton(android.R.string.yes, this)
-                        .setNegativeButton(android.R.string.no, this)
-                        .show();
-                mEnableDialog.setOnDismissListener(this);
-            } else {
-                resetDangerousOptions();
-                mSettingsEnabler.disableDevelopmentSettings();
-                setPrefsEnabledState(false);
-            }
-        }
-    }
-
-    @Override
-    public void onActivityResult(int requestCode, int resultCode, Intent data) {
-        if (requestCode == RESULT_DEBUG_APP) {
-            if (resultCode == Activity.RESULT_OK) {
-                mDebugApp = data.getAction();
-                writeDebuggerOptions();
-                updateDebuggerOptions();
-            }
-        } else if (requestCode == RESULT_MOCK_LOCATION_APP) {
-            if (resultCode == Activity.RESULT_OK) {
-                mMockLocationApp = data.getAction();
-                writeMockLocation();
-                updateMockLocation();
-            }
-        } else if (requestCode == REQUEST_CODE_ENABLE_OEM_UNLOCK) {
-            if (resultCode == Activity.RESULT_OK) {
-                if (mEnableOemUnlock.isChecked()) {
-                    confirmEnableOemUnlock();
-                } else {
-                    mOemLockManager.setOemUnlockAllowedByUser(false);
-                }
-            }
-        } else {
-            super.onActivityResult(requestCode, resultCode, data);
-        }
-    }
-
-    @Override
-    public boolean onPreferenceTreeClick(Preference preference) {
-        if (Utils.isMonkeyRunning()) {
-            return false;
-        }
-
-        if (mBugReportInPowerController.handlePreferenceTreeClick(preference)) {
-            return true;
-        }
-
-        if (mTelephonyMonitorController.handlePreferenceTreeClick(preference)) {
-            return true;
-        }
-
-        if (mWebViewAppPrefController.handlePreferenceTreeClick(preference)) {
-            return true;
-        }
-
-        if (mVerifyAppsOverUsbController.handlePreferenceTreeClick(preference)) {
-            return true;
-        }
-
-        if (mEnableAdbController.handlePreferenceTreeClick(preference)) {
-            return true;
-        }
-
-        if (mCameraLaserSensorController.handlePreferenceTreeClick(preference)) {
-            return true;
-        }
-
-        if (preference == mClearAdbKeys) {
-            if (mAdbKeysDialog != null) dismissDialogs();
-            mAdbKeysDialog = new AlertDialog.Builder(getActivity())
-                    .setMessage(R.string.adb_keys_warning_message)
-                    .setPositiveButton(android.R.string.ok, this)
-                    .setNegativeButton(android.R.string.cancel, null)
-                    .show();
-        } else if (preference == mEnableTerminal) {
-            final PackageManager pm = getActivity().getPackageManager();
-            pm.setApplicationEnabledSetting(TERMINAL_APP_PACKAGE,
-                    mEnableTerminal.isChecked() ? PackageManager.COMPONENT_ENABLED_STATE_ENABLED
-                            : PackageManager.COMPONENT_ENABLED_STATE_DEFAULT, 0);
-        } else if (preference == mKeepScreenOn) {
-            Settings.Global.putInt(getActivity().getContentResolver(),
-                    Settings.Global.STAY_ON_WHILE_PLUGGED_IN,
-                    mKeepScreenOn.isChecked() ?
-                            (BatteryManager.BATTERY_PLUGGED_AC | BatteryManager.BATTERY_PLUGGED_USB
-                                    | BatteryManager.BATTERY_PLUGGED_WIRELESS) : 0);
-        } else if (preference == mBtHciSnoopLog) {
-            writeBtHciSnoopLogOptions();
-        } else if (preference == mEnableOemUnlock && mEnableOemUnlock.isEnabled()) {
-            if (mEnableOemUnlock.isChecked()) {
-                if (!showKeyguardConfirmation(getResources(), REQUEST_CODE_ENABLE_OEM_UNLOCK)) {
-                    confirmEnableOemUnlock();
-                }
-            } else {
-                mOemLockManager.setOemUnlockAllowedByUser(false);
-            }
-        } else if (preference == mMockLocationAppPref) {
-            Intent intent = new Intent(getActivity(), AppPicker.class);
-            intent.putExtra(AppPicker.EXTRA_REQUESTIING_PERMISSION,
-                    Manifest.permission.ACCESS_MOCK_LOCATION);
-            startActivityForResult(intent, RESULT_MOCK_LOCATION_APP);
-        } else if (preference == mDebugViewAttributes) {
-            Settings.Global.putInt(getActivity().getContentResolver(),
-                    Settings.Global.DEBUG_VIEW_ATTRIBUTES,
-                    mDebugViewAttributes.isChecked() ? 1 : 0);
-        } else if (preference == mForceAllowOnExternal) {
-            Settings.Global.putInt(getActivity().getContentResolver(),
-                    Settings.Global.FORCE_ALLOW_ON_EXTERNAL,
-                    mForceAllowOnExternal.isChecked() ? 1 : 0);
-        } else if (preference == mDebugAppPref) {
-            Intent intent = new Intent(getActivity(), AppPicker.class);
-            intent.putExtra(AppPicker.EXTRA_DEBUGGABLE, true);
-            startActivityForResult(intent, RESULT_DEBUG_APP);
-        } else if (preference == mWaitForDebugger) {
-            writeDebuggerOptions();
-        } else if (preference == mOtaDisableAutomaticUpdate) {
-            writeOtaDisableAutomaticUpdateOptions();
-        } else if (preference == mStrictMode) {
-            writeStrictModeVisualOptions();
-        } else if (preference == mPointerLocation) {
-            writePointerLocationOptions();
-        } else if (preference == mShowTouches) {
-            writeShowTouchesOptions();
-        } else if (preference == mShowScreenUpdates) {
-            writeShowUpdatesOption();
-        } else if (preference == mDisableOverlays) {
-            writeDisableOverlaysOption();
-        } else if (preference == mImmediatelyDestroyActivities) {
-            writeImmediatelyDestroyActivitiesOptions();
-        } else if (preference == mShowAllANRs) {
-            writeShowAllANRsOptions();
-        } else if (preference == mShowNotificationChannelWarnings) {
-            writeShowNotificationChannelWarningsOptions();
-        } else if (preference == mForceHardwareUi) {
-            writeHardwareUiOptions();
-        } else if (preference == mForceMsaa) {
-            writeMsaaOptions();
-        } else if (preference == mShowHwScreenUpdates) {
-            writeShowHwScreenUpdatesOptions();
-        } else if (preference == mShowHwLayersUpdates) {
-            writeShowHwLayersUpdatesOptions();
-        } else if (preference == mDebugLayout) {
-            writeDebugLayoutOptions();
-        } else if (preference == mForceRtlLayout) {
-            writeForceRtlOptions();
-        } else if (preference == mWifiDisplayCertification) {
-            writeWifiDisplayCertificationOptions();
-        } else if (preference == mWifiVerboseLogging) {
-            writeWifiVerboseLoggingOptions();
-        } else if (preference == mWifiAggressiveHandover) {
-            writeWifiAggressiveHandoverOptions();
-        } else if (preference == mWifiAllowScansWithTraffic) {
-            writeWifiAllowScansWithTrafficOptions();
-        } else if (preference == mMobileDataAlwaysOn) {
-            writeMobileDataAlwaysOnOptions();
-        } else if (preference == mTetheringHardwareOffload) {
-            writeTetheringHardwareOffloadOptions();
-        } else if (preference == mColorTemperaturePreference) {
-            writeColorTemperature();
-        } else if (preference == mUSBAudio) {
-            writeUSBAudioOptions();
-        } else if (preference == mForceResizable) {
-            writeForceResizableOptions();
-        } else if (preference == mBluetoothShowDevicesWithoutNames) {
-            writeBluetoothShowDevicesWithoutUserFriendlyNameOptions();
-        } else if (preference == mBluetoothDisableAbsVolume) {
-            writeBluetoothDisableAbsVolumeOptions();
-        } else if (preference == mBluetoothEnableInbandRinging) {
-            writeBluetoothEnableInbandRingingOptions();
-        } else if (SHORTCUT_MANAGER_RESET_KEY.equals(preference.getKey())) {
-            resetShortcutManagerThrottling();
-        } else {
-            return super.onPreferenceTreeClick(preference);
-        }
-
-        return false;
-    }
-
-    private boolean showKeyguardConfirmation(Resources resources, int requestCode) {
-        return new ChooseLockSettingsHelper(getActivity(), this).launchConfirmationActivity(
-                requestCode, resources.getString(R.string.oem_unlock_enable));
-    }
-
-    @Override
-    public boolean onPreferenceChange(Preference preference, Object newValue) {
-        if (HDCP_CHECKING_KEY.equals(preference.getKey())) {
-            SystemProperties.set(HDCP_CHECKING_PROPERTY, newValue.toString());
-            updateHdcpValues();
-            pokeSystemProperties();
-            return true;
-        } else if (preference == mBluetoothSelectAvrcpVersion) {
-           writeBluetoothAvrcpVersion(newValue);
-           return true;
-        } else if ((preference == mBluetoothSelectA2dpCodec) ||
-                   (preference == mBluetoothSelectA2dpSampleRate) ||
-                   (preference == mBluetoothSelectA2dpBitsPerSample) ||
-                   (preference == mBluetoothSelectA2dpChannelMode) ||
-                   (preference == mBluetoothSelectA2dpLdacPlaybackQuality)) {
-            writeBluetoothConfigurationOption(preference, newValue);
-            return true;
-        } else if (preference == mLogdSize) {
-            writeLogdSizeOption(newValue);
-            return true;
-        } else if (preference == mLogpersist) {
-            writeLogpersistOption(newValue, false);
-            return true;
-        } else if (preference == mUsbConfiguration) {
-            writeUsbConfigurationOption(newValue);
-            return true;
-        } else if (preference == mWindowAnimationScale) {
-            writeAnimationScaleOption(0, mWindowAnimationScale, newValue);
-            return true;
-        } else if (preference == mTransitionAnimationScale) {
-            writeAnimationScaleOption(1, mTransitionAnimationScale, newValue);
-            return true;
-        } else if (preference == mAnimatorDurationScale) {
-            writeAnimationScaleOption(2, mAnimatorDurationScale, newValue);
-            return true;
-        } else if (preference == mOverlayDisplayDevices) {
-            writeOverlayDisplayDevicesOptions(newValue);
-            return true;
-        } else if (preference == mTrackFrameTime) {
-            writeTrackFrameTimeOptions(newValue);
-            return true;
-        } else if (preference == mDebugHwOverdraw) {
-            writeDebugHwOverdrawOptions(newValue);
-            return true;
-        } else if (preference == mDebugHwRenderer) {
-            writeDebugHwRendererOptions(newValue);
-            return true;
-        } else if (preference == mShowNonRectClip) {
-            writeShowNonRectClipOptions(newValue);
-            return true;
-        } else if (preference == mAppProcessLimit) {
-            writeAppProcessLimitOptions(newValue);
-            return true;
-        } else if (preference == mSimulateColorSpace) {
-            writeSimulateColorSpace(newValue);
-            return true;
-        }
-        return false;
-    }
-
-    private void dismissDialogs() {
-        mEnableAdbController.dismissDialogs();
-        if (mAdbKeysDialog != null) {
-            mAdbKeysDialog.dismiss();
-            mAdbKeysDialog = null;
-        }
-        if (mEnableDialog != null) {
-            mEnableDialog.dismiss();
-            mEnableDialog = null;
-        }
-        if (mLogpersistClearDialog != null) {
-            mLogpersistClearDialog.dismiss();
-            mLogpersistClearDialog = null;
-        }
-    }
-
-    public void onClick(DialogInterface dialog, int which) {
-        if (dialog == mAdbKeysDialog) {
-            if (which == DialogInterface.BUTTON_POSITIVE) {
-                try {
-                    IBinder b = ServiceManager.getService(Context.USB_SERVICE);
-                    IUsbManager service = IUsbManager.Stub.asInterface(b);
-                    service.clearUsbDebuggingKeys();
-                } catch (RemoteException e) {
-                    Log.e(TAG, "Unable to clear adb keys", e);
-                }
-            }
-        } else if (dialog == mEnableDialog) {
-            if (which == DialogInterface.BUTTON_POSITIVE) {
-                mDialogClicked = true;
-                mSettingsEnabler.enableDevelopmentSettings();
-                setPrefsEnabledState(true);
-            } else {
-                // Reset the toggle
-                mSwitchBar.setChecked(false);
-            }
-        } else if (dialog == mLogpersistClearDialog) {
-            if (which == DialogInterface.BUTTON_POSITIVE) {
-                setLogpersistOff(true);
-            } else {
-                updateLogpersistValues();
-            }
-        }
-    }
-
-    public void onDismiss(DialogInterface dialog) {
-        // Assuming that onClick gets called first
-        if (dialog == mEnableDialog) {
-            if (!mDialogClicked) {
-                mSwitchBar.setChecked(false);
-            }
-            mEnableDialog = null;
-        } else if (dialog == mLogpersistClearDialog) {
-            mLogpersistClearDialog = null;
-        }
-    }
-
-    @Override
-    public void onDestroy() {
-        dismissDialogs();
-        super.onDestroy();
-    }
-
-    void pokeSystemProperties() {
-        if (!mDontPokeProperties) {
-            //noinspection unchecked
-            (new SystemPropPoker()).execute();
-        }
-    }
-
-    private BroadcastReceiver mUsbReceiver = new BroadcastReceiver() {
-        @Override
-        public void onReceive(Context context, Intent intent) {
-            updateUsbConfigurationValues();
-        }
-    };
-
-    private BroadcastReceiver mBluetoothA2dpReceiver = new BroadcastReceiver() {
-        @Override
-        public void onReceive(Context context, Intent intent) {
-            Log.d(TAG, "mBluetoothA2dpReceiver.onReceive intent=" + intent);
-            String action = intent.getAction();
-
-            if (BluetoothA2dp.ACTION_CODEC_CONFIG_CHANGED.equals(action)) {
-                BluetoothCodecStatus codecStatus =
-                    (BluetoothCodecStatus)intent.getParcelableExtra(BluetoothCodecStatus.EXTRA_CODEC_STATUS);
-                Log.d(TAG, "Received BluetoothCodecStatus=" + codecStatus);
-                updateBluetoothA2dpConfigurationValues();
-            }
-        }
-    };
-
-    private BluetoothProfile.ServiceListener mBluetoothA2dpServiceListener =
-        new BluetoothProfile.ServiceListener() {
-            public void onServiceConnected(int profile,
-                                           BluetoothProfile proxy) {
-                synchronized (mBluetoothA2dpLock) {
-                    mBluetoothA2dp = (BluetoothA2dp) proxy;
-                }
-                updateBluetoothA2dpConfigurationValues();
-            }
-
-            public void onServiceDisconnected(int profile) {
-                synchronized (mBluetoothA2dpLock) {
-                    mBluetoothA2dp = null;
-                }
-                updateBluetoothA2dpConfigurationValues();
-            }
-        };
-
-    public static class SystemPropPoker extends AsyncTask<Void, Void, Void> {
-        @Override
-        protected Void doInBackground(Void... params) {
-            String[] services = ServiceManager.listServices();
-            for (String service : services) {
-                IBinder obj = ServiceManager.checkService(service);
-                if (obj != null) {
-                    Parcel data = Parcel.obtain();
-                    try {
-                        obj.transact(IBinder.SYSPROPS_TRANSACTION, data, null, 0);
-                    } catch (RemoteException e) {
-                    } catch (Exception e) {
-                        Log.i(TAG, "Someone wrote a bad service '" + service
-                                + "' that doesn't like to be poked: " + e);
-                    }
-                    data.recycle();
-                }
-            }
-            return null;
-        }
-    }
-
-    private static boolean isPackageInstalled(Context context, String packageName) {
-        try {
-            return context.getPackageManager().getPackageInfo(packageName, 0) != null;
-        } catch (NameNotFoundException e) {
-            return false;
-        }
-    }
-
-
-    /**
-     * For Search.
-     */
-    public static final Indexable.SearchIndexProvider SEARCH_INDEX_DATA_PROVIDER =
-            new BaseSearchIndexProvider() {
-
-                @Override
-                protected boolean isPageSearchEnabled(Context context) {
-                    return context.getSharedPreferences(DevelopmentSettings.PREF_FILE,
-                            Context.MODE_PRIVATE).getBoolean(
-                            DevelopmentSettings.PREF_SHOW,
-                            android.os.Build.TYPE.equals("eng"));
-                }
-
-                @Override
-                public List<SearchIndexableResource> getXmlResourcesToIndex(
-                        Context context, boolean enabled) {
-
-                    final SearchIndexableResource sir = new SearchIndexableResource(context);
-                    sir.xmlResId = R.xml.development_prefs;
-                    return Arrays.asList(sir);
-                }
-
-                @Override
-                public List<String> getNonIndexableKeys(Context context) {
-                    final List<String> keys = super.getNonIndexableKeys(context);
-
-                    if (!showEnableOemUnlockPreference(context)) {
-                        keys.add(ENABLE_OEM_UNLOCK);
-                    }
-                    return keys;
-                }
-            };
-
-    private void resetShortcutManagerThrottling() {
-        final IShortcutService service = IShortcutService.Stub.asInterface(
-                ServiceManager.getService(Context.SHORTCUT_SERVICE));
-        if (service != null) {
-            try {
-                service.resetThrottling();
-                Toast.makeText(getActivity(), R.string.reset_shortcut_manager_throttling_complete,
-                        Toast.LENGTH_SHORT).show();
-            } catch (RemoteException e) {
-                Log.e(TAG, "Failed to reset rate limiting", e);
-            }
-        }
-    }
-
-    private void updateOemUnlockSettingDescription() {
-        if (mEnableOemUnlock != null) {
-            int oemUnlockSummary = R.string.oem_unlock_enable_summary;
-            if (isBootloaderUnlocked()) {
-                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 (!isOemUnlockAllowedByUserAndCarrier()) {
-                // 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;
-            }
-            mEnableOemUnlock.setSummary(getString(oemUnlockSummary));
-        }
-    }
-
-    /** Returns {@code true} if the device is SIM-locked. Otherwise, returns {@code false}. */
-    private boolean isSimLockedDevice() {
-        int phoneCount = mTelephonyManager.getPhoneCount();
-        for (int i = 0; i < phoneCount; i++) {
-            if (mTelephonyManager.getAllowedCarriers(i).size() > 0) {
-                return true;
-            }
-        }
-        return false;
-    }
-
-    /**
-     * Returns {@code true} if the bootloader has been unlocked. Otherwise, returns {code false}.
-     */
-    private boolean isBootloaderUnlocked() {
-        return mOemLockManager.isDeviceOemUnlocked();
-    }
-
-
-}
diff --git a/src/com/android/settings/development/DevelopmentSettingsDashboardFragment.java b/src/com/android/settings/development/DevelopmentSettingsDashboardFragment.java
new file mode 100644
index 0000000..8f114fc
--- /dev/null
+++ b/src/com/android/settings/development/DevelopmentSettingsDashboardFragment.java
@@ -0,0 +1,485 @@
+/*
+ * Copyright (C) 2017 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF 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.app.Activity;
+import android.bluetooth.BluetoothA2dp;
+import android.bluetooth.BluetoothAdapter;
+import android.bluetooth.BluetoothCodecStatus;
+import android.bluetooth.BluetoothProfile;
+import android.content.BroadcastReceiver;
+import android.content.Context;
+import android.content.Intent;
+import android.content.IntentFilter;
+import android.os.Bundle;
+import android.os.UserManager;
+import android.provider.SearchIndexableResource;
+import android.support.annotation.VisibleForTesting;
+import android.support.v4.content.LocalBroadcastManager;
+import android.util.Log;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.Switch;
+
+import com.android.internal.logging.nano.MetricsProto;
+import com.android.settings.R;
+import com.android.settings.SettingsActivity;
+import com.android.settings.Utils;
+import com.android.settings.dashboard.RestrictedDashboardFragment;
+import com.android.settings.search.BaseSearchIndexProvider;
+import com.android.settings.search.Indexable;
+import com.android.settings.widget.SwitchBar;
+import com.android.settingslib.core.AbstractPreferenceController;
+import com.android.settingslib.core.lifecycle.Lifecycle;
+import com.android.settingslib.development.DeveloperOptionsPreferenceController;
+import com.android.settingslib.development.DevelopmentSettingsEnabler;
+import com.android.settingslib.development.SystemPropPoker;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+
+public class DevelopmentSettingsDashboardFragment extends RestrictedDashboardFragment
+        implements SwitchBar.OnSwitchChangeListener, OemUnlockDialogHost, AdbDialogHost,
+        AdbClearKeysDialogHost, LogPersistDialogHost {
+
+    private static final String TAG = "DevSettingsDashboard";
+
+    private final BluetoothA2dpConfigStore mBluetoothA2dpConfigStore =
+            new BluetoothA2dpConfigStore();
+
+    private boolean mIsAvailable = true;
+    private SwitchBar mSwitchBar;
+    private DevelopmentSwitchBarController mSwitchBarController;
+    private List<AbstractPreferenceController> mPreferenceControllers = new ArrayList<>();
+    private BluetoothA2dp mBluetoothA2dp;
+
+    private final BroadcastReceiver mEnableAdbReceiver = new BroadcastReceiver() {
+        @Override
+        public void onReceive(Context context, Intent intent) {
+            for (AbstractPreferenceController controller : mPreferenceControllers) {
+                if (controller instanceof AdbOnChangeListener) {
+                    ((AdbOnChangeListener) controller).onAdbSettingChanged();
+                }
+            }
+        }
+    };
+
+    private final BroadcastReceiver mBluetoothA2dpReceiver = new BroadcastReceiver() {
+        @Override
+        public void onReceive(Context context, Intent intent) {
+            Log.d(TAG, "mBluetoothA2dpReceiver.onReceive intent=" + intent);
+            String action = intent.getAction();
+
+            if (BluetoothA2dp.ACTION_CODEC_CONFIG_CHANGED.equals(action)) {
+                BluetoothCodecStatus codecStatus = intent.getParcelableExtra(
+                        BluetoothCodecStatus.EXTRA_CODEC_STATUS);
+                Log.d(TAG, "Received BluetoothCodecStatus=" + codecStatus);
+                for (AbstractPreferenceController controller : mPreferenceControllers) {
+                    if (controller instanceof BluetoothServiceConnectionListener) {
+                        ((BluetoothServiceConnectionListener) controller).onBluetoothCodecUpdated();
+                    }
+                }
+            }
+        }
+    };
+
+
+    private final BluetoothProfile.ServiceListener mBluetoothA2dpServiceListener =
+            new BluetoothProfile.ServiceListener() {
+                @Override
+                public void onServiceConnected(int profile,
+                        BluetoothProfile proxy) {
+                    synchronized (mBluetoothA2dpConfigStore) {
+                        mBluetoothA2dp = (BluetoothA2dp) proxy;
+                    }
+                    for (AbstractPreferenceController controller : mPreferenceControllers) {
+                        if (controller instanceof BluetoothServiceConnectionListener) {
+                            ((BluetoothServiceConnectionListener) controller)
+                                    .onBluetoothServiceConnected(mBluetoothA2dp);
+                        }
+                    }
+                }
+
+                @Override
+                public void onServiceDisconnected(int profile) {
+                    synchronized (mBluetoothA2dpConfigStore) {
+                        mBluetoothA2dp = null;
+                    }
+                    for (AbstractPreferenceController controller : mPreferenceControllers) {
+                        if (controller instanceof BluetoothServiceConnectionListener) {
+                            ((BluetoothServiceConnectionListener) controller)
+                                    .onBluetoothServiceDisconnected();
+                        }
+                    }
+                }
+            };
+
+    public DevelopmentSettingsDashboardFragment() {
+        super(UserManager.DISALLOW_DEBUGGING_FEATURES);
+    }
+
+    @Override
+    public void onCreate(Bundle icicle) {
+        super.onCreate(icicle);
+        if (Utils.isMonkeyRunning()) {
+            getActivity().finish();
+            return;
+        }
+    }
+
+    @Override
+    public void onActivityCreated(Bundle icicle) {
+        super.onActivityCreated(icicle);
+        // Apply page-level restrictions
+        setIfOnlyAvailableForAdmins(true);
+        if (isUiRestricted() || !Utils.isDeviceProvisioned(getActivity())) {
+            // 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
+            mIsAvailable = false;
+            // Show error message
+            if (!isUiRestrictedByOnlyAdmin()) {
+                getEmptyTextView().setText(R.string.development_settings_not_available);
+            }
+            getPreferenceScreen().removeAll();
+            return;
+        }
+        // Set up master switch
+        mSwitchBar = ((SettingsActivity) getActivity()).getSwitchBar();
+        mSwitchBarController = new DevelopmentSwitchBarController(
+                this /* DevelopmentSettings */, mSwitchBar, mIsAvailable, getLifecycle());
+        mSwitchBar.show();
+
+        // Restore UI state based on whether developer options is enabled
+        if (DevelopmentSettingsEnabler.isDevelopmentSettingsEnabled(getContext())) {
+            enableDeveloperOptions();
+        } else {
+            disableDeveloperOptions();
+        }
+    }
+
+    @Override
+    public View onCreateView(LayoutInflater inflater, ViewGroup container,
+            Bundle savedInstanceState) {
+        registerReceivers();
+
+        final BluetoothAdapter adapter = BluetoothAdapter.getDefaultAdapter();
+        if (adapter != null) {
+            adapter.getProfileProxy(getActivity(), mBluetoothA2dpServiceListener,
+                    BluetoothProfile.A2DP);
+        }
+        return super.onCreateView(inflater, container, savedInstanceState);
+    }
+
+    @Override
+    public void onDestroyView() {
+        super.onDestroyView();
+        unregisterReceivers();
+
+        final BluetoothAdapter adapter = BluetoothAdapter.getDefaultAdapter();
+        if (adapter != null) {
+            adapter.closeProfileProxy(BluetoothProfile.A2DP, mBluetoothA2dp);
+            mBluetoothA2dp = null;
+        }
+    }
+
+    @Override
+    public int getMetricsCategory() {
+        return MetricsProto.MetricsEvent.DEVELOPMENT;
+    }
+
+    @Override
+    public void onSwitchChanged(Switch switchView, boolean isChecked) {
+        if (switchView != mSwitchBar.getSwitch()) {
+            return;
+        }
+        final boolean developmentEnabledState =
+                DevelopmentSettingsEnabler.isDevelopmentSettingsEnabled(getContext());
+        if (isChecked != developmentEnabledState) {
+            if (isChecked) {
+                EnableDevelopmentSettingWarningDialog.show(this /* host */);
+            } else {
+                disableDeveloperOptions();
+            }
+        }
+    }
+
+    @Override
+    public void onOemUnlockDialogConfirmed() {
+        final OemUnlockPreferenceController controller = getDevelopmentOptionsController(
+                OemUnlockPreferenceController.class);
+        controller.onOemUnlockConfirmed();
+    }
+
+    @Override
+    public void onOemUnlockDialogDismissed() {
+        final OemUnlockPreferenceController controller = getDevelopmentOptionsController(
+                OemUnlockPreferenceController.class);
+        controller.onOemUnlockDismissed();
+    }
+
+    @Override
+    public void onEnableAdbDialogConfirmed() {
+        final AdbPreferenceController controller = getDevelopmentOptionsController(
+                AdbPreferenceController.class);
+        controller.onAdbDialogConfirmed();
+
+    }
+
+    @Override
+    public void onEnableAdbDialogDismissed() {
+        final AdbPreferenceController controller = getDevelopmentOptionsController(
+                AdbPreferenceController.class);
+        controller.onAdbDialogDismissed();
+    }
+
+    @Override
+    public void onAdbClearKeysDialogConfirmed() {
+        final ClearAdbKeysPreferenceController controller = getDevelopmentOptionsController(
+                ClearAdbKeysPreferenceController.class);
+        controller.onClearAdbKeysConfirmed();
+    }
+
+    @Override
+    public void onDisableLogPersistDialogConfirmed() {
+        final LogPersistPreferenceController controller = getDevelopmentOptionsController(
+                LogPersistPreferenceController.class);
+        controller.onDisableLogPersistDialogConfirmed();
+    }
+
+    @Override
+    public void onDisableLogPersistDialogRejected() {
+        final LogPersistPreferenceController controller = getDevelopmentOptionsController(
+                LogPersistPreferenceController.class);
+        controller.onDisableLogPersistDialogRejected();
+    }
+
+    @Override
+    public void onActivityResult(int requestCode, int resultCode, Intent data) {
+        boolean handledResult = false;
+        for (AbstractPreferenceController controller : mPreferenceControllers) {
+            if (controller instanceof OnActivityResultListener) {
+                // We do not break early because it is possible for multiple controllers to
+                // handle the same result code.
+                handledResult |=
+                        ((OnActivityResultListener) controller).onActivityResult(
+                                requestCode, resultCode, data);
+            }
+        }
+        if (!handledResult) {
+            super.onActivityResult(requestCode, resultCode, data);
+        }
+    }
+
+    @Override
+    protected String getLogTag() {
+        return TAG;
+    }
+
+    @Override
+    public int getHelpResource() {
+        return 0;
+    }
+
+    @Override
+    protected int getPreferenceScreenResId() {
+        return Utils.isMonkeyRunning()? R.xml.placeholder_prefs : R.xml.development_settings;
+    }
+
+    @Override
+    protected List<AbstractPreferenceController> getPreferenceControllers(Context context) {
+        if (Utils.isMonkeyRunning()) {
+            mPreferenceControllers = new ArrayList<>();
+            return null;
+        }
+        mPreferenceControllers = buildPreferenceControllers(context, getActivity(), getLifecycle(),
+                this /* devOptionsDashboardFragment */,
+                new BluetoothA2dpConfigStore());
+        return mPreferenceControllers;
+    }
+
+    private void registerReceivers() {
+        LocalBroadcastManager.getInstance(getContext())
+                .registerReceiver(mEnableAdbReceiver, new IntentFilter(
+                        AdbPreferenceController.ACTION_ENABLE_ADB_STATE_CHANGED));
+
+        final IntentFilter filter = new IntentFilter();
+        filter.addAction(BluetoothA2dp.ACTION_CODEC_CONFIG_CHANGED);
+        getActivity().registerReceiver(mBluetoothA2dpReceiver, filter);
+    }
+
+    private void unregisterReceivers() {
+        LocalBroadcastManager.getInstance(getContext()).unregisterReceiver(mEnableAdbReceiver);
+        getActivity().unregisterReceiver(mBluetoothA2dpReceiver);
+    }
+
+    private void enableDeveloperOptions() {
+        if (Utils.isMonkeyRunning()) {
+            return;
+        }
+        DevelopmentSettingsEnabler.setDevelopmentSettingsEnabled(getContext(), true);
+        for (AbstractPreferenceController controller : mPreferenceControllers) {
+            if (controller instanceof DeveloperOptionsPreferenceController) {
+                ((DeveloperOptionsPreferenceController) controller).onDeveloperOptionsEnabled();
+            }
+        }
+    }
+
+    private void disableDeveloperOptions() {
+        if (Utils.isMonkeyRunning()) {
+            return;
+        }
+        DevelopmentSettingsEnabler.setDevelopmentSettingsEnabled(getContext(), false);
+        final SystemPropPoker poker = SystemPropPoker.getInstance();
+        poker.blockPokes();
+        for (AbstractPreferenceController controller : mPreferenceControllers) {
+            if (controller instanceof DeveloperOptionsPreferenceController) {
+                ((DeveloperOptionsPreferenceController) controller)
+                        .onDeveloperOptionsDisabled();
+            }
+        }
+        poker.unblockPokes();
+        poker.poke();
+    }
+
+    void onEnableDevelopmentOptionsConfirmed() {
+        enableDeveloperOptions();
+    }
+
+    void onEnableDevelopmentOptionsRejected() {
+        // Reset the toggle
+        mSwitchBar.setChecked(false);
+    }
+
+    private static List<AbstractPreferenceController> buildPreferenceControllers(Context context,
+            Activity activity, Lifecycle lifecycle, DevelopmentSettingsDashboardFragment fragment,
+            BluetoothA2dpConfigStore bluetoothA2dpConfigStore) {
+        final List<AbstractPreferenceController> controllers = new ArrayList<>();
+        controllers.add(new MemoryUsagePreferenceController(context));
+        controllers.add(new BugReportPreferenceController(context));
+        controllers.add(new LocalBackupPasswordPreferenceController(context));
+        controllers.add(new StayAwakePreferenceController(context, lifecycle));
+        controllers.add(new HdcpCheckingPreferenceController(context));
+        controllers.add(new BluetoothSnoopLogPreferenceController(context));
+        controllers.add(new OemUnlockPreferenceController(context, activity, fragment));
+        controllers.add(new FileEncryptionPreferenceController(context));
+        controllers.add(new PictureColorModePreferenceController(context, lifecycle));
+        controllers.add(new WebViewAppPreferenceController(context));
+        controllers.add(new CoolColorTemperaturePreferenceController(context));
+        controllers.add(new DisableAutomaticUpdatesPreferenceController(context));
+        controllers.add(new AdbPreferenceController(context, fragment));
+        controllers.add(new ClearAdbKeysPreferenceController(context, fragment));
+        controllers.add(new LocalTerminalPreferenceController(context));
+        controllers.add(new BugReportInPowerPreferenceController(context));
+        controllers.add(new MockLocationAppPreferenceController(context, fragment));
+        controllers.add(new DebugViewAttributesPreferenceController(context));
+        controllers.add(new SelectDebugAppPreferenceController(context, fragment));
+        controllers.add(new WaitForDebuggerPreferenceController(context));
+        controllers.add(new EnableGpuDebugLayersPreferenceController(context));
+        controllers.add(new VerifyAppsOverUsbPreferenceController(context));
+        controllers.add(new LogdSizePreferenceController(context));
+        controllers.add(new LogPersistPreferenceController(context, fragment, lifecycle));
+        controllers.add(new ConnectivityMonitorPreferenceController(context));
+        controllers.add(new CameraLaserSensorPreferenceController(context));
+        controllers.add(new WifiDisplayCertificationPreferenceController(context));
+        controllers.add(new WifiVerboseLoggingPreferenceController(context));
+        controllers.add(new WifiAggressiveHandoverPreferenceController(context));
+        controllers.add(new WifiRoamScansPreferenceController(context));
+        controllers.add(new MobileDataAlwaysOnPreferenceController(context));
+        controllers.add(new TetheringHardwareAccelPreferenceController(context));
+        controllers.add(new SelectUsbConfigPreferenceController(context, lifecycle));
+        controllers.add(new BluetoothDeviceNoNamePreferenceController(context));
+        controllers.add(new BluetoothAbsoluteVolumePreferenceController(context));
+        controllers.add(new BluetoothInbandRingingPreferenceController(context));
+        controllers.add(new BluetoothAvrcpVersionPreferenceController(context));
+        controllers.add(new BluetoothAudioCodecPreferenceController(context, lifecycle,
+                bluetoothA2dpConfigStore));
+        controllers.add(new BluetoothAudioSampleRatePreferenceController(context, lifecycle,
+                bluetoothA2dpConfigStore));
+        controllers.add(new BluetoothAudioBitsPerSamplePreferenceController(context, lifecycle,
+                bluetoothA2dpConfigStore));
+        controllers.add(new BluetoothAudioChannelModePreferenceController(context, lifecycle,
+                bluetoothA2dpConfigStore));
+        controllers.add(new BluetoothAudioQualityPreferenceController(context, lifecycle,
+                bluetoothA2dpConfigStore));
+        controllers.add(new ShowTapsPreferenceController(context));
+        controllers.add(new PointerLocationPreferenceController(context));
+        controllers.add(new ShowSurfaceUpdatesPreferenceController(context));
+        controllers.add(new ShowLayoutBoundsPreferenceController(context));
+        controllers.add(new RtlLayoutPreferenceController(context));
+        controllers.add(new WindowAnimationScalePreferenceController(context));
+        controllers.add(new TransitionAnimationScalePreferenceController(context));
+        controllers.add(new AnimatorDurationScalePreferenceController(context));
+        controllers.add(new SecondaryDisplayPreferenceController(context));
+        controllers.add(new ForceGpuRenderingPreferenceController(context));
+        controllers.add(new GpuViewUpdatesPreferenceController(context));
+        controllers.add(new HardwareLayersUpdatesPreferenceController(context));
+        controllers.add(new DebugGpuOverdrawPreferenceController(context));
+        controllers.add(new DebugNonRectClipOperationsPreferenceController(context));
+        controllers.add(new ForceMSAAPreferenceController(context));
+        controllers.add(new HardwareOverlaysPreferenceController(context));
+        controllers.add(new SimulateColorSpacePreferenceController(context));
+        controllers.add(new SetGpuRendererPreferenceController(context));
+        controllers.add(new UsbAudioRoutingPreferenceController(context));
+        controllers.add(new StrictModePreferenceController(context));
+        controllers.add(new ProfileGpuRenderingPreferenceController(context));
+        controllers.add(new KeepActivitiesPreferenceController(context));
+        controllers.add(new BackgroundProcessLimitPreferenceController(context));
+        controllers.add(new AppsNotRespondingPreferenceController(context));
+        controllers.add(new NotificationChannelWarningsPreferenceController(context));
+        controllers.add(new AllowAppsOnExternalPreferenceController(context));
+        controllers.add(new ResizableActivityPreferenceController(context));
+        controllers.add(new FreeformWindowsPreferenceController(context));
+        controllers.add(new ShortcutManagerThrottlingPreferenceController(context));
+        return controllers;
+    }
+
+    @VisibleForTesting
+    <T extends AbstractPreferenceController> T getDevelopmentOptionsController(Class<T> clazz) {
+        return getPreferenceController(clazz);
+    }
+
+    /**
+     * For Search.
+     */
+    public static final Indexable.SearchIndexProvider SEARCH_INDEX_DATA_PROVIDER =
+            new BaseSearchIndexProvider() {
+
+                @Override
+                protected boolean isPageSearchEnabled(Context context) {
+                    return DevelopmentSettingsEnabler.isDevelopmentSettingsEnabled(context);
+                }
+
+                @Override
+                public List<SearchIndexableResource> getXmlResourcesToIndex(
+                        Context context, boolean enabled) {
+
+                    final SearchIndexableResource sir = new SearchIndexableResource(context);
+                    sir.xmlResId = R.xml.development_settings;
+                    return Arrays.asList(sir);
+                }
+
+                @Override
+                public List<AbstractPreferenceController> getPreferenceControllers(Context
+                        context) {
+                    return buildPreferenceControllers(context, null /* activity */,
+                            null /* lifecycle */, null /* devOptionsDashboardFragment */,
+                            null /* bluetoothA2dpConfigStore */);
+                }
+            };
+}
diff --git a/src/com/android/settings/development/DevelopmentSettingsEnabler.java b/src/com/android/settings/development/DevelopmentSettingsEnabler.java
deleted file mode 100644
index ed750e4..0000000
--- a/src/com/android/settings/development/DevelopmentSettingsEnabler.java
+++ /dev/null
@@ -1,77 +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.content.SharedPreferences;
-import android.provider.Settings;
-
-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 {
-
-    private final Context mContext;
-    private final SharedPreferences mDevelopmentPreferences;
-    private boolean mLastEnabledState;
-
-    public DevelopmentSettingsEnabler(Context context, Lifecycle lifecycle) {
-        mContext = context;
-        mDevelopmentPreferences = context.getSharedPreferences(DevelopmentSettings.PREF_FILE,
-                Context.MODE_PRIVATE);
-        updateEnabledState();
-        if (lifecycle != null) {
-            lifecycle.addObserver(this);
-        }
-    }
-
-    @Override
-    public void onResume() {
-        updateEnabledState();
-    }
-
-    public static boolean enableDevelopmentSettings(Context context, SharedPreferences prefs) {
-        prefs.edit()
-                .putBoolean(DevelopmentSettings.PREF_SHOW, true)
-                .commit();
-        return Settings.Global.putInt(context.getContentResolver(),
-                Settings.Global.DEVELOPMENT_SETTINGS_ENABLED, 1);
-    }
-
-    private void updateEnabledState() {
-        mLastEnabledState = Settings.Global.getInt(mContext.getContentResolver(),
-                Settings.Global.DEVELOPMENT_SETTINGS_ENABLED, 0) != 0;
-    }
-
-    public boolean getLastEnabledState() {
-        return mLastEnabledState;
-    }
-
-    public void enableDevelopmentSettings() {
-        mLastEnabledState = enableDevelopmentSettings(mContext, mDevelopmentPreferences);
-    }
-
-    public void disableDevelopmentSettings() {
-        mDevelopmentPreferences.edit()
-                .putBoolean(DevelopmentSettings.PREF_SHOW, false)
-                .commit();
-        Settings.Global.putInt(mContext.getContentResolver(),
-                Settings.Global.DEVELOPMENT_SETTINGS_ENABLED, 0);
-        mLastEnabledState = false;
-    }
-}
diff --git a/src/com/android/settings/development/DevelopmentSwitchBarController.java b/src/com/android/settings/development/DevelopmentSwitchBarController.java
index 168f7c0..79a8310 100644
--- a/src/com/android/settings/development/DevelopmentSwitchBarController.java
+++ b/src/com/android/settings/development/DevelopmentSwitchBarController.java
@@ -16,21 +16,24 @@
 
 package com.android.settings.development;
 
+import android.support.annotation.NonNull;
+
 import com.android.settings.Utils;
 import com.android.settings.widget.SwitchBar;
 import com.android.settingslib.core.lifecycle.Lifecycle;
 import com.android.settingslib.core.lifecycle.LifecycleObserver;
 import com.android.settingslib.core.lifecycle.events.OnStart;
 import com.android.settingslib.core.lifecycle.events.OnStop;
+import com.android.settingslib.development.DevelopmentSettingsEnabler;
 
 public class DevelopmentSwitchBarController implements LifecycleObserver, OnStart, OnStop {
 
     private final SwitchBar mSwitchBar;
     private final boolean mIsAvailable;
-    private final DevelopmentSettings mSettings;
+    private final DevelopmentSettingsDashboardFragment mSettings;
 
-    public DevelopmentSwitchBarController(DevelopmentSettings settings, SwitchBar switchBar,
-            boolean isAvailable, Lifecycle lifecycle) {
+    public DevelopmentSwitchBarController(@NonNull DevelopmentSettingsDashboardFragment settings,
+            SwitchBar switchBar, boolean isAvailable, Lifecycle lifecycle) {
         mSwitchBar = switchBar;
         mIsAvailable = isAvailable && !Utils.isMonkeyRunning();
         mSettings = settings;
@@ -44,6 +47,9 @@
 
     @Override
     public void onStart() {
+        final boolean developmentEnabledState = DevelopmentSettingsEnabler
+                .isDevelopmentSettingsEnabled(mSettings.getContext());
+        mSwitchBar.setChecked(developmentEnabledState);
         mSwitchBar.addOnSwitchChangeListener(mSettings);
     }
 
diff --git a/src/com/android/settings/development/DisableAutomaticUpdatesPreferenceController.java b/src/com/android/settings/development/DisableAutomaticUpdatesPreferenceController.java
new file mode 100644
index 0000000..4090462
--- /dev/null
+++ b/src/com/android/settings/development/DisableAutomaticUpdatesPreferenceController.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.development;
+
+import android.content.Context;
+import android.provider.Settings;
+import android.support.annotation.VisibleForTesting;
+import android.support.v14.preference.SwitchPreference;
+import android.support.v7.preference.Preference;
+import android.support.v7.preference.PreferenceScreen;
+
+import com.android.settings.core.PreferenceControllerMixin;
+import com.android.settingslib.development.DeveloperOptionsPreferenceController;
+
+public class DisableAutomaticUpdatesPreferenceController extends
+        DeveloperOptionsPreferenceController implements
+        Preference.OnPreferenceChangeListener, PreferenceControllerMixin {
+
+    private static final String OTA_DISABLE_AUTOMATIC_UPDATE_KEY = "ota_disable_automatic_update";
+
+    private SwitchPreference mPreference;
+
+    // We use the "disabled status" in code, but show the opposite text
+    // "Automatic system updates" on screen. So a value 0 indicates the
+    // automatic update is enabled.
+    @VisibleForTesting
+    final static int DISABLE_UPDATES_SETTING = 1;
+    @VisibleForTesting
+    final static int ENABLE_UPDATES_SETTING = 0;
+
+    public DisableAutomaticUpdatesPreferenceController(Context context) {
+        super(context);
+    }
+
+    @Override
+    public String getPreferenceKey() {
+        return OTA_DISABLE_AUTOMATIC_UPDATE_KEY;
+    }
+
+    @Override
+    public void displayPreference(PreferenceScreen screen) {
+        super.displayPreference(screen);
+
+        mPreference = (SwitchPreference) screen.findPreference(getPreferenceKey());
+    }
+
+    @Override
+    public boolean onPreferenceChange(Preference preference, Object newValue) {
+        final boolean updatesEnabled = (Boolean) newValue;
+        Settings.Global.putInt(mContext.getContentResolver(),
+                Settings.Global.OTA_DISABLE_AUTOMATIC_UPDATE,
+                updatesEnabled ? ENABLE_UPDATES_SETTING : DISABLE_UPDATES_SETTING);
+        return true;
+    }
+
+    @Override
+    public void updateState(Preference preference) {
+        final int updatesEnabled = Settings.Global.getInt(mContext.getContentResolver(),
+                Settings.Global.OTA_DISABLE_AUTOMATIC_UPDATE, 0 /* default */);
+
+        mPreference.setChecked(updatesEnabled != DISABLE_UPDATES_SETTING);
+    }
+
+    @Override
+    protected void onDeveloperOptionsSwitchEnabled() {
+        mPreference.setEnabled(true);
+    }
+
+    @Override
+    protected void onDeveloperOptionsSwitchDisabled() {
+        Settings.Global.putInt(mContext.getContentResolver(),
+                Settings.Global.OTA_DISABLE_AUTOMATIC_UPDATE, DISABLE_UPDATES_SETTING);
+        mPreference.setChecked(false);
+        mPreference.setEnabled(false);
+    }
+}
diff --git a/src/com/android/settings/development/DisableLogPersistWarningDialog.java b/src/com/android/settings/development/DisableLogPersistWarningDialog.java
new file mode 100644
index 0000000..1ab3a92
--- /dev/null
+++ b/src/com/android/settings/development/DisableLogPersistWarningDialog.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.development;
+
+import android.app.AlertDialog;
+import android.app.Dialog;
+import android.app.Fragment;
+import android.app.FragmentManager;
+import android.content.DialogInterface;
+import android.os.Bundle;
+
+import com.android.internal.logging.nano.MetricsProto;
+import com.android.settings.R;
+import com.android.settings.core.instrumentation.InstrumentedDialogFragment;
+
+public class DisableLogPersistWarningDialog extends InstrumentedDialogFragment implements
+        DialogInterface.OnClickListener, DialogInterface.OnDismissListener {
+
+    public static final String TAG = "DisableLogPersistDlg";
+
+    public static void show(LogPersistDialogHost host) {
+        if (!(host instanceof Fragment)) {
+            return;
+        }
+        final Fragment hostFragment = (Fragment) host;
+        final FragmentManager manager = hostFragment.getActivity().getFragmentManager();
+        if (manager.findFragmentByTag(TAG) == null) {
+            final DisableLogPersistWarningDialog dialog =
+                    new DisableLogPersistWarningDialog();
+            dialog.setTargetFragment(hostFragment, 0 /* requestCode */);
+            dialog.show(manager, TAG);
+        }
+    }
+
+    @Override
+    public int getMetricsCategory() {
+        return MetricsProto.MetricsEvent.DIALOG_LOG_PERSIST;
+    }
+
+    @Override
+    public Dialog onCreateDialog(Bundle savedInstanceState) {
+        return new AlertDialog.Builder(getActivity())
+                .setTitle(R.string.dev_logpersist_clear_warning_title)
+                .setMessage(R.string.dev_logpersist_clear_warning_message)
+                .setPositiveButton(android.R.string.yes, this /* onClickListener */)
+                .setNegativeButton(android.R.string.no, this /* onClickListener */)
+                .create();
+    }
+
+    @Override
+    public void onClick(DialogInterface dialog, int which) {
+        final LogPersistDialogHost host = (LogPersistDialogHost) getTargetFragment();
+        if (host == null) {
+            return;
+        }
+        if (which == DialogInterface.BUTTON_POSITIVE) {
+            host.onDisableLogPersistDialogConfirmed();
+        } else {
+            host.onDisableLogPersistDialogRejected();
+        }
+    }
+}
diff --git a/src/com/android/settings/development/EnableAdbPreferenceController.java b/src/com/android/settings/development/EnableAdbPreferenceController.java
deleted file mode 100644
index a159f0a..0000000
--- a/src/com/android/settings/development/EnableAdbPreferenceController.java
+++ /dev/null
@@ -1,69 +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.app.AlertDialog;
-import android.app.Dialog;
-import android.content.Context;
-import android.provider.Settings;
-import android.support.v14.preference.SwitchPreference;
-
-import com.android.settings.R;
-import com.android.settings.core.PreferenceControllerMixin;
-import com.android.settingslib.development.AbstractEnableAdbPreferenceController;
-
-public class EnableAdbPreferenceController extends AbstractEnableAdbPreferenceController
-        implements PreferenceControllerMixin {
-
-    private Dialog mAdbDialog;
-    private boolean mDialogClicked;
-
-    public EnableAdbPreferenceController(Context context) {
-        super(context);
-    }
-
-    @Override
-    public void showConfirmationDialog(SwitchPreference preference) {
-        mDialogClicked = false;
-        dismissDialogs();
-        mAdbDialog = new AlertDialog.Builder(mContext).setMessage(
-                mContext.getString(R.string.adb_warning_message))
-                .setTitle(R.string.adb_warning_title)
-                .setPositiveButton(android.R.string.yes, (dialog, which) -> {
-                    mDialogClicked = true;
-                    writeAdbSetting(true);
-                })
-                .setNegativeButton(android.R.string.no, (dialog, which) -> {
-                    preference.setChecked(false);
-                })
-                .show();
-        mAdbDialog.setOnDismissListener(dialog -> {
-            // Assuming that onClick gets called first
-            if (!mDialogClicked) {
-                preference.setChecked(false);
-            }
-            mAdbDialog = null;
-        });
-    }
-
-    public void dismissDialogs() {
-        if (mAdbDialog != null) {
-            mAdbDialog.dismiss();
-            mAdbDialog = null;
-        }
-    }
-}
diff --git a/src/com/android/settings/development/EnableAdbWarningDialog.java b/src/com/android/settings/development/EnableAdbWarningDialog.java
new file mode 100644
index 0000000..9829f70
--- /dev/null
+++ b/src/com/android/settings/development/EnableAdbWarningDialog.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.development;
+
+import android.app.AlertDialog;
+import android.app.Dialog;
+import android.app.Fragment;
+import android.app.FragmentManager;
+import android.content.DialogInterface;
+import android.os.Bundle;
+
+import com.android.internal.logging.nano.MetricsProto;
+import com.android.settings.R;
+import com.android.settings.core.instrumentation.InstrumentedDialogFragment;
+
+public class EnableAdbWarningDialog extends InstrumentedDialogFragment implements
+        DialogInterface.OnClickListener, DialogInterface.OnDismissListener {
+
+    public static final String TAG = "EnableAdbDialog";
+
+    public static void show(Fragment host) {
+        final FragmentManager manager = host.getActivity().getFragmentManager();
+        if (manager.findFragmentByTag(TAG) == null) {
+            final EnableAdbWarningDialog dialog = new EnableAdbWarningDialog();
+            dialog.setTargetFragment(host, 0 /* requestCode */);
+            dialog.show(manager, TAG);
+        }
+    }
+
+    @Override
+    public int getMetricsCategory() {
+        return MetricsProto.MetricsEvent.DIALOG_ENABLE_ADB;
+    }
+
+    @Override
+    public Dialog onCreateDialog(Bundle savedInstanceState) {
+        return new AlertDialog.Builder(getActivity())
+                .setTitle(R.string.adb_warning_title)
+                .setMessage(R.string.adb_warning_message)
+                .setPositiveButton(android.R.string.yes, this /* onClickListener */)
+                .setNegativeButton(android.R.string.no, this /* onClickListener */)
+                .create();
+    }
+
+    @Override
+    public void onClick(DialogInterface dialog, int which) {
+        final AdbDialogHost host = (AdbDialogHost) getTargetFragment();
+        if (host == null) {
+            return;
+        }
+        if (which == DialogInterface.BUTTON_POSITIVE) {
+            host.onEnableAdbDialogConfirmed();
+        } else {
+            host.onEnableAdbDialogDismissed();
+        }
+    }
+
+    @Override
+    public void onDismiss(DialogInterface dialog) {
+        super.onDismiss(dialog);
+        final AdbDialogHost host = (AdbDialogHost) getTargetFragment();
+        if (host == null) {
+            return;
+        }
+        host.onEnableAdbDialogDismissed();
+    }
+}
diff --git a/src/com/android/settings/development/EnableDevelopmentSettingWarningDialog.java b/src/com/android/settings/development/EnableDevelopmentSettingWarningDialog.java
new file mode 100644
index 0000000..3c3d645
--- /dev/null
+++ b/src/com/android/settings/development/EnableDevelopmentSettingWarningDialog.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.development;
+
+import android.app.AlertDialog;
+import android.app.Dialog;
+import android.app.FragmentManager;
+import android.content.DialogInterface;
+import android.os.Bundle;
+
+import com.android.internal.logging.nano.MetricsProto;
+import com.android.settings.R;
+import com.android.settings.core.instrumentation.InstrumentedDialogFragment;
+
+public class EnableDevelopmentSettingWarningDialog extends InstrumentedDialogFragment
+        implements DialogInterface.OnClickListener {
+
+    public static final String TAG = "EnableDevSettingDlg";
+
+    public static void show(
+            DevelopmentSettingsDashboardFragment host) {
+        final EnableDevelopmentSettingWarningDialog dialog =
+                new EnableDevelopmentSettingWarningDialog();
+        dialog.setTargetFragment(host, 0 /* requestCode */);
+        final FragmentManager manager = host.getActivity().getFragmentManager();
+        if (manager.findFragmentByTag(TAG) == null) {
+            dialog.show(manager, TAG);
+        }
+    }
+
+    @Override
+    public int getMetricsCategory() {
+        return MetricsProto.MetricsEvent.DIALOG_ENABLE_DEVELOPMENT_OPTIONS;
+    }
+
+    @Override
+    public Dialog onCreateDialog(Bundle savedInstanceState) {
+        return new AlertDialog.Builder(getActivity())
+                .setMessage(R.string.dev_settings_warning_message)
+                .setTitle(R.string.dev_settings_warning_title)
+                .setPositiveButton(android.R.string.yes, this)
+                .setNegativeButton(android.R.string.no, this)
+                .create();
+    }
+
+    @Override
+    public void onClick(DialogInterface dialog, int which) {
+        final DevelopmentSettingsDashboardFragment host =
+                (DevelopmentSettingsDashboardFragment) getTargetFragment();
+        if (which == DialogInterface.BUTTON_POSITIVE) {
+            host.onEnableDevelopmentOptionsConfirmed();
+        } else {
+            host.onEnableDevelopmentOptionsRejected();
+        }
+    }
+}
diff --git a/src/com/android/settings/development/EnableGpuDebugLayersPreferenceController.java b/src/com/android/settings/development/EnableGpuDebugLayersPreferenceController.java
new file mode 100644
index 0000000..9cea8c8
--- /dev/null
+++ b/src/com/android/settings/development/EnableGpuDebugLayersPreferenceController.java
@@ -0,0 +1,86 @@
+/*
+ * Copyright (C) 2017 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.development;
+
+import android.content.Context;
+import android.provider.Settings;
+import android.support.annotation.VisibleForTesting;
+import android.support.v14.preference.SwitchPreference;
+import android.support.v7.preference.Preference;
+import android.support.v7.preference.PreferenceScreen;
+
+import com.android.settings.core.PreferenceControllerMixin;
+import com.android.settingslib.development.DeveloperOptionsPreferenceController;
+
+public class EnableGpuDebugLayersPreferenceController extends
+        DeveloperOptionsPreferenceController implements Preference.OnPreferenceChangeListener,
+        PreferenceControllerMixin {
+
+    private static final String ENABLE_GPU_DEBUG_LAYERS_KEY = "enable_gpu_debug_layers";
+
+    @VisibleForTesting
+    static final int SETTING_VALUE_ON = 1;
+    @VisibleForTesting
+    static final int SETTING_VALUE_OFF = 0;
+
+    private SwitchPreference mPreference;
+
+    public EnableGpuDebugLayersPreferenceController(Context context) {
+        super(context);
+    }
+
+    @Override
+    public String getPreferenceKey() {
+        return ENABLE_GPU_DEBUG_LAYERS_KEY;
+    }
+
+    @Override
+    public void displayPreference(PreferenceScreen screen) {
+        super.displayPreference(screen);
+
+        mPreference = (SwitchPreference) screen.findPreference(getPreferenceKey());
+    }
+
+    @Override
+    public boolean onPreferenceChange(Preference preference, Object newValue) {
+        final boolean isEnabled = (Boolean) newValue;
+        Settings.Global.putInt(mContext.getContentResolver(),
+                Settings.Global.ENABLE_GPU_DEBUG_LAYERS,
+                isEnabled ? SETTING_VALUE_ON : SETTING_VALUE_OFF);
+        return true;
+    }
+
+    @Override
+    public void updateState(Preference preference) {
+        final int enableGpuDebugLayersMode = Settings.Global.getInt(mContext.getContentResolver(),
+                Settings.Global.ENABLE_GPU_DEBUG_LAYERS, SETTING_VALUE_OFF);
+        mPreference.setChecked(enableGpuDebugLayersMode != SETTING_VALUE_OFF);
+    }
+
+    @Override
+    protected void onDeveloperOptionsSwitchEnabled() {
+        mPreference.setEnabled(true);
+    }
+
+    @Override
+    protected void onDeveloperOptionsSwitchDisabled() {
+        Settings.Global.putInt(mContext.getContentResolver(),
+                Settings.Global.ENABLE_GPU_DEBUG_LAYERS, SETTING_VALUE_OFF);
+        mPreference.setEnabled(false);
+        mPreference.setChecked(false);
+    }
+}
diff --git a/src/com/android/settings/development/EnableOemUnlockSettingWarningDialog.java b/src/com/android/settings/development/EnableOemUnlockSettingWarningDialog.java
new file mode 100644
index 0000000..2486ef5
--- /dev/null
+++ b/src/com/android/settings/development/EnableOemUnlockSettingWarningDialog.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.development;
+
+import android.app.AlertDialog;
+import android.app.Dialog;
+import android.app.Fragment;
+import android.app.FragmentManager;
+import android.content.DialogInterface;
+import android.os.Bundle;
+
+import com.android.internal.logging.nano.MetricsProto;
+import com.android.settings.R;
+import com.android.settings.core.instrumentation.InstrumentedDialogFragment;
+
+public class EnableOemUnlockSettingWarningDialog extends InstrumentedDialogFragment implements
+        DialogInterface.OnClickListener, DialogInterface.OnDismissListener {
+
+    public static final String TAG = "EnableOemUnlockDlg";
+
+    public static void show(Fragment host) {
+        final FragmentManager manager = host.getActivity().getFragmentManager();
+        if (manager.findFragmentByTag(TAG) == null) {
+            final EnableOemUnlockSettingWarningDialog dialog =
+                    new EnableOemUnlockSettingWarningDialog();
+            dialog.setTargetFragment(host, 0 /* requestCode */);
+            dialog.show(manager, TAG);
+        }
+    }
+
+    @Override
+    public int getMetricsCategory() {
+        return MetricsProto.MetricsEvent.DIALOG_ENABLE_OEM_UNLOCKING;
+    }
+
+    @Override
+    public Dialog onCreateDialog(Bundle savedInstanceState) {
+        return new AlertDialog.Builder(getActivity())
+                .setTitle(R.string.confirm_enable_oem_unlock_title)
+                .setMessage(R.string.confirm_enable_oem_unlock_text)
+                .setPositiveButton(R.string.enable_text, this /* onClickListener */)
+                .setNegativeButton(android.R.string.cancel, this /* onClickListener */)
+                .create();
+    }
+
+    @Override
+    public void onClick(DialogInterface dialog, int which) {
+        final OemUnlockDialogHost host = (OemUnlockDialogHost) getTargetFragment();
+        if (host == null) {
+            return;
+        }
+        if (which == DialogInterface.BUTTON_POSITIVE) {
+            host.onOemUnlockDialogConfirmed();
+        } else {
+            host.onOemUnlockDialogDismissed();
+        }
+    }
+
+    @Override
+    public void onDismiss(DialogInterface dialog) {
+        super.onDismiss(dialog);
+        final OemUnlockDialogHost host = (OemUnlockDialogHost) getTargetFragment();
+        if (host == null) {
+            return;
+        }
+        host.onOemUnlockDialogDismissed();
+    }
+}
diff --git a/src/com/android/settings/development/FileEncryptionPreferenceController.java b/src/com/android/settings/development/FileEncryptionPreferenceController.java
new file mode 100644
index 0000000..3249bcf
--- /dev/null
+++ b/src/com/android/settings/development/FileEncryptionPreferenceController.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.development;
+
+import android.content.Context;
+import android.os.RemoteException;
+import android.os.ServiceManager;
+import android.os.SystemProperties;
+import android.os.storage.IStorageManager;
+import android.support.annotation.VisibleForTesting;
+import android.support.v7.preference.Preference;
+import android.support.v7.preference.PreferenceScreen;
+import android.text.TextUtils;
+
+import com.android.settings.R;
+import com.android.settings.core.PreferenceControllerMixin;
+import com.android.settingslib.development.DeveloperOptionsPreferenceController;
+
+public class FileEncryptionPreferenceController extends
+        DeveloperOptionsPreferenceController implements PreferenceControllerMixin {
+
+    private static final String KEY_CONVERT_FBE = "convert_to_file_encryption";
+    private static final String KEY_STORAGE_MANAGER = "mount";
+
+    @VisibleForTesting
+    static final String FILE_ENCRYPTION_PROPERTY_KEY = "ro.crypto.type";
+
+    private final IStorageManager mStorageManager;
+
+    private Preference mPreference;
+
+    public FileEncryptionPreferenceController(Context context) {
+        super(context);
+
+        mStorageManager = getStorageManager();
+    }
+
+    @Override
+    public boolean isAvailable() {
+        if (mStorageManager == null) {
+            return false;
+        }
+
+        try {
+            return mStorageManager.isConvertibleToFBE();
+        } catch (RemoteException e) {
+            return false;
+        }
+    }
+
+    @Override
+    public String getPreferenceKey() {
+        return KEY_CONVERT_FBE;
+    }
+
+    @Override
+    public void displayPreference(PreferenceScreen screen) {
+        super.displayPreference(screen);
+
+        mPreference = screen.findPreference(getPreferenceKey());
+    }
+
+    @Override
+    public void updateState(Preference preference) {
+        if (!TextUtils.equals("file",
+                SystemProperties.get(FILE_ENCRYPTION_PROPERTY_KEY, "none" /* default */))) {
+            return;
+        }
+
+        mPreference.setEnabled(false);
+        mPreference.setSummary(
+                mContext.getResources().getString(R.string.convert_to_file_encryption_done));
+    }
+
+    private IStorageManager getStorageManager() {
+        try {
+            return IStorageManager.Stub.asInterface(
+                    ServiceManager.getService(KEY_STORAGE_MANAGER));
+        } catch (VerifyError e) {
+            // Used for tests since Robolectric cannot initialize this class.
+            return null;
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/com/android/settings/development/ForceGpuRenderingPreferenceController.java b/src/com/android/settings/development/ForceGpuRenderingPreferenceController.java
new file mode 100644
index 0000000..83f7930
--- /dev/null
+++ b/src/com/android/settings/development/ForceGpuRenderingPreferenceController.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.development;
+
+import android.content.Context;
+import android.os.SystemProperties;
+import android.support.annotation.VisibleForTesting;
+import android.support.v14.preference.SwitchPreference;
+import android.support.v7.preference.Preference;
+import android.support.v7.preference.PreferenceScreen;
+
+import com.android.settings.core.PreferenceControllerMixin;
+import com.android.settingslib.development.DeveloperOptionsPreferenceController;
+import com.android.settingslib.development.SystemPropPoker;
+
+public class ForceGpuRenderingPreferenceController extends
+        DeveloperOptionsPreferenceController implements Preference.OnPreferenceChangeListener,
+        PreferenceControllerMixin {
+
+    private static final String FORCE_HARDWARE_UI_KEY = "force_hw_ui";
+
+    @VisibleForTesting
+    static final String HARDWARE_UI_PROPERTY = "persist.sys.ui.hw";
+
+    private SwitchPreference mPreference;
+
+    public ForceGpuRenderingPreferenceController(Context context) {
+        super(context);
+    }
+
+    @Override
+    public String getPreferenceKey() {
+        return FORCE_HARDWARE_UI_KEY;
+    }
+
+    @Override
+    public void displayPreference(PreferenceScreen screen) {
+        super.displayPreference(screen);
+
+        mPreference = (SwitchPreference) screen.findPreference(getPreferenceKey());
+    }
+
+    @Override
+    public boolean onPreferenceChange(Preference preference, Object newValue) {
+        final boolean isEnabled = (Boolean) newValue;
+        SystemProperties.set(HARDWARE_UI_PROPERTY,
+                isEnabled ? Boolean.toString(true) : Boolean.toString(false));
+        SystemPropPoker.getInstance().poke();
+        return true;
+    }
+
+    @Override
+    public void updateState(Preference preference) {
+        final boolean isEnabled = SystemProperties.getBoolean(HARDWARE_UI_PROPERTY,
+                false /* default */);
+        mPreference.setChecked(isEnabled);
+    }
+
+    @Override
+    protected void onDeveloperOptionsSwitchEnabled() {
+        mPreference.setEnabled(true);
+    }
+
+    @Override
+    protected void onDeveloperOptionsSwitchDisabled() {
+        SystemProperties.set(HARDWARE_UI_PROPERTY, Boolean.toString(false));
+        mPreference.setEnabled(false);
+        mPreference.setChecked(false);
+    }
+}
diff --git a/src/com/android/settings/development/ForceMSAAPreferenceController.java b/src/com/android/settings/development/ForceMSAAPreferenceController.java
new file mode 100644
index 0000000..2d2fd95
--- /dev/null
+++ b/src/com/android/settings/development/ForceMSAAPreferenceController.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.development;
+
+import android.content.Context;
+import android.os.SystemProperties;
+import android.support.annotation.VisibleForTesting;
+import android.support.v14.preference.SwitchPreference;
+import android.support.v7.preference.Preference;
+import android.support.v7.preference.PreferenceScreen;
+
+import com.android.settings.core.PreferenceControllerMixin;
+import com.android.settingslib.development.DeveloperOptionsPreferenceController;
+import com.android.settingslib.development.SystemPropPoker;
+
+public class ForceMSAAPreferenceController extends DeveloperOptionsPreferenceController
+        implements Preference.OnPreferenceChangeListener, PreferenceControllerMixin {
+
+    private static final String FORCE_MSAA_KEY = "force_msaa";
+
+    @VisibleForTesting
+    static final String MSAA_PROPERTY = "debug.egl.force_msaa";
+
+    private SwitchPreference mPreference;
+
+    public ForceMSAAPreferenceController(Context context) {
+        super(context);
+    }
+
+    @Override
+    public String getPreferenceKey() {
+        return FORCE_MSAA_KEY;
+    }
+
+    @Override
+    public void displayPreference(PreferenceScreen screen) {
+        super.displayPreference(screen);
+
+        mPreference = (SwitchPreference) screen.findPreference(getPreferenceKey());
+    }
+
+    @Override
+    public boolean onPreferenceChange(Preference preference, Object newValue) {
+        final boolean isEnabled = (Boolean) newValue;
+        SystemProperties.set(MSAA_PROPERTY,
+                isEnabled ? Boolean.toString(true) : Boolean.toString(false));
+        SystemPropPoker.getInstance().poke();
+        return true;
+    }
+
+    @Override
+    public void updateState(Preference preference) {
+        final boolean isEnabled = SystemProperties.getBoolean(MSAA_PROPERTY, false /* default */);
+        mPreference.setChecked(isEnabled);
+    }
+
+    @Override
+    protected void onDeveloperOptionsSwitchEnabled() {
+        mPreference.setEnabled(true);
+    }
+
+    @Override
+    protected void onDeveloperOptionsSwitchDisabled() {
+        SystemProperties.set(MSAA_PROPERTY, Boolean.toString(false));
+        mPreference.setChecked(false);
+        mPreference.setEnabled(false);
+    }
+}
diff --git a/src/com/android/settings/development/FreeformWindowsPreferenceController.java b/src/com/android/settings/development/FreeformWindowsPreferenceController.java
new file mode 100644
index 0000000..8b847f6
--- /dev/null
+++ b/src/com/android/settings/development/FreeformWindowsPreferenceController.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.development;
+
+import android.content.Context;
+import android.os.Build;
+import android.provider.Settings;
+import android.support.annotation.VisibleForTesting;
+import android.support.v14.preference.SwitchPreference;
+import android.support.v7.preference.Preference;
+import android.support.v7.preference.PreferenceScreen;
+import android.text.TextUtils;
+
+import com.android.settings.core.PreferenceControllerMixin;
+import com.android.settingslib.development.DeveloperOptionsPreferenceController;
+
+public class FreeformWindowsPreferenceController extends
+        DeveloperOptionsPreferenceController implements Preference.OnPreferenceChangeListener,
+        PreferenceControllerMixin {
+
+    private static final String ENABLE_FREEFORM_SUPPORT_KEY = "enable_freeform_support";
+
+    @VisibleForTesting
+    static final int SETTING_VALUE_OFF = 0;
+    @VisibleForTesting
+    static final int SETTING_VALUE_ON = 1;
+    @VisibleForTesting
+    static final String USER_BUILD_TYPE = "user";
+
+    private SwitchPreference mPreference;
+
+    public FreeformWindowsPreferenceController(Context context) {
+        super(context);
+    }
+
+    @Override
+    public boolean isAvailable() {
+        return !TextUtils.equals(USER_BUILD_TYPE, getBuildType());
+    }
+
+    @Override
+    public String getPreferenceKey() {
+        return ENABLE_FREEFORM_SUPPORT_KEY;
+    }
+
+    @Override
+    public void displayPreference(PreferenceScreen screen) {
+        super.displayPreference(screen);
+
+        mPreference = (SwitchPreference) screen.findPreference(getPreferenceKey());
+    }
+
+    @Override
+    public boolean onPreferenceChange(Preference preference, Object newValue) {
+        final boolean isEnabled = (Boolean) newValue;
+        Settings.Global.putInt(mContext.getContentResolver(),
+                Settings.Global.DEVELOPMENT_ENABLE_FREEFORM_WINDOWS_SUPPORT,
+                isEnabled ? SETTING_VALUE_ON : SETTING_VALUE_OFF);
+        return true;
+    }
+
+    @Override
+    public void updateState(Preference preference) {
+        final int mode = Settings.Global.getInt(mContext.getContentResolver(),
+                Settings.Global.DEVELOPMENT_ENABLE_FREEFORM_WINDOWS_SUPPORT, SETTING_VALUE_OFF);
+        mPreference.setChecked(mode != SETTING_VALUE_OFF);
+    }
+
+    @Override
+    protected void onDeveloperOptionsSwitchEnabled() {
+        mPreference.setEnabled(true);
+    }
+
+    @Override
+    protected void onDeveloperOptionsSwitchDisabled() {
+        Settings.Global.putInt(mContext.getContentResolver(),
+                Settings.Global.DEVELOPMENT_ENABLE_FREEFORM_WINDOWS_SUPPORT, SETTING_VALUE_OFF);
+        mPreference.setEnabled(false);
+        mPreference.setChecked(false);
+    }
+
+    @VisibleForTesting
+    String getBuildType() {
+        return Build.TYPE;
+    }
+}
diff --git a/src/com/android/settings/development/GpuViewUpdatesPreferenceController.java b/src/com/android/settings/development/GpuViewUpdatesPreferenceController.java
new file mode 100644
index 0000000..cccb38b
--- /dev/null
+++ b/src/com/android/settings/development/GpuViewUpdatesPreferenceController.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.development;
+
+import android.content.Context;
+import android.os.SystemProperties;
+import android.support.v14.preference.SwitchPreference;
+import android.support.v7.preference.Preference;
+import android.support.v7.preference.PreferenceScreen;
+import android.view.ThreadedRenderer;
+
+import com.android.settings.core.PreferenceControllerMixin;
+import com.android.settingslib.development.DeveloperOptionsPreferenceController;
+import com.android.settingslib.development.SystemPropPoker;
+
+public class GpuViewUpdatesPreferenceController extends
+        DeveloperOptionsPreferenceController implements Preference.OnPreferenceChangeListener,
+        PreferenceControllerMixin {
+
+    private static final String SHOW_HW_SCREEN_UPDATES_KEY = "show_hw_screen_updates";
+
+    private SwitchPreference mPreference;
+
+    public GpuViewUpdatesPreferenceController(Context context) {
+        super(context);
+    }
+
+    @Override
+    public String getPreferenceKey() {
+        return SHOW_HW_SCREEN_UPDATES_KEY;
+    }
+
+    @Override
+    public void displayPreference(PreferenceScreen screen) {
+        super.displayPreference(screen);
+
+        mPreference = (SwitchPreference) screen.findPreference(getPreferenceKey());
+    }
+
+    @Override
+    public boolean onPreferenceChange(Preference preference, Object newValue) {
+        final boolean isEnabled = (Boolean) newValue;
+        SystemProperties.set(ThreadedRenderer.DEBUG_DIRTY_REGIONS_PROPERTY,
+                isEnabled ? "true" : null);
+        SystemPropPoker.getInstance().poke();
+        return true;
+    }
+
+    @Override
+    public void updateState(Preference preference) {
+        final boolean isEnabled = SystemProperties.getBoolean(
+                ThreadedRenderer.DEBUG_DIRTY_REGIONS_PROPERTY, false /* default */);
+        mPreference.setChecked(isEnabled);
+    }
+
+    @Override
+    protected void onDeveloperOptionsSwitchEnabled() {
+        mPreference.setEnabled(true);
+    }
+
+    @Override
+    protected void onDeveloperOptionsSwitchDisabled() {
+        SystemProperties.set(ThreadedRenderer.DEBUG_DIRTY_REGIONS_PROPERTY, null);
+        mPreference.setEnabled(false);
+        mPreference.setChecked(false);
+    }
+}
diff --git a/src/com/android/settings/development/HardwareLayersUpdatesPreferenceController.java b/src/com/android/settings/development/HardwareLayersUpdatesPreferenceController.java
new file mode 100644
index 0000000..967839e
--- /dev/null
+++ b/src/com/android/settings/development/HardwareLayersUpdatesPreferenceController.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.development;
+
+import android.content.Context;
+import android.os.SystemProperties;
+import android.support.v14.preference.SwitchPreference;
+import android.support.v7.preference.Preference;
+import android.support.v7.preference.PreferenceScreen;
+import android.view.ThreadedRenderer;
+
+import com.android.settings.core.PreferenceControllerMixin;
+import com.android.settingslib.development.DeveloperOptionsPreferenceController;
+import com.android.settingslib.development.SystemPropPoker;
+
+public class HardwareLayersUpdatesPreferenceController extends
+        DeveloperOptionsPreferenceController implements Preference.OnPreferenceChangeListener,
+        PreferenceControllerMixin {
+
+    private static final String SHOW_HW_LAYERS_UPDATES_KEY = "show_hw_layers_updates";
+
+    private SwitchPreference mPreference;
+
+    public HardwareLayersUpdatesPreferenceController(Context context) {
+        super(context);
+    }
+
+    @Override
+    public String getPreferenceKey() {
+        return SHOW_HW_LAYERS_UPDATES_KEY;
+    }
+
+    @Override
+    public void displayPreference(PreferenceScreen screen) {
+        super.displayPreference(screen);
+
+        mPreference = (SwitchPreference) screen.findPreference(getPreferenceKey());
+    }
+
+    @Override
+    public boolean onPreferenceChange(Preference preference, Object newValue) {
+        final boolean isEnabled = (Boolean) newValue;
+        SystemProperties.set(ThreadedRenderer.DEBUG_SHOW_LAYERS_UPDATES_PROPERTY,
+                isEnabled ? "true" : null);
+        SystemPropPoker.getInstance().poke();
+        return true;
+    }
+
+    @Override
+    public void updateState(Preference preference) {
+        final boolean isEnabled = SystemProperties.getBoolean(
+                ThreadedRenderer.DEBUG_SHOW_LAYERS_UPDATES_PROPERTY, false /* default */);
+        mPreference.setChecked(isEnabled);
+    }
+
+    @Override
+    protected void onDeveloperOptionsSwitchEnabled() {
+        mPreference.setEnabled(true);
+    }
+
+    @Override
+    protected void onDeveloperOptionsSwitchDisabled() {
+        SystemProperties.set(ThreadedRenderer.DEBUG_SHOW_LAYERS_UPDATES_PROPERTY, null);
+        mPreference.setEnabled(false);
+        mPreference.setChecked(false);
+    }
+}
diff --git a/src/com/android/settings/development/HardwareOverlaysPreferenceController.java b/src/com/android/settings/development/HardwareOverlaysPreferenceController.java
new file mode 100644
index 0000000..c2f7c54
--- /dev/null
+++ b/src/com/android/settings/development/HardwareOverlaysPreferenceController.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.development;
+
+import android.content.Context;
+import android.os.IBinder;
+import android.os.Parcel;
+import android.os.RemoteException;
+import android.os.ServiceManager;
+import android.support.annotation.VisibleForTesting;
+import android.support.v14.preference.SwitchPreference;
+import android.support.v7.preference.Preference;
+import android.support.v7.preference.PreferenceScreen;
+
+import com.android.settings.core.PreferenceControllerMixin;
+import com.android.settingslib.development.DeveloperOptionsPreferenceController;
+
+public class HardwareOverlaysPreferenceController extends DeveloperOptionsPreferenceController
+        implements Preference.OnPreferenceChangeListener, PreferenceControllerMixin {
+
+    private static final String DISABLE_OVERLAYS_KEY = "disable_overlays";
+
+    private static final int SETTING_VALUE_ON = 1;
+    private static final int SETTING_VALUE_OFF = 0;
+    private static final String SURFACE_FLINGER_SERVICE_KEY = "SurfaceFlinger";
+
+    @VisibleForTesting
+    static final int SURFACE_FLINGER_READ_CODE = 1010;
+
+    private static final int SURFACE_FLINGER_DISABLE_OVERLAYS_CODE = 1008;
+    private static final String SURFACE_COMPOSER_INTERFACE_KEY = "android.ui.ISurfaceComposer";
+
+    private final IBinder mSurfaceFlinger;
+    private SwitchPreference mPreference;
+
+    public HardwareOverlaysPreferenceController(Context context) {
+        super(context);
+        mSurfaceFlinger = ServiceManager.getService(SURFACE_FLINGER_SERVICE_KEY);
+    }
+
+    @Override
+    public String getPreferenceKey() {
+        return DISABLE_OVERLAYS_KEY;
+    }
+
+    @Override
+    public void displayPreference(PreferenceScreen screen) {
+        super.displayPreference(screen);
+
+        mPreference = (SwitchPreference) screen.findPreference(getPreferenceKey());
+    }
+
+    @Override
+    public boolean onPreferenceChange(Preference preference, Object newValue) {
+        final boolean isEnabled = (Boolean) newValue;
+        writeHardwareOverlaysSetting(isEnabled);
+        return true;
+    }
+
+    @Override
+    public void updateState(Preference preference) {
+        updateHardwareOverlaysSetting();
+    }
+
+    @Override
+    protected void onDeveloperOptionsSwitchEnabled() {
+        mPreference.setEnabled(true);
+    }
+
+    @Override
+    protected void onDeveloperOptionsSwitchDisabled() {
+        if (mPreference.isChecked()) {
+            // Writing false to the preference when the setting is already off will have a
+            // side effect of turning on the preference that we wish to avoid
+            writeHardwareOverlaysSetting(false);
+            mPreference.setChecked(false);
+        }
+        mPreference.setEnabled(false);
+    }
+
+    @VisibleForTesting
+    void updateHardwareOverlaysSetting() {
+        if (mSurfaceFlinger == null) {
+            return;
+        }
+        // magic communication with surface flinger.
+        try {
+            final Parcel data = Parcel.obtain();
+            final Parcel reply = Parcel.obtain();
+            data.writeInterfaceToken(SURFACE_COMPOSER_INTERFACE_KEY);
+            mSurfaceFlinger.transact(SURFACE_FLINGER_READ_CODE, data, reply, 0 /* flags */);
+            @SuppressWarnings("unused") final int showCpu = reply.readInt();
+            @SuppressWarnings("unused") final int enableGL = reply.readInt();
+            @SuppressWarnings("unused") final int showUpdates = reply.readInt();
+            @SuppressWarnings("unused") final int showBackground = reply.readInt();
+            final int disableOverlays = reply.readInt();
+            mPreference.setChecked(disableOverlays != SETTING_VALUE_OFF);
+            reply.recycle();
+            data.recycle();
+        } catch (RemoteException ex) {
+            // intentional no-op
+        }
+    }
+
+    @VisibleForTesting
+    void writeHardwareOverlaysSetting(boolean isEnabled) {
+        if (mSurfaceFlinger == null) {
+            return;
+        }
+        try {
+            final Parcel data = Parcel.obtain();
+            data.writeInterfaceToken(SURFACE_COMPOSER_INTERFACE_KEY);
+            final int disableOverlays = isEnabled ? SETTING_VALUE_ON : SETTING_VALUE_OFF;
+            data.writeInt(disableOverlays);
+            mSurfaceFlinger.transact(SURFACE_FLINGER_DISABLE_OVERLAYS_CODE, data,
+                    null /* reply */, 0 /* flags */);
+            data.recycle();
+        } catch (RemoteException ex) {
+            // intentional no-op
+        }
+        updateHardwareOverlaysSetting();
+    }
+}
diff --git a/src/com/android/settings/development/HdcpCheckingPreferenceController.java b/src/com/android/settings/development/HdcpCheckingPreferenceController.java
new file mode 100644
index 0000000..60264ef
--- /dev/null
+++ b/src/com/android/settings/development/HdcpCheckingPreferenceController.java
@@ -0,0 +1,112 @@
+/*
+ * Copyright (C) 2017 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.development;
+
+import android.content.Context;
+import android.os.Build;
+import android.os.SystemProperties;
+import android.support.annotation.VisibleForTesting;
+import android.support.v7.preference.ListPreference;
+import android.support.v7.preference.Preference;
+import android.support.v7.preference.PreferenceScreen;
+import android.text.TextUtils;
+
+import com.android.settings.R;
+import com.android.settings.core.PreferenceControllerMixin;
+import com.android.settingslib.development.DeveloperOptionsPreferenceController;
+import com.android.settingslib.development.SystemPropPoker;
+
+public class HdcpCheckingPreferenceController extends
+        DeveloperOptionsPreferenceController implements Preference.OnPreferenceChangeListener,
+        PreferenceControllerMixin {
+
+    private static final String HDCP_CHECKING_KEY = "hdcp_checking";
+
+    @VisibleForTesting
+    static final String HDCP_CHECKING_PROPERTY = "persist.sys.hdcp_checking";
+    @VisibleForTesting
+    static final String USER_BUILD_TYPE = "user";
+
+    private final String[] mListValues;
+    private final String[] mListSummaries;
+    private ListPreference mPreference;
+
+    public HdcpCheckingPreferenceController(Context context) {
+        super(context);
+
+        mListValues = mContext.getResources().getStringArray(R.array.hdcp_checking_values);
+        mListSummaries = mContext.getResources().getStringArray(R.array.hdcp_checking_summaries);
+    }
+
+    @Override
+    public boolean isAvailable() {
+        return !TextUtils.equals(USER_BUILD_TYPE, getBuildType());
+    }
+
+    @Override
+    public String getPreferenceKey() {
+        return HDCP_CHECKING_KEY;
+    }
+
+    @Override
+    public void displayPreference(PreferenceScreen screen) {
+        super.displayPreference(screen);
+
+        mPreference = (ListPreference) screen.findPreference(getPreferenceKey());
+    }
+
+    @Override
+    public boolean onPreferenceChange(Preference preference, Object newValue) {
+        SystemProperties.set(HDCP_CHECKING_PROPERTY, newValue.toString());
+        updateHdcpValues();
+        SystemPropPoker.getInstance().poke();
+        return true;
+    }
+
+    @Override
+    public void updateState(Preference preference) {
+        updateHdcpValues();
+    }
+
+    @Override
+    protected void onDeveloperOptionsSwitchEnabled() {
+        mPreference.setEnabled(true);
+    }
+
+    @Override
+    protected void onDeveloperOptionsSwitchDisabled() {
+        mPreference.setEnabled(false);
+    }
+
+    private void updateHdcpValues() {
+        final String currentValue = SystemProperties.get(HDCP_CHECKING_PROPERTY);
+        int index = 1; // Defaults to drm-only. Needs to match with R.array.hdcp_checking_values
+        for (int i = 0; i < mListValues.length; i++) {
+            if (TextUtils.equals(currentValue, mListValues[i])) {
+                index = i;
+                break;
+            }
+        }
+        mPreference.setValue(mListValues[index]);
+        mPreference.setSummary(mListSummaries[index]);
+    }
+
+    @VisibleForTesting
+    public String getBuildType() {
+        return Build.TYPE;
+    }
+}
diff --git a/src/com/android/settings/development/KeepActivitiesPreferenceController.java b/src/com/android/settings/development/KeepActivitiesPreferenceController.java
new file mode 100644
index 0000000..aab4d1f
--- /dev/null
+++ b/src/com/android/settings/development/KeepActivitiesPreferenceController.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.development;
+
+import android.app.ActivityManager;
+import android.app.IActivityManager;
+import android.content.Context;
+import android.os.RemoteException;
+import android.provider.Settings;
+import android.support.annotation.VisibleForTesting;
+import android.support.v14.preference.SwitchPreference;
+import android.support.v7.preference.Preference;
+import android.support.v7.preference.PreferenceScreen;
+
+import com.android.settings.core.PreferenceControllerMixin;
+import com.android.settingslib.development.DeveloperOptionsPreferenceController;
+
+public class KeepActivitiesPreferenceController extends DeveloperOptionsPreferenceController
+        implements Preference.OnPreferenceChangeListener, PreferenceControllerMixin {
+
+    private static final String IMMEDIATELY_DESTROY_ACTIVITIES_KEY =
+            "immediately_destroy_activities";
+
+    @VisibleForTesting
+    static final int SETTING_VALUE_OFF = 0;
+
+    private IActivityManager mActivityManager;
+    private SwitchPreference mPreference;
+
+    public KeepActivitiesPreferenceController(Context context) {
+        super(context);
+    }
+
+    @Override
+    public String getPreferenceKey() {
+        return IMMEDIATELY_DESTROY_ACTIVITIES_KEY;
+    }
+
+    @Override
+    public void displayPreference(PreferenceScreen screen) {
+        super.displayPreference(screen);
+
+        mPreference = (SwitchPreference) screen.findPreference(getPreferenceKey());
+        mActivityManager = getActivityManager();
+    }
+
+    @Override
+    public boolean onPreferenceChange(Preference preference, Object newValue) {
+        final boolean isEnabled = (Boolean) newValue;
+        writeImmediatelyDestroyActivitiesOptions(isEnabled);
+        return true;
+    }
+
+    @Override
+    public void updateState(Preference preference) {
+        final int mode = Settings.Global.getInt(mContext.getContentResolver(),
+                Settings.Global.ALWAYS_FINISH_ACTIVITIES, SETTING_VALUE_OFF);
+        mPreference.setChecked(mode != SETTING_VALUE_OFF);
+    }
+
+    @Override
+    protected void onDeveloperOptionsSwitchEnabled() {
+        mPreference.setEnabled(true);
+    }
+
+    @Override
+    protected void onDeveloperOptionsSwitchDisabled() {
+        writeImmediatelyDestroyActivitiesOptions(false);
+        mPreference.setEnabled(false);
+        mPreference.setChecked(false);
+    }
+
+    private void writeImmediatelyDestroyActivitiesOptions(boolean isEnabled) {
+        try {
+            mActivityManager.setAlwaysFinish(isEnabled);
+        } catch (RemoteException ex) {
+            // intentional no-op
+        }
+    }
+
+    @VisibleForTesting
+    IActivityManager getActivityManager() {
+        return ActivityManager.getService();
+    }
+}
diff --git a/src/com/android/settings/development/LocalBackupPasswordPreferenceController.java b/src/com/android/settings/development/LocalBackupPasswordPreferenceController.java
new file mode 100644
index 0000000..51690ff
--- /dev/null
+++ b/src/com/android/settings/development/LocalBackupPasswordPreferenceController.java
@@ -0,0 +1,78 @@
+/*
+ * Copyright (C) 2017 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF 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.app.backup.IBackupManager;
+import android.content.Context;
+import android.os.RemoteException;
+import android.os.ServiceManager;
+import android.os.UserManager;
+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.PreferenceControllerMixin;
+import com.android.settingslib.development.DeveloperOptionsPreferenceController;
+
+public class LocalBackupPasswordPreferenceController extends
+        DeveloperOptionsPreferenceController implements PreferenceControllerMixin {
+
+    private static final String LOCAL_BACKUP_PASSWORD = "local_backup_password";
+
+    private final UserManager mUserManager;
+    private final IBackupManager mBackupManager;
+
+    public LocalBackupPasswordPreferenceController(Context context) {
+        super(context);
+
+        mUserManager = (UserManager) context.getSystemService(Context.USER_SERVICE);
+        mBackupManager = IBackupManager.Stub.asInterface(
+                ServiceManager.getService(Context.BACKUP_SERVICE));
+    }
+
+    @Override
+    public String getPreferenceKey() {
+        return LOCAL_BACKUP_PASSWORD;
+    }
+
+    @Override
+    public void updateState(Preference preference) {
+        updatePasswordSummary(preference);
+    }
+
+    private void updatePasswordSummary(Preference preference) {
+        preference.setEnabled(isAdminUser() && mBackupManager != null);
+        if (mBackupManager == null) {
+            return;
+        }
+        try {
+            if (mBackupManager.hasBackupPassword()) {
+                preference.setSummary(R.string.local_backup_password_summary_change);
+            } else {
+                preference.setSummary(R.string.local_backup_password_summary_none);
+            }
+        } catch (RemoteException e) {
+            // Not much we can do here
+        }
+    }
+
+    @VisibleForTesting
+    boolean isAdminUser() {
+        return mUserManager.isAdminUser();
+    }
+}
diff --git a/src/com/android/settings/development/LocalTerminalPreferenceController.java b/src/com/android/settings/development/LocalTerminalPreferenceController.java
new file mode 100644
index 0000000..17a5785
--- /dev/null
+++ b/src/com/android/settings/development/LocalTerminalPreferenceController.java
@@ -0,0 +1,103 @@
+package com.android.settings.development;
+
+import android.content.Context;
+import android.content.pm.PackageManager;
+import android.os.UserManager;
+import android.support.annotation.VisibleForTesting;
+import android.support.v14.preference.SwitchPreference;
+import android.support.v7.preference.Preference;
+import android.support.v7.preference.PreferenceScreen;
+
+import com.android.settings.core.PreferenceControllerMixin;
+import com.android.settingslib.development.DeveloperOptionsPreferenceController;
+import com.android.settingslib.wrapper.PackageManagerWrapper;
+
+public class LocalTerminalPreferenceController extends
+        DeveloperOptionsPreferenceController implements Preference.OnPreferenceChangeListener,
+        PreferenceControllerMixin {
+
+    private static final String ENABLE_TERMINAL_KEY = "enable_terminal";
+
+    @VisibleForTesting
+    static final String TERMINAL_APP_PACKAGE = "com.android.terminal";
+
+    private PackageManagerWrapper mPackageManager;
+    private SwitchPreference mPreference;
+    private UserManager mUserManager;
+
+    public LocalTerminalPreferenceController(Context context) {
+        super(context);
+
+        mUserManager = (UserManager) context.getSystemService(Context.USER_SERVICE);
+    }
+
+    @Override
+    public boolean isAvailable() {
+        return isPackageInstalled(TERMINAL_APP_PACKAGE);
+    }
+
+    @Override
+    public String getPreferenceKey() {
+        return ENABLE_TERMINAL_KEY;
+    }
+
+    @Override
+    public void displayPreference(PreferenceScreen screen) {
+        super.displayPreference(screen);
+
+        mPreference = (SwitchPreference) screen.findPreference(getPreferenceKey());
+        mPackageManager = getPackageManagerWrapper();
+
+        if (isAvailable() && !isEnabled()) {
+            mPreference.setEnabled(false);
+        }
+    }
+
+    @Override
+    public boolean onPreferenceChange(Preference preference, Object newValue) {
+        final boolean terminalEnabled = (Boolean) newValue;
+        mPackageManager.setApplicationEnabledSetting(TERMINAL_APP_PACKAGE,
+                terminalEnabled ? PackageManager.COMPONENT_ENABLED_STATE_ENABLED
+                        : PackageManager.COMPONENT_ENABLED_STATE_DEFAULT, 0 /* flags */);
+        return true;
+    }
+
+    @Override
+    public void updateState(Preference preference) {
+        final boolean isTerminalEnabled = mPackageManager.getApplicationEnabledSetting(
+                TERMINAL_APP_PACKAGE) == PackageManager.COMPONENT_ENABLED_STATE_ENABLED;
+        mPreference.setChecked(isTerminalEnabled);
+    }
+
+    @Override
+    protected void onDeveloperOptionsSwitchEnabled() {
+        if (isEnabled()) {
+            mPreference.setEnabled(true);
+        }
+    }
+
+    @Override
+    protected void onDeveloperOptionsSwitchDisabled() {
+        mPackageManager.setApplicationEnabledSetting(TERMINAL_APP_PACKAGE,
+                PackageManager.COMPONENT_ENABLED_STATE_DEFAULT, 0 /* flags */);
+        mPreference.setEnabled(false);
+        mPreference.setChecked(false);
+    }
+
+    @VisibleForTesting
+    PackageManagerWrapper getPackageManagerWrapper() {
+        return new PackageManagerWrapper(mContext.getPackageManager());
+    }
+
+    private boolean isPackageInstalled(String packageName) {
+        try {
+            return mContext.getPackageManager().getPackageInfo(packageName, 0 /* flags */) != null;
+        } catch (PackageManager.NameNotFoundException e) {
+            return false;
+        }
+    }
+
+    private boolean isEnabled() {
+        return mUserManager.isAdminUser();
+    }
+}
diff --git a/src/com/android/settings/development/LogPersistDialogHost.java b/src/com/android/settings/development/LogPersistDialogHost.java
new file mode 100644
index 0000000..0187e03
--- /dev/null
+++ b/src/com/android/settings/development/LogPersistDialogHost.java
@@ -0,0 +1,33 @@
+/*
+ * Copyright (C) 2017 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF 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;
+
+/**
+ * Interface for LogPersistDialogFragment callbacks.
+ */
+public interface LogPersistDialogHost {
+
+    /**
+     * Called when the user presses yes on the warning dialog.
+     */
+    void onDisableLogPersistDialogConfirmed();
+
+    /**
+     * Called when the user presses no on the warning dialog.
+     */
+    void onDisableLogPersistDialogRejected();
+}
diff --git a/src/com/android/settings/development/LogPersistPreferenceController.java b/src/com/android/settings/development/LogPersistPreferenceController.java
new file mode 100644
index 0000000..a958379
--- /dev/null
+++ b/src/com/android/settings/development/LogPersistPreferenceController.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.development;
+
+import android.content.Context;
+import android.support.annotation.Nullable;
+import android.support.v7.preference.ListPreference;
+import android.support.v7.preference.Preference;
+import android.support.v7.preference.PreferenceScreen;
+
+import com.android.settings.core.PreferenceControllerMixin;
+import com.android.settingslib.core.lifecycle.Lifecycle;
+import com.android.settingslib.development.AbstractLogpersistPreferenceController;
+
+public class LogPersistPreferenceController extends
+        AbstractLogpersistPreferenceController implements PreferenceControllerMixin {
+
+    private final DevelopmentSettingsDashboardFragment mFragment;
+    private ListPreference mPreference;
+
+
+    public LogPersistPreferenceController(Context context,
+            DevelopmentSettingsDashboardFragment fragment, Lifecycle lifecycle) {
+        super(context, lifecycle);
+
+        mFragment = fragment;
+    }
+
+    @Override
+    public void showConfirmationDialog(@Nullable Preference preference) {
+        DisableLogPersistWarningDialog.show(mFragment);
+    }
+
+    @Override
+    public void dismissConfirmationDialog() {
+        // intentional no-op
+    }
+
+    @Override
+    public boolean isConfirmationDialogShowing() {
+        return false;
+    }
+
+    @Override
+    public void displayPreference(PreferenceScreen screen) {
+        super.displayPreference(screen);
+
+        mPreference = (ListPreference) screen.findPreference(getPreferenceKey());
+    }
+
+    @Override
+    public void updateState(Preference preference) {
+        updateLogpersistValues();
+    }
+
+    @Override
+    protected void onDeveloperOptionsSwitchEnabled() {
+        mPreference.setEnabled(true);
+    }
+
+    @Override
+    protected void onDeveloperOptionsSwitchDisabled() {
+        writeLogpersistOption(null /* new value */, true);
+        mPreference.setEnabled(false);
+    }
+
+    public void onDisableLogPersistDialogConfirmed() {
+        setLogpersistOff(true);
+        updateLogpersistValues();
+    }
+
+    public void onDisableLogPersistDialogRejected() {
+        updateLogpersistValues();
+    }
+}
diff --git a/src/com/android/settings/development/LogdSizePreferenceController.java b/src/com/android/settings/development/LogdSizePreferenceController.java
new file mode 100644
index 0000000..6522800
--- /dev/null
+++ b/src/com/android/settings/development/LogdSizePreferenceController.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.development;
+
+import android.content.Context;
+import android.support.v7.preference.ListPreference;
+import android.support.v7.preference.Preference;
+import android.support.v7.preference.PreferenceScreen;
+
+import com.android.settings.core.PreferenceControllerMixin;
+import com.android.settingslib.development.AbstractLogdSizePreferenceController;
+
+public class LogdSizePreferenceController extends AbstractLogdSizePreferenceController implements
+        Preference.OnPreferenceChangeListener, PreferenceControllerMixin {
+
+    private ListPreference mPreference;
+
+    public LogdSizePreferenceController(Context context) {
+        super(context);
+    }
+
+    @Override
+    public void displayPreference(PreferenceScreen screen) {
+        super.displayPreference(screen);
+
+        mPreference = (ListPreference) screen.findPreference(getPreferenceKey());
+    }
+
+    @Override
+    public void updateState(Preference preference) {
+        updateLogdSizeValues();
+    }
+
+    @Override
+    protected void onDeveloperOptionsSwitchEnabled() {
+        mPreference.setEnabled(true);
+    }
+
+    @Override
+    protected void onDeveloperOptionsSwitchDisabled() {
+        writeLogdSizeOption(null /* new value */);
+        mPreference.setEnabled(false);
+    }
+}
diff --git a/src/com/android/settings/development/MemoryUsagePreferenceController.java b/src/com/android/settings/development/MemoryUsagePreferenceController.java
new file mode 100644
index 0000000..9471b90
--- /dev/null
+++ b/src/com/android/settings/development/MemoryUsagePreferenceController.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.development;
+
+import android.content.Context;
+import android.support.annotation.VisibleForTesting;
+import android.support.v7.preference.Preference;
+import android.support.v7.preference.PreferenceScreen;
+import android.text.format.Formatter;
+
+import com.android.settings.R;
+import com.android.settings.applications.ProcStatsData;
+import com.android.settings.applications.ProcessStatsBase;
+import com.android.settings.core.PreferenceControllerMixin;
+import com.android.settingslib.development.DeveloperOptionsPreferenceController;
+import com.android.settingslib.utils.ThreadUtils;
+
+public class MemoryUsagePreferenceController extends DeveloperOptionsPreferenceController implements
+        PreferenceControllerMixin {
+
+    private static final String MEMORY_USAGE_KEY = "memory";
+
+    private Preference mPreference;
+    private ProcStatsData mProcStatsData;
+
+    public MemoryUsagePreferenceController(Context context) {
+        super(context);
+    }
+
+    @Override
+    public String getPreferenceKey() {
+        return MEMORY_USAGE_KEY;
+    }
+
+    @Override
+    public void displayPreference(PreferenceScreen screen) {
+        super.displayPreference(screen);
+
+        mPreference = screen.findPreference(getPreferenceKey());
+        mProcStatsData = getProcStatsData();
+        setDuration();
+    }
+
+    @Override
+    public void updateState(Preference preference) {
+        // This is posted on the background thread to speed up fragment launch time for dev options
+        // mProcStasData.refreshStats(true) takes ~20ms to run.
+        ThreadUtils.postOnBackgroundThread(() -> {
+            mProcStatsData.refreshStats(true);
+            final ProcStatsData.MemInfo memInfo = mProcStatsData.getMemInfo();
+            final String usedResult = Formatter.formatShortFileSize(mContext,
+                    (long) memInfo.realUsedRam);
+            final String totalResult = Formatter.formatShortFileSize(mContext,
+                    (long) memInfo.realTotalRam);
+            ThreadUtils.postOnMainThread(
+                    () -> mPreference.setSummary(mContext.getString(R.string.memory_summary,
+                            usedResult, totalResult)));
+        });
+    }
+
+    @VisibleForTesting
+    void setDuration() {
+        mProcStatsData.setDuration(ProcessStatsBase.sDurations[0] /* 3 hours */);
+    }
+
+    @VisibleForTesting
+    ProcStatsData getProcStatsData() {
+        return new ProcStatsData(mContext, false);
+    }
+}
diff --git a/src/com/android/settings/development/MobileDataAlwaysOnPreferenceController.java b/src/com/android/settings/development/MobileDataAlwaysOnPreferenceController.java
new file mode 100644
index 0000000..eafcb5c
--- /dev/null
+++ b/src/com/android/settings/development/MobileDataAlwaysOnPreferenceController.java
@@ -0,0 +1,86 @@
+/*
+ * Copyright (C) 2017 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.development;
+
+import android.content.Context;
+import android.provider.Settings;
+import android.support.annotation.VisibleForTesting;
+import android.support.v14.preference.SwitchPreference;
+import android.support.v7.preference.Preference;
+import android.support.v7.preference.PreferenceScreen;
+
+import com.android.settings.core.PreferenceControllerMixin;
+import com.android.settingslib.development.DeveloperOptionsPreferenceController;
+
+public class MobileDataAlwaysOnPreferenceController extends
+        DeveloperOptionsPreferenceController implements Preference.OnPreferenceChangeListener,
+        PreferenceControllerMixin {
+
+    private static final String MOBILE_DATA_ALWAYS_ON = "mobile_data_always_on";
+
+    @VisibleForTesting
+    static final int SETTING_VALUE_ON = 1;
+    @VisibleForTesting
+    static final int SETTING_VALUE_OFF = 0;
+
+    private SwitchPreference mPreference;
+
+    public MobileDataAlwaysOnPreferenceController(Context context) {
+        super(context);
+    }
+
+    @Override
+    public String getPreferenceKey() {
+        return MOBILE_DATA_ALWAYS_ON;
+    }
+
+    @Override
+    public void displayPreference(PreferenceScreen screen) {
+        super.displayPreference(screen);
+
+        mPreference = (SwitchPreference) screen.findPreference(getPreferenceKey());
+    }
+
+    @Override
+    public boolean onPreferenceChange(Preference preference, Object newValue) {
+        final boolean isEnabled = (Boolean) newValue;
+        Settings.Global.putInt(mContext.getContentResolver(), Settings.Global.MOBILE_DATA_ALWAYS_ON,
+                isEnabled ? SETTING_VALUE_ON : SETTING_VALUE_OFF);
+        return true;
+    }
+
+    @Override
+    public void updateState(Preference preference) {
+        final int mobileDataAlwaysOnMode = Settings.Global.getInt(mContext.getContentResolver(),
+                Settings.Global.MOBILE_DATA_ALWAYS_ON, SETTING_VALUE_ON);
+
+        mPreference.setChecked(mobileDataAlwaysOnMode != SETTING_VALUE_OFF);
+    }
+
+    @Override
+    protected void onDeveloperOptionsSwitchEnabled() {
+        mPreference.setEnabled(true);
+    }
+
+    @Override
+    protected void onDeveloperOptionsSwitchDisabled() {
+        Settings.Global.putInt(mContext.getContentResolver(), Settings.Global.MOBILE_DATA_ALWAYS_ON,
+                SETTING_VALUE_OFF);
+        mPreference.setEnabled(false);
+        mPreference.setChecked(false);
+    }
+}
diff --git a/src/com/android/settings/development/MockLocationAppPreferenceController.java b/src/com/android/settings/development/MockLocationAppPreferenceController.java
new file mode 100644
index 0000000..8305a9d
--- /dev/null
+++ b/src/com/android/settings/development/MockLocationAppPreferenceController.java
@@ -0,0 +1,187 @@
+/*
+ * Copyright (C) 2017 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF 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 static com.android.settings.development.DevelopmentOptionsActivityRequestCodes
+        .REQUEST_MOCK_LOCATION_APP;
+
+import android.Manifest;
+import android.app.Activity;
+import android.app.AppOpsManager;
+import android.content.Context;
+import android.content.Intent;
+import android.content.pm.ApplicationInfo;
+import android.content.pm.PackageManager;
+import android.support.v7.preference.Preference;
+import android.support.v7.preference.PreferenceScreen;
+import android.text.TextUtils;
+
+import com.android.settings.R;
+import com.android.settings.core.PreferenceControllerMixin;
+import com.android.settingslib.development.DeveloperOptionsPreferenceController;
+import com.android.settingslib.wrapper.PackageManagerWrapper;
+
+import java.util.List;
+
+public class MockLocationAppPreferenceController extends
+        DeveloperOptionsPreferenceController implements PreferenceControllerMixin,
+        OnActivityResultListener {
+
+    private static final String MOCK_LOCATION_APP_KEY = "mock_location_app";
+    private static final int[] MOCK_LOCATION_APP_OPS = new int[]{AppOpsManager.OP_MOCK_LOCATION};
+
+    private final DevelopmentSettingsDashboardFragment mFragment;
+    private final AppOpsManager mAppsOpsManager;
+    private final PackageManagerWrapper mPackageManager;
+    private Preference mPreference;
+
+    public MockLocationAppPreferenceController(Context context,
+            DevelopmentSettingsDashboardFragment fragment) {
+        super(context);
+
+        mFragment = fragment;
+        mAppsOpsManager = (AppOpsManager) context.getSystemService(Context.APP_OPS_SERVICE);
+        mPackageManager = new PackageManagerWrapper(context.getPackageManager());
+    }
+
+    @Override
+    public String getPreferenceKey() {
+        return MOCK_LOCATION_APP_KEY;
+    }
+
+    @Override
+    public void displayPreference(PreferenceScreen screen) {
+        super.displayPreference(screen);
+
+        mPreference = screen.findPreference(getPreferenceKey());
+    }
+
+    @Override
+    public boolean handlePreferenceTreeClick(Preference preference) {
+        if (!TextUtils.equals(preference.getKey(), getPreferenceKey())) {
+            return false;
+        }
+        final Intent intent = new Intent(mContext, AppPicker.class);
+        intent.putExtra(AppPicker.EXTRA_REQUESTIING_PERMISSION,
+                Manifest.permission.ACCESS_MOCK_LOCATION);
+        mFragment.startActivityForResult(intent, REQUEST_MOCK_LOCATION_APP);
+        return true;
+    }
+
+    @Override
+    public void updateState(Preference preference) {
+        updateMockLocation();
+    }
+
+    @Override
+    public boolean onActivityResult(int requestCode, int resultCode, Intent data) {
+        if (requestCode != REQUEST_MOCK_LOCATION_APP || resultCode != Activity.RESULT_OK) {
+            return false;
+        }
+        writeMockLocation(data.getAction());
+        updateMockLocation();
+        return true;
+    }
+
+    @Override
+    protected void onDeveloperOptionsSwitchEnabled() {
+        mPreference.setEnabled(true);
+    }
+
+    @Override
+    protected void onDeveloperOptionsSwitchDisabled() {
+        mPreference.setEnabled(false);
+    }
+
+    private void updateMockLocation() {
+        final String mockLocationApp = getCurrentMockLocationApp();
+
+        if (!TextUtils.isEmpty(mockLocationApp)) {
+            mPreference.setSummary(
+                    mContext.getResources().getString(R.string.mock_location_app_set,
+                            getAppLabel(mockLocationApp)));
+        } else {
+            mPreference.setSummary(
+                    mContext.getResources().getString(R.string.mock_location_app_not_set));
+        }
+    }
+
+    private void writeMockLocation(String mockLocationAppName) {
+        removeAllMockLocations();
+        // Enable the app op of the new mock location app if such.
+        if (!TextUtils.isEmpty(mockLocationAppName)) {
+            try {
+                final ApplicationInfo ai = mPackageManager.getApplicationInfo(
+                        mockLocationAppName, PackageManager.MATCH_DISABLED_COMPONENTS);
+                mAppsOpsManager.setMode(AppOpsManager.OP_MOCK_LOCATION, ai.uid,
+                        mockLocationAppName, AppOpsManager.MODE_ALLOWED);
+            } catch (PackageManager.NameNotFoundException e) {
+                /* ignore */
+            }
+        }
+    }
+
+    private String getAppLabel(String mockLocationApp) {
+        try {
+            final ApplicationInfo ai = mPackageManager.getApplicationInfo(
+                    mockLocationApp, PackageManager.MATCH_DISABLED_COMPONENTS);
+            final CharSequence appLabel = mPackageManager.getApplicationLabel(ai);
+            return appLabel != null ? appLabel.toString() : mockLocationApp;
+        } catch (PackageManager.NameNotFoundException e) {
+            return mockLocationApp;
+        }
+    }
+
+    private void removeAllMockLocations() {
+        // Disable the app op of the previous mock location app if such.
+        final List<AppOpsManager.PackageOps> packageOps = mAppsOpsManager.getPackagesForOps(
+                MOCK_LOCATION_APP_OPS);
+        if (packageOps == null) {
+            return;
+        }
+        // Should be one but in case we are in a bad state due to use of command line tools.
+        for (AppOpsManager.PackageOps packageOp : packageOps) {
+            if (packageOp.getOps().get(0).getMode() != AppOpsManager.MODE_ERRORED) {
+                removeMockLocationForApp(packageOp.getPackageName());
+            }
+        }
+    }
+
+    private void removeMockLocationForApp(String appName) {
+        try {
+            final ApplicationInfo ai = mPackageManager.getApplicationInfo(
+                    appName, PackageManager.MATCH_DISABLED_COMPONENTS);
+            mAppsOpsManager.setMode(AppOpsManager.OP_MOCK_LOCATION, ai.uid,
+                    appName, AppOpsManager.MODE_ERRORED);
+        } catch (PackageManager.NameNotFoundException e) {
+            /* ignore */
+        }
+    }
+
+    private String getCurrentMockLocationApp() {
+        final List<AppOpsManager.PackageOps> packageOps = mAppsOpsManager.getPackagesForOps(
+                MOCK_LOCATION_APP_OPS);
+        if (packageOps != null) {
+            for (AppOpsManager.PackageOps packageOp : packageOps) {
+                if (packageOp.getOps().get(0).getMode() == AppOpsManager.MODE_ALLOWED) {
+                    return packageOps.get(0).getPackageName();
+                }
+            }
+        }
+        return null;
+    }
+}
diff --git a/src/com/android/settings/development/NotificationChannelWarningsPreferenceController.java b/src/com/android/settings/development/NotificationChannelWarningsPreferenceController.java
new file mode 100644
index 0000000..15a1532
--- /dev/null
+++ b/src/com/android/settings/development/NotificationChannelWarningsPreferenceController.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.development;
+
+import android.content.Context;
+import android.os.Build;
+import android.provider.Settings;
+import android.support.annotation.VisibleForTesting;
+import android.support.v14.preference.SwitchPreference;
+import android.support.v7.preference.Preference;
+import android.support.v7.preference.PreferenceScreen;
+
+import com.android.settings.core.PreferenceControllerMixin;
+import com.android.settingslib.development.DeveloperOptionsPreferenceController;
+
+public class NotificationChannelWarningsPreferenceController extends
+        DeveloperOptionsPreferenceController implements Preference.OnPreferenceChangeListener,
+        PreferenceControllerMixin {
+
+    private static final String SHOW_NOTIFICATION_CHANNEL_WARNINGS_KEY =
+            "show_notification_channel_warnings";
+
+    private SwitchPreference mPreference;
+
+    @VisibleForTesting
+    final static int SETTING_VALUE_ON = 1;
+    @VisibleForTesting
+    final static int SETTING_VALUE_OFF = 0;
+    @VisibleForTesting
+    final static int DEBUGGING_ENABLED = 1;
+    @VisibleForTesting
+    final static int DEBUGGING_DISABLED = 0;
+
+    public NotificationChannelWarningsPreferenceController(Context context) {
+        super(context);
+    }
+
+
+    @Override
+    public String getPreferenceKey() {
+        return SHOW_NOTIFICATION_CHANNEL_WARNINGS_KEY;
+    }
+
+    @Override
+    public void displayPreference(PreferenceScreen screen) {
+        super.displayPreference(screen);
+
+        mPreference = (SwitchPreference) screen.findPreference(getPreferenceKey());
+    }
+
+    @Override
+    public boolean onPreferenceChange(Preference preference, Object newValue) {
+        final boolean isEnabled = (Boolean) newValue;
+        Settings.Global.putInt(mContext.getContentResolver(),
+                Settings.Global.SHOW_NOTIFICATION_CHANNEL_WARNINGS,
+                isEnabled ? SETTING_VALUE_ON : SETTING_VALUE_OFF);
+        return true;
+    }
+
+    @Override
+    public void updateState(Preference preference) {
+        final int defaultWarningEnabled = isDebuggable() ? DEBUGGING_ENABLED : DEBUGGING_DISABLED;
+        final int mode = Settings.Global.getInt(mContext.getContentResolver(),
+                Settings.Global.SHOW_NOTIFICATION_CHANNEL_WARNINGS, defaultWarningEnabled);
+        mPreference.setChecked(mode != SETTING_VALUE_OFF);
+    }
+
+    @Override
+    protected void onDeveloperOptionsSwitchEnabled() {
+        mPreference.setEnabled(true);
+    }
+
+    @Override
+    protected void onDeveloperOptionsSwitchDisabled() {
+        Settings.Global.putInt(mContext.getContentResolver(),
+                Settings.Global.SHOW_NOTIFICATION_CHANNEL_WARNINGS, SETTING_VALUE_OFF);
+        mPreference.setEnabled(false);
+        mPreference.setChecked(false);
+    }
+
+    @VisibleForTesting
+    boolean isDebuggable() {
+        return Build.IS_DEBUGGABLE;
+    }
+}
diff --git a/src/com/android/settings/development/OemLockInfoDialog.java b/src/com/android/settings/development/OemLockInfoDialog.java
new file mode 100644
index 0000000..6d75812
--- /dev/null
+++ b/src/com/android/settings/development/OemLockInfoDialog.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.development;
+
+import android.app.AlertDialog;
+import android.app.Dialog;
+import android.app.Fragment;
+import android.app.FragmentManager;
+import android.os.Bundle;
+
+import com.android.internal.logging.nano.MetricsProto;
+import com.android.settings.R;
+import com.android.settings.core.instrumentation.InstrumentedDialogFragment;
+
+public class OemLockInfoDialog extends InstrumentedDialogFragment {
+
+    private static final String TAG = "OemLockInfoDialog";
+
+    public static void show(Fragment host) {
+        final FragmentManager manager = host.getChildFragmentManager();
+        if (manager.findFragmentByTag(TAG) == null) {
+            final OemLockInfoDialog dialog = new OemLockInfoDialog();
+            dialog.show(manager, TAG);
+        }
+    }
+
+    @Override
+    public int getMetricsCategory() {
+        return MetricsProto.MetricsEvent.DIALOG_OEM_LOCK_INFO;
+    }
+
+    @Override
+    public Dialog onCreateDialog(Bundle savedInstanceState) {
+        final AlertDialog.Builder builder = new AlertDialog.Builder(getActivity())
+                .setMessage(R.string.oem_lock_info_message);
+
+        return builder.create();
+    }
+}
diff --git a/src/com/android/settings/development/OemUnlockDialogHost.java b/src/com/android/settings/development/OemUnlockDialogHost.java
new file mode 100644
index 0000000..c134e9c
--- /dev/null
+++ b/src/com/android/settings/development/OemUnlockDialogHost.java
@@ -0,0 +1,33 @@
+/*
+ * Copyright (C) 2017 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF 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;
+
+/**
+ * Interface for OemUnlockDialogFragment callbacks.
+ */
+public interface OemUnlockDialogHost {
+
+    /**
+     * Called when the user presses enable on the warning dialog.
+     */
+    void onOemUnlockDialogConfirmed();
+
+    /**
+     * Called when the user dismisses or cancels the warning dialog.
+     */
+    void onOemUnlockDialogDismissed();
+}
diff --git a/src/com/android/settings/development/OemUnlockPreferenceController.java b/src/com/android/settings/development/OemUnlockPreferenceController.java
new file mode 100644
index 0000000..c6ba60c
--- /dev/null
+++ b/src/com/android/settings/development/OemUnlockPreferenceController.java
@@ -0,0 +1,225 @@
+/*
+ * Copyright (C) 2017 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF 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 static com.android.settings.development.DevelopmentOptionsActivityRequestCodes
+        .REQUEST_CODE_ENABLE_OEM_UNLOCK;
+
+import android.app.Activity;
+import android.content.Context;
+import android.content.Intent;
+import android.content.res.Resources;
+import android.os.UserHandle;
+import android.os.UserManager;
+import android.service.oemlock.OemLockManager;
+import android.support.annotation.VisibleForTesting;
+import android.support.v7.preference.Preference;
+import android.support.v7.preference.PreferenceScreen;
+import android.telephony.TelephonyManager;
+
+import com.android.settings.R;
+import com.android.settings.core.PreferenceControllerMixin;
+import com.android.settings.password.ChooseLockSettingsHelper;
+import com.android.settingslib.RestrictedSwitchPreference;
+import com.android.settingslib.development.DeveloperOptionsPreferenceController;
+
+public class OemUnlockPreferenceController extends DeveloperOptionsPreferenceController implements
+        Preference.OnPreferenceChangeListener, PreferenceControllerMixin, OnActivityResultListener {
+
+    private static final String PREFERENCE_KEY = "oem_unlock_enable";
+
+    private final OemLockManager mOemLockManager;
+    private final UserManager mUserManager;
+    private final TelephonyManager mTelephonyManager;
+    private final DevelopmentSettingsDashboardFragment mFragment;
+    private final ChooseLockSettingsHelper mChooseLockSettingsHelper;
+    private RestrictedSwitchPreference mPreference;
+
+    public OemUnlockPreferenceController(Context context, Activity activity,
+            DevelopmentSettingsDashboardFragment fragment) {
+        super(context);
+        mOemLockManager = (OemLockManager) context.getSystemService(Context.OEM_LOCK_SERVICE);
+        mUserManager = (UserManager) context.getSystemService(Context.USER_SERVICE);
+        mTelephonyManager = (TelephonyManager) context.getSystemService(Context.TELEPHONY_SERVICE);
+        mFragment = fragment;
+        if (activity != null || mFragment != null) {
+            mChooseLockSettingsHelper = new ChooseLockSettingsHelper(activity, mFragment);
+        } else {
+            mChooseLockSettingsHelper = null;
+        }
+    }
+
+    @Override
+    public boolean isAvailable() {
+        return mOemLockManager != null;
+    }
+
+    @Override
+    public String getPreferenceKey() {
+        return PREFERENCE_KEY;
+    }
+
+    @Override
+    public void displayPreference(PreferenceScreen screen) {
+        super.displayPreference(screen);
+
+        mPreference = (RestrictedSwitchPreference) screen.findPreference(getPreferenceKey());
+    }
+
+    @Override
+    public boolean onPreferenceChange(Preference preference, Object newValue) {
+        boolean isUnlocked = (Boolean) newValue;
+        if (isUnlocked) {
+            if (!showKeyguardConfirmation(mContext.getResources(),
+                    REQUEST_CODE_ENABLE_OEM_UNLOCK)) {
+                confirmEnableOemUnlock();
+            }
+        } else {
+            mOemLockManager.setOemUnlockAllowedByUser(false);
+            OemLockInfoDialog.show(mFragment);
+        }
+        return true;
+    }
+
+    @Override
+    public void updateState(Preference preference) {
+        super.updateState(preference);
+        mPreference.setChecked(isOemUnlockedAllowed());
+        updateOemUnlockSettingDescription();
+        // Showing mEnableOemUnlock preference as device has persistent data block.
+        mPreference.setDisabledByAdmin(null);
+        mPreference.setEnabled(enableOemUnlockPreference());
+        if (mPreference.isEnabled()) {
+            // Check restriction, disable mEnableOemUnlock and apply policy transparency.
+            mPreference.checkRestrictionAndSetDisabled(UserManager.DISALLOW_FACTORY_RESET);
+        }
+    }
+
+    @Override
+    public boolean onActivityResult(int requestCode, int resultCode, Intent data) {
+        if (requestCode == REQUEST_CODE_ENABLE_OEM_UNLOCK) {
+            if (resultCode == Activity.RESULT_OK) {
+                if (mPreference.isChecked()) {
+                    confirmEnableOemUnlock();
+                } else {
+                    mOemLockManager.setOemUnlockAllowedByUser(false);
+                }
+            }
+            return true;
+        }
+        return false;
+    }
+
+    @Override
+    protected void onDeveloperOptionsSwitchEnabled() {
+        handleDeveloperOptionsToggled();
+    }
+
+    @Override
+    protected void onDeveloperOptionsSwitchDisabled() {
+        handleDeveloperOptionsToggled();
+    }
+
+    public void onOemUnlockConfirmed() {
+        mOemLockManager.setOemUnlockAllowedByUser(true);
+    }
+
+    public void onOemUnlockDismissed() {
+        if (mPreference == null) {
+            return;
+        }
+        updateState(mPreference);
+    }
+
+    private void handleDeveloperOptionsToggled() {
+        mPreference.setEnabled(enableOemUnlockPreference());
+        if (mPreference.isEnabled()) {
+            // Check restriction, disable mEnableOemUnlock and apply policy transparency.
+            mPreference.checkRestrictionAndSetDisabled(UserManager.DISALLOW_FACTORY_RESET);
+        }
+    }
+
+    private void updateOemUnlockSettingDescription() {
+        int oemUnlockSummary = R.string.oem_unlock_enable_summary;
+        if (isBootloaderUnlocked()) {
+            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 (!isOemUnlockAllowedByUserAndCarrier()) {
+            // 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;
+        }
+        mPreference.setSummary(mContext.getResources().getString(oemUnlockSummary));
+    }
+
+    /** Returns {@code true} if the device is SIM-locked. Otherwise, returns {@code false}. */
+    private boolean isSimLockedDevice() {
+        int phoneCount = mTelephonyManager.getPhoneCount();
+        for (int i = 0; i < phoneCount; i++) {
+            if (mTelephonyManager.getAllowedCarriers(i).size() > 0) {
+                return true;
+            }
+        }
+        return false;
+    }
+
+    /**
+     * Returns {@code true} if the bootloader has been unlocked. Otherwise, returns {code false}.
+     */
+    @VisibleForTesting
+    boolean isBootloaderUnlocked() {
+        return mOemLockManager.isDeviceOemUnlocked();
+    }
+
+    private boolean enableOemUnlockPreference() {
+        return !isBootloaderUnlocked() && isOemUnlockAllowedByUserAndCarrier();
+    }
+
+
+    @VisibleForTesting
+    boolean showKeyguardConfirmation(Resources resources, int requestCode) {
+        return mChooseLockSettingsHelper.launchConfirmationActivity(
+                requestCode, resources.getString(R.string.oem_unlock_enable));
+    }
+
+    @VisibleForTesting
+    void confirmEnableOemUnlock() {
+        EnableOemUnlockSettingWarningDialog.show(mFragment);
+    }
+
+    /**
+     * Returns whether OEM unlock is allowed by the user and carrier.
+     *
+     * This does not take into account any restrictions imposed by the device policy.
+     */
+    @VisibleForTesting
+    boolean isOemUnlockAllowedByUserAndCarrier() {
+        final UserHandle userHandle = UserHandle.of(UserHandle.myUserId());
+        return mOemLockManager.isOemUnlockAllowedByCarrier()
+                && !mUserManager.hasBaseUserRestriction(UserManager.DISALLOW_FACTORY_RESET,
+                userHandle);
+    }
+
+    @VisibleForTesting
+    boolean isOemUnlockedAllowed() {
+        return mOemLockManager.isOemUnlockAllowed();
+    }
+
+}
diff --git a/src/com/android/settings/development/OnActivityResultListener.java b/src/com/android/settings/development/OnActivityResultListener.java
new file mode 100644
index 0000000..6763653
--- /dev/null
+++ b/src/com/android/settings/development/OnActivityResultListener.java
@@ -0,0 +1,22 @@
+package com.android.settings.development;
+
+import android.content.Intent;
+
+/**
+ * Interface for activity result callbacks in the {@link DevelopmentSettingsDashboardFragment}
+ */
+public interface OnActivityResultListener {
+    /**
+     * Called when an activity returns to the {@link DevelopmentSettingsDashboardFragment}.
+     *
+     * @param requestCode The integer request code originally supplied to
+     *                    startActivityForResult(), allowing you to identify who this
+     *                    result came from.
+     * @param resultCode  The integer result code returned by the child activity
+     *                    through its setResult().
+     * @param data        An Intent, which can return result data to the caller
+     *                    (various data can be attached to Intent "extras").
+     * @return true if the controller handled the result.
+     */
+    boolean onActivityResult(int requestCode, int resultCode, Intent data);
+}
diff --git a/src/com/android/settings/development/PictureColorModePreferenceController.java b/src/com/android/settings/development/PictureColorModePreferenceController.java
new file mode 100644
index 0000000..8fa94af
--- /dev/null
+++ b/src/com/android/settings/development/PictureColorModePreferenceController.java
@@ -0,0 +1,101 @@
+/*
+ * Copyright (C) 2017 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF 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.support.annotation.VisibleForTesting;
+import android.support.v7.preference.PreferenceScreen;
+
+import com.android.settings.core.PreferenceControllerMixin;
+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.development.DeveloperOptionsPreferenceController;
+
+public class PictureColorModePreferenceController extends
+        DeveloperOptionsPreferenceController implements
+        LifecycleObserver, OnResume, OnPause, PreferenceControllerMixin {
+
+    private static final String KEY_COLOR_MODE = "picture_color_mode";
+
+    private ColorModePreference mPreference;
+
+    public PictureColorModePreferenceController(Context context, Lifecycle lifecycle) {
+        super(context);
+
+        if (lifecycle != null) {
+            lifecycle.addObserver(this);
+        }
+    }
+
+    @Override
+    public boolean isAvailable() {
+        return getColorModeDescriptionsSize() > 1 && !isWideColorGamut();
+    }
+
+    @Override
+    public String getPreferenceKey() {
+        return KEY_COLOR_MODE;
+    }
+
+    @Override
+    public void displayPreference(PreferenceScreen screen) {
+        super.displayPreference(screen);
+        mPreference = (ColorModePreference) screen.findPreference(getPreferenceKey());
+        if (mPreference != null) {
+            mPreference.updateCurrentAndSupported();
+        }
+    }
+
+    @Override
+    public void onResume() {
+        if (mPreference == null) {
+            return;
+        }
+        mPreference.startListening();
+        mPreference.updateCurrentAndSupported();
+    }
+
+    @Override
+    public void onPause() {
+        if (mPreference == null) {
+            return;
+        }
+        mPreference.stopListening();
+    }
+    
+    @Override
+    protected void onDeveloperOptionsSwitchEnabled() {
+        mPreference.setEnabled(true);
+    }
+
+    @Override
+    protected void onDeveloperOptionsSwitchDisabled() {
+        mPreference.setEnabled(false);
+    }
+
+    @VisibleForTesting
+    boolean isWideColorGamut() {
+        return mContext.getResources().getConfiguration().isScreenWideColorGamut();
+    }
+
+    @VisibleForTesting
+    int getColorModeDescriptionsSize() {
+        return ColorModePreference.getColorModeDescriptions(mContext).size();
+    }
+}
diff --git a/src/com/android/settings/development/PointerLocationPreferenceController.java b/src/com/android/settings/development/PointerLocationPreferenceController.java
new file mode 100644
index 0000000..98298af
--- /dev/null
+++ b/src/com/android/settings/development/PointerLocationPreferenceController.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.development;
+
+import android.content.Context;
+import android.provider.Settings;
+import android.support.annotation.VisibleForTesting;
+import android.support.v14.preference.SwitchPreference;
+import android.support.v7.preference.Preference;
+import android.support.v7.preference.PreferenceScreen;
+
+import com.android.settings.core.PreferenceControllerMixin;
+import com.android.settingslib.development.DeveloperOptionsPreferenceController;
+
+public class PointerLocationPreferenceController extends DeveloperOptionsPreferenceController
+        implements Preference.OnPreferenceChangeListener, PreferenceControllerMixin {
+
+    private static final String POINTER_LOCATION_KEY = "pointer_location";
+
+    @VisibleForTesting
+    static final int SETTING_VALUE_ON = 1;
+    @VisibleForTesting
+    static final int SETTING_VALUE_OFF = 0;
+
+    private SwitchPreference mPreference;
+
+    public PointerLocationPreferenceController(Context context) {
+        super(context);
+    }
+
+    @Override
+    public String getPreferenceKey() {
+        return POINTER_LOCATION_KEY;
+    }
+
+    @Override
+    public void displayPreference(PreferenceScreen screen) {
+        super.displayPreference(screen);
+
+        mPreference = (SwitchPreference) screen.findPreference(getPreferenceKey());
+    }
+
+    @Override
+    public boolean onPreferenceChange(Preference preference, Object newValue) {
+        final boolean isEnabled = (Boolean) newValue;
+        Settings.System.putInt(mContext.getContentResolver(),
+                Settings.System.POINTER_LOCATION, isEnabled ? SETTING_VALUE_ON : SETTING_VALUE_OFF);
+        return true;
+    }
+
+    @Override
+    public void updateState(Preference preference) {
+        final int pointerLocationMode = Settings.System.getInt(mContext.getContentResolver(),
+                Settings.System.POINTER_LOCATION, SETTING_VALUE_OFF);
+        mPreference.setChecked(pointerLocationMode != SETTING_VALUE_OFF);
+    }
+
+    @Override
+    protected void onDeveloperOptionsSwitchEnabled() {
+        mPreference.setEnabled(true);
+    }
+
+    @Override
+    protected void onDeveloperOptionsSwitchDisabled() {
+        Settings.System.putInt(mContext.getContentResolver(), Settings.System.POINTER_LOCATION,
+                SETTING_VALUE_OFF);
+        mPreference.setChecked(false);
+        mPreference.setEnabled(false);
+    }
+}
diff --git a/src/com/android/settings/development/PrivateDnsModeDialogPreference.java b/src/com/android/settings/development/PrivateDnsModeDialogPreference.java
deleted file mode 100644
index ee44b08..0000000
--- a/src/com/android/settings/development/PrivateDnsModeDialogPreference.java
+++ /dev/null
@@ -1,246 +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 static android.net.ConnectivityManager.PRIVATE_DNS_DEFAULT_MODE;
-import static android.net.ConnectivityManager.PRIVATE_DNS_MODE_OFF;
-import static android.net.ConnectivityManager.PRIVATE_DNS_MODE_OPPORTUNISTIC;
-import static android.net.ConnectivityManager.PRIVATE_DNS_MODE_PROVIDER_HOSTNAME;
-
-import android.app.AlertDialog;
-import android.app.Dialog;
-import android.content.ContentResolver;
-import android.content.Context;
-import android.content.DialogInterface;
-import android.content.res.Resources;
-import android.os.Bundle;
-import android.provider.Settings;
-import android.support.v14.preference.PreferenceDialogFragment;
-import android.support.v7.preference.DialogPreference;
-import android.text.Editable;
-import android.text.TextUtils;
-import android.text.TextWatcher;
-import android.util.AttributeSet;
-import android.util.Log;
-import android.view.inputmethod.EditorInfo;
-import android.view.KeyEvent;
-import android.view.View;
-import android.view.ViewGroup.LayoutParams;
-import android.view.ViewGroup.MarginLayoutParams;
-import android.widget.CompoundButton;
-import android.widget.CompoundButton.OnCheckedChangeListener;
-import android.widget.EditText;
-import android.widget.RadioButton;
-import android.widget.TextView;
-import android.widget.TextView.OnEditorActionListener;
-
-import com.android.settings.R;
-import com.android.settingslib.CustomDialogPreference;
-
-
-public class PrivateDnsModeDialogPreference extends CustomDialogPreference
-        implements OnCheckedChangeListener, TextWatcher, OnEditorActionListener {
-    private static final String TAG = PrivateDnsModeDialogPreference.class.getSimpleName();
-
-    private static final String MODE_KEY = Settings.Global.PRIVATE_DNS_MODE;
-    private static final String HOSTNAME_KEY = Settings.Global.PRIVATE_DNS_SPECIFIER;
-    private String mMode;
-    private EditText mEditText;
-
-    public static String getSummaryStringForModeFromSettings(ContentResolver cr, Resources res) {
-        final String mode = getModeFromSettings(cr);
-        switch (mode) {
-            case PRIVATE_DNS_MODE_OFF:
-                return res.getString(R.string.private_dns_mode_off);
-            case PRIVATE_DNS_MODE_OPPORTUNISTIC:
-                return res.getString(R.string.private_dns_mode_opportunistic);
-            case PRIVATE_DNS_MODE_PROVIDER_HOSTNAME:
-                return getHostnameFromSettings(cr);
-            default:
-                return "unknown";
-        }
-    }
-
-    public PrivateDnsModeDialogPreference(Context context, AttributeSet attrs, int defStyleAttr,
-            int defStyleRes) {
-        super(context, attrs, defStyleAttr, defStyleRes);
-    }
-
-    public PrivateDnsModeDialogPreference(Context context, AttributeSet attrs, int defStyleAttr) {
-        super(context, attrs, defStyleAttr);
-    }
-
-    public PrivateDnsModeDialogPreference(Context context, AttributeSet attrs) {
-        super(context, attrs);
-    }
-
-    public PrivateDnsModeDialogPreference(Context context) {
-        super(context);
-    }
-
-    // This is called first when the dialog is launched.
-    @Override
-    protected void onBindDialogView(View view) {
-        final String mode = getModeFromSettings();
-
-        RadioButton rb = (RadioButton) view.findViewById(R.id.private_dns_mode_off);
-        if (mode.equals(PRIVATE_DNS_MODE_OFF)) rb.setChecked(true);
-        rb.setOnCheckedChangeListener(this);
-
-        rb = (RadioButton) view.findViewById(R.id.private_dns_mode_opportunistic);
-        if (mode.equals(PRIVATE_DNS_MODE_OPPORTUNISTIC)) rb.setChecked(true);
-        rb.setOnCheckedChangeListener(this);
-
-        rb = (RadioButton) view.findViewById(R.id.private_dns_mode_provider);
-        if (mode.equals(PRIVATE_DNS_MODE_PROVIDER_HOSTNAME)) rb.setChecked(true);
-        rb.setOnCheckedChangeListener(this);
-
-        mEditText = (EditText) view.findViewById(R.id.private_dns_mode_provider_hostname);
-        mEditText.setOnEditorActionListener(this);
-        mEditText.addTextChangedListener(this);
-
-        // (Mostly) Fix the EditText field's indentation to align underneath the
-        // displayed radio button text, and not under the radio button itself.
-        final int padding = rb.isLayoutRtl()
-                ? rb.getCompoundPaddingRight()
-                : rb.getCompoundPaddingLeft();
-        final MarginLayoutParams marginParams = (MarginLayoutParams) mEditText.getLayoutParams();
-        marginParams.setMarginStart(marginParams.getMarginStart() + padding);
-        mEditText.setLayoutParams(marginParams);
-        mEditText.setText(getHostnameFromSettings());
-
-        setDialogValue(mode);
-    }
-
-    @Override
-    protected void onDialogClosed(boolean positiveResult) {
-        if (!positiveResult) return;
-
-        saveDialogValue();
-        setSummary(getSummaryStringForModeFromSettings(
-                getContext().getContentResolver(), getContext().getResources()));
-    }
-
-    @Override
-    public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
-        if (!isChecked) return;
-
-        switch (buttonView.getId()) {
-            case R.id.private_dns_mode_off:
-                setDialogValue(PRIVATE_DNS_MODE_OFF);
-                break;
-            case R.id.private_dns_mode_opportunistic:
-                setDialogValue(PRIVATE_DNS_MODE_OPPORTUNISTIC);
-                break;
-            case R.id.private_dns_mode_provider:
-                setDialogValue(PRIVATE_DNS_MODE_PROVIDER_HOSTNAME);
-                break;
-            default:
-                // Unknown button; ignored.
-                break;
-        }
-    }
-
-    @Override
-    public boolean onEditorAction(TextView tv, int actionId, KeyEvent k) {
-        if (actionId == EditorInfo.IME_ACTION_DONE) {
-            saveDialogValue();
-            getDialog().dismiss();
-            return true;
-        }
-        return false;
-    }
-
-    @Override
-    public void beforeTextChanged(CharSequence s, int start, int count, int after) { return; }
-
-    @Override
-    public void onTextChanged(CharSequence s, int start, int before, int count) { return; }
-
-    @Override
-    public void afterTextChanged(Editable s) {
-        final String hostname = s.toString();
-        final boolean appearsValid = isWeaklyValidatedHostname(hostname);
-        // TODO: Disable the "positive button" ("Save") when appearsValid is false.
-    }
-
-    private void setDialogValue(String mode) {
-        mMode = mode;
-        final boolean txtEnabled = mMode.equals(PRIVATE_DNS_MODE_PROVIDER_HOSTNAME);
-        mEditText.setEnabled(txtEnabled);
-    }
-
-    private void saveDialogValue() {
-        if (!isValidMode(mMode)) {
-            mMode = PRIVATE_DNS_DEFAULT_MODE;
-        }
-
-        if (mMode.equals(PRIVATE_DNS_MODE_PROVIDER_HOSTNAME)) {
-            final String hostname = mEditText.getText().toString();
-            if (isWeaklyValidatedHostname(hostname)) {
-                saveHostnameToSettings(hostname);
-            } else {
-                // TODO: Once quasi-validation of hostnames works and acceptable
-                // user signaling is working, this can be deleted.
-                mMode = PRIVATE_DNS_MODE_OPPORTUNISTIC;
-                if (TextUtils.isEmpty(hostname)) saveHostnameToSettings("");
-            }
-        }
-
-        saveModeToSettings(mMode);
-    }
-
-    private String getModeFromSettings() {
-        return getModeFromSettings(getContext().getContentResolver());
-    }
-
-    private void saveModeToSettings(String value) {
-        Settings.Global.putString(getContext().getContentResolver(), MODE_KEY, value);
-    }
-
-    private String getHostnameFromSettings() {
-        return getHostnameFromSettings(getContext().getContentResolver());
-    }
-
-    private void saveHostnameToSettings(String hostname) {
-        Settings.Global.putString(getContext().getContentResolver(), HOSTNAME_KEY, hostname);
-    }
-
-    private static String getModeFromSettings(ContentResolver cr) {
-        final String mode = Settings.Global.getString(cr, MODE_KEY);
-        return isValidMode(mode) ? mode : PRIVATE_DNS_DEFAULT_MODE;
-    }
-
-    private static boolean isValidMode(String mode) {
-        return !TextUtils.isEmpty(mode) && (
-                mode.equals(PRIVATE_DNS_MODE_OFF) ||
-                mode.equals(PRIVATE_DNS_MODE_OPPORTUNISTIC) ||
-                mode.equals(PRIVATE_DNS_MODE_PROVIDER_HOSTNAME));
-    }
-
-    private static String getHostnameFromSettings(ContentResolver cr) {
-        return Settings.Global.getString(cr, HOSTNAME_KEY);
-    }
-
-    private static boolean isWeaklyValidatedHostname(String hostname) {
-        // TODO: Find and use a better validation method.  Specifically:
-        //     [1] this should reject IP string literals, and
-        //     [2] do the best, simplest, future-proof verification that
-        //         the input approximates a DNS hostname.
-        final String WEAK_HOSTNAME_REGEX = "^[a-zA-Z0-9_.-]+$";
-        return hostname.matches(WEAK_HOSTNAME_REGEX);
-    }
-}
diff --git a/src/com/android/settings/development/ProfileGpuRenderingPreferenceController.java b/src/com/android/settings/development/ProfileGpuRenderingPreferenceController.java
new file mode 100644
index 0000000..d1f4484
--- /dev/null
+++ b/src/com/android/settings/development/ProfileGpuRenderingPreferenceController.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.development;
+
+import android.content.Context;
+import android.os.SystemProperties;
+import android.support.v7.preference.ListPreference;
+import android.support.v7.preference.Preference;
+import android.support.v7.preference.PreferenceScreen;
+import android.text.TextUtils;
+import android.view.ThreadedRenderer;
+
+import com.android.settings.R;
+import com.android.settings.core.PreferenceControllerMixin;
+import com.android.settingslib.development.DeveloperOptionsPreferenceController;
+import com.android.settingslib.development.SystemPropPoker;
+
+public class ProfileGpuRenderingPreferenceController extends
+        DeveloperOptionsPreferenceController implements Preference.OnPreferenceChangeListener,
+        PreferenceControllerMixin {
+
+    private static final String TRACK_FRAME_TIME_KEY = "track_frame_time";
+
+    private final String[] mListValues;
+    private final String[] mListSummaries;
+    private ListPreference mPreference;
+
+    public ProfileGpuRenderingPreferenceController(Context context) {
+        super(context);
+
+        mListValues = context.getResources().getStringArray(R.array.track_frame_time_values);
+        mListSummaries = context.getResources().getStringArray(R.array.track_frame_time_entries);
+    }
+
+    @Override
+    public String getPreferenceKey() {
+        return TRACK_FRAME_TIME_KEY;
+    }
+
+    @Override
+    public void displayPreference(PreferenceScreen screen) {
+        super.displayPreference(screen);
+
+        mPreference = (ListPreference) screen.findPreference(getPreferenceKey());
+    }
+
+    @Override
+    public boolean onPreferenceChange(Preference preference, Object newValue) {
+        writeTrackFrameTimeOptions(newValue);
+        updateTrackFrameTimeOptions();
+        return true;
+    }
+
+    @Override
+    public void updateState(Preference preference) {
+        updateTrackFrameTimeOptions();
+    }
+
+    @Override
+    protected void onDeveloperOptionsSwitchEnabled() {
+        mPreference.setEnabled(true);
+    }
+
+    @Override
+    protected void onDeveloperOptionsSwitchDisabled() {
+        mPreference.setEnabled(false);
+    }
+
+    private void writeTrackFrameTimeOptions(Object newValue) {
+        SystemProperties.set(ThreadedRenderer.PROFILE_PROPERTY,
+                newValue == null ? "" : newValue.toString());
+        SystemPropPoker.getInstance().poke();
+    }
+
+    private void updateTrackFrameTimeOptions() {
+        final String value = SystemProperties.get(
+                ThreadedRenderer.PROFILE_PROPERTY, "" /* default */);
+        int index = 0; // default
+        for (int i = 0; i < mListValues.length; i++) {
+            if (TextUtils.equals(value, mListValues[i])) {
+                index = i;
+                break;
+            }
+        }
+        mPreference.setValue(mListValues[index]);
+        mPreference.setSummary(mListSummaries[index]);
+    }
+}
diff --git a/src/com/android/settings/development/ResizableActivityPreferenceController.java b/src/com/android/settings/development/ResizableActivityPreferenceController.java
new file mode 100644
index 0000000..d192e11
--- /dev/null
+++ b/src/com/android/settings/development/ResizableActivityPreferenceController.java
@@ -0,0 +1,86 @@
+/*
+ * Copyright (C) 2017 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.development;
+
+import android.content.Context;
+import android.provider.Settings;
+import android.support.annotation.VisibleForTesting;
+import android.support.v14.preference.SwitchPreference;
+import android.support.v7.preference.Preference;
+import android.support.v7.preference.PreferenceScreen;
+
+import com.android.settings.core.PreferenceControllerMixin;
+import com.android.settingslib.development.DeveloperOptionsPreferenceController;
+
+public class ResizableActivityPreferenceController extends
+        DeveloperOptionsPreferenceController implements Preference.OnPreferenceChangeListener,
+        PreferenceControllerMixin {
+
+    private static final String FORCE_RESIZABLE_KEY = "force_resizable_activities";
+
+    @VisibleForTesting
+    final static int SETTING_VALUE_ON = 1;
+    @VisibleForTesting
+    final static int SETTING_VALUE_OFF = 0;
+
+    private SwitchPreference mPreference;
+
+    public ResizableActivityPreferenceController(Context context) {
+        super(context);
+    }
+
+    @Override
+    public String getPreferenceKey() {
+        return FORCE_RESIZABLE_KEY;
+    }
+
+    @Override
+    public void displayPreference(PreferenceScreen screen) {
+        super.displayPreference(screen);
+
+        mPreference = (SwitchPreference) screen.findPreference(getPreferenceKey());
+    }
+
+    @Override
+    public boolean onPreferenceChange(Preference preference, Object newValue) {
+        final boolean isEnabled = (Boolean) newValue;
+        Settings.Global.putInt(mContext.getContentResolver(),
+                Settings.Global.DEVELOPMENT_FORCE_RESIZABLE_ACTIVITIES,
+                isEnabled ? SETTING_VALUE_ON : SETTING_VALUE_OFF);
+        return true;
+    }
+
+    @Override
+    public void updateState(Preference preference) {
+        final int mode = Settings.Global.getInt(mContext.getContentResolver(),
+                Settings.Global.DEVELOPMENT_FORCE_RESIZABLE_ACTIVITIES, SETTING_VALUE_OFF);
+        mPreference.setChecked(mode != SETTING_VALUE_OFF);
+    }
+
+    @Override
+    protected void onDeveloperOptionsSwitchEnabled() {
+        mPreference.setEnabled(true);
+    }
+
+    @Override
+    protected void onDeveloperOptionsSwitchDisabled() {
+        Settings.Global.putInt(mContext.getContentResolver(),
+                Settings.Global.DEVELOPMENT_FORCE_RESIZABLE_ACTIVITIES, SETTING_VALUE_OFF);
+        mPreference.setChecked(false);
+        mPreference.setEnabled(false);
+    }
+}
diff --git a/src/com/android/settings/development/RtlLayoutPreferenceController.java b/src/com/android/settings/development/RtlLayoutPreferenceController.java
new file mode 100644
index 0000000..6729e76
--- /dev/null
+++ b/src/com/android/settings/development/RtlLayoutPreferenceController.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.development;
+
+import android.content.Context;
+import android.os.SystemProperties;
+import android.provider.Settings;
+import android.support.annotation.VisibleForTesting;
+import android.support.v14.preference.SwitchPreference;
+import android.support.v7.preference.Preference;
+import android.support.v7.preference.PreferenceScreen;
+
+import com.android.internal.app.LocalePicker;
+import com.android.settings.core.PreferenceControllerMixin;
+import com.android.settingslib.development.DeveloperOptionsPreferenceController;
+
+public class RtlLayoutPreferenceController extends DeveloperOptionsPreferenceController implements
+        Preference.OnPreferenceChangeListener, PreferenceControllerMixin {
+
+    private static final String FORCE_RTL_LAYOUT_KEY = "force_rtl_layout_all_locales";
+
+    @VisibleForTesting
+    static final int SETTING_VALUE_ON = 1;
+    @VisibleForTesting
+    static final int SETTING_VALUE_OFF = 0;
+
+    private SwitchPreference mPreference;
+
+    public RtlLayoutPreferenceController(Context context) {
+        super(context);
+    }
+
+    @Override
+    public String getPreferenceKey() {
+        return FORCE_RTL_LAYOUT_KEY;
+    }
+
+    @Override
+    public void displayPreference(PreferenceScreen screen) {
+        super.displayPreference(screen);
+
+        mPreference = (SwitchPreference) screen.findPreference(getPreferenceKey());
+    }
+
+    @Override
+    public boolean onPreferenceChange(Preference preference, Object newValue) {
+        final boolean isEnabled = (Boolean) newValue;
+        writeToForceRtlLayoutSetting(isEnabled);
+        updateLocales();
+        return true;
+    }
+
+    @Override
+    public void updateState(Preference preference) {
+        int rtlLayoutMode = Settings.Global.getInt(mContext.getContentResolver(),
+                Settings.Global.DEVELOPMENT_FORCE_RTL, SETTING_VALUE_OFF);
+        mPreference.setChecked(rtlLayoutMode != SETTING_VALUE_OFF);
+    }
+
+    @Override
+    protected void onDeveloperOptionsSwitchEnabled() {
+        mPreference.setEnabled(true);
+    }
+
+    @Override
+    protected void onDeveloperOptionsSwitchDisabled() {
+        writeToForceRtlLayoutSetting(false);
+        updateLocales();
+        mPreference.setChecked(false);
+        mPreference.setEnabled(false);
+    }
+
+    @VisibleForTesting
+    void updateLocales() {
+        LocalePicker.updateLocales(mContext.getResources().getConfiguration().getLocales());
+    }
+
+    private void writeToForceRtlLayoutSetting(boolean isEnabled) {
+        Settings.Global.putInt(mContext.getContentResolver(),
+                Settings.Global.DEVELOPMENT_FORCE_RTL,
+                isEnabled ? SETTING_VALUE_ON : SETTING_VALUE_OFF);
+        SystemProperties.set(Settings.Global.DEVELOPMENT_FORCE_RTL,
+                isEnabled ? Integer.toString(SETTING_VALUE_ON)
+                        : Integer.toString(SETTING_VALUE_OFF));
+    }
+}
diff --git a/src/com/android/settings/development/SecondaryDisplayPreferenceController.java b/src/com/android/settings/development/SecondaryDisplayPreferenceController.java
new file mode 100644
index 0000000..0e34148
--- /dev/null
+++ b/src/com/android/settings/development/SecondaryDisplayPreferenceController.java
@@ -0,0 +1,101 @@
+/*
+ * Copyright (C) 2017 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF 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.provider.Settings;
+import android.support.v7.preference.ListPreference;
+import android.support.v7.preference.Preference;
+import android.support.v7.preference.PreferenceScreen;
+import android.text.TextUtils;
+
+import com.android.settings.R;
+import com.android.settings.core.PreferenceControllerMixin;
+import com.android.settingslib.development.DeveloperOptionsPreferenceController;
+
+public class SecondaryDisplayPreferenceController extends
+        DeveloperOptionsPreferenceController implements
+        Preference.OnPreferenceChangeListener, PreferenceControllerMixin {
+
+    private static final String OVERLAY_DISPLAY_DEVICES_KEY = "overlay_display_devices";
+
+    private final String[] mListValues;
+    private final String[] mListSummaries;
+    private ListPreference mPreference;
+
+    public SecondaryDisplayPreferenceController(Context context) {
+        super(context);
+
+        mListValues = context.getResources().getStringArray(R.array.overlay_display_devices_values);
+        mListSummaries = context.getResources().getStringArray(
+                R.array.overlay_display_devices_entries);
+    }
+
+    @Override
+    public String getPreferenceKey() {
+        return OVERLAY_DISPLAY_DEVICES_KEY;
+    }
+
+    @Override
+    public void displayPreference(PreferenceScreen screen) {
+        super.displayPreference(screen);
+
+        mPreference = (ListPreference) screen.findPreference(getPreferenceKey());
+    }
+
+    @Override
+    public boolean onPreferenceChange(Preference preference, Object newValue) {
+        writeSecondaryDisplayDevicesOption(newValue.toString());
+        return true;
+    }
+
+    @Override
+    public void updateState(Preference preference) {
+        updateSecondaryDisplayDevicesOptions();
+    }
+
+    @Override
+    protected void onDeveloperOptionsSwitchEnabled() {
+        mPreference.setEnabled(true);
+    }
+
+    @Override
+    protected void onDeveloperOptionsSwitchDisabled() {
+        writeSecondaryDisplayDevicesOption(null);
+        mPreference.setEnabled(false);
+    }
+
+    private void updateSecondaryDisplayDevicesOptions() {
+        final String value = Settings.Global.getString(mContext.getContentResolver(),
+                Settings.Global.OVERLAY_DISPLAY_DEVICES);
+        int index = 0; // default
+        for (int i = 0; i < mListValues.length; i++) {
+            if (TextUtils.equals(value, mListValues[i])) {
+                index = i;
+                break;
+            }
+        }
+        mPreference.setValue(mListValues[index]);
+        mPreference.setSummary(mListSummaries[index]);
+    }
+
+    private void writeSecondaryDisplayDevicesOption(String newValue) {
+        Settings.Global.putString(mContext.getContentResolver(),
+                Settings.Global.OVERLAY_DISPLAY_DEVICES, newValue);
+        updateSecondaryDisplayDevicesOptions();
+    }
+}
diff --git a/src/com/android/settings/development/SelectDebugAppPreferenceController.java b/src/com/android/settings/development/SelectDebugAppPreferenceController.java
new file mode 100644
index 0000000..1037f91
--- /dev/null
+++ b/src/com/android/settings/development/SelectDebugAppPreferenceController.java
@@ -0,0 +1,131 @@
+/*
+ * Copyright (C) 2017 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.development;
+
+import static com.android.settings.development.DevelopmentOptionsActivityRequestCodes
+        .REQUEST_CODE_DEBUG_APP;
+
+import android.app.Activity;
+import android.content.Context;
+import android.content.Intent;
+import android.content.pm.ApplicationInfo;
+import android.content.pm.PackageManager;
+import android.provider.Settings;
+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.PreferenceControllerMixin;
+import com.android.settingslib.development.DeveloperOptionsPreferenceController;
+import com.android.settingslib.wrapper.PackageManagerWrapper;
+
+public class SelectDebugAppPreferenceController extends
+        DeveloperOptionsPreferenceController implements PreferenceControllerMixin,
+        OnActivityResultListener {
+
+    private static final String DEBUG_APP_KEY = "debug_app";
+
+    private final DevelopmentSettingsDashboardFragment mFragment;
+    private final PackageManagerWrapper mPackageManager;
+
+    private Preference mPreference;
+
+    public SelectDebugAppPreferenceController(Context context,
+            DevelopmentSettingsDashboardFragment fragment) {
+        super(context);
+        mFragment = fragment;
+        mPackageManager = new PackageManagerWrapper(mContext.getPackageManager());
+    }
+
+    @Override
+    public String getPreferenceKey() {
+        return DEBUG_APP_KEY;
+    }
+
+    @Override
+    public void displayPreference(PreferenceScreen screen) {
+        super.displayPreference(screen);
+
+        mPreference = screen.findPreference(getPreferenceKey());
+    }
+
+    @Override
+    public boolean handlePreferenceTreeClick(Preference preference) {
+        if (DEBUG_APP_KEY.equals(preference.getKey())) {
+            final Intent intent = getActivityStartIntent();
+            intent.putExtra(AppPicker.EXTRA_DEBUGGABLE, true /* value */);
+            mFragment.startActivityForResult(intent, REQUEST_CODE_DEBUG_APP);
+            return true;
+        }
+        return false;
+    }
+
+    @Override
+    public void updateState(Preference preference) {
+        updatePreferenceSummary();
+    }
+
+    @Override
+    public boolean onActivityResult(int requestCode, int resultCode, Intent data) {
+        if (requestCode != REQUEST_CODE_DEBUG_APP || resultCode != Activity.RESULT_OK) {
+            return false;
+        }
+        Settings.Global.putString(mContext.getContentResolver(), Settings.Global.DEBUG_APP,
+                data.getAction());
+        updatePreferenceSummary();
+        return true;
+    }
+
+    @Override
+    protected void onDeveloperOptionsSwitchEnabled() {
+        mPreference.setEnabled(true);
+    }
+
+    @Override
+    protected void onDeveloperOptionsSwitchDisabled() {
+        mPreference.setEnabled(false);
+        mPreference.setSummary(mContext.getResources().getString(R.string.debug_app_not_set));
+    }
+
+    @VisibleForTesting
+    Intent getActivityStartIntent() {
+        return new Intent(mContext, AppPicker.class);
+    }
+
+    private void updatePreferenceSummary() {
+        final String debugApp = Settings.Global.getString(
+                mContext.getContentResolver(), Settings.Global.DEBUG_APP);
+        if (debugApp != null && debugApp.length() > 0) {
+            mPreference.setSummary(mContext.getResources().getString(R.string.debug_app_set,
+                    getAppLabel(debugApp)));
+        } else {
+            mPreference.setSummary(mContext.getResources().getString(R.string.debug_app_not_set));
+        }
+    }
+
+    private String getAppLabel(String debugApp) {
+        try {
+            final ApplicationInfo ai = mPackageManager.getApplicationInfo(debugApp,
+                    PackageManager.GET_DISABLED_COMPONENTS);
+            final CharSequence lab = mPackageManager.getApplicationLabel(ai);
+            return lab != null ? lab.toString() : debugApp;
+        } catch (PackageManager.NameNotFoundException e) {
+            return debugApp;
+        }
+    }
+}
diff --git a/src/com/android/settings/development/SelectUsbConfigPreferenceController.java b/src/com/android/settings/development/SelectUsbConfigPreferenceController.java
new file mode 100644
index 0000000..77a9a75
--- /dev/null
+++ b/src/com/android/settings/development/SelectUsbConfigPreferenceController.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.development;
+
+import android.content.BroadcastReceiver;
+import android.content.Context;
+import android.content.Intent;
+import android.content.IntentFilter;
+import android.content.pm.PackageManager;
+import android.hardware.usb.UsbManager;
+import android.os.Bundle;
+import android.support.annotation.VisibleForTesting;
+import android.support.v7.preference.ListPreference;
+import android.support.v7.preference.Preference;
+import android.support.v7.preference.PreferenceScreen;
+import android.text.TextUtils;
+
+import com.android.settings.R;
+import com.android.settings.Utils;
+import com.android.settings.core.PreferenceControllerMixin;
+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.development.DeveloperOptionsPreferenceController;
+
+public class SelectUsbConfigPreferenceController extends
+        DeveloperOptionsPreferenceController implements
+        Preference.OnPreferenceChangeListener, LifecycleObserver, OnCreate, OnDestroy,
+        PreferenceControllerMixin {
+
+    private static final String USB_CONFIGURATION_KEY = "select_usb_configuration";
+
+    private final String[] mListValues;
+    private final String[] mListSummaries;
+    private final UsbManager mUsbManager;
+    private BroadcastReceiver mUsbReceiver;
+    private ListPreference mPreference;
+
+    public SelectUsbConfigPreferenceController(Context context, Lifecycle lifecycle) {
+        super(context);
+
+        mListValues = context.getResources().getStringArray(R.array.usb_configuration_values);
+        mListSummaries = context.getResources().getStringArray(R.array.usb_configuration_titles);
+        mUsbManager = (UsbManager) context.getSystemService(Context.USB_SERVICE);
+        mUsbReceiver = new BroadcastReceiver() {
+            @Override
+            public void onReceive(Context context, Intent intent) {
+                if (mPreference != null) {
+                    updateUsbConfigurationValues();
+                }
+            }
+        };
+        if (lifecycle != null) {
+            lifecycle.addObserver(this);
+        }
+    }
+
+    @Override
+    public void onCreate(Bundle savedInstanceState) {
+        IntentFilter filter = new IntentFilter();
+        filter.addAction(UsbManager.ACTION_USB_STATE);
+        mContext.registerReceiver(mUsbReceiver, filter);
+    }
+
+    @Override
+    public String getPreferenceKey() {
+        return USB_CONFIGURATION_KEY;
+    }
+
+    @Override
+    public void displayPreference(PreferenceScreen screen) {
+        super.displayPreference(screen);
+
+        mPreference = (ListPreference) screen.findPreference(getPreferenceKey());
+    }
+
+    @Override
+    public boolean onPreferenceChange(Preference preference, Object newValue) {
+        if (Utils.isMonkeyRunning()) {
+            return false;
+        }
+
+        writeUsbConfigurationOption(newValue.toString());
+        updateUsbConfigurationValues();
+        return true;
+    }
+
+    @Override
+    public void updateState(Preference preference) {
+        updateUsbConfigurationValues();
+    }
+
+    @Override
+    public void onDestroy() {
+        mContext.unregisterReceiver(mUsbReceiver);
+    }
+
+    @Override
+    public boolean isAvailable() {
+        final PackageManager packageManager = mContext.getPackageManager();
+
+        return packageManager.hasSystemFeature(PackageManager.FEATURE_USB_HOST)
+                || packageManager.hasSystemFeature(PackageManager.FEATURE_USB_ACCESSORY);
+    }
+
+    @Override
+    protected void onDeveloperOptionsSwitchEnabled() {
+        mPreference.setEnabled(true);
+    }
+
+    @Override
+    protected void onDeveloperOptionsSwitchDisabled() {
+        mPreference.setEnabled(false);
+    }
+
+    @VisibleForTesting
+    void setCurrentFunction(String newValue, boolean usbDataUnlocked) {
+        mUsbManager.setCurrentFunction(newValue, usbDataUnlocked);
+    }
+
+    private void updateUsbConfigurationValues() {
+        int index = 0;
+        for (int i = 0; i < mListValues.length; i++) {
+            if (mUsbManager.isFunctionEnabled(mListValues[i])) {
+                index = i;
+                break;
+            }
+        }
+        mPreference.setValue(mListValues[index]);
+        mPreference.setSummary(mListSummaries[index]);
+    }
+
+    private void writeUsbConfigurationOption(String newValue) {
+        if (TextUtils.equals(newValue, "none")) {
+            setCurrentFunction(newValue, false);
+        } else {
+            setCurrentFunction(newValue, true);
+        }
+    }
+}
diff --git a/src/com/android/settings/development/SetGpuRendererPreferenceController.java b/src/com/android/settings/development/SetGpuRendererPreferenceController.java
new file mode 100644
index 0000000..b19344c
--- /dev/null
+++ b/src/com/android/settings/development/SetGpuRendererPreferenceController.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.development;
+
+import android.content.Context;
+import android.os.SystemProperties;
+import android.support.v7.preference.ListPreference;
+import android.support.v7.preference.Preference;
+import android.support.v7.preference.PreferenceScreen;
+import android.text.TextUtils;
+import android.view.ThreadedRenderer;
+
+import com.android.settings.R;
+import com.android.settings.core.PreferenceControllerMixin;
+import com.android.settingslib.development.DeveloperOptionsPreferenceController;
+import com.android.settingslib.development.SystemPropPoker;
+
+public class SetGpuRendererPreferenceController extends
+        DeveloperOptionsPreferenceController implements Preference.OnPreferenceChangeListener,
+        PreferenceControllerMixin {
+
+    private static final String DEBUG_HW_RENDERER_KEY = "debug_hw_renderer";
+
+    private final String[] mListValues;
+    private final String[] mListSummaries;
+    private ListPreference mPreference;
+
+    public SetGpuRendererPreferenceController(Context context) {
+        super(context);
+
+        mListValues = context.getResources().getStringArray(R.array.debug_hw_renderer_values);
+        mListSummaries = context.getResources().getStringArray(R.array.debug_hw_renderer_entries);
+    }
+
+    @Override
+    public String getPreferenceKey() {
+        return DEBUG_HW_RENDERER_KEY;
+    }
+
+    @Override
+    public void displayPreference(PreferenceScreen screen) {
+        super.displayPreference(screen);
+
+        mPreference = (ListPreference) screen.findPreference(getPreferenceKey());
+    }
+
+    @Override
+    public boolean onPreferenceChange(Preference preference, Object newValue) {
+        writeDebugHwRendererOptions(newValue);
+        updateDebugHwRendererOptions();
+        return true;
+    }
+
+    @Override
+    public void updateState(Preference preference) {
+        updateDebugHwRendererOptions();
+    }
+
+    @Override
+    protected void onDeveloperOptionsSwitchEnabled() {
+        mPreference.setEnabled(true);
+    }
+
+    @Override
+    protected void onDeveloperOptionsSwitchDisabled() {
+        mPreference.setEnabled(false);
+    }
+
+    private void writeDebugHwRendererOptions(Object newValue) {
+        SystemProperties.set(ThreadedRenderer.DEBUG_RENDERER_PROPERTY,
+                newValue == null ? "" : newValue.toString());
+        SystemPropPoker.getInstance().poke();
+    }
+
+    private void updateDebugHwRendererOptions() {
+        final String value = SystemProperties.get(
+                ThreadedRenderer.DEBUG_RENDERER_PROPERTY, "" /* default */);
+        int index = 0; // default
+        for (int i = 0; i < mListValues.length; i++) {
+            if (TextUtils.equals(value, mListValues[i])) {
+                index = i;
+                break;
+            }
+        }
+        mPreference.setValue(mListValues[index]);
+        mPreference.setSummary(mListSummaries[index]);
+    }
+}
diff --git a/src/com/android/settings/development/ShortcutManagerThrottlingPreferenceController.java b/src/com/android/settings/development/ShortcutManagerThrottlingPreferenceController.java
new file mode 100644
index 0000000..a0e6592
--- /dev/null
+++ b/src/com/android/settings/development/ShortcutManagerThrottlingPreferenceController.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.development;
+
+import android.content.Context;
+import android.content.pm.IShortcutService;
+import android.os.RemoteException;
+import android.os.ServiceManager;
+import android.support.v7.preference.Preference;
+import android.text.TextUtils;
+import android.util.Log;
+import android.widget.Toast;
+
+import com.android.settings.R;
+import com.android.settings.core.PreferenceControllerMixin;
+import com.android.settingslib.development.DeveloperOptionsPreferenceController;
+
+public class ShortcutManagerThrottlingPreferenceController extends
+        DeveloperOptionsPreferenceController implements PreferenceControllerMixin {
+
+    private static final String TAG = "ShortcutMgrPrefCtrl";
+
+    private static final String SHORTCUT_MANAGER_RESET_KEY = "reset_shortcut_manager_throttling";
+
+    private final IShortcutService mShortcutService;
+
+    public ShortcutManagerThrottlingPreferenceController(Context context) {
+        super(context);
+
+        mShortcutService = getShortCutService();
+    }
+
+    @Override
+    public String getPreferenceKey() {
+        return SHORTCUT_MANAGER_RESET_KEY;
+    }
+
+    @Override
+    public boolean handlePreferenceTreeClick(Preference preference) {
+        if (!TextUtils.equals(SHORTCUT_MANAGER_RESET_KEY, preference.getKey())) {
+            return false;
+        }
+        resetShortcutManagerThrottling();
+        return true;
+    }
+
+    private void resetShortcutManagerThrottling() {
+        if (mShortcutService == null) {
+            return;
+        }
+        try {
+            mShortcutService.resetThrottling();
+            Toast.makeText(mContext, R.string.reset_shortcut_manager_throttling_complete,
+                    Toast.LENGTH_SHORT).show();
+        } catch (RemoteException e) {
+            Log.e(TAG, "Failed to reset rate limiting", e);
+        }
+    }
+
+    private IShortcutService getShortCutService() {
+        try {
+            return IShortcutService.Stub.asInterface(
+                    ServiceManager.getService(Context.SHORTCUT_SERVICE));
+        } catch (VerifyError e) {
+            // Used for tests since Robolectric cannot initialize this class.
+            return null;
+        }
+    }
+}
diff --git a/src/com/android/settings/development/ShowLayoutBoundsPreferenceController.java b/src/com/android/settings/development/ShowLayoutBoundsPreferenceController.java
new file mode 100644
index 0000000..ad4a44e
--- /dev/null
+++ b/src/com/android/settings/development/ShowLayoutBoundsPreferenceController.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.development;
+
+import android.content.Context;
+import android.os.SystemProperties;
+import android.support.v14.preference.SwitchPreference;
+import android.support.v7.preference.Preference;
+import android.support.v7.preference.PreferenceScreen;
+import android.view.View;
+
+import com.android.settings.core.PreferenceControllerMixin;
+import com.android.settingslib.development.DeveloperOptionsPreferenceController;
+import com.android.settingslib.development.SystemPropPoker;
+
+public class ShowLayoutBoundsPreferenceController extends DeveloperOptionsPreferenceController
+        implements Preference.OnPreferenceChangeListener, PreferenceControllerMixin {
+
+    private static final String DEBUG_LAYOUT_KEY = "debug_layout";
+
+    private SwitchPreference mPreference;
+
+    public ShowLayoutBoundsPreferenceController(Context context) {
+        super(context);
+    }
+
+    @Override
+    public String getPreferenceKey() {
+        return DEBUG_LAYOUT_KEY;
+    }
+
+    @Override
+    public void displayPreference(PreferenceScreen screen) {
+        super.displayPreference(screen);
+
+        mPreference = (SwitchPreference) screen.findPreference(getPreferenceKey());
+    }
+
+    @Override
+    public boolean onPreferenceChange(Preference preference, Object newValue) {
+        final boolean isEnabled = (Boolean) newValue;
+        SystemProperties.set(View.DEBUG_LAYOUT_PROPERTY,
+                isEnabled ? Boolean.toString(true) : Boolean.toString(false));
+        SystemPropPoker.getInstance().poke();
+        return true;
+    }
+
+    @Override
+    public void updateState(Preference preference) {
+        final boolean isEnabled = SystemProperties.getBoolean(View.DEBUG_LAYOUT_PROPERTY,
+                false /* default */);
+        mPreference.setChecked(isEnabled);
+    }
+
+    @Override
+    protected void onDeveloperOptionsSwitchEnabled() {
+        mPreference.setEnabled(true);
+    }
+
+    @Override
+    protected void onDeveloperOptionsSwitchDisabled() {
+        SystemProperties.set(View.DEBUG_LAYOUT_PROPERTY, Boolean.toString(false));
+        mPreference.setChecked(false);
+        mPreference.setEnabled(false);
+    }
+}
diff --git a/src/com/android/settings/development/ShowSurfaceUpdatesPreferenceController.java b/src/com/android/settings/development/ShowSurfaceUpdatesPreferenceController.java
new file mode 100644
index 0000000..1202759
--- /dev/null
+++ b/src/com/android/settings/development/ShowSurfaceUpdatesPreferenceController.java
@@ -0,0 +1,134 @@
+/*
+ * Copyright (C) 2017 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.development;
+
+import android.content.Context;
+import android.os.IBinder;
+import android.os.Parcel;
+import android.os.RemoteException;
+import android.os.ServiceManager;
+import android.support.annotation.VisibleForTesting;
+import android.support.v14.preference.SwitchPreference;
+import android.support.v7.preference.Preference;
+import android.support.v7.preference.PreferenceScreen;
+
+import com.android.settings.core.PreferenceControllerMixin;
+import com.android.settingslib.development.DeveloperOptionsPreferenceController;
+
+public class ShowSurfaceUpdatesPreferenceController extends DeveloperOptionsPreferenceController
+        implements Preference.OnPreferenceChangeListener, PreferenceControllerMixin {
+
+    private static final String SHOW_SCREEN_UPDATES_KEY = "show_screen_updates";
+
+    private static final int SETTING_VALUE_ON = 1;
+    private static final int SETTING_VALUE_OFF = 0;
+
+    @VisibleForTesting
+    static final String SURFACE_FLINGER_SERVICE_KEY = "SurfaceFlinger";
+    @VisibleForTesting
+    static final int SURFACE_FLINGER_READ_CODE = 1010;
+
+    private static final int SURFACE_FLINGER_WRITE_SURFACE_UPDATES_CODE = 1002;
+    private static final String SURFACE_COMPOSER_INTERFACE_KEY = "android.ui.ISurfaceComposer";
+
+    private final IBinder mSurfaceFlinger;
+    private SwitchPreference mPreference;
+
+    public ShowSurfaceUpdatesPreferenceController(Context context) {
+        super(context);
+        mSurfaceFlinger = ServiceManager.getService(SURFACE_FLINGER_SERVICE_KEY);
+    }
+
+    @Override
+    public String getPreferenceKey() {
+        return SHOW_SCREEN_UPDATES_KEY;
+    }
+
+    @Override
+    public void displayPreference(PreferenceScreen screen) {
+        super.displayPreference(screen);
+
+        mPreference = (SwitchPreference) screen.findPreference(getPreferenceKey());
+    }
+
+    @Override
+    public boolean onPreferenceChange(Preference preference, Object newValue) {
+        final boolean isEnabled = (Boolean) newValue;
+        writeShowUpdatesSetting(isEnabled);
+        return true;
+    }
+
+    @Override
+    public void updateState(Preference preference) {
+        updateShowUpdatesSetting();
+    }
+
+    @Override
+    protected void onDeveloperOptionsSwitchEnabled() {
+        mPreference.setEnabled(true);
+    }
+
+    @Override
+    protected void onDeveloperOptionsSwitchDisabled() {
+        if (mPreference.isChecked()) {
+            // Writing false to the preference when the setting is already off will have a
+            // side effect of turning on the preference that we wish to avoid
+            writeShowUpdatesSetting(false);
+            mPreference.setChecked(false);
+        }
+        mPreference.setEnabled(false);
+    }
+
+    @VisibleForTesting
+    void updateShowUpdatesSetting() {
+        // magic communication with surface flinger.
+        try {
+            if (mSurfaceFlinger != null) {
+                final Parcel data = Parcel.obtain();
+                final Parcel reply = Parcel.obtain();
+                data.writeInterfaceToken(SURFACE_COMPOSER_INTERFACE_KEY);
+                mSurfaceFlinger.transact(SURFACE_FLINGER_READ_CODE, data, reply, 0 /* flags */);
+                @SuppressWarnings("unused") final int showCpu = reply.readInt();
+                @SuppressWarnings("unused") final int enableGL = reply.readInt();
+                final int showUpdates = reply.readInt();
+                mPreference.setChecked(showUpdates != SETTING_VALUE_OFF);
+                reply.recycle();
+                data.recycle();
+            }
+        } catch (RemoteException ex) {
+            // intentional no-op
+        }
+    }
+
+    @VisibleForTesting
+    void writeShowUpdatesSetting(boolean isEnabled) {
+        try {
+            if (mSurfaceFlinger != null) {
+                final Parcel data = Parcel.obtain();
+                data.writeInterfaceToken(SURFACE_COMPOSER_INTERFACE_KEY);
+                final int showUpdates = isEnabled ? SETTING_VALUE_ON : SETTING_VALUE_OFF;
+                data.writeInt(showUpdates);
+                mSurfaceFlinger.transact(SURFACE_FLINGER_WRITE_SURFACE_UPDATES_CODE, data,
+                        null /* reply */, 0 /* flags */);
+                data.recycle();
+            }
+        } catch (RemoteException ex) {
+            // intentional no-op
+        }
+        updateShowUpdatesSetting();
+    }
+}
diff --git a/src/com/android/settings/development/ShowTapsPreferenceController.java b/src/com/android/settings/development/ShowTapsPreferenceController.java
new file mode 100644
index 0000000..ce7d4bd
--- /dev/null
+++ b/src/com/android/settings/development/ShowTapsPreferenceController.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.development;
+
+import android.content.Context;
+import android.provider.Settings;
+import android.support.annotation.VisibleForTesting;
+import android.support.v14.preference.SwitchPreference;
+import android.support.v7.preference.Preference;
+import android.support.v7.preference.PreferenceScreen;
+
+import com.android.settings.core.PreferenceControllerMixin;
+import com.android.settingslib.development.DeveloperOptionsPreferenceController;
+
+public class ShowTapsPreferenceController extends DeveloperOptionsPreferenceController implements
+        Preference.OnPreferenceChangeListener, PreferenceControllerMixin {
+
+    private static final String SHOW_TOUCHES_KEY = "show_touches";
+
+    @VisibleForTesting
+    static final int SETTING_VALUE_ON = 1;
+    @VisibleForTesting
+    static final int SETTING_VALUE_OFF = 0;
+
+    private SwitchPreference mPreference;
+
+    public ShowTapsPreferenceController(Context context) {
+        super(context);
+    }
+
+    @Override
+    public String getPreferenceKey() {
+        return SHOW_TOUCHES_KEY;
+    }
+
+    @Override
+    public void displayPreference(PreferenceScreen screen) {
+        super.displayPreference(screen);
+
+        mPreference = (SwitchPreference) screen.findPreference(getPreferenceKey());
+    }
+
+    @Override
+    public boolean onPreferenceChange(Preference preference, Object newValue) {
+        final boolean isEnabled = (Boolean) newValue;
+        Settings.System.putInt(mContext.getContentResolver(),
+                Settings.System.SHOW_TOUCHES, isEnabled ? SETTING_VALUE_ON : SETTING_VALUE_OFF);
+        return true;
+    }
+
+    @Override
+    public void updateState(Preference preference) {
+        int showTapsMode = Settings.System.getInt(mContext.getContentResolver(),
+                Settings.System.SHOW_TOUCHES, SETTING_VALUE_OFF);
+        mPreference.setChecked(showTapsMode != SETTING_VALUE_OFF);
+    }
+
+    @Override
+    protected void onDeveloperOptionsSwitchEnabled() {
+        mPreference.setEnabled(true);
+    }
+
+    @Override
+    protected void onDeveloperOptionsSwitchDisabled() {
+        Settings.System.putInt(mContext.getContentResolver(), Settings.System.SHOW_TOUCHES,
+                SETTING_VALUE_OFF);
+        mPreference.setChecked(false);
+        mPreference.setEnabled(false);
+    }
+}
diff --git a/src/com/android/settings/development/SimulateColorSpacePreferenceController.java b/src/com/android/settings/development/SimulateColorSpacePreferenceController.java
new file mode 100644
index 0000000..985e878
--- /dev/null
+++ b/src/com/android/settings/development/SimulateColorSpacePreferenceController.java
@@ -0,0 +1,145 @@
+/*
+ * Copyright (C) 2017 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF 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.ContentResolver;
+import android.content.Context;
+import android.content.res.Resources;
+import android.provider.Settings;
+import android.support.annotation.VisibleForTesting;
+import android.support.v7.preference.ListPreference;
+import android.support.v7.preference.Preference;
+import android.support.v7.preference.PreferenceScreen;
+import android.view.accessibility.AccessibilityManager;
+
+import com.android.settings.R;
+import com.android.settings.core.PreferenceControllerMixin;
+import com.android.settingslib.development.DeveloperOptionsPreferenceController;
+
+public class SimulateColorSpacePreferenceController extends
+        DeveloperOptionsPreferenceController implements
+        Preference.OnPreferenceChangeListener, PreferenceControllerMixin {
+
+    private static final String SIMULATE_COLOR_SPACE = "simulate_color_space";
+
+    @VisibleForTesting
+    static final int SETTING_VALUE_OFF = 0;
+    @VisibleForTesting
+    static final int SETTING_VALUE_ON = 1;
+
+    private ListPreference mPreference;
+
+    public SimulateColorSpacePreferenceController(Context context) {
+        super(context);
+    }
+
+    @Override
+    public String getPreferenceKey() {
+        return SIMULATE_COLOR_SPACE;
+    }
+
+    @Override
+    public void displayPreference(PreferenceScreen screen) {
+        super.displayPreference(screen);
+
+        mPreference = (ListPreference) screen.findPreference(getPreferenceKey());
+    }
+
+    @Override
+    public boolean onPreferenceChange(Preference preference, Object newValue) {
+        writeSimulateColorSpace(newValue);
+        return true;
+    }
+
+    @Override
+    public void updateState(Preference preference) {
+        updateSimulateColorSpace();
+    }
+
+    @Override
+    protected void onDeveloperOptionsSwitchEnabled() {
+        mPreference.setEnabled(true);
+    }
+
+    @Override
+    public void onDeveloperOptionsDisabled() {
+        if (usingDevelopmentColorSpace()) {
+            writeSimulateColorSpace(-1);
+        }
+        mPreference.setEnabled(false);
+    }
+
+    private void updateSimulateColorSpace() {
+        final ContentResolver cr = mContext.getContentResolver();
+        final boolean enabled = Settings.Secure.getInt(
+                cr, Settings.Secure.ACCESSIBILITY_DISPLAY_DALTONIZER_ENABLED, SETTING_VALUE_OFF)
+                != SETTING_VALUE_OFF;
+        if (enabled) {
+            final String mode = Integer.toString(Settings.Secure.getInt(
+                    cr, Settings.Secure.ACCESSIBILITY_DISPLAY_DALTONIZER,
+                    AccessibilityManager.DALTONIZER_DISABLED));
+            mPreference.setValue(mode);
+            final int index = mPreference.findIndexOfValue(mode);
+            if (index < 0) {
+                final Resources res = mContext.getResources();
+                // We're using a mode controlled by accessibility preferences.
+                mPreference.setSummary(res.getString(R.string.daltonizer_type_overridden,
+                        res.getString(R.string.accessibility_display_daltonizer_preference_title)));
+            } else {
+                mPreference.setSummary("%s");
+            }
+        } else {
+            mPreference.setValue(
+                    Integer.toString(AccessibilityManager.DALTONIZER_DISABLED));
+        }
+    }
+
+    private void writeSimulateColorSpace(Object value) {
+        final ContentResolver cr = mContext.getContentResolver();
+        final int newMode = Integer.parseInt(value.toString());
+        if (newMode < 0) {
+            Settings.Secure.putInt(cr, Settings.Secure.ACCESSIBILITY_DISPLAY_DALTONIZER_ENABLED,
+                    SETTING_VALUE_OFF);
+        } else {
+            Settings.Secure.putInt(cr, Settings.Secure.ACCESSIBILITY_DISPLAY_DALTONIZER_ENABLED,
+                    SETTING_VALUE_ON);
+            Settings.Secure.putInt(cr, Settings.Secure.ACCESSIBILITY_DISPLAY_DALTONIZER, newMode);
+        }
+    }
+
+    /**
+     * @return <code>true</code> if the color space preference is currently
+     * controlled by development settings
+     */
+    private boolean usingDevelopmentColorSpace() {
+        final ContentResolver cr = mContext.getContentResolver();
+        final boolean enabled = Settings.Secure.getInt(
+                cr, Settings.Secure.ACCESSIBILITY_DISPLAY_DALTONIZER_ENABLED, SETTING_VALUE_OFF)
+                != SETTING_VALUE_OFF;
+        if (enabled) {
+            final String mode = Integer.toString(Settings.Secure.getInt(
+                    cr, Settings.Secure.ACCESSIBILITY_DISPLAY_DALTONIZER,
+                    AccessibilityManager.DALTONIZER_DISABLED));
+            final int index = mPreference.findIndexOfValue(mode);
+            if (index >= 0) {
+                // We're using a mode controlled by developer preferences.
+                return true;
+            }
+        }
+        return false;
+    }
+}
diff --git a/src/com/android/settings/development/StayAwakePreferenceController.java b/src/com/android/settings/development/StayAwakePreferenceController.java
new file mode 100644
index 0000000..c2e8a17
--- /dev/null
+++ b/src/com/android/settings/development/StayAwakePreferenceController.java
@@ -0,0 +1,167 @@
+/*
+ * Copyright (C) 2017 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF 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.ContentResolver;
+import android.content.Context;
+import android.database.ContentObserver;
+import android.net.Uri;
+import android.os.BatteryManager;
+import android.os.Handler;
+import android.provider.Settings;
+import android.support.annotation.VisibleForTesting;
+import android.support.v7.preference.Preference;
+import android.support.v7.preference.PreferenceScreen;
+
+import com.android.settings.core.PreferenceControllerMixin;
+import com.android.settingslib.RestrictedLockUtils;
+import com.android.settingslib.RestrictedSwitchPreference;
+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.development.DeveloperOptionsPreferenceController;
+
+
+public class StayAwakePreferenceController extends DeveloperOptionsPreferenceController implements
+        Preference.OnPreferenceChangeListener, LifecycleObserver,
+        OnResume, OnPause, PreferenceControllerMixin {
+
+    private static final String TAG = "StayAwakeCtrl";
+    private static final String PREFERENCE_KEY = "keep_screen_on";
+    @VisibleForTesting
+    static final int SETTING_VALUE_OFF = 0;
+    @VisibleForTesting
+    static final int SETTING_VALUE_ON =
+            BatteryManager.BATTERY_PLUGGED_AC | BatteryManager.BATTERY_PLUGGED_USB
+                    | BatteryManager.BATTERY_PLUGGED_WIRELESS;
+    @VisibleForTesting
+    SettingsObserver mSettingsObserver;
+
+    private RestrictedSwitchPreference mPreference;
+
+    public StayAwakePreferenceController(Context context, Lifecycle lifecycle) {
+        super(context);
+
+        if (lifecycle != null) {
+            lifecycle.addObserver(this);
+        }
+    }
+
+    @Override
+    public String getPreferenceKey() {
+        return PREFERENCE_KEY;
+    }
+
+    @Override
+    public void displayPreference(PreferenceScreen screen) {
+        super.displayPreference(screen);
+        mPreference = (RestrictedSwitchPreference) screen.findPreference(getPreferenceKey());
+    }
+
+    @Override
+    public boolean onPreferenceChange(Preference preference, Object newValue) {
+        final boolean stayAwake = (Boolean) newValue;
+        Settings.Global.putInt(mContext.getContentResolver(),
+                Settings.Global.STAY_ON_WHILE_PLUGGED_IN,
+                stayAwake ? SETTING_VALUE_ON : SETTING_VALUE_OFF);
+        return true;
+    }
+
+    @Override
+    public void updateState(Preference preference) {
+        final RestrictedLockUtils.EnforcedAdmin admin = checkIfMaximumTimeToLockSetByAdmin();
+        if (admin != null) {
+            mPreference.setDisabledByAdmin(admin);
+            return;
+        }
+
+        final int stayAwakeMode = Settings.Global.getInt(mContext.getContentResolver(),
+                Settings.Global.STAY_ON_WHILE_PLUGGED_IN,
+                SETTING_VALUE_OFF);
+        mPreference.setChecked(stayAwakeMode != SETTING_VALUE_OFF);
+    }
+
+    @Override
+    public void onResume() {
+        if (mPreference == null) {
+            return;
+        }
+        if (mSettingsObserver == null) {
+            mSettingsObserver = new SettingsObserver();
+        }
+        mSettingsObserver.register(true /* register */);
+    }
+
+    @Override
+    public void onPause() {
+        if (mPreference == null || mSettingsObserver == null) {
+            return;
+        }
+        mSettingsObserver.register(false /* unregister */);
+    }
+
+    @Override
+    protected void onDeveloperOptionsSwitchEnabled() {
+        mPreference.setEnabled(true);
+    }
+
+    @Override
+    protected void onDeveloperOptionsSwitchDisabled() {
+        Settings.Global.putInt(mContext.getContentResolver(),
+                Settings.Global.STAY_ON_WHILE_PLUGGED_IN, SETTING_VALUE_OFF);
+        mPreference.setChecked(false);
+        mPreference.setEnabled(false);
+    }
+
+    @VisibleForTesting
+    RestrictedLockUtils.EnforcedAdmin checkIfMaximumTimeToLockSetByAdmin() {
+        // A DeviceAdmin has specified a maximum time until the device
+        // will lock...  in this case we can't allow the user to turn
+        // on "stay awake when plugged in" because that would defeat the
+        // restriction.
+        return RestrictedLockUtils.checkIfMaximumTimeToLockIsSet(mContext);
+    }
+
+    @VisibleForTesting
+    class SettingsObserver extends ContentObserver {
+        private final Uri mStayAwakeUri = Settings.Global.getUriFor(
+                Settings.Global.STAY_ON_WHILE_PLUGGED_IN);
+
+        public SettingsObserver() {
+            super(new Handler());
+        }
+
+        public void register(boolean register) {
+            final ContentResolver cr = mContext.getContentResolver();
+            if (register) {
+                cr.registerContentObserver(
+                        mStayAwakeUri, false, this);
+            } else {
+                cr.unregisterContentObserver(this);
+            }
+        }
+
+        @Override
+        public void onChange(boolean selfChange, Uri uri) {
+            super.onChange(selfChange, uri);
+            if (mStayAwakeUri.equals(uri)) {
+                updateState(mPreference);
+            }
+        }
+    }
+}
diff --git a/src/com/android/settings/development/StrictModePreferenceController.java b/src/com/android/settings/development/StrictModePreferenceController.java
new file mode 100644
index 0000000..7a4a069
--- /dev/null
+++ b/src/com/android/settings/development/StrictModePreferenceController.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.development;
+
+import android.content.Context;
+import android.os.RemoteException;
+import android.os.ServiceManager;
+import android.os.StrictMode;
+import android.os.SystemProperties;
+import android.support.annotation.VisibleForTesting;
+import android.support.v14.preference.SwitchPreference;
+import android.support.v7.preference.Preference;
+import android.support.v7.preference.PreferenceScreen;
+import android.view.IWindowManager;
+
+import com.android.settings.core.PreferenceControllerMixin;
+import com.android.settingslib.development.DeveloperOptionsPreferenceController;
+
+public class StrictModePreferenceController extends DeveloperOptionsPreferenceController implements
+        Preference.OnPreferenceChangeListener, PreferenceControllerMixin {
+
+    private static final String STRICT_MODE_KEY = "strict_mode";
+    private static final String WINDOW_MANAGER_KEY = "window";
+
+    @VisibleForTesting
+    static final String STRICT_MODE_ENABLED = "1";
+    @VisibleForTesting
+    static final String STRICT_MODE_DISABLED = "";
+
+    private final IWindowManager mWindowManager;
+
+    private SwitchPreference mPreference;
+
+    public StrictModePreferenceController(Context context) {
+        super(context);
+
+        mWindowManager = IWindowManager.Stub.asInterface(
+                ServiceManager.getService(WINDOW_MANAGER_KEY));
+    }
+
+    @Override
+    public String getPreferenceKey() {
+        return STRICT_MODE_KEY;
+    }
+
+    @Override
+    public void displayPreference(PreferenceScreen screen) {
+        super.displayPreference(screen);
+
+        mPreference = (SwitchPreference) screen.findPreference(getPreferenceKey());
+    }
+
+    @Override
+    public boolean onPreferenceChange(Preference preference, Object newValue) {
+        final boolean isEnabled = (Boolean) newValue;
+        writeStrictModeVisualOptions(isEnabled);
+        return true;
+    }
+
+    @Override
+    public void updateState(Preference preference) {
+        mPreference.setChecked(isStrictModeEnabled());
+    }
+
+    @Override
+    protected void onDeveloperOptionsSwitchEnabled() {
+        mPreference.setEnabled(true);
+    }
+
+    @Override
+    protected void onDeveloperOptionsSwitchDisabled() {
+        writeStrictModeVisualOptions(false);
+        mPreference.setEnabled(false);
+        mPreference.setChecked(false);
+    }
+
+    private boolean isStrictModeEnabled() {
+        return SystemProperties.getBoolean(StrictMode.VISUAL_PROPERTY, false /* default */);
+    }
+
+    private void writeStrictModeVisualOptions(boolean isEnabled) {
+        try {
+            mWindowManager.setStrictModeVisualIndicatorPreference(
+                    isEnabled ? STRICT_MODE_ENABLED : STRICT_MODE_DISABLED);
+        } catch (RemoteException e) {
+            // intentional no-op
+        }
+    }
+}
diff --git a/src/com/android/settings/development/TelephonyMonitorPreferenceController.java b/src/com/android/settings/development/TelephonyMonitorPreferenceController.java
deleted file mode 100644
index fd6825e..0000000
--- a/src/com/android/settings/development/TelephonyMonitorPreferenceController.java
+++ /dev/null
@@ -1,114 +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.SystemProperties;
-import android.support.v14.preference.SwitchPreference;
-import android.support.v7.preference.Preference;
-import android.support.v7.preference.PreferenceScreen;
-import android.widget.Toast;
-
-import com.android.internal.annotations.VisibleForTesting;
-import com.android.settings.core.PreferenceControllerMixin;
-import com.android.settings.R;
-import com.android.settingslib.core.AbstractPreferenceController;
-
-public class TelephonyMonitorPreferenceController extends AbstractPreferenceController implements
-        PreferenceControllerMixin {
-
-    private static final String KEY_TELEPHONY_MONITOR_SWITCH = "telephony_monitor_switch";
-    @VisibleForTesting
-    static final String BUILD_TYPE = "ro.build.type";
-    @VisibleForTesting
-    static final String PROPERTY_TELEPHONY_MONITOR = "persist.radio.enable_tel_mon";
-
-    @VisibleForTesting
-    static final String ENABLED_STATUS = "enabled";
-    @VisibleForTesting
-    static final String DISABLED_STATUS = "disabled";
-    @VisibleForTesting
-    static final String USER_ENABLED_STATUS = "user_enabled";
-    @VisibleForTesting
-    static final String USER_DISABLED_STATUS = "user_disabled";
-
-    private SwitchPreference mPreference;
-
-    public TelephonyMonitorPreferenceController(Context context) {
-        super(context);
-    }
-
-    @Override
-    public void displayPreference(PreferenceScreen screen) {
-        super.displayPreference(screen);
-        if (isAvailable()) {
-            mPreference = (SwitchPreference) screen.findPreference(KEY_TELEPHONY_MONITOR_SWITCH);
-            mPreference.setChecked(isTelephonyMonitorEnabled());
-        }
-    }
-
-    @Override
-    public String getPreferenceKey() {
-        return KEY_TELEPHONY_MONITOR_SWITCH;
-    }
-
-    @Override
-    public boolean isAvailable() {
-        return mContext.getResources().getBoolean(R.bool.config_show_telephony_monitor) &&
-                (SystemProperties.get(BUILD_TYPE).equals("userdebug") ||
-                        SystemProperties.get(BUILD_TYPE).equals("eng"));
-    }
-
-    @Override
-    public void updateState(Preference preference) {
-        updatePreference();
-    }
-
-    @Override
-    public boolean handlePreferenceTreeClick(Preference preference) {
-        if (KEY_TELEPHONY_MONITOR_SWITCH.equals(preference.getKey())) {
-            final SwitchPreference switchPreference = (SwitchPreference) preference;
-            SystemProperties.set(PROPERTY_TELEPHONY_MONITOR,
-                    switchPreference.isChecked() ? USER_ENABLED_STATUS : USER_DISABLED_STATUS);
-            Toast.makeText(mContext, R.string.telephony_monitor_toast,
-                    Toast.LENGTH_LONG).show();
-            return true;
-        }
-        return false;
-    }
-
-    public void enablePreference(boolean enabled) {
-        if (isAvailable()) {
-            mPreference.setEnabled(enabled);
-        }
-    }
-
-    public boolean updatePreference() {
-        if (!isAvailable()) {
-            return false;
-        }
-        final boolean enabled = isTelephonyMonitorEnabled();
-        mPreference.setChecked(enabled);
-        return enabled;
-    }
-
-    private boolean isTelephonyMonitorEnabled() {
-        final String tmStatus = SystemProperties.get(PROPERTY_TELEPHONY_MONITOR, DISABLED_STATUS);
-        return ENABLED_STATUS.equals(tmStatus) || USER_ENABLED_STATUS.equals(tmStatus);
-    }
-
-}
diff --git a/src/com/android/settings/development/TetheringHardwareAccelPreferenceController.java b/src/com/android/settings/development/TetheringHardwareAccelPreferenceController.java
new file mode 100644
index 0000000..ed14382
--- /dev/null
+++ b/src/com/android/settings/development/TetheringHardwareAccelPreferenceController.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.development;
+
+import android.content.Context;
+import android.provider.Settings;
+import android.support.annotation.VisibleForTesting;
+import android.support.v14.preference.SwitchPreference;
+import android.support.v7.preference.Preference;
+import android.support.v7.preference.PreferenceScreen;
+
+import com.android.settings.core.PreferenceControllerMixin;
+import com.android.settingslib.development.DeveloperOptionsPreferenceController;
+
+public class TetheringHardwareAccelPreferenceController extends
+        DeveloperOptionsPreferenceController implements Preference.OnPreferenceChangeListener,
+        PreferenceControllerMixin {
+
+    private static final String TETHERING_HARDWARE_OFFLOAD = "tethering_hardware_offload";
+
+    // We use the "disabled status" in code, but show the opposite text
+    // on screen. So a value 0 indicates the tethering hardware accel is enabled.
+    @VisibleForTesting
+    static final int SETTING_VALUE_ON = 0;
+    @VisibleForTesting
+    static final int SETTING_VALUE_OFF = 1;
+
+    private SwitchPreference mPreference;
+
+    public TetheringHardwareAccelPreferenceController(Context context) {
+        super(context);
+    }
+
+    @Override
+    public String getPreferenceKey() {
+        return TETHERING_HARDWARE_OFFLOAD;
+    }
+
+    @Override
+    public void displayPreference(PreferenceScreen screen) {
+        super.displayPreference(screen);
+
+        mPreference = (SwitchPreference) screen.findPreference(getPreferenceKey());
+    }
+
+    @Override
+    public boolean onPreferenceChange(Preference preference, Object newValue) {
+        final boolean isEnabled = (Boolean) newValue;
+        Settings.Global.putInt(mContext.getContentResolver(),
+                Settings.Global.TETHER_OFFLOAD_DISABLED,
+                isEnabled ? SETTING_VALUE_ON : SETTING_VALUE_OFF);
+        return true;
+    }
+
+    @Override
+    public void updateState(Preference preference) {
+        final int tetheringMode = Settings.Global.getInt(
+                mContext.getContentResolver(),
+                Settings.Global.TETHER_OFFLOAD_DISABLED, 0 /* default */);
+        mPreference.setChecked(tetheringMode != SETTING_VALUE_OFF);
+    }
+
+    @Override
+    protected void onDeveloperOptionsSwitchEnabled() {
+        mPreference.setEnabled(true);
+    }
+
+    @Override
+    protected void onDeveloperOptionsSwitchDisabled() {
+        Settings.Global.putInt(mContext.getContentResolver(),
+                Settings.Global.TETHER_OFFLOAD_DISABLED, SETTING_VALUE_OFF);
+        mPreference.setEnabled(false);
+        mPreference.setChecked(false);
+    }
+}
diff --git a/src/com/android/settings/development/TransitionAnimationScalePreferenceController.java b/src/com/android/settings/development/TransitionAnimationScalePreferenceController.java
new file mode 100644
index 0000000..dceb712
--- /dev/null
+++ b/src/com/android/settings/development/TransitionAnimationScalePreferenceController.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.development;
+
+import android.content.Context;
+import android.os.RemoteException;
+import android.os.ServiceManager;
+import android.support.annotation.VisibleForTesting;
+import android.support.v7.preference.ListPreference;
+import android.support.v7.preference.Preference;
+import android.support.v7.preference.PreferenceScreen;
+import android.view.IWindowManager;
+
+import com.android.settings.R;
+import com.android.settings.core.PreferenceControllerMixin;
+import com.android.settingslib.development.DeveloperOptionsPreferenceController;
+
+public class TransitionAnimationScalePreferenceController extends
+        DeveloperOptionsPreferenceController implements Preference.OnPreferenceChangeListener,
+        PreferenceControllerMixin {
+
+    private static final String TRANSITION_ANIMATION_SCALE_KEY = "transition_animation_scale";
+
+    @VisibleForTesting
+    static final int TRANSITION_ANIMATION_SCALE_SELECTOR = 1;
+    @VisibleForTesting
+    static final float DEFAULT_VALUE = 1;
+
+    private final IWindowManager mWindowManager;
+    private final String[] mListValues;
+    private final String[] mListSummaries;
+    private ListPreference mPreference;
+
+    public TransitionAnimationScalePreferenceController(Context context) {
+        super(context);
+
+        mWindowManager = IWindowManager.Stub.asInterface(
+                ServiceManager.getService(Context.WINDOW_SERVICE));
+        mListValues = context.getResources().getStringArray(
+                R.array.transition_animation_scale_values);
+        mListSummaries = context.getResources().getStringArray(
+                R.array.transition_animation_scale_entries);
+    }
+
+    @Override
+    public String getPreferenceKey() {
+        return TRANSITION_ANIMATION_SCALE_KEY;
+    }
+
+    @Override
+    public void displayPreference(PreferenceScreen screen) {
+        super.displayPreference(screen);
+
+        mPreference = (ListPreference) screen.findPreference(getPreferenceKey());
+    }
+
+    @Override
+    public boolean onPreferenceChange(Preference preference, Object newValue) {
+        writeAnimationScaleOption(newValue);
+        return true;
+    }
+
+    @Override
+    public void updateState(Preference preference) {
+        updateAnimationScaleValue();
+    }
+
+    @Override
+    protected void onDeveloperOptionsSwitchEnabled() {
+        mPreference.setEnabled(true);
+    }
+
+    @Override
+    protected void onDeveloperOptionsSwitchDisabled() {
+        writeAnimationScaleOption(null);
+        mPreference.setEnabled(false);
+    }
+
+    private void writeAnimationScaleOption(Object newValue) {
+        try {
+            float scale = newValue != null ? Float.parseFloat(newValue.toString()) : DEFAULT_VALUE;
+            mWindowManager.setAnimationScale(TRANSITION_ANIMATION_SCALE_SELECTOR, scale);
+            updateAnimationScaleValue();
+        } catch (RemoteException e) {
+            // intentional no-op
+        }
+    }
+
+    private void updateAnimationScaleValue() {
+        try {
+            final float scale = mWindowManager.getAnimationScale(
+                    TRANSITION_ANIMATION_SCALE_SELECTOR);
+            int index = 0; // default
+            for (int i = 0; i < mListValues.length; i++) {
+                float val = Float.parseFloat(mListValues[i]);
+                if (scale <= val) {
+                    index = i;
+                    break;
+                }
+            }
+            mPreference.setValue(mListValues[index]);
+            mPreference.setSummary(mListSummaries[index]);
+        } catch (RemoteException e) {
+            // intentional no-op
+        }
+    }
+}
diff --git a/src/com/android/settings/development/UsbAudioRoutingPreferenceController.java b/src/com/android/settings/development/UsbAudioRoutingPreferenceController.java
new file mode 100644
index 0000000..1e5febd
--- /dev/null
+++ b/src/com/android/settings/development/UsbAudioRoutingPreferenceController.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.development;
+
+import android.content.Context;
+import android.provider.Settings;
+import android.support.annotation.VisibleForTesting;
+import android.support.v14.preference.SwitchPreference;
+import android.support.v7.preference.Preference;
+import android.support.v7.preference.PreferenceScreen;
+
+import com.android.settings.core.PreferenceControllerMixin;
+import com.android.settingslib.development.DeveloperOptionsPreferenceController;
+
+public class UsbAudioRoutingPreferenceController extends DeveloperOptionsPreferenceController
+        implements Preference.OnPreferenceChangeListener, PreferenceControllerMixin {
+
+    private static final String USB_AUDIO_KEY = "usb_audio";
+
+    @VisibleForTesting
+    static final int SETTING_VALUE_ON = 1;
+    @VisibleForTesting
+    static final int SETTING_VALUE_OFF = 0;
+
+    private SwitchPreference mPreference;
+
+    public UsbAudioRoutingPreferenceController(Context context) {
+        super(context);
+    }
+
+    @Override
+    public String getPreferenceKey() {
+        return USB_AUDIO_KEY;
+    }
+
+    @Override
+    public void displayPreference(PreferenceScreen screen) {
+        super.displayPreference(screen);
+
+        mPreference = (SwitchPreference) screen.findPreference(getPreferenceKey());
+    }
+
+    @Override
+    public boolean onPreferenceChange(Preference preference, Object newValue) {
+        final boolean isEnabled = (Boolean) newValue;
+        Settings.Secure.putInt(mContext.getContentResolver(),
+                Settings.Secure.USB_AUDIO_AUTOMATIC_ROUTING_DISABLED,
+                isEnabled ? SETTING_VALUE_ON : SETTING_VALUE_OFF);
+        return true;
+    }
+
+    @Override
+    public void updateState(Preference preference) {
+        final int usbAudioRoutingMode = Settings.Secure.getInt(mContext.getContentResolver(),
+                Settings.Secure.USB_AUDIO_AUTOMATIC_ROUTING_DISABLED, SETTING_VALUE_OFF);
+        mPreference.setChecked(usbAudioRoutingMode != SETTING_VALUE_OFF);
+    }
+
+    @Override
+    protected void onDeveloperOptionsSwitchEnabled() {
+        mPreference.setEnabled(true);
+    }
+
+    @Override
+    protected void onDeveloperOptionsSwitchDisabled() {
+        Settings.Secure.putInt(mContext.getContentResolver(),
+                Settings.Secure.USB_AUDIO_AUTOMATIC_ROUTING_DISABLED, SETTING_VALUE_OFF);
+        mPreference.setChecked(false);
+        mPreference.setEnabled(false);
+    }
+}
diff --git a/src/com/android/settings/development/VerifyAppsOverUsbPreferenceController.java b/src/com/android/settings/development/VerifyAppsOverUsbPreferenceController.java
index d7891c7..f01da0d 100644
--- a/src/com/android/settings/development/VerifyAppsOverUsbPreferenceController.java
+++ b/src/com/android/settings/development/VerifyAppsOverUsbPreferenceController.java
@@ -18,7 +18,6 @@
 import android.content.ContentResolver;
 import android.content.Context;
 import android.content.Intent;
-import android.content.pm.PackageManager;
 import android.content.pm.ResolveInfo;
 import android.os.UserHandle;
 import android.os.UserManager;
@@ -31,20 +30,27 @@
 import com.android.settingslib.RestrictedLockUtils;
 import com.android.settingslib.RestrictedLockUtils.EnforcedAdmin;
 import com.android.settingslib.RestrictedSwitchPreference;
-import com.android.settingslib.core.AbstractPreferenceController;
+import com.android.settingslib.development.DeveloperOptionsPreferenceController;
+import com.android.settingslib.wrapper.PackageManagerWrapper;
 
 import java.util.List;
 
 /**
  * Controller to manage the state of "Verify apps over USB" toggle.
  */
-public class VerifyAppsOverUsbPreferenceController extends AbstractPreferenceController implements
-        PreferenceControllerMixin {
+public class VerifyAppsOverUsbPreferenceController extends
+        DeveloperOptionsPreferenceController implements Preference.OnPreferenceChangeListener,
+        AdbOnChangeListener, PreferenceControllerMixin {
     private static final String VERIFY_APPS_OVER_USB_KEY = "verify_apps_over_usb";
     private static final String PACKAGE_MIME_TYPE = "application/vnd.android.package-archive";
 
     private RestrictedSwitchPreference mPreference;
 
+    @VisibleForTesting
+    static final int SETTING_VALUE_ON = 1;
+    @VisibleForTesting
+    static final int SETTING_VALUE_OFF = 0;
+
     /**
      * Class for indirection of RestrictedLockUtils for testing purposes. It would be nice to mock
      * the appropriate methods in UserManager instead but they aren't accessible.
@@ -56,27 +62,24 @@
             return RestrictedLockUtils.checkIfRestrictionEnforced(context, userRestriction, userId);
         }
     }
+
     // NB: This field is accessed using reflection in the test, please keep name in sync.
     private final RestrictedLockUtilsDelegate mRestrictedLockUtils =
             new RestrictedLockUtilsDelegate();
 
-    VerifyAppsOverUsbPreferenceController(Context context) {
-        super(context);
-    }
+    // This field is accessed using reflection in the test, please keep name in sync.
+    private final PackageManagerWrapper mPackageManager;
 
-    @Override
-    public void displayPreference(PreferenceScreen screen) {
-        super.displayPreference(screen);
-        if (isAvailable()) {
-            mPreference = (RestrictedSwitchPreference)
-                    screen.findPreference(VERIFY_APPS_OVER_USB_KEY);
-        }
+    public VerifyAppsOverUsbPreferenceController(Context context) {
+        super(context);
+
+        mPackageManager = new PackageManagerWrapper(context.getPackageManager());
     }
 
     @Override
     public boolean isAvailable() {
         return Settings.Global.getInt(mContext.getContentResolver(),
-                Settings.Global.PACKAGE_VERIFIER_SETTING_VISIBLE, 1) > 0;
+                Settings.Global.PACKAGE_VERIFIER_SETTING_VISIBLE, 1 /* default */) > 0;
     }
 
     @Override
@@ -84,15 +87,61 @@
         return VERIFY_APPS_OVER_USB_KEY;
     }
 
-    /** Saves the settings value when it is toggled. */
     @Override
-    public boolean handlePreferenceTreeClick(Preference preference) {
-        if (VERIFY_APPS_OVER_USB_KEY.equals(preference.getKey())) {
-            Settings.Global.putInt(mContext.getContentResolver(),
-                    Settings.Global.PACKAGE_VERIFIER_INCLUDE_ADB, mPreference.isChecked() ? 1 : 0);
-            return true;
+    public void displayPreference(PreferenceScreen screen) {
+        super.displayPreference(screen);
+        mPreference = (RestrictedSwitchPreference) screen.findPreference(getPreferenceKey());
+    }
+
+    @Override
+    public boolean onPreferenceChange(Preference preference, Object newValue) {
+        final boolean isEnabled = (Boolean) newValue;
+        Settings.Global.putInt(mContext.getContentResolver(),
+                Settings.Global.PACKAGE_VERIFIER_INCLUDE_ADB,
+                isEnabled ? SETTING_VALUE_ON : SETTING_VALUE_OFF);
+        return true;
+    }
+
+    @Override
+    public void updateState(Preference preference) {
+        if (!shouldBeEnabled()) {
+            mPreference.setChecked(false);
+            mPreference.setDisabledByAdmin(null);
+            mPreference.setEnabled(false);
+            return;
         }
-        return false;
+
+        final EnforcedAdmin enforcingAdmin = mRestrictedLockUtils.checkIfRestrictionEnforced(
+                mContext, UserManager.ENSURE_VERIFY_APPS, UserHandle.myUserId());
+        if (enforcingAdmin != null) {
+            mPreference.setChecked(true);
+            mPreference.setDisabledByAdmin(enforcingAdmin);
+            return;
+        }
+
+        mPreference.setEnabled(true);
+        final boolean checked = Settings.Global.getInt(mContext.getContentResolver(),
+                Settings.Global.PACKAGE_VERIFIER_INCLUDE_ADB, SETTING_VALUE_ON)
+                != SETTING_VALUE_OFF;
+        mPreference.setChecked(checked);
+    }
+
+    @Override
+    public void onAdbSettingChanged() {
+        if (isAvailable()) {
+            updateState(mPreference);
+        }
+    }
+
+    @Override
+    protected void onDeveloperOptionsSwitchEnabled() {
+        updateState(mPreference);
+    }
+
+    @Override
+    protected void onDeveloperOptionsSwitchDisabled() {
+        // intentional no-op
+        // We can rely on onAdbSettingChanged() to update this controller.
     }
 
     /**
@@ -102,50 +151,24 @@
      */
     private boolean shouldBeEnabled() {
         final ContentResolver cr = mContext.getContentResolver();
-        if (Settings.Global.getInt(cr, Settings.Global.ADB_ENABLED, 0) == 0) {
+        if (Settings.Global.getInt(cr, Settings.Global.ADB_ENABLED,
+                AdbPreferenceController.ADB_SETTING_OFF)
+                == AdbPreferenceController.ADB_SETTING_OFF) {
             return false;
         }
-        if (Settings.Global.getInt(cr, Settings.Global.PACKAGE_VERIFIER_ENABLE, 1) == 0) {
+        if (Settings.Global.getInt(cr, Settings.Global.PACKAGE_VERIFIER_ENABLE, SETTING_VALUE_ON)
+                == SETTING_VALUE_OFF) {
             return false;
         } else {
-            final PackageManager pm = mContext.getPackageManager();
             final Intent verification = new Intent(Intent.ACTION_PACKAGE_NEEDS_VERIFICATION);
             verification.setType(PACKAGE_MIME_TYPE);
             verification.addFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION);
-            final List<ResolveInfo> receivers = pm.queryBroadcastReceivers(verification, 0);
+            final List<ResolveInfo> receivers = mPackageManager.queryBroadcastReceivers(
+                    verification, 0 /* flags */);
             if (receivers.size() == 0) {
                 return false;
             }
         }
         return true;
     }
-
-    /**
-     * Updates position, enabled status and maybe admin message.
-     */
-    public void updatePreference() {
-        if (!isAvailable()) {
-            return;
-        }
-
-        if (!shouldBeEnabled()) {
-            mPreference.setChecked(false);
-            mPreference.setDisabledByAdmin(null);
-            mPreference.setEnabled(false);
-            return;
-        }
-
-        final EnforcedAdmin enforcingAdmin = mRestrictedLockUtils.checkIfRestrictionEnforced(
-                        mContext, UserManager.ENSURE_VERIFY_APPS, UserHandle.myUserId());
-        if (enforcingAdmin != null) {
-            mPreference.setChecked(true);
-            mPreference.setDisabledByAdmin(enforcingAdmin);
-            return;
-        }
-
-        mPreference.setEnabled(true);
-        final boolean checked = Settings.Global.getInt(mContext.getContentResolver(),
-                Settings.Global.PACKAGE_VERIFIER_INCLUDE_ADB, 1) != 0;
-        mPreference.setChecked(checked);
-    }
 }
diff --git a/src/com/android/settings/development/WaitForDebuggerPreferenceController.java b/src/com/android/settings/development/WaitForDebuggerPreferenceController.java
new file mode 100644
index 0000000..ec259be
--- /dev/null
+++ b/src/com/android/settings/development/WaitForDebuggerPreferenceController.java
@@ -0,0 +1,127 @@
+/*
+ * Copyright (C) 2017 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF 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 static com.android.settings.development.DevelopmentOptionsActivityRequestCodes
+        .REQUEST_CODE_DEBUG_APP;
+
+import android.app.Activity;
+import android.app.ActivityManager;
+import android.app.IActivityManager;
+import android.content.Context;
+import android.content.Intent;
+import android.os.RemoteException;
+import android.provider.Settings;
+import android.support.annotation.VisibleForTesting;
+import android.support.v14.preference.SwitchPreference;
+import android.support.v7.preference.Preference;
+import android.support.v7.preference.PreferenceScreen;
+import android.text.TextUtils;
+
+import com.android.settings.core.PreferenceControllerMixin;
+import com.android.settingslib.development.DeveloperOptionsPreferenceController;
+
+public class WaitForDebuggerPreferenceController extends
+        DeveloperOptionsPreferenceController implements Preference.OnPreferenceChangeListener,
+        PreferenceControllerMixin, OnActivityResultListener {
+
+    private static final String WAIT_FOR_DEBUGGER_KEY = "wait_for_debugger";
+
+    @VisibleForTesting
+    static final int SETTING_VALUE_ON = 1;
+    @VisibleForTesting
+    static final int SETTING_VALUE_OFF = 0;
+
+    private SwitchPreference mPreference;
+
+    public WaitForDebuggerPreferenceController(Context context) {
+        super(context);
+    }
+
+    @Override
+    public String getPreferenceKey() {
+        return WAIT_FOR_DEBUGGER_KEY;
+    }
+
+    @Override
+    public void displayPreference(PreferenceScreen screen) {
+        super.displayPreference(screen);
+
+        mPreference = (SwitchPreference) screen.findPreference(getPreferenceKey());
+    }
+
+    @Override
+    public boolean onPreferenceChange(Preference preference, Object newValue) {
+        final boolean debuggerEnabled = (Boolean) newValue;
+        final String debugApp = Settings.Global.getString(
+                mContext.getContentResolver(), Settings.Global.DEBUG_APP);
+        writeDebuggerAppOptions(debugApp, debuggerEnabled, true /* persistent */);
+        return true;
+    }
+
+    @Override
+    public void updateState(Preference preference) {
+        final String debugApp = Settings.Global.getString(
+                mContext.getContentResolver(), Settings.Global.DEBUG_APP);
+        final boolean debuggerEnabled = Settings.Global.getInt(mContext.getContentResolver(),
+                Settings.Global.WAIT_FOR_DEBUGGER, SETTING_VALUE_OFF) != SETTING_VALUE_OFF;
+        writeDebuggerAppOptions(debugApp, debuggerEnabled, true /* persistent */);
+        mPreference.setChecked(debuggerEnabled);
+        mPreference.setEnabled(!TextUtils.isEmpty(debugApp));
+    }
+
+    @Override
+    public boolean onActivityResult(int requestCode, int resultCode, Intent data) {
+        if (requestCode != REQUEST_CODE_DEBUG_APP || resultCode != Activity.RESULT_OK) {
+            return false;
+        }
+        final boolean debuggerEnabled = Settings.Global.getInt(mContext.getContentResolver(),
+                Settings.Global.WAIT_FOR_DEBUGGER, SETTING_VALUE_OFF) != SETTING_VALUE_OFF;
+        final String debugApp = data.getAction();
+        writeDebuggerAppOptions(debugApp, debuggerEnabled, true /* persistent */);
+        mPreference.setChecked(debuggerEnabled);
+        mPreference.setEnabled(!TextUtils.isEmpty(debugApp));
+        return true;
+    }
+
+    @Override
+    protected void onDeveloperOptionsSwitchEnabled() {
+        mPreference.setEnabled(true);
+    }
+
+    @Override
+    protected void onDeveloperOptionsSwitchDisabled() {
+        writeDebuggerAppOptions(null /* package name */,
+                false /* waitForDebugger */, false /* persistent */);
+        mPreference.setChecked(false);
+        mPreference.setEnabled(false);
+    }
+
+    @VisibleForTesting
+    IActivityManager getActivityManagerService() {
+        return ActivityManager.getService();
+    }
+
+    private void writeDebuggerAppOptions(String packageName, boolean waitForDebugger,
+            boolean persistent) {
+        try {
+            getActivityManagerService().setDebugApp(packageName, waitForDebugger, persistent);
+        } catch (RemoteException ex) {
+            /* intentional no-op */
+        }
+    }
+}
diff --git a/src/com/android/settings/development/WebViewAppPreferenceController.java b/src/com/android/settings/development/WebViewAppPreferenceController.java
new file mode 100644
index 0000000..9ccb20b
--- /dev/null
+++ b/src/com/android/settings/development/WebViewAppPreferenceController.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.development;
+
+import android.content.Context;
+import android.content.pm.PackageInfo;
+import android.support.annotation.VisibleForTesting;
+import android.support.v7.preference.Preference;
+import android.support.v7.preference.PreferenceScreen;
+import android.text.TextUtils;
+import android.util.Log;
+
+import com.android.settings.R;
+import com.android.settings.applications.defaultapps.DefaultAppInfo;
+import com.android.settings.core.PreferenceControllerMixin;
+import com.android.settings.webview.WebViewUpdateServiceWrapper;
+import com.android.settingslib.development.DeveloperOptionsPreferenceController;
+import com.android.settingslib.wrapper.PackageManagerWrapper;
+
+public class WebViewAppPreferenceController extends
+        DeveloperOptionsPreferenceController implements PreferenceControllerMixin {
+
+    private static final String TAG = "WebViewAppPrefCtrl";
+    private static final String WEBVIEW_APP_KEY = "select_webview_provider";
+
+    private final PackageManagerWrapper mPackageManager;
+    private final WebViewUpdateServiceWrapper mWebViewUpdateServiceWrapper;
+
+    private Preference mPreference;
+
+    public WebViewAppPreferenceController(Context context) {
+        super(context);
+
+        mPackageManager = new PackageManagerWrapper(context.getPackageManager());
+        mWebViewUpdateServiceWrapper = new WebViewUpdateServiceWrapper();
+    }
+
+    @Override
+    public String getPreferenceKey() {
+        return WEBVIEW_APP_KEY;
+    }
+
+    @Override
+    public void displayPreference(PreferenceScreen screen) {
+        super.displayPreference(screen);
+
+        mPreference = screen.findPreference(getPreferenceKey());
+    }
+
+    @Override
+    public void updateState(Preference preference) {
+        final CharSequence defaultAppLabel = getDefaultAppLabel();
+        if (!TextUtils.isEmpty(defaultAppLabel)) {
+            mPreference.setSummary(defaultAppLabel);
+        } else {
+            Log.d(TAG, "No default app");
+            mPreference.setSummary(R.string.app_list_preference_none);
+        }
+    }
+
+    @Override
+    protected void onDeveloperOptionsSwitchEnabled() {
+        mPreference.setEnabled(true);
+    }
+
+    @Override
+    protected void onDeveloperOptionsSwitchDisabled() {
+        mPreference.setEnabled(false);
+    }
+
+    @VisibleForTesting
+    DefaultAppInfo getDefaultAppInfo() {
+        final PackageInfo currentPackage = mWebViewUpdateServiceWrapper.getCurrentWebViewPackage();
+        return new DefaultAppInfo(mContext, mPackageManager,
+                currentPackage == null ? null : currentPackage.applicationInfo);
+    }
+
+    private CharSequence getDefaultAppLabel() {
+        final DefaultAppInfo app = getDefaultAppInfo();
+        return app.loadLabel();
+    }
+}
diff --git a/src/com/android/settings/development/WifiAggressiveHandoverPreferenceController.java b/src/com/android/settings/development/WifiAggressiveHandoverPreferenceController.java
new file mode 100644
index 0000000..aa607ce
--- /dev/null
+++ b/src/com/android/settings/development/WifiAggressiveHandoverPreferenceController.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.development;
+
+import android.content.Context;
+import android.net.wifi.WifiManager;
+import android.support.annotation.VisibleForTesting;
+import android.support.v14.preference.SwitchPreference;
+import android.support.v7.preference.Preference;
+import android.support.v7.preference.PreferenceScreen;
+
+import com.android.settings.core.PreferenceControllerMixin;
+import com.android.settingslib.development.DeveloperOptionsPreferenceController;
+
+public class WifiAggressiveHandoverPreferenceController extends
+        DeveloperOptionsPreferenceController implements Preference.OnPreferenceChangeListener,
+        PreferenceControllerMixin {
+
+    private static final String WIFI_AGGRESSIVE_HANDOVER_KEY = "wifi_aggressive_handover";
+
+    @VisibleForTesting
+    static final int SETTING_VALUE_ON = 1;
+    @VisibleForTesting
+    static final int SETTING_VALUE_OFF = 0;
+
+    private final WifiManager mWifiManager;
+    private SwitchPreference mPreference;
+
+    public WifiAggressiveHandoverPreferenceController(Context context) {
+        super(context);
+
+        mWifiManager = (WifiManager) context.getSystemService(Context.WIFI_SERVICE);
+    }
+
+    @Override
+    public String getPreferenceKey() {
+        return WIFI_AGGRESSIVE_HANDOVER_KEY;
+    }
+
+    @Override
+    public void displayPreference(PreferenceScreen screen) {
+        super.displayPreference(screen);
+
+        mPreference = (SwitchPreference) screen.findPreference(getPreferenceKey());
+    }
+
+    @Override
+    public boolean onPreferenceChange(Preference preference, Object newValue) {
+        boolean isEnabled = (Boolean) newValue;
+        mWifiManager.enableAggressiveHandover(isEnabled ? SETTING_VALUE_ON : SETTING_VALUE_OFF);
+        return true;
+    }
+
+    @Override
+    public void updateState(Preference preference) {
+        boolean enabled = mWifiManager.getAggressiveHandover() > 0;
+        mPreference.setChecked(enabled);
+    }
+
+    @Override
+    protected void onDeveloperOptionsSwitchEnabled() {
+        mPreference.setEnabled(true);
+    }
+
+    @Override
+    protected void onDeveloperOptionsSwitchDisabled() {
+        mWifiManager.enableAggressiveHandover(SETTING_VALUE_OFF);
+        mPreference.setChecked(false);
+        mPreference.setEnabled(false);
+    }
+}
diff --git a/src/com/android/settings/development/WifiDisplayCertificationPreferenceController.java b/src/com/android/settings/development/WifiDisplayCertificationPreferenceController.java
new file mode 100644
index 0000000..5de3071
--- /dev/null
+++ b/src/com/android/settings/development/WifiDisplayCertificationPreferenceController.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.development;
+
+import android.content.Context;
+import android.provider.Settings;
+import android.support.annotation.VisibleForTesting;
+import android.support.v14.preference.SwitchPreference;
+import android.support.v7.preference.Preference;
+import android.support.v7.preference.PreferenceScreen;
+
+import com.android.settings.core.PreferenceControllerMixin;
+import com.android.settingslib.development.DeveloperOptionsPreferenceController;
+
+public class WifiDisplayCertificationPreferenceController extends
+        DeveloperOptionsPreferenceController implements
+        Preference.OnPreferenceChangeListener, PreferenceControllerMixin {
+
+    private static final String WIFI_DISPLAY_CERTIFICATION_KEY = "wifi_display_certification";
+
+    @VisibleForTesting
+    static final int SETTING_VALUE_ON = 1;
+    @VisibleForTesting
+    static final int SETTING_VALUE_OFF = 0;
+
+    private SwitchPreference mPreference;
+
+    public WifiDisplayCertificationPreferenceController(Context context) {
+        super(context);
+    }
+
+    @Override
+    public String getPreferenceKey() {
+        return WIFI_DISPLAY_CERTIFICATION_KEY;
+    }
+
+    @Override
+    public void displayPreference(PreferenceScreen screen) {
+        super.displayPreference(screen);
+
+        mPreference = (SwitchPreference) screen.findPreference(getPreferenceKey());
+    }
+
+    @Override
+    public boolean onPreferenceChange(Preference preference, Object newValue) {
+        final boolean isEnabled = (Boolean) newValue;
+        Settings.Global.putInt(mContext.getContentResolver(),
+                Settings.Global.WIFI_DISPLAY_CERTIFICATION_ON,
+                isEnabled ? SETTING_VALUE_ON : SETTING_VALUE_OFF);
+        return true;
+    }
+
+    @Override
+    public void updateState(Preference preference) {
+        final int wifiDisplayCertificationMode = Settings.Global.getInt(
+                mContext.getContentResolver(), Settings.Global.WIFI_DISPLAY_CERTIFICATION_ON,
+                SETTING_VALUE_OFF);
+        mPreference.setChecked(wifiDisplayCertificationMode != SETTING_VALUE_OFF);
+    }
+
+    @Override
+    protected void onDeveloperOptionsSwitchEnabled() {
+        mPreference.setEnabled(true);
+    }
+
+    @Override
+    protected void onDeveloperOptionsSwitchDisabled() {
+        Settings.Global.putInt(mContext.getContentResolver(),
+                Settings.Global.WIFI_DISPLAY_CERTIFICATION_ON, SETTING_VALUE_OFF);
+        mPreference.setEnabled(false);
+        mPreference.setChecked(false);
+    }
+}
diff --git a/src/com/android/settings/development/WifiRoamScansPreferenceController.java b/src/com/android/settings/development/WifiRoamScansPreferenceController.java
new file mode 100644
index 0000000..b3ff400
--- /dev/null
+++ b/src/com/android/settings/development/WifiRoamScansPreferenceController.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.development;
+
+import android.content.Context;
+import android.net.wifi.WifiManager;
+import android.support.annotation.VisibleForTesting;
+import android.support.v14.preference.SwitchPreference;
+import android.support.v7.preference.Preference;
+import android.support.v7.preference.PreferenceScreen;
+
+import com.android.settings.core.PreferenceControllerMixin;
+import com.android.settingslib.development.DeveloperOptionsPreferenceController;
+
+public class WifiRoamScansPreferenceController extends
+        DeveloperOptionsPreferenceController implements Preference.OnPreferenceChangeListener,
+        PreferenceControllerMixin {
+
+    private static final String WIFI_ALLOW_SCAN_WITH_TRAFFIC_KEY = "wifi_allow_scan_with_traffic";
+
+    @VisibleForTesting
+    static final int SETTING_VALUE_ON = 1;
+    @VisibleForTesting
+    static final int SETTING_VALUE_OFF = 0;
+
+    private final WifiManager mWifiManager;
+    private SwitchPreference mPreference;
+
+    public WifiRoamScansPreferenceController(Context context) {
+        super(context);
+
+        mWifiManager = (WifiManager) context.getSystemService(Context.WIFI_SERVICE);
+    }
+
+    @Override
+    public String getPreferenceKey() {
+        return WIFI_ALLOW_SCAN_WITH_TRAFFIC_KEY;
+    }
+
+    @Override
+    public void displayPreference(PreferenceScreen screen) {
+        super.displayPreference(screen);
+
+        mPreference = (SwitchPreference) screen.findPreference(getPreferenceKey());
+    }
+
+    @Override
+    public boolean onPreferenceChange(Preference preference, Object newValue) {
+        final boolean isEnabled = (Boolean) newValue;
+        mWifiManager.setAllowScansWithTraffic(isEnabled ? SETTING_VALUE_ON : SETTING_VALUE_OFF);
+        return true;
+    }
+
+    @Override
+    public void updateState(Preference preference) {
+        final boolean enabled = mWifiManager.getAllowScansWithTraffic() > 0;
+        mPreference.setChecked(enabled);
+    }
+
+    @Override
+    protected void onDeveloperOptionsSwitchEnabled() {
+        mPreference.setEnabled(true);
+    }
+
+    @Override
+    protected void onDeveloperOptionsSwitchDisabled() {
+        mWifiManager.setAllowScansWithTraffic(SETTING_VALUE_OFF);
+        mPreference.setEnabled(false);
+        mPreference.setChecked(false);
+    }
+}
diff --git a/src/com/android/settings/development/WifiVerboseLoggingPreferenceController.java b/src/com/android/settings/development/WifiVerboseLoggingPreferenceController.java
new file mode 100644
index 0000000..ad2b7eb
--- /dev/null
+++ b/src/com/android/settings/development/WifiVerboseLoggingPreferenceController.java
@@ -0,0 +1,86 @@
+/*
+ * Copyright (C) 2017 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.development;
+
+import android.content.Context;
+import android.net.wifi.WifiManager;
+import android.support.annotation.VisibleForTesting;
+import android.support.v14.preference.SwitchPreference;
+import android.support.v7.preference.Preference;
+import android.support.v7.preference.PreferenceScreen;
+
+import com.android.settings.core.PreferenceControllerMixin;
+import com.android.settingslib.development.DeveloperOptionsPreferenceController;
+
+public class WifiVerboseLoggingPreferenceController extends
+        DeveloperOptionsPreferenceController implements Preference.OnPreferenceChangeListener,
+        PreferenceControllerMixin {
+
+    private static final String WIFI_VERBOSE_LOGGING_KEY = "wifi_verbose_logging";
+
+    @VisibleForTesting
+    static final int SETTING_VALUE_ON = 1;
+    @VisibleForTesting
+    static final int SETTING_VALUE_OFF = 0;
+
+    private final WifiManager mWifiManager;
+    private SwitchPreference mPreference;
+
+    public WifiVerboseLoggingPreferenceController(Context context) {
+        super(context);
+
+        mWifiManager = (WifiManager) context.getSystemService(Context.WIFI_SERVICE);
+    }
+
+    @Override
+    public String getPreferenceKey() {
+        return WIFI_VERBOSE_LOGGING_KEY;
+    }
+
+    @Override
+    public void displayPreference(PreferenceScreen screen) {
+        super.displayPreference(screen);
+
+        mPreference = (SwitchPreference) screen.findPreference(getPreferenceKey());
+    }
+
+    @Override
+    public boolean onPreferenceChange(Preference preference, Object newValue) {
+        final boolean isEnabled = (Boolean) newValue;
+        mWifiManager.enableVerboseLogging(isEnabled ? SETTING_VALUE_ON : SETTING_VALUE_OFF);
+        return true;
+    }
+
+    @Override
+    public void updateState(Preference preference) {
+        final boolean enabled = mWifiManager.getVerboseLoggingLevel() > 0;
+        mPreference.setChecked(enabled);
+
+    }
+
+    @Override
+    protected void onDeveloperOptionsSwitchEnabled() {
+        mPreference.setEnabled(true);
+    }
+
+    @Override
+    protected void onDeveloperOptionsSwitchDisabled() {
+        mWifiManager.enableVerboseLogging(SETTING_VALUE_OFF);
+        mPreference.setEnabled(false);
+        mPreference.setChecked(false);
+    }
+}
diff --git a/src/com/android/settings/development/WindowAnimationScalePreferenceController.java b/src/com/android/settings/development/WindowAnimationScalePreferenceController.java
new file mode 100644
index 0000000..1a17fd2
--- /dev/null
+++ b/src/com/android/settings/development/WindowAnimationScalePreferenceController.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.development;
+
+import android.content.Context;
+import android.os.RemoteException;
+import android.os.ServiceManager;
+import android.support.annotation.VisibleForTesting;
+import android.support.v7.preference.ListPreference;
+import android.support.v7.preference.Preference;
+import android.support.v7.preference.PreferenceScreen;
+import android.view.IWindowManager;
+
+import com.android.settings.R;
+import com.android.settings.core.PreferenceControllerMixin;
+import com.android.settingslib.development.DeveloperOptionsPreferenceController;
+
+public class WindowAnimationScalePreferenceController extends
+        DeveloperOptionsPreferenceController implements Preference.OnPreferenceChangeListener,
+        PreferenceControllerMixin {
+
+    private static final String WINDOW_ANIMATION_SCALE_KEY = "window_animation_scale";
+
+    @VisibleForTesting
+    static final int WINDOW_ANIMATION_SCALE_SELECTOR = 0;
+    @VisibleForTesting
+    static final float DEFAULT_VALUE = 1;
+
+    private final IWindowManager mWindowManager;
+    private final String[] mListValues;
+    private final String[] mListSummaries;
+
+    private ListPreference mPreference;
+
+    public WindowAnimationScalePreferenceController(Context context) {
+        super(context);
+
+        mWindowManager = IWindowManager.Stub.asInterface(
+                ServiceManager.getService(Context.WINDOW_SERVICE));
+        mListValues = context.getResources().getStringArray(R.array.window_animation_scale_values);
+        mListSummaries = context.getResources().getStringArray(
+                R.array.window_animation_scale_entries);
+    }
+
+    @Override
+    public String getPreferenceKey() {
+        return WINDOW_ANIMATION_SCALE_KEY;
+    }
+
+    @Override
+    public void displayPreference(PreferenceScreen screen) {
+        super.displayPreference(screen);
+
+        mPreference = (ListPreference) screen.findPreference(getPreferenceKey());
+    }
+
+    @Override
+    public boolean onPreferenceChange(Preference preference, Object newValue) {
+        writeAnimationScaleOption(newValue);
+        return true;
+    }
+
+    @Override
+    public void updateState(Preference preference) {
+        updateAnimationScaleValue();
+    }
+
+    @Override
+    protected void onDeveloperOptionsSwitchEnabled() {
+        mPreference.setEnabled(true);
+    }
+
+    @Override
+    protected void onDeveloperOptionsSwitchDisabled() {
+        writeAnimationScaleOption(null);
+        mPreference.setEnabled(false);
+    }
+
+    private void writeAnimationScaleOption(Object newValue) {
+        try {
+            float scale = newValue != null ? Float.parseFloat(newValue.toString()) : DEFAULT_VALUE;
+            mWindowManager.setAnimationScale(WINDOW_ANIMATION_SCALE_SELECTOR, scale);
+            updateAnimationScaleValue();
+        } catch (RemoteException e) {
+            // intentional no-op
+        }
+    }
+
+    private void updateAnimationScaleValue() {
+        try {
+            final float scale = mWindowManager.getAnimationScale(WINDOW_ANIMATION_SCALE_SELECTOR);
+            int index = 0; // default
+            for (int i = 0; i < mListValues.length; i++) {
+                float val = Float.parseFloat(mListValues[i]);
+                if (scale <= val) {
+                    index = i;
+                    break;
+                }
+            }
+            mPreference.setValue(mListValues[index]);
+            mPreference.setSummary(mListSummaries[index]);
+        } catch (RemoteException e) {
+            // intentional no-op
+        }
+    }
+}
diff --git a/src/com/android/settings/development/featureflags/FeatureFlagPreference.java b/src/com/android/settings/development/featureflags/FeatureFlagPreference.java
new file mode 100644
index 0000000..b5a4a15
--- /dev/null
+++ b/src/com/android/settings/development/featureflags/FeatureFlagPreference.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 com.android.settings.development.featureflags;
+
+import android.content.Context;
+import android.support.v14.preference.SwitchPreference;
+import android.util.FeatureFlagUtils;
+
+public class FeatureFlagPreference extends SwitchPreference {
+
+    private final String mKey;
+
+    public FeatureFlagPreference(Context context, String key) {
+        super(context);
+        mKey = key;
+        setKey(key);
+        setTitle(key);
+        setCheckedInternal(FeatureFlagUtils.isEnabled(context, mKey));
+    }
+
+    @Override
+    public void setChecked(boolean isChecked) {
+        setCheckedInternal(isChecked);
+        FeatureFlagUtils.setEnabled(getContext(), mKey, isChecked);
+    }
+
+    private void setCheckedInternal(boolean isChecked) {
+        super.setChecked(isChecked);
+        setSummary(Boolean.toString(isChecked));
+    }
+}
diff --git a/src/com/android/settings/development/featureflags/FeatureFlagsDashboard.java b/src/com/android/settings/development/featureflags/FeatureFlagsDashboard.java
new file mode 100644
index 0000000..8f37c67
--- /dev/null
+++ b/src/com/android/settings/development/featureflags/FeatureFlagsDashboard.java
@@ -0,0 +1,59 @@
+/*
+ * Copyright (C) 2017 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.development.featureflags;
+
+import android.content.Context;
+
+import com.android.internal.logging.nano.MetricsProto;
+import com.android.settings.R;
+import com.android.settings.dashboard.DashboardFragment;
+import com.android.settingslib.core.AbstractPreferenceController;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class FeatureFlagsDashboard extends DashboardFragment {
+
+    private static final String TAG = "FeatureFlagsDashboard";
+
+    @Override
+    public int getMetricsCategory() {
+        return MetricsProto.MetricsEvent.SETTINGS_FEATURE_FLAGS_DASHBOARD;
+    }
+
+    @Override
+    protected String getLogTag() {
+        return TAG;
+    }
+
+    @Override
+    protected int getPreferenceScreenResId() {
+        return R.xml.feature_flags_settings;
+    }
+
+    @Override
+    public int getHelpResource() {
+        return 0;
+    }
+
+    @Override
+    protected List<AbstractPreferenceController> getPreferenceControllers(Context context) {
+        final List<AbstractPreferenceController> controllers = new ArrayList<>();
+        controllers.add(new FeatureFlagsPreferenceController(context, getLifecycle()));
+        return controllers;
+    }
+}
diff --git a/src/com/android/settings/development/featureflags/FeatureFlagsPreferenceController.java b/src/com/android/settings/development/featureflags/FeatureFlagsPreferenceController.java
new file mode 100644
index 0000000..7c00591
--- /dev/null
+++ b/src/com/android/settings/development/featureflags/FeatureFlagsPreferenceController.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.development.featureflags;
+
+import android.content.Context;
+import android.support.v7.preference.Preference;
+import android.support.v7.preference.PreferenceScreen;
+import android.util.FeatureFlagUtils;
+
+import com.android.settings.core.PreferenceControllerMixin;
+import com.android.settingslib.core.AbstractPreferenceController;
+import com.android.settingslib.core.lifecycle.Lifecycle;
+import com.android.settingslib.core.lifecycle.LifecycleObserver;
+import com.android.settingslib.core.lifecycle.events.OnStart;
+
+import java.util.Map;
+
+public class FeatureFlagsPreferenceController extends AbstractPreferenceController
+        implements PreferenceControllerMixin, LifecycleObserver, OnStart {
+
+    private PreferenceScreen mScreen;
+
+    public FeatureFlagsPreferenceController(Context context, Lifecycle lifecycle) {
+        super(context);
+        if (lifecycle != null) {
+            lifecycle.addObserver(this);
+        }
+    }
+
+    @Override
+    public boolean isAvailable() {
+        return true;
+    }
+
+    @Override
+    public String getPreferenceKey() {
+        return null;
+    }
+
+    @Override
+    public void displayPreference(PreferenceScreen screen) {
+        super.displayPreference(screen);
+        mScreen = screen;
+    }
+
+    @Override
+    public void onStart() {
+        if (mScreen == null) {
+            return;
+        }
+        final Map<String, String> featureMap = FeatureFlagUtils.getAllFeatureFlags();
+        if (featureMap == null) {
+            return;
+        }
+        mScreen.removeAll();
+        final Context prefContext = mScreen.getContext();
+        for (String prefixedFeature : featureMap.keySet()) {
+            if (prefixedFeature.startsWith(FeatureFlagUtils.FFLAG_PREFIX)
+                    && !prefixedFeature.startsWith(FeatureFlagUtils.FFLAG_OVERRIDE_PREFIX)) {
+                final String feature = prefixedFeature.substring(
+                        FeatureFlagUtils.FFLAG_PREFIX.length());
+                final Preference pref = new FeatureFlagPreference(prefContext, feature);
+                mScreen.addPreference(pref);
+            }
+        }
+    }
+}
diff --git a/src/com/android/settings/development/qstile/DevelopmentTileConfigFragment.java b/src/com/android/settings/development/qstile/DevelopmentTileConfigFragment.java
new file mode 100644
index 0000000..ca4181e
--- /dev/null
+++ b/src/com/android/settings/development/qstile/DevelopmentTileConfigFragment.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.development.qstile;
+
+import android.content.Context;
+
+import com.android.internal.logging.nano.MetricsProto;
+import com.android.settings.R;
+import com.android.settings.dashboard.DashboardFragment;
+import com.android.settingslib.core.AbstractPreferenceController;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class DevelopmentTileConfigFragment extends DashboardFragment {
+    private static final String TAG = "DevelopmentTileConfig";
+
+    @Override
+    protected String getLogTag() {
+        return TAG;
+    }
+
+    @Override
+    protected int getPreferenceScreenResId() {
+        return R.xml.development_tile_settings;
+    }
+
+    @Override
+    protected List<AbstractPreferenceController> getPreferenceControllers(Context context) {
+        final List<AbstractPreferenceController> controllers = new ArrayList<>();
+        controllers.add(new DevelopmentTilePreferenceController(context));
+        return controllers;
+    }
+
+    @Override
+    public int getMetricsCategory() {
+        return MetricsProto.MetricsEvent.DEVELOPMENT_QS_TILE_CONFIG;
+    }
+}
diff --git a/src/com/android/settings/development/qstile/DevelopmentTilePreferenceController.java b/src/com/android/settings/development/qstile/DevelopmentTilePreferenceController.java
new file mode 100644
index 0000000..083a719
--- /dev/null
+++ b/src/com/android/settings/development/qstile/DevelopmentTilePreferenceController.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.development.qstile;
+
+import android.content.ComponentName;
+import android.content.Context;
+import android.content.Intent;
+import android.content.pm.PackageManager;
+import android.content.pm.ResolveInfo;
+import android.content.pm.ServiceInfo;
+import android.service.quicksettings.TileService;
+import android.support.v14.preference.SwitchPreference;
+import android.support.v7.preference.Preference;
+import android.support.v7.preference.PreferenceScreen;
+
+import com.android.settingslib.core.AbstractPreferenceController;
+
+import java.util.List;
+
+public class DevelopmentTilePreferenceController extends AbstractPreferenceController {
+
+    private final OnChangeHandler mOnChangeHandler;
+    private final PackageManager mPackageManager;
+
+    public DevelopmentTilePreferenceController(Context context) {
+        super(context);
+        mOnChangeHandler = new OnChangeHandler(context);
+        mPackageManager = context.getPackageManager();
+    }
+
+    @Override
+    public boolean isAvailable() {
+        return true;
+    }
+
+    @Override
+    public String getPreferenceKey() {
+        return null;
+    }
+
+    @Override
+    public void displayPreference(PreferenceScreen screen) {
+        super.displayPreference(screen);
+        Context context = screen.getContext();
+        Intent intent = new Intent(TileService.ACTION_QS_TILE)
+                .setPackage(context.getPackageName());
+        final List<ResolveInfo> resolveInfos = mPackageManager.queryIntentServices(intent,
+                PackageManager.MATCH_DISABLED_COMPONENTS);
+        for (ResolveInfo info : resolveInfos) {
+            ServiceInfo sInfo = info.serviceInfo;
+            final int enabledSetting = mPackageManager.getComponentEnabledSetting(
+                    new ComponentName(sInfo.packageName, sInfo.name));
+            boolean checked = enabledSetting == PackageManager.COMPONENT_ENABLED_STATE_ENABLED
+                    || ((enabledSetting == PackageManager.COMPONENT_ENABLED_STATE_DEFAULT)
+                    && sInfo.enabled);
+
+            SwitchPreference preference = new SwitchPreference(context);
+            preference.setTitle(sInfo.loadLabel(mPackageManager));
+            preference.setIcon(sInfo.icon);
+            preference.setKey(sInfo.name);
+            preference.setChecked(checked);
+            preference.setOnPreferenceChangeListener(mOnChangeHandler);
+            screen.addPreference(preference);
+        }
+    }
+
+    private static class OnChangeHandler implements Preference.OnPreferenceChangeListener {
+
+        private final Context mContext;
+        private final PackageManager mPackageManager;
+
+        public OnChangeHandler(Context context) {
+            mContext = context;
+            mPackageManager = context.getPackageManager();
+        }
+
+        @Override
+        public boolean onPreferenceChange(Preference preference, Object newValue) {
+            ComponentName cn = new ComponentName(
+                    mContext.getPackageName(), preference.getKey());
+            mPackageManager.setComponentEnabledSetting(cn, (Boolean) newValue
+                            ? PackageManager.COMPONENT_ENABLED_STATE_ENABLED
+                            : PackageManager.COMPONENT_ENABLED_STATE_DISABLED,
+                    PackageManager.DONT_KILL_APP);
+            return true;
+        }
+    }
+}
diff --git a/src/com/android/settings/development/qstile/DevelopmentTiles.java b/src/com/android/settings/development/qstile/DevelopmentTiles.java
new file mode 100644
index 0000000..bc3fcb5
--- /dev/null
+++ b/src/com/android/settings/development/qstile/DevelopmentTiles.java
@@ -0,0 +1,134 @@
+/*
+ * 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.development.qstile;
+
+import android.os.RemoteException;
+import android.os.SystemProperties;
+import android.provider.Settings;
+import android.service.quicksettings.Tile;
+import android.service.quicksettings.TileService;
+import android.view.IWindowManager;
+import android.view.ThreadedRenderer;
+import android.view.View;
+import android.view.WindowManagerGlobal;
+
+import com.android.internal.app.LocalePicker;
+import com.android.settingslib.development.SystemPropPoker;
+
+public abstract class DevelopmentTiles extends TileService {
+
+    protected abstract boolean isEnabled();
+
+    protected abstract void setIsEnabled(boolean isEnabled);
+
+    @Override
+    public void onStartListening() {
+        super.onStartListening();
+        refresh();
+    }
+
+    public void refresh() {
+        getQsTile().setState(isEnabled() ? Tile.STATE_ACTIVE : Tile.STATE_INACTIVE);
+        getQsTile().updateTile();
+    }
+
+    @Override
+    public void onClick() {
+        setIsEnabled(getQsTile().getState() == Tile.STATE_INACTIVE);
+        SystemPropPoker.getInstance().poke(); // Settings app magic
+        refresh();
+    }
+
+    /**
+     * Tile to control the "Show layout bounds" developer setting
+     */
+    public static class ShowLayout extends DevelopmentTiles {
+
+        @Override
+        protected boolean isEnabled() {
+            return SystemProperties.getBoolean(View.DEBUG_LAYOUT_PROPERTY, false);
+        }
+
+        @Override
+        protected void setIsEnabled(boolean isEnabled) {
+            SystemProperties.set(View.DEBUG_LAYOUT_PROPERTY, isEnabled ? "true" : "false");
+        }
+    }
+
+    /**
+     * Tile to control the "GPU profiling" developer setting
+     */
+    public static class GPUProfiling extends DevelopmentTiles {
+
+        @Override
+        protected boolean isEnabled() {
+            final String value = SystemProperties.get(ThreadedRenderer.PROFILE_PROPERTY);
+            return value.equals("visual_bars");
+        }
+
+        @Override
+        protected void setIsEnabled(boolean isEnabled) {
+            SystemProperties.set(ThreadedRenderer.PROFILE_PROPERTY, isEnabled ? "visual_bars" : "");
+        }
+    }
+
+    /**
+     * Tile to control the "Force RTL" developer setting
+     */
+    public static class ForceRTL extends DevelopmentTiles {
+
+        @Override
+        protected boolean isEnabled() {
+            return Settings.Global.getInt(
+                    getContentResolver(), Settings.Global.DEVELOPMENT_FORCE_RTL, 0) != 0;
+        }
+
+        @Override
+        protected void setIsEnabled(boolean isEnabled) {
+            Settings.Global.putInt(
+                    getContentResolver(), Settings.Global.DEVELOPMENT_FORCE_RTL, isEnabled ? 1 : 0);
+            SystemProperties.set(Settings.Global.DEVELOPMENT_FORCE_RTL, isEnabled ? "1" : "0");
+            LocalePicker.updateLocales(getResources().getConfiguration().getLocales());
+        }
+    }
+
+    /**
+     * Tile to control the "Animation speed" developer setting
+     */
+    public static class AnimationSpeed extends DevelopmentTiles {
+
+        @Override
+        protected boolean isEnabled() {
+            IWindowManager wm = WindowManagerGlobal.getWindowManagerService();
+            try {
+                return wm.getAnimationScale(0) != 1;
+            } catch (RemoteException e) { }
+            return false;
+        }
+
+        @Override
+        protected void setIsEnabled(boolean isEnabled) {
+            IWindowManager wm = WindowManagerGlobal.getWindowManagerService();
+            float scale = isEnabled ? 10 : 1;
+            try {
+                wm.setAnimationScale(0, scale);
+                wm.setAnimationScale(1, scale);
+                wm.setAnimationScale(2, scale);
+            } catch (RemoteException e) { }
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/com/android/settings/deviceinfo/BasebandVersionPreferenceController.java b/src/com/android/settings/deviceinfo/BasebandVersionPreferenceController.java
index 018a068..06ed872 100644
--- a/src/com/android/settings/deviceinfo/BasebandVersionPreferenceController.java
+++ b/src/com/android/settings/deviceinfo/BasebandVersionPreferenceController.java
@@ -20,10 +20,15 @@
 import android.support.v7.preference.Preference;
 
 import com.android.settings.R;
-import com.android.settings.Utils;
 import com.android.settings.core.PreferenceControllerMixin;
+import com.android.settings.deviceinfo.firmwareversion.BasebandVersionDialogController;
+import com.android.settingslib.Utils;
 import com.android.settingslib.core.AbstractPreferenceController;
 
+/**
+ * deprecated in favor of {@link BasebandVersionDialogController}
+ */
+@Deprecated
 public class BasebandVersionPreferenceController extends AbstractPreferenceController implements
         PreferenceControllerMixin {
 
diff --git a/src/com/android/settings/deviceinfo/BatteryInfoPreferenceController.java b/src/com/android/settings/deviceinfo/BatteryInfoPreferenceController.java
new file mode 100644
index 0000000..b5c12f7
--- /dev/null
+++ b/src/com/android/settings/deviceinfo/BatteryInfoPreferenceController.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.deviceinfo;
+
+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 com.android.settings.Utils;
+import com.android.settings.core.PreferenceControllerMixin;
+import com.android.settings.fuelgauge.PowerUsageSummary;
+import com.android.settingslib.core.AbstractPreferenceController;
+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;
+
+/**
+ * Deprecated in About Phone V2
+ * Information in this preference is available in {@link PowerUsageSummary}
+ */
+@Deprecated
+public class BatteryInfoPreferenceController extends AbstractPreferenceController
+        implements PreferenceControllerMixin, LifecycleObserver, OnStart, OnStop {
+
+    @VisibleForTesting
+    static final IntentFilter BATTERY_INFO_RECEIVER_INTENT_FILTER =
+            new IntentFilter(Intent.ACTION_BATTERY_CHANGED);
+    @VisibleForTesting
+    static final String KEY_BATTERY_STATUS = "battery_status";
+    @VisibleForTesting
+    static final String KEY_BATTERY_LEVEL = "battery_level";
+
+    @VisibleForTesting
+    BroadcastReceiver mBatteryInfoReceiver;
+    private Preference mBatteryStatus;
+    private Preference mBatteryLevel;
+
+
+    public BatteryInfoPreferenceController(Context context, Lifecycle lifecycle) {
+        super(context);
+        mBatteryInfoReceiver = new BatteryInfoReceiver(context);
+        if (lifecycle != null) {
+            lifecycle.addObserver(this);
+        }
+    }
+
+    @Override
+    public boolean isAvailable() {
+        return true;
+    }
+
+    @Override
+    public String getPreferenceKey() {
+        return null;
+    }
+
+    @Override
+    public void displayPreference(PreferenceScreen screen) {
+        super.displayPreference(screen);
+        mBatteryLevel = screen.findPreference(KEY_BATTERY_LEVEL);
+        mBatteryStatus = screen.findPreference(KEY_BATTERY_STATUS);
+    }
+
+    @Override
+    public void onStart() {
+        mContext.registerReceiver(mBatteryInfoReceiver, BATTERY_INFO_RECEIVER_INTENT_FILTER);
+    }
+
+    @Override
+    public void onStop() {
+        mContext.unregisterReceiver(mBatteryInfoReceiver);
+    }
+
+    private class BatteryInfoReceiver extends BroadcastReceiver {
+
+        private final Context mContext;
+
+        public BatteryInfoReceiver(Context context) {
+            mContext = context;
+        }
+
+        @Override
+        public void onReceive(Context context, Intent intent) {
+            String action = intent.getAction();
+            if (Intent.ACTION_BATTERY_CHANGED.equals(action)) {
+                mBatteryLevel.setSummary(Utils.getBatteryPercentage(intent));
+                mBatteryStatus.setSummary(Utils.getBatteryStatus(mContext.getResources(), intent));
+            }
+        }
+    }
+}
diff --git a/src/com/android/settings/deviceinfo/BluetoothAddressPreferenceController.java b/src/com/android/settings/deviceinfo/BluetoothAddressPreferenceController.java
new file mode 100644
index 0000000..431ead5
--- /dev/null
+++ b/src/com/android/settings/deviceinfo/BluetoothAddressPreferenceController.java
@@ -0,0 +1,35 @@
+/*
+ * Copyright (C) 2017 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.deviceinfo;
+
+import android.content.Context;
+
+import com.android.settings.core.PreferenceControllerMixin;
+import com.android.settingslib.core.lifecycle.Lifecycle;
+import com.android.settingslib.deviceinfo.AbstractBluetoothAddressPreferenceController;
+
+/**
+ * Concrete subclass of bluetooth address preference controller
+ */
+public class BluetoothAddressPreferenceController extends
+        AbstractBluetoothAddressPreferenceController implements PreferenceControllerMixin {
+    public BluetoothAddressPreferenceController(Context context, Lifecycle lifecycle) {
+        super(context, lifecycle);
+    }
+
+    // This space intentionally left blank
+}
diff --git a/src/com/android/settings/deviceinfo/BuildNumberPreferenceController.java b/src/com/android/settings/deviceinfo/BuildNumberPreferenceController.java
index a25bb53..2641f5d 100644
--- a/src/com/android/settings/deviceinfo/BuildNumberPreferenceController.java
+++ b/src/com/android/settings/deviceinfo/BuildNumberPreferenceController.java
@@ -35,8 +35,6 @@
 import com.android.settings.Utils;
 import com.android.settings.core.PreferenceControllerMixin;
 import com.android.settings.core.instrumentation.MetricsFeatureProvider;
-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;
@@ -44,6 +42,7 @@
 import com.android.settingslib.core.lifecycle.Lifecycle;
 import com.android.settingslib.core.lifecycle.LifecycleObserver;
 import com.android.settingslib.core.lifecycle.events.OnResume;
+import com.android.settingslib.development.DevelopmentSettingsEnabler;
 
 public class BuildNumberPreferenceController extends AbstractPreferenceController implements
         PreferenceControllerMixin, LifecycleObserver, OnResume {
@@ -106,9 +105,8 @@
                 mContext, UserManager.DISALLOW_DEBUGGING_FEATURES, UserHandle.myUserId());
         mDebuggingFeaturesDisallowedBySystem = RestrictedLockUtils.hasBaseUserRestriction(
                 mContext, UserManager.DISALLOW_DEBUGGING_FEATURES, UserHandle.myUserId());
-        mDevHitCountdown = mContext.getSharedPreferences(DevelopmentSettings.PREF_FILE,
-                Context.MODE_PRIVATE).getBoolean(DevelopmentSettings.PREF_SHOW,
-                android.os.Build.TYPE.equals("eng")) ? -1 : TAPS_TO_BE_A_DEVELOPER;
+        mDevHitCountdown = DevelopmentSettingsEnabler.isDevelopmentSettingsEnabled(mContext)
+                ? -1 : TAPS_TO_BE_A_DEVELOPER;
         mDevHitToast = null;
     }
 
@@ -215,18 +213,12 @@
     private void enableDevelopmentSettings() {
         mDevHitCountdown = 0;
         mProcessingLastDevHit = false;
-        DevelopmentSettingsEnabler.enableDevelopmentSettings(mContext,
-                mContext.getSharedPreferences(DevelopmentSettings.PREF_FILE,
-                        Context.MODE_PRIVATE));
+        DevelopmentSettingsEnabler.setDevelopmentSettingsEnabled(mContext, true);
         if (mDevHitToast != null) {
             mDevHitToast.cancel();
         }
         mDevHitToast = Toast.makeText(mContext, R.string.show_dev_on,
                 Toast.LENGTH_LONG);
         mDevHitToast.show();
-        // This is good time to index the Developer Options
-        FeatureFactory.getFactory(mContext).getSearchFeatureProvider().getIndexingManager(mContext)
-                .updateFromClassNameResource(DevelopmentSettings.class.getName(),
-                        true /* includeInSearchResults */);
     }
 }
diff --git a/src/com/android/settings/deviceinfo/DeviceModelPreferenceController.java b/src/com/android/settings/deviceinfo/DeviceModelPreferenceController.java
index f1dc415..89df7cc 100644
--- a/src/com/android/settings/deviceinfo/DeviceModelPreferenceController.java
+++ b/src/com/android/settings/deviceinfo/DeviceModelPreferenceController.java
@@ -21,7 +21,10 @@
 import android.support.v7.preference.Preference;
 import android.support.v7.preference.PreferenceScreen;
 import android.text.TextUtils;
+import android.util.FeatureFlagUtils;
 
+import com.android.settings.R;
+import com.android.settings.core.FeatureFlags;
 import com.android.settings.core.PreferenceControllerMixin;
 import com.android.settingslib.DeviceInfoUtils;
 import com.android.settingslib.core.AbstractPreferenceController;
@@ -48,7 +51,12 @@
         super.displayPreference(screen);
         final Preference pref = screen.findPreference(KEY_DEVICE_MODEL);
         if (pref != null) {
-            pref.setSummary(getDeviceModel());
+            if (FeatureFlagUtils.isEnabled(mContext, FeatureFlags.DEVICE_INFO_V2) || true) {
+                pref.setSummary(mContext.getResources().getString(R.string.model_summary,
+                        getDeviceModel()));
+            } else {
+                pref.setSummary(getDeviceModel());
+            }
         }
     }
 
diff --git a/src/com/android/settings/deviceinfo/FirmwareVersionPreferenceController.java b/src/com/android/settings/deviceinfo/FirmwareVersionPreferenceController.java
index fd73ed5..8c9a2f1 100644
--- a/src/com/android/settings/deviceinfo/FirmwareVersionPreferenceController.java
+++ b/src/com/android/settings/deviceinfo/FirmwareVersionPreferenceController.java
@@ -27,13 +27,17 @@
 import android.util.Log;
 
 import com.android.settings.core.PreferenceControllerMixin;
+import com.android.settings.deviceinfo.firmwareversion.FirmwareVersionPreferenceControllerV2;
 import com.android.settingslib.RestrictedLockUtils;
 import com.android.settingslib.core.AbstractPreferenceController;
 import com.android.settingslib.core.lifecycle.Lifecycle;
 import com.android.settingslib.core.lifecycle.LifecycleObserver;
 import com.android.settingslib.core.lifecycle.events.OnResume;
 
-
+/**
+ * deprecated in favor of {@link FirmwareVersionPreferenceControllerV2}
+ */
+@Deprecated
 public class FirmwareVersionPreferenceController extends AbstractPreferenceController implements
         PreferenceControllerMixin, LifecycleObserver, OnResume {
 
diff --git a/src/com/android/settings/deviceinfo/HardwareInfoDialogFragment.java b/src/com/android/settings/deviceinfo/HardwareInfoDialogFragment.java
index 60082c7..d1c6447 100644
--- a/src/com/android/settings/deviceinfo/HardwareInfoDialogFragment.java
+++ b/src/com/android/settings/deviceinfo/HardwareInfoDialogFragment.java
@@ -18,16 +18,19 @@
 
 import android.app.AlertDialog;
 import android.app.Dialog;
+import android.os.Build;
 import android.os.Bundle;
 import android.os.SystemProperties;
 import android.support.annotation.VisibleForTesting;
 import android.text.TextUtils;
+import android.util.FeatureFlagUtils;
 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.core.FeatureFlags;
 import com.android.settings.core.instrumentation.InstrumentedDialogFragment;
 
 public class HardwareInfoDialogFragment extends InstrumentedDialogFragment {
@@ -54,6 +57,15 @@
         // Model
         setText(content, R.id.model_label, R.id.model_value,
                 DeviceModelPreferenceController.getDeviceModel());
+
+        // Serial number
+        if (FeatureFlagUtils.isEnabled(getContext(), FeatureFlags.DEVICE_INFO_V2) || true) {
+            setText(content, R.id.serial_number_label, R.id.serial_number_value, getSerialNumber());
+        } else {
+            content.findViewById(R.id.serial_number_label).setVisibility(View.GONE);
+            content.findViewById(R.id.serial_number_value).setVisibility(View.GONE);
+        }
+
         // Hardware rev
         setText(content, R.id.hardware_rev_label, R.id.hardware_rev_value,
                 SystemProperties.get("ro.boot.hardware.revision"));
@@ -61,7 +73,7 @@
         return builder.setView(content).create();
     }
 
-    @VisibleForTesting(otherwise = VisibleForTesting.PRIVATE)
+    @VisibleForTesting
     void setText(View content, int labelViewId, int valueViewId, String value) {
         if (content == null) {
             return;
@@ -77,4 +89,9 @@
             valueView.setVisibility(View.GONE);
         }
     }
+
+    @VisibleForTesting
+    String getSerialNumber() {
+        return Build.getSerial();
+    }
 }
diff --git a/src/com/android/settings/deviceinfo/ImeiInfoPreferenceController.java b/src/com/android/settings/deviceinfo/ImeiInfoPreferenceController.java
new file mode 100644
index 0000000..456dbfc
--- /dev/null
+++ b/src/com/android/settings/deviceinfo/ImeiInfoPreferenceController.java
@@ -0,0 +1,42 @@
+/*
+ * Copyright (C) 2017 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.deviceinfo;
+
+import android.content.Context;
+
+import com.android.settings.core.PreferenceControllerMixin;
+import com.android.settings.deviceinfo.imei.ImeiInfoPreferenceControllerV2;
+import com.android.settingslib.deviceinfo.AbstractSimStatusImeiInfoPreferenceController;
+
+/**
+ * deprecated in favour of {@link ImeiInfoPreferenceControllerV2}
+ */
+@Deprecated
+public class ImeiInfoPreferenceController extends AbstractSimStatusImeiInfoPreferenceController
+        implements PreferenceControllerMixin {
+
+    private static final String KEY_IMEI_INFO = "imei_info";
+
+    public ImeiInfoPreferenceController(Context context) {
+        super(context);
+    }
+
+    @Override
+    public String getPreferenceKey() {
+        return KEY_IMEI_INFO;
+    }
+}
diff --git a/src/com/android/settings/deviceinfo/ImeiInformation.java b/src/com/android/settings/deviceinfo/ImeiInformation.java
index 9d4602b..9f38f1b 100644
--- a/src/com/android/settings/deviceinfo/ImeiInformation.java
+++ b/src/com/android/settings/deviceinfo/ImeiInformation.java
@@ -22,7 +22,6 @@
 import android.telephony.SubscriptionManager;
 import android.telephony.TelephonyManager;
 import android.text.Spannable;
-import android.text.SpannableString;
 import android.text.SpannableStringBuilder;
 import android.text.Spanned;
 import android.text.TextUtils;
@@ -34,7 +33,12 @@
 import com.android.internal.telephony.PhoneFactory;
 import com.android.settings.R;
 import com.android.settings.SettingsPreferenceFragment;
+import com.android.settings.deviceinfo.imei.ImeiInfoPreferenceControllerV2;
 
+/**
+ * deprecated in favor of {@link ImeiInfoPreferenceControllerV2}
+ */
+@Deprecated
 public class ImeiInformation extends SettingsPreferenceFragment {
 
     private static final String KEY_PRL_VERSION = "prl_version";
diff --git a/src/com/android/settings/deviceinfo/ImsStatusPreferenceController.java b/src/com/android/settings/deviceinfo/ImsStatusPreferenceController.java
new file mode 100644
index 0000000..07bd4a6
--- /dev/null
+++ b/src/com/android/settings/deviceinfo/ImsStatusPreferenceController.java
@@ -0,0 +1,36 @@
+/*
+ * Copyright (C) 2017 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.deviceinfo;
+
+import android.content.Context;
+
+import com.android.settings.core.PreferenceControllerMixin;
+import com.android.settingslib.core.lifecycle.Lifecycle;
+import com.android.settingslib.deviceinfo.AbstractImsStatusPreferenceController;
+
+/**
+ * Concrete subclass of IMS status preference controller
+ */
+public class ImsStatusPreferenceController extends AbstractImsStatusPreferenceController
+        implements PreferenceControllerMixin {
+    public ImsStatusPreferenceController(Context context,
+            Lifecycle lifecycle) {
+        super(context, lifecycle);
+    }
+
+    // This space intentionally left blank
+}
diff --git a/src/com/android/settings/deviceinfo/IpAddressPreferenceController.java b/src/com/android/settings/deviceinfo/IpAddressPreferenceController.java
new file mode 100644
index 0000000..f4e2f8c
--- /dev/null
+++ b/src/com/android/settings/deviceinfo/IpAddressPreferenceController.java
@@ -0,0 +1,35 @@
+/*
+ * Copyright (C) 2017 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.deviceinfo;
+
+import android.content.Context;
+
+import com.android.settings.core.PreferenceControllerMixin;
+import com.android.settingslib.core.lifecycle.Lifecycle;
+import com.android.settingslib.deviceinfo.AbstractIpAddressPreferenceController;
+
+/**
+ * Concrete subclass of IP address preference controller
+ */
+public class IpAddressPreferenceController extends AbstractIpAddressPreferenceController implements
+        PreferenceControllerMixin {
+    public IpAddressPreferenceController(Context context, Lifecycle lifecycle) {
+        super(context, lifecycle);
+    }
+
+    // This space intentionally left blank
+}
diff --git a/src/com/android/settings/deviceinfo/KernelVersionPreferenceController.java b/src/com/android/settings/deviceinfo/KernelVersionPreferenceController.java
index 5afed9c..f3b98ed 100644
--- a/src/com/android/settings/deviceinfo/KernelVersionPreferenceController.java
+++ b/src/com/android/settings/deviceinfo/KernelVersionPreferenceController.java
@@ -39,7 +39,7 @@
     @Override
     public void updateState(Preference preference) {
         super.updateState(preference);
-        preference.setSummary(DeviceInfoUtils.getFormattedKernelVersion());
+        preference.setSummary(DeviceInfoUtils.getFormattedKernelVersion(mContext));
     }
 
     @Override
diff --git a/src/com/android/settings/deviceinfo/PhoneNumberPreferenceController.java b/src/com/android/settings/deviceinfo/PhoneNumberPreferenceController.java
new file mode 100644
index 0000000..802d774
--- /dev/null
+++ b/src/com/android/settings/deviceinfo/PhoneNumberPreferenceController.java
@@ -0,0 +1,130 @@
+/*
+ * Copyright (C) 2017 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.deviceinfo;
+
+import android.content.Context;
+import android.support.annotation.VisibleForTesting;
+import android.support.v7.preference.Preference;
+import android.support.v7.preference.PreferenceScreen;
+import android.telephony.SubscriptionInfo;
+import android.telephony.SubscriptionManager;
+import android.telephony.TelephonyManager;
+import android.text.TextUtils;
+
+import com.android.settings.R;
+import com.android.settings.core.PreferenceControllerMixin;
+import com.android.settingslib.DeviceInfoUtils;
+import com.android.settingslib.core.AbstractPreferenceController;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class PhoneNumberPreferenceController extends AbstractPreferenceController implements
+        PreferenceControllerMixin {
+
+    private final static String KEY_PHONE_NUMBER = "phone_number";
+
+    private final TelephonyManager mTelephonyManager;
+    private final SubscriptionManager mSubscriptionManager;
+    private final List<Preference> mPreferenceList = new ArrayList<>();
+
+    public PhoneNumberPreferenceController(Context context) {
+        super(context);
+        mTelephonyManager = (TelephonyManager) context.getSystemService(Context.TELEPHONY_SERVICE);
+        mSubscriptionManager = (SubscriptionManager) context.getSystemService(
+                Context.TELEPHONY_SUBSCRIPTION_SERVICE);
+    }
+
+    @Override
+    public String getPreferenceKey() {
+        return KEY_PHONE_NUMBER;
+    }
+
+    @Override
+    public boolean isAvailable() {
+        return true;
+    }
+
+    @Override
+    public void displayPreference(PreferenceScreen screen) {
+        super.displayPreference(screen);
+        final Preference preference = screen.findPreference(getPreferenceKey());
+        mPreferenceList.add(preference);
+
+        final int phonePreferenceOrder = preference.getOrder();
+        // Add additional preferences for each sim in the device
+        for (int simSlotNumber = 1; simSlotNumber < mTelephonyManager.getPhoneCount();
+                simSlotNumber++) {
+            final Preference multiSimPreference = createNewPreference(screen.getContext());
+            multiSimPreference.setOrder(phonePreferenceOrder + simSlotNumber);
+            multiSimPreference.setKey(KEY_PHONE_NUMBER + simSlotNumber);
+            screen.addPreference(multiSimPreference);
+            mPreferenceList.add(multiSimPreference);
+        }
+    }
+
+    @Override
+    public void updateState(Preference preference) {
+        for (int simSlotNumber = 0; simSlotNumber < mPreferenceList.size(); simSlotNumber++) {
+            final Preference simStatusPreference = mPreferenceList.get(simSlotNumber);
+            simStatusPreference.setTitle(getPreferenceTitle(simSlotNumber));
+            simStatusPreference.setSummary(getPhoneNumber(simSlotNumber));
+        }
+    }
+
+    private CharSequence getPhoneNumber(int simSlot) {
+        final SubscriptionInfo subscriptionInfo = getSubscriptionInfo(simSlot);
+        if (subscriptionInfo == null) {
+            return mContext.getString(R.string.device_info_default);
+        }
+
+        return getFormattedPhoneNumber(subscriptionInfo);
+    }
+
+    private CharSequence getPreferenceTitle(int simSlot) {
+        return mTelephonyManager.getPhoneCount() > 1 ? mContext.getString(
+                R.string.status_number_sim_slot, simSlot + 1) : mContext.getString(
+                R.string.status_number);
+    }
+
+    @VisibleForTesting
+    SubscriptionInfo getSubscriptionInfo(int simSlot) {
+        final List<SubscriptionInfo> subscriptionInfoList =
+                mSubscriptionManager.getActiveSubscriptionInfoList();
+        if (subscriptionInfoList != null) {
+            for (SubscriptionInfo info : subscriptionInfoList) {
+                if (info.getSimSlotIndex() == simSlot) {
+                    return info;
+                }
+            }
+        }
+        return null;
+    }
+
+    @VisibleForTesting
+    CharSequence getFormattedPhoneNumber(SubscriptionInfo subscriptionInfo) {
+        final String phoneNumber = DeviceInfoUtils.getFormattedPhoneNumber(mContext,
+                subscriptionInfo);
+        return TextUtils.isEmpty(phoneNumber) ? mContext.getString(R.string.device_info_default)
+                : phoneNumber;
+    }
+
+    @VisibleForTesting
+    Preference createNewPreference(Context context) {
+        return new Preference(context);
+    }
+}
diff --git a/src/com/android/settings/deviceinfo/PrivateVolumeOptionMenuController.java b/src/com/android/settings/deviceinfo/PrivateVolumeOptionMenuController.java
index 88b9487..6047f8c 100644
--- a/src/com/android/settings/deviceinfo/PrivateVolumeOptionMenuController.java
+++ b/src/com/android/settings/deviceinfo/PrivateVolumeOptionMenuController.java
@@ -24,12 +24,12 @@
 import android.view.MenuItem;
 
 import com.android.settings.R;
-import com.android.settings.applications.PackageManagerWrapper;
 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 com.android.settingslib.wrapper.PackageManagerWrapper;
 
 import java.util.Objects;
 
diff --git a/src/com/android/settings/deviceinfo/PrivateVolumeSettings.java b/src/com/android/settings/deviceinfo/PrivateVolumeSettings.java
index 04da586..f3ef4c7 100644
--- a/src/com/android/settings/deviceinfo/PrivateVolumeSettings.java
+++ b/src/com/android/settings/deviceinfo/PrivateVolumeSettings.java
@@ -19,7 +19,6 @@
 import android.app.AlertDialog;
 import android.app.Dialog;
 import android.app.Fragment;
-import android.content.ActivityNotFoundException;
 import android.content.Context;
 import android.content.DialogInterface;
 import android.content.Intent;
@@ -57,7 +56,7 @@
 import com.android.settings.Settings.StorageUseActivity;
 import com.android.settings.SettingsPreferenceFragment;
 import com.android.settings.Utils;
-import com.android.settings.applications.ManageApplications;
+import com.android.settings.applications.manageapplications.ManageApplications;
 import com.android.settings.core.instrumentation.InstrumentedDialogFragment;
 import com.android.settings.deviceinfo.StorageSettings.MountTask;
 import com.android.settingslib.deviceinfo.StorageMeasurement;
diff --git a/src/com/android/settings/deviceinfo/SELinuxStatusPreferenceController.java b/src/com/android/settings/deviceinfo/SELinuxStatusPreferenceController.java
deleted file mode 100644
index 058992f..0000000
--- a/src/com/android/settings/deviceinfo/SELinuxStatusPreferenceController.java
+++ /dev/null
@@ -1,65 +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.deviceinfo;
-
-import android.content.Context;
-import android.os.SELinux;
-import android.os.SystemProperties;
-import android.support.v7.preference.Preference;
-import android.support.v7.preference.PreferenceScreen;
-import android.text.TextUtils;
-
-import com.android.settings.R;
-import com.android.settings.core.PreferenceControllerMixin;
-import com.android.settingslib.core.AbstractPreferenceController;
-
-public class SELinuxStatusPreferenceController extends AbstractPreferenceController implements
-        PreferenceControllerMixin {
-
-    private static final String PROPERTY_SELINUX_STATUS = "ro.build.selinux";
-    private static final String KEY_SELINUX_STATUS = "selinux_status";
-
-    public SELinuxStatusPreferenceController(Context context) {
-        super(context);
-    }
-
-    @Override
-    public boolean isAvailable() {
-        return !TextUtils.isEmpty(SystemProperties.get(PROPERTY_SELINUX_STATUS));
-    }
-
-    @Override
-    public String getPreferenceKey() {
-        return KEY_SELINUX_STATUS;
-    }
-
-    @Override
-    public void displayPreference(PreferenceScreen screen) {
-        super.displayPreference(screen);
-        final Preference pref = screen.findPreference(KEY_SELINUX_STATUS);
-        if (pref == null) {
-            return;
-        }
-        if (!SELinux.isSELinuxEnabled()) {
-            String status = mContext.getResources().getString(R.string.selinux_status_disabled);
-            pref.setSummary(status);
-        } else if (!SELinux.isSELinuxEnforced()) {
-            String status = mContext.getResources().getString(R.string.selinux_status_permissive);
-            pref.setSummary(status);
-        }
-    }
-}
-
diff --git a/src/com/android/settings/deviceinfo/SecurityPatchPreferenceController.java b/src/com/android/settings/deviceinfo/SecurityPatchPreferenceController.java
index f38602a..9b0120e 100644
--- a/src/com/android/settings/deviceinfo/SecurityPatchPreferenceController.java
+++ b/src/com/android/settings/deviceinfo/SecurityPatchPreferenceController.java
@@ -23,9 +23,14 @@
 import android.util.Log;
 
 import com.android.settings.core.PreferenceControllerMixin;
+import com.android.settings.deviceinfo.firmwareversion.SecurityPatchLevelDialogController;
 import com.android.settingslib.DeviceInfoUtils;
 import com.android.settingslib.core.AbstractPreferenceController;
 
+/**
+ * deprecated in favor of {@link SecurityPatchLevelDialogController}
+ */
+@Deprecated
 public class SecurityPatchPreferenceController extends AbstractPreferenceController implements
         PreferenceControllerMixin {
 
diff --git a/src/com/android/settings/deviceinfo/SerialNumberPreferenceController.java b/src/com/android/settings/deviceinfo/SerialNumberPreferenceController.java
index b69844d..e466bbf 100644
--- a/src/com/android/settings/deviceinfo/SerialNumberPreferenceController.java
+++ b/src/com/android/settings/deviceinfo/SerialNumberPreferenceController.java
@@ -18,47 +18,22 @@
 
 import android.content.Context;
 import android.os.Build;
-import android.support.v7.preference.Preference;
-import android.support.v7.preference.PreferenceScreen;
-import android.text.TextUtils;
 
-import com.android.internal.annotations.VisibleForTesting;
 import com.android.settings.core.PreferenceControllerMixin;
-import com.android.settingslib.core.AbstractPreferenceController;
+import com.android.settingslib.deviceinfo.AbstractSerialNumberPreferenceController;
 
-public class SerialNumberPreferenceController extends AbstractPreferenceController implements
+/**
+ * Preference controller for displaying device serial number. Wraps {@link Build#getSerial()}.
+ *
+ * deprecated because this preference is no longer used in About Phone V2
+ */
+@Deprecated
+public class SerialNumberPreferenceController extends
+        AbstractSerialNumberPreferenceController implements
         PreferenceControllerMixin {
-
-    private static final String KEY_SERIAL_NUMBER = "serial_number";
-
-    private final String mSerialNumber;
-
     public SerialNumberPreferenceController(Context context) {
-        this(context, Build.getSerial());
-    }
-
-    @VisibleForTesting
-    SerialNumberPreferenceController(Context context, String serialNumber) {
         super(context);
-        mSerialNumber = serialNumber;
     }
 
-    @Override
-    public boolean isAvailable() {
-        return !TextUtils.isEmpty(mSerialNumber);
-    }
-
-    @Override
-    public void displayPreference(PreferenceScreen screen) {
-        super.displayPreference(screen);
-        final Preference pref = screen.findPreference(KEY_SERIAL_NUMBER);
-        if (pref != null) {
-            pref.setSummary(mSerialNumber);
-        }
-    }
-
-    @Override
-    public String getPreferenceKey() {
-        return KEY_SERIAL_NUMBER;
-    }
+    // This space intentionally left blank
 }
diff --git a/src/com/android/settings/deviceinfo/SimStatus.java b/src/com/android/settings/deviceinfo/SimStatus.java
index 2cc76e7..dad4419 100644
--- a/src/com/android/settings/deviceinfo/SimStatus.java
+++ b/src/com/android/settings/deviceinfo/SimStatus.java
@@ -73,7 +73,9 @@
  * # Operator info (area update info cell broadcast)
  * # Signal Strength
  *
+ * deprecated in favor of {@link com.android.settings.deviceinfo.simstatus.SimStatusDialogFragment}
  */
+@Deprecated
 public class SimStatus extends SettingsPreferenceFragment {
     private static final String TAG = "SimStatus";
 
diff --git a/src/com/android/settings/deviceinfo/SimStatusPreferenceController.java b/src/com/android/settings/deviceinfo/SimStatusPreferenceController.java
new file mode 100644
index 0000000..ca531ea5
--- /dev/null
+++ b/src/com/android/settings/deviceinfo/SimStatusPreferenceController.java
@@ -0,0 +1,42 @@
+/*
+ * Copyright (C) 2017 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.deviceinfo;
+
+import android.content.Context;
+
+import com.android.settings.core.PreferenceControllerMixin;
+import com.android.settings.deviceinfo.simstatus.SimStatusPreferenceControllerV2;
+import com.android.settingslib.deviceinfo.AbstractSimStatusImeiInfoPreferenceController;
+
+/**
+ * deprecated in favor of {@link SimStatusPreferenceControllerV2}
+ */
+@Deprecated
+public class SimStatusPreferenceController extends AbstractSimStatusImeiInfoPreferenceController
+        implements PreferenceControllerMixin {
+
+    private static final String KEY_SIM_STATUS = "sim_status";
+
+    public SimStatusPreferenceController(Context context) {
+        super(context);
+    }
+
+    @Override
+    public String getPreferenceKey() {
+        return KEY_SIM_STATUS;
+    }
+}
diff --git a/src/com/android/settings/deviceinfo/Status.java b/src/com/android/settings/deviceinfo/Status.java
index 228774f..15ad5cf 100644
--- a/src/com/android/settings/deviceinfo/Status.java
+++ b/src/com/android/settings/deviceinfo/Status.java
@@ -16,200 +16,30 @@
 
 package com.android.settings.deviceinfo;
 
-import android.bluetooth.BluetoothAdapter;
-import android.content.BroadcastReceiver;
 import android.content.Context;
-import android.content.Intent;
-import android.content.IntentFilter;
-import android.content.res.Resources;
-import android.net.ConnectivityManager;
-import android.net.wifi.WifiInfo;
-import android.net.wifi.WifiManager;
-import android.os.Bundle;
-import android.os.Handler;
-import android.os.Message;
-import android.os.PersistableBundle;
-import android.os.SystemClock;
-import android.os.SystemProperties;
-import android.os.UserManager;
 import android.provider.SearchIndexableResource;
-import android.support.v7.preference.Preference;
-import android.support.v7.preference.PreferenceScreen;
-import android.telephony.CarrierConfigManager;
-import android.telephony.SubscriptionManager;
-import android.telephony.TelephonyManager;
-import android.text.TextUtils;
 
 import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
-import com.android.internal.util.ArrayUtils;
+import com.android.settings.DeviceInfoSettings;
 import com.android.settings.R;
-import com.android.settings.SettingsPreferenceFragment;
-import com.android.settings.Utils;
+import com.android.settings.dashboard.DashboardFragment;
 import com.android.settings.search.BaseSearchIndexProvider;
-import com.android.settings.search.Indexable;
+import com.android.settingslib.core.AbstractPreferenceController;
+import com.android.settingslib.core.lifecycle.Lifecycle;
 
-import java.lang.ref.WeakReference;
+import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 
-import static android.content.Context.CONNECTIVITY_SERVICE;
-import static android.content.Context.WIFI_SERVICE;
+/**
+ * Fragment for showing device hardware info, such as MAC addresses and serial numbers
+ * Deprecated in About Phone V2
+ * Information on this page is available in {@link DeviceInfoSettings}
+ */
+@Deprecated
+public class Status extends DashboardFragment {
 
-public class Status extends SettingsPreferenceFragment implements Indexable {
-
-    private static final String KEY_BATTERY_STATUS = "battery_status";
-    private static final String KEY_BATTERY_LEVEL = "battery_level";
-    private static final String KEY_IP_ADDRESS = "wifi_ip_address";
-    private static final String KEY_WIFI_MAC_ADDRESS = "wifi_mac_address";
-    private static final String KEY_BT_ADDRESS = "bt_address";
-    private static final String KEY_WIMAX_MAC_ADDRESS = "wimax_mac_address";
-    private static final String KEY_SIM_STATUS = "sim_status";
-    private static final String KEY_IMEI_INFO = "imei_info";
-    private static final String KEY_IMS_REGISTRATION_STATE = "ims_reg_state";
-
-    // Broadcasts to listen to for connectivity changes.
-    private static final String[] CONNECTIVITY_INTENTS = {
-            BluetoothAdapter.ACTION_STATE_CHANGED,
-            ConnectivityManager.CONNECTIVITY_ACTION,
-            WifiManager.LINK_CONFIGURATION_CHANGED_ACTION,
-            WifiManager.NETWORK_STATE_CHANGED_ACTION,
-    };
-
-    private static final int EVENT_UPDATE_STATS = 500;
-
-    private static final int EVENT_UPDATE_CONNECTIVITY = 600;
-
-    private ConnectivityManager mCM;
-    private WifiManager mWifiManager;
-
-    private Resources mRes;
-
-    private String mUnavailable;
-
-    private SerialNumberPreferenceController mSerialNumberPreferenceController;
-
-    private Preference mUptime;
-    private Preference mBatteryStatus;
-    private Preference mBatteryLevel;
-    private Preference mBtAddress;
-    private Preference mIpAddress;
-    private Preference mWifiMacAddress;
-    private Preference mWimaxMacAddress;
-    private Preference mImsStatus;
-
-    private Handler mHandler;
-
-    private static class MyHandler extends Handler {
-        private WeakReference<Status> mStatus;
-
-        public MyHandler(Status activity) {
-            mStatus = new WeakReference<Status>(activity);
-        }
-
-        @Override
-        public void handleMessage(Message msg) {
-            Status status = mStatus.get();
-            if (status == null) {
-                return;
-            }
-
-            switch (msg.what) {
-                case EVENT_UPDATE_STATS:
-                    status.updateTimes();
-                    sendEmptyMessageDelayed(EVENT_UPDATE_STATS, 1000);
-                    break;
-
-                case EVENT_UPDATE_CONNECTIVITY:
-                    status.updateConnectivity();
-                    break;
-            }
-        }
-    }
-
-    private BroadcastReceiver mBatteryInfoReceiver = new BroadcastReceiver() {
-
-        @Override
-        public void onReceive(Context context, Intent intent) {
-            String action = intent.getAction();
-            if (Intent.ACTION_BATTERY_CHANGED.equals(action)) {
-                mBatteryLevel.setSummary(Utils.getBatteryPercentage(intent));
-                mBatteryStatus.setSummary(Utils.getBatteryStatus(getResources(), intent));
-            }
-        }
-    };
-
-    private IntentFilter mConnectivityIntentFilter;
-    private final BroadcastReceiver mConnectivityReceiver = new BroadcastReceiver() {
-        @Override
-        public void onReceive(Context context, Intent intent) {
-            String action = intent.getAction();
-            if (ArrayUtils.contains(CONNECTIVITY_INTENTS, action)) {
-                mHandler.sendEmptyMessage(EVENT_UPDATE_CONNECTIVITY);
-            }
-        }
-    };
-
-    private boolean hasBluetooth() {
-        return BluetoothAdapter.getDefaultAdapter() != null;
-    }
-
-    private boolean hasWimax() {
-        return  mCM.getNetworkInfo(ConnectivityManager.TYPE_WIMAX) != null;
-    }
-
-    @Override
-    public void onCreate(Bundle icicle) {
-        super.onCreate(icicle);
-
-        mHandler = new MyHandler(this);
-
-        mCM = (ConnectivityManager) getSystemService(CONNECTIVITY_SERVICE);
-        mWifiManager = (WifiManager) getSystemService(WIFI_SERVICE);
-        mSerialNumberPreferenceController = new SerialNumberPreferenceController(getActivity());
-
-        addPreferencesFromResource(R.xml.device_info_status);
-        mBatteryLevel = findPreference(KEY_BATTERY_LEVEL);
-        mBatteryStatus = findPreference(KEY_BATTERY_STATUS);
-        mBtAddress = findPreference(KEY_BT_ADDRESS);
-        mWifiMacAddress = findPreference(KEY_WIFI_MAC_ADDRESS);
-        mWimaxMacAddress = findPreference(KEY_WIMAX_MAC_ADDRESS);
-        mIpAddress = findPreference(KEY_IP_ADDRESS);
-        mImsStatus = findPreference(KEY_IMS_REGISTRATION_STATE);
-
-        mRes = getResources();
-        mUnavailable = mRes.getString(R.string.status_unavailable);
-
-        // Note - missing in zaku build, be careful later...
-        mUptime = findPreference("up_time");
-        final PreferenceScreen screen = getPreferenceScreen();
-        if (!hasBluetooth()) {
-            screen.removePreference(mBtAddress);
-            mBtAddress = null;
-        }
-
-        if (!hasWimax()) {
-            screen.removePreference(mWimaxMacAddress);
-            mWimaxMacAddress = null;
-        }
-
-        mConnectivityIntentFilter = new IntentFilter();
-        for (String intent: CONNECTIVITY_INTENTS) {
-             mConnectivityIntentFilter.addAction(intent);
-        }
-
-        updateConnectivity();
-
-        mSerialNumberPreferenceController.displayPreference(screen);
-
-        // Remove SimStatus and Imei for Secondary user as it access Phone b/19165700
-        // Also remove on Wi-Fi only devices.
-        //TODO: the bug above will surface in split system user mode.
-        if (!UserManager.get(getContext()).isAdminUser()
-                || Utils.isWifiOnly(getContext())) {
-            removePreferenceFromScreen(KEY_SIM_STATUS);
-            removePreferenceFromScreen(KEY_IMEI_INFO);
-        }
-    }
+    private static final String TAG = "DeviceStatus";
 
     @Override
     public int getMetricsCategory() {
@@ -217,123 +47,33 @@
     }
 
     @Override
-    public void onResume() {
-        super.onResume();
-        getContext().registerReceiver(mConnectivityReceiver, mConnectivityIntentFilter,
-                         android.Manifest.permission.CHANGE_NETWORK_STATE, null);
-        getContext().registerReceiver(mBatteryInfoReceiver,
-                new IntentFilter(Intent.ACTION_BATTERY_CHANGED));
-        mHandler.sendEmptyMessage(EVENT_UPDATE_STATS);
+    protected String getLogTag() {
+        return TAG;
     }
 
     @Override
-    public void onPause() {
-        super.onPause();
-
-        getContext().unregisterReceiver(mBatteryInfoReceiver);
-        getContext().unregisterReceiver(mConnectivityReceiver);
-        mHandler.removeMessages(EVENT_UPDATE_STATS);
+    protected int getPreferenceScreenResId() {
+        return R.xml.device_info_status;
     }
 
-    /**
-     * Removes the specified preference, if it exists.
-     * @param key the key for the Preference item
-     */
-    private void removePreferenceFromScreen(String key) {
-        Preference pref = findPreference(key);
-        if (pref != null) {
-            getPreferenceScreen().removePreference(pref);
-        }
+    @Override
+    protected List<AbstractPreferenceController> getPreferenceControllers(Context context) {
+        return buildPreferenceControllers(context, getLifecycle());
     }
 
-    private void setWimaxStatus() {
-        if (mWimaxMacAddress != null) {
-            String macAddress = SystemProperties.get("net.wimax.mac.address", mUnavailable);
-            mWimaxMacAddress.setSummary(macAddress);
-        }
-    }
-
-    private void setWifiStatus() {
-        WifiInfo wifiInfo = mWifiManager.getConnectionInfo();
-        boolean hasMacAddress = wifiInfo != null && wifiInfo.hasRealMacAddress();
-        String macAddress = hasMacAddress ? wifiInfo.getMacAddress() : null;
-        mWifiMacAddress.setSummary(!TextUtils.isEmpty(macAddress) ? macAddress : mUnavailable);
-    }
-
-    private void setIpAddressStatus() {
-        String ipAddress = Utils.getDefaultIpAddresses(this.mCM);
-        if (ipAddress != null) {
-            mIpAddress.setSummary(ipAddress);
-        } else {
-            mIpAddress.setSummary(mUnavailable);
-        }
-    }
-
-    private void setBtStatus() {
-        BluetoothAdapter bluetooth = BluetoothAdapter.getDefaultAdapter();
-        if (bluetooth != null && mBtAddress != null) {
-            String address = bluetooth.isEnabled() ? bluetooth.getAddress() : null;
-            if (!TextUtils.isEmpty(address)) {
-               // Convert the address to lowercase for consistency with the wifi MAC address.
-                mBtAddress.setSummary(address.toLowerCase());
-            } else {
-                mBtAddress.setSummary(mUnavailable);
-            }
-        }
-    }
-
-    private void setImsRegistrationStatus() {
-        CarrierConfigManager configManager = (CarrierConfigManager)
-                getSystemService(Context.CARRIER_CONFIG_SERVICE);
-        int subId = SubscriptionManager.getDefaultDataSubscriptionId();
-        PersistableBundle config = null;
-        if (configManager != null) {
-            config = configManager.getConfigForSubId(subId);
-        }
-        if (config != null && config.getBoolean(
-                CarrierConfigManager.KEY_SHOW_IMS_REGISTRATION_STATUS_BOOL)) {
-            TelephonyManager tm = (TelephonyManager) getSystemService(Context.TELEPHONY_SERVICE);
-            mImsStatus.setSummary((tm != null && tm.isImsRegistered(subId)) ?
-                    R.string.ims_reg_status_registered : R.string.ims_reg_status_not_registered);
-        } else {
-            removePreferenceFromScreen(KEY_IMS_REGISTRATION_STATE);
-            mImsStatus = null;
-        }
-    }
-
-    void updateConnectivity() {
-        setWimaxStatus();
-        setWifiStatus();
-        setBtStatus();
-        setIpAddressStatus();
-        setImsRegistrationStatus();
-    }
-
-    void updateTimes() {
-        long at = SystemClock.uptimeMillis() / 1000;
-        long ut = SystemClock.elapsedRealtime() / 1000;
-
-        if (ut == 0) {
-            ut = 1;
-        }
-
-        mUptime.setSummary(convert(ut));
-    }
-
-    private String pad(int n) {
-        if (n >= 10) {
-            return String.valueOf(n);
-        } else {
-            return "0" + String.valueOf(n);
-        }
-    }
-
-    private String convert(long t) {
-        int s = (int)(t % 60);
-        int m = (int)((t / 60) % 60);
-        int h = (int)((t / 3600));
-
-        return h + ":" + pad(m) + ":" + pad(s);
+    private static List<AbstractPreferenceController> buildPreferenceControllers(Context context,
+            Lifecycle lifecycle) {
+        final List<AbstractPreferenceController> controllers = new ArrayList<>();
+        controllers.add(new SerialNumberPreferenceController(context));
+        controllers.add(new UptimePreferenceController(context, lifecycle));
+        controllers.add(new BluetoothAddressPreferenceController(context, lifecycle));
+        controllers.add(new IpAddressPreferenceController(context, lifecycle));
+        controllers.add(new WifiMacAddressPreferenceController(context, lifecycle));
+        controllers.add(new ImsStatusPreferenceController(context, lifecycle));
+        controllers.add(new SimStatusPreferenceController(context));
+        controllers.add(new ImeiInfoPreferenceController(context));
+        controllers.add(new BatteryInfoPreferenceController(context, lifecycle));
+        return controllers;
     }
 
     /**
@@ -349,5 +89,11 @@
                     sir.xmlResId = R.xml.device_info_status;
                     return Arrays.asList(sir);
                 }
+
+                @Override
+                public List<AbstractPreferenceController> getPreferenceControllers(Context
+                        context) {
+                    return buildPreferenceControllers(context, null /* lifecycle */);
+                }
             };
 }
diff --git a/src/com/android/settings/deviceinfo/StorageDashboardFragment.java b/src/com/android/settings/deviceinfo/StorageDashboardFragment.java
index a63247c..341c76f 100644
--- a/src/com/android/settings/deviceinfo/StorageDashboardFragment.java
+++ b/src/com/android/settings/deviceinfo/StorageDashboardFragment.java
@@ -35,9 +35,6 @@
 import com.android.internal.logging.nano.MetricsProto;
 import com.android.settings.R;
 import com.android.settings.Utils;
-import com.android.settings.applications.PackageManagerWrapperImpl;
-import com.android.settings.applications.UserManagerWrapper;
-import com.android.settings.applications.UserManagerWrapperImpl;
 import com.android.settings.dashboard.DashboardFragment;
 import com.android.settings.deviceinfo.storage.AutomaticStorageManagementSwitchPreferenceController;
 import com.android.settings.deviceinfo.storage.CachedStorageValuesHelper;
@@ -49,10 +46,12 @@
 import com.android.settings.deviceinfo.storage.VolumeSizesLoader;
 import com.android.settings.search.BaseSearchIndexProvider;
 import com.android.settings.search.Indexable;
+import com.android.settings.wrapper.UserManagerWrapper;
 import com.android.settingslib.applications.StorageStatsSource;
 import com.android.settingslib.core.AbstractPreferenceController;
 import com.android.settingslib.deviceinfo.PrivateStorageInfo;
 import com.android.settingslib.deviceinfo.StorageManagerVolumeProvider;
+import com.android.settingslib.wrapper.PackageManagerWrapper;
 
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -95,7 +94,7 @@
     @VisibleForTesting
     void initializeOptionsMenu(Activity activity) {
         mOptionMenuController = new PrivateVolumeOptionMenuController(
-                activity, mVolume, new PackageManagerWrapperImpl(activity.getPackageManager()));
+                activity, mVolume, new PackageManagerWrapper(activity.getPackageManager()));
         getLifecycle().addObserver(mOptionMenuController);
         setHasOptionsMenu(true);
         activity.invalidateOptionsMenu();
@@ -118,7 +117,7 @@
     }
 
     @Override
-    protected int getHelpResource() {
+    public int getHelpResource() {
         return R.string.help_url_storage_dashboard;
     }
 
@@ -178,7 +177,7 @@
         controllers.add(mPreferenceController);
 
         UserManagerWrapper userManager =
-                new UserManagerWrapperImpl(context.getSystemService(UserManager.class));
+                new UserManagerWrapper(context.getSystemService(UserManager.class));
         mSecondaryUsers = SecondaryUserController.getSecondaryUserControllers(context, userManager);
         controllers.addAll(mSecondaryUsers);
 
@@ -227,7 +226,7 @@
                 public List<AbstractPreferenceController> getPreferenceControllers(Context context) {
                     final StorageManager sm = context.getSystemService(StorageManager.class);
                     final UserManagerWrapper userManager =
-                            new UserManagerWrapperImpl(context.getSystemService(UserManager.class));
+                            new UserManagerWrapper(context.getSystemService(UserManager.class));
                     final List<AbstractPreferenceController> controllers = new ArrayList<>();
                     controllers.add(new StorageSummaryDonutPreferenceController(context));
                     controllers.add(new StorageItemPreferenceController(context, null /* host */,
@@ -244,10 +243,10 @@
             Bundle args) {
         Context context = getContext();
         return new StorageAsyncLoader(context,
-                new UserManagerWrapperImpl(context.getSystemService(UserManager.class)),
+                new UserManagerWrapper(context.getSystemService(UserManager.class)),
                 mVolume.fsUuid,
                 new StorageStatsSource(context),
-                new PackageManagerWrapperImpl(context.getPackageManager()));
+                new PackageManagerWrapper(context.getPackageManager()));
     }
 
     @Override
diff --git a/src/com/android/settings/deviceinfo/StorageProfileFragment.java b/src/com/android/settings/deviceinfo/StorageProfileFragment.java
index 9f3ce0c..f2383de 100644
--- a/src/com/android/settings/deviceinfo/StorageProfileFragment.java
+++ b/src/com/android/settings/deviceinfo/StorageProfileFragment.java
@@ -30,15 +30,15 @@
 import com.android.internal.logging.nano.MetricsProto;
 import com.android.settings.R;
 import com.android.settings.Utils;
-import com.android.settings.applications.PackageManagerWrapperImpl;
-import com.android.settings.applications.UserManagerWrapperImpl;
 import com.android.settings.dashboard.DashboardFragment;
 import com.android.settings.deviceinfo.storage.StorageAsyncLoader;
 import com.android.settings.deviceinfo.storage.StorageAsyncLoader.AppsStorageResult;
 import com.android.settings.deviceinfo.storage.StorageItemPreferenceController;
+import com.android.settings.wrapper.UserManagerWrapper;
 import com.android.settingslib.applications.StorageStatsSource;
 import com.android.settingslib.core.AbstractPreferenceController;
 import com.android.settingslib.deviceinfo.StorageManagerVolumeProvider;
+import com.android.settingslib.wrapper.PackageManagerWrapper;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -116,10 +116,10 @@
     public Loader<SparseArray<AppsStorageResult>> onCreateLoader(int id, Bundle args) {
         Context context = getContext();
         return new StorageAsyncLoader(context,
-                new UserManagerWrapperImpl(context.getSystemService(UserManager.class)),
+                new UserManagerWrapper(context.getSystemService(UserManager.class)),
                 mVolume.fsUuid,
                 new StorageStatsSource(context),
-                new PackageManagerWrapperImpl(context.getPackageManager()));
+                new PackageManagerWrapper(context.getPackageManager()));
     }
 
     @Override
diff --git a/src/com/android/settings/deviceinfo/StorageSettings.java b/src/com/android/settings/deviceinfo/StorageSettings.java
index a3ed940..0f88b4a 100644
--- a/src/com/android/settings/deviceinfo/StorageSettings.java
+++ b/src/com/android/settings/deviceinfo/StorageSettings.java
@@ -16,7 +16,8 @@
 
 package com.android.settings.deviceinfo;
 
-import android.app.Activity;
+import static com.android.settingslib.RestrictedLockUtils.EnforcedAdmin;
+
 import android.app.AlertDialog;
 import android.app.Dialog;
 import android.app.Fragment;
@@ -63,8 +64,6 @@
 import java.util.Collections;
 import java.util.List;
 
-import static com.android.settingslib.RestrictedLockUtils.EnforcedAdmin;
-
 /**
  * Panel showing both internal storage (both built-in storage and private
  * volumes) and removable storage (public volumes).
@@ -101,7 +100,7 @@
     }
 
     @Override
-    protected int getHelpResource() {
+    public int getHelpResource() {
         return R.string.help_uri_storage;
     }
 
@@ -545,13 +544,7 @@
 
 
     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);
-        }
-    };
+            = (activity, summaryLoader) -> new SummaryProvider(activity, summaryLoader);
 
     /** Enable indexing of searchable data */
     public static final SearchIndexProvider SEARCH_INDEX_DATA_PROVIDER =
@@ -559,15 +552,17 @@
                 @Override
                 public List<SearchIndexableRaw> getRawDataToIndex(
                         Context context, boolean enabled) {
-                    final List<SearchIndexableRaw> result = new ArrayList<SearchIndexableRaw>();
+                    final List<SearchIndexableRaw> result = new ArrayList<>();
 
                     SearchIndexableRaw data = new SearchIndexableRaw(context);
                     data.title = context.getString(R.string.storage_settings);
+                    data.key = "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.key = "storage_settings_internal_storage";
                     data.screenTitle = context.getString(R.string.storage_settings);
                     result.add(data);
 
@@ -577,6 +572,7 @@
                     for (VolumeInfo vol : vols) {
                         if (isInteresting(vol)) {
                             data.title = storage.getBestVolumeDescription(vol);
+                            data.key = "storage_settings_volume_" +vol.id;
                             data.screenTitle = context.getString(R.string.storage_settings);
                             result.add(data);
                         }
@@ -584,36 +580,43 @@
 
                     data = new SearchIndexableRaw(context);
                     data.title = context.getString(R.string.memory_size);
+                    data.key = "storage_settings_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.key = "storage_settings_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.key = "storage_settings_apps_space";
                     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.key = "storage_settings_dcim_space";
                     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.key = "storage_settings_music_space";
                     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.key = "storage_settings_misc_space";
                     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.key = "storage_settings_free_space";
                     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;
diff --git a/src/com/android/settings/deviceinfo/StorageWizardBase.java b/src/com/android/settings/deviceinfo/StorageWizardBase.java
index c7bea30..c2ea2d2 100644
--- a/src/com/android/settings/deviceinfo/StorageWizardBase.java
+++ b/src/com/android/settings/deviceinfo/StorageWizardBase.java
@@ -16,15 +16,19 @@
 
 package com.android.settings.deviceinfo;
 
+import static com.android.settings.deviceinfo.StorageSettings.TAG;
+
 import android.annotation.LayoutRes;
 import android.app.Activity;
 import android.graphics.Color;
 import android.os.Bundle;
+import android.os.SystemClock;
 import android.os.storage.DiskInfo;
 import android.os.storage.StorageEventListener;
 import android.os.storage.StorageManager;
 import android.os.storage.VolumeInfo;
 import android.text.TextUtils;
+import android.util.Log;
 import android.view.View;
 import android.view.ViewGroup;
 import android.view.Window;
@@ -202,13 +206,27 @@
     }
 
     protected VolumeInfo findFirstVolume(int type) {
-        final List<VolumeInfo> vols = mStorage.getVolumes();
-        for (VolumeInfo vol : vols) {
-            if (Objects.equals(mDisk.getId(), vol.getDiskId()) && (vol.getType() == type)) {
-                return vol;
+        return findFirstVolume(type, 1);
+    }
+
+    protected VolumeInfo findFirstVolume(int type, int attempts) {
+        while (true) {
+            final List<VolumeInfo> vols = mStorage.getVolumes();
+            for (VolumeInfo vol : vols) {
+                if (Objects.equals(mDisk.getId(), vol.getDiskId()) && (vol.getType() == type)
+                        && (vol.getState() == VolumeInfo.STATE_MOUNTED)) {
+                    return vol;
+                }
+            }
+
+            if (--attempts > 0) {
+                Log.w(TAG, "Missing mounted volume of type " + type + " hosted by disk "
+                        + mDisk.getId() + "; trying again");
+                SystemClock.sleep(250);
+            } else {
+                return null;
             }
         }
-        return null;
     }
 
     private final StorageEventListener mStorageListener = new StorageEventListener() {
diff --git a/src/com/android/settings/deviceinfo/StorageWizardFormatProgress.java b/src/com/android/settings/deviceinfo/StorageWizardFormatProgress.java
index 59a1866..3dfc74b 100644
--- a/src/com/android/settings/deviceinfo/StorageWizardFormatProgress.java
+++ b/src/com/android/settings/deviceinfo/StorageWizardFormatProgress.java
@@ -16,15 +16,20 @@
 
 package com.android.settings.deviceinfo;
 
+import static android.os.storage.VolumeInfo.TYPE_PRIVATE;
+
+import static com.android.settings.deviceinfo.StorageSettings.TAG;
+
 import android.app.AlertDialog;
 import android.app.Dialog;
-import android.app.DialogFragment;
 import android.content.Context;
 import android.content.DialogInterface;
 import android.content.Intent;
 import android.content.pm.IPackageMoveObserver;
 import android.os.AsyncTask;
 import android.os.Bundle;
+import android.os.IVoldTaskListener;
+import android.os.PersistableBundle;
 import android.os.storage.DiskInfo;
 import android.os.storage.StorageManager;
 import android.os.storage.VolumeInfo;
@@ -38,8 +43,8 @@
 import com.android.settings.core.instrumentation.InstrumentedDialogFragment;
 
 import java.util.Objects;
-
-import static com.android.settings.deviceinfo.StorageSettings.TAG;
+import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.TimeUnit;
 
 public class StorageWizardFormatProgress extends StorageWizardBase {
     private static final String TAG_SLOW_WARNING = "slow_warning";
@@ -99,9 +104,21 @@
                     storage.partitionPrivate(activity.mDisk.getId());
                     publishProgress(40);
 
-                    final VolumeInfo privateVol = activity.findFirstVolume(VolumeInfo.TYPE_PRIVATE);
-                    mPrivateBench = storage.benchmark(privateVol.getId());
-                    mPrivateBench /= 1000000;
+                    final VolumeInfo privateVol = activity.findFirstVolume(TYPE_PRIVATE, 5);
+                    final CompletableFuture<PersistableBundle> result = new CompletableFuture<>();
+                    storage.benchmark(privateVol.getId(), new IVoldTaskListener.Stub() {
+                        @Override
+                        public void onStatus(int status, PersistableBundle extras) {
+                            // Map benchmark 0-100% progress onto 40-80%
+                            publishProgress(40 + ((status * 40) / 100));
+                        }
+
+                        @Override
+                        public void onFinished(int status, PersistableBundle extras) {
+                            result.complete(extras);
+                        }
+                    });
+                    mPrivateBench = result.get(60, TimeUnit.SECONDS).getLong("run", Long.MAX_VALUE);
 
                     // If we just adopted the device that had been providing
                     // physical storage, then automatically move storage to the
diff --git a/src/com/android/settings/deviceinfo/SystemUpdatePreferenceController.java b/src/com/android/settings/deviceinfo/SystemUpdatePreferenceController.java
index d2ad6d8..d8a64a8 100644
--- a/src/com/android/settings/deviceinfo/SystemUpdatePreferenceController.java
+++ b/src/com/android/settings/deviceinfo/SystemUpdatePreferenceController.java
@@ -15,6 +15,8 @@
  */
 package com.android.settings.deviceinfo;
 
+import static android.content.Context.CARRIER_CONFIG_SERVICE;
+
 import android.content.Context;
 import android.content.Intent;
 import android.os.Build;
@@ -31,8 +33,6 @@
 import com.android.settings.core.PreferenceControllerMixin;
 import com.android.settingslib.core.AbstractPreferenceController;
 
-import static android.content.Context.CARRIER_CONFIG_SERVICE;
-
 public class SystemUpdatePreferenceController extends AbstractPreferenceController implements
         PreferenceControllerMixin {
 
@@ -59,12 +59,11 @@
 
     @Override
     public void displayPreference(PreferenceScreen screen) {
+        super.displayPreference(screen);
         if (isAvailable()) {
             Utils.updatePreferenceToSpecificActivityOrRemove(mContext, screen,
                     KEY_SYSTEM_UPDATE_SETTINGS,
                     Utils.UPDATE_PREFERENCE_FLAG_SET_TITLE_TO_MATCHING_ACTIVITY);
-        } else {
-            removePreference(screen, KEY_SYSTEM_UPDATE_SETTINGS);
         }
     }
 
diff --git a/src/com/android/settings/deviceinfo/UptimePreferenceController.java b/src/com/android/settings/deviceinfo/UptimePreferenceController.java
new file mode 100644
index 0000000..c25f984
--- /dev/null
+++ b/src/com/android/settings/deviceinfo/UptimePreferenceController.java
@@ -0,0 +1,40 @@
+/*
+ * Copyright (C) 2017 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.deviceinfo;
+
+import android.content.Context;
+
+import com.android.settings.core.PreferenceControllerMixin;
+import com.android.settings.fuelgauge.PowerUsageSummary;
+import com.android.settingslib.core.lifecycle.Lifecycle;
+import com.android.settingslib.deviceinfo.AbstractUptimePreferenceController;
+
+/**
+ * Concrete subclass of uptime preference controller
+ *
+ * Deprecated in About Phone V2
+ * Information in this preference is available in {@link PowerUsageSummary}
+ */
+@Deprecated
+public class UptimePreferenceController extends AbstractUptimePreferenceController
+        implements PreferenceControllerMixin {
+    public UptimePreferenceController(Context context, Lifecycle lifecycle) {
+        super(context, lifecycle);
+    }
+
+    // This space intentionally left blank
+}
diff --git a/src/com/android/settings/deviceinfo/WifiMacAddressPreferenceController.java b/src/com/android/settings/deviceinfo/WifiMacAddressPreferenceController.java
new file mode 100644
index 0000000..92390d7
--- /dev/null
+++ b/src/com/android/settings/deviceinfo/WifiMacAddressPreferenceController.java
@@ -0,0 +1,35 @@
+/*
+ * Copyright (C) 2017 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.deviceinfo;
+
+import android.content.Context;
+
+import com.android.settings.core.PreferenceControllerMixin;
+import com.android.settingslib.core.lifecycle.Lifecycle;
+import com.android.settingslib.deviceinfo.AbstractWifiMacAddressPreferenceController;
+
+/**
+ * Concrete subclass of WIFI MAC address preference controller
+ */
+public class WifiMacAddressPreferenceController extends AbstractWifiMacAddressPreferenceController
+        implements PreferenceControllerMixin {
+    public WifiMacAddressPreferenceController(Context context, Lifecycle lifecycle) {
+        super(context, lifecycle);
+    }
+
+    // This space intentionally left blank
+}
diff --git a/src/com/android/settings/deviceinfo/firmwareversion/BasebandVersionDialogController.java b/src/com/android/settings/deviceinfo/firmwareversion/BasebandVersionDialogController.java
new file mode 100644
index 0000000..c857f19
--- /dev/null
+++ b/src/com/android/settings/deviceinfo/firmwareversion/BasebandVersionDialogController.java
@@ -0,0 +1,55 @@
+/*
+ * Copyright (C) 2017 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.deviceinfo.firmwareversion;
+
+import android.content.Context;
+import android.os.SystemProperties;
+import android.support.annotation.VisibleForTesting;
+
+import com.android.settings.R;
+import com.android.settings.Utils;
+
+public class BasebandVersionDialogController {
+
+    @VisibleForTesting
+    static final int BASEBAND_VERSION_LABEL_ID = R.id.baseband_version_label;
+    @VisibleForTesting
+    static final int BASEBAND_VERSION_VALUE_ID = R.id.baseband_version_value;
+    @VisibleForTesting
+    static final String BASEBAND_PROPERTY = "gsm.version.baseband";
+
+    private final FirmwareVersionDialogFragment mDialog;
+
+    public BasebandVersionDialogController(FirmwareVersionDialogFragment dialog) {
+        mDialog = dialog;
+    }
+
+    /**
+     * Updates the baseband version field of the dialog.
+     */
+    public void initialize() {
+        final Context context = mDialog.getContext();
+        if (Utils.isWifiOnly(context)) {
+            mDialog.removeSettingFromScreen(BASEBAND_VERSION_LABEL_ID);
+            mDialog.removeSettingFromScreen(BASEBAND_VERSION_VALUE_ID);
+            return;
+        }
+
+        mDialog.setText(BASEBAND_VERSION_VALUE_ID, SystemProperties.get(BASEBAND_PROPERTY,
+                context.getString(R.string.device_info_default)));
+    }
+}
diff --git a/src/com/android/settings/deviceinfo/firmwareversion/BuildNumberDialogController.java b/src/com/android/settings/deviceinfo/firmwareversion/BuildNumberDialogController.java
new file mode 100644
index 0000000..d995867
--- /dev/null
+++ b/src/com/android/settings/deviceinfo/firmwareversion/BuildNumberDialogController.java
@@ -0,0 +1,43 @@
+/*
+ * Copyright (C) 2017 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.deviceinfo.firmwareversion;
+
+import android.os.Build;
+import android.support.annotation.VisibleForTesting;
+import android.text.BidiFormatter;
+
+import com.android.settings.R;
+
+public class BuildNumberDialogController {
+
+    @VisibleForTesting
+    static final int BUILD_NUMBER_VALUE_ID = R.id.build_number_value;
+
+    private final FirmwareVersionDialogFragment mDialog;
+
+    public BuildNumberDialogController(FirmwareVersionDialogFragment dialog) {
+        mDialog = dialog;
+    }
+
+    /**
+     * Updates the build number to the dialog.
+     */
+    public void initialize() {
+        mDialog.setText(BUILD_NUMBER_VALUE_ID,
+                BidiFormatter.getInstance().unicodeWrap(Build.DISPLAY));
+    }
+}
diff --git a/src/com/android/settings/deviceinfo/firmwareversion/FirmwareVersionDialogController.java b/src/com/android/settings/deviceinfo/firmwareversion/FirmwareVersionDialogController.java
new file mode 100644
index 0000000..5794e12
--- /dev/null
+++ b/src/com/android/settings/deviceinfo/firmwareversion/FirmwareVersionDialogController.java
@@ -0,0 +1,112 @@
+/*
+ * Copyright (C) 2017 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.deviceinfo.firmwareversion;
+
+import android.content.Context;
+import android.content.Intent;
+import android.os.Build;
+import android.os.SystemClock;
+import android.os.UserHandle;
+import android.os.UserManager;
+import android.support.annotation.VisibleForTesting;
+import android.util.Log;
+import android.view.View;
+
+import com.android.settings.R;
+import com.android.settingslib.RestrictedLockUtils;
+
+public class FirmwareVersionDialogController implements View.OnClickListener {
+
+    private static final String TAG = "firmwareDialogCtrl";
+    private static final int DELAY_TIMER_MILLIS = 500;
+    private static final int ACTIVITY_TRIGGER_COUNT = 3;
+
+    @VisibleForTesting
+    static final int FIRMWARE_VERSION_VALUE_ID = R.id.firmware_version_value;
+    @VisibleForTesting
+    static final int FIRMWARE_VERSION_LABEL_ID = R.id.firmware_version_label;
+
+    private final FirmwareVersionDialogFragment mDialog;
+    private final Context mContext;
+    private final UserManager mUserManager;
+    private final long[] mHits = new long[ACTIVITY_TRIGGER_COUNT];
+
+    private RestrictedLockUtils.EnforcedAdmin mFunDisallowedAdmin;
+    private boolean mFunDisallowedBySystem;
+
+    public FirmwareVersionDialogController(FirmwareVersionDialogFragment dialog) {
+        mDialog = dialog;
+        mContext = dialog.getContext();
+        mUserManager = (UserManager) mContext.getSystemService(Context.USER_SERVICE);
+    }
+
+    @Override
+    public void onClick(View v) {
+        arrayCopy();
+        mHits[mHits.length - 1] = SystemClock.uptimeMillis();
+        if (mHits[0] >= (SystemClock.uptimeMillis() - DELAY_TIMER_MILLIS)) {
+            if (mUserManager.hasUserRestriction(UserManager.DISALLOW_FUN)) {
+                if (mFunDisallowedAdmin != null && !mFunDisallowedBySystem) {
+                    RestrictedLockUtils.sendShowAdminSupportDetailsIntent(mContext,
+                            mFunDisallowedAdmin);
+                }
+                Log.d(TAG, "Sorry, no fun for you!");
+                return;
+            }
+
+            final Intent intent = new Intent(Intent.ACTION_MAIN)
+                    .setClassName(
+                            "android", com.android.internal.app.PlatLogoActivity.class.getName());
+            try {
+                mContext.startActivity(intent);
+            } catch (Exception e) {
+                Log.e(TAG, "Unable to start activity " + intent.toString());
+            }
+        }
+    }
+
+    /**
+     * Populates the Android version field in the dialog and registers click listeners.
+     */
+    public void initialize() {
+        initializeAdminPermissions();
+        registerClickListeners();
+
+        mDialog.setText(FIRMWARE_VERSION_VALUE_ID, Build.VERSION.RELEASE);
+    }
+
+    private void registerClickListeners() {
+        mDialog.registerClickListener(FIRMWARE_VERSION_LABEL_ID, this /* listener */);
+        mDialog.registerClickListener(FIRMWARE_VERSION_VALUE_ID, this /* listener */);
+    }
+
+    /**
+     * Copies the array onto itself to remove the oldest hit.
+     */
+    @VisibleForTesting
+    void arrayCopy() {
+        System.arraycopy(mHits, 1, mHits, 0, mHits.length - 1);
+    }
+
+    @VisibleForTesting
+    void initializeAdminPermissions() {
+        mFunDisallowedAdmin = RestrictedLockUtils.checkIfRestrictionEnforced(
+                mContext, UserManager.DISALLOW_FUN, UserHandle.myUserId());
+        mFunDisallowedBySystem = RestrictedLockUtils.hasBaseUserRestriction(
+                mContext, UserManager.DISALLOW_FUN, UserHandle.myUserId());
+    }
+}
diff --git a/src/com/android/settings/deviceinfo/firmwareversion/FirmwareVersionDialogFragment.java b/src/com/android/settings/deviceinfo/firmwareversion/FirmwareVersionDialogFragment.java
new file mode 100644
index 0000000..0087444
--- /dev/null
+++ b/src/com/android/settings/deviceinfo/firmwareversion/FirmwareVersionDialogFragment.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.deviceinfo.firmwareversion;
+
+import android.app.AlertDialog;
+import android.app.Dialog;
+import android.app.Fragment;
+import android.app.FragmentManager;
+import android.os.Bundle;
+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.core.instrumentation.InstrumentedDialogFragment;
+
+public class FirmwareVersionDialogFragment extends InstrumentedDialogFragment {
+
+    private static final String TAG = "firmwareVersionDialog";
+
+    private View mRootView;
+
+    public static void show(Fragment host) {
+        final FragmentManager manager = host.getChildFragmentManager();
+        if (manager.findFragmentByTag(TAG) == null) {
+            final FirmwareVersionDialogFragment dialog = new FirmwareVersionDialogFragment();
+            dialog.show(manager, TAG);
+        }
+    }
+
+    @Override
+    public int getMetricsCategory() {
+        return MetricsProto.MetricsEvent.DIALOG_FIRMWARE_VERSION;
+    }
+
+    @Override
+    public Dialog onCreateDialog(Bundle savedInstanceState) {
+        final AlertDialog.Builder builder = new AlertDialog.Builder(getActivity())
+                .setTitle(R.string.firmware_title)
+                .setPositiveButton(android.R.string.ok, null /* listener */);
+
+        mRootView = LayoutInflater.from(getActivity()).inflate(
+                R.layout.dialog_firmware_version, null /* parent */);
+
+        initializeControllers();
+
+        return builder.setView(mRootView).create();
+    }
+
+    public void setText(int viewId, CharSequence text) {
+        final TextView view = mRootView.findViewById(viewId);
+        if (view != null) {
+            view.setText(text);
+        }
+    }
+
+    public void removeSettingFromScreen(int viewId) {
+        final View view = mRootView.findViewById(viewId);
+        if (view != null) {
+            view.setVisibility(View.GONE);
+        }
+    }
+
+    public void registerClickListener(int viewId, View.OnClickListener listener) {
+        final View view = mRootView.findViewById(viewId);
+        if (view != null) {
+            view.setOnClickListener(listener);
+        }
+    }
+
+    private void initializeControllers() {
+        new FirmwareVersionDialogController(this).initialize();
+        new SecurityPatchLevelDialogController(this).initialize();
+        new BasebandVersionDialogController(this).initialize();
+        new KernelVersionDialogController(this).initialize();
+        new BuildNumberDialogController(this).initialize();
+    }
+}
diff --git a/src/com/android/settings/deviceinfo/firmwareversion/FirmwareVersionPreferenceControllerV2.java b/src/com/android/settings/deviceinfo/firmwareversion/FirmwareVersionPreferenceControllerV2.java
new file mode 100644
index 0000000..3ce9ee1
--- /dev/null
+++ b/src/com/android/settings/deviceinfo/firmwareversion/FirmwareVersionPreferenceControllerV2.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.deviceinfo.firmwareversion;
+
+import android.app.Fragment;
+import android.content.Context;
+import android.os.Build;
+import android.support.v7.preference.Preference;
+import android.support.v7.preference.PreferenceScreen;
+import android.text.TextUtils;
+
+import com.android.settings.core.PreferenceControllerMixin;
+import com.android.settingslib.core.AbstractPreferenceController;
+
+public class FirmwareVersionPreferenceControllerV2 extends AbstractPreferenceController implements
+        PreferenceControllerMixin {
+
+    private final static String FIRMWARE_VERSION_KEY = "firmware_version";
+
+    private final Fragment mFragment;
+
+    public FirmwareVersionPreferenceControllerV2(Context context, Fragment fragment) {
+        super(context);
+
+        mFragment = fragment;
+    }
+
+
+    @Override
+    public boolean isAvailable() {
+        return true;
+    }
+
+    @Override
+    public void displayPreference(PreferenceScreen screen) {
+        super.displayPreference(screen);
+        final Preference pref = screen.findPreference(getPreferenceKey());
+        if (pref != null) {
+            pref.setSummary(Build.VERSION.RELEASE);
+        }
+    }
+
+    @Override
+    public String getPreferenceKey() {
+        return FIRMWARE_VERSION_KEY;
+    }
+
+    @Override
+    public boolean handlePreferenceTreeClick(Preference preference) {
+        if (!TextUtils.equals(preference.getKey(), getPreferenceKey())) {
+            return false;
+        }
+
+        FirmwareVersionDialogFragment.show(mFragment);
+        return true;
+    }
+}
diff --git a/src/com/android/settings/deviceinfo/firmwareversion/KernelVersionDialogController.java b/src/com/android/settings/deviceinfo/firmwareversion/KernelVersionDialogController.java
new file mode 100644
index 0000000..d583e04
--- /dev/null
+++ b/src/com/android/settings/deviceinfo/firmwareversion/KernelVersionDialogController.java
@@ -0,0 +1,42 @@
+/*
+ * Copyright (C) 2017 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.deviceinfo.firmwareversion;
+
+import android.support.annotation.VisibleForTesting;
+
+import com.android.settings.R;
+import com.android.settingslib.DeviceInfoUtils;
+
+public class KernelVersionDialogController {
+
+    @VisibleForTesting
+    static int KERNEL_VERSION_VALUE_ID = R.id.kernel_version_value;
+
+    private final FirmwareVersionDialogFragment mDialog;
+
+    public KernelVersionDialogController(FirmwareVersionDialogFragment dialog) {
+        mDialog = dialog;
+    }
+
+    /**
+     * Updates kernel version to the dialog.
+     */
+    public void initialize() {
+        mDialog.setText(KERNEL_VERSION_VALUE_ID,
+                DeviceInfoUtils.getFormattedKernelVersion(mDialog.getContext()));
+    }
+}
diff --git a/src/com/android/settings/deviceinfo/firmwareversion/SecurityPatchLevelDialogController.java b/src/com/android/settings/deviceinfo/firmwareversion/SecurityPatchLevelDialogController.java
new file mode 100644
index 0000000..01f440d
--- /dev/null
+++ b/src/com/android/settings/deviceinfo/firmwareversion/SecurityPatchLevelDialogController.java
@@ -0,0 +1,86 @@
+/*
+ * Copyright (C) 2017 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.deviceinfo.firmwareversion;
+
+import android.content.Context;
+import android.content.Intent;
+import android.net.Uri;
+import android.support.annotation.VisibleForTesting;
+import android.text.TextUtils;
+import android.util.Log;
+import android.view.View;
+
+import com.android.settings.R;
+import com.android.settingslib.DeviceInfoUtils;
+import com.android.settingslib.wrapper.PackageManagerWrapper;
+
+public class SecurityPatchLevelDialogController implements View.OnClickListener {
+
+    private static final String TAG = "SecurityPatchCtrl";
+    private static final Uri INTENT_URI_DATA = Uri.parse(
+            "https://source.android.com/security/bulletin/");
+
+    @VisibleForTesting
+    static final int SECURITY_PATCH_VALUE_ID = R.id.security_patch_level_value;
+    @VisibleForTesting
+    static final int SECURITY_PATCH_LABEL_ID = R.id.security_patch_level_label;
+
+    private final FirmwareVersionDialogFragment mDialog;
+    private final Context mContext;
+    private final PackageManagerWrapper mPackageManager;
+    private final String mCurrentPatch;
+
+    public SecurityPatchLevelDialogController(FirmwareVersionDialogFragment dialog) {
+        mDialog = dialog;
+        mContext = dialog.getContext();
+        mPackageManager = new PackageManagerWrapper(mContext.getPackageManager());
+        mCurrentPatch = DeviceInfoUtils.getSecurityPatch();
+    }
+
+    @Override
+    public void onClick(View v) {
+        final Intent intent = new Intent();
+        intent.setAction(Intent.ACTION_VIEW);
+        intent.setData(INTENT_URI_DATA);
+        if (mPackageManager.queryIntentActivities(intent, 0).isEmpty()) {
+            // Don't send out the intent to stop crash
+            Log.w(TAG, "Stop click action on " + SECURITY_PATCH_VALUE_ID + ": "
+                    + "queryIntentActivities() returns empty");
+            return;
+        }
+
+        mContext.startActivity(intent);
+    }
+
+    /**
+     * Populates the security patch level field in the dialog and registers click listeners.
+     */
+    public void initialize() {
+        if (TextUtils.isEmpty(mCurrentPatch)) {
+            mDialog.removeSettingFromScreen(SECURITY_PATCH_LABEL_ID);
+            mDialog.removeSettingFromScreen(SECURITY_PATCH_VALUE_ID);
+            return;
+        }
+        registerListeners();
+        mDialog.setText(SECURITY_PATCH_VALUE_ID, mCurrentPatch);
+    }
+
+    private void registerListeners() {
+        mDialog.registerClickListener(SECURITY_PATCH_LABEL_ID, this /* listener */);
+        mDialog.registerClickListener(SECURITY_PATCH_VALUE_ID, this /* listener */);
+    }
+}
diff --git a/src/com/android/settings/deviceinfo/imei/ImeiInfoDialogController.java b/src/com/android/settings/deviceinfo/imei/ImeiInfoDialogController.java
new file mode 100644
index 0000000..33bb1d4
--- /dev/null
+++ b/src/com/android/settings/deviceinfo/imei/ImeiInfoDialogController.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.deviceinfo.imei;
+
+import android.content.Context;
+import android.content.res.Resources;
+import android.support.annotation.NonNull;
+import android.support.annotation.VisibleForTesting;
+import android.telephony.SubscriptionInfo;
+import android.telephony.SubscriptionManager;
+import android.telephony.TelephonyManager;
+import android.text.Spannable;
+import android.text.SpannableStringBuilder;
+import android.text.Spanned;
+import android.text.TextUtils;
+import android.text.style.TtsSpan;
+
+import com.android.internal.telephony.PhoneConstants;
+import com.android.settings.R;
+
+import java.util.List;
+
+public class ImeiInfoDialogController {
+
+    @VisibleForTesting
+    static final int ID_PRL_VERSION_VALUE = R.id.prl_version_value;
+    private static final int ID_MIN_NUMBER_LABEL = R.id.min_number_label;
+    @VisibleForTesting
+    static final int ID_MIN_NUMBER_VALUE = R.id.min_number_value;
+    @VisibleForTesting
+    static final int ID_MEID_NUMBER_VALUE = R.id.meid_number_value;
+    @VisibleForTesting
+    static final int ID_IMEI_VALUE = R.id.imei_value;
+    @VisibleForTesting
+    static final int ID_IMEI_SV_VALUE = R.id.imei_sv_value;
+    @VisibleForTesting
+    static final int ID_CDMA_SETTINGS = R.id.cdma_settings;
+    @VisibleForTesting
+    static final int ID_GSM_SETTINGS = R.id.gsm_settings;
+
+    private static CharSequence getTextAsDigits(CharSequence text) {
+        if (TextUtils.isDigitsOnly(text)) {
+            final Spannable spannable = new SpannableStringBuilder(text);
+            final TtsSpan span = new TtsSpan.DigitsBuilder(text.toString()).build();
+            spannable.setSpan(span, 0, spannable.length(), Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
+            text = spannable;
+        }
+        return text;
+    }
+
+    private final ImeiInfoDialogFragment mDialog;
+    private final TelephonyManager mTelephonyManager;
+    private final SubscriptionInfo mSubscriptionInfo;
+    private final int mSlotId;
+
+    public ImeiInfoDialogController(@NonNull ImeiInfoDialogFragment dialog, int slotId) {
+        mDialog = dialog;
+        mSlotId = slotId;
+        final Context context = dialog.getContext();
+        mTelephonyManager = (TelephonyManager) context.getSystemService(
+                Context.TELEPHONY_SERVICE);
+        mSubscriptionInfo = getSubscriptionInfo(context, slotId);
+    }
+
+    /**
+     * Sets IMEI/MEID information based on whether the device is CDMA or GSM.
+     */
+    public void populateImeiInfo() {
+        if (mSubscriptionInfo == null) {
+            return;
+        }
+        if (mTelephonyManager.getPhoneType() == TelephonyManager.PHONE_TYPE_CDMA) {
+            updateDialogForCdmaPhone();
+        } else {
+            updateDialogForGsmPhone();
+        }
+    }
+
+    private void updateDialogForCdmaPhone() {
+        final Resources res = mDialog.getContext().getResources();
+        mDialog.setText(ID_MEID_NUMBER_VALUE, getMeid());
+        mDialog.setText(ID_MIN_NUMBER_VALUE,
+                mTelephonyManager.getCdmaMin(mSubscriptionInfo.getSubscriptionId()));
+
+        if (res.getBoolean(R.bool.config_msid_enable)) {
+            mDialog.setText(ID_MIN_NUMBER_LABEL,
+                    res.getString(R.string.status_msid_number));
+        }
+
+        mDialog.setText(ID_PRL_VERSION_VALUE, getCdmaPrlVersion());
+
+        if (isCdmaLteEnabled()) {
+            // Show IMEI for LTE device
+            mDialog.setText(ID_IMEI_VALUE,
+                    getTextAsDigits(mTelephonyManager.getImei(mSlotId)));
+            mDialog.setText(ID_IMEI_SV_VALUE,
+                    getTextAsDigits(mTelephonyManager.getDeviceSoftwareVersion(mSlotId)));
+        } else {
+            // device is not GSM/UMTS, do not display GSM/UMTS features
+            mDialog.removeViewFromScreen(ID_GSM_SETTINGS);
+        }
+    }
+
+    private void updateDialogForGsmPhone() {
+        mDialog.setText(ID_IMEI_VALUE, getTextAsDigits(mTelephonyManager.getImei(mSlotId)));
+        mDialog.setText(ID_IMEI_SV_VALUE,
+                getTextAsDigits(mTelephonyManager.getDeviceSoftwareVersion(mSlotId)));
+        // device is not CDMA, do not display CDMA features
+        mDialog.removeViewFromScreen(ID_CDMA_SETTINGS);
+    }
+
+    private SubscriptionInfo getSubscriptionInfo(Context context, int slotId) {
+        final List<SubscriptionInfo> subscriptionInfoList = SubscriptionManager.from(context)
+                .getActiveSubscriptionInfoList();
+        if (subscriptionInfoList == null) {
+            return null;
+        }
+
+        return subscriptionInfoList.get(slotId);
+    }
+
+    @VisibleForTesting
+    String getCdmaPrlVersion() {
+        return mTelephonyManager.getCdmaPrlVersion();
+    }
+
+    @VisibleForTesting
+    boolean isCdmaLteEnabled() {
+        return mTelephonyManager.getLteOnCdmaMode(mSubscriptionInfo.getSubscriptionId())
+                == PhoneConstants.LTE_ON_CDMA_TRUE;
+    }
+
+    @VisibleForTesting
+    String getMeid() {
+        return mTelephonyManager.getMeid(mSlotId);
+    }
+}
diff --git a/src/com/android/settings/deviceinfo/imei/ImeiInfoDialogFragment.java b/src/com/android/settings/deviceinfo/imei/ImeiInfoDialogFragment.java
new file mode 100644
index 0000000..11e66f1
--- /dev/null
+++ b/src/com/android/settings/deviceinfo/imei/ImeiInfoDialogFragment.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.deviceinfo.imei;
+
+import android.app.AlertDialog;
+import android.app.Dialog;
+import android.app.Fragment;
+import android.app.FragmentManager;
+import android.os.Bundle;
+import android.support.annotation.NonNull;
+import android.support.annotation.VisibleForTesting;
+import android.text.TextUtils;
+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.core.instrumentation.InstrumentedDialogFragment;
+
+public class ImeiInfoDialogFragment extends InstrumentedDialogFragment {
+
+    @VisibleForTesting
+    static final String TAG = "ImeiInfoDialog";
+
+    private static final String SLOT_ID_BUNDLE_KEY = "arg_key_slot_id";
+    private static final String DIALOG_TITLE_BUNDLE_KEY = "arg_key_dialog_title";
+
+    private View mRootView;
+
+    public static void show(@NonNull Fragment host, int slotId, String dialogTitle) {
+        final FragmentManager manager = host.getChildFragmentManager();
+        if (manager.findFragmentByTag(TAG) == null) {
+            final Bundle bundle = new Bundle();
+            bundle.putInt(SLOT_ID_BUNDLE_KEY, slotId);
+            bundle.putString(DIALOG_TITLE_BUNDLE_KEY, dialogTitle);
+            final ImeiInfoDialogFragment dialog = new ImeiInfoDialogFragment();
+            dialog.setArguments(bundle);
+            dialog.show(manager, TAG);
+        }
+    }
+
+    @Override
+    public int getMetricsCategory() {
+        return MetricsProto.MetricsEvent.DIALOG_IMEI_INFO;
+    }
+
+    @Override
+    public Dialog onCreateDialog(Bundle savedInstanceState) {
+        final Bundle bundle = getArguments();
+        final int slotId = bundle.getInt(SLOT_ID_BUNDLE_KEY);
+        final String dialogTitle = bundle.getString(DIALOG_TITLE_BUNDLE_KEY);
+
+        final ImeiInfoDialogController controller = new ImeiInfoDialogController(this, slotId);
+        final AlertDialog.Builder builder = new AlertDialog.Builder(getActivity())
+                .setTitle(dialogTitle)
+                .setPositiveButton(android.R.string.ok, null);
+        mRootView = LayoutInflater.from(builder.getContext())
+                .inflate(R.layout.dialog_imei_info, null /* parent */);
+        controller.populateImeiInfo();
+        return builder.setView(mRootView).create();
+    }
+
+    public void removeViewFromScreen(int viewId) {
+        final View view = mRootView.findViewById(viewId);
+        if (view != null) {
+            view.setVisibility(View.GONE);
+        }
+    }
+
+    public void setText(int viewId, CharSequence text) {
+        final TextView textView = mRootView.findViewById(viewId);
+        if (TextUtils.isEmpty(text)) {
+            text = getResources().getString(R.string.device_info_default);
+        }
+        if (textView != null) {
+            textView.setText(text);
+        }
+    }
+}
diff --git a/src/com/android/settings/deviceinfo/imei/ImeiInfoPreferenceControllerV2.java b/src/com/android/settings/deviceinfo/imei/ImeiInfoPreferenceControllerV2.java
new file mode 100644
index 0000000..dcc6db6
--- /dev/null
+++ b/src/com/android/settings/deviceinfo/imei/ImeiInfoPreferenceControllerV2.java
@@ -0,0 +1,127 @@
+/*
+ * Copyright (C) 2017 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.deviceinfo.imei;
+
+import static android.telephony.TelephonyManager.PHONE_TYPE_CDMA;
+
+import android.app.Fragment;
+import android.content.Context;
+import android.support.annotation.VisibleForTesting;
+import android.support.v7.preference.Preference;
+import android.support.v7.preference.PreferenceScreen;
+import android.telephony.TelephonyManager;
+
+import com.android.settings.R;
+import com.android.settings.core.PreferenceControllerMixin;
+import com.android.settingslib.deviceinfo.AbstractSimStatusImeiInfoPreferenceController;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * Controller that manages preference for single and multi sim devices.
+ */
+public class ImeiInfoPreferenceControllerV2 extends
+        AbstractSimStatusImeiInfoPreferenceController implements PreferenceControllerMixin {
+
+    private static final String KEY_IMEI_INFO = "imei_info";
+
+    private final boolean mIsMultiSim;
+    private final TelephonyManager mTelephonyManager;
+    private final List<Preference> mPreferenceList = new ArrayList<>();
+    private final Fragment mFragment;
+
+    public ImeiInfoPreferenceControllerV2(Context context, Fragment fragment) {
+        super(context);
+
+        mFragment = fragment;
+        mTelephonyManager = (TelephonyManager) context.getSystemService(Context.TELEPHONY_SERVICE);
+        mIsMultiSim = mTelephonyManager.getPhoneCount() > 1;
+    }
+
+    @Override
+    public String getPreferenceKey() {
+        return KEY_IMEI_INFO;
+    }
+
+    @Override
+    public void displayPreference(PreferenceScreen screen) {
+        super.displayPreference(screen);
+        final Preference preference = screen.findPreference(getPreferenceKey());
+        if (!isAvailable() || preference == null || !preference.isVisible()) {
+            return;
+        }
+
+        mPreferenceList.add(preference);
+        updatePreference(preference, 0 /* sim slot */);
+
+        final int imeiPreferenceOrder = preference.getOrder();
+        // Add additional preferences for each sim in the device
+        for (int simSlotNumber = 1; simSlotNumber < mTelephonyManager.getPhoneCount();
+                simSlotNumber++) {
+            final Preference multiSimPreference = createNewPreference(screen.getContext());
+            multiSimPreference.setOrder(imeiPreferenceOrder + simSlotNumber);
+            multiSimPreference.setKey(KEY_IMEI_INFO + simSlotNumber);
+            screen.addPreference(multiSimPreference);
+            mPreferenceList.add(multiSimPreference);
+            updatePreference(multiSimPreference, simSlotNumber);
+        }
+    }
+
+    @Override
+    public boolean handlePreferenceTreeClick(Preference preference) {
+        final int simSlot = mPreferenceList.indexOf(preference);
+        if (simSlot == -1) {
+            return false;
+        }
+
+        ImeiInfoDialogFragment.show(mFragment, simSlot, preference.getTitle().toString());
+        return true;
+    }
+
+    private void updatePreference(Preference preference, int simSlot) {
+        final int phoneType = mTelephonyManager.getPhoneType();
+        if (phoneType == PHONE_TYPE_CDMA) {
+            preference.setTitle(getTitleForCdmaPhone(simSlot));
+            preference.setSummary(getMeid(simSlot));
+        } else {
+            // GSM phone
+            preference.setTitle(getTitleForGsmPhone(simSlot));
+            preference.setSummary(mTelephonyManager.getImei(simSlot));
+        }
+    }
+
+    private CharSequence getTitleForGsmPhone(int simSlot) {
+        return mIsMultiSim ? mContext.getString(R.string.imei_multi_sim, simSlot + 1)
+                : mContext.getString(R.string.status_imei);
+    }
+
+    private CharSequence getTitleForCdmaPhone(int simSlot) {
+        return mIsMultiSim ? mContext.getString(R.string.meid_multi_sim, simSlot + 1)
+                : mContext.getString(R.string.status_meid_number);
+    }
+
+    @VisibleForTesting
+    String getMeid(int simSlot) {
+        return mTelephonyManager.getMeid(simSlot);
+    }
+
+    @VisibleForTesting
+    Preference createNewPreference(Context context) {
+        return new Preference(context);
+    }
+}
diff --git a/src/com/android/settings/deviceinfo/simstatus/SimStatusDialogController.java b/src/com/android/settings/deviceinfo/simstatus/SimStatusDialogController.java
new file mode 100644
index 0000000..15ca87b
--- /dev/null
+++ b/src/com/android/settings/deviceinfo/simstatus/SimStatusDialogController.java
@@ -0,0 +1,405 @@
+/*
+ * Copyright (C) 2017 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.deviceinfo.simstatus;
+
+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;
+import android.content.IntentFilter;
+import android.content.pm.PackageManager;
+import android.content.res.Resources;
+import android.os.Bundle;
+import android.os.PersistableBundle;
+import android.os.UserHandle;
+import android.support.annotation.NonNull;
+import android.support.annotation.VisibleForTesting;
+import android.telephony.CarrierConfigManager;
+import android.telephony.CellBroadcastMessage;
+import android.telephony.PhoneStateListener;
+import android.telephony.ServiceState;
+import android.telephony.SignalStrength;
+import android.telephony.SubscriptionInfo;
+import android.telephony.SubscriptionManager;
+import android.telephony.TelephonyManager;
+import android.text.TextUtils;
+import android.util.Log;
+
+import com.android.settings.R;
+import com.android.settingslib.DeviceInfoUtils;
+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 class SimStatusDialogController implements LifecycleObserver, OnResume, OnPause {
+
+    private final static String TAG = "SimStatusDialogCtrl";
+
+    @VisibleForTesting
+    final static int NETWORK_PROVIDER_VALUE_ID = R.id.operator_name_value;
+    @VisibleForTesting
+    final static int PHONE_NUMBER_VALUE_ID = R.id.number_value;
+    @VisibleForTesting
+    final static int CELLULAR_NETWORK_STATE = R.id.data_state_value;
+    @VisibleForTesting
+    final static int OPERATOR_INFO_LABEL_ID = R.id.latest_area_info_label;
+    @VisibleForTesting
+    final static int OPERATOR_INFO_VALUE_ID = R.id.latest_area_info_value;
+    @VisibleForTesting
+    final static int SERVICE_STATE_VALUE_ID = R.id.service_state_value;
+    @VisibleForTesting
+    final static int SIGNAL_STRENGTH_VALUE_ID = R.id.signal_strength_value;
+    @VisibleForTesting
+    final static int CELLULAR_NETWORK_TYPE_VALUE_ID = R.id.network_type_value;
+    @VisibleForTesting
+    final static int ROAMING_INFO_VALUE_ID = R.id.roaming_state_value;
+    @VisibleForTesting
+    final static int ICCID_INFO_LABEL_ID = R.id.icc_id_label;
+    @VisibleForTesting
+    final static int ICCID_INFO_VALUE_ID = R.id.icc_id_value;
+
+    private final static String CB_AREA_INFO_RECEIVED_ACTION =
+            "com.android.cellbroadcastreceiver.CB_AREA_INFO_RECEIVED";
+    private final static String GET_LATEST_CB_AREA_INFO_ACTION =
+            "com.android.cellbroadcastreceiver.GET_LATEST_CB_AREA_INFO";
+    private final static String CELL_BROADCAST_RECEIVER_APP = "com.android.cellbroadcastreceiver";
+
+    private final SimStatusDialogFragment mDialog;
+    private final SubscriptionInfo mSubscriptionInfo;
+    private final TelephonyManager mTelephonyManager;
+    private final CarrierConfigManager mCarrierConfigManager;
+    private final Resources mRes;
+    private final Context mContext;
+
+    private boolean mShowLatestAreaInfo;
+
+    private final BroadcastReceiver mAreaInfoReceiver = new BroadcastReceiver() {
+        @Override
+        public void onReceive(Context context, Intent intent) {
+            final String action = intent.getAction();
+            if (TextUtils.equals(action, CB_AREA_INFO_RECEIVED_ACTION)) {
+                final Bundle extras = intent.getExtras();
+                if (extras == null) {
+                    return;
+                }
+                final CellBroadcastMessage cbMessage = (CellBroadcastMessage) extras.get("message");
+                if (cbMessage != null
+                        && mSubscriptionInfo.getSubscriptionId() == cbMessage.getSubId()) {
+                    final String latestAreaInfo = cbMessage.getMessageBody();
+                    mDialog.setText(OPERATOR_INFO_VALUE_ID, latestAreaInfo);
+                }
+            }
+        }
+    };
+
+
+    private PhoneStateListener mPhoneStateListener;
+
+    public SimStatusDialogController(@NonNull SimStatusDialogFragment dialog, Lifecycle lifecycle,
+            int slotId) {
+        mDialog = dialog;
+        mContext = dialog.getContext();
+        mSubscriptionInfo = getPhoneSubscriptionInfo(slotId);
+        mTelephonyManager = (TelephonyManager) mContext.getSystemService(
+                TELEPHONY_SERVICE);
+        mCarrierConfigManager = (CarrierConfigManager) mContext.getSystemService(
+                CARRIER_CONFIG_SERVICE);
+
+        mRes = mContext.getResources();
+
+        if (lifecycle != null) {
+            lifecycle.addObserver(this);
+        }
+    }
+
+    public void initialize() {
+        if (mSubscriptionInfo == null) {
+            return;
+        }
+
+        mPhoneStateListener = getPhoneStateListener();
+
+        final ServiceState serviceState = getCurrentServiceState();
+        updateNetworkProvider(serviceState);
+        updatePhoneNumber();
+        updateLatestAreaInfo();
+        updateServiceState(serviceState);
+        updateSignalStrength(getSignalStrength());
+        updateNetworkType();
+        updateRoamingStatus(serviceState);
+        updateIccidNumber();
+    }
+
+    @Override
+    public void onResume() {
+        if (mSubscriptionInfo == null) {
+            return;
+        }
+
+        mTelephonyManager.listen(mPhoneStateListener,
+                PhoneStateListener.LISTEN_DATA_CONNECTION_STATE
+                        | PhoneStateListener.LISTEN_SIGNAL_STRENGTHS
+                        | PhoneStateListener.LISTEN_SERVICE_STATE);
+
+        if (mShowLatestAreaInfo) {
+            mContext.registerReceiver(mAreaInfoReceiver,
+                    new IntentFilter(CB_AREA_INFO_RECEIVED_ACTION),
+                    Manifest.permission.RECEIVE_EMERGENCY_BROADCAST, null /* scheduler */);
+            // Ask CellBroadcastReceiver to broadcast the latest area info received
+            final Intent getLatestIntent = new Intent(GET_LATEST_CB_AREA_INFO_ACTION);
+            getLatestIntent.setPackage(CELL_BROADCAST_RECEIVER_APP);
+            mContext.sendBroadcastAsUser(getLatestIntent, UserHandle.ALL,
+                    Manifest.permission.RECEIVE_EMERGENCY_BROADCAST);
+        }
+    }
+
+    @Override
+    public void onPause() {
+        if (mSubscriptionInfo == null) {
+            return;
+        }
+
+        mTelephonyManager.listen(mPhoneStateListener,
+                PhoneStateListener.LISTEN_NONE);
+
+        if (mShowLatestAreaInfo) {
+            mContext.unregisterReceiver(mAreaInfoReceiver);
+        }
+    }
+
+    private void updateNetworkProvider(ServiceState serviceState) {
+        mDialog.setText(NETWORK_PROVIDER_VALUE_ID, serviceState.getOperatorAlphaLong());
+    }
+
+    private void updatePhoneNumber() {
+        // If formattedNumber is null or empty, it'll display as "Unknown".
+        mDialog.setText(PHONE_NUMBER_VALUE_ID, getPhoneNumber());
+    }
+
+    private void updateDataState(int state) {
+        String networkStateValue;
+
+        switch (state) {
+            case TelephonyManager.DATA_CONNECTED:
+                networkStateValue = mRes.getString(R.string.radioInfo_data_connected);
+                break;
+            case TelephonyManager.DATA_SUSPENDED:
+                networkStateValue = mRes.getString(R.string.radioInfo_data_suspended);
+                break;
+            case TelephonyManager.DATA_CONNECTING:
+                networkStateValue = mRes.getString(R.string.radioInfo_data_connecting);
+                break;
+            case TelephonyManager.DATA_DISCONNECTED:
+                networkStateValue = mRes.getString(R.string.radioInfo_data_disconnected);
+                break;
+            default:
+                networkStateValue = mRes.getString(R.string.radioInfo_unknown);
+                break;
+        }
+
+        mDialog.setText(CELLULAR_NETWORK_STATE, networkStateValue);
+    }
+
+
+    private void updateLatestAreaInfo() {
+        mShowLatestAreaInfo = Resources.getSystem().getBoolean(
+                com.android.internal.R.bool.config_showAreaUpdateInfoSettings)
+                && mTelephonyManager.getPhoneType() != TelephonyManager.PHONE_TYPE_CDMA;
+
+        if (!mShowLatestAreaInfo) {
+            mDialog.removeSettingFromScreen(OPERATOR_INFO_LABEL_ID);
+            mDialog.removeSettingFromScreen(OPERATOR_INFO_VALUE_ID);
+        }
+    }
+
+    private void updateServiceState(ServiceState serviceState) {
+        final int state = serviceState.getState();
+        if (state == ServiceState.STATE_OUT_OF_SERVICE || state == ServiceState.STATE_POWER_OFF) {
+            resetSignalStrength();
+        }
+
+        String serviceStateValue;
+
+        switch (state) {
+            case ServiceState.STATE_IN_SERVICE:
+                serviceStateValue = mRes.getString(R.string.radioInfo_service_in);
+                break;
+            case ServiceState.STATE_OUT_OF_SERVICE:
+            case ServiceState.STATE_EMERGENCY_ONLY:
+                // Set summary string of service state to radioInfo_service_out when
+                // service state is both STATE_OUT_OF_SERVICE & STATE_EMERGENCY_ONLY
+                serviceStateValue = mRes.getString(R.string.radioInfo_service_out);
+                break;
+            case ServiceState.STATE_POWER_OFF:
+                serviceStateValue = mRes.getString(R.string.radioInfo_service_off);
+                break;
+            default:
+                serviceStateValue = mRes.getString(R.string.radioInfo_unknown);
+                break;
+        }
+
+        mDialog.setText(SERVICE_STATE_VALUE_ID, serviceStateValue);
+    }
+
+    private void updateSignalStrength(SignalStrength signalStrength) {
+        final int state = getCurrentServiceState().getState();
+
+        if ((ServiceState.STATE_OUT_OF_SERVICE == state) ||
+                (ServiceState.STATE_POWER_OFF == state)) {
+            return;
+        }
+
+        int signalDbm = getDbm(signalStrength);
+        int signalAsu = getAsuLevel(signalStrength);
+
+        if (signalDbm == -1) {
+            signalDbm = 0;
+        }
+
+        if (signalAsu == -1) {
+            signalAsu = 0;
+        }
+
+        mDialog.setText(SIGNAL_STRENGTH_VALUE_ID, mRes.getString(R.string.sim_signal_strength,
+                signalDbm, signalAsu));
+    }
+
+    private void resetSignalStrength() {
+        mDialog.setText(SIGNAL_STRENGTH_VALUE_ID, "0");
+    }
+
+    private void updateNetworkType() {
+        // Whether EDGE, UMTS, etc...
+        String networktype = null;
+        final int subId = mSubscriptionInfo.getSubscriptionId();
+        final int actualDataNetworkType = mTelephonyManager.getDataNetworkType(subId);
+        final int actualVoiceNetworkType = mTelephonyManager.getVoiceNetworkType(subId);
+        if (TelephonyManager.NETWORK_TYPE_UNKNOWN != actualDataNetworkType) {
+            networktype = mTelephonyManager.getNetworkTypeName(actualDataNetworkType);
+        } else if (TelephonyManager.NETWORK_TYPE_UNKNOWN != actualVoiceNetworkType) {
+            networktype = mTelephonyManager.getNetworkTypeName(actualVoiceNetworkType);
+        }
+
+        boolean show4GForLTE = false;
+        try {
+            final Context con = mContext.createPackageContext(
+                    "com.android.systemui", 0 /* flags */);
+            final int id = con.getResources().getIdentifier("config_show4GForLTE",
+                    "bool" /* default type */, "com.android.systemui" /* default package */);
+            show4GForLTE = con.getResources().getBoolean(id);
+        } catch (PackageManager.NameNotFoundException e) {
+            Log.e(TAG, "NameNotFoundException for show4GFotLTE");
+        }
+
+        if (TextUtils.equals(networktype, "LTE") && show4GForLTE) {
+            networktype = "4G";
+        }
+        mDialog.setText(CELLULAR_NETWORK_TYPE_VALUE_ID, networktype);
+    }
+
+    private void updateRoamingStatus(ServiceState serviceState) {
+        if (serviceState.getRoaming()) {
+            mDialog.setText(ROAMING_INFO_VALUE_ID, mRes.getString(R.string.radioInfo_roaming_in));
+        } else {
+            mDialog.setText(ROAMING_INFO_VALUE_ID, mRes.getString(R.string.radioInfo_roaming_not));
+        }
+    }
+
+    private void updateIccidNumber() {
+        final int subscriptionId = mSubscriptionInfo.getSubscriptionId();
+        final PersistableBundle carrierConfig = mCarrierConfigManager.getConfigForSubId(subscriptionId);
+        final boolean showIccId = carrierConfig.getBoolean(
+                CarrierConfigManager.KEY_SHOW_ICCID_IN_SIM_STATUS_BOOL);
+        if (!showIccId) {
+            mDialog.removeSettingFromScreen(ICCID_INFO_LABEL_ID);
+            mDialog.removeSettingFromScreen(ICCID_INFO_VALUE_ID);
+        } else {
+            mDialog.setText(ICCID_INFO_VALUE_ID, getSimSerialNumber(subscriptionId));
+        }
+    }
+
+    private SubscriptionInfo getPhoneSubscriptionInfo(int slotId) {
+        final List<SubscriptionInfo> subscriptionInfoList = SubscriptionManager.from(
+                mContext).getActiveSubscriptionInfoList();
+        if (subscriptionInfoList != null && subscriptionInfoList.size() > slotId) {
+            return subscriptionInfoList.get(slotId);
+        } else {
+            return null;
+        }
+    }
+
+    @VisibleForTesting
+    ServiceState getCurrentServiceState() {
+        return mTelephonyManager.getServiceStateForSubscriber(
+                mSubscriptionInfo.getSubscriptionId());
+    }
+
+    @VisibleForTesting
+    int getDbm(SignalStrength signalStrength) {
+        return signalStrength.getDbm();
+    }
+
+    @VisibleForTesting
+    int getAsuLevel(SignalStrength signalStrength) {
+        return signalStrength.getAsuLevel();
+    }
+
+    @VisibleForTesting
+    PhoneStateListener getPhoneStateListener() {
+        return new PhoneStateListener(
+                mSubscriptionInfo.getSubscriptionId()) {
+            @Override
+            public void onDataConnectionStateChanged(int state) {
+                updateDataState(state);
+                updateNetworkType();
+            }
+
+            @Override
+            public void onSignalStrengthsChanged(SignalStrength signalStrength) {
+                updateSignalStrength(signalStrength);
+            }
+
+            @Override
+            public void onServiceStateChanged(ServiceState serviceState) {
+                updateNetworkProvider(serviceState);
+                updateServiceState(serviceState);
+                updateRoamingStatus(serviceState);
+            }
+        };
+    }
+
+    @VisibleForTesting
+    String getPhoneNumber() {
+        return DeviceInfoUtils.getFormattedPhoneNumber(mContext, mSubscriptionInfo);
+    }
+
+    @VisibleForTesting
+    SignalStrength getSignalStrength() {
+        return mTelephonyManager.getSignalStrength();
+    }
+
+    @VisibleForTesting
+    String getSimSerialNumber(int subscriptionId) {
+        return mTelephonyManager.getSimSerialNumber(subscriptionId);
+    }
+}
diff --git a/src/com/android/settings/deviceinfo/simstatus/SimStatusDialogFragment.java b/src/com/android/settings/deviceinfo/simstatus/SimStatusDialogFragment.java
new file mode 100644
index 0000000..a15cb81
--- /dev/null
+++ b/src/com/android/settings/deviceinfo/simstatus/SimStatusDialogFragment.java
@@ -0,0 +1,92 @@
+/*
+ * Copyright (C) 2017 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.deviceinfo.simstatus;
+
+import android.app.AlertDialog;
+import android.app.Dialog;
+import android.app.Fragment;
+import android.app.FragmentManager;
+import android.os.Bundle;
+import android.text.TextUtils;
+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.core.instrumentation.InstrumentedDialogFragment;
+
+public class SimStatusDialogFragment extends InstrumentedDialogFragment {
+
+    private static final String SIM_SLOT_BUNDLE_KEY = "arg_key_sim_slot";
+    private static final String DIALOG_TITLE_BUNDLE_KEY = "arg_key_dialog_title";
+
+    private static final String TAG = "SimStatusDialog";
+
+    private View mRootView;
+    private SimStatusDialogController mController;
+
+    @Override
+    public int getMetricsCategory() {
+        return MetricsProto.MetricsEvent.DIALOG_SIM_STATUS;
+    }
+
+    public static void show(Fragment host, int slotId, String dialogTitle) {
+        final FragmentManager manager = host.getChildFragmentManager();
+        if (manager.findFragmentByTag(TAG) == null) {
+            final Bundle bundle = new Bundle();
+            bundle.putInt(SIM_SLOT_BUNDLE_KEY, slotId);
+            bundle.putString(DIALOG_TITLE_BUNDLE_KEY, dialogTitle);
+            final SimStatusDialogFragment dialog =
+                    new SimStatusDialogFragment();
+            dialog.setArguments(bundle);
+            dialog.show(manager, TAG);
+        }
+    }
+
+    @Override
+    public Dialog onCreateDialog(Bundle savedInstanceState) {
+        final Bundle bundle = getArguments();
+        final int slotId = bundle.getInt(SIM_SLOT_BUNDLE_KEY);
+        final String dialogTitle = bundle.getString(DIALOG_TITLE_BUNDLE_KEY);
+        mController = new SimStatusDialogController(this, mLifecycle, slotId);
+        final AlertDialog.Builder builder = new AlertDialog.Builder(getActivity())
+                .setTitle(dialogTitle)
+                .setPositiveButton(android.R.string.ok, null /* onClickListener */);
+        mRootView = LayoutInflater.from(builder.getContext())
+                .inflate(R.layout.dialog_sim_status, null /* parent */);
+        mController.initialize();
+        return builder.setView(mRootView).create();
+    }
+
+    public void removeSettingFromScreen(int viewId) {
+        final View view = mRootView.findViewById(viewId);
+        if (view != null) {
+            view.setVisibility(View.GONE);
+        }
+    }
+
+    public void setText(int viewId, CharSequence text) {
+        final TextView textView = mRootView.findViewById(viewId);
+        if (TextUtils.isEmpty(text)) {
+            text = getResources().getString(R.string.device_info_default);
+        }
+        if (textView != null) {
+            textView.setText(text);
+        }
+    }
+}
diff --git a/src/com/android/settings/deviceinfo/simstatus/SimStatusPreferenceControllerV2.java b/src/com/android/settings/deviceinfo/simstatus/SimStatusPreferenceControllerV2.java
new file mode 100644
index 0000000..55493dc
--- /dev/null
+++ b/src/com/android/settings/deviceinfo/simstatus/SimStatusPreferenceControllerV2.java
@@ -0,0 +1,124 @@
+/*
+ * Copyright (C) 2017 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.deviceinfo.simstatus;
+
+import android.app.Fragment;
+import android.content.Context;
+import android.support.annotation.VisibleForTesting;
+import android.support.v7.preference.Preference;
+import android.support.v7.preference.PreferenceScreen;
+import android.telephony.SubscriptionInfo;
+import android.telephony.SubscriptionManager;
+import android.telephony.TelephonyManager;
+
+import com.android.settings.R;
+import com.android.settings.core.PreferenceControllerMixin;
+import com.android.settingslib.deviceinfo.AbstractSimStatusImeiInfoPreferenceController;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class SimStatusPreferenceControllerV2 extends
+        AbstractSimStatusImeiInfoPreferenceController implements PreferenceControllerMixin {
+
+    private static final String KEY_SIM_STATUS = "sim_status";
+
+    private final TelephonyManager mTelephonyManager;
+    private final SubscriptionManager mSubscriptionManager;
+    private final Fragment mFragment;
+    private final List<Preference> mPreferenceList = new ArrayList<>();
+
+    public SimStatusPreferenceControllerV2(Context context, Fragment fragment) {
+        super(context);
+
+        mTelephonyManager = (TelephonyManager) context.getSystemService(Context.TELEPHONY_SERVICE);
+        mSubscriptionManager = (SubscriptionManager) context.getSystemService(
+                Context.TELEPHONY_SUBSCRIPTION_SERVICE);
+        mFragment = fragment;
+    }
+
+    @Override
+    public String getPreferenceKey() {
+        return KEY_SIM_STATUS;
+    }
+
+    @Override
+    public void displayPreference(PreferenceScreen screen) {
+        super.displayPreference(screen);
+        final Preference preference = screen.findPreference(getPreferenceKey());
+        if (!isAvailable() || preference == null || !preference.isVisible()) {
+            return;
+        }
+
+        mPreferenceList.add(preference);
+
+        final int simStatusOrder = preference.getOrder();
+        // Add additional preferences for each sim in the device
+        for (int simSlotNumber = 1; simSlotNumber < mTelephonyManager.getPhoneCount();
+                simSlotNumber++) {
+            final Preference multiSimPreference = createNewPreference(screen.getContext());
+            multiSimPreference.setOrder(simStatusOrder + simSlotNumber);
+            multiSimPreference.setKey(KEY_SIM_STATUS + simSlotNumber);
+            screen.addPreference(multiSimPreference);
+            mPreferenceList.add(multiSimPreference);
+        }
+    }
+
+    @Override
+    public void updateState(Preference preference) {
+        for (int simSlotNumber = 0; simSlotNumber < mPreferenceList.size(); simSlotNumber++) {
+            final Preference simStatusPreference = mPreferenceList.get(simSlotNumber);
+            simStatusPreference.setTitle(getPreferenceTitle(simSlotNumber /* sim slot */));
+            simStatusPreference.setSummary(getCarrierName(simSlotNumber /* sim slot */));
+        }
+    }
+
+    @Override
+    public boolean handlePreferenceTreeClick(Preference preference) {
+        final int simSlot = mPreferenceList.indexOf(preference);
+        if (simSlot == -1) {
+            return false;
+        }
+
+        SimStatusDialogFragment.show(mFragment, simSlot, getPreferenceTitle(simSlot));
+        return true;
+    }
+
+    private String getPreferenceTitle(int simSlot) {
+        return mTelephonyManager.getPhoneCount() > 1 ? mContext.getString(
+                R.string.sim_status_title_sim_slot, simSlot + 1) : mContext.getString(
+                R.string.sim_status_title);
+    }
+
+    private CharSequence getCarrierName(int simSlot) {
+        final List<SubscriptionInfo> subscriptionInfoList =
+                mSubscriptionManager.getActiveSubscriptionInfoList();
+        if (subscriptionInfoList != null) {
+            for (SubscriptionInfo info : subscriptionInfoList) {
+                if (info.getSimSlotIndex() == simSlot) {
+                    return info.getCarrierName();
+                }
+            }
+        }
+        return mContext.getText(R.string.device_info_not_available);
+    }
+
+    @VisibleForTesting
+    Preference createNewPreference(Context context) {
+        return new Preference(context);
+    }
+}
diff --git a/src/com/android/settings/deviceinfo/storage/SecondaryUserController.java b/src/com/android/settings/deviceinfo/storage/SecondaryUserController.java
index 3c69ab1..4aeb782 100644
--- a/src/com/android/settings/deviceinfo/storage/SecondaryUserController.java
+++ b/src/com/android/settings/deviceinfo/storage/SecondaryUserController.java
@@ -27,9 +27,9 @@
 import android.util.SparseArray;
 
 import com.android.settings.Utils;
-import com.android.settings.applications.UserManagerWrapper;
 import com.android.settings.core.PreferenceControllerMixin;
 import com.android.settings.deviceinfo.StorageItemPreference;
+import com.android.settings.wrapper.UserManagerWrapper;
 import com.android.settingslib.core.AbstractPreferenceController;
 
 import java.util.ArrayList;
diff --git a/src/com/android/settings/deviceinfo/storage/StorageAsyncLoader.java b/src/com/android/settings/deviceinfo/storage/StorageAsyncLoader.java
index f92a24e..2ce53f6 100644
--- a/src/com/android/settings/deviceinfo/storage/StorageAsyncLoader.java
+++ b/src/com/android/settings/deviceinfo/storage/StorageAsyncLoader.java
@@ -30,10 +30,10 @@
 import android.util.Log;
 import android.util.SparseArray;
 
-import com.android.settings.applications.PackageManagerWrapper;
-import com.android.settings.applications.UserManagerWrapper;
 import com.android.settings.utils.AsyncLoader;
+import com.android.settings.wrapper.UserManagerWrapper;
 import com.android.settingslib.applications.StorageStatsSource;
+import com.android.settingslib.wrapper.PackageManagerWrapper;
 
 import java.io.IOException;
 import java.util.Collections;
diff --git a/src/com/android/settings/deviceinfo/storage/StorageItemPreferenceController.java b/src/com/android/settings/deviceinfo/storage/StorageItemPreferenceController.java
index 7f2cc33..1149b99 100644
--- a/src/com/android/settings/deviceinfo/storage/StorageItemPreferenceController.java
+++ b/src/com/android/settings/deviceinfo/storage/StorageItemPreferenceController.java
@@ -36,7 +36,7 @@
 import com.android.settings.R;
 import com.android.settings.Settings;
 import com.android.settings.Utils;
-import com.android.settings.applications.ManageApplications;
+import com.android.settings.applications.manageapplications.ManageApplications;
 import com.android.settings.core.PreferenceControllerMixin;
 import com.android.settings.core.instrumentation.MetricsFeatureProvider;
 import com.android.settings.deviceinfo.PrivateVolumeSettings.SystemInfoFragment;
diff --git a/src/com/android/settings/deviceinfo/storage/UserProfileController.java b/src/com/android/settings/deviceinfo/storage/UserProfileController.java
index cf1e360..4870e7e 100644
--- a/src/com/android/settings/deviceinfo/storage/UserProfileController.java
+++ b/src/com/android/settings/deviceinfo/storage/UserProfileController.java
@@ -30,10 +30,10 @@
 import com.android.internal.logging.nano.MetricsProto;
 import com.android.internal.util.Preconditions;
 import com.android.settings.Utils;
-import com.android.settings.applications.UserManagerWrapper;
 import com.android.settings.core.PreferenceControllerMixin;
 import com.android.settings.deviceinfo.StorageItemPreference;
 import com.android.settings.deviceinfo.StorageProfileFragment;
+import com.android.settings.wrapper.UserManagerWrapper;
 import com.android.settingslib.core.AbstractPreferenceController;
 import com.android.settingslib.drawer.SettingsDrawerActivity;
 
diff --git a/src/com/android/settings/display/AmbientDisplayAlwaysOnPreferenceController.java b/src/com/android/settings/display/AmbientDisplayAlwaysOnPreferenceController.java
index 280098d..9132daa 100644
--- a/src/com/android/settings/display/AmbientDisplayAlwaysOnPreferenceController.java
+++ b/src/com/android/settings/display/AmbientDisplayAlwaysOnPreferenceController.java
@@ -21,6 +21,7 @@
 import android.provider.Settings;
 import android.support.v14.preference.SwitchPreference;
 import android.support.v7.preference.Preference;
+import android.support.annotation.VisibleForTesting;
 
 import com.android.internal.hardware.AmbientDisplayConfiguration;
 import com.android.settings.R;
@@ -81,7 +82,7 @@
 
     @Override
     public boolean isAvailable() {
-        return isAvailable(mConfig);
+        return alwaysOnAvailableForUser(mConfig);
     }
 
     public static boolean isAvailable(AmbientDisplayConfiguration config) {
@@ -94,7 +95,7 @@
 
     @Override
     public ResultPayload getResultPayload() {
-        final Intent intent = DatabaseIndexingUtils.buildSubsettingIntent(mContext,
+        final Intent intent = DatabaseIndexingUtils.buildSearchResultPageIntent(mContext,
                 AmbientDisplaySettings.class.getName(), KEY_ALWAYS_ON,
                 mContext.getString(R.string.ambient_display_screen_title));
 
@@ -102,4 +103,9 @@
                 ResultPayload.SettingsSource.SECURE, ON /* onValue */, intent, isAvailable(),
                 ON /* defaultValue */);
     }
+
+    @VisibleForTesting
+    boolean alwaysOnAvailableForUser(AmbientDisplayConfiguration config) {
+        return isAvailable(config);
+    }
 }
diff --git a/src/com/android/settings/display/AmbientDisplayNotificationsPreferenceController.java b/src/com/android/settings/display/AmbientDisplayNotificationsPreferenceController.java
index c1af133..68a21ce 100644
--- a/src/com/android/settings/display/AmbientDisplayNotificationsPreferenceController.java
+++ b/src/com/android/settings/display/AmbientDisplayNotificationsPreferenceController.java
@@ -13,6 +13,9 @@
  */
 package com.android.settings.display;
 
+import static android.provider.Settings.Secure.DOZE_ENABLED;
+import static com.android.internal.logging.nano.MetricsProto.MetricsEvent.ACTION_AMBIENT_DISPLAY;
+
 import android.content.Context;
 import android.content.Intent;
 import android.os.UserHandle;
@@ -30,9 +33,6 @@
 import com.android.settings.search.ResultPayload;
 import com.android.settingslib.core.AbstractPreferenceController;
 
-import static android.provider.Settings.Secure.DOZE_ENABLED;
-import static com.android.internal.logging.nano.MetricsProto.MetricsEvent.ACTION_AMBIENT_DISPLAY;
-
 public class AmbientDisplayNotificationsPreferenceController extends
         AbstractPreferenceController implements PreferenceControllerMixin,
         Preference.OnPreferenceChangeListener {
@@ -86,7 +86,7 @@
 
     @Override
     public ResultPayload getResultPayload() {
-        final Intent intent = DatabaseIndexingUtils.buildSubsettingIntent(mContext,
+        final Intent intent = DatabaseIndexingUtils.buildSearchResultPageIntent(mContext,
                 AmbientDisplaySettings.class.getName(), KEY_AMBIENT_DISPLAY_NOTIFICATIONS,
                 mContext.getString(R.string.ambient_display_screen_title));
 
diff --git a/src/com/android/settings/display/AppGridView.java b/src/com/android/settings/display/AppGridView.java
index 2d52ef2..4b814d0 100644
--- a/src/com/android/settings/display/AppGridView.java
+++ b/src/com/android/settings/display/AppGridView.java
@@ -16,20 +16,23 @@
 
 package com.android.settings.display;
 
-import com.android.settings.R;
-
 import android.content.Context;
 import android.content.Intent;
 import android.content.pm.PackageManager;
 import android.content.pm.ResolveInfo;
 import android.graphics.drawable.Drawable;
+import android.os.UserHandle;
+import android.support.annotation.VisibleForTesting;
 import android.util.AttributeSet;
+import android.util.IconDrawableFactory;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.ArrayAdapter;
 import android.widget.GridView;
 import android.widget.ImageView;
 
+import com.android.settings.R;
+
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
@@ -63,7 +66,8 @@
     /**
      * Loads application labels and icons.
      */
-    private static class AppsAdapter extends ArrayAdapter<ActivityEntry> {
+    @VisibleForTesting
+    public static class AppsAdapter extends ArrayAdapter<ActivityEntry> {
         private final PackageManager mPackageManager;
         private final int mIconResId;
 
@@ -80,9 +84,8 @@
         public View getView(int position, View convertView, ViewGroup parent) {
             final View view = super.getView(position, convertView, parent);
             final ActivityEntry entry = getItem(position);
-            final ImageView iconView = (ImageView) view.findViewById(mIconResId);
-            final Drawable icon = entry.info.loadIcon(mPackageManager);
-            iconView.setImageDrawable(icon);
+            final ImageView iconView = view.findViewById(mIconResId);
+            iconView.setImageDrawable(entry.getIcon());
             return view;
         }
 
@@ -108,10 +111,11 @@
             final PackageManager pm = mPackageManager;
             final ArrayList<ActivityEntry> results = new ArrayList<>();
             final List<ResolveInfo> infos = pm.queryIntentActivities(mainIntent, 0);
+            final IconDrawableFactory iconFactory = IconDrawableFactory.newInstance(getContext());
             for (ResolveInfo info : infos) {
                 final CharSequence label = info.loadLabel(pm);
                 if (label != null) {
-                    results.add(new ActivityEntry(info, label.toString()));
+                    results.add(new ActivityEntry(info, label.toString(), iconFactory));
                 }
             }
 
@@ -124,13 +128,19 @@
     /**
      * Class used for caching the activity label and icon.
      */
-    private static class ActivityEntry implements Comparable<ActivityEntry> {
+    @VisibleForTesting
+    public static class ActivityEntry implements Comparable<ActivityEntry> {
+
         public final ResolveInfo info;
         public final String label;
+        private final IconDrawableFactory mIconFactory;
+        private final int mUserId;
 
-        public ActivityEntry(ResolveInfo info, String label) {
+        public ActivityEntry(ResolveInfo info, String label, IconDrawableFactory iconFactory) {
             this.info = info;
             this.label = label;
+            mIconFactory = iconFactory;
+            mUserId = UserHandle.myUserId();
         }
 
         @Override
@@ -142,5 +152,10 @@
         public String toString() {
             return label;
         }
+
+        public Drawable getIcon() {
+            return mIconFactory.getBadgedIcon(
+                    info.activityInfo, info.activityInfo.applicationInfo, mUserId);
+        }
     }
 }
diff --git a/src/com/android/settings/display/AutoBrightnessPreferenceController.java b/src/com/android/settings/display/AutoBrightnessPreferenceController.java
index e74a1a0..d71a1f8 100644
--- a/src/com/android/settings/display/AutoBrightnessPreferenceController.java
+++ b/src/com/android/settings/display/AutoBrightnessPreferenceController.java
@@ -16,65 +16,54 @@
 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 com.android.settings.DisplaySettings;
-import com.android.settings.core.PreferenceControllerMixin;
+import com.android.settings.core.TogglePreferenceController;
 import com.android.settings.search.DatabaseIndexingUtils;
 import com.android.settings.search.InlineSwitchPayload;
 import com.android.settings.search.ResultPayload;
 import com.android.settings.R;
-import com.android.settingslib.core.AbstractPreferenceController;
 
 import static android.provider.Settings.System.SCREEN_BRIGHTNESS_MODE;
 import static android.provider.Settings.System.SCREEN_BRIGHTNESS_MODE_AUTOMATIC;
 import static android.provider.Settings.System.SCREEN_BRIGHTNESS_MODE_MANUAL;
 
 
-public class AutoBrightnessPreferenceController extends AbstractPreferenceController implements
-        PreferenceControllerMixin, Preference.OnPreferenceChangeListener {
-
-    private final String mAutoBrightnessKey;
+public class AutoBrightnessPreferenceController extends TogglePreferenceController {
 
     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;
+        super(context, key);
     }
 
     @Override
-    public boolean isAvailable() {
-        return mContext.getResources().getBoolean(
-                com.android.internal.R.bool.config_automatic_brightness_available);
+    public boolean isChecked() {
+        return Settings.System.getInt(mContext.getContentResolver(),
+                SYSTEM_KEY, DEFAULT_VALUE) != DEFAULT_VALUE;
     }
 
     @Override
-    public String getPreferenceKey() {
-        return mAutoBrightnessKey;
-    }
-
-    @Override
-    public void updateState(Preference preference) {
-        int brightnessMode = Settings.System.getInt(mContext.getContentResolver(),
-                SYSTEM_KEY, DEFAULT_VALUE);
-        ((SwitchPreference) preference).setChecked(brightnessMode != DEFAULT_VALUE);
-    }
-
-    @Override
-    public boolean onPreferenceChange(Preference preference, Object newValue) {
-        boolean auto = (Boolean) newValue;
+    public void setChecked(boolean isChecked) {
         Settings.System.putInt(mContext.getContentResolver(), SYSTEM_KEY,
-                auto ? SCREEN_BRIGHTNESS_MODE_AUTOMATIC : DEFAULT_VALUE);
-        return true;
+                isChecked ? SCREEN_BRIGHTNESS_MODE_AUTOMATIC : DEFAULT_VALUE);
+    }
+
+    @Override
+    @AvailabilityStatus
+    public int getAvailabilityStatus() {
+        return mContext.getResources().getBoolean(
+                com.android.internal.R.bool.config_automatic_brightness_available)
+                ? AVAILABLE
+                : DISABLED_UNSUPPORTED;
     }
 
     @Override
     public ResultPayload getResultPayload() {
-        final Intent intent = DatabaseIndexingUtils.buildSubsettingIntent(mContext,
-                DisplaySettings.class.getName(), mAutoBrightnessKey,
+        // TODO remove result payload
+        final Intent intent = DatabaseIndexingUtils.buildSearchResultPageIntent(mContext,
+                DisplaySettings.class.getName(), getPreferenceKey(),
                 mContext.getString(R.string.display_settings));
 
         return new InlineSwitchPayload(SYSTEM_KEY,
diff --git a/src/com/android/settings/display/BrightnessLevelPreferenceController.java b/src/com/android/settings/display/BrightnessLevelPreferenceController.java
index 78fec32..ee573eb 100644
--- a/src/com/android/settings/display/BrightnessLevelPreferenceController.java
+++ b/src/com/android/settings/display/BrightnessLevelPreferenceController.java
@@ -31,6 +31,7 @@
 import android.util.Log;
 
 import com.android.settings.core.PreferenceControllerMixin;
+import com.android.settings.wrapper.PowerManagerWrapper;
 import com.android.settingslib.core.AbstractPreferenceController;
 import com.android.settingslib.core.lifecycle.Lifecycle;
 import com.android.settingslib.core.lifecycle.LifecycleObserver;
diff --git a/src/com/android/settings/display/ColorModePreferenceFragment.java b/src/com/android/settings/display/ColorModePreferenceFragment.java
index 07cf82e..e3fb65d 100644
--- a/src/com/android/settings/display/ColorModePreferenceFragment.java
+++ b/src/com/android/settings/display/ColorModePreferenceFragment.java
@@ -17,7 +17,7 @@
 import android.graphics.drawable.Drawable;
 import android.support.annotation.VisibleForTesting;
 
-import com.android.internal.app.NightDisplayController;
+import com.android.internal.app.ColorDisplayController;
 import com.android.internal.logging.nano.MetricsProto;
 
 import com.android.settings.R;
@@ -36,12 +36,17 @@
     @VisibleForTesting
     static final String KEY_COLOR_MODE_SATURATED = "color_mode_saturated";
 
-    private NightDisplayController mController;
+    private ColorDisplayController mController;
 
     @Override
     public void onAttach(Context context) {
         super.onAttach(context);
-        mController = new NightDisplayController(context);
+        mController = new ColorDisplayController(context);
+    }
+
+    @Override
+    protected int getPreferenceScreenResId() {
+        return R.xml.color_mode_settings;
     }
 
     @Override
@@ -59,10 +64,10 @@
 
     @Override
     protected String getDefaultKey() {
-        if (mController.getColorMode() == NightDisplayController.COLOR_MODE_SATURATED) {
+        if (mController.getColorMode() == ColorDisplayController.COLOR_MODE_SATURATED) {
             return KEY_COLOR_MODE_SATURATED;
         }
-        if (mController.getColorMode() == NightDisplayController.COLOR_MODE_BOOSTED) {
+        if (mController.getColorMode() == ColorDisplayController.COLOR_MODE_BOOSTED) {
             return KEY_COLOR_MODE_BOOSTED;
         }
         return KEY_COLOR_MODE_NATURAL;
@@ -72,13 +77,13 @@
     protected boolean setDefaultKey(String key) {
         switch (key) {
             case KEY_COLOR_MODE_NATURAL:
-                mController.setColorMode(NightDisplayController.COLOR_MODE_NATURAL);
+                mController.setColorMode(ColorDisplayController.COLOR_MODE_NATURAL);
                 break;
             case KEY_COLOR_MODE_BOOSTED:
-                mController.setColorMode(NightDisplayController.COLOR_MODE_BOOSTED);
+                mController.setColorMode(ColorDisplayController.COLOR_MODE_BOOSTED);
                 break;
             case KEY_COLOR_MODE_SATURATED:
-                mController.setColorMode(NightDisplayController.COLOR_MODE_SATURATED);
+                mController.setColorMode(ColorDisplayController.COLOR_MODE_SATURATED);
                 break;
         }
         return true;
diff --git a/src/com/android/settings/display/DensityPreference.java b/src/com/android/settings/display/DensityPreference.java
index a62e6b5..581a3ee 100644
--- a/src/com/android/settings/display/DensityPreference.java
+++ b/src/com/android/settings/display/DensityPreference.java
@@ -27,6 +27,7 @@
 
 import com.android.settings.R;
 import com.android.settingslib.CustomEditTextPreference;
+import com.android.settings.Utils;
 import com.android.settingslib.display.DisplayDensityUtils;
 
 import java.text.NumberFormat;
@@ -63,6 +64,7 @@
         if (editText != null) {
             editText.setInputType(InputType.TYPE_CLASS_NUMBER);
             editText.setText(getCurrentSwDp() + "");
+            Utils.setEditTextCursorPosition(editText);
         }
     }
 
diff --git a/src/com/android/settings/display/NightDisplayPreference.java b/src/com/android/settings/display/NightDisplayPreference.java
index b966530..ea39f75 100644
--- a/src/com/android/settings/display/NightDisplayPreference.java
+++ b/src/com/android/settings/display/NightDisplayPreference.java
@@ -18,7 +18,7 @@
 import android.support.v14.preference.SwitchPreference;
 import android.util.AttributeSet;
 
-import com.android.internal.app.NightDisplayController;
+import com.android.internal.app.ColorDisplayController;
 import com.android.settings.R;
 
 import java.text.DateFormat;
@@ -27,15 +27,15 @@
 import java.util.TimeZone;
 
 public class NightDisplayPreference extends SwitchPreference
-        implements NightDisplayController.Callback {
+        implements ColorDisplayController.Callback {
 
-    private NightDisplayController mController;
+    private ColorDisplayController mController;
     private DateFormat mTimeFormatter;
 
     public NightDisplayPreference(Context context, AttributeSet attrs) {
         super(context, attrs);
 
-        mController = new NightDisplayController(context);
+        mController = new ColorDisplayController(context);
         mTimeFormatter = android.text.format.DateFormat.getTimeFormat(context);
         mTimeFormatter.setTimeZone(TimeZone.getTimeZone("UTC"));
     }
@@ -78,12 +78,12 @@
         final String autoModeSummary;
         switch (autoMode) {
             default:
-            case NightDisplayController.AUTO_MODE_DISABLED:
+            case ColorDisplayController.AUTO_MODE_DISABLED:
                 autoModeSummary = context.getString(isActivated
                         ? R.string.night_display_summary_on_auto_mode_never
                         : R.string.night_display_summary_off_auto_mode_never);
                 break;
-            case NightDisplayController.AUTO_MODE_CUSTOM:
+            case ColorDisplayController.AUTO_MODE_CUSTOM:
                 if (isActivated) {
                     autoModeSummary = context.getString(
                             R.string.night_display_summary_on_auto_mode_custom,
@@ -94,7 +94,7 @@
                             getFormattedTimeString(mController.getCustomStartTime()));
                 }
                 break;
-            case NightDisplayController.AUTO_MODE_TWILIGHT:
+            case ColorDisplayController.AUTO_MODE_TWILIGHT:
                 autoModeSummary = context.getString(isActivated
                         ? R.string.night_display_summary_on_auto_mode_twilight
                         : R.string.night_display_summary_off_auto_mode_twilight);
diff --git a/src/com/android/settings/display/NightDisplayPreferenceController.java b/src/com/android/settings/display/NightDisplayPreferenceController.java
index f42e324..2761eca 100644
--- a/src/com/android/settings/display/NightDisplayPreferenceController.java
+++ b/src/com/android/settings/display/NightDisplayPreferenceController.java
@@ -15,7 +15,7 @@
 
 import android.content.Context;
 
-import com.android.internal.app.NightDisplayController;
+import com.android.internal.app.ColorDisplayController;
 import com.android.settings.core.PreferenceControllerMixin;
 import com.android.settingslib.core.AbstractPreferenceController;
 
@@ -30,11 +30,11 @@
 
     @Override
     public boolean isAvailable() {
-        return NightDisplayController.isAvailable(mContext);
+        return ColorDisplayController.isAvailable(mContext);
     }
 
     @Override
     public String getPreferenceKey() {
         return KEY_NIGHT_DISPLAY;
     }
-}
+}
\ No newline at end of file
diff --git a/src/com/android/settings/display/NightDisplaySettings.java b/src/com/android/settings/display/NightDisplaySettings.java
index 5879297..4e0ebcd 100644
--- a/src/com/android/settings/display/NightDisplaySettings.java
+++ b/src/com/android/settings/display/NightDisplaySettings.java
@@ -20,27 +20,34 @@
 import android.app.TimePickerDialog;
 import android.content.Context;
 import android.os.Bundle;
+import android.provider.SearchIndexableResource;
 import android.support.v7.preference.DropDownPreference;
 import android.support.v7.preference.Preference;
 import android.support.v7.preference.TwoStatePreference;
-import android.widget.TimePicker;
 
-import com.android.internal.app.NightDisplayController;
+import com.android.internal.app.ColorDisplayController;
 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.widget.SeekBarPreference;
 import com.android.settings.SettingsPreferenceFragment;
+import com.android.settingslib.core.AbstractPreferenceController;
 
 import java.text.DateFormat;
 import java.time.LocalTime;
+import java.util.ArrayList;
 import java.util.Calendar;
+import java.util.List;
 import java.util.TimeZone;
 
 /**
  * Settings screen for Night display.
+ * TODO (b/69912911) Upgrade to Dashboard fragment
  */
 public class NightDisplaySettings extends SettingsPreferenceFragment
-        implements NightDisplayController.Callback, Preference.OnPreferenceChangeListener {
+        implements ColorDisplayController.Callback, Preference.OnPreferenceChangeListener,
+        Indexable {
 
     private static final String KEY_NIGHT_DISPLAY_AUTO_MODE = "night_display_auto_mode";
     private static final String KEY_NIGHT_DISPLAY_START_TIME = "night_display_start_time";
@@ -51,7 +58,7 @@
     private static final int DIALOG_START_TIME = 0;
     private static final int DIALOG_END_TIME = 1;
 
-    private NightDisplayController mController;
+    private ColorDisplayController mController;
     private DateFormat mTimeFormatter;
 
     private DropDownPreference mAutoModePreference;
@@ -65,7 +72,7 @@
         super.onCreate(savedInstanceState);
 
         final Context context = getContext();
-        mController = new NightDisplayController(context);
+        mController = new ColorDisplayController(context);
 
         mTimeFormatter = android.text.format.DateFormat.getTimeFormat(context);
         mTimeFormatter.setTimeZone(TimeZone.getTimeZone("UTC"));
@@ -75,7 +82,7 @@
     }
 
     @Override
-    protected int getHelpResource() {
+    public int getHelpResource() {
         return R.string.help_url_night_display;
     }
 
@@ -92,15 +99,15 @@
         mActivatedPreference = (TwoStatePreference) findPreference(KEY_NIGHT_DISPLAY_ACTIVATED);
         mTemperaturePreference = (SeekBarPreference) findPreference(KEY_NIGHT_DISPLAY_TEMPERATURE);
 
-        mAutoModePreference.setEntries(new CharSequence[] {
+        mAutoModePreference.setEntries(new CharSequence[]{
                 getString(R.string.night_display_auto_mode_never),
                 getString(R.string.night_display_auto_mode_custom),
                 getString(R.string.night_display_auto_mode_twilight)
         });
-        mAutoModePreference.setEntryValues(new CharSequence[] {
-                String.valueOf(NightDisplayController.AUTO_MODE_DISABLED),
-                String.valueOf(NightDisplayController.AUTO_MODE_CUSTOM),
-                String.valueOf(NightDisplayController.AUTO_MODE_TWILIGHT)
+        mAutoModePreference.setEntryValues(new CharSequence[]{
+                String.valueOf(ColorDisplayController.AUTO_MODE_DISABLED),
+                String.valueOf(ColorDisplayController.AUTO_MODE_CUSTOM),
+                String.valueOf(ColorDisplayController.AUTO_MODE_TWILIGHT)
         });
         mAutoModePreference.setOnPreferenceChangeListener(this);
         mActivatedPreference.setOnPreferenceChangeListener(this);
@@ -155,15 +162,12 @@
 
             final Context context = getContext();
             final boolean use24HourFormat = android.text.format.DateFormat.is24HourFormat(context);
-            return new TimePickerDialog(context, new TimePickerDialog.OnTimeSetListener() {
-                @Override
-                public void onTimeSet(TimePicker view, int hourOfDay, int minute) {
-                    final LocalTime time = LocalTime.of(hourOfDay, minute);
-                    if (dialogId == DIALOG_START_TIME) {
-                        mController.setCustomStartTime(time);
-                    } else {
-                        mController.setCustomEndTime(time);
-                    }
+            return new TimePickerDialog(context, (view, hourOfDay, minute) -> {
+                final LocalTime time = LocalTime.of(hourOfDay, minute);
+                if (dialogId == DIALOG_START_TIME) {
+                    mController.setCustomStartTime(time);
+                } else {
+                    mController.setCustomEndTime(time);
                 }
             }, initialTime.getHour(), initialTime.getMinute(), use24HourFormat);
         }
@@ -192,7 +196,7 @@
     public void onAutoModeChanged(int autoMode) {
         mAutoModePreference.setValue(String.valueOf(autoMode));
 
-        final boolean showCustomSchedule = autoMode == NightDisplayController.AUTO_MODE_CUSTOM;
+        final boolean showCustomSchedule = autoMode == ColorDisplayController.AUTO_MODE_CUSTOM;
         mStartTimePreference.setVisible(showCustomSchedule);
         mEndTimePreference.setVisible(showCustomSchedule);
     }
@@ -247,4 +251,23 @@
     public int getMetricsCategory() {
         return MetricsEvent.NIGHT_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.night_display_settings;
+                    result.add(sir);
+                    return result;
+                }
+
+                @Override
+                protected boolean isPageSearchEnabled(Context context) {
+                    return ColorDisplayController.isAvailable(context);
+                }
+            };
 }
diff --git a/src/com/android/settings/display/NightModePreferenceController.java b/src/com/android/settings/display/NightModePreferenceController.java
index 7e9701b..96ef938 100644
--- a/src/com/android/settings/display/NightModePreferenceController.java
+++ b/src/com/android/settings/display/NightModePreferenceController.java
@@ -13,6 +13,8 @@
  */
 package com.android.settings.display;
 
+import static android.content.Context.UI_MODE_SERVICE;
+
 import android.app.UiModeManager;
 import android.content.Context;
 import android.support.v7.preference.ListPreference;
@@ -23,8 +25,6 @@
 import com.android.settings.core.PreferenceControllerMixin;
 import com.android.settingslib.core.AbstractPreferenceController;
 
-import static android.content.Context.UI_MODE_SERVICE;
-
 public class NightModePreferenceController extends AbstractPreferenceController implements
         PreferenceControllerMixin, Preference.OnPreferenceChangeListener {
 
@@ -48,7 +48,7 @@
     @Override
     public void displayPreference(PreferenceScreen screen) {
         if (!isAvailable()) {
-            removePreference(screen, KEY_NIGHT_MODE);
+            setVisible(screen, KEY_NIGHT_MODE, false /* visible */);
             return;
         }
         ListPreference mNightModePreference = (ListPreference) screen.findPreference(
diff --git a/src/com/android/settings/display/PowerManagerWrapper.java b/src/com/android/settings/display/PowerManagerWrapper.java
deleted file mode 100644
index afa2f33..0000000
--- a/src/com/android/settings/display/PowerManagerWrapper.java
+++ /dev/null
@@ -1,49 +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.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/ScreenZoomPreference.java b/src/com/android/settings/display/ScreenZoomPreference.java
index 07f61f8..9fe082d 100644
--- a/src/com/android/settings/display/ScreenZoomPreference.java
+++ b/src/com/android/settings/display/ScreenZoomPreference.java
@@ -34,10 +34,6 @@
                 android.support.v7.preference.R.attr.preferenceStyle,
                 android.R.attr.preferenceStyle));
 
-        if (TextUtils.isEmpty(getFragment())) {
-            setFragment("com.android.settings.display.ScreenZoomSettings");
-        }
-
         final DisplayDensityUtils density = new DisplayDensityUtils(context);
         final int defaultIndex = density.getCurrentIndex();
         if (defaultIndex < 0) {
diff --git a/src/com/android/settings/display/ScreenZoomSettings.java b/src/com/android/settings/display/ScreenZoomSettings.java
index ec3999b..6b5216e 100644
--- a/src/com/android/settings/display/ScreenZoomSettings.java
+++ b/src/com/android/settings/display/ScreenZoomSettings.java
@@ -22,6 +22,7 @@
 import android.content.res.Resources;
 import android.os.Bundle;
 import android.view.Display;
+
 import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
 import com.android.settings.PreviewSeekBarPreferenceFragment;
 import com.android.settings.R;
@@ -48,7 +49,7 @@
         mActivityLayoutResId = R.layout.screen_zoom_activity;
 
         // This should be replaced once the final preview sample screen is in place.
-        mPreviewSampleResIds = new int[]{R.layout.screen_zoom_preview_1,
+        mPreviewSampleResIds = new int[] {R.layout.screen_zoom_preview_1,
                 R.layout.screen_zoom_preview_2,
                 R.layout.screen_zoom_preview_settings};
 
@@ -60,8 +61,8 @@
             // connect to the window manager service. Just use the current
             // density and don't let the user change anything.
             final int densityDpi = getResources().getDisplayMetrics().densityDpi;
-            mValues = new int[] { densityDpi };
-            mEntries = new String[] { getString(DisplayDensityUtils.SUMMARY_DEFAULT) };
+            mValues = new int[] {densityDpi};
+            mEntries = new String[] {getString(DisplayDensityUtils.SUMMARY_DEFAULT)};
             mInitialIndex = 0;
             mDefaultDensity = densityDpi;
         } else {
@@ -70,6 +71,8 @@
             mInitialIndex = initialIndex;
             mDefaultDensity = density.getDefaultDensity();
         }
+
+        getActivity().setTitle(R.string.screen_zoom_title);
     }
 
     @Override
@@ -107,10 +110,12 @@
     public static final SearchIndexProvider SEARCH_INDEX_DATA_PROVIDER =
             new BaseSearchIndexProvider() {
                 @Override
-                public List<SearchIndexableRaw> getRawDataToIndex(Context context, boolean enabled) {
+                public List<SearchIndexableRaw> getRawDataToIndex(Context context,
+                        boolean enabled) {
                     final Resources res = context.getResources();
                     final SearchIndexableRaw data = new SearchIndexableRaw(context);
                     data.title = res.getString(R.string.screen_zoom_title);
+                    data.key = "screen_zoom_settings";
                     data.screenTitle = res.getString(R.string.screen_zoom_title);
                     data.keywords = res.getString(R.string.screen_zoom_keywords);
 
diff --git a/src/com/android/settings/display/ShowOperatorNamePreferenceController.java b/src/com/android/settings/display/ShowOperatorNamePreferenceController.java
new file mode 100644
index 0000000..4573c6d
--- /dev/null
+++ b/src/com/android/settings/display/ShowOperatorNamePreferenceController.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.display;
+
+import android.content.Context;
+import android.provider.Settings;
+import android.support.v14.preference.SwitchPreference;
+import android.support.v7.preference.Preference;
+
+import com.android.settings.R;
+import com.android.settings.core.PreferenceControllerMixin;
+import com.android.settingslib.core.AbstractPreferenceController;
+
+public class ShowOperatorNamePreferenceController extends AbstractPreferenceController
+        implements PreferenceControllerMixin, Preference.OnPreferenceChangeListener {
+
+    private static final String KEY_SHOW_OPERATOR_NAME = "show_operator_name";
+
+    public ShowOperatorNamePreferenceController(Context context) {
+        super(context);
+    }
+
+    @Override
+    public boolean isAvailable() {
+        return mContext.getResources().getBoolean(R.bool.config_showOperatorNameInStatusBar);
+    }
+
+    @Override
+    public String getPreferenceKey() {
+        return KEY_SHOW_OPERATOR_NAME;
+    }
+
+    @Override
+    public boolean onPreferenceChange(Preference preference, Object newValue) {
+        boolean value = (Boolean) newValue;
+        Settings.Secure.putInt(mContext.getContentResolver(),
+                KEY_SHOW_OPERATOR_NAME, value ? 1 : 0);
+        return true;
+    }
+
+    @Override
+    public void updateState(Preference preference) {
+        int value = Settings.Secure.getInt(mContext.getContentResolver(),
+                KEY_SHOW_OPERATOR_NAME, 1);
+        ((SwitchPreference) preference).setChecked(value != 0);
+    }
+}
diff --git a/src/com/android/settings/display/VrDisplayPreferencePicker.java b/src/com/android/settings/display/VrDisplayPreferencePicker.java
index bccdaa5..5487c46 100644
--- a/src/com/android/settings/display/VrDisplayPreferencePicker.java
+++ b/src/com/android/settings/display/VrDisplayPreferencePicker.java
@@ -33,6 +33,11 @@
     static final String PREF_KEY_PREFIX = "vr_display_pref_";
 
     @Override
+    protected int getPreferenceScreenResId() {
+        return R.xml.vr_display_settings;
+    }
+
+    @Override
     public int getMetricsCategory() {
         return MetricsProto.MetricsEvent.VR_DISPLAY_PREFERENCE;
     }
diff --git a/src/com/android/settings/dream/CurrentDreamPicker.java b/src/com/android/settings/dream/CurrentDreamPicker.java
index da9bf9e..f0d520c 100644
--- a/src/com/android/settings/dream/CurrentDreamPicker.java
+++ b/src/com/android/settings/dream/CurrentDreamPicker.java
@@ -16,11 +16,11 @@
 
 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.R;
 import com.android.settings.widget.RadioButtonPickerFragment;
 import com.android.settingslib.dream.DreamBackend;
 import com.android.settingslib.dream.DreamBackend.DreamInfo;
@@ -41,6 +41,11 @@
     }
 
     @Override
+    protected int getPreferenceScreenResId() {
+        return R.xml.current_dream_settings;
+    }
+
+    @Override
     public int getMetricsCategory() {
         return MetricsProto.MetricsEvent.DREAM;
     }
diff --git a/src/com/android/settings/dream/DreamSettings.java b/src/com/android/settings/dream/DreamSettings.java
index 94ec149..c3eaa7f 100644
--- a/src/com/android/settings/dream/DreamSettings.java
+++ b/src/com/android/settings/dream/DreamSettings.java
@@ -99,7 +99,7 @@
     }
 
     @Override
-    protected int getHelpResource() {
+    public int getHelpResource() {
         return R.string.help_url_screen_saver;
     }
 
diff --git a/src/com/android/settings/dream/WhenToDreamPicker.java b/src/com/android/settings/dream/WhenToDreamPicker.java
index a55064d..7031bdf 100644
--- a/src/com/android/settings/dream/WhenToDreamPicker.java
+++ b/src/com/android/settings/dream/WhenToDreamPicker.java
@@ -38,6 +38,11 @@
     }
 
     @Override
+    protected int getPreferenceScreenResId() {
+        return R.xml.when_to_dream_settings;
+    }
+
+    @Override
     public int getMetricsCategory() {
         return MetricsProto.MetricsEvent.DREAM;
     }
diff --git a/src/com/android/settings/enterprise/AdminGrantedCameraPermissionPreferenceController.java b/src/com/android/settings/enterprise/AdminGrantedCameraPermissionPreferenceController.java
index be41e4d..6b4e70d 100644
--- a/src/com/android/settings/enterprise/AdminGrantedCameraPermissionPreferenceController.java
+++ b/src/com/android/settings/enterprise/AdminGrantedCameraPermissionPreferenceController.java
@@ -17,18 +17,14 @@
 import android.Manifest;
 import android.content.Context;
 
-import com.android.settingslib.core.lifecycle.Lifecycle;
-
 public class AdminGrantedCameraPermissionPreferenceController extends
         AdminGrantedPermissionsPreferenceControllerBase {
 
     private static final String KEY_ENTERPRISE_PRIVACY_NUMBER_CAMERA_ACCESS_PACKAGES
             = "enterprise_privacy_number_camera_access_packages";
 
-    public AdminGrantedCameraPermissionPreferenceController(Context context, Lifecycle lifecycle,
-            boolean async) {
-        super(context, lifecycle, async, new String[] {Manifest.permission.CAMERA},
-                Manifest.permission_group.CAMERA);
+    public AdminGrantedCameraPermissionPreferenceController(Context context, boolean async) {
+        super(context, async, new String[] {Manifest.permission.CAMERA});
     }
 
     @Override
diff --git a/src/com/android/settings/enterprise/AdminGrantedLocationPermissionsPreferenceController.java b/src/com/android/settings/enterprise/AdminGrantedLocationPermissionsPreferenceController.java
index 77c6040..5c6dfc2 100644
--- a/src/com/android/settings/enterprise/AdminGrantedLocationPermissionsPreferenceController.java
+++ b/src/com/android/settings/enterprise/AdminGrantedLocationPermissionsPreferenceController.java
@@ -17,18 +17,15 @@
 import android.Manifest;
 import android.content.Context;
 
-import com.android.settingslib.core.lifecycle.Lifecycle;
-
 public class AdminGrantedLocationPermissionsPreferenceController extends
         AdminGrantedPermissionsPreferenceControllerBase {
 
     private static final String KEY_ENTERPRISE_PRIVACY_NUMBER_LOCATION_ACCESS_PACKAGES
             = "enterprise_privacy_number_location_access_packages";
 
-    public AdminGrantedLocationPermissionsPreferenceController(Context context, Lifecycle lifecycle,
-            boolean async) {
-        super(context, lifecycle, async, new String[] {Manifest.permission.ACCESS_COARSE_LOCATION,
-                Manifest.permission.ACCESS_FINE_LOCATION}, Manifest.permission_group.LOCATION);
+    public AdminGrantedLocationPermissionsPreferenceController(Context context, boolean async) {
+        super(context, async, new String[] {Manifest.permission.ACCESS_COARSE_LOCATION,
+                Manifest.permission.ACCESS_FINE_LOCATION});
     }
 
     @Override
diff --git a/src/com/android/settings/enterprise/AdminGrantedMicrophonePermissionPreferenceController.java b/src/com/android/settings/enterprise/AdminGrantedMicrophonePermissionPreferenceController.java
index 9896420..74e260a 100644
--- a/src/com/android/settings/enterprise/AdminGrantedMicrophonePermissionPreferenceController.java
+++ b/src/com/android/settings/enterprise/AdminGrantedMicrophonePermissionPreferenceController.java
@@ -17,18 +17,14 @@
 import android.Manifest;
 import android.content.Context;
 
-import com.android.settingslib.core.lifecycle.Lifecycle;
-
 public class AdminGrantedMicrophonePermissionPreferenceController extends
         AdminGrantedPermissionsPreferenceControllerBase {
 
     private static final String KEY_ENTERPRISE_PRIVACY_NUMBER_MICROPHONE_ACCESS_PACKAGES
             = "enterprise_privacy_number_microphone_access_packages";
 
-    public AdminGrantedMicrophonePermissionPreferenceController(Context context,
-            Lifecycle lifecycle, boolean async) {
-        super(context, lifecycle, async, new String[] {Manifest.permission.RECORD_AUDIO},
-                Manifest.permission_group.MICROPHONE);
+    public AdminGrantedMicrophonePermissionPreferenceController(Context context, boolean async) {
+        super(context, async, new String[] {Manifest.permission.RECORD_AUDIO});
     }
 
     @Override
diff --git a/src/com/android/settings/enterprise/AdminGrantedPermissionsPreferenceControllerBase.java b/src/com/android/settings/enterprise/AdminGrantedPermissionsPreferenceControllerBase.java
index 9187cec..dd5ab34 100644
--- a/src/com/android/settings/enterprise/AdminGrantedPermissionsPreferenceControllerBase.java
+++ b/src/com/android/settings/enterprise/AdminGrantedPermissionsPreferenceControllerBase.java
@@ -20,24 +20,22 @@
 
 import com.android.settings.R;
 import com.android.settings.applications.ApplicationFeatureProvider;
-import com.android.settings.core.DynamicAvailabilityPreferenceController;
+import com.android.settings.core.PreferenceControllerMixin;
 import com.android.settings.overlay.FeatureFactory;
-import com.android.settingslib.core.lifecycle.Lifecycle;
+import com.android.settingslib.core.AbstractPreferenceController;
 
 public abstract class AdminGrantedPermissionsPreferenceControllerBase
-        extends DynamicAvailabilityPreferenceController {
+        extends AbstractPreferenceController implements PreferenceControllerMixin {
 
     private final String[] mPermissions;
-    private final String mPermissionGroup;
     private final ApplicationFeatureProvider mFeatureProvider;
     private final boolean mAsync;
     private boolean mHasApps;
 
-    public AdminGrantedPermissionsPreferenceControllerBase(Context context, Lifecycle lifecycle,
-            boolean async, String[] permissions, String permissionGroup) {
-        super(context, lifecycle);
+    public AdminGrantedPermissionsPreferenceControllerBase(Context context, boolean async,
+            String[] permissions) {
+        super(context);
         mPermissions = permissions;
-        mPermissionGroup = permissionGroup;
         mFeatureProvider = FeatureFactory.getFactory(context)
                 .getApplicationFeatureProvider(context);
         mAsync = async;
@@ -58,7 +56,6 @@
                         mHasApps = true;
                     }
                     preference.setVisible(mHasApps);
-                    notifyOnAvailabilityUpdate(mHasApps);
                 });
     }
 
@@ -80,7 +77,6 @@
         mFeatureProvider.calculateNumberOfAppsWithAdminGrantedPermissions(mPermissions,
                 false /* async */, (num) -> haveAppsWithAdminGrantedPermissions[0] = num > 0);
         mHasApps = haveAppsWithAdminGrantedPermissions[0];
-        notifyOnAvailabilityUpdate(mHasApps);
         return mHasApps;
     }
 
diff --git a/src/com/android/settings/enterprise/AlwaysOnVpnCurrentUserPreferenceController.java b/src/com/android/settings/enterprise/AlwaysOnVpnCurrentUserPreferenceController.java
index ed91fef..883fd36 100644
--- a/src/com/android/settings/enterprise/AlwaysOnVpnCurrentUserPreferenceController.java
+++ b/src/com/android/settings/enterprise/AlwaysOnVpnCurrentUserPreferenceController.java
@@ -17,18 +17,18 @@
 import android.support.v7.preference.Preference;
 
 import com.android.settings.R;
-import com.android.settings.core.DynamicAvailabilityPreferenceController;
+import com.android.settings.core.PreferenceControllerMixin;
 import com.android.settings.overlay.FeatureFactory;
-import com.android.settingslib.core.lifecycle.Lifecycle;
+import com.android.settingslib.core.AbstractPreferenceController;
 
 public class AlwaysOnVpnCurrentUserPreferenceController
-        extends DynamicAvailabilityPreferenceController {
+        extends AbstractPreferenceController implements PreferenceControllerMixin {
 
     private static final String KEY_ALWAYS_ON_VPN_PRIMARY_USER = "always_on_vpn_primary_user";
     private final EnterprisePrivacyFeatureProvider mFeatureProvider;
 
-    public AlwaysOnVpnCurrentUserPreferenceController(Context context, Lifecycle lifecycle) {
-        super(context, lifecycle);
+    public AlwaysOnVpnCurrentUserPreferenceController(Context context) {
+        super(context);
         mFeatureProvider = FeatureFactory.getFactory(context)
                 .getEnterprisePrivacyFeatureProvider(context);
     }
@@ -42,9 +42,7 @@
 
     @Override
     public boolean isAvailable() {
-        final boolean available = mFeatureProvider.isAlwaysOnVpnSetInCurrentUser();
-        notifyOnAvailabilityUpdate(available);
-        return available;
+        return mFeatureProvider.isAlwaysOnVpnSetInCurrentUser();
     }
 
     @Override
diff --git a/src/com/android/settings/enterprise/AlwaysOnVpnManagedProfilePreferenceController.java b/src/com/android/settings/enterprise/AlwaysOnVpnManagedProfilePreferenceController.java
index db6fc1d..a23af0c 100644
--- a/src/com/android/settings/enterprise/AlwaysOnVpnManagedProfilePreferenceController.java
+++ b/src/com/android/settings/enterprise/AlwaysOnVpnManagedProfilePreferenceController.java
@@ -15,27 +15,25 @@
 
 import android.content.Context;
 
-import com.android.settings.core.DynamicAvailabilityPreferenceController;
+import com.android.settings.core.PreferenceControllerMixin;
 import com.android.settings.overlay.FeatureFactory;
-import com.android.settingslib.core.lifecycle.Lifecycle;
+import com.android.settingslib.core.AbstractPreferenceController;
 
 public class AlwaysOnVpnManagedProfilePreferenceController
-        extends DynamicAvailabilityPreferenceController {
+        extends AbstractPreferenceController implements PreferenceControllerMixin {
 
     private static final String KEY_ALWAYS_ON_VPN_MANAGED_PROFILE = "always_on_vpn_managed_profile";
     private final EnterprisePrivacyFeatureProvider mFeatureProvider;
 
-    public AlwaysOnVpnManagedProfilePreferenceController(Context context, Lifecycle lifecycle) {
-        super(context, lifecycle);
+    public AlwaysOnVpnManagedProfilePreferenceController(Context context) {
+        super(context);
         mFeatureProvider = FeatureFactory.getFactory(context)
                 .getEnterprisePrivacyFeatureProvider(context);
     }
 
     @Override
     public boolean isAvailable() {
-        final boolean available = mFeatureProvider.isAlwaysOnVpnSetInManagedProfile();
-        notifyOnAvailabilityUpdate(available);
-        return available;
+        return mFeatureProvider.isAlwaysOnVpnSetInManagedProfile();
     }
 
     @Override
diff --git a/src/com/android/settings/enterprise/ApplicationListPreferenceController.java b/src/com/android/settings/enterprise/ApplicationListPreferenceController.java
index eee9b33..8be7944 100644
--- a/src/com/android/settings/enterprise/ApplicationListPreferenceController.java
+++ b/src/com/android/settings/enterprise/ApplicationListPreferenceController.java
@@ -20,12 +20,13 @@
 import android.content.pm.PackageManager;
 import android.support.v7.preference.Preference;
 import android.support.v7.preference.PreferenceScreen;
+import android.util.IconDrawableFactory;
 
-import com.android.settings.R;
 import com.android.settings.SettingsPreferenceFragment;
 import com.android.settings.applications.ApplicationFeatureProvider;
 import com.android.settings.applications.UserAppInfo;
 import com.android.settings.core.PreferenceControllerMixin;
+import com.android.settings.widget.AppPreference;
 import com.android.settingslib.core.AbstractPreferenceController;
 
 import java.util.List;
@@ -63,13 +64,13 @@
         if (screen == null) {
             return;
         }
+        final IconDrawableFactory iconDrawableFactory = IconDrawableFactory.newInstance(mContext);
         final Context prefContext = mParent.getPreferenceManager().getContext();
         for (int position = 0; position < result.size(); position++) {
             final UserAppInfo item = result.get(position);
-            final Preference preference = new Preference(prefContext);
-            preference.setLayoutResource(R.layout.preference_app);
+            final Preference preference = new AppPreference(prefContext);
             preference.setTitle(item.appInfo.loadLabel(mPm));
-            preference.setIcon(item.appInfo.loadIcon(mPm));
+            preference.setIcon(iconDrawableFactory.getBadgedIcon(item.appInfo));
             preference.setOrder(position);
             preference.setSelectable(false);
             screen.addPreference(preference);
diff --git a/src/com/android/settings/enterprise/CaCertsCurrentUserPreferenceController.java b/src/com/android/settings/enterprise/CaCertsCurrentUserPreferenceController.java
index 30da907..e328fc5 100644
--- a/src/com/android/settings/enterprise/CaCertsCurrentUserPreferenceController.java
+++ b/src/com/android/settings/enterprise/CaCertsCurrentUserPreferenceController.java
@@ -20,16 +20,13 @@
 
 import com.android.settings.R;
 
-import com.android.settingslib.core.lifecycle.Lifecycle;
-
 public class CaCertsCurrentUserPreferenceController extends CaCertsPreferenceControllerBase {
 
     @VisibleForTesting
     static final String CA_CERTS_CURRENT_USER = "ca_certs_current_user";
 
-    public CaCertsCurrentUserPreferenceController(Context context,
-            Lifecycle lifecycle) {
-        super(context, lifecycle);
+    public CaCertsCurrentUserPreferenceController(Context context) {
+        super(context);
     }
 
     @Override
diff --git a/src/com/android/settings/enterprise/CaCertsManagedProfilePreferenceController.java b/src/com/android/settings/enterprise/CaCertsManagedProfilePreferenceController.java
index 2b4e72d..94b923f 100644
--- a/src/com/android/settings/enterprise/CaCertsManagedProfilePreferenceController.java
+++ b/src/com/android/settings/enterprise/CaCertsManagedProfilePreferenceController.java
@@ -17,16 +17,13 @@
 import android.content.Context;
 import android.support.annotation.VisibleForTesting;
 
-import com.android.settingslib.core.lifecycle.Lifecycle;
-
 public class CaCertsManagedProfilePreferenceController extends CaCertsPreferenceControllerBase {
 
     @VisibleForTesting
     static final String CA_CERTS_MANAGED_PROFILE = "ca_certs_managed_profile";
 
-    public CaCertsManagedProfilePreferenceController(Context context,
-            Lifecycle lifecycle) {
-        super(context, lifecycle);
+    public CaCertsManagedProfilePreferenceController(Context context) {
+        super(context);
     }
 
     @Override
diff --git a/src/com/android/settings/enterprise/CaCertsPreferenceControllerBase.java b/src/com/android/settings/enterprise/CaCertsPreferenceControllerBase.java
index 8009caf..b9df20a 100644
--- a/src/com/android/settings/enterprise/CaCertsPreferenceControllerBase.java
+++ b/src/com/android/settings/enterprise/CaCertsPreferenceControllerBase.java
@@ -18,17 +18,17 @@
 import android.support.v7.preference.Preference;
 
 import com.android.settings.R;
-import com.android.settings.core.DynamicAvailabilityPreferenceController;
+import com.android.settings.core.PreferenceControllerMixin;
 import com.android.settings.overlay.FeatureFactory;
-import com.android.settingslib.core.lifecycle.Lifecycle;
+import com.android.settingslib.core.AbstractPreferenceController;
 
 public abstract class CaCertsPreferenceControllerBase
-        extends DynamicAvailabilityPreferenceController {
+        extends AbstractPreferenceController implements PreferenceControllerMixin {
 
     protected final EnterprisePrivacyFeatureProvider mFeatureProvider;
 
-    public CaCertsPreferenceControllerBase(Context context, Lifecycle lifecycle) {
-        super(context, lifecycle);
+    public CaCertsPreferenceControllerBase(Context context) {
+        super(context);
         mFeatureProvider = FeatureFactory.getFactory(context)
                 .getEnterprisePrivacyFeatureProvider(context);
     }
@@ -42,9 +42,7 @@
 
     @Override
     public boolean isAvailable() {
-        final boolean available = getNumberOfCaCerts() > 0;
-        notifyOnAvailabilityUpdate(available);
-        return available;
+        return getNumberOfCaCerts() > 0;
     }
 
     protected abstract int getNumberOfCaCerts();
diff --git a/src/com/android/settings/enterprise/DevicePolicyManagerWrapper.java b/src/com/android/settings/enterprise/DevicePolicyManagerWrapper.java
deleted file mode 100644
index ede241a..0000000
--- a/src/com/android/settings/enterprise/DevicePolicyManagerWrapper.java
+++ /dev/null
@@ -1,161 +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.enterprise;
-
-import android.annotation.NonNull;
-import android.content.ComponentName;
-import android.content.Intent;
-import android.os.UserHandle;
-import android.support.annotation.Nullable;
-
-import java.util.List;
-
-/**
- * This interface replicates a subset of the android.app.admin.DevicePolicyManager (DPM). The
- * interface exists so that we can use a thin wrapper around the DPM in production code and a mock
- * in tests. We cannot directly mock or shadow the DPM, because some of the methods we rely on are
- * newer than the API version supported by Robolectric.
- */
-public interface DevicePolicyManagerWrapper {
-    /**
-     * Calls {@code DevicePolicyManager.getActiveAdminsAsUser()}.
-     *
-     * @see android.app.admin.DevicePolicyManager#getActiveAdminsAsUser
-     */
-    public @Nullable List<ComponentName> getActiveAdminsAsUser(int userId);
-
-    /**
-     * Calls {@code DevicePolicyManager.getMaximumFailedPasswordsForWipe()}.
-     *
-     * @see android.app.admin.DevicePolicyManager#getMaximumFailedPasswordsForWipe
-     */
-    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
-     */
-    ComponentName getDeviceOwnerComponentOnAnyUser();
-
-    /**
-     * Calls {@code DevicePolicyManager.getProfileOwnerAsUser()}.
-     *
-     * @see android.app.admin.DevicePolicyManager#getProfileOwnerAsUser
-     */
-    @Nullable ComponentName getProfileOwnerAsUser(final int userId);
-
-    /**
-     * Calls {@code DevicePolicyManager.getDeviceOwnerNameOnAnyUser()}.
-     *
-     * @see android.app.admin.DevicePolicyManager#getDeviceOwnerNameOnAnyUser
-     */
-    CharSequence getDeviceOwnerOrganizationName();
-
-    /**
-     * Calls {@code DevicePolicyManager.getPermissionGrantState()}.
-     *
-     * @see android.app.admin.DevicePolicyManager#getPermissionGrantState
-     */
-    int getPermissionGrantState(@Nullable ComponentName admin, String packageName,
-            String permission);
-
-    /**
-     * Calls {@code DevicePolicyManager.isSecurityLoggingEnabled()}.
-     *
-     * @see android.app.admin.DevicePolicyManager#isSecurityLoggingEnabled
-     */
-    boolean isSecurityLoggingEnabled(@Nullable ComponentName admin);
-
-    /**
-     * Calls {@code DevicePolicyManager.isNetworkLoggingEnabled()}.
-     *
-     * @see android.app.admin.DevicePolicyManager#isNetworkLoggingEnabled
-     */
-    boolean isNetworkLoggingEnabled(@Nullable ComponentName admin);
-
-    /**
-     * Calls {@code DevicePolicyManager.getLastSecurityLogRetrievalTime()}.
-     *
-     * @see android.app.admin.DevicePolicyManager#getLastSecurityLogRetrievalTime
-     */
-    long getLastSecurityLogRetrievalTime();
-
-    /**
-     * Calls {@code DevicePolicyManager.getLastBugReportRequestTime()}.
-     *
-     * @see android.app.admin.DevicePolicyManager#getLastBugReportRequestTime
-     */
-    long getLastBugReportRequestTime();
-
-    /**
-     * Calls {@code DevicePolicyManager.getLastNetworkLogRetrievalTime()}.
-     *
-     * @see android.app.admin.DevicePolicyManager#getLastNetworkLogRetrievalTime
-     */
-    long getLastNetworkLogRetrievalTime();
-
-    /**
-     * Calls {@code DevicePolicyManager.isCurrentInputMethodSetByOwner()}.
-     *
-     * @see android.app.admin.DevicePolicyManager#isCurrentInputMethodSetByOwner
-     */
-    boolean isCurrentInputMethodSetByOwner();
-
-
-    /**
-     * Calls {@code DevicePolicyManager.getOwnerInstalledCaCerts()}.
-     *
-     * @see android.app.admin.DevicePolicyManager#getOwnerInstalledCaCerts
-     */
-    List<String> getOwnerInstalledCaCerts(@NonNull UserHandle user);
-
-    /**
-     * Calls {@code DevicePolicyManager.isDeviceOwnerAppOnAnyUser()}.
-     *
-     * @see android.app.admin.DevicePolicyManager#isDeviceOwnerAppOnAnyUser
-     */
-    boolean isDeviceOwnerAppOnAnyUser(String packageName);
-
-    /**
-     * Calls {@code DevicePolicyManager.packageHasActiveAdmins()}.
-     *
-     * @see android.app.admin.DevicePolicyManager#packageHasActiveAdmins
-     */
-    boolean packageHasActiveAdmins(String packageName);
-
-    /**
-     * Calls {@code DevicePolicyManager.isUninstallInQueue()}.
-     *
-     * @see android.app.admin.DevicePolicyManager#isUninstallInQueue
-     */
-    boolean isUninstallInQueue(String packageName);
-
-    /**
-     * Calls {@code DevicePolicyManager.createAdminSupportIntent()}.
-     *
-     * @see android.app.admin.DevicePolicyManager#createAdminSupportIntent
-     */
-    Intent createAdminSupportIntent(String restriction);
-}
diff --git a/src/com/android/settings/enterprise/DevicePolicyManagerWrapperImpl.java b/src/com/android/settings/enterprise/DevicePolicyManagerWrapperImpl.java
deleted file mode 100644
index 69ee272..0000000
--- a/src/com/android/settings/enterprise/DevicePolicyManagerWrapperImpl.java
+++ /dev/null
@@ -1,125 +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.enterprise;
-
-import android.annotation.NonNull;
-import android.app.admin.DevicePolicyManager;
-import android.content.ComponentName;
-import android.content.Intent;
-import android.os.UserHandle;
-import android.support.annotation.Nullable;
-
-import java.util.List;
-
-public class DevicePolicyManagerWrapperImpl implements DevicePolicyManagerWrapper {
-    private final DevicePolicyManager mDpm;
-
-    public DevicePolicyManagerWrapperImpl(DevicePolicyManager dpm) {
-        mDpm = dpm;
-    }
-
-    @Override
-    public @Nullable List<ComponentName> getActiveAdminsAsUser(int userId) {
-        return mDpm.getActiveAdminsAsUser(userId);
-    }
-
-    @Override
-    public int getMaximumFailedPasswordsForWipe(@Nullable ComponentName admin, int userHandle) {
-        return mDpm.getMaximumFailedPasswordsForWipe(admin, userHandle);
-    }
-
-    @Override
-    public ComponentName getDeviceOwnerComponentOnCallingUser() {
-        return mDpm.getDeviceOwnerComponentOnCallingUser();
-    }
-
-    @Override
-    public ComponentName getDeviceOwnerComponentOnAnyUser() {
-        return mDpm.getDeviceOwnerComponentOnAnyUser();
-    }
-
-    @Override
-    public @Nullable ComponentName getProfileOwnerAsUser(final int userId) {
-        return mDpm.getProfileOwnerAsUser(userId);
-    }
-
-    @Override
-    public CharSequence getDeviceOwnerOrganizationName() {
-        return mDpm.getDeviceOwnerOrganizationName();
-    }
-
-    @Override
-    public int getPermissionGrantState(@Nullable ComponentName admin, String packageName,
-            String permission) {
-        return mDpm.getPermissionGrantState(admin, packageName, permission);
-    }
-
-    @Override
-    public boolean isSecurityLoggingEnabled(@Nullable ComponentName admin) {
-        return mDpm.isSecurityLoggingEnabled(admin);
-    }
-
-    @Override
-    public boolean isNetworkLoggingEnabled(@Nullable ComponentName admin) {
-        return mDpm.isNetworkLoggingEnabled(admin);
-    }
-
-    @Override
-    public long getLastSecurityLogRetrievalTime() {
-        return mDpm.getLastSecurityLogRetrievalTime();
-    }
-
-    @Override
-    public long getLastBugReportRequestTime() {
-        return mDpm.getLastBugReportRequestTime();
-    }
-
-    @Override
-    public long getLastNetworkLogRetrievalTime() {
-        return mDpm.getLastNetworkLogRetrievalTime();
-    }
-
-    @Override
-    public boolean isCurrentInputMethodSetByOwner() {
-        return mDpm.isCurrentInputMethodSetByOwner();
-    }
-
-    @Override
-    public List<String> getOwnerInstalledCaCerts(@NonNull UserHandle user) {
-        return mDpm.getOwnerInstalledCaCerts(user);
-    }
-
-    @Override
-    public boolean isDeviceOwnerAppOnAnyUser(String packageName) {
-        return mDpm.isDeviceOwnerAppOnAnyUser(packageName);
-    }
-
-    @Override
-    public boolean packageHasActiveAdmins(String packageName) {
-        return mDpm.packageHasActiveAdmins(packageName);
-    }
-
-    @Override
-    public boolean isUninstallInQueue(String packageName) {
-        return mDpm.isUninstallInQueue(packageName);
-    }
-
-    @Override
-    public Intent createAdminSupportIntent(@NonNull String restriction) {
-        return mDpm.createAdminSupportIntent(restriction);
-    }
-}
diff --git a/src/com/android/settings/enterprise/EnterpriseInstalledPackagesPreferenceController.java b/src/com/android/settings/enterprise/EnterpriseInstalledPackagesPreferenceController.java
index cced8e8..1086c0e 100644
--- a/src/com/android/settings/enterprise/EnterpriseInstalledPackagesPreferenceController.java
+++ b/src/com/android/settings/enterprise/EnterpriseInstalledPackagesPreferenceController.java
@@ -18,21 +18,20 @@
 
 import com.android.settings.R;
 import com.android.settings.applications.ApplicationFeatureProvider;
-import com.android.settings.core.DynamicAvailabilityPreferenceController;
+import com.android.settings.core.PreferenceControllerMixin;
 import com.android.settings.overlay.FeatureFactory;
-import com.android.settingslib.core.lifecycle.Lifecycle;
+import com.android.settingslib.core.AbstractPreferenceController;
 
 public class EnterpriseInstalledPackagesPreferenceController
-        extends DynamicAvailabilityPreferenceController {
+        extends AbstractPreferenceController implements PreferenceControllerMixin {
 
     private static final String KEY_NUMBER_ENTERPRISE_INSTALLED_PACKAGES
             = "number_enterprise_installed_packages";
     private final ApplicationFeatureProvider mFeatureProvider;
     private final boolean mAsync;
 
-    public EnterpriseInstalledPackagesPreferenceController(Context context, Lifecycle lifecycle,
-            boolean async) {
-        super(context, lifecycle);
+    public EnterpriseInstalledPackagesPreferenceController(Context context, boolean async) {
+        super(context);
         mFeatureProvider = FeatureFactory.getFactory(context)
                 .getApplicationFeatureProvider(context);
         mAsync = async;
@@ -53,7 +52,6 @@
 
                     }
                     preference.setVisible(available);
-                    notifyOnAvailabilityUpdate(available);
                 });
     }
 
@@ -72,9 +70,8 @@
         final Boolean[] haveEnterpriseInstalledPackages = { null };
         mFeatureProvider.calculateNumberOfPolicyInstalledApps(false /* async */,
                 (num) -> haveEnterpriseInstalledPackages[0] = num > 0);
-        final boolean available = haveEnterpriseInstalledPackages[0];
-        notifyOnAvailabilityUpdate(available);
-        return available;
+        return haveEnterpriseInstalledPackages[0];
+
     }
 
     @Override
diff --git a/src/com/android/settings/enterprise/EnterprisePrivacyFeatureProviderImpl.java b/src/com/android/settings/enterprise/EnterprisePrivacyFeatureProviderImpl.java
index 159f57b..9217001 100644
--- a/src/com/android/settings/enterprise/EnterprisePrivacyFeatureProviderImpl.java
+++ b/src/com/android/settings/enterprise/EnterprisePrivacyFeatureProviderImpl.java
@@ -30,9 +30,10 @@
 import android.view.View;
 
 import com.android.settings.R;
-import com.android.settings.applications.PackageManagerWrapper;
-import com.android.settings.vpn2.ConnectivityManagerWrapper;
 import com.android.settings.vpn2.VpnUtils;
+import com.android.settings.wrapper.ConnectivityManagerWrapper;
+import com.android.settings.wrapper.DevicePolicyManagerWrapper;
+import com.android.settingslib.wrapper.PackageManagerWrapper;
 
 import java.util.Date;
 import java.util.List;
diff --git a/src/com/android/settings/enterprise/EnterprisePrivacyPreferenceController.java b/src/com/android/settings/enterprise/EnterprisePrivacyPreferenceController.java
index 6ec091b..11fc29e 100644
--- a/src/com/android/settings/enterprise/EnterprisePrivacyPreferenceController.java
+++ b/src/com/android/settings/enterprise/EnterprisePrivacyPreferenceController.java
@@ -17,23 +17,27 @@
 import android.support.v7.preference.Preference;
 
 import com.android.settings.R;
-import com.android.settings.core.DynamicAvailabilityPreferenceController;
+import com.android.settings.core.PreferenceControllerMixin;
 import com.android.settings.overlay.FeatureFactory;
-import com.android.settingslib.core.lifecycle.Lifecycle;
+import com.android.settingslib.core.AbstractPreferenceController;
 
-public class EnterprisePrivacyPreferenceController extends DynamicAvailabilityPreferenceController {
+public class EnterprisePrivacyPreferenceController extends AbstractPreferenceController implements
+        PreferenceControllerMixin {
 
     private static final String KEY_ENTERPRISE_PRIVACY = "enterprise_privacy";
     private final EnterprisePrivacyFeatureProvider mFeatureProvider;
 
-    public EnterprisePrivacyPreferenceController(Context context, Lifecycle lifecycle) {
-        super(context, lifecycle);
+    public EnterprisePrivacyPreferenceController(Context context) {
+        super(context);
         mFeatureProvider = FeatureFactory.getFactory(context)
                 .getEnterprisePrivacyFeatureProvider(context);
     }
 
     @Override
     public void updateState(Preference preference) {
+        if (preference == null) {
+            return;
+        }
         final String organizationName = mFeatureProvider.getDeviceOwnerOrganizationName();
         if (organizationName == null) {
             preference.setSummary(R.string.enterprise_privacy_settings_summary_generic);
@@ -45,9 +49,7 @@
 
     @Override
     public boolean isAvailable() {
-        final boolean available = mFeatureProvider.hasDeviceOwner();
-        notifyOnAvailabilityUpdate(available);
-        return available;
+        return mFeatureProvider.hasDeviceOwner();
     }
 
     @Override
diff --git a/src/com/android/settings/enterprise/EnterprisePrivacySettings.java b/src/com/android/settings/enterprise/EnterprisePrivacySettings.java
index 4caec30..0628dbb 100644
--- a/src/com/android/settings/enterprise/EnterprisePrivacySettings.java
+++ b/src/com/android/settings/enterprise/EnterprisePrivacySettings.java
@@ -21,12 +21,11 @@
 
 import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
 import com.android.settings.R;
-import com.android.settings.core.DynamicAvailabilityPreferenceController;
 import com.android.settings.dashboard.DashboardFragment;
 import com.android.settings.overlay.FeatureFactory;
 import com.android.settings.search.BaseSearchIndexProvider;
+import com.android.settings.widget.PreferenceCategoryController;
 import com.android.settingslib.core.AbstractPreferenceController;
-import com.android.settingslib.core.lifecycle.Lifecycle;
 
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -53,45 +52,41 @@
 
     @Override
     protected List<AbstractPreferenceController> getPreferenceControllers(Context context) {
-        return buildPreferenceControllers(context, getLifecycle(), true /* async */);
+        return buildPreferenceControllers(context, true /* async */);
     }
 
     private static List<AbstractPreferenceController> buildPreferenceControllers(Context context,
-            Lifecycle lifecycle, boolean async) {
+            boolean async) {
         final List<AbstractPreferenceController> controllers = new ArrayList<>();
         controllers.add(new NetworkLogsPreferenceController(context));
         controllers.add(new BugReportsPreferenceController(context));
         controllers.add(new SecurityLogsPreferenceController(context));
-        final List<DynamicAvailabilityPreferenceController> exposureChangesCategoryControllers =
+        final List<AbstractPreferenceController> exposureChangesCategoryControllers =
                 new ArrayList<>();
         exposureChangesCategoryControllers.add(new EnterpriseInstalledPackagesPreferenceController(
-                context, lifecycle, async));
+                context, async));
         exposureChangesCategoryControllers.add(
-                new AdminGrantedLocationPermissionsPreferenceController(context, lifecycle, async));
+                new AdminGrantedLocationPermissionsPreferenceController(context, async));
         exposureChangesCategoryControllers.add(
-                new AdminGrantedMicrophonePermissionPreferenceController(context, lifecycle,
-                        async));
+                new AdminGrantedMicrophonePermissionPreferenceController(context, async));
         exposureChangesCategoryControllers.add(new AdminGrantedCameraPermissionPreferenceController(
-                context, lifecycle, async));
+                context, async));
         exposureChangesCategoryControllers.add(new EnterpriseSetDefaultAppsPreferenceController(
-                context, lifecycle));
+                context));
         exposureChangesCategoryControllers.add(new AlwaysOnVpnCurrentUserPreferenceController(
-                context, lifecycle));
+                context));
         exposureChangesCategoryControllers.add(new AlwaysOnVpnManagedProfilePreferenceController(
-                context, lifecycle));
-        exposureChangesCategoryControllers.add(new ImePreferenceController(context, lifecycle));
-        exposureChangesCategoryControllers.add(new GlobalHttpProxyPreferenceController(context,
-                lifecycle));
-        exposureChangesCategoryControllers.add(new CaCertsCurrentUserPreferenceController(
-                context, lifecycle));
+                context));
+        exposureChangesCategoryControllers.add(new ImePreferenceController(context));
+        exposureChangesCategoryControllers.add(new GlobalHttpProxyPreferenceController(context));
+        exposureChangesCategoryControllers.add(new CaCertsCurrentUserPreferenceController(context));
         exposureChangesCategoryControllers.add(new CaCertsManagedProfilePreferenceController(
-                context, lifecycle));
+                context));
         controllers.addAll(exposureChangesCategoryControllers);
-        controllers.add(new ExposureChangesCategoryPreferenceController(context, lifecycle,
-                exposureChangesCategoryControllers, async));
-        controllers.add(new FailedPasswordWipeCurrentUserPreferenceController(context, lifecycle));
-        controllers.add(new FailedPasswordWipeManagedProfilePreferenceController(context,
-                lifecycle));
+        controllers.add(new PreferenceCategoryController(context, "exposure_changes_category",
+                exposureChangesCategoryControllers));
+        controllers.add(new FailedPasswordWipeCurrentUserPreferenceController(context));
+        controllers.add(new FailedPasswordWipeManagedProfilePreferenceController(context));
         return controllers;
     }
 
@@ -114,11 +109,12 @@
                     final SearchIndexableResource sir = new SearchIndexableResource(context);
                     sir.xmlResId = R.xml.enterprise_privacy_settings;
                     return Arrays.asList(sir);
-            }
+                }
 
-            @Override
-            public List<AbstractPreferenceController> getPreferenceControllers(Context context) {
-                return buildPreferenceControllers(context, null /* lifecycle */, false /* async */);
+                @Override
+                public List<AbstractPreferenceController> getPreferenceControllers(
+                        Context context) {
+                    return buildPreferenceControllers(context, false /* async */);
                 }
             };
 }
diff --git a/src/com/android/settings/enterprise/EnterpriseSetDefaultAppsListPreferenceController.java b/src/com/android/settings/enterprise/EnterpriseSetDefaultAppsListPreferenceController.java
index 03a78ea..0927299 100644
--- a/src/com/android/settings/enterprise/EnterpriseSetDefaultAppsListPreferenceController.java
+++ b/src/com/android/settings/enterprise/EnterpriseSetDefaultAppsListPreferenceController.java
@@ -20,7 +20,6 @@
 import android.content.pm.ApplicationInfo;
 import android.content.pm.PackageManager;
 import android.content.pm.UserInfo;
-import android.os.Handler;
 import android.os.UserHandle;
 import android.support.v7.preference.Preference;
 import android.support.v7.preference.PreferenceCategory;
@@ -36,6 +35,7 @@
 import com.android.settings.overlay.FeatureFactory;
 import com.android.settings.users.UserFeatureProvider;
 import com.android.settingslib.core.AbstractPreferenceController;
+import com.android.settingslib.utils.ThreadUtils;
 
 import java.util.ArrayList;
 import java.util.Collections;
@@ -100,7 +100,7 @@
                 userMap.put(typeOfDefault, applicationInfos);
             }
         }
-        new Handler(mContext.getMainLooper()).post(() -> { updateUi(); });
+        ThreadUtils.postOnMainThread(() -> updateUi());
     }
 
     @Override
diff --git a/src/com/android/settings/enterprise/EnterpriseSetDefaultAppsPreferenceController.java b/src/com/android/settings/enterprise/EnterpriseSetDefaultAppsPreferenceController.java
index 537ef78..0f9584b 100644
--- a/src/com/android/settings/enterprise/EnterpriseSetDefaultAppsPreferenceController.java
+++ b/src/com/android/settings/enterprise/EnterpriseSetDefaultAppsPreferenceController.java
@@ -21,20 +21,20 @@
 import com.android.settings.R;
 import com.android.settings.applications.ApplicationFeatureProvider;
 import com.android.settings.applications.EnterpriseDefaultApps;
-import com.android.settings.core.DynamicAvailabilityPreferenceController;
+import com.android.settings.core.PreferenceControllerMixin;
 import com.android.settings.overlay.FeatureFactory;
 import com.android.settings.users.UserFeatureProvider;
-import com.android.settingslib.core.lifecycle.Lifecycle;
+import com.android.settingslib.core.AbstractPreferenceController;
 
 public class EnterpriseSetDefaultAppsPreferenceController
-        extends DynamicAvailabilityPreferenceController {
+        extends AbstractPreferenceController implements PreferenceControllerMixin {
 
     private static final String KEY_DEFAULT_APPS = "number_enterprise_set_default_apps";
     private final ApplicationFeatureProvider mApplicationFeatureProvider;
     private final UserFeatureProvider mUserFeatureProvider;
 
-    public EnterpriseSetDefaultAppsPreferenceController(Context context, Lifecycle lifecycle) {
-        super(context, lifecycle);
+    public EnterpriseSetDefaultAppsPreferenceController(Context context) {
+        super(context);
         final FeatureFactory factory = FeatureFactory.getFactory(context);
         mApplicationFeatureProvider = factory.getApplicationFeatureProvider(context);
         mUserFeatureProvider = factory.getUserFeatureProvider(context);
@@ -49,9 +49,7 @@
 
     @Override
     public boolean isAvailable() {
-        final boolean available = getNumberOfEnterpriseSetDefaultApps() > 0;
-        notifyOnAvailabilityUpdate(available);
-        return available;
+        return getNumberOfEnterpriseSetDefaultApps() > 0;
     }
 
     @Override
diff --git a/src/com/android/settings/enterprise/ExposureChangesCategoryPreferenceController.java b/src/com/android/settings/enterprise/ExposureChangesCategoryPreferenceController.java
deleted file mode 100644
index 7833325..0000000
--- a/src/com/android/settings/enterprise/ExposureChangesCategoryPreferenceController.java
+++ /dev/null
@@ -1,111 +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.enterprise;
-
-import android.content.Context;
-import android.support.v7.preference.Preference;
-
-import com.android.settings.core.DynamicAvailabilityPreferenceController;
-import com.android.settings.core.PreferenceAvailabilityObserver;
-import com.android.settingslib.core.lifecycle.Lifecycle;
-
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
-
-/**
- * A controller that hides a {@link android.support.v7.preference.PreferenceGroup} when none of the
- * {@link Preference}s inside it are visible.
- *
- * TODO(b/62051162): Use {@link android.support.v7.preference.PreferenceGroup}'s native ability to
- * hide itself when all {@link Preference}s inside it are invisible when that functionality becomes
- * available. This custom controller will still be needed to remove the
- * {@link android.support.v7.preference.PreferenceGroup} from the search index as required (by
- * having {@link #isAvailable()} return {@code false} if the method returns {@code false} for all
- * {@link Preference}s in the {@link android.support.v7.preference.PreferenceGroup}).
- */
-public class ExposureChangesCategoryPreferenceController
-        extends DynamicAvailabilityPreferenceController implements PreferenceAvailabilityObserver {
-
-    private static final String KEY_EXPOSURE_CHANGES_CATEGORY = "exposure_changes_category";
-    private final Set<String> mAvailablePrefs = new HashSet<String>();
-    private Preference mPreference = null;
-    private boolean mControllingUi;
-
-    /**
-     * When {@code controllingUi} is {@code true}, some of the preferences may have their visibility
-     * determined asynchronously. In this case, {@link #isAvailable()} must always return {@code
-     * true} and the group should be hidden using {@link Preference#setVisible()} if all preferences
-     * report that they are invisible.
-     * When {@code controllingUi} is {@code false}, we are running on the search indexer thread and
-     * visibility must be determined synchronously. {@link #isAvailable()} can rely on all
-     * preferences having their visibility determined already and should return whether the group is
-     * visible or not.
-     */
-    public ExposureChangesCategoryPreferenceController(Context context, Lifecycle lifecycle,
-            List<DynamicAvailabilityPreferenceController> controllers, boolean controllingUi) {
-        super(context, lifecycle);
-        mControllingUi = controllingUi;
-        for (final DynamicAvailabilityPreferenceController controller : controllers) {
-            controller.setAvailabilityObserver(this);
-        }
-    }
-
-    @Override
-    public void onPreferenceAvailabilityUpdated(String key, boolean available) {
-        if (available) {
-            mAvailablePrefs.add(key);
-        } else {
-            mAvailablePrefs.remove(key);
-        }
-        available = haveAnyVisiblePreferences();
-        if (mControllingUi) {
-            notifyOnAvailabilityUpdate(available);
-        }
-        if (mPreference != null) {
-            mPreference.setVisible(available);
-        }
-    }
-
-    @Override
-    public void updateState(Preference preference) {
-        mPreference = preference;
-        mPreference.setVisible(haveAnyVisiblePreferences());
-    }
-
-    @Override
-    public boolean isAvailable() {
-        if (mControllingUi) {
-            // When running on the main UI thread, some preferences determine their visibility
-            // asynchronously. Always return true here and determine the pref group's actual
-            // visibility as the other preferences report their visibility asynchronously via
-            // onPreferenceAvailabilityUpdated().
-            return true;
-        }
-        final boolean available = haveAnyVisiblePreferences();
-        notifyOnAvailabilityUpdate(available);
-        return available;
-    }
-
-    @Override
-    public String getPreferenceKey() {
-        return KEY_EXPOSURE_CHANGES_CATEGORY;
-    }
-
-    private boolean haveAnyVisiblePreferences() {
-        return mAvailablePrefs.size() > 0;
-    }
-}
diff --git a/src/com/android/settings/enterprise/FailedPasswordWipeCurrentUserPreferenceController.java b/src/com/android/settings/enterprise/FailedPasswordWipeCurrentUserPreferenceController.java
index d7f8dc0..f93025c 100644
--- a/src/com/android/settings/enterprise/FailedPasswordWipeCurrentUserPreferenceController.java
+++ b/src/com/android/settings/enterprise/FailedPasswordWipeCurrentUserPreferenceController.java
@@ -15,16 +15,14 @@
 
 import android.content.Context;
 
-import com.android.settingslib.core.lifecycle.Lifecycle;
-
 public class FailedPasswordWipeCurrentUserPreferenceController
         extends FailedPasswordWipePreferenceControllerBase {
 
     private static final String KEY_FAILED_PASSWORD_WIPE_CURRENT_USER
             = "failed_password_wipe_current_user";
 
-    public FailedPasswordWipeCurrentUserPreferenceController(Context context, Lifecycle lifecycle) {
-        super(context, lifecycle);
+    public FailedPasswordWipeCurrentUserPreferenceController(Context context) {
+        super(context);
     }
 
     @Override
diff --git a/src/com/android/settings/enterprise/FailedPasswordWipeManagedProfilePreferenceController.java b/src/com/android/settings/enterprise/FailedPasswordWipeManagedProfilePreferenceController.java
index 739003a..5a0e7c8 100644
--- a/src/com/android/settings/enterprise/FailedPasswordWipeManagedProfilePreferenceController.java
+++ b/src/com/android/settings/enterprise/FailedPasswordWipeManagedProfilePreferenceController.java
@@ -14,7 +14,6 @@
 package com.android.settings.enterprise;
 
 import android.content.Context;
-import com.android.settingslib.core.lifecycle.Lifecycle;
 
 public class FailedPasswordWipeManagedProfilePreferenceController
         extends FailedPasswordWipePreferenceControllerBase {
@@ -22,9 +21,8 @@
     private static final String KEY_FAILED_PASSWORD_WIPE_MANAGED_PROFILE
             = "failed_password_wipe_managed_profile";
 
-    public FailedPasswordWipeManagedProfilePreferenceController(Context context,
-            Lifecycle lifecycle) {
-        super(context, lifecycle);
+    public FailedPasswordWipeManagedProfilePreferenceController(Context context) {
+        super(context);
     }
 
     @Override
diff --git a/src/com/android/settings/enterprise/FailedPasswordWipePreferenceControllerBase.java b/src/com/android/settings/enterprise/FailedPasswordWipePreferenceControllerBase.java
index 298f911..3c78c21 100644
--- a/src/com/android/settings/enterprise/FailedPasswordWipePreferenceControllerBase.java
+++ b/src/com/android/settings/enterprise/FailedPasswordWipePreferenceControllerBase.java
@@ -15,21 +15,20 @@
 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.core.DynamicAvailabilityPreferenceController;
+import com.android.settings.core.PreferenceControllerMixin;
 import com.android.settings.overlay.FeatureFactory;
-import com.android.settingslib.core.lifecycle.Lifecycle;
+import com.android.settingslib.core.AbstractPreferenceController;
 
 public abstract class FailedPasswordWipePreferenceControllerBase
-        extends DynamicAvailabilityPreferenceController {
+        extends AbstractPreferenceController implements PreferenceControllerMixin {
 
     protected final EnterprisePrivacyFeatureProvider mFeatureProvider;
 
-    public FailedPasswordWipePreferenceControllerBase(Context context, Lifecycle lifecycle) {
-        super(context, lifecycle);
+    public FailedPasswordWipePreferenceControllerBase(Context context) {
+        super(context);
         mFeatureProvider = FeatureFactory.getFactory(context)
                 .getEnterprisePrivacyFeatureProvider(context);
     }
@@ -46,8 +45,6 @@
 
     @Override
     public boolean isAvailable() {
-        final boolean available = getMaximumFailedPasswordsBeforeWipe() > 0;
-        notifyOnAvailabilityUpdate(available);
-        return available;
+        return getMaximumFailedPasswordsBeforeWipe() > 0;
     }
 }
diff --git a/src/com/android/settings/enterprise/GlobalHttpProxyPreferenceController.java b/src/com/android/settings/enterprise/GlobalHttpProxyPreferenceController.java
index 55552b6..04e63aa 100644
--- a/src/com/android/settings/enterprise/GlobalHttpProxyPreferenceController.java
+++ b/src/com/android/settings/enterprise/GlobalHttpProxyPreferenceController.java
@@ -15,26 +15,25 @@
 
 import android.content.Context;
 
-import com.android.settings.core.DynamicAvailabilityPreferenceController;
+import com.android.settings.core.PreferenceControllerMixin;
 import com.android.settings.overlay.FeatureFactory;
-import com.android.settingslib.core.lifecycle.Lifecycle;
+import com.android.settingslib.core.AbstractPreferenceController;
 
-public class GlobalHttpProxyPreferenceController extends DynamicAvailabilityPreferenceController {
+public class GlobalHttpProxyPreferenceController extends AbstractPreferenceController implements
+        PreferenceControllerMixin {
 
     private static final String KEY_GLOBAL_HTTP_PROXY = "global_http_proxy";
     private final EnterprisePrivacyFeatureProvider mFeatureProvider;
 
-    public GlobalHttpProxyPreferenceController(Context context, Lifecycle lifecycle) {
-        super(context, lifecycle);
+    public GlobalHttpProxyPreferenceController(Context context) {
+        super(context);
         mFeatureProvider = FeatureFactory.getFactory(context)
                 .getEnterprisePrivacyFeatureProvider(context);
     }
 
     @Override
     public boolean isAvailable() {
-        final boolean available = mFeatureProvider.isGlobalHttpProxySet();
-        notifyOnAvailabilityUpdate(available);
-        return available;
+        return mFeatureProvider.isGlobalHttpProxySet();
     }
 
     @Override
diff --git a/src/com/android/settings/enterprise/ImePreferenceController.java b/src/com/android/settings/enterprise/ImePreferenceController.java
index ca52fc0..7a4ea2c 100644
--- a/src/com/android/settings/enterprise/ImePreferenceController.java
+++ b/src/com/android/settings/enterprise/ImePreferenceController.java
@@ -15,21 +15,21 @@
 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.core.DynamicAvailabilityPreferenceController;
+import com.android.settings.core.PreferenceControllerMixin;
 import com.android.settings.overlay.FeatureFactory;
-import com.android.settingslib.core.lifecycle.Lifecycle;
+import com.android.settingslib.core.AbstractPreferenceController;
 
-public class ImePreferenceController extends DynamicAvailabilityPreferenceController {
+public class ImePreferenceController extends AbstractPreferenceController implements
+        PreferenceControllerMixin {
 
     private static final String KEY_INPUT_METHOD = "input_method";
     private final EnterprisePrivacyFeatureProvider mFeatureProvider;
 
-    public ImePreferenceController(Context context, Lifecycle lifecycle) {
-        super(context, lifecycle);
+    public ImePreferenceController(Context context) {
+        super(context);
         mFeatureProvider = FeatureFactory.getFactory(context)
                 .getEnterprisePrivacyFeatureProvider(context);
     }
@@ -37,15 +37,13 @@
     @Override
     public void updateState(Preference preference) {
         preference.setSummary(mContext.getResources().getString(
-            R.string.enterprise_privacy_input_method_name,
-            mFeatureProvider.getImeLabelIfOwnerSet()));
+                R.string.enterprise_privacy_input_method_name,
+                mFeatureProvider.getImeLabelIfOwnerSet()));
     }
 
     @Override
     public boolean isAvailable() {
-        final boolean available = mFeatureProvider.getImeLabelIfOwnerSet() != null;
-        notifyOnAvailabilityUpdate(available);
-        return available;
+        return mFeatureProvider.getImeLabelIfOwnerSet() != null;
     }
 
     @Override
diff --git a/src/com/android/settings/fingerprint/FingerprintAuthenticateSidecar.java b/src/com/android/settings/fingerprint/FingerprintAuthenticateSidecar.java
new file mode 100644
index 0000000..d649c0b
--- /dev/null
+++ b/src/com/android/settings/fingerprint/FingerprintAuthenticateSidecar.java
@@ -0,0 +1,132 @@
+/*
+ * Copyright (C) 2017 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF 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.hardware.fingerprint.FingerprintManager;
+import android.hardware.fingerprint.FingerprintManager.AuthenticationResult;
+import android.os.CancellationSignal;
+
+import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
+import com.android.settings.core.InstrumentedPreferenceFragment;
+
+/**
+ * Sidecar fragment to handle the state around fingerprint authentication
+ */
+public class FingerprintAuthenticateSidecar extends InstrumentedPreferenceFragment {
+
+    private static final String TAG = "FingerprintAuthenticateSidecar";
+
+    private FingerprintManager mFingerprintManager;
+    private Listener mListener;
+    private AuthenticationResult mAuthenticationResult;
+    private CancellationSignal mCancellationSignal;
+    private AuthenticationError mAuthenticationError;
+
+    public interface Listener {
+        void onAuthenticationSucceeded(AuthenticationResult result);
+        void onAuthenticationFailed();
+        void onAuthenticationError(int errMsgId, CharSequence errString);
+        void onAuthenticationHelp(int helpMsgId, CharSequence helpString);
+    }
+
+    private class AuthenticationError {
+        int error;
+        CharSequence errorString;
+
+        public AuthenticationError(int errMsgId, CharSequence errString) {
+            error = errMsgId;
+            errorString = errString;
+        }
+    }
+
+    @Override
+    public int getMetricsCategory() {
+        return MetricsEvent.FINGERPRINT_AUTHENTICATE_SIDECAR;
+    }
+
+    private FingerprintManager.AuthenticationCallback mAuthenticationCallback =
+            new FingerprintManager.AuthenticationCallback() {
+                @Override
+                public void onAuthenticationSucceeded(AuthenticationResult result) {
+                    mCancellationSignal = null;
+                    if (mListener != null) {
+                        mListener.onAuthenticationSucceeded(result);
+                    } else {
+                        mAuthenticationResult = result;
+                        mAuthenticationError = null;
+                    }
+                }
+
+                @Override
+                public void onAuthenticationFailed() {
+                    if (mListener != null) {
+                        mListener.onAuthenticationFailed();
+                    }
+                }
+
+                @Override
+                public void onAuthenticationError(int errMsgId, CharSequence errString) {
+                    mCancellationSignal = null;
+                    if (mListener != null) {
+                        mListener.onAuthenticationError(errMsgId, errString);
+                    } else {
+                        mAuthenticationError = new AuthenticationError(errMsgId, errString);
+                        mAuthenticationResult = null;
+                    }
+                }
+
+                @Override
+                public void onAuthenticationHelp(int helpMsgId, CharSequence helpString) {
+                    if (mListener != null) {
+                        mListener.onAuthenticationHelp(helpMsgId, helpString);
+                    }
+                }
+    };
+
+    public void setFingerprintManager(FingerprintManager fingerprintManager) {
+        mFingerprintManager = fingerprintManager;
+    }
+
+    public void startAuthentication(int userId) {
+        mCancellationSignal = new CancellationSignal();
+        mFingerprintManager.authenticate(null, mCancellationSignal, 0 /* flags */,
+                mAuthenticationCallback, null, userId);
+    }
+
+    public void stopAuthentication() {
+        if (mCancellationSignal != null && !mCancellationSignal.isCanceled()) {
+            mCancellationSignal.cancel();
+        }
+        mCancellationSignal = null;
+    }
+
+    public void setListener(Listener listener) {
+        if (mListener == null && listener != null) {
+            if (mAuthenticationResult != null) {
+                listener.onAuthenticationSucceeded(mAuthenticationResult);
+                mAuthenticationResult = null;
+            }
+            if (mAuthenticationError != null &&
+                    mAuthenticationError.error != FingerprintManager.FINGERPRINT_ERROR_CANCELED) {
+                listener.onAuthenticationError(mAuthenticationError.error,
+                        mAuthenticationError.errorString);
+                mAuthenticationError = null;
+            }
+        }
+        mListener = listener;
+    }
+}
\ No newline at end of file
diff --git a/src/com/android/settings/fingerprint/FingerprintEnrollEnrolling.java b/src/com/android/settings/fingerprint/FingerprintEnrollEnrolling.java
index 66a9948..756f826 100644
--- a/src/com/android/settings/fingerprint/FingerprintEnrollEnrolling.java
+++ b/src/com/android/settings/fingerprint/FingerprintEnrollEnrolling.java
@@ -32,6 +32,8 @@
 import android.hardware.fingerprint.FingerprintManager;
 import android.os.Bundle;
 import android.os.UserHandle;
+import android.os.VibrationEffect;
+import android.os.Vibrator;
 import android.text.TextUtils;
 import android.view.MotionEvent;
 import android.view.View;
@@ -74,6 +76,9 @@
      */
     private static final int ICON_TOUCH_COUNT_SHOW_UNTIL_DIALOG_SHOWN = 3;
 
+    private static final VibrationEffect VIBRATE_EFFECT_ERROR =
+            VibrationEffect.createWaveform(new long[] {0, 5, 55, 60}, -1);
+
     private ProgressBar mProgressBar;
     private ObjectAnimator mProgressAnim;
     private TextView mStartMessage;
@@ -90,6 +95,7 @@
     private int mIndicatorBackgroundRestingColor;
     private int mIndicatorBackgroundActivatedColor;
     private boolean mRestoring;
+    private Vibrator mVibrator;
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
@@ -100,6 +106,7 @@
         mRepeatMessage = (TextView) findViewById(R.id.repeat_message);
         mErrorText = (TextView) findViewById(R.id.error_text);
         mProgressBar = (ProgressBar) findViewById(R.id.fingerprint_progress_bar);
+        mVibrator = getSystemService(Vibrator.class);
 
         Button skipButton = findViewById(R.id.skip_button);
         skipButton.setOnClickListener(this);
@@ -165,22 +172,6 @@
         startIconAnimation();
     }
 
-    @Override
-    protected void onResume() {
-        super.onResume();
-        if (mSidecar != null) {
-            mSidecar.setListener(this);
-        }
-    }
-
-    @Override
-    protected void onPause() {
-        super.onPause();
-        if (mSidecar != null) {
-            mSidecar.setListener(null);
-        }
-    }
-
     private void startIconAnimation() {
         mIconAnimationDrawable.start();
     }
@@ -384,6 +375,9 @@
             mErrorText.setAlpha(1f);
             mErrorText.setTranslationY(0f);
         }
+        if (isResumed()) {
+            mVibrator.vibrate(VIBRATE_EFFECT_ERROR);
+        }
     }
 
     private void clearError() {
@@ -394,12 +388,7 @@
                             R.dimen.fingerprint_error_text_disappear_distance))
                     .setDuration(100)
                     .setInterpolator(mFastOutLinearInInterpolator)
-                    .withEndAction(new Runnable() {
-                        @Override
-                        public void run() {
-                            mErrorText.setVisibility(View.INVISIBLE);
-                        }
-                    })
+                    .withEndAction(() -> mErrorText.setVisibility(View.INVISIBLE))
                     .start();
         }
     }
diff --git a/src/com/android/settings/fingerprint/FingerprintEnrollSidecar.java b/src/com/android/settings/fingerprint/FingerprintEnrollSidecar.java
index 9ab561d..20bb13b 100644
--- a/src/com/android/settings/fingerprint/FingerprintEnrollSidecar.java
+++ b/src/com/android/settings/fingerprint/FingerprintEnrollSidecar.java
@@ -29,8 +29,7 @@
 import com.android.settings.Utils;
 import com.android.settings.core.InstrumentedFragment;
 import com.android.settings.password.ChooseLockSettingsHelper;
-
-import com.android.settings.password.IFingerprintManager;
+import com.android.settings.wrapper.FingerprintManagerWrapper;
 
 import java.util.ArrayList;
 
@@ -48,7 +47,7 @@
     private byte[] mToken;
     private boolean mDone;
     private int mUserId;
-    private IFingerprintManager mFingerprintManager;
+    private FingerprintManagerWrapper mFingerprintManager;
     private ArrayList<QueuedEvent> mQueuedEvents;
 
     private abstract class QueuedEvent {
diff --git a/src/com/android/settings/fingerprint/FingerprintEnrollSuggestionActivity.java b/src/com/android/settings/fingerprint/FingerprintEnrollSuggestionActivity.java
new file mode 100644
index 0000000..4a4d08d
--- /dev/null
+++ b/src/com/android/settings/fingerprint/FingerprintEnrollSuggestionActivity.java
@@ -0,0 +1,33 @@
+/*
+ * Copyright (C) 2017 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF 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.content.Context;
+
+import com.android.settings.Utils;
+
+public class FingerprintEnrollSuggestionActivity extends FingerprintEnrollIntroduction {
+
+    public static boolean isSuggestionComplete(Context context) {
+        if (!Utils.hasFingerprintHardware(context)
+                || !FingerprintSuggestionActivity.isFingerprintEnabled(context)
+                || !Utils.hasFingerprintHardware(context)) {
+            return true;
+        }
+        return Utils.getFingerprintManagerOrNull(context).hasEnrolledFingerprints();
+    }
+}
diff --git a/src/com/android/settings/fingerprint/FingerprintSettings.java b/src/com/android/settings/fingerprint/FingerprintSettings.java
index 6a8a1fd..ad7f83a 100644
--- a/src/com/android/settings/fingerprint/FingerprintSettings.java
+++ b/src/com/android/settings/fingerprint/FingerprintSettings.java
@@ -29,8 +29,6 @@
 import android.graphics.drawable.Drawable;
 import android.hardware.fingerprint.Fingerprint;
 import android.hardware.fingerprint.FingerprintManager;
-import android.hardware.fingerprint.FingerprintManager.AuthenticationCallback;
-import android.hardware.fingerprint.FingerprintManager.AuthenticationResult;
 import android.os.Bundle;
 import android.os.CancellationSignal;
 import android.os.Handler;
@@ -152,41 +150,44 @@
         protected static final boolean DEBUG = true;
 
         private FingerprintManager mFingerprintManager;
-        private CancellationSignal mFingerprintCancel;
         private boolean mInFingerprintLockout;
         private byte[] mToken;
         private boolean mLaunchedConfirm;
         private Drawable mHighlightDrawable;
         private int mUserId;
 
+        private static final String TAG_AUTHENTICATE_SIDECAR = "authenticate_sidecar";
         private static final String TAG_REMOVAL_SIDECAR = "removal_sidecar";
+        private FingerprintAuthenticateSidecar mAuthenticateSidecar;
         private FingerprintRemoveSidecar mRemovalSidecar;
         private HashMap<Integer, String> mFingerprintsRenaming;
 
-        private AuthenticationCallback mAuthCallback = new AuthenticationCallback() {
-            @Override
-            public void onAuthenticationSucceeded(AuthenticationResult result) {
-                int fingerId = result.getFingerprint().getFingerId();
-                mHandler.obtainMessage(MSG_FINGER_AUTH_SUCCESS, fingerId, 0).sendToTarget();
-            }
+        FingerprintAuthenticateSidecar.Listener mAuthenticateListener =
+            new FingerprintAuthenticateSidecar.Listener() {
+                @Override
+                public void onAuthenticationSucceeded(
+                        FingerprintManager.AuthenticationResult result) {
+                    int fingerId = result.getFingerprint().getFingerId();
+                    mHandler.obtainMessage(MSG_FINGER_AUTH_SUCCESS, fingerId, 0).sendToTarget();
+                }
 
-            @Override
-            public void onAuthenticationFailed() {
-                mHandler.obtainMessage(MSG_FINGER_AUTH_FAIL).sendToTarget();
-            }
+                @Override
+                public void onAuthenticationFailed() {
+                    mHandler.obtainMessage(MSG_FINGER_AUTH_FAIL).sendToTarget();
+                }
 
-            @Override
-            public void onAuthenticationError(int errMsgId, CharSequence errString) {
-                mHandler.obtainMessage(MSG_FINGER_AUTH_ERROR, errMsgId, 0, errString)
-                        .sendToTarget();
-            }
+                @Override
+                public void onAuthenticationError(int errMsgId, CharSequence errString) {
+                    mHandler.obtainMessage(MSG_FINGER_AUTH_ERROR, errMsgId, 0, errString)
+                            .sendToTarget();
+                }
 
-            @Override
-            public void onAuthenticationHelp(int helpMsgId, CharSequence helpString) {
-                mHandler.obtainMessage(MSG_FINGER_AUTH_HELP, helpMsgId, 0, helpString)
-                        .sendToTarget();
-            }
-        };
+                @Override
+                public void onAuthenticationHelp(int helpMsgId, CharSequence helpString) {
+                    mHandler.obtainMessage(MSG_FINGER_AUTH_HELP, helpMsgId, 0, helpString)
+                            .sendToTarget();
+                }
+            };
 
         FingerprintRemoveSidecar.Listener mRemovalListener =
                 new FingerprintRemoveSidecar.Listener() {
@@ -223,7 +224,6 @@
                         retryFingerprint();
                     break;
                     case MSG_FINGER_AUTH_SUCCESS:
-                        mFingerprintCancel = null;
                         highlightFingerprintItem(msg.arg1);
                         retryFingerprint();
                     break;
@@ -241,18 +241,10 @@
             }
         };
 
-        private void stopFingerprint() {
-            if (mFingerprintCancel != null && !mFingerprintCancel.isCanceled()) {
-                mFingerprintCancel.cancel();
-            }
-            mFingerprintCancel = null;
-        }
-
         /**
          * @param errMsgId
          */
         protected void handleError(int errMsgId, CharSequence msg) {
-            mFingerprintCancel = null;
             switch (errMsgId) {
                 case FingerprintManager.FINGERPRINT_ERROR_CANCELED:
                     return; // Only happens if we get preempted by another activity. Ignored.
@@ -290,9 +282,8 @@
                 return;
             }
             if (!mInFingerprintLockout) {
-                mFingerprintCancel = new CancellationSignal();
-                mFingerprintManager.authenticate(null, mFingerprintCancel, 0 /* flags */,
-                        mAuthCallback, null, mUserId);
+                mAuthenticateSidecar.startAuthentication(mUserId);
+                mAuthenticateSidecar.setListener(mAuthenticateListener);
             }
         }
 
@@ -308,6 +299,15 @@
             Activity activity = getActivity();
             mFingerprintManager = Utils.getFingerprintManagerOrNull(activity);
 
+            mAuthenticateSidecar = (FingerprintAuthenticateSidecar)
+                    getFragmentManager().findFragmentByTag(TAG_AUTHENTICATE_SIDECAR);
+            if (mAuthenticateSidecar == null) {
+                mAuthenticateSidecar = new FingerprintAuthenticateSidecar();
+                getFragmentManager().beginTransaction()
+                        .add(mAuthenticateSidecar, TAG_AUTHENTICATE_SIDECAR).commit();
+            }
+            mAuthenticateSidecar.setFingerprintManager(mFingerprintManager);
+
             mRemovalSidecar = (FingerprintRemoveSidecar)
                     getFragmentManager().findFragmentByTag(TAG_REMOVAL_SIDECAR);
             if (mRemovalSidecar == null) {
@@ -454,10 +454,13 @@
         @Override
         public void onPause() {
             super.onPause();
-            stopFingerprint();
             if (mRemovalSidecar != null) {
                 mRemovalSidecar.setListener(null);
             }
+            if (mAuthenticateSidecar != null) {
+                mAuthenticateSidecar.setListener(null);
+                mAuthenticateSidecar.stopAuthentication();
+            }
         }
 
         @Override
@@ -542,7 +545,7 @@
         }
 
         @Override
-        protected int getHelpResource() {
+        public int getHelpResource() {
             return R.string.help_url_fingerprint;
         }
 
diff --git a/src/com/android/settings/fingerprint/FingerprintSuggestionActivity.java b/src/com/android/settings/fingerprint/FingerprintSuggestionActivity.java
index e1a4183..fa6aeb4 100644
--- a/src/com/android/settings/fingerprint/FingerprintSuggestionActivity.java
+++ b/src/com/android/settings/fingerprint/FingerprintSuggestionActivity.java
@@ -16,9 +16,13 @@
 
 package com.android.settings.fingerprint;
 
+import android.app.admin.DevicePolicyManager;
+import android.content.Context;
+import android.hardware.fingerprint.FingerprintManager;
 import android.widget.Button;
 
 import com.android.settings.R;
+import com.android.settings.Utils;
 
 public class FingerprintSuggestionActivity extends SetupFingerprintEnrollIntroduction {
 
@@ -36,4 +40,23 @@
         setResult(RESULT_CANCELED);
         super.finish();
     }
+
+    public static boolean isSuggestionComplete(Context context) {
+        return !Utils.hasFingerprintHardware(context)
+                || !isFingerprintEnabled(context)
+                || isNotSingleFingerprintEnrolled(context);
+    }
+
+    private static boolean isNotSingleFingerprintEnrolled(Context context) {
+        final FingerprintManager manager = Utils.getFingerprintManagerOrNull(context);
+        return manager == null || manager.getEnrolledFingerprints().size() != 1;
+    }
+
+    static boolean isFingerprintEnabled(Context context) {
+        final DevicePolicyManager dpManager =
+                (DevicePolicyManager) context.getSystemService(Context.DEVICE_POLICY_SERVICE);
+        final int dpmFlags = dpManager.getKeyguardDisabledFeatures(null, /* admin */
+                context.getUserId());
+        return (dpmFlags & DevicePolicyManager.KEYGUARD_DISABLE_FINGERPRINT) == 0;
+    }
 }
diff --git a/src/com/android/settings/fuelgauge/AdvancedPowerUsageDetail.java b/src/com/android/settings/fuelgauge/AdvancedPowerUsageDetail.java
index 3b83fa5..819846a 100644
--- a/src/com/android/settings/fuelgauge/AdvancedPowerUsageDetail.java
+++ b/src/com/android/settings/fuelgauge/AdvancedPowerUsageDetail.java
@@ -16,7 +16,9 @@
 
 package com.android.settings.fuelgauge;
 
+import android.annotation.UserIdInt;
 import android.app.Activity;
+import android.app.ActivityManager;
 import android.app.LoaderManager;
 import android.app.admin.DevicePolicyManager;
 import android.content.Context;
@@ -43,8 +45,8 @@
 import com.android.settings.Utils;
 import com.android.settings.applications.LayoutPreference;
 import com.android.settings.dashboard.DashboardFragment;
-import com.android.settings.enterprise.DevicePolicyManagerWrapper;
-import com.android.settings.enterprise.DevicePolicyManagerWrapperImpl;
+import com.android.settings.fuelgauge.anomaly.AnomalyUtils;
+import com.android.settings.wrapper.DevicePolicyManagerWrapper;
 import com.android.settings.fuelgauge.anomaly.Anomaly;
 import com.android.settings.fuelgauge.anomaly.AnomalyDialogFragment;
 import com.android.settings.fuelgauge.anomaly.AnomalyLoader;
@@ -66,7 +68,8 @@
 public class AdvancedPowerUsageDetail extends DashboardFragment implements
         ButtonActionDialogFragment.AppButtonsDialogListener,
         AnomalyDialogFragment.AnomalyDialogListener,
-        LoaderManager.LoaderCallbacks<List<Anomaly>> {
+        LoaderManager.LoaderCallbacks<List<Anomaly>>,
+        BackgroundActivityPreferenceController.WarningConfirmationListener {
 
     public static final String TAG = "AdvancedPowerUsageDetail";
     public static final String EXTRA_UID = "extra_uid";
@@ -107,6 +110,7 @@
     @VisibleForTesting
     AnomalySummaryPreferenceController mAnomalySummaryPreferenceController;
     private AppButtonsPreferenceController mAppButtonsPreferenceController;
+    private BackgroundActivityPreferenceController mBackgroundActivityPreferenceController;
 
     private DevicePolicyManagerWrapper mDpm;
     private UserManager mUserManager;
@@ -152,7 +156,14 @@
 
         caller.startPreferencePanelAsUser(fragment, AdvancedPowerUsageDetail.class.getName(), args,
                 R.string.battery_details_title, null,
-                new UserHandle(UserHandle.getUserId(sipper.getUid())));
+                new UserHandle(getUserIdToLaunchAdvancePowerUsageDetail(sipper)));
+    }
+
+    private static @UserIdInt int getUserIdToLaunchAdvancePowerUsageDetail(BatterySipper bs) {
+        if (bs.drainType == BatterySipper.DrainType.USER) {
+            return ActivityManager.getCurrentUser();
+        }
+        return UserHandle.getUserId(bs.getUid());
     }
 
     public static void startBatteryDetailPage(SettingsActivity caller, PreferenceFragment fragment,
@@ -183,7 +194,7 @@
         super.onAttach(activity);
 
         mState = ApplicationsState.getInstance(getActivity().getApplication());
-        mDpm = new DevicePolicyManagerWrapperImpl(
+        mDpm = new DevicePolicyManagerWrapper(
                 (DevicePolicyManager) activity.getSystemService(Context.DEVICE_POLICY_SERVICE));
         mUserManager = (UserManager) activity.getSystemService(Context.USER_SERVICE);
         mPackageManager = activity.getPackageManager();
@@ -310,7 +321,9 @@
         final int uid = bundle.getInt(EXTRA_UID, 0);
         final String packageName = bundle.getString(EXTRA_PACKAGE_NAME);
 
-        controllers.add(new BackgroundActivityPreferenceController(context, uid));
+        mBackgroundActivityPreferenceController = new BackgroundActivityPreferenceController(
+                context, this, uid, packageName);
+        controllers.add(mBackgroundActivityPreferenceController);
         controllers.add(new BatteryOptimizationPreferenceController(
                 (SettingsActivity) getActivity(), this, packageName));
         mAppButtonsPreferenceController = new AppButtonsPreferenceController(
@@ -348,6 +361,9 @@
 
     @Override
     public void onLoadFinished(Loader<List<Anomaly>> loader, List<Anomaly> data) {
+        final AnomalyUtils anomalyUtils = AnomalyUtils.getInstance(getContext());
+        anomalyUtils.logAnomalies(mMetricsFeatureProvider, data,
+                MetricsEvent.FUELGAUGE_POWER_USAGE_DETAIL);
         mAnomalySummaryPreferenceController.updateAnomalySummaryPreference(data);
     }
 
@@ -355,4 +371,10 @@
     public void onLoaderReset(Loader<List<Anomaly>> loader) {
 
     }
+
+    @Override
+    public void onLimitBackgroundActivity() {
+        mBackgroundActivityPreferenceController.setUnchecked(
+                findPreference(mBackgroundActivityPreferenceController.getPreferenceKey()));
+    }
 }
diff --git a/src/com/android/settings/fuelgauge/AppButtonsPreferenceController.java b/src/com/android/settings/fuelgauge/AppButtonsPreferenceController.java
index b889cfd..c034746 100644
--- a/src/com/android/settings/fuelgauge/AppButtonsPreferenceController.java
+++ b/src/com/android/settings/fuelgauge/AppButtonsPreferenceController.java
@@ -28,7 +28,6 @@
 import android.content.pm.PackageInfo;
 import android.content.pm.PackageManager;
 import android.content.pm.ResolveInfo;
-import android.content.pm.UserInfo;
 import android.content.res.Resources;
 import android.net.Uri;
 import android.os.AsyncTask;
@@ -37,23 +36,22 @@
 import android.os.ServiceManager;
 import android.os.UserHandle;
 import android.os.UserManager;
+import android.support.annotation.VisibleForTesting;
 import android.support.v7.preference.PreferenceScreen;
 import android.util.Log;
 import android.view.View;
 import android.webkit.IWebViewUpdateService;
-import android.widget.Button;
 
-import com.android.internal.annotations.VisibleForTesting;
 import com.android.internal.logging.nano.MetricsProto;
 import com.android.settings.DeviceAdminAdd;
 import com.android.settings.R;
 import com.android.settings.SettingsActivity;
 import com.android.settings.Utils;
-import com.android.settings.applications.LayoutPreference;
 import com.android.settings.core.PreferenceControllerMixin;
 import com.android.settings.core.instrumentation.MetricsFeatureProvider;
-import com.android.settings.enterprise.DevicePolicyManagerWrapper;
 import com.android.settings.overlay.FeatureFactory;
+import com.android.settings.widget.ActionButtonPreference;
+import com.android.settings.wrapper.DevicePolicyManagerWrapper;
 import com.android.settingslib.RestrictedLockUtils;
 import com.android.settingslib.applications.AppUtils;
 import com.android.settingslib.applications.ApplicationsState;
@@ -78,8 +76,8 @@
  */
 //TODO(b/35810915): Make InstalledAppDetails use this controller
 public class AppButtonsPreferenceController extends AbstractPreferenceController implements
-        PreferenceControllerMixin, LifecycleObserver, OnResume, OnPause, OnDestroy,
-        View.OnClickListener, ApplicationsState.Callbacks {
+        PreferenceControllerMixin, LifecycleObserver, OnResume, OnDestroy,
+        ApplicationsState.Callbacks {
     public static final String APP_CHG = "chg";
 
     private static final String TAG = "AppButtonsPrefCtl";
@@ -95,13 +93,11 @@
     @VisibleForTesting
     PackageInfo mPackageInfo;
     @VisibleForTesting
-    Button mForceStopButton;
-    @VisibleForTesting
-    Button mUninstallButton;
-    @VisibleForTesting
     String mPackageName;
     @VisibleForTesting
     boolean mDisableAfterUninstall = false;
+    @VisibleForTesting
+    ActionButtonPreference mButtonsPref;
 
     private final int mRequestUninstall;
     private final int mRequestRemoveDeviceAdmin;
@@ -115,7 +111,6 @@
     private RestrictedLockUtils.EnforcedAdmin mAppsControlDisallowedAdmin;
     private MetricsFeatureProvider mMetricsFeatureProvider;
 
-    private LayoutPreference mButtonsPref;
     private int mUserId;
     private boolean mUpdatedSysApp = false;
     private boolean mListeningToPackageRemove = false;
@@ -148,7 +143,7 @@
 
         if (packageName != null) {
             mAppEntry = mState.getEntry(packageName, mUserId);
-            mSession = mState.newSession(this);
+            mSession = mState.newSession(this, lifecycle);
             lifecycle.addObserver(this);
         } else {
             mFinishing = true;
@@ -165,14 +160,14 @@
     public void displayPreference(PreferenceScreen screen) {
         super.displayPreference(screen);
         if (isAvailable()) {
-            mButtonsPref = (LayoutPreference) screen.findPreference(KEY_ACTION_BUTTONS);
-
-            mUninstallButton = (Button) mButtonsPref.findViewById(R.id.left_button);
-            mUninstallButton.setText(R.string.uninstall_text);
-
-            mForceStopButton = (Button) mButtonsPref.findViewById(R.id.right_button);
-            mForceStopButton.setText(R.string.force_stop);
-            mForceStopButton.setEnabled(false);
+            mButtonsPref = ((ActionButtonPreference) screen.findPreference(KEY_ACTION_BUTTONS))
+                    .setButton1Text(R.string.uninstall_text)
+                    .setButton2Text(R.string.force_stop)
+                    .setButton1OnClickListener(new UninstallAndDisableButtonListener())
+                    .setButton2OnClickListener(new ForceStopButtonListener())
+                    .setButton1Positive(false)
+                    .setButton2Positive(false)
+                    .setButton2Enabled(false);
         }
     }
 
@@ -183,7 +178,6 @@
 
     @Override
     public void onResume() {
-        mSession.resume();
         if (isAvailable() && !mFinishing) {
             mAppsControlDisallowedBySystem = RestrictedLockUtils.hasBaseUserRestriction(mActivity,
                     UserManager.DISALLOW_APPS_CONTROL, mUserId);
@@ -197,21 +191,15 @@
     }
 
     @Override
-    public void onPause() {
-        mSession.pause();
-    }
-
-    @Override
     public void onDestroy() {
         stopListeningToPackageRemove();
-        mSession.release();
     }
 
-    @Override
-    public void onClick(View v) {
-        final String packageName = mAppEntry.info.packageName;
-        final int id = v.getId();
-        if (id == R.id.left_button) {
+    private class UninstallAndDisableButtonListener implements View.OnClickListener {
+
+        @Override
+        public void onClick(View v) {
+            final String packageName = mAppEntry.info.packageName;
             // Uninstall
             if (mDpm.packageHasActiveAdmins(mPackageInfo.packageName)) {
                 stopListeningToPackageRemove();
@@ -254,7 +242,13 @@
             } else {
                 uninstallPkg(packageName, false, false);
             }
-        } else if (id == R.id.right_button) {
+        }
+    }
+
+    private class ForceStopButtonListener implements View.OnClickListener {
+
+        @Override
+        public void onClick(View v) {
             // force stop
             if (mAppsControlDisallowedAdmin != null && !mAppsControlDisallowedBySystem) {
                 RestrictedLockUtils.sendShowAdminSupportDetailsIntent(
@@ -363,7 +357,7 @@
         final boolean isBundled = (mAppEntry.info.flags & ApplicationInfo.FLAG_SYSTEM) != 0;
         boolean enabled = true;
         if (isBundled) {
-            enabled = handleDisableable(mUninstallButton);
+            enabled = handleDisableable();
         } else {
             if ((mPackageInfo.applicationInfo.flags & ApplicationInfo.FLAG_INSTALLED) == 0
                     && mUserManager.getUsers().size() >= 2) {
@@ -428,11 +422,7 @@
             enabled = false;
         }
 
-        mUninstallButton.setEnabled(enabled);
-        if (enabled) {
-            // Register listener
-            mUninstallButton.setOnClickListener(this);
-        }
+        mButtonsPref.setButton1Enabled(enabled);
     }
 
     /**
@@ -477,12 +467,12 @@
         if (mDpm.packageHasActiveAdmins(mPackageInfo.packageName)) {
             // User can't force stop device admin.
             Log.w(TAG, "User can't force stop device admin");
-            updateForceStopButtonInner(false);
+            updateForceStopButtonInner(false /* enabled */);
         } else if ((mAppEntry.info.flags & ApplicationInfo.FLAG_STOPPED) == 0) {
             // If the app isn't explicitly stopped, then always show the
             // force stop button.
             Log.w(TAG, "App is not explicitly stopped");
-            updateForceStopButtonInner(true);
+            updateForceStopButtonInner(true /* enabled */);
         } else {
             Intent intent = new Intent(Intent.ACTION_QUERY_PACKAGE_RESTART,
                     Uri.fromParts("package", mAppEntry.info.packageName, null));
@@ -499,10 +489,9 @@
     @VisibleForTesting
     void updateForceStopButtonInner(boolean enabled) {
         if (mAppsControlDisallowedBySystem) {
-            mForceStopButton.setEnabled(false);
+            mButtonsPref.setButton2Enabled(false);
         } else {
-            mForceStopButton.setEnabled(enabled);
-            mForceStopButton.setOnClickListener(this);
+            mButtonsPref.setButton2Enabled(enabled);
         }
     }
 
@@ -538,7 +527,7 @@
     }
 
     @VisibleForTesting
-    boolean handleDisableable(Button button) {
+    boolean handleDisableable() {
         boolean disableable = false;
         // Try to prevent the user from bricking their phone
         // by not allowing disabling of apps signed with the
@@ -546,12 +535,16 @@
         if (mHomePackages.contains(mAppEntry.info.packageName)
                 || isSystemPackage(mActivity.getResources(), mPm, mPackageInfo)) {
             // Disable button for core system applications.
-            button.setText(R.string.disable_text);
+            mButtonsPref.setButton1Text(R.string.disable_text)
+                    .setButton1Positive(false);
+
         } else if (mAppEntry.info.enabled && !isDisabledUntilUsed()) {
-            button.setText(R.string.disable_text);
+            mButtonsPref.setButton1Text(R.string.disable_text)
+                    .setButton1Positive(false);
             disableable = true;
         } else {
-            button.setText(R.string.enable_text);
+            mButtonsPref.setButton1Text(R.string.enable_text)
+                    .setButton1Positive(true);
             disableable = true;
         }
 
diff --git a/src/com/android/settings/fuelgauge/BackgroundActivityPreferenceController.java b/src/com/android/settings/fuelgauge/BackgroundActivityPreferenceController.java
index 4d1cf77..14aba85 100644
--- a/src/com/android/settings/fuelgauge/BackgroundActivityPreferenceController.java
+++ b/src/com/android/settings/fuelgauge/BackgroundActivityPreferenceController.java
@@ -14,12 +14,17 @@
 
 package com.android.settings.fuelgauge;
 
+import android.app.AlertDialog;
 import android.app.AppOpsManager;
+import android.app.Dialog;
+import android.app.Fragment;
 import android.app.admin.DevicePolicyManager;
 import android.content.Context;
+import android.content.DialogInterface;
 import android.content.pm.ApplicationInfo;
 import android.content.pm.PackageManager;
 import android.os.Build;
+import android.os.Bundle;
 import android.os.UserManager;
 import android.support.annotation.VisibleForTesting;
 import android.support.v14.preference.SwitchPreference;
@@ -29,8 +34,8 @@
 import com.android.settings.R;
 import com.android.settings.Utils;
 import com.android.settings.core.PreferenceControllerMixin;
-import com.android.settings.enterprise.DevicePolicyManagerWrapper;
-import com.android.settings.enterprise.DevicePolicyManagerWrapperImpl;
+import com.android.settings.core.instrumentation.InstrumentedDialogFragment;
+import com.android.settings.wrapper.DevicePolicyManagerWrapper;
 import com.android.settingslib.core.AbstractPreferenceController;
 
 /**
@@ -45,54 +50,72 @@
     private final PackageManager mPackageManager;
     private final AppOpsManager mAppOpsManager;
     private final UserManager mUserManager;
-    private final String[] mPackages;
     private final int mUid;
     @VisibleForTesting
     DevicePolicyManagerWrapper mDpm;
-
+    private Fragment mFragment;
     private String mTargetPackage;
+    private boolean mIsPreOApp;
+    private PowerWhitelistBackend mPowerWhitelistBackend;
 
-    public BackgroundActivityPreferenceController(Context context, int uid) {
+    public BackgroundActivityPreferenceController(Context context, Fragment fragment,
+            int uid, String packageName) {
+        this(context, fragment, uid, packageName, PowerWhitelistBackend.getInstance());
+    }
+
+    @VisibleForTesting
+    BackgroundActivityPreferenceController(Context context, Fragment fragment,
+            int uid, String packageName, PowerWhitelistBackend backend) {
         super(context);
+        mPowerWhitelistBackend = backend;
         mPackageManager = context.getPackageManager();
         mUserManager = (UserManager) context.getSystemService(Context.USER_SERVICE);
-        mDpm = new DevicePolicyManagerWrapperImpl(
+        mDpm = new DevicePolicyManagerWrapper(
                 (DevicePolicyManager) context.getSystemService(Context.DEVICE_POLICY_SERVICE));
         mAppOpsManager = (AppOpsManager) context.getSystemService(Context.APP_OPS_SERVICE);
         mUid = uid;
-        mPackages = mPackageManager.getPackagesForUid(mUid);
+        mFragment = fragment;
+        mTargetPackage = packageName;
+        mIsPreOApp = isLegacyApp(packageName);
     }
 
     @Override
     public void updateState(Preference preference) {
         final int mode = mAppOpsManager
-                .checkOpNoThrow(AppOpsManager.OP_RUN_IN_BACKGROUND, mUid, mTargetPackage);
+                .checkOpNoThrow(AppOpsManager.OP_RUN_ANY_IN_BACKGROUND, mUid, mTargetPackage);
+        final boolean whitelisted = mPowerWhitelistBackend.isWhitelisted(mTargetPackage);
         // Set checked or not before we may set it disabled
         if (mode != AppOpsManager.MODE_ERRORED) {
-            final boolean checked = mode != AppOpsManager.MODE_IGNORED;
+            final boolean checked = whitelisted || mode != AppOpsManager.MODE_IGNORED;
             ((SwitchPreference) preference).setChecked(checked);
         }
-        if (mode == AppOpsManager.MODE_ERRORED
+        if (whitelisted || mode == AppOpsManager.MODE_ERRORED
                 || Utils.isProfileOrDeviceOwner(mUserManager, mDpm, mTargetPackage)) {
             preference.setEnabled(false);
+        } else {
+            preference.setEnabled(true);
         }
-
         updateSummary(preference);
     }
 
     @Override
     public boolean isAvailable() {
-        if (mPackages == null) {
-            return false;
-        }
-        for (final String packageName : mPackages) {
-            if (isLegacyApp(packageName)) {
-                mTargetPackage = packageName;
-                return true;
-            }
-        }
+        return mTargetPackage != null;
+    }
 
-        return false;
+    /**
+     * Called from the warning dialog, if the user decides to go ahead and disable background
+     * activity for this package
+     */
+    public void setUnchecked(Preference preference) {
+        if (mIsPreOApp) {
+            mAppOpsManager.setMode(AppOpsManager.OP_RUN_IN_BACKGROUND, mUid, mTargetPackage,
+                    AppOpsManager.MODE_IGNORED);
+        }
+        mAppOpsManager.setMode(AppOpsManager.OP_RUN_ANY_IN_BACKGROUND, mUid, mTargetPackage,
+                AppOpsManager.MODE_IGNORED);
+        ((SwitchPreference) preference).setChecked(false);
+        updateSummary(preference);
     }
 
     @Override
@@ -102,20 +125,24 @@
 
     @Override
     public boolean onPreferenceChange(Preference preference, Object newValue) {
-        boolean switchOn = (Boolean) newValue;
-        mAppOpsManager.setMode(AppOpsManager.OP_RUN_IN_BACKGROUND, mUid, mTargetPackage,
-                switchOn ? AppOpsManager.MODE_ALLOWED : AppOpsManager.MODE_IGNORED);
-
+        final boolean switchOn = (Boolean) newValue;
+        if (!switchOn) {
+            final WarningDialogFragment dialogFragment = new WarningDialogFragment();
+            dialogFragment.setTargetFragment(mFragment, 0);
+            dialogFragment.show(mFragment.getFragmentManager(), TAG);
+            return false;
+        }
+        if (mIsPreOApp) {
+            mAppOpsManager.setMode(AppOpsManager.OP_RUN_IN_BACKGROUND, mUid, mTargetPackage,
+                    AppOpsManager.MODE_ALLOWED);
+        }
+        mAppOpsManager.setMode(AppOpsManager.OP_RUN_ANY_IN_BACKGROUND, mUid, mTargetPackage,
+                AppOpsManager.MODE_ALLOWED);
         updateSummary(preference);
         return true;
     }
 
     @VisibleForTesting
-    String getTargetPackage() {
-        return mTargetPackage;
-    }
-
-    @VisibleForTesting
     boolean isLegacyApp(final String packageName) {
         try {
             ApplicationInfo info = mPackageManager.getApplicationInfo(packageName,
@@ -131,8 +158,12 @@
 
     @VisibleForTesting
     void updateSummary(Preference preference) {
+        if (mPowerWhitelistBackend.isWhitelisted(mTargetPackage)) {
+            preference.setSummary(R.string.background_activity_summary_whitelisted);
+            return;
+        }
         final int mode = mAppOpsManager
-                .checkOpNoThrow(AppOpsManager.OP_RUN_IN_BACKGROUND, mUid, mTargetPackage);
+                .checkOpNoThrow(AppOpsManager.OP_RUN_ANY_IN_BACKGROUND, mUid, mTargetPackage);
 
         if (mode == AppOpsManager.MODE_ERRORED) {
             preference.setSummary(R.string.background_activity_summary_disabled);
@@ -142,4 +173,37 @@
                     : R.string.background_activity_summary_off);
         }
     }
+
+    interface WarningConfirmationListener {
+        void onLimitBackgroundActivity();
+    }
+
+    /**
+     * Warning dialog to show to the user as turning off background activity can lead to
+     * apps misbehaving as their background task scheduling guarantees will no longer be honored.
+     */
+    public static class WarningDialogFragment extends InstrumentedDialogFragment {
+        @Override
+        public int getMetricsCategory() {
+            // TODO (b/65494831): add metric id
+            return 0;
+        }
+
+        @Override
+        public Dialog onCreateDialog(Bundle savedInstanceState) {
+            final WarningConfirmationListener listener =
+                    (WarningConfirmationListener) getTargetFragment();
+            return new AlertDialog.Builder(getContext())
+                    .setTitle(R.string.background_activity_warning_dialog_title)
+                    .setMessage(R.string.background_activity_warning_dialog_text)
+                    .setPositiveButton(R.string.dlg_ok, new DialogInterface.OnClickListener() {
+                        @Override
+                        public void onClick(DialogInterface dialog, int which) {
+                            listener.onLimitBackgroundActivity();
+                        }
+                    })
+                    .setNegativeButton(R.string.dlg_cancel, null)
+                    .create();
+        }
+    }
 }
diff --git a/src/com/android/settings/fuelgauge/BatteryHistoryChart.java b/src/com/android/settings/fuelgauge/BatteryHistoryChart.java
index e9a2250..d44f9f8 100644
--- a/src/com/android/settings/fuelgauge/BatteryHistoryChart.java
+++ b/src/com/android/settings/fuelgauge/BatteryHistoryChart.java
@@ -38,8 +38,10 @@
 import android.util.TimeUtils;
 import android.util.TypedValue;
 import android.view.View;
+
 import com.android.settings.R;
 import com.android.settings.Utils;
+
 import libcore.icu.LocaleData;
 
 import java.util.ArrayList;
@@ -577,7 +579,7 @@
                     || (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())) {
+            if (!com.android.settingslib.Utils.isWifiOnly(getContext())) {
                 mHavePhoneSignal = true;
             }
             if (mHistEnd <= mHistStart) mHistEnd = mHistStart+1;
diff --git a/src/com/android/settings/fuelgauge/BatteryOptimizationPreferenceController.java b/src/com/android/settings/fuelgauge/BatteryOptimizationPreferenceController.java
index 53a3770..10e4280 100644
--- a/src/com/android/settings/fuelgauge/BatteryOptimizationPreferenceController.java
+++ b/src/com/android/settings/fuelgauge/BatteryOptimizationPreferenceController.java
@@ -22,7 +22,7 @@
 import com.android.settings.R;
 import com.android.settings.Settings;
 import com.android.settings.SettingsActivity;
-import com.android.settings.applications.ManageApplications;
+import com.android.settings.applications.manageapplications.ManageApplications;
 import com.android.settings.core.PreferenceControllerMixin;
 import com.android.settingslib.core.AbstractPreferenceController;
 
diff --git a/src/com/android/settings/fuelgauge/BatterySaverSettings.java b/src/com/android/settings/fuelgauge/BatterySaverSettings.java
index 88dab49..f00b952 100644
--- a/src/com/android/settings/fuelgauge/BatterySaverSettings.java
+++ b/src/com/android/settings/fuelgauge/BatterySaverSettings.java
@@ -25,6 +25,7 @@
 import android.os.Bundle;
 import android.os.Handler;
 import android.os.PowerManager;
+import android.provider.SearchIndexableResource;
 import android.provider.Settings.Global;
 import android.support.annotation.VisibleForTesting;
 import android.util.Log;
@@ -38,10 +39,16 @@
 import com.android.settings.dashboard.conditional.BatterySaverCondition;
 import com.android.settings.dashboard.conditional.ConditionManager;
 import com.android.settings.notification.SettingPref;
+import com.android.settings.search.BaseSearchIndexProvider;
+import com.android.settings.search.Indexable;
 import com.android.settings.widget.SwitchBar;
 
+import java.util.Arrays;
+import java.util.List;
+
 public class BatterySaverSettings extends SettingsPreferenceFragment
-        implements SwitchBar.OnSwitchChangeListener, BatterySaverReceiver.BatterySaverListener {
+        implements SwitchBar.OnSwitchChangeListener, BatterySaverReceiver.BatterySaverListener,
+        Indexable {
     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";
@@ -89,7 +96,7 @@
             protected String getCaption(Resources res, int value) {
                 if (value > 0 && value < 100) {
                     return res.getString(R.string.battery_saver_turn_on_automatically_pct,
-                                         Utils.formatPercentage(value));
+                            Utils.formatPercentage(value));
                 }
                 return res.getString(R.string.battery_saver_turn_on_automatically_never);
             }
@@ -219,4 +226,18 @@
             }
         }
     }
+
+    /**
+     * For Search.
+     */
+    public static final Indexable.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.battery_saver_settings;
+                    return Arrays.asList(sir);
+                }
+            };
 }
diff --git a/src/com/android/settings/fuelgauge/FakeUid.java b/src/com/android/settings/fuelgauge/FakeUid.java
index 253dc02..2b5afe1 100644
--- a/src/com/android/settings/fuelgauge/FakeUid.java
+++ b/src/com/android/settings/fuelgauge/FakeUid.java
@@ -51,6 +51,11 @@
     }
 
     @Override
+    public Timer getMulticastWakelockStats() {
+        return null;
+    }
+
+    @Override
     public ArrayMap<String, ? extends Timer> getSyncStats() {
         return null;
     }
@@ -154,6 +159,11 @@
     }
 
     @Override
+    public Timer getWifiScanTimer() {
+        return null;
+    }
+
+    @Override
     public int getWifiScanBackgroundCount(int which)  {
         return 0;
     }
@@ -169,6 +179,11 @@
     }
 
     @Override
+    public Timer getWifiScanBackgroundTimer() {
+        return null;
+    }
+
+    @Override
     public long getWifiBatchedScanTime(int csphBin, long elapsedRealtimeUs, int which) {
         return 0;
     }
diff --git a/src/com/android/settings/fuelgauge/HighPowerDetail.java b/src/com/android/settings/fuelgauge/HighPowerDetail.java
index 296f973..a086986 100644
--- a/src/com/android/settings/fuelgauge/HighPowerDetail.java
+++ b/src/com/android/settings/fuelgauge/HighPowerDetail.java
@@ -18,7 +18,6 @@
 
 import android.app.AlertDialog;
 import android.app.Dialog;
-import android.app.DialogFragment;
 import android.app.Fragment;
 import android.content.Context;
 import android.content.DialogInterface;
@@ -165,12 +164,10 @@
                 : R.string.high_power_off);
     }
 
-    public static void show(Fragment caller, String packageName, int requestCode,
-            boolean defaultToOn) {
+    public static void show(Fragment caller, String packageName, int requestCode) {
         HighPowerDetail fragment = new HighPowerDetail();
         Bundle args = new Bundle();
         args.putString(AppInfoBase.ARG_PACKAGE_NAME, packageName);
-        args.putBoolean(ARG_DEFAULT_ON, defaultToOn);
         fragment.setArguments(args);
         fragment.setTargetFragment(caller, requestCode);
         fragment.show(caller.getFragmentManager(), HighPowerDetail.class.getSimpleName());
diff --git a/src/com/android/settings/fuelgauge/PowerGaugePreference.java b/src/com/android/settings/fuelgauge/PowerGaugePreference.java
index 322c908..93e33cc 100644
--- a/src/com/android/settings/fuelgauge/PowerGaugePreference.java
+++ b/src/com/android/settings/fuelgauge/PowerGaugePreference.java
@@ -21,14 +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;
+import com.android.settings.widget.AppPreference;
 
 /**
  * Custom preference for displaying battery usage info as a bar and an icon on
@@ -37,8 +34,7 @@
  * The battery usage info could be usage percentage or usage time. The preference
  * won't show any icon if it is null.
  */
-public class PowerGaugePreference extends TintablePreference {
-    private final int mIconSize;
+public class PowerGaugePreference extends AppPreference {
 
     private BatteryEntry mInfo;
     private CharSequence mContentDescription;
@@ -65,7 +61,6 @@
         setWidgetLayoutResource(R.layout.preference_widget_summary);
         mInfo = info;
         mContentDescription = contentDescription;
-        mIconSize = context.getResources().getDimensionPixelSize(R.dimen.app_icon_size);
         mShowAnomalyIcon = false;
     }
 
@@ -108,8 +103,6 @@
     @Override
     public void onBindViewHolder(PreferenceViewHolder view) {
         super.onBindViewHolder(view);
-        ImageView icon = (ImageView) view.findViewById(android.R.id.icon);
-        icon.setLayoutParams(new LinearLayout.LayoutParams(mIconSize, mIconSize));
 
         final TextView subtitle = (TextView) view.findViewById(R.id.widget_summary);
         subtitle.setText(mProgress);
diff --git a/src/com/android/settings/fuelgauge/PowerUsageAdvanced.java b/src/com/android/settings/fuelgauge/PowerUsageAdvanced.java
index adadb78..6ed92a7 100644
--- a/src/com/android/settings/fuelgauge/PowerUsageAdvanced.java
+++ b/src/com/android/settings/fuelgauge/PowerUsageAdvanced.java
@@ -18,6 +18,7 @@
 import android.content.Intent;
 import android.content.IntentFilter;
 import android.content.pm.PackageManager;
+import android.content.pm.UserInfo;
 import android.os.BatteryManager;
 import android.os.BatteryStats;
 import android.os.Bundle;
@@ -250,7 +251,7 @@
     boolean shouldHideCategory(PowerUsageData powerUsageData) {
         return powerUsageData.usageType == UsageType.UNACCOUNTED
                 || powerUsageData.usageType == UsageType.OVERCOUNTED
-                || (powerUsageData.usageType == UsageType.USER && mUserManager.getUserCount() == 1)
+                || (powerUsageData.usageType == UsageType.USER && isSingleNormalUser())
                 || (powerUsageData.usageType == UsageType.CELL
                 && !DataUsageUtils.hasMobileData(getContext()));
     }
@@ -373,6 +374,18 @@
         mBatteryUtils = batteryUtils;
     }
 
+    @VisibleForTesting
+    boolean isSingleNormalUser() {
+        int count = 0;
+        for (UserInfo userInfo : mUserManager.getUsers()) {
+            if (userInfo.isEnabled() && !userInfo.isManagedProfile()) {
+                count++;
+            }
+        }
+
+        return count == 1;
+    }
+
     /**
      * Class that contains data used in {@link PowerGaugePreference}.
      */
diff --git a/src/com/android/settings/fuelgauge/PowerUsageAnomalyDetails.java b/src/com/android/settings/fuelgauge/PowerUsageAnomalyDetails.java
index bf4c2af..0d73511 100644
--- a/src/com/android/settings/fuelgauge/PowerUsageAnomalyDetails.java
+++ b/src/com/android/settings/fuelgauge/PowerUsageAnomalyDetails.java
@@ -125,8 +125,7 @@
 
     @Override
     public int getMetricsCategory() {
-        //TODO(b/37681923): add correct metrics category
-        return 0;
+        return MetricsProto.MetricsEvent.FUELGAUGE_ANOMALY_DETAIL;
     }
 
     void refreshUi() {
diff --git a/src/com/android/settings/fuelgauge/PowerUsageBase.java b/src/com/android/settings/fuelgauge/PowerUsageBase.java
index 88edb7a..5f46b07 100644
--- a/src/com/android/settings/fuelgauge/PowerUsageBase.java
+++ b/src/com/android/settings/fuelgauge/PowerUsageBase.java
@@ -60,8 +60,6 @@
         mBatteryBroadcastReceiver.setBatteryChangedListener(() -> {
             restartBatteryStatsLoader();
         });
-
-        getLoaderManager().initLoader(0, icicle, this);
     }
 
     @Override
diff --git a/src/com/android/settings/fuelgauge/PowerUsageSummary.java b/src/com/android/settings/fuelgauge/PowerUsageSummary.java
index ee6ebb2..bf3cc64 100644
--- a/src/com/android/settings/fuelgauge/PowerUsageSummary.java
+++ b/src/com/android/settings/fuelgauge/PowerUsageSummary.java
@@ -21,7 +21,6 @@
 import android.app.LoaderManager.LoaderCallbacks;
 import android.content.Context;
 import android.content.Loader;
-import android.content.res.TypedArray;
 import android.graphics.drawable.Drawable;
 import android.os.BatteryStats;
 import android.os.Bundle;
@@ -56,7 +55,7 @@
 import com.android.settings.SettingsActivity;
 import com.android.settings.Utils;
 import com.android.settings.applications.LayoutPreference;
-import com.android.settings.applications.ManageApplications;
+import com.android.settings.applications.manageapplications.ManageApplications;
 import com.android.settings.core.instrumentation.MetricsFeatureProvider;
 import com.android.settings.dashboard.SummaryLoader;
 import com.android.settings.display.AmbientDisplayPreferenceController;
@@ -68,6 +67,7 @@
 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.fuelgauge.anomaly.AnomalyUtils;
 import com.android.settings.overlay.FeatureFactory;
 import com.android.settings.search.BaseSearchIndexProvider;
 import com.android.settingslib.core.AbstractPreferenceController;
@@ -110,10 +110,8 @@
     @VisibleForTesting
     static final int MENU_HIGH_POWER_APPS = Menu.FIRST + 3;
     @VisibleForTesting
-    static final int MENU_ADDITIONAL_BATTERY_INFO = Menu.FIRST + 4;
-    @VisibleForTesting
-    static final int MENU_TOGGLE_APPS = Menu.FIRST + 5;
-    private static final int MENU_HELP = Menu.FIRST + 6;
+    static final int MENU_TOGGLE_APPS = Menu.FIRST + 4;
+    private static final int MENU_HELP = Menu.FIRST + 5;
     public static final int DEBUG_INFO_LOADER = 3;
 
     @VisibleForTesting
@@ -151,6 +149,10 @@
 
                 @Override
                 public void onLoadFinished(Loader<List<Anomaly>> loader, List<Anomaly> data) {
+                    final AnomalyUtils anomalyUtils = AnomalyUtils.getInstance(getContext());
+                    anomalyUtils.logAnomalies(mMetricsFeatureProvider, data,
+                            MetricsEvent.FUELGAUGE_POWER_USAGE_SUMMARY);
+
                     // show high usage preference if possible
                     mAnomalySummaryPreferenceController.updateAnomalySummaryPreference(data);
 
@@ -329,10 +331,6 @@
 
         menu.add(Menu.NONE, MENU_HIGH_POWER_APPS, Menu.NONE, R.string.high_power_apps);
 
-        if (mPowerFeatureProvider.isAdditionalBatteryInfoEnabled()) {
-            menu.add(Menu.NONE, MENU_ADDITIONAL_BATTERY_INFO,
-                    Menu.NONE, R.string.additional_battery_info);
-        }
         if (mPowerFeatureProvider.isPowerAccountingToggleEnabled()) {
             menu.add(Menu.NONE, MENU_TOGGLE_APPS, Menu.NONE,
                     mShowAllApps ? R.string.hide_extra_apps : R.string.show_all_apps);
@@ -342,7 +340,7 @@
     }
 
     @Override
-    protected int getHelpResource() {
+    public int getHelpResource() {
         return R.string.help_url_battery;
     }
 
@@ -371,12 +369,6 @@
                 metricsFeatureProvider.action(context,
                         MetricsEvent.ACTION_SETTINGS_MENU_BATTERY_OPTIMIZATION);
                 return true;
-            case MENU_ADDITIONAL_BATTERY_INFO:
-                startActivity(mPowerFeatureProvider
-                        .getAdditionalBatteryInfoIntent());
-                metricsFeatureProvider.action(context,
-                        MetricsEvent.ACTION_SETTINGS_MENU_BATTERY_USAGE_ALERTS);
-                return true;
             case MENU_TOGGLE_APPS:
                 mShowAllApps = !mShowAllApps;
                 item.setTitle(mShowAllApps ? R.string.hide_extra_apps : R.string.show_all_apps);
@@ -428,7 +420,8 @@
     }
 
     private static boolean isSystemUid(int uid) {
-        return uid >= Process.SYSTEM_UID && uid < Process.FIRST_APPLICATION_UID;
+        final int appUid = UserHandle.getAppId(uid);
+        return appUid >= Process.SYSTEM_UID && appUid < Process.FIRST_APPLICATION_UID;
     }
 
     /**
@@ -532,7 +525,7 @@
         updateScreenPreference();
         updateLastFullChargePreference(lastFullChargeTime);
 
-        final CharSequence timeSequence = Utils.formatElapsedTime(context, lastFullChargeTime,
+        final CharSequence timeSequence = Utils.formatRelativeTime(context, lastFullChargeTime,
                 false);
         final int resId = mShowAllApps ? R.string.power_usage_list_summary_device
                 : R.string.power_usage_list_summary;
@@ -542,17 +535,10 @@
     }
 
     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;
 
@@ -594,9 +580,6 @@
                             contentDescription, entry);
                     pref.setKey(key);
                 }
-
-                final double percentOfMax = (sipper.totalPowerMah * 100)
-                        / mStatsHelper.getMaxPower();
                 sipper.percent = percentOfTotal;
                 pref.setTitle(entry.getLabel());
                 pref.setOrder(i + 1);
@@ -607,11 +590,6 @@
                             BatteryUtils.StatusType.FOREGROUND, sipper.uidObj, mStatsType);
                 }
                 setUsageSummary(pref, sipper);
-                if ((sipper.drainType != DrainType.APP
-                        || sipper.uidObj.getUid() == Process.ROOT_UID)
-                        && sipper.drainType != DrainType.USER) {
-                    pref.setTint(colorControl);
-                }
                 addedSome = true;
                 mAppListGroup.addPreference(pref);
                 if (mAppListGroup.getPreferenceCount() - getCachedCount()
@@ -681,10 +659,8 @@
 
     @VisibleForTesting
     void updateLastFullChargePreference(long timeMs) {
-        final CharSequence timeSequence = Utils.formatElapsedTime(getContext(), timeMs, false);
-        mLastFullChargePref.setSubtitle(
-                TextUtils.expandTemplate(getText(R.string.power_last_full_charge_summary),
-                        timeSequence));
+        final CharSequence timeSequence = Utils.formatRelativeTime(getContext(), timeMs, false);
+        mLastFullChargePref.setSubtitle(timeSequence);
     }
 
     @VisibleForTesting
@@ -724,6 +700,8 @@
     String extractKeyFromSipper(BatterySipper sipper) {
         if (sipper.uidObj != null) {
             return extractKeyFromUid(sipper.getUid());
+        } else if (sipper.drainType == DrainType.USER) {
+            return sipper.drainType.toString() + sipper.userId;
         } else if (sipper.drainType != DrainType.APP) {
             return sipper.drainType.toString();
         } else if (sipper.getPackages() != null) {
diff --git a/src/com/android/settings/fuelgauge/anomaly/AnomalyDetectionPolicy.java b/src/com/android/settings/fuelgauge/anomaly/AnomalyDetectionPolicy.java
index dd8ebc7..3791d89 100644
--- a/src/com/android/settings/fuelgauge/anomaly/AnomalyDetectionPolicy.java
+++ b/src/com/android/settings/fuelgauge/anomaly/AnomalyDetectionPolicy.java
@@ -24,6 +24,8 @@
 import android.util.KeyValueListParser;
 import android.util.Log;
 
+import com.android.settings.wrapper.KeyValueListParserWrapper;
+
 import java.util.Arrays;
 import java.util.Set;
 import java.util.stream.Collectors;
@@ -119,7 +121,7 @@
     private final KeyValueListParserWrapper mParserWrapper;
 
     public AnomalyDetectionPolicy(Context context) {
-        this(context, new KeyValueListParserWrapperImpl(new KeyValueListParser(',')));
+        this(context, new KeyValueListParserWrapper(new KeyValueListParser(',')));
     }
 
     @VisibleForTesting
diff --git a/src/com/android/settings/fuelgauge/anomaly/AnomalyDialogFragment.java b/src/com/android/settings/fuelgauge/anomaly/AnomalyDialogFragment.java
index 69d03b9..538f5b1 100644
--- a/src/com/android/settings/fuelgauge/anomaly/AnomalyDialogFragment.java
+++ b/src/com/android/settings/fuelgauge/anomaly/AnomalyDialogFragment.java
@@ -23,6 +23,7 @@
 import android.os.Bundle;
 import android.support.annotation.VisibleForTesting;
 
+import com.android.internal.logging.nano.MetricsProto;
 import com.android.settings.R;
 import com.android.settings.core.instrumentation.InstrumentedDialogFragment;
 import com.android.settings.fuelgauge.anomaly.action.AnomalyAction;
@@ -79,8 +80,7 @@
 
     @Override
     public int getMetricsCategory() {
-        // TODO(b/37681923): add anomaly metric id
-        return 0;
+        return MetricsProto.MetricsEvent.DIALOG_HANDLE_ANOMALY;
     }
 
     @Override
@@ -100,9 +100,13 @@
     @Override
     public Dialog onCreateDialog(Bundle savedInstanceState) {
         final Bundle bundle = getArguments();
-        mAnomaly = bundle.getParcelable(ARG_ANOMALY);
-
         final Context context = getContext();
+        final AnomalyUtils anomalyUtils = AnomalyUtils.getInstance(context);
+
+        mAnomaly = bundle.getParcelable(ARG_ANOMALY);
+        anomalyUtils.logAnomaly(mMetricsFeatureProvider, mAnomaly,
+                MetricsProto.MetricsEvent.DIALOG_HANDLE_ANOMALY);
+
         final AnomalyAction anomalyAction = mAnomalyUtils.getAnomalyAction(mAnomaly);
         switch (anomalyAction.getActionType()) {
             case Anomaly.AnomalyActionType.FORCE_STOP:
diff --git a/src/com/android/settings/fuelgauge/anomaly/AnomalyUtils.java b/src/com/android/settings/fuelgauge/anomaly/AnomalyUtils.java
index 491a3b4..39d51dc0 100644
--- a/src/com/android/settings/fuelgauge/anomaly/AnomalyUtils.java
+++ b/src/com/android/settings/fuelgauge/anomaly/AnomalyUtils.java
@@ -19,8 +19,12 @@
 import android.content.Context;
 import android.os.Build;
 import android.support.annotation.VisibleForTesting;
+import android.util.Pair;
+import android.util.SparseIntArray;
 
+import com.android.internal.logging.nano.MetricsProto;
 import com.android.internal.os.BatteryStatsHelper;
+import com.android.settings.core.instrumentation.MetricsFeatureProvider;
 import com.android.settings.fuelgauge.anomaly.action.AnomalyAction;
 import com.android.settings.fuelgauge.anomaly.action.ForceStopAction;
 import com.android.settings.fuelgauge.anomaly.action.LocationCheckAction;
@@ -40,6 +44,17 @@
     private Context mContext;
     private static AnomalyUtils sInstance;
 
+    private static final SparseIntArray mMetricArray;
+    static {
+        mMetricArray = new SparseIntArray();
+        mMetricArray.append(Anomaly.AnomalyType.WAKE_LOCK,
+                MetricsProto.MetricsEvent.ANOMALY_TYPE_WAKELOCK);
+        mMetricArray.append(Anomaly.AnomalyType.WAKEUP_ALARM,
+                MetricsProto.MetricsEvent.ANOMALY_TYPE_WAKEUP_ALARM);
+        mMetricArray.append(Anomaly.AnomalyType.BLUETOOTH_SCAN,
+                MetricsProto.MetricsEvent.ANOMALY_TYPE_UNOPTIMIZED_BT);
+    }
+
     @VisibleForTesting
     AnomalyUtils(Context context) {
         mContext = context.getApplicationContext();
@@ -118,4 +133,39 @@
         return anomalies;
     }
 
+    /**
+     * Log the list of {@link Anomaly} using {@link MetricsFeatureProvider}, which contains
+     * anomaly type, package name, field_context, field_action_type
+     *
+     * @param provider  provider to do the logging
+     * @param anomalies contains the data to log
+     * @param contextId which page invoke this logging
+     * @see #logAnomaly(MetricsFeatureProvider, Anomaly, int)
+     */
+    public void logAnomalies(MetricsFeatureProvider provider, List<Anomaly> anomalies,
+            int contextId) {
+        for (int i = 0, size = anomalies.size(); i < size; i++) {
+            logAnomaly(provider, anomalies.get(i), contextId);
+        }
+    }
+
+    /**
+     * Log the {@link Anomaly} using {@link MetricsFeatureProvider}, which contains
+     * anomaly type, package name, field_context, field_action_type
+     *
+     * @param provider  provider to do the logging
+     * @param anomaly   contains the data to log
+     * @param contextId which page invoke this logging
+     * @see #logAnomalies(MetricsFeatureProvider, List, int)
+     */
+    public void logAnomaly(MetricsFeatureProvider provider, Anomaly anomaly, int contextId) {
+        provider.action(
+                mContext,
+                mMetricArray.get(anomaly.type, MetricsProto.MetricsEvent.VIEW_UNKNOWN),
+                anomaly.packageName,
+                Pair.create(MetricsProto.MetricsEvent.FIELD_CONTEXT, contextId),
+                Pair.create(MetricsProto.MetricsEvent.FIELD_ANOMALY_ACTION_TYPE,
+                        getAnomalyAction(anomaly).getActionType()));
+    }
+
 }
diff --git a/src/com/android/settings/fuelgauge/anomaly/KeyValueListParserWrapper.java b/src/com/android/settings/fuelgauge/anomaly/KeyValueListParserWrapper.java
deleted file mode 100644
index 7d216c5..0000000
--- a/src/com/android/settings/fuelgauge/anomaly/KeyValueListParserWrapper.java
+++ /dev/null
@@ -1,70 +0,0 @@
-/*
- * Copyright (C) 2017 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.fuelgauge.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 string.
-     * @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.
-     */
-    String getString(String key, String defaultValue);
-
-    /**
-     * 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
deleted file mode 100644
index cf3aa95..0000000
--- a/src/com/android/settings/fuelgauge/anomaly/KeyValueListParserWrapperImpl.java
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
- * Copyright (C) 2017 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.fuelgauge.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 String getString(String key, String defaultValue) {
-        return mParser.getString(key, defaultValue);
-    }
-
-    @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
index 87212e7..3ee89d1 100644
--- a/src/com/android/settings/fuelgauge/anomaly/action/AnomalyAction.java
+++ b/src/com/android/settings/fuelgauge/anomaly/action/AnomalyAction.java
@@ -58,5 +58,6 @@
      */
     public abstract boolean isActionActive(Anomaly anomaly);
 
+    @Anomaly.AnomalyActionType
     public abstract int getActionType();
 }
diff --git a/src/com/android/settings/fuelgauge/anomaly/action/StopAndBackgroundCheckAction.java b/src/com/android/settings/fuelgauge/anomaly/action/StopAndBackgroundCheckAction.java
index dba221a..2c799ee 100644
--- a/src/com/android/settings/fuelgauge/anomaly/action/StopAndBackgroundCheckAction.java
+++ b/src/com/android/settings/fuelgauge/anomaly/action/StopAndBackgroundCheckAction.java
@@ -19,6 +19,7 @@
 import android.content.Context;
 import android.support.annotation.VisibleForTesting;
 
+import com.android.internal.logging.nano.MetricsProto;
 import com.android.settings.fuelgauge.anomaly.Anomaly;
 
 /**
@@ -34,6 +35,7 @@
 
     public StopAndBackgroundCheckAction(Context context) {
         this(context, new ForceStopAction(context), new BackgroundCheckAction(context));
+        mActionMetricKey = MetricsProto.MetricsEvent.ACTION_APP_STOP_AND_BACKGROUND_CHECK;
     }
 
     @VisibleForTesting
@@ -46,6 +48,7 @@
 
     @Override
     public void handlePositiveAction(Anomaly anomaly, int metricsKey) {
+        super.handlePositiveAction(anomaly, metricsKey);
         mForceStopAction.handlePositiveAction(anomaly, metricsKey);
         mBackgroundCheckAction.handlePositiveAction(anomaly, metricsKey);
     }
diff --git a/src/com/android/settings/fuelgauge/anomaly/checker/WakeupAlarmAnomalyDetector.java b/src/com/android/settings/fuelgauge/anomaly/checker/WakeupAlarmAnomalyDetector.java
index 936fe30..46f31ab 100644
--- a/src/com/android/settings/fuelgauge/anomaly/checker/WakeupAlarmAnomalyDetector.java
+++ b/src/com/android/settings/fuelgauge/anomaly/checker/WakeupAlarmAnomalyDetector.java
@@ -21,6 +21,8 @@
 import android.support.annotation.VisibleForTesting;
 import android.text.format.DateUtils;
 import android.util.ArrayMap;
+import android.util.ArraySet;
+import android.util.Log;
 
 import com.android.internal.os.BatterySipper;
 import com.android.internal.os.BatteryStatsHelper;
@@ -31,6 +33,7 @@
 import com.android.settings.fuelgauge.anomaly.AnomalyUtils;
 
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
diff --git a/src/com/android/settings/gestures/AssistGestureSettingsPreferenceController.java b/src/com/android/settings/gestures/AssistGestureSettingsPreferenceController.java
index bf6ee8c..1ecba0d 100644
--- a/src/com/android/settings/gestures/AssistGestureSettingsPreferenceController.java
+++ b/src/com/android/settings/gestures/AssistGestureSettingsPreferenceController.java
@@ -162,7 +162,7 @@
 
     @Override
     public ResultPayload getResultPayload() {
-        final Intent intent = DatabaseIndexingUtils.buildSubsettingIntent(mContext,
+        final Intent intent = DatabaseIndexingUtils.buildSearchResultPageIntent(mContext,
                 AssistGestureSettings.class.getName(), mAssistGesturePrefKey,
                 mContext.getString(R.string.display_settings));
 
diff --git a/src/com/android/settings/gestures/DoubleTapPowerPreferenceController.java b/src/com/android/settings/gestures/DoubleTapPowerPreferenceController.java
index 970b6a7..049ee18 100644
--- a/src/com/android/settings/gestures/DoubleTapPowerPreferenceController.java
+++ b/src/com/android/settings/gestures/DoubleTapPowerPreferenceController.java
@@ -16,10 +16,13 @@
 
 package com.android.settings.gestures;
 
+import static android.provider.Settings.Secure.CAMERA_DOUBLE_TAP_POWER_GESTURE_DISABLED;
+
 import android.content.Context;
 import android.content.Intent;
 import android.content.SharedPreferences;
 import android.provider.Settings;
+import android.support.annotation.VisibleForTesting;
 import android.support.v7.preference.Preference;
 
 import com.android.settings.R;
@@ -28,12 +31,12 @@
 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;
+    @VisibleForTesting
+    static final int ON = 0;
+    @VisibleForTesting
+    static final int OFF = 1;
 
     private static final String PREF_KEY_VIDEO = "gesture_double_tap_power_video";
     private final String mDoubleTapPowerKey;
@@ -81,12 +84,12 @@
     protected boolean isSwitchPrefEnabled() {
         final int cameraDisabled = Settings.Secure.getInt(mContext.getContentResolver(),
                 SECURE_KEY, ON);
-        return cameraDisabled == 0;
+        return cameraDisabled == ON;
     }
 
     @Override
     public ResultPayload getResultPayload() {
-        final Intent intent = DatabaseIndexingUtils.buildSubsettingIntent(mContext,
+        final Intent intent = DatabaseIndexingUtils.buildSearchResultPageIntent(mContext,
                 DoubleTapPowerSettings.class.getName(), mDoubleTapPowerKey,
                 mContext.getString(R.string.display_settings));
 
diff --git a/src/com/android/settings/gestures/DoubleTapScreenPreferenceController.java b/src/com/android/settings/gestures/DoubleTapScreenPreferenceController.java
index 9ec06ae..5412f36 100644
--- a/src/com/android/settings/gestures/DoubleTapScreenPreferenceController.java
+++ b/src/com/android/settings/gestures/DoubleTapScreenPreferenceController.java
@@ -22,6 +22,7 @@
 import android.content.SharedPreferences;
 import android.provider.Settings;
 import android.support.v7.preference.Preference;
+import android.support.annotation.VisibleForTesting;
 
 import com.android.internal.hardware.AmbientDisplayConfiguration;
 import com.android.settings.R;
@@ -55,8 +56,13 @@
     }
 
     public static boolean isSuggestionComplete(Context context, SharedPreferences prefs) {
-        AmbientDisplayConfiguration ambientConfig = new AmbientDisplayConfiguration(context);
-        return !ambientConfig.pulseOnDoubleTapAvailable()
+        return isSuggestionComplete(new AmbientDisplayConfiguration(context), prefs);
+    }
+
+    @VisibleForTesting
+    static boolean isSuggestionComplete(AmbientDisplayConfiguration config,
+            SharedPreferences prefs) {
+        return !config.pulseOnDoubleTapAvailable()
                 || prefs.getBoolean(DoubleTapScreenSettings.PREF_KEY_SUGGESTION_COMPLETE, false);
     }
 
@@ -89,7 +95,7 @@
 
     @Override
     public ResultPayload getResultPayload() {
-        final Intent intent = DatabaseIndexingUtils.buildSubsettingIntent(mContext,
+        final Intent intent = DatabaseIndexingUtils.buildSearchResultPageIntent(mContext,
                 DoubleTapScreenSettings.class.getName(), mDoubleTapScreenPrefKey,
                 mContext.getString(R.string.display_settings));
 
diff --git a/src/com/android/settings/gestures/DoubleTapScreenSettings.java b/src/com/android/settings/gestures/DoubleTapScreenSettings.java
index c0cd453e..f2148b4 100644
--- a/src/com/android/settings/gestures/DoubleTapScreenSettings.java
+++ b/src/com/android/settings/gestures/DoubleTapScreenSettings.java
@@ -68,7 +68,7 @@
     }
 
     @Override
-    protected int getHelpResource() {
+    public int getHelpResource() {
         return R.string.help_url_double_tap_screen;
     }
 
diff --git a/src/com/android/settings/gestures/PickupGesturePreferenceController.java b/src/com/android/settings/gestures/PickupGesturePreferenceController.java
index e64c0cf..02107c1 100644
--- a/src/com/android/settings/gestures/PickupGesturePreferenceController.java
+++ b/src/com/android/settings/gestures/PickupGesturePreferenceController.java
@@ -16,12 +16,15 @@
 
 package com.android.settings.gestures;
 
+import static android.provider.Settings.Secure.DOZE_PULSE_ON_PICK_UP;
+
 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 android.support.annotation.VisibleForTesting;
 
 import com.android.internal.hardware.AmbientDisplayConfiguration;
 import com.android.settings.R;
@@ -30,8 +33,6 @@
 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 final int ON = 1;
@@ -56,8 +57,8 @@
 
     public static boolean isSuggestionComplete(Context context, SharedPreferences prefs) {
         AmbientDisplayConfiguration ambientConfig = new AmbientDisplayConfiguration(context);
-        return !ambientConfig.pulseOnPickupAvailable()
-                || prefs.getBoolean(PickupGestureSettings.PREF_KEY_SUGGESTION_COMPLETE, false);
+        return prefs.getBoolean(PickupGestureSettings.PREF_KEY_SUGGESTION_COMPLETE, false)
+                || !ambientConfig.pulseOnPickupAvailable();
     }
 
     @Override
@@ -90,16 +91,21 @@
 
     @Override
     public boolean canHandleClicks() {
-        return mAmbientConfig.pulseOnPickupCanBeModified(mUserId);
+        return pulseOnPickupCanBeModified();
     }
 
     @Override
     public ResultPayload getResultPayload() {
-        final Intent intent = DatabaseIndexingUtils.buildSubsettingIntent(mContext,
+        final Intent intent = DatabaseIndexingUtils.buildSearchResultPageIntent(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 */);
     }
+
+    @VisibleForTesting
+    boolean pulseOnPickupCanBeModified() {
+        return mAmbientConfig.pulseOnPickupCanBeModified(mUserId);
+    }
 }
diff --git a/src/com/android/settings/gestures/PickupGestureSettings.java b/src/com/android/settings/gestures/PickupGestureSettings.java
index a4f1776..1762ba8 100644
--- a/src/com/android/settings/gestures/PickupGestureSettings.java
+++ b/src/com/android/settings/gestures/PickupGestureSettings.java
@@ -68,7 +68,7 @@
     }
 
     @Override
-    protected int getHelpResource() {
+    public int getHelpResource() {
         return R.string.help_url_pickup_gesture;
     }
 
diff --git a/src/com/android/settings/gestures/SwipeToNotificationPreferenceController.java b/src/com/android/settings/gestures/SwipeToNotificationPreferenceController.java
index 6f334a5..b50968f 100644
--- a/src/com/android/settings/gestures/SwipeToNotificationPreferenceController.java
+++ b/src/com/android/settings/gestures/SwipeToNotificationPreferenceController.java
@@ -16,6 +16,8 @@
 
 package com.android.settings.gestures;
 
+import static android.provider.Settings.Secure.SYSTEM_NAVIGATION_KEYS_ENABLED;
+
 import android.content.Context;
 import android.content.SharedPreferences;
 import android.provider.Settings;
@@ -24,8 +26,6 @@
 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;
@@ -45,11 +45,12 @@
     public static boolean isSuggestionComplete(Context context, SharedPreferences prefs) {
         return !isGestureAvailable(context)
                 || prefs.getBoolean(SwipeToNotificationSettings.PREF_KEY_SUGGESTION_COMPLETE,
-                        false);
+                false);
     }
 
     private static boolean isGestureAvailable(Context context) {
-        return Utils.hasFingerprintHardware(context) && context.getResources()
+        return Utils.hasFingerprintHardware(context)
+                && context.getResources()
                 .getBoolean(com.android.internal.R.bool.config_supportSystemNavigationKeys);
     }
 
diff --git a/src/com/android/settings/language/LanguageAndInputSettings.java b/src/com/android/settings/language/LanguageAndInputSettings.java
index 4affc6e..bf61116 100644
--- a/src/com/android/settings/language/LanguageAndInputSettings.java
+++ b/src/com/android/settings/language/LanguageAndInputSettings.java
@@ -65,13 +65,6 @@
     }
 
     @Override
-    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
@@ -176,7 +169,6 @@
                     // Duplicates in summary and details pages.
                     keys.add(KEY_TEXT_TO_SPEECH);
                     keys.add(KEY_PHYSICAL_KEYBOARD);
-
                     return keys;
                 }
             };
diff --git a/src/com/android/settings/language/PhoneLanguagePreferenceController.java b/src/com/android/settings/language/PhoneLanguagePreferenceController.java
index 11c3e03..49f7f21 100644
--- a/src/com/android/settings/language/PhoneLanguagePreferenceController.java
+++ b/src/com/android/settings/language/PhoneLanguagePreferenceController.java
@@ -19,10 +19,17 @@
 import android.content.Context;
 import android.support.v7.preference.Preference;
 
+import com.android.internal.logging.nano.MetricsProto;
+import com.android.settings.R;
+import com.android.settings.Utils;
+import com.android.settings.core.InstrumentedPreferenceFragment;
 import com.android.settings.core.PreferenceControllerMixin;
+import com.android.settings.localepicker.LocaleListEditor;
 import com.android.settings.overlay.FeatureFactory;
 import com.android.settingslib.core.AbstractPreferenceController;
 
+import java.util.List;
+
 public class PhoneLanguagePreferenceController extends AbstractPreferenceController
         implements PreferenceControllerMixin {
 
@@ -48,7 +55,26 @@
     }
 
     @Override
+    public void updateNonIndexableKeys(List<String> keys) {
+        // No index needed, because this pref has the same name as the parent page. Indexing it will
+        // make search page look like there are duplicate result, creating confusion.
+        keys.add(getPreferenceKey());
+    }
+
+    @Override
     public String getPreferenceKey() {
         return KEY_PHONE_LANGUAGE;
     }
+
+    @Override
+    public boolean handlePreferenceTreeClick(Preference preference) {
+        if (!KEY_PHONE_LANGUAGE.equals(preference.getKey())) {
+            return false;
+        }
+        Utils.startWithFragment(mContext, LocaleListEditor.class.getName(), null, null, 0,
+                R.string.pref_title_lang_selection, null,
+                MetricsProto.MetricsEvent.SETTINGS_LANGUAGE_CATEGORY);
+        return true;
+    }
+
 }
diff --git a/src/com/android/settings/localepicker/LocaleDragAndDropAdapter.java b/src/com/android/settings/localepicker/LocaleDragAndDropAdapter.java
index 0b40bbd..1d21c12 100644
--- a/src/com/android/settings/localepicker/LocaleDragAndDropAdapter.java
+++ b/src/com/android/settings/localepicker/LocaleDragAndDropAdapter.java
@@ -82,14 +82,13 @@
     }
 
     public LocaleDragAndDropAdapter(Context context, List<LocaleStore.LocaleInfo> feedItemList) {
-        this.mFeedItemList = feedItemList;
-
-        this.mContext = context;
+        mFeedItemList = feedItemList;
+        mContext = context;
 
         final float dragElevation = TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP, 8,
                 context.getResources().getDisplayMetrics());
 
-        this.mItemTouchHelper = new ItemTouchHelper(new ItemTouchHelper.SimpleCallback(
+        mItemTouchHelper = new ItemTouchHelper(new ItemTouchHelper.SimpleCallback(
                 ItemTouchHelper.UP | ItemTouchHelper.DOWN, 0 /* no swipe */) {
 
             @Override
@@ -248,15 +247,6 @@
         return result;
     }
 
-    LocaleStore.LocaleInfo getFirstChecked() {
-        for (LocaleStore.LocaleInfo li : mFeedItemList) {
-            if (li.getChecked()) {
-                return li;
-            }
-        }
-        return null;
-    }
-
     void addLocale(LocaleStore.LocaleInfo li) {
         mFeedItemList.add(li);
         notifyItemInserted(mFeedItemList.size() - 1);
diff --git a/src/com/android/settings/localepicker/LocaleListEditor.java b/src/com/android/settings/localepicker/LocaleListEditor.java
index 9590545..79d538f 100644
--- a/src/com/android/settings/localepicker/LocaleListEditor.java
+++ b/src/com/android/settings/localepicker/LocaleListEditor.java
@@ -18,7 +18,6 @@
 
 import android.app.AlertDialog;
 import android.app.FragmentTransaction;
-import android.content.Context;
 import android.content.DialogInterface;
 import android.os.Bundle;
 import android.os.LocaleList;
@@ -30,21 +29,24 @@
 import android.view.View;
 import android.view.ViewGroup;
 
+import android.widget.TextView;
 import com.android.internal.app.LocalePicker;
 import com.android.internal.app.LocalePickerWithRegion;
 import com.android.internal.app.LocaleStore;
 import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
 import com.android.settings.R;
-import com.android.settings.SettingsPreferenceFragment;
+import com.android.settings.RestrictedSettingsFragment;
 
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Locale;
 
+import static android.os.UserManager.DISALLOW_CONFIG_LOCALE;
+
 /**
  * Drag-and-drop editor for the user-ordered locale lists.
  */
-public class LocaleListEditor extends SettingsPreferenceFragment
+public class LocaleListEditor extends RestrictedSettingsFragment
         implements LocalePickerWithRegion.LocaleSelectedListener {
 
     private static final String CFGKEY_REMOVE_MODE = "localeRemoveMode";
@@ -56,6 +58,11 @@
     private View mAddLanguage;
     private boolean mRemoveMode;
     private boolean mShowingRemoveDialog;
+    private boolean mIsUiRestricted;
+
+    public LocaleListEditor() {
+        super(DISALLOW_CONFIG_LOCALE);
+    }
 
     @Override
     public int getMetricsCategory() {
@@ -68,7 +75,7 @@
         setHasOptionsMenu(true);
 
         LocaleStore.fillCache(this.getContext());
-        final List<LocaleStore.LocaleInfo> feedsList = getUserLocaleList(this.getContext());
+        final List<LocaleStore.LocaleInfo> feedsList = getUserLocaleList();
         mAdapter = new LocaleDragAndDropAdapter(this.getContext(), feedsList);
     }
 
@@ -77,13 +84,30 @@
         final View result = super.onCreateView(inflater, container, savedInstState);
         final View myLayout = inflater.inflate(R.layout.locale_order_list, (ViewGroup) result);
 
-        getActivity().setTitle(R.string.pref_title_lang_selection);
-
         configureDragAndDrop(myLayout);
         return result;
     }
 
     @Override
+    public void onResume() {
+        super.onResume();
+
+        final boolean previouslyRestricted = mIsUiRestricted;
+        mIsUiRestricted = isUiRestricted();
+        final TextView emptyView = getEmptyTextView();
+        if (mIsUiRestricted && !previouslyRestricted) {
+            // Lock it down.
+            emptyView.setText(R.string.language_empty_list_user_restricted);
+            emptyView.setVisibility(View.VISIBLE);
+            updateVisibilityOfRemoveMenu();
+        } else if (!mIsUiRestricted && previouslyRestricted) {
+            // Unlock it.
+            emptyView.setVisibility(View.GONE);
+            updateVisibilityOfRemoveMenu();
+        }
+    }
+
+    @Override
     public void onViewStateRestored(Bundle savedInstanceState) {
         super.onViewStateRestored(savedInstanceState);
         if (savedInstanceState != null) {
@@ -219,20 +243,18 @@
         updateVisibilityOfRemoveMenu();
     }
 
-    private static List<LocaleStore.LocaleInfo> getUserLocaleList(Context context) {
+    private List<LocaleStore.LocaleInfo> getUserLocaleList() {
         final List<LocaleStore.LocaleInfo> result = new ArrayList<>();
-
         final LocaleList localeList = LocalePicker.getLocales();
         for (int i = 0; i < localeList.size(); i++) {
             Locale locale = localeList.get(i);
             result.add(LocaleStore.getLocaleInfo(locale));
         }
-
         return result;
     }
 
     private void configureDragAndDrop(View view) {
-        final RecyclerView list = (RecyclerView) view.findViewById(R.id.dragList);
+        final RecyclerView list = view.findViewById(R.id.dragList);
         final LocaleLinearLayoutManager llm = new LocaleLinearLayoutManager(getContext(), mAdapter);
         llm.setAutoMeasureEnabled(true);
         list.setLayoutManager(llm);
@@ -274,7 +296,8 @@
         if (menuItemRemove != null) {
             menuItemRemove.setShowAsAction(
                     mRemoveMode ? MenuItem.SHOW_AS_ACTION_ALWAYS : MenuItem.SHOW_AS_ACTION_NEVER);
-            menuItemRemove.setVisible(mAdapter.getItemCount() > 1);
+            final boolean hasMultipleLanguages = mAdapter.getItemCount() > 1;
+            menuItemRemove.setVisible(hasMultipleLanguages && !mIsUiRestricted);
         }
     }
 }
diff --git a/src/com/android/settings/location/AppLocationPermissionPreferenceController.java b/src/com/android/settings/location/AppLocationPermissionPreferenceController.java
index 75c9e2f..fabe295 100644
--- a/src/com/android/settings/location/AppLocationPermissionPreferenceController.java
+++ b/src/com/android/settings/location/AppLocationPermissionPreferenceController.java
@@ -2,8 +2,6 @@
 
 import android.content.Context;
 import android.provider.Settings;
-import android.support.v7.preference.Preference;
-import android.support.v7.preference.PreferenceScreen;
 
 import com.android.settings.core.PreferenceControllerMixin;
 import com.android.settingslib.core.AbstractPreferenceController;
@@ -12,21 +10,12 @@
         AbstractPreferenceController implements PreferenceControllerMixin {
 
     private static final String KEY_APP_LEVEL_PERMISSIONS = "app_level_permissions";
-    private Preference mPreference;
 
     public AppLocationPermissionPreferenceController(Context context) {
         super(context);
     }
 
     @Override
-    public void displayPreference(PreferenceScreen screen) {
-        super.displayPreference(screen);
-        if (isAvailable()) {
-            mPreference = screen.findPreference(KEY_APP_LEVEL_PERMISSIONS);
-        }
-    }
-
-    @Override
     public String getPreferenceKey() {
         return KEY_APP_LEVEL_PERMISSIONS;
     }
diff --git a/src/com/android/settings/location/BluetoothScanningPreferenceController.java b/src/com/android/settings/location/BluetoothScanningPreferenceController.java
new file mode 100644
index 0000000..c97bc7d
--- /dev/null
+++ b/src/com/android/settings/location/BluetoothScanningPreferenceController.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.location;
+
+import android.content.Context;
+import android.provider.Settings;
+import android.support.v14.preference.SwitchPreference;
+import android.support.v7.preference.Preference;
+
+import com.android.settings.core.PreferenceControllerMixin;
+import com.android.settingslib.core.AbstractPreferenceController;
+
+public class BluetoothScanningPreferenceController extends AbstractPreferenceController
+        implements PreferenceControllerMixin {
+
+    private static final String KEY_BLUETOOTH_SCAN_ALWAYS_AVAILABLE = "bluetooth_always_scanning";
+
+    public BluetoothScanningPreferenceController(Context context) {
+        super(context);
+    }
+
+    @Override
+    public boolean isAvailable() {
+        return true;
+    }
+
+    @Override
+    public String getPreferenceKey() {
+        return KEY_BLUETOOTH_SCAN_ALWAYS_AVAILABLE;
+    }
+
+    @Override
+    public void updateState(Preference preference) {
+        ((SwitchPreference) preference).setChecked(
+                Settings.Global.getInt(mContext.getContentResolver(),
+                        Settings.Global.BLE_SCAN_ALWAYS_AVAILABLE, 0) == 1);
+    }
+
+    @Override
+    public boolean handlePreferenceTreeClick(Preference preference) {
+        if (KEY_BLUETOOTH_SCAN_ALWAYS_AVAILABLE.equals(preference.getKey())) {
+            Settings.Global.putInt(mContext.getContentResolver(),
+                    Settings.Global.BLE_SCAN_ALWAYS_AVAILABLE,
+                    ((SwitchPreference) preference).isChecked() ? 1 : 0);
+            return true;
+        }
+        return false;
+    }
+}
diff --git a/src/com/android/settings/location/LocationBasePreferenceController.java b/src/com/android/settings/location/LocationBasePreferenceController.java
new file mode 100644
index 0000000..6cf8626
--- /dev/null
+++ b/src/com/android/settings/location/LocationBasePreferenceController.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.location;
+
+import android.content.Context;
+import android.os.UserManager;
+
+import com.android.settings.core.PreferenceControllerMixin;
+import com.android.settingslib.core.AbstractPreferenceController;
+import com.android.settingslib.core.lifecycle.Lifecycle;
+
+/**
+ * A base controller for preferences that listens to location settings change and modifies location
+ * settings.
+ */
+public abstract class LocationBasePreferenceController extends AbstractPreferenceController
+        implements PreferenceControllerMixin, LocationEnabler.LocationModeChangeListener {
+
+    protected final UserManager mUserManager;
+    protected final LocationEnabler mLocationEnabler;
+
+    public LocationBasePreferenceController(Context context, Lifecycle lifecycle) {
+        super(context);
+        mUserManager = (UserManager) context.getSystemService(Context.USER_SERVICE);
+        mLocationEnabler = new LocationEnabler(context, this /* listener */, lifecycle);
+    }
+
+    @Override
+    public boolean isAvailable() {
+        return true;
+    }
+
+}
diff --git a/src/com/android/settings/location/LocationEnabler.java b/src/com/android/settings/location/LocationEnabler.java
new file mode 100644
index 0000000..0bec6ba
--- /dev/null
+++ b/src/com/android/settings/location/LocationEnabler.java
@@ -0,0 +1,166 @@
+/*
+ * Copyright (C) 2017 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file
+ * except in compliance with the License. You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the
+ * License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+package com.android.settings.location;
+
+import android.Manifest.permission;
+import android.content.BroadcastReceiver;
+import android.content.Context;
+import android.content.Intent;
+import android.content.IntentFilter;
+import android.location.LocationManager;
+import android.os.UserHandle;
+import android.os.UserManager;
+import android.provider.Settings;
+import android.support.annotation.VisibleForTesting;
+import android.util.Log;
+
+import com.android.settings.Utils;
+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.OnPause;
+import com.android.settingslib.core.lifecycle.events.OnResume;
+
+/**
+ * A class that listens to location settings change and modifies location settings
+ * settings.
+ */
+public class LocationEnabler implements LifecycleObserver, OnResume, OnPause {
+
+    private static final String TAG = "LocationEnabler";
+    @VisibleForTesting
+    static final String MODE_CHANGING_ACTION =
+            "com.android.settings.location.MODE_CHANGING";
+    private static final String CURRENT_MODE_KEY = "CURRENT_MODE";
+    private static final String NEW_MODE_KEY = "NEW_MODE";
+    @VisibleForTesting
+    static final IntentFilter INTENT_FILTER_LOCATION_MODE_CHANGED =
+            new IntentFilter(LocationManager.MODE_CHANGED_ACTION);
+
+    private final Context mContext;
+    private final UserManager mUserManager;
+    private final LocationModeChangeListener mListener;
+
+    @VisibleForTesting
+    BroadcastReceiver mReceiver;
+
+    public interface LocationModeChangeListener {
+        /** Called when location mode has changed. */
+        void onLocationModeChanged(int mode, boolean restricted);
+    }
+
+    public LocationEnabler(Context context, LocationModeChangeListener listener,
+            Lifecycle lifecycle) {
+        mContext = context;
+        mListener = listener;
+        mUserManager = (UserManager) context.getSystemService(Context.USER_SERVICE);
+        if (lifecycle != null) {
+            lifecycle.addObserver(this);
+        }
+    }
+
+    @Override
+    public void onResume() {
+        if (mReceiver == null) {
+            mReceiver = new BroadcastReceiver() {
+                @Override
+                public void onReceive(Context context, Intent intent) {
+                    if (Log.isLoggable(TAG, Log.DEBUG)) {
+                        Log.d(TAG, "Received location mode change intent: " + intent);
+                    }
+                    refreshLocationMode();
+                }
+            };
+        }
+        mContext.registerReceiver(mReceiver, INTENT_FILTER_LOCATION_MODE_CHANGED);
+        refreshLocationMode();
+    }
+
+    @Override
+    public void onPause() {
+        try {
+            mContext.unregisterReceiver(mReceiver);
+        } catch (RuntimeException e) {
+            // Ignore exceptions caused by race condition
+        }
+    }
+
+    void refreshLocationMode() {
+        final int mode = Settings.Secure.getInt(mContext.getContentResolver(),
+                Settings.Secure.LOCATION_MODE, Settings.Secure.LOCATION_MODE_OFF);
+        if (Log.isLoggable(TAG, Log.INFO)) {
+            Log.i(TAG, "Location mode has been changed");
+        }
+        if (mListener != null) {
+            mListener.onLocationModeChanged(mode, isRestricted());
+        }
+    }
+
+    void setLocationMode(int mode) {
+        final int currentMode = Settings.Secure.getInt(mContext.getContentResolver(),
+                Settings.Secure.LOCATION_MODE, Settings.Secure.LOCATION_MODE_OFF);
+        if (isRestricted()) {
+            // Location toggling disabled by user restriction. Read the current location mode to
+            // update the location master switch.
+            if (Log.isLoggable(TAG, Log.INFO)) {
+                Log.i(TAG, "Restricted user, not setting location mode");
+            }
+            if (mListener != null) {
+                mListener.onLocationModeChanged(currentMode, true);
+            }
+            return;
+        }
+
+        updateLocationMode(currentMode, mode);
+        refreshLocationMode();
+    }
+
+    boolean isEnabled(int mode) {
+        return mode != Settings.Secure.LOCATION_MODE_OFF && !isRestricted();
+    }
+
+    /**
+     * Checking if device policy has put a location access lock-down on the managed profile.
+     *
+     * @return true if device policy has put a location access lock-down on the managed profile
+     */
+    boolean isManagedProfileRestrictedByBase() {
+        final UserHandle managedProfile = Utils.getManagedProfile(mUserManager);
+        return managedProfile != null
+                && hasShareLocationRestriction(managedProfile.getIdentifier());
+    }
+
+    RestrictedLockUtils.EnforcedAdmin getShareLocationEnforcedAdmin(int userId) {
+        return RestrictedLockUtils.checkIfRestrictionEnforced(
+                mContext, UserManager.DISALLOW_SHARE_LOCATION, userId);
+    }
+
+    boolean hasShareLocationRestriction(int userId) {
+        return RestrictedLockUtils.hasBaseUserRestriction(
+                mContext, UserManager.DISALLOW_SHARE_LOCATION, userId);
+    }
+
+    private boolean isRestricted() {
+        return mUserManager.hasUserRestriction(UserManager.DISALLOW_SHARE_LOCATION);
+    }
+
+    private boolean updateLocationMode(int oldMode, int newMode) {
+        final Intent intent = new Intent(MODE_CHANGING_ACTION);
+        intent.putExtra(CURRENT_MODE_KEY, oldMode);
+        intent.putExtra(NEW_MODE_KEY, newMode);
+        mContext.sendBroadcast(intent, permission.WRITE_SECURE_SETTINGS);
+        return Settings.Secure.putInt(
+                mContext.getContentResolver(), Settings.Secure.LOCATION_MODE, newMode);
+    }
+}
diff --git a/src/com/android/settings/location/LocationForWorkPreferenceController.java b/src/com/android/settings/location/LocationForWorkPreferenceController.java
new file mode 100644
index 0000000..a81c9d4
--- /dev/null
+++ b/src/com/android/settings/location/LocationForWorkPreferenceController.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.location;
+
+import android.content.Context;
+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.Utils;
+import com.android.settingslib.RestrictedLockUtils;
+import com.android.settingslib.RestrictedSwitchPreference;
+import com.android.settingslib.core.lifecycle.Lifecycle;
+
+public class LocationForWorkPreferenceController extends LocationBasePreferenceController {
+
+    /**
+     * Key for managed profile location switch preference. Shown only
+     * if there is a managed profile.
+     */
+    private static final String KEY_MANAGED_PROFILE_SWITCH = "managed_profile_location_switch";
+
+    private RestrictedSwitchPreference mPreference;
+
+    public LocationForWorkPreferenceController(Context context, Lifecycle lifecycle) {
+        super(context, lifecycle);
+    }
+
+    @Override
+    public boolean handlePreferenceTreeClick(Preference preference) {
+        if (KEY_MANAGED_PROFILE_SWITCH.equals(preference.getKey())) {
+            final boolean switchState = mPreference.isChecked();
+            mUserManager.setUserRestriction(UserManager.DISALLOW_SHARE_LOCATION, !switchState,
+                    Utils.getManagedProfile(mUserManager));
+            mPreference.setSummary(switchState ?
+                    R.string.switch_on_text : R.string.switch_off_text);
+            return true;
+        }
+        return false;
+    }
+
+    @Override
+    public void displayPreference(PreferenceScreen screen) {
+        super.displayPreference(screen);
+        mPreference =
+                (RestrictedSwitchPreference) screen.findPreference(KEY_MANAGED_PROFILE_SWITCH);
+    }
+
+    @Override
+    public boolean isAvailable() {
+        // Looking for a managed profile. If there are no managed profiles then we are removing the
+        // managed profile category.
+        return Utils.getManagedProfile(mUserManager) != null;
+    }
+
+    @Override
+    public String getPreferenceKey() {
+        return KEY_MANAGED_PROFILE_SWITCH;
+    }
+
+    @Override
+    public void onLocationModeChanged(int mode, boolean restricted) {
+        if (!mPreference.isVisible() || !isAvailable()) {
+            return;
+        }
+        final RestrictedLockUtils.EnforcedAdmin admin =
+                mLocationEnabler.getShareLocationEnforcedAdmin(
+                        Utils.getManagedProfile(mUserManager).getIdentifier());
+        final boolean isRestrictedByBase = mLocationEnabler.isManagedProfileRestrictedByBase();
+        if (!isRestrictedByBase && admin != null) {
+            mPreference.setDisabledByAdmin(admin);
+            mPreference.setChecked(false);
+        } else {
+            final boolean enabled = mLocationEnabler.isEnabled(mode);
+            mPreference.setEnabled(enabled);
+
+            int summaryResId = R.string.switch_off_text;
+            if (!enabled) {
+                mPreference.setChecked(false);
+            } else {
+                mPreference.setChecked(!isRestrictedByBase);
+                summaryResId = (isRestrictedByBase ?
+                        R.string.switch_off_text : R.string.switch_on_text);
+            }
+            mPreference.setSummary(summaryResId);
+        }
+    }
+}
+
diff --git a/src/com/android/settings/location/LocationMode.java b/src/com/android/settings/location/LocationMode.java
index 4ca098d..34f082b 100644
--- a/src/com/android/settings/location/LocationMode.java
+++ b/src/com/android/settings/location/LocationMode.java
@@ -16,12 +16,20 @@
 
 package com.android.settings.location;
 
-import android.provider.Settings;
-import android.support.v7.preference.PreferenceScreen;
+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.widget.RadioButtonPreference;
+import com.android.settings.dashboard.DashboardFragment;
+import com.android.settings.search.BaseSearchIndexProvider;
+import com.android.settings.search.Indexable;
+import com.android.settingslib.core.AbstractPreferenceController;
+import com.android.settingslib.core.lifecycle.Lifecycle;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
 
 /**
  * A page with 3 radio buttons to choose the location mode.
@@ -34,14 +42,9 @@
  *
  * Sensors only: use GPS location only.
  */
-public class LocationMode extends LocationSettingsBase
-        implements RadioButtonPreference.OnClickListener {
-    private static final String KEY_HIGH_ACCURACY = "high_accuracy";
-    private RadioButtonPreference mHighAccuracy;
-    private static final String KEY_BATTERY_SAVING = "battery_saving";
-    private RadioButtonPreference mBatterySaving;
-    private static final String KEY_SENSORS_ONLY = "sensors_only";
-    private RadioButtonPreference mSensorsOnly;
+public class LocationMode extends DashboardFragment {
+
+    private static final String TAG = "LocationMode";
 
     @Override
     public int getMetricsCategory() {
@@ -49,95 +52,52 @@
     }
 
     @Override
-    public void onResume() {
-        super.onResume();
-        createPreferenceHierarchy();
+    protected int getPreferenceScreenResId() {
+        return R.xml.location_mode;
     }
 
     @Override
-    public void onPause() {
-        super.onPause();
-    }
-
-    private PreferenceScreen createPreferenceHierarchy() {
-        PreferenceScreen root = getPreferenceScreen();
-        if (root != null) {
-            root.removeAll();
-        }
-        addPreferencesFromResource(R.xml.location_mode);
-        root = getPreferenceScreen();
-
-        mHighAccuracy = (RadioButtonPreference) root.findPreference(KEY_HIGH_ACCURACY);
-        mBatterySaving = (RadioButtonPreference) root.findPreference(KEY_BATTERY_SAVING);
-        mSensorsOnly = (RadioButtonPreference) root.findPreference(KEY_SENSORS_ONLY);
-        mHighAccuracy.setOnClickListener(this);
-        mBatterySaving.setOnClickListener(this);
-        mSensorsOnly.setOnClickListener(this);
-
-        refreshLocationMode();
-        return root;
-    }
-
-    private void updateRadioButtons(RadioButtonPreference activated) {
-        if (activated == null) {
-            mHighAccuracy.setChecked(false);
-            mBatterySaving.setChecked(false);
-            mSensorsOnly.setChecked(false);
-        } else if (activated == mHighAccuracy) {
-            mHighAccuracy.setChecked(true);
-            mBatterySaving.setChecked(false);
-            mSensorsOnly.setChecked(false);
-        } else if (activated == mBatterySaving) {
-            mHighAccuracy.setChecked(false);
-            mBatterySaving.setChecked(true);
-            mSensorsOnly.setChecked(false);
-        } else if (activated == mSensorsOnly) {
-            mHighAccuracy.setChecked(false);
-            mBatterySaving.setChecked(false);
-            mSensorsOnly.setChecked(true);
-        }
+    protected String getLogTag() {
+        return TAG;
     }
 
     @Override
-    public void onRadioButtonClicked(RadioButtonPreference emiter) {
-        int mode = Settings.Secure.LOCATION_MODE_OFF;
-        if (emiter == mHighAccuracy) {
-            mode = Settings.Secure.LOCATION_MODE_HIGH_ACCURACY;
-        } else if (emiter == mBatterySaving) {
-            mode = Settings.Secure.LOCATION_MODE_BATTERY_SAVING;
-        } else if (emiter == mSensorsOnly) {
-            mode = Settings.Secure.LOCATION_MODE_SENSORS_ONLY;
-        }
-        setLocationMode(mode);
-    }
-
-    @Override
-    public void onModeChanged(int mode, boolean restricted) {
-        switch (mode) {
-            case Settings.Secure.LOCATION_MODE_OFF:
-                updateRadioButtons(null);
-                break;
-            case Settings.Secure.LOCATION_MODE_SENSORS_ONLY:
-                updateRadioButtons(mSensorsOnly);
-                break;
-            case Settings.Secure.LOCATION_MODE_BATTERY_SAVING:
-                updateRadioButtons(mBatterySaving);
-                break;
-            case Settings.Secure.LOCATION_MODE_HIGH_ACCURACY:
-                updateRadioButtons(mHighAccuracy);
-                break;
-            default:
-                break;
-        }
-
-        boolean enabled = (mode != Settings.Secure.LOCATION_MODE_OFF) && !restricted;
-        mHighAccuracy.setEnabled(enabled);
-        mBatterySaving.setEnabled(enabled);
-        mSensorsOnly.setEnabled(enabled);
+    protected List<AbstractPreferenceController> getPreferenceControllers(Context context) {
+        return buildPreferenceControllers(context, getLifecycle());
     }
 
     @Override
     public int getHelpResource() {
         return R.string.help_url_location_access;
     }
+
+    private static List<AbstractPreferenceController> buildPreferenceControllers(
+            Context context, Lifecycle lifecycle) {
+        final List<AbstractPreferenceController> controllers = new ArrayList<>();
+        controllers.add(new LocationModeHighAccuracyPreferenceController(context, lifecycle));
+        controllers.add(
+                new LocationModeBatterySavingPreferenceController(context, lifecycle));
+        controllers.add(new LocationModeSensorsOnlyPreferenceController(context, lifecycle));
+        return controllers;
+    }
+
+    /**
+     * For Search.
+     */
+    public static final Indexable.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.location_mode;
+                    return Arrays.asList(sir);
+                }
+
+                @Override
+                public List<AbstractPreferenceController> getPreferenceControllers(Context
+                        context) {
+                    return buildPreferenceControllers(context, null /* lifecycle */);
+                }
+            };
 }
diff --git a/src/com/android/settings/location/LocationModeBatterySavingPreferenceController.java b/src/com/android/settings/location/LocationModeBatterySavingPreferenceController.java
new file mode 100644
index 0000000..70c7013
--- /dev/null
+++ b/src/com/android/settings/location/LocationModeBatterySavingPreferenceController.java
@@ -0,0 +1,40 @@
+/*
+ * Copyright (C) 2017 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file
+ * except in compliance with the License. You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the
+ * License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+package com.android.settings.location;
+
+import android.content.Context;
+import android.provider.Settings;
+
+import com.android.settingslib.core.lifecycle.Lifecycle;
+
+public class LocationModeBatterySavingPreferenceController
+        extends LocationModeRadioButtonPreferenceController {
+
+    private static final String KEY_BATTERY_SAVING = "battery_saving";
+
+    public LocationModeBatterySavingPreferenceController(Context context,
+            Lifecycle lifecycle) {
+        super(context, lifecycle);
+    }
+
+    @Override
+    public String getPreferenceKey() {
+        return KEY_BATTERY_SAVING;
+    }
+
+    @Override
+    protected int getLocationMode() {
+        return Settings.Secure.LOCATION_MODE_BATTERY_SAVING;
+    }
+}
diff --git a/src/com/android/settings/location/LocationModeHighAccuracyPreferenceController.java b/src/com/android/settings/location/LocationModeHighAccuracyPreferenceController.java
new file mode 100644
index 0000000..bd2d07e
--- /dev/null
+++ b/src/com/android/settings/location/LocationModeHighAccuracyPreferenceController.java
@@ -0,0 +1,40 @@
+/*
+ * Copyright (C) 2017 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file
+ * except in compliance with the License. You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the
+ * License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+package com.android.settings.location;
+
+import android.content.Context;
+import android.provider.Settings;
+
+import com.android.settingslib.core.lifecycle.Lifecycle;
+
+public class LocationModeHighAccuracyPreferenceController
+        extends LocationModeRadioButtonPreferenceController {
+
+    private static final String KEY_HIGH_ACCURACY = "high_accuracy";
+
+    public LocationModeHighAccuracyPreferenceController(Context context,
+            Lifecycle lifecycle) {
+        super(context, lifecycle);
+    }
+
+    @Override
+    public String getPreferenceKey() {
+        return KEY_HIGH_ACCURACY;
+    }
+
+    @Override
+    protected int getLocationMode() {
+        return Settings.Secure.LOCATION_MODE_HIGH_ACCURACY;
+    }
+}
diff --git a/src/com/android/settings/location/LocationModePreferenceController.java b/src/com/android/settings/location/LocationModePreferenceController.java
new file mode 100644
index 0000000..a9ed6ad
--- /dev/null
+++ b/src/com/android/settings/location/LocationModePreferenceController.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.location;
+
+import android.content.Context;
+import android.support.v7.preference.Preference;
+import android.support.v7.preference.PreferenceScreen;
+
+import com.android.settings.R;
+import com.android.settings.SettingsActivity;
+import com.android.settingslib.core.lifecycle.Lifecycle;
+
+public class LocationModePreferenceController extends LocationBasePreferenceController {
+
+    /** Key for preference screen "Mode" */
+    private static final String KEY_LOCATION_MODE = "location_mode";
+
+    private final LocationSettings mParentFragment;
+    private Preference mPreference;
+
+    public LocationModePreferenceController(Context context, LocationSettings parent,
+            Lifecycle lifecycle) {
+        super(context, lifecycle);
+        mParentFragment = parent;
+    }
+
+    @Override
+    public String getPreferenceKey() {
+        return KEY_LOCATION_MODE;
+    }
+
+    @Override
+    public void displayPreference(PreferenceScreen screen) {
+        super.displayPreference(screen);
+        mPreference = screen.findPreference(KEY_LOCATION_MODE);
+    }
+
+    @Override
+    public boolean handlePreferenceTreeClick(Preference preference) {
+        if (KEY_LOCATION_MODE.equals(preference.getKey())) {
+            final SettingsActivity activity = (SettingsActivity) mParentFragment.getActivity();
+            activity.startPreferencePanel(mParentFragment, LocationMode.class.getName(), null,
+                    R.string.location_mode_screen_title, null, mParentFragment, 0);
+            return true;
+        }
+        return false;
+    }
+
+    @Override
+    public void onLocationModeChanged(int mode, boolean restricted) {
+        final int modeDescription = LocationPreferenceController.getLocationString(mode);
+        if (modeDescription != 0) {
+            mPreference.setSummary(modeDescription);
+        }
+        // Restricted user can't change the location mode, so disable the master switch. But in some
+        // corner cases, the location might still be enabled. In such case the master switch should
+        // be disabled but checked.
+        mPreference.setEnabled(mLocationEnabler.isEnabled(mode));
+    }
+}
diff --git a/src/com/android/settings/location/LocationModeRadioButtonPreferenceController.java b/src/com/android/settings/location/LocationModeRadioButtonPreferenceController.java
new file mode 100644
index 0000000..bdf7c8f
--- /dev/null
+++ b/src/com/android/settings/location/LocationModeRadioButtonPreferenceController.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.location;
+
+import android.content.Context;
+import android.support.v7.preference.PreferenceScreen;
+
+import com.android.settings.widget.RadioButtonPreference;
+import com.android.settingslib.core.lifecycle.Lifecycle;
+
+public abstract class LocationModeRadioButtonPreferenceController
+        extends LocationBasePreferenceController
+        implements RadioButtonPreference.OnClickListener {
+
+    protected RadioButtonPreference mPreference;
+
+    public LocationModeRadioButtonPreferenceController(Context context, Lifecycle lifecycle) {
+        super(context, lifecycle);
+    }
+
+    @Override
+    public void displayPreference(PreferenceScreen screen) {
+        super.displayPreference(screen);
+        mPreference = (RadioButtonPreference) screen.findPreference(getPreferenceKey());
+        mPreference.setOnClickListener(this);
+    }
+
+    @Override
+    public void onRadioButtonClicked(RadioButtonPreference emiter) {
+        mLocationEnabler.setLocationMode(getLocationMode());
+    }
+
+    @Override
+    public void onLocationModeChanged(int mode, boolean restricted) {
+        mPreference.setChecked(mode == getLocationMode());
+        mPreference.setEnabled(mLocationEnabler.isEnabled(mode));
+    }
+
+    /** Gets the location mode that this controller monitors. */
+    protected abstract int getLocationMode();
+
+}
diff --git a/src/com/android/settings/location/LocationModeSensorsOnlyPreferenceController.java b/src/com/android/settings/location/LocationModeSensorsOnlyPreferenceController.java
new file mode 100644
index 0000000..b79dbf2
--- /dev/null
+++ b/src/com/android/settings/location/LocationModeSensorsOnlyPreferenceController.java
@@ -0,0 +1,40 @@
+/*
+ * Copyright (C) 2017 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file
+ * except in compliance with the License. You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the
+ * License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+package com.android.settings.location;
+
+import android.content.Context;
+import android.provider.Settings;
+
+import com.android.settingslib.core.lifecycle.Lifecycle;
+
+public class LocationModeSensorsOnlyPreferenceController
+        extends LocationModeRadioButtonPreferenceController {
+
+    private static final String KEY_SENSORS_ONLY = "sensors_only";
+
+    public LocationModeSensorsOnlyPreferenceController(Context context,
+            Lifecycle lifecycle) {
+        super(context, lifecycle);
+    }
+
+    @Override
+    public String getPreferenceKey() {
+        return KEY_SENSORS_ONLY;
+    }
+
+    @Override
+    protected int getLocationMode() {
+        return Settings.Secure.LOCATION_MODE_SENSORS_ONLY;
+    }
+}
diff --git a/src/com/android/settings/location/LocationPreferenceController.java b/src/com/android/settings/location/LocationPreferenceController.java
index 225100f..9b68848 100644
--- a/src/com/android/settings/location/LocationPreferenceController.java
+++ b/src/com/android/settings/location/LocationPreferenceController.java
@@ -127,7 +127,7 @@
 
     @Override
     public ResultPayload getResultPayload() {
-        final Intent intent = DatabaseIndexingUtils.buildSubsettingIntent(mContext,
+        final Intent intent = DatabaseIndexingUtils.buildSearchResultPageIntent(mContext,
                 LocationSettings.class.getName(), KEY_LOCATION,
                 mContext.getString(R.string.location_settings_title));
 
diff --git a/src/com/android/settings/location/LocationServicePreferenceController.java b/src/com/android/settings/location/LocationServicePreferenceController.java
new file mode 100644
index 0000000..0a6a5c1
--- /dev/null
+++ b/src/com/android/settings/location/LocationServicePreferenceController.java
@@ -0,0 +1,130 @@
+/*
+ * Copyright (C) 2017 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file
+ * except in compliance with the License. You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the
+ * License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+package com.android.settings.location;
+
+import android.content.BroadcastReceiver;
+import android.content.Context;
+import android.content.Intent;
+import android.content.IntentFilter;
+import android.location.SettingInjectorService;
+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.util.Log;
+
+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 class LocationServicePreferenceController extends LocationBasePreferenceController
+        implements LifecycleObserver, OnResume, OnPause {
+
+    private static final String TAG = "LocationServicePrefCtrl";
+    /** Key for preference category "Location services" */
+    private static final String KEY_LOCATION_SERVICES = "location_services";
+    @VisibleForTesting
+    static final IntentFilter INTENT_FILTER_INJECTED_SETTING_CHANGED =
+            new IntentFilter(SettingInjectorService.ACTION_INJECTED_SETTING_CHANGED);
+
+    private PreferenceCategory mCategoryLocationServices;
+    private final LocationSettings mFragment;
+    private final SettingsInjector mInjector;
+    /** Receives UPDATE_INTENT  */
+    @VisibleForTesting
+    BroadcastReceiver mInjectedSettingsReceiver;
+
+    public LocationServicePreferenceController(Context context, LocationSettings fragment,
+            Lifecycle lifecycle) {
+        this(context, fragment, lifecycle, new SettingsInjector(context));
+    }
+
+    @VisibleForTesting
+    LocationServicePreferenceController(Context context, LocationSettings fragment,
+            Lifecycle lifecycle, SettingsInjector injector) {
+        super(context, lifecycle);
+        mFragment = fragment;
+        mInjector = injector;
+        if (lifecycle != null) {
+            lifecycle.addObserver(this);
+        }
+    }
+
+    @Override
+    public String getPreferenceKey() {
+        return KEY_LOCATION_SERVICES;
+    }
+
+    @Override
+    public boolean isAvailable() {
+        // If managed profile has lock-down on location access then its injected location services
+        // must not be shown.
+        return mInjector.hasInjectedSettings(mLocationEnabler.isManagedProfileRestrictedByBase()
+                ? UserHandle.myUserId() : UserHandle.USER_CURRENT);
+    }
+
+    @Override
+    public void displayPreference(PreferenceScreen screen) {
+        super.displayPreference(screen);
+        mCategoryLocationServices =
+                (PreferenceCategory) screen.findPreference(KEY_LOCATION_SERVICES);
+    }
+
+    @Override
+    public void updateState(Preference preference) {
+        mCategoryLocationServices.removeAll();
+        LocationSettings.addPreferencesSorted(getLocationServices(), mCategoryLocationServices);
+    }
+
+    @Override
+    public void onLocationModeChanged(int mode, boolean restricted) {
+        // As a safety measure, also reloads on location mode change to ensure the settings are
+        // up-to-date even if an affected app doesn't send the setting changed broadcast.
+        mInjector.reloadStatusMessages();
+    }
+
+    @Override
+    public void onResume() {
+        if (mInjectedSettingsReceiver == null) {
+            mInjectedSettingsReceiver = new BroadcastReceiver() {
+                @Override
+                public void onReceive(Context context, Intent intent) {
+                    if (Log.isLoggable(TAG, Log.DEBUG)) {
+                        Log.d(TAG, "Received settings change intent: " + intent);
+                    }
+                    mInjector.reloadStatusMessages();
+                }
+            };
+        }
+        mContext.registerReceiver(
+                mInjectedSettingsReceiver, INTENT_FILTER_INJECTED_SETTING_CHANGED);
+    }
+
+    @Override
+    public void onPause() {
+        mContext.unregisterReceiver(mInjectedSettingsReceiver);
+    }
+
+    private List<Preference> getLocationServices() {
+        // If location access is locked down by device policy then we only show injected settings
+        // for the primary profile.
+        return mInjector.getInjectedSettings(mFragment.getPreferenceManager().getContext(),
+                mLocationEnabler.isManagedProfileRestrictedByBase()
+                        ? UserHandle.myUserId() : UserHandle.USER_CURRENT);
+    }
+}
diff --git a/src/com/android/settings/location/LocationSettings.java b/src/com/android/settings/location/LocationSettings.java
index 34e8cc3..3330421 100644
--- a/src/com/android/settings/location/LocationSettings.java
+++ b/src/com/android/settings/location/LocationSettings.java
@@ -16,37 +16,27 @@
 
 package com.android.settings.location;
 
-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.location.SettingInjectorService;
 import android.os.Bundle;
-import android.os.UserHandle;
-import android.os.UserManager;
+import android.provider.SearchIndexableResource;
 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.util.Log;
-import android.widget.Switch;
 
 import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
-import com.android.settings.DimmableIconPreference;
 import com.android.settings.R;
 import com.android.settings.SettingsActivity;
-import com.android.settings.Utils;
-import com.android.settings.applications.InstalledAppDetails;
+import com.android.settings.dashboard.DashboardFragment;
 import com.android.settings.dashboard.SummaryLoader;
-import com.android.settings.widget.SwitchBar;
-import com.android.settingslib.RestrictedLockUtils;
-import com.android.settingslib.RestrictedSwitchPreference;
+import com.android.settings.search.BaseSearchIndexProvider;
+import com.android.settings.search.Indexable;
+import com.android.settingslib.core.AbstractPreferenceController;
+import com.android.settingslib.core.lifecycle.Lifecycle;
 import com.android.settingslib.location.RecentLocationApps;
 
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.Collections;
 import java.util.Comparator;
 import java.util.List;
@@ -76,34 +66,11 @@
  * other things, this simplifies integration with future changes to the default (AOSP)
  * implementation.
  */
-public class LocationSettings extends LocationSettingsBase
-        implements SwitchBar.OnSwitchChangeListener {
+public class LocationSettings extends DashboardFragment {
 
     private static final String TAG = "LocationSettings";
 
-    /**
-     * Key for managed profile location switch preference. Shown only
-     * if there is a managed profile.
-     */
-    private static final String KEY_MANAGED_PROFILE_SWITCH = "managed_profile_location_switch";
-    /** Key for preference screen "Mode" */
-    private static final String KEY_LOCATION_MODE = "location_mode";
-    /** Key for preference category "Recent location requests" */
-    private static final String KEY_RECENT_LOCATION_REQUESTS = "recent_location_requests";
-    /** Key for preference category "Location services" */
-    private static final String KEY_LOCATION_SERVICES = "location_services";
-
-    private SwitchBar mSwitchBar;
-    private Switch mSwitch;
-    private boolean mValidListener = false;
-    private UserHandle mManagedProfile;
-    private RestrictedSwitchPreference mManagedProfileSwitch;
-    private Preference mLocationMode;
-    private PreferenceCategory mCategoryRecentLocationRequests;
-    /** Receives UPDATE_INTENT  */
-    private BroadcastReceiver mReceiver;
-    private SettingsInjector injector;
-    private UserManager mUm;
+    private LocationSwitchBarController mSwitchBarController;
 
     @Override
     public int getMetricsCategory() {
@@ -113,52 +80,27 @@
     @Override
     public void onActivityCreated(Bundle savedInstanceState) {
         super.onActivityCreated(savedInstanceState);
-
         final SettingsActivity activity = (SettingsActivity) getActivity();
-        mUm = (UserManager) activity.getSystemService(Context.USER_SERVICE);
-
-        setHasOptionsMenu(true);
-        mSwitchBar = activity.getSwitchBar();
-        mSwitch = mSwitchBar.getSwitch();
-        mSwitchBar.show();
-
-        setHasOptionsMenu(true);
+        mSwitchBarController = new LocationSwitchBarController(
+                activity, activity.getSwitchBar(), getLifecycle());
     }
 
     @Override
-    public void onDestroyView() {
-        super.onDestroyView();
-        mSwitchBar.hide();
+    protected int getPreferenceScreenResId() {
+        return R.xml.location_settings;
     }
 
     @Override
-    public void onResume() {
-        super.onResume();
-        createPreferenceHierarchy();
-        if (!mValidListener) {
-            mSwitchBar.addOnSwitchChangeListener(this);
-            mValidListener = true;
-        }
+    protected String getLogTag() {
+        return TAG;
     }
 
     @Override
-    public void onPause() {
-        try {
-            getActivity().unregisterReceiver(mReceiver);
-        } catch (RuntimeException e) {
-            // Ignore exceptions caused by race condition
-            if (Log.isLoggable(TAG, Log.VERBOSE)) {
-                Log.v(TAG, "Swallowing " + e);
-            }
-        }
-        if (mValidListener) {
-            mSwitchBar.removeOnSwitchChangeListener(this);
-            mValidListener = false;
-        }
-        super.onPause();
+    protected List<AbstractPreferenceController> getPreferenceControllers(Context context) {
+        return buildPreferenceControllers(context, this, getLifecycle());
     }
 
-    private void addPreferencesSorted(List<Preference> prefs, PreferenceGroup container) {
+    static void addPreferencesSorted(List<Preference> prefs, PreferenceGroup container) {
         // If there's some items to display, sort the items and add them to the container.
         Collections.sort(prefs, new Comparator<Preference>() {
             @Override
@@ -171,261 +113,22 @@
         }
     }
 
-    private PreferenceScreen createPreferenceHierarchy() {
-        final SettingsActivity activity = (SettingsActivity) getActivity();
-        PreferenceScreen root = getPreferenceScreen();
-        if (root != null) {
-            root.removeAll();
-        }
-        addPreferencesFromResource(R.xml.location_settings);
-        root = getPreferenceScreen();
-
-        setupManagedProfileCategory(root);
-        mLocationMode = root.findPreference(KEY_LOCATION_MODE);
-        mLocationMode.setOnPreferenceClickListener(
-                new Preference.OnPreferenceClickListener() {
-                    @Override
-                    public boolean onPreferenceClick(Preference preference) {
-                        activity.startPreferencePanel(
-                                LocationSettings.this,
-                                LocationMode.class.getName(), null,
-                                R.string.location_mode_screen_title, null, LocationSettings.this,
-                                0);
-                        return true;
-                    }
-                });
-
-        RecentLocationApps recentApps = new RecentLocationApps(activity);
-        List<RecentLocationApps.Request> recentLocationRequests = recentApps.getAppList();
-
-        final AppLocationPermissionPreferenceController preferenceController =
-                new AppLocationPermissionPreferenceController(activity);
-        preferenceController.displayPreference(root);
-
-        mCategoryRecentLocationRequests =
-                (PreferenceCategory) root.findPreference(KEY_RECENT_LOCATION_REQUESTS);
-
-        List<Preference> recentLocationPrefs = new ArrayList<>(recentLocationRequests.size());
-        for (final RecentLocationApps.Request request : recentLocationRequests) {
-            DimmableIconPreference pref = new DimmableIconPreference(getPrefContext(),
-                    request.contentDescription);
-            pref.setIcon(request.icon);
-            pref.setTitle(request.label);
-            pref.setOnPreferenceClickListener(
-                    new PackageEntryClickedListener(request.packageName, request.userHandle));
-            recentLocationPrefs.add(pref);
-
-        }
-        if (recentLocationRequests.size() > 0) {
-            addPreferencesSorted(recentLocationPrefs, mCategoryRecentLocationRequests);
-        } else {
-            // If there's no item to display, add a "No recent apps" item.
-            Preference banner = new Preference(getPrefContext());
-            banner.setLayoutResource(R.layout.location_list_no_item);
-            banner.setTitle(R.string.location_no_recent_apps);
-            banner.setSelectable(false);
-            mCategoryRecentLocationRequests.addPreference(banner);
-        }
-
-        boolean lockdownOnLocationAccess = false;
-        // Checking if device policy has put a location access lock-down on the managed
-        // profile. If managed profile has lock-down on location access then its
-        // injected location services must not be shown.
-        if (mManagedProfile != null
-                && mUm.hasUserRestriction(UserManager.DISALLOW_SHARE_LOCATION, mManagedProfile)) {
-            lockdownOnLocationAccess = true;
-        }
-        addLocationServices(activity, root, lockdownOnLocationAccess);
-
-        refreshLocationMode();
-        return root;
-    }
-
-    private void setupManagedProfileCategory(PreferenceScreen root) {
-        // Looking for a managed profile. If there are no managed profiles then we are removing the
-        // managed profile category.
-        mManagedProfile = Utils.getManagedProfile(mUm);
-        if (mManagedProfile == null) {
-            // There is no managed profile
-            root.removePreference(root.findPreference(KEY_MANAGED_PROFILE_SWITCH));
-            mManagedProfileSwitch = null;
-        } else {
-            mManagedProfileSwitch = (RestrictedSwitchPreference)root
-                    .findPreference(KEY_MANAGED_PROFILE_SWITCH);
-            mManagedProfileSwitch.setOnPreferenceClickListener(null);
-        }
-    }
-
-    private void changeManagedProfileLocationAccessStatus(boolean mainSwitchOn) {
-        if (mManagedProfileSwitch == null) {
-            return;
-        }
-        mManagedProfileSwitch.setOnPreferenceClickListener(null);
-        final EnforcedAdmin admin = RestrictedLockUtils.checkIfRestrictionEnforced(getActivity(),
-                UserManager.DISALLOW_SHARE_LOCATION, mManagedProfile.getIdentifier());
-        final boolean isRestrictedByBase = isManagedProfileRestrictedByBase();
-        if (!isRestrictedByBase && admin != null) {
-            mManagedProfileSwitch.setDisabledByAdmin(admin);
-            mManagedProfileSwitch.setChecked(false);
-        } else {
-            boolean enabled = mainSwitchOn;
-            mManagedProfileSwitch.setEnabled(enabled);
-
-            int summaryResId = R.string.switch_off_text;
-            if (!enabled) {
-                mManagedProfileSwitch.setChecked(false);
-            } else {
-                mManagedProfileSwitch.setChecked(!isRestrictedByBase);
-                summaryResId = (isRestrictedByBase ?
-                        R.string.switch_off_text : R.string.switch_on_text);
-                mManagedProfileSwitch.setOnPreferenceClickListener(
-                        mManagedProfileSwitchClickListener);
-            }
-            mManagedProfileSwitch.setSummary(summaryResId);
-        }
-    }
-
-    /**
-     * Add the settings injected by external apps into the "App Settings" category. Hides the
-     * category if there are no injected settings.
-     *
-     * Reloads the settings whenever receives
-     * {@link SettingInjectorService#ACTION_INJECTED_SETTING_CHANGED}.
-     */
-    private void addLocationServices(Context context, PreferenceScreen root,
-            boolean lockdownOnLocationAccess) {
-        PreferenceCategory categoryLocationServices =
-                (PreferenceCategory) root.findPreference(KEY_LOCATION_SERVICES);
-        injector = new SettingsInjector(context);
-        // If location access is locked down by device policy then we only show injected settings
-        // for the primary profile.
-        final Context prefContext = categoryLocationServices.getContext();
-        final List<Preference> locationServices = injector.getInjectedSettings(prefContext,
-                lockdownOnLocationAccess ? UserHandle.myUserId() : UserHandle.USER_CURRENT);
-
-        mReceiver = new BroadcastReceiver() {
-            @Override
-            public void onReceive(Context context, Intent intent) {
-                if (Log.isLoggable(TAG, Log.DEBUG)) {
-                    Log.d(TAG, "Received settings change intent: " + intent);
-                }
-                injector.reloadStatusMessages();
-            }
-        };
-
-        IntentFilter filter = new IntentFilter();
-        filter.addAction(SettingInjectorService.ACTION_INJECTED_SETTING_CHANGED);
-        context.registerReceiver(mReceiver, filter);
-
-        if (locationServices.size() > 0) {
-            addPreferencesSorted(locationServices, categoryLocationServices);
-        } else {
-            // If there's no item to display, remove the whole category.
-            root.removePreference(categoryLocationServices);
-        }
-    }
-
     @Override
     public int getHelpResource() {
         return R.string.help_url_location_access;
     }
 
-    @Override
-    public void onModeChanged(int mode, boolean restricted) {
-        int modeDescription = LocationPreferenceController.getLocationString(mode);
-        if (modeDescription != 0) {
-            mLocationMode.setSummary(modeDescription);
-        }
-
-        // Restricted user can't change the location mode, so disable the master switch. But in some
-        // corner cases, the location might still be enabled. In such case the master switch should
-        // be disabled but checked.
-        final boolean enabled = (mode != android.provider.Settings.Secure.LOCATION_MODE_OFF);
-        EnforcedAdmin admin = RestrictedLockUtils.checkIfRestrictionEnforced(getActivity(),
-                UserManager.DISALLOW_SHARE_LOCATION, UserHandle.myUserId());
-        boolean hasBaseUserRestriction = RestrictedLockUtils.hasBaseUserRestriction(getActivity(),
-                UserManager.DISALLOW_SHARE_LOCATION, UserHandle.myUserId());
-        // Disable the whole switch bar instead of the switch itself. If we disabled the switch
-        // only, it would be re-enabled again if the switch bar is not disabled.
-        if (!hasBaseUserRestriction && admin != null) {
-            mSwitchBar.setDisabledByAdmin(admin);
-        } else {
-            mSwitchBar.setEnabled(!restricted);
-        }
-        mLocationMode.setEnabled(enabled && !restricted);
-        mCategoryRecentLocationRequests.setEnabled(enabled);
-
-        if (enabled != mSwitch.isChecked()) {
-            // set listener to null so that that code below doesn't trigger onCheckedChanged()
-            if (mValidListener) {
-                mSwitchBar.removeOnSwitchChangeListener(this);
-            }
-            mSwitch.setChecked(enabled);
-            if (mValidListener) {
-                mSwitchBar.addOnSwitchChangeListener(this);
-            }
-        }
-
-        changeManagedProfileLocationAccessStatus(enabled);
-
-        // As a safety measure, also reloads on location mode change to ensure the settings are
-        // up-to-date even if an affected app doesn't send the setting changed broadcast.
-        injector.reloadStatusMessages();
-    }
-
-    /**
-     * Listens to the state change of the location master switch.
-     */
-    @Override
-    public void onSwitchChanged(Switch switchView, boolean isChecked) {
-        if (isChecked) {
-            setLocationMode(android.provider.Settings.Secure.LOCATION_MODE_PREVIOUS);
-        } else {
-            setLocationMode(android.provider.Settings.Secure.LOCATION_MODE_OFF);
-        }
-    }
-
-    private boolean isManagedProfileRestrictedByBase() {
-        if (mManagedProfile == null) {
-            return false;
-        }
-        return mUm.hasBaseUserRestriction(UserManager.DISALLOW_SHARE_LOCATION, mManagedProfile);
-    }
-
-    private Preference.OnPreferenceClickListener mManagedProfileSwitchClickListener =
-            new Preference.OnPreferenceClickListener() {
-                @Override
-                public boolean onPreferenceClick(Preference preference) {
-                    final boolean switchState = mManagedProfileSwitch.isChecked();
-                    mUm.setUserRestriction(UserManager.DISALLOW_SHARE_LOCATION,
-                            !switchState, mManagedProfile);
-                    mManagedProfileSwitch.setSummary(switchState ?
-                            R.string.switch_on_text : R.string.switch_off_text);
-                    return true;
-                }
-            };
-
-    private class PackageEntryClickedListener
-            implements Preference.OnPreferenceClickListener {
-        private String mPackage;
-        private UserHandle mUserHandle;
-
-        public PackageEntryClickedListener(String packageName, UserHandle userHandle) {
-            mPackage = packageName;
-            mUserHandle = userHandle;
-        }
-
-        @Override
-        public boolean onPreferenceClick(Preference preference) {
-            // start new fragment to display extended information
-            Bundle args = new Bundle();
-            args.putString(InstalledAppDetails.ARG_PACKAGE_NAME, mPackage);
-            ((SettingsActivity) getActivity()).startPreferencePanelAsUser(
-                    LocationSettings.this,
-                    InstalledAppDetails.class.getName(), args,
-                    R.string.application_info_label, null, mUserHandle);
-            return true;
-        }
+    private static List<AbstractPreferenceController> buildPreferenceControllers(
+            Context context, LocationSettings fragment, Lifecycle lifecycle) {
+        final List<AbstractPreferenceController> controllers = new ArrayList<>();
+        controllers.add(new LocationModePreferenceController(context, fragment, lifecycle));
+        controllers.add(new AppLocationPermissionPreferenceController(context));
+        controllers.add(new LocationForWorkPreferenceController(context, lifecycle));
+        controllers.add(
+                new RecentLocationRequestPreferenceController(context, fragment, lifecycle));
+        controllers.add(
+                new LocationServicePreferenceController(context, fragment, lifecycle));
+        return controllers;
     }
 
     private static class SummaryProvider implements SummaryLoader.SummaryProvider {
@@ -455,4 +158,25 @@
             return new SummaryProvider(activity, summaryLoader);
         }
     };
+
+    /**
+     * For Search.
+     */
+    public static final Indexable.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.location_settings;
+                    return Arrays.asList(sir);
+                }
+
+                @Override
+                public List<AbstractPreferenceController> getPreferenceControllers(Context
+                        context) {
+                    return buildPreferenceControllers(context, null /* fragment */,
+                            null /* lifecycle */);
+                }
+            };
 }
diff --git a/src/com/android/settings/location/LocationSettingsBase.java b/src/com/android/settings/location/LocationSettingsBase.java
deleted file mode 100644
index 741d607..0000000
--- a/src/com/android/settings/location/LocationSettingsBase.java
+++ /dev/null
@@ -1,133 +0,0 @@
-/*
- * Copyright (C) 2011 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.location;
-
-import android.content.BroadcastReceiver;
-import android.content.Context;
-import android.content.Intent;
-import android.content.IntentFilter;
-import android.location.LocationManager;
-import android.os.Bundle;
-import android.os.UserManager;
-import android.provider.Settings;
-import android.util.Log;
-
-import com.android.settings.SettingsPreferenceFragment;
-
-/**
- * A base class that listens to location settings change and modifies location
- * settings.
- */
-public abstract class LocationSettingsBase extends SettingsPreferenceFragment {
-    private static final String TAG = "LocationSettingsBase";
-    /** Broadcast intent action when the location mode is about to change. */
-    private static final String MODE_CHANGING_ACTION =
-            "com.android.settings.location.MODE_CHANGING";
-    private static final String CURRENT_MODE_KEY = "CURRENT_MODE";
-    private static final String NEW_MODE_KEY = "NEW_MODE";
-
-    private int mCurrentMode;
-    private BroadcastReceiver mReceiver;
-
-    /**
-     * Whether the fragment is actively running.
-     */
-    private boolean mActive = false;
-
-    @Override
-    public void onCreate(Bundle icicle) {
-        super.onCreate(icicle);
-        mReceiver = new BroadcastReceiver() {
-            @Override
-            public void onReceive(Context context, Intent intent) {
-                if (Log.isLoggable(TAG, Log.DEBUG)) {
-                    Log.d(TAG, "Received location mode change intent: " + intent);
-                }
-                refreshLocationMode();
-            }
-        };
-    }
-
-    @Override
-    public void onResume() {
-        super.onResume();
-        mActive = true;
-        IntentFilter filter = new IntentFilter();
-        filter.addAction(LocationManager.MODE_CHANGED_ACTION);
-        getActivity().registerReceiver(mReceiver, filter);
-    }
-
-    @Override
-    public void onPause() {
-        try {
-            getActivity().unregisterReceiver(mReceiver);
-        } catch (RuntimeException e) {
-            // Ignore exceptions caused by race condition
-        }
-        super.onPause();
-        mActive = false;
-    }
-
-    /** Called when location mode has changed. */
-    public abstract void onModeChanged(int mode, boolean restricted);
-
-    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) {
-        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)) {
-                Log.i(TAG, "Restricted user, not setting location mode");
-            }
-            mode = Settings.Secure.getInt(getContentResolver(), Settings.Secure.LOCATION_MODE,
-                    Settings.Secure.LOCATION_MODE_OFF);
-            if (mActive) {
-                onModeChanged(mode, true);
-            }
-            return;
-        }
-
-        updateLocationMode(context, mCurrentMode, mode);
-        refreshLocationMode();
-    }
-
-    public void refreshLocationMode() {
-        if (mActive) {
-            int mode = Settings.Secure.getInt(getContentResolver(), Settings.Secure.LOCATION_MODE,
-                    Settings.Secure.LOCATION_MODE_OFF);
-            mCurrentMode = mode;
-            if (Log.isLoggable(TAG, Log.INFO)) {
-                Log.i(TAG, "Location mode has been changed");
-            }
-            onModeChanged(mode, isRestricted(getActivity()));
-        }
-    }
-}
diff --git a/src/com/android/settings/location/LocationSwitchBarController.java b/src/com/android/settings/location/LocationSwitchBarController.java
new file mode 100644
index 0000000..6522dc7
--- /dev/null
+++ b/src/com/android/settings/location/LocationSwitchBarController.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.location;
+
+import android.content.Context;
+import android.os.UserHandle;
+import android.widget.Switch;
+
+import com.android.settings.widget.SwitchBar;
+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.OnStart;
+import com.android.settingslib.core.lifecycle.events.OnStop;
+
+public class LocationSwitchBarController implements SwitchBar.OnSwitchChangeListener,
+        LocationEnabler.LocationModeChangeListener, LifecycleObserver, OnStart, OnStop {
+
+    private final SwitchBar mSwitchBar;
+    private final Switch mSwitch;
+    private final LocationEnabler mLocationEnabler;
+    private boolean mValidListener;
+
+    public LocationSwitchBarController(Context context, SwitchBar switchBar,
+            Lifecycle lifecycle) {
+        mSwitchBar = switchBar;
+        mSwitch = mSwitchBar.getSwitch();
+        mLocationEnabler = new LocationEnabler(context, this /* listener */, lifecycle);
+        if (lifecycle != null) {
+            lifecycle.addObserver(this);
+        }
+    }
+
+    @Override
+    public void onStart() {
+        if (!mValidListener) {
+            mSwitchBar.addOnSwitchChangeListener(this);
+            mValidListener = true;
+        }
+        mSwitchBar.show();
+    }
+
+    @Override
+    public void onStop() {
+        mSwitchBar.hide();
+        if (mValidListener) {
+            mSwitchBar.removeOnSwitchChangeListener(this);
+            mValidListener = false;
+        }
+    }
+
+    @Override
+    public void onLocationModeChanged(int mode, boolean restricted) {
+        // Restricted user can't change the location mode, so disable the master switch. But in some
+        // corner cases, the location might still be enabled. In such case the master switch should
+        // be disabled but checked.
+        final boolean enabled = mLocationEnabler.isEnabled(mode);
+        final int userId = UserHandle.myUserId();
+        final RestrictedLockUtils.EnforcedAdmin admin =
+                mLocationEnabler.getShareLocationEnforcedAdmin(userId);
+        final boolean hasBaseUserRestriction =
+                mLocationEnabler.hasShareLocationRestriction(userId);
+        // Disable the whole switch bar instead of the switch itself. If we disabled the switch
+        // only, it would be re-enabled again if the switch bar is not disabled.
+        if (!hasBaseUserRestriction && admin != null) {
+            mSwitchBar.setDisabledByAdmin(admin);
+        } else {
+            mSwitchBar.setEnabled(!restricted);
+        }
+
+        if (enabled != mSwitch.isChecked()) {
+            // set listener to null so that that code below doesn't trigger onCheckedChanged()
+            if (mValidListener) {
+                mSwitchBar.removeOnSwitchChangeListener(this);
+            }
+            mSwitch.setChecked(enabled);
+            if (mValidListener) {
+                mSwitchBar.addOnSwitchChangeListener(this);
+            }
+        }
+    }
+
+    /**
+     * Listens to the state change of the location master switch.
+     */
+    @Override
+    public void onSwitchChanged(Switch switchView, boolean isChecked) {
+        mLocationEnabler.setLocationMode(isChecked
+                ? android.provider.Settings.Secure.LOCATION_MODE_PREVIOUS
+                : android.provider.Settings.Secure.LOCATION_MODE_OFF);
+    }
+
+}
diff --git a/src/com/android/settings/location/OWNERS b/src/com/android/settings/location/OWNERS
index f00674e..5feda77 100644
--- a/src/com/android/settings/location/OWNERS
+++ b/src/com/android/settings/location/OWNERS
@@ -1,4 +1,5 @@
 # Default reviewers for this and subdirectories.
+asalo@google.com
 lifu@google.com
 mstogaitis@google.com
 palanki@google.com
@@ -6,4 +7,4 @@
 weiwa@google.com
 wyattriley@google.com
 
-# Emergency approvers in case the above are not available
+# Emergency approvers in case the above are not available
\ No newline at end of file
diff --git a/src/com/android/settings/location/RecentLocationRequestPreferenceController.java b/src/com/android/settings/location/RecentLocationRequestPreferenceController.java
new file mode 100644
index 0000000..8c4fa579
--- /dev/null
+++ b/src/com/android/settings/location/RecentLocationRequestPreferenceController.java
@@ -0,0 +1,148 @@
+/*
+ * Copyright (C) 2017 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file
+ * except in compliance with the License. You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the
+ * License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+package com.android.settings.location;
+
+import android.content.Context;
+import android.os.Bundle;
+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.util.FeatureFlagUtils;
+
+import com.android.settings.R;
+import com.android.settings.SettingsActivity;
+import com.android.settings.applications.InstalledAppDetails;
+import com.android.settings.applications.AppInfoDashboardFragment;
+import com.android.settings.core.FeatureFlags;
+import com.android.settings.widget.AppPreference;
+import com.android.settingslib.core.lifecycle.Lifecycle;
+import com.android.settingslib.location.RecentLocationApps;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class RecentLocationRequestPreferenceController extends LocationBasePreferenceController {
+
+    /** Key for preference category "Recent location requests" */
+    private static final String KEY_RECENT_LOCATION_REQUESTS = "recent_location_requests";
+    private final LocationSettings mFragment;
+    private final RecentLocationApps mRecentLocationApps;
+    private PreferenceCategory mCategoryRecentLocationRequests;
+
+    @VisibleForTesting
+    static class PackageEntryClickedListener implements Preference.OnPreferenceClickListener {
+        private final LocationSettings mFragment;
+        private final String mPackage;
+        private final UserHandle mUserHandle;
+
+        public PackageEntryClickedListener(LocationSettings fragment, String packageName,
+                UserHandle userHandle) {
+            mFragment = fragment;
+            mPackage = packageName;
+            mUserHandle = userHandle;
+        }
+
+        @Override
+        public boolean onPreferenceClick(Preference preference) {
+            // start new fragment to display extended information
+            final Bundle args = new Bundle();
+            if (FeatureFlagUtils.isEnabled(mFragment.getActivity(), FeatureFlags.APP_INFO_V2)) {
+                args.putString(AppInfoDashboardFragment.ARG_PACKAGE_NAME, mPackage);
+                ((SettingsActivity) mFragment.getActivity()).startPreferencePanelAsUser(
+                        mFragment,
+                        AppInfoDashboardFragment.class.getName(), args,
+                        R.string.application_info_label, null, mUserHandle);
+            } else {
+                args.putString(InstalledAppDetails.ARG_PACKAGE_NAME, mPackage);
+                ((SettingsActivity) mFragment.getActivity()).startPreferencePanelAsUser(
+                        mFragment,
+                        InstalledAppDetails.class.getName(), args,
+                        R.string.application_info_label, null, mUserHandle);
+            }
+            return true;
+        }
+    }
+
+    public RecentLocationRequestPreferenceController(Context context, LocationSettings fragment,
+            Lifecycle lifecycle) {
+        this(context, fragment, lifecycle, new RecentLocationApps(context));
+    }
+
+    @VisibleForTesting
+    RecentLocationRequestPreferenceController(Context context, LocationSettings fragment,
+            Lifecycle lifecycle, RecentLocationApps recentApps) {
+        super(context, lifecycle);
+        mFragment = fragment;
+        mRecentLocationApps = recentApps;
+    }
+
+    @Override
+    public String getPreferenceKey() {
+        return KEY_RECENT_LOCATION_REQUESTS;
+    }
+
+    @Override
+    public void displayPreference(PreferenceScreen screen) {
+        super.displayPreference(screen);
+        mCategoryRecentLocationRequests =
+                (PreferenceCategory) screen.findPreference(KEY_RECENT_LOCATION_REQUESTS);
+    }
+
+    @Override
+    public void updateState(Preference preference) {
+        mCategoryRecentLocationRequests.removeAll();
+
+        final Context prefContext = preference.getContext();
+        final List<RecentLocationApps.Request> recentLocationRequests =
+                mRecentLocationApps.getAppList();
+
+        final List<Preference> recentLocationPrefs = new ArrayList<>(recentLocationRequests.size());
+        for (final RecentLocationApps.Request request : recentLocationRequests) {
+            recentLocationPrefs.add(createAppPreference(prefContext, request));
+        }
+        if (recentLocationRequests.size() > 0) {
+            LocationSettings.addPreferencesSorted(
+                    recentLocationPrefs, mCategoryRecentLocationRequests);
+        } else {
+            // If there's no item to display, add a "No recent apps" item.
+            final Preference banner = createAppPreference(prefContext);
+            banner.setTitle(R.string.location_no_recent_apps);
+            banner.setSelectable(false);
+            mCategoryRecentLocationRequests.addPreference(banner);
+        }
+    }
+
+    @Override
+    public void onLocationModeChanged(int mode, boolean restricted) {
+        mCategoryRecentLocationRequests.setEnabled(mLocationEnabler.isEnabled(mode));
+    }
+
+    @VisibleForTesting
+    AppPreference createAppPreference(Context prefContext) {
+        return new AppPreference(prefContext);
+    }
+
+    @VisibleForTesting
+    AppPreference createAppPreference(Context prefContext, RecentLocationApps.Request request) {
+        final AppPreference pref =  createAppPreference(prefContext);
+        pref.setSummary(request.contentDescription);
+        pref.setIcon(request.icon);
+        pref.setTitle(request.label);
+        pref.setOnPreferenceClickListener(new PackageEntryClickedListener(
+                mFragment, request.packageName, request.userHandle));
+        return pref;
+    }
+}
diff --git a/src/com/android/settings/location/ScanningSettings.java b/src/com/android/settings/location/ScanningSettings.java
index fd5a7fd..4585870 100644
--- a/src/com/android/settings/location/ScanningSettings.java
+++ b/src/com/android/settings/location/ScanningSettings.java
@@ -16,21 +16,25 @@
 
 package com.android.settings.location;
 
-import android.provider.Settings.Global;
-import android.support.v14.preference.SwitchPreference;
-import android.support.v7.preference.Preference;
-import android.support.v7.preference.PreferenceScreen;
+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.dashboard.DashboardFragment;
+import com.android.settings.search.BaseSearchIndexProvider;
+import com.android.settings.search.Indexable;
+import com.android.settingslib.core.AbstractPreferenceController;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
 
 /**
  * A page that configures the background scanning settings for Wi-Fi and Bluetooth.
  */
-public class ScanningSettings extends SettingsPreferenceFragment {
-    private static final String KEY_WIFI_SCAN_ALWAYS_AVAILABLE = "wifi_always_scanning";
-    private static final String KEY_BLUETOOTH_SCAN_ALWAYS_AVAILABLE = "bluetooth_always_scanning";
+public class ScanningSettings extends DashboardFragment {
+    private static final String TAG = "ScanningSettings";
 
     @Override
     public int getMetricsCategory() {
@@ -38,47 +42,44 @@
     }
 
     @Override
-    public void onResume() {
-        super.onResume();
-        createPreferenceHierarchy();
-    }
-
-    private PreferenceScreen createPreferenceHierarchy() {
-        PreferenceScreen root = getPreferenceScreen();
-        if (root != null) {
-            root.removeAll();
-        }
-        addPreferencesFromResource(R.xml.location_scanning);
-        root = getPreferenceScreen();
-        initPreferences();
-        return root;
-    }
-
-    private void initPreferences() {
-        final SwitchPreference wifiScanAlwaysAvailable =
-            (SwitchPreference) findPreference(KEY_WIFI_SCAN_ALWAYS_AVAILABLE);
-        wifiScanAlwaysAvailable.setChecked(Global.getInt(getContentResolver(),
-                    Global.WIFI_SCAN_ALWAYS_AVAILABLE, 0) == 1);
-        final SwitchPreference bleScanAlwaysAvailable =
-            (SwitchPreference) findPreference(KEY_BLUETOOTH_SCAN_ALWAYS_AVAILABLE);
-        bleScanAlwaysAvailable.setChecked(Global.getInt(getContentResolver(),
-                    Global.BLE_SCAN_ALWAYS_AVAILABLE, 0) == 1);
+    protected int getPreferenceScreenResId() {
+        return R.xml.location_scanning;
     }
 
     @Override
-    public boolean onPreferenceTreeClick(Preference preference) {
-        String key = preference.getKey();
-        if (KEY_WIFI_SCAN_ALWAYS_AVAILABLE.equals(key)) {
-            Global.putInt(getContentResolver(),
-                    Global.WIFI_SCAN_ALWAYS_AVAILABLE,
-                    ((SwitchPreference) preference).isChecked() ? 1 : 0);
-        } else if (KEY_BLUETOOTH_SCAN_ALWAYS_AVAILABLE.equals(key)) {
-            Global.putInt(getContentResolver(),
-                    Global.BLE_SCAN_ALWAYS_AVAILABLE,
-                    ((SwitchPreference) preference).isChecked() ? 1 : 0);
-        } else {
-            return super.onPreferenceTreeClick(preference);
-        }
-        return true;
+    protected String getLogTag() {
+        return TAG;
     }
+
+    @Override
+    protected List<AbstractPreferenceController> getPreferenceControllers(Context context) {
+        return buildPreferenceControllers(context);
+    }
+
+    private static List<AbstractPreferenceController> buildPreferenceControllers(Context context) {
+        final List<AbstractPreferenceController> controllers = new ArrayList<>();
+        controllers.add(new WifiScanningPreferenceController(context));
+        controllers.add(new BluetoothScanningPreferenceController(context));
+        return controllers;
+    }
+
+    /**
+     * For Search.
+     */
+    public static final Indexable.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.location_scanning;
+                    return Arrays.asList(sir);
+                }
+
+                @Override
+                public List<AbstractPreferenceController> getPreferenceControllers(Context
+                        context) {
+                    return buildPreferenceControllers(context);
+                }
+            };
 }
diff --git a/src/com/android/settings/location/SettingsInjector.java b/src/com/android/settings/location/SettingsInjector.java
index da7dd9e..dfa5143 100644
--- a/src/com/android/settings/location/SettingsInjector.java
+++ b/src/com/android/settings/location/SettingsInjector.java
@@ -30,6 +30,7 @@
 import android.location.SettingInjectorService;
 import android.os.Bundle;
 import android.os.Handler;
+import android.os.Looper;
 import android.os.Message;
 import android.os.Messenger;
 import android.os.SystemClock;
@@ -40,7 +41,7 @@
 import android.util.Log;
 import android.util.Xml;
 
-import com.android.settings.DimmableIconPreference;
+import com.android.settings.widget.AppPreference;
 
 import org.xmlpull.v1.XmlPullParser;
 import org.xmlpull.v1.XmlPullParserException;
@@ -253,6 +254,28 @@
     }
 
     /**
+     * Checks wheteher there is any preference that other apps have injected.
+     *
+     * @param profileId Identifier of the user/profile to obtain the injected settings for or
+     *                  UserHandle.USER_CURRENT for all profiles associated with current user.
+     */
+    public boolean hasInjectedSettings(final int profileId) {
+        final UserManager um = (UserManager) mContext.getSystemService(Context.USER_SERVICE);
+        final List<UserHandle> profiles = um.getUserProfiles();
+        final int profileCount = profiles.size();
+        for (int i = 0; i < profileCount; ++i) {
+            final UserHandle userHandle = profiles.get(i);
+            if (profileId == UserHandle.USER_CURRENT || profileId == userHandle.getIdentifier()) {
+                Iterable<InjectedSetting> settings = getSettings(userHandle);
+                for (InjectedSetting setting : settings) {
+                    return true;
+                }
+            }
+        }
+        return false;
+    }
+
+    /**
      * Reloads the status messages for all the preference items.
      */
     public void reloadStatusMessages() {
@@ -270,13 +293,7 @@
         PackageManager pm = mContext.getPackageManager();
         Drawable appIcon = pm.getDrawable(info.packageName, info.iconId, null);
         Drawable icon = pm.getUserBadgedIcon(appIcon, info.mUserHandle);
-        CharSequence badgedAppLabel = pm.getUserBadgedLabel(info.title, info.mUserHandle);
-        if (info.title.contentEquals(badgedAppLabel)) {
-            // If badged label is not different from original then no need for it as
-            // a separate content description.
-            badgedAppLabel = null;
-        }
-        Preference pref = new DimmableIconPreference(prefContext, badgedAppLabel);
+        Preference pref = new AppPreference(prefContext);
         pref.setTitle(info.title);
         pref.setSummary(null);
         pref.setIcon(icon);
@@ -344,6 +361,9 @@
 
         private boolean mReloadRequested;
 
+        private StatusLoadingHandler() {
+            super(Looper.getMainLooper());
+        }
         @Override
         public void handleMessage(Message msg) {
             if (Log.isLoggable(TAG, Log.DEBUG)) {
diff --git a/src/com/android/settings/location/WifiScanningPreferenceController.java b/src/com/android/settings/location/WifiScanningPreferenceController.java
new file mode 100644
index 0000000..8d4cf98
--- /dev/null
+++ b/src/com/android/settings/location/WifiScanningPreferenceController.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.location;
+
+import android.content.Context;
+import android.provider.Settings;
+import android.support.v14.preference.SwitchPreference;
+import android.support.v7.preference.Preference;
+
+import com.android.settings.core.PreferenceControllerMixin;
+import com.android.settingslib.core.AbstractPreferenceController;
+
+public class WifiScanningPreferenceController extends AbstractPreferenceController
+        implements PreferenceControllerMixin {
+
+    private static final String KEY_WIFI_SCAN_ALWAYS_AVAILABLE = "wifi_always_scanning";
+
+    public WifiScanningPreferenceController(Context context) {
+        super(context);
+    }
+
+    @Override
+    public boolean isAvailable() {
+        return true;
+    }
+
+    @Override
+    public String getPreferenceKey() {
+        return KEY_WIFI_SCAN_ALWAYS_AVAILABLE;
+    }
+
+    @Override
+    public void updateState(Preference preference) {
+        ((SwitchPreference) preference).setChecked(
+                Settings.Global.getInt(mContext.getContentResolver(),
+                        Settings.Global.WIFI_SCAN_ALWAYS_AVAILABLE, 0) == 1);
+    }
+
+    @Override
+    public boolean handlePreferenceTreeClick(Preference preference) {
+        if (KEY_WIFI_SCAN_ALWAYS_AVAILABLE.equals(preference.getKey())) {
+            Settings.Global.putInt(mContext.getContentResolver(),
+                    Settings.Global.WIFI_SCAN_ALWAYS_AVAILABLE,
+                    ((SwitchPreference) preference).isChecked() ? 1 : 0);
+            return true;
+        }
+        return false;
+    }
+}
diff --git a/src/com/android/settings/network/AirplaneModePreferenceController.java b/src/com/android/settings/network/AirplaneModePreferenceController.java
index d2015df..d86f7f7 100644
--- a/src/com/android/settings/network/AirplaneModePreferenceController.java
+++ b/src/com/android/settings/network/AirplaneModePreferenceController.java
@@ -81,7 +81,7 @@
                         mMetricsFeatureProvider);
             }
         } else {
-            removePreference(screen, getPreferenceKey());
+            setVisible(screen, getPreferenceKey(), false /* visible */);
         }
     }
 
@@ -91,7 +91,7 @@
     }
 
     public static boolean isAvailable(Context context) {
-        return !context.getPackageManager().hasSystemFeature(PackageManager.FEATURE_TELEVISION);
+        return !context.getPackageManager().hasSystemFeature(PackageManager.FEATURE_LEANBACK);
     }
 
     @Override
@@ -100,12 +100,16 @@
     }
 
     public void onResume() {
-        mAirplaneModeEnabler.resume();
+        if (mAirplaneModeEnabler != null) {
+            mAirplaneModeEnabler.resume();
+        }
     }
 
     @Override
     public void onPause() {
-        mAirplaneModeEnabler.pause();
+        if (mAirplaneModeEnabler != null) {
+            mAirplaneModeEnabler.pause();
+        }
     }
 
     public void onActivityResult(int requestCode, int resultCode, Intent data) {
diff --git a/src/com/android/settings/network/MobileNetworkPreferenceController.java b/src/com/android/settings/network/MobileNetworkPreferenceController.java
index 6e2c2d5..1670b0d 100644
--- a/src/com/android/settings/network/MobileNetworkPreferenceController.java
+++ b/src/com/android/settings/network/MobileNetworkPreferenceController.java
@@ -15,6 +15,9 @@
  */
 package com.android.settings.network;
 
+import static android.os.UserHandle.myUserId;
+import static android.os.UserManager.DISALLOW_CONFIG_MOBILE_NETWORKS;
+
 import android.content.Context;
 import android.os.UserManager;
 import android.support.annotation.VisibleForTesting;
@@ -24,16 +27,14 @@
 import android.telephony.ServiceState;
 import android.telephony.TelephonyManager;
 
-import com.android.settings.Utils;
 import com.android.settings.core.PreferenceControllerMixin;
+import com.android.settings.wrapper.RestrictedLockUtilsWrapper;
+import com.android.settingslib.Utils;
 import com.android.settingslib.core.AbstractPreferenceController;
 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;
-
 public class MobileNetworkPreferenceController extends AbstractPreferenceController
         implements PreferenceControllerMixin, LifecycleObserver, OnResume, OnPause {
 
diff --git a/src/com/android/settings/network/MobilePlanPreferenceController.java b/src/com/android/settings/network/MobilePlanPreferenceController.java
index d5ff924..6556113 100644
--- a/src/com/android/settings/network/MobilePlanPreferenceController.java
+++ b/src/com/android/settings/network/MobilePlanPreferenceController.java
@@ -15,6 +15,13 @@
  */
 package com.android.settings.network;
 
+import static android.content.Intent.FLAG_ACTIVITY_BROUGHT_TO_FRONT;
+import static android.content.Intent.FLAG_ACTIVITY_NEW_TASK;
+import static android.os.UserHandle.myUserId;
+import static android.os.UserManager.DISALLOW_CONFIG_MOBILE_NETWORKS;
+
+import static com.android.settingslib.RestrictedLockUtils.hasBaseUserRestriction;
+
 import android.content.ActivityNotFoundException;
 import android.content.Context;
 import android.content.Intent;
@@ -30,8 +37,8 @@
 import android.util.Log;
 
 import com.android.settings.R;
-import com.android.settings.Utils;
 import com.android.settings.core.PreferenceControllerMixin;
+import com.android.settingslib.Utils;
 import com.android.settingslib.core.AbstractPreferenceController;
 import com.android.settingslib.core.lifecycle.LifecycleObserver;
 import com.android.settingslib.core.lifecycle.events.OnCreate;
@@ -39,12 +46,6 @@
 
 import java.util.List;
 
-import static android.content.Intent.FLAG_ACTIVITY_BROUGHT_TO_FRONT;
-import static android.content.Intent.FLAG_ACTIVITY_NEW_TASK;
-import static android.os.UserHandle.myUserId;
-import static android.os.UserManager.DISALLOW_CONFIG_MOBILE_NETWORKS;
-import static com.android.settingslib.RestrictedLockUtils.hasBaseUserRestriction;
-
 
 public class MobilePlanPreferenceController extends AbstractPreferenceController
         implements PreferenceControllerMixin, LifecycleObserver, OnCreate, OnSaveInstanceState {
diff --git a/src/com/android/settings/network/NetworkDashboardFragment.java b/src/com/android/settings/network/NetworkDashboardFragment.java
index e982a28..4b1da31 100644
--- a/src/com/android/settings/network/NetworkDashboardFragment.java
+++ b/src/com/android/settings/network/NetworkDashboardFragment.java
@@ -48,8 +48,11 @@
         MobilePlanPreferenceHost {
 
     private static final String TAG = "NetworkDashboardFrag";
+    private static final int MENU_NETWORK_RESET = Menu.FIRST;
+    private static final int MENU_PRIVATE_DNS = Menu.FIRST + 1;
 
     private NetworkResetActionMenuController mNetworkResetController;
+    private PrivateDnsMenuController mPrivateDnsMenuController;
 
     @Override
     public int getMetricsCategory() {
@@ -69,11 +72,13 @@
     @Override
     public void onAttach(Context context) {
         super.onAttach(context);
-        mNetworkResetController = new NetworkResetActionMenuController(context);
+        mNetworkResetController = new NetworkResetActionMenuController(context, MENU_NETWORK_RESET);
+        mPrivateDnsMenuController = new PrivateDnsMenuController(getFragmentManager(),
+                MENU_PRIVATE_DNS);
     }
 
     @Override
-    protected int getHelpResource() {
+    public int getHelpResource() {
         return R.string.help_url_network_dashboard;
     }
 
@@ -81,6 +86,7 @@
     public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
         super.onCreateOptionsMenu(menu, inflater);
         mNetworkResetController.buildMenuItem(menu);
+        mPrivateDnsMenuController.buildMenuItem(menu);
     }
 
     @Override
diff --git a/src/com/android/settings/network/NetworkResetActionMenuController.java b/src/com/android/settings/network/NetworkResetActionMenuController.java
index 254834b..75db65e 100644
--- a/src/com/android/settings/network/NetworkResetActionMenuController.java
+++ b/src/com/android/settings/network/NetworkResetActionMenuController.java
@@ -27,19 +27,20 @@
 
 public class NetworkResetActionMenuController {
 
-    private static final int MENU_NETWORK_RESET = Menu.FIRST + 200;
     private final Context mContext;
     private final NetworkResetRestrictionChecker mRestrictionChecker;
+    private final int mMenuId;
 
-    public NetworkResetActionMenuController(Context context) {
+    public NetworkResetActionMenuController(Context context, int menuId) {
         mContext = context;
         mRestrictionChecker = new NetworkResetRestrictionChecker(context);
+        mMenuId = menuId;
     }
 
     public void buildMenuItem(Menu menu) {
         MenuItem item = null;
         if (isAvailable() && menu != null) {
-            item = menu.add(0, MENU_NETWORK_RESET, 0, R.string.reset_network_title);
+            item = menu.add(0, mMenuId, 0, R.string.reset_network_title);
         }
         if (item != null) {
             item.setOnMenuItemClickListener(target -> {
diff --git a/src/com/android/settings/network/NetworkScoreManagerWrapper.java b/src/com/android/settings/network/NetworkScoreManagerWrapper.java
deleted file mode 100644
index 3489640..0000000
--- a/src/com/android/settings/network/NetworkScoreManagerWrapper.java
+++ /dev/null
@@ -1,80 +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.network;
-
-import android.annotation.Nullable;
-import android.net.NetworkScoreManager;
-import android.net.NetworkScorerAppData;
-
-import java.util.List;
-
-/**
- * Wrapper around {@link NetworkScoreManager} to facilitate unit testing.
- *
- * TODO: delete this class once robolectric supports Android O
- */
-public class NetworkScoreManagerWrapper {
-    private final NetworkScoreManager mNetworkScoreManager;
-
-    public NetworkScoreManagerWrapper(NetworkScoreManager networkScoreManager) {
-        mNetworkScoreManager = networkScoreManager;
-    }
-
-    /**
-     * Returns the list of available scorer apps. The list will be empty if there are
-     * no valid scorers.
-     */
-    public List<NetworkScorerAppData> getAllValidScorers() {
-        return mNetworkScoreManager.getAllValidScorers();
-    }
-
-    /**
-     * Obtain the package name of the current active network scorer.
-     *
-     * <p>At any time, only one scorer application will receive {@link #ACTION_SCORE_NETWORKS}
-     * broadcasts and be allowed to call {@link #updateScores}. Applications may use this method to
-     * determine the current scorer and offer the user the ability to select a different scorer via
-     * the {@link #ACTION_CHANGE_ACTIVE} intent.
-     * @return the full package name of the current active scorer, or null if there is no active
-     *         scorer.
-     */
-    @Nullable
-    public String getActiveScorerPackage() {
-        return mNetworkScoreManager.getActiveScorerPackage();
-    }
-
-    /**
-     * Returns metadata about the active scorer or <code>null</code> if there is no active scorer.
-     */
-    @Nullable
-    public NetworkScorerAppData getActiveScorer() {
-        return mNetworkScoreManager.getActiveScorer();
-    }
-
-    /**
-     * Set the active scorer to a new package and clear existing scores.
-     *
-     * <p>Should never be called directly without obtaining user consent. This can be done by using
-     * the {@link #ACTION_CHANGE_ACTIVE} broadcast, or using a custom configuration activity.
-     *
-     * @return true if the operation succeeded, or false if the new package is not a valid scorer.
-     * @throws SecurityException if the caller is not a system process or does not hold the
-     *         {@link android.Manifest.permission#REQUEST_NETWORK_SCORES} permission
-     */
-    public boolean setActiveScorer(String packageName) throws SecurityException {
-        return mNetworkScoreManager.setActiveScorer(packageName);
-    }
-}
\ No newline at end of file
diff --git a/src/com/android/settings/network/NetworkScorerPicker.java b/src/com/android/settings/network/NetworkScorerPicker.java
index 1280cf5..187c9ce 100644
--- a/src/com/android/settings/network/NetworkScorerPicker.java
+++ b/src/com/android/settings/network/NetworkScorerPicker.java
@@ -30,6 +30,7 @@
 import com.android.settings.R;
 import com.android.settings.core.InstrumentedPreferenceFragment;
 import com.android.settings.widget.RadioButtonPreference;
+import com.android.settings.wrapper.NetworkScoreManagerWrapper;
 
 import java.util.List;
 
diff --git a/src/com/android/settings/network/NetworkScorerPickerPreferenceController.java b/src/com/android/settings/network/NetworkScorerPickerPreferenceController.java
index 8d4ea63..e25e62d 100644
--- a/src/com/android/settings/network/NetworkScorerPickerPreferenceController.java
+++ b/src/com/android/settings/network/NetworkScorerPickerPreferenceController.java
@@ -21,6 +21,7 @@
 
 import com.android.settings.R;
 import com.android.settings.core.PreferenceControllerMixin;
+import com.android.settings.wrapper.NetworkScoreManagerWrapper;
 import com.android.settingslib.core.AbstractPreferenceController;
 
 import java.util.List;
diff --git a/src/com/android/settings/network/PrivateDnsMenuController.java b/src/com/android/settings/network/PrivateDnsMenuController.java
new file mode 100644
index 0000000..a811775
--- /dev/null
+++ b/src/com/android/settings/network/PrivateDnsMenuController.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.network;
+
+import android.app.FragmentManager;
+import android.view.Menu;
+import android.view.MenuItem;
+
+import com.android.settings.R;
+
+public class PrivateDnsMenuController {
+    private final FragmentManager mFragmentManager;
+    private final int mMenuId;
+
+    public PrivateDnsMenuController(FragmentManager fragmentManager, int menuId) {
+        mFragmentManager = fragmentManager;
+        mMenuId = menuId;
+    }
+
+    public void buildMenuItem(Menu menu) {
+        if (menu != null) {
+            MenuItem item = menu.add(0 /* groupId */, mMenuId, 0 /* order */,
+                    R.string.select_private_dns_configuration_title);
+            item.setOnMenuItemClickListener(target -> {
+                PrivateDnsModeDialogFragment.show(mFragmentManager);
+                return true;
+            });
+        }
+    }
+}
diff --git a/src/com/android/settings/network/PrivateDnsModeDialogFragment.java b/src/com/android/settings/network/PrivateDnsModeDialogFragment.java
new file mode 100644
index 0000000..5704fb9
--- /dev/null
+++ b/src/com/android/settings/network/PrivateDnsModeDialogFragment.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.network;
+
+import static android.net.ConnectivityManager.PRIVATE_DNS_MODE_OFF;
+import static android.net.ConnectivityManager.PRIVATE_DNS_MODE_OPPORTUNISTIC;
+import static android.net.ConnectivityManager.PRIVATE_DNS_MODE_PROVIDER_HOSTNAME;
+
+import android.app.AlertDialog;
+import android.app.Dialog;
+import android.app.FragmentManager;
+import android.content.ContentResolver;
+import android.content.Context;
+import android.content.DialogInterface;
+import android.os.Bundle;
+import android.provider.Settings;
+import android.support.annotation.VisibleForTesting;
+import android.text.Editable;
+import android.text.TextWatcher;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.widget.Button;
+import android.widget.EditText;
+import android.widget.RadioGroup;
+
+import com.android.settings.R;
+import com.android.settings.core.instrumentation.InstrumentedDialogFragment;
+
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * Dialog to set the private dns
+ */
+public class PrivateDnsModeDialogFragment extends InstrumentedDialogFragment implements
+        DialogInterface.OnClickListener, RadioGroup.OnCheckedChangeListener, TextWatcher {
+
+    private static final String TAG = "PrivateDnsModeDialogFragment";
+    // DNS_MODE -> RadioButton id
+    private static final Map<String, Integer> PRIVATE_DNS_MAP;
+
+    static {
+        PRIVATE_DNS_MAP = new HashMap<>();
+        PRIVATE_DNS_MAP.put(PRIVATE_DNS_MODE_OFF, R.id.private_dns_mode_off);
+        PRIVATE_DNS_MAP.put(PRIVATE_DNS_MODE_OPPORTUNISTIC, R.id.private_dns_mode_opportunistic);
+        PRIVATE_DNS_MAP.put(PRIVATE_DNS_MODE_PROVIDER_HOSTNAME, R.id.private_dns_mode_provider);
+    }
+
+    @VisibleForTesting
+    static final String MODE_KEY = Settings.Global.PRIVATE_DNS_MODE;
+    @VisibleForTesting
+    static final String HOSTNAME_KEY = Settings.Global.PRIVATE_DNS_SPECIFIER;
+
+    @VisibleForTesting
+    EditText mEditText;
+    @VisibleForTesting
+    RadioGroup mRadioGroup;
+    @VisibleForTesting
+    Button mSaveButton;
+    @VisibleForTesting
+    String mMode;
+
+    public static void show(FragmentManager fragmentManager) {
+        if (fragmentManager.findFragmentByTag(TAG) == null) {
+            final PrivateDnsModeDialogFragment fragment = new PrivateDnsModeDialogFragment();
+            fragment.show(fragmentManager, TAG);
+        }
+    }
+
+    @Override
+    public Dialog onCreateDialog(Bundle savedInstanceState) {
+        final Context context = getContext();
+
+        final AlertDialog dialog = new AlertDialog.Builder(context)
+                .setTitle(R.string.select_private_dns_configuration_title)
+                .setView(buildPrivateDnsView(context))
+                .setPositiveButton(R.string.save, this)
+                .setNegativeButton(R.string.dlg_cancel, null)
+                .create();
+
+        dialog.setOnShowListener(dialogInterface -> {
+            mSaveButton = dialog.getButton(DialogInterface.BUTTON_POSITIVE);
+            updateDialogInfo();
+        });
+        return dialog;
+    }
+
+    private View buildPrivateDnsView(final Context context) {
+        final ContentResolver contentResolver = context.getContentResolver();
+        mMode = Settings.Global.getString(contentResolver, MODE_KEY);
+        final View view = LayoutInflater.from(context).inflate(R.layout.private_dns_mode_dialog,
+                null);
+
+        mEditText = view.findViewById(R.id.private_dns_mode_provider_hostname);
+        mEditText.addTextChangedListener(this);
+        mEditText.setText(Settings.Global.getString(contentResolver, HOSTNAME_KEY));
+
+        mRadioGroup = view.findViewById(R.id.private_dns_radio_group);
+        mRadioGroup.setOnCheckedChangeListener(this);
+        mRadioGroup.check(PRIVATE_DNS_MAP.getOrDefault(mMode, R.id.private_dns_mode_opportunistic));
+
+        return view;
+    }
+
+    @Override
+    public void onClick(DialogInterface dialog, int which) {
+        //TODO(b/34953048): add metric action
+        if (mMode.equals(PRIVATE_DNS_MODE_PROVIDER_HOSTNAME)) {
+            // Only clickable if hostname is valid, so we could save it safely
+            Settings.Global.putString(getContext().getContentResolver(), HOSTNAME_KEY,
+                    mEditText.getText().toString());
+        }
+
+        Settings.Global.putString(getContext().getContentResolver(), MODE_KEY, mMode);
+    }
+
+    @Override
+    public int getMetricsCategory() {
+        //TODO(b/68030013): add metric id
+        return 0;
+    }
+
+    @Override
+    public void onCheckedChanged(RadioGroup group, int checkedId) {
+        switch (checkedId) {
+            case R.id.private_dns_mode_off:
+                mMode = PRIVATE_DNS_MODE_OFF;
+                break;
+            case R.id.private_dns_mode_opportunistic:
+                mMode = PRIVATE_DNS_MODE_OPPORTUNISTIC;
+                break;
+            case R.id.private_dns_mode_provider:
+                mMode = PRIVATE_DNS_MODE_PROVIDER_HOSTNAME;
+                break;
+        }
+        updateDialogInfo();
+    }
+
+    @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 afterTextChanged(Editable s) {
+        if (mSaveButton != null) {
+            mSaveButton.setEnabled(isWeaklyValidatedHostname(mEditText.getText().toString()));
+        }
+    }
+
+    private boolean isWeaklyValidatedHostname(String hostname) {
+        // TODO(b/34953048): Find and use a better validation method.  Specifically:
+        //     [1] this should reject IP string literals, and
+        //     [2] do the best, simplest, future-proof verification that
+        //         the input approximates a DNS hostname.
+        final String WEAK_HOSTNAME_REGEX = "^[a-zA-Z0-9_.-]+$";
+        return hostname.matches(WEAK_HOSTNAME_REGEX);
+    }
+
+    private void updateDialogInfo() {
+        final boolean modeProvider = PRIVATE_DNS_MODE_PROVIDER_HOSTNAME.equals(mMode);
+        if (mEditText != null) {
+            mEditText.setEnabled(modeProvider);
+        }
+        if (mSaveButton != null) {
+            mSaveButton.setEnabled(
+                    modeProvider
+                            ? isWeaklyValidatedHostname(mEditText.getText().toString())
+                            : true);
+        }
+    }
+
+}
diff --git a/src/com/android/settings/network/RestrictedLockUtilsWrapper.java b/src/com/android/settings/network/RestrictedLockUtilsWrapper.java
deleted file mode 100644
index de5b808..0000000
--- a/src/com/android/settings/network/RestrictedLockUtilsWrapper.java
+++ /dev/null
@@ -1,15 +0,0 @@
-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/VpnPreferenceController.java b/src/com/android/settings/network/VpnPreferenceController.java
index 763fb72..95513e0 100644
--- a/src/com/android/settings/network/VpnPreferenceController.java
+++ b/src/com/android/settings/network/VpnPreferenceController.java
@@ -23,8 +23,6 @@
 import android.net.Network;
 import android.net.NetworkCapabilities;
 import android.net.NetworkRequest;
-import android.os.Handler;
-import android.os.Looper;
 import android.os.RemoteException;
 import android.os.ServiceManager;
 import android.os.UserHandle;
@@ -45,6 +43,7 @@
 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.utils.ThreadUtils;
 
 import java.util.List;
 
@@ -157,7 +156,7 @@
         } else {
             summary = getNameForVpnConfig(vpn, UserHandle.of(uid));
         }
-        new Handler(Looper.getMainLooper()).post(() -> mPreference.setSummary(summary));
+        ThreadUtils.postOnMainThread(() -> mPreference.setSummary(summary));
     }
 
     private String getNameForVpnConfig(VpnConfig cfg, UserHandle user) {
diff --git a/src/com/android/settings/nfc/AndroidBeam.java b/src/com/android/settings/nfc/AndroidBeam.java
index fe264f3..707017b 100644
--- a/src/com/android/settings/nfc/AndroidBeam.java
+++ b/src/com/android/settings/nfc/AndroidBeam.java
@@ -97,6 +97,8 @@
             mSwitchBar.setEnabled(!mBeamDisallowedByBase);
             mSwitchBar.show();
         }
+
+        activity.setTitle(R.string.android_beam_settings_title);
     }
 
     @Override
diff --git a/src/com/android/settings/nfc/NfcPreferenceController.java b/src/com/android/settings/nfc/NfcPreferenceController.java
index a034777..76977d2 100644
--- a/src/com/android/settings/nfc/NfcPreferenceController.java
+++ b/src/com/android/settings/nfc/NfcPreferenceController.java
@@ -26,9 +26,9 @@
 import android.support.v7.preference.PreferenceScreen;
 
 import com.android.settings.core.PreferenceControllerMixin;
+import com.android.settingslib.RestrictedPreference;
 import com.android.settingslib.core.AbstractPreferenceController;
 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;
 
@@ -55,8 +55,8 @@
     @Override
     public void displayPreference(PreferenceScreen screen) {
         if (!isAvailable()) {
-            removePreference(screen, KEY_TOGGLE_NFC);
-            removePreference(screen, KEY_ANDROID_BEAM_SETTINGS);
+            setVisible(screen, KEY_TOGGLE_NFC, false /* visible */);
+            setVisible(screen, KEY_ANDROID_BEAM_SETTINGS, false /* visible */);
             mNfcEnabler = null;
             return;
         }
diff --git a/src/com/android/settings/nfc/PaymentSettings.java b/src/com/android/settings/nfc/PaymentSettings.java
index 10f1154..c832dfc 100644
--- a/src/com/android/settings/nfc/PaymentSettings.java
+++ b/src/com/android/settings/nfc/PaymentSettings.java
@@ -52,14 +52,18 @@
     }
 
     @Override
+    protected int getPreferenceScreenResId() {
+        return R.xml.nfc_payment_settings;
+    }
+
+    @Override
     public void onCreate(Bundle icicle) {
         super.onCreate(icicle);
 
         mPaymentBackend = new PaymentBackend(getActivity());
         setHasOptionsMenu(true);
 
-        PreferenceManager manager = getPreferenceManager();
-        PreferenceScreen screen = manager.createPreferenceScreen(getActivity());
+        final PreferenceScreen screen = getPreferenceScreen();
 
         List<PaymentBackend.PaymentAppInfo> appInfos = mPaymentBackend.getPaymentAppInfos();
         if (appInfos != null && appInfos.size() > 0) {
@@ -71,7 +75,6 @@
                     mPaymentBackend);
             screen.addPreference(foreground);
         }
-        setPreferenceScreen(screen);
     }
 
     @Override
diff --git a/src/com/android/settings/notification/AbstractZenModeAutomaticRulePreferenceController.java b/src/com/android/settings/notification/AbstractZenModeAutomaticRulePreferenceController.java
new file mode 100644
index 0000000..ec9cf2a
--- /dev/null
+++ b/src/com/android/settings/notification/AbstractZenModeAutomaticRulePreferenceController.java
@@ -0,0 +1,160 @@
+/*
+ * Copyright (C) 2017 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.notification;
+
+import android.app.AutomaticZenRule;
+import android.app.Fragment;
+import android.app.NotificationManager;
+import android.content.ComponentName;
+import android.content.Context;
+import android.content.Intent;
+import android.content.pm.PackageManager;
+import android.content.pm.ServiceInfo;
+import android.provider.Settings;
+import android.service.notification.ConditionProviderService;
+import android.service.notification.ZenModeConfig;
+import android.support.v7.preference.Preference;
+
+import com.android.settings.core.PreferenceControllerMixin;
+import com.android.settingslib.core.AbstractPreferenceController;
+
+import java.util.Arrays;
+import java.util.Comparator;
+import java.util.Map;
+import java.util.Set;
+
+abstract public class AbstractZenModeAutomaticRulePreferenceController extends
+        AbstractPreferenceController implements PreferenceControllerMixin {
+
+    private static final String TAG = "ZenModeAutomaticRule";
+    protected ZenModeBackend mBackend;
+    protected Fragment mParent;
+    protected Set<Map.Entry<String, AutomaticZenRule>> mRules;
+    protected PackageManager mPm;
+
+    public AbstractZenModeAutomaticRulePreferenceController(Context context, Fragment parent) {
+        super(context);
+        mBackend = ZenModeBackend.getInstance(context);
+        mParent = parent;
+        mPm = mContext.getPackageManager();
+    }
+
+    @Override
+    public void updateState(Preference preference) {
+        super.updateState(preference);
+        mRules = getZenModeRules();
+    }
+
+    private Set<Map.Entry<String, AutomaticZenRule>> getZenModeRules() {
+        Map<String, AutomaticZenRule> ruleMap =
+                NotificationManager.from(mContext).getAutomaticZenRules();
+        return ruleMap.entrySet();
+    }
+
+    protected void showNameRuleDialog(final ZenRuleInfo ri) {
+        new ZenRuleNameDialog(mContext, null, ri.defaultConditionId) {
+            @Override
+            public void onOk(String ruleName) {
+                AutomaticZenRule rule = new AutomaticZenRule(ruleName, ri.serviceComponent,
+                        ri.defaultConditionId, NotificationManager.INTERRUPTION_FILTER_PRIORITY,
+                        true);
+                String savedRuleId = mBackend.addZenRule(rule);
+                if (savedRuleId != null) {
+                    mParent.startActivity(getRuleIntent(ri.settingsAction, null, savedRuleId));
+                }
+            }
+        }.show();
+    }
+
+    protected Map.Entry<String, AutomaticZenRule>[] sortedRules() {
+        if (mRules == null) {
+            mRules = getZenModeRules();
+        }
+        final Map.Entry<String, AutomaticZenRule>[] rt =
+                mRules.toArray(new Map.Entry[mRules.size()]);
+        Arrays.sort(rt, RULE_COMPARATOR);
+        return rt;
+    }
+
+    protected static Intent getRuleIntent(String settingsAction,
+            ComponentName configurationActivity, String ruleId) {
+        final Intent intent = new Intent()
+                .addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP)
+                .putExtra(ConditionProviderService.EXTRA_RULE_ID, ruleId);
+        if (configurationActivity != null) {
+            intent.setComponent(configurationActivity);
+        } else {
+            intent.setAction(settingsAction);
+        }
+        return intent;
+    }
+
+    private static final Comparator<Map.Entry<String, AutomaticZenRule>> RULE_COMPARATOR =
+            new Comparator<Map.Entry<String, AutomaticZenRule>>() {
+                @Override
+                public int compare(Map.Entry<String, AutomaticZenRule> lhs,
+                        Map.Entry<String, AutomaticZenRule> rhs) {
+                    int byDate = Long.compare(lhs.getValue().getCreationTime(),
+                            rhs.getValue().getCreationTime());
+                    if (byDate != 0) {
+                        return byDate;
+                    } else {
+                        return key(lhs.getValue()).compareTo(key(rhs.getValue()));
+                    }
+                }
+
+                private String key(AutomaticZenRule rule) {
+                    final int type = ZenModeConfig.isValidScheduleConditionId(rule.getConditionId())
+                            ? 1 : ZenModeConfig.isValidEventConditionId(rule.getConditionId())
+                            ? 2 : 3;
+                    return type + rule.getName().toString();
+                }
+            };
+
+    public static ZenRuleInfo getRuleInfo(PackageManager pm, ServiceInfo si) {
+        if (si == null || si.metaData == null) {
+            return null;
+        }
+        final String ruleType = si.metaData.getString(ConditionProviderService.META_DATA_RULE_TYPE);
+        final ComponentName configurationActivity = getSettingsActivity(si);
+        if (ruleType != null && !ruleType.trim().isEmpty() && configurationActivity != null) {
+            final ZenRuleInfo ri = new ZenRuleInfo();
+            ri.serviceComponent = new ComponentName(si.packageName, si.name);
+            ri.settingsAction = Settings.ACTION_ZEN_MODE_EXTERNAL_RULE_SETTINGS;
+            ri.title = ruleType;
+            ri.packageName = si.packageName;
+            ri.configurationActivity = getSettingsActivity(si);
+            ri.packageLabel = si.applicationInfo.loadLabel(pm);
+            ri.ruleInstanceLimit =
+                    si.metaData.getInt(ConditionProviderService.META_DATA_RULE_INSTANCE_LIMIT, -1);
+            return ri;
+        }
+        return null;
+    }
+
+    protected static ComponentName getSettingsActivity(ServiceInfo si) {
+        if (si == null || si.metaData == null) {
+            return null;
+        }
+        final String configurationActivity =
+                si.metaData.getString(ConditionProviderService.META_DATA_CONFIGURATION_ACTIVITY);
+        if (configurationActivity != null) {
+            return ComponentName.unflattenFromString(configurationActivity);
+        }
+        return null;
+    }
+}
diff --git a/src/com/android/settings/notification/AbstractZenModePreferenceController.java b/src/com/android/settings/notification/AbstractZenModePreferenceController.java
new file mode 100644
index 0000000..de2e8fd
--- /dev/null
+++ b/src/com/android/settings/notification/AbstractZenModePreferenceController.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.notification;
+
+import android.app.NotificationManager;
+import android.content.ContentResolver;
+import android.content.Context;
+import android.database.ContentObserver;
+import android.net.Uri;
+import android.os.Handler;
+import android.os.UserHandle;
+import android.provider.Settings;
+import android.support.v7.preference.Preference;
+import android.support.v7.preference.PreferenceScreen;
+
+import com.android.internal.annotations.VisibleForTesting;
+import com.android.settings.core.PreferenceControllerMixin;
+import com.android.settingslib.core.AbstractPreferenceController;
+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;
+
+abstract public class AbstractZenModePreferenceController extends
+        AbstractPreferenceController implements PreferenceControllerMixin, LifecycleObserver,
+        OnResume, OnPause {
+
+    @VisibleForTesting
+    protected SettingObserver mSettingObserver;
+    private final String KEY;
+    final private NotificationManager mNotificationManager;
+
+    public AbstractZenModePreferenceController(Context context, String key,
+            Lifecycle lifecycle) {
+        super(context);
+        if (lifecycle != null) {
+            lifecycle.addObserver(this);
+        }
+        KEY = key;
+        mNotificationManager = (NotificationManager) context.getSystemService(
+                Context.NOTIFICATION_SERVICE);
+    }
+
+    @Override
+    public void displayPreference(PreferenceScreen screen) {
+        super.displayPreference(screen);
+        mSettingObserver = new SettingObserver(screen.findPreference(KEY));
+    }
+
+    @Override
+    public void onResume() {
+        if (mSettingObserver != null) {
+            mSettingObserver.register(mContext.getContentResolver());
+        }
+    }
+
+    @Override
+    public void onPause() {
+        if (mSettingObserver != null) {
+            mSettingObserver.unregister(mContext.getContentResolver());
+        }
+    }
+
+    protected NotificationManager.Policy getPolicy() {
+        return mNotificationManager.getNotificationPolicy();
+    }
+
+    protected int getZenMode() {
+        return Settings.Global.getInt(mContext.getContentResolver(),
+                Settings.Global.ZEN_MODE, 0);
+    }
+
+    class SettingObserver extends ContentObserver {
+        private final Uri ZEN_MODE_URI = Settings.Global.getUriFor(Settings.Global.ZEN_MODE);
+        private final Uri ZEN_MODE_CONFIG_ETAG_URI = Settings.Global.getUriFor(
+                Settings.Global.ZEN_MODE_CONFIG_ETAG);
+
+        private final Preference mPreference;
+
+        public SettingObserver(Preference preference) {
+            super(new Handler());
+            mPreference = preference;
+        }
+
+        public void register(ContentResolver cr) {
+            cr.registerContentObserver(ZEN_MODE_URI, false, this, UserHandle.USER_ALL);
+            cr.registerContentObserver(ZEN_MODE_CONFIG_ETAG_URI, false, this, UserHandle.USER_ALL);
+        }
+
+        public void unregister(ContentResolver cr) {
+            cr.unregisterContentObserver(this);
+        }
+
+        @Override
+        public void onChange(boolean selfChange, Uri uri) {
+            super.onChange(selfChange, uri);
+            if (ZEN_MODE_URI.equals(uri)) {
+                updateState(mPreference);
+            }
+
+            if (ZEN_MODE_CONFIG_ETAG_URI.equals(uri)) {
+                updateState(mPreference);
+            }
+        }
+    }
+}
diff --git a/src/com/android/settings/notification/AllowSoundPreferenceController.java b/src/com/android/settings/notification/AllowSoundPreferenceController.java
new file mode 100644
index 0000000..dcd5e45
--- /dev/null
+++ b/src/com/android/settings/notification/AllowSoundPreferenceController.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.notification;
+
+import static android.app.NotificationManager.IMPORTANCE_DEFAULT;
+import static android.app.NotificationManager.IMPORTANCE_LOW;
+import static android.app.NotificationManager.IMPORTANCE_UNSPECIFIED;
+
+import android.app.NotificationChannel;
+import android.content.Context;
+import android.support.v7.preference.Preference;
+import android.util.Log;
+
+import com.android.settings.core.PreferenceControllerMixin;
+import com.android.settingslib.RestrictedSwitchPreference;
+
+public class AllowSoundPreferenceController extends NotificationPreferenceController
+        implements PreferenceControllerMixin, Preference.OnPreferenceChangeListener {
+
+    private static final String TAG = "AllowSoundPrefContr";
+    private static final String KEY_IMPORTANCE = "allow_sound";
+    private NotificationSettingsBase.ImportanceListener mImportanceListener;
+
+    public AllowSoundPreferenceController(Context context,
+            NotificationSettingsBase.ImportanceListener importanceListener,
+            NotificationBackend backend) {
+        super(context, backend);
+        mImportanceListener = importanceListener;
+    }
+
+    @Override
+    public String getPreferenceKey() {
+        return KEY_IMPORTANCE;
+    }
+
+    @Override
+    public boolean isAvailable() {
+        if (!super.isAvailable()) {
+            return false;
+        }
+        return mChannel != null && NotificationChannel.DEFAULT_CHANNEL_ID.equals(mChannel.getId());
+
+    }
+
+    public void updateState(Preference preference) {
+        if (mChannel != null) {
+            RestrictedSwitchPreference pref = (RestrictedSwitchPreference) preference;
+            pref.setDisabledByAdmin(mAdmin);
+            pref.setEnabled(isChannelConfigurable() && !pref.isDisabledByAdmin());
+            pref.setChecked(mChannel.getImportance() >= IMPORTANCE_DEFAULT
+                    || mChannel.getImportance() == IMPORTANCE_UNSPECIFIED);
+        } else { Log.i(TAG, "tried to updatestate on a null channel?!"); }
+    }
+
+    @Override
+    public boolean onPreferenceChange(Preference preference, Object newValue) {
+        if (mChannel != null) {
+            final int importance =
+                    ((Boolean) newValue ? IMPORTANCE_UNSPECIFIED : IMPORTANCE_LOW);
+            mChannel.setImportance(importance);
+            mChannel.lockFields(NotificationChannel.USER_LOCKED_IMPORTANCE);
+            saveChannel();
+            mImportanceListener.onImportanceChanged();
+        }
+        return true;
+    }
+}
diff --git a/src/com/android/settings/notification/AppLinkPreferenceController.java b/src/com/android/settings/notification/AppLinkPreferenceController.java
new file mode 100644
index 0000000..ff5945b
--- /dev/null
+++ b/src/com/android/settings/notification/AppLinkPreferenceController.java
@@ -0,0 +1,55 @@
+/*
+ * Copyright (C) 2017 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.notification;
+
+import android.content.Context;
+import android.support.v7.preference.Preference;
+
+import com.android.settings.core.PreferenceControllerMixin;
+
+/**
+ * Controls link to reach more preference settings inside the app.
+ */
+public class AppLinkPreferenceController extends NotificationPreferenceController
+        implements PreferenceControllerMixin {
+
+    private static final String TAG = "AppLinkPrefContr";
+    private static final String KEY_APP_LINK = "app_link";
+
+    public AppLinkPreferenceController(Context context) {
+        super(context, null);
+    }
+
+    @Override
+    public String getPreferenceKey() {
+        return KEY_APP_LINK;
+    }
+
+    @Override
+    public boolean isAvailable() {
+        if (!super.isAvailable()) {
+            return false;
+        }
+        return mAppRow.settingsIntent != null;
+    }
+
+    public void updateState(Preference preference) {
+        if (mAppRow != null) {
+            preference.setIntent(mAppRow.settingsIntent);
+        }
+    }
+}
diff --git a/src/com/android/settings/notification/AppNotificationSettings.java b/src/com/android/settings/notification/AppNotificationSettings.java
index 72a4cc1..af168d6 100644
--- a/src/com/android/settings/notification/AppNotificationSettings.java
+++ b/src/com/android/settings/notification/AppNotificationSettings.java
@@ -16,56 +16,40 @@
 
 package com.android.settings.notification;
 
-import android.app.Activity;
 import android.app.NotificationChannel;
 import android.app.NotificationChannelGroup;
-import android.app.NotificationManager;
+import android.content.Context;
 import android.content.Intent;
-import android.net.Uri;
 import android.os.AsyncTask;
 import android.os.Bundle;
 import android.provider.Settings;
 import android.support.v7.preference.Preference;
 import android.support.v7.preference.PreferenceCategory;
+import android.support.v7.preference.PreferenceGroup;
 import android.text.TextUtils;
-import android.util.ArrayMap;
 import android.util.Log;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.widget.Switch;
 
 import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
+import com.android.internal.widget.LockPatternUtils;
 import com.android.settings.R;
 import com.android.settings.Utils;
 import com.android.settings.applications.AppInfoBase;
-import com.android.settings.applications.LayoutPreference;
-import com.android.settings.notification.NotificationBackend.AppRow;
-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 com.android.settingslib.core.AbstractPreferenceController;
 
 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";
     private static final boolean DEBUG = Log.isLoggable(TAG, Log.DEBUG);
 
     private static String KEY_GENERAL_CATEGORY = "categories";
-    private static String KEY_DELETED = "deleted";
 
     private List<NotificationChannelGroup> mChannelGroupList;
-    private List<PreferenceCategory> mChannelGroups = new ArrayList();
-    private FooterPreference mDeletedChannels;
 
     @Override
     public int getMetricsCategory() {
@@ -84,29 +68,18 @@
 
         if (getPreferenceScreen() != null) {
             getPreferenceScreen().removeAll();
-            mChannelGroups.clear();
-            mDeletedChannels = null;
-            mShowLegacyChannelConfig = false;
+            mDynamicPreferences.clear();
         }
 
-        addPreferencesFromResource(R.xml.notification_settings);
-        getPreferenceScreen().setOrderingAsAdded(true);
-        setupBlock();
-        addHeaderPref();
-
-        mShowLegacyChannelConfig = mBackend.onlyHasDefaultChannel(mAppRow.pkg, mAppRow.uid);
         if (mShowLegacyChannelConfig) {
-            mChannel = mBackend.getChannel(
-                    mAppRow.pkg, mAppRow.uid, NotificationChannel.DEFAULT_CHANNEL_ID);
-            populateDefaultChannelPrefs();
+            addPreferencesFromResource(R.xml.channel_notification_settings);
         } else {
-            addPreferencesFromResource(R.xml.upgraded_app_notification_settings);
-            setupBadge();
+            addPreferencesFromResource(R.xml.app_notification_settings);
             // Load channel settings
             new AsyncTask<Void, Void, Void>() {
                 @Override
                 protected Void doInBackground(Void... unused) {
-                    mChannelGroupList = mBackend.getChannelGroups(mPkg, mUid).getList();
+                    mChannelGroupList = mBackend.getGroups(mPkg, mUid).getList();
                     Collections.sort(mChannelGroupList, mChannelGroupComparator);
                     return null;
                 }
@@ -116,42 +89,60 @@
                     if (getHost() == null) {
                         return;
                     }
-                    populateChannelList();
-                    addAppLinkPref();
+                    populateList();
                 }
             }.execute();
         }
+        getPreferenceScreen().setOrderingAsAdded(true);
 
-        updateDependents(mAppRow.banned);
+        for (NotificationPreferenceController controller : mControllers) {
+            controller.onResume(mAppRow, mChannel, mChannelGroup, mSuspendedAppsAdmin);
+            controller.displayPreference(getPreferenceScreen());
+        }
+        updatePreferenceStates();
     }
 
-    private void addHeaderPref() {
-        ArrayMap<String, AppRow> rows = new ArrayMap<>();
-        rows.put(mAppRow.pkg, mAppRow);
-        collectConfigActivities(rows);
-        final Activity activity = getActivity();
-        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)
-                .setHasAppInfoLink(true)
-                .setButtonActions(EntityHeaderController.ActionType.ACTION_NONE,
-                        EntityHeaderController.ActionType.ACTION_NOTIF_PREFERENCE)
-                .done(activity, getPrefContext());
-        pref.setKey(KEY_HEADER);
-        getPreferenceScreen().addPreference(pref);
+    @Override
+    protected String getLogTag() {
+        return TAG;
     }
 
-    private void populateChannelList() {
-        if (!mChannelGroups.isEmpty()) {
+    @Override
+    protected int getPreferenceScreenResId() {
+        return R.xml.notification_settings;
+    }
+
+    @Override
+    protected List<AbstractPreferenceController> getPreferenceControllers(Context context) {
+        mControllers = new ArrayList<>();
+        mControllers.add(new HeaderPreferenceController(context, this));
+        mControllers.add(new BlockPreferenceController(context, mImportanceListener, mBackend));
+        mControllers.add(new BadgePreferenceController(context, mBackend));
+        mControllers.add(new AllowSoundPreferenceController(
+                context, mImportanceListener, mBackend));
+        mControllers.add(new ImportancePreferenceController(context));
+        mControllers.add(new SoundPreferenceController(context, this,
+                mImportanceListener, mBackend));
+        mControllers.add(new LightsPreferenceController(context, mBackend));
+        mControllers.add(new VibrationPreferenceController(context, mBackend));
+        mControllers.add(new VisibilityPreferenceController(context, new LockPatternUtils(context),
+                mBackend));
+        mControllers.add(new DndPreferenceController(context, getLifecycle(), mBackend));
+        mControllers.add(new AppLinkPreferenceController(context));
+        mControllers.add(new DescriptionPreferenceController(context));
+        mControllers.add(new NotificationsOffPreferenceController(context));
+        mControllers.add(new DeletedChannelsPreferenceController(context, mBackend));
+        return new ArrayList<>(mControllers);
+    }
+
+
+    private void populateList() {
+        if (!mDynamicPreferences.isEmpty()) {
             // If there's anything in mChannelGroups, we've called populateChannelList twice.
             // Clear out existing channels and log.
             Log.w(TAG, "Notification channel group posted twice to settings - old size " +
-                    mChannelGroups.size() + ", new size " + mChannelGroupList.size());
-            for (Preference p : mChannelGroups) {
+                    mDynamicPreferences.size() + ", new size " + mChannelGroupList.size());
+            for (Preference p : mDynamicPreferences) {
                 getPreferenceScreen().removePreference(p);
             }
         }
@@ -160,217 +151,74 @@
             groupCategory.setTitle(R.string.notification_channels);
             groupCategory.setKey(KEY_GENERAL_CATEGORY);
             getPreferenceScreen().addPreference(groupCategory);
-            mChannelGroups.add(groupCategory);
+            mDynamicPreferences.add(groupCategory);
 
             Preference empty = new Preference(getPrefContext());
             empty.setTitle(R.string.no_channels);
             empty.setEnabled(false);
             groupCategory.addPreference(empty);
         } else {
-            for (NotificationChannelGroup group : mChannelGroupList) {
-                PreferenceCategory groupCategory = new PreferenceCategory(getPrefContext());
-                if (group.getId() == null) {
-                    groupCategory.setTitle(mChannelGroupList.size() > 1
-                            ? R.string.notification_channels_other
-                            : R.string.notification_channels);
-                    groupCategory.setKey(KEY_GENERAL_CATEGORY);
-                } else {
-                    groupCategory.setTitle(group.getName());
-                    groupCategory.setKey(group.getId());
-                }
-                groupCategory.setOrderingAsAdded(true);
-                getPreferenceScreen().addPreference(groupCategory);
-                mChannelGroups.add(groupCategory);
+            populateGroupList();
+            mImportanceListener.onImportanceChanged();
+        }
+    }
 
-                final List<NotificationChannel> channels = group.getChannels();
+    private void populateGroupList() {
+        PreferenceCategory groupCategory = new PreferenceCategory(getPrefContext());
+        groupCategory.setTitle(R.string.notification_channels);
+        groupCategory.setKey(KEY_GENERAL_CATEGORY);
+        groupCategory.setOrderingAsAdded(true);
+        getPreferenceScreen().addPreference(groupCategory);
+        mDynamicPreferences.add(groupCategory);
+        for (NotificationChannelGroup group : mChannelGroupList) {
+            final List<NotificationChannel> channels = group.getChannels();
+            int N = channels.size();
+            // app defined groups with one channel and channels with no group display the channel
+            // name and no summary and link directly to the channel page unless the group is blocked
+            if ((group.getId() == null || N < 2) && !group.isBlocked()) {
                 Collections.sort(channels, mChannelComparator);
-                int N = channels.size();
                 for (int i = 0; i < N; i++) {
                     final NotificationChannel channel = channels.get(i);
-                    populateSingleChannelPrefs(groupCategory, channel);
+                    populateSingleChannelPrefs(groupCategory, channel, "");
                 }
-            }
-
-            int deletedChannelCount = mBackend.getDeletedChannelCount(mAppRow.pkg, mAppRow.uid);
-            if (deletedChannelCount > 0 &&
-                    getPreferenceScreen().findPreference(KEY_DELETED) == null) {
-                mDeletedChannels = new FooterPreference(getPrefContext());
-                mDeletedChannels.setSelectable(false);
-                mDeletedChannels.setTitle(getResources().getQuantityString(
-                        R.plurals.deleted_channels, deletedChannelCount, deletedChannelCount));
-                mDeletedChannels.setEnabled(false);
-                mDeletedChannels.setKey(KEY_DELETED);
-                mDeletedChannels.setOrder(ORDER_LAST);
-                getPreferenceScreen().addPreference(mDeletedChannels);
+            } else {
+                populateGroupPreference(groupCategory, group, N);
             }
         }
-
-        updateDependents(mAppRow.banned);
     }
 
-    private void populateSingleChannelPrefs(PreferenceCategory groupCategory,
-            final NotificationChannel channel) {
-        MasterSwitchPreference channelPref = new MasterSwitchPreference(
+    void populateGroupPreference(PreferenceGroup parent,
+            final NotificationChannelGroup group, int channelCount) {
+        MasterSwitchPreference groupPref = new MasterSwitchPreference(
                 getPrefContext());
-        channelPref.setSwitchEnabled(mSuspendedAppsAdmin == null
-                && isChannelBlockable(mAppRow.systemApp, channel)
-                && isChannelConfigurable(channel));
-        channelPref.setKey(channel.getId());
-        channelPref.setTitle(channel.getName());
-        channelPref.setChecked(channel.getImportance() != IMPORTANCE_NONE);
-        channelPref.setSummary(getImportanceSummary(channel));
-        Bundle channelArgs = new Bundle();
-        channelArgs.putInt(AppInfoBase.ARG_PACKAGE_UID, mUid);
-        channelArgs.putString(AppInfoBase.ARG_PACKAGE_NAME, mPkg);
-        channelArgs.putString(Settings.EXTRA_CHANNEL_ID, channel.getId());
-        Intent channelIntent = Utils.onBuildStartFragmentIntent(getActivity(),
-                ChannelNotificationSettings.class.getName(),
-                channelArgs, null, R.string.notification_channel_title, null, false,
+        groupPref.setSwitchEnabled(mSuspendedAppsAdmin == null
+                && isChannelGroupBlockable(group));
+        groupPref.setKey(group.getId());
+        groupPref.setTitle(group.getName());
+        groupPref.setChecked(!group.isBlocked());
+        groupPref.setSummary(getResources().getQuantityString(
+                R.plurals.notification_group_summary, channelCount, channelCount));
+        Bundle groupArgs = new Bundle();
+        groupArgs.putInt(AppInfoBase.ARG_PACKAGE_UID, mUid);
+        groupArgs.putString(AppInfoBase.ARG_PACKAGE_NAME, mPkg);
+        groupArgs.putString(Settings.EXTRA_CHANNEL_GROUP_ID, group.getId());
+        Intent groupIntent = Utils.onBuildStartFragmentIntent(getActivity(),
+                ChannelGroupNotificationSettings.class.getName(),
+                groupArgs, null, R.string.notification_group_title, null, false,
                 getMetricsCategory());
-        channelPref.setIntent(channelIntent);
+        groupPref.setIntent(groupIntent);
 
-        channelPref.setOnPreferenceChangeListener(
-                new Preference.OnPreferenceChangeListener() {
-                    @Override
-                    public boolean onPreferenceChange(Preference preference,
-                            Object o) {
-                        boolean value = (Boolean) o;
-                        int importance = value ?  IMPORTANCE_LOW : IMPORTANCE_NONE;
-                        channel.setImportance(importance);
-                        channel.lockFields(
-                                NotificationChannel.USER_LOCKED_IMPORTANCE);
-                        channelPref.setSummary(getImportanceSummary(channel));
-                        mBackend.updateChannel(mPkg, mUid, channel);
+        groupPref.setOnPreferenceChangeListener(
+                (preference, o) -> {
+                    boolean value = (Boolean) o;
+                    group.setBlocked(!value);
+                    mBackend.updateChannelGroup(mPkg, mUid, group);
 
-                        return true;
-                    }
+                    return true;
                 });
-        groupCategory.addPreference(channelPref);
+        parent.addPreference(groupPref);
     }
 
-    void setupBadge() {
-        mBadge = (RestrictedSwitchPreference) getPreferenceScreen().findPreference(KEY_BADGE);
-        mBadge.setDisabledByAdmin(mSuspendedAppsAdmin);
-        if (mChannel == null) {
-            mBadge.setChecked(mAppRow.showBadge);
-        } else {
-            mBadge.setChecked(mChannel.canShowBadge());
-        }
-        mBadge.setOnPreferenceChangeListener(new Preference.OnPreferenceChangeListener() {
-            @Override
-            public boolean onPreferenceChange(Preference preference, Object newValue) {
-                final boolean value = (Boolean) newValue;
-                if (mChannel == null) {
-                    mBackend.setShowBadge(mPkg, mUid, value);
-                } else {
-                    mChannel.setShowBadge(value);
-                    mChannel.lockFields(NotificationChannel.USER_LOCKED_SHOW_BADGE);
-                    mBackend.updateChannel(mPkg, mUid, mChannel);
-                }
-                return true;
-            }
-        });
-    }
-
-    protected void setupBlock() {
-        View switchBarContainer = LayoutInflater.from(
-                getPrefContext()).inflate(R.layout.styled_switch_bar, null);
-        mSwitchBar = switchBarContainer.findViewById(R.id.switch_bar);
-        mSwitchBar.show();
-        mSwitchBar.setDisabledByAdmin(mSuspendedAppsAdmin);
-        mSwitchBar.setChecked(!mAppRow.banned);
-        mSwitchBar.addOnSwitchChangeListener(new SwitchBar.OnSwitchChangeListener() {
-            @Override
-            public void onSwitchChanged(Switch switchView, boolean isChecked) {
-                if (mShowLegacyChannelConfig && mChannel != null) {
-                    final int importance = isChecked ? IMPORTANCE_UNSPECIFIED : IMPORTANCE_NONE;
-                    mImportanceToggle.setChecked(importance == IMPORTANCE_UNSPECIFIED);
-                    mChannel.setImportance(importance);
-                    mChannel.lockFields(NotificationChannel.USER_LOCKED_IMPORTANCE);
-                    mBackend.updateChannel(mPkg, mUid, mChannel);
-                }
-                mBackend.setNotificationsEnabledForPackage(mPkgInfo.packageName, mUid, isChecked);
-                mAppRow.banned = true;
-                updateDependents(!isChecked);
-            }
-        });
-
-        mBlockBar = new LayoutPreference(getPrefContext(), switchBarContainer);
-        mBlockBar.setOrder(ORDER_FIRST);
-        mBlockBar.setKey(KEY_BLOCK);
-        getPreferenceScreen().addPreference(mBlockBar);
-
-        if (mAppRow.systemApp && !mAppRow.banned) {
-            setVisible(mBlockBar, false);
-        }
-
-        setupBlockDesc(R.string.app_notifications_off_desc);
-    }
-
-    protected void updateDependents(boolean banned) {
-        for (PreferenceCategory category : mChannelGroups) {
-            setVisible(category, !banned);
-        }
-        if (mDeletedChannels != null) {
-            setVisible(mDeletedChannels, !banned);
-        }
-        setVisible(mBlockedDesc, banned);
-        setVisible(mBadge, !banned);
-        if (mShowLegacyChannelConfig) {
-            setVisible(mImportanceToggle, !banned);
-            setVisible(mPriority, checkCanBeVisible(NotificationManager.IMPORTANCE_DEFAULT)
-                    || (checkCanBeVisible(NotificationManager.IMPORTANCE_LOW)
-                    && mDndVisualEffectsSuppressed));
-            setVisible(mVisibilityOverride, !banned &&
-                    checkCanBeVisible(NotificationManager.IMPORTANCE_LOW) && isLockScreenSecure());
-        }
-        if (mAppLink != null) {
-            setVisible(mAppLink, !banned);
-        }
-        if (mAppRow.systemApp && !mAppRow.banned) {
-            setVisible(mBlockBar, false);
-        }
-    }
-
-    private String getImportanceSummary(NotificationChannel channel) {
-        switch (channel.getImportance()) {
-            case NotificationManager.IMPORTANCE_UNSPECIFIED:
-                return getContext().getString(R.string.notification_importance_unspecified);
-            case NotificationManager.IMPORTANCE_NONE:
-                return getContext().getString(R.string.notification_toggle_off);
-            case NotificationManager.IMPORTANCE_MIN:
-                return getContext().getString(R.string.notification_importance_min);
-            case NotificationManager.IMPORTANCE_LOW:
-                return getContext().getString(R.string.notification_importance_low);
-            case NotificationManager.IMPORTANCE_DEFAULT:
-                if (hasValidSound(channel)) {
-                    return getContext().getString(R.string.notification_importance_default);
-                } else { // Silent
-                    return getContext().getString(R.string.notification_importance_low);
-                }
-            case NotificationManager.IMPORTANCE_HIGH:
-            case NotificationManager.IMPORTANCE_MAX:
-            default:
-                if (hasValidSound(channel)) {
-                    return getContext().getString(R.string.notification_importance_high);
-                } else { // Silent
-                    return getContext().getString(R.string.notification_importance_high_silent);
-                }
-        }
-    }
-
-    private Comparator<NotificationChannel> mChannelComparator =
-            new Comparator<NotificationChannel>() {
-
-        @Override
-        public int compare(NotificationChannel left, NotificationChannel right) {
-            if (left.isDeleted() != right.isDeleted()) {
-                return Boolean.compare(left.isDeleted(), right.isDeleted());
-            }
-            return left.getId().compareTo(right.getId());
-        }
-    };
-
     private Comparator<NotificationChannelGroup> mChannelGroupComparator =
             new Comparator<NotificationChannelGroup>() {
 
diff --git a/src/com/android/settings/notification/BadgePreferenceController.java b/src/com/android/settings/notification/BadgePreferenceController.java
new file mode 100644
index 0000000..6b72c50
--- /dev/null
+++ b/src/com/android/settings/notification/BadgePreferenceController.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.notification;
+
+import static android.provider.Settings.Secure.NOTIFICATION_BADGING;
+
+import android.content.Context;
+import android.provider.Settings;
+import android.support.v7.preference.Preference;
+
+import com.android.settings.core.PreferenceControllerMixin;
+import com.android.settingslib.RestrictedSwitchPreference;
+
+public class BadgePreferenceController extends NotificationPreferenceController
+        implements PreferenceControllerMixin, Preference.OnPreferenceChangeListener {
+
+    private static final String TAG = "BadgePrefContr";
+    private static final String KEY_BADGE = "badge";
+    private static final int SYSTEM_WIDE_ON = 1;
+    private static final int SYSTEM_WIDE_OFF = 0;
+
+    public BadgePreferenceController(Context context,
+            NotificationBackend backend) {
+        super(context, backend);
+    }
+
+    @Override
+    public String getPreferenceKey() {
+        return KEY_BADGE;
+    }
+
+    @Override
+    public boolean isAvailable() {
+        if (!super.isAvailable()) {
+            return false;
+        }
+        if (mAppRow == null && mChannel == null) {
+            return false;
+        }
+        if (Settings.Secure.getInt(mContext.getContentResolver(),
+                NOTIFICATION_BADGING, SYSTEM_WIDE_ON) == SYSTEM_WIDE_OFF) {
+            return false;
+        }
+        if (mChannel != null && !mAppRow.showBadge) {
+            return false;
+        }
+        return true;
+    }
+
+    public void updateState(Preference preference) {
+        if (mAppRow != null) {
+            RestrictedSwitchPreference pref = (RestrictedSwitchPreference) preference;
+            pref.setDisabledByAdmin(mAdmin);
+            if (mChannel != null) {
+                pref.setChecked(mChannel.canShowBadge());
+                pref.setEnabled(isChannelConfigurable() && !pref.isDisabledByAdmin());
+            } else {
+                pref.setChecked(mAppRow.showBadge);
+            }
+        }
+    }
+
+    @Override
+    public boolean onPreferenceChange(Preference preference, Object newValue) {
+        final boolean showBadge = (Boolean) newValue;
+        if (mChannel != null) {
+            mChannel.setShowBadge(showBadge);
+            saveChannel();
+        } else if (mAppRow != null){
+            mAppRow.showBadge = showBadge;
+            mBackend.setShowBadge(mAppRow.pkg, mAppRow.uid, showBadge);
+        }
+        return true;
+    }
+
+}
diff --git a/src/com/android/settings/notification/BadgingNotificationPreferenceController.java b/src/com/android/settings/notification/BadgingNotificationPreferenceController.java
index 94eccf9..18efd43 100644
--- a/src/com/android/settings/notification/BadgingNotificationPreferenceController.java
+++ b/src/com/android/settings/notification/BadgingNotificationPreferenceController.java
@@ -133,7 +133,7 @@
 
     @Override
     public ResultPayload getResultPayload() {
-        final Intent intent = DatabaseIndexingUtils.buildSubsettingIntent(mContext,
+        final Intent intent = DatabaseIndexingUtils.buildSearchResultPageIntent(mContext,
                 ConfigureNotificationSettings.class.getName(), KEY_NOTIFICATION_BADGING,
                 mContext.getString(R.string.configure_notification_settings));
 
diff --git a/src/com/android/settings/notification/BlockPreferenceController.java b/src/com/android/settings/notification/BlockPreferenceController.java
new file mode 100644
index 0000000..5c366ea
--- /dev/null
+++ b/src/com/android/settings/notification/BlockPreferenceController.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.notification;
+
+import static android.app.NotificationChannel.DEFAULT_CHANNEL_ID;
+import static android.app.NotificationManager.IMPORTANCE_DEFAULT;
+import static android.app.NotificationManager.IMPORTANCE_NONE;
+import static android.app.NotificationManager.IMPORTANCE_UNSPECIFIED;
+
+import android.app.NotificationManager;
+import android.content.Context;
+import android.support.v7.preference.Preference;
+import android.widget.Switch;
+
+import com.android.settings.R;
+import com.android.settings.applications.LayoutPreference;
+import com.android.settings.core.PreferenceControllerMixin;
+import com.android.settings.widget.SwitchBar;
+
+public class BlockPreferenceController extends NotificationPreferenceController
+        implements PreferenceControllerMixin, SwitchBar.OnSwitchChangeListener {
+
+    private static final String KEY_BLOCK = "block";
+    private NotificationSettingsBase.ImportanceListener mImportanceListener;
+
+    public BlockPreferenceController(Context context,
+            NotificationSettingsBase.ImportanceListener importanceListener,
+            NotificationBackend backend) {
+        super(context, backend);
+        mImportanceListener = importanceListener;
+    }
+
+    @Override
+    public String getPreferenceKey() {
+        return KEY_BLOCK;
+    }
+
+    @Override
+    public boolean isAvailable() {
+        if (mAppRow == null) {
+            return false;
+        }
+        if (mChannel != null) {
+            return isChannelBlockable();
+        } else if (mChannelGroup != null && mChannelGroup.getGroup() != null) {
+            return isChannelGroupBlockable();
+        } else {
+            return !mAppRow.systemApp || (mAppRow.systemApp && mAppRow.banned);
+        }
+    }
+
+    public void updateState(Preference preference) {
+        LayoutPreference pref = (LayoutPreference) preference;
+        SwitchBar bar = pref.findViewById(R.id.switch_bar);
+        if (bar != null) {
+            bar.show();
+            try {
+                bar.addOnSwitchChangeListener(this);
+            } catch (IllegalStateException e) {
+                // an exception is thrown if you try to add the listener twice
+            }
+            bar.setDisabledByAdmin(mAdmin);
+
+            if (mChannel != null) {
+                bar.setChecked(!mAppRow.banned
+                        && mChannel.getImportance() != NotificationManager.IMPORTANCE_NONE);
+            } else if (mChannelGroup != null && mChannelGroup.getGroup() != null) {
+                bar.setChecked(!mAppRow.banned && !mChannelGroup.isBlocked());
+            } else {
+                bar.setChecked(!mAppRow.banned);
+            }
+        }
+    }
+
+    @Override
+    public void onSwitchChanged(Switch switchView, boolean isChecked) {
+        boolean blocked = !isChecked;
+        if (mChannel != null) {
+            final int originalImportance = mChannel.getImportance();
+            // setting the initial state of the switch in updateState() triggers this callback.
+            // It's always safe to override the importance if it's meant to be blocked or if
+            // it was blocked and we are unblocking it.
+            if (blocked || originalImportance == IMPORTANCE_NONE) {
+                final int importance = blocked ? IMPORTANCE_NONE
+                        : DEFAULT_CHANNEL_ID.equals(mChannel.getId())
+                                ? IMPORTANCE_UNSPECIFIED : IMPORTANCE_DEFAULT;
+                mChannel.setImportance(importance);
+                saveChannel();
+            }
+        } else if (mChannelGroup != null && mChannelGroup.getGroup() != null) {
+            mChannelGroup.setBlocked(blocked);
+            mBackend.updateChannelGroup(mAppRow.pkg, mAppRow.uid, mChannelGroup.getGroup());
+        } else if (mAppRow != null) {
+            mAppRow.banned = blocked;
+            mBackend.setNotificationsEnabledForPackage(mAppRow.pkg, mAppRow.uid, !blocked);
+        }
+        mImportanceListener.onImportanceChanged();
+    }
+}
diff --git a/src/com/android/settings/notification/ChannelGroupNotificationSettings.java b/src/com/android/settings/notification/ChannelGroupNotificationSettings.java
new file mode 100644
index 0000000..68dd91b
--- /dev/null
+++ b/src/com/android/settings/notification/ChannelGroupNotificationSettings.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.notification;
+
+import android.app.NotificationChannel;
+import android.content.Context;
+import android.support.v7.preference.Preference;
+import android.text.TextUtils;
+import android.util.Log;
+
+import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
+import com.android.settings.R;
+import com.android.settingslib.core.AbstractPreferenceController;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+
+public class ChannelGroupNotificationSettings extends NotificationSettingsBase {
+    private static final String TAG = "ChannelGroupSettings";
+
+    @Override
+    public int getMetricsCategory() {
+        return MetricsEvent.NOTIFICATION_CHANNEL_GROUP;
+    }
+
+    @Override
+    public void onResume() {
+        super.onResume();
+        if (mAppRow == null || mChannelGroup == null || mChannelGroup.getGroup() == null) {
+            Log.w(TAG, "Missing package or uid or packageinfo or group");
+            finish();
+            return;
+        }
+
+        populateChannelList();
+        for (NotificationPreferenceController controller : mControllers) {
+            controller.onResume(mAppRow, mChannel, mChannelGroup, mSuspendedAppsAdmin);
+            controller.displayPreference(getPreferenceScreen());
+        }
+        updatePreferenceStates();
+    }
+
+    @Override
+    protected String getLogTag() {
+        return TAG;
+    }
+
+    @Override
+    protected int getPreferenceScreenResId() {
+        return R.xml.notification_group_settings;
+    }
+
+    @Override
+    protected List<AbstractPreferenceController> getPreferenceControllers(Context context) {
+        mControllers = new ArrayList<>();
+        mControllers.add(new HeaderPreferenceController(context, this));
+        mControllers.add(new BlockPreferenceController(context, mImportanceListener, mBackend));
+        mControllers.add(new AppLinkPreferenceController(context));
+        mControllers.add(new NotificationsOffPreferenceController(context));
+        mControllers.add(new DescriptionPreferenceController(context));
+        return new ArrayList<>(mControllers);
+    }
+
+    private void populateChannelList() {
+        if (!mDynamicPreferences.isEmpty()) {
+            // If there's anything in mDynamicPreferences, we've called populateChannelList twice.
+            // Clear out existing channels and log.
+            Log.w(TAG, "Notification channel group posted twice to settings - old size " +
+                    mDynamicPreferences.size() + ", new size " + mDynamicPreferences.size());
+            for (Preference p : mDynamicPreferences) {
+                getPreferenceScreen().removePreference(p);
+            }
+        }
+        if (mChannelGroup.getGroup().getChannels().isEmpty()) {
+            Preference empty = new Preference(getPrefContext());
+            empty.setTitle(R.string.no_channels);
+            empty.setEnabled(false);
+            getPreferenceScreen().addPreference(empty);
+            mDynamicPreferences.add(empty);
+
+        } else {
+            final List<NotificationChannel> channels = mChannelGroup.getGroup().getChannels();
+            Collections.sort(channels, mChannelComparator);
+            for (NotificationChannel channel : channels) {
+                mDynamicPreferences.add(populateSingleChannelPrefs(
+                        getPreferenceScreen(), channel,
+                        ImportancePreferenceController.getImportanceSummary(
+                                getPrefContext(), channel)));
+            }
+
+        }
+    }
+}
diff --git a/src/com/android/settings/notification/ChannelImportanceSettings.java b/src/com/android/settings/notification/ChannelImportanceSettings.java
index 9e9ffd6..27b23b8 100644
--- a/src/com/android/settings/notification/ChannelImportanceSettings.java
+++ b/src/com/android/settings/notification/ChannelImportanceSettings.java
@@ -37,6 +37,7 @@
 import com.android.settings.search.BaseSearchIndexProvider;
 import com.android.settings.search.Indexable;
 import com.android.settings.widget.RadioButtonPreference;
+import com.android.settingslib.core.AbstractPreferenceController;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -60,8 +61,8 @@
     @Override
     public void onResume() {
         super.onResume();
-        if (mUid < 0 || TextUtils.isEmpty(mPkg) || mPkgInfo == null || mChannel == null) {
-            Log.w(TAG, "Missing package or uid or packageinfo or channel");
+        if (mAppRow == null || mChannel == null) {
+            Log.w(TAG, "Missing package or channel");
             finish();
             return;
         }
@@ -69,10 +70,19 @@
     }
 
     @Override
-    void setupBadge() {}
+    protected String getLogTag() {
+        return TAG;
+    }
 
     @Override
-    void updateDependents(boolean banned) {}
+    protected int getPreferenceScreenResId() {
+        return R.xml.notification_importance;
+    }
+
+    @Override
+    protected List<AbstractPreferenceController> getPreferenceControllers(Context context) {
+        return null;
+    }
 
     @Override
     public void onPause() {
@@ -81,11 +91,6 @@
 
     private PreferenceScreen createPreferenceHierarchy() {
         PreferenceScreen root = getPreferenceScreen();
-        if (root != null) {
-            root.removeAll();
-        }
-        addPreferencesFromResource(R.xml.notification_importance);
-        root = getPreferenceScreen();
 
         for (int i = 0; i < root.getPreferenceCount(); i++) {
             Preference pref = root.getPreference(i);
@@ -148,8 +153,9 @@
         // but the sound you had selected was "Silence",
         // then set sound for this channel to your default sound,
         // because you probably intended to cause this channel to actually start making sound.
-        if (oldImportance < IMPORTANCE_DEFAULT && !hasValidSound(mChannel) &&
-                mChannel.getImportance() >= IMPORTANCE_DEFAULT) {
+        if (oldImportance < IMPORTANCE_DEFAULT
+                && !SoundPreferenceController.hasValidSound(mChannel)
+                && mChannel.getImportance() >= IMPORTANCE_DEFAULT) {
             mChannel.setSound(RingtoneManager.getDefaultUri(RingtoneManager.TYPE_NOTIFICATION),
                     mChannel.getAudioAttributes());
             mChannel.lockFields(USER_LOCKED_SOUND);
@@ -157,15 +163,4 @@
         mChannel.lockFields(USER_LOCKED_IMPORTANCE);
         mBackend.updateChannel(mAppRow.pkg, mAppRow.uid, mChannel);
     }
-
-    // This page exists per notification channel; should not be included
-    // in search
-    public static final SearchIndexProvider SEARCH_INDEX_DATA_PROVIDER =
-            new BaseSearchIndexProvider() {
-                @Override
-                public List<SearchIndexableResource> getXmlResourcesToIndex(
-                        Context context, boolean enabled) {
-                    return null;
-                }
-            };
 }
diff --git a/src/com/android/settings/notification/ChannelNotificationSettings.java b/src/com/android/settings/notification/ChannelNotificationSettings.java
index dd4850e..ea17a05 100644
--- a/src/com/android/settings/notification/ChannelNotificationSettings.java
+++ b/src/com/android/settings/notification/ChannelNotificationSettings.java
@@ -16,59 +16,23 @@
 
 package com.android.settings.notification;
 
-import android.app.Activity;
-import android.app.NotificationChannel;
-import android.app.NotificationChannelGroup;
-import android.app.NotificationManager;
+import android.content.Context;
 import android.content.Intent;
-import android.net.Uri;
-import android.os.Bundle;
-import android.os.AsyncTask;
-import android.provider.Settings;
-import android.support.v7.preference.Preference;
-import android.support.v7.preference.PreferenceGroup;
+import android.preference.PreferenceManager;
 import android.text.TextUtils;
-import android.text.BidiFormatter;
-import android.text.SpannableStringBuilder;
-import android.util.ArrayMap;
 import android.util.Log;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.widget.Switch;
 
 import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
+import com.android.internal.widget.LockPatternUtils;
 import com.android.settings.R;
-import com.android.settings.RingtonePreference;
-import com.android.settings.Utils;
-import com.android.settings.applications.AppInfoBase;
-import com.android.settings.applications.LayoutPreference;
-import com.android.settings.widget.EntityHeaderController;
-import com.android.settings.widget.SwitchBar;
-import com.android.settingslib.RestrictedSwitchPreference;
-import com.android.settingslib.widget.FooterPreference;
+import com.android.settingslib.core.AbstractPreferenceController;
 
-import static android.app.NotificationManager.IMPORTANCE_LOW;
-import static android.app.NotificationManager.IMPORTANCE_NONE;
-import static android.app.NotificationManager.IMPORTANCE_UNSPECIFIED;
+import java.util.ArrayList;
+import java.util.List;
 
 public class ChannelNotificationSettings extends NotificationSettingsBase {
     private static final String TAG = "ChannelSettings";
 
-    private static final String KEY_LIGHTS = "lights";
-    private static final String KEY_VIBRATE = "vibrate";
-    private static final String KEY_RINGTONE = "ringtone";
-    private static final String KEY_IMPORTANCE = "importance";
-    private static final String KEY_ADVANCED = "advanced";
-
-    private Preference mImportance;
-    private RestrictedSwitchPreference mLights;
-    private RestrictedSwitchPreference mVibrate;
-    private NotificationSoundPreference mRingtone;
-    private FooterPreference mFooter;
-    private NotificationChannelGroup mChannelGroup;
-    private EntityHeaderController mHeaderPref;
-    private PreferenceGroup mAdvanced;
-
     @Override
     public int getMetricsCategory() {
         return MetricsEvent.NOTIFICATION_TOPIC_NOTIFICATION;
@@ -83,322 +47,52 @@
             return;
         }
 
-        if (getPreferenceScreen() != null) {
-            getPreferenceScreen().removeAll();
+        for (NotificationPreferenceController controller : mControllers) {
+            controller.onResume(mAppRow, mChannel, mChannelGroup, mSuspendedAppsAdmin);
+            controller.displayPreference(getPreferenceScreen());
         }
-        addPreferencesFromResource(R.xml.notification_settings);
-        setupBlock();
-        addHeaderPref();
-        addAppLinkPref();
-        addFooterPref();
-
-        if (NotificationChannel.DEFAULT_CHANNEL_ID.equals(mChannel.getId())) {
-            populateDefaultChannelPrefs();
-            mShowLegacyChannelConfig = true;
-        } else {
-            populateUpgradedChannelPrefs();
-
-            if (mChannel.getGroup() != null) {
-                // Go look up group name
-                new AsyncTask<Void, Void, Void>() {
-                    @Override
-                    protected Void doInBackground(Void... unused) {
-                        if (mChannel.getGroup() != null) {
-                            mChannelGroup = mBackend.getGroup(mChannel.getGroup(), mPkg, mUid);
-                        }
-                        return null;
-                    }
-
-                    @Override
-                    protected void onPostExecute(Void unused) {
-                        if (getHost() == null || mChannelGroup == null) {
-                            return;
-                        }
-                        setChannelGroupLabel(mChannelGroup.getName());
-                    }
-                }.execute();
-            }
-        }
-
-        updateDependents(mChannel.getImportance() == IMPORTANCE_NONE);
-    }
-
-    private void populateUpgradedChannelPrefs() {
-        addPreferencesFromResource(R.xml.upgraded_channel_notification_settings);
-        setupBadge();
-        setupPriorityPref(mChannel.canBypassDnd());
-        setupVisOverridePref(mChannel.getLockscreenVisibility());
-        setupLights();
-        setupVibrate();
-        setupRingtone();
-        setupImportance();
-        mAdvanced = (PreferenceGroup) findPreference(KEY_ADVANCED);
-    }
-
-    private void addHeaderPref() {
-        ArrayMap<String, NotificationBackend.AppRow> rows = new ArrayMap<>();
-        rows.put(mAppRow.pkg, mAppRow);
-        collectConfigActivities(rows);
-        final Activity activity = getActivity();
-        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(EntityHeaderController.ActionType.ACTION_NOTIF_PREFERENCE,
-                        EntityHeaderController.ActionType.ACTION_NONE)
-                .setHasAppInfoLink(true)
-                .done(activity, getPrefContext());
-        getPreferenceScreen().addPreference(pref);
-    }
-
-    private void setChannelGroupLabel(CharSequence groupName) {
-        final SpannableStringBuilder summary = new SpannableStringBuilder();
-        BidiFormatter bidi = BidiFormatter.getInstance();
-        summary.append(bidi.unicodeWrap(mAppRow.label.toString()));
-        if (groupName != null) {
-            summary.append(bidi.unicodeWrap(mContext.getText(
-                    R.string.notification_header_divider_symbol_with_spaces)));
-            summary.append(bidi.unicodeWrap(groupName.toString()));
-        }
-        final Activity activity = getActivity();
-        mHeaderPref.setSummary(summary.toString());
-        mHeaderPref.done(activity, getPrefContext());
-    }
-
-    private void addFooterPref() {
-        if (!TextUtils.isEmpty(mChannel.getDescription())) {
-            FooterPreference descPref = new FooterPreference(getPrefContext());
-            descPref.setOrder(ORDER_LAST);
-            descPref.setSelectable(false);
-            descPref.setTitle(mChannel.getDescription());
-            getPreferenceScreen().addPreference(descPref);
-        }
-    }
-
-    protected void setupBadge() {
-        mBadge = (RestrictedSwitchPreference) getPreferenceScreen().findPreference(KEY_BADGE);
-        mBadge.setDisabledByAdmin(mSuspendedAppsAdmin);
-        mBadge.setEnabled(mAppRow.showBadge);
-        mBadge.setChecked(mChannel.canShowBadge());
-
-        mBadge.setOnPreferenceChangeListener(new Preference.OnPreferenceChangeListener() {
-            @Override
-            public boolean onPreferenceChange(Preference preference, Object newValue) {
-                final boolean value = (Boolean) newValue;
-                mChannel.setShowBadge(value);
-                mChannel.lockFields(NotificationChannel.USER_LOCKED_SHOW_BADGE);
-                mBackend.updateChannel(mPkg, mUid, mChannel);
-                return true;
-            }
-        });
-    }
-
-    private void setupLights() {
-        mLights = (RestrictedSwitchPreference) findPreference(KEY_LIGHTS);
-        mLights.setDisabledByAdmin(mSuspendedAppsAdmin);
-        mLights.setChecked(mChannel.shouldShowLights());
-        mLights.setOnPreferenceChangeListener(new Preference.OnPreferenceChangeListener() {
-            @Override
-            public boolean onPreferenceChange(Preference preference, Object newValue) {
-                final boolean lights = (Boolean) newValue;
-                mChannel.enableLights(lights);
-                mChannel.lockFields(NotificationChannel.USER_LOCKED_LIGHTS);
-                mBackend.updateChannel(mPkg, mUid, mChannel);
-                return true;
-            }
-        });
-    }
-
-    private void setupVibrate() {
-        mVibrate = (RestrictedSwitchPreference) findPreference(KEY_VIBRATE);
-        mVibrate.setDisabledByAdmin(mSuspendedAppsAdmin);
-        mVibrate.setEnabled(!mVibrate.isDisabledByAdmin() && isChannelConfigurable(mChannel));
-        mVibrate.setChecked(mChannel.shouldVibrate());
-        mVibrate.setOnPreferenceChangeListener(new Preference.OnPreferenceChangeListener() {
-            @Override
-            public boolean onPreferenceChange(Preference preference, Object newValue) {
-                final boolean vibrate = (Boolean) newValue;
-                mChannel.enableVibration(vibrate);
-                mChannel.lockFields(NotificationChannel.USER_LOCKED_VIBRATION);
-                mBackend.updateChannel(mPkg, mUid, mChannel);
-                return true;
-            }
-        });
-    }
-
-    private void setupRingtone() {
-        mRingtone = (NotificationSoundPreference) findPreference(KEY_RINGTONE);
-        mRingtone.setRingtone(mChannel.getSound());
-        mRingtone.setEnabled(isChannelConfigurable(mChannel));
-        mRingtone.setOnPreferenceChangeListener(new Preference.OnPreferenceChangeListener() {
-            @Override
-            public boolean onPreferenceChange(Preference preference, Object newValue) {
-                mChannel.setSound((Uri) newValue, mChannel.getAudioAttributes());
-                mChannel.lockFields(NotificationChannel.USER_LOCKED_SOUND);
-                mBackend.updateChannel(mPkg, mUid, mChannel);
-                return false;
-            }
-        });
-    }
-
-    private void setupBlock() {
-        View switchBarContainer = LayoutInflater.from(
-                getPrefContext()).inflate(R.layout.styled_switch_bar, null);
-        mSwitchBar = switchBarContainer.findViewById(R.id.switch_bar);
-        mSwitchBar.show();
-        mSwitchBar.setDisabledByAdmin(mSuspendedAppsAdmin);
-        mSwitchBar.setChecked(mChannel.getImportance() != NotificationManager.IMPORTANCE_NONE);
-        mSwitchBar.addOnSwitchChangeListener(new SwitchBar.OnSwitchChangeListener() {
-            @Override
-            public void onSwitchChanged(Switch switchView, boolean isChecked) {
-                int importance = 0;
-                if (mShowLegacyChannelConfig) {
-                    importance = isChecked ? IMPORTANCE_UNSPECIFIED : IMPORTANCE_NONE;
-                    mImportanceToggle.setChecked(importance == IMPORTANCE_UNSPECIFIED);
-                } else {
-                    importance = isChecked ? IMPORTANCE_LOW : IMPORTANCE_NONE;
-                    mImportance.setSummary(getImportanceSummary(importance));
-                }
-                mChannel.setImportance(importance);
-                mChannel.lockFields(NotificationChannel.USER_LOCKED_IMPORTANCE);
-                mBackend.updateChannel(mPkg, mUid, mChannel);
-                updateDependents(mChannel.getImportance() == IMPORTANCE_NONE);
-            }
-        });
-
-        mBlockBar = new LayoutPreference(getPrefContext(), switchBarContainer);
-        mBlockBar.setOrder(ORDER_FIRST);
-        mBlockBar.setKey(KEY_BLOCK);
-        getPreferenceScreen().addPreference(mBlockBar);
-
-        if (!isChannelBlockable(mAppRow.systemApp, mChannel)) {
-            setVisible(mBlockBar, false);
-        }
-
-        setupBlockDesc(R.string.channel_notifications_off_desc);
-    }
-
-    private void setupImportance() {
-        mImportance = findPreference(KEY_IMPORTANCE);
-        Bundle channelArgs = new Bundle();
-        channelArgs.putInt(AppInfoBase.ARG_PACKAGE_UID, mUid);
-        channelArgs.putString(AppInfoBase.ARG_PACKAGE_NAME, mPkg);
-        channelArgs.putString(Settings.EXTRA_CHANNEL_ID, mChannel.getId());
-        mImportance.setEnabled(mSuspendedAppsAdmin == null && isChannelConfigurable(mChannel));
-        // Set up intent to show importance selection only if this setting is enabled.
-        if (mImportance.isEnabled()) {
-            Intent channelIntent = Utils.onBuildStartFragmentIntent(getActivity(),
-                    ChannelImportanceSettings.class.getName(),
-                    channelArgs, null, R.string.notification_importance_title, null,
-                    false, getMetricsCategory());
-            mImportance.setIntent(channelIntent);
-        }
-        mImportance.setSummary(getImportanceSummary(mChannel.getImportance()));
-    }
-
-    private String getImportanceSummary(int importance) {
-        String title;
-        String summary = null;
-        switch (importance) {
-            case IMPORTANCE_UNSPECIFIED:
-                title = getContext().getString(R.string.notification_importance_unspecified);
-                break;
-            case NotificationManager.IMPORTANCE_MIN:
-                title = getContext().getString(R.string.notification_importance_min_title);
-                summary = getContext().getString(R.string.notification_importance_min);
-                break;
-            case NotificationManager.IMPORTANCE_LOW:
-                title = getContext().getString(R.string.notification_importance_low_title);
-                summary = getContext().getString(R.string.notification_importance_low);
-                break;
-            case NotificationManager.IMPORTANCE_DEFAULT:
-                title = getContext().getString(R.string.notification_importance_default_title);
-                if (hasValidSound(mChannel)) {
-                    summary = getContext().getString(R.string.notification_importance_default);
-                } else {
-                    summary = getContext().getString(R.string.notification_importance_low);
-                }
-                break;
-            case NotificationManager.IMPORTANCE_HIGH:
-            case NotificationManager.IMPORTANCE_MAX:
-                title = getContext().getString(R.string.notification_importance_high_title);
-                if (hasValidSound(mChannel)) {
-                    summary = getContext().getString(R.string.notification_importance_high);
-                } else {
-                    summary = getContext().getString(R.string.notification_importance_high_silent);
-                }
-                break;
-            default:
-                return "";
-        }
-
-        if (summary != null) {
-            return getContext().getString(R.string.notification_importance_divider, title, summary);
-        } else {
-            return title;
-        }
-    }
-
-    @Override
-    public boolean onPreferenceTreeClick(Preference preference) {
-        if (preference instanceof RingtonePreference) {
-            mRingtone.onPrepareRingtonePickerIntent(mRingtone.getIntent());
-            startActivityForResult(preference.getIntent(), 200);
-            return true;
-        }
-        return super.onPreferenceTreeClick(preference);
+        updatePreferenceStates();
     }
 
     @Override
     public void onActivityResult(int requestCode, int resultCode, Intent data) {
-        if (mRingtone != null) {
-            mRingtone.onActivityResult(requestCode, resultCode, data);
-        }
-        if (mChannel != null) {
-            mImportance.setSummary(getImportanceSummary(mChannel.getImportance()));
+        for (NotificationPreferenceController controller : mControllers) {
+            if (controller instanceof PreferenceManager.OnActivityResultListener) {
+                ((PreferenceManager.OnActivityResultListener) controller)
+                        .onActivityResult(requestCode, resultCode, data);
+            }
         }
     }
 
-    boolean canPulseLight() {
-        if (!getResources()
-                .getBoolean(com.android.internal.R.bool.config_intrusiveNotificationLed)) {
-            return false;
-        }
-        return Settings.System.getInt(getContentResolver(),
-                Settings.System.NOTIFICATION_LIGHT_PULSE, 0) == 1;
+    @Override
+    protected String getLogTag() {
+        return TAG;
     }
 
-    void updateDependents(boolean banned) {
-        PreferenceGroup parent;
-        if (mShowLegacyChannelConfig) {
-            parent = getPreferenceScreen();
-            setVisible(mImportanceToggle, checkCanBeVisible(NotificationManager.IMPORTANCE_MIN));
-        } else {
-            setVisible(mAdvanced, checkCanBeVisible(NotificationManager.IMPORTANCE_MIN));
-            setVisible(mImportance, checkCanBeVisible(NotificationManager.IMPORTANCE_MIN));
-            setVisible(mAdvanced, mLights, checkCanBeVisible(
-                    NotificationManager.IMPORTANCE_DEFAULT) && canPulseLight());
-            setVisible(mVibrate, checkCanBeVisible(NotificationManager.IMPORTANCE_DEFAULT));
-            setVisible(mRingtone, checkCanBeVisible(NotificationManager.IMPORTANCE_DEFAULT));
-            parent = mAdvanced;
-        }
-        setVisible(parent, mBadge, checkCanBeVisible(NotificationManager.IMPORTANCE_MIN));
-        setVisible(parent, mPriority, checkCanBeVisible(NotificationManager.IMPORTANCE_DEFAULT)
-                || (checkCanBeVisible(NotificationManager.IMPORTANCE_LOW)
-                && mDndVisualEffectsSuppressed));
-        setVisible(parent, mVisibilityOverride, isLockScreenSecure()
-                &&checkCanBeVisible(NotificationManager.IMPORTANCE_LOW));
-        setVisible(mBlockedDesc, mChannel.getImportance() == IMPORTANCE_NONE);
-        if (mAppLink != null) {
-            setVisible(mAppLink, checkCanBeVisible(NotificationManager.IMPORTANCE_MIN));
-        }
-        if (mFooter != null) {
-            setVisible(mFooter, checkCanBeVisible(NotificationManager.IMPORTANCE_MIN));
-        }
+    @Override
+    protected int getPreferenceScreenResId() {
+        return  R.xml.channel_notification_settings;
+    }
+
+    @Override
+    protected List<AbstractPreferenceController> getPreferenceControllers(Context context) {
+        mControllers = new ArrayList<>();
+        mControllers.add(new HeaderPreferenceController(context, this));
+        mControllers.add(new BlockPreferenceController(context, mImportanceListener, mBackend));
+        mControllers.add(new ImportancePreferenceController(context));
+        mControllers.add(new AllowSoundPreferenceController(
+                context, mImportanceListener, mBackend));
+        mControllers.add(new SoundPreferenceController(context, this,
+                mImportanceListener, mBackend));
+        mControllers.add(new VibrationPreferenceController(context, mBackend));
+        mControllers.add(new AppLinkPreferenceController(context));
+        mControllers.add(new DescriptionPreferenceController(context));
+        mControllers.add(new VisibilityPreferenceController(context, new LockPatternUtils(context),
+                mBackend));
+        mControllers.add(new LightsPreferenceController(context, mBackend));
+        mControllers.add(new BadgePreferenceController(context, mBackend));
+        mControllers.add(new DndPreferenceController(context, getLifecycle(), mBackend));
+        mControllers.add(new NotificationsOffPreferenceController(context));
+        return new ArrayList<>(mControllers);
     }
 }
diff --git a/src/com/android/settings/notification/DeletedChannelsPreferenceController.java b/src/com/android/settings/notification/DeletedChannelsPreferenceController.java
new file mode 100644
index 0000000..16eb9ed
--- /dev/null
+++ b/src/com/android/settings/notification/DeletedChannelsPreferenceController.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.notification;
+
+import android.content.Context;
+import android.support.v7.preference.Preference;
+
+import com.android.settings.R;
+import com.android.settings.core.PreferenceControllerMixin;
+
+public class DeletedChannelsPreferenceController extends NotificationPreferenceController
+        implements PreferenceControllerMixin {
+
+    private static final String  KEY_DELETED = "deleted";
+
+    public DeletedChannelsPreferenceController(Context context, NotificationBackend backend) {
+        super(context, backend);
+    }
+
+    @Override
+    public String getPreferenceKey() {
+        return KEY_DELETED;
+    }
+
+    @Override
+    public boolean isAvailable() {
+        if (!super.isAvailable()) {
+            return false;
+        }
+        // only visible on app screen
+        if (mChannel != null || hasValidGroup()) {
+            return false;
+        }
+
+        return mBackend.getDeletedChannelCount(mAppRow.pkg, mAppRow.uid) > 0;
+    }
+
+    public void updateState(Preference preference) {
+        if (mAppRow != null) {
+            int deletedChannelCount = mBackend.getDeletedChannelCount(mAppRow.pkg, mAppRow.uid);
+            preference.setTitle(mContext.getResources().getQuantityString(
+                    R.plurals.deleted_channels, deletedChannelCount, deletedChannelCount));
+        }
+        preference.setEnabled(false);
+        preference.setSelectable(false);
+    }
+}
diff --git a/src/com/android/settings/notification/DescriptionPreferenceController.java b/src/com/android/settings/notification/DescriptionPreferenceController.java
new file mode 100644
index 0000000..fae2f5f
--- /dev/null
+++ b/src/com/android/settings/notification/DescriptionPreferenceController.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.notification;
+
+import android.content.Context;
+import android.support.v7.preference.Preference;
+import android.text.TextUtils;
+
+import com.android.settings.core.PreferenceControllerMixin;
+
+public class DescriptionPreferenceController extends NotificationPreferenceController
+        implements PreferenceControllerMixin {
+
+    private static final String KEY_DESC = "desc";
+
+    public DescriptionPreferenceController(Context context) {
+        super(context, null);
+    }
+
+    @Override
+    public String getPreferenceKey() {
+        return KEY_DESC;
+    }
+
+    @Override
+    public boolean isAvailable() {
+        if (!super.isAvailable()) {
+            return false;
+        }
+        if (mChannel == null && !hasValidGroup()) {
+            return false;
+        }
+        if (mChannel != null && !TextUtils.isEmpty(mChannel.getDescription())) {
+            return true;
+        }
+        if (hasValidGroup() && !TextUtils.isEmpty(mChannelGroup.getDescription())) {
+            return true;
+        }
+        return false;
+    }
+
+    public void updateState(Preference preference) {
+        if (mAppRow != null) {
+            if (mChannel != null) {
+                preference.setTitle(mChannel.getDescription());
+            } else if (hasValidGroup()) {
+                preference.setTitle(mChannelGroup.getDescription());
+            }
+        }
+        preference.setEnabled(false);
+        preference.setSelectable(false);
+    }
+}
diff --git a/src/com/android/settings/notification/DndPreferenceController.java b/src/com/android/settings/notification/DndPreferenceController.java
new file mode 100644
index 0000000..af60401
--- /dev/null
+++ b/src/com/android/settings/notification/DndPreferenceController.java
@@ -0,0 +1,86 @@
+/*
+ * Copyright (C) 2017 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.notification;
+
+import android.app.NotificationChannel;
+import android.app.NotificationManager;
+import android.content.Context;
+import android.support.v7.preference.Preference;
+
+import com.android.settings.core.PreferenceControllerMixin;
+import com.android.settingslib.RestrictedSwitchPreference;
+import com.android.settingslib.core.lifecycle.Lifecycle;
+import com.android.settingslib.core.lifecycle.LifecycleObserver;
+import com.android.settingslib.core.lifecycle.events.OnResume;
+
+public class DndPreferenceController extends NotificationPreferenceController
+        implements PreferenceControllerMixin, Preference.OnPreferenceChangeListener,
+        LifecycleObserver, OnResume {
+
+    private static final String KEY_BYPASS_DND = "bypass_dnd";
+    private boolean mVisualEffectsSuppressed;
+
+    public DndPreferenceController(Context context, Lifecycle lifecycle,
+            NotificationBackend backend) {
+        super(context, backend);
+        if (lifecycle != null) {
+            lifecycle.addObserver(this);
+        }
+    }
+
+    @Override
+    public void onResume() {
+        NotificationManager.Policy policy = mNm.getNotificationPolicy();
+        mVisualEffectsSuppressed = policy != null && policy.suppressedVisualEffects != 0;
+    }
+
+    @Override
+    public String getPreferenceKey() {
+        return KEY_BYPASS_DND;
+    }
+
+    @Override
+    public boolean isAvailable() {
+        if (!super.isAvailable()) {
+            return false;
+        }
+        return checkCanBeVisible(NotificationManager.IMPORTANCE_DEFAULT)
+                || (checkCanBeVisible(NotificationManager.IMPORTANCE_LOW)
+                && mVisualEffectsSuppressed);
+    }
+
+    public void updateState(Preference preference) {
+        if (mChannel != null) {
+            RestrictedSwitchPreference pref = (RestrictedSwitchPreference) preference;
+            pref.setDisabledByAdmin(mAdmin);
+            pref.setEnabled(isChannelConfigurable() && !pref.isDisabledByAdmin());
+            pref.setChecked(mChannel.canBypassDnd());
+        }
+    }
+
+    @Override
+    public boolean onPreferenceChange(Preference preference, Object newValue) {
+        if (mChannel != null) {
+            final boolean bypassZenMode = (Boolean) newValue;
+            mChannel.setBypassDnd(bypassZenMode);
+            mChannel.lockFields(NotificationChannel.USER_LOCKED_PRIORITY);
+            saveChannel();
+        }
+        return true;
+    }
+
+}
diff --git a/src/com/android/settings/notification/EmergencyBroadcastPreferenceController.java b/src/com/android/settings/notification/EmergencyBroadcastPreferenceController.java
index d6291a8..2eb9f6a 100644
--- a/src/com/android/settings/notification/EmergencyBroadcastPreferenceController.java
+++ b/src/com/android/settings/notification/EmergencyBroadcastPreferenceController.java
@@ -40,7 +40,6 @@
     private AccountRestrictionHelper mHelper;
     private UserManager mUserManager;
     private PackageManager mPm;
-    private boolean mCellBroadcastAppLinkEnabled;
 
     public EmergencyBroadcastPreferenceController(Context context, String prefKey) {
         this(context, new AccountRestrictionHelper(context), prefKey);
@@ -54,8 +53,6 @@
         mHelper = helper;
         mUserManager = (UserManager) context.getSystemService(Context.USER_SERVICE);
         mPm = mContext.getPackageManager();
-        // Enable link to CMAS app settings depending on the value in config.xml.
-        mCellBroadcastAppLinkEnabled = isCellBroadcastAppLinkEnabled();
     }
 
     @Override
@@ -79,12 +76,13 @@
 
     @Override
     public boolean isAvailable() {
-        return mUserManager.isAdminUser() && mCellBroadcastAppLinkEnabled
+        return mUserManager.isAdminUser() && isCellBroadcastAppLinkEnabled()
                 && !mHelper.hasBaseUserRestriction(
                 UserManager.DISALLOW_CONFIG_CELL_BROADCASTS, UserHandle.myUserId());
     }
 
     private boolean isCellBroadcastAppLinkEnabled() {
+        // Enable link to CMAS app settings depending on the value in config.xml.
         boolean enabled = mContext.getResources().getBoolean(
                 com.android.internal.R.bool.config_cellBroadcastAppLinks);
         if (enabled) {
diff --git a/src/com/android/settings/notification/HeaderPreferenceController.java b/src/com/android/settings/notification/HeaderPreferenceController.java
new file mode 100644
index 0000000..3d51b25
--- /dev/null
+++ b/src/com/android/settings/notification/HeaderPreferenceController.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.notification;
+
+import static com.android.settings.widget.EntityHeaderController.PREF_KEY_APP_HEADER;
+
+import android.content.Context;
+import android.support.v14.preference.PreferenceFragment;
+import android.support.v7.preference.Preference;
+import android.text.BidiFormatter;
+import android.text.SpannableStringBuilder;
+import android.text.TextUtils;
+import android.view.View;
+
+import com.android.settings.R;
+import com.android.settings.applications.LayoutPreference;
+import com.android.settings.core.PreferenceControllerMixin;
+import com.android.settings.widget.EntityHeaderController;
+
+public class HeaderPreferenceController extends NotificationPreferenceController
+        implements PreferenceControllerMixin {
+
+    private final PreferenceFragment mFragment;
+
+    public HeaderPreferenceController(Context context, PreferenceFragment fragment) {
+        super(context, null);
+        mFragment = fragment;
+    }
+
+    @Override
+    public String getPreferenceKey() {
+        return PREF_KEY_APP_HEADER;
+    }
+
+    @Override
+    public boolean isAvailable() {
+        return mAppRow != null;
+    }
+
+    public void updateState(Preference preference) {
+        if (mAppRow != null && mFragment != null) {
+            LayoutPreference pref = (LayoutPreference) preference;
+            EntityHeaderController controller = EntityHeaderController
+                    .newInstance(mFragment.getActivity(), mFragment,
+                            pref.findViewById(R.id.entity_header));
+            pref = controller.setIcon(mAppRow.icon)
+                    .setLabel(getLabel())
+                    .setSummary(getSummary())
+                    .setPackageName(mAppRow.pkg)
+                    .setUid(mAppRow.uid)
+                    .setButtonActions(EntityHeaderController.ActionType.ACTION_NOTIF_PREFERENCE,
+                            EntityHeaderController.ActionType.ACTION_NONE)
+                    .setHasAppInfoLink(true)
+                    .done(mFragment.getActivity(), mContext);
+            pref.findViewById(R.id.entity_header).setVisibility(View.VISIBLE);
+        }
+    }
+
+    CharSequence getLabel() {
+        return mChannel != null ? mChannel.getName()
+                : mChannelGroup != null && mChannelGroup.getGroup() != null
+                        ? mChannelGroup.getGroup().getName()
+                        : mAppRow.label;
+    }
+
+    CharSequence getSummary() {
+        if (mChannel != null) {
+           if (mChannelGroup != null && mChannelGroup.getGroup() != null
+                && !TextUtils.isEmpty(mChannelGroup.getGroup().getName())) {
+               final SpannableStringBuilder summary = new SpannableStringBuilder();
+               BidiFormatter bidi = BidiFormatter.getInstance();
+               summary.append(bidi.unicodeWrap(mAppRow.label.toString()));
+               summary.append(bidi.unicodeWrap(mContext.getText(
+                       R.string.notification_header_divider_symbol_with_spaces)));
+               summary.append(bidi.unicodeWrap(mChannelGroup.getGroup().getName().toString()));
+               return summary;
+           } else {
+               return mAppRow.label;
+           }
+        } else if (mChannelGroup != null && mChannelGroup.getGroup() != null) {
+            return mAppRow.label;
+        } else {
+            return "";
+        }
+    }
+}
diff --git a/src/com/android/settings/notification/ImportancePreferenceController.java b/src/com/android/settings/notification/ImportancePreferenceController.java
new file mode 100644
index 0000000..ba47c54
--- /dev/null
+++ b/src/com/android/settings/notification/ImportancePreferenceController.java
@@ -0,0 +1,127 @@
+/*
+ * Copyright (C) 2017 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF 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 android.app.NotificationManager.IMPORTANCE_UNSPECIFIED;
+
+import android.app.NotificationChannel;
+import android.app.NotificationManager;
+import android.content.Context;
+import android.content.Intent;
+import android.os.Bundle;
+import android.provider.Settings;
+import android.support.v7.preference.Preference;
+
+import com.android.internal.logging.nano.MetricsProto;
+import com.android.settings.R;
+import com.android.settings.Utils;
+import com.android.settings.applications.AppInfoBase;
+import com.android.settings.core.PreferenceControllerMixin;
+
+public class ImportancePreferenceController extends NotificationPreferenceController
+        implements PreferenceControllerMixin {
+
+    private static final String KEY_IMPORTANCE = "importance";
+
+    // Ironically doesn't take an importance listener because the importance is not changed
+    // by this controller's preference but by the screen it links to.
+    public ImportancePreferenceController(Context context) {
+        super(context, null);
+    }
+
+    @Override
+    public String getPreferenceKey() {
+        return KEY_IMPORTANCE;
+    }
+    
+    private int getMetricsCategory() {
+        return MetricsProto.MetricsEvent.NOTIFICATION_TOPIC_NOTIFICATION;
+    }
+
+    @Override
+    public boolean isAvailable() {
+        if (!super.isAvailable()) {
+            return false;
+        }
+        if (mChannel == null) {
+            return false;
+        }
+        return !NotificationChannel.DEFAULT_CHANNEL_ID.equals(mChannel.getId());
+    }
+
+    public void updateState(Preference preference) {
+        if (mAppRow!= null && mChannel != null) {
+            preference.setEnabled(mAdmin == null && isChannelConfigurable());
+            Bundle channelArgs = new Bundle();
+            channelArgs.putInt(AppInfoBase.ARG_PACKAGE_UID, mAppRow.uid);
+            channelArgs.putString(AppInfoBase.ARG_PACKAGE_NAME, mAppRow.pkg);
+            channelArgs.putString(Settings.EXTRA_CHANNEL_ID, mChannel.getId());
+            if (preference.isEnabled()) {
+                Intent channelIntent = Utils.onBuildStartFragmentIntent(mContext,
+                        ChannelImportanceSettings.class.getName(),
+                        channelArgs, null, R.string.notification_importance_title, null,
+                        false, getMetricsCategory());
+                preference.setIntent(channelIntent);
+                preference.setSummary(getImportanceSummary(mContext, mChannel));
+            }
+        }
+    }
+
+    protected static String getImportanceSummary(Context context, NotificationChannel channel) {
+        String title;
+        String summary = null;
+        int importance = channel.getImportance();
+        switch (importance) {
+            case IMPORTANCE_UNSPECIFIED:
+                title = context.getString(R.string.notification_importance_unspecified);
+                break;
+            case NotificationManager.IMPORTANCE_MIN:
+                title = context.getString(R.string.notification_importance_min_title);
+                summary = context.getString(R.string.notification_importance_min);
+                break;
+            case NotificationManager.IMPORTANCE_LOW:
+                title = context.getString(R.string.notification_importance_low_title);
+                summary = context.getString(R.string.notification_importance_low);
+                break;
+            case NotificationManager.IMPORTANCE_DEFAULT:
+                title = context.getString(R.string.notification_importance_default_title);
+                if (SoundPreferenceController.hasValidSound(channel)) {
+                    summary = context.getString(R.string.notification_importance_default);
+                } else {
+                    summary = context.getString(R.string.notification_importance_low);
+                }
+                break;
+            case NotificationManager.IMPORTANCE_HIGH:
+            case NotificationManager.IMPORTANCE_MAX:
+                title = context.getString(R.string.notification_importance_high_title);
+                if (SoundPreferenceController.hasValidSound(channel)) {
+                    summary = context.getString(R.string.notification_importance_high);
+                } else {
+                    summary = context.getString(R.string.notification_importance_high_silent);
+                }
+                break;
+            default:
+                return "";
+        }
+
+        if (summary != null) {
+            return context.getString(R.string.notification_importance_divider, title, summary);
+        } else {
+            return title;
+        }
+    }
+}
diff --git a/src/com/android/settings/notification/LightsPreferenceController.java b/src/com/android/settings/notification/LightsPreferenceController.java
new file mode 100644
index 0000000..230c3e2
--- /dev/null
+++ b/src/com/android/settings/notification/LightsPreferenceController.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.notification;
+
+import android.app.NotificationChannel;
+import android.app.NotificationManager;
+import android.content.Context;
+import android.provider.Settings;
+import android.support.v7.preference.Preference;
+
+import com.android.settings.core.PreferenceControllerMixin;
+import com.android.settingslib.RestrictedSwitchPreference;
+import com.android.settingslib.core.lifecycle.Lifecycle;
+import com.android.settingslib.core.lifecycle.LifecycleObserver;
+import com.android.settingslib.core.lifecycle.events.OnResume;
+
+public class LightsPreferenceController extends NotificationPreferenceController
+        implements PreferenceControllerMixin, Preference.OnPreferenceChangeListener {
+
+    private static final String KEY_LIGHTS = "lights";
+
+    public LightsPreferenceController(Context context, NotificationBackend backend) {
+        super(context, backend);
+    }
+
+    @Override
+    public String getPreferenceKey() {
+        return KEY_LIGHTS;
+    }
+
+    @Override
+    public boolean isAvailable() {
+        if (!super.isAvailable()) {
+            return false;
+        }
+        if (mChannel == null) {
+            return false;
+        }
+        return checkCanBeVisible(NotificationManager.IMPORTANCE_DEFAULT) && canPulseLight()
+                && !NotificationChannel.DEFAULT_CHANNEL_ID.equals(mChannel.getId());
+    }
+
+    public void updateState(Preference preference) {
+        if (mChannel != null) {
+            RestrictedSwitchPreference pref = (RestrictedSwitchPreference) preference;
+            pref.setDisabledByAdmin(mAdmin);
+            pref.setEnabled(isChannelConfigurable() && !pref.isDisabledByAdmin());
+            pref.setChecked(mChannel.shouldShowLights());
+        }
+    }
+
+    @Override
+    public boolean onPreferenceChange(Preference preference, Object newValue) {
+        if (mChannel != null) {
+            final boolean lights = (Boolean) newValue;
+            mChannel.enableLights(lights);
+            saveChannel();
+        }
+        return true;
+    }
+
+    boolean canPulseLight() {
+        if (!mContext.getResources()
+                .getBoolean(com.android.internal.R.bool.config_intrusiveNotificationLed)) {
+            return false;
+        }
+        return Settings.System.getInt(mContext.getContentResolver(),
+                Settings.System.NOTIFICATION_LIGHT_PULSE, 0) == 1;
+    }
+
+}
diff --git a/src/com/android/settings/notification/LockScreenNotificationPreferenceController.java b/src/com/android/settings/notification/LockScreenNotificationPreferenceController.java
index 9855751..dd7b0fb 100644
--- a/src/com/android/settings/notification/LockScreenNotificationPreferenceController.java
+++ b/src/com/android/settings/notification/LockScreenNotificationPreferenceController.java
@@ -98,8 +98,8 @@
             mLockscreenProfile = (RestrictedDropDownPreference) screen.findPreference(
                     mWorkSettingKey);
         } else {
-            removePreference(screen, mWorkSettingKey);
-            removePreference(screen, mWorkSettingCategoryKey);
+            setVisible(screen, mWorkSettingKey, false /* visible */);
+            setVisible(screen, mWorkSettingCategoryKey, false /* visible */);
         }
         mSettingObserver = new SettingObserver();
         initLockScreenNotificationPrefDisplay();
diff --git a/src/com/android/settings/notification/NotificationAccessConfirmationActivity.java b/src/com/android/settings/notification/NotificationAccessConfirmationActivity.java
index f9eabb9..16d255b 100644
--- a/src/com/android/settings/notification/NotificationAccessConfirmationActivity.java
+++ b/src/com/android/settings/notification/NotificationAccessConfirmationActivity.java
@@ -78,6 +78,9 @@
         AlertController
                 .create(this, this, getWindow())
                 .installContent(p);
+        // Consistent with the permission dialog
+        // Used instead of p.mCancelable as that is only honored for AlertDialog
+        getWindow().setCloseOnTouchOutside(false); 
     }
 
     @Override
@@ -119,6 +122,12 @@
     }
 
     @Override
+    public void onBackPressed() {
+        // Suppress finishing the activity on back button press,
+        // consistently with the permission dialog behavior
+    }
+
+    @Override
     public void cancel() {
         finish();
     }
diff --git a/src/com/android/settings/notification/NotificationAccessSettings.java b/src/com/android/settings/notification/NotificationAccessSettings.java
index 858482c..af89f49 100644
--- a/src/com/android/settings/notification/NotificationAccessSettings.java
+++ b/src/com/android/settings/notification/NotificationAccessSettings.java
@@ -16,7 +16,6 @@
 
 package com.android.settings.notification;
 
-import android.app.ActivityManager;
 import android.app.AlertDialog;
 import android.app.Dialog;
 import android.app.Fragment;
@@ -38,11 +37,6 @@
     private static final String TAG = NotificationAccessSettings.class.getSimpleName();
     private static final Config CONFIG = getNotificationListenerConfig();
 
-    @Override
-    public void onCreate(Bundle icicle) {
-        super.onCreate(icicle);
-    }
-
     private static Config getNotificationListenerConfig() {
         final Config c = new Config();
         c.tag = TAG;
@@ -100,6 +94,11 @@
         mNm.setNotificationListenerAccessGranted(service, true);
     }
 
+    @Override
+    protected int getPreferenceScreenResId() {
+        return R.xml.notification_access_settings;
+    }
+
     @VisibleForTesting
     void logSpecialPermissionChange(boolean enable, String packageName) {
         int logCategory = enable ? MetricsEvent.APP_SPECIAL_PERMISSION_NOTIVIEW_ALLOW
diff --git a/src/com/android/settings/notification/NotificationBackend.java b/src/com/android/settings/notification/NotificationBackend.java
index 82e3a9e..4de528e 100644
--- a/src/com/android/settings/notification/NotificationBackend.java
+++ b/src/com/android/settings/notification/NotificationBackend.java
@@ -136,8 +136,7 @@
         }
     }
 
-
-    public NotificationChannelGroup getGroup(String groupId, String pkg, int uid) {
+    public NotificationChannelGroup getGroup(String pkg, int uid, String groupId) {
         if (groupId == null) {
             return null;
         }
@@ -149,7 +148,19 @@
         }
     }
 
-    public ParceledListSlice<NotificationChannelGroup> getChannelGroups(String pkg, int uid) {
+    public NotificationChannelGroup getGroupWithChannels(String pkg, int uid, String groupId) {
+        if (groupId == null) {
+            return null;
+        }
+        try {
+            return sINM.getPopulatedNotificationChannelGroupForPackage(pkg, uid, groupId, true);
+        } catch (Exception e) {
+            Log.w(TAG, "Error calling NoMan", e);
+            return null;
+        }
+    }
+
+    public ParceledListSlice<NotificationChannelGroup> getGroups(String pkg, int uid) {
         try {
             return sINM.getNotificationChannelGroupsForPackage(pkg, uid, false);
         } catch (Exception e) {
@@ -166,6 +177,15 @@
         }
     }
 
+    public void updateChannelGroup(String pkg, int uid, NotificationChannelGroup group) {
+        try {
+            sINM.updateNotificationChannelGroupForPackage(pkg, uid, group);
+        } catch (Exception e) {
+            Log.w(TAG, "Error calling NoMan", e);
+        }
+    }
+
+
     public int getDeletedChannelCount(String pkg, int uid) {
         try {
             return sINM.getDeletedChannelCount(pkg, uid);
diff --git a/src/com/android/settings/notification/NotificationFooterPreference.java b/src/com/android/settings/notification/NotificationFooterPreference.java
new file mode 100644
index 0000000..d44ebee
--- /dev/null
+++ b/src/com/android/settings/notification/NotificationFooterPreference.java
@@ -0,0 +1,57 @@
+/*
+ * Copyright (C) 2017 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF 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 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.settingslib.R;
+
+/**
+ * FooterPreference that can have any key or ordering.
+ */
+public class NotificationFooterPreference extends Preference {
+
+    public NotificationFooterPreference(Context context, AttributeSet attrs) {
+        super(context, attrs, TypedArrayUtils.getAttr(
+                context, R.attr.footerPreferenceStyle, android.R.attr.preferenceStyle));
+        init();
+    }
+
+    public NotificationFooterPreference(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);
+        setSelectable(false);
+    }
+}
diff --git a/src/com/android/settings/notification/NotificationPreferenceController.java b/src/com/android/settings/notification/NotificationPreferenceController.java
new file mode 100644
index 0000000..797f30d
--- /dev/null
+++ b/src/com/android/settings/notification/NotificationPreferenceController.java
@@ -0,0 +1,188 @@
+/*
+ * Copyright (C) 2017 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF 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 android.app.NotificationManager.IMPORTANCE_NONE;
+
+import android.annotation.Nullable;
+import android.app.NotificationChannel;
+import android.app.NotificationChannelGroup;
+import android.app.NotificationManager;
+import android.content.Context;
+import android.content.pm.PackageManager;
+import android.os.UserManager;
+import android.support.annotation.VisibleForTesting;
+import android.support.v7.preference.Preference;
+import android.support.v7.preference.PreferenceGroup;
+import android.support.v7.preference.PreferenceScreen;
+import android.util.Log;
+
+import com.android.settings.wrapper.NotificationChannelGroupWrapper;
+import com.android.settingslib.RestrictedLockUtils;
+import com.android.settingslib.core.AbstractPreferenceController;
+
+import java.util.Objects;
+
+/**
+ * Parent class for preferences appearing on notification setting pages at the app,
+ * notification channel group, or notification channel level.
+ */
+public abstract class NotificationPreferenceController extends AbstractPreferenceController
+{
+    private static final String TAG = "ChannelPrefContr";
+    @Nullable protected NotificationChannel mChannel;
+    @Nullable protected NotificationChannelGroupWrapper mChannelGroup;
+    protected RestrictedLockUtils.EnforcedAdmin mAdmin;
+    protected NotificationBackend.AppRow mAppRow;
+    protected final NotificationManager mNm;
+    protected final NotificationBackend mBackend;
+    protected final Context mContext;
+    protected final UserManager mUm;
+    protected final PackageManager mPm;
+    protected Preference mPreference;
+
+    public NotificationPreferenceController(Context context, NotificationBackend backend) {
+        super(context);
+        mContext = context;
+        mNm = (NotificationManager) mContext.getSystemService(Context.NOTIFICATION_SERVICE);
+        mBackend = backend;
+        mUm = (UserManager) mContext.getSystemService(Context.USER_SERVICE);
+        mPm = mContext.getPackageManager();
+    }
+
+    /**
+     * Returns true if field's parent object is not blocked.
+     */
+    @Override
+    public boolean isAvailable() {
+        if (mAppRow == null) {
+            return false;
+        }
+        if (mAppRow.banned) {
+            return false;
+        }
+        if (mChannel != null) {
+            return mChannel.getImportance() != IMPORTANCE_NONE;
+        }
+        if (mChannelGroup != null && mChannelGroup.getGroup() == null) {
+            return !mChannelGroup.isBlocked();
+        }
+        return true;
+    }
+
+    /**
+     * Displays or removes preference in this controller.
+     */
+    @Override
+    public void displayPreference(PreferenceScreen screen) {
+        if (isAvailable()) {
+            final Preference preference = screen.findPreference(getPreferenceKey());
+            if (mPreference != null && preference == null) {
+                screen.addPreference(mPreference);
+            }
+            if (preference != null) {
+                mPreference = preference;
+            }
+            if (this instanceof Preference.OnPreferenceChangeListener) {
+                mPreference.setOnPreferenceChangeListener(
+                        (Preference.OnPreferenceChangeListener) this);
+            }
+        } else {
+            findAndRemovePreference(screen, getPreferenceKey());
+        }
+    }
+
+    // finds the preference recursively and removes it from its parent
+    private void findAndRemovePreference(PreferenceGroup prefGroup, String key) {
+        final int preferenceCount = prefGroup.getPreferenceCount();
+        for (int i = preferenceCount - 1; i >= 0; i--) {
+            final Preference preference = prefGroup.getPreference(i);
+            final String curKey = preference.getKey();
+
+            if (curKey != null && curKey.equals(key)) {
+                mPreference = preference;
+                prefGroup.removePreference(preference);
+            }
+
+            if (preference instanceof PreferenceGroup) {
+                findAndRemovePreference((PreferenceGroup) preference, key);
+            }
+        }
+    }
+
+    protected void onResume(NotificationBackend.AppRow appRow,
+            @Nullable NotificationChannel channel, @Nullable NotificationChannelGroupWrapper group,
+            RestrictedLockUtils.EnforcedAdmin admin) {
+        mAppRow = appRow;
+        mChannel = channel;
+        mChannelGroup = group;
+        mAdmin = admin;
+    }
+
+    protected boolean checkCanBeVisible(int minImportanceVisible) {
+        if (mChannel == null) {
+            Log.w(TAG, "No channel");
+            return false;
+        }
+
+        int importance = mChannel.getImportance();
+        if (importance == NotificationManager.IMPORTANCE_UNSPECIFIED) {
+            return true;
+        }
+        return importance >= minImportanceVisible;
+    }
+
+    protected void saveChannel() {
+        if (mChannel != null && mAppRow != null) {
+            mBackend.updateChannel(mAppRow.pkg, mAppRow.uid, mChannel);
+        }
+    }
+
+    protected boolean isChannelConfigurable() {
+        if (mChannel != null && mAppRow != null) {
+            return !Objects.equals(mChannel.getId(), mAppRow.lockedChannelId);
+        }
+        return false;
+    }
+
+    protected boolean isChannelBlockable() {
+        if (mChannel != null && mAppRow != null) {
+            if (!mAppRow.systemApp) {
+                return true;
+            }
+
+            return mChannel.isBlockableSystem()
+                    || mChannel.getImportance() == IMPORTANCE_NONE;
+        }
+        return false;
+    }
+
+    protected boolean isChannelGroupBlockable() {
+        if (mChannelGroup != null && mChannelGroup.getGroup() != null && mAppRow != null) {
+            if (!mAppRow.systemApp) {
+                return true;
+            }
+
+            return mChannelGroup.isBlocked();
+        }
+        return false;
+    }
+
+    protected boolean hasValidGroup() {
+        return mChannelGroup != null && mChannelGroup.getGroup() != null;
+    }
+}
diff --git a/src/com/android/settings/notification/NotificationSettingsBase.java b/src/com/android/settings/notification/NotificationSettingsBase.java
index 0d24afc..9afb618 100644
--- a/src/com/android/settings/notification/NotificationSettingsBase.java
+++ b/src/com/android/settings/notification/NotificationSettingsBase.java
@@ -24,15 +24,23 @@
 import com.android.internal.widget.LockPatternUtils;
 import com.android.settings.R;
 import com.android.settings.SettingsPreferenceFragment;
+import com.android.settings.Utils;
 import com.android.settings.applications.AppInfoBase;
 import com.android.settings.applications.LayoutPreference;
+import com.android.settings.dashboard.DashboardFragment;
+import com.android.settings.search.BaseSearchIndexProvider;
+import com.android.settings.search.Indexable;
+import com.android.settings.widget.MasterSwitchPreference;
 import com.android.settings.widget.SwitchBar;
+import com.android.settings.wrapper.NotificationChannelGroupWrapper;
 import com.android.settingslib.RestrictedLockUtils;
 import com.android.settingslib.RestrictedSwitchPreference;
+import com.android.settingslib.core.AbstractPreferenceController;
 import com.android.settingslib.widget.FooterPreference;
 
 import android.app.Notification;
 import android.app.NotificationChannel;
+import android.app.NotificationChannelGroup;
 import android.app.NotificationManager;
 import android.app.admin.DevicePolicyManager;
 import android.content.BroadcastReceiver;
@@ -50,11 +58,12 @@
 import android.os.Bundle;
 import android.os.UserHandle;
 import android.os.UserManager;
+import android.provider.SearchIndexableResource;
 import android.provider.Settings;
 import android.service.notification.NotificationListenerService;
-import android.support.v7.preference.DropDownPreference;
 import android.support.v7.preference.Preference;
 import android.support.v7.preference.PreferenceGroup;
+import android.support.v7.preference.PreferenceScreen;
 import android.text.TextUtils;
 import android.util.ArrayMap;
 import android.util.Log;
@@ -63,67 +72,33 @@
 import static com.android.settingslib.RestrictedLockUtils.EnforcedAdmin;
 
 import java.util.ArrayList;
+import java.util.Comparator;
 import java.util.List;
 
-abstract public class NotificationSettingsBase extends SettingsPreferenceFragment {
+abstract public class NotificationSettingsBase extends DashboardFragment {
     private static final String TAG = "NotifiSettingsBase";
     private static final boolean DEBUG = Log.isLoggable(TAG, Log.DEBUG);
 
-    private static final Intent APP_NOTIFICATION_PREFS_CATEGORY_INTENT
-            = new Intent(Intent.ACTION_MAIN)
-            .addCategory(Notification.INTENT_CATEGORY_NOTIFICATION_PREFERENCES);
-
-    protected static final int ORDER_FIRST = -500;
-    protected static final int ORDER_LAST = 1000;
-
-    protected static final String KEY_APP_LINK = "app_link";
-    protected static final String KEY_HEADER = "header";
-    protected static final String KEY_BLOCK = "block";
-    protected static final String KEY_BADGE = "badge";
-    protected static final String KEY_BYPASS_DND = "bypass_dnd";
-    protected static final String KEY_VISIBILITY_OVERRIDE = "visibility_override";
-    protected static final String KEY_BLOCKED_DESC = "block_desc";
-    protected static final String KEY_ALLOW_SOUND = "allow_sound";
-
     protected PackageManager mPm;
-    protected UserManager mUm;
     protected NotificationBackend mBackend = new NotificationBackend();
-    protected LockPatternUtils mLockPatternUtils;
     protected NotificationManager mNm;
     protected Context mContext;
-    protected boolean mCreated;
+
     protected int mUid;
     protected int mUserId;
     protected String mPkg;
     protected PackageInfo mPkgInfo;
-    protected RestrictedSwitchPreference mBadge;
-    protected RestrictedSwitchPreference mPriority;
-    protected RestrictedDropDownPreference mVisibilityOverride;
-    protected RestrictedSwitchPreference mImportanceToggle;
-    protected LayoutPreference mBlockBar;
-    protected SwitchBar mSwitchBar;
-    protected FooterPreference mBlockedDesc;
-    protected Preference mAppLink;
-
     protected EnforcedAdmin mSuspendedAppsAdmin;
-    protected boolean mDndVisualEffectsSuppressed;
-
+    protected NotificationChannelGroupWrapper mChannelGroup;
     protected NotificationChannel mChannel;
     protected NotificationBackend.AppRow mAppRow;
-    protected boolean mShowLegacyChannelConfig = false;
 
+    protected boolean mShowLegacyChannelConfig = false;
     protected boolean mListeningToPackageRemove;
 
-    @Override
-    public void onActivityCreated(Bundle savedInstanceState) {
-        super.onActivityCreated(savedInstanceState);
-        if (DEBUG) Log.d(TAG, "onActivityCreated mCreated=" + mCreated);
-        if (mCreated) {
-            Log.w(TAG, "onActivityCreated: ignoring duplicate call");
-            return;
-        }
-        mCreated = true;
-    }
+    protected List<NotificationPreferenceController> mControllers = new ArrayList<>();
+    protected List<Preference> mDynamicPreferences = new ArrayList<>();
+    protected ImportanceListener mImportanceListener = new ImportanceListener();
 
     @Override
     public void onCreate(Bundle savedInstanceState) {
@@ -139,7 +114,6 @@
         }
 
         mPm = getPackageManager();
-        mUm = (UserManager) mContext.getSystemService(Context.USER_SERVICE);
         mNm = NotificationManager.from(mContext);
 
         mPkg = args != null && args.containsKey(AppInfoBase.ARG_PACKAGE_NAME)
@@ -183,30 +157,41 @@
             return;
         }
         mAppRow = mBackend.loadAppRow(mContext, mPm, mPkgInfo);
+        if (mAppRow == null) {
+            Log.w(TAG, "Can't load package");
+            finish();
+            return;
+        }
+        collectConfigActivities();
         Bundle args = getArguments();
         mChannel = (args != null && args.containsKey(Settings.EXTRA_CHANNEL_ID)) ?
                 mBackend.getChannel(mPkg, mUid, args.getString(Settings.EXTRA_CHANNEL_ID)) : null;
 
-        mSuspendedAppsAdmin = RestrictedLockUtils.checkIfApplicationIsSuspended(
-                mContext, mPkg, mUserId);
-        NotificationManager.Policy policy = mNm.getNotificationPolicy();
-        mDndVisualEffectsSuppressed = policy == null ? false : policy.suppressedVisualEffects != 0;
+        NotificationChannelGroup group =
+                (args != null && args.containsKey(Settings.EXTRA_CHANNEL_GROUP_ID))
+                        ? mBackend.getGroupWithChannels(mPkg, mUid,
+                        args.getString(Settings.EXTRA_CHANNEL_GROUP_ID))
+                        : null;
+        if (group != null) {
+            mChannelGroup = new NotificationChannelGroupWrapper(group);
+        }
 
         mSuspendedAppsAdmin = RestrictedLockUtils.checkIfApplicationIsSuspended(
                 mContext, mPkg, mUserId);
-    }
 
-    protected void setVisible(Preference p, boolean visible) {
-        setVisible(getPreferenceScreen(), p, visible);
-    }
+        mShowLegacyChannelConfig = mBackend.onlyHasDefaultChannel(mAppRow.pkg, mAppRow.uid)
+                || (mChannel != null
+                && NotificationChannel.DEFAULT_CHANNEL_ID.equals(mChannel.getId()));
 
-    protected void setVisible(PreferenceGroup parent, Preference p, boolean visible) {
-        final boolean isVisible = parent.findPreference(p.getKey()) != null;
-        if (isVisible == visible) return;
-        if (visible) {
-            parent.addPreference(p);
-        } else {
-            parent.removePreference(p);
+        if (mShowLegacyChannelConfig) {
+            mChannel = mBackend.getChannel(
+                    mAppRow.pkg, mAppRow.uid, NotificationChannel.DEFAULT_CHANNEL_ID);
+        }
+        if (mChannel != null && !TextUtils.isEmpty(mChannel.getGroup())) {
+            group = mBackend.getGroup(mPkg, mUid, mChannel.getGroup());
+            if (group != null) {
+                mChannelGroup = new NotificationChannelGroupWrapper(group);
+            }
         }
     }
 
@@ -215,45 +200,38 @@
         getActivity().finish();
     }
 
-    private List<ResolveInfo> queryNotificationConfigActivities() {
-        if (DEBUG) Log.d(TAG, "APP_NOTIFICATION_PREFS_CATEGORY_INTENT is "
-                + APP_NOTIFICATION_PREFS_CATEGORY_INTENT);
+    protected void collectConfigActivities() {
+        Intent intent = new Intent(Intent.ACTION_MAIN)
+                .addCategory(Notification.INTENT_CATEGORY_NOTIFICATION_PREFERENCES)
+                .setPackage(mAppRow.pkg);
         final List<ResolveInfo> resolveInfos = mPm.queryIntentActivities(
-                APP_NOTIFICATION_PREFS_CATEGORY_INTENT,
+                intent,
                 0 //PackageManager.MATCH_DEFAULT_ONLY
         );
-        return resolveInfos;
-    }
-
-    protected void collectConfigActivities(ArrayMap<String, NotificationBackend.AppRow> rows) {
-        final List<ResolveInfo> resolveInfos = queryNotificationConfigActivities();
-        applyConfigActivities(rows, resolveInfos);
-    }
-
-    private void applyConfigActivities(ArrayMap<String, NotificationBackend.AppRow> rows,
-            List<ResolveInfo> resolveInfos) {
-        if (DEBUG) Log.d(TAG, "Found " + resolveInfos.size() + " preference activities"
-                + (resolveInfos.size() == 0 ? " ;_;" : ""));
+        if (DEBUG) {
+            Log.d(TAG, "Found " + resolveInfos.size() + " preference activities"
+                    + (resolveInfos.size() == 0 ? " ;_;" : ""));
+        }
         for (ResolveInfo ri : resolveInfos) {
             final ActivityInfo activityInfo = ri.activityInfo;
             final ApplicationInfo appInfo = activityInfo.applicationInfo;
-            final NotificationBackend.AppRow row = rows.get(appInfo.packageName);
-            if (row == null) {
-                if (DEBUG) Log.v(TAG, "Ignoring notification preference activity ("
-                        + activityInfo.name + ") for unknown package "
-                        + activityInfo.packageName);
+            if (mAppRow.settingsIntent != null) {
+                if (DEBUG) {
+                    Log.d(TAG, "Ignoring duplicate notification preference activity ("
+                            + activityInfo.name + ") for package "
+                            + activityInfo.packageName);
+                }
                 continue;
             }
-            if (row.settingsIntent != null) {
-                if (DEBUG) Log.v(TAG, "Ignoring duplicate notification preference activity ("
-                        + activityInfo.name + ") for package "
-                        + activityInfo.packageName);
-                continue;
-            }
-            row.settingsIntent = new Intent(APP_NOTIFICATION_PREFS_CATEGORY_INTENT)
+            mAppRow.settingsIntent = intent
+                    .setPackage(null)
                     .setClassName(activityInfo.packageName, activityInfo.name);
             if (mChannel != null) {
-                row.settingsIntent.putExtra(Notification.EXTRA_CHANNEL_ID, mChannel.getId());
+                mAppRow.settingsIntent.putExtra(Notification.EXTRA_CHANNEL_ID, mChannel.getId());
+            }
+            if (mChannelGroup != null) {
+                mAppRow.settingsIntent.putExtra(
+                        Notification.EXTRA_CHANNEL_GROUP_ID, mChannelGroup.getGroup().getId());
             }
         }
     }
@@ -279,199 +257,89 @@
         return null;
     }
 
-    protected void addAppLinkPref() {
-        if (mAppRow.settingsIntent != null && mAppLink == null) {
-            addPreferencesFromResource(R.xml.inapp_notification_settings);
-            mAppLink = (Preference) findPreference(KEY_APP_LINK);
-            mAppLink.setIntent(mAppRow.settingsIntent);
-        }
-    }
+    protected Preference populateSingleChannelPrefs(PreferenceGroup parent,
+            final NotificationChannel channel, String summary) {
+        MasterSwitchPreference channelPref = new MasterSwitchPreference(
+                getPrefContext());
+        channelPref.setSwitchEnabled(mSuspendedAppsAdmin == null
+                && isChannelBlockable(channel)
+                && isChannelConfigurable(channel));
+        channelPref.setKey(channel.getId());
+        channelPref.setTitle(channel.getName());
+        channelPref.setChecked(channel.getImportance() != IMPORTANCE_NONE);
+        channelPref.setSummary(summary);
+        Bundle channelArgs = new Bundle();
+        channelArgs.putInt(AppInfoBase.ARG_PACKAGE_UID, mUid);
+        channelArgs.putString(AppInfoBase.ARG_PACKAGE_NAME, mPkg);
+        channelArgs.putString(Settings.EXTRA_CHANNEL_ID, channel.getId());
+        Intent channelIntent = Utils.onBuildStartFragmentIntent(getActivity(),
+                ChannelNotificationSettings.class.getName(),
+                channelArgs, null, R.string.notification_channel_title, null, false,
+                getMetricsCategory());
+        channelPref.setIntent(channelIntent);
 
-    protected void populateDefaultChannelPrefs() {
-        if (mPkgInfo != null && mChannel != null) {
-            addPreferencesFromResource(R.xml.legacy_channel_notification_settings);
-            setupPriorityPref(mChannel.canBypassDnd());
-            setupVisOverridePref(mChannel.getLockscreenVisibility());
-            setupImportanceToggle();
-            setupBadge();
-        }
-        mSwitchBar.setChecked(!mAppRow.banned
-                && mChannel.getImportance() != NotificationManager.IMPORTANCE_NONE);
-    }
-
-    abstract void setupBadge();
-
-    abstract void updateDependents(boolean banned);
-
-    // 'allow sound'
-    private void setupImportanceToggle() {
-        mImportanceToggle = (RestrictedSwitchPreference) findPreference(KEY_ALLOW_SOUND);
-        mImportanceToggle.setDisabledByAdmin(mSuspendedAppsAdmin);
-        mImportanceToggle.setEnabled(isChannelConfigurable(mChannel)
-                && !mImportanceToggle.isDisabledByAdmin());
-        mImportanceToggle.setChecked(mChannel.getImportance() >= IMPORTANCE_DEFAULT
-                || mChannel.getImportance() == IMPORTANCE_UNSPECIFIED);
-        mImportanceToggle.setOnPreferenceChangeListener(
+        channelPref.setOnPreferenceChangeListener(
                 new Preference.OnPreferenceChangeListener() {
                     @Override
-                    public boolean onPreferenceChange(Preference preference, Object newValue) {
-                        final int importance =
-                                ((Boolean) newValue ? IMPORTANCE_UNSPECIFIED : IMPORTANCE_LOW);
-                        mChannel.setImportance(importance);
-                        mChannel.lockFields(NotificationChannel.USER_LOCKED_IMPORTANCE);
-                        mBackend.updateChannel(mPkg, mUid, mChannel);
-                        updateDependents(mChannel.getImportance() == IMPORTANCE_NONE);
+                    public boolean onPreferenceChange(Preference preference,
+                            Object o) {
+                        boolean value = (Boolean) o;
+                        int importance = value ? IMPORTANCE_LOW : IMPORTANCE_NONE;
+                        channel.setImportance(importance);
+                        channel.lockFields(
+                                NotificationChannel.USER_LOCKED_IMPORTANCE);
+                        channelPref.setSummary(summary);
+                        mBackend.updateChannel(mPkg, mUid, channel);
+
                         return true;
                     }
                 });
-    }
-
-    protected void setupPriorityPref(boolean priority) {
-        mPriority = (RestrictedSwitchPreference) findPreference(KEY_BYPASS_DND);
-        mPriority.setDisabledByAdmin(mSuspendedAppsAdmin);
-        mPriority.setEnabled(isChannelConfigurable(mChannel) && !mPriority.isDisabledByAdmin());
-        mPriority.setChecked(priority);
-        mPriority.setOnPreferenceChangeListener(new Preference.OnPreferenceChangeListener() {
-            @Override
-            public boolean onPreferenceChange(Preference preference, Object newValue) {
-                final boolean bypassZenMode = (Boolean) newValue;
-                mChannel.setBypassDnd(bypassZenMode);
-                mChannel.lockFields(NotificationChannel.USER_LOCKED_PRIORITY);
-                mBackend.updateChannel(mPkg, mUid, mChannel);
-                return true;
-            }
-        });
-    }
-
-    protected void setupVisOverridePref(int sensitive) {
-        mVisibilityOverride =
-                (RestrictedDropDownPreference) findPreference(KEY_VISIBILITY_OVERRIDE);
-        ArrayList<CharSequence> entries = new ArrayList<>();
-        ArrayList<CharSequence> values = new ArrayList<>();
-
-        mVisibilityOverride.clearRestrictedItems();
-        if (getLockscreenNotificationsEnabled() && getLockscreenAllowPrivateNotifications()) {
-            final String summaryShowEntry =
-                    getString(R.string.lock_screen_notifications_summary_show);
-            final String summaryShowEntryValue =
-                    Integer.toString(NotificationManager.VISIBILITY_NO_OVERRIDE);
-            entries.add(summaryShowEntry);
-            values.add(summaryShowEntryValue);
-            setRestrictedIfNotificationFeaturesDisabled(summaryShowEntry, summaryShowEntryValue,
-                    DevicePolicyManager.KEYGUARD_DISABLE_SECURE_NOTIFICATIONS
-                            | DevicePolicyManager.KEYGUARD_DISABLE_UNREDACTED_NOTIFICATIONS);
-        }
-
-        final String summaryHideEntry = getString(R.string.lock_screen_notifications_summary_hide);
-        final String summaryHideEntryValue = Integer.toString(Notification.VISIBILITY_PRIVATE);
-        entries.add(summaryHideEntry);
-        values.add(summaryHideEntryValue);
-        setRestrictedIfNotificationFeaturesDisabled(summaryHideEntry, summaryHideEntryValue,
-                DevicePolicyManager.KEYGUARD_DISABLE_SECURE_NOTIFICATIONS);
-        entries.add(getString(R.string.lock_screen_notifications_summary_disable));
-        values.add(Integer.toString(Notification.VISIBILITY_SECRET));
-        mVisibilityOverride.setEntries(entries.toArray(new CharSequence[entries.size()]));
-        mVisibilityOverride.setEntryValues(values.toArray(new CharSequence[values.size()]));
-
-        if (sensitive == NotificationListenerService.Ranking.VISIBILITY_NO_OVERRIDE) {
-            mVisibilityOverride.setValue(Integer.toString(getGlobalVisibility()));
-        } else {
-            mVisibilityOverride.setValue(Integer.toString(sensitive));
-        }
-        mVisibilityOverride.setSummary("%s");
-
-        mVisibilityOverride.setOnPreferenceChangeListener(
-                new Preference.OnPreferenceChangeListener() {
-                    @Override
-                    public boolean onPreferenceChange(Preference preference, Object newValue) {
-                        int sensitive = Integer.parseInt((String) newValue);
-                        if (sensitive == getGlobalVisibility()) {
-                            sensitive = NotificationListenerService.Ranking.VISIBILITY_NO_OVERRIDE;
-                        }
-                        mChannel.setLockscreenVisibility(sensitive);
-                        mChannel.lockFields(NotificationChannel.USER_LOCKED_VISIBILITY);
-                        mBackend.updateChannel(mPkg, mUid, mChannel);
-                        return true;
-                    }
-                });
-        mVisibilityOverride.setDisabledByAdmin(mSuspendedAppsAdmin);
-    }
-
-    protected void setupBlockDesc(int summaryResId) {
-        mBlockedDesc = (FooterPreference) getPreferenceScreen().findPreference(
-                KEY_BLOCKED_DESC);
-        mBlockedDesc = new FooterPreference(getPrefContext());
-        mBlockedDesc.setSelectable(false);
-        mBlockedDesc.setTitle(summaryResId);
-        mBlockedDesc.setEnabled(false);
-        mBlockedDesc.setOrder(50);
-        getPreferenceScreen().addPreference(mBlockedDesc);
-    }
-
-    protected boolean checkCanBeVisible(int minImportanceVisible) {
-        int importance = mChannel.getImportance();
-        if (importance == NotificationManager.IMPORTANCE_UNSPECIFIED) {
-            return true;
-        }
-        return importance >= minImportanceVisible;
-    }
-
-    private void setRestrictedIfNotificationFeaturesDisabled(CharSequence entry,
-            CharSequence entryValue, int keyguardNotificationFeatures) {
-        RestrictedLockUtils.EnforcedAdmin admin =
-                RestrictedLockUtils.checkIfKeyguardFeaturesDisabled(
-                        mContext, keyguardNotificationFeatures, mUserId);
-        if (admin != null) {
-            RestrictedDropDownPreference.RestrictedItem item =
-                    new RestrictedDropDownPreference.RestrictedItem(entry, entryValue, admin);
-            mVisibilityOverride.addRestrictedItem(item);
-        }
-    }
-
-    private int getGlobalVisibility() {
-        int globalVis = NotificationListenerService.Ranking.VISIBILITY_NO_OVERRIDE;
-        if (!getLockscreenNotificationsEnabled()) {
-            globalVis = Notification.VISIBILITY_SECRET;
-        } else if (!getLockscreenAllowPrivateNotifications()) {
-            globalVis = Notification.VISIBILITY_PRIVATE;
-        }
-        return globalVis;
-    }
-
-    private boolean getLockscreenNotificationsEnabled() {
-        return Settings.Secure.getInt(getContentResolver(),
-                Settings.Secure.LOCK_SCREEN_SHOW_NOTIFICATIONS, 0) != 0;
-    }
-
-    private boolean getLockscreenAllowPrivateNotifications() {
-        return Settings.Secure.getInt(getContentResolver(),
-                Settings.Secure.LOCK_SCREEN_ALLOW_PRIVATE_NOTIFICATIONS, 0) != 0;
-    }
-
-    protected boolean isLockScreenSecure() {
-        if (mLockPatternUtils == null) {
-            mLockPatternUtils = new LockPatternUtils(getActivity());
-        }
-        boolean lockscreenSecure = mLockPatternUtils.isSecure(UserHandle.myUserId());
-        UserInfo parentUser = mUm.getProfileParent(UserHandle.myUserId());
-        if (parentUser != null){
-            lockscreenSecure |= mLockPatternUtils.isSecure(parentUser.id);
-        }
-
-        return lockscreenSecure;
+        parent.addPreference(channelPref);
+        return channelPref;
     }
 
     protected boolean isChannelConfigurable(NotificationChannel channel) {
-        return !channel.getId().equals(mAppRow.lockedChannelId);
+        if (channel != null && mAppRow != null) {
+            return !channel.getId().equals(mAppRow.lockedChannelId);
+        }
+        return false;
     }
 
-    protected boolean isChannelBlockable(boolean systemApp, NotificationChannel channel) {
-        if (!mAppRow.systemApp) {
-            return true;
-        }
+    protected boolean isChannelBlockable(NotificationChannel channel) {
+        if (channel != null && mAppRow != null) {
+            if (!mAppRow.systemApp) {
+                return true;
+            }
 
-        return channel.isBlockableSystem()
-                || channel.getImportance() == NotificationManager.IMPORTANCE_NONE;
+            return channel.isBlockableSystem()
+                    || channel.getImportance() == NotificationManager.IMPORTANCE_NONE;
+        }
+        return false;
+    }
+
+    protected boolean isChannelGroupBlockable(NotificationChannelGroup group) {
+        if (group != null && mAppRow != null) {
+            if (!mAppRow.systemApp) {
+                return true;
+            }
+
+            return group.isBlocked();
+        }
+        return false;
+    }
+
+    protected void setVisible(Preference p, boolean visible) {
+        setVisible(getPreferenceScreen(), p, visible);
+    }
+
+    protected void setVisible(PreferenceGroup parent, Preference p, boolean visible) {
+        final boolean isVisible = parent.findPreference(p.getKey()) != null;
+        if (isVisible == visible) return;
+        if (visible) {
+            parent.addPreference(p);
+        } else {
+            parent.removePreference(p);
+        }
     }
 
     protected void startListeningToPackageRemove() {
@@ -501,14 +369,44 @@
         public void onReceive(Context context, Intent intent) {
             String packageName = intent.getData().getSchemeSpecificPart();
             if (mPkgInfo == null || TextUtils.equals(mPkgInfo.packageName, packageName)) {
-                if (DEBUG) Log.d(TAG, "Package (" + packageName + ") removed. Removing"
-                        + "NotificationSettingsBase.");
+                if (DEBUG) {
+                    Log.d(TAG, "Package (" + packageName + ") removed. Removing"
+                            + "NotificationSettingsBase.");
+                }
                 onPackageRemoved();
             }
         }
     };
 
-    boolean hasValidSound(NotificationChannel channel) {
-        return channel.getSound() != null && !Uri.EMPTY.equals(channel.getSound());
+    protected Comparator<NotificationChannel> mChannelComparator =
+            (left, right) -> {
+                if (left.isDeleted() != right.isDeleted()) {
+                    return Boolean.compare(left.isDeleted(), right.isDeleted());
+                }
+                return left.getId().compareTo(right.getId());
+            };
+
+    protected class ImportanceListener {
+        protected void onImportanceChanged() {
+            final PreferenceScreen screen = getPreferenceScreen();
+            for (NotificationPreferenceController controller : mControllers) {
+                controller.displayPreference(screen);
+            }
+            updatePreferenceStates();
+
+            boolean hideDynamicFields = false;
+            if (mAppRow == null || mAppRow.banned) {
+                hideDynamicFields = true;
+            } else {
+                if (mChannel != null) {
+                    hideDynamicFields = mChannel.getImportance() == IMPORTANCE_NONE;
+                } else if (mChannelGroup != null) {
+                    hideDynamicFields = mChannelGroup.isBlocked();
+                }
+            }
+            for (Preference preference : mDynamicPreferences) {
+                setVisible(getPreferenceScreen(), preference, !hideDynamicFields);
+            }
+        }
     }
 }
diff --git a/src/com/android/settings/notification/NotificationsOffPreferenceController.java b/src/com/android/settings/notification/NotificationsOffPreferenceController.java
new file mode 100644
index 0000000..74591cf
--- /dev/null
+++ b/src/com/android/settings/notification/NotificationsOffPreferenceController.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.notification;
+
+import android.content.Context;
+import android.support.v7.preference.Preference;
+
+import com.android.settings.R;
+import com.android.settings.core.PreferenceControllerMixin;
+import com.android.settingslib.widget.FooterPreference;
+
+public class NotificationsOffPreferenceController extends NotificationPreferenceController
+        implements PreferenceControllerMixin {
+
+    private static final String KEY_BLOCKED_DESC = "block_desc";
+
+    public NotificationsOffPreferenceController(Context context) {
+        super(context, null);
+    }
+
+    @Override
+    public String getPreferenceKey() {
+        return KEY_BLOCKED_DESC;
+    }
+
+    @Override
+    public boolean isAvailable() {
+        if (mAppRow == null) {
+            return false;
+        }
+        // Available only when other controllers are unavailable - this UI replaces the UI that
+        // would give more detailed notification controls.
+        return !super.isAvailable();
+    }
+
+    public void updateState(Preference preference) {
+        if (mAppRow != null) {
+            if (mChannel != null) {
+                preference.setTitle(R.string.channel_notifications_off_desc);
+            } else if (mChannelGroup != null && mChannelGroup.getGroup() == null) {
+                preference.setTitle(R.string.channel_group_notifications_off_desc);
+            } else {
+                preference.setTitle(R.string.app_notifications_off_desc);
+            }
+        }
+        preference.setEnabled(false);
+        preference.setSelectable(false);
+    }
+}
diff --git a/src/com/android/settings/notification/SoundPreferenceController.java b/src/com/android/settings/notification/SoundPreferenceController.java
new file mode 100644
index 0000000..e4414b6
--- /dev/null
+++ b/src/com/android/settings/notification/SoundPreferenceController.java
@@ -0,0 +1,119 @@
+/*
+ * Copyright (C) 2017 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF 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 android.app.NotificationChannel;
+import android.app.NotificationManager;
+import android.content.Context;
+import android.content.Intent;
+import android.net.Uri;
+import android.preference.PreferenceManager;
+import android.support.v7.preference.Preference;
+import android.support.v7.preference.PreferenceScreen;
+
+import com.android.settings.SettingsPreferenceFragment;
+import com.android.settings.core.PreferenceControllerMixin;
+
+public class SoundPreferenceController extends NotificationPreferenceController
+        implements PreferenceControllerMixin, Preference.OnPreferenceChangeListener,
+        PreferenceManager.OnActivityResultListener {
+
+    private static final String KEY_SOUND = "ringtone";
+    private final SettingsPreferenceFragment mFragment;
+    private final NotificationSettingsBase.ImportanceListener mListener;
+    private NotificationSoundPreference mPreference;
+    protected static final int CODE = 200;
+
+    public SoundPreferenceController(Context context, SettingsPreferenceFragment hostFragment,
+            NotificationSettingsBase.ImportanceListener importanceListener,
+            NotificationBackend backend) {
+        super(context, backend);
+        mFragment = hostFragment;
+        mListener = importanceListener;
+    }
+
+    @Override
+    public String getPreferenceKey() {
+        return KEY_SOUND;
+    }
+
+    @Override
+    public boolean isAvailable() {
+        if (!super.isAvailable()) {
+            return false;
+        }
+        if (mChannel == null) {
+            return false;
+        }
+        return checkCanBeVisible(NotificationManager.IMPORTANCE_DEFAULT)
+                && !NotificationChannel.DEFAULT_CHANNEL_ID.equals(mChannel.getId());
+    }
+
+    @Override
+    public void displayPreference(PreferenceScreen screen) {
+        super.displayPreference(screen);
+
+        mPreference = (NotificationSoundPreference) screen.findPreference(getPreferenceKey());
+    }
+
+    public void updateState(Preference preference) {
+        if (mAppRow!= null && mChannel != null) {
+            NotificationSoundPreference pref = (NotificationSoundPreference) preference;
+            pref.setEnabled(mAdmin == null && isChannelConfigurable());
+            pref.setRingtone(mChannel.getSound());
+        }
+    }
+
+    @Override
+    public boolean onPreferenceChange(Preference preference, Object newValue) {
+        if (mChannel != null) {
+            mChannel.setSound((Uri) newValue, mChannel.getAudioAttributes());
+            saveChannel();
+        }
+        return true;
+    }
+
+    @Override
+    public boolean handlePreferenceTreeClick(Preference preference) {
+        if (KEY_SOUND.equals(preference.getKey()) && mFragment != null) {
+            NotificationSoundPreference pref = (NotificationSoundPreference) preference;
+            pref.onPrepareRingtonePickerIntent(pref.getIntent());
+            mFragment.startActivityForResult(preference.getIntent(), CODE);
+            return true;
+        }
+        return false;
+    }
+
+    @Override
+    public boolean onActivityResult(int requestCode, int resultCode, Intent data) {
+        if (CODE == requestCode) {
+            if (mPreference != null) {
+                mPreference.onActivityResult(requestCode, resultCode, data);
+            }
+            // the importance hasn't changed, but the importance description might as a result of
+            // user's selection.
+            mListener.onImportanceChanged();
+            return true;
+        }
+        return false;
+    }
+
+    protected static boolean hasValidSound(NotificationChannel channel) {
+        return channel != null
+                && channel.getSound() != null && !Uri.EMPTY.equals(channel.getSound());
+    }
+}
diff --git a/src/com/android/settings/notification/SoundSettings.java b/src/com/android/settings/notification/SoundSettings.java
index ad6da10..6e998f6 100644
--- a/src/com/android/settings/notification/SoundSettings.java
+++ b/src/com/android/settings/notification/SoundSettings.java
@@ -55,12 +55,6 @@
     private RingtonePreference mRequestPreference;
 
     @Override
-    public void onAttach(Context context) {
-        super.onAttach(context);
-        mProgressiveDisclosureMixin.setTileLimit(1);
-    }
-
-    @Override
     public int getMetricsCategory() {
         return MetricsEvent.SOUND;
     }
@@ -77,7 +71,7 @@
     }
 
     @Override
-    protected int getHelpResource() {
+    public int getHelpResource() {
         return R.string.help_url_sound;
     }
 
@@ -243,7 +237,6 @@
                     List<String> keys = super.getNonIndexableKeys(context);
                     // Duplicate results
                     keys.add((new ZenModePreferenceController(context)).getPreferenceKey());
-                    keys.add(ZenModeSettings.KEY_VISUAL_SETTINGS);
                     keys.add(KEY_CELL_BROADCAST_SETTINGS);
                     return keys;
                 }
diff --git a/src/com/android/settings/notification/VibrationPreferenceController.java b/src/com/android/settings/notification/VibrationPreferenceController.java
new file mode 100644
index 0000000..f9b786d
--- /dev/null
+++ b/src/com/android/settings/notification/VibrationPreferenceController.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.notification;
+
+import android.app.NotificationChannel;
+import android.app.NotificationManager;
+import android.content.Context;
+import android.os.Vibrator;
+import android.support.v7.preference.Preference;
+
+import com.android.settings.core.PreferenceControllerMixin;
+import com.android.settingslib.RestrictedSwitchPreference;
+
+public class VibrationPreferenceController extends NotificationPreferenceController
+        implements PreferenceControllerMixin, Preference.OnPreferenceChangeListener {
+
+    private static final String KEY_VIBRATE = "vibrate";
+    private final Vibrator mVibrator;
+
+    public VibrationPreferenceController(Context context, NotificationBackend backend) {
+        super(context, backend);
+        mVibrator = (Vibrator) context.getSystemService(Context.VIBRATOR_SERVICE);
+    }
+
+    @Override
+    public String getPreferenceKey() {
+        return KEY_VIBRATE;
+    }
+
+    @Override
+    public boolean isAvailable() {
+        if (!super.isAvailable() || mChannel == null) {
+            return false;
+       }
+        return checkCanBeVisible(NotificationManager.IMPORTANCE_DEFAULT)
+                && !NotificationChannel.DEFAULT_CHANNEL_ID.equals(mChannel.getId())
+                && mVibrator != null
+                && mVibrator.hasVibrator();
+    }
+
+    public void updateState(Preference preference) {
+        if (mChannel != null) {
+            RestrictedSwitchPreference pref = (RestrictedSwitchPreference) preference;
+            pref.setDisabledByAdmin(mAdmin);
+            pref.setEnabled(!pref.isDisabledByAdmin() && isChannelConfigurable());
+            pref.setChecked(mChannel.shouldVibrate());
+        }
+    }
+
+    @Override
+    public boolean onPreferenceChange(Preference preference, Object newValue) {
+        if (mChannel != null) {
+            final boolean vibrate = (Boolean) newValue;
+            mChannel.enableVibration(vibrate);
+            saveChannel();
+        }
+        return true;
+    }
+}
diff --git a/src/com/android/settings/notification/VisibilityPreferenceController.java b/src/com/android/settings/notification/VisibilityPreferenceController.java
new file mode 100644
index 0000000..76caac0
--- /dev/null
+++ b/src/com/android/settings/notification/VisibilityPreferenceController.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.notification;
+
+import android.app.Notification;
+import android.app.NotificationChannel;
+import android.app.NotificationManager;
+import android.app.admin.DevicePolicyManager;
+import android.content.Context;
+import android.content.pm.UserInfo;
+import android.os.UserHandle;
+import android.provider.Settings;
+import android.service.notification.NotificationListenerService;
+import android.support.v7.preference.Preference;
+
+import com.android.internal.widget.LockPatternUtils;
+import com.android.settings.R;
+import com.android.settings.core.PreferenceControllerMixin;
+import com.android.settingslib.RestrictedLockUtils;
+
+import java.util.ArrayList;
+
+public class VisibilityPreferenceController extends NotificationPreferenceController
+        implements PreferenceControllerMixin, Preference.OnPreferenceChangeListener {
+
+    private static final String TAG = "ChannelVisPrefContr";
+    private static final String KEY_VISIBILITY_OVERRIDE = "visibility_override";
+    private LockPatternUtils mLockPatternUtils;
+
+    public VisibilityPreferenceController(Context context, LockPatternUtils utils,
+            NotificationBackend backend) {
+        super(context, backend);
+        mLockPatternUtils = utils;
+    }
+
+    @Override
+    public String getPreferenceKey() {
+        return KEY_VISIBILITY_OVERRIDE;
+    }
+
+    @Override
+    public boolean isAvailable() {
+        if (!super.isAvailable()) {
+            return false;
+        }
+        if (mChannel == null || mAppRow.banned) {
+            return false;
+        }
+        return checkCanBeVisible(NotificationManager.IMPORTANCE_LOW) && isLockScreenSecure();
+    }
+
+    public void updateState(Preference preference) {
+        if (mChannel != null && mAppRow != null) {
+            RestrictedDropDownPreference pref = (RestrictedDropDownPreference) preference;
+            ArrayList<CharSequence> entries = new ArrayList<>();
+            ArrayList<CharSequence> values = new ArrayList<>();
+
+            pref.clearRestrictedItems();
+            if (getLockscreenNotificationsEnabled() && getLockscreenAllowPrivateNotifications()) {
+                final String summaryShowEntry =
+                        mContext.getString(R.string.lock_screen_notifications_summary_show);
+                final String summaryShowEntryValue =
+                        Integer.toString(NotificationManager.VISIBILITY_NO_OVERRIDE);
+                entries.add(summaryShowEntry);
+                values.add(summaryShowEntryValue);
+                setRestrictedIfNotificationFeaturesDisabled(pref, summaryShowEntry,
+                        summaryShowEntryValue,
+                        DevicePolicyManager.KEYGUARD_DISABLE_SECURE_NOTIFICATIONS
+                                | DevicePolicyManager.KEYGUARD_DISABLE_UNREDACTED_NOTIFICATIONS);
+            }
+
+            final String summaryHideEntry =
+                    mContext.getString(R.string.lock_screen_notifications_summary_hide);
+            final String summaryHideEntryValue = Integer.toString(Notification.VISIBILITY_PRIVATE);
+            entries.add(summaryHideEntry);
+            values.add(summaryHideEntryValue);
+            setRestrictedIfNotificationFeaturesDisabled(pref,
+                    summaryHideEntry, summaryHideEntryValue,
+                    DevicePolicyManager.KEYGUARD_DISABLE_SECURE_NOTIFICATIONS);
+            entries.add(mContext.getString(R.string.lock_screen_notifications_summary_disable));
+            values.add(Integer.toString(Notification.VISIBILITY_SECRET));
+            pref.setEntries(entries.toArray(new CharSequence[entries.size()]));
+            pref.setEntryValues(values.toArray(new CharSequence[values.size()]));
+
+            if (mChannel.getLockscreenVisibility()
+                    == NotificationListenerService.Ranking.VISIBILITY_NO_OVERRIDE) {
+                pref.setValue(Integer.toString(getGlobalVisibility()));
+            } else {
+                pref.setValue(Integer.toString(mChannel.getLockscreenVisibility()));
+            }
+            pref.setSummary("%s");
+        }
+    }
+
+    @Override
+    public boolean onPreferenceChange(Preference preference, Object newValue) {
+        if (mChannel != null) {
+            int sensitive = Integer.parseInt((String) newValue);
+            if (sensitive == getGlobalVisibility()) {
+                sensitive = NotificationListenerService.Ranking.VISIBILITY_NO_OVERRIDE;
+            }
+            mChannel.setLockscreenVisibility(sensitive);
+            mChannel.lockFields(NotificationChannel.USER_LOCKED_VISIBILITY);
+            saveChannel();
+        }
+        return true;
+    }
+
+    private void setRestrictedIfNotificationFeaturesDisabled(RestrictedDropDownPreference pref,
+            CharSequence entry, CharSequence entryValue, int keyguardNotificationFeatures) {
+        RestrictedLockUtils.EnforcedAdmin admin =
+                RestrictedLockUtils.checkIfKeyguardFeaturesDisabled(
+                        mContext, keyguardNotificationFeatures, mAppRow.userId);
+        if (admin != null) {
+            RestrictedDropDownPreference.RestrictedItem item =
+                    new RestrictedDropDownPreference.RestrictedItem(entry, entryValue, admin);
+            pref.addRestrictedItem(item);
+        }
+    }
+
+    private int getGlobalVisibility() {
+        int globalVis = NotificationListenerService.Ranking.VISIBILITY_NO_OVERRIDE;
+        if (!getLockscreenNotificationsEnabled()) {
+            globalVis = Notification.VISIBILITY_SECRET;
+        } else if (!getLockscreenAllowPrivateNotifications()) {
+            globalVis = Notification.VISIBILITY_PRIVATE;
+        }
+        return globalVis;
+    }
+
+    private boolean getLockscreenNotificationsEnabled() {
+        return Settings.Secure.getInt(mContext.getContentResolver(),
+                Settings.Secure.LOCK_SCREEN_SHOW_NOTIFICATIONS, 0) != 0;
+    }
+
+    private boolean getLockscreenAllowPrivateNotifications() {
+        return Settings.Secure.getInt(mContext.getContentResolver(),
+                Settings.Secure.LOCK_SCREEN_ALLOW_PRIVATE_NOTIFICATIONS, 0) != 0;
+    }
+
+    protected boolean isLockScreenSecure() {
+        boolean lockscreenSecure = mLockPatternUtils.isSecure(UserHandle.myUserId());
+        UserInfo parentUser = mUm.getProfileParent(UserHandle.myUserId());
+        if (parentUser != null){
+            lockscreenSecure |= mLockPatternUtils.isSecure(parentUser.id);
+        }
+
+        return lockscreenSecure;
+    }
+
+}
diff --git a/src/com/android/settings/notification/ZenAccessSettings.java b/src/com/android/settings/notification/ZenAccessSettings.java
index 238c11e..d92bc5a 100644
--- a/src/com/android/settings/notification/ZenAccessSettings.java
+++ b/src/com/android/settings/notification/ZenAccessSettings.java
@@ -21,9 +21,7 @@
 import android.app.AlertDialog;
 import android.app.AppGlobals;
 import android.app.Dialog;
-import android.app.DialogFragment;
 import android.app.NotificationManager;
-import android.content.ComponentName;
 import android.content.Context;
 import android.content.DialogInterface;
 import android.content.pm.ApplicationInfo;
@@ -38,7 +36,6 @@
 import android.os.Handler;
 import android.os.Looper;
 import android.os.RemoteException;
-import android.provider.Settings;
 import android.provider.Settings.Secure;
 import android.support.v14.preference.SwitchPreference;
 import android.support.v7.preference.Preference;
@@ -48,13 +45,13 @@
 import android.util.ArraySet;
 import android.util.Log;
 import android.view.View;
-import android.widget.Toast;
 
 import com.android.internal.annotations.VisibleForTesting;
 import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
 import com.android.settings.R;
 import com.android.settings.core.instrumentation.InstrumentedDialogFragment;
 import com.android.settings.overlay.FeatureFactory;
+import com.android.settings.widget.AppSwitchPreference;
 
 import java.util.ArrayList;
 import java.util.Collections;
@@ -80,7 +77,6 @@
         mContext = getActivity();
         mPkgMan = mContext.getPackageManager();
         mNoMan = mContext.getSystemService(NotificationManager.class);
-        setPreferenceScreen(getPreferenceManager().createPreferenceScreen(mContext));
     }
 
     @Override
@@ -90,6 +86,11 @@
     }
 
     @Override
+    protected int getPreferenceScreenResId() {
+        return R.xml.zen_access_settings;
+    }
+
+    @Override
     public void onResume() {
         super.onResume();
         if (!ActivityManager.isLowRamDeviceStatic()) {
@@ -135,7 +136,7 @@
         for (ApplicationInfo app : apps) {
             final String pkg = app.packageName;
             final CharSequence label = app.loadLabel(mPkgMan);
-            final SwitchPreference pref = new SwitchPreference(getPrefContext());
+            final SwitchPreference pref = new AppSwitchPreference(getPrefContext());
             pref.setPersistent(false);
             pref.setIcon(app.loadIcon(mPkgMan));
             pref.setTitle(label);
diff --git a/src/com/android/settings/notification/ZenModeAddAutomaticRulePreferenceController.java b/src/com/android/settings/notification/ZenModeAddAutomaticRulePreferenceController.java
new file mode 100644
index 0000000..a15536c
--- /dev/null
+++ b/src/com/android/settings/notification/ZenModeAddAutomaticRulePreferenceController.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.notification;
+
+import android.app.Fragment;
+import android.content.Context;
+import android.content.Intent;
+import android.support.v7.preference.Preference;
+import android.support.v7.preference.PreferenceScreen;
+
+import com.android.settings.utils.ZenServiceListing;
+
+public class ZenModeAddAutomaticRulePreferenceController extends
+        AbstractZenModeAutomaticRulePreferenceController implements
+        Preference.OnPreferenceClickListener {
+
+    private final String KEY_ADD_RULE;
+    private final ZenServiceListing mZenServiceListing;
+
+    public ZenModeAddAutomaticRulePreferenceController(Context context, String key,
+            Fragment parent, ZenServiceListing serviceListing) {
+        super(context, parent);
+        KEY_ADD_RULE = key;
+        mZenServiceListing = serviceListing;
+    }
+
+    @Override
+    public String getPreferenceKey() {
+        return KEY_ADD_RULE;
+    }
+
+    @Override
+    public boolean isAvailable() {
+        return true;
+    }
+
+    @Override
+    public void displayPreference(PreferenceScreen screen) {
+        super.displayPreference(screen);
+        Preference pref = screen.findPreference(KEY_ADD_RULE);
+        pref.setPersistent(false);
+        pref.setOnPreferenceClickListener(this);
+    }
+
+    @Override
+    public boolean onPreferenceClick(Preference preference) {
+        new ZenRuleSelectionDialog(mContext, mZenServiceListing) {
+            @Override
+            public void onSystemRuleSelected(ZenRuleInfo ri) {
+                showNameRuleDialog(ri);
+            }
+
+            @Override
+            public void onExternalRuleSelected(ZenRuleInfo ri) {
+                Intent intent = new Intent().setComponent(ri.configurationActivity);
+                mParent.startActivity(intent);
+            }
+        }.show();
+        return true;
+    }
+}
diff --git a/src/com/android/settings/notification/ZenModeAlarmsPreferenceController.java b/src/com/android/settings/notification/ZenModeAlarmsPreferenceController.java
new file mode 100644
index 0000000..ef8d026
--- /dev/null
+++ b/src/com/android/settings/notification/ZenModeAlarmsPreferenceController.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.notification;
+
+import android.app.NotificationManager.Policy;
+import android.content.Context;
+import android.provider.Settings;
+import android.support.v14.preference.SwitchPreference;
+import android.support.v7.preference.Preference;
+import android.util.Log;
+
+import com.android.settingslib.core.lifecycle.Lifecycle;
+
+public class ZenModeAlarmsPreferenceController extends
+        AbstractZenModePreferenceController implements Preference.OnPreferenceChangeListener {
+
+    protected static final String KEY = "zen_mode_alarms";
+    private final ZenModeBackend mBackend;
+
+    public ZenModeAlarmsPreferenceController(Context context, Lifecycle lifecycle) {
+        super(context, KEY, lifecycle);
+        mBackend = ZenModeBackend.getInstance(context);
+    }
+
+    @Override
+    public String getPreferenceKey() {
+        return KEY;
+    }
+
+    @Override
+    public boolean isAvailable() {
+        return true;
+    }
+
+    @Override
+    public void updateState(Preference preference) {
+        super.updateState(preference);
+
+        SwitchPreference pref = (SwitchPreference) preference;
+        switch (getZenMode()) {
+            case Settings.Global.ZEN_MODE_NO_INTERRUPTIONS:
+                pref.setEnabled(false);
+                pref.setChecked(false);
+                break;
+            case Settings.Global.ZEN_MODE_ALARMS:
+                pref.setEnabled(false);
+                pref.setChecked(true);
+                break;
+            default:
+                pref.setEnabled(true);
+                pref.setChecked(mBackend.isPriorityCategoryEnabled(
+                        Policy.PRIORITY_CATEGORY_ALARMS));
+        }
+    }
+
+    @Override
+    public boolean onPreferenceChange(Preference preference, Object newValue) {
+        final boolean allowAlarms = (Boolean) newValue;
+        if (ZenModeSettingsBase.DEBUG) {
+            Log.d(TAG, "onPrefChange allowAlarms=" + allowAlarms);
+        }
+        mBackend.saveSoundPolicy(Policy.PRIORITY_CATEGORY_ALARMS, allowAlarms);
+        return true;
+    }
+}
diff --git a/src/com/android/settings/notification/ZenModeAutomaticRulesPreferenceController.java b/src/com/android/settings/notification/ZenModeAutomaticRulesPreferenceController.java
new file mode 100644
index 0000000..f91bdd6
--- /dev/null
+++ b/src/com/android/settings/notification/ZenModeAutomaticRulesPreferenceController.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.notification;
+
+import android.app.AutomaticZenRule;
+import android.app.Fragment;
+import android.content.Context;
+import android.support.v7.preference.Preference;
+import android.support.v7.preference.PreferenceCategory;
+import android.support.v7.preference.PreferenceScreen;
+import java.util.Map;
+
+public class ZenModeAutomaticRulesPreferenceController extends
+        AbstractZenModeAutomaticRulePreferenceController {
+
+    private final String KEY_AUTOMATIC_RULES;
+    private PreferenceCategory mPreferenceCategory;
+    Map.Entry<String, AutomaticZenRule>[] mSortedRules;
+
+    public ZenModeAutomaticRulesPreferenceController(Context context, String key,
+            Fragment parent) {
+        super(context, parent);
+        KEY_AUTOMATIC_RULES = key;
+        mSortedRules = sortedRules();
+    }
+
+    @Override
+    public String getPreferenceKey() {
+        return KEY_AUTOMATIC_RULES;
+    }
+
+    @Override
+    public boolean isAvailable() {
+        return true;
+    }
+
+    @Override
+    public void displayPreference(PreferenceScreen screen) {
+        super.displayPreference(screen);
+        mPreferenceCategory = (PreferenceCategory) screen.findPreference(getPreferenceKey());
+        mPreferenceCategory.setPersistent(false);
+    }
+
+    @Override
+    public void updateState(Preference preference) {
+        super.updateState(preference);
+
+        // no need to update AutomaticRule if a rule was deleted
+        // (on rule deletion, the preference removes itself from its parent)
+        int oldRuleLength = mSortedRules.length;
+        mSortedRules = sortedRules();
+        if  (!wasRuleDeleted(oldRuleLength)) {
+            updateAutomaticRules();
+        }
+    }
+
+    private boolean wasRuleDeleted(int oldRuleLength) {
+        int newRuleLength = mSortedRules.length;
+        int prefCount =  mPreferenceCategory.getPreferenceCount();
+
+        return (prefCount == oldRuleLength -1) && (prefCount == newRuleLength);
+    }
+
+    private void updateAutomaticRules() {
+        for (Map.Entry<String, AutomaticZenRule> sortedRule : mSortedRules) {
+            ZenRulePreference currPref = (ZenRulePreference)
+                    mPreferenceCategory.findPreference(sortedRule.getKey());
+            if (currPref != null && currPref.appExists) {
+                // rule already exists in preferences, update it
+                currPref.setAttributes(sortedRule.getValue());
+            } else {
+                // rule doesn't exist in preferences, add it
+                ZenRulePreference pref = new ZenRulePreference(mPreferenceCategory.getContext(),
+                        sortedRule, mPreferenceCategory);
+                if (pref.appExists) {
+                    mPreferenceCategory.addPreference(pref);
+                }
+            }
+        }
+
+    }
+}
+
+
+
diff --git a/src/com/android/settings/notification/ZenModeAutomationPreferenceController.java b/src/com/android/settings/notification/ZenModeAutomationPreferenceController.java
new file mode 100644
index 0000000..aa46d4e
--- /dev/null
+++ b/src/com/android/settings/notification/ZenModeAutomationPreferenceController.java
@@ -0,0 +1,34 @@
+package com.android.settings.notification;
+
+import android.content.Context;
+import android.support.v7.preference.Preference;
+
+import com.android.settings.core.PreferenceControllerMixin;
+import com.android.settingslib.core.AbstractPreferenceController;
+
+public class ZenModeAutomationPreferenceController extends
+        AbstractPreferenceController implements PreferenceControllerMixin {
+
+    protected static final String KEY_ZEN_MODE_AUTOMATION = "zen_mode_automation_settings";
+    private final ZenModeSettings.SummaryBuilder mSummaryBuilder;
+
+    public ZenModeAutomationPreferenceController(Context context) {
+        super(context);
+        mSummaryBuilder = new ZenModeSettings.SummaryBuilder(context);
+    }
+
+    @Override
+    public String getPreferenceKey() {
+        return KEY_ZEN_MODE_AUTOMATION;
+    }
+
+    @Override
+    public boolean isAvailable() {
+        return true;
+    }
+
+    @Override
+    public void updateState(Preference preference) {
+        preference.setSummary(mSummaryBuilder.getAutomaticRulesSummary());
+    }
+}
diff --git a/src/com/android/settings/notification/ZenModeAutomationSettings.java b/src/com/android/settings/notification/ZenModeAutomationSettings.java
new file mode 100644
index 0000000..582fb03
--- /dev/null
+++ b/src/com/android/settings/notification/ZenModeAutomationSettings.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.notification;
+
+import android.app.Fragment;
+import android.content.Context;
+import android.provider.SearchIndexableResource;
+import android.service.notification.ConditionProviderService;
+
+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.utils.ManagedServiceSettings;
+import com.android.settings.utils.ZenServiceListing;
+import com.android.settingslib.core.AbstractPreferenceController;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class ZenModeAutomationSettings extends ZenModeSettingsBase {
+    private static final String KEY_ADD_RULE = "zen_mode_add_automatic_rule";
+    private static final String KEY_AUTOMATIC_RULES = "zen_mode_automatic_rules";
+    protected static final ManagedServiceSettings.Config CONFIG = getConditionProviderConfig();
+
+    @Override
+    protected List<AbstractPreferenceController> getPreferenceControllers(Context context) {
+        ZenServiceListing serviceListing = new ZenServiceListing(getContext(), CONFIG);
+        serviceListing.reloadApprovedServices();
+        return buildPreferenceControllers(context, this, serviceListing);
+    }
+
+    private static List<AbstractPreferenceController> buildPreferenceControllers(Context context,
+            Fragment parent, ZenServiceListing serviceListing) {
+        List<AbstractPreferenceController> controllers = new ArrayList<>();
+        controllers.add(new ZenModeAddAutomaticRulePreferenceController(context, KEY_ADD_RULE,
+                parent, serviceListing));
+        controllers.add(new ZenModeAutomaticRulesPreferenceController(context,
+                KEY_AUTOMATIC_RULES, parent));
+
+        return controllers;
+    }
+
+    @Override
+    protected int getPreferenceScreenResId() {
+        return R.xml.zen_mode_automation_settings;
+    }
+
+    @Override
+    public int getMetricsCategory() {
+        return MetricsEvent.NOTIFICATION_ZEN_MODE_AUTOMATION;
+    }
+
+    protected static ManagedServiceSettings.Config getConditionProviderConfig() {
+        final ManagedServiceSettings.Config c = new ManagedServiceSettings.Config();
+        c.tag = TAG;
+        c.intentAction = ConditionProviderService.SERVICE_INTERFACE;
+        c.permission = android.Manifest.permission.BIND_CONDITION_PROVIDER_SERVICE;
+        c.noun = "condition provider";
+        return c;
+    }
+
+    /**
+     * For Search.
+     */
+    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.zen_mode_automation_settings;
+                    result.add(sir);
+                    return result;
+                }
+
+                @Override
+                public List<String> getNonIndexableKeys(Context context) {
+                    final List<String> keys = super.getNonIndexableKeys(context);
+                    keys.add(KEY_ADD_RULE);
+                    keys.add(KEY_AUTOMATIC_RULES);
+                    return keys;
+                }
+
+                @Override
+                public List<AbstractPreferenceController> getPreferenceControllers(
+                        Context context) {
+                    return buildPreferenceControllers(context, null, null);
+                }
+            };
+}
diff --git a/src/com/android/settings/notification/ZenModeBackend.java b/src/com/android/settings/notification/ZenModeBackend.java
new file mode 100644
index 0000000..945da0b
--- /dev/null
+++ b/src/com/android/settings/notification/ZenModeBackend.java
@@ -0,0 +1,274 @@
+/*
+ * Copyright (C) 2017 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF 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 android.app.AutomaticZenRule;
+import android.app.NotificationManager;
+import android.content.Context;
+import android.provider.Settings;
+import android.service.notification.ZenModeConfig;
+import android.support.annotation.VisibleForTesting;
+import android.util.Log;
+
+import com.android.settings.R;
+
+public class ZenModeBackend {
+    @VisibleForTesting
+    protected static final String ZEN_MODE_FROM_ANYONE = "zen_mode_from_anyone";
+    @VisibleForTesting
+    protected static final String ZEN_MODE_FROM_CONTACTS = "zen_mode_from_contacts";
+    @VisibleForTesting
+    protected static final String ZEN_MODE_FROM_STARRED = "zen_mode_from_starred";
+    @VisibleForTesting
+    protected static final String ZEN_MODE_FROM_NONE = "zen_mode_from_none";
+    protected static final int SOURCE_NONE = -1;
+
+    private static ZenModeBackend sInstance;
+
+    protected int mZenMode;
+    /** gets policy last set by updatePolicy **/
+    protected NotificationManager.Policy mPolicy;
+    private final NotificationManager mNotificationManager;
+
+    private String TAG = "ZenModeSettingsBackend";
+    private final Context mContext;
+
+    public static ZenModeBackend getInstance(Context context) {
+        if (sInstance == null) {
+            sInstance = new ZenModeBackend(context);
+        }
+        return sInstance;
+    }
+
+    public ZenModeBackend(Context context) {
+        mContext = context;
+        mNotificationManager = (NotificationManager) context.getSystemService(
+                Context.NOTIFICATION_SERVICE);
+        updateZenMode();
+        updatePolicy();
+    }
+
+    protected void updatePolicy() {
+        if (mNotificationManager != null) {
+            mPolicy = mNotificationManager.getNotificationPolicy();
+        }
+    }
+
+    protected void updateZenMode() {
+        mZenMode = Settings.Global.getInt(mContext.getContentResolver(),
+                Settings.Global.ZEN_MODE, mZenMode);
+    }
+
+    protected boolean setZenRule(String id, AutomaticZenRule rule) {
+        return NotificationManager.from(mContext).updateAutomaticZenRule(id, rule);
+    }
+
+    protected void setZenMode(int zenMode) {
+        NotificationManager.from(mContext).setZenMode(zenMode, null, TAG);
+        mZenMode = zenMode;
+    }
+
+    /** gets last zen mode set by setZenMode or updateZenMode **/
+    protected int getZenMode() {
+        mZenMode = Settings.Global.getInt(mContext.getContentResolver(),
+                Settings.Global.ZEN_MODE, mZenMode);
+        return mZenMode;
+    }
+
+    protected boolean isPriorityCategoryEnabled(int categoryType) {
+        return (mPolicy.priorityCategories & categoryType) != 0;
+    }
+
+    protected int getNewPriorityCategories(boolean allow, int categoryType) {
+        int priorityCategories = mPolicy.priorityCategories;
+        if (allow) {
+            priorityCategories |= categoryType;
+        } else {
+            priorityCategories &= ~categoryType;
+        }
+        return priorityCategories;
+    }
+
+    protected int getPriorityCallSenders() {
+        return mPolicy.priorityCallSenders;
+    }
+
+    protected int getPriorityMessageSenders() {
+        return mPolicy.priorityMessageSenders;
+    }
+
+    protected void saveVisualEffectsPolicy(int category, boolean canBypass) {
+        int suppressedEffects = getNewSuppressedEffects(!canBypass, category);
+        savePolicy(mPolicy.priorityCategories, mPolicy.priorityCallSenders,
+                mPolicy.priorityMessageSenders, suppressedEffects);
+    }
+
+    protected void saveSoundPolicy(int category, boolean allow) {
+        int priorityCategories = getNewPriorityCategories(allow, category);
+        savePolicy(priorityCategories, mPolicy.priorityCallSenders,
+                mPolicy.priorityMessageSenders, mPolicy.suppressedVisualEffects);
+    }
+
+    protected void savePolicy(int priorityCategories, int priorityCallSenders,
+            int priorityMessageSenders, int suppressedVisualEffects) {
+        mPolicy = new NotificationManager.Policy(priorityCategories, priorityCallSenders,
+                priorityMessageSenders,
+                suppressedVisualEffects);
+        mNotificationManager.setNotificationPolicy(mPolicy);
+    }
+
+    protected int getNewSuppressedEffects(boolean suppress, int effectType) {
+        int effects = mPolicy.suppressedVisualEffects;
+        if (suppress) {
+            effects |= effectType;
+        } else {
+            effects &= ~effectType;
+        }
+        return effects;
+    }
+
+    protected boolean isEffectAllowed(int effect) {
+        return (mPolicy.suppressedVisualEffects & effect) == 0;
+    }
+
+    protected void saveSenders(int category, int val) {
+        int priorityCallSenders = getPriorityCallSenders();
+        int priorityMessagesSenders = getPriorityMessageSenders();
+        int categorySenders = getPrioritySenders(category);
+
+        final boolean allowSenders = val != SOURCE_NONE;
+        final int allowSendersFrom = val == SOURCE_NONE ? categorySenders : val;
+
+        String stringCategory = "";
+        if (category == NotificationManager.Policy.PRIORITY_CATEGORY_CALLS) {
+            stringCategory = "Calls";
+            priorityCallSenders = allowSendersFrom;
+        }
+
+        if (category == NotificationManager.Policy.PRIORITY_CATEGORY_MESSAGES) {
+            stringCategory = "Messages";
+            priorityMessagesSenders = allowSendersFrom;
+        }
+
+        savePolicy(getNewPriorityCategories(allowSenders, category),
+            priorityCallSenders, priorityMessagesSenders, mPolicy.suppressedVisualEffects);
+
+        if (ZenModeSettingsBase.DEBUG) Log.d(TAG, "onPrefChange allow=" +
+                stringCategory + allowSenders + " allow" + stringCategory + "From="
+                + ZenModeConfig.sourceToString(allowSendersFrom));
+    }
+
+    protected String getSendersKey(int category) {
+        switch (getZenMode()) {
+            case Settings.Global.ZEN_MODE_NO_INTERRUPTIONS:
+            case Settings.Global.ZEN_MODE_ALARMS:
+                return getKeyFromSetting(SOURCE_NONE);
+            default:
+                int prioritySenders = getPrioritySenders(category);
+                return getKeyFromSetting(isPriorityCategoryEnabled(category)
+                        ? prioritySenders : SOURCE_NONE);
+            }
+    }
+
+    private int getPrioritySenders(int category) {
+        int categorySenders = -1;
+
+        if (category == NotificationManager.Policy.PRIORITY_CATEGORY_CALLS) {
+            return getPriorityCallSenders();
+        }
+
+        if (category == NotificationManager.Policy.PRIORITY_CATEGORY_MESSAGES) {
+            return getPriorityMessageSenders();
+        }
+
+        return categorySenders;
+    }
+
+    protected static String getKeyFromSetting(int contactType) {
+        switch (contactType) {
+            case NotificationManager.Policy.PRIORITY_SENDERS_ANY:
+                return ZEN_MODE_FROM_ANYONE;
+            case NotificationManager.Policy.PRIORITY_SENDERS_CONTACTS:
+                return ZEN_MODE_FROM_CONTACTS;
+            case NotificationManager.Policy.PRIORITY_SENDERS_STARRED:
+                return ZEN_MODE_FROM_STARRED;
+            case SOURCE_NONE:
+            default:
+                return ZEN_MODE_FROM_NONE;
+        }
+    }
+
+    protected int getContactsSummary(int category) {
+        int contactType = -1;
+
+        // SOURCE_NONE can be used when in total silence or alarms only
+        // (policy is based on user's preferences but the UI displayed is based on zenMode)
+        if (category == SOURCE_NONE) {
+            return R.string.zen_mode_from_none;
+        }
+
+        if (category == NotificationManager.Policy.PRIORITY_CATEGORY_MESSAGES) {
+            if (isPriorityCategoryEnabled(category)) {
+                contactType = getPriorityMessageSenders();
+            }
+        } else if (category == NotificationManager.Policy.PRIORITY_CATEGORY_CALLS) {
+            if (isPriorityCategoryEnabled(category)) {
+                contactType = getPriorityCallSenders();
+            }
+        }
+
+        switch (contactType) {
+            case NotificationManager.Policy.PRIORITY_SENDERS_ANY:
+                return R.string.zen_mode_from_anyone;
+            case NotificationManager.Policy.PRIORITY_SENDERS_CONTACTS:
+                return  R.string.zen_mode_from_contacts;
+            case NotificationManager.Policy.PRIORITY_SENDERS_STARRED:
+                return  R.string.zen_mode_from_starred;
+            case SOURCE_NONE:
+            default:
+                return R.string.zen_mode_from_none;
+        }
+    }
+
+    protected static int getSettingFromPrefKey(String key) {
+        switch (key) {
+            case ZEN_MODE_FROM_ANYONE:
+                return NotificationManager.Policy.PRIORITY_SENDERS_ANY;
+            case ZEN_MODE_FROM_CONTACTS:
+                return NotificationManager.Policy.PRIORITY_SENDERS_CONTACTS;
+            case ZEN_MODE_FROM_STARRED:
+                return NotificationManager.Policy.PRIORITY_SENDERS_STARRED;
+            case ZEN_MODE_FROM_NONE:
+            default:
+                return SOURCE_NONE;
+        }
+    }
+
+    public boolean removeZenRule(String ruleId) {
+        return NotificationManager.from(mContext).removeAutomaticZenRule(ruleId);
+    }
+
+    protected String addZenRule(AutomaticZenRule rule) {
+        try {
+            String id = NotificationManager.from(mContext).addAutomaticZenRule(rule);
+            NotificationManager.from(mContext).getAutomaticZenRule(id);
+            return id;
+        } catch (Exception e) {
+            return null;
+        }
+    }
+}
diff --git a/src/com/android/settings/notification/ZenModeBehaviorPreferenceController.java b/src/com/android/settings/notification/ZenModeBehaviorPreferenceController.java
new file mode 100644
index 0000000..0e1f066
--- /dev/null
+++ b/src/com/android/settings/notification/ZenModeBehaviorPreferenceController.java
@@ -0,0 +1,37 @@
+package com.android.settings.notification;
+
+import android.content.Context;
+import android.support.v7.preference.Preference;
+
+import com.android.settings.core.PreferenceControllerMixin;
+import com.android.settingslib.core.lifecycle.Lifecycle;
+
+public class ZenModeBehaviorPreferenceController extends
+        AbstractZenModePreferenceController implements PreferenceControllerMixin {
+
+    protected static final String KEY_BEHAVIOR_SETTINGS = "zen_mode_behavior_settings";
+    private final ZenModeSettings.SummaryBuilder mSummaryBuilder;
+
+    public ZenModeBehaviorPreferenceController(Context context, Lifecycle lifecycle) {
+        super(context, KEY_BEHAVIOR_SETTINGS, lifecycle);
+        mSummaryBuilder = new ZenModeSettings.SummaryBuilder(context);
+    }
+
+    @Override
+    public String getPreferenceKey() {
+        return KEY_BEHAVIOR_SETTINGS;
+    }
+
+    @Override
+    public boolean isAvailable() {
+        return true;
+    }
+
+    @Override
+    public void updateState(Preference preference) {
+        super.updateState(preference);
+
+        preference.setSummary(mSummaryBuilder.getBehaviorSettingSummary(getPolicy(),
+                getZenMode()));
+    }
+}
diff --git a/src/com/android/settings/notification/ZenModeBehaviorSettings.java b/src/com/android/settings/notification/ZenModeBehaviorSettings.java
new file mode 100644
index 0000000..b58ef86
--- /dev/null
+++ b/src/com/android/settings/notification/ZenModeBehaviorSettings.java
@@ -0,0 +1,101 @@
+/*
+ * Copyright (C) 2017 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF 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 android.content.Context;
+import android.provider.SearchIndexableResource;
+
+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.settingslib.core.AbstractPreferenceController;
+import com.android.settingslib.core.lifecycle.Lifecycle;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class ZenModeBehaviorSettings extends ZenModeSettingsBase implements Indexable {
+
+    @Override
+    protected List<AbstractPreferenceController> getPreferenceControllers(Context context) {
+        return buildPreferenceControllers(context, getLifecycle());
+    }
+
+    private static List<AbstractPreferenceController> buildPreferenceControllers(Context context,
+            Lifecycle lifecycle) {
+        List<AbstractPreferenceController> controllers = new ArrayList<>();
+        controllers.add(new ZenModeAlarmsPreferenceController(context, lifecycle));
+        controllers.add(new ZenModeMediaSystemOtherPreferenceController(context, lifecycle));
+        controllers.add(new ZenModeEventsPreferenceController(context, lifecycle));
+        controllers.add(new ZenModeRemindersPreferenceController(context, lifecycle));
+        controllers.add(new ZenModeMessagesPreferenceController(context, lifecycle));
+        controllers.add(new ZenModeCallsPreferenceController(context, lifecycle));
+        controllers.add(new ZenModeRepeatCallersPreferenceController(context, lifecycle));
+        controllers.add(new ZenModeScreenOnPreferenceController(context, lifecycle));
+        controllers.add(new ZenModeScreenOffPreferenceController(context, lifecycle));
+        return controllers;
+    }
+
+    @Override
+    protected int getPreferenceScreenResId() {
+        return R.xml.zen_mode_behavior_settings;
+    }
+
+    @Override
+    public int getMetricsCategory() {
+        return MetricsEvent.NOTIFICATION_ZEN_MODE_PRIORITY;
+    }
+
+    /**
+     * For Search.
+     */
+    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.zen_mode_behavior_settings;
+                    result.add(sir);
+                    return result;
+                }
+
+                @Override
+                public List<String> getNonIndexableKeys(Context context) {
+                    final List<String> keys = super.getNonIndexableKeys(context);
+                    keys.add(ZenModeAlarmsPreferenceController.KEY);
+                    keys.add(ZenModeMediaSystemOtherPreferenceController.KEY);
+                    keys.add(ZenModeEventsPreferenceController.KEY);
+                    keys.add(ZenModeRemindersPreferenceController.KEY);
+                    keys.add(ZenModeMessagesPreferenceController.KEY);
+                    keys.add(ZenModeCallsPreferenceController.KEY);
+                    keys.add(ZenModeRepeatCallersPreferenceController.KEY);
+                    keys.add(ZenModeScreenOnPreferenceController.KEY);
+                    keys.add(ZenModeScreenOffPreferenceController.KEY);
+                    return keys;
+                }
+
+            @Override
+            public List<AbstractPreferenceController> getPreferenceControllers(Context context) {
+                return buildPreferenceControllers(context, null);
+            }
+        };
+}
diff --git a/src/com/android/settings/notification/ZenModeButtonPreferenceController.java b/src/com/android/settings/notification/ZenModeButtonPreferenceController.java
new file mode 100644
index 0000000..79115f2
--- /dev/null
+++ b/src/com/android/settings/notification/ZenModeButtonPreferenceController.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.notification;
+
+import android.content.Context;
+import android.provider.Settings;
+import android.support.v7.preference.Preference;
+import android.view.View;
+import android.widget.Button;
+
+import com.android.settings.R;
+import com.android.settings.applications.LayoutPreference;
+import com.android.settings.core.PreferenceControllerMixin;
+import com.android.settingslib.core.lifecycle.Lifecycle;
+
+public class ZenModeButtonPreferenceController extends AbstractZenModePreferenceController
+        implements PreferenceControllerMixin {
+
+    protected static final String KEY = "zen_mode_settings_button_container";
+    private Button mZenButtonOn;
+    private Button mZenButtonOff;
+    private ZenModeBackend mBackend;
+
+    public ZenModeButtonPreferenceController(Context context, Lifecycle lifecycle) {
+        super(context, KEY, lifecycle);
+        mBackend = ZenModeBackend.getInstance(context);
+    }
+
+    @Override
+    public boolean isAvailable() {
+        return true;
+    }
+
+    @Override
+    public String getPreferenceKey() {
+        return KEY;
+    }
+
+    @Override
+    public void updateState(Preference preference) {
+        super.updateState(preference);
+
+        if (null == mZenButtonOn) {
+            mZenButtonOn = (Button) ((LayoutPreference) preference)
+                    .findViewById(R.id.zen_mode_settings_turn_on_button);
+            mZenButtonOn.setOnClickListener(v ->
+                    mBackend.setZenMode(Settings.Global.ZEN_MODE_IMPORTANT_INTERRUPTIONS));
+        }
+
+        if (null == mZenButtonOff) {
+            mZenButtonOff = (Button) ((LayoutPreference) preference)
+                    .findViewById(R.id.zen_mode_settings_turn_off_button);
+            mZenButtonOff.setOnClickListener(v ->
+                    mBackend.setZenMode(Settings.Global.ZEN_MODE_OFF));
+        }
+
+        updateButtons();
+    }
+
+    private void updateButtons() {
+        switch (getZenMode()) {
+            case Settings.Global.ZEN_MODE_ALARMS:
+            case Settings.Global.ZEN_MODE_IMPORTANT_INTERRUPTIONS:
+            case Settings.Global.ZEN_MODE_NO_INTERRUPTIONS:
+                mZenButtonOff.setVisibility(View.VISIBLE);
+                mZenButtonOn.setVisibility(View.GONE);
+                break;
+            case Settings.Global.ZEN_MODE_OFF:
+            default:
+                mZenButtonOff.setVisibility(View.GONE);
+                mZenButtonOn.setVisibility(View.VISIBLE);
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/com/android/settings/notification/ZenModeCallsPreferenceController.java b/src/com/android/settings/notification/ZenModeCallsPreferenceController.java
new file mode 100644
index 0000000..d952c11
--- /dev/null
+++ b/src/com/android/settings/notification/ZenModeCallsPreferenceController.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.notification;
+
+import android.app.NotificationManager;
+import android.content.Context;
+import android.provider.Settings;
+import android.support.v7.preference.Preference;
+
+import com.android.settingslib.core.lifecycle.Lifecycle;
+
+public class ZenModeCallsPreferenceController extends AbstractZenModePreferenceController {
+
+    protected static final String KEY = "zen_mode_calls";
+    private final ZenModeBackend mBackend;
+
+    public ZenModeCallsPreferenceController(Context context, Lifecycle lifecycle) {
+        super(context, KEY, lifecycle);
+        mBackend = ZenModeBackend.getInstance(context);
+    }
+
+    @Override
+    public String getPreferenceKey() {
+        return KEY;
+    }
+
+    @Override
+    public boolean isAvailable() {
+        return true;
+    }
+
+    @Override
+    public void updateState(Preference preference) {
+        super.updateState(preference);
+
+        switch (getZenMode()) {
+            case Settings.Global.ZEN_MODE_NO_INTERRUPTIONS:
+            case Settings.Global.ZEN_MODE_ALARMS:
+                preference.setEnabled(false);
+                preference.setSummary(mBackend.getContactsSummary(mBackend.SOURCE_NONE));
+                break;
+            default:
+                preference.setEnabled(true);
+                preference.setSummary(mBackend.getContactsSummary(
+                        NotificationManager.Policy.PRIORITY_CATEGORY_CALLS));
+        }
+
+    }
+}
diff --git a/src/com/android/settings/notification/ZenModeCallsSettings.java b/src/com/android/settings/notification/ZenModeCallsSettings.java
new file mode 100644
index 0000000..6874dc0
--- /dev/null
+++ b/src/com/android/settings/notification/ZenModeCallsSettings.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.notification;
+
+import android.app.NotificationManager;
+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 java.util.ArrayList;
+import java.util.List;
+
+public class ZenModeCallsSettings extends RadioButtonPickerFragment {
+    private ZenModeBackend mBackend;
+
+    @Override
+    public void onAttach(Context context) {
+        super.onAttach(context);
+        mBackend = ZenModeBackend.getInstance(context);
+    }
+
+    @Override
+    public int getMetricsCategory() {
+        return MetricsProto.MetricsEvent.NOTIFICATION_ZEN_MODE_CALLS;
+    }
+
+    @Override
+    protected int getPreferenceScreenResId() {
+        return R.xml.zen_mode_calls_settings;
+    }
+
+    @Override
+    protected List<? extends RadioButtonPickerFragment.CandidateInfo> getCandidates() {
+        final String[] entries = entries();
+        final String[] values = keys();
+        final List<CallsCandidateInfo> 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 CallsCandidateInfo(entries[i], values[i]));
+        }
+
+        return candidates;
+    }
+
+    private String[] entries() {
+        return getResources().getStringArray(R.array.zen_mode_contacts_entries);
+    }
+
+    private String[] keys() {
+        return getResources().getStringArray(R.array.zen_mode_contacts_values);
+    }
+
+    @Override
+    protected String getDefaultKey() {
+        return mBackend.getSendersKey(NotificationManager.Policy.PRIORITY_CATEGORY_CALLS);
+    }
+
+    @Override
+    protected boolean setDefaultKey(String key) {
+        mBackend.saveSenders(NotificationManager.Policy.PRIORITY_CATEGORY_CALLS,
+                mBackend.getSettingFromPrefKey(key));
+        return true;
+    }
+
+    private static final class CallsCandidateInfo extends RadioButtonPickerFragment.CandidateInfo {
+        private final String name;
+        private final String key;
+
+        CallsCandidateInfo(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/notification/ZenModeEventRuleSettings.java b/src/com/android/settings/notification/ZenModeEventRuleSettings.java
index 3361734..aa2cc3f 100644
--- a/src/com/android/settings/notification/ZenModeEventRuleSettings.java
+++ b/src/com/android/settings/notification/ZenModeEventRuleSettings.java
@@ -33,6 +33,7 @@
 
 import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
 import com.android.settings.R;
+import com.android.settingslib.core.AbstractPreferenceController;
 
 import java.util.ArrayList;
 import java.util.Collections;
@@ -81,6 +82,16 @@
         mCreate = false;
     }
 
+    @Override
+    protected int getPreferenceScreenResId() {
+        return R.xml.zen_mode_event_rule_settings;
+    }
+
+    @Override
+    protected List<AbstractPreferenceController> getPreferenceControllers(Context context) {
+        return null;
+    }
+
     private void reloadCalendar() {
         mCalendars = getCalendars(mContext);
         ArrayList<CharSequence> entries = new ArrayList<>();
@@ -107,7 +118,6 @@
     @Override
     protected void onCreateInternal() {
         mCreate = true;
-        addPreferencesFromResource(R.xml.zen_mode_event_rule_settings);
         final PreferenceScreen root = getPreferenceScreen();
 
         mCalendar = (DropDownPreference) root.findPreference(KEY_CALENDAR);
@@ -243,5 +253,4 @@
         public String name;
         public int userId;
     }
-
 }
diff --git a/src/com/android/settings/notification/ZenModeEventsPreferenceController.java b/src/com/android/settings/notification/ZenModeEventsPreferenceController.java
new file mode 100644
index 0000000..3763fed
--- /dev/null
+++ b/src/com/android/settings/notification/ZenModeEventsPreferenceController.java
@@ -0,0 +1,77 @@
+/*
+ * Copyright (C) 2017 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF 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 android.app.NotificationManager.Policy;
+import android.content.Context;
+import android.provider.Settings;
+import android.support.v14.preference.SwitchPreference;
+import android.support.v7.preference.Preference;
+import android.util.Log;
+
+
+import com.android.settingslib.core.lifecycle.Lifecycle;
+
+public class ZenModeEventsPreferenceController extends AbstractZenModePreferenceController
+        implements Preference.OnPreferenceChangeListener {
+
+    protected static final String KEY = "zen_mode_events";
+        private final ZenModeBackend mBackend;
+
+    public ZenModeEventsPreferenceController(Context context, Lifecycle lifecycle) {
+        super(context, KEY, lifecycle);
+        mBackend = ZenModeBackend.getInstance(context);
+    }
+
+    @Override
+    public String getPreferenceKey() {
+        return KEY;
+    }
+
+    @Override
+    public boolean isAvailable() {
+        return true;
+    }
+
+    @Override
+    public void updateState(Preference preference) {
+        super.updateState(preference);
+
+        SwitchPreference pref = (SwitchPreference) preference;
+        switch (getZenMode()) {
+            case Settings.Global.ZEN_MODE_NO_INTERRUPTIONS:
+            case Settings.Global.ZEN_MODE_ALARMS:
+                pref.setEnabled(false);
+                pref.setChecked(false);
+                break;
+            default:
+                pref.setChecked(mBackend.isPriorityCategoryEnabled(
+                        Policy.PRIORITY_CATEGORY_EVENTS));
+                pref.setEnabled(true);
+        }
+    }
+
+    @Override
+    public boolean onPreferenceChange(Preference preference, Object newValue) {
+        final boolean allowEvents = (Boolean) newValue;
+        if (ZenModeSettingsBase.DEBUG) {
+            Log.d(TAG, "onPrefChange allowEvents=" + allowEvents);
+        }
+        mBackend.saveSoundPolicy(Policy.PRIORITY_CATEGORY_EVENTS, allowEvents);
+        return true;
+    }
+}
diff --git a/src/com/android/settings/notification/ZenModeMediaSystemOtherPreferenceController.java b/src/com/android/settings/notification/ZenModeMediaSystemOtherPreferenceController.java
new file mode 100644
index 0000000..8afe881
--- /dev/null
+++ b/src/com/android/settings/notification/ZenModeMediaSystemOtherPreferenceController.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.notification;
+
+import android.app.NotificationManager.Policy;
+import android.content.Context;
+import android.provider.Settings;
+import android.support.v14.preference.SwitchPreference;
+import android.support.v7.preference.Preference;
+import android.util.Log;
+
+import com.android.settingslib.core.lifecycle.Lifecycle;
+
+public class ZenModeMediaSystemOtherPreferenceController extends AbstractZenModePreferenceController
+        implements Preference.OnPreferenceChangeListener {
+
+    protected static final String KEY = "zen_mode_media";
+    private final ZenModeBackend mBackend;
+
+    public ZenModeMediaSystemOtherPreferenceController(Context context, Lifecycle lifecycle) {
+        super(context, KEY, lifecycle);
+        mBackend = ZenModeBackend.getInstance(context);
+    }
+
+    @Override
+    public String getPreferenceKey() {
+        return KEY;
+    }
+
+    @Override
+    public boolean isAvailable() {
+        return true;
+    }
+
+    @Override
+    public void updateState(Preference preference) {
+        super.updateState(preference);
+
+        SwitchPreference pref = (SwitchPreference) preference;
+        switch (getZenMode()) {
+            case Settings.Global.ZEN_MODE_NO_INTERRUPTIONS:
+                pref.setEnabled(false);
+                pref.setChecked(false);
+                break;
+            case Settings.Global.ZEN_MODE_ALARMS:
+                pref.setEnabled(false);
+                pref.setChecked(true);
+                break;
+            default:
+                pref.setEnabled(true);
+                pref.setChecked(mBackend.isPriorityCategoryEnabled(
+                        Policy.PRIORITY_CATEGORY_MEDIA_SYSTEM_OTHER));
+        }
+    }
+
+    @Override
+    public boolean onPreferenceChange(Preference preference, Object newValue) {
+        final boolean allowMedia = (Boolean) newValue;
+        if (ZenModeSettingsBase.DEBUG) {
+            Log.d(TAG, "onPrefChange allowMediaSystemOther=" + allowMedia);
+        }
+        mBackend.saveSoundPolicy(Policy.PRIORITY_CATEGORY_MEDIA_SYSTEM_OTHER, allowMedia);
+        return true;
+    }
+}
diff --git a/src/com/android/settings/notification/ZenModeMessagesPreferenceController.java b/src/com/android/settings/notification/ZenModeMessagesPreferenceController.java
new file mode 100644
index 0000000..dad6cf1
--- /dev/null
+++ b/src/com/android/settings/notification/ZenModeMessagesPreferenceController.java
@@ -0,0 +1,46 @@
+package com.android.settings.notification;
+
+import android.app.NotificationManager;
+import android.content.Context;
+import android.provider.Settings;
+import android.support.v7.preference.Preference;
+
+import com.android.settingslib.core.lifecycle.Lifecycle;
+
+public class ZenModeMessagesPreferenceController extends AbstractZenModePreferenceController {
+
+    protected static final String KEY = "zen_mode_messages";
+    private final ZenModeBackend mBackend;
+
+    public ZenModeMessagesPreferenceController(Context context, Lifecycle lifecycle) {
+        super(context, KEY, lifecycle);
+        mBackend = ZenModeBackend.getInstance(context);
+    }
+
+    @Override
+    public String getPreferenceKey() {
+        return KEY;
+    }
+
+    @Override
+    public boolean isAvailable() {
+        return true;
+    }
+
+    @Override
+    public void updateState(Preference preference) {
+        super.updateState(preference);
+
+        switch (getZenMode()) {
+            case Settings.Global.ZEN_MODE_NO_INTERRUPTIONS:
+            case Settings.Global.ZEN_MODE_ALARMS:
+                preference.setEnabled(false);
+                preference.setSummary(mBackend.getContactsSummary(mBackend.SOURCE_NONE));
+                break;
+            default:
+                preference.setEnabled(true);
+                preference.setSummary(mBackend.getContactsSummary(
+                        NotificationManager.Policy.PRIORITY_CATEGORY_MESSAGES));
+        }
+    }
+}
diff --git a/src/com/android/settings/notification/ZenModeMessagesSettings.java b/src/com/android/settings/notification/ZenModeMessagesSettings.java
new file mode 100644
index 0000000..9cbf248
--- /dev/null
+++ b/src/com/android/settings/notification/ZenModeMessagesSettings.java
@@ -0,0 +1,112 @@
+/*
+ * Copyright (C) 2017 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.notification;
+
+import android.app.NotificationManager;
+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 java.util.ArrayList;
+import java.util.List;
+
+public class ZenModeMessagesSettings extends RadioButtonPickerFragment {
+    private ZenModeBackend mBackend;
+
+    @Override
+    public void onAttach(Context context) {
+        super.onAttach(context);
+        mBackend = ZenModeBackend.getInstance(context);
+    }
+    @Override
+    public int getMetricsCategory() {
+        return MetricsProto.MetricsEvent.NOTIFICATION_ZEN_MODE_MESSAGES;
+    }
+
+    @Override
+    protected int getPreferenceScreenResId() {
+        return R.xml.zen_mode_messages_settings;
+    }
+
+    @Override
+    protected List<? extends RadioButtonPickerFragment.CandidateInfo> getCandidates() {
+        final String[] entries = entries();
+        final String[] values = keys();
+        final List<MessagesCandidateInfo> 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 MessagesCandidateInfo(entries[i], values[i]));
+        }
+
+        return candidates;
+    }
+
+    private String[] entries() {
+        return getResources().getStringArray(R.array.zen_mode_contacts_entries);
+    }
+
+    private String[] keys() {
+        return getResources().getStringArray(R.array.zen_mode_contacts_values);
+    }
+
+    @Override
+    protected String getDefaultKey() {
+        return mBackend.getSendersKey(NotificationManager.Policy.PRIORITY_CATEGORY_MESSAGES);
+    }
+
+    @Override
+    protected boolean setDefaultKey(String key) {
+        mBackend.saveSenders(NotificationManager.Policy.PRIORITY_CATEGORY_MESSAGES,
+                mBackend.getSettingFromPrefKey(key));
+        return true;
+    }
+
+    private final class MessagesCandidateInfo extends RadioButtonPickerFragment.CandidateInfo {
+        private final String name;
+        private final String key;
+
+        MessagesCandidateInfo(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/notification/ZenModePrioritySettings.java b/src/com/android/settings/notification/ZenModePrioritySettings.java
deleted file mode 100644
index b164407..0000000
--- a/src/com/android/settings/notification/ZenModePrioritySettings.java
+++ /dev/null
@@ -1,225 +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.notification;
-
-import android.app.NotificationManager;
-import android.app.NotificationManager.Policy;
-import android.os.Bundle;
-import android.service.notification.ZenModeConfig;
-import android.support.v14.preference.SwitchPreference;
-import android.support.v7.preference.DropDownPreference;
-import android.support.v7.preference.Preference;
-import android.support.v7.preference.Preference.OnPreferenceChangeListener;
-import android.support.v7.preference.PreferenceScreen;
-import android.util.Log;
-
-import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
-import com.android.settings.R;
-import com.android.settings.search.Indexable;
-
-public class ZenModePrioritySettings extends ZenModeSettingsBase {
-    private static final String KEY_REMINDERS = "reminders";
-    private static final String KEY_EVENTS = "events";
-    private static final String KEY_MESSAGES = "messages";
-    private static final String KEY_CALLS = "calls";
-    private static final String KEY_REPEAT_CALLERS = "repeat_callers";
-
-    private static final int SOURCE_NONE = -1;
-
-    private boolean mDisableListeners;
-    private SwitchPreference mReminders;
-    private SwitchPreference mEvents;
-    private DropDownPreference mMessages;
-    private DropDownPreference mCalls;
-    private SwitchPreference mRepeatCallers;
-
-    private Policy mPolicy;
-
-    @Override
-    public void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        addPreferencesFromResource(R.xml.zen_mode_priority_settings);
-        final PreferenceScreen root = getPreferenceScreen();
-
-        mPolicy = NotificationManager.from(mContext).getNotificationPolicy();
-
-        mReminders = (SwitchPreference) root.findPreference(KEY_REMINDERS);
-        mReminders.setOnPreferenceChangeListener(new OnPreferenceChangeListener() {
-            @Override
-            public boolean onPreferenceChange(Preference preference, Object newValue) {
-                if (mDisableListeners) return true;
-                final boolean val = (Boolean) newValue;
-                mMetricsFeatureProvider.action(mContext, MetricsEvent.ACTION_ZEN_ALLOW_REMINDERS,
-                        val);
-                if (DEBUG) Log.d(TAG, "onPrefChange allowReminders=" + val);
-                savePolicy(getNewPriorityCategories(val, Policy.PRIORITY_CATEGORY_REMINDERS),
-                        mPolicy.priorityCallSenders, mPolicy.priorityMessageSenders,
-                        mPolicy.suppressedVisualEffects);
-                return true;
-            }
-        });
-
-        mEvents = (SwitchPreference) root.findPreference(KEY_EVENTS);
-        mEvents.setOnPreferenceChangeListener(new OnPreferenceChangeListener() {
-            @Override
-            public boolean onPreferenceChange(Preference preference, Object newValue) {
-                if (mDisableListeners) return true;
-                final boolean val = (Boolean) newValue;
-                mMetricsFeatureProvider.action(mContext, MetricsEvent.ACTION_ZEN_ALLOW_EVENTS, val);
-                if (DEBUG) Log.d(TAG, "onPrefChange allowEvents=" + val);
-                savePolicy(getNewPriorityCategories(val, Policy.PRIORITY_CATEGORY_EVENTS),
-                        mPolicy.priorityCallSenders, mPolicy.priorityMessageSenders,
-                        mPolicy.suppressedVisualEffects);
-                return true;
-            }
-        });
-
-        mMessages = (DropDownPreference) root.findPreference(KEY_MESSAGES);
-        addSources(mMessages);
-        mMessages.setOnPreferenceChangeListener(new OnPreferenceChangeListener() {
-            @Override
-            public boolean onPreferenceChange(Preference preference, Object newValue) {
-                if (mDisableListeners) return false;
-                final int val = Integer.parseInt((String) newValue);
-                final boolean allowMessages = val != SOURCE_NONE;
-                final int allowMessagesFrom =
-                        val == SOURCE_NONE ? mPolicy.priorityMessageSenders : val;
-                mMetricsFeatureProvider.action(mContext, MetricsEvent.ACTION_ZEN_ALLOW_MESSAGES, val);
-                if (DEBUG) Log.d(TAG, "onPrefChange allowMessages=" + allowMessages
-                        + " allowMessagesFrom=" + ZenModeConfig.sourceToString(allowMessagesFrom));
-                savePolicy(
-                        getNewPriorityCategories(allowMessages, Policy.PRIORITY_CATEGORY_MESSAGES),
-                        mPolicy.priorityCallSenders, allowMessagesFrom,
-                        mPolicy.suppressedVisualEffects);
-                return true;
-            }
-        });
-
-        mCalls = (DropDownPreference) root.findPreference(KEY_CALLS);
-        addSources(mCalls);
-        mCalls.setOnPreferenceChangeListener(new OnPreferenceChangeListener() {
-            @Override
-            public boolean onPreferenceChange(Preference preference, Object newValue) {
-                if (mDisableListeners) return false;
-                final int val = Integer.parseInt((String) newValue);
-                final boolean allowCalls = val != SOURCE_NONE;
-                final int allowCallsFrom = val == SOURCE_NONE ? mPolicy.priorityCallSenders : val;
-                mMetricsFeatureProvider.action(mContext, MetricsEvent.ACTION_ZEN_ALLOW_CALLS, val);
-                if (DEBUG) Log.d(TAG, "onPrefChange allowCalls=" + allowCalls
-                        + " allowCallsFrom=" + ZenModeConfig.sourceToString(allowCallsFrom));
-                savePolicy(getNewPriorityCategories(allowCalls, Policy.PRIORITY_CATEGORY_CALLS),
-                        allowCallsFrom, mPolicy.priorityMessageSenders,
-                        mPolicy.suppressedVisualEffects);
-                return true;
-            }
-        });
-
-        mRepeatCallers = (SwitchPreference) root.findPreference(KEY_REPEAT_CALLERS);
-        mRepeatCallers.setSummary(mContext.getString(R.string.zen_mode_repeat_callers_summary,
-                mContext.getResources().getInteger(com.android.internal.R.integer
-                        .config_zen_repeat_callers_threshold)));
-        mRepeatCallers.setOnPreferenceChangeListener(new OnPreferenceChangeListener() {
-            @Override
-            public boolean onPreferenceChange(Preference preference, Object newValue) {
-                if (mDisableListeners) return true;
-                final boolean val = (Boolean) newValue;
-                mMetricsFeatureProvider.action(mContext, MetricsEvent.ACTION_ZEN_ALLOW_REPEAT_CALLS,
-                        val);
-                if (DEBUG) Log.d(TAG, "onPrefChange allowRepeatCallers=" + val);
-                int priorityCategories = getNewPriorityCategories(val,
-                        NotificationManager.Policy.PRIORITY_CATEGORY_REPEAT_CALLERS);
-                savePolicy(priorityCategories, mPolicy.priorityCallSenders,
-                        mPolicy.priorityMessageSenders, mPolicy.suppressedVisualEffects);
-                return true;
-            }
-        });
-
-        updateControls();
-    }
-
-    @Override
-    protected void onZenModeChanged() {
-        // don't care
-    }
-
-    @Override
-    protected void onZenModeConfigChanged() {
-        mPolicy = NotificationManager.from(mContext).getNotificationPolicy();
-        updateControls();
-    }
-
-    private void updateControls() {
-        mDisableListeners = true;
-        if (mCalls != null) {
-            mCalls.setValue(Integer.toString(
-                    isPriorityCategoryEnabled(Policy.PRIORITY_CATEGORY_CALLS)
-                            ? mPolicy.priorityCallSenders : SOURCE_NONE));
-        }
-        mMessages.setValue(Integer.toString(
-                isPriorityCategoryEnabled(Policy.PRIORITY_CATEGORY_MESSAGES)
-                        ? mPolicy.priorityMessageSenders : SOURCE_NONE));
-        mReminders.setChecked(isPriorityCategoryEnabled(Policy.PRIORITY_CATEGORY_REMINDERS));
-        mEvents.setChecked(isPriorityCategoryEnabled(Policy.PRIORITY_CATEGORY_EVENTS));
-        mRepeatCallers.setChecked(
-                isPriorityCategoryEnabled(Policy.PRIORITY_CATEGORY_REPEAT_CALLERS));
-        mRepeatCallers.setVisible(!isPriorityCategoryEnabled(Policy.PRIORITY_CATEGORY_CALLS)
-                || mPolicy.priorityCallSenders != Policy.PRIORITY_SENDERS_ANY);
-        mDisableListeners = false;
-    }
-
-    @Override
-    public int getMetricsCategory() {
-        return MetricsEvent.NOTIFICATION_ZEN_MODE_PRIORITY;
-    }
-
-    private static void addSources(DropDownPreference pref) {
-        pref.setEntries(new CharSequence[]{
-                pref.getContext().getString(R.string.zen_mode_from_anyone),
-                pref.getContext().getString(R.string.zen_mode_from_contacts),
-                pref.getContext().getString(R.string.zen_mode_from_starred),
-                pref.getContext().getString(R.string.zen_mode_from_none),
-        });
-        pref.setEntryValues(new CharSequence[] {
-                Integer.toString(Policy.PRIORITY_SENDERS_ANY),
-                Integer.toString(Policy.PRIORITY_SENDERS_CONTACTS),
-                Integer.toString(Policy.PRIORITY_SENDERS_STARRED),
-                Integer.toString(SOURCE_NONE),
-        });
-    }
-
-    private boolean isPriorityCategoryEnabled(int categoryType) {
-        return (mPolicy.priorityCategories & categoryType) != 0;
-    }
-
-    private int getNewPriorityCategories(boolean allow, int categoryType) {
-        int priorityCategories = mPolicy.priorityCategories;
-        if (allow) {
-            priorityCategories |= categoryType;
-        } else {
-            priorityCategories &= ~categoryType;
-        }
-        return priorityCategories;
-    }
-
-    private void savePolicy(int priorityCategories, int priorityCallSenders,
-            int priorityMessageSenders, int suppressedVisualEffects) {
-        mPolicy = new Policy(priorityCategories, priorityCallSenders, priorityMessageSenders,
-                suppressedVisualEffects);
-        NotificationManager.from(mContext).setNotificationPolicy(mPolicy);
-    }
-
-}
diff --git a/src/com/android/settings/notification/ZenModeRemindersPreferenceController.java b/src/com/android/settings/notification/ZenModeRemindersPreferenceController.java
new file mode 100644
index 0000000..edc7cf9
--- /dev/null
+++ b/src/com/android/settings/notification/ZenModeRemindersPreferenceController.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.notification;
+
+import android.app.NotificationManager;
+import android.content.Context;
+import android.provider.Settings;
+import android.support.v14.preference.SwitchPreference;
+import android.support.v7.preference.Preference;
+import android.util.Log;
+
+import com.android.settingslib.core.lifecycle.Lifecycle;
+
+public class ZenModeRemindersPreferenceController extends AbstractZenModePreferenceController
+        implements Preference.OnPreferenceChangeListener {
+
+    protected static final String KEY = "zen_mode_reminders";
+    private final ZenModeBackend mBackend;
+
+    public ZenModeRemindersPreferenceController(Context context, Lifecycle lifecycle) {
+        super(context, KEY, lifecycle);
+        mBackend = ZenModeBackend.getInstance(context);
+    }
+
+    @Override
+    public String getPreferenceKey() {
+        return KEY;
+    }
+
+    @Override
+    public boolean isAvailable() {
+        return true;
+    }
+
+    @Override
+    public void updateState(Preference preference) {
+        super.updateState(preference);
+
+        SwitchPreference pref = (SwitchPreference) preference;
+        switch (getZenMode()) {
+            case Settings.Global.ZEN_MODE_NO_INTERRUPTIONS:
+            case Settings.Global.ZEN_MODE_ALARMS:
+                pref.setEnabled(false);
+                pref.setChecked(false);
+                break;
+            default:
+                pref.setEnabled(true);
+                pref.setChecked(mBackend.isPriorityCategoryEnabled(
+                        NotificationManager.Policy.PRIORITY_CATEGORY_REMINDERS));
+        }
+    }
+
+    @Override
+    public boolean onPreferenceChange(Preference preference, Object newValue) {
+        final boolean allowReminders = (Boolean) newValue;
+        if (ZenModeSettingsBase.DEBUG) Log.d(TAG, "onPrefChange allowReminders=" + allowReminders);
+        mBackend.saveSoundPolicy(NotificationManager.Policy.PRIORITY_CATEGORY_REMINDERS,
+                allowReminders);
+        return true;
+    }
+}
diff --git a/src/com/android/settings/notification/ZenModeRepeatCallersPreferenceController.java b/src/com/android/settings/notification/ZenModeRepeatCallersPreferenceController.java
new file mode 100644
index 0000000..1d18409
--- /dev/null
+++ b/src/com/android/settings/notification/ZenModeRepeatCallersPreferenceController.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.notification;
+
+import android.app.NotificationManager.Policy;
+import android.content.Context;
+import android.provider.Settings;
+import android.support.v14.preference.SwitchPreference;
+import android.support.v7.preference.Preference;
+import android.util.Log;
+
+import com.android.settingslib.core.lifecycle.Lifecycle;
+
+public class ZenModeRepeatCallersPreferenceController extends AbstractZenModePreferenceController
+        implements Preference.OnPreferenceChangeListener {
+
+    protected static final String KEY = "zen_mode_repeat_callers";
+    private final ZenModeBackend mBackend;
+
+    public ZenModeRepeatCallersPreferenceController(Context context, Lifecycle lifecycle) {
+        super(context, KEY, lifecycle);
+        mBackend = ZenModeBackend.getInstance(context);
+    }
+
+    @Override
+    public String getPreferenceKey() {
+        return KEY;
+    }
+
+    @Override
+    public boolean isAvailable() {
+        return true;
+    }
+
+    @Override
+    public void updateState(Preference preference) {
+        super.updateState(preference);
+
+        SwitchPreference pref = (SwitchPreference) preference;
+
+        switch (getZenMode()) {
+            case Settings.Global.ZEN_MODE_NO_INTERRUPTIONS:
+            case Settings.Global.ZEN_MODE_ALARMS:
+                pref.setEnabled(false);
+                pref.setChecked(false);
+                break;
+            default:
+                boolean anyCallersCanBypassDnd = (mBackend.isPriorityCategoryEnabled(
+                        Policy.PRIORITY_CATEGORY_CALLS)
+                        && mBackend.getPriorityCallSenders() == Policy.PRIORITY_SENDERS_ANY);
+                // if any caller can bypass dnd then repeat callers preference is disabled
+                if (anyCallersCanBypassDnd) {
+                    pref.setEnabled(false);
+                    pref.setChecked(true);
+                } else {
+                    pref.setEnabled(true);
+                    pref.setChecked(mBackend.isPriorityCategoryEnabled(
+                            Policy.PRIORITY_CATEGORY_REPEAT_CALLERS));
+                }
+        }
+    }
+
+    @Override
+    public boolean onPreferenceChange(Preference preference, Object newValue) {
+        final boolean allowRepeatCallers = (Boolean) newValue;
+        if (ZenModeSettingsBase.DEBUG) Log.d(TAG, "onPrefChange allowRepeatCallers="
+                + allowRepeatCallers);
+        mBackend.saveSoundPolicy(Policy.PRIORITY_CATEGORY_REPEAT_CALLERS, allowRepeatCallers);
+        return true;
+    }
+}
diff --git a/src/com/android/settings/notification/ZenModeRuleSettingsBase.java b/src/com/android/settings/notification/ZenModeRuleSettingsBase.java
index 4abdd7e..069d38b 100644
--- a/src/com/android/settings/notification/ZenModeRuleSettingsBase.java
+++ b/src/com/android/settings/notification/ZenModeRuleSettingsBase.java
@@ -44,6 +44,9 @@
 import com.android.settings.R;
 import com.android.settings.SettingsActivity;
 import com.android.settings.widget.SwitchBar;
+import com.android.settingslib.core.AbstractPreferenceController;
+
+import java.util.List;
 
 public abstract class ZenModeRuleSettingsBase extends ZenModeSettingsBase
         implements SwitchBar.OnSwitchChangeListener {
@@ -72,8 +75,6 @@
 
     @Override
     public void onCreate(Bundle icicle) {
-        super.onCreate(icicle);
-
         mContext = getActivity();
 
         final Intent intent = getActivity().getIntent();
@@ -85,11 +86,19 @@
         }
 
         mId = intent.getStringExtra(ConditionProviderService.EXTRA_RULE_ID);
+        if (mId == null) {
+            Log.w(TAG, "rule id is null");
+            toastAndFinish();
+            return;
+        }
+
         if (DEBUG) Log.d(TAG, "mId=" + mId);
         if (refreshRuleOrFinish()) {
             return;
         }
 
+        super.onCreate(icicle);
+
         setHasOptionsMenu(true);
 
         onCreateInternal();
@@ -123,7 +132,7 @@
                 if (zenMode == mRule.getInterruptionFilter()) return false;
                 if (DEBUG) Log.d(TAG, "onPrefChange zenMode=" + zenMode);
                 mRule.setInterruptionFilter(zenMode);
-                setZenRule(mId, mRule);
+                mBackend.setZenRule(mId, mRule);
                 return true;
             }
         });
@@ -132,6 +141,11 @@
     }
 
     @Override
+    protected List<AbstractPreferenceController> getPreferenceControllers(Context context) {
+        return null;
+    }
+
+    @Override
     public void onResume() {
         super.onResume();
         if (isUiRestricted()) {
@@ -166,7 +180,7 @@
         mMetricsFeatureProvider.action(mContext, MetricsEvent.ACTION_ZEN_ENABLE_RULE, enabled);
         if (DEBUG) Log.d(TAG, "onSwitchChanged enabled=" + enabled);
         mRule.setEnabled(enabled);
-        setZenRule(mId, mRule);
+        mBackend.setZenRule(mId, mRule);
         if (enabled) {
             final int toastText = getEnabledToastText();
             if (toastText != 0) {
@@ -182,16 +196,12 @@
 
     protected void updateRule(Uri newConditionId) {
         mRule.setConditionId(newConditionId);
-        setZenRule(mId, mRule);
-    }
-
-    @Override
-    protected void onZenModeChanged() {
-        // noop
+        mBackend.setZenRule(mId, mRule);
     }
 
     @Override
     protected void onZenModeConfigChanged() {
+        super.onZenModeConfigChanged();
         if (!refreshRuleOrFinish()) {
             updateControls();
         }
@@ -215,11 +225,11 @@
     }
 
     private void showRuleNameDialog() {
-        new ZenRuleNameDialog(mContext, mRule.getName()) {
+        new ZenRuleNameDialog(mContext, mRule.getName(), null) {
             @Override
             public void onOk(String ruleName) {
                 mRule.setName(ruleName);
-                setZenRule(mId, mRule);
+                mBackend.setZenRule(mId, mRule);
             }
         }.show();
     }
@@ -244,7 +254,7 @@
                         mMetricsFeatureProvider.action(mContext,
                                 MetricsEvent.ACTION_ZEN_DELETE_RULE_OK);
                         mDeleting = true;
-                        removeZenRule(mId);
+                        mBackend.removeZenRule(mId);
                     }
                 })
                 .show();
@@ -287,5 +297,4 @@
         }
         mDisableListeners = false;
     }
-
 }
diff --git a/src/com/android/settings/notification/ZenModeScheduleRuleSettings.java b/src/com/android/settings/notification/ZenModeScheduleRuleSettings.java
index 72f6567..ab0349e 100644
--- a/src/com/android/settings/notification/ZenModeScheduleRuleSettings.java
+++ b/src/com/android/settings/notification/ZenModeScheduleRuleSettings.java
@@ -19,7 +19,6 @@
 import android.app.AlertDialog;
 import android.app.AutomaticZenRule;
 import android.app.Dialog;
-import android.app.DialogFragment;
 import android.app.FragmentManager;
 import android.app.TimePickerDialog;
 import android.content.Context;
@@ -40,10 +39,12 @@
 import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
 import com.android.settings.R;
 import com.android.settings.core.instrumentation.InstrumentedDialogFragment;
+import com.android.settingslib.core.AbstractPreferenceController;
 
 import java.text.SimpleDateFormat;
 import java.util.Arrays;
 import java.util.Calendar;
+import java.util.List;
 
 public class ZenModeScheduleRuleSettings extends ZenModeRuleSettingsBase {
     private static final String KEY_DAYS = "days";
@@ -71,6 +72,16 @@
     }
 
     @Override
+    protected int getPreferenceScreenResId() {
+        return R.xml.zen_mode_schedule_rule_settings;
+    }
+
+    @Override
+    protected List<AbstractPreferenceController> getPreferenceControllers(Context context) {
+        return null;
+    }
+
+    @Override
     protected String getZenModeDependency() {
         return mDays.getKey();
     }
@@ -82,7 +93,6 @@
 
     @Override
     protected void onCreateInternal() {
-        addPreferencesFromResource(R.xml.zen_mode_schedule_rule_settings);
         final PreferenceScreen root = getPreferenceScreen();
 
         mDays = root.findPreference(KEY_DAYS);
@@ -306,5 +316,4 @@
             boolean onSetTime(int hour, int minute);
         }
     }
-
 }
diff --git a/src/com/android/settings/notification/ZenModeScreenOffPreferenceController.java b/src/com/android/settings/notification/ZenModeScreenOffPreferenceController.java
new file mode 100644
index 0000000..2b70706
--- /dev/null
+++ b/src/com/android/settings/notification/ZenModeScreenOffPreferenceController.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.notification;
+
+import android.app.NotificationManager.Policy;
+import android.content.Context;
+import android.support.v14.preference.SwitchPreference;
+import android.support.v7.preference.Preference;
+import android.util.Log;
+
+import com.android.settingslib.core.lifecycle.Lifecycle;
+
+public class ZenModeScreenOffPreferenceController extends
+        AbstractZenModePreferenceController implements Preference.OnPreferenceChangeListener {
+
+    protected static final String KEY = "zen_mode_screen_off";
+    private final ZenModeBackend mBackend;
+
+    public ZenModeScreenOffPreferenceController(Context context, Lifecycle lifecycle) {
+        super(context, KEY, lifecycle);
+        mBackend = ZenModeBackend.getInstance(context);
+    }
+
+    @Override
+    public String getPreferenceKey() {
+        return KEY;
+    }
+
+    @Override
+    public boolean isAvailable() {
+        return true;
+    }
+
+    @Override
+    public void updateState(Preference preference) {
+        super.updateState(preference);
+
+        SwitchPreference pref = (SwitchPreference) preference;
+        pref.setChecked(mBackend.isEffectAllowed(Policy.SUPPRESSED_EFFECT_SCREEN_OFF));
+    }
+
+    @Override
+    public boolean onPreferenceChange(Preference preference, Object newValue) {
+        final boolean bypass = (Boolean) newValue;
+        if (ZenModeSettingsBase.DEBUG) Log.d(TAG, "onPrefChange allowWhenScreenOff="
+                + !bypass);
+        mBackend.saveVisualEffectsPolicy(Policy.SUPPRESSED_EFFECT_SCREEN_OFF, bypass);
+        return true;
+    }
+}
diff --git a/src/com/android/settings/notification/ZenModeScreenOnPreferenceController.java b/src/com/android/settings/notification/ZenModeScreenOnPreferenceController.java
new file mode 100644
index 0000000..8e0b348
--- /dev/null
+++ b/src/com/android/settings/notification/ZenModeScreenOnPreferenceController.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.notification;
+
+import android.app.NotificationManager.Policy;
+import android.content.Context;
+import android.support.v14.preference.SwitchPreference;
+import android.support.v7.preference.Preference;
+import android.util.Log;
+
+import com.android.settingslib.core.lifecycle.Lifecycle;
+
+public class ZenModeScreenOnPreferenceController extends
+        AbstractZenModePreferenceController implements Preference.OnPreferenceChangeListener {
+
+    protected static final String KEY = "zen_mode_screen_on";
+    private final ZenModeBackend mBackend;
+
+    public ZenModeScreenOnPreferenceController(Context context, Lifecycle lifecycle) {
+        super(context, KEY, lifecycle);
+        mBackend = ZenModeBackend.getInstance(context);
+    }
+
+    @Override
+    public String getPreferenceKey() {
+        return KEY;
+    }
+
+    @Override
+    public boolean isAvailable() {
+        return true;
+    }
+
+    @Override
+    public void updateState(Preference preference) {
+        super.updateState(preference);
+
+        SwitchPreference pref = (SwitchPreference) preference;
+        pref.setChecked(mBackend.isEffectAllowed(Policy.SUPPRESSED_EFFECT_SCREEN_ON));
+    }
+
+    @Override
+    public boolean onPreferenceChange(Preference preference, Object newValue) {
+        final boolean bypass = (Boolean) newValue;
+        if (ZenModeSettingsBase.DEBUG) Log.d(TAG, "onPrefChange allowWhenScreenOn="
+                + !bypass);
+
+        mBackend.saveVisualEffectsPolicy(Policy.SUPPRESSED_EFFECT_SCREEN_ON, bypass);
+        return true;
+    }
+}
diff --git a/src/com/android/settings/notification/ZenModeSettings.java b/src/com/android/settings/notification/ZenModeSettings.java
index 8cb700b..22d6fca 100644
--- a/src/com/android/settings/notification/ZenModeSettings.java
+++ b/src/com/android/settings/notification/ZenModeSettings.java
@@ -16,84 +16,31 @@
 
 package com.android.settings.notification;
 
-import android.app.AlertDialog;
 import android.app.AutomaticZenRule;
 import android.app.NotificationManager;
 import android.app.NotificationManager.Policy;
-import android.content.ComponentName;
 import android.content.Context;
-import android.content.DialogInterface;
-import android.content.Intent;
-import android.content.pm.ApplicationInfo;
-import android.content.pm.PackageManager;
-import android.content.pm.ServiceInfo;
-import android.content.res.Resources;
-import android.graphics.drawable.Drawable;
-import android.os.AsyncTask;
-import android.os.Bundle;
+import android.provider.SearchIndexableResource;
 import android.provider.Settings;
-import android.service.notification.ConditionProviderService;
-import android.service.notification.ZenModeConfig;
-import com.android.settings.utils.ManagedServiceSettings;
-import com.android.settings.utils.ZenServiceListing;
 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.support.v7.preference.PreferenceViewHolder;
-import android.view.View;
 
 import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
 import com.android.settings.R;
-import com.android.settingslib.TwoTargetPreference;
+import com.android.settings.search.BaseSearchIndexProvider;
+import com.android.settings.search.Indexable;
+import com.android.settingslib.core.AbstractPreferenceController;
+import com.android.settingslib.core.lifecycle.Lifecycle;
 
-import java.lang.ref.WeakReference;
+import java.util.ArrayList;
 import java.util.Arrays;
-import java.util.Comparator;
+import java.util.List;
 import java.util.Map;
 import java.util.Map.Entry;
 
 public class ZenModeSettings extends ZenModeSettingsBase {
-
-    public static final String KEY_VISUAL_SETTINGS = "visual_interruptions_settings";
-
-    private static final String KEY_PRIORITY_SETTINGS = "priority_settings";
-    private static final String KEY_AUTOMATIC_RULES = "automatic_rules";
-
-    static final ManagedServiceSettings.Config CONFIG = getConditionProviderConfig();
-
-    private PreferenceCategory mAutomaticRules;
-    private Preference mPrioritySettings;
-    private Preference mVisualSettings;
-    private Policy mPolicy;
-    private SummaryBuilder mSummaryBuilder;
-    private PackageManager mPm;
-    private ZenServiceListing mServiceListing;
-
     @Override
-    public void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-
-        addPreferencesFromResource(R.xml.zen_mode_settings);
-        final PreferenceScreen root = getPreferenceScreen();
-
-        mAutomaticRules = (PreferenceCategory) root.findPreference(KEY_AUTOMATIC_RULES);
-        mPrioritySettings = root.findPreference(KEY_PRIORITY_SETTINGS);
-        mVisualSettings = root.findPreference(KEY_VISUAL_SETTINGS);
-        mPolicy = NotificationManager.from(mContext).getNotificationPolicy();
-        mSummaryBuilder = new SummaryBuilder(getContext());
-        mPm = mContext.getPackageManager();
-        mServiceListing = new ZenServiceListing(mContext, CONFIG);
-        mServiceListing.reloadApprovedServices();
-    }
-
-    @Override
-    public void onResume() {
-        super.onResume();
-        if (isUiRestricted()) {
-            return;
-        }
-        updateControls();
+    protected int getPreferenceScreenResId() {
+        return R.xml.zen_mode_settings;
     }
 
     @Override
@@ -102,246 +49,22 @@
     }
 
     @Override
-    protected void onZenModeChanged() {
-        updateControls();
+    protected List<AbstractPreferenceController> getPreferenceControllers(Context context) {
+        return buildPreferenceControllers(context, getLifecycle());
     }
 
     @Override
-    protected void onZenModeConfigChanged() {
-        mPolicy = NotificationManager.from(mContext).getNotificationPolicy();
-        updateControls();
-    }
-
-    private void updateControls() {
-        updatePrioritySettingsSummary();
-        updateVisualSettingsSummary();
-        updateAutomaticRules();
-    }
-
-    private void updatePrioritySettingsSummary() {
-        mPrioritySettings.setSummary(mSummaryBuilder.getPrioritySettingSummary(mPolicy));
-    }
-
-    private void updateVisualSettingsSummary() {
-        mVisualSettings.setSummary(mSummaryBuilder.getVisualSettingSummary(mPolicy));
-    }
-
-    private void updateAutomaticRules() {
-        mAutomaticRules.removeAll();
-        final Map.Entry<String,AutomaticZenRule>[] sortedRules = sortedRules();
-        for (Map.Entry<String,AutomaticZenRule> sortedRule : sortedRules) {
-            ZenRulePreference pref = new ZenRulePreference(getPrefContext(), sortedRule);
-            if (pref.appExists) {
-                mAutomaticRules.addPreference(pref);
-            }
-        }
-        final Preference p = new Preference(getPrefContext());
-        p.setIcon(R.drawable.ic_menu_add);
-        p.setTitle(R.string.zen_mode_add_rule);
-        p.setPersistent(false);
-        p.setOnPreferenceClickListener(new Preference.OnPreferenceClickListener() {
-            @Override
-            public boolean onPreferenceClick(Preference preference) {
-                mMetricsFeatureProvider.action(mContext, MetricsEvent.ACTION_ZEN_ADD_RULE);
-                showAddRuleDialog();
-                return true;
-            }
-        });
-        mAutomaticRules.addPreference(p);
-    }
-
-    private void showAddRuleDialog() {
-        new ZenRuleSelectionDialog(mContext, mServiceListing) {
-            @Override
-            public void onSystemRuleSelected(ZenRuleInfo ri) {
-                showNameRuleDialog(ri);
-            }
-
-            @Override
-            public void onExternalRuleSelected(ZenRuleInfo ri) {
-                Intent intent = new Intent().setComponent(ri.configurationActivity);
-                startActivity(intent);
-            }
-        }.show();
-    }
-
-    private String computeRuleSummary(AutomaticZenRule rule, boolean isSystemRule,
-            CharSequence providerLabel) {
-        final String mode = computeZenModeCaption(getResources(), rule.getInterruptionFilter());
-        final String ruleState = (rule == null || !rule.isEnabled())
-                ? getString(R.string.switch_off_text)
-                : getString(R.string.zen_mode_rule_summary_enabled_combination, mode);
-
-        return ruleState;
-    }
-
-    private static ManagedServiceSettings.Config getConditionProviderConfig() {
-        final ManagedServiceSettings.Config c = new ManagedServiceSettings.Config();
-        c.tag = TAG;
-        c.intentAction = ConditionProviderService.SERVICE_INTERFACE;
-        c.permission = android.Manifest.permission.BIND_CONDITION_PROVIDER_SERVICE;
-        c.noun = "condition provider";
-        return c;
-    }
-
-    private static String computeZenModeCaption(Resources res, int zenMode) {
-        switch (zenMode) {
-            case NotificationManager.INTERRUPTION_FILTER_ALARMS:
-                return res.getString(R.string.zen_mode_option_alarms);
-            case NotificationManager.INTERRUPTION_FILTER_PRIORITY:
-                return res.getString(R.string.zen_mode_option_important_interruptions);
-            case NotificationManager.INTERRUPTION_FILTER_NONE:
-                return res.getString(R.string.zen_mode_option_no_interruptions);
-            default:
-                return null;
-        }
-    }
-
-    public static ZenRuleInfo getRuleInfo(PackageManager pm, ServiceInfo si) {
-        if (si == null || si.metaData == null) return null;
-        final String ruleType = si.metaData.getString(ConditionProviderService.META_DATA_RULE_TYPE);
-        final ComponentName configurationActivity = getSettingsActivity(si);
-        if (ruleType != null && !ruleType.trim().isEmpty() && configurationActivity != null) {
-            final ZenRuleInfo ri = new ZenRuleInfo();
-            ri.serviceComponent = new ComponentName(si.packageName, si.name);
-            ri.settingsAction = Settings.ACTION_ZEN_MODE_EXTERNAL_RULE_SETTINGS;
-            ri.title = ruleType;
-            ri.packageName = si.packageName;
-            ri.configurationActivity = getSettingsActivity(si);
-            ri.packageLabel = si.applicationInfo.loadLabel(pm);
-            ri.ruleInstanceLimit =
-                    si.metaData.getInt(ConditionProviderService.META_DATA_RULE_INSTANCE_LIMIT, -1);
-            return ri;
-        }
-        return null;
-    }
-
-    private static ComponentName getSettingsActivity(ServiceInfo si) {
-        if (si == null || si.metaData == null) return null;
-        final String configurationActivity =
-                si.metaData.getString(ConditionProviderService.META_DATA_CONFIGURATION_ACTIVITY);
-        if (configurationActivity != null) {
-            return ComponentName.unflattenFromString(configurationActivity);
-        }
-        return null;
-    }
-
-    private void showNameRuleDialog(final ZenRuleInfo ri) {
-        new ZenRuleNameDialog(mContext, null) {
-            @Override
-            public void onOk(String ruleName) {
-                mMetricsFeatureProvider.action(mContext, MetricsEvent.ACTION_ZEN_ADD_RULE_OK);
-                AutomaticZenRule rule = new AutomaticZenRule(ruleName, ri.serviceComponent,
-                        ri.defaultConditionId, NotificationManager.INTERRUPTION_FILTER_PRIORITY,
-                        true);
-                String savedRuleId = addZenRule(rule);
-                if (savedRuleId != null) {
-                    startActivity(getRuleIntent(ri.settingsAction, null, savedRuleId));
-                }
-            }
-        }.show();
-    }
-
-    private void showDeleteRuleDialog(final String ruleId, final CharSequence ruleName) {
-        new AlertDialog.Builder(mContext)
-                .setMessage(getString(R.string.zen_mode_delete_rule_confirmation, ruleName))
-                .setNegativeButton(R.string.cancel, null)
-                .setPositiveButton(R.string.zen_mode_delete_rule_button,
-                        new DialogInterface.OnClickListener() {
-                            @Override
-                            public void onClick(DialogInterface dialog, int which) {
-                                mMetricsFeatureProvider.action(mContext,
-                                        MetricsEvent.ACTION_ZEN_DELETE_RULE_OK);
-                                removeZenRule(ruleId);
-                            }
-                        })
-                .show();
-    }
-
-    private Intent getRuleIntent(String settingsAction, ComponentName configurationActivity,
-            String ruleId) {
-        Intent intent = new Intent()
-                .addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP)
-                .putExtra(ConditionProviderService.EXTRA_RULE_ID, ruleId);
-        if (configurationActivity != null) {
-            intent.setComponent(configurationActivity);
-        } else {
-            intent.setAction(settingsAction);
-        }
-        return intent;
-    }
-
-    private Map.Entry<String,AutomaticZenRule>[] sortedRules() {
-        final Map.Entry<String,AutomaticZenRule>[] rt =
-                mRules.toArray(new Map.Entry[mRules.size()]);
-        Arrays.sort(rt, RULE_COMPARATOR);
-        return rt;
-    }
-
-    @Override
-    protected int getHelpResource() {
+    public int getHelpResource() {
         return R.string.help_uri_interruptions;
     }
 
-    private class ZenRulePreference extends TwoTargetPreference {
-        final CharSequence mName;
-        final String mId;
-        final boolean appExists;
-
-        public ZenRulePreference(Context context,
-                final Map.Entry<String, AutomaticZenRule> ruleEntry) {
-            super(context);
-
-            final AutomaticZenRule rule = ruleEntry.getValue();
-            mName = rule.getName();
-            mId = ruleEntry.getKey();
-
-            final boolean isSchedule = ZenModeConfig.isValidScheduleConditionId(
-                    rule.getConditionId());
-            final boolean isEvent = ZenModeConfig.isValidEventConditionId(rule.getConditionId());
-            final boolean isSystemRule = isSchedule || isEvent;
-
-            try {
-                ApplicationInfo info = mPm.getApplicationInfo(rule.getOwner().getPackageName(), 0);
-                setSummary(computeRuleSummary(rule, isSystemRule, info.loadLabel(mPm)));
-            } catch (PackageManager.NameNotFoundException e) {
-                appExists = false;
-                return;
-            }
-
-            appExists = true;
-            setTitle(rule.getName());
-            setPersistent(false);
-
-            final String action = isSchedule ? ZenModeScheduleRuleSettings.ACTION
-                    : isEvent ? ZenModeEventRuleSettings.ACTION : "";
-            ServiceInfo si = mServiceListing.findService(rule.getOwner());
-            ComponentName settingsActivity = getSettingsActivity(si);
-            setIntent(getRuleIntent(action, settingsActivity, mId));
-            setSelectable(settingsActivity != null || isSystemRule);
-        }
-
-        @Override
-        protected int getSecondTargetResId() {
-            return R.layout.zen_rule_widget;
-        }
-
-        @Override
-        public void onBindViewHolder(PreferenceViewHolder view) {
-            super.onBindViewHolder(view);
-
-            View v = view.findViewById(R.id.delete_zen_rule);
-            if (v != null) {
-                v.setOnClickListener(mDeleteListener);
-            }
-        }
-
-        private final View.OnClickListener mDeleteListener = new View.OnClickListener() {
-            @Override
-            public void onClick(View v) {
-                showDeleteRuleDialog(mId, mName);
-            }
-        };
+    private static List<AbstractPreferenceController> buildPreferenceControllers(Context context,
+            Lifecycle lifecycle) {
+        List<AbstractPreferenceController> controllers = new ArrayList<>();
+        controllers.add(new ZenModeBehaviorPreferenceController(context, lifecycle));
+        controllers.add(new ZenModeAutomationPreferenceController(context));
+        controllers.add(new ZenModeButtonPreferenceController(context, lifecycle));
+        return controllers;
     }
 
     public static class SummaryBuilder {
@@ -352,42 +75,44 @@
             mContext = context;
         }
 
-        String getPrioritySettingSummary(Policy policy) {
-            String s = mContext.getString(R.string.zen_mode_alarms);
-            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);
-            if (isCategoryEnabled(policy, Policy.PRIORITY_CATEGORY_MESSAGES)) {
-                if (policy.priorityMessageSenders == Policy.PRIORITY_SENDERS_ANY) {
-                    s = append(s, true, R.string.zen_mode_all_messages);
-                } else {
-                    s = append(s, true, R.string.zen_mode_selected_messages);
-                }
-            }
-            if (isCategoryEnabled(policy, Policy.PRIORITY_CATEGORY_CALLS)) {
-                if (policy.priorityCallSenders == Policy.PRIORITY_SENDERS_ANY) {
-                    s = append(s, true, R.string.zen_mode_all_callers);
-                } else {
-                    s = append(s, true, R.string.zen_mode_selected_callers);
-                }
-            } else if (isCategoryEnabled(policy, Policy.PRIORITY_CATEGORY_REPEAT_CALLERS)) {
-                s = append(s, true, R.string.zen_mode_repeat_callers);
-            }
-            return s;
-        }
+        private static final int[] ALL_PRIORITY_CATEGORIES = {
+                Policy.PRIORITY_CATEGORY_ALARMS,
+                Policy.PRIORITY_CATEGORY_MEDIA_SYSTEM_OTHER,
+                Policy.PRIORITY_CATEGORY_REMINDERS,
+                Policy.PRIORITY_CATEGORY_EVENTS,
+                Policy.PRIORITY_CATEGORY_MESSAGES,
+                Policy.PRIORITY_CATEGORY_CALLS,
+                Policy.PRIORITY_CATEGORY_REPEAT_CALLERS,
+        };
 
-        String getVisualSettingSummary(Policy policy) {
-            String s = mContext.getString(R.string.zen_mode_all_visual_interruptions);
-            if (isEffectSuppressed(policy, Policy.SUPPRESSED_EFFECT_SCREEN_ON)
-                && isEffectSuppressed(policy, Policy.SUPPRESSED_EFFECT_SCREEN_OFF)) {
-                s = mContext.getString(R.string.zen_mode_no_visual_interruptions);
-            } else if (isEffectSuppressed(policy, Policy.SUPPRESSED_EFFECT_SCREEN_ON)) {
-                s = mContext.getString(R.string.zen_mode_screen_on_visual_interruptions);
-            } else if (isEffectSuppressed(policy, Policy.SUPPRESSED_EFFECT_SCREEN_OFF)) {
-                s = mContext.getString(R.string.zen_mode_screen_off_visual_interruptions);
+        String getBehaviorSettingSummary(Policy policy, int zenMode) {
+            List<String> enabledCategories;
+
+            if (zenMode == Settings.Global.ZEN_MODE_NO_INTERRUPTIONS) {
+                return mContext.getString(R.string.zen_mode_behavior_total_silence);
+            } else if (zenMode == Settings.Global.ZEN_MODE_ALARMS) {
+                return mContext.getString(R.string.zen_mode_behavior_alarms_only);
+            } else {
+                enabledCategories = getEnabledCategories(policy);
             }
-            return s;
+
+            int numCategories = enabledCategories.size();
+            if (numCategories == 0) {
+                return mContext.getString(R.string.zen_mode_behavior_no_sound);
+            }
+
+            String s = enabledCategories.get(0).toLowerCase();
+            for (int i = 1; i < numCategories; i++) {
+                if (i == numCategories - 1) {
+                    s = mContext.getString(R.string.join_many_items_last,
+                            s, enabledCategories.get(i).toLowerCase());
+                } else {
+                    s = mContext.getString(R.string.join_many_items_middle,
+                            s, enabledCategories.get(i).toLowerCase());
+                }
+            }
+
+            return mContext.getString(R.string.zen_mode_behavior_no_sound_except, s);
         }
 
         String getAutomaticRulesSummary() {
@@ -413,22 +138,45 @@
             return count;
         }
 
-        @VisibleForTesting
-        String append(String s, boolean condition, int resId) {
-            if (condition) {
-                return mContext.getString(
-                    R.string.join_many_items_middle, s, mContext.getString(resId));
+        private List<String> getEnabledCategories(Policy policy) {
+            List<String> enabledCategories = new ArrayList<>();
+            for (int category : ALL_PRIORITY_CATEGORIES) {
+                if (isCategoryEnabled(policy, category)) {
+                    if (category == Policy.PRIORITY_CATEGORY_ALARMS) {
+                        enabledCategories.add(mContext.getString(R.string.zen_mode_alarms));
+                    } else if (category == Policy.PRIORITY_CATEGORY_MEDIA_SYSTEM_OTHER) {
+                        enabledCategories.add(mContext.getString(
+                                R.string.zen_mode_media_system_other));
+                    } else if (category == Policy.PRIORITY_CATEGORY_REMINDERS) {
+                        enabledCategories.add(mContext.getString(R.string.zen_mode_reminders));
+                    } else if (category == Policy.PRIORITY_CATEGORY_EVENTS) {
+                        enabledCategories.add(mContext.getString(R.string.zen_mode_events));
+                    } else if (category == Policy.PRIORITY_CATEGORY_MESSAGES) {
+                        if (policy.priorityMessageSenders == Policy.PRIORITY_SENDERS_ANY) {
+                            enabledCategories.add(mContext.getString(
+                                    R.string.zen_mode_all_messages));
+                        } else {
+                            enabledCategories.add(mContext.getString(
+                                    R.string.zen_mode_selected_messages));
+                        }
+                    } else if (category == Policy.PRIORITY_CATEGORY_CALLS) {
+                        if (policy.priorityCallSenders == Policy.PRIORITY_SENDERS_ANY) {
+                            enabledCategories.add(mContext.getString(
+                                    R.string.zen_mode_all_callers));
+                        } else {
+                            enabledCategories.add(mContext.getString(
+                                    R.string.zen_mode_selected_callers));
+                        }
+                    } else if (category == Policy.PRIORITY_CATEGORY_REPEAT_CALLERS) {
+                        if (!enabledCategories.contains(mContext.getString(
+                                R.string.zen_mode_all_callers))) {
+                            enabledCategories.add(mContext.getString(
+                                    R.string.zen_mode_repeat_callers));
+                        }
+                    }
+                }
             }
-            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;
+            return enabledCategories;
         }
 
         private boolean isCategoryEnabled(Policy policy, int categoryType) {
@@ -440,27 +188,31 @@
         }
     }
 
-    private static final Comparator<Map.Entry<String,AutomaticZenRule>> RULE_COMPARATOR =
-            new Comparator<Map.Entry<String,AutomaticZenRule>>() {
+    /**
+     * For Search.
+     */
+    public static final Indexable.SearchIndexProvider SEARCH_INDEX_DATA_PROVIDER =
+            new BaseSearchIndexProvider() {
+
                 @Override
-                public int compare(Map.Entry<String,AutomaticZenRule> lhs,
-                        Map.Entry<String,AutomaticZenRule> rhs) {
-                    int byDate = Long.compare(lhs.getValue().getCreationTime(),
-                            rhs.getValue().getCreationTime());
-                    if (byDate != 0) {
-                        return byDate;
-                    } else {
-                        return key(lhs.getValue()).compareTo(key(rhs.getValue()));
-                    }
+                public List<SearchIndexableResource> getXmlResourcesToIndex(Context context,
+                        boolean enabled) {
+                    final SearchIndexableResource sir = new SearchIndexableResource(context);
+                    sir.xmlResId = R.xml.zen_mode_settings;
+                    return Arrays.asList(sir);
                 }
 
-                private String key(AutomaticZenRule rule) {
-                    final int type = ZenModeConfig.isValidScheduleConditionId(rule.getConditionId())
-                            ? 1
-                            : ZenModeConfig.isValidEventConditionId(rule.getConditionId())
-                                    ? 2
-                                    : 3;
-                    return type + rule.getName().toString();
+                @Override
+                public List<String> getNonIndexableKeys(Context context) {
+                    List<String> keys = super.getNonIndexableKeys(context);
+                    keys.add(ZenModeButtonPreferenceController.KEY);
+                    return keys;
+                }
+
+                @Override
+                public List<AbstractPreferenceController> getPreferenceControllers(Context
+                        context) {
+                    return buildPreferenceControllers(context, null);
                 }
             };
 }
diff --git a/src/com/android/settings/notification/ZenModeSettingsBase.java b/src/com/android/settings/notification/ZenModeSettingsBase.java
index 6a9431e..2aecae4 100644
--- a/src/com/android/settings/notification/ZenModeSettingsBase.java
+++ b/src/com/android/settings/notification/ZenModeSettingsBase.java
@@ -16,8 +16,6 @@
 
 package com.android.settings.notification;
 
-import android.app.AutomaticZenRule;
-import android.app.NotificationManager;
 import android.content.Context;
 import android.database.ContentObserver;
 import android.net.Uri;
@@ -26,17 +24,11 @@
 import android.os.UserManager;
 import android.provider.Settings;
 import android.provider.Settings.Global;
-import android.service.notification.ZenModeConfig;
 import android.util.Log;
 
-import com.android.settings.RestrictedSettingsFragment;
+import com.android.settings.dashboard.RestrictedDashboardFragment;
 
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
-abstract public class ZenModeSettingsBase extends RestrictedSettingsFragment {
+abstract public class ZenModeSettingsBase extends RestrictedDashboardFragment {
     protected static final String TAG = "ZenModeSettings";
     protected static final boolean DEBUG = Log.isLoggable(TAG, Log.DEBUG);
 
@@ -44,30 +36,33 @@
     private final SettingsObserver mSettingsObserver = new SettingsObserver();
 
     protected Context mContext;
-    protected Set<Map.Entry<String, AutomaticZenRule>> mRules;
     protected int mZenMode;
 
-    abstract protected void onZenModeChanged();
-    abstract protected void onZenModeConfigChanged();
+    protected ZenModeBackend mBackend;
+
+    protected void onZenModeConfigChanged() {};
 
     public ZenModeSettingsBase() {
         super(UserManager.DISALLOW_ADJUST_VOLUME);
     }
 
     @Override
+    protected String getLogTag() {
+        return TAG;
+    }
+
+    @Override
     public void onCreate(Bundle icicle) {
-        super.onCreate(icicle);
         mContext = getActivity();
+        mBackend = ZenModeBackend.getInstance(mContext);
+        super.onCreate(icicle);
         updateZenMode(false /*fireChanged*/);
-        maybeRefreshRules(true, false /*fireChanged*/);
-        if (DEBUG) Log.d(TAG, "Loaded mRules=" + mRules);
     }
 
     @Override
     public void onResume() {
         super.onResume();
         updateZenMode(true /*fireChanged*/);
-        maybeRefreshRules(true, true /*fireChanged*/);
         mSettingsObserver.register();
         if (isUiRestricted()) {
             if (isUiRestrictedByOnlyAdmin()) {
@@ -89,56 +84,7 @@
         final int zenMode = Settings.Global.getInt(getContentResolver(), Global.ZEN_MODE, mZenMode);
         if (zenMode == mZenMode) return;
         mZenMode = zenMode;
-        if (DEBUG) Log.d(TAG, "updateZenMode mZenMode=" + mZenMode);
-        if (fireChanged) {
-            onZenModeChanged();
-        }
-    }
-
-    protected String addZenRule(AutomaticZenRule rule) {
-        try {
-            String id = NotificationManager.from(mContext).addAutomaticZenRule(rule);
-            final AutomaticZenRule savedRule =
-                    NotificationManager.from(mContext).getAutomaticZenRule(id);
-            maybeRefreshRules(savedRule != null, true);
-            return id;
-        } catch (Exception e) {
-            return null;
-        }
-    }
-
-    protected boolean setZenRule(String id, AutomaticZenRule rule) {
-        final boolean success =
-                NotificationManager.from(mContext).updateAutomaticZenRule(id, rule);
-        maybeRefreshRules(success, true);
-        return success;
-    }
-
-    protected boolean removeZenRule(String id) {
-        final boolean success =
-                NotificationManager.from(mContext).removeAutomaticZenRule(id);
-        maybeRefreshRules(success, true);
-        return success;
-    }
-
-    protected void maybeRefreshRules(boolean success, boolean fireChanged) {
-        if (success) {
-            mRules = getZenModeRules();
-            if (DEBUG) Log.d(TAG, "Refreshed mRules=" + mRules);
-            if (fireChanged) {
-                onZenModeConfigChanged();
-            }
-        }
-    }
-
-    protected void setZenMode(int zenMode, Uri conditionId) {
-        NotificationManager.from(mContext).setZenMode(zenMode, conditionId, TAG);
-    }
-
-    private Set<Map.Entry<String, AutomaticZenRule>> getZenModeRules() {
-        Map<String, AutomaticZenRule> ruleMap
-                = NotificationManager.from(mContext).getAutomaticZenRules();
-        return ruleMap.entrySet();
+        if (DEBUG) Log.d(TAG, "updateZenMode mZenMode=" + mZenMode + " " + fireChanged);
     }
 
     private final class SettingsObserver extends ContentObserver {
@@ -165,7 +111,8 @@
                 updateZenMode(true /*fireChanged*/);
             }
             if (ZEN_MODE_CONFIG_ETAG_URI.equals(uri)) {
-                maybeRefreshRules(true, true /*fireChanged*/);
+                mBackend.updatePolicy();
+                onZenModeConfigChanged();
             }
         }
     }
diff --git a/src/com/android/settings/notification/ZenModeVisualInterruptionSettings.java b/src/com/android/settings/notification/ZenModeVisualInterruptionSettings.java
deleted file mode 100644
index aa27848..0000000
--- a/src/com/android/settings/notification/ZenModeVisualInterruptionSettings.java
+++ /dev/null
@@ -1,125 +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.notification;
-
-import android.app.NotificationManager;
-import android.app.NotificationManager.Policy;
-import android.os.Bundle;
-import android.support.v14.preference.SwitchPreference;
-import android.support.v7.preference.Preference;
-import android.support.v7.preference.PreferenceScreen;
-import android.util.Log;
-
-import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
-import com.android.settings.R;
-
-public class ZenModeVisualInterruptionSettings extends ZenModeSettingsBase {
-
-    private static final String KEY_SCREEN_OFF = "screenOff";
-    private static final String KEY_SCREEN_ON = "screenOn";
-
-    private SwitchPreference mScreenOff;
-    private SwitchPreference mScreenOn;
-
-    private boolean mDisableListeners;
-    private NotificationManager.Policy mPolicy;
-
-    @Override
-    public void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        addPreferencesFromResource(R.xml.zen_mode_visual_interruptions_settings);
-        final PreferenceScreen root = getPreferenceScreen();
-
-        mPolicy = NotificationManager.from(mContext).getNotificationPolicy();
-
-        mScreenOff = (SwitchPreference) root.findPreference(KEY_SCREEN_OFF);
-        if (!getResources()
-                .getBoolean(com.android.internal.R.bool.config_intrusiveNotificationLed)) {
-            mScreenOff.setSummary(R.string.zen_mode_screen_off_summary_no_led);
-        }
-        mScreenOff.setOnPreferenceChangeListener(new Preference.OnPreferenceChangeListener() {
-            @Override
-            public boolean onPreferenceChange(Preference preference, Object newValue) {
-                if (mDisableListeners) return true;
-                final boolean val = (Boolean) newValue;
-                mMetricsFeatureProvider.action(mContext,
-                        MetricsEvent.ACTION_ZEN_ALLOW_WHEN_SCREEN_OFF, val);
-                if (DEBUG) Log.d(TAG, "onPrefChange suppressWhenScreenOff=" + val);
-                savePolicy(getNewSuppressedEffects(val, Policy.SUPPRESSED_EFFECT_SCREEN_OFF));
-                return true;
-            }
-        });
-
-        mScreenOn = (SwitchPreference) root.findPreference(KEY_SCREEN_ON);
-        mScreenOn.setOnPreferenceChangeListener(new Preference.OnPreferenceChangeListener() {
-            @Override
-            public boolean onPreferenceChange(Preference preference, Object newValue) {
-                if (mDisableListeners) return true;
-                final boolean val = (Boolean) newValue;
-                mMetricsFeatureProvider.action(mContext,
-                        MetricsEvent.ACTION_ZEN_ALLOW_WHEN_SCREEN_ON, val);
-                if (DEBUG) Log.d(TAG, "onPrefChange suppressWhenScreenOn=" + val);
-                savePolicy(getNewSuppressedEffects(val, Policy.SUPPRESSED_EFFECT_SCREEN_ON));
-                return true;
-            }
-        });
-    }
-
-    @Override
-    public int getMetricsCategory() {
-        return MetricsEvent.NOTIFICATION_ZEN_MODE_VISUAL_INTERRUPTIONS;
-    }
-
-    @Override
-    protected void onZenModeChanged() {
-        // Don't care
-    }
-
-    @Override
-    protected void onZenModeConfigChanged() {
-        mPolicy = NotificationManager.from(mContext).getNotificationPolicy();
-        updateControls();
-    }
-
-    private void updateControls() {
-        mDisableListeners = true;
-        mScreenOff.setChecked(isEffectSuppressed(Policy.SUPPRESSED_EFFECT_SCREEN_OFF));
-        mScreenOn.setChecked(isEffectSuppressed(Policy.SUPPRESSED_EFFECT_SCREEN_ON));
-        mDisableListeners = false;
-    }
-
-    private boolean isEffectSuppressed(int effect) {
-        return (mPolicy.suppressedVisualEffects & effect) != 0;
-    }
-
-    private int getNewSuppressedEffects(boolean suppress, int effectType) {
-        int effects = mPolicy.suppressedVisualEffects;
-        if (suppress) {
-            effects |= effectType;
-        } else {
-            effects &= ~effectType;
-        }
-        return effects;
-    }
-
-    private void savePolicy(int suppressedVisualEffects) {
-        mPolicy = new Policy(mPolicy.priorityCategories,
-                mPolicy.priorityCallSenders, mPolicy.priorityMessageSenders,
-                suppressedVisualEffects);
-        NotificationManager.from(mContext).setNotificationPolicy(mPolicy);
-    }
-}
diff --git a/src/com/android/settings/notification/ZenRuleNameDialog.java b/src/com/android/settings/notification/ZenRuleNameDialog.java
index c6ce23b..eb85431 100644
--- a/src/com/android/settings/notification/ZenRuleNameDialog.java
+++ b/src/com/android/settings/notification/ZenRuleNameDialog.java
@@ -19,6 +19,8 @@
 import android.app.AlertDialog;
 import android.content.Context;
 import android.content.DialogInterface;
+import android.net.Uri;
+import android.service.notification.ZenModeConfig;
 import android.text.TextUtils;
 import android.view.LayoutInflater;
 import android.view.View;
@@ -35,20 +37,21 @@
     private final CharSequence mOriginalRuleName;
     private final boolean mIsNew;
 
-    public ZenRuleNameDialog(Context context, CharSequence ruleName) {
+    public ZenRuleNameDialog(Context context, CharSequence ruleName, Uri conditionId) {
         mIsNew = ruleName == null;
         mOriginalRuleName = ruleName;
-        final View v = LayoutInflater.from(context).inflate(R.layout.zen_rule_name, null, false);
-        mEditText = (EditText) v.findViewById(R.id.rule_name);
+        final View v = LayoutInflater.from(context).inflate(R.layout.zen_rule_name, null,
+                false);
+        mEditText = (EditText) v.findViewById(R.id.zen_mode_rule_name);
         if (!mIsNew) {
             mEditText.setText(ruleName);
         }
         mEditText.setSelectAllOnFocus(true);
-
         mDialog = new AlertDialog.Builder(context)
-                .setTitle(mIsNew ? R.string.zen_mode_add_rule : R.string.zen_mode_rule_name)
+                .setTitle(getTitleResource(conditionId))
                 .setView(v)
-                .setPositiveButton(R.string.okay, new DialogInterface.OnClickListener() {
+                .setPositiveButton(mIsNew ? R.string.zen_mode_add : R.string.okay,
+                        new DialogInterface.OnClickListener() {
                     @Override
                     public void onClick(DialogInterface dialog, int which) {
                         final String newName = trimmedText();
@@ -75,4 +78,18 @@
     private String trimmedText() {
         return mEditText.getText() == null ? null : mEditText.getText().toString().trim();
     }
+
+    private int getTitleResource(Uri conditionId) {
+        final boolean isEvent = ZenModeConfig.isValidEventConditionId(conditionId);
+        final boolean isTime = ZenModeConfig.isValidScheduleConditionId(conditionId);
+        int titleResource =  R.string.zen_mode_rule_name;
+        if (mIsNew) {
+            if (isEvent) {
+                titleResource = R.string.zen_mode_add_event_rule;
+            } else if (isTime) {
+                titleResource = R.string.zen_mode_add_time_rule;
+            }
+        }
+        return titleResource;
+    }
 }
diff --git a/src/com/android/settings/notification/ZenRulePreference.java b/src/com/android/settings/notification/ZenRulePreference.java
new file mode 100644
index 0000000..4d7181a
--- /dev/null
+++ b/src/com/android/settings/notification/ZenRulePreference.java
@@ -0,0 +1,166 @@
+/*
+ * Copyright (C) 2017 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.notification;
+
+import android.app.AlertDialog;
+import android.app.AutomaticZenRule;
+import android.app.NotificationManager;
+import android.content.ComponentName;
+import android.content.Context;
+import android.content.DialogInterface;
+import android.content.pm.ApplicationInfo;
+import android.content.pm.PackageManager;
+import android.content.pm.ServiceInfo;
+import android.content.res.Resources;
+import android.service.notification.ZenModeConfig;
+import android.support.v7.preference.Preference;
+import android.support.v7.preference.PreferenceCategory;
+import android.support.v7.preference.PreferenceViewHolder;
+import android.view.View;
+
+import com.android.settings.R;
+import com.android.settings.utils.ManagedServiceSettings;
+import com.android.settings.utils.ZenServiceListing;
+import com.android.settingslib.TwoTargetPreference;
+
+import java.util.Map;
+
+public class ZenRulePreference extends TwoTargetPreference {
+    private static final ManagedServiceSettings.Config CONFIG =
+            ZenModeAutomationSettings.getConditionProviderConfig();
+    final CharSequence mName;
+    final String mId;
+    boolean appExists;
+    final PreferenceCategory mParent;
+    final Preference mPref;
+    final Context mContext;
+    final ZenModeBackend mBackend;
+    final ZenServiceListing mServiceListing;
+    final PackageManager mPm;
+
+    public ZenRulePreference(Context context,
+            final Map.Entry<String, AutomaticZenRule> ruleEntry,
+            PreferenceCategory prefCategory) {
+        super(context);
+
+        mBackend = ZenModeBackend.getInstance(context);
+        mContext = context;
+        final AutomaticZenRule rule = ruleEntry.getValue();
+        mName = rule.getName();
+        mId = ruleEntry.getKey();
+        mParent = prefCategory;
+        mPm = mContext.getPackageManager();
+        mServiceListing = new ZenServiceListing(mContext, CONFIG);
+        mServiceListing.reloadApprovedServices();
+        mPref = this;
+
+        setAttributes(rule);
+    }
+
+    @Override
+    protected int getSecondTargetResId() {
+        return R.layout.zen_rule_widget;
+    }
+
+    @Override
+    public void onBindViewHolder(PreferenceViewHolder view) {
+        super.onBindViewHolder(view);
+
+        View v = view.findViewById(R.id.delete_zen_rule);
+        if (v != null) {
+            v.setOnClickListener(mDeleteListener);
+        }
+    }
+
+    private final View.OnClickListener mDeleteListener = new View.OnClickListener() {
+        @Override
+        public void onClick(View v) {
+            showDeleteRuleDialog(mId, mName, mParent, mPref);
+        }
+    };
+
+    private void showDeleteRuleDialog(final String ruleId, final CharSequence ruleName,
+            PreferenceCategory parent, Preference pref) {
+        new AlertDialog.Builder(mContext)
+                .setMessage(mContext.getResources().getString(
+                        R.string.zen_mode_delete_rule_confirmation, ruleName))
+                .setNegativeButton(R.string.cancel, null)
+                .setPositiveButton(R.string.zen_mode_delete_rule_button,
+                        new DialogInterface.OnClickListener() {
+                            @Override
+                            public void onClick(DialogInterface dialog, int which) {
+                                mBackend.removeZenRule(ruleId);
+                                parent.removePreference(pref);
+                            }
+                        })
+                .show();
+    }
+
+    protected void setAttributes(AutomaticZenRule rule) {
+        final boolean isSchedule = ZenModeConfig.isValidScheduleConditionId(
+                rule.getConditionId());
+        final boolean isEvent = ZenModeConfig.isValidEventConditionId(rule.getConditionId());
+        final boolean isSystemRule = isSchedule || isEvent;
+
+        try {
+            ApplicationInfo info = mPm.getApplicationInfo(rule.getOwner().getPackageName(), 0);
+            setSummary(computeRuleSummary(rule, isSystemRule, info.loadLabel(mPm)));
+        } catch (PackageManager.NameNotFoundException e) {
+            appExists = false;
+            return;
+        }
+
+        appExists = true;
+        setTitle(rule.getName());
+        setPersistent(false);
+
+        final String action = isSchedule ? ZenModeScheduleRuleSettings.ACTION
+                : isEvent ? ZenModeEventRuleSettings.ACTION : "";
+        ServiceInfo si = mServiceListing.findService(rule.getOwner());
+        ComponentName settingsActivity = AbstractZenModeAutomaticRulePreferenceController.
+                getSettingsActivity(si);
+        setIntent(AbstractZenModeAutomaticRulePreferenceController.getRuleIntent(action,
+                settingsActivity, mId));
+        setSelectable(settingsActivity != null || isSystemRule);
+        setKey(mId);
+    }
+
+    private String computeRuleSummary(AutomaticZenRule rule, boolean isSystemRule,
+            CharSequence providerLabel) {
+        final String mode = computeZenModeCaption(mContext.getResources(),
+                rule.getInterruptionFilter());
+        final String ruleState = (rule == null || !rule.isEnabled())
+                ? mContext.getResources().getString(R.string.switch_off_text)
+                : mContext.getResources().getString(
+                        R.string.zen_mode_rule_summary_enabled_combination, mode);
+
+        return ruleState;
+    }
+
+    private static String computeZenModeCaption(Resources res, int zenMode) {
+        switch (zenMode) {
+            case NotificationManager.INTERRUPTION_FILTER_ALARMS:
+                return res.getString(R.string.zen_mode_option_alarms);
+            case NotificationManager.INTERRUPTION_FILTER_PRIORITY:
+                return res.getString(R.string.zen_mode_option_important_interruptions);
+            case NotificationManager.INTERRUPTION_FILTER_NONE:
+                return res.getString(R.string.zen_mode_option_no_interruptions);
+            default:
+                return null;
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/com/android/settings/notification/ZenRuleSelectionDialog.java b/src/com/android/settings/notification/ZenRuleSelectionDialog.java
index 4fa632a..0c725ed 100644
--- a/src/com/android/settings/notification/ZenRuleSelectionDialog.java
+++ b/src/com/android/settings/notification/ZenRuleSelectionDialog.java
@@ -27,7 +27,6 @@
 import android.graphics.drawable.Drawable;
 import android.os.AsyncTask;
 import android.service.notification.ZenModeConfig;
-import android.util.ArraySet;
 import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.View;
@@ -36,15 +35,11 @@
 import android.widget.TextView;
 
 import com.android.settings.R;
-import com.android.settings.utils.ServiceListing;
 import com.android.settings.utils.ZenServiceListing;
 
 import java.lang.ref.WeakReference;
 import java.text.Collator;
-import java.util.ArrayList;
-import java.util.Collections;
 import java.util.Comparator;
-import java.util.List;
 import java.util.Set;
 import java.util.TreeSet;
 
@@ -169,7 +164,8 @@
             if (DEBUG) Log.d(TAG, "Services reloaded: count=" + services.size());
             Set<ZenRuleInfo> externalRuleTypes = new TreeSet<>(RULE_TYPE_COMPARATOR);
             for (ServiceInfo serviceInfo : services) {
-                final ZenRuleInfo ri = ZenModeSettings.getRuleInfo(mPm, serviceInfo);
+                final ZenRuleInfo ri = AbstractZenModeAutomaticRulePreferenceController.
+                        getRuleInfo(mPm, serviceInfo);
                 if (ri != null && ri.configurationActivity != null
                         && mNm.isNotificationPolicyAccessGrantedForPackage(ri.packageName)
                         && (ri.ruleInstanceLimit <= 0 || ri.ruleInstanceLimit
diff --git a/src/com/android/settings/overlay/FeatureFactoryImpl.java b/src/com/android/settings/overlay/FeatureFactoryImpl.java
index 36c3bc9..d3fca68 100644
--- a/src/com/android/settings/overlay/FeatureFactoryImpl.java
+++ b/src/com/android/settings/overlay/FeatureFactoryImpl.java
@@ -25,8 +25,6 @@
 
 import com.android.settings.applications.ApplicationFeatureProvider;
 import com.android.settings.applications.ApplicationFeatureProviderImpl;
-import com.android.settings.applications.IPackageManagerWrapperImpl;
-import com.android.settings.applications.PackageManagerWrapperImpl;
 import com.android.settings.bluetooth.BluetoothFeatureProvider;
 import com.android.settings.bluetooth.BluetoothFeatureProviderImpl;
 import com.android.settings.connecteddevice.SmsMirroringFeatureProvider;
@@ -38,7 +36,6 @@
 import com.android.settings.dashboard.suggestions.SuggestionFeatureProviderImpl;
 import com.android.settings.datausage.DataPlanFeatureProvider;
 import com.android.settings.datausage.DataPlanFeatureProviderImpl;
-import com.android.settings.enterprise.DevicePolicyManagerWrapperImpl;
 import com.android.settings.enterprise.EnterprisePrivacyFeatureProvider;
 import com.android.settings.enterprise.EnterprisePrivacyFeatureProviderImpl;
 import com.android.settings.fuelgauge.PowerUsageFeatureProvider;
@@ -53,7 +50,10 @@
 import com.android.settings.security.SecurityFeatureProviderImpl;
 import com.android.settings.users.UserFeatureProvider;
 import com.android.settings.users.UserFeatureProviderImpl;
-import com.android.settings.vpn2.ConnectivityManagerWrapperImpl;
+import com.android.settings.wrapper.ConnectivityManagerWrapper;
+import com.android.settings.wrapper.DevicePolicyManagerWrapper;
+import com.android.settings.wrapper.IPackageManagerWrapper;
+import com.android.settingslib.wrapper.PackageManagerWrapper;
 
 /**
  * {@link FeatureFactory} implementation for AOSP Settings.
@@ -109,9 +109,9 @@
     public ApplicationFeatureProvider getApplicationFeatureProvider(Context context) {
         if (mApplicationFeatureProvider == null) {
             mApplicationFeatureProvider = new ApplicationFeatureProviderImpl(context,
-                    new PackageManagerWrapperImpl(context.getPackageManager()),
-                    new IPackageManagerWrapperImpl(AppGlobals.getPackageManager()),
-                    new DevicePolicyManagerWrapperImpl((DevicePolicyManager) context
+                    new PackageManagerWrapper(context.getPackageManager()),
+                    new IPackageManagerWrapper(AppGlobals.getPackageManager()),
+                    new DevicePolicyManagerWrapper((DevicePolicyManager) context
                             .getSystemService(Context.DEVICE_POLICY_SERVICE)));
         }
         return mApplicationFeatureProvider;
@@ -129,11 +129,11 @@
     public EnterprisePrivacyFeatureProvider getEnterprisePrivacyFeatureProvider(Context context) {
         if (mEnterprisePrivacyFeatureProvider == null) {
             mEnterprisePrivacyFeatureProvider = new EnterprisePrivacyFeatureProviderImpl(context,
-                    new DevicePolicyManagerWrapperImpl((DevicePolicyManager) context
+                    new DevicePolicyManagerWrapper((DevicePolicyManager) context
                             .getSystemService(Context.DEVICE_POLICY_SERVICE)),
-                    new PackageManagerWrapperImpl(context.getPackageManager()),
+                    new PackageManagerWrapper(context.getPackageManager()),
                     UserManager.get(context),
-                    new ConnectivityManagerWrapperImpl((ConnectivityManager) context
+                    new ConnectivityManagerWrapper((ConnectivityManager) context
                             .getSystemService(Context.CONNECTIVITY_SERVICE)),
                     context.getResources());
         }
diff --git a/src/com/android/settings/password/ChooseLockGeneric.java b/src/com/android/settings/password/ChooseLockGeneric.java
index a694603..e5ba200 100644
--- a/src/com/android/settings/password/ChooseLockGeneric.java
+++ b/src/com/android/settings/password/ChooseLockGeneric.java
@@ -753,7 +753,7 @@
         }
 
         @Override
-        protected int getHelpResource() {
+        public int getHelpResource() {
             return R.string.help_url_choose_lockscreen;
         }
 
diff --git a/src/com/android/settings/password/ChooseLockPassword.java b/src/com/android/settings/password/ChooseLockPassword.java
index 9f5192d..e5fbe6c 100644
--- a/src/com/android/settings/password/ChooseLockPassword.java
+++ b/src/com/android/settings/password/ChooseLockPassword.java
@@ -267,7 +267,7 @@
                     0,
                     0,
                     0,
-                    R.string.lockpassword_ok_label),
+                    R.string.lockpassword_confirm_label),
 
             ConfirmWrong(
                     R.string.lockpassword_confirm_passwords_dont_match,
diff --git a/src/com/android/settings/password/ChooseLockPattern.java b/src/com/android/settings/password/ChooseLockPattern.java
index 7df8974..7cd9db8 100644
--- a/src/com/android/settings/password/ChooseLockPattern.java
+++ b/src/com/android/settings/password/ChooseLockPattern.java
@@ -141,7 +141,7 @@
         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);
+                : R.string.lockpassword_choose_your_screen_lock_header);
         LinearLayout layout = (LinearLayout) findViewById(R.id.content_parent);
         layout.setFitsSystemWindows(false);
     }
@@ -172,6 +172,7 @@
         private boolean mHasChallenge;
         private long mChallenge;
         protected TextView mHeaderText;
+        protected TextView mMessageText;
         protected LockPatternView mLockPatternView;
         protected TextView mFooterText;
         private TextView mFooterLeftButton;
@@ -338,44 +339,55 @@
         protected enum Stage {
 
             Introduction(
+                    R.string.lock_settings_picker_fingerprint_added_security_message,
+                    R.string.lockpassword_choose_your_pattern_message,
                     R.string.lockpattern_recording_intro_header,
                     LeftButtonMode.Cancel, RightButtonMode.ContinueDisabled,
                     ID_EMPTY_MESSAGE, true),
             HelpScreen(
-                    R.string.lockpattern_settings_help_how_to_record,
+                    ID_EMPTY_MESSAGE, ID_EMPTY_MESSAGE, R.string.lockpattern_settings_help_how_to_record,
                     LeftButtonMode.Gone, RightButtonMode.Ok, ID_EMPTY_MESSAGE, false),
             ChoiceTooShort(
+                    R.string.lock_settings_picker_fingerprint_added_security_message,
+                    R.string.lockpassword_choose_your_pattern_message,
                     R.string.lockpattern_recording_incorrect_too_short,
                     LeftButtonMode.Retry, RightButtonMode.ContinueDisabled,
                     ID_EMPTY_MESSAGE, true),
             FirstChoiceValid(
+                    R.string.lock_settings_picker_fingerprint_added_security_message,
+                    R.string.lockpassword_choose_your_pattern_message,
                     R.string.lockpattern_pattern_entered_header,
                     LeftButtonMode.Retry, RightButtonMode.Continue, ID_EMPTY_MESSAGE, false),
             NeedToConfirm(
-                    R.string.lockpattern_need_to_confirm,
+                    ID_EMPTY_MESSAGE, ID_EMPTY_MESSAGE, R.string.lockpattern_need_to_confirm,
                     LeftButtonMode.Cancel, RightButtonMode.ConfirmDisabled,
                     ID_EMPTY_MESSAGE, true),
             ConfirmWrong(
-                    R.string.lockpattern_need_to_unlock_wrong,
+                    ID_EMPTY_MESSAGE, ID_EMPTY_MESSAGE, R.string.lockpattern_need_to_unlock_wrong,
                     LeftButtonMode.Cancel, RightButtonMode.ConfirmDisabled,
                     ID_EMPTY_MESSAGE, true),
             ChoiceConfirmed(
-                    R.string.lockpattern_pattern_confirmed_header,
+                    ID_EMPTY_MESSAGE, ID_EMPTY_MESSAGE, R.string.lockpattern_pattern_confirmed_header,
                     LeftButtonMode.Cancel, RightButtonMode.Confirm, ID_EMPTY_MESSAGE, false);
 
 
             /**
+             * @param messageForFingerprint The message displayed at the top, above header for
+             *                              fingerprint flow.
+             * @param message The message displayed at the top.
              * @param headerMessage The message displayed at the top.
              * @param leftMode The mode of the left button.
              * @param rightMode The mode of the right button.
              * @param footerMessage The footer message.
              * @param patternEnabled Whether the pattern widget is enabled.
              */
-            Stage(int headerMessage,
+            Stage(int messageForFingerprint, int message, int headerMessage,
                     LeftButtonMode leftMode,
                     RightButtonMode rightMode,
                     int footerMessage, boolean patternEnabled) {
                 this.headerMessage = headerMessage;
+                this.messageForFingerprint = messageForFingerprint;
+                this.message = message;
                 this.leftMode = leftMode;
                 this.rightMode = rightMode;
                 this.footerMessage = footerMessage;
@@ -383,6 +395,8 @@
             }
 
             final int headerMessage;
+            final int messageForFingerprint;
+            final int message;
             final LeftButtonMode leftMode;
             final RightButtonMode rightMode;
             final int footerMessage;
@@ -450,6 +464,7 @@
         public void onViewCreated(View view, Bundle savedInstanceState) {
             super.onViewCreated(view, savedInstanceState);
             mHeaderText = (TextView) view.findViewById(R.id.headerText);
+            mMessageText = view.findViewById(R.id.message);
             mLockPatternView = (LockPatternView) view.findViewById(R.id.lockPattern);
             mLockPatternView.setOnPatternListener(mChooseNewLockPatternListener);
             mLockPatternView.setTactileFeedbackEnabled(
@@ -634,6 +649,12 @@
             } else {
                 mHeaderText.setText(stage.headerMessage);
             }
+            int message = mForFingerprint ? stage.messageForFingerprint : stage.message;
+            if (message == ID_EMPTY_MESSAGE) {
+                mMessageText.setText("");
+            } else {
+                mMessageText.setText(message);
+            }
             if (stage.footerMessage == ID_EMPTY_MESSAGE) {
                 mFooterText.setText("");
             } else {
diff --git a/src/com/android/settings/password/ConfirmDeviceCredentialBaseFragment.java b/src/com/android/settings/password/ConfirmDeviceCredentialBaseFragment.java
index a67184a..350fc76 100644
--- a/src/com/android/settings/password/ConfirmDeviceCredentialBaseFragment.java
+++ b/src/com/android/settings/password/ConfirmDeviceCredentialBaseFragment.java
@@ -50,15 +50,15 @@
 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.core.InstrumentedPreferenceFragment;
 import com.android.settings.fingerprint.FingerprintUiHelper;
 
 /**
  * Base fragment to be shared for PIN/Pattern/Password confirmation fragments.
  */
-public abstract class ConfirmDeviceCredentialBaseFragment extends OptionsMenuFragment
+public abstract class ConfirmDeviceCredentialBaseFragment extends InstrumentedPreferenceFragment
         implements FingerprintUiHelper.Callback {
 
     public static final String PACKAGE = "com.android.settings";
@@ -243,7 +243,6 @@
             try {
                 IActivityManager activityManager = ActivityManager.getService();
                 final ActivityOptions options = ActivityOptions.makeBasic();
-                options.setLaunchStackId(ActivityManager.StackId.INVALID_STACK_ID);
                 activityManager.startActivityFromRecents(taskId, options.toBundle());
                 return;
             } catch (RemoteException e) {
diff --git a/src/com/android/settings/password/FingerprintManagerWrapper.java b/src/com/android/settings/password/FingerprintManagerWrapper.java
deleted file mode 100644
index 51b31af..0000000
--- a/src/com/android/settings/password/FingerprintManagerWrapper.java
+++ /dev/null
@@ -1,67 +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.password;
-
-import android.annotation.NonNull;
-import android.hardware.fingerprint.FingerprintManager;
-import android.hardware.fingerprint.FingerprintManager.EnrollmentCallback;
-import android.os.CancellationSignal;
-
-import com.android.internal.util.Preconditions;
-
-/**
- * Wrapper of {@link FingerprintManager}. Workaround for roboelectic testing. See
- * {@link IFingerprintManager} for details.
- */
-public class FingerprintManagerWrapper implements IFingerprintManager {
-    private @NonNull FingerprintManager mFingerprintManager;
-
-    public FingerprintManagerWrapper(@NonNull FingerprintManager fingerprintManager) {
-        Preconditions.checkNotNull(fingerprintManager);
-        mFingerprintManager = fingerprintManager;
-    }
-
-    @Override
-    public boolean isHardwareDetected() {
-        return mFingerprintManager.isHardwareDetected();
-    }
-
-    @Override
-    public boolean hasEnrolledFingerprints(int userId) {
-        return mFingerprintManager.hasEnrolledFingerprints(userId);
-    }
-
-    @Override
-    public long preEnroll() {
-        return mFingerprintManager.preEnroll();
-    }
-
-    @Override
-    public void setActiveUser(int userId) {
-        mFingerprintManager.setActiveUser(userId);
-    }
-
-    @Override
-    public void enroll(
-            byte[] token,
-            CancellationSignal cancel,
-            int flags,
-            int userId,
-            EnrollmentCallback callback) {
-        mFingerprintManager.enroll(token, cancel, flags, userId, callback);
-    }
-}
diff --git a/src/com/android/settings/password/IFingerprintManager.java b/src/com/android/settings/password/IFingerprintManager.java
deleted file mode 100644
index 9402146..0000000
--- a/src/com/android/settings/password/IFingerprintManager.java
+++ /dev/null
@@ -1,39 +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.password;
-
-import android.hardware.fingerprint.FingerprintManager.EnrollmentCallback;
-import android.os.CancellationSignal;
-
-/**
- * This is the workaround to allow us test {@link SetNewPasswordController} which uses a new hidden
- * API {@link android.hardware.fingerprint.FingerprintManager#hasEnrolledFingerprints(int)} that
- * roboelectric does not support yet. Having roboelectic to support latest platform API is tracked
- * in b/30995831.
- */
-public interface IFingerprintManager {
-    boolean isHardwareDetected();
-
-    boolean hasEnrolledFingerprints(int userId);
-
-    long preEnroll();
-
-    void setActiveUser(int userId);
-
-    void enroll(byte [] token, CancellationSignal cancel, int flags,
-            int userId, EnrollmentCallback callback);
-}
diff --git a/src/com/android/settings/password/ManagedLockPasswordProvider.java b/src/com/android/settings/password/ManagedLockPasswordProvider.java
index 09fe104..82135cf 100644
--- a/src/com/android/settings/password/ManagedLockPasswordProvider.java
+++ b/src/com/android/settings/password/ManagedLockPasswordProvider.java
@@ -66,15 +66,6 @@
     }
 
     /**
-     * Gets resource id of the subscreen that should be shown after clicking gear icon for lock
-     * screen preference in security settings if the current password quality is set to
-     * {@link android.app.admin.DevicePolicyManager#PASSWORD_QUALITY_MANAGED}.
-     */
-    public int getResIdForLockUnlockSubScreen() {
-        return R.xml.security_settings_password_sub;
-    }
-
-    /**
      * Creates intent that should be launched when user chooses managed password in the lock
      * settings picker.
      * @param requirePasswordToDecrypt Whether a password is needed to decrypt the user.
diff --git a/src/com/android/settings/password/ScreenLockSuggestionActivity.java b/src/com/android/settings/password/ScreenLockSuggestionActivity.java
new file mode 100644
index 0000000..56beb01
--- /dev/null
+++ b/src/com/android/settings/password/ScreenLockSuggestionActivity.java
@@ -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.
+ */
+
+package com.android.settings.password;
+
+import android.app.KeyguardManager;
+import android.content.Context;
+
+public class ScreenLockSuggestionActivity extends ChooseLockGeneric {
+
+    public static boolean isSuggestionComplete(Context context) {
+        KeyguardManager km = context.getSystemService(KeyguardManager.class);
+        return km.isKeyguardSecure();
+    }
+}
diff --git a/src/com/android/settings/password/SetNewPasswordController.java b/src/com/android/settings/password/SetNewPasswordController.java
index 57aa8c1..a974da4 100644
--- a/src/com/android/settings/password/SetNewPasswordController.java
+++ b/src/com/android/settings/password/SetNewPasswordController.java
@@ -36,6 +36,7 @@
 import com.android.internal.annotations.VisibleForTesting;
 import com.android.internal.widget.LockPatternUtils;
 import com.android.settings.Utils;
+import com.android.settings.wrapper.FingerprintManagerWrapper;
 
 /**
  * Business logic for {@link SetNewPasswordActivity}.
@@ -56,7 +57,7 @@
      */
     private final int mTargetUserId;
     private final PackageManager mPackageManager;
-    @Nullable private final IFingerprintManager mFingerprintManager;
+    @Nullable private final FingerprintManagerWrapper mFingerprintManager;
     private final DevicePolicyManager mDevicePolicyManager;
     private final Ui mUi;
 
@@ -77,7 +78,7 @@
         }
         // Create a wrapper of FingerprintManager for testing, see IFingerPrintManager for details.
         final FingerprintManager fingerprintManager = Utils.getFingerprintManagerOrNull(context);
-        final IFingerprintManager fingerprintManagerWrapper =
+        final FingerprintManagerWrapper fingerprintManagerWrapper =
                 fingerprintManager == null
                         ? null
                         : new FingerprintManagerWrapper(fingerprintManager);
@@ -91,7 +92,7 @@
     SetNewPasswordController(
             int targetUserId,
             PackageManager packageManager,
-            IFingerprintManager fingerprintManager,
+            FingerprintManagerWrapper fingerprintManager,
             DevicePolicyManager devicePolicyManager,
             Ui ui) {
         mTargetUserId = targetUserId;
diff --git a/src/com/android/settings/print/PrintJobSettingsFragment.java b/src/com/android/settings/print/PrintJobSettingsFragment.java
index 349d9fc..7142e49 100644
--- a/src/com/android/settings/print/PrintJobSettingsFragment.java
+++ b/src/com/android/settings/print/PrintJobSettingsFragment.java
@@ -17,6 +17,8 @@
 package com.android.settings.print;
 
 import android.content.Context;
+import android.content.res.TypedArray;
+import android.graphics.drawable.Drawable;
 import android.os.Bundle;
 import android.print.PrintJob;
 import android.print.PrintJobId;
@@ -31,8 +33,8 @@
 import android.view.MenuInflater;
 import android.view.MenuItem;
 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.SettingsPreferenceFragment;
@@ -220,16 +222,28 @@
                         info.getCreationTime(), info.getCreationTime(), DateFormat.SHORT,
                         DateFormat.SHORT)));
 
+        TypedArray a = getActivity().obtainStyledAttributes(new int[]{
+                android.R.attr.colorControlNormal});
+        int tintColor = a.getColor(0, 0);
+        a.recycle();
+
         switch (info.getState()) {
             case PrintJobInfo.STATE_QUEUED:
             case PrintJobInfo.STATE_STARTED: {
-                mPrintJobPreference.setIcon(R.drawable.ic_print);
-            } break;
+                Drawable icon = getActivity().getDrawable(com.android.internal.R.drawable.ic_print);
+                icon.setTint(tintColor);
+                mPrintJobPreference.setIcon(icon);
+                break;
+            }
 
             case PrintJobInfo.STATE_FAILED:
             case PrintJobInfo.STATE_BLOCKED: {
-                mPrintJobPreference.setIcon(R.drawable.ic_print_error);
-            } break;
+                Drawable icon = getActivity().getDrawable(
+                        com.android.internal.R.drawable.ic_print_error);
+                icon.setTint(tintColor);
+                mPrintJobPreference.setIcon(icon);
+                break;
+            }
         }
 
         CharSequence status = info.getStatus(getPackageManager());
diff --git a/src/com/android/settings/print/PrintSettingsFragment.java b/src/com/android/settings/print/PrintSettingsFragment.java
index 26e760c..56bebcc 100644
--- a/src/com/android/settings/print/PrintSettingsFragment.java
+++ b/src/com/android/settings/print/PrintSettingsFragment.java
@@ -24,6 +24,7 @@
 import android.content.Intent;
 import android.content.Loader;
 import android.content.pm.PackageManager;
+import android.content.res.TypedArray;
 import android.graphics.drawable.Drawable;
 import android.net.Uri;
 import android.os.Bundle;
@@ -54,7 +55,6 @@
 import com.android.settings.dashboard.SummaryLoader;
 import com.android.settings.search.BaseSearchIndexProvider;
 import com.android.settings.search.Indexable;
-import com.android.settings.search.SearchIndexableRaw;
 import com.android.settings.utils.ProfileSettingsPreferenceFragment;
 
 import java.text.DateFormat;
@@ -98,7 +98,7 @@
     }
 
     @Override
-    protected int getHelpResource() {
+    public int getHelpResource() {
         return R.string.help_uri_printing;
     }
 
@@ -359,15 +359,29 @@
                                     printJob.getCreationTime(), printJob.getCreationTime(),
                                     DateFormat.SHORT, DateFormat.SHORT)));
 
+                    TypedArray a = getActivity().obtainStyledAttributes(new int[]{
+                            android.R.attr.colorControlNormal});
+                    int tintColor = a.getColor(0, 0);
+                    a.recycle();
+
                     switch (printJob.getState()) {
                         case PrintJobInfo.STATE_QUEUED:
-                        case PrintJobInfo.STATE_STARTED:
-                            preference.setIcon(R.drawable.ic_print);
+                        case PrintJobInfo.STATE_STARTED: {
+                            Drawable icon = getActivity().getDrawable(
+                                    com.android.internal.R.drawable.ic_print);
+                            icon.setTint(tintColor);
+                            preference.setIcon(icon);
                             break;
+                        }
+
                         case PrintJobInfo.STATE_FAILED:
-                        case PrintJobInfo.STATE_BLOCKED:
-                            preference.setIcon(R.drawable.ic_print_error);
+                        case PrintJobInfo.STATE_BLOCKED: {
+                            Drawable icon = getActivity().getDrawable(
+                                    com.android.internal.R.drawable.ic_print_error);
+                            icon.setTint(tintColor);
+                            preference.setIcon(icon);
                             break;
+                        }
                     }
 
                     Bundle extras = preference.getExtras();
@@ -601,49 +615,11 @@
 
     public static final SearchIndexProvider SEARCH_INDEX_DATA_PROVIDER =
             new BaseSearchIndexProvider() {
-        @Override
-        public List<SearchIndexableRaw> getRawDataToIndex(Context context, boolean enabled) {
-            List<SearchIndexableRaw> indexables = new ArrayList<SearchIndexableRaw>();
-
-            PackageManager packageManager = context.getPackageManager();
-            PrintManager printManager = (PrintManager) context.getSystemService(
-                    Context.PRINT_SERVICE);
-
-            String screenTitle = context.getResources().getString(R.string.print_settings);
-            SearchIndexableRaw data = new SearchIndexableRaw(context);
-            data.title = screenTitle;
-            data.screenTitle = screenTitle;
-            indexables.add(data);
-
-            // Indexing all services, regardless if enabled. Please note that the index will not be
-            // updated until this function is called again
-            List<PrintServiceInfo> services =
-                    printManager.getPrintServices(PrintManager.ALL_SERVICES);
-
-            if (services != null) {
-                final int serviceCount = services.size();
-                for (int i = 0; i < serviceCount; i++) {
-                    PrintServiceInfo service = services.get(i);
-
-                    ComponentName componentName = new ComponentName(
-                            service.getResolveInfo().serviceInfo.packageName,
-                            service.getResolveInfo().serviceInfo.name);
-
-                    data = new SearchIndexableRaw(context);
-                    data.key = componentName.flattenToString();
-                    data.title = service.getResolveInfo().loadLabel(packageManager).toString();
-                    data.screenTitle = screenTitle;
-                    indexables.add(data);
-                }
-            }
-
-            return indexables;
-        }
 
         @Override
         public List<SearchIndexableResource> getXmlResourcesToIndex(Context context,
                 boolean enabled) {
-            List<SearchIndexableResource> indexables = new ArrayList<SearchIndexableResource>();
+            List<SearchIndexableResource> indexables = new ArrayList<>();
             SearchIndexableResource indexable = new SearchIndexableResource(context);
             indexable.xmlResId = R.xml.print_settings;
             indexables.add(indexable);
diff --git a/src/com/android/settings/qstile/DevelopmentTileConfigActivity.java b/src/com/android/settings/qstile/DevelopmentTileConfigActivity.java
deleted file mode 100644
index 5968d7a..0000000
--- a/src/com/android/settings/qstile/DevelopmentTileConfigActivity.java
+++ /dev/null
@@ -1,99 +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.qstile;
-
-import android.content.ComponentName;
-import android.content.Context;
-import android.content.Intent;
-import android.content.pm.PackageManager;
-import android.content.pm.ResolveInfo;
-import android.content.pm.ServiceInfo;
-import android.os.Bundle;
-import android.service.quicksettings.TileService;
-import android.support.v14.preference.SwitchPreference;
-import android.support.v7.preference.Preference;
-
-import com.android.settings.SettingsActivity;
-import com.android.settings.SettingsPreferenceFragment;
-import com.android.settings.core.instrumentation.Instrumentable;
-
-public class DevelopmentTileConfigActivity extends SettingsActivity {
-
-    @Override
-    public Intent getIntent() {
-        Intent modIntent = new Intent(super.getIntent())
-                .putExtra(EXTRA_SHOW_FRAGMENT, DevelopmentTileConfigFragment.class.getName())
-                .putExtra(EXTRA_HIDE_DRAWER, true);
-        return modIntent;
-    }
-
-    @Override
-    protected boolean isValidFragment(String fragmentName) {
-        return (DevelopmentTileConfigFragment.class.getName().equals(fragmentName));
-    }
-
-    public static class DevelopmentTileConfigFragment extends SettingsPreferenceFragment
-            implements Preference.OnPreferenceChangeListener {
-
-        @Override
-        public void onCreate(Bundle icicle) {
-            super.onCreate(icicle);
-
-            Context context = getPrefContext();
-            setPreferenceScreen(getPreferenceManager().createPreferenceScreen(context));
-            getPreferenceScreen().removeAll();
-
-            Intent intent = new Intent(TileService.ACTION_QS_TILE)
-                    .setPackage(context.getPackageName());
-            PackageManager pm = getPackageManager();
-            for (ResolveInfo info :
-                    pm.queryIntentServices(intent, PackageManager.MATCH_DISABLED_COMPONENTS)) {
-                ServiceInfo sInfo = info.serviceInfo;
-                int enabledSetting = pm.getComponentEnabledSetting(
-                        new ComponentName(sInfo.packageName, sInfo.name));
-                boolean checked = enabledSetting == PackageManager.COMPONENT_ENABLED_STATE_ENABLED
-                        || ((enabledSetting == PackageManager.COMPONENT_ENABLED_STATE_DEFAULT)
-                        && sInfo.enabled);
-
-                SwitchPreference preference = new SwitchPreference(context);
-                preference.setTitle(sInfo.loadLabel(pm));
-                preference.setIcon(sInfo.icon);
-                preference.setKey(sInfo.name);
-                preference.setChecked(checked);
-                preference.setPersistent(false);
-                preference.setOnPreferenceChangeListener(this);
-                getPreferenceScreen().addPreference(preference);
-            }
-        }
-
-        @Override
-        public int getMetricsCategory() {
-            return Instrumentable.METRICS_CATEGORY_UNKNOWN;
-        }
-
-        @Override
-        public boolean onPreferenceChange(Preference preference, Object newValue) {
-            ComponentName cn = new ComponentName(
-                    getPrefContext().getPackageName(), preference.getKey());
-            getPackageManager().setComponentEnabledSetting(cn, (Boolean) newValue
-                            ? PackageManager.COMPONENT_ENABLED_STATE_ENABLED
-                            : PackageManager.COMPONENT_ENABLED_STATE_DISABLED,
-                    PackageManager.DONT_KILL_APP);
-            return true;
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/com/android/settings/qstile/DevelopmentTiles.java b/src/com/android/settings/qstile/DevelopmentTiles.java
deleted file mode 100644
index ad60827..0000000
--- a/src/com/android/settings/qstile/DevelopmentTiles.java
+++ /dev/null
@@ -1,134 +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.qstile;
-
-import android.os.RemoteException;
-import android.os.SystemProperties;
-import android.provider.Settings;
-import android.service.quicksettings.Tile;
-import android.service.quicksettings.TileService;
-import android.view.IWindowManager;
-import android.view.ThreadedRenderer;
-import android.view.View;
-import android.view.WindowManagerGlobal;
-
-import com.android.internal.app.LocalePicker;
-import com.android.settings.development.DevelopmentSettings;
-
-public abstract class DevelopmentTiles extends TileService {
-
-    protected abstract boolean isEnabled();
-
-    protected abstract void setIsEnabled(boolean isEnabled);
-
-    @Override
-    public void onStartListening() {
-        super.onStartListening();
-        refresh();
-    }
-
-    public void refresh() {
-        getQsTile().setState(isEnabled() ? Tile.STATE_ACTIVE : Tile.STATE_INACTIVE);
-        getQsTile().updateTile();
-    }
-
-    @Override
-    public void onClick() {
-        setIsEnabled(getQsTile().getState() == Tile.STATE_INACTIVE);
-        new DevelopmentSettings.SystemPropPoker().execute(); // Settings app magic
-        refresh();
-    }
-
-    /**
-     * Tile to control the "Show layout bounds" developer setting
-     */
-    public static class ShowLayout extends DevelopmentTiles {
-
-        @Override
-        protected boolean isEnabled() {
-            return SystemProperties.getBoolean(View.DEBUG_LAYOUT_PROPERTY, false);
-        }
-
-        @Override
-        protected void setIsEnabled(boolean isEnabled) {
-            SystemProperties.set(View.DEBUG_LAYOUT_PROPERTY, isEnabled ? "true" : "false");
-        }
-    }
-
-    /**
-     * Tile to control the "GPU profiling" developer setting
-     */
-    public static class GPUProfiling extends DevelopmentTiles {
-
-        @Override
-        protected boolean isEnabled() {
-            final String value = SystemProperties.get(ThreadedRenderer.PROFILE_PROPERTY);
-            return value.equals("visual_bars");
-        }
-
-        @Override
-        protected void setIsEnabled(boolean isEnabled) {
-            SystemProperties.set(ThreadedRenderer.PROFILE_PROPERTY, isEnabled ? "visual_bars" : "");
-        }
-    }
-
-    /**
-     * Tile to control the "Force RTL" developer setting
-     */
-    public static class ForceRTL extends DevelopmentTiles {
-
-        @Override
-        protected boolean isEnabled() {
-            return Settings.Global.getInt(
-                    getContentResolver(), Settings.Global.DEVELOPMENT_FORCE_RTL, 0) != 0;
-        }
-
-        @Override
-        protected void setIsEnabled(boolean isEnabled) {
-            Settings.Global.putInt(
-                    getContentResolver(), Settings.Global.DEVELOPMENT_FORCE_RTL, isEnabled ? 1 : 0);
-            SystemProperties.set(Settings.Global.DEVELOPMENT_FORCE_RTL, isEnabled ? "1" : "0");
-            LocalePicker.updateLocales(getResources().getConfiguration().getLocales());
-        }
-    }
-
-    /**
-     * Tile to control the "Animation speed" developer setting
-     */
-    public static class AnimationSpeed extends DevelopmentTiles {
-
-        @Override
-        protected boolean isEnabled() {
-            IWindowManager wm = WindowManagerGlobal.getWindowManagerService();
-            try {
-                return wm.getAnimationScale(0) != 1;
-            } catch (RemoteException e) { }
-            return false;
-        }
-
-        @Override
-        protected void setIsEnabled(boolean isEnabled) {
-            IWindowManager wm = WindowManagerGlobal.getWindowManagerService();
-            float scale = isEnabled ? 10 : 1;
-            try {
-                wm.setAnimationScale(0, scale);
-                wm.setAnimationScale(1, scale);
-                wm.setAnimationScale(2, scale);
-            } catch (RemoteException e) { }
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/com/android/settings/search/AccessibilityServiceResultLoader.java b/src/com/android/settings/search/AccessibilityServiceResultLoader.java
index 7ffbcfc..327aef2 100644
--- a/src/com/android/settings/search/AccessibilityServiceResultLoader.java
+++ b/src/com/android/settings/search/AccessibilityServiceResultLoader.java
@@ -26,98 +26,116 @@
 import android.content.pm.ResolveInfo;
 import android.content.pm.ServiceInfo;
 import android.graphics.drawable.Drawable;
+import android.os.UserHandle;
 import android.support.annotation.VisibleForTesting;
 import android.support.v4.content.ContextCompat;
+import android.util.IconDrawableFactory;
+import android.util.Log;
 import android.view.accessibility.AccessibilityManager;
 
 import com.android.settings.R;
 import com.android.settings.accessibility.AccessibilitySettings;
 import com.android.settings.dashboard.SiteMapManager;
-import com.android.settings.utils.AsyncLoader;
 
-import java.util.HashSet;
+import java.util.ArrayList;
+import java.util.Collections;
 import java.util.List;
 import java.util.Objects;
-import java.util.Set;
+import java.util.concurrent.Callable;
+import java.util.concurrent.FutureTask;
 
-public class AccessibilityServiceResultLoader extends AsyncLoader<Set<? extends SearchResult>> {
+public class AccessibilityServiceResultLoader extends
+        FutureTask<List<? extends SearchResult>> {
 
-    private static final int NAME_NO_MATCH = -1;
-
-    private List<String> mBreadcrumb;
-    private SiteMapManager mSiteMapManager;
-    @VisibleForTesting
-    final String mQuery;
-    private final AccessibilityManager mAccessibilityManager;
-    private final PackageManager mPackageManager;
-
+    private static final String TAG = "A11yResultFutureTask";
 
     public AccessibilityServiceResultLoader(Context context, String query,
-            SiteMapManager mapManager) {
-        super(context);
-        mSiteMapManager = mapManager;
-        mPackageManager = context.getPackageManager();
-        mAccessibilityManager =
-                (AccessibilityManager) context.getSystemService(Context.ACCESSIBILITY_SERVICE);
-        mQuery = query;
+            SiteMapManager manager) {
+        super(new AccessibilityServiceResultCallable(context, query, manager));
     }
 
-    @Override
-    public Set<? extends SearchResult> loadInBackground() {
-        final Set<SearchResult> results = new HashSet<>();
-        final Context context = getContext();
-        final List<AccessibilityServiceInfo> services = mAccessibilityManager
-                .getInstalledAccessibilityServiceList();
-        final String screenTitle = context.getString(R.string.accessibility_settings);
-        for (AccessibilityServiceInfo service : services) {
-            if (service == null) {
-                continue;
-            }
-            final ResolveInfo resolveInfo = service.getResolveInfo();
-            if (service.getResolveInfo() == null) {
-                continue;
-            }
-            final ServiceInfo serviceInfo = resolveInfo.serviceInfo;
-            final CharSequence title = resolveInfo.loadLabel(mPackageManager);
-            final int wordDiff = getWordDifference(title.toString(), mQuery);
-            if (wordDiff == NAME_NO_MATCH) {
-                continue;
-            }
-            final Drawable icon;
-            if (resolveInfo.getIconResource() == 0) {
-                icon = ContextCompat.getDrawable(context, R.mipmap.ic_accessibility_generic);
-            } else {
-                icon = resolveInfo.loadIcon(mPackageManager);
-            }
-            final String componentName = new ComponentName(serviceInfo.packageName,
-                    serviceInfo.name).flattenToString();
-            final Intent intent = DatabaseIndexingUtils.buildSubsettingIntent(context,
-                    AccessibilitySettings.class.getName(), componentName, screenTitle);
+    static class AccessibilityServiceResultCallable implements
+            Callable<List<? extends SearchResult>> {
 
-            results.add(new SearchResult.Builder()
-                    .setTitle(title)
-                    .addBreadcrumbs(getBreadCrumb())
-                    .setPayload(new ResultPayload(intent))
-                    .setRank(wordDiff)
-                    .setIcon(icon)
-                    .setStableId(Objects.hash(screenTitle, componentName))
-                    .build());
+        private static final int NAME_NO_MATCH = -1;
+
+        private final Context mContext;
+        private List<String> mBreadcrumb;
+        private SiteMapManager mSiteMapManager;
+        @VisibleForTesting
+        final String mQuery;
+        private final AccessibilityManager mAccessibilityManager;
+        private final PackageManager mPackageManager;
+        private final int mUserId;
+
+        public AccessibilityServiceResultCallable(Context context, String query,
+                SiteMapManager mapManager) {
+            mUserId = UserHandle.myUserId();
+            mContext = context;
+            mSiteMapManager = mapManager;
+            mPackageManager = context.getPackageManager();
+            mAccessibilityManager =
+                    (AccessibilityManager) context.getSystemService(Context.ACCESSIBILITY_SERVICE);
+            mQuery = query;
         }
-        return results;
-    }
 
-    private List<String> getBreadCrumb() {
-        if (mBreadcrumb == null || mBreadcrumb.isEmpty()) {
-            final Context context = getContext();
-            mBreadcrumb = mSiteMapManager.buildBreadCrumb(
-                    context, AccessibilitySettings.class.getName(),
-                    context.getString(R.string.accessibility_settings));
+        @Override
+        public List<? extends SearchResult> call() throws Exception {
+            long startTime = System.currentTimeMillis();
+            final List<SearchResult> results = new ArrayList<>();
+            final List<AccessibilityServiceInfo> services = mAccessibilityManager
+                    .getInstalledAccessibilityServiceList();
+            final IconDrawableFactory iconFactory = IconDrawableFactory.newInstance(mContext);
+            final String screenTitle = mContext.getString(R.string.accessibility_settings);
+            for (AccessibilityServiceInfo service : services) {
+                if (service == null) {
+                    continue;
+                }
+                final ResolveInfo resolveInfo = service.getResolveInfo();
+                if (service.getResolveInfo() == null) {
+                    continue;
+                }
+                final ServiceInfo serviceInfo = resolveInfo.serviceInfo;
+                final CharSequence title = resolveInfo.loadLabel(mPackageManager);
+                final int wordDiff = getWordDifference(title.toString(), mQuery);
+                if (wordDiff == NAME_NO_MATCH) {
+                    continue;
+                }
+                final Drawable icon;
+                if (resolveInfo.getIconResource() == 0) {
+                    icon = ContextCompat.getDrawable(mContext, R.mipmap.ic_accessibility_generic);
+                } else {
+                    icon = iconFactory.getBadgedIcon(
+                            resolveInfo.serviceInfo,
+                            resolveInfo.serviceInfo.applicationInfo,
+                            mUserId);
+                }
+                final String componentName = new ComponentName(serviceInfo.packageName,
+                        serviceInfo.name).flattenToString();
+                final Intent intent = DatabaseIndexingUtils.buildSearchResultPageIntent(mContext,
+                        AccessibilitySettings.class.getName(), componentName, screenTitle);
+
+                results.add(new SearchResult.Builder()
+                        .setTitle(title)
+                        .addBreadcrumbs(getBreadCrumb())
+                        .setPayload(new ResultPayload(intent))
+                        .setRank(wordDiff)
+                        .setIcon(icon)
+                        .setStableId(Objects.hash(screenTitle, componentName))
+                        .build());
+            }
+            Collections.sort(results);
+            Log.i(TAG, "A11y search loading took:" + (System.currentTimeMillis() - startTime));
+            return results;
         }
-        return mBreadcrumb;
-    }
 
-    @Override
-    protected void onDiscardResult(Set<? extends SearchResult> result) {
-
+        private List<String> getBreadCrumb() {
+            if (mBreadcrumb == null || mBreadcrumb.isEmpty()) {
+                mBreadcrumb = mSiteMapManager.buildBreadCrumb(
+                        mContext, AccessibilitySettings.class.getName(),
+                        mContext.getString(R.string.accessibility_settings));
+            }
+            return mBreadcrumb;
+        }
     }
 }
diff --git a/src/com/android/settings/search/BaseSearchIndexProvider.java b/src/com/android/settings/search/BaseSearchIndexProvider.java
index 0f02f49..5723300 100644
--- a/src/com/android/settings/search/BaseSearchIndexProvider.java
+++ b/src/com/android/settings/search/BaseSearchIndexProvider.java
@@ -27,6 +27,7 @@
 import android.util.Log;
 import android.util.Xml;
 
+import com.android.settings.core.BasePreferenceController;
 import com.android.settings.core.PreferenceControllerMixin;
 import com.android.settingslib.core.AbstractPreferenceController;
 
@@ -71,6 +72,9 @@
                 if (controller instanceof PreferenceControllerMixin) {
                     ((PreferenceControllerMixin) controller)
                             .updateNonIndexableKeys(nonIndexableKeys);
+                } else if (controller instanceof BasePreferenceController) {
+                    ((BasePreferenceController) controller).updateNonIndexableKeys(
+                            nonIndexableKeys);
                 } else {
                     throw new IllegalStateException(controller.getClass().getName()
                             + " must implement " + PreferenceControllerMixin.class.getName());
diff --git a/src/com/android/settings/search/CursorToSearchResultConverter.java b/src/com/android/settings/search/CursorToSearchResultConverter.java
index ce64de9..8528c56 100644
--- a/src/com/android/settings/search/CursorToSearchResultConverter.java
+++ b/src/com/android/settings/search/CursorToSearchResultConverter.java
@@ -36,16 +36,6 @@
 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;
 
 /**
@@ -62,6 +52,25 @@
 
     private static final String TAG = "CursorConverter";
 
+    /**
+     * These indices are used to match the columns of the this loader's SELECT statement.
+     * These are not necessarily the same order nor similar coverage as the schema defined in
+     * IndexDatabaseHelper
+     */
+    public static final int COLUMN_INDEX_ID = 0;
+    public static final int COLUMN_INDEX_TITLE = 1;
+    public static final int COLUMN_INDEX_SUMMARY_ON = 2;
+    public static final int COLUMN_INDEX_SUMMARY_OFF = 3;
+    public static final int COLUMN_INDEX_CLASS_NAME = 4;
+    public static final int COLUMN_INDEX_SCREEN_TITLE = 5;
+    public static final int COLUMN_INDEX_ICON = 6;
+    public static final int COLUMN_INDEX_INTENT_ACTION = 7;
+    public static final int COLUMN_INDEX_INTENT_ACTION_TARGET_PACKAGE = 8;
+    public static final int COLUMN_INDEX_INTENT_ACTION_TARGET_CLASS = 9;
+    public static final int COLUMN_INDEX_KEY = 10;
+    public static final int COLUMN_INDEX_PAYLOAD_TYPE = 11;
+    public static final int COLUMN_INDEX_PAYLOAD = 12;
+
     private final Context mContext;
 
     private final int LONG_TITLE_LENGTH = 20;
diff --git a/src/com/android/settings/search/DatabaseIndexingManager.java b/src/com/android/settings/search/DatabaseIndexingManager.java
index 7f6f012..0aeda66 100644
--- a/src/com/android/settings/search/DatabaseIndexingManager.java
+++ b/src/com/android/settings/search/DatabaseIndexingManager.java
@@ -17,43 +17,17 @@
 
 package com.android.settings.search;
 
-import static android.provider.SearchIndexablesContract.COLUMN_INDEX_NON_INDEXABLE_KEYS_KEY_VALUE;
-import static android.provider.SearchIndexablesContract.COLUMN_INDEX_RAW_CLASS_NAME;
-import static android.provider.SearchIndexablesContract.COLUMN_INDEX_RAW_ENTRIES;
-import static android.provider.SearchIndexablesContract.COLUMN_INDEX_RAW_ICON_RESID;
-import static android.provider.SearchIndexablesContract.COLUMN_INDEX_RAW_INTENT_ACTION;
-import static android.provider.SearchIndexablesContract.COLUMN_INDEX_RAW_INTENT_TARGET_CLASS;
-import static android.provider.SearchIndexablesContract.COLUMN_INDEX_RAW_INTENT_TARGET_PACKAGE;
-import static android.provider.SearchIndexablesContract.COLUMN_INDEX_RAW_KEY;
-import static android.provider.SearchIndexablesContract.COLUMN_INDEX_RAW_KEYWORDS;
-import static android.provider.SearchIndexablesContract.COLUMN_INDEX_RAW_RANK;
-import static android.provider.SearchIndexablesContract.COLUMN_INDEX_RAW_SCREEN_TITLE;
-import static android.provider.SearchIndexablesContract.COLUMN_INDEX_RAW_SUMMARY_OFF;
-import static android.provider.SearchIndexablesContract.COLUMN_INDEX_RAW_SUMMARY_ON;
-import static android.provider.SearchIndexablesContract.COLUMN_INDEX_RAW_TITLE;
-import static android.provider.SearchIndexablesContract.COLUMN_INDEX_RAW_USER_ID;
-import static android.provider.SearchIndexablesContract.COLUMN_INDEX_XML_RES_CLASS_NAME;
-import static android.provider.SearchIndexablesContract.COLUMN_INDEX_XML_RES_ICON_RESID;
-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_RESID;
-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.CursorToSearchResultConverter.COLUMN_INDEX_ID;
+import static com.android.settings.search.CursorToSearchResultConverter.COLUMN_INDEX_INTENT_ACTION_TARGET_PACKAGE;
+import static com.android.settings.search.CursorToSearchResultConverter.COLUMN_INDEX_KEY;
 import static com.android.settings.search.DatabaseResultLoader.SELECT_COLUMNS;
 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;
 import static com.android.settings.search.IndexDatabaseHelper.IndexColumns.DATA_KEY_REF;
-import static com.android.settings.search.IndexDatabaseHelper.IndexColumns.DATA_RANK;
-import static com.android.settings.search.IndexDatabaseHelper.IndexColumns.DATA_SUMMARY_OFF;
-import static com.android.settings.search.IndexDatabaseHelper.IndexColumns
-        .DATA_SUMMARY_OFF_NORMALIZED;
 import static com.android.settings.search.IndexDatabaseHelper.IndexColumns.DATA_SUMMARY_ON;
-import static com.android.settings.search.IndexDatabaseHelper.IndexColumns
-        .DATA_SUMMARY_ON_NORMALIZED;
+import static com.android.settings.search.IndexDatabaseHelper.IndexColumns.DATA_SUMMARY_ON_NORMALIZED;
 import static com.android.settings.search.IndexDatabaseHelper.IndexColumns.DATA_TITLE;
 import static com.android.settings.search.IndexDatabaseHelper.IndexColumns.DATA_TITLE_NORMALIZED;
 import static com.android.settings.search.IndexDatabaseHelper.IndexColumns.DOCID;
@@ -69,46 +43,30 @@
 import static com.android.settings.search.IndexDatabaseHelper.IndexColumns.USER_ID;
 import static com.android.settings.search.IndexDatabaseHelper.Tables.TABLE_PREFS_INDEX;
 
-import android.content.ComponentName;
-import android.content.ContentResolver;
 import android.content.ContentValues;
 import android.content.Context;
 import android.content.Intent;
-import android.content.pm.PackageManager;
 import android.content.pm.ResolveInfo;
-import android.content.res.XmlResourceParser;
 import android.database.Cursor;
 import android.database.sqlite.SQLiteDatabase;
 import android.database.sqlite.SQLiteException;
-import android.net.Uri;
 import android.os.AsyncTask;
 import android.os.Build;
-import android.provider.SearchIndexableData;
-import android.provider.SearchIndexableResource;
 import android.provider.SearchIndexablesContract;
-import android.support.annotation.DrawableRes;
+import android.provider.SearchIndexablesContract.SiteMapColumns;
 import android.support.annotation.VisibleForTesting;
 import android.text.TextUtils;
-import android.util.ArraySet;
-import android.util.AttributeSet;
 import android.util.Log;
-import android.util.Xml;
 
-import com.android.settings.SettingsActivity;
-import com.android.settings.core.PreferenceControllerMixin;
 import com.android.settings.overlay.FeatureFactory;
+import com.android.settings.search.indexing.IndexData;
+import com.android.settings.search.indexing.IndexDataConverter;
+import com.android.settings.search.indexing.PreIndexData;
+import com.android.settings.search.indexing.PreIndexDataCollector;
 
-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.HashMap;
 import java.util.List;
 import java.util.Locale;
 import java.util.Map;
-import java.util.Objects;
 import java.util.Set;
 import java.util.concurrent.atomic.AtomicBoolean;
 
@@ -116,7 +74,7 @@
  * Consumes the SearchIndexableProvider content providers.
  * Updates the Resource, Raw Data and non-indexable data for Search.
  *
- * TODO this class needs to be refactored by moving most of its methods into controllers
+ * TODO(b/33577327) this class needs to be refactored by moving most of its methods into controllers
  */
 public class DatabaseIndexingManager {
 
@@ -128,27 +86,15 @@
     public static final String FIELD_NAME_SEARCH_INDEX_DATA_PROVIDER =
             "SEARCH_INDEX_DATA_PROVIDER";
 
-    private static final String NODE_NAME_PREFERENCE_SCREEN = "PreferenceScreen";
-    private static final String NODE_NAME_CHECK_BOX_PREFERENCE = "CheckBoxPreference";
-    private static final String NODE_NAME_LIST_PREFERENCE = "ListPreference";
-
-    private static final List<String> EMPTY_LIST = Collections.emptyList();
-
-    private final String mBaseAuthority;
-
     @VisibleForTesting
     final AtomicBoolean mIsIndexingComplete = new AtomicBoolean(false);
 
-    @VisibleForTesting
-    final UpdateData mDataToProcess = new UpdateData();
+    private PreIndexDataCollector mCollector;
+    private IndexDataConverter mConverter;
+
     private Context mContext;
 
-    public DatabaseIndexingManager(Context context, String baseAuthority) {
-        mContext = context;
-        mBaseAuthority = baseAuthority;
-    }
-
-    public void setContext(Context context) {
+    public DatabaseIndexingManager(Context context) {
         mContext = context;
     }
 
@@ -177,33 +123,17 @@
         final String providerVersionedNames =
                 IndexDatabaseHelper.buildProviderVersionedNames(providers);
 
-        final boolean isFullIndex = IndexDatabaseHelper.isFullIndex(mContext, localeStr,
-                fingerprint, providerVersionedNames);
+        final boolean isFullIndex = isFullIndex(mContext, localeStr, fingerprint,
+                providerVersionedNames);
 
         if (isFullIndex) {
             rebuildDatabase();
         }
 
-        for (final ResolveInfo info : providers) {
-            if (!DatabaseIndexingUtils.isWellKnownProvider(info, mContext)) {
-                continue;
-            }
-            final String authority = info.providerInfo.authority;
-            final String packageName = info.providerInfo.packageName;
+        PreIndexData indexData = getIndexDataFromProviders(providers, isFullIndex);
 
-            if (isFullIndex) {
-                addIndexablesFromRemoteProvider(packageName, authority);
-            }
-            final long nonIndexableStartTime = System.currentTimeMillis();
-            addNonIndexablesKeysFromRemoteProvider(packageName, authority);
-            if (SettingsSearchIndexablesProvider.DEBUG) {
-                final long nonIndextableTime = System.currentTimeMillis() - nonIndexableStartTime;
-                Log.d(LOG_TAG, "performIndexing update non-indexable for package " + packageName
-                        + " took time: " + nonIndextableTime);
-            }
-        }
         final long updateDatabaseStartTime = System.currentTimeMillis();
-        updateDatabase(isFullIndex, localeStr);
+        updateDatabase(indexData, isFullIndex);
         if (SettingsSearchIndexablesProvider.DEBUG) {
             final long updateDatabaseTime = System.currentTimeMillis() - updateDatabaseStartTime;
             Log.d(LOG_TAG, "performIndexing updateDatabase took time: " + updateDatabaseTime);
@@ -221,10 +151,37 @@
         }
     }
 
+    @VisibleForTesting
+    PreIndexData getIndexDataFromProviders(List<ResolveInfo> providers, boolean isFullIndex) {
+        if (mCollector == null) {
+            mCollector = new PreIndexDataCollector(mContext);
+        }
+        return mCollector.collectIndexableData(providers, isFullIndex);
+    }
+
     /**
-     * Reconstruct the database in the following cases:
-     * - Language has changed
-     * - Build has changed
+     * Checks if the indexed data is obsolete, when either:
+     * - Device language has changed
+     * - Device has taken an OTA.
+     * In both cases, the device requires a full index.
+     *
+     * @param locale      is the default for the device
+     * @param fingerprint id for the current build.
+     * @return true if a full index should be preformed.
+     */
+    @VisibleForTesting
+    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);
+    }
+
+    /**
+     * Drop the currently stored database, and clear the flags which mark the database as indexed.
      */
     private void rebuildDatabase() {
         // Drop the database when the locale or build has changed. This eliminates rows which are
@@ -241,19 +198,10 @@
      * Finally, we record that the locale has been indexed.
      *
      * @param needsReindexing true the database needs to be rebuilt.
-     * @param localeStr       the default locale for the device.
      */
     @VisibleForTesting
-    void updateDatabase(boolean needsReindexing, String localeStr) {
-        final UpdateData copy;
-
-        synchronized (mDataToProcess) {
-            copy = mDataToProcess.copy();
-            mDataToProcess.clear();
-        }
-
-        final List<SearchIndexableData> dataToUpdate = copy.dataToUpdate;
-        final Map<String, Set<String>> nonIndexableKeys = copy.nonIndexableKeys;
+    void updateDatabase(PreIndexData preIndexData, boolean needsReindexing) {
+        final Map<String, Set<String>> nonIndexableKeys = preIndexData.nonIndexableKeys;
 
         final SQLiteDatabase database = getWritableDatabase();
         if (database == null) {
@@ -264,10 +212,9 @@
         try {
             database.beginTransaction();
 
-            // Add new data from Providers at initial index time, or inserted later.
-            if (dataToUpdate.size() > 0) {
-                addDataToDatabase(database, localeStr, dataToUpdate, nonIndexableKeys);
-            }
+            // Convert all Pre-index data to Index data.
+            List<IndexData> indexData = getIndexData(preIndexData);
+            insertIndexData(database, indexData);
 
             // Only check for non-indexable key updates after initial index.
             // Enabled state with non-indexable keys is checked when items are first inserted.
@@ -281,32 +228,62 @@
         }
     }
 
+    @VisibleForTesting
+    List<IndexData> getIndexData(PreIndexData data) {
+        if (mConverter == null) {
+            mConverter = new IndexDataConverter(mContext);
+        }
+        return mConverter.convertPreIndexDataToIndexData(data);
+    }
+
     /**
-     * Inserts {@link SearchIndexableData} into the database.
-     *
-     * @param database         where the data will be inserted.
-     * @param localeStr        is the locale of the data to be inserted.
-     * @param dataToUpdate     is a {@link List} of the data to be inserted.
-     * @param nonIndexableKeys is a {@link Map} from Package Name to a {@link Set} of keys which
-     *                         identify search results which should not be surfaced.
+     * Inserts all of the entries in {@param indexData} into the {@param database}
+     * as Search Data and as part of the Information Hierarchy.
      */
     @VisibleForTesting
-    void addDataToDatabase(SQLiteDatabase database, String localeStr,
-            List<SearchIndexableData> dataToUpdate, Map<String, Set<String>> nonIndexableKeys) {
-        final long current = System.currentTimeMillis();
+    void insertIndexData(SQLiteDatabase database, List<IndexData> indexData) {
+        ContentValues values;
 
-        for (SearchIndexableData data : dataToUpdate) {
-            try {
-                indexOneSearchIndexableData(database, localeStr, data, nonIndexableKeys);
-            } catch (Exception e) {
-                Log.e(LOG_TAG, "Cannot index: " + (data != null ? data.className : data)
-                        + " for locale: " + localeStr, e);
+        for (IndexData dataRow : indexData) {
+            if (TextUtils.isEmpty(dataRow.normalizedTitle)) {
+                continue;
+            }
+
+            values = new ContentValues();
+            values.put(IndexDatabaseHelper.IndexColumns.DOCID, dataRow.getDocId());
+            values.put(LOCALE, dataRow.locale);
+            values.put(DATA_TITLE, dataRow.updatedTitle);
+            values.put(DATA_TITLE_NORMALIZED, dataRow.normalizedTitle);
+            values.put(DATA_SUMMARY_ON, dataRow.updatedSummaryOn);
+            values.put(DATA_SUMMARY_ON_NORMALIZED, dataRow.normalizedSummaryOn);
+            values.put(DATA_ENTRIES, dataRow.entries);
+            values.put(DATA_KEYWORDS, dataRow.spaceDelimitedKeywords);
+            values.put(CLASS_NAME, dataRow.className);
+            values.put(SCREEN_TITLE, dataRow.screenTitle);
+            values.put(INTENT_ACTION, dataRow.intentAction);
+            values.put(INTENT_TARGET_PACKAGE, dataRow.intentTargetPackage);
+            values.put(INTENT_TARGET_CLASS, dataRow.intentTargetClass);
+            values.put(ICON, dataRow.iconResId);
+            values.put(ENABLED, dataRow.enabled);
+            values.put(DATA_KEY_REF, dataRow.key);
+            values.put(USER_ID, dataRow.userId);
+            values.put(PAYLOAD_TYPE, dataRow.payloadType);
+            values.put(PAYLOAD, dataRow.payload);
+
+            database.replaceOrThrow(TABLE_PREFS_INDEX, null, values);
+
+            if (!TextUtils.isEmpty(dataRow.className)
+                    && !TextUtils.isEmpty(dataRow.childClassName)) {
+                final ContentValues siteMapPair = new ContentValues();
+                siteMapPair.put(SiteMapColumns.PARENT_CLASS, dataRow.className);
+                siteMapPair.put(SiteMapColumns.PARENT_TITLE, dataRow.screenTitle);
+                siteMapPair.put(SiteMapColumns.CHILD_CLASS, dataRow.childClassName);
+                siteMapPair.put(SiteMapColumns.CHILD_TITLE, dataRow.updatedTitle);
+
+                database.replaceOrThrow(IndexDatabaseHelper.Tables.TABLE_SITE_MAP,
+                        null /* nullColumnHack */, siteMapPair);
             }
         }
-
-        final long now = System.currentTimeMillis();
-        Log.d(LOG_TAG, "Indexing locale '" + localeStr + "' took " +
-                (now - current) + " millis");
     }
 
     /**
@@ -378,126 +355,6 @@
         disabledResults.close();
     }
 
-    @VisibleForTesting
-    boolean addIndexablesFromRemoteProvider(String packageName, String authority) {
-        try {
-            final Context context = mBaseAuthority.equals(authority) ?
-                    mContext : mContext.createPackageContext(packageName, 0);
-
-            final Uri uriForResources = buildUriForXmlResources(authority);
-            addIndexablesForXmlResourceUri(context, packageName, uriForResources,
-                    SearchIndexablesContract.INDEXABLES_XML_RES_COLUMNS);
-
-            final Uri uriForRawData = buildUriForRawData(authority);
-            addIndexablesForRawDataUri(context, packageName, uriForRawData,
-                    SearchIndexablesContract.INDEXABLES_RAW_COLUMNS);
-            return true;
-        } catch (PackageManager.NameNotFoundException e) {
-            Log.w(LOG_TAG, "Could not create context for " + packageName + ": "
-                    + Log.getStackTraceString(e));
-            return false;
-        }
-    }
-
-    @VisibleForTesting
-    void addNonIndexablesKeysFromRemoteProvider(String packageName,
-            String authority) {
-        final List<String> keys =
-                getNonIndexablesKeysFromRemoteProvider(packageName, authority);
-
-        addNonIndexableKeys(packageName, keys);
-    }
-
-    private List<String> getNonIndexablesKeysFromRemoteProvider(String packageName,
-            String authority) {
-        try {
-            final Context packageContext = mContext.createPackageContext(packageName, 0);
-
-            final Uri uriForNonIndexableKeys = buildUriForNonIndexableKeys(authority);
-            return getNonIndexablesKeys(packageContext, uriForNonIndexableKeys,
-                    SearchIndexablesContract.NON_INDEXABLES_KEYS_COLUMNS);
-        } catch (PackageManager.NameNotFoundException e) {
-            Log.w(LOG_TAG, "Could not create context for " + packageName + ": "
-                    + Log.getStackTraceString(e));
-            return EMPTY_LIST;
-        }
-    }
-
-    private List<String> getNonIndexablesKeys(Context packageContext, Uri uri,
-            String[] projection) {
-
-        final ContentResolver resolver = packageContext.getContentResolver();
-        final Cursor cursor = resolver.query(uri, projection, null, null, null);
-
-        if (cursor == null) {
-            Log.w(LOG_TAG, "Cannot add index data for Uri: " + uri.toString());
-            return EMPTY_LIST;
-        }
-
-        final List<String> result = new ArrayList<>();
-        try {
-            final int count = cursor.getCount();
-            if (count > 0) {
-                while (cursor.moveToNext()) {
-                    final String key = cursor.getString(COLUMN_INDEX_NON_INDEXABLE_KEYS_KEY_VALUE);
-
-                    if (TextUtils.isEmpty(key) && Log.isLoggable(LOG_TAG, Log.VERBOSE)) {
-                        Log.v(LOG_TAG, "Empty non-indexable key from: "
-                                + packageContext.getPackageName());
-                        continue;
-                    }
-
-                    result.add(key);
-                }
-            }
-            return result;
-        } finally {
-            cursor.close();
-        }
-    }
-
-    public void addIndexableData(SearchIndexableData data) {
-        synchronized (mDataToProcess) {
-            mDataToProcess.dataToUpdate.add(data);
-        }
-    }
-
-    public void addNonIndexableKeys(String authority, List<String> keys) {
-        synchronized (mDataToProcess) {
-            if (keys != null && !keys.isEmpty()) {
-                mDataToProcess.nonIndexableKeys.put(authority, new ArraySet<>(keys));
-            }
-        }
-    }
-
-    /**
-     * Update the Index for a specific class name resources
-     *
-     * @param className              the class name (typically a fragment name).
-     * @param includeInSearchResults true means that you want the bit "enabled" set so that the
-     *                               data will be seen included into the search results
-     */
-    public void updateFromClassNameResource(String className, boolean includeInSearchResults) {
-        if (className == null) {
-            throw new IllegalArgumentException("class name cannot be null!");
-        }
-        final SearchIndexableResource res = SearchIndexableResources.getResourceByName(className);
-        if (res == null) {
-            Log.e(LOG_TAG, "Cannot find SearchIndexableResources for class name: " + className);
-            return;
-        }
-        res.context = mContext;
-        res.enabled = includeInSearchResults;
-        AsyncTask.execute(new Runnable() {
-            @Override
-            public void run() {
-                addIndexableData(res);
-                updateDatabase(false, Locale.getDefault().toString());
-                res.enabled = false;
-            }
-        });
-    }
-
     private SQLiteDatabase getWritableDatabase() {
         try {
             return IndexDatabaseHelper.getInstance(mContext).getWritableDatabase();
@@ -507,795 +364,6 @@
         }
     }
 
-    private static Uri buildUriForXmlResources(String authority) {
-        return Uri.parse("content://" + authority + "/" +
-                SearchIndexablesContract.INDEXABLES_XML_RES_PATH);
-    }
-
-    private static Uri buildUriForRawData(String authority) {
-        return Uri.parse("content://" + authority + "/" +
-                SearchIndexablesContract.INDEXABLES_RAW_PATH);
-    }
-
-    private static Uri buildUriForNonIndexableKeys(String authority) {
-        return Uri.parse("content://" + authority + "/" +
-                SearchIndexablesContract.NON_INDEXABLES_KEYS_PATH);
-    }
-
-    private void addIndexablesForXmlResourceUri(Context packageContext, String packageName,
-            Uri uri, String[] projection) {
-
-        final ContentResolver resolver = packageContext.getContentResolver();
-        final Cursor cursor = resolver.query(uri, projection, null, null, null);
-
-        if (cursor == null) {
-            Log.w(LOG_TAG, "Cannot add index data for Uri: " + uri.toString());
-            return;
-        }
-
-        try {
-            final int count = cursor.getCount();
-            if (count > 0) {
-                while (cursor.moveToNext()) {
-                    final int xmlResId = cursor.getInt(COLUMN_INDEX_XML_RES_RESID);
-
-                    final String className = cursor.getString(COLUMN_INDEX_XML_RES_CLASS_NAME);
-                    final int iconResId = cursor.getInt(COLUMN_INDEX_XML_RES_ICON_RESID);
-
-                    final String action = cursor.getString(COLUMN_INDEX_XML_RES_INTENT_ACTION);
-                    final String targetPackage = cursor.getString(
-                            COLUMN_INDEX_XML_RES_INTENT_TARGET_PACKAGE);
-                    final String targetClass = cursor.getString(
-                            COLUMN_INDEX_XML_RES_INTENT_TARGET_CLASS);
-
-                    SearchIndexableResource sir = new SearchIndexableResource(packageContext);
-                    sir.xmlResId = xmlResId;
-                    sir.className = className;
-                    sir.packageName = packageName;
-                    sir.iconResId = iconResId;
-                    sir.intentAction = action;
-                    sir.intentTargetPackage = targetPackage;
-                    sir.intentTargetClass = targetClass;
-
-                    addIndexableData(sir);
-                }
-            }
-        } finally {
-            cursor.close();
-        }
-    }
-
-    private void addIndexablesForRawDataUri(Context packageContext, String packageName,
-            Uri uri, String[] projection) {
-
-        final ContentResolver resolver = packageContext.getContentResolver();
-        final Cursor cursor = resolver.query(uri, projection, null, null, null);
-
-        if (cursor == null) {
-            Log.w(LOG_TAG, "Cannot add index data for Uri: " + uri.toString());
-            return;
-        }
-
-        try {
-            final int count = cursor.getCount();
-            if (count > 0) {
-                while (cursor.moveToNext()) {
-                    final int providerRank = cursor.getInt(COLUMN_INDEX_RAW_RANK);
-                    // TODO Remove rank
-                    final String title = cursor.getString(COLUMN_INDEX_RAW_TITLE);
-                    final String summaryOn = cursor.getString(COLUMN_INDEX_RAW_SUMMARY_ON);
-                    final String summaryOff = cursor.getString(COLUMN_INDEX_RAW_SUMMARY_OFF);
-                    final String entries = cursor.getString(COLUMN_INDEX_RAW_ENTRIES);
-                    final String keywords = cursor.getString(COLUMN_INDEX_RAW_KEYWORDS);
-
-                    final String screenTitle = cursor.getString(COLUMN_INDEX_RAW_SCREEN_TITLE);
-
-                    final String className = cursor.getString(COLUMN_INDEX_RAW_CLASS_NAME);
-                    final int iconResId = cursor.getInt(COLUMN_INDEX_RAW_ICON_RESID);
-
-                    final String action = cursor.getString(COLUMN_INDEX_RAW_INTENT_ACTION);
-                    final String targetPackage = cursor.getString(
-                            COLUMN_INDEX_RAW_INTENT_TARGET_PACKAGE);
-                    final String targetClass = cursor.getString(
-                            COLUMN_INDEX_RAW_INTENT_TARGET_CLASS);
-
-                    final String key = cursor.getString(COLUMN_INDEX_RAW_KEY);
-                    final int userId = cursor.getInt(COLUMN_INDEX_RAW_USER_ID);
-
-                    SearchIndexableRaw data = new SearchIndexableRaw(packageContext);
-                    data.title = title;
-                    data.summaryOn = summaryOn;
-                    data.summaryOff = summaryOff;
-                    data.entries = entries;
-                    data.keywords = keywords;
-                    data.screenTitle = screenTitle;
-                    data.className = className;
-                    data.packageName = packageName;
-                    data.iconResId = iconResId;
-                    data.intentAction = action;
-                    data.intentTargetPackage = targetPackage;
-                    data.intentTargetClass = targetClass;
-                    data.key = key;
-                    data.userId = userId;
-
-                    addIndexableData(data);
-                }
-            }
-        } finally {
-            cursor.close();
-        }
-    }
-
-    public void indexOneSearchIndexableData(SQLiteDatabase database, String localeStr,
-            SearchIndexableData data, Map<String, Set<String>> nonIndexableKeys) {
-        if (data instanceof SearchIndexableResource) {
-            indexOneResource(database, localeStr, (SearchIndexableResource) data, nonIndexableKeys);
-        } else if (data instanceof SearchIndexableRaw) {
-            indexOneRaw(database, localeStr, (SearchIndexableRaw) data, nonIndexableKeys);
-        }
-    }
-
-    private void indexOneRaw(SQLiteDatabase database, String localeStr,
-            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)
-                .setClassName(raw.className)
-                .setScreenTitle(raw.screenTitle)
-                .setIconResId(raw.iconResId)
-                .setRank(raw.rank)
-                .setIntentAction(raw.intentAction)
-                .setIntentTargetPackage(raw.intentTargetPackage)
-                .setIntentTargetClass(raw.intentTargetClass)
-                .setEnabled(enabled)
-                .setKey(raw.key)
-                .setUserId(raw.userId);
-
-        updateOneRowWithFilteredData(database, builder, raw.title, raw.summaryOn, raw.summaryOff,
-                raw.keywords);
-    }
-
-    private void indexOneResource(SQLiteDatabase database, String localeStr,
-            SearchIndexableResource sir, Map<String, Set<String>> nonIndexableKeysFromResource) {
-
-        if (sir == null) {
-            Log.e(LOG_TAG, "Cannot index a null resource!");
-            return;
-        }
-
-        final List<String> nonIndexableKeys = new ArrayList<String>();
-
-        if (sir.xmlResId > SearchIndexableResources.NO_DATA_RES_ID) {
-            Set<String> resNonIndexableKeys = nonIndexableKeysFromResource.get(sir.packageName);
-            if (resNonIndexableKeys != null && resNonIndexableKeys.size() > 0) {
-                nonIndexableKeys.addAll(resNonIndexableKeys);
-            }
-
-            indexFromResource(database, localeStr, sir, nonIndexableKeys);
-        } else {
-            if (TextUtils.isEmpty(sir.className)) {
-                Log.w(LOG_TAG, "Cannot index an empty Search Provider name!");
-                return;
-            }
-
-            final Class<?> clazz = DatabaseIndexingUtils.getIndexableClass(sir.className);
-            if (clazz == null) {
-                Log.d(LOG_TAG, "SearchIndexableResource '" + sir.className +
-                        "' should implement the " + Indexable.class.getName() + " interface!");
-                return;
-            }
-
-            // Will be non null only for a Local provider implementing a
-            // SEARCH_INDEX_DATA_PROVIDER field
-            final Indexable.SearchIndexProvider provider =
-                    DatabaseIndexingUtils.getSearchIndexProvider(clazz);
-            if (provider != null) {
-                List<String> providerNonIndexableKeys = provider.getNonIndexableKeys(sir.context);
-                if (providerNonIndexableKeys != null && providerNonIndexableKeys.size() > 0) {
-                    nonIndexableKeys.addAll(providerNonIndexableKeys);
-                }
-
-                indexFromProvider(database, localeStr, provider, sir, nonIndexableKeys);
-            }
-        }
-    }
-
-    @VisibleForTesting
-    void indexFromResource(SQLiteDatabase database, String localeStr,
-            SearchIndexableResource sir, List<String> nonIndexableKeys) {
-        final Context context = sir.context;
-        XmlResourceParser parser = null;
-        try {
-            parser = context.getResources().getXml(sir.xmlResId);
-
-            int type;
-            while ((type = parser.next()) != XmlPullParser.END_DOCUMENT
-                    && type != XmlPullParser.START_TAG) {
-                // Parse next until start tag is found
-            }
-
-            String nodeName = parser.getName();
-            if (!NODE_NAME_PREFERENCE_SCREEN.equals(nodeName)) {
-                throw new RuntimeException(
-                        "XML document must start with <PreferenceScreen> tag; found"
-                                + nodeName + " at " + parser.getPositionDescription());
-            }
-
-            final int outerDepth = parser.getDepth();
-            final AttributeSet attrs = Xml.asAttributeSet(parser);
-
-            final String screenTitle = XmlParserUtils.getDataTitle(context, attrs);
-            String key = XmlParserUtils.getDataKey(context, attrs);
-
-            String title;
-            String headerTitle;
-            String summary;
-            String headerSummary;
-            String keywords;
-            String headerKeywords;
-            String childFragment;
-            @DrawableRes
-            int iconResId;
-            ResultPayload payload;
-            boolean enabled;
-            final String fragmentName = sir.className;
-            final int rank = sir.rank;
-            final String intentAction = sir.intentAction;
-            final String intentTargetPackage = sir.intentTargetPackage;
-            final String intentTargetClass = sir.intentTargetClass;
-
-            Map<String, PreferenceControllerMixin> controllerUriMap = null;
-
-            if (fragmentName != null) {
-                controllerUriMap = DatabaseIndexingUtils
-                        .getPreferenceControllerUriMap(fragmentName, context);
-            }
-
-            // Insert rows for the main PreferenceScreen node. Rewrite the data for removing
-            // hyphens.
-
-            headerTitle = XmlParserUtils.getDataTitle(context, attrs);
-            headerSummary = XmlParserUtils.getDataSummary(context, attrs);
-            headerKeywords = XmlParserUtils.getDataKeywords(context, attrs);
-            enabled = !nonIndexableKeys.contains(key);
-
-            // TODO: Set payload type for header results
-            DatabaseRow.Builder headerBuilder = new DatabaseRow.Builder();
-            headerBuilder.setLocale(localeStr)
-                    .setEntries(null)
-                    .setClassName(fragmentName)
-                    .setScreenTitle(screenTitle)
-                    .setRank(rank)
-                    .setIntentAction(intentAction)
-                    .setIntentTargetPackage(intentTargetPackage)
-                    .setIntentTargetClass(intentTargetClass)
-                    .setEnabled(enabled)
-                    .setKey(key)
-                    .setUserId(-1 /* default user id */);
-
-            // Flag for XML headers which a child element's title.
-            boolean isHeaderUnique = true;
-            DatabaseRow.Builder builder;
-
-            while ((type = parser.next()) != XmlPullParser.END_DOCUMENT
-                    && (type != XmlPullParser.END_TAG || parser.getDepth() > outerDepth)) {
-                if (type == XmlPullParser.END_TAG || type == XmlPullParser.TEXT) {
-                    continue;
-                }
-
-                nodeName = parser.getName();
-
-                title = XmlParserUtils.getDataTitle(context, attrs);
-                key = XmlParserUtils.getDataKey(context, attrs);
-                enabled = !nonIndexableKeys.contains(key);
-                keywords = XmlParserUtils.getDataKeywords(context, attrs);
-                iconResId = XmlParserUtils.getDataIcon(context, attrs);
-
-                if (isHeaderUnique && TextUtils.equals(headerTitle, title)) {
-                    isHeaderUnique = false;
-                }
-
-                builder = new DatabaseRow.Builder();
-                builder.setLocale(localeStr)
-                        .setClassName(fragmentName)
-                        .setScreenTitle(screenTitle)
-                        .setIconResId(iconResId)
-                        .setRank(rank)
-                        .setIntentAction(intentAction)
-                        .setIntentTargetPackage(intentTargetPackage)
-                        .setIntentTargetClass(intentTargetClass)
-                        .setEnabled(enabled)
-                        .setKey(key)
-                        .setUserId(-1 /* default user id */);
-
-                if (!nodeName.equals(NODE_NAME_CHECK_BOX_PREFERENCE)) {
-                    summary = XmlParserUtils.getDataSummary(context, attrs);
-
-                    String entries = null;
-
-                    if (nodeName.endsWith(NODE_NAME_LIST_PREFERENCE)) {
-                        entries = XmlParserUtils.getDataEntries(context, attrs);
-                    }
-
-                    // TODO (b/62254931) index primitives instead of payload
-                    payload = DatabaseIndexingUtils.getPayloadFromUriMap(controllerUriMap, key);
-                    childFragment = XmlParserUtils.getDataChildFragment(context, attrs);
-
-                    builder.setEntries(entries)
-                            .setChildClassName(childFragment)
-                            .setPayload(payload);
-
-                    // Insert rows for the child nodes of PreferenceScreen
-                    updateOneRowWithFilteredData(database, builder, title, summary,
-                            null /* summary off */, keywords);
-                } else {
-                    String summaryOn = XmlParserUtils.getDataSummaryOn(context, attrs);
-                    String summaryOff = XmlParserUtils.getDataSummaryOff(context, attrs);
-
-                    if (TextUtils.isEmpty(summaryOn) && TextUtils.isEmpty(summaryOff)) {
-                        summaryOn = XmlParserUtils.getDataSummary(context, attrs);
-                    }
-
-                    updateOneRowWithFilteredData(database, builder, title, summaryOn, summaryOff,
-                            keywords);
-                }
-            }
-
-            // The xml header's title does not match the title of one of the child settings.
-            if (isHeaderUnique) {
-                updateOneRowWithFilteredData(database, headerBuilder, headerTitle, headerSummary,
-                        null /* summary off */, headerKeywords);
-            }
-        } catch (XmlPullParserException e) {
-            throw new RuntimeException("Error parsing PreferenceScreen", e);
-        } catch (IOException e) {
-            throw new RuntimeException("Error parsing PreferenceScreen", e);
-        } finally {
-            if (parser != null) parser.close();
-        }
-    }
-
-    private void indexFromProvider(SQLiteDatabase database, String localeStr,
-            Indexable.SearchIndexProvider provider, SearchIndexableResource sir,
-            List<String> nonIndexableKeys) {
-
-        final String className = sir.className;
-        final String intentAction = sir.intentAction;
-        final String intentTargetPackage = sir.intentTargetPackage;
-
-        if (provider == null) {
-            Log.w(LOG_TAG, "Cannot find provider: " + className);
-            return;
-        }
-
-        final List<SearchIndexableRaw> rawList = provider.getRawDataToIndex(mContext,
-                true /* enabled */);
-
-        if (rawList != null) {
-
-            final int rawSize = rawList.size();
-            for (int i = 0; i < rawSize; i++) {
-                SearchIndexableRaw raw = rawList.get(i);
-
-                // Should be the same locale as the one we are processing
-                if (!raw.locale.toString().equalsIgnoreCase(localeStr)) {
-                    continue;
-                }
-                boolean enabled = !nonIndexableKeys.contains(raw.key);
-
-                DatabaseRow.Builder builder = new DatabaseRow.Builder();
-                builder.setLocale(localeStr)
-                        .setEntries(raw.entries)
-                        .setClassName(className)
-                        .setScreenTitle(raw.screenTitle)
-                        .setIconResId(raw.iconResId)
-                        .setIntentAction(raw.intentAction)
-                        .setIntentTargetPackage(raw.intentTargetPackage)
-                        .setIntentTargetClass(raw.intentTargetClass)
-                        .setEnabled(enabled)
-                        .setKey(raw.key)
-                        .setUserId(raw.userId);
-
-                updateOneRowWithFilteredData(database, builder, raw.title, raw.summaryOn,
-                        raw.summaryOff, raw.keywords);
-            }
-        }
-
-        final List<SearchIndexableResource> resList =
-                provider.getXmlResourcesToIndex(mContext, true);
-        if (resList != null) {
-            final int resSize = resList.size();
-            for (int i = 0; i < resSize; i++) {
-                SearchIndexableResource item = resList.get(i);
-
-                // Should be the same locale as the one we are processing
-                if (!item.locale.toString().equalsIgnoreCase(localeStr)) {
-                    continue;
-                }
-
-                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);
-            }
-        }
-    }
-
-    private void updateOneRowWithFilteredData(SQLiteDatabase database, DatabaseRow.Builder builder,
-            String title, String summaryOn, String summaryOff, String keywords) {
-
-        final String updatedTitle = DatabaseIndexingUtils.normalizeHyphen(title);
-        final String updatedSummaryOn = DatabaseIndexingUtils.normalizeHyphen(summaryOn);
-        final String updatedSummaryOff = DatabaseIndexingUtils.normalizeHyphen(summaryOff);
-
-        final String normalizedTitle = DatabaseIndexingUtils.normalizeString(updatedTitle);
-        final String normalizedSummaryOn = DatabaseIndexingUtils.normalizeString(updatedSummaryOn);
-        final String normalizedSummaryOff = DatabaseIndexingUtils
-                .normalizeString(updatedSummaryOff);
-
-        final String spaceDelimitedKeywords = DatabaseIndexingUtils.normalizeKeywords(keywords);
-
-        builder.setUpdatedTitle(updatedTitle)
-                .setUpdatedSummaryOn(updatedSummaryOn)
-                .setUpdatedSummaryOff(updatedSummaryOff)
-                .setNormalizedTitle(normalizedTitle)
-                .setNormalizedSummaryOn(normalizedSummaryOn)
-                .setNormalizedSummaryOff(normalizedSummaryOff)
-                .setSpaceDelimitedKeywords(spaceDelimitedKeywords);
-
-        updateOneRow(database, builder.build(mContext));
-    }
-
-    private void updateOneRow(SQLiteDatabase database, DatabaseRow row) {
-
-        if (TextUtils.isEmpty(row.updatedTitle)) {
-            return;
-        }
-
-        ContentValues values = new ContentValues();
-        values.put(IndexDatabaseHelper.IndexColumns.DOCID, row.getDocId());
-        values.put(LOCALE, row.locale);
-        values.put(DATA_RANK, row.rank);
-        values.put(DATA_TITLE, row.updatedTitle);
-        values.put(DATA_TITLE_NORMALIZED, row.normalizedTitle);
-        values.put(DATA_SUMMARY_ON, row.updatedSummaryOn);
-        values.put(DATA_SUMMARY_ON_NORMALIZED, row.normalizedSummaryOn);
-        values.put(DATA_SUMMARY_OFF, row.updatedSummaryOff);
-        values.put(DATA_SUMMARY_OFF_NORMALIZED, row.normalizedSummaryOff);
-        values.put(DATA_ENTRIES, row.entries);
-        values.put(DATA_KEYWORDS, row.spaceDelimitedKeywords);
-        values.put(CLASS_NAME, row.className);
-        values.put(SCREEN_TITLE, row.screenTitle);
-        values.put(INTENT_ACTION, row.intentAction);
-        values.put(INTENT_TARGET_PACKAGE, row.intentTargetPackage);
-        values.put(INTENT_TARGET_CLASS, row.intentTargetClass);
-        values.put(ICON, row.iconResId);
-        values.put(ENABLED, row.enabled);
-        values.put(DATA_KEY_REF, row.key);
-        values.put(USER_ID, row.userId);
-        values.put(PAYLOAD_TYPE, row.payloadType);
-        values.put(PAYLOAD, row.payload);
-
-        database.replaceOrThrow(TABLE_PREFS_INDEX, null, values);
-
-        if (!TextUtils.isEmpty(row.className) && !TextUtils.isEmpty(row.childClassName)) {
-            ContentValues siteMapPair = new ContentValues();
-            final int pairDocId = Objects.hash(row.className, row.childClassName);
-            siteMapPair.put(IndexDatabaseHelper.SiteMapColumns.DOCID, pairDocId);
-            siteMapPair.put(IndexDatabaseHelper.SiteMapColumns.PARENT_CLASS, row.className);
-            siteMapPair.put(IndexDatabaseHelper.SiteMapColumns.PARENT_TITLE, row.screenTitle);
-            siteMapPair.put(IndexDatabaseHelper.SiteMapColumns.CHILD_CLASS, row.childClassName);
-            siteMapPair.put(IndexDatabaseHelper.SiteMapColumns.CHILD_TITLE, row.updatedTitle);
-
-            database.replaceOrThrow(IndexDatabaseHelper.Tables.TABLE_SITE_MAP, null, siteMapPair);
-        }
-    }
-
-    /**
-     * A private class to describe the indexDatabase data for the Index database
-     */
-    @VisibleForTesting(otherwise = VisibleForTesting.PRIVATE)
-    static class UpdateData {
-        public List<SearchIndexableData> dataToUpdate;
-        public List<SearchIndexableData> dataToDisable;
-        public Map<String, Set<String>> nonIndexableKeys;
-
-        public UpdateData() {
-            dataToUpdate = new ArrayList<>();
-            dataToDisable = new ArrayList<>();
-            nonIndexableKeys = new HashMap<>();
-        }
-
-        public UpdateData(UpdateData other) {
-            dataToUpdate = new ArrayList<>(other.dataToUpdate);
-            dataToDisable = new ArrayList<>(other.dataToDisable);
-            nonIndexableKeys = new HashMap<>(other.nonIndexableKeys);
-        }
-
-        public UpdateData copy() {
-            return new UpdateData(this);
-        }
-
-        public void clear() {
-            dataToUpdate.clear();
-            dataToDisable.clear();
-            nonIndexableKeys.clear();
-        }
-    }
-
-    public static class DatabaseRow {
-        public final String locale;
-        public final String updatedTitle;
-        public final String normalizedTitle;
-        public final String updatedSummaryOn;
-        public final String normalizedSummaryOn;
-        public final String updatedSummaryOff;
-        public final String normalizedSummaryOff;
-        public final String entries;
-        public final String className;
-        public final String childClassName;
-        public final String screenTitle;
-        public final int iconResId;
-        public final int rank;
-        public final String spaceDelimitedKeywords;
-        public final String intentAction;
-        public final String intentTargetPackage;
-        public final String intentTargetClass;
-        public final boolean enabled;
-        public final String key;
-        public final int userId;
-        public final int payloadType;
-        public final byte[] payload;
-
-        private DatabaseRow(Builder builder) {
-            locale = builder.mLocale;
-            updatedTitle = builder.mUpdatedTitle;
-            normalizedTitle = builder.mNormalizedTitle;
-            updatedSummaryOn = builder.mUpdatedSummaryOn;
-            normalizedSummaryOn = builder.mNormalizedSummaryOn;
-            updatedSummaryOff = builder.mUpdatedSummaryOff;
-            normalizedSummaryOff = builder.mNormalizedSummaryOff;
-            entries = builder.mEntries;
-            className = builder.mClassName;
-            childClassName = builder.mChildClassName;
-            screenTitle = builder.mScreenTitle;
-            iconResId = builder.mIconResId;
-            rank = builder.mRank;
-            spaceDelimitedKeywords = builder.mSpaceDelimitedKeywords;
-            intentAction = builder.mIntentAction;
-            intentTargetPackage = builder.mIntentTargetPackage;
-            intentTargetClass = builder.mIntentTargetClass;
-            enabled = builder.mEnabled;
-            key = builder.mKey;
-            userId = builder.mUserId;
-            payloadType = builder.mPayloadType;
-            payload = builder.mPayload != null ? ResultPayloadUtils.marshall(builder.mPayload)
-                    : null;
-        }
-
-        /**
-         * Returns the doc id for this row.
-         */
-        public int getDocId() {
-            // 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 {
-            private String mLocale;
-            private String mUpdatedTitle;
-            private String mNormalizedTitle;
-            private String mUpdatedSummaryOn;
-            private String mNormalizedSummaryOn;
-            private String mUpdatedSummaryOff;
-            private String mNormalizedSummaryOff;
-            private String mEntries;
-            private String mClassName;
-            private String mChildClassName;
-            private String mScreenTitle;
-            private int mIconResId;
-            private int mRank;
-            private String mSpaceDelimitedKeywords;
-            private String mIntentAction;
-            private String mIntentTargetPackage;
-            private String mIntentTargetClass;
-            private boolean mEnabled;
-            private String mKey;
-            private int mUserId;
-            @ResultPayload.PayloadType
-            private int mPayloadType;
-            private ResultPayload mPayload;
-
-            public Builder setLocale(String locale) {
-                mLocale = locale;
-                return this;
-            }
-
-            public Builder setUpdatedTitle(String updatedTitle) {
-                mUpdatedTitle = updatedTitle;
-                return this;
-            }
-
-            public Builder setNormalizedTitle(String normalizedTitle) {
-                mNormalizedTitle = normalizedTitle;
-                return this;
-            }
-
-            public Builder setUpdatedSummaryOn(String updatedSummaryOn) {
-                mUpdatedSummaryOn = updatedSummaryOn;
-                return this;
-            }
-
-            public Builder setNormalizedSummaryOn(String normalizedSummaryOn) {
-                mNormalizedSummaryOn = normalizedSummaryOn;
-                return this;
-            }
-
-            public Builder setUpdatedSummaryOff(String updatedSummaryOff) {
-                mUpdatedSummaryOff = updatedSummaryOff;
-                return this;
-            }
-
-            public Builder setNormalizedSummaryOff(String normalizedSummaryOff) {
-                this.mNormalizedSummaryOff = normalizedSummaryOff;
-                return this;
-            }
-
-            public Builder setEntries(String entries) {
-                mEntries = entries;
-                return this;
-            }
-
-            public Builder setClassName(String className) {
-                mClassName = className;
-                return this;
-            }
-
-            public Builder setChildClassName(String childClassName) {
-                mChildClassName = childClassName;
-                return this;
-            }
-
-            public Builder setScreenTitle(String screenTitle) {
-                mScreenTitle = screenTitle;
-                return this;
-            }
-
-            public Builder setIconResId(int iconResId) {
-                mIconResId = iconResId;
-                return this;
-            }
-
-            public Builder setRank(int rank) {
-                mRank = rank;
-                return this;
-            }
-
-            public Builder setSpaceDelimitedKeywords(String spaceDelimitedKeywords) {
-                mSpaceDelimitedKeywords = spaceDelimitedKeywords;
-                return this;
-            }
-
-            public Builder setIntentAction(String intentAction) {
-                mIntentAction = intentAction;
-                return this;
-            }
-
-            public Builder setIntentTargetPackage(String intentTargetPackage) {
-                mIntentTargetPackage = intentTargetPackage;
-                return this;
-            }
-
-            public Builder setIntentTargetClass(String intentTargetClass) {
-                mIntentTargetClass = intentTargetClass;
-                return this;
-            }
-
-            public Builder setEnabled(boolean enabled) {
-                mEnabled = enabled;
-                return this;
-            }
-
-            public Builder setKey(String key) {
-                mKey = key;
-                return this;
-            }
-
-            public Builder setUserId(int userId) {
-                mUserId = userId;
-                return this;
-            }
-
-            public Builder setPayload(ResultPayload payload) {
-                mPayload = payload;
-
-                if (mPayload != null) {
-                    setPayloadType(mPayload.getType());
-                }
-                return this;
-            }
-
-            /**
-             * Payload type is added when a Payload is added to the Builder in {setPayload}
-             *
-             * @param payloadType PayloadType
-             * @return The Builder
-             */
-            private Builder setPayloadType(@ResultPayload.PayloadType int payloadType) {
-                mPayloadType = payloadType;
-                return this;
-            }
-
-            /**
-             * 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);
-            }
-        }
-    }
-
     public class IndexingTask extends AsyncTask<Void, Void, Void> {
 
         @VisibleForTesting
@@ -1330,4 +398,4 @@
             }
         }
     }
-}
+}
\ No newline at end of file
diff --git a/src/com/android/settings/search/DatabaseIndexingUtils.java b/src/com/android/settings/search/DatabaseIndexingUtils.java
index 938ddb7..207d09f 100644
--- a/src/com/android/settings/search/DatabaseIndexingUtils.java
+++ b/src/com/android/settings/search/DatabaseIndexingUtils.java
@@ -17,30 +17,23 @@
 
 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.BasePreferenceController;
 import com.android.settings.core.PreferenceControllerMixin;
 import com.android.settingslib.core.AbstractPreferenceController;
 
 import java.lang.reflect.Field;
-import java.text.Normalizer;
 import java.util.List;
 import java.util.Map;
-import java.util.regex.Pattern;
 
 /**
  * Utility class for {@like DatabaseIndexingManager} to handle the mapping between Payloads
@@ -53,38 +46,38 @@
     private static final String FIELD_NAME_SEARCH_INDEX_DATA_PROVIDER =
             "SEARCH_INDEX_DATA_PROVIDER";
 
-    private static final String NON_BREAKING_HYPHEN = "\u2011";
-    private static final String EMPTY = "";
-    private static final String LIST_DELIMITERS = "[,]\\s*";
-    private static final String HYPHEN = "-";
-    private static final String SPACE = " ";
-
-    private static final Pattern REMOVE_DIACRITICALS_PATTERN
-            = Pattern.compile("\\p{InCombiningDiacriticalMarks}+");
-
     /**
-     * Builds intent into a subsetting.
+     * Builds intent that launches the search destination as a sub-setting.
      */
-    public static Intent buildSubsettingIntent(Context context, String className, String key,
+    public static Intent buildSearchResultPageIntent(Context context, String className, String key,
             String screenTitle) {
+        return buildSearchResultPageIntent(context, className, key, screenTitle,
+                MetricsProto.MetricsEvent.DASHBOARD_SEARCH_RESULTS);
+    }
+
+    public static Intent  buildSearchResultPageIntent(Context context, String className, String key,
+            String screenTitle, int sourceMetricsCategory) {
         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);
+        final Intent searchDestination = Utils.onBuildStartFragmentIntent(context,
+                className, args, null, 0, screenTitle, false, sourceMetricsCategory);
+        searchDestination.putExtra(SettingsActivity.EXTRA_FRAGMENT_ARG_KEY, key)
+                .setAction("com.android.settings.SEARCH_RESULT_TRAMPOLINE")
+                .setComponent(null);
+        return searchDestination;
     }
 
     /**
      * @param className which wil provide the map between from {@link Uri}s to
-     * {@link PreferenceControllerMixin}
-     * @param context
+     *                  {@link PreferenceControllerMixin}
      * @return A map between {@link Uri}s and {@link PreferenceControllerMixin}s to get the payload
      * types for Settings.
      */
-    public static Map<String, PreferenceControllerMixin> getPreferenceControllerUriMap(
+    public static Map<String, ResultPayload> getPayloadKeyMap(
             String className, Context context) {
+        ArrayMap<String, ResultPayload> map = new ArrayMap<>();
         if (context == null) {
-            return null;
+            return map;
         }
 
         final Class<?> clazz = getIndexableClass(className);
@@ -92,7 +85,7 @@
         if (clazz == null) {
             Log.d(TAG, "SearchIndexableResource '" + className +
                     "' should implement the " + Indexable.class.getName() + " interface!");
-            return null;
+            return map;
         }
 
         // Will be non null only for a Local provider implementing a
@@ -102,45 +95,29 @@
         List<AbstractPreferenceController> controllers =
                 provider.getPreferenceControllers(context);
 
-        if (controllers == null ) {
-            return null;
+        if (controllers == null) {
+            return map;
         }
 
-        ArrayMap<String, PreferenceControllerMixin> map = new ArrayMap<>();
-
         for (AbstractPreferenceController controller : controllers) {
+            ResultPayload payload;
             if (controller instanceof PreferenceControllerMixin) {
-                map.put(controller.getPreferenceKey(), (PreferenceControllerMixin) controller);
+                payload = ((PreferenceControllerMixin) controller).getResultPayload();
+
+            } else if (controller instanceof BasePreferenceController) {
+                payload = ((BasePreferenceController) controller).getResultPayload();
             } else {
                 throw new IllegalStateException(controller.getClass().getName()
                         + " must implement " + PreferenceControllerMixin.class.getName());
             }
+            if (payload != null) {
+                map.put(controller.getPreferenceKey(), payload);
+            }
         }
 
         return map;
     }
 
-    /**
-     * @param uriMap Map between the {@link PreferenceControllerMixin} keys
-     *               and the controllers themselves.
-     * @param key The look-up key
-     * @return The Payload from the {@link PreferenceControllerMixin} specified by the key,
-     * if it exists. Otherwise null.
-     */
-    public static ResultPayload getPayloadFromUriMap(Map<String, PreferenceControllerMixin> uriMap,
-            String key) {
-        if (uriMap == null) {
-            return null;
-        }
-
-        PreferenceControllerMixin controller = uriMap.get(key);
-        if (controller == null) {
-            return null;
-        }
-
-        return controller.getResultPayload();
-    }
-
     public static Class<?> getIndexableClass(String className) {
         final Class<?> clazz;
         try {
@@ -173,59 +150,4 @@
         }
         return null;
     }
-
-    /**
-     * Only allow a "well known" SearchIndexablesProvider. The provider should:
-     *
-     * - have read/write {@link Manifest.permission#READ_SEARCH_INDEXABLES}
-     * - be from a privileged package
-     */
-    static boolean isWellKnownProvider(ResolveInfo info, Context context) {
-        final String authority = info.providerInfo.authority;
-        final String packageName = info.providerInfo.applicationInfo.packageName;
-
-        if (TextUtils.isEmpty(authority) || TextUtils.isEmpty(packageName)) {
-            return false;
-        }
-
-        final String readPermission = info.providerInfo.readPermission;
-        final String writePermission = info.providerInfo.writePermission;
-
-        if (TextUtils.isEmpty(readPermission) || TextUtils.isEmpty(writePermission)) {
-            return false;
-        }
-
-        if (!android.Manifest.permission.READ_SEARCH_INDEXABLES.equals(readPermission) ||
-                !android.Manifest.permission.READ_SEARCH_INDEXABLES.equals(writePermission)) {
-            return false;
-        }
-
-        return isPrivilegedPackage(packageName, 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);
-            return ((packInfo.applicationInfo.privateFlags
-                    & ApplicationInfo.PRIVATE_FLAG_PRIVILEGED) != 0);
-        } catch (PackageManager.NameNotFoundException e) {
-            return false;
-        }
-    }
-}
+}
\ No newline at end of file
diff --git a/src/com/android/settings/search/DatabaseResultLoader.java b/src/com/android/settings/search/DatabaseResultLoader.java
index 7815a45..66548a4 100644
--- a/src/com/android/settings/search/DatabaseResultLoader.java
+++ b/src/com/android/settings/search/DatabaseResultLoader.java
@@ -24,35 +24,31 @@
 import android.database.Cursor;
 import android.database.sqlite.SQLiteDatabase;
 import android.support.annotation.VisibleForTesting;
+import android.util.Log;
+import android.util.Pair;
 
 import com.android.settings.dashboard.SiteMapManager;
-import com.android.settings.utils.AsyncLoader;
+import com.android.settings.overlay.FeatureFactory;
 
+import java.util.ArrayList;
+import java.util.Collections;
 import java.util.HashSet;
+import java.util.List;
 import java.util.Set;
+import java.util.TreeSet;
+import java.util.concurrent.Callable;
+import java.util.concurrent.ExecutionException;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.FutureTask;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.TimeoutException;
 
 /**
- * AsyncTask to retrieve Settings, First party app and any intent based results.
+ * AsyncTask to retrieve Settings, first party app and any intent based results.
  */
-public class DatabaseResultLoader extends AsyncLoader<Set<? extends SearchResult>> {
-    private static final String LOG = "DatabaseResultLoader";
+public class DatabaseResultLoader extends FutureTask<List<? extends SearchResult>> {
 
-    /* These indices are used to match the columns of the this loader's SELECT statement.
-     These are not necessarily the same order nor similar coverage as the schema defined in
-     IndexDatabaseHelper */
-    static final int COLUMN_INDEX_ID = 0;
-    static final int COLUMN_INDEX_TITLE = 1;
-    static final int COLUMN_INDEX_SUMMARY_ON = 2;
-    static final int COLUMN_INDEX_SUMMARY_OFF = 3;
-    static final int COLUMN_INDEX_CLASS_NAME = 4;
-    static final int COLUMN_INDEX_SCREEN_TITLE = 5;
-    static final int COLUMN_INDEX_ICON = 6;
-    static final int COLUMN_INDEX_INTENT_ACTION = 7;
-    static final int COLUMN_INDEX_INTENT_ACTION_TARGET_PACKAGE = 8;
-    static final int COLUMN_INDEX_INTENT_ACTION_TARGET_CLASS = 9;
-    static final int COLUMN_INDEX_KEY = 10;
-    static final int COLUMN_INDEX_PAYLOAD_TYPE = 11;
-    static final int COLUMN_INDEX_PAYLOAD = 12;
+    private static final String TAG = "DatabaseResultLoader";
 
     public static final String[] SELECT_COLUMNS = {
             IndexColumns.DOCID,
@@ -82,195 +78,267 @@
             IndexColumns.DATA_SUMMARY_OFF_NORMALIZED,
     };
 
-    public static final String[] MATCH_COLUMNS_TERTIARY = {
-            IndexColumns.DATA_KEYWORDS,
-            IndexColumns.DATA_ENTRIES
-    };
-
     /**
      * Base ranks defines the best possible rank based on what the query matches.
-     * If the query matches the prefix of the first word in the title, the best rank it can be is 1
-     * If the query matches the prefix of the other words in the title, the best rank it can be is 3
+     * If the query matches the prefix of the first word in the title, the best rank it can be
+     * is 1
+     * If the query matches the prefix of the other words in the title, the best rank it can be
+     * is 3
      * If the query only matches the summary, the best rank it can be is 7
      * If the query only matches keywords or entries, the best rank it can be is 9
-     *
      */
     public static final int[] BASE_RANKS = {1, 3, 7, 9};
 
-    @VisibleForTesting
-    final String mQueryText;
-    private final Context mContext;
-    private final CursorToSearchResultConverter mConverter;
-    private final SiteMapManager mSiteMapManager;
-
-    public DatabaseResultLoader(Context context, String queryText, SiteMapManager mapManager) {
-        super(context);
-        mSiteMapManager = mapManager;
-        mContext = context;
-        mQueryText = queryText;
-        mConverter = new CursorToSearchResultConverter(context);
+    public DatabaseResultLoader(Context context, String query, SiteMapManager manager) {
+        super(new StaticSearchResultCallable(context, query, manager));
     }
 
-    @Override
-    protected void onDiscardResult(Set<? extends SearchResult> result) {
-        // TODO Search
-    }
+    static class StaticSearchResultCallable implements
+            Callable<List<? extends SearchResult>> {
 
-    @Override
-    public Set<? extends SearchResult> loadInBackground() {
-        if (mQueryText == null || mQueryText.isEmpty()) {
-            return null;
+        public final String[] MATCH_COLUMNS_TERTIARY = {
+                IndexColumns.DATA_KEYWORDS,
+                IndexColumns.DATA_ENTRIES
+        };
+
+        @VisibleForTesting
+        final String mQueryText;
+        private final Context mContext;
+        private final CursorToSearchResultConverter mConverter;
+        private final SiteMapManager mSiteMapManager;
+        private final SearchFeatureProvider mFeatureProvider;
+
+        public StaticSearchResultCallable(Context context, String queryText,
+                SiteMapManager mapManager) {
+            mContext = context;
+            mSiteMapManager = mapManager;
+            mQueryText = queryText;
+            mConverter = new CursorToSearchResultConverter(context);
+            mFeatureProvider = FeatureFactory.getFactory(context).getSearchFeatureProvider();
         }
 
-        final Set<SearchResult> results = new HashSet<>();
+        @Override
+        public List<? extends SearchResult> call() {
+            if (mQueryText == null || mQueryText.isEmpty()) {
+                return new ArrayList<>();
+            }
 
-        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;
-    }
+            // TODO (b/68656233) Consolidate timing metrics
+            long startTime = System.currentTimeMillis();
+            // Start a Future to get search result scores.
+            FutureTask<List<Pair<String, Float>>> rankerTask = mFeatureProvider.getRankerTask(
+                    mContext, mQueryText);
 
-    @Override
-    protected boolean onCancelLoad() {
-        // TODO
-        return super.onCancelLoad();
-    }
+            if (rankerTask != null) {
+                ExecutorService executorService = mFeatureProvider.getExecutorService();
+                executorService.execute(rankerTask);
+            }
 
-    /**
-     * 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 set of the matching results.
-     */
-    private Set<SearchResult> firstWordQuery(String[] matchColumns, int baseRank) {
-        final String whereClause = buildSingleWordWhereClause(matchColumns);
-        final String query = mQueryText + "%";
-        final String[] selection = buildSingleWordSelection(query, matchColumns.length);
+            final Set<SearchResult> resultSet = new HashSet<>();
 
-        return query(whereClause, selection, baseRank);
-    }
+            resultSet.addAll(firstWordQuery(MATCH_COLUMNS_PRIMARY, BASE_RANKS[0]));
+            resultSet.addAll(secondaryWordQuery(MATCH_COLUMNS_PRIMARY, BASE_RANKS[1]));
+            resultSet.addAll(anyWordQuery(MATCH_COLUMNS_SECONDARY, BASE_RANKS[2]));
+            resultSet.addAll(anyWordQuery(MATCH_COLUMNS_TERTIARY, BASE_RANKS[3]));
 
-    /**
-     * Creates and executes the query which matches prefixes of the non-first words of the
-     * given columns.
-     *
-     * @param matchColumns The columns to match on
-     * @param baseRank The highest rank achievable by these results
-     * @return A set of the matching results.
-     */
-    private Set<SearchResult> secondaryWordQuery(String[] matchColumns, int baseRank) {
-        final String whereClause = buildSingleWordWhereClause(matchColumns);
-        final String query = "% " + mQueryText + "%";
-        final String[] selection = buildSingleWordSelection(query, matchColumns.length);
+            // Try to retrieve the scores in time. Otherwise use static ranking.
+            if (rankerTask != null) {
+                try {
+                    final long timeoutMs = mFeatureProvider.smartSearchRankingTimeoutMs(mContext);
+                    List<Pair<String, Float>> searchRankScores = rankerTask.get(timeoutMs,
+                            TimeUnit.MILLISECONDS);
+                    return getDynamicRankedResults(resultSet, searchRankScores);
+                } catch (TimeoutException | InterruptedException | ExecutionException e) {
+                    Log.d(TAG, "Error waiting for result scores: " + e);
+                }
+            }
 
-        return query(whereClause, selection, baseRank);
-    }
-
-    /**
-     * Creates and executes the query which matches prefixes of the any word of the given columns.
-     *
-     * @param matchColumns The columns to match on
-     * @param baseRank The highest rank achievable by these results
-     * @return A set of the matching results.
-     */
-    private Set<SearchResult> anyWordQuery(String[] matchColumns, int baseRank) {
-        final String whereClause = buildTwoWordWhereClause(matchColumns);
-        final String[] selection = buildAnyWordSelection(matchColumns.length * 2);
-
-        return query(whereClause, selection, baseRank);
-    }
-
-    /**
-     * Generic method used by all of the query methods above to execute a query.
-     *
-     * @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 set of the matching results.
-     */
-    private Set<SearchResult> query(String whereClause, String[] selection, int baseRank) {
-        final SQLiteDatabase database =
-                IndexDatabaseHelper.getInstance(mContext).getReadableDatabase();
-        try (Cursor resultCursor = database.query(TABLE_PREFS_INDEX, SELECT_COLUMNS, whereClause,
-                selection, null, null, null)) {
-            return mConverter.convertCursor(mSiteMapManager, resultCursor, baseRank);
+            List<SearchResult> resultList = new ArrayList<>(resultSet);
+            Collections.sort(resultList);
+            Log.i(TAG, "Static search loading took:" + (System.currentTimeMillis() - startTime));
+            return resultList;
         }
-    }
 
-    /**
-     * Builds the SQLite WHERE clause that matches all matchColumns for a single query.
-     *
-     * @param matchColumns List of columns that will be used for matching.
-     * @return The constructed WHERE clause.
-     */
-    private static String buildSingleWordWhereClause(String[] matchColumns) {
-        StringBuilder sb = new StringBuilder(" (");
-        final int count = matchColumns.length;
-        for (int n = 0; n < count; n++) {
-            sb.append(matchColumns[n]);
-            sb.append(" like ? ");
-            if (n < count - 1) {
-                sb.append(" OR ");
+        // TODO (b/33577327) Retrieve all search results with a single query.
+
+        /**
+         * 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 set of the matching results.
+         */
+        private Set<SearchResult> firstWordQuery(String[] matchColumns, int baseRank) {
+            final String whereClause = buildSingleWordWhereClause(matchColumns);
+            final String query = mQueryText + "%";
+            final String[] selection = buildSingleWordSelection(query, matchColumns.length);
+
+            return query(whereClause, selection, baseRank);
+        }
+
+        /**
+         * Creates and executes the query which matches prefixes of the non-first words of the
+         * given columns.
+         *
+         * @param matchColumns The columns to match on
+         * @param baseRank     The highest rank achievable by these results
+         * @return A set of the matching results.
+         */
+        private Set<SearchResult> secondaryWordQuery(String[] matchColumns, int baseRank) {
+            final String whereClause = buildSingleWordWhereClause(matchColumns);
+            final String query = "% " + mQueryText + "%";
+            final String[] selection = buildSingleWordSelection(query, matchColumns.length);
+
+            return query(whereClause, selection, baseRank);
+        }
+
+        /**
+         * Creates and executes the query which matches prefixes of the any word of the given
+         * columns.
+         *
+         * @param matchColumns The columns to match on
+         * @param baseRank     The highest rank achievable by these results
+         * @return A set of the matching results.
+         */
+        private Set<SearchResult> anyWordQuery(String[] matchColumns, int baseRank) {
+            final String whereClause = buildTwoWordWhereClause(matchColumns);
+            final String[] selection = buildAnyWordSelection(matchColumns.length * 2);
+
+            return query(whereClause, selection, baseRank);
+        }
+
+        /**
+         * Generic method used by all of the query methods above to execute a query.
+         *
+         * @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 set of the matching results.
+         */
+        private Set<SearchResult> query(String whereClause, String[] selection, int baseRank) {
+            final SQLiteDatabase database =
+                    IndexDatabaseHelper.getInstance(mContext).getReadableDatabase();
+            try (Cursor resultCursor = database.query(TABLE_PREFS_INDEX, SELECT_COLUMNS,
+                    whereClause,
+                    selection, null, null, null)) {
+                return mConverter.convertCursor(mSiteMapManager, resultCursor, baseRank);
             }
         }
-        sb.append(") AND enabled = 1");
-        return sb.toString();
-    }
 
-    /**
-     * Builds the SQLite WHERE clause that matches all matchColumns to two different queries.
-     *
-     * @param matchColumns List of columns that will be used for matching.
-     * @return The constructed WHERE clause.
-     */
-    private static String buildTwoWordWhereClause(String[] matchColumns) {
-        StringBuilder sb = new StringBuilder(" (");
-        final int count = matchColumns.length;
-        for (int n = 0; n < count; n++) {
-            sb.append(matchColumns[n]);
-            sb.append(" like ? OR ");
-            sb.append(matchColumns[n]);
-            sb.append(" like ?");
-            if (n < count - 1) {
-                sb.append(" OR ");
+        /**
+         * Builds the SQLite WHERE clause that matches all matchColumns for a single query.
+         *
+         * @param matchColumns List of columns that will be used for matching.
+         * @return The constructed WHERE clause.
+         */
+        private static String buildSingleWordWhereClause(String[] matchColumns) {
+            StringBuilder sb = new StringBuilder(" (");
+            final int count = matchColumns.length;
+            for (int n = 0; n < count; n++) {
+                sb.append(matchColumns[n]);
+                sb.append(" like ? ");
+                if (n < count - 1) {
+                    sb.append(" OR ");
+                }
             }
+            sb.append(") AND enabled = 1");
+            return sb.toString();
         }
-        sb.append(") AND enabled = 1");
-        return sb.toString();
-    }
 
-    /**
-     * Fills out the selection array to match the query as the prefix of a single word.
-     *
-     * @param size is the number of columns to be matched.
-     */
-    private String[] buildSingleWordSelection(String query, int size) {
-        String[] selection = new String[size];
-
-        for(int i = 0; i < size; i ++) {
-            selection[i] = query;
+        /**
+         * Builds the SQLite WHERE clause that matches all matchColumns to two different queries.
+         *
+         * @param matchColumns List of columns that will be used for matching.
+         * @return The constructed WHERE clause.
+         */
+        private static String buildTwoWordWhereClause(String[] matchColumns) {
+            StringBuilder sb = new StringBuilder(" (");
+            final int count = matchColumns.length;
+            for (int n = 0; n < count; n++) {
+                sb.append(matchColumns[n]);
+                sb.append(" like ? OR ");
+                sb.append(matchColumns[n]);
+                sb.append(" like ?");
+                if (n < count - 1) {
+                    sb.append(" OR ");
+                }
+            }
+            sb.append(") AND enabled = 1");
+            return sb.toString();
         }
-        return selection;
-    }
 
-    /**
-     * Fills out the selection array to match the query as the prefix of a word.
-     *
-     * @param size is twice the number of columns to be matched. The first match is for the prefix
-     *             of the first word in the column. The second match is for any subsequent word
-     *             prefix match.
-     */
-    private String[] buildAnyWordSelection(int size) {
-        String[] selection = new String[size];
-        final String query = mQueryText + "%";
-        final String subStringQuery = "% " + mQueryText + "%";
+        /**
+         * Fills out the selection array to match the query as the prefix of a single word.
+         *
+         * @param size is the number of columns to be matched.
+         */
+        private String[] buildSingleWordSelection(String query, int size) {
+            String[] selection = new String[size];
 
-        for(int i = 0; i < (size - 1); i += 2) {
-            selection[i] = query;
-            selection[i + 1] = subStringQuery;
+            for (int i = 0; i < size; i++) {
+                selection[i] = query;
+            }
+            return selection;
         }
-        return selection;
+
+        /**
+         * Fills out the selection array to match the query as the prefix of a word.
+         *
+         * @param size is twice the number of columns to be matched. The first match is for the
+         *             prefix
+         *             of the first word in the column. The second match is for any subsequent word
+         *             prefix match.
+         */
+        private String[] buildAnyWordSelection(int size) {
+            String[] selection = new String[size];
+            final String query = mQueryText + "%";
+            final String subStringQuery = "% " + mQueryText + "%";
+
+            for (int i = 0; i < (size - 1); i += 2) {
+                selection[i] = query;
+                selection[i + 1] = subStringQuery;
+            }
+            return selection;
+        }
+
+        private List<SearchResult> getDynamicRankedResults(Set<SearchResult> unsortedSet,
+                List<Pair<String, Float>> searchRankScores) {
+            TreeSet<SearchResult> dbResultsSortedByScores = new TreeSet<>(
+                    (o1, o2) -> {
+                        float score1 = getRankingScoreByStableId(searchRankScores, o1.stableId);
+                        float score2 = getRankingScoreByStableId(searchRankScores, o2.stableId);
+                        if (score1 > score2) {
+                            return -1;
+                        } else if (score1 == score2) {
+                            return 0;
+                        } else {
+                            return 1;
+                        }
+                    });
+            dbResultsSortedByScores.addAll(unsortedSet);
+
+            return new ArrayList<>(dbResultsSortedByScores);
+        }
+
+        /**
+         * 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(List<Pair<String, Float>> searchRankScores, int stableId) {
+            for (Pair<String, Float> rankingScore : searchRankScores) {
+                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;
+        }
     }
 }
\ No newline at end of file
diff --git a/src/com/android/settings/search/IndexDatabaseHelper.java b/src/com/android/settings/search/IndexDatabaseHelper.java
index d78b611..7073545 100644
--- a/src/com/android/settings/search/IndexDatabaseHelper.java
+++ b/src/com/android/settings/search/IndexDatabaseHelper.java
@@ -22,6 +22,7 @@
 import android.database.sqlite.SQLiteDatabase;
 import android.database.sqlite.SQLiteOpenHelper;
 import android.os.Build;
+import android.provider.SearchIndexablesContract.SiteMapColumns;
 import android.support.annotation.VisibleForTesting;
 import android.text.TextUtils;
 import android.util.Log;
@@ -33,9 +34,9 @@
     private static final String TAG = "IndexDatabaseHelper";
 
     private static final String DATABASE_NAME = "search_index.db";
-    private static final int DATABASE_VERSION = 117;
+    private static final int DATABASE_VERSION = 118;
 
-    private static final String INDEX = "index";
+    private static final String SHARED_PREFS_TAG = "indexing_manager";
 
     private static final String PREF_KEY_INDEXED_PROVIDERS = "indexed_providers";
 
@@ -80,14 +81,6 @@
         String TIME_STAMP = "timestamp";
     }
 
-    public interface SiteMapColumns {
-        String DOCID = "docid";
-        String PARENT_CLASS = "parent_class";
-        String CHILD_CLASS = "child_class";
-        String PARENT_TITLE = "parent_title";
-        String CHILD_TITLE = "child_title";
-    }
-
     private static final String CREATE_INDEX_TABLE =
             "CREATE VIRTUAL TABLE " + Tables.TABLE_PREFS_INDEX + " USING fts4" +
                     "(" +
@@ -179,7 +172,7 @@
 
     public IndexDatabaseHelper(Context context) {
         super(context, DATABASE_NAME, null, DATABASE_VERSION);
-        mContext = context;
+        mContext = context.getApplicationContext();
     }
 
     @Override
@@ -230,6 +223,10 @@
     }
 
     public void reconstruct(SQLiteDatabase db) {
+        mContext.getSharedPreferences(SHARED_PREFS_TAG, Context.MODE_PRIVATE)
+                .edit()
+                .clear()
+                .commit();
         dropTables(db);
         bootstrapDB(db);
     }
@@ -252,24 +249,6 @@
         return version;
     }
 
-    /**
-     * Perform a full index on an OTA or when the locale has changed
-     *
-     * @param locale      is the default for the device
-     * @param fingerprint id for the current build.
-     * @return true when the locale or build has changed since last index.
-     */
-    @VisibleForTesting
-    static boolean isFullIndex(Context context, String locale, String fingerprint,
-            String providerVersionedNames) {
-        final boolean isLocaleIndexed = IndexDatabaseHelper.isLocaleAlreadyIndexed(context, locale);
-        final boolean isBuildIndexed = IndexDatabaseHelper.isBuildIndexed(context, fingerprint);
-        final boolean areProvidersIndexed = IndexDatabaseHelper
-                .areProvidersIndexed(context, providerVersionedNames);
-
-        return !(isLocaleIndexed && isBuildIndexed && areProvidersIndexed);
-    }
-
     @VisibleForTesting
     static String buildProviderVersionedNames(List<ResolveInfo> providers) {
         StringBuilder sb = new StringBuilder();
@@ -282,44 +261,43 @@
         return sb.toString();
     }
 
-    static void clearCachedIndexed(Context context) {
-        context.getSharedPreferences(INDEX, Context.MODE_PRIVATE).edit().clear().commit();
-    }
-
     static void setLocaleIndexed(Context context, String locale) {
-        context.getSharedPreferences(INDEX, Context.MODE_PRIVATE)
+        context.getSharedPreferences(SHARED_PREFS_TAG, Context.MODE_PRIVATE)
                 .edit()
                 .putBoolean(locale, true)
                 .apply();
     }
 
     static void setProvidersIndexed(Context context, String providerVersionedNames) {
-        context.getSharedPreferences(INDEX, Context.MODE_PRIVATE)
+        context.getSharedPreferences(SHARED_PREFS_TAG, 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);
+        return context.getSharedPreferences(SHARED_PREFS_TAG, 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);
+        final String indexedProviders =
+                context.getSharedPreferences(SHARED_PREFS_TAG, 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);
+        return context.getSharedPreferences(SHARED_PREFS_TAG,
+                Context.MODE_PRIVATE).getBoolean(buildNo, false);
     }
 
     static void setBuildIndexed(Context context, String buildNo) {
-        context.getSharedPreferences(INDEX, 0).edit().putBoolean(buildNo, true).commit();
+        // Use #apply() instead of #commit() since #commit() Robolectric loop indefinitely in sdk 26
+        context.getSharedPreferences(SHARED_PREFS_TAG, 0).edit().putBoolean(buildNo, true).apply();
     }
 
     private void dropTables(SQLiteDatabase db) {
-        clearCachedIndexed(mContext);
         db.execSQL("DROP TABLE IF EXISTS " + Tables.TABLE_META_INDEX);
         db.execSQL("DROP TABLE IF EXISTS " + Tables.TABLE_PREFS_INDEX);
         db.execSQL("DROP TABLE IF EXISTS " + Tables.TABLE_SAVED_QUERIES);
diff --git a/src/com/android/settings/search/InlinePayload.java b/src/com/android/settings/search/InlinePayload.java
index 03b8828..1cb694a 100644
--- a/src/com/android/settings/search/InlinePayload.java
+++ b/src/com/android/settings/search/InlinePayload.java
@@ -35,8 +35,7 @@
     /**
      * Defines the key to access and store the Setting the inline result represents.
      */
-    @VisibleForTesting
-    final String mSettingKey;
+    private final String mSettingKey;
 
     /**
      * Defines where the Setting is stored.
@@ -154,4 +153,8 @@
 
         return false;
     }
+
+    public String getKey() {
+        return mSettingKey;
+    }
 }
\ No newline at end of file
diff --git a/src/com/android/settings/search/InputDeviceResultLoader.java b/src/com/android/settings/search/InputDeviceResultLoader.java
index 61e1ad1..598281c 100644
--- a/src/com/android/settings/search/InputDeviceResultLoader.java
+++ b/src/com/android/settings/search/InputDeviceResultLoader.java
@@ -26,6 +26,7 @@
 import android.hardware.input.InputManager;
 import android.hardware.input.KeyboardLayout;
 import android.support.annotation.VisibleForTesting;
+import android.util.Log;
 import android.view.InputDevice;
 import android.view.inputmethod.InputMethodInfo;
 import android.view.inputmethod.InputMethodManager;
@@ -35,20 +36,24 @@
 import com.android.settings.dashboard.SiteMapManager;
 import com.android.settings.inputmethod.AvailableVirtualKeyboardFragment;
 import com.android.settings.inputmethod.PhysicalKeyboardFragment;
-import com.android.settings.utils.AsyncLoader;
 import com.android.settingslib.inputmethod.InputMethodAndSubtypeUtil;
 
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Objects;
 import java.util.Set;
+import java.util.concurrent.Callable;
+import java.util.concurrent.FutureTask;
 
 /**
  * Search result for input devices (physical/virtual keyboard, game controllers, etc)
  */
-public class InputDeviceResultLoader extends AsyncLoader<Set<? extends SearchResult>> {
-    private static final int NAME_NO_MATCH = -1;
+
+public class InputDeviceResultLoader extends FutureTask<List<? extends SearchResult>> {
+
+    private static final String TAG = "InputResultFutureTask";
 
     @VisibleForTesting
     static final String PHYSICAL_KEYBOARD_FRAGMENT = PhysicalKeyboardFragment.class.getName();
@@ -56,145 +61,151 @@
     static final String VIRTUAL_KEYBOARD_FRAGMENT =
             AvailableVirtualKeyboardFragment.class.getName();
 
-    private final SiteMapManager mSiteMapManager;
-    private final InputManager mInputManager;
-    private final InputMethodManager mImm;
-    private final PackageManager mPackageManager;
-    @VisibleForTesting
-    final String mQuery;
-
-    private List<String> mPhysicalKeyboardBreadcrumb;
-    private List<String> mVirtualKeyboardBreadcrumb;
-
-    public InputDeviceResultLoader(Context context, String query, SiteMapManager mapManager) {
-        super(context);
-        mQuery = query;
-        mSiteMapManager = mapManager;
-        mInputManager = (InputManager) context.getSystemService(Context.INPUT_SERVICE);
-        mImm = (InputMethodManager) context.getSystemService(INPUT_METHOD_SERVICE);
-        mPackageManager = context.getPackageManager();
+    public InputDeviceResultLoader(Context context, String query, SiteMapManager manager) {
+        super(new InputDeviceResultCallable(context, query, manager));
     }
 
-    @Override
-    protected void onDiscardResult(Set<? extends SearchResult> result) {
-    }
+    static class InputDeviceResultCallable implements
+            Callable<List<? extends SearchResult>> {
+        private static final int NAME_NO_MATCH = -1;
 
-    @Override
-    public Set<? extends SearchResult> loadInBackground() {
-        final Set<SearchResult> results = new HashSet<>();
-        results.addAll(buildPhysicalKeyboardSearchResults());
-        results.addAll(buildVirtualKeyboardSearchResults());
-        return results;
-    }
+        private final Context mContext;
+        private final SiteMapManager mSiteMapManager;
+        private final InputManager mInputManager;
+        private final InputMethodManager mImm;
+        private final PackageManager mPackageManager;
+        @VisibleForTesting
+        final String mQuery;
 
-    private Set<SearchResult> buildPhysicalKeyboardSearchResults() {
-        final Set<SearchResult> results = new HashSet<>();
-        final Context context = getContext();
-        final String screenTitle = context.getString(R.string.physical_keyboard_title);
+        private List<String> mPhysicalKeyboardBreadcrumb;
+        private List<String> mVirtualKeyboardBreadcrumb;
 
-        for (final InputDevice device : getPhysicalFullKeyboards()) {
-            final String deviceName = device.getName();
-            final int wordDiff = InstalledAppResultLoader.getWordDifference(deviceName, mQuery);
-            if (wordDiff == NAME_NO_MATCH) {
-                continue;
+        public InputDeviceResultCallable(Context context, String query, SiteMapManager mapManager) {
+            mContext = context;
+            mQuery = query;
+            mSiteMapManager = mapManager;
+            mInputManager = (InputManager) context.getSystemService(Context.INPUT_SERVICE);
+            mImm = (InputMethodManager) context.getSystemService(INPUT_METHOD_SERVICE);
+            mPackageManager = context.getPackageManager();
+        }
+
+        @Override
+        public List<? extends SearchResult> call() {
+            long startTime = System.currentTimeMillis();
+            final List<SearchResult> results = new ArrayList<>();
+            results.addAll(buildPhysicalKeyboardSearchResults());
+            results.addAll(buildVirtualKeyboardSearchResults());
+            Collections.sort(results);
+            Log.i(TAG, "Input search loading took:" + (System.currentTimeMillis() - startTime));
+            return results;
+        }
+
+        private Set<SearchResult> buildPhysicalKeyboardSearchResults() {
+            final Set<SearchResult> results = new HashSet<>();
+            final String screenTitle = mContext.getString(R.string.physical_keyboard_title);
+
+            for (final InputDevice device : getPhysicalFullKeyboards()) {
+                final String deviceName = device.getName();
+                final int wordDiff = InstalledAppResultLoader.getWordDifference(deviceName,
+                        mQuery);
+                if (wordDiff == NAME_NO_MATCH) {
+                    continue;
+                }
+                final String keyboardLayoutDescriptor = mInputManager
+                        .getCurrentKeyboardLayoutForInputDevice(device.getIdentifier());
+                final KeyboardLayout keyboardLayout = (keyboardLayoutDescriptor != null)
+                        ? mInputManager.getKeyboardLayout(keyboardLayoutDescriptor) : null;
+                final String summary = (keyboardLayout != null)
+                        ? keyboardLayout.toString()
+                        : mContext.getString(R.string.keyboard_layout_default_label);
+
+                final Intent intent = DatabaseIndexingUtils.buildSearchResultPageIntent(mContext,
+                        PHYSICAL_KEYBOARD_FRAGMENT, deviceName, screenTitle);
+                results.add(new SearchResult.Builder()
+                        .setTitle(deviceName)
+                        .setPayload(new ResultPayload(intent))
+                        .setStableId(Objects.hash(PHYSICAL_KEYBOARD_FRAGMENT, deviceName))
+                        .setSummary(summary)
+                        .setRank(wordDiff)
+                        .addBreadcrumbs(getPhysicalKeyboardBreadCrumb())
+                        .build());
             }
-            final String keyboardLayoutDescriptor = mInputManager
-                    .getCurrentKeyboardLayoutForInputDevice(device.getIdentifier());
-            final KeyboardLayout keyboardLayout = (keyboardLayoutDescriptor != null)
-                    ? mInputManager.getKeyboardLayout(keyboardLayoutDescriptor) : null;
-            final String summary = (keyboardLayout != null)
-                    ? keyboardLayout.toString()
-                    : context.getString(R.string.keyboard_layout_default_label);
-            final String key = deviceName;
-
-            final Intent intent = DatabaseIndexingUtils.buildSubsettingIntent(context,
-                    PHYSICAL_KEYBOARD_FRAGMENT, key, screenTitle);
-            results.add(new SearchResult.Builder()
-                    .setTitle(deviceName)
-                    .setPayload(new ResultPayload(intent))
-                    .setStableId(Objects.hash(PHYSICAL_KEYBOARD_FRAGMENT, key))
-                    .setSummary(summary)
-                    .setRank(wordDiff)
-                    .addBreadcrumbs(getPhysicalKeyboardBreadCrumb())
-                    .build());
+            return results;
         }
-        return results;
-    }
 
-    private Set<SearchResult> buildVirtualKeyboardSearchResults() {
-        final Set<SearchResult> results = new HashSet<>();
-        final Context context = getContext();
-        final String screenTitle = context.getString(R.string.add_virtual_keyboard);
-        final List<InputMethodInfo> inputMethods = mImm.getInputMethodList();
-        for (InputMethodInfo info : inputMethods) {
-            final String title = info.loadLabel(mPackageManager).toString();
-            final String summary = InputMethodAndSubtypeUtil
-                    .getSubtypeLocaleNameListAsSentence(getAllSubtypesOf(info), context, info);
-            int wordDiff = InstalledAppResultLoader.getWordDifference(title, mQuery);
-            if (wordDiff == NAME_NO_MATCH) {
-                wordDiff = InstalledAppResultLoader.getWordDifference(summary, mQuery);
+        private Set<SearchResult> buildVirtualKeyboardSearchResults() {
+            final Set<SearchResult> results = new HashSet<>();
+            final String screenTitle = mContext.getString(R.string.add_virtual_keyboard);
+            final List<InputMethodInfo> inputMethods = mImm.getInputMethodList();
+            for (InputMethodInfo info : inputMethods) {
+                final String title = info.loadLabel(mPackageManager).toString();
+                final String summary = InputMethodAndSubtypeUtil
+                        .getSubtypeLocaleNameListAsSentence(getAllSubtypesOf(info), mContext, info);
+                int wordDiff = InstalledAppResultLoader.getWordDifference(title, mQuery);
+                if (wordDiff == NAME_NO_MATCH) {
+                    wordDiff = InstalledAppResultLoader.getWordDifference(summary, mQuery);
+                }
+                if (wordDiff == NAME_NO_MATCH) {
+                    continue;
+                }
+                final ServiceInfo serviceInfo = info.getServiceInfo();
+                final String key = new ComponentName(serviceInfo.packageName, serviceInfo.name)
+                        .flattenToString();
+                final Intent intent = DatabaseIndexingUtils.buildSearchResultPageIntent(mContext,
+                        VIRTUAL_KEYBOARD_FRAGMENT, key, screenTitle);
+                results.add(new SearchResult.Builder()
+                        .setTitle(title)
+                        .setSummary(summary)
+                        .setRank(wordDiff)
+                        .setStableId(Objects.hash(VIRTUAL_KEYBOARD_FRAGMENT, key))
+                        .addBreadcrumbs(getVirtualKeyboardBreadCrumb())
+                        .setPayload(new ResultPayload(intent))
+                        .build());
             }
-            if (wordDiff == NAME_NO_MATCH) {
-                continue;
+            return results;
+        }
+
+        private List<String> getPhysicalKeyboardBreadCrumb() {
+            if (mPhysicalKeyboardBreadcrumb == null || mPhysicalKeyboardBreadcrumb.isEmpty()) {
+                mPhysicalKeyboardBreadcrumb = mSiteMapManager.buildBreadCrumb(
+                        mContext, PHYSICAL_KEYBOARD_FRAGMENT,
+                        mContext.getString(R.string.physical_keyboard_title));
             }
-            final ServiceInfo serviceInfo = info.getServiceInfo();
-            final String key = new ComponentName(serviceInfo.packageName, serviceInfo.name)
-                    .flattenToString();
-            final Intent intent = DatabaseIndexingUtils.buildSubsettingIntent(context,
-                    VIRTUAL_KEYBOARD_FRAGMENT, key, screenTitle);
-            results.add(new SearchResult.Builder()
-                    .setTitle(title)
-                    .setSummary(summary)
-                    .setRank(wordDiff)
-                    .setStableId(Objects.hash(VIRTUAL_KEYBOARD_FRAGMENT, key))
-                    .addBreadcrumbs(getVirtualKeyboardBreadCrumb())
-                    .setPayload(new ResultPayload(intent))
-                    .build());
+            return mPhysicalKeyboardBreadcrumb;
         }
-        return results;
-    }
 
-    private List<String> getPhysicalKeyboardBreadCrumb() {
-        if (mPhysicalKeyboardBreadcrumb == null || mPhysicalKeyboardBreadcrumb.isEmpty()) {
-            final Context context = getContext();
-            mPhysicalKeyboardBreadcrumb = mSiteMapManager.buildBreadCrumb(
-                    context, PHYSICAL_KEYBOARD_FRAGMENT,
-                    context.getString(R.string.physical_keyboard_title));
+
+        private List<String> getVirtualKeyboardBreadCrumb() {
+            if (mVirtualKeyboardBreadcrumb == null || mVirtualKeyboardBreadcrumb.isEmpty()) {
+                final Context context = mContext;
+                mVirtualKeyboardBreadcrumb = mSiteMapManager.buildBreadCrumb(
+                        context, VIRTUAL_KEYBOARD_FRAGMENT,
+                        context.getString(R.string.add_virtual_keyboard));
+            }
+            return mVirtualKeyboardBreadcrumb;
         }
-        return mPhysicalKeyboardBreadcrumb;
-    }
 
-
-    private List<String> getVirtualKeyboardBreadCrumb() {
-        if (mVirtualKeyboardBreadcrumb == null || mVirtualKeyboardBreadcrumb.isEmpty()) {
-            final Context context = getContext();
-            mVirtualKeyboardBreadcrumb = mSiteMapManager.buildBreadCrumb(
-                    context, VIRTUAL_KEYBOARD_FRAGMENT,
-                    context.getString(R.string.add_virtual_keyboard));
-        }
-        return mVirtualKeyboardBreadcrumb;
-    }
-
-    private List<InputDevice> getPhysicalFullKeyboards() {
-        final List<InputDevice> keyboards = new ArrayList<>();
-        final int[] deviceIds = InputDevice.getDeviceIds();
-        if (deviceIds != null) {
-            for (int deviceId : deviceIds) {
-                final InputDevice device = InputDevice.getDevice(deviceId);
-                if (device != null && !device.isVirtual() && device.isFullKeyboard()) {
-                    keyboards.add(device);
+        private List<InputDevice> getPhysicalFullKeyboards() {
+            final List<InputDevice> keyboards = new ArrayList<>();
+            final int[] deviceIds = InputDevice.getDeviceIds();
+            if (deviceIds != null) {
+                for (int deviceId : deviceIds) {
+                    final InputDevice device = InputDevice.getDevice(deviceId);
+                    if (device != null && !device.isVirtual() && device.isFullKeyboard()) {
+                        keyboards.add(device);
+                    }
                 }
             }
+            return keyboards;
         }
-        return keyboards;
-    }
 
-    private static List<InputMethodSubtype> getAllSubtypesOf(final InputMethodInfo imi) {
-        final int subtypeCount = imi.getSubtypeCount();
-        final List<InputMethodSubtype> allSubtypes = new ArrayList<>(subtypeCount);
-        for (int index = 0; index < subtypeCount; index++) {
-            allSubtypes.add(imi.getSubtypeAt(index));
+        private static List<InputMethodSubtype> getAllSubtypesOf(final InputMethodInfo imi) {
+            final int subtypeCount = imi.getSubtypeCount();
+            final List<InputMethodSubtype> allSubtypes = new ArrayList<>(subtypeCount);
+            for (int index = 0; index < subtypeCount; index++) {
+                allSubtypes.add(imi.getSubtypeAt(index));
+            }
+            return allSubtypes;
         }
-        return allSubtypes;
     }
 }
diff --git a/src/com/android/settings/search/InstalledAppResultLoader.java b/src/com/android/settings/search/InstalledAppResultLoader.java
index 9d80b73..e5d8ac1 100644
--- a/src/com/android/settings/search/InstalledAppResultLoader.java
+++ b/src/com/android/settings/search/InstalledAppResultLoader.java
@@ -29,124 +29,39 @@
 import android.provider.Settings;
 import android.support.annotation.VisibleForTesting;
 import android.text.TextUtils;
+import android.util.Log;
 
 import com.android.internal.logging.nano.MetricsProto;
 import com.android.settings.R;
 import com.android.settings.SettingsActivity;
-import com.android.settings.applications.ManageApplications;
-import com.android.settings.applications.PackageManagerWrapper;
+import com.android.settings.applications.manageapplications.ManageApplications;
 import com.android.settings.dashboard.SiteMapManager;
-import com.android.settings.utils.AsyncLoader;
+import com.android.settingslib.wrapper.PackageManagerWrapper;
 
 import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Objects;
 import java.util.Set;
+import java.util.concurrent.Callable;
+import java.util.concurrent.FutureTask;
 
 /**
  * Search loader for installed apps.
  */
-public class InstalledAppResultLoader extends AsyncLoader<Set<? extends SearchResult>> {
+public class InstalledAppResultLoader extends FutureTask<List<? extends SearchResult>> {
+
+    private static final String TAG = "InstalledAppFutureTask";
 
     private static final int NAME_NO_MATCH = -1;
     private static final Intent LAUNCHER_PROBE = new Intent(Intent.ACTION_MAIN)
             .addCategory(Intent.CATEGORY_LAUNCHER);
 
-    private List<String> mBreadcrumb;
-    private SiteMapManager mSiteMapManager;
-    @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) {
-        super(context);
-        mSiteMapManager = mapManager;
-        mUserManager = (UserManager) context.getSystemService(Context.USER_SERVICE);
-        mPackageManager = pmWrapper;
-        mQuery = query;
-    }
-
-    @Override
-    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(
-                            PackageManager.MATCH_DISABLED_COMPONENTS
-                                    | PackageManager.MATCH_DISABLED_UNTIL_USED_COMPONENTS
-                                    | (user.isAdmin() ? PackageManager.MATCH_ANY_USER : 0),
-                            user.id);
-            for (ApplicationInfo info : apps) {
-                if (!shouldIncludeAsCandidate(info, user)) {
-                    continue;
-                }
-                final CharSequence label = info.loadLabel(pm);
-                final int wordDiff = getWordDifference(label.toString(), mQuery);
-                if (wordDiff == NAME_NO_MATCH) {
-                    continue;
-                }
-                final Intent intent = new Intent(Settings.ACTION_APPLICATION_DETAILS_SETTINGS)
-                        .setAction(Settings.ACTION_APPLICATION_DETAILS_SETTINGS)
-                        .setData(Uri.fromParts("package", info.packageName, null))
-                        .putExtra(SettingsActivity.EXTRA_SOURCE_METRICS_CATEGORY,
-                                MetricsProto.MetricsEvent.DASHBOARD_SEARCH_RESULTS);
-
-                final AppSearchResult.Builder builder = new AppSearchResult.Builder();
-                builder.setAppInfo(info)
-                        .setStableId(Objects.hash(info.packageName, user.id))
-                        .setTitle(info.loadLabel(pm))
-                        .setRank(getRank(wordDiff))
-                        .addBreadcrumbs(getBreadCrumb())
-                        .setPayload(new ResultPayload(intent));
-                results.add(builder.build());
-            }
-        }
-        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(
-                launchIntent,
-                PackageManager.MATCH_DISABLED_COMPONENTS
-                        | PackageManager.MATCH_DIRECT_BOOT_AWARE
-                        | PackageManager.MATCH_DIRECT_BOOT_UNAWARE,
-                user.id);
-        if (intents != null && intents.size() != 0) {
-            return true;
-        }
-        // Is launcher app itself
-        return isPackageInList(mHomeActivities, info.packageName);
-    }
-
-    @Override
-    protected void onDiscardResult(Set<? extends SearchResult> result) {
-
-    }
-
-    private List<UserInfo> getUsersToCount() {
-        return mUserManager.getProfiles(UserHandle.myUserId());
+    public InstalledAppResultLoader(Context context, PackageManagerWrapper wrapper,
+            String query, SiteMapManager manager) {
+        super(new InstalledAppResultCallable(context, wrapper, query, manager));
     }
 
     /**
@@ -213,35 +128,133 @@
         return NAME_NO_MATCH;
     }
 
-    private boolean isPackageInList(List<ResolveInfo> resolveInfos, String pkg) {
-        for (ResolveInfo info : resolveInfos) {
-            if (TextUtils.equals(info.activityInfo.packageName, pkg)) {
+    static class InstalledAppResultCallable implements
+            Callable<List<? extends SearchResult>> {
+
+        private final Context mContext;
+        private List<String> mBreadcrumb;
+        private SiteMapManager mSiteMapManager;
+        @VisibleForTesting
+        final String mQuery;
+        private final UserManager mUserManager;
+        private final PackageManagerWrapper mPackageManager;
+        private final List<ResolveInfo> mHomeActivities = new ArrayList<>();
+
+        public InstalledAppResultCallable(Context context, PackageManagerWrapper pmWrapper,
+                String query, SiteMapManager mapManager) {
+            mContext = context;
+            mSiteMapManager = mapManager;
+            mUserManager = (UserManager) context.getSystemService(Context.USER_SERVICE);
+            mPackageManager = pmWrapper;
+            mQuery = query;
+        }
+
+        @Override
+        public List<? extends SearchResult> call() throws Exception {
+            long startTime = System.currentTimeMillis();
+            final List<AppSearchResult> results = new ArrayList<>();
+            final PackageManager pm = mPackageManager.getPackageManager();
+
+            mHomeActivities.clear();
+            mPackageManager.getHomeActivities(mHomeActivities);
+
+            for (UserInfo user : getUsersToCount()) {
+                final List<ApplicationInfo> apps =
+                        mPackageManager.getInstalledApplicationsAsUser(
+                                PackageManager.MATCH_DISABLED_COMPONENTS
+                                        | PackageManager.MATCH_DISABLED_UNTIL_USED_COMPONENTS
+                                        | (user.isAdmin() ? PackageManager.MATCH_ANY_USER : 0),
+                                user.id);
+                for (ApplicationInfo info : apps) {
+                    if (!shouldIncludeAsCandidate(info, user)) {
+                        continue;
+                    }
+                    final CharSequence label = info.loadLabel(pm);
+                    final int wordDiff = getWordDifference(label.toString(), mQuery);
+                    if (wordDiff == NAME_NO_MATCH) {
+                        continue;
+                    }
+                    final Intent intent = new Intent(Settings.ACTION_APPLICATION_DETAILS_SETTINGS)
+                            .setAction(Settings.ACTION_APPLICATION_DETAILS_SETTINGS)
+                            .setData(Uri.fromParts("package", info.packageName, null))
+                            .putExtra(SettingsActivity.EXTRA_SOURCE_METRICS_CATEGORY,
+                                    MetricsProto.MetricsEvent.DASHBOARD_SEARCH_RESULTS);
+
+                    final AppSearchResult.Builder builder = new AppSearchResult.Builder();
+                    builder.setAppInfo(info)
+                            .setStableId(Objects.hash(info.packageName, user.id))
+                            .setTitle(info.loadLabel(pm))
+                            .setRank(getRank(wordDiff))
+                            .addBreadcrumbs(getBreadCrumb())
+                            .setPayload(new ResultPayload(intent));
+                    results.add(builder.build());
+                }
+            }
+            Collections.sort(results);
+            Log.i(TAG, "App search loading took:" + (System.currentTimeMillis() - startTime));
+            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(
+                    launchIntent,
+                    PackageManager.MATCH_DISABLED_COMPONENTS
+                            | PackageManager.MATCH_DIRECT_BOOT_AWARE
+                            | PackageManager.MATCH_DIRECT_BOOT_UNAWARE,
+                    user.id);
+            if (intents != null && intents.size() != 0) {
+                return true;
+            }
+            // Is launcher app itself
+            return isPackageInList(mHomeActivities, info.packageName);
         }
-        return false;
-    }
 
-    private List<String> getBreadCrumb() {
-        if (mBreadcrumb == null || mBreadcrumb.isEmpty()) {
-            final Context context = getContext();
-            mBreadcrumb = mSiteMapManager.buildBreadCrumb(
-                    context, ManageApplications.class.getName(),
-                    context.getString(R.string.applications_settings));
+        private List<UserInfo> getUsersToCount() {
+            return mUserManager.getProfiles(UserHandle.myUserId());
         }
-        return mBreadcrumb;
-    }
 
-    /**
-     * A temporary ranking scheme for installed apps.
-     *
-     * @param wordDiff difference between query length and app name length.
-     * @return the ranking.
-     */
-    private int getRank(int wordDiff) {
-        if (wordDiff < 6) {
-            return 2;
+        private boolean isPackageInList(List<ResolveInfo> resolveInfos, String pkg) {
+            for (ResolveInfo info : resolveInfos) {
+                if (TextUtils.equals(info.activityInfo.packageName, pkg)) {
+                    return true;
+                }
+            }
+            return false;
         }
-        return 3;
+
+        private List<String> getBreadCrumb() {
+            if (mBreadcrumb == null || mBreadcrumb.isEmpty()) {
+                mBreadcrumb = mSiteMapManager.buildBreadCrumb(
+                        mContext, ManageApplications.class.getName(),
+                        mContext.getString(R.string.applications_settings));
+            }
+            return mBreadcrumb;
+        }
+
+        /**
+         * A temporary ranking scheme for installed apps.
+         *
+         * @param wordDiff difference between query length and app name length.
+         * @return the ranking.
+         */
+        private int getRank(int wordDiff) {
+            if (wordDiff < 6) {
+                return 2;
+            }
+            return 3;
+        }
     }
 }
diff --git a/src/com/android/settings/search/IntentSearchViewHolder.java b/src/com/android/settings/search/IntentSearchViewHolder.java
index 711d08e..8f6aa2c 100644
--- a/src/com/android/settings/search/IntentSearchViewHolder.java
+++ b/src/com/android/settings/search/IntentSearchViewHolder.java
@@ -20,6 +20,7 @@
 import android.content.pm.PackageManager;
 import android.content.pm.ResolveInfo;
 import android.os.UserHandle;
+import android.support.annotation.VisibleForTesting;
 import android.util.Log;
 import android.view.View;
 
@@ -34,6 +35,8 @@
 public class IntentSearchViewHolder extends SearchViewHolder {
 
     private static final String TAG = "IntentSearchViewHolder";
+    @VisibleForTesting
+    static final int REQUEST_CODE_NO_OP = 0;
 
     public IntentSearchViewHolder(View view) {
         super(view);
@@ -60,7 +63,7 @@
                 final PackageManager pm = fragment.getActivity().getPackageManager();
                 final List<ResolveInfo> info = pm.queryIntentActivities(intent, 0 /* flags */);
                 if (info != null && !info.isEmpty()) {
-                    fragment.startActivity(intent);
+                    fragment.startActivityForResult(intent, REQUEST_CODE_NO_OP);
                 } else {
                     Log.e(TAG, "Cannot launch search result, title: "
                             + result.title + ", " + intent);
diff --git a/src/com/android/settings/search/SearchFeatureProvider.java b/src/com/android/settings/search/SearchFeatureProvider.java
index 956808d..437fc86 100644
--- a/src/com/android/settings/search/SearchFeatureProvider.java
+++ b/src/com/android/settings/search/SearchFeatureProvider.java
@@ -16,42 +16,64 @@
  */
 package com.android.settings.search;
 
+import android.annotation.NonNull;
+import android.app.Activity;
+import android.content.ComponentName;
 import android.content.Context;
+import android.content.Intent;
+import android.util.FeatureFlagUtils;
+import android.util.Pair;
 import android.view.View;
+import android.widget.Toolbar;
 
+import com.android.settings.core.FeatureFlags;
 import com.android.settings.dashboard.SiteMapManager;
-import com.android.settings.search.ranking.SearchResultsRankerCallback;
+
+import java.util.List;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.FutureTask;
 
 /**
  * FeatureProvider for Settings Search
  */
 public interface SearchFeatureProvider {
 
+    Intent SEARCH_UI_INTENT = new Intent("com.android.settings.action.SETTINGS_SEARCH");
+
     /**
-     * @return true to use the new version of search
+     * Ensures the caller has necessary privilege to launch search result page.
+     *
+     * @throws IllegalArgumentException when caller is null
+     * @throws SecurityException        when caller is not allowed to launch search result page
      */
-    boolean isEnabled(Context context);
+    void verifyLaunchSearchResultPageCaller(Context context, @NonNull ComponentName caller)
+            throws SecurityException, IllegalArgumentException;
+
+    /**
+     * Returns a new loader to get settings search results.
+     */
+    SearchResultLoader getSearchResultLoader(Context context, String query);
 
     /**
      * Returns a new loader to search in index database.
      */
-    DatabaseResultLoader getDatabaseSearchLoader(Context context, String query);
+    DatabaseResultLoader getStaticSearchResultTask(Context context, String query);
 
     /**
      * Returns a new loader to search installed apps.
      */
-    InstalledAppResultLoader getInstalledAppSearchLoader(Context context, String query);
+    InstalledAppResultLoader getInstalledAppSearchTask(Context context, String query);
 
     /**
      * Returns a new loader to search accessibility services.
      */
-    AccessibilityServiceResultLoader getAccessibilityServiceResultLoader(Context context,
+    AccessibilityServiceResultLoader getAccessibilityServiceResultTask(Context context,
             String query);
 
     /**
      * Returns a new loader to search input devices.
      */
-    InputDeviceResultLoader getInputDeviceResultLoader(Context context, String query);
+    InputDeviceResultLoader getInputDeviceResultTask(Context context, String query);
 
     /**
      * Returns a new loader to get all recently saved queries search terms.
@@ -85,6 +107,11 @@
     boolean isIndexingComplete(Context context);
 
     /**
+     * @return a {@link ExecutorService} to be shared between search tasks.
+     */
+    ExecutorService getExecutorService();
+
+    /**
      * Initializes the feedback button in case it was dismissed.
      */
     default void initFeedbackButton() {
@@ -104,23 +131,6 @@
     }
 
     /**
-     * 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
@@ -150,4 +160,32 @@
     default void searchRankingWarmup(Context context) {
     }
 
+    /**
+     * Return a FutureTask to get a list of scores for search results.
+     */
+    default FutureTask<List<Pair<String, Float>>> getRankerTask(Context context, String query) {
+        return null;
+    }
+
+    default boolean isSearchV2Enabled(Context context) {
+        return FeatureFlagUtils.isEnabled(context, FeatureFlags.SEARCH_V2);
+    }
+
+    /**
+     * Initializes the search toolbar.
+     */
+    default void initSearchToolbar(Activity activity, Toolbar toolbar) {
+        if (activity == null || toolbar == null) {
+            return;
+        }
+        toolbar.setOnClickListener(tb -> {
+            final Intent intent;
+            if (isSearchV2Enabled(activity)) {
+                intent = SEARCH_UI_INTENT;
+            } else {
+                intent = new Intent(activity, SearchActivity.class);
+            }
+            activity.startActivityForResult(intent, 0 /* requestCode */);
+        });
+    }
 }
diff --git a/src/com/android/settings/search/SearchFeatureProviderImpl.java b/src/com/android/settings/search/SearchFeatureProviderImpl.java
index 400cf8f..1c96714 100644
--- a/src/com/android/settings/search/SearchFeatureProviderImpl.java
+++ b/src/com/android/settings/search/SearchFeatureProviderImpl.java
@@ -17,13 +17,20 @@
 
 package com.android.settings.search;
 
+import android.content.ComponentName;
 import android.content.Context;
 import android.text.TextUtils;
 import android.util.Log;
 
-import com.android.settings.applications.PackageManagerWrapperImpl;
+import com.android.internal.annotations.VisibleForTesting;
 import com.android.settings.dashboard.SiteMapManager;
 import com.android.settings.overlay.FeatureFactory;
+import com.android.settings.search.indexing.IndexData;
+import com.android.settingslib.wrapper.PackageManagerWrapper;
+
+import java.util.Locale;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
 
 /**
  * FeatureProvider for the refactored search code.
@@ -33,36 +40,54 @@
     private static final String TAG = "SearchFeatureProvider";
 
     private static final String METRICS_ACTION_SETTINGS_INDEX = "search_synchronous_indexing";
-
     private DatabaseIndexingManager mDatabaseIndexingManager;
     private SiteMapManager mSiteMapManager;
+    private ExecutorService mExecutorService;
 
     @Override
-    public boolean isEnabled(Context context) {
-        return true;
+    public void verifyLaunchSearchResultPageCaller(Context context, ComponentName caller) {
+        if (caller == null) {
+            throw new IllegalArgumentException("ExternalSettingsTrampoline intents "
+                    + "must be called with startActivityForResult");
+        }
+        final String packageName = caller.getPackageName();
+        final boolean isSettingsPackage = TextUtils.equals(packageName, context.getPackageName())
+                || TextUtils.equals(getSettingsIntelligencePkgName(), packageName);
+        final boolean isWhitelistedPackage =
+                isSignatureWhitelisted(context, caller.getPackageName());
+        if (isSettingsPackage || isWhitelistedPackage) {
+            return;
+        }
+        throw new SecurityException("Search result intents must be called with from a "
+                + "whitelisted package.");
     }
 
     @Override
-    public DatabaseResultLoader getDatabaseSearchLoader(Context context, String query) {
+    public SearchResultLoader getSearchResultLoader(Context context, String query) {
+        return new SearchResultLoader(context, cleanQuery(query));
+    }
+
+    @Override
+    public DatabaseResultLoader getStaticSearchResultTask(Context context, String query) {
         return new DatabaseResultLoader(context, cleanQuery(query), getSiteMapManager());
     }
 
     @Override
-    public InstalledAppResultLoader getInstalledAppSearchLoader(Context context, String query) {
+    public InstalledAppResultLoader getInstalledAppSearchTask(Context context, String query) {
         return new InstalledAppResultLoader(
-                context, new PackageManagerWrapperImpl(context.getPackageManager()),
+                context, new PackageManagerWrapper(context.getPackageManager()),
                 cleanQuery(query), getSiteMapManager());
     }
 
     @Override
-    public AccessibilityServiceResultLoader getAccessibilityServiceResultLoader(Context context,
+    public AccessibilityServiceResultLoader getAccessibilityServiceResultTask(Context context,
             String query) {
         return new AccessibilityServiceResultLoader(context, cleanQuery(query),
                 getSiteMapManager());
     }
 
     @Override
-    public InputDeviceResultLoader getInputDeviceResultLoader(Context context, String query) {
+    public InputDeviceResultLoader getInputDeviceResultTask(Context context, String query) {
         return new InputDeviceResultLoader(context, cleanQuery(query), getSiteMapManager());
     }
 
@@ -74,8 +99,7 @@
     @Override
     public DatabaseIndexingManager getIndexingManager(Context context) {
         if (mDatabaseIndexingManager == null) {
-            mDatabaseIndexingManager = new DatabaseIndexingManager(context.getApplicationContext(),
-                    context.getPackageName());
+            mDatabaseIndexingManager = new DatabaseIndexingManager(context.getApplicationContext());
         }
         return mDatabaseIndexingManager;
     }
@@ -109,15 +133,35 @@
                 .histogram(context, METRICS_ACTION_SETTINGS_INDEX, indexingTime);
     }
 
+    @Override
+    public ExecutorService getExecutorService() {
+        if (mExecutorService == null) {
+            mExecutorService = Executors.newCachedThreadPool();
+        }
+        return mExecutorService;
+    }
+
+    protected boolean isSignatureWhitelisted(Context context, String callerPackage) {
+        return false;
+    }
+
+    protected String getSettingsIntelligencePkgName() {
+        return "com.android.settings.intelligence";
+    }
+
     /**
      * A generic method to make the query suitable for searching the database.
      *
      * @return the cleaned query string
      */
-    private String cleanQuery(String query) {
+    @VisibleForTesting
+    String cleanQuery(String query) {
         if (TextUtils.isEmpty(query)) {
             return null;
         }
+        if (Locale.getDefault().equals(Locale.JAPAN)) {
+            query = IndexData.normalizeJapaneseString(query);
+        }
         return query.trim();
     }
 }
diff --git a/src/com/android/settings/search/SearchFragment.java b/src/com/android/settings/search/SearchFragment.java
index 092404c..e6316a8 100644
--- a/src/com/android/settings/search/SearchFragment.java
+++ b/src/com/android/settings/search/SearchFragment.java
@@ -54,8 +54,6 @@
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
-import java.util.Set;
-import java.util.concurrent.atomic.AtomicInteger;
 
 /**
  * This fragment manages the lifecycle of indexing and searching.
@@ -68,45 +66,30 @@
  * the query if the user has entered text.
  */
 public class SearchFragment extends InstrumentedFragment implements SearchView.OnQueryTextListener,
-        LoaderManager.LoaderCallbacks<Set<? extends SearchResult>>, IndexingCallback {
+        LoaderManager.LoaderCallbacks<List<? extends SearchResult>>, IndexingCallback {
     private static final String TAG = "SearchFragment";
 
     // State values
     private static final String STATE_QUERY = "state_query";
     private static final String STATE_SHOWING_SAVED_QUERY = "state_showing_saved_query";
     private static final String STATE_NEVER_ENTERED_QUERY = "state_never_entered_query";
-    private static final String STATE_RESULT_CLICK_COUNT = "state_result_click_count";
 
     static final class SearchLoaderId {
         // Search Query IDs
-        public static final int DATABASE = 1;
-        public static final int INSTALLED_APPS = 2;
-        public static final int ACCESSIBILITY_SERVICES = 3;
-        public static final int INPUT_DEVICES = 4;
+        public static final int SEARCH_RESULT = 1;
 
         // Saved Query IDs
-        public static final int SAVE_QUERY_TASK = 5;
-        public static final int REMOVE_QUERY_TASK = 6;
-        public static final int SAVED_QUERIES = 7;
+        public static final int SAVE_QUERY_TASK = 2;
+        public static final int REMOVE_QUERY_TASK = 3;
+        public static final int SAVED_QUERIES = 4;
     }
 
-
-    private static final int NUM_QUERY_LOADERS = 4;
-
-    @VisibleForTesting
-    AtomicInteger mUnfinishedLoadersCount = new AtomicInteger(NUM_QUERY_LOADERS);
-
-    // Logging
-    @VisibleForTesting
-    static final String RESULT_CLICK_COUNT = "settings_search_result_click_count";
-
     @VisibleForTesting
     String mQuery;
 
     private boolean mNeverEnteredQuery = true;
     @VisibleForTesting
     boolean mShowingSavedQuery;
-    private int mResultClickCount;
     private MetricsFeatureProvider mMetricsFeatureProvider;
     @VisibleForTesting
     SavedQueryController mSavedQueryController;
@@ -153,7 +136,7 @@
         setHasOptionsMenu(true);
 
         final LoaderManager loaderManager = getLoaderManager();
-        mSearchAdapter = new SearchResultsAdapter(this, mSearchFeatureProvider);
+        mSearchAdapter = new SearchResultsAdapter(this /* fragment */);
         mSavedQueryController = new SavedQueryController(
                 getContext(), loaderManager, mSearchAdapter);
         mSearchFeatureProvider.initFeedbackButton();
@@ -161,7 +144,6 @@
         if (savedInstanceState != null) {
             mQuery = savedInstanceState.getString(STATE_QUERY);
             mNeverEnteredQuery = savedInstanceState.getBoolean(STATE_NEVER_ENTERED_QUERY);
-            mResultClickCount = savedInstanceState.getInt(STATE_RESULT_CLICK_COUNT);
             mShowingSavedQuery = savedInstanceState.getBoolean(STATE_SHOWING_SAVED_QUERY);
         } else {
             mShowingSavedQuery = true;
@@ -244,7 +226,6 @@
         super.onStop();
         final Activity activity = getActivity();
         if (activity != null && activity.isFinishing()) {
-            mMetricsFeatureProvider.histogram(activity, RESULT_CLICK_COUNT, mResultClickCount);
             if (mNeverEnteredQuery) {
                 mMetricsFeatureProvider.action(activity,
                         MetricsEvent.ACTION_LEAVE_SEARCH_RESULT_WITHOUT_QUERY);
@@ -258,7 +239,6 @@
         outState.putString(STATE_QUERY, mQuery);
         outState.putBoolean(STATE_NEVER_ENTERED_QUERY, mNeverEnteredQuery);
         outState.putBoolean(STATE_SHOWING_SAVED_QUERY, mShowingSavedQuery);
-        outState.putInt(STATE_RESULT_CLICK_COUNT, mResultClickCount);
     }
 
     @Override
@@ -276,7 +256,6 @@
             mNoResultsView.setVisibility(View.GONE);
         }
 
-        mResultClickCount = 0;
         mNeverEnteredQuery = false;
         mQuery = query;
 
@@ -287,15 +266,11 @@
 
         if (isEmptyQuery) {
             final LoaderManager loaderManager = getLoaderManager();
-            loaderManager.destroyLoader(SearchLoaderId.DATABASE);
-            loaderManager.destroyLoader(SearchLoaderId.INSTALLED_APPS);
-            loaderManager.destroyLoader(SearchLoaderId.ACCESSIBILITY_SERVICES);
-            loaderManager.destroyLoader(SearchLoaderId.INPUT_DEVICES);
+            loaderManager.destroyLoader(SearchLoaderId.SEARCH_RESULT);
             mShowingSavedQuery = true;
             mSavedQueryController.loadSavedQueries();
             mSearchFeatureProvider.hideFeedbackButton();
         } else {
-            mSearchAdapter.initializeSearch(mQuery);
             restartLoaders();
         }
 
@@ -311,36 +286,25 @@
     }
 
     @Override
-    public Loader<Set<? extends SearchResult>> onCreateLoader(int id, Bundle args) {
+    public Loader<List<? extends SearchResult>> onCreateLoader(int id, Bundle args) {
         final Activity activity = getActivity();
 
-        switch (id) {
-            case SearchLoaderId.DATABASE:
-                return mSearchFeatureProvider.getDatabaseSearchLoader(activity, mQuery);
-            case SearchLoaderId.INSTALLED_APPS:
-                return mSearchFeatureProvider.getInstalledAppSearchLoader(activity, mQuery);
-            case SearchLoaderId.ACCESSIBILITY_SERVICES:
-                return mSearchFeatureProvider.getAccessibilityServiceResultLoader(activity, mQuery);
-            case SearchLoaderId.INPUT_DEVICES:
-                return mSearchFeatureProvider.getInputDeviceResultLoader(activity, mQuery);
+        switch(id) {
+            case SearchLoaderId.SEARCH_RESULT:
+                return mSearchFeatureProvider.getSearchResultLoader(activity, mQuery);
             default:
                 return null;
         }
     }
 
     @Override
-    public void onLoadFinished(Loader<Set<? extends SearchResult>> loader,
-            Set<? extends SearchResult> data) {
-        mSearchAdapter.addSearchResults(data, loader.getClass().getName());
-        if (mUnfinishedLoadersCount.decrementAndGet() != 0) {
-            return;
-        }
-
-        mSearchAdapter.notifyResultsLoaded();
+    public void onLoadFinished(Loader<List<? extends SearchResult>> loader,
+            List<? extends SearchResult> data) {
+        mSearchAdapter.postSearchResults(data);
     }
 
     @Override
-    public void onLoaderReset(Loader<Set<? extends SearchResult>> loader) {
+    public void onLoaderReset(Loader<List<? extends SearchResult>> loader) {
     }
 
     /**
@@ -355,13 +319,8 @@
             mSavedQueryController.loadSavedQueries();
         } else {
             final LoaderManager loaderManager = getLoaderManager();
-            loaderManager.initLoader(SearchLoaderId.DATABASE, null /* args */, this /* callback */);
-            loaderManager.initLoader(
-                    SearchLoaderId.INSTALLED_APPS, null /* args */, this /* callback */);
-            loaderManager.initLoader(
-                    SearchLoaderId.ACCESSIBILITY_SERVICES, null /* args */, this /* callback */);
-            loaderManager.initLoader(
-                    SearchLoaderId.INPUT_DEVICES, null /* args */, this /* callback */);
+            loaderManager.initLoader(SearchLoaderId.SEARCH_RESULT, null /* args */,
+                    this /* callback */);
         }
 
         requery();
@@ -372,7 +331,6 @@
         logSearchResultClicked(resultViewHolder, result, logTaggedData);
         mSearchFeatureProvider.searchResultClicked(getContext(), mQuery, result);
         mSavedQueryController.saveQuery(mQuery);
-        mResultClickCount++;
     }
 
     public void onSearchResultsDisplayed(int resultCount) {
@@ -384,6 +342,8 @@
             mNoResultsView.setVisibility(View.GONE);
             mResultsRecyclerView.scrollToPosition(0);
         }
+        mMetricsFeatureProvider.action(
+                getVisibilityLogger(), MetricsEvent.ACTION_SEARCH_RESULTS, 1);
         mSearchFeatureProvider.showFeedbackButton(this, getView());
     }
 
@@ -398,15 +358,8 @@
     private void restartLoaders() {
         mShowingSavedQuery = false;
         final LoaderManager loaderManager = getLoaderManager();
-        mUnfinishedLoadersCount.set(NUM_QUERY_LOADERS);
         loaderManager.restartLoader(
-                SearchLoaderId.DATABASE, null /* args */, this /* callback */);
-        loaderManager.restartLoader(
-                SearchLoaderId.INSTALLED_APPS, null /* args */, this /* callback */);
-        loaderManager.restartLoader(
-                SearchLoaderId.ACCESSIBILITY_SERVICES, null /* args */, this /* callback */);
-        loaderManager.restartLoader(
-                SearchLoaderId.INPUT_DEVICES, null /* args */, this /* callback */);
+                SearchLoaderId.SEARCH_RESULT, null /* args */, this /* callback */);
     }
 
     public String getQuery() {
@@ -463,9 +416,7 @@
         taggedData.add(Pair.create(
                 MetricsEvent.FIELD_SETTINGS_SEARCH_RESULT_RANK,
                 resultViewHolder.getAdapterPosition()));
-        taggedData.add(Pair.create(
-                MetricsEvent.FIELD_SETTINGS_SEARCH_RESULT_ASYNC_RANKING_STATE,
-                mSearchAdapter.getAsyncRankingState()));
+        // TODO (b/67744820) Move metrics to SettingsIntelligence (including ranking state).
         taggedData.add(Pair.create(
                 MetricsEvent.FIELD_SETTINGS_SEARCH_QUERY_LENGTH,
                 TextUtils.isEmpty(mQuery) ? 0 : mQuery.length()));
diff --git a/src/com/android/settings/search/SearchIndexableResources.java b/src/com/android/settings/search/SearchIndexableResources.java
index 3b12e20..c4e178f 100644
--- a/src/com/android/settings/search/SearchIndexableResources.java
+++ b/src/com/android/settings/search/SearchIndexableResources.java
@@ -16,19 +16,12 @@
 
 package com.android.settings.search;
 
-import android.provider.SearchIndexableResource;
-import android.support.annotation.DrawableRes;
 import android.support.annotation.VisibleForTesting;
-import android.support.annotation.XmlRes;
-import android.text.TextUtils;
+
 import com.android.settings.DateTimeSettings;
 import com.android.settings.DeviceInfoSettings;
 import com.android.settings.DisplaySettings;
-import com.android.settings.EncryptionAndCredential;
 import com.android.settings.LegalSettings;
-import com.android.settings.R;
-import com.android.settings.ScreenPinningSettings;
-import com.android.settings.SecuritySettings;
 import com.android.settings.accessibility.AccessibilitySettings;
 import com.android.settings.accessibility.AccessibilityShortcutPreferenceFragment;
 import com.android.settings.accessibility.MagnificationPreferenceFragment;
@@ -40,15 +33,17 @@
 import com.android.settings.backup.BackupSettingsActivity;
 import com.android.settings.backup.BackupSettingsFragment;
 import com.android.settings.bluetooth.BluetoothSettings;
+import com.android.settings.connecteddevice.AdvancedConnectedDeviceDashboardFragment;
 import com.android.settings.connecteddevice.ConnectedDeviceDashboardFragment;
+import com.android.settings.connecteddevice.ConnectedDeviceDashboardFragmentOld;
 import com.android.settings.datausage.DataUsageMeteredSettings;
 import com.android.settings.datausage.DataUsageSummary;
 import com.android.settings.deletionhelper.AutomaticStorageManagerSettings;
-import com.android.settings.development.DevelopmentSettings;
-import com.android.settings.deviceinfo.Status;
+import com.android.settings.development.DevelopmentSettingsDashboardFragment;
 import com.android.settings.deviceinfo.StorageDashboardFragment;
 import com.android.settings.deviceinfo.StorageSettings;
 import com.android.settings.display.AmbientDisplaySettings;
+import com.android.settings.display.NightDisplaySettings;
 import com.android.settings.display.ScreenZoomSettings;
 import com.android.settings.dream.DreamSettings;
 import com.android.settings.enterprise.EnterprisePrivacySettings;
@@ -66,170 +61,123 @@
 import com.android.settings.inputmethod.PhysicalKeyboardFragment;
 import com.android.settings.inputmethod.VirtualKeyboardFragment;
 import com.android.settings.language.LanguageAndInputSettings;
+import com.android.settings.location.LocationMode;
 import com.android.settings.location.LocationSettings;
 import com.android.settings.location.ScanningSettings;
 import com.android.settings.network.NetworkDashboardFragment;
 import com.android.settings.nfc.PaymentSettings;
-import com.android.settings.notification.ChannelImportanceSettings;
 import com.android.settings.notification.ConfigureNotificationSettings;
 import com.android.settings.notification.SoundSettings;
-import com.android.settings.notification.ZenModePrioritySettings;
+import com.android.settings.notification.ZenModeAutomationSettings;
+import com.android.settings.notification.ZenModeBehaviorSettings;
 import com.android.settings.notification.ZenModeSettings;
-import com.android.settings.notification.ZenModeVisualInterruptionSettings;
 import com.android.settings.print.PrintSettingsFragment;
+import com.android.settings.security.EncryptionAndCredential;
 import com.android.settings.security.LockscreenDashboardFragment;
+import com.android.settings.security.ScreenPinningSettings;
+import com.android.settings.security.SecuritySettings;
+import com.android.settings.security.screenlock.ScreenLockSettings;
 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;
 import com.android.settings.tts.TtsEnginePreferenceFragment;
 import com.android.settings.users.UserSettings;
 import com.android.settings.wallpaper.WallpaperTypeSettings;
+import com.android.settings.wfd.WifiDisplaySettings;
 import com.android.settings.wifi.ConfigureWifiSettings;
-import com.android.settings.wifi.SavedAccessPointsWifiSettings;
 import com.android.settings.wifi.WifiSettings;
+
 import java.util.Collection;
-import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Set;
 
 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;
+    @VisibleForTesting
+    static final Set<Class> sProviders = new HashSet<>();
 
     @VisibleForTesting
-    static final HashMap<String, SearchIndexableResource> sResMap = new HashMap<>();
-
-    @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();
-        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 void addIndex(Class indexClass) {
+        sProviders.add(indexClass);
     }
 
     static {
-        addIndex(WifiSettings.class, NO_DATA_RES_ID, R.drawable.ic_settings_wireless);
-        addIndex(NetworkDashboardFragment.class, NO_DATA_RES_ID, R.drawable.ic_settings_wireless);
-        addIndex(ConfigureWifiSettings.class, NO_DATA_RES_ID, R.drawable.ic_settings_wireless);
-        addIndex(SavedAccessPointsWifiSettings.class, NO_DATA_RES_ID,
-                R.drawable.ic_settings_wireless);
-        addIndex(BluetoothSettings.class, NO_DATA_RES_ID, R.drawable.ic_settings_bluetooth);
-        addIndex(SimSettings.class, NO_DATA_RES_ID, R.drawable.ic_sim_sd);
-        addIndex(DataUsageSummary.class, NO_DATA_RES_ID, R.drawable.ic_settings_data_usage);
-        addIndex(DataUsageMeteredSettings.class, NO_DATA_RES_ID, R.drawable.ic_settings_data_usage);
-        addIndex(ScreenZoomSettings.class, NO_DATA_RES_ID, R.drawable.ic_settings_display);
-        addIndex(DisplaySettings.class, NO_DATA_RES_ID, R.drawable.ic_settings_display,
-                "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,
-                "android.settings.SOUND_SETTINGS");
-        addIndex(ZenModeSettings.class,
-                R.xml.zen_mode_settings, R.drawable.ic_settings_notifications);
-        addIndex(ZenModePrioritySettings.class,
-                R.xml.zen_mode_priority_settings, R.drawable.ic_settings_notifications);
-        addIndex(StorageSettings.class, NO_DATA_RES_ID, R.drawable.ic_settings_storage);
-        addIndex(PowerUsageSummary.class,
-                R.xml.power_usage_summary, R.drawable.ic_settings_battery);
-        addIndex(PowerUsageAdvanced.class, NO_DATA_RES_ID, R.drawable.ic_settings_battery);
-        addIndex(BatterySaverSettings.class,
-                R.xml.battery_saver_settings, R.drawable.ic_settings_battery);
-        addIndex(DefaultAppSettings.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, 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);
-        addIndex(DoubleTapScreenSettings.class, NO_DATA_RES_ID, R.drawable.ic_settings_gestures);
-        addIndex(DoubleTapPowerSettings.class, NO_DATA_RES_ID, R.drawable.ic_settings_gestures);
-        addIndex(DoubleTwistGestureSettings.class, NO_DATA_RES_ID, R.drawable.ic_settings_gestures);
-        addIndex(SwipeToNotificationSettings.class, NO_DATA_RES_ID,
-                R.drawable.ic_settings_gestures);
-        addIndex(GestureSettings.class, NO_DATA_RES_ID, R.drawable.ic_settings_gestures);
-        addIndex(LanguageAndInputSettings.class, NO_DATA_RES_ID, R.drawable.ic_settings_language);
-        addIndex(LocationSettings.class, R.xml.location_settings, R.drawable.ic_settings_location);
-        addIndex(ScanningSettings.class, R.xml.location_scanning, R.drawable.ic_settings_location);
-        addIndex(SecuritySettings.class, NO_DATA_RES_ID, 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);
-        addIndex(VirtualKeyboardFragment.class, NO_DATA_RES_ID, R.drawable.ic_settings_language);
-        addIndex(AvailableVirtualKeyboardFragment.class,
-                NO_DATA_RES_ID, R.drawable.ic_settings_language);
-        addIndex(PhysicalKeyboardFragment.class, NO_DATA_RES_ID, R.drawable.ic_settings_language);
-        addIndex(BackupSettingsActivity.class, NO_DATA_RES_ID, R.drawable.ic_settings_backup);
-        addIndex(BackupSettingsFragment.class, NO_DATA_RES_ID, R.drawable.ic_settings_backup);
-        addIndex(DateTimeSettings.class, NO_DATA_RES_ID, R.drawable.ic_settings_date_time);
-        addIndex(AccessibilitySettings.class, NO_DATA_RES_ID, R.drawable.ic_settings_accessibility);
-        addIndex(PrintSettingsFragment.class, NO_DATA_RES_ID, R.drawable.ic_settings_print);
-        addIndex(DevelopmentSettings.class, NO_DATA_RES_ID, R.drawable.ic_settings_development);
-        addIndex(DeviceInfoSettings.class, NO_DATA_RES_ID, R.drawable.ic_settings_about);
-        addIndex(Status.class, NO_DATA_RES_ID, 0 /* icon */);
-        addIndex(LegalSettings.class, NO_DATA_RES_ID, R.drawable.ic_settings_about);
-        addIndex(ZenModeVisualInterruptionSettings.class,
-                R.xml.zen_mode_visual_interruptions_settings,
-                R.drawable.ic_settings_notifications);
-        addIndex(SystemDashboardFragment.class, NO_DATA_RES_ID, R.drawable.ic_settings_about);
-        addIndex(ResetDashboardFragment.class, NO_DATA_RES_ID, R.drawable.ic_restore);
-        addIndex(StorageDashboardFragment.class, NO_DATA_RES_ID, R.drawable.ic_settings_storage);
-        addIndex(ConnectedDeviceDashboardFragment.class, NO_DATA_RES_ID,
-                R.drawable.ic_devices_other);
-        addIndex(EnterprisePrivacySettings.class, NO_DATA_RES_ID, R.drawable.ic_settings_about);
-        addIndex(PaymentSettings.class, NO_DATA_RES_ID, R.drawable.ic_settings_nfc_payment);
-        addIndex(
-                TtsEnginePreferenceFragment.class, NO_DATA_RES_ID, R.drawable.ic_settings_language);
-        addIndex(LockscreenDashboardFragment.class, R.xml.security_lockscreen_settings,
-                R.drawable.ic_settings_security);
-        addIndex(MagnificationPreferenceFragment.class, NO_DATA_RES_ID,
-                R.drawable.ic_settings_accessibility);
-        addIndex(AccessibilityShortcutPreferenceFragment.class, NO_DATA_RES_ID,
-                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);
-        addIndex(
-                AutomaticStorageManagerSettings.class,
-                NO_DATA_RES_ID,
-                R.drawable.ic_settings_storage);
+        addIndex(WifiSettings.class);
+        addIndex(NetworkDashboardFragment.class);
+        addIndex(ConfigureWifiSettings.class);
+        addIndex(BluetoothSettings.class);
+        addIndex(SimSettings.class);
+        addIndex(DataUsageSummary.class);
+        addIndex(DataUsageMeteredSettings.class);
+        addIndex(ScreenZoomSettings.class);
+        addIndex(DisplaySettings.class);
+        addIndex(AmbientDisplaySettings.class);
+        addIndex(WallpaperTypeSettings.class);
+        addIndex(AppAndNotificationDashboardFragment.class);
+        addIndex(SoundSettings.class);
+        addIndex(ZenModeSettings.class);
+        addIndex(StorageSettings.class);
+        addIndex(PowerUsageAdvanced.class);
+        addIndex(DefaultAppSettings.class);
+        addIndex(ManageAssist.class);
+        addIndex(SpecialAccessSettings.class);
+        addIndex(UserSettings.class);
+        addIndex(AssistGestureSettings.class);
+        addIndex(PickupGestureSettings.class);
+        addIndex(DoubleTapScreenSettings.class);
+        addIndex(DoubleTapPowerSettings.class);
+        addIndex(DoubleTwistGestureSettings.class);
+        addIndex(SwipeToNotificationSettings.class);
+        addIndex(GestureSettings.class);
+        addIndex(LanguageAndInputSettings.class);
+        addIndex(LocationSettings.class);
+        addIndex(LocationMode.class);
+        addIndex(ScanningSettings.class);
+        addIndex(SecuritySettings.class);
+        addIndex(ScreenLockSettings.class);
+        addIndex(EncryptionAndCredential.class);
+        addIndex(ScreenPinningSettings.class);
+        addIndex(UserAndAccountDashboardFragment.class);
+        addIndex(VirtualKeyboardFragment.class);
+        addIndex(AvailableVirtualKeyboardFragment.class);
+        addIndex(PhysicalKeyboardFragment.class);
+        addIndex(BackupSettingsActivity.class);
+        addIndex(BackupSettingsFragment.class);
+        addIndex(DateTimeSettings.class);
+        addIndex(AccessibilitySettings.class);
+        addIndex(PrintSettingsFragment.class);
+        addIndex(DevelopmentSettingsDashboardFragment.class);
+        addIndex(DeviceInfoSettings.class);
+        addIndex(LegalSettings.class);
+        addIndex(SystemDashboardFragment.class);
+        addIndex(ResetDashboardFragment.class);
+        addIndex(StorageDashboardFragment.class);
+        addIndex(ConnectedDeviceDashboardFragment.class);
+        addIndex(ConnectedDeviceDashboardFragmentOld.class);
+        addIndex(AdvancedConnectedDeviceDashboardFragment.class);
+        addIndex(EnterprisePrivacySettings.class);
+        addIndex(PaymentSettings.class);
+        addIndex(TextToSpeechSettings.class);
+        addIndex(TtsEnginePreferenceFragment.class);
+        addIndex(MagnificationPreferenceFragment.class);
+        addIndex(AccessibilityShortcutPreferenceFragment.class);
+        addIndex(DreamSettings.class);
+        addIndex(SupportDashboardActivity.class);
+        addIndex(AutomaticStorageManagerSettings.class);
+        addIndex(ConfigureNotificationSettings.class);
+        addIndex(PowerUsageSummary.class);
+        addIndex(BatterySaverSettings.class);
+        addIndex(LockscreenDashboardFragment.class);
+        addIndex(WifiDisplaySettings.class);
+        addIndex(ZenModeBehaviorSettings.class);
+        addIndex(ZenModeAutomationSettings.class);
+        addIndex(NightDisplaySettings.class);
     }
 
     private SearchIndexableResources() {
     }
 
-    public static int size() {
-        return sResMap.size();
-    }
-
-    public static SearchIndexableResource getResourceByName(String className) {
-        return sResMap.get(className);
-    }
-
-    public static Collection<SearchIndexableResource> values() {
-        return sResMap.values();
-    }
-}
+    public static Collection<Class> providerValues() { return sProviders;}
+}
\ No newline at end of file
diff --git a/src/com/android/settings/search/SearchResultAggregator.java b/src/com/android/settings/search/SearchResultAggregator.java
new file mode 100644
index 0000000..890e3f0
--- /dev/null
+++ b/src/com/android/settings/search/SearchResultAggregator.java
@@ -0,0 +1,177 @@
+package com.android.settings.search;
+
+import android.annotation.NonNull;
+import android.content.Context;
+import android.util.Log;
+import android.util.SparseArray;
+
+import com.android.settings.overlay.FeatureFactory;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.concurrent.ExecutionException;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.TimeoutException;
+
+/**
+ * Collects the sorted list of all setting search results.
+ *
+ * TODO (b/64939692) Convert the timing logs to metrics
+ */
+public class SearchResultAggregator {
+
+    private static final String TAG = "SearchResultAggregator";
+
+    /**
+     * Timeout for first task. Allows for longer delay.
+     */
+    private static final long LONG_CHECK_TASK_TIMEOUT_MS = 500;
+
+    /**
+     * Timeout for subsequent tasks to allow for fast returning tasks.
+     */
+    private static final long SHORT_CHECK_TASK_TIMEOUT_MS = 150;
+
+    private static SearchResultAggregator sResultAggregator;
+
+    // TODO (b/33577327) Merge the other loaders into a single dynamic loader
+    static final class ResultLoaderId {
+        static final int STATIC_RESULTS = 1;
+        static final int INSTALLED_RESULTS = 2;
+        static final int INPUT_RESULTS = 3;
+        static final int ACCESSIBILITY_RESULTS = 4;
+    }
+
+    private SearchResultAggregator() {
+    }
+
+    public static SearchResultAggregator getInstance() {
+        if (sResultAggregator == null) {
+            sResultAggregator = new SearchResultAggregator();
+        }
+
+        return sResultAggregator;
+    }
+
+    @NonNull
+    public synchronized List<? extends SearchResult> fetchResults(Context context, String query) {
+        SearchFeatureProvider mFeatureProvider = FeatureFactory.getFactory(
+                context).getSearchFeatureProvider();
+        ExecutorService executorService = mFeatureProvider.getExecutorService();
+
+        final DatabaseResultLoader staticResultsTask =
+                mFeatureProvider.getStaticSearchResultTask(context, query);
+        final InstalledAppResultLoader installedAppTask =
+                mFeatureProvider.getInstalledAppSearchTask(context, query);
+        final InputDeviceResultLoader inputDevicesTask =
+                mFeatureProvider.getInputDeviceResultTask(context, query);
+        final AccessibilityServiceResultLoader accessibilityServicesTask =
+                mFeatureProvider.getAccessibilityServiceResultTask(context,
+                        query);
+
+        executorService.execute(staticResultsTask);
+        executorService.execute(installedAppTask);
+        executorService.execute(inputDevicesTask);
+        executorService.execute(accessibilityServicesTask);
+
+        SparseArray<List<? extends SearchResult>> resultsArray = new SparseArray<>();
+        List<? extends SearchResult> EMPTY_LIST = new ArrayList<>();
+
+        long allTasksStart = System.currentTimeMillis();
+        try {
+            resultsArray.put(ResultLoaderId.INPUT_RESULTS,
+                    inputDevicesTask.get(SHORT_CHECK_TASK_TIMEOUT_MS, TimeUnit.MILLISECONDS));
+        } catch (TimeoutException | InterruptedException | ExecutionException e) {
+            Log.d(TAG, "Could not retrieve input devices results in time: " + e);
+            resultsArray.put(ResultLoaderId.INPUT_RESULTS, EMPTY_LIST);
+        }
+
+        try {
+            resultsArray.put(ResultLoaderId.ACCESSIBILITY_RESULTS,
+                    accessibilityServicesTask.get(SHORT_CHECK_TASK_TIMEOUT_MS,
+                            TimeUnit.MILLISECONDS));
+        } catch (TimeoutException | InterruptedException | ExecutionException e) {
+            Log.d(TAG, "Could not retrieve accessibility results in time: " + e);
+            resultsArray.put(ResultLoaderId.ACCESSIBILITY_RESULTS, EMPTY_LIST);
+        }
+
+        try {
+            resultsArray.put(ResultLoaderId.STATIC_RESULTS,
+                    staticResultsTask.get(LONG_CHECK_TASK_TIMEOUT_MS, TimeUnit.MILLISECONDS));
+        } catch (TimeoutException | InterruptedException | ExecutionException e) {
+            Log.d(TAG, "Could not retrieve static results: " + e);
+            resultsArray.put(ResultLoaderId.STATIC_RESULTS, EMPTY_LIST);
+        }
+
+        try {
+            resultsArray.put(ResultLoaderId.INSTALLED_RESULTS,
+                    installedAppTask.get(SHORT_CHECK_TASK_TIMEOUT_MS, TimeUnit.MILLISECONDS));
+        } catch (TimeoutException | InterruptedException | ExecutionException e) {
+            Log.d(TAG, "Could not retrieve installed app results in time: " + e);
+
+            resultsArray.put(ResultLoaderId.INSTALLED_RESULTS, EMPTY_LIST);
+        }
+
+        long mergeStartTime = System.currentTimeMillis();
+        Log.i(TAG, "Total result loader time: " + (mergeStartTime - allTasksStart));
+        List<? extends SearchResult> mergedResults = mergeSearchResults(resultsArray);
+        Log.i(TAG, "Total merge time: " + (System.currentTimeMillis() - mergeStartTime));
+        Log.i(TAG, "Total aggregator time: " + (System.currentTimeMillis() - allTasksStart));
+
+        return mergedResults;
+    }
+
+    // TODO (b/68255021) scale the dynamic search results ranks and do a k-way merge
+    private List<? extends SearchResult> mergeSearchResults(
+            SparseArray<List<? extends SearchResult>> resultsArray) {
+        List<? extends SearchResult> staticResults = resultsArray.get(
+                ResultLoaderId.STATIC_RESULTS);
+        List<? extends SearchResult> installedAppResults = resultsArray.get(
+                ResultLoaderId.INSTALLED_RESULTS);
+        List<? extends SearchResult> accessibilityResults = resultsArray.get(
+                ResultLoaderId.ACCESSIBILITY_RESULTS);
+        List<? extends SearchResult> inputDeviceResults = resultsArray.get(
+                ResultLoaderId.INPUT_RESULTS);
+        List<SearchResult> searchResults;
+
+        int staticSize = staticResults.size();
+        int appSize = installedAppResults.size();
+        int a11ySize = accessibilityResults.size();
+        int inputDeviceSize = inputDeviceResults.size();
+        int appIndex = 0;
+        int a11yIndex = 0;
+        int inputDeviceIndex = 0;
+        int rank = SearchResult.TOP_RANK;
+
+        // TODO: We need a helper method to do k-way merge.
+        searchResults = new ArrayList<>(staticSize + appSize + a11ySize + inputDeviceSize);
+        searchResults.addAll(resultsArray.get(ResultLoaderId.STATIC_RESULTS));
+
+        while (rank <= SearchResult.BOTTOM_RANK) {
+            while ((appIndex < appSize) && (installedAppResults.get(appIndex).rank == rank)) {
+                searchResults.add(installedAppResults.get(appIndex++));
+            }
+            while ((a11yIndex < a11ySize) && (accessibilityResults.get(a11yIndex).rank == rank)) {
+                searchResults.add(accessibilityResults.get(a11yIndex++));
+            }
+            while (inputDeviceIndex < inputDeviceSize
+                    && inputDeviceResults.get(inputDeviceIndex).rank == rank) {
+                searchResults.add(inputDeviceResults.get(inputDeviceIndex++));
+            }
+            rank++;
+        }
+
+        while (appIndex < appSize) {
+            searchResults.add(installedAppResults.get(appIndex++));
+        }
+        while (a11yIndex < a11ySize) {
+            searchResults.add(accessibilityResults.get(a11yIndex++));
+        }
+        while (inputDeviceIndex < inputDeviceSize) {
+            searchResults.add(inputDeviceResults.get(inputDeviceIndex++));
+        }
+
+        return searchResults;
+    }
+}
diff --git a/src/com/android/settings/search/SearchResultDiffCallback.java b/src/com/android/settings/search/SearchResultDiffCallback.java
index b7bbc66..0f0b977 100644
--- a/src/com/android/settings/search/SearchResultDiffCallback.java
+++ b/src/com/android/settings/search/SearchResultDiffCallback.java
@@ -26,10 +26,11 @@
  */
 public class SearchResultDiffCallback extends DiffUtil.Callback {
 
-    private List<SearchResult> mOldList;
-    private List<SearchResult> mNewList;
+    private List<? extends SearchResult> mOldList;
+    private List<? extends SearchResult> mNewList;
 
-    public SearchResultDiffCallback(List<SearchResult> oldList, List<SearchResult> newList) {
+    public SearchResultDiffCallback(List<? extends SearchResult> oldList,
+            List<? extends SearchResult> newList) {
         mOldList = oldList;
         mNewList = newList;
     }
diff --git a/src/com/android/settings/search/SearchResultLoader.java b/src/com/android/settings/search/SearchResultLoader.java
new file mode 100644
index 0000000..7ec3146
--- /dev/null
+++ b/src/com/android/settings/search/SearchResultLoader.java
@@ -0,0 +1,30 @@
+package com.android.settings.search;
+
+import com.android.settings.utils.AsyncLoader;
+
+import android.content.Context;
+
+import java.util.List;
+
+/**
+ * Loads a sorted list of Search results for a given query.
+ */
+public class SearchResultLoader extends AsyncLoader<List<? extends SearchResult>> {
+
+    private final String mQuery;
+
+    public SearchResultLoader(Context context, String query) {
+        super(context);
+        mQuery = query;
+    }
+
+    @Override
+    public List<? extends SearchResult> loadInBackground() {
+        SearchResultAggregator aggregator = SearchResultAggregator.getInstance();
+        return aggregator.fetchResults(getContext(), mQuery);
+    }
+
+    @Override
+    protected void onDiscardResult(List<? extends SearchResult> result) {
+    }
+}
diff --git a/src/com/android/settings/search/SearchResultTrampoline.java b/src/com/android/settings/search/SearchResultTrampoline.java
new file mode 100644
index 0000000..3bbe6bd
--- /dev/null
+++ b/src/com/android/settings/search/SearchResultTrampoline.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.search;
+
+import static com.android.settings.SettingsActivity.EXTRA_SHOW_FRAGMENT_ARGUMENTS;
+
+import android.app.Activity;
+import android.content.Intent;
+import android.os.Bundle;
+
+import com.android.settings.SettingsActivity;
+import com.android.settings.SubSettings;
+import com.android.settings.overlay.FeatureFactory;
+
+/**
+ * A trampoline activity that launches setting result page.
+ */
+public class SearchResultTrampoline extends Activity {
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+
+        // First make sure caller has privilege to launch a search result page.
+        FeatureFactory.getFactory(this)
+                .getSearchFeatureProvider()
+                .verifyLaunchSearchResultPageCaller(this, getCallingActivity());
+        // Didn't crash, proceed and launch the result as a subsetting.
+        final Intent intent = getIntent();
+
+        // Hack to take EXTRA_FRAGMENT_ARG_KEY from intent and set into
+        // EXTRA_SHOW_FRAGMENT_ARGUMENTS. This is necessary because intent could be from external
+        // caller and args may not persisted.
+        final String settingKey = intent.getStringExtra(SettingsActivity.EXTRA_FRAGMENT_ARG_KEY);
+        final Bundle args = new Bundle();
+        args.putString(SettingsActivity.EXTRA_FRAGMENT_ARG_KEY, settingKey);
+        intent.putExtra(EXTRA_SHOW_FRAGMENT_ARGUMENTS, args);
+
+        // Reroute request to SubSetting.
+        intent.setClass(this /* context */, SubSettings.class)
+                .addFlags(Intent.FLAG_ACTIVITY_FORWARD_RESULT);
+        startActivity(intent);
+
+        // Done.
+        finish();
+    }
+
+}
diff --git a/src/com/android/settings/search/SearchResultsAdapter.java b/src/com/android/settings/search/SearchResultsAdapter.java
index 5fedc52..c05ce18 100644
--- a/src/com/android/settings/search/SearchResultsAdapter.java
+++ b/src/com/android/settings/search/SearchResultsAdapter.java
@@ -18,87 +18,25 @@
 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;
-import java.util.TreeSet;
 
-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 String ACCESSIBILITY_LOADER_KEY = AccessibilityServiceResultLoader.class.getName();
-    @VisibleForTesting
-    static final String INPUT_DEVICE_LOADER_KEY = InputDeviceResultLoader.class.getName();
-
-    @VisibleForTesting
-    static final int MSG_RANKING_TIMED_OUT = 1;
+public class SearchResultsAdapter extends RecyclerView.Adapter<SearchViewHolder> {
 
     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 {}
-    @VisibleForTesting
-    static final int DISABLED = 0;
-    @VisibleForTesting
-    static final int PENDING_RESULTS = 1;
-    @VisibleForTesting
-    static final int SUCCEEDED = 2;
-    @VisibleForTesting
-    static final int FAILED = 3;
-    @VisibleForTesting
-    static final int TIMED_OUT = 4;
-    private @AsyncRankingState int mAsyncRankingState;
-
-    public SearchResultsAdapter(SearchFragment fragment,
-            SearchFeatureProvider searchFeatureProvider) {
+    public SearchResultsAdapter(SearchFragment fragment) {
         mFragment = fragment;
-        mContext = fragment.getContext().getApplicationContext();
         mSearchResults = new ArrayList<>();
-        mResultsMap = new ArrayMap<>();
-        mSearchRankingScores = new ArrayList<>();
-        mStaticallyRankedSearchResults = new ArrayList<>();
-        mSearchFeatureProvider = searchFeatureProvider;
 
         setHasStableIds(true);
     }
@@ -149,298 +87,30 @@
         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) {
+    public void 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();
-            final long timeoutMs = mSearchFeatureProvider.smartSearchRankingTimeoutMs(mContext);
-            handler.sendMessageDelayed(
-                    handler.obtainMessage(MSG_RANKING_TIMED_OUT), timeoutMs);
-            mSearchFeatureProvider.querySearchResults(mContext, query, this);
-        } else {
-            mAsyncRankingState = DISABLED;
-        }
-    }
-
-    @AsyncRankingState int getAsyncRankingState() {
-        return mAsyncRankingState;
-    }
-
-    /**
-     * 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);
-        List<? extends SearchResult> accessibilityResults =
-                getSortedLoadedResults(ACCESSIBILITY_LOADER_KEY);
-        List<? extends SearchResult> inputDeviceResults =
-                getSortedLoadedResults(INPUT_DEVICE_LOADER_KEY);
-
-        int dbSize = databaseResults.size();
-        int appSize = installedAppResults.size();
-        int a11ySize = accessibilityResults.size();
-        int inputDeviceSize = inputDeviceResults.size();
-        int dbIndex = 0;
-        int appIndex = 0;
-        int a11yIndex = 0;
-        int inputDeviceIndex = 0;
-        int rank = SearchResult.TOP_RANK;
-
-        // TODO: We need a helper method to do k-way merge.
-        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++));
-            }
-            while ((a11yIndex < a11ySize) && (accessibilityResults.get(a11yIndex).rank == rank)) {
-                mStaticallyRankedSearchResults.add(accessibilityResults.get(a11yIndex++));
-            }
-            while (inputDeviceIndex < inputDeviceSize
-                    && inputDeviceResults.get(inputDeviceIndex).rank == rank) {
-                mStaticallyRankedSearchResults.add(inputDeviceResults.get(inputDeviceIndex++));
-            }
-            rank++;
-        }
-
-        while (dbIndex < dbSize) {
-            mStaticallyRankedSearchResults.add(databaseResults.get(dbIndex++));
-        }
-        while (appIndex < appSize) {
-            mStaticallyRankedSearchResults.add(installedAppResults.get(appIndex++));
-        }
-        while(a11yIndex < a11ySize) {
-            mStaticallyRankedSearchResults.add(accessibilityResults.get(a11yIndex++));
-        }
-        while (inputDeviceIndex < inputDeviceSize) {
-            mStaticallyRankedSearchResults.add(inputDeviceResults.get(inputDeviceIndex++));
-        }
-    }
-
-    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);
-        List<? extends SearchResult> accessibilityResults =
-                getSortedLoadedResults(ACCESSIBILITY_LOADER_KEY);
-        List<? extends SearchResult> inputDeviceResults =
-                getSortedLoadedResults(INPUT_DEVICE_LOADER_KEY);
-        int dbSize = databaseResults.size();
-        int appSize = installedAppResults.size();
-        int a11ySize = accessibilityResults.size();
-        int inputDeviceSize = inputDeviceResults.size();
-
-        final List<SearchResult> asyncRankingResults = new ArrayList<>(
-                dbSize + appSize + a11ySize + inputDeviceSize);
-        TreeSet<SearchResult> dbResultsSortedByScores = new TreeSet<>(
-                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;
-                        }
-                    }
-                });
-        dbResultsSortedByScores.addAll(databaseResults);
-        asyncRankingResults.addAll(dbResultsSortedByScores);
-        // Other results are not ranked by async ranking and appended at the end of the list.
-        asyncRankingResults.addAll(installedAppResults);
-        asyncRankingResults.addAll(accessibilityResults);
-        asyncRankingResults.addAll(inputDeviceResults);
-        return asyncRankingResults;
-    }
-
-    @VisibleForTesting
-    Set<? extends SearchResult> getUnsortedLoadedResults(String loaderKey) {
-        return mResultsMap.containsKey(loaderKey) ? mResultsMap.get(loaderKey) : new HashSet<>();
-    }
-
-    @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;
-    }
-
-    @VisibleForTesting
-    public void postSearchResults(List<SearchResult> newSearchResults, boolean detectMoves) {
+    public void postSearchResults(List<? extends SearchResult> newSearchResults) {
         final DiffUtil.DiffResult diffResult = DiffUtil.calculateDiff(
-                new SearchResultDiffCallback(mSearchResults, newSearchResults), detectMoves);
+                new SearchResultDiffCallback(mSearchResults, newSearchResults));
         mSearchResults.clear();
         mSearchResults.addAll(newSearchResults);
         diffResult.dispatchUpdatesTo(this);
         mFragment.onSearchResultsDisplayed(mSearchResults.size());
-        mSearchResultsUpdated = true;
     }
 }
diff --git a/src/com/android/settings/search/SearchViewHolder.java b/src/com/android/settings/search/SearchViewHolder.java
index ed72940..7667a06 100644
--- a/src/com/android/settings/search/SearchViewHolder.java
+++ b/src/com/android/settings/search/SearchViewHolder.java
@@ -17,6 +17,7 @@
 package com.android.settings.search;
 
 import android.content.Context;
+import android.content.pm.ApplicationInfo;
 import android.content.pm.PackageManager;
 import android.graphics.drawable.Drawable;
 import android.os.UserHandle;
@@ -26,6 +27,7 @@
 import android.view.View;
 import android.widget.ImageView;
 import android.widget.TextView;
+import android.support.annotation.VisibleForTesting;
 
 import com.android.settings.R;
 import com.android.settings.core.instrumentation.MetricsFeatureProvider;
@@ -84,8 +86,7 @@
             AppSearchResult appResult = (AppSearchResult) result;
             PackageManager pm = fragment.getActivity().getPackageManager();
             UserHandle userHandle = appResult.getAppUserHandle();
-            Drawable badgedIcon =
-                    mIconDrawableFactory.getBadgedIcon(appResult.info, userHandle.getIdentifier());
+            Drawable badgedIcon = getBadgedIcon(appResult.info, userHandle.getIdentifier());
             iconView.setImageDrawable(badgedIcon);
             titleView.setContentDescription(
                     pm.getUserBadgedLabel(appResult.info.loadLabel(pm), userHandle));
@@ -112,4 +113,9 @@
         breadcrumbView.setText(breadcrumb);
         breadcrumbView.setVisibility(View.VISIBLE);
     }
+
+    @VisibleForTesting
+    Drawable getBadgedIcon(ApplicationInfo info, int userId) {
+        return mIconDrawableFactory.getBadgedIcon(info, userId);
+    }
 }
\ No newline at end of file
diff --git a/src/com/android/settings/search/SettingsSearchIndexablesProvider.java b/src/com/android/settings/search/SettingsSearchIndexablesProvider.java
index 622378b..0c98b9c 100644
--- a/src/com/android/settings/search/SettingsSearchIndexablesProvider.java
+++ b/src/com/android/settings/search/SettingsSearchIndexablesProvider.java
@@ -17,6 +17,19 @@
 package com.android.settings.search;
 
 import static android.provider.SearchIndexablesContract.COLUMN_INDEX_NON_INDEXABLE_KEYS_KEY_VALUE;
+import static android.provider.SearchIndexablesContract.COLUMN_INDEX_RAW_CLASS_NAME;
+import static android.provider.SearchIndexablesContract.COLUMN_INDEX_RAW_ENTRIES;
+import static android.provider.SearchIndexablesContract.COLUMN_INDEX_RAW_ICON_RESID;
+import static android.provider.SearchIndexablesContract.COLUMN_INDEX_RAW_INTENT_ACTION;
+import static android.provider.SearchIndexablesContract.COLUMN_INDEX_RAW_INTENT_TARGET_CLASS;
+import static android.provider.SearchIndexablesContract.COLUMN_INDEX_RAW_INTENT_TARGET_PACKAGE;
+import static android.provider.SearchIndexablesContract.COLUMN_INDEX_RAW_KEY;
+import static android.provider.SearchIndexablesContract.COLUMN_INDEX_RAW_KEYWORDS;
+import static android.provider.SearchIndexablesContract.COLUMN_INDEX_RAW_SCREEN_TITLE;
+import static android.provider.SearchIndexablesContract.COLUMN_INDEX_RAW_SUMMARY_OFF;
+import static android.provider.SearchIndexablesContract.COLUMN_INDEX_RAW_SUMMARY_ON;
+import static android.provider.SearchIndexablesContract.COLUMN_INDEX_RAW_TITLE;
+import static android.provider.SearchIndexablesContract.COLUMN_INDEX_RAW_USER_ID;
 import static android.provider.SearchIndexablesContract.COLUMN_INDEX_XML_RES_CLASS_NAME;
 import static android.provider.SearchIndexablesContract.COLUMN_INDEX_XML_RES_ICON_RESID;
 import static android.provider.SearchIndexablesContract.COLUMN_INDEX_XML_RES_INTENT_ACTION;
@@ -27,17 +40,26 @@
 import static android.provider.SearchIndexablesContract.INDEXABLES_RAW_COLUMNS;
 import static android.provider.SearchIndexablesContract.INDEXABLES_XML_RES_COLUMNS;
 import static android.provider.SearchIndexablesContract.NON_INDEXABLES_KEYS_COLUMNS;
+import static android.provider.SearchIndexablesContract.SITE_MAP_COLUMNS;
+import static com.android.settings.dashboard.DashboardFragmentRegistry.CATEGORY_KEY_TO_PARENT_MAP;
 
 import android.content.Context;
 import android.database.Cursor;
 import android.database.MatrixCursor;
 import android.provider.SearchIndexableResource;
+import android.provider.SearchIndexablesContract;
 import android.provider.SearchIndexablesProvider;
+import android.text.TextUtils;
 import android.util.ArraySet;
 import android.util.Log;
 
+import com.android.settings.SettingsActivity;
+import com.android.settings.overlay.FeatureFactory;
+import com.android.settingslib.drawer.DashboardCategory;
+import com.android.settingslib.drawer.Tile;
+
+import java.util.ArrayList;
 import java.util.Collection;
-import java.util.HashSet;
 import java.util.List;
 
 public class SettingsSearchIndexablesProvider extends SearchIndexablesProvider {
@@ -60,8 +82,9 @@
     @Override
     public Cursor queryXmlResources(String[] projection) {
         MatrixCursor cursor = new MatrixCursor(INDEXABLES_XML_RES_COLUMNS);
-        Collection<SearchIndexableResource> values = SearchIndexableResources.values();
-        for (SearchIndexableResource val : values) {
+        final List<SearchIndexableResource> resources =
+                getSearchIndexableResourcesFromProvider(getContext());
+        for (SearchIndexableResource val : resources) {
             Object[] ref = new Object[INDEXABLES_XML_RES_COLUMNS.length];
             ref[COLUMN_INDEX_XML_RES_RANK] = val.rank;
             ref[COLUMN_INDEX_XML_RES_RESID] = val.xmlResId;
@@ -72,13 +95,33 @@
             ref[COLUMN_INDEX_XML_RES_INTENT_TARGET_CLASS] = null; // intent target class
             cursor.addRow(ref);
         }
+
         return cursor;
     }
 
     @Override
     public Cursor queryRawData(String[] projection) {
-        MatrixCursor result = new MatrixCursor(INDEXABLES_RAW_COLUMNS);
-        return result;
+        MatrixCursor cursor = new MatrixCursor(INDEXABLES_RAW_COLUMNS);
+        final List<SearchIndexableRaw> raws = getSearchIndexableRawFromProvider(getContext());
+        for (SearchIndexableRaw val : raws) {
+            Object[] ref = new Object[INDEXABLES_RAW_COLUMNS.length];
+            ref[COLUMN_INDEX_RAW_TITLE] = val.title;
+            ref[COLUMN_INDEX_RAW_SUMMARY_ON] = val.summaryOn;
+            ref[COLUMN_INDEX_RAW_SUMMARY_OFF] = val.summaryOff;
+            ref[COLUMN_INDEX_RAW_ENTRIES] = val.entries;
+            ref[COLUMN_INDEX_RAW_KEYWORDS] = val.keywords;
+            ref[COLUMN_INDEX_RAW_SCREEN_TITLE] = val.screenTitle;
+            ref[COLUMN_INDEX_RAW_CLASS_NAME] = val.className;
+            ref[COLUMN_INDEX_RAW_ICON_RESID] = val.iconResId;
+            ref[COLUMN_INDEX_RAW_INTENT_ACTION] = val.intentAction;
+            ref[COLUMN_INDEX_RAW_INTENT_TARGET_PACKAGE] = val.intentTargetPackage;
+            ref[COLUMN_INDEX_RAW_INTENT_TARGET_CLASS] = val.intentTargetClass;
+            ref[COLUMN_INDEX_RAW_KEY] = val.key;
+            ref[COLUMN_INDEX_RAW_USER_ID] = val.userId;
+            cursor.addRow(ref);
+        }
+
+        return cursor;
     }
 
     /**
@@ -89,29 +132,56 @@
     @Override
     public Cursor queryNonIndexableKeys(String[] projection) {
         MatrixCursor cursor = new MatrixCursor(NON_INDEXABLES_KEYS_COLUMNS);
-        final Collection<String> values = new HashSet<>();
+        final List<String> nonIndexableKeys = getNonIndexableKeysFromProvider(getContext());
+        for (String nik : nonIndexableKeys) {
+            final Object[] ref = new Object[NON_INDEXABLES_KEYS_COLUMNS.length];
+            ref[COLUMN_INDEX_NON_INDEXABLE_KEYS_KEY_VALUE] = nik;
+            cursor.addRow(ref);
+        }
+
+        return cursor;
+    }
+
+    @Override
+    public Cursor querySiteMapPairs() {
+        final MatrixCursor cursor = new MatrixCursor(SITE_MAP_COLUMNS);
         final Context context = getContext();
-
-        for (SearchIndexableResource sir : SearchIndexableResources.values()) {
-            if (DEBUG) {
-                Log.d(TAG, "Getting non-indexable from " + sir.className);
+        // Loop through all IA categories and pages and build additional SiteMapPairs
+        final List<DashboardCategory> categories = FeatureFactory.getFactory(context)
+                .getDashboardFeatureProvider(context).getAllCategories();
+        for (DashboardCategory category : categories) {
+            // Use the category key to look up parent (which page hosts this key)
+            final String parentClass = CATEGORY_KEY_TO_PARENT_MAP.get(category.key);
+            if (parentClass == null) {
+                continue;
             }
+            // Build parent-child class pairs for all children listed under this key.
+            for (Tile tile : category.getTiles()) {
+                String childClass = null;
+                if (tile.metaData != null) {
+                    childClass = tile.metaData.getString(
+                            SettingsActivity.META_DATA_KEY_FRAGMENT_CLASS);
+                }
+                if (childClass == null) {
+                    continue;
+                }
+                cursor.newRow()
+                        .add(SearchIndexablesContract.SiteMapColumns.PARENT_CLASS, parentClass)
+                        .add(SearchIndexablesContract.SiteMapColumns.CHILD_CLASS, childClass);
+            }
+        }
+        // Done.
+        return cursor;
+    }
+
+    private List<String> getNonIndexableKeysFromProvider(Context context) {
+        final Collection<Class> values = SearchIndexableResources.providerValues();
+        final List<String> nonIndexableKeys = new ArrayList<>();
+
+        for (Class<?> clazz : values) {
             final long startTime = System.currentTimeMillis();
-            final Class<?> clazz = DatabaseIndexingUtils.getIndexableClass(sir.className);
-            if (clazz == null) {
-                Log.d(TAG, "SearchIndexableResource '" + sir.className +
-                        "' should implement the " + Indexable.class.getName() + " interface!");
-                continue;
-            }
-
-            final Indexable.SearchIndexProvider provider =
-                    DatabaseIndexingUtils.getSearchIndexProvider(clazz);
-
-            if (provider == null) {
-                Log.d(TAG, "Unable to get SearchIndexableProvider from " + clazz);
-                continue;
-            }
-
+            Indexable.SearchIndexProvider provider = DatabaseIndexingUtils.getSearchIndexProvider(
+                    clazz);
             List<String> providerNonIndexableKeys = provider.getNonIndexableKeys(context);
 
             if (providerNonIndexableKeys == null || providerNonIndexableKeys.isEmpty()) {
@@ -123,22 +193,71 @@
             }
 
             if (providerNonIndexableKeys.removeAll(INVALID_KEYS)) {
-                Log.v(TAG, clazz.getName() + " tried to add an empty non-indexable key");
+                Log.v(TAG, provider + " tried to add an empty non-indexable key");
             }
+
             if (DEBUG) {
                 final long totalTime = System.currentTimeMillis() - startTime;
                 Log.d(TAG, "Non-indexables " + providerNonIndexableKeys.size() + ", total time "
                         + totalTime);
             }
-            values.addAll(providerNonIndexableKeys);
+
+            nonIndexableKeys.addAll(providerNonIndexableKeys);
         }
 
-        for (String nik : values) {
+        return nonIndexableKeys;
+    }
 
-            final Object[] ref = new Object[NON_INDEXABLES_KEYS_COLUMNS.length];
-            ref[COLUMN_INDEX_NON_INDEXABLE_KEYS_KEY_VALUE] = nik;
-            cursor.addRow(ref);
+    private List<SearchIndexableResource> getSearchIndexableResourcesFromProvider(Context context) {
+        Collection<Class> values = SearchIndexableResources.providerValues();
+        List<SearchIndexableResource> resourceList = new ArrayList<>();
+
+        for (Class<?> clazz : values) {
+            Indexable.SearchIndexProvider provider = DatabaseIndexingUtils.getSearchIndexProvider(
+                    clazz);
+
+            final List<SearchIndexableResource> resList =
+                    provider.getXmlResourcesToIndex(context, true);
+
+            if (resList == null) {
+                continue;
+            }
+
+            for (SearchIndexableResource item : resList) {
+                item.className = TextUtils.isEmpty(item.className)
+                        ? clazz.getName()
+                        : item.className;
+            }
+
+            resourceList.addAll(resList);
         }
-        return cursor;
+
+        return resourceList;
+    }
+
+    private List<SearchIndexableRaw> getSearchIndexableRawFromProvider(Context context) {
+        final Collection<Class> values = SearchIndexableResources.providerValues();
+        final List<SearchIndexableRaw> rawList = new ArrayList<>();
+
+        for (Class<?> clazz : values) {
+            Indexable.SearchIndexProvider provider = DatabaseIndexingUtils.getSearchIndexProvider(
+                    clazz);
+            final List<SearchIndexableRaw> providerRaws = provider.getRawDataToIndex(context,
+                    true /* enabled */);
+
+            if (providerRaws == null) {
+                continue;
+            }
+
+            for (SearchIndexableRaw raw : providerRaws) {
+                // The classname and intent information comes from the PreIndexData
+                // This will be more clear when provider conversion is done at PreIndex time.
+                raw.className = clazz.getName();
+
+            }
+            rawList.addAll(providerRaws);
+        }
+
+        return rawList;
     }
 }
diff --git a/src/com/android/settings/search/actionbar/SearchMenuController.java b/src/com/android/settings/search/actionbar/SearchMenuController.java
new file mode 100644
index 0000000..28bde33
--- /dev/null
+++ b/src/com/android/settings/search/actionbar/SearchMenuController.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.search.actionbar;
+
+import android.annotation.NonNull;
+import android.app.Fragment;
+import android.content.Context;
+import android.os.Bundle;
+import android.view.Menu;
+import android.view.MenuInflater;
+import android.view.MenuItem;
+
+import com.android.settings.R;
+import com.android.settings.overlay.FeatureFactory;
+import com.android.settings.search.SearchFeatureProvider;
+import com.android.settingslib.core.lifecycle.LifecycleObserver;
+import com.android.settingslib.core.lifecycle.ObservablePreferenceFragment;
+import com.android.settingslib.core.lifecycle.events.OnCreateOptionsMenu;
+
+public class SearchMenuController implements LifecycleObserver, OnCreateOptionsMenu {
+
+    public static final String NEED_SEARCH_ICON_IN_ACTION_BAR = "need_search_icon_in_action_bar";
+
+    private final Fragment mHost;
+
+    public static void init(@NonNull ObservablePreferenceFragment host) {
+        final Context context = host.getContext();
+        final boolean isSearchV2Enabled = FeatureFactory.getFactory(context)
+                .getSearchFeatureProvider()
+                .isSearchV2Enabled(context);
+
+        if (isSearchV2Enabled) {
+            host.getLifecycle().addObserver(new SearchMenuController(host));
+        }
+    }
+
+    private SearchMenuController(@NonNull Fragment host) {
+        mHost = host;
+    }
+
+    @Override
+    public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
+        if (menu == null) {
+            return;
+        }
+        final Bundle arguments = mHost.getArguments();
+        if (arguments != null && !arguments.getBoolean(NEED_SEARCH_ICON_IN_ACTION_BAR, true)) {
+            return;
+        }
+        final MenuItem searchItem = menu.add(Menu.NONE, Menu.NONE, 0 /* order */,
+                R.string.search_menu);
+        searchItem.setIcon(R.drawable.ic_search_24dp);
+        searchItem.setShowAsAction(MenuItem.SHOW_AS_ACTION_ALWAYS);
+
+        searchItem.setOnMenuItemClickListener(target -> {
+            mHost.startActivityForResult(
+                    SearchFeatureProvider.SEARCH_UI_INTENT, 0 /* requestCode */);
+            return true;
+        });
+    }
+}
diff --git a/src/com/android/settings/search/indexing/IndexData.java b/src/com/android/settings/search/indexing/IndexData.java
new file mode 100644
index 0000000..eac7528
--- /dev/null
+++ b/src/com/android/settings/search/indexing/IndexData.java
@@ -0,0 +1,313 @@
+/*
+ * Copyright (C) 2017 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF 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.indexing;
+
+import android.content.ComponentName;
+import android.content.Context;
+import android.content.Intent;
+import android.text.TextUtils;
+
+import com.android.settings.SettingsActivity;
+import com.android.settings.search.DatabaseIndexingUtils;
+import com.android.settings.search.ResultPayload;
+import com.android.settings.search.ResultPayloadUtils;
+
+import java.text.Normalizer;
+import java.util.Locale;
+import java.util.Objects;
+import java.util.regex.Pattern;
+
+/**
+ * Data class representing a single row in the Setting Search results database.
+ */
+public class IndexData {
+    public final String locale;
+    public final String updatedTitle;
+    public final String normalizedTitle;
+    public final String updatedSummaryOn;
+    public final String normalizedSummaryOn;
+    public final String entries;
+    public final String className;
+    public final String childClassName;
+    public final String screenTitle;
+    public final int iconResId;
+    public final String spaceDelimitedKeywords;
+    public final String intentAction;
+    public final String intentTargetPackage;
+    public final String intentTargetClass;
+    public final boolean enabled;
+    public final String key;
+    public final int userId;
+    public final int payloadType;
+    public final byte[] payload;
+
+    private static final String NON_BREAKING_HYPHEN = "\u2011";
+    private static final String EMPTY = "";
+    private static final String HYPHEN = "-";
+    private static final String SPACE = " ";
+    // Regex matching a comma, and any number of subsequent white spaces.
+    private static final String LIST_DELIMITERS = "[,]\\s*";
+
+    private static final Pattern REMOVE_DIACRITICALS_PATTERN
+            = Pattern.compile("\\p{InCombiningDiacriticalMarks}+");
+
+    private IndexData(Builder builder) {
+        locale = Locale.getDefault().toString();
+        updatedTitle = normalizeHyphen(builder.mTitle);
+        updatedSummaryOn = normalizeHyphen(builder.mSummaryOn);
+        if (Locale.JAPAN.toString().equalsIgnoreCase(locale)) {
+            // Special case for JP. Convert charset to the same type for indexing purpose.
+            normalizedTitle = normalizeJapaneseString(builder.mTitle);
+            normalizedSummaryOn = normalizeJapaneseString(builder.mSummaryOn);
+        } else {
+            normalizedTitle = normalizeString(builder.mTitle);
+            normalizedSummaryOn = normalizeString(builder.mSummaryOn);
+        }
+        entries = builder.mEntries;
+        className = builder.mClassName;
+        childClassName = builder.mChildClassName;
+        screenTitle = builder.mScreenTitle;
+        iconResId = builder.mIconResId;
+        spaceDelimitedKeywords = normalizeKeywords(builder.mKeywords);
+        intentAction = builder.mIntentAction;
+        intentTargetPackage = builder.mIntentTargetPackage;
+        intentTargetClass = builder.mIntentTargetClass;
+        enabled = builder.mEnabled;
+        key = builder.mKey;
+        userId = builder.mUserId;
+        payloadType = builder.mPayloadType;
+        payload = builder.mPayload != null ? ResultPayloadUtils.marshall(builder.mPayload)
+                : null;
+    }
+
+    /**
+     * Returns the doc id for this row.
+     */
+    public int getDocId() {
+        // 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();
+    }
+
+    @Override
+    public String toString() {
+        return new StringBuilder(updatedTitle)
+                .append(": ")
+                .append(updatedSummaryOn)
+                .toString();
+    }
+
+    /**
+     * In the list of keywords, replace the comma and all subsequent whitespace with a single space.
+     */
+    public static String normalizeKeywords(String input) {
+        return (input != null) ? input.replaceAll(LIST_DELIMITERS, SPACE) : EMPTY;
+    }
+
+    /**
+     * @return {@param input} where all non-standard hyphens are replaced by normal hyphens.
+     */
+    public static String normalizeHyphen(String input) {
+        return (input != null) ? input.replaceAll(NON_BREAKING_HYPHEN, HYPHEN) : EMPTY;
+    }
+
+    /**
+     * @return {@param input} with all hyphens removed, and all letters lower case.
+     */
+    public static String normalizeString(String input) {
+        final String normalizedHypen = normalizeHyphen(input);
+        final String nohyphen = (input != null) ? normalizedHypen.replaceAll(HYPHEN, EMPTY) : EMPTY;
+        final String normalized = Normalizer.normalize(nohyphen, Normalizer.Form.NFD);
+
+        return REMOVE_DIACRITICALS_PATTERN.matcher(normalized).replaceAll("").toLowerCase();
+    }
+
+    public static String normalizeJapaneseString(String input) {
+        final String nohyphen = (input != null) ? input.replaceAll(HYPHEN, EMPTY) : EMPTY;
+        final String normalized = Normalizer.normalize(nohyphen, Normalizer.Form.NFKD);
+        final StringBuffer sb = new StringBuffer();
+        final int length = normalized.length();
+        for (int i = 0; i < length; i++) {
+            char c = normalized.charAt(i);
+            // Convert Hiragana to full-width Katakana
+            if (c >= '\u3041' && c <= '\u3096') {
+                sb.append((char) (c - '\u3041' + '\u30A1'));
+            } else {
+                sb.append(c);
+            }
+        }
+
+        return REMOVE_DIACRITICALS_PATTERN.matcher(sb.toString()).replaceAll("").toLowerCase();
+    }
+
+    public static class Builder {
+        private String mTitle;
+        private String mSummaryOn;
+        private String mEntries;
+        private String mClassName;
+        private String mChildClassName;
+        private String mScreenTitle;
+        private int mIconResId;
+        private String mKeywords;
+        private String mIntentAction;
+        private String mIntentTargetPackage;
+        private String mIntentTargetClass;
+        private boolean mEnabled;
+        private String mKey;
+        private int mUserId;
+        @ResultPayload.PayloadType
+        private int mPayloadType;
+        private ResultPayload mPayload;
+
+        public Builder setTitle(String title) {
+            mTitle = title;
+            return this;
+        }
+
+        public Builder setSummaryOn(String summaryOn) {
+            mSummaryOn = summaryOn;
+            return this;
+        }
+
+        public Builder setEntries(String entries) {
+            mEntries = entries;
+            return this;
+        }
+
+        public Builder setClassName(String className) {
+            mClassName = className;
+            return this;
+        }
+
+        public Builder setChildClassName(String childClassName) {
+            mChildClassName = childClassName;
+            return this;
+        }
+
+        public Builder setScreenTitle(String screenTitle) {
+            mScreenTitle = screenTitle;
+            return this;
+        }
+
+        public Builder setIconResId(int iconResId) {
+            mIconResId = iconResId;
+            return this;
+        }
+
+        public Builder setKeywords(String keywords) {
+            mKeywords = keywords;
+            return this;
+        }
+
+        public Builder setIntentAction(String intentAction) {
+            mIntentAction = intentAction;
+            return this;
+        }
+
+        public Builder setIntentTargetPackage(String intentTargetPackage) {
+            mIntentTargetPackage = intentTargetPackage;
+            return this;
+        }
+
+        public Builder setIntentTargetClass(String intentTargetClass) {
+            mIntentTargetClass = intentTargetClass;
+            return this;
+        }
+
+        public Builder setEnabled(boolean enabled) {
+            mEnabled = enabled;
+            return this;
+        }
+
+        public Builder setKey(String key) {
+            mKey = key;
+            return this;
+        }
+
+        public Builder setUserId(int userId) {
+            mUserId = userId;
+            return this;
+        }
+
+        public Builder setPayload(ResultPayload payload) {
+            mPayload = payload;
+
+            if (mPayload != null) {
+                setPayloadType(mPayload.getType());
+            }
+            return this;
+        }
+
+        /**
+         * Payload type is added when a Payload is added to the Builder in {setPayload}
+         *
+         * @param payloadType PayloadType
+         * @return The Builder
+         */
+        private Builder setPayloadType(@ResultPayload.PayloadType int payloadType) {
+            mPayloadType = payloadType;
+            return this;
+        }
+
+        /**
+         * 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) {
+                // Action is null, we will launch it as a sub-setting
+                intent = DatabaseIndexingUtils.buildSearchResultPageIntent(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 IndexData build(Context context) {
+            setIntent(context);
+            return new IndexData(this);
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/com/android/settings/search/indexing/IndexDataConverter.java b/src/com/android/settings/search/indexing/IndexDataConverter.java
new file mode 100644
index 0000000..c40a466
--- /dev/null
+++ b/src/com/android/settings/search/indexing/IndexDataConverter.java
@@ -0,0 +1,301 @@
+/*
+ * Copyright (C) 2017 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF 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.indexing;
+
+import android.annotation.Nullable;
+import android.content.Context;
+import android.content.res.Resources;
+import android.content.res.XmlResourceParser;
+import android.provider.SearchIndexableData;
+import android.provider.SearchIndexableResource;
+import android.support.annotation.DrawableRes;
+import android.text.TextUtils;
+import android.util.AttributeSet;
+import android.util.Log;
+import android.util.Xml;
+
+import com.android.settings.core.PreferenceControllerMixin;
+import com.android.settings.search.DatabaseIndexingUtils;
+import com.android.settings.search.ResultPayload;
+import com.android.settings.search.SearchIndexableRaw;
+import com.android.settings.search.XmlParserUtils;
+
+import org.xmlpull.v1.XmlPullParser;
+import org.xmlpull.v1.XmlPullParserException;
+
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
+/**
+ * Helper class to convert {@link PreIndexData} to {@link IndexData}.
+ */
+public class IndexDataConverter {
+
+    private static final String LOG_TAG = "IndexDataConverter";
+
+    private static final String NODE_NAME_PREFERENCE_SCREEN = "PreferenceScreen";
+    private static final String NODE_NAME_CHECK_BOX_PREFERENCE = "CheckBoxPreference";
+    private static final String NODE_NAME_LIST_PREFERENCE = "ListPreference";
+
+    private final Context mContext;
+
+    public IndexDataConverter(Context context) {
+        mContext = context;
+    }
+
+    /**
+     * Return the collection of {@param preIndexData} converted into {@link IndexData}.
+     *
+     * @param preIndexData a collection of {@link SearchIndexableResource},
+     *                     {@link SearchIndexableRaw} and non-indexable keys.
+     */
+    public List<IndexData> convertPreIndexDataToIndexData(PreIndexData preIndexData) {
+        final long current = System.currentTimeMillis();
+        final List<SearchIndexableData> indexableData = preIndexData.dataToUpdate;
+        final Map<String, Set<String>> nonIndexableKeys = preIndexData.nonIndexableKeys;
+        final List<IndexData> indexData = new ArrayList<>();
+
+        for (SearchIndexableData data : indexableData) {
+            if (data instanceof SearchIndexableRaw) {
+                final SearchIndexableRaw rawData = (SearchIndexableRaw) data;
+                final Set<String> rawNonIndexableKeys = nonIndexableKeys.get(
+                        rawData.intentTargetPackage);
+                final IndexData.Builder builder = convertRaw(rawData, rawNonIndexableKeys);
+
+                if (builder != null) {
+                    indexData.add(builder.build(mContext));
+                }
+            } else if (data instanceof SearchIndexableResource) {
+                final SearchIndexableResource sir = (SearchIndexableResource) data;
+                final Set<String> resourceNonIndexableKeys =
+                        getNonIndexableKeysForResource(nonIndexableKeys, sir.packageName);
+                final List<IndexData> resourceData = convertResource(sir, resourceNonIndexableKeys);
+                indexData.addAll(resourceData);
+            }
+        }
+
+        final long endConversion = System.currentTimeMillis();
+        Log.d(LOG_TAG, "Converting pre-index data to index data took: "
+                + (endConversion - current));
+
+        return indexData;
+    }
+
+    /**
+     * Return the conversion of {@link SearchIndexableRaw} to {@link IndexData}.
+     * The fields of {@link SearchIndexableRaw} are a subset of {@link IndexData},
+     * and there is some data sanitization in the conversion.
+     */
+    @Nullable
+    private IndexData.Builder convertRaw(SearchIndexableRaw raw, Set<String> nonIndexableKeys) {
+        // A row is enabled if it does not show up as an nonIndexableKey
+        boolean enabled = !(nonIndexableKeys != null && nonIndexableKeys.contains(raw.key));
+
+        IndexData.Builder builder = new IndexData.Builder();
+        builder.setTitle(raw.title)
+                .setSummaryOn(raw.summaryOn)
+                .setEntries(raw.entries)
+                .setKeywords(raw.keywords)
+                .setClassName(raw.className)
+                .setScreenTitle(raw.screenTitle)
+                .setIconResId(raw.iconResId)
+                .setIntentAction(raw.intentAction)
+                .setIntentTargetPackage(raw.intentTargetPackage)
+                .setIntentTargetClass(raw.intentTargetClass)
+                .setEnabled(enabled)
+                .setKey(raw.key)
+                .setUserId(raw.userId);
+
+        return builder;
+    }
+
+    /**
+     * Return the conversion of the {@link SearchIndexableResource} to {@link IndexData}.
+     * Each of the elements in the xml layout attribute of {@param sir} is a candidate to be
+     * converted (including the header element).
+     *
+     * TODO (b/33577327) simplify this method.
+     */
+    private List<IndexData> convertResource(SearchIndexableResource sir,
+            Set<String> nonIndexableKeys) {
+        final Context context = sir.context;
+        XmlResourceParser parser = null;
+
+        List<IndexData> resourceIndexData = new ArrayList<>();
+        try {
+            parser = context.getResources().getXml(sir.xmlResId);
+
+            int type;
+            while ((type = parser.next()) != XmlPullParser.END_DOCUMENT
+                    && type != XmlPullParser.START_TAG) {
+                // Parse next until start tag is found
+            }
+
+            String nodeName = parser.getName();
+            if (!NODE_NAME_PREFERENCE_SCREEN.equals(nodeName)) {
+                throw new RuntimeException(
+                        "XML document must start with <PreferenceScreen> tag; found"
+                                + nodeName + " at " + parser.getPositionDescription());
+            }
+
+            final int outerDepth = parser.getDepth();
+            final AttributeSet attrs = Xml.asAttributeSet(parser);
+
+            final String screenTitle = XmlParserUtils.getDataTitle(context, attrs);
+            String key = XmlParserUtils.getDataKey(context, attrs);
+
+            String title;
+            String headerTitle;
+            String summary;
+            String headerSummary;
+            String keywords;
+            String headerKeywords;
+            String childFragment;
+            @DrawableRes int iconResId;
+            ResultPayload payload;
+            boolean enabled;
+            final String fragmentName = sir.className;
+            final String intentAction = sir.intentAction;
+            final String intentTargetPackage = sir.intentTargetPackage;
+            final String intentTargetClass = sir.intentTargetClass;
+
+            Map<String, ResultPayload> controllerUriMap = new HashMap<>();
+
+            if (fragmentName != null) {
+                controllerUriMap = DatabaseIndexingUtils
+                        .getPayloadKeyMap(fragmentName, context);
+            }
+
+            headerTitle = XmlParserUtils.getDataTitle(context, attrs);
+            headerSummary = XmlParserUtils.getDataSummary(context, attrs);
+            headerKeywords = XmlParserUtils.getDataKeywords(context, attrs);
+            enabled = !nonIndexableKeys.contains(key);
+
+            // TODO: Set payload type for header results
+            IndexData.Builder headerBuilder = new IndexData.Builder();
+            headerBuilder.setTitle(headerTitle)
+                    .setSummaryOn(headerSummary)
+                    .setKeywords(headerKeywords)
+                    .setClassName(fragmentName)
+                    .setScreenTitle(screenTitle)
+                    .setIntentAction(intentAction)
+                    .setIntentTargetPackage(intentTargetPackage)
+                    .setIntentTargetClass(intentTargetClass)
+                    .setEnabled(enabled)
+                    .setKey(key)
+                    .setUserId(-1 /* default user id */);
+
+            // Flag for XML headers which a child element's title.
+            boolean isHeaderUnique = true;
+            IndexData.Builder builder;
+
+            while ((type = parser.next()) != XmlPullParser.END_DOCUMENT
+                    && (type != XmlPullParser.END_TAG || parser.getDepth() > outerDepth)) {
+                if (type == XmlPullParser.END_TAG || type == XmlPullParser.TEXT) {
+                    continue;
+                }
+
+                nodeName = parser.getName();
+
+                title = XmlParserUtils.getDataTitle(context, attrs);
+                key = XmlParserUtils.getDataKey(context, attrs);
+                enabled = !nonIndexableKeys.contains(key);
+                keywords = XmlParserUtils.getDataKeywords(context, attrs);
+                iconResId = XmlParserUtils.getDataIcon(context, attrs);
+
+                if (isHeaderUnique && TextUtils.equals(headerTitle, title)) {
+                    isHeaderUnique = false;
+                }
+
+                builder = new IndexData.Builder();
+                builder.setTitle(title)
+                        .setKeywords(keywords)
+                        .setClassName(fragmentName)
+                        .setScreenTitle(screenTitle)
+                        .setIconResId(iconResId)
+                        .setIntentAction(intentAction)
+                        .setIntentTargetPackage(intentTargetPackage)
+                        .setIntentTargetClass(intentTargetClass)
+                        .setEnabled(enabled)
+                        .setKey(key)
+                        .setUserId(-1 /* default user id */);
+
+                if (!nodeName.equals(NODE_NAME_CHECK_BOX_PREFERENCE)) {
+                    summary = XmlParserUtils.getDataSummary(context, attrs);
+
+                    String entries = null;
+
+                    if (nodeName.endsWith(NODE_NAME_LIST_PREFERENCE)) {
+                        entries = XmlParserUtils.getDataEntries(context, attrs);
+                    }
+
+                    // TODO (b/62254931) index primitives instead of payload
+                    payload = controllerUriMap.get(key);
+                    childFragment = XmlParserUtils.getDataChildFragment(context, attrs);
+
+                    builder.setSummaryOn(summary)
+                            .setEntries(entries)
+                            .setChildClassName(childFragment)
+                            .setPayload(payload);
+
+                    resourceIndexData.add(builder.build(mContext));
+                } else {
+                    // TODO (b/33577327) We removed summary off here. We should check if we can
+                    // merge this 'else' section with the one above. Put a break point to
+                    // investigate.
+                    String summaryOn = XmlParserUtils.getDataSummaryOn(context, attrs);
+                    String summaryOff = XmlParserUtils.getDataSummaryOff(context, attrs);
+
+                    if (TextUtils.isEmpty(summaryOn) && TextUtils.isEmpty(summaryOff)) {
+                        summaryOn = XmlParserUtils.getDataSummary(context, attrs);
+                    }
+
+                    builder.setSummaryOn(summaryOn);
+
+                    resourceIndexData.add(builder.build(mContext));
+                }
+            }
+
+            // The xml header's title does not match the title of one of the child settings.
+            if (isHeaderUnique) {
+                resourceIndexData.add(headerBuilder.build(mContext));
+            }
+        } catch (XmlPullParserException e) {
+            Log.w(LOG_TAG, "XML Error parsing PreferenceScreen: ", e);
+        } catch (IOException e) {
+            Log.w(LOG_TAG, "IO Error parsing PreferenceScreen: ", e);
+        } catch (Resources.NotFoundException e) {
+            Log.w(LOG_TAG, "Resoucre not found error parsing PreferenceScreen: ", e);
+        } finally {
+            if (parser != null) parser.close();
+        }
+        return resourceIndexData;
+    }
+
+    private Set<String> getNonIndexableKeysForResource(Map<String, Set<String>> nonIndexableKeys,
+            String packageName) {
+        return nonIndexableKeys.containsKey(packageName)
+                ? nonIndexableKeys.get(packageName)
+                : new HashSet<>();
+    }
+}
diff --git a/src/com/android/settings/search/indexing/PreIndexData.java b/src/com/android/settings/search/indexing/PreIndexData.java
new file mode 100644
index 0000000..de3cf7c
--- /dev/null
+++ b/src/com/android/settings/search/indexing/PreIndexData.java
@@ -0,0 +1,55 @@
+/*
+ * Copyright (C) 2017 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+package com.android.settings.search.indexing;
+
+import android.provider.SearchIndexableData;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
+
+/**
+ * Holds Data sources for indexable data.
+ * TODO (b/33577327) add getters and setters for data.
+ */
+public class PreIndexData {
+    public List<SearchIndexableData> dataToUpdate;
+    public Map<String, Set<String>> nonIndexableKeys;
+
+    public PreIndexData() {
+        dataToUpdate = new ArrayList<>();
+        nonIndexableKeys = new HashMap<>();
+    }
+
+    public PreIndexData(PreIndexData other) {
+        dataToUpdate = new ArrayList<>(other.dataToUpdate);
+        nonIndexableKeys = new HashMap<>(other.nonIndexableKeys);
+    }
+
+    public PreIndexData copy() {
+        return new PreIndexData(this);
+    }
+
+    public void clear() {
+        dataToUpdate.clear();
+        nonIndexableKeys.clear();
+    }
+}
diff --git a/src/com/android/settings/search/indexing/PreIndexDataCollector.java b/src/com/android/settings/search/indexing/PreIndexDataCollector.java
new file mode 100644
index 0000000..a4e1131
--- /dev/null
+++ b/src/com/android/settings/search/indexing/PreIndexDataCollector.java
@@ -0,0 +1,362 @@
+/*
+ * Copyright (C) 2017 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF 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.indexing;
+
+import android.Manifest;
+import android.content.ContentResolver;
+import android.content.Context;
+import android.content.pm.ApplicationInfo;
+import android.content.pm.PackageInfo;
+import android.content.pm.PackageManager;
+import android.content.pm.ResolveInfo;
+import android.database.Cursor;
+import android.net.Uri;
+import android.provider.SearchIndexableResource;
+import android.provider.SearchIndexablesContract;
+import android.text.TextUtils;
+import android.util.ArraySet;
+import android.util.Log;
+
+import com.android.internal.annotations.VisibleForTesting;
+import com.android.settings.search.SearchIndexableRaw;
+import com.android.settings.search.SettingsSearchIndexablesProvider;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+
+import static android.provider.SearchIndexablesContract.COLUMN_INDEX_XML_RES_CLASS_NAME;
+import static android.provider.SearchIndexablesContract.COLUMN_INDEX_XML_RES_ICON_RESID;
+import static android.provider.SearchIndexablesContract.COLUMN_INDEX_XML_RES_RESID;
+
+import static android.provider.SearchIndexablesContract.COLUMN_INDEX_NON_INDEXABLE_KEYS_KEY_VALUE;
+import static android.provider.SearchIndexablesContract.COLUMN_INDEX_RAW_CLASS_NAME;
+import static android.provider.SearchIndexablesContract.COLUMN_INDEX_RAW_ENTRIES;
+import static android.provider.SearchIndexablesContract.COLUMN_INDEX_RAW_ICON_RESID;
+import static android.provider.SearchIndexablesContract.COLUMN_INDEX_RAW_INTENT_ACTION;
+import static android.provider.SearchIndexablesContract.COLUMN_INDEX_RAW_INTENT_TARGET_CLASS;
+import static android.provider.SearchIndexablesContract.COLUMN_INDEX_RAW_INTENT_TARGET_PACKAGE;
+import static android.provider.SearchIndexablesContract.COLUMN_INDEX_RAW_KEY;
+import static android.provider.SearchIndexablesContract.COLUMN_INDEX_RAW_KEYWORDS;
+import static android.provider.SearchIndexablesContract.COLUMN_INDEX_RAW_RANK;
+import static android.provider.SearchIndexablesContract.COLUMN_INDEX_RAW_SCREEN_TITLE;
+import static android.provider.SearchIndexablesContract.COLUMN_INDEX_RAW_SUMMARY_OFF;
+import static android.provider.SearchIndexablesContract.COLUMN_INDEX_RAW_SUMMARY_ON;
+import static android.provider.SearchIndexablesContract.COLUMN_INDEX_RAW_TITLE;
+import static android.provider.SearchIndexablesContract.COLUMN_INDEX_RAW_USER_ID;
+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;
+
+/**
+ * Collects all data from {@link android.provider.SearchIndexablesProvider} to be indexed.
+ */
+public class PreIndexDataCollector {
+
+    private static final String TAG = "IndexableDataCollector";
+
+    // TODO (b/64938328) update to new search package.
+    private final String BASE_AUTHORITY = "com.android.settings";
+
+    private static final List<String> EMPTY_LIST = Collections.emptyList();
+
+    private Context mContext;
+
+    private PreIndexData mIndexData;
+
+    public PreIndexDataCollector(Context context) {
+        mContext = context;
+    }
+
+    public PreIndexData collectIndexableData(List<ResolveInfo> providers, boolean isFullIndex) {
+        mIndexData = new PreIndexData();
+
+        for (final ResolveInfo info : providers) {
+            if (!isWellKnownProvider(info)) {
+                continue;
+            }
+            final String authority = info.providerInfo.authority;
+            final String packageName = info.providerInfo.packageName;
+
+            if (isFullIndex) {
+                addIndexablesFromRemoteProvider(packageName, authority);
+            }
+
+            final long nonIndexableStartTime = System.currentTimeMillis();
+            addNonIndexablesKeysFromRemoteProvider(packageName, authority);
+            if (SettingsSearchIndexablesProvider.DEBUG) {
+                final long nonIndexableTime = System.currentTimeMillis() - nonIndexableStartTime;
+                Log.d(TAG, "performIndexing update non-indexable for package " + packageName
+                        + " took time: " + nonIndexableTime);
+            }
+        }
+
+        return mIndexData;
+    }
+
+    private boolean addIndexablesFromRemoteProvider(String packageName, String authority) {
+        try {
+            final Context context = BASE_AUTHORITY.equals(authority) ?
+                    mContext : mContext.createPackageContext(packageName, 0);
+
+            final Uri uriForResources = buildUriForXmlResources(authority);
+            mIndexData.dataToUpdate.addAll(getIndexablesForXmlResourceUri(context, packageName,
+                    uriForResources, SearchIndexablesContract.INDEXABLES_XML_RES_COLUMNS));
+
+            final Uri uriForRawData = buildUriForRawData(authority);
+            mIndexData.dataToUpdate.addAll(getIndexablesForRawDataUri(context, packageName,
+                    uriForRawData, SearchIndexablesContract.INDEXABLES_RAW_COLUMNS));
+            return true;
+        } catch (PackageManager.NameNotFoundException e) {
+            Log.w(TAG, "Could not create context for " + packageName + ": "
+                    + Log.getStackTraceString(e));
+            return false;
+        }
+    }
+
+    @VisibleForTesting
+    List<SearchIndexableResource> getIndexablesForXmlResourceUri(Context packageContext,
+            String packageName, Uri uri, String[] projection) {
+
+        final ContentResolver resolver = packageContext.getContentResolver();
+        final Cursor cursor = resolver.query(uri, projection, null, null, null);
+        List<SearchIndexableResource> resources = new ArrayList<>();
+
+        if (cursor == null) {
+            Log.w(TAG, "Cannot add index data for Uri: " + uri.toString());
+            return resources;
+        }
+
+        try {
+            final int count = cursor.getCount();
+            if (count > 0) {
+                while (cursor.moveToNext()) {
+                    final int xmlResId = cursor.getInt(COLUMN_INDEX_XML_RES_RESID);
+
+                    final String className = cursor.getString(COLUMN_INDEX_XML_RES_CLASS_NAME);
+                    final int iconResId = cursor.getInt(COLUMN_INDEX_XML_RES_ICON_RESID);
+
+                    final String action = cursor.getString(COLUMN_INDEX_XML_RES_INTENT_ACTION);
+                    final String targetPackage = cursor.getString(
+                            COLUMN_INDEX_XML_RES_INTENT_TARGET_PACKAGE);
+                    final String targetClass = cursor.getString(
+                            COLUMN_INDEX_XML_RES_INTENT_TARGET_CLASS);
+
+                    SearchIndexableResource sir = new SearchIndexableResource(packageContext);
+                    sir.xmlResId = xmlResId;
+                    sir.className = className;
+                    sir.packageName = packageName;
+                    sir.iconResId = iconResId;
+                    sir.intentAction = action;
+                    sir.intentTargetPackage = targetPackage;
+                    sir.intentTargetClass = targetClass;
+
+                    resources.add(sir);
+                }
+            }
+        } finally {
+            cursor.close();
+        }
+        return resources;
+    }
+
+    private void addNonIndexablesKeysFromRemoteProvider(String packageName,
+            String authority) {
+        final List<String> keys =
+                getNonIndexablesKeysFromRemoteProvider(packageName, authority);
+
+        if (keys != null && !keys.isEmpty()) {
+            mIndexData.nonIndexableKeys.put(authority, new ArraySet<>(keys));
+        }
+    }
+
+    @VisibleForTesting
+    List<String> getNonIndexablesKeysFromRemoteProvider(String packageName,
+            String authority) {
+        try {
+            final Context packageContext = mContext.createPackageContext(packageName, 0);
+
+            final Uri uriForNonIndexableKeys = buildUriForNonIndexableKeys(authority);
+            return getNonIndexablesKeys(packageContext, uriForNonIndexableKeys,
+                    SearchIndexablesContract.NON_INDEXABLES_KEYS_COLUMNS);
+        } catch (PackageManager.NameNotFoundException e) {
+            Log.w(TAG, "Could not create context for " + packageName + ": "
+                    + Log.getStackTraceString(e));
+            return EMPTY_LIST;
+        }
+    }
+
+    @VisibleForTesting
+    Uri buildUriForXmlResources(String authority) {
+        return Uri.parse("content://" + authority + "/" +
+                SearchIndexablesContract.INDEXABLES_XML_RES_PATH);
+    }
+
+    @VisibleForTesting
+    Uri buildUriForRawData(String authority) {
+        return Uri.parse("content://" + authority + "/" +
+                SearchIndexablesContract.INDEXABLES_RAW_PATH);
+    }
+
+    @VisibleForTesting
+    Uri buildUriForNonIndexableKeys(String authority) {
+        return Uri.parse("content://" + authority + "/" +
+                SearchIndexablesContract.NON_INDEXABLES_KEYS_PATH);
+    }
+
+    @VisibleForTesting
+    List<SearchIndexableRaw> getIndexablesForRawDataUri(Context packageContext, String packageName,
+            Uri uri, String[] projection) {
+        final ContentResolver resolver = packageContext.getContentResolver();
+        final Cursor cursor = resolver.query(uri, projection, null, null, null);
+        List<SearchIndexableRaw> rawData = new ArrayList<>();
+
+        if (cursor == null) {
+            Log.w(TAG, "Cannot add index data for Uri: " + uri.toString());
+            return rawData;
+        }
+
+        try {
+            final int count = cursor.getCount();
+            if (count > 0) {
+                while (cursor.moveToNext()) {
+                    final int providerRank = cursor.getInt(COLUMN_INDEX_RAW_RANK);
+                    // TODO Remove rank
+                    final String title = cursor.getString(COLUMN_INDEX_RAW_TITLE);
+                    final String summaryOn = cursor.getString(COLUMN_INDEX_RAW_SUMMARY_ON);
+                    final String summaryOff = cursor.getString(COLUMN_INDEX_RAW_SUMMARY_OFF);
+                    final String entries = cursor.getString(COLUMN_INDEX_RAW_ENTRIES);
+                    final String keywords = cursor.getString(COLUMN_INDEX_RAW_KEYWORDS);
+
+                    final String screenTitle = cursor.getString(COLUMN_INDEX_RAW_SCREEN_TITLE);
+
+                    final String className = cursor.getString(COLUMN_INDEX_RAW_CLASS_NAME);
+                    final int iconResId = cursor.getInt(COLUMN_INDEX_RAW_ICON_RESID);
+
+                    final String action = cursor.getString(COLUMN_INDEX_RAW_INTENT_ACTION);
+                    final String targetPackage = cursor.getString(
+                            COLUMN_INDEX_RAW_INTENT_TARGET_PACKAGE);
+                    final String targetClass = cursor.getString(
+                            COLUMN_INDEX_RAW_INTENT_TARGET_CLASS);
+
+                    final String key = cursor.getString(COLUMN_INDEX_RAW_KEY);
+                    final int userId = cursor.getInt(COLUMN_INDEX_RAW_USER_ID);
+
+                    SearchIndexableRaw data = new SearchIndexableRaw(packageContext);
+                    data.title = title;
+                    data.summaryOn = summaryOn;
+                    data.summaryOff = summaryOff;
+                    data.entries = entries;
+                    data.keywords = keywords;
+                    data.screenTitle = screenTitle;
+                    data.className = className;
+                    data.packageName = packageName;
+                    data.iconResId = iconResId;
+                    data.intentAction = action;
+                    data.intentTargetPackage = targetPackage;
+                    data.intentTargetClass = targetClass;
+                    data.key = key;
+                    data.userId = userId;
+
+                    rawData.add(data);
+                }
+            }
+        } finally {
+            cursor.close();
+        }
+
+        return rawData;
+    }
+
+    private List<String> getNonIndexablesKeys(Context packageContext, Uri uri,
+            String[] projection) {
+
+        final ContentResolver resolver = packageContext.getContentResolver();
+        final Cursor cursor = resolver.query(uri, projection, null, null, null);
+        final List<String> result = new ArrayList<>();
+
+        if (cursor == null) {
+            Log.w(TAG, "Cannot add index data for Uri: " + uri.toString());
+            return result;
+        }
+
+        try {
+            final int count = cursor.getCount();
+            if (count > 0) {
+                while (cursor.moveToNext()) {
+                    final String key = cursor.getString(COLUMN_INDEX_NON_INDEXABLE_KEYS_KEY_VALUE);
+
+                    if (TextUtils.isEmpty(key) && Log.isLoggable(TAG, Log.VERBOSE)) {
+                        Log.v(TAG, "Empty non-indexable key from: "
+                                + packageContext.getPackageName());
+                        continue;
+                    }
+
+                    result.add(key);
+                }
+            }
+            return result;
+        } finally {
+            cursor.close();
+        }
+    }
+
+    /**
+     * Only allow a "well known" SearchIndexablesProvider. The provider should:
+     *
+     * - have read/write {@link Manifest.permission#READ_SEARCH_INDEXABLES}
+     * - be from a privileged package
+     */
+    @VisibleForTesting
+    boolean isWellKnownProvider(ResolveInfo info) {
+        final String authority = info.providerInfo.authority;
+        final String packageName = info.providerInfo.applicationInfo.packageName;
+
+        if (TextUtils.isEmpty(authority) || TextUtils.isEmpty(packageName)) {
+            return false;
+        }
+
+        final String readPermission = info.providerInfo.readPermission;
+        final String writePermission = info.providerInfo.writePermission;
+
+        if (TextUtils.isEmpty(readPermission) || TextUtils.isEmpty(writePermission)) {
+            return false;
+        }
+
+        if (!android.Manifest.permission.READ_SEARCH_INDEXABLES.equals(readPermission) ||
+                !android.Manifest.permission.READ_SEARCH_INDEXABLES.equals(writePermission)) {
+            return false;
+        }
+
+        return isPrivilegedPackage(packageName, mContext);
+    }
+
+    /**
+     * @return true if the {@param packageName} is privileged.
+     */
+    private boolean isPrivilegedPackage(String packageName, Context context) {
+        final PackageManager pm = context.getPackageManager();
+        try {
+            PackageInfo packInfo = pm.getPackageInfo(packageName, 0);
+            return ((packInfo.applicationInfo.privateFlags
+                    & ApplicationInfo.PRIVATE_FLAG_PRIVILEGED) != 0);
+        } catch (PackageManager.NameNotFoundException e) {
+            return false;
+        }
+    }
+}
diff --git a/src/com/android/settings/security/ConfigureKeyGuardDialog.java b/src/com/android/settings/security/ConfigureKeyGuardDialog.java
index 3c89340..dfe3bbe 100644
--- a/src/com/android/settings/security/ConfigureKeyGuardDialog.java
+++ b/src/com/android/settings/security/ConfigureKeyGuardDialog.java
@@ -51,7 +51,7 @@
         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)
+                .setPositiveButton(R.string.credentials_configure_lock_screen_button, this)
                 .setNegativeButton(android.R.string.cancel, this)
                 .create();
     }
diff --git a/src/com/android/settings/security/CredentialStoragePreferenceController.java b/src/com/android/settings/security/CredentialStoragePreferenceController.java
new file mode 100644
index 0000000..53f11f5
--- /dev/null
+++ b/src/com/android/settings/security/CredentialStoragePreferenceController.java
@@ -0,0 +1,48 @@
+/*
+ * Copyright (C) 2017 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF 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.Context;
+import android.os.UserManager;
+import android.security.KeyStore;
+import android.support.v7.preference.Preference;
+
+import com.android.settings.R;
+
+public class CredentialStoragePreferenceController extends
+        RestrictedEncryptionPreferenceController {
+
+    private static final String KEY_CREDENTIAL_STORAGE_TYPE = "credential_storage_type";
+    private final KeyStore mKeyStore;
+
+    public CredentialStoragePreferenceController(Context context) {
+        super(context, UserManager.DISALLOW_CONFIG_CREDENTIALS);
+        mKeyStore = KeyStore.getInstance();
+    }
+
+    @Override
+    public String getPreferenceKey() {
+        return KEY_CREDENTIAL_STORAGE_TYPE;
+    }
+
+    @Override
+    public void updateState(Preference preference) {
+        preference.setSummary(mKeyStore.isHardwareBacked()
+                ? R.string.credential_storage_type_hardware
+                : R.string.credential_storage_type_software);
+    }
+}
diff --git a/src/com/android/settings/security/CryptKeeperSettings.java b/src/com/android/settings/security/CryptKeeperSettings.java
new file mode 100644
index 0000000..7d5ee9d
--- /dev/null
+++ b/src/com/android/settings/security/CryptKeeperSettings.java
@@ -0,0 +1,221 @@
+/*
+ * Copyright (C) 2008 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF 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.admin.DevicePolicyManager;
+import android.content.BroadcastReceiver;
+import android.content.Context;
+import android.content.Intent;
+import android.content.IntentFilter;
+import android.content.res.Resources;
+import android.os.BatteryManager;
+import android.os.Bundle;
+import android.os.UserHandle;
+import android.os.storage.StorageManager;
+import android.support.v7.preference.Preference;
+import android.text.TextUtils;
+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.CryptKeeperConfirm;
+import com.android.settings.R;
+import com.android.settings.SettingsActivity;
+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";
+    private static final String TYPE = "type";
+    private static final String PASSWORD = "password";
+
+    private static final int KEYGUARD_REQUEST = 55;
+
+    // Minimum battery charge level (in percent) to launch encryption.  If the battery charge is
+    // lower than this, encryption should not be activated.
+    private static final int MIN_BATTERY_LEVEL = 80;
+
+    private View mContentView;
+    private Button mInitiateButton;
+    private View mPowerWarning;
+    private View mBatteryWarning;
+    private IntentFilter mIntentFilter;
+
+    private BroadcastReceiver mIntentReceiver = new BroadcastReceiver() {
+        @Override
+        public void onReceive(Context context, Intent intent) {
+            String action = intent.getAction();
+            if (action.equals(Intent.ACTION_BATTERY_CHANGED)) {
+                final int level = intent.getIntExtra(BatteryManager.EXTRA_LEVEL, 0);
+                final int plugged = intent.getIntExtra(BatteryManager.EXTRA_PLUGGED, 0);
+                final int invalidCharger = intent.getIntExtra(
+                    BatteryManager.EXTRA_INVALID_CHARGER, 0);
+
+                final boolean levelOk = level >= MIN_BATTERY_LEVEL;
+                final boolean pluggedOk =
+                    ((plugged & BatteryManager.BATTERY_PLUGGED_ANY) != 0) &&
+                     invalidCharger == 0;
+
+                // Update UI elements based on power/battery status
+                mInitiateButton.setEnabled(levelOk && pluggedOk);
+                mPowerWarning.setVisibility(pluggedOk ? View.GONE : View.VISIBLE );
+                mBatteryWarning.setVisibility(levelOk ? View.GONE : View.VISIBLE);
+            }
+        }
+    };
+
+    /**
+     * 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 prompt the user to set a password.
+     */
+    private Button.OnClickListener mInitiateListener = new Button.OnClickListener() {
+        @Override
+        public void onClick(View v) {
+            if (!runKeyguardConfirmation(KEYGUARD_REQUEST)) {
+                // TODO replace (or follow) this dialog with an explicit launch into password UI
+                new AlertDialog.Builder(getActivity())
+                    .setTitle(R.string.crypt_keeper_dialog_need_password_title)
+                    .setMessage(R.string.crypt_keeper_dialog_need_password_message)
+                    .setPositiveButton(android.R.string.ok, null)
+                    .create()
+                    .show();
+            }
+        }
+    };
+
+    @Override
+    public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedState) {
+        mContentView = inflater.inflate(R.layout.crypt_keeper_settings, null);
+
+        mIntentFilter = new IntentFilter();
+        mIntentFilter.addAction(Intent.ACTION_BATTERY_CHANGED);
+
+        mInitiateButton = (Button) mContentView.findViewById(R.id.initiate_encrypt);
+        mInitiateButton.setOnClickListener(mInitiateListener);
+        mInitiateButton.setEnabled(false);
+
+        mPowerWarning = mContentView.findViewById(R.id.warning_unplugged);
+        mBatteryWarning = mContentView.findViewById(R.id.warning_low_charge);
+
+        return mContentView;
+    }
+
+    @Override
+    public int getMetricsCategory() {
+        return MetricsEvent.CRYPT_KEEPER;
+    }
+
+    @Override
+    public void onResume() {
+        super.onResume();
+        getActivity().registerReceiver(mIntentReceiver, mIntentFilter);
+    }
+
+    @Override
+    public void onPause() {
+        super.onPause();
+        getActivity().unregisterReceiver(mIntentReceiver);
+    }
+
+    /**
+     * If encryption is already started, and this launched via a "start encryption" intent,
+     * then exit immediately - it's already up and running, so there's no point in "starting" it.
+     */
+    @Override
+    public void onActivityCreated(Bundle savedInstanceState) {
+        super.onActivityCreated(savedInstanceState);
+        Activity activity = getActivity();
+        Intent intent = activity.getIntent();
+        if (DevicePolicyManager.ACTION_START_ENCRYPTION.equals(intent.getAction())) {
+            DevicePolicyManager dpm = (DevicePolicyManager)
+                    activity.getSystemService(Context.DEVICE_POLICY_SERVICE);
+            if (dpm != null) {
+                int status = dpm.getStorageEncryptionStatus();
+                if (status != DevicePolicyManager.ENCRYPTION_STATUS_INACTIVE) {
+                    // There is nothing to do here, so simply finish() (which returns to caller)
+                    activity.finish();
+                }
+            }
+        }
+    }
+
+    /**
+     * Keyguard validation is run using the standard {@link ConfirmLockPattern}
+     * component as a subactivity
+     * @param request the request code to be returned once confirmation finishes
+     * @return true if confirmation launched
+     */
+    private boolean runKeyguardConfirmation(int request) {
+        Resources res = getActivity().getResources();
+        ChooseLockSettingsHelper helper = new ChooseLockSettingsHelper(getActivity(), this);
+
+        if (helper.utils().getKeyguardStoredPasswordQuality(UserHandle.myUserId())
+                == DevicePolicyManager.PASSWORD_QUALITY_UNSPECIFIED) {
+            showFinalConfirmation(StorageManager.CRYPT_TYPE_DEFAULT, "");
+            return true;
+        }
+
+        return helper.launchConfirmationActivity(request,
+                res.getText(R.string.crypt_keeper_encrypt_title), true);
+    }
+
+    @Override
+    public void onActivityResult(int requestCode, int resultCode, Intent data) {
+        super.onActivityResult(requestCode, resultCode, data);
+
+        if (requestCode != KEYGUARD_REQUEST) {
+            return;
+        }
+
+        // If the user entered a valid keyguard trace, present the final
+        // confirmation prompt; otherwise, go back to the initial state.
+        if (resultCode == Activity.RESULT_OK && data != null) {
+            int type = data.getIntExtra(ChooseLockSettingsHelper.EXTRA_KEY_TYPE, -1);
+            String password = data.getStringExtra(ChooseLockSettingsHelper.EXTRA_KEY_PASSWORD);
+            if (!TextUtils.isEmpty(password)) {
+                showFinalConfirmation(type, password);
+            }
+        }
+    }
+
+    private void showFinalConfirmation(int type, String password) {
+        Preference preference = new Preference(getPreferenceManager().getContext());
+        preference.setFragment(CryptKeeperConfirm.class.getName());
+        preference.setTitle(R.string.crypt_keeper_confirm_title);
+        addEncryptionInfoToPreference(preference, type, password);
+        ((SettingsActivity) getActivity()).onPreferenceStartFragment(null, preference);
+    }
+
+    private void addEncryptionInfoToPreference(Preference preference, int type, String password) {
+        Activity activity = getActivity();
+        DevicePolicyManager dpm = (DevicePolicyManager)
+                activity.getSystemService(Context.DEVICE_POLICY_SERVICE);
+        if (dpm.getDoNotAskCredentialsOnBoot()) {
+            preference.getExtras().putInt(TYPE, StorageManager.CRYPT_TYPE_DEFAULT);
+            preference.getExtras().putString(PASSWORD, "");
+        } else {
+            preference.getExtras().putInt(TYPE, type);
+            preference.getExtras().putString(PASSWORD, password);
+        }
+    }
+}
diff --git a/src/com/android/settings/security/EncryptionAndCredential.java b/src/com/android/settings/security/EncryptionAndCredential.java
new file mode 100644
index 0000000..62f5a0c
--- /dev/null
+++ b/src/com/android/settings/security/EncryptionAndCredential.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.security;
+
+import android.content.Context;
+import android.os.UserManager;
+import android.provider.SearchIndexableResource;
+
+import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
+import com.android.settings.R;
+import com.android.settings.dashboard.DashboardFragment;
+import com.android.settings.search.BaseSearchIndexProvider;
+import com.android.settings.widget.PreferenceCategoryController;
+import com.android.settingslib.core.AbstractPreferenceController;
+import com.android.settingslib.core.lifecycle.Lifecycle;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+
+/**
+ * Encryption and Credential settings.
+ */
+public class EncryptionAndCredential extends DashboardFragment {
+
+    private static final String TAG = "EncryptionAndCredential";
+
+    @Override
+    public int getMetricsCategory() {
+        return MetricsEvent.ENCRYPTION_AND_CREDENTIAL;
+    }
+
+    @Override
+    protected String getLogTag() {
+        return TAG;
+    }
+
+    @Override
+    protected List<AbstractPreferenceController> getPreferenceControllers(Context context) {
+        return buildPreferenceControllers(context, getLifecycle());
+    }
+
+    @Override
+    protected int getPreferenceScreenResId() {
+        return R.xml.encryption_and_credential;
+    }
+
+    private static List<AbstractPreferenceController> buildPreferenceControllers(Context context,
+            Lifecycle lifecycle) {
+        final List<AbstractPreferenceController> controllers = new ArrayList<>();
+        final EncryptionStatusPreferenceController encryptStatusController =
+                new EncryptionStatusPreferenceController(context);
+        controllers.add(encryptStatusController);
+        controllers.add(new PreferenceCategoryController(context,
+                "encryption_and_credentials_status_category",
+                Arrays.asList(encryptStatusController)));
+        controllers.add(new CredentialStoragePreferenceController(context));
+        controllers.add(new UserCredentialsPreferenceController(context));
+        controllers.add(new ResetCredentialsPreferenceController(context, lifecycle));
+        controllers.add(new InstallCredentialsPreferenceController(context));
+        return controllers;
+    }
+
+    @Override
+    public int getHelpResource() {
+        return R.string.help_url_encryption;
+    }
+
+    /**
+     * For Search. Please keep it in sync when updating "createPreferenceHierarchy()"
+     */
+    public static final SearchIndexProvider SEARCH_INDEX_DATA_PROVIDER =
+            new SecuritySearchIndexProvider();
+
+    private static class SecuritySearchIndexProvider extends BaseSearchIndexProvider {
+
+        @Override
+        public List<SearchIndexableResource> getXmlResourcesToIndex(
+                Context context, boolean enabled) {
+            final SearchIndexableResource sir = new SearchIndexableResource(context);
+            sir.xmlResId = R.xml.encryption_and_credential;
+            return Arrays.asList(sir);
+        }
+
+        @Override
+        public List<AbstractPreferenceController> getPreferenceControllers(Context context) {
+            return buildPreferenceControllers(context, null /* lifecycle */);
+        }
+
+        @Override
+        protected boolean isPageSearchEnabled(Context context) {
+            final UserManager um = (UserManager) context.getSystemService(Context.USER_SERVICE);
+            return um.isAdminUser();
+        }
+    }
+}
diff --git a/src/com/android/settings/security/EncryptionStatusPreferenceController.java b/src/com/android/settings/security/EncryptionStatusPreferenceController.java
new file mode 100644
index 0000000..7d84421
--- /dev/null
+++ b/src/com/android/settings/security/EncryptionStatusPreferenceController.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.security;
+
+import android.content.Context;
+import android.os.UserManager;
+import android.support.v7.preference.Preference;
+
+import com.android.internal.widget.LockPatternUtils;
+import com.android.settings.R;
+import com.android.settings.core.PreferenceControllerMixin;
+import com.android.settingslib.core.AbstractPreferenceController;
+
+public class EncryptionStatusPreferenceController extends AbstractPreferenceController
+        implements PreferenceControllerMixin {
+
+    private static final String PREF_KEY = "encryption_and_credentials_encryption_status";
+
+    private final UserManager mUserManager;
+
+    public EncryptionStatusPreferenceController(Context context) {
+        super(context);
+        mUserManager = (UserManager) context.getSystemService(Context.USER_SERVICE);
+    }
+
+    @Override
+    public boolean isAvailable() {
+        return mUserManager.isAdminUser();
+    }
+
+    @Override
+    public String getPreferenceKey() {
+        return PREF_KEY;
+    }
+
+    @Override
+    public void updateState(Preference preference) {
+        final boolean encryptionEnabled = LockPatternUtils.isDeviceEncryptionEnabled();
+        if (encryptionEnabled) {
+            preference.setFragment(null);
+            preference.setSummary(R.string.crypt_keeper_encrypted_summary);
+        } else {
+            preference.setFragment(CryptKeeperSettings.class.getName());
+            preference.setSummary(R.string.summary_placeholder);
+        }
+    }
+}
diff --git a/src/com/android/settings/security/InstallCredentialsPreferenceController.java b/src/com/android/settings/security/InstallCredentialsPreferenceController.java
new file mode 100644
index 0000000..ca9ed26
--- /dev/null
+++ b/src/com/android/settings/security/InstallCredentialsPreferenceController.java
@@ -0,0 +1,35 @@
+/*
+ * Copyright (C) 2017 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF 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.Context;
+import android.os.UserManager;
+
+public class InstallCredentialsPreferenceController extends
+        RestrictedEncryptionPreferenceController {
+
+    private static final String KEY_CREDENTIALS_INSTALL = "credentials_install";
+
+    public InstallCredentialsPreferenceController(Context context) {
+        super(context, UserManager.DISALLOW_CONFIG_CREDENTIALS);
+    }
+
+    @Override
+    public String getPreferenceKey() {
+        return KEY_CREDENTIALS_INSTALL;
+    }
+}
diff --git a/src/com/android/settings/security/LockscreenDashboardFragment.java b/src/com/android/settings/security/LockscreenDashboardFragment.java
index b679b73..df4ca30 100644
--- a/src/com/android/settings/security/LockscreenDashboardFragment.java
+++ b/src/com/android/settings/security/LockscreenDashboardFragment.java
@@ -49,6 +49,9 @@
     @VisibleForTesting
     static final String KEY_LOCK_SCREEN_NOTIFICATON_WORK_PROFILE =
             "security_setting_lock_screen_notif_work";
+    @VisibleForTesting
+    static final String KEY_ADD_USER_FROM_LOCK_SCREEN =
+            "security_lockscreen_add_users_when_locked";
 
     private OwnerInfoPreferenceController mOwnerInfoPreferenceController;
 
@@ -68,7 +71,7 @@
     }
 
     @Override
-    protected int getHelpResource() {
+    public int getHelpResource() {
         return R.string.help_url_lockscreen;
     }
 
@@ -77,18 +80,18 @@
         final List<AbstractPreferenceController> controllers = new ArrayList<>();
         final Lifecycle lifecycle = getLifecycle();
         final LockScreenNotificationPreferenceController notificationController =
-            new LockScreenNotificationPreferenceController(context,
-                    KEY_LOCK_SCREEN_NOTIFICATON,
-                    KEY_LOCK_SCREEN_NOTIFICATON_WORK_PROFILE_HEADER,
-                    KEY_LOCK_SCREEN_NOTIFICATON_WORK_PROFILE);
+                new LockScreenNotificationPreferenceController(context,
+                        KEY_LOCK_SCREEN_NOTIFICATON,
+                        KEY_LOCK_SCREEN_NOTIFICATON_WORK_PROFILE_HEADER,
+                        KEY_LOCK_SCREEN_NOTIFICATON_WORK_PROFILE);
         lifecycle.addObserver(notificationController);
         controllers.add(notificationController);
         final AddUserWhenLockedPreferenceController addUserWhenLockedController =
-            new AddUserWhenLockedPreferenceController(context);
+                new AddUserWhenLockedPreferenceController(context, KEY_ADD_USER_FROM_LOCK_SCREEN);
         lifecycle.addObserver(addUserWhenLockedController);
         controllers.add(addUserWhenLockedController);
         mOwnerInfoPreferenceController =
-            new OwnerInfoPreferenceController(context, this, lifecycle);
+                new OwnerInfoPreferenceController(context, this, lifecycle);
         controllers.add(mOwnerInfoPreferenceController);
         return controllers;
     }
@@ -101,23 +104,32 @@
     }
 
     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.security_lockscreen_settings;
-                return Arrays.asList(sir);
-            }
+            new BaseSearchIndexProvider() {
+                @Override
+                public List<SearchIndexableResource> getXmlResourcesToIndex(
+                        Context context, boolean enabled) {
+                    final SearchIndexableResource sir = new SearchIndexableResource(context);
+                    sir.xmlResId = R.xml.security_lockscreen_settings;
+                    return Arrays.asList(sir);
+                }
 
-            @Override
-            public List<AbstractPreferenceController> getPreferenceControllers(Context context) {
-                final List<AbstractPreferenceController> controllers = new ArrayList<>();
-                controllers.add(new LockScreenNotificationPreferenceController(context));
-                controllers.add(new AddUserWhenLockedPreferenceController(context));
-                controllers.add(new OwnerInfoPreferenceController(
-                    context, null /* fragment */, null /* lifecycle */));
-                return controllers;
-            }
-        };
+                @Override
+                public List<AbstractPreferenceController> getPreferenceControllers(
+                        Context context) {
+                    final List<AbstractPreferenceController> controllers = new ArrayList<>();
+                    controllers.add(new LockScreenNotificationPreferenceController(context));
+                    controllers.add(new AddUserWhenLockedPreferenceController(context,
+                            KEY_ADD_USER_FROM_LOCK_SCREEN));
+                    controllers.add(new OwnerInfoPreferenceController(
+                            context, null /* fragment */, null /* lifecycle */));
+                    return controllers;
+                }
+
+                @Override
+                public List<String> getNonIndexableKeys(Context context) {
+                    final List<String> niks = super.getNonIndexableKeys(context);
+                    niks.add(KEY_ADD_USER_FROM_LOCK_SCREEN);
+                    return niks;
+                }
+            };
 }
diff --git a/src/com/android/settings/security/OwnerInfoPreferenceController.java b/src/com/android/settings/security/OwnerInfoPreferenceController.java
index cae4d10..395e532 100644
--- a/src/com/android/settings/security/OwnerInfoPreferenceController.java
+++ b/src/com/android/settings/security/OwnerInfoPreferenceController.java
@@ -22,9 +22,10 @@
 import android.support.v7.preference.Preference;
 import android.support.v7.preference.Preference.OnPreferenceClickListener;
 import android.support.v7.preference.PreferenceScreen;
+
 import com.android.internal.widget.LockPatternUtils;
-import com.android.settings.OwnerInfoSettings;
 import com.android.settings.core.PreferenceControllerMixin;
+import com.android.settings.users.OwnerInfoSettings;
 import com.android.settingslib.RestrictedLockUtils;
 import com.android.settingslib.RestrictedLockUtils.EnforcedAdmin;
 import com.android.settingslib.RestrictedPreference;
@@ -45,7 +46,7 @@
 
     // Container fragment should implement this in order to show the correct summary
     public interface OwnerInfoCallback {
-        public void onOwnerInfoUpdated();
+        void onOwnerInfoUpdated();
     }
 
     public OwnerInfoPreferenceController(Context context, Fragment parent, Lifecycle lifecycle ) {
diff --git a/src/com/android/settings/security/ResetCredentialsPreferenceController.java b/src/com/android/settings/security/ResetCredentialsPreferenceController.java
new file mode 100644
index 0000000..7b91b15
--- /dev/null
+++ b/src/com/android/settings/security/ResetCredentialsPreferenceController.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.security;
+
+import android.content.Context;
+import android.os.UserManager;
+import android.security.KeyStore;
+import android.support.v7.preference.PreferenceScreen;
+
+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 ResetCredentialsPreferenceController extends RestrictedEncryptionPreferenceController
+        implements LifecycleObserver, OnResume {
+
+    private static final String KEY_RESET_CREDENTIALS = "credentials_reset";
+
+    private final KeyStore mKeyStore;
+
+    private RestrictedPreference mPreference;
+
+    public ResetCredentialsPreferenceController(Context context, Lifecycle lifecycle) {
+        super(context, UserManager.DISALLOW_CONFIG_CREDENTIALS);
+        mKeyStore = KeyStore.getInstance();
+        if (lifecycle != null) {
+            lifecycle.addObserver(this);
+        }
+    }
+
+    @Override
+    public String getPreferenceKey() {
+        return KEY_RESET_CREDENTIALS;
+    }
+
+    @Override
+    public void displayPreference(PreferenceScreen screen) {
+        super.displayPreference(screen);
+        mPreference = (RestrictedPreference) screen.findPreference(getPreferenceKey());
+    }
+
+    @Override
+    public void onResume() {
+        if (mPreference != null && !mPreference.isDisabledByAdmin()) {
+            mPreference.setEnabled(!mKeyStore.isEmpty());
+        }
+    }
+}
diff --git a/src/com/android/settings/security/RestrictedEncryptionPreferenceController.java b/src/com/android/settings/security/RestrictedEncryptionPreferenceController.java
new file mode 100644
index 0000000..2c5308f
--- /dev/null
+++ b/src/com/android/settings/security/RestrictedEncryptionPreferenceController.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 com.android.settings.security;
+
+import android.content.Context;
+import android.os.UserHandle;
+import android.os.UserManager;
+
+import com.android.settings.core.PreferenceControllerMixin;
+import com.android.settingslib.core.AbstractPreferenceController;
+
+public abstract class RestrictedEncryptionPreferenceController extends
+        AbstractPreferenceController implements PreferenceControllerMixin {
+
+    protected final UserManager mUserManager;
+
+    private final UserHandle mUserHandle;
+    private final String mUserRestriction;
+
+    public RestrictedEncryptionPreferenceController(Context context, String userRestriction) {
+        super(context);
+        mUserHandle = UserHandle.of(UserHandle.myUserId());
+        mUserManager = (UserManager) context.getSystemService(Context.USER_SERVICE);
+        mUserRestriction = userRestriction;
+    }
+
+    @Override
+    public boolean isAvailable() {
+        return !mUserManager.hasBaseUserRestriction(mUserRestriction, mUserHandle);
+    }
+}
diff --git a/src/com/android/settings/security/ScreenPinningSettings.java b/src/com/android/settings/security/ScreenPinningSettings.java
new file mode 100644
index 0000000..6e4856e
--- /dev/null
+++ b/src/com/android/settings/security/ScreenPinningSettings.java
@@ -0,0 +1,224 @@
+/*
+ * 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.security;
+
+import android.app.admin.DevicePolicyManager;
+import android.content.Context;
+import android.content.Intent;
+import android.os.Bundle;
+import android.os.UserHandle;
+import android.provider.SearchIndexableResource;
+import android.provider.Settings;
+import android.support.v14.preference.SwitchPreference;
+import android.support.v7.preference.Preference;
+import android.support.v7.preference.Preference.OnPreferenceChangeListener;
+import android.support.v7.preference.PreferenceScreen;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.Switch;
+
+import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
+import com.android.internal.widget.LockPatternUtils;
+import com.android.settings.R;
+import com.android.settings.SettingsActivity;
+import com.android.settings.SettingsPreferenceFragment;
+import com.android.settings.password.ChooseLockGeneric;
+import com.android.settings.search.BaseSearchIndexProvider;
+import com.android.settings.search.Indexable;
+import com.android.settings.widget.SwitchBar;
+
+import java.util.Arrays;
+import java.util.List;
+
+/**
+ * Screen pinning settings.
+ */
+public class ScreenPinningSettings extends SettingsPreferenceFragment
+        implements SwitchBar.OnSwitchChangeListener, Indexable {
+
+    private static final CharSequence KEY_USE_SCREEN_LOCK = "use_screen_lock";
+    private static final int CHANGE_LOCK_METHOD_REQUEST = 43;
+
+    private SwitchBar mSwitchBar;
+    private SwitchPreference mUseScreenLock;
+    private LockPatternUtils mLockPatternUtils;
+
+    @Override
+    public int getMetricsCategory() {
+        return MetricsEvent.SCREEN_PINNING;
+    }
+
+    @Override
+    public void onActivityCreated(Bundle savedInstanceState) {
+        super.onActivityCreated(savedInstanceState);
+
+        final SettingsActivity activity = (SettingsActivity) getActivity();
+        activity.setTitle(R.string.screen_pinning_title);
+        mLockPatternUtils = new LockPatternUtils(activity);
+
+
+        mSwitchBar = activity.getSwitchBar();
+        mSwitchBar.addOnSwitchChangeListener(this);
+        mSwitchBar.show();
+        mSwitchBar.setChecked(isLockToAppEnabled(getActivity()));
+    }
+
+    @Override
+    public 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);
+        View emptyView = LayoutInflater.from(getContext())
+                .inflate(R.layout.screen_pinning_instructions, parent, false);
+        parent.addView(emptyView);
+        setEmptyView(emptyView);
+    }
+
+    @Override
+    public void onDestroyView() {
+        super.onDestroyView();
+
+        mSwitchBar.removeOnSwitchChangeListener(this);
+        mSwitchBar.hide();
+    }
+
+    private static boolean isLockToAppEnabled(Context context) {
+        return Settings.System.getInt(context.getContentResolver(),
+                Settings.System.LOCK_TO_APP_ENABLED, 0) != 0;
+    }
+
+    private void setLockToAppEnabled(boolean isEnabled) {
+        Settings.System.putInt(getContentResolver(), Settings.System.LOCK_TO_APP_ENABLED,
+                isEnabled ? 1 : 0);
+        if (isEnabled) {
+            // Set the value to match what we have defaulted to in the UI.
+            setScreenLockUsedSetting(isScreenLockUsed());
+        }
+    }
+
+    private boolean isScreenLockUsed() {
+        int def = getCurrentSecurityTitle() != R.string.screen_pinning_unlock_none ? 1 : 0;
+        return Settings.Secure.getInt(getContentResolver(),
+                Settings.Secure.LOCK_TO_APP_EXIT_LOCKED, def) != 0;
+    }
+
+    private boolean setScreenLockUsed(boolean isEnabled) {
+        if (isEnabled) {
+            LockPatternUtils lockPatternUtils = new LockPatternUtils(getActivity());
+            int passwordQuality = lockPatternUtils
+                    .getKeyguardStoredPasswordQuality(UserHandle.myUserId());
+            if (passwordQuality == DevicePolicyManager.PASSWORD_QUALITY_UNSPECIFIED) {
+                Intent chooseLockIntent = new Intent(DevicePolicyManager.ACTION_SET_NEW_PASSWORD);
+                chooseLockIntent.putExtra(
+                        ChooseLockGeneric.ChooseLockGenericFragment.MINIMUM_QUALITY_KEY,
+                        DevicePolicyManager.PASSWORD_QUALITY_SOMETHING);
+                startActivityForResult(chooseLockIntent, CHANGE_LOCK_METHOD_REQUEST);
+                return false;
+            }
+        }
+        setScreenLockUsedSetting(isEnabled);
+        return true;
+    }
+
+    private void setScreenLockUsedSetting(boolean isEnabled) {
+        Settings.Secure.putInt(getContentResolver(), Settings.Secure.LOCK_TO_APP_EXIT_LOCKED,
+                isEnabled ? 1 : 0);
+    }
+
+    @Override
+    public void onActivityResult(int requestCode, int resultCode, Intent data) {
+        super.onActivityResult(requestCode, resultCode, data);
+        if (requestCode == CHANGE_LOCK_METHOD_REQUEST) {
+            LockPatternUtils lockPatternUtils = new LockPatternUtils(getActivity());
+            boolean validPassQuality = lockPatternUtils.getKeyguardStoredPasswordQuality(
+                    UserHandle.myUserId())
+                    != DevicePolicyManager.PASSWORD_QUALITY_UNSPECIFIED;
+            setScreenLockUsed(validPassQuality);
+            // Make sure the screen updates.
+            mUseScreenLock.setChecked(validPassQuality);
+        }
+    }
+
+    private int getCurrentSecurityTitle() {
+        int quality = mLockPatternUtils.getKeyguardStoredPasswordQuality(
+                UserHandle.myUserId());
+        switch (quality) {
+            case DevicePolicyManager.PASSWORD_QUALITY_NUMERIC:
+            case DevicePolicyManager.PASSWORD_QUALITY_NUMERIC_COMPLEX:
+                return R.string.screen_pinning_unlock_pin;
+            case DevicePolicyManager.PASSWORD_QUALITY_ALPHABETIC:
+            case DevicePolicyManager.PASSWORD_QUALITY_ALPHANUMERIC:
+            case DevicePolicyManager.PASSWORD_QUALITY_COMPLEX:
+            case DevicePolicyManager.PASSWORD_QUALITY_MANAGED:
+                return R.string.screen_pinning_unlock_password;
+            case DevicePolicyManager.PASSWORD_QUALITY_SOMETHING:
+                if (mLockPatternUtils.isLockPatternEnabled(UserHandle.myUserId())) {
+                    return R.string.screen_pinning_unlock_pattern;
+                }
+        }
+        return R.string.screen_pinning_unlock_none;
+    }
+
+    /**
+     * Listens to the state change of the lock-to-app master switch.
+     */
+    @Override
+    public void onSwitchChanged(Switch switchView, boolean isChecked) {
+        setLockToAppEnabled(isChecked);
+        updateDisplay();
+    }
+
+    public void updateDisplay() {
+        PreferenceScreen root = getPreferenceScreen();
+        if (root != null) {
+            root.removeAll();
+        }
+        if (isLockToAppEnabled(getActivity())) {
+            addPreferencesFromResource(R.xml.screen_pinning_settings);
+            root = getPreferenceScreen();
+
+            mUseScreenLock = (SwitchPreference) root.findPreference(KEY_USE_SCREEN_LOCK);
+            mUseScreenLock.setOnPreferenceChangeListener(new OnPreferenceChangeListener() {
+                @Override
+                public boolean onPreferenceChange(Preference preference, Object newValue) {
+                    return setScreenLockUsed((boolean) newValue);
+                }
+            });
+            mUseScreenLock.setChecked(isScreenLockUsed());
+            mUseScreenLock.setTitle(getCurrentSecurityTitle());
+        }
+    }
+
+    /**
+     * For search
+     */
+    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.screen_pinning_settings;
+                return Arrays.asList(sir);
+            }
+        };
+}
diff --git a/src/com/android/settings/security/SecurityFeatureProvider.java b/src/com/android/settings/security/SecurityFeatureProvider.java
index 23b4cf0..509446d 100644
--- a/src/com/android/settings/security/SecurityFeatureProvider.java
+++ b/src/com/android/settings/security/SecurityFeatureProvider.java
@@ -19,7 +19,7 @@
 import android.content.Context;
 import android.support.v7.preference.PreferenceScreen;
 
-import com.android.settings.trustagent.TrustAgentManager;
+import com.android.settings.security.trustagent.TrustAgentManager;
 import com.android.settingslib.drawer.DashboardCategory;
 
 
diff --git a/src/com/android/settings/security/SecurityFeatureProviderImpl.java b/src/com/android/settings/security/SecurityFeatureProviderImpl.java
index 47f7a1b..29aaefe 100644
--- a/src/com/android/settings/security/SecurityFeatureProviderImpl.java
+++ b/src/com/android/settings/security/SecurityFeatureProviderImpl.java
@@ -22,8 +22,6 @@
 import android.content.pm.PackageManager;
 import android.content.res.Resources;
 import android.graphics.drawable.Drawable;
-import android.os.Handler;
-import android.os.Looper;
 import android.support.annotation.VisibleForTesting;
 import android.support.v7.preference.Preference;
 import android.support.v7.preference.PreferenceScreen;
@@ -32,15 +30,14 @@
 import android.util.Pair;
 
 import com.android.settings.R;
-import com.android.settings.trustagent.TrustAgentManager;
-import com.android.settings.trustagent.TrustAgentManagerImpl;
+import com.android.settings.security.trustagent.TrustAgentManager;
 import com.android.settingslib.drawer.DashboardCategory;
 import com.android.settingslib.drawer.Tile;
 import com.android.settingslib.drawer.TileUtils;
+import com.android.settingslib.utils.ThreadUtils;
 
 import java.util.Map;
 import java.util.TreeMap;
-import java.util.concurrent.Executors;
 
 /** Implementation for {@code SecurityFeatureProvider}. */
 public class SecurityFeatureProviderImpl implements SecurityFeatureProvider {
@@ -71,12 +68,8 @@
 
         // Fetching the summary and icon from the provider introduces latency, so do this on a
         // separate thread.
-        Executors.newSingleThreadExecutor().execute(new Runnable() {
-            @Override
-            public void run() {
-                updatePreferencesToRunOnWorkerThread(context, preferenceScreen, dashboardCategory);
-            }
-        });
+        ThreadUtils.postOnBackgroundThread(() ->
+                updatePreferencesToRunOnWorkerThread(context, preferenceScreen, dashboardCategory));
     }
 
     @VisibleForTesting
@@ -162,19 +155,16 @@
                     sIconCache.put(iconUri, icon);
                     // Icon is only returned if the icon belongs to Settings or the target app.
                     // setIcon must be called on the UI thread.
-                    new Handler(Looper.getMainLooper()).post(new Runnable() {
-                        @Override
-                        public void run() {
-                            try {
-                                matchingPref.setIcon(context.getPackageManager()
-                                        .getResourcesForApplication(icon.first /* package name */)
-                                                .getDrawable(icon.second /* res id */,
-                                                        context.getTheme()));
-                            } catch (PackageManager.NameNotFoundException
-                                    | Resources.NotFoundException e) {
-                                // Intentionally ignored. If icon resources cannot be found, do not
-                                // update.
-                            }
+                    ThreadUtils.postOnMainThread(() -> {
+                        try {
+                            matchingPref.setIcon(context.getPackageManager()
+                                    .getResourcesForApplication(icon.first /* package name */)
+                                    .getDrawable(icon.second /* res id */,
+                                            context.getTheme()));
+                        } catch (PackageManager.NameNotFoundException
+                                | Resources.NotFoundException e) {
+                            // Intentionally ignored. If icon resources cannot be found, do not
+                            // update.
                         }
                     });
                 }
@@ -184,17 +174,14 @@
                         TileUtils.META_DATA_PREFERENCE_SUMMARY);
                 sSummaryCache.put(summaryUri, summary);
                 // setSummary must be called on UI thread.
-                new Handler(Looper.getMainLooper()).post(new Runnable() {
-                    @Override
-                    public void run() {
-                        // Only update the summary if it has actually changed.
-                        if (summary == null) {
-                            if (matchingPref.getSummary() != null) {
-                                matchingPref.setSummary(summary);
-                            }
-                        } else if (!summary.equals(matchingPref.getSummary())) {
+                ThreadUtils.postOnMainThread(() -> {
+                    // Only update the summary if it has actually changed.
+                    if (summary == null) {
+                        if (matchingPref.getSummary() != null) {
                             matchingPref.setSummary(summary);
                         }
+                    } else if (!summary.equals(matchingPref.getSummary())) {
+                        matchingPref.setSummary(summary);
                     }
                 });
             }
@@ -204,7 +191,7 @@
     @Override
     public TrustAgentManager getTrustAgentManager() {
         if (mTrustAgentManager == null) {
-            mTrustAgentManager = new TrustAgentManagerImpl();
+            mTrustAgentManager = new TrustAgentManager();
         }
         return mTrustAgentManager;
     }
diff --git a/src/com/android/settings/security/SecuritySettings.java b/src/com/android/settings/security/SecuritySettings.java
new file mode 100644
index 0000000..31f1ec6
--- /dev/null
+++ b/src/com/android/settings/security/SecuritySettings.java
@@ -0,0 +1,995 @@
+/*
+ * Copyright (C) 2007 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF 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 static com.android.settingslib.RestrictedLockUtils.EnforcedAdmin;
+
+import android.app.Activity;
+import android.app.AlertDialog;
+import android.app.Dialog;
+import android.app.FragmentManager;
+import android.app.admin.DevicePolicyManager;
+import android.content.Context;
+import android.content.DialogInterface;
+import android.content.Intent;
+import android.content.res.Resources;
+import android.hardware.fingerprint.FingerprintManager;
+import android.os.Bundle;
+import android.os.PersistableBundle;
+import android.os.UserHandle;
+import android.os.UserManager;
+import android.os.storage.StorageManager;
+import android.provider.SearchIndexableResource;
+import android.provider.Settings;
+import android.support.annotation.VisibleForTesting;
+import android.support.v14.preference.SwitchPreference;
+import android.support.v7.preference.Preference;
+import android.support.v7.preference.Preference.OnPreferenceChangeListener;
+import android.support.v7.preference.PreferenceGroup;
+import android.support.v7.preference.PreferenceScreen;
+import android.telephony.CarrierConfigManager;
+import android.telephony.SubscriptionInfo;
+import android.telephony.SubscriptionManager;
+import android.telephony.TelephonyManager;
+import android.text.TextUtils;
+
+import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
+import com.android.internal.widget.LockPatternUtils;
+import com.android.settings.R;
+import com.android.settings.SettingsPreferenceFragment;
+import com.android.settings.Utils;
+import com.android.settings.core.instrumentation.InstrumentedDialogFragment;
+import com.android.settings.dashboard.DashboardFeatureProvider;
+import com.android.settings.dashboard.SummaryLoader;
+import com.android.settings.enterprise.EnterprisePrivacyPreferenceController;
+import com.android.settings.enterprise.ManageDeviceAdminPreferenceController;
+import com.android.settings.fingerprint.FingerprintSettings;
+import com.android.settings.location.LocationPreferenceController;
+import com.android.settings.notification.LockScreenNotificationPreferenceController;
+import com.android.settings.overlay.FeatureFactory;
+import com.android.settings.password.ChooseLockGeneric.ChooseLockGenericFragment;
+import com.android.settings.password.ChooseLockSettingsHelper;
+import com.android.settings.password.ManagedLockPasswordProvider;
+import com.android.settings.search.BaseSearchIndexProvider;
+import com.android.settings.search.Indexable;
+import com.android.settings.search.SearchIndexableRaw;
+import com.android.settings.security.screenlock.ScreenLockSettings;
+import com.android.settings.security.trustagent.TrustAgentManager;
+import com.android.settings.security.trustagent.TrustAgentManager.TrustAgentComponentInfo;
+import com.android.settings.widget.GearPreference;
+import com.android.settingslib.RestrictedLockUtils;
+import com.android.settingslib.RestrictedPreference;
+import com.android.settingslib.drawer.CategoryKey;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * Gesture lock pattern settings.
+ */
+public class SecuritySettings extends SettingsPreferenceFragment
+        implements OnPreferenceChangeListener, Indexable,
+        GearPreference.OnGearClickListener {
+
+    private static final String TAG = "SecuritySettings";
+
+    private static final String TRUST_AGENT_CLICK_INTENT = "trust_agent_click_intent";
+
+    // Lock Settings
+    private static final String KEY_UNLOCK_SET_OR_CHANGE = "unlock_set_or_change";
+    private static final String KEY_UNLOCK_SET_OR_CHANGE_PROFILE = "unlock_set_or_change_profile";
+    private static final String KEY_VISIBLE_PATTERN_PROFILE = "visiblepattern_profile";
+    private static final String KEY_SECURITY_CATEGORY = "security_category";
+    @VisibleForTesting
+    static final String KEY_MANAGE_TRUST_AGENTS = "manage_trust_agents";
+    private static final String KEY_UNIFICATION = "unification";
+    @VisibleForTesting
+    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;
+    private static final int SET_OR_CHANGE_LOCK_METHOD_REQUEST_PROFILE = 127;
+    private static final int UNIFY_LOCK_CONFIRM_DEVICE_REQUEST = 128;
+    private static final int UNIFY_LOCK_CONFIRM_PROFILE_REQUEST = 129;
+    private static final int UNUNIFY_LOCK_CONFIRM_DEVICE_REQUEST = 130;
+    private static final String TAG_UNIFICATION_DIALOG = "unification_dialog";
+
+    // Misc Settings
+    private static final String KEY_SIM_LOCK = "sim_lock_settings";
+    private static final String KEY_SHOW_PASSWORD = "show_password";
+    private static final String KEY_TRUST_AGENT = "trust_agent";
+    private static final String KEY_SCREEN_PINNING = "screen_pinning_settings";
+
+    // Security status
+    private static final String KEY_SECURITY_STATUS = "security_status";
+    private static final String SECURITY_STATUS_KEY_PREFIX = "security_status_";
+
+    // Device management settings
+    private static final String KEY_ENTERPRISE_PRIVACY = "enterprise_privacy";
+    private static final String KEY_MANAGE_DEVICE_ADMIN = "manage_device_admin";
+
+    // These switch preferences need special handling since they're not all stored in Settings.
+    private static final String SWITCH_PREFERENCE_KEYS[] = {
+            KEY_SHOW_PASSWORD, KEY_UNIFICATION, KEY_VISIBLE_PATTERN_PROFILE
+    };
+
+    private static final int MY_USER_ID = UserHandle.myUserId();
+
+    private DashboardFeatureProvider mDashboardFeatureProvider;
+    private DevicePolicyManager mDPM;
+    private SecurityFeatureProvider mSecurityFeatureProvider;
+    private TrustAgentManager mTrustAgentManager;
+    private SubscriptionManager mSubscriptionManager;
+    private UserManager mUm;
+
+    private ChooseLockSettingsHelper mChooseLockSettingsHelper;
+    private LockPatternUtils mLockPatternUtils;
+    private ManagedLockPasswordProvider mManagedPasswordProvider;
+
+    private SwitchPreference mVisiblePatternProfile;
+    private SwitchPreference mUnifyProfile;
+
+    private SwitchPreference mShowPassword;
+
+    private boolean mIsAdmin;
+
+    private Intent mTrustAgentClickIntent;
+
+    private int mProfileChallengeUserId;
+
+    private String mCurrentDevicePassword;
+    private String mCurrentProfilePassword;
+
+    private LocationPreferenceController mLocationcontroller;
+    private ManageDeviceAdminPreferenceController mManageDeviceAdminPreferenceController;
+    private EnterprisePrivacyPreferenceController mEnterprisePrivacyPreferenceController;
+    private LockScreenNotificationPreferenceController mLockScreenNotificationPreferenceController;
+
+    @Override
+    public int getMetricsCategory() {
+        return MetricsEvent.SECURITY;
+    }
+
+    @Override
+    public void onAttach(Context context) {
+        super.onAttach(context);
+        mLocationcontroller = new LocationPreferenceController(context, getLifecycle());
+    }
+
+    @Override
+    public void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+
+        final Activity activity = getActivity();
+
+        mSubscriptionManager = SubscriptionManager.from(activity);
+
+        mLockPatternUtils = new LockPatternUtils(activity);
+
+        mManagedPasswordProvider = ManagedLockPasswordProvider.get(activity, MY_USER_ID);
+
+        mDPM = (DevicePolicyManager)getSystemService(Context.DEVICE_POLICY_SERVICE);
+
+        mUm = UserManager.get(activity);
+
+        mChooseLockSettingsHelper = new ChooseLockSettingsHelper(activity);
+
+        mDashboardFeatureProvider = FeatureFactory.getFactory(activity)
+                .getDashboardFeatureProvider(activity);
+
+        mSecurityFeatureProvider = FeatureFactory.getFactory(activity).getSecurityFeatureProvider();
+
+        mTrustAgentManager = mSecurityFeatureProvider.getTrustAgentManager();
+
+        if (savedInstanceState != null
+                && savedInstanceState.containsKey(TRUST_AGENT_CLICK_INTENT)) {
+            mTrustAgentClickIntent = savedInstanceState.getParcelable(TRUST_AGENT_CLICK_INTENT);
+        }
+
+        mManageDeviceAdminPreferenceController
+                = new ManageDeviceAdminPreferenceController(activity);
+        mEnterprisePrivacyPreferenceController
+                = new EnterprisePrivacyPreferenceController(activity);
+        mLockScreenNotificationPreferenceController
+                = new LockScreenNotificationPreferenceController(activity);
+    }
+
+    private static int getResIdForLockUnlockScreen(LockPatternUtils lockPatternUtils,
+            ManagedLockPasswordProvider managedPasswordProvider, int userId) {
+        final boolean isMyUser = userId == MY_USER_ID;
+        int resid = 0;
+        if (!lockPatternUtils.isSecure(userId)) {
+            if (!isMyUser) {
+                resid = R.xml.security_settings_lockscreen_profile;
+            } else if (lockPatternUtils.isLockScreenDisabled(userId)) {
+                resid = R.xml.security_settings_lockscreen;
+            } else {
+                resid = R.xml.security_settings_chooser;
+            }
+        } else {
+            switch (lockPatternUtils.getKeyguardStoredPasswordQuality(userId)) {
+                case DevicePolicyManager.PASSWORD_QUALITY_SOMETHING:
+                    resid = isMyUser ? R.xml.security_settings_pattern
+                            : R.xml.security_settings_pattern_profile;
+                    break;
+                case DevicePolicyManager.PASSWORD_QUALITY_NUMERIC:
+                case DevicePolicyManager.PASSWORD_QUALITY_NUMERIC_COMPLEX:
+                    resid = isMyUser ? R.xml.security_settings_pin
+                            : R.xml.security_settings_pin_profile;
+                    break;
+                case DevicePolicyManager.PASSWORD_QUALITY_ALPHABETIC:
+                case DevicePolicyManager.PASSWORD_QUALITY_ALPHANUMERIC:
+                case DevicePolicyManager.PASSWORD_QUALITY_COMPLEX:
+                    resid = isMyUser ? R.xml.security_settings_password
+                            : R.xml.security_settings_password_profile;
+                    break;
+                case DevicePolicyManager.PASSWORD_QUALITY_MANAGED:
+                    resid = managedPasswordProvider.getResIdForLockUnlockScreen(!isMyUser);
+                    break;
+            }
+        }
+        return resid;
+    }
+
+    /**
+     * Important!
+     *
+     * Don't forget to update the SecuritySearchIndexProvider if you are doing any change in the
+     * logic or adding/removing preferences here.
+     */
+    private PreferenceScreen createPreferenceHierarchy() {
+        PreferenceScreen root = getPreferenceScreen();
+        if (root != null) {
+            root.removeAll();
+        }
+        addPreferencesFromResource(R.xml.security_settings);
+        root = getPreferenceScreen();
+
+        // Add category for security status
+        addPreferencesFromResource(R.xml.security_settings_status);
+
+        // Add options for lock/unlock screen
+        final int resid = getResIdForLockUnlockScreen(mLockPatternUtils,
+                mManagedPasswordProvider, MY_USER_ID);
+        addPreferencesFromResource(resid);
+
+        // DO or PO installed in the user may disallow to change password.
+        disableIfPasswordQualityManaged(KEY_UNLOCK_SET_OR_CHANGE, MY_USER_ID);
+
+        mProfileChallengeUserId = Utils.getManagedProfileId(mUm, MY_USER_ID);
+        if (mProfileChallengeUserId != UserHandle.USER_NULL
+                && mLockPatternUtils.isSeparateProfileChallengeAllowed(mProfileChallengeUserId)) {
+            addPreferencesFromResource(R.xml.security_settings_profile);
+            addPreferencesFromResource(R.xml.security_settings_unification);
+            final int profileResid = getResIdForLockUnlockScreen(mLockPatternUtils,
+                    mManagedPasswordProvider, mProfileChallengeUserId);
+            addPreferencesFromResource(profileResid);
+            maybeAddFingerprintPreference(root, mProfileChallengeUserId);
+            if (!mLockPatternUtils.isSeparateProfileChallengeEnabled(mProfileChallengeUserId)) {
+                final Preference lockPreference =
+                        root.findPreference(KEY_UNLOCK_SET_OR_CHANGE_PROFILE);
+                final String summary = getContext().getString(
+                        R.string.lock_settings_profile_unified_summary);
+                lockPreference.setSummary(summary);
+                lockPreference.setEnabled(false);
+                // PO may disallow to change password for the profile, but screen lock and managed
+                // profile's lock is the same. Disable main "Screen lock" menu.
+                disableIfPasswordQualityManaged(KEY_UNLOCK_SET_OR_CHANGE, mProfileChallengeUserId);
+            } else {
+                // PO may disallow to change profile password, and the profile's password is
+                // separated from screen lock password. Disable profile specific "Screen lock" menu.
+                disableIfPasswordQualityManaged(KEY_UNLOCK_SET_OR_CHANGE_PROFILE,
+                        mProfileChallengeUserId);
+            }
+        }
+
+        Preference unlockSetOrChange = findPreference(KEY_UNLOCK_SET_OR_CHANGE);
+        if (unlockSetOrChange instanceof GearPreference) {
+            ((GearPreference) unlockSetOrChange).setOnGearClickListener(this);
+        }
+
+        mIsAdmin = mUm.isAdminUser();
+
+        // Fingerprint and trust agents
+        int numberOfTrustAgent = 0;
+        PreferenceGroup securityCategory = (PreferenceGroup)
+                root.findPreference(KEY_SECURITY_CATEGORY);
+        if (securityCategory != null) {
+            maybeAddFingerprintPreference(securityCategory, UserHandle.myUserId());
+            numberOfTrustAgent = addTrustAgentSettings(securityCategory);
+            setLockscreenPreferencesSummary(securityCategory);
+        }
+
+        mVisiblePatternProfile =
+                (SwitchPreference) root.findPreference(KEY_VISIBLE_PATTERN_PROFILE);
+        mUnifyProfile = (SwitchPreference) root.findPreference(KEY_UNIFICATION);
+
+        // Append the rest of the settings
+        addPreferencesFromResource(R.xml.security_settings_misc);
+
+        // Do not display SIM lock for devices without an Icc card
+        TelephonyManager tm = TelephonyManager.getDefault();
+        CarrierConfigManager cfgMgr = (CarrierConfigManager)
+                getActivity().getSystemService(Context.CARRIER_CONFIG_SERVICE);
+        PersistableBundle b = cfgMgr.getConfig();
+        if (!mIsAdmin || !isSimIccReady() ||
+                b.getBoolean(CarrierConfigManager.KEY_HIDE_SIM_LOCK_SETTINGS_BOOL)) {
+            root.removePreference(root.findPreference(KEY_SIM_LOCK));
+        } else {
+            // Disable SIM lock if there is no ready SIM card.
+            root.findPreference(KEY_SIM_LOCK).setEnabled(isSimReady());
+        }
+        if (Settings.System.getInt(getContentResolver(),
+                Settings.System.LOCK_TO_APP_ENABLED, 0) != 0) {
+            root.findPreference(KEY_SCREEN_PINNING).setSummary(
+                    getResources().getString(R.string.switch_on_text));
+        }
+
+        // Encryption status of device
+        if (LockPatternUtils.isDeviceEncryptionEnabled()) {
+            root.findPreference(KEY_ENCRYPTION_AND_CREDENTIALS).setSummary(
+                R.string.encryption_and_credential_settings_summary);
+        } else {
+            root.findPreference(KEY_ENCRYPTION_AND_CREDENTIALS).setSummary(
+                R.string.summary_placeholder);
+        }
+
+        // Show password
+        mShowPassword = (SwitchPreference) root.findPreference(KEY_SHOW_PASSWORD);
+
+        // Credential storage
+        final UserManager um = (UserManager) getActivity().getSystemService(Context.USER_SERVICE);
+
+        // Advanced Security features
+        initTrustAgentPreference(root, numberOfTrustAgent);
+
+        PreferenceGroup securityStatusPreferenceGroup =
+                (PreferenceGroup) root.findPreference(KEY_SECURITY_STATUS);
+        final List<Preference> tilePrefs = mDashboardFeatureProvider.getPreferencesForCategory(
+            getActivity(), getPrefContext(), getMetricsCategory(),
+            CategoryKey.CATEGORY_SECURITY);
+        int numSecurityStatusPrefs = 0;
+        if (tilePrefs != null && !tilePrefs.isEmpty()) {
+            for (Preference preference : tilePrefs) {
+                if (!TextUtils.isEmpty(preference.getKey())
+                    && preference.getKey().startsWith(SECURITY_STATUS_KEY_PREFIX)) {
+                    // Injected security status settings are placed under the Security status
+                    // category.
+                    securityStatusPreferenceGroup.addPreference(preference);
+                    numSecurityStatusPrefs++;
+                } else {
+                    // Other injected settings are placed under the Security preference screen.
+                    root.addPreference(preference);
+                }
+            }
+        }
+
+        if (numSecurityStatusPrefs == 0) {
+            root.removePreference(securityStatusPreferenceGroup);
+        } else if (numSecurityStatusPrefs > 0) {
+            // Update preference data with tile data. Security feature provider only updates the
+            // data if it actually needs to be changed.
+            mSecurityFeatureProvider.updatePreferences(getActivity(), root,
+                mDashboardFeatureProvider.getTilesForCategory(
+                    CategoryKey.CATEGORY_SECURITY));
+        }
+
+        for (int i = 0; i < SWITCH_PREFERENCE_KEYS.length; i++) {
+            final Preference pref = findPreference(SWITCH_PREFERENCE_KEYS[i]);
+            if (pref != null) pref.setOnPreferenceChangeListener(this);
+        }
+
+        mLocationcontroller.displayPreference(root);
+        mManageDeviceAdminPreferenceController.updateState(
+                root.findPreference(KEY_MANAGE_DEVICE_ADMIN));
+        mEnterprisePrivacyPreferenceController.displayPreference(root);
+        final Preference enterprisePrivacyPreference = root.findPreference(
+                mEnterprisePrivacyPreferenceController.getPreferenceKey());
+        mEnterprisePrivacyPreferenceController.updateState(enterprisePrivacyPreference);
+
+        return root;
+    }
+
+    @VisibleForTesting
+    void initTrustAgentPreference(PreferenceScreen root, int numberOfTrustAgent) {
+        Preference manageAgents = root.findPreference(KEY_MANAGE_TRUST_AGENTS);
+        if (manageAgents != null) {
+            if (!mLockPatternUtils.isSecure(MY_USER_ID)) {
+                manageAgents.setEnabled(false);
+                manageAgents.setSummary(R.string.disabled_because_no_backup_security);
+            } else if (numberOfTrustAgent > 0) {
+                manageAgents.setSummary(getActivity().getResources().getQuantityString(
+                    R.plurals.manage_trust_agents_summary_on,
+                    numberOfTrustAgent, numberOfTrustAgent));
+            } else {
+                manageAgents.setSummary(R.string.manage_trust_agents_summary);
+            }
+        }
+    }
+
+    @VisibleForTesting
+    void setLockscreenPreferencesSummary(PreferenceGroup group) {
+        final Preference lockscreenPreferences = group.findPreference(KEY_LOCKSCREEN_PREFERENCES);
+        if (lockscreenPreferences != null) {
+            lockscreenPreferences.setSummary(
+                mLockScreenNotificationPreferenceController.getSummaryResource());
+        }
+    }
+
+    /*
+     * Sets the preference as disabled by admin if PASSWORD_QUALITY_MANAGED is set.
+     * The preference must be a RestrictedPreference.
+     */
+    private void disableIfPasswordQualityManaged(String preferenceKey, int userId) {
+        final EnforcedAdmin admin = RestrictedLockUtils.checkIfPasswordQualityIsSet(
+                getActivity(), userId);
+        if (admin != null && mDPM.getPasswordQuality(admin.component, userId) ==
+                DevicePolicyManager.PASSWORD_QUALITY_MANAGED) {
+            final RestrictedPreference pref =
+                    (RestrictedPreference) getPreferenceScreen().findPreference(preferenceKey);
+            pref.setDisabledByAdmin(admin);
+        }
+    }
+
+    private void maybeAddFingerprintPreference(PreferenceGroup securityCategory, int userId) {
+        Preference fingerprintPreference =
+                FingerprintSettings.getFingerprintPreferenceForUser(
+                        securityCategory.getContext(), userId);
+        if (fingerprintPreference != null) {
+            securityCategory.addPreference(fingerprintPreference);
+        }
+    }
+
+    // Return the number of trust agents being added
+    private int addTrustAgentSettings(PreferenceGroup securityCategory) {
+        final boolean hasSecurity = mLockPatternUtils.isSecure(MY_USER_ID);
+        final List<TrustAgentComponentInfo> agents = mTrustAgentManager.getActiveTrustAgents(
+                getActivity(), mLockPatternUtils);
+        for (TrustAgentComponentInfo agent : agents) {
+            final RestrictedPreference trustAgentPreference =
+                    new RestrictedPreference(securityCategory.getContext());
+            trustAgentPreference.setKey(KEY_TRUST_AGENT);
+            trustAgentPreference.setTitle(agent.title);
+            trustAgentPreference.setSummary(agent.summary);
+            // Create intent for this preference.
+            Intent intent = new Intent();
+            intent.setComponent(agent.componentName);
+            intent.setAction(Intent.ACTION_MAIN);
+            trustAgentPreference.setIntent(intent);
+            // Add preference to the settings menu.
+            securityCategory.addPreference(trustAgentPreference);
+
+            trustAgentPreference.setDisabledByAdmin(agent.admin);
+            if (!trustAgentPreference.isDisabledByAdmin() && !hasSecurity) {
+                trustAgentPreference.setEnabled(false);
+                trustAgentPreference.setSummary(R.string.disabled_because_no_backup_security);
+            }
+        }
+        return agents.size();
+    }
+
+    /* Return true if a there is a Slot that has Icc.
+     */
+    private boolean isSimIccReady() {
+        TelephonyManager tm = TelephonyManager.getDefault();
+        final List<SubscriptionInfo> subInfoList =
+                mSubscriptionManager.getActiveSubscriptionInfoList();
+
+        if (subInfoList != null) {
+            for (SubscriptionInfo subInfo : subInfoList) {
+                if (tm.hasIccCard(subInfo.getSimSlotIndex())) {
+                    return true;
+                }
+            }
+        }
+
+        return false;
+    }
+
+    /* Return true if a SIM is ready for locking.
+     * TODO: consider adding to TelephonyManager or SubscritpionManasger.
+     */
+    private boolean isSimReady() {
+        int simState = TelephonyManager.SIM_STATE_UNKNOWN;
+        final List<SubscriptionInfo> subInfoList =
+                mSubscriptionManager.getActiveSubscriptionInfoList();
+        if (subInfoList != null) {
+            for (SubscriptionInfo subInfo : subInfoList) {
+                simState = TelephonyManager.getDefault().getSimState(subInfo.getSimSlotIndex());
+                if((simState != TelephonyManager.SIM_STATE_ABSENT) &&
+                            (simState != TelephonyManager.SIM_STATE_UNKNOWN)){
+                    return true;
+                }
+            }
+        }
+        return false;
+    }
+
+    @Override
+    public void onGearClick(GearPreference p) {
+        if (KEY_UNLOCK_SET_OR_CHANGE.equals(p.getKey())) {
+            startFragment(this, ScreenLockSettings.class.getName(), 0, 0, null);
+        }
+    }
+
+    @Override
+    public void onSaveInstanceState(Bundle outState) {
+        super.onSaveInstanceState(outState);
+        if (mTrustAgentClickIntent != null) {
+            outState.putParcelable(TRUST_AGENT_CLICK_INTENT, mTrustAgentClickIntent);
+        }
+    }
+
+    @Override
+    public void onResume() {
+        super.onResume();
+
+        // Make sure we reload the preference hierarchy since some of these settings
+        // depend on others...
+        createPreferenceHierarchy();
+
+        if (mVisiblePatternProfile != null) {
+            mVisiblePatternProfile.setChecked(mLockPatternUtils.isVisiblePatternEnabled(
+                    mProfileChallengeUserId));
+        }
+
+        updateUnificationPreference();
+
+        if (mShowPassword != null) {
+            mShowPassword.setChecked(Settings.System.getInt(getContentResolver(),
+                    Settings.System.TEXT_SHOW_PASSWORD, 1) != 0);
+        }
+
+        mLocationcontroller.updateSummary();
+    }
+
+    private void updateUnificationPreference() {
+        if (mUnifyProfile != null) {
+            mUnifyProfile.setChecked(!mLockPatternUtils.isSeparateProfileChallengeEnabled(
+                    mProfileChallengeUserId));
+        }
+    }
+
+    @Override
+    public boolean onPreferenceTreeClick(Preference preference) {
+        final String key = preference.getKey();
+        if (KEY_UNLOCK_SET_OR_CHANGE.equals(key)) {
+            // TODO(b/35930129): Remove once existing password can be passed into vold directly.
+            // Currently we need this logic to ensure that the QUIET_MODE is off for any work
+            // profile with unified challenge on FBE-enabled devices. Otherwise, vold would not be
+            // able to complete the operation due to the lack of (old) encryption key.
+            if (mProfileChallengeUserId != UserHandle.USER_NULL
+                    && !mLockPatternUtils.isSeparateProfileChallengeEnabled(mProfileChallengeUserId)
+                    && StorageManager.isFileEncryptedNativeOnly()) {
+                if (Utils.startQuietModeDialogIfNecessary(this.getActivity(), mUm,
+                        mProfileChallengeUserId)) {
+                    return false;
+                }
+            }
+            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,
+                    mProfileChallengeUserId)) {
+                return false;
+            }
+            Bundle extras = new Bundle();
+            extras.putInt(Intent.EXTRA_USER_ID, mProfileChallengeUserId);
+            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)) {
+            ChooseLockSettingsHelper helper =
+                    new ChooseLockSettingsHelper(this.getActivity(), this);
+            mTrustAgentClickIntent = preference.getIntent();
+            boolean confirmationLaunched = helper.launchConfirmationActivity(
+                    CHANGE_TRUST_AGENT_SETTINGS, preference.getTitle());
+            if (!confirmationLaunched&&  mTrustAgentClickIntent != null) {
+                // If this returns false, it means no password confirmation is required.
+                startActivity(mTrustAgentClickIntent);
+                mTrustAgentClickIntent = null;
+            }
+        } else {
+            // If we didn't handle it, let preferences handle it.
+            return super.onPreferenceTreeClick(preference);
+        }
+        return true;
+    }
+
+    /**
+     * see confirmPatternThenDisableAndClear
+     */
+    @Override
+    public void onActivityResult(int requestCode, int resultCode, Intent data) {
+        super.onActivityResult(requestCode, resultCode, data);
+        if (requestCode == CHANGE_TRUST_AGENT_SETTINGS && resultCode == Activity.RESULT_OK) {
+            if (mTrustAgentClickIntent != null) {
+                startActivity(mTrustAgentClickIntent);
+                mTrustAgentClickIntent = null;
+            }
+            return;
+        } else if (requestCode == UNIFY_LOCK_CONFIRM_DEVICE_REQUEST
+                && resultCode == Activity.RESULT_OK) {
+            mCurrentDevicePassword =
+                    data.getStringExtra(ChooseLockSettingsHelper.EXTRA_KEY_PASSWORD);
+            launchConfirmProfileLockForUnification();
+            return;
+        } else if (requestCode == UNIFY_LOCK_CONFIRM_PROFILE_REQUEST
+                && resultCode == Activity.RESULT_OK) {
+            mCurrentProfilePassword =
+                    data.getStringExtra(ChooseLockSettingsHelper.EXTRA_KEY_PASSWORD);
+            unifyLocks();
+            return;
+        } else if (requestCode == UNUNIFY_LOCK_CONFIRM_DEVICE_REQUEST
+                && resultCode == Activity.RESULT_OK) {
+            ununifyLocks();
+            return;
+        }
+        createPreferenceHierarchy();
+    }
+
+    private void launchConfirmDeviceLockForUnification() {
+        final String title = getActivity().getString(
+                R.string.unlock_set_unlock_launch_picker_title);
+        final ChooseLockSettingsHelper helper =
+                new ChooseLockSettingsHelper(getActivity(), this);
+        if (!helper.launchConfirmationActivity(
+                UNIFY_LOCK_CONFIRM_DEVICE_REQUEST, title, true, MY_USER_ID)) {
+            launchConfirmProfileLockForUnification();
+        }
+    }
+
+    private void launchConfirmProfileLockForUnification() {
+        final String title = getActivity().getString(
+                R.string.unlock_set_unlock_launch_picker_title_profile);
+        final ChooseLockSettingsHelper helper =
+                new ChooseLockSettingsHelper(getActivity(), this);
+        if (!helper.launchConfirmationActivity(
+                UNIFY_LOCK_CONFIRM_PROFILE_REQUEST, title, true, mProfileChallengeUserId)) {
+            unifyLocks();
+            createPreferenceHierarchy();
+        }
+    }
+
+    private void unifyLocks() {
+        int profileQuality =
+                mLockPatternUtils.getKeyguardStoredPasswordQuality(mProfileChallengeUserId);
+        if (profileQuality == DevicePolicyManager.PASSWORD_QUALITY_SOMETHING) {
+            mLockPatternUtils.saveLockPattern(
+                    LockPatternUtils.stringToPattern(mCurrentProfilePassword),
+                    mCurrentDevicePassword, MY_USER_ID);
+        } else {
+            mLockPatternUtils.saveLockPassword(
+                    mCurrentProfilePassword, mCurrentDevicePassword,
+                    profileQuality, MY_USER_ID);
+        }
+        mLockPatternUtils.setSeparateProfileChallengeEnabled(mProfileChallengeUserId, false,
+                mCurrentProfilePassword);
+        final boolean profilePatternVisibility =
+                mLockPatternUtils.isVisiblePatternEnabled(mProfileChallengeUserId);
+        mLockPatternUtils.setVisiblePatternEnabled(profilePatternVisibility, MY_USER_ID);
+        mCurrentDevicePassword = null;
+        mCurrentProfilePassword = null;
+    }
+
+    private void unifyUncompliantLocks() {
+        mLockPatternUtils.setSeparateProfileChallengeEnabled(mProfileChallengeUserId, false,
+                mCurrentProfilePassword);
+        startFragment(this, ChooseLockGenericFragment.class.getName(),
+                R.string.lock_settings_picker_title, SET_OR_CHANGE_LOCK_METHOD_REQUEST, null);
+    }
+
+    private void ununifyLocks() {
+        Bundle extras = new Bundle();
+        extras.putInt(Intent.EXTRA_USER_ID, mProfileChallengeUserId);
+        startFragment(this,
+                ChooseLockGenericFragment.class.getName(),
+                R.string.lock_settings_picker_title_profile,
+                SET_OR_CHANGE_LOCK_METHOD_REQUEST_PROFILE, extras);
+    }
+
+    @Override
+    public boolean onPreferenceChange(Preference preference, Object value) {
+        boolean result = true;
+        final String key = preference.getKey();
+        final LockPatternUtils lockPatternUtils = mChooseLockSettingsHelper.utils();
+        if (KEY_VISIBLE_PATTERN_PROFILE.equals(key)) {
+            if (Utils.startQuietModeDialogIfNecessary(this.getActivity(), mUm,
+                    mProfileChallengeUserId)) {
+                return false;
+            }
+            lockPatternUtils.setVisiblePatternEnabled((Boolean) value, mProfileChallengeUserId);
+        } else if (KEY_UNIFICATION.equals(key)) {
+            if (Utils.startQuietModeDialogIfNecessary(this.getActivity(), mUm,
+                    mProfileChallengeUserId)) {
+                return false;
+            }
+            if ((Boolean) value) {
+                final boolean compliantForDevice =
+                        (mLockPatternUtils.getKeyguardStoredPasswordQuality(mProfileChallengeUserId)
+                                >= DevicePolicyManager.PASSWORD_QUALITY_SOMETHING
+                        && mLockPatternUtils.isSeparateProfileChallengeAllowedToUnify(
+                                mProfileChallengeUserId));
+                UnificationConfirmationDialog dialog =
+                        UnificationConfirmationDialog.newIntance(compliantForDevice);
+                dialog.show(getChildFragmentManager(), TAG_UNIFICATION_DIALOG);
+            } else {
+                final String title = getActivity().getString(
+                        R.string.unlock_set_unlock_launch_picker_title);
+                final ChooseLockSettingsHelper helper =
+                        new ChooseLockSettingsHelper(getActivity(), this);
+                if(!helper.launchConfirmationActivity(
+                        UNUNIFY_LOCK_CONFIRM_DEVICE_REQUEST, title, true, MY_USER_ID)) {
+                    ununifyLocks();
+                }
+            }
+        } else if (KEY_SHOW_PASSWORD.equals(key)) {
+            Settings.System.putInt(getContentResolver(), Settings.System.TEXT_SHOW_PASSWORD,
+                    ((Boolean) value) ? 1 : 0);
+            lockPatternUtils.setVisiblePasswordEnabled((Boolean) value, MY_USER_ID);
+        }
+        return result;
+    }
+
+    @Override
+    public int getHelpResource() {
+        return R.string.help_url_security;
+    }
+
+    /**
+     * For Search. Please keep it in sync when updating "createPreferenceHierarchy()"
+     */
+    public static final SearchIndexProvider SEARCH_INDEX_DATA_PROVIDER =
+            new SecuritySearchIndexProvider();
+
+    private static class SecuritySearchIndexProvider extends BaseSearchIndexProvider {
+
+        // TODO (b/68001777) Refactor indexing to include all XML and block other settings.
+
+        @Override
+        public List<SearchIndexableResource> getXmlResourcesToIndex(
+                Context context, boolean enabled) {
+            final List<SearchIndexableResource> index = new ArrayList<>();
+
+            final LockPatternUtils lockPatternUtils = new LockPatternUtils(context);
+            final ManagedLockPasswordProvider managedPasswordProvider =
+                    ManagedLockPasswordProvider.get(context, MY_USER_ID);
+            final DevicePolicyManager dpm = (DevicePolicyManager)
+                    context.getSystemService(Context.DEVICE_POLICY_SERVICE);
+            final UserManager um = UserManager.get(context);
+            final int profileUserId = Utils.getManagedProfileId(um, MY_USER_ID);
+
+            // To add option for unlock screen, user's password must not be managed and
+            // must not be unified with managed profile, whose password is managed.
+            if (!isPasswordManaged(MY_USER_ID, context, dpm)
+                    && (profileUserId == UserHandle.USER_NULL
+                            || lockPatternUtils.isSeparateProfileChallengeAllowed(profileUserId)
+                            || !isPasswordManaged(profileUserId, context, dpm))) {
+                // Add options for lock/unlock screen
+                final int resId = getResIdForLockUnlockScreen(lockPatternUtils,
+                        managedPasswordProvider, MY_USER_ID);
+                index.add(getSearchResource(context, resId));
+            }
+
+            if (profileUserId != UserHandle.USER_NULL
+                    && lockPatternUtils.isSeparateProfileChallengeAllowed(profileUserId)
+                    && !isPasswordManaged(profileUserId, context, dpm)) {
+                index.add(getSearchResource(context, getResIdForLockUnlockScreen(
+                        lockPatternUtils, managedPasswordProvider, profileUserId)));
+            }
+
+            // Append the rest of the settings
+            index.add(getSearchResource(context, R.xml.security_settings_misc));
+
+            return index;
+        }
+
+        private SearchIndexableResource getSearchResource(Context context, int xmlResId) {
+            final SearchIndexableResource sir = new SearchIndexableResource(context);
+            sir.xmlResId = xmlResId;
+            return sir;
+        }
+
+        private boolean isPasswordManaged(int userId, Context context, DevicePolicyManager dpm) {
+            final EnforcedAdmin admin = RestrictedLockUtils.checkIfPasswordQualityIsSet(
+                    context, userId);
+            return admin != null && dpm.getPasswordQuality(admin.component, userId) ==
+                    DevicePolicyManager.PASSWORD_QUALITY_MANAGED;
+        }
+
+        @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.security_settings_title);
+
+            SearchIndexableRaw data = new SearchIndexableRaw(context);
+            data.title = screenTitle;
+            data.key = "security_settings_screen";
+            data.screenTitle = screenTitle;
+            result.add(data);
+
+            final UserManager um = UserManager.get(context);
+
+            // Fingerprint
+            final FingerprintManager fpm = Utils.getFingerprintManagerOrNull(context);
+            if (fpm != null && fpm.isHardwareDetected()) {
+                // This catches the title which can be overloaded in an overlay
+                data = new SearchIndexableRaw(context);
+                data.title = res.getString(R.string.security_settings_fingerprint_preference_title);
+                data.key = "security_fingerprint";
+                data.screenTitle = screenTitle;
+                result.add(data);
+                // Fallback for when the above doesn't contain "fingerprint"
+                data = new SearchIndexableRaw(context);
+                data.title = res.getString(R.string.fingerprint_manage_category_title);
+                data.key = "security_managed_fingerprint";
+                data.screenTitle = screenTitle;
+                result.add(data);
+            }
+
+            final LockPatternUtils lockPatternUtils = new LockPatternUtils(context);
+            final int profileUserId = Utils.getManagedProfileId(um, MY_USER_ID);
+            if (profileUserId != UserHandle.USER_NULL
+                    && lockPatternUtils.isSeparateProfileChallengeAllowed(profileUserId)) {
+                if (lockPatternUtils.getKeyguardStoredPasswordQuality(profileUserId)
+                        >= DevicePolicyManager.PASSWORD_QUALITY_SOMETHING
+                        && lockPatternUtils.isSeparateProfileChallengeAllowedToUnify(
+                                profileUserId)) {
+                    data = new SearchIndexableRaw(context);
+                    data.title = res.getString(R.string.lock_settings_profile_unification_title);
+                    data.key = "security_use_one_lock";
+                    data.screenTitle = screenTitle;
+                    result.add(data);
+                }
+            }
+            return result;
+        }
+
+        @Override
+        public List<String> getNonIndexableKeys(Context context) {
+            final List<String> keys = super.getNonIndexableKeys(context);
+
+            LockPatternUtils lockPatternUtils = new LockPatternUtils(context);
+
+            // Do not display SIM lock for devices without an Icc card
+            final UserManager um = UserManager.get(context);
+            final TelephonyManager tm = TelephonyManager.from(context);
+            if (!um.isAdminUser() || !tm.hasIccCard()) {
+                keys.add(KEY_SIM_LOCK);
+            }
+
+            // TrustAgent settings disappear when the user has no primary security.
+            if (!lockPatternUtils.isSecure(MY_USER_ID)) {
+                keys.add(KEY_TRUST_AGENT);
+                keys.add(KEY_MANAGE_TRUST_AGENTS);
+            }
+
+            if (!(new EnterprisePrivacyPreferenceController(context))
+                    .isAvailable()) {
+                keys.add(KEY_ENTERPRISE_PRIVACY);
+            }
+
+            // Duplicate in special app access
+            keys.add(KEY_MANAGE_DEVICE_ADMIN);
+            // Duplicates between parent-child
+            keys.add(KEY_LOCATION);
+            keys.add(KEY_ENCRYPTION_AND_CREDENTIALS);
+            keys.add(KEY_SCREEN_PINNING);
+            keys.add(KEY_LOCATION_SCANNING);
+
+            return keys;
+        }
+    }
+
+    public static class UnificationConfirmationDialog extends InstrumentedDialogFragment {
+        private static final String EXTRA_COMPLIANT = "compliant";
+
+        public static UnificationConfirmationDialog newIntance(boolean compliant) {
+            UnificationConfirmationDialog dialog = new UnificationConfirmationDialog();
+            Bundle args = new Bundle();
+            args.putBoolean(EXTRA_COMPLIANT, compliant);
+            dialog.setArguments(args);
+            return dialog;
+        }
+
+        @Override
+        public void show(FragmentManager manager, String tag) {
+            if (manager.findFragmentByTag(tag) == null) {
+                // Prevent opening multiple dialogs if tapped on button quickly
+                super.show(manager, tag);
+            }
+        }
+
+        @Override
+        public Dialog onCreateDialog(Bundle savedInstanceState) {
+            final SecuritySettings parentFragment = ((SecuritySettings) getParentFragment());
+            final boolean compliant = getArguments().getBoolean(EXTRA_COMPLIANT);
+            return new AlertDialog.Builder(getActivity())
+                    .setTitle(R.string.lock_settings_profile_unification_dialog_title)
+                    .setMessage(compliant ? R.string.lock_settings_profile_unification_dialog_body
+                            : R.string.lock_settings_profile_unification_dialog_uncompliant_body)
+                    .setPositiveButton(
+                            compliant ? R.string.lock_settings_profile_unification_dialog_confirm
+                            : R.string.lock_settings_profile_unification_dialog_uncompliant_confirm,
+                            new DialogInterface.OnClickListener() {
+                                @Override
+                                public void onClick(DialogInterface dialog, int whichButton) {
+                                    if (compliant) {
+                                        parentFragment.launchConfirmDeviceLockForUnification();
+                                    }    else {
+                                        parentFragment.unifyUncompliantLocks();
+                                    }
+                                }
+                            }
+                    )
+                    .setNegativeButton(R.string.cancel, null)
+                    .create();
+        }
+
+        @Override
+        public void onDismiss(DialogInterface dialog) {
+            super.onDismiss(dialog);
+            ((SecuritySettings) getParentFragment()).updateUnificationPreference();
+        }
+
+        @Override
+        public int getMetricsCategory() {
+            return MetricsEvent.DIALOG_UNIFICATION_CONFIRMATION;
+        }
+    }
+
+    static class SummaryProvider implements SummaryLoader.SummaryProvider {
+
+        private final Context mContext;
+        private final SummaryLoader mSummaryLoader;
+
+        public SummaryProvider(Context context, SummaryLoader summaryLoader) {
+            mContext = context;
+            mSummaryLoader = summaryLoader;
+        }
+
+        @Override
+        public void setListening(boolean listening) {
+            if (listening) {
+                final FingerprintManager fpm =
+                    Utils.getFingerprintManagerOrNull(mContext);
+                if (fpm != null && fpm.isHardwareDetected()) {
+                    mSummaryLoader.setSummary(this,
+                        mContext.getString(R.string.security_dashboard_summary));
+                } else {
+                    mSummaryLoader.setSummary(this, mContext.getString(
+                        R.string.security_dashboard_summary_no_fingerprint));
+                }
+            }
+        }
+    }
+
+    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);
+        }
+    };
+
+}
diff --git a/src/com/android/settings/security/UserCredentialsPreferenceController.java b/src/com/android/settings/security/UserCredentialsPreferenceController.java
new file mode 100644
index 0000000..48503f8
--- /dev/null
+++ b/src/com/android/settings/security/UserCredentialsPreferenceController.java
@@ -0,0 +1,35 @@
+/*
+ * Copyright (C) 2017 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF 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.Context;
+import android.os.UserManager;
+
+public class UserCredentialsPreferenceController extends
+        RestrictedEncryptionPreferenceController {
+
+    private static final String KEY_USER_CREDENTIALS = "user_credentials";
+
+    public UserCredentialsPreferenceController(Context context) {
+        super(context, UserManager.DISALLOW_CONFIG_CREDENTIALS);
+    }
+
+    @Override
+    public String getPreferenceKey() {
+        return KEY_USER_CREDENTIALS;
+    }
+}
diff --git a/src/com/android/settings/security/screenlock/LockAfterTimeoutPreferenceController.java b/src/com/android/settings/security/screenlock/LockAfterTimeoutPreferenceController.java
new file mode 100644
index 0000000..3cbde58
--- /dev/null
+++ b/src/com/android/settings/security/screenlock/LockAfterTimeoutPreferenceController.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.security.screenlock;
+
+import static android.provider.Settings.System.SCREEN_OFF_TIMEOUT;
+
+import android.app.admin.DevicePolicyManager;
+import android.content.Context;
+import android.os.UserHandle;
+import android.provider.Settings;
+import android.support.v7.preference.Preference;
+import android.text.TextUtils;
+import android.util.Log;
+
+import com.android.internal.widget.LockPatternUtils;
+import com.android.settings.R;
+import com.android.settings.TimeoutListPreference;
+import com.android.settings.core.PreferenceControllerMixin;
+import com.android.settings.overlay.FeatureFactory;
+import com.android.settings.security.trustagent.TrustAgentManager;
+import com.android.settingslib.RestrictedLockUtils;
+import com.android.settingslib.core.AbstractPreferenceController;
+
+public class LockAfterTimeoutPreferenceController extends AbstractPreferenceController
+        implements PreferenceControllerMixin, Preference.OnPreferenceChangeListener {
+
+    private static final String KEY_LOCK_AFTER_TIMEOUT = "lock_after_timeout";
+
+    private final int mUserId;
+    private final LockPatternUtils mLockPatternUtils;
+    private final TrustAgentManager mTrustAgentManager;
+    private final DevicePolicyManager mDPM;
+
+    public LockAfterTimeoutPreferenceController(Context context, int userId,
+            LockPatternUtils lockPatternUtils) {
+        super(context);
+        mUserId = userId;
+        mLockPatternUtils = lockPatternUtils;
+        mDPM = context.getSystemService(DevicePolicyManager.class);
+        mTrustAgentManager = FeatureFactory.getFactory(context)
+                .getSecurityFeatureProvider().getTrustAgentManager();
+    }
+
+    @Override
+    public boolean isAvailable() {
+        if (!mLockPatternUtils.isSecure(mUserId)) {
+            return false;
+        }
+        switch (mLockPatternUtils.getKeyguardStoredPasswordQuality(mUserId)) {
+            case DevicePolicyManager.PASSWORD_QUALITY_SOMETHING:
+            case DevicePolicyManager.PASSWORD_QUALITY_NUMERIC:
+            case DevicePolicyManager.PASSWORD_QUALITY_NUMERIC_COMPLEX:
+            case DevicePolicyManager.PASSWORD_QUALITY_ALPHABETIC:
+            case DevicePolicyManager.PASSWORD_QUALITY_ALPHANUMERIC:
+            case DevicePolicyManager.PASSWORD_QUALITY_COMPLEX:
+            case DevicePolicyManager.PASSWORD_QUALITY_MANAGED:
+                return true;
+            default:
+                return false;
+        }
+    }
+
+    @Override
+    public String getPreferenceKey() {
+        return KEY_LOCK_AFTER_TIMEOUT;
+    }
+
+    @Override
+    public void updateState(Preference preference) {
+        setupLockAfterPreference((TimeoutListPreference) preference);
+        updateLockAfterPreferenceSummary((TimeoutListPreference) preference);
+    }
+
+    @Override
+    public boolean onPreferenceChange(Preference preference, Object newValue) {
+        try {
+            final int timeout = Integer.parseInt((String) newValue);
+            Settings.Secure.putInt(mContext.getContentResolver(),
+                    Settings.Secure.LOCK_SCREEN_LOCK_AFTER_TIMEOUT, timeout);
+            updateState(preference);
+        } catch (NumberFormatException e) {
+            Log.e(TAG, "could not persist lockAfter timeout setting", e);
+        }
+        return true;
+    }
+
+    private void setupLockAfterPreference(TimeoutListPreference preference) {
+        // Compatible with pre-Froyo
+        long currentTimeout = Settings.Secure.getLong(mContext.getContentResolver(),
+                Settings.Secure.LOCK_SCREEN_LOCK_AFTER_TIMEOUT, 5000);
+        preference.setValue(String.valueOf(currentTimeout));
+        if (mDPM != null) {
+            final RestrictedLockUtils.EnforcedAdmin admin =
+                    RestrictedLockUtils.checkIfMaximumTimeToLockIsSet(mContext);
+            final long adminTimeout = mDPM
+                    .getMaximumTimeToLockForUserAndProfiles(UserHandle.myUserId());
+            final long displayTimeout = Math.max(0,
+                    Settings.System.getInt(mContext.getContentResolver(), SCREEN_OFF_TIMEOUT, 0));
+            // This setting is a slave to display timeout when a device policy is enforced.
+            // As such, maxLockTimeout = adminTimeout - displayTimeout.
+            // If there isn't enough time, shows "immediately" setting.
+            final long maxTimeout = Math.max(0, adminTimeout - displayTimeout);
+            preference.removeUnusableTimeouts(maxTimeout, admin);
+        }
+    }
+
+    private void updateLockAfterPreferenceSummary(TimeoutListPreference preference) {
+        final CharSequence summary;
+        if (preference.isDisabledByAdmin()) {
+            summary = mContext.getText(R.string.disabled_by_policy_title);
+        } else {
+            // Update summary message with current value
+            long currentTimeout = Settings.Secure.getLong(mContext.getContentResolver(),
+                    Settings.Secure.LOCK_SCREEN_LOCK_AFTER_TIMEOUT, 5000);
+            final CharSequence[] entries = preference.getEntries();
+            final CharSequence[] values = preference.getEntryValues();
+            int best = 0;
+            for (int i = 0; i < values.length; i++) {
+                long timeout = Long.valueOf(values[i].toString());
+                if (currentTimeout >= timeout) {
+                    best = i;
+                }
+            }
+
+            final CharSequence trustAgentLabel = mTrustAgentManager
+                    .getActiveTrustAgentLabel(mContext, mLockPatternUtils);
+            if (!TextUtils.isEmpty(trustAgentLabel)) {
+                if (Long.valueOf(values[best].toString()) == 0) {
+                    summary = mContext.getString(R.string.lock_immediately_summary_with_exception,
+                            trustAgentLabel);
+                } else {
+                    summary = mContext.getString(R.string.lock_after_timeout_summary_with_exception,
+                            entries[best], trustAgentLabel);
+                }
+            } else {
+                summary = mContext.getString(R.string.lock_after_timeout_summary, entries[best]);
+            }
+        }
+        preference.setSummary(summary);
+    }
+}
diff --git a/src/com/android/settings/security/screenlock/PatternVisiblePreferenceController.java b/src/com/android/settings/security/screenlock/PatternVisiblePreferenceController.java
new file mode 100644
index 0000000..beddd4b
--- /dev/null
+++ b/src/com/android/settings/security/screenlock/PatternVisiblePreferenceController.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.security.screenlock;
+
+import android.app.admin.DevicePolicyManager;
+import android.content.Context;
+import android.support.v7.preference.Preference;
+import android.support.v7.preference.TwoStatePreference;
+
+import com.android.internal.widget.LockPatternUtils;
+import com.android.settings.core.PreferenceControllerMixin;
+import com.android.settingslib.core.AbstractPreferenceController;
+
+public class PatternVisiblePreferenceController extends AbstractPreferenceController
+        implements PreferenceControllerMixin, Preference.OnPreferenceChangeListener {
+
+    private static final String PREF_KEY = "visiblepattern";
+
+    private final int mUserId;
+    private final LockPatternUtils mLockPatternUtils;
+
+    public PatternVisiblePreferenceController(Context context, int userId,
+            LockPatternUtils lockPatternUtils) {
+        super(context);
+        mUserId = userId;
+        mLockPatternUtils = lockPatternUtils;
+    }
+
+    @Override
+    public boolean isAvailable() {
+        return isPatternLock();
+    }
+
+    @Override
+    public String getPreferenceKey() {
+        return PREF_KEY;
+    }
+
+    @Override
+    public void updateState(Preference preference) {
+        ((TwoStatePreference) preference).setChecked(
+                mLockPatternUtils.isVisiblePatternEnabled(mUserId));
+    }
+
+    private boolean isPatternLock() {
+        return mLockPatternUtils.isSecure(mUserId)
+                && mLockPatternUtils.getKeyguardStoredPasswordQuality(mUserId)
+                == DevicePolicyManager.PASSWORD_QUALITY_SOMETHING;
+    }
+
+    @Override
+    public boolean onPreferenceChange(Preference preference, Object newValue) {
+        mLockPatternUtils.setVisiblePatternEnabled((Boolean) newValue, mUserId);
+        return true;
+    }
+}
diff --git a/src/com/android/settings/security/screenlock/PowerButtonInstantLockPreferenceController.java b/src/com/android/settings/security/screenlock/PowerButtonInstantLockPreferenceController.java
new file mode 100644
index 0000000..1a32a0e
--- /dev/null
+++ b/src/com/android/settings/security/screenlock/PowerButtonInstantLockPreferenceController.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.security.screenlock;
+
+import android.app.admin.DevicePolicyManager;
+import android.content.Context;
+import android.support.v7.preference.Preference;
+import android.support.v7.preference.TwoStatePreference;
+import android.text.TextUtils;
+
+import com.android.internal.widget.LockPatternUtils;
+import com.android.settings.R;
+import com.android.settings.core.PreferenceControllerMixin;
+import com.android.settings.overlay.FeatureFactory;
+import com.android.settings.security.trustagent.TrustAgentManager;
+import com.android.settingslib.core.AbstractPreferenceController;
+
+public class PowerButtonInstantLockPreferenceController extends AbstractPreferenceController
+        implements PreferenceControllerMixin, Preference.OnPreferenceChangeListener {
+
+    private static final String KEY_POWER_INSTANTLY_LOCKS = "power_button_instantly_locks";
+
+    private final int mUserId;
+    private final LockPatternUtils mLockPatternUtils;
+    private final TrustAgentManager mTrustAgentManager;
+
+    public PowerButtonInstantLockPreferenceController(Context context, int userId,
+            LockPatternUtils lockPatternUtils) {
+        super(context);
+        mUserId = userId;
+        mLockPatternUtils = lockPatternUtils;
+        mTrustAgentManager = FeatureFactory.getFactory(context)
+                .getSecurityFeatureProvider().getTrustAgentManager();
+    }
+
+    @Override
+    public boolean isAvailable() {
+        if (!mLockPatternUtils.isSecure(mUserId)) {
+            return false;
+        }
+        switch (mLockPatternUtils.getKeyguardStoredPasswordQuality(mUserId)) {
+            case DevicePolicyManager.PASSWORD_QUALITY_SOMETHING:
+            case DevicePolicyManager.PASSWORD_QUALITY_NUMERIC:
+            case DevicePolicyManager.PASSWORD_QUALITY_NUMERIC_COMPLEX:
+            case DevicePolicyManager.PASSWORD_QUALITY_ALPHABETIC:
+            case DevicePolicyManager.PASSWORD_QUALITY_ALPHANUMERIC:
+            case DevicePolicyManager.PASSWORD_QUALITY_COMPLEX:
+            case DevicePolicyManager.PASSWORD_QUALITY_MANAGED:
+                return true;
+            default:
+                return false;
+        }
+    }
+
+    @Override
+    public void updateState(Preference preference) {
+        ((TwoStatePreference) preference).setChecked(
+                mLockPatternUtils.getPowerButtonInstantlyLocks(mUserId));
+        final CharSequence trustAgentLabel = mTrustAgentManager.getActiveTrustAgentLabel(
+                mContext, mLockPatternUtils);
+        if (!TextUtils.isEmpty(trustAgentLabel)) {
+            preference.setSummary(mContext.getString(
+                    R.string.lockpattern_settings_power_button_instantly_locks_summary,
+                    trustAgentLabel));
+        } else {
+            preference.setSummary(R.string.summary_placeholder);
+        }
+    }
+
+    @Override
+    public String getPreferenceKey() {
+        return KEY_POWER_INSTANTLY_LOCKS;
+    }
+
+    @Override
+    public boolean onPreferenceChange(Preference preference, Object newValue) {
+        mLockPatternUtils.setPowerButtonInstantlyLocks((Boolean) newValue, mUserId);
+        return true;
+    }
+}
diff --git a/src/com/android/settings/security/screenlock/ScreenLockSettings.java b/src/com/android/settings/security/screenlock/ScreenLockSettings.java
new file mode 100644
index 0000000..029a556
--- /dev/null
+++ b/src/com/android/settings/security/screenlock/ScreenLockSettings.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.security.screenlock;
+
+import android.app.Fragment;
+import android.content.Context;
+import android.os.UserHandle;
+import android.provider.SearchIndexableResource;
+
+import com.android.internal.logging.nano.MetricsProto;
+import com.android.internal.widget.LockPatternUtils;
+import com.android.settings.R;
+import com.android.settings.dashboard.DashboardFragment;
+import com.android.settings.search.BaseSearchIndexProvider;
+import com.android.settings.search.Indexable;
+import com.android.settings.security.OwnerInfoPreferenceController;
+import com.android.settingslib.core.AbstractPreferenceController;
+import com.android.settingslib.core.lifecycle.Lifecycle;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class ScreenLockSettings extends DashboardFragment
+        implements OwnerInfoPreferenceController.OwnerInfoCallback {
+
+    private static final String TAG = "ScreenLockSettings";
+
+    private static final String KEY_LOCK_SCREEN_TITLE = "security_settings_password_sub_screen";
+
+    private static final int MY_USER_ID = UserHandle.myUserId();
+    private LockPatternUtils mLockPatternUtils;
+
+    @Override
+    public int getMetricsCategory() {
+        return MetricsProto.MetricsEvent.SECURITY;
+    }
+
+    @Override
+    protected int getPreferenceScreenResId() {
+        return R.xml.screen_lock_settings;
+    }
+
+    @Override
+    protected String getLogTag() {
+        return TAG;
+    }
+
+    @Override
+    protected List<AbstractPreferenceController> getPreferenceControllers(Context context) {
+        mLockPatternUtils = new LockPatternUtils(context);
+        return buildPreferenceControllers(context, this /* parent */, getLifecycle(),
+                mLockPatternUtils);
+    }
+
+    @Override
+    public void onOwnerInfoUpdated() {
+        getPreferenceController(OwnerInfoPreferenceController.class).updateSummary();
+    }
+
+    private static List<AbstractPreferenceController> buildPreferenceControllers(Context context,
+            Fragment parent, Lifecycle lifecycle, LockPatternUtils lockPatternUtils) {
+        final List<AbstractPreferenceController> controllers = new ArrayList<>();
+        controllers.add(new PatternVisiblePreferenceController(
+                context, MY_USER_ID, lockPatternUtils));
+        controllers.add(new PowerButtonInstantLockPreferenceController(
+                context, MY_USER_ID, lockPatternUtils));
+        controllers.add(new LockAfterTimeoutPreferenceController(
+                context, MY_USER_ID, lockPatternUtils));
+        controllers.add(new OwnerInfoPreferenceController(context, parent, lifecycle));
+        return controllers;
+    }
+
+
+    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.screen_lock_settings;
+                    result.add(sir);
+                    return result;
+                }
+
+                @Override
+                public List<AbstractPreferenceController> getPreferenceControllers(
+                        Context context) {
+                    return buildPreferenceControllers(context, null /* parent */,
+                            null /* lifecycle */, new LockPatternUtils(context));
+                }
+
+                @Override
+                public List<String> getNonIndexableKeys(Context context) {
+                    final List<String> keys = super.getNonIndexableKeys(context);
+                    keys.add(KEY_LOCK_SCREEN_TITLE);
+                    return keys;
+                }
+            };
+}
diff --git a/src/com/android/settings/security/trustagent/TrustAgentManager.java b/src/com/android/settings/security/trustagent/TrustAgentManager.java
new file mode 100644
index 0000000..3710905
--- /dev/null
+++ b/src/com/android/settings/security/trustagent/TrustAgentManager.java
@@ -0,0 +1,204 @@
+/*
+ * 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.security.trustagent;
+
+import static android.service.trust.TrustAgentService.TRUST_AGENT_META_DATA;
+
+import android.app.admin.DevicePolicyManager;
+import android.content.ComponentName;
+import android.content.Context;
+import android.content.Intent;
+import android.content.pm.PackageManager;
+import android.content.pm.ResolveInfo;
+import android.content.res.Resources;
+import android.content.res.TypedArray;
+import android.content.res.XmlResourceParser;
+import android.os.UserHandle;
+import android.service.trust.TrustAgentService;
+import android.support.annotation.VisibleForTesting;
+import android.text.TextUtils;
+import android.util.AttributeSet;
+import android.util.Log;
+import android.util.Slog;
+import android.util.Xml;
+
+import com.android.internal.widget.LockPatternUtils;
+import com.android.settingslib.RestrictedLockUtils;
+
+import org.xmlpull.v1.XmlPullParser;
+import org.xmlpull.v1.XmlPullParserException;
+
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.List;
+
+
+/** A manager for trust agent state. */
+public class TrustAgentManager {
+
+    // Only allow one trust agent on the platform.
+    private static final boolean ONLY_ONE_TRUST_AGENT = true;
+
+    public static class TrustAgentComponentInfo {
+        public ComponentName componentName;
+        public String title;
+        public String summary;
+        public RestrictedLockUtils.EnforcedAdmin admin = null;
+    }
+
+    private static final String TAG = "TrustAgentManager";
+    private static final Intent TRUST_AGENT_INTENT =
+            new Intent(TrustAgentService.SERVICE_INTERFACE);
+
+    @VisibleForTesting
+    static final String PERMISSION_PROVIDE_AGENT =
+            android.Manifest.permission.PROVIDE_TRUST_AGENT;
+
+    /**
+     * Determines if the service associated with a resolved trust agent intent is allowed to provide
+     * trust on this device.
+     *
+     * @param resolveInfo The entry corresponding to the matched trust agent intent.
+     * @param pm          The package manager to be used to check for permissions.
+     * @return {@code true} if the associated service is allowed to provide a trust agent, and
+     * {@code false} if otherwise.
+     */
+    public boolean shouldProvideTrust(ResolveInfo resolveInfo, PackageManager pm) {
+        final String packageName = resolveInfo.serviceInfo.packageName;
+        if (pm.checkPermission(PERMISSION_PROVIDE_AGENT, packageName)
+                != PackageManager.PERMISSION_GRANTED) {
+            Log.w(TAG, "Skipping agent because package " + packageName
+                    + " does not have permission " + PERMISSION_PROVIDE_AGENT + ".");
+            return false;
+        }
+        return true;
+    }
+
+    /**
+     * Return the display label for active trust agent.
+     */
+    public CharSequence getActiveTrustAgentLabel(Context context, LockPatternUtils utils) {
+        final List<TrustAgentComponentInfo> agents = getActiveTrustAgents(context, utils);
+        return agents.isEmpty() ? null : agents.get(0).title;
+    }
+
+    /**
+     * Returns a list of trust agents.
+     *
+     * If {@link #ONLY_ONE_TRUST_AGENT} is set, the list will contain up to 1 agent instead of all
+     * available agents on device.
+     */
+    public List<TrustAgentComponentInfo> getActiveTrustAgents(Context context,
+            LockPatternUtils utils) {
+        final int myUserId = UserHandle.myUserId();
+        final DevicePolicyManager dpm = context.getSystemService(DevicePolicyManager.class);
+        final PackageManager pm = context.getPackageManager();
+        final List<TrustAgentComponentInfo> result = new ArrayList<>();
+
+        final List<ResolveInfo> resolveInfos = pm.queryIntentServices(TRUST_AGENT_INTENT,
+                PackageManager.GET_META_DATA);
+        final List<ComponentName> enabledTrustAgents = utils.getEnabledTrustAgents(myUserId);
+        final RestrictedLockUtils.EnforcedAdmin admin = RestrictedLockUtils
+                .checkIfKeyguardFeaturesDisabled(
+                        context, DevicePolicyManager.KEYGUARD_DISABLE_TRUST_AGENTS, myUserId);
+
+        if (enabledTrustAgents != null && !enabledTrustAgents.isEmpty()) {
+            for (ResolveInfo resolveInfo : resolveInfos) {
+                if (resolveInfo.serviceInfo == null || !shouldProvideTrust(resolveInfo, pm)) {
+                    continue;
+                }
+                final TrustAgentComponentInfo trustAgentComponentInfo =
+                        getSettingsComponent(pm, resolveInfo);
+                if (trustAgentComponentInfo.componentName == null ||
+                        !enabledTrustAgents.contains(getComponentName(resolveInfo)) ||
+                        TextUtils.isEmpty(trustAgentComponentInfo.title)) {
+                    continue;
+                }
+                if (admin != null && dpm.getTrustAgentConfiguration(
+                        null, getComponentName(resolveInfo)) == null) {
+                    trustAgentComponentInfo.admin = admin;
+                }
+                result.add(trustAgentComponentInfo);
+                if (ONLY_ONE_TRUST_AGENT) {
+                    break;
+                }
+            }
+        }
+        return result;
+    }
+
+    public ComponentName getComponentName(ResolveInfo resolveInfo) {
+        if (resolveInfo == null || resolveInfo.serviceInfo == null) return null;
+        return new ComponentName(resolveInfo.serviceInfo.packageName, resolveInfo.serviceInfo.name);
+    }
+
+    private TrustAgentComponentInfo getSettingsComponent(PackageManager pm,
+            ResolveInfo resolveInfo) {
+        if (resolveInfo == null || resolveInfo.serviceInfo == null
+                || resolveInfo.serviceInfo.metaData == null) {
+            return null;
+        }
+        String cn = null;
+        TrustAgentComponentInfo trustAgentComponentInfo = new TrustAgentComponentInfo();
+        XmlResourceParser parser = null;
+        Exception caughtException = null;
+        try {
+            parser = resolveInfo.serviceInfo.loadXmlMetaData(pm, TRUST_AGENT_META_DATA);
+            if (parser == null) {
+                Slog.w(TAG, "Can't find " + TRUST_AGENT_META_DATA + " meta-data");
+                return null;
+            }
+            Resources res = pm.getResourcesForApplication(resolveInfo.serviceInfo.applicationInfo);
+            AttributeSet attrs = Xml.asAttributeSet(parser);
+            int type;
+            while ((type = parser.next()) != XmlPullParser.END_DOCUMENT
+                    && type != XmlPullParser.START_TAG) {
+            }
+            String nodeName = parser.getName();
+            if (!"trust-agent".equals(nodeName)) {
+                Slog.w(TAG, "Meta-data does not start with trust-agent tag");
+                return null;
+            }
+            TypedArray sa =
+                    res.obtainAttributes(attrs, com.android.internal.R.styleable.TrustAgent);
+            trustAgentComponentInfo.summary =
+                    sa.getString(com.android.internal.R.styleable.TrustAgent_summary);
+            trustAgentComponentInfo.title =
+                    sa.getString(com.android.internal.R.styleable.TrustAgent_title);
+            cn = sa.getString(com.android.internal.R.styleable.TrustAgent_settingsActivity);
+            sa.recycle();
+        } catch (PackageManager.NameNotFoundException e) {
+            caughtException = e;
+        } catch (IOException e) {
+            caughtException = e;
+        } catch (XmlPullParserException e) {
+            caughtException = e;
+        } finally {
+            if (parser != null) parser.close();
+        }
+        if (caughtException != null) {
+            Slog.w(TAG, "Error parsing : " + resolveInfo.serviceInfo.packageName, caughtException);
+            return null;
+        }
+        if (cn != null && cn.indexOf('/') < 0) {
+            cn = resolveInfo.serviceInfo.packageName + "/" + cn;
+        }
+        trustAgentComponentInfo.componentName =
+                (cn == null) ? null : ComponentName.unflattenFromString(cn);
+        return trustAgentComponentInfo;
+    }
+}
diff --git a/src/com/android/settings/security/trustagent/TrustAgentSettings.java b/src/com/android/settings/security/trustagent/TrustAgentSettings.java
new file mode 100644
index 0000000..b7f89ba
--- /dev/null
+++ b/src/com/android/settings/security/trustagent/TrustAgentSettings.java
@@ -0,0 +1,205 @@
+/*
+ * 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.security.trustagent;
+
+import static com.android.settingslib.RestrictedLockUtils.EnforcedAdmin;
+
+import android.app.admin.DevicePolicyManager;
+import android.content.ComponentName;
+import android.content.Context;
+import android.content.Intent;
+import android.content.pm.PackageManager;
+import android.content.pm.ResolveInfo;
+import android.graphics.drawable.Drawable;
+import android.os.Bundle;
+import android.os.UserHandle;
+import android.service.trust.TrustAgentService;
+import android.support.v14.preference.SwitchPreference;
+import android.support.v7.preference.Preference;
+import android.support.v7.preference.PreferenceGroup;
+import android.util.ArrayMap;
+import android.util.ArraySet;
+
+import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
+import com.android.internal.widget.LockPatternUtils;
+import com.android.settings.R;
+import com.android.settings.SettingsPreferenceFragment;
+import com.android.settings.overlay.FeatureFactory;
+import com.android.settingslib.RestrictedLockUtils;
+import com.android.settingslib.RestrictedSwitchPreference;
+
+import java.util.List;
+
+public class TrustAgentSettings extends SettingsPreferenceFragment implements
+        Preference.OnPreferenceChangeListener {
+    private static final String SERVICE_INTERFACE = TrustAgentService.SERVICE_INTERFACE;
+
+    private ArrayMap<ComponentName, AgentInfo> mAvailableAgents;
+    private final ArraySet<ComponentName> mActiveAgents = new ArraySet<ComponentName>();
+    private LockPatternUtils mLockPatternUtils;
+    private DevicePolicyManager mDpm;
+    private TrustAgentManager mTrustAgentManager;
+
+    public static final class AgentInfo {
+        CharSequence label;
+        ComponentName component; // service that implements ITrustAgent
+        SwitchPreference preference;
+        public Drawable icon;
+
+        @Override
+        public boolean equals(Object other) {
+            if (other instanceof AgentInfo) {
+                return component.equals(((AgentInfo)other).component);
+            }
+            return true;
+        }
+
+        public int compareTo(AgentInfo other) {
+            return component.compareTo(other.component);
+        }
+    }
+
+    @Override
+    public int getMetricsCategory() {
+        return MetricsEvent.TRUST_AGENT;
+    }
+
+    @Override
+    public int getHelpResource() {
+        return R.string.help_url_trust_agent;
+    }
+
+    @Override
+    public void onCreate(Bundle icicle) {
+        super.onCreate(icicle);
+        mDpm = getActivity().getSystemService(DevicePolicyManager.class);
+        mTrustAgentManager =
+            FeatureFactory.getFactory(getActivity()).getSecurityFeatureProvider()
+                .getTrustAgentManager();
+
+        addPreferencesFromResource(R.xml.trust_agent_settings);
+    }
+
+    public void onResume() {
+        super.onResume();
+        removePreference("dummy_preference");
+        updateAgents();
+    }
+
+    private void updateAgents() {
+        final Context context = getActivity();
+        if (mAvailableAgents == null) {
+            mAvailableAgents = findAvailableTrustAgents();
+        }
+        if (mLockPatternUtils == null) {
+            mLockPatternUtils = new LockPatternUtils(getActivity());
+        }
+        loadActiveAgents();
+        PreferenceGroup category =
+                (PreferenceGroup) getPreferenceScreen().findPreference("trust_agents");
+        category.removeAll();
+
+        final EnforcedAdmin admin = RestrictedLockUtils.checkIfKeyguardFeaturesDisabled(context,
+                DevicePolicyManager.KEYGUARD_DISABLE_TRUST_AGENTS, UserHandle.myUserId());
+
+        final int count = mAvailableAgents.size();
+        for (int i = 0; i < count; i++) {
+            AgentInfo agent = mAvailableAgents.valueAt(i);
+            final RestrictedSwitchPreference preference =
+                    new RestrictedSwitchPreference(getPrefContext());
+            preference.useAdminDisabledSummary(true);
+            agent.preference = preference;
+            preference.setPersistent(false);
+            preference.setTitle(agent.label);
+            preference.setIcon(agent.icon);
+            preference.setPersistent(false);
+            preference.setOnPreferenceChangeListener(this);
+            preference.setChecked(mActiveAgents.contains(agent.component));
+
+            if (admin != null
+                    && mDpm.getTrustAgentConfiguration(null, agent.component) == null) {
+                preference.setChecked(false);
+                preference.setDisabledByAdmin(admin);
+            }
+
+            category.addPreference(agent.preference);
+        }
+    }
+
+    private void loadActiveAgents() {
+        List<ComponentName> activeTrustAgents = mLockPatternUtils.getEnabledTrustAgents(
+                UserHandle.myUserId());
+        if (activeTrustAgents != null) {
+            mActiveAgents.addAll(activeTrustAgents);
+        }
+    }
+
+    private void saveActiveAgents() {
+        mLockPatternUtils.setEnabledTrustAgents(mActiveAgents,
+                UserHandle.myUserId());
+    }
+
+    private ArrayMap<ComponentName, AgentInfo> findAvailableTrustAgents() {
+        PackageManager pm = getActivity().getPackageManager();
+        Intent trustAgentIntent = new Intent(SERVICE_INTERFACE);
+        List<ResolveInfo> resolveInfos = pm.queryIntentServices(trustAgentIntent,
+                PackageManager.GET_META_DATA);
+
+        ArrayMap<ComponentName, AgentInfo> agents = new ArrayMap<ComponentName, AgentInfo>();
+        final int count = resolveInfos.size();
+        agents.ensureCapacity(count);
+        for (int i = 0; i < count; i++ ) {
+            ResolveInfo resolveInfo = resolveInfos.get(i);
+            if (resolveInfo.serviceInfo == null) {
+                continue;
+            }
+            if (!mTrustAgentManager.shouldProvideTrust(resolveInfo, pm)) {
+                continue;
+            }
+            ComponentName name = mTrustAgentManager.getComponentName(resolveInfo);
+            AgentInfo agentInfo = new AgentInfo();
+            agentInfo.label = resolveInfo.loadLabel(pm);
+            agentInfo.icon = resolveInfo.loadIcon(pm);
+            agentInfo.component = name;
+            agents.put(name, agentInfo);
+        }
+        return agents;
+    }
+
+    @Override
+    public boolean onPreferenceChange(Preference preference, Object newValue) {
+        if (preference instanceof SwitchPreference) {
+            final int count = mAvailableAgents.size();
+            for (int i = 0; i < count; i++) {
+                AgentInfo agent = mAvailableAgents.valueAt(i);
+                if (agent.preference == preference) {
+                    if ((Boolean) newValue) {
+                        if (!mActiveAgents.contains(agent.component)) {
+                            mActiveAgents.add(agent.component);
+                        }
+                    } else {
+                        mActiveAgents.remove(agent.component);
+                    }
+                    saveActiveAgents();
+                    return true;
+                }
+            }
+        }
+        return false;
+    }
+
+}
diff --git a/src/com/android/settings/sim/SimPreferenceDialog.java b/src/com/android/settings/sim/SimPreferenceDialog.java
index d195724..2b6ebe3 100644
--- a/src/com/android/settings/sim/SimPreferenceDialog.java
+++ b/src/com/android/settings/sim/SimPreferenceDialog.java
@@ -40,6 +40,7 @@
 import android.widget.TextView;
 
 import com.android.settings.R;
+import com.android.settings.Utils;
 
 public class SimPreferenceDialog extends Activity {
 
@@ -98,13 +99,14 @@
 
         EditText nameText = (EditText)mDialogLayout.findViewById(R.id.sim_name);
         nameText.setText(savedInstanceState.getString(SIM_NAME));
+        Utils.setEditTextCursorPosition(nameText);
     }
 
     private void createEditDialog(Bundle bundle) {
         final Resources res = mContext.getResources();
         EditText nameText = (EditText)mDialogLayout.findViewById(R.id.sim_name);
         nameText.setText(mSubInfoRecord.getDisplayName());
-
+        Utils.setEditTextCursorPosition(nameText);
         final Spinner tintSpinner = (Spinner) mDialogLayout.findViewById(R.id.spinner);
         SelectColorAdapter adapter = new SelectColorAdapter(mContext,
                 R.layout.settings_color_picker_item, mColorStrings);
@@ -154,7 +156,7 @@
             @Override
             public void onClick(DialogInterface dialog, int whichButton) {
                 final EditText nameText = (EditText)mDialogLayout.findViewById(R.id.sim_name);
-
+                Utils.setEditTextCursorPosition(nameText);
                 String displayName = nameText.getText().toString();
                 int subId = mSubInfoRecord.getSubscriptionId();
                 mSubInfoRecord.setDisplayName(displayName);
diff --git a/src/com/android/settings/support/actionbar/HelpMenuController.java b/src/com/android/settings/support/actionbar/HelpMenuController.java
new file mode 100644
index 0000000..a95d44e
--- /dev/null
+++ b/src/com/android/settings/support/actionbar/HelpMenuController.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.support.actionbar;
+
+import static com.android.settings.support.actionbar.HelpResourceProvider.HELP_URI_RESOURCE_KEY;
+
+import android.annotation.NonNull;
+import android.app.Activity;
+import android.app.Fragment;
+import android.os.Bundle;
+import android.view.Menu;
+import android.view.MenuInflater;
+
+import com.android.settingslib.HelpUtils;
+import com.android.settingslib.core.lifecycle.LifecycleObserver;
+import com.android.settingslib.core.lifecycle.ObservablePreferenceFragment;
+import com.android.settingslib.core.lifecycle.events.OnCreateOptionsMenu;
+
+/**
+ * A controller that adds help menu to any Settings page.
+ */
+public class HelpMenuController implements LifecycleObserver, OnCreateOptionsMenu {
+
+    private final Fragment mHost;
+
+    public static void init(@NonNull ObservablePreferenceFragment host) {
+        host.getLifecycle().addObserver(new HelpMenuController(host));
+    }
+
+    private HelpMenuController(@NonNull Fragment host) {
+        mHost = host;
+    }
+
+    @Override
+    public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
+        final Bundle arguments = mHost.getArguments();
+        int helpResourceId = 0;
+        if (arguments != null && arguments.containsKey(HELP_URI_RESOURCE_KEY)) {
+            helpResourceId = arguments.getInt(HELP_URI_RESOURCE_KEY);
+        } else if (mHost instanceof HelpResourceProvider) {
+            helpResourceId = ((HelpResourceProvider) mHost).getHelpResource();
+        }
+
+        String helpUri = null;
+        if (helpResourceId != 0) {
+            helpUri = mHost.getContext().getString(helpResourceId);
+        }
+        final Activity activity = mHost.getActivity();
+        if (helpUri != null && activity != null) {
+            HelpUtils.prepareHelpMenuItem(activity, menu, helpUri, mHost.getClass().getName());
+        }
+    }
+}
diff --git a/src/com/android/settings/support/actionbar/HelpResourceProvider.java b/src/com/android/settings/support/actionbar/HelpResourceProvider.java
new file mode 100644
index 0000000..2898986
--- /dev/null
+++ b/src/com/android/settings/support/actionbar/HelpResourceProvider.java
@@ -0,0 +1,36 @@
+/*
+ * Copyright (C) 2017 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF 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.actionbar;
+
+import com.android.settings.R;
+
+public interface HelpResourceProvider {
+    /**
+     * The Help Uri Resource key. This can be passed as an extra argument when creating the
+     * Fragment.
+     **/
+    String HELP_URI_RESOURCE_KEY = "help_uri_resource";
+
+    /**
+     * Override this if you want to show a help item in the menu, by returning the resource id.
+     *
+     * @return the resource id for the help url
+     */
+    default int getHelpResource() {
+        return R.string.help_uri_default;
+    }
+}
diff --git a/src/com/android/settings/system/ResetDashboardFragment.java b/src/com/android/settings/system/ResetDashboardFragment.java
index 48295a4..b7b6b77 100644
--- a/src/com/android/settings/system/ResetDashboardFragment.java
+++ b/src/com/android/settings/system/ResetDashboardFragment.java
@@ -21,7 +21,7 @@
 
 import com.android.internal.logging.nano.MetricsProto;
 import com.android.settings.R;
-import com.android.settings.applications.ResetAppPrefPreferenceController;
+import com.android.settings.applications.manageapplications.ResetAppPrefPreferenceController;
 import com.android.settings.dashboard.DashboardFragment;
 import com.android.settings.network.NetworkResetPreferenceController;
 import com.android.settings.search.BaseSearchIndexProvider;
diff --git a/src/com/android/settings/system/SystemDashboardFragment.java b/src/com/android/settings/system/SystemDashboardFragment.java
index 2485cce..c01bfcc 100644
--- a/src/com/android/settings/system/SystemDashboardFragment.java
+++ b/src/com/android/settings/system/SystemDashboardFragment.java
@@ -56,7 +56,7 @@
     }
 
     @Override
-    protected int getHelpResource() {
+    public int getHelpResource() {
         return R.string.help_url_system_dashboard;
     }
 
diff --git a/src/com/android/settings/trustagent/TrustAgentManager.java b/src/com/android/settings/trustagent/TrustAgentManager.java
deleted file mode 100644
index 3335e17..0000000
--- a/src/com/android/settings/trustagent/TrustAgentManager.java
+++ /dev/null
@@ -1,38 +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.trustagent;
-
-import android.content.pm.PackageManager;
-import android.content.pm.ResolveInfo;
-
-
-/** A manager for trust agent state. */
-public interface TrustAgentManager {
-
-   String PERMISSION_PROVIDE_AGENT = android.Manifest.permission.PROVIDE_TRUST_AGENT;
-
-  /**
-   * Determines if the service associated with a resolved trust agent intent is allowed to provide
-   * trust on this device.
-   *
-   * @param resolveInfo The entry corresponding to the matched trust agent intent.
-   * @param pm The package manager to be used to check for permissions.
-   * @return {@code true} if the associated service is allowed to provide a trust agent, and
-   * {@code false} if otherwise.
-   */
-   boolean shouldProvideTrust(ResolveInfo resolveInfo, PackageManager pm);
-}
diff --git a/src/com/android/settings/trustagent/TrustAgentManagerImpl.java b/src/com/android/settings/trustagent/TrustAgentManagerImpl.java
deleted file mode 100644
index cabda79..0000000
--- a/src/com/android/settings/trustagent/TrustAgentManagerImpl.java
+++ /dev/null
@@ -1,39 +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.trustagent;
-
-import android.content.pm.PackageManager;
-import android.content.pm.ResolveInfo;
-import android.util.Log;
-
-/** Implementation for {@code SecurityFeatureProvider}. */
-public class TrustAgentManagerImpl implements TrustAgentManager {
-
-    private static final String TAG = "TrustAgentFeature";
-
-    @Override
-    public boolean shouldProvideTrust(ResolveInfo resolveInfo, PackageManager pm) {
-        final String packageName = resolveInfo.serviceInfo.packageName;
-        if (pm.checkPermission(PERMISSION_PROVIDE_AGENT, packageName)
-                != PackageManager.PERMISSION_GRANTED) {
-            Log.w(TAG, "Skipping agent because package " + packageName
-                    + " does not have permission " + PERMISSION_PROVIDE_AGENT + ".");
-            return false;
-        }
-        return true;
-    }
-}
diff --git a/src/com/android/settings/tts/TextToSpeechSettings.java b/src/com/android/settings/tts/TextToSpeechSettings.java
index e8823a6..9092c0d 100644
--- a/src/com/android/settings/tts/TextToSpeechSettings.java
+++ b/src/com/android/settings/tts/TextToSpeechSettings.java
@@ -16,34 +16,41 @@
 
 package com.android.settings.tts;
 
-import android.support.v7.preference.ListPreference;
+import static android.provider.Settings.Secure.TTS_DEFAULT_PITCH;
+import static android.provider.Settings.Secure.TTS_DEFAULT_RATE;
+import static android.provider.Settings.Secure.TTS_DEFAULT_SYNTH;
+
 import android.app.AlertDialog;
 import android.content.ActivityNotFoundException;
 import android.content.ContentResolver;
+import android.content.Context;
 import android.content.Intent;
 import android.os.Bundle;
+import android.provider.SearchIndexableResource;
 import android.speech.tts.TextToSpeech;
 import android.speech.tts.TextToSpeech.EngineInfo;
 import android.speech.tts.TtsEngines;
 import android.speech.tts.UtteranceProgressListener;
+import android.support.v7.preference.ListPreference;
 import android.support.v7.preference.Preference;
 import android.text.TextUtils;
 import android.util.Log;
 import android.util.Pair;
-import android.view.View;
-import java.util.Comparator;
-import java.util.Collections;
-import com.android.settings.applications.LayoutPreference;
 
 import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
-import com.android.settings.widget.SeekBarPreference;
 import com.android.settings.R;
 import com.android.settings.SettingsActivity;
 import com.android.settings.SettingsPreferenceFragment;
+import com.android.settings.search.BaseSearchIndexProvider;
+import com.android.settings.search.Indexable;
+import com.android.settings.widget.ActionButtonPreference;
 import com.android.settings.widget.GearPreference;
-import android.widget.Button;
+import com.android.settings.widget.SeekBarPreference;
 
 import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.Comparator;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Locale;
@@ -51,14 +58,9 @@
 import java.util.Objects;
 import java.util.Set;
 
-import static android.provider.Settings.Secure.TTS_DEFAULT_PITCH;
-import static android.provider.Settings.Secure.TTS_DEFAULT_RATE;
-import static android.provider.Settings.Secure.TTS_DEFAULT_SYNTH;
-
 public class TextToSpeechSettings extends SettingsPreferenceFragment
         implements Preference.OnPreferenceChangeListener,
-                View.OnClickListener,
-                GearPreference.OnGearClickListener {
+        GearPreference.OnGearClickListener, Indexable {
 
     private static final String STATE_KEY_LOCALE_ENTRIES = "locale_entries";
     private static final String STATE_KEY_LOCALE_ENTRY_VALUES = "locale_entry_values";
@@ -108,9 +110,7 @@
 
     private SeekBarPreference mDefaultPitchPref;
     private SeekBarPreference mDefaultRatePref;
-    private Button mResetButton;
-    private Button mPlayButton;
-    private LayoutPreference mActionButtons;
+    private ActionButtonPreference mActionButtons;
 
     private int mDefaultPitch = TextToSpeech.Engine.DEFAULT_PITCH;
     private int mDefaultRate = TextToSpeech.Engine.DEFAULT_RATE;
@@ -126,7 +126,6 @@
     private String mSampleText = null;
 
     private ListPreference mLocalePreference;
-    private Preference mInstallVoicesPreference;
 
     /**
      * Default locale used by selected TTS engine, null if not connected to any engine.
@@ -172,12 +171,15 @@
         mDefaultPitchPref = (SeekBarPreference) findPreference(KEY_DEFAULT_PITCH);
         mDefaultRatePref = (SeekBarPreference) findPreference(KEY_DEFAULT_RATE);
 
-        mActionButtons = (LayoutPreference) findPreference(KEY_ACTION_BUTTONS);
-        mPlayButton = (Button) mActionButtons.findViewById(R.id.tts_play_button);
-        mPlayButton.setOnClickListener(this);
-        mPlayButton.setEnabled(false);
-        mResetButton = (Button) mActionButtons.findViewById(R.id.tts_reset_button);
-        mResetButton.setOnClickListener(this);
+        mActionButtons = ((ActionButtonPreference) findPreference(KEY_ACTION_BUTTONS))
+                .setButton1Text(R.string.tts_play)
+                .setButton1Positive(true)
+                .setButton1OnClickListener(v -> speakSampleText())
+                .setButton1Enabled(false)
+                .setButton2Text(R.string.tts_reset)
+                .setButton2Positive(false)
+                .setButton2OnClickListener(v -> resetTts())
+                .setButton1Enabled(true);
 
         if (savedInstanceState == null) {
             mLocalePreference.setEnabled(false);
@@ -228,7 +230,8 @@
             // Do set pitch correctly after it may have changed, and unlike speed, it doesn't change
             // immediately.
             final ContentResolver resolver = getContentResolver();
-            mTts.setPitch(android.provider.Settings.Secure.getInt(resolver, TTS_DEFAULT_PITCH, TextToSpeech.Engine.DEFAULT_PITCH)/100.0f);
+            mTts.setPitch(android.provider.Settings.Secure.getInt(resolver, TTS_DEFAULT_PITCH,
+                    TextToSpeech.Engine.DEFAULT_PITCH) / 100.0f);
         }
 
         Locale ttsDefaultLocale = mTts.getDefaultLanguage();
@@ -244,10 +247,12 @@
         }
         mTts.setOnUtteranceProgressListener(new UtteranceProgressListener() {
             @Override
-            public void onStart(String utteranceId) {}
+            public void onStart(String utteranceId) {
+            }
 
             @Override
-            public void onDone(String utteranceId) {}
+            public void onDone(String utteranceId) {
+            }
 
             @Override
             public void onError(String utteranceId) {
@@ -316,7 +321,6 @@
             EngineInfo info = mEnginesHelper.getEngineInfo(mCurrentEngine);
 
 
-
             Preference mEnginePreference = findPreference(KEY_TTS_ENGINE_PREFERENCE);
             ((GearPreference) mEnginePreference).setOnGearClickListener(this);
             mEnginePreference.setSummary(info.label);
@@ -367,7 +371,10 @@
                                 }
                             });
         } else {
-            if (DBG) Log.d(TAG, "TTS engine for settings screen failed to initialize successfully.");
+            if (DBG) {
+                Log.d(TAG,
+                        "TTS engine for settings screen failed to initialize successfully.");
+            }
             updateWidgetState(false);
         }
     }
@@ -414,8 +421,8 @@
 
             for (String loc : mAvailableStrLocals) {
                 if (loc.equalsIgnoreCase(defaultLocaleStr)) {
-                  notInAvailableLangauges = false;
-                  break;
+                    notInAvailableLangauges = false;
+                    break;
                 }
             }
         } catch (MissingResourceException e) {
@@ -575,7 +582,7 @@
     private boolean isNetworkRequiredForSynthesis() {
         Set<String> features = mTts.getFeatures(mCurrentDefaultLocale);
         if (features == null) {
-          return false;
+            return false;
         }
         return features.contains(TextToSpeech.Engine.KEY_FEATURE_NETWORK_SYNTHESIS) &&
                 !features.contains(TextToSpeech.Engine.KEY_FEATURE_EMBEDDED_SYNTHESIS);
@@ -656,32 +663,18 @@
         mTts.setLanguage((locale != null) ? locale : Locale.getDefault());
     }
 
-    /** Called when mPlayButton, mResetButton is clicked. */
-    @Override
-    public void onClick(View v) {
-        switch (v.getId()) {
-            case R.id.tts_play_button:
-                // Play button.
-                // Get the sample text from the TTS engine; onActivityResult will do
-                // the actual speaking
-                speakSampleText();
-                break;
-            case R.id.tts_reset_button:
-                // Reset button.
-                int speechRateSeekbarProgress =
-                        getSeekBarProgressFromValue(
-                                KEY_DEFAULT_RATE, TextToSpeech.Engine.DEFAULT_RATE);
-                mDefaultRatePref.setProgress(speechRateSeekbarProgress);
-                updateSpeechRate(speechRateSeekbarProgress);
-                int pitchSeekbarProgress =
-                        getSeekBarProgressFromValue(
-                                KEY_DEFAULT_PITCH, TextToSpeech.Engine.DEFAULT_PITCH);
-                mDefaultPitchPref.setProgress(pitchSeekbarProgress);
-                updateSpeechPitchValue(pitchSeekbarProgress);
-                break;
-            default:
-                break;
-        }
+    private void resetTts() {
+        // Reset button.
+        int speechRateSeekbarProgress =
+                getSeekBarProgressFromValue(
+                        KEY_DEFAULT_RATE, TextToSpeech.Engine.DEFAULT_RATE);
+        mDefaultRatePref.setProgress(speechRateSeekbarProgress);
+        updateSpeechRate(speechRateSeekbarProgress);
+        int pitchSeekbarProgress =
+                getSeekBarProgressFromValue(
+                        KEY_DEFAULT_PITCH, TextToSpeech.Engine.DEFAULT_PITCH);
+        mDefaultPitchPref.setProgress(pitchSeekbarProgress);
+        updateSpeechPitchValue(pitchSeekbarProgress);
     }
 
     private void updateSpeechRate(int speechRateSeekBarProgress) {
@@ -715,7 +708,7 @@
     }
 
     private void updateWidgetState(boolean enable) {
-        mPlayButton.setEnabled(enable);
+        mActionButtons.setButton1Enabled(enable);
         mDefaultRatePref.setEnabled(enable);
         mDefaultPitchPref.setEnabled(enable);
     }
@@ -752,7 +745,7 @@
             return;
         }
 
-        if (data == null){
+        if (data == null) {
             Log.e(TAG, "Engine failed voice data integrity check (null return)" +
                     mTts.getCurrentEngine());
             return;
@@ -761,7 +754,7 @@
         android.provider.Settings.Secure.putString(getContentResolver(), TTS_DEFAULT_SYNTH, engine);
 
         mAvailableStrLocals = data.getStringArrayListExtra(
-            TextToSpeech.Engine.EXTRA_AVAILABLE_VOICES);
+                TextToSpeech.Engine.EXTRA_AVAILABLE_VOICES);
         if (mAvailableStrLocals == null) {
             Log.e(TAG, "Voice data check complete, but no available voices found");
             // Set mAvailableStrLocals to empty list
@@ -781,4 +774,22 @@
         }
     }
 
+    public static final Indexable.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.tts_settings;
+                    return Arrays.asList(sir);
+                }
+
+                @Override
+                public List<String> getNonIndexableKeys(Context context) {
+                    final List<String> keys = super.getNonIndexableKeys(context);
+                    keys.add("tts_engine_preference");
+                    return keys;
+                }
+            };
+
 }
diff --git a/src/com/android/settings/tts/TtsEnginePreferenceFragment.java b/src/com/android/settings/tts/TtsEnginePreferenceFragment.java
index e0ed8b7..8e6cfec 100644
--- a/src/com/android/settings/tts/TtsEnginePreferenceFragment.java
+++ b/src/com/android/settings/tts/TtsEnginePreferenceFragment.java
@@ -23,7 +23,7 @@
 
 public class TtsEnginePreferenceFragment extends SettingsPreferenceFragment //implements
         implements RadioButtonGroupState, Indexable {
-    private static final String TAG = "TtsEnginePreferenceFragment";
+    private static final String TAG = "TtsEnginePrefFragment";
 
     private static final int VOICE_DATA_INTEGRITY_CHECK = 1977;
 
@@ -185,7 +185,6 @@
                 @Override
                 public List<SearchIndexableResource> getXmlResourcesToIndex(
                         Context context, boolean enabled) {
-                    Log.i(TAG, "Indexing");
                     final SearchIndexableResource sir = new SearchIndexableResource(context);
                     sir.xmlResId = R.xml.tts_engine_picker;
                     return Arrays.asList(sir);
diff --git a/src/com/android/settings/users/OwnerInfoSettings.java b/src/com/android/settings/users/OwnerInfoSettings.java
new file mode 100644
index 0000000..582431f
--- /dev/null
+++ b/src/com/android/settings/users/OwnerInfoSettings.java
@@ -0,0 +1,100 @@
+/*
+ * Copyright (C) 2010 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.users;
+
+import android.app.AlertDialog;
+import android.app.Dialog;
+import android.app.Fragment;
+import android.content.DialogInterface;
+import android.content.DialogInterface.OnClickListener;
+import android.os.Bundle;
+import android.os.UserHandle;
+import android.text.TextUtils;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.widget.EditText;
+
+import com.android.internal.logging.nano.MetricsProto;
+import com.android.internal.widget.LockPatternUtils;
+import com.android.settings.R;
+import com.android.settings.core.instrumentation.InstrumentedDialogFragment;
+import com.android.settings.security.OwnerInfoPreferenceController.OwnerInfoCallback;
+
+public class OwnerInfoSettings extends InstrumentedDialogFragment implements OnClickListener {
+
+    private static final String TAG_OWNER_INFO = "ownerInfo";
+
+    private View mView;
+    private int mUserId;
+    private LockPatternUtils mLockPatternUtils;
+    private EditText mOwnerInfo;
+
+    @Override
+    public void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        mUserId = UserHandle.myUserId();
+        mLockPatternUtils = new LockPatternUtils(getActivity());
+    }
+
+    @Override
+    public Dialog onCreateDialog(Bundle savedInstanceState) {
+        mView = LayoutInflater.from(getActivity()).inflate(R.layout.ownerinfo, null);
+        initView();
+        return new AlertDialog.Builder(getActivity())
+                .setTitle(R.string.owner_info_settings_title)
+                .setView(mView)
+                .setPositiveButton(R.string.save, this)
+                .setNegativeButton(R.string.cancel, this)
+                .show();
+    }
+
+    private void initView() {
+        String info = mLockPatternUtils.getOwnerInfo(mUserId);
+
+        mOwnerInfo = (EditText) mView.findViewById(R.id.owner_info_edit_text);
+        if (!TextUtils.isEmpty(info)) {
+            mOwnerInfo.setText(info);
+            mOwnerInfo.setSelection(info.length());
+        }
+    }
+
+    @Override
+    public void onClick(DialogInterface dialog, int which) {
+        if (which == AlertDialog.BUTTON_POSITIVE) {
+            String info = mOwnerInfo.getText().toString();
+            mLockPatternUtils.setOwnerInfoEnabled(!TextUtils.isEmpty(info), mUserId);
+            mLockPatternUtils.setOwnerInfo(info, mUserId);
+
+            if (getTargetFragment() instanceof OwnerInfoCallback) {
+                ((OwnerInfoCallback) getTargetFragment()).onOwnerInfoUpdated();
+            }
+        }
+    }
+
+    public static void show(Fragment parent) {
+        if (!parent.isAdded()) return;
+
+        final OwnerInfoSettings dialog = new OwnerInfoSettings();
+        dialog.setTargetFragment(parent, 0);
+        dialog.show(parent.getFragmentManager(), TAG_OWNER_INFO);
+    }
+
+    @Override
+    public int getMetricsCategory() {
+        return MetricsProto.MetricsEvent.DIALOG_OWNER_INFO_SETTINGS;
+    }
+}
diff --git a/src/com/android/settings/users/ProfileUpdateReceiver.java b/src/com/android/settings/users/ProfileUpdateReceiver.java
index d532089..80fa10a 100644
--- a/src/com/android/settings/users/ProfileUpdateReceiver.java
+++ b/src/com/android/settings/users/ProfileUpdateReceiver.java
@@ -38,13 +38,13 @@
         // Profile changed, lets get the photo and write to user manager
         new Thread() {
             public void run() {
-                Utils.copyMeProfilePhoto(context, null);
+                UserSettings.copyMeProfilePhoto(context, null);
                 copyProfileName(context);
             }
         }.start();
     }
 
-    static void copyProfileName(Context context) {
+    private static void copyProfileName(Context context) {
         SharedPreferences prefs = context.getSharedPreferences("profile", Context.MODE_PRIVATE);
         if (prefs.contains(KEY_PROFILE_NAME_COPIED_ONCE)) {
             return;
@@ -55,7 +55,8 @@
         String profileName = Utils.getMeProfileName(context, false /* partial name */);
         if (profileName != null && profileName.length() > 0) {
             um.setUserName(userId, profileName);
-            // Flag that we've written the profile one time at least. No need to do it in the future.
+            // Flag that we've written the profile one time at least. No need to do it in the
+            // future.
             prefs.edit().putBoolean(KEY_PROFILE_NAME_COPIED_ONCE, true).commit();
         }
     }
diff --git a/src/com/android/settings/users/UserSettings.java b/src/com/android/settings/users/UserSettings.java
index ec055f1..834166b 100644
--- a/src/com/android/settings/users/UserSettings.java
+++ b/src/com/android/settings/users/UserSettings.java
@@ -30,7 +30,9 @@
 import android.content.pm.UserInfo;
 import android.content.res.Resources;
 import android.graphics.Bitmap;
+import android.graphics.BitmapFactory;
 import android.graphics.drawable.Drawable;
+import android.net.Uri;
 import android.os.AsyncTask;
 import android.os.Bundle;
 import android.os.Handler;
@@ -38,7 +40,10 @@
 import android.os.RemoteException;
 import android.os.UserHandle;
 import android.os.UserManager;
+import android.provider.ContactsContract;
 import android.provider.Settings.Global;
+import android.support.annotation.VisibleForTesting;
+import android.support.annotation.WorkerThread;
 import android.support.v7.preference.Preference;
 import android.support.v7.preference.Preference.OnPreferenceClickListener;
 import android.support.v7.preference.PreferenceGroup;
@@ -53,9 +58,8 @@
 import android.widget.SimpleAdapter;
 
 import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
+import com.android.internal.util.UserIcons;
 import com.android.internal.widget.LockPatternUtils;
-import com.android.settings.DimmableIconPreference;
-import com.android.settings.OwnerInfoSettings;
 import com.android.settings.R;
 import com.android.settings.SettingsActivity;
 import com.android.settings.SettingsPreferenceFragment;
@@ -67,8 +71,11 @@
 import com.android.settings.search.SearchIndexableRaw;
 import com.android.settingslib.RestrictedLockUtils;
 import com.android.settingslib.RestrictedLockUtils.EnforcedAdmin;
+import com.android.settingslib.RestrictedPreference;
 import com.android.settingslib.drawable.CircleFramedDrawable;
 
+import java.io.IOException;
+import java.io.InputStream;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.HashMap;
@@ -126,7 +133,7 @@
 
     private PreferenceGroup mUserListCategory;
     private UserPreference mMePreference;
-    private DimmableIconPreference mAddUser;
+    private RestrictedPreference mAddUser;
     private int mRemovingUserId = -1;
     private int mAddedUserId = 0;
     private boolean mAddingUser;
@@ -135,7 +142,8 @@
     private boolean mShouldUpdateUserList = true;
     private final Object mUserLock = new Object();
     private UserManager mUserManager;
-    private SparseArray<Bitmap> mUserIcons = new SparseArray<Bitmap>();
+    private SparseArray<Bitmap> mUserIcons = new SparseArray<>();
+    private static SparseArray<Bitmap> sDarkDefaultUserBitmapCache = new SparseArray<>();
 
     private EditUserInfoController mEditUserInfoController =
             new EditUserInfoController();
@@ -212,7 +220,7 @@
         if (mUserCaps.mIsAdmin) {
             mMePreference.setSummary(R.string.user_admin);
         }
-        mAddUser = (DimmableIconPreference) findPreference(KEY_ADD_USER);
+        mAddUser = (RestrictedPreference) findPreference(KEY_ADD_USER);
         mAddUser.useAdminDisabledSummary(false);
         // Determine if add user/profile button should be visible
         if (mUserCaps.mCanAddUser && Utils.isDeviceProvisioned(getActivity())) {
@@ -325,7 +333,7 @@
                 UserInfo user = mUserManager.getUserInfo(UserHandle.myUserId());
                 if (user.iconPath == null || user.iconPath.equals("")) {
                     // Assign profile photo.
-                    Utils.copyMeProfilePhoto(getActivity(), user);
+                    copyMeProfilePhoto(getActivity(), user);
                 }
                 return user.name;
             }
@@ -398,7 +406,7 @@
 
     private UserInfo createRestrictedProfile() {
         UserInfo newUserInfo = mUserManager.createRestrictedProfile(mAddingUserName);
-        if (newUserInfo != null && !Utils.assignDefaultPhoto(getActivity(), newUserInfo.id)) {
+        if (newUserInfo != null && !assignDefaultPhoto(getActivity(), newUserInfo.id)) {
             return null;
         }
         return newUserInfo;
@@ -406,7 +414,7 @@
 
     private UserInfo createTrustedUser() {
         UserInfo newUserInfo = mUserManager.createUser(mAddingUserName, 0);
-        if (newUserInfo != null && !Utils.assignDefaultPhoto(getActivity(), newUserInfo.id)) {
+        if (newUserInfo != null && !assignDefaultPhoto(getActivity(), newUserInfo.id)) {
             return null;
         }
         return newUserInfo;
@@ -915,7 +923,7 @@
                 for (int userId : values[0]) {
                     Bitmap bitmap = mUserManager.getUserIcon(userId);
                     if (bitmap == null) {
-                        bitmap = Utils.getDefaultUserIconAsBitmap(userId);
+                        bitmap = getDefaultUserIconAsBitmap(getContext().getResources(), userId);
                     }
                     mUserIcons.append(userId, bitmap);
                 }
@@ -926,7 +934,8 @@
 
     private Drawable getEncircledDefaultIcon() {
         if (mDefaultIconDrawable == null) {
-            mDefaultIconDrawable = encircle(Utils.getDefaultUserIconAsBitmap(UserHandle.USER_NULL));
+            mDefaultIconDrawable = encircle(
+                    getDefaultUserIconAsBitmap(getContext().getResources(), UserHandle.USER_NULL));
         }
         return mDefaultIconDrawable;
     }
@@ -1026,6 +1035,67 @@
         mMePreference.setTitle(label);
     }
 
+    /**
+     * Returns a default user icon (as a {@link Bitmap}) for the given user.
+     *
+     * Note that for guest users, you should pass in {@code UserHandle.USER_NULL}.
+     * @param resources resources object to fetch the user icon.
+     * @param userId the user id or {@code UserHandle.USER_NULL} for a non-user specific icon
+     */
+    private static Bitmap getDefaultUserIconAsBitmap(Resources resources, int userId) {
+        Bitmap bitmap = null;
+        // Try finding the corresponding bitmap in the dark bitmap cache
+        bitmap = sDarkDefaultUserBitmapCache.get(userId);
+        if (bitmap == null) {
+            bitmap = UserIcons.convertToBitmap(
+                    UserIcons.getDefaultUserIcon(resources, userId, false));
+            // Save it to cache
+            sDarkDefaultUserBitmapCache.put(userId, bitmap);
+        }
+        return bitmap;
+    }
+
+    /**
+     * Assign the default photo to user with {@paramref userId}
+     * @param context used to get the {@link UserManager}
+     * @param userId  used to get the icon bitmap
+     * @return true if assign photo successfully, false if failed
+     */
+    @VisibleForTesting
+    static boolean assignDefaultPhoto(Context context, int userId) {
+        if (context == null) {
+            return false;
+        }
+        UserManager um = (UserManager) context.getSystemService(Context.USER_SERVICE);
+        Bitmap bitmap = getDefaultUserIconAsBitmap(context.getResources(), userId);
+        um.setUserIcon(userId, bitmap);
+
+        return true;
+    }
+
+    @WorkerThread
+    static void copyMeProfilePhoto(Context context, UserInfo user) {
+        Uri contactUri = ContactsContract.Profile.CONTENT_URI;
+
+        int userId = user != null ? user.id : UserHandle.myUserId();
+
+        InputStream avatarDataStream = ContactsContract.Contacts.openContactPhotoInputStream(
+                context.getContentResolver(),
+                contactUri, true);
+        // If there's no profile photo, assign a default avatar
+        if (avatarDataStream == null) {
+            assignDefaultPhoto(context, userId);
+            return;
+        }
+
+        UserManager um = (UserManager) context.getSystemService(Context.USER_SERVICE);
+        Bitmap icon = BitmapFactory.decodeStream(avatarDataStream);
+        um.setUserIcon(userId, icon);
+        try {
+            avatarDataStream.close();
+        } catch (IOException ioe) { }
+    }
+
     private static class SummaryProvider implements SummaryLoader.SummaryProvider {
 
         private final Context mContext;
@@ -1069,6 +1139,7 @@
                     final Resources res = context.getResources();
                     SearchIndexableRaw data = new SearchIndexableRaw(context);
                     data.title = res.getString(R.string.user_settings_title);
+                    data.key = "users_settings";
                     data.screenTitle = res.getString(R.string.user_settings_title);
                     result.add(data);
 
@@ -1078,6 +1149,7 @@
                                 R.string.user_add_user_or_profile_menu
                                 : R.string.user_add_user_menu);
                         data.screenTitle = res.getString(R.string.user_settings_title);
+                        data.key = "user_settings_add_users";
                         result.add(data);
                     }
                     return result;
diff --git a/src/com/android/settings/utils/ManagedServiceSettings.java b/src/com/android/settings/utils/ManagedServiceSettings.java
index 7a888db..d488dfe 100644
--- a/src/com/android/settings/utils/ManagedServiceSettings.java
+++ b/src/com/android/settings/utils/ManagedServiceSettings.java
@@ -21,7 +21,6 @@
 import android.app.AlertDialog;
 import android.app.Dialog;
 import android.app.Fragment;
-import android.app.Notification;
 import android.app.NotificationManager;
 import android.app.admin.DevicePolicyManager;
 import android.content.ComponentName;
@@ -46,6 +45,7 @@
 import com.android.settings.Utils;
 import com.android.settings.core.instrumentation.InstrumentedDialogFragment;
 import com.android.settings.notification.EmptyTextSettings;
+import com.android.settings.widget.AppSwitchPreference;
 
 import java.util.Collections;
 import java.util.List;
@@ -127,7 +127,7 @@
                 Log.e(TAG, "can't find package name", e);
             }
             final String summary = service.loadLabel(mPm).toString();
-            final SwitchPreference pref = new SwitchPreference(getPrefContext());
+            final SwitchPreference pref = new AppSwitchPreference(getPrefContext());
             pref.setPersistent(false);
             pref.setIcon(mIconDrawableFactory.getBadgedIcon(service, service.applicationInfo,
                     UserHandle.getUserId(service.applicationInfo.uid)));
diff --git a/src/com/android/settings/vpn2/ConnectivityManagerWrapper.java b/src/com/android/settings/vpn2/ConnectivityManagerWrapper.java
deleted file mode 100644
index 9e20c9d..0000000
--- a/src/com/android/settings/vpn2/ConnectivityManagerWrapper.java
+++ /dev/null
@@ -1,75 +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.vpn2;
-
-import android.net.ConnectivityManager;
-import android.net.ConnectivityManager.NetworkCallback;
-import android.net.Network;
-import android.net.NetworkRequest;
-import android.os.Handler;
-import android.net.ProxyInfo;
-
-/**
- * This interface replicates a subset of the android.net.ConnectivityManager (CM). The interface
- * exists so that we can use a thin wrapper around the CM in production code and a mock in tests.
- * We cannot directly mock or shadow the CM, because some of the methods we rely on are marked as
- * hidden and are thus invisible to Robolectric.
- */
-public interface ConnectivityManagerWrapper {
-
-    /**
-     * Returns the real ConnectivityManager object wrapped by this wrapper.
-     */
-    public ConnectivityManager getConnectivityManager();
-
-    /**
-     * Calls {@code ConnectivityManager.getAlwaysOnVpnPackageForUser()}.
-     *
-     * @see android.net.ConnectivityManager#getAlwaysOnVpnPackageForUser
-     */
-   String getAlwaysOnVpnPackageForUser(int userId);
-
-    /**
-     * Calls {@code ConnectivityManager.getGlobalProxy()}.
-     *
-     * @see android.net.ConnectivityManager#getGlobalProxy
-     */
-   ProxyInfo getGlobalProxy();
-
-    /**
-     * Calls {@code ConnectivityManager.registerNetworkCallback()}.
-     *
-     * This is part of the ConnectivityManager public API in SDK 26 or above, but is not yet visible
-     * to the robolectric tests, which currently build with SDK 23.
-     * TODO: delete this once the robolectric tests build with SDK 26 or above.
-     *
-     * @see android.net.ConnectivityManager#registerNetworkCallback(NetworkRequest,NetworkCallback,Handler)
-     */
-    public void registerNetworkCallback(NetworkRequest request, NetworkCallback callback,
-            Handler handler);
-
-    /**
-     * Calls {@code ConnectivityManager.startCaptivePortalApp()}.
-     *
-     * This is part of the ConnectivityManager public API in SDK 26 or above, but is not yet visible
-     * to the robolectric tests, which currently build with SDK 23.
-     * TODO: delete this once the robolectric tests build with SDK 26 or above.
-     *
-     * @see android.net.ConnectivityManager#startCaptivePortalApp(Network)
-     */
-    public void startCaptivePortalApp(Network network);
-}
diff --git a/src/com/android/settings/vpn2/ConnectivityManagerWrapperImpl.java b/src/com/android/settings/vpn2/ConnectivityManagerWrapperImpl.java
deleted file mode 100644
index f742cd2..0000000
--- a/src/com/android/settings/vpn2/ConnectivityManagerWrapperImpl.java
+++ /dev/null
@@ -1,59 +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.vpn2;
-
-import android.net.ConnectivityManager;
-import android.net.ConnectivityManager.NetworkCallback;
-import android.net.Network;
-import android.net.NetworkRequest;
-import android.os.Handler;
-import android.net.ProxyInfo;
-
-public class ConnectivityManagerWrapperImpl implements ConnectivityManagerWrapper {
-
-    private final ConnectivityManager mCm;
-
-    public ConnectivityManagerWrapperImpl(ConnectivityManager cm) {
-        mCm = cm;
-    }
-
-    @Override
-    public ConnectivityManager getConnectivityManager() {
-        return mCm;
-    }
-
-    @Override
-    public String getAlwaysOnVpnPackageForUser(int userId) {
-        return mCm.getAlwaysOnVpnPackageForUser(userId);
-    }
-
-    @Override
-    public ProxyInfo getGlobalProxy() {
-        return mCm.getGlobalProxy();
-    }
-
-    @Override
-    public void registerNetworkCallback(NetworkRequest request, NetworkCallback callback,
-            Handler handler) {
-        mCm.registerNetworkCallback(request, callback, handler);
-    }
-
-    @Override
-    public void startCaptivePortalApp(Network network) {
-        mCm.startCaptivePortalApp(network);
-    }
-}
diff --git a/src/com/android/settings/vpn2/LegacyVpnPreference.java b/src/com/android/settings/vpn2/LegacyVpnPreference.java
index 4ef2808..8fa9680 100644
--- a/src/com/android/settings/vpn2/LegacyVpnPreference.java
+++ b/src/com/android/settings/vpn2/LegacyVpnPreference.java
@@ -16,6 +16,8 @@
 
 package com.android.settings.vpn2;
 
+import static com.android.internal.net.LegacyVpnInfo.STATE_CONNECTED;
+
 import android.content.Context;
 import android.support.v7.preference.Preference;
 import android.text.TextUtils;
@@ -23,7 +25,6 @@
 
 import com.android.internal.net.VpnProfile;
 import com.android.settings.R;
-import static com.android.internal.net.LegacyVpnInfo.STATE_CONNECTED;
 
 /**
  * {@link android.support.v7.preference.Preference} tracks the underlying legacy vpn profile and
@@ -35,6 +36,7 @@
     LegacyVpnPreference(Context context) {
         super(context, null /* attrs */);
         setIcon(R.drawable.ic_vpn_key);
+        setUseSmallIcon(true);
     }
 
     public VpnProfile getProfile() {
diff --git a/src/com/android/settings/vpn2/VpnSettings.java b/src/com/android/settings/vpn2/VpnSettings.java
index d40441f..0a3bfe6 100644
--- a/src/com/android/settings/vpn2/VpnSettings.java
+++ b/src/com/android/settings/vpn2/VpnSettings.java
@@ -401,7 +401,7 @@
     }
 
     @Override
-    protected int getHelpResource() {
+    public int getHelpResource() {
         return R.string.help_url_vpn;
     }
 
diff --git a/src/com/android/settings/vpn2/VpnUtils.java b/src/com/android/settings/vpn2/VpnUtils.java
index a36cce8..1aa4ada 100644
--- a/src/com/android/settings/vpn2/VpnUtils.java
+++ b/src/com/android/settings/vpn2/VpnUtils.java
@@ -27,6 +27,7 @@
 
 import com.android.internal.net.LegacyVpnInfo;
 import com.android.internal.net.VpnConfig;
+import com.android.settings.wrapper.ConnectivityManagerWrapper;
 
 /**
  * Utility functions for vpn.
diff --git a/src/com/android/settings/wallpaper/WallpaperSuggestionActivity.java b/src/com/android/settings/wallpaper/WallpaperSuggestionActivity.java
index 90c5888..77142ed 100644
--- a/src/com/android/settings/wallpaper/WallpaperSuggestionActivity.java
+++ b/src/com/android/settings/wallpaper/WallpaperSuggestionActivity.java
@@ -17,6 +17,8 @@
 package com.android.settings.wallpaper;
 
 import android.app.Activity;
+import android.app.WallpaperManager;
+import android.content.Context;
 import android.content.Intent;
 import android.content.pm.PackageManager;
 import android.os.Bundle;
@@ -25,6 +27,7 @@
 import com.android.internal.logging.nano.MetricsProto;
 import com.android.settings.R;
 import com.android.settings.Utils;
+import com.android.settings.wrapper.WallpaperManagerWrapper;
 
 public class WallpaperSuggestionActivity extends Activity {
 
@@ -48,9 +51,15 @@
     @VisibleForTesting
     void startFallbackSuggestion() {
         // fall back to default wallpaper picker
-        Utils.startWithFragment(this, WallpaperTypeSettings.class.getName(), null, null, 0,
-                R.string.wallpaper_suggestion_title, null,
-                MetricsProto.MetricsEvent.DASHBOARD_SUMMARY);
+        Utils.startWithFragment(this, WallpaperTypeSettings.class.getName(),
+                R.string.wallpaper_suggestion_title, MetricsProto.MetricsEvent.DASHBOARD_SUMMARY,
+                Intent.FLAG_ACTIVITY_FORWARD_RESULT);
+    }
+
+    @VisibleForTesting
+    public static boolean isSuggestionComplete(Context context) {
+        final WallpaperManagerWrapper manager = new WallpaperManagerWrapper(context);
+        return manager.getWallpaperId(WallpaperManager.FLAG_SYSTEM) > 0;
     }
 
 }
diff --git a/src/com/android/settings/wallpaper/WallpaperTypeSettings.java b/src/com/android/settings/wallpaper/WallpaperTypeSettings.java
index 1ca8ac7..1ff1faa 100644
--- a/src/com/android/settings/wallpaper/WallpaperTypeSettings.java
+++ b/src/com/android/settings/wallpaper/WallpaperTypeSettings.java
@@ -43,7 +43,7 @@
     }
 
     @Override
-    protected int getHelpResource() {
+    public int getHelpResource() {
         return R.string.help_uri_wallpaper;
     }
 
@@ -67,7 +67,7 @@
         // Add Preference items for each of the matching activities
         for (ResolveInfo info : rList) {
             Preference pref = new Preference(getPrefContext());
-            Intent prefIntent = new Intent(intent);
+            Intent prefIntent = new Intent(intent).addFlags(Intent.FLAG_ACTIVITY_FORWARD_RESULT);
             prefIntent.setComponent(new ComponentName(
                     info.activityInfo.packageName, info.activityInfo.name));
             pref.setIntent(prefIntent);
@@ -79,6 +79,16 @@
         }
     }
 
+    @Override
+    public boolean onPreferenceTreeClick(Preference preference) {
+        if (preference.getIntent() == null) {
+            return super.onPreferenceTreeClick(preference);
+        }
+        startActivity(preference.getIntent());
+        finish();
+        return true;
+    }
+
     public static final SearchIndexProvider SEARCH_INDEX_DATA_PROVIDER =
         new BaseSearchIndexProvider() {
             @Override
@@ -102,6 +112,7 @@
 
                     SearchIndexableRaw data = new SearchIndexableRaw(context);
                     data.title = label.toString();
+                    data.key = "wallpaper_type_settings";
                     data.screenTitle = context.getResources().getString(
                             R.string.wallpaper_settings_fragment_title);
                     data.intentAction = Intent.ACTION_SET_WALLPAPER;
diff --git a/src/com/android/settings/webview/UserPackageWrapper.java b/src/com/android/settings/webview/UserPackageWrapper.java
deleted file mode 100644
index 8fbb10c..0000000
--- a/src/com/android/settings/webview/UserPackageWrapper.java
+++ /dev/null
@@ -1,33 +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.webview;
-
-import android.content.Context;
-import android.content.pm.PackageInfo;
-import android.content.pm.UserInfo;
-import android.webkit.UserPackage;
-
-import java.util.List;
-
-/**
- * Wrapper class around android.webkit.UserPackage - to be able to use UserPackage in Robolectric
- * tests (such tests currently don't support mocking hidden classes).
- */
-interface UserPackageWrapper {
-    UserInfo getUserInfo();
-    PackageInfo getPackageInfo();
-    boolean isEnabledPackage();
-    boolean isInstalledPackage();
-}
diff --git a/src/com/android/settings/webview/UserPackageWrapperImpl.java b/src/com/android/settings/webview/UserPackageWrapperImpl.java
deleted file mode 100644
index 1ea7c2e..0000000
--- a/src/com/android/settings/webview/UserPackageWrapperImpl.java
+++ /dev/null
@@ -1,50 +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.webview;
-
-import android.content.Context;
-import android.content.pm.PackageInfo;
-import android.content.pm.UserInfo;
-import android.webkit.UserPackage;
-
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * Default implementation of UserPackageWrapper.
- */
-class UserPackageWrapperImpl implements UserPackageWrapper {
-    private final UserPackage mUserPackage;
-
-    UserPackageWrapperImpl(UserPackage userPackage) {
-        mUserPackage = userPackage;
-    }
-
-    public UserInfo getUserInfo() {
-        return mUserPackage.getUserInfo();
-    }
-
-    public PackageInfo getPackageInfo() {
-        return mUserPackage.getPackageInfo();
-    }
-
-    public boolean isEnabledPackage() {
-        return mUserPackage.isEnabledPackage();
-    }
-
-    public boolean isInstalledPackage() {
-        return mUserPackage.isInstalledPackage();
-    }
-}
diff --git a/src/com/android/settings/webview/WebViewAppPicker.java b/src/com/android/settings/webview/WebViewAppPicker.java
index 380b964..0e9fc39 100644
--- a/src/com/android/settings/webview/WebViewAppPicker.java
+++ b/src/com/android/settings/webview/WebViewAppPicker.java
@@ -30,9 +30,10 @@
 
 import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
 import com.android.settings.R;
-import com.android.settings.applications.PackageManagerWrapper;
 import com.android.settings.applications.defaultapps.DefaultAppInfo;
 import com.android.settings.applications.defaultapps.DefaultAppPickerFragment;
+import com.android.settings.wrapper.UserPackageWrapper;
+import com.android.settingslib.wrapper.PackageManagerWrapper;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -57,14 +58,20 @@
     }
 
     @Override
+    protected int getPreferenceScreenResId() {
+        return R.xml.webview_app_settings;
+    }
+
+    @Override
     protected List<DefaultAppInfo> getCandidates() {
         final List<DefaultAppInfo> packageInfoList = new ArrayList<DefaultAppInfo>();
-        List<ApplicationInfo> pkgs =
-                getWebViewUpdateServiceWrapper().getValidWebViewApplicationInfos(getContext());
+        final Context context = getContext();
+        final WebViewUpdateServiceWrapper webViewUpdateService = getWebViewUpdateServiceWrapper();
+        final List<ApplicationInfo> pkgs =
+                webViewUpdateService.getValidWebViewApplicationInfos(context);
         for (ApplicationInfo ai : pkgs) {
-            packageInfoList.add(createDefaultAppInfo(mPm, ai,
-                    getDisabledReason(getWebViewUpdateServiceWrapper(),
-                            getContext(), ai.packageName)));
+            packageInfoList.add(createDefaultAppInfo(context, mPm, ai,
+                    getDisabledReason(webViewUpdateService, context, ai.packageName)));
         }
         return packageInfoList;
     }
@@ -111,9 +118,9 @@
     }
 
     private static class WebViewAppInfo extends DefaultAppInfo {
-        public WebViewAppInfo(PackageManagerWrapper pm, PackageItemInfo packageItemInfo,
-                String summary, boolean enabled) {
-            super(pm, packageItemInfo, summary, enabled);
+        public WebViewAppInfo(Context context, PackageManagerWrapper pm,
+                PackageItemInfo packageItemInfo, String summary, boolean enabled) {
+            super(context, pm, packageItemInfo, summary, enabled);
         }
 
         @Override
@@ -130,9 +137,9 @@
 
 
     @VisibleForTesting
-    DefaultAppInfo createDefaultAppInfo(PackageManagerWrapper pm, PackageItemInfo packageItemInfo,
-            String disabledReason) {
-        return new WebViewAppInfo(pm, packageItemInfo, disabledReason,
+    DefaultAppInfo createDefaultAppInfo(Context context, PackageManagerWrapper pm,
+            PackageItemInfo packageItemInfo, String disabledReason) {
+        return new WebViewAppInfo(context, pm, packageItemInfo, disabledReason,
                 TextUtils.isEmpty(disabledReason) /* enabled */);
     }
 
diff --git a/src/com/android/settings/webview/WebViewAppPreferenceController.java b/src/com/android/settings/webview/WebViewAppPreferenceController.java
deleted file mode 100644
index c774093..0000000
--- a/src/com/android/settings/webview/WebViewAppPreferenceController.java
+++ /dev/null
@@ -1,72 +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.webview;
-
-import android.content.Context;
-import android.content.pm.PackageInfo;
-import android.support.v7.preference.Preference;
-import android.support.v7.preference.PreferenceScreen;
-
-import com.android.settings.applications.defaultapps.DefaultAppInfo;
-import com.android.settings.applications.defaultapps.DefaultAppPreferenceController;
-
-public class WebViewAppPreferenceController extends DefaultAppPreferenceController {
-
-    private static final String WEBVIEW_APP_KEY = "select_webview_provider";
-
-    private final WebViewUpdateServiceWrapper mWebViewUpdateServiceWrapper;
-    private Preference mPreference;
-
-    public WebViewAppPreferenceController(Context context) {
-        this(context, new WebViewUpdateServiceWrapper());
-    }
-
-    public WebViewAppPreferenceController(Context context,
-            WebViewUpdateServiceWrapper webviewUpdateServiceWrapper) {
-        super(context);
-        mWebViewUpdateServiceWrapper = webviewUpdateServiceWrapper;
-    }
-
-    @Override
-    public DefaultAppInfo getDefaultAppInfo() {
-        PackageInfo currentPackage = mWebViewUpdateServiceWrapper.getCurrentWebViewPackage();
-        return new DefaultAppInfo(mPackageManager,
-                currentPackage == null ? null : currentPackage.applicationInfo);
-    }
-
-    @Override
-    public void displayPreference(PreferenceScreen screen) {
-        super.displayPreference(screen);
-        if (isAvailable()) {
-            mPreference = screen.findPreference(WEBVIEW_APP_KEY);
-        }
-    }
-
-    @Override
-    public String getPreferenceKey() {
-        return WEBVIEW_APP_KEY;
-    }
-
-    @Override
-    public boolean isAvailable() {
-        return true;
-    }
-
-    public void enablePreference(boolean enabled) {
-        if (isAvailable()) {
-            mPreference.setEnabled(enabled);
-        }
-    }
-}
diff --git a/src/com/android/settings/webview/WebViewUpdateServiceWrapper.java b/src/com/android/settings/webview/WebViewUpdateServiceWrapper.java
index b40be19..fa1cd3d 100644
--- a/src/com/android/settings/webview/WebViewUpdateServiceWrapper.java
+++ b/src/com/android/settings/webview/WebViewUpdateServiceWrapper.java
@@ -28,11 +28,13 @@
 import android.widget.Toast;
 
 import com.android.settings.R;
+import com.android.settings.wrapper.UserPackageWrapper;
+import com.android.settings.wrapper.UserPackageWrapperImpl;
 
 import java.util.ArrayList;
 import java.util.List;
 
-class WebViewUpdateServiceWrapper {
+public class WebViewUpdateServiceWrapper {
     private static final String TAG = "WVUSWrapper";
 
     public WebViewUpdateServiceWrapper() {}
diff --git a/src/com/android/settings/wfd/WifiDisplaySettings.java b/src/com/android/settings/wfd/WifiDisplaySettings.java
index 3fe438f..7a9fc39 100755
--- a/src/com/android/settings/wfd/WifiDisplaySettings.java
+++ b/src/com/android/settings/wfd/WifiDisplaySettings.java
@@ -36,7 +36,7 @@
 import android.os.Bundle;
 import android.os.Handler;
 import android.os.Looper;
-import android.os.ServiceManager;
+import android.provider.SearchIndexableResource;
 import android.provider.Settings;
 import android.support.v14.preference.SwitchPreference;
 import android.support.v7.preference.ListPreference;
@@ -63,6 +63,11 @@
 import com.android.settings.R;
 import com.android.settings.SettingsPreferenceFragment;
 import com.android.settings.dashboard.SummaryLoader;
+import com.android.settings.search.BaseSearchIndexProvider;
+import com.android.settings.search.Indexable;
+
+import java.util.ArrayList;
+import java.util.List;
 
 /**
  * The Settings screen for WifiDisplay configuration and connection management.
@@ -72,7 +77,7 @@
  * on the system.  In that case, the enable option will not be shown but other
  * remote display routes will continue to be made available.
  */
-public final class WifiDisplaySettings extends SettingsPreferenceFragment {
+public final class WifiDisplaySettings extends SettingsPreferenceFragment implements Indexable {
     private static final String TAG = "WifiDisplaySettings";
     private static final boolean DEBUG = false;
 
@@ -136,7 +141,7 @@
     }
 
     @Override
-    protected int getHelpResource() {
+    public int getHelpResource() {
         return R.string.help_url_remote_display;
     }
 
@@ -823,4 +828,18 @@
 
     public static final SummaryLoader.SummaryProviderFactory SUMMARY_PROVIDER_FACTORY
             = (activity, summaryLoader) -> new SummaryProvider(activity, summaryLoader);
+
+    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.wifi_display_settings;
+                    result.add(sir);
+                    return result;
+                }
+            };
 }
diff --git a/src/com/android/settings/widget/ActionButtonPreference.java b/src/com/android/settings/widget/ActionButtonPreference.java
new file mode 100644
index 0000000..bb5d490
--- /dev/null
+++ b/src/com/android/settings/widget/ActionButtonPreference.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.widget;
+
+import android.content.Context;
+import android.support.annotation.StringRes;
+import android.support.v7.preference.Preference;
+import android.support.v7.preference.PreferenceViewHolder;
+import android.text.TextUtils;
+import android.util.AttributeSet;
+import android.view.View;
+import android.widget.Button;
+
+import com.android.settings.R;
+
+public class ActionButtonPreference extends Preference {
+
+    private final ButtonInfo mButton1Info = new ButtonInfo();
+    private final ButtonInfo mButton2Info = new ButtonInfo();
+
+    public ActionButtonPreference(Context context, AttributeSet attrs,
+            int defStyleAttr, int defStyleRes) {
+        super(context, attrs, defStyleAttr, defStyleRes);
+        init();
+    }
+
+    public ActionButtonPreference(Context context, AttributeSet attrs, int defStyleAttr) {
+        super(context, attrs, defStyleAttr);
+        init();
+    }
+
+    public ActionButtonPreference(Context context, AttributeSet attrs) {
+        super(context, attrs);
+        init();
+    }
+
+    public ActionButtonPreference(Context context) {
+        super(context);
+        init();
+    }
+
+    private void init() {
+        setLayoutResource(R.layout.two_action_buttons);
+        setSelectable(false);
+    }
+
+    @Override
+    public void onBindViewHolder(PreferenceViewHolder holder) {
+        super.onBindViewHolder(holder);
+        holder.setDividerAllowedAbove(false);
+        holder.setDividerAllowedBelow(false);
+        mButton1Info.mPositiveButton = (Button) holder.findViewById(R.id.button1_positive);
+        mButton1Info.mNegativeButton = (Button) holder.findViewById(R.id.button1_negative);
+        mButton2Info.mPositiveButton = (Button) holder.findViewById(R.id.button2_positive);
+        mButton2Info.mNegativeButton = (Button) holder.findViewById(R.id.button2_negative);
+
+        mButton1Info.setUpButton();
+        mButton2Info.setUpButton();
+    }
+
+    public ActionButtonPreference setButton1Text(@StringRes int textResId) {
+        final String newText = getContext().getString(textResId);
+        if (!TextUtils.equals(newText, mButton1Info.mText)) {
+            mButton1Info.mText = newText;
+            notifyChanged();
+        }
+        return this;
+    }
+
+    public ActionButtonPreference setButton1Enabled(boolean isEnabled) {
+        if (isEnabled != mButton1Info.mIsEnabled) {
+            mButton1Info.mIsEnabled = isEnabled;
+            notifyChanged();
+        }
+        return this;
+    }
+
+    public ActionButtonPreference setButton2Text(@StringRes int textResId) {
+        final String newText = getContext().getString(textResId);
+        if (!TextUtils.equals(newText, mButton2Info.mText)) {
+            mButton2Info.mText = newText;
+            notifyChanged();
+        }
+        return this;
+    }
+
+    public ActionButtonPreference setButton2Enabled(boolean isEnabled) {
+        if (isEnabled != mButton2Info.mIsEnabled) {
+            mButton2Info.mIsEnabled = isEnabled;
+            notifyChanged();
+        }
+        return this;
+    }
+
+    public ActionButtonPreference setButton1OnClickListener(View.OnClickListener listener) {
+        if (listener != mButton1Info.mListener) {
+            mButton1Info.mListener = listener;
+            notifyChanged();
+        }
+        return this;
+    }
+
+    public ActionButtonPreference setButton2OnClickListener(View.OnClickListener listener) {
+        if (listener != mButton2Info.mListener) {
+            mButton2Info.mListener = listener;
+            notifyChanged();
+        }
+        return this;
+    }
+
+    public ActionButtonPreference setButton1Positive(boolean isPositive) {
+        if (isPositive != mButton1Info.mIsPositive) {
+            mButton1Info.mIsPositive = isPositive;
+            notifyChanged();
+        }
+        return this;
+    }
+
+    public ActionButtonPreference setButton2Positive(boolean isPositive) {
+        if (isPositive != mButton2Info.mIsPositive) {
+            mButton2Info.mIsPositive = isPositive;
+            notifyChanged();
+        }
+        return this;
+    }
+    public ActionButtonPreference setButton1Visible(boolean isPositive) {
+        if (isPositive != mButton1Info.mIsVisible) {
+            mButton1Info.mIsVisible = isPositive;
+            notifyChanged();
+        }
+        return this;
+    }
+
+    public ActionButtonPreference setButton2Visible(boolean isPositive) {
+        if (isPositive != mButton2Info.mIsVisible) {
+            mButton2Info.mIsVisible = isPositive;
+            notifyChanged();
+        }
+        return this;
+    }
+
+    static class ButtonInfo {
+        private Button mPositiveButton;
+        private Button mNegativeButton;
+        private CharSequence mText;
+        private View.OnClickListener mListener;
+        private boolean mIsPositive = true;
+        private boolean mIsEnabled = true;
+        private boolean mIsVisible = true;
+
+        void setUpButton() {
+            setUpButton(mPositiveButton);
+            setUpButton(mNegativeButton);
+            if (!mIsVisible) {
+                mPositiveButton.setVisibility(View.INVISIBLE);
+                mNegativeButton.setVisibility(View.INVISIBLE);
+            } else if (mIsPositive) {
+                mPositiveButton.setVisibility(View.VISIBLE);
+                mNegativeButton.setVisibility(View.INVISIBLE);
+            } else {
+                mPositiveButton.setVisibility(View.INVISIBLE);
+                mNegativeButton.setVisibility(View.VISIBLE);
+            }
+        }
+
+        private void setUpButton(Button button) {
+            button.setText(mText);
+            button.setOnClickListener(mListener);
+            button.setEnabled(mIsEnabled);
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/com/android/settings/widget/AppPreference.java b/src/com/android/settings/widget/AppPreference.java
new file mode 100644
index 0000000..8a0e6a1
--- /dev/null
+++ b/src/com/android/settings/widget/AppPreference.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.widget;
+
+import android.content.Context;
+import android.support.v7.preference.Preference;
+import android.support.v7.preference.PreferenceViewHolder;
+import android.text.TextUtils;
+import android.util.AttributeSet;
+import android.view.View;
+import android.widget.ProgressBar;
+
+import com.android.settings.R;
+
+public class AppPreference extends Preference {
+
+    private int mProgress;
+    private boolean mProgressVisible;
+
+    public AppPreference(Context context) {
+        super(context);
+        setLayoutResource(R.layout.preference_app);
+    }
+
+    public AppPreference(Context context, AttributeSet attrs) {
+        super(context, attrs);
+        setLayoutResource(R.layout.preference_app);
+    }
+
+    public void setProgress(int amount) {
+        mProgress = amount;
+        mProgressVisible = true;
+        notifyChanged();
+    }
+
+    @Override
+    public void onBindViewHolder(PreferenceViewHolder view) {
+        super.onBindViewHolder(view);
+
+        view.findViewById(R.id.summary_container)
+                .setVisibility(TextUtils.isEmpty(getSummary()) ? View.GONE : View.VISIBLE);
+        final ProgressBar progress = (ProgressBar) view.findViewById(android.R.id.progress);
+        if (mProgressVisible) {
+            progress.setProgress(mProgress);
+            progress.setVisibility(View.VISIBLE);
+        } else {
+            progress.setVisibility(View.GONE);
+        }
+    }
+}
diff --git a/src/com/android/settings/widget/AppSwitchPreference.java b/src/com/android/settings/widget/AppSwitchPreference.java
new file mode 100644
index 0000000..d67e895
--- /dev/null
+++ b/src/com/android/settings/widget/AppSwitchPreference.java
@@ -0,0 +1,41 @@
+/*
+ * Copyright (C) 2017 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF 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.SwitchPreference;
+import android.support.v7.preference.PreferenceViewHolder;
+import android.text.TextUtils;
+import android.view.View;
+
+import com.android.settings.R;
+
+public class AppSwitchPreference extends SwitchPreference {
+
+    public AppSwitchPreference(Context context) {
+        super(context);
+        setLayoutResource(R.layout.preference_app);
+    }
+
+    @Override
+    public void onBindViewHolder(PreferenceViewHolder view) {
+        super.onBindViewHolder(view);
+
+        view.findViewById(R.id.summary_container)
+                .setVisibility(TextUtils.isEmpty(getSummary()) ? View.GONE : View.VISIBLE);
+    }
+}
diff --git a/src/com/android/settings/widget/AspectRatioFrameLayout.java b/src/com/android/settings/widget/AspectRatioFrameLayout.java
index 14d7921..bb4c28b 100644
--- a/src/com/android/settings/widget/AspectRatioFrameLayout.java
+++ b/src/com/android/settings/widget/AspectRatioFrameLayout.java
@@ -22,12 +22,14 @@
 import com.android.settings.R;
 
 /**
- * A {@link FrameLayout} with customizable aspect ration.
+ * A {@link FrameLayout} with customizable aspect ratio.
  * This is used to avoid dynamically calculating the height for the frame. Default aspect
  * ratio will be 1 if none is set in layout attribute.
  */
 public final class AspectRatioFrameLayout extends FrameLayout {
 
+    private static final float ASPECT_RATIO_CHANGE_THREASHOLD = 0.01f;
+
     private float mAspectRatio = 1.0f;
 
     public AspectRatioFrameLayout(Context context) {
@@ -51,7 +53,25 @@
 
     @Override
     protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
-        super.onMeasure(widthMeasureSpec, (int) (widthMeasureSpec / mAspectRatio));
+        super.onMeasure(widthMeasureSpec, heightMeasureSpec);
+        int width = getMeasuredWidth();
+        int height = getMeasuredHeight();
+        if (width == 0 || height == 0) {
+            return;
+        }
+        final float viewAspectRatio = (float) width / height;
+        final float aspectRatioDiff = mAspectRatio - viewAspectRatio;
+        if (Math.abs(aspectRatioDiff) <= ASPECT_RATIO_CHANGE_THREASHOLD) {
+            // Close enough, skip.
+            return;
+        }
+        if (aspectRatioDiff > 0) {
+            width = (int) (height * mAspectRatio);
+        } else {
+            height = (int) (width / mAspectRatio);
+        }
+        super.onMeasure(MeasureSpec.makeMeasureSpec(width, MeasureSpec.EXACTLY),
+                MeasureSpec.makeMeasureSpec(height, MeasureSpec.EXACTLY));
     }
 
 }
diff --git a/src/com/android/settings/widget/ChartGridView.java b/src/com/android/settings/widget/ChartGridView.java
index 2091719..b456a49 100644
--- a/src/com/android/settings/widget/ChartGridView.java
+++ b/src/com/android/settings/widget/ChartGridView.java
@@ -170,8 +170,9 @@
         paint.setColor(mLabelColor);
         paint.setTextSize(mLabelSize);
 
-        return new StaticLayout(text, paint,
-                (int) Math.ceil(Layout.getDesiredWidth(text, paint)),
-                Layout.Alignment.ALIGN_NORMAL, 1.f, 0, true);
+        return StaticLayout.Builder.obtain(text, 0, text.length(), paint,
+                (int) Math.ceil(Layout.getDesiredWidth(text, paint)))
+                .setUseLineSpacingFromFallbacks(true)
+                .build();
     }
 }
diff --git a/src/com/android/settings/widget/ChartSweepView.java b/src/com/android/settings/widget/ChartSweepView.java
index cdcd0a7..de1bc08 100644
--- a/src/com/android/settings/widget/ChartSweepView.java
+++ b/src/com/android/settings/widget/ChartSweepView.java
@@ -265,8 +265,11 @@
             paint.setColor(mLabelColor);
 
             mLabelTemplate = new SpannableStringBuilder(template);
-            mLabelLayout = new DynamicLayout(
-                    mLabelTemplate, paint, LARGE_WIDTH, Alignment.ALIGN_RIGHT, 1f, 0f, false);
+            mLabelLayout = DynamicLayout.Builder.obtain(mLabelTemplate, paint, LARGE_WIDTH)
+                    .setAlignment(Alignment.ALIGN_RIGHT)
+                    .setIncludePad(false)
+                    .setUseLineSpacingFromFallbacks(true)
+                    .build();
             invalidateLabel();
 
         } else {
diff --git a/src/com/android/settings/widget/EntityHeaderController.java b/src/com/android/settings/widget/EntityHeaderController.java
index c38ad02..5fa7586 100644
--- a/src/com/android/settings/widget/EntityHeaderController.java
+++ b/src/com/android/settings/widget/EntityHeaderController.java
@@ -32,6 +32,7 @@
 import android.support.annotation.VisibleForTesting;
 import android.support.v7.widget.RecyclerView;
 import android.text.TextUtils;
+import android.util.FeatureFlagUtils;
 import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.View;
@@ -44,6 +45,8 @@
 import com.android.settings.applications.AppInfoBase;
 import com.android.settings.applications.InstalledAppDetails;
 import com.android.settings.applications.LayoutPreference;
+import com.android.settings.applications.AppInfoDashboardFragment;
+import com.android.settings.core.FeatureFlags;
 import com.android.settings.overlay.FeatureFactory;
 import com.android.settingslib.applications.ApplicationsState;
 import com.android.settingslib.core.lifecycle.Lifecycle;
@@ -272,11 +275,17 @@
         entityHeaderContent.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);
-
+                if (FeatureFlagUtils.isEnabled(mAppContext, FeatureFlags.APP_INFO_V2)) {
+                    AppInfoBase.startAppInfoFragment(
+                            AppInfoDashboardFragment.class, R.string.application_info_label,
+                            mPackageName, mUid, mFragment, 0 /* request */,
+                            mMetricsCategory);
+                } else {
+                    AppInfoBase.startAppInfoFragment(
+                            InstalledAppDetails.class, R.string.application_info_label,
+                            mPackageName, mUid, mFragment, 0 /* request */,
+                            mMetricsCategory);
+                }
             }
         });
         return;
diff --git a/src/com/android/settings/widget/MasterSwitchController.java b/src/com/android/settings/widget/MasterSwitchController.java
index f7253fd..a22640c 100644
--- a/src/com/android/settings/widget/MasterSwitchController.java
+++ b/src/com/android/settings/widget/MasterSwitchController.java
@@ -74,9 +74,4 @@
     public void setDisabledByAdmin(EnforcedAdmin admin) {
         mPreference.setDisabledByAdmin(admin);
     }
-
-    @Override
-    public Switch getSwitch() {
-        return mPreference.getSwitch();
-    }
 }
diff --git a/src/com/android/settings/widget/MasterSwitchPreference.java b/src/com/android/settings/widget/MasterSwitchPreference.java
index 29bc17b..d47de88 100644
--- a/src/com/android/settings/widget/MasterSwitchPreference.java
+++ b/src/com/android/settings/widget/MasterSwitchPreference.java
@@ -90,7 +90,7 @@
     }
 
     public boolean isChecked() {
-        return mSwitch != null && mSwitch.isEnabled() && mChecked;
+        return mSwitch != null && mChecked;
     }
 
     public void setChecked(boolean checked) {
diff --git a/src/com/android/settings/widget/PreferenceCategoryController.java b/src/com/android/settings/widget/PreferenceCategoryController.java
new file mode 100644
index 0000000..9836476
--- /dev/null
+++ b/src/com/android/settings/widget/PreferenceCategoryController.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.widget;
+
+import android.content.Context;
+
+import com.android.settings.core.PreferenceControllerMixin;
+import com.android.settingslib.core.AbstractPreferenceController;
+
+import java.util.List;
+
+/**
+ * A controller for generic Preference categories. If all controllers for its children reports
+ * not-available, this controller will also report not-available, and subsequently will be hidden by
+ * UI.
+ */
+public class PreferenceCategoryController extends AbstractPreferenceController
+        implements PreferenceControllerMixin {
+
+    private final String mKey;
+    private final List<AbstractPreferenceController> mChildren;
+
+    public PreferenceCategoryController(Context context,
+            String key, List<AbstractPreferenceController> childrenControllers) {
+        super(context);
+        mKey = key;
+        mChildren = childrenControllers;
+    }
+
+    @Override
+    public boolean isAvailable() {
+        if (mChildren == null || mChildren.isEmpty()) {
+            return true;
+        }
+        // Category is available if any child is available
+        for (AbstractPreferenceController controller : mChildren) {
+            if (controller.isAvailable()) {
+                return true;
+            }
+        }
+        return false;
+    }
+
+    @Override
+    public String getPreferenceKey() {
+        return mKey;
+    }
+}
diff --git a/src/com/android/settings/widget/RadioButtonPickerFragment.java b/src/com/android/settings/widget/RadioButtonPickerFragment.java
index 6854793..b3e8746 100644
--- a/src/com/android/settings/widget/RadioButtonPickerFragment.java
+++ b/src/com/android/settings/widget/RadioButtonPickerFragment.java
@@ -21,6 +21,7 @@
 import android.os.Bundle;
 import android.os.UserHandle;
 import android.os.UserManager;
+import android.support.annotation.LayoutRes;
 import android.support.annotation.VisibleForTesting;
 import android.support.v7.preference.Preference;
 import android.support.v7.preference.PreferenceScreen;
@@ -67,7 +68,6 @@
     @Override
     public void onCreatePreferences(Bundle savedInstanceState, String rootKey) {
         super.onCreatePreferences(savedInstanceState, rootKey);
-        addPreferencesFromResource(R.xml.placeholder_prefs);
         updateCandidates();
     }
 
@@ -80,6 +80,9 @@
     }
 
     @Override
+    protected abstract int getPreferenceScreenResId();
+
+    @Override
     public void onRadioButtonClicked(RadioButtonPreference selected) {
         final String selectedKey = selected.getKey();
         onRadioButtonConfirmed(selectedKey);
@@ -131,8 +134,13 @@
         final String systemDefaultKey = getSystemDefaultKey();
         final PreferenceScreen screen = getPreferenceScreen();
         screen.removeAll();
+
+        final int customLayoutResId = getRadioButtonPreferenceCustomLayoutResId();
         if (shouldShowItemNone()) {
             final RadioButtonPreference nonePref = new RadioButtonPreference(getPrefContext());
+            if (customLayoutResId > 0) {
+                nonePref.setLayoutResource(customLayoutResId);
+            }
             nonePref.setIcon(R.drawable.ic_remove_circle);
             nonePref.setTitle(R.string.app_list_preference_none);
             nonePref.setChecked(TextUtils.isEmpty(defaultKey));
@@ -142,6 +150,9 @@
         if (candidateList != null) {
             for (CandidateInfo info : candidateList) {
                 RadioButtonPreference pref = new RadioButtonPreference(getPrefContext());
+                if (customLayoutResId > 0) {
+                    pref.setLayoutResource(customLayoutResId);
+                }
                 bindPreference(pref, info.getKey(), info, defaultKey);
                 bindPreferenceExtra(pref, info.getKey(), info, defaultKey, systemDefaultKey);
                 screen.addPreference(pref);
@@ -154,7 +165,7 @@
     public RadioButtonPreference bindPreference(RadioButtonPreference pref,
             String key, CandidateInfo info, String defaultKey) {
         pref.setTitle(info.loadLabel());
-        pref.setIcon(info.loadIcon());
+        Utils.setSafeIcon(pref, info.loadIcon());
         pref.setKey(key);
         if (TextUtils.equals(defaultKey, key)) {
             pref.setChecked(true);
@@ -204,6 +215,14 @@
         return null;
     }
 
+    /**
+     * Provides a custom layout for each candidate row.
+     */
+    @LayoutRes
+    protected int getRadioButtonPreferenceCustomLayoutResId() {
+        return 0;
+    }
+
     public static abstract class CandidateInfo {
 
         public final boolean enabled;
diff --git a/src/com/android/settings/widget/SwitchBarController.java b/src/com/android/settings/widget/SwitchBarController.java
index 624db2a..cc4c8dc 100644
--- a/src/com/android/settings/widget/SwitchBarController.java
+++ b/src/com/android/settings/widget/SwitchBarController.java
@@ -82,10 +82,4 @@
     public void setDisabledByAdmin(EnforcedAdmin admin) {
         mSwitchBar.setDisabledByAdmin(admin);
     }
-
-    @Override
-    public Switch getSwitch() {
-        return mSwitchBar.getSwitch();
-    }
-
 }
diff --git a/src/com/android/settings/widget/SwitchWidgetController.java b/src/com/android/settings/widget/SwitchWidgetController.java
index 325a093..6c4f40a 100644
--- a/src/com/android/settings/widget/SwitchWidgetController.java
+++ b/src/com/android/settings/widget/SwitchWidgetController.java
@@ -16,7 +16,6 @@
 
 package com.android.settings.widget;
 
-import android.widget.Switch;
 import com.android.settingslib.RestrictedLockUtils.EnforcedAdmin;
 
 /*
@@ -108,12 +107,4 @@
      * is {@code null}, then this preference will be enabled. Otherwise, it will be disabled.
      */
     public abstract void setDisabledByAdmin(EnforcedAdmin admin);
-
-    /**
-     * Get the underlying switch widget.
-     *
-     * @return the switch widget.
-     */
-    public abstract Switch getSwitch();
-
 }
\ No newline at end of file
diff --git a/src/com/android/settings/widget/WorkOnlyCategory.java b/src/com/android/settings/widget/WorkOnlyCategory.java
new file mode 100644
index 0000000..53badb2
--- /dev/null
+++ b/src/com/android/settings/widget/WorkOnlyCategory.java
@@ -0,0 +1,38 @@
+/*
+ * 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.os.UserManager;
+import android.support.v7.preference.PreferenceCategory;
+import android.util.AttributeSet;
+
+import com.android.settings.SelfAvailablePreference;
+import com.android.settings.Utils;
+
+/**
+ * A PreferenceCategory that is only visible when the device has a work profile.
+ */
+public class WorkOnlyCategory extends PreferenceCategory implements SelfAvailablePreference {
+
+    public WorkOnlyCategory(Context context, AttributeSet attrs) {
+        super(context, attrs);
+    }
+
+    @Override
+    public boolean isAvailable(Context context) {
+        return Utils.getManagedProfile(UserManager.get(context)) != null;
+    }
+}
diff --git a/src/com/android/settings/wifi/ConfigureWifiSettings.java b/src/com/android/settings/wifi/ConfigureWifiSettings.java
index 4199a6d..13ec152 100644
--- a/src/com/android/settings/wifi/ConfigureWifiSettings.java
+++ b/src/com/android/settings/wifi/ConfigureWifiSettings.java
@@ -23,17 +23,18 @@
 import android.net.NetworkInfo;
 import android.net.NetworkScoreManager;
 import android.net.wifi.WifiManager;
+import android.os.Bundle;
 import android.provider.SearchIndexableResource;
 
 import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
 import com.android.settings.R;
 import com.android.settings.dashboard.DashboardFragment;
-import com.android.settings.network.NetworkScoreManagerWrapper;
 import com.android.settings.network.NetworkScorerPickerPreferenceController;
 import com.android.settings.network.WifiCallingPreferenceController;
 import com.android.settings.search.BaseSearchIndexProvider;
 import com.android.settings.search.Indexable;
 import com.android.settings.wifi.p2p.WifiP2pPreferenceController;
+import com.android.settings.wrapper.NetworkScoreManagerWrapper;
 import com.android.settingslib.core.AbstractPreferenceController;
 
 import java.util.ArrayList;
@@ -60,8 +61,8 @@
     }
 
     @Override
-    public void onAttach(Context context) {
-        super.onAttach(context);
+    public void onCreate(Bundle icicle) {
+        super.onCreate(icicle);
         int tileLimit = 1;
         if (mWifiWakeupPreferenceController.isAvailable()) {
             tileLimit++;
@@ -69,7 +70,7 @@
         if (mUseOpenWifiPreferenceController.isAvailable()) {
             tileLimit++;
         }
-        mProgressiveDisclosureMixin.setTileLimit(tileLimit);
+        getPreferenceScreen().setInitialExpandedChildrenCount(tileLimit);
     }
 
     @Override
diff --git a/src/com/android/settings/wifi/ConnectedAccessPointPreference.java b/src/com/android/settings/wifi/ConnectedAccessPointPreference.java
new file mode 100644
index 0000000..6b9c788
--- /dev/null
+++ b/src/com/android/settings/wifi/ConnectedAccessPointPreference.java
@@ -0,0 +1,78 @@
+/*
+ * Copyright (C) 2017 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF 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.support.annotation.DrawableRes;
+import android.support.v7.preference.PreferenceViewHolder;
+import android.view.View;
+
+import com.android.settings.R;
+import com.android.settingslib.wifi.AccessPoint;
+import com.android.settingslib.wifi.AccessPointPreference;
+
+/**
+ * An AP preference for the currently connected AP
+ */
+public class ConnectedAccessPointPreference extends AccessPointPreference implements
+        View.OnClickListener {
+
+    private OnGearClickListener mOnGearClickListener;
+
+    public ConnectedAccessPointPreference(AccessPoint accessPoint, Context context,
+            UserBadgeCache cache, @DrawableRes int iconResId, boolean forSavedNetworks) {
+        super(accessPoint, context, cache, iconResId, forSavedNetworks);
+    }
+
+    public void setOnGearClickListener(OnGearClickListener l) {
+        mOnGearClickListener = l;
+        notifyChanged();
+    }
+
+    @Override
+    protected int getSecondTargetResId() {
+        return R.layout.preference_widget_gear;
+    }
+
+    @Override
+    protected boolean shouldHideSecondTarget() {
+        return mOnGearClickListener == null;
+    }
+
+    @Override
+    public void onBindViewHolder(PreferenceViewHolder holder) {
+        super.onBindViewHolder(holder);
+        final View gear = holder.findViewById(R.id.settings_button);
+        if (gear != null) {
+            gear.setOnClickListener(this);
+        }
+        setDividerVisibility(holder, View.VISIBLE);
+    }
+
+    @Override
+    public void onClick(View v) {
+        if (v.getId() == R.id.settings_button) {
+            if (mOnGearClickListener != null) {
+                mOnGearClickListener.onGearClick(this);
+            }
+        }
+    }
+
+    public interface OnGearClickListener {
+        void onGearClick(ConnectedAccessPointPreference p);
+    }
+}
diff --git a/src/com/android/settings/wifi/ConnectivityManagerWrapper.java b/src/com/android/settings/wifi/ConnectivityManagerWrapper.java
deleted file mode 100644
index 7317666..0000000
--- a/src/com/android/settings/wifi/ConnectivityManagerWrapper.java
+++ /dev/null
@@ -1,36 +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.net.ConnectivityManager;
-
-/**
- * Wrapper around {@link ConnectivityManager} to facilitate unit testing.
- */
-public class ConnectivityManagerWrapper {
-    private final ConnectivityManager mConnectivityManager;
-
-    public ConnectivityManagerWrapper(ConnectivityManager connectivityManager) {
-        mConnectivityManager = connectivityManager;
-    }
-
-    /**
-     * {@link ConnectivityManager#stopTethering}
-     */
-    public void stopTethering(int type) {
-        mConnectivityManager.stopTethering(type);
-    }
-}
diff --git a/src/com/android/settings/wifi/SavedAccessPointsWifiSettings.java b/src/com/android/settings/wifi/SavedAccessPointsWifiSettings.java
index 5cb3679..9f52159 100644
--- a/src/com/android/settings/wifi/SavedAccessPointsWifiSettings.java
+++ b/src/com/android/settings/wifi/SavedAccessPointsWifiSettings.java
@@ -20,11 +20,11 @@
 import android.app.Activity;
 import android.app.Dialog;
 import android.content.Context;
-import android.content.res.Resources;
 import android.icu.text.Collator;
 import android.net.wifi.WifiManager;
 import android.os.Bundle;
-import android.provider.SearchIndexableResource;
+import android.os.Handler;
+import android.support.annotation.VisibleForTesting;
 import android.support.v7.preference.Preference;
 import android.support.v7.preference.PreferenceScreen;
 import android.util.Log;
@@ -34,15 +34,12 @@
 import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
 import com.android.settings.R;
 import com.android.settings.SettingsPreferenceFragment;
-import com.android.settings.search.BaseSearchIndexProvider;
 import com.android.settings.search.Indexable;
-import com.android.settings.search.SearchIndexableRaw;
+import com.android.settings.wrapper.WifiManagerWrapper;
 import com.android.settingslib.wifi.AccessPoint;
 import com.android.settingslib.wifi.AccessPointPreference;
 import com.android.settingslib.wifi.WifiSavedConfigUtils;
 
-import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.Collections;
 import java.util.Comparator;
 import java.util.List;
@@ -53,7 +50,9 @@
  */
 public class SavedAccessPointsWifiSettings extends SettingsPreferenceFragment
         implements Indexable, WifiDialog.WifiDialogListener {
-    private static final String TAG = "SavedAccessPointsWifiSettings";
+    private static final String TAG = "SavedAccessPoints";
+    @VisibleForTesting
+    static final int MSG_UPDATE_PREFERENCES = 1;
     private static final Comparator<AccessPoint> SAVED_NETWORK_COMPARATOR =
             new Comparator<AccessPoint>() {
         final Collator mCollator = Collator.getInstance();
@@ -68,22 +67,33 @@
         }
     };
 
-    private final WifiManager.ActionListener mForgetListener = new WifiManager.ActionListener() {
+    @VisibleForTesting
+    final WifiManager.ActionListener mForgetListener = new WifiManager.ActionListener() {
         @Override
         public void onSuccess() {
-            initPreferences();
+            postUpdatePreference();
         }
 
         @Override
         public void onFailure(int reason) {
-            initPreferences();
+            postUpdatePreference();
+        }
+    };
+
+    @VisibleForTesting
+    final Handler mHandler = new Handler() {
+        @Override
+        public void handleMessage(android.os.Message msg) {
+            if (msg.what == MSG_UPDATE_PREFERENCES) {
+                initPreferences();
+            }
         }
     };
 
     private final WifiManager.ActionListener mSaveListener = new WifiManager.ActionListener() {
         @Override
         public void onSuccess() {
-            initPreferences();
+            postUpdatePreference();
         }
         @Override
         public void onFailure(int reason) {
@@ -97,7 +107,7 @@
     };
 
     private WifiDialog mDialog;
-    private WifiManager mWifiManager;
+    private WifiManagerWrapper mWifiManager;
     private AccessPoint mDlgAccessPoint;
     private Bundle mAccessPointSavedState;
     private AccessPoint mSelectedAccessPoint;
@@ -129,7 +139,7 @@
     @Override
     public void onActivityCreated(Bundle savedInstanceState) {
         super.onActivityCreated(savedInstanceState);
-        mWifiManager = (WifiManager) getSystemService(Context.WIFI_SERVICE);
+        mWifiManager = new WifiManagerWrapper((WifiManager) getSystemService(Context.WIFI_SERVICE));
 
         if (savedInstanceState != null) {
             if (savedInstanceState.containsKey(SAVE_DIALOG_ACCESS_POINT_STATE)) {
@@ -144,7 +154,7 @@
         final Context context = getPrefContext();
 
         final List<AccessPoint> accessPoints =
-                WifiSavedConfigUtils.getAllConfigs(context, mWifiManager);
+                WifiSavedConfigUtils.getAllConfigs(context, mWifiManager.getWifiManager());
         Collections.sort(accessPoints, SAVED_NETWORK_COMPARATOR);
         cacheRemoveAllPrefs(preferenceScreen);
 
@@ -179,6 +189,12 @@
         }
     }
 
+    private void postUpdatePreference() {
+        if (!mHandler.hasMessages(MSG_UPDATE_PREFERENCES)) {
+            mHandler.sendEmptyMessage(MSG_UPDATE_PREFERENCES);
+        }
+    }
+
     private void showWifiDialog(@Nullable LongPressAccessPointPreference accessPoint) {
         if (mDialog != null) {
             removeDialog(WifiSettings.WIFI_DIALOG_ID);
@@ -258,7 +274,7 @@
                     Log.e(TAG, "Failed to remove Passpoint configuration for "
                             + mSelectedAccessPoint.getConfigName());
                 }
-                initPreferences();
+                postUpdatePreference();
             } else {
                 // mForgetListener will call initPreferences upon completion
                 mWifiManager.forget(mSelectedAccessPoint.getConfig().networkId, mForgetListener);
@@ -284,47 +300,4 @@
             return super.onPreferenceTreeClick(preference);
         }
     }
-
-    /**
-     * For search.
-     */
-    public static final SearchIndexProvider SEARCH_INDEX_DATA_PROVIDER =
-        new BaseSearchIndexProvider() {
-            @Override
-            public List<SearchIndexableResource> getXmlResourcesToIndex(Context context,
-                    boolean enabled) {
-                SearchIndexableResource sir = new SearchIndexableResource(context);
-                sir.xmlResId = R.xml.wifi_display_saved_access_points;
-                return Arrays.asList(sir);
-            }
-
-            @Override
-            public List<SearchIndexableRaw> getRawDataToIndex(Context context, boolean enabled) {
-                final List<SearchIndexableRaw> result = new ArrayList<SearchIndexableRaw>();
-                final Resources res = context.getResources();
-                final String title = res.getString(R.string.wifi_saved_access_points_titlebar);
-
-                // Add fragment title
-                SearchIndexableRaw data = new SearchIndexableRaw(context);
-                data.title = title;
-                data.screenTitle = title;
-                data.enabled = enabled;
-                result.add(data);
-
-                // Add available Wi-Fi access points
-                final List<AccessPoint> accessPoints = WifiSavedConfigUtils.getAllConfigs(
-                        context, context.getSystemService(WifiManager.class));
-
-                final int accessPointsSize = accessPoints.size();
-                for (int i = 0; i < accessPointsSize; ++i){
-                    data = new SearchIndexableRaw(context);
-                    data.title = accessPoints.get(i).getSsidStr();
-                    data.screenTitle = title;
-                    data.enabled = enabled;
-                    result.add(data);
-                }
-
-                return result;
-            }
-        };
 }
diff --git a/src/com/android/settings/wifi/UseOpenWifiPreferenceController.java b/src/com/android/settings/wifi/UseOpenWifiPreferenceController.java
index d44c8a9..c563fce 100644
--- a/src/com/android/settings/wifi/UseOpenWifiPreferenceController.java
+++ b/src/com/android/settings/wifi/UseOpenWifiPreferenceController.java
@@ -21,7 +21,7 @@
 
 import com.android.settings.R;
 import com.android.settings.core.PreferenceControllerMixin;
-import com.android.settings.network.NetworkScoreManagerWrapper;
+import com.android.settings.wrapper.NetworkScoreManagerWrapper;
 import com.android.settingslib.core.AbstractPreferenceController;
 import com.android.settingslib.core.lifecycle.Lifecycle;
 import com.android.settingslib.core.lifecycle.LifecycleObserver;
diff --git a/src/com/android/settings/wifi/WifiApDialog.java b/src/com/android/settings/wifi/WifiApDialog.java
deleted file mode 100644
index 1316a49..0000000
--- a/src/com/android/settings/wifi/WifiApDialog.java
+++ /dev/null
@@ -1,263 +0,0 @@
-/*
- * Copyright (C) 2010 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.wifi;
-
-import android.app.AlertDialog;
-import android.content.Context;
-import android.content.DialogInterface;
-import android.net.wifi.WifiConfiguration;
-import android.net.wifi.WifiConfiguration.AuthAlgorithm;
-import android.net.wifi.WifiConfiguration.KeyMgmt;
-import android.net.wifi.WifiManager;
-import android.os.Bundle;
-import android.text.Editable;
-import android.text.InputType;
-import android.text.TextWatcher;
-import android.util.Log;
-import android.view.View;
-import android.widget.AdapterView;
-import android.widget.ArrayAdapter;
-import android.widget.CheckBox;
-import android.widget.EditText;
-import android.widget.Spinner;
-import android.widget.TextView;
-
-import com.android.settings.R;
-
-import java.nio.charset.Charset;
-
-/**
- * Dialog to configure the SSID and security settings
- * for Access Point operation
- */
-public class WifiApDialog extends AlertDialog implements View.OnClickListener,
-        TextWatcher, AdapterView.OnItemSelectedListener {
-
-    static final int BUTTON_SUBMIT = DialogInterface.BUTTON_POSITIVE;
-
-    private final DialogInterface.OnClickListener mListener;
-
-    public static final int OPEN_INDEX = 0;
-    public static final int WPA2_INDEX = 1;
-
-    private View mView;
-    private TextView mSsid;
-    private int mSecurityTypeIndex = OPEN_INDEX;
-    private EditText mPassword;
-    private int mBandIndex = OPEN_INDEX;
-
-    WifiConfiguration mWifiConfig;
-    WifiManager mWifiManager;
-    private Context mContext;
-
-    private static final String TAG = "WifiApDialog";
-
-    public WifiApDialog(Context context, DialogInterface.OnClickListener listener,
-            WifiConfiguration wifiConfig) {
-        super(context);
-        mListener = listener;
-        mWifiConfig = wifiConfig;
-        if (wifiConfig != null) {
-            mSecurityTypeIndex = getSecurityTypeIndex(wifiConfig);
-        }
-        mWifiManager = (WifiManager) context.getSystemService(Context.WIFI_SERVICE);
-        mContext =  context;
-    }
-
-    public static int getSecurityTypeIndex(WifiConfiguration wifiConfig) {
-        if (wifiConfig.allowedKeyManagement.get(KeyMgmt.WPA2_PSK)) {
-            return WPA2_INDEX;
-        }
-        return OPEN_INDEX;
-    }
-
-    public WifiConfiguration getConfig() {
-
-        WifiConfiguration config = new WifiConfiguration();
-
-        /**
-         * TODO: SSID in WifiConfiguration for soft ap
-         * is being stored as a raw string without quotes.
-         * This is not the case on the client side. We need to
-         * make things consistent and clean it up
-         */
-        config.SSID = mSsid.getText().toString();
-
-        config.apBand = mBandIndex;
-
-        switch (mSecurityTypeIndex) {
-            case OPEN_INDEX:
-                config.allowedKeyManagement.set(KeyMgmt.NONE);
-                return config;
-
-            case WPA2_INDEX:
-                config.allowedKeyManagement.set(KeyMgmt.WPA2_PSK);
-                config.allowedAuthAlgorithms.set(AuthAlgorithm.OPEN);
-                if (mPassword.length() != 0) {
-                    String password = mPassword.getText().toString();
-                    config.preSharedKey = password;
-                }
-                return config;
-        }
-        return null;
-    }
-
-    @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        boolean mInit = true;
-        mView = getLayoutInflater().inflate(R.layout.wifi_ap_dialog, null);
-        Spinner mSecurity = ((Spinner) mView.findViewById(R.id.security));
-        final Spinner mChannel = (Spinner) mView.findViewById(R.id.choose_channel);
-
-        setView(mView);
-        setInverseBackgroundForced(true);
-
-        Context context = getContext();
-
-        setTitle(R.string.wifi_tether_configure_ap_text);
-        mView.findViewById(R.id.type).setVisibility(View.VISIBLE);
-        mSsid = (TextView) mView.findViewById(R.id.ssid);
-        mPassword = (EditText) mView.findViewById(R.id.password);
-
-        ArrayAdapter <CharSequence> channelAdapter;
-        String countryCode = mWifiManager.getCountryCode();
-        if (!mWifiManager.isDualBandSupported() || countryCode == null) {
-            //If no country code, 5GHz AP is forbidden
-            Log.i(TAG,(!mWifiManager.isDualBandSupported() ? "Device do not support 5GHz " :"") 
-                    + (countryCode == null ? " NO country code" :"") +  " forbid 5GHz");
-            channelAdapter = ArrayAdapter.createFromResource(mContext,
-                    R.array.wifi_ap_band_config_2G_only, android.R.layout.simple_spinner_item);
-            mWifiConfig.apBand = 0;
-        } else {
-            channelAdapter = ArrayAdapter.createFromResource(mContext,
-                    R.array.wifi_ap_band_config_full, android.R.layout.simple_spinner_item);
-        }
-
-        channelAdapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item);
-
-        setButton(BUTTON_SUBMIT, context.getString(R.string.wifi_save), mListener);
-        setButton(DialogInterface.BUTTON_NEGATIVE,
-        context.getString(R.string.wifi_cancel), mListener);
-
-        if (mWifiConfig != null) {
-            mSsid.setText(mWifiConfig.SSID);
-            if (mWifiConfig.apBand == 0) {
-               mBandIndex = 0;
-            } else {
-               mBandIndex = 1;
-            }
-
-            mSecurity.setSelection(mSecurityTypeIndex);
-            if (mSecurityTypeIndex == WPA2_INDEX) {
-                mPassword.setText(mWifiConfig.preSharedKey);
-            }
-        }
-
-        mChannel.setAdapter(channelAdapter);
-        mChannel.setOnItemSelectedListener(
-                new AdapterView.OnItemSelectedListener() {
-                    boolean mInit = true;
-                    @Override
-                    public void onItemSelected(AdapterView<?> adapterView, View view, int position,
-                                               long id) {
-                        if (!mInit) {
-                            mBandIndex = position;
-                            mWifiConfig.apBand = mBandIndex;
-                            Log.i(TAG, "config on channelIndex : " + mBandIndex + " Band: " +
-                                    mWifiConfig.apBand);
-                        } else {
-                            mInit = false;
-                            mChannel.setSelection(mBandIndex);
-                        }
-
-                    }
-
-                    @Override
-                    public void onNothingSelected(AdapterView<?> adapterView) {
-
-                    }
-                }
-        );
-
-        mSsid.addTextChangedListener(this);
-        mPassword.addTextChangedListener(this);
-        ((CheckBox) mView.findViewById(R.id.show_password)).setOnClickListener(this);
-        mSecurity.setOnItemSelectedListener(this);
-
-        super.onCreate(savedInstanceState);
-
-        showSecurityFields();
-        validate();
-    }
-
-    public void onRestoreInstanceState(Bundle savedInstanceState) {
-        super.onRestoreInstanceState(savedInstanceState);
-        mPassword.setInputType(
-                InputType.TYPE_CLASS_TEXT |
-                (((CheckBox) mView.findViewById(R.id.show_password)).isChecked() ?
-                InputType.TYPE_TEXT_VARIATION_VISIBLE_PASSWORD :
-                InputType.TYPE_TEXT_VARIATION_PASSWORD));
-    }
-
-    private void validate() {
-        String mSsidString = mSsid.getText().toString();
-        if ((mSsid != null && mSsid.length() == 0)
-                || ((mSecurityTypeIndex == WPA2_INDEX) && mPassword.length() < 8)
-                || (mSsid != null &&
-                Charset.forName("UTF-8").encode(mSsidString).limit() > 32)) {
-            getButton(BUTTON_SUBMIT).setEnabled(false);
-        } else {
-            getButton(BUTTON_SUBMIT).setEnabled(true);
-        }
-    }
-
-    public void onClick(View view) {
-        mPassword.setInputType(
-                InputType.TYPE_CLASS_TEXT | (((CheckBox) view).isChecked() ?
-                InputType.TYPE_TEXT_VARIATION_VISIBLE_PASSWORD :
-                InputType.TYPE_TEXT_VARIATION_PASSWORD));
-    }
-
-    public void onTextChanged(CharSequence s, int start, int before, int count) {
-    }
-
-    public void beforeTextChanged(CharSequence s, int start, int count, int after) {
-    }
-
-    public void afterTextChanged(Editable editable) {
-        validate();
-    }
-
-    @Override
-    public void onItemSelected(AdapterView<?> parent, View view, int position, long id) {
-        mSecurityTypeIndex = position;
-        showSecurityFields();
-        validate();
-    }
-
-    @Override
-    public void onNothingSelected(AdapterView<?> parent) {
-    }
-
-    private void showSecurityFields() {
-        if (mSecurityTypeIndex == OPEN_INDEX) {
-            mView.findViewById(R.id.fields).setVisibility(View.GONE);
-            return;
-        }
-        mView.findViewById(R.id.fields).setVisibility(View.VISIBLE);
-    }
-}
diff --git a/src/com/android/settings/wifi/WifiApEnabler.java b/src/com/android/settings/wifi/WifiApEnabler.java
deleted file mode 100644
index 2a8015b..0000000
--- a/src/com/android/settings/wifi/WifiApEnabler.java
+++ /dev/null
@@ -1,188 +0,0 @@
-/*
- * Copyright (C) 2010 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.wifi;
-
-import android.content.BroadcastReceiver;
-import android.content.Context;
-import android.content.Intent;
-import android.content.IntentFilter;
-import android.net.ConnectivityManager;
-import android.net.wifi.WifiConfiguration;
-import android.net.wifi.WifiManager;
-import android.provider.Settings;
-import android.support.v14.preference.SwitchPreference;
-import android.text.BidiFormatter;
-
-import com.android.settings.R;
-import com.android.settings.datausage.DataSaverBackend;
-
-import java.util.ArrayList;
-
-/**
- * @deprecated in favor of WifiTetherPreferenceController and WifiTetherSettings
- */
-@Deprecated
-public class WifiApEnabler {
-    private final Context mContext;
-    private final SwitchPreference mSwitch;
-    private final CharSequence mOriginalSummary;
-    private final DataSaverBackend mDataSaverBackend;
-
-    private WifiManager mWifiManager;
-    private final IntentFilter mIntentFilter;
-
-    ConnectivityManager mCm;
-    private String[] mWifiRegexs;
-
-    private final BroadcastReceiver mReceiver = new BroadcastReceiver() {
-        @Override
-        public void onReceive(Context context, Intent intent) {
-            String action = intent.getAction();
-            if (WifiManager.WIFI_AP_STATE_CHANGED_ACTION.equals(action)) {
-                int state = intent.getIntExtra(
-                        WifiManager.EXTRA_WIFI_AP_STATE, WifiManager.WIFI_AP_STATE_FAILED);
-                if (state == WifiManager.WIFI_AP_STATE_FAILED) {
-                    int reason = intent.getIntExtra(WifiManager.EXTRA_WIFI_AP_FAILURE_REASON,
-                            WifiManager.SAP_START_FAILURE_GENERAL);
-                    handleWifiApStateChanged(state, reason);
-                } else {
-                    handleWifiApStateChanged(state, WifiManager.SAP_START_FAILURE_GENERAL);
-                }
-            } else if (ConnectivityManager.ACTION_TETHER_STATE_CHANGED.equals(action)) {
-                ArrayList<String> available = intent.getStringArrayListExtra(
-                        ConnectivityManager.EXTRA_AVAILABLE_TETHER);
-                ArrayList<String> active = intent.getStringArrayListExtra(
-                        ConnectivityManager.EXTRA_ACTIVE_TETHER);
-                ArrayList<String> errored = intent.getStringArrayListExtra(
-                        ConnectivityManager.EXTRA_ERRORED_TETHER);
-                updateTetherState(available.toArray(), active.toArray(), errored.toArray());
-            } else if (Intent.ACTION_AIRPLANE_MODE_CHANGED.equals(action)) {
-                enableWifiSwitch();
-            }
-        }
-    };
-
-    public WifiApEnabler(Context context, DataSaverBackend dataSaverBackend,
-            SwitchPreference switchPreference) {
-        mContext = context;
-        mDataSaverBackend = dataSaverBackend;
-        mSwitch = switchPreference;
-        mOriginalSummary = context.getText(R.string.wifi_hotspot_off_subtext);
-        switchPreference.setPersistent(false);
-
-        mWifiManager = (WifiManager) context.getSystemService(Context.WIFI_SERVICE);
-        mCm = (ConnectivityManager) mContext.getSystemService(Context.CONNECTIVITY_SERVICE);
-
-        mWifiRegexs = mCm.getTetherableWifiRegexs();
-
-        mIntentFilter = new IntentFilter(WifiManager.WIFI_AP_STATE_CHANGED_ACTION);
-        mIntentFilter.addAction(ConnectivityManager.ACTION_TETHER_STATE_CHANGED);
-        mIntentFilter.addAction(Intent.ACTION_AIRPLANE_MODE_CHANGED);
-    }
-
-    public void resume() {
-        mContext.registerReceiver(mReceiver, mIntentFilter);
-        enableWifiSwitch();
-    }
-
-    public void pause() {
-        mContext.unregisterReceiver(mReceiver);
-    }
-
-    private void enableWifiSwitch() {
-        boolean isAirplaneMode = Settings.Global.getInt(mContext.getContentResolver(),
-                Settings.Global.AIRPLANE_MODE_ON, 0) != 0;
-        if(!isAirplaneMode) {
-            mSwitch.setEnabled(!mDataSaverBackend.isDataSaverEnabled());
-        } else {
-            mSwitch.setSummary(mOriginalSummary);
-            mSwitch.setEnabled(false);
-        }
-    }
-
-    private void updateConfigSummary(WifiConfiguration wifiConfig) {
-        String s = mContext.getString(
-                com.android.internal.R.string.wifi_tether_configure_ssid_default);
-
-        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) {
-        boolean wifiTethered = false;
-        boolean wifiErrored = false;
-
-        for (Object o : tethered) {
-            String s = (String)o;
-            for (String regex : mWifiRegexs) {
-                if (s.matches(regex)) wifiTethered = true;
-            }
-        }
-        for (Object o: errored) {
-            String s = (String)o;
-            for (String regex : mWifiRegexs) {
-                if (s.matches(regex)) wifiErrored = true;
-            }
-        }
-
-        if (wifiTethered) {
-            WifiConfiguration wifiConfig = mWifiManager.getWifiApConfiguration();
-            updateConfigSummary(wifiConfig);
-        } else if (wifiErrored) {
-            mSwitch.setSummary(R.string.wifi_error);
-        } else {
-            mSwitch.setSummary(R.string.wifi_hotspot_off_subtext);
-        }
-    }
-
-    private void handleWifiApStateChanged(int state, int reason) {
-        switch (state) {
-            case WifiManager.WIFI_AP_STATE_ENABLING:
-                mSwitch.setSummary(R.string.wifi_tether_starting);
-                mSwitch.setEnabled(false);
-                break;
-            case WifiManager.WIFI_AP_STATE_ENABLED:
-                /**
-                 * Summary on enable is handled by tether
-                 * broadcast notice
-                 */
-                mSwitch.setChecked(true);
-                /* Doesnt need the airplane check */
-                mSwitch.setEnabled(!mDataSaverBackend.isDataSaverEnabled());
-                break;
-            case WifiManager.WIFI_AP_STATE_DISABLING:
-                mSwitch.setSummary(R.string.wifi_tether_stopping);
-                mSwitch.setChecked(false);
-                mSwitch.setEnabled(false);
-                break;
-            case WifiManager.WIFI_AP_STATE_DISABLED:
-                mSwitch.setChecked(false);
-                mSwitch.setSummary(mOriginalSummary);
-                enableWifiSwitch();
-                break;
-            default:
-                mSwitch.setChecked(false);
-                if (reason == WifiManager.SAP_START_FAILURE_NO_CHANNEL) {
-                    mSwitch.setSummary(R.string.wifi_sap_no_channel_error);
-                } else {
-                    mSwitch.setSummary(R.string.wifi_error);
-                }
-                enableWifiSwitch();
-        }
-    }
-}
diff --git a/src/com/android/settings/wifi/WifiCallingSuggestionActivity.java b/src/com/android/settings/wifi/WifiCallingSuggestionActivity.java
new file mode 100644
index 0000000..c3c7adb
--- /dev/null
+++ b/src/com/android/settings/wifi/WifiCallingSuggestionActivity.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.wifi;
+
+import android.content.Context;
+
+import com.android.ims.ImsManager;
+import com.android.settings.SettingsActivity;
+
+public class WifiCallingSuggestionActivity extends SettingsActivity {
+
+    public static boolean isSuggestionComplete(Context context) {
+        if (!ImsManager.isWfcEnabledByPlatform(context) ||
+                !ImsManager.isWfcProvisionedOnDevice(context)) {
+            return true;
+        }
+        return ImsManager.isWfcEnabledByUser(context)
+                && ImsManager.isNonTtyOrTtyOnVolteEnabled(context);
+    }
+}
diff --git a/src/com/android/settings/wifi/WifiConfigController.java b/src/com/android/settings/wifi/WifiConfigController.java
index ecd4b59..4da7366 100644
--- a/src/com/android/settings/wifi/WifiConfigController.java
+++ b/src/com/android/settings/wifi/WifiConfigController.java
@@ -60,7 +60,8 @@
 
 import com.android.settings.ProxySelector;
 import com.android.settings.R;
-import com.android.settings.Utils;
+import com.android.settingslib.Utils;
+import com.android.settingslib.utils.ThreadUtils;
 import com.android.settingslib.wifi.AccessPoint;
 
 import java.net.Inet4Address;
@@ -116,8 +117,6 @@
     /* Full list of phase2 methods */
     private final ArrayAdapter<String> mPhase2FullAdapter;
 
-    private final Handler mTextViewChangedHandler;
-
     // e.g. AccessPoint.SECURITY_NONE
     private int mAccessPointSecurity;
     private TextView mPasswordView;
@@ -175,7 +174,6 @@
                 accessPoint.getSecurity();
         mMode = mode;
 
-        mTextViewChangedHandler = new Handler();
         mContext = mConfigUi.getContext();
         final Resources res = mContext.getResources();
 
@@ -500,7 +498,7 @@
         }
     }
 
-    /* package */ WifiConfiguration getConfig() {
+    public WifiConfiguration getConfig() {
         if (mMode == WifiConfigUiBase.MODE_VIEW) {
             return null;
         }
@@ -1258,12 +1256,10 @@
 
     @Override
     public void afterTextChanged(Editable s) {
-        mTextViewChangedHandler.post(new Runnable() {
-                public void run() {
-                    showWarningMessagesIfAppropriate();
-                    enableSubmitIfAppropriate();
-                }
-            });
+        ThreadUtils.postOnMainThread(() -> {
+            showWarningMessagesIfAppropriate();
+            enableSubmitIfAppropriate();
+        });
     }
 
     @Override
diff --git a/src/com/android/settings/wifi/WifiDialog.java b/src/com/android/settings/wifi/WifiDialog.java
index 81f2a14..79500e0 100644
--- a/src/com/android/settings/wifi/WifiDialog.java
+++ b/src/com/android/settings/wifi/WifiDialog.java
@@ -27,8 +27,7 @@
 import com.android.settingslib.RestrictedLockUtils;
 import com.android.settingslib.wifi.AccessPoint;
 
-// TODO(b/64069122) Have this extend a dialogfragment to handle the fullscreen launch case.
-class WifiDialog extends AlertDialog implements WifiConfigUiBase, DialogInterface.OnClickListener {
+public class WifiDialog extends AlertDialog implements WifiConfigUiBase, DialogInterface.OnClickListener {
 
     public interface WifiDialogListener {
         void onForget(WifiDialog dialog);
@@ -120,8 +119,7 @@
                     mListener.onSubmit(this);
                     break;
                 case BUTTON_FORGET:
-                    if (WifiSettings.isEditabilityLockedDown(
-                            getContext(), mAccessPoint.getConfig())) {
+                    if (WifiUtils.isNetworkLockedDown(getContext(), mAccessPoint.getConfig())) {
                         RestrictedLockUtils.sendShowAdminSupportDetailsIntent(getContext(),
                                 RestrictedLockUtils.getDeviceOwner(getContext()));
                         return;
diff --git a/src/com/android/settings/wifi/WifiDialogActivity.java b/src/com/android/settings/wifi/WifiDialogActivity.java
index 4f9c7a6..e2e3d01 100644
--- a/src/com/android/settings/wifi/WifiDialogActivity.java
+++ b/src/com/android/settings/wifi/WifiDialogActivity.java
@@ -22,7 +22,9 @@
 import android.net.NetworkInfo;
 import android.net.wifi.WifiConfiguration;
 import android.net.wifi.WifiManager;
+import android.net.wifi.WifiManager.ActionListener;
 import android.os.Bundle;
+import android.support.annotation.VisibleForTesting;
 import android.util.Log;
 
 import com.android.settings.SetupWizardUtils;
@@ -40,6 +42,15 @@
     private static final String KEY_ACCESS_POINT_STATE = "access_point_state";
     private static final String KEY_WIFI_CONFIGURATION = "wifi_configuration";
 
+    /**
+     * Boolean extra indicating whether this activity should connect to an access point on the
+     * caller's behalf. If this is set to false, the caller should check
+     * {@link #KEY_WIFI_CONFIGURATION} in the result data and save that using
+     * {@link WifiManager#connect(WifiConfiguration, ActionListener)}. Default is true.
+     */
+    @VisibleForTesting
+    static final String KEY_CONNECT_FOR_CALLER = "connect_for_caller";
+
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         final Intent intent = getIntent();
@@ -55,7 +66,8 @@
             accessPoint = new AccessPoint(this, accessPointState);
         }
 
-        WifiDialog dialog = WifiDialog.createModal(this, this, accessPoint, WifiConfigUiBase.MODE_CONNECT);
+        WifiDialog dialog = WifiDialog.createModal(
+                this, this, accessPoint, WifiConfigUiBase.MODE_CONNECT);
         dialog.show();
         dialog.setOnDismissListener(this);
     }
@@ -102,17 +114,19 @@
         final AccessPoint accessPoint = dialog.getController().getAccessPoint();
         final WifiManager wifiManager = getSystemService(WifiManager.class);
 
-        if (config == null) {
-            if (accessPoint != null && accessPoint.isSaved()) {
-                wifiManager.connect(accessPoint.getConfig(), null /* listener */);
-            }
-        } else {
-            wifiManager.save(config, null /* listener */);
-            if (accessPoint != null) {
-                // accessPoint is null for "Add network"
-                NetworkInfo networkInfo = accessPoint.getNetworkInfo();
-                if (networkInfo == null || !networkInfo.isConnected()) {
-                    wifiManager.connect(config, null /* listener */);
+        if (getIntent().getBooleanExtra(KEY_CONNECT_FOR_CALLER, true)) {
+            if (config == null) {
+                if (accessPoint != null && accessPoint.isSaved()) {
+                    wifiManager.connect(accessPoint.getConfig(), null /* listener */);
+                }
+            } else {
+                wifiManager.save(config, null /* listener */);
+                if (accessPoint != null) {
+                    // accessPoint is null for "Add network"
+                    NetworkInfo networkInfo = accessPoint.getNetworkInfo();
+                    if (networkInfo == null || !networkInfo.isConnected()) {
+                        wifiManager.connect(config, null /* listener */);
+                    }
                 }
             }
         }
diff --git a/src/com/android/settings/wifi/WifiEnabler.java b/src/com/android/settings/wifi/WifiEnabler.java
index 7718898..9c43142 100644
--- a/src/com/android/settings/wifi/WifiEnabler.java
+++ b/src/com/android/settings/wifi/WifiEnabler.java
@@ -35,6 +35,7 @@
 import com.android.settings.R;
 import com.android.settings.core.instrumentation.MetricsFeatureProvider;
 import com.android.settings.widget.SwitchWidgetController;
+import com.android.settings.wrapper.ConnectivityManagerWrapper;
 import com.android.settingslib.RestrictedLockUtils;
 import com.android.settingslib.RestrictedLockUtils.EnforcedAdmin;
 import com.android.settingslib.WirelessUtils;
diff --git a/src/com/android/settings/wifi/WifiManagerWrapper.java b/src/com/android/settings/wifi/WifiManagerWrapper.java
deleted file mode 100644
index 69b5ee9..0000000
--- a/src/com/android/settings/wifi/WifiManagerWrapper.java
+++ /dev/null
@@ -1,23 +0,0 @@
-package com.android.settings.wifi;
-
-import android.net.wifi.WifiManager;
-
-/**
- * Wrapper around {@link WifiManager} to facilitate unit testing.
- *
- * TODO: delete this class once robolectric supports Android O
- */
-public class WifiManagerWrapper {
-    private final WifiManager mWifiManager;
-
-    public WifiManagerWrapper(WifiManager wifiManager) {
-        mWifiManager = wifiManager;
-    }
-
-    /**
-     * {@link WifiManager#getCurrentNetworkWpsNfcConfigurationToken}
-     */
-    public String getCurrentNetworkWpsNfcConfigurationToken() {
-        return mWifiManager.getCurrentNetworkWpsNfcConfigurationToken();
-    }
-}
diff --git a/src/com/android/settings/wifi/WifiSettings.java b/src/com/android/settings/wifi/WifiSettings.java
index 190af4d..30b6d96 100644
--- a/src/com/android/settings/wifi/WifiSettings.java
+++ b/src/com/android/settings/wifi/WifiSettings.java
@@ -21,13 +21,9 @@
 import android.annotation.NonNull;
 import android.app.Activity;
 import android.app.Dialog;
-import android.app.admin.DevicePolicyManager;
-import android.content.ComponentName;
 import android.content.ContentResolver;
 import android.content.Context;
 import android.content.Intent;
-import android.content.pm.PackageManager;
-import android.content.pm.PackageManager.NameNotFoundException;
 import android.content.res.Resources;
 import android.net.ConnectivityManager;
 import android.net.NetworkInfo;
@@ -37,9 +33,7 @@
 import android.net.wifi.WpsInfo;
 import android.nfc.NfcAdapter;
 import android.os.Bundle;
-import android.os.HandlerThread;
 import android.os.PowerManager;
-import android.os.Process;
 import android.provider.Settings;
 import android.support.annotation.VisibleForTesting;
 import android.support.v7.preference.Preference;
@@ -65,6 +59,7 @@
 import com.android.settings.widget.SummaryUpdater.OnSummaryChangeListener;
 import com.android.settings.widget.SwitchBarController;
 import com.android.settings.wifi.details.WifiNetworkDetailsFragment;
+import com.android.settings.wrapper.WifiManagerWrapper;
 import com.android.settingslib.RestrictedLockUtils;
 import com.android.settingslib.wifi.AccessPoint;
 import com.android.settingslib.wifi.AccessPoint.AccessPointListener;
@@ -161,8 +156,6 @@
     private WifiTracker mWifiTracker;
     private String mOpenSsid;
 
-    private HandlerThread mBgThread;
-
     private AccessPointPreference.UserBadgeCache mUserBadgeCache;
 
     private PreferenceCategory mConnectedAccessPointPreferenceCategory;
@@ -210,9 +203,6 @@
         addPreferences();
 
         mIsRestricted = isUiRestricted();
-
-        mBgThread = new HandlerThread(TAG, Process.THREAD_PRIORITY_BACKGROUND);
-        mBgThread.start();
     }
 
     private void addPreferences() {
@@ -237,17 +227,11 @@
     }
 
     @Override
-    public void onDestroy() {
-        mBgThread.quit();
-        super.onDestroy();
-    }
-
-    @Override
     public void onActivityCreated(Bundle savedInstanceState) {
         super.onActivityCreated(savedInstanceState);
 
         mWifiTracker = WifiTrackerFactory.create(
-                getActivity(), this, mBgThread.getLooper(), true, true, false);
+                getActivity(), this, getLifecycle(), true, true);
         mWifiManager = mWifiTracker.getManager();
 
         mConnectListener = new WifiManager.ActionListener() {
@@ -349,8 +333,6 @@
         // On/off switch is hidden for Setup Wizard (returns null)
         mWifiEnabler = createWifiEnabler();
 
-        mWifiTracker.startTracking();
-
         if (mIsRestricted) {
             restrictUi();
             return;
@@ -429,7 +411,6 @@
 
     @Override
     public void onStop() {
-        mWifiTracker.stopTracking();
         getView().removeCallbacks(mUpdateAccessPointsRunnable);
         getView().removeCallbacks(mHideProgressBarRunnable);
         super.onStop();
@@ -506,7 +487,7 @@
 
                 WifiConfiguration config = mSelectedAccessPoint.getConfig();
                 // Some configs are ineditable
-                if (isEditabilityLockedDown(getActivity(), config)) {
+                if (WifiUtils.isNetworkLockedDown(getActivity(), config)) {
                     return;
                 }
 
@@ -609,7 +590,7 @@
     private void showDialog(AccessPoint accessPoint, int dialogMode) {
         if (accessPoint != null) {
             WifiConfiguration config = accessPoint.getConfig();
-            if (isEditabilityLockedDown(getActivity(), config) && accessPoint.isActive()) {
+            if (WifiUtils.isNetworkLockedDown(getActivity(), config) && accessPoint.isActive()) {
                 RestrictedLockUtils.sendShowAdminSupportDetailsIntent(getActivity(),
                         RestrictedLockUtils.getDeviceOwner(getActivity()));
                 return;
@@ -743,12 +724,10 @@
     }
 
     /**
-     * Called when the connection state of wifi has changed and isConnected
-     * should be called to get the updated state.
+     * Called when the connection state of wifi has changed.
      */
     @Override
     public void onConnectedChanged() {
-        updateAccessPointsDelayed();
         changeNextButtonState(mWifiTracker.isConnected());
     }
 
@@ -798,7 +777,7 @@
                     continue;
                 }
                 LongPressAccessPointPreference preference =
-                        createLongPressActionPointPreference(accessPoint);
+                        createLongPressAccessPointPreference(accessPoint);
                 preference.setKey(key);
                 preference.setOrder(index);
                 if (mOpenSsid != null && mOpenSsid.equals(accessPoint.getSsidStr())
@@ -833,10 +812,17 @@
     }
 
     @NonNull
-    private LongPressAccessPointPreference createLongPressActionPointPreference(
+    private LongPressAccessPointPreference createLongPressAccessPointPreference(
             AccessPoint accessPoint) {
         return new LongPressAccessPointPreference(accessPoint, getPrefContext(), mUserBadgeCache,
-                false, R.drawable.ic_wifi_signal_0, this);
+                false /* forSavedNetworks */, R.drawable.ic_wifi_signal_0, this);
+    }
+
+    @NonNull
+    private ConnectedAccessPointPreference createConnectedAccessPointPreference(
+            AccessPoint accessPoint) {
+        return new ConnectedAccessPointPreference(accessPoint, getPrefContext(), mUserBadgeCache,
+                R.drawable.ic_wifi_signal_0, false /* forSavedNetworks */);
     }
 
     /**
@@ -875,7 +861,7 @@
 
         // Else same AP is connected, simply refresh the connected access point preference
         // (first and only access point in this category).
-        ((LongPressAccessPointPreference) mConnectedAccessPointPreferenceCategory.getPreference(0))
+        ((AccessPointPreference) mConnectedAccessPointPreferenceCategory.getPreference(0))
                 .refresh();
         return true;
     }
@@ -885,17 +871,19 @@
      * {@link #mConnectedAccessPointPreferenceCategory}.
      */
     private void addConnectedAccessPointPreference(AccessPoint connectedAp) {
-        String key = connectedAp.getBssid();
-        LongPressAccessPointPreference pref = (LongPressAccessPointPreference)
-                getCachedPreference(key);
-        if (pref == null) {
-            pref = createLongPressActionPointPreference(connectedAp);
-        }
+        final ConnectedAccessPointPreference pref = createConnectedAccessPointPreference(
+                connectedAp);
 
-        // Save the state of the current access point in the bundle so that we can restore it
-        // in the Wifi Network Details Fragment
-        pref.getAccessPoint().saveWifiState(pref.getExtras());
-        pref.setFragment(WifiNetworkDetailsFragment.class.getName());
+        // Launch details page on click.
+        pref.setOnGearClickListener(l -> {
+            pref.getAccessPoint().saveWifiState(pref.getExtras());
+
+            SettingsActivity activity = (SettingsActivity) WifiSettings.this.getActivity();
+            activity.startPreferencePanel(this,
+                    WifiNetworkDetailsFragment.class.getName(), pref.getExtras(),
+                    R.string.wifi_details_title, null, null, 0);
+        });
+
         pref.refresh();
 
         mConnectedAccessPointPreferenceCategory.addPreference(pref);
@@ -1059,7 +1047,7 @@
 
     protected void connect(final WifiConfiguration config, boolean isSavedNetwork) {
         // Log subtype if configuration is a saved network.
-        mMetricsFeatureProvider.action(getActivity(), MetricsEvent.ACTION_WIFI_CONNECT,
+        mMetricsFeatureProvider.action(getVisibilityLogger(), MetricsEvent.ACTION_WIFI_CONNECT,
                 isSavedNetwork);
         mWifiManager.connect(config, mConnectListener);
         mClickedConnect = true;
@@ -1083,7 +1071,7 @@
     }
 
     @Override
-    protected int getHelpResource() {
+    public int getHelpResource() {
         return R.string.help_url_wifi;
     }
 
@@ -1097,7 +1085,7 @@
                 public void run() {
                     Object tag = accessPoint.getTag();
                     if (tag != null) {
-                        ((LongPressAccessPointPreference) tag).refresh();
+                        ((AccessPointPreference) tag).refresh();
                     }
                 }
             });
@@ -1106,7 +1094,7 @@
 
     @Override
     public void onLevelChanged(AccessPoint accessPoint) {
-        ((LongPressAccessPointPreference) accessPoint.getTag()).onLevelChanged();
+        ((AccessPointPreference) accessPoint.getTag()).onLevelChanged();
     }
 
     public static final SearchIndexProvider SEARCH_INDEX_DATA_PROVIDER =
@@ -1124,77 +1112,10 @@
                 data.key = DATA_KEY_REFERENCE;
                 result.add(data);
 
-                // Add saved Wi-Fi access points
-                final List<AccessPoint> accessPoints =
-                        WifiTracker.getCurrentAccessPoints(context, true, false, false);
-                for (AccessPoint accessPoint : accessPoints) {
-                    data = new SearchIndexableRaw(context);
-                    data.title = accessPoint.getSsidStr();
-                    data.screenTitle = res.getString(R.string.wifi_settings);
-                    data.enabled = enabled;
-                    result.add(data);
-                }
-
                 return result;
             }
         };
 
-    /**
-     * Returns true if the config is not editable through Settings.
-     * @param context Context of caller
-     * @param config The WiFi config.
-     * @return true if the config is not editable through Settings.
-     */
-    public static boolean isEditabilityLockedDown(Context context, WifiConfiguration config) {
-        return !canModifyNetwork(context, config);
-    }
-
-    /**
-     * This method is a stripped version of WifiConfigStore.canModifyNetwork.
-     * TODO: refactor to have only one method.
-     * @param context Context of caller
-     * @param config The WiFi config.
-     * @return true if Settings can modify the config.
-     */
-    static boolean canModifyNetwork(Context context, WifiConfiguration config) {
-        if (config == null) {
-            return true;
-        }
-
-        final DevicePolicyManager dpm = (DevicePolicyManager) context.getSystemService(
-                Context.DEVICE_POLICY_SERVICE);
-
-        // Check if device has DPM capability. If it has and dpm is still null, then we
-        // treat this case with suspicion and bail out.
-        final PackageManager pm = context.getPackageManager();
-        if (pm.hasSystemFeature(PackageManager.FEATURE_DEVICE_ADMIN) && dpm == null) {
-            return false;
-        }
-
-        boolean isConfigEligibleForLockdown = false;
-        if (dpm != null) {
-            final ComponentName deviceOwner = dpm.getDeviceOwnerComponentOnAnyUser();
-            if (deviceOwner != null) {
-                final int deviceOwnerUserId = dpm.getDeviceOwnerUserId();
-                try {
-                    final int deviceOwnerUid = pm.getPackageUidAsUser(deviceOwner.getPackageName(),
-                            deviceOwnerUserId);
-                    isConfigEligibleForLockdown = deviceOwnerUid == config.creatorUid;
-                } catch (NameNotFoundException e) {
-                    // don't care
-                }
-            }
-        }
-        if (!isConfigEligibleForLockdown) {
-            return true;
-        }
-
-        final ContentResolver resolver = context.getContentResolver();
-        final boolean isLockdownFeatureEnabled = Settings.Global.getInt(resolver,
-                Settings.Global.WIFI_DEVICE_OWNER_CONFIGS_LOCKDOWN, 0) != 0;
-        return !isLockdownFeatureEnabled;
-    }
-
     private static class SummaryProvider
             implements SummaryLoader.SummaryProvider, OnSummaryChangeListener {
 
diff --git a/src/com/android/settings/wifi/WifiUtils.java b/src/com/android/settings/wifi/WifiUtils.java
index 7bd69db..34c86d1 100644
--- a/src/com/android/settings/wifi/WifiUtils.java
+++ b/src/com/android/settings/wifi/WifiUtils.java
@@ -16,8 +16,18 @@
 
 package com.android.settings.wifi;
 
+import android.app.admin.DevicePolicyManager;
+import android.content.ComponentName;
+import android.content.ContentResolver;
+import android.content.Context;
+import android.content.pm.PackageManager;
+import android.net.wifi.WifiConfiguration;
+import android.provider.Settings;
 import android.text.TextUtils;
 
+import com.android.settings.wrapper.DevicePolicyManagerWrapper;
+import com.android.settingslib.wrapper.PackageManagerWrapper;
+
 public class WifiUtils {
 
     private static final int SSID_ASCII_MIN_LENGTH = 1;
@@ -47,4 +57,48 @@
         final int length = password.length();
         return length >= PASSWORD_MIN_LENGTH && length <= PASSWORD_MAX_LENGTH;
     }
+
+    /**
+     * This method is a stripped and negated version of WifiConfigStore.canModifyNetwork.
+     * @param context Context of caller
+     * @param config The WiFi config.
+     * @return true if Settings cannot modify the config due to lockDown.
+     */
+    public static boolean isNetworkLockedDown(Context context, WifiConfiguration config) {
+        if (config == null) {
+            return false;
+        }
+
+        final DevicePolicyManagerWrapper dpm = DevicePolicyManagerWrapper.from(context);
+        final PackageManagerWrapper pm = new PackageManagerWrapper(context.getPackageManager());
+
+        // Check if device has DPM capability. If it has and dpm is still null, then we
+        // treat this case with suspicion and bail out.
+        if (pm.hasSystemFeature(PackageManager.FEATURE_DEVICE_ADMIN) && dpm == null) {
+            return true;
+        }
+
+        boolean isConfigEligibleForLockdown = false;
+        if (dpm != null) {
+            final ComponentName deviceOwner = dpm.getDeviceOwnerComponentOnAnyUser();
+            if (deviceOwner != null) {
+                final int deviceOwnerUserId = dpm.getDeviceOwnerUserId();
+                try {
+                    final int deviceOwnerUid = pm.getPackageUidAsUser(deviceOwner.getPackageName(),
+                            deviceOwnerUserId);
+                    isConfigEligibleForLockdown = deviceOwnerUid == config.creatorUid;
+                } catch (PackageManager.NameNotFoundException e) {
+                    // don't care
+                }
+            }
+        }
+        if (!isConfigEligibleForLockdown) {
+            return false;
+        }
+
+        final ContentResolver resolver = context.getContentResolver();
+        final boolean isLockdownFeatureEnabled = Settings.Global.getInt(resolver,
+                Settings.Global.WIFI_DEVICE_OWNER_CONFIGS_LOCKDOWN, 0) != 0;
+        return isLockdownFeatureEnabled;
+    }
 }
diff --git a/src/com/android/settings/wifi/WifiWakeupPreferenceController.java b/src/com/android/settings/wifi/WifiWakeupPreferenceController.java
index efb8aa6..a3170c0 100644
--- a/src/com/android/settings/wifi/WifiWakeupPreferenceController.java
+++ b/src/com/android/settings/wifi/WifiWakeupPreferenceController.java
@@ -29,7 +29,7 @@
 
 import com.android.settings.R;
 import com.android.settings.core.PreferenceControllerMixin;
-import com.android.settings.network.NetworkScoreManagerWrapper;
+import com.android.settings.wrapper.NetworkScoreManagerWrapper;
 import com.android.settingslib.core.AbstractPreferenceController;
 import com.android.settingslib.core.lifecycle.Lifecycle;
 import com.android.settingslib.core.lifecycle.LifecycleObserver;
diff --git a/src/com/android/settings/wifi/WriteWifiConfigToNfcDialog.java b/src/com/android/settings/wifi/WriteWifiConfigToNfcDialog.java
index 52871f6..dc98e21 100644
--- a/src/com/android/settings/wifi/WriteWifiConfigToNfcDialog.java
+++ b/src/com/android/settings/wifi/WriteWifiConfigToNfcDialog.java
@@ -20,7 +20,6 @@
 import android.app.AlertDialog;
 import android.content.Context;
 import android.content.DialogInterface;
-import android.net.wifi.WifiManager;
 import android.nfc.FormatException;
 import android.nfc.NdefMessage;
 import android.nfc.NdefRecord;
@@ -43,6 +42,7 @@
 import android.widget.TextView;
 
 import com.android.settings.R;
+import com.android.settings.wrapper.WifiManagerWrapper;
 import com.android.settingslib.wifi.AccessPoint;
 
 import java.io.IOException;
@@ -63,7 +63,6 @@
     private View mView;
     private Button mSubmitButton;
     private Button mCancelButton;
-    private Handler mOnTextChangedHandler;
     private TextView mPasswordView;
     private TextView mLabelView;
     private CheckBox mPasswordCheckBox;
@@ -79,7 +78,6 @@
         mContext = context;
         mWakeLock = ((PowerManager) context.getSystemService(Context.POWER_SERVICE))
                 .newWakeLock(PowerManager.PARTIAL_WAKE_LOCK, "WriteWifiConfigToNfcDialog:wakeLock");
-        mOnTextChangedHandler = new Handler();
         mSecurity = security;
         mWifiManager = wifiManager;
     }
@@ -90,7 +88,6 @@
         mContext = context;
         mWakeLock = ((PowerManager) context.getSystemService(Context.POWER_SERVICE))
                 .newWakeLock(PowerManager.PARTIAL_WAKE_LOCK, "WriteWifiConfigToNfcDialog:wakeLock");
-        mOnTextChangedHandler = new Handler();
         mSecurity = savedState.getInt(SECURITY);
         mWifiManager = wifiManager;
     }
@@ -226,12 +223,7 @@
 
     @Override
     public void onTextChanged(CharSequence s, int start, int before, int count) {
-        mOnTextChangedHandler.post(new Runnable() {
-            @Override
-            public void run() {
-                enableSubmitIfAppropriate();
-            }
-        });
+        enableSubmitIfAppropriate();
     }
 
     private void enableSubmitIfAppropriate() {
diff --git a/src/com/android/settings/wifi/details/WifiDetailActionBarObserver.java b/src/com/android/settings/wifi/details/WifiDetailActionBarObserver.java
deleted file mode 100644
index 81413d2..0000000
--- a/src/com/android/settings/wifi/details/WifiDetailActionBarObserver.java
+++ /dev/null
@@ -1,45 +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.details;
-
-import android.app.Fragment;
-import android.content.Context;
-import android.os.Bundle;
-import com.android.settings.R;
-import com.android.settingslib.core.lifecycle.LifecycleObserver;
-import com.android.settingslib.core.lifecycle.events.OnCreate;
-
-/**
- * ActionBar lifecycle observer for {@link WifiNetworkDetailsFragment}.
- */
-public class WifiDetailActionBarObserver implements LifecycleObserver, OnCreate {
-
-    private final Fragment mFragment;
-    private final Context mContext;
-
-    public WifiDetailActionBarObserver(Context context, Fragment fragment) {
-        mContext = context;
-        mFragment = fragment;
-    }
-
-    @Override
-    public void onCreate(Bundle savedInstanceState) {
-        if (mFragment.getActivity() != null) {
-            mFragment.getActivity().getActionBar()
-                    .setTitle(mContext.getString(R.string.wifi_details_title));
-        }
-    }
-}
diff --git a/src/com/android/settings/wifi/details/WifiDetailPreferenceController.java b/src/com/android/settings/wifi/details/WifiDetailPreferenceController.java
index c9c251e..70ee20d 100644
--- a/src/com/android/settings/wifi/details/WifiDetailPreferenceController.java
+++ b/src/com/android/settings/wifi/details/WifiDetailPreferenceController.java
@@ -19,8 +19,7 @@
 import static android.net.NetworkCapabilities.NET_CAPABILITY_VALIDATED;
 import static android.net.NetworkCapabilities.TRANSPORT_WIFI;
 
-import static com.android.settings.wifi.WifiSettings.isEditabilityLockedDown;
-
+import android.app.Activity;
 import android.app.Fragment;
 import android.content.BroadcastReceiver;
 import android.content.Context;
@@ -32,7 +31,6 @@
 import android.net.LinkAddress;
 import android.net.LinkProperties;
 import android.net.Network;
-import android.net.NetworkBadging;
 import android.net.NetworkCapabilities;
 import android.net.NetworkInfo;
 import android.net.NetworkRequest;
@@ -48,10 +46,8 @@
 import android.support.v7.preference.PreferenceScreen;
 import android.text.TextUtils;
 import android.util.Log;
-import android.view.View;
-import android.widget.Button;
 import android.widget.ImageView;
-
+import android.widget.Toast;
 import com.android.internal.annotations.VisibleForTesting;
 import com.android.internal.logging.nano.MetricsProto;
 import com.android.settings.R;
@@ -59,16 +55,19 @@
 import com.android.settings.applications.LayoutPreference;
 import com.android.settings.core.PreferenceControllerMixin;
 import com.android.settings.core.instrumentation.MetricsFeatureProvider;
-import com.android.settings.vpn2.ConnectivityManagerWrapper;
+import com.android.settings.widget.ActionButtonPreference;
 import com.android.settings.widget.EntityHeaderController;
 import com.android.settings.wifi.WifiDetailPreference;
+import com.android.settings.wifi.WifiDialog;
+import com.android.settings.wifi.WifiDialog.WifiDialogListener;
+import com.android.settings.wifi.WifiUtils;
+import com.android.settings.wrapper.ConnectivityManagerWrapper;
 import com.android.settingslib.core.AbstractPreferenceController;
 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;
@@ -81,7 +80,9 @@
  * {@link WifiNetworkDetailsFragment}.
  */
 public class WifiDetailPreferenceController extends AbstractPreferenceController
-        implements PreferenceControllerMixin, LifecycleObserver, OnPause, OnResume {
+        implements PreferenceControllerMixin, WifiDialogListener, LifecycleObserver, OnPause,
+        OnResume {
+
     private static final String TAG = "WifiDetailsPrefCtrl";
     private static final boolean DEBUG = Log.isLoggable(TAG, Log.DEBUG);
 
@@ -121,18 +122,16 @@
     private Network mNetwork;
     private NetworkInfo mNetworkInfo;
     private NetworkCapabilities mNetworkCapabilities;
-    private int mRssi;
+    private int mRssiSignalLevel = -1;
     private String[] mSignalStr;
-    private final WifiConfiguration mWifiConfig;
+    private WifiConfiguration mWifiConfig;
     private WifiInfo mWifiInfo;
     private final WifiManager mWifiManager;
     private final MetricsFeatureProvider mMetricsFeatureProvider;
 
     // UI elements - in order of appearance
-    private LayoutPreference mButtonsPref;
+    private ActionButtonPreference mButtonsPref;
     private EntityHeaderController mEntityHeaderController;
-    private Button mForgetButton;
-    private Button mSignInButton;
     private WifiDetailPreference mSignalStrengthPref;
     private WifiDetailPreference mLinkSpeedPref;
     private WifiDetailPreference mFrequencyPref;
@@ -145,14 +144,27 @@
     private PreferenceCategory mIpv6Category;
     private Preference mIpv6AddressPref;
 
+    private final IconInjector mIconInjector;
     private final IntentFilter mFilter;
     private final BroadcastReceiver mReceiver = new BroadcastReceiver() {
         @Override
         public void onReceive(Context context, Intent intent) {
             switch (intent.getAction()) {
+                case WifiManager.CONFIGURED_NETWORKS_CHANGED_ACTION:
+                    if (!intent.getBooleanExtra(WifiManager.EXTRA_MULTIPLE_NETWORKS_CHANGED,
+                        false /* defaultValue */)) {
+                        // only one network changed
+                        WifiConfiguration wifiConfiguration = intent
+                            .getParcelableExtra(WifiManager.EXTRA_WIFI_CONFIGURATION);
+                        if (mAccessPoint.matches(wifiConfiguration)) {
+                            mWifiConfig = wifiConfiguration;
+                        }
+                    }
+                    // fall through
                 case WifiManager.NETWORK_STATE_CHANGED_ACTION:
                 case WifiManager.RSSI_CHANGED_ACTION:
                     updateInfo();
+                    break;
             }
         }
     };
@@ -201,7 +213,7 @@
         }
     };
 
-    public WifiDetailPreferenceController(
+    public static WifiDetailPreferenceController newInstance(
             AccessPoint accessPoint,
             ConnectivityManagerWrapper connectivityManagerWrapper,
             Context context,
@@ -210,6 +222,22 @@
             Lifecycle lifecycle,
             WifiManager wifiManager,
             MetricsFeatureProvider metricsFeatureProvider) {
+        return new WifiDetailPreferenceController(
+                accessPoint, connectivityManagerWrapper, context, fragment, handler, lifecycle,
+                wifiManager, metricsFeatureProvider, new IconInjector(context));
+    }
+
+    @VisibleForTesting
+    /* package */ WifiDetailPreferenceController(
+            AccessPoint accessPoint,
+            ConnectivityManagerWrapper connectivityManagerWrapper,
+            Context context,
+            Fragment fragment,
+            Handler handler,
+            Lifecycle lifecycle,
+            WifiManager wifiManager,
+            MetricsFeatureProvider metricsFeatureProvider,
+            IconInjector injector) {
         super(context);
 
         mAccessPoint = accessPoint;
@@ -221,10 +249,12 @@
         mWifiConfig = accessPoint.getConfig();
         mWifiManager = wifiManager;
         mMetricsFeatureProvider = metricsFeatureProvider;
+        mIconInjector = injector;
 
         mFilter = new IntentFilter();
         mFilter.addAction(WifiManager.NETWORK_STATE_CHANGED_ACTION);
         mFilter.addAction(WifiManager.RSSI_CHANGED_ACTION);
+        mFilter.addAction(WifiManager.CONFIGURED_NETWORKS_CHANGED_ACTION);
 
         lifecycle.addObserver(this);
     }
@@ -246,9 +276,13 @@
 
         setupEntityHeader(screen);
 
-        mButtonsPref = (LayoutPreference) screen.findPreference(KEY_BUTTONS_PREF);
-        mSignInButton = mButtonsPref.findViewById(R.id.signin_button);
-        mSignInButton.setOnClickListener(view -> signIntoNetwork());
+        mButtonsPref = ((ActionButtonPreference) screen.findPreference(KEY_BUTTONS_PREF))
+                .setButton1Text(R.string.forget)
+                .setButton1Positive(false)
+                .setButton1OnClickListener(view -> forgetNetwork())
+                .setButton2Text(R.string.support_sign_in_button_text)
+                .setButton2Positive(true)
+                .setButton2OnClickListener(view -> signIntoNetwork());
 
         mSignalStrengthPref =
                 (WifiDetailPreference) screen.findPreference(KEY_SIGNAL_STRENGTH_PREF);
@@ -266,8 +300,6 @@
         mIpv6AddressPref = screen.findPreference(KEY_IPV6_ADDRESSES_PREF);
 
         mSecurityPref.setDetailText(mAccessPoint.getSecurityString(false /* concise */));
-        mForgetButton = mButtonsPref.findViewById(R.id.forget_button);
-        mForgetButton.setOnClickListener(view -> forgetNetwork());
     }
 
     private void setupEntityHeader(PreferenceScreen screen) {
@@ -319,13 +351,12 @@
             return;
         }
 
-        // Update whether the forgot button should be displayed.
-        mForgetButton.setVisibility(canForgetNetwork() ? View.VISIBLE : View.INVISIBLE);
+        // Update whether the forget button should be displayed.
+        mButtonsPref.setButton1Visible(canForgetNetwork());
 
         refreshNetworkState();
 
         // Update Connection Header icon and Signal Strength Preference
-        mRssi = mWifiInfo.getRssi();
         refreshRssiViews();
 
         // MAC Address Pref
@@ -368,10 +399,13 @@
     }
 
     private void refreshRssiViews() {
-        int iconSignalLevel = WifiManager.calculateSignalLevel(
-                mRssi, WifiManager.RSSI_LEVELS);
-        Drawable wifiIcon = NetworkBadging.getWifiIcon(
-                iconSignalLevel, NetworkBadging.BADGING_NONE, mContext.getTheme()).mutate();
+        int signalLevel = mAccessPoint.getLevel();
+
+        if (mRssiSignalLevel == signalLevel) {
+            return;
+        }
+        mRssiSignalLevel = signalLevel;
+        Drawable wifiIcon = mIconInjector.getIcon(mRssiSignalLevel);
 
         wifiIcon.setTint(Utils.getColorAccent(mContext));
         mEntityHeaderController.setIcon(wifiIcon).done(mFragment.getActivity(), true /* rebind */);
@@ -381,8 +415,7 @@
                 R.color.wifi_details_icon_color, mContext.getTheme()));
         mSignalStrengthPref.setIcon(wifiIconDark);
 
-        int summarySignalLevel = mAccessPoint.getLevel();
-        mSignalStrengthPref.setDetailText(mSignalStr[summarySignalLevel]);
+        mSignalStrengthPref.setDetailText(mSignalStr[mRssiSignalLevel]);
     }
 
     private void updatePreference(WifiDetailPreference pref, String detailText) {
@@ -395,9 +428,8 @@
     }
 
     private void updateIpLayerInfo() {
-        mSignInButton.setVisibility(canSignIntoNetwork() ? View.VISIBLE : View.INVISIBLE);
-        mButtonsPref.setVisible(mForgetButton.getVisibility() == View.VISIBLE
-                || mSignInButton.getVisibility() == View.VISIBLE);
+        mButtonsPref.setButton2Visible(canSignIntoNetwork());
+        mButtonsPref.setVisible(canSignIntoNetwork() || canForgetNetwork());
 
         if (mNetwork == null || mLinkProperties == null) {
             mIpAddressPref.setVisible(false);
@@ -465,9 +497,14 @@
      * Returns whether the network represented by this preference can be forgotten.
      */
     private boolean canForgetNetwork() {
-        // TODO(65396674): create test for the locked down scenario
-        return (mWifiInfo != null && mWifiInfo.isEphemeral())
-                || (mWifiConfig != null && !isEditabilityLockedDown(mContext, mWifiConfig));
+        return (mWifiInfo != null && mWifiInfo.isEphemeral()) || canModifyNetwork();
+    }
+
+    /**
+     * Returns whether the network represented by this preference can be modified.
+     */
+    public boolean canModifyNetwork() {
+        return mWifiConfig != null && !WifiUtils.isNetworkLockedDown(mContext, mWifiConfig);
     }
 
     /**
@@ -504,4 +541,46 @@
                 mFragment.getActivity(), MetricsProto.MetricsEvent.ACTION_WIFI_SIGNIN);
         mConnectivityManagerWrapper.startCaptivePortalApp(mNetwork);
     }
+
+    @Override
+    public void onForget(WifiDialog dialog) {
+        // can't forget network from a 'modify' dialog
+    }
+
+    @Override
+    public void onSubmit(WifiDialog dialog) {
+        if (dialog.getController() != null) {
+            mWifiManager.save(dialog.getController().getConfig(), new WifiManager.ActionListener() {
+                @Override
+                public void onSuccess() {
+                }
+
+                @Override
+                public void onFailure(int reason) {
+                    Activity activity = mFragment.getActivity();
+                    if (activity != null) {
+                        Toast.makeText(activity,
+                                R.string.wifi_failed_save_message,
+                                Toast.LENGTH_SHORT).show();
+                    }
+                }
+            });
+        }
+    }
+
+    /**
+     * Wrapper for testing compatibility.
+     */
+    @VisibleForTesting
+    static class IconInjector {
+        private final Context mContext;
+
+        public IconInjector(Context context) {
+            mContext = context;
+        }
+
+        public Drawable getIcon(int level) {
+            return mContext.getDrawable(Utils.getWifiIconResource(level)).mutate();
+        }
+    }
 }
diff --git a/src/com/android/settings/wifi/details/WifiNetworkDetailsFragment.java b/src/com/android/settings/wifi/details/WifiNetworkDetailsFragment.java
index 8145d77..ea30b56 100644
--- a/src/com/android/settings/wifi/details/WifiNetworkDetailsFragment.java
+++ b/src/com/android/settings/wifi/details/WifiNetworkDetailsFragment.java
@@ -15,18 +15,30 @@
  */
 package com.android.settings.wifi.details;
 
+import static com.android.settings.wifi.WifiSettings.WIFI_DIALOG_ID;
+
+import android.app.Dialog;
 import android.content.Context;
 import android.net.ConnectivityManager;
 import android.net.wifi.WifiManager;
 import android.os.Bundle;
 import android.os.Handler;
 import android.os.Looper;
+import android.view.Menu;
+import android.view.MenuInflater;
+import android.view.MenuItem;
+
 import com.android.internal.logging.nano.MetricsProto;
+import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
 import com.android.settings.R;
 import com.android.settings.dashboard.DashboardFragment;
-import com.android.settings.vpn2.ConnectivityManagerWrapperImpl;
+import com.android.settings.wifi.WifiConfigUiBase;
+import com.android.settings.wifi.WifiDialog;
+import com.android.settings.wrapper.ConnectivityManagerWrapper;
+import com.android.settingslib.RestrictedLockUtils;
 import com.android.settingslib.core.AbstractPreferenceController;
 import com.android.settingslib.wifi.AccessPoint;
+
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
@@ -43,13 +55,9 @@
 
     private AccessPoint mAccessPoint;
     private WifiDetailPreferenceController mWifiDetailPreferenceController;
-    private WifiDetailActionBarObserver mWifiDetailActionBarObserver;
 
     @Override
     public void onAttach(Context context) {
-        mWifiDetailActionBarObserver = new WifiDetailActionBarObserver(context, this);
-        getLifecycle().addObserver(mWifiDetailActionBarObserver);
-
         mAccessPoint = new AccessPoint(context, getArguments());
         super.onAttach(context);
     }
@@ -70,11 +78,54 @@
     }
 
     @Override
+    public int getDialogMetricsCategory(int dialogId) {
+        if (dialogId == WIFI_DIALOG_ID) {
+            return MetricsEvent.DIALOG_WIFI_AP_EDIT;
+        }
+        return 0;
+    }
+
+    @Override
+    public Dialog onCreateDialog(int dialogId) {
+        if (getActivity() == null || mWifiDetailPreferenceController == null
+                || mAccessPoint == null) {
+            return null;
+        }
+        return WifiDialog.createModal(getActivity(), mWifiDetailPreferenceController, mAccessPoint,
+                WifiConfigUiBase.MODE_MODIFY);
+    }
+
+
+    @Override
+    public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
+        MenuItem item = menu.add(0, Menu.FIRST, 0, R.string.wifi_modify);
+        item.setIcon(R.drawable.ic_mode_edit);
+        item.setShowAsAction(MenuItem.SHOW_AS_ACTION_ALWAYS);
+        super.onCreateOptionsMenu(menu, inflater);
+    }
+
+    @Override
+    public boolean onOptionsItemSelected(MenuItem menuItem) {
+        switch (menuItem.getItemId()) {
+            case Menu.FIRST:
+                if (!mWifiDetailPreferenceController.canModifyNetwork()) {
+                    RestrictedLockUtils.sendShowAdminSupportDetailsIntent(getContext(),
+                            RestrictedLockUtils.getDeviceOwner(getContext()));
+                } else {
+                    showDialog(WIFI_DIALOG_ID);
+                }
+                return true;
+            default:
+                return super.onOptionsItemSelected(menuItem);
+        }
+    }
+
+    @Override
     protected List<AbstractPreferenceController> getPreferenceControllers(Context context) {
         ConnectivityManager cm = context.getSystemService(ConnectivityManager.class);
-        mWifiDetailPreferenceController = new WifiDetailPreferenceController(
+        mWifiDetailPreferenceController = WifiDetailPreferenceController.newInstance(
                 mAccessPoint,
-                new ConnectivityManagerWrapperImpl(cm),
+                new ConnectivityManagerWrapper(cm),
                 context,
                 this,
                 new Handler(Looper.getMainLooper()),  // UI thread.
diff --git a/src/com/android/settings/wifi/tether/WifiTetherApBandPreferenceController.java b/src/com/android/settings/wifi/tether/WifiTetherApBandPreferenceController.java
index 5a08c58..1e299ab 100644
--- a/src/com/android/settings/wifi/tether/WifiTetherApBandPreferenceController.java
+++ b/src/com/android/settings/wifi/tether/WifiTetherApBandPreferenceController.java
@@ -23,12 +23,13 @@
 import android.net.wifi.WifiConfiguration;
 import android.support.v7.preference.ListPreference;
 import android.support.v7.preference.Preference;
-import android.support.v7.preference.PreferenceScreen;
+import android.util.Log;
 
 import com.android.settings.R;
 
 public class WifiTetherApBandPreferenceController extends WifiTetherBasePreferenceController {
 
+    private static final String TAG = "WifiTetherApBandPref";
     private static final String PREF_KEY = "wifi_tether_network_ap_band";
     private static final String[] BAND_VALUES =
             {String.valueOf(AP_BAND_2GHZ), String.valueOf(AP_BAND_5GHZ)};
@@ -40,21 +41,23 @@
             OnTetherConfigUpdateListener listener) {
         super(context, listener);
         mBandEntries = mContext.getResources().getStringArray(R.array.wifi_ap_band_config_full);
+    }
+
+    @Override
+    public void updateDisplay() {
         final WifiConfiguration config = mWifiManager.getWifiApConfiguration();
         if (config == null) {
             mBandIndex = 0;
+            Log.d(TAG, "Updating band index to 0 because no config");
         } else if (is5GhzBandSupported()) {
             mBandIndex = config.apBand;
+            Log.d(TAG, "Updating band index to " + mBandIndex);
         } else {
             config.apBand = 0;
             mWifiManager.setWifiApConfiguration(config);
             mBandIndex = config.apBand;
+            Log.d(TAG, "5Ghz not supported, updating band index to " + mBandIndex);
         }
-    }
-
-    @Override
-    public void displayPreference(PreferenceScreen screen) {
-        super.displayPreference(screen);
         ListPreference preference = (ListPreference) mPreference;
         if (!is5GhzBandSupported()) {
             preference.setEnabled(false);
diff --git a/src/com/android/settings/wifi/tether/WifiTetherBasePreferenceController.java b/src/com/android/settings/wifi/tether/WifiTetherBasePreferenceController.java
index b6aba1b..c41f345 100644
--- a/src/com/android/settings/wifi/tether/WifiTetherBasePreferenceController.java
+++ b/src/com/android/settings/wifi/tether/WifiTetherBasePreferenceController.java
@@ -57,5 +57,8 @@
     public void displayPreference(PreferenceScreen screen) {
         super.displayPreference(screen);
         mPreference = screen.findPreference(getPreferenceKey());
+        updateDisplay();
     }
+
+    public abstract void updateDisplay();
 }
diff --git a/src/com/android/settings/wifi/tether/WifiTetherPasswordPreferenceController.java b/src/com/android/settings/wifi/tether/WifiTetherPasswordPreferenceController.java
index acb36b1..eb65965 100644
--- a/src/com/android/settings/wifi/tether/WifiTetherPasswordPreferenceController.java
+++ b/src/com/android/settings/wifi/tether/WifiTetherPasswordPreferenceController.java
@@ -20,7 +20,7 @@
 import android.net.wifi.WifiConfiguration;
 import android.support.v7.preference.EditTextPreference;
 import android.support.v7.preference.Preference;
-import android.support.v7.preference.PreferenceScreen;
+import android.util.Log;
 
 import com.android.settings.widget.ValidatedEditTextPreference;
 import com.android.settings.wifi.WifiUtils;
@@ -28,6 +28,7 @@
 public class WifiTetherPasswordPreferenceController extends WifiTetherBasePreferenceController
         implements ValidatedEditTextPreference.Validator {
 
+    private static final String TAG = "WifiTetherPswdPref";
     private static final String PREF_KEY = "wifi_tether_network_password";
 
     private String mPassword;
@@ -35,10 +36,6 @@
     public WifiTetherPasswordPreferenceController(Context context,
             OnTetherConfigUpdateListener listener) {
         super(context, listener);
-        final WifiConfiguration config = mWifiManager.getWifiApConfiguration();
-        if (config != null) {
-            mPassword = config.preSharedKey;
-        }
     }
 
     @Override
@@ -47,8 +44,12 @@
     }
 
     @Override
-    public void displayPreference(PreferenceScreen screen) {
-        super.displayPreference(screen);
+    public void updateDisplay() {
+        final WifiConfiguration config = mWifiManager.getWifiApConfiguration();
+        if (config != null) {
+            mPassword = config.preSharedKey;
+            Log.d(TAG, "Updating password in Preference, " + mPassword);
+        }
         ((ValidatedEditTextPreference) mPreference).setValidator(this);
         updatePasswordDisplay((EditTextPreference) mPreference);
     }
diff --git a/src/com/android/settings/wifi/tether/WifiTetherPreferenceController.java b/src/com/android/settings/wifi/tether/WifiTetherPreferenceController.java
index a216f9d..fa10607 100644
--- a/src/com/android/settings/wifi/tether/WifiTetherPreferenceController.java
+++ b/src/com/android/settings/wifi/tether/WifiTetherPreferenceController.java
@@ -75,7 +75,6 @@
     public boolean isAvailable() {
         return mWifiRegexs != null
                 && mWifiRegexs.length != 0
-                && WifiTetherSettings.isTetherSettingPageEnabled()
                 && !Utils.isMonkeyRunning();
     }
 
diff --git a/src/com/android/settings/wifi/tether/WifiTetherSSIDPreferenceController.java b/src/com/android/settings/wifi/tether/WifiTetherSSIDPreferenceController.java
index a4c6c67..b563e53 100644
--- a/src/com/android/settings/wifi/tether/WifiTetherSSIDPreferenceController.java
+++ b/src/com/android/settings/wifi/tether/WifiTetherSSIDPreferenceController.java
@@ -21,7 +21,7 @@
 import android.support.annotation.VisibleForTesting;
 import android.support.v7.preference.EditTextPreference;
 import android.support.v7.preference.Preference;
-import android.support.v7.preference.PreferenceScreen;
+import android.util.Log;
 
 import com.android.settings.widget.ValidatedEditTextPreference;
 import com.android.settings.wifi.WifiUtils;
@@ -29,6 +29,7 @@
 public class WifiTetherSSIDPreferenceController extends WifiTetherBasePreferenceController
         implements ValidatedEditTextPreference.Validator {
 
+    private static final String TAG = "WifiTetherSsidPref";
     private static final String PREF_KEY = "wifi_tether_network_name";
     @VisibleForTesting
     static final String DEFAULT_SSID = "AndroidAP";
@@ -46,13 +47,14 @@
     }
 
     @Override
-    public void displayPreference(PreferenceScreen screen) {
-        super.displayPreference(screen);
+    public void updateDisplay() {
         final WifiConfiguration config = mWifiManager.getWifiApConfiguration();
         if (config != null) {
             mSSID = config.SSID;
+            Log.d(TAG, "Updating SSID in Preference, " + mSSID);
         } else {
             mSSID = DEFAULT_SSID;
+            Log.d(TAG, "Updating to default SSID in Preference, " + mSSID);
         }
         ((ValidatedEditTextPreference) mPreference).setValidator(this);
         updateSsidDisplay((EditTextPreference) mPreference);
diff --git a/src/com/android/settings/wifi/tether/WifiTetherSettings.java b/src/com/android/settings/wifi/tether/WifiTetherSettings.java
index 3a1d5c6..d06ad4a 100644
--- a/src/com/android/settings/wifi/tether/WifiTetherSettings.java
+++ b/src/com/android/settings/wifi/tether/WifiTetherSettings.java
@@ -26,9 +26,9 @@
 import android.net.wifi.WifiConfiguration;
 import android.net.wifi.WifiManager;
 import android.os.Bundle;
-import android.os.SystemProperties;
 import android.os.UserManager;
 import android.support.annotation.VisibleForTesting;
+import android.text.TextUtils;
 import android.util.Log;
 
 import com.android.internal.logging.nano.MetricsProto;
@@ -41,14 +41,12 @@
 
 import java.util.ArrayList;
 import java.util.List;
+import java.util.UUID;
 
 public class WifiTetherSettings extends RestrictedDashboardFragment
         implements WifiTetherBasePreferenceController.OnTetherConfigUpdateListener {
 
-    public static boolean isTetherSettingPageEnabled() {
-        return SystemProperties.getBoolean("settings.ui.wifi.tether.enabled", false);
-    }
-
+    private static final String TAG = "WifiTetherSettings";
     private static final IntentFilter TETHER_STATE_CHANGE_FILTER;
 
     private WifiTetherSwitchBarController mSwitchBarController;
@@ -160,33 +158,53 @@
 
         config.SSID = mSSIDPreferenceController.getSSID();
         config.preSharedKey = mPasswordPreferenceController.getPassword();
+        ensureWifiConfigHasPassword(config);
         config.allowedKeyManagement.set(WifiConfiguration.KeyMgmt.WPA2_PSK);
         config.allowedAuthAlgorithms.set(WifiConfiguration.AuthAlgorithm.OPEN);
         config.apBand = mApBandPreferenceController.getBandIndex();
         return config;
     }
 
+    private void startTether() {
+        mRestartWifiApAfterConfigChange = false;
+        mSwitchBarController.startTether();
+    }
+
+    private void updateDisplayWithNewConfig() {
+        getPreferenceController(WifiTetherSSIDPreferenceController.class)
+                .updateDisplay();
+        getPreferenceController(WifiTetherPasswordPreferenceController.class)
+                .updateDisplay();
+        getPreferenceController(WifiTetherApBandPreferenceController.class)
+                .updateDisplay();
+    }
+
+    @VisibleForTesting
+    static void ensureWifiConfigHasPassword(WifiConfiguration config) {
+        if (TextUtils.isEmpty(config.preSharedKey)) {
+            String randomUUID = UUID.randomUUID().toString();
+            //first 12 chars from xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx
+            config.preSharedKey = randomUUID.substring(0, 8) + randomUUID.substring(9, 13);
+        }
+    }
+
     @VisibleForTesting
     class TetherChangeReceiver extends BroadcastReceiver {
-        private static final String TAG = "TetherChangeReceiver";
-
         @Override
         public void onReceive(Context content, Intent intent) {
             String action = intent.getAction();
+            Log.d(TAG, "updating display config due to receiving broadcast action " + action);
+            updateDisplayWithNewConfig();
             if (action.equals(ACTION_TETHER_STATE_CHANGED)) {
                 if (mWifiManager.getWifiApState() == WifiManager.WIFI_AP_STATE_DISABLED
                         && mRestartWifiApAfterConfigChange) {
-                    mRestartWifiApAfterConfigChange = false;
-                    Log.d(TAG, "Restarting WifiAp due to prior config change.");
-                    mSwitchBarController.startTether();
+                    startTether();
                 }
             } else if (action.equals(WIFI_AP_STATE_CHANGED_ACTION)) {
                 int state = intent.getIntExtra(WifiManager.EXTRA_WIFI_AP_STATE, 0);
                 if (state == WifiManager.WIFI_AP_STATE_DISABLED
                         && mRestartWifiApAfterConfigChange) {
-                    mRestartWifiApAfterConfigChange = false;
-                    Log.d(TAG, "Restarting WifiAp due to prior config change.");
-                    mSwitchBarController.startTether();
+                    startTether();
                 }
             }
         }
diff --git a/src/com/android/settings/wrapper/AccessibilityManagerWrapper.java b/src/com/android/settings/wrapper/AccessibilityManagerWrapper.java
new file mode 100644
index 0000000..4fd7ccf
--- /dev/null
+++ b/src/com/android/settings/wrapper/AccessibilityManagerWrapper.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.wrapper;
+
+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 AccessibilityManagerWrapper {
+
+    /**
+     * 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/wrapper/AccessibilityServiceInfoWrapper.java b/src/com/android/settings/wrapper/AccessibilityServiceInfoWrapper.java
new file mode 100644
index 0000000..c920392
--- /dev/null
+++ b/src/com/android/settings/wrapper/AccessibilityServiceInfoWrapper.java
@@ -0,0 +1,47 @@
+/*
+ * Copyright (C) 2017 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.wrapper;
+
+import android.accessibilityservice.AccessibilityServiceInfo;
+import android.content.ComponentName;
+
+/**
+ * This class replicates a subset of the
+ * {@link android.accessibilityservice.AccessibilityServiceInfo}. The class
+ * 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 class AccessibilityServiceInfoWrapper {
+
+    private final AccessibilityServiceInfo mServiceInfo;
+
+    public AccessibilityServiceInfoWrapper(AccessibilityServiceInfo serviceInfo) {
+        mServiceInfo = serviceInfo;
+    }
+
+    /**
+     * Returns the real {@code AccessibilityServiceInfo} object.
+     */
+    public AccessibilityServiceInfo getAccessibilityServiceInfo() {
+        return mServiceInfo;
+    }
+
+    public ComponentName getComponentName() {
+        return mServiceInfo.getComponentName();
+    }
+}
diff --git a/src/com/android/settings/wrapper/ActivityInfoWrapper.java b/src/com/android/settings/wrapper/ActivityInfoWrapper.java
new file mode 100644
index 0000000..37d0d42
--- /dev/null
+++ b/src/com/android/settings/wrapper/ActivityInfoWrapper.java
@@ -0,0 +1,40 @@
+/*
+ * Copyright (C) 2017 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.wrapper;
+
+import android.content.pm.ActivityInfo;
+
+/**
+ * This class replicates a subset of the android.content.pm.ActivityInfo. The class
+ * exists so that we can use a thin wrapper around the ActivityInfo in production code and a mock in
+ * tests.
+ */
+public class ActivityInfoWrapper {
+
+    private final ActivityInfo mInfo;
+
+    public ActivityInfoWrapper(ActivityInfo info) {
+        mInfo = info;
+    }
+
+    /**
+     * Returns whether this activity supports picture-in-picture.
+     */
+    public boolean supportsPictureInPicture() {
+        return mInfo.supportsPictureInPicture();
+    }
+}
diff --git a/src/com/android/settings/wrapper/AutofillManagerWrapper.java b/src/com/android/settings/wrapper/AutofillManagerWrapper.java
new file mode 100644
index 0000000..57c9375
--- /dev/null
+++ b/src/com/android/settings/wrapper/AutofillManagerWrapper.java
@@ -0,0 +1,59 @@
+/*
+ * Copyright (C) 2017 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.wrapper;
+
+import android.view.autofill.AutofillManager;
+
+/**
+ * This class replicates a subset of the android.view.autofill.AutofillManager (AFM). The
+ * class exists so that we can use a thin wrapper around the AFM in production code and a mock
+ * in tests. We cannot directly mock or shadow the AFM, because some of the methods we rely on are
+ * newer than the API version supported by Robolectric.
+ */
+public class AutofillManagerWrapper {
+    private final AutofillManager mAfm;
+
+    public AutofillManagerWrapper(AutofillManager afm) {
+        mAfm = afm;
+    }
+
+    /**
+     * Calls {@code AutofillManager.hasAutofillFeature()}.
+     *
+     * @see AutofillManager#hasAutofillFeature
+     */
+    public boolean hasAutofillFeature() {
+        if (mAfm == null) {
+            return false;
+        }
+
+        return mAfm.hasAutofillFeature();
+    }
+
+    /**
+     * Calls {@code AutofillManager.isAutofillSupported()}.
+     *
+     * @see AutofillManager#isAutofillSupported
+     */
+    public boolean isAutofillSupported() {
+        if (mAfm == null) {
+            return false;
+        }
+
+        return mAfm.isAutofillSupported();
+    }
+}
diff --git a/src/com/android/settings/wrapper/ConnectivityManagerWrapper.java b/src/com/android/settings/wrapper/ConnectivityManagerWrapper.java
new file mode 100644
index 0000000..c80a97b
--- /dev/null
+++ b/src/com/android/settings/wrapper/ConnectivityManagerWrapper.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.wrapper;
+
+import android.net.ConnectivityManager;
+import android.net.ConnectivityManager.NetworkCallback;
+import android.net.Network;
+import android.net.NetworkRequest;
+import android.os.Handler;
+import android.net.ProxyInfo;
+
+/**
+ * This class replicates a subset of the android.net.ConnectivityManager (CM). The class
+ * exists so that we can use a thin wrapper around the CM in production code and a mock in tests.
+ * We cannot directly mock or shadow the CM, because some of the methods we rely on are marked as
+ * hidden and are thus invisible to Robolectric.
+ */
+public class ConnectivityManagerWrapper {
+
+    private final ConnectivityManager mCm;
+
+    public ConnectivityManagerWrapper(ConnectivityManager cm) {
+        mCm = cm;
+    }
+
+    /**
+     * Returns the real ConnectivityManager object wrapped by this wrapper.
+     */
+    public ConnectivityManager getConnectivityManager() {
+        return mCm;
+    }
+
+    /**
+     * Calls {@code ConnectivityManager.getAlwaysOnVpnPackageForUser()}.
+     *
+     * @see android.net.ConnectivityManager#getAlwaysOnVpnPackageForUser
+     */
+    public String getAlwaysOnVpnPackageForUser(int userId) {
+        return mCm.getAlwaysOnVpnPackageForUser(userId);
+    }
+
+    /**
+     * Calls {@code ConnectivityManager.getGlobalProxy()}.
+     *
+     * @see android.net.ConnectivityManager#getGlobalProxy
+     */
+    public ProxyInfo getGlobalProxy() {
+        return mCm.getGlobalProxy();
+    }
+
+    /**
+     * Calls {@code ConnectivityManager.registerNetworkCallback()}.
+     *
+     * This is part of the ConnectivityManager public API in SDK 26 or above, but is not yet visible
+     * to the robolectric tests, which currently build with SDK 23.
+     * TODO: delete this once the robolectric tests build with SDK 26 or above.
+     *
+     * @see android.net.ConnectivityManager#registerNetworkCallback(NetworkRequest,NetworkCallback,Handler)
+     */
+    public void registerNetworkCallback(NetworkRequest request, NetworkCallback callback,
+            Handler handler) {
+        mCm.registerNetworkCallback(request, callback, handler);
+    }
+
+    /**
+     * Calls {@code ConnectivityManager.startCaptivePortalApp()}.
+     *
+     * This is part of the ConnectivityManager public API in SDK 26 or above, but is not yet visible
+     * to the robolectric tests, which currently build with SDK 23.
+     * TODO: delete this once the robolectric tests build with SDK 26 or above.
+     *
+     * @see android.net.ConnectivityManager#startCaptivePortalApp(Network)
+     */
+    public void startCaptivePortalApp(Network network) {
+        mCm.startCaptivePortalApp(network);
+    }
+
+    /**
+     * {@link ConnectivityManager#stopTethering}
+     */
+    public void stopTethering(int type) {
+        mCm.stopTethering(type);
+    }
+}
diff --git a/src/com/android/settings/wrapper/DevicePolicyManagerWrapper.java b/src/com/android/settings/wrapper/DevicePolicyManagerWrapper.java
new file mode 100644
index 0000000..8417219
--- /dev/null
+++ b/src/com/android/settings/wrapper/DevicePolicyManagerWrapper.java
@@ -0,0 +1,219 @@
+/*
+ * 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.wrapper;
+
+import android.annotation.NonNull;
+import android.annotation.Nullable;
+import android.app.admin.DevicePolicyManager;
+import android.content.ComponentName;
+import android.content.Context;
+import android.content.Intent;
+import android.os.UserHandle;
+
+import java.util.List;
+
+/**
+ * This class replicates a subset of the android.app.admin.DevicePolicyManager (DPM). The
+ * class exists so that we can use a thin wrapper around the DPM in production code and a mock
+ * in tests. We cannot directly mock or shadow the DPM, because some of the methods we rely on are
+ * newer than the API version supported by Robolectric.
+ */
+public class DevicePolicyManagerWrapper {
+    private final DevicePolicyManager mDpm;
+
+    public DevicePolicyManagerWrapper(DevicePolicyManager dpm) {
+        mDpm = dpm;
+    }
+
+    public static @Nullable DevicePolicyManagerWrapper from(Context context) {
+        DevicePolicyManager dpm =
+                (DevicePolicyManager) context.getSystemService(Context.DEVICE_POLICY_SERVICE);
+        return dpm == null ? null : new DevicePolicyManagerWrapper(dpm);
+    }
+
+    /**
+     * Calls {@code DevicePolicyManager.getActiveAdminsAsUser()}.
+     *
+     * @see DevicePolicyManager#getActiveAdminsAsUser
+     */
+    public @Nullable List<ComponentName> getActiveAdminsAsUser(int userId) {
+        return mDpm.getActiveAdminsAsUser(userId);
+    }
+
+    /**
+     * Calls {@code DevicePolicyManager.getMaximumFailedPasswordsForWipe()}.
+     *
+     * @see DevicePolicyManager#getMaximumFailedPasswordsForWipe
+     */
+    public int getMaximumFailedPasswordsForWipe(@Nullable ComponentName admin, int userHandle) {
+        return mDpm.getMaximumFailedPasswordsForWipe(admin, userHandle);
+    }
+
+    /**
+     * Calls {@code DevicePolicyManager.getDeviceOwnerComponentOnCallingUser()}.
+     *
+     * @see DevicePolicyManager#getDeviceOwnerComponentOnCallingUser
+     */
+    public ComponentName getDeviceOwnerComponentOnCallingUser() {
+        return mDpm.getDeviceOwnerComponentOnCallingUser();
+    }
+
+    /**
+     * Calls {@code DevicePolicyManager.getDeviceOwnerComponentOnAnyUser()}.
+     *
+     * @see DevicePolicyManager#getDeviceOwnerComponentOnAnyUser
+     */
+    public ComponentName getDeviceOwnerComponentOnAnyUser() {
+        return mDpm.getDeviceOwnerComponentOnAnyUser();
+    }
+
+    /**
+     * Calls {@code DevicePolicyManager.getProfileOwnerAsUser()}.
+     *
+     * @see DevicePolicyManager#getProfileOwnerAsUser
+     */
+    public @Nullable ComponentName getProfileOwnerAsUser(final int userId) {
+        return mDpm.getProfileOwnerAsUser(userId);
+    }
+
+    /**
+     * Calls {@code DevicePolicyManager.getDeviceOwnerNameOnAnyUser()}.
+     *
+     * @see DevicePolicyManager#getDeviceOwnerNameOnAnyUser
+     */
+    public CharSequence getDeviceOwnerOrganizationName() {
+        return mDpm.getDeviceOwnerOrganizationName();
+    }
+
+    /**
+     * Calls {@code DevicePolicyManager.getPermissionGrantState()}.
+     *
+     * @see DevicePolicyManager#getPermissionGrantState
+     */
+    public int getPermissionGrantState(@Nullable ComponentName admin, String packageName,
+            String permission) {
+        return mDpm.getPermissionGrantState(admin, packageName, permission);
+    }
+
+    /**
+     * Calls {@code DevicePolicyManager.isSecurityLoggingEnabled()}.
+     *
+     * @see DevicePolicyManager#isSecurityLoggingEnabled
+     */
+    public boolean isSecurityLoggingEnabled(@Nullable ComponentName admin) {
+        return mDpm.isSecurityLoggingEnabled(admin);
+    }
+
+    /**
+     * Calls {@code DevicePolicyManager.isNetworkLoggingEnabled()}.
+     *
+     * @see DevicePolicyManager#isNetworkLoggingEnabled
+     */
+    public boolean isNetworkLoggingEnabled(@Nullable ComponentName admin) {
+        return mDpm.isNetworkLoggingEnabled(admin);
+    }
+
+    /**
+     * Calls {@code DevicePolicyManager.getLastSecurityLogRetrievalTime()}.
+     *
+     * @see DevicePolicyManager#getLastSecurityLogRetrievalTime
+     */
+    public long getLastSecurityLogRetrievalTime() {
+        return mDpm.getLastSecurityLogRetrievalTime();
+    }
+
+    /**
+     * Calls {@code DevicePolicyManager.getLastBugReportRequestTime()}.
+     *
+     * @see DevicePolicyManager#getLastBugReportRequestTime
+     */
+    public long getLastBugReportRequestTime() {
+        return mDpm.getLastBugReportRequestTime();
+    }
+
+    /**
+     * Calls {@code DevicePolicyManager.getLastNetworkLogRetrievalTime()}.
+     *
+     * @see DevicePolicyManager#getLastNetworkLogRetrievalTime
+     */
+    public long getLastNetworkLogRetrievalTime() {
+        return mDpm.getLastNetworkLogRetrievalTime();
+    }
+
+    /**
+     * Calls {@code DevicePolicyManager.isCurrentInputMethodSetByOwner()}.
+     *
+     * @see DevicePolicyManager#isCurrentInputMethodSetByOwner
+     */
+    public boolean isCurrentInputMethodSetByOwner() {
+        return mDpm.isCurrentInputMethodSetByOwner();
+    }
+
+    /**
+     * Calls {@code DevicePolicyManager.getOwnerInstalledCaCerts()}.
+     *
+     * @see DevicePolicyManager#getOwnerInstalledCaCerts
+     */
+    public List<String> getOwnerInstalledCaCerts(@NonNull UserHandle user) {
+        return mDpm.getOwnerInstalledCaCerts(user);
+    }
+
+    /**
+     * Calls {@code DevicePolicyManager.isDeviceOwnerAppOnAnyUser()}.
+     *
+     * @see DevicePolicyManager#isDeviceOwnerAppOnAnyUser
+     */
+    public boolean isDeviceOwnerAppOnAnyUser(String packageName) {
+        return mDpm.isDeviceOwnerAppOnAnyUser(packageName);
+    }
+
+    /**
+     * Calls {@code DevicePolicyManager.packageHasActiveAdmins()}.
+     *
+     * @see DevicePolicyManager#packageHasActiveAdmins
+     */
+    public boolean packageHasActiveAdmins(String packageName) {
+        return mDpm.packageHasActiveAdmins(packageName);
+    }
+
+    /**
+     * Calls {@code DevicePolicyManager.isUninstallInQueue()}.
+     *
+     * @see DevicePolicyManager#isUninstallInQueue
+     */
+    public boolean isUninstallInQueue(String packageName) {
+        return mDpm.isUninstallInQueue(packageName);
+    }
+
+    /**
+     * Calls {@code DevicePolicyManager.createAdminSupportIntent()}.
+     *
+     * @see DevicePolicyManager#createAdminSupportIntent(String)
+     */
+    public Intent createAdminSupportIntent(@NonNull String restriction) {
+        return mDpm.createAdminSupportIntent(restriction);
+    }
+
+    /**
+     * Calls {@code DevicePolicyManager#getDeviceOwnerUserId()}.
+     *
+     * @see DevicePolicyManager#getDeviceOwnerUserId()
+     */
+    public int getDeviceOwnerUserId() {
+        return mDpm.getDeviceOwnerUserId();
+    }
+}
diff --git a/src/com/android/settings/wrapper/FingerprintManagerWrapper.java b/src/com/android/settings/wrapper/FingerprintManagerWrapper.java
new file mode 100644
index 0000000..9b43bfa
--- /dev/null
+++ b/src/com/android/settings/wrapper/FingerprintManagerWrapper.java
@@ -0,0 +1,66 @@
+/*
+ * 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.wrapper;
+
+import android.annotation.NonNull;
+import android.hardware.fingerprint.FingerprintManager;
+import android.hardware.fingerprint.FingerprintManager.EnrollmentCallback;
+import android.os.CancellationSignal;
+
+import com.android.internal.util.Preconditions;
+
+/**
+ * Wrapper of {@link FingerprintManager}. Workaround for robolectic testing.
+ *
+ * This is the workaround to allow us test {@link SetNewPasswordController} which uses a new hidden
+ * API {@link android.hardware.fingerprint.FingerprintManager#hasEnrolledFingerprints(int)} that
+ * robolectric does not support yet. Having robolectic to support latest platform API is tracked
+ * in b/30995831.
+ */
+public class FingerprintManagerWrapper {
+    private @NonNull FingerprintManager mFingerprintManager;
+
+    public FingerprintManagerWrapper(@NonNull FingerprintManager fingerprintManager) {
+        Preconditions.checkNotNull(fingerprintManager);
+        mFingerprintManager = fingerprintManager;
+    }
+
+    public boolean isHardwareDetected() {
+        return mFingerprintManager.isHardwareDetected();
+    }
+
+    public boolean hasEnrolledFingerprints(int userId) {
+        return mFingerprintManager.hasEnrolledFingerprints(userId);
+    }
+
+    public long preEnroll() {
+        return mFingerprintManager.preEnroll();
+    }
+
+    public void setActiveUser(int userId) {
+        mFingerprintManager.setActiveUser(userId);
+    }
+
+    public void enroll(
+            byte[] token,
+            CancellationSignal cancel,
+            int flags,
+            int userId,
+            EnrollmentCallback callback) {
+        mFingerprintManager.enroll(token, cancel, flags, userId, callback);
+    }
+}
diff --git a/src/com/android/settings/wrapper/IPackageManagerWrapper.java b/src/com/android/settings/wrapper/IPackageManagerWrapper.java
new file mode 100644
index 0000000..9bb2df7
--- /dev/null
+++ b/src/com/android/settings/wrapper/IPackageManagerWrapper.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.wrapper;
+
+import android.content.Intent;
+import android.content.pm.IPackageManager;
+import android.content.pm.PackageInfo;
+import android.content.pm.ParceledListSlice;
+import android.content.pm.ResolveInfo;
+import android.os.RemoteException;
+
+/**
+ * This class replicates a subset of the android.content.pm.IPackageManager (PMS). The class
+ * exists so that we can use a thin wrapper around the PMS in production code and a mock in tests.
+ * We cannot directly mock or shadow the PMS, because some of the methods we rely on are newer than
+ * the API version supported by Robolectric.
+ */
+public class IPackageManagerWrapper {
+
+    private final IPackageManager mPms;
+
+    public IPackageManagerWrapper(IPackageManager pms) {
+        mPms = pms;
+    }
+
+    /**
+     * Calls {@code IPackageManager.checkUidPermission()}.
+     *
+     * @see android.content.pm.IPackageManager#checkUidPermission
+     */
+    public int checkUidPermission(String permName, int uid) throws RemoteException {
+        return mPms.checkUidPermission(permName, uid);
+    }
+
+    /**
+     * Calls {@code IPackageManager.findPersistentPreferredActivity()}.
+     *
+     * @see android.content.pm.IPackageManager#findPersistentPreferredActivity
+     */
+    public ResolveInfo findPersistentPreferredActivity(Intent intent, int userId)
+            throws RemoteException {
+        return mPms.findPersistentPreferredActivity(intent, userId);
+    }
+
+    /**
+     * Calls {@code IPackageManager.getPackageInfo()}.
+     *
+     * @see android.content.pm.IPackageManager#getPackageInfo
+     */
+    public PackageInfo getPackageInfo(String packageName, int flags, int userId)
+            throws RemoteException {
+        return mPms.getPackageInfo(packageName, flags, userId);
+    }
+
+    /**
+     * Calls {@code IPackageManager.getAppOpPermissionPackages()}.
+     *
+     * @see android.content.pm.IPackageManager#getAppOpPermissionPackages
+     */
+    public String[] getAppOpPermissionPackages(String permissionName) throws RemoteException {
+        return mPms.getAppOpPermissionPackages(permissionName);
+    }
+
+    /**
+     * Calls {@code IPackageManager.isPackageAvailable()}.
+     *
+     * @see android.content.pm.IPackageManager#isPackageAvailable
+     */
+    public boolean isPackageAvailable(String packageName, int userId) throws RemoteException {
+        return mPms.isPackageAvailable(packageName, userId);
+    }
+
+    /**
+     * Calls {@code IPackageManager.getPackagesHoldingPermissions()}.
+     *
+     * @see android.content.pm.IPackageManager#getPackagesHoldingPermissions
+     */
+    public ParceledListSlice<PackageInfo> getPackagesHoldingPermissions(
+        String[] permissions, int flags, int userId) throws RemoteException {
+        return mPms.getPackagesHoldingPermissions(permissions, flags, userId);
+    }
+
+}
diff --git a/src/com/android/settings/wrapper/KeyValueListParserWrapper.java b/src/com/android/settings/wrapper/KeyValueListParserWrapper.java
new file mode 100644
index 0000000..3fab571
--- /dev/null
+++ b/src/com/android/settings/wrapper/KeyValueListParserWrapper.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.wrapper;
+
+import android.util.KeyValueListParser;
+
+/**
+ * This class replicates a subset of the {@link KeyValueListParser}. The class
+ * 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 class KeyValueListParserWrapper {
+    private KeyValueListParser mParser;
+
+    public KeyValueListParserWrapper(KeyValueListParser parser) {
+        mParser = parser;
+    }
+
+    /**
+     * Get real {@link KeyValueListParser}
+     */
+    public KeyValueListParser getKeyValueListParser() {
+        return mParser;
+    }
+
+    /**
+     * 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.
+     */
+    public void setString(String str) throws IllegalArgumentException {
+        mParser.setString(str);
+    }
+
+    /**
+     * 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 boolean value associated with the key.
+     */
+    public boolean getBoolean(String key, boolean defaultValue) {
+        return mParser.getBoolean(key, defaultValue);
+    }
+
+    /**
+     * Get the value for key as a string.
+     * @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.
+     */
+    public String getString(String key, String defaultValue) {
+        return mParser.getString(key, 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.
+     */
+    public long getLong(String key, long defaultValue) {
+        return mParser.getLong(key, defaultValue);
+    }
+}
diff --git a/src/com/android/settings/wrapper/NetworkScoreManagerWrapper.java b/src/com/android/settings/wrapper/NetworkScoreManagerWrapper.java
new file mode 100644
index 0000000..a07d645
--- /dev/null
+++ b/src/com/android/settings/wrapper/NetworkScoreManagerWrapper.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.wrapper;
+
+import android.annotation.Nullable;
+import android.net.NetworkScoreManager;
+import android.net.NetworkScorerAppData;
+
+import java.util.List;
+
+/**
+ * Wrapper around {@link NetworkScoreManager} to facilitate unit testing.
+ *
+ * TODO: delete this class once robolectric supports Android O
+ */
+public class NetworkScoreManagerWrapper {
+    private final NetworkScoreManager mNetworkScoreManager;
+
+    public NetworkScoreManagerWrapper(NetworkScoreManager networkScoreManager) {
+        mNetworkScoreManager = networkScoreManager;
+    }
+
+    /**
+     * Returns the list of available scorer apps. The list will be empty if there are
+     * no valid scorers.
+     */
+    public List<NetworkScorerAppData> getAllValidScorers() {
+        return mNetworkScoreManager.getAllValidScorers();
+    }
+
+    /**
+     * Obtain the package name of the current active network scorer.
+     *
+     * <p>At any time, only one scorer application will receive {@link #ACTION_SCORE_NETWORKS}
+     * broadcasts and be allowed to call {@link #updateScores}. Applications may use this method to
+     * determine the current scorer and offer the user the ability to select a different scorer via
+     * the {@link #ACTION_CHANGE_ACTIVE} intent.
+     * @return the full package name of the current active scorer, or null if there is no active
+     *         scorer.
+     */
+    @Nullable
+    public String getActiveScorerPackage() {
+        return mNetworkScoreManager.getActiveScorerPackage();
+    }
+
+    /**
+     * Returns metadata about the active scorer or <code>null</code> if there is no active scorer.
+     */
+    @Nullable
+    public NetworkScorerAppData getActiveScorer() {
+        return mNetworkScoreManager.getActiveScorer();
+    }
+
+    /**
+     * Set the active scorer to a new package and clear existing scores.
+     *
+     * <p>Should never be called directly without obtaining user consent. This can be done by using
+     * the {@link #ACTION_CHANGE_ACTIVE} broadcast, or using a custom configuration activity.
+     *
+     * @return true if the operation succeeded, or false if the new package is not a valid scorer.
+     * @throws SecurityException if the caller is not a system process or does not hold the
+     *         {@link android.Manifest.permission#REQUEST_NETWORK_SCORES} permission
+     */
+    public boolean setActiveScorer(String packageName) throws SecurityException {
+        return mNetworkScoreManager.setActiveScorer(packageName);
+    }
+}
\ No newline at end of file
diff --git a/src/com/android/settings/wrapper/NotificationChannelGroupWrapper.java b/src/com/android/settings/wrapper/NotificationChannelGroupWrapper.java
new file mode 100644
index 0000000..dbfff1a
--- /dev/null
+++ b/src/com/android/settings/wrapper/NotificationChannelGroupWrapper.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.wrapper;
+
+import android.app.NotificationChannelGroup;
+
+/**
+ * Wrapper for {@link NotificationChannelGroup} until roboletric supports O MR1.
+ */
+public class NotificationChannelGroupWrapper {
+
+    private final NotificationChannelGroup mGroup;
+
+    public NotificationChannelGroupWrapper(NotificationChannelGroup group) {
+        mGroup = group;
+    }
+
+    /**
+     * Get the real group object so we can call APIs directly on it.
+     */
+    public NotificationChannelGroup getGroup() {
+        return mGroup;
+    }
+
+    public String getDescription() {
+        if (mGroup != null) {
+            return mGroup.getDescription();
+        }
+        return null;
+    }
+
+    public void setDescription(String desc) {
+        if (mGroup != null) {
+            mGroup.setDescription(desc);
+        }
+    }
+
+    public boolean isBlocked() {
+        if (mGroup != null) {
+            return mGroup.isBlocked();
+        }
+        return true;
+    }
+
+    public void setBlocked(boolean blocked) {
+        if (mGroup != null) {
+            mGroup.setBlocked(blocked);
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/com/android/settings/wrapper/PowerManagerWrapper.java b/src/com/android/settings/wrapper/PowerManagerWrapper.java
new file mode 100644
index 0000000..6357a3e
--- /dev/null
+++ b/src/com/android/settings/wrapper/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.wrapper;
+
+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/wrapper/RestrictedLockUtilsWrapper.java b/src/com/android/settings/wrapper/RestrictedLockUtilsWrapper.java
new file mode 100644
index 0000000..7a0185f
--- /dev/null
+++ b/src/com/android/settings/wrapper/RestrictedLockUtilsWrapper.java
@@ -0,0 +1,15 @@
+package com.android.settings.wrapper;
+
+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/wrapper/UserManagerWrapper.java b/src/com/android/settings/wrapper/UserManagerWrapper.java
new file mode 100644
index 0000000..4b4d2f4
--- /dev/null
+++ b/src/com/android/settings/wrapper/UserManagerWrapper.java
@@ -0,0 +1,48 @@
+/*
+ * Copyright (C) 2017 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.wrapper;
+
+import android.content.pm.UserInfo;
+import android.os.UserManager;
+
+import java.util.List;
+
+/**
+ * This class replicates a subset of the android.os.UserManager. The class
+ * exists so that we can use a thin wrapper around the UserManager in production code and a mock in
+ * tests. We cannot directly mock or shadow the UserManager, because some of the methods we rely on
+ * are newer than the API version supported by Robolectric or are hidden.
+ */
+public class UserManagerWrapper {
+    private UserManager mUserManager;
+
+    public UserManagerWrapper(UserManager userManager) {
+        mUserManager = userManager;
+    }
+
+    public UserInfo getPrimaryUser() {
+        return mUserManager.getPrimaryUser();
+    }
+
+    public List<UserInfo> getUsers() {
+        return mUserManager.getUsers();
+    }
+
+    public List<UserInfo> getProfiles(int userHandle) {
+        return mUserManager.getProfiles(userHandle);
+    }
+}
diff --git a/src/com/android/settings/wrapper/UserPackageWrapper.java b/src/com/android/settings/wrapper/UserPackageWrapper.java
new file mode 100644
index 0000000..afa1d82
--- /dev/null
+++ b/src/com/android/settings/wrapper/UserPackageWrapper.java
@@ -0,0 +1,29 @@
+/*
+ * Copyright (C) 2017 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file
+ * except in compliance with the License. You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the
+ * License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+package com.android.settings.wrapper;
+
+import android.content.pm.PackageInfo;
+import android.content.pm.UserInfo;
+
+/**
+ * Wrapper class around android.webkit.UserPackage - to be able to use UserPackage in Robolectric
+ * tests (such tests currently don't support mocking hidden classes).
+ */
+public interface UserPackageWrapper {
+    UserInfo getUserInfo();
+    PackageInfo getPackageInfo();
+    boolean isEnabledPackage();
+    boolean isInstalledPackage();
+}
diff --git a/src/com/android/settings/wrapper/UserPackageWrapperImpl.java b/src/com/android/settings/wrapper/UserPackageWrapperImpl.java
new file mode 100644
index 0000000..0a2b9cd
--- /dev/null
+++ b/src/com/android/settings/wrapper/UserPackageWrapperImpl.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.wrapper;
+
+import android.content.pm.PackageInfo;
+import android.content.pm.UserInfo;
+import android.webkit.UserPackage;
+
+/**
+ * Default implementation of UserPackageWrapper.
+ */
+public class UserPackageWrapperImpl implements UserPackageWrapper {
+    private final UserPackage mUserPackage;
+
+    public UserPackageWrapperImpl(UserPackage userPackage) {
+        mUserPackage = userPackage;
+    }
+
+    public UserInfo getUserInfo() {
+        return mUserPackage.getUserInfo();
+    }
+
+    public PackageInfo getPackageInfo() {
+        return mUserPackage.getPackageInfo();
+    }
+
+    public boolean isEnabledPackage() {
+        return mUserPackage.isEnabledPackage();
+    }
+
+    public boolean isInstalledPackage() {
+        return mUserPackage.isInstalledPackage();
+    }
+}
diff --git a/src/com/android/settings/wrapper/WallpaperManagerWrapper.java b/src/com/android/settings/wrapper/WallpaperManagerWrapper.java
new file mode 100644
index 0000000..89015e5
--- /dev/null
+++ b/src/com/android/settings/wrapper/WallpaperManagerWrapper.java
@@ -0,0 +1,33 @@
+/*
+ * Copyright (C) 2017 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.wrapper;
+
+import android.app.WallpaperManager;
+import android.content.Context;
+
+public class WallpaperManagerWrapper {
+
+    private final WallpaperManager mWallpaperManager;
+
+    public WallpaperManagerWrapper(Context context) {
+        mWallpaperManager = (WallpaperManager) context.getSystemService(Context.WALLPAPER_SERVICE);
+    }
+
+    public int getWallpaperId(int which) {
+        return mWallpaperManager.getWallpaperId(which);
+    }
+}
diff --git a/src/com/android/settings/wrapper/WifiManagerWrapper.java b/src/com/android/settings/wrapper/WifiManagerWrapper.java
new file mode 100644
index 0000000..c788995
--- /dev/null
+++ b/src/com/android/settings/wrapper/WifiManagerWrapper.java
@@ -0,0 +1,53 @@
+package com.android.settings.wrapper;
+
+import android.net.wifi.WifiConfiguration;
+import android.net.wifi.WifiManager;
+
+/**
+ * Wrapper around {@link WifiManager} to facilitate unit testing.
+ *
+ * TODO: delete this class once robolectric supports Android O
+ */
+public class WifiManagerWrapper {
+    private final WifiManager mWifiManager;
+
+    public WifiManagerWrapper(WifiManager wifiManager) {
+        mWifiManager = wifiManager;
+    }
+
+    /**
+     * Gets the real WifiManager
+     * @return the real WifiManager
+     */
+    public WifiManager getWifiManager() {
+        return mWifiManager;
+    }
+
+    /**
+     * {@link WifiManager#getCurrentNetworkWpsNfcConfigurationToken}
+     */
+    public String getCurrentNetworkWpsNfcConfigurationToken() {
+        return mWifiManager.getCurrentNetworkWpsNfcConfigurationToken();
+    }
+
+    /**
+     * {@link WifiManager#removePasspointConfiguration}
+     */
+    public void removePasspointConfiguration(String fqdn) {
+        mWifiManager.removePasspointConfiguration(fqdn);
+    }
+
+    /**
+     * {@link WifiManager#forget}
+     */
+    public void forget(int netId, WifiManager.ActionListener listener) {
+        mWifiManager.forget(netId, listener);
+    }
+
+    /**
+     * {@link WifiManager#save}
+     */
+    public void save(WifiConfiguration config, WifiManager.ActionListener listener) {
+        mWifiManager.save(config, listener);
+    }
+}
diff --git a/tests/anomaly-tester/res/values-af/strings.xml b/tests/anomaly-tester/res/values-af/strings.xml
new file mode 100644
index 0000000..cdc7ee5
--- /dev/null
+++ b/tests/anomaly-tester/res/values-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="app_name" msgid="4895205370884535654">"AnomalyTester"</string>
+</resources>
diff --git a/tests/anomaly-tester/res/values-am/strings.xml b/tests/anomaly-tester/res/values-am/strings.xml
new file mode 100644
index 0000000..cdc7ee5
--- /dev/null
+++ b/tests/anomaly-tester/res/values-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="app_name" msgid="4895205370884535654">"AnomalyTester"</string>
+</resources>
diff --git a/tests/anomaly-tester/res/values-az/strings.xml b/tests/anomaly-tester/res/values-az/strings.xml
new file mode 100644
index 0000000..cdc7ee5
--- /dev/null
+++ b/tests/anomaly-tester/res/values-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="app_name" msgid="4895205370884535654">"AnomalyTester"</string>
+</resources>
diff --git a/tests/anomaly-tester/res/values-b+sr+Latn/strings.xml b/tests/anomaly-tester/res/values-b+sr+Latn/strings.xml
new file mode 100644
index 0000000..cdc7ee5
--- /dev/null
+++ b/tests/anomaly-tester/res/values-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="app_name" msgid="4895205370884535654">"AnomalyTester"</string>
+</resources>
diff --git a/tests/anomaly-tester/res/values-be/strings.xml b/tests/anomaly-tester/res/values-be/strings.xml
new file mode 100644
index 0000000..cdc7ee5
--- /dev/null
+++ b/tests/anomaly-tester/res/values-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="app_name" msgid="4895205370884535654">"AnomalyTester"</string>
+</resources>
diff --git a/tests/anomaly-tester/res/values-bg/strings.xml b/tests/anomaly-tester/res/values-bg/strings.xml
new file mode 100644
index 0000000..cdc7ee5
--- /dev/null
+++ b/tests/anomaly-tester/res/values-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="app_name" msgid="4895205370884535654">"AnomalyTester"</string>
+</resources>
diff --git a/tests/anomaly-tester/res/values-bn/strings.xml b/tests/anomaly-tester/res/values-bn/strings.xml
new file mode 100644
index 0000000..cdc7ee5
--- /dev/null
+++ b/tests/anomaly-tester/res/values-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="app_name" msgid="4895205370884535654">"AnomalyTester"</string>
+</resources>
diff --git a/tests/anomaly-tester/res/values-bs/strings.xml b/tests/anomaly-tester/res/values-bs/strings.xml
new file mode 100644
index 0000000..cdc7ee5
--- /dev/null
+++ b/tests/anomaly-tester/res/values-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="app_name" msgid="4895205370884535654">"AnomalyTester"</string>
+</resources>
diff --git a/tests/anomaly-tester/res/values-ca/strings.xml b/tests/anomaly-tester/res/values-ca/strings.xml
new file mode 100644
index 0000000..cdc7ee5
--- /dev/null
+++ b/tests/anomaly-tester/res/values-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="app_name" msgid="4895205370884535654">"AnomalyTester"</string>
+</resources>
diff --git a/tests/anomaly-tester/res/values-cs/strings.xml b/tests/anomaly-tester/res/values-cs/strings.xml
new file mode 100644
index 0000000..cdc7ee5
--- /dev/null
+++ b/tests/anomaly-tester/res/values-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="app_name" msgid="4895205370884535654">"AnomalyTester"</string>
+</resources>
diff --git a/tests/anomaly-tester/res/values-da/strings.xml b/tests/anomaly-tester/res/values-da/strings.xml
new file mode 100644
index 0000000..cdc7ee5
--- /dev/null
+++ b/tests/anomaly-tester/res/values-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="app_name" msgid="4895205370884535654">"AnomalyTester"</string>
+</resources>
diff --git a/tests/anomaly-tester/res/values-de/strings.xml b/tests/anomaly-tester/res/values-de/strings.xml
new file mode 100644
index 0000000..cdc7ee5
--- /dev/null
+++ b/tests/anomaly-tester/res/values-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="app_name" msgid="4895205370884535654">"AnomalyTester"</string>
+</resources>
diff --git a/tests/anomaly-tester/res/values-el/strings.xml b/tests/anomaly-tester/res/values-el/strings.xml
new file mode 100644
index 0000000..cdc7ee5
--- /dev/null
+++ b/tests/anomaly-tester/res/values-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="app_name" msgid="4895205370884535654">"AnomalyTester"</string>
+</resources>
diff --git a/tests/anomaly-tester/res/values-en-rAU/strings.xml b/tests/anomaly-tester/res/values-en-rAU/strings.xml
new file mode 100644
index 0000000..cdc7ee5
--- /dev/null
+++ b/tests/anomaly-tester/res/values-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="app_name" msgid="4895205370884535654">"AnomalyTester"</string>
+</resources>
diff --git a/tests/anomaly-tester/res/values-en-rCA/strings.xml b/tests/anomaly-tester/res/values-en-rCA/strings.xml
new file mode 100644
index 0000000..cdc7ee5
--- /dev/null
+++ b/tests/anomaly-tester/res/values-en-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="app_name" msgid="4895205370884535654">"AnomalyTester"</string>
+</resources>
diff --git a/tests/anomaly-tester/res/values-en-rGB/strings.xml b/tests/anomaly-tester/res/values-en-rGB/strings.xml
new file mode 100644
index 0000000..cdc7ee5
--- /dev/null
+++ b/tests/anomaly-tester/res/values-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="app_name" msgid="4895205370884535654">"AnomalyTester"</string>
+</resources>
diff --git a/tests/anomaly-tester/res/values-en-rIN/strings.xml b/tests/anomaly-tester/res/values-en-rIN/strings.xml
new file mode 100644
index 0000000..cdc7ee5
--- /dev/null
+++ b/tests/anomaly-tester/res/values-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="app_name" msgid="4895205370884535654">"AnomalyTester"</string>
+</resources>
diff --git a/tests/anomaly-tester/res/values-en-rXC/strings.xml b/tests/anomaly-tester/res/values-en-rXC/strings.xml
new file mode 100644
index 0000000..8fce2b8
--- /dev/null
+++ b/tests/anomaly-tester/res/values-en-rXC/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="app_name" msgid="4895205370884535654">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‎‎‏‏‏‏‏‎‏‏‏‏‎‏‎‎‎‎‏‏‎‏‎‏‏‎‎‏‎‏‎‏‎‎‏‎‎‎‏‎‏‎‎‎‎‎‏‏‎‏‎‏‎‏‏‎‎‏‏‎‎AnomalyTester‎‏‎‎‏‎"</string>
+</resources>
diff --git a/tests/anomaly-tester/res/values-es-rUS/strings.xml b/tests/anomaly-tester/res/values-es-rUS/strings.xml
new file mode 100644
index 0000000..cdc7ee5
--- /dev/null
+++ b/tests/anomaly-tester/res/values-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="app_name" msgid="4895205370884535654">"AnomalyTester"</string>
+</resources>
diff --git a/tests/anomaly-tester/res/values-es/strings.xml b/tests/anomaly-tester/res/values-es/strings.xml
new file mode 100644
index 0000000..cdc7ee5
--- /dev/null
+++ b/tests/anomaly-tester/res/values-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="app_name" msgid="4895205370884535654">"AnomalyTester"</string>
+</resources>
diff --git a/tests/anomaly-tester/res/values-et/strings.xml b/tests/anomaly-tester/res/values-et/strings.xml
new file mode 100644
index 0000000..cdc7ee5
--- /dev/null
+++ b/tests/anomaly-tester/res/values-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="app_name" msgid="4895205370884535654">"AnomalyTester"</string>
+</resources>
diff --git a/tests/anomaly-tester/res/values-eu/strings.xml b/tests/anomaly-tester/res/values-eu/strings.xml
new file mode 100644
index 0000000..cdc7ee5
--- /dev/null
+++ b/tests/anomaly-tester/res/values-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="app_name" msgid="4895205370884535654">"AnomalyTester"</string>
+</resources>
diff --git a/tests/anomaly-tester/res/values-fa/strings.xml b/tests/anomaly-tester/res/values-fa/strings.xml
new file mode 100644
index 0000000..cdc7ee5
--- /dev/null
+++ b/tests/anomaly-tester/res/values-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="app_name" msgid="4895205370884535654">"AnomalyTester"</string>
+</resources>
diff --git a/tests/anomaly-tester/res/values-fi/strings.xml b/tests/anomaly-tester/res/values-fi/strings.xml
new file mode 100644
index 0000000..cdc7ee5
--- /dev/null
+++ b/tests/anomaly-tester/res/values-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="app_name" msgid="4895205370884535654">"AnomalyTester"</string>
+</resources>
diff --git a/tests/anomaly-tester/res/values-fr/strings.xml b/tests/anomaly-tester/res/values-fr/strings.xml
new file mode 100644
index 0000000..cdc7ee5
--- /dev/null
+++ b/tests/anomaly-tester/res/values-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="app_name" msgid="4895205370884535654">"AnomalyTester"</string>
+</resources>
diff --git a/tests/anomaly-tester/res/values-gl/strings.xml b/tests/anomaly-tester/res/values-gl/strings.xml
new file mode 100644
index 0000000..cdc7ee5
--- /dev/null
+++ b/tests/anomaly-tester/res/values-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="app_name" msgid="4895205370884535654">"AnomalyTester"</string>
+</resources>
diff --git a/tests/anomaly-tester/res/values-gu/strings.xml b/tests/anomaly-tester/res/values-gu/strings.xml
new file mode 100644
index 0000000..8c09d6c
--- /dev/null
+++ b/tests/anomaly-tester/res/values-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="app_name" msgid="4895205370884535654">"અસંગતિ પરીક્ષક"</string>
+</resources>
diff --git a/tests/anomaly-tester/res/values-hr/strings.xml b/tests/anomaly-tester/res/values-hr/strings.xml
new file mode 100644
index 0000000..cdc7ee5
--- /dev/null
+++ b/tests/anomaly-tester/res/values-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="app_name" msgid="4895205370884535654">"AnomalyTester"</string>
+</resources>
diff --git a/tests/anomaly-tester/res/values-hu/strings.xml b/tests/anomaly-tester/res/values-hu/strings.xml
new file mode 100644
index 0000000..cdc7ee5
--- /dev/null
+++ b/tests/anomaly-tester/res/values-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="app_name" msgid="4895205370884535654">"AnomalyTester"</string>
+</resources>
diff --git a/tests/anomaly-tester/res/values-hy/strings.xml b/tests/anomaly-tester/res/values-hy/strings.xml
new file mode 100644
index 0000000..cdc7ee5
--- /dev/null
+++ b/tests/anomaly-tester/res/values-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="app_name" msgid="4895205370884535654">"AnomalyTester"</string>
+</resources>
diff --git a/tests/anomaly-tester/res/values-in/strings.xml b/tests/anomaly-tester/res/values-in/strings.xml
new file mode 100644
index 0000000..cdc7ee5
--- /dev/null
+++ b/tests/anomaly-tester/res/values-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="app_name" msgid="4895205370884535654">"AnomalyTester"</string>
+</resources>
diff --git a/tests/anomaly-tester/res/values-is/strings.xml b/tests/anomaly-tester/res/values-is/strings.xml
new file mode 100644
index 0000000..cdc7ee5
--- /dev/null
+++ b/tests/anomaly-tester/res/values-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="app_name" msgid="4895205370884535654">"AnomalyTester"</string>
+</resources>
diff --git a/tests/anomaly-tester/res/values-it/strings.xml b/tests/anomaly-tester/res/values-it/strings.xml
new file mode 100644
index 0000000..cdc7ee5
--- /dev/null
+++ b/tests/anomaly-tester/res/values-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="app_name" msgid="4895205370884535654">"AnomalyTester"</string>
+</resources>
diff --git a/tests/anomaly-tester/res/values-iw/strings.xml b/tests/anomaly-tester/res/values-iw/strings.xml
new file mode 100644
index 0000000..cdc7ee5
--- /dev/null
+++ b/tests/anomaly-tester/res/values-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="app_name" msgid="4895205370884535654">"AnomalyTester"</string>
+</resources>
diff --git a/tests/anomaly-tester/res/values-ka/strings.xml b/tests/anomaly-tester/res/values-ka/strings.xml
new file mode 100644
index 0000000..cdc7ee5
--- /dev/null
+++ b/tests/anomaly-tester/res/values-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="app_name" msgid="4895205370884535654">"AnomalyTester"</string>
+</resources>
diff --git a/tests/anomaly-tester/res/values-kk/strings.xml b/tests/anomaly-tester/res/values-kk/strings.xml
new file mode 100644
index 0000000..cdc7ee5
--- /dev/null
+++ b/tests/anomaly-tester/res/values-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="app_name" msgid="4895205370884535654">"AnomalyTester"</string>
+</resources>
diff --git a/tests/anomaly-tester/res/values-km/strings.xml b/tests/anomaly-tester/res/values-km/strings.xml
new file mode 100644
index 0000000..cdc7ee5
--- /dev/null
+++ b/tests/anomaly-tester/res/values-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="app_name" msgid="4895205370884535654">"AnomalyTester"</string>
+</resources>
diff --git a/tests/anomaly-tester/res/values-kn/strings.xml b/tests/anomaly-tester/res/values-kn/strings.xml
new file mode 100644
index 0000000..dace89c
--- /dev/null
+++ b/tests/anomaly-tester/res/values-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="app_name" msgid="4895205370884535654">"ಅನೋಮಲಿಟೆಸ್ಟರ್"</string>
+</resources>
diff --git a/tests/anomaly-tester/res/values-ky/strings.xml b/tests/anomaly-tester/res/values-ky/strings.xml
new file mode 100644
index 0000000..cdc7ee5
--- /dev/null
+++ b/tests/anomaly-tester/res/values-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="app_name" msgid="4895205370884535654">"AnomalyTester"</string>
+</resources>
diff --git a/tests/anomaly-tester/res/values-lo/strings.xml b/tests/anomaly-tester/res/values-lo/strings.xml
new file mode 100644
index 0000000..cdc7ee5
--- /dev/null
+++ b/tests/anomaly-tester/res/values-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="app_name" msgid="4895205370884535654">"AnomalyTester"</string>
+</resources>
diff --git a/tests/anomaly-tester/res/values-lt/strings.xml b/tests/anomaly-tester/res/values-lt/strings.xml
new file mode 100644
index 0000000..cdc7ee5
--- /dev/null
+++ b/tests/anomaly-tester/res/values-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="app_name" msgid="4895205370884535654">"AnomalyTester"</string>
+</resources>
diff --git a/tests/anomaly-tester/res/values-lv/strings.xml b/tests/anomaly-tester/res/values-lv/strings.xml
new file mode 100644
index 0000000..cdc7ee5
--- /dev/null
+++ b/tests/anomaly-tester/res/values-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="app_name" msgid="4895205370884535654">"AnomalyTester"</string>
+</resources>
diff --git a/tests/anomaly-tester/res/values-mk/strings.xml b/tests/anomaly-tester/res/values-mk/strings.xml
new file mode 100644
index 0000000..cdc7ee5
--- /dev/null
+++ b/tests/anomaly-tester/res/values-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="app_name" msgid="4895205370884535654">"AnomalyTester"</string>
+</resources>
diff --git a/tests/anomaly-tester/res/values-ml/strings.xml b/tests/anomaly-tester/res/values-ml/strings.xml
new file mode 100644
index 0000000..cdc7ee5
--- /dev/null
+++ b/tests/anomaly-tester/res/values-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="app_name" msgid="4895205370884535654">"AnomalyTester"</string>
+</resources>
diff --git a/tests/anomaly-tester/res/values-mn/strings.xml b/tests/anomaly-tester/res/values-mn/strings.xml
new file mode 100644
index 0000000..cdc7ee5
--- /dev/null
+++ b/tests/anomaly-tester/res/values-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="app_name" msgid="4895205370884535654">"AnomalyTester"</string>
+</resources>
diff --git a/tests/anomaly-tester/res/values-mr/strings.xml b/tests/anomaly-tester/res/values-mr/strings.xml
new file mode 100644
index 0000000..3472e99
--- /dev/null
+++ b/tests/anomaly-tester/res/values-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="app_name" msgid="4895205370884535654">"विसंगती परीक्षक"</string>
+</resources>
diff --git a/tests/anomaly-tester/res/values-ms/strings.xml b/tests/anomaly-tester/res/values-ms/strings.xml
new file mode 100644
index 0000000..cdc7ee5
--- /dev/null
+++ b/tests/anomaly-tester/res/values-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="app_name" msgid="4895205370884535654">"AnomalyTester"</string>
+</resources>
diff --git a/tests/anomaly-tester/res/values-my/strings.xml b/tests/anomaly-tester/res/values-my/strings.xml
new file mode 100644
index 0000000..3535a3f
--- /dev/null
+++ b/tests/anomaly-tester/res/values-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="app_name" msgid="4895205370884535654">"Anomaly စမ်းသပ်ကိရိယာ"</string>
+</resources>
diff --git a/tests/anomaly-tester/res/values-nb/strings.xml b/tests/anomaly-tester/res/values-nb/strings.xml
new file mode 100644
index 0000000..cdc7ee5
--- /dev/null
+++ b/tests/anomaly-tester/res/values-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="app_name" msgid="4895205370884535654">"AnomalyTester"</string>
+</resources>
diff --git a/tests/anomaly-tester/res/values-ne/strings.xml b/tests/anomaly-tester/res/values-ne/strings.xml
new file mode 100644
index 0000000..cdc7ee5
--- /dev/null
+++ b/tests/anomaly-tester/res/values-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="app_name" msgid="4895205370884535654">"AnomalyTester"</string>
+</resources>
diff --git a/tests/anomaly-tester/res/values-nl/strings.xml b/tests/anomaly-tester/res/values-nl/strings.xml
new file mode 100644
index 0000000..cdc7ee5
--- /dev/null
+++ b/tests/anomaly-tester/res/values-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="app_name" msgid="4895205370884535654">"AnomalyTester"</string>
+</resources>
diff --git a/tests/anomaly-tester/res/values-pa/strings.xml b/tests/anomaly-tester/res/values-pa/strings.xml
new file mode 100644
index 0000000..cdc7ee5
--- /dev/null
+++ b/tests/anomaly-tester/res/values-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="app_name" msgid="4895205370884535654">"AnomalyTester"</string>
+</resources>
diff --git a/tests/anomaly-tester/res/values-pl/strings.xml b/tests/anomaly-tester/res/values-pl/strings.xml
new file mode 100644
index 0000000..cdc7ee5
--- /dev/null
+++ b/tests/anomaly-tester/res/values-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="app_name" msgid="4895205370884535654">"AnomalyTester"</string>
+</resources>
diff --git a/tests/anomaly-tester/res/values-pt-rBR/strings.xml b/tests/anomaly-tester/res/values-pt-rBR/strings.xml
new file mode 100644
index 0000000..cdc7ee5
--- /dev/null
+++ b/tests/anomaly-tester/res/values-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="app_name" msgid="4895205370884535654">"AnomalyTester"</string>
+</resources>
diff --git a/tests/anomaly-tester/res/values-pt-rPT/strings.xml b/tests/anomaly-tester/res/values-pt-rPT/strings.xml
new file mode 100644
index 0000000..cdc7ee5
--- /dev/null
+++ b/tests/anomaly-tester/res/values-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="app_name" msgid="4895205370884535654">"AnomalyTester"</string>
+</resources>
diff --git a/tests/anomaly-tester/res/values-pt/strings.xml b/tests/anomaly-tester/res/values-pt/strings.xml
new file mode 100644
index 0000000..cdc7ee5
--- /dev/null
+++ b/tests/anomaly-tester/res/values-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="app_name" msgid="4895205370884535654">"AnomalyTester"</string>
+</resources>
diff --git a/tests/anomaly-tester/res/values-ro/strings.xml b/tests/anomaly-tester/res/values-ro/strings.xml
new file mode 100644
index 0000000..cdc7ee5
--- /dev/null
+++ b/tests/anomaly-tester/res/values-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="app_name" msgid="4895205370884535654">"AnomalyTester"</string>
+</resources>
diff --git a/tests/anomaly-tester/res/values-ru/strings.xml b/tests/anomaly-tester/res/values-ru/strings.xml
new file mode 100644
index 0000000..cdc7ee5
--- /dev/null
+++ b/tests/anomaly-tester/res/values-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="app_name" msgid="4895205370884535654">"AnomalyTester"</string>
+</resources>
diff --git a/tests/anomaly-tester/res/values-si/strings.xml b/tests/anomaly-tester/res/values-si/strings.xml
new file mode 100644
index 0000000..de39b09
--- /dev/null
+++ b/tests/anomaly-tester/res/values-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="app_name" msgid="4895205370884535654">"විෂමතා පරීක්ෂක"</string>
+</resources>
diff --git a/tests/anomaly-tester/res/values-sk/strings.xml b/tests/anomaly-tester/res/values-sk/strings.xml
new file mode 100644
index 0000000..cdc7ee5
--- /dev/null
+++ b/tests/anomaly-tester/res/values-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="app_name" msgid="4895205370884535654">"AnomalyTester"</string>
+</resources>
diff --git a/tests/anomaly-tester/res/values-sl/strings.xml b/tests/anomaly-tester/res/values-sl/strings.xml
new file mode 100644
index 0000000..cdc7ee5
--- /dev/null
+++ b/tests/anomaly-tester/res/values-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="app_name" msgid="4895205370884535654">"AnomalyTester"</string>
+</resources>
diff --git a/tests/anomaly-tester/res/values-sq/strings.xml b/tests/anomaly-tester/res/values-sq/strings.xml
new file mode 100644
index 0000000..cdc7ee5
--- /dev/null
+++ b/tests/anomaly-tester/res/values-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="app_name" msgid="4895205370884535654">"AnomalyTester"</string>
+</resources>
diff --git a/tests/anomaly-tester/res/values-sr/strings.xml b/tests/anomaly-tester/res/values-sr/strings.xml
new file mode 100644
index 0000000..cdc7ee5
--- /dev/null
+++ b/tests/anomaly-tester/res/values-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="app_name" msgid="4895205370884535654">"AnomalyTester"</string>
+</resources>
diff --git a/tests/anomaly-tester/res/values-sv/strings.xml b/tests/anomaly-tester/res/values-sv/strings.xml
new file mode 100644
index 0000000..cdc7ee5
--- /dev/null
+++ b/tests/anomaly-tester/res/values-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="app_name" msgid="4895205370884535654">"AnomalyTester"</string>
+</resources>
diff --git a/tests/anomaly-tester/res/values-ta/strings.xml b/tests/anomaly-tester/res/values-ta/strings.xml
new file mode 100644
index 0000000..cdc7ee5
--- /dev/null
+++ b/tests/anomaly-tester/res/values-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="app_name" msgid="4895205370884535654">"AnomalyTester"</string>
+</resources>
diff --git a/tests/anomaly-tester/res/values-te/strings.xml b/tests/anomaly-tester/res/values-te/strings.xml
new file mode 100644
index 0000000..f175840
--- /dev/null
+++ b/tests/anomaly-tester/res/values-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="app_name" msgid="4895205370884535654">"అనామలీ టెస్టర్"</string>
+</resources>
diff --git a/tests/anomaly-tester/res/values-tl/strings.xml b/tests/anomaly-tester/res/values-tl/strings.xml
new file mode 100644
index 0000000..cdc7ee5
--- /dev/null
+++ b/tests/anomaly-tester/res/values-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="app_name" msgid="4895205370884535654">"AnomalyTester"</string>
+</resources>
diff --git a/tests/anomaly-tester/res/values-tr/strings.xml b/tests/anomaly-tester/res/values-tr/strings.xml
new file mode 100644
index 0000000..cdc7ee5
--- /dev/null
+++ b/tests/anomaly-tester/res/values-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="app_name" msgid="4895205370884535654">"AnomalyTester"</string>
+</resources>
diff --git a/tests/anomaly-tester/res/values-uk/strings.xml b/tests/anomaly-tester/res/values-uk/strings.xml
new file mode 100644
index 0000000..cdc7ee5
--- /dev/null
+++ b/tests/anomaly-tester/res/values-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="app_name" msgid="4895205370884535654">"AnomalyTester"</string>
+</resources>
diff --git a/tests/anomaly-tester/res/values-ur/strings.xml b/tests/anomaly-tester/res/values-ur/strings.xml
new file mode 100644
index 0000000..cdc7ee5
--- /dev/null
+++ b/tests/anomaly-tester/res/values-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="app_name" msgid="4895205370884535654">"AnomalyTester"</string>
+</resources>
diff --git a/tests/anomaly-tester/res/values-uz/strings.xml b/tests/anomaly-tester/res/values-uz/strings.xml
new file mode 100644
index 0000000..cdc7ee5
--- /dev/null
+++ b/tests/anomaly-tester/res/values-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="app_name" msgid="4895205370884535654">"AnomalyTester"</string>
+</resources>
diff --git a/tests/anomaly-tester/res/values-vi/strings.xml b/tests/anomaly-tester/res/values-vi/strings.xml
new file mode 100644
index 0000000..cdc7ee5
--- /dev/null
+++ b/tests/anomaly-tester/res/values-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="app_name" msgid="4895205370884535654">"AnomalyTester"</string>
+</resources>
diff --git a/tests/anomaly-tester/res/values-zh-rCN/strings.xml b/tests/anomaly-tester/res/values-zh-rCN/strings.xml
new file mode 100644
index 0000000..cdc7ee5
--- /dev/null
+++ b/tests/anomaly-tester/res/values-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="app_name" msgid="4895205370884535654">"AnomalyTester"</string>
+</resources>
diff --git a/tests/anomaly-tester/res/values-zh-rHK/strings.xml b/tests/anomaly-tester/res/values-zh-rHK/strings.xml
new file mode 100644
index 0000000..cdc7ee5
--- /dev/null
+++ b/tests/anomaly-tester/res/values-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="app_name" msgid="4895205370884535654">"AnomalyTester"</string>
+</resources>
diff --git a/tests/anomaly-tester/res/values-zu/strings.xml b/tests/anomaly-tester/res/values-zu/strings.xml
new file mode 100644
index 0000000..e28ad50
--- /dev/null
+++ b/tests/anomaly-tester/res/values-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="app_name" msgid="4895205370884535654">"I-AnomalyTester"</string>
+</resources>
diff --git a/tests/anomaly-tester/res/values/strings.xml b/tests/anomaly-tester/res/values/strings.xml
index 99de34e..da56356 100644
--- a/tests/anomaly-tester/res/values/strings.xml
+++ b/tests/anomaly-tester/res/values/strings.xml
@@ -15,5 +15,5 @@
 -->
 
 <resources>
-    <string name="app_name">AnomalyTester</string>
+    <string name="app_name" translatable="false">AnomalyTester</string>
 </resources>
diff --git a/tests/app/Android.mk b/tests/app/Android.mk
deleted file mode 100644
index c0c0ccf..0000000
--- a/tests/app/Android.mk
+++ /dev/null
@@ -1,27 +0,0 @@
-LOCAL_PATH:= $(call my-dir)
-include $(CLEAR_VARS)
-
-# We only want this apk build for tests.
-LOCAL_MODULE_TAGS := tests
-LOCAL_CERTIFICATE := platform
-
-LOCAL_JAVA_LIBRARIES := android.test.runner bouncycastle
-
-LOCAL_STATIC_JAVA_LIBRARIES := \
-    android-support-test \
-    mockito-target \
-    espresso-core \
-    espresso-contrib-nodep \
-    espresso-intents-nodep \
-    ub-uiautomator \
-    truth-prebuilt \
-    legacy-android-test
-
-# Include all test java files.
-LOCAL_SRC_FILES := $(call all-java-files-under, src)
-
-LOCAL_PACKAGE_NAME := SettingsTests
-
-LOCAL_INSTRUMENTATION_FOR := Settings
-
-include $(BUILD_PACKAGE)
diff --git a/tests/app/AndroidManifest.xml b/tests/app/AndroidManifest.xml
deleted file mode 100644
index 6659e5f..0000000
--- a/tests/app/AndroidManifest.xml
+++ /dev/null
@@ -1,67 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2008 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.android.settings.tests">
-
-    <uses-permission android:name="android.permission.BLUETOOTH" />
-    <uses-permission android:name="android.permission.BLUETOOTH_ADMIN" />
-    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
-    <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
-    <uses-permission android:name="android.permission.USE_CREDENTIALS" />
-    <uses-permission android:name="android.permission.REQUEST_INSTALL_PACKAGES" />
-    <uses-permission android:name="android.permission.INTERACT_ACROSS_USERS" />
-    <uses-permission android:name="android.permission.UPDATE_APP_OPS_STATS" />
-
-    <application>
-        <uses-library android:name="android.test.runner" />
-        <activity android:name="BluetoothRequestPermissionTest"
-            android:label="Bluetooth Perm Test" >
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.DEFAULT" />
-                <category android:name="android.intent.category.LAUNCHER" />
-            </intent-filter>
-        </activity>
-        <activity android:name="Operator" android:label="Operator Hook Test" >
-            <intent-filter>
-                <action android:name="com.android.settings.OPERATOR_APPLICATION_SETTING" />
-            </intent-filter>
-            <meta-data android:name="com.android.settings.title" android:resource="@string/operator_settings_title" />
-            <meta-data android:name="com.android.settings.summary" android:resource="@string/operator_settings_summary" />
-            <meta-data android:name="com.android.settings.icon" android:resource="@drawable/ic_settings_applications" />
-        </activity>
-        <activity android:name="Manufacturer" android:label="Manufacturer Hook Test" >
-            <intent-filter>
-                <action android:name="com.android.settings.MANUFACTURER_APPLICATION_SETTING" />
-            </intent-filter>
-            <meta-data android:name="com.android.settings.title" android:resource="@string/manufacturer_settings_title" />
-            <meta-data android:name="com.android.settings.summary" android:resource="@string/manufacturer_settings_summary" />
-            <meta-data android:name="com.android.settings.icon" android:resource="@drawable/ic_settings_applications" />
-        </activity>
-    </application>
-
-    <instrumentation android:name="android.support.test.runner.AndroidJUnitRunner"
-        android:targetPackage="com.android.settings"
-        android:label="Settings Test Cases">
-    </instrumentation>
-
-    <instrumentation android:name="SettingsLaunchPerformance"
-        android:targetPackage="com.android.settings"
-        android:label="Settings Launch Performance">
-    </instrumentation>
-
-</manifest>
diff --git a/tests/app/res/values-af/strings.xml b/tests/app/res/values-af/strings.xml
deleted file mode 100644
index 5a9ae32..0000000
--- a/tests/app/res/values-af/strings.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2009 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT 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="discoverable" msgid="5156521178072363663">"Opspoorbaar"</string>
-    <string name="start_scan" msgid="3834980997400324437">"Begin skandering"</string>
-    <string name="stop_scan" msgid="4195720269023182612">"Stop skandering"</string>
-    <string name="operator_hello" msgid="5164036004953019483">"Hallo, operateur!"</string>
-    <string name="operator_settings_title" msgid="6484497120056200416">"Operateur"</string>
-    <string name="operator_settings_summary" msgid="8356150829172002728">"Operateurhoek wat gebruik kan word om voorkeuraktiwiteit te begin"</string>
-    <string name="manufacturer_hello" msgid="5926168503597475062">"Hallo, vervaardiger!"</string>
-    <string name="manufacturer_settings_title" msgid="3516742885166545864">"Vervaardiger"</string>
-    <string name="manufacturer_settings_summary" msgid="4436962417539186408">"Vervaardigerhoek wat gebruik kan word om voorkeuraktiwiteit te begin"</string>
-</resources>
diff --git a/tests/app/res/values-am/strings.xml b/tests/app/res/values-am/strings.xml
deleted file mode 100644
index f77c852..0000000
--- a/tests/app/res/values-am/strings.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2009 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT 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="discoverable" msgid="5156521178072363663">"ሊገኝ የሚችል"</string>
-    <string name="start_scan" msgid="3834980997400324437">"ቅኝት ጀምር"</string>
-    <string name="stop_scan" msgid="4195720269023182612">"ቅኝት አቁም"</string>
-    <string name="operator_hello" msgid="5164036004953019483">"ታዲያስ ከዋኝ!"</string>
-    <string name="operator_settings_title" msgid="6484497120056200416">"ከዋኝ"</string>
-    <string name="operator_settings_summary" msgid="8356150829172002728">"የምርጫን እንቅስቃሴ ለማስጀመር ጥቅም ላይ መዋል የሚችል የከዋኝ መንጠቆ።"</string>
-    <string name="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/res/values-ar/strings.xml b/tests/app/res/values-ar/strings.xml
deleted file mode 100644
index 6ca54be..0000000
--- a/tests/app/res/values-ar/strings.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2009 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT 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="discoverable" msgid="5156521178072363663">"قابل للاكتشاف"</string>
-    <string name="start_scan" msgid="3834980997400324437">"بدء الفحص"</string>
-    <string name="stop_scan" msgid="4195720269023182612">"إيقاف الفحص"</string>
-    <string name="operator_hello" msgid="5164036004953019483">"مرحبًا بمشغِّل شبكة الجوّال!"</string>
-    <string name="operator_settings_title" msgid="6484497120056200416">"مشغِّل شبكة الجوال"</string>
-    <string name="operator_settings_summary" msgid="8356150829172002728">"أداة مشغِّل شبكة الجوّال التي يمكن استخدامها لبدء النشاط المختار"</string>
-    <string name="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/res/values-az/strings.xml b/tests/app/res/values-az/strings.xml
deleted file mode 100644
index d24e093..0000000
--- a/tests/app/res/values-az/strings.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2009 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT 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="discoverable" msgid="5156521178072363663">"Aşkarlana bilən"</string>
-    <string name="start_scan" msgid="3834980997400324437">"Skana başlay"</string>
-    <string name="stop_scan" msgid="4195720269023182612">"Skan prosesini dayandırın"</string>
-    <string name="operator_hello" msgid="5164036004953019483">"Salam, Operator!"</string>
-    <string name="operator_settings_title" msgid="6484497120056200416">"Operator"</string>
-    <string name="operator_settings_summary" msgid="8356150829172002728">"Seçim fəaliyyətinə başlamaq üçün istifadə edilə bilən Operator qarmağı"</string>
-    <string name="manufacturer_hello" msgid="5926168503597475062">"İstehsalçıya Salamlar!"</string>
-    <string name="manufacturer_settings_title" msgid="3516742885166545864">"İstehsalçı"</string>
-    <string name="manufacturer_settings_summary" msgid="4436962417539186408">"İstehsalçı dəhrəsi seçim aktivliyinə başlamaq üçün işlənə bilər"</string>
-</resources>
diff --git a/tests/app/res/values-b+sr+Latn/strings.xml b/tests/app/res/values-b+sr+Latn/strings.xml
deleted file mode 100644
index 9ee1c5e..0000000
--- a/tests/app/res/values-b+sr+Latn/strings.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2009 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT 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="discoverable" msgid="5156521178072363663">"Vidljivo"</string>
-    <string name="start_scan" msgid="3834980997400324437">"Pokreni skeniranje"</string>
-    <string name="stop_scan" msgid="4195720269023182612">"Zaustavi skeniranje"</string>
-    <string name="operator_hello" msgid="5164036004953019483">"Zdravo, operateru!"</string>
-    <string name="operator_settings_title" msgid="6484497120056200416">"Mobilni operater"</string>
-    <string name="operator_settings_summary" msgid="8356150829172002728">"Mamac za operatera koji može da se koristi za pokretanje željene aktivnosti"</string>
-    <string name="manufacturer_hello" msgid="5926168503597475062">"Zdravo, proizvođaču!"</string>
-    <string name="manufacturer_settings_title" msgid="3516742885166545864">"Proizvođač"</string>
-    <string name="manufacturer_settings_summary" msgid="4436962417539186408">"Mamac za proizvođača koji može da se koristi za pokretanje željene aktivnosti"</string>
-</resources>
diff --git a/tests/app/res/values-be/strings.xml b/tests/app/res/values-be/strings.xml
deleted file mode 100644
index 41d62b4..0000000
--- a/tests/app/res/values-be/strings.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2009 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT 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="discoverable" msgid="5156521178072363663">"Бачная прылада"</string>
-    <string name="start_scan" msgid="3834980997400324437">"Пачаць сканіраванне"</string>
-    <string name="stop_scan" msgid="4195720269023182612">"Спыніць сканіраванне"</string>
-    <string name="operator_hello" msgid="5164036004953019483">"Прывітанне, аператар!"</string>
-    <string name="operator_settings_title" msgid="6484497120056200416">"Аператар"</string>
-    <string name="operator_settings_summary" msgid="8356150829172002728">"Хітрык аператара, які можна выкарыстоўваць для выбранай дзейнасці"</string>
-    <string name="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/res/values-bg/strings.xml b/tests/app/res/values-bg/strings.xml
deleted file mode 100644
index 580bf85..0000000
--- a/tests/app/res/values-bg/strings.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2009 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT 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="discoverable" msgid="5156521178072363663">"Откриваемо"</string>
-    <string name="start_scan" msgid="3834980997400324437">"Стартиране на сканирането"</string>
-    <string name="stop_scan" msgid="4195720269023182612">"Спиране на сканирането"</string>
-    <string name="operator_hello" msgid="5164036004953019483">"Здравейте, операторе!"</string>
-    <string name="operator_settings_title" msgid="6484497120056200416">"Оператор"</string>
-    <string name="operator_settings_summary" msgid="8356150829172002728">"Фраза за поздрав към оператора, чрез която може да се стартира желана дейност"</string>
-    <string name="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/res/values-bn/strings.xml b/tests/app/res/values-bn/strings.xml
deleted file mode 100644
index ac6edab..0000000
--- a/tests/app/res/values-bn/strings.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2009 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT 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="discoverable" msgid="5156521178072363663">"খুঁজে নেওয়ার যোগ্য"</string>
-    <string name="start_scan" msgid="3834980997400324437">"স্ক্যান শুরু করুন"</string>
-    <string name="stop_scan" msgid="4195720269023182612">"স্ক্যান বন্ধ করুন"</string>
-    <string name="operator_hello" msgid="5164036004953019483">"হ্যালো অপারেটর!"</string>
-    <string name="operator_settings_title" msgid="6484497120056200416">"অপারেটর"</string>
-    <string name="operator_settings_summary" msgid="8356150829172002728">"অপারেটর হুক যা পছন্দের কার্যকলাপ শুরু করতে ব্যবহার করা যেতে পারে"</string>
-    <string name="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/res/values-bs/strings.xml b/tests/app/res/values-bs/strings.xml
deleted file mode 100644
index db91532..0000000
--- a/tests/app/res/values-bs/strings.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2009 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT 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="discoverable" msgid="5156521178072363663">"Vidljiv"</string>
-    <string name="start_scan" msgid="3834980997400324437">"Započni skeniranje"</string>
-    <string name="stop_scan" msgid="4195720269023182612">"Zaustavi skeniranje"</string>
-    <string name="operator_hello" msgid="5164036004953019483">"Zdravo, operateru!"</string>
-    <string name="operator_settings_title" msgid="6484497120056200416">"Operater"</string>
-    <string name="operator_settings_summary" msgid="8356150829172002728">"Zakačka operatera koja se može koristiti za pokretanje aktivnosti po izboru"</string>
-    <string name="manufacturer_hello" msgid="5926168503597475062">"Zdravo, proizvođaču!"</string>
-    <string name="manufacturer_settings_title" msgid="3516742885166545864">"Proizvođač"</string>
-    <string name="manufacturer_settings_summary" msgid="4436962417539186408">"Zakačka proizvođača koja se može koristiti za pokretanje aktivnosti po izboru"</string>
-</resources>
diff --git a/tests/app/res/values-ca/strings.xml b/tests/app/res/values-ca/strings.xml
deleted file mode 100644
index e324eeb..0000000
--- a/tests/app/res/values-ca/strings.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2009 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT 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="discoverable" msgid="5156521178072363663">"Visible"</string>
-    <string name="start_scan" msgid="3834980997400324437">"Inicia la cerca"</string>
-    <string name="stop_scan" msgid="4195720269023182612">"Atura la cerca"</string>
-    <string name="operator_hello" msgid="5164036004953019483">"Hola, operador!"</string>
-    <string name="operator_settings_title" msgid="6484497120056200416">"Operador"</string>
-    <string name="operator_settings_summary" msgid="8356150829172002728">"Esquer per a l\'operador que es pot utilitzar per iniciar l\'activitat triada"</string>
-    <string name="manufacturer_hello" msgid="5926168503597475062">"Hola, fabricant!"</string>
-    <string name="manufacturer_settings_title" msgid="3516742885166545864">"Fabricant"</string>
-    <string name="manufacturer_settings_summary" msgid="4436962417539186408">"Esquer per al fabricant que es pot utilitzar per iniciar l\'activitat triada"</string>
-</resources>
diff --git a/tests/app/res/values-cs/strings.xml b/tests/app/res/values-cs/strings.xml
deleted file mode 100644
index 92a93cf..0000000
--- a/tests/app/res/values-cs/strings.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2009 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT 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="discoverable" msgid="5156521178072363663">"Viditelné"</string>
-    <string name="start_scan" msgid="3834980997400324437">"Zahájit vyhledávání"</string>
-    <string name="stop_scan" msgid="4195720269023182612">"Zastavit vyhledávání"</string>
-    <string name="operator_hello" msgid="5164036004953019483">"Ahoj operátore!"</string>
-    <string name="operator_settings_title" msgid="6484497120056200416">"Operátor"</string>
-    <string name="operator_settings_summary" msgid="8356150829172002728">"Háček operátora, který lze použít ke spuštění vybrané činnosti"</string>
-    <string name="manufacturer_hello" msgid="5926168503597475062">"Ahoj výrobce!"</string>
-    <string name="manufacturer_settings_title" msgid="3516742885166545864">"Výrobce"</string>
-    <string name="manufacturer_settings_summary" msgid="4436962417539186408">"Háček výrobce, který lze použít ke spuštění vybrané činnosti"</string>
-</resources>
diff --git a/tests/app/res/values-da/strings.xml b/tests/app/res/values-da/strings.xml
deleted file mode 100644
index 6a76b15..0000000
--- a/tests/app/res/values-da/strings.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2009 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT 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="discoverable" msgid="5156521178072363663">"Søgbar"</string>
-    <string name="start_scan" msgid="3834980997400324437">"Start scanning"</string>
-    <string name="stop_scan" msgid="4195720269023182612">"Stop scanning"</string>
-    <string name="operator_hello" msgid="5164036004953019483">"Hej mobilselskab"</string>
-    <string name="operator_settings_title" msgid="6484497120056200416">"Mobilselskab"</string>
-    <string name="operator_settings_summary" msgid="8356150829172002728">"Hook fra mobilselskabet, der kan bruges til at starte en aktivitet"</string>
-    <string name="manufacturer_hello" msgid="5926168503597475062">"Hej producent"</string>
-    <string name="manufacturer_settings_title" msgid="3516742885166545864">"Producent"</string>
-    <string name="manufacturer_settings_summary" msgid="4436962417539186408">"Hook fra producenten, der kan bruges til at starte en aktivitet"</string>
-</resources>
diff --git a/tests/app/res/values-de/strings.xml b/tests/app/res/values-de/strings.xml
deleted file mode 100644
index 8916379..0000000
--- a/tests/app/res/values-de/strings.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2009 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT 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="discoverable" msgid="5156521178072363663">"Sichtbar"</string>
-    <string name="start_scan" msgid="3834980997400324437">"Scan starten"</string>
-    <string name="stop_scan" msgid="4195720269023182612">"Scan beenden"</string>
-    <string name="operator_hello" msgid="5164036004953019483">"Hallo Operator!"</string>
-    <string name="operator_settings_title" msgid="6484497120056200416">"Operator"</string>
-    <string name="operator_settings_summary" msgid="8356150829172002728">"Operator-Hook zum Starten einer gewünschten Aktivität"</string>
-    <string name="manufacturer_hello" msgid="5926168503597475062">"Hallo Hersteller!"</string>
-    <string name="manufacturer_settings_title" msgid="3516742885166545864">"Hersteller"</string>
-    <string name="manufacturer_settings_summary" msgid="4436962417539186408">"Hersteller-Hook zum Starten einer gewünschten Aktivität"</string>
-</resources>
diff --git a/tests/app/res/values-el/strings.xml b/tests/app/res/values-el/strings.xml
deleted file mode 100644
index 1e7f4ec..0000000
--- a/tests/app/res/values-el/strings.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2009 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT 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="discoverable" msgid="5156521178072363663">"Ανιχνεύσιμο"</string>
-    <string name="start_scan" msgid="3834980997400324437">"Έναρξη σάρωσης"</string>
-    <string name="stop_scan" msgid="4195720269023182612">"Διακοπή σάρωσης"</string>
-    <string name="operator_hello" msgid="5164036004953019483">"Γεια σας, χειριστή!"</string>
-    <string name="operator_settings_title" msgid="6484497120056200416">"Χειριστής"</string>
-    <string name="operator_settings_summary" msgid="8356150829172002728">"Άγκιστρο χειριστή που μπορεί να χρησιμοποιηθεί για την έναρξη της επιλεγμένης δραστηριότητας"</string>
-    <string name="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/res/values-en-rAU/strings.xml b/tests/app/res/values-en-rAU/strings.xml
deleted file mode 100644
index e1a9a09..0000000
--- a/tests/app/res/values-en-rAU/strings.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2009 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT 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="discoverable" msgid="5156521178072363663">"Discoverable"</string>
-    <string name="start_scan" msgid="3834980997400324437">"Start scan"</string>
-    <string name="stop_scan" msgid="4195720269023182612">"Stop scan"</string>
-    <string name="operator_hello" msgid="5164036004953019483">"Hello Operator!"</string>
-    <string name="operator_settings_title" msgid="6484497120056200416">"Operator"</string>
-    <string name="operator_settings_summary" msgid="8356150829172002728">"Operator\'s hook that can be used to start activity of choice"</string>
-    <string name="manufacturer_hello" msgid="5926168503597475062">"Hello Manufacturer!"</string>
-    <string name="manufacturer_settings_title" msgid="3516742885166545864">"Manufacturer"</string>
-    <string name="manufacturer_settings_summary" msgid="4436962417539186408">"Manufacturer\'s hook that can be used to start activity of choice"</string>
-</resources>
diff --git a/tests/app/res/values-en-rGB/strings.xml b/tests/app/res/values-en-rGB/strings.xml
deleted file mode 100644
index e1a9a09..0000000
--- a/tests/app/res/values-en-rGB/strings.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2009 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT 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="discoverable" msgid="5156521178072363663">"Discoverable"</string>
-    <string name="start_scan" msgid="3834980997400324437">"Start scan"</string>
-    <string name="stop_scan" msgid="4195720269023182612">"Stop scan"</string>
-    <string name="operator_hello" msgid="5164036004953019483">"Hello Operator!"</string>
-    <string name="operator_settings_title" msgid="6484497120056200416">"Operator"</string>
-    <string name="operator_settings_summary" msgid="8356150829172002728">"Operator\'s hook that can be used to start activity of choice"</string>
-    <string name="manufacturer_hello" msgid="5926168503597475062">"Hello Manufacturer!"</string>
-    <string name="manufacturer_settings_title" msgid="3516742885166545864">"Manufacturer"</string>
-    <string name="manufacturer_settings_summary" msgid="4436962417539186408">"Manufacturer\'s hook that can be used to start activity of choice"</string>
-</resources>
diff --git a/tests/app/res/values-en-rIN/strings.xml b/tests/app/res/values-en-rIN/strings.xml
deleted file mode 100644
index e1a9a09..0000000
--- a/tests/app/res/values-en-rIN/strings.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2009 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT 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="discoverable" msgid="5156521178072363663">"Discoverable"</string>
-    <string name="start_scan" msgid="3834980997400324437">"Start scan"</string>
-    <string name="stop_scan" msgid="4195720269023182612">"Stop scan"</string>
-    <string name="operator_hello" msgid="5164036004953019483">"Hello Operator!"</string>
-    <string name="operator_settings_title" msgid="6484497120056200416">"Operator"</string>
-    <string name="operator_settings_summary" msgid="8356150829172002728">"Operator\'s hook that can be used to start activity of choice"</string>
-    <string name="manufacturer_hello" msgid="5926168503597475062">"Hello Manufacturer!"</string>
-    <string name="manufacturer_settings_title" msgid="3516742885166545864">"Manufacturer"</string>
-    <string name="manufacturer_settings_summary" msgid="4436962417539186408">"Manufacturer\'s hook that can be used to start activity of choice"</string>
-</resources>
diff --git a/tests/app/res/values-es-rUS/strings.xml b/tests/app/res/values-es-rUS/strings.xml
deleted file mode 100644
index 1ea3671..0000000
--- a/tests/app/res/values-es-rUS/strings.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2009 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT 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="discoverable" msgid="5156521178072363663">"Visible"</string>
-    <string name="start_scan" msgid="3834980997400324437">"Comenzar lectura"</string>
-    <string name="stop_scan" msgid="4195720269023182612">"Detener lectura"</string>
-    <string name="operator_hello" msgid="5164036004953019483">"¡Hola operador!"</string>
-    <string name="operator_settings_title" msgid="6484497120056200416">"Operador"</string>
-    <string name="operator_settings_summary" msgid="8356150829172002728">"Vínculo del operador que puede utilizarse para iniciar la actividad que elijas"</string>
-    <string name="manufacturer_hello" msgid="5926168503597475062">"¡Hola fabricante!"</string>
-    <string name="manufacturer_settings_title" msgid="3516742885166545864">"Fabricante"</string>
-    <string name="manufacturer_settings_summary" msgid="4436962417539186408">"Vínculo del fabricante que puede utilizarse para iniciar la actividad que elijas"</string>
-</resources>
diff --git a/tests/app/res/values-es/strings.xml b/tests/app/res/values-es/strings.xml
deleted file mode 100644
index efd42e3..0000000
--- a/tests/app/res/values-es/strings.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2009 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT 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="discoverable" msgid="5156521178072363663">"Visible"</string>
-    <string name="start_scan" msgid="3834980997400324437">"Iniciar búsqueda"</string>
-    <string name="stop_scan" msgid="4195720269023182612">"Detener búsqueda"</string>
-    <string name="operator_hello" msgid="5164036004953019483">"¡Hola, operador!"</string>
-    <string name="operator_settings_title" msgid="6484497120056200416">"Operador"</string>
-    <string name="operator_settings_summary" msgid="8356150829172002728">"Enlace del operador que se puede utilizar para iniciar la selección"</string>
-    <string name="manufacturer_hello" msgid="5926168503597475062">"¡Hola, fabricante!"</string>
-    <string name="manufacturer_settings_title" msgid="3516742885166545864">"Fabricante"</string>
-    <string name="manufacturer_settings_summary" msgid="4436962417539186408">"Enlace del fabricante que se puede utilizar para iniciar la selección"</string>
-</resources>
diff --git a/tests/app/res/values-et/strings.xml b/tests/app/res/values-et/strings.xml
deleted file mode 100644
index 077d066..0000000
--- a/tests/app/res/values-et/strings.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2009 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT 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="discoverable" msgid="5156521178072363663">"Leitav"</string>
-    <string name="start_scan" msgid="3834980997400324437">"Käivita skannimine"</string>
-    <string name="stop_scan" msgid="4195720269023182612">"Peata skannimine"</string>
-    <string name="operator_hello" msgid="5164036004953019483">"Tere, operaator!"</string>
-    <string name="operator_settings_title" msgid="6484497120056200416">"Operaator"</string>
-    <string name="operator_settings_summary" msgid="8356150829172002728">"Operaatoriharki saab kasutada teie valitud tegevuse käivitamiseks"</string>
-    <string name="manufacturer_hello" msgid="5926168503597475062">"Tere, tootja!"</string>
-    <string name="manufacturer_settings_title" msgid="3516742885166545864">"Tootja"</string>
-    <string name="manufacturer_settings_summary" msgid="4436962417539186408">"Tootjaharki saab kasutada teie valitud tegevuse käivitamiseks"</string>
-</resources>
diff --git a/tests/app/res/values-eu/strings.xml b/tests/app/res/values-eu/strings.xml
deleted file mode 100644
index 2234436..0000000
--- a/tests/app/res/values-eu/strings.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2009 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT 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="discoverable" msgid="5156521178072363663">"Ikusgai"</string>
-    <string name="start_scan" msgid="3834980997400324437">"Hasi aztertzen"</string>
-    <string name="stop_scan" msgid="4195720269023182612">"Gelditu azterketa"</string>
-    <string name="operator_hello" msgid="5164036004953019483">"Kaixo, operadore hori!"</string>
-    <string name="operator_settings_title" msgid="6484497120056200416">"Operadorea"</string>
-    <string name="operator_settings_summary" msgid="8356150829172002728">"Operadorearen lotura, jarduerak nahieran hasteko erabil daitekeena"</string>
-    <string name="manufacturer_hello" msgid="5926168503597475062">"Kaixo, fabrikatzaile hori!"</string>
-    <string name="manufacturer_settings_title" msgid="3516742885166545864">"Fabrikatzailea"</string>
-    <string name="manufacturer_settings_summary" msgid="4436962417539186408">"Fabrikatzailearen lotura, jarduerak nahieran hasteko erabil daitekeena"</string>
-</resources>
diff --git a/tests/app/res/values-fa/strings.xml b/tests/app/res/values-fa/strings.xml
deleted file mode 100644
index 5f8a919..0000000
--- a/tests/app/res/values-fa/strings.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2009 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT 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="discoverable" msgid="5156521178072363663">"قابل شناسایی"</string>
-    <string name="start_scan" msgid="3834980997400324437">"شروع اسکن"</string>
-    <string name="stop_scan" msgid="4195720269023182612">"توقف اسکن"</string>
-    <string name="operator_hello" msgid="5164036004953019483">"سلام اپراتور!"</string>
-    <string name="operator_settings_title" msgid="6484497120056200416">"اپراتور"</string>
-    <string name="operator_settings_summary" msgid="8356150829172002728">"گیره اپراتور که می‌توان از آن برای شروع فعالیت دلخواه استفاده کرد"</string>
-    <string name="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/res/values-fi/strings.xml b/tests/app/res/values-fi/strings.xml
deleted file mode 100644
index 0b2b237..0000000
--- a/tests/app/res/values-fi/strings.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2009 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT 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="discoverable" msgid="5156521178072363663">"Tunnistettavissa"</string>
-    <string name="start_scan" msgid="3834980997400324437">"Aloita haku"</string>
-    <string name="stop_scan" msgid="4195720269023182612">"Pysäytä haku"</string>
-    <string name="operator_hello" msgid="5164036004953019483">"Hei operaattori!"</string>
-    <string name="operator_settings_title" msgid="6484497120056200416">"Operaattori"</string>
-    <string name="operator_settings_summary" msgid="8356150829172002728">"Operaattorin pakote, jonka avulla voidaan aloittaa valittu toiminto"</string>
-    <string name="manufacturer_hello" msgid="5926168503597475062">"Hei valmistaja!"</string>
-    <string name="manufacturer_settings_title" msgid="3516742885166545864">"Valmistaja"</string>
-    <string name="manufacturer_settings_summary" msgid="4436962417539186408">"Valmistajan pakote, jonka avulla valittu toiminto voidaan aloittaa"</string>
-</resources>
diff --git a/tests/app/res/values-fr-rCA/strings.xml b/tests/app/res/values-fr-rCA/strings.xml
deleted file mode 100644
index f8df49a..0000000
--- a/tests/app/res/values-fr-rCA/strings.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2009 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT 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="discoverable" msgid="5156521178072363663">"Visible"</string>
-    <string name="start_scan" msgid="3834980997400324437">"Démarrer la recherche"</string>
-    <string name="stop_scan" msgid="4195720269023182612">"Arrêter la recherche"</string>
-    <string name="operator_hello" msgid="5164036004953019483">"Bonjour, fournisseur de services!"</string>
-    <string name="operator_settings_title" msgid="6484497120056200416">"Fournisseur de services"</string>
-    <string name="operator_settings_summary" msgid="8356150829172002728">"Accroche à l\'intention du fournisseur de services pouvant servir à démarrer l\'opération souhaitée"</string>
-    <string name="manufacturer_hello" msgid="5926168503597475062">"Bonjour, fabricant!"</string>
-    <string name="manufacturer_settings_title" msgid="3516742885166545864">"Fabricant"</string>
-    <string name="manufacturer_settings_summary" msgid="4436962417539186408">"Accroche à l\'intention du fabricant pouvant servir à démarrer l\'opération souhaitée"</string>
-</resources>
diff --git a/tests/app/res/values-fr/strings.xml b/tests/app/res/values-fr/strings.xml
deleted file mode 100644
index a2df7ed..0000000
--- a/tests/app/res/values-fr/strings.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2009 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT 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="discoverable" msgid="5156521178072363663">"Visible"</string>
-    <string name="start_scan" msgid="3834980997400324437">"Démarrer la recherche"</string>
-    <string name="stop_scan" msgid="4195720269023182612">"Arrêter la recherche"</string>
-    <string name="operator_hello" msgid="5164036004953019483">"Hello Operator!"</string>
-    <string name="operator_settings_title" msgid="6484497120056200416">"Opérateur"</string>
-    <string name="operator_settings_summary" msgid="8356150829172002728">"Accroche opérateur pouvant servir à démarrer l\'opération souhaitée"</string>
-    <string name="manufacturer_hello" msgid="5926168503597475062">"Hello Manufacturer!"</string>
-    <string name="manufacturer_settings_title" msgid="3516742885166545864">"Fabricant"</string>
-    <string name="manufacturer_settings_summary" msgid="4436962417539186408">"Accroche fabricant pouvant servir à démarrer l\'opération souhaitée"</string>
-</resources>
diff --git a/tests/app/res/values-gl/strings.xml b/tests/app/res/values-gl/strings.xml
deleted file mode 100644
index d4343d2..0000000
--- a/tests/app/res/values-gl/strings.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2009 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT 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="discoverable" msgid="5156521178072363663">"Detectable"</string>
-    <string name="start_scan" msgid="3834980997400324437">"Iniciar escaneo"</string>
-    <string name="stop_scan" msgid="4195720269023182612">"Deter escaneo"</string>
-    <string name="operator_hello" msgid="5164036004953019483">"Ola, operador!"</string>
-    <string name="operator_settings_title" msgid="6484497120056200416">"Operador"</string>
-    <string name="operator_settings_summary" msgid="8356150829172002728">"Gancho do operador que se pode usar para iniciar a actividade escollida"</string>
-    <string name="manufacturer_hello" msgid="5926168503597475062">"Ola, fabricante!"</string>
-    <string name="manufacturer_settings_title" msgid="3516742885166545864">"Fabricante"</string>
-    <string name="manufacturer_settings_summary" msgid="4436962417539186408">"Gancho do fabricante que se pode usar para iniciar a actividade escollida"</string>
-</resources>
diff --git a/tests/app/res/values-gu/strings.xml b/tests/app/res/values-gu/strings.xml
deleted file mode 100644
index 703f70e..0000000
--- a/tests/app/res/values-gu/strings.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2009 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT 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="discoverable" msgid="5156521178072363663">"શોધવાયોગ્ય"</string>
-    <string name="start_scan" msgid="3834980997400324437">"સ્કૅન પ્રારંભ કરો"</string>
-    <string name="stop_scan" msgid="4195720269023182612">"સ્કૅન રોકો"</string>
-    <string name="operator_hello" msgid="5164036004953019483">"ઓપરેટરને નમસ્કાર!"</string>
-    <string name="operator_settings_title" msgid="6484497120056200416">"ઓપરેટર"</string>
-    <string name="operator_settings_summary" msgid="8356150829172002728">"ઓપરેટર હુક કે જેનો ઉપયોગ પસંદગીની પ્રવૃત્તિ પ્રારંભ કરવા માટે કરી શકાય છે"</string>
-    <string name="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/res/values-hi/strings.xml b/tests/app/res/values-hi/strings.xml
deleted file mode 100644
index ed366ca..0000000
--- a/tests/app/res/values-hi/strings.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2009 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT 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="discoverable" msgid="5156521178072363663">"खोजे जाने योग्य"</string>
-    <string name="start_scan" msgid="3834980997400324437">"स्कैन प्रारंभ करें"</string>
-    <string name="stop_scan" msgid="4195720269023182612">"स्कैन बंद करें"</string>
-    <string name="operator_hello" msgid="5164036004953019483">"नमस्कार ऑपरेटर!"</string>
-    <string name="operator_settings_title" msgid="6484497120056200416">"ऑपरेटर"</string>
-    <string name="operator_settings_summary" msgid="8356150829172002728">"पसंद की गतिविधि प्रारंभ करने में उपयोग किया जाने वाला ऑपरेटर हुक"</string>
-    <string name="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/res/values-hr/strings.xml b/tests/app/res/values-hr/strings.xml
deleted file mode 100644
index 768ebb7..0000000
--- a/tests/app/res/values-hr/strings.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2009 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT 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="discoverable" msgid="5156521178072363663">"Moguće otkrivanje"</string>
-    <string name="start_scan" msgid="3834980997400324437">"Pokreni skeniranje"</string>
-    <string name="stop_scan" msgid="4195720269023182612">"Zaustavi skeniranje"</string>
-    <string name="operator_hello" msgid="5164036004953019483">"Pozdrav, operateru!"</string>
-    <string name="operator_settings_title" msgid="6484497120056200416">"Mobilni operater"</string>
-    <string name="operator_settings_summary" msgid="8356150829172002728">"Operatorska kvaka koja se može upotrijebiti da bi se započela odabrana aktivnost"</string>
-    <string name="manufacturer_hello" msgid="5926168503597475062">"Pozdrav, proizvođaču!"</string>
-    <string name="manufacturer_settings_title" msgid="3516742885166545864">"Proizvođač"</string>
-    <string name="manufacturer_settings_summary" msgid="4436962417539186408">"Proizvođačka kvaka koja se može upotrijebiti da bi se započela odabrana aktivnost"</string>
-</resources>
diff --git a/tests/app/res/values-hu/strings.xml b/tests/app/res/values-hu/strings.xml
deleted file mode 100644
index da41396..0000000
--- a/tests/app/res/values-hu/strings.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2009 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT 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="discoverable" msgid="5156521178072363663">"Látható"</string>
-    <string name="start_scan" msgid="3834980997400324437">"Keresés indítása"</string>
-    <string name="stop_scan" msgid="4195720269023182612">"Keresés leállítása"</string>
-    <string name="operator_hello" msgid="5164036004953019483">"Üdv, Operátor!"</string>
-    <string name="operator_settings_title" msgid="6484497120056200416">"Szolgáltató"</string>
-    <string name="operator_settings_summary" msgid="8356150829172002728">"Operátori horog, amelyet tetszés szerinti tevékenység elindítására lehet használni"</string>
-    <string name="manufacturer_hello" msgid="5926168503597475062">"Tisztelt Gyártó!"</string>
-    <string name="manufacturer_settings_title" msgid="3516742885166545864">"Gyártó"</string>
-    <string name="manufacturer_settings_summary" msgid="4436962417539186408">"Gyártói horog, amely tetszés szerinti tevékenység elindítására használható"</string>
-</resources>
diff --git a/tests/app/res/values-hy/strings.xml b/tests/app/res/values-hy/strings.xml
deleted file mode 100644
index c8cd4a1..0000000
--- a/tests/app/res/values-hy/strings.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2009 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT 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="discoverable" msgid="5156521178072363663">"Հայտնաբերելի"</string>
-    <string name="start_scan" msgid="3834980997400324437">"Սկսել սկանավորումը"</string>
-    <string name="stop_scan" msgid="4195720269023182612">"Դադարեցնել սկանավորումը"</string>
-    <string name="operator_hello" msgid="5164036004953019483">"Ողջու˜յն, օպերատոր:"</string>
-    <string name="operator_settings_title" msgid="6484497120056200416">"Օպերատոր"</string>
-    <string name="operator_settings_summary" msgid="8356150829172002728">"Օպերատորի սլաքը կարող է օգտագործվել ընտրված գործողությունը սկսելու համար"</string>
-    <string name="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/res/values-in/strings.xml b/tests/app/res/values-in/strings.xml
deleted file mode 100644
index 51c474c..0000000
--- a/tests/app/res/values-in/strings.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2009 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT 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="discoverable" msgid="5156521178072363663">"Dapat ditemukan"</string>
-    <string name="start_scan" msgid="3834980997400324437">"Mulai memindai"</string>
-    <string name="stop_scan" msgid="4195720269023182612">"Hentikan pemindaian"</string>
-    <string name="operator_hello" msgid="5164036004953019483">"Halo Operator!"</string>
-    <string name="operator_settings_title" msgid="6484497120056200416">"Operator"</string>
-    <string name="operator_settings_summary" msgid="8356150829172002728">"Hook operator yang dapat digunakan untuk memulai aktivitas pilihan"</string>
-    <string name="manufacturer_hello" msgid="5926168503597475062">"Halo Pabrikan!"</string>
-    <string name="manufacturer_settings_title" msgid="3516742885166545864">"Produsen"</string>
-    <string name="manufacturer_settings_summary" msgid="4436962417539186408">"Hook produsen yang dapat digunakan untuk memulai aktivitas pilihan"</string>
-</resources>
diff --git a/tests/app/res/values-is/strings.xml b/tests/app/res/values-is/strings.xml
deleted file mode 100644
index 4d694cc..0000000
--- a/tests/app/res/values-is/strings.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2009 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT 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="discoverable" msgid="5156521178072363663">"Sýnilegt"</string>
-    <string name="start_scan" msgid="3834980997400324437">"Hefja skönnun"</string>
-    <string name="stop_scan" msgid="4195720269023182612">"Stöðva skönnun"</string>
-    <string name="operator_hello" msgid="5164036004953019483">"Halló, símafyrirtæki!"</string>
-    <string name="operator_settings_title" msgid="6484497120056200416">"Símafyrirtæki"</string>
-    <string name="operator_settings_summary" msgid="8356150829172002728">"Símafyrirtækishlið sem hægt er að nota til að ræsa hvaða virkni sem er"</string>
-    <string name="manufacturer_hello" msgid="5926168503597475062">"Halló, framleiðandi!"</string>
-    <string name="manufacturer_settings_title" msgid="3516742885166545864">"Framleiðandi"</string>
-    <string name="manufacturer_settings_summary" msgid="4436962417539186408">"Framleiðandahlið sem hægt er að nota til að ræsa hvaða virkni sem er"</string>
-</resources>
diff --git a/tests/app/res/values-it/strings.xml b/tests/app/res/values-it/strings.xml
deleted file mode 100644
index 46a8a1c..0000000
--- a/tests/app/res/values-it/strings.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2009 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT 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="discoverable" msgid="5156521178072363663">"Rilevabile"</string>
-    <string name="start_scan" msgid="3834980997400324437">"Avvia scansione"</string>
-    <string name="stop_scan" msgid="4195720269023182612">"Interrompi scansione"</string>
-    <string name="operator_hello" msgid="5164036004953019483">"Ciao operatore!"</string>
-    <string name="operator_settings_title" msgid="6484497120056200416">"Operatore"</string>
-    <string name="operator_settings_summary" msgid="8356150829172002728">"Collegamento all\'operatore utilizzabile per avviare l\'attività di propria scelta"</string>
-    <string name="manufacturer_hello" msgid="5926168503597475062">"Ciao produttore!"</string>
-    <string name="manufacturer_settings_title" msgid="3516742885166545864">"Produttore"</string>
-    <string name="manufacturer_settings_summary" msgid="4436962417539186408">"Collegamento al produttore utilizzabile per avviare l\'attività di propria scelta"</string>
-</resources>
diff --git a/tests/app/res/values-iw/strings.xml b/tests/app/res/values-iw/strings.xml
deleted file mode 100644
index a2c9e46..0000000
--- a/tests/app/res/values-iw/strings.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2009 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT 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="discoverable" msgid="5156521178072363663">"גלוי"</string>
-    <string name="start_scan" msgid="3834980997400324437">"התחל סריקה"</string>
-    <string name="stop_scan" msgid="4195720269023182612">"הפסק סריקה"</string>
-    <string name="operator_hello" msgid="5164036004953019483">"שלום לך ספק!"</string>
-    <string name="operator_settings_title" msgid="6484497120056200416">"ספק"</string>
-    <string name="operator_settings_summary" msgid="8356150829172002728">"חיבור ספק שיכול לשמש להתחלת הפעילות שנבחרה"</string>
-    <string name="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/res/values-ja/strings.xml b/tests/app/res/values-ja/strings.xml
deleted file mode 100644
index 5b663e7..0000000
--- a/tests/app/res/values-ja/strings.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2009 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT 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="discoverable" msgid="5156521178072363663">"検出可能"</string>
-    <string name="start_scan" msgid="3834980997400324437">"スキャンを開始"</string>
-    <string name="stop_scan" msgid="4195720269023182612">"スキャンを停止"</string>
-    <string name="operator_hello" msgid="5164036004953019483">"オペレーター"</string>
-    <string name="operator_settings_title" msgid="6484497120056200416">"オペレーター"</string>
-    <string name="operator_settings_summary" msgid="8356150829172002728">"選択した操作を開始するためのオペレーター フック"</string>
-    <string name="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/res/values-ka/strings.xml b/tests/app/res/values-ka/strings.xml
deleted file mode 100644
index 303a3c5..0000000
--- a/tests/app/res/values-ka/strings.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2009 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT 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="discoverable" msgid="5156521178072363663">"აღმოჩენადი"</string>
-    <string name="start_scan" msgid="3834980997400324437">"სკანირების დაწყება"</string>
-    <string name="stop_scan" msgid="4195720269023182612">"სკანირების შეწყვეტა"</string>
-    <string name="operator_hello" msgid="5164036004953019483">"გამარჯობა, ოპერატორო!"</string>
-    <string name="operator_settings_title" msgid="6484497120056200416">"ოპერატორი"</string>
-    <string name="operator_settings_summary" msgid="8356150829172002728">"ოპერატორის ფანდი, რომლის გამოყენებაც არჩევანის გაკეთების იძულებისთვის შეიძლება"</string>
-    <string name="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/res/values-kk/strings.xml b/tests/app/res/values-kk/strings.xml
deleted file mode 100644
index f68c61b..0000000
--- a/tests/app/res/values-kk/strings.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2009 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT 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="discoverable" msgid="5156521178072363663">"Табу мүмкіндігі бар"</string>
-    <string name="start_scan" msgid="3834980997400324437">"Іздеуді бастау"</string>
-    <string name="stop_scan" msgid="4195720269023182612">"Іздеуді тоқтату"</string>
-    <string name="operator_hello" msgid="5164036004953019483">"Сәлем, Operator!"</string>
-    <string name="operator_settings_title" msgid="6484497120056200416">"Operator"</string>
-    <string name="operator_settings_summary" msgid="8356150829172002728">"Таңдалған әрекетті іске қосу үшін пайдалануға болатын Operator хугы"</string>
-    <string name="manufacturer_hello" msgid="5926168503597475062">"Сәлем, Manufacturer!"</string>
-    <string name="manufacturer_settings_title" msgid="3516742885166545864">"Өндіруші"</string>
-    <string name="manufacturer_settings_summary" msgid="4436962417539186408">"Таңдалған әрекетті іске қосу үшін пайдалануға болатын Manufacturer хугы"</string>
-</resources>
diff --git a/tests/app/res/values-km/strings.xml b/tests/app/res/values-km/strings.xml
deleted file mode 100644
index a738ee0..0000000
--- a/tests/app/res/values-km/strings.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2009 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT 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="discoverable" msgid="5156521178072363663">"អាចរកឃើញ"</string>
-    <string name="start_scan" msgid="3834980997400324437">"ចាប់ផ្ដើមស្កេន"</string>
-    <string name="stop_scan" msgid="4195720269023182612">"ឈប់ស្កេន"</string>
-    <string name="operator_hello" msgid="5164036004953019483">"សួស្ដីប្រតិបត្តិករ!"</string>
-    <string name="operator_settings_title" msgid="6484497120056200416">"ប្រតិបត្តិករ"</string>
-    <string name="operator_settings_summary" msgid="8356150829172002728">"ការទាក់ទាញប្រតិបត្តិករអាចត្រូវបានប្រើដើម្បីចាប់ផ្ដើមជម្រើសសកម្មភាព"</string>
-    <string name="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/res/values-kn/strings.xml b/tests/app/res/values-kn/strings.xml
deleted file mode 100644
index 2bc15ed..0000000
--- a/tests/app/res/values-kn/strings.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2009 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT 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="discoverable" msgid="5156521178072363663">"ಅನ್ವೇಷಿಸಬಹುದಾದ"</string>
-    <string name="start_scan" msgid="3834980997400324437">"ಸ್ಕ್ಯಾನ್ ಪ್ರಾರಂಭಿಸಿ"</string>
-    <string name="stop_scan" msgid="4195720269023182612">"ಸ್ಕ್ಯಾನ್ ನಿಲ್ಲಿಸಿ"</string>
-    <string name="operator_hello" msgid="5164036004953019483">"ಹಲೋ ಆಪರೇಟರ್!"</string>
-    <string name="operator_settings_title" msgid="6484497120056200416">"ಆಪರೇಟರ್"</string>
-    <string name="operator_settings_summary" msgid="8356150829172002728">"ಆಯ್ಕೆಯ ಚಟುವಟಿಕೆಯನ್ನು ಪ್ರಾರಂಭಿಸಲು ಬಳಸಬಹುದಾದ ಆಪರೇಟರ್ ಹುಕ್"</string>
-    <string name="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/res/values-ko/strings.xml b/tests/app/res/values-ko/strings.xml
deleted file mode 100644
index 996016c..0000000
--- a/tests/app/res/values-ko/strings.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2009 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT 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="discoverable" msgid="5156521178072363663">"검색 가능"</string>
-    <string name="start_scan" msgid="3834980997400324437">"검색 시작"</string>
-    <string name="stop_scan" msgid="4195720269023182612">"검색 중지"</string>
-    <string name="operator_hello" msgid="5164036004953019483">"운영자님, 안녕하세요."</string>
-    <string name="operator_settings_title" msgid="6484497120056200416">"운영자"</string>
-    <string name="operator_settings_summary" msgid="8356150829172002728">"선택한 작업을 시작하는 데 사용할 수 있는 운영자 안내"</string>
-    <string name="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/res/values-ky/strings.xml b/tests/app/res/values-ky/strings.xml
deleted file mode 100644
index 766d591..0000000
--- a/tests/app/res/values-ky/strings.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2009 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT 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="discoverable" msgid="5156521178072363663">"Ачык"</string>
-    <string name="start_scan" msgid="3834980997400324437">"Скандоону баштоо"</string>
-    <string name="stop_scan" msgid="4195720269023182612">"Скандоону токтотуу"</string>
-    <string name="operator_hello" msgid="5164036004953019483">"Салам!"</string>
-    <string name="operator_settings_title" msgid="6484497120056200416">"Оператор"</string>
-    <string name="operator_settings_summary" msgid="8356150829172002728">"Тандалган аракетти баштоо үчүн колдонула турган оператордун куралы"</string>
-    <string name="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/res/values-lo/strings.xml b/tests/app/res/values-lo/strings.xml
deleted file mode 100644
index b10e8e4..0000000
--- a/tests/app/res/values-lo/strings.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2009 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT 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="discoverable" msgid="5156521178072363663">"ສາມາດຄົ້ນພົບໄດ້"</string>
-    <string name="start_scan" msgid="3834980997400324437">"ເລີ່ມຕົ້ນສະແກນ"</string>
-    <string name="stop_scan" msgid="4195720269023182612">"ຢຸດສະແກນ"</string>
-    <string name="operator_hello" msgid="5164036004953019483">"ສະບາຍດີຜູ້ໃຫ້ບໍລິການ!"</string>
-    <string name="operator_settings_title" msgid="6484497120056200416">"ຜູ້ໃຫ້ບໍລິການ"</string>
-    <string name="operator_settings_summary" msgid="8356150829172002728">"ຂໍ້ຄວາມຂອງຜູ້ໃຫ້ບໍລິການທີ່ສາມາດໃຊ້ ເພື່ອເລີ່ມການເຄື່ອນໄຫວທີ່ເລືອກໄດ້"</string>
-    <string name="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/res/values-lt/strings.xml b/tests/app/res/values-lt/strings.xml
deleted file mode 100644
index a590999..0000000
--- a/tests/app/res/values-lt/strings.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2009 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT 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="discoverable" msgid="5156521178072363663">"Aptinkamas"</string>
-    <string name="start_scan" msgid="3834980997400324437">"Pradėti nuskaitymą"</string>
-    <string name="stop_scan" msgid="4195720269023182612">"Sustabdyti nuskaitymą"</string>
-    <string name="operator_hello" msgid="5164036004953019483">"Sveiki, operatoriau!"</string>
-    <string name="operator_settings_title" msgid="6484497120056200416">"Operatorius"</string>
-    <string name="operator_settings_summary" msgid="8356150829172002728">"Operatoriaus dominantis turinys, kurį galima naudoti norint pradėti pasirinktą veiklą"</string>
-    <string name="manufacturer_hello" msgid="5926168503597475062">"Sveiki, gamintojau!"</string>
-    <string name="manufacturer_settings_title" msgid="3516742885166545864">"Gamintojas"</string>
-    <string name="manufacturer_settings_summary" msgid="4436962417539186408">"Gamintojo dominantis turinys, kurį galima naudoti norint pradėti pasirinktą veiklą"</string>
-</resources>
diff --git a/tests/app/res/values-lv/strings.xml b/tests/app/res/values-lv/strings.xml
deleted file mode 100644
index e28fe2a..0000000
--- a/tests/app/res/values-lv/strings.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2009 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT 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="discoverable" msgid="5156521178072363663">"Uztverama"</string>
-    <string name="start_scan" msgid="3834980997400324437">"Sākt skenēšanu"</string>
-    <string name="stop_scan" msgid="4195720269023182612">"Apturēt skenēšanu"</string>
-    <string name="operator_hello" msgid="5164036004953019483">"Esiet sveicināts, operator!"</string>
-    <string name="operator_settings_title" msgid="6484497120056200416">"Operators"</string>
-    <string name="operator_settings_summary" msgid="8356150829172002728">"Operatora aizķere, ko var izmantot, lai startētu izvēlētu darbību"</string>
-    <string name="manufacturer_hello" msgid="5926168503597475062">"Esiet sveicināts, ražotāj!"</string>
-    <string name="manufacturer_settings_title" msgid="3516742885166545864">"Ražotājs"</string>
-    <string name="manufacturer_settings_summary" msgid="4436962417539186408">"Ražotāja aizķere, ko var izmantot, lai startētu izvēlētu darbību"</string>
-</resources>
diff --git a/tests/app/res/values-mk/strings.xml b/tests/app/res/values-mk/strings.xml
deleted file mode 100644
index b6eca54..0000000
--- a/tests/app/res/values-mk/strings.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2009 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT 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="discoverable" msgid="5156521178072363663">"Достапен"</string>
-    <string name="start_scan" msgid="3834980997400324437">"Започни скенирање"</string>
-    <string name="stop_scan" msgid="4195720269023182612">"Запри скенирање"</string>
-    <string name="operator_hello" msgid="5164036004953019483">"Здраво операторе!"</string>
-    <string name="operator_settings_title" msgid="6484497120056200416">"Оператор"</string>
-    <string name="operator_settings_summary" msgid="8356150829172002728">"Кука на оператор што може да се употреби за да се започне активност по избор"</string>
-    <string name="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/res/values-ml/strings.xml b/tests/app/res/values-ml/strings.xml
deleted file mode 100644
index e1aa334..0000000
--- a/tests/app/res/values-ml/strings.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2009 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT 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="discoverable" msgid="5156521178072363663">"കണ്ടെത്താനാകുന്നത്"</string>
-    <string name="start_scan" msgid="3834980997400324437">"സ്കാൻ ചെയ്യാൻ ആരംഭിക്കുക"</string>
-    <string name="stop_scan" msgid="4195720269023182612">"സ്‌കാൻ ചെയ്യുന്നത് നിർത്തുക"</string>
-    <string name="operator_hello" msgid="5164036004953019483">"ഹലോ, ഓപ്പറേറ്റർ!"</string>
-    <string name="operator_settings_title" msgid="6484497120056200416">"ഓപ്പറേറ്റർ"</string>
-    <string name="operator_settings_summary" msgid="8356150829172002728">"തിരഞ്ഞെടുക്കൽ പ്രവർത്തനം ആരംഭിക്കാൻ ഉപയോഗിക്കാവുന്ന ഓപ്പറേറ്റർ ഹുക്ക്"</string>
-    <string name="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/res/values-mn/strings.xml b/tests/app/res/values-mn/strings.xml
deleted file mode 100644
index c264826..0000000
--- a/tests/app/res/values-mn/strings.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2009 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT 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="discoverable" msgid="5156521178072363663">"Харагдахуйц"</string>
-    <string name="start_scan" msgid="3834980997400324437">"Сканийг эхлүүлэх"</string>
-    <string name="stop_scan" msgid="4195720269023182612">"Шинжлэхийг зогсоох"</string>
-    <string name="operator_hello" msgid="5164036004953019483">"Сайн байна уу, Оператор оо!"</string>
-    <string name="operator_settings_title" msgid="6484497120056200416">"Оператор"</string>
-    <string name="operator_settings_summary" msgid="8356150829172002728">"Сонгох ажлыг эхлүүлэхэд ашиглаж болох үйлдвэрлэгчийн хэсэг"</string>
-    <string name="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/res/values-mr/strings.xml b/tests/app/res/values-mr/strings.xml
deleted file mode 100644
index 0a53c57..0000000
--- a/tests/app/res/values-mr/strings.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2009 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT 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="discoverable" msgid="5156521178072363663">"शोधण्यायोग्य"</string>
-    <string name="start_scan" msgid="3834980997400324437">"स्कॅन प्रारंभ करा"</string>
-    <string name="stop_scan" msgid="4195720269023182612">"स्कॅन थांबवा"</string>
-    <string name="operator_hello" msgid="5164036004953019483">"हॅलो ऑपरेटर!"</string>
-    <string name="operator_settings_title" msgid="6484497120056200416">"ऑपरेटर"</string>
-    <string name="operator_settings_summary" msgid="8356150829172002728">"पसंतीचा क्रियाकलाप प्रारंभ करण्‍यासाठी वापरले जाऊ शकणारे ऑपरेटर हुक"</string>
-    <string name="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/res/values-ms/strings.xml b/tests/app/res/values-ms/strings.xml
deleted file mode 100644
index 6d19101..0000000
--- a/tests/app/res/values-ms/strings.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2009 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT 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="discoverable" msgid="5156521178072363663">"Boleh ditemui"</string>
-    <string name="start_scan" msgid="3834980997400324437">"Mulakan pengimbasan"</string>
-    <string name="stop_scan" msgid="4195720269023182612">"Hentikan pengimbasan"</string>
-    <string name="operator_hello" msgid="5164036004953019483">"Helo Pembawa!"</string>
-    <string name="operator_settings_title" msgid="6484497120056200416">"Pembawa"</string>
-    <string name="operator_settings_summary" msgid="8356150829172002728">"Tarikan pembawa yang dapat digunakan untuk memulakan aktiviti pilihan"</string>
-    <string name="manufacturer_hello" msgid="5926168503597475062">"Helo Pengeluar!"</string>
-    <string name="manufacturer_settings_title" msgid="3516742885166545864">"Pengeluar"</string>
-    <string name="manufacturer_settings_summary" msgid="4436962417539186408">"Tarikan pengeluar yang dapat digunakan untuk memulakan aktiviti pilihan"</string>
-</resources>
diff --git a/tests/app/res/values-my/strings.xml b/tests/app/res/values-my/strings.xml
deleted file mode 100644
index 45b090d..0000000
--- a/tests/app/res/values-my/strings.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2009 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT 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="discoverable" msgid="5156521178072363663">"ရှာတွေ့နိုင်သော"</string>
-    <string name="start_scan" msgid="3834980997400324437">"ဖတ်ခြင်းစပါ"</string>
-    <string name="stop_scan" msgid="4195720269023182612">"ဖတ်ခြင်းရပ်ပါ"</string>
-    <string name="operator_hello" msgid="5164036004953019483">"မင်္ဂလာပါ အော်ပရေတာ။"</string>
-    <string name="operator_settings_title" msgid="6484497120056200416">"အော်ပရေတာ"</string>
-    <string name="operator_settings_summary" msgid="8356150829172002728">"ရွေးချယ်မှု စတင်အသုံးပြုနိုင်မည့် အော်ပရေတာမှ စိတ်ဝင်စားစရာအကြောင်းအရာ"</string>
-    <string name="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/res/values-nb/strings.xml b/tests/app/res/values-nb/strings.xml
deleted file mode 100644
index dbc3ec8..0000000
--- a/tests/app/res/values-nb/strings.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2009 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT 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="discoverable" msgid="5156521178072363663">"Synlig"</string>
-    <string name="start_scan" msgid="3834980997400324437">"Start skanning"</string>
-    <string name="stop_scan" msgid="4195720269023182612">"Stopp skanning"</string>
-    <string name="operator_hello" msgid="5164036004953019483">"Hei, operatør!"</string>
-    <string name="operator_settings_title" msgid="6484497120056200416">"Operatør"</string>
-    <string name="operator_settings_summary" msgid="8356150829172002728">"Operatøraktivering som kan brukes til å starte en ønsket aktivitet"</string>
-    <string name="manufacturer_hello" msgid="5926168503597475062">"Hei, produsent!"</string>
-    <string name="manufacturer_settings_title" msgid="3516742885166545864">"Produsent"</string>
-    <string name="manufacturer_settings_summary" msgid="4436962417539186408">"Produsentaktivering som kan brukes til å starte en ønsket aktivitet"</string>
-</resources>
diff --git a/tests/app/res/values-ne/strings.xml b/tests/app/res/values-ne/strings.xml
deleted file mode 100644
index 9ec6fd3..0000000
--- a/tests/app/res/values-ne/strings.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2009 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT 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="discoverable" msgid="5156521178072363663">"पत्ता लगाउनयोग्य"</string>
-    <string name="start_scan" msgid="3834980997400324437">"स्क्यान सुरु गर्नुहोस्"</string>
-    <string name="stop_scan" msgid="4195720269023182612">"स्क्यान बन्द गर्नुहोस्"</string>
-    <string name="operator_hello" msgid="5164036004953019483">"नमस्कार अपरेटर!"</string>
-    <string name="operator_settings_title" msgid="6484497120056200416">"अपरेटर"</string>
-    <string name="operator_settings_summary" msgid="8356150829172002728">"अपरेटर हुक जसलाई रोजाइको गतिविधि सुरु गर्न प्रयोग गर्न सकिन्छ"</string>
-    <string name="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/res/values-nl/strings.xml b/tests/app/res/values-nl/strings.xml
deleted file mode 100644
index 384670e..0000000
--- a/tests/app/res/values-nl/strings.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2009 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT 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="discoverable" msgid="5156521178072363663">"Vindbaar"</string>
-    <string name="start_scan" msgid="3834980997400324437">"Scan starten"</string>
-    <string name="stop_scan" msgid="4195720269023182612">"Scan stoppen"</string>
-    <string name="operator_hello" msgid="5164036004953019483">"Hallo operator!"</string>
-    <string name="operator_settings_title" msgid="6484497120056200416">"Operator"</string>
-    <string name="operator_settings_summary" msgid="8356150829172002728">"Hook van operator die kan worden gebruikt om de gewenste activiteit te starten"</string>
-    <string name="manufacturer_hello" msgid="5926168503597475062">"Hallo fabrikant!"</string>
-    <string name="manufacturer_settings_title" msgid="3516742885166545864">"Fabrikant"</string>
-    <string name="manufacturer_settings_summary" msgid="4436962417539186408">"Hook van fabrikant die kan worden gebruikt om de gewenste activiteit te starten"</string>
-</resources>
diff --git a/tests/app/res/values-pa/strings.xml b/tests/app/res/values-pa/strings.xml
deleted file mode 100644
index 61c3102..0000000
--- a/tests/app/res/values-pa/strings.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2009 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT 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="discoverable" msgid="5156521178072363663">"ਖੋਜਣਯੋਗ"</string>
-    <string name="start_scan" msgid="3834980997400324437">"ਸਕੈਨ ਚਾਲੂ ਕਰੋ"</string>
-    <string name="stop_scan" msgid="4195720269023182612">"ਸਕੈਨ ਰੋਕੋ"</string>
-    <string name="operator_hello" msgid="5164036004953019483">"ਹੈਲੋ ਕੈਰੀਅਰ!"</string>
-    <string name="operator_settings_title" msgid="6484497120056200416">"ਕੈਰੀਅਰ"</string>
-    <string name="operator_settings_summary" msgid="8356150829172002728">"ਕੈਰੀਅਰ ਹੁੱਕ ਜਿਸ ਦੀ ਵਰਤੋਂ ਪਸੰਦ ਦੀ ਸਰਗਰਮੀ ਸ਼ੁਰੂ ਕਰਨ ਲਈ  ਕੀਤੀ ਜਾ ਸਕਦੀ ਹੈ"</string>
-    <string name="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/res/values-pl/strings.xml b/tests/app/res/values-pl/strings.xml
deleted file mode 100644
index 3d64274..0000000
--- a/tests/app/res/values-pl/strings.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2009 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT 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="discoverable" msgid="5156521178072363663">"Wykrywalny"</string>
-    <string name="start_scan" msgid="3834980997400324437">"Rozpocznij skanowanie"</string>
-    <string name="stop_scan" msgid="4195720269023182612">"Zatrzymaj skanowanie"</string>
-    <string name="operator_hello" msgid="5164036004953019483">"Witaj operatorze"</string>
-    <string name="operator_settings_title" msgid="6484497120056200416">"Operator"</string>
-    <string name="operator_settings_summary" msgid="8356150829172002728">"Interfejs operatora umożliwiający uruchomienie wybranego działania"</string>
-    <string name="manufacturer_hello" msgid="5926168503597475062">"Witaj producencie"</string>
-    <string name="manufacturer_settings_title" msgid="3516742885166545864">"Producent"</string>
-    <string name="manufacturer_settings_summary" msgid="4436962417539186408">"Interfejs producenta umożliwiający uruchomienie wybranego działania"</string>
-</resources>
diff --git a/tests/app/res/values-pt-rBR/strings.xml b/tests/app/res/values-pt-rBR/strings.xml
deleted file mode 100644
index 0f85050..0000000
--- a/tests/app/res/values-pt-rBR/strings.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2009 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT 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="discoverable" msgid="5156521178072363663">"Detectável"</string>
-    <string name="start_scan" msgid="3834980997400324437">"Iniciar verificação"</string>
-    <string name="stop_scan" msgid="4195720269023182612">"Parar verificação"</string>
-    <string name="operator_hello" msgid="5164036004953019483">"Olá, operador."</string>
-    <string name="operator_settings_title" msgid="6484497120056200416">"Operador"</string>
-    <string name="operator_settings_summary" msgid="8356150829172002728">"Ferramenta do operador que pode ser usada para iniciar a atividade que você escolher"</string>
-    <string name="manufacturer_hello" msgid="5926168503597475062">"Olá, fabricante."</string>
-    <string name="manufacturer_settings_title" msgid="3516742885166545864">"Fabricante"</string>
-    <string name="manufacturer_settings_summary" msgid="4436962417539186408">"Ferramenta do fabricante que pode ser usada para iniciar a atividade que você escolher"</string>
-</resources>
diff --git a/tests/app/res/values-pt-rPT/strings.xml b/tests/app/res/values-pt-rPT/strings.xml
deleted file mode 100644
index e94d5d0..0000000
--- a/tests/app/res/values-pt-rPT/strings.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2009 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT 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="discoverable" msgid="5156521178072363663">"Detetável"</string>
-    <string name="start_scan" msgid="3834980997400324437">"Iniciar análise"</string>
-    <string name="stop_scan" msgid="4195720269023182612">"Parar análise"</string>
-    <string name="operator_hello" msgid="5164036004953019483">"Olá, operador!"</string>
-    <string name="operator_settings_title" msgid="6484497120056200416">"Operador"</string>
-    <string name="operator_settings_summary" msgid="8356150829172002728">"Símbolo do operador que pode ser utilizado para iniciar uma atividade à escolha"</string>
-    <string name="manufacturer_hello" msgid="5926168503597475062">"Olá, fabricante!"</string>
-    <string name="manufacturer_settings_title" msgid="3516742885166545864">"Fabricante"</string>
-    <string name="manufacturer_settings_summary" msgid="4436962417539186408">"Símbolo do fabricante que pode ser utilizado para iniciar uma atividade à escolha"</string>
-</resources>
diff --git a/tests/app/res/values-pt/strings.xml b/tests/app/res/values-pt/strings.xml
deleted file mode 100644
index 0f85050..0000000
--- a/tests/app/res/values-pt/strings.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2009 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT 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="discoverable" msgid="5156521178072363663">"Detectável"</string>
-    <string name="start_scan" msgid="3834980997400324437">"Iniciar verificação"</string>
-    <string name="stop_scan" msgid="4195720269023182612">"Parar verificação"</string>
-    <string name="operator_hello" msgid="5164036004953019483">"Olá, operador."</string>
-    <string name="operator_settings_title" msgid="6484497120056200416">"Operador"</string>
-    <string name="operator_settings_summary" msgid="8356150829172002728">"Ferramenta do operador que pode ser usada para iniciar a atividade que você escolher"</string>
-    <string name="manufacturer_hello" msgid="5926168503597475062">"Olá, fabricante."</string>
-    <string name="manufacturer_settings_title" msgid="3516742885166545864">"Fabricante"</string>
-    <string name="manufacturer_settings_summary" msgid="4436962417539186408">"Ferramenta do fabricante que pode ser usada para iniciar a atividade que você escolher"</string>
-</resources>
diff --git a/tests/app/res/values-ro/strings.xml b/tests/app/res/values-ro/strings.xml
deleted file mode 100644
index a97dd14..0000000
--- a/tests/app/res/values-ro/strings.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2009 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT 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="discoverable" msgid="5156521178072363663">"Detectabil"</string>
-    <string name="start_scan" msgid="3834980997400324437">"Începeți scanarea"</string>
-    <string name="stop_scan" msgid="4195720269023182612">"Opriți scanarea"</string>
-    <string name="operator_hello" msgid="5164036004953019483">"Stimate operator!"</string>
-    <string name="operator_settings_title" msgid="6484497120056200416">"Operator"</string>
-    <string name="operator_settings_summary" msgid="8356150829172002728">"Mesaj pentru operator, care poate fi utilizat pentru a începe activitatea dorită"</string>
-    <string name="manufacturer_hello" msgid="5926168503597475062">"Stimate producător!"</string>
-    <string name="manufacturer_settings_title" msgid="3516742885166545864">"Producător"</string>
-    <string name="manufacturer_settings_summary" msgid="4436962417539186408">"Mesaj pentru producător, care poate fi utilizat pentru a începe activitatea dorită"</string>
-</resources>
diff --git a/tests/app/res/values-ru/strings.xml b/tests/app/res/values-ru/strings.xml
deleted file mode 100644
index d5c4d02..0000000
--- a/tests/app/res/values-ru/strings.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2009 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT 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="discoverable" msgid="5156521178072363663">"Видимость"</string>
-    <string name="start_scan" msgid="3834980997400324437">"Начать поиск"</string>
-    <string name="stop_scan" msgid="4195720269023182612">"Остановить поиск"</string>
-    <string name="operator_hello" msgid="5164036004953019483">"Здравствуйте!"</string>
-    <string name="operator_settings_title" msgid="6484497120056200416">"Оператор"</string>
-    <string name="operator_settings_summary" msgid="8356150829172002728">"Уловка оператора, побуждающая к совершению действия"</string>
-    <string name="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/res/values-si/strings.xml b/tests/app/res/values-si/strings.xml
deleted file mode 100644
index 04c6ec2..0000000
--- a/tests/app/res/values-si/strings.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2009 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT 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="discoverable" msgid="5156521178072363663">"සොයා ගත හැකි"</string>
-    <string name="start_scan" msgid="3834980997400324437">"ස්කෑන් කිරීම අරඹන්න"</string>
-    <string name="stop_scan" msgid="4195720269023182612">"ස්කෑන් කිරීම නවත්වන්න"</string>
-    <string name="operator_hello" msgid="5164036004953019483">"ආයුබෝවන් ක්‍රියාකරු!"</string>
-    <string name="operator_settings_title" msgid="6484497120056200416">"ක්‍රියාකරු"</string>
-    <string name="operator_settings_summary" msgid="8356150829172002728">"කැමැති ක්‍රියාවක් ඇරඹීමට භාවිත කළ හැකි මෙහෙයුම් අංශය"</string>
-    <string name="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/res/values-sk/strings.xml b/tests/app/res/values-sk/strings.xml
deleted file mode 100644
index 53c2a78..0000000
--- a/tests/app/res/values-sk/strings.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2009 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT 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="discoverable" msgid="5156521178072363663">"Viditeľné"</string>
-    <string name="start_scan" msgid="3834980997400324437">"Spustiť vyhľadávanie"</string>
-    <string name="stop_scan" msgid="4195720269023182612">"Zastaviť vyhľadávanie"</string>
-    <string name="operator_hello" msgid="5164036004953019483">"Dobrý deň, operátor!"</string>
-    <string name="operator_settings_title" msgid="6484497120056200416">"Operátor"</string>
-    <string name="operator_settings_summary" msgid="8356150829172002728">"Háčik operátora, ktorý je možné použiť na spustenie vybratej činnosti"</string>
-    <string name="manufacturer_hello" msgid="5926168503597475062">"Dobrý deň, výrobca!"</string>
-    <string name="manufacturer_settings_title" msgid="3516742885166545864">"Výrobca"</string>
-    <string name="manufacturer_settings_summary" msgid="4436962417539186408">"Háčik výrobcu, ktorý je možné použiť na spustenie vybratej činnosti"</string>
-</resources>
diff --git a/tests/app/res/values-sl/strings.xml b/tests/app/res/values-sl/strings.xml
deleted file mode 100644
index da186eb..0000000
--- a/tests/app/res/values-sl/strings.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2009 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT 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="discoverable" msgid="5156521178072363663">"Vidno"</string>
-    <string name="start_scan" msgid="3834980997400324437">"Začni iskanje"</string>
-    <string name="stop_scan" msgid="4195720269023182612">"Ustavi iskanje"</string>
-    <string name="operator_hello" msgid="5164036004953019483">"Živijo, operater!"</string>
-    <string name="operator_settings_title" msgid="6484497120056200416">"Operater"</string>
-    <string name="operator_settings_summary" msgid="8356150829172002728">"Priključitvena točka za operaterja, ki jo je mogoče uporabiti za novo dejavnost"</string>
-    <string name="manufacturer_hello" msgid="5926168503597475062">"Živijo, proizvajalec!"</string>
-    <string name="manufacturer_settings_title" msgid="3516742885166545864">"Proizvajalec"</string>
-    <string name="manufacturer_settings_summary" msgid="4436962417539186408">"Priključitvena točka za proizvajalca, ki jo je mogoče uporabiti za poljubno dejavnost"</string>
-</resources>
diff --git a/tests/app/res/values-sq/strings.xml b/tests/app/res/values-sq/strings.xml
deleted file mode 100644
index 7de0081..0000000
--- a/tests/app/res/values-sq/strings.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2009 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT 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="discoverable" msgid="5156521178072363663">"I zbulueshëm"</string>
-    <string name="start_scan" msgid="3834980997400324437">"Nis skanimin"</string>
-    <string name="stop_scan" msgid="4195720269023182612">"Ndalo skanimin"</string>
-    <string name="operator_hello" msgid="5164036004953019483">"Përshëndetje operator!"</string>
-    <string name="operator_settings_title" msgid="6484497120056200416">"Operatori"</string>
-    <string name="operator_settings_summary" msgid="8356150829172002728">"Grepi i operatorit që mund të përdoret për të filluar aktivitetin e zgjedhur"</string>
-    <string name="manufacturer_hello" msgid="5926168503597475062">"Përshëndetje prodhues!"</string>
-    <string name="manufacturer_settings_title" msgid="3516742885166545864">"Prodhuesi"</string>
-    <string name="manufacturer_settings_summary" msgid="4436962417539186408">"Grepi i prodhuesit që mund të përdoret për të nisur aktivitetin e zgjedhur"</string>
-</resources>
diff --git a/tests/app/res/values-sr/strings.xml b/tests/app/res/values-sr/strings.xml
deleted file mode 100644
index dd8b7d9..0000000
--- a/tests/app/res/values-sr/strings.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2009 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT 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="discoverable" msgid="5156521178072363663">"Видљиво"</string>
-    <string name="start_scan" msgid="3834980997400324437">"Покрени скенирање"</string>
-    <string name="stop_scan" msgid="4195720269023182612">"Заустави скенирање"</string>
-    <string name="operator_hello" msgid="5164036004953019483">"Здраво, оператеру!"</string>
-    <string name="operator_settings_title" msgid="6484497120056200416">"Мобилни оператер"</string>
-    <string name="operator_settings_summary" msgid="8356150829172002728">"Мамац за оператера који може да се користи за покретање жељене активности"</string>
-    <string name="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/res/values-sv/strings.xml b/tests/app/res/values-sv/strings.xml
deleted file mode 100644
index e8f8d53..0000000
--- a/tests/app/res/values-sv/strings.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2009 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT 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="discoverable" msgid="5156521178072363663">"Synlig"</string>
-    <string name="start_scan" msgid="3834980997400324437">"Starta sökning"</string>
-    <string name="stop_scan" msgid="4195720269023182612">"Stoppa sökningen"</string>
-    <string name="operator_hello" msgid="5164036004953019483">"Hej operatör!"</string>
-    <string name="operator_settings_title" msgid="6484497120056200416">"Operatör"</string>
-    <string name="operator_settings_summary" msgid="8356150829172002728">"Operatörsfunktion som kan användas för att starta en valfri aktivitet"</string>
-    <string name="manufacturer_hello" msgid="5926168503597475062">"Hej tillverkare!"</string>
-    <string name="manufacturer_settings_title" msgid="3516742885166545864">"Tillverkare"</string>
-    <string name="manufacturer_settings_summary" msgid="4436962417539186408">"Tillverkarfunktion som kan användas för att starta en valfri aktivitet"</string>
-</resources>
diff --git a/tests/app/res/values-sw/strings.xml b/tests/app/res/values-sw/strings.xml
deleted file mode 100644
index bd5a126..0000000
--- a/tests/app/res/values-sw/strings.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2009 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT 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="discoverable" msgid="5156521178072363663">"Inaweza kutambulika"</string>
-    <string name="start_scan" msgid="3834980997400324437">"Anza kuchanganua"</string>
-    <string name="stop_scan" msgid="4195720269023182612">"Komesha kuchanganua"</string>
-    <string name="operator_hello" msgid="5164036004953019483">"Hujambo Mwendeshaji!"</string>
-    <string name="operator_settings_title" msgid="6484497120056200416">"Kiendeshaji"</string>
-    <string name="operator_settings_summary" msgid="8356150829172002728">"Kishikilio cha mtengenezaji ambacho inaweza kutumiwa kwa kuanza shughuli ya chaguo"</string>
-    <string name="manufacturer_hello" msgid="5926168503597475062">"Hujambo Mtengenezaji!"</string>
-    <string name="manufacturer_settings_title" msgid="3516742885166545864">"Mtengenezaji"</string>
-    <string name="manufacturer_settings_summary" msgid="4436962417539186408">"Kishikilio cha mtengenezaji ambacho kinaweza kutumiwa kwa kuanza shughuli ya chaguo"</string>
-</resources>
diff --git a/tests/app/res/values-ta/strings.xml b/tests/app/res/values-ta/strings.xml
deleted file mode 100644
index 3a80158..0000000
--- a/tests/app/res/values-ta/strings.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2009 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT 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="discoverable" msgid="5156521178072363663">"கண்டறியப்படலாம்"</string>
-    <string name="start_scan" msgid="3834980997400324437">"ஸ்கேனைத் தொடங்கு"</string>
-    <string name="stop_scan" msgid="4195720269023182612">"ஸ்கேனை நிறுத்து"</string>
-    <string name="operator_hello" msgid="5164036004953019483">"ஹலோ ஆபரேட்டரே!"</string>
-    <string name="operator_settings_title" msgid="6484497120056200416">"ஆபரேட்டர்"</string>
-    <string name="operator_settings_summary" msgid="8356150829172002728">"விரும்பிய செயல்பாட்டைத் தொடங்குவதற்குப் பயன்படுத்தக் கூடிய ஆபரேட்டர் பொறி"</string>
-    <string name="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/res/values-te/strings.xml b/tests/app/res/values-te/strings.xml
deleted file mode 100644
index 1ffb2b7..0000000
--- a/tests/app/res/values-te/strings.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2009 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT 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="discoverable" msgid="5156521178072363663">"కనుగొనదగినది"</string>
-    <string name="start_scan" msgid="3834980997400324437">"స్కాన్‌ని ప్రారంభించండి"</string>
-    <string name="stop_scan" msgid="4195720269023182612">"స్కాన్‌ని ఆపివేయండి"</string>
-    <string name="operator_hello" msgid="5164036004953019483">"హలో ఆపరేటర్!"</string>
-    <string name="operator_settings_title" msgid="6484497120056200416">"ఆపరేటర్"</string>
-    <string name="operator_settings_summary" msgid="8356150829172002728">"ఎంచుకున్న కార్యాచరణను ప్రారంభించడానికి ఉపయోగించగల దాన్ని ఆపరేటర్ నియంత్రించగలరు"</string>
-    <string name="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/res/values-th/strings.xml b/tests/app/res/values-th/strings.xml
deleted file mode 100644
index 249d0f7..0000000
--- a/tests/app/res/values-th/strings.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2009 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT 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="discoverable" msgid="5156521178072363663">"ค้นพบได้"</string>
-    <string name="start_scan" msgid="3834980997400324437">"เริ่มสแกน"</string>
-    <string name="stop_scan" msgid="4195720269023182612">"หยุดสแกน"</string>
-    <string name="operator_hello" msgid="5164036004953019483">"สวัสดี โอเปอเรเตอร์"</string>
-    <string name="operator_settings_title" msgid="6484497120056200416">"โอเปอเรเตอร์"</string>
-    <string name="operator_settings_summary" msgid="8356150829172002728">"ข้อความของโอเปอเรเตอร์ที่สามารถใช้เริ่มกิจกรรมที่เลือกได้"</string>
-    <string name="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/res/values-tl/strings.xml b/tests/app/res/values-tl/strings.xml
deleted file mode 100644
index c64985e..0000000
--- a/tests/app/res/values-tl/strings.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2009 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT 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="discoverable" msgid="5156521178072363663">"Katuklas-tuklas"</string>
-    <string name="start_scan" msgid="3834980997400324437">"Simulan ang pag-ii-scan"</string>
-    <string name="stop_scan" msgid="4195720269023182612">"Ihinto ang pag-ii-scan"</string>
-    <string name="operator_hello" msgid="5164036004953019483">"Kumusta Operator!"</string>
-    <string name="operator_settings_title" msgid="6484497120056200416">"Operator"</string>
-    <string name="operator_settings_summary" msgid="8356150829172002728">"Hook ng operator na maaaring magamit upang simulan ang napiling aktibidad"</string>
-    <string name="manufacturer_hello" msgid="5926168503597475062">"Kumusta Manufacturer!"</string>
-    <string name="manufacturer_settings_title" msgid="3516742885166545864">"Manufacturer"</string>
-    <string name="manufacturer_settings_summary" msgid="4436962417539186408">"Hook ng manufacturer na maaaring magamit upang simulan ang napiling aktibidad"</string>
-</resources>
diff --git a/tests/app/res/values-tr/strings.xml b/tests/app/res/values-tr/strings.xml
deleted file mode 100644
index 7c9adff..0000000
--- a/tests/app/res/values-tr/strings.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2009 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT 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="discoverable" msgid="5156521178072363663">"Keşfedilebilir"</string>
-    <string name="start_scan" msgid="3834980997400324437">"Taramayı başlat"</string>
-    <string name="stop_scan" msgid="4195720269023182612">"Taramayı durdur"</string>
-    <string name="operator_hello" msgid="5164036004953019483">"Merhaba Operatör!"</string>
-    <string name="operator_settings_title" msgid="6484497120056200416">"Operatör"</string>
-    <string name="operator_settings_summary" msgid="8356150829172002728">"Seçilen etkinliğin başlatılmasında kullanılabilen operatör kancası"</string>
-    <string name="manufacturer_hello" msgid="5926168503597475062">"Merhaba Üretici!"</string>
-    <string name="manufacturer_settings_title" msgid="3516742885166545864">"Üretici"</string>
-    <string name="manufacturer_settings_summary" msgid="4436962417539186408">"Seçilen etkinliğin başlatılmasında kullanılabilen üretici kancası"</string>
-</resources>
diff --git a/tests/app/res/values-uk/strings.xml b/tests/app/res/values-uk/strings.xml
deleted file mode 100644
index 30700d8e..0000000
--- a/tests/app/res/values-uk/strings.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2009 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT 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="discoverable" msgid="5156521178072363663">"Видимий"</string>
-    <string name="start_scan" msgid="3834980997400324437">"Почати сканування"</string>
-    <string name="stop_scan" msgid="4195720269023182612">"Припинити сканування"</string>
-    <string name="operator_hello" msgid="5164036004953019483">"Вітаємо, операторе!"</string>
-    <string name="operator_settings_title" msgid="6484497120056200416">"Оператор"</string>
-    <string name="operator_settings_summary" msgid="8356150829172002728">"Обробник оператора, за допомогою якого можна вибирати"</string>
-    <string name="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/res/values-ur/strings.xml b/tests/app/res/values-ur/strings.xml
deleted file mode 100644
index 34e1e3e..0000000
--- a/tests/app/res/values-ur/strings.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2009 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT 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="discoverable" msgid="5156521178072363663">"قابل دریافت"</string>
-    <string name="start_scan" msgid="3834980997400324437">"اسکین شروع کریں"</string>
-    <string name="stop_scan" msgid="4195720269023182612">"اسکین روکیں"</string>
-    <string name="operator_hello" msgid="5164036004953019483">"ہیلو آپریٹر!"</string>
-    <string name="operator_settings_title" msgid="6484497120056200416">"آپریٹر"</string>
-    <string name="operator_settings_summary" msgid="8356150829172002728">"آپریٹر ہک جس کا استعمال پسند کی سرگرمی شروع کرنے کیلئے کیا جا سکتا ہے"</string>
-    <string name="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/res/values-uz/strings.xml b/tests/app/res/values-uz/strings.xml
deleted file mode 100644
index 5e86591..0000000
--- a/tests/app/res/values-uz/strings.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2009 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT 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="discoverable" msgid="5156521178072363663">"Ko‘rinadi"</string>
-    <string name="start_scan" msgid="3834980997400324437">"Qidiruvni boshlash"</string>
-    <string name="stop_scan" msgid="4195720269023182612">"Qidiruvni to‘xtatish"</string>
-    <string name="operator_hello" msgid="5164036004953019483">"Salom, operator!"</string>
-    <string name="operator_settings_title" msgid="6484497120056200416">"Operator"</string>
-    <string name="operator_settings_summary" msgid="8356150829172002728">"Operatorning tanlangan amalni ishga tushiruvchi hiylasi"</string>
-    <string name="manufacturer_hello" msgid="5926168503597475062">"Salom, ishlab chiqaruvchi!"</string>
-    <string name="manufacturer_settings_title" msgid="3516742885166545864">"Ishlab chiqaruvchi"</string>
-    <string name="manufacturer_settings_summary" msgid="4436962417539186408">"Ishlab chiqaruvchining tanlangan amalni ishga tushiruvchi hiylasi"</string>
-</resources>
diff --git a/tests/app/res/values-vi/strings.xml b/tests/app/res/values-vi/strings.xml
deleted file mode 100644
index a060dc1..0000000
--- a/tests/app/res/values-vi/strings.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2009 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT 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="discoverable" msgid="5156521178072363663">"Có thể phát hiện"</string>
-    <string name="start_scan" msgid="3834980997400324437">"Bắt đầu quét"</string>
-    <string name="stop_scan" msgid="4195720269023182612">"Dừng quét"</string>
-    <string name="operator_hello" msgid="5164036004953019483">"Xin chào Nhà cung cấp dịch vụ!"</string>
-    <string name="operator_settings_title" msgid="6484497120056200416">"Nhà cung cấp dịch vụ"</string>
-    <string name="operator_settings_summary" msgid="8356150829172002728">"Có thể sử dụng mác của nhà cung cấp dịch vụ để bắt đầu hoạt động đã chọn"</string>
-    <string name="manufacturer_hello" msgid="5926168503597475062">"Xin chào Nhà sản xuất!"</string>
-    <string name="manufacturer_settings_title" msgid="3516742885166545864">"Nhà sản xuất"</string>
-    <string name="manufacturer_settings_summary" msgid="4436962417539186408">"Có thể sử dụng mác của nhà sản xuất để bắt đầu hoạt động đã chọn"</string>
-</resources>
diff --git a/tests/app/res/values-zh-rCN/strings.xml b/tests/app/res/values-zh-rCN/strings.xml
deleted file mode 100644
index de1e8a8..0000000
--- a/tests/app/res/values-zh-rCN/strings.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2009 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT 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="discoverable" msgid="5156521178072363663">"可检测到"</string>
-    <string name="start_scan" msgid="3834980997400324437">"开始扫描"</string>
-    <string name="stop_scan" msgid="4195720269023182612">"停止扫描"</string>
-    <string name="operator_hello" msgid="5164036004953019483">"运营商，您好！"</string>
-    <string name="operator_settings_title" msgid="6484497120056200416">"运营商"</string>
-    <string name="operator_settings_summary" msgid="8356150829172002728">"可用于启动所选活动的运营商引子"</string>
-    <string name="manufacturer_hello" msgid="5926168503597475062">"制造商，您好！"</string>
-    <string name="manufacturer_settings_title" msgid="3516742885166545864">"制造商"</string>
-    <string name="manufacturer_settings_summary" msgid="4436962417539186408">"可用于启动所选 Activity 的制造商挂钩"</string>
-</resources>
diff --git a/tests/app/res/values-zh-rHK/strings.xml b/tests/app/res/values-zh-rHK/strings.xml
deleted file mode 100644
index 335b55c..0000000
--- a/tests/app/res/values-zh-rHK/strings.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2009 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT 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="discoverable" msgid="5156521178072363663">"可供偵測"</string>
-    <string name="start_scan" msgid="3834980997400324437">"開始掃瞄"</string>
-    <string name="stop_scan" msgid="4195720269023182612">"停止掃瞄"</string>
-    <string name="operator_hello" msgid="5164036004953019483">"流動網絡供應商您好！"</string>
-    <string name="operator_settings_title" msgid="6484497120056200416">"流動網絡供應商"</string>
-    <string name="operator_settings_summary" msgid="8356150829172002728">"可用來啟動所選活動的流動網絡供應商勾點"</string>
-    <string name="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/res/values-zh-rTW/strings.xml b/tests/app/res/values-zh-rTW/strings.xml
deleted file mode 100644
index d3a7279..0000000
--- a/tests/app/res/values-zh-rTW/strings.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2009 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT 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="discoverable" msgid="5156521178072363663">"可供偵測"</string>
-    <string name="start_scan" msgid="3834980997400324437">"開始掃描"</string>
-    <string name="stop_scan" msgid="4195720269023182612">"停止掃描"</string>
-    <string name="operator_hello" msgid="5164036004953019483">"電信業者你好！"</string>
-    <string name="operator_settings_title" msgid="6484497120056200416">"電信業者"</string>
-    <string name="operator_settings_summary" msgid="8356150829172002728">"可用來啟動所選活動的電信業者勾點"</string>
-    <string name="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/res/values-zu/strings.xml b/tests/app/res/values-zu/strings.xml
deleted file mode 100644
index 217fe9d..0000000
--- a/tests/app/res/values-zu/strings.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2009 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT 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="discoverable" msgid="5156521178072363663">"Iyatholakala"</string>
-    <string name="start_scan" msgid="3834980997400324437">"Qala ukuskena"</string>
-    <string name="stop_scan" msgid="4195720269023182612">"Misa ukuskena"</string>
-    <string name="operator_hello" msgid="5164036004953019483">"Sawubona Opheretha!"</string>
-    <string name="operator_settings_title" msgid="6484497120056200416">"Opharetha"</string>
-    <string name="operator_settings_summary" msgid="8356150829172002728">"Ihhuku ye-opharetha ingasetshenziselwa ukuqala umsebenzi owuthandayo"</string>
-    <string name="manufacturer_hello" msgid="5926168503597475062">"Sawubona Mkhiqizi!"</string>
-    <string name="manufacturer_settings_title" msgid="3516742885166545864">"Umkhiqizi"</string>
-    <string name="manufacturer_settings_summary" msgid="4436962417539186408">"Ihhuku yomkhiqizi engasetshenziselwa ukuqala umsebenzi owuthandayo"</string>
-</resources>
diff --git a/tests/app/res/values/strings.xml b/tests/app/res/values/strings.xml
deleted file mode 100644
index 9fb98f9..0000000
--- a/tests/app/res/values/strings.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2009 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT 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">
-    <!-- Test only. Do not translate. -->
-    <!-- Test only. Do not translate. -->
-    <!-- Test only. Do not translate. -->
-    <string name="enable">Enable</string>
-    <string name="discoverable">Discoverable</string>
-    <string name="start_scan">Start scan</string>
-    <string name="stop_scan">Stop scan</string>
-    <string name="operator_hello">Hello Operator!</string>
-    <string name="operator_settings_title">Operator</string>
-    <string name="operator_settings_summary">Operator hook that can be used to start activity of choice</string>
-    <string name="manufacturer_hello">Hello Manufacturer!</string>
-    <string name="manufacturer_settings_title">Manufacturer</string>
-    <string name="manufacturer_settings_summary">Manufacturer hook that can be used to start activity of choice</string>
-</resources>
diff --git a/tests/app/src/com/android/settings/DisplaySettingsTest.java b/tests/app/src/com/android/settings/DisplaySettingsTest.java
deleted file mode 100644
index 888b7fd..0000000
--- a/tests/app/src/com/android/settings/DisplaySettingsTest.java
+++ /dev/null
@@ -1,57 +0,0 @@
-/*
- * Copyright (C) 2017 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License
- */
-
-package com.android.settings;
-
-import static android.support.test.espresso.Espresso.onView;
-import static android.support.test.espresso.action.ViewActions.click;
-import static android.support.test.espresso.matcher.ViewMatchers.withText;
-
-import android.app.Instrumentation;
-import android.content.Context;
-import android.content.Intent;
-import android.support.test.InstrumentationRegistry;
-import android.support.test.filters.SmallTest;
-import android.support.test.runner.AndroidJUnit4;
-import android.support.test.uiautomator.UiDevice;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-
-@RunWith(AndroidJUnit4.class)
-@SmallTest
-public class DisplaySettingsTest {
-
-    private Instrumentation mInstrumentation;
-    private Context mContext;
-    private UiDevice mDevice;
-
-    @Before
-    public void setUp() {
-        mInstrumentation = InstrumentationRegistry.getInstrumentation();
-        mContext = mInstrumentation.getTargetContext();
-        mDevice = UiDevice.getInstance(mInstrumentation);
-    }
-
-    @Test
-    public void launchBrightnessLevel_shouldNotCrash() {
-        mInstrumentation.startActivitySync(
-                new Intent(mContext, DisplaySettings.class));
-        onView(withText(mContext.getString(R.string.brightness))).perform(click());
-        // should not crash
-        mDevice.pressBack(); // dismiss the brightness dialog
-    }
-}
diff --git a/tests/app/src/com/android/settings/ManagedAccessSettingsLowRamTest.java b/tests/app/src/com/android/settings/ManagedAccessSettingsLowRamTest.java
deleted file mode 100644
index 95c1dcf..0000000
--- a/tests/app/src/com/android/settings/ManagedAccessSettingsLowRamTest.java
+++ /dev/null
@@ -1,121 +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;
-
-import static android.support.test.espresso.Espresso.onView;
-import static android.support.test.espresso.assertion.ViewAssertions.doesNotExist;
-import static android.support.test.espresso.assertion.ViewAssertions.matches;
-import static android.support.test.espresso.matcher.ViewMatchers.isDisplayed;
-import static android.support.test.espresso.matcher.ViewMatchers.withText;
-
-import android.app.ActivityManager;
-import android.app.Instrumentation;
-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.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-
-@RunWith(AndroidJUnit4.class)
-@SmallTest
-public class ManagedAccessSettingsLowRamTest {
-
-    private Instrumentation mInstrumentation;
-    private Context mTargetContext;
-
-    @Before
-    public void setUp() {
-        mInstrumentation = InstrumentationRegistry.getInstrumentation();
-        mTargetContext = mInstrumentation.getTargetContext();
-    }
-
-    @Test
-    public void testManagedAccessOptionsVisibility() throws Exception {
-        mInstrumentation.startActivitySync(new Intent(mTargetContext,
-                com.android.settings.Settings.SpecialAccessSettingsActivity.class));
-
-        String[] managedServiceLabels = new String[] {"Do Not Disturb access",
-                "VR helper services", "Notification access", "Picture-in-picture"};
-        for (String label : managedServiceLabels) {
-            if (ActivityManager.isLowRamDeviceStatic()) {
-                onView(withText(label)).check(doesNotExist());
-            } else {
-                onView(withText(label)).check(matches(isDisplayed()));
-            }
-        }
-    }
-
-    @Test
-    public void launchNotificationSetting_onlyWorksIfNotLowRam() {
-        final Intent intent = new Intent(Settings.ACTION_NOTIFICATION_LISTENER_SETTINGS);
-
-        mInstrumentation.startActivitySync(intent);
-
-        final String label = "This feature is not available on this device";
-        if (ActivityManager.isLowRamDeviceStatic()) {
-            onView(withText(label)).check(matches(isDisplayed()));
-        } else {
-            onView(withText(label)).check(doesNotExist());
-        }
-    }
-
-    @Test
-    public void launchDndSetting_onlyWorksIfNotLowRam() {
-        final Intent intent = new Intent(Settings.ACTION_NOTIFICATION_POLICY_ACCESS_SETTINGS);
-
-        mInstrumentation.startActivitySync(intent);
-
-        final String label = "This feature is not available on this device";
-        if (ActivityManager.isLowRamDeviceStatic()) {
-            onView(withText(label)).check(matches(isDisplayed()));
-        } else {
-            onView(withText(label)).check(doesNotExist());
-        }
-    }
-
-    @Test
-    public void launchVrSetting_onlyWorksIfNotLowRam() {
-        final Intent intent = new Intent(Settings.ACTION_VR_LISTENER_SETTINGS);
-
-        mInstrumentation.startActivitySync(intent);
-
-        final String label = "This feature is not available on this device";
-        if (ActivityManager.isLowRamDeviceStatic()) {
-            onView(withText(label)).check(matches(isDisplayed()));
-        } else {
-            onView(withText(label)).check(doesNotExist());
-        }
-    }
-
-    @Test
-    public void launchPictureInPictureSetting_onlyWorksIfNotLowRam() {
-        final Intent intent = new Intent(Settings.ACTION_PICTURE_IN_PICTURE_SETTINGS);
-
-        mInstrumentation.startActivitySync(intent);
-
-        final String label = "This feature is not available on this device";
-        if (ActivityManager.isLowRamDeviceStatic()) {
-            onView(withText(label)).check(matches(isDisplayed()));
-        } else {
-            onView(withText(label)).check(doesNotExist());
-        }
-    }
-}
diff --git a/tests/app/src/com/android/settings/SettingsHookTests.java b/tests/app/src/com/android/settings/SettingsHookTests.java
deleted file mode 100644
index 4dfd484..0000000
--- a/tests/app/src/com/android/settings/SettingsHookTests.java
+++ /dev/null
@@ -1,134 +0,0 @@
-/*
- * Copyright (C) 2010 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings;
-
-import com.android.settings.Settings;
-import com.android.settings.tests.Manufacturer;
-import com.android.settings.tests.Operator;
-
-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.test.ActivityInstrumentationTestCase2;
-
-import java.util.List;
-
-/**
- * Tests for the Settings operator/manufacturer hook.
- *
- * Running all tests:
- *
- *   make SettingsTests
- *   adb push SettingsTests.apk /system/app/SettingsTests.apk
- *   adb shell am instrument \
- *    -w com.android.settings.tests/android.test.InstrumentationTestRunner
- */
-public class SettingsHookTests extends ActivityInstrumentationTestCase2<Settings> {
-
-    private static final String PACKAGE_NAME = "com.android.settings.tests";
-
-    private static final String KEY_SETTINGS_ROOT = "parent";
-    private static final String KEY_SETTINGS_OPERATOR = "operator_settings";
-    private static final String KEY_SETTINGS_MANUFACTURER = "manufacturer_settings";
-
-    private static final String INTENT_OPERATOR_HOOK = "com.android.settings.OPERATOR_APPLICATION_SETTING";
-    private static final String INTENT_MANUFACTURER_HOOK = "com.android.settings.MANUFACTURER_APPLICATION_SETTING";
-
-    private Settings mSettings;
-
-    public SettingsHookTests() {
-        super("com.android.settings", Settings.class);
-    }
-
-    @Override
-    protected void setUp() throws Exception {
-        super.setUp();
-        mSettings = getActivity();
-    }
-
-    /**
-     * Test that the operator/manufacturer settings hook test application is
-     * available and that it's installed in the device's system image.
-     */
-    public void testSettingsHookTestAppAvailable() throws Exception {
-        Context context = mSettings.getApplicationContext();
-        PackageManager pm = context.getPackageManager();
-        ApplicationInfo applicationInfo = pm.getApplicationInfo(PACKAGE_NAME, 0);
-        assertTrue((applicationInfo.flags & ApplicationInfo.FLAG_SYSTEM) != 0);
-    }
-
-    /**
-     * Test that the operator test activity has registered an intent-filter for
-     * an action named 'android.settings.OPERATOR_APPLICATION_SETTING'.
-     */
-    public void testOperatorIntentFilter() {
-        boolean result = false;
-        Context context = mSettings.getApplicationContext();
-        PackageManager pm = context.getPackageManager();
-        Intent intent = new Intent(INTENT_OPERATOR_HOOK);
-        List<ResolveInfo> list = pm.queryIntentActivities(intent, 0);
-        for (ResolveInfo resolveInfo : list) {
-            if (resolveInfo.activityInfo.packageName.equals(PACKAGE_NAME)) {
-                result = true;
-            }
-        }
-        assertTrue("Intent-filter not found", result);
-    }
-
-    /**
-     * Test that the manufacturer test activity has registered an intent-filter
-     * for an action named 'android.settings.MANUFACTURER_APPLICATION_SETTING'.
-     */
-    public void testManufacturerIntentFilter() {
-        boolean result = false;
-        Context context = mSettings.getApplicationContext();
-        PackageManager pm = context.getPackageManager();
-        Intent intent = new Intent(INTENT_MANUFACTURER_HOOK);
-        List<ResolveInfo> list = pm.queryIntentActivities(intent, 0);
-        for (ResolveInfo resolveInfo : list) {
-            if (resolveInfo.activityInfo.packageName.equals(PACKAGE_NAME)) {
-                result = true;
-            }
-        }
-        assertTrue("Intent-filter not found", result);
-    }
-
-    /**
-     * Test that the operator preference is available in the Settings
-     * application.
-     */
-    public void testOperatorPreferenceAvailable() {
-// TODO: fix this test case to work with fragments
-//        PreferenceGroup root = (PreferenceGroup)mSettings.findPreference(KEY_SETTINGS_ROOT);
-//        Preference operatorPreference = root.findPreference(KEY_SETTINGS_OPERATOR);
-//        assertNotNull(operatorPreference);
-    }
-
-    /**
-     * Test that the manufacturer preference is available in the Settings
-     * application.
-     */
-    public void testManufacturerPreferenceAvailable() {
-// TODO: fix this test case to work with fragments
-//        PreferenceGroup root = (PreferenceGroup)mSettings.findPreference(KEY_SETTINGS_ROOT);
-//        Preference manufacturerHook = root.findPreference(KEY_SETTINGS_MANUFACTURER);
-//        assertNotNull(manufacturerHook);
-    }
-
-}
diff --git a/tests/app/src/com/android/settings/SettingsPreferenceFragmentTest.java b/tests/app/src/com/android/settings/SettingsPreferenceFragmentTest.java
deleted file mode 100644
index 30fc124..0000000
--- a/tests/app/src/com/android/settings/SettingsPreferenceFragmentTest.java
+++ /dev/null
@@ -1,73 +0,0 @@
-package com.android.settings;
-
-import android.content.Intent;
-import android.content.Context;
-
-import android.app.Instrumentation;
-import android.os.Bundle;
-import android.support.v7.preference.Preference;
-import android.support.v7.preference.PreferenceGroupAdapter;
-import com.android.settings.accessibility.AccessibilitySettings;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import android.support.test.InstrumentationRegistry;
-import android.support.test.filters.SmallTest;
-import android.support.test.runner.AndroidJUnit4;
-
-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 com.google.common.truth.Truth.assertThat;
-
-@RunWith(AndroidJUnit4.class)
-@SmallTest
-public class SettingsPreferenceFragmentTest {
-
-    private Instrumentation mInstrumentation;
-    private Context mTargetContext;
-
-    @Before
-    public void setUp() throws Exception {
-        mInstrumentation = InstrumentationRegistry.getInstrumentation();
-        mTargetContext = mInstrumentation.getTargetContext();
-    }
-
-    @Test
-    public void testHighlightCaptions() throws InterruptedException {
-        final String prefKey = "captioning_preference_screen";
-        Bundle args = new Bundle();
-        args.putString(SettingsActivity.EXTRA_FRAGMENT_ARG_KEY, prefKey);
-
-        Intent intent = new Intent(Intent.ACTION_MAIN);
-        intent.setClass(mTargetContext, SubSettings.class);
-        intent.putExtra(SettingsActivity.EXTRA_SHOW_FRAGMENT,
-                "com.android.settings.accessibility.AccessibilitySettings");
-        intent.putExtra(SettingsActivity.EXTRA_SHOW_FRAGMENT_ARGUMENTS, args);
-
-        SettingsActivity activity  = (SettingsActivity) mInstrumentation.startActivitySync(intent);
-        AccessibilitySettings fragment = (AccessibilitySettings)
-                activity.getFragmentManager().getFragments().get(0);
-
-        // Allow time for highlight from post-delay.
-        Thread.sleep(SettingsPreferenceFragment.DELAY_HIGHLIGHT_DURATION_MILLIS);
-        if (!fragment.mPreferenceHighlighted) {
-            Thread.sleep(SettingsPreferenceFragment.DELAY_HIGHLIGHT_DURATION_MILLIS);
-        }
-
-        int prefPosition = -1;
-        PreferenceGroupAdapter adapter = (PreferenceGroupAdapter)
-                fragment.getListView().getAdapter();
-        for (int n = 0, count = adapter.getItemCount(); n < count; n++) {
-            final Preference preference = adapter.getItem(n);
-            final String preferenceKey = preference.getKey();
-            if (preferenceKey.equals(prefKey)) {
-                prefPosition = n;
-                break;
-            }
-        }
-
-        assertThat(fragment.mAdapter.initialHighlightedPosition).isEqualTo(prefPosition);
-    }
-}
diff --git a/tests/app/src/com/android/settings/applications/DefaultAppSettingsTest.java b/tests/app/src/com/android/settings/applications/DefaultAppSettingsTest.java
deleted file mode 100644
index bd03bc9..0000000
--- a/tests/app/src/com/android/settings/applications/DefaultAppSettingsTest.java
+++ /dev/null
@@ -1,75 +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.applications;
-
-import android.content.Context;
-import android.content.Intent;
-import android.support.test.filters.SmallTest;
-import android.support.test.uiautomator.UiDevice;
-import android.support.test.uiautomator.UiObject;
-import android.support.test.uiautomator.UiSelector;
-import android.test.InstrumentationTestCase;
-import android.widget.TextView;
-
-import com.android.settings.R;
-
-import org.junit.Test;
-
-/**
- * Test for Advanced App preferences.
- */
-@SmallTest
-public class DefaultAppSettingsTest extends InstrumentationTestCase {
-
-    private UiDevice mDevice;
-    private Context mTargetContext;
-    private String mTargetPackage;
-
-    @Override
-    protected void setUp() throws Exception {
-        super.setUp();
-        mDevice = UiDevice.getInstance(getInstrumentation());
-        mTargetContext = getInstrumentation().getTargetContext();
-        mTargetPackage = mTargetContext.getPackageName();
-    }
-
-    @Test
-    public void testSelectDefaultHome_shouldLaunchHomePicker() throws Exception {
-        launchDefaultApps();
-        final String titleHomeApp = mTargetContext.getResources().getString(R.string.home_app);
-        mDevice.findObject(new UiSelector().text(titleHomeApp)).click();
-        final UiObject actionBar = mDevice.findObject(new UiSelector().resourceId(
-            "com.android.settings:id/action_bar"));
-        final UiObject title = actionBar.getChild(
-            new UiSelector().className(TextView.class.getName()));
-        assertEquals(titleHomeApp, title.getText());
-    }
-
-    private void launchDefaultApps() throws Exception  {
-        final Intent settingsIntent = new Intent(Intent.ACTION_MAIN)
-            .addCategory(Intent.CATEGORY_LAUNCHER)
-            .setPackage(mTargetPackage)
-            .addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
-        getInstrumentation().getContext().startActivity(settingsIntent);
-        final String titleApps = mTargetContext.getResources().getString(
-            R.string.app_and_notification_dashboard_title);
-        mDevice.findObject(new UiSelector().text(titleApps)).click();
-        final String titleDefaultApps = mTargetContext.getResources().getString(
-            R.string.app_default_dashboard_title);
-        mDevice.findObject(new UiSelector().text(titleDefaultApps)).click();
-    }
-
-}
diff --git a/tests/app/src/com/android/settings/deviceinfo/StorageDashboardFragmentEspressoTest.java b/tests/app/src/com/android/settings/deviceinfo/StorageDashboardFragmentEspressoTest.java
deleted file mode 100644
index b43a5ba..0000000
--- a/tests/app/src/com/android/settings/deviceinfo/StorageDashboardFragmentEspressoTest.java
+++ /dev/null
@@ -1,40 +0,0 @@
-package com.android.settings.deviceinfo;
-
-import android.support.test.espresso.intent.rule.IntentsTestRule;
-import android.support.test.filters.SmallTest;
-import android.support.test.runner.AndroidJUnitRunner;
-import com.android.settings.R;
-import com.android.settings.Settings.StorageDashboardActivity;
-import com.android.settings.deletionhelper.AutomaticStorageManagerSettings;
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-
-import static android.support.test.espresso.Espresso.onView;
-import static android.support.test.espresso.action.ViewActions.click;
-import static android.support.test.espresso.intent.Intents.intended;
-import static android.support.test.espresso.intent.matcher.IntentMatchers.hasExtra;
-import static android.support.test.espresso.matcher.ViewMatchers.withText;
-import static org.hamcrest.Matchers.containsString;
-import static org.hamcrest.Matchers.equalTo;
-
-@SmallTest
-public class StorageDashboardFragmentEspressoTest {
-
-    public static final String EXTRA_KEY = ":settings:show_fragment";
-
-    @Rule
-    public IntentsTestRule<StorageDashboardActivity> mActivityRule =
-            new IntentsTestRule<>(StorageDashboardActivity.class, true, true);
-
-    @Test
-    public void testStorageManagePreference_canClickTextView() throws InterruptedException {
-        // Click on the actual textbox instead of just somewhere in the preference
-        onView(withText(R.string.storage_menu_manage)).perform(click());
-
-        // Check that it worked by seeing if we switched screens
-        intended(hasExtra(equalTo(EXTRA_KEY),
-                containsString(AutomaticStorageManagerSettings.class.getName())));
-
-    }
-}
diff --git a/tests/app/src/com/android/settings/fuelgauge/PowerUsageSummaryUiTest.java b/tests/app/src/com/android/settings/fuelgauge/PowerUsageSummaryUiTest.java
deleted file mode 100644
index 6c372c5..0000000
--- a/tests/app/src/com/android/settings/fuelgauge/PowerUsageSummaryUiTest.java
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
- * Copyright (C) 2017 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.fuelgauge;
-
-import static android.support.test.espresso.Espresso.onView;
-import static android.support.test.espresso.action.ViewActions.click;
-import static android.support.test.espresso.matcher.ViewMatchers.withText;
-
-import android.app.Instrumentation;
-import android.content.Intent;
-import android.support.test.InstrumentationRegistry;
-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;
-
-@RunWith(AndroidJUnit4.class)
-@SmallTest
-public class PowerUsageSummaryUiTest {
-    private static final String BATTERY_INTENT = "android.intent.action.POWER_USAGE_SUMMARY";
-
-    @Before
-    public void SetUp() {
-        Instrumentation instrumentation = InstrumentationRegistry.getInstrumentation();
-        instrumentation.startActivitySync(new Intent(BATTERY_INTENT));
-    }
-
-    @Test
-    public void testClickLastFullCharge_shouldNotCrash() {
-        onView(withText(R.string.battery_last_full_charge)).perform(click());
-    }
-
-    @Test
-    public void testClickScreenUsage_shouldNotCrash() {
-        onView(withText(R.string.device_screen_usage)).perform(click());
-    }
-
-}
diff --git a/tests/app/src/com/android/settings/notification/AppNotificationSettingsTest.java b/tests/app/src/com/android/settings/notification/AppNotificationSettingsTest.java
deleted file mode 100644
index 22e98c7..0000000
--- a/tests/app/src/com/android/settings/notification/AppNotificationSettingsTest.java
+++ /dev/null
@@ -1,63 +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.notification;
-
-import android.app.Instrumentation;
-import android.content.Context;
-import android.content.Intent;
-import android.provider.Settings;
-import android.support.test.InstrumentationRegistry;
-import android.support.test.espresso.matcher.ViewMatchers;
-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.doesNotExist;
-import static android.support.test.espresso.matcher.ViewMatchers.withEffectiveVisibility;
-import static android.support.test.espresso.matcher.ViewMatchers.withId;
-import static org.hamcrest.Matchers.allOf;
-
-@RunWith(AndroidJUnit4.class)
-@SmallTest
-public class AppNotificationSettingsTest {
-
-    private Context mTargetContext;
-    private Instrumentation mInstrumentation;
-
-    @Before
-    public void setUp() {
-        mInstrumentation = InstrumentationRegistry.getInstrumentation();
-        mTargetContext = mInstrumentation.getTargetContext();
-    }
-
-    @Test
-    public void launchNotificationSetting_shouldNotHaveAppInfoLink() {
-        final Intent intent = new Intent(Settings.ACTION_APP_NOTIFICATION_SETTINGS)
-                .putExtra(Settings.EXTRA_APP_PACKAGE, mTargetContext.getPackageName());
-
-        mInstrumentation.startActivitySync(intent);
-
-        onView(allOf(withId(android.R.id.button1),
-                withEffectiveVisibility(ViewMatchers.Visibility.VISIBLE)))
-                .check(doesNotExist());
-    }
-
-}
diff --git a/tests/app/src/com/android/settings/notification/SoundSettingsIntegrationTest.java b/tests/app/src/com/android/settings/notification/SoundSettingsIntegrationTest.java
deleted file mode 100644
index dff7e61..0000000
--- a/tests/app/src/com/android/settings/notification/SoundSettingsIntegrationTest.java
+++ /dev/null
@@ -1,83 +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.notification;
-
-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.hasDescendant;
-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 org.hamcrest.Matchers.allOf;
-import static org.hamcrest.Matchers.containsString;
-
-import android.content.Context;
-import android.media.AudioManager;
-import android.support.test.espresso.contrib.RecyclerViewActions;
-import android.support.test.filters.SmallTest;
-import android.support.test.rule.ActivityTestRule;
-import android.support.test.runner.AndroidJUnit4;
-import com.android.settings.R;
-import com.android.settings.Settings;
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-
-@RunWith(AndroidJUnit4.class)
-@SmallTest
-public class SoundSettingsIntegrationTest {
-
-    private AudioManager mAudioManager;
-    private final String TRUNCATED_SUMMARY = "Ring volume at";
-
-    @Rule
-    public ActivityTestRule<Settings> mActivityRule =
-            new ActivityTestRule<>(Settings.class, true);
-
-    @Test
-    public void soundPreferenceShowsCorrectSummaryOnSilentMode() {
-        mAudioManager = (AudioManager) mActivityRule.getActivity().getApplicationContext()
-                .getSystemService(Context.AUDIO_SERVICE);
-        mAudioManager.setRingerMode(AudioManager.RINGER_MODE_SILENT);
-        onView(withId(R.id.dashboard_container))
-                .perform(RecyclerViewActions.scrollTo(
-                        hasDescendant(withText(R.string.sound_settings))));
-        onView(withText(R.string.sound_settings_summary_silent)).check(matches(isDisplayed()));
-    }
-
-    @Test
-    public void soundPreferenceShowsCorrectSummaryOnVibrateMode() {
-        mAudioManager = (AudioManager) mActivityRule.getActivity().getApplicationContext()
-                .getSystemService(Context.AUDIO_SERVICE);
-        mAudioManager.setRingerMode(AudioManager.RINGER_MODE_VIBRATE);
-        onView(withId(R.id.dashboard_container)).perform(RecyclerViewActions
-                .scrollTo(hasDescendant(withText(R.string.sound_settings))));
-        onView(withText(R.string.sound_settings_summary_vibrate)).check(matches(isDisplayed()));
-    }
-
-    @Test
-    public void soundPreferenceShowsCorrectSummaryOnMaxVolume() {
-        mAudioManager = (AudioManager) mActivityRule.getActivity().getApplicationContext()
-                .getSystemService(Context.AUDIO_SERVICE);
-        mAudioManager.setRingerMode(AudioManager.RINGER_MODE_NORMAL);
-        mAudioManager.setStreamVolume(AudioManager.STREAM_RING,
-                mAudioManager.getStreamMaxVolume(AudioManager.STREAM_RING), 0);
-        onView(withId(R.id.dashboard_container))
-                .perform(RecyclerViewActions.scrollTo(
-                        hasDescendant(withText(R.string.sound_settings))));
-        onView(withText(containsString(TRUNCATED_SUMMARY))).check(matches(isDisplayed()));
-    }
-}
\ No newline at end of file
diff --git a/tests/app/src/com/android/settings/notification/ZenModeSettingsIntegrationTest.java b/tests/app/src/com/android/settings/notification/ZenModeSettingsIntegrationTest.java
deleted file mode 100644
index e7e5e19..0000000
--- a/tests/app/src/com/android/settings/notification/ZenModeSettingsIntegrationTest.java
+++ /dev/null
@@ -1,53 +0,0 @@
-package com.android.settings.notification;
-
-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.withText;
-
-import android.content.Context;
-import android.content.Intent;
-import android.provider.Settings;
-import android.support.test.InstrumentationRegistry;
-import android.support.test.filters.LargeTest;
-import android.support.test.runner.AndroidJUnit4;
-import android.support.test.uiautomator.UiDevice;
-
-import org.junit.Before;
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-
-@RunWith(AndroidJUnit4.class)
-@LargeTest
-public class ZenModeSettingsIntegrationTest {
-    private static final String WM_DISMISS_KEYGUARD_COMMAND = "wm dismiss-keyguard";
-
-    private Context mContext;
-    private UiDevice mUiDevice;
-
-    @Before
-    public void setUp() throws Exception {
-        mContext = InstrumentationRegistry.getTargetContext();
-        mUiDevice = UiDevice.getInstance(InstrumentationRegistry.getInstrumentation());
-        mUiDevice.wakeUp();
-        mUiDevice.executeShellCommand(WM_DISMISS_KEYGUARD_COMMAND);
-    }
-
-    @Test
-    public void testAutomaticRulesAppear() {
-        launchZenSettings();
-        onView(withText("Automatic rules")).check(matches(isDisplayed()));
-        onView(withText("Weekend")).check(matches(isDisplayed()));
-        onView(withText("Add more")).check(matches(isDisplayed())).perform(click());
-        onView(withText("Choose rule type")).check(matches(isDisplayed()));
-    }
-
-    private void launchZenSettings() {
-        Intent settingsIntent = new Intent(Settings.ACTION_ZEN_MODE_SETTINGS)
-                .setPackage(mContext.getPackageName())
-                .addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
-        mContext.startActivity(settingsIntent);
-    }
-}
diff --git a/tests/app/src/com/android/settings/password/ChooseLockGenericTest.java b/tests/app/src/com/android/settings/password/ChooseLockGenericTest.java
deleted file mode 100644
index 40b69a4..0000000
--- a/tests/app/src/com/android/settings/password/ChooseLockGenericTest.java
+++ /dev/null
@@ -1,228 +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.password;
-
-import static android.support.test.InstrumentationRegistry.getInstrumentation;
-import static android.support.test.InstrumentationRegistry.getTargetContext;
-import static com.google.common.truth.Truth.assertThat;
-import static org.junit.Assert.assertTrue;
-
-import android.app.Activity;
-import android.app.ActivityManager;
-import android.app.ActivityManager.AppTask;
-import android.app.KeyguardManager;
-import android.app.admin.DevicePolicyManager;
-import android.content.Context;
-import android.content.Intent;
-import android.support.test.filters.MediumTest;
-import android.support.test.rule.ActivityTestRule;
-import android.support.test.runner.AndroidJUnit4;
-import android.support.test.runner.lifecycle.ActivityLifecycleMonitorRegistry;
-import android.support.test.runner.lifecycle.Stage;
-import android.support.test.uiautomator.UiDevice;
-import android.support.test.uiautomator.UiObject;
-import android.support.test.uiautomator.UiSelector;
-import android.text.format.DateUtils;
-import android.view.WindowManager;
-
-import com.android.internal.widget.LockPatternUtils;
-
-import org.junit.Before;
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-
-import java.util.Collection;
-import java.util.List;
-
-/**
- * Tests for {@link ChooseLockGenericTest}
- *
- * m SettingsTests &&
- * adb install \
- * -r -g  ${ANDROID_PRODUCT_OUT}/data/app/SettingsTests/SettingsTests.apk &&
- * adb shell am instrument -e class com.android.settings.password.ChooseLockGenericTest \
- * -w com.android.settings.tests/android.support.test.runner.AndroidJUnitRunner
- */
-@RunWith(AndroidJUnit4.class)
-@MediumTest
-public class ChooseLockGenericTest {
-    private static final long TIMEOUT = 5 * DateUtils.SECOND_IN_MILLIS;
-    private static final Intent PHISHING_ATTACK_INTENT = new Intent()
-            .putExtra("confirm_credentials", false)
-            .putExtra("password_confirmed", true);
-
-    private UiDevice mDevice;
-    private Context mTargetContext;
-    private String mSettingPackage;
-
-    @Rule
-    public ActivityTestRule<ChooseLockGeneric> mChooseLockGenericActivityRule =
-            new ActivityTestRule<>(
-                    ChooseLockGeneric.class,
-                    true /* enable touch at launch */,
-                    false /* don't launch at every test */);
-
-    @Before
-    public void setUp() throws Exception {
-        mDevice = UiDevice.getInstance(getInstrumentation());
-        mTargetContext = getInstrumentation().getTargetContext();
-        mSettingPackage = mTargetContext.getPackageName();
-    }
-
-    @Test
-    public void testConfirmLockPasswordShown_deviceWithPassword() throws Throwable {
-        setPassword();
-        try {
-            // GIVEN a PIN password is set on this device at set up.
-            // WHEN ChooseLockGeneric is launched with no extras.
-            mChooseLockGenericActivityRule.launchActivity(null /* No extras */);
-            // THEN ConfirmLockPassword.InternalActivity is shown.
-            final Activity activity = getCurrentActivity();
-            assertThat(isSecureWindow(activity)).isTrue();
-            assertThat(activity)
-                    .isInstanceOf(ConfirmLockPassword.InternalActivity.class);
-        } finally {
-            finishAllAppTasks();
-            mDevice.waitForIdle();
-            clearPassword();
-        }
-    }
-
-    @Test
-    public void testConfirmLockPasswordShown_deviceWithPassword_phishingAttack() throws Throwable {
-        setPassword();
-        try {
-            // GIVEN a PIN password is set on this device at set up.
-            // WHEN ChooseLockGeneric is launched with extras to by-pass lock password confirmation.
-            mChooseLockGenericActivityRule.launchActivity(PHISHING_ATTACK_INTENT);
-            // THEN ConfirmLockPassword.InternalActivity is still shown.
-            final Activity activity = getCurrentActivity();
-            assertThat(isSecureWindow(activity)).isTrue();
-            assertThat(activity)
-                    .isInstanceOf(ConfirmLockPassword.InternalActivity.class);
-        } finally {
-            finishAllAppTasks();
-            mDevice.waitForIdle();
-            clearPassword();
-        }
-    }
-
-    @Test
-    public void testForFingerprint_inflateLayout() {
-        mChooseLockGenericActivityRule.launchActivity(new Intent()
-                .putExtra(ChooseLockSettingsHelper.EXTRA_KEY_FOR_FINGERPRINT, true));
-
-        assertThat(mChooseLockGenericActivityRule.getActivity().isResumed()).isTrue();
-    }
-
-    private Activity getCurrentActivity() throws Throwable {
-        getInstrumentation().waitForIdleSync();
-        final Activity[] activity = new Activity[1];
-        getInstrumentation().runOnMainSync(() -> {
-            Collection<Activity> activities = ActivityLifecycleMonitorRegistry.getInstance()
-                    .getActivitiesInStage(Stage.RESUMED);
-            activity[0] = activities.iterator().next();
-        });
-        return activity[0];
-    }
-
-    /** Sets a PIN password, 12345, for testing. */
-    private void setPassword() throws Exception {
-        Intent newPasswordIntent = new Intent(getTargetContext(), ChooseLockGeneric.class)
-                .putExtra(LockPatternUtils.PASSWORD_TYPE_KEY,
-                        DevicePolicyManager.PASSWORD_QUALITY_NUMERIC)
-                .putExtra(ChooseLockSettingsHelper.EXTRA_KEY_PASSWORD,
-                        "12345")
-                .addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
-        getInstrumentation().getContext().startActivity(newPasswordIntent);
-        mDevice.waitForIdle();
-
-
-        // Ignore any interstitial options
-        UiObject view = new UiObject(new UiSelector()
-                .resourceId(mSettingPackage + ":id/encrypt_dont_require_password"));
-        if (view.waitForExists(TIMEOUT)) {
-            view.click();
-            mDevice.waitForIdle();
-        }
-
-        // Set our PIN
-        view = new UiObject(new UiSelector()
-                .resourceId(mSettingPackage + ":id/password_entry"));
-        assertTrue("password_entry", view.waitForExists(TIMEOUT));
-
-        // Enter it twice to confirm
-        enterTestPin(view);
-        enterTestPin(view);
-
-        mDevice.pressBack();
-
-        assertThat(getTargetContext().getSystemService(KeyguardManager.class).isDeviceSecure())
-                .isTrue();
-    }
-
-    /** Clears the previous set PIN password. */
-    private void clearPassword() throws Exception {
-        Intent newPasswordIntent = new Intent(getTargetContext(), ChooseLockGeneric.class)
-                .putExtra(LockPatternUtils.PASSWORD_TYPE_KEY,
-                        DevicePolicyManager.PASSWORD_QUALITY_UNSPECIFIED)
-                .addFlags(Intent.FLAG_ACTIVITY_NEW_TASK
-                        | Intent.FLAG_ACTIVITY_CLEAR_TASK);
-        getInstrumentation().getContext().startActivity(newPasswordIntent);
-        mDevice.waitForIdle();
-
-        // Enter current PIN
-        UiObject view = new UiObject(
-                new UiSelector().resourceId(mSettingPackage + ":id/password_entry"));
-        if (!view.waitForExists(TIMEOUT)) {
-            // Odd, maybe there is a crash dialog showing; try dismissing it
-            mDevice.pressBack();
-            mDevice.waitForIdle();
-
-            assertTrue("password_entry", view.waitForExists(TIMEOUT));
-        }
-
-        enterTestPin(view);
-
-        mDevice.pressBack();
-
-        assertThat(getTargetContext().getSystemService(KeyguardManager.class).isDeviceSecure())
-                .isFalse();
-    }
-
-    private void finishAllAppTasks() {
-        final ActivityManager activityManager =
-                getTargetContext().getSystemService(ActivityManager.class);
-        final List<AppTask> appTasks = activityManager.getAppTasks();
-        for (ActivityManager.AppTask task : appTasks) {
-            task.finishAndRemoveTask();
-        }
-    }
-
-    private void enterTestPin(UiObject view) throws Exception {
-        mDevice.waitForIdle();
-        view.setText("12345");
-        mDevice.pressEnter();
-        mDevice.waitForIdle();
-    }
-
-    private boolean isSecureWindow(Activity activity) {
-        return (activity.getWindow().getAttributes().flags & WindowManager.LayoutParams.FLAG_SECURE)
-                != 0;
-    }
-}
diff --git a/tests/app/src/com/android/settings/search/SearchFragmentEspressoTest.java b/tests/app/src/com/android/settings/search/SearchFragmentEspressoTest.java
deleted file mode 100644
index d342881..0000000
--- a/tests/app/src/com/android/settings/search/SearchFragmentEspressoTest.java
+++ /dev/null
@@ -1,51 +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.search;
-
-import android.support.test.filters.SmallTest;
-import android.support.test.rule.ActivityTestRule;
-import android.support.test.runner.AndroidJUnit4;
-import android.widget.SearchView;
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-
-import static android.support.test.espresso.Espresso.onView;
-import static android.support.test.espresso.matcher.ViewMatchers.hasFocus;
-import static android.support.test.espresso.matcher.ViewMatchers.withClassName;
-import static android.support.test.espresso.matcher.ViewMatchers.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
-public class SearchFragmentEspressoTest {
-    @Rule
-    public ActivityTestRule<SearchActivity> mActivityRule =
-            new ActivityTestRule<>(SearchActivity.class, true, true);
-
-    @Test
-    public void test_OpenKeyboardOnSearchLaunch() {
-        onView(allOf(hasFocus(), withId(R.id.search_view)))
-                .check(matches(withClassName(containsString(SearchView.class.getName()))));
-    }
-}
diff --git a/tests/app/src/com/android/settings/tests/BluetoothRequestPermissionTest.java b/tests/app/src/com/android/settings/tests/BluetoothRequestPermissionTest.java
deleted file mode 100644
index a2cdafe..0000000
--- a/tests/app/src/com/android/settings/tests/BluetoothRequestPermissionTest.java
+++ /dev/null
@@ -1,177 +0,0 @@
-/*
- * Copyright (C) 2009 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.tests;
-
-import android.app.Activity;
-import android.bluetooth.BluetoothAdapter;
-import android.bluetooth.BluetoothDevice;
-import android.content.BroadcastReceiver;
-import android.content.Context;
-import android.content.Intent;
-import android.content.IntentFilter;
-import android.os.Bundle;
-import android.util.Log;
-import android.view.View;
-import android.view.View.OnClickListener;
-import android.widget.ArrayAdapter;
-import android.widget.Button;
-import android.widget.ListView;
-
-public class BluetoothRequestPermissionTest extends Activity {
-    private static final String TAG = "BluetoothRequestPermissionTest";
-    BluetoothAdapter mAdapter;
-    private ArrayAdapter<String> mMsgAdapter;
-
-    // Discoverable button alternates between 20 second timeout and no timeout.
-    private boolean mDiscoveryWithTimeout = true;
-
-    private class BtOnClickListener implements OnClickListener {
-        final boolean mEnableOnly; // enable or enable + discoverable
-
-        public BtOnClickListener(boolean enableOnly) {
-            mEnableOnly = enableOnly;
-        }
-
-        public void onClick(View v) {
-            requestPermission(mEnableOnly);
-        }
-    }
-
-    private class BtScanOnClickListener implements OnClickListener {
-        public void onClick(View v) {
-            Button scanButton = (Button) v;
-            if (mAdapter.isDiscovering()) {
-                mAdapter.cancelDiscovery();
-                scanButton.setText(R.string.start_scan);
-            } else {
-                mAdapter.startDiscovery();
-                scanButton.setText(R.string.stop_scan);
-            }
-        }
-    }
-
-    @Override
-    public void onCreate(Bundle icicle) {
-        super.onCreate(icicle);
-        setContentView(R.layout.bluetooth_request_permission_test);
-        mAdapter = BluetoothAdapter.getDefaultAdapter();
-
-        Button enable = (Button) findViewById(R.id.enable);
-        enable.setOnClickListener(new BtOnClickListener(true /* enable */));
-
-        Button discoverable = (Button) findViewById(R.id.discoverable);
-        discoverable.setOnClickListener(new BtOnClickListener(false /* enable & discoverable */));
-
-        Button scanButton = (Button) findViewById(R.id.scan);
-        scanButton.setOnClickListener(new BtScanOnClickListener());
-        if (mAdapter.isDiscovering()) {
-            scanButton.setText(R.string.stop_scan);
-        } else {
-            scanButton.setText(R.string.start_scan);
-        }
-
-        mMsgAdapter = new ArrayAdapter<String>(this, android.R.layout.simple_list_item_1);
-
-        ListView listView = (ListView) findViewById(R.id.msg_container);
-        listView.setAdapter(mMsgAdapter);
-
-        IntentFilter filter = new IntentFilter();
-        filter.addAction(BluetoothAdapter.ACTION_DISCOVERY_STARTED);
-        filter.addAction(BluetoothAdapter.ACTION_DISCOVERY_FINISHED);
-        filter.addAction(BluetoothAdapter.ACTION_STATE_CHANGED);
-        filter.addAction(BluetoothDevice.ACTION_FOUND);
-        registerReceiver(mReceiver, filter);
-        addMsg("Initialized");
-    }
-
-    void requestPermission(boolean enableOnly) {
-        Intent i = new Intent();
-        if (enableOnly) {
-            addMsg("Starting activity to enable bt");
-            i.setAction(BluetoothAdapter.ACTION_REQUEST_ENABLE);
-        } else {
-            addMsg("Starting activity to enable bt + discovery");
-            i.setAction(BluetoothAdapter.ACTION_REQUEST_DISCOVERABLE);
-            // Discoverability duration toggles between 20 seconds and no timeout.
-            int timeout = (mDiscoveryWithTimeout ? 20 : 0);
-            i.putExtra(BluetoothAdapter.EXTRA_DISCOVERABLE_DURATION, timeout);
-            mDiscoveryWithTimeout = !mDiscoveryWithTimeout;
-        }
-        startActivityForResult(i, 1);
-    }
-
-    @Override
-    protected void onActivityResult(int requestCode, int resultCode, Intent data) {
-        if (requestCode != 1) {
-            Log.e(TAG, "Unexpected onActivityResult " + requestCode + " " + resultCode);
-            return;
-        }
-
-        if (resultCode == Activity.RESULT_CANCELED) {
-            addMsg("Result = RESULT_CANCELED");
-        } else if (resultCode == Activity.RESULT_OK) {
-            addMsg("Result = RESULT_OK (not expected for discovery)");
-        } else {
-            addMsg("Result = " + resultCode);
-        }
-    }
-
-    @Override
-    protected void onDestroy() {
-        super.onDestroy();
-        unregisterReceiver(mReceiver);
-    }
-
-    private void addMsg(String msg) {
-        mMsgAdapter.add(msg);
-        Log.d(TAG, "msg");
-    }
-
-    private BroadcastReceiver mReceiver = new BroadcastReceiver() {
-        @Override
-        public void onReceive(Context context, Intent intent) {
-            if (intent == null)
-                return;
-            String action = intent.getAction();
-            if (BluetoothAdapter.ACTION_STATE_CHANGED.equals(action)) {
-                String stateStr = "???";
-                switch (intent.getIntExtra(BluetoothAdapter.EXTRA_STATE, BluetoothDevice.ERROR)) {
-                    case BluetoothAdapter.STATE_OFF:
-                        stateStr = "off";
-                        break;
-                    case BluetoothAdapter.STATE_TURNING_ON:
-                        stateStr = "turning on";
-                        break;
-                    case BluetoothAdapter.STATE_ON:
-                        stateStr = "on";
-                        break;
-                    case BluetoothAdapter.STATE_TURNING_OFF:
-                        stateStr = "turning off";
-                        break;
-                }
-                addMsg("Bluetooth status = " + stateStr);
-            } else if (action.equals(BluetoothDevice.ACTION_FOUND)) {
-                String name = intent.getStringExtra(BluetoothDevice.EXTRA_NAME);
-                addMsg("Found: " + name);
-            } else if (action.equals(BluetoothAdapter.ACTION_DISCOVERY_STARTED)) {
-                addMsg("Scan started...");
-            } else if (action.equals(BluetoothAdapter.ACTION_DISCOVERY_FINISHED)) {
-                addMsg("Scan ended");
-            }
-        }
-    };
-}
diff --git a/tests/app/src/com/android/settings/tests/DashboardAdapterTest.java b/tests/app/src/com/android/settings/tests/DashboardAdapterTest.java
deleted file mode 100644
index 4b8e6cf..0000000
--- a/tests/app/src/com/android/settings/tests/DashboardAdapterTest.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.tests;
-
-import android.app.Instrumentation;
-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.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import com.android.settings.R;
-
-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.*;
-import static android.support.test.espresso.matcher.ViewMatchers.Visibility.VISIBLE;
-import static org.hamcrest.core.AllOf.allOf;
-
-@RunWith(AndroidJUnit4.class)
-@SmallTest
-public class DashboardAdapterTest {
-    @Before
-    public void SetUp() {
-        Instrumentation instrumentation = InstrumentationRegistry.getInstrumentation();
-        instrumentation.startActivitySync(new Intent(Settings
-                .ACTION_SETTINGS));
-    }
-
-    @Test
-    public void testTileConsistency_ToggleSuggestionsAndOpenBluetooth_shouldInBluetooth()
-            throws Exception{
-        final Context context = InstrumentationRegistry.getTargetContext();
-
-        onView(allOf(withText(context.getString(R.string.suggestions_title)),
-                withEffectiveVisibility(VISIBLE))).perform(click());
-        onView(allOf(withText(context.getString(R.string.bluetooth_settings)),
-                withEffectiveVisibility(VISIBLE))).perform(click());
-
-        // It should go to Bluetooth sub page, not other page or crash
-        onView(allOf(withText(context.getString(R.string.bluetooth_settings)),
-                withEffectiveVisibility(VISIBLE))).check(matches(isDisplayed()));
-
-    }
-}
diff --git a/tests/app/src/com/android/settings/tests/DrawOverlayDetailsTest.java b/tests/app/src/com/android/settings/tests/DrawOverlayDetailsTest.java
deleted file mode 100644
index 234f8e6..0000000
--- a/tests/app/src/com/android/settings/tests/DrawOverlayDetailsTest.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.tests;
-
-import android.app.Instrumentation;
-import android.content.Context;
-import android.content.Intent;
-import android.content.pm.PackageManager;
-import android.support.test.InstrumentationRegistry;
-import org.junit.runner.RunWith;
-import android.support.test.filters.SmallTest;
-import android.support.test.runner.AndroidJUnit4;
-import org.junit.Test;
-import com.android.settings.R;
-
-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.isEnabled;
-import static android.support.test.espresso.matcher.ViewMatchers.withText;
-import static org.hamcrest.core.IsNot.not;
-import static android.support.test.espresso.Espresso.openActionBarOverflowOrOptionsMenu;
-
-@RunWith(AndroidJUnit4.class)
-@SmallTest
-public class DrawOverlayDetailsTest {
-    private final static String PACKAGE_SYSTEM_UI = "com.android.systemui";
-
-    @Test
-    public void testSystemUiDrawOverlayDetails_Disabled() throws Exception{
-        Instrumentation instrumentation = InstrumentationRegistry.getInstrumentation();
-        instrumentation.startActivitySync(new Intent(android.provider.Settings
-                .ACTION_MANAGE_OVERLAY_PERMISSION));
-
-        final Context targetContext = instrumentation.getTargetContext();
-
-        final PackageManager packageManager = targetContext.getPackageManager();
-        final String appName = (String) packageManager.getApplicationLabel(packageManager
-                .getApplicationInfo(PACKAGE_SYSTEM_UI, PackageManager.GET_META_DATA));
-
-        openActionBarOverflowOrOptionsMenu(targetContext);
-        onView(withText(targetContext.getString(R.string.menu_show_system))).perform(click());
-        onView(withText(appName)).perform(click());
-        onView(withText(targetContext.getString(R.string.permit_draw_overlay))).check(matches
-                (not(isEnabled())));
-    }
-
-}
diff --git a/tests/app/src/com/android/settings/tests/Manufacturer.java b/tests/app/src/com/android/settings/tests/Manufacturer.java
deleted file mode 100644
index 692e6a8..0000000
--- a/tests/app/src/com/android/settings/tests/Manufacturer.java
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- * Copyright (C) 2010 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.tests;
-
-import android.app.Activity;
-import android.os.Bundle;
-
-public class Manufacturer extends Activity {
-
-    @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        setContentView(R.layout.manufacturer_main);
-    }
-}
diff --git a/tests/app/src/com/android/settings/tests/Operator.java b/tests/app/src/com/android/settings/tests/Operator.java
deleted file mode 100644
index 8a34363..0000000
--- a/tests/app/src/com/android/settings/tests/Operator.java
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- * Copyright (C) 2010 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.tests;
-
-import android.app.Activity;
-import android.os.Bundle;
-
-public class Operator extends Activity {
-
-    @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        setContentView(R.layout.operator_main);
-    }
-
-}
diff --git a/tests/app/src/com/android/settings/tests/PrivateVolumeSettingsTest.java b/tests/app/src/com/android/settings/tests/PrivateVolumeSettingsTest.java
deleted file mode 100644
index 6289f1b..0000000
--- a/tests/app/src/com/android/settings/tests/PrivateVolumeSettingsTest.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.tests;
-
-import android.app.Instrumentation;
-import android.content.Intent;
-import android.support.test.InstrumentationRegistry;
-import android.support.test.filters.SmallTest;
-import android.support.test.runner.AndroidJUnit4;
-import com.android.settings.Settings;
-import org.junit.Rule;
-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.doesNotExist;
-import static android.support.test.espresso.assertion.ViewAssertions.matches;
-import static android.support.test.espresso.matcher.ViewMatchers.withText;
-
-@RunWith(AndroidJUnit4.class)
-@SmallTest
-public class PrivateVolumeSettingsTest {
-    @Test
-    public void test_ManageStorageNotShown() {
-        Instrumentation instrumentation = InstrumentationRegistry.getInstrumentation();
-        instrumentation.startActivitySync(
-                new Intent(android.provider.Settings.ACTION_INTERNAL_STORAGE_SETTINGS));
-        onView(withText(com.android.settings.R.string.storage_menu_manage)).check(doesNotExist());
-    }
-}
\ No newline at end of file
diff --git a/tests/app/src/com/android/settings/users/UserSettingsTest.java b/tests/app/src/com/android/settings/users/UserSettingsTest.java
deleted file mode 100644
index 06e2bdd..0000000
--- a/tests/app/src/com/android/settings/users/UserSettingsTest.java
+++ /dev/null
@@ -1,85 +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.users;
-
-import android.content.Context;
-import android.content.Intent;
-import android.support.test.filters.SmallTest;
-import android.support.test.uiautomator.UiDevice;
-import android.support.test.uiautomator.UiObject;
-import android.support.test.uiautomator.UiSelector;
-import android.support.test.uiautomator.UiScrollable;
-import android.test.InstrumentationTestCase;
-
-import com.android.settings.R;
-
-import org.junit.Test;
-
-@SmallTest
-public class UserSettingsTest extends InstrumentationTestCase {
-
-    private static final String USER_AND_ACCOUNTS = "Users & accounts";
-    private static final String USERS = "Users";
-    private static final String EMERGNENCY_INFO = "Emergency information";
-    private static final String ADD_USERS_WHEN_LOCKED = "Add users";
-
-    private UiDevice mDevice;
-    private Context mContext;
-    private String mTargetPackage;
-
-    @Override
-    protected void setUp() throws Exception {
-        super.setUp();
-        mDevice = UiDevice.getInstance(getInstrumentation());
-        mContext = getInstrumentation().getTargetContext();
-        mTargetPackage = mContext.getPackageName();
-    }
-
-    @Test
-    public void testEmergencyInfoNotExists() throws Exception {
-        launchUserSettings();
-        UiObject emergencyInfoPreference =
-            mDevice.findObject(new UiSelector().text(EMERGNENCY_INFO));
-        assertFalse(emergencyInfoPreference.exists());
-    }
-
-    @Test
-    public void testAddUsersWhenLockedNotExists() throws Exception {
-        launchUserSettings();
-        UiObject addUsersPreference =
-            mDevice.findObject(new UiSelector().text(ADD_USERS_WHEN_LOCKED));
-        assertFalse(addUsersPreference.exists());
-    }
-
-    private void launchSettings() {
-        Intent settingsIntent = new Intent(Intent.ACTION_MAIN)
-                .addCategory(Intent.CATEGORY_LAUNCHER)
-                .setPackage(mTargetPackage)
-                .addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
-        getInstrumentation().getContext().startActivity(settingsIntent);
-    }
-
-    private void launchUserSettings() throws Exception  {
-        launchSettings();
-        final UiScrollable settings = new UiScrollable(
-                new UiSelector().packageName(mTargetPackage).scrollable(true));
-        final String titleUsersAndAccounts = USER_AND_ACCOUNTS;
-        settings.scrollTextIntoView(titleUsersAndAccounts);
-        mDevice.findObject(new UiSelector().text(titleUsersAndAccounts)).click();
-        mDevice.findObject(new UiSelector().text(USERS)).click();
-    }
-
-}
diff --git a/tests/app/src/com/android/settings/vpn2/CertInstallerHelper.java b/tests/app/src/com/android/settings/vpn2/CertInstallerHelper.java
deleted file mode 100644
index fa2638f..0000000
--- a/tests/app/src/com/android/settings/vpn2/CertInstallerHelper.java
+++ /dev/null
@@ -1,223 +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.vpn2;
-
-import android.os.Environment;
-import android.security.Credentials;
-import android.security.KeyStore;
-import android.util.Log;
-
-import com.android.internal.net.VpnProfile;
-import com.android.org.bouncycastle.asn1.ASN1InputStream;
-import com.android.org.bouncycastle.asn1.ASN1Sequence;
-import com.android.org.bouncycastle.asn1.DEROctetString;
-import com.android.org.bouncycastle.asn1.x509.BasicConstraints;
-
-import junit.framework.Assert;
-
-import libcore.io.Streams;
-
-import java.io.ByteArrayInputStream;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.nio.charset.StandardCharsets;
-import java.security.KeyStoreException;
-import java.security.NoSuchAlgorithmException;
-import java.security.KeyStore.PasswordProtection;
-import java.security.KeyStore.PrivateKeyEntry;
-import java.security.PrivateKey;
-import java.security.UnrecoverableEntryException;
-import java.security.cert.Certificate;
-import java.security.cert.CertificateEncodingException;
-import java.security.cert.CertificateException;
-import java.security.cert.X509Certificate;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Enumeration;
-import java.util.List;
-
-/**
- * Certificate installer helper to extract information from a provided file
- * and install certificates to keystore.
- */
-public class CertInstallerHelper {
-    private static final String TAG = "CertInstallerHelper";
-    /* Define a password to unlock keystore after it is reset */
-    private static final String CERT_STORE_PASSWORD = "password";
-    private final int mUid = KeyStore.UID_SELF;
-    private PrivateKey mUserKey;  // private key
-    private X509Certificate mUserCert;  // user certificate
-    private List<X509Certificate> mCaCerts = new ArrayList<X509Certificate>();
-    private KeyStore mKeyStore = KeyStore.getInstance();
-
-    /**
-     * Unlock keystore and set password
-     */
-    public CertInstallerHelper() {
-        mKeyStore.reset();
-        mKeyStore.onUserPasswordChanged(CERT_STORE_PASSWORD);
-    }
-
-    private void extractCertificate(String certFile, String password) {
-        InputStream in = null;
-        final byte[] raw;
-        java.security.KeyStore keystore = null;
-        try {
-            // Read .p12 file from SDCARD and extract with password
-            in = new FileInputStream(new File(
-                    Environment.getExternalStorageDirectory(), certFile));
-            raw = Streams.readFully(in);
-
-            keystore = java.security.KeyStore.getInstance("PKCS12");
-            PasswordProtection passwordProtection = new PasswordProtection(password.toCharArray());
-            keystore.load(new ByteArrayInputStream(raw), passwordProtection.getPassword());
-
-            // Install certificates and private keys
-            Enumeration<String> aliases = keystore.aliases();
-            if (!aliases.hasMoreElements()) {
-                Assert.fail("key store failed to put in keychain");
-            }
-            ArrayList<String> aliasesList = Collections.list(aliases);
-            // The keystore is initialized for each test case, there will
-            // be only one alias in the keystore
-            Assert.assertEquals(1, aliasesList.size());
-            String alias = aliasesList.get(0);
-            java.security.KeyStore.Entry entry = keystore.getEntry(alias, passwordProtection);
-            Log.d(TAG, "extracted alias = " + alias + ", entry=" + entry.getClass());
-
-            if (entry instanceof PrivateKeyEntry) {
-                Assert.assertTrue(installFrom((PrivateKeyEntry) entry));
-            }
-        } catch (IOException e) {
-            Assert.fail("Failed to read certficate: " + e);
-        } catch (KeyStoreException e) {
-            Log.e(TAG, "failed to extract certificate" + e);
-        } catch (NoSuchAlgorithmException e) {
-            Log.e(TAG, "failed to extract certificate" + e);
-        } catch (CertificateException e) {
-            Log.e(TAG, "failed to extract certificate" + e);
-        } catch (UnrecoverableEntryException e) {
-            Log.e(TAG, "failed to extract certificate" + e);
-        }
-        finally {
-            if (in != null) {
-                try {
-                    in.close();
-                } catch (IOException e) {
-                    Log.e(TAG, "close FileInputStream error: " + e);
-                }
-            }
-        }
-    }
-
-    /**
-     * Extract private keys, user certificates and ca certificates
-     */
-    private synchronized boolean installFrom(PrivateKeyEntry entry) {
-        mUserKey = entry.getPrivateKey();
-        mUserCert = (X509Certificate) entry.getCertificate();
-
-        Certificate[] certs = entry.getCertificateChain();
-        Log.d(TAG, "# certs extracted = " + certs.length);
-        mCaCerts = new ArrayList<X509Certificate>(certs.length);
-        for (Certificate c : certs) {
-            X509Certificate cert = (X509Certificate) c;
-            if (isCa(cert)) {
-                mCaCerts.add(cert);
-            }
-        }
-        Log.d(TAG, "# ca certs extracted = " + mCaCerts.size());
-        return true;
-    }
-
-    private boolean isCa(X509Certificate cert) {
-        try {
-            byte[] asn1EncodedBytes = cert.getExtensionValue("2.5.29.19");
-            if (asn1EncodedBytes == null) {
-                return false;
-            }
-            DEROctetString derOctetString = (DEROctetString)
-                    new ASN1InputStream(asn1EncodedBytes).readObject();
-            byte[] octets = derOctetString.getOctets();
-            ASN1Sequence sequence = (ASN1Sequence)
-                    new ASN1InputStream(octets).readObject();
-            return BasicConstraints.getInstance(sequence).isCA();
-        } catch (IOException e) {
-            return false;
-        }
-    }
-
-    /**
-     * Extract certificate from the given file, and install it to keystore
-     * @param name certificate name
-     * @param certFile .p12 file which includes certificates
-     * @param password password to extract the .p12 file
-     */
-    public void installCertificate(VpnProfile profile, String certFile, String password) {
-        // extract private keys, certificates from the provided file
-        extractCertificate(certFile, password);
-        // install certificate to the keystore
-        int flags = KeyStore.FLAG_ENCRYPTED;
-        try {
-            if (mUserKey != null) {
-                Log.v(TAG, "has private key");
-                String key = Credentials.USER_PRIVATE_KEY + profile.ipsecUserCert;
-                byte[] value = mUserKey.getEncoded();
-
-                if (!mKeyStore.importKey(key, value, mUid, flags)) {
-                    Log.e(TAG, "Failed to install " + key + " as user " + mUid);
-                    return;
-                }
-                Log.v(TAG, "install " + key + " as user " + mUid + " is successful");
-            }
-
-            if (mUserCert != null) {
-                String certName = Credentials.USER_CERTIFICATE + profile.ipsecUserCert;
-                byte[] certData = Credentials.convertToPem(mUserCert);
-
-                if (!mKeyStore.put(certName, certData, mUid, flags)) {
-                    Log.e(TAG, "Failed to install " + certName + " as user " + mUid);
-                    return;
-                }
-                Log.v(TAG, "install " + certName + " as user" + mUid + " is successful.");
-            }
-
-            if (!mCaCerts.isEmpty()) {
-                String caListName = Credentials.CA_CERTIFICATE + profile.ipsecCaCert;
-                X509Certificate[] caCerts = mCaCerts.toArray(new X509Certificate[mCaCerts.size()]);
-                byte[] caListData = Credentials.convertToPem(caCerts);
-
-                if (!mKeyStore.put(caListName, caListData, mUid, flags)) {
-                    Log.e(TAG, "Failed to install " + caListName + " as user " + mUid);
-                    return;
-                }
-                Log.v(TAG, " install " + caListName + " as user " + mUid + " is successful");
-            }
-        } catch (CertificateEncodingException e) {
-            Log.e(TAG, "Exception while convert certificates to pem " + e);
-            throw new AssertionError(e);
-        } catch (IOException e) {
-            Log.e(TAG, "IOException while convert to pem: " + e);
-        }
-    }
-
-    public int getUid() {
-        return mUid;
-    }
-}
diff --git a/tests/app/src/com/android/settings/vpn2/VpnInfo.java b/tests/app/src/com/android/settings/vpn2/VpnInfo.java
deleted file mode 100644
index ab7fb0f..0000000
--- a/tests/app/src/com/android/settings/vpn2/VpnInfo.java
+++ /dev/null
@@ -1,65 +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.vpn2;
-
-import com.android.internal.net.VpnProfile;
-
-/**
- * Wrapper for VPN Profile and associated certificate files
- */
-public class VpnInfo {
-    // VPN Profile
-    private VpnProfile mVpnProfile;
-    // Certificate file in PC12 format for user certificates and private keys
-    private String mCertificateFile = null;
-    // Password to extract certificates from the file
-    private String mPassword = null;
-
-    public VpnInfo(VpnProfile vpnProfile, String certFile, String password) {
-        mVpnProfile = vpnProfile;
-        mCertificateFile = certFile;
-        mPassword = password;
-    }
-
-    public VpnInfo(VpnProfile vpnProfile) {
-        mVpnProfile = vpnProfile;
-    }
-
-    public void setVpnProfile(VpnProfile vpnProfile) {
-        mVpnProfile = vpnProfile;
-    }
-
-    public void setCertificateFile(String certFile) {
-        mCertificateFile = certFile;
-    }
-
-    public void setPassword(String password) {
-        mPassword = password;
-    }
-
-    public VpnProfile getVpnProfile() {
-        return mVpnProfile;
-    }
-
-    public String getCertificateFile() {
-        return mCertificateFile;
-    }
-
-    public String getPassword() {
-        return mPassword;
-    }
-}
diff --git a/tests/app/src/com/android/settings/vpn2/VpnProfileParser.java b/tests/app/src/com/android/settings/vpn2/VpnProfileParser.java
deleted file mode 100644
index 51c2550..0000000
--- a/tests/app/src/com/android/settings/vpn2/VpnProfileParser.java
+++ /dev/null
@@ -1,246 +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.vpn2;
-
-import android.util.Log;
-
-import com.android.internal.net.VpnProfile;
-
-import org.xml.sax.Attributes;
-import org.xml.sax.SAXException;
-import org.xml.sax.helpers.DefaultHandler;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.HashMap;
-import java.util.Map;
-
-import javax.xml.parsers.ParserConfigurationException;
-import javax.xml.parsers.SAXParser;
-import javax.xml.parsers.SAXParserFactory;
-
-/**
- * Parse VPN profiles from an XML file
- */
-public class VpnProfileParser {
-    private final static String TAG = "VpnProfileParser";
-    private static Map<Integer, VpnInfo> mVpnPool = new HashMap<Integer, VpnInfo>();
-
-    static DefaultHandler mHandler = new DefaultHandler() {
-        boolean name;
-        boolean type;
-        boolean server;
-        boolean username;
-        boolean password;
-        boolean dnsServers;
-        boolean searchDomains;
-        boolean routes;
-        boolean mppe;
-        boolean l2tpSecret;
-        boolean ipsecIdentifier;
-        boolean ipsecSecret;
-        boolean ipsecUserCert;
-        boolean ipsecCaCert;
-        boolean ipsecServerCert;
-        boolean certFile;
-        boolean certFilePassword;
-        VpnProfile profile = null;
-        VpnInfo vpnInfo = null;
-
-
-        @Override
-        public void startElement(String uri, String localName, String tagName,
-                Attributes attributes) throws SAXException {
-            if (tagName.equalsIgnoreCase("vpn")) {
-                //create a new VPN profile
-                profile = new VpnProfile(Long.toHexString(System.currentTimeMillis()));
-                vpnInfo = new VpnInfo(profile);
-            }
-            if (tagName.equalsIgnoreCase("name")) {
-                name = true;
-            }
-            if (tagName.equalsIgnoreCase("type")) {
-                type = true;
-            }
-            if (tagName.equalsIgnoreCase("server")) {
-                server = true;
-            }
-            if (tagName.equalsIgnoreCase("username")) {
-                username = true;
-            }
-            if (tagName.equalsIgnoreCase("password")) {
-                password = true;
-            }
-            if (tagName.equalsIgnoreCase("dnsServers")) {
-                dnsServers = true;
-            }
-            if (tagName.equalsIgnoreCase("searchDomains")) {
-                searchDomains = true;
-            }
-            if (tagName.equalsIgnoreCase("mppe")) {
-                mppe = true;
-            }
-            if (tagName.equalsIgnoreCase("l2tpSecret")) {
-                l2tpSecret = true;
-            }
-            if (tagName.equalsIgnoreCase("ipsecIdentifier")) {
-                ipsecIdentifier = true;
-            }
-            if (tagName.equalsIgnoreCase("ipsecSecret")) {
-                ipsecSecret = true;
-            }
-            if (tagName.equalsIgnoreCase("ipsecUserCert")) {
-                ipsecUserCert = true;
-            }
-            if (tagName.equalsIgnoreCase("ipsecCaCert")) {
-                ipsecCaCert = true;
-            }
-            if (tagName.equalsIgnoreCase("ipsecServerCert")) {
-                ipsecServerCert = true;
-            }
-            if (tagName.equalsIgnoreCase("routes")) {
-                routes = true;
-            }
-            if (tagName.equalsIgnoreCase("cert-file")) {
-                certFile = true;
-            }
-            if (tagName.equalsIgnoreCase("cert-file-password")) {
-                certFilePassword = true;
-            }
-        }
-
-        @Override
-        public void endElement(String uri, String localName, String tagName) throws SAXException {
-            if (tagName.equalsIgnoreCase("vpn")) {
-                mVpnPool.put(profile.type, vpnInfo);
-            }
-        }
-
-        @Override
-        public void characters(char ch[], int start, int length) throws SAXException {
-            String strValue = new String(ch, start, length);
-            if (name) {
-                profile.name = strValue;
-                name = false;
-            }
-            if (type) {
-                int t = getVpnProfileType(strValue);
-                if (t < 0) {
-                    throw new SAXException("not a valid VPN type");
-                } else {
-                    profile.type = t;
-                }
-                type = false;
-            }
-            if (server) {
-                profile.server = strValue;
-                server = false;
-            }
-            if (username) {
-                profile.username = strValue;
-                username = false;
-            }
-            if (password) {
-                profile.password = strValue;
-                password = false;
-            }
-            if (dnsServers) {
-                profile.dnsServers = strValue;
-                dnsServers = false;
-            }
-            if (searchDomains) {
-                profile.searchDomains = strValue;
-                searchDomains = false;
-            }
-            if (mppe) {
-                profile.mppe = Boolean.valueOf(strValue);
-                mppe = false;
-            }
-            if (l2tpSecret) {
-                profile.l2tpSecret = strValue;
-                l2tpSecret = false;
-            }
-            if (ipsecIdentifier) {
-                profile.ipsecIdentifier = strValue;
-                ipsecIdentifier = false;
-            }
-            if (ipsecSecret) {
-                profile.ipsecSecret = strValue;
-                ipsecSecret = false;
-            }
-            if (ipsecUserCert) {
-                profile.ipsecUserCert = strValue;
-                ipsecUserCert = false;
-            }
-            if (ipsecCaCert) {
-                profile.ipsecCaCert = strValue;
-                ipsecCaCert = false;
-            }
-            if (ipsecServerCert) {
-                profile.ipsecServerCert = strValue;
-                ipsecServerCert = false;
-            }
-            if (routes) {
-                profile.routes = strValue;
-                routes = false;
-            }
-            if (certFile) {
-                vpnInfo.setCertificateFile(strValue);
-                certFile = false;
-            }
-            if (certFilePassword) {
-                vpnInfo.setPassword(strValue);
-                certFilePassword = false;
-            }
-        }
-
-        private int getVpnProfileType(String type) {
-            if (type.equalsIgnoreCase("TYPE_PPTP")) {
-                return VpnProfile.TYPE_PPTP;
-            } else if (type.equalsIgnoreCase("TYPE_L2TP_IPSEC_PSK")) {
-                return VpnProfile.TYPE_L2TP_IPSEC_PSK;
-            } else if (type.equalsIgnoreCase("TYPE_L2TP_IPSEC_RSA")) {
-                return VpnProfile.TYPE_L2TP_IPSEC_RSA;
-            } else if (type.equalsIgnoreCase("TYPE_IPSEC_XAUTH_PSK")) {
-                return VpnProfile.TYPE_IPSEC_XAUTH_PSK;
-            } else if (type.equalsIgnoreCase("TYPE_IPSEC_XAUTH_RSA")) {
-                return VpnProfile.TYPE_IPSEC_XAUTH_RSA;
-            } else if (type.equalsIgnoreCase("TYPE_IPSEC_HYBRID_RSA")) {
-                return VpnProfile.TYPE_IPSEC_HYBRID_RSA;
-            } else {
-                Log.v(TAG, "Invalid VPN type: " + type);
-                return -1;
-            }
-        }
-    };
-
-    public static Map<Integer, VpnInfo> parse(InputStream in) {
-        try {
-            SAXParserFactory factory = SAXParserFactory.newInstance();
-            SAXParser saxParser = factory.newSAXParser();
-            saxParser.parse(in, mHandler);
-        } catch (SAXException e) {
-            Log.e(TAG, "Parse vpn profile exception: " + e.toString());
-        } catch (IOException e) {
-            Log.e(TAG, "Parse vpn profile exception: " + e.toString());
-        } catch (ParserConfigurationException e) {
-            Log.e(TAG, "Parse vpn profile exception: " + e.toString());
-        } finally {
-            return mVpnPool;
-        }
-    }
-}
diff --git a/tests/app/src/com/android/settings/vpn2/VpnTests.java b/tests/app/src/com/android/settings/vpn2/VpnTests.java
deleted file mode 100644
index 11e8265..0000000
--- a/tests/app/src/com/android/settings/vpn2/VpnTests.java
+++ /dev/null
@@ -1,446 +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.vpn2;
-
-import android.content.Context;
-import android.net.IConnectivityManager;
-import android.os.Bundle;
-import android.os.Environment;
-import android.os.RemoteException;
-import android.os.ServiceManager;
-import android.os.UserHandle;
-import android.security.Credentials;
-import android.security.KeyStore;
-import android.security.NetworkSecurityPolicy;
-import android.test.InstrumentationTestCase;
-import android.test.InstrumentationTestRunner;
-import android.test.suitebuilder.annotation.LargeTest;
-import android.util.Log;
-
-import com.android.internal.net.LegacyVpnInfo;
-import com.android.internal.net.VpnConfig;
-import com.android.internal.net.VpnProfile;
-
-import java.net.HttpURLConnection;
-import java.net.URL;
-import junit.framework.Assert;
-
-import libcore.io.Streams;
-import org.json.JSONException;
-import org.json.JSONObject;
-
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.net.UnknownHostException;
-import java.nio.charset.StandardCharsets;
-import java.util.List;
-import java.util.Map;
-
-/**
- * Legacy VPN connection tests
- *
- * To run the test, use command:
- * adb shell am instrument -e class com.android.settings.vpn2.VpnTests -e profile foo.xml
- * -w com.android.settings.tests/android.test.InstrumentationTestRunner
- *
- * VPN profiles are saved in an xml file and will be loaded through {@link VpnProfileParser}.
- * Push the profile (foo.xml) to the external storage, e.g adb push foo.xml /sdcard/ before running
- * the above command.
- *
- * A typical profile looks like the following:
- * <vpn>
- *   <name></name>
- *   <type></type>
- *   <server></server>
- *   <username></username>
- *   <password></password>
- *   <dnsServers></dnsServers>
- *   <searchDomains></searchDomains>
- *   <routes></routes>
- *   <l2tpSecret></l2tpSecret>
- *   <ipsecIdentifier></ipsecIdentifier>
- *   <ipsecSecret></ipsecSecret>
- *   <ipsecUserCert></ipsecUserCert>
- *   <ipsecCaCert></ipsecCaCert>
- *   <ipsecServerCert></ipsecServerCert>
- * </vpn>
- * VPN types include: TYPE_PPTP, TYPE_L2TP_IPSEC_PSK, TYPE_L2TP_IPSEC_RSA,
- * TYPE_IPSEC_XAUTH_PSK, TYPE_IPSEC_XAUTH_RSA, TYPE_IPSEC_HYBRID_RSA
- */
-public class VpnTests extends InstrumentationTestCase {
-    private static final String TAG = "VpnTests";
-    /* Maximum time to wait for VPN connection */
-    private static final long MAX_CONNECTION_TIME = 5 * 60 * 1000;
-    private static final long VPN_STAY_TIME = 60 * 1000;
-    private static final int MAX_DISCONNECTION_TRIES = 3;
-    private static final String EXTERNAL_SERVER =
-            "http://ip2country.sourceforge.net/ip2c.php?format=JSON";
-    private static final String VPN_INTERFACE = "ppp0";
-    private final IConnectivityManager mService = IConnectivityManager.Stub
-        .asInterface(ServiceManager.getService(Context.CONNECTIVITY_SERVICE));
-    private Map<Integer, VpnInfo> mVpnInfoPool = null;
-    private Context mContext;
-    private CertInstallerHelper mCertHelper = null;
-    private KeyStore mKeyStore = KeyStore.getInstance();
-    private String mPreviousIpAddress = null;
-    private boolean DEBUG = false;
-
-    @Override
-    protected void setUp() throws Exception {
-        super.setUp();
-        InputStream in = null;
-        InstrumentationTestRunner mRunner = (InstrumentationTestRunner)getInstrumentation();
-        mContext = mRunner.getContext();
-        Bundle arguments = mRunner.getArguments();
-        String PROFILE_NAME = arguments.getString("profile");
-        Assert.assertNotNull("Push profile to external storage and load with"
-                + "'-e profile <filename>'", PROFILE_NAME);
-        File profileFile = new File(Environment.getExternalStorageDirectory(), PROFILE_NAME);
-        in = new FileInputStream(profileFile);
-        mVpnInfoPool = VpnProfileParser.parse(in);
-        Assert.assertNotNull("no VPN profiles are parsed", mVpnInfoPool);
-        if (DEBUG) {
-            Log.v(TAG, "print out the vpn profiles");
-            for (Map.Entry<Integer, VpnInfo> profileEntrySet: mVpnInfoPool.entrySet()) {
-                VpnInfo vpnInfo = profileEntrySet.getValue();
-                printVpnProfile(vpnInfo.getVpnProfile());
-                if (vpnInfo.getCertificateFile() != null) {
-                    Log.d(TAG, "certificate file for this vpn is " + vpnInfo.getCertificateFile());
-                }
-                if (vpnInfo.getPassword() != null) {
-                    Log.d(TAG, "password for the certificate file is: " + vpnInfo.getPassword());
-                }
-            }
-        }
-        // disconnect existing vpn if there is any
-        LegacyVpnInfo oldVpn = mService.getLegacyVpnInfo(UserHandle.myUserId());
-        if (oldVpn != null) {
-            Log.v(TAG, "disconnect legacy VPN");
-            disconnect();
-            // wait till the legacy VPN is disconnected.
-            int tries = 0;
-            while (tries < MAX_DISCONNECTION_TRIES &&
-                    mService.getLegacyVpnInfo(UserHandle.myUserId()) != null) {
-                tries++;
-                Thread.sleep(10 * 1000);
-                Log.v(TAG, "Wait for legacy VPN to be disconnected.");
-            }
-            Assert.assertNull("Failed to disconect VPN",
-                    mService.getLegacyVpnInfo(UserHandle.myUserId()));
-            // wait for 30 seconds after the previous VPN is disconnected.
-            sleep(30 * 1000);
-        }
-        // Create CertInstallerHelper to initialize the keystore
-        mCertHelper = new CertInstallerHelper();
-    }
-
-    @Override
-    protected void tearDown() throws Exception {
-        sleep(VPN_STAY_TIME);
-        super.tearDown();
-    }
-
-    private void printVpnProfile(VpnProfile profile) {
-        Log.v(TAG, "profile: ");
-        Log.v(TAG, "key: " + profile.key);
-        Log.v(TAG, "name: " + profile.name);
-        Log.v(TAG, "type: " + profile.type);
-        Log.v(TAG, "server: " + profile.server);
-        Log.v(TAG, "username: " + profile.username);
-        Log.v(TAG, "password: " + profile.password);
-        Log.v(TAG, "dnsServers: " + profile.dnsServers);
-        Log.v(TAG, "searchDomains: " + profile.searchDomains);
-        Log.v(TAG, "routes: " + profile.routes);
-        Log.v(TAG, "mppe: " + profile.mppe);
-        Log.v(TAG, "l2tpSecret: " + profile.l2tpSecret);
-        Log.v(TAG, "ipsecIdentifier: " + profile.ipsecIdentifier);
-        Log.v(TAG, "ipsecSecret: " + profile.ipsecSecret);
-        Log.v(TAG, "ipsecUserCert: " + profile.ipsecUserCert);
-        Log.v(TAG, "ipsecCaCert: " + profile.ipsecCaCert);
-        Log.v(TAG, "ipsecServerCert: " + profile.ipsecServerCert);
-    }
-
-    private void printKeyStore(VpnProfile profile) {
-        // print out the information from keystore
-        String privateKey = "";
-        String userCert = "";
-        String caCert = "";
-        String serverCert = "";
-        if (!profile.ipsecUserCert.isEmpty()) {
-            privateKey = Credentials.USER_PRIVATE_KEY + profile.ipsecUserCert;
-            byte[] value = mKeyStore.get(Credentials.USER_CERTIFICATE + profile.ipsecUserCert);
-            userCert = (value == null) ? null : new String(value, StandardCharsets.UTF_8);
-        }
-        if (!profile.ipsecCaCert.isEmpty()) {
-            byte[] value = mKeyStore.get(Credentials.CA_CERTIFICATE + profile.ipsecCaCert);
-            caCert = (value == null) ? null : new String(value, StandardCharsets.UTF_8);
-        }
-        if (!profile.ipsecServerCert.isEmpty()) {
-            byte[] value = mKeyStore.get(Credentials.USER_CERTIFICATE + profile.ipsecServerCert);
-            serverCert = (value == null) ? null : new String(value, StandardCharsets.UTF_8);
-        }
-        Log.v(TAG, "privateKey: \n" + ((privateKey == null) ? "" : privateKey));
-        Log.v(TAG, "userCert: \n" + ((userCert == null) ? "" : userCert));
-        Log.v(TAG, "caCert: \n" + ((caCert == null) ? "" : caCert));
-        Log.v(TAG, "serverCert: \n" + ((serverCert == null) ? "" : serverCert));
-    }
-
-    /**
-     * Connect legacy VPN
-     */
-    private void connect(VpnProfile profile) throws Exception {
-        try {
-            mService.startLegacyVpn(profile);
-        } catch (IllegalStateException e) {
-            fail(String.format("start legacy vpn: %s failed: %s", profile.name, e.toString()));
-        }
-    }
-
-    /**
-     * Disconnect legacy VPN
-     */
-    private void disconnect() throws Exception {
-        try {
-            mService.prepareVpn(VpnConfig.LEGACY_VPN, VpnConfig.LEGACY_VPN, UserHandle.myUserId());
-        } catch (RemoteException e) {
-            Log.e(TAG, String.format("disconnect VPN exception: %s", e.toString()));
-        }
-    }
-
-    /**
-     * Get external IP address
-     */
-    private String getIpAddress() {
-        String ip = null;
-        HttpURLConnection urlConnection = null;
-        // TODO: Rewrite this test to use an HTTPS URL.
-        // Because this test uses cleartext HTTP, the network security policy of this app needs to
-        // be temporarily relaxed to permit such traffic.
-        NetworkSecurityPolicy networkSecurityPolicy = NetworkSecurityPolicy.getInstance();
-        boolean cleartextTrafficPermittedBeforeTest =
-                networkSecurityPolicy.isCleartextTrafficPermitted();
-        networkSecurityPolicy.setCleartextTrafficPermitted(true);
-        try {
-            URL url = new URL(EXTERNAL_SERVER);
-            urlConnection = (HttpURLConnection) url.openConnection();
-            Log.i(TAG, "Response from httpget: " + urlConnection.getResponseCode());
-
-            InputStream is = urlConnection.getInputStream();
-            String response;
-            try {
-                response = new String(Streams.readFully(is), StandardCharsets.UTF_8);
-            } finally {
-                is.close();
-            }
-
-            JSONObject json_data = new JSONObject(response);
-            ip = json_data.getString("ip");
-            Log.v(TAG, "json_data: " + ip);
-        } catch (IllegalArgumentException e) {
-            Log.e(TAG, "exception while getting external IP: " + e.toString());
-        } catch (IOException e) {
-            Log.e(TAG, "IOException while getting IP: " + e.toString());
-        } catch (JSONException e) {
-            Log.e(TAG, "exception while creating JSONObject: " + e.toString());
-        } finally {
-            networkSecurityPolicy.setCleartextTrafficPermitted(cleartextTrafficPermittedBeforeTest);
-            if (urlConnection != null) {
-                urlConnection.disconnect();
-            }
-        }
-        return ip;
-    }
-
-    /**
-     * Verify the vpn connection by checking the VPN state and external IP
-     */
-    private void validateVpnConnection(VpnProfile profile) throws Exception {
-        validateVpnConnection(profile, false);
-    }
-
-    /**
-     * Verify the vpn connection by checking the VPN state, external IP or ping test
-     */
-    private void validateVpnConnection(VpnProfile profile, boolean pingTestFlag) throws Exception {
-        LegacyVpnInfo legacyVpnInfo = mService.getLegacyVpnInfo(UserHandle.myUserId());
-        Assert.assertTrue(legacyVpnInfo != null);
-
-        long start = System.currentTimeMillis();
-        while (((System.currentTimeMillis() - start)  < MAX_CONNECTION_TIME) &&
-                (legacyVpnInfo.state != LegacyVpnInfo.STATE_CONNECTED)) {
-            Log.v(TAG, "vpn state: " + legacyVpnInfo.state);
-            sleep(10 * 1000);
-            legacyVpnInfo = mService.getLegacyVpnInfo(UserHandle.myUserId());
-        }
-
-        // the vpn state should be CONNECTED
-        Assert.assertTrue(legacyVpnInfo.state == LegacyVpnInfo.STATE_CONNECTED);
-        if (pingTestFlag) {
-            Assert.assertTrue(pingTest(profile.server));
-        } else {
-            String curIpAddress = getIpAddress();
-            // the outgoing IP address should be the same as the VPN server address
-            Assert.assertEquals(profile.server, curIpAddress);
-        }
-    }
-
-    private boolean pingTest(String server) {
-        final long PING_TIMER = 3 * 60 * 1000; // 3 minutes
-        if (server == null || server.isEmpty()) {
-            return false;
-        }
-        long startTime = System.currentTimeMillis();
-        while ((System.currentTimeMillis() - startTime) < PING_TIMER) {
-            try {
-                Log.v(TAG, "Start ping test, ping " + server);
-                Process p = Runtime.getRuntime().exec("ping -c 10 -w 100 " + server);
-                int status = p.waitFor();
-                if (status == 0) {
-                    // if any of the ping test is successful, return true
-                    return true;
-                }
-            } catch (UnknownHostException e) {
-                Log.e(TAG, "Ping test Fail: Unknown Host");
-            } catch (IOException e) {
-                Log.e(TAG, "Ping test Fail:  IOException");
-            } catch (InterruptedException e) {
-                Log.e(TAG, "Ping test Fail: InterruptedException");
-            }
-        }
-        // ping test timeout
-        return false;
-    }
-
-    /**
-     * Install certificates from a file loaded in external stroage on the device
-     * @param profile vpn profile
-     * @param fileName certificate file name
-     * @param password password to extract certificate file
-     */
-    private void installCertificatesFromFile(VpnProfile profile, String fileName, String password)
-            throws Exception {
-        if (profile == null || fileName == null || password == null) {
-            throw new Exception ("vpn profile, certificate file name and password can not be null");
-        }
-
-        int curUid = mContext.getUserId();
-        mCertHelper.installCertificate(profile, fileName, password);
-
-        if (DEBUG) {
-            printKeyStore(profile);
-        }
-    }
-
-    private void sleep(long time) {
-        try {
-            Thread.sleep(time);
-        } catch (InterruptedException e) {
-            Log.e(TAG, "interrupted: " + e.toString());
-        }
-    }
-
-    /**
-     * Test PPTP VPN connection
-     */
-    @LargeTest
-    public void testPPTPConnection() throws Exception {
-        mPreviousIpAddress = getIpAddress();
-        VpnInfo curVpnInfo = mVpnInfoPool.get(VpnProfile.TYPE_PPTP);
-        VpnProfile vpnProfile = curVpnInfo.getVpnProfile();
-        connect(vpnProfile);
-        validateVpnConnection(vpnProfile);
-    }
-
-    /**
-     * Test L2TP/IPSec PSK VPN connection
-     */
-    @LargeTest
-    public void testL2tpIpsecPskConnection() throws Exception {
-        mPreviousIpAddress = getIpAddress();
-        VpnInfo curVpnInfo = mVpnInfoPool.get(VpnProfile.TYPE_L2TP_IPSEC_PSK);
-        VpnProfile vpnProfile = curVpnInfo.getVpnProfile();
-        connect(vpnProfile);
-        validateVpnConnection(vpnProfile);
-    }
-
-    /**
-     * Test L2TP/IPSec RSA VPN connection
-     */
-    @LargeTest
-    public void testL2tpIpsecRsaConnection() throws Exception {
-        mPreviousIpAddress = getIpAddress();
-        VpnInfo curVpnInfo = mVpnInfoPool.get(VpnProfile.TYPE_L2TP_IPSEC_RSA);
-        VpnProfile vpnProfile = curVpnInfo.getVpnProfile();
-        if (DEBUG) {
-            printVpnProfile(vpnProfile);
-        }
-        String certFile = curVpnInfo.getCertificateFile();
-        String password = curVpnInfo.getPassword();
-        installCertificatesFromFile(vpnProfile, certFile, password);
-        connect(vpnProfile);
-        validateVpnConnection(vpnProfile);
-    }
-
-    /**
-     * Test IPSec Xauth RSA VPN connection
-     */
-    @LargeTest
-    public void testIpsecXauthRsaConnection() throws Exception {
-        mPreviousIpAddress = getIpAddress();
-        VpnInfo curVpnInfo = mVpnInfoPool.get(VpnProfile.TYPE_IPSEC_XAUTH_RSA);
-        VpnProfile vpnProfile = curVpnInfo.getVpnProfile();
-        if (DEBUG) {
-            printVpnProfile(vpnProfile);
-        }
-        String certFile = curVpnInfo.getCertificateFile();
-        String password = curVpnInfo.getPassword();
-        installCertificatesFromFile(vpnProfile, certFile, password);
-        connect(vpnProfile);
-        validateVpnConnection(vpnProfile);
-    }
-
-    /**
-     * Test IPSec Xauth PSK VPN connection
-     */
-    @LargeTest
-    public void testIpsecXauthPskConnection() throws Exception {
-        VpnInfo curVpnInfo = mVpnInfoPool.get(VpnProfile.TYPE_IPSEC_XAUTH_PSK);
-        VpnProfile vpnProfile = curVpnInfo.getVpnProfile();
-        if (DEBUG) {
-            printVpnProfile(vpnProfile);
-        }
-        connect(vpnProfile);
-        validateVpnConnection(vpnProfile, true);
-    }
-
-    /**
-     * Test IPSec Hybrid RSA VPN connection
-     */
-    @LargeTest
-    public void testIpsecHybridRsaConnection() throws Exception {
-        mPreviousIpAddress = getIpAddress();
-        VpnInfo curVpnInfo = mVpnInfoPool.get(VpnProfile.TYPE_IPSEC_HYBRID_RSA);
-        VpnProfile vpnProfile = curVpnInfo.getVpnProfile();
-        if (DEBUG) {
-            printVpnProfile(vpnProfile);
-        }
-        connect(vpnProfile);
-        validateVpnConnection(vpnProfile);
-    }
-}
diff --git a/tests/robotests/Android.mk b/tests/robotests/Android.mk
index ae0102f..97e5e04 100644
--- a/tests/robotests/Android.mk
+++ b/tests/robotests/Android.mk
@@ -9,12 +9,12 @@
 # Include the testing libraries (JUnit4 + Robolectric libs).
 LOCAL_STATIC_JAVA_LIBRARIES := \
     mockito-robolectric-prebuilt \
+    platform-robolectric-android-all-stubs \
     truth-prebuilt
 
 LOCAL_JAVA_LIBRARIES := \
     junit \
-    platform-robolectric-prebuilt \
-    sdk_vcurrent \
+    platform-robolectric-3.4.2-prebuilt \
     telephony-common
 
 LOCAL_INSTRUMENTATION_FOR := Settings
@@ -40,4 +40,6 @@
 
 LOCAL_INSTRUMENT_SOURCE_DIRS := $(dir $(LOCAL_PATH))../src
 
-include prebuilts/misc/common/robolectric/run_robotests.mk
\ No newline at end of file
+LOCAL_ROBOTEST_TIMEOUT := 36000
+
+include prebuilts/misc/common/robolectric/3.4.2/run_robotests.mk
diff --git a/tests/robotests/assets/grandfather_not_implementing_index_provider b/tests/robotests/assets/grandfather_not_implementing_index_provider
index 4623889..4d5b256 100644
--- a/tests/robotests/assets/grandfather_not_implementing_index_provider
+++ b/tests/robotests/assets/grandfather_not_implementing_index_provider
@@ -1,10 +1,17 @@
+com.android.settings.applications.AppInfoDashboardFragment
 com.android.settings.bluetooth.DevicePickerFragment
 com.android.settings.bluetooth.BluetoothDeviceDetailsFragment
 com.android.settings.bluetooth.BluetoothPairingDetail
 com.android.settings.accounts.AccountDetailDashboardFragment
 com.android.settings.fuelgauge.PowerUsageAnomalyDetails
 com.android.settings.fuelgauge.AdvancedPowerUsageDetail
+com.android.settings.development.featureflags.FeatureFlagsDashboard
+com.android.settings.development.qstile.DevelopmentTileConfigFragment
 com.android.settings.deviceinfo.StorageProfileFragment
+com.android.settings.notification.ChannelNotificationSettings
+com.android.settings.notification.ChannelImportanceSettings
+com.android.settings.notification.ChannelGroupNotificationSettings
+com.android.settings.notification.AppNotificationSettings
 com.android.settings.wifi.details.WifiNetworkDetailsFragment
 com.android.settings.wifi.p2p.WifiP2pSettings
 com.android.settings.enterprise.ApplicationListFragment$AdminGrantedPermissionCamera
@@ -13,3 +20,6 @@
 com.android.settings.enterprise.ApplicationListFragment$EnterpriseInstalledPackages
 com.android.settings.enterprise.EnterpriseSetDefaultAppsListFragment
 com.android.settings.wifi.tether.WifiTetherSettings
+com.android.settings.wifi.SavedAccessPointsWifiSettings
+com.android.settings.notification.ZenModeEventRuleSettings
+com.android.settings.notification.ZenModeScheduleRuleSettings
diff --git a/tests/robotests/assets/grandfather_not_implementing_indexable b/tests/robotests/assets/grandfather_not_implementing_indexable
index 1a978cd..245d321 100644
--- a/tests/robotests/assets/grandfather_not_implementing_indexable
+++ b/tests/robotests/assets/grandfather_not_implementing_indexable
@@ -1,19 +1,14 @@
-com.android.settings.location.LocationMode
-com.android.settings.notification.ZenModePrioritySettings
-com.android.settings.notification.ZenModeVisualInterruptionSettings
 com.android.settings.accessibility.ToggleScreenMagnificationPreferenceFragment
 com.android.settings.deviceinfo.SimStatus
 com.android.settings.deviceinfo.PrivateVolumeForget
 com.android.settings.inputmethod.SpellCheckersSettings
 com.android.settings.inputmethod.KeyboardLayoutPickerFragment
-com.android.settings.notification.ZenModeEventRuleSettings
 com.android.settings.fuelgauge.InactiveApps
 com.android.settings.accessibility.CaptionPropertiesFragment
 com.android.settings.accessibility.AccessibilitySettingsForSetupWizard
 com.android.settings.deviceinfo.ImeiInformation
 com.android.settings.datausage.DataUsageList
 com.android.settings.vpn2.AppManagementFragment
-com.android.settings.display.NightDisplaySettings
 com.android.settings.vpn2.VpnSettings
 com.android.settings.fingerprint.FingerprintSettings$FingerprintSettingsFragment
 com.android.settings.applications.ProcessStatsDetail
@@ -21,24 +16,18 @@
 com.android.settings.applications.VrListenerSettings
 com.android.settings.inputmethod.UserDictionaryList
 com.android.settings.datausage.DataSaverSummary
-com.android.settings.notification.ChannelNotificationSettings
 com.android.settings.datausage.AppDataUsage
 com.android.settings.datausage.DataPlanUsageSummary
 com.android.settings.accessibility.FontSizePreferenceFragmentForSetupWizard
 com.android.settings.applications.ManageDomainUrls
 com.android.settings.applications.WriteSettingsDetails
-com.android.settings.location.LocationSettings
 com.android.settings.applications.ProcessStatsSummary
 com.android.settings.users.RestrictedProfileSettings
 com.android.settings.accounts.ChooseAccountActivity
 com.android.settings.accounts.ManagedProfileSettings
 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.notification.ZenModeScheduleRuleSettings
 com.android.settings.datausage.BillingCycleSettings
 com.android.settings.notification.NotificationStation
 com.android.settings.print.PrintJobSettingsFragment
@@ -59,8 +48,6 @@
 com.android.settings.applications.InstalledAppDetails
 com.android.settings.accessibility.ToggleAccessibilityServicePreferenceFragment
 com.android.settings.print.PrintServiceSettingsFragment
-com.android.settings.wfd.WifiDisplaySettings
-com.android.settings.notification.AppNotificationSettings
 com.android.settings.deviceinfo.PrivateVolumeSettings
 com.android.settings.users.AppRestrictionsFragment
 com.android.settings.deviceinfo.PrivateVolumeUnmount
@@ -70,24 +57,21 @@
 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.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.WifiCallingSettingsForSub
 com.android.settings.password.SetupChooseLockGeneric$SetupChooseLockGenericFragment
 com.android.settings.SetupRedactionInterstitial$SetupRedactionInterstitialFragment
-com.android.settings.TrustAgentSettings
+com.android.settings.security.trustagent.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
+com.android.settings.TestingSettings
\ No newline at end of file
diff --git a/tests/robotests/assets/grandfather_not_implementing_instrumentable b/tests/robotests/assets/grandfather_not_implementing_instrumentable
index 64b5c83..54f906d 100644
--- a/tests/robotests/assets/grandfather_not_implementing_instrumentable
+++ b/tests/robotests/assets/grandfather_not_implementing_instrumentable
@@ -1,5 +1,5 @@
 com.android.settings.deletionhelper.ActivationWarningFragment
-com.android.settings.applications.AppOpsCategory
+com.android.settings.applications.appops.AppOpsCategory
 com.android.settings.inputmethod.UserDictionaryLocalePicker
 com.android.settings.CustomListPreference$CustomListPreferenceDialogFragment
 com.android.settings.password.ChooseLockPassword$SaveAndFinishWorker
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 948b14a..9fd41f2 100644
--- a/tests/robotests/assets/grandfather_not_in_search_index_provider_registry
+++ b/tests/robotests/assets/grandfather_not_in_search_index_provider_registry
@@ -1 +1,3 @@
 com.android.settings.display.ScreenZoomPreferenceFragmentForSetupWizard
+com.android.settings.search.indexing.FakeSettingsFragment
+com.android.settings.deviceinfo.Status
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 b329072..a71b040 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 +1 @@
-com.android.settings.fuelgauge.PowerUsageSummary
+com.android.settings.fuelgauge.PowerUsageSummary
\ No newline at end of file
diff --git a/tests/robotests/assets/whitelist_duplicate_index_key b/tests/robotests/assets/whitelist_duplicate_index_key
deleted file mode 100644
index a761f35..0000000
--- a/tests/robotests/assets/whitelist_duplicate_index_key
+++ /dev/null
@@ -1,5 +0,0 @@
-add_users_when_locked
-additional_system_update_settings
-dashboard_tile_placeholder
-screen_zoom
-usage_access
diff --git a/tests/robotests/res/values-mcc999/config.xml b/tests/robotests/res/values-mcc999/config.xml
new file mode 100644
index 0000000..4113c90
--- /dev/null
+++ b/tests/robotests/res/values-mcc999/config.xml
@@ -0,0 +1,23 @@
+<!--
+  Copyright (C) 2017 The Android Open Source Project
+
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT 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>
+    <bool name="config_tintSettingIcon">false</bool>
+    <bool name="config_enableColorTemperature">false</bool>
+    <bool name="config_show_camera_laser_sensor">false</bool>
+    <bool name="config_show_connectivity_monitor">false</bool>
+    <bool name="config_display_recent_apps">false</bool>
+</resources>
\ No newline at end of file
diff --git a/tests/robotests/res/values/config.xml b/tests/robotests/res/values/config.xml
index 156e20a..4004106 100644
--- a/tests/robotests/res/values/config.xml
+++ b/tests/robotests/res/values/config.xml
@@ -17,4 +17,8 @@
 <resources>
     <!-- Whether or not new device intro suggestion is supported for this device -->
     <bool name="config_new_device_intro_suggestion_supported">true</bool>
+    <bool name="config_enableColorTemperature">true</bool>
+    <bool name="config_show_camera_laser_sensor">true</bool>
+    <bool name="config_show_connectivity_monitor">true</bool>
+    <bool name="config_display_recent_apps">true</bool>
 </resources>
\ No newline at end of file
diff --git a/tests/robotests/res/values/themes.xml b/tests/robotests/res/values/themes.xml
index b91df65..74bdd9b 100644
--- a/tests/robotests/res/values/themes.xml
+++ b/tests/robotests/res/values/themes.xml
@@ -1,3 +1,7 @@
 <resources>
-    <style name="Theme.Settings" parent="@android:style/Theme.DeviceDefault.Settings"/>
+    <style name="Theme.Settings" parent="@android:style/Theme.DeviceDefault.Settings" />
+
+    <!-- Override the main app's style for ActionPrimaryButton to get around lack of new style
+         support in robolectric  -->
+    <style name="ActionPrimaryButton" parent="android:Widget.DeviceDefault.Button" />
 </resources>
diff --git a/tests/robotests/res/xml-mcc999/about_legal.xml b/tests/robotests/res/xml-mcc999/about_legal.xml
new file mode 100644
index 0000000..53a2b89
--- /dev/null
+++ b/tests/robotests/res/xml-mcc999/about_legal.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.
+
+  -->
+
+<!--
+    WARNING: This resource file is used to test Settings Search indexing.
+    If you change something in here, please run the settings robotests and
+    make sure they still pass.
+ -->
+
+<PreferenceScreen
+        xmlns:android="http://schemas.android.com/apk/res/android"
+        xmlns:settings="http://schemas.android.com/apk/res/com.android.settings"
+        android:title="bears_bears_bears"
+        settings:keywords="keywords">
+
+    <Preference
+            android:key="pref_key_1"
+            android:title="bears_bears_bears"/>
+</PreferenceScreen>
\ No newline at end of file
diff --git a/tests/robotests/res/xml-mcc999/display_settings.xml b/tests/robotests/res/xml-mcc999/display_settings.xml
new file mode 100644
index 0000000..8c5d47a
--- /dev/null
+++ b/tests/robotests/res/xml-mcc999/display_settings.xml
@@ -0,0 +1,63 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  Copyright (C) 2017 The Android Open Source Project
+
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+  -->
+
+<!--
+    WARNING: This resource file is used to test Settings Search indexing.
+    If you change something in here, please run the settings robotests and
+    make sure they still pass.
+ -->
+
+<PreferenceScreen
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:settings="http://schemas.android.com/apk/res/com.android.settings"
+    android:title="page_title"
+    settings:keywords="keywords">
+
+    <Preference
+        android:key="pref_key_1"
+        android:title="pref_title_1"
+        android:summary="summary_1"
+        settings:keywords="keywords1, keywords2, keywords3" />
+
+    <SwitchPreference
+        android:key="pref_key_2"
+        android:title="pref_title_2"
+        android:summary="summary_2"
+        settings:keywords="keywords1, keywords2, keywords3" />
+
+    <Preference
+        android:key="pref_key_3"
+        android:title="pref_title_3"
+        android:summary="summary_3"
+        android:icon="@drawable/ic_android"
+        settings:keywords="keywords1, keywords2, keywords3" />
+
+    <ListPreference
+        android:key="pref_key_4"
+        android:title="pref_title_4"
+        android:summary="summary_4"
+        android:entries="@array/app_install_location_entries"
+        android:entryValues="@array/app_install_location_values"
+        settings:keywords="keywords1, keywords2, keywords3" />
+
+    <CheckBoxPreference
+            android:key="pref_key_5"
+            android:title="pref_title_5"
+            android:summaryOn="summary_on"
+            android:summaryOff="summary_off"
+            settings:keywords="keywords1, keywords2, keywords3" />
+</PreferenceScreen>
\ No newline at end of file
diff --git a/tests/robotests/src/android/bluetooth/BluetoothCodecConfig.java b/tests/robotests/src/android/bluetooth/BluetoothCodecConfig.java
index 40b76df..ee7bdb0 100644
--- a/tests/robotests/src/android/bluetooth/BluetoothCodecConfig.java
+++ b/tests/robotests/src/android/bluetooth/BluetoothCodecConfig.java
@@ -20,4 +20,35 @@
  * A placeholder class to prevent ClassNotFound exceptions caused by lack of visibility.
  */
 public class BluetoothCodecConfig {
+
+    public static final int SAMPLE_RATE_NONE = 0;
+    public static final int SAMPLE_RATE_48000 = 0x1 << 1;
+    public static final int SOURCE_CODEC_TYPE_INVALID = 1000 * 1000;
+    public static final int SOURCE_CODEC_TYPE_AAC = 1;
+    public static final int CODEC_PRIORITY_DEFAULT = 0;
+    public static final int CODEC_PRIORITY_HIGHEST = 1000 * 1000;
+    public static final int BITS_PER_SAMPLE_NONE = 0;
+    public static final int CHANNEL_MODE_NONE = 0;
+    public static final int BITS_PER_SAMPLE_24 =  0x1 << 1;
+    public static final int CHANNEL_MODE_STEREO = 0x1 << 1;
+
+    public int getSampleRate() {
+        return 0;
+    }
+
+    public int getCodecType() {
+        return 0;
+    }
+
+    public int getBitsPerSample() {
+        return 0;
+    }
+
+    public int getChannelMode() {
+        return 0;
+    }
+
+    public long getCodecSpecific1() {
+        return 0;
+    }
 }
diff --git a/tests/robotests/src/android/net/NetworkBadging.java b/tests/robotests/src/android/net/NetworkBadging.java
deleted file mode 100644
index f2af08b..0000000
--- a/tests/robotests/src/android/net/NetworkBadging.java
+++ /dev/null
@@ -1,49 +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 android.net;
-
-import android.annotation.IntDef;
-import android.annotation.Nullable;
-import android.content.res.Resources;
-import android.graphics.Color;
-import android.graphics.drawable.ColorDrawable;
-import android.graphics.drawable.Drawable;
-
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-
-/**
- * Implementation for {@link android.net.NetworkBadging}.
- *
- * <p>Can be removed once Robolectric supports Android O.
- */
-public class NetworkBadging {
-    @IntDef({BADGING_NONE, BADGING_SD, BADGING_HD, BADGING_4K})
-    @Retention(RetentionPolicy.SOURCE)
-    public @interface Badging {}
-
-    public static final int BADGING_NONE = 0;
-    public static final int BADGING_SD = 10;
-    public static final int BADGING_HD = 20;
-    public static final int BADGING_4K = 30;
-
-    private static Drawable drawable;
-
-    public static Drawable getWifiIcon(
-            int signalLevel, @NetworkBadging.Badging int badging, @Nullable Resources.Theme theme) {
-        return new ColorDrawable(Color.GREEN);
-    }
-}
diff --git a/tests/robotests/src/android/net/wifi/WifiNetworkScoreCache.java b/tests/robotests/src/android/net/wifi/WifiNetworkScoreCache.java
deleted file mode 100644
index 7995e07..0000000
--- a/tests/robotests/src/android/net/wifi/WifiNetworkScoreCache.java
+++ /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.
- */
-package android.net.wifi;
-
-/**
- * Empty class def for {@link android.net.wifi.WifiNetworkScoreCache}.
- *
- * <p>Can be removed once Robolectric supports Android O.
- */
-public class WifiNetworkScoreCache {
-
-}
diff --git a/tests/robotests/src/android/service/settings/suggestions/ISuggestionService.java b/tests/robotests/src/android/service/settings/suggestions/ISuggestionService.java
new file mode 100644
index 0000000..f4f5a51
--- /dev/null
+++ b/tests/robotests/src/android/service/settings/suggestions/ISuggestionService.java
@@ -0,0 +1,23 @@
+/*
+ * Copyright (C) 2017 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES 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.settings.suggestions;
+
+import java.util.List;
+
+public interface ISuggestionService {
+    List<Suggestion> getSuggestions();
+}
diff --git a/tests/robotests/src/android/service/settings/suggestions/Suggestion.java b/tests/robotests/src/android/service/settings/suggestions/Suggestion.java
new file mode 100644
index 0000000..79aeb93
--- /dev/null
+++ b/tests/robotests/src/android/service/settings/suggestions/Suggestion.java
@@ -0,0 +1,146 @@
+/*
+ * Copyright (C) 2017 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES 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.settings.suggestions;
+
+import android.app.PendingIntent;
+import android.graphics.drawable.Icon;
+import android.text.TextUtils;
+
+public class Suggestion {
+
+    public static final int FLAG_HAS_BUTTON = 1 << 0;
+
+    private final String mId;
+    private final CharSequence mTitle;
+    private final CharSequence mSummary;
+    private final Icon mIcon;
+    private final int mFlags;
+    private final PendingIntent mPendingIntent;
+
+    /**
+     * Gets the id for the suggestion object.
+     */
+    public String getId() {
+        return mId;
+    }
+
+    /**
+     * Title of the suggestion that is shown to the user.
+     */
+    public CharSequence getTitle() {
+        return mTitle;
+    }
+
+    /**
+     * Optional summary describing what this suggestion controls.
+     */
+    public CharSequence getSummary() {
+        return mSummary;
+    }
+
+    /**
+     * Optional icon for this suggestion.
+     */
+    public Icon getIcon() {
+        return mIcon;
+    }
+
+    public int getFlags() {
+        return mFlags;
+    }
+
+    /**
+     * The Intent to launch when the suggestion is activated.
+     */
+    public PendingIntent getPendingIntent() {
+        return mPendingIntent;
+    }
+
+    private Suggestion(Builder builder) {
+        mTitle = builder.mTitle;
+        mSummary = builder.mSummary;
+        mIcon = builder.mIcon;
+        mPendingIntent = builder.mPendingIntent;
+        mId = builder.mId;
+        mFlags = builder.mFlags;
+    }
+
+    /**
+     * Builder class for {@link Suggestion}.
+     */
+    public static class Builder {
+
+        private final String mId;
+        private int mFlags;
+        private CharSequence mTitle;
+        private CharSequence mSummary;
+        private Icon mIcon;
+        private PendingIntent mPendingIntent;
+
+        public Builder(String id) {
+            if (TextUtils.isEmpty(id)) {
+                throw new IllegalArgumentException("Suggestion id cannot be empty");
+            }
+            mId = id;
+        }
+
+        /**
+         * Sets suggestion title
+         */
+
+        public Builder setTitle(CharSequence title) {
+            mTitle = title;
+            return this;
+        }
+
+        /**
+         * Sets suggestion summary
+         */
+        public Builder setSummary(CharSequence summary) {
+            mSummary = summary;
+            return this;
+        }
+
+        /**
+         * Sets icon for the suggestion.
+         */
+        public Builder setIcon(Icon icon) {
+            mIcon = icon;
+            return this;
+        }
+
+        public Builder setFlags(int flags) {
+            mFlags = flags;
+            return this;
+        }
+
+        /**
+         * Sets suggestion intent
+         */
+        public Builder setPendingIntent(PendingIntent pendingIntent) {
+            mPendingIntent = pendingIntent;
+            return this;
+        }
+
+        /**
+         * Builds an immutable {@link Suggestion} object.
+         */
+        public Suggestion build() {
+            return new Suggestion(this /* builder */);
+        }
+    }
+}
diff --git a/tests/robotests/src/android/util/FeatureFlagUtils.java b/tests/robotests/src/android/util/FeatureFlagUtils.java
new file mode 100644
index 0000000..e9dc966
--- /dev/null
+++ b/tests/robotests/src/android/util/FeatureFlagUtils.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 android.util;
+
+import android.content.Context;
+import android.os.SystemProperties;
+import android.provider.Settings;
+import android.text.TextUtils;
+
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * This class is only needed to get around Robolectric issue.
+ */
+public class FeatureFlagUtils {
+    public static final String FFLAG_PREFIX = "sys.fflag.";
+    public static final String FFLAG_OVERRIDE_PREFIX = FFLAG_PREFIX + "override.";
+
+    /**
+     * Whether or not a flag is enabled.
+     *
+     * @param feature the flag name
+     * @return true if the flag is enabled (either by default in system, or override by user)
+     */
+    public static boolean isEnabled(Context context, String feature) {
+        // Override precedence:
+        // Settings.Global -> sys.fflag.override.* -> sys.fflag.*
+
+        // Step 1: check if feature flag is set in Settings.Global.
+        String value;
+        if (context != null) {
+            value = Settings.Global.getString(context.getContentResolver(), feature);
+            if (!TextUtils.isEmpty(value)) {
+                return Boolean.parseBoolean(value);
+            }
+        }
+
+        // Step 2: check if feature flag has any override. Flag name: sys.fflag.override.<feature>
+        value = SystemProperties.get(FFLAG_OVERRIDE_PREFIX + feature);
+        if (!TextUtils.isEmpty(value)) {
+            return Boolean.parseBoolean(value);
+        }
+        // Step 3: check if feature flag has any default value. Flag name: sys.fflag.<feature>
+        value = SystemProperties.get(FFLAG_PREFIX + feature);
+        return Boolean.parseBoolean(value);
+    }
+
+    /**
+     * Override feature flag to new state.
+     */
+    public static void setEnabled(Context context, String feature, boolean enabled) {
+        SystemProperties.set(FFLAG_OVERRIDE_PREFIX + feature, enabled ? "true" : "false");
+    }
+
+    public static Map<String, String> getAllFeatureFlags() {
+        final Map<String, String> features = new HashMap<>();
+        features.put(FFLAG_PREFIX + "abc", "false");
+        features.put(FFLAG_OVERRIDE_PREFIX + "abc", "true");
+        return features;
+    }
+}
diff --git a/tests/robotests/src/com/android/internal/app/ColorDisplayController.java b/tests/robotests/src/com/android/internal/app/ColorDisplayController.java
new file mode 100644
index 0000000..74e7d8a
--- /dev/null
+++ b/tests/robotests/src/com/android/internal/app/ColorDisplayController.java
@@ -0,0 +1,44 @@
+/*
+ * 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.internal.app;
+
+/**
+ * Fake controller to make robolectric test compile. Should be removed when Robolectric supports
+ * API 25.
+ */
+public class ColorDisplayController {
+
+    public static final int AUTO_MODE_DISABLED = 0;
+    public static final int AUTO_MODE_CUSTOM = 1;
+    public static final int AUTO_MODE_TWILIGHT = 2;
+
+    public static final int COLOR_MODE_NATURAL = 0;
+    public static final int COLOR_MODE_BOOSTED = 1;
+    public static final int COLOR_MODE_SATURATED = 2;
+
+    private int mColorMode;
+
+    public void setColorMode(int colorMode) {
+        mColorMode = colorMode;
+    }
+
+    public int getColorMode() {
+        return mColorMode;
+    }
+
+    public interface Callback {
+    }
+}
diff --git a/tests/robotests/src/com/android/internal/app/NightDisplayController.java b/tests/robotests/src/com/android/internal/app/NightDisplayController.java
deleted file mode 100644
index bc2a0ca..0000000
--- a/tests/robotests/src/com/android/internal/app/NightDisplayController.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.internal.app;
-
-/**
- * Fake controller to make robolectric test compile. Should be removed when Robolectric supports
- * API 25.
- */
-public class NightDisplayController {
-
-    public static final int AUTO_MODE_CUSTOM = 1;
-    public static final int COLOR_MODE_NATURAL = 0;
-
-    public static final int AUTO_MODE_TWILIGHT = 2;
-    public static final int COLOR_MODE_BOOSTED = 1;
-    public static final int COLOR_MODE_SATURATED = 2;
-    private int mColorMode;
-
-    public void setColorMode(int colorMode) {
-        mColorMode = colorMode;
-    }
-
-    public int getColorMode() {
-        return mColorMode;
-    }
-
-    public interface Callback {
-    }
-}
diff --git a/tests/robotests/src/com/android/internal/hardware/AmbientDisplayConfiguration.java b/tests/robotests/src/com/android/internal/hardware/AmbientDisplayConfiguration.java
index 3dcf6ab..e080aa3 100644
--- a/tests/robotests/src/com/android/internal/hardware/AmbientDisplayConfiguration.java
+++ b/tests/robotests/src/com/android/internal/hardware/AmbientDisplayConfiguration.java
@@ -24,7 +24,11 @@
  */
 public class AmbientDisplayConfiguration {
 
-    public AmbientDisplayConfiguration(Context context) {}
+    private final Context mContext;
+
+    public AmbientDisplayConfiguration(Context context) {
+        mContext = context;
+    }
 
     public boolean pulseOnPickupAvailable() {
         return false;
diff --git a/tests/robotests/src/com/android/settings/DeviceAdminAddTest.java b/tests/robotests/src/com/android/settings/DeviceAdminAddTest.java
index cd891be..82b8e1b 100644
--- a/tests/robotests/src/com/android/settings/DeviceAdminAddTest.java
+++ b/tests/robotests/src/com/android/settings/DeviceAdminAddTest.java
@@ -36,7 +36,7 @@
 import static org.mockito.Mockito.verify;
 
 @RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION_O)
 public class DeviceAdminAddTest {
 
     @Mock(answer = Answers.RETURNS_DEEP_STUBS)
diff --git a/tests/robotests/src/com/android/settings/DeviceInfoSettingsTest.java b/tests/robotests/src/com/android/settings/DeviceInfoSettingsTest.java
index c5a1833..0bd8933 100644
--- a/tests/robotests/src/com/android/settings/DeviceInfoSettingsTest.java
+++ b/tests/robotests/src/com/android/settings/DeviceInfoSettingsTest.java
@@ -16,27 +16,38 @@
 
 package com.android.settings;
 
+import static com.android.settings.DeviceInfoSettings.NON_SIM_PREFERENCES_COUNT;
+import static com.android.settings.DeviceInfoSettings.SIM_PREFERENCES_COUNT;
 import static com.google.common.truth.Truth.assertThat;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.Mockito.doNothing;
 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.Build;
-import android.os.UserManager;
+import android.os.SystemProperties;
 import android.support.v7.preference.PreferenceScreen;
+import android.telephony.TelephonyManager;
+import android.util.FeatureFlagUtils;
 
+import com.android.settings.core.FeatureFlags;
 import com.android.settings.dashboard.SummaryLoader;
+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.SettingsShadowSystemProperties;
+import com.android.settings.testutils.shadow.ShadowConnectivityManager;
+import com.android.settings.testutils.shadow.ShadowUserManager;
 import com.android.settings.testutils.shadow.ShadowUtils;
 import com.android.settingslib.DeviceInfoUtils;
 
 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;
@@ -46,34 +57,43 @@
 
 @RunWith(SettingsRobolectricTestRunner.class)
 @Config(
-    manifest = TestConfig.MANIFEST_PATH,
-    sdk = TestConfig.SDK_VERSION,
-    shadows = ShadowUtils.class
+        manifest = TestConfig.MANIFEST_PATH,
+        sdk = TestConfig.SDK_VERSION_O,
+        shadows = {ShadowUtils.class, ShadowConnectivityManager.class, ShadowUserManager.class}
 )
 public class DeviceInfoSettingsTest {
 
-    @Mock(answer = Answers.RETURNS_DEEP_STUBS)
-    private Context mContext;
+    @Mock
+    private Activity mActivity;
     @Mock
     private PreferenceScreen mScreen;
     @Mock
-    private UserManager mUserManager;
-    @Mock
     private SummaryLoader mSummaryLoader;
+    @Mock
+    private TelephonyManager mTelephonyManager;
 
+    private Context mContext;
     private DeviceInfoSettings mSettings;
 
     @Before
     public void setUp() {
         MockitoAnnotations.initMocks(this);
-        when(mContext.getSystemService(Context.USER_SERVICE)).thenReturn(mUserManager);
+        FakeFeatureFactory.setupForTest();
+        mContext = RuntimeEnvironment.application;
         mSettings = spy(new DeviceInfoSettings());
+
+        doReturn(mActivity).when(mSettings).getActivity();
+        doReturn(mContext.getTheme()).when(mActivity).getTheme();
+        doReturn(mContext.getResources()).when(mSettings).getResources();
+        doNothing().when(mSettings).onCreatePreferences(any(), any());
+
         doReturn(mScreen).when(mSettings).getPreferenceScreen();
+        doReturn(mTelephonyManager).when(mSettings).getSystemService(Context.TELEPHONY_SERVICE);
     }
 
     @Test
     public void getPrefXml_shouldReturnDeviceInfoXml() {
-        assertThat(mSettings.getPreferenceScreenResId()).isEqualTo(R.xml.device_info_settings);
+        assertThat(mSettings.getPreferenceScreenResId()).isEqualTo(R.xml.device_info_settings_v2);
     }
 
     @Test
@@ -97,4 +117,32 @@
 
         assertThat(keys).containsAllIn(niks);
     }
+
+    @Test
+    @Config(shadows = {SettingsShadowResources.SettingsShadowTheme.class,
+            SettingsShadowSystemProperties.class})
+    public void onCreate_singleSim_shouldAddSingleSimCount() {
+        SystemProperties.set(FeatureFlagUtils.FFLAG_OVERRIDE_PREFIX + FeatureFlags.DEVICE_INFO_V2,
+                "true");
+        doReturn(1).when(mTelephonyManager).getPhoneCount();
+
+        mSettings.onCreate(null /* icicle */);
+
+        verify(mScreen).setInitialExpandedChildrenCount(
+                SIM_PREFERENCES_COUNT + NON_SIM_PREFERENCES_COUNT);
+    }
+
+    @Test
+    @Config(shadows = {SettingsShadowResources.SettingsShadowTheme.class,
+            SettingsShadowSystemProperties.class})
+    public void onCreate_dualeSim_shouldAddDualSimCount() {
+        SystemProperties.set(FeatureFlagUtils.FFLAG_OVERRIDE_PREFIX + FeatureFlags.DEVICE_INFO_V2,
+                "true");
+        doReturn(2).when(mTelephonyManager).getPhoneCount();
+
+        mSettings.onCreate(null /* icicle */);
+
+        verify(mScreen).setInitialExpandedChildrenCount(
+                2 * SIM_PREFERENCES_COUNT + NON_SIM_PREFERENCES_COUNT);
+    }
 }
diff --git a/tests/robotests/src/com/android/settings/DisplaySettingsTest.java b/tests/robotests/src/com/android/settings/DisplaySettingsTest.java
index 4b345c0..a956aa7 100644
--- a/tests/robotests/src/com/android/settings/DisplaySettingsTest.java
+++ b/tests/robotests/src/com/android/settings/DisplaySettingsTest.java
@@ -2,6 +2,8 @@
 
 import static com.google.common.truth.Truth.assertThat;
 
+import static org.mockito.Mockito.mock;
+
 import android.content.Context;
 
 import com.android.settings.testutils.SettingsRobolectricTestRunner;
@@ -13,20 +15,19 @@
 import org.junit.runner.RunWith;
 import org.robolectric.RuntimeEnvironment;
 import org.robolectric.annotation.Config;
+import org.robolectric.util.ReflectionHelpers;
 
 import java.util.ArrayList;
 import java.util.List;
 
 @RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION_O)
 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
deleted file mode 100644
index 7a3875e..0000000
--- a/tests/robotests/src/com/android/settings/EncryptionAndCredentialTest.java
+++ /dev/null
@@ -1,125 +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;
-
-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/HelpTrampolineTest.java b/tests/robotests/src/com/android/settings/HelpTrampolineTest.java
index e10b878..11f5c7b 100644
--- a/tests/robotests/src/com/android/settings/HelpTrampolineTest.java
+++ b/tests/robotests/src/com/android/settings/HelpTrampolineTest.java
@@ -34,7 +34,7 @@
 import static org.robolectric.Shadows.shadowOf;
 
 @RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION,
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION_O,
         shadows = {
                 ShadowHelpUtils.class
         })
diff --git a/tests/robotests/src/com/android/settings/LegalSettingsTest.java b/tests/robotests/src/com/android/settings/LegalSettingsTest.java
index 3d50c63..f457c08 100644
--- a/tests/robotests/src/com/android/settings/LegalSettingsTest.java
+++ b/tests/robotests/src/com/android/settings/LegalSettingsTest.java
@@ -29,7 +29,7 @@
 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_O)
 public class LegalSettingsTest {
 
     @Test
diff --git a/tests/robotests/src/com/android/settings/LicenseHtmlGeneratorFromXmlTest.java b/tests/robotests/src/com/android/settings/LicenseHtmlGeneratorFromXmlTest.java
index ea4b272..7d82b27 100644
--- a/tests/robotests/src/com/android/settings/LicenseHtmlGeneratorFromXmlTest.java
+++ b/tests/robotests/src/com/android/settings/LicenseHtmlGeneratorFromXmlTest.java
@@ -34,7 +34,7 @@
 import org.xmlpull.v1.XmlPullParserException;
 
 @RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION_O)
 public class LicenseHtmlGeneratorFromXmlTest {
     private static final String VAILD_XML_STRING =
             "<?xml version=\"1.0\" encoding=\"utf-8\"?>\n" +
diff --git a/tests/robotests/src/com/android/settings/LicenseHtmlLoaderTest.java b/tests/robotests/src/com/android/settings/LicenseHtmlLoaderTest.java
index b16d315..2fd655f 100644
--- a/tests/robotests/src/com/android/settings/LicenseHtmlLoaderTest.java
+++ b/tests/robotests/src/com/android/settings/LicenseHtmlLoaderTest.java
@@ -39,7 +39,7 @@
 import org.robolectric.annotation.Config;
 
 @RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION_O)
 public class LicenseHtmlLoaderTest {
     @Mock
     private Context mContext;
diff --git a/tests/robotests/src/com/android/settings/MasterClearTest.java b/tests/robotests/src/com/android/settings/MasterClearTest.java
index 838b1e8..bfdf25e 100644
--- a/tests/robotests/src/com/android/settings/MasterClearTest.java
+++ b/tests/robotests/src/com/android/settings/MasterClearTest.java
@@ -51,7 +51,7 @@
 @RunWith(SettingsRobolectricTestRunner.class)
 @Config(
     manifest = TestConfig.MANIFEST_PATH,
-    sdk = TestConfig.SDK_VERSION,
+    sdk = TestConfig.SDK_VERSION_O,
     shadows = {ShadowUtils.class}
 )
 public class MasterClearTest {
diff --git a/tests/robotests/src/com/android/settings/PrivacySettingsTest.java b/tests/robotests/src/com/android/settings/PrivacySettingsTest.java
index c52204d..4eaa781 100644
--- a/tests/robotests/src/com/android/settings/PrivacySettingsTest.java
+++ b/tests/robotests/src/com/android/settings/PrivacySettingsTest.java
@@ -33,7 +33,7 @@
 import com.android.settings.testutils.SettingsRobolectricTestRunner;
 
 @RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION_O)
 public class PrivacySettingsTest {
 
     @Mock
diff --git a/tests/robotests/src/com/android/settings/SecuritySettingsTest.java b/tests/robotests/src/com/android/settings/SecuritySettingsTest.java
deleted file mode 100644
index 3d0d5a1..0000000
--- a/tests/robotests/src/com/android/settings/SecuritySettingsTest.java
+++ /dev/null
@@ -1,205 +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;
-
-import android.app.Activity;
-import android.content.Context;
-import android.content.IContentProvider;
-import android.content.pm.PackageManager;
-import android.hardware.fingerprint.FingerprintManager;
-import android.os.UserManager;
-import android.support.v7.preference.Preference;
-import android.support.v7.preference.PreferenceGroup;
-import android.support.v7.preference.PreferenceScreen;
-
-import com.android.internal.widget.LockPatternUtils;
-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;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Answers;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
-import org.robolectric.RuntimeEnvironment;
-import org.robolectric.annotation.Config;
-import org.robolectric.annotation.Implementation;
-import org.robolectric.annotation.Implements;
-import org.robolectric.shadows.ShadowApplication;
-import org.robolectric.util.ReflectionHelpers;
-
-import java.util.List;
-import java.util.Map;
-
-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.verify;
-import static org.mockito.Mockito.verifyNoMoreInteractions;
-import static org.mockito.Mockito.when;
-
-@RunWith(SettingsRobolectricTestRunner.class)
-@Config(
-    manifest = TestConfig.MANIFEST_PATH,
-    sdk = TestConfig.SDK_VERSION,
-    shadows = {ShadowLockPatternUtils.class}
-)
-public class SecuritySettingsTest {
-
-    private static final String MOCK_SUMMARY = "summary";
-
-    @Mock(answer = Answers.RETURNS_DEEP_STUBS)
-    private Context mContext;
-    @Mock
-    private DashboardCategory mDashboardCategory;
-    @Mock
-    private SummaryLoader mSummaryLoader;
-
-    private SecuritySettings.SummaryProvider mSummaryProvider;
-
-    @Implements(com.android.settingslib.drawer.TileUtils.class)
-    public static class ShadowTileUtils {
-        @Implementation
-        public static String getTextFromUri(Context context, String uriString,
-                Map<String, IContentProvider> providerMap, String key) {
-            return MOCK_SUMMARY;
-        }
-    }
-
-    @Before
-    public void setUp() {
-        MockitoAnnotations.initMocks(this);
-        FakeFeatureFactory.setupForTest(mContext);
-        mSummaryProvider = new SecuritySettings.SummaryProvider(mContext, mSummaryLoader);
-    }
-
-    @Test
-    public void testSummaryProvider_notListening() {
-        mSummaryProvider.setListening(false);
-
-        verifyNoMoreInteractions(mSummaryLoader);
-    }
-
-    @Test
-    public void testSummaryProvider_hasFingerPrint_hasStaticSummary() {
-        final FingerprintManager fpm = mock(FingerprintManager.class);
-        when(mContext.getPackageManager().hasSystemFeature(PackageManager.FEATURE_FINGERPRINT))
-                .thenReturn(true);
-
-        // Cast to Object to workaround a robolectric casting bug
-        when((Object) mContext.getSystemService(FingerprintManager.class)).thenReturn(fpm);
-        when(fpm.isHardwareDetected()).thenReturn(true);
-
-        mSummaryProvider.setListening(true);
-
-        verify(mContext).getString(R.string.security_dashboard_summary);
-    }
-
-    @Test
-    public void testSummaryProvider_noFpFeature_shouldSetSummaryWithNoFingerprint() {
-        final FingerprintManager fpm = mock(FingerprintManager.class);
-        when(mContext.getPackageManager().hasSystemFeature(PackageManager.FEATURE_FINGERPRINT))
-            .thenReturn(false);
-
-        mSummaryProvider.setListening(true);
-
-        verify(mContext).getString(R.string.security_dashboard_summary_no_fingerprint);
-    }
-
-    @Test
-    public void testSummaryProvider_noFpHardware_shouldSetSummaryWithNoFingerprint() {
-        final FingerprintManager fpm = mock(FingerprintManager.class);
-        when(mContext.getPackageManager().hasSystemFeature(PackageManager.FEATURE_FINGERPRINT))
-            .thenReturn(true);
-
-        // Cast to Object to workaround a robolectric casting bug
-        when((Object) mContext.getSystemService(FingerprintManager.class)).thenReturn(fpm);
-        when(fpm.isHardwareDetected()).thenReturn(false);
-
-        mSummaryProvider.setListening(true);
-
-        verify(mContext).getString(R.string.security_dashboard_summary_no_fingerprint);
-    }
-
-    @Test
-    public void testInitTrustAgentPreference_secure_shouldSetSummaryToNumberOfTrustAgent() {
-        final Preference preference = mock(Preference.class);
-        final PreferenceScreen screen = mock(PreferenceScreen.class);
-        when(screen.findPreference(SecuritySettings.KEY_MANAGE_TRUST_AGENTS))
-                .thenReturn(preference);
-        final LockPatternUtils utils = mock(LockPatternUtils.class);
-        when(utils.isSecure(anyInt())).thenReturn(true);
-        final Context context = ShadowApplication.getInstance().getApplicationContext();
-        final Activity activity = mock(Activity.class);
-        when(activity.getResources()).thenReturn(context.getResources());
-        final SecuritySettings securitySettings = spy(new SecuritySettings());
-        when(securitySettings.getActivity()).thenReturn(activity);
-
-        ReflectionHelpers.setField(securitySettings, "mLockPatternUtils", utils);
-
-        securitySettings.initTrustAgentPreference(screen, 0);
-        verify(preference).setSummary(R.string.manage_trust_agents_summary);
-
-        securitySettings.initTrustAgentPreference(screen, 2);
-        verify(preference).setSummary(context.getResources().getQuantityString(
-            R.plurals.manage_trust_agents_summary_on, 2, 2));
-    }
-
-    @Test
-    public void testSetLockscreenPreferencesSummary_shouldSetSummaryFromLockScreenNotification() {
-        final Preference preference = mock(Preference.class);
-        final PreferenceGroup group = mock(PreferenceGroup.class);
-        when(group.findPreference(SecuritySettings.KEY_LOCKSCREEN_PREFERENCES))
-            .thenReturn(preference);
-        final LockScreenNotificationPreferenceController controller =
-            mock(LockScreenNotificationPreferenceController.class);
-
-        final SecuritySettings securitySettings = new SecuritySettings();
-        ReflectionHelpers.setField(securitySettings,
-            "mLockScreenNotificationPreferenceController", controller);
-
-        when(controller.getSummaryResource()).thenReturn(1234);
-        securitySettings.setLockscreenPreferencesSummary(group);
-        verify(preference).setSummary(1234);
-    }
-
-    @Test
-    public void testNonIndexableKeys_existInXmlLayout() {
-        final Context context = spy(RuntimeEnvironment.application);
-        UserManager manager = mock(UserManager.class);
-        when(manager.isAdminUser()).thenReturn(false);
-        doReturn(manager).when(context).getSystemService(Context.USER_SERVICE);
-        final List<String> niks = SecuritySettings.SEARCH_INDEX_DATA_PROVIDER
-                .getNonIndexableKeys(context);
-
-        final List<String> keys = XmlTestUtils.getKeysFromPreferenceXml(context,
-                R.xml.security_settings_misc);
-        keys.addAll(XmlTestUtils.getKeysFromPreferenceXml(context,
-                R.xml.location_settings));
-        keys.addAll(XmlTestUtils.getKeysFromPreferenceXml(context,
-                R.xml.encryption_and_credential));
-
-        assertThat(keys).containsAllIn(niks);
-    }
-}
diff --git a/tests/robotests/src/com/android/settings/SettingsActivityTest.java b/tests/robotests/src/com/android/settings/SettingsActivityTest.java
index 3fc46e8..8d595bc 100644
--- a/tests/robotests/src/com/android/settings/SettingsActivityTest.java
+++ b/tests/robotests/src/com/android/settings/SettingsActivityTest.java
@@ -17,7 +17,6 @@
 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;
@@ -26,19 +25,14 @@
 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;
@@ -49,11 +43,9 @@
 import org.mockito.MockitoAnnotations;
 import org.robolectric.RuntimeEnvironment;
 import org.robolectric.annotation.Config;
-import org.robolectric.shadows.ShadowApplication;
-import org.robolectric.util.ReflectionHelpers;
 
 @RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION_O)
 public class SettingsActivityTest {
 
     @Mock(answer = Answers.RETURNS_DEEP_STUBS)
@@ -101,15 +93,4 @@
 
         assertThat((boolean) bundle.get(SettingsActivity.SAVE_KEY_SHOW_HOME_AS_UP)).isTrue();
     }
-
-    @Test
-    public void testOnClick() {
-        doReturn("com.android.settings").when(mActivity).getPackageName();
-
-        mActivity.onClick(null);
-
-        Intent intent = ShadowApplication.getInstance().getNextStartedActivity();
-        assertThat(intent.getComponent()).isEqualTo(
-                new ComponentName("com.android.settings", SearchActivity.class.getName()));
-    }
 }
diff --git a/tests/robotests/src/com/android/settings/SettingsDialogFragmentTest.java b/tests/robotests/src/com/android/settings/SettingsDialogFragmentTest.java
index 942634a..a5a7280 100644
--- a/tests/robotests/src/com/android/settings/SettingsDialogFragmentTest.java
+++ b/tests/robotests/src/com/android/settings/SettingsDialogFragmentTest.java
@@ -33,7 +33,7 @@
 import com.android.settings.testutils.SettingsRobolectricTestRunner;
 
 @RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION_O)
 public class SettingsDialogFragmentTest {
 
     private static final int DIALOG_ID = 15;
diff --git a/tests/robotests/src/com/android/settings/SettingsDumpServiceTest.java b/tests/robotests/src/com/android/settings/SettingsDumpServiceTest.java
index 0d0f22c..38e78e4 100644
--- a/tests/robotests/src/com/android/settings/SettingsDumpServiceTest.java
+++ b/tests/robotests/src/com/android/settings/SettingsDumpServiceTest.java
@@ -37,7 +37,7 @@
 import com.android.settings.testutils.SettingsRobolectricTestRunner;
 
 @RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION_O)
 public class SettingsDumpServiceTest {
     private static final String PACKAGE_BROWSER = "com.android.test.browser";
     private static final String PACKAGE_NULL = "android";
diff --git a/tests/robotests/src/com/android/settings/SettingsLicenseActivityTest.java b/tests/robotests/src/com/android/settings/SettingsLicenseActivityTest.java
index dd17d9c..6d28bd5 100644
--- a/tests/robotests/src/com/android/settings/SettingsLicenseActivityTest.java
+++ b/tests/robotests/src/com/android/settings/SettingsLicenseActivityTest.java
@@ -39,11 +39,11 @@
 import org.mockito.MockitoAnnotations;
 import org.robolectric.Robolectric;
 import org.robolectric.RuntimeEnvironment;
+import org.robolectric.android.controller.ActivityController;
 import org.robolectric.annotation.Config;
-import org.robolectric.util.ActivityController;
 
 @RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION_O)
 public class SettingsLicenseActivityTest {
     private ActivityController<SettingsLicenseActivity> mActivityController;
     private SettingsLicenseActivity mActivity;
diff --git a/tests/robotests/src/com/android/settings/SettingsPreferenceFragmentTest.java b/tests/robotests/src/com/android/settings/SettingsPreferenceFragmentTest.java
index dc4166d..788d185 100644
--- a/tests/robotests/src/com/android/settings/SettingsPreferenceFragmentTest.java
+++ b/tests/robotests/src/com/android/settings/SettingsPreferenceFragmentTest.java
@@ -16,9 +16,9 @@
 
 package com.android.settings;
 
-
 import android.app.Activity;
 import android.content.Context;
+import android.os.Bundle;
 import android.support.v7.preference.Preference;
 import android.support.v7.preference.PreferenceCategory;
 import android.support.v7.preference.PreferenceManager;
@@ -39,19 +39,20 @@
 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 com.android.settings.testutils.FakeFeatureFactory;
 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_O)
 public class SettingsPreferenceFragmentTest {
 
     private static final int ITEM_COUNT = 5;
 
     @Mock
-    private PreferenceManager mPreferenceManager;
-    @Mock
     private Activity mActivity;
     @Mock
     private View mListContainer;
@@ -64,6 +65,7 @@
     @Before
     public void setUp() {
         MockitoAnnotations.initMocks(this);
+        FakeFeatureFactory.setupForTest();
         mContext = RuntimeEnvironment.application;
         mFragment = spy(new TestFragment());
         doReturn(mActivity).when(mFragment).getActivity();
@@ -142,6 +144,36 @@
         assertThat(mEmptyView.getVisibility()).isEqualTo(View.GONE);
     }
 
+    @Test
+    @Config(shadows = SettingsShadowResources.SettingsShadowTheme.class)
+    public void onCreate_hasExtraFragmentKey_shouldExpandPreferences() {
+        doReturn(mContext.getTheme()).when(mActivity).getTheme();
+        doReturn(mContext.getResources()).when(mFragment).getResources();
+        doReturn(mPreferenceScreen).when(mFragment).getPreferenceScreen();
+        final Bundle bundle = new Bundle();
+        bundle.putString(SettingsActivity.EXTRA_FRAGMENT_ARG_KEY, "test_key");
+        doReturn(bundle).when(mFragment).getArguments();
+
+        mFragment.onCreate(null /* icicle */);
+
+        verify(mPreferenceScreen).setInitialExpandedChildrenCount(Integer.MAX_VALUE);
+    }
+
+    @Test
+    @Config(shadows = SettingsShadowResources.SettingsShadowTheme.class)
+    public void onCreate_noPreferenceScreen_shouldNotCrash() {
+        doReturn(mContext.getTheme()).when(mActivity).getTheme();
+        doReturn(mContext.getResources()).when(mFragment).getResources();
+        doReturn(null).when(mFragment).getPreferenceScreen();
+        final Bundle bundle = new Bundle();
+        bundle.putString(SettingsActivity.EXTRA_FRAGMENT_ARG_KEY, "test_key");
+        doReturn(bundle).when(mFragment).getArguments();
+
+        mFragment.onCreate(null /* icicle */);
+
+        // no crash
+    }
+
     public static class TestFragment extends SettingsPreferenceFragment {
 
         @Override
@@ -150,5 +182,4 @@
         }
     }
 
-
 }
diff --git a/tests/robotests/src/com/android/settings/SetupChooseLockPatternTest.java b/tests/robotests/src/com/android/settings/SetupChooseLockPatternTest.java
index 69a1351..17d1021 100644
--- a/tests/robotests/src/com/android/settings/SetupChooseLockPatternTest.java
+++ b/tests/robotests/src/com/android/settings/SetupChooseLockPatternTest.java
@@ -30,6 +30,7 @@
 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.SettingsShadowResourcesImpl;
 import com.android.settings.testutils.shadow.ShadowEventLogWriter;
 import com.android.settings.testutils.shadow.ShadowUtils;
 
@@ -37,16 +38,17 @@
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.robolectric.Robolectric;
-import org.robolectric.RuntimeEnvironment;
+import org.robolectric.Shadows;
 import org.robolectric.annotation.Config;
-import org.robolectric.res.builder.RobolectricPackageManager.ComponentState;
+import org.robolectric.shadows.ShadowPackageManager.ComponentState;
 
 @RunWith(SettingsRobolectricTestRunner.class)
 @Config(
         manifest = TestConfig.MANIFEST_PATH,
-        sdk = TestConfig.SDK_VERSION,
+        sdk = TestConfig.SDK_VERSION_O,
         shadows = {
                 SettingsShadowResources.class,
+                SettingsShadowResourcesImpl.class,
                 SettingsShadowResources.SettingsShadowTheme.class,
                 ShadowEventLogWriter.class,
                 ShadowUtils.class
@@ -57,12 +59,12 @@
 
     @Before
     public void setUp() {
-        RuntimeEnvironment.getRobolectricPackageManager().setComponentEnabledSetting(
+        Shadows.shadowOf(application.getPackageManager()).setComponentEnabledSetting(
                 new ComponentName(application, SetupRedactionInterstitial.class),
                 PackageManager.COMPONENT_ENABLED_STATE_DISABLED,
                 PackageManager.DONT_KILL_APP);
 
-        mActivity =  Robolectric.buildActivity(
+        mActivity = Robolectric.buildActivity(
                 SetupChooseLockPattern.class,
                 SetupChooseLockPattern.modifyIntentForSetup(
                         application,
@@ -77,7 +79,7 @@
         findFragment(mActivity).onChosenLockSaveFinished(false, null);
 
         ComponentState redactionComponentState =
-                RuntimeEnvironment.getRobolectricPackageManager().getComponentState(
+                Shadows.shadowOf(application.getPackageManager()).getComponentState(
                         new ComponentName(application, SetupRedactionInterstitial.class));
         assertThat(redactionComponentState.newState).named("Redaction component state")
                 .isEqualTo(PackageManager.COMPONENT_ENABLED_STATE_ENABLED);
diff --git a/tests/robotests/src/com/android/settings/SetupWizardUtilsTest.java b/tests/robotests/src/com/android/settings/SetupWizardUtilsTest.java
index 21061c1..4238a4c 100644
--- a/tests/robotests/src/com/android/settings/SetupWizardUtilsTest.java
+++ b/tests/robotests/src/com/android/settings/SetupWizardUtilsTest.java
@@ -34,7 +34,7 @@
 @RunWith(SettingsRobolectricTestRunner.class)
 @Config(
         manifest = TestConfig.MANIFEST_PATH,
-        sdk = TestConfig.SDK_VERSION,
+        sdk = TestConfig.SDK_VERSION_O,
         shadows = {
                 SettingsShadowSystemProperties.class
         })
diff --git a/tests/robotests/src/com/android/settings/SummaryPreferenceTest.java b/tests/robotests/src/com/android/settings/SummaryPreferenceTest.java
index 59a5867..94e4785 100644
--- a/tests/robotests/src/com/android/settings/SummaryPreferenceTest.java
+++ b/tests/robotests/src/com/android/settings/SummaryPreferenceTest.java
@@ -35,7 +35,7 @@
 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_O,
         shadows = {
                 SettingsShadowResources.class,
                 SettingsShadowResources.SettingsShadowTheme.class
diff --git a/tests/robotests/src/com/android/settings/TestConfig.java b/tests/robotests/src/com/android/settings/TestConfig.java
index 3b2d2e4..d2d65a9 100644
--- a/tests/robotests/src/com/android/settings/TestConfig.java
+++ b/tests/robotests/src/com/android/settings/TestConfig.java
@@ -16,10 +16,18 @@
 
 package com.android.settings;
 
+import android.os.Build;
+
 /**
  * Constants for Robolectric config
  */
 public class TestConfig {
+
+    /**
+     * @deprecated New tests should use {@link #SDK_VERSION_O}
+     */
+    @Deprecated
     public static final int SDK_VERSION = 23;
+    public static final int SDK_VERSION_O = Build.VERSION_CODES.O;
     public static final String MANIFEST_PATH = "packages/apps/Settings/AndroidManifest.xml";
 }
diff --git a/tests/robotests/src/com/android/settings/TetherServiceTest.java b/tests/robotests/src/com/android/settings/TetherServiceTest.java
index 0275c15..a888c30 100644
--- a/tests/robotests/src/com/android/settings/TetherServiceTest.java
+++ b/tests/robotests/src/com/android/settings/TetherServiceTest.java
@@ -37,7 +37,7 @@
 import org.robolectric.util.ReflectionHelpers;
 
 @RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION_O)
 public class TetherServiceTest {
 
     @Mock
diff --git a/tests/robotests/src/com/android/settings/UtilsTest.java b/tests/robotests/src/com/android/settings/UtilsTest.java
index 33ead1f..3d66dea 100644
--- a/tests/robotests/src/com/android/settings/UtilsTest.java
+++ b/tests/robotests/src/com/android/settings/UtilsTest.java
@@ -25,9 +25,11 @@
 import android.text.SpannableStringBuilder;
 import android.text.format.DateUtils;
 import android.text.style.TtsSpan;
+import android.widget.EditText;
+import android.widget.TextView;
 
-import com.android.settings.enterprise.DevicePolicyManagerWrapper;
 import com.android.settings.testutils.SettingsRobolectricTestRunner;
+import com.android.settings.wrapper.DevicePolicyManagerWrapper;
 
 import org.junit.Before;
 import org.junit.Test;
@@ -42,12 +44,11 @@
 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_O)
 public class UtilsTest {
 
-    private static final String TIME_DESCRIPTION = "1 day 20 hours 30 minutes";
     private static final String PACKAGE_NAME = "com.android.app";
-    private Context mContext;
+
     @Mock
     private WifiManager wifiManager;
     @Mock
@@ -58,6 +59,7 @@
     private DevicePolicyManagerWrapper mDevicePolicyManager;
     @Mock
     private UserManager mUserManager;
+    private Context mContext;
 
     @Before
     public void setUp() {
@@ -98,12 +100,6 @@
     }
 
     @Test
-    public void testAssignDefaultPhoto_ContextNull_ReturnFalseAndNotCrash() {
-        // Should not crash here
-        assertThat(Utils.assignDefaultPhoto(null, 0)).isFalse();
-    }
-
-    @Test
     public void testFormatElapsedTime_WithSeconds_ShowSeconds() {
         final double testMillis = 5 * DateUtils.MINUTE_IN_MILLIS + 30 * DateUtils.SECOND_IN_MILLIS;
         final String expectedTime = "5m 30s";
@@ -174,6 +170,105 @@
     }
 
     @Test
+    public void testFormatRelativeTime_WithSeconds_ShowSeconds() {
+        final double testMillis = 40 * DateUtils.SECOND_IN_MILLIS;
+        final String expectedTime = "40 sec. ago";
+
+        assertThat(Utils.formatRelativeTime(mContext, testMillis, true).toString()).isEqualTo(
+                expectedTime);
+    }
+
+    @Test
+    public void testFormatRelativeTime_NoSeconds_DoNotShowSeconds() {
+        final double testMillis = 40 * DateUtils.SECOND_IN_MILLIS;
+        final String expectedTime = "1 min. ago";
+
+        assertThat(Utils.formatRelativeTime(mContext, testMillis, false).toString()).isEqualTo(
+                expectedTime);
+    }
+
+    @Test
+    public void testFormatRelativeTime_LessThanTwoMinutes_withSeconds() {
+        final double testMillis = 119 * DateUtils.SECOND_IN_MILLIS;
+        final String expectedTime = "119 sec. ago";
+
+        assertThat(Utils.formatRelativeTime(mContext, testMillis, true).toString()).isEqualTo(
+                expectedTime);
+    }
+
+    @Test
+    public void testFormatRelativeTime_LessThanTwoMinutes_NoSeconds() {
+        final double testMillis = 119 * DateUtils.SECOND_IN_MILLIS;
+        final String expectedTime = "2 min. ago";
+
+        assertThat(Utils.formatRelativeTime(mContext, testMillis, false).toString()).isEqualTo(
+                expectedTime);
+    }
+
+    @Test
+    public void testFormatRelativeTime_TwoMinutes_withSeconds() {
+        final double testMillis = 2 * DateUtils.MINUTE_IN_MILLIS;
+        final String expectedTime = "2 min. ago";
+
+        assertThat(Utils.formatRelativeTime(mContext, testMillis, true).toString()).isEqualTo(
+                expectedTime);
+    }
+
+    @Test
+    public void testFormatRelativeTime_LessThanTwoHours_withSeconds() {
+        final double testMillis = 119 * DateUtils.MINUTE_IN_MILLIS;
+        final String expectedTime = "119 min. ago";
+
+        assertThat(Utils.formatRelativeTime(mContext, testMillis, true).toString()).isEqualTo(
+                expectedTime);
+    }
+
+    @Test
+    public void testFormatRelativeTime_TwoHours_withSeconds() {
+        final double testMillis = 2 * DateUtils.HOUR_IN_MILLIS;
+        final String expectedTime = "2 hr. ago";
+
+        assertThat(Utils.formatRelativeTime(mContext, testMillis, true).toString()).isEqualTo(
+                expectedTime);
+    }
+
+    @Test
+    public void testFormatRelativeTime_LessThanTwoDays_withSeconds() {
+        final double testMillis = 47 * DateUtils.HOUR_IN_MILLIS;
+        final String expectedTime = "47 hr. ago";
+
+        assertThat(Utils.formatRelativeTime(mContext, testMillis, true).toString()).isEqualTo(
+                expectedTime);
+    }
+
+    @Test
+    public void testFormatRelativeTime_TwoDays_withSeconds() {
+        final double testMillis = 2 * DateUtils.DAY_IN_MILLIS;
+        final String expectedTime = "2 days ago";
+
+        assertThat(Utils.formatRelativeTime(mContext, testMillis, true).toString()).isEqualTo(
+                expectedTime);
+    }
+
+    @Test
+    public void testFormatRelativeTime_FormatZero_WithSeconds() {
+        final double testMillis = 0;
+        final String expectedTime = "0 sec. ago";
+
+        assertThat(Utils.formatRelativeTime(mContext, testMillis, true).toString()).isEqualTo(
+                expectedTime);
+    }
+
+    @Test
+    public void testFormatRelativeTime_FormatZero_NoSeconds() {
+        final double testMillis = 0;
+        final String expectedTime = "0 min. ago";
+
+        assertThat(Utils.formatRelativeTime(mContext, testMillis, false).toString()).isEqualTo(
+                expectedTime);
+    }
+
+    @Test
     public void testInitializeVolumeDoesntBreakOnNullVolume() {
         VolumeInfo info = new VolumeInfo("id", 0, new DiskInfo("id", 0), "");
         StorageManager storageManager = mock(StorageManager.class, RETURNS_DEEP_STUBS);
@@ -226,4 +321,15 @@
         assertThat(Utils.isProfileOrDeviceOwner(mUserManager, mDevicePolicyManager,
                 PACKAGE_NAME)).isTrue();
     }
+
+    @Test
+    public void testSetEditTextCursorPosition_shouldGetExpectedEditTextLenght() {
+        final EditText editText = new EditText(mContext);
+        final CharSequence text = "test";
+        editText.setText(text, TextView.BufferType.EDITABLE);
+        final int length = editText.getText().length();
+        Utils.setEditTextCursorPosition(editText);
+
+        assertThat(editText.getSelectionEnd()).isEqualTo(length);
+    }
 }
diff --git a/tests/robotests/src/com/android/settings/ZonePickerTest.java b/tests/robotests/src/com/android/settings/ZonePickerTest.java
index 31606f1..6f9ce4e 100644
--- a/tests/robotests/src/com/android/settings/ZonePickerTest.java
+++ b/tests/robotests/src/com/android/settings/ZonePickerTest.java
@@ -29,6 +29,7 @@
 import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.testutils.shadow.ShadowLibcoreTimeZoneNames;
 import com.android.settings.testutils.shadow.ShadowTimeZoneNames;
+import com.android.settings.testutils.shadow.ShadowZoneGetterData;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -38,11 +39,12 @@
 @RunWith(SettingsRobolectricTestRunner.class)
 @Config(
         manifest = TestConfig.MANIFEST_PATH,
-        sdk = TestConfig.SDK_VERSION,
+        sdk = TestConfig.SDK_VERSION_O,
         shadows = {
                 ShadowLibcoreTimeZoneNames.class,
                 ShadowLibcoreTimeZoneNames.ShadowZoneStringsCache.class,
-                ShadowTimeZoneNames.class
+                ShadowTimeZoneNames.class,
+                ShadowZoneGetterData.class,
         }
 )
 public class ZonePickerTest {
diff --git a/tests/robotests/src/com/android/settings/accessibility/AccessibilitySettingsTest.java b/tests/robotests/src/com/android/settings/accessibility/AccessibilitySettingsTest.java
index fb32da1..6616537 100644
--- a/tests/robotests/src/com/android/settings/accessibility/AccessibilitySettingsTest.java
+++ b/tests/robotests/src/com/android/settings/accessibility/AccessibilitySettingsTest.java
@@ -33,7 +33,7 @@
 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_O)
 public class AccessibilitySettingsTest {
 
     @Test
diff --git a/tests/robotests/src/com/android/settings/accessibility/ShortcutServicePickerFragmentTest.java b/tests/robotests/src/com/android/settings/accessibility/ShortcutServicePickerFragmentTest.java
index f2d1e65..2e95c73 100644
--- a/tests/robotests/src/com/android/settings/accessibility/ShortcutServicePickerFragmentTest.java
+++ b/tests/robotests/src/com/android/settings/accessibility/ShortcutServicePickerFragmentTest.java
@@ -16,15 +16,20 @@
 
 package com.android.settings.accessibility;
 
+import static com.google.common.truth.Truth.assertThat;
+
+import static org.mockito.Mockito.doReturn;
+import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.when;
+
 import android.app.Activity;
 import android.content.Context;
 import android.os.UserManager;
 
-import android.test.mock.MockContentResolver;
-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.SettingsRobolectricTestRunner;
+import com.android.settingslib.wrapper.PackageManagerWrapper;
 
 import org.junit.Before;
 import org.junit.Test;
@@ -35,14 +40,8 @@
 import org.robolectric.RuntimeEnvironment;
 import org.robolectric.annotation.Config;
 
-import static com.google.common.truth.Truth.assertThat;
-import static org.mockito.Mockito.doReturn;
-import static org.mockito.Mockito.spy;
-import static 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_O)
 public class ShortcutServicePickerFragmentTest {
 
     private static final String TEST_SERVICE_KEY_1 = "abc/123";
@@ -59,7 +58,6 @@
     private PackageManagerWrapper mPackageManager;
 
     private ShortcutServicePickerFragment mFragment;
-    private MockContentResolver mContentResolver;
 
     @Before
     public void setUp() {
diff --git a/tests/robotests/src/com/android/settings/accessibility/ToggleFeaturePreferenceFragmentTest.java b/tests/robotests/src/com/android/settings/accessibility/ToggleFeaturePreferenceFragmentTest.java
new file mode 100644
index 0000000..8d1d174
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/accessibility/ToggleFeaturePreferenceFragmentTest.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.accessibility;
+
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.verify;
+
+import android.os.Bundle;
+import android.support.annotation.XmlRes;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+
+import com.android.settings.R;
+import com.android.settings.TestConfig;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.shadow.SettingsShadowResources;
+import com.android.settings.widget.SwitchBar;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.robolectric.annotation.Config;
+import org.robolectric.util.FragmentTestUtil;
+
+@RunWith(SettingsRobolectricTestRunner.class)
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION_O,
+        shadows = {
+                SettingsShadowResources.class,
+                SettingsShadowResources.SettingsShadowTheme.class,
+        })
+public class ToggleFeaturePreferenceFragmentTest {
+
+    private ToggleFeaturePreferenceFragmentTestable mFragment;
+
+    @Test
+    public void createFragment_shouldOnlyAddPreferencesOnce() {
+        mFragment = spy(new ToggleFeaturePreferenceFragmentTestable());
+
+        FragmentTestUtil.startFragment(mFragment);
+
+        // execute exactly once
+        verify(mFragment).addPreferencesFromResource(R.xml.placeholder_prefs);
+    }
+
+
+    public static class ToggleFeaturePreferenceFragmentTestable
+            extends ToggleFeaturePreferenceFragment {
+
+        @Override
+        protected void onPreferenceToggled(String preferenceKey, boolean enabled) {}
+
+        @Override
+        public int getMetricsCategory() {
+            return 0;
+        }
+
+        @Override
+        public int getPreferenceScreenResId() {
+            return R.xml.placeholder_prefs;
+        }
+
+        @Override
+        public View onCreateView(LayoutInflater inflater, ViewGroup container,
+                Bundle savedInstanceState) {
+            return mock(View.class);
+        }
+
+        @Override
+        public void addPreferencesFromResource(@XmlRes int preferencesResId) {
+            // do nothing
+        }
+
+        @Override
+        public void onViewCreated(View view, Bundle savedInstanceState) {
+            // do nothing
+        }
+
+        @Override
+        public void onActivityCreated(Bundle savedInstanceState) {
+            mSwitchBar = mock(SwitchBar.class);
+            super.onActivityCreated(savedInstanceState);
+        }
+    }
+}
diff --git a/tests/robotests/src/com/android/settings/accounts/AccountDetailDashboardFragmentTest.java b/tests/robotests/src/com/android/settings/accounts/AccountDetailDashboardFragmentTest.java
index 15a3746..8924551 100644
--- a/tests/robotests/src/com/android/settings/accounts/AccountDetailDashboardFragmentTest.java
+++ b/tests/robotests/src/com/android/settings/accounts/AccountDetailDashboardFragmentTest.java
@@ -41,7 +41,6 @@
 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.ShadowApplication;
 import org.robolectric.util.ReflectionHelpers;
@@ -56,7 +55,7 @@
 import static org.robolectric.Shadows.shadowOf;
 
 @RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION_O)
 public class AccountDetailDashboardFragmentTest {
 
     private static final String METADATA_CATEGORY = "com.android.settings.category";
@@ -64,8 +63,6 @@
     private static final String METADATA_USER_HANDLE = "user_handle";
 
     @Mock(answer = RETURNS_DEEP_STUBS)
-    private Activity mActivity;
-    @Mock(answer = RETURNS_DEEP_STUBS)
     private AccountManager mAccountManager;
     @Mock
     private Preference mPreference;
@@ -130,11 +127,11 @@
 
     @Test
     public void refreshDashboardTiles_HasAccountType_shouldAddAccountNameToIntent() {
-        FakeFeatureFactory.setupForTest(mActivity);
+        FakeFeatureFactory.setupForTest(mContext);
         final FakeFeatureFactory featureFactory =
-                (FakeFeatureFactory) FakeFeatureFactory.getFactory(mActivity);
+                (FakeFeatureFactory) FakeFeatureFactory.getFactory(mContext);
         final DashboardFeatureProviderImpl dashboardFeatureProvider =
-                new DashboardFeatureProviderImpl(mActivity);
+                new DashboardFeatureProviderImpl(mContext);
         final PackageManager packageManager = mock(PackageManager.class);
         ReflectionHelpers.setField(dashboardFeatureProvider, "mPackageManager", packageManager);
         when(packageManager.resolveActivity(any(Intent.class), anyInt()))
diff --git a/tests/robotests/src/com/android/settings/accounts/AccountHeaderPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/accounts/AccountHeaderPreferenceControllerTest.java
index 34ac183..1b20e96 100644
--- a/tests/robotests/src/com/android/settings/accounts/AccountHeaderPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/accounts/AccountHeaderPreferenceControllerTest.java
@@ -16,8 +16,12 @@
 
 package com.android.settings.accounts;
 
+import static android.arch.lifecycle.Lifecycle.Event.ON_RESUME;
+
 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.when;
 
 import android.accounts.Account;
@@ -52,7 +56,7 @@
 @RunWith(SettingsRobolectricTestRunner.class)
 @Config(
     manifest = TestConfig.MANIFEST_PATH,
-    sdk = TestConfig.SDK_VERSION,
+    sdk = TestConfig.SDK_VERSION_O,
     shadows = AccountHeaderPreferenceControllerTest.ShadowAuthenticatorHelper.class
 )
 public class AccountHeaderPreferenceControllerTest {
@@ -70,38 +74,42 @@
 
     private AccountHeaderPreferenceController mController;
 
+    private Lifecycle mLifecycle =
+            new Lifecycle(() -> AccountHeaderPreferenceControllerTest.this.mLifecycle);
+
     @Before
     public void setUp() {
         MockitoAnnotations.initMocks(this);
         FakeFeatureFactory.setupForTest(mContext);
         mHeaderPreference = new LayoutPreference(
                 RuntimeEnvironment.application, R.layout.settings_entity_header);
+        doReturn(mContext).when(mActivity).getApplicationContext();
+        mLifecycle = new Lifecycle(() -> mLifecycle);
     }
 
     @Test
     public void isAvailable_noArgs_shouldReturnNull() {
         mController = new AccountHeaderPreferenceController(RuntimeEnvironment.application,
-                new Lifecycle(), mActivity, mFragment, null /* args */);
+                mLifecycle, mActivity, mFragment, null /* args */);
 
         assertThat(mController.isAvailable()).isFalse();
     }
 
     @Test
     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);
+                mLifecycle, mActivity, mFragment, args);
 
         assertThat(mController.isAvailable()).isTrue();
 
         when(mScreen.findPreference(anyString())).thenReturn(mHeaderPreference);
 
         mController.displayPreference(mScreen);
-        lifecycle.onResume();
+        mLifecycle.handleLifecycleEvent(ON_RESUME);
 
         final CharSequence label =
                 ((TextView) mHeaderPreference.findViewById(R.id.entity_header_title)).getText();
diff --git a/tests/robotests/src/com/android/settings/accounts/AccountPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/accounts/AccountPreferenceControllerTest.java
index 139bee7..6daaeca 100644
--- a/tests/robotests/src/com/android/settings/accounts/AccountPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/accounts/AccountPreferenceControllerTest.java
@@ -68,7 +68,7 @@
 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_O,
         shadows = {ShadowAccountManager.class, ShadowContentResolver.class})
 public class AccountPreferenceControllerTest {
 
diff --git a/tests/robotests/src/com/android/settings/accounts/AccountPreferenceTest.java b/tests/robotests/src/com/android/settings/accounts/AccountPreferenceTest.java
index 0778043..4399580 100644
--- a/tests/robotests/src/com/android/settings/accounts/AccountPreferenceTest.java
+++ b/tests/robotests/src/com/android/settings/accounts/AccountPreferenceTest.java
@@ -35,7 +35,7 @@
 import static org.mockito.Mockito.verify;
 
 @RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION_O)
 public class AccountPreferenceTest {
 
     private Context mContext;
diff --git a/tests/robotests/src/com/android/settings/accounts/AccountSyncPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/accounts/AccountSyncPreferenceControllerTest.java
index 5fbd3a7..dde68f5 100644
--- a/tests/robotests/src/com/android/settings/accounts/AccountSyncPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/accounts/AccountSyncPreferenceControllerTest.java
@@ -47,7 +47,7 @@
 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_O,
         shadows = {ShadowAccountManager.class, ShadowContentResolver.class})
 public class AccountSyncPreferenceControllerTest {
 
diff --git a/tests/robotests/src/com/android/settings/accounts/AccountTypePreferenceLoaderTest.java b/tests/robotests/src/com/android/settings/accounts/AccountTypePreferenceLoaderTest.java
index fff73b7..2e7f0fa 100644
--- a/tests/robotests/src/com/android/settings/accounts/AccountTypePreferenceLoaderTest.java
+++ b/tests/robotests/src/com/android/settings/accounts/AccountTypePreferenceLoaderTest.java
@@ -50,7 +50,7 @@
 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_O)
 public class AccountTypePreferenceLoaderTest {
 
     @Mock(answer = RETURNS_DEEP_STUBS)
diff --git a/tests/robotests/src/com/android/settings/accounts/AddUserWhenLockedPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/accounts/AddUserWhenLockedPreferenceControllerTest.java
index 38f6988..e00a0ae 100644
--- a/tests/robotests/src/com/android/settings/accounts/AddUserWhenLockedPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/accounts/AddUserWhenLockedPreferenceControllerTest.java
@@ -15,16 +15,22 @@
  */
 package com.android.settings.accounts;
 
+import static com.google.common.truth.Truth.assertThat;
+import static org.mockito.Answers.RETURNS_DEEP_STUBS;
+import static org.mockito.Matchers.anyInt;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
 import android.content.Context;
 import android.content.pm.UserInfo;
 import android.os.UserManager;
 import android.provider.Settings.Global;
-import android.support.v7.preference.Preference;
 import android.support.v7.preference.PreferenceScreen;
-import com.android.settingslib.RestrictedSwitchPreference;
 
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
+import com.android.settingslib.RestrictedSwitchPreference;
 
 import org.junit.Before;
 import org.junit.Test;
@@ -34,16 +40,8 @@
 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.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_O)
 public class AddUserWhenLockedPreferenceControllerTest {
 
     @Mock(answer = RETURNS_DEEP_STUBS)
@@ -62,7 +60,7 @@
         ShadowApplication shadowContext = ShadowApplication.getInstance();
         shadowContext.setSystemService(Context.USER_SERVICE, mUserManager);
         mContext = shadowContext.getApplicationContext();
-        mController = new AddUserWhenLockedPreferenceController(mContext);
+        mController = new AddUserWhenLockedPreferenceController(mContext, "fake_key");
     }
 
     @Test
@@ -70,13 +68,12 @@
         when(mUserManager.getUserInfo(anyInt())).thenReturn(mUserInfo);
         when(mUserInfo.isAdmin()).thenReturn(false);
         final RestrictedSwitchPreference preference = mock(RestrictedSwitchPreference.class);
-        when(mScreen.getPreferenceCount()).thenReturn(1);
-        when(mScreen.getPreference(0)).thenReturn(preference);
         when(preference.getKey()).thenReturn(mController.getPreferenceKey());
+        when(mScreen.findPreference(preference.getKey())).thenReturn(preference);
 
         mController.displayPreference(mScreen);
 
-        verify(mScreen).removePreference(any(Preference.class));
+        verify(preference).setVisible(false);
     }
 
     @Test
diff --git a/tests/robotests/src/com/android/settings/accounts/AutoSyncDataPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/accounts/AutoSyncDataPreferenceControllerTest.java
index b8ad837..336de21 100644
--- a/tests/robotests/src/com/android/settings/accounts/AutoSyncDataPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/accounts/AutoSyncDataPreferenceControllerTest.java
@@ -15,19 +15,23 @@
  */
 package com.android.settings.accounts;
 
+import static com.google.common.truth.Truth.assertThat;
+import static org.mockito.Answers.RETURNS_DEEP_STUBS;
+import static org.mockito.Matchers.anyInt;
+import static org.mockito.Mockito.when;
+
 import android.app.Fragment;
 import android.content.Context;
 import android.content.DialogInterface;
 import android.content.pm.UserInfo;
 import android.os.UserManager;
+import android.support.v14.preference.SwitchPreference;
 import android.support.v7.preference.Preference;
 import android.support.v7.preference.PreferenceScreen;
-import android.support.v14.preference.SwitchPreference;
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.TestConfig;
 
-import java.util.ArrayList;
-import java.util.List;
+import com.android.settings.TestConfig;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
+
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -36,28 +40,21 @@
 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.Mockito.mock;
-import static org.mockito.Mockito.never;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
+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_O)
 public class AutoSyncDataPreferenceControllerTest {
 
     @Mock(answer = RETURNS_DEEP_STUBS)
     private PreferenceScreen mScreen;
     @Mock(answer = RETURNS_DEEP_STUBS)
     private UserManager mUserManager;
-    @Mock(answer = RETURNS_DEEP_STUBS)
-    private Fragment mFragment;
     @Mock
-    private Preference mPreference;
+    private Fragment mFragment;
 
+    private Preference mPreference;
     private Context mContext;
     private AutoSyncDataPreferenceController mController;
     private AutoSyncDataPreferenceController.ConfirmAutoSyncChangeFragment mConfirmSyncFragment;
@@ -71,9 +68,9 @@
         mController = new AutoSyncDataPreferenceController(mContext, mFragment);
         mConfirmSyncFragment = new AutoSyncDataPreferenceController.ConfirmAutoSyncChangeFragment();
         mConfirmSyncFragment.setTargetFragment(mFragment, 0);
-        when(mScreen.getPreferenceCount()).thenReturn(1);
-        when(mScreen.getPreference(0)).thenReturn(mPreference);
-        when(mPreference.getKey()).thenReturn(mController.getPreferenceKey());
+        mPreference = new Preference(mContext);
+        mPreference.setKey(mController.getPreferenceKey());
+        when(mScreen.findPreference(mPreference.getKey())).thenReturn(mPreference);
     }
 
     @Test
@@ -82,7 +79,7 @@
 
         mController.displayPreference(mScreen);
 
-        verify(mScreen).removePreference(any(Preference.class));
+        assertThat(mPreference.isVisible()).isFalse();
     }
 
     @Test
@@ -92,7 +89,7 @@
 
         mController.displayPreference(mScreen);
 
-        verify(mScreen, never()).removePreference(any(Preference.class));
+        assertThat(mPreference.isVisible()).isTrue();
     }
 
     @Test
@@ -105,7 +102,7 @@
 
         mController.displayPreference(mScreen);
 
-        verify(mScreen, never()).removePreference(any(Preference.class));
+        assertThat(mPreference.isVisible()).isTrue();
     }
 
     @Test
@@ -119,7 +116,7 @@
 
         mController.displayPreference(mScreen);
 
-        verify(mScreen).removePreference(any(Preference.class));
+        assertThat(mPreference.isVisible()).isFalse();
     }
 
     @Test
@@ -135,5 +132,4 @@
         mConfirmSyncFragment.onClick(null, DialogInterface.BUTTON_NEGATIVE);
         assertThat(preference.isChecked()).isFalse();
     }
-
 }
diff --git a/tests/robotests/src/com/android/settings/accounts/AutoSyncPersonalDataPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/accounts/AutoSyncPersonalDataPreferenceControllerTest.java
index ab462c0..50d4df8 100644
--- a/tests/robotests/src/com/android/settings/accounts/AutoSyncPersonalDataPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/accounts/AutoSyncPersonalDataPreferenceControllerTest.java
@@ -15,17 +15,21 @@
  */
 package com.android.settings.accounts;
 
+import static com.google.common.truth.Truth.assertThat;
+import static org.mockito.Answers.RETURNS_DEEP_STUBS;
+import static org.mockito.Matchers.anyInt;
+import static org.mockito.Mockito.when;
+
 import android.app.Fragment;
 import android.content.Context;
 import android.content.pm.UserInfo;
 import android.os.UserManager;
 import android.support.v7.preference.Preference;
 import android.support.v7.preference.PreferenceScreen;
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.TestConfig;
 
-import java.util.ArrayList;
-import java.util.List;
+import com.android.settings.TestConfig;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
+
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -34,15 +38,11 @@
 import org.robolectric.annotation.Config;
 import org.robolectric.shadows.ShadowApplication;
 
-import static org.mockito.Answers.RETURNS_DEEP_STUBS;
-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 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_O)
 public class AutoSyncPersonalDataPreferenceControllerTest {
 
     @Mock(answer = RETURNS_DEEP_STUBS)
@@ -51,10 +51,9 @@
     private UserManager mUserManager;
     @Mock(answer = RETURNS_DEEP_STUBS)
     private Fragment mFragment;
-    @Mock
-    private Preference mPreference;
 
     private Context mContext;
+    private Preference mPreference;
     private AutoSyncPersonalDataPreferenceController mController;
 
     @Before
@@ -64,9 +63,9 @@
         shadowContext.setSystemService(Context.USER_SERVICE, mUserManager);
         mContext = shadowContext.getApplicationContext();
         mController = new AutoSyncPersonalDataPreferenceController(mContext, mFragment);
-        when(mScreen.getPreferenceCount()).thenReturn(1);
-        when(mScreen.getPreference(0)).thenReturn(mPreference);
-        when(mPreference.getKey()).thenReturn(mController.getPreferenceKey());
+        mPreference = new Preference(mContext);
+        mPreference.setKey(mController.getPreferenceKey());
+        when(mScreen.findPreference(mPreference.getKey())).thenReturn(mPreference);
     }
 
     @Test
@@ -75,7 +74,7 @@
 
         mController.displayPreference(mScreen);
 
-        verify(mScreen).removePreference(any(Preference.class));
+        assertThat(mPreference.isVisible()).isFalse();
     }
 
     @Test
@@ -85,7 +84,7 @@
 
         mController.displayPreference(mScreen);
 
-        verify(mScreen).removePreference(any(Preference.class));
+        assertThat(mPreference.isVisible()).isFalse();
     }
 
     @Test
@@ -98,11 +97,11 @@
 
         mController.displayPreference(mScreen);
 
-        verify(mScreen).removePreference(any(Preference.class));
+        assertThat(mPreference.isVisible()).isFalse();
     }
 
     @Test
-    public void displayPref_prefAvaiable_shouldDisplay() {
+    public void displayPref_prefAvailable_shouldDisplay() {
         List<UserInfo> infos = new ArrayList<>();
         infos.add(new UserInfo(1, "user 1", 0));
         infos.add(new UserInfo(2, "user 2", 0));
@@ -112,7 +111,7 @@
 
         mController.displayPreference(mScreen);
 
-        verify(mScreen, never()).removePreference(any(Preference.class));
+        assertThat(mPreference.isVisible()).isTrue();
     }
 
 }
diff --git a/tests/robotests/src/com/android/settings/accounts/AutoSyncWorkDataPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/accounts/AutoSyncWorkDataPreferenceControllerTest.java
index a25aa28..35a8bb6 100644
--- a/tests/robotests/src/com/android/settings/accounts/AutoSyncWorkDataPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/accounts/AutoSyncWorkDataPreferenceControllerTest.java
@@ -42,7 +42,7 @@
 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_O)
 public class AutoSyncWorkDataPreferenceControllerTest {
 
     private static int MANAGED_PROFILE_ID = 10;
diff --git a/tests/robotests/src/com/android/settings/accounts/EmergencyInfoPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/accounts/EmergencyInfoPreferenceControllerTest.java
index 0f7de46..29a011e 100644
--- a/tests/robotests/src/com/android/settings/accounts/EmergencyInfoPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/accounts/EmergencyInfoPreferenceControllerTest.java
@@ -15,31 +15,6 @@
  */
 package com.android.settings.accounts;
 
-import android.content.Context;
-import android.content.Intent;
-import android.content.pm.ResolveInfo;
-import android.content.pm.UserInfo;
-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.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 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.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;
@@ -49,8 +24,35 @@
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
+import android.content.Context;
+import android.content.Intent;
+import android.content.pm.ResolveInfo;
+import android.content.pm.UserInfo;
+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.TestConfig;
+import com.android.settings.search.SearchIndexableRaw;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.shadow.ShadowAccountManager;
+import com.android.settings.testutils.shadow.ShadowContentResolver;
+
+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.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_O)
 public class EmergencyInfoPreferenceControllerTest {
 
     @Mock(answer = RETURNS_DEEP_STUBS)
@@ -61,15 +63,19 @@
     private UserManager mUserManager;
 
     private EmergencyInfoPreferenceController mController;
+    private Preference mPreference;
 
     @Before
     public void setUp() {
         MockitoAnnotations.initMocks(this);
         mController = new EmergencyInfoPreferenceController(mContext);
+        mPreference = new Preference(RuntimeEnvironment.application);
+        mPreference.setKey(mController.getPreferenceKey());
+        when(mScreen.findPreference(mPreference.getKey())).thenReturn(mPreference);
     }
 
     @Test
-    public void updateRawDataToIndex_prefUnavaiable_shouldNotUpdate() {
+    public void updateRawDataToIndex_prefUnavailable_shouldNotUpdate() {
         final List<SearchIndexableRaw> data = new ArrayList<>();
         when(mContext.getPackageManager().queryIntentActivities(
                 any(Intent.class), anyInt()))
@@ -81,7 +87,7 @@
     }
 
     @Test
-    public void updateRawDataToIndex_prefAvaiable_shouldUpdate() {
+    public void updateRawDataToIndex_prefAvailable_shouldUpdate() {
         final List<SearchIndexableRaw> data = new ArrayList<>();
         final List<ResolveInfo> infos = new ArrayList<>();
         infos.add(new ResolveInfo());
@@ -95,23 +101,18 @@
     }
 
     @Test
-    public void displayPref_prefUnAvaiable_shouldNotDisplay() {
+    public void displayPref_prefUnAvailable_shouldNotDisplay() {
         when(mContext.getPackageManager().queryIntentActivities(
                 any(Intent.class), anyInt()))
                 .thenReturn(null);
-        final Preference preference = mock(Preference.class);
-        when(mScreen.getPreferenceCount()).thenReturn(1);
-        when(mScreen.getPreference(0)).thenReturn(preference);
-        when(preference.getKey()).thenReturn(mController.getPreferenceKey());
 
         mController.displayPreference(mScreen);
 
-        verify(mScreen).removePreference(any(Preference.class));
+        assertThat(mPreference.isVisible()).isFalse();
     }
 
     @Test
-    public void displayPref_prefAvaiable_shouldDisplay() {
-        final List<SearchIndexableRaw> data = new ArrayList<>();
+    public void displayPref_prefAvailable_shouldDisplay() {
         final List<ResolveInfo> infos = new ArrayList<>();
         infos.add(new ResolveInfo());
         when(mContext.getPackageManager().queryIntentActivities(
diff --git a/tests/robotests/src/com/android/settings/accounts/ProviderPreferenceTest.java b/tests/robotests/src/com/android/settings/accounts/ProviderPreferenceTest.java
new file mode 100644
index 0000000..4d1667f
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/accounts/ProviderPreferenceTest.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.accounts;
+
+
+import static com.google.common.truth.Truth.assertThat;
+
+import android.content.Context;
+
+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 org.robolectric.util.ReflectionHelpers;
+
+@RunWith(SettingsRobolectricTestRunner.class)
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION_O)
+public class ProviderPreferenceTest {
+
+    private Context mContext;
+
+    @Before
+    public void setUp() {
+        mContext = RuntimeEnvironment.application;
+    }
+
+    @Test
+    public void shouldUseSmallIcon() {
+        final ProviderPreference providerPreference = new ProviderPreference(
+                mContext, "account_type", null /* icon */, "provider_name");
+        final boolean useSmallIcon =
+                ReflectionHelpers.getField(providerPreference, "mUseSmallIcon");
+        assertThat(useSmallIcon).isTrue();
+    }
+}
diff --git a/tests/robotests/src/com/android/settings/accounts/RemoveAccountPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/accounts/RemoveAccountPreferenceControllerTest.java
index a1eb2d8..8250340 100644
--- a/tests/robotests/src/com/android/settings/accounts/RemoveAccountPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/accounts/RemoveAccountPreferenceControllerTest.java
@@ -40,16 +40,17 @@
 import android.os.UserHandle;
 import android.os.UserManager;
 import android.support.v14.preference.PreferenceFragment;
+import android.support.v7.preference.PreferenceManager;
 import android.support.v7.preference.PreferenceScreen;
 import android.widget.Button;
 
 import com.android.settings.R;
 import com.android.settings.TestConfig;
 import com.android.settings.applications.LayoutPreference;
-import com.android.settings.enterprise.DevicePolicyManagerWrapper;
 import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.testutils.shadow.ShadowAccountManager;
 import com.android.settings.testutils.shadow.ShadowContentResolver;
+import com.android.settings.wrapper.DevicePolicyManagerWrapper;
 
 import org.junit.Before;
 import org.junit.Test;
@@ -60,7 +61,7 @@
 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_O)
 public class RemoveAccountPreferenceControllerTest {
 
     private static final String KEY_REMOVE_ACCOUNT = "remove_account";
@@ -70,9 +71,11 @@
     private AccountManager mAccountManager;
     @Mock
     private DevicePolicyManagerWrapper mDevicePolicyManager;
-    @Mock(answer = RETURNS_DEEP_STUBS)
+    @Mock
     private PreferenceFragment mFragment;
     @Mock
+    private PreferenceManager mPreferenceManager;
+    @Mock
     private PreferenceScreen mScreen;
     @Mock
     private FragmentManager mFragmentManager;
@@ -92,7 +95,8 @@
         mContext = spy(shadowContext.getApplicationContext());
 
         when(mFragment.getPreferenceScreen()).thenReturn(mScreen);
-        when(mFragment.getPreferenceManager().getContext()).thenReturn(mContext);
+        when(mFragment.getPreferenceManager()).thenReturn(mPreferenceManager);
+        when(mPreferenceManager.getContext()).thenReturn(mContext);
         when(mFragment.getFragmentManager()).thenReturn(mFragmentManager);
         when(mFragmentManager.beginTransaction()).thenReturn(mFragmentTransaction);
         when(mAccountManager.getAuthenticatorTypesAsUser(anyInt())).thenReturn(
diff --git a/tests/robotests/src/com/android/settings/accounts/RemoveUserFragmentTest.java b/tests/robotests/src/com/android/settings/accounts/RemoveUserFragmentTest.java
index cd73068..ef23d22 100644
--- a/tests/robotests/src/com/android/settings/accounts/RemoveUserFragmentTest.java
+++ b/tests/robotests/src/com/android/settings/accounts/RemoveUserFragmentTest.java
@@ -28,7 +28,7 @@
 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_O)
 public class RemoveUserFragmentTest {
 
     @Test
diff --git a/tests/robotests/src/com/android/settings/accounts/UserAndAccountDashboardFragmentTest.java b/tests/robotests/src/com/android/settings/accounts/UserAndAccountDashboardFragmentTest.java
index 8c13aab..2383ed1 100644
--- a/tests/robotests/src/com/android/settings/accounts/UserAndAccountDashboardFragmentTest.java
+++ b/tests/robotests/src/com/android/settings/accounts/UserAndAccountDashboardFragmentTest.java
@@ -17,7 +17,6 @@
 
 import android.app.Activity;
 import android.content.pm.UserInfo;
-import android.os.Bundle;
 import android.os.UserManager;
 import android.provider.SearchIndexableResource;
 
@@ -25,7 +24,6 @@
 import com.android.settings.TestConfig;
 import com.android.settings.dashboard.SummaryLoader;
 import com.android.settingslib.drawer.CategoryKey;
-import com.android.settingslib.drawer.Tile;
 
 import org.junit.Before;
 import org.junit.Test;
@@ -45,7 +43,7 @@
 import static org.mockito.Mockito.when;
 
 @RunWith(RobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION_O)
 public class UserAndAccountDashboardFragmentTest {
 
     private static final String METADATA_CATEGORY = "com.android.settings.category";
diff --git a/tests/robotests/src/com/android/settings/applications/AppAndNotificationDashboardFragmentTest.java b/tests/robotests/src/com/android/settings/applications/AppAndNotificationDashboardFragmentTest.java
index 697d04f..55141f7 100644
--- a/tests/robotests/src/com/android/settings/applications/AppAndNotificationDashboardFragmentTest.java
+++ b/tests/robotests/src/com/android/settings/applications/AppAndNotificationDashboardFragmentTest.java
@@ -16,30 +16,35 @@
 
 package com.android.settings.applications;
 
-import android.content.Context;
+import static com.google.common.truth.Truth.assertThat;
 
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.when;
+
+import android.content.Context;
 import android.os.UserManager;
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
+
 import com.android.settings.TestConfig;
+import com.android.settings.notification.EmergencyBroadcastPreferenceController;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.testutils.XmlTestUtils;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.robolectric.RuntimeEnvironment;
 import org.robolectric.annotation.Config;
+import org.robolectric.annotation.Implementation;
+import org.robolectric.annotation.Implements;
 
 import java.util.List;
 
-import static com.google.common.truth.Truth.assertThat;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.spy;
-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_O)
 public class AppAndNotificationDashboardFragmentTest {
 
     @Test
+    @Config(shadows = {ShadowEmergencyBroadcastPreferenceController.class})
     public void testNonIndexableKeys_existInXmlLayout() {
         final Context context = spy(RuntimeEnvironment.application);
         UserManager manager = mock(UserManager.class);
@@ -47,10 +52,20 @@
         when(context.getSystemService(Context.USER_SERVICE)).thenReturn(manager);
         final List<String> niks = AppAndNotificationDashboardFragment.SEARCH_INDEX_DATA_PROVIDER
                 .getNonIndexableKeys(context);
-        final int xmlId = (new AppAndNotificationDashboardFragment()).getPreferenceScreenResId();
+        AppAndNotificationDashboardFragment fragment = new AppAndNotificationDashboardFragment();
+        final int xmlId = fragment.getPreferenceScreenResId();
 
         final List<String> keys = XmlTestUtils.getKeysFromPreferenceXml(context, xmlId);
 
         assertThat(keys).containsAllIn(niks);
     }
+
+    @Implements(EmergencyBroadcastPreferenceController.class)
+    public static class ShadowEmergencyBroadcastPreferenceController {
+
+        @Implementation
+        public boolean isAvailable() {
+            return true;
+        }
+    }
 }
diff --git a/tests/robotests/src/com/android/settings/applications/AppInfoDashboardFragmentTest.java b/tests/robotests/src/com/android/settings/applications/AppInfoDashboardFragmentTest.java
new file mode 100644
index 0000000..97c4df0
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/applications/AppInfoDashboardFragmentTest.java
@@ -0,0 +1,460 @@
+/*
+ * Copyright (C) 2017 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF 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.ArgumentMatchers.nullable;
+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.AlertDialog;
+import android.app.AppOpsManager;
+import android.app.Fragment;
+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.res.Resources;
+import android.os.UserManager;
+import android.support.v7.preference.Preference;
+import android.support.v7.preference.PreferenceManager;
+import android.support.v7.preference.PreferenceScreen;
+import android.view.View;
+
+import com.android.settings.R;
+import com.android.settings.SettingsActivity;
+import com.android.settings.TestConfig;
+import com.android.settings.applications.instantapps.InstantAppButtonsController;
+import com.android.settings.applications.instantapps.InstantAppButtonsController.ShowDialogDelegate;
+import com.android.settings.testutils.FakeFeatureFactory;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
+import com.android.settings.widget.ActionButtonPreferenceTest;
+import com.android.settings.wrapper.DevicePolicyManagerWrapper;
+import com.android.settingslib.Utils;
+import com.android.settingslib.applications.AppUtils;
+import com.android.settingslib.applications.ApplicationsState.AppEntry;
+import com.android.settingslib.applications.instantapps.InstantAppDataProvider;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Answers;
+import org.mockito.Mock;
+import org.mockito.MockitoAnnotations;
+import org.robolectric.RuntimeEnvironment;
+import org.robolectric.annotation.Config;
+import org.robolectric.annotation.Implementation;
+import org.robolectric.annotation.Implements;
+import org.robolectric.util.ReflectionHelpers;
+
+import java.util.HashSet;
+
+@RunWith(SettingsRobolectricTestRunner.class)
+@Config(
+    manifest = TestConfig.MANIFEST_PATH,
+    sdk = TestConfig.SDK_VERSION_O
+)
+public final class AppInfoDashboardFragmentTest {
+
+    private static final String PACKAGE_NAME = "test_package_name";
+
+    @Mock(answer = Answers.RETURNS_DEEP_STUBS)
+    private Context mContext;
+    @Mock(answer = Answers.RETURNS_DEEP_STUBS)
+    private UserManager mUserManager;
+    @Mock(answer = Answers.RETURNS_DEEP_STUBS)
+    private SettingsActivity mActivity;
+    @Mock
+    private DevicePolicyManagerWrapper mDevicePolicyManager;
+    @Mock
+    private PackageManager mPackageManager;
+    @Mock
+    private AppOpsManager mAppOpsManager;
+
+    private FakeFeatureFactory mFeatureFactory;
+    private AppInfoDashboardFragment mAppDetail;
+    private Context mShadowContext;
+
+
+    @Before
+    public void setUp() {
+        MockitoAnnotations.initMocks(this);
+        mFeatureFactory = FakeFeatureFactory.setupForTest(mContext);
+        mShadowContext = RuntimeEnvironment.application;
+        mAppDetail = spy(new AppInfoDashboardFragment());
+        doReturn(mActivity).when(mAppDetail).getActivity();
+        doReturn(mShadowContext).when(mAppDetail).getContext();
+        doReturn(mPackageManager).when(mActivity).getPackageManager();
+        doReturn(mAppOpsManager).when(mActivity).getSystemService(Context.APP_OPS_SERVICE);
+        mAppDetail.mActionButtons = ActionButtonPreferenceTest.createMock();
+
+        // Default to not considering any apps to be instant (individual tests can override this).
+        ReflectionHelpers.setStaticField(AppUtils.class, "sInstantAppDataProvider",
+                (InstantAppDataProvider) (i -> false));
+    }
+
+    @Test
+    public void shouldShowUninstallForAll_installForOneOtherUserOnly_shouldReturnTrue() {
+        when(mDevicePolicyManager.packageHasActiveAdmins(nullable(String.class))).thenReturn(false);
+        when(mUserManager.getUsers().size()).thenReturn(2);
+        ReflectionHelpers.setField(mAppDetail, "mDpm", mDevicePolicyManager);
+        ReflectionHelpers.setField(mAppDetail, "mUserManager", mUserManager);
+        final ApplicationInfo info = new ApplicationInfo();
+        info.enabled = true;
+        final AppEntry appEntry = mock(AppEntry.class);
+        appEntry.info = info;
+        final PackageInfo packageInfo = mock(PackageInfo.class);
+        ReflectionHelpers.setField(mAppDetail, "mPackageInfo", packageInfo);
+
+        assertThat(mAppDetail.shouldShowUninstallForAll(appEntry)).isTrue();
+    }
+
+    @Test
+    public void shouldShowUninstallForAll_installForSelfOnly_shouldReturnFalse() {
+        when(mDevicePolicyManager.packageHasActiveAdmins(nullable(String.class))).thenReturn(false);
+        when(mUserManager.getUsers().size()).thenReturn(2);
+        ReflectionHelpers.setField(mAppDetail, "mDpm", mDevicePolicyManager);
+        ReflectionHelpers.setField(mAppDetail, "mUserManager", mUserManager);
+        final ApplicationInfo info = new ApplicationInfo();
+        info.flags = ApplicationInfo.FLAG_INSTALLED;
+        info.enabled = true;
+        final AppEntry appEntry = mock(AppEntry.class);
+        appEntry.info = info;
+        final PackageInfo packageInfo = mock(PackageInfo.class);
+        ReflectionHelpers.setField(mAppDetail, "mPackageInfo", packageInfo);
+
+        assertThat(mAppDetail.shouldShowUninstallForAll(appEntry)).isFalse();
+    }
+
+    @Test
+    public void launchFragment_hasNoPackageInfo_shouldFinish() {
+        ReflectionHelpers.setField(mAppDetail, "mPackageInfo", null);
+
+        assertThat(mAppDetail.ensurePackageInfoAvailable(mActivity)).isFalse();
+        verify(mActivity).finishAndRemoveTask();
+    }
+
+    @Test
+    public void launchFragment_hasPackageInfo_shouldReturnTrue() {
+        final PackageInfo packageInfo = mock(PackageInfo.class);
+        ReflectionHelpers.setField(mAppDetail, "mPackageInfo", packageInfo);
+
+        assertThat(mAppDetail.ensurePackageInfoAvailable(mActivity)).isTrue();
+        verify(mActivity, never()).finishAndRemoveTask();
+    }
+
+    @Test
+    public void packageSizeChange_isOtherPackage_shouldNotRefreshUi() {
+        ReflectionHelpers.setField(mAppDetail, "mPackageName", PACKAGE_NAME);
+        mAppDetail.onPackageSizeChanged("Not_" + PACKAGE_NAME);
+
+        verify(mAppDetail, never()).refreshUi();
+    }
+
+    @Test
+    public void packageSizeChange_isOwnPackage_shouldRefreshUi() {
+        doReturn(Boolean.TRUE).when(mAppDetail).refreshUi();
+        ReflectionHelpers.setField(mAppDetail, "mPackageName", PACKAGE_NAME);
+
+        mAppDetail.onPackageSizeChanged(PACKAGE_NAME);
+
+        verify(mAppDetail).refreshUi();
+    }
+
+    // Tests that we don't show the "uninstall for all users" button for instant apps.
+    @Test
+    public void instantApps_noUninstallForAllButton() {
+        // Make this app appear to be instant.
+        ReflectionHelpers.setStaticField(AppUtils.class, "sInstantAppDataProvider",
+                (InstantAppDataProvider) (i -> true));
+        when(mDevicePolicyManager.packageHasActiveAdmins(nullable(String.class))).thenReturn(false);
+        when(mUserManager.getUsers().size()).thenReturn(2);
+
+        final ApplicationInfo info = new ApplicationInfo();
+        info.enabled = true;
+        final AppEntry appEntry = mock(AppEntry.class);
+        appEntry.info = info;
+        final PackageInfo packageInfo = mock(PackageInfo.class);
+
+        ReflectionHelpers.setField(mAppDetail, "mDpm", mDevicePolicyManager);
+        ReflectionHelpers.setField(mAppDetail, "mUserManager", mUserManager);
+        ReflectionHelpers.setField(mAppDetail, "mPackageInfo", packageInfo);
+
+        assertThat(mAppDetail.shouldShowUninstallForAll(appEntry)).isFalse();
+    }
+
+    // Tests that we don't show the uninstall button for instant apps"
+    @Test
+    public void instantApps_noUninstallButton() {
+        // Make this app appear to be instant.
+        ReflectionHelpers.setStaticField(AppUtils.class, "sInstantAppDataProvider",
+                (InstantAppDataProvider) (i -> true));
+        final ApplicationInfo info = new ApplicationInfo();
+        info.flags = ApplicationInfo.FLAG_INSTALLED;
+        info.enabled = true;
+        final AppEntry appEntry = mock(AppEntry.class);
+        appEntry.info = info;
+        final PackageInfo packageInfo = mock(PackageInfo.class);
+        packageInfo.applicationInfo = info;
+
+        ReflectionHelpers.setField(mAppDetail, "mUserManager", mUserManager);
+        ReflectionHelpers.setField(mAppDetail, "mAppEntry", appEntry);
+        ReflectionHelpers.setField(mAppDetail, "mPackageInfo", packageInfo);
+
+        mAppDetail.initUninstallButtonForUserApp();
+        verify(mAppDetail.mActionButtons).setButton1Visible(false);
+    }
+
+    // Tests that we don't show the force stop button for instant apps (they aren't allowed to run
+    // when they aren't in the foreground).
+    @Test
+    public void instantApps_noForceStop() {
+        // Make this app appear to be instant.
+        ReflectionHelpers.setStaticField(AppUtils.class, "sInstantAppDataProvider",
+                (InstantAppDataProvider) (i -> true));
+        final PackageInfo packageInfo = mock(PackageInfo.class);
+        final AppEntry appEntry = mock(AppEntry.class);
+        final ApplicationInfo info = new ApplicationInfo();
+        appEntry.info = info;
+
+        ReflectionHelpers.setField(mAppDetail, "mDpm", mDevicePolicyManager);
+        ReflectionHelpers.setField(mAppDetail, "mPackageInfo", packageInfo);
+        ReflectionHelpers.setField(mAppDetail, "mAppEntry", appEntry);
+
+        mAppDetail.checkForceStop();
+        verify(mAppDetail.mActionButtons).setButton2Visible(false);
+    }
+
+    @Test
+    public void instantApps_buttonControllerHandlesDialog() {
+        InstantAppButtonsController mockController = mock(InstantAppButtonsController.class);
+        ReflectionHelpers.setField(
+                mAppDetail, "mInstantAppButtonsController", mockController);
+        // Make sure first that button controller is not called for supported dialog id
+        AlertDialog mockDialog = mock(AlertDialog.class);
+        when(mockController.createDialog(InstantAppButtonsController.DLG_CLEAR_APP))
+                .thenReturn(mockDialog);
+        assertThat(mAppDetail.createDialog(InstantAppButtonsController.DLG_CLEAR_APP, 0))
+                .isEqualTo(mockDialog);
+        verify(mockController).createDialog(InstantAppButtonsController.DLG_CLEAR_APP);
+    }
+
+    // A helper class for testing the InstantAppButtonsController - it lets us look up the
+    // preference associated with a key for instant app buttons and get back a mock
+    // LayoutPreference (to avoid a null pointer exception).
+    public static class InstalledAppDetailsWithMockInstantButtons extends InstalledAppDetails {
+        @Mock
+        private LayoutPreference mInstantButtons;
+
+        public InstalledAppDetailsWithMockInstantButtons() {
+            super();
+            MockitoAnnotations.initMocks(this);
+        }
+
+        @Override
+        public Preference findPreference(CharSequence key) {
+            if (key == "instant_app_buttons") {
+                return mInstantButtons;
+            }
+            return super.findPreference(key);
+        }
+    }
+
+    @Test
+    public void instantApps_instantSpecificButtons() {
+        // Make this app appear to be instant.
+        ReflectionHelpers.setStaticField(AppUtils.class, "sInstantAppDataProvider",
+                (InstantAppDataProvider) (i -> true));
+        final PackageInfo packageInfo = mock(PackageInfo.class);
+
+        final InstalledAppDetailsWithMockInstantButtons
+                fragment = new InstalledAppDetailsWithMockInstantButtons();
+        ReflectionHelpers.setField(fragment, "mPackageInfo", packageInfo);
+        ReflectionHelpers.setField(fragment, "mApplicationFeatureProvider",
+                mFeatureFactory.applicationFeatureProvider);
+
+        final InstantAppButtonsController buttonsController =
+                mock(InstantAppButtonsController.class);
+        when(buttonsController.setPackageName(nullable(String.class)))
+                .thenReturn(buttonsController);
+        when(mFeatureFactory.applicationFeatureProvider.newInstantAppButtonsController(
+                nullable(Fragment.class), nullable(View.class), nullable(ShowDialogDelegate.class)))
+                .thenReturn(buttonsController);
+
+        fragment.maybeAddInstantAppButtons();
+        verify(buttonsController).setPackageName(nullable(String.class));
+        verify(buttonsController).show();
+    }
+
+    @Test
+    public void instantApps_removeCorrectPref() {
+        PreferenceScreen mockPreferenceScreen = mock(PreferenceScreen.class);
+        PreferenceManager mockPreferenceManager = mock(PreferenceManager.class);
+        AppDomainsPreference mockAppDomainsPref = mock(AppDomainsPreference.class);
+        PackageInfo mockPackageInfo = mock(PackageInfo.class);
+        PackageManager mockPackageManager = mock(PackageManager.class);
+        ReflectionHelpers.setField(
+                mAppDetail, "mInstantAppDomainsPreference", mockAppDomainsPref);
+        ReflectionHelpers.setField(
+                mAppDetail, "mPreferenceManager", mockPreferenceManager);
+        ReflectionHelpers.setField(
+                mAppDetail, "mPackageInfo", mockPackageInfo);
+        ReflectionHelpers.setField(
+                mAppDetail, "mPm", mockPackageManager);
+        when(mockPreferenceManager.getPreferenceScreen()).thenReturn(mockPreferenceScreen);
+
+        ReflectionHelpers.setStaticField(AppUtils.class, "sInstantAppDataProvider",
+                (InstantAppDataProvider) (i -> false));
+        mAppDetail.prepareInstantAppPrefs();
+
+        // For the non instant case we remove the app domain pref, and leave the launch pref
+        verify(mockPreferenceScreen).removePreference(mockAppDomainsPref);
+
+        // For the instant app case we remove the launch preff, and leave the app domain pref
+        ReflectionHelpers.setStaticField(AppUtils.class, "sInstantAppDataProvider",
+                (InstantAppDataProvider) (i -> true));
+
+        mAppDetail.prepareInstantAppPrefs();
+        // Will be 1 still due to above call
+        verify(mockPreferenceScreen, times(1))
+                .removePreference(mockAppDomainsPref);
+    }
+
+    @Test
+    public void onActivityResult_uninstalledUpdates_shouldInvalidateOptionsMenu() {
+        doReturn(true).when(mAppDetail).refreshUi();
+
+        mAppDetail.onActivityResult(InstalledAppDetails.REQUEST_UNINSTALL, 0, mock(Intent.class));
+
+        verify(mActivity).invalidateOptionsMenu();
+    }
+
+    @Test
+    public void handleDisableable_appIsHomeApp_buttonShouldNotWork() {
+        final ApplicationInfo info = new ApplicationInfo();
+        info.packageName = "pkg";
+        info.enabled = true;
+        final AppEntry appEntry = mock(AppEntry.class);
+        appEntry.info = info;
+        final HashSet<String> homePackages = new HashSet<>();
+        homePackages.add(info.packageName);
+
+        ReflectionHelpers.setField(mAppDetail, "mHomePackages", homePackages);
+        ReflectionHelpers.setField(mAppDetail, "mAppEntry", appEntry);
+
+        assertThat(mAppDetail.handleDisableable()).isFalse();
+        verify(mAppDetail.mActionButtons).setButton1Text(R.string.disable_text);
+    }
+
+    @Test
+    @Config(shadows = ShadowUtils.class)
+    public void handleDisableable_appIsEnabled_buttonShouldWork() {
+        final ApplicationInfo info = new ApplicationInfo();
+        info.packageName = "pkg";
+        info.enabled = true;
+        info.enabledSetting = PackageManager.COMPONENT_ENABLED_STATE_ENABLED;
+
+        final AppEntry appEntry = mock(AppEntry.class);
+        appEntry.info = info;
+        when(mFeatureFactory.applicationFeatureProvider.getKeepEnabledPackages()).thenReturn(
+                new HashSet<>());
+
+        ReflectionHelpers.setField(mAppDetail, "mApplicationFeatureProvider",
+                mFeatureFactory.applicationFeatureProvider);
+        ReflectionHelpers.setField(mAppDetail, "mAppEntry", appEntry);
+
+        assertThat(mAppDetail.handleDisableable()).isTrue();
+        verify(mAppDetail.mActionButtons).setButton1Text(R.string.disable_text);
+    }
+
+    @Test
+    @Config(shadows = ShadowUtils.class)
+    public void handleDisableable_appIsDisabled_buttonShouldShowEnable() {
+        final ApplicationInfo info = new ApplicationInfo();
+        info.packageName = "pkg";
+        info.enabled = false;
+        info.enabledSetting = PackageManager.COMPONENT_ENABLED_STATE_ENABLED;
+
+        final AppEntry appEntry = mock(AppEntry.class);
+        appEntry.info = info;
+        when(mFeatureFactory.applicationFeatureProvider.getKeepEnabledPackages()).thenReturn(
+                new HashSet<>());
+
+        ReflectionHelpers.setField(mAppDetail, "mApplicationFeatureProvider",
+                mFeatureFactory.applicationFeatureProvider);
+        ReflectionHelpers.setField(mAppDetail, "mAppEntry", appEntry);
+
+        assertThat(mAppDetail.handleDisableable()).isTrue();
+        verify(mAppDetail.mActionButtons).setButton1Text(R.string.enable_text);
+        verify(mAppDetail.mActionButtons).setButton1Positive(true);
+    }
+
+    @Test
+    @Config(shadows = ShadowUtils.class)
+    public void handleDisableable_appIsEnabledAndInKeepEnabledWhitelist_buttonShouldNotWork() {
+        final ApplicationInfo info = new ApplicationInfo();
+        info.packageName = "pkg";
+        info.enabled = true;
+        info.enabledSetting = PackageManager.COMPONENT_ENABLED_STATE_ENABLED;
+
+        final AppEntry appEntry = mock(AppEntry.class);
+        appEntry.info = info;
+
+        final HashSet<String> packages = new HashSet<>();
+        packages.add(info.packageName);
+        when(mFeatureFactory.applicationFeatureProvider.getKeepEnabledPackages()).thenReturn(
+                packages);
+
+        ReflectionHelpers.setField(mAppDetail, "mApplicationFeatureProvider",
+                mFeatureFactory.applicationFeatureProvider);
+        ReflectionHelpers.setField(mAppDetail, "mAppEntry", appEntry);
+
+        assertThat(mAppDetail.handleDisableable()).isFalse();
+        verify(mAppDetail.mActionButtons).setButton1Text(R.string.disable_text);
+    }
+
+    @Test
+    public void initUninstallButtonForUserApp_shouldSetNegativeButton() {
+        final ApplicationInfo info = new ApplicationInfo();
+        info.flags = ApplicationInfo.FLAG_INSTALLED;
+        info.enabled = true;
+        final PackageInfo packageInfo = mock(PackageInfo.class);
+        packageInfo.applicationInfo = info;
+        ReflectionHelpers.setField(mAppDetail, "mUserManager", mUserManager);
+        ReflectionHelpers.setField(mAppDetail, "mPackageInfo", packageInfo);
+
+        mAppDetail.initUninstallButtonForUserApp();
+
+        verify(mAppDetail.mActionButtons).setButton1Positive(false);
+    }
+
+    @Implements(Utils.class)
+    public static class ShadowUtils {
+        @Implementation
+        public static boolean isSystemPackage(Resources resources, PackageManager pm,
+                PackageInfo pkg) {
+            return false;
+        }
+    }
+}
diff --git a/tests/robotests/src/com/android/settings/applications/AppInfoWithHeaderTest.java b/tests/robotests/src/com/android/settings/applications/AppInfoWithHeaderTest.java
index 62395f3..75ae458 100644
--- a/tests/robotests/src/com/android/settings/applications/AppInfoWithHeaderTest.java
+++ b/tests/robotests/src/com/android/settings/applications/AppInfoWithHeaderTest.java
@@ -16,6 +16,13 @@
 
 package com.android.settings.applications;
 
+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;
+
 import android.app.AlertDialog;
 import android.content.BroadcastReceiver;
 import android.content.Context;
@@ -49,14 +56,8 @@
 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_O,
         shadows = ShadowEntityHeaderController.class)
 public class AppInfoWithHeaderTest {
     @Mock(answer = Answers.RETURNS_DEEP_STUBS)
diff --git a/tests/robotests/src/com/android/settings/applications/AppPermissionsPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/applications/AppPermissionsPreferenceControllerTest.java
index e19c52f..b0f0d0c 100644
--- a/tests/robotests/src/com/android/settings/applications/AppPermissionsPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/applications/AppPermissionsPreferenceControllerTest.java
@@ -46,7 +46,7 @@
 import org.robolectric.annotation.Config;
 
 @RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION_O)
 public class AppPermissionsPreferenceControllerTest {
 
     private static final String PERM_LOCATION = "android.permission-group.LOCATION";
@@ -178,33 +178,33 @@
         permissions[2] = mPermCamera;
         permissions[3] = mPermSms;
         mController.updateState(mPreference);
-        verify(mPreference).setSummary("Apps using Location, Microphone, Camera");
+        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");
+        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");
+        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");
+        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");
+        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 df226a8..6fadb43 100644
--- a/tests/robotests/src/com/android/settings/applications/AppStateAppOpsBridgeTest.java
+++ b/tests/robotests/src/com/android/settings/applications/AppStateAppOpsBridgeTest.java
@@ -27,6 +27,7 @@
 import android.os.UserManager;
 import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
+import com.android.settings.wrapper.IPackageManagerWrapper;
 import com.android.settingslib.applications.ApplicationsState.AppEntry;
 import org.junit.Before;
 import org.junit.Test;
@@ -36,7 +37,7 @@
 import org.robolectric.annotation.Config;
 
 @RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION_O)
 public final class AppStateAppOpsBridgeTest {
 
     @Mock private Context mContext;
diff --git a/tests/robotests/src/com/android/settings/applications/AppStateInstallAppsBridgeTest.java b/tests/robotests/src/com/android/settings/applications/AppStateInstallAppsBridgeTest.java
index 62623e5..c88f878 100644
--- a/tests/robotests/src/com/android/settings/applications/AppStateInstallAppsBridgeTest.java
+++ b/tests/robotests/src/com/android/settings/applications/AppStateInstallAppsBridgeTest.java
@@ -28,7 +28,7 @@
 import org.robolectric.annotation.Config;
 
 @RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION_O)
 public class AppStateInstallAppsBridgeTest {
 
     @Test
diff --git a/tests/robotests/src/com/android/settings/applications/AppStorageSettingsTest.java b/tests/robotests/src/com/android/settings/applications/AppStorageSettingsTest.java
new file mode 100644
index 0000000..d254074
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/applications/AppStorageSettingsTest.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.applications;
+
+
+import static org.mockito.ArgumentMatchers.nullable;
+import static org.mockito.Matchers.any;
+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;
+
+import android.content.Context;
+import android.view.View;
+import android.widget.Button;
+
+import com.android.settings.TestConfig;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
+import com.android.settings.widget.ActionButtonPreference;
+import com.android.settings.widget.ActionButtonPreferenceTest;
+import com.android.settingslib.applications.StorageStatsSource.AppStorageStats;
+
+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_O)
+public class AppStorageSettingsTest {
+
+    @Mock
+    private AppStorageSizesController mSizesController;
+    private ActionButtonPreference mButtonsPref;
+    private AppStorageSettings mSettings;
+    private Button mLeftButton;
+    private Button mRightButton;
+
+    @Before
+    public void setUp() {
+        MockitoAnnotations.initMocks(this);
+        mLeftButton = new Button(RuntimeEnvironment.application);
+        mRightButton = new Button(RuntimeEnvironment.application);
+        mSettings = spy(new AppStorageSettings());
+        mSettings.mSizeController = mSizesController;
+        mButtonsPref = ActionButtonPreferenceTest.createMock();
+        mSettings.mButtonsPref = mButtonsPref;
+
+        when(mButtonsPref.setButton1OnClickListener(any(View.OnClickListener.class)))
+                .thenAnswer(invocation -> {
+                    final Object[] args = invocation.getArguments();
+                    mLeftButton.setOnClickListener((View.OnClickListener) args[0]);
+                    return mButtonsPref;
+                });
+        when(mButtonsPref.setButton2OnClickListener(any(View.OnClickListener.class)))
+                .thenAnswer(invocation -> {
+                    final Object[] args = invocation.getArguments();
+                    mRightButton.setOnClickListener((View.OnClickListener) args[0]);
+                    return mButtonsPref;
+                });
+    }
+
+    @Test
+    public void updateUiWithSize_noAppStats_shouldDisableClearButtons() {
+        mSettings.updateUiWithSize(null);
+
+        verify(mSizesController).updateUi(nullable(Context.class));
+        verify(mButtonsPref).setButton1Enabled(false);
+        verify(mButtonsPref).setButton2Enabled(false);
+    }
+
+    @Test
+    public void updateUiWithSize_hasDataAndCache_shouldEnableClearButtons() {
+        final AppStorageStats stats = mock(AppStorageStats.class);
+        when(stats.getCacheBytes()).thenReturn(5000L);
+        when(stats.getDataBytes()).thenReturn(10000L);
+        doNothing().when(mSettings).handleClearCacheClick();
+        doNothing().when(mSettings).handleClearDataClick();
+
+        mSettings.updateUiWithSize(stats);
+        verify(mButtonsPref).setButton1Enabled(true);
+        verify(mButtonsPref).setButton2Enabled(true);
+        mLeftButton.performClick();
+        verify(mSettings).handleClearDataClick();
+        verify(mSettings, never()).handleClearCacheClick();
+
+        mRightButton.performClick();
+        verify(mSettings).handleClearDataClick();
+        verify(mSettings).handleClearCacheClick();
+    }
+}
+
diff --git a/tests/robotests/src/com/android/settings/applications/AppStorageSizesControllerTest.java b/tests/robotests/src/com/android/settings/applications/AppStorageSizesControllerTest.java
index 8145b40..62cb26c 100644
--- a/tests/robotests/src/com/android/settings/applications/AppStorageSizesControllerTest.java
+++ b/tests/robotests/src/com/android/settings/applications/AppStorageSizesControllerTest.java
@@ -8,8 +8,10 @@
 import android.content.Context;
 import android.support.v7.preference.Preference;
 
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
+import com.android.settings.R;
 import com.android.settings.TestConfig;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
+import com.android.settingslib.applications.StorageStatsSource.AppStorageStats;
 
 import org.junit.Before;
 import org.junit.Test;
@@ -18,11 +20,8 @@
 import org.robolectric.RuntimeEnvironment;
 import org.robolectric.annotation.Config;
 
-import com.android.settings.R;
-import com.android.settingslib.applications.StorageStatsSource.AppStorageStats;
-
 @RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION_O)
 public class AppStorageSizesControllerTest {
     private static final String COMPUTING = "Computing…";
     private static final String INVALID_SIZE = "Couldn’t compute package size.";
@@ -85,10 +84,10 @@
         mController.setResult(result);
         mController.updateUi(mContext);
 
-        assertThat(mAppPreference.getSummary()).isEqualTo("1.00B");
-        assertThat(mCachePreference.getSummary()).isEqualTo("10.00B");
-        assertThat(mDataPreference.getSummary()).isEqualTo("90.00B");
-        assertThat(mTotalPreference.getSummary()).isEqualTo("101B");
+        assertThat(mAppPreference.getSummary()).isEqualTo("1 B");
+        assertThat(mCachePreference.getSummary()).isEqualTo("10 B");
+        assertThat(mDataPreference.getSummary()).isEqualTo("90 B");
+        assertThat(mTotalPreference.getSummary()).isEqualTo("101 B");
     }
 
     @Test
@@ -103,10 +102,10 @@
         mController.setCacheCleared(true);
         mController.updateUi(mContext);
 
-        assertThat(mAppPreference.getSummary()).isEqualTo("1.00B");
-        assertThat(mCachePreference.getSummary()).isEqualTo("0.00B");
-        assertThat(mDataPreference.getSummary()).isEqualTo("90.00B");
-        assertThat(mTotalPreference.getSummary()).isEqualTo("91.00B");
+        assertThat(mAppPreference.getSummary()).isEqualTo("1 B");
+        assertThat(mCachePreference.getSummary()).isEqualTo("0 B");
+        assertThat(mDataPreference.getSummary()).isEqualTo("90 B");
+        assertThat(mTotalPreference.getSummary()).isEqualTo("91 B");
     }
 
     @Test
@@ -121,9 +120,9 @@
         mController.setDataCleared(true);
         mController.updateUi(mContext);
 
-        assertThat(mAppPreference.getSummary()).isEqualTo("1.00B");
-        assertThat(mCachePreference.getSummary()).isEqualTo("0.00B");
-        assertThat(mDataPreference.getSummary()).isEqualTo("0.00B");
-        assertThat(mTotalPreference.getSummary()).isEqualTo("1.00B");
+        assertThat(mAppPreference.getSummary()).isEqualTo("1 B");
+        assertThat(mCachePreference.getSummary()).isEqualTo("0 B");
+        assertThat(mDataPreference.getSummary()).isEqualTo("0 B");
+        assertThat(mTotalPreference.getSummary()).isEqualTo("1 B");
     }
 }
diff --git a/tests/robotests/src/com/android/settings/applications/AppWithAdminGrantedPermissionsCounterTest.java b/tests/robotests/src/com/android/settings/applications/AppWithAdminGrantedPermissionsCounterTest.java
index 11401a8..eb3d94f 100644
--- a/tests/robotests/src/com/android/settings/applications/AppWithAdminGrantedPermissionsCounterTest.java
+++ b/tests/robotests/src/com/android/settings/applications/AppWithAdminGrantedPermissionsCounterTest.java
@@ -28,7 +28,9 @@
 
 import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
-import com.android.settings.enterprise.DevicePolicyManagerWrapper;
+import com.android.settings.wrapper.DevicePolicyManagerWrapper;
+import com.android.settings.wrapper.IPackageManagerWrapper;
+import com.android.settingslib.wrapper.PackageManagerWrapper;
 
 import org.junit.Before;
 import org.junit.Test;
@@ -54,7 +56,7 @@
  * Tests for {@link InstalledAppCounter}.
  */
 @RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION_O)
 public final class AppWithAdminGrantedPermissionsCounterTest {
 
     private final String APP_1 = "app1";
diff --git a/tests/robotests/src/com/android/settings/applications/AppWithAdminGrantedPermissionsListerTest.java b/tests/robotests/src/com/android/settings/applications/AppWithAdminGrantedPermissionsListerTest.java
index c3c1bb3..d7c8059 100644
--- a/tests/robotests/src/com/android/settings/applications/AppWithAdminGrantedPermissionsListerTest.java
+++ b/tests/robotests/src/com/android/settings/applications/AppWithAdminGrantedPermissionsListerTest.java
@@ -25,7 +25,9 @@
 
 import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
-import com.android.settings.enterprise.DevicePolicyManagerWrapper;
+import com.android.settings.wrapper.DevicePolicyManagerWrapper;
+import com.android.settings.wrapper.IPackageManagerWrapper;
+import com.android.settingslib.wrapper.PackageManagerWrapper;
 
 import org.junit.Before;
 import org.junit.Test;
@@ -53,7 +55,7 @@
  * Tests for {@link AppWithAdminGrantedPermissionsLister}.
  */
 @RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION_O)
 public final class AppWithAdminGrantedPermissionsListerTest {
 
     private final String APP_1 = "app1";
diff --git a/tests/robotests/src/com/android/settings/applications/ApplicationFeatureProviderImplTest.java b/tests/robotests/src/com/android/settings/applications/ApplicationFeatureProviderImplTest.java
index 2b1c296..dad02ef 100644
--- a/tests/robotests/src/com/android/settings/applications/ApplicationFeatureProviderImplTest.java
+++ b/tests/robotests/src/com/android/settings/applications/ApplicationFeatureProviderImplTest.java
@@ -30,9 +30,11 @@
 
 import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
-import com.android.settings.enterprise.DevicePolicyManagerWrapper;
 import com.android.settings.testutils.ApplicationTestUtils;
 import com.android.settings.testutils.shadow.ShadowUserManager;
+import com.android.settings.wrapper.DevicePolicyManagerWrapper;
+import com.android.settings.wrapper.IPackageManagerWrapper;
+import com.android.settingslib.wrapper.PackageManagerWrapper;
 
 import org.junit.Before;
 import org.junit.Test;
@@ -53,7 +55,7 @@
  * Tests for {@link ApplicationFeatureProviderImpl}.
  */
 @RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION,
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION_O,
         shadows = {ShadowUserManager.class})
 public final class ApplicationFeatureProviderImplTest {
 
diff --git a/tests/robotests/src/com/android/settings/applications/DefaultAppSettingsTest.java b/tests/robotests/src/com/android/settings/applications/DefaultAppSettingsTest.java
index 9054a8e..78ec265 100644
--- a/tests/robotests/src/com/android/settings/applications/DefaultAppSettingsTest.java
+++ b/tests/robotests/src/com/android/settings/applications/DefaultAppSettingsTest.java
@@ -52,7 +52,7 @@
 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_O)
 public class DefaultAppSettingsTest {
 
     private Context mContext;
@@ -95,7 +95,7 @@
         when(defaultBrowser.getDefaultAppLabel()).thenReturn("Browser1");
         when(defaultPhone.getDefaultAppLabel()).thenReturn("Phone1");
         summaryProvider.setListening(true);
-        verify(summaryLoader).setSummary(summaryProvider, "Sms1, Browser1, Phone1");
+        verify(summaryLoader).setSummary(summaryProvider, "Browser1, Phone1, Sms1");
 
         // 2 available
         when(defaultSms.getDefaultAppLabel()).thenReturn(null);
@@ -108,13 +108,13 @@
         when(defaultBrowser.getDefaultAppLabel()).thenReturn(null);
         when(defaultPhone.getDefaultAppLabel()).thenReturn("Phone1");
         summaryProvider.setListening(true);
-        verify(summaryLoader).setSummary(summaryProvider, "Sms1, Phone1");
+        verify(summaryLoader).setSummary(summaryProvider, "Phone1, Sms1");
 
         when(defaultSms.getDefaultAppLabel()).thenReturn("Sms1");
         when(defaultBrowser.getDefaultAppLabel()).thenReturn("Browser1");
         when(defaultPhone.getDefaultAppLabel()).thenReturn(null);
         summaryProvider.setListening(true);
-        verify(summaryLoader).setSummary(summaryProvider, "Sms1, Browser1");
+        verify(summaryLoader).setSummary(summaryProvider, "Phone1, Sms1");
 
         // 1 available
         when(defaultSms.getDefaultAppLabel()).thenReturn(null);
diff --git a/tests/robotests/src/com/android/settings/applications/DrawOverlayDetailsTest.java b/tests/robotests/src/com/android/settings/applications/DrawOverlayDetailsTest.java
index 5d20a4c..38c0128 100644
--- a/tests/robotests/src/com/android/settings/applications/DrawOverlayDetailsTest.java
+++ b/tests/robotests/src/com/android/settings/applications/DrawOverlayDetailsTest.java
@@ -46,7 +46,7 @@
 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_O)
 public class DrawOverlayDetailsTest {
 
     @Mock(answer = Answers.RETURNS_DEEP_STUBS)
diff --git a/tests/robotests/src/com/android/settings/applications/EnterpriseDefaultAppsTest.java b/tests/robotests/src/com/android/settings/applications/EnterpriseDefaultAppsTest.java
index 10caf13..8014dbb 100644
--- a/tests/robotests/src/com/android/settings/applications/EnterpriseDefaultAppsTest.java
+++ b/tests/robotests/src/com/android/settings/applications/EnterpriseDefaultAppsTest.java
@@ -27,7 +27,7 @@
 import static junit.framework.Assert.assertTrue;
 
 @RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION_O)
 public class EnterpriseDefaultAppsTest {
     @Test
     public void testNumberOfIntentsCorrelateWithUI() throws Exception {
diff --git a/tests/robotests/src/com/android/settings/applications/FetchPackageStorageAsyncLoaderTest.java b/tests/robotests/src/com/android/settings/applications/FetchPackageStorageAsyncLoaderTest.java
index 3269acb..d34b2eb 100644
--- a/tests/robotests/src/com/android/settings/applications/FetchPackageStorageAsyncLoaderTest.java
+++ b/tests/robotests/src/com/android/settings/applications/FetchPackageStorageAsyncLoaderTest.java
@@ -44,7 +44,7 @@
 import java.io.IOException;
 
 @RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION_O)
 public class FetchPackageStorageAsyncLoaderTest {
     private static final String PACKAGE_NAME = "com.test.package";
     @Mock(answer = Answers.RETURNS_DEEP_STUBS)
diff --git a/tests/robotests/src/com/android/settings/applications/InstalledAppCounterTest.java b/tests/robotests/src/com/android/settings/applications/InstalledAppCounterTest.java
index 56df10e..def8758 100644
--- a/tests/robotests/src/com/android/settings/applications/InstalledAppCounterTest.java
+++ b/tests/robotests/src/com/android/settings/applications/InstalledAppCounterTest.java
@@ -41,6 +41,7 @@
 import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
 import com.android.settings.testutils.shadow.ShadowUserManager;
+import com.android.settingslib.wrapper.PackageManagerWrapper;
 
 import org.junit.Before;
 import org.junit.Test;
@@ -60,7 +61,7 @@
  * Tests for {@link InstalledAppCounter}.
  */
 @RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION,
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION_O,
         shadows = {ShadowUserManager.class})
 public final class InstalledAppCounterTest {
 
diff --git a/tests/robotests/src/com/android/settings/applications/InstalledAppDetailsTest.java b/tests/robotests/src/com/android/settings/applications/InstalledAppDetailsTest.java
index deef5e0..b8a27b9 100644
--- a/tests/robotests/src/com/android/settings/applications/InstalledAppDetailsTest.java
+++ b/tests/robotests/src/com/android/settings/applications/InstalledAppDetailsTest.java
@@ -16,12 +16,23 @@
 
 package com.android.settings.applications;
 
+import static com.google.common.truth.Truth.assertThat;
+
+import static org.mockito.ArgumentMatchers.nullable;
+import static org.mockito.Matchers.anyDouble;
+import static org.mockito.Matchers.anyInt;
+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.AlertDialog;
 import android.app.AppOpsManager;
 import android.app.Fragment;
 import android.app.LoaderManager;
-import android.app.admin.DevicePolicyManager;
 import android.content.Context;
 import android.content.Intent;
 import android.content.pm.ApplicationInfo;
@@ -35,19 +46,19 @@
 import android.support.v7.preference.PreferenceManager;
 import android.support.v7.preference.PreferenceScreen;
 import android.view.View;
-import android.widget.Button;
 
 import com.android.internal.os.BatterySipper;
 import com.android.internal.os.BatteryStatsHelper;
 import com.android.settings.R;
 import com.android.settings.SettingsActivity;
-import com.android.settings.testutils.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.enterprise.DevicePolicyManagerWrapper;
 import com.android.settings.fuelgauge.BatteryUtils;
 import com.android.settings.testutils.FakeFeatureFactory;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
+import com.android.settings.widget.ActionButtonPreferenceTest;
+import com.android.settings.wrapper.DevicePolicyManagerWrapper;
 import com.android.settingslib.Utils;
 import com.android.settingslib.applications.AppUtils;
 import com.android.settingslib.applications.ApplicationsState.AppEntry;
@@ -70,24 +81,12 @@
 import java.util.HashSet;
 import java.util.List;
 
-import static com.google.common.truth.Truth.assertThat;
-import static org.mockito.ArgumentMatchers.nullable;
-import static org.mockito.Matchers.anyDouble;
-import static org.mockito.Matchers.anyInt;
-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,
-    shadows = InstalledAppDetailsTest.ShadowUtils.class
+        manifest = TestConfig.MANIFEST_PATH,
+        sdk = TestConfig.SDK_VERSION_O,
+        shadows = InstalledAppDetailsTest.ShadowUtils.class
 )
 public final class InstalledAppDetailsTest {
 
@@ -138,6 +137,7 @@
 
         mBatteryPreference = new Preference(mShadowContext);
         mAppDetail.mBatteryPreference = mBatteryPreference;
+        mAppDetail.mActionButtons = ActionButtonPreferenceTest.createMock();
 
         mBatterySipper.drainType = BatterySipper.DrainType.IDLE;
         mBatterySipper.uidObj = mUid;
@@ -193,7 +193,7 @@
         when(stats.getTotalBytes()).thenReturn(1L);
 
         assertThat(InstalledAppDetails.getStorageSummary(context, stats, true))
-                .isEqualTo("1.00B used in external storage");
+                .isEqualTo("1 B used in external storage");
     }
 
     @Test
@@ -203,7 +203,7 @@
         when(stats.getTotalBytes()).thenReturn(1L);
 
         assertThat(InstalledAppDetails.getStorageSummary(context, stats, false))
-                .isEqualTo("1.00B used in internal storage");
+                .isEqualTo("1 B used in internal storage");
     }
 
     @Test
@@ -286,15 +286,13 @@
         appEntry.info = info;
         final PackageInfo packageInfo = mock(PackageInfo.class);
         packageInfo.applicationInfo = info;
-        final Button uninstallButton = mock(Button.class);
 
         ReflectionHelpers.setField(mAppDetail, "mUserManager", mUserManager);
         ReflectionHelpers.setField(mAppDetail, "mAppEntry", appEntry);
         ReflectionHelpers.setField(mAppDetail, "mPackageInfo", packageInfo);
-        ReflectionHelpers.setField(mAppDetail, "mUninstallButton", uninstallButton);
 
-        mAppDetail.initUnintsallButtonForUserApp();
-        verify(uninstallButton).setVisibility(View.GONE);
+        mAppDetail.initUninstallButtonForUserApp();
+        verify(mAppDetail.mActionButtons).setButton1Visible(false);
     }
 
     // Tests that we don't show the force stop button for instant apps (they aren't allowed to run
@@ -308,15 +306,13 @@
         final AppEntry appEntry = mock(AppEntry.class);
         final ApplicationInfo info = new ApplicationInfo();
         appEntry.info = info;
-        final Button forceStopButton = mock(Button.class);
 
         ReflectionHelpers.setField(mAppDetail, "mDpm", mDevicePolicyManager);
         ReflectionHelpers.setField(mAppDetail, "mPackageInfo", packageInfo);
         ReflectionHelpers.setField(mAppDetail, "mAppEntry", appEntry);
-        ReflectionHelpers.setField(mAppDetail, "mForceStopButton", forceStopButton);
 
         mAppDetail.checkForceStop();
-        verify(forceStopButton).setVisibility(View.GONE);
+        verify(mAppDetail.mActionButtons).setButton2Visible(false);
     }
 
     @Test
@@ -489,10 +485,9 @@
 
         ReflectionHelpers.setField(mAppDetail, "mHomePackages", homePackages);
         ReflectionHelpers.setField(mAppDetail, "mAppEntry", appEntry);
-        final Button button = mock(Button.class);
 
-        assertThat(mAppDetail.handleDisableable(button)).isFalse();
-        verify(button).setText(R.string.disable_text);
+        assertThat(mAppDetail.handleDisableable()).isFalse();
+        verify(mAppDetail.mActionButtons).setButton1Text(R.string.disable_text);
     }
 
     @Test
@@ -510,10 +505,31 @@
         ReflectionHelpers.setField(mAppDetail, "mApplicationFeatureProvider",
                 mFeatureFactory.applicationFeatureProvider);
         ReflectionHelpers.setField(mAppDetail, "mAppEntry", appEntry);
-        final Button button = mock(Button.class);
 
-        assertThat(mAppDetail.handleDisableable(button)).isTrue();
-        verify(button).setText(R.string.disable_text);
+        assertThat(mAppDetail.handleDisableable()).isTrue();
+        verify(mAppDetail.mActionButtons).setButton1Text(R.string.disable_text);
+    }
+
+    @Test
+    @Config(shadows = ShadowUtils.class)
+    public void handleDisableable_appIsDisabled_buttonShouldShowEnable() {
+        final ApplicationInfo info = new ApplicationInfo();
+        info.packageName = "pkg";
+        info.enabled = false;
+        info.enabledSetting = PackageManager.COMPONENT_ENABLED_STATE_ENABLED;
+
+        final AppEntry appEntry = mock(AppEntry.class);
+        appEntry.info = info;
+        when(mFeatureFactory.applicationFeatureProvider.getKeepEnabledPackages()).thenReturn(
+                new HashSet<>());
+
+        ReflectionHelpers.setField(mAppDetail, "mApplicationFeatureProvider",
+                mFeatureFactory.applicationFeatureProvider);
+        ReflectionHelpers.setField(mAppDetail, "mAppEntry", appEntry);
+
+        assertThat(mAppDetail.handleDisableable()).isTrue();
+        verify(mAppDetail.mActionButtons).setButton1Text(R.string.enable_text);
+        verify(mAppDetail.mActionButtons).setButton1Positive(true);
     }
 
     @Test
@@ -535,10 +551,8 @@
                 mFeatureFactory.applicationFeatureProvider);
         ReflectionHelpers.setField(mAppDetail, "mAppEntry", appEntry);
 
-        final Button button = mock(Button.class);
-
-        assertThat(mAppDetail.handleDisableable(button)).isFalse();
-        verify(button).setText(R.string.disable_text);
+        assertThat(mAppDetail.handleDisableable()).isFalse();
+        verify(mAppDetail.mActionButtons).setButton1Text(R.string.disable_text);
     }
 
     @Test
@@ -551,6 +565,21 @@
                 mAppDetail.mBatteryCallbacks);
     }
 
+    @Test
+    public void initUninstallButtonForUserApp_shouldSetNegativeButton() {
+        final ApplicationInfo info = new ApplicationInfo();
+        info.flags = ApplicationInfo.FLAG_INSTALLED;
+        info.enabled = true;
+        final PackageInfo packageInfo = mock(PackageInfo.class);
+        packageInfo.applicationInfo = info;
+        ReflectionHelpers.setField(mAppDetail, "mUserManager", mUserManager);
+        ReflectionHelpers.setField(mAppDetail, "mPackageInfo", packageInfo);
+
+        mAppDetail.initUninstallButtonForUserApp();
+
+        verify(mAppDetail.mActionButtons).setButton1Positive(false);
+    }
+
     @Implements(Utils.class)
     public static class ShadowUtils {
         @Implementation
diff --git a/tests/robotests/src/com/android/settings/applications/InstalledAppListerTest.java b/tests/robotests/src/com/android/settings/applications/InstalledAppListerTest.java
index c4c3259..6a5cfeb 100644
--- a/tests/robotests/src/com/android/settings/applications/InstalledAppListerTest.java
+++ b/tests/robotests/src/com/android/settings/applications/InstalledAppListerTest.java
@@ -26,6 +26,7 @@
 
 import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
+import com.android.settingslib.wrapper.PackageManagerWrapper;
 
 import org.junit.Before;
 import org.junit.Test;
@@ -56,7 +57,7 @@
  * Tests for {@link InstalledAppLister}.
  */
 @RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION_O)
 public final class InstalledAppListerTest {
 
     private final String APP_1 = "app1";
diff --git a/tests/robotests/src/com/android/settings/applications/LayoutPreferenceTest.java b/tests/robotests/src/com/android/settings/applications/LayoutPreferenceTest.java
index 699c0db..35d1194 100644
--- a/tests/robotests/src/com/android/settings/applications/LayoutPreferenceTest.java
+++ b/tests/robotests/src/com/android/settings/applications/LayoutPreferenceTest.java
@@ -24,11 +24,10 @@
 import android.support.v7.preference.Preference.OnPreferenceClickListener;
 import android.support.v7.preference.PreferenceViewHolder;
 import android.view.LayoutInflater;
-import android.view.View;
 
 import com.android.settings.R;
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 
 import org.junit.Before;
 import org.junit.Test;
@@ -37,19 +36,17 @@
 import org.robolectric.annotation.Config;
 
 @RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION_O)
 public class LayoutPreferenceTest {
 
     private Context mContext;
     private LayoutPreference mPreference;
-    private View mRootView;
     private PreferenceViewHolder mHolder;
 
     @Before
     public void setUp() {
         mContext = RuntimeEnvironment.application;
-        mPreference = new LayoutPreference(mContext, R.layout.app_action_buttons);
-        mRootView = mPreference.mRootView;
+        mPreference = new LayoutPreference(mContext, R.layout.two_action_buttons);
         mHolder = PreferenceViewHolder.createInstanceForTests(LayoutInflater.from(mContext)
                 .inflate(R.layout.layout_preference_frame, null, false));
     }
@@ -79,12 +76,12 @@
 
     @Test
     public void disableSomeView_shouldMaintainStateAfterBind() {
-        mPreference.findViewById(R.id.left_button).setEnabled(false);
-        mPreference.findViewById(R.id.right_button).setEnabled(true);
+        mPreference.findViewById(R.id.button1_positive).setEnabled(false);
+        mPreference.findViewById(R.id.button2_positive).setEnabled(true);
 
         mPreference.onBindViewHolder(mHolder);
 
-        assertThat(mPreference.findViewById(R.id.left_button).isEnabled()).isFalse();
-        assertThat(mPreference.findViewById(R.id.right_button).isEnabled()).isTrue();
+        assertThat(mPreference.findViewById(R.id.button1_positive).isEnabled()).isFalse();
+        assertThat(mPreference.findViewById(R.id.button2_positive).isEnabled()).isTrue();
     }
 }
diff --git a/tests/robotests/src/com/android/settings/applications/ManageApplicationsTest.java b/tests/robotests/src/com/android/settings/applications/ManageApplicationsTest.java
deleted file mode 100644
index 8ed7284..0000000
--- a/tests/robotests/src/com/android/settings/applications/ManageApplicationsTest.java
+++ /dev/null
@@ -1,258 +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.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;
-
-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.TestConfig;
-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.ShadowEventLogWriter;
-import com.android.settings.widget.LoadingViewController;
-import com.android.settingslib.applications.ApplicationsState;
-import com.android.settingslib.core.lifecycle.Lifecycle;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
-import org.robolectric.RuntimeEnvironment;
-import org.robolectric.annotation.Config;
-import org.robolectric.fakes.RoboMenuItem;
-import org.robolectric.util.ReflectionHelpers;
-
-import java.util.ArrayList;
-
-/**
- * Tests for {@link ManageApplications}.
- */
-@RunWith(SettingsRobolectricTestRunner.class)
-// TODO: Consider making the shadow class set global using a robolectric.properties file.
-@Config(manifest = TestConfig.MANIFEST_PATH,
-        sdk = TestConfig.SDK_VERSION,
-        shadows = {
-                SettingsShadowResources.class,
-                SettingsShadowTheme.class,
-                ShadowEventLogWriter.class
-        })
-public class ManageApplicationsTest {
-
-    @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();
-        when(mState.getBackgroundLooper()).thenReturn(mBgLooper);
-
-        mFragment = new ManageApplications();
-        ReflectionHelpers.setField(mFragment, "mLifecycle", new Lifecycle());
-    }
-
-    @Test
-    public void launchFragment() {
-        SettingsRobolectricTestRunner.startSettingsFragment(
-                mFragment, Settings.ManageApplicationsActivity.class);
-    }
-
-    @Test
-    public void updateDisableView_appDisabledUntilUsed_shouldSetDisabled() {
-        final TextView view = mock(TextView.class);
-        final ApplicationInfo info = new ApplicationInfo();
-        info.flags = ApplicationInfo.FLAG_INSTALLED;
-        info.enabled = true;
-        info.enabledSetting = PackageManager.COMPONENT_ENABLED_STATE_DISABLED_UNTIL_USED;
-        ManageApplications fragment = mock(ManageApplications.class);
-        when(fragment.getActivity()).thenReturn(mock(Activity.class));
-        final ManageApplications.ApplicationsAdapter adapter =
-                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 Handler handler = mock(Handler.class);
-        final ManageApplications.ApplicationsAdapter adapter =
-            spy(new ManageApplications.ApplicationsAdapter(mState, fragment, 0));
-        final LoadingViewController loadingViewController =
-                mock(LoadingViewController.class);
-        ReflectionHelpers.setField(adapter, "mLoadingViewController", loadingViewController);
-        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(loadingViewController, never()).showLoadingViewDelayed();
-    }
-
-    @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 Handler handler = mock(Handler.class);
-        final ManageApplications.ApplicationsAdapter adapter =
-            spy(new ManageApplications.ApplicationsAdapter(mState, fragment, 0));
-        final LoadingViewController loadingViewController =
-                mock(LoadingViewController.class);
-        ReflectionHelpers.setField(adapter, "mLoadingViewController", loadingViewController);
-        ReflectionHelpers.setField(adapter, "mFgHandler", handler);
-
-        // app loading not yet completed
-        ReflectionHelpers.setField(adapter, "mHasReceivedLoadEntries", false);
-
-        adapter.updateLoading();
-
-        verify(loadingViewController).showLoadingViewDelayed();
-    }
-
-    @Test
-    public void onRebuildComplete_shouldHideLoadingView() {
-        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 Handler handler = mock(Handler.class);
-        final ManageApplications.ApplicationsAdapter adapter =
-            spy(new ManageApplications.ApplicationsAdapter(mState, fragment, 0));
-        final LoadingViewController loadingViewController =
-                mock(LoadingViewController.class);
-        ReflectionHelpers.setField(adapter, "mLoadingViewController", loadingViewController);
-        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(loadingViewController).showContent(true /* animate */);
-    }
-
-    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/ManageDomainUrlsTest.java b/tests/robotests/src/com/android/settings/applications/ManageDomainUrlsTest.java
new file mode 100644
index 0000000..3e89647
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/applications/ManageDomainUrlsTest.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.applications;
+
+
+import static com.google.common.truth.Truth.assertThat;
+
+import android.content.Context;
+import android.content.pm.ApplicationInfo;
+
+import com.android.settings.R;
+import com.android.settings.TestConfig;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
+import com.android.settingslib.applications.ApplicationsState;
+
+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_O)
+public class ManageDomainUrlsTest {
+
+    @Mock
+    private ApplicationsState.AppEntry mAppEntry;
+    private Context mContext;
+
+    @Before
+    public void setUp() {
+        MockitoAnnotations.initMocks(this);
+        mContext = RuntimeEnvironment.application;
+    }
+
+    @Test
+    public void domainAppPreferenceShouldUseAppPreferenceLayout() {
+        mAppEntry.info = new ApplicationInfo();
+        mAppEntry.info.packageName = "com.android.settings.test";
+        final ManageDomainUrls.DomainAppPreference pref =
+                new ManageDomainUrls.DomainAppPreference(mContext, null, mAppEntry);
+
+        assertThat(pref.getLayoutResource()).isEqualTo(R.layout.preference_app);
+    }
+}
diff --git a/tests/robotests/src/com/android/settings/applications/MusicViewHolderControllerTest.java b/tests/robotests/src/com/android/settings/applications/MusicViewHolderControllerTest.java
deleted file mode 100644
index 5df5bed..0000000
--- a/tests/robotests/src/com/android/settings/applications/MusicViewHolderControllerTest.java
+++ /dev/null
@@ -1,108 +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.applications;
-
-import static com.google.common.truth.Truth.assertThat;
-
-import static org.mockito.Matchers.nullable;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
-import android.app.Fragment;
-import android.content.Context;
-import android.content.Intent;
-import android.os.UserHandle;
-import android.os.storage.VolumeInfo;
-import android.provider.DocumentsContract;
-import android.view.LayoutInflater;
-
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.TestConfig;
-import com.android.settingslib.applications.StorageStatsSource;
-import com.android.settingslib.deviceinfo.StorageVolumeProvider;
-
-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;
-
-
-@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
-public class MusicViewHolderControllerTest {
-    @Mock(answer = Answers.RETURNS_DEEP_STUBS)
-    private Fragment mFragment;
-    @Mock
-    private StorageVolumeProvider mSvp;
-    @Mock
-    private StorageStatsSource mSource;
-
-    private Context mContext;
-    private MusicViewHolderController mController;
-    private VolumeInfo mVolume;
-    private AppViewHolder mHolder;
-
-    @Before
-    public void setUp() throws Exception {
-        MockitoAnnotations.initMocks(this);
-        mContext = RuntimeEnvironment.application;
-        mVolume = new VolumeInfo("id", 0, null, "id");
-        mController = new MusicViewHolderController(mContext, mSource, mVolume.fsUuid,
-                new UserHandle(0));
-
-        LayoutInflater inflater = LayoutInflater.from(mContext);
-        mHolder = AppViewHolder.createOrRecycle(inflater, null);
-    }
-
-    @Test
-    public void storageShouldBeZeroBytesIfQueriedBeforeStorageQueryFinishes() {
-        mController.setupView(mHolder);
-
-        assertThat(mHolder.summary.getText().toString()).isEqualTo("0.00B");
-    }
-
-    @Test
-    public void storageShouldRepresentStorageStatsQuery() throws Exception {
-        when(mSource.getExternalStorageStats(nullable(String.class), nullable(UserHandle.class))).thenReturn(
-                new StorageStatsSource.ExternalStorageStats(1, 1, 0, 0, 0));
-
-        mController.queryStats();
-        mController.setupView(mHolder);
-
-        assertThat(mHolder.summary.getText().toString()).isEqualTo("1.00B");
-    }
-
-    @Test
-    public void clickingShouldIntentIntoFilesApp() {
-        mController.onClick(mFragment);
-
-        final ArgumentCaptor<Intent> argumentCaptor = ArgumentCaptor.forClass(Intent.class);
-        verify(mFragment).startActivity(argumentCaptor.capture());
-        Intent intent = argumentCaptor.getValue();
-
-        assertThat(intent.getAction()).isEqualTo(Intent.ACTION_VIEW);
-        assertThat(intent.getData()).isEqualTo(DocumentsContract.buildRootUri(
-                "com.android.providers.media.documents",
-                "audio_root"));
-        assertThat(intent.getType()).isEqualTo(DocumentsContract.Root.MIME_TYPE_ITEM);
-    }
-}
diff --git a/tests/robotests/src/com/android/settings/applications/NotificationAppsTest.java b/tests/robotests/src/com/android/settings/applications/NotificationAppsTest.java
index 1635576..735a811 100644
--- a/tests/robotests/src/com/android/settings/applications/NotificationAppsTest.java
+++ b/tests/robotests/src/com/android/settings/applications/NotificationAppsTest.java
@@ -27,6 +27,7 @@
 import com.android.settings.TestConfig;
 import com.android.settings.dashboard.SummaryLoader;
 import com.android.settings.notification.NotificationBackend;
+import com.android.settingslib.wrapper.PackageManagerWrapper;
 
 import java.util.List;
 import java.util.ArrayList;
@@ -48,7 +49,7 @@
 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_O)
 public class NotificationAppsTest {
 
     @Mock
diff --git a/tests/robotests/src/com/android/settings/applications/PhotosViewHolderControllerTest.java b/tests/robotests/src/com/android/settings/applications/PhotosViewHolderControllerTest.java
deleted file mode 100644
index 7eacba2..0000000
--- a/tests/robotests/src/com/android/settings/applications/PhotosViewHolderControllerTest.java
+++ /dev/null
@@ -1,88 +0,0 @@
-package com.android.settings.applications;
-
-import static com.google.common.truth.Truth.assertThat;
-
-import static org.mockito.Matchers.nullable;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
-import android.app.Fragment;
-import android.content.Context;
-import android.content.Intent;
-import android.os.UserHandle;
-import android.os.storage.VolumeInfo;
-import android.view.LayoutInflater;
-
-import com.android.settings.TestConfig;
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settingslib.applications.StorageStatsSource;
-import com.android.settingslib.deviceinfo.StorageVolumeProvider;
-
-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;
-
-@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
-public class PhotosViewHolderControllerTest {
-    @Mock(answer = Answers.RETURNS_DEEP_STUBS)
-    private Fragment mFragment;
-
-    @Mock private StorageVolumeProvider mSvp;
-    @Mock private StorageStatsSource mSource;
-
-    private Context mContext;
-    private PhotosViewHolderController mController;
-    private VolumeInfo mVolume;
-    private AppViewHolder mHolder;
-
-    @Before
-    public void setUp() throws Exception {
-        MockitoAnnotations.initMocks(this);
-        mContext = RuntimeEnvironment.application;
-        mVolume = new VolumeInfo("id", 0, null, "id");
-        mController =
-                new PhotosViewHolderController(
-                        mContext, mSource, mVolume.fsUuid, new UserHandle(0));
-
-        LayoutInflater inflater = LayoutInflater.from(mContext);
-        mHolder = AppViewHolder.createOrRecycle(inflater, null);
-    }
-
-    @Test
-    public void storageShouldBeZeroBytesIfQueriedBeforeStorageQueryFinishes() {
-        mController.setupView(mHolder);
-
-        assertThat(mHolder.summary.getText().toString()).isEqualTo("0.00B");
-    }
-
-    @Test
-    public void storageShouldRepresentStorageStatsQuery() throws Exception {
-        when(mSource.getExternalStorageStats(nullable(String.class), nullable(UserHandle.class)))
-                .thenReturn(new StorageStatsSource.ExternalStorageStats(1, 0, 1, 10, 0));
-
-        mController.queryStats();
-        mController.setupView(mHolder);
-
-        assertThat(mHolder.summary.getText().toString()).isEqualTo("11.00B");
-    }
-
-    @Test
-    public void clickingShouldIntentIntoFilesApp() {
-        mController.onClick(mFragment);
-
-        final ArgumentCaptor<Intent> argumentCaptor = ArgumentCaptor.forClass(Intent.class);
-        verify(mFragment).startActivity(argumentCaptor.capture());
-        Intent intent = argumentCaptor.getValue();
-
-        assertThat(intent.getType()).isEqualTo("image/*");
-        assertThat(intent.getAction()).isEqualTo(android.content.Intent.ACTION_VIEW);
-        assertThat(intent.getBooleanExtra(Intent.EXTRA_FROM_STORAGE, false)).isTrue();
-    }
-}
diff --git a/tests/robotests/src/com/android/settings/applications/PictureInPictureDetailsTest.java b/tests/robotests/src/com/android/settings/applications/PictureInPictureDetailsTest.java
index 6bac9a3..b998b81e 100644
--- a/tests/robotests/src/com/android/settings/applications/PictureInPictureDetailsTest.java
+++ b/tests/robotests/src/com/android/settings/applications/PictureInPictureDetailsTest.java
@@ -28,6 +28,7 @@
 import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
 import com.android.settings.testutils.FakeFeatureFactory;
+import com.android.settings.wrapper.ActivityInfoWrapper;
 
 import org.junit.Before;
 import org.junit.Test;
@@ -38,7 +39,7 @@
 import org.robolectric.annotation.Config;
 
 @RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION_O)
 public class PictureInPictureDetailsTest {
 
     @Mock(answer = Answers.RETURNS_DEEP_STUBS)
@@ -104,11 +105,12 @@
                 activities);
     }
 
-    private class MockActivityInfo implements ActivityInfoWrapper {
+    private class MockActivityInfo extends ActivityInfoWrapper {
 
         private boolean mSupportsPictureInPicture;
 
         public MockActivityInfo(boolean supportsPictureInPicture) {
+            super(null);
             mSupportsPictureInPicture = supportsPictureInPicture;
         }
 
diff --git a/tests/robotests/src/com/android/settings/applications/PictureInPictureSettingsTest.java b/tests/robotests/src/com/android/settings/applications/PictureInPictureSettingsTest.java
index 77acb46..85b398a 100644
--- a/tests/robotests/src/com/android/settings/applications/PictureInPictureSettingsTest.java
+++ b/tests/robotests/src/com/android/settings/applications/PictureInPictureSettingsTest.java
@@ -36,6 +36,8 @@
 import com.android.settings.TestConfig;
 import com.android.settings.testutils.FakeFeatureFactory;
 import com.android.settings.testutils.SettingsRobolectricTestRunner;
+import com.android.settings.wrapper.UserManagerWrapper;
+import com.android.settingslib.wrapper.PackageManagerWrapper;
 
 import org.junit.Before;
 import org.junit.Test;
@@ -49,7 +51,7 @@
 import java.util.Collections;
 
 @RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION_O)
 public class PictureInPictureSettingsTest {
 
     private static final int PRIMARY_USER_ID = 0;
diff --git a/tests/robotests/src/com/android/settings/applications/PremiumSmsAccessTest.java b/tests/robotests/src/com/android/settings/applications/PremiumSmsAccessTest.java
index 30ebcde..dedb61d 100644
--- a/tests/robotests/src/com/android/settings/applications/PremiumSmsAccessTest.java
+++ b/tests/robotests/src/com/android/settings/applications/PremiumSmsAccessTest.java
@@ -38,7 +38,7 @@
 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_O)
 public class PremiumSmsAccessTest {
 
     @Mock(answer = Answers.RETURNS_DEEP_STUBS)
diff --git a/tests/robotests/src/com/android/settings/applications/RecentAppsPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/applications/RecentAppsPreferenceControllerTest.java
index 2510f20..d0d8a3b 100644
--- a/tests/robotests/src/com/android/settings/applications/RecentAppsPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/applications/RecentAppsPreferenceControllerTest.java
@@ -16,13 +16,30 @@
 
 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.anyLong;
+import static org.mockito.Matchers.anyString;
+import static org.mockito.Matchers.argThat;
+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.Application;
 import android.app.usage.UsageStats;
 import android.app.usage.UsageStatsManager;
 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.res.Configuration;
 import android.os.UserHandle;
 import android.os.UserManager;
 import android.support.v7.preference.Preference;
@@ -31,14 +48,13 @@
 import android.text.TextUtils;
 
 import com.android.settings.R;
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.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;
@@ -47,25 +63,9 @@
 
 import java.util.ArrayList;
 import java.util.List;
-import java.util.Locale;
-
-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)
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION_O)
 public class RecentAppsPreferenceControllerTest {
 
     @Mock
@@ -76,14 +76,18 @@
     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;
+    @Mock
+    private PackageManager mPackageManager;
+    @Mock
+    private ApplicationsState.AppEntry mAppEntry;
+    @Mock
+    private ApplicationInfo mApplicationInfo;
 
     private Context mContext;
     private RecentAppsPreferenceController mController;
@@ -91,12 +95,11 @@
     @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 = spy(RuntimeEnvironment.application);
+        doReturn(mUsageStatsManager).when(mContext).getSystemService(Context.USAGE_STATS_SERVICE);
+        doReturn(mUserManager).when(mContext).getSystemService(Context.USER_SERVICE);
+        doReturn(mPackageManager).when(mContext).getPackageManager();
 
-        mContext = RuntimeEnvironment.application;
         mController = new RecentAppsPreferenceController(mContext, mAppState, null);
         when(mScreen.findPreference(anyString())).thenReturn(mCategory);
 
@@ -125,7 +128,7 @@
     @Test
     public void onDisplayAndUpdateState_shouldRefreshUi() {
         mController = spy(
-                new RecentAppsPreferenceController(mMockContext, (Application) null, null));
+                new RecentAppsPreferenceController(mContext, (Application) null, null));
 
         doNothing().when(mController).refreshUi(mContext);
 
@@ -136,11 +139,8 @@
     }
 
     @Test
+    @Config(qualifiers = "mcc999")
     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));
@@ -152,8 +152,6 @@
 
     @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();
@@ -172,20 +170,17 @@
 
         // stat1, stat2 are valid apps. stat3 is invalid.
         when(mAppState.getEntry(stat1.mPackageName, UserHandle.myUserId()))
-                .thenReturn(mock(ApplicationsState.AppEntry.class));
+                .thenReturn(mAppEntry);
         when(mAppState.getEntry(stat2.mPackageName, UserHandle.myUserId()))
-                .thenReturn(mock(ApplicationsState.AppEntry.class));
+                .thenReturn(mAppEntry);
         when(mAppState.getEntry(stat3.mPackageName, UserHandle.myUserId()))
                 .thenReturn(null);
-        when(mMockContext.getPackageManager().resolveActivity(any(Intent.class), anyInt()))
-                .thenReturn(new ResolveInfo());
+        when(mPackageManager.resolveActivity(any(Intent.class), anyInt())).thenReturn(
+                new ResolveInfo());
         when(mUsageStatsManager.queryUsageStats(anyInt(), anyLong(), anyLong()))
                 .thenReturn(stats);
-        final Configuration configuration = new Configuration();
-        configuration.locale = Locale.US;
-        when(mMockContext.getResources().getConfiguration()).thenReturn(configuration);
+        mAppEntry.info = mApplicationInfo;
 
-        mController = new RecentAppsPreferenceController(mMockContext, mAppState, null);
         mController.displayPreference(mScreen);
 
         verify(mCategory).setTitle(R.string.recent_app_category_title);
@@ -200,8 +195,6 @@
 
     @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();
@@ -218,12 +211,11 @@
                 .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(mPackageManager.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));
@@ -234,8 +226,6 @@
 
     @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();
@@ -243,22 +233,16 @@
         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());
+                .thenReturn(mAppEntry);
+        when(mPackageManager.resolveActivity(any(Intent.class), anyInt())).thenReturn(
+                new ResolveInfo());
         when(mUsageStatsManager.queryUsageStats(anyInt(), anyLong(), anyLong()))
-            .thenReturn(stats);
+                .thenReturn(stats);
+        mAppEntry.info = mApplicationInfo;
 
-        when(mMockContext.getResources().getText(eq(R.string.recent_app_summary)))
-            .thenReturn(mContext.getResources().getText(R.string.recent_app_summary));
-        final Configuration configuration = new Configuration();
-        configuration.locale = Locale.US;
-        when(mMockContext.getResources().getConfiguration()).thenReturn(configuration);
-
-        mController = new RecentAppsPreferenceController(mMockContext, mAppState, null);
         mController.displayPreference(mScreen);
 
-        verify(mCategory).addPreference(argThat(summaryMatches("0m ago")));
+        verify(mCategory).addPreference(argThat(summaryMatches("0 min. ago")));
     }
 
     private static ArgumentMatcher<Preference> summaryMatches(String expected) {
diff --git a/tests/robotests/src/com/android/settings/applications/SpecialAppAccessPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/applications/SpecialAppAccessPreferenceControllerTest.java
index f17addd..09bfc29 100644
--- a/tests/robotests/src/com/android/settings/applications/SpecialAppAccessPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/applications/SpecialAppAccessPreferenceControllerTest.java
@@ -36,7 +36,7 @@
 import org.robolectric.util.ReflectionHelpers;
 
 @RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION_O)
 public class SpecialAppAccessPreferenceControllerTest {
     private Context mContext;
     @Mock
diff --git a/tests/robotests/src/com/android/settings/applications/UsageAccessDetailsTest.java b/tests/robotests/src/com/android/settings/applications/UsageAccessDetailsTest.java
index 07acb13..64ef4ff 100644
--- a/tests/robotests/src/com/android/settings/applications/UsageAccessDetailsTest.java
+++ b/tests/robotests/src/com/android/settings/applications/UsageAccessDetailsTest.java
@@ -16,17 +16,20 @@
 
 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.mock;
 import static org.mockito.Mockito.verify;
 
 import android.content.Context;
-import android.os.RemoteException;
+import android.os.Bundle;
 
 import com.android.internal.logging.nano.MetricsProto;
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
 import com.android.settings.testutils.FakeFeatureFactory;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
+import com.android.settingslib.applications.ApplicationsState;
 
 import org.junit.Before;
 import org.junit.Test;
@@ -38,7 +41,7 @@
 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_O)
 public class UsageAccessDetailsTest {
 
     @Mock(answer = Answers.RETURNS_DEEP_STUBS)
@@ -68,9 +71,12 @@
     }
 
     @Test
-    public void refreshUi_nullPackageInfo_shouldNotCrash() throws RemoteException {
-        mFragment.mPackageInfo = null;
-        mFragment.refreshUi();
-        // should not crash
+    public void refreshUi_hasNoAppEntry_shouldReturnFalse() {
+        mFragment.mState = mock(ApplicationsState.class);
+        mFragment.setArguments(new Bundle());
+
+        assertThat(mFragment.refreshUi()).isFalse();
+        assertThat(mFragment.mAppEntry).isNull();
+        assertThat(mFragment.mPackageInfo).isNull();
     }
 }
diff --git a/tests/robotests/src/com/android/settings/applications/VrListenerSettingsTest.java b/tests/robotests/src/com/android/settings/applications/VrListenerSettingsTest.java
index d2f1bbd..5f9ec95 100644
--- a/tests/robotests/src/com/android/settings/applications/VrListenerSettingsTest.java
+++ b/tests/robotests/src/com/android/settings/applications/VrListenerSettingsTest.java
@@ -36,7 +36,7 @@
 import org.robolectric.annotation.Config;
 
 @RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION_O)
 public class VrListenerSettingsTest {
 
     @Mock(answer = Answers.RETURNS_DEEP_STUBS)
diff --git a/tests/robotests/src/com/android/settings/applications/WriteSettingsDetailsTest.java b/tests/robotests/src/com/android/settings/applications/WriteSettingsDetailsTest.java
index a995394..6cd07e3 100644
--- a/tests/robotests/src/com/android/settings/applications/WriteSettingsDetailsTest.java
+++ b/tests/robotests/src/com/android/settings/applications/WriteSettingsDetailsTest.java
@@ -36,7 +36,7 @@
 import org.robolectric.annotation.Config;
 
 @RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION_O)
 public class WriteSettingsDetailsTest {
 
     @Mock(answer = Answers.RETURNS_DEEP_STUBS)
diff --git a/tests/robotests/src/com/android/settings/applications/appinfo/AppBatteryPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/applications/appinfo/AppBatteryPreferenceControllerTest.java
new file mode 100644
index 0000000..065fe2b
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/applications/appinfo/AppBatteryPreferenceControllerTest.java
@@ -0,0 +1,198 @@
+/*
+ * Copyright (C) 2017 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.applications.appinfo;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import static org.mockito.ArgumentMatchers.anyDouble;
+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.AppOpsManager;
+import android.app.LoaderManager;
+import android.content.Context;
+import android.content.pm.PackageManager;
+import android.content.pm.PackageManager.NameNotFoundException;
+import android.os.BatteryStats;
+import android.os.Bundle;
+import android.support.v7.preference.Preference;
+import android.support.v7.preference.PreferenceScreen;
+
+import com.android.internal.os.BatterySipper;
+import com.android.internal.os.BatteryStatsHelper;
+import com.android.settings.SettingsActivity;
+import com.android.settings.TestConfig;
+import com.android.settings.applications.AppInfoDashboardFragment;
+import com.android.settings.fuelgauge.BatteryUtils;
+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 java.util.ArrayList;
+import java.util.List;
+
+@RunWith(SettingsRobolectricTestRunner.class)
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION_O)
+public class AppBatteryPreferenceControllerTest {
+
+    private static final int TARGET_UID = 111;
+    private static final int OTHER_UID = 222;
+    private static final double BATTERY_LEVEL = 60;
+
+    @Mock
+    private SettingsActivity mActivity;
+    @Mock
+    private BatteryUtils mBatteryUtils;
+    @Mock
+    private BatterySipper mBatterySipper;
+    @Mock
+    private BatterySipper mOtherBatterySipper;
+    @Mock(answer = Answers.RETURNS_DEEP_STUBS)
+    private BatteryStatsHelper mBatteryStatsHelper;
+    @Mock
+    private BatteryStats.Uid mUid;
+    @Mock
+    private PreferenceScreen mScreen;
+    @Mock
+    private PackageManager mPackageManager;
+    @Mock
+    private LoaderManager mLoaderManager;
+
+    private Context mContext;
+    private AppInfoDashboardFragment mFragment;
+    private AppBatteryPreferenceController mController;
+    private Preference mBatteryPreference;
+
+    @Before
+    public void setUp() throws NameNotFoundException {
+        MockitoAnnotations.initMocks(this);
+        mContext = spy(RuntimeEnvironment.application);
+        when(mContext.getPackageManager()).thenReturn(mPackageManager);
+
+        mFragment = spy(new AppInfoDashboardFragment());
+
+        mBatteryPreference = spy(new Preference(mContext));
+
+        mBatterySipper.drainType = BatterySipper.DrainType.IDLE;
+        mBatterySipper.uidObj = mUid;
+        doReturn(TARGET_UID).when(mBatterySipper).getUid();
+        doReturn(OTHER_UID).when(mOtherBatterySipper).getUid();
+
+        mController = spy(new AppBatteryPreferenceController(
+                mContext, mFragment, "package1", null /* lifecycle */));
+        mController.mBatteryUtils = mBatteryUtils;
+        when(mScreen.findPreference(mController.getPreferenceKey())).thenReturn(mBatteryPreference);
+    }
+
+    @Test
+    public void getAvailabilityStatus_shouldAlwaysReturnAvailable() {
+        assertThat(mController.getAvailabilityStatus()).isEqualTo(mController.AVAILABLE);
+    }
+
+    @Test
+    public void findTargetSipper_findCorrectSipper() {
+        final List<BatterySipper> usageList = new ArrayList<>();
+        usageList.add(mBatterySipper);
+        usageList.add(mOtherBatterySipper);
+        doReturn(usageList).when(mBatteryStatsHelper).getUsageList();
+
+        assertThat(mController.findTargetSipper(mBatteryStatsHelper, TARGET_UID)).isEqualTo(
+                mBatterySipper);
+    }
+
+    @Test
+    public void updateBattery_noBatteryStats_summaryNo() {
+        mController.displayPreference(mScreen);
+
+        mController.updateBattery();
+
+        assertThat(mBatteryPreference.getSummary()).isEqualTo(
+                "No battery use since last full charge");
+    }
+
+    @Test
+    public void updateBattery_hasBatteryStats_summaryPercent() {
+        mController.mBatteryHelper = mBatteryStatsHelper;
+        mController.mSipper = mBatterySipper;
+        doReturn(BATTERY_LEVEL).when(mBatteryUtils).calculateBatteryPercent(anyDouble(),
+                anyDouble(), anyDouble(), anyInt());
+        doReturn(new ArrayList<>()).when(mBatteryStatsHelper).getUsageList();
+        mController.displayPreference(mScreen);
+
+        mController.updateBattery();
+
+        assertThat(mBatteryPreference.getSummary()).isEqualTo("60% use since last full charge");
+    }
+
+    @Test
+    public void isBatteryStatsAvailable_hasBatteryStatsHelperAndSipper_returnTrue() {
+        mController.mBatteryHelper = mBatteryStatsHelper;
+        mController.mSipper = mBatterySipper;
+
+        assertThat(mController.isBatteryStatsAvailable()).isTrue();
+    }
+
+    @Test
+    public void isBatteryStatsAvailable_parametersNull_returnFalse() {
+        assertThat(mController.isBatteryStatsAvailable()).isFalse();
+    }
+
+    @Test
+    public void launchPowerUsageDetailFragment_shouldNotCrash() {
+        when(mActivity.getSystemService(Context.APP_OPS_SERVICE))
+                .thenReturn(mock(AppOpsManager.class));
+        when(mFragment.getActivity()).thenReturn(mActivity);
+        final String key = mController.getPreferenceKey();
+        when(mBatteryPreference.getKey()).thenReturn(key);
+        mController.mSipper = mBatterySipper;
+        mController.mBatteryHelper = mBatteryStatsHelper;
+
+        // Should not crash
+        mController.handlePreferenceTreeClick(mBatteryPreference);
+    }
+
+    @Test
+    public void onResume_shouldRestartBatteryStatsLoader() {
+        doReturn(mLoaderManager).when(mFragment).getLoaderManager();
+
+        mController.onResume();
+
+        verify(mLoaderManager).restartLoader(AppInfoDashboardFragment.LOADER_BATTERY, Bundle.EMPTY,
+                mController);
+    }
+
+    @Test
+    public void onPause_shouldDestroyBatteryStatsLoader() {
+        doReturn(mLoaderManager).when(mFragment).getLoaderManager();
+
+        mController.onPause();
+
+        verify(mLoaderManager).destroyLoader(AppInfoDashboardFragment.LOADER_BATTERY);
+    }
+
+}
diff --git a/tests/robotests/src/com/android/settings/applications/appinfo/AppDataUsagePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/applications/appinfo/AppDataUsagePreferenceControllerTest.java
new file mode 100644
index 0000000..40f095c
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/applications/appinfo/AppDataUsagePreferenceControllerTest.java
@@ -0,0 +1,140 @@
+/*
+ * Copyright (C) 2017 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.applications.appinfo;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.anyInt;
+import static org.mockito.ArgumentMatchers.eq;
+import static org.mockito.Mockito.doReturn;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.never;
+import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+import android.app.LoaderManager;
+import android.content.Context;
+import android.content.pm.ApplicationInfo;
+import android.net.ConnectivityManager;
+import android.net.INetworkStatsSession;
+import android.os.Bundle;
+import android.support.v7.preference.Preference;
+
+import com.android.settings.R;
+import com.android.settings.TestConfig;
+import com.android.settings.applications.AppInfoDashboardFragment;
+import com.android.settings.datausage.AppDataUsage;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
+import com.android.settingslib.applications.ApplicationsState.AppEntry;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.mockito.MockitoAnnotations;
+import org.robolectric.RuntimeEnvironment;
+import org.robolectric.annotation.Config;
+import org.robolectric.util.ReflectionHelpers;
+
+@RunWith(SettingsRobolectricTestRunner.class)
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION_O)
+public class AppDataUsagePreferenceControllerTest {
+
+    @Mock
+    private LoaderManager mLoaderManager;
+    @Mock
+    private AppInfoDashboardFragment mFragment;
+
+    private Context mContext;
+    private AppDataUsagePreferenceController mController;
+
+    @Before
+    public void setUp() {
+        MockitoAnnotations.initMocks(this);
+        mContext = spy(RuntimeEnvironment.application.getApplicationContext());
+        mController = spy(
+                new AppDataUsagePreferenceController(mContext, mFragment, null /* lifecycle */));
+    }
+
+    @Test
+    public void getAvailabilityStatus_bandwidthControlEnabled_shouldReturnAvailable() {
+        doReturn(true).when(mController).isBandwidthControlEnabled();
+
+        assertThat(mController.getAvailabilityStatus()).isEqualTo(mController.AVAILABLE);
+    }
+
+    @Test
+    public void getAvailabilityStatus_bandwidthControlDisabled_shouldReturnDisabled() {
+        doReturn(false).when(mController).isBandwidthControlEnabled();
+
+        assertThat(mController.getAvailabilityStatus()).isEqualTo(mController.DISABLED_UNSUPPORTED);
+    }
+
+    @Test
+    public void onResume_noSession_shouldNotRestartDataLoader() {
+        doReturn(mLoaderManager).when(mFragment).getLoaderManager();
+
+        mController.onResume();
+
+        verify(mLoaderManager, never()).restartLoader(
+                AppInfoDashboardFragment.LOADER_CHART_DATA, Bundle.EMPTY, mController);
+    }
+
+    @Test
+    public void onResume_hasSession_shouldRestartDataLoader() {
+        final ConnectivityManager connectivityManager = mock(ConnectivityManager.class);
+        when(mContext.getSystemService(Context.CONNECTIVITY_SERVICE))
+                .thenReturn(connectivityManager);
+        when(connectivityManager.isNetworkSupported(anyInt())).thenReturn(true);
+        doReturn(mLoaderManager).when(mFragment).getLoaderManager();
+        ReflectionHelpers.setField(mController, "mStatsSession", mock(INetworkStatsSession.class));
+        final AppEntry appEntry = mock(AppEntry.class);
+        appEntry.info = new ApplicationInfo();
+        when(mFragment.getAppEntry()).thenReturn(appEntry);
+
+        mController.onResume();
+
+        verify(mLoaderManager).restartLoader(
+                eq(AppInfoDashboardFragment.LOADER_CHART_DATA), any(Bundle.class), eq(mController));
+    }
+
+    @Test
+    public void onPause_shouldDestroyDataLoader() {
+        doReturn(mLoaderManager).when(mFragment).getLoaderManager();
+
+        mController.onPause();
+
+        verify(mLoaderManager).destroyLoader(AppInfoDashboardFragment.LOADER_CHART_DATA);
+    }
+
+    @Test
+    public void getDetailFragmentClass_shouldReturnAppDataUsage() {
+        assertThat(mController.getDetailFragmentClass()).isEqualTo(AppDataUsage.class);
+    }
+
+    @Test
+    public void updateState_shouldUpdatePreferenceSummary() {
+        final Preference preference = mock(Preference.class);
+
+        mController.updateState(preference);
+
+        verify(preference).setSummary(any());
+    }
+
+}
diff --git a/tests/robotests/src/com/android/settings/applications/appinfo/AppInfoPreferenceControllerBaseTest.java b/tests/robotests/src/com/android/settings/applications/appinfo/AppInfoPreferenceControllerBaseTest.java
new file mode 100644
index 0000000..0803c93
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/applications/appinfo/AppInfoPreferenceControllerBaseTest.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.applications.appinfo;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.anyInt;
+import static org.mockito.ArgumentMatchers.eq;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+import android.content.pm.ApplicationInfo;
+import android.support.v7.preference.Preference;
+import android.support.v7.preference.PreferenceScreen;
+
+import com.android.settings.R;
+import com.android.settings.SettingsActivity;
+import com.android.settings.SettingsPreferenceFragment;
+import com.android.settings.TestConfig;
+import com.android.settings.applications.AppInfoDashboardFragment;
+import com.android.settings.notification.AppNotificationSettings;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
+import com.android.settingslib.applications.ApplicationsState;
+
+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_O)
+public class AppInfoPreferenceControllerBaseTest {
+
+    @Mock
+    private SettingsActivity mActivity;
+    @Mock
+    private AppInfoDashboardFragment mFragment;
+    @Mock
+    private PreferenceScreen mScreen;
+    @Mock
+    private Preference mPreference;
+
+    private TestPreferenceController mController;
+
+    @Before
+    public void setUp() {
+        MockitoAnnotations.initMocks(this);
+        mController = new TestPreferenceController(mFragment);
+        final String key = mController.getPreferenceKey();
+        when(mScreen.findPreference(key)).thenReturn(mPreference);
+        when(mPreference.getKey()).thenReturn(key);
+        when(mFragment.getActivity()).thenReturn(mActivity);
+    }
+
+    @Test
+    public void getAvailabilityStatus_shouldReturnAvailable() {
+        assertThat(mController.getAvailabilityStatus()).isEqualTo(mController.AVAILABLE);
+    }
+
+    @Test
+    public void refreshUi_shouldUpdatePreference() {
+        mController.displayPreference(mScreen);
+        mController.refreshUi();
+
+        assertThat(mController.preferenceUpdated).isTrue();
+    }
+
+    @Test
+    public void handlePreferenceTreeClick_shouldStartDetailFragmentClass() {
+        final ApplicationsState.AppEntry appEntry = mock(ApplicationsState.AppEntry.class);
+        appEntry.info = new ApplicationInfo();
+        when(mFragment.getAppEntry()).thenReturn(appEntry);
+
+        mController.handlePreferenceTreeClick(mPreference);
+
+        verify(mActivity).startPreferencePanel(any(),
+                eq(mController.getDetailFragmentClass().getName()), any(), anyInt(), any(), any(),
+                anyInt());
+    }
+
+    private class TestPreferenceController extends AppInfoPreferenceControllerBase {
+
+        private boolean preferenceUpdated;
+
+        public TestPreferenceController(AppInfoDashboardFragment parent) {
+            super(RuntimeEnvironment.application, parent, "TestKey");
+        }
+
+        @Override
+        public void updateState(Preference preference) {
+            preferenceUpdated = true;
+        }
+
+        @Override
+        public Class<? extends SettingsPreferenceFragment> getDetailFragmentClass() {
+            return AppNotificationSettings.class;
+        }
+
+    }
+
+}
diff --git a/tests/robotests/src/com/android/settings/applications/appinfo/AppMemoryPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/applications/appinfo/AppMemoryPreferenceControllerTest.java
new file mode 100644
index 0000000..39bb875
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/applications/appinfo/AppMemoryPreferenceControllerTest.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.applications.appinfo;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.anyInt;
+import static org.mockito.ArgumentMatchers.eq;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+import android.content.Context;
+import android.provider.Settings;
+import android.support.v7.preference.Preference;
+import android.support.v7.preference.PreferenceScreen;
+
+import com.android.settings.R;
+import com.android.settings.SettingsActivity;
+import com.android.settings.TestConfig;
+import com.android.settings.applications.AppInfoDashboardFragment;
+import com.android.settings.applications.ProcStatsData;
+import com.android.settings.applications.ProcessStatsDetail;
+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;
+
+@RunWith(SettingsRobolectricTestRunner.class)
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION_O)
+public class AppMemoryPreferenceControllerTest {
+
+    @Mock
+    private SettingsActivity mActivity;
+    @Mock
+    private AppInfoDashboardFragment mFragment;
+    @Mock
+    private PreferenceScreen mScreen;
+    @Mock
+    private Preference mPreference;
+
+    private Context mContext;
+    private AppMemoryPreferenceController mController;
+
+    @Before
+    public void setUp() {
+        MockitoAnnotations.initMocks(this);
+        mContext = RuntimeEnvironment.application;
+        mController =
+                spy(new AppMemoryPreferenceController(mContext, mFragment, null /* lifecycle */));
+        when(mScreen.findPreference(mController.getPreferenceKey())).thenReturn(mPreference);
+        final String key = mController.getPreferenceKey();
+        when(mPreference.getKey()).thenReturn(key);
+        when(mFragment.getActivity()).thenReturn(mActivity);
+    }
+
+    @Test
+    public void getAvailabilityStatus_developmentSettingsEnabled_shouldReturnAvailable() {
+        Settings.Global.putInt(mContext.getContentResolver(),
+                Settings.Global.DEVELOPMENT_SETTINGS_ENABLED, 1);
+
+        assertThat(mController.getAvailabilityStatus()).isEqualTo(mController.AVAILABLE);
+    }
+
+    @Test
+    public void getAvailabilityStatus_developmentSettingsDisabled_shouldReturnDisabled() {
+        Settings.Global.putInt(mContext.getContentResolver(),
+                Settings.Global.DEVELOPMENT_SETTINGS_ENABLED, 0);
+
+        assertThat(mController.getAvailabilityStatus())
+                .isEqualTo(mController.DISABLED_DEPENDENT_SETTING);
+    }
+
+    @Test
+    public void handlePreferenceTreeClick_shouldStartProcessStatsDetail() {
+        final ProcStatsData data = mock(ProcStatsData.class);
+        when(data.getMemInfo()).thenReturn(mock(ProcStatsData.MemInfo.class));
+        ReflectionHelpers.setField(mController, "mStatsManager", data);
+
+        mController.handlePreferenceTreeClick(mPreference);
+
+        verify(mActivity).startPreferencePanel(any(), eq(ProcessStatsDetail.class.getName()), any(),
+                eq(R.string.memory_usage), any(), any(), anyInt());
+    }
+
+}
diff --git a/tests/robotests/src/com/android/settings/applications/appinfo/AppNotificationPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/applications/appinfo/AppNotificationPreferenceControllerTest.java
new file mode 100644
index 0000000..0d42fc2
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/applications/appinfo/AppNotificationPreferenceControllerTest.java
@@ -0,0 +1,92 @@
+/*
+ * Copyright (C) 2017 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.applications.appinfo;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import static org.mockito.ArgumentMatchers.any;
+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.content.Context;
+import android.content.pm.ApplicationInfo;
+import android.support.v7.preference.Preference;
+import android.support.v7.preference.PreferenceScreen;
+
+import com.android.settings.R;
+import com.android.settings.TestConfig;
+import com.android.settings.applications.AppInfoDashboardFragment;
+import com.android.settings.notification.AppNotificationSettings;
+import com.android.settings.notification.NotificationBackend;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
+import com.android.settingslib.applications.ApplicationsState;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.mockito.MockitoAnnotations;
+import org.robolectric.RuntimeEnvironment;
+import org.robolectric.annotation.Config;
+import org.robolectric.util.ReflectionHelpers;
+
+@RunWith(SettingsRobolectricTestRunner.class)
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION_O)
+public class AppNotificationPreferenceControllerTest {
+
+    @Mock
+    private AppInfoDashboardFragment mFragment;
+    @Mock
+    private PreferenceScreen mScreen;
+    @Mock
+    private Preference mPreference;
+
+    private Context mContext;
+    private AppNotificationPreferenceController mController;
+
+    @Before
+    public void setUp() {
+        MockitoAnnotations.initMocks(this);
+        mContext = RuntimeEnvironment.application;
+        mController =
+                spy(new AppNotificationPreferenceController(mContext, mFragment));
+        when(mScreen.findPreference(mController.getPreferenceKey())).thenReturn(mPreference);
+        final String key = mController.getPreferenceKey();
+        when(mPreference.getKey()).thenReturn(key);
+    }
+
+    @Test
+    public void getDetailFragmentClass_shouldReturnAppNotificationSettings() {
+        assertThat(mController.getDetailFragmentClass()).isEqualTo(AppNotificationSettings.class);
+    }
+
+    @Test
+    public void updateState_shouldSetSummary() {
+        final ApplicationsState.AppEntry appEntry = mock(ApplicationsState.AppEntry.class);
+        appEntry.info = new ApplicationInfo();
+        when(mFragment.getAppEntry()).thenReturn(appEntry);
+        ReflectionHelpers.setField(mController, "mBackend", new NotificationBackend());
+        mController.displayPreference(mScreen);
+
+        mController.updateState(mPreference);
+
+        verify(mPreference).setSummary(any());
+    }
+
+}
diff --git a/tests/robotests/src/com/android/settings/applications/appinfo/AppOpenByDefaultPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/applications/appinfo/AppOpenByDefaultPreferenceControllerTest.java
new file mode 100644
index 0000000..d4f0179
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/applications/appinfo/AppOpenByDefaultPreferenceControllerTest.java
@@ -0,0 +1,166 @@
+/*
+ * Copyright (C) 2017 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.applications.appinfo;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.never;
+import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+import android.content.Context;
+import android.content.pm.ApplicationInfo;
+import android.content.pm.PackageInfo;
+import android.support.v7.preference.Preference;
+import android.support.v7.preference.PreferenceScreen;
+
+import com.android.settings.R;
+import com.android.settings.TestConfig;
+import com.android.settings.applications.AppInfoDashboardFragment;
+import com.android.settings.applications.AppLaunchSettings;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
+import com.android.settingslib.applications.AppUtils;
+import com.android.settingslib.applications.ApplicationsState.AppEntry;
+import com.android.settingslib.applications.instantapps.InstantAppDataProvider;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.mockito.MockitoAnnotations;
+import org.robolectric.RuntimeEnvironment;
+import org.robolectric.annotation.Config;
+import org.robolectric.util.ReflectionHelpers;
+
+@RunWith(SettingsRobolectricTestRunner.class)
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION_O)
+public class AppOpenByDefaultPreferenceControllerTest {
+
+    @Mock
+    private AppInfoDashboardFragment mFragment;
+    @Mock
+    private PreferenceScreen mScreen;
+    @Mock
+    private Preference mPreference;
+
+    private Context mContext;
+    private AppOpenByDefaultPreferenceController mController;
+
+    @Before
+    public void setUp() {
+        MockitoAnnotations.initMocks(this);
+        mContext = RuntimeEnvironment.application.getApplicationContext();
+        mController = spy(new AppOpenByDefaultPreferenceController(mContext, mFragment));
+        when(mScreen.findPreference(mController.getPreferenceKey())).thenReturn(mPreference);
+    }
+
+    @Test
+    public void getDetailFragmentClass_shouldReturnAppLaunchSettings() {
+        assertThat(mController.getDetailFragmentClass()).isEqualTo(AppLaunchSettings.class);
+    }
+
+    @Test
+    public void displayPreference_noAppEntry_shouldDisablePreference() {
+        mController.displayPreference(mScreen);
+
+        verify(mPreference).setEnabled(false);
+    }
+
+    @Test
+    public void displayPreference_noAppInfo_shouldDisablePreference() {
+        final AppEntry appEntry = mock(AppEntry.class);
+        when(mFragment.getAppEntry()).thenReturn(appEntry);
+
+        mController.displayPreference(mScreen);
+
+        verify(mPreference).setEnabled(false);
+    }
+
+    @Test
+    public void displayPreference_appNotInstalled_shouldDisablePreference() {
+        final AppEntry appEntry = mock(AppEntry.class);
+        appEntry.info = new ApplicationInfo();
+        when(mFragment.getAppEntry()).thenReturn(appEntry);
+
+        mController.displayPreference(mScreen);
+
+        verify(mPreference).setEnabled(false);
+    }
+
+    @Test
+    public void displayPreference_appDisabled_shouldDisablePreference() {
+        final AppEntry appEntry = mock(AppEntry.class);
+        appEntry.info = new ApplicationInfo();
+        appEntry.info.flags &= ApplicationInfo.FLAG_INSTALLED;
+        appEntry.info.enabled = false;
+        when(mFragment.getAppEntry()).thenReturn(appEntry);
+
+        mController.displayPreference(mScreen);
+
+        verify(mPreference).setEnabled(false);
+    }
+
+    @Test
+    public void displayPreference_appEnabled_shouldNotDisablePreference() {
+        final AppEntry appEntry = mock(AppEntry.class);
+        appEntry.info = new ApplicationInfo();
+        appEntry.info.flags |= ApplicationInfo.FLAG_INSTALLED;
+        appEntry.info.enabled = true;
+        when(mFragment.getAppEntry()).thenReturn(appEntry);
+
+        mController.displayPreference(mScreen);
+
+        verify(mPreference, never()).setEnabled(false);
+    }
+
+    @Test
+    public void updateState_noPackageInfo_shouldNotShowPreference() {
+        mController.updateState(mPreference);
+
+        verify(mPreference).setVisible(false);
+    }
+
+    @Test
+    public void updateState_isInstantApp_shouldNotShowPreference() {
+        when(mFragment.getPackageInfo()).thenReturn(new PackageInfo());
+        ReflectionHelpers.setStaticField(AppUtils.class, "sInstantAppDataProvider",
+                (InstantAppDataProvider) (i -> true));
+
+        mController.updateState(mPreference);
+
+        verify(mPreference).setVisible(false);
+    }
+
+    @Test
+    public void updateState_notInstantApp_shouldShowPreferenceAndSetSummary() {
+        when(mFragment.getPackageInfo()).thenReturn(new PackageInfo());
+        final AppEntry appEntry = mock(AppEntry.class);
+        appEntry.info = new ApplicationInfo();
+        when(mFragment.getAppEntry()).thenReturn(appEntry);
+        ReflectionHelpers.setStaticField(AppUtils.class, "sInstantAppDataProvider",
+                (InstantAppDataProvider) (i -> false));
+
+        mController.updateState(mPreference);
+
+        verify(mPreference).setVisible(true);
+        verify(mPreference).setSummary(any());
+    }
+
+}
diff --git a/tests/robotests/src/com/android/settings/applications/appinfo/AppPermissionPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/applications/appinfo/AppPermissionPreferenceControllerTest.java
new file mode 100644
index 0000000..3ddfaf0
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/applications/appinfo/AppPermissionPreferenceControllerTest.java
@@ -0,0 +1,145 @@
+/*
+ * Copyright (C) 2017 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.applications.appinfo;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.anyInt;
+import static org.mockito.ArgumentMatchers.argThat;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+import android.content.Context;
+import android.content.Intent;
+import android.content.pm.ApplicationInfo;
+import android.support.v7.preference.Preference;
+import android.support.v7.preference.PreferenceScreen;
+
+import com.android.settings.R;
+import com.android.settings.SettingsActivity;
+import com.android.settings.TestConfig;
+import com.android.settings.applications.AppInfoDashboardFragment;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
+import com.android.settingslib.applications.ApplicationsState;
+
+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.ArrayList;
+
+@RunWith(SettingsRobolectricTestRunner.class)
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION_O)
+public class AppPermissionPreferenceControllerTest {
+
+    @Mock
+    private SettingsActivity mActivity;
+    @Mock
+    private AppInfoDashboardFragment mFragment;
+    @Mock
+    private PreferenceScreen mScreen;
+    @Mock
+    private Preference mPreference;
+
+    private Context mContext;
+    private AppPermissionPreferenceController mController;
+
+    @Before
+    public void setUp() {
+        MockitoAnnotations.initMocks(this);
+        mContext = RuntimeEnvironment.application;
+        mController = new AppPermissionPreferenceController(mContext, mFragment, "Package1");
+        when(mScreen.findPreference(any())).thenReturn(mPreference);
+        final String key = mController.getPreferenceKey();
+        when(mPreference.getKey()).thenReturn(key);
+        when(mFragment.getActivity()).thenReturn(mActivity);
+    }
+
+    @Test
+    public void getAvailabilityStatus_isAlwaysAvailable() {
+        assertThat(mController.getAvailabilityStatus()).isEqualTo(mController.AVAILABLE);
+    }
+
+    @Test
+    public void onPermissionSummaryResult_noRequestedPermission_shouldDisablePreference() {
+        mController.displayPreference(mScreen);
+
+        mController.mPermissionCallback.onPermissionSummaryResult(
+                1, 0, 1, new ArrayList<CharSequence>());
+
+        verify(mPreference).setEnabled(false);
+        verify(mPreference).setSummary(mContext.getString(
+                R.string.runtime_permissions_summary_no_permissions_requested));
+    }
+
+    @Test
+    public void onPermissionSummaryResult_noGrantedPermission_shouldSetNoPermissionSummary() {
+        mController.displayPreference(mScreen);
+
+        mController.mPermissionCallback.onPermissionSummaryResult(
+                1, 5, 0, new ArrayList<CharSequence>());
+
+        verify(mPreference).setEnabled(true);
+        verify(mPreference).setSummary(mContext.getString(
+                R.string.runtime_permissions_summary_no_permissions_granted));
+    }
+
+    @Test
+    public void onPermissionSummaryResult_hasRuntimePermission_shouldSetPermissionAsSummary() {
+        mController.displayPreference(mScreen);
+        final String permission = "Storage";
+        final ArrayList<CharSequence> labels = new ArrayList<>();
+        labels.add(permission);
+
+        mController.mPermissionCallback.onPermissionSummaryResult(1, 5, 0, labels);
+
+        verify(mPreference).setEnabled(true);
+        verify(mPreference).setSummary(permission);
+    }
+
+    @Test
+    public void onPermissionSummaryResult_hasAdditionalPermission_shouldSetAdditionalSummary() {
+        mController.displayPreference(mScreen);
+        final String permission = "Storage";
+        final ArrayList<CharSequence> labels = new ArrayList<>();
+        labels.add(permission);
+
+        mController.mPermissionCallback.onPermissionSummaryResult(1, 5, 2, labels);
+
+        verify(mPreference).setEnabled(true);
+        verify(mPreference).setSummary("Storage and 2 additional permissions");
+    }
+
+    @Test
+    public void handlePreferenceTreeClick_shouldStartManagePermissionsActivity() {
+        final ApplicationsState.AppEntry appEntry = mock(ApplicationsState.AppEntry.class);
+        appEntry.info = new ApplicationInfo();
+        when(mFragment.getAppEntry()).thenReturn(appEntry);
+
+        mController.handlePreferenceTreeClick(mPreference);
+
+        verify(mActivity).startActivityForResult(argThat(intent-> intent != null &&
+                Intent.ACTION_MANAGE_APP_PERMISSIONS.equals(intent.getAction())), anyInt());
+    }
+
+}
diff --git a/tests/robotests/src/com/android/settings/applications/appinfo/AppStoragePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/applications/appinfo/AppStoragePreferenceControllerTest.java
new file mode 100644
index 0000000..1b6b3c0
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/applications/appinfo/AppStoragePreferenceControllerTest.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.applications.appinfo;
+
+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.mock;
+import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+import android.app.LoaderManager;
+import android.content.Context;
+import android.content.pm.ApplicationInfo;
+import android.os.Bundle;
+import android.support.v7.preference.Preference;
+
+import com.android.settings.R;
+import com.android.settings.TestConfig;
+import com.android.settings.applications.AppInfoDashboardFragment;
+import com.android.settings.applications.AppStorageSettings;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
+import com.android.settingslib.applications.ApplicationsState.AppEntry;
+import com.android.settingslib.applications.StorageStatsSource;
+
+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_O)
+public class AppStoragePreferenceControllerTest {
+
+    @Mock
+    private LoaderManager mLoaderManager;
+    @Mock
+    private AppInfoDashboardFragment mFragment;
+
+    private Context mContext;
+    private AppStoragePreferenceController mController;
+
+    @Before
+    public void setUp() {
+        MockitoAnnotations.initMocks(this);
+        mContext = RuntimeEnvironment.application.getApplicationContext();
+        mController =
+                spy(new AppStoragePreferenceController(mContext, mFragment, null /* lifecycle */));
+    }
+
+    @Test
+    public void onResume_shouldRestartStorageLoader() {
+        doReturn(mLoaderManager).when(mFragment).getLoaderManager();
+
+        mController.onResume();
+
+        verify(mLoaderManager).restartLoader(AppInfoDashboardFragment.LOADER_STORAGE, Bundle.EMPTY,
+                mController);
+    }
+
+    @Test
+    public void onPause_shouldDestroyStorageLoader() {
+        doReturn(mLoaderManager).when(mFragment).getLoaderManager();
+
+        mController.onPause();
+
+        verify(mLoaderManager).destroyLoader(AppInfoDashboardFragment.LOADER_STORAGE);
+    }
+
+    @Test
+    public void getDetailFragmentClass_shouldReturnAppStorageSettings() {
+        assertThat(mController.getDetailFragmentClass()).isEqualTo(AppStorageSettings.class);
+    }
+
+    @Test
+    public void updateState_shouldUpdatePreferenceSummary() {
+        final AppEntry appEntry = mock(AppEntry.class);
+        appEntry.info = new ApplicationInfo();
+        when(mFragment.getAppEntry()).thenReturn(appEntry);
+        Preference preference = mock(Preference.class);
+
+        mController.updateState(preference);
+
+        verify(preference).setSummary(any());
+    }
+
+    @Test
+    public void getStorageSummary_shouldWorkForExternal() {
+        final StorageStatsSource.AppStorageStats stats =
+                mock(StorageStatsSource.AppStorageStats.class);
+        when(stats.getTotalBytes()).thenReturn(1L);
+
+        assertThat(mController.getStorageSummary(stats, true))
+                .isEqualTo("1 B used in external storage");
+    }
+
+    @Test
+    public void getStorageSummary_shouldWorkForInternal() {
+        final StorageStatsSource.AppStorageStats stats =
+                mock(StorageStatsSource.AppStorageStats.class);
+        when(stats.getTotalBytes()).thenReturn(1L);
+
+        assertThat(mController.getStorageSummary(stats, false))
+                .isEqualTo("1 B used in internal storage");
+    }
+
+}
diff --git a/tests/robotests/src/com/android/settings/applications/appinfo/AppVersionPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/applications/appinfo/AppVersionPreferenceControllerTest.java
new file mode 100644
index 0000000..838b442
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/applications/appinfo/AppVersionPreferenceControllerTest.java
@@ -0,0 +1,69 @@
+/*
+ * Copyright (C) 2017 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.applications.appinfo;
+
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+import android.content.Context;
+import android.content.pm.PackageInfo;
+import android.support.v7.preference.Preference;
+
+import com.android.settings.TestConfig;
+import com.android.settings.applications.AppInfoDashboardFragment;
+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_O)
+public class AppVersionPreferenceControllerTest {
+
+    @Mock
+    private AppInfoDashboardFragment mFragment;
+    @Mock
+    private Preference mPreference;
+
+    private Context mContext;
+    private AppVersionPreferenceController mController;
+
+    @Before
+    public void setUp() {
+        MockitoAnnotations.initMocks(this);
+        mContext = RuntimeEnvironment.application;
+        mController = new AppVersionPreferenceController(mContext, mFragment);
+    }
+
+    @Test
+    public void updateState_shouldUpdatePreferenceSummary() {
+        final PackageInfo packageInfo = mock(PackageInfo.class);
+        packageInfo.versionName = "test1234";
+        when(mFragment.getPackageInfo()).thenReturn(packageInfo);
+
+        mController.updateState(mPreference);
+
+        verify(mPreference).setSummary("version test1234");
+    }
+
+}
diff --git a/tests/robotests/src/com/android/settings/applications/appinfo/DefaultAppShortcutPreferenceControllerBaseTest.java b/tests/robotests/src/com/android/settings/applications/appinfo/DefaultAppShortcutPreferenceControllerBaseTest.java
new file mode 100644
index 0000000..1a06f3b
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/applications/appinfo/DefaultAppShortcutPreferenceControllerBaseTest.java
@@ -0,0 +1,145 @@
+/*
+ * Copyright (C) 2017 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.applications.appinfo;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import static org.mockito.ArgumentMatchers.argThat;
+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.UserManager;
+import android.support.v7.preference.Preference;
+import android.support.v7.preference.PreferenceScreen;
+
+import com.android.settings.R;
+import com.android.settings.SettingsActivity;
+import com.android.settings.TestConfig;
+import com.android.settings.applications.AppInfoDashboardFragment;
+import com.android.settings.applications.DefaultAppSettings;
+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_O)
+public class DefaultAppShortcutPreferenceControllerBaseTest {
+
+    @Mock
+    private UserManager mUserManager;
+    @Mock
+    private AppInfoDashboardFragment mFragment;
+    @Mock
+    private PreferenceScreen mScreen;
+    @Mock
+    private Preference mPreference;
+
+    private Context mContext;
+    private TestPreferenceController mController;
+
+    @Before
+    public void setUp() {
+        MockitoAnnotations.initMocks(this);
+        mContext = spy(RuntimeEnvironment.application);
+        when(mContext.getSystemService(Context.USER_SERVICE)).thenReturn(mUserManager);
+        mController = new TestPreferenceController(mContext, mFragment);
+        final String key = mController.getPreferenceKey();
+        when(mPreference.getKey()).thenReturn(key);
+    }
+
+    @Test
+    public void getAvailabilityStatus_managedProfile_shouldReturnDisabled() {
+        when(mUserManager.isManagedProfile()).thenReturn(true);
+
+        assertThat(mController.getAvailabilityStatus()).isEqualTo(mController.DISABLED_FOR_USER);
+    }
+
+    @Test
+    public void getAvailabilityStatus_hasAppCapability_shouldReturnAvailable() {
+        mController.capable = true;
+        when(mUserManager.isManagedProfile()).thenReturn(false);
+
+        assertThat(mController.getAvailabilityStatus()).isEqualTo(mController.AVAILABLE);
+    }
+
+    @Test
+    public void getAvailabilityStatus_noAppCapability_shouldReturnDisabled() {
+        mController.capable = false;
+        when(mUserManager.isManagedProfile()).thenReturn(false);
+
+        assertThat(mController.getAvailabilityStatus()).isEqualTo(mController.DISABLED_UNSUPPORTED);
+    }
+
+    @Test
+    public void updateState_isDefaultApp_shouldSetSummaryToYes() {
+        mController.isDefault = true;
+
+        mController.updateState(mPreference);
+
+        verify(mPreference).setSummary(R.string.yes);
+    }
+
+    @Test
+    public void updateState_notDefaultApp_shouldSetSummaryToNo() {
+        mController.isDefault = false;
+
+        mController.updateState(mPreference);
+
+        verify(mPreference).setSummary(R.string.no);
+    }
+
+    @Test
+    public void handlePreferenceTreeClick_shouldStartDefaultAppSettings() {
+        mController.handlePreferenceTreeClick(mPreference);
+
+        verify(mContext).startActivity(argThat(intent-> intent != null
+                && intent.getStringExtra(SettingsActivity.EXTRA_SHOW_FRAGMENT).equals(
+                        DefaultAppSettings.class.getName())
+                && intent.getBundleExtra(SettingsActivity.EXTRA_SHOW_FRAGMENT_ARGUMENTS)
+                .getString(SettingsActivity.EXTRA_FRAGMENT_ARG_KEY).equals("TestKey")));
+    }
+
+    private class TestPreferenceController extends DefaultAppShortcutPreferenceControllerBase {
+
+        private boolean isDefault;
+        private boolean capable;
+
+        public TestPreferenceController(Context context, AppInfoDashboardFragment parent) {
+            super(context, "TestKey", "TestPackage");
+        }
+
+        @Override
+        protected boolean hasAppCapability() {
+            return capable;
+        }
+
+        @Override
+        protected boolean isDefaultApp() {
+            return isDefault;
+        }
+
+    }
+
+}
diff --git a/tests/robotests/src/com/android/settings/applications/appinfo/DefaultBrowserShortcutPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/applications/appinfo/DefaultBrowserShortcutPreferenceControllerTest.java
new file mode 100644
index 0000000..0a18722
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/applications/appinfo/DefaultBrowserShortcutPreferenceControllerTest.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.applications.appinfo;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import static org.mockito.ArgumentMatchers.anyInt;
+import static org.mockito.ArgumentMatchers.argThat;
+import static org.mockito.Mockito.spy;
+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.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;
+
+import java.util.ArrayList;
+import java.util.List;
+
+@RunWith(SettingsRobolectricTestRunner.class)
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION_O)
+public class DefaultBrowserShortcutPreferenceControllerTest {
+
+    @Mock
+    private PackageManager mPackageManager;
+
+    private Context mContext;
+    private DefaultBrowserShortcutPreferenceController mController;
+
+    @Before
+    public void setUp() {
+        MockitoAnnotations.initMocks(this);
+        mContext = spy(RuntimeEnvironment.application);
+        when(mContext.getPackageManager()).thenReturn(mPackageManager);
+        mController = new DefaultBrowserShortcutPreferenceController(mContext, "Package1");
+    }
+
+    @Test
+    public void getPreferenceKey_shouldReturnDefaultBrowser() {
+        assertThat(mController.getPreferenceKey()).isEqualTo("default_browser");
+    }
+
+    @Test
+    public void hasAppCapability_hasBrowserCapability_shouldReturnTrue() {
+        List<ResolveInfo> resolveInfos = new ArrayList<>();
+        resolveInfos.add(new ResolveInfo());
+        when(mPackageManager.queryIntentActivities(argThat(intent-> intent != null
+                && intent.getCategories().contains(Intent.CATEGORY_BROWSABLE)), anyInt()))
+                .thenReturn(resolveInfos);
+
+        assertThat(mController.hasAppCapability()).isTrue();
+    }
+
+    @Test
+    public void hasAppCapability_noBrowserCapability_shouldReturnFalse() {
+        assertThat(mController.hasAppCapability()).isFalse();
+    }
+
+    @Test
+    public void isDefaultApp_isDefaultBrowser_shouldReturnTrue() {
+        when(mPackageManager.getDefaultBrowserPackageNameAsUser(anyInt())).thenReturn("Package1");
+
+        assertThat(mController.isDefaultApp()).isTrue();
+    }
+
+    @Test
+    public void isDefaultApp_notDefaultBrowser_shouldReturnFalse() {
+        assertThat(mController.isDefaultApp()).isFalse();
+    }
+
+}
diff --git a/tests/robotests/src/com/android/settings/applications/appinfo/DefaultEmergencyShortcutPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/applications/appinfo/DefaultEmergencyShortcutPreferenceControllerTest.java
new file mode 100644
index 0000000..414ef70
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/applications/appinfo/DefaultEmergencyShortcutPreferenceControllerTest.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.applications.appinfo;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import static org.mockito.ArgumentMatchers.anyInt;
+import static org.mockito.ArgumentMatchers.argThat;
+import static org.mockito.Mockito.spy;
+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 android.provider.Settings;
+import android.telephony.TelephonyManager;
+
+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;
+
+import java.util.ArrayList;
+import java.util.List;
+
+@RunWith(SettingsRobolectricTestRunner.class)
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION_O)
+public class DefaultEmergencyShortcutPreferenceControllerTest {
+
+    @Mock
+    private PackageManager mPackageManager;
+
+    private Context mContext;
+    private DefaultEmergencyShortcutPreferenceController mController;
+
+    @Before
+    public void setUp() {
+        MockitoAnnotations.initMocks(this);
+        mContext = spy(RuntimeEnvironment.application);
+        when(mContext.getPackageManager()).thenReturn(mPackageManager);
+        mController = new DefaultEmergencyShortcutPreferenceController(mContext, "Package1");
+    }
+
+    @Test
+    public void getPreferenceKey_shouldReturnDefaultEmergency() {
+        assertThat(mController.getPreferenceKey()).isEqualTo("default_emergency_app");
+    }
+
+    @Test
+    public void hasAppCapability_hasEmergencyCapability_shouldReturnTrue() {
+        List<ResolveInfo> resolveInfos = new ArrayList<>();
+        resolveInfos.add(new ResolveInfo());
+        when(mPackageManager.queryIntentActivities(argThat(intent-> intent != null
+                && intent.getAction().equals(TelephonyManager.ACTION_EMERGENCY_ASSISTANCE)),
+                anyInt())).thenReturn(resolveInfos);
+
+        assertThat(mController.hasAppCapability()).isTrue();
+    }
+
+    @Test
+    public void hasAppCapability_noEmergencyCapability_shouldReturnFalse() {
+        assertThat(mController.hasAppCapability()).isFalse();
+    }
+
+    @Test
+    public void isDefaultApp_isDefaultEmergency_shouldReturnTrue() {
+        Settings.Secure.putString(mContext.getContentResolver(),
+                Settings.Secure.EMERGENCY_ASSISTANCE_APPLICATION, "Package1");
+
+        assertThat(mController.isDefaultApp()).isTrue();
+    }
+
+    @Test
+    public void isDefaultApp_notDefaultEmergency_shouldReturnFalse() {
+        assertThat(mController.isDefaultApp()).isFalse();
+    }
+
+}
diff --git a/tests/robotests/src/com/android/settings/applications/appinfo/DefaultHomeShortcutPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/applications/appinfo/DefaultHomeShortcutPreferenceControllerTest.java
new file mode 100644
index 0000000..a0a57f6
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/applications/appinfo/DefaultHomeShortcutPreferenceControllerTest.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.applications.appinfo;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import static org.mockito.ArgumentMatchers.anyList;
+import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.when;
+
+import android.content.ComponentName;
+import android.content.Context;
+import android.content.pm.PackageManager;
+
+import com.android.settings.TestConfig;
+import com.android.settings.applications.defaultapps.DefaultHomePreferenceController;
+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.annotation.Implementation;
+import org.robolectric.annotation.Implements;
+
+@RunWith(SettingsRobolectricTestRunner.class)
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION_O)
+public class DefaultHomeShortcutPreferenceControllerTest {
+
+    @Mock
+    private PackageManager mPackageManager;
+
+    private Context mContext;
+    private DefaultHomeShortcutPreferenceController mController;
+
+    @Before
+    public void setUp() {
+        MockitoAnnotations.initMocks(this);
+        mContext = spy(RuntimeEnvironment.application);
+        when(mContext.getPackageManager()).thenReturn(mPackageManager);
+        mController = new DefaultHomeShortcutPreferenceController(mContext, "Package1");
+    }
+
+    @Test
+    public void getPreferenceKey_shouldReturnDefaultHome() {
+        assertThat(mController.getPreferenceKey()).isEqualTo("default_home");
+    }
+
+    @Test
+    @Config(shadows = ShadowDefaultHomePreferenceController.class)
+    public void hasAppCapability_hasHomeCapability_shouldReturnTrue() {
+        assertThat(mController.hasAppCapability()).isTrue();
+    }
+
+    @Test
+    public void hasAppCapability_noHomeCapability_shouldReturnFalse() {
+        assertThat(mController.hasAppCapability()).isFalse();
+    }
+
+    @Test
+    public void isDefaultApp_isDefaultHome_shouldReturnTrue() {
+        when(mPackageManager.getHomeActivities(anyList()))
+                .thenReturn(new ComponentName("Package1", "cls1"));
+        assertThat(mController.isDefaultApp()).isTrue();
+    }
+
+    @Test
+    public void isDefaultApp_notDefaultHome_shouldReturnFalse() {
+        when(mPackageManager.getHomeActivities(anyList()))
+                .thenReturn(new ComponentName("pkg2", "cls1"));
+        assertThat(mController.isDefaultApp()).isFalse();
+    }
+
+    @Implements(DefaultHomePreferenceController.class)
+    public static class ShadowDefaultHomePreferenceController {
+        @Implementation
+        public static boolean hasHomePreference(String pkg, Context context) {
+            return true;
+        }
+    }
+
+}
diff --git a/tests/robotests/src/com/android/settings/applications/appinfo/DefaultPhoneShortcutPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/applications/appinfo/DefaultPhoneShortcutPreferenceControllerTest.java
new file mode 100644
index 0000000..d04b114
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/applications/appinfo/DefaultPhoneShortcutPreferenceControllerTest.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.applications.appinfo;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.when;
+
+import android.content.Context;
+import android.content.pm.PackageManager;
+
+import com.android.settings.TestConfig;
+import com.android.settings.applications.defaultapps.DefaultPhonePreferenceController;
+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.annotation.Implementation;
+import org.robolectric.annotation.Implements;
+
+@RunWith(SettingsRobolectricTestRunner.class)
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION_O)
+public class DefaultPhoneShortcutPreferenceControllerTest {
+
+    @Mock
+    private PackageManager mPackageManager;
+
+    private Context mContext;
+    private DefaultPhoneShortcutPreferenceController mController;
+
+    @Before
+    public void setUp() {
+        MockitoAnnotations.initMocks(this);
+        mContext = spy(RuntimeEnvironment.application);
+        when(mContext.getPackageManager()).thenReturn(mPackageManager);
+        mController = new DefaultPhoneShortcutPreferenceController(mContext, "Package1");
+    }
+
+    @Test
+    public void getPreferenceKey_shouldReturnDefaultPhone() {
+        assertThat(mController.getPreferenceKey()).isEqualTo("default_phone_app");
+    }
+
+    @Test
+    @Config(shadows = ShadowDefaultPhonePreferenceController.class)
+    public void hasAppCapability_hasPhoneCapability_shouldReturnTrue() {
+        assertThat(mController.hasAppCapability()).isTrue();
+    }
+
+    @Test
+    public void hasAppCapability_noPhoneCapability_shouldReturnFalse() {
+        assertThat(mController.hasAppCapability()).isFalse();
+    }
+
+    @Test
+    @Config(shadows = ShadowDefaultPhonePreferenceController.class)
+    public void isDefaultApp_isDefaultPhone_shouldReturnTrue() {
+        assertThat(mController.isDefaultApp()).isTrue();
+    }
+
+    @Test
+    public void isDefaultApp_notDefaultPhone_shouldReturnFalse() {
+        assertThat(mController.isDefaultApp()).isFalse();
+    }
+
+    @Implements(DefaultPhonePreferenceController.class)
+    public static class ShadowDefaultPhonePreferenceController {
+        @Implementation
+        public static boolean hasPhonePreference(String pkg, Context context) {
+            return true;
+        }
+
+        @Implementation
+        public static boolean isPhoneDefault(String pkg, Context context) {
+            return true;
+        }
+    }
+
+}
diff --git a/tests/robotests/src/com/android/settings/applications/appinfo/DefaultSmsShortcutPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/applications/appinfo/DefaultSmsShortcutPreferenceControllerTest.java
new file mode 100644
index 0000000..4abaa6a
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/applications/appinfo/DefaultSmsShortcutPreferenceControllerTest.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.applications.appinfo;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.when;
+
+import android.content.Context;
+import android.content.pm.PackageManager;
+
+import com.android.settings.TestConfig;
+import com.android.settings.applications.defaultapps.DefaultSmsPreferenceController;
+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.annotation.Implementation;
+import org.robolectric.annotation.Implements;
+
+@RunWith(SettingsRobolectricTestRunner.class)
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION_O)
+public class DefaultSmsShortcutPreferenceControllerTest {
+
+    @Mock
+    private PackageManager mPackageManager;
+
+    private Context mContext;
+    private DefaultSmsShortcutPreferenceController mController;
+
+    @Before
+    public void setUp() {
+        MockitoAnnotations.initMocks(this);
+        mContext = spy(RuntimeEnvironment.application);
+        when(mContext.getPackageManager()).thenReturn(mPackageManager);
+        mController = new DefaultSmsShortcutPreferenceController(mContext, "Package1");
+    }
+
+    @Test
+    public void getPreferenceKey_shouldReturnDefaultSms() {
+        assertThat(mController.getPreferenceKey()).isEqualTo("default_sms_app");
+    }
+
+    @Test
+    @Config(shadows = ShadowDefaultSmsPreferenceController.class)
+    public void hasAppCapability_hasSmsCapability_shouldReturnTrue() {
+        assertThat(mController.hasAppCapability()).isTrue();
+    }
+
+    @Test
+    public void hasAppCapability_noSmsCapability_shouldReturnFalse() {
+        assertThat(mController.hasAppCapability()).isFalse();
+    }
+
+    @Test
+    @Config(shadows = ShadowDefaultSmsPreferenceController.class)
+    public void isDefaultApp_isDefaultSms_shouldReturnTrue() {
+        assertThat(mController.isDefaultApp()).isTrue();
+    }
+
+    @Test
+    public void isDefaultApp_notDefaultSms_shouldReturnFalse() {
+        assertThat(mController.isDefaultApp()).isFalse();
+    }
+
+    @Implements(DefaultSmsPreferenceController.class)
+    public static class ShadowDefaultSmsPreferenceController {
+        @Implementation
+        public static boolean hasSmsPreference(String pkg, Context context) {
+            return true;
+        }
+
+        @Implementation
+        public static boolean isSmsDefault(String pkg, Context context) {
+            return true;
+        }
+    }
+
+}
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 6c8ad9b..253d6ea 100644
--- a/tests/robotests/src/com/android/settings/applications/assist/AssistContextPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/applications/assist/AssistContextPreferenceControllerTest.java
@@ -16,14 +16,24 @@
 
 package com.android.settings.applications.assist;
 
+import static android.arch.lifecycle.Lifecycle.Event.ON_RESUME;
+
+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 android.content.ContentResolver;
 import android.content.Context;
 import android.provider.Settings;
 import android.support.v7.preference.PreferenceScreen;
 import android.support.v7.preference.TwoStatePreference;
 
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settingslib.core.lifecycle.Lifecycle;
 
 import org.junit.Before;
@@ -35,15 +45,8 @@
 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.anyString;
-import static org.mockito.Matchers.eq;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
 @RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION_O)
 public class AssistContextPreferenceControllerTest {
 
     @Mock
@@ -60,7 +63,7 @@
     public void setUp() {
         MockitoAnnotations.initMocks(this);
         when(mScreen.findPreference(anyString())).thenReturn(mPreference);
-        mLifecycle = new Lifecycle();
+        mLifecycle = new Lifecycle(() -> mLifecycle);
         mContext = RuntimeEnvironment.application;
         mController = new AssistContextPreferenceController(mContext, mLifecycle);
         ReflectionHelpers.setField(mController, "mSettingObserver", mObserver);
@@ -88,7 +91,7 @@
         Settings.Secure.putInt(mContext.getContentResolver(),
                 Settings.Secure.ASSIST_STRUCTURE_ENABLED, 1);
 
-        mLifecycle.onResume();
+        mLifecycle.handleLifecycleEvent(ON_RESUME);
         verify(mObserver).register(any(ContentResolver.class), eq(true));
         verify(mPreference).setChecked(true);
     }
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 d68229f..e062291 100644
--- a/tests/robotests/src/com/android/settings/applications/assist/AssistFlashScreenPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/applications/assist/AssistFlashScreenPreferenceControllerTest.java
@@ -16,6 +16,18 @@
 
 package com.android.settings.applications.assist;
 
+import static android.arch.lifecycle.Lifecycle.Event.ON_RESUME;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import static org.mockito.Matchers.any;
+import static org.mockito.Matchers.anyString;
+import static org.mockito.Matchers.eq;
+import static org.mockito.Mockito.doReturn;
+import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
 import android.content.ComponentName;
 import android.content.ContentResolver;
 import android.content.Context;
@@ -23,8 +35,8 @@
 import android.support.v7.preference.PreferenceScreen;
 import android.support.v7.preference.TwoStatePreference;
 
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.testutils.shadow.ShadowSecureSettings;
 import com.android.settingslib.core.lifecycle.Lifecycle;
 
@@ -38,17 +50,8 @@
 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.anyString;
-import static org.mockito.Matchers.eq;
-import static org.mockito.Mockito.doReturn;
-import static org.mockito.Mockito.spy;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
 @RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION_O)
 public class AssistFlashScreenPreferenceControllerTest {
 
     @Mock(answer = Answers.RETURNS_DEEP_STUBS)
@@ -67,7 +70,7 @@
     public void setUp() {
         MockitoAnnotations.initMocks(this);
         when(mScreen.findPreference(anyString())).thenReturn(mPreference);
-        mLifecycle = new Lifecycle();
+        mLifecycle = new Lifecycle(() -> mLifecycle);
         mContext = RuntimeEnvironment.application;
         mController = spy(new AssistFlashScreenPreferenceController(mContext, mLifecycle));
         mLifecycle.addObserver(mController);
@@ -116,7 +119,7 @@
         Settings.Secure.putInt(mContext.getContentResolver(),
                 Settings.Secure.ASSIST_DISCLOSURE_ENABLED, 1);
 
-        mLifecycle.onResume();
+        mLifecycle.handleLifecycleEvent(ON_RESUME);
 
         verify(mObserver).register(any(ContentResolver.class), eq(true));
         verify(mPreference).setChecked(true);
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 f0956c7..431cfba 100644
--- a/tests/robotests/src/com/android/settings/applications/assist/AssistSettingObserverTest.java
+++ b/tests/robotests/src/com/android/settings/applications/assist/AssistSettingObserverTest.java
@@ -29,7 +29,7 @@
 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_O)
 public class AssistSettingObserverTest {
 
     private AssistSettingObserver mObserver;
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 52916f5..1018872 100644
--- a/tests/robotests/src/com/android/settings/applications/assist/DefaultAssistPickerTest.java
+++ b/tests/robotests/src/com/android/settings/applications/assist/DefaultAssistPickerTest.java
@@ -25,6 +25,7 @@
 import com.android.settings.TestConfig;
 
 import org.junit.Before;
+import org.junit.BeforeClass;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.robolectric.RuntimeEnvironment;
@@ -39,11 +40,15 @@
 import static org.mockito.Mockito.spy;
 
 @RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION_O)
 public class DefaultAssistPickerTest {
 
-    private static final ComponentName TEST_ASSIST =
-            new ComponentName("com.android.settings", "assist");
+    private static ComponentName sTestAssist;
+
+    @BeforeClass
+    public static void beforeClass() {
+        sTestAssist = new ComponentName("com.android.settings", "assist");
+    }
 
     private Context mContext;
     private DefaultAssistPicker mPicker;
@@ -59,22 +64,22 @@
     @Test
     public void setDefaultAppKey_shouldUpdateDefaultAssist() {
         final List<DefaultAssistPicker.Info> assistants = new ArrayList<>();
-        assistants.add(new DefaultAssistPicker.Info(TEST_ASSIST));
+        assistants.add(new DefaultAssistPicker.Info(sTestAssist));
         ReflectionHelpers.setField(mPicker, "mAvailableAssistants", assistants);
-        mPicker.setDefaultKey(TEST_ASSIST.flattenToString());
+        mPicker.setDefaultKey(sTestAssist.flattenToString());
 
         assertThat(Settings.Secure.getString(mContext.getContentResolver(),
                 Settings.Secure.ASSISTANT))
-                .isEqualTo(TEST_ASSIST.flattenToString());
+                .isEqualTo(sTestAssist.flattenToString());
         assertThat(mPicker.getDefaultKey())
-                .isEqualTo(TEST_ASSIST.flattenToString());
+                .isEqualTo(sTestAssist.flattenToString());
     }
 
     @Test
     public void setDefaultAppKey_noAvaialbleAssit_shouldClearDefaultAssist() {
         final List<DefaultAssistPicker.Info> assistants = new ArrayList<>();
         ReflectionHelpers.setField(mPicker, "mAvailableAssistants", assistants);
-        mPicker.setDefaultKey(TEST_ASSIST.flattenToString());
+        mPicker.setDefaultKey(sTestAssist.flattenToString());
 
         assertThat(Settings.Secure.getString(mContext.getContentResolver(),
                 Settings.Secure.ASSISTANT))
@@ -86,7 +91,7 @@
     @Test
     public void setDefaultAppKeyToNull_shouldClearDefaultAssist() {
         final List<DefaultAssistPicker.Info> assistants = new ArrayList<>();
-        assistants.add(new DefaultAssistPicker.Info(TEST_ASSIST));
+        assistants.add(new DefaultAssistPicker.Info(sTestAssist));
         ReflectionHelpers.setField(mPicker, "mAvailableAssistants", assistants);
         mPicker.setDefaultKey(null);
 
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 180abbb..199862f 100644
--- a/tests/robotests/src/com/android/settings/applications/assist/DefaultAssistPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/applications/assist/DefaultAssistPreferenceControllerTest.java
@@ -56,7 +56,7 @@
 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_O)
 public class DefaultAssistPreferenceControllerTest {
 
     private static final String TEST_KEY = "test_pref_key";
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 1b4fb09..6abf09d 100644
--- a/tests/robotests/src/com/android/settings/applications/assist/ManageAssistTest.java
+++ b/tests/robotests/src/com/android/settings/applications/assist/ManageAssistTest.java
@@ -29,7 +29,7 @@
 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_O)
 public class ManageAssistTest {
 
     private ManageAssist mSettings;
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 281e70a..0b933c6 100644
--- a/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultAppInfoTest.java
+++ b/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultAppInfoTest.java
@@ -16,28 +16,36 @@
 
 package com.android.settings.applications.defaultapps;
 
-
 import static com.google.common.truth.Truth.assertThat;
+
+import static org.mockito.ArgumentMatchers.anyInt;
+import static org.mockito.ArgumentMatchers.anyString;
+import static org.mockito.Mockito.doReturn;
+import static org.mockito.Mockito.spy;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
 import android.content.ComponentName;
+import android.content.Context;
+import android.content.pm.ApplicationInfo;
 import android.content.pm.PackageItemInfo;
 import android.content.pm.PackageManager;
+import android.graphics.drawable.Drawable;
 
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
-import com.android.settings.applications.PackageManagerWrapper;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
+import com.android.settingslib.wrapper.PackageManagerWrapper;
 
 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)
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION_O)
 public class DefaultAppInfoTest {
 
     @Mock
@@ -48,32 +56,43 @@
     private PackageManager mPackageManager;
     @Mock
     private PackageManagerWrapper mPackageManagerWrapper;
+    @Mock
+    private ApplicationInfo mApplicationInfo;
+    @Mock
+    private Drawable mIcon;
 
+    private Context mContext;
     private DefaultAppInfo mInfo;
 
     @Before
-    public void setUp() {
+    public void setUp() throws PackageManager.NameNotFoundException {
         MockitoAnnotations.initMocks(this);
+        mContext = spy(RuntimeEnvironment.application);
+        doReturn(mPackageManager).when(mContext).getPackageManager();
         when(mPackageManagerWrapper.getPackageManager()).thenReturn(mPackageManager);
+        when(mPackageManagerWrapper.getApplicationInfoAsUser(anyString(), anyInt(),
+                anyInt())).thenReturn(mApplicationInfo);
+        when(mPackageManager.loadUnbadgedItemIcon(mPackageItemInfo, mApplicationInfo)).thenReturn(
+                mIcon);
     }
 
     @Test
     public void initInfoWithActivityInfo_shouldLoadInfo() {
         mPackageItemInfo.packageName = "test";
-        mInfo = new DefaultAppInfo(mPackageManagerWrapper, mPackageItemInfo);
+        mInfo = new DefaultAppInfo(mContext, mPackageManagerWrapper, mPackageItemInfo);
         mInfo.loadLabel();
-        mInfo.loadIcon();
+        Drawable icon = mInfo.loadIcon();
 
         assertThat(mInfo.getKey()).isEqualTo(mPackageItemInfo.packageName);
+        assertThat(icon).isNotNull();
         verify(mPackageItemInfo).loadLabel(mPackageManager);
-        verify(mPackageItemInfo).loadIcon(mPackageManager);
     }
 
     @Test
     public void initInfoWithComponent_shouldLoadInfo() {
         when(mComponentName.getPackageName()).thenReturn("com.android.settings");
 
-        mInfo = new DefaultAppInfo(mPackageManagerWrapper, 0 /* uid */, mComponentName);
+        mInfo = new DefaultAppInfo(mContext, mPackageManagerWrapper, 0 /* uid */, mComponentName);
         mInfo.getKey();
 
         verify(mComponentName).flattenToString();
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 66ec80a..804df51 100644
--- a/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultAppPickerFragmentTest.java
+++ b/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultAppPickerFragmentTest.java
@@ -17,6 +17,14 @@
 package com.android.settings.applications.defaultapps;
 
 
+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 static org.mockito.Mockito.when;
+
 import android.app.Activity;
 import android.content.Context;
 import android.os.UserManager;
@@ -24,9 +32,10 @@
 import android.util.Pair;
 
 import com.android.internal.logging.nano.MetricsProto;
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
+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.settings.widget.RadioButtonPreference;
 
 import org.junit.Before;
@@ -41,15 +50,8 @@
 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)
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION_O)
 public class DefaultAppPickerFragmentTest {
 
     @Mock(answer = Answers.RETURNS_DEEP_STUBS)
@@ -97,6 +99,12 @@
                 any(Pair.class));
     }
 
+    @Test
+    public void shouldHaveAppPreferenceLayout() {
+        assertThat(mFragment.getRadioButtonPreferenceCustomLayoutResId())
+                .isEqualTo(R.layout.preference_app);
+    }
+
     public static class TestFragment extends DefaultAppPickerFragment {
 
         boolean setDefaultAppKeyCalled;
@@ -107,6 +115,11 @@
         }
 
         @Override
+        protected int getPreferenceScreenResId() {
+            return 0;
+        }
+
+        @Override
         protected List<DefaultAppInfo> getCandidates() {
             return new ArrayList<>();
         }
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 120f3ae..f16c05e 100644
--- a/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultAppPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultAppPreferenceControllerTest.java
@@ -26,8 +26,9 @@
 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.testutils.SettingsRobolectricTestRunner;
+import com.android.settingslib.TwoTargetPreference;
 
 import org.junit.Before;
 import org.junit.Test;
@@ -38,7 +39,7 @@
 import org.robolectric.annotation.Config;
 
 @RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION_O)
 public class DefaultAppPreferenceControllerTest {
 
     private static final String TEST_APP_NAME = "test";
@@ -79,6 +80,16 @@
         verify(mPreference).setSummary(R.string.app_list_preference_none);
     }
 
+    @Test
+    public void updateState_twoTargetPref_shouldUseSmallIcon() {
+        final TwoTargetPreference pref = mock(TwoTargetPreference.class);
+        mController = new TestPreferenceController(mContext);
+
+        mController.updateState(pref);
+
+        verify(pref).setUseSmallIcon(true);
+    }
+
     private static class TestPreferenceController extends DefaultAppPreferenceController {
 
         private DefaultAppInfo mAppInfo;
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 655f693..61d7f34 100644
--- a/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultAutofillPickerTest.java
+++ b/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultAutofillPickerTest.java
@@ -17,20 +17,20 @@
 package com.android.settings.applications.defaultapps;
 
 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 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.applications.PackageManagerWrapper;
 import com.android.settings.testutils.FakeFeatureFactory;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
+import com.android.settingslib.wrapper.PackageManagerWrapper;
 
 import org.junit.Before;
 import org.junit.Test;
@@ -43,11 +43,10 @@
 import org.robolectric.util.ReflectionHelpers;
 
 @RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION_O)
 public class DefaultAutofillPickerTest {
 
-    private static final String TEST_APP_KEY = new ComponentName("foo.bar",
-            "foo.bar.Baz").flattenToString();
+    private static final String TEST_APP_KEY = "foo.bar/foo.bar.Baz";
 
     @Mock(answer = Answers.RETURNS_DEEP_STUBS)
     private Activity mActivity;
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 d6f1122..8a181d8 100644
--- a/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultAutofillPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultAutofillPreferenceControllerTest.java
@@ -16,7 +16,6 @@
 
 package com.android.settings.applications.defaultapps;
 
-
 import android.content.Context;
 import android.content.pm.PackageManager;
 import android.os.UserManager;
@@ -27,8 +26,8 @@
 import com.android.settings.R;
 import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
-import com.android.settings.applications.AutofillManagerWrapper;
-import com.android.settings.applications.PackageManagerWrapper;
+import com.android.settings.wrapper.AutofillManagerWrapper;
+import com.android.settingslib.wrapper.PackageManagerWrapper;
 
 import org.junit.Before;
 import org.junit.Test;
@@ -47,7 +46,7 @@
 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_O)
 public class DefaultAutofillPreferenceControllerTest {
 
     @Mock
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 f5dc72d..934c4c6 100644
--- a/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultBrowserPickerTest.java
+++ b/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultBrowserPickerTest.java
@@ -16,14 +16,13 @@
 
 package com.android.settings.applications.defaultapps;
 
-
 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.applications.PackageManagerWrapper;
+import com.android.settingslib.wrapper.PackageManagerWrapper;
 
 import org.junit.Before;
 import org.junit.Test;
@@ -40,7 +39,7 @@
 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_O)
 public class DefaultBrowserPickerTest {
 
     private static final String TEST_APP_KEY = "";
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 e918ee2..b3406a1 100644
--- a/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultBrowserPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultBrowserPreferenceControllerTest.java
@@ -16,7 +16,6 @@
 
 package com.android.settings.applications.defaultapps;
 
-
 import android.content.Context;
 import android.content.Intent;
 import android.content.pm.ResolveInfo;
@@ -26,7 +25,7 @@
 import com.android.settings.R;
 import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
-import com.android.settings.applications.PackageManagerWrapper;
+import com.android.settingslib.wrapper.PackageManagerWrapper;
 
 import org.junit.Before;
 import org.junit.Test;
@@ -49,7 +48,7 @@
 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_O)
 public class DefaultBrowserPreferenceControllerTest {
 
     @Mock
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 04972ae..d499ac2 100644
--- a/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultEmergencyPickerTest.java
+++ b/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultEmergencyPickerTest.java
@@ -23,7 +23,7 @@
 
 import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
-import com.android.settings.applications.PackageManagerWrapper;
+import com.android.settingslib.wrapper.PackageManagerWrapper;
 
 import org.junit.Before;
 import org.junit.Test;
@@ -41,7 +41,7 @@
 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_O)
 public class DefaultEmergencyPickerTest {
 
     private static final String TEST_APP_KEY = "test_app";
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 b500637..4680a08 100644
--- a/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultHomePickerTest.java
+++ b/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultHomePickerTest.java
@@ -31,7 +31,7 @@
 
 import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
-import com.android.settings.applications.PackageManagerWrapper;
+import com.android.settingslib.wrapper.PackageManagerWrapper;
 
 import org.junit.Before;
 import org.junit.Test;
@@ -59,7 +59,7 @@
 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_O)
 public class DefaultHomePickerTest {
 
     private static final String TEST_APP_KEY = "com.android.settings/DefaultEmergencyPickerTest";
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 22b30bd..cf19655 100644
--- a/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultHomePreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultHomePreferenceControllerTest.java
@@ -16,8 +16,10 @@
 
 package com.android.settings.applications.defaultapps;
 
-
 import static com.google.common.truth.Truth.assertThat;
+
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.eq;
 import static org.mockito.Matchers.anyList;
 import static org.mockito.Mockito.atLeastOnce;
 import static org.mockito.Mockito.mock;
@@ -27,12 +29,14 @@
 
 import android.content.ComponentName;
 import android.content.Context;
+import android.content.Intent;
+import android.content.pm.ResolveInfo;
 import android.os.UserManager;
 import android.support.v7.preference.Preference;
 
 import com.android.settings.TestConfig;
-import com.android.settings.applications.PackageManagerWrapper;
 import com.android.settings.testutils.SettingsRobolectricTestRunner;
+import com.android.settingslib.wrapper.PackageManagerWrapper;
 
 import org.junit.Before;
 import org.junit.Test;
@@ -43,8 +47,11 @@
 import org.robolectric.annotation.Config;
 import org.robolectric.util.ReflectionHelpers;
 
+import java.util.Arrays;
+
+
 @RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION_O)
 public class DefaultHomePreferenceControllerTest {
 
     @Mock
@@ -113,4 +120,32 @@
         assertThat(DefaultHomePreferenceController.isHomeDefault(pkgName, mPackageManager))
                 .isFalse();
     }
+
+    @Test
+    public void testGetSettingIntent_homeHasNoSetting_shouldNotReturnSettingIntent() {
+        when(mPackageManager.getHomeActivities(anyList())).thenReturn(
+                new ComponentName("test.pkg", "class"));
+        assertThat(mController.getSettingIntent(mController.getDefaultAppInfo())).isNull();
+    }
+
+    @Test
+    public void testGetSettingIntent_homeHasOneSetting_shouldReturnSettingIntent() {
+        when(mPackageManager.getHomeActivities(anyList())).thenReturn(
+                new ComponentName("test.pkg", "class"));
+        when(mPackageManager.queryIntentActivities(any(), eq(0))).thenReturn(
+                Arrays.asList(mock(ResolveInfo.class)));
+
+        Intent intent = mController.getSettingIntent(mController.getDefaultAppInfo());
+        assertThat(intent).isNotNull();
+        assertThat(intent.getPackage()).isEqualTo("test.pkg");
+    }
+
+    @Test
+    public void testGetSettingIntent_homeHasMultipleSettings_shouldNotReturnSettingIntent() {
+        when(mPackageManager.getHomeActivities(anyList())).thenReturn(
+                new ComponentName("test.pkg", "class"));
+        when(mPackageManager.queryIntentActivities(any(), eq(0))).thenReturn(
+                Arrays.asList(mock(ResolveInfo.class), mock(ResolveInfo.class)));
+        assertThat(mController.getSettingIntent(mController.getDefaultAppInfo())).isNull();
+    }
 }
diff --git a/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultPaymentSettingsPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultPaymentSettingsPreferenceControllerTest.java
index 6a73269..025d50a 100644
--- a/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultPaymentSettingsPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultPaymentSettingsPreferenceControllerTest.java
@@ -42,7 +42,7 @@
 import org.robolectric.util.ReflectionHelpers;
 
 @RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION_O)
 public class DefaultPaymentSettingsPreferenceControllerTest {
 
     @Mock
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 600acb4..b1bea25 100644
--- a/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultPhonePickerTest.java
+++ b/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultPhonePickerTest.java
@@ -16,14 +16,13 @@
 
 package com.android.settings.applications.defaultapps;
 
-
 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.applications.PackageManagerWrapper;
+import com.android.settingslib.wrapper.PackageManagerWrapper;
 
 import org.junit.Before;
 import org.junit.Test;
@@ -44,7 +43,7 @@
 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_O)
 public class DefaultPhonePickerTest {
 
     private static final String TEST_APP_KEY = "com.android.settings/PickerTest";
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 da0c325..e9bdfe3 100644
--- a/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultSmsPickerTest.java
+++ b/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultSmsPickerTest.java
@@ -16,14 +16,13 @@
 
 package com.android.settings.applications.defaultapps;
 
-
 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.applications.PackageManagerWrapper;
+import com.android.settingslib.wrapper.PackageManagerWrapper;
 
 import org.junit.Before;
 import org.junit.Test;
@@ -43,7 +42,7 @@
 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_O)
 public class DefaultSmsPickerTest {
 
     private static final String TEST_APP_KEY = "com.android.settings/PickerTest";
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 9e190b5..c7ca133 100644
--- a/tests/robotests/src/com/android/settings/applications/instantapps/InstantAppButtonsControllerTest.java
+++ b/tests/robotests/src/com/android/settings/applications/instantapps/InstantAppButtonsControllerTest.java
@@ -46,11 +46,12 @@
 import com.android.settings.R;
 import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
-import com.android.settings.applications.PackageManagerWrapper;
 import com.android.settings.core.instrumentation.MetricsFeatureProvider;
 import com.android.settings.testutils.FakeFeatureFactory;
+import com.android.settingslib.wrapper.PackageManagerWrapper;
 
 import org.junit.Before;
+import org.junit.BeforeClass;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.Answers;
@@ -66,11 +67,16 @@
 
     private static final String TEST_INSTALLER_PACKAGE_NAME = "com.installer";
     private static final String TEST_INSTALLER_ACTIVITY_NAME = "com.installer.InstallerActivity";
-    private static final ComponentName TEST_INSTALLER_COMPONENT =
-            new ComponentName(
-                    TEST_INSTALLER_PACKAGE_NAME,
-                    TEST_INSTALLER_ACTIVITY_NAME);
     private static final String TEST_AIA_PACKAGE_NAME = "test.aia.package";
+    private static ComponentName sTestInstallerComponent;
+
+    @BeforeClass
+    public static void beforeClass() {
+        sTestInstallerComponent =
+                new ComponentName(
+                        TEST_INSTALLER_PACKAGE_NAME,
+                        TEST_INSTALLER_ACTIVITY_NAME);
+    }
 
     @Mock(answer = Answers.RETURNS_DEEP_STUBS)
     Context mockContext;
@@ -133,7 +139,7 @@
         receivedListener.onClick(mockInstallButton);
         assertThat(testFragment.getStartActivityIntent()).isNotNull();
         assertThat(testFragment.getStartActivityIntent().getComponent())
-                .isEqualTo(TEST_INSTALLER_COMPONENT);
+                .isEqualTo(sTestInstallerComponent);
     }
 
     @Test
diff --git a/tests/robotests/src/com/android/settings/applications/manageapplications/AppFilterItemTest.java b/tests/robotests/src/com/android/settings/applications/manageapplications/AppFilterItemTest.java
new file mode 100644
index 0000000..2dde6f4
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/applications/manageapplications/AppFilterItemTest.java
@@ -0,0 +1,92 @@
+/*
+ * Copyright (C) 2017 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF 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.manageapplications;
+
+import static com.android.settings.applications.manageapplications.AppFilterRegistry
+        .FILTER_APPS_BLOCKED;
+import static com.android.settings.applications.manageapplications.AppFilterRegistry
+        .FILTER_APPS_ENABLED;
+import static com.android.settings.applications.manageapplications.AppFilterRegistry
+        .FILTER_APPS_USAGE_ACCESS;
+import static com.google.common.truth.Truth.assertThat;
+
+import com.android.settings.R;
+import com.android.settings.TestConfig;
+import com.android.settings.applications.AppStateUsageBridge;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
+import com.android.settingslib.applications.ApplicationsState;
+
+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_O)
+public class AppFilterItemTest {
+
+    @Test
+    public void equals_sameContent_true() {
+        final AppFilterItem item = AppFilterRegistry.getInstance().get(FILTER_APPS_USAGE_ACCESS);
+        final AppFilterItem item2 = new AppFilterItem(
+                AppStateUsageBridge.FILTER_APP_USAGE,
+                FILTER_APPS_USAGE_ACCESS,
+                R.string.filter_all_apps);
+
+        // Same instance, should be same
+        assertThat(item).isEqualTo(item);
+
+        // Same content, should be same
+        assertThat(item).isEqualTo(item2);
+    }
+
+    @Test
+    public void compare_sameContent_return0() {
+        final AppFilterItem item = AppFilterRegistry.getInstance().get(FILTER_APPS_USAGE_ACCESS);
+        final AppFilterItem item2 = new AppFilterItem(
+                AppStateUsageBridge.FILTER_APP_USAGE,
+                FILTER_APPS_USAGE_ACCESS,
+                R.string.filter_all_apps);
+
+        assertThat(item.compareTo(item)).isEqualTo(0);
+        assertThat(item.compareTo(item2)).isEqualTo(0);
+        assertThat(item2.compareTo(item)).isEqualTo(0);
+    }
+
+    @Test
+    public void compare_toNull_return1() {
+        final AppFilterItem item = AppFilterRegistry.getInstance().get(FILTER_APPS_USAGE_ACCESS);
+        assertThat(item.compareTo(null)).isEqualTo(1);
+    }
+
+    @Test
+    public void compare_differentFilter_returnFilterDiff() {
+        final AppFilterItem item = AppFilterRegistry.getInstance().get(FILTER_APPS_USAGE_ACCESS);
+        final AppFilterItem item2 = new AppFilterItem(
+                ApplicationsState.FILTER_ALL_ENABLED,
+                FILTER_APPS_ENABLED,
+                R.string.filter_enabled_apps);
+        assertThat(item.compareTo(item2)).isNotEqualTo(0);
+    }
+
+    @Test
+    public void hash_differentItem_differentHash() {
+        final AppFilterItem item = AppFilterRegistry.getInstance().get(FILTER_APPS_USAGE_ACCESS);
+        final AppFilterItem item2 = AppFilterRegistry.getInstance().get(FILTER_APPS_BLOCKED);
+
+        assertThat(item.hashCode()).isNotEqualTo(item2.hashCode());
+    }
+}
diff --git a/tests/robotests/src/com/android/settings/applications/manageapplications/AppFilterRegistryTest.java b/tests/robotests/src/com/android/settings/applications/manageapplications/AppFilterRegistryTest.java
new file mode 100644
index 0000000..ccd8470
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/applications/manageapplications/AppFilterRegistryTest.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.applications.manageapplications;
+
+import static com.android.settings.applications.manageapplications.AppFilterRegistry
+        .FILTER_APPS_ALL;
+import static com.android.settings.applications.manageapplications.AppFilterRegistry
+        .FILTER_APPS_INSTALL_SOURCES;
+import static com.android.settings.applications.manageapplications.AppFilterRegistry
+        .FILTER_APPS_POWER_WHITELIST;
+import static com.android.settings.applications.manageapplications.AppFilterRegistry
+        .FILTER_APPS_USAGE_ACCESS;
+import static com.android.settings.applications.manageapplications.AppFilterRegistry
+        .FILTER_APPS_WITH_OVERLAY;
+import static com.android.settings.applications.manageapplications.AppFilterRegistry
+        .FILTER_APPS_WRITE_SETTINGS;
+import static com.android.settings.applications.manageapplications.ManageApplications
+        .LIST_TYPE_GAMES;
+import static com.android.settings.applications.manageapplications.ManageApplications
+        .LIST_TYPE_HIGH_POWER;
+import static com.android.settings.applications.manageapplications.ManageApplications
+        .LIST_TYPE_MAIN;
+import static com.android.settings.applications.manageapplications.ManageApplications
+        .LIST_TYPE_MANAGE_SOURCES;
+import static com.android.settings.applications.manageapplications.ManageApplications
+        .LIST_TYPE_MOVIES;
+import static com.android.settings.applications.manageapplications.ManageApplications
+        .LIST_TYPE_NOTIFICATION;
+import static com.android.settings.applications.manageapplications.ManageApplications
+        .LIST_TYPE_OVERLAY;
+import static com.android.settings.applications.manageapplications.ManageApplications
+        .LIST_TYPE_PHOTOGRAPHY;
+import static com.android.settings.applications.manageapplications.ManageApplications
+        .LIST_TYPE_STORAGE;
+import static com.android.settings.applications.manageapplications.ManageApplications
+        .LIST_TYPE_USAGE_ACCESS;
+import static com.android.settings.applications.manageapplications.ManageApplications
+        .LIST_TYPE_WRITE_SETTINGS;
+import static com.google.common.truth.Truth.assertThat;
+
+import com.android.settings.TestConfig;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
+
+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_O)
+public class AppFilterRegistryTest {
+
+    @Test
+    public void getDefaultType_shouldMatchForAllListType() {
+        final AppFilterRegistry registry = AppFilterRegistry.getInstance();
+        assertThat(registry.getDefaultFilterType(LIST_TYPE_USAGE_ACCESS))
+                .isEqualTo(FILTER_APPS_USAGE_ACCESS);
+        assertThat(registry.getDefaultFilterType(LIST_TYPE_HIGH_POWER))
+                .isEqualTo(FILTER_APPS_POWER_WHITELIST);
+        assertThat(registry.getDefaultFilterType(LIST_TYPE_OVERLAY)).isEqualTo(
+                FILTER_APPS_WITH_OVERLAY);
+        assertThat(registry.getDefaultFilterType(LIST_TYPE_WRITE_SETTINGS)).isEqualTo(
+                FILTER_APPS_WRITE_SETTINGS);
+        assertThat(registry.getDefaultFilterType(LIST_TYPE_MANAGE_SOURCES)).isEqualTo(
+                FILTER_APPS_INSTALL_SOURCES);
+
+        assertThat(registry.getDefaultFilterType(LIST_TYPE_MAIN))
+                .isEqualTo(FILTER_APPS_ALL);
+        assertThat(registry.getDefaultFilterType(LIST_TYPE_NOTIFICATION))
+                .isEqualTo(FILTER_APPS_ALL);
+        assertThat(registry.getDefaultFilterType(LIST_TYPE_STORAGE)).isEqualTo(FILTER_APPS_ALL);
+
+        assertThat(registry.getDefaultFilterType(LIST_TYPE_GAMES)).isEqualTo(FILTER_APPS_ALL);
+        assertThat(registry.getDefaultFilterType(LIST_TYPE_MOVIES)).isEqualTo(FILTER_APPS_ALL);
+        assertThat(registry.getDefaultFilterType(LIST_TYPE_PHOTOGRAPHY)).isEqualTo(FILTER_APPS_ALL);
+    }
+}
+
diff --git a/tests/robotests/src/com/android/settings/applications/manageapplications/ApplicationViewHolderTest.java b/tests/robotests/src/com/android/settings/applications/manageapplications/ApplicationViewHolderTest.java
new file mode 100644
index 0000000..ebc0ddc
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/applications/manageapplications/ApplicationViewHolderTest.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.applications.manageapplications;
+
+import static com.google.common.truth.Truth.assertThat;
+import static org.mockito.Mockito.mock;
+
+import android.content.Context;
+import android.content.pm.ApplicationInfo;
+import android.content.pm.PackageManager;
+import android.view.View;
+import android.widget.FrameLayout;
+
+import com.android.settings.R;
+import com.android.settings.TestConfig;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
+import com.android.settingslib.applications.ApplicationsState;
+
+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_O)
+public class ApplicationViewHolderTest {
+
+    private Context mContext;
+    private View mView;
+    private ApplicationViewHolder mHolder;
+
+    @Before
+    public void seUp() {
+        mContext = RuntimeEnvironment.application;
+        mView = ApplicationViewHolder.newView(new FrameLayout(mContext));
+        mHolder = new ApplicationViewHolder(mView, false /* useStableHeight */);
+    }
+
+    @Test
+    public void updateDisableView_appDisabledUntilUsed_shouldSetDisabled() {
+        final ApplicationInfo info = new ApplicationInfo();
+        info.flags = ApplicationInfo.FLAG_INSTALLED;
+        info.enabled = true;
+        info.enabledSetting = PackageManager.COMPONENT_ENABLED_STATE_DISABLED_UNTIL_USED;
+        mHolder.updateDisableView(info);
+
+        assertThat(mHolder.mDisabled.getText()).isEqualTo(mContext.getText(R.string.disabled));
+    }
+
+    @Test
+    public void setSummaries() {
+        mHolder.setSummary("hello");
+        assertThat(mHolder.mSummary.getText()).isEqualTo("hello");
+
+        mHolder.setSummary(R.string.disabled);
+        assertThat(mHolder.mSummary.getText()).isEqualTo(mContext.getText(R.string.disabled));
+        assertThat(mHolder.mSummaryContainer.getVisibility()).isEqualTo(View.VISIBLE);
+
+        mHolder.setSummary(null);
+        assertThat(mHolder.mSummaryContainer.getVisibility()).isEqualTo(View.GONE);
+    }
+
+    @Test
+    public void updateSize() {
+        final String invalidStr = "invalid";
+        final ApplicationsState.AppEntry entry = mock(ApplicationsState.AppEntry.class);
+        entry.internalSizeStr = "internal";
+        entry.externalSizeStr = "external";
+        entry.sizeStr = entry.internalSizeStr;
+
+        mHolder.updateSizeText(entry, invalidStr, ManageApplications.SIZE_INTERNAL);
+        assertThat(mHolder.mSummary.getText()).isEqualTo(entry.internalSizeStr);
+
+        mHolder.updateSizeText(entry, invalidStr, ManageApplications.SIZE_EXTERNAL);
+        assertThat(mHolder.mSummary.getText()).isEqualTo(entry.externalSizeStr);
+
+        entry.sizeStr = null;
+        entry.size = ApplicationsState.SIZE_INVALID;
+        mHolder.updateSizeText(entry, invalidStr, ManageApplications.SIZE_EXTERNAL);
+        assertThat(mHolder.mSummary.getText()).isEqualTo(invalidStr);
+    }
+}
diff --git a/tests/robotests/src/com/android/settings/applications/manageapplications/ManageApplicationsTest.java b/tests/robotests/src/com/android/settings/applications/manageapplications/ManageApplicationsTest.java
new file mode 100644
index 0000000..d208194
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/applications/manageapplications/ManageApplicationsTest.java
@@ -0,0 +1,254 @@
+/*
+ * 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.manageapplications;
+
+import static com.android.settings.applications.manageapplications.AppFilterRegistry
+        .FILTER_APPS_ALL;
+import static com.android.settings.applications.manageapplications.ManageApplications
+        .LIST_TYPE_MAIN;
+import static com.android.settings.applications.manageapplications.ManageApplications
+        .LIST_TYPE_NOTIFICATION;
+
+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.mock;
+import static org.mockito.Mockito.never;
+import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+import android.app.Activity;
+import android.content.Context;
+import android.os.Bundle;
+import android.os.Looper;
+import android.support.v7.widget.RecyclerView;
+import android.view.LayoutInflater;
+import android.view.Menu;
+import android.view.MenuItem;
+import android.view.View;
+import android.view.ViewGroup;
+
+import com.android.settings.R;
+import com.android.settings.TestConfig;
+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.ShadowEventLogWriter;
+import com.android.settings.widget.LoadingViewController;
+import com.android.settingslib.applications.ApplicationsState;
+
+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 java.util.ArrayList;
+
+/**
+ * Tests for {@link ManageApplications}.
+ */
+@RunWith(SettingsRobolectricTestRunner.class)
+// TODO: Consider making the shadow class set global using a robolectric.properties file.
+@Config(manifest = TestConfig.MANIFEST_PATH,
+        sdk = TestConfig.SDK_VERSION_O,
+        shadows = {
+                SettingsShadowResources.class,
+                SettingsShadowTheme.class,
+                ShadowEventLogWriter.class
+        })
+public class ManageApplicationsTest {
+
+    @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();
+        when(mState.getBackgroundLooper()).thenReturn(mBgLooper);
+
+        mFragment = new ManageApplications();
+    }
+
+    @Test
+    public void updateMenu_mainListType_showAppReset() {
+        setUpOptionMenus();
+        ReflectionHelpers.setField(mFragment, "mListType", 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 ManageApplications.ApplicationsAdapter adapter =
+                spy(new ManageApplications.ApplicationsAdapter(mState, fragment,
+                        AppFilterRegistry.getInstance().get(FILTER_APPS_ALL), new Bundle()));
+        final LoadingViewController loadingViewController =
+                mock(LoadingViewController.class);
+        ReflectionHelpers.setField(adapter, "mLoadingViewController", loadingViewController);
+
+        // 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(loadingViewController, never()).showLoadingViewDelayed();
+    }
+
+    @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 ManageApplications.ApplicationsAdapter adapter =
+                spy(new ManageApplications.ApplicationsAdapter(mState, fragment,
+                        AppFilterRegistry.getInstance().get(FILTER_APPS_ALL), new Bundle()));
+        final LoadingViewController loadingViewController =
+                mock(LoadingViewController.class);
+        ReflectionHelpers.setField(adapter, "mLoadingViewController", loadingViewController);
+
+        // app loading not yet completed
+        ReflectionHelpers.setField(adapter, "mHasReceivedLoadEntries", false);
+
+        adapter.updateLoading();
+
+        verify(loadingViewController).showLoadingViewDelayed();
+    }
+
+    @Test
+    public void shouldUseStableItemHeight_mainType_yes() {
+        assertThat(ManageApplications.ApplicationsAdapter.shouldUseStableItemHeight(
+                LIST_TYPE_MAIN))
+                .isTrue();
+        assertThat(ManageApplications.ApplicationsAdapter.shouldUseStableItemHeight(
+                LIST_TYPE_NOTIFICATION))
+                .isFalse();
+    }
+
+    @Test
+    public void shouldUseStableItemHeight_notificationType_no() {
+
+    }
+
+    @Test
+    public void onRebuildComplete_shouldHideLoadingView() {
+        final Context context = RuntimeEnvironment.application;
+        final ManageApplications fragment = mock(ManageApplications.class);
+        final RecyclerView recyclerView = mock(RecyclerView.class);
+        final View emptyView = mock(View.class);
+        ReflectionHelpers.setField(fragment, "mRecyclerView", recyclerView);
+        ReflectionHelpers.setField(fragment, "mEmptyView", emptyView);
+        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 ManageApplications.ApplicationsAdapter adapter =
+                spy(new ManageApplications.ApplicationsAdapter(mState, fragment,
+                        AppFilterRegistry.getInstance().get(FILTER_APPS_ALL), new Bundle()));
+        final LoadingViewController loadingViewController =
+                mock(LoadingViewController.class);
+        ReflectionHelpers.setField(adapter, "mLoadingViewController", loadingViewController);
+        ReflectionHelpers.setField(adapter, "mAppFilter",
+                AppFilterRegistry.getInstance().get(FILTER_APPS_ALL));
+
+        // 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(loadingViewController).showContent(true /* animate */);
+    }
+
+    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/manageapplications/MusicViewHolderControllerTest.java b/tests/robotests/src/com/android/settings/applications/manageapplications/MusicViewHolderControllerTest.java
new file mode 100644
index 0000000..c7f2f53
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/applications/manageapplications/MusicViewHolderControllerTest.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.applications.manageapplications;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import static org.mockito.Matchers.nullable;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+import android.app.Fragment;
+import android.content.Context;
+import android.content.Intent;
+import android.os.UserHandle;
+import android.os.storage.VolumeInfo;
+import android.provider.DocumentsContract;
+import android.text.format.Formatter;
+import android.view.View;
+import android.widget.FrameLayout;
+
+import com.android.settings.TestConfig;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
+import com.android.settingslib.applications.StorageStatsSource;
+
+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;
+
+
+@RunWith(SettingsRobolectricTestRunner.class)
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION_O)
+public class MusicViewHolderControllerTest {
+    @Mock(answer = Answers.RETURNS_DEEP_STUBS)
+    private Fragment mFragment;
+    @Mock
+    private StorageStatsSource mSource;
+
+    private Context mContext;
+    private MusicViewHolderController mController;
+    private VolumeInfo mVolume;
+    private View mView;
+    private ApplicationViewHolder mHolder;
+
+    @Before
+    public void setUp() throws Exception {
+        MockitoAnnotations.initMocks(this);
+        mContext = RuntimeEnvironment.application;
+        mVolume = new VolumeInfo("id", 0, null, "id");
+        mController = new MusicViewHolderController(mContext, mSource, mVolume.fsUuid,
+                new UserHandle(0));
+
+        mView = ApplicationViewHolder.newView(new FrameLayout(mContext));
+        mHolder = new ApplicationViewHolder(mView, false /* useStableHeight */);
+    }
+
+    @Test
+    public void storageShouldBeZeroBytesIfQueriedBeforeStorageQueryFinishes() {
+        mController.setupView(mHolder);
+
+        assertThat(mHolder.mSummary.getText().toString()).isEqualTo(
+                Formatter.formatFileSize(mContext, 0));
+    }
+
+    @Test
+    public void storageShouldRepresentStorageStatsQuery() throws Exception {
+        when(mSource.getExternalStorageStats(nullable(String.class), nullable(UserHandle.class)))
+                .thenReturn(new StorageStatsSource.ExternalStorageStats(1, 1, 0, 0, 0));
+
+        mController.queryStats();
+        mController.setupView(mHolder);
+
+        assertThat(mHolder.mSummary.getText().toString()).isEqualTo(
+                Formatter.formatFileSize(mContext, 1));
+    }
+
+    @Test
+    public void clickingShouldIntentIntoFilesApp() {
+        mController.onClick(mFragment);
+
+        final ArgumentCaptor<Intent> argumentCaptor = ArgumentCaptor.forClass(Intent.class);
+        verify(mFragment).startActivity(argumentCaptor.capture());
+        Intent intent = argumentCaptor.getValue();
+
+        assertThat(intent.getAction()).isEqualTo(Intent.ACTION_VIEW);
+        assertThat(intent.getData()).isEqualTo(DocumentsContract.buildRootUri(
+                "com.android.providers.media.documents",
+                "audio_root"));
+        assertThat(intent.getType()).isEqualTo(DocumentsContract.Root.MIME_TYPE_ITEM);
+    }
+}
diff --git a/tests/robotests/src/com/android/settings/applications/manageapplications/PhotosViewHolderControllerTest.java b/tests/robotests/src/com/android/settings/applications/manageapplications/PhotosViewHolderControllerTest.java
new file mode 100644
index 0000000..fd25921
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/applications/manageapplications/PhotosViewHolderControllerTest.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.applications.manageapplications;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import static org.mockito.Matchers.nullable;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+import android.app.Fragment;
+import android.content.Context;
+import android.content.Intent;
+import android.os.UserHandle;
+import android.os.storage.VolumeInfo;
+import android.text.format.Formatter;
+import android.view.View;
+import android.widget.FrameLayout;
+
+import com.android.settings.TestConfig;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
+import com.android.settingslib.applications.StorageStatsSource;
+
+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;
+
+@RunWith(SettingsRobolectricTestRunner.class)
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION_O)
+public class PhotosViewHolderControllerTest {
+    @Mock(answer = Answers.RETURNS_DEEP_STUBS)
+    private Fragment mFragment;
+    @Mock
+    private StorageStatsSource mSource;
+
+    private Context mContext;
+    private PhotosViewHolderController mController;
+    private VolumeInfo mVolume;
+    private View mView;
+    private ApplicationViewHolder mHolder;
+
+
+    @Before
+    public void setUp() throws Exception {
+        MockitoAnnotations.initMocks(this);
+        mContext = RuntimeEnvironment.application;
+        mVolume = new VolumeInfo("id", 0, null, "id");
+        mController =
+                new PhotosViewHolderController(
+                        mContext, mSource, mVolume.fsUuid, new UserHandle(0));
+
+        mView = ApplicationViewHolder.newView(new FrameLayout(mContext));
+        mHolder = new ApplicationViewHolder(mView, false /* useStableHeight */);
+    }
+
+    @Test
+    public void storageShouldBeZeroBytesIfQueriedBeforeStorageQueryFinishes() {
+        mController.setupView(mHolder);
+
+        assertThat(mHolder.mSummary.getText().toString()).isEqualTo(
+                Formatter.formatFileSize(mContext, 0));
+    }
+
+    @Test
+    public void storageShouldRepresentStorageStatsQuery() throws Exception {
+        when(mSource.getExternalStorageStats(nullable(String.class), nullable(UserHandle.class)))
+                .thenReturn(new StorageStatsSource.ExternalStorageStats(1, 0, 1, 10, 0));
+
+        mController.queryStats();
+        mController.setupView(mHolder);
+
+        assertThat(mHolder.mSummary.getText().toString()).isEqualTo(
+                Formatter.formatFileSize(mContext, 11));
+    }
+
+    @Test
+    public void clickingShouldIntentIntoFilesApp() {
+        mController.onClick(mFragment);
+
+        final ArgumentCaptor<Intent> argumentCaptor = ArgumentCaptor.forClass(Intent.class);
+        verify(mFragment).startActivity(argumentCaptor.capture());
+        Intent intent = argumentCaptor.getValue();
+
+        assertThat(intent.getType()).isEqualTo("image/*");
+        assertThat(intent.getAction()).isEqualTo(android.content.Intent.ACTION_VIEW);
+        assertThat(intent.getBooleanExtra(Intent.EXTRA_FROM_STORAGE, false)).isTrue();
+    }
+}
diff --git a/tests/robotests/src/com/android/settings/backup/BackupSettingsActivityPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/backup/BackupSettingsActivityPreferenceControllerTest.java
index 5fc3ebc..39cc9a2 100644
--- a/tests/robotests/src/com/android/settings/backup/BackupSettingsActivityPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/backup/BackupSettingsActivityPreferenceControllerTest.java
@@ -45,7 +45,7 @@
 import org.robolectric.annotation.Implements;
 
 @RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION,
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION_O,
         shadows = {BackupSettingsActivityPreferenceControllerTest.ShadowBackupManager.class})
 public class BackupSettingsActivityPreferenceControllerTest {
     private static final String KEY_BACKUP_SETTINGS = "backup_settings";
diff --git a/tests/robotests/src/com/android/settings/backup/BackupSettingsActivityTest.java b/tests/robotests/src/com/android/settings/backup/BackupSettingsActivityTest.java
index 69c8a03..cf3cb53 100644
--- a/tests/robotests/src/com/android/settings/backup/BackupSettingsActivityTest.java
+++ b/tests/robotests/src/com/android/settings/backup/BackupSettingsActivityTest.java
@@ -16,6 +16,8 @@
 
 package com.android.settings.backup;
 
+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.isA;
@@ -32,9 +34,9 @@
 import android.content.pm.PackageManager;
 import android.os.UserHandle;
 
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
 import com.android.settings.search.SearchIndexableRaw;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 
 import org.junit.After;
 import org.junit.Before;
@@ -44,27 +46,26 @@
 import org.mockito.MockitoAnnotations;
 import org.robolectric.Robolectric;
 import org.robolectric.RuntimeEnvironment;
+import org.robolectric.Shadows;
+import org.robolectric.android.controller.ActivityController;
 import org.robolectric.annotation.Config;
 import org.robolectric.annotation.Implementation;
 import org.robolectric.annotation.Implements;
 import org.robolectric.annotation.Resetter;
-import org.robolectric.res.builder.RobolectricPackageManager;
-import org.robolectric.util.ActivityController;
-
-import static com.google.common.truth.Truth.assertThat;
+import org.robolectric.shadows.ShadowPackageManager;
 
 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_O,
         shadows = {BackupSettingsActivityTest.ShadowBackupSettingsHelper.class,
                 BackupSettingsActivityTest.ShadowUserHandle.class})
 public class BackupSettingsActivityTest {
     private ActivityController<BackupSettingsActivity> mActivityController;
     private BackupSettingsActivity mActivity;
     private Application mApplication;
-    private RobolectricPackageManager mPackageManager;
+    private ShadowPackageManager mPackageManager;
     private static boolean mIsBackupProvidedByOEM;
 
     @Mock
@@ -84,7 +85,7 @@
         mApplication = RuntimeEnvironment.application;
         mActivityController = Robolectric.buildActivity(BackupSettingsActivity.class);
         mActivity = mActivityController.get();
-        mPackageManager = (RobolectricPackageManager) mApplication.getPackageManager();
+        mPackageManager = Shadows.shadowOf(mApplication.getPackageManager());
         doReturn(mComponent).when(mIntent).getComponent();
     }
 
diff --git a/tests/robotests/src/com/android/settings/backup/BackupSettingsHelperTest.java b/tests/robotests/src/com/android/settings/backup/BackupSettingsHelperTest.java
index 9de0c6a..eb33cd6 100644
--- a/tests/robotests/src/com/android/settings/backup/BackupSettingsHelperTest.java
+++ b/tests/robotests/src/com/android/settings/backup/BackupSettingsHelperTest.java
@@ -50,7 +50,7 @@
 import com.android.settingslib.drawer.SettingsDrawerActivity;
 
 @RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION,
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION_O,
         shadows = {BackupSettingsHelperTest.ShadowBackupManagerStub.class})
 public class BackupSettingsHelperTest {
 
diff --git a/tests/robotests/src/com/android/settings/backup/BackupSettingsPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/backup/BackupSettingsPreferenceControllerTest.java
index 3ad49e7..83d9709 100644
--- a/tests/robotests/src/com/android/settings/backup/BackupSettingsPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/backup/BackupSettingsPreferenceControllerTest.java
@@ -41,7 +41,7 @@
 import android.support.v7.preference.PreferenceScreen;
 
 @RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION,
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION_O,
         shadows = {BackupSettingsPreferenceControllerTest.ShadowBackupSettingsHelper.class})
 public class BackupSettingsPreferenceControllerTest {
     private static final String BACKUP_SETTINGS = "backup_settings";
diff --git a/tests/robotests/src/com/android/settings/bluetooth/AlwaysDiscoverableTest.java b/tests/robotests/src/com/android/settings/bluetooth/AlwaysDiscoverableTest.java
index fd46b4b..3cc90bd 100644
--- a/tests/robotests/src/com/android/settings/bluetooth/AlwaysDiscoverableTest.java
+++ b/tests/robotests/src/com/android/settings/bluetooth/AlwaysDiscoverableTest.java
@@ -41,7 +41,7 @@
 import org.robolectric.annotation.Config;
 
 @RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION_O)
 public class AlwaysDiscoverableTest {
     @Mock
     private LocalBluetoothAdapter mLocalAdapter;
diff --git a/tests/robotests/src/com/android/settings/bluetooth/BluetoothDetailsButtonsControllerTest.java b/tests/robotests/src/com/android/settings/bluetooth/BluetoothDetailsButtonsControllerTest.java
index 7af2b85..e7ce7e0 100644
--- a/tests/robotests/src/com/android/settings/bluetooth/BluetoothDetailsButtonsControllerTest.java
+++ b/tests/robotests/src/com/android/settings/bluetooth/BluetoothDetailsButtonsControllerTest.java
@@ -17,7 +17,7 @@
 package com.android.settings.bluetooth;
 
 import static com.google.common.truth.Truth.assertThat;
-
+import static org.mockito.Matchers.any;
 import static org.mockito.Matchers.anyString;
 import static org.mockito.Matchers.eq;
 import static org.mockito.Mockito.mock;
@@ -26,40 +26,55 @@
 
 import android.app.FragmentManager;
 import android.app.FragmentTransaction;
+import android.view.View;
 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 com.android.settings.widget.ActionButtonPreference;
+import com.android.settings.widget.ActionButtonPreferenceTest;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.ArgumentCaptor;
+import org.robolectric.RuntimeEnvironment;
 import org.robolectric.annotation.Config;
 
 @RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION,
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION_O,
         shadows = SettingsShadowBluetoothDevice.class)
 public class BluetoothDetailsButtonsControllerTest extends BluetoothDetailsControllerTestBase {
     private BluetoothDetailsButtonsController mController;
-    private LayoutPreference mLayoutPreference;
-    private Button mLeftButton;
-    private Button mRightButton;
+    private ActionButtonPreference mButtonsPref;
+    private Button mConnectButton;
+    private Button mForgetButton;
 
     @Override
     public void setUp() {
         super.setUp();
+        final View buttons = View.inflate(
+                RuntimeEnvironment.application, R.layout.two_action_buttons, null /* parent */);
+        mConnectButton = buttons.findViewById(R.id.button2_positive);
+        mForgetButton = buttons.findViewById(R.id.button1_positive);
         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);
+        mButtonsPref = ActionButtonPreferenceTest.createMock();
+        when(mButtonsPref.getKey()).thenReturn(mController.getPreferenceKey());
+        when(mButtonsPref.setButton2OnClickListener(any(View.OnClickListener.class)))
+                .thenAnswer(invocation -> {
+                    final Object[] args = invocation.getArguments();
+                    mConnectButton.setOnClickListener((View.OnClickListener) args[0]);
+                    return mButtonsPref;
+                });
+        when(mButtonsPref.setButton1OnClickListener(any(View.OnClickListener.class)))
+                .thenAnswer(invocation -> {
+                    final Object[] args = invocation.getArguments();
+                    mForgetButton.setOnClickListener((View.OnClickListener) args[0]);
+                    return mButtonsPref;
+                });
+        mScreen.addPreference(mButtonsPref);
         setupDevice(mDeviceConfig);
         when(mCachedDevice.isBusy()).thenReturn(false);
     }
@@ -67,15 +82,16 @@
     @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));
+
+        verify(mButtonsPref).setButton2Text(R.string.bluetooth_device_context_disconnect);
+        verify(mButtonsPref).setButton1Text(R.string.forget);
     }
 
     @Test
     public void clickOnDisconnect() {
         showScreen(mController);
-        mLeftButton.callOnClick();
+        mConnectButton.callOnClick();
+
         verify(mCachedDevice).disconnect();
     }
 
@@ -84,10 +100,9 @@
         when(mCachedDevice.isConnected()).thenReturn(false);
         showScreen(mController);
 
-        assertThat(mLeftButton.getText()).isEqualTo(
-                mContext.getString(R.string.bluetooth_device_context_connect));
+        verify(mButtonsPref).setButton2Text(R.string.bluetooth_device_context_connect);
 
-        mLeftButton.callOnClick();
+        mConnectButton.callOnClick();
         verify(mCachedDevice).connect(eq(true));
     }
 
@@ -95,17 +110,15 @@
     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));
+        verify(mButtonsPref).setButton2Text(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));
+        verify(mButtonsPref).setButton2Text(R.string.bluetooth_device_context_connect);
 
         // Click the button and make sure that connect (not disconnect) gets called.
-        mLeftButton.callOnClick();
+        mConnectButton.callOnClick();
         verify(mCachedDevice).connect(eq(true));
     }
 
@@ -115,17 +128,16 @@
         when(mCachedDevice.isConnected()).thenReturn(false);
         showScreen(mController);
 
-        assertThat(mLeftButton.getText()).isEqualTo(
-                mContext.getString(R.string.bluetooth_device_context_connect));
+        verify(mButtonsPref).setButton2Text(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));
+        verify(mButtonsPref).setButton2Text(R.string.bluetooth_device_context_disconnect);
 
         // Click the button and make sure that disconnnect (not connect) gets called.
-        mLeftButton.callOnClick();
+        mConnectButton.callOnClick();
         verify(mCachedDevice).disconnect();
     }
 
@@ -136,7 +148,7 @@
         when(mFragment.getFragmentManager()).thenReturn(fragmentManager);
         FragmentTransaction ft = mock(FragmentTransaction.class);
         when(fragmentManager.beginTransaction()).thenReturn(ft);
-        mRightButton.callOnClick();
+        mForgetButton.callOnClick();
 
         ArgumentCaptor<ForgetDeviceDialogFragment> dialogCaptor =
                 ArgumentCaptor.forClass(ForgetDeviceDialogFragment.class);
@@ -150,24 +162,27 @@
     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();
+
+        verify(mButtonsPref).setButton2Text(R.string.bluetooth_device_context_disconnect);
+        verify(mButtonsPref).setButton2Enabled(false);
+        verify(mButtonsPref).setButton1Text(R.string.forget);
 
         // Now pretend the device became non-busy.
         when(mCachedDevice.isBusy()).thenReturn(false);
         mController.onDeviceAttributesChanged();
-        assertThat(mLeftButton.isEnabled()).isTrue();
+
+        verify(mButtonsPref).setButton2Enabled(true);
     }
 
     @Test
     public void becomesBusy() {
         showScreen(mController);
-        assertThat(mLeftButton.isEnabled()).isTrue();
+        verify(mButtonsPref).setButton2Enabled(true);
 
+        // Now pretend the device became busy.
         when(mCachedDevice.isBusy()).thenReturn(true);
         mController.onDeviceAttributesChanged();
-        assertThat(mLeftButton.isEnabled()).isFalse();
+
+        verify(mButtonsPref).setButton2Enabled(false);
     }
 }
diff --git a/tests/robotests/src/com/android/settings/bluetooth/BluetoothDetailsControllerEventsTest.java b/tests/robotests/src/com/android/settings/bluetooth/BluetoothDetailsControllerEventsTest.java
index 240ece1..62e4986 100644
--- a/tests/robotests/src/com/android/settings/bluetooth/BluetoothDetailsControllerEventsTest.java
+++ b/tests/robotests/src/com/android/settings/bluetooth/BluetoothDetailsControllerEventsTest.java
@@ -36,7 +36,7 @@
 import org.robolectric.annotation.Config;
 
 @RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION,
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION_O,
         shadows=SettingsShadowBluetoothDevice.class)
 public class BluetoothDetailsControllerEventsTest extends BluetoothDetailsControllerTestBase {
 
diff --git a/tests/robotests/src/com/android/settings/bluetooth/BluetoothDetailsControllerTestBase.java b/tests/robotests/src/com/android/settings/bluetooth/BluetoothDetailsControllerTestBase.java
index 3b8db04..b03ecc1 100644
--- a/tests/robotests/src/com/android/settings/bluetooth/BluetoothDetailsControllerTestBase.java
+++ b/tests/robotests/src/com/android/settings/bluetooth/BluetoothDetailsControllerTestBase.java
@@ -28,16 +28,22 @@
 import android.support.v7.preference.PreferenceScreen;
 
 import com.android.settings.R;
+import com.android.settings.TestConfig;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settingslib.bluetooth.CachedBluetoothDevice;
 import com.android.settingslib.core.lifecycle.Lifecycle;
 
 import org.junit.Before;
+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_O)
 public class BluetoothDetailsControllerTestBase {
-    protected Context mContext = RuntimeEnvironment.application;
+    protected Context mContext;
     protected Lifecycle mLifecycle;
     protected DeviceConfig mDeviceConfig;
     protected BluetoothDevice mDevice;
@@ -58,6 +64,7 @@
     @Before
     public void setUp() {
         MockitoAnnotations.initMocks(this);
+        mContext = RuntimeEnvironment.application;
         mPreferenceManager = new PreferenceManager(mContext);
         mScreen = mPreferenceManager.createPreferenceScreen(mContext);
         mDeviceConfig = makeDefaultDeviceConfig();
@@ -66,7 +73,7 @@
         when(mFragment.getContext()).thenReturn(mContext);
         when(mFragment.getPreferenceManager()).thenReturn(mPreferenceManager);
         when(mFragment.getPreferenceScreen()).thenReturn(mScreen);
-        mLifecycle = spy(new Lifecycle());
+        mLifecycle = spy(new Lifecycle(() -> mLifecycle));
         mBluetoothManager = new BluetoothManager(mContext);
         mBluetoothAdapter = mBluetoothManager.getAdapter();
     }
diff --git a/tests/robotests/src/com/android/settings/bluetooth/BluetoothDetailsHeaderControllerTest.java b/tests/robotests/src/com/android/settings/bluetooth/BluetoothDetailsHeaderControllerTest.java
index 98a3580..2dc411c 100644
--- a/tests/robotests/src/com/android/settings/bluetooth/BluetoothDetailsHeaderControllerTest.java
+++ b/tests/robotests/src/com/android/settings/bluetooth/BluetoothDetailsHeaderControllerTest.java
@@ -45,7 +45,7 @@
 import org.robolectric.annotation.Config;
 
 @RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION,
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION_O,
         shadows={SettingsShadowBluetoothDevice.class, ShadowEntityHeaderController.class,
                 SettingsShadowResources.class})
 public class BluetoothDetailsHeaderControllerTest extends BluetoothDetailsControllerTestBase {
diff --git a/tests/robotests/src/com/android/settings/bluetooth/BluetoothDetailsMacAddressControllerTest.java b/tests/robotests/src/com/android/settings/bluetooth/BluetoothDetailsMacAddressControllerTest.java
index 24b28a1..4edcc74 100644
--- a/tests/robotests/src/com/android/settings/bluetooth/BluetoothDetailsMacAddressControllerTest.java
+++ b/tests/robotests/src/com/android/settings/bluetooth/BluetoothDetailsMacAddressControllerTest.java
@@ -17,8 +17,8 @@
 
 import static com.google.common.truth.Truth.assertThat;
 
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.testutils.shadow.SettingsShadowBluetoothDevice;
 import com.android.settingslib.widget.FooterPreference;
 
@@ -27,9 +27,10 @@
 import org.robolectric.annotation.Config;
 
 @RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION,
-        shadows=SettingsShadowBluetoothDevice.class)
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION_O,
+        shadows = SettingsShadowBluetoothDevice.class)
 public class BluetoothDetailsMacAddressControllerTest extends BluetoothDetailsControllerTestBase {
+
     private BluetoothDetailsMacAddressController mController;
 
     @Override
diff --git a/tests/robotests/src/com/android/settings/bluetooth/BluetoothDetailsProfilesControllerTest.java b/tests/robotests/src/com/android/settings/bluetooth/BluetoothDetailsProfilesControllerTest.java
index 445e4e3..eca5df9 100644
--- a/tests/robotests/src/com/android/settings/bluetooth/BluetoothDetailsProfilesControllerTest.java
+++ b/tests/robotests/src/com/android/settings/bluetooth/BluetoothDetailsProfilesControllerTest.java
@@ -54,7 +54,7 @@
 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_O,
         shadows=SettingsShadowBluetoothDevice.class)
 public class BluetoothDetailsProfilesControllerTest extends BluetoothDetailsControllerTestBase {
     private BluetoothDetailsProfilesController mController;
diff --git a/tests/robotests/src/com/android/settings/bluetooth/BluetoothDeviceDetailsFragmentTest.java b/tests/robotests/src/com/android/settings/bluetooth/BluetoothDeviceDetailsFragmentTest.java
index 544b590..cd07a90 100644
--- a/tests/robotests/src/com/android/settings/bluetooth/BluetoothDeviceDetailsFragmentTest.java
+++ b/tests/robotests/src/com/android/settings/bluetooth/BluetoothDeviceDetailsFragmentTest.java
@@ -53,7 +53,7 @@
 import org.robolectric.fakes.RoboMenu;
 
 @RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION_O)
 public class BluetoothDeviceDetailsFragmentTest {
     private BluetoothDeviceDetailsFragment mFragment;
     private Context mContext;
diff --git a/tests/robotests/src/com/android/settings/bluetooth/BluetoothDeviceNamePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/bluetooth/BluetoothDeviceNamePreferenceControllerTest.java
index 2e094e2..93de52d 100644
--- a/tests/robotests/src/com/android/settings/bluetooth/BluetoothDeviceNamePreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/bluetooth/BluetoothDeviceNamePreferenceControllerTest.java
@@ -40,7 +40,7 @@
 import org.robolectric.annotation.Config;
 
 @RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION_O)
 public class BluetoothDeviceNamePreferenceControllerTest {
     private static final String DEVICE_NAME = "Nightshade";
     private static final int ORDER = 1;
diff --git a/tests/robotests/src/com/android/settings/bluetooth/BluetoothDevicePreferenceTest.java b/tests/robotests/src/com/android/settings/bluetooth/BluetoothDevicePreferenceTest.java
index ac0720a..3dd97bb 100644
--- a/tests/robotests/src/com/android/settings/bluetooth/BluetoothDevicePreferenceTest.java
+++ b/tests/robotests/src/com/android/settings/bluetooth/BluetoothDevicePreferenceTest.java
@@ -41,6 +41,7 @@
 import static com.google.common.truth.Truth.assertThat;
 
 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;
@@ -48,9 +49,10 @@
 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_O,
         shadows = SettingsShadowResources.class)
 public class BluetoothDevicePreferenceTest {
+    private static final boolean SHOW_DEVICES_WITHOUT_NAMES = true;
 
     private Context mContext;
     @Mock
@@ -70,7 +72,7 @@
         mFakeFeatureFactory = (FakeFeatureFactory) FakeFeatureFactory.getFactory(mContext);
         mMetricsFeatureProvider = mFakeFeatureFactory.getMetricsFeatureProvider();
         mPreference = new BluetoothDevicePreference(mContext, mCachedBluetoothDevice,
-                mDeviceListPreferenceFragment);
+                SHOW_DEVICES_WITHOUT_NAMES);
     }
 
     @Test
@@ -177,47 +179,22 @@
     }
 
     @Test
-    public void testVisible_notVisibleThenVisible() {
-        when(mDeviceListPreferenceFragment.shouldShowDevicesWithoutNames()).thenReturn(false);
-        final boolean[] humanReadableName = {false};
-        doAnswer(invocation -> humanReadableName[0]).when(mCachedBluetoothDevice)
-                .hasHumanReadableName();
+    public void testVisible_showDeviceWithoutNames_visible() {
+        doReturn(false).when(mCachedBluetoothDevice).hasHumanReadableName();
         BluetoothDevicePreference preference =
                 new BluetoothDevicePreference(mContext, mCachedBluetoothDevice,
-                        mDeviceListPreferenceFragment);
-        assertThat(preference.isVisible()).isFalse();
-        humanReadableName[0] = true;
-        preference.onDeviceAttributesChanged();
+                        SHOW_DEVICES_WITHOUT_NAMES);
+
         assertThat(preference.isVisible()).isTrue();
     }
 
     @Test
-    public void testVisible_visibleThenNotVisible() {
-        when(mDeviceListPreferenceFragment.shouldShowDevicesWithoutNames()).thenReturn(false);
-        final boolean[] humanReadableName = {true};
-        doAnswer(invocation -> humanReadableName[0]).when(mCachedBluetoothDevice)
-                .hasHumanReadableName();
+    public void testVisible_hideDeviceWithoutNames_invisible() {
+        doReturn(false).when(mCachedBluetoothDevice).hasHumanReadableName();
         BluetoothDevicePreference preference =
                 new BluetoothDevicePreference(mContext, mCachedBluetoothDevice,
-                        mDeviceListPreferenceFragment);
-        assertThat(preference.isVisible()).isTrue();
-        humanReadableName[0] = false;
-        preference.onDeviceAttributesChanged();
-        assertThat(preference.isVisible()).isFalse();
-    }
+                        false);
 
-    @Test
-    public void testVisible_alwaysVisibleWhenEnabled() {
-        when(mDeviceListPreferenceFragment.shouldShowDevicesWithoutNames()).thenReturn(true);
-        final boolean[] humanReadableName = {true};
-        doAnswer(invocation -> humanReadableName[0]).when(mCachedBluetoothDevice)
-                .hasHumanReadableName();
-        BluetoothDevicePreference preference =
-                new BluetoothDevicePreference(mContext, mCachedBluetoothDevice,
-                        mDeviceListPreferenceFragment);
-        assertThat(preference.isVisible()).isTrue();
-        humanReadableName[0] = false;
-        preference.onDeviceAttributesChanged();
-        assertThat(preference.isVisible()).isTrue();
+        assertThat(preference.isVisible()).isFalse();
     }
 }
diff --git a/tests/robotests/src/com/android/settings/bluetooth/BluetoothDeviceRenamePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/bluetooth/BluetoothDeviceRenamePreferenceControllerTest.java
index cde95cd..186e274 100644
--- a/tests/robotests/src/com/android/settings/bluetooth/BluetoothDeviceRenamePreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/bluetooth/BluetoothDeviceRenamePreferenceControllerTest.java
@@ -43,7 +43,7 @@
 import org.robolectric.annotation.Config;
 
 @RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION_O)
 public class BluetoothDeviceRenamePreferenceControllerTest {
 
     private static final String DEVICE_NAME = "Nightshade";
diff --git a/tests/robotests/src/com/android/settings/bluetooth/BluetoothDeviceUpdaterTest.java b/tests/robotests/src/com/android/settings/bluetooth/BluetoothDeviceUpdaterTest.java
new file mode 100644
index 0000000..d5abd93
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/bluetooth/BluetoothDeviceUpdaterTest.java
@@ -0,0 +1,127 @@
+/*
+ * Copyright (C) 2017 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF 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.never;
+import static org.mockito.Mockito.verify;
+
+import android.bluetooth.BluetoothDevice;
+import android.content.Context;
+import android.support.v7.preference.Preference;
+
+import com.android.settings.R;
+import com.android.settings.SettingsActivity;
+import com.android.settings.TestConfig;
+import com.android.settings.connecteddevice.DevicePreferenceCallback;
+import com.android.settings.dashboard.DashboardFragment;
+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.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_O)
+public class BluetoothDeviceUpdaterTest {
+    @Mock
+    private DashboardFragment mDashboardFragment;
+    @Mock
+    private DevicePreferenceCallback mDevicePreferenceCallback;
+    @Mock
+    private CachedBluetoothDevice mCachedBluetoothDevice;
+    @Mock
+    private BluetoothDevice mBluetoothDevice;
+    @Mock
+    private SettingsActivity mSettingsActivity;
+
+    private Context mContext;
+    private BluetoothDeviceUpdater mBluetoothDeviceUpdater;
+    private BluetoothDevicePreference mPreference;
+
+    @Before
+    public void setUp() {
+        MockitoAnnotations.initMocks(this);
+
+        mContext = RuntimeEnvironment.application;
+        doReturn(mContext).when(mDashboardFragment).getContext();
+        doReturn(mBluetoothDevice).when(mCachedBluetoothDevice).getDevice();
+
+        mPreference = new BluetoothDevicePreference(mContext, mCachedBluetoothDevice, false);
+        mBluetoothDeviceUpdater = new BluetoothDeviceUpdater(mDashboardFragment,
+                mDevicePreferenceCallback, null) {
+            @Override
+            public boolean isFilterMatched(CachedBluetoothDevice cachedBluetoothDevice) {
+                return true;
+            }
+        };
+        mBluetoothDeviceUpdater.setPrefContext(mContext);
+    }
+
+    @Test
+    public void testAddPreference_deviceExist_doNothing() {
+        mBluetoothDeviceUpdater.mPreferenceMap.put(mBluetoothDevice, mPreference);
+
+        mBluetoothDeviceUpdater.addPreference(mCachedBluetoothDevice);
+
+        verify(mDevicePreferenceCallback, never()).onDeviceAdded(any(Preference.class));
+    }
+
+    @Test
+    public void testAddPreference_deviceNotExist_addPreference() {
+        mBluetoothDeviceUpdater.addPreference(mCachedBluetoothDevice);
+
+        verify(mDevicePreferenceCallback).onDeviceAdded(any(Preference.class));
+        assertThat(mBluetoothDeviceUpdater.mPreferenceMap.containsKey(mBluetoothDevice)).isTrue();
+    }
+
+    @Test
+    public void testRemovePreference_deviceExist_removePreference() {
+        mBluetoothDeviceUpdater.mPreferenceMap.put(mBluetoothDevice, mPreference);
+
+        mBluetoothDeviceUpdater.removePreference(mCachedBluetoothDevice);
+
+        verify(mDevicePreferenceCallback).onDeviceRemoved(mPreference);
+        assertThat(mBluetoothDeviceUpdater.mPreferenceMap.containsKey(mBluetoothDevice)).isFalse();
+    }
+
+    @Test
+    public void testRemovePreference_deviceNotExist_doNothing() {
+        mBluetoothDeviceUpdater.removePreference(mCachedBluetoothDevice);
+
+        verify(mDevicePreferenceCallback, never()).onDeviceRemoved(any(Preference.class));
+    }
+
+    @Test
+    public void testDeviceProfilesListener_click_startBluetoothDeviceDetailPage() {
+        doReturn(mSettingsActivity).when(mDashboardFragment).getActivity();
+
+        mBluetoothDeviceUpdater.mDeviceProfilesListener.onGearClick(mPreference);
+
+        verify(mSettingsActivity).startPreferencePanel(eq(mDashboardFragment),
+                eq(BluetoothDeviceDetailsFragment.class.getName()), any(),
+                eq(R.string.device_details_title), eq(null), eq(null), eq(0));
+    }
+}
diff --git a/tests/robotests/src/com/android/settings/bluetooth/BluetoothEnablerTest.java b/tests/robotests/src/com/android/settings/bluetooth/BluetoothEnablerTest.java
index 8fa8f06..102f0a7 100644
--- a/tests/robotests/src/com/android/settings/bluetooth/BluetoothEnablerTest.java
+++ b/tests/robotests/src/com/android/settings/bluetooth/BluetoothEnablerTest.java
@@ -38,6 +38,7 @@
 import com.android.settingslib.bluetooth.LocalBluetoothManager;
 
 import org.junit.Before;
+import org.junit.BeforeClass;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.ArgumentCaptor;
@@ -57,13 +58,17 @@
 import static org.mockito.Mockito.when;
 
 @RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION, shadows = {
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION_O, shadows = {
         SettingsShadowResources.class, SettingsShadowResources.SettingsShadowTheme.class
 })
 public class BluetoothEnablerTest {
 
-    private static final EnforcedAdmin FAKE_ENFORCED_ADMIN =
-            new EnforcedAdmin(new ComponentName("test.package", "test.Class"), 10);
+    private static EnforcedAdmin sFakeEnforcedAdmin;
+
+    @BeforeClass
+    public static void beforeClass() {
+        sFakeEnforcedAdmin = new EnforcedAdmin(new ComponentName("test.package", "test.Class"), 10);
+    }
 
     @Mock
     private MetricsFeatureProvider mMetricsFeatureProvider;
@@ -130,7 +135,7 @@
     public void maybeEnforceRestrictions_disallowBluetoothRestrictionSet() {
         // GIVEN Bluetooth has been disallowed...
         when(mRestrictionUtils.checkIfRestrictionEnforced(
-                mContext, UserManager.DISALLOW_BLUETOOTH)).thenReturn(FAKE_ENFORCED_ADMIN);
+                mContext, UserManager.DISALLOW_BLUETOOTH)).thenReturn(sFakeEnforcedAdmin);
         when(mRestrictionUtils.checkIfRestrictionEnforced(
                 mContext, UserManager.DISALLOW_CONFIG_BLUETOOTH)).thenReturn(null);
 
@@ -139,7 +144,7 @@
         assertThat(mBluetoothEnabler.maybeEnforceRestrictions()).isTrue();
 
         // THEN the expected EnfoceAdmin is set.
-        verify(mMasterSwitchController).setDisabledByAdmin(FAKE_ENFORCED_ADMIN);
+        verify(mMasterSwitchController).setDisabledByAdmin(sFakeEnforcedAdmin);
 
         // THEN the switch is unchecked.
         verify(mMasterSwitchController).setChecked(false);
@@ -151,14 +156,14 @@
         when(mRestrictionUtils.checkIfRestrictionEnforced(
                 mContext, UserManager.DISALLOW_BLUETOOTH)).thenReturn(null);
         when(mRestrictionUtils.checkIfRestrictionEnforced(
-                mContext, UserManager.DISALLOW_CONFIG_BLUETOOTH)).thenReturn(FAKE_ENFORCED_ADMIN);
+                mContext, UserManager.DISALLOW_CONFIG_BLUETOOTH)).thenReturn(sFakeEnforcedAdmin);
 
         // WHEN the maybeEnforceRestrictions is called...
         // THEN true is returned to indicate there was a restriction to enforce.
         assertThat(mBluetoothEnabler.maybeEnforceRestrictions()).isTrue();
 
         // THEN the expected EnfoceAdmin is set.
-        verify(mMasterSwitchController).setDisabledByAdmin(FAKE_ENFORCED_ADMIN);
+        verify(mMasterSwitchController).setDisabledByAdmin(sFakeEnforcedAdmin);
 
         // THEN the switch is unchecked.
         verify(mMasterSwitchController).setChecked(false);
@@ -168,7 +173,7 @@
     public void maybeEnforceRestrictions_disallowBluetoothNotOverriden() {
         // GIVEN Bluetooth has been disallowed...
         when(mRestrictionUtils.checkIfRestrictionEnforced(
-                mContext, UserManager.DISALLOW_BLUETOOTH)).thenReturn(FAKE_ENFORCED_ADMIN);
+                mContext, UserManager.DISALLOW_BLUETOOTH)).thenReturn(sFakeEnforcedAdmin);
         when(mRestrictionUtils.checkIfRestrictionEnforced(
                 mContext, UserManager.DISALLOW_CONFIG_BLUETOOTH)).thenReturn(null);
 
diff --git a/tests/robotests/src/com/android/settings/bluetooth/BluetoothFilesPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/bluetooth/BluetoothFilesPreferenceControllerTest.java
index 7713aaf..ed63fc4 100644
--- a/tests/robotests/src/com/android/settings/bluetooth/BluetoothFilesPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/bluetooth/BluetoothFilesPreferenceControllerTest.java
@@ -22,7 +22,6 @@
 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;
@@ -35,10 +34,8 @@
 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)
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION_O)
 public class BluetoothFilesPreferenceControllerTest {
     private Context mContext;
     private BluetoothFilesPreferenceController mController;
diff --git a/tests/robotests/src/com/android/settings/bluetooth/BluetoothMasterSwitchPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/bluetooth/BluetoothMasterSwitchPreferenceControllerTest.java
index 9634661..534cace 100644
--- a/tests/robotests/src/com/android/settings/bluetooth/BluetoothMasterSwitchPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/bluetooth/BluetoothMasterSwitchPreferenceControllerTest.java
@@ -21,7 +21,6 @@
 import android.support.v7.preference.Preference.OnPreferenceChangeListener;
 import android.support.v7.preference.PreferenceScreen;
 
-import com.android.settings.R;
 import com.android.settings.SettingsActivity;
 import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
@@ -48,7 +47,7 @@
 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_O)
 public class BluetoothMasterSwitchPreferenceControllerTest {
 
     @Mock(answer = Answers.RETURNS_DEEP_STUBS)
diff --git a/tests/robotests/src/com/android/settings/bluetooth/BluetoothPairingDetailTest.java b/tests/robotests/src/com/android/settings/bluetooth/BluetoothPairingDetailTest.java
index d1d4935..f434186 100644
--- a/tests/robotests/src/com/android/settings/bluetooth/BluetoothPairingDetailTest.java
+++ b/tests/robotests/src/com/android/settings/bluetooth/BluetoothPairingDetailTest.java
@@ -31,7 +31,6 @@
 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;
@@ -52,12 +51,10 @@
 import org.robolectric.annotation.Config;
 
 @RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION_O)
 public class BluetoothPairingDetailTest {
 
     @Mock
-    private UserManager mUserManager;
-    @Mock
     private Resources mResource;
     @Mock
     private LocalBluetoothAdapter mLocalAdapter;
@@ -134,6 +131,25 @@
     }
 
     @Test
+    public void testUpdateBluetooth_bluetoothOff_turnOnBluetooth() {
+        doReturn(false).when(mLocalAdapter).isEnabled();
+
+        mFragment.updateBluetooth();
+
+        verify(mLocalAdapter).enable();
+    }
+
+    @Test
+    public void testUpdateBluetooth_bluetoothOn_updateState() {
+        doReturn(true).when(mLocalAdapter).isEnabled();
+        doNothing().when(mFragment).updateContent(anyInt());
+
+        mFragment.updateBluetooth();
+
+        verify(mFragment).updateContent(anyInt());
+    }
+
+    @Test
     public void testOnScanningStateChanged_restartScanAfterInitialScanning() {
         mFragment.mAvailableDevicesCategory = mAvailableDevicesCategory;
         mFragment.mFooterPreference = mFooterPreference;
@@ -181,6 +197,4 @@
         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 80b4810..e598ec1 100644
--- a/tests/robotests/src/com/android/settings/bluetooth/BluetoothPairingDialogTest.java
+++ b/tests/robotests/src/com/android/settings/bluetooth/BluetoothPairingDialogTest.java
@@ -53,7 +53,7 @@
 import org.robolectric.util.FragmentTestUtil;
 
 @RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION,
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION_O,
         shadows=ShadowEventLogWriter.class)
 public class BluetoothPairingDialogTest {
 
diff --git a/tests/robotests/src/com/android/settings/bluetooth/BluetoothPairingPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/bluetooth/BluetoothPairingPreferenceControllerTest.java
index 4459f61..192e447 100644
--- a/tests/robotests/src/com/android/settings/bluetooth/BluetoothPairingPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/bluetooth/BluetoothPairingPreferenceControllerTest.java
@@ -49,7 +49,7 @@
 import org.robolectric.annotation.Config;
 
 @RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION_O)
 public class BluetoothPairingPreferenceControllerTest {
     private static final int ORDER = 1;
     private Context mContext;
diff --git a/tests/robotests/src/com/android/settings/bluetooth/BluetoothSettingsSummaryProviderTest.java b/tests/robotests/src/com/android/settings/bluetooth/BluetoothSettingsSummaryProviderTest.java
index 0061ee5..e7a66fa 100644
--- a/tests/robotests/src/com/android/settings/bluetooth/BluetoothSettingsSummaryProviderTest.java
+++ b/tests/robotests/src/com/android/settings/bluetooth/BluetoothSettingsSummaryProviderTest.java
@@ -35,7 +35,7 @@
 import static org.mockito.Mockito.verify;
 
 @RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION_O)
 public class BluetoothSettingsSummaryProviderTest {
 
     private Context mContext;
diff --git a/tests/robotests/src/com/android/settings/bluetooth/BluetoothSettingsTest.java b/tests/robotests/src/com/android/settings/bluetooth/BluetoothSettingsTest.java
index c772560..b177729 100644
--- a/tests/robotests/src/com/android/settings/bluetooth/BluetoothSettingsTest.java
+++ b/tests/robotests/src/com/android/settings/bluetooth/BluetoothSettingsTest.java
@@ -50,7 +50,7 @@
 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_O)
 public class BluetoothSettingsTest {
     private static final String FOOTAGE_MAC_STRING = "Bluetooth mac: xxxx";
 
diff --git a/tests/robotests/src/com/android/settings/bluetooth/BluetoothSummaryUpdaterTest.java b/tests/robotests/src/com/android/settings/bluetooth/BluetoothSummaryUpdaterTest.java
index 0c27412..cb04347 100644
--- a/tests/robotests/src/com/android/settings/bluetooth/BluetoothSummaryUpdaterTest.java
+++ b/tests/robotests/src/com/android/settings/bluetooth/BluetoothSummaryUpdaterTest.java
@@ -51,7 +51,7 @@
 import java.util.Set;
 
 @RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION_O)
 public class BluetoothSummaryUpdaterTest {
     private static final String DEVICE_NAME = "Nightshade";
     private static final String DEVICE_KEYBOARD_NAME = "Bluetooth Keyboard";
diff --git a/tests/robotests/src/com/android/settings/bluetooth/ConnectedBluetoothDeviceUpdaterTest.java b/tests/robotests/src/com/android/settings/bluetooth/ConnectedBluetoothDeviceUpdaterTest.java
new file mode 100644
index 0000000..c86664c
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/bluetooth/ConnectedBluetoothDeviceUpdaterTest.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.bluetooth;
+
+import static org.mockito.Matchers.any;
+import static org.mockito.Mockito.doNothing;
+import static org.mockito.Mockito.doReturn;
+import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.verify;
+
+import android.bluetooth.BluetoothAdapter;
+import android.bluetooth.BluetoothDevice;
+import android.content.Context;
+
+import com.android.settings.TestConfig;
+import com.android.settings.connecteddevice.DevicePreferenceCallback;
+import com.android.settings.dashboard.DashboardFragment;
+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.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_O)
+public class ConnectedBluetoothDeviceUpdaterTest {
+    @Mock
+    private DashboardFragment mDashboardFragment;
+    @Mock
+    private DevicePreferenceCallback mDevicePreferenceCallback;
+    @Mock
+    private CachedBluetoothDevice mCachedBluetoothDevice;
+    @Mock
+    private BluetoothDevice mBluetoothDevice;
+
+    private Context mContext;
+    private ConnectedBluetoothDeviceUpdater mBluetoothDeviceUpdater;
+
+    @Before
+    public void setUp() {
+        MockitoAnnotations.initMocks(this);
+
+        mContext = RuntimeEnvironment.application;
+        doReturn(mContext).when(mDashboardFragment).getContext();
+        doReturn(mBluetoothDevice).when(mCachedBluetoothDevice).getDevice();
+
+        mBluetoothDeviceUpdater = spy(new ConnectedBluetoothDeviceUpdater(mDashboardFragment,
+                mDevicePreferenceCallback, null));
+        mBluetoothDeviceUpdater.setPrefContext(mContext);
+        doNothing().when(mBluetoothDeviceUpdater).addPreference(any());
+        doNothing().when(mBluetoothDeviceUpdater).removePreference(any());
+    }
+
+    @Test
+    public void testUpdate_filterMatch_addPreference() {
+        doReturn(BluetoothDevice.BOND_BONDED).when(mBluetoothDevice).getBondState();
+        doReturn(true).when(mBluetoothDevice).isConnected();
+
+        mBluetoothDeviceUpdater.update(mCachedBluetoothDevice);
+
+        verify(mBluetoothDeviceUpdater).addPreference(mCachedBluetoothDevice);
+    }
+
+    @Test
+    public void testUpdate_filterNotMatch_removePreference() {
+        doReturn(BluetoothDevice.BOND_NONE).when(mBluetoothDevice).getBondState();
+        doReturn(false).when(mBluetoothDevice).isConnected();
+
+        mBluetoothDeviceUpdater.update(mCachedBluetoothDevice);
+
+        verify(mBluetoothDeviceUpdater).removePreference(mCachedBluetoothDevice);
+    }
+
+    @Test
+    public void testOnConnectionStateChanged_deviceConnected_addPreference() {
+        mBluetoothDeviceUpdater.onConnectionStateChanged(mCachedBluetoothDevice,
+                BluetoothAdapter.STATE_CONNECTED);
+
+        verify(mBluetoothDeviceUpdater).addPreference(mCachedBluetoothDevice);
+    }
+
+    @Test
+    public void testOnConnectionStateChanged_deviceDisconnected_removePreference() {
+        mBluetoothDeviceUpdater.onConnectionStateChanged(mCachedBluetoothDevice,
+                BluetoothAdapter.STATE_DISCONNECTED);
+
+        verify(mBluetoothDeviceUpdater).removePreference(mCachedBluetoothDevice);
+    }
+
+}
diff --git a/tests/robotests/src/com/android/settings/bluetooth/DeviceListPreferenceFragmentTest.java b/tests/robotests/src/com/android/settings/bluetooth/DeviceListPreferenceFragmentTest.java
index 49efecb..169db24 100644
--- a/tests/robotests/src/com/android/settings/bluetooth/DeviceListPreferenceFragmentTest.java
+++ b/tests/robotests/src/com/android/settings/bluetooth/DeviceListPreferenceFragmentTest.java
@@ -49,7 +49,7 @@
 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_O)
 public class DeviceListPreferenceFragmentTest {
     private static final String FOOTAGE_MAC_STRING = "Bluetooth mac: xxxx";
 
diff --git a/tests/robotests/src/com/android/settings/bluetooth/DevicePickerFragmentTest.java b/tests/robotests/src/com/android/settings/bluetooth/DevicePickerFragmentTest.java
index 3294ffd..f9b392e 100644
--- a/tests/robotests/src/com/android/settings/bluetooth/DevicePickerFragmentTest.java
+++ b/tests/robotests/src/com/android/settings/bluetooth/DevicePickerFragmentTest.java
@@ -30,7 +30,7 @@
 import org.robolectric.annotation.Config;
 
 @RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION_O)
 public class DevicePickerFragmentTest {
     @Mock
     private LocalBluetoothAdapter mLocalAdapter;
diff --git a/tests/robotests/src/com/android/settings/bluetooth/DeviceProfilesSettingsTest.java b/tests/robotests/src/com/android/settings/bluetooth/DeviceProfilesSettingsTest.java
index a6793bb..56454b8 100644
--- a/tests/robotests/src/com/android/settings/bluetooth/DeviceProfilesSettingsTest.java
+++ b/tests/robotests/src/com/android/settings/bluetooth/DeviceProfilesSettingsTest.java
@@ -56,7 +56,7 @@
 
 
 @RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION, shadows = {
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION_O, shadows = {
         ShadowEventLogWriter.class
 })
 public class DeviceProfilesSettingsTest {
diff --git a/tests/robotests/src/com/android/settings/bluetooth/ForgetDeviceDialogFragmentTest.java b/tests/robotests/src/com/android/settings/bluetooth/ForgetDeviceDialogFragmentTest.java
index 21bc868..71e9933 100644
--- a/tests/robotests/src/com/android/settings/bluetooth/ForgetDeviceDialogFragmentTest.java
+++ b/tests/robotests/src/com/android/settings/bluetooth/ForgetDeviceDialogFragmentTest.java
@@ -33,7 +33,6 @@
 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;
@@ -47,7 +46,7 @@
 import org.robolectric.shadows.ShadowDialog;
 
 @RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION_O)
 public class ForgetDeviceDialogFragmentTest {
 
     @Mock(answer = Answers.RETURNS_DEEP_STUBS)
diff --git a/tests/robotests/src/com/android/settings/bluetooth/RemoteDeviceNameDialogFragmentTest.java b/tests/robotests/src/com/android/settings/bluetooth/RemoteDeviceNameDialogFragmentTest.java
index a8ef4e6..65fe46c 100644
--- a/tests/robotests/src/com/android/settings/bluetooth/RemoteDeviceNameDialogFragmentTest.java
+++ b/tests/robotests/src/com/android/settings/bluetooth/RemoteDeviceNameDialogFragmentTest.java
@@ -50,7 +50,7 @@
 import org.robolectric.util.FragmentTestUtil;
 
 @RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION_O)
 public class RemoteDeviceNameDialogFragmentTest {
 
     @Mock(answer = Answers.RETURNS_DEEP_STUBS)
diff --git a/tests/robotests/src/com/android/settings/bluetooth/SavedBluetoothDeviceUpdaterTest.java b/tests/robotests/src/com/android/settings/bluetooth/SavedBluetoothDeviceUpdaterTest.java
new file mode 100644
index 0000000..d0f367e
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/bluetooth/SavedBluetoothDeviceUpdaterTest.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.bluetooth;
+
+import static org.mockito.Matchers.any;
+import static org.mockito.Mockito.doNothing;
+import static org.mockito.Mockito.doReturn;
+import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.verify;
+
+import android.bluetooth.BluetoothAdapter;
+import android.bluetooth.BluetoothDevice;
+import android.content.Context;
+
+import com.android.settings.TestConfig;
+import com.android.settings.connecteddevice.DevicePreferenceCallback;
+import com.android.settings.dashboard.DashboardFragment;
+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.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_O)
+public class SavedBluetoothDeviceUpdaterTest {
+    @Mock
+    private DashboardFragment mDashboardFragment;
+    @Mock
+    private DevicePreferenceCallback mDevicePreferenceCallback;
+    @Mock
+    private CachedBluetoothDevice mCachedBluetoothDevice;
+    @Mock
+    private BluetoothDevice mBluetoothDevice;
+
+    private Context mContext;
+    private BluetoothDeviceUpdater mBluetoothDeviceUpdater;
+
+    @Before
+    public void setUp() {
+        MockitoAnnotations.initMocks(this);
+
+        mContext = RuntimeEnvironment.application;
+        doReturn(mContext).when(mDashboardFragment).getContext();
+        doReturn(mBluetoothDevice).when(mCachedBluetoothDevice).getDevice();
+
+        mBluetoothDeviceUpdater = spy(new SavedBluetoothDeviceUpdater(mDashboardFragment,
+                mDevicePreferenceCallback, null));
+        mBluetoothDeviceUpdater.setPrefContext(mContext);
+        doNothing().when(mBluetoothDeviceUpdater).addPreference(any());
+        doNothing().when(mBluetoothDeviceUpdater).removePreference(any());
+    }
+
+    @Test
+    public void testUpdate_filterMatch_addPreference() {
+        doReturn(BluetoothDevice.BOND_BONDED).when(mBluetoothDevice).getBondState();
+        doReturn(false).when(mBluetoothDevice).isConnected();
+
+        mBluetoothDeviceUpdater.update(mCachedBluetoothDevice);
+
+        verify(mBluetoothDeviceUpdater).addPreference(mCachedBluetoothDevice);
+    }
+
+    @Test
+    public void testUpdate_filterNotMatch_removePreference() {
+        doReturn(BluetoothDevice.BOND_NONE).when(mBluetoothDevice).getBondState();
+        doReturn(true).when(mBluetoothDevice).isConnected();
+
+        mBluetoothDeviceUpdater.update(mCachedBluetoothDevice);
+
+        verify(mBluetoothDeviceUpdater).removePreference(mCachedBluetoothDevice);
+    }
+
+    @Test
+    public void testOnConnectionStateChanged_deviceConnected_removePreference() {
+        mBluetoothDeviceUpdater.onConnectionStateChanged(mCachedBluetoothDevice,
+                BluetoothAdapter.STATE_CONNECTED);
+
+        verify(mBluetoothDeviceUpdater).removePreference(mCachedBluetoothDevice);
+    }
+
+    @Test
+    public void testOnConnectionStateChanged_deviceDisconnected_addPreference() {
+        mBluetoothDeviceUpdater.onConnectionStateChanged(mCachedBluetoothDevice,
+                BluetoothAdapter.STATE_DISCONNECTED);
+
+        verify(mBluetoothDeviceUpdater).addPreference(mCachedBluetoothDevice);
+    }
+
+}
diff --git a/tests/robotests/src/com/android/settings/bluetooth/UtilsTest.java b/tests/robotests/src/com/android/settings/bluetooth/UtilsTest.java
index 220d829..43583ed 100644
--- a/tests/robotests/src/com/android/settings/bluetooth/UtilsTest.java
+++ b/tests/robotests/src/com/android/settings/bluetooth/UtilsTest.java
@@ -15,21 +15,15 @@
  */
 package com.android.settings.bluetooth;
 
-import static com.google.common.truth.Truth.assertThat;
-
-import android.bluetooth.BluetoothDevice;
 import android.content.Context;
-import android.graphics.drawable.Drawable;
 
 import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
-import com.android.settings.R;
 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.bluetooth.LocalBluetoothManager;
-import com.android.settingslib.graph.BluetoothDeviceLayerDrawable;
 
 import org.junit.Before;
 import org.junit.Test;
@@ -37,7 +31,6 @@
 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.anyInt;
@@ -48,7 +41,7 @@
 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_O,
         shadows = SettingsShadowResources.class)
 public class UtilsTest {
 
@@ -76,20 +69,4 @@
         verify(mMetricsFeatureProvider).visible(eq(mContext), anyInt(),
                 eq(MetricsEvent.ACTION_SETTINGS_BLUETOOTH_CONNECT_ERROR));
     }
-
-    @Test
-    public void testGetBluetoothDrawable_noBatteryLevel_returnSimpleDrawable() {
-        final Drawable drawable = Utils.getBluetoothDrawable(RuntimeEnvironment.application,
-                R.drawable.ic_bt_laptop, BluetoothDevice.BATTERY_LEVEL_UNKNOWN, 1 /* iconScale */);
-
-        assertThat(drawable).isNotInstanceOf(BluetoothDeviceLayerDrawable.class);
-    }
-
-    @Test
-    public void testGetBluetoothDrawable_hasBatteryLevel_returnLayerDrawable() {
-        final Drawable drawable = Utils.getBluetoothDrawable(RuntimeEnvironment.application,
-                R.drawable.ic_bt_laptop, 10 /* batteryLevel */, 1 /* iconScale */);
-
-        assertThat(drawable).isInstanceOf(BluetoothDeviceLayerDrawable.class);
-    }
 }
diff --git a/tests/robotests/src/com/android/settings/connecteddevice/AdvancedConnectedDeviceDashboardFragmentTest.java b/tests/robotests/src/com/android/settings/connecteddevice/AdvancedConnectedDeviceDashboardFragmentTest.java
new file mode 100644
index 0000000..bb35911
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/connecteddevice/AdvancedConnectedDeviceDashboardFragmentTest.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.connecteddevice;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import static org.mockito.Mockito.when;
+
+import android.content.Context;
+import android.content.pm.PackageManager;
+import android.provider.SearchIndexableResource;
+
+import com.android.settings.TestConfig;
+import com.android.settings.core.PreferenceControllerMixin;
+import com.android.settings.nfc.NfcPreferenceController;
+import com.android.settings.testutils.FakeFeatureFactory;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
+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.Answers;
+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_O)
+public class AdvancedConnectedDeviceDashboardFragmentTest {
+
+    @Mock(answer = Answers.RETURNS_DEEP_STUBS)
+    Context mContext;
+
+    @Mock
+    private PackageManager mManager;
+
+    private FakeFeatureFactory mFeatureFactory;
+    private SmsMirroringFeatureProvider mFeatureProvider;
+    private AdvancedConnectedDeviceDashboardFragment mFragment;
+    private TestSmsMirroringPreferenceController mSmsMirroringPreferenceController;
+
+    private static final class TestSmsMirroringPreferenceController
+            extends SmsMirroringPreferenceController implements PreferenceControllerMixin {
+
+        private boolean mIsAvailable;
+
+        public TestSmsMirroringPreferenceController(Context context) {
+            super(context);
+        }
+
+        @Override
+        public boolean isAvailable() {
+            return mIsAvailable;
+        }
+    }
+
+    @Before
+    public void setUp() {
+        MockitoAnnotations.initMocks(this);
+        FakeFeatureFactory.setupForTest(mContext);
+        mFeatureFactory = (FakeFeatureFactory) FakeFeatureFactory.getFactory(mContext);
+        mFeatureProvider = mFeatureFactory.smsMirroringFeatureProvider;
+
+        mFragment = new AdvancedConnectedDeviceDashboardFragment();
+        when(mContext.getPackageManager()).thenReturn(mManager);
+
+        mSmsMirroringPreferenceController = new TestSmsMirroringPreferenceController(mContext);
+        when(mFeatureProvider.getController(mContext)).thenReturn(
+                mSmsMirroringPreferenceController);
+    }
+
+    @Test
+    public void testCategory_isConnectedDevice() {
+        assertThat(mFragment.getCategoryKey()).isEqualTo(CategoryKey.CATEGORY_DEVICE);
+    }
+
+    @Test
+    public void testSearchIndexProvider_shouldIndexResource() {
+        final List<SearchIndexableResource> indexRes =
+                mFragment.SEARCH_INDEX_DATA_PROVIDER.getXmlResourcesToIndex(mContext,
+                        true /* enabled */);
+
+        assertThat(indexRes).isNotNull();
+        assertThat(indexRes.get(0).xmlResId).isEqualTo(mFragment.getPreferenceScreenResId());
+    }
+
+    @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);
+
+        assertThat(keys).isNotNull();
+        assertThat(keys).contains(NfcPreferenceController.KEY_TOGGLE_NFC);
+        assertThat(keys).contains(NfcPreferenceController.KEY_ANDROID_BEAM_SETTINGS);
+    }
+
+    @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);
+
+        assertThat(keys).isNotNull();
+        assertThat(keys).doesNotContain(NfcPreferenceController.KEY_TOGGLE_NFC);
+        assertThat(keys).doesNotContain(NfcPreferenceController.KEY_ANDROID_BEAM_SETTINGS);
+    }
+
+    @Test
+    public void testSearchIndexProvider_NoSmsMirroring_KeyAdded() {
+        when(mFeatureProvider.shouldShowSmsMirroring(mContext)).thenReturn(false);
+        mSmsMirroringPreferenceController.mIsAvailable = false;
+
+        final List<String> keys = mFragment.SEARCH_INDEX_DATA_PROVIDER.getNonIndexableKeys(
+                mContext);
+
+        assertThat(keys).isNotNull();
+        assertThat(keys).contains(mSmsMirroringPreferenceController.getPreferenceKey());
+    }
+
+    @Test
+    public void testSearchIndexProvider_SmsMirroring_KeyNotAdded() {
+        when(mFeatureProvider.shouldShowSmsMirroring(mContext)).thenReturn(true);
+        mSmsMirroringPreferenceController.mIsAvailable = true;
+
+        final List<String> keys = mFragment.SEARCH_INDEX_DATA_PROVIDER.getNonIndexableKeys(
+                mContext);
+
+        assertThat(keys).isNotNull();
+        assertThat(keys).doesNotContain(mSmsMirroringPreferenceController.getPreferenceKey());
+    }
+
+    @Test
+    public void testNonIndexableKeys_existInXmlLayout() {
+        final Context context = RuntimeEnvironment.application;
+        when(mManager.hasSystemFeature(PackageManager.FEATURE_NFC)).thenReturn(false);
+        final List<String> niks = ConnectedDeviceDashboardFragment.SEARCH_INDEX_DATA_PROVIDER
+                .getNonIndexableKeys(mContext);
+        final int xmlId = (new ConnectedDeviceDashboardFragment()).getPreferenceScreenResId();
+
+        final List<String> keys = XmlTestUtils.getKeysFromPreferenceXml(context, xmlId);
+
+        assertThat(keys).containsAllIn(niks);
+    }
+}
diff --git a/tests/robotests/src/com/android/settings/connecteddevice/ConnectedDeviceDashboardFragment2Test.java b/tests/robotests/src/com/android/settings/connecteddevice/ConnectedDeviceDashboardFragment2Test.java
new file mode 100644
index 0000000..4bcb299
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/connecteddevice/ConnectedDeviceDashboardFragment2Test.java
@@ -0,0 +1,210 @@
+/*
+ * 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.connecteddevice;
+
+import android.content.Context;
+import android.content.pm.PackageManager;
+import android.nfc.NfcAdapter;
+import android.nfc.NfcManager;
+import android.provider.SearchIndexableResource;
+
+import com.android.settings.R;
+import com.android.settings.core.PreferenceControllerMixin;
+import com.android.settings.nfc.NfcPreferenceController;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
+import com.android.settings.TestConfig;
+import com.android.settings.dashboard.SummaryLoader;
+import com.android.settings.testutils.FakeFeatureFactory;
+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.Answers;
+import org.mockito.Mock;
+import org.mockito.MockitoAnnotations;
+import org.robolectric.RuntimeEnvironment;
+import org.robolectric.annotation.Config;
+
+import java.util.List;
+
+import static android.content.Context.NFC_SERVICE;
+import static com.google.common.truth.Truth.assertThat;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.verifyZeroInteractions;
+import static org.mockito.Mockito.when;
+
+@RunWith(SettingsRobolectricTestRunner.class)
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION_O)
+public class ConnectedDeviceDashboardFragment2Test {
+
+    @Mock(answer = Answers.RETURNS_DEEP_STUBS)
+    Context mContext;
+
+    @Mock
+    private PackageManager mManager;
+
+    private FakeFeatureFactory mFeatureFactory;
+    private SmsMirroringFeatureProvider mFeatureProvider;
+    private ConnectedDeviceDashboardFragmentOld mFragment;
+    private TestSmsMirroringPreferenceController mSmsMirroringPreferenceController;
+
+    private static final class TestSmsMirroringPreferenceController
+            extends SmsMirroringPreferenceController implements PreferenceControllerMixin {
+
+        private boolean mIsAvailable;
+
+        public TestSmsMirroringPreferenceController(Context context) {
+            super(context);
+        }
+
+        @Override
+        public boolean isAvailable() {
+            return mIsAvailable;
+        }
+    }
+
+    @Before
+    public void setUp() {
+        MockitoAnnotations.initMocks(this);
+        FakeFeatureFactory.setupForTest(mContext);
+        mFeatureFactory = (FakeFeatureFactory) FakeFeatureFactory.getFactory(mContext);
+        mFeatureProvider = mFeatureFactory.smsMirroringFeatureProvider;
+
+        mFragment = new ConnectedDeviceDashboardFragmentOld();
+        when(mContext.getPackageManager()).thenReturn(mManager);
+
+        mSmsMirroringPreferenceController = new TestSmsMirroringPreferenceController(mContext);
+        when(mFeatureProvider.getController(mContext)).thenReturn(
+                mSmsMirroringPreferenceController);
+    }
+
+    @Test
+    public void testCategory_isConnectedDevice() {
+        assertThat(mFragment.getCategoryKey()).isEqualTo(CategoryKey.CATEGORY_DEVICE);
+    }
+
+    @Test
+    public void testSearchIndexProvider_shouldIndexResource() {
+        final List<SearchIndexableResource> indexRes =
+                mFragment.SEARCH_INDEX_DATA_PROVIDER.getXmlResourcesToIndex(mContext,
+                        true /* enabled */);
+
+        assertThat(indexRes).isNotNull();
+        assertThat(indexRes.get(0).xmlResId).isEqualTo(mFragment.getPreferenceScreenResId());
+    }
+
+    @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);
+
+        assertThat(keys).isNotNull();
+        assertThat(keys).contains(NfcPreferenceController.KEY_TOGGLE_NFC);
+        assertThat(keys).contains(NfcPreferenceController.KEY_ANDROID_BEAM_SETTINGS);
+    }
+
+    @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);
+
+        assertThat(keys).isNotNull();
+        assertThat(keys).doesNotContain(NfcPreferenceController.KEY_TOGGLE_NFC);
+        assertThat(keys).doesNotContain(NfcPreferenceController.KEY_ANDROID_BEAM_SETTINGS);
+    }
+
+    @Test
+    public void testSearchIndexProvider_NoSmsMirroring_KeyAdded() {
+        when(mFeatureProvider.shouldShowSmsMirroring(mContext)).thenReturn(false);
+        mSmsMirroringPreferenceController.mIsAvailable = false;
+
+        final List<String> keys = mFragment.SEARCH_INDEX_DATA_PROVIDER.getNonIndexableKeys(
+                mContext);
+
+        assertThat(keys).isNotNull();
+        assertThat(keys).contains(mSmsMirroringPreferenceController.getPreferenceKey());
+    }
+
+    @Test
+    public void testSearchIndexProvider_SmsMirroring_KeyNotAdded() {
+        when(mFeatureProvider.shouldShowSmsMirroring(mContext)).thenReturn(true);
+        mSmsMirroringPreferenceController.mIsAvailable = true;
+
+        final List<String> keys = mFragment.SEARCH_INDEX_DATA_PROVIDER.getNonIndexableKeys(
+                mContext);
+
+        assertThat(keys).isNotNull();
+        assertThat(keys).doesNotContain(mSmsMirroringPreferenceController.getPreferenceKey());
+    }
+
+    @Test
+    public void testNonIndexableKeys_existInXmlLayout() {
+        final Context context = RuntimeEnvironment.application;
+        when(mManager.hasSystemFeature(PackageManager.FEATURE_NFC)).thenReturn(false);
+        final List<String> niks = ConnectedDeviceDashboardFragment.SEARCH_INDEX_DATA_PROVIDER
+                .getNonIndexableKeys(mContext);
+        final int xmlId = (new ConnectedDeviceDashboardFragment()).getPreferenceScreenResId();
+
+        final List<String> keys = XmlTestUtils.getKeysFromPreferenceXml(context, xmlId);
+
+        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);
+        when(mContext.getSystemService(NFC_SERVICE)).thenReturn(null);
+
+        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/ConnectedDeviceDashboardFragmentTest.java b/tests/robotests/src/com/android/settings/connecteddevice/ConnectedDeviceDashboardFragmentTest.java
deleted file mode 100644
index 4cb853e..0000000
--- a/tests/robotests/src/com/android/settings/connecteddevice/ConnectedDeviceDashboardFragmentTest.java
+++ /dev/null
@@ -1,210 +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.connecteddevice;
-
-import android.content.Context;
-import android.content.pm.PackageManager;
-import android.nfc.NfcAdapter;
-import android.nfc.NfcManager;
-import android.provider.SearchIndexableResource;
-
-import com.android.settings.R;
-import com.android.settings.core.PreferenceControllerMixin;
-import com.android.settings.nfc.NfcPreferenceController;
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.TestConfig;
-import com.android.settings.dashboard.SummaryLoader;
-import com.android.settings.testutils.FakeFeatureFactory;
-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.Answers;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
-import org.robolectric.RuntimeEnvironment;
-import org.robolectric.annotation.Config;
-
-import java.util.List;
-
-import static android.content.Context.NFC_SERVICE;
-import static com.google.common.truth.Truth.assertThat;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.verifyZeroInteractions;
-import static org.mockito.Mockito.when;
-
-@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
-public class ConnectedDeviceDashboardFragmentTest {
-
-    @Mock(answer = Answers.RETURNS_DEEP_STUBS)
-    Context mContext;
-
-    @Mock
-    private PackageManager mManager;
-
-    private FakeFeatureFactory mFeatureFactory;
-    private SmsMirroringFeatureProvider mFeatureProvider;
-    private ConnectedDeviceDashboardFragment mFragment;
-    private TestSmsMirroringPreferenceController mSmsMirroringPreferenceController;
-
-    private static final class TestSmsMirroringPreferenceController
-            extends SmsMirroringPreferenceController implements PreferenceControllerMixin {
-
-        private boolean mIsAvailable;
-
-        public TestSmsMirroringPreferenceController(Context context) {
-            super(context);
-        }
-
-        @Override
-        public boolean isAvailable() {
-            return mIsAvailable;
-        }
-    }
-
-    @Before
-    public void setUp() {
-        MockitoAnnotations.initMocks(this);
-        FakeFeatureFactory.setupForTest(mContext);
-        mFeatureFactory = (FakeFeatureFactory) FakeFeatureFactory.getFactory(mContext);
-        mFeatureProvider = mFeatureFactory.smsMirroringFeatureProvider;
-
-        mFragment = new ConnectedDeviceDashboardFragment();
-        when(mContext.getPackageManager()).thenReturn(mManager);
-
-        mSmsMirroringPreferenceController = new TestSmsMirroringPreferenceController(mContext);
-        when(mFeatureProvider.getController(mContext)).thenReturn(
-                mSmsMirroringPreferenceController);
-    }
-
-    @Test
-    public void testCategory_isConnectedDevice() {
-        assertThat(mFragment.getCategoryKey()).isEqualTo(CategoryKey.CATEGORY_DEVICE);
-    }
-
-    @Test
-    public void testSearchIndexProvider_shouldIndexResource() {
-        final List<SearchIndexableResource> indexRes =
-                mFragment.SEARCH_INDEX_DATA_PROVIDER.getXmlResourcesToIndex(mContext,
-                        true /* enabled */);
-
-        assertThat(indexRes).isNotNull();
-        assertThat(indexRes.get(0).xmlResId).isEqualTo(mFragment.getPreferenceScreenResId());
-    }
-
-    @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);
-
-        assertThat(keys).isNotNull();
-        assertThat(keys).contains(NfcPreferenceController.KEY_TOGGLE_NFC);
-        assertThat(keys).contains(NfcPreferenceController.KEY_ANDROID_BEAM_SETTINGS);
-    }
-
-    @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);
-
-        assertThat(keys).isNotNull();
-        assertThat(keys).doesNotContain(NfcPreferenceController.KEY_TOGGLE_NFC);
-        assertThat(keys).doesNotContain(NfcPreferenceController.KEY_ANDROID_BEAM_SETTINGS);
-    }
-
-    @Test
-    public void testSearchIndexProvider_NoSmsMirroring_KeyAdded() {
-        when(mFeatureProvider.shouldShowSmsMirroring(mContext)).thenReturn(false);
-        mSmsMirroringPreferenceController.mIsAvailable = false;
-
-        final List<String> keys = mFragment.SEARCH_INDEX_DATA_PROVIDER.getNonIndexableKeys(
-                mContext);
-
-        assertThat(keys).isNotNull();
-        assertThat(keys).contains(mSmsMirroringPreferenceController.getPreferenceKey());
-    }
-
-    @Test
-    public void testSearchIndexProvider_SmsMirroring_KeyNotAdded() {
-        when(mFeatureProvider.shouldShowSmsMirroring(mContext)).thenReturn(true);
-        mSmsMirroringPreferenceController.mIsAvailable = true;
-
-        final List<String> keys = mFragment.SEARCH_INDEX_DATA_PROVIDER.getNonIndexableKeys(
-                mContext);
-
-        assertThat(keys).isNotNull();
-        assertThat(keys).doesNotContain(mSmsMirroringPreferenceController.getPreferenceKey());
-    }
-
-    @Test
-    public void testNonIndexableKeys_existInXmlLayout() {
-        final Context context = RuntimeEnvironment.application;
-        when(mManager.hasSystemFeature(PackageManager.FEATURE_NFC)).thenReturn(false);
-        final List<String> niks = ConnectedDeviceDashboardFragment.SEARCH_INDEX_DATA_PROVIDER
-                .getNonIndexableKeys(mContext);
-        final int xmlId = (new ConnectedDeviceDashboardFragment()).getPreferenceScreenResId();
-
-        final List<String> keys = XmlTestUtils.getKeysFromPreferenceXml(context, xmlId);
-
-        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);
-        when(mContext.getSystemService(NFC_SERVICE)).thenReturn(null);
-
-        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/ConnectedDeviceGroupControllerTest.java b/tests/robotests/src/com/android/settings/connecteddevice/ConnectedDeviceGroupControllerTest.java
new file mode 100644
index 0000000..e18115a
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/connecteddevice/ConnectedDeviceGroupControllerTest.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.connecteddevice;
+
+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.never;
+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.PreferenceGroup;
+import android.support.v7.preference.PreferenceManager;
+import android.support.v7.preference.PreferenceScreen;
+
+import com.android.settings.TestConfig;
+import com.android.settings.bluetooth.ConnectedBluetoothDeviceUpdater;
+import com.android.settings.dashboard.DashboardFragment;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
+import com.android.settingslib.core.lifecycle.Lifecycle;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.mockito.MockitoAnnotations;
+import org.robolectric.RuntimeEnvironment;
+import org.robolectric.annotation.Config;
+
+@RunWith(SettingsRobolectricTestRunner.class)
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION_O)
+public class ConnectedDeviceGroupControllerTest {
+    @Mock
+    private DashboardFragment mDashboardFragment;
+    @Mock
+    private ConnectedBluetoothDeviceUpdater mConnectedBluetoothDeviceUpdater;
+    @Mock
+    private PreferenceScreen mPreferenceScreen;
+    @Mock
+    private PreferenceManager mPreferenceManager;
+
+    private PreferenceGroup mPreferenceGroup;
+    private Context mContext;
+    private Preference mPreference;
+    private ConnectedDeviceGroupController mConnectedDeviceGroupController;
+    private Lifecycle mLifecycle;
+
+    @Before
+    public void setUp() {
+        MockitoAnnotations.initMocks(this);
+
+        mContext = RuntimeEnvironment.application;
+        mPreference = new Preference(mContext);
+        mLifecycle = new Lifecycle(() -> mLifecycle);
+        mPreferenceGroup = spy(new PreferenceScreen(mContext, null));
+        doReturn(mPreferenceManager).when(mPreferenceGroup).getPreferenceManager();
+        doReturn(mContext).when(mDashboardFragment).getContext();
+
+        mConnectedDeviceGroupController = new ConnectedDeviceGroupController(mDashboardFragment,
+                mLifecycle, mConnectedBluetoothDeviceUpdater);
+        mConnectedDeviceGroupController.mPreferenceGroup = mPreferenceGroup;
+    }
+
+    @Test
+    public void testOnDeviceAdded_firstAdd_becomeVisible() {
+        mConnectedDeviceGroupController.onDeviceAdded(mPreference);
+
+        assertThat(mPreferenceGroup.isVisible()).isTrue();
+    }
+
+    @Test
+    public void testOnDeviceRemoved_lastRemove_becomeInvisible() {
+        mPreferenceGroup.addPreference(mPreference);
+
+        mConnectedDeviceGroupController.onDeviceRemoved(mPreference);
+
+        assertThat(mPreferenceGroup.isVisible()).isFalse();
+    }
+
+    @Test
+    public void testOnDeviceRemoved_notLastRemove_stillVisible() {
+        mPreferenceGroup.setVisible(true);
+        mPreferenceGroup.addPreference(mPreference);
+        mPreferenceGroup.addPreference(new Preference(mContext));
+
+        mConnectedDeviceGroupController.onDeviceRemoved(mPreference);
+
+        assertThat(mPreferenceGroup.isVisible()).isTrue();
+    }
+
+    @Test
+    public void testDisplayPreference_becomeInvisible() {
+        doReturn(mPreferenceGroup).when(mPreferenceScreen).findPreference(anyString());
+
+        mConnectedDeviceGroupController.displayPreference(mPreferenceScreen);
+
+        assertThat(mPreferenceGroup.isVisible()).isFalse();
+    }
+
+    @Test
+    public void testLifecycle() {
+        // register the callback in onStart()
+        mLifecycle.handleLifecycleEvent(android.arch.lifecycle.Lifecycle.Event.ON_START);
+        verify(mConnectedBluetoothDeviceUpdater).registerCallback();
+
+        // unregister the callback in onStop()
+        mLifecycle.handleLifecycleEvent(android.arch.lifecycle.Lifecycle.Event.ON_STOP);
+        verify(mConnectedBluetoothDeviceUpdater).unregisterCallback();
+    }
+}
diff --git a/tests/robotests/src/com/android/settings/connecteddevice/UsbModePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/connecteddevice/UsbModePreferenceControllerTest.java
index 7edde6e..59a5172 100644
--- a/tests/robotests/src/com/android/settings/connecteddevice/UsbModePreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/connecteddevice/UsbModePreferenceControllerTest.java
@@ -26,7 +26,7 @@
 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_O)
 public class UsbModePreferenceControllerTest {
 
     @Mock(answer = RETURNS_DEEP_STUBS)
diff --git a/tests/robotests/src/com/android/settings/core/BasePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/core/BasePreferenceControllerTest.java
new file mode 100644
index 0000000..d153e9a
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/core/BasePreferenceControllerTest.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.core;
+
+import static com.android.settings.core.BasePreferenceController.AVAILABLE;
+import static com.android.settings.core.BasePreferenceController
+        .DISABLED_DEPENDENT_SETTING;
+import static com.android.settings.core.BasePreferenceController.DISABLED_FOR_USER;
+import static com.android.settings.core.BasePreferenceController.DISABLED_UNSUPPORTED;
+import static com.android.settings.core.BasePreferenceController.UNAVAILABLE_UNKNOWN;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import static org.mockito.Mockito.when;
+
+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_O)
+public class BasePreferenceControllerTest {
+
+    @Mock
+    BasePreferenceController mPreferenceController;
+
+    @Before
+    public void setUp() {
+        MockitoAnnotations.initMocks(this);
+    }
+
+    @Test
+    public void isAvailable_availableStatusAvailable_returnsTrue() {
+        when(mPreferenceController.getAvailabilityStatus()).thenReturn(AVAILABLE);
+
+        assertThat(mPreferenceController.isAvailable()).isTrue();
+    }
+
+    @Test
+    public void isAvailable_availableStatusUnsupported_returnsFalse() {
+        when(mPreferenceController.getAvailabilityStatus()).thenReturn(DISABLED_UNSUPPORTED);
+
+        assertThat(mPreferenceController.isAvailable()).isFalse();
+    }
+
+    @Test
+    public void isAvailable_availableStatusDisabled_returnsFalse() {
+        when(mPreferenceController.getAvailabilityStatus()).thenReturn(DISABLED_FOR_USER);
+
+        assertThat(mPreferenceController.isAvailable()).isFalse();
+    }
+
+    @Test
+    public void isAvailable_availableStatusBlockedDependent_returnsFalse() {
+        when(mPreferenceController.getAvailabilityStatus()).thenReturn(DISABLED_DEPENDENT_SETTING);
+
+        assertThat(mPreferenceController.isAvailable()).isFalse();
+    }
+
+    @Test
+    public void isAvailable_availableStatusUnavailable_returnsFalse() {
+        when(mPreferenceController.getAvailabilityStatus()).thenReturn(UNAVAILABLE_UNKNOWN);
+
+        assertThat(mPreferenceController.isAvailable()).isFalse();
+    }
+
+    @Test
+    public void isSupported_availableStatusAvailable_returnsTrue() {
+        when(mPreferenceController.getAvailabilityStatus()).thenReturn(AVAILABLE);
+
+        assertThat(mPreferenceController.isSupported()).isTrue();
+    }
+
+    @Test
+    public void isSupported_availableStatusUnsupported_returnsFalse() {
+        when(mPreferenceController.getAvailabilityStatus()).thenReturn(DISABLED_UNSUPPORTED);
+
+        assertThat(mPreferenceController.isSupported()).isFalse();
+    }
+
+    @Test
+    public void isSupported_availableStatusDisabled_returnsTrue() {
+        when(mPreferenceController.getAvailabilityStatus()).thenReturn(DISABLED_FOR_USER);
+
+        assertThat(mPreferenceController.isSupported()).isTrue();
+    }
+
+    @Test
+    public void isSupported_availableStatusDependentSetting_returnsTrue() {
+        when(mPreferenceController.getAvailabilityStatus()).thenReturn(DISABLED_DEPENDENT_SETTING);
+
+        assertThat(mPreferenceController.isSupported()).isTrue();
+    }
+
+    @Test
+    public void isSupported_availableStatusUnavailable_returnsTrue() {
+        when(mPreferenceController.getAvailabilityStatus()).thenReturn(UNAVAILABLE_UNKNOWN);
+
+        assertThat(mPreferenceController.isSupported()).isTrue();
+    }
+}
diff --git a/tests/robotests/src/com/android/settings/core/DynamicAvailabilityPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/core/DynamicAvailabilityPreferenceControllerTest.java
deleted file mode 100644
index 9bf73ce..0000000
--- a/tests/robotests/src/com/android/settings/core/DynamicAvailabilityPreferenceControllerTest.java
+++ /dev/null
@@ -1,157 +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;
-
-import android.content.Context;
-import android.support.v7.preference.Preference;
-import android.support.v7.preference.PreferenceScreen;
-
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.TestConfig;
-import com.android.settingslib.core.lifecycle.Lifecycle;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
-import org.robolectric.annotation.Config;
-
-import static com.google.common.truth.Truth.assertThat;
-import static org.mockito.Mockito.never;
-import static org.mockito.Mockito.reset;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
-/**
- * Tests for {@link DynamicAvailabilityPreferenceController}.
- */
-@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
-public final class DynamicAvailabilityPreferenceControllerTest {
-
-    private final String PREFERENCE_KEY = "preference_key";
-
-    private @Mock Context mContext;
-    private @Mock Preference mPreference;
-    private @Mock PreferenceScreen mScreen;
-    private @Mock Lifecycle mLifecycle;
-    private @Mock PreferenceAvailabilityObserver mObserver;
-
-    private boolean mIsAvailable;
-    private Preference mUpdatedPreference = null;
-
-    @Before
-    public void setUp() {
-        MockitoAnnotations.initMocks(this);
-        when(mPreference.getKey()).thenReturn(PREFERENCE_KEY);
-        when(mScreen.findPreference(PREFERENCE_KEY)).thenReturn(mPreference);
-        when(mScreen.getPreferenceCount()).thenReturn(1);
-        when(mScreen.getPreference(0)).thenReturn(mPreference);
-    }
-
-    @Test
-    public void testAvailableToUnavailable() {
-        mIsAvailable = true;
-
-        final DynamicAvailabilityPreferenceController controller
-                = new DynamicAvailabilityPreferenceControllerTestable(mLifecycle);
-        verify(mLifecycle).addObserver(controller);
-
-        controller.displayPreference(mScreen);
-        verify(mScreen, never()).removePreference(mPreference);
-        verify(mScreen, never()).addPreference(mPreference);
-        assertThat(mUpdatedPreference).isNull();
-
-        controller.onResume();
-        verify(mScreen, never()).removePreference(mPreference);
-        verify(mScreen, never()).addPreference(mPreference);
-        assertThat(mUpdatedPreference).isEqualTo(mPreference);
-
-        mUpdatedPreference = null;
-        mIsAvailable = false;
-        controller.onResume();
-        verify(mScreen).removePreference(mPreference);
-        verify(mScreen, never()).addPreference(mPreference);
-        assertThat(mUpdatedPreference).isNull();
-    }
-
-    @Test
-    public void testUnavailableToAvailable() {
-        mIsAvailable = false;
-
-        final DynamicAvailabilityPreferenceController controller
-                = new DynamicAvailabilityPreferenceControllerTestable(mLifecycle);
-        verify(mLifecycle).addObserver(controller);
-
-        controller.displayPreference(mScreen);
-        verify(mScreen).removePreference(mPreference);
-        verify(mScreen, never()).addPreference(mPreference);
-        assertThat(mUpdatedPreference).isNull();
-
-        reset(mScreen);
-        controller.onResume();
-        verify(mScreen, never()).removePreference(mPreference);
-        verify(mScreen, never()).addPreference(mPreference);
-        assertThat(mUpdatedPreference).isNull();
-
-        mIsAvailable = true;
-        controller.onResume();
-        verify(mScreen, never()).removePreference(mPreference);
-        verify(mScreen).addPreference(mPreference);
-        assertThat(mUpdatedPreference).isEqualTo(mPreference);
-    }
-
-    @Test
-    public void testNotifyOnAvailabilityUpdate() {
-        final DynamicAvailabilityPreferenceController controller
-                = new DynamicAvailabilityPreferenceControllerTestable(mLifecycle);
-        controller.setAvailabilityObserver(mObserver);
-        assertThat(controller.getAvailabilityObserver()).isEqualTo(mObserver);
-
-        mIsAvailable = false;
-        controller.isAvailable();
-        verify(mObserver).onPreferenceAvailabilityUpdated(PREFERENCE_KEY, false);
-
-        mIsAvailable = true;
-        controller.isAvailable();
-        verify(mObserver).onPreferenceAvailabilityUpdated(PREFERENCE_KEY, true);
-    }
-
-    private class DynamicAvailabilityPreferenceControllerTestable
-            extends DynamicAvailabilityPreferenceController {
-        public DynamicAvailabilityPreferenceControllerTestable(Lifecycle lifecycle) {
-            super(DynamicAvailabilityPreferenceControllerTest.this.mContext, lifecycle);
-        }
-
-        @Override
-        public boolean isAvailable() {
-            notifyOnAvailabilityUpdate(mIsAvailable);
-            return mIsAvailable;
-        }
-
-        @Override
-        public void updateState(Preference preference) {
-            mUpdatedPreference = preference;
-        }
-
-        @Override
-        public String getPreferenceKey() {
-            return PREFERENCE_KEY;
-        }
-    }
-}
diff --git a/tests/robotests/src/com/android/settings/core/InstrumentedPreferenceFragmentTest.java b/tests/robotests/src/com/android/settings/core/InstrumentedPreferenceFragmentTest.java
new file mode 100644
index 0000000..8814ecb
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/core/InstrumentedPreferenceFragmentTest.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.core;
+
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.anyInt;
+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.os.Bundle;
+import android.support.v7.preference.PreferenceManager;
+import android.support.v7.preference.PreferenceScreen;
+
+import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
+import com.android.settings.R;
+import com.android.settings.TestConfig;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.shadow.SettingsShadowSystemProperties;
+
+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.util.ReflectionHelpers;
+
+@RunWith(SettingsRobolectricTestRunner.class)
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION_O, shadows = {
+        SettingsShadowSystemProperties.class
+})
+public class InstrumentedPreferenceFragmentTest {
+
+    @Mock
+    private PreferenceScreen mScreen;
+    @Mock
+    private PreferenceManager mPreferenceManager;
+    @Mock
+    private Activity mActivity;
+
+    private InstrumentedPreferenceFragmentTestable mFragment;
+
+    @Before
+    public void setUp() {
+        MockitoAnnotations.initMocks(this);
+        when(mPreferenceManager.getPreferenceScreen()).thenReturn(mScreen);
+
+        mFragment = spy(new InstrumentedPreferenceFragmentTestable());
+        ReflectionHelpers.setField(mFragment, "mPreferenceManager", mPreferenceManager);
+    }
+
+    @After
+    public void tearDown() {
+        SettingsShadowSystemProperties.clear();
+    }
+
+    @Test
+    public void onCreatePreferences_noPreferenceScreenResId_shouldNotAddPreference() {
+        mFragment.onCreatePreferences(Bundle.EMPTY, null /* rootKey */);
+
+        verify(mFragment, never()).addPreferencesFromResource(anyInt());
+    }
+
+    @Test
+    public void onCreatePreferences_gotPreferenceScreenResId_shouldAddPreferences() {
+        mFragment.setPreferenceScreenResId(R.xml.screen_pinning_settings);
+        when(mFragment.getActivity()).thenReturn(mActivity);
+
+        mFragment.onCreatePreferences(Bundle.EMPTY, null /* rootKey */);
+
+        verify(mFragment).addPreferencesFromResource(R.xml.screen_pinning_settings);
+        verify(mActivity, never()).setTitle(any());
+    }
+
+    @Test
+    public void onCreatePreferences_gotPrefScreenResIdAndTitle_shouldAddPreferencesAndSetTitle() {
+        mFragment.setPreferenceScreenResId(R.xml.screen_pinning_settings);
+        when(mFragment.getActivity()).thenReturn(mActivity);
+        final CharSequence title = "Test Title";
+        when(mScreen.getTitle()).thenReturn(title);
+
+        mFragment.onCreatePreferences(Bundle.EMPTY, null /* rootKey */);
+
+        verify(mFragment).addPreferencesFromResource(R.xml.screen_pinning_settings);
+        verify(mActivity).setTitle(title);
+    }
+
+    public static class InstrumentedPreferenceFragmentTestable
+            extends InstrumentedPreferenceFragment {
+
+        private int mScreenId = -1;
+
+        @Override
+        public int getMetricsCategory() {
+            return MetricsEvent.VIEW_UNKNOWN;
+        }
+
+        @Override
+        protected int getPreferenceScreenResId() {
+            return mScreenId;
+        }
+
+        public void setPreferenceScreenResId(int id) {
+            mScreenId = id;
+        }
+    }
+}
diff --git a/tests/robotests/src/com/android/settings/core/TogglePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/core/TogglePreferenceControllerTest.java
new file mode 100644
index 0000000..b3df90a
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/core/TogglePreferenceControllerTest.java
@@ -0,0 +1,92 @@
+/*
+ * Copyright (C) 2017 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF 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;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+import android.content.Context;
+import android.support.v14.preference.SwitchPreference;
+
+import com.android.settings.TestConfig;
+import com.android.settings.core.TogglePreferenceController;
+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_O)
+public class TogglePreferenceControllerTest {
+
+    @Mock
+    TogglePreferenceController mTogglePreferenceController;
+
+    Context mContext;
+    SwitchPreference mPreference;
+
+    @Before
+    public void setUp() {
+        MockitoAnnotations.initMocks(this);
+        mContext = RuntimeEnvironment.application;
+        mPreference = new SwitchPreference(mContext);
+    }
+
+    @Test
+    public void testSetsPreferenceValue_setsChecked() {
+        when(mTogglePreferenceController.isChecked()).thenReturn(true);
+        mPreference.setChecked(false);
+
+        mTogglePreferenceController.updateState(mPreference);
+
+        assertThat(mPreference.isChecked()).isTrue();
+    }
+
+    @Test
+    public void testSetsPreferenceValue_setsNotChecked() {
+        when(mTogglePreferenceController.isChecked()).thenReturn(false);
+        mPreference.setChecked(true);
+
+        mTogglePreferenceController.updateState(mPreference);
+
+        assertThat(mPreference.isChecked()).isFalse();
+    }
+
+    @Test
+    public void testUpdatesPreferenceOnChange_turnsOn() {
+        boolean newValue = true;
+
+        mTogglePreferenceController.onPreferenceChange(mPreference, newValue);
+
+        verify(mTogglePreferenceController).setChecked(newValue);
+    }
+
+    @Test
+    public void testUpdatesPreferenceOnChange_turnsOff() {
+        boolean newValue = false;
+
+        mTogglePreferenceController.onPreferenceChange(mPreference, newValue);
+
+        verify(mTogglePreferenceController).setChecked(newValue);
+    }
+}
diff --git a/tests/robotests/src/com/android/settings/core/codeinspection/ClassScanner.java b/tests/robotests/src/com/android/settings/core/codeinspection/ClassScanner.java
index 09af870..bf57f40 100644
--- a/tests/robotests/src/com/android/settings/core/codeinspection/ClassScanner.java
+++ b/tests/robotests/src/com/android/settings/core/codeinspection/ClassScanner.java
@@ -16,50 +16,47 @@
 
 package com.android.settings.core.codeinspection;
 
-import java.io.File;
+import com.google.common.reflect.ClassPath;
+
 import java.io.IOException;
-import java.net.JarURLConnection;
-import java.net.URL;
-import java.net.URLConnection;
-import java.net.URLDecoder;
 import java.util.ArrayList;
-import java.util.Enumeration;
 import java.util.List;
-import java.util.jar.JarEntry;
-import java.util.jar.JarFile;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
 
 /**
  * Scans and builds all classes in current classloader.
  */
 public class ClassScanner {
 
-    private static final String CLASS_SUFFIX = ".class";
-
     public List<Class<?>> getClassesForPackage(String packageName)
             throws ClassNotFoundException {
         final List<Class<?>> classes = new ArrayList<>();
 
         try {
-            final Enumeration<URL> resources = Thread.currentThread().getContextClassLoader()
-                    .getResources(packageName.replace('.', '/'));
-            if (!resources.hasMoreElements()) {
-                return classes;
-            }
-            URL url = resources.nextElement();
-            while (url != null) {
-                final URLConnection connection = url.openConnection();
+            ClassLoader classLoader = Thread.currentThread().getContextClassLoader();
+            ClassPath classPath = ClassPath.from(classLoader);
 
-                if (connection instanceof JarURLConnection) {
-                    loadClassFromJar((JarURLConnection) connection, packageName,
-                            classes);
-                } else {
-                    loadClassFromDirectory(new File(URLDecoder.decode(url.getPath(), "UTF-8")),
-                            packageName, classes);
-                }
-                if (resources.hasMoreElements()) {
-                    url = resources.nextElement();
-                } else {
-                    break;
+            // Some anonymous classes don't return true when calling isAnonymousClass(), but they
+            // always seem to be nested anonymous classes like com.android.settings.Foo$1$2. In
+            // general we don't want any anonymous classes so we just filter these out by searching
+            // for $[0-9] in the name.
+            Pattern anonymousClassPattern = Pattern.compile(".*\\$\\d+.*");
+            Matcher anonymousClassMatcher = anonymousClassPattern.matcher("");
+
+            for (ClassPath.ClassInfo info : classPath.getAllClasses()) {
+                if (info.getPackageName().startsWith(packageName)) {
+                    try {
+                        Class clazz = classLoader.loadClass(info.getName());
+                        if (clazz.isAnonymousClass() || anonymousClassMatcher.reset(
+                                clazz.getName()).matches()) {
+                            continue;
+                        }
+                        classes.add(clazz);
+                    } catch (NoClassDefFoundError e) {
+                        // do nothing. this class hasn't been found by the
+                        // loader, and we don't care.
+                    }
                 }
             }
         } catch (final IOException e) {
@@ -68,63 +65,4 @@
         return classes;
     }
 
-    private void loadClassFromDirectory(File directory, String packageName, List<Class<?>> classes)
-            throws ClassNotFoundException {
-        if (directory.exists() && directory.isDirectory()) {
-            final String[] files = directory.list();
-
-            for (final String file : files) {
-                if (file.endsWith(CLASS_SUFFIX)) {
-                    try {
-                        classes.add(Class.forName(
-                                packageName + '.' + file.substring(0, file.length() - 6),
-                                false /* init */,
-                                Thread.currentThread().getContextClassLoader()));
-                    } catch (NoClassDefFoundError e) {
-                        // do nothing. this class hasn't been found by the
-                        // loader, and we don't care.
-                    }
-                } else {
-                    final File tmpDirectory = new File(directory, file);
-                    if (tmpDirectory.isDirectory()) {
-                        loadClassFromDirectory(tmpDirectory, packageName + "." + file, classes);
-                    }
-                }
-            }
-        }
-    }
-
-    private void loadClassFromJar(JarURLConnection connection, String packageName,
-            List<Class<?>> classes) throws ClassNotFoundException, IOException {
-        final JarFile jarFile = connection.getJarFile();
-        final Enumeration<JarEntry> entries = jarFile.entries();
-        String name;
-        if (!entries.hasMoreElements()) {
-            return;
-        }
-        JarEntry jarEntry = entries.nextElement();
-        while (jarEntry != null) {
-            name = jarEntry.getName();
-
-            if (name.contains(CLASS_SUFFIX)) {
-                name = name.substring(0, name.length() - CLASS_SUFFIX.length()).replace('/', '.');
-
-                if (name.startsWith(packageName)) {
-                    try {
-                        classes.add(Class.forName(name,
-                                false /* init */,
-                                Thread.currentThread().getContextClassLoader()));
-                    } catch (NoClassDefFoundError e) {
-                        // do nothing. this class hasn't been found by the
-                        // loader, and we don't care.
-                    }
-                }
-            }
-            if (entries.hasMoreElements()) {
-                jarEntry = entries.nextElement();
-            } else {
-                break;
-            }
-        }
-    }
 }
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 d05bee6..16b1f61 100644
--- a/tests/robotests/src/com/android/settings/core/codeinspection/CodeInspectionTest.java
+++ b/tests/robotests/src/com/android/settings/core/codeinspection/CodeInspectionTest.java
@@ -16,6 +16,8 @@
 
 package com.android.settings.core.codeinspection;
 
+import static com.google.common.truth.Truth.assertThat;
+
 import com.android.settings.TestConfig;
 import com.android.settings.core.instrumentation.InstrumentableFragmentCodeInspector;
 import com.android.settings.search.SearchIndexProviderCodeInspector;
@@ -33,7 +35,7 @@
  * for conformance.
  */
 @RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION,
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION_O,
         assetDir = "/tests/robotests/assets")
 public class CodeInspectionTest {
 
@@ -42,6 +44,7 @@
     @Before
     public void setUp() throws Exception {
         mClasses = new ClassScanner().getClassesForPackage(CodeInspector.PACKAGE_NAME);
+        assertThat(mClasses).isNotEmpty();
     }
 
     @Test
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 a927306..88c184c 100644
--- a/tests/robotests/src/com/android/settings/core/instrumentation/InstrumentedDialogFragmentTest.java
+++ b/tests/robotests/src/com/android/settings/core/instrumentation/InstrumentedDialogFragmentTest.java
@@ -15,18 +15,20 @@
  */
 package com.android.settings.core.instrumentation;
 
+import static com.google.common.truth.Truth.assertThat;
+
 import android.os.Bundle;
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
+
 import com.android.settings.TestConfig;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
+
 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)
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION_O)
 public class InstrumentedDialogFragmentTest {
 
     public static class TestDialogFragment extends InstrumentedDialogFragment {
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 ea33c83..a7c95b6 100644
--- a/tests/robotests/src/com/android/settings/core/instrumentation/MetricsFeatureProviderTest.java
+++ b/tests/robotests/src/com/android/settings/core/instrumentation/MetricsFeatureProviderTest.java
@@ -15,19 +15,28 @@
  */
 package com.android.settings.core.instrumentation;
 
+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.verify;
+import static org.mockito.Mockito.verifyNoMoreInteractions;
+import static org.mockito.Mockito.when;
+
 import android.content.ComponentName;
 import android.content.Context;
 import android.content.Intent;
 import android.util.Pair;
 
 import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
 import com.android.settings.overlay.FeatureFactory;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 
 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.RuntimeEnvironment;
@@ -37,29 +46,33 @@
 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.verify;
-import static org.mockito.Mockito.verifyNoMoreInteractions;
-
 @RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION_O)
 public class MetricsFeatureProviderTest {
+    private static int CATEGORY = 10;
+    private static boolean SUBTYPE_BOOLEAN = true;
+    private static int SUBTYPE_INTEGER = 1;
+    private static long ELAPSED_TIME = 1000;
 
-    @Mock
-    private LogWriter mLogWriter;
+    @Mock private LogWriter mockLogWriter;
+    @Mock private VisibilityLoggerMixin mockVisibilityLogger;
+
     private Context mContext;
     private MetricsFeatureProvider mProvider;
 
+    @Captor
+    private ArgumentCaptor<Pair> mPairCaptor;
+
     @Before
     public void setUp() {
         MockitoAnnotations.initMocks(this);
         mContext = RuntimeEnvironment.application;
         mProvider = new MetricsFeatureProvider();
         List<LogWriter> writers = new ArrayList<>();
-        writers.add(mLogWriter);
+        writers.add(mockLogWriter);
         ReflectionHelpers.setField(mProvider, "mLoggerWriters", writers);
+
+        when(mockVisibilityLogger.elapsedTimeSinceVisible()).thenReturn(ELAPSED_TIME);
     }
 
     @Test
@@ -77,7 +90,7 @@
         mProvider.logDashboardStartIntent(mContext, null /* intent */,
                 MetricsEvent.SETTINGS_GESTURES);
 
-        verifyNoMoreInteractions(mLogWriter);
+        verifyNoMoreInteractions(mockLogWriter);
     }
 
     @Test
@@ -86,7 +99,7 @@
 
         mProvider.logDashboardStartIntent(mContext, intent, MetricsEvent.SETTINGS_GESTURES);
 
-        verify(mLogWriter).action(
+        verify(mockLogWriter).action(
                 eq(mContext),
                 eq(MetricsEvent.ACTION_SETTINGS_TILE_CLICK),
                 anyString(),
@@ -99,10 +112,32 @@
 
         mProvider.logDashboardStartIntent(mContext, intent, MetricsEvent.SETTINGS_GESTURES);
 
-        verify(mLogWriter).action(
+        verify(mockLogWriter).action(
                 eq(mContext),
                 eq(MetricsEvent.ACTION_SETTINGS_TILE_CLICK),
                 anyString(),
                 eq(Pair.create(MetricsEvent.FIELD_CONTEXT, MetricsEvent.SETTINGS_GESTURES)));
     }
+
+    @Test
+    public void action_BooleanLogsElapsedTime() {
+        mProvider.action(mockVisibilityLogger, CATEGORY, SUBTYPE_BOOLEAN);
+        verify(mockLogWriter).action(eq(CATEGORY), eq(SUBTYPE_BOOLEAN), mPairCaptor.capture());
+
+        Pair value = mPairCaptor.getValue();
+        assertThat(value.first instanceof Integer).isTrue();
+        assertThat((int) value.first).isEqualTo(MetricsEvent.NOTIFICATION_SINCE_VISIBLE_MILLIS);
+        assertThat(value.second).isEqualTo(ELAPSED_TIME);
+    }
+
+    @Test
+    public void action_IntegerLogsElapsedTime() {
+        mProvider.action(mockVisibilityLogger, CATEGORY, SUBTYPE_INTEGER);
+        verify(mockLogWriter).action(eq(CATEGORY), eq(SUBTYPE_INTEGER), mPairCaptor.capture());
+
+        Pair value = mPairCaptor.getValue();
+        assertThat(value.first instanceof Integer).isTrue();
+        assertThat((int) value.first).isEqualTo(MetricsEvent.NOTIFICATION_SINCE_VISIBLE_MILLIS);
+        assertThat(value.second).isEqualTo(ELAPSED_TIME);
+    }
 }
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 bb41cf0..3ad70ab 100644
--- a/tests/robotests/src/com/android/settings/core/instrumentation/SharedPreferenceLoggerTest.java
+++ b/tests/robotests/src/com/android/settings/core/instrumentation/SharedPreferenceLoggerTest.java
@@ -15,13 +15,24 @@
  */
 package com.android.settings.core.instrumentation;
 
+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_INT_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;
+
 import android.content.Context;
 import android.content.SharedPreferences;
 import android.util.Pair;
 
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
 import com.android.settings.testutils.FakeFeatureFactory;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 
 import com.google.common.truth.Platform;
 
@@ -34,23 +45,8 @@
 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_INT_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;
-
 @RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION_O)
 public class SharedPreferenceLoggerTest {
 
     private static final String TEST_TAG = "tag";
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 1a47a66..b12d9d6 100644
--- a/tests/robotests/src/com/android/settings/core/instrumentation/VisibilityLoggerMixinTest.java
+++ b/tests/robotests/src/com/android/settings/core/instrumentation/VisibilityLoggerMixinTest.java
@@ -44,7 +44,7 @@
 
 
 @RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION_O)
 public class VisibilityLoggerMixinTest {
 
     @Mock
diff --git a/tests/robotests/src/com/android/settings/dashboard/DashboardAdapterTest.java b/tests/robotests/src/com/android/settings/dashboard/DashboardAdapterTest.java
index 4b345d0..fdb1470 100644
--- a/tests/robotests/src/com/android/settings/dashboard/DashboardAdapterTest.java
+++ b/tests/robotests/src/com/android/settings/dashboard/DashboardAdapterTest.java
@@ -24,10 +24,10 @@
 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.app.PendingIntent;
 import android.content.ComponentName;
 import android.content.Context;
 import android.content.Intent;
@@ -35,14 +35,13 @@
 import android.content.res.TypedArray;
 import android.graphics.drawable.Icon;
 import android.os.Bundle;
+import android.service.settings.suggestions.Suggestion;
 import android.support.v7.widget.RecyclerView;
 import android.util.DisplayMetrics;
-import android.util.Pair;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.widget.RelativeLayout;
 
-import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
 import com.android.settings.R;
 import com.android.settings.SettingsActivity;
 import com.android.settings.TestConfig;
@@ -59,8 +58,6 @@
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.Answers;
-import org.mockito.ArgumentCaptor;
-import org.mockito.Captor;
 import org.mockito.Mock;
 import org.mockito.MockitoAnnotations;
 import org.robolectric.RuntimeEnvironment;
@@ -71,7 +68,7 @@
 
 @RunWith(SettingsRobolectricTestRunner.class)
 @Config(manifest = TestConfig.MANIFEST_PATH,
-        sdk = TestConfig.SDK_VERSION,
+        sdk = TestConfig.SDK_VERSION_O,
         shadows = {
                 SettingsShadowResources.class,
                 SettingsShadowResources.SettingsShadowTheme.class,
@@ -86,12 +83,6 @@
     private Condition mCondition;
     @Mock
     private Resources mResources;
-    @Captor
-    private ArgumentCaptor<Integer> mActionCategoryCaptor = ArgumentCaptor.forClass(Integer.class);
-    @Captor
-    private ArgumentCaptor<String> mActionPackageCaptor = ArgumentCaptor.forClass(String.class);
-    @Captor
-    private ArgumentCaptor<Pair> mTaggedDataCaptor = ArgumentCaptor.forClass(Pair.class);
     private FakeFeatureFactory mFactory;
     private DashboardAdapter mDashboardAdapter;
     private DashboardAdapter.SuggestionAndConditionHeaderHolder mSuggestionHolder;
@@ -108,7 +99,7 @@
                 .getSuggestionIdentifier(any(Context.class), any(Tile.class)))
                 .thenAnswer(invocation -> {
                     final Object[] args = invocation.getArguments();
-                    return ((Tile)args[1]).intent.getComponent().getPackageName();
+                    return ((Tile) args[1]).intent.getComponent().getPackageName();
                 });
 
         when(mContext.getResources()).thenReturn(mResources);
@@ -118,288 +109,12 @@
         mConditionList = new ArrayList<>();
         mConditionList.add(mCondition);
         when(mCondition.shouldShow()).thenReturn(true);
-        mDashboardAdapter = new DashboardAdapter(mContext, null, mConditionList, null, null);
+        mDashboardAdapter = new DashboardAdapter(mContext, null, mConditionList, null, null, null);
         mSuggestionHeaderData = new DashboardData.SuggestionConditionHeaderData(mConditionList, 1);
         when(mView.getTag()).thenReturn(mCondition);
     }
 
     @Test
-    public void testSuggestionsLogs_NotExpanded() {
-        setupSuggestions(makeSuggestions("pkg1", "pkg2", "pkg3"));
-
-        verify(mFactory.metricsFeatureProvider, times(2)).action(
-                any(Context.class), mActionCategoryCaptor.capture(),
-                mActionPackageCaptor.capture(),
-                mTaggedDataCaptor.capture());
-        assertThat(mActionCategoryCaptor.getAllValues()).containsExactly(
-                MetricsEvent.ACTION_SHOW_SETTINGS_SUGGESTION,
-                MetricsEvent.ACTION_SHOW_SETTINGS_SUGGESTION);
-        assertThat(mActionPackageCaptor.getAllValues()).containsExactly("pkg1", "pkg2");
-        assertThat(mTaggedDataCaptor.getAllValues()).containsExactly(
-                Pair.create(MetricsEvent.FIELD_SETTINGS_SMART_SUGGESTIONS_ENABLED, 0),
-                Pair.create(MetricsEvent.FIELD_SETTINGS_SMART_SUGGESTIONS_ENABLED, 0));
-    }
-
-    @Test
-    public void testSuggestionsLogs_NotExpandedAndPaused() {
-        setupSuggestions(makeSuggestions("pkg1", "pkg2", "pkg3"));
-
-        mDashboardAdapter.onPause();
-
-        verify(mFactory.metricsFeatureProvider, times(4)).action(
-                any(Context.class), mActionCategoryCaptor.capture(),
-                mActionPackageCaptor.capture(),
-                mTaggedDataCaptor.capture());
-        assertThat(mActionCategoryCaptor.getAllValues()).containsExactly(
-                MetricsEvent.ACTION_SHOW_SETTINGS_SUGGESTION,
-                MetricsEvent.ACTION_SHOW_SETTINGS_SUGGESTION,
-                MetricsEvent.ACTION_HIDE_SETTINGS_SUGGESTION,
-                MetricsEvent.ACTION_HIDE_SETTINGS_SUGGESTION);
-        assertThat(mActionPackageCaptor.getAllValues()).containsExactly(
-                "pkg1", "pkg2", "pkg1", "pkg2");
-        assertThat(mTaggedDataCaptor.getAllValues()).containsExactly(
-                Pair.create(MetricsEvent.FIELD_SETTINGS_SMART_SUGGESTIONS_ENABLED, 0),
-                Pair.create(MetricsEvent.FIELD_SETTINGS_SMART_SUGGESTIONS_ENABLED, 0),
-                Pair.create(MetricsEvent.FIELD_SETTINGS_SMART_SUGGESTIONS_ENABLED, 0),
-                Pair.create(MetricsEvent.FIELD_SETTINGS_SMART_SUGGESTIONS_ENABLED, 0));
-    }
-
-    @Test
-    public void testSuggestionsLogs_Expanded() {
-        setupSuggestions(makeSuggestions("pkg1", "pkg2", "pkg3"));
-
-        mDashboardAdapter.onBindSuggestionConditionHeader(mSuggestionHolder, mSuggestionHeaderData);
-        mSuggestionHolder.itemView.callOnClick();
-
-        verify(mFactory.metricsFeatureProvider, times(3)).action(
-                any(Context.class), mActionCategoryCaptor.capture(),
-                mActionPackageCaptor.capture(),
-                mTaggedDataCaptor.capture());
-        assertThat(mActionCategoryCaptor.getAllValues()).containsExactly(
-                MetricsEvent.ACTION_SHOW_SETTINGS_SUGGESTION,
-                MetricsEvent.ACTION_SHOW_SETTINGS_SUGGESTION,
-                MetricsEvent.ACTION_SHOW_SETTINGS_SUGGESTION);
-        assertThat(mActionPackageCaptor.getAllValues()).containsExactly(
-                "pkg1", "pkg2", "pkg3");
-        assertThat(mTaggedDataCaptor.getAllValues()).containsExactly(
-                Pair.create(MetricsEvent.FIELD_SETTINGS_SMART_SUGGESTIONS_ENABLED, 0),
-                Pair.create(MetricsEvent.FIELD_SETTINGS_SMART_SUGGESTIONS_ENABLED, 0),
-                Pair.create(MetricsEvent.FIELD_SETTINGS_SMART_SUGGESTIONS_ENABLED, 0));
-    }
-
-    @Test
-    public void testSuggestionsLogs_ExpandedAndPaused() {
-        setupSuggestions(makeSuggestions("pkg1", "pkg2", "pkg3"));
-
-        mDashboardAdapter.onBindSuggestionConditionHeader(mSuggestionHolder, mSuggestionHeaderData);
-        mSuggestionHolder.itemView.callOnClick();
-        mDashboardAdapter.onPause();
-
-        verify(mFactory.metricsFeatureProvider, times(6)).action(
-                any(Context.class), mActionCategoryCaptor.capture(),
-                mActionPackageCaptor.capture(),
-                mTaggedDataCaptor.capture());
-        assertThat(mActionCategoryCaptor.getAllValues()).containsExactly(
-                MetricsEvent.ACTION_SHOW_SETTINGS_SUGGESTION,
-                MetricsEvent.ACTION_SHOW_SETTINGS_SUGGESTION,
-                MetricsEvent.ACTION_SHOW_SETTINGS_SUGGESTION,
-                MetricsEvent.ACTION_HIDE_SETTINGS_SUGGESTION,
-                MetricsEvent.ACTION_HIDE_SETTINGS_SUGGESTION,
-                MetricsEvent.ACTION_HIDE_SETTINGS_SUGGESTION);
-        assertThat(mActionPackageCaptor.getAllValues()).containsExactly(
-                "pkg1", "pkg2", "pkg3", "pkg1", "pkg2", "pkg3");
-        assertThat(mTaggedDataCaptor.getAllValues()).containsExactly(
-                Pair.create(MetricsEvent.FIELD_SETTINGS_SMART_SUGGESTIONS_ENABLED, 0),
-                Pair.create(MetricsEvent.FIELD_SETTINGS_SMART_SUGGESTIONS_ENABLED, 0),
-                Pair.create(MetricsEvent.FIELD_SETTINGS_SMART_SUGGESTIONS_ENABLED, 0),
-                Pair.create(MetricsEvent.FIELD_SETTINGS_SMART_SUGGESTIONS_ENABLED, 0),
-                Pair.create(MetricsEvent.FIELD_SETTINGS_SMART_SUGGESTIONS_ENABLED, 0),
-                Pair.create(MetricsEvent.FIELD_SETTINGS_SMART_SUGGESTIONS_ENABLED, 0));
-    }
-
-    @Test
-    public void testSuggestionsLogs_ExpandedAfterPause() {
-        setupSuggestions(makeSuggestions("pkg1", "pkg2", "pkg3"));
-
-        mDashboardAdapter.onPause();
-        mDashboardAdapter.onBindSuggestionConditionHeader(mSuggestionHolder, mSuggestionHeaderData);
-        mSuggestionHolder.itemView.callOnClick();
-
-        verify(mFactory.metricsFeatureProvider, times(7)).action(
-                any(Context.class), mActionCategoryCaptor.capture(),
-                mActionPackageCaptor.capture(),
-                mTaggedDataCaptor.capture());
-        assertThat(mActionCategoryCaptor.getAllValues()).containsExactly(
-                MetricsEvent.ACTION_SHOW_SETTINGS_SUGGESTION,
-                MetricsEvent.ACTION_SHOW_SETTINGS_SUGGESTION,
-                MetricsEvent.ACTION_HIDE_SETTINGS_SUGGESTION,
-                MetricsEvent.ACTION_HIDE_SETTINGS_SUGGESTION,
-                MetricsEvent.ACTION_SHOW_SETTINGS_SUGGESTION,
-                MetricsEvent.ACTION_SHOW_SETTINGS_SUGGESTION,
-                MetricsEvent.ACTION_SHOW_SETTINGS_SUGGESTION);
-        assertThat(mActionPackageCaptor.getAllValues()).containsExactly(
-                "pkg1", "pkg2", "pkg1", "pkg2", "pkg1", "pkg2", "pkg3");
-        assertThat(mTaggedDataCaptor.getAllValues()).containsExactly(
-                Pair.create(MetricsEvent.FIELD_SETTINGS_SMART_SUGGESTIONS_ENABLED, 0),
-                Pair.create(MetricsEvent.FIELD_SETTINGS_SMART_SUGGESTIONS_ENABLED, 0),
-                Pair.create(MetricsEvent.FIELD_SETTINGS_SMART_SUGGESTIONS_ENABLED, 0),
-                Pair.create(MetricsEvent.FIELD_SETTINGS_SMART_SUGGESTIONS_ENABLED, 0),
-                Pair.create(MetricsEvent.FIELD_SETTINGS_SMART_SUGGESTIONS_ENABLED, 0),
-                Pair.create(MetricsEvent.FIELD_SETTINGS_SMART_SUGGESTIONS_ENABLED, 0),
-                Pair.create(MetricsEvent.FIELD_SETTINGS_SMART_SUGGESTIONS_ENABLED, 0));
-    }
-
-    @Test
-    public void testSuggestionsLogs_ExpandedAfterPauseAndPausedAgain() {
-        setupSuggestions(makeSuggestions("pkg1", "pkg2", "pkg3"));
-
-        mDashboardAdapter.onPause();
-        mDashboardAdapter.onBindSuggestionConditionHeader(mSuggestionHolder, mSuggestionHeaderData);
-        mSuggestionHolder.itemView.callOnClick();
-        mDashboardAdapter.onPause();
-
-        verify(mFactory.metricsFeatureProvider, times(10)).action(
-                any(Context.class), mActionCategoryCaptor.capture(),
-                mActionPackageCaptor.capture(),
-                mTaggedDataCaptor.capture());
-        assertThat(mActionCategoryCaptor.getAllValues()).containsExactly(
-                MetricsEvent.ACTION_SHOW_SETTINGS_SUGGESTION,
-                MetricsEvent.ACTION_SHOW_SETTINGS_SUGGESTION,
-                MetricsEvent.ACTION_HIDE_SETTINGS_SUGGESTION,
-                MetricsEvent.ACTION_HIDE_SETTINGS_SUGGESTION,
-                MetricsEvent.ACTION_SHOW_SETTINGS_SUGGESTION,
-                MetricsEvent.ACTION_SHOW_SETTINGS_SUGGESTION,
-                MetricsEvent.ACTION_SHOW_SETTINGS_SUGGESTION,
-                MetricsEvent.ACTION_HIDE_SETTINGS_SUGGESTION,
-                MetricsEvent.ACTION_HIDE_SETTINGS_SUGGESTION,
-                MetricsEvent.ACTION_HIDE_SETTINGS_SUGGESTION);
-        assertThat(mActionPackageCaptor.getAllValues()).containsExactly(
-                "pkg1", "pkg2", "pkg1", "pkg2", "pkg1", "pkg2", "pkg3", "pkg1", "pkg2", "pkg3");
-        assertThat(mTaggedDataCaptor.getAllValues()).containsExactly(
-                Pair.create(MetricsEvent.FIELD_SETTINGS_SMART_SUGGESTIONS_ENABLED, 0),
-                Pair.create(MetricsEvent.FIELD_SETTINGS_SMART_SUGGESTIONS_ENABLED, 0),
-                Pair.create(MetricsEvent.FIELD_SETTINGS_SMART_SUGGESTIONS_ENABLED, 0),
-                Pair.create(MetricsEvent.FIELD_SETTINGS_SMART_SUGGESTIONS_ENABLED, 0),
-                Pair.create(MetricsEvent.FIELD_SETTINGS_SMART_SUGGESTIONS_ENABLED, 0),
-                Pair.create(MetricsEvent.FIELD_SETTINGS_SMART_SUGGESTIONS_ENABLED, 0),
-                Pair.create(MetricsEvent.FIELD_SETTINGS_SMART_SUGGESTIONS_ENABLED, 0),
-                Pair.create(MetricsEvent.FIELD_SETTINGS_SMART_SUGGESTIONS_ENABLED, 0),
-                Pair.create(MetricsEvent.FIELD_SETTINGS_SMART_SUGGESTIONS_ENABLED, 0),
-                Pair.create(MetricsEvent.FIELD_SETTINGS_SMART_SUGGESTIONS_ENABLED, 0));
-    }
-
-    @Test
-    public void testSuggestionsLogs_ExpandedWithLessThanDefaultShown() {
-        setupSuggestions(makeSuggestions("pkg1"));
-
-        mDashboardAdapter.onBindSuggestionConditionHeader(mSuggestionHolder, mSuggestionHeaderData);
-        mSuggestionHolder.itemView.callOnClick();
-
-        verify(mFactory.metricsFeatureProvider, times(1)).action(
-                any(Context.class), mActionCategoryCaptor.capture(),
-                mActionPackageCaptor.capture(),
-                mTaggedDataCaptor.capture());
-        assertThat(mActionCategoryCaptor.getAllValues()).containsExactly(
-                MetricsEvent.ACTION_SHOW_SETTINGS_SUGGESTION);
-        assertThat(mActionPackageCaptor.getAllValues()).containsExactly("pkg1");
-        assertThat(mTaggedDataCaptor.getAllValues()).containsExactly(
-                Pair.create(MetricsEvent.FIELD_SETTINGS_SMART_SUGGESTIONS_ENABLED, 0));
-    }
-
-    @Test
-    public void testSuggestionsLogs_ExpandedWithLessThanDefaultShownAndPaused() {
-        setupSuggestions(makeSuggestions("pkg1"));
-
-        mDashboardAdapter.onBindSuggestionConditionHeader(mSuggestionHolder, mSuggestionHeaderData);
-        mSuggestionHolder.itemView.callOnClick();
-        mDashboardAdapter.onPause();
-
-        verify(mFactory.metricsFeatureProvider, times(2)).action(
-                any(Context.class), mActionCategoryCaptor.capture(),
-                mActionPackageCaptor.capture(),
-                mTaggedDataCaptor.capture());
-        assertThat(mActionCategoryCaptor.getAllValues()).containsExactly(
-                MetricsEvent.ACTION_SHOW_SETTINGS_SUGGESTION,
-                MetricsEvent.ACTION_HIDE_SETTINGS_SUGGESTION);
-        assertThat(mActionPackageCaptor.getAllValues()).containsExactly("pkg1", "pkg1");
-        assertThat(mTaggedDataCaptor.getAllValues()).containsExactly(
-                Pair.create(MetricsEvent.FIELD_SETTINGS_SMART_SUGGESTIONS_ENABLED, 0),
-                Pair.create(MetricsEvent.FIELD_SETTINGS_SMART_SUGGESTIONS_ENABLED, 0));
-    }
-
-    @Test
-    public void testSuggestionsLogs_ExpandedWithLessThanDefaultShownAfterPause() {
-        setupSuggestions(makeSuggestions("pkg1"));
-
-        mDashboardAdapter.onPause();
-        mDashboardAdapter.onBindSuggestionConditionHeader(mSuggestionHolder, mSuggestionHeaderData);
-        mSuggestionHolder.itemView.callOnClick();
-
-        verify(mFactory.metricsFeatureProvider, times(3)).action(
-                any(Context.class), mActionCategoryCaptor.capture(),
-                mActionPackageCaptor.capture(),
-                mTaggedDataCaptor.capture());
-        assertThat(mActionCategoryCaptor.getAllValues()).containsExactly(
-                MetricsEvent.ACTION_SHOW_SETTINGS_SUGGESTION,
-                MetricsEvent.ACTION_HIDE_SETTINGS_SUGGESTION,
-                MetricsEvent.ACTION_SHOW_SETTINGS_SUGGESTION);
-        assertThat(mActionPackageCaptor.getAllValues()).containsExactly("pkg1", "pkg1", "pkg1");
-        assertThat(mTaggedDataCaptor.getAllValues()).containsExactly(
-                Pair.create(MetricsEvent.FIELD_SETTINGS_SMART_SUGGESTIONS_ENABLED, 0),
-                Pair.create(MetricsEvent.FIELD_SETTINGS_SMART_SUGGESTIONS_ENABLED, 0),
-                Pair.create(MetricsEvent.FIELD_SETTINGS_SMART_SUGGESTIONS_ENABLED, 0));
-    }
-
-    @Test
-    public void testSuggestionsLogs_ExpandedWithLessThanDefaultShownAfterPauseAndPausedAgain() {
-        setupSuggestions(makeSuggestions("pkg1"));
-        mDashboardAdapter.onPause();
-        mDashboardAdapter.onBindSuggestionConditionHeader(mSuggestionHolder, mSuggestionHeaderData);
-        mSuggestionHolder.itemView.callOnClick();
-        mDashboardAdapter.onPause();
-
-        verify(mFactory.metricsFeatureProvider, times(4)).action(
-                any(Context.class), mActionCategoryCaptor.capture(),
-                mActionPackageCaptor.capture(),
-                mTaggedDataCaptor.capture());
-        assertThat(mActionCategoryCaptor.getAllValues()).containsExactly(
-                MetricsEvent.ACTION_SHOW_SETTINGS_SUGGESTION,
-                MetricsEvent.ACTION_HIDE_SETTINGS_SUGGESTION,
-                MetricsEvent.ACTION_SHOW_SETTINGS_SUGGESTION,
-                MetricsEvent.ACTION_HIDE_SETTINGS_SUGGESTION);
-        assertThat(mActionPackageCaptor.getAllValues()).containsExactly(
-                "pkg1", "pkg1", "pkg1", "pkg1");
-        assertThat(mTaggedDataCaptor.getAllValues()).containsExactly(
-                Pair.create(MetricsEvent.FIELD_SETTINGS_SMART_SUGGESTIONS_ENABLED, 0),
-                Pair.create(MetricsEvent.FIELD_SETTINGS_SMART_SUGGESTIONS_ENABLED, 0),
-                Pair.create(MetricsEvent.FIELD_SETTINGS_SMART_SUGGESTIONS_ENABLED, 0),
-                Pair.create(MetricsEvent.FIELD_SETTINGS_SMART_SUGGESTIONS_ENABLED, 0));
-    }
-
-    @Test
-    public void testSuggestionsLogs_SmartSuggestionEnabled() {
-        when(mFactory.suggestionsFeatureProvider
-                .isSmartSuggestionEnabled(any(Context.class))).thenReturn(true);
-        setupSuggestions(makeSuggestions("pkg1"));
-
-        mDashboardAdapter.onBindSuggestionConditionHeader(mSuggestionHolder, mSuggestionHeaderData);
-        mSuggestionHolder.itemView.callOnClick();
-        mDashboardAdapter.onPause();
-
-        verify(mFactory.metricsFeatureProvider, times(2)).action(
-                any(Context.class), mActionCategoryCaptor.capture(),
-                mActionPackageCaptor.capture(),
-                mTaggedDataCaptor.capture());
-        assertThat(mActionCategoryCaptor.getAllValues()).containsExactly(
-                MetricsEvent.ACTION_SHOW_SETTINGS_SUGGESTION,
-                MetricsEvent.ACTION_HIDE_SETTINGS_SUGGESTION);
-        assertThat(mActionPackageCaptor.getAllValues()).containsExactly("pkg1", "pkg1");
-        assertThat(mTaggedDataCaptor.getAllValues()).containsExactly(
-                Pair.create(MetricsEvent.FIELD_SETTINGS_SMART_SUGGESTIONS_ENABLED, 1),
-                Pair.create(MetricsEvent.FIELD_SETTINGS_SMART_SUGGESTIONS_ENABLED, 1));
-    }
-
-    @Test
     public void testSuggestionsLogs_nullSuggestionsList_shouldNotCrash() {
         setupSuggestions(makeSuggestions("pkg1", "pkg2", "pkg3", "pkg4", "pkg5"));
         mDashboardAdapter.onBindSuggestionConditionHeader(mSuggestionHolder, mSuggestionHeaderData);
@@ -417,7 +132,7 @@
     @Test
     public void testSuggestionDismissed_notOnlySuggestion_updateSuggestionOnly() {
         final DashboardAdapter adapter =
-                spy(new DashboardAdapter(mContext, null, null, null, null));
+                spy(new DashboardAdapter(mContext, null, null, null, null, null));
         final List<Tile> suggestions = makeSuggestions("pkg1", "pkg2", "pkg3");
         adapter.setCategoriesAndSuggestions(null /* category */, suggestions);
 
@@ -455,7 +170,8 @@
         final List<Tile> suggestions =
                 makeSuggestions("pkg1", "pkg2", "pkg3", "pkg4");
         final DashboardAdapter adapter = spy(new DashboardAdapter(mContext, null /*savedInstance */,
-                null /* conditions */, null /* suggestionParser */, null /* callback */));
+                null /* conditions */, null /* suggestionParser */,
+                null /* suggestionControllerMixin */, null /* callback */));
         adapter.setCategoriesAndSuggestions(null /* category */, suggestions);
         adapter.onBindConditionAndSuggestion(
                 holder, DashboardAdapter.SUGGESTION_CONDITION_HEADER_POSITION);
@@ -472,7 +188,7 @@
     @Test
     public void testSuggestionDismissed_onlySuggestion_updateDashboardData() {
         DashboardAdapter adapter =
-                spy(new DashboardAdapter(mContext, null, null, null, null));
+                spy(new DashboardAdapter(mContext, null, null, null, null, null));
         final List<Tile> suggestions = makeSuggestions("pkg1");
         adapter.setCategoriesAndSuggestions(null /* category */, suggestions);
         final DashboardData dashboardData = adapter.mDashboardData;
@@ -506,14 +222,12 @@
         doReturn(mockTypedArray).when(mContext).obtainStyledAttributes(any(int[].class));
         doReturn(0x89000000).when(mockTypedArray).getColor(anyInt(), anyInt());
 
-        final DashboardCategory category = mock(DashboardCategory.class);
-        final List<Tile> tiles = new ArrayList<>();
+        final DashboardCategory category = new DashboardCategory();
         final Icon mockIcon = mock(Icon.class);
         final Tile tile = new Tile();
         tile.isIconTintable = true;
         tile.icon = mockIcon;
-        tiles.add(tile);
-        category.tiles = tiles;
+        category.addTile(tile);
 
         mDashboardAdapter.setCategory(category);
 
@@ -532,12 +246,10 @@
 
     @Test
     public void testBindConditionAndSuggestion_shouldSetSuggestionAdapterAndNoCrash() {
-        mDashboardAdapter = new DashboardAdapter(mContext, null, null, null, null);
+        mDashboardAdapter = new DashboardAdapter(mContext, null, null, null, null, null);
         final List<Tile> suggestions = makeSuggestions("pkg1");
-        final DashboardCategory category = mock(DashboardCategory.class);
-        final List<Tile> tiles = new ArrayList<>();
-        tiles.add(mock(Tile.class));
-        category.tiles = tiles;
+        final DashboardCategory category = new DashboardCategory();
+        category.addTile(mock(Tile.class));
 
         mDashboardAdapter.setCategoriesAndSuggestions(category, suggestions);
 
@@ -558,18 +270,42 @@
     }
 
     @Test
+    public void testBindConditionAndSuggestion_v2_shouldSetSuggestionAdapterAndNoCrash() {
+        mDashboardAdapter = new DashboardAdapter(mContext, null, null, null, null, null);
+        final List<Suggestion> suggestions = makeSuggestionsV2("pkg1");
+        final DashboardCategory category = new DashboardCategory();
+        category.addTile(mock(Tile.class));
+
+        mDashboardAdapter.setSuggestionsV2(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_shouldSetConditionAdpater() {
         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 */);
+                null /* SuggestionParser */, null /* suggestionControllerMixin */,
+                null /* SuggestionDismissController.Callback */);
 
         final List<Tile> suggestions = new ArrayList<>();
-        final DashboardCategory category = mock(DashboardCategory.class);
-        final List<Tile> tiles = new ArrayList<>();
-        tiles.add(mock(Tile.class));
-        category.tiles = tiles;
+        final DashboardCategory category = new DashboardCategory();
+        category.addTile(mock(Tile.class));
         mDashboardAdapter.setCategoriesAndSuggestions(category, suggestions);
 
         final RecyclerView data = mock(RecyclerView.class);
@@ -587,6 +323,10 @@
         verify(data).setAdapter(any(ConditionAdapter.class));
     }
 
+    /**
+     * @deprecated in favor of {@link #makeSuggestionsV2(String...)}
+     */
+    @Deprecated
     private List<Tile> makeSuggestions(String... pkgNames) {
         final List<Tile> suggestions = new ArrayList<>();
         for (String pkgName : pkgNames) {
@@ -598,6 +338,17 @@
         return suggestions;
     }
 
+    private List<Suggestion> makeSuggestionsV2(String... pkgNames) {
+        final List<Suggestion> suggestions = new ArrayList<>();
+        for (String pkgName : pkgNames) {
+            final Suggestion suggestion = new Suggestion.Builder(pkgName)
+                    .setPendingIntent(mock(PendingIntent.class))
+                    .build();
+            suggestions.add(suggestion);
+        }
+        return suggestions;
+    }
+
     private void setupSuggestions(List<Tile> suggestions) {
         mDashboardAdapter.setCategoriesAndSuggestions(null /* category */, suggestions);
         final Context context = RuntimeEnvironment.application;
@@ -605,4 +356,6 @@
                 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 cc4f741..33f379e 100644
--- a/tests/robotests/src/com/android/settings/dashboard/DashboardDataTest.java
+++ b/tests/robotests/src/com/android/settings/dashboard/DashboardDataTest.java
@@ -49,7 +49,7 @@
 import java.util.Objects;
 
 @RunWith(RobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION_O)
 public class DashboardDataTest {
     private static final String TEST_SUGGESTION_TITLE = "Use fingerprint";
     private static final String TEST_CATEGORY_TILE_TITLE = "Display";
@@ -57,13 +57,12 @@
     private DashboardData mDashboardDataWithOneConditions;
     private DashboardData mDashboardDataWithTwoConditions;
     private DashboardData mDashboardDataWithNoItems;
+    private DashboardCategory mDashboardCategory;
     @Mock
     private Tile mTestCategoryTile;
     @Mock
     private Tile mTestSuggestion;
     @Mock
-    private DashboardCategory mDashboardCategory;
-    @Mock
     private Condition mTestCondition;
     @Mock
     private Condition mSecondCondition; // condition used to test insert in DiffUtil
@@ -72,6 +71,8 @@
     public void SetUp() {
         MockitoAnnotations.initMocks(this);
 
+        mDashboardCategory = new DashboardCategory();
+
         // Build suggestions
         final List<Tile> suggestions = new ArrayList<>();
         mTestSuggestion.title = TEST_SUGGESTION_TITLE;
@@ -91,8 +92,8 @@
         // Build category
         mTestCategoryTile.title = TEST_CATEGORY_TILE_TITLE;
         mDashboardCategory.title = "test";
-        mDashboardCategory.tiles = new ArrayList<>();
-        mDashboardCategory.tiles.add(mTestCategoryTile);
+
+        mDashboardCategory.addTile(mTestCategoryTile);
 
         // Build DashboardData
         mDashboardDataWithOneConditions = new DashboardData.Builder()
diff --git a/tests/robotests/src/com/android/settings/dashboard/DashboardFeatureProviderImplTest.java b/tests/robotests/src/com/android/settings/dashboard/DashboardFeatureProviderImplTest.java
index 2791da3..3d36e6f 100644
--- a/tests/robotests/src/com/android/settings/dashboard/DashboardFeatureProviderImplTest.java
+++ b/tests/robotests/src/com/android/settings/dashboard/DashboardFeatureProviderImplTest.java
@@ -16,11 +16,25 @@
 
 package com.android.settings.dashboard;
 
+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.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 static org.robolectric.RuntimeEnvironment.application;
+import static org.robolectric.Shadows.shadowOf;
+
 import android.app.Activity;
 import android.content.ComponentName;
 import android.content.Context;
 import android.content.Intent;
-import android.content.res.Resources;
+import android.content.pm.PackageManager;
+import android.content.pm.ResolveInfo;
 import android.graphics.Bitmap;
 import android.graphics.drawable.Icon;
 import android.os.Bundle;
@@ -31,14 +45,17 @@
 import com.android.internal.logging.nano.MetricsProto;
 import com.android.settings.R;
 import com.android.settings.SettingsActivity;
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
 import com.android.settings.testutils.FakeFeatureFactory;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.shadow.ShadowThreadUtils;
+import com.android.settings.testutils.shadow.ShadowTileUtils;
 import com.android.settings.testutils.shadow.ShadowUserManager;
 import com.android.settingslib.drawer.CategoryKey;
 import com.android.settingslib.drawer.CategoryManager;
 import com.android.settingslib.drawer.DashboardCategory;
 import com.android.settingslib.drawer.Tile;
+import com.android.settingslib.drawer.TileUtils;
 
 import org.junit.Before;
 import org.junit.Test;
@@ -55,18 +72,9 @@
 
 import java.util.ArrayList;
 
-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 static org.robolectric.Shadows.shadowOf;
-
 @RunWith(SettingsRobolectricTestRunner.class)
 @Config(manifest = TestConfig.MANIFEST_PATH,
-        sdk = TestConfig.SDK_VERSION,
+        sdk = TestConfig.SDK_VERSION_O,
         shadows = ShadowUserManager.class)
 public class DashboardFeatureProviderImplTest {
 
@@ -76,21 +84,28 @@
     private UserManager mUserManager;
     @Mock
     private CategoryManager mCategoryManager;
+    @Mock
+    private PackageManager mPackageManager;
     private FakeFeatureFactory mFeatureFactory;
 
+    private Context mContext;
     private DashboardFeatureProviderImpl mImpl;
 
     @Before
     public void setUp() {
         MockitoAnnotations.initMocks(this);
+        mContext = spy(RuntimeEnvironment.application);
+        doReturn(mPackageManager).when(mContext).getPackageManager();
+        when(mPackageManager.resolveActivity(any(Intent.class), anyInt())).thenReturn(
+                new ResolveInfo());
         FakeFeatureFactory.setupForTest(mActivity);
         mFeatureFactory = (FakeFeatureFactory) FakeFeatureFactory.getFactory(mActivity);
-        mImpl = new DashboardFeatureProviderImpl(mActivity);
+        mImpl = new DashboardFeatureProviderImpl(mContext);
     }
 
     @Test
     public void shouldHoldAppContext() {
-        assertThat(mImpl.mContext).isEqualTo(mActivity.getApplicationContext());
+        assertThat(mImpl.mContext).isEqualTo(mContext.getApplicationContext());
     }
 
     @Test
@@ -135,7 +150,7 @@
 
     @Test
     public void bindPreference_noFragmentMetadata_shouldBindToProfileSelector() {
-        final Preference preference = new Preference(RuntimeEnvironment.application);
+        final Preference preference = new Preference(application);
         final Tile tile = new Tile();
         tile.metaData = new Bundle();
         tile.userHandle = new ArrayList<>();
@@ -156,7 +171,7 @@
 
     @Test
     public void bindPreference_noFragmentMetadataSingleUser_shouldBindToDirectLaunchIntent() {
-        final Preference preference = new Preference(RuntimeEnvironment.application);
+        final Preference preference = new Preference(application);
         final Tile tile = new Tile();
         tile.metaData = new Bundle();
         tile.userHandle = new ArrayList<>();
@@ -181,19 +196,19 @@
 
     @Test
     public void bindPreference_toInternalSettingActivity_shouldBindToDirectLaunchIntentAndNotLog() {
-        final Preference preference = new Preference(RuntimeEnvironment.application);
+        final Preference preference = new Preference(application);
         final Tile tile = new Tile();
         tile.metaData = new Bundle();
         tile.userHandle = new ArrayList<>();
         tile.userHandle.add(mock(UserHandle.class));
         tile.intent = new Intent();
         tile.intent.setComponent(
-                new ComponentName(RuntimeEnvironment.application.getPackageName(), "class"));
+                new ComponentName(application.getPackageName(), "class"));
 
         when(mActivity.getSystemService(Context.USER_SERVICE))
                 .thenReturn(mUserManager);
         when(mActivity.getApplicationContext().getPackageName())
-                .thenReturn(RuntimeEnvironment.application.getPackageName());
+                .thenReturn(application.getPackageName());
 
         mImpl.bindPreferenceToTile(mActivity, MetricsProto.MetricsEvent.SETTINGS_GESTURES,
                 preference, tile, "123", Preference.DEFAULT_ORDER);
@@ -208,7 +223,7 @@
 
     @Test
     public void bindPreference_withNullKeyNullPriority_shouldGenerateKeyAndPriority() {
-        final Preference preference = new Preference(RuntimeEnvironment.application);
+        final Preference preference = new Preference(application);
         final Tile tile = new Tile();
         tile.intent = new Intent();
         tile.intent.setComponent(new ComponentName("pkg", "class"));
@@ -221,7 +236,7 @@
 
     @Test
     public void bindPreference_noSummary_shouldSetSummaryToPlaceholder() {
-        final Preference preference = new Preference(RuntimeEnvironment.application);
+        final Preference preference = new Preference(application);
         final Tile tile = new Tile();
         tile.intent = new Intent();
         tile.intent.setComponent(new ComponentName("pkg", "class"));
@@ -229,12 +244,12 @@
                 preference, tile, null /*key */, Preference.DEFAULT_ORDER);
 
         assertThat(preference.getSummary())
-                .isEqualTo(RuntimeEnvironment.application.getString(R.string.summary_placeholder));
+                .isEqualTo(application.getString(R.string.summary_placeholder));
     }
 
     @Test
     public void bindPreference_hasSummary_shouldSetSummary() {
-        final Preference preference = new Preference(RuntimeEnvironment.application);
+        final Preference preference = new Preference(application);
         final Tile tile = new Tile();
         tile.summary = "test";
         tile.intent = new Intent();
@@ -246,8 +261,28 @@
     }
 
     @Test
+    @Config(shadows = {
+            ShadowTileUtils.class,
+            ShadowThreadUtils.class
+    })
+    public void bindPreference_hasSummaryUri_shouldLoadSummaryFromContentProvider() {
+        final Preference preference = new Preference(application);
+        final Tile tile = new Tile();
+        tile.intent = new Intent();
+        tile.intent.setComponent(new ComponentName("pkg", "class"));
+        tile.metaData = new Bundle();
+        tile.metaData.putString(TileUtils.META_DATA_PREFERENCE_SUMMARY_URI,
+                "content://com.android.settings/tile_summary");
+
+        mImpl.bindPreferenceToTile(mActivity, MetricsProto.MetricsEvent.VIEW_UNKNOWN,
+                preference, tile, null /*key */, Preference.DEFAULT_ORDER);
+
+        assertThat(preference.getSummary()).isEqualTo(ShadowTileUtils.MOCK_SUMMARY);
+    }
+
+    @Test
     public void bindPreference_withNullKeyTileKey_shouldUseTileKey() {
-        final Preference preference = new Preference(RuntimeEnvironment.application);
+        final Preference preference = new Preference(application);
         final Tile tile = new Tile();
         tile.key = "key";
         tile.intent = new Intent();
@@ -259,9 +294,29 @@
     }
 
     @Test
+    @Config(shadows = {
+            ShadowTileUtils.class,
+            ShadowThreadUtils.class
+    })
+    public void bindPreference_withIconUri_shouldLoadIconFromContentProvider() {
+        final Preference preference = new Preference(application);
+        final Tile tile = new Tile();
+        tile.key = "key";
+        tile.intent = new Intent();
+        tile.intent.setComponent(
+                new ComponentName(application.getPackageName(), "class"));
+        tile.metaData = new Bundle();
+        tile.metaData.putString(TileUtils.META_DATA_PREFERENCE_ICON_URI,
+                "content://com.android.settings/tile_icon");
+        mImpl.bindIcon(preference, tile);
+
+        assertThat(tile.icon).isNotNull();
+    }
+
+    @Test
     public void bindPreference_withBaseOrder_shouldOffsetPriority() {
         final int baseOrder = 100;
-        final Preference preference = new Preference(RuntimeEnvironment.application);
+        final Preference preference = new Preference(application);
         final Tile tile = new Tile();
         tile.metaData = new Bundle();
         tile.priority = 10;
@@ -272,7 +327,34 @@
     }
 
     @Test
-    public void bindPreference_withIntentActionMetatdata_shouldSetLaunchAction() {
+    public void bindPreference_withOrderMetadata_shouldUseOrderInMetadata() {
+        final Preference preference = new Preference(application);
+        final int testOrder = -30;
+        final Tile tile = new Tile();
+        tile.metaData = new Bundle();
+        tile.metaData.putInt(mImpl.META_DATA_KEY_ORDER, testOrder);
+        tile.priority = 10;
+        mImpl.bindPreferenceToTile(mActivity, MetricsProto.MetricsEvent.VIEW_UNKNOWN,
+                preference, tile, "123", Preference.DEFAULT_ORDER);
+
+        assertThat(preference.getOrder()).isEqualTo(testOrder);
+    }
+
+    @Test
+    public void bindPreference_invalidOrderMetadata_shouldIgnore() {
+        final Preference preference = new Preference(application);
+        final Tile tile = new Tile();
+        tile.metaData = new Bundle();
+        tile.metaData.putString(mImpl.META_DATA_KEY_ORDER, "hello");
+        tile.priority = 10;
+        mImpl.bindPreferenceToTile(mActivity, MetricsProto.MetricsEvent.VIEW_UNKNOWN,
+                preference, tile, "123", Preference.DEFAULT_ORDER);
+
+        assertThat(preference.getOrder()).isEqualTo(-tile.priority);
+    }
+
+    @Test
+    public void bindPreference_withIntentActionMetadata_shouldSetLaunchAction() {
         Activity activity = Robolectric.buildActivity(Activity.class).get();
         final ShadowApplication application = ShadowApplication.getInstance();
         final Preference preference = new Preference(application.getApplicationContext());
@@ -298,7 +380,7 @@
     @Test
     public void clickPreference_withUnresolvableIntent_shouldNotLaunchAnything() {
         ReflectionHelpers.setField(
-                mImpl, "mPackageManager", RuntimeEnvironment.getPackageManager());
+                mImpl, "mPackageManager", application.getPackageManager());
         Activity activity = Robolectric.buildActivity(Activity.class).get();
         final ShadowApplication application = ShadowApplication.getInstance();
         final Preference preference = new Preference(application.getApplicationContext());
@@ -349,7 +431,7 @@
         mImpl = new DashboardFeatureProviderImpl(mActivity);
         ReflectionHelpers.setField(mImpl, "mCategoryManager", mCategoryManager);
         final DashboardCategory category = new DashboardCategory();
-        category.tiles.add(new Tile());
+        category.addTile(new Tile());
         when(mCategoryManager
                 .getTilesByCategory(any(Context.class), eq(CategoryKey.CATEGORY_HOMEPAGE)))
                 .thenReturn(category);
@@ -367,14 +449,13 @@
     }
 
     @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);
+    public void testShouldTintIcon_enabledInResources_shouldBeTrue() {
         assertThat(mImpl.shouldTintIcon()).isTrue();
     }
+
+    @Test
+    @Config(qualifiers = "mcc999")
+    public void testShouldTintIcon_disabledInResources_shouldBeFalse() {
+        assertThat(mImpl.shouldTintIcon()).isFalse();
+    }
 }
diff --git a/tests/robotests/src/com/android/settings/dashboard/DashboardFragmentTest.java b/tests/robotests/src/com/android/settings/dashboard/DashboardFragmentTest.java
index ea160dd..14f3078 100644
--- a/tests/robotests/src/com/android/settings/dashboard/DashboardFragmentTest.java
+++ b/tests/robotests/src/com/android/settings/dashboard/DashboardFragmentTest.java
@@ -58,17 +58,14 @@
 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_O)
 public class DashboardFragmentTest {
 
     @Mock(answer = Answers.RETURNS_DEEP_STUBS)
     private Context mContext;
     @Mock
-    private DashboardCategory mDashboardCategory;
-    @Mock
     private FakeFeatureFactory mFakeFeatureFactory;
-    @Mock
-    private ProgressiveDisclosureMixin mDisclosureMixin;
+    private DashboardCategory mDashboardCategory;
     private TestFragment mTestFragment;
 
     @Before
@@ -76,12 +73,9 @@
         MockitoAnnotations.initMocks(this);
         FakeFeatureFactory.setupForTest(mContext);
         mFakeFeatureFactory = (FakeFeatureFactory) FeatureFactory.getFactory(mContext);
-        mDashboardCategory.tiles = new ArrayList<>();
-        mDashboardCategory.tiles.add(new Tile());
+        mDashboardCategory = new DashboardCategory();
+        mDashboardCategory.addTile(new Tile());
         mTestFragment = new TestFragment(ShadowApplication.getInstance().getApplicationContext());
-        when(mFakeFeatureFactory.dashboardFeatureProvider.getProgressiveDisclosureMixin(
-                nullable(Context.class), eq(mTestFragment), nullable(Bundle.class)))
-                .thenReturn(mDisclosureMixin);
         when(mFakeFeatureFactory.dashboardFeatureProvider
                 .getTilesForCategory(nullable(String.class)))
                 .thenReturn(mDashboardCategory);
@@ -110,8 +104,7 @@
                 .thenReturn("test_key");
         mTestFragment.onCreatePreferences(new Bundle(), "rootKey");
 
-        verify(mDisclosureMixin).addPreference(nullable(PreferenceScreen.class),
-                nullable(Preference.class));
+        verify(mTestFragment.mScreen).addPreference(nullable(Preference.class));
     }
 
     @Test
@@ -123,7 +116,7 @@
 
     @Test
     public void displayTilesAsPreference_withEmptyCategory_shouldNotAddTiles() {
-        mDashboardCategory.tiles = null;
+        mDashboardCategory.removeTile(0);
         mTestFragment.onCreatePreferences(new Bundle(), "rootKey");
 
         verify(mTestFragment.mScreen, never()).addPreference(nullable(Preference.class));
diff --git a/tests/robotests/src/com/android/settings/dashboard/DashboardItemAnimatorTest.java b/tests/robotests/src/com/android/settings/dashboard/DashboardItemAnimatorTest.java
index cda9a22..bb24435 100644
--- a/tests/robotests/src/com/android/settings/dashboard/DashboardItemAnimatorTest.java
+++ b/tests/robotests/src/com/android/settings/dashboard/DashboardItemAnimatorTest.java
@@ -31,7 +31,7 @@
 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_O)
 public class DashboardItemAnimatorTest {
 
     private DashboardItemAnimator mDashboardItemAnimator;
diff --git a/tests/robotests/src/com/android/settings/dashboard/DashboardSummaryTest.java b/tests/robotests/src/com/android/settings/dashboard/DashboardSummaryTest.java
index f3ed57c..2437565 100644
--- a/tests/robotests/src/com/android/settings/dashboard/DashboardSummaryTest.java
+++ b/tests/robotests/src/com/android/settings/dashboard/DashboardSummaryTest.java
@@ -47,7 +47,7 @@
 
 
 @RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION_O)
 public class DashboardSummaryTest {
 
     @Mock
diff --git a/tests/robotests/src/com/android/settings/dashboard/DashboardTilePlaceholderPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/dashboard/DashboardTilePlaceholderPreferenceControllerTest.java
index c48f30c..6ea3222 100644
--- a/tests/robotests/src/com/android/settings/dashboard/DashboardTilePlaceholderPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/dashboard/DashboardTilePlaceholderPreferenceControllerTest.java
@@ -37,7 +37,7 @@
 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_O)
 public class DashboardTilePlaceholderPreferenceControllerTest {
 
 
diff --git a/tests/robotests/src/com/android/settings/dashboard/ProgressiveDisclosureTest.java b/tests/robotests/src/com/android/settings/dashboard/ProgressiveDisclosureTest.java
deleted file mode 100644
index 6fe60cf..0000000
--- a/tests/robotests/src/com/android/settings/dashboard/ProgressiveDisclosureTest.java
+++ /dev/null
@@ -1,358 +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.dashboard;
-
-import android.content.Context;
-import android.support.v14.preference.PreferenceFragment;
-import android.support.v7.preference.Preference;
-import android.support.v7.preference.PreferenceManager;
-import android.support.v7.preference.PreferenceScreen;
-
-import com.android.settings.R;
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.TestConfig;
-import com.android.settings.testutils.FakeFeatureFactory;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Answers;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
-import org.robolectric.annotation.Config;
-import org.robolectric.shadows.ShadowApplication;
-import org.robolectric.util.ReflectionHelpers;
-
-import java.util.List;
-
-import static com.google.common.truth.Truth.assertThat;
-
-import static org.mockito.ArgumentMatchers.nullable;
-import static org.mockito.Matchers.any;
-import static org.mockito.Matchers.anyInt;
-import static org.mockito.Mockito.atLeastOnce;
-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 ProgressiveDisclosureTest {
-
-    @Mock(answer = Answers.RETURNS_DEEP_STUBS)
-    private Context mContext;
-    @Mock(answer = Answers.RETURNS_DEEP_STUBS)
-    private PreferenceFragment mPreferenceFragment;
-    @Mock
-    private ExpandPreference mExpandButton;
-    private PreferenceScreen mScreen;
-    private Context mAppContext;
-    private Preference mPreference;
-    private ProgressiveDisclosureMixin mMixin;
-
-    @Before
-    public void setUp() {
-        MockitoAnnotations.initMocks(this);
-        FakeFeatureFactory.setupForTest(mContext);
-        mScreen = mPreferenceFragment.getPreferenceScreen();
-        mAppContext = ShadowApplication.getInstance().getApplicationContext();
-        mMixin = new ProgressiveDisclosureMixin(mAppContext,
-                mPreferenceFragment, false /* keepExpanded */);
-        ReflectionHelpers.setField(mMixin, "mExpandButton", mExpandButton);
-        mPreference = new Preference(mAppContext);
-        mPreference.setKey("test");
-    }
-
-    @Test
-    public void shouldNotCollapse_lessPreferenceThanLimit() {
-        when(mScreen.getPreferenceCount()).thenReturn(5);
-
-        mMixin.setTileLimit(10);
-
-        assertThat(mMixin.shouldCollapse(mScreen)).isFalse();
-    }
-
-    @Test
-    public void shouldNotCollapse_preferenceCountSameAsThreshold() {
-        when(mScreen.getPreferenceCount()).thenReturn(5);
-
-        mMixin.setTileLimit(5);
-
-        assertThat(mMixin.shouldCollapse(mScreen)).isFalse();
-    }
-
-    @Test
-    public void shouldNotCollapse_whenStartAsExpanded() {
-        when(mScreen.getPreferenceCount()).thenReturn(5);
-
-        mMixin = new ProgressiveDisclosureMixin(mAppContext,
-                mPreferenceFragment, true /* keepExpanded */);
-        mMixin.setTileLimit(10);
-
-        assertThat(mMixin.shouldCollapse(mScreen)).isFalse();
-    }
-
-    @Test
-    public void shouldCollapse_morePreferenceThanLimit() {
-        when(mScreen.getPreferenceCount()).thenReturn(5);
-        mMixin.setTileLimit(3);
-
-        assertThat(mMixin.shouldCollapse(mScreen)).isTrue();
-    }
-
-    @Test
-    public void findPreference_prefInCollapsedList_shouldFindIt() {
-        when(mScreen.findPreference(nullable(String.class))).thenReturn(null);
-        mMixin.addToCollapsedList(mPreference);
-
-        Preference pref = mMixin.findPreference(mScreen, mPreference.getKey());
-
-        assertThat(pref).isNotNull();
-        assertThat(pref).isSameAs(mPreference);
-    }
-
-    @Test
-    public void findPreference_prefOnScreen_shouldFindIt() {
-        when(mScreen.findPreference(mPreference.getKey())).thenReturn(mPreference);
-
-        Preference pref = mMixin.findPreference(mScreen, mPreference.getKey());
-
-        assertThat(pref).isNotNull();
-        assertThat(pref).isSameAs(mPreference);
-    }
-
-    @Test
-    public void findPreference_prefNotInCollapsedListOrScreen_shouldNotFindIt() {
-        when(mScreen.findPreference(nullable(String.class))).thenReturn(null);
-        Preference pref = mMixin.findPreference(mScreen, mPreference.getKey());
-
-        assertThat(pref).isNull();
-    }
-
-    @Test
-    public void findPreference_prefRemovedFromCollapsedList_shouldNotFindIt() {
-        when(mScreen.findPreference(nullable(String.class))).thenReturn(null);
-        mMixin.addToCollapsedList(mPreference);
-        mMixin.removePreference(mPreferenceFragment.getPreferenceScreen(), mPreference.getKey());
-
-        Preference pref = mMixin.findPreference(mScreen, mPreference.getKey());
-
-        assertThat(pref).isNull();
-    }
-
-    @Test
-    public void findPreference_nestedPrefInCollapsedList_shouldFindIt() {
-        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);
-        when(preference.getKey()).thenReturn("TestKey");
-        prefGroup.addPreference(preference);
-        mMixin.addToCollapsedList(prefGroup);
-
-        Preference pref = mMixin.findPreference(mScreen, "TestKey");
-
-        assertThat(pref).isNotNull();
-        assertThat(pref).isSameAs(preference);
-    }
-
-    @Test
-    public void removePreference_shouldRemoveOnScreenPreference() {
-        when(mScreen.findPreference(mPreference.getKey())).thenReturn(mPreference);
-
-        mMixin.removePreference(mScreen, mPreference.getKey());
-
-        verify(mScreen).removePreference(mPreference);
-    }
-
-    @Test
-    public void removeLastPreference_shouldRemoveExpandButtonToo() {
-        when(mScreen.findPreference(nullable(String.class))).thenReturn(null);
-        mMixin.addToCollapsedList(mPreference);
-        // Collapsed
-        assertThat(mMixin.isCollapsed()).isTrue();
-
-        mMixin.removePreference(mScreen, mPreference.getKey());
-
-        // Removing expand button
-        verify(mScreen).removePreference(any(Preference.class));
-        // No longer collapsed
-        assertThat(mMixin.isCollapsed()).isFalse();
-    }
-
-    @Test
-    public void collapse_shouldDoNothingIfNotCollapsible() {
-        final PreferenceScreen screen = mPreferenceFragment.getPreferenceScreen();
-        when(screen.getPreferenceCount()).thenReturn(5);
-        mMixin.setTileLimit(15);
-
-        mMixin.collapse(screen);
-        assertThat(mMixin.isCollapsed()).isFalse();
-        verify(mExpandButton, never()).setSummary(nullable(String.class));
-        verify(screen, never()).addPreference(any(Preference.class));
-        verify(screen, never()).removePreference(any(Preference.class));
-    }
-
-    @Test
-    public void collapse_shouldRemovePrefAndAddExpandButton() {
-        final PreferenceScreen screen = mPreferenceFragment.getPreferenceScreen();
-        when(screen.getPreferenceCount()).thenReturn(5);
-        when(screen.getPreference(anyInt())).thenReturn(mPreference);
-        mMixin.setTileLimit(2);
-
-        mMixin.collapse(screen);
-
-        assertThat(mMixin.isCollapsed()).isTrue();
-        verify(mExpandButton, atLeastOnce()).setSummary(nullable(String.class));
-        verify(screen).addPreference(any(ExpandPreference.class));
-        verify(screen, times(3)).removePreference(any(Preference.class));
-    }
-
-    @Test
-    public void addToCollapsedList_shouldAddInOrder() {
-        final Preference pref1 = new Preference(mAppContext);
-        final Preference pref2 = new Preference(mAppContext);
-        pref1.setOrder(10);
-        pref2.setOrder(20);
-
-        // Pref1 has lower order than pref2, but add pref2 first. The collapsed list should maintain
-        // items in increasing order.
-        mMixin.addToCollapsedList(pref2);
-        mMixin.addToCollapsedList(pref1);
-
-        List<Preference> collapsedList = mMixin.getCollapsedPrefs();
-        assertThat(collapsedList.get(0)).isSameAs(pref1);
-        assertThat(collapsedList.get(1)).isSameAs(pref2);
-    }
-
-    @Test
-    public void addPreferenceWhenCollapsed_noPrefOnScreen_shouldAddToList() {
-        // Add something to collapsed list so we are in collapsed state.
-        mMixin.addToCollapsedList(new Preference(mAppContext));
-        assertThat(mMixin.getCollapsedPrefs().size()).isEqualTo(1);
-
-        // Just 1 preference on screen: the more button
-        when(mScreen.getPreferenceCount()).thenReturn(1);
-        final Preference toBeAdded = new Preference(mAppContext);
-        toBeAdded.setOrder(100);
-        mMixin.addPreference(mScreen, toBeAdded);
-
-        // Should have 2 prefs in collapsed list now
-        assertThat(mMixin.getCollapsedPrefs().size()).isEqualTo(2);
-        assertThat(mMixin.getCollapsedPrefs().get(0)).isSameAs(toBeAdded);
-    }
-
-    @Test
-    public void addPreferenceWhenCollapsed_prefOrderLessThanLastOnScreen_shouldAddToScreen() {
-        final Preference lastPref = new Preference(mAppContext);
-        lastPref.setOrder(100);
-        // Add something to collapsed list so we are in collapsed state.
-        mMixin.addToCollapsedList(new Preference(mAppContext));
-        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.
-        when(mScreen.getPreferenceCount()).thenReturn(3);
-        when(mScreen.getPreference(1)).thenReturn(lastPref);
-
-        final Preference toBeAdded = new Preference(mAppContext);
-        toBeAdded.setOrder(50);
-        mMixin.addPreference(mScreen, toBeAdded);
-
-        verify(mScreen).removePreference(lastPref);
-        verify(mScreen).addPreference(toBeAdded);
-        assertThat(mMixin.getCollapsedPrefs().get(0)).isSameAs(lastPref);
-    }
-
-    @Test
-    public void addPreferenceWhenCollapsed_prefOrderMoreThanLastOnScreen_shouldAddToList() {
-        final Preference lastPref = new Preference(mAppContext);
-        lastPref.setOrder(100);
-        // Add something to collapsed list so we are in collapsed state.
-        mMixin.addToCollapsedList(new Preference(mAppContext));
-        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.
-        when(mScreen.getPreferenceCount()).thenReturn(3);
-        when(mScreen.getPreference(1)).thenReturn(lastPref);
-
-        final Preference toBeAdded = new Preference(mAppContext);
-        toBeAdded.setOrder(200);
-        mMixin.addPreference(mScreen, toBeAdded);
-
-        verify(mScreen, never()).removePreference(any(Preference.class));
-        verify(mScreen, never()).addPreference(any(Preference.class));
-        verify(mExpandButton, times(2)).setSummary(nullable(String.class));
-        assertThat(mMixin.getCollapsedPrefs().get(0)).isSameAs(toBeAdded);
-    }
-
-    @Test
-    public void updateExpandSummary_noPref_noSummary() {
-        mMixin.updateExpandButtonSummary();
-
-        verify(mExpandButton).setSummary(null);
-    }
-
-    @Test
-    public void updateExpandSummary_doNotIncludeEmptyPrefTitle() {
-        final Preference pref1 = new Preference(mAppContext);
-        pref1.setTitle("1");
-        final Preference pref2 = new Preference(mAppContext);
-        pref2.setTitle(null);
-        final Preference pref3 = new Preference(mAppContext);
-        pref3.setTitle("3");
-        final Preference pref4 = new Preference(mAppContext);
-        pref4.setTitle("");
-
-        mMixin.addToCollapsedList(pref1);
-        mMixin.addToCollapsedList(pref2);
-        mMixin.addToCollapsedList(pref3);
-        mMixin.addToCollapsedList(pref4);
-
-        verify(mExpandButton).setSummary("1, 3");
-    }
-
-    @Test
-    public void updateExapndSummary_singlePref_expandSummarySameAsPrefTitle() {
-        final String TEST = "test";
-        final Preference pref = new Preference(mAppContext);
-        pref.setTitle(TEST);
-
-        mMixin.addToCollapsedList(pref);
-        verify(mExpandButton).setSummary(TEST);
-    }
-
-    @Test
-    public void updateExapndSummary_multiPrefs_useCombinedPrefTitleAsSummary() {
-        final String TEST1 = "test1";
-        final String TEST2 = "test2";
-        final Preference pref1 = new Preference(mAppContext);
-        pref1.setTitle(TEST1);
-        final Preference pref2 = new Preference(mAppContext);
-        pref2.setTitle(TEST2);
-
-        mMixin.addToCollapsedList(pref1);
-        mMixin.addToCollapsedList(pref2);
-
-        verify(mExpandButton)
-                .setSummary(mAppContext.getString(R.string.join_many_items_middle, TEST1, TEST2));
-    }
-}
diff --git a/tests/robotests/src/com/android/settings/dashboard/SummaryLoaderTest.java b/tests/robotests/src/com/android/settings/dashboard/SummaryLoaderTest.java
index 146be9c..92ed7b4 100644
--- a/tests/robotests/src/com/android/settings/dashboard/SummaryLoaderTest.java
+++ b/tests/robotests/src/com/android/settings/dashboard/SummaryLoaderTest.java
@@ -16,6 +16,10 @@
 
 package com.android.settings.dashboard;
 
+import static com.google.common.truth.Truth.assertThat;
+import static org.mockito.Mockito.verifyZeroInteractions;
+import static org.mockito.Mockito.when;
+
 import android.app.Activity;
 import android.content.Context;
 import android.content.Intent;
@@ -23,6 +27,7 @@
 import com.android.settings.TestConfig;
 import com.android.settings.testutils.FakeFeatureFactory;
 import com.android.settings.testutils.SettingsRobolectricTestRunner;
+import com.android.settingslib.drawer.CategoryKey;
 import com.android.settingslib.drawer.DashboardCategory;
 import com.android.settingslib.drawer.Tile;
 
@@ -35,14 +40,8 @@
 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;
-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_O)
 public class SummaryLoaderTest {
 
     private static final String SUMMARY_1 = "summary1";
@@ -65,14 +64,14 @@
         mCallbackInvoked = false;
 
         final Activity activity = Robolectric.buildActivity(Activity.class).get();
-        final List<DashboardCategory> categories = new ArrayList<>();
-        mSummaryLoader = new SummaryLoader(activity, categories);
-        mSummaryLoader.setSummaryConsumer(new SummaryLoader.SummaryConsumer() {
-            @Override
-            public void notifySummaryChanged(Tile tile) {
-                mCallbackInvoked = true;
-            }
-        });
+
+        mSummaryLoader = new SummaryLoader(activity, CategoryKey.CATEGORY_HOMEPAGE);
+        mSummaryLoader.setSummaryConsumer(tile -> mCallbackInvoked = true);
+    }
+
+    @Test
+    public void newInstance_shouldNotLoadCategory() {
+        verifyZeroInteractions(mFeatureFactory.dashboardFeatureProvider);
     }
 
     @Test
diff --git a/tests/robotests/src/com/android/settings/dashboard/SupportItemAdapterTest.java b/tests/robotests/src/com/android/settings/dashboard/SupportItemAdapterTest.java
index 3dd5266..52c8fbb 100644
--- a/tests/robotests/src/com/android/settings/dashboard/SupportItemAdapterTest.java
+++ b/tests/robotests/src/com/android/settings/dashboard/SupportItemAdapterTest.java
@@ -49,7 +49,7 @@
 import static org.robolectric.Shadows.shadowOf;
 
 @RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION_O)
 public class SupportItemAdapterTest {
     private static final String ACCOUNT_TYPE = "com.google";
     private final Account USER_1 = new Account("user1", ACCOUNT_TYPE);
diff --git a/tests/robotests/src/com/android/settings/dashboard/conditional/ConditionAdapterTest.java b/tests/robotests/src/com/android/settings/dashboard/conditional/ConditionAdapterTest.java
index d943fe3..03165c6 100644
--- a/tests/robotests/src/com/android/settings/dashboard/conditional/ConditionAdapterTest.java
+++ b/tests/robotests/src/com/android/settings/dashboard/conditional/ConditionAdapterTest.java
@@ -43,7 +43,7 @@
 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_O)
 public class ConditionAdapterTest {
     @Mock
     private Condition mCondition1;
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 d077e6f..623f762 100644
--- a/tests/robotests/src/com/android/settings/dashboard/conditional/ConditionTest.java
+++ b/tests/robotests/src/com/android/settings/dashboard/conditional/ConditionTest.java
@@ -41,7 +41,7 @@
 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_O)
 public class ConditionTest {
 
     @Mock
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 e46ae9e..aa81a1c 100644
--- a/tests/robotests/src/com/android/settings/dashboard/conditional/DndConditionTest.java
+++ b/tests/robotests/src/com/android/settings/dashboard/conditional/DndConditionTest.java
@@ -35,7 +35,7 @@
 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_O)
 public class DndConditionTest {
 
     @Mock
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 114ee2b..9598c1e 100644
--- a/tests/robotests/src/com/android/settings/dashboard/suggestions/EventStoreTest.java
+++ b/tests/robotests/src/com/android/settings/dashboard/suggestions/EventStoreTest.java
@@ -29,7 +29,7 @@
 import org.robolectric.RuntimeEnvironment;
 
 @RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION_O)
 public class EventStoreTest {
 
     private EventStore mEventStore;
diff --git a/tests/robotests/src/com/android/settings/dashboard/suggestions/ShadowSuggestionController.java b/tests/robotests/src/com/android/settings/dashboard/suggestions/ShadowSuggestionController.java
new file mode 100644
index 0000000..b720f83
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/dashboard/suggestions/ShadowSuggestionController.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.dashboard.suggestions;
+
+import android.service.settings.suggestions.Suggestion;
+
+import org.robolectric.annotation.Implementation;
+import org.robolectric.annotation.Implements;
+
+import java.util.List;
+
+@Implements(SuggestionController.class)
+public class ShadowSuggestionController {
+
+    public static boolean sStartCalled;
+    public static boolean sStopCalled;
+    public static boolean sGetSuggestionCalled;
+
+    public static List<Suggestion> sSuggestions;
+
+    public static void reset() {
+        sStartCalled = false;
+        sStopCalled = false;
+        sGetSuggestionCalled = false;
+        sSuggestions = null;
+    }
+
+    @Implementation
+    public void start() {
+        sStartCalled = true;
+    }
+
+    @Implementation
+    public void stop() {
+        sStopCalled = true;
+    }
+
+    public static void setSuggestion(List<Suggestion> suggestions) {
+        sSuggestions = suggestions;
+    }
+
+    @Implementation
+    public List<Suggestion> getSuggestions() {
+        sGetSuggestionCalled = true;
+        return sSuggestions;
+    }
+}
diff --git a/tests/robotests/src/com/android/settings/dashboard/suggestions/SuggestionAdapterTest.java b/tests/robotests/src/com/android/settings/dashboard/suggestions/SuggestionAdapterTest.java
index bd3650b..b052527 100644
--- a/tests/robotests/src/com/android/settings/dashboard/suggestions/SuggestionAdapterTest.java
+++ b/tests/robotests/src/com/android/settings/dashboard/suggestions/SuggestionAdapterTest.java
@@ -15,13 +15,23 @@
  */
 package com.android.settings.dashboard.suggestions;
 
+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.verify;
+
+import android.app.PendingIntent;
 import android.content.ComponentName;
 import android.content.Context;
 import android.content.Intent;
 import android.graphics.drawable.Icon;
+import android.service.settings.suggestions.Suggestion;
+import android.view.ContextThemeWrapper;
 import android.view.LayoutInflater;
 import android.view.View;
-import android.view.ContextThemeWrapper;
 import android.view.ViewGroup;
 import android.widget.Button;
 import android.widget.FrameLayout;
@@ -29,17 +39,15 @@
 import android.widget.RemoteViews;
 import android.widget.TextView;
 
+import com.android.internal.logging.nano.MetricsProto;
 import com.android.settings.R;
 import com.android.settings.SettingsActivity;
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
 import com.android.settings.dashboard.DashboardAdapter;
 import com.android.settings.testutils.FakeFeatureFactory;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 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;
@@ -50,70 +58,116 @@
 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;
+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_O)
 public class SuggestionAdapterTest {
-    @Mock
-    private Tile mSuggestion1;
-    @Mock
-    private Tile mSuggestion2;
+
     @Mock(answer = Answers.RETURNS_DEEP_STUBS)
     private SettingsActivity mActivity;
-
+    @Mock
+    private SuggestionControllerMixin mSuggestionControllerMixin;
+    private FakeFeatureFactory mFeatureFactory;
     private Context mContext;
     private SuggestionAdapter mSuggestionAdapter;
     private DashboardAdapter.DashboardItemHolder mSuggestionHolder;
     private List<Tile> mOneSuggestion;
     private List<Tile> mTwoSuggestions;
+    private List<Suggestion> mOneSuggestionV2;
+    private List<Suggestion> mTwoSuggestionsV2;
 
     @Before
     public void setUp() {
         MockitoAnnotations.initMocks(this);
         mContext = RuntimeEnvironment.application;
-        FakeFeatureFactory.setupForTest(mActivity);
+        mFeatureFactory = FakeFeatureFactory.setupForTest(mActivity);
 
-        mSuggestion1.title = "Test Suggestion 1";
-        mSuggestion1.icon = mock(Icon.class);
-        mSuggestion2.title = "Test Suggestion 2";
-        mSuggestion2.icon = mock(Icon.class);
+        final Tile suggestion1 = new Tile();
+        final Tile suggestion2 = new Tile();
+        final Suggestion suggestion1V2 = new Suggestion.Builder("id1")
+                .setTitle("Test suggestion 1")
+                .build();
+        final Suggestion suggestion2V2 = new Suggestion.Builder("id2")
+                .setTitle("Test suggestion 2")
+                .build();
+        suggestion1.title = "Test Suggestion 1";
+        suggestion1.icon = mock(Icon.class);
+        suggestion2.title = "Test Suggestion 2";
+        suggestion2.icon = mock(Icon.class);
         mOneSuggestion = new ArrayList<>();
-        mOneSuggestion.add(mSuggestion1);
+        mOneSuggestion.add(suggestion1);
         mTwoSuggestions = new ArrayList<>();
-        mTwoSuggestions.add(mSuggestion1);
-        mTwoSuggestions.add(mSuggestion2);
+        mTwoSuggestions.add(suggestion1);
+        mTwoSuggestions.add(suggestion2);
+        mOneSuggestionV2 = new ArrayList<>();
+        mOneSuggestionV2.add(suggestion1V2);
+        mTwoSuggestionsV2 = new ArrayList<>();
+        mTwoSuggestionsV2.add(suggestion1V2);
+        mTwoSuggestionsV2.add(suggestion2V2);
     }
 
     @Test
     public void getItemCount_shouldReturnListSize() {
-        mSuggestionAdapter = new SuggestionAdapter(mContext, mOneSuggestion, new ArrayList<>());
+        mSuggestionAdapter = new SuggestionAdapter(mContext, mSuggestionControllerMixin,
+                mOneSuggestion, null /* suggestionV2 */, new ArrayList<>());
         assertThat(mSuggestionAdapter.getItemCount()).isEqualTo(1);
 
-        mSuggestionAdapter = new SuggestionAdapter(mContext, mTwoSuggestions, new ArrayList<>());
+        mSuggestionAdapter = new SuggestionAdapter(mContext, mSuggestionControllerMixin,
+                mTwoSuggestions, null /* suggestionV2 */, new ArrayList<>());
+        assertThat(mSuggestionAdapter.getItemCount()).isEqualTo(2);
+    }
+
+    @Test
+    public void getItemCount_v2_shouldReturnListSize() {
+        mSuggestionAdapter = new SuggestionAdapter(mContext, mSuggestionControllerMixin,
+                null /* suggestions */, mOneSuggestionV2, new ArrayList<>());
+        assertThat(mSuggestionAdapter.getItemCount()).isEqualTo(1);
+
+        mSuggestionAdapter = new SuggestionAdapter(mContext, mSuggestionControllerMixin,
+                null /* suggestions */, mTwoSuggestionsV2, new ArrayList<>());
         assertThat(mSuggestionAdapter.getItemCount()).isEqualTo(2);
     }
 
     @Test
     public void getItemViewType_shouldReturnSuggestionTile() {
-        mSuggestionAdapter = new SuggestionAdapter(mContext, mOneSuggestion, new ArrayList<>());
+        mSuggestionAdapter = new SuggestionAdapter(mContext, mSuggestionControllerMixin,
+                mOneSuggestion, null /* suggestionV2 */, new ArrayList<>());
         assertThat(mSuggestionAdapter.getItemViewType(0))
-            .isEqualTo(R.layout.suggestion_tile);
+                .isEqualTo(R.layout.suggestion_tile);
+    }
+
+    @Test
+    public void getItemViewType_v2_shouldReturnSuggestionTile() {
+        mSuggestionAdapter = new SuggestionAdapter(mContext, mSuggestionControllerMixin,
+                null /* suggestions */, mOneSuggestionV2, new ArrayList<>());
+        assertThat(mSuggestionAdapter.getItemViewType(0))
+                .isEqualTo(R.layout.suggestion_tile);
+    }
+
+    @Test
+    public void getItemType_hasButton_shouldReturnSuggestionWithButton() {
+        final List<Suggestion> suggestions = new ArrayList<>();
+        suggestions.add(new Suggestion.Builder("id")
+                .setFlags(Suggestion.FLAG_HAS_BUTTON)
+                .setTitle("123")
+                .setSummary("456")
+                .build());
+        mSuggestionAdapter = new SuggestionAdapter(mContext, mSuggestionControllerMixin,
+                null /* suggestions */, suggestions, new ArrayList<>());
+
+        assertThat(mSuggestionAdapter.getItemViewType(0))
+                .isEqualTo(R.layout.suggestion_tile_with_button);
     }
 
     @Test
     public void onBindViewHolder_shouldSetListener() {
         final View view = spy(LayoutInflater.from(mContext).inflate(
-            R.layout.suggestion_tile, new LinearLayout(mContext), true));
+                R.layout.suggestion_tile, new LinearLayout(mContext), true));
         mSuggestionHolder = new DashboardAdapter.DashboardItemHolder(view);
-        mSuggestionAdapter = new SuggestionAdapter(mContext, mOneSuggestion, new ArrayList<>());
+        mSuggestionAdapter = new SuggestionAdapter(mContext, mSuggestionControllerMixin,
+                mOneSuggestion, null /* suggestionV2 */, new ArrayList<>());
 
         mSuggestionAdapter.onBindViewHolder(mSuggestionHolder, 0);
 
@@ -121,13 +175,31 @@
     }
 
     @Test
+    public void onBindViewHolder_shouldLog() {
+        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, mSuggestionControllerMixin,
+                null /* suggestionV1*/, mOneSuggestionV2, new ArrayList<>());
+
+        // Bind twice
+        mSuggestionAdapter.onBindViewHolder(mSuggestionHolder, 0);
+        mSuggestionAdapter.onBindViewHolder(mSuggestionHolder, 0);
+
+        // Log once
+        verify(mFeatureFactory.metricsFeatureProvider).action(
+                mContext, MetricsProto.MetricsEvent.ACTION_SHOW_SETTINGS_SUGGESTION,
+                mOneSuggestionV2.get(0).getId());
+    }
+
+    @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);
+        setupSuggestions(mActivity, packages, null);
 
         mSuggestionAdapter.onBindViewHolder(mSuggestionHolder, 0);
 
@@ -150,7 +222,7 @@
         layout.addView(primary);
         doReturn(layout).when(remoteViews).apply(any(Context.class), any(ViewGroup.class));
         packages.get(0).remoteViews = remoteViews;
-        setupSuggestions(mActivity, packages);
+        setupSuggestions(mActivity, packages, null /* suggestionV2 */);
 
         mSuggestionAdapter.onBindViewHolder(mSuggestionHolder, 0);
         mSuggestionHolder.itemView.performClick();
@@ -164,6 +236,19 @@
     }
 
     @Test
+    public void onBindViewHolder_v2_itemViewShouldHandleClick()
+            throws PendingIntent.CanceledException {
+        final List<Suggestion> suggestions = makeSuggestionsV2("pkg1");
+        setupSuggestions(mActivity, null /* suggestionV1 */, suggestions);
+
+        mSuggestionAdapter.onBindViewHolder(mSuggestionHolder, 0);
+        mSuggestionHolder.itemView.performClick();
+
+        verify(mSuggestionControllerMixin).launchSuggestion(suggestions.get(0));
+        verify(suggestions.get(0).getPendingIntent()).send();
+    }
+
+    @Test
     public void onBindViewHolder_viewsShouldClearOnRebind() {
         Context context =
                 new ContextThemeWrapper(RuntimeEnvironment.application, R.style.Theme_Settings);
@@ -176,7 +261,7 @@
         layout.addView(primary);
         doReturn(layout).when(remoteViews).apply(any(Context.class), any(ViewGroup.class));
         packages.get(0).remoteViews = remoteViews;
-        setupSuggestions(mActivity, packages);
+        setupSuggestions(mActivity, packages, null /* suggestionV2 */);
 
         mSuggestionAdapter.onBindViewHolder(mSuggestionHolder, 0);
         mSuggestionAdapter.onBindViewHolder(mSuggestionHolder, 0);
@@ -185,8 +270,26 @@
         assertThat(itemView.getChildCount()).isEqualTo(1);
     }
 
-    private void setupSuggestions(Context context, List<Tile> suggestions) {
-        mSuggestionAdapter = new SuggestionAdapter(context, suggestions, new ArrayList<>());
+    @Test
+    public void getSuggestionsV2_shouldReturnSuggestionWhenMatch() {
+        final List<Suggestion> suggestionsV2 = makeSuggestionsV2("pkg1");
+        setupSuggestions(mActivity, null /* suggestionV1 */, suggestionsV2);
+
+        assertThat(mSuggestionAdapter.getSuggestion(0)).isNull();
+        assertThat(mSuggestionAdapter.getSuggestionsV2(0)).isNotNull();
+
+        List<Tile> suggestionsV1 = makeSuggestions("pkg1");
+        setupSuggestions(mActivity, suggestionsV1, null /* suggestionV2 */);
+
+        assertThat(mSuggestionAdapter.getSuggestionsV2(0)).isNull();
+        assertThat(mSuggestionAdapter.getSuggestion(0)).isNotNull();
+
+    }
+
+    private void setupSuggestions(Context context, List<Tile> suggestions,
+            List<Suggestion> suggestionsV2) {
+        mSuggestionAdapter = new SuggestionAdapter(context, mSuggestionControllerMixin,
+                suggestions, suggestionsV2, new ArrayList<>());
         mSuggestionHolder = mSuggestionAdapter.onCreateViewHolder(
                 new FrameLayout(RuntimeEnvironment.application),
                 mSuggestionAdapter.getItemViewType(0));
@@ -204,4 +307,14 @@
         return suggestions;
     }
 
+    private List<Suggestion> makeSuggestionsV2(String... pkgNames) {
+        final List<Suggestion> suggestions = new ArrayList<>();
+        for (String pkgName : pkgNames) {
+            final Suggestion suggestion = new Suggestion.Builder(pkgName)
+                    .setPendingIntent(mock(PendingIntent.class))
+                    .build();
+            suggestions.add(suggestion);
+        }
+        return suggestions;
+    }
 }
diff --git a/tests/robotests/src/com/android/settings/dashboard/suggestions/SuggestionControllerMixinTest.java b/tests/robotests/src/com/android/settings/dashboard/suggestions/SuggestionControllerMixinTest.java
new file mode 100644
index 0000000..ad97e18
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/dashboard/suggestions/SuggestionControllerMixinTest.java
@@ -0,0 +1,114 @@
+/*
+ * Copyright (C) 2017 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.dashboard.suggestions;
+
+import static android.arch.lifecycle.Lifecycle.Event.ON_START;
+import static android.arch.lifecycle.Lifecycle.Event.ON_STOP;
+
+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.app.LoaderManager;
+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.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.annotation.Config;
+
+@RunWith(SettingsRobolectricTestRunner.class)
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION_O,
+        shadows = {
+                ShadowSuggestionController.class
+        })
+public class SuggestionControllerMixinTest {
+
+    @Mock(answer = Answers.RETURNS_DEEP_STUBS)
+    private Context mContext;
+    @Mock
+    private SuggestionControllerMixin.SuggestionControllerHost mHost;
+    private Lifecycle mLifecycle;
+    private SuggestionControllerMixin mMixin;
+
+    @Before
+    public void setUp() {
+        MockitoAnnotations.initMocks(this);
+        FakeFeatureFactory.setupForTest(mContext);
+        mLifecycle = new Lifecycle(() -> mLifecycle);
+        when(mContext.getApplicationContext()).thenReturn(mContext);
+    }
+
+    @After
+    public void tearDown() {
+        ShadowSuggestionController.reset();
+    }
+
+    @Test
+    public void goThroughLifecycle_onStartStop_shouldStartStopController() {
+        mMixin = new SuggestionControllerMixin(mContext, mHost, mLifecycle);
+
+        mLifecycle.handleLifecycleEvent(ON_START);
+        assertThat(ShadowSuggestionController.sStartCalled).isTrue();
+
+        mLifecycle.handleLifecycleEvent(ON_STOP);
+        assertThat(ShadowSuggestionController.sStopCalled).isTrue();
+    }
+
+    @Test
+    public void onServiceConnected_shouldGetSuggestion() {
+        final LoaderManager loaderManager = mock(LoaderManager.class);
+        when(mHost.getLoaderManager()).thenReturn(loaderManager);
+
+        mMixin = new SuggestionControllerMixin(mContext, mHost, mLifecycle);
+        mMixin.onServiceConnected();
+
+        verify(loaderManager).restartLoader(SuggestionLoader.LOADER_ID_SUGGESTIONS,
+                null /* args */, mMixin /* callback */);
+    }
+
+    @Test
+    public void onServiceConnected_hostNotAttached_shouldDoNothing() {
+        when(mHost.getLoaderManager()).thenReturn(null);
+
+        mMixin = new SuggestionControllerMixin(mContext, mHost, mLifecycle);
+        mMixin.onServiceConnected();
+
+        verify(mHost).getLoaderManager();
+    }
+
+    @Test
+    public void onServiceDisconnected_hostNotAttached_shouldDoNothing() {
+        when(mHost.getLoaderManager()).thenReturn(null);
+
+        mMixin = new SuggestionControllerMixin(mContext, mHost, mLifecycle);
+        mMixin.onServiceDisconnected();
+
+        verify(mHost).getLoaderManager();
+    }
+}
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 ca9faf5..c94f200 100644
--- a/tests/robotests/src/com/android/settings/dashboard/suggestions/SuggestionDismissControllerTest.java
+++ b/tests/robotests/src/com/android/settings/dashboard/suggestions/SuggestionDismissControllerTest.java
@@ -26,6 +26,7 @@
 import static org.mockito.Mockito.when;
 
 import android.content.Context;
+import android.service.settings.suggestions.Suggestion;
 import android.support.v7.widget.RecyclerView;
 import android.support.v7.widget.helper.ItemTouchHelper;
 
@@ -45,7 +46,7 @@
 import org.robolectric.annotation.Config;
 
 @RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION_O)
 public class SuggestionDismissControllerTest {
 
     @Mock(answer = Answers.RETURNS_DEEP_STUBS)
@@ -55,6 +56,8 @@
     @Mock
     private SuggestionParser mSuggestionParser;
     @Mock
+    private SuggestionControllerMixin mSuggestionControllerMixin;
+    @Mock
     private SuggestionDismissController.Callback mCallback;
 
     private FakeFeatureFactory mFactory;
@@ -69,7 +72,7 @@
         when(mRecyclerView.getResources().getDimension(anyInt())).thenReturn(50F);
 
         mController = new SuggestionDismissController(mContext, mRecyclerView,
-                mSuggestionParser, mCallback);
+                mSuggestionControllerMixin, mSuggestionParser, mCallback);
     }
 
     @Test
@@ -89,7 +92,7 @@
     @Test
     public void getSwipeDirs_isSuggestionTileCard_shouldReturnDirection() {
         final RecyclerView.ViewHolder vh = mock(RecyclerView.ViewHolder.class);
-        when(vh.getItemViewType()).thenReturn(R.layout.suggestion_tile_remote_container);
+        when(vh.getItemViewType()).thenReturn(R.layout.suggestion_tile_with_button);
 
         assertThat(mController.getSwipeDirs(mRecyclerView, vh))
                 .isEqualTo(ItemTouchHelper.START | ItemTouchHelper.END);
@@ -114,4 +117,17 @@
                 eq(mContext), eq(mSuggestionParser), nullable(Tile.class));
         verify(mCallback).onSuggestionDismissed(nullable(Tile.class));
     }
+
+    @Test
+    public void onSwiped_v2_shouldTriggerDismissSuggestion() {
+        final RecyclerView.ViewHolder vh = mock(RecyclerView.ViewHolder.class);
+        when(mCallback.getSuggestionAt(anyInt())).thenReturn(
+                new Suggestion.Builder("id").build());
+
+        mController.onSwiped(vh, ItemTouchHelper.START);
+
+        verify(mFactory.suggestionsFeatureProvider).dismissSuggestion(
+                eq(mContext), eq(mSuggestionControllerMixin), nullable(Suggestion.class));
+        verify(mCallback).onSuggestionDismissed(nullable(Suggestion.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 82bef2d..b74453c 100644
--- a/tests/robotests/src/com/android/settings/dashboard/suggestions/SuggestionFeatureProviderImplTest.java
+++ b/tests/robotests/src/com/android/settings/dashboard/suggestions/SuggestionFeatureProviderImplTest.java
@@ -19,10 +19,10 @@
 
 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.never;
+import static org.mockito.Mockito.spy;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.verifyZeroInteractions;
 import static org.mockito.Mockito.when;
@@ -31,34 +31,27 @@
 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 android.provider.Settings.Secure;
+import android.service.settings.suggestions.Suggestion;
+import android.util.FeatureFlagUtils;
 import android.util.Pair;
 
-import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
 import com.android.internal.logging.nano.MetricsProto;
-import com.android.settings.R;
-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.internal.logging.nano.MetricsProto.MetricsEvent;
 import com.android.settings.Settings.NightDisplaySuggestionActivity;
-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.core.FeatureFlags;
 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.SettingsShadowSystemProperties;
 import com.android.settings.testutils.shadow.ShadowSecureSettings;
 import com.android.settingslib.drawer.Tile;
 import com.android.settingslib.suggestions.SuggestionParser;
 
-import java.time.LocalDateTime;
+import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -70,25 +63,25 @@
 import org.robolectric.RuntimeEnvironment;
 import org.robolectric.annotation.Config;
 
+import java.time.LocalDateTime;
 import java.util.ArrayList;
 import java.util.List;
 
 @RunWith(SettingsRobolectricTestRunner.class)
-@Config(
-    manifest = TestConfig.MANIFEST_PATH,
-    sdk = TestConfig.SDK_VERSION,
-    shadows = {ShadowSecureSettings.class, SettingsShadowResources.class}
-)
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION_O, shadows = {
+        ShadowSecureSettings.class,
+        SettingsShadowResources.class,
+        SettingsShadowSystemProperties.class
+})
 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 SuggestionControllerMixin mSuggestionControllerMixin;
+    @Mock
     private Tile mSuggestion;
     @Mock
     private ActivityManager mActivityManager;
@@ -96,8 +89,6 @@
     private PackageManager mPackageManager;
     @Mock
     private FingerprintManager mFingerprintManager;
-    @Mock
-    private SharedPreferences mSharedPreferences;
     @Captor
     private ArgumentCaptor<Pair> mTaggedDataCaptor = ArgumentCaptor.forClass(Pair.class);
 
@@ -123,156 +114,16 @@
         mProvider = new SuggestionFeatureProviderImpl(mContext);
     }
 
-    @Test
-    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();
+    @After
+    public void tearDown() {
+        SettingsShadowResources.reset();
+        SettingsShadowSystemProperties.clear();
     }
 
     @Test
-    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
-    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
-    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
-    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
-    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
-    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
-    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();
+    public void getSuggestionServiceComponentName_shouldReturnAndroidPackage() {
+        assertThat(mProvider.getSuggestionServiceComponent().getPackageName())
+                .isEqualTo("com.android.settings.intelligence");
     }
 
     @Test
@@ -283,15 +134,16 @@
     }
 
     @Test
-    public void isSuggestionEnabled_isNotLowMemoryDevice_shouldReturnTrue() {
+    public void isSuggestionV2Enabled_isNotLowMemoryDevice_sysPropOn_shouldReturnTrue() {
         when(mActivityManager.isLowRamDevice()).thenReturn(false);
-
-        assertThat(mProvider.isSuggestionEnabled(mContext)).isTrue();
+        SettingsShadowSystemProperties.set(
+                FeatureFlagUtils.FFLAG_PREFIX + FeatureFlags.SUGGESTIONS_V2, "true");
+        assertThat(mProvider.isSuggestionV2Enabled(mContext)).isTrue();
     }
 
     @Test
     public void dismissSuggestion_noParserOrSuggestion_noop() {
-        mProvider.dismissSuggestion(mContext, null, null);
+        mProvider.dismissSuggestion(mContext, null, (Tile) null);
         mProvider.dismissSuggestion(mContext, mSuggestionParser, null);
         mProvider.dismissSuggestion(mContext, null, mSuggestion);
 
@@ -299,6 +151,16 @@
     }
 
     @Test
+    public void dismissSuggestion_noControllerOrSuggestion_noop() {
+        mProvider.dismissSuggestion(mContext, null, (Suggestion) null);
+        mProvider.dismissSuggestion(mContext, mSuggestionControllerMixin, null);
+        mProvider.dismissSuggestion(mContext, null, new Suggestion.Builder("id").build());
+
+        verifyZeroInteractions(mFactory.metricsFeatureProvider);
+        verifyZeroInteractions(mSuggestionControllerMixin);
+    }
+
+    @Test
     public void getSuggestionIdentifier_samePackage_returnClassName() {
         final Tile suggestion = new Tile();
         suggestion.intent = new Intent()
@@ -376,11 +238,6 @@
                         PackageManager.DONT_KILL_APP);
     }
 
-    private void stubFingerprintSupported(boolean enabled) {
-        when(mPackageManager.hasSystemFeature(PackageManager.FEATURE_FINGERPRINT))
-                .thenReturn(enabled);
-    }
-
     @Test
     public void filterExclusiveSuggestions_shouldOnlyKeepFirst3() {
         final List<Tile> suggestions = new ArrayList<>();
@@ -416,7 +273,7 @@
                 LocalDateTime.now().toString());
         final ComponentName componentName =
                 new ComponentName(mContext, NightDisplaySuggestionActivity.class);
-        assertThat(mProvider.isSuggestionCompleted(mContext, componentName)).isTrue();
+        assertThat(mProvider.isSuggestionComplete(mContext, componentName)).isTrue();
     }
 
     @Test
@@ -424,7 +281,7 @@
         Secure.putInt(mContext.getContentResolver(), Secure.NIGHT_DISPLAY_AUTO_MODE, 1);
         final ComponentName componentName =
                 new ComponentName(mContext, NightDisplaySuggestionActivity.class);
-        assertThat(mProvider.isSuggestionCompleted(mContext, componentName)).isTrue();
+        assertThat(mProvider.isSuggestionComplete(mContext, componentName)).isTrue();
     }
 
     @Test
@@ -434,13 +291,28 @@
         Secure.putInt(mContext.getContentResolver(), Secure.NIGHT_DISPLAY_AUTO_MODE, 1);
         final ComponentName componentName =
                 new ComponentName(mContext, NightDisplaySuggestionActivity.class);
-        assertThat(mProvider.isSuggestionCompleted(mContext, componentName)).isTrue();
+        assertThat(mProvider.isSuggestionComplete(mContext, componentName)).isTrue();
     }
 
     @Test
     public void nightDisplaySuggestion_isNotCompleted_byDefault() {
         final ComponentName componentName =
                 new ComponentName(mContext, NightDisplaySuggestionActivity.class);
-        assertThat(mProvider.isSuggestionCompleted(mContext, componentName)).isFalse();
+        assertThat(mProvider.isSuggestionComplete(mContext, componentName)).isFalse();
+    }
+
+    @Test
+    public void testGetSmartSuggestionEnabledTaggedData_disabled() {
+        assertThat(mProvider.getLoggingTaggedData(mContext)).asList().containsExactly(
+                Pair.create(MetricsEvent.FIELD_SETTINGS_SMART_SUGGESTIONS_ENABLED, 0));
+    }
+
+    @Test
+    public void testGetSmartSuggestionEnabledTaggedData_enabled() {
+        final SuggestionFeatureProvider provider = spy(mProvider);
+        when(provider.isSmartSuggestionEnabled(any(Context.class))).thenReturn(true);
+
+        assertThat(provider.getLoggingTaggedData(mContext)).asList().containsExactly(
+                Pair.create(MetricsEvent.FIELD_SETTINGS_SMART_SUGGESTIONS_ENABLED, 1));
     }
 }
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 4d6a743..f5e342b 100644
--- a/tests/robotests/src/com/android/settings/dashboard/suggestions/SuggestionFeaturizerTest.java
+++ b/tests/robotests/src/com/android/settings/dashboard/suggestions/SuggestionFeaturizerTest.java
@@ -32,7 +32,7 @@
 import org.robolectric.RuntimeEnvironment;
 
 @RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION_O)
 public class SuggestionFeaturizerTest {
 
     private EventStore mEventStore;
diff --git a/tests/robotests/src/com/android/settings/dashboard/suggestions/SuggestionLogHelperTest.java b/tests/robotests/src/com/android/settings/dashboard/suggestions/SuggestionLogHelperTest.java
deleted file mode 100644
index 8eb4273..0000000
--- a/tests/robotests/src/com/android/settings/dashboard/suggestions/SuggestionLogHelperTest.java
+++ /dev/null
@@ -1,41 +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.dashboard.suggestions;
-
-import static com.google.common.truth.Truth.assertThat;
-
-import android.util.Pair;
-
-import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
-
-import org.junit.Test;
-
-public class SuggestionLogHelperTest {
-
-    @Test
-    public void testGetSmartSuggestionEnabledTaggedData_disabled() {
-        assertThat(SuggestionLogHelper.getSuggestionTaggedData(false)).asList().containsExactly(
-                Pair.create(MetricsEvent.FIELD_SETTINGS_SMART_SUGGESTIONS_ENABLED, 0));
-    }
-
-    @Test
-    public void testGetSmartSuggestionEnabledTaggedData_enabled() {
-        assertThat(SuggestionLogHelper.getSuggestionTaggedData(true)).asList().containsExactly(
-                Pair.create(MetricsEvent.FIELD_SETTINGS_SMART_SUGGESTIONS_ENABLED, 1));
-    }
-}
-
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 1f32531..3698e4e 100644
--- a/tests/robotests/src/com/android/settings/dashboard/suggestions/SuggestionRankerTest.java
+++ b/tests/robotests/src/com/android/settings/dashboard/suggestions/SuggestionRankerTest.java
@@ -41,7 +41,7 @@
 import static org.mockito.Mockito.spy;
 
 @RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION_O)
 public class SuggestionRankerTest {
 
     @Mock
diff --git a/tests/robotests/src/com/android/settings/dashboard/suggestions/SuggestionStateProviderTest.java b/tests/robotests/src/com/android/settings/dashboard/suggestions/SuggestionStateProviderTest.java
new file mode 100644
index 0000000..6ddba03
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/dashboard/suggestions/SuggestionStateProviderTest.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.dashboard.suggestions;
+
+import static android.content.Intent.EXTRA_COMPONENT_NAME;
+import static org.mockito.Matchers.any;
+import static org.mockito.Mockito.verify;
+
+import android.content.ComponentName;
+import android.content.Context;
+import android.os.Bundle;
+
+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.Robolectric;
+import org.robolectric.annotation.Config;
+
+@RunWith(SettingsRobolectricTestRunner.class)
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION_O)
+public class SuggestionStateProviderTest {
+
+    @Mock(answer = Answers.RETURNS_DEEP_STUBS)
+    private Context mContext;
+
+    private SuggestionStateProvider mProvider;
+    private FakeFeatureFactory mFeatureFactory;
+
+    @Before
+    public void setUp() {
+        MockitoAnnotations.initMocks(this);
+        mFeatureFactory = FakeFeatureFactory.setupForTest(mContext);
+
+        mProvider = Robolectric.setupContentProvider(SuggestionStateProvider.class);
+    }
+
+    @Test(expected = UnsupportedOperationException.class)
+    public void query_shouldCrash() {
+        mProvider.query(null, null, null, null, null);
+    }
+
+    @Test(expected = UnsupportedOperationException.class)
+    public void getType_shouldCrash() {
+        mProvider.getType(null);
+    }
+
+    @Test(expected = UnsupportedOperationException.class)
+    public void insert_shouldCrash() {
+        mProvider.insert(null, null);
+    }
+
+    @Test(expected = UnsupportedOperationException.class)
+    public void delete_shouldCrash() {
+        mProvider.delete(null, null, null);
+    }
+
+    @Test(expected = UnsupportedOperationException.class)
+    public void update_shouldCrash() {
+        mProvider.update(null, null, null, null);
+    }
+
+    @Test
+    public void getSuggestionState_shouldQueryFeatureProvider() {
+        final Bundle extras = new Bundle();
+        extras.putString(SuggestionStateProvider.EXTRA_CANDIDATE_ID, "ID");
+        extras.putParcelable(EXTRA_COMPONENT_NAME, new ComponentName("pkg", "cls"));
+
+        mProvider.call(SuggestionStateProvider.METHOD_GET_SUGGESTION_STATE, "foobar", extras);
+
+        verify(mFeatureFactory.suggestionsFeatureProvider)
+                .isSuggestionComplete(any(Context.class), any(ComponentName.class));
+    }
+}
diff --git a/tests/robotests/src/com/android/settings/dashboard/suggestions/SuggestionsChecksTest.java b/tests/robotests/src/com/android/settings/dashboard/suggestions/SuggestionsChecksTest.java
deleted file mode 100644
index 59752c6..0000000
--- a/tests/robotests/src/com/android/settings/dashboard/suggestions/SuggestionsChecksTest.java
+++ /dev/null
@@ -1,155 +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.dashboard.suggestions;
-
-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.when;
-
-import android.app.WallpaperManager;
-import android.app.admin.DevicePolicyManager;
-import android.content.ComponentName;
-import android.content.Context;
-import android.content.Intent;
-import android.content.pm.PackageManager;
-import android.hardware.fingerprint.FingerprintManager;
-
-import com.android.settings.Settings;
-import com.android.settings.TestConfig;
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settingslib.drawer.Tile;
-
-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;
-
-
-@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
-public class SuggestionsChecksTest {
-
-    @Mock
-    private Context mContext;
-    @Mock
-    private PackageManager mPackageManager;
-    @Mock
-    private FingerprintManager mFingerprintManager;
-    @Mock
-    private DevicePolicyManager mDevicePolicyManager;
-    @Mock
-    private WallpaperManagerWrapper mWallpaperManager;
-    private SuggestionsChecks mSuggestionsChecks;
-
-    @Before
-    public void setUp() {
-        MockitoAnnotations.initMocks(this);
-
-        when(mContext.getApplicationContext()).thenReturn(mContext);
-        mSuggestionsChecks = new SuggestionsChecks(mContext);
-        when(mContext.getPackageManager()).thenReturn(mPackageManager);
-        when(mContext.getSystemService(eq(Context.DEVICE_POLICY_SERVICE)))
-                .thenReturn(mDevicePolicyManager);
-        when(mDevicePolicyManager.getKeyguardDisabledFeatures(any(), anyInt()))
-                .thenReturn(0);
-        when(mContext.getSystemService(FingerprintManager.class)).thenReturn(mFingerprintManager);
-    }
-
-    @Test
-    public void testFingerprintEnrollmentIntroductionIsCompleteWhenFingerprintAdded() {
-        stubFingerprintSupported(true);
-        when(mFingerprintManager.hasEnrolledFingerprints()).thenReturn(true);
-        when(mFingerprintManager.isHardwareDetected()).thenReturn(true);
-        Tile tile = createFingerprintTile();
-        assertThat(mSuggestionsChecks.isSuggestionComplete(tile)).isTrue();
-    }
-
-    @Test
-    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() {
-        stubFingerprintSupported(false);
-        Tile tile = createFingerprintTile();
-        assertThat(mSuggestionsChecks.isSuggestionComplete(tile)).isTrue();
-    }
-
-    @Test
-    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);
-
-        Tile tile = createFingerprintTile();
-        assertThat(mSuggestionsChecks.isSuggestionComplete(tile)).isTrue();
-    }
-
-    private void stubFingerprintSupported(boolean enabled) {
-        when(mPackageManager.hasSystemFeature(PackageManager.FEATURE_FINGERPRINT))
-                .thenReturn(enabled);
-    }
-
-    private Tile createFingerprintTile() {
-        final Tile tile = new Tile();
-        tile.intent = new Intent();
-        tile.intent.setComponent(new ComponentName(mContext,
-                Settings.FingerprintEnrollSuggestionActivity.class));
-        return tile;
-    }
-
-    @Test
-    public void hasWallpaperSet_no_shouldReturnFalse() {
-        ReflectionHelpers.setField(mSuggestionsChecks, "mWallpaperManager", mWallpaperManager);
-        when(mWallpaperManager.getWallpaperId(WallpaperManager.FLAG_SYSTEM))
-                .thenReturn(0);
-
-        assertThat(mSuggestionsChecks.hasWallpaperSet())
-                .isFalse();
-    }
-
-    @Test
-    public void hasWallpaperSet_yes_shouldReturnTrue() {
-        ReflectionHelpers.setField(mSuggestionsChecks, "mWallpaperManager", mWallpaperManager);
-        when(mWallpaperManager.getWallpaperId(WallpaperManager.FLAG_SYSTEM))
-                .thenReturn(100);
-
-        assertThat(mSuggestionsChecks.hasWallpaperSet())
-                .isTrue();
-    }
-}
diff --git a/tests/robotests/src/com/android/settings/datausage/AppDataUsagePreferenceTest.java b/tests/robotests/src/com/android/settings/datausage/AppDataUsagePreferenceTest.java
new file mode 100644
index 0000000..4f7e216
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/datausage/AppDataUsagePreferenceTest.java
@@ -0,0 +1,86 @@
+/*
+ * Copyright (C) 2017 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.datausage;
+
+
+import static com.google.common.truth.Truth.assertThat;
+import static org.mockito.Mockito.when;
+
+import android.graphics.Color;
+import android.graphics.drawable.ColorDrawable;
+
+import com.android.settings.TestConfig;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.shadow.ShadowThreadUtils;
+import com.android.settingslib.AppItem;
+import com.android.settingslib.net.UidDetail;
+import com.android.settingslib.net.UidDetailProvider;
+
+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_O,
+        shadows = ShadowThreadUtils.class)
+public class AppDataUsagePreferenceTest {
+
+    @Mock
+    private UidDetailProvider mUidDetailProvider;
+    private AppItem mAppItem;
+    private UidDetail mUidDetail;
+
+    private AppDataUsagePreference mPreference;
+
+    @Before
+    public void setUp() {
+        MockitoAnnotations.initMocks(this);
+        mAppItem = new AppItem(123);
+        mUidDetail = new UidDetail();
+        mUidDetail.icon = new ColorDrawable(Color.BLUE);
+        mUidDetail.label = "title";
+    }
+
+    @Test
+    public void createPref_hasCachedUidDetail_shouldSetAppInfo() {
+        when(mUidDetailProvider.getUidDetail(mAppItem.key, false /* blocking */))
+                .thenReturn(mUidDetail);
+
+        mPreference = new AppDataUsagePreference(RuntimeEnvironment.application, mAppItem,
+                50 /* percent */, mUidDetailProvider);
+
+        assertThat(mPreference.getTitle()).isEqualTo(mUidDetail.label);
+        assertThat(mPreference.getIcon()).isEqualTo(mUidDetail.icon);
+    }
+
+
+    @Test
+    public void createPref_noCachedUidDetail_shouldSetAppInfo() {
+        when(mUidDetailProvider.getUidDetail(mAppItem.key, true /* blocking */))
+                .thenReturn(mUidDetail);
+
+        mPreference = new AppDataUsagePreference(RuntimeEnvironment.application, mAppItem,
+                50 /* percent */, mUidDetailProvider);
+
+        assertThat(mPreference.getTitle()).isEqualTo(mUidDetail.label);
+        assertThat(mPreference.getIcon()).isEqualTo(mUidDetail.icon);
+    }
+}
diff --git a/tests/robotests/src/com/android/settings/datausage/AppDataUsageTest.java b/tests/robotests/src/com/android/settings/datausage/AppDataUsageTest.java
index 2f2a685..75fec68 100644
--- a/tests/robotests/src/com/android/settings/datausage/AppDataUsageTest.java
+++ b/tests/robotests/src/com/android/settings/datausage/AppDataUsageTest.java
@@ -16,7 +16,6 @@
 
 package com.android.settings.datausage;
 
-
 import static org.mockito.Matchers.any;
 import static org.mockito.Matchers.anyBoolean;
 import static org.mockito.Matchers.anyInt;
@@ -39,12 +38,12 @@
 import android.view.View;
 
 import com.android.settings.TestConfig;
-import com.android.settings.applications.PackageManagerWrapper;
 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.AppItem;
+import com.android.settingslib.wrapper.PackageManagerWrapper;
 
 import org.junit.After;
 import org.junit.Before;
@@ -58,7 +57,7 @@
 import org.robolectric.util.ReflectionHelpers;
 
 @RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION,
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION_O,
         shadows = ShadowEntityHeaderController.class)
 public class AppDataUsageTest {
 
diff --git a/tests/robotests/src/com/android/settings/datausage/AppPrefLoaderTest.java b/tests/robotests/src/com/android/settings/datausage/AppPrefLoaderTest.java
index ac28e1d..b6547ab 100644
--- a/tests/robotests/src/com/android/settings/datausage/AppPrefLoaderTest.java
+++ b/tests/robotests/src/com/android/settings/datausage/AppPrefLoaderTest.java
@@ -44,7 +44,7 @@
 
 
 @RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION_O)
 public class AppPrefLoaderTest {
 
     @Mock(answer = Answers.RETURNS_DEEP_STUBS)
diff --git a/tests/robotests/src/com/android/settings/datausage/BillingCycleSettingsTest.java b/tests/robotests/src/com/android/settings/datausage/BillingCycleSettingsTest.java
index 8b635d2..d735342 100644
--- a/tests/robotests/src/com/android/settings/datausage/BillingCycleSettingsTest.java
+++ b/tests/robotests/src/com/android/settings/datausage/BillingCycleSettingsTest.java
@@ -38,7 +38,7 @@
 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_O)
 public class BillingCycleSettingsTest {
 
     private static final int LIMIT_BYTES = 123;
diff --git a/tests/robotests/src/com/android/settings/datausage/DataPlanSummaryPreferenceTest.java b/tests/robotests/src/com/android/settings/datausage/DataPlanSummaryPreferenceTest.java
index a5dbf78..a5dea97 100644
--- a/tests/robotests/src/com/android/settings/datausage/DataPlanSummaryPreferenceTest.java
+++ b/tests/robotests/src/com/android/settings/datausage/DataPlanSummaryPreferenceTest.java
@@ -31,13 +31,14 @@
 import com.android.settings.widget.DonutView;
 import org.junit.After;
 import org.junit.Before;
+import org.junit.BeforeClass;
 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,
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION_O,
         shadows = {
                 SettingsShadowResources.class,
                 SettingsShadowResources.SettingsShadowTheme.class
@@ -48,9 +49,16 @@
     private static final String TEST_PLAN_USAGE = "Test plan usage";
     private static final String TEST_PLAN_NAME = "Test plan name";
     private static final String TEST_PLAN_DESCRIPTION = "Test plan description";
-    private static final int PLAN_USAGE_TEXT_COLOR = Color.parseColor("#FF5C94F1");
-    private static final int METER_BACKGROUND_COLOR = Color.parseColor("#FFDBDCDC");
-    private static final int METER_CONSUMED_COLOR = Color.parseColor("#FF5C94F1");
+    private static int sPlanUsageTextColor;
+    private static int sMeterBackgroundColor;
+    private static int sMeterConsumedColor;
+
+    @BeforeClass
+    public static void beforeClass() {
+        sPlanUsageTextColor = Color.parseColor("#FF5C94F1");
+        sMeterBackgroundColor = Color.parseColor("#FFDBDCDC");
+        sMeterConsumedColor = Color.parseColor("#FF5C94F1");
+    }
 
     private DataPlanSummaryPreference mPreference;
     private PreferenceViewHolder mHolder;
@@ -87,18 +95,18 @@
     @Test
     public void shouldRender_withData() {
         mPreference.setTitle(TEST_PLAN_USAGE);
-        mPreference.setUsageTextColor(PLAN_USAGE_TEXT_COLOR);
+        mPreference.setUsageTextColor(sPlanUsageTextColor);
         mPreference.setName(TEST_PLAN_NAME);
         mPreference.setDescription(TEST_PLAN_DESCRIPTION);
         mPreference.setPercentageUsage(0.25D);
-        mPreference.setMeterBackgroundColor(METER_BACKGROUND_COLOR);
-        mPreference.setMeterConsumedColor(METER_CONSUMED_COLOR);
+        mPreference.setMeterBackgroundColor(sMeterBackgroundColor);
+        mPreference.setMeterConsumedColor(sMeterConsumedColor);
 
         mPreference.onBindViewHolder(mHolder);
 
         TextView planUsageTextView = (TextView) mHolder.findViewById(android.R.id.title);
         assertThat(planUsageTextView.getTextColors().getDefaultColor())
-                .isEqualTo(PLAN_USAGE_TEXT_COLOR);
+                .isEqualTo(sPlanUsageTextColor);
         assertThat(planUsageTextView.getText()).isEqualTo(TEST_PLAN_USAGE);
 
         TextView planNameTextView = (TextView) mHolder.findViewById(android.R.id.text1);
@@ -108,7 +116,7 @@
         assertThat(planDescriptionTextView.getText()).isEqualTo(TEST_PLAN_DESCRIPTION);
 
         DonutView donutView = (DonutView) mHolder.findViewById(R.id.donut);
-        assertThat(donutView.getMeterBackgroundColor()).isEqualTo(METER_BACKGROUND_COLOR);
-        assertThat(donutView.getMeterConsumedColor()).isEqualTo(METER_CONSUMED_COLOR);
+        assertThat(donutView.getMeterBackgroundColor()).isEqualTo(sMeterBackgroundColor);
+        assertThat(donutView.getMeterConsumedColor()).isEqualTo(sMeterConsumedColor);
     }
 }
diff --git a/tests/robotests/src/com/android/settings/datausage/DataPlanUsageSummaryTest.java b/tests/robotests/src/com/android/settings/datausage/DataPlanUsageSummaryTest.java
index 748c317..cf790e9 100644
--- a/tests/robotests/src/com/android/settings/datausage/DataPlanUsageSummaryTest.java
+++ b/tests/robotests/src/com/android/settings/datausage/DataPlanUsageSummaryTest.java
@@ -45,7 +45,7 @@
 import org.robolectric.util.ReflectionHelpers;
 
 @RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION_O)
 public class DataPlanUsageSummaryTest {
     @Mock
     private ConnectivityManager mManager;
diff --git a/tests/robotests/src/com/android/settings/datausage/DataPlansSyncTimePreferenceTest.java b/tests/robotests/src/com/android/settings/datausage/DataPlansSyncTimePreferenceTest.java
index ba2d5f1..1e2565e 100644
--- a/tests/robotests/src/com/android/settings/datausage/DataPlansSyncTimePreferenceTest.java
+++ b/tests/robotests/src/com/android/settings/datausage/DataPlansSyncTimePreferenceTest.java
@@ -35,7 +35,7 @@
 import org.robolectric.annotation.Config;
 
 @RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION_O)
 public final class DataPlansSyncTimePreferenceTest {
     private static final String SYNC_TIME = "Today 12:24pm";
 
diff --git a/tests/robotests/src/com/android/settings/datausage/DataUsageInfoControllerTest.java b/tests/robotests/src/com/android/settings/datausage/DataUsageInfoControllerTest.java
index e60243b..57041fd 100644
--- a/tests/robotests/src/com/android/settings/datausage/DataUsageInfoControllerTest.java
+++ b/tests/robotests/src/com/android/settings/datausage/DataUsageInfoControllerTest.java
@@ -13,7 +13,7 @@
 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_O)
 public class DataUsageInfoControllerTest {
     private DataUsageInfoController mInfoController;
     private DataUsageInfo info;
diff --git a/tests/robotests/src/com/android/settings/datausage/DataUsageListTest.java b/tests/robotests/src/com/android/settings/datausage/DataUsageListTest.java
index 9ab88d3..59c99f4 100644
--- a/tests/robotests/src/com/android/settings/datausage/DataUsageListTest.java
+++ b/tests/robotests/src/com/android/settings/datausage/DataUsageListTest.java
@@ -36,7 +36,7 @@
 import static org.mockito.Mockito.verify;
 
 @RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION_O)
 public class DataUsageListTest {
 
     @Mock
diff --git a/tests/robotests/src/com/android/settings/datausage/DataUsageSummaryTest.java b/tests/robotests/src/com/android/settings/datausage/DataUsageSummaryTest.java
index 431796a..179f743 100644
--- a/tests/robotests/src/com/android/settings/datausage/DataUsageSummaryTest.java
+++ b/tests/robotests/src/com/android/settings/datausage/DataUsageSummaryTest.java
@@ -28,28 +28,30 @@
 import android.net.ConnectivityManager;
 import android.net.wifi.WifiConfiguration;
 import android.net.wifi.WifiManager;
+import android.text.format.Formatter;
+
 import com.android.settings.R;
 import com.android.settings.TestConfig;
 import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.testutils.XmlTestUtils;
-import com.android.settings.testutils.shadow.ShadowConnectivityManager;
+import com.android.settings.testutils.shadow.SettingsShadowResources;
 import com.android.settingslib.NetworkPolicyEditor;
-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 org.robolectric.shadows.ShadowApplication;
 import org.robolectric.util.ReflectionHelpers;
 
+import java.util.ArrayList;
+
 @RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION_O)
 public class DataUsageSummaryTest {
-    @Mock private ConnectivityManager mManager;
+    @Mock
+    private ConnectivityManager mManager;
     private Context mContext;
 
     /**
@@ -80,6 +82,21 @@
         dataUsageSummary.updateNetworkRestrictionSummary(preference);
 
         verify(preference).setSummary(mContext.getResources().getQuantityString(
-            R.plurals.network_restrictions_summary, 0, 0));
+                R.plurals.network_restrictions_summary, 0, 0));
+    }
+
+    @Test
+    @Config(shadows = {
+            SettingsShadowResources.class,
+            SettingsShadowResources.SettingsShadowTheme.class
+    })
+    public void formatUsage_shouldLookLikeFormatFileSize() {
+        SettingsShadowResources.overrideResource(com.android.internal.R.string.fileSizeSuffix,
+                "%1$s %2$s");
+        final long usage = 2147483648L; // 2GB
+        final String formattedUsage =
+                DataUsageSummary.formatUsage(mContext, "^1", usage).toString();
+        final String formattedAsFileSize = Formatter.formatFileSize(mContext, usage);
+        assertThat(formattedUsage).isEqualTo(formattedAsFileSize);
     }
 }
diff --git a/tests/robotests/src/com/android/settings/datausage/DataUsageUtilsTest.java b/tests/robotests/src/com/android/settings/datausage/DataUsageUtilsTest.java
index cdcd3a9..1dacc68 100644
--- a/tests/robotests/src/com/android/settings/datausage/DataUsageUtilsTest.java
+++ b/tests/robotests/src/com/android/settings/datausage/DataUsageUtilsTest.java
@@ -33,7 +33,7 @@
 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_O)
 public final class DataUsageUtilsTest {
     @Mock private ConnectivityManager mManager;
     private Context mContext;
diff --git a/tests/robotests/src/com/android/settings/datausage/ManageDataPlansPreferenceTest.java b/tests/robotests/src/com/android/settings/datausage/ManageDataPlansPreferenceTest.java
index 6eff393..e96b4e8 100644
--- a/tests/robotests/src/com/android/settings/datausage/ManageDataPlansPreferenceTest.java
+++ b/tests/robotests/src/com/android/settings/datausage/ManageDataPlansPreferenceTest.java
@@ -35,7 +35,7 @@
 import org.robolectric.annotation.Config;
 
 @RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION_O)
 public final class ManageDataPlansPreferenceTest {
     private Preference mPreference;
     private PreferenceViewHolder mHolder;
diff --git a/tests/robotests/src/com/android/settings/datausage/UnrestrictedDataAccessTest.java b/tests/robotests/src/com/android/settings/datausage/UnrestrictedDataAccessTest.java
index f20e50c..081337f 100644
--- a/tests/robotests/src/com/android/settings/datausage/UnrestrictedDataAccessTest.java
+++ b/tests/robotests/src/com/android/settings/datausage/UnrestrictedDataAccessTest.java
@@ -40,7 +40,7 @@
 import org.robolectric.annotation.Config;
 
 @RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION_O)
 public class UnrestrictedDataAccessTest {
 
     @Mock(answer = Answers.RETURNS_DEEP_STUBS)
diff --git a/tests/robotests/src/com/android/settings/datetime/AutoTimeFormatPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/datetime/AutoTimeFormatPreferenceControllerTest.java
new file mode 100644
index 0000000..f9784ef
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/datetime/AutoTimeFormatPreferenceControllerTest.java
@@ -0,0 +1,183 @@
+/*
+ * Copyright (C) 2017 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.datetime;
+
+
+import static com.google.common.truth.Truth.assertThat;
+import static org.mockito.Answers.RETURNS_DEEP_STUBS;
+
+import android.content.Context;
+import android.content.Intent;
+import android.provider.Settings;
+import android.support.v14.preference.SwitchPreference;
+import android.support.v7.preference.PreferenceScreen;
+import android.text.format.DateFormat;
+import com.android.settings.TestConfig;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
+import java.util.List;
+import java.util.Locale;
+
+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_O)
+public class AutoTimeFormatPreferenceControllerTest {
+
+    @Mock(answer = RETURNS_DEEP_STUBS)
+    private PreferenceScreen mScreen;
+    @Mock
+    private UpdateTimeAndDateCallback mCallback;
+
+    private ShadowApplication mApplication;
+    private Context mContext;
+    private SwitchPreference mPreference;
+    private TestAutoTimeFormatPreferenceController mController;
+
+    @Before
+    public void setUp() {
+        MockitoAnnotations.initMocks(this);
+        mApplication = ShadowApplication.getInstance();
+        mContext = mApplication.getApplicationContext();
+    }
+
+    @Test
+    public void updateState_24HourSet_shouldCheckPreference() {
+        mController = new TestAutoTimeFormatPreferenceController(mContext, mCallback);
+        mPreference = new SwitchPreference(mContext);
+        mPreference.setKey(mController.getPreferenceKey());
+        Settings.System.putString(mContext.getContentResolver(), Settings.System.TIME_12_24,
+                TimeFormatPreferenceController.HOURS_24);
+
+        mController.updateState(mPreference);
+
+        assertThat(mPreference.isChecked()).isFalse();
+    }
+
+    @Test
+    public void updateState_12HourSet_shouldCheckPreference() {
+        mController = new TestAutoTimeFormatPreferenceController(mContext, mCallback);
+        mPreference = new SwitchPreference(mContext);
+        mPreference.setKey(mController.getPreferenceKey());
+        Settings.System.putString(mContext.getContentResolver(), Settings.System.TIME_12_24,
+                TimeFormatPreferenceController.HOURS_12);
+
+        mController.updateState(mPreference);
+
+        assertThat(mPreference.isChecked()).isFalse();
+    }
+
+    @Test
+    public void updateState_autoSet_shouldNotCheckPreference() {
+        mController = new TestAutoTimeFormatPreferenceController(mContext, mCallback);
+        mPreference = new SwitchPreference(mContext);
+        mPreference.setKey(mController.getPreferenceKey());
+        Settings.System.putString(mContext.getContentResolver(), Settings.System.TIME_12_24, null);
+
+        mController.updateState(mPreference);
+
+        assertThat(mPreference.isChecked()).isTrue();
+    }
+
+    @Test
+    public void updatePreference_autoSet_shouldSendIntent_12HourLocale() {
+        mController = new TestAutoTimeFormatPreferenceController(mContext, mCallback);
+        mPreference = new SwitchPreference(mContext);
+        mPreference.setKey(mController.getPreferenceKey());
+        mPreference.setChecked(false);
+
+        boolean result = mController.handlePreferenceTreeClick(mPreference);
+
+        assertThat(result).isTrue();
+
+        List<Intent> intentsFired = mApplication.getBroadcastIntents();
+        assertThat(intentsFired.size()).isEqualTo(1);
+        Intent intentFired = intentsFired.get(0);
+        assertThat(intentFired.getAction()).isEqualTo(Intent.ACTION_TIME_CHANGED);
+        assertThat(intentFired.getIntExtra(Intent.EXTRA_TIME_PREF_24_HOUR_FORMAT, -1))
+                .isEqualTo(Intent.EXTRA_TIME_PREF_VALUE_USE_12_HOUR);
+    }
+
+    @Test
+    public void updatePreference_autoSet_shouldSendIntent_24HourLocale() {
+        mController = new TestAutoTimeFormatPreferenceController(mContext, mCallback);
+        mPreference = new SwitchPreference(mContext);
+        mPreference.setKey(mController.getPreferenceKey());
+        mPreference.setChecked(false);
+
+        mController.setIs24HourLocale(true);
+        boolean result = mController.handlePreferenceTreeClick(mPreference);
+
+        assertThat(result).isTrue();
+
+        List<Intent> intentsFired = mApplication.getBroadcastIntents();
+        assertThat(intentsFired.size()).isEqualTo(1);
+        Intent intentFired = intentsFired.get(0);
+        assertThat(intentFired.getAction()).isEqualTo(Intent.ACTION_TIME_CHANGED);
+        assertThat(intentFired.getIntExtra(Intent.EXTRA_TIME_PREF_24_HOUR_FORMAT, -1))
+                .isEqualTo(Intent.EXTRA_TIME_PREF_VALUE_USE_24_HOUR);
+    }
+
+    @Test
+    public void updatePreference_24HourSet_shouldSendIntent() {
+        mController = new TestAutoTimeFormatPreferenceController(mContext, mCallback);
+        mPreference = new SwitchPreference(mContext);
+        mPreference.setKey(mController.getPreferenceKey());
+        mPreference.setChecked(true);
+
+        mController.setIs24HourLocale(false);
+        boolean result = mController.handlePreferenceTreeClick(mPreference);
+
+        assertThat(result).isTrue();
+
+        List<Intent> intentsFired = mApplication.getBroadcastIntents();
+        assertThat(intentsFired.size()).isEqualTo(1);
+        Intent intentFired = intentsFired.get(0);
+        assertThat(intentFired.getAction()).isEqualTo(Intent.ACTION_TIME_CHANGED);
+        assertThat(intentFired.getIntExtra(Intent.EXTRA_TIME_PREF_24_HOUR_FORMAT, -1))
+                .isEqualTo(Intent.EXTRA_TIME_PREF_VALUE_USE_LOCALE_DEFAULT);
+    }
+
+    /**
+     * Extend class under test to change {@link #is24HourLocale()} to not call
+     * {@link DateFormat#is24HourLocale(Locale)} because that's not available in roboelectric.
+     */
+    private static class TestAutoTimeFormatPreferenceController
+            extends AutoTimeFormatPreferenceController {
+
+        private boolean is24HourLocale = false;
+
+        public TestAutoTimeFormatPreferenceController(Context context,
+              UpdateTimeAndDateCallback callback) {
+            super(context, callback);
+        }
+
+        void setIs24HourLocale(boolean value) {
+            is24HourLocale = value;
+        }
+
+        @Override
+        boolean is24HourLocale(Locale locale) {
+            return is24HourLocale;
+        }
+    }
+}
diff --git a/tests/robotests/src/com/android/settings/datetime/AutoTimePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/datetime/AutoTimePreferenceControllerTest.java
index d28cad1..f4c1596 100644
--- a/tests/robotests/src/com/android/settings/datetime/AutoTimePreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/datetime/AutoTimePreferenceControllerTest.java
@@ -35,7 +35,7 @@
 import static org.mockito.Mockito.verify;
 
 @RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION_O)
 public class AutoTimePreferenceControllerTest {
 
     @Mock
diff --git a/tests/robotests/src/com/android/settings/datetime/AutoTimeZonePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/datetime/AutoTimeZonePreferenceControllerTest.java
index 41bff93..950fd0d 100644
--- a/tests/robotests/src/com/android/settings/datetime/AutoTimeZonePreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/datetime/AutoTimeZonePreferenceControllerTest.java
@@ -16,35 +16,34 @@
 
 package com.android.settings.datetime;
 
+import static com.google.common.truth.Truth.assertThat;
+
+import static org.mockito.Mockito.verify;
+import static org.robolectric.shadow.api.Shadow.extract;
+
 import android.content.Context;
 import android.net.ConnectivityManager;
 import android.provider.Settings;
 import android.support.v7.preference.Preference;
 
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.shadow.ShadowConnectivityManager;
 
 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 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)
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION_O,
+        shadows = ShadowConnectivityManager.class)
 public class AutoTimeZonePreferenceControllerTest {
 
     @Mock
-    private Context mMockContext;
-    @Mock
-    private ConnectivityManager mCm;
-    @Mock
     private UpdateTimeAndDateCallback mCallback;
 
     private Context mContext;
@@ -55,17 +54,17 @@
     @Before
     public void setUp() {
         MockitoAnnotations.initMocks(this);
-        ShadowApplication.getInstance().setSystemService(Context.CONNECTIVITY_SERVICE, mCm);
-        mContext = ShadowApplication.getInstance().getApplicationContext();
+        mContext = RuntimeEnvironment.application;
         mPreference = new Preference(mContext);
-        when(mMockContext.getSystemService(Context.CONNECTIVITY_SERVICE)).thenReturn(mCm);
-        when(mCm.isNetworkSupported(ConnectivityManager.TYPE_MOBILE)).thenReturn(true);
+        ShadowConnectivityManager connectivityManager =
+                extract(mContext.getSystemService(ConnectivityManager.class));
+        connectivityManager.setNetworkSupported(ConnectivityManager.TYPE_MOBILE, true);
     }
 
     @Test
     public void isFromSUW_notAvailable() {
         mController = new AutoTimeZonePreferenceController(
-                mMockContext, null /* callback */, true /* isFromSUW */);
+                mContext, null /* callback */, true /* isFromSUW */);
 
         assertThat(mController.isAvailable()).isFalse();
     }
@@ -73,17 +72,19 @@
     @Test
     public void notFromSUW_isAvailable() {
         mController = new AutoTimeZonePreferenceController(
-                mMockContext, null /* callback */, false /* isFromSUW */);
+                mContext, null /* callback */, false /* isFromSUW */);
 
         assertThat(mController.isAvailable()).isTrue();
     }
 
     @Test
     public void isWifiOnly_notAvailable() {
-        when(mCm.isNetworkSupported(ConnectivityManager.TYPE_MOBILE)).thenReturn(false);
+        ShadowConnectivityManager connectivityManager =
+                extract(mContext.getSystemService(ConnectivityManager.class));
+        connectivityManager.setNetworkSupported(ConnectivityManager.TYPE_MOBILE, false);
 
         mController = new AutoTimeZonePreferenceController(
-                mMockContext, null /* callback */, false /* isFromSUW */);
+                mContext, null /* callback */, false /* isFromSUW */);
 
         assertThat(mController.isAvailable()).isFalse();
     }
@@ -91,17 +92,19 @@
     @Test
     public void isFromSUW_notEnable() {
         mController = new AutoTimeZonePreferenceController(
-            mMockContext, null /* callback */, true /* isFromSUW */);
+                mContext, null /* callback */, true /* isFromSUW */);
 
         assertThat(mController.isEnabled()).isFalse();
     }
 
     @Test
     public void isWifiOnly_notEnable() {
-        when(mCm.isNetworkSupported(ConnectivityManager.TYPE_MOBILE)).thenReturn(false);
+        ShadowConnectivityManager connectivityManager =
+                extract(mContext.getSystemService(ConnectivityManager.class));
+        connectivityManager.setNetworkSupported(ConnectivityManager.TYPE_MOBILE, false);
 
         mController = new AutoTimeZonePreferenceController(
-            mMockContext, null /* callback */, false /* isFromSUW */);
+                mContext, null /* callback */, false /* isFromSUW */);
 
         assertThat(mController.isEnabled()).isFalse();
     }
diff --git a/tests/robotests/src/com/android/settings/datetime/DatePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/datetime/DatePreferenceControllerTest.java
index e6a6dd8..000dd2c 100644
--- a/tests/robotests/src/com/android/settings/datetime/DatePreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/datetime/DatePreferenceControllerTest.java
@@ -22,6 +22,7 @@
 
 import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
+import com.android.settingslib.RestrictedPreference;
 
 import org.junit.Before;
 import org.junit.Test;
@@ -36,7 +37,7 @@
 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_O)
 public class DatePreferenceControllerTest {
 
     @Mock
@@ -48,14 +49,15 @@
     @Mock
     private AutoTimePreferenceController mAutoTimePreferenceController;
 
-    private Preference mPreference;
+    private RestrictedPreference mPreference;
     private DatePreferenceController mController;
 
     @Before
     public void setUp() {
         MockitoAnnotations.initMocks(this);
         when(mContext.getSystemService(Context.ALARM_SERVICE)).thenReturn(mAlarmManager);
-        mPreference = new Preference(ShadowApplication.getInstance().getApplicationContext());
+        mPreference = new RestrictedPreference(ShadowApplication.getInstance().
+                getApplicationContext());
         mController = new DatePreferenceController(mContext, mHost, mAutoTimePreferenceController);
     }
 
@@ -72,6 +74,9 @@
 
     @Test
     public void updateState_autoTimeEnabled_shouldDisablePref() {
+        // Make sure not disabled by admin.
+        mPreference.setDisabledByAdmin(null);
+
         when(mAutoTimePreferenceController.isEnabled()).thenReturn(true);
         mController.updateState(mPreference);
 
@@ -80,6 +85,9 @@
 
     @Test
     public void updateState_autoTimeDisabled_shouldEnablePref() {
+        // Make sure not disabled by admin.
+        mPreference.setDisabledByAdmin(null);
+
         when(mAutoTimePreferenceController.isEnabled()).thenReturn(false);
         mController.updateState(mPreference);
 
diff --git a/tests/robotests/src/com/android/settings/datetime/TimeChangeListenerMixinTest.java b/tests/robotests/src/com/android/settings/datetime/TimeChangeListenerMixinTest.java
index 843c753..524a88e 100644
--- a/tests/robotests/src/com/android/settings/datetime/TimeChangeListenerMixinTest.java
+++ b/tests/robotests/src/com/android/settings/datetime/TimeChangeListenerMixinTest.java
@@ -39,7 +39,7 @@
 import static org.mockito.Mockito.verify;
 
 @RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION_O)
 public class TimeChangeListenerMixinTest {
 
     @Mock
@@ -66,7 +66,8 @@
     public void onResume_shouldRegisterIntentFilter() {
         mMixin.onResume();
         mContext.sendBroadcast(new Intent(Intent.ACTION_TIME_TICK));
-        mContext.sendBroadcast(new Intent(Intent.ACTION_TIME_CHANGED));
+        mContext.sendBroadcast(new Intent(Intent.ACTION_TIME_CHANGED)
+                .addFlags(Intent.FLAG_RECEIVER_INCLUDE_BACKGROUND));
         mContext.sendBroadcast(new Intent(Intent.ACTION_TIMEZONE_CHANGED));
 
         verify(mCallback, times(3)).updateTimeAndDateDisplay(mContext);
@@ -77,7 +78,8 @@
         mMixin.onResume();
         mMixin.onPause();
         mContext.sendBroadcast(new Intent(Intent.ACTION_TIME_TICK));
-        mContext.sendBroadcast(new Intent(Intent.ACTION_TIME_CHANGED));
+        mContext.sendBroadcast(new Intent(Intent.ACTION_TIME_CHANGED)
+                .addFlags(Intent.FLAG_RECEIVER_INCLUDE_BACKGROUND));
         mContext.sendBroadcast(new Intent(Intent.ACTION_TIMEZONE_CHANGED));
 
         verify(mCallback, never()).updateTimeAndDateDisplay(mContext);
diff --git a/tests/robotests/src/com/android/settings/datetime/TimeFormatPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/datetime/TimeFormatPreferenceControllerTest.java
index 58ecd62..2e975c3 100644
--- a/tests/robotests/src/com/android/settings/datetime/TimeFormatPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/datetime/TimeFormatPreferenceControllerTest.java
@@ -41,7 +41,7 @@
 import static org.mockito.Mockito.verify;
 
 @RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION_O)
 public class TimeFormatPreferenceControllerTest {
 
     @Mock(answer = RETURNS_DEEP_STUBS)
@@ -102,6 +102,18 @@
     }
 
     @Test
+    public void updateState_autoSet_shouldNotEnablePreference() {
+        mController = new TimeFormatPreferenceController(mContext, mCallback, false);
+        Settings.System.putString(mContext.getContentResolver(), Settings.System.TIME_12_24, null);
+        mPreference = new SwitchPreference(mContext);
+        mPreference.setKey(mController.getPreferenceKey());
+
+        mController.updateState(mPreference);
+
+        assertThat(mPreference.isEnabled()).isFalse();
+    }
+
+    @Test
     public void updatePreference_12HourSet_shouldSendIntent() {
         mController = new TimeFormatPreferenceController(mContext, mCallback, false);
         mPreference = new SwitchPreference(mContext);
diff --git a/tests/robotests/src/com/android/settings/datetime/TimePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/datetime/TimePreferenceControllerTest.java
index 15877e0..afec523 100644
--- a/tests/robotests/src/com/android/settings/datetime/TimePreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/datetime/TimePreferenceControllerTest.java
@@ -17,10 +17,11 @@
 package com.android.settings.datetime;
 
 import android.content.Context;
-import android.support.v7.preference.Preference;
+import android.os.UserManager;
 
 import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
+import com.android.settingslib.RestrictedPreference;
 
 import org.junit.Before;
 import org.junit.Test;
@@ -31,11 +32,12 @@
 import org.robolectric.shadows.ShadowApplication;
 
 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)
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION_O)
 public class TimePreferenceControllerTest {
 
     @Mock
@@ -46,12 +48,13 @@
     private AutoTimePreferenceController mAutoTimePreferenceController;
 
     private TimePreferenceController mController;
-    private Preference mPreference;
+    private RestrictedPreference mPreference;
 
     @Before
     public void setUp() {
         MockitoAnnotations.initMocks(this);
-        mPreference = new Preference(ShadowApplication.getInstance().getApplicationContext());
+        mPreference = new RestrictedPreference(
+                ShadowApplication.getInstance().getApplicationContext());
         mController = new TimePreferenceController(mContext, mHost, mAutoTimePreferenceController);
     }
 
@@ -62,6 +65,9 @@
 
     @Test
     public void updateState_autoTimeEnabled_shouldDisablePref() {
+        // Make sure not disabled by admin.
+        mPreference.setDisabledByAdmin(null);
+
         when(mAutoTimePreferenceController.isEnabled()).thenReturn(true);
         mController.updateState(mPreference);
 
@@ -70,6 +76,9 @@
 
     @Test
     public void updateState_autoTimeDisabled_shouldEnablePref() {
+        // Make sure not disabled by admin.
+        mPreference.setDisabledByAdmin(null);
+
         when(mAutoTimePreferenceController.isEnabled()).thenReturn(false);
         mController.updateState(mPreference);
 
diff --git a/tests/robotests/src/com/android/settings/datetime/TimeZonePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/datetime/TimeZonePreferenceControllerTest.java
index 2f96d65..aa10a70 100644
--- a/tests/robotests/src/com/android/settings/datetime/TimeZonePreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/datetime/TimeZonePreferenceControllerTest.java
@@ -21,6 +21,7 @@
 
 import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
+import com.android.settingslib.RestrictedPreference;
 
 import org.junit.Before;
 import org.junit.Test;
@@ -36,20 +37,21 @@
 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_O)
 public class TimeZonePreferenceControllerTest {
 
     @Mock
     private AutoTimeZonePreferenceController mAutoTimeZonePreferenceController;
+
     private Context mContext;
     private TimeZonePreferenceController mController;
-    private Preference mPreference;
+    private RestrictedPreference mPreference;
 
     @Before
     public void setUp() {
         MockitoAnnotations.initMocks(this);
         mContext = ShadowApplication.getInstance().getApplicationContext();
-        mPreference = new Preference(mContext);
+        mPreference = new RestrictedPreference(mContext);
         mController = spy(new TimeZonePreferenceController(mContext,
                 mAutoTimeZonePreferenceController));
     }
@@ -61,6 +63,9 @@
 
     @Test
     public void updateState_autoTimeZoneEnabled_shouldDisablePref() {
+        // Make sure not disabled by admin.
+        mPreference.setDisabledByAdmin(null);
+
         doReturn("test timezone").when(mController).getTimeZoneOffsetAndName();
         when(mAutoTimeZonePreferenceController.isEnabled()).thenReturn(true);
         mController.updateState(mPreference);
@@ -70,6 +75,9 @@
 
     @Test
     public void updateState_autoTimeZoneDisabled_shouldEnablePref() {
+        // Make sure not disabled by admin.
+        mPreference.setDisabledByAdmin(null);
+
         doReturn("test timezone").when(mController).getTimeZoneOffsetAndName();
         when(mAutoTimeZonePreferenceController.isEnabled()).thenReturn(false);
         mController.updateState(mPreference);
diff --git a/tests/robotests/src/com/android/settings/datetime/ZonePickerComparatorTest.java b/tests/robotests/src/com/android/settings/datetime/ZonePickerComparatorTest.java
index 4c1794c..10e5e5c 100644
--- a/tests/robotests/src/com/android/settings/datetime/ZonePickerComparatorTest.java
+++ b/tests/robotests/src/com/android/settings/datetime/ZonePickerComparatorTest.java
@@ -23,7 +23,7 @@
 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_O)
 public class ZonePickerComparatorTest {
 
     // Strings in Chinese are sorted by alphabet order of their Pinyin.
diff --git a/tests/robotests/src/com/android/settings/datetime/ZonePickerTest.java b/tests/robotests/src/com/android/settings/datetime/ZonePickerTest.java
index 92807e9..09ff1cd 100644
--- a/tests/robotests/src/com/android/settings/datetime/ZonePickerTest.java
+++ b/tests/robotests/src/com/android/settings/datetime/ZonePickerTest.java
@@ -39,7 +39,7 @@
 import org.robolectric.util.ReflectionHelpers;
 
 @RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION_O)
 public class ZonePickerTest {
 
     private Activity mActivity;
diff --git a/tests/robotests/src/com/android/settings/deletionhelper/AutomaticStorageManagerDescriptionPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/deletionhelper/AutomaticStorageManagerDescriptionPreferenceControllerTest.java
index dd438ff..d0f895a 100644
--- a/tests/robotests/src/com/android/settings/deletionhelper/AutomaticStorageManagerDescriptionPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/deletionhelper/AutomaticStorageManagerDescriptionPreferenceControllerTest.java
@@ -23,7 +23,7 @@
 import org.robolectric.annotation.Config;
 
 @RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION_O)
 public class AutomaticStorageManagerDescriptionPreferenceControllerTest {
     @Mock private PreferenceScreen mScreen;
     @Mock private Preference mPreference;
diff --git a/tests/robotests/src/com/android/settings/deletionhelper/AutomaticStorageManagerSwitchBarControllerTest.java b/tests/robotests/src/com/android/settings/deletionhelper/AutomaticStorageManagerSwitchBarControllerTest.java
index 38c4ab2..3b98063 100644
--- a/tests/robotests/src/com/android/settings/deletionhelper/AutomaticStorageManagerSwitchBarControllerTest.java
+++ b/tests/robotests/src/com/android/settings/deletionhelper/AutomaticStorageManagerSwitchBarControllerTest.java
@@ -51,7 +51,7 @@
 import org.robolectric.annotation.Config;
 
 @RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION_O)
 public class AutomaticStorageManagerSwitchBarControllerTest {
     private Context mContext;
     private SwitchBar mSwitchBar;
diff --git a/tests/robotests/src/com/android/settings/development/AbstractBluetoothA2dpPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/AbstractBluetoothA2dpPreferenceControllerTest.java
new file mode 100644
index 0000000..29f19df
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/development/AbstractBluetoothA2dpPreferenceControllerTest.java
@@ -0,0 +1,171 @@
+/*
+ * Copyright (C) 2017 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.development;
+
+import static com.android.settings.development.AbstractBluetoothA2dpPreferenceController
+        .STREAMING_LABEL_ID;
+
+import static org.mockito.ArgumentMatchers.any;
+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;
+
+import android.bluetooth.BluetoothA2dp;
+import android.bluetooth.BluetoothCodecConfig;
+import android.content.Context;
+import android.support.v7.preference.ListPreference;
+import android.support.v7.preference.PreferenceScreen;
+
+import com.android.settings.TestConfig;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
+import com.android.settingslib.core.lifecycle.Lifecycle;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.mockito.MockitoAnnotations;
+import org.robolectric.RuntimeEnvironment;
+import org.robolectric.annotation.Config;
+
+@RunWith(SettingsRobolectricTestRunner.class)
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION_O)
+public class AbstractBluetoothA2dpPreferenceControllerTest {
+
+    @Mock
+    private BluetoothA2dp mBluetoothA2dp;
+    @Mock
+    private BluetoothCodecConfig mBluetoothCodecConfig;
+    @Mock
+    private ListPreference mPreference;
+    @Mock
+    private PreferenceScreen mScreen;
+    @Mock
+    private BluetoothA2dpConfigStore mBluetoothA2dpConfigStore;
+
+    private Lifecycle mLifecycle;
+    private Context mContext;
+    private AbstractBluetoothA2dpPreferenceController mController;
+
+    @Before
+    public void setup() {
+        MockitoAnnotations.initMocks(this);
+        mContext = RuntimeEnvironment.application;
+        mLifecycle = new Lifecycle(() -> mLifecycle);
+        mController = spy(new AbstractBluetoothA2dpPreferenceControllerImpl(mContext, mLifecycle,
+                mBluetoothA2dpConfigStore));
+        doReturn(mBluetoothCodecConfig).when(mController).getCodecConfig();
+        doNothing().when(mController).setCodecConfigPreference(any());
+        when(mBluetoothA2dpConfigStore.createCodecConfig()).thenReturn(mBluetoothCodecConfig);
+        when(mScreen.findPreference(mController.getPreferenceKey())).thenReturn(mPreference);
+        mController.displayPreference(mScreen);
+    }
+
+    @Test
+    public void onPreferenceChange_bluetoothConnected_shouldUpdateCodec() {
+        mController.onBluetoothServiceConnected(mBluetoothA2dp);
+
+        mController.onPreferenceChange(mPreference, "" /* new value */);
+
+        verify(mController).setCodecConfigPreference(any());
+    }
+
+    @Test
+    public void onPreferenceChange_bluetoothNotConnected_shouldNotUpdateCodec() {
+        mController.onBluetoothServiceDisconnected();
+
+        mController.onPreferenceChange(mPreference, "" /* new value */);
+
+        verify(mController, never()).setCodecConfigPreference(any());
+    }
+
+    @Test
+    public void updateState_option2Set_shouldUpdateToOption2() {
+        when(mBluetoothCodecConfig.getSampleRate()).thenReturn(
+                BluetoothCodecConfig.SAMPLE_RATE_48000);
+
+        doReturn(2).when(mController).getCurrentA2dpSettingIndex(any());
+        mController.updateState(mPreference);
+
+        verify(mPreference).setValue(mController.getListValues()[2]);
+        verify(mPreference).setSummary(mContext.getResources().getString(STREAMING_LABEL_ID,
+                mController.getListSummaries()[2]));
+    }
+
+    @Test
+    public void onBluetoothServiceConnected_shouldUpdateState() {
+        mController.onBluetoothServiceConnected(mBluetoothA2dp);
+
+        verify(mController).updateState(mPreference);
+    }
+
+    @Test
+    public void onDeveloperOptionsSwitchEnabled_shouldEnablePreference() {
+        mController.onDeveloperOptionsSwitchEnabled();
+
+        verify(mPreference).setEnabled(true);
+    }
+
+    @Test
+    public void onDeveloperOptionsSwitchDisabled_shouldDisablePreference() {
+        mController.onDeveloperOptionsSwitchDisabled();
+
+        verify(mPreference).setEnabled(false);
+    }
+
+    static class AbstractBluetoothA2dpPreferenceControllerImpl extends
+            AbstractBluetoothA2dpPreferenceController {
+
+        public AbstractBluetoothA2dpPreferenceControllerImpl(Context context,
+                Lifecycle lifecycle, BluetoothA2dpConfigStore store) {
+            super(context, lifecycle, store);
+        }
+
+        @Override
+        public String getPreferenceKey() {
+            return null;
+        }
+
+        @Override
+        protected String[] getListValues() {
+            return new String[]{"1", "2", "3"};
+        }
+
+        @Override
+        protected String[] getListSummaries() {
+            return new String[]{"foo", "bar", "foobar"};
+        }
+
+        @Override
+        protected void writeConfigurationValues(Object newValue) {
+        }
+
+        @Override
+        protected int getCurrentA2dpSettingIndex(BluetoothCodecConfig config) {
+            return 0;
+        }
+
+        @Override
+        protected int getDefaultIndex() {
+            return 0;
+        }
+    }
+
+}
diff --git a/tests/robotests/src/com/android/settings/development/AdbPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/AdbPreferenceControllerTest.java
new file mode 100644
index 0000000..6dac819
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/development/AdbPreferenceControllerTest.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.development;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import static org.mockito.Mockito.doReturn;
+import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+import android.content.Context;
+import android.os.UserManager;
+import android.provider.Settings;
+import android.support.v14.preference.SwitchPreference;
+import android.support.v7.preference.PreferenceScreen;
+
+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_O)
+public class AdbPreferenceControllerTest {
+
+    @Mock
+    private SwitchPreference mPreference;
+    @Mock
+    private PreferenceScreen mPreferenceScreen;
+    @Mock
+    private UserManager mUserManager;
+    @Mock
+    private DevelopmentSettingsDashboardFragment mFragment;
+
+    private Context mContext;
+    private AdbPreferenceController mController;
+
+    @Before
+    public void setup() {
+        MockitoAnnotations.initMocks(this);
+        mContext = RuntimeEnvironment.application;
+        mController = spy(new AdbPreferenceController(mContext, mFragment));
+        doReturn(true).when(mController).isAvailable();
+        when(mPreferenceScreen.findPreference(mController.getPreferenceKey())).thenReturn(
+                mPreference);
+        mController.displayPreference(mPreferenceScreen);
+    }
+
+    @Test
+    public void onDeveloperOptionsDisabled_shouldDisablePreference() {
+        mController.onDeveloperOptionsDisabled();
+        final int mode = Settings.System.getInt(mContext.getContentResolver(),
+                Settings.Global.ADB_ENABLED, -1);
+
+        assertThat(mode).isEqualTo(AdbPreferenceController.ADB_SETTING_OFF);
+        verify(mPreference).setEnabled(false);
+        verify(mPreference).setChecked(false);
+    }
+
+    @Test
+    public void onDeveloperOptionsEnabled_shouldEnablePreference() {
+        when(mUserManager.isAdminUser()).thenReturn(true);
+        mController.onDeveloperOptionsEnabled();
+
+        verify(mPreference).setEnabled(true);
+    }
+
+    @Test
+    public void onAdbDialogConfirmed_shouldEnableAdbSetting() {
+        mController.onAdbDialogConfirmed();
+        final int mode = Settings.System.getInt(mContext.getContentResolver(),
+                Settings.Global.ADB_ENABLED, -1);
+
+        assertThat(mode).isEqualTo(AdbPreferenceController.ADB_SETTING_ON);
+    }
+
+    @Test
+    public void onAdbDialogDismissed_preferenceShouldNotBeChecked() {
+        Settings.System.putInt(mContext.getContentResolver(), Settings.Global.ADB_ENABLED,
+                AdbPreferenceController.ADB_SETTING_OFF);
+        mController.onAdbDialogDismissed();
+
+        verify(mPreference).setChecked(false);
+    }
+}
diff --git a/tests/robotests/src/com/android/settings/development/AllowAppsOnExternalPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/AllowAppsOnExternalPreferenceControllerTest.java
new file mode 100644
index 0000000..2703617
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/development/AllowAppsOnExternalPreferenceControllerTest.java
@@ -0,0 +1,124 @@
+/*
+ * Copyright (C) 2017 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.development;
+
+
+import static com.android.settings.development.AllowAppsOnExternalPreferenceController
+        .SETTING_VALUE_OFF;
+import static com.android.settings.development.AllowAppsOnExternalPreferenceController
+        .SETTING_VALUE_ON;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+import android.content.Context;
+import android.provider.Settings;
+import android.support.v14.preference.SwitchPreference;
+import android.support.v7.preference.PreferenceScreen;
+
+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_O)
+public class AllowAppsOnExternalPreferenceControllerTest {
+
+    @Mock
+    private SwitchPreference mPreference;
+    @Mock
+    private PreferenceScreen mPreferenceScreen;
+
+    private Context mContext;
+    private AllowAppsOnExternalPreferenceController mController;
+
+    @Before
+    public void setup() {
+        MockitoAnnotations.initMocks(this);
+        mContext = RuntimeEnvironment.application;
+        mController = new AllowAppsOnExternalPreferenceController(mContext);
+        when(mPreferenceScreen.findPreference(mController.getPreferenceKey())).thenReturn(
+                mPreference);
+        mController.displayPreference(mPreferenceScreen);
+    }
+
+    @Test
+    public void onPreferenceChange_settingEnabled_allowAppsOnExternalShouldBeOn() {
+        mController.onPreferenceChange(mPreference, true /* new value */);
+
+        final int mode = Settings.Global.getInt(mContext.getContentResolver(),
+                Settings.Global.FORCE_ALLOW_ON_EXTERNAL, -1 /* default */);
+
+        assertThat(mode).isEqualTo(SETTING_VALUE_ON);
+    }
+
+    @Test
+    public void onPreferenceChange_settingDisabled_allowAppsOnExternalShouldBeOff() {
+        mController.onPreferenceChange(mPreference, false /* new value */);
+
+        final int mode = Settings.Global.getInt(mContext.getContentResolver(),
+                Settings.Global.FORCE_ALLOW_ON_EXTERNAL, -1 /* default */);
+
+        assertThat(mode).isEqualTo(SETTING_VALUE_OFF);
+    }
+
+    @Test
+    public void updateState_settingDisabled_preferenceShouldNotBeChecked() {
+        Settings.Global.putInt(mContext.getContentResolver(),
+                Settings.Global.FORCE_ALLOW_ON_EXTERNAL, SETTING_VALUE_OFF);
+        mController.updateState(mPreference);
+
+        verify(mPreference).setChecked(false);
+    }
+
+    @Test
+    public void updateState_settingEnabled_preferenceShouldBeChecked() {
+        Settings.Global.putInt(mContext.getContentResolver(),
+                Settings.Global.FORCE_ALLOW_ON_EXTERNAL, SETTING_VALUE_ON);
+        mController.updateState(mPreference);
+
+        verify(mPreference).setChecked(true);
+    }
+
+    @Test
+    public void onDeveloperOptionsSwitchDisabled_shouldDisablePreference() {
+        mController.onDeveloperOptionsSwitchDisabled();
+
+        final int mode = Settings.Global.getInt(mContext.getContentResolver(),
+                Settings.Global.FORCE_ALLOW_ON_EXTERNAL, -1 /* default */);
+
+        assertThat(mode).isEqualTo(SETTING_VALUE_OFF);
+        verify(mPreference).setChecked(false);
+        verify(mPreference).setEnabled(false);
+    }
+
+    @Test
+    public void onDeveloperOptionsSwitchEnabled_shouldEnablePreference() {
+        mController.onDeveloperOptionsSwitchEnabled();
+
+        verify(mPreference).setEnabled(true);
+    }
+}
diff --git a/tests/robotests/src/com/android/settings/development/AnimatorDurationScalePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/AnimatorDurationScalePreferenceControllerTest.java
new file mode 100644
index 0000000..6c83e47
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/development/AnimatorDurationScalePreferenceControllerTest.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.development;
+
+import static com.android.settings.development.AnimatorDurationScalePreferenceController
+        .ANIMATOR_DURATION_SCALE_SELECTOR;
+import static com.android.settings.development.AnimatorDurationScalePreferenceController
+        .DEFAULT_VALUE;
+
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+import android.content.Context;
+import android.os.RemoteException;
+import android.support.v7.preference.ListPreference;
+import android.support.v7.preference.PreferenceScreen;
+import android.view.IWindowManager;
+
+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.RuntimeEnvironment;
+import org.robolectric.annotation.Config;
+import org.robolectric.util.ReflectionHelpers;
+
+@RunWith(SettingsRobolectricTestRunner.class)
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION_O)
+public class AnimatorDurationScalePreferenceControllerTest {
+
+    @Mock
+    private ListPreference mPreference;
+    @Mock
+    private PreferenceScreen mScreen;
+    @Mock
+    private IWindowManager mWindowManager;
+
+    /**
+     * 0: Animation off
+     * 1: Animation scale .5x
+     * 2: Animation scale 1x
+     * 3: Animation scale 1.5x
+     * 4: Animation scale 2x
+     * 5: Animation scale 5x
+     * 6: Animation scale 10x
+     */
+    private String[] mListValues;
+    private String[] mListSummaries;
+    private Context mContext;
+    private AnimatorDurationScalePreferenceController mController;
+
+    @Before
+    public void setup() {
+        MockitoAnnotations.initMocks(this);
+        mContext = RuntimeEnvironment.application;
+        mListValues = mContext.getResources().getStringArray(
+                R.array.animator_duration_scale_values);
+        mListSummaries = mContext.getResources().getStringArray(
+                R.array.animator_duration_scale_entries);
+        mController = new AnimatorDurationScalePreferenceController(mContext);
+        ReflectionHelpers.setField(mController, "mWindowManager", mWindowManager);
+        when(mScreen.findPreference(mController.getPreferenceKey())).thenReturn(mPreference);
+        mController.displayPreference(mScreen);
+    }
+
+    @Test
+    public void onPreferenceChange_noValueSet_shouldSetDefault() throws RemoteException {
+        mController.onPreferenceChange(mPreference, null /* new value */);
+
+        verify(mWindowManager).setAnimationScale(ANIMATOR_DURATION_SCALE_SELECTOR, DEFAULT_VALUE);
+    }
+
+    @Test
+    public void onPreferenceChange_option5Selected_shouldSetOption5() throws RemoteException {
+        mController.onPreferenceChange(mPreference, mListValues[5]);
+
+        verify(mWindowManager).setAnimationScale(ANIMATOR_DURATION_SCALE_SELECTOR,
+                Float.valueOf(mListValues[5]));
+    }
+
+    @Test
+    public void updateState_option5Set_shouldUpdatePreferenceToOption5() throws RemoteException {
+        when(mWindowManager.getAnimationScale(ANIMATOR_DURATION_SCALE_SELECTOR)).thenReturn(
+                Float.valueOf(mListValues[5]));
+
+        mController.updateState(mPreference);
+
+        verify(mPreference).setValue(mListValues[5]);
+        verify(mPreference).setSummary(mListSummaries[5]);
+    }
+
+    @Test
+    public void updateState_option3Set_shouldUpdatePreferenceToOption3() throws RemoteException {
+        when(mWindowManager.getAnimationScale(ANIMATOR_DURATION_SCALE_SELECTOR)).thenReturn(
+                Float.valueOf(mListValues[3]));
+
+        mController.updateState(mPreference);
+
+        verify(mPreference).setValue(mListValues[3]);
+        verify(mPreference).setSummary(mListSummaries[3]);
+    }
+
+    @Test
+    public void onDeveloperOptionsSwitchDisabled_shouldDisablePreference() throws RemoteException {
+        mController.onDeveloperOptionsSwitchDisabled();
+
+        verify(mWindowManager).setAnimationScale(ANIMATOR_DURATION_SCALE_SELECTOR, DEFAULT_VALUE);
+        verify(mPreference).setEnabled(false);
+    }
+
+    @Test
+    public void onDeveloperOptionsSwitchEnabled_shouldEnablePreference() throws RemoteException {
+        mController.onDeveloperOptionsSwitchEnabled();
+
+        verify(mPreference).setEnabled(true);
+    }
+}
diff --git a/tests/robotests/src/com/android/settings/development/AppsNotRespondingPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/AppsNotRespondingPreferenceControllerTest.java
new file mode 100644
index 0000000..8850df0
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/development/AppsNotRespondingPreferenceControllerTest.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.development;
+
+import static com.android.settings.development.AppsNotRespondingPreferenceController
+        .SETTING_VALUE_OFF;
+import static com.android.settings.development.AppsNotRespondingPreferenceController
+        .SETTING_VALUE_ON;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+import android.content.Context;
+import android.provider.Settings;
+import android.support.v14.preference.SwitchPreference;
+import android.support.v7.preference.PreferenceScreen;
+
+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_O)
+public class AppsNotRespondingPreferenceControllerTest {
+
+    @Mock
+    private SwitchPreference mPreference;
+    @Mock
+    private PreferenceScreen mPreferenceScreen;
+
+    private Context mContext;
+    private AppsNotRespondingPreferenceController mController;
+
+    @Before
+    public void setup() {
+        MockitoAnnotations.initMocks(this);
+        mContext = RuntimeEnvironment.application;
+        mController = new AppsNotRespondingPreferenceController(mContext);
+        when(mPreferenceScreen.findPreference(mController.getPreferenceKey())).thenReturn(
+                mPreference);
+        mController.displayPreference(mPreferenceScreen);
+    }
+
+    @Test
+    public void onPreferenceChange_settingEnabled_appsNotRespondingDialogShouldBeOn() {
+        mController.onPreferenceChange(mPreference, true /* new value */);
+
+        final int mode = Settings.Secure.getInt(mContext.getContentResolver(),
+                Settings.Secure.ANR_SHOW_BACKGROUND, -1 /* default */);
+
+        assertThat(mode).isEqualTo(SETTING_VALUE_ON);
+    }
+
+    @Test
+    public void onPreferenceChange_settingDisabled_appsNotRespondingDialogShouldBeOff() {
+        mController.onPreferenceChange(mPreference, false /* new value */);
+
+        final int mode = Settings.Secure.getInt(mContext.getContentResolver(),
+                Settings.Secure.ANR_SHOW_BACKGROUND, -1 /* default */);
+
+        assertThat(mode).isEqualTo(SETTING_VALUE_OFF);
+    }
+
+    @Test
+    public void updateState_settingDisabled_preferenceShouldNotBeChecked() {
+        Settings.Secure.putInt(mContext.getContentResolver(),
+                Settings.Secure.ANR_SHOW_BACKGROUND, SETTING_VALUE_OFF);
+        mController.updateState(mPreference);
+
+        verify(mPreference).setChecked(false);
+    }
+
+    @Test
+    public void updateState_settingEnabled_preferenceShouldBeChecked() {
+        Settings.Secure.putInt(mContext.getContentResolver(),
+                Settings.Secure.ANR_SHOW_BACKGROUND, SETTING_VALUE_ON);
+        mController.updateState(mPreference);
+
+        verify(mPreference).setChecked(true);
+    }
+
+    @Test
+    public void onDeveloperOptionsSwitchDisabled_shouldDisablePreference() {
+        mController.onDeveloperOptionsSwitchDisabled();
+
+        final int mode = Settings.Secure.getInt(mContext.getContentResolver(),
+                Settings.Secure.ANR_SHOW_BACKGROUND, -1 /* default */);
+
+        assertThat(mode).isEqualTo(SETTING_VALUE_OFF);
+        verify(mPreference).setChecked(false);
+        verify(mPreference).setEnabled(false);
+    }
+
+    @Test
+    public void onDeveloperOptionsSwitchEnabled_shouldEnablePreference() {
+        mController.onDeveloperOptionsSwitchEnabled();
+
+        verify(mPreference).setEnabled(true);
+    }
+}
diff --git a/tests/robotests/src/com/android/settings/development/BackgroundProcessLimitPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/BackgroundProcessLimitPreferenceControllerTest.java
new file mode 100644
index 0000000..67b2abe
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/development/BackgroundProcessLimitPreferenceControllerTest.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.development;
+
+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.IActivityManager;
+import android.content.Context;
+import android.os.RemoteException;
+import android.support.v7.preference.ListPreference;
+import android.support.v7.preference.PreferenceScreen;
+
+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.RuntimeEnvironment;
+import org.robolectric.annotation.Config;
+
+@RunWith(SettingsRobolectricTestRunner.class)
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION_O)
+public class BackgroundProcessLimitPreferenceControllerTest {
+
+    @Mock
+    private IActivityManager mActivityManager;
+    @Mock
+    private ListPreference mPreference;
+    @Mock
+    private PreferenceScreen mScreen;
+
+    /**
+     * 0: Standard limit
+     * 1: No Background processes
+     * 2: At most 1 process
+     * 3: At most 2 processes
+     * 4: At most 3 processes
+     * 5: At most 4 processes
+     */
+    private String[] mListValues;
+    private String[] mListSummaries;
+    private Context mContext;
+    private BackgroundProcessLimitPreferenceController mController;
+
+    @Before
+    public void setup() {
+        MockitoAnnotations.initMocks(this);
+        mContext = RuntimeEnvironment.application;
+        mListValues = mContext.getResources().getStringArray(R.array.app_process_limit_values);
+        mListSummaries = mContext.getResources().getStringArray(R.array.app_process_limit_entries);
+        mController = spy(new BackgroundProcessLimitPreferenceController(mContext));
+        doReturn(mActivityManager).when(mController).getActivityManagerService();
+        when(mScreen.findPreference(mController.getPreferenceKey())).thenReturn(mPreference);
+        mController.displayPreference(mScreen);
+    }
+
+    @Test
+    public void onPreferenceChange_noBackgroundProcessSet_shouldSetToNoBackgroundProcess()
+            throws RemoteException {
+        mController.onPreferenceChange(mPreference, mListValues[1]);
+
+        verify(mActivityManager).setProcessLimit(Integer.valueOf(mListValues[1]));
+    }
+
+    @Test
+    public void onPreferenceChange_1ProcessSet_shouldSetTo1BackgroundProcess()
+            throws RemoteException {
+        mController.onPreferenceChange(mPreference, mListValues[2]);
+
+        verify(mActivityManager).setProcessLimit(Integer.valueOf(mListValues[2]));
+    }
+
+    @Test
+    public void updateState_noBackgroundProcessSet_shouldSetPreferenceToNoBackgroundProcess()
+            throws RemoteException {
+        when(mActivityManager.getProcessLimit()).thenReturn(Integer.valueOf(mListValues[1]));
+
+        mController.updateState(mPreference);
+
+        verify(mPreference).setValue(mListValues[1]);
+        verify(mPreference).setSummary(mListSummaries[1]);
+    }
+
+    @Test
+    public void updateState_1ProcessSet_shouldSetPreference1BackgroundProcess()
+            throws RemoteException {
+        when(mActivityManager.getProcessLimit()).thenReturn(Integer.valueOf(mListValues[2]));
+
+        mController.updateState(mPreference);
+
+        verify(mPreference).setValue(mListValues[2]);
+        verify(mPreference).setSummary(mListSummaries[2]);
+    }
+
+    @Test
+    public void updateState_veryHighLimit_shouldDefaultToStandardLimit() throws RemoteException {
+        when(mActivityManager.getProcessLimit()).thenReturn(Integer.MAX_VALUE);
+
+        mController.updateState(mPreference);
+
+        verify(mPreference).setValue(mListValues[0]);
+        verify(mPreference).setSummary(mListSummaries[0]);
+    }
+
+    @Test
+    public void onDeveloperOptionsSwitchEnabled_shouldEnablePreference() {
+        mController.onDeveloperOptionsSwitchEnabled();
+
+        verify(mPreference).setEnabled(true);
+    }
+
+    @Test
+    public void onDeveloperOptionsSwitchDisabled_shouldDisableAndResetPreference()
+            throws RemoteException {
+        mController.onDeveloperOptionsSwitchDisabled();
+
+        verify(mPreference).setEnabled(false);
+        verify(mActivityManager).setProcessLimit(-1);
+    }
+}
diff --git a/tests/robotests/src/com/android/settings/development/BluetoothAbsoluteVolumePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/BluetoothAbsoluteVolumePreferenceControllerTest.java
new file mode 100644
index 0000000..652832f
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/development/BluetoothAbsoluteVolumePreferenceControllerTest.java
@@ -0,0 +1,124 @@
+/*
+ * Copyright (C) 2017 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.development;
+
+
+import static com.android.settings.development.BluetoothAbsoluteVolumePreferenceController
+        .BLUETOOTH_DISABLE_ABSOLUTE_VOLUME_PROPERTY;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+import android.content.Context;
+import android.support.v14.preference.SwitchPreference;
+import android.support.v7.preference.PreferenceScreen;
+
+import com.android.settings.TestConfig;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
+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.RuntimeEnvironment;
+import org.robolectric.annotation.Config;
+
+@RunWith(SettingsRobolectricTestRunner.class)
+@Config(manifest = TestConfig.MANIFEST_PATH,
+        sdk = TestConfig.SDK_VERSION_O,
+        shadows = {SettingsShadowSystemProperties.class})
+public class BluetoothAbsoluteVolumePreferenceControllerTest {
+
+    @Mock
+    private SwitchPreference mPreference;
+    @Mock
+    private PreferenceScreen mPreferenceScreen;
+
+    private Context mContext;
+    private BluetoothAbsoluteVolumePreferenceController mController;
+
+    @Before
+    public void setup() {
+        MockitoAnnotations.initMocks(this);
+        mContext = RuntimeEnvironment.application;
+        mController = new BluetoothAbsoluteVolumePreferenceController(mContext);
+        when(mPreferenceScreen.findPreference(mController.getPreferenceKey())).thenReturn(
+                mPreference);
+        mController.displayPreference(mPreferenceScreen);
+    }
+
+    @Test
+    public void onPreferenceChanged_settingEnabled_shouldTurnOnBluetoothDisableAbsoluteVolume() {
+        mController.onPreferenceChange(mPreference, true /* new value */);
+
+        final boolean mode = SettingsShadowSystemProperties.getBoolean(
+                BLUETOOTH_DISABLE_ABSOLUTE_VOLUME_PROPERTY, false /* default */);
+
+        assertThat(mode).isTrue();
+    }
+
+    @Test
+    public void onPreferenceChanged_settingDisabled_shouldTurnOffBluetoothDisableAbsoluteVolume() {
+        mController.onPreferenceChange(mPreference, false /* new value */);
+
+        final boolean mode = SettingsShadowSystemProperties.getBoolean(
+                BLUETOOTH_DISABLE_ABSOLUTE_VOLUME_PROPERTY, false /* default */);
+
+        assertThat(mode).isFalse();
+    }
+
+    @Test
+    public void updateState_settingEnabled_preferenceShouldBeChecked() {
+        SettingsShadowSystemProperties.set(BLUETOOTH_DISABLE_ABSOLUTE_VOLUME_PROPERTY,
+                Boolean.toString(true));
+        mController.updateState(mPreference);
+
+        verify(mPreference).setChecked(true);
+    }
+
+    @Test
+    public void updateState_settingDisabled_preferenceShouldNotBeChecked() {
+        SettingsShadowSystemProperties.set(BLUETOOTH_DISABLE_ABSOLUTE_VOLUME_PROPERTY,
+                Boolean.toString(false));
+        mController.updateState(mPreference);
+
+        verify(mPreference).setChecked(false);
+    }
+
+    @Test
+    public void onDeveloperOptionsDisabled_shouldDisablePreference() {
+        mController.onDeveloperOptionsDisabled();
+
+        final boolean mode = SettingsShadowSystemProperties.getBoolean(
+                BLUETOOTH_DISABLE_ABSOLUTE_VOLUME_PROPERTY, false /* default */);
+
+        assertThat(mode).isFalse();
+        verify(mPreference).setEnabled(false);
+        verify(mPreference).setChecked(false);
+    }
+
+    @Test
+    public void onDeveloperOptionsEnabled_shouldEnablePreference() {
+        mController.onDeveloperOptionsEnabled();
+
+        verify(mPreference).setEnabled(true);
+    }
+}
diff --git a/tests/robotests/src/com/android/settings/development/BluetoothAudioBitsPerSamplePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/BluetoothAudioBitsPerSamplePreferenceControllerTest.java
new file mode 100644
index 0000000..586d626
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/development/BluetoothAudioBitsPerSamplePreferenceControllerTest.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.development;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+import android.bluetooth.BluetoothCodecConfig;
+import android.content.Context;
+import android.support.v7.preference.ListPreference;
+import android.support.v7.preference.PreferenceScreen;
+
+import com.android.settings.TestConfig;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
+import com.android.settingslib.core.lifecycle.Lifecycle;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.mockito.MockitoAnnotations;
+import org.robolectric.RuntimeEnvironment;
+import org.robolectric.annotation.Config;
+
+@RunWith(SettingsRobolectricTestRunner.class)
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION_O)
+public class BluetoothAudioBitsPerSamplePreferenceControllerTest {
+
+    @Mock
+    private BluetoothCodecConfig mBluetoothCodecConfig;
+    @Mock
+    private ListPreference mPreference;
+    @Mock
+    private PreferenceScreen mScreen;
+    @Mock
+    private BluetoothA2dpConfigStore mBluetoothA2dpConfigStore;
+
+    /**
+     * 0: Use System Selection (Default)
+     * 1: 16 bits/sample
+     * 2: 24 bits/sample
+     * 3: 32 bits/sample
+     */
+    private String[] mListValues;
+    private Context mContext;
+    private BluetoothAudioBitsPerSamplePreferenceController mController;
+    private Lifecycle mLifecycle;
+
+    @Before
+    public void setup() {
+        MockitoAnnotations.initMocks(this);
+        mContext = RuntimeEnvironment.application;
+        mLifecycle = new Lifecycle(() -> mLifecycle);
+        mController = spy(new BluetoothAudioBitsPerSamplePreferenceController(mContext,
+                mLifecycle, mBluetoothA2dpConfigStore));
+        mListValues = mController.getListValues();
+        when(mScreen.findPreference(mController.getPreferenceKey())).thenReturn(mPreference);
+        mController.displayPreference(mScreen);
+    }
+
+    @Test
+    public void writeConfigurationValues_option2_shouldWriteOption2ToSharedStore() {
+        when(mPreference.findIndexOfValue(mListValues[2])).thenReturn(2);
+        mController.writeConfigurationValues(mListValues[2]);
+
+        verify(mBluetoothA2dpConfigStore).setBitsPerSample(BluetoothCodecConfig.BITS_PER_SAMPLE_24);
+    }
+
+    @Test
+    public void writeConfigurationValues_default_shouldSetDefault() {
+        when(mPreference.findIndexOfValue(mListValues[0])).thenReturn(0);
+        mController.writeConfigurationValues(mListValues[0]);
+
+        verify(mBluetoothA2dpConfigStore).setBitsPerSample(
+                BluetoothCodecConfig.BITS_PER_SAMPLE_NONE);
+    }
+
+    @Test
+    public void getCurrentA2dpSettingIndex_option2_shouldReturnSecondIndex() {
+        when(mBluetoothCodecConfig.getBitsPerSample()).thenReturn(
+                BluetoothCodecConfig.BITS_PER_SAMPLE_24);
+
+        final int index = mController.getCurrentA2dpSettingIndex(mBluetoothCodecConfig);
+
+        assertThat(index).isEqualTo(2);
+    }
+
+    @Test
+    public void getCurrentA2dpSettingIndex_unknownOption_shouldReturnDefault() {
+        when(mBluetoothCodecConfig.getCodecType()).thenReturn(1381391835);
+
+        final int index = mController.getCurrentA2dpSettingIndex(mBluetoothCodecConfig);
+
+        assertThat(index).isEqualTo(0);
+    }
+}
diff --git a/tests/robotests/src/com/android/settings/development/BluetoothAudioChannelModePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/BluetoothAudioChannelModePreferenceControllerTest.java
new file mode 100644
index 0000000..2f51f1c
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/development/BluetoothAudioChannelModePreferenceControllerTest.java
@@ -0,0 +1,112 @@
+/*
+ * Copyright (C) 2017 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.development;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+import android.bluetooth.BluetoothCodecConfig;
+import android.content.Context;
+import android.support.v7.preference.ListPreference;
+import android.support.v7.preference.PreferenceScreen;
+
+import com.android.settings.TestConfig;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
+import com.android.settingslib.core.lifecycle.Lifecycle;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.mockito.MockitoAnnotations;
+import org.robolectric.RuntimeEnvironment;
+import org.robolectric.annotation.Config;
+
+@RunWith(SettingsRobolectricTestRunner.class)
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION_O)
+public class BluetoothAudioChannelModePreferenceControllerTest {
+
+    @Mock
+    private BluetoothCodecConfig mBluetoothCodecConfig;
+    @Mock
+    private ListPreference mPreference;
+    @Mock
+    private PreferenceScreen mScreen;
+    @Mock
+    private BluetoothA2dpConfigStore mBluetoothA2dpConfigStore;
+
+    /**
+     * 0: Use System Selection (Default)
+     * 1: Mono
+     * 2: Stereo
+     */
+    private String[] mListValues;
+    private Context mContext;
+    private BluetoothAudioChannelModePreferenceController mController;
+    private Lifecycle mLifecycle;
+
+    @Before
+    public void setup() {
+        MockitoAnnotations.initMocks(this);
+        mContext = RuntimeEnvironment.application;
+        mLifecycle = new Lifecycle(() -> mLifecycle);
+        mController = spy(new BluetoothAudioChannelModePreferenceController(mContext,
+                mLifecycle, mBluetoothA2dpConfigStore));
+        mListValues = mController.getListValues();
+        when(mScreen.findPreference(mController.getPreferenceKey())).thenReturn(mPreference);
+        mController.displayPreference(mScreen);
+    }
+
+    @Test
+    public void writeConfigurationValues_option2_shouldWriteOption2ToSharedStore() {
+        when(mPreference.findIndexOfValue(mListValues[2])).thenReturn(2);
+        mController.writeConfigurationValues(mListValues[2]);
+
+        verify(mBluetoothA2dpConfigStore).setChannelMode(BluetoothCodecConfig.CHANNEL_MODE_STEREO);
+    }
+
+    @Test
+    public void writeConfigurationValues_default_shouldSetDefault() {
+        when(mPreference.findIndexOfValue(mListValues[0])).thenReturn(0);
+        mController.writeConfigurationValues(mListValues[0]);
+
+        verify(mBluetoothA2dpConfigStore).setChannelMode(
+                BluetoothCodecConfig.CHANNEL_MODE_NONE);
+    }
+
+    @Test
+    public void getCurrentA2dpSettingIndex_option2_shouldReturnSecondIndex() {
+        when(mBluetoothCodecConfig.getChannelMode()).thenReturn(
+                BluetoothCodecConfig.CHANNEL_MODE_STEREO);
+
+        final int index = mController.getCurrentA2dpSettingIndex(mBluetoothCodecConfig);
+
+        assertThat(index).isEqualTo(2);
+    }
+
+    @Test
+    public void getCurrentA2dpSettingIndex_unknownOption_shouldReturnDefault() {
+        when(mBluetoothCodecConfig.getCodecType()).thenReturn(1381391835);
+
+        final int index = mController.getCurrentA2dpSettingIndex(mBluetoothCodecConfig);
+
+        assertThat(index).isEqualTo(0);
+    }
+}
diff --git a/tests/robotests/src/com/android/settings/development/BluetoothAudioCodecPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/BluetoothAudioCodecPreferenceControllerTest.java
new file mode 100644
index 0000000..33cd3a1
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/development/BluetoothAudioCodecPreferenceControllerTest.java
@@ -0,0 +1,119 @@
+/*
+ * Copyright (C) 2017 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF 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 static com.google.common.truth.Truth.assertThat;
+
+import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+import android.bluetooth.BluetoothCodecConfig;
+import android.content.Context;
+import android.support.v7.preference.ListPreference;
+import android.support.v7.preference.PreferenceScreen;
+
+import com.android.settings.TestConfig;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
+import com.android.settingslib.core.lifecycle.Lifecycle;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.mockito.MockitoAnnotations;
+import org.robolectric.RuntimeEnvironment;
+import org.robolectric.annotation.Config;
+
+@RunWith(SettingsRobolectricTestRunner.class)
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION_O)
+public class BluetoothAudioCodecPreferenceControllerTest {
+
+    @Mock
+    private BluetoothCodecConfig mBluetoothCodecConfig;
+    @Mock
+    private ListPreference mPreference;
+    @Mock
+    private PreferenceScreen mScreen;
+    @Mock
+    private BluetoothA2dpConfigStore mBluetoothA2dpConfigStore;
+
+    /**
+     * 0: Use System Selection (Default)
+     * 1: SBC
+     * 2: AAC
+     * 3: Qualcomm aptX audio
+     * 4: Qualcomm aptX HD audio
+     * 5: LDAC
+     * 6: Enable Optional Codecs
+     * 7: Disable Optional Codecs
+     */
+    private String[] mListValues;
+    private Context mContext;
+    private BluetoothAudioCodecPreferenceController mController;
+    private Lifecycle mLifecycle;
+
+    @Before
+    public void setup() {
+        MockitoAnnotations.initMocks(this);
+        mContext = RuntimeEnvironment.application;
+        mLifecycle = new Lifecycle(() -> mLifecycle);
+        mController = spy(new BluetoothAudioCodecPreferenceController(mContext, mLifecycle,
+                mBluetoothA2dpConfigStore));
+        mListValues = mController.getListValues();
+        when(mScreen.findPreference(mController.getPreferenceKey())).thenReturn(mPreference);
+        mController.displayPreference(mScreen);
+    }
+
+    @Test
+    public void writeConfigurationValues_option2_shouldWriteOption2ToSharedStore() {
+        when(mPreference.findIndexOfValue(mListValues[2])).thenReturn(2);
+        mController.writeConfigurationValues(mListValues[2]);
+
+        verify(mBluetoothA2dpConfigStore).setCodecType(BluetoothCodecConfig.SOURCE_CODEC_TYPE_AAC);
+        verify(mBluetoothA2dpConfigStore).setCodecPriority(
+                BluetoothCodecConfig.CODEC_PRIORITY_HIGHEST);
+    }
+
+    @Test
+    public void writeConfigurationValues_default_shouldSetDefaultPriority() {
+        when(mPreference.findIndexOfValue(mListValues[0])).thenReturn(0);
+        mController.writeConfigurationValues(mListValues[0]);
+
+        verify(mBluetoothA2dpConfigStore).setCodecPriority(
+                BluetoothCodecConfig.CODEC_PRIORITY_DEFAULT);
+    }
+
+    @Test
+    public void getCurrentA2dpSettingIndex_option2_shouldReturnSecondIndex() {
+        when(mBluetoothCodecConfig.getCodecType()).thenReturn(
+                BluetoothCodecConfig.SOURCE_CODEC_TYPE_AAC);
+
+        final int index = mController.getCurrentA2dpSettingIndex(mBluetoothCodecConfig);
+
+        assertThat(index).isEqualTo(2);
+    }
+
+    @Test
+    public void getCurrentA2dpSettingIndex_unknownOption_shouldReturnDefault() {
+        when(mBluetoothCodecConfig.getCodecType()).thenReturn(1381391835);
+
+        final int index = mController.getCurrentA2dpSettingIndex(mBluetoothCodecConfig);
+
+        assertThat(index).isEqualTo(0);
+    }
+}
diff --git a/tests/robotests/src/com/android/settings/development/BluetoothAudioQualityPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/BluetoothAudioQualityPreferenceControllerTest.java
new file mode 100644
index 0000000..20593dc
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/development/BluetoothAudioQualityPreferenceControllerTest.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.development;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+import android.bluetooth.BluetoothCodecConfig;
+import android.content.Context;
+import android.support.v7.preference.ListPreference;
+import android.support.v7.preference.PreferenceScreen;
+
+import com.android.settings.TestConfig;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
+import com.android.settingslib.core.lifecycle.Lifecycle;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.mockito.MockitoAnnotations;
+import org.robolectric.RuntimeEnvironment;
+import org.robolectric.annotation.Config;
+
+@RunWith(SettingsRobolectricTestRunner.class)
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION_O)
+public class BluetoothAudioQualityPreferenceControllerTest {
+
+    @Mock
+    private BluetoothCodecConfig mBluetoothCodecConfig;
+    @Mock
+    private ListPreference mPreference;
+    @Mock
+    private PreferenceScreen mScreen;
+    @Mock
+    private BluetoothA2dpConfigStore mBluetoothA2dpConfigStore;
+
+    /**
+     * 0: Optimized for Audio Quality (990kbps/909kbps)
+     * 1: Balanced Audio And Connection Quality (660kbps/606kbps)
+     * 2: Stereo
+     */
+    private String[] mListValues;
+    private Context mContext;
+    private BluetoothAudioQualityPreferenceController mController;
+    private Lifecycle mLifecycle;
+
+    @Before
+    public void setup() {
+        MockitoAnnotations.initMocks(this);
+        mContext = RuntimeEnvironment.application;
+        mLifecycle = new Lifecycle(() -> mLifecycle);
+        mController = spy(new BluetoothAudioQualityPreferenceController(mContext,
+                mLifecycle, mBluetoothA2dpConfigStore));
+        mListValues = mController.getListValues();
+        when(mScreen.findPreference(mController.getPreferenceKey())).thenReturn(mPreference);
+        mController.displayPreference(mScreen);
+    }
+
+    @Test
+    public void writeConfigurationValues_option3_shouldWrite1003ToSharedStore() {
+        when(mPreference.findIndexOfValue(mListValues[3])).thenReturn(3);
+        mController.writeConfigurationValues(mListValues[3]);
+
+        verify(mBluetoothA2dpConfigStore).setCodecSpecific1Value(1003);
+    }
+
+    @Test
+    public void writeConfigurationValues_default_shouldSetDefault() {
+        when(mPreference.findIndexOfValue(mListValues[0])).thenReturn(0);
+        mController.writeConfigurationValues(mListValues[0]);
+
+        verify(mBluetoothA2dpConfigStore).setCodecSpecific1Value(1000);
+    }
+
+    @Test
+    public void getCurrentA2dpSettingIndex_option2_shouldReturnSecondIndex() {
+        when(mBluetoothCodecConfig.getCodecSpecific1()).thenReturn(Long.valueOf(2));
+
+        final int index = mController.getCurrentA2dpSettingIndex(mBluetoothCodecConfig);
+
+        assertThat(index).isEqualTo(2);
+    }
+
+    @Test
+    public void getCurrentA2dpSettingIndex_unknownOption_shouldReturnDefault() {
+        when(mBluetoothCodecConfig.getCodecType()).thenReturn(1381391835);
+
+        final int index = mController.getCurrentA2dpSettingIndex(mBluetoothCodecConfig);
+
+        assertThat(index).isEqualTo(3);
+    }
+}
diff --git a/tests/robotests/src/com/android/settings/development/BluetoothAudioSampleRatePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/BluetoothAudioSampleRatePreferenceControllerTest.java
new file mode 100644
index 0000000..95f07c2
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/development/BluetoothAudioSampleRatePreferenceControllerTest.java
@@ -0,0 +1,105 @@
+/*
+ * Copyright (C) 2017 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF 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 static com.google.common.truth.Truth.assertThat;
+
+import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+import android.bluetooth.BluetoothCodecConfig;
+import android.content.Context;
+import android.support.v7.preference.ListPreference;
+import android.support.v7.preference.PreferenceScreen;
+
+import com.android.settings.TestConfig;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
+import com.android.settingslib.core.lifecycle.Lifecycle;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.mockito.MockitoAnnotations;
+import org.robolectric.RuntimeEnvironment;
+import org.robolectric.annotation.Config;
+
+@RunWith(SettingsRobolectricTestRunner.class)
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION_O)
+public class BluetoothAudioSampleRatePreferenceControllerTest {
+
+    @Mock
+    private BluetoothCodecConfig mBluetoothCodecConfig;
+    @Mock
+    private ListPreference mPreference;
+    @Mock
+    private PreferenceScreen mScreen;
+    @Mock
+    private BluetoothA2dpConfigStore mBluetoothA2dpConfigStore;
+
+    /**
+     * 0: Use System Selection (Default)
+     * 1: 44.1 kHz
+     * 2: 48.0 kHz
+     * 3: 88.2 kHz
+     * 4: 96.0 kHz
+     */
+    private String[] mListValues;
+    private Lifecycle mLifecycle;
+    private Context mContext;
+    private BluetoothAudioSampleRatePreferenceController mController;
+
+    @Before
+    public void setup() {
+        MockitoAnnotations.initMocks(this);
+        mContext = RuntimeEnvironment.application;
+        mLifecycle = new Lifecycle(() -> mLifecycle);
+        mController = spy(new BluetoothAudioSampleRatePreferenceController(mContext, mLifecycle,
+                mBluetoothA2dpConfigStore));
+        mListValues = mController.getListValues();
+        when(mScreen.findPreference(mController.getPreferenceKey())).thenReturn(mPreference);
+        mController.displayPreference(mScreen);
+    }
+
+    @Test
+    public void writeConfigurationValues_option2_shouldWriteOption2ToSharedStore() {
+        when(mPreference.findIndexOfValue(mListValues[2])).thenReturn(2);
+        mController.writeConfigurationValues(mListValues[2]);
+
+        verify(mBluetoothA2dpConfigStore).setSampleRate(BluetoothCodecConfig.SAMPLE_RATE_48000);
+    }
+
+    @Test
+    public void getCurrentA2dpSettingIndex_option2_shouldReturnSecondIndex() {
+        when(mBluetoothCodecConfig.getSampleRate()).thenReturn(
+                BluetoothCodecConfig.SAMPLE_RATE_48000);
+
+        final int index = mController.getCurrentA2dpSettingIndex(mBluetoothCodecConfig);
+
+        assertThat(index).isEqualTo(2);
+    }
+
+    @Test
+    public void getCurrentA2dpSettingIndex_unknownOption_shouldReturnDefault() {
+        when(mBluetoothCodecConfig.getSampleRate()).thenReturn(1381391835);
+
+        final int index = mController.getCurrentA2dpSettingIndex(mBluetoothCodecConfig);
+
+        assertThat(index).isEqualTo(0);
+    }
+}
diff --git a/tests/robotests/src/com/android/settings/development/BluetoothAvrcpVersionPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/BluetoothAvrcpVersionPreferenceControllerTest.java
new file mode 100644
index 0000000..3f993e5
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/development/BluetoothAvrcpVersionPreferenceControllerTest.java
@@ -0,0 +1,146 @@
+/*
+ * Copyright (C) 2017 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF 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 static com.android.settings.development.BluetoothAvrcpVersionPreferenceController
+        .BLUETOOTH_AVRCP_VERSION_PROPERTY;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+import android.content.Context;
+import android.os.SystemProperties;
+import android.support.v7.preference.ListPreference;
+import android.support.v7.preference.PreferenceScreen;
+
+import com.android.settings.R;
+import com.android.settings.TestConfig;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.shadow.SettingsShadowSystemProperties;
+
+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;
+
+@RunWith(SettingsRobolectricTestRunner.class)
+@Config(manifest = TestConfig.MANIFEST_PATH,
+        sdk = TestConfig.SDK_VERSION_O,
+        shadows = {SettingsShadowSystemProperties.class})
+public class BluetoothAvrcpVersionPreferenceControllerTest {
+
+    @Mock
+    private ListPreference mPreference;
+    @Mock
+    private PreferenceScreen mPreferenceScreen;
+
+    private Context mContext;
+    private BluetoothAvrcpVersionPreferenceController mController;
+
+    /**
+     * 0: AVRCP 1.4 (Default)
+     * 1: AVRCP 1.3
+     * 2: AVRCP 1.5
+     * 3: AVRCP 1.6
+     */
+    private String[] mListValues;
+    private String[] mListSummaries;
+
+    @Before
+    public void setup() {
+        MockitoAnnotations.initMocks(this);
+        mContext = RuntimeEnvironment.application;
+        mListValues = mContext.getResources().getStringArray(
+                R.array.bluetooth_avrcp_version_values);
+        mListSummaries = mContext.getResources().getStringArray(R.array.bluetooth_avrcp_versions);
+        mController = new BluetoothAvrcpVersionPreferenceController(mContext);
+        when(mPreferenceScreen.findPreference(mController.getPreferenceKey())).thenReturn(
+                mPreference);
+        mController.displayPreference(mPreferenceScreen);
+    }
+
+    @After
+    public void teardown() {
+        SettingsShadowSystemProperties.clear();
+    }
+
+    @Test
+    public void onPreferenceChange_setAvrcp13_shouldEnableAvrcp13() {
+        mController.onPreferenceChange(mPreference, mListValues[1]);
+
+        final String currentValue = SystemProperties.get(BLUETOOTH_AVRCP_VERSION_PROPERTY);
+
+        assertThat(currentValue).isEqualTo(mListValues[1]);
+    }
+
+    @Test
+    public void onPreferenceChange_setAvrcp15_shouldEnableAvrcp15() {
+        mController.onPreferenceChange(mPreference, mListValues[2]);
+
+        final String currentValue = SystemProperties.get(BLUETOOTH_AVRCP_VERSION_PROPERTY);
+
+        assertThat(currentValue).isEqualTo(mListValues[2]);
+    }
+
+    @Test
+    public void updateState_setAvrcp13_shouldSetPreferenceToAvrcp13() {
+        SystemProperties.set(BLUETOOTH_AVRCP_VERSION_PROPERTY, mListValues[1]);
+
+        mController.updateState(mPreference);
+
+        verify(mPreference).setValue(mListValues[1]);
+        verify(mPreference).setSummary(mListSummaries[1]);
+    }
+
+    @Test
+    public void updateState_setAvrcp15_shouldSetPreferenceToAvrcp15() {
+        SystemProperties.set(BLUETOOTH_AVRCP_VERSION_PROPERTY, mListValues[2]);
+
+        mController.updateState(mPreference);
+
+        verify(mPreference).setValue(mListValues[2]);
+        verify(mPreference).setSummary(mListSummaries[2]);
+    }
+
+    @Test
+    public void updateState_noValueSet_shouldSetDefaultToAvrcp14() {
+        mController.updateState(mPreference);
+
+        verify(mPreference).setValue(mListValues[0]);
+        verify(mPreference).setSummary(mListSummaries[0]);
+    }
+
+    @Test
+    public void onDeveloperOptionsSwitchDisabled_shouldDisablePreference() {
+        mController.onDeveloperOptionsSwitchDisabled();
+
+        verify(mPreference).setEnabled(false);
+    }
+
+    @Test
+    public void onDeveloperOptionsSwitchEnabled_shouldEnablePreference() {
+        mController.onDeveloperOptionsSwitchEnabled();
+
+        verify(mPreference).setEnabled(true);
+    }
+}
diff --git a/tests/robotests/src/com/android/settings/development/BluetoothDeviceNoNamePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/BluetoothDeviceNoNamePreferenceControllerTest.java
new file mode 100644
index 0000000..0bc527a
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/development/BluetoothDeviceNoNamePreferenceControllerTest.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.development;
+
+import static com.android.settings.development.BluetoothDeviceNoNamePreferenceController
+        .BLUETOOTH_SHOW_DEVICES_WITHOUT_NAMES_PROPERTY;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+import android.content.Context;
+import android.support.v14.preference.SwitchPreference;
+import android.support.v7.preference.PreferenceScreen;
+
+import com.android.settings.TestConfig;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
+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.RuntimeEnvironment;
+import org.robolectric.annotation.Config;
+
+@RunWith(SettingsRobolectricTestRunner.class)
+@Config(manifest = TestConfig.MANIFEST_PATH,
+        sdk = TestConfig.SDK_VERSION_O,
+        shadows = {SettingsShadowSystemProperties.class})
+public class BluetoothDeviceNoNamePreferenceControllerTest {
+
+    @Mock
+    private SwitchPreference mPreference;
+    @Mock
+    private PreferenceScreen mPreferenceScreen;
+
+    private Context mContext;
+    private BluetoothDeviceNoNamePreferenceController mController;
+
+    @Before
+    public void setup() {
+        MockitoAnnotations.initMocks(this);
+        mContext = RuntimeEnvironment.application;
+        mController = new BluetoothDeviceNoNamePreferenceController(mContext);
+        when(mPreferenceScreen.findPreference(mController.getPreferenceKey())).thenReturn(
+                mPreference);
+        mController.displayPreference(mPreferenceScreen);
+    }
+
+    @Test
+    public void onPreferenceChanged_settingEnabled_shouldTurnOnBluetoothDeviceNoName() {
+        mController.onPreferenceChange(mPreference, true /* new value */);
+
+        final boolean mode = SettingsShadowSystemProperties.getBoolean(
+                BLUETOOTH_SHOW_DEVICES_WITHOUT_NAMES_PROPERTY, false /* default */);
+
+        assertThat(mode).isTrue();
+    }
+
+    @Test
+    public void onPreferenceChanged_settingDisabled_shouldTurnOffBluetoothDeviceNoName() {
+        mController.onPreferenceChange(mPreference, false /* new value */);
+
+        final boolean mode = SettingsShadowSystemProperties.getBoolean(
+                BLUETOOTH_SHOW_DEVICES_WITHOUT_NAMES_PROPERTY, false /* default */);
+
+        assertThat(mode).isFalse();
+    }
+
+    @Test
+    public void updateState_settingEnabled_preferenceShouldBeChecked() {
+        SettingsShadowSystemProperties.set(BLUETOOTH_SHOW_DEVICES_WITHOUT_NAMES_PROPERTY,
+                Boolean.toString(true));
+        mController.updateState(mPreference);
+
+        verify(mPreference).setChecked(true);
+    }
+
+    @Test
+    public void updateState_settingDisabled_preferenceShouldNotBeChecked() {
+        SettingsShadowSystemProperties.set(BLUETOOTH_SHOW_DEVICES_WITHOUT_NAMES_PROPERTY,
+                Boolean.toString(false));
+        mController.updateState(mPreference);
+
+        verify(mPreference).setChecked(false);
+    }
+
+    @Test
+    public void onDeveloperOptionsDisabled_shouldDisablePreference() {
+        mController.onDeveloperOptionsDisabled();
+
+        final boolean mode = SettingsShadowSystemProperties.getBoolean(
+                BLUETOOTH_SHOW_DEVICES_WITHOUT_NAMES_PROPERTY, false /* default */);
+
+        assertThat(mode).isFalse();
+        verify(mPreference).setEnabled(false);
+        verify(mPreference).setChecked(false);
+    }
+
+    @Test
+    public void onDeveloperOptionsEnabled_shouldEnablePreference() {
+        mController.onDeveloperOptionsEnabled();
+
+        verify(mPreference).setEnabled(true);
+    }
+}
diff --git a/tests/robotests/src/com/android/settings/development/BluetoothInbandRingingPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/BluetoothInbandRingingPreferenceControllerTest.java
new file mode 100644
index 0000000..d132224
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/development/BluetoothInbandRingingPreferenceControllerTest.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.development;
+
+
+import static com.android.settings.development.BluetoothInbandRingingPreferenceController
+        .BLUETOOTH_ENABLE_INBAND_RINGING_PROPERTY;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import static org.mockito.Mockito.doReturn;
+import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+import android.content.Context;
+import android.support.v14.preference.SwitchPreference;
+import android.support.v7.preference.PreferenceScreen;
+
+import com.android.settings.TestConfig;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
+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.RuntimeEnvironment;
+import org.robolectric.annotation.Config;
+
+@RunWith(SettingsRobolectricTestRunner.class)
+@Config(manifest = TestConfig.MANIFEST_PATH,
+        sdk = TestConfig.SDK_VERSION_O,
+        shadows = {SettingsShadowSystemProperties.class})
+public class BluetoothInbandRingingPreferenceControllerTest {
+
+    @Mock
+    private SwitchPreference mPreference;
+    @Mock
+    private PreferenceScreen mPreferenceScreen;
+
+    private Context mContext;
+    private BluetoothInbandRingingPreferenceController mController;
+
+    @Before
+    public void setup() {
+        MockitoAnnotations.initMocks(this);
+        mContext = RuntimeEnvironment.application;
+        mController = spy(new BluetoothInbandRingingPreferenceController(mContext));
+        doReturn(true).when(mController).isInbandRingingSupported();
+        when(mPreferenceScreen.findPreference(mController.getPreferenceKey())).thenReturn(
+                mPreference);
+        mController.displayPreference(mPreferenceScreen);
+    }
+
+    @Test
+    public void isAvailable_inbandRingingNotSupported_shouldReturnFalse() {
+        doReturn(false).when(mController).isInbandRingingSupported();
+        assertThat(mController.isAvailable()).isFalse();
+    }
+
+    @Test
+    public void isAvailable_inbandRingingSupported_shouldReturnTrue() {
+        assertThat(mController.isAvailable()).isTrue();
+    }
+
+    @Test
+    public void onPreferenceChanged_settingEnabled_turnOnBluetoothSnoopLog() {
+        mController.onPreferenceChange(mPreference, true /* new value */);
+
+        final boolean mode = SettingsShadowSystemProperties.getBoolean(
+                BLUETOOTH_ENABLE_INBAND_RINGING_PROPERTY, false /* default */);
+
+        assertThat(mode).isTrue();
+    }
+
+    @Test
+    public void onPreferenceChanged_settingDisabled_turnOffBluetoothSnoopLog() {
+        mController.onPreferenceChange(mPreference, false /* new value */);
+
+        final boolean mode = SettingsShadowSystemProperties.getBoolean(
+                BLUETOOTH_ENABLE_INBAND_RINGING_PROPERTY, false /* default */);
+
+        assertThat(mode).isFalse();
+    }
+
+    @Test
+    public void updateState_settingEnabled_preferenceShouldBeChecked() {
+        SettingsShadowSystemProperties.set(BLUETOOTH_ENABLE_INBAND_RINGING_PROPERTY,
+                Boolean.toString(true));
+        mController.updateState(mPreference);
+
+        verify(mPreference).setChecked(true);
+    }
+
+    @Test
+    public void updateState_settingDisabled_preferenceShouldNotBeChecked() {
+        SettingsShadowSystemProperties.set(BLUETOOTH_ENABLE_INBAND_RINGING_PROPERTY,
+                Boolean.toString(false));
+        mController.updateState(mPreference);
+
+        verify(mPreference).setChecked(false);
+    }
+
+    @Test
+    public void onDeveloperOptionsDisabled_shouldDisablePreference() {
+        mController.onDeveloperOptionsDisabled();
+
+        final boolean mode = SettingsShadowSystemProperties.getBoolean(
+                BLUETOOTH_ENABLE_INBAND_RINGING_PROPERTY, false /* default */);
+
+        assertThat(mode).isTrue();
+        verify(mPreference).setEnabled(false);
+        verify(mPreference).setChecked(true);
+    }
+
+    @Test
+    public void onDeveloperOptionsEnabled_shouldEnablePreference() {
+        mController.onDeveloperOptionsEnabled();
+
+        verify(mPreference).setEnabled(true);
+    }
+}
diff --git a/tests/robotests/src/com/android/settings/development/BluetoothSnoopLogPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/BluetoothSnoopLogPreferenceControllerTest.java
new file mode 100644
index 0000000..7d29637
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/development/BluetoothSnoopLogPreferenceControllerTest.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.development;
+
+import static com.android.settings.development.BluetoothSnoopLogPreferenceController
+        .BLUETOOTH_BTSNOOP_ENABLE_PROPERTY;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+import android.content.Context;
+import android.support.v14.preference.SwitchPreference;
+import android.support.v7.preference.PreferenceScreen;
+
+import com.android.settings.TestConfig;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
+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;
+
+@RunWith(SettingsRobolectricTestRunner.class)
+@Config(manifest = TestConfig.MANIFEST_PATH,
+        sdk = TestConfig.SDK_VERSION_O,
+        shadows = {SettingsShadowSystemProperties.class})
+public class BluetoothSnoopLogPreferenceControllerTest {
+
+    @Mock
+    private Context mContext;
+    @Mock
+    private SwitchPreference mPreference;
+    @Mock
+    private PreferenceScreen mPreferenceScreen;
+    private BluetoothSnoopLogPreferenceController mController;
+
+    @Before
+    public void setup() {
+        MockitoAnnotations.initMocks(this);
+        mController = new BluetoothSnoopLogPreferenceController(mContext);
+        when(mPreferenceScreen.findPreference(mController.getPreferenceKey())).thenReturn(
+                mPreference);
+        mController.displayPreference(mPreferenceScreen);
+    }
+
+    @Test
+    public void onPreferenceChanged_turnOnBluetoothSnoopLog() {
+        mController.onPreferenceChange(null, true);
+
+        final boolean mode = SettingsShadowSystemProperties.getBoolean(
+                BLUETOOTH_BTSNOOP_ENABLE_PROPERTY, false);
+
+        assertThat(mode).isTrue();
+    }
+
+    @Test
+    public void onPreferenceChanged_turnOffBluetoothSnoopLog() {
+        mController.onPreferenceChange(null, false);
+
+        final boolean mode = SettingsShadowSystemProperties.getBoolean(
+                BLUETOOTH_BTSNOOP_ENABLE_PROPERTY, false);
+
+        assertThat(mode).isFalse();
+    }
+
+    @Test
+    public void updateState_preferenceShouldBeChecked() {
+        SettingsShadowSystemProperties.set(BLUETOOTH_BTSNOOP_ENABLE_PROPERTY,
+                Boolean.toString(true));
+        mController.updateState(mPreference);
+
+        verify(mPreference).setChecked(true);
+    }
+
+    @Test
+    public void updateState_preferenceShouldNotBeChecked() {
+        SettingsShadowSystemProperties.set(BLUETOOTH_BTSNOOP_ENABLE_PROPERTY,
+                Boolean.toString(false));
+        mController.updateState(mPreference);
+
+        verify(mPreference).setChecked(false);
+    }
+
+    @Test
+    public void onDeveloperOptionsDisabled_shouldDisablePreference() {
+        mController.onDeveloperOptionsDisabled();
+
+        verify(mPreference).setEnabled(false);
+        verify(mPreference).setChecked(false);
+    }
+
+    @Test
+    public void onDeveloperOptionsEnabled_shouldEnablePreference() {
+        mController.onDeveloperOptionsEnabled();
+
+        verify(mPreference).setEnabled(true);
+    }
+}
diff --git a/tests/robotests/src/com/android/settings/development/BugReportInPowerPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/BugReportInPowerPreferenceControllerTest.java
index f703b26..bce9b0d 100644
--- a/tests/robotests/src/com/android/settings/development/BugReportInPowerPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/development/BugReportInPowerPreferenceControllerTest.java
@@ -16,178 +16,158 @@
 
 package com.android.settings.development;
 
-import android.content.ComponentName;
+import static com.android.settings.development.BugReportInPowerPreferenceController.COMPONENT_NAME;
+import static com.android.settings.development.BugReportInPowerPreferenceController
+        .SETTING_VALUE_OFF;
+import static com.android.settings.development.BugReportInPowerPreferenceController
+        .SETTING_VALUE_ON;
+
+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;
+
+import android.content.ContentResolver;
 import android.content.Context;
 import android.content.pm.PackageManager;
-import android.provider.Settings;
 import android.os.UserManager;
+import android.provider.Settings;
 import android.support.v14.preference.SwitchPreference;
-import android.support.v7.preference.Preference;
 import android.support.v7.preference.PreferenceScreen;
 
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
+import com.android.settingslib.wrapper.PackageManagerWrapper;
 
 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 org.robolectric.util.ReflectionHelpers;
 
-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.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;
 
 @RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION_O)
 public class BugReportInPowerPreferenceControllerTest {
 
-    @Mock(answer = RETURNS_DEEP_STUBS)
+    @Mock
     private PreferenceScreen mScreen;
     @Mock
     private UserManager mUserManager;
     @Mock
-    private PackageManager mPackageManager;
-
+    private PackageManagerWrapper mPackageManager;
+    @Mock
     private Context mContext;
+    @Mock
     private SwitchPreference mPreference;
+
+    private ContentResolver mContentResolver;
     private BugReportInPowerPreferenceController mController;
 
     @Before
     public void setUp() {
         MockitoAnnotations.initMocks(this);
-        ShadowApplication shadowContext = ShadowApplication.getInstance();
-        shadowContext.setSystemService(Context.USER_SERVICE, mUserManager);
-        mContext = spy(shadowContext.getApplicationContext());
-        when(mContext.getPackageManager()).thenReturn(mPackageManager);
-        mPreference = new SwitchPreference(mContext);
-        when(mScreen.findPreference(anyString())).thenReturn(mPreference);
+        mContentResolver = RuntimeEnvironment.application.getContentResolver();
+        when(mContext.getContentResolver()).thenReturn(mContentResolver);
+        when(mContext.getSystemService(Context.USER_SERVICE)).thenReturn(mUserManager);
         mController = new BugReportInPowerPreferenceController(mContext);
-        mPreference.setKey(mController.getPreferenceKey());
+        when(mScreen.findPreference(mController.getPreferenceKey())).thenReturn(mPreference);
+        ReflectionHelpers.setField(mController, "mPackageManager", mPackageManager);
     }
 
     @Test
-    public void displayPreference_hasDebugRestriction_shouldRemovePreference() {
+    public void isAvailable_hasDebugRestriction_shouldReturnFalse() {
         when(mUserManager.hasUserRestriction(anyString())).thenReturn(true);
-        when(mScreen.getPreferenceCount()).thenReturn(1);
-        when(mScreen.getPreference(0)).thenReturn(mPreference);
 
-        mController.displayPreference(mScreen);
-
-        verify(mScreen).removePreference(any(Preference.class));
+        assertThat(mController.isAvailable()).isFalse();
     }
 
     @Test
-    public void displayPreference_noDebugRestriction_shouldNotRemovePreference() {
+    public void isAvailable_noDebugRestriction_shouldReturnTrue() {
         when(mUserManager.hasUserRestriction(anyString())).thenReturn(false);
 
-        mController.displayPreference(mScreen);
-
-        verify(mScreen, never()).removePreference(any(Preference.class));
+        assertThat(mController.isAvailable()).isTrue();
     }
 
     @Test
-    public void enablePreference_hasDebugRestriction_shouldNotEnable() {
-        when(mUserManager.hasUserRestriction(anyString())).thenReturn(true);
-        mController.displayPreference(mScreen);
-        mPreference.setEnabled(false);
-
-        mController.enablePreference(true);
-
-        assertThat(mPreference.isEnabled()).isFalse();
-    }
-
-    @Test
-    public void enablePreference_noDebugRestriction_shouldEnable() {
+    public void onDeveloperOptionsSwitchDisabled_preferenceShouldNotBeChecked() {
         when(mUserManager.hasUserRestriction(anyString())).thenReturn(false);
         mController.displayPreference(mScreen);
-        mPreference.setEnabled(false);
 
-        mController.enablePreference(true);
+        mController.onDeveloperOptionsSwitchDisabled();
 
-        assertThat(mPreference.isEnabled()).isTrue();
+        verify(mPreference).setChecked(false);
     }
 
     @Test
-    public void resetPreference_shouldUncheck() {
+    public void onPreferenceChanged_settingDisabled_shouldDisableBugReportInPowerSetting() {
         when(mUserManager.hasUserRestriction(anyString())).thenReturn(false);
         mController.displayPreference(mScreen);
-        mPreference.setChecked(true);
 
-        mController.resetPreference();
+        mController.onPreferenceChange(mPreference, false /* new value */);
+        int mode = Settings.Secure.getInt(mContext.getContentResolver(),
+                Settings.Global.BUGREPORT_IN_POWER_MENU, -1 /* default */);
 
-        assertThat(mPreference.isChecked()).isFalse();
+        assertThat(mode).isEqualTo(SETTING_VALUE_OFF);
+        verify(mPackageManager).setComponentEnabledSetting(COMPONENT_NAME,
+                PackageManager.COMPONENT_ENABLED_STATE_DEFAULT, 0 /* flags */);
     }
 
     @Test
-    public void handlePreferenceTreeClick_shouldUpdateSettings() {
+    public void onPreferenceChanged_settingEnabled_shouldEnableBugReportInPowerSetting() {
+        when(mUserManager.hasUserRestriction(anyString())).thenReturn(false);
+        mController.displayPreference(mScreen);
+
+        mController.onPreferenceChange(mPreference, true /* new value */);
+        int mode = Settings.Secure.getInt(mContext.getContentResolver(),
+                Settings.Global.BUGREPORT_IN_POWER_MENU, -1 /* default */);
+
+        assertThat(mode).isEqualTo(SETTING_VALUE_ON);
+        verify(mPackageManager).setComponentEnabledSetting(COMPONENT_NAME,
+                PackageManager.COMPONENT_ENABLED_STATE_ENABLED, 0 /* flags */);
+    }
+
+
+    @Test
+    public void updateState_settingsOn_preferenceShouldBeChecked() {
         when(mUserManager.hasUserRestriction(anyString())).thenReturn(false);
         Settings.Secure.putInt(mContext.getContentResolver(),
-            Settings.Global.BUGREPORT_IN_POWER_MENU, 0);
-        mPreference.setChecked(true);
-        mController.displayPreference(mScreen);
-
-        mController.handlePreferenceTreeClick(mPreference);
-
-        assertThat(Settings.Secure.getInt(mContext.getContentResolver(),
-            Settings.Global.BUGREPORT_IN_POWER_MENU, 0)).isEqualTo(1);
-    }
-
-    @Test
-    public void updateState_settingsOn_shouldCheck() {
-        when(mUserManager.hasUserRestriction(anyString())).thenReturn(false);
-        Settings.Secure.putInt(mContext.getContentResolver(),
-            Settings.Global.BUGREPORT_IN_POWER_MENU, 1);
-        mPreference.setChecked(false);
+                Settings.Global.BUGREPORT_IN_POWER_MENU, SETTING_VALUE_ON);
         mController.displayPreference(mScreen);
 
         mController.updateState(mPreference);
 
-        assertThat(mPreference.isChecked()).isTrue();
+        verify(mPreference).setChecked(true);
     }
 
     @Test
-    public void updateState_settingsOff_shouldUncheck() {
+    public void updateState_settingsOff_preferenceShouldNotBeChecked() {
         when(mUserManager.hasUserRestriction(anyString())).thenReturn(false);
         Settings.Secure.putInt(mContext.getContentResolver(),
-            Settings.Global.BUGREPORT_IN_POWER_MENU, 0);
-        mPreference.setChecked(true);
+                Settings.Global.BUGREPORT_IN_POWER_MENU, SETTING_VALUE_OFF);
         mController.displayPreference(mScreen);
 
         mController.updateState(mPreference);
 
-        assertThat(mPreference.isChecked()).isFalse();
+        verify(mPreference).setChecked(false);
     }
 
     @Test
-    public void updateBugreportOptions_shouldEnable() {
-        when(mUserManager.hasUserRestriction(anyString())).thenReturn(false);
-        mPreference.setEnabled(false);
-        mController.displayPreference(mScreen);
-
-        mController.updateBugreportOptions();
-
-        assertThat(mPreference.isEnabled()).isTrue();
-    }
-
-    @Test
-    public void updateBugreportOptions_shouldEnableBugReportStorage() {
-        final ComponentName componentName = new ComponentName("com.android.shell",
-            "com.android.shell.BugreportStorageProvider");
+    public void onDeveloperOptionsSwitchDisabled_shouldTurnOffPreference() {
         when(mUserManager.hasUserRestriction(anyString())).thenReturn(false);
         mController.displayPreference(mScreen);
 
-        mController.updateBugreportOptions();
+        mController.onDeveloperOptionsSwitchDisabled();
+        int mode = Settings.Secure.getInt(mContext.getContentResolver(),
+                Settings.Global.BUGREPORT_IN_POWER_MENU, -1 /* default */);
 
-        verify(mPackageManager).setComponentEnabledSetting(eq(componentName), anyInt(), anyInt());
+        assertThat(mode).isEqualTo(SETTING_VALUE_OFF);
+        verify(mPreference).setChecked(false);
+        verify(mPackageManager).setComponentEnabledSetting(COMPONENT_NAME,
+                PackageManager.COMPONENT_ENABLED_STATE_DEFAULT, 0 /* flags */);
     }
 }
diff --git a/tests/robotests/src/com/android/settings/development/BugReportPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/BugReportPreferenceControllerTest.java
index 3b3b482..77a109a 100644
--- a/tests/robotests/src/com/android/settings/development/BugReportPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/development/BugReportPreferenceControllerTest.java
@@ -16,13 +16,16 @@
 
 package com.android.settings.development;
 
+import static com.google.common.truth.Truth.assertThat;
+
+import static org.mockito.Matchers.anyString;
+import static org.mockito.Mockito.when;
+
 import android.content.Context;
 import android.os.UserManager;
-import android.support.v7.preference.Preference;
-import android.support.v7.preference.PreferenceScreen;
 
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 
 import org.junit.Before;
 import org.junit.Test;
@@ -31,25 +34,13 @@
 import org.mockito.MockitoAnnotations;
 import org.robolectric.annotation.Config;
 
-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.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)
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION_O)
 public class BugReportPreferenceControllerTest {
 
     @Mock
     private Context mContext;
     @Mock
-    private Preference mPreference;
-    @Mock(answer = RETURNS_DEEP_STUBS)
-    private PreferenceScreen mScreen;
-    @Mock
     private UserManager mUserManager;
 
     private BugReportPreferenceController mController;
@@ -58,49 +49,20 @@
     public void setUp() {
         MockitoAnnotations.initMocks(this);
         when(mContext.getSystemService(Context.USER_SERVICE)).thenReturn(mUserManager);
-        when(mScreen.findPreference(anyString())).thenReturn(mPreference);
         mController = new BugReportPreferenceController(mContext);
     }
 
     @Test
-    public void displayPreference_hasDebugRestriction_shouldRemovePreference() {
+    public void isAvailable_hasDebugRestriction_shouldBeFalse() {
         when(mUserManager.hasUserRestriction(anyString())).thenReturn(true);
-        when(mScreen.getPreferenceCount()).thenReturn(1);
-        when(mScreen.getPreference(0)).thenReturn(mPreference);
-        when(mPreference.getKey()).thenReturn(mController.getPreferenceKey());
 
-        mController.displayPreference(mScreen);
-
-        verify(mScreen).removePreference(any(Preference.class));
+        assertThat(mController.isAvailable()).isFalse();
     }
 
     @Test
-    public void displayPreference_noDebugRestriction_shouldNotRemovePreference() {
+    public void isAvailable_noDebugRestriction_shouldBeTrue() {
         when(mUserManager.hasUserRestriction(anyString())).thenReturn(false);
 
-        mController.displayPreference(mScreen);
-
-        verify(mScreen, never()).removePreference(any(Preference.class));
+        assertThat(mController.isAvailable()).isTrue();
     }
-
-    @Test
-    public void enablePreference_hasDebugRestriction_shouldNotEnable() {
-        when(mUserManager.hasUserRestriction(anyString())).thenReturn(true);
-        mController.displayPreference(mScreen);
-
-        mController.enablePreference(true);
-
-        verify(mPreference, never()).setEnabled(anyBoolean());
-    }
-
-    @Test
-    public void enablePreference_noDebugRestriction_shouldEnable() {
-        when(mUserManager.hasUserRestriction(anyString())).thenReturn(false);
-        mController.displayPreference(mScreen);
-
-        mController.enablePreference(true);
-
-        verify(mPreference).setEnabled(anyBoolean());
-    }
-
 }
diff --git a/tests/robotests/src/com/android/settings/development/CameraLaserSensorPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/CameraLaserSensorPreferenceControllerTest.java
index 7aab99d..21a01aa 100644
--- a/tests/robotests/src/com/android/settings/development/CameraLaserSensorPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/development/CameraLaserSensorPreferenceControllerTest.java
@@ -16,12 +16,16 @@
 
 package com.android.settings.development;
 
+import static com.android.settings.development.CameraLaserSensorPreferenceController.ENG_BUILD;
+import static com.android.settings.development.CameraLaserSensorPreferenceController
+        .USERDEBUG_BUILD;
+import static com.android.settings.development.CameraLaserSensorPreferenceController.USER_BUILD;
+
 import android.content.Context;
 import android.os.SystemProperties;
 import android.support.v14.preference.SwitchPreference;
 import android.support.v7.preference.PreferenceScreen;
 
-import com.android.settings.R;
 import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
 import com.android.settings.testutils.shadow.SettingsShadowSystemProperties;
@@ -30,40 +34,38 @@
 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.RuntimeEnvironment;
 
 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,
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION_O,
         shadows = {SettingsShadowSystemProperties.class})
 public class CameraLaserSensorPreferenceControllerTest {
 
-    @Mock(answer = Answers.RETURNS_DEEP_STUBS)
-    private Context mContext;
     @Mock
     private PreferenceScreen mScreen;
     @Mock
     private SwitchPreference mPreference;
 
-    static final String USERDEBUG_BUILD = "userdebug";
-    static final String ENG_BUILD = "eng";
-    static final String USER_BUILD = "user";
+    private Context mContext;
 
     private CameraLaserSensorPreferenceController mController;
 
     @Before
     public void setUp() {
         MockitoAnnotations.initMocks(this);
+        mContext = RuntimeEnvironment.application;
         mController = new CameraLaserSensorPreferenceController(mContext);
         when(mScreen.findPreference(mController.getPreferenceKey())).thenReturn(mPreference);
         when(mPreference.getKey()).thenReturn(mController.getPreferenceKey());
+        mController.displayPreference(mScreen);
     }
 
     @After
@@ -72,17 +74,13 @@
     }
 
     @Test
+    @Config(qualifiers = "mcc999")
     public void isAvailable_withConfigNoShow_shouldReturnFalse() {
-        when(mContext.getResources().getBoolean(R.bool.config_show_camera_laser_sensor))
-                .thenReturn(false);
         assertThat(mController.isAvailable()).isFalse();
     }
 
     @Test
     public void isAvailable_withUserdebugBuild_shouldReturnTrue() {
-        when(mContext.getResources().getBoolean(R.bool.config_show_camera_laser_sensor))
-                .thenReturn(true);
-
         SettingsShadowSystemProperties.set(
                 CameraLaserSensorPreferenceController.BUILD_TYPE, USERDEBUG_BUILD);
 
@@ -91,9 +89,6 @@
 
     @Test
     public void isAvailable_withEngBuild_shouldReturnTrue() {
-        when(mContext.getResources().getBoolean(R.bool.config_show_camera_laser_sensor))
-                .thenReturn(true);
-
         SettingsShadowSystemProperties.set(
                 CameraLaserSensorPreferenceController.BUILD_TYPE, ENG_BUILD);
 
@@ -102,9 +97,6 @@
 
     @Test
     public void isAvailable_withUserBuild_shouldReturnFalse() {
-        when(mContext.getResources().getBoolean(R.bool.config_show_camera_laser_sensor))
-                .thenReturn(true);
-
         SettingsShadowSystemProperties.set(
                 CameraLaserSensorPreferenceController.BUILD_TYPE, USER_BUILD);
 
@@ -112,64 +104,67 @@
     }
 
     @Test
-    public void displayPreference_cameraLaserSensorEnabled_shouldCheckedPreference() {
-        when(mContext.getResources().getBoolean(R.bool.config_show_camera_laser_sensor))
-                .thenReturn(true);
-
+    public void updateState_cameraLaserSensorEnabled_shouldCheckedPreference() {
         SettingsShadowSystemProperties.set(
                 CameraLaserSensorPreferenceController.PROPERTY_CAMERA_LASER_SENSOR,
                 Integer.toString(CameraLaserSensorPreferenceController.ENABLED));
         SettingsShadowSystemProperties.set(
                 CameraLaserSensorPreferenceController.BUILD_TYPE, USERDEBUG_BUILD);
 
-        mController.displayPreference(mScreen);
+        mController.updateState(mScreen);
 
         verify(mPreference).setChecked(true);
     }
 
     @Test
-    public void displayPreference_cameraLaserSensorEnabled_shouldUncheckedPreference() {
-        when(mContext.getResources().getBoolean(R.bool.config_show_camera_laser_sensor))
-                .thenReturn(true);
-
+    public void updateState_cameraLaserSensorEnabled_shouldUncheckedPreference() {
         SettingsShadowSystemProperties.set(
                 CameraLaserSensorPreferenceController.PROPERTY_CAMERA_LASER_SENSOR,
                 Integer.toString(CameraLaserSensorPreferenceController.DISABLED));
         SettingsShadowSystemProperties.set(
                 CameraLaserSensorPreferenceController.BUILD_TYPE, USERDEBUG_BUILD);
 
-        mController.displayPreference(mScreen);
+        mController.updateState(mScreen);
 
         verify(mPreference).setChecked(false);
     }
 
     @Test
-    public void handlePreferenceTreeClick_preferenceChecked_shouldEnableCameraLaserSensor() {
-        when(mContext.getResources().getBoolean(R.bool.config_show_camera_laser_sensor))
-                .thenReturn(true);
+    public void onPreferenceChange_preferenceChecked_shouldEnableCameraLaserSensor() {
+        mController.onPreferenceChange(mPreference, true);
 
-        when(mPreference.isChecked()).thenReturn(true);
-
-        mController.handlePreferenceTreeClick(mPreference);
-
-        assertThat(Integer.toString(CameraLaserSensorPreferenceController.ENABLED).equals(
-            SystemProperties.get(
+        assertThat(Integer.toString(CameraLaserSensorPreferenceController.ENABLED)).isEqualTo(
+                SystemProperties.get(
                         CameraLaserSensorPreferenceController.PROPERTY_CAMERA_LASER_SENSOR,
-                        Integer.toString(CameraLaserSensorPreferenceController.ENABLED)))).isTrue();
+                        Integer.toString(CameraLaserSensorPreferenceController.ENABLED)));
     }
 
     @Test
-    public void handlePreferenceTreeClick_preferenceUnchecked_shouldDisableCameraLaserSensor() {
-        when(mContext.getResources().getBoolean(R.bool.config_show_camera_laser_sensor))
-                .thenReturn(true);
+    public void onPreferenceChange__preferenceUnchecked_shouldDisableCameraLaserSensor() {
+        mController.onPreferenceChange(mPreference, false);
 
-        when(mPreference.isChecked()).thenReturn(false);
-
-        mController.handlePreferenceTreeClick(mPreference);
-
-        assertThat(Integer.toString(CameraLaserSensorPreferenceController.DISABLED).equals(
+        assertThat(Integer.toString(CameraLaserSensorPreferenceController.DISABLED)).isEqualTo(
                 SystemProperties.get(
                         CameraLaserSensorPreferenceController.PROPERTY_CAMERA_LASER_SENSOR,
-                        Integer.toString(CameraLaserSensorPreferenceController.ENABLED)))).isTrue();
+                        Integer.toString(CameraLaserSensorPreferenceController.ENABLED)));
+    }
+
+    @Test
+    public void onDeveloperOptionsSwitchEnabled_preferenceShouldBeEnabled() {
+        mController.onDeveloperOptionsSwitchEnabled();
+
+        verify(mPreference).setEnabled(true);
+    }
+
+    @Test
+    public void onDeveloperOptionsSwitchDisabled_preferenceShouldBeEnabled() {
+        mController.onDeveloperOptionsSwitchDisabled();
+
+        verify(mPreference).setEnabled(false);
+        verify(mPreference).setChecked(false);
+        assertThat(Integer.toString(CameraLaserSensorPreferenceController.DISABLED)).isEqualTo(
+                SystemProperties.get(
+                        CameraLaserSensorPreferenceController.PROPERTY_CAMERA_LASER_SENSOR,
+                        Integer.toString(CameraLaserSensorPreferenceController.ENABLED)));
     }
 }
diff --git a/tests/robotests/src/com/android/settings/development/ClearAdbKeysPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/ClearAdbKeysPreferenceControllerTest.java
new file mode 100644
index 0000000..471bf27
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/development/ClearAdbKeysPreferenceControllerTest.java
@@ -0,0 +1,206 @@
+/*
+ * Copyright (C) 2017 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF 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 static com.android.settings.development.ClearAdbKeysPreferenceController
+        .RO_ADB_SECURE_PROPERTY_KEY;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import static org.mockito.Mockito.doReturn;
+import static org.mockito.Mockito.never;
+import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+import android.app.Fragment;
+import android.content.Context;
+import android.hardware.usb.IUsbManager;
+import android.os.RemoteException;
+import android.os.SystemProperties;
+import android.support.v14.preference.SwitchPreference;
+import android.support.v7.preference.PreferenceScreen;
+
+import com.android.settings.TestConfig;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.shadow.SettingsShadowSystemProperties;
+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.mockito.Mock;
+import org.mockito.MockitoAnnotations;
+import org.robolectric.RuntimeEnvironment;
+import org.robolectric.annotation.Config;
+import org.robolectric.annotation.Implementation;
+import org.robolectric.annotation.Implements;
+import org.robolectric.util.ReflectionHelpers;
+
+@RunWith(SettingsRobolectricTestRunner.class)
+@Config(manifest = TestConfig.MANIFEST_PATH,
+        sdk = TestConfig.SDK_VERSION_O,
+        shadows = {SettingsShadowSystemProperties.class, ShadowUtils.class})
+public class ClearAdbKeysPreferenceControllerTest {
+
+    @Mock
+    private PreferenceScreen mScreen;
+    @Mock
+    private SwitchPreference mPreference;
+    @Mock
+    private IUsbManager mUsbManager;
+    @Mock
+    private DevelopmentSettingsDashboardFragment mFragment;
+
+    private Context mContext;
+
+    private ClearAdbKeysPreferenceController mController;
+
+    @Before
+    public void setUp() {
+        MockitoAnnotations.initMocks(this);
+        mContext = RuntimeEnvironment.application;
+        mController = spy(new ClearAdbKeysPreferenceController(mContext, mFragment));
+        ReflectionHelpers.setField(mController, "mUsbManager", mUsbManager);
+        when(mScreen.findPreference(mController.getPreferenceKey())).thenReturn(mPreference);
+    }
+
+    @After
+    public void tearDown() {
+        ShadowClearAdbKeysWarningDialog.resetDialog();
+        SettingsShadowSystemProperties.clear();
+        ShadowUtils.reset();
+    }
+
+    @Test
+    public void isAvailable_roAdbSecureEnabled_shouldBeTrue() {
+        SystemProperties.set(RO_ADB_SECURE_PROPERTY_KEY, Boolean.toString(true));
+
+        assertThat(mController.isAvailable()).isTrue();
+    }
+
+    @Test
+    public void isAvailable_roAdbSecureDisabled_shouldBeFalse() {
+        SystemProperties.set(RO_ADB_SECURE_PROPERTY_KEY, Boolean.toString(false));
+
+        assertThat(mController.isAvailable()).isFalse();
+    }
+
+    @Test
+    public void displayPreference_isNotAdminUser_preferenceShouldBeDisabled() {
+        SystemProperties.set(RO_ADB_SECURE_PROPERTY_KEY, Boolean.toString(true));
+        doReturn(false).when(mController).isAdminUser();
+
+        mController.displayPreference(mScreen);
+
+        verify(mPreference).setEnabled(false);
+    }
+
+    @Test
+    @Config(shadows = {
+            ShadowClearAdbKeysWarningDialog.class
+    })
+    public void handlePreferenceTreeClick_clearAdbKeysPreference_shouldShowWarningDialog() {
+        SystemProperties.set(RO_ADB_SECURE_PROPERTY_KEY, Boolean.toString(true));
+        doReturn(true).when(mController).isAdminUser();
+        mController.displayPreference(mScreen);
+        final String preferenceKey = mController.getPreferenceKey();
+        when(mPreference.getKey()).thenReturn(preferenceKey);
+        final boolean isHandled = mController.handlePreferenceTreeClick(mPreference);
+
+        assertThat(ShadowClearAdbKeysWarningDialog.sIsShowing).isTrue();
+        assertThat(isHandled).isTrue();
+    }
+
+    @Test
+    public void handlePreferenceTreeClick_notClearAdbKeysPreference_shouldReturnFalse() {
+        SystemProperties.set(RO_ADB_SECURE_PROPERTY_KEY, Boolean.toString(true));
+        doReturn(true).when(mController).isAdminUser();
+        mController.displayPreference(mScreen);
+        when(mPreference.getKey()).thenReturn("Some random key!!!");
+        final boolean isHandled = mController.handlePreferenceTreeClick(mPreference);
+
+        assertThat(isHandled).isFalse();
+    }
+
+    @Test
+    public void handlePreferenceTreeClick_monkeyUser_shouldReturnFalse() {
+        SystemProperties.set(RO_ADB_SECURE_PROPERTY_KEY, Boolean.toString(true));
+        doReturn(true).when(mController).isAdminUser();
+        ShadowUtils.setIsUserAMonkey(true);
+        mController.displayPreference(mScreen);
+        final String preferenceKey = mController.getPreferenceKey();
+        when(mPreference.getKey()).thenReturn(preferenceKey);
+
+        final boolean isHandled = mController.handlePreferenceTreeClick(mPreference);
+
+        assertThat(isHandled).isFalse();
+    }
+
+    @Test
+    public void onDeveloperOptionsSwitchEnabled_isAdminUser_shouldEnablePreference() {
+        SystemProperties.set(RO_ADB_SECURE_PROPERTY_KEY, Boolean.toString(true));
+        doReturn(true).when(mController).isAdminUser();
+        mController.displayPreference(mScreen);
+        mController.onDeveloperOptionsSwitchEnabled();
+
+        verify(mPreference).setEnabled(true);
+    }
+
+    @Test
+    public void onDeveloperOptionsSwitchEnabled_isNotAdminUser_shouldNotEnablePreference() {
+        SystemProperties.set(RO_ADB_SECURE_PROPERTY_KEY, Boolean.toString(true));
+        doReturn(false).when(mController).isAdminUser();
+        mController.displayPreference(mScreen);
+        mController.onDeveloperOptionsSwitchEnabled();
+
+        verify(mPreference, never()).setEnabled(true);
+    }
+
+    @Test
+    public void onDeveloperOptionsSwitchDisabled_shouldDisablePreference() {
+        SystemProperties.set(RO_ADB_SECURE_PROPERTY_KEY, Boolean.toString(true));
+        doReturn(true).when(mController).isAdminUser();
+        mController.displayPreference(mScreen);
+        mController.onDeveloperOptionsSwitchDisabled();
+
+        verify(mPreference).setEnabled(false);
+    }
+
+    @Test
+    public void onClearAdbKeysConfirmed_shouldClearKeys() throws RemoteException {
+        mController.onClearAdbKeysConfirmed();
+
+        verify(mUsbManager).clearUsbDebuggingKeys();
+    }
+
+    @Implements(ClearAdbKeysWarningDialog.class)
+    public static class ShadowClearAdbKeysWarningDialog {
+
+        public static boolean sIsShowing;
+
+        @Implementation
+        public static void show(Fragment host) {
+            sIsShowing = true;
+        }
+
+        public static void resetDialog() {
+            sIsShowing = false;
+        }
+    }
+}
diff --git a/tests/robotests/src/com/android/settings/development/ConnectivityMonitorPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/ConnectivityMonitorPreferenceControllerTest.java
new file mode 100644
index 0000000..bb974f4
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/development/ConnectivityMonitorPreferenceControllerTest.java
@@ -0,0 +1,220 @@
+/*
+ * Copyright (C) 2017 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF 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 static com.android.settings.development.ConnectivityMonitorPreferenceController.ENG_BUILD;
+import static com.android.settings.development.ConnectivityMonitorPreferenceController
+        .USERDEBUG_BUILD;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+import android.content.Context;
+import android.os.SystemProperties;
+import android.support.v14.preference.SwitchPreference;
+import android.support.v7.preference.PreferenceScreen;
+
+import com.android.settings.TestConfig;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
+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.RuntimeEnvironment;
+import org.robolectric.annotation.Config;
+
+@RunWith(SettingsRobolectricTestRunner.class)
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION_O, shadows =
+        SettingsShadowSystemProperties.class)
+public class ConnectivityMonitorPreferenceControllerTest {
+
+    private static final String USER_BUILD = "user";
+
+    @Mock
+    private PreferenceScreen mScreen;
+    @Mock
+    private SwitchPreference mPreference;
+
+    private Context mContext;
+    private ConnectivityMonitorPreferenceController mController;
+
+    @Before
+    public void setUp() {
+        MockitoAnnotations.initMocks(this);
+        SettingsShadowSystemProperties.clear();
+        mContext = RuntimeEnvironment.application;
+        mController = new ConnectivityMonitorPreferenceController(mContext);
+        when(mScreen.findPreference(mController.getPreferenceKey())).thenReturn(mPreference);
+        mController.displayPreference(mScreen);
+    }
+
+    @Test
+    public void isAvailable_trueShowFlagWithUserdebugBuild_shouldReturnTrue() {
+        SettingsShadowSystemProperties.set(
+                ConnectivityMonitorPreferenceController.BUILD_TYPE, USERDEBUG_BUILD);
+
+        assertThat(mController.isAvailable()).isTrue();
+    }
+
+    @Test
+    public void isAvailable_trueShowFlagWithEngBuild_shouldReturnTrue() {
+        SettingsShadowSystemProperties.set(
+                ConnectivityMonitorPreferenceController.BUILD_TYPE, ENG_BUILD);
+
+        assertThat(mController.isAvailable()).isTrue();
+    }
+
+    @Test
+    public void isAvailable_trueShowFlagWithUserBuild_shouldReturnFalse() {
+        SettingsShadowSystemProperties.set(
+                ConnectivityMonitorPreferenceController.BUILD_TYPE, USER_BUILD);
+
+        assertThat(mController.isAvailable()).isFalse();
+    }
+
+    @Test
+    @Config(qualifiers = "mcc999")
+    public void isAvailable_falseShowFlagWithUserdebugBuild_shouldReturnFalse() {
+        SettingsShadowSystemProperties.set(
+                ConnectivityMonitorPreferenceController.BUILD_TYPE, USERDEBUG_BUILD);
+
+        assertThat(mController.isAvailable()).isFalse();
+    }
+
+    @Test
+    @Config(qualifiers = "mcc999")
+    public void isAvailable_falseShowFlagWithEngBuild_shouldReturnFalse() {
+        SettingsShadowSystemProperties.set(
+                ConnectivityMonitorPreferenceController.BUILD_TYPE, ENG_BUILD);
+
+        assertThat(mController.isAvailable()).isFalse();
+    }
+
+    @Test
+    @Config(qualifiers = "mcc999")
+    public void isAvailable_falseShowFlagWithUserBuild_shouldReturnFalse() {
+        SettingsShadowSystemProperties.set(
+                ConnectivityMonitorPreferenceController.BUILD_TYPE, USER_BUILD);
+
+        assertThat(mController.isAvailable()).isFalse();
+    }
+
+    @Test
+    public void updateState_connectivityMonitorEnabled_shouldCheckedPreference() {
+        SettingsShadowSystemProperties.set(
+                ConnectivityMonitorPreferenceController.PROPERTY_CONNECTIVITY_MONITOR,
+                ConnectivityMonitorPreferenceController.ENABLED_STATUS);
+        SettingsShadowSystemProperties.set(
+                ConnectivityMonitorPreferenceController.BUILD_TYPE, USERDEBUG_BUILD);
+
+        mController.updateState(mPreference);
+
+        verify(mPreference).setChecked(true);
+    }
+
+    @Test
+    public void updateState_connectivityMonitorUserEnabled_shouldCheckedPreference() {
+        SettingsShadowSystemProperties.set(
+                ConnectivityMonitorPreferenceController.PROPERTY_CONNECTIVITY_MONITOR,
+                ConnectivityMonitorPreferenceController.USER_ENABLED_STATUS);
+        SettingsShadowSystemProperties.set(
+                ConnectivityMonitorPreferenceController.BUILD_TYPE, USERDEBUG_BUILD);
+
+        mController.updateState(mPreference);
+
+        verify(mPreference).setChecked(true);
+    }
+
+    @Test
+    public void updateState_connectivityMonitorDisabled_shouldUncheckedPreference() {
+        SettingsShadowSystemProperties.set(
+                ConnectivityMonitorPreferenceController.PROPERTY_CONNECTIVITY_MONITOR,
+                ConnectivityMonitorPreferenceController.DISABLED_STATUS);
+        SettingsShadowSystemProperties.set(
+                ConnectivityMonitorPreferenceController.BUILD_TYPE, USERDEBUG_BUILD);
+
+        mController.updateState(mPreference);
+
+        verify(mPreference).setChecked(false);
+    }
+
+    @Test
+    public void updateState_connectivityMonitorUserDisabled_shouldUncheckedPreference() {
+        SettingsShadowSystemProperties.set(
+                ConnectivityMonitorPreferenceController.PROPERTY_CONNECTIVITY_MONITOR,
+                ConnectivityMonitorPreferenceController.USER_DISABLED_STATUS);
+        SettingsShadowSystemProperties.set(
+                ConnectivityMonitorPreferenceController.BUILD_TYPE, USERDEBUG_BUILD);
+
+        mController.updateState(mPreference);
+
+        verify(mPreference).setChecked(false);
+    }
+
+    @Test
+    public void onPreferenceChange_preferenceChecked_shouldEnableConnectivityMonitor() {
+        SystemProperties.set(
+                ConnectivityMonitorPreferenceController.PROPERTY_CONNECTIVITY_MONITOR,
+                ConnectivityMonitorPreferenceController.USER_ENABLED_STATUS);
+
+        mController.handlePreferenceTreeClick(mPreference);
+
+        assertThat(ConnectivityMonitorPreferenceController.USER_ENABLED_STATUS).isEqualTo(
+                SystemProperties.get(
+                        ConnectivityMonitorPreferenceController.PROPERTY_CONNECTIVITY_MONITOR,
+                        ConnectivityMonitorPreferenceController.DISABLED_STATUS));
+    }
+
+    @Test
+    public void onPreferenceChange_preferenceUnchecked_shouldDisableConnectivityMonitor() {
+        SystemProperties.set(
+                ConnectivityMonitorPreferenceController.PROPERTY_CONNECTIVITY_MONITOR,
+                ConnectivityMonitorPreferenceController.USER_DISABLED_STATUS);
+
+        mController.handlePreferenceTreeClick(mPreference);
+
+        assertThat(ConnectivityMonitorPreferenceController.USER_DISABLED_STATUS).isEqualTo(
+                SystemProperties.get(
+                        ConnectivityMonitorPreferenceController.PROPERTY_CONNECTIVITY_MONITOR,
+                        ConnectivityMonitorPreferenceController.DISABLED_STATUS));
+    }
+
+    @Test
+    public void onDeveloperOptionsSwitchEnabled_shouldEnablePreference() {
+        mController.onDeveloperOptionsSwitchEnabled();
+
+        verify(mPreference).setEnabled(true);
+    }
+
+    @Test
+    public void onDeveloperOptionsSwitchDisabled_shouldDisablePreference() {
+        mController.onDeveloperOptionsSwitchDisabled();
+
+        String mode = SystemProperties.get(
+                ConnectivityMonitorPreferenceController.PROPERTY_CONNECTIVITY_MONITOR,
+                null /* default */);
+
+        assertThat(mode).isEqualTo(ConnectivityMonitorPreferenceController.USER_DISABLED_STATUS);
+        verify(mPreference).setEnabled(false);
+        verify(mPreference).setChecked(false);
+    }
+}
diff --git a/tests/robotests/src/com/android/settings/development/CoolColorTemperaturePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/CoolColorTemperaturePreferenceControllerTest.java
new file mode 100644
index 0000000..6e85ca6
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/development/CoolColorTemperaturePreferenceControllerTest.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.development;
+
+import static com.android.settings.development.CoolColorTemperaturePreferenceController
+        .COLOR_TEMPERATURE_PROPERTY;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import static org.mockito.Mockito.doNothing;
+import static org.mockito.Mockito.doReturn;
+import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+import android.content.Context;
+import android.support.v14.preference.SwitchPreference;
+import android.support.v7.preference.PreferenceScreen;
+
+import com.android.settings.TestConfig;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
+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.RuntimeEnvironment;
+import org.robolectric.annotation.Config;
+
+@RunWith(SettingsRobolectricTestRunner.class)
+@Config(manifest = TestConfig.MANIFEST_PATH,
+        sdk = TestConfig.SDK_VERSION_O,
+        shadows = {SettingsShadowSystemProperties.class})
+public class CoolColorTemperaturePreferenceControllerTest {
+
+    private Context mContext;
+    @Mock
+    private SwitchPreference mPreference;
+    @Mock
+    private PreferenceScreen mPreferenceScreen;
+    private CoolColorTemperaturePreferenceController mController;
+
+    @Before
+    public void setup() {
+        MockitoAnnotations.initMocks(this);
+        mContext = RuntimeEnvironment.application;
+        mController = new CoolColorTemperaturePreferenceController(mContext);
+        when(mPreferenceScreen.findPreference(mController.getPreferenceKey())).thenReturn(
+                mPreference);
+        mController.displayPreference(mPreferenceScreen);
+    }
+
+    @Test
+    public void onPreferenceChanged_turnOnCoolColorTemperature() {
+        mController.onPreferenceChange(null, true);
+        final boolean mode = SettingsShadowSystemProperties.getBoolean(
+                COLOR_TEMPERATURE_PROPERTY, false);
+
+        assertThat(mode).isTrue();
+    }
+
+    @Test
+    public void onPreferenceChanged_turnOffCoolColorTemperature() {
+        mController.onPreferenceChange(null, false);
+        final boolean mode = SettingsShadowSystemProperties.getBoolean(
+                COLOR_TEMPERATURE_PROPERTY, false);
+
+        assertThat(mode).isFalse();
+    }
+
+    @Test
+    public void updateState_preferenceShouldBeChecked() {
+        SettingsShadowSystemProperties.set(COLOR_TEMPERATURE_PROPERTY,
+                Boolean.toString(true));
+        mController.updateState(mPreference);
+
+        verify(mPreference).setChecked(true);
+    }
+
+    @Test
+    public void updateState_preferenceShouldNotBeChecked() {
+        SettingsShadowSystemProperties.set(COLOR_TEMPERATURE_PROPERTY,
+                Boolean.toString(false));
+        mController.updateState(mPreference);
+
+        verify(mPreference).setChecked(false);
+    }
+
+    @Test
+    public void onDeveloperOptionsDisabled_shouldDisablePreference() {
+        mController.onDeveloperOptionsDisabled();
+
+        verify(mPreference).setEnabled(false);
+        verify(mPreference).setChecked(false);
+    }
+
+    @Test
+    public void onDeveloperOptionsEnabled_shouldEnablePreference() {
+        mController.onDeveloperOptionsEnabled();
+
+        verify(mPreference).setEnabled(true);
+    }
+
+    @Test
+    @Config(qualifiers = "mcc999")
+    public void isAvailable_shouldBeFalse() {
+        assertThat(mController.isAvailable()).isFalse();
+    }
+}
diff --git a/tests/robotests/src/com/android/settings/development/DebugGpuOverdrawPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/DebugGpuOverdrawPreferenceControllerTest.java
new file mode 100644
index 0000000..7aa34ca
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/development/DebugGpuOverdrawPreferenceControllerTest.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.development;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+import android.content.Context;
+import android.os.SystemProperties;
+import android.support.v7.preference.ListPreference;
+import android.support.v7.preference.PreferenceScreen;
+import android.view.ThreadedRenderer;
+
+import com.android.settings.R;
+import com.android.settings.TestConfig;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.shadow.SettingsShadowSystemProperties;
+
+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;
+
+@RunWith(SettingsRobolectricTestRunner.class)
+@Config(manifest = TestConfig.MANIFEST_PATH,
+        sdk = TestConfig.SDK_VERSION_O,
+        shadows = {SettingsShadowSystemProperties.class})
+public class DebugGpuOverdrawPreferenceControllerTest {
+
+    @Mock
+    private ListPreference mPreference;
+    @Mock
+    private PreferenceScreen mScreen;
+
+    /**
+     * 0: off
+     * 1: Show overdraw areas
+     * 2: Show areas for Deuteranomaly
+     */
+    private String[] mListValues;
+    private String[] mListSummaries;
+    private Context mContext;
+    private DebugGpuOverdrawPreferenceController mController;
+
+    @Before
+    public void setup() {
+        MockitoAnnotations.initMocks(this);
+        mContext = RuntimeEnvironment.application;
+        mListValues = mContext.getResources().getStringArray(R.array.debug_hw_overdraw_values);
+        mListSummaries = mContext.getResources().getStringArray(
+                R.array.debug_hw_overdraw_entries);
+        mController = new DebugGpuOverdrawPreferenceController(mContext);
+        when(mScreen.findPreference(mController.getPreferenceKey())).thenReturn(mPreference);
+        mController.displayPreference(mScreen);
+    }
+
+    @After
+    public void teardown() {
+        SettingsShadowSystemProperties.clear();
+    }
+
+    @Test
+    public void onPreferenceChange_noValueSet_shouldSetEmptyString() {
+        mController.onPreferenceChange(mPreference, null /* new value */);
+
+        String mode = SystemProperties.get(ThreadedRenderer.DEBUG_OVERDRAW_PROPERTY);
+        assertThat(mode).isEqualTo("");
+    }
+
+    @Test
+    public void onPreferenceChange_option1Selected_shouldSetOption1() {
+        mController.onPreferenceChange(mPreference, mListValues[1]);
+
+        String mode = SystemProperties.get(ThreadedRenderer.DEBUG_OVERDRAW_PROPERTY);
+        assertThat(mode).isEqualTo(mListValues[1]);
+    }
+
+    @Test
+    public void updateState_option1Set_shouldUpdatePreferenceToOption1() {
+        SystemProperties.set(ThreadedRenderer.DEBUG_OVERDRAW_PROPERTY, mListValues[1]);
+
+        mController.updateState(mPreference);
+
+        verify(mPreference).setValue(mListValues[1]);
+        verify(mPreference).setSummary(mListSummaries[1]);
+    }
+
+    @Test
+    public void updateState_option2Set_shouldUpdatePreferenceToOption2() {
+        SystemProperties.set(ThreadedRenderer.DEBUG_OVERDRAW_PROPERTY, mListValues[2]);
+
+        mController.updateState(mPreference);
+
+        verify(mPreference).setValue(mListValues[2]);
+        verify(mPreference).setSummary(mListSummaries[2]);
+    }
+
+    @Test
+    public void updateState_noOptionSet_shouldDefaultToOption0() {
+        SystemProperties.set(ThreadedRenderer.DEBUG_OVERDRAW_PROPERTY, null);
+
+        mController.updateState(mPreference);
+
+        verify(mPreference).setValue(mListValues[0]);
+        verify(mPreference).setSummary(mListSummaries[0]);
+    }
+
+    @Test
+    public void onDeveloperOptionsSwitchDisabled_shouldDisablePreference() {
+        mController.onDeveloperOptionsSwitchDisabled();
+
+        verify(mPreference).setEnabled(false);
+    }
+
+    @Test
+    public void onDeveloperOptionsSwitchEnabled_shouldEnablePreference() {
+        mController.onDeveloperOptionsSwitchEnabled();
+
+        verify(mPreference).setEnabled(true);
+    }
+}
diff --git a/tests/robotests/src/com/android/settings/development/DebugNonRectClipOperationsPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/DebugNonRectClipOperationsPreferenceControllerTest.java
new file mode 100644
index 0000000..877f7fb
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/development/DebugNonRectClipOperationsPreferenceControllerTest.java
@@ -0,0 +1,144 @@
+/*
+ * Copyright (C) 2017 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF 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 static com.google.common.truth.Truth.assertThat;
+
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+import android.content.Context;
+import android.os.SystemProperties;
+import android.support.v7.preference.ListPreference;
+import android.support.v7.preference.PreferenceScreen;
+import android.view.ThreadedRenderer;
+
+import com.android.settings.R;
+import com.android.settings.TestConfig;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.shadow.SettingsShadowSystemProperties;
+
+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;
+
+@RunWith(SettingsRobolectricTestRunner.class)
+@Config(manifest = TestConfig.MANIFEST_PATH,
+        sdk = TestConfig.SDK_VERSION_O,
+        shadows = {SettingsShadowSystemProperties.class})
+public class DebugNonRectClipOperationsPreferenceControllerTest {
+
+    @Mock
+    private ListPreference mPreference;
+    @Mock
+    private PreferenceScreen mScreen;
+
+    /**
+     * 0: off
+     * 1: Draw non-rectangular clip region in blue
+     * 2: Highlight tested drawing commands in green
+     */
+    private String[] mListValues;
+    private String[] mListSummaries;
+    private Context mContext;
+    private DebugNonRectClipOperationsPreferenceController mController;
+
+    @Before
+    public void setup() {
+        MockitoAnnotations.initMocks(this);
+        mContext = RuntimeEnvironment.application;
+        mListValues = mContext.getResources().getStringArray(R.array.show_non_rect_clip_values);
+        mListSummaries = mContext.getResources().getStringArray(R.array.show_non_rect_clip_entries);
+        mController = new DebugNonRectClipOperationsPreferenceController(mContext);
+        when(mScreen.findPreference(mController.getPreferenceKey())).thenReturn(mPreference);
+        mController.displayPreference(mScreen);
+    }
+
+    @After
+    public void teardown() {
+        SettingsShadowSystemProperties.clear();
+    }
+
+    @Test
+    public void onPreferenceChange_noValueSet_shouldSetEmptyString() {
+        mController.onPreferenceChange(mPreference, null /* new value */);
+
+        String mode = SystemProperties.get(
+                ThreadedRenderer.DEBUG_SHOW_NON_RECTANGULAR_CLIP_PROPERTY);
+        assertThat(mode).isEqualTo("");
+    }
+
+    @Test
+    public void onPreferenceChange_option1Selected_shouldSetOption1() {
+        mController.onPreferenceChange(mPreference, mListValues[1]);
+
+        String mode = SystemProperties.get(
+                ThreadedRenderer.DEBUG_SHOW_NON_RECTANGULAR_CLIP_PROPERTY);
+        assertThat(mode).isEqualTo(mListValues[1]);
+    }
+
+    @Test
+    public void updateState_option1Set_shouldUpdatePreferenceToOption1() {
+        SystemProperties.set(ThreadedRenderer.DEBUG_SHOW_NON_RECTANGULAR_CLIP_PROPERTY,
+                mListValues[1]);
+
+        mController.updateState(mPreference);
+
+        verify(mPreference).setValue(mListValues[1]);
+        verify(mPreference).setSummary(mListSummaries[1]);
+    }
+
+    @Test
+    public void updateState_option2Set_shouldUpdatePreferenceToOption2() {
+        SystemProperties.set(ThreadedRenderer.DEBUG_SHOW_NON_RECTANGULAR_CLIP_PROPERTY,
+                mListValues[2]);
+
+        mController.updateState(mPreference);
+
+        verify(mPreference).setValue(mListValues[2]);
+        verify(mPreference).setSummary(mListSummaries[2]);
+    }
+
+    @Test
+    public void updateState_noOptionSet_shouldDefaultToOption0() {
+        SystemProperties.set(ThreadedRenderer.DEBUG_SHOW_NON_RECTANGULAR_CLIP_PROPERTY, null);
+
+        mController.updateState(mPreference);
+
+        verify(mPreference).setValue(mListValues[0]);
+        verify(mPreference).setSummary(mListSummaries[0]);
+    }
+
+    @Test
+    public void onDeveloperOptionsSwitchDisabled_shouldDisablePreference() {
+        mController.onDeveloperOptionsSwitchDisabled();
+
+        verify(mPreference).setEnabled(false);
+    }
+
+    @Test
+    public void onDeveloperOptionsSwitchEnabled_shouldEnablePreference() {
+        mController.onDeveloperOptionsSwitchEnabled();
+
+        verify(mPreference).setEnabled(true);
+    }
+}
diff --git a/tests/robotests/src/com/android/settings/development/DebugViewAttributesPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/DebugViewAttributesPreferenceControllerTest.java
new file mode 100644
index 0000000..6256ddb
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/development/DebugViewAttributesPreferenceControllerTest.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.development;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+import android.content.Context;
+import android.provider.Settings;
+import android.support.v14.preference.SwitchPreference;
+import android.support.v7.preference.PreferenceScreen;
+
+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_O)
+public class DebugViewAttributesPreferenceControllerTest {
+
+    @Mock
+    private SwitchPreference mPreference;
+    @Mock
+    private PreferenceScreen mPreferenceScreen;
+
+    private Context mContext;
+    private DebugViewAttributesPreferenceController mController;
+
+    @Before
+    public void setup() {
+        MockitoAnnotations.initMocks(this);
+        mContext = RuntimeEnvironment.application;
+        mController = new DebugViewAttributesPreferenceController(mContext);
+        when(mPreferenceScreen.findPreference(mController.getPreferenceKey())).thenReturn(
+                mPreference);
+        mController.displayPreference(mPreferenceScreen);
+    }
+
+    @Test
+    public void onPreferenceChanged_turnOnViewAttributes() {
+        mController.onPreferenceChange(null, true);
+
+        final int mode = Settings.System.getInt(mContext.getContentResolver(),
+                Settings.Global.DEBUG_VIEW_ATTRIBUTES, -1);
+
+        assertThat(mode).isEqualTo(DebugViewAttributesPreferenceController.SETTING_VALUE_ON);
+    }
+
+    @Test
+    public void onPreferenceChanged_turnOffViewAttributes() {
+        mController.onPreferenceChange(null, false);
+
+        final int mode = Settings.System.getInt(mContext.getContentResolver(),
+                Settings.Global.DEBUG_VIEW_ATTRIBUTES, -1);
+
+        assertThat(mode).isEqualTo(DebugViewAttributesPreferenceController.SETTING_VALUE_OFF);
+    }
+
+    @Test
+    public void updateState_preferenceShouldBeChecked() {
+        Settings.System.putInt(mContext.getContentResolver(), Settings.Global.DEBUG_VIEW_ATTRIBUTES,
+                DebugViewAttributesPreferenceController.SETTING_VALUE_ON);
+        mController.updateState(mPreference);
+
+        verify(mPreference).setChecked(true);
+    }
+
+    @Test
+    public void updateState_preferenceShouldNotBeChecked() {
+        Settings.System.putInt(mContext.getContentResolver(), Settings.Global.DEBUG_VIEW_ATTRIBUTES,
+                DebugViewAttributesPreferenceController.SETTING_VALUE_OFF);
+        mController.updateState(mPreference);
+
+        verify(mPreference).setChecked(false);
+    }
+
+    @Test
+    public void onDeveloperOptionsDisabled_shouldDisablePreference() {
+        mController.onDeveloperOptionsDisabled();
+        final int mode = Settings.System.getInt(mContext.getContentResolver(),
+                Settings.Global.DEBUG_VIEW_ATTRIBUTES, -1);
+
+        assertThat(mode).isEqualTo(DebugViewAttributesPreferenceController.SETTING_VALUE_OFF);
+        verify(mPreference).setEnabled(false);
+        verify(mPreference).setChecked(false);
+    }
+
+    @Test
+    public void onDeveloperOptionsEnabled_shouldEnablePreference() {
+        mController.onDeveloperOptionsEnabled();
+
+        verify(mPreference).setEnabled(true);
+    }
+
+}
diff --git a/tests/robotests/src/com/android/settings/development/DevelopmentSettingsDashboardFragmentTest.java b/tests/robotests/src/com/android/settings/development/DevelopmentSettingsDashboardFragmentTest.java
new file mode 100644
index 0000000..43e389a
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/development/DevelopmentSettingsDashboardFragmentTest.java
@@ -0,0 +1,295 @@
+/*
+ * Copyright (C) 2017 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF 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 static com.google.common.truth.Truth.assertThat;
+
+import static org.mockito.Mockito.doReturn;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+import android.content.Context;
+import android.provider.SearchIndexableResource;
+import android.provider.Settings;
+
+import com.android.internal.logging.nano.MetricsProto;
+import com.android.settings.R;
+import com.android.settings.TestConfig;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.shadow.SettingsShadowResources;
+import com.android.settings.widget.SwitchBar;
+import com.android.settings.widget.ToggleSwitch;
+import com.android.settingslib.development.AbstractEnableAdbPreferenceController;
+import com.android.settingslib.development.DevelopmentSettingsEnabler;
+
+import org.junit.After;
+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.annotation.Implementation;
+import org.robolectric.annotation.Implements;
+import org.robolectric.util.ReflectionHelpers;
+
+import java.util.List;
+
+@RunWith(SettingsRobolectricTestRunner.class)
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION_O)
+public class DevelopmentSettingsDashboardFragmentTest {
+
+    private SwitchBar mSwitchBar;
+    private ToggleSwitch mSwitch;
+    private Context mContext;
+    private DevelopmentSettingsDashboardFragment mDashboard;
+
+    @Before
+    public void setUp() {
+        MockitoAnnotations.initMocks(this);
+        mContext = RuntimeEnvironment.application;
+        mSwitchBar = new SwitchBar(mContext);
+        mSwitch = mSwitchBar.getSwitch();
+        mDashboard = spy(new DevelopmentSettingsDashboardFragment());
+        ReflectionHelpers.setField(mDashboard, "mSwitchBar", mSwitchBar);
+    }
+
+    @After
+    public void tearDown() {
+        ShadowEnableDevelopmentSettingWarningDialog.reset();
+    }
+
+    @Test
+    public void shouldNotHaveHelpResource() {
+        assertThat(mDashboard.getHelpResource()).isEqualTo(0);
+    }
+
+    @Test
+    public void shouldLogAsFeatureFlagPage() {
+        assertThat(mDashboard.getMetricsCategory())
+                .isEqualTo(MetricsProto.MetricsEvent.DEVELOPMENT);
+    }
+
+    @Test
+    public void searchIndex_shouldIndexFromPrefXml() {
+        final List<SearchIndexableResource> index =
+                DevelopmentSettingsDashboardFragment.SEARCH_INDEX_DATA_PROVIDER
+                        .getXmlResourcesToIndex(RuntimeEnvironment.application, true);
+
+        assertThat(index.size()).isEqualTo(1);
+        assertThat(index.get(0).xmlResId).isEqualTo(R.xml.development_settings);
+    }
+
+    @Test
+    @Config(shadows = {
+            SettingsShadowResources.class,
+            SettingsShadowResources.SettingsShadowTheme.class
+    })
+    public void searchIndex_pageDisabled_shouldAddAllKeysToNonIndexable() {
+        final Context appContext = RuntimeEnvironment.application;
+        DevelopmentSettingsEnabler.setDevelopmentSettingsEnabled(appContext, false);
+
+        final List<String> nonIndexableKeys =
+                DevelopmentSettingsDashboardFragment.SEARCH_INDEX_DATA_PROVIDER
+                        .getNonIndexableKeys(appContext);
+
+        assertThat(nonIndexableKeys).contains("development_prefs_screen");
+    }
+
+    @Test
+    @Config(shadows = {
+            ShadowPictureColorModePreferenceController.class,
+            ShadowAdbPreferenceController.class,
+            ShadowBluetoothInbandRingingPreferenceController.class,
+            ShadowClearAdbKeysPreferenceController.class
+    })
+    public void searchIndex_pageEnabled_shouldNotAddKeysToNonIndexable() {
+        final Context appContext = RuntimeEnvironment.application;
+        DevelopmentSettingsEnabler.setDevelopmentSettingsEnabled(appContext, true);
+
+        final List<String> nonIndexableKeys =
+                DevelopmentSettingsDashboardFragment.SEARCH_INDEX_DATA_PROVIDER
+                        .getNonIndexableKeys(appContext);
+
+        assertThat(nonIndexableKeys).doesNotContain("development_prefs_screen");
+    }
+
+    @Test
+    @Config(shadows = {
+            ShadowEnableDevelopmentSettingWarningDialog.class
+    })
+    public void onSwitchChanged_sameState_shouldDoNothing() {
+        when(mDashboard.getContext()).thenReturn(mContext);
+        Settings.Global.putInt(mContext.getContentResolver(),
+                Settings.Global.DEVELOPMENT_SETTINGS_ENABLED, 0);
+
+        mDashboard.onSwitchChanged(mSwitch, false /* isChecked */);
+        assertThat(ShadowEnableDevelopmentSettingWarningDialog.mShown).isFalse();
+    }
+
+    @Test
+    @Config(shadows = {
+            ShadowEnableDevelopmentSettingWarningDialog.class
+    })
+    public void onSwitchChanged_turnOn_shouldShowWarningDialog() {
+        when(mDashboard.getContext()).thenReturn(mContext);
+        Settings.Global.putInt(mContext.getContentResolver(),
+                Settings.Global.DEVELOPMENT_SETTINGS_ENABLED, 0);
+
+        mDashboard.onSwitchChanged(mSwitch, true /* isChecked */);
+        assertThat(ShadowEnableDevelopmentSettingWarningDialog.mShown).isTrue();
+    }
+
+    @Test
+    @Config(shadows = {
+            ShadowEnableDevelopmentSettingWarningDialog.class
+    })
+    public void onSwitchChanged_turnOff_shouldTurnOff() {
+        when(mDashboard.getContext()).thenReturn(mContext);
+        Settings.Global.putInt(mContext.getContentResolver(),
+                Settings.Global.DEVELOPMENT_SETTINGS_ENABLED, 1);
+
+        mDashboard.onSwitchChanged(mSwitch, false /* isChecked */);
+
+        assertThat(ShadowEnableDevelopmentSettingWarningDialog.mShown).isFalse();
+        assertThat(DevelopmentSettingsEnabler.isDevelopmentSettingsEnabled(mContext))
+                .isFalse();
+    }
+
+    @Test
+    public void onOemUnlockDialogConfirmed_shouldCallControllerOemConfirmed() {
+        final OemUnlockPreferenceController controller = mock(OemUnlockPreferenceController.class);
+        doReturn(controller).when(mDashboard).getDevelopmentOptionsController(
+                OemUnlockPreferenceController.class);
+        mDashboard.onOemUnlockDialogConfirmed();
+        verify(controller).onOemUnlockConfirmed();
+    }
+
+    @Test
+    public void onOemUnlockDialogConfirmed_shouldCallControllerOemDismissed() {
+        final OemUnlockPreferenceController controller = mock(OemUnlockPreferenceController.class);
+        doReturn(controller).when(mDashboard).getDevelopmentOptionsController(
+                OemUnlockPreferenceController.class);
+        mDashboard.onOemUnlockDialogDismissed();
+        verify(controller).onOemUnlockDismissed();
+    }
+
+    @Test
+    public void onAdbDialogConfirmed_shouldCallControllerDialogConfirmed() {
+        final AdbPreferenceController controller = mock(AdbPreferenceController.class);
+        doReturn(controller).when(mDashboard).getDevelopmentOptionsController(
+                AdbPreferenceController.class);
+        mDashboard.onEnableAdbDialogConfirmed();
+
+        verify(controller).onAdbDialogConfirmed();
+    }
+
+    @Test
+    public void onAdbDialogDismissed_shouldCallControllerOemDismissed() {
+        final AdbPreferenceController controller = mock(AdbPreferenceController.class);
+        doReturn(controller).when(mDashboard).getDevelopmentOptionsController(
+                AdbPreferenceController.class);
+        mDashboard.onEnableAdbDialogDismissed();
+
+        verify(controller).onAdbDialogDismissed();
+    }
+
+    @Test
+    public void onAdbClearKeysDialogConfirmed_shouldCallControllerDialogConfirmed() {
+        final ClearAdbKeysPreferenceController controller = mock(
+                ClearAdbKeysPreferenceController.class);
+        doReturn(controller).when(mDashboard).getDevelopmentOptionsController(
+                ClearAdbKeysPreferenceController.class);
+        mDashboard.onAdbClearKeysDialogConfirmed();
+
+        verify(controller).onClearAdbKeysConfirmed();
+    }
+
+    @Test
+    public void onDisableLogPersistDialogConfirmed_shouldCallControllerDialogConfirmed() {
+        final LogPersistPreferenceController controller = mock(
+                LogPersistPreferenceController.class);
+        doReturn(controller).when(mDashboard).getDevelopmentOptionsController(
+                LogPersistPreferenceController.class);
+        mDashboard.onDisableLogPersistDialogConfirmed();
+
+        verify(controller).onDisableLogPersistDialogConfirmed();
+    }
+
+    @Test
+    public void onDisableLogPersistDialogRejected_shouldCallControllerDialogRejected() {
+        final LogPersistPreferenceController controller = mock(
+                LogPersistPreferenceController.class);
+        doReturn(controller).when(mDashboard).getDevelopmentOptionsController(
+                LogPersistPreferenceController.class);
+        mDashboard.onDisableLogPersistDialogRejected();
+
+        verify(controller).onDisableLogPersistDialogRejected();
+    }
+
+    @Implements(EnableDevelopmentSettingWarningDialog.class)
+    public static class ShadowEnableDevelopmentSettingWarningDialog {
+
+        static boolean mShown;
+
+        public static void reset() {
+            mShown = false;
+        }
+
+        @Implementation
+        public static void show(
+                DevelopmentSettingsDashboardFragment host) {
+            mShown = true;
+        }
+    }
+
+    @Implements(PictureColorModePreferenceController.class)
+    public static class ShadowPictureColorModePreferenceController {
+        @Implementation
+        public boolean isAvailable() {
+            return true;
+        }
+    }
+
+    @Implements(AbstractEnableAdbPreferenceController.class)
+    public static class ShadowAdbPreferenceController {
+        @Implementation
+        public boolean isAvailable() {
+            return true;
+        }
+    }
+
+    @Implements(BluetoothInbandRingingPreferenceController.class)
+    public static class ShadowBluetoothInbandRingingPreferenceController {
+
+        @Implementation
+        public boolean isAvailable() {
+            return true;
+        }
+    }
+
+    @Implements(ClearAdbKeysPreferenceController.class)
+    public static class ShadowClearAdbKeysPreferenceController {
+
+        @Implementation
+        public boolean isAvailable() {
+            return true;
+        }
+    }
+}
diff --git a/tests/robotests/src/com/android/settings/development/DevelopmentSettingsDisabledActivityTest.java b/tests/robotests/src/com/android/settings/development/DevelopmentSettingsDisabledActivityTest.java
index 5927646..aa9a3a3 100644
--- a/tests/robotests/src/com/android/settings/development/DevelopmentSettingsDisabledActivityTest.java
+++ b/tests/robotests/src/com/android/settings/development/DevelopmentSettingsDisabledActivityTest.java
@@ -31,7 +31,7 @@
 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_O)
 public class DevelopmentSettingsDisabledActivityTest {
 
     @Test
diff --git a/tests/robotests/src/com/android/settings/development/DevelopmentSettingsEnablerTest.java b/tests/robotests/src/com/android/settings/development/DevelopmentSettingsEnablerTest.java
deleted file mode 100644
index 223f98d..0000000
--- a/tests/robotests/src/com/android/settings/development/DevelopmentSettingsEnablerTest.java
+++ /dev/null
@@ -1,105 +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 static com.google.common.truth.Truth.assertThat;
-
-import android.content.Context;
-import android.content.SharedPreferences;
-import android.provider.Settings;
-
-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.Answers;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
-import org.robolectric.RuntimeEnvironment;
-import org.robolectric.annotation.Config;
-import org.robolectric.util.ReflectionHelpers;
-
-@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
-public class DevelopmentSettingsEnablerTest {
-
-    @Mock(answer = Answers.RETURNS_DEEP_STUBS)
-    private SharedPreferences mDevelopmentPreferences;
-    private Context mContext;
-    private DevelopmentSettingsEnabler mEnabler;
-
-    @Before
-    public void setUp() {
-        MockitoAnnotations.initMocks(this);
-        mContext = RuntimeEnvironment.application;
-        mEnabler = new DevelopmentSettingsEnabler(mContext, null);
-        ReflectionHelpers.setField(mEnabler, "mDevelopmentPreferences", mDevelopmentPreferences);
-    }
-
-    @Test
-    public void constructor_shouldInitEnabledState() {
-        Settings.Global.putInt(mContext.getContentResolver(),
-                Settings.Global.DEVELOPMENT_SETTINGS_ENABLED, 1);
-
-        mEnabler = new DevelopmentSettingsEnabler(mContext, null);
-
-        assertThat(mEnabler.getLastEnabledState()).isTrue();
-    }
-
-    @Test
-    public void onResume_shouldReadStateFromSettingProvider() {
-        Settings.Global.putInt(mContext.getContentResolver(),
-                Settings.Global.DEVELOPMENT_SETTINGS_ENABLED, 1);
-
-        mEnabler.onResume();
-
-        assertThat(mEnabler.getLastEnabledState()).isTrue();
-
-        Settings.Global.putInt(mContext.getContentResolver(),
-                Settings.Global.DEVELOPMENT_SETTINGS_ENABLED, 0);
-
-        mEnabler.onResume();
-
-        assertThat(mEnabler.getLastEnabledState()).isFalse();
-    }
-
-    @Test
-    public void disable_shouldChangeSettingProviderValue() {
-        Settings.Global.putInt(mContext.getContentResolver(),
-                Settings.Global.DEVELOPMENT_SETTINGS_ENABLED, 1);
-
-        mEnabler.disableDevelopmentSettings();
-
-        assertThat(mEnabler.getLastEnabledState()).isFalse();
-        assertThat(Settings.Global.getInt(mContext.getContentResolver(),
-                Settings.Global.DEVELOPMENT_SETTINGS_ENABLED, 1)).isEqualTo(0);
-    }
-
-    @Test
-    public void enable_shouldChangeSettingProviderValue() {
-        Settings.Global.putInt(mContext.getContentResolver(),
-                Settings.Global.DEVELOPMENT_SETTINGS_ENABLED, 0);
-
-        mEnabler.enableDevelopmentSettings();
-
-        assertThat(mEnabler.getLastEnabledState()).isTrue();
-        assertThat(Settings.Global.getInt(mContext.getContentResolver(),
-                Settings.Global.DEVELOPMENT_SETTINGS_ENABLED, 0)).isEqualTo(1);
-    }
-}
diff --git a/tests/robotests/src/com/android/settings/development/DevelopmentSettingsTest.java b/tests/robotests/src/com/android/settings/development/DevelopmentSettingsTest.java
deleted file mode 100644
index 8e4b74d..0000000
--- a/tests/robotests/src/com/android/settings/development/DevelopmentSettingsTest.java
+++ /dev/null
@@ -1,136 +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.development;
-
-import android.app.Activity;
-import android.content.Context;
-import android.provider.SearchIndexableResource;
-import android.support.v7.preference.Preference;
-import android.support.v7.preference.PreferenceManager;
-import android.support.v7.preference.PreferenceScreen;
-
-import com.android.settings.R;
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.TestConfig;
-import com.android.settings.testutils.FakeFeatureFactory;
-import com.android.settings.testutils.shadow.SettingsShadowResources;
-import com.android.settingslib.drawer.CategoryKey;
-
-import org.junit.Before;
-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 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;
-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 = {
-                SettingsShadowResources.class,
-                SettingsShadowResources.SettingsShadowTheme.class
-        })
-public class DevelopmentSettingsTest {
-
-    @Mock(answer = Answers.RETURNS_DEEP_STUBS)
-    private Context mContext;
-    @Mock(answer = Answers.RETURNS_DEEP_STUBS)
-    private Activity mActivity;
-    @Mock(answer = RETURNS_DEEP_STUBS)
-    private PreferenceScreen mScreen;
-    @Mock
-    private PreferenceManager mPreferenceManager;
-
-    private FakeFeatureFactory mFeatureFactory;
-    private DevelopmentSettings mSettings;
-
-    @Before
-    public void setUp() {
-        MockitoAnnotations.initMocks(this);
-        FakeFeatureFactory.setupForTest(mContext);
-        mFeatureFactory = (FakeFeatureFactory) FakeFeatureFactory.getFactory(mContext);
-        mSettings = spy(new DevelopmentSettings());
-    }
-
-    @Test
-    public void addDashboardCategoryPreference_shouldAddToScreen() {
-        final List<Preference> preferences = new ArrayList<>();
-        preferences.add(new Preference(ShadowApplication.getInstance().getApplicationContext()));
-        preferences.add(new Preference(ShadowApplication.getInstance().getApplicationContext()));
-        doReturn(mScreen).when(mSettings).getPreferenceScreen();
-        doReturn(mPreferenceManager).when(mSettings).getPreferenceManager();
-        doReturn(mActivity).when(mSettings).getActivity();
-        when(mPreferenceManager.getContext()).thenReturn(mContext);
-        when(mFeatureFactory.dashboardFeatureProvider.getPreferencesForCategory(
-                mActivity, mContext, mSettings.getMetricsCategory(),
-                CategoryKey.CATEGORY_SYSTEM_DEVELOPMENT))
-                .thenReturn(preferences);
-
-        mSettings.onAttach(mContext);
-        mSettings.addDashboardCategoryPreferences();
-
-        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/DevelopmentSwitchBarControllerTest.java b/tests/robotests/src/com/android/settings/development/DevelopmentSwitchBarControllerTest.java
index a53b836..f34bedf 100644
--- a/tests/robotests/src/com/android/settings/development/DevelopmentSwitchBarControllerTest.java
+++ b/tests/robotests/src/com/android/settings/development/DevelopmentSwitchBarControllerTest.java
@@ -16,8 +16,15 @@
 
 package com.android.settings.development;
 
+import static android.arch.lifecycle.Lifecycle.Event.ON_START;
+import static android.arch.lifecycle.Lifecycle.Event.ON_STOP;
+
 import static com.google.common.truth.Truth.assertThat;
 
+import static org.mockito.Mockito.when;
+
+import android.content.Context;
+
 import com.android.settings.TestConfig;
 import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.testutils.shadow.ShadowUtils;
@@ -37,14 +44,15 @@
 import java.util.ArrayList;
 
 @RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION,
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION_O,
         shadows = {
                 ShadowUtils.class
         })
 public class DevelopmentSwitchBarControllerTest {
 
     @Mock
-    private DevelopmentSettings mSettings;
+    private DevelopmentSettingsDashboardFragment mSettings;
+    private Context mContext;
     private Lifecycle mLifecycle;
     private SwitchBar mSwitchBar;
     private DevelopmentSwitchBarController mController;
@@ -52,8 +60,10 @@
     @Before
     public void setUp() {
         MockitoAnnotations.initMocks(this);
-        mLifecycle = new Lifecycle();
-        mSwitchBar = new SwitchBar(RuntimeEnvironment.application);
+        mContext = RuntimeEnvironment.application;
+        mLifecycle = new Lifecycle(() -> mLifecycle);
+        mSwitchBar = new SwitchBar(mContext);
+        when(mSettings.getContext()).thenReturn(mContext);
     }
 
     @After
@@ -62,17 +72,17 @@
     }
 
     @Test
-    public void runThroughLifecycle_isMonkeyRun_shouldNotRegisterListener() {
+    public void runThroughLifecycle_v2_isMonkeyRun_shouldNotRegisterListener() {
         ShadowUtils.setIsUserAMonkey(true);
         mController = new DevelopmentSwitchBarController(mSettings, mSwitchBar,
                 true /* isAvailable */, mLifecycle);
         final ArrayList<SwitchBar.OnSwitchChangeListener> listeners =
                 ReflectionHelpers.getField(mSwitchBar, "mSwitchChangeListeners");
 
-        mLifecycle.onStart();
+        mLifecycle.handleLifecycleEvent(ON_START);
         assertThat(listeners).doesNotContain(mSettings);
 
-        mLifecycle.onStop();
+        mLifecycle.handleLifecycleEvent(ON_STOP);
         assertThat(listeners).doesNotContain(mSettings);
     }
 
@@ -84,10 +94,26 @@
         final ArrayList<SwitchBar.OnSwitchChangeListener> listeners =
                 ReflectionHelpers.getField(mSwitchBar, "mSwitchChangeListeners");
 
-        mLifecycle.onStart();
+        mLifecycle.handleLifecycleEvent(ON_START);
         assertThat(listeners).contains(mSettings);
 
-        mLifecycle.onStop();
+        mLifecycle.handleLifecycleEvent(ON_STOP);
+        assertThat(listeners).doesNotContain(mSettings);
+    }
+
+    @Test
+    public void runThroughLifecycle_v2_isNotMonkeyRun_shouldRegisterAndRemoveListener() {
+        when(mSettings.getContext()).thenReturn(RuntimeEnvironment.application);
+        ShadowUtils.setIsUserAMonkey(false);
+        mController = new DevelopmentSwitchBarController(mSettings, mSwitchBar,
+                true /* isAvailable */, mLifecycle);
+        final ArrayList<SwitchBar.OnSwitchChangeListener> listeners =
+                ReflectionHelpers.getField(mSwitchBar, "mSwitchChangeListeners");
+
+        mLifecycle.handleLifecycleEvent(ON_START);
+        assertThat(listeners).contains(mSettings);
+
+        mLifecycle.handleLifecycleEvent(ON_STOP);
         assertThat(listeners).doesNotContain(mSettings);
     }
 
diff --git a/tests/robotests/src/com/android/settings/development/DisableAutomaticUpdatesPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/DisableAutomaticUpdatesPreferenceControllerTest.java
new file mode 100644
index 0000000..d1e2fd9
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/development/DisableAutomaticUpdatesPreferenceControllerTest.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.development;
+
+import android.content.Context;
+import android.provider.Settings;
+import android.support.v14.preference.SwitchPreference;
+import android.support.v7.preference.PreferenceScreen;
+
+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;
+
+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_O)
+public class DisableAutomaticUpdatesPreferenceControllerTest {
+
+    @Mock
+    private PreferenceScreen mPreferenceScreen;
+    @Mock
+    private SwitchPreference mPreference;
+
+    private Context mContext;
+    private DisableAutomaticUpdatesPreferenceController mController;
+
+    @Before
+    public void setup() {
+        MockitoAnnotations.initMocks(this);
+        mContext = RuntimeEnvironment.application;
+        mController = new DisableAutomaticUpdatesPreferenceController(mContext);
+        when(mPreferenceScreen.findPreference(mController.getPreferenceKey())).thenReturn(
+                mPreference);
+        mController.displayPreference(mPreferenceScreen);
+    }
+
+    @Test
+    public void onPreferenceChanged_turnOnAutomaticUpdates() {
+        mController.onPreferenceChange(null, true);
+
+        final int mode = Settings.System.getInt(mContext.getContentResolver(),
+                Settings.Global.OTA_DISABLE_AUTOMATIC_UPDATE, -1);
+
+        assertThat(mode).isEqualTo(
+                DisableAutomaticUpdatesPreferenceController.ENABLE_UPDATES_SETTING);
+    }
+
+    @Test
+    public void onPreferenceChanged_turnOffAutomaticUpdates() {
+        mController.onPreferenceChange(null, false);
+
+        final int mode = Settings.System.getInt(mContext.getContentResolver(),
+                Settings.Global.OTA_DISABLE_AUTOMATIC_UPDATE, -1);
+
+        assertThat(mode).isEqualTo(
+                DisableAutomaticUpdatesPreferenceController.DISABLE_UPDATES_SETTING);
+    }
+
+    @Test
+    public void updateState_preferenceShouldBeChecked() {
+        Settings.System
+                .putInt(mContext.getContentResolver(), Settings.Global.OTA_DISABLE_AUTOMATIC_UPDATE,
+                        DisableAutomaticUpdatesPreferenceController.ENABLE_UPDATES_SETTING);
+        mController.updateState(mPreference);
+
+        verify(mPreference).setChecked(true);
+    }
+
+    @Test
+    public void updateState_preferenceShouldNotBeChecked() {
+        Settings.System
+                .putInt(mContext.getContentResolver(), Settings.Global.OTA_DISABLE_AUTOMATIC_UPDATE,
+                        DisableAutomaticUpdatesPreferenceController.DISABLE_UPDATES_SETTING);
+        mController.updateState(mPreference);
+
+        verify(mPreference).setChecked(false);
+    }
+
+
+    @Test
+    public void onDeveloperOptionsDisabled_shouldDisablePreference() {
+        mController.onDeveloperOptionsDisabled();
+
+        verify(mPreference).setEnabled(false);
+        verify(mPreference).setChecked(false);
+    }
+
+    @Test
+    public void onDeveloperOptionsEnabled_shouldEnablePreference() {
+        mController.onDeveloperOptionsEnabled();
+
+        verify(mPreference).setEnabled(true);
+    }
+
+}
diff --git a/tests/robotests/src/com/android/settings/development/EnableGpuDebugLayersPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/EnableGpuDebugLayersPreferenceControllerTest.java
new file mode 100644
index 0000000..4f4d4af
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/development/EnableGpuDebugLayersPreferenceControllerTest.java
@@ -0,0 +1,124 @@
+/*
+ * Copyright (C) 2017 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.development;
+
+
+import static com.android.settings.development.EnableGpuDebugLayersPreferenceController
+        .SETTING_VALUE_OFF;
+import static com.android.settings.development.EnableGpuDebugLayersPreferenceController
+        .SETTING_VALUE_ON;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+import android.content.Context;
+import android.provider.Settings;
+import android.support.v14.preference.SwitchPreference;
+import android.support.v7.preference.PreferenceScreen;
+
+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_O)
+public class EnableGpuDebugLayersPreferenceControllerTest {
+
+    @Mock
+    private SwitchPreference mPreference;
+    @Mock
+    private PreferenceScreen mPreferenceScreen;
+
+    private Context mContext;
+    private EnableGpuDebugLayersPreferenceController mController;
+
+    @Before
+    public void setup() {
+        MockitoAnnotations.initMocks(this);
+        mContext = RuntimeEnvironment.application;
+        mController = new EnableGpuDebugLayersPreferenceController(mContext);
+        when(mPreferenceScreen.findPreference(mController.getPreferenceKey())).thenReturn(
+                mPreference);
+        mController.displayPreference(mPreferenceScreen);
+    }
+
+    @Test
+    public void onPreferenceChange_settingEnabled_enableGpuDebugLayersShouldBeOn() {
+        mController.onPreferenceChange(mPreference, true /* new value */);
+
+        final int mode = Settings.Global.getInt(mContext.getContentResolver(),
+                Settings.Global.ENABLE_GPU_DEBUG_LAYERS, -1 /* default */);
+
+        assertThat(mode).isEqualTo(SETTING_VALUE_ON);
+    }
+
+    @Test
+    public void onPreferenceChange_settingDisabled_enableGpuDebugLayersShouldBeOff() {
+        mController.onPreferenceChange(mPreference, false /* new value */);
+
+        final int mode = Settings.Global.getInt(mContext.getContentResolver(),
+                Settings.Global.ENABLE_GPU_DEBUG_LAYERS, -1 /* default */);
+
+        assertThat(mode).isEqualTo(SETTING_VALUE_OFF);
+    }
+
+    @Test
+    public void updateState_settingDisabled_preferenceShouldNotBeChecked() {
+        Settings.Global.putInt(mContext.getContentResolver(),
+                Settings.Global.ENABLE_GPU_DEBUG_LAYERS, SETTING_VALUE_OFF);
+        mController.updateState(mPreference);
+
+        verify(mPreference).setChecked(false);
+    }
+
+    @Test
+    public void updateState_settingEnabled_preferenceShouldBeChecked() {
+        Settings.Global.putInt(mContext.getContentResolver(),
+                Settings.Global.ENABLE_GPU_DEBUG_LAYERS, SETTING_VALUE_ON);
+        mController.updateState(mPreference);
+
+        verify(mPreference).setChecked(true);
+    }
+
+    @Test
+    public void onDeveloperOptionsSwitchDisabled_shouldDisablePreference() {
+        mController.onDeveloperOptionsSwitchDisabled();
+
+        final int mode = Settings.Global.getInt(mContext.getContentResolver(),
+                Settings.Global.ENABLE_GPU_DEBUG_LAYERS, -1 /* default */);
+
+        assertThat(mode).isEqualTo(SETTING_VALUE_OFF);
+        verify(mPreference).setChecked(false);
+        verify(mPreference).setEnabled(false);
+    }
+
+    @Test
+    public void onDeveloperOptionsSwitchEnabled_shouldEnablePreference() {
+        mController.onDeveloperOptionsSwitchEnabled();
+
+        verify(mPreference).setEnabled(true);
+    }
+}
diff --git a/tests/robotests/src/com/android/settings/development/FileEncryptionPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/FileEncryptionPreferenceControllerTest.java
new file mode 100644
index 0000000..f94213f
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/development/FileEncryptionPreferenceControllerTest.java
@@ -0,0 +1,134 @@
+/*
+ * Copyright (C) 2017 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.development;
+
+import static com.android.settings.development.FileEncryptionPreferenceController
+        .FILE_ENCRYPTION_PROPERTY_KEY;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import static org.mockito.ArgumentMatchers.anyBoolean;
+import static org.mockito.ArgumentMatchers.anyString;
+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.RemoteException;
+import android.os.SystemProperties;
+import android.os.storage.IStorageManager;
+import android.support.v7.preference.Preference;
+import android.support.v7.preference.PreferenceScreen;
+
+import com.android.settings.R;
+import com.android.settings.TestConfig;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.shadow.SettingsShadowSystemProperties;
+
+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;
+import org.robolectric.util.ReflectionHelpers;
+
+@RunWith(SettingsRobolectricTestRunner.class)
+@Config(manifest = TestConfig.MANIFEST_PATH,
+        sdk = TestConfig.SDK_VERSION_O,
+        shadows = {SettingsShadowSystemProperties.class})
+public class FileEncryptionPreferenceControllerTest {
+
+    @Mock
+    private Preference mPreference;
+    @Mock
+    private PreferenceScreen mPreferenceScreen;
+    @Mock
+    private IStorageManager mStorageManager;
+
+    private Context mContext;
+    private FileEncryptionPreferenceController mController;
+
+    @Before
+    public void setup() {
+        MockitoAnnotations.initMocks(this);
+        mContext = RuntimeEnvironment.application;
+        mController = new FileEncryptionPreferenceController(mContext);
+        when(mPreferenceScreen.findPreference(mController.getPreferenceKey())).thenReturn(
+                mPreference);
+    }
+
+    @After
+    public void teardown() {
+        SettingsShadowSystemProperties.clear();
+    }
+
+    @Test
+    public void isAvailable_storageManagerNull_shouldBeFalse() {
+        ReflectionHelpers.setField(mController, "mStorageManager", null);
+
+        assertThat(mController.isAvailable()).isFalse();
+    }
+
+    @Test
+    public void isAvailable_notConvertibleToFBE_shouldBeFalse() throws RemoteException {
+        ReflectionHelpers.setField(mController, "mStorageManager", mStorageManager);
+        when(mStorageManager.isConvertibleToFBE()).thenReturn(false);
+
+        assertThat(mController.isAvailable()).isFalse();
+    }
+
+    @Test
+    public void isAvailable_convertibleToFBE_shouldBeTrue() throws RemoteException {
+        ReflectionHelpers.setField(mController, "mStorageManager", mStorageManager);
+        when(mStorageManager.isConvertibleToFBE()).thenReturn(true);
+
+        assertThat(mController.isAvailable()).isTrue();
+    }
+
+    @Test
+    public void updateState_settingIsNotFile_shouldDoNothing() throws RemoteException {
+        ReflectionHelpers.setField(mController, "mStorageManager", mStorageManager);
+        when(mStorageManager.isConvertibleToFBE()).thenReturn(true);
+        mController.displayPreference(mPreferenceScreen);
+        SystemProperties.set(FILE_ENCRYPTION_PROPERTY_KEY, "foobar");
+
+        mController.updateState(mPreference);
+
+        verify(mPreference, never()).setEnabled(anyBoolean());
+        verify(mPreference, never()).setSummary(anyString());
+    }
+
+    @Test
+    public void updateState_settingIsFile_shouldSetSummaryAndDisablePreference()
+            throws RemoteException {
+        ReflectionHelpers.setField(mController, "mStorageManager", mStorageManager);
+        when(mStorageManager.isConvertibleToFBE()).thenReturn(true);
+        mController.displayPreference(mPreferenceScreen);
+        SystemProperties.set(FILE_ENCRYPTION_PROPERTY_KEY, "file");
+
+        mController.updateState(mPreference);
+
+        verify(mPreference).setEnabled(false);
+        verify(mPreference).setSummary(
+                mContext.getResources().getString(R.string.convert_to_file_encryption_done));
+    }
+}
+
+
diff --git a/tests/robotests/src/com/android/settings/development/ForceGpuRenderingPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/ForceGpuRenderingPreferenceControllerTest.java
new file mode 100644
index 0000000..e81b422
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/development/ForceGpuRenderingPreferenceControllerTest.java
@@ -0,0 +1,127 @@
+/*
+ * Copyright (C) 2017 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF 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 static com.android.settings.development.ForceGpuRenderingPreferenceController
+        .HARDWARE_UI_PROPERTY;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+import android.content.Context;
+import android.support.v14.preference.SwitchPreference;
+import android.support.v7.preference.PreferenceScreen;
+
+import com.android.settings.TestConfig;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.shadow.SettingsShadowSystemProperties;
+
+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;
+
+@RunWith(SettingsRobolectricTestRunner.class)
+@Config(manifest = TestConfig.MANIFEST_PATH,
+        sdk = TestConfig.SDK_VERSION_O,
+        shadows = {SettingsShadowSystemProperties.class})
+public class ForceGpuRenderingPreferenceControllerTest {
+
+    @Mock
+    private SwitchPreference mPreference;
+    @Mock
+    private PreferenceScreen mPreferenceScreen;
+
+    private Context mContext;
+    private ForceGpuRenderingPreferenceController mController;
+
+    @Before
+    public void setup() {
+        MockitoAnnotations.initMocks(this);
+        mContext = RuntimeEnvironment.application;
+        mController = new ForceGpuRenderingPreferenceController(mContext);
+        when(mPreferenceScreen.findPreference(mController.getPreferenceKey())).thenReturn(
+                mPreference);
+        mController.displayPreference(mPreferenceScreen);
+    }
+
+    @After
+    public void tearDown() {
+        SettingsShadowSystemProperties.clear();
+    }
+
+    @Test
+    public void onPreferenceChanged_settingEnabled_turnOnForceGpuRendering() {
+        mController.onPreferenceChange(mPreference, true /* new value */);
+
+        final boolean mode = SettingsShadowSystemProperties.getBoolean(HARDWARE_UI_PROPERTY,
+                false /* default */);
+
+        assertThat(mode).isTrue();
+    }
+
+    @Test
+    public void onPreferenceChanged_settingDisabled_turnOffForceGpuRendering() {
+        mController.onPreferenceChange(mPreference, false /* new value */);
+
+        final boolean mode = SettingsShadowSystemProperties.getBoolean(HARDWARE_UI_PROPERTY,
+                false /* default */);
+
+        assertThat(mode).isFalse();
+    }
+
+    @Test
+    public void updateState_settingEnabled_preferenceShouldBeChecked() {
+        SettingsShadowSystemProperties.set(HARDWARE_UI_PROPERTY, Boolean.toString(true));
+        mController.updateState(mPreference);
+
+        verify(mPreference).setChecked(true);
+    }
+
+    @Test
+    public void updateState_settingDisabled_preferenceShouldNotBeChecked() {
+        SettingsShadowSystemProperties.set(HARDWARE_UI_PROPERTY, Boolean.toString(false));
+        mController.updateState(mPreference);
+
+        verify(mPreference).setChecked(false);
+    }
+
+    @Test
+    public void onDeveloperOptionsDisabled_shouldDisablePreference() {
+        mController.onDeveloperOptionsDisabled();
+
+        final boolean mode = SettingsShadowSystemProperties.getBoolean(HARDWARE_UI_PROPERTY,
+                false /* default */);
+
+        assertThat(mode).isFalse();
+        verify(mPreference).setEnabled(false);
+        verify(mPreference).setChecked(false);
+    }
+
+    @Test
+    public void onDeveloperOptionsEnabled_shouldEnablePreference() {
+        mController.onDeveloperOptionsEnabled();
+
+        verify(mPreference).setEnabled(true);
+    }
+}
diff --git a/tests/robotests/src/com/android/settings/development/ForceMSAAPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/ForceMSAAPreferenceControllerTest.java
new file mode 100644
index 0000000..5aaadb4
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/development/ForceMSAAPreferenceControllerTest.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.development;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+import android.content.Context;
+import android.support.v14.preference.SwitchPreference;
+import android.support.v7.preference.PreferenceScreen;
+
+import com.android.settings.TestConfig;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.shadow.SettingsShadowSystemProperties;
+
+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;
+
+@RunWith(SettingsRobolectricTestRunner.class)
+@Config(manifest = TestConfig.MANIFEST_PATH,
+        sdk = TestConfig.SDK_VERSION_O,
+        shadows = {SettingsShadowSystemProperties.class})
+public class ForceMSAAPreferenceControllerTest {
+
+    @Mock
+    private SwitchPreference mPreference;
+    @Mock
+    private PreferenceScreen mPreferenceScreen;
+
+    private Context mContext;
+    private ForceMSAAPreferenceController mController;
+
+    @Before
+    public void setup() {
+        MockitoAnnotations.initMocks(this);
+        mContext = RuntimeEnvironment.application;
+        mController = new ForceMSAAPreferenceController(mContext);
+        when(mPreferenceScreen.findPreference(mController.getPreferenceKey())).thenReturn(
+                mPreference);
+        mController.displayPreference(mPreferenceScreen);
+    }
+
+    @After
+    public void tearDown() {
+        SettingsShadowSystemProperties.clear();
+    }
+
+    @Test
+    public void onPreferenceChanged_settingEnabled_turnOnForceMsaa() {
+        mController.onPreferenceChange(mPreference, true /* new value */);
+
+        final boolean mode = SettingsShadowSystemProperties.getBoolean(
+                ForceMSAAPreferenceController.MSAA_PROPERTY, false /* default */);
+
+        assertThat(mode).isTrue();
+    }
+
+    @Test
+    public void onPreferenceChanged_settingDisabled_turnOffForceMsaa() {
+        mController.onPreferenceChange(mPreference, false /* new value */);
+
+        final boolean mode = SettingsShadowSystemProperties.getBoolean(
+                ForceMSAAPreferenceController.MSAA_PROPERTY, false /* default */);
+
+        assertThat(mode).isFalse();
+    }
+
+    @Test
+    public void updateState_settingEnabled_preferenceShouldBeChecked() {
+        SettingsShadowSystemProperties.set(ForceMSAAPreferenceController.MSAA_PROPERTY,
+                Boolean.toString(true));
+        mController.updateState(mPreference);
+
+        verify(mPreference).setChecked(true);
+    }
+
+    @Test
+    public void updateState_settingDisabled_preferenceShouldNotBeChecked() {
+        SettingsShadowSystemProperties.set(ForceMSAAPreferenceController.MSAA_PROPERTY,
+                Boolean.toString(false));
+        mController.updateState(mPreference);
+
+        verify(mPreference).setChecked(false);
+    }
+
+    @Test
+    public void onDeveloperOptionsDisabled_shouldDisablePreference() {
+        mController.onDeveloperOptionsDisabled();
+
+        verify(mPreference).setEnabled(false);
+        verify(mPreference).setChecked(false);
+    }
+
+    @Test
+    public void onDeveloperOptionsEnabled_shouldEnablePreference() {
+        mController.onDeveloperOptionsEnabled();
+
+        final boolean mode = SettingsShadowSystemProperties.getBoolean(
+                ForceMSAAPreferenceController.MSAA_PROPERTY, false /* default */);
+
+        assertThat(mode).isFalse();
+        verify(mPreference).setEnabled(true);
+    }
+}
diff --git a/tests/robotests/src/com/android/settings/development/FreeformWindowsPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/FreeformWindowsPreferenceControllerTest.java
new file mode 100644
index 0000000..43757d0
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/development/FreeformWindowsPreferenceControllerTest.java
@@ -0,0 +1,140 @@
+/*
+ * Copyright (C) 2017 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.development;
+
+import static com.android.settings.development.FreeformWindowsPreferenceController
+        .SETTING_VALUE_OFF;
+import static com.android.settings.development.FreeformWindowsPreferenceController.SETTING_VALUE_ON;
+import static com.android.settings.development.FreeformWindowsPreferenceController.USER_BUILD_TYPE;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import static org.mockito.Mockito.doReturn;
+import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+import android.content.Context;
+import android.provider.Settings;
+import android.support.v14.preference.SwitchPreference;
+import android.support.v7.preference.PreferenceScreen;
+
+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_O)
+public class FreeformWindowsPreferenceControllerTest {
+
+    private static final String ENG_BUILD_TYPE = "eng";
+
+    @Mock
+    private SwitchPreference mPreference;
+    @Mock
+    private PreferenceScreen mScreen;
+
+    private Context mContext;
+    private FreeformWindowsPreferenceController mController;
+
+    @Before
+    public void setup() {
+        MockitoAnnotations.initMocks(this);
+        mContext = RuntimeEnvironment.application;
+        mController = new FreeformWindowsPreferenceController(mContext);
+        when(mScreen.findPreference(mController.getPreferenceKey())).thenReturn(mPreference);
+        mController.displayPreference(mScreen);
+    }
+
+    @Test
+    public void isAvailable_engBuild_shouldBeTrue() {
+        mController = spy(mController);
+        doReturn(ENG_BUILD_TYPE).when(mController).getBuildType();
+
+        assertThat(mController.isAvailable()).isTrue();
+    }
+
+    @Test
+    public void isAvaiable_userBuild_shouldBeFalse() {
+        mController = spy(mController);
+        doReturn(USER_BUILD_TYPE).when(mController).getBuildType();
+
+        assertThat(mController.isAvailable()).isFalse();
+    }
+
+    @Test
+    public void onPreferenceChange_switchEnabled_shouldEnableFreeformWindows() {
+        mController.onPreferenceChange(mPreference, true /* new value */);
+
+        final int mode = Settings.Global.getInt(mContext.getContentResolver(),
+                Settings.Global.DEVELOPMENT_ENABLE_FREEFORM_WINDOWS_SUPPORT, -1 /* default */);
+        assertThat(mode).isEqualTo(SETTING_VALUE_ON);
+    }
+
+    @Test
+    public void onPreferenceChange_switchDisabled_shouldDisableFreeformWindows() {
+        mController.onPreferenceChange(mPreference, false /* new value */);
+
+        final int mode = Settings.Global.getInt(mContext.getContentResolver(),
+                Settings.Global.DEVELOPMENT_ENABLE_FREEFORM_WINDOWS_SUPPORT, -1 /* default */);
+        assertThat(mode).isEqualTo(SETTING_VALUE_OFF);
+    }
+
+    @Test
+    public void updateState_settingEnabled_preferenceShouldBeChecked() {
+        Settings.Global.putInt(mContext.getContentResolver(),
+                Settings.Global.DEVELOPMENT_ENABLE_FREEFORM_WINDOWS_SUPPORT, SETTING_VALUE_ON);
+
+        mController.updateState(mPreference);
+
+        verify(mPreference).setChecked(true);
+    }
+
+    @Test
+    public void updateState_settingDisabled_preferenceShouldNotBeChecked() {
+        Settings.Global.putInt(mContext.getContentResolver(),
+                Settings.Global.DEVELOPMENT_ENABLE_FREEFORM_WINDOWS_SUPPORT, SETTING_VALUE_OFF);
+
+        mController.updateState(mPreference);
+
+        verify(mPreference).setChecked(false);
+    }
+
+    @Test
+    public void onDeveloperOptionsSwitchEnabled_shouldEnablePreference() {
+        mController.onDeveloperOptionsSwitchEnabled();
+
+        verify(mPreference).setEnabled(true);
+    }
+
+    @Test
+    public void onDeveloperOptionsSwitchDisabled_shouldDisablePreference() {
+        mController.onDeveloperOptionsSwitchDisabled();
+
+        final int mode = Settings.Global.getInt(mContext.getContentResolver(),
+                Settings.Global.DEVELOPMENT_ENABLE_FREEFORM_WINDOWS_SUPPORT, -1 /* default */);
+        assertThat(mode).isEqualTo(SETTING_VALUE_OFF);
+        verify(mPreference).setEnabled(false);
+    }
+}
diff --git a/tests/robotests/src/com/android/settings/development/GpuViewUpdatesPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/GpuViewUpdatesPreferenceControllerTest.java
new file mode 100644
index 0000000..028c29e
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/development/GpuViewUpdatesPreferenceControllerTest.java
@@ -0,0 +1,127 @@
+/*
+ * Copyright (C) 2017 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF 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 static com.google.common.truth.Truth.assertThat;
+
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+import android.content.Context;
+import android.support.v14.preference.SwitchPreference;
+import android.support.v7.preference.PreferenceScreen;
+import android.view.ThreadedRenderer;
+
+import com.android.settings.TestConfig;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.shadow.SettingsShadowSystemProperties;
+
+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;
+
+@RunWith(SettingsRobolectricTestRunner.class)
+@Config(manifest = TestConfig.MANIFEST_PATH,
+        sdk = TestConfig.SDK_VERSION_O,
+        shadows = {SettingsShadowSystemProperties.class})
+public class GpuViewUpdatesPreferenceControllerTest {
+
+    @Mock
+    private SwitchPreference mPreference;
+    @Mock
+    private PreferenceScreen mPreferenceScreen;
+
+    private Context mContext;
+    private GpuViewUpdatesPreferenceController mController;
+
+    @Before
+    public void setup() {
+        MockitoAnnotations.initMocks(this);
+        mContext = RuntimeEnvironment.application;
+        mController = new GpuViewUpdatesPreferenceController(mContext);
+        when(mPreferenceScreen.findPreference(mController.getPreferenceKey())).thenReturn(
+                mPreference);
+        mController.displayPreference(mPreferenceScreen);
+    }
+
+    @After
+    public void tearDown() {
+        SettingsShadowSystemProperties.clear();
+    }
+
+    @Test
+    public void onPreferenceChanged_settingEnabled_turnOnGpuViewUpdates() {
+        mController.onPreferenceChange(mPreference, true /* new value */);
+
+        final boolean mode = SettingsShadowSystemProperties.getBoolean(
+                ThreadedRenderer.DEBUG_DIRTY_REGIONS_PROPERTY, false /* default */);
+
+        assertThat(mode).isTrue();
+    }
+
+    @Test
+    public void onPreferenceChanged_settingDisabled_turnOffGpuViewUpdates() {
+        mController.onPreferenceChange(mPreference, false /* new value */);
+
+        final boolean mode = SettingsShadowSystemProperties.getBoolean(
+                ThreadedRenderer.DEBUG_DIRTY_REGIONS_PROPERTY, false /* default */);
+
+        assertThat(mode).isFalse();
+    }
+
+    @Test
+    public void updateState_settingEnabled_preferenceShouldBeChecked() {
+        SettingsShadowSystemProperties.set(ThreadedRenderer.DEBUG_DIRTY_REGIONS_PROPERTY,
+                Boolean.toString(true));
+        mController.updateState(mPreference);
+
+        verify(mPreference).setChecked(true);
+    }
+
+    @Test
+    public void updateState_settingDisabled_preferenceShouldNotBeChecked() {
+        SettingsShadowSystemProperties.set(ThreadedRenderer.DEBUG_DIRTY_REGIONS_PROPERTY,
+                Boolean.toString(false));
+        mController.updateState(mPreference);
+
+        verify(mPreference).setChecked(false);
+    }
+
+    @Test
+    public void onDeveloperOptionsDisabled_shouldDisablePreference() {
+        mController.onDeveloperOptionsDisabled();
+
+        verify(mPreference).setEnabled(false);
+        verify(mPreference).setChecked(false);
+    }
+
+    @Test
+    public void onDeveloperOptionsEnabled_shouldEnablePreference() {
+        mController.onDeveloperOptionsEnabled();
+
+        final boolean mode = SettingsShadowSystemProperties.getBoolean(
+                ThreadedRenderer.DEBUG_DIRTY_REGIONS_PROPERTY, false /* default */);
+
+        assertThat(mode).isFalse();
+        verify(mPreference).setEnabled(true);
+    }
+}
diff --git a/tests/robotests/src/com/android/settings/development/HardwareLayersUpdatesPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/HardwareLayersUpdatesPreferenceControllerTest.java
new file mode 100644
index 0000000..e7c984b
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/development/HardwareLayersUpdatesPreferenceControllerTest.java
@@ -0,0 +1,127 @@
+/*
+ * Copyright (C) 2017 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF 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 static com.google.common.truth.Truth.assertThat;
+
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+import android.content.Context;
+import android.support.v14.preference.SwitchPreference;
+import android.support.v7.preference.PreferenceScreen;
+import android.view.ThreadedRenderer;
+
+import com.android.settings.TestConfig;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.shadow.SettingsShadowSystemProperties;
+
+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;
+
+@RunWith(SettingsRobolectricTestRunner.class)
+@Config(manifest = TestConfig.MANIFEST_PATH,
+        sdk = TestConfig.SDK_VERSION_O,
+        shadows = {SettingsShadowSystemProperties.class})
+public class HardwareLayersUpdatesPreferenceControllerTest {
+
+    @Mock
+    private SwitchPreference mPreference;
+    @Mock
+    private PreferenceScreen mPreferenceScreen;
+
+    private Context mContext;
+    private HardwareLayersUpdatesPreferenceController mController;
+
+    @Before
+    public void setup() {
+        MockitoAnnotations.initMocks(this);
+        mContext = RuntimeEnvironment.application;
+        mController = new HardwareLayersUpdatesPreferenceController(mContext);
+        when(mPreferenceScreen.findPreference(mController.getPreferenceKey())).thenReturn(
+                mPreference);
+        mController.displayPreference(mPreferenceScreen);
+    }
+
+    @After
+    public void tearDown() {
+        SettingsShadowSystemProperties.clear();
+    }
+
+    @Test
+    public void onPreferenceChanged_settingEnabled_turnOnHardwareLayersUpdates() {
+        mController.onPreferenceChange(mPreference, true /* new value */);
+
+        final boolean mode = SettingsShadowSystemProperties.getBoolean(
+                ThreadedRenderer.DEBUG_SHOW_LAYERS_UPDATES_PROPERTY, false /* default */);
+
+        assertThat(mode).isTrue();
+    }
+
+    @Test
+    public void onPreferenceChanged_settingDisabled_turnOffHardwareLayersUpdates() {
+        mController.onPreferenceChange(mPreference, false /* new value */);
+
+        final boolean mode = SettingsShadowSystemProperties.getBoolean(
+                ThreadedRenderer.DEBUG_SHOW_LAYERS_UPDATES_PROPERTY, false /* default */);
+
+        assertThat(mode).isFalse();
+    }
+
+    @Test
+    public void updateState_settingEnabled_preferenceShouldBeChecked() {
+        SettingsShadowSystemProperties.set(ThreadedRenderer.DEBUG_SHOW_LAYERS_UPDATES_PROPERTY,
+                Boolean.toString(true));
+        mController.updateState(mPreference);
+
+        verify(mPreference).setChecked(true);
+    }
+
+    @Test
+    public void updateState_settingDisabled_preferenceShouldNotBeChecked() {
+        SettingsShadowSystemProperties.set(ThreadedRenderer.DEBUG_SHOW_LAYERS_UPDATES_PROPERTY,
+                Boolean.toString(false));
+        mController.updateState(mPreference);
+
+        verify(mPreference).setChecked(false);
+    }
+
+    @Test
+    public void onDeveloperOptionsDisabled_shouldDisablePreference() {
+        mController.onDeveloperOptionsDisabled();
+
+        verify(mPreference).setEnabled(false);
+        verify(mPreference).setChecked(false);
+    }
+
+    @Test
+    public void onDeveloperOptionsEnabled_shouldEnablePreference() {
+        mController.onDeveloperOptionsEnabled();
+
+        final boolean mode = SettingsShadowSystemProperties.getBoolean(
+                ThreadedRenderer.DEBUG_SHOW_LAYERS_UPDATES_PROPERTY, false /* default */);
+
+        assertThat(mode).isFalse();
+        verify(mPreference).setEnabled(true);
+    }
+}
diff --git a/tests/robotests/src/com/android/settings/development/HardwareOverlaysPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/HardwareOverlaysPreferenceControllerTest.java
new file mode 100644
index 0000000..31e910e
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/development/HardwareOverlaysPreferenceControllerTest.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.development;
+
+import static com.android.settings.development.HardwareOverlaysPreferenceController
+        .SURFACE_FLINGER_READ_CODE;
+
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.anyBoolean;
+import static org.mockito.ArgumentMatchers.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;
+
+import android.content.Context;
+import android.os.IBinder;
+import android.os.RemoteException;
+import android.support.v14.preference.SwitchPreference;
+import android.support.v7.preference.PreferenceScreen;
+
+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 org.robolectric.util.ReflectionHelpers;
+
+@RunWith(SettingsRobolectricTestRunner.class)
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION_O)
+public class HardwareOverlaysPreferenceControllerTest {
+
+    @Mock
+    private Context mContext;
+    @Mock
+    private PreferenceScreen mScreen;
+    @Mock
+    private SwitchPreference mPreference;
+    @Mock
+    private IBinder mSurfaceFlinger;
+
+    private HardwareOverlaysPreferenceController mController;
+
+    @Before
+    public void setUp() {
+        MockitoAnnotations.initMocks(this);
+        mController = spy(new HardwareOverlaysPreferenceController(mContext));
+        ReflectionHelpers.setField(mController, "mSurfaceFlinger", mSurfaceFlinger);
+        doNothing().when(mController).writeHardwareOverlaysSetting(anyBoolean());
+        when(mScreen.findPreference(mController.getPreferenceKey())).thenReturn(mPreference);
+        mController.displayPreference(mScreen);
+    }
+
+    @Test
+    public void onPreferenceChange_settingToggledOn_shouldWriteTrueToHardwareOverlaysSetting() {
+        mController.onPreferenceChange(mPreference, true /* new value */);
+
+        verify(mController).writeHardwareOverlaysSetting(true);
+    }
+
+    @Test
+    public void onPreferenceChange_settingToggledOff_shouldWriteFalseToHardwareOverlaysSetting() {
+        mController.onPreferenceChange(mPreference, false /* new value */);
+
+        verify(mController).writeHardwareOverlaysSetting(false);
+    }
+
+    @Test
+    @Config(shadows = {ShadowParcel.class})
+    public void updateState_settingEnabled_shouldCheckPreference() throws RemoteException {
+        ShadowParcel.sReadIntResult = 1;
+        doReturn(true).when(mSurfaceFlinger).transact(eq(SURFACE_FLINGER_READ_CODE), any(), any(),
+                eq(0 /* flags */));
+        mController.updateState(mPreference);
+
+        verify(mPreference).setChecked(true);
+    }
+
+    @Test
+    @Config(shadows = {ShadowParcel.class})
+    public void updateState_settingDisabled_shouldUnCheckPreference() throws RemoteException {
+        ShadowParcel.sReadIntResult = 0;
+        doReturn(true).when(mSurfaceFlinger).transact(eq(SURFACE_FLINGER_READ_CODE), any(), any(),
+                eq(0 /* flags */));
+        mController.updateState(mPreference);
+
+        verify(mPreference).setChecked(false);
+    }
+
+    @Test
+    public void onDeveloperOptionsSwitchDisabled_preferenceChecked_shouldTurnOffPreference() {
+        when(mPreference.isChecked()).thenReturn(true);
+        mController.onDeveloperOptionsSwitchDisabled();
+
+        verify(mController).writeHardwareOverlaysSetting(false);
+        verify(mPreference).setChecked(false);
+        verify(mPreference).setEnabled(false);
+    }
+
+    @Test
+    public void onDeveloperOptionsSwitchDisabled_preferenceUnchecked_shouldNotTurnOffPreference() {
+        when(mPreference.isChecked()).thenReturn(false);
+        mController.onDeveloperOptionsSwitchDisabled();
+
+        verify(mController, never()).writeHardwareOverlaysSetting(anyBoolean());
+        verify(mPreference, never()).setChecked(anyBoolean());
+        verify(mPreference).setEnabled(false);
+    }
+
+    @Test
+    public void onDeveloperOptionsSwitchEnabled_shouldEnablePreference() {
+        mController.onDeveloperOptionsSwitchEnabled();
+
+        verify(mPreference).setEnabled(true);
+    }
+}
diff --git a/tests/robotests/src/com/android/settings/development/HdcpCheckingPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/HdcpCheckingPreferenceControllerTest.java
new file mode 100644
index 0000000..a85075b
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/development/HdcpCheckingPreferenceControllerTest.java
@@ -0,0 +1,164 @@
+/*
+ * Copyright (C) 2017 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF 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 static com.android.settings.development.HdcpCheckingPreferenceController
+        .HDCP_CHECKING_PROPERTY;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import static org.mockito.Mockito.doReturn;
+import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+import android.content.Context;
+import android.os.SystemProperties;
+import android.support.v7.preference.ListPreference;
+import android.support.v7.preference.PreferenceScreen;
+
+import com.android.settings.R;
+import com.android.settings.TestConfig;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.shadow.SettingsShadowSystemProperties;
+
+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;
+
+@RunWith(SettingsRobolectricTestRunner.class)
+@Config(manifest = TestConfig.MANIFEST_PATH,
+        sdk = TestConfig.SDK_VERSION_O,
+        shadows = {SettingsShadowSystemProperties.class})
+public class HdcpCheckingPreferenceControllerTest {
+
+    private static final String USER_DEBUG = "userdebug";
+
+    @Mock
+    private ListPreference mPreference;
+    @Mock
+    private PreferenceScreen mScreen;
+
+    private Context mContext;
+    private HdcpCheckingPreferenceController mController;
+
+    /**
+     * Array Values Key
+     *
+     * 0: Never Check
+     * 1: Check for DRM content only
+     * 2: Always Check
+     */
+    private String[] mValues;
+    private String[] mSummaries;
+
+    @Before
+    public void setup() {
+        MockitoAnnotations.initMocks(this);
+        mContext = RuntimeEnvironment.application;
+        mValues = mContext.getResources().getStringArray(R.array.hdcp_checking_values);
+        mSummaries = mContext.getResources().getStringArray(R.array.hdcp_checking_summaries);
+        mController = new HdcpCheckingPreferenceController(mContext);
+        when(mScreen.findPreference(mController.getPreferenceKey())).thenReturn(mPreference);
+        mController.displayPreference(mScreen);
+
+    }
+
+    @After
+    public void teardown() {
+        SettingsShadowSystemProperties.clear();
+    }
+
+    @Test
+    public void isAvailable_isUserBuildType_shouldReturnFalse() {
+        mController = spy(mController);
+        doReturn(HdcpCheckingPreferenceController.USER_BUILD_TYPE).when(mController).getBuildType();
+
+        assertThat(mController.isAvailable()).isFalse();
+    }
+
+    @Test
+    public void isAvailable_isUserDebugBuildType_shouldReturnTrue() {
+        mController = spy(mController);
+        doReturn(USER_DEBUG).when(mController).getBuildType();
+
+        assertThat(mController.isAvailable()).isTrue();
+    }
+
+    @Test
+    public void onPreferenceChange_setNeverCheckHdcp_shouldEnableNeverCheckHdcp() {
+        mController.onPreferenceChange(mPreference, mValues[0]);
+
+        assertThat(SystemProperties.get(HDCP_CHECKING_PROPERTY)).isEqualTo(mValues[0]);
+    }
+
+    @Test
+    public void onPreferenceChange_setCheckDrm_shouldEnableCheckDrm() {
+        mController.onPreferenceChange(mPreference, mValues[1]);
+
+        assertThat(SystemProperties.get(HDCP_CHECKING_PROPERTY)).isEqualTo(mValues[1]);
+    }
+
+    @Test
+    public void updateState_neverCheckHdcp_shouldEnableNeverCheckHdcp() {
+        SystemProperties.set(HDCP_CHECKING_PROPERTY, mValues[0]);
+
+        mController.updateState(mPreference);
+
+        verify(mPreference).setValue(mValues[0]);
+        verify(mPreference).setSummary(mSummaries[0]);
+    }
+
+    @Test
+    public void updateState_checkDrm_shouldEnableCheckDrm() {
+        SystemProperties.set(HDCP_CHECKING_PROPERTY, mValues[1]);
+
+        mController.updateState(mPreference);
+
+        verify(mPreference).setValue(mValues[1]);
+        verify(mPreference).setSummary(mSummaries[1]);
+    }
+
+    @Test
+    public void updateState_noValueSet_shouldEnableCheckDrmAsDefault() {
+        SystemProperties.set(HDCP_CHECKING_PROPERTY, null);
+
+        mController.updateState(mPreference);
+
+        verify(mPreference).setValue(mValues[1]);
+        verify(mPreference).setSummary(mSummaries[1]);
+    }
+
+    @Test
+    public void onDeveloperOptionsSwitchDisabled_shouldDisablePreference() {
+        mController.onDeveloperOptionsSwitchDisabled();
+
+        verify(mPreference).setEnabled(false);
+    }
+
+    @Test
+    public void onDeveloperOptionsSwitchEnabled_shouldEnablePreference() {
+        mController.onDeveloperOptionsSwitchEnabled();
+
+        verify(mPreference).setEnabled(true);
+    }
+}
diff --git a/tests/robotests/src/com/android/settings/development/KeepActivitiesPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/KeepActivitiesPreferenceControllerTest.java
new file mode 100644
index 0000000..9736365
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/development/KeepActivitiesPreferenceControllerTest.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.development;
+
+import static com.android.settings.development.KeepActivitiesPreferenceController.SETTING_VALUE_OFF;
+
+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.IActivityManager;
+import android.content.Context;
+import android.os.RemoteException;
+import android.provider.Settings;
+import android.support.v14.preference.SwitchPreference;
+import android.support.v7.preference.PreferenceScreen;
+
+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_O)
+public class KeepActivitiesPreferenceControllerTest {
+
+    private static final int SETTING_VALUE_ON = 1;
+
+    @Mock
+    private SwitchPreference mPreference;
+    @Mock
+    private PreferenceScreen mPreferenceScreen;
+    @Mock
+    private IActivityManager mActivityManager;
+
+    private Context mContext;
+    private KeepActivitiesPreferenceController mController;
+
+    @Before
+    public void setup() {
+        MockitoAnnotations.initMocks(this);
+        mContext = RuntimeEnvironment.application;
+        mController = spy(new KeepActivitiesPreferenceController(mContext));
+        doReturn(mActivityManager).when(mController).getActivityManager();
+        when(mPreferenceScreen.findPreference(mController.getPreferenceKey())).thenReturn(
+                mPreference);
+        mController.displayPreference(mPreferenceScreen);
+    }
+
+    @Test
+    public void onPreferenceChanged_settingEnabled_turnOnDestroyActivities()
+            throws RemoteException {
+        mController.onPreferenceChange(mPreference, true /* new value */);
+
+        verify(mActivityManager).setAlwaysFinish(true);
+    }
+
+    @Test
+    public void onPreferenceChanged_settingDisabled_turnOffDestroyActivities()
+            throws RemoteException {
+        mController.onPreferenceChange(mPreference, false /* new value */);
+
+        verify(mActivityManager).setAlwaysFinish(false);
+    }
+
+    @Test
+    public void updateState_settingEnabled_preferenceShouldBeChecked() {
+        Settings.System.putInt(mContext.getContentResolver(),
+                Settings.Global.ALWAYS_FINISH_ACTIVITIES, SETTING_VALUE_ON);
+        mController.updateState(mPreference);
+
+        verify(mPreference).setChecked(true);
+    }
+
+    @Test
+    public void updateState_settingDisabled_preferenceShouldNotBeChecked() {
+        Settings.System.putInt(mContext.getContentResolver(),
+                Settings.Global.ALWAYS_FINISH_ACTIVITIES, SETTING_VALUE_OFF);
+        mController.updateState(mPreference);
+
+        verify(mPreference).setChecked(false);
+    }
+
+    @Test
+    public void onDeveloperOptionsDisabled_shouldDisablePreference() throws RemoteException {
+        mController.onDeveloperOptionsSwitchDisabled();
+
+        verify(mActivityManager).setAlwaysFinish(false);
+        verify(mPreference).setEnabled(false);
+        verify(mPreference).setChecked(false);
+    }
+
+    @Test
+    public void onDeveloperOptionsEnabled_shouldEnablePreference() {
+        mController.onDeveloperOptionsSwitchEnabled();
+
+        verify(mPreference).setEnabled(true);
+    }
+}
diff --git a/tests/robotests/src/com/android/settings/development/LocalBackupPasswordPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/LocalBackupPasswordPreferenceControllerTest.java
new file mode 100644
index 0000000..24b0290
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/development/LocalBackupPasswordPreferenceControllerTest.java
@@ -0,0 +1,120 @@
+package com.android.settings.development;
+
+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.backup.IBackupManager;
+import android.content.Context;
+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.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;
+import org.robolectric.util.ReflectionHelpers;
+
+@RunWith(SettingsRobolectricTestRunner.class)
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION_O)
+public class LocalBackupPasswordPreferenceControllerTest {
+
+    @Mock
+    private Preference mPreference;
+    @Mock
+    private PreferenceScreen mScreen;
+    @Mock
+    private UserManager mUserManager;
+    @Mock
+    private IBackupManager mBackupManager;
+
+    private Context mContext;
+    private LocalBackupPasswordPreferenceController mController;
+
+    @Before
+    public void setup() {
+        MockitoAnnotations.initMocks(this);
+        mContext = RuntimeEnvironment.application;
+        mController = spy(new LocalBackupPasswordPreferenceController(mContext));
+        ReflectionHelpers.setField(mController, "mUserManager", mUserManager);
+        when(mScreen.findPreference(mController.getPreferenceKey())).thenReturn(
+                mPreference);
+    }
+
+    @Test
+    public void updateState_hasBackupPassword_preferenceShouldHavePasswordSetSummary()
+            throws RemoteException {
+        ReflectionHelpers.setField(mController, "mBackupManager", mBackupManager);
+        doReturn(true).when(mController).isAdminUser();
+        when(mBackupManager.hasBackupPassword()).thenReturn(true);
+        mController.displayPreference(mScreen);
+
+        mController.updateState(mPreference);
+
+        verify(mPreference).setSummary(R.string.local_backup_password_summary_change);
+    }
+
+    @Test
+    public void updateState_noBackupPassword_preferenceShouldHaveNoPasswordSetSummary()
+            throws RemoteException {
+        ReflectionHelpers.setField(mController, "mBackupManager", mBackupManager);
+        doReturn(true).when(mController).isAdminUser();
+        when(mBackupManager.hasBackupPassword()).thenReturn(false);
+        mController.displayPreference(mScreen);
+
+        mController.updateState(mPreference);
+
+        verify(mPreference).setSummary(R.string.local_backup_password_summary_none);
+    }
+
+    @Test
+    public void updateState_backupManagerIsNull_shouldDisablePreference() throws RemoteException {
+        ReflectionHelpers.setField(mController, "mBackupManager", null);
+        doReturn(true).when(mController).isAdminUser();
+        when(mBackupManager.hasBackupPassword()).thenReturn(true);
+        mController.displayPreference(mScreen);
+
+        mController.updateState(mPreference);
+
+        verify(mPreference).setEnabled(false);
+        verify(mPreference, never()).setSummary(any());
+    }
+
+    @Test
+    public void updateState_backupManagerIsNotNullAndNotAdminUser_shouldDisablePreference()
+            throws RemoteException {
+        ReflectionHelpers.setField(mController, "mBackupManager", mBackupManager);
+        doReturn(false).when(mController).isAdminUser();
+        when(mBackupManager.hasBackupPassword()).thenReturn(true);
+
+        mController.updateState(mPreference);
+
+        verify(mPreference).setEnabled(false);
+        verify(mPreference, never()).setSummary(any());
+    }
+
+    @Test
+    public void updateState_backupManagerIsNotNullAndAdminUser_shouldEnablePreference()
+            throws RemoteException {
+        ReflectionHelpers.setField(mController, "mBackupManager", mBackupManager);
+        doReturn(true).when(mController).isAdminUser();
+        when(mBackupManager.hasBackupPassword()).thenReturn(true);
+
+        mController.updateState(mPreference);
+
+        verify(mPreference).setEnabled(true);
+        verify(mPreference, never()).setSummary(any());
+    }
+}
diff --git a/tests/robotests/src/com/android/settings/development/LocalTerminalPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/LocalTerminalPreferenceControllerTest.java
new file mode 100644
index 0000000..66e7ccd
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/development/LocalTerminalPreferenceControllerTest.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.development;
+
+import static com.android.settings.development.LocalTerminalPreferenceController
+        .TERMINAL_APP_PACKAGE;
+
+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.pm.PackageManager;
+import android.os.UserManager;
+import android.support.v14.preference.SwitchPreference;
+import android.support.v7.preference.PreferenceScreen;
+
+import com.android.settings.TestConfig;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
+import com.android.settingslib.wrapper.PackageManagerWrapper;
+
+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_O)
+public class LocalTerminalPreferenceControllerTest {
+
+    @Mock
+    private Context mContext;
+    @Mock
+    private SwitchPreference mPreference;
+    @Mock
+    private PreferenceScreen mPreferenceScreen;
+    @Mock
+    private UserManager mUserManager;
+    @Mock
+    private PackageManagerWrapper mPackageManagerWrapper;
+
+    private LocalTerminalPreferenceController mController;
+
+    @Before
+    public void setup() {
+        MockitoAnnotations.initMocks(this);
+        when(mContext.getSystemService(Context.USER_SERVICE)).thenReturn(mUserManager);
+        when(mUserManager.isAdminUser()).thenReturn(true);
+        mController = spy(new LocalTerminalPreferenceController(mContext));
+        doReturn(true).when(mController).isAvailable();
+        doReturn(mPackageManagerWrapper).when(mController).getPackageManagerWrapper();
+        when(mPreferenceScreen.findPreference(mController.getPreferenceKey())).thenReturn(
+                mPreference);
+        mController.displayPreference(mPreferenceScreen);
+    }
+
+    @Test
+    public void displayPreference_shouldDisablePreferenceWhenNotAdmin() {
+        when(mUserManager.isAdminUser()).thenReturn(false);
+        mController.displayPreference(mPreferenceScreen);
+
+        verify(mPreference).setEnabled(false);
+    }
+
+    @Test
+    public void onPreferenceChanged_turnOnTerminal() {
+        mController.onPreferenceChange(null, true);
+
+        verify(mPackageManagerWrapper).setApplicationEnabledSetting(TERMINAL_APP_PACKAGE,
+                PackageManager.COMPONENT_ENABLED_STATE_ENABLED, 0);
+    }
+
+    @Test
+    public void onPreferenceChanged_turnOffTerminal() {
+        mController.onPreferenceChange(null, false);
+
+        verify(mPackageManagerWrapper).setApplicationEnabledSetting(TERMINAL_APP_PACKAGE,
+                PackageManager.COMPONENT_ENABLED_STATE_DEFAULT, 0);
+    }
+
+    @Test
+    public void updateState_preferenceShouldBeChecked() {
+        when(mPackageManagerWrapper.getApplicationEnabledSetting(TERMINAL_APP_PACKAGE)).thenReturn(
+                PackageManager.COMPONENT_ENABLED_STATE_ENABLED);
+        mController.updateState(mPreference);
+
+        verify(mPreference).setChecked(true);
+    }
+
+    @Test
+    public void updateState_preferenceShouldNotBeChecked() {
+        when(mPackageManagerWrapper.getApplicationEnabledSetting(TERMINAL_APP_PACKAGE)).thenReturn(
+                PackageManager.COMPONENT_ENABLED_STATE_DEFAULT);
+        mController.updateState(mPreference);
+
+        verify(mPreference).setChecked(false);
+    }
+
+    @Test
+    public void onDeveloperOptionsSwitchDisabled_shouldDisablePreference() {
+        mController.onDeveloperOptionsSwitchDisabled();
+
+        verify(mPackageManagerWrapper).setApplicationEnabledSetting(TERMINAL_APP_PACKAGE,
+                PackageManager.COMPONENT_ENABLED_STATE_DEFAULT, 0);
+        verify(mPreference).setChecked(false);
+        verify(mPreference).setEnabled(false);
+    }
+
+    @Test
+    public void onDeveloperOptionsSwitchEnabled_shouldDoNothingWhenNotAdmin() {
+        when(mUserManager.isAdminUser()).thenReturn(false);
+        mController.onDeveloperOptionsSwitchDisabled();
+
+        verify(mPreference, never()).setEnabled(true);
+    }
+
+    @Test
+    public void onDeveloperOptionsSwitchEnabled_preferenceShouldBeEnabledWhenAdmin() {
+        mController.onDeveloperOptionsSwitchEnabled();
+
+        verify(mPreference).setEnabled(true);
+    }
+}
diff --git a/tests/robotests/src/com/android/settings/development/LogPersistPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/LogPersistPreferenceControllerTest.java
new file mode 100644
index 0000000..b567dbe
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/development/LogPersistPreferenceControllerTest.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.development;
+
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+import android.content.Context;
+import android.os.SystemProperties;
+import android.support.v7.preference.ListPreference;
+import android.support.v7.preference.PreferenceScreen;
+
+import com.android.settings.TestConfig;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.shadow.SettingsShadowSystemProperties;
+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;
+
+@RunWith(SettingsRobolectricTestRunner.class)
+@Config(manifest = TestConfig.MANIFEST_PATH,
+        sdk = TestConfig.SDK_VERSION_O,
+        shadows = {SettingsShadowSystemProperties.class})
+public class LogPersistPreferenceControllerTest {
+
+    @Mock
+    private ListPreference mPreference;
+    @Mock
+    private PreferenceScreen mScreen;
+    @Mock
+    private DevelopmentSettingsDashboardFragment mFragment;
+
+    private Context mContext;
+    private LogPersistPreferenceController mController;
+    private Lifecycle mLifecycle;
+
+    @Before
+    public void setup() {
+        MockitoAnnotations.initMocks(this);
+        mContext = RuntimeEnvironment.application;
+        mLifecycle = new Lifecycle(() -> mLifecycle);
+        mController = new LogPersistPreferenceController(mContext, mFragment, mLifecycle);
+        when(mScreen.findPreference(mController.getPreferenceKey())).thenReturn(mPreference);
+        SystemProperties.set("ro.debuggable", "1");
+        mController.displayPreference(mScreen);
+    }
+
+    @After
+    public void teardown() {
+        SettingsShadowSystemProperties.clear();
+    }
+
+    @Test
+    public void onDeveloperOptionsSwitchDisabled_shouldDisablePreference() {
+        mController.onDeveloperOptionsSwitchDisabled();
+
+        verify(mPreference).setEnabled(false);
+    }
+
+    @Test
+    public void onDeveloperOptionsSwitchEnabled_shouldEnablePreference() {
+        mController.onDeveloperOptionsSwitchEnabled();
+
+        verify(mPreference).setEnabled(true);
+    }
+}
diff --git a/tests/robotests/src/com/android/settings/development/LogdSizePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/LogdSizePreferenceControllerTest.java
new file mode 100644
index 0000000..ec0f492
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/development/LogdSizePreferenceControllerTest.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.development;
+
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+import android.content.Context;
+import android.support.v7.preference.ListPreference;
+import android.support.v7.preference.PreferenceScreen;
+
+import com.android.settings.TestConfig;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.shadow.SettingsShadowSystemProperties;
+import com.android.settingslib.R;
+
+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;
+
+@RunWith(SettingsRobolectricTestRunner.class)
+@Config(manifest = TestConfig.MANIFEST_PATH,
+        sdk = TestConfig.SDK_VERSION_O,
+        shadows = {SettingsShadowSystemProperties.class})
+public class LogdSizePreferenceControllerTest {
+
+    @Mock
+    private PreferenceScreen mScreen;
+    @Mock
+    private ListPreference mPreference;
+
+    /**
+     * List Values
+     *
+     * 0: off
+     * 1: 64k
+     * 2: 256k
+     * 3: 1M
+     * 4: 4M
+     * 5: 16M
+     */
+    private String[] mListValues;
+    private String[] mListSummaries;
+    private Context mContext;
+    private LogdSizePreferenceController mController;
+
+    @Before
+    public void setup() {
+        MockitoAnnotations.initMocks(this);
+        mContext = RuntimeEnvironment.application;
+        mListValues = mContext.getResources().getStringArray(R.array.select_logd_size_values);
+        mListSummaries = mContext.getResources().getStringArray(R.array.select_logd_size_summaries);
+        mController = new LogdSizePreferenceController(mContext);
+        when(mScreen.findPreference(mController.getPreferenceKey())).thenReturn(mPreference);
+        mController.displayPreference(mScreen);
+    }
+
+    @After
+    public void teardown() {
+        SettingsShadowSystemProperties.clear();
+    }
+
+    @Test
+    public void onDeveloperOptionsSwitchDisabled_shouldDisableAndResetPreferenceToDefault() {
+        mController.onDeveloperOptionsSwitchDisabled();
+
+        verify(mPreference).setValue(mListValues[2]);
+        verify(mPreference).setSummary(mListSummaries[2]);
+        verify(mPreference).setEnabled(false);
+    }
+
+    @Test
+    public void onDeveloperOptionsSwitchEnabled_shouldEnablePreference() {
+        mController.onDeveloperOptionsSwitchEnabled();
+
+        verify(mPreference).setEnabled(true);
+    }
+}
diff --git a/tests/robotests/src/com/android/settings/development/MemoryUsagePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/MemoryUsagePreferenceControllerTest.java
new file mode 100644
index 0000000..a769344
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/development/MemoryUsagePreferenceControllerTest.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.development;
+
+import static org.mockito.ArgumentMatchers.anyString;
+import static org.mockito.Mockito.doNothing;
+import static org.mockito.Mockito.doReturn;
+import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+import android.content.Context;
+import android.support.v7.preference.Preference;
+import android.support.v7.preference.PreferenceScreen;
+
+import com.android.settings.TestConfig;
+import com.android.settings.applications.ProcStatsData;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.shadow.ShadowThreadUtils;
+
+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_O)
+public class MemoryUsagePreferenceControllerTest {
+
+    @Mock
+    private Preference mPreference;
+    @Mock
+    private PreferenceScreen mScreen;
+    @Mock
+    private ProcStatsData mProcStatsData;
+    @Mock
+    private ProcStatsData.MemInfo mMemInfo;
+
+    private Context mContext;
+    private MemoryUsagePreferenceController mController;
+
+    @Before
+    public void setup() {
+        MockitoAnnotations.initMocks(this);
+        mContext = RuntimeEnvironment.application;
+        mController = spy(new MemoryUsagePreferenceController(mContext));
+        doReturn(mProcStatsData).when(mController).getProcStatsData();
+        doNothing().when(mController).setDuration();
+        when(mScreen.findPreference(mController.getPreferenceKey())).thenReturn(mPreference);
+        when(mProcStatsData.getMemInfo()).thenReturn(mMemInfo);
+        mController.displayPreference(mScreen);
+    }
+
+    @Test
+    @Config(shadows = {
+            ShadowThreadUtils.class
+    })
+    public void updateState_shouldUpdatePreferenceSummary() {
+        mController.updateState(mPreference);
+
+        verify(mPreference).setSummary(anyString());
+    }
+}
diff --git a/tests/robotests/src/com/android/settings/development/MobileDataAlwaysOnPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/MobileDataAlwaysOnPreferenceControllerTest.java
new file mode 100644
index 0000000..7f33630
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/development/MobileDataAlwaysOnPreferenceControllerTest.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.development;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+import android.content.Context;
+import android.provider.Settings;
+import android.support.v14.preference.SwitchPreference;
+import android.support.v7.preference.PreferenceScreen;
+
+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_O)
+public class MobileDataAlwaysOnPreferenceControllerTest {
+
+    @Mock
+    private SwitchPreference mPreference;
+    @Mock
+    private PreferenceScreen mPreferenceScreen;
+
+    private Context mContext;
+    private MobileDataAlwaysOnPreferenceController mController;
+
+    @Before
+    public void setup() {
+        MockitoAnnotations.initMocks(this);
+        mContext = RuntimeEnvironment.application;
+        mController = new MobileDataAlwaysOnPreferenceController(mContext);
+        when(mPreferenceScreen.findPreference(mController.getPreferenceKey())).thenReturn(
+                mPreference);
+        mController.displayPreference(mPreferenceScreen);
+    }
+
+    @Test
+    public void onPreferenceChanged_turnOnPreference_shouldEnableMobileDataAlwaysOn() {
+        mController.onPreferenceChange(mPreference, true /* new value */);
+
+        final int mode = Settings.System.getInt(mContext.getContentResolver(),
+                Settings.Global.MOBILE_DATA_ALWAYS_ON, -1 /* default */);
+
+        assertThat(mode).isEqualTo(MobileDataAlwaysOnPreferenceController.SETTING_VALUE_ON);
+    }
+
+    @Test
+    public void onPreferenceChanged_turnOffPreference_shouldDisableMobileDataAlwaysOn() {
+        mController.onPreferenceChange(mPreference, false /* new value */);
+
+        final int mode = Settings.System.getInt(mContext.getContentResolver(),
+                Settings.Global.MOBILE_DATA_ALWAYS_ON, -1 /* default */);
+
+        assertThat(mode).isEqualTo(MobileDataAlwaysOnPreferenceController.SETTING_VALUE_OFF);
+    }
+
+    @Test
+    public void updateState_settingEnabled_preferenceShouldBeChecked() {
+        Settings.System.putInt(mContext.getContentResolver(), Settings.Global.MOBILE_DATA_ALWAYS_ON,
+                MobileDataAlwaysOnPreferenceController.SETTING_VALUE_ON);
+        mController.updateState(mPreference);
+
+        verify(mPreference).setChecked(true);
+    }
+
+    @Test
+    public void updateState_settingDisabled_preferenceShouldNotBeChecked() {
+        Settings.System.putInt(mContext.getContentResolver(), Settings.Global.MOBILE_DATA_ALWAYS_ON,
+                MobileDataAlwaysOnPreferenceController.SETTING_VALUE_OFF);
+        mController.updateState(mPreference);
+
+        verify(mPreference).setChecked(false);
+    }
+
+    @Test
+    public void onDeveloperOptionsSwitchEnabled_preferenceShouldBeEnabled() {
+        mController.onDeveloperOptionsSwitchEnabled();
+
+        verify(mPreference).setEnabled(true);
+    }
+
+    @Test
+    public void onDeveloperOptionsSwitchDisabled_preferenceShouldBeDisabled() {
+        mController.onDeveloperOptionsSwitchDisabled();
+        final int mode = Settings.System.getInt(mContext.getContentResolver(),
+                Settings.Global.MOBILE_DATA_ALWAYS_ON, -1 /* default */);
+
+        assertThat(mode).isEqualTo(MobileDataAlwaysOnPreferenceController.SETTING_VALUE_OFF);
+        verify(mPreference).setEnabled(false);
+        verify(mPreference).setChecked(false);
+    }
+}
diff --git a/tests/robotests/src/com/android/settings/development/MockLocationAppPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/MockLocationAppPreferenceControllerTest.java
new file mode 100644
index 0000000..e136fc0
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/development/MockLocationAppPreferenceControllerTest.java
@@ -0,0 +1,166 @@
+package com.android.settings.development;
+
+import static com.android.settings.development.DevelopmentOptionsActivityRequestCodes
+        .REQUEST_MOCK_LOCATION_APP;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.anyInt;
+import static org.mockito.ArgumentMatchers.anyString;
+import static org.mockito.ArgumentMatchers.eq;
+import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+import android.app.Activity;
+import android.app.AppOpsManager;
+import android.content.Context;
+import android.content.Intent;
+import android.content.pm.ApplicationInfo;
+import android.content.pm.PackageManager;
+import android.support.v7.preference.Preference;
+import android.support.v7.preference.PreferenceScreen;
+
+import com.android.settings.R;
+import com.android.settings.TestConfig;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
+import com.android.settingslib.wrapper.PackageManagerWrapper;
+
+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.Collections;
+
+@RunWith(SettingsRobolectricTestRunner.class)
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION_O)
+public class MockLocationAppPreferenceControllerTest {
+
+    @Mock
+    private DevelopmentSettingsDashboardFragment mFragment;
+    @Mock
+    private AppOpsManager mAppOpsManager;
+    @Mock
+    private PackageManagerWrapper mPackageManager;
+    @Mock
+    private Preference mPreference;
+    @Mock
+    private PreferenceScreen mScreen;
+    @Mock
+    private AppOpsManager.PackageOps mPackageOps;
+    @Mock
+    private AppOpsManager.OpEntry mOpEntry;
+    @Mock
+    private ApplicationInfo mApplicationInfo;
+
+    private Context mContext;
+    private MockLocationAppPreferenceController mController;
+
+    @Before
+    public void setup() {
+        MockitoAnnotations.initMocks(this);
+        mContext = RuntimeEnvironment.application;
+        mController = spy(new MockLocationAppPreferenceController(mContext, mFragment));
+        ReflectionHelpers.setField(mController, "mAppsOpsManager", mAppOpsManager);
+        ReflectionHelpers.setField(mController, "mPackageManager", mPackageManager);
+        when(mScreen.findPreference(mController.getPreferenceKey())).thenReturn(mPreference);
+        mController.displayPreference(mScreen);
+    }
+
+    @Test
+    public void updateState_foobarAppSelected_shouldSetSummaryToFoobar() {
+        final String appName = "foobar";
+        when(mAppOpsManager.getPackagesForOps(any())).thenReturn(
+                Collections.singletonList(mPackageOps));
+        when(mPackageOps.getOps()).thenReturn(Collections.singletonList(mOpEntry));
+        when(mOpEntry.getMode()).thenReturn(AppOpsManager.MODE_ALLOWED);
+        when(mPackageOps.getPackageName()).thenReturn(appName);
+
+        mController.updateState(mPreference);
+
+        verify(mPreference).setSummary(
+                mContext.getResources().getString(R.string.mock_location_app_set, appName));
+    }
+
+    @Test
+    public void updateState_noAppSelected_shouldSetSummaryToDefault() {
+        when(mAppOpsManager.getPackagesForOps(any())).thenReturn(
+                Collections.emptyList());
+
+        mController.updateState(mPreference);
+
+        verify(mPreference).setSummary(
+                mContext.getResources().getString(R.string.mock_location_app_not_set));
+    }
+
+    @Test
+    public void onActivityResult_fooPrevAppBarNewApp_shouldRemoveFooAndSetBarAsMockLocationApp()
+            throws PackageManager.NameNotFoundException {
+        final String prevAppName = "foo";
+        final String newAppName = "bar";
+        final Intent intent = new Intent();
+        intent.setAction(newAppName);
+        when(mAppOpsManager.getPackagesForOps(any())).thenReturn(
+                Collections.singletonList(mPackageOps));
+        when(mPackageOps.getOps()).thenReturn(Collections.singletonList(mOpEntry));
+        when(mOpEntry.getMode()).thenReturn(AppOpsManager.MODE_ALLOWED);
+        when(mPackageOps.getPackageName()).thenReturn(prevAppName);
+        when(mPackageManager.getApplicationInfo(anyString(),
+                eq(PackageManager.MATCH_DISABLED_COMPONENTS))).thenReturn(mApplicationInfo);
+
+        final boolean handled = mController.onActivityResult(REQUEST_MOCK_LOCATION_APP,
+                Activity.RESULT_OK, intent);
+
+        assertThat(handled).isTrue();
+        verify(mAppOpsManager).setMode(anyInt(), anyInt(), eq(newAppName),
+                eq(AppOpsManager.MODE_ALLOWED));
+        verify(mAppOpsManager).setMode(anyInt(), anyInt(), eq(prevAppName),
+                eq(AppOpsManager.MODE_ERRORED));
+    }
+
+    @Test
+    public void onActivityResult_incorrectCode_shouldReturnFalse() {
+        final boolean handled = mController.onActivityResult(30983150 /* request code */,
+                Activity.RESULT_OK, null /* intent */);
+
+        assertThat(handled).isFalse();
+    }
+
+    @Test
+    public void handlePreferenceTreeClick_samePreferenceKey_shouldLaunchActivity() {
+        final String preferenceKey = mController.getPreferenceKey();
+        when(mPreference.getKey()).thenReturn(preferenceKey);
+
+        final boolean handled = mController.handlePreferenceTreeClick(mPreference);
+
+        assertThat(handled).isTrue();
+        verify(mFragment).startActivityForResult(any(), eq(REQUEST_MOCK_LOCATION_APP));
+    }
+
+    @Test
+    public void handlePreferenceTreeClick_incorrectPreferenceKey_shouldReturnFalse() {
+        when(mPreference.getKey()).thenReturn("SomeRandomKey");
+
+        assertThat(mController.handlePreferenceTreeClick(mPreference)).isFalse();
+    }
+
+    @Test
+    public void onDeveloperOptionsSwitchDisabled_shouldDisablePreference() {
+        mController.onDeveloperOptionsSwitchDisabled();
+
+        verify(mPreference).setEnabled(false);
+    }
+
+    @Test
+    public void onDeveloperOptionsSwitchEnabled_shouldEnablePreference() {
+        mController.onDeveloperOptionsSwitchEnabled();
+
+        verify(mPreference).setEnabled(true);
+    }
+}
diff --git a/tests/robotests/src/com/android/settings/development/NotificationChannelWarningsPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/NotificationChannelWarningsPreferenceControllerTest.java
new file mode 100644
index 0000000..f471f35
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/development/NotificationChannelWarningsPreferenceControllerTest.java
@@ -0,0 +1,151 @@
+package com.android.settings.development;
+
+/*
+ * Copyright (C) 2017 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import static com.google.common.truth.Truth.assertThat;
+
+import static org.mockito.Mockito.doReturn;
+import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+import android.content.Context;
+import android.provider.Settings;
+import android.support.v14.preference.SwitchPreference;
+import android.support.v7.preference.PreferenceScreen;
+
+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_O)
+public class NotificationChannelWarningsPreferenceControllerTest {
+
+    @Mock
+    private SwitchPreference mPreference;
+    @Mock
+    private PreferenceScreen mScreen;
+
+
+    private Context mContext;
+    private NotificationChannelWarningsPreferenceController mController;
+
+    @Before
+    public void setup() {
+        MockitoAnnotations.initMocks(this);
+        mContext = RuntimeEnvironment.application;
+        mController = new NotificationChannelWarningsPreferenceController(mContext);
+        when(mScreen.findPreference(mController.getPreferenceKey())).thenReturn(mPreference);
+        mController.displayPreference(mScreen);
+    }
+
+    @Test
+    public void onPreferenceChange_settingEnabled_shouldEnableNotificationChannelWarnings() {
+        mController.onPreferenceChange(mPreference, true /* new value */);
+
+        final int mode = Settings.Global.getInt(mContext.getContentResolver(),
+                Settings.Global.SHOW_NOTIFICATION_CHANNEL_WARNINGS, -1 /* default */);
+
+        assertThat(mode).isEqualTo(
+                NotificationChannelWarningsPreferenceController.SETTING_VALUE_ON);
+    }
+
+    @Test
+    public void onPreferenceChange_settingDisabled_shouldDisableNotificationChannelWarnings() {
+        mController.onPreferenceChange(mPreference, false /* new value */);
+
+        final int mode = Settings.Global.getInt(mContext.getContentResolver(),
+                Settings.Global.SHOW_NOTIFICATION_CHANNEL_WARNINGS, -1 /* default */);
+
+        assertThat(mode).isEqualTo(
+                NotificationChannelWarningsPreferenceController.SETTING_VALUE_OFF);
+    }
+
+    @Test
+    public void updateState_settingEnabled_preferenceShouldBeChecked() {
+        Settings.Global.putInt(mContext.getContentResolver(),
+                Settings.Global.SHOW_NOTIFICATION_CHANNEL_WARNINGS,
+                NotificationChannelWarningsPreferenceController.SETTING_VALUE_ON);
+
+        mController.updateState(mPreference);
+
+        verify(mPreference).setChecked(true);
+    }
+
+    @Test
+    public void updateState_settingDisabled_preferenceShouldNotBeChecked() {
+        Settings.Global.putInt(mContext.getContentResolver(),
+                Settings.Global.SHOW_NOTIFICATION_CHANNEL_WARNINGS,
+                NotificationChannelWarningsPreferenceController.SETTING_VALUE_OFF);
+
+        mController.updateState(mPreference);
+
+        verify(mPreference).setChecked(false);
+    }
+
+    @Test
+    public void updateState_settingUndefinedDebuggingEnabled_preferenceShouldBeChecked() {
+        mController = spy(mController);
+        doReturn(true).when(mController).isDebuggable();
+        Settings.Global.putString(mContext.getContentResolver(),
+                Settings.Global.SHOW_NOTIFICATION_CHANNEL_WARNINGS, "NotAnInteger");
+
+        mController.updateState(mPreference);
+
+        verify(mPreference).setChecked(true);
+    }
+
+    @Test
+    public void updateState_settingUndefinedDebuggingDisabled_preferenceShouldNotBeChecked() {
+        mController = spy(mController);
+        doReturn(false).when(mController).isDebuggable();
+        Settings.Global.putString(mContext.getContentResolver(),
+                Settings.Global.SHOW_NOTIFICATION_CHANNEL_WARNINGS, "NotAnInteger");
+
+        mController.updateState(mPreference);
+
+        verify(mPreference).setChecked(false);
+    }
+
+    @Test
+    public void onDeveloperOptionsSwitchDisabled_preferenceShouldBeDisabled() {
+        mController.onDeveloperOptionsSwitchDisabled();
+        final int mode = Settings.Global.getInt(mContext.getContentResolver(),
+                Settings.Global.SHOW_NOTIFICATION_CHANNEL_WARNINGS, -1 /* default */);
+
+        assertThat(mode).isEqualTo(
+                NotificationChannelWarningsPreferenceController.SETTING_VALUE_OFF);
+        verify(mPreference).setChecked(false);
+        verify(mPreference).setEnabled(false);
+    }
+
+    @Test
+    public void onDeveloperOptionsSwitchEnabled_preferenceShouldBeEnabled() {
+        mController.onDeveloperOptionsSwitchEnabled();
+
+        verify(mPreference).setEnabled(true);
+    }
+}
diff --git a/tests/robotests/src/com/android/settings/development/OemUnlockPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/OemUnlockPreferenceControllerTest.java
new file mode 100644
index 0000000..5018b75
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/development/OemUnlockPreferenceControllerTest.java
@@ -0,0 +1,214 @@
+/*
+ * Copyright (C) 2017 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF 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 static com.android.settings.development.DevelopmentOptionsActivityRequestCodes
+        .REQUEST_CODE_ENABLE_OEM_UNLOCK;
+import static com.google.common.truth.Truth.assertThat;
+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.verify;
+import static org.mockito.Mockito.when;
+
+import android.app.Activity;
+import android.app.FragmentManager;
+import android.content.Context;
+import android.content.res.Resources;
+import android.os.UserManager;
+import android.service.oemlock.OemLockManager;
+import android.support.v7.preference.PreferenceScreen;
+import android.telephony.TelephonyManager;
+
+import com.android.settings.TestConfig;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
+import com.android.settingslib.RestrictedSwitchPreference;
+
+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_O)
+public class OemUnlockPreferenceControllerTest {
+
+    @Mock
+    private Context mContext;
+    @Mock
+    private Activity mActivity;
+    @Mock
+    private DevelopmentSettingsDashboardFragment mFragment;
+    @Mock
+    private RestrictedSwitchPreference mPreference;
+    @Mock
+    private PreferenceScreen mPreferenceScreen;
+    @Mock
+    private OemLockManager mOemLockManager;
+    @Mock
+    private UserManager mUserManager;
+    @Mock
+    private TelephonyManager mTelephonyManager;
+    @Mock
+    private Resources mResources;
+    private OemUnlockPreferenceController mController;
+
+    @Before
+    public void setup() {
+        MockitoAnnotations.initMocks(this);
+        when(mContext.getSystemService(Context.OEM_LOCK_SERVICE)).thenReturn(mOemLockManager);
+        when(mContext.getSystemService(Context.USER_SERVICE)).thenReturn(mUserManager);
+        when(mContext.getSystemService(Context.TELEPHONY_SERVICE)).thenReturn(mTelephonyManager);
+        when(mContext.getResources()).thenReturn(mResources);
+        mController = new OemUnlockPreferenceController(mContext, mActivity, mFragment);
+        when(mPreferenceScreen.findPreference(mController.getPreferenceKey())).thenReturn(
+                mPreference);
+        when(mFragment.getChildFragmentManager()).thenReturn(
+                mock(FragmentManager.class, Answers.RETURNS_DEEP_STUBS));
+        mController.displayPreference(mPreferenceScreen);
+    }
+
+    @Test
+    public void isAvailable_shouldReturnTrueWhenOemLockManagerIsNotNull() {
+        boolean returnValue = mController.isAvailable();
+
+        assertThat(returnValue).isTrue();
+    }
+
+    @Test
+    public void isAvailable_shouldReturnFalseWhenOemLockManagerIsNull() {
+        when(mContext.getSystemService(Context.OEM_LOCK_SERVICE)).thenReturn(null);
+        mController = new OemUnlockPreferenceController(mContext, mActivity, mFragment);
+        boolean returnValue = mController.isAvailable();
+
+        assertThat(returnValue).isFalse();
+    }
+
+    @Test
+    public void onPreferenceChanged_turnOnUnlock() {
+        mController = spy(mController);
+        doReturn(false).when(mController).showKeyguardConfirmation(mResources,
+                REQUEST_CODE_ENABLE_OEM_UNLOCK);
+        doNothing().when(mController).confirmEnableOemUnlock();
+
+        mController.onPreferenceChange(null, true);
+
+        verify(mController).confirmEnableOemUnlock();
+    }
+
+    @Test
+    public void onPreferenceChanged_turnOffUnlock() {
+        mController = spy(mController);
+        mController.onPreferenceChange(null, false);
+        doReturn(false).when(mController).isBootloaderUnlocked();
+
+        verify(mFragment).getChildFragmentManager();
+    }
+
+    @Test
+    public void updateState_preferenceShouldBeCheckedAndShouldBeDisabled() {
+        mController = spy(mController);
+        doReturn(true).when(mController).isOemUnlockedAllowed();
+        doReturn(true).when(mController).isOemUnlockAllowedByUserAndCarrier();
+        doReturn(true).when(mController).isBootloaderUnlocked();
+
+        mController.updateState(mPreference);
+
+        verify(mPreference).setChecked(true);
+        verify(mPreference).setEnabled(false);
+    }
+
+    @Test
+    public void updateState_preferenceShouldBeUncheckedAndShouldBeDisabled() {
+        mController = spy(mController);
+        doReturn(false).when(mController).isOemUnlockedAllowed();
+        doReturn(true).when(mController).isOemUnlockAllowedByUserAndCarrier();
+        doReturn(true).when(mController).isBootloaderUnlocked();
+
+        mController.updateState(mPreference);
+
+        verify(mPreference).setChecked(false);
+        verify(mPreference).setEnabled(false);
+    }
+
+    @Test
+    public void updateState_preferenceShouldBeCheckedAndShouldBeEnabled() {
+        mController = spy(mController);
+        doReturn(true).when(mController).isOemUnlockedAllowed();
+        doReturn(true).when(mController).isOemUnlockAllowedByUserAndCarrier();
+        doReturn(false).when(mController).isBootloaderUnlocked();
+
+        mController.updateState(mPreference);
+
+        verify(mPreference).setChecked(true);
+        verify(mPreference).setEnabled(true);
+    }
+
+    @Test
+    public void onActivityResult_shouldReturnTrue() {
+        final boolean result = mController.onActivityResult(REQUEST_CODE_ENABLE_OEM_UNLOCK,
+                Activity.RESULT_OK, null);
+
+        assertThat(result).isTrue();
+    }
+
+    @Test
+    public void onActivityResult_shouldReturnFalse() {
+        final boolean result = mController.onActivityResult(123454,
+                1434, null);
+
+        assertThat(result).isFalse();
+    }
+
+    @Test
+    public void onDeveloperOptionsEnabled_preferenceShouldCheckRestriction() {
+        mController = spy(mController);
+        doReturn(false).when(mController).isOemUnlockAllowedByUserAndCarrier();
+        doReturn(false).when(mController).isBootloaderUnlocked();
+        when(mPreference.isEnabled()).thenReturn(true);
+
+        mController.onDeveloperOptionsEnabled();
+
+        verify(mPreference).checkRestrictionAndSetDisabled(UserManager.DISALLOW_FACTORY_RESET);
+
+    }
+
+    @Test
+    public void onDeveloperOptionsDisabled_preferenceShouldCheckRestriction() {
+        mController = spy(mController);
+        doReturn(true).when(mController).isOemUnlockedAllowed();
+        doReturn(false).when(mController).isOemUnlockAllowedByUserAndCarrier();
+        doReturn(false).when(mController).isBootloaderUnlocked();
+        when(mPreference.isEnabled()).thenReturn(true);
+
+        mController.onDeveloperOptionsDisabled();
+
+        verify(mPreference).checkRestrictionAndSetDisabled(UserManager.DISALLOW_FACTORY_RESET);
+
+    }
+
+    @Test
+    public void onOemUnlockConfirmed_oemManagerShouldSetUnlockAllowedByUser() {
+        mController.onOemUnlockConfirmed();
+
+        verify(mOemLockManager).setOemUnlockAllowedByUser(true);
+    }
+}
diff --git a/tests/robotests/src/com/android/settings/development/PictureColorModePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/PictureColorModePreferenceControllerTest.java
new file mode 100644
index 0000000..ff5ffd3
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/development/PictureColorModePreferenceControllerTest.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.development;
+
+import static android.arch.lifecycle.Lifecycle.Event.ON_PAUSE;
+import static android.arch.lifecycle.Lifecycle.Event.ON_RESUME;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import static org.mockito.Mockito.doReturn;
+import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+import android.content.Context;
+import android.content.res.Resources;
+import android.support.v7.preference.PreferenceScreen;
+
+import com.android.settings.R;
+import com.android.settings.TestConfig;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
+import com.android.settingslib.core.lifecycle.Lifecycle;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.mockito.MockitoAnnotations;
+import org.robolectric.annotation.Config;
+
+@RunWith(SettingsRobolectricTestRunner.class)
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION_O)
+public class PictureColorModePreferenceControllerTest {
+
+    @Mock
+    private ColorModePreference mPreference;
+    @Mock
+    private Context mContext;
+    @Mock
+    private PreferenceScreen mPreferenceScreen;
+    @Mock
+    private Resources mResources;
+
+    private Lifecycle mLifecycle;
+    private PictureColorModePreferenceController mController;
+
+    @Before
+    public void setup() {
+        MockitoAnnotations.initMocks(this);
+        mLifecycle = new Lifecycle(() -> mLifecycle);
+        mController = new PictureColorModePreferenceController(mContext, mLifecycle);
+        when(mPreferenceScreen.findPreference(mController.getPreferenceKey())).thenReturn(
+                mPreference);
+        when(mContext.getResources()).thenReturn(mResources);
+        when(mResources.getIntArray(R.array.color_mode_ids)).thenReturn(new int[0]);
+        mController.displayPreference(mPreferenceScreen);
+    }
+
+    @Test
+    public void isAvailable_shouldReturnFalseWhenWideColorGambit() {
+        mController = spy(mController);
+        doReturn(2).when(mController).getColorModeDescriptionsSize();
+        doReturn(true).when(mController).isWideColorGamut();
+
+        assertThat(mController.isAvailable()).isFalse();
+    }
+
+    @Test
+    public void isAvailable_shouldReturnTrueWhenNotWideColorGambit() {
+        mController = spy(mController);
+        doReturn(2).when(mController).getColorModeDescriptionsSize();
+        doReturn(false).when(mController).isWideColorGamut();
+
+        assertThat(mController.isAvailable()).isTrue();
+    }
+
+    @Test
+    public void isAvailable_shouldReturnFalseWhenColorCountIsOne() {
+        mController = spy(mController);
+        doReturn(1).when(mController).getColorModeDescriptionsSize();
+        doReturn(true).when(mController).isWideColorGamut();
+
+        assertThat(mController.isAvailable()).isFalse();
+    }
+
+    @Test
+    public void isAvailable_shouldReturnTrueWhenColorCountIsTwo() {
+        mController = spy(mController);
+        doReturn(2).when(mController).getColorModeDescriptionsSize();
+        doReturn(false).when(mController).isWideColorGamut();
+
+        assertThat(mController.isAvailable()).isTrue();
+    }
+
+    @Test
+    public void onDeveloperOptionEnabled_shouldEnablePreference() {
+        mController = spy(mController);
+        doReturn(true).when(mController).isAvailable();
+        mController.onDeveloperOptionsEnabled();
+
+        verify(mPreference).setEnabled(true);
+    }
+
+    @Test
+    public void onDeveloperOptionDisabled_shouldDisablePreference() {
+        mController = spy(mController);
+        doReturn(true).when(mController).isAvailable();
+        mController.onDeveloperOptionsDisabled();
+
+        verify(mPreference).setEnabled(false);
+    }
+
+    @Test
+    public void onResume_shouldStartListening() {
+        mLifecycle.handleLifecycleEvent(ON_RESUME);
+
+        verify(mPreference).startListening();
+    }
+
+    @Test
+    public void onPause_shouldStopListening() {
+        mLifecycle.handleLifecycleEvent(ON_RESUME);
+        mLifecycle.handleLifecycleEvent(ON_PAUSE);
+
+        verify(mPreference).stopListening();
+    }
+}
diff --git a/tests/robotests/src/com/android/settings/development/PointerLocationPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/PointerLocationPreferenceControllerTest.java
new file mode 100644
index 0000000..120e4a4
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/development/PointerLocationPreferenceControllerTest.java
@@ -0,0 +1,132 @@
+/*
+ * Copyright (C) 2017 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF 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 static com.google.common.truth.Truth.assertThat;
+
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+import android.content.Context;
+import android.provider.Settings;
+import android.support.v14.preference.SwitchPreference;
+import android.support.v7.preference.PreferenceScreen;
+
+import com.android.settings.TestConfig;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.shadow.SettingsShadowSystemProperties;
+
+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;
+
+@RunWith(SettingsRobolectricTestRunner.class)
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION_O)
+public class PointerLocationPreferenceControllerTest {
+
+    @Mock
+    private PreferenceScreen mScreen;
+    @Mock
+    private SwitchPreference mPreference;
+
+    private Context mContext;
+
+    private PointerLocationPreferenceController mController;
+
+    @Before
+    public void setUp() {
+        MockitoAnnotations.initMocks(this);
+        mContext = RuntimeEnvironment.application;
+        mController = new PointerLocationPreferenceController(mContext);
+        when(mScreen.findPreference(mController.getPreferenceKey())).thenReturn(mPreference);
+        mController.displayPreference(mScreen);
+    }
+
+    @After
+    public void tearDown() {
+        SettingsShadowSystemProperties.clear();
+    }
+
+    @Test
+    public void updateState_pointerLocationEnabled_shouldCheckedPreference() {
+        Settings.System.putInt(mContext.getContentResolver(),
+                Settings.System.POINTER_LOCATION,
+                PointerLocationPreferenceController.SETTING_VALUE_ON);
+
+        mController.updateState(mPreference);
+
+        verify(mPreference).setChecked(true);
+    }
+
+    @Test
+    public void updateState_pointerLocationDisabled_shouldUncheckedPreference() {
+        Settings.System.putInt(mContext.getContentResolver(),
+                Settings.System.POINTER_LOCATION,
+                PointerLocationPreferenceController.SETTING_VALUE_OFF);
+
+        mController.updateState(mPreference);
+
+        verify(mPreference).setChecked(false);
+    }
+
+    @Test
+    public void onPreferenceChange_preferenceChecked_shouldEnablePointerLocation() {
+        mController.onPreferenceChange(mPreference, true /* new value */);
+
+        final int pointerLocationMode = Settings.System.getInt(mContext.getContentResolver(),
+                Settings.System.POINTER_LOCATION, -1 /* default */);
+
+        assertThat(pointerLocationMode).isEqualTo(
+                PointerLocationPreferenceController.SETTING_VALUE_ON);
+    }
+
+    @Test
+    public void onPreferenceChange__preferenceUnchecked_shouldDisablePointerLocation() {
+        mController.onPreferenceChange(mPreference, false /* new value */);
+
+        final int pointerLocationMode = Settings.System.getInt(mContext.getContentResolver(),
+                Settings.System.POINTER_LOCATION, -1 /* default */);
+
+        assertThat(pointerLocationMode).isEqualTo(
+                PointerLocationPreferenceController.SETTING_VALUE_OFF);
+    }
+
+    @Test
+    public void onDeveloperOptionsSwitchEnabled_preferenceShouldBeEnabled() {
+        mController.onDeveloperOptionsSwitchEnabled();
+
+        verify(mPreference).setEnabled(true);
+    }
+
+    @Test
+    public void onDeveloperOptionsSwitchDisabled_preferenceShouldBeEnabled() {
+        mController.onDeveloperOptionsSwitchDisabled();
+
+        final int pointerLocationMode = Settings.System.getInt(mContext.getContentResolver(),
+                Settings.System.POINTER_LOCATION, -1 /* default */);
+
+        assertThat(pointerLocationMode).isEqualTo(
+                PointerLocationPreferenceController.SETTING_VALUE_OFF);
+        verify(mPreference).setEnabled(false);
+        verify(mPreference).setChecked(false);
+    }
+}
diff --git a/tests/robotests/src/com/android/settings/development/ProfileGpuRenderingPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/ProfileGpuRenderingPreferenceControllerTest.java
new file mode 100644
index 0000000..d6c6185
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/development/ProfileGpuRenderingPreferenceControllerTest.java
@@ -0,0 +1,144 @@
+/*
+ * Copyright (C) 2017 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF 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 static com.google.common.truth.Truth.assertThat;
+
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+import android.content.Context;
+import android.os.SystemProperties;
+import android.support.v7.preference.ListPreference;
+import android.support.v7.preference.PreferenceScreen;
+import android.view.ThreadedRenderer;
+
+import com.android.settings.R;
+import com.android.settings.TestConfig;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.shadow.SettingsShadowSystemProperties;
+
+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;
+
+@RunWith(SettingsRobolectricTestRunner.class)
+@Config(manifest = TestConfig.MANIFEST_PATH,
+        sdk = TestConfig.SDK_VERSION_O,
+        shadows = {SettingsShadowSystemProperties.class})
+public class ProfileGpuRenderingPreferenceControllerTest {
+
+    @Mock
+    private ListPreference mPreference;
+    @Mock
+    private PreferenceScreen mScreen;
+
+    /**
+     * 0: Off
+     * 1: On screen as bars
+     * 2: In adb shell dumpsys gfxinfo
+     */
+    private String[] mListValues;
+    private String[] mListSummaries;
+    private Context mContext;
+    private ProfileGpuRenderingPreferenceController mController;
+
+    @Before
+    public void setup() {
+        MockitoAnnotations.initMocks(this);
+        mContext = RuntimeEnvironment.application;
+        mListValues = mContext.getResources().getStringArray(R.array.track_frame_time_values);
+        mListSummaries = mContext.getResources().getStringArray(R.array.track_frame_time_entries);
+        mController = new ProfileGpuRenderingPreferenceController(mContext);
+        when(mScreen.findPreference(mController.getPreferenceKey())).thenReturn(mPreference);
+        mController.displayPreference(mScreen);
+    }
+
+    @After
+    public void teardown() {
+        SettingsShadowSystemProperties.clear();
+    }
+
+    @Test
+    public void onPreferenceChange_noValueSet_shouldSetEmptyString() {
+        mController.onPreferenceChange(mPreference, null /* new value */);
+
+        String mode = SystemProperties.get(
+                ThreadedRenderer.PROFILE_PROPERTY);
+        assertThat(mode).isEqualTo("");
+    }
+
+    @Test
+    public void onPreferenceChange_option1Selected_shouldSetOption1() {
+        mController.onPreferenceChange(mPreference, mListValues[1]);
+
+        String mode = SystemProperties.get(
+                ThreadedRenderer.PROFILE_PROPERTY);
+        assertThat(mode).isEqualTo(mListValues[1]);
+    }
+
+    @Test
+    public void updateState_option1Set_shouldUpdatePreferenceToOption1() {
+        SystemProperties.set(ThreadedRenderer.PROFILE_PROPERTY,
+                mListValues[1]);
+
+        mController.updateState(mPreference);
+
+        verify(mPreference).setValue(mListValues[1]);
+        verify(mPreference).setSummary(mListSummaries[1]);
+    }
+
+    @Test
+    public void updateState_option2Set_shouldUpdatePreferenceToOption2() {
+        SystemProperties.set(ThreadedRenderer.PROFILE_PROPERTY,
+                mListValues[2]);
+
+        mController.updateState(mPreference);
+
+        verify(mPreference).setValue(mListValues[2]);
+        verify(mPreference).setSummary(mListSummaries[2]);
+    }
+
+    @Test
+    public void updateState_noOptionSet_shouldDefaultToOption0() {
+        SystemProperties.set(ThreadedRenderer.PROFILE_PROPERTY, null);
+
+        mController.updateState(mPreference);
+
+        verify(mPreference).setValue(mListValues[0]);
+        verify(mPreference).setSummary(mListSummaries[0]);
+    }
+
+    @Test
+    public void onDeveloperOptionsSwitchDisabled_shouldDisablePreference() {
+        mController.onDeveloperOptionsSwitchDisabled();
+
+        verify(mPreference).setEnabled(false);
+    }
+
+    @Test
+    public void onDeveloperOptionsSwitchEnabled_shouldEnablePreference() {
+        mController.onDeveloperOptionsSwitchEnabled();
+
+        verify(mPreference).setEnabled(true);
+    }
+}
diff --git a/tests/robotests/src/com/android/settings/development/ResizableActivityPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/ResizableActivityPreferenceControllerTest.java
new file mode 100644
index 0000000..3d6bd16
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/development/ResizableActivityPreferenceControllerTest.java
@@ -0,0 +1,124 @@
+package com.android.settings.development;
+
+/*
+ * Copyright (C) 2017 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import static com.google.common.truth.Truth.assertThat;
+
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+import android.content.Context;
+import android.provider.Settings;
+import android.support.v14.preference.SwitchPreference;
+import android.support.v7.preference.PreferenceScreen;
+
+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_O)
+public class ResizableActivityPreferenceControllerTest {
+
+    @Mock
+    private SwitchPreference mPreference;
+    @Mock
+    private PreferenceScreen mScreen;
+
+    private Context mContext;
+    private ResizableActivityPreferenceController mController;
+
+    @Before
+    public void setup() {
+        MockitoAnnotations.initMocks(this);
+        mContext = RuntimeEnvironment.application;
+        mController = new ResizableActivityPreferenceController(mContext);
+        when(mScreen.findPreference(mController.getPreferenceKey())).thenReturn(mPreference);
+        mController.displayPreference(mScreen);
+    }
+
+    @Test
+    public void onPreferenceChange_settingEnabled_shouldEnableResizableActivities() {
+        mController.onPreferenceChange(mPreference, true /* new value */);
+
+        final int mode = Settings.Global.getInt(mContext.getContentResolver(),
+                Settings.Global.DEVELOPMENT_FORCE_RESIZABLE_ACTIVITIES, -1 /* default */);
+
+        assertThat(mode).isEqualTo(
+                ResizableActivityPreferenceController.SETTING_VALUE_ON);
+    }
+
+    @Test
+    public void onPreferenceChange_settingDisabled_shouldDisableResizableActivities() {
+        mController.onPreferenceChange(mPreference, false /* new value */);
+
+        final int mode = Settings.Global.getInt(mContext.getContentResolver(),
+                Settings.Global.DEVELOPMENT_FORCE_RESIZABLE_ACTIVITIES, -1 /* default */);
+
+        assertThat(mode).isEqualTo(
+                ResizableActivityPreferenceController.SETTING_VALUE_OFF);
+    }
+
+    @Test
+    public void updateState_settingEnabled_preferenceShouldBeChecked() {
+        Settings.Global.putInt(mContext.getContentResolver(),
+                Settings.Global.DEVELOPMENT_FORCE_RESIZABLE_ACTIVITIES,
+                ResizableActivityPreferenceController.SETTING_VALUE_ON);
+
+        mController.updateState(mPreference);
+
+        verify(mPreference).setChecked(true);
+    }
+
+    @Test
+    public void updateState_settingDisabled_preferenceShouldNotBeChecked() {
+        Settings.Global.putInt(mContext.getContentResolver(),
+                Settings.Global.DEVELOPMENT_FORCE_RESIZABLE_ACTIVITIES,
+                ResizableActivityPreferenceController.SETTING_VALUE_OFF);
+
+        mController.updateState(mPreference);
+
+        verify(mPreference).setChecked(false);
+    }
+
+    @Test
+    public void onDeveloperOptionsSwitchDisabled_preferenceShouldBeDisabled() {
+        mController.onDeveloperOptionsSwitchDisabled();
+        final int mode = Settings.Global.getInt(mContext.getContentResolver(),
+                Settings.Global.DEVELOPMENT_FORCE_RESIZABLE_ACTIVITIES, -1 /* default */);
+
+        assertThat(mode).isEqualTo(
+                ResizableActivityPreferenceController.SETTING_VALUE_OFF);
+        verify(mPreference).setChecked(false);
+        verify(mPreference).setEnabled(false);
+    }
+
+    @Test
+    public void onDeveloperOptionsSwitchEnabled_preferenceShouldBeEnabled() {
+        mController.onDeveloperOptionsSwitchEnabled();
+
+        verify(mPreference).setEnabled(true);
+    }
+}
diff --git a/tests/robotests/src/com/android/settings/development/RtlLayoutPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/RtlLayoutPreferenceControllerTest.java
new file mode 100644
index 0000000..d607a27
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/development/RtlLayoutPreferenceControllerTest.java
@@ -0,0 +1,128 @@
+/*
+ * Copyright (C) 2017 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.development;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import static org.mockito.Mockito.doNothing;
+import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+import android.content.Context;
+import android.provider.Settings;
+import android.support.v14.preference.SwitchPreference;
+import android.support.v7.preference.PreferenceScreen;
+
+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_O)
+public class RtlLayoutPreferenceControllerTest {
+
+    @Mock
+    private PreferenceScreen mScreen;
+    @Mock
+    private SwitchPreference mPreference;
+
+    private Context mContext;
+
+    private RtlLayoutPreferenceController mController;
+
+    @Before
+    public void setUp() {
+        MockitoAnnotations.initMocks(this);
+        mContext = RuntimeEnvironment.application;
+        mController = new RtlLayoutPreferenceController(mContext);
+        when(mScreen.findPreference(mController.getPreferenceKey())).thenReturn(mPreference);
+        mController.displayPreference(mScreen);
+    }
+
+    @Test
+    public void updateState_forceRtlEnabled_shouldCheckedPreference() {
+        Settings.Global.putInt(mContext.getContentResolver(), Settings.Global.DEVELOPMENT_FORCE_RTL,
+                RtlLayoutPreferenceController.SETTING_VALUE_ON);
+
+        mController.updateState(mPreference);
+
+        verify(mPreference).setChecked(true);
+    }
+
+    @Test
+    public void updateState_forceRtlDisabled_shouldUncheckedPreference() {
+        Settings.Global.putInt(mContext.getContentResolver(), Settings.Global.DEVELOPMENT_FORCE_RTL,
+                RtlLayoutPreferenceController.SETTING_VALUE_OFF);
+
+        mController.updateState(mPreference);
+
+        verify(mPreference).setChecked(false);
+    }
+
+    @Test
+    public void onPreferenceChange_preferenceChecked_shouldEnableForceRtl() {
+        mController = spy(mController);
+        doNothing().when(mController).updateLocales();
+        mController.onPreferenceChange(mPreference, true /* new value */);
+
+        final int rtlLayoutMode = Settings.Global.getInt(mContext.getContentResolver(),
+                Settings.Global.DEVELOPMENT_FORCE_RTL, -1 /* default */);
+
+        assertThat(rtlLayoutMode).isEqualTo(RtlLayoutPreferenceController.SETTING_VALUE_ON);
+    }
+
+    @Test
+    public void onPreferenceChange__preferenceUnchecked_shouldDisableForceRtl() {
+        mController = spy(mController);
+        doNothing().when(mController).updateLocales();
+        mController.onPreferenceChange(mPreference, false /* new value */);
+
+        final int rtlLayoutMode = Settings.Global.getInt(mContext.getContentResolver(),
+                Settings.Global.DEVELOPMENT_FORCE_RTL, -1 /* default */);
+
+        assertThat(rtlLayoutMode).isEqualTo(RtlLayoutPreferenceController.SETTING_VALUE_OFF);
+    }
+
+    @Test
+    public void onDeveloperOptionsSwitchEnabled_preferenceShouldBeEnabled() {
+        mController.onDeveloperOptionsSwitchEnabled();
+
+        verify(mPreference).setEnabled(true);
+    }
+
+    @Test
+    public void onDeveloperOptionsSwitchDisabled_preferenceShouldBeEnabled() {
+        mController = spy(mController);
+        doNothing().when(mController).updateLocales();
+        mController.onDeveloperOptionsSwitchDisabled();
+
+        final int rtlLayoutMode = Settings.Global.getInt(mContext.getContentResolver(),
+                Settings.Global.DEVELOPMENT_FORCE_RTL, -1 /* default */);
+
+        assertThat(rtlLayoutMode).isEqualTo(RtlLayoutPreferenceController.SETTING_VALUE_OFF);
+        verify(mPreference).setEnabled(false);
+        verify(mPreference).setChecked(false);
+    }
+}
diff --git a/tests/robotests/src/com/android/settings/development/SecondaryDisplayPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/SecondaryDisplayPreferenceControllerTest.java
new file mode 100644
index 0000000..d11c117
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/development/SecondaryDisplayPreferenceControllerTest.java
@@ -0,0 +1,148 @@
+/*
+ * Copyright (C) 2017 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.development;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+import android.content.Context;
+import android.provider.Settings;
+import android.support.v7.preference.ListPreference;
+import android.support.v7.preference.PreferenceScreen;
+
+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.RuntimeEnvironment;
+import org.robolectric.annotation.Config;
+
+@RunWith(SettingsRobolectricTestRunner.class)
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION_O)
+public class SecondaryDisplayPreferenceControllerTest {
+
+    @Mock
+    private ListPreference mPreference;
+    @Mock
+    private PreferenceScreen mScreen;
+
+    /**
+     * 0: None
+     * 1: 480p
+     * 2: 480p (secure)
+     * 3: 720p
+     * 4: 720p (secure)
+     * 5: 1080p
+     * 6: 1080p (secure)
+     * 7: 4K
+     * 8: 4K (secure)
+     * 9: 4K (upscaled)
+     * 10: 4K (upscaled, secure)
+     * 11: 720p, 1080p (dual screen)
+     */
+    private String[] mListValues;
+    private String[] mListSummaries;
+    private Context mContext;
+    private SecondaryDisplayPreferenceController mController;
+
+    @Before
+    public void setup() {
+        MockitoAnnotations.initMocks(this);
+        mContext = RuntimeEnvironment.application;
+        mListValues = mContext.getResources().getStringArray(
+                R.array.overlay_display_devices_values);
+        mListSummaries = mContext.getResources().getStringArray(
+                R.array.overlay_display_devices_entries);
+        mController = new SecondaryDisplayPreferenceController(mContext);
+        when(mScreen.findPreference(mController.getPreferenceKey())).thenReturn(mPreference);
+        mController.displayPreference(mScreen);
+    }
+
+    @Test
+    public void onPreferenceChange_set480p_shouldEnable480p() {
+        mController.onPreferenceChange(mPreference, mListValues[1]);
+
+        final String value = Settings.Global.getString(mContext.getContentResolver(),
+                Settings.Global.OVERLAY_DISPLAY_DEVICES);
+        assertThat(value).isEqualTo(mListValues[1]);
+    }
+
+    @Test
+    public void onPreferenceChange_set720p_shouldEnable720p() {
+        mController.onPreferenceChange(mPreference, mListValues[3]);
+
+        final String value = Settings.Global.getString(mContext.getContentResolver(),
+                Settings.Global.OVERLAY_DISPLAY_DEVICES);
+        assertThat(value).isEqualTo(mListValues[3]);
+    }
+
+    @Test
+    public void updateState_set480p_shouldSetPreferenceTo480p() {
+        Settings.Global.putString(mContext.getContentResolver(),
+                Settings.Global.OVERLAY_DISPLAY_DEVICES, mListValues[1]);
+
+        mController.updateState(mPreference);
+
+        verify(mPreference).setValue(mListValues[1]);
+        verify(mPreference).setSummary(mListSummaries[1]);
+    }
+
+    @Test
+    public void updateState_set720p_shouldSetPreferenceTo720p() {
+        Settings.Global.putString(mContext.getContentResolver(),
+                Settings.Global.OVERLAY_DISPLAY_DEVICES, mListValues[3]);
+
+        mController.updateState(mPreference);
+
+        verify(mPreference).setValue(mListValues[3]);
+        verify(mPreference).setSummary(mListSummaries[3]);
+    }
+
+    @Test
+    public void updateState_nothingSet_shouldSetDefaultToNone() {
+        mController.updateState(mPreference);
+
+        verify(mPreference).setValue(mListValues[0]);
+        verify(mPreference).setSummary(mListSummaries[0]);
+    }
+
+    @Test
+    public void onDeveloperOptionsSwitchDisabled_shouldDisablePreferenceAndSetToNone() {
+        mController.onDeveloperOptionsSwitchDisabled();
+
+        final String value = Settings.Global.getString(mContext.getContentResolver(),
+                Settings.Global.OVERLAY_DISPLAY_DEVICES);
+        assertThat(value).isNull();
+        verify(mPreference).setEnabled(false);
+        verify(mPreference).setValue(mListValues[0]);
+        verify(mPreference).setSummary(mListSummaries[0]);
+    }
+
+    @Test
+    public void onDeveloperOptionsSwitchEnabled_shouldEnablePreference() {
+        mController.onDeveloperOptionsSwitchEnabled();
+
+        verify(mPreference).setEnabled(true);
+    }
+}
diff --git a/tests/robotests/src/com/android/settings/development/SelectDebugAppPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/SelectDebugAppPreferenceControllerTest.java
new file mode 100644
index 0000000..6c38cea
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/development/SelectDebugAppPreferenceControllerTest.java
@@ -0,0 +1,145 @@
+/*
+ * Copyright (C) 2017 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF 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 static com.android.settings.development.DevelopmentOptionsActivityRequestCodes
+        .REQUEST_CODE_DEBUG_APP;
+
+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.content.Intent;
+import android.provider.Settings;
+import android.support.v7.preference.Preference;
+import android.support.v7.preference.PreferenceScreen;
+
+import com.android.settings.R;
+import com.android.settings.TestConfig;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
+import com.android.settingslib.wrapper.PackageManagerWrapper;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.mockito.MockitoAnnotations;
+import org.robolectric.RuntimeEnvironment;
+import org.robolectric.annotation.Config;
+import org.robolectric.util.ReflectionHelpers;
+
+@RunWith(SettingsRobolectricTestRunner.class)
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION_O)
+public class SelectDebugAppPreferenceControllerTest {
+
+    @Mock
+    private Preference mPreference;
+    @Mock
+    private PreferenceScreen mPreferenceScreen;
+    @Mock
+    private DevelopmentSettingsDashboardFragment mFragment;
+    @Mock
+    private PackageManagerWrapper mPackageManagerWrapper;
+
+    private Context mContext;
+    private SelectDebugAppPreferenceController mController;
+
+    @Before
+    public void setup() {
+        MockitoAnnotations.initMocks(this);
+        mContext = RuntimeEnvironment.application;
+        mController = spy(new SelectDebugAppPreferenceController(mContext, mFragment));
+        ReflectionHelpers.setField(mController, "mPackageManager" /* field name */,
+                mPackageManagerWrapper);
+        when(mPreferenceScreen.findPreference(mController.getPreferenceKey())).thenReturn(
+                mPreference);
+        mController.displayPreference(mPreferenceScreen);
+    }
+
+    @Test
+    public void handlePreferenceTreeClick_preferenceClicked_launchActivity() {
+        final Intent activityStartIntent = new Intent(mContext, AppPicker.class);
+        final String preferenceKey = mController.getPreferenceKey();
+        doReturn(activityStartIntent).when(mController).getActivityStartIntent();
+        when(mPreference.getKey()).thenReturn(preferenceKey);
+        mController.handlePreferenceTreeClick(mPreference);
+
+        verify(mFragment).startActivityForResult(activityStartIntent, REQUEST_CODE_DEBUG_APP);
+    }
+
+    @Test
+    public void updateState_foobarAppSelected_shouldUpdateSummaryWithDebugAppLabel() {
+        final String debugApp = "foobar";
+        Settings.Global.putString(mContext.getContentResolver(), Settings.Global.DEBUG_APP,
+                debugApp);
+        mController.updateState(mPreference);
+
+        verify(mPreference).setSummary(
+                mContext.getResources().getString(R.string.debug_app_set, debugApp));
+    }
+
+    @Test
+    public void updateState_noAppSelected_shouldUpdateSummaryWithNoAppSelected() {
+        final String debugApp = null;
+        Settings.Global.putString(mContext.getContentResolver(), Settings.Global.DEBUG_APP,
+                debugApp);
+        mController.updateState(mPreference);
+
+        verify(mPreference).setSummary(
+                mContext.getResources().getString(R.string.debug_app_not_set));
+    }
+
+    @Test
+    public void onActivityResult_foobarAppSelected_shouldUpdateSummaryWithDebugLabel() {
+        Intent activityResultIntent = new Intent(mContext, AppPicker.class);
+        final String appLabel = "foobar";
+        activityResultIntent.setAction(appLabel);
+        final boolean result = mController.onActivityResult(REQUEST_CODE_DEBUG_APP,
+                Activity.RESULT_OK, activityResultIntent);
+
+        assertThat(result).isTrue();
+        verify(mPreference).setSummary(
+                mContext.getResources().getString(R.string.debug_app_set, appLabel));
+    }
+
+    @Test
+    public void onActivityResult_badRequestCode_shouldReturnFalse() {
+        assertThat(mController.onActivityResult(
+                -1 /* requestCode */, -1 /* resultCode */, null /* intent */)).isFalse();
+    }
+
+    @Test
+    public void onDeveloperOptionsSwitchEnabled_shouldEnablePreference() {
+        mController.onDeveloperOptionsSwitchEnabled();
+
+        verify(mPreference).setEnabled(true);
+    }
+
+    @Test
+    public void onDeveloperOptionsSwitchDisabled_shouldDisablePreference() {
+        mController.onDeveloperOptionsSwitchDisabled();
+
+        verify(mPreference).setEnabled(false);
+        verify(mPreference).setSummary(
+                mContext.getResources().getString(R.string.debug_app_not_set));
+    }
+}
diff --git a/tests/robotests/src/com/android/settings/development/SelectUsbConfigPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/SelectUsbConfigPreferenceControllerTest.java
new file mode 100644
index 0000000..bbbc52b
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/development/SelectUsbConfigPreferenceControllerTest.java
@@ -0,0 +1,222 @@
+/*
+ * Copyright (C) 2017 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF 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 static android.arch.lifecycle.Lifecycle.Event.ON_CREATE;
+import static android.arch.lifecycle.Lifecycle.Event.ON_DESTROY;
+import static com.google.common.truth.Truth.assertThat;
+
+import static junit.framework.Assert.assertFalse;
+import static junit.framework.Assert.assertTrue;
+
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.anyBoolean;
+import static org.mockito.ArgumentMatchers.anyString;
+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;
+
+import android.content.Context;
+import android.content.pm.PackageManager;
+import android.hardware.usb.UsbManager;
+import android.support.v7.preference.ListPreference;
+import android.support.v7.preference.PreferenceScreen;
+
+import com.android.settings.R;
+import com.android.settings.TestConfig;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.shadow.ShadowUtils;
+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.Mockito;
+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_O,
+        shadows = {ShadowUtils.class})
+public class SelectUsbConfigPreferenceControllerTest {
+
+    @Mock
+    private ListPreference mPreference;
+    @Mock
+    private PreferenceScreen mScreen;
+    @Mock
+    private UsbManager mUsbManager;
+    @Mock
+    private PackageManager mPackageManager;
+
+    private Context mContext;
+    private Lifecycle mLifecycle;
+    private SelectUsbConfigPreferenceController mController;
+
+    /**
+     * Array Values Key
+     *
+     * 0: Charging
+     * 1: MTP
+     * 2: PTP
+     * 3: RNDIS
+     * 4: Audio Source
+     * 5: MIDI
+     */
+    private String[] mValues;
+    private String[] mSummaries;
+
+    @Before
+    public void setup() {
+        MockitoAnnotations.initMocks(this);
+        mLifecycle = new Lifecycle(() -> mLifecycle);
+        mContext = spy(RuntimeEnvironment.application);
+        doReturn(mUsbManager).when(mContext).getSystemService(Context.USB_SERVICE);
+        doReturn(mPackageManager).when(mContext).getPackageManager();
+        mValues = mContext.getResources().getStringArray(R.array.usb_configuration_values);
+        mSummaries = mContext.getResources().getStringArray(R.array.usb_configuration_titles);
+        mController = spy(new SelectUsbConfigPreferenceController(mContext, mLifecycle));
+        when(mScreen.findPreference(mController.getPreferenceKey())).thenReturn(mPreference);
+        mController.displayPreference(mScreen);
+
+    }
+
+    @After
+    public void teardown() {
+        ShadowUtils.reset();
+    }
+
+    @Test
+    public void onPreferenceChange_setCharging_shouldEnableCharging() {
+        when(mUsbManager.isFunctionEnabled(mValues[0])).thenReturn(true);
+        doNothing().when(mController).setCurrentFunction(anyString(), anyBoolean());
+        mController.onPreferenceChange(mPreference, mValues[0]);
+
+        verify(mController).setCurrentFunction(mValues[0], false /* usb data unlock */);
+    }
+
+    @Test
+    public void onUsbAccessoryAndHostDisabled_shouldNotBeAvailable() {
+        when(mPackageManager.hasSystemFeature(PackageManager.FEATURE_USB_HOST)).thenReturn(false);
+        when(mPackageManager.hasSystemFeature(PackageManager.FEATURE_USB_ACCESSORY)).thenReturn(
+                false);
+        assertFalse(mController.isAvailable());
+    }
+
+    @Test
+    public void onUsbHostEnabled_shouldBeAvailable() {
+        when(mPackageManager.hasSystemFeature(PackageManager.FEATURE_USB_HOST)).thenReturn(true);
+        when(mPackageManager.hasSystemFeature(PackageManager.FEATURE_USB_ACCESSORY)).thenReturn(
+                false);
+        assertTrue(mController.isAvailable());
+    }
+
+    @Test
+    public void onUsbAccessoryEnabled_shouldBeAvailable() {
+        when(mPackageManager.hasSystemFeature(PackageManager.FEATURE_USB_HOST)).thenReturn(false);
+        when(mPackageManager.hasSystemFeature(PackageManager.FEATURE_USB_ACCESSORY)).thenReturn(
+                true);
+        assertTrue(mController.isAvailable());
+    }
+
+    @Test
+    public void onPreferenceChange_setMtp_shouldEnableMtp() {
+        when(mUsbManager.isFunctionEnabled(mValues[1])).thenReturn(true);
+        doNothing().when(mController).setCurrentFunction(anyString(), anyBoolean());
+        mController.onPreferenceChange(mPreference, mValues[1]);
+
+        verify(mController).setCurrentFunction(mValues[1], true /* usb data unlock */);
+    }
+
+    @Test
+    public void onPreferenceChange_monkeyUser_shouldReturnFalse() {
+        when(mUsbManager.isFunctionEnabled(mValues[1])).thenReturn(true);
+        ShadowUtils.setIsUserAMonkey(true);
+        doNothing().when(mController).setCurrentFunction(anyString(), anyBoolean());
+
+        final boolean isHandled = mController.onPreferenceChange(mPreference, mValues[1]);
+
+        assertThat(isHandled).isFalse();
+        verify(mController, never()).setCurrentFunction(any(), anyBoolean());
+    }
+
+    @Test
+    public void updateState_chargingEnabled_shouldSetPreferenceToCharging() {
+        when(mUsbManager.isFunctionEnabled(mValues[0])).thenReturn(true);
+
+        mController.updateState(mPreference);
+
+        verify(mPreference).setValue(mValues[0]);
+        verify(mPreference).setSummary(mSummaries[0]);
+    }
+
+    @Test
+    public void updateState_RndisEnabled_shouldEnableRndis() {
+        when(mUsbManager.isFunctionEnabled(mValues[3])).thenReturn(true);
+
+        mController.updateState(mPreference);
+
+        verify(mPreference).setValue(mValues[3]);
+        verify(mPreference).setSummary(mSummaries[3]);
+    }
+
+    @Test
+    public void updateState_noValueSet_shouldEnableChargingAsDefault() {
+        mController.updateState(mPreference);
+
+        verify(mPreference).setValue(mValues[0]);
+        verify(mPreference).setSummary(mSummaries[0]);
+    }
+
+    @Test
+    public void onDeveloperOptionsSwitchDisabled_shouldDisablePreference() {
+        mController.onDeveloperOptionsSwitchDisabled();
+
+        verify(mPreference).setEnabled(false);
+    }
+
+    @Test
+    public void onDeveloperOptionsSwitchEnabled_shouldEnablePreference() {
+        mController.onDeveloperOptionsSwitchEnabled();
+
+        verify(mPreference).setEnabled(true);
+    }
+
+    @Test
+    public void onCreate_shouldRegisterReceiver() {
+        mLifecycle.onCreate(null /* bundle */);
+        mLifecycle.handleLifecycleEvent(ON_CREATE);
+
+        verify(mContext).registerReceiver(any(), any());
+    }
+
+    @Test
+    public void onDestroy_shouldUnregisterReceiver() {
+        doNothing().when(mContext).unregisterReceiver(any());
+        mLifecycle.handleLifecycleEvent(ON_CREATE);
+        mLifecycle.handleLifecycleEvent(ON_DESTROY);
+
+        verify(mContext).unregisterReceiver(any());
+    }
+}
diff --git a/tests/robotests/src/com/android/settings/development/SetGpuRendererPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/SetGpuRendererPreferenceControllerTest.java
new file mode 100644
index 0000000..9ad1540
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/development/SetGpuRendererPreferenceControllerTest.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.development;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+import android.content.Context;
+import android.os.SystemProperties;
+import android.support.v7.preference.ListPreference;
+import android.support.v7.preference.PreferenceScreen;
+import android.view.ThreadedRenderer;
+
+import com.android.settings.R;
+import com.android.settings.TestConfig;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.shadow.SettingsShadowSystemProperties;
+
+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;
+
+@RunWith(SettingsRobolectricTestRunner.class)
+@Config(manifest = TestConfig.MANIFEST_PATH,
+        sdk = TestConfig.SDK_VERSION_O,
+        shadows = {SettingsShadowSystemProperties.class})
+public class SetGpuRendererPreferenceControllerTest {
+
+    @Mock
+    private ListPreference mPreference;
+    @Mock
+    private PreferenceScreen mScreen;
+
+    /**
+     * 0: OpenGl (Default)
+     * 1: OpenGl (Skia)
+     */
+    private String[] mListValues;
+    private String[] mListSummaries;
+    private Context mContext;
+    private SetGpuRendererPreferenceController mController;
+
+    @Before
+    public void setup() {
+        MockitoAnnotations.initMocks(this);
+        mContext = RuntimeEnvironment.application;
+        mListValues = mContext.getResources().getStringArray(R.array.debug_hw_renderer_values);
+        mListSummaries = mContext.getResources().getStringArray(R.array.debug_hw_renderer_entries);
+        mController = new SetGpuRendererPreferenceController(mContext);
+        when(mScreen.findPreference(mController.getPreferenceKey())).thenReturn(mPreference);
+        mController.displayPreference(mScreen);
+    }
+
+    @After
+    public void teardown() {
+        SettingsShadowSystemProperties.clear();
+    }
+
+    @Test
+    public void onPreferenceChange_noValueSet_shouldSetEmptyString() {
+        mController.onPreferenceChange(mPreference, null /* new value */);
+
+        String mode = SystemProperties.get(
+                ThreadedRenderer.DEBUG_RENDERER_PROPERTY);
+        assertThat(mode).isEqualTo("");
+    }
+
+    @Test
+    public void onPreferenceChange_option1Selected_shouldSetOption1() {
+        mController.onPreferenceChange(mPreference, mListValues[1]);
+
+        String mode = SystemProperties.get(
+                ThreadedRenderer.DEBUG_RENDERER_PROPERTY);
+        assertThat(mode).isEqualTo(mListValues[1]);
+    }
+
+    @Test
+    public void updateState_option1Set_shouldUpdatePreferenceToOption1() {
+        SystemProperties.set(ThreadedRenderer.DEBUG_RENDERER_PROPERTY,
+                mListValues[1]);
+
+        mController.updateState(mPreference);
+
+        verify(mPreference).setValue(mListValues[1]);
+        verify(mPreference).setSummary(mListSummaries[1]);
+    }
+
+    @Test
+    public void updateState_option0Set_shouldUpdatePreferenceToOption0() {
+        SystemProperties.set(ThreadedRenderer.DEBUG_RENDERER_PROPERTY,
+                mListValues[0]);
+
+        mController.updateState(mPreference);
+
+        verify(mPreference).setValue(mListValues[0]);
+        verify(mPreference).setSummary(mListSummaries[0]);
+    }
+
+    @Test
+    public void updateState_noOptionSet_shouldDefaultToOption0() {
+        SystemProperties.set(ThreadedRenderer.DEBUG_RENDERER_PROPERTY, null);
+
+        mController.updateState(mPreference);
+
+        verify(mPreference).setValue(mListValues[0]);
+        verify(mPreference).setSummary(mListSummaries[0]);
+    }
+
+    @Test
+    public void onDeveloperOptionsSwitchDisabled_shouldDisablePreference() {
+        mController.onDeveloperOptionsSwitchDisabled();
+
+        verify(mPreference).setEnabled(false);
+    }
+
+    @Test
+    public void onDeveloperOptionsSwitchEnabled_shouldEnablePreference() {
+        mController.onDeveloperOptionsSwitchEnabled();
+
+        verify(mPreference).setEnabled(true);
+    }
+}
diff --git a/tests/robotests/src/com/android/settings/development/ShadowParcel.java b/tests/robotests/src/com/android/settings/development/ShadowParcel.java
new file mode 100644
index 0000000..965c959
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/development/ShadowParcel.java
@@ -0,0 +1,20 @@
+package com.android.settings.development;
+
+import android.os.Parcel;
+
+import org.robolectric.annotation.Implementation;
+import org.robolectric.annotation.Implements;
+
+/**
+ * This class provides helpers to test logic that reads from parcels.
+ */
+@Implements(Parcel.class)
+public class ShadowParcel {
+
+    static int sReadIntResult;
+
+    @Implementation
+    public int readInt() {
+        return sReadIntResult;
+    }
+}
\ No newline at end of file
diff --git a/tests/robotests/src/com/android/settings/development/ShortcutManagerThrottlingPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/ShortcutManagerThrottlingPreferenceControllerTest.java
new file mode 100644
index 0000000..6654f9a
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/development/ShortcutManagerThrottlingPreferenceControllerTest.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.development;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+import android.content.Context;
+import android.content.pm.IShortcutService;
+import android.os.RemoteException;
+import android.support.v14.preference.SwitchPreference;
+import android.support.v7.preference.PreferenceScreen;
+
+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;
+import org.robolectric.util.ReflectionHelpers;
+
+@RunWith(SettingsRobolectricTestRunner.class)
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION_O)
+public class ShortcutManagerThrottlingPreferenceControllerTest {
+
+    @Mock
+    private SwitchPreference mPreference;
+    @Mock
+    private PreferenceScreen mPreferenceScreen;
+    @Mock
+    private IShortcutService mShortcutService;
+
+    private Context mContext;
+    private ShortcutManagerThrottlingPreferenceController mController;
+
+    @Before
+    public void setup() {
+        MockitoAnnotations.initMocks(this);
+        mContext = RuntimeEnvironment.application;
+        mController = new ShortcutManagerThrottlingPreferenceController(mContext);
+        ReflectionHelpers.setField(mController, "mShortcutService", mShortcutService);
+        when(mPreferenceScreen.findPreference(mController.getPreferenceKey())).thenReturn(
+                mPreference);
+        mController.displayPreference(mPreferenceScreen);
+    }
+
+    @Test
+    public void handlePreferenceTreeClick_differentPreferenceKey_shouldReturnFalse() {
+        when(mPreference.getKey()).thenReturn("SomeRandomKey");
+
+        assertThat(mController.handlePreferenceTreeClick(mPreference)).isFalse();
+    }
+
+    @Test
+    public void handlePreferenceTreeClick_correctPreferenceKey_shouldResetThrottling()
+            throws RemoteException {
+        when(mPreference.getKey()).thenReturn(mController.getPreferenceKey());
+
+        final boolean handled = mController.handlePreferenceTreeClick(mPreference);
+
+        assertThat(handled).isTrue();
+        verify(mShortcutService).resetThrottling();
+    }
+}
diff --git a/tests/robotests/src/com/android/settings/development/ShowLayoutBoundsPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/ShowLayoutBoundsPreferenceControllerTest.java
new file mode 100644
index 0000000..8320c97
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/development/ShowLayoutBoundsPreferenceControllerTest.java
@@ -0,0 +1,127 @@
+/*
+ * Copyright (C) 2017 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF 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 static com.google.common.truth.Truth.assertThat;
+
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+import android.content.Context;
+import android.support.v14.preference.SwitchPreference;
+import android.support.v7.preference.PreferenceScreen;
+import android.view.View;
+
+import com.android.settings.TestConfig;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.shadow.SettingsShadowSystemProperties;
+
+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;
+
+@RunWith(SettingsRobolectricTestRunner.class)
+@Config(manifest = TestConfig.MANIFEST_PATH,
+        sdk = TestConfig.SDK_VERSION_O,
+        shadows = {SettingsShadowSystemProperties.class})
+public class ShowLayoutBoundsPreferenceControllerTest {
+
+    @Mock
+    private SwitchPreference mPreference;
+    @Mock
+    private PreferenceScreen mPreferenceScreen;
+
+    private Context mContext;
+    private ShowLayoutBoundsPreferenceController mController;
+
+    @Before
+    public void setup() {
+        MockitoAnnotations.initMocks(this);
+        mContext = RuntimeEnvironment.application;
+        mController = new ShowLayoutBoundsPreferenceController(mContext);
+        when(mPreferenceScreen.findPreference(mController.getPreferenceKey())).thenReturn(
+                mPreference);
+        mController.displayPreference(mPreferenceScreen);
+    }
+
+    @After
+    public void tearDown() {
+        SettingsShadowSystemProperties.clear();
+    }
+
+    @Test
+    public void onPreferenceChanged_settingEnabled_turnOnShowLayoutBounds() {
+        mController.onPreferenceChange(mPreference, true /* new value */);
+
+        final boolean mode = SettingsShadowSystemProperties.getBoolean(
+                View.DEBUG_LAYOUT_PROPERTY, false /* default */);
+
+        assertThat(mode).isTrue();
+    }
+
+    @Test
+    public void onPreferenceChanged_settingDisabled_turnOffShowLayoutBounds() {
+        mController.onPreferenceChange(mPreference, false /* new value */);
+
+        final boolean mode = SettingsShadowSystemProperties.getBoolean(
+                View.DEBUG_LAYOUT_PROPERTY, false /* default */);
+
+        assertThat(mode).isFalse();
+    }
+
+    @Test
+    public void updateState_settingEnabled_preferenceShouldBeChecked() {
+        SettingsShadowSystemProperties.set(View.DEBUG_LAYOUT_PROPERTY,
+                Boolean.toString(true));
+        mController.updateState(mPreference);
+
+        verify(mPreference).setChecked(true);
+    }
+
+    @Test
+    public void updateState_settingDisabled_preferenceShouldNotBeChecked() {
+        SettingsShadowSystemProperties.set(View.DEBUG_LAYOUT_PROPERTY,
+                Boolean.toString(false));
+        mController.updateState(mPreference);
+
+        verify(mPreference).setChecked(false);
+    }
+
+    @Test
+    public void onDeveloperOptionsDisabled_shouldDisablePreference() {
+        mController.onDeveloperOptionsDisabled();
+
+        final boolean mode = SettingsShadowSystemProperties.getBoolean(
+                View.DEBUG_LAYOUT_PROPERTY, false /* default */);
+
+        assertThat(mode).isFalse();
+        verify(mPreference).setEnabled(false);
+        verify(mPreference).setChecked(false);
+    }
+
+    @Test
+    public void onDeveloperOptionsEnabled_shouldEnablePreference() {
+        mController.onDeveloperOptionsEnabled();
+
+        verify(mPreference).setEnabled(true);
+    }
+}
diff --git a/tests/robotests/src/com/android/settings/development/ShowSurfaceUpdatesPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/ShowSurfaceUpdatesPreferenceControllerTest.java
new file mode 100644
index 0000000..94af993
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/development/ShowSurfaceUpdatesPreferenceControllerTest.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.development;
+
+import static com.android.settings.development.ShowSurfaceUpdatesPreferenceController
+        .SURFACE_FLINGER_READ_CODE;
+
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.anyBoolean;
+import static org.mockito.ArgumentMatchers.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;
+
+import android.content.Context;
+import android.os.IBinder;
+import android.os.RemoteException;
+import android.support.v14.preference.SwitchPreference;
+import android.support.v7.preference.PreferenceScreen;
+
+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 org.robolectric.util.ReflectionHelpers;
+
+@RunWith(SettingsRobolectricTestRunner.class)
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION_O)
+public class ShowSurfaceUpdatesPreferenceControllerTest {
+
+    @Mock
+    private Context mContext;
+    @Mock
+    private PreferenceScreen mScreen;
+    @Mock
+    private SwitchPreference mPreference;
+    @Mock
+    private IBinder mSurfaceFlinger;
+
+    private ShowSurfaceUpdatesPreferenceController mController;
+
+    @Before
+    public void setUp() {
+        MockitoAnnotations.initMocks(this);
+        mController = spy(new ShowSurfaceUpdatesPreferenceController(mContext));
+        ReflectionHelpers.setField(mController, "mSurfaceFlinger", mSurfaceFlinger);
+        doNothing().when(mController).writeShowUpdatesSetting(anyBoolean());
+        when(mScreen.findPreference(mController.getPreferenceKey())).thenReturn(mPreference);
+        mController.displayPreference(mScreen);
+    }
+
+    @Test
+    public void onPreferenceChange_settingToggledOn_shouldWriteTrueToShowUpdatesSetting() {
+        mController.onPreferenceChange(mPreference, true /* new value */);
+
+        verify(mController).writeShowUpdatesSetting(true);
+    }
+
+    @Test
+    public void onPreferenceChange_settingToggledOff_shouldWriteFalseToShowUpdatesSetting() {
+        mController.onPreferenceChange(mPreference, false /* new value */);
+
+        verify(mController).writeShowUpdatesSetting(false);
+    }
+
+    @Test
+    @Config(shadows = {ShadowParcel.class})
+    public void updateState_settingEnabled_shouldCheckPreference() throws RemoteException {
+        ShadowParcel.sReadIntResult = 1;
+        doReturn(true).when(mSurfaceFlinger).transact(eq(SURFACE_FLINGER_READ_CODE), any(), any(),
+                eq(0 /* flags */));
+        mController.updateState(mPreference);
+
+        verify(mPreference).setChecked(true);
+    }
+
+    @Test
+    @Config(shadows = {ShadowParcel.class})
+    public void updateState_settingDisabled_shouldUnCheckPreference() throws RemoteException {
+        ShadowParcel.sReadIntResult = 0;
+        doReturn(true).when(mSurfaceFlinger).transact(eq(SURFACE_FLINGER_READ_CODE), any(), any(),
+                eq(0 /* flags */));
+        mController.updateState(mPreference);
+
+        verify(mPreference).setChecked(false);
+    }
+
+    @Test
+    public void onDeveloperOptionsSwitchDisabled_preferenceUnchecked_shouldNotTurnOffPreference() {
+        when(mPreference.isChecked()).thenReturn(false);
+        mController.onDeveloperOptionsSwitchDisabled();
+
+        verify(mController, never()).writeShowUpdatesSetting(anyBoolean());
+        verify(mPreference, never()).setChecked(anyBoolean());
+        verify(mPreference).setEnabled(false);
+    }
+
+    @Test
+    public void onDeveloperOptionsSwitchDisabled_preferenceChecked_shouldTurnOffPreference() {
+        when(mPreference.isChecked()).thenReturn(true);
+        mController.onDeveloperOptionsSwitchDisabled();
+
+        verify(mController).writeShowUpdatesSetting(false);
+        verify(mPreference).setChecked(false);
+        verify(mPreference).setEnabled(false);
+    }
+
+    @Test
+    public void onDeveloperOptionsSwitchEnabled_shouldEnablePreference() {
+        mController.onDeveloperOptionsSwitchEnabled();
+
+        verify(mPreference).setEnabled(true);
+    }
+}
diff --git a/tests/robotests/src/com/android/settings/development/ShowTapsPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/ShowTapsPreferenceControllerTest.java
new file mode 100644
index 0000000..d8fec93
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/development/ShowTapsPreferenceControllerTest.java
@@ -0,0 +1,127 @@
+/*
+ * Copyright (C) 2017 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF 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 static com.google.common.truth.Truth.assertThat;
+
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+import android.content.Context;
+import android.provider.Settings;
+import android.support.v14.preference.SwitchPreference;
+import android.support.v7.preference.PreferenceScreen;
+
+import com.android.settings.TestConfig;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.shadow.SettingsShadowSystemProperties;
+
+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;
+
+@RunWith(SettingsRobolectricTestRunner.class)
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION_O)
+public class ShowTapsPreferenceControllerTest {
+
+    @Mock
+    private PreferenceScreen mScreen;
+    @Mock
+    private SwitchPreference mPreference;
+
+    private Context mContext;
+
+    private ShowTapsPreferenceController mController;
+
+    @Before
+    public void setUp() {
+        MockitoAnnotations.initMocks(this);
+        mContext = RuntimeEnvironment.application;
+        mController = new ShowTapsPreferenceController(mContext);
+        when(mScreen.findPreference(mController.getPreferenceKey())).thenReturn(mPreference);
+        mController.displayPreference(mScreen);
+    }
+
+    @After
+    public void tearDown() {
+        SettingsShadowSystemProperties.clear();
+    }
+
+    @Test
+    public void updateState_showTapsEnabled_shouldCheckedPreference() {
+        Settings.System.putInt(mContext.getContentResolver(),
+                Settings.System.SHOW_TOUCHES, ShowTapsPreferenceController.SETTING_VALUE_ON);
+
+        mController.updateState(mPreference);
+
+        verify(mPreference).setChecked(true);
+    }
+
+    @Test
+    public void updateState_showTapsDisabled_shouldUncheckedPreference() {
+        Settings.System.putInt(mContext.getContentResolver(),
+                Settings.System.SHOW_TOUCHES, ShowTapsPreferenceController.SETTING_VALUE_OFF);
+
+        mController.updateState(mPreference);
+
+        verify(mPreference).setChecked(false);
+    }
+
+    @Test
+    public void onPreferenceChange_preferenceChecked_shouldEnableShowTaps() {
+        mController.onPreferenceChange(mPreference, true /* new value */);
+
+        final int showTapsMode = Settings.System.getInt(mContext.getContentResolver(),
+                Settings.System.SHOW_TOUCHES, -1 /* default */);
+
+        assertThat(showTapsMode).isEqualTo(ShowTapsPreferenceController.SETTING_VALUE_ON);
+    }
+
+    @Test
+    public void onPreferenceChange__preferenceUnchecked_shouldDisableShowTaps() {
+        mController.onPreferenceChange(mPreference, false /* new value */);
+
+        final int showTapsMode = Settings.System.getInt(mContext.getContentResolver(),
+                Settings.System.SHOW_TOUCHES, -1 /* default */);
+
+        assertThat(showTapsMode).isEqualTo(ShowTapsPreferenceController.SETTING_VALUE_OFF);
+    }
+
+    @Test
+    public void onDeveloperOptionsSwitchEnabled_preferenceShouldBeEnabled() {
+        mController.onDeveloperOptionsSwitchEnabled();
+
+        verify(mPreference).setEnabled(true);
+    }
+
+    @Test
+    public void onDeveloperOptionsSwitchDisabled_preferenceShouldBeEnabled() {
+        mController.onDeveloperOptionsSwitchDisabled();
+
+        final int showTapsMode = Settings.System.getInt(mContext.getContentResolver(),
+                Settings.System.SHOW_TOUCHES, -1 /* default */);
+
+        assertThat(showTapsMode).isEqualTo(ShowTapsPreferenceController.SETTING_VALUE_OFF);
+        verify(mPreference).setEnabled(false);
+        verify(mPreference).setChecked(false);
+    }
+}
diff --git a/tests/robotests/src/com/android/settings/development/SimulateColorSpacePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/SimulateColorSpacePreferenceControllerTest.java
new file mode 100644
index 0000000..3570368
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/development/SimulateColorSpacePreferenceControllerTest.java
@@ -0,0 +1,174 @@
+/*
+ * Copyright (C) 2017 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.development;
+
+import static com.android.settings.development.SimulateColorSpacePreferenceController
+        .SETTING_VALUE_OFF;
+import static com.android.settings.development.SimulateColorSpacePreferenceController
+        .SETTING_VALUE_ON;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import static org.mockito.ArgumentMatchers.anyString;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+import android.content.Context;
+import android.content.res.Resources;
+import android.provider.Settings;
+import android.support.v7.preference.ListPreference;
+import android.support.v7.preference.PreferenceScreen;
+
+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.RuntimeEnvironment;
+import org.robolectric.annotation.Config;
+
+@RunWith(SettingsRobolectricTestRunner.class)
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION_O)
+public class SimulateColorSpacePreferenceControllerTest {
+
+    @Mock
+    private ListPreference mPreference;
+    @Mock
+    private PreferenceScreen mScreen;
+
+    /**
+     * 0: Disabled
+     * 1: Monochromacy
+     * 2: Deuteranomaly (red-green)
+     * 3: Protanomaly (red-green)
+     * 4: Tritanomaly (blue-yellow)
+     */
+    private String[] mListValues;
+    private Context mContext;
+    private SimulateColorSpacePreferenceController mController;
+
+    @Before
+    public void setup() {
+        MockitoAnnotations.initMocks(this);
+        mContext = RuntimeEnvironment.application;
+        mListValues = mContext.getResources().getStringArray(R.array.simulate_color_space_values);
+        mController = new SimulateColorSpacePreferenceController(mContext);
+        when(mScreen.findPreference(mController.getPreferenceKey())).thenReturn(mPreference);
+        mController.displayPreference(mScreen);
+    }
+
+    @Test
+    public void onPreferenceChange_disabledSelected_shouldTurnOffPreference()
+            throws Settings.SettingNotFoundException {
+        mController.onPreferenceChange(mPreference, mListValues[0]);
+
+        final int enabled = Settings.Secure.getInt(mContext.getContentResolver(),
+                Settings.Secure.ACCESSIBILITY_DISPLAY_DALTONIZER_ENABLED);
+
+        assertThat(enabled).isEqualTo(SETTING_VALUE_OFF);
+    }
+
+    @Test
+    public void onPreferenceChange_monochromacySelected_shouldEnableAndSelectPreference()
+            throws Settings.SettingNotFoundException {
+        mController.onPreferenceChange(mPreference, mListValues[1]);
+
+        final int enabled = Settings.Secure.getInt(mContext.getContentResolver(),
+                Settings.Secure.ACCESSIBILITY_DISPLAY_DALTONIZER_ENABLED);
+        final int settingValue = Settings.Secure.getInt(mContext.getContentResolver(),
+                Settings.Secure.ACCESSIBILITY_DISPLAY_DALTONIZER);
+
+        assertThat(enabled).isEqualTo(SETTING_VALUE_ON);
+        assertThat(settingValue).isEqualTo(Integer.valueOf(mListValues[1]));
+    }
+
+    @Test
+    public void updateState_settingOff_shouldSetValueToDisabled() {
+        Settings.Secure.putInt(mContext.getContentResolver(),
+                Settings.Secure.ACCESSIBILITY_DISPLAY_DALTONIZER_ENABLED, SETTING_VALUE_OFF);
+
+        mController.updateState(mPreference);
+
+        verify(mPreference).setValue(mListValues[0]);
+    }
+
+    @Test
+    public void updateState_settingOnMonochromacyEnabled_shouldSelectMonochromacy() {
+        Settings.Secure.putInt(mContext.getContentResolver(),
+                Settings.Secure.ACCESSIBILITY_DISPLAY_DALTONIZER_ENABLED, SETTING_VALUE_ON);
+        Settings.Secure.putInt(mContext.getContentResolver(),
+                Settings.Secure.ACCESSIBILITY_DISPLAY_DALTONIZER, Integer.valueOf(mListValues[1]));
+
+        mController.updateState(mPreference);
+
+        verify(mPreference).setValue(mListValues[1]);
+        verify(mPreference).setSummary("%s");
+    }
+
+    @Test
+    public void updateState_settingOnControlledByAccessibility_shouldSetOverridedSummary() {
+        Resources res = mContext.getResources();
+        Settings.Secure.putInt(mContext.getContentResolver(),
+                Settings.Secure.ACCESSIBILITY_DISPLAY_DALTONIZER_ENABLED, SETTING_VALUE_ON);
+        when(mPreference.findIndexOfValue(anyString())).thenReturn(-1);
+
+        mController.updateState(mPreference);
+
+        verify(mPreference).setSummary(res.getString(R.string.daltonizer_type_overridden,
+                res.getString(R.string.accessibility_display_daltonizer_preference_title)));
+    }
+
+    @Test
+    public void onDeveloperOptionsSwitchDisabled_notControlledByDevOptions_shouldDisableAndReset()
+            throws Settings.SettingNotFoundException {
+        Settings.Secure.putInt(mContext.getContentResolver(),
+                Settings.Secure.ACCESSIBILITY_DISPLAY_DALTONIZER_ENABLED, SETTING_VALUE_ON);
+        when(mPreference.findIndexOfValue(anyString())).thenReturn(-1);
+
+        mController.onDeveloperOptionsDisabled();
+
+        final int settingValue = Settings.Secure.getInt(mContext.getContentResolver(),
+                Settings.Secure.ACCESSIBILITY_DISPLAY_DALTONIZER_ENABLED);
+        assertThat(settingValue).isEqualTo(SETTING_VALUE_ON);
+        verify(mPreference).setEnabled(false);
+    }
+
+    @Test
+    public void onDeveloperOptionsSwitchDisabled_controlledByDevOptions_shouldDisableAndNotReset()
+            throws Settings.SettingNotFoundException {
+        Settings.Secure.putInt(mContext.getContentResolver(),
+                Settings.Secure.ACCESSIBILITY_DISPLAY_DALTONIZER_ENABLED, SETTING_VALUE_ON);
+
+        mController.onDeveloperOptionsDisabled();
+
+        final int settingValue = Settings.Secure.getInt(mContext.getContentResolver(),
+                Settings.Secure.ACCESSIBILITY_DISPLAY_DALTONIZER_ENABLED);
+        assertThat(settingValue).isEqualTo(SETTING_VALUE_OFF);
+        verify(mPreference).setEnabled(false);
+    }
+
+    @Test
+    public void onDeveloperOptionsSwitchEnabled_shouldEnablePreference() {
+        mController.onDeveloperOptionsSwitchEnabled();
+
+        verify(mPreference).setEnabled(true);
+    }
+}
diff --git a/tests/robotests/src/com/android/settings/development/StayAwakePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/StayAwakePreferenceControllerTest.java
new file mode 100644
index 0000000..2dd0caf
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/development/StayAwakePreferenceControllerTest.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.development;
+
+import static com.google.common.truth.Truth.assertThat;
+
+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.ContentResolver;
+import android.content.Context;
+import android.provider.Settings;
+import android.support.v7.preference.PreferenceScreen;
+
+import com.android.settings.TestConfig;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
+import com.android.settingslib.RestrictedLockUtils;
+import com.android.settingslib.RestrictedSwitchPreference;
+import com.android.settingslib.core.lifecycle.Lifecycle;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.mockito.Mockito;
+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_O)
+public class StayAwakePreferenceControllerTest {
+
+    @Mock
+    private Context mContext;
+    @Mock
+    private RestrictedSwitchPreference mPreference;
+    @Mock
+    private PreferenceScreen mPreferenceScreen;
+    @Mock
+    private Lifecycle mLifecycle;
+    private ContentResolver mContentResolver;
+    private StayAwakePreferenceController mController;
+
+    @Before
+    public void setup() {
+        MockitoAnnotations.initMocks(this);
+        mContentResolver = RuntimeEnvironment.application.getContentResolver();
+        mController = new StayAwakePreferenceController(mContext, mLifecycle);
+        when(mContext.getContentResolver()).thenReturn(mContentResolver);
+        when(mPreferenceScreen.findPreference(mController.getPreferenceKey())).thenReturn(
+                mPreference);
+        mController.displayPreference(mPreferenceScreen);
+    }
+
+    @Test
+    public void onPreferenceChanged_turnOnStayAwake() {
+        mController.onPreferenceChange(null, true);
+
+        final int mode = Settings.System.getInt(mContentResolver,
+                Settings.Global.STAY_ON_WHILE_PLUGGED_IN, -1);
+
+        assertThat(mode).isEqualTo(StayAwakePreferenceController.SETTING_VALUE_ON);
+    }
+
+    @Test
+    public void onPreferenceChanged_turnOffStayAwake() {
+        mController.onPreferenceChange(null, false);
+
+        final int mode = Settings.System.getInt(mContentResolver,
+                Settings.Global.STAY_ON_WHILE_PLUGGED_IN, -1);
+
+        assertThat(mode).isEqualTo(StayAwakePreferenceController.SETTING_VALUE_OFF);
+    }
+
+    @Test
+    public void updateState_preferenceShouldBeChecked() {
+        Settings.System.putInt(mContentResolver, Settings.Global.STAY_ON_WHILE_PLUGGED_IN,
+                StayAwakePreferenceController.SETTING_VALUE_ON);
+        mController.updateState(mPreference);
+
+        verify(mPreference).setChecked(true);
+    }
+
+    @Test
+    public void updateState_preferenceShouldNotBeChecked() {
+        Settings.System.putInt(mContentResolver, Settings.Global.STAY_ON_WHILE_PLUGGED_IN,
+                StayAwakePreferenceController.SETTING_VALUE_OFF);
+        mController.updateState(mPreference);
+
+        verify(mPreference).setChecked(false);
+    }
+
+    @Test
+    public void displayPreference_expectSetDisabledByAdminToBeCalled() {
+        mController = spy(mController);
+        RestrictedLockUtils.EnforcedAdmin admin = Mockito.mock(
+                RestrictedLockUtils.EnforcedAdmin.class);
+        doReturn(admin).when(mController).checkIfMaximumTimeToLockSetByAdmin();
+        mController.updateState(mPreference);
+
+        verify(mPreference).setDisabledByAdmin(admin);
+    }
+
+    @Test
+    public void observerOnChangeCalledWithSameUri_preferenceShouldBeUpdated() {
+        Settings.System.putInt(mContentResolver, Settings.Global.STAY_ON_WHILE_PLUGGED_IN,
+                StayAwakePreferenceController.SETTING_VALUE_ON);
+        mController.onResume();
+        mController.mSettingsObserver.onChange(false,
+                Settings.Global.getUriFor(Settings.Global.STAY_ON_WHILE_PLUGGED_IN));
+
+        verify(mPreference).setChecked(true);
+    }
+
+    @Test
+    public void observerOnChangeCalledWithDifferentUri_preferenceShouldNotBeUpdated() {
+        Settings.System.putInt(mContentResolver, Settings.Global.STAY_ON_WHILE_PLUGGED_IN,
+                StayAwakePreferenceController.SETTING_VALUE_ON);
+        mController.onResume();
+        mController.mSettingsObserver.onChange(false, null);
+
+        verify(mPreference, never()).setChecked(true);
+    }
+
+    @Test
+    public void onDeveloperOptionsDisabled_shouldDisablePreference() {
+        mController.onDeveloperOptionsDisabled();
+
+        verify(mPreference).setEnabled(false);
+        verify(mPreference).setChecked(false);
+    }
+
+    @Test
+    public void onDeveloperOptionsEnabled_shouldEnablePreference() {
+        mController.onDeveloperOptionsEnabled();
+
+        verify(mPreference).setEnabled(true);
+    }
+}
diff --git a/tests/robotests/src/com/android/settings/development/StrictModePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/StrictModePreferenceControllerTest.java
new file mode 100644
index 0000000..fdc841b
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/development/StrictModePreferenceControllerTest.java
@@ -0,0 +1,127 @@
+/*
+ * Copyright (C) 2017 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF 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 static com.google.common.truth.Truth.assertThat;
+
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+import android.content.Context;
+import android.os.RemoteException;
+import android.os.StrictMode;
+import android.os.SystemProperties;
+import android.support.v14.preference.SwitchPreference;
+import android.support.v7.preference.PreferenceScreen;
+import android.view.IWindowManager;
+
+import com.android.settings.TestConfig;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.shadow.SettingsShadowSystemProperties;
+
+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;
+import org.robolectric.util.ReflectionHelpers;
+
+@RunWith(SettingsRobolectricTestRunner.class)
+@Config(manifest = TestConfig.MANIFEST_PATH,
+        sdk = TestConfig.SDK_VERSION_O,
+        shadows = {SettingsShadowSystemProperties.class})
+public class StrictModePreferenceControllerTest {
+
+    @Mock
+    private IWindowManager mWindowManager;
+    @Mock
+    private PreferenceScreen mScreen;
+    @Mock
+    private SwitchPreference mPreference;
+
+    private Context mContext;
+    private StrictModePreferenceController mController;
+
+    @Before
+    public void setUp() {
+        MockitoAnnotations.initMocks(this);
+        mContext = RuntimeEnvironment.application;
+        mController = new StrictModePreferenceController(mContext);
+        ReflectionHelpers.setField(mController, "mWindowManager", mWindowManager);
+        when(mScreen.findPreference(mController.getPreferenceKey())).thenReturn(mPreference);
+        mController.displayPreference(mScreen);
+    }
+
+    @After
+    public void tearDown() {
+        SettingsShadowSystemProperties.clear();
+    }
+
+    @Test
+    public void onPreferenceChange_settingEnabled_shouldTurnOnStrictMode() throws RemoteException {
+        mController.onPreferenceChange(mPreference, true /* new value */);
+
+        verify(mWindowManager).setStrictModeVisualIndicatorPreference(
+                StrictModePreferenceController.STRICT_MODE_ENABLED);
+    }
+
+    @Test
+    public void onPreferenceChange_settingDisabled_shouldTurnOffStrictMode()
+            throws RemoteException {
+        mController.onPreferenceChange(mPreference, false /* new value */);
+
+        verify(mWindowManager).setStrictModeVisualIndicatorPreference(
+                StrictModePreferenceController.STRICT_MODE_DISABLED);
+    }
+
+    @Test
+    public void updateState_settingEnabled_preferenceShouldBeChecked() {
+        SystemProperties.set(StrictMode.VISUAL_PROPERTY, Boolean.toString(false));
+        mController.updateState(mPreference);
+
+        verify(mPreference).setChecked(false);
+    }
+
+    @Test
+    public void updateState_settingDisabled_preferenceShouldNotBeChecked() {
+        SystemProperties.set(StrictMode.VISUAL_PROPERTY, Boolean.toString(true));
+        mController.updateState(mPreference);
+
+        verify(mPreference).setChecked(true);
+    }
+
+    @Test
+    public void onDeveloperOptionsSwitchDisabled_shouldTurnOffPreference() {
+        mController.onDeveloperOptionsSwitchDisabled();
+        final boolean isEnabled = SystemProperties.getBoolean(StrictMode.VISUAL_PROPERTY,
+                false /* default */);
+
+        assertThat(isEnabled).isFalse();
+        verify(mPreference).setChecked(false);
+        verify(mPreference).setEnabled(false);
+    }
+
+    @Test
+    public void onDeveloperOptionsSwitchEnabled_shouldTurnOnPreference() {
+        mController.onDeveloperOptionsSwitchEnabled();
+
+        verify(mPreference).setEnabled(true);
+    }
+}
diff --git a/tests/robotests/src/com/android/settings/development/TelephonyMonitorPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/TelephonyMonitorPreferenceControllerTest.java
deleted file mode 100644
index 2f0f261..0000000
--- a/tests/robotests/src/com/android/settings/development/TelephonyMonitorPreferenceControllerTest.java
+++ /dev/null
@@ -1,225 +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.SystemProperties;
-import android.support.v14.preference.SwitchPreference;
-import android.support.v7.preference.PreferenceScreen;
-
-import com.android.settings.R;
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.TestConfig;
-import com.android.settings.testutils.shadow.SettingsShadowSystemProperties;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Answers;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
-import org.robolectric.annotation.Config;
-
-import static com.google.common.truth.Truth.assertThat;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
-@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
-public class TelephonyMonitorPreferenceControllerTest {
-
-    @Mock(answer = Answers.RETURNS_DEEP_STUBS)
-    private Context mContext;
-    @Mock
-    private PreferenceScreen mScreen;
-    @Mock
-    private SwitchPreference mPreference;
-
-    private TelephonyMonitorPreferenceController mController;
-
-    @Before
-    public void setUp() {
-        MockitoAnnotations.initMocks(this);
-        SettingsShadowSystemProperties.clear();
-        mController = new TelephonyMonitorPreferenceController(mContext);
-        when(mScreen.findPreference(mController.getPreferenceKey())).thenReturn(mPreference);
-        when(mPreference.getKey()).thenReturn(mController.getPreferenceKey());
-    }
-
-    @Config(shadows = {SettingsShadowSystemProperties.class})
-    @Test
-    public void isAvailable_trueShowFlagWithUserdebugBuild_shouldReturnTrue() {
-        when(mContext.getResources().getBoolean(R.bool.config_show_telephony_monitor))
-                .thenReturn(true);
-        SettingsShadowSystemProperties.set(
-                TelephonyMonitorPreferenceController.BUILD_TYPE, "userdebug");
-
-        assertThat(mController.isAvailable()).isTrue();
-    }
-
-    @Config(shadows = {SettingsShadowSystemProperties.class})
-    @Test
-    public void isAvailable_trueShowFlagWithEngBuild_shouldReturnTrue() {
-        when(mContext.getResources().getBoolean(R.bool.config_show_telephony_monitor))
-                .thenReturn(true);
-        SettingsShadowSystemProperties.set(
-                TelephonyMonitorPreferenceController.BUILD_TYPE, "eng");
-
-        assertThat(mController.isAvailable()).isTrue();
-    }
-
-    @Config(shadows = {SettingsShadowSystemProperties.class})
-    @Test
-    public void isAvailable_trueShowFlagWithUserBuild_shouldReturnFalse() {
-        when(mContext.getResources().getBoolean(R.bool.config_show_telephony_monitor))
-                .thenReturn(true);
-        SettingsShadowSystemProperties.set(
-                TelephonyMonitorPreferenceController.BUILD_TYPE, "user");
-
-        assertThat(mController.isAvailable()).isFalse();
-    }
-
-    @Config(shadows = {SettingsShadowSystemProperties.class})
-    @Test
-    public void isAvailable_falseShowFlagWithUserdebugBuild_shouldReturnFalse() {
-        when(mContext.getResources().getBoolean(R.bool.config_show_telephony_monitor))
-                .thenReturn(false);
-        SettingsShadowSystemProperties.set(
-                TelephonyMonitorPreferenceController.BUILD_TYPE, "userdebug");
-
-        assertThat(mController.isAvailable()).isFalse();
-    }
-
-    @Config(shadows = {SettingsShadowSystemProperties.class})
-    @Test
-    public void isAvailable_falseShowFlagWithEngBuild_shouldReturnFalse() {
-        when(mContext.getResources().getBoolean(R.bool.config_show_telephony_monitor))
-                .thenReturn(false);
-        SettingsShadowSystemProperties.set(
-                TelephonyMonitorPreferenceController.BUILD_TYPE, "eng");
-
-        assertThat(mController.isAvailable()).isFalse();
-    }
-
-    @Config(shadows = {SettingsShadowSystemProperties.class})
-    @Test
-    public void isAvailable_falseShowFlagWithUserBuild_shouldReturnFalse() {
-        when(mContext.getResources().getBoolean(R.bool.config_show_telephony_monitor))
-                .thenReturn(false);
-        SettingsShadowSystemProperties.set(
-                TelephonyMonitorPreferenceController.BUILD_TYPE, "user");
-
-        assertThat(mController.isAvailable()).isFalse();
-    }
-
-    @Config(shadows = {SettingsShadowSystemProperties.class})
-    @Test
-    public void displayPreference_telephonyMonitorEnabled_shouldCheckedPreference() {
-        when(mContext.getResources().getBoolean(R.bool.config_show_telephony_monitor))
-                .thenReturn(true);
-        SettingsShadowSystemProperties.set(
-                TelephonyMonitorPreferenceController.PROPERTY_TELEPHONY_MONITOR,
-                TelephonyMonitorPreferenceController.ENABLED_STATUS);
-        SettingsShadowSystemProperties.set(
-                TelephonyMonitorPreferenceController.BUILD_TYPE, "userdebug");
-
-        mController.displayPreference(mScreen);
-
-        verify(mPreference).setChecked(true);
-    }
-
-    @Config(shadows = {SettingsShadowSystemProperties.class})
-    @Test
-    public void displayPreference_telephonyMonitorUserEnabled_shouldCheckedPreference() {
-        when(mContext.getResources().getBoolean(R.bool.config_show_telephony_monitor))
-                .thenReturn(true);
-        SettingsShadowSystemProperties.set(
-                TelephonyMonitorPreferenceController.PROPERTY_TELEPHONY_MONITOR,
-                TelephonyMonitorPreferenceController.USER_ENABLED_STATUS);
-        SettingsShadowSystemProperties.set(
-                TelephonyMonitorPreferenceController.BUILD_TYPE, "userdebug");
-
-        mController.displayPreference(mScreen);
-
-        verify(mPreference).setChecked(true);
-    }
-
-    @Config(shadows = {SettingsShadowSystemProperties.class})
-    @Test
-    public void displayPreference_telephonyMonitorDisabled_shouldUncheckedPreference() {
-        when(mContext.getResources().getBoolean(R.bool.config_show_telephony_monitor))
-                .thenReturn(true);
-        SettingsShadowSystemProperties.set(
-                TelephonyMonitorPreferenceController.PROPERTY_TELEPHONY_MONITOR,
-                TelephonyMonitorPreferenceController.DISABLED_STATUS);
-        SettingsShadowSystemProperties.set(
-                TelephonyMonitorPreferenceController.BUILD_TYPE, "userdebug");
-
-        mController.displayPreference(mScreen);
-
-        verify(mPreference).setChecked(false);
-    }
-
-    @Config(shadows = {SettingsShadowSystemProperties.class})
-    @Test
-    public void displayPreference_telephonyMonitorUserDisabled_shouldUncheckedPreference() {
-        when(mContext.getResources().getBoolean(R.bool.config_show_telephony_monitor))
-                .thenReturn(true);
-        SettingsShadowSystemProperties.set(
-                TelephonyMonitorPreferenceController.PROPERTY_TELEPHONY_MONITOR,
-                TelephonyMonitorPreferenceController.USER_DISABLED_STATUS);
-        SettingsShadowSystemProperties.set(
-                TelephonyMonitorPreferenceController.BUILD_TYPE, "userdebug");
-
-        mController.displayPreference(mScreen);
-
-        verify(mPreference).setChecked(false);
-    }
-
-    @Config(shadows = {SettingsShadowSystemProperties.class})
-    @Test
-    public void handlePreferenceTreeClick_preferenceChecked_shouldEnableTelephonyMonitor() {
-        when(mPreference.isChecked()).thenReturn(true);
-
-        when(mContext.getResources().getString(R.string.telephony_monitor_toast))
-                .thenReturn("To apply telephony monitor change, reboot device");
-
-        mController.handlePreferenceTreeClick(mPreference);
-
-        assertThat(TelephonyMonitorPreferenceController.USER_ENABLED_STATUS.equals(
-                SystemProperties.get(
-                        TelephonyMonitorPreferenceController.PROPERTY_TELEPHONY_MONITOR,
-                        TelephonyMonitorPreferenceController.DISABLED_STATUS))).isTrue();
-    }
-
-    @Config(shadows = {SettingsShadowSystemProperties.class})
-    @Test
-    public void handlePreferenceTreeClick_preferenceUnchecked_shouldDisableTelephonyMonitor() {
-        when(mPreference.isChecked()).thenReturn(false);
-
-        when(mContext.getResources().getString(R.string.telephony_monitor_toast))
-                .thenReturn("To apply telephony monitor change, reboot device");
-
-        mController.handlePreferenceTreeClick(mPreference);
-
-        assertThat(TelephonyMonitorPreferenceController.USER_DISABLED_STATUS.equals(
-                SystemProperties.get(
-                        TelephonyMonitorPreferenceController.PROPERTY_TELEPHONY_MONITOR,
-                        TelephonyMonitorPreferenceController.DISABLED_STATUS))).isTrue();
-    }
-
-}
diff --git a/tests/robotests/src/com/android/settings/development/TetheringHardwareAccelPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/TetheringHardwareAccelPreferenceControllerTest.java
new file mode 100644
index 0000000..43798c0
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/development/TetheringHardwareAccelPreferenceControllerTest.java
@@ -0,0 +1,119 @@
+/*
+ * Copyright (C) 2017 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF 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 static com.google.common.truth.Truth.assertThat;
+
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+import android.content.Context;
+import android.provider.Settings;
+import android.support.v14.preference.SwitchPreference;
+import android.support.v7.preference.PreferenceScreen;
+
+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_O)
+public class TetheringHardwareAccelPreferenceControllerTest {
+
+    @Mock
+    private SwitchPreference mPreference;
+    @Mock
+    private PreferenceScreen mPreferenceScreen;
+
+    private Context mContext;
+    private TetheringHardwareAccelPreferenceController mController;
+
+    @Before
+    public void setup() {
+        MockitoAnnotations.initMocks(this);
+        mContext = RuntimeEnvironment.application;
+        mController = new TetheringHardwareAccelPreferenceController(mContext);
+        when(mPreferenceScreen.findPreference(mController.getPreferenceKey())).thenReturn(
+                mPreference);
+        mController.displayPreference(mPreferenceScreen);
+    }
+
+    @Test
+    public void onPreferenceChanged_settingEnabled_turnOnTetheringAccel() {
+        mController.onPreferenceChange(mPreference, true /* new value */);
+
+        final int mode = Settings.System.getInt(mContext.getContentResolver(),
+                Settings.Global.TETHER_OFFLOAD_DISABLED, -1 /* default */);
+
+        assertThat(mode).isEqualTo(TetheringHardwareAccelPreferenceController.SETTING_VALUE_ON);
+    }
+
+    @Test
+    public void onPreferenceChanged_settingDisabled_turnOffTetheringAccel() {
+        mController.onPreferenceChange(mPreference, false /* new value */);
+
+        final int mode = Settings.System.getInt(mContext.getContentResolver(),
+                Settings.Global.TETHER_OFFLOAD_DISABLED, -1 /* default */);
+
+        assertThat(mode).isEqualTo(TetheringHardwareAccelPreferenceController.SETTING_VALUE_OFF);
+    }
+
+    @Test
+    public void updateState_settingEnabled_preferenceShouldBeChecked() {
+        Settings.System.putInt(mContext.getContentResolver(),
+                Settings.Global.TETHER_OFFLOAD_DISABLED,
+                TetheringHardwareAccelPreferenceController.SETTING_VALUE_ON);
+        mController.updateState(mPreference);
+
+        verify(mPreference).setChecked(true);
+    }
+
+    @Test
+    public void updateState_settingDisabled_preferenceShouldNotBeChecked() {
+        Settings.System.putInt(mContext.getContentResolver(),
+                Settings.Global.TETHER_OFFLOAD_DISABLED,
+                TetheringHardwareAccelPreferenceController.SETTING_VALUE_OFF);
+        mController.updateState(mPreference);
+
+        verify(mPreference).setChecked(false);
+    }
+
+    @Test
+    public void onDeveloperOptionsSwitchDisabled_shouldDisablePreference() {
+        mController.onDeveloperOptionsSwitchDisabled();
+        final int mode = Settings.System.getInt(mContext.getContentResolver(),
+                Settings.Global.TETHER_OFFLOAD_DISABLED, -1 /* default */);
+
+        assertThat(mode).isEqualTo(TetheringHardwareAccelPreferenceController.SETTING_VALUE_OFF);
+        verify(mPreference).setEnabled(false);
+        verify(mPreference).setChecked(false);
+    }
+
+    @Test
+    public void onDeveloperOptionsSwitchEnabled_shouldEnablePreference() {
+        mController.onDeveloperOptionsSwitchEnabled();
+
+        verify(mPreference).setEnabled(true);
+    }
+}
diff --git a/tests/robotests/src/com/android/settings/development/TransitionAnimationScalePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/TransitionAnimationScalePreferenceControllerTest.java
new file mode 100644
index 0000000..5da1abc
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/development/TransitionAnimationScalePreferenceControllerTest.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.development;
+
+import static com.android.settings.development.TransitionAnimationScalePreferenceController
+        .DEFAULT_VALUE;
+import static com.android.settings.development.TransitionAnimationScalePreferenceController
+        .TRANSITION_ANIMATION_SCALE_SELECTOR;
+
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+import android.content.Context;
+import android.os.RemoteException;
+import android.support.v7.preference.ListPreference;
+import android.support.v7.preference.PreferenceScreen;
+import android.view.IWindowManager;
+
+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.RuntimeEnvironment;
+import org.robolectric.annotation.Config;
+import org.robolectric.util.ReflectionHelpers;
+
+@RunWith(SettingsRobolectricTestRunner.class)
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION_O)
+public class TransitionAnimationScalePreferenceControllerTest {
+
+    @Mock
+    private ListPreference mPreference;
+    @Mock
+    private PreferenceScreen mScreen;
+    @Mock
+    private IWindowManager mWindowManager;
+
+    /**
+     * 0: Animation off
+     * 1: Animation scale .5x
+     * 2: Animation scale 1x
+     * 3: Animation scale 1.5x
+     * 4: Animation scale 2x
+     * 5: Animation scale 5x
+     * 6: Animation scale 10x
+     */
+    private String[] mListValues;
+    private String[] mListSummaries;
+    private Context mContext;
+    private TransitionAnimationScalePreferenceController mController;
+
+    @Before
+    public void setup() {
+        MockitoAnnotations.initMocks(this);
+        mContext = RuntimeEnvironment.application;
+        mListValues = mContext.getResources().getStringArray(
+                R.array.transition_animation_scale_values);
+        mListSummaries = mContext.getResources().getStringArray(
+                R.array.transition_animation_scale_entries);
+        mController = new TransitionAnimationScalePreferenceController(mContext);
+        ReflectionHelpers.setField(mController, "mWindowManager", mWindowManager);
+        when(mScreen.findPreference(mController.getPreferenceKey())).thenReturn(mPreference);
+        mController.displayPreference(mScreen);
+    }
+
+    @Test
+    public void onPreferenceChange_noValueSet_shouldSetDefault() throws RemoteException {
+        mController.onPreferenceChange(mPreference, null /* new value */);
+
+        verify(mWindowManager).setAnimationScale(TRANSITION_ANIMATION_SCALE_SELECTOR,
+                DEFAULT_VALUE);
+    }
+
+    @Test
+    public void onPreferenceChange_option5Selected_shouldSetOption5() throws RemoteException {
+        mController.onPreferenceChange(mPreference, mListValues[5]);
+
+        verify(mWindowManager).setAnimationScale(TRANSITION_ANIMATION_SCALE_SELECTOR,
+                Float.valueOf(mListValues[5]));
+    }
+
+    @Test
+    public void updateState_option5Set_shouldUpdatePreferenceToOption5() throws RemoteException {
+        when(mWindowManager.getAnimationScale(TRANSITION_ANIMATION_SCALE_SELECTOR)).thenReturn(
+                Float.valueOf(mListValues[5]));
+
+        mController.updateState(mPreference);
+
+        verify(mPreference).setValue(mListValues[5]);
+        verify(mPreference).setSummary(mListSummaries[5]);
+    }
+
+    @Test
+    public void updateState_option3Set_shouldUpdatePreferenceToOption3() throws RemoteException {
+        when(mWindowManager.getAnimationScale(TRANSITION_ANIMATION_SCALE_SELECTOR)).thenReturn(
+                Float.valueOf(mListValues[3]));
+
+        mController.updateState(mPreference);
+
+        verify(mPreference).setValue(mListValues[3]);
+        verify(mPreference).setSummary(mListSummaries[3]);
+    }
+
+    @Test
+    public void onDeveloperOptionsSwitchDisabled_shouldDisablePreference() throws RemoteException {
+        mController.onDeveloperOptionsSwitchDisabled();
+
+        verify(mWindowManager).setAnimationScale(TRANSITION_ANIMATION_SCALE_SELECTOR,
+                DEFAULT_VALUE);
+        verify(mPreference).setEnabled(false);
+    }
+
+    @Test
+    public void onDeveloperOptionsSwitchEnabled_shouldEnablePreference() throws RemoteException {
+        mController.onDeveloperOptionsSwitchEnabled();
+
+        verify(mPreference).setEnabled(true);
+    }
+}
diff --git a/tests/robotests/src/com/android/settings/development/UsbAudioRoutingPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/UsbAudioRoutingPreferenceControllerTest.java
new file mode 100644
index 0000000..644e7c9
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/development/UsbAudioRoutingPreferenceControllerTest.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.development;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+import android.content.Context;
+import android.provider.Settings;
+import android.support.v14.preference.SwitchPreference;
+import android.support.v7.preference.PreferenceScreen;
+
+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_O)
+public class UsbAudioRoutingPreferenceControllerTest {
+
+    @Mock
+    private PreferenceScreen mScreen;
+    @Mock
+    private SwitchPreference mPreference;
+
+    private Context mContext;
+
+    private UsbAudioRoutingPreferenceController mController;
+
+    @Before
+    public void setUp() {
+        MockitoAnnotations.initMocks(this);
+        mContext = RuntimeEnvironment.application;
+        mController = new UsbAudioRoutingPreferenceController(mContext);
+        when(mScreen.findPreference(mController.getPreferenceKey())).thenReturn(mPreference);
+        mController.displayPreference(mScreen);
+    }
+
+    @Test
+    public void updateState_usbAudioRoutingEnabled_shouldCheckedPreference() {
+        Settings.Secure.putInt(mContext.getContentResolver(),
+                Settings.Secure.USB_AUDIO_AUTOMATIC_ROUTING_DISABLED,
+                UsbAudioRoutingPreferenceController.SETTING_VALUE_ON);
+
+        mController.updateState(mPreference);
+
+        verify(mPreference).setChecked(true);
+    }
+
+    @Test
+    public void updateState_usbAudioRoutingDisabled_shouldUncheckedPreference() {
+        Settings.Secure.putInt(mContext.getContentResolver(),
+                Settings.Secure.USB_AUDIO_AUTOMATIC_ROUTING_DISABLED,
+                UsbAudioRoutingPreferenceController.SETTING_VALUE_OFF);
+
+        mController.updateState(mPreference);
+
+        verify(mPreference).setChecked(false);
+    }
+
+    @Test
+    public void onPreferenceChange_preferenceChecked_shouldEnableUsbAudioRouting() {
+        mController.onPreferenceChange(mPreference, true /* new value */);
+
+        final int usbAudioRoutingMode = Settings.Secure.getInt(mContext.getContentResolver(),
+                Settings.Secure.USB_AUDIO_AUTOMATIC_ROUTING_DISABLED, -1 /* default */);
+
+        assertThat(usbAudioRoutingMode).isEqualTo(
+                UsbAudioRoutingPreferenceController.SETTING_VALUE_ON);
+    }
+
+    @Test
+    public void onPreferenceChange__preferenceUnchecked_shouldDisableUsbAudioRouting() {
+        mController.onPreferenceChange(mPreference, false /* new value */);
+
+        final int usbAudioRoutingMode = Settings.Secure.getInt(mContext.getContentResolver(),
+                Settings.Secure.USB_AUDIO_AUTOMATIC_ROUTING_DISABLED, -1 /* default */);
+
+        assertThat(usbAudioRoutingMode).isEqualTo(
+                UsbAudioRoutingPreferenceController.SETTING_VALUE_OFF);
+    }
+
+    @Test
+    public void onDeveloperOptionsSwitchEnabled_preferenceShouldBeEnabled() {
+        mController.onDeveloperOptionsSwitchEnabled();
+
+        verify(mPreference).setEnabled(true);
+    }
+
+    @Test
+    public void onDeveloperOptionsSwitchDisabled_preferenceShouldBeEnabled() {
+        mController.onDeveloperOptionsSwitchDisabled();
+
+        final int usbAudioRoutingMode = Settings.Secure.getInt(mContext.getContentResolver(),
+                Settings.Secure.USB_AUDIO_AUTOMATIC_ROUTING_DISABLED, -1 /* default */);
+
+        assertThat(usbAudioRoutingMode).isEqualTo(
+                UsbAudioRoutingPreferenceController.SETTING_VALUE_OFF);
+        verify(mPreference).setEnabled(false);
+        verify(mPreference).setChecked(false);
+    }
+}
diff --git a/tests/robotests/src/com/android/settings/development/VerifyAppsOverUsbPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/VerifyAppsOverUsbPreferenceControllerTest.java
index 45e457b..4585b6d 100644
--- a/tests/robotests/src/com/android/settings/development/VerifyAppsOverUsbPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/development/VerifyAppsOverUsbPreferenceControllerTest.java
@@ -15,6 +15,8 @@
  */
 package com.android.settings.development;
 
+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;
@@ -25,34 +27,35 @@
 
 import android.content.Context;
 import android.content.Intent;
-import android.content.pm.PackageManager;
 import android.content.pm.ResolveInfo;
+import android.provider.Settings;
 import android.provider.Settings.Global;
 import android.support.v7.preference.PreferenceScreen;
 
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settingslib.RestrictedLockUtils.EnforcedAdmin;
 import com.android.settingslib.RestrictedSwitchPreference;
+import com.android.settingslib.wrapper.PackageManagerWrapper;
 
 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 org.robolectric.util.ReflectionHelpers;
 
 import java.util.Collections;
 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_O)
 public class VerifyAppsOverUsbPreferenceControllerTest {
 
     @Mock
-    private PackageManager mPackageManager;
+    private PackageManagerWrapper mPackageManager;
     @Mock
     private PreferenceScreen mScreen;
     @Mock
@@ -72,18 +75,19 @@
             return this;
         }
     }
+
     private final GlobalSetter mGlobals = new GlobalSetter();
 
     @Before
     public void setUp() {
         MockitoAnnotations.initMocks(this);
-        final ShadowApplication shadowContext = ShadowApplication.getInstance();
-        mContext = spy(shadowContext.getApplicationContext());
+        mContext = RuntimeEnvironment.application;
         when(mScreen.findPreference(anyString())).thenReturn(mPreference);
-        when(mContext.getPackageManager()).thenReturn(mPackageManager);
         mController = new VerifyAppsOverUsbPreferenceController(mContext);
         ReflectionHelpers.setField(
                 mController, "mRestrictedLockUtils", mRestrictedLockUtilsDelegate);
+        ReflectionHelpers.setField(mController, "mPackageManager", mPackageManager);
+        mController.displayPreference(mScreen);
     }
 
     private void setupVerifyBroadcastReceivers(boolean nonEmpty) {
@@ -100,78 +104,108 @@
     }
 
     @Test
-    public void updateState_preferenceCheckedWhenSettingIsOn() {
+    public void updateState_settingEnabled_preferenceShouldBeChecked() {
         setupVerifyBroadcastReceivers(true);
         setupEnforcedAdmin(null);
-        mGlobals.set(Global.ADB_ENABLED, 1).set(Global.PACKAGE_VERIFIER_INCLUDE_ADB, 1);
-        mController.displayPreference(mScreen);
-        mController.updatePreference();
+        mGlobals.set(Global.ADB_ENABLED, 1 /* setting enabled */)
+                .set(Global.PACKAGE_VERIFIER_INCLUDE_ADB, 1 /* setting enabled */);
+        mController.updateState(mPreference);
         verify(mPreference).setChecked(true);
     }
 
     @Test
-    public void updateState_preferenceUncheckedWhenSettingIsOff() {
+    public void updateState_settingDisabled_preferenceShouldNotBeChecked() {
         setupVerifyBroadcastReceivers(true);
         setupEnforcedAdmin(null);
-        mGlobals.set(Global.ADB_ENABLED, 1).set(Global.PACKAGE_VERIFIER_INCLUDE_ADB, 0);
-        mController.displayPreference(mScreen);
-        mController.updatePreference();
+        mGlobals.set(Global.ADB_ENABLED, 1 /* setting enabled */)
+                .set(Global.PACKAGE_VERIFIER_INCLUDE_ADB, 0 /* setting disabled */);
+        mController.updateState(mPreference);
         verify(mPreference).setChecked(false);
     }
 
     @Test
-    public void updateState_preferenceUncheckedWhenNoAdb() {
+    public void updateState_adbDisabled_preferenceShouldNotBeChecked() {
         setupVerifyBroadcastReceivers(true);
         setupEnforcedAdmin(null);
-        mGlobals.set(Global.ADB_ENABLED, 0).set(Global.PACKAGE_VERIFIER_INCLUDE_ADB, 1);
-        mController.displayPreference(mScreen);
-        mController.updatePreference();
+        mGlobals.set(Global.ADB_ENABLED, 0 /* setting disabled */)
+                .set(Global.PACKAGE_VERIFIER_INCLUDE_ADB, 1 /* setting enabled */);
+        mController.updateState(mPreference);
         verify(mPreference).setChecked(false);
     }
 
     @Test
-    public void updateState_preferenceUncheckedWhenVerifierIsOff() {
+    public void updateState_verifierOff_preferenceShouldNotBeChecked() {
         setupVerifyBroadcastReceivers(true);
         setupEnforcedAdmin(null);
-        mGlobals.set(Global.ADB_ENABLED, 1)
-                .set(Global.PACKAGE_VERIFIER_INCLUDE_ADB, 1)
-                .set(Global.PACKAGE_VERIFIER_ENABLE, 0);
-        mController.displayPreference(mScreen);
-        mController.updatePreference();
+        mGlobals.set(Global.ADB_ENABLED, 1 /* setting enabled */)
+                .set(Global.PACKAGE_VERIFIER_INCLUDE_ADB, 1 /* setting enabled */)
+                .set(Global.PACKAGE_VERIFIER_ENABLE, 0 /* setting disabled */);
+        mController.updateState(mPreference);
         verify(mPreference).setChecked(false);
     }
 
     @Test
-    public void updateState_preferenceUncheckedWhenNoVerifyBroadcastReceivers() {
+    public void updateState_noBroadcastReceivers_preferenceShouldNotBeChecked() {
         setupVerifyBroadcastReceivers(false);
         setupEnforcedAdmin(null);
-        mGlobals.set(Global.ADB_ENABLED, 1)
-                .set(Global.PACKAGE_VERIFIER_INCLUDE_ADB, 1);
-        mController.displayPreference(mScreen);
-        mController.updatePreference();
+        mGlobals.set(Global.ADB_ENABLED, 1 /* setting enabled */)
+                .set(Global.PACKAGE_VERIFIER_INCLUDE_ADB, 1 /* setting enabled */);
+        mController.updateState(mPreference);
         verify(mPreference).setChecked(false);
     }
 
     @Test
-    public void updateState_preferenceDisabledWhenRestrictedByAdmin() {
+    public void updateState_restrictedByAdmin_preferenceShouldBeDisabled() {
         setupVerifyBroadcastReceivers(true);
         final EnforcedAdmin admin = new EnforcedAdmin();
         setupEnforcedAdmin(admin);
-        mGlobals.set(Global.ADB_ENABLED, 1)
-                .set(Global.PACKAGE_VERIFIER_INCLUDE_ADB, 1);
-        mController.displayPreference(mScreen);
-        mController.updatePreference();
+        mGlobals.set(Global.ADB_ENABLED, 1 /* setting enabled */)
+                .set(Global.PACKAGE_VERIFIER_INCLUDE_ADB, 1 /* setting enabled */);
+        mController.updateState(mPreference);
         verify(mPreference).setDisabledByAdmin(admin);
     }
 
     @Test
-    public void updateState_preferenceRemovedWhenVerifierSettingsVisibleIsOff() {
+    public void isAvailable_verifierNotVisible_shouldReturnFalse() {
         setupVerifyBroadcastReceivers(true);
-        mGlobals.set(Global.PACKAGE_VERIFIER_SETTING_VISIBLE, 0);
-        when(mPreference.getKey()).thenReturn(mController.getPreferenceKey());
-        when(mScreen.getPreferenceCount()).thenReturn(1);
-        when(mScreen.getPreference(anyInt())).thenReturn(mPreference);
-        mController.displayPreference(mScreen);
-        verify(mScreen).removePreference(mPreference);
+        mGlobals.set(Global.PACKAGE_VERIFIER_SETTING_VISIBLE, 0 /* setting disabled */);
+
+        assertThat(mController.isAvailable()).isFalse();
+    }
+
+    @Test
+    public void isAvailable_verifierVisible_shouldReturnTrue() {
+        setupVerifyBroadcastReceivers(true);
+        mGlobals.set(Global.PACKAGE_VERIFIER_SETTING_VISIBLE, 1 /* setting enabled */);
+
+        assertThat(mController.isAvailable()).isTrue();
+    }
+
+    @Test
+    public void onPreferenceChange_settingEnabled_shouldEnableUsbVerify() {
+        mController.onPreferenceChange(mPreference, true /* new value */);
+
+        final int mode = Settings.Global.getInt(mContext.getContentResolver(),
+                android.provider.Settings.Global.PACKAGE_VERIFIER_INCLUDE_ADB, -1 /* default */);
+
+        assertThat(mode).isEqualTo(VerifyAppsOverUsbPreferenceController.SETTING_VALUE_ON);
+    }
+
+    @Test
+    public void onPreferenceChange_settingDisabled_shouldDisableUsbVerify() {
+        mController.onPreferenceChange(mPreference, false /* new value */);
+
+        final int mode = Settings.Global.getInt(mContext.getContentResolver(),
+                android.provider.Settings.Global.PACKAGE_VERIFIER_INCLUDE_ADB, -1 /* default */);
+
+        assertThat(mode).isEqualTo(VerifyAppsOverUsbPreferenceController.SETTING_VALUE_OFF);
+    }
+
+    @Test
+    public void onDeveloperOptionsEnabled_shouldUpdateState() {
+        mController = spy(mController);
+        mController.onDeveloperOptionsSwitchEnabled();
+
+        verify(mController).updateState(mPreference);
     }
 }
\ No newline at end of file
diff --git a/tests/robotests/src/com/android/settings/development/WaitForDebuggerPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/WaitForDebuggerPreferenceControllerTest.java
new file mode 100644
index 0000000..1d7f3f7
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/development/WaitForDebuggerPreferenceControllerTest.java
@@ -0,0 +1,202 @@
+/*
+ * Copyright (C) 2017 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF 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 static com.android.settings.development.DevelopmentOptionsActivityRequestCodes
+        .REQUEST_CODE_DEBUG_APP;
+import static com.android.settings.development.WaitForDebuggerPreferenceController
+        .SETTING_VALUE_OFF;
+import static com.android.settings.development.WaitForDebuggerPreferenceController.SETTING_VALUE_ON;
+
+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.app.IActivityManager;
+import android.content.Context;
+import android.content.Intent;
+import android.os.RemoteException;
+import android.provider.Settings;
+import android.support.v14.preference.SwitchPreference;
+import android.support.v7.preference.PreferenceScreen;
+
+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_O)
+public class WaitForDebuggerPreferenceControllerTest {
+
+    @Mock
+    private SwitchPreference mPreference;
+    @Mock
+    private PreferenceScreen mPreferenceScreen;
+    @Mock
+    private IActivityManager mIActivityManager;
+
+    private Context mContext;
+    private WaitForDebuggerPreferenceController mController;
+
+    @Before
+    public void setup() {
+        MockitoAnnotations.initMocks(this);
+        mContext = RuntimeEnvironment.application;
+        mController = spy(new WaitForDebuggerPreferenceController(mContext));
+        doReturn(mIActivityManager).when(mController).getActivityManagerService();
+        when(mPreferenceScreen.findPreference(mController.getPreferenceKey())).thenReturn(
+                mPreference);
+        mController.displayPreference(mPreferenceScreen);
+    }
+
+    @Test
+    public void onPreferenceChange_settingEnabledFoobarApp_waitForDebuggerShouldBeOn()
+            throws RemoteException {
+        final String debugApp = "foobar";
+        Settings.Global.putString(mContext.getContentResolver(), Settings.Global.DEBUG_APP,
+                debugApp);
+        mController.onPreferenceChange(mPreference, true /* newValue */);
+
+
+        verify(mIActivityManager).setDebugApp(debugApp,
+                true /* waitForDebugger */, true /* persistent */);
+    }
+
+    @Test
+    public void onPreferenceChange_settingDisabledFoobarApp_waitForDebuggerShouldBeOff()
+            throws RemoteException {
+        final String debugApp = "foobar";
+        Settings.Global.putString(mContext.getContentResolver(), Settings.Global.DEBUG_APP,
+                debugApp);
+        mController.onPreferenceChange(mPreference, false /* newValue */);
+
+        verify(mIActivityManager).setDebugApp(debugApp,
+                false /* waitForDebugger */, true /* persistent */);
+    }
+
+    @Test
+    public void updateState_settingEnabledNullDebugApp_preferenceShouldBeCheckedAndDisabled() {
+        final String debugApp = null;
+        Settings.Global.putString(mContext.getContentResolver(), Settings.Global.DEBUG_APP,
+                debugApp);
+        Settings.Global.putInt(mContext.getContentResolver(), Settings.Global.WAIT_FOR_DEBUGGER,
+                SETTING_VALUE_ON);
+        mController.updateState(mPreference);
+
+        verify(mPreference).setChecked(true);
+        verify(mPreference).setEnabled(false);
+    }
+
+    @Test
+    public void updateState_settingEnabledFoobarApp_preferenceShouldBeCheckedAndDisabled() {
+        final String debugApp = "foobar";
+        Settings.Global.putString(mContext.getContentResolver(), Settings.Global.DEBUG_APP,
+                debugApp);
+        Settings.Global.putInt(mContext.getContentResolver(), Settings.Global.WAIT_FOR_DEBUGGER,
+                SETTING_VALUE_ON);
+        mController.updateState(mPreference);
+
+        verify(mPreference).setChecked(true);
+        verify(mPreference).setEnabled(true);
+    }
+
+    @Test
+    public void updateState_settingDisabledNullDebugApp_preferenceShouldNotBeCheckedAndDisabled() {
+        final String debugApp = null;
+        Settings.Global.putString(mContext.getContentResolver(), Settings.Global.DEBUG_APP,
+                debugApp);
+        Settings.Global.putInt(mContext.getContentResolver(), Settings.Global.WAIT_FOR_DEBUGGER,
+                SETTING_VALUE_OFF);
+        mController.updateState(mPreference);
+
+        verify(mPreference).setChecked(false);
+        verify(mPreference).setEnabled(false);
+    }
+
+    @Test
+    public void updateState_settingDisableFoobarApp_preferenceShouldNotBeCheckedAndEnabled() {
+        final String debugApp = "foobar";
+        Settings.Global.putString(mContext.getContentResolver(), Settings.Global.DEBUG_APP,
+                debugApp);
+        Settings.Global.putInt(mContext.getContentResolver(), Settings.Global.WAIT_FOR_DEBUGGER,
+                SETTING_VALUE_OFF);
+        mController.updateState(mPreference);
+
+        verify(mPreference).setChecked(false);
+        verify(mPreference).setEnabled(true);
+    }
+
+    @Test
+    public void onActivityResult_requestCodeAndSettingEnabled_waitForDebuggerShouldBeChecked() {
+        Intent onActivityResultIntent = new Intent(mContext, AppPicker.class);
+        Settings.Global.putInt(mContext.getContentResolver(), Settings.Global.WAIT_FOR_DEBUGGER,
+                SETTING_VALUE_ON);
+        boolean result = mController.onActivityResult(REQUEST_CODE_DEBUG_APP, Activity.RESULT_OK,
+                onActivityResultIntent);
+
+        assertThat(result).isTrue();
+        verify(mPreference).setChecked(true);
+    }
+
+    @Test
+    public void onActivityResult_requestCodeAndSettingDisabled_waitForDebuggerShouldNotBeChecked() {
+        Intent onActivityResultIntent = new Intent(mContext, AppPicker.class);
+        Settings.Global.putInt(mContext.getContentResolver(), Settings.Global.WAIT_FOR_DEBUGGER,
+                SETTING_VALUE_OFF);
+        boolean result = mController.onActivityResult(REQUEST_CODE_DEBUG_APP, Activity.RESULT_OK,
+                onActivityResultIntent);
+
+        assertThat(result).isTrue();
+        verify(mPreference).setChecked(false);
+    }
+
+    @Test
+    public void onActivityResult_badRequestCode_shouldReturnFalse() {
+        boolean result = mController.onActivityResult(
+                -1 /* request code */, -1 /* result code */, null /* intent */);
+
+        assertThat(result).isFalse();
+    }
+
+    @Test
+    public void onDeveloperOptionsSwitchDisabled_shouldDisablePreference() throws RemoteException {
+        mController.onDeveloperOptionsSwitchDisabled();
+
+        verify(mIActivityManager).setDebugApp(null /* package name */,
+                false /* waitForDebugger */, false /* persistent */);
+        verify(mPreference).setChecked(false);
+        verify(mPreference).setEnabled(false);
+    }
+
+    @Test
+    public void onDeveloperOptionsSwitchEnabled_shouldEnablePreference() {
+        mController.onDeveloperOptionsSwitchEnabled();
+
+        verify(mPreference).setEnabled(true);
+    }
+}
diff --git a/tests/robotests/src/com/android/settings/development/WebViewAppPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/WebViewAppPreferenceControllerTest.java
new file mode 100644
index 0000000..26331b1
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/development/WebViewAppPreferenceControllerTest.java
@@ -0,0 +1,109 @@
+/*
+ * Copyright (C) 2017 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.development;
+
+import static org.mockito.Mockito.doReturn;
+import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+import android.content.Context;
+import android.support.v7.preference.Preference;
+import android.support.v7.preference.PreferenceScreen;
+
+import com.android.settings.R;
+import com.android.settings.TestConfig;
+import com.android.settings.applications.defaultapps.DefaultAppInfo;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
+import com.android.settings.webview.WebViewUpdateServiceWrapper;
+import com.android.settingslib.wrapper.PackageManagerWrapper;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.mockito.MockitoAnnotations;
+import org.robolectric.RuntimeEnvironment;
+import org.robolectric.annotation.Config;
+import org.robolectric.util.ReflectionHelpers;
+
+@RunWith(SettingsRobolectricTestRunner.class)
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION_O)
+public class WebViewAppPreferenceControllerTest {
+
+    @Mock
+    private PreferenceScreen mPreferenceScreen;
+    @Mock
+    private PackageManagerWrapper mPackageManager;
+    @Mock
+    private WebViewUpdateServiceWrapper mWebViewUpdateServiceWrapper;
+    @Mock
+    private Preference mPreference;
+    @Mock
+    private DefaultAppInfo mAppInfo;
+
+    private Context mContext;
+    private WebViewAppPreferenceController mController;
+
+    @Before
+    public void setup() {
+        MockitoAnnotations.initMocks(this);
+        mContext = RuntimeEnvironment.application;
+        mController = spy(new WebViewAppPreferenceController(mContext));
+        ReflectionHelpers.setField(mController, "mPackageManager", mPackageManager);
+        ReflectionHelpers.setField(mController, "mWebViewUpdateServiceWrapper",
+                mWebViewUpdateServiceWrapper);
+        doReturn(mAppInfo).when(mController).getDefaultAppInfo();
+        when(mPreferenceScreen.findPreference(mController.getPreferenceKey())).thenReturn(
+                mPreference);
+        mController.displayPreference(mPreferenceScreen);
+    }
+
+    @Test
+    public void updateState_hasAppLabel_shouldSetAppLabelAndIcon() {
+        final String appLabel = "SomeRandomAppLabel!!!";
+        when(mAppInfo.loadLabel()).thenReturn(appLabel);
+
+        mController.updateState(mPreference);
+
+        verify(mPreference).setSummary(appLabel);
+    }
+
+    @Test
+    public void updateState_noAppLabel_shouldSetAppDefaultLabelAndNullIcon() {
+        final String appLabel = null;
+        when(mAppInfo.loadLabel()).thenReturn(appLabel);
+
+        mController.updateState(mPreference);
+
+        verify(mPreference).setSummary(R.string.app_list_preference_none);
+    }
+
+    @Test
+    public void onDeveloperOptionsSwitchDisabled_preferenceShouldBeDisabled() {
+        mController.onDeveloperOptionsSwitchDisabled();
+
+        verify(mPreference).setEnabled(false);
+    }
+
+    @Test
+    public void onDeveloperOptionsSwitchEnabled_preferenceShouldBeEnabled() {
+        mController.onDeveloperOptionsSwitchEnabled();
+
+        verify(mPreference).setEnabled(true);
+    }
+}
diff --git a/tests/robotests/src/com/android/settings/development/WifiAggressiveHandoverPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/WifiAggressiveHandoverPreferenceControllerTest.java
new file mode 100644
index 0000000..57b6e1d
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/development/WifiAggressiveHandoverPreferenceControllerTest.java
@@ -0,0 +1,112 @@
+/*
+ * Copyright (C) 2017 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.development;
+
+import static com.android.settings.development.WifiAggressiveHandoverPreferenceController
+        .SETTING_VALUE_OFF;
+import static com.android.settings.development.WifiAggressiveHandoverPreferenceController
+        .SETTING_VALUE_ON;
+
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+import android.content.Context;
+import android.net.wifi.WifiManager;
+import android.support.v14.preference.SwitchPreference;
+import android.support.v7.preference.PreferenceScreen;
+
+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_O)
+public class WifiAggressiveHandoverPreferenceControllerTest {
+
+    @Mock
+    private Context mContext;
+    @Mock
+    private WifiManager mWifiManager;
+    @Mock
+    private SwitchPreference mPreference;
+    @Mock
+    private PreferenceScreen mPreferenceScreen;
+
+    private WifiAggressiveHandoverPreferenceController mController;
+
+    @Before
+    public void setup() {
+        MockitoAnnotations.initMocks(this);
+        when(mContext.getSystemService(Context.WIFI_SERVICE)).thenReturn(mWifiManager);
+        mController = new WifiAggressiveHandoverPreferenceController(mContext);
+        when(mPreferenceScreen.findPreference(mController.getPreferenceKey())).thenReturn(
+                mPreference);
+        mController.displayPreference(mPreferenceScreen);
+    }
+
+    @Test
+    public void onPreferenceChange_settingEnabled_shouldEnableAggressiveHandover() {
+        mController.onPreferenceChange(mPreference, true /* new value */);
+
+        verify(mWifiManager).enableAggressiveHandover(SETTING_VALUE_ON);
+    }
+
+    @Test
+    public void onPreferenceChange_settingDisabled_shouldDisableAggressiveHandover() {
+        mController.onPreferenceChange(mPreference, false /* new value */);
+
+        verify(mWifiManager).enableAggressiveHandover(SETTING_VALUE_OFF);
+    }
+
+    @Test
+    public void updateState_settingEnabled_shouldEnablePreference() {
+        when(mWifiManager.getAggressiveHandover()).thenReturn(1);
+        mController.updateState(mPreference);
+
+        verify(mPreference).setChecked(true);
+    }
+
+    @Test
+    public void updateState_settingDisabled_shouldDisablePreference() {
+        when(mWifiManager.getAggressiveHandover()).thenReturn(0);
+        mController.updateState(mPreference);
+
+        verify(mPreference).setChecked(false);
+    }
+
+    @Test
+    public void onDeveloperOptionsSwitchEnabled_shouldEnablePreference() {
+        mController.onDeveloperOptionsSwitchEnabled();
+
+        verify(mPreference).setEnabled(true);
+    }
+
+    @Test
+    public void onDeveloperOptionsSwitchDisabled_shouldDisablePreference() {
+        mController.onDeveloperOptionsSwitchDisabled();
+
+        verify(mWifiManager).enableAggressiveHandover(SETTING_VALUE_OFF);
+        verify(mPreference).setEnabled(false);
+        verify(mPreference).setChecked(false);
+    }
+}
diff --git a/tests/robotests/src/com/android/settings/development/WifiDisplayCertificationPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/WifiDisplayCertificationPreferenceControllerTest.java
new file mode 100644
index 0000000..9ca9b55d
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/development/WifiDisplayCertificationPreferenceControllerTest.java
@@ -0,0 +1,119 @@
+/*
+ * Copyright (C) 2017 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF 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 static com.google.common.truth.Truth.assertThat;
+
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+import android.content.Context;
+import android.provider.Settings;
+import android.support.v14.preference.SwitchPreference;
+import android.support.v7.preference.PreferenceScreen;
+
+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_O)
+public class WifiDisplayCertificationPreferenceControllerTest {
+
+    @Mock
+    private SwitchPreference mPreference;
+    @Mock
+    private PreferenceScreen mPreferenceScreen;
+
+    private Context mContext;
+    private WifiDisplayCertificationPreferenceController mController;
+
+    @Before
+    public void setup() {
+        MockitoAnnotations.initMocks(this);
+        mContext = RuntimeEnvironment.application;
+        mController = new WifiDisplayCertificationPreferenceController(mContext);
+        when(mPreferenceScreen.findPreference(mController.getPreferenceKey())).thenReturn(
+                mPreference);
+        mController.displayPreference(mPreferenceScreen);
+    }
+
+    @Test
+    public void onPreferenceChanged_turnOnWifiDisplayCertification() {
+        mController.onPreferenceChange(mPreference, true /* new value */);
+
+        final int mode = Settings.System.getInt(mContext.getContentResolver(),
+                Settings.Global.WIFI_DISPLAY_CERTIFICATION_ON, -1 /* default */);
+
+        assertThat(mode).isEqualTo(WifiDisplayCertificationPreferenceController.SETTING_VALUE_ON);
+    }
+
+    @Test
+    public void onPreferenceChanged_turnOffWifiDisplayCertification() {
+        mController.onPreferenceChange(mPreference, false /* new value */);
+
+        final int mode = Settings.System.getInt(mContext.getContentResolver(),
+                Settings.Global.WIFI_DISPLAY_CERTIFICATION_ON, -1 /* default */);
+
+        assertThat(mode).isEqualTo(WifiDisplayCertificationPreferenceController.SETTING_VALUE_OFF);
+    }
+
+    @Test
+    public void updateState_preferenceShouldBeChecked() {
+        Settings.System.putInt(mContext.getContentResolver(),
+                Settings.Global.WIFI_DISPLAY_CERTIFICATION_ON,
+                WifiDisplayCertificationPreferenceController.SETTING_VALUE_ON);
+        mController.updateState(mPreference);
+
+        verify(mPreference).setChecked(true);
+    }
+
+    @Test
+    public void updateState_preferenceShouldNotBeChecked() {
+        Settings.System.putInt(mContext.getContentResolver(),
+                Settings.Global.WIFI_DISPLAY_CERTIFICATION_ON,
+                WifiDisplayCertificationPreferenceController.SETTING_VALUE_OFF);
+        mController.updateState(mPreference);
+
+        verify(mPreference).setChecked(false);
+    }
+
+    @Test
+    public void onDeveloperOptionsDisabled_shouldDisablePreference() {
+        mController.onDeveloperOptionsDisabled();
+        final int mode = Settings.System.getInt(mContext.getContentResolver(),
+                Settings.Global.WIFI_DISPLAY_CERTIFICATION_ON, -1 /* default */);
+
+        assertThat(mode).isEqualTo(WifiDisplayCertificationPreferenceController.SETTING_VALUE_OFF);
+        verify(mPreference).setEnabled(false);
+        verify(mPreference).setChecked(false);
+    }
+
+    @Test
+    public void onDeveloperOptionsEnabled_shouldEnablePreference() {
+        mController.onDeveloperOptionsEnabled();
+
+        verify(mPreference).setEnabled(true);
+    }
+}
diff --git a/tests/robotests/src/com/android/settings/development/WifiRoamScansPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/WifiRoamScansPreferenceControllerTest.java
new file mode 100644
index 0000000..a7a6608
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/development/WifiRoamScansPreferenceControllerTest.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.development;
+
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+import android.content.Context;
+import android.net.wifi.WifiManager;
+import android.support.v14.preference.SwitchPreference;
+import android.support.v7.preference.PreferenceScreen;
+
+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_O)
+public class WifiRoamScansPreferenceControllerTest {
+
+    @Mock
+    private Context mContext;
+    @Mock
+    private WifiManager mWifiManager;
+    @Mock
+    private SwitchPreference mPreference;
+    @Mock
+    private PreferenceScreen mPreferenceScreen;
+
+    private WifiRoamScansPreferenceController mController;
+
+    @Before
+    public void setup() {
+        MockitoAnnotations.initMocks(this);
+        when(mContext.getSystemService(Context.WIFI_SERVICE)).thenReturn(mWifiManager);
+        mController = new WifiRoamScansPreferenceController(mContext);
+        when(mPreferenceScreen.findPreference(mController.getPreferenceKey())).thenReturn(
+                mPreference);
+        mController.displayPreference(mPreferenceScreen);
+    }
+
+    @Test
+    public void onPreferenceChange_shouldEnableRoamScanning() {
+        mController.onPreferenceChange(mPreference, true /* new value */);
+
+        verify(mWifiManager).setAllowScansWithTraffic(
+                WifiRoamScansPreferenceController.SETTING_VALUE_ON);
+    }
+
+    @Test
+    public void onPreferenceChange_shouldDisableRoamScanning() {
+        mController.onPreferenceChange(mPreference, false /* new value */);
+
+        verify(mWifiManager).setAllowScansWithTraffic(
+                WifiRoamScansPreferenceController.SETTING_VALUE_OFF);
+    }
+
+    @Test
+    public void updateState_shouldEnablePreference() {
+        when(mWifiManager.getAllowScansWithTraffic()).thenReturn(1);
+        mController.updateState(mPreference);
+
+        verify(mPreference).setChecked(true);
+    }
+
+    @Test
+    public void updateState_shouldDisablePreference() {
+        when(mWifiManager.getAllowScansWithTraffic()).thenReturn(0);
+        mController.updateState(mPreference);
+
+        verify(mPreference).setChecked(false);
+    }
+
+    @Test
+    public void onDeveloperOptionsSwitchEnabled_shouldEnablePreference() {
+        mController.onDeveloperOptionsSwitchEnabled();
+
+        verify(mPreference).setEnabled(true);
+    }
+
+    @Test
+    public void onDeveloperOptionsSwitchDisabled_shouldDisablePreference() {
+        mController.onDeveloperOptionsSwitchDisabled();
+
+        verify(mWifiManager).setAllowScansWithTraffic(
+                WifiRoamScansPreferenceController.SETTING_VALUE_OFF);
+        verify(mPreference).setEnabled(false);
+        verify(mPreference).setChecked(false);
+    }
+}
diff --git a/tests/robotests/src/com/android/settings/development/WifiVerboseLoggingPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/WifiVerboseLoggingPreferenceControllerTest.java
new file mode 100644
index 0000000..09a5e9c
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/development/WifiVerboseLoggingPreferenceControllerTest.java
@@ -0,0 +1,109 @@
+/*
+ * Copyright (C) 2017 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.development;
+
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+import android.content.Context;
+import android.net.wifi.WifiManager;
+import android.support.v14.preference.SwitchPreference;
+import android.support.v7.preference.PreferenceScreen;
+
+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_O)
+public class WifiVerboseLoggingPreferenceControllerTest {
+    @Mock
+    private Context mContext;
+    @Mock
+    private WifiManager mWifiManager;
+    @Mock
+    private SwitchPreference mPreference;
+    @Mock
+    private PreferenceScreen mPreferenceScreen;
+
+    private WifiVerboseLoggingPreferenceController mController;
+
+    @Before
+    public void setup() {
+        MockitoAnnotations.initMocks(this);
+        when(mContext.getSystemService(Context.WIFI_SERVICE)).thenReturn(mWifiManager);
+        mController = new WifiVerboseLoggingPreferenceController(mContext);
+        when(mPreferenceScreen.findPreference(mController.getPreferenceKey())).thenReturn(
+                mPreference);
+        mController.displayPreference(mPreferenceScreen);
+    }
+
+    @Test
+    public void onPreferenceChange_settingEnabled_shouldEnableVerboseLogging() {
+        mController.onPreferenceChange(mPreference, true /* new value */);
+
+        verify(mWifiManager).enableVerboseLogging(
+                WifiVerboseLoggingPreferenceController.SETTING_VALUE_ON);
+    }
+
+    @Test
+    public void onPreferenceChange_settingDisabled_shouldDisablVerboseLogging() {
+        mController.onPreferenceChange(mPreference, false /* new value */);
+
+        verify(mWifiManager).enableVerboseLogging(
+                WifiVerboseLoggingPreferenceController.SETTING_VALUE_OFF);
+    }
+
+    @Test
+    public void updateState_settingEnabled_shouldEnablePreference() {
+        when(mWifiManager.getVerboseLoggingLevel()).thenReturn(1);
+        mController.updateState(mPreference);
+
+        verify(mPreference).setChecked(true);
+    }
+
+    @Test
+    public void updateState_settingDisabled_shouldDisablePreference() {
+        when(mWifiManager.getVerboseLoggingLevel()).thenReturn(0);
+        mController.updateState(mPreference);
+
+        verify(mPreference).setChecked(false);
+    }
+
+    @Test
+    public void onDeveloperOptionsSwitchEnabled_shouldEnablePreference() {
+        mController.onDeveloperOptionsSwitchEnabled();
+
+        verify(mPreference).setEnabled(true);
+    }
+
+    @Test
+    public void onDeveloperOptionsSwitchDisabled_shouldDisablePreference() {
+        mController.onDeveloperOptionsSwitchDisabled();
+
+        verify(mWifiManager).enableVerboseLogging(
+                WifiVerboseLoggingPreferenceController.SETTING_VALUE_OFF);
+        verify(mPreference).setEnabled(false);
+        verify(mPreference).setChecked(false);
+    }
+}
diff --git a/tests/robotests/src/com/android/settings/development/WindowAnimationScalePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/WindowAnimationScalePreferenceControllerTest.java
new file mode 100644
index 0000000..c7e2258
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/development/WindowAnimationScalePreferenceControllerTest.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.development;
+
+import static com.android.settings.development.WindowAnimationScalePreferenceController
+        .DEFAULT_VALUE;
+import static com.android.settings.development.WindowAnimationScalePreferenceController
+        .WINDOW_ANIMATION_SCALE_SELECTOR;
+
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+import android.content.Context;
+import android.os.RemoteException;
+import android.support.v7.preference.ListPreference;
+import android.support.v7.preference.PreferenceScreen;
+import android.view.IWindowManager;
+
+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.RuntimeEnvironment;
+import org.robolectric.annotation.Config;
+import org.robolectric.util.ReflectionHelpers;
+
+@RunWith(SettingsRobolectricTestRunner.class)
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION_O)
+public class WindowAnimationScalePreferenceControllerTest {
+
+    @Mock
+    private ListPreference mPreference;
+    @Mock
+    private PreferenceScreen mScreen;
+    @Mock
+    private IWindowManager mWindowManager;
+
+    /**
+     * 0: Animation off
+     * 1: Animation scale .5x
+     * 2: Animation scale 1x
+     * 3: Animation scale 1.5x
+     * 4: Animation scale 2x
+     * 5: Animation scale 5x
+     * 6: Animation scale 10x
+     */
+    private String[] mListValues;
+    private String[] mListSummaries;
+    private Context mContext;
+    private WindowAnimationScalePreferenceController mController;
+
+    @Before
+    public void setup() {
+        MockitoAnnotations.initMocks(this);
+        mContext = RuntimeEnvironment.application;
+        mListValues = mContext.getResources().getStringArray(R.array.window_animation_scale_values);
+        mListSummaries = mContext.getResources().getStringArray(
+                R.array.window_animation_scale_entries);
+        mController = new WindowAnimationScalePreferenceController(mContext);
+        ReflectionHelpers.setField(mController, "mWindowManager", mWindowManager);
+        when(mScreen.findPreference(mController.getPreferenceKey())).thenReturn(mPreference);
+        mController.displayPreference(mScreen);
+    }
+
+    @Test
+    public void onPreferenceChange_noValueSet_shouldSetDefault() throws RemoteException {
+        mController.onPreferenceChange(mPreference, null /* new value */);
+
+        verify(mWindowManager).setAnimationScale(WINDOW_ANIMATION_SCALE_SELECTOR, DEFAULT_VALUE);
+    }
+
+    @Test
+    public void onPreferenceChange_option5Selected_shouldSetOption5() throws RemoteException {
+        mController.onPreferenceChange(mPreference, mListValues[5]);
+
+        verify(mWindowManager).setAnimationScale(WINDOW_ANIMATION_SCALE_SELECTOR,
+                Float.valueOf(mListValues[5]));
+    }
+
+    @Test
+    public void updateState_option5Set_shouldUpdatePreferenceToOption5() throws RemoteException {
+        when(mWindowManager.getAnimationScale(WINDOW_ANIMATION_SCALE_SELECTOR)).thenReturn(
+                Float.valueOf(mListValues[5]));
+
+        mController.updateState(mPreference);
+
+        verify(mPreference).setValue(mListValues[5]);
+        verify(mPreference).setSummary(mListSummaries[5]);
+    }
+
+    @Test
+    public void updateState_option3Set_shouldUpdatePreferenceToOption3() throws RemoteException {
+        when(mWindowManager.getAnimationScale(WINDOW_ANIMATION_SCALE_SELECTOR)).thenReturn(
+                Float.valueOf(mListValues[3]));
+
+        mController.updateState(mPreference);
+
+        verify(mPreference).setValue(mListValues[3]);
+        verify(mPreference).setSummary(mListSummaries[3]);
+    }
+
+    @Test
+    public void onDeveloperOptionsSwitchDisabled_shouldDisablePreference() throws RemoteException {
+        mController.onDeveloperOptionsSwitchDisabled();
+
+        verify(mWindowManager).setAnimationScale(WINDOW_ANIMATION_SCALE_SELECTOR, DEFAULT_VALUE);
+        verify(mPreference).setEnabled(false);
+    }
+
+    @Test
+    public void onDeveloperOptionsSwitchEnabled_shouldEnablePreference() throws RemoteException {
+        mController.onDeveloperOptionsSwitchEnabled();
+
+        verify(mPreference).setEnabled(true);
+    }
+}
diff --git a/tests/robotests/src/com/android/settings/development/featureflags/FeatureFlagPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/featureflags/FeatureFlagPreferenceControllerTest.java
new file mode 100644
index 0000000..fabf3b6
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/development/featureflags/FeatureFlagPreferenceControllerTest.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.development.featureflags;
+
+import static android.arch.lifecycle.Lifecycle.Event.ON_START;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import static org.mockito.Matchers.any;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+import android.content.Context;
+import android.support.v7.preference.PreferenceScreen;
+
+import com.android.settings.TestConfig;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
+import com.android.settingslib.core.lifecycle.Lifecycle;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.mockito.MockitoAnnotations;
+import org.robolectric.RuntimeEnvironment;
+import org.robolectric.annotation.Config;
+
+@RunWith(SettingsRobolectricTestRunner.class)
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION_O)
+public class FeatureFlagPreferenceControllerTest {
+
+    @Mock
+    private PreferenceScreen mScreen;
+    private Context mContext;
+    private Lifecycle mLifecycle;
+    private FeatureFlagsPreferenceController mController;
+
+    @Before
+    public void setUp() {
+        MockitoAnnotations.initMocks(this);
+        mContext = RuntimeEnvironment.application;
+        mLifecycle = new Lifecycle(() -> mLifecycle);
+        mController = new FeatureFlagsPreferenceController(mContext, mLifecycle);
+        when(mScreen.getContext()).thenReturn(mContext);
+        mController.displayPreference(mScreen);
+    }
+
+    @Test
+    public void verifyConstants() {
+        assertThat(mController.isAvailable()).isTrue();
+        assertThat(mController.getPreferenceKey()).isNull();
+    }
+
+    @Test
+    public void onStart_shouldRefreshFeatureFlags() {
+        mLifecycle.handleLifecycleEvent(ON_START);
+
+        verify(mScreen).removeAll();
+        verify(mScreen).addPreference(any(FeatureFlagPreference.class));
+    }
+}
diff --git a/tests/robotests/src/com/android/settings/development/featureflags/FeatureFlagPreferenceTest.java b/tests/robotests/src/com/android/settings/development/featureflags/FeatureFlagPreferenceTest.java
new file mode 100644
index 0000000..35ad7e1
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/development/featureflags/FeatureFlagPreferenceTest.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.development.featureflags;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import android.content.Context;
+
+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;
+
+@RunWith(SettingsRobolectricTestRunner.class)
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION_O)
+public class FeatureFlagPreferenceTest {
+
+    private static final String KEY = "feature_key";
+
+    private Context mContext;
+    private FeatureFlagPreference mPreference;
+
+    @Before
+    public void setUp() {
+        mContext = RuntimeEnvironment.application;
+        mPreference = new FeatureFlagPreference(mContext, KEY);
+    }
+
+    @Test
+    public void constructor_shouldSetTitleAndSummary() {
+        assertThat(mPreference.getTitle()).isEqualTo(KEY);
+        assertThat(mPreference.getSummary()).isEqualTo("false");
+        assertThat(mPreference.isChecked()).isFalse();
+    }
+
+    @Test
+    public void toggle_shouldUpdateSummary() {
+        mPreference.setChecked(true);
+
+        assertThat(mPreference.getSummary()).isEqualTo("true");
+        assertThat(mPreference.isChecked()).isTrue();
+    }
+}
diff --git a/tests/robotests/src/com/android/settings/development/featureflags/FeatureFlagsDashboardTest.java b/tests/robotests/src/com/android/settings/development/featureflags/FeatureFlagsDashboardTest.java
new file mode 100644
index 0000000..1fd07c3
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/development/featureflags/FeatureFlagsDashboardTest.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.development.featureflags;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import com.android.internal.logging.nano.MetricsProto;
+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.robolectric.annotation.Config;
+
+@RunWith(SettingsRobolectricTestRunner.class)
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION_O)
+public class FeatureFlagsDashboardTest {
+
+    private FeatureFlagsDashboard mDashboard;
+
+    @Before
+    public void setUp() {
+        mDashboard = new FeatureFlagsDashboard();
+    }
+
+    @Test
+    public void shouldNotHaveHelpResource() {
+        assertThat(mDashboard.getHelpResource()).isEqualTo(0);
+    }
+
+    @Test
+    public void shouldLogAsFeatureFlagPage() {
+        assertThat(mDashboard.getMetricsCategory())
+                .isEqualTo(MetricsProto.MetricsEvent.SETTINGS_FEATURE_FLAGS_DASHBOARD);
+    }
+
+    @Test
+    public void shouldUseFeatureFlagPreferenceLayout() {
+        assertThat(mDashboard.getPreferenceScreenResId())
+                .isEqualTo(R.xml.feature_flags_settings);
+    }
+}
diff --git a/tests/robotests/src/com/android/settings/development/qstile/DevelopmentTilePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/qstile/DevelopmentTilePreferenceControllerTest.java
new file mode 100644
index 0000000..e4c479e
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/development/qstile/DevelopmentTilePreferenceControllerTest.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.development.qstile;
+
+import static com.google.common.truth.Truth.assertThat;
+import static org.mockito.Matchers.any;
+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.content.pm.ResolveInfo;
+import android.content.pm.ServiceInfo;
+import android.service.quicksettings.TileService;
+import android.support.v7.preference.Preference;
+import android.support.v7.preference.PreferenceScreen;
+
+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.RuntimeEnvironment;
+import org.robolectric.Shadows;
+import org.robolectric.annotation.Config;
+import org.robolectric.shadows.ShadowPackageManager;
+
+@RunWith(SettingsRobolectricTestRunner.class)
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION_O)
+public class DevelopmentTilePreferenceControllerTest {
+
+    @Mock
+    private PreferenceScreen mScreen;
+    private Context mContext;
+    private DevelopmentTilePreferenceController mController;
+    private ShadowPackageManager mShadowPackageManager;
+
+    @Before
+    public void setUp() {
+        MockitoAnnotations.initMocks(this);
+        mContext = RuntimeEnvironment.application;
+        mShadowPackageManager = Shadows.shadowOf(mContext.getPackageManager());
+        when(mScreen.getContext()).thenReturn(mContext);
+
+        mController = new DevelopmentTilePreferenceController(mContext);
+        assertThat(mController.getPreferenceKey()).isNull();
+    }
+
+    @Test
+    public void isAlwaysAvailable() {
+        assertThat(mController.isAvailable()).isTrue();
+    }
+
+    @Test
+    public void display_hasTileService_shouldDisplay() {
+        final Intent tileProbe = new Intent(TileService.ACTION_QS_TILE)
+                .setPackage(mContext.getPackageName());
+        final ResolveInfo info = new ResolveInfo();
+        info.serviceInfo = new FakeServiceInfo();
+        info.serviceInfo.name = "abc";
+        info.serviceInfo.icon = R.drawable.ic_settings_24dp;
+        info.serviceInfo.packageName = mContext.getPackageName();
+        mShadowPackageManager.addResolveInfoForIntent(tileProbe, info);
+
+        mController.displayPreference(mScreen);
+
+        verify(mScreen).addPreference(any(Preference.class));
+    }
+
+    public static class FakeServiceInfo extends ServiceInfo {
+
+        public String loadLabel(PackageManager mgr) {
+            return "hi";
+        }
+    }
+
+}
diff --git a/tests/robotests/src/com/android/settings/deviceinfo/BasebandVersionPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/deviceinfo/BasebandVersionPreferenceControllerTest.java
index 3bba438..f71bae6 100644
--- a/tests/robotests/src/com/android/settings/deviceinfo/BasebandVersionPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/deviceinfo/BasebandVersionPreferenceControllerTest.java
@@ -15,35 +15,38 @@
  */
 package com.android.settings.deviceinfo;
 
-import android.content.Context;
+import static com.google.common.truth.Truth.assertThat;
+
+import static org.mockito.Mockito.verify;
+import static org.robolectric.shadow.api.Shadow.extract;
+
 import android.net.ConnectivityManager;
 import android.support.v7.preference.Preference;
 
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
+import com.android.settings.deviceinfo.firmwareversion.BasebandVersionDialogController;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.testutils.shadow.SettingsShadowSystemProperties;
+import com.android.settings.testutils.shadow.ShadowConnectivityManager;
 
 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.Mockito.verify;
-import static org.mockito.Mockito.when;
-
+/**
+ * Deprecated in favor of {@link BasebandVersionDialogController}
+ */
+@Deprecated
 @RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION,
+        shadows = ShadowConnectivityManager.class)
 public class BasebandVersionPreferenceControllerTest {
 
 
-    @Mock(answer = Answers.RETURNS_DEEP_STUBS)
-    private Context mContext;
-    @Mock
-    private ConnectivityManager mCm;
     @Mock
     private Preference mPreference;
 
@@ -52,19 +55,22 @@
     @Before
     public void setUp() {
         MockitoAnnotations.initMocks(this);
-        mController = new BasebandVersionPreferenceController(mContext);
-        when(mContext.getSystemService(Context.CONNECTIVITY_SERVICE)).thenReturn(mCm);
+        mController = new BasebandVersionPreferenceController(RuntimeEnvironment.application);
     }
 
     @Test
     public void isAvailable_wifiOnly_shouldReturnFalse() {
-        when(mCm.isNetworkSupported(ConnectivityManager.TYPE_MOBILE)).thenReturn(false);
+        ShadowConnectivityManager connectivityManager =
+                extract(RuntimeEnvironment.application.getSystemService(ConnectivityManager.class));
+        connectivityManager.setNetworkSupported(ConnectivityManager.TYPE_MOBILE, false);
         assertThat(mController.isAvailable()).isFalse();
     }
 
     @Test
     public void isAvailable_hasMobile_shouldReturnTrue() {
-        when(mCm.isNetworkSupported(ConnectivityManager.TYPE_MOBILE)).thenReturn(true);
+        ShadowConnectivityManager connectivityManager =
+                extract(RuntimeEnvironment.application.getSystemService(ConnectivityManager.class));
+        connectivityManager.setNetworkSupported(ConnectivityManager.TYPE_MOBILE, true);
         assertThat(mController.isAvailable()).isTrue();
     }
 
diff --git a/tests/robotests/src/com/android/settings/deviceinfo/BatteryInfoPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/deviceinfo/BatteryInfoPreferenceControllerTest.java
new file mode 100644
index 0000000..5587f4b
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/deviceinfo/BatteryInfoPreferenceControllerTest.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.deviceinfo;
+
+import static android.arch.lifecycle.Lifecycle.Event.ON_START;
+import static android.arch.lifecycle.Lifecycle.Event.ON_STOP;
+
+import static com.android.settings.deviceinfo.BatteryInfoPreferenceController
+        .BATTERY_INFO_RECEIVER_INTENT_FILTER;
+import static com.android.settings.deviceinfo.BatteryInfoPreferenceController.KEY_BATTERY_LEVEL;
+import static com.android.settings.deviceinfo.BatteryInfoPreferenceController.KEY_BATTERY_STATUS;
+
+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.content.Intent;
+import android.os.BatteryManager;
+import android.support.v7.preference.Preference;
+import android.support.v7.preference.PreferenceScreen;
+
+import com.android.settings.R;
+import com.android.settings.TestConfig;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
+import com.android.settingslib.core.lifecycle.Lifecycle;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.mockito.MockitoAnnotations;
+import org.robolectric.RuntimeEnvironment;
+import org.robolectric.annotation.Config;
+
+@RunWith(SettingsRobolectricTestRunner.class)
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION_O)
+public class BatteryInfoPreferenceControllerTest {
+
+    private Context mContext;
+    @Mock
+    private PreferenceScreen mScreen;
+
+    private Preference mBatteryLevel;
+    private Preference mBatteryStatus;
+    private Lifecycle mLifecycle;
+    private BatteryInfoPreferenceController mController;
+
+
+    @Before
+    public void setUp() {
+        MockitoAnnotations.initMocks(this);
+        mContext = RuntimeEnvironment.application;
+        mLifecycle = new Lifecycle(() -> mLifecycle);
+        mController = new BatteryInfoPreferenceController(mContext, mLifecycle);
+        mBatteryLevel = new Preference(mContext);
+        mBatteryStatus = new Preference(mContext);
+        when(mScreen.findPreference(KEY_BATTERY_STATUS)).thenReturn(mBatteryStatus);
+        when(mScreen.findPreference(KEY_BATTERY_LEVEL)).thenReturn(mBatteryLevel);
+    }
+
+    @Test
+    public void isAlwaysAvailable() {
+        assertThat(mController.getPreferenceKey()).isNull();
+        assertThat(mController.isAvailable()).isTrue();
+    }
+
+    @Test
+    public void runThroughLifecycle_shouldRegisterUnregisterBatteryInfoReceiver() {
+        final Context context = mock(Context.class);
+        mController = new BatteryInfoPreferenceController(context, mLifecycle);
+        mLifecycle.handleLifecycleEvent(ON_START);
+        mLifecycle.handleLifecycleEvent(ON_STOP);
+
+        verify(context).registerReceiver(mController.mBatteryInfoReceiver,
+                BATTERY_INFO_RECEIVER_INTENT_FILTER);
+        verify(context).unregisterReceiver(mController.mBatteryInfoReceiver);
+    }
+
+    @Test
+    public void onReceiveBatteryInfoBroadcast_shouldUpdatePreferences() {
+        mController.displayPreference(mScreen);
+        final Intent intent = new Intent(Intent.ACTION_BATTERY_CHANGED);
+        intent.putExtra(BatteryManager.EXTRA_LEVEL, 50);
+        intent.putExtra(BatteryManager.EXTRA_SCALE, 100);
+        intent.putExtra(BatteryManager.EXTRA_STATUS, BatteryManager.BATTERY_STATUS_CHARGING);
+
+        mController.mBatteryInfoReceiver.onReceive(mContext, intent);
+
+        assertThat(mBatteryLevel.getSummary()).isEqualTo("50%");
+        assertThat(mBatteryStatus.getSummary())
+                .isEqualTo(mContext.getText(R.string.battery_info_status_charging));
+    }
+}
diff --git a/tests/robotests/src/com/android/settings/deviceinfo/BuildNumberPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/deviceinfo/BuildNumberPreferenceControllerTest.java
index 6dc7bbe..8312673 100644
--- a/tests/robotests/src/com/android/settings/deviceinfo/BuildNumberPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/deviceinfo/BuildNumberPreferenceControllerTest.java
@@ -17,6 +17,7 @@
 package com.android.settings.deviceinfo;
 
 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.eq;
@@ -38,12 +39,12 @@
 
 import com.android.internal.logging.nano.MetricsProto;
 import com.android.settings.TestConfig;
-import com.android.settings.development.DevelopmentSettings;
 import com.android.settings.search.DatabaseIndexingManager;
 import com.android.settings.testutils.FakeFeatureFactory;
 import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.testutils.shadow.ShadowUtils;
 import com.android.settingslib.core.lifecycle.Lifecycle;
+import com.android.settingslib.development.DevelopmentSettingsEnabler;
 
 import org.junit.After;
 import org.junit.Before;
@@ -57,7 +58,7 @@
 import org.robolectric.util.ReflectionHelpers;
 
 @RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION,
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION_O,
         shadows = {
                 ShadowUtils.class
         })
@@ -83,7 +84,7 @@
     public void setUp() {
         MockitoAnnotations.initMocks(this);
         mFactory = FakeFeatureFactory.setupForTest(mContext);
-        mLifecycle = new Lifecycle();
+        mLifecycle = new Lifecycle(() -> mLifecycle);
         when(mContext.getSystemService(Context.USER_SERVICE)).thenReturn(mUserManager);
         mController = new BuildNumberPreferenceController(
                 mContext, mActivity, mFragment, mLifecycle);
@@ -176,8 +177,8 @@
                 null);
 
         assertThat(activityResultHandled).isFalse();
-        verify(mContext, never())
-                .getSharedPreferences(DevelopmentSettings.PREF_FILE, Context.MODE_PRIVATE);
+        assertThat(DevelopmentSettingsEnabler
+                .isDevelopmentSettingsEnabled(RuntimeEnvironment.application)).isFalse();
     }
 
     @Test
@@ -188,8 +189,8 @@
                 null);
 
         assertThat(activityResultHandled).isTrue();
-        verify(mContext, never())
-                .getSharedPreferences(DevelopmentSettings.PREF_FILE, Context.MODE_PRIVATE);
+        assertThat(DevelopmentSettingsEnabler
+                .isDevelopmentSettingsEnabled(RuntimeEnvironment.application)).isFalse();
     }
 
     @Test
@@ -208,9 +209,8 @@
                 null);
 
         assertThat(activityResultHandled).isTrue();
-        assertThat(context.getSharedPreferences(DevelopmentSettings.PREF_FILE,
-                Context.MODE_PRIVATE).getBoolean(DevelopmentSettings.PREF_SHOW, false))
-                .isTrue();
+        assertThat(DevelopmentSettingsEnabler
+                .isDevelopmentSettingsEnabled(RuntimeEnvironment.application)).isTrue();
     }
 
 }
diff --git a/tests/robotests/src/com/android/settings/deviceinfo/DeviceModelPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/deviceinfo/DeviceModelPreferenceControllerTest.java
index 108d342..c344df3 100644
--- a/tests/robotests/src/com/android/settings/deviceinfo/DeviceModelPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/deviceinfo/DeviceModelPreferenceControllerTest.java
@@ -16,21 +16,7 @@
 package com.android.settings.deviceinfo;
 
 
-import android.app.Fragment;
-import android.content.Context;
-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.Answers;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
-import org.robolectric.annotation.Config;
+import static com.android.settings.deviceinfo.DeviceModelPreferenceController.getDeviceModel;
 
 import static com.google.common.truth.Truth.assertThat;
 import static org.mockito.Matchers.any;
@@ -39,23 +25,42 @@
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
+import android.app.Fragment;
+import android.content.Context;
+import android.support.v7.preference.Preference;
+import android.support.v7.preference.PreferenceScreen;
+
+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.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)
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION_O)
 public class DeviceModelPreferenceControllerTest {
 
     @Mock(answer = Answers.RETURNS_DEEP_STUBS)
-    private Context mContext;
-    @Mock(answer = Answers.RETURNS_DEEP_STUBS)
     private Fragment mFragment;
     @Mock
     private Preference mPreference;
     @Mock
     private PreferenceScreen mPreferenceScreen;
+
+    private Context mContext;
     private DeviceModelPreferenceController mController;
 
     @Before
     public void setUp() {
         MockitoAnnotations.initMocks(this);
+        mContext = RuntimeEnvironment.application;
         mController = new DeviceModelPreferenceController(mContext, mFragment);
         when(mPreferenceScreen.findPreference(mController.getPreferenceKey()))
                 .thenReturn(mPreference);
@@ -71,7 +76,8 @@
     public void displayPref_shouldSetSummary() {
         mController.displayPreference(mPreferenceScreen);
 
-        verify(mPreference).setSummary(anyString());
+        verify(mPreference).setSummary(mContext.getResources().getString(R.string.model_summary,
+                getDeviceModel()));
     }
 
     @Test
diff --git a/tests/robotests/src/com/android/settings/deviceinfo/FccEquipmentIdPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/deviceinfo/FccEquipmentIdPreferenceControllerTest.java
index 951d8c7..c77a279 100644
--- a/tests/robotests/src/com/android/settings/deviceinfo/FccEquipmentIdPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/deviceinfo/FccEquipmentIdPreferenceControllerTest.java
@@ -36,7 +36,7 @@
 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_O)
 public class FccEquipmentIdPreferenceControllerTest {
 
     @Mock(answer = Answers.RETURNS_DEEP_STUBS)
diff --git a/tests/robotests/src/com/android/settings/deviceinfo/FeedbackPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/deviceinfo/FeedbackPreferenceControllerTest.java
index dfc1a0c..293127c 100644
--- a/tests/robotests/src/com/android/settings/deviceinfo/FeedbackPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/deviceinfo/FeedbackPreferenceControllerTest.java
@@ -34,7 +34,7 @@
 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_O)
 public class FeedbackPreferenceControllerTest {
     @Mock
     private Fragment mFragment;
diff --git a/tests/robotests/src/com/android/settings/deviceinfo/FirmwareVersionPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/deviceinfo/FirmwareVersionPreferenceControllerTest.java
index 5a4d988..09b2e7f 100644
--- a/tests/robotests/src/com/android/settings/deviceinfo/FirmwareVersionPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/deviceinfo/FirmwareVersionPreferenceControllerTest.java
@@ -15,13 +15,18 @@
  */
 package com.android.settings.deviceinfo;
 
+import static com.google.common.truth.Truth.assertThat;
+
+import static org.mockito.Mockito.when;
+
 import android.content.Context;
 import android.os.UserManager;
 import android.support.v7.preference.Preference;
 import android.support.v7.preference.PreferenceScreen;
 
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
+import com.android.settings.deviceinfo.firmwareversion.FirmwareVersionDialogController;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settingslib.core.lifecycle.Lifecycle;
 
 import org.junit.Before;
@@ -32,9 +37,10 @@
 import org.mockito.MockitoAnnotations;
 import org.robolectric.annotation.Config;
 
-import static com.google.common.truth.Truth.assertThat;
-import static org.mockito.Mockito.when;
-
+/**
+ * Deprecated in favor of {@link FirmwareVersionDialogController}
+ */
+@Deprecated
 @RunWith(SettingsRobolectricTestRunner.class)
 @Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
 public class FirmwareVersionPreferenceControllerTest {
@@ -53,7 +59,7 @@
     @Before
     public void setUp() {
         MockitoAnnotations.initMocks(this);
-        mLifecycle = new Lifecycle();
+        mLifecycle = new Lifecycle(() -> mLifecycle);
         when(mContext.getSystemService(Context.USER_SERVICE)).thenReturn(mUserManager);
         when(mContext.getSystemService(Context.DEVICE_POLICY_SERVICE)).thenReturn(null);
         mController = new FirmwareVersionPreferenceController(mContext, mLifecycle);
diff --git a/tests/robotests/src/com/android/settings/deviceinfo/HardwareInfoDialogFragmentTest.java b/tests/robotests/src/com/android/settings/deviceinfo/HardwareInfoDialogFragmentTest.java
index 8e8da51..e56a2b2 100644
--- a/tests/robotests/src/com/android/settings/deviceinfo/HardwareInfoDialogFragmentTest.java
+++ b/tests/robotests/src/com/android/settings/deviceinfo/HardwareInfoDialogFragmentTest.java
@@ -16,13 +16,20 @@
 
 package com.android.settings.deviceinfo;
 
+import static org.mockito.Matchers.any;
+import static org.mockito.Matchers.anyString;
+import static org.mockito.Matchers.eq;
+import static org.mockito.Mockito.doReturn;
+import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.verify;
+
 import android.app.Activity;
 import android.os.SystemProperties;
 import android.view.View;
 
 import com.android.settings.R;
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 
 import org.junit.Before;
 import org.junit.Test;
@@ -30,14 +37,8 @@
 import org.robolectric.Robolectric;
 import org.robolectric.annotation.Config;
 
-import static org.mockito.Matchers.any;
-import static org.mockito.Matchers.anyString;
-import static org.mockito.Matchers.eq;
-import static org.mockito.Mockito.spy;
-import static org.mockito.Mockito.verify;
-
 @RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION_O)
 public class HardwareInfoDialogFragmentTest {
 
     private Activity mActivity;
@@ -53,6 +54,7 @@
         SystemProperties.set("ro.boot.hardware.revision", TEST_HARDWARE_REV);
 
         final HardwareInfoDialogFragment fragment = spy(HardwareInfoDialogFragment.newInstance());
+        doReturn("").when(fragment).getSerialNumber();
         fragment.show(mActivity.getFragmentManager(), HardwareInfoDialogFragment.TAG);
 
         verify(fragment).setText(
diff --git a/tests/robotests/src/com/android/settings/deviceinfo/KernelVersionPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/deviceinfo/KernelVersionPreferenceControllerTest.java
index 10e4958..a889e9b 100644
--- a/tests/robotests/src/com/android/settings/deviceinfo/KernelVersionPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/deviceinfo/KernelVersionPreferenceControllerTest.java
@@ -30,7 +30,7 @@
 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_O)
 public class KernelVersionPreferenceControllerTest {
 
     @Mock
diff --git a/tests/robotests/src/com/android/settings/deviceinfo/ManualPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/deviceinfo/ManualPreferenceControllerTest.java
index 6151ca0..916c45d 100644
--- a/tests/robotests/src/com/android/settings/deviceinfo/ManualPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/deviceinfo/ManualPreferenceControllerTest.java
@@ -34,7 +34,7 @@
 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_O)
 public class ManualPreferenceControllerTest {
 
     @Mock(answer = Answers.RETURNS_DEEP_STUBS)
diff --git a/tests/robotests/src/com/android/settings/deviceinfo/PhoneNumberPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/deviceinfo/PhoneNumberPreferenceControllerTest.java
new file mode 100644
index 0000000..37c814a
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/deviceinfo/PhoneNumberPreferenceControllerTest.java
@@ -0,0 +1,114 @@
+/*
+ * Copyright (C) 2017 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.deviceinfo;
+
+import static org.mockito.ArgumentMatchers.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;
+
+import android.content.Context;
+import android.support.v7.preference.Preference;
+import android.support.v7.preference.PreferenceScreen;
+import android.telephony.SubscriptionInfo;
+import android.telephony.TelephonyManager;
+
+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.RuntimeEnvironment;
+import org.robolectric.annotation.Config;
+import org.robolectric.util.ReflectionHelpers;
+
+@RunWith(SettingsRobolectricTestRunner.class)
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION_O)
+public class PhoneNumberPreferenceControllerTest {
+
+    @Mock
+    private Preference mPreference;
+    @Mock
+    private Preference mSecondPreference;
+    @Mock
+    private TelephonyManager mTelephonyManager;
+    @Mock
+    private SubscriptionInfo mSubscriptionInfo;
+    @Mock
+    private PreferenceScreen mScreen;
+
+    private Context mContext;
+    private PhoneNumberPreferenceController mController;
+
+    @Before
+    public void setup() {
+        MockitoAnnotations.initMocks(this);
+        mContext = RuntimeEnvironment.application;
+        mController = spy(new PhoneNumberPreferenceController(mContext));
+        ReflectionHelpers.setField(mController, "mTelephonyManager", mTelephonyManager);
+        final String prefKey = mController.getPreferenceKey();
+        when(mScreen.findPreference(prefKey)).thenReturn(mPreference);
+        when(mScreen.getContext()).thenReturn(mContext);
+        doReturn(mSubscriptionInfo).when(mController).getSubscriptionInfo(anyInt());
+        doReturn(mSecondPreference).when(mController).createNewPreference(mContext);
+        when(mPreference.isVisible()).thenReturn(true);
+    }
+
+    @Test
+    public void displayPreference_multiSim_shouldAddSecondPreference() {
+        when(mTelephonyManager.getPhoneCount()).thenReturn(2);
+
+        mController.displayPreference(mScreen);
+
+        verify(mScreen).addPreference(mSecondPreference);
+    }
+
+    @Test
+    public void updateState_singleSim_shouldUpdateTitleAndPhoneNumber() {
+        final String phoneNumber = "1111111111";
+        doReturn(phoneNumber).when(mController).getFormattedPhoneNumber(mSubscriptionInfo);
+        when(mTelephonyManager.getPhoneCount()).thenReturn(1);
+        mController.displayPreference(mScreen);
+
+        mController.updateState(mPreference);
+
+        verify(mPreference).setTitle(mContext.getString(R.string.status_number));
+        verify(mPreference).setSummary(phoneNumber);
+    }
+
+    @Test
+    public void updateState_multiSim_shouldUpdateTitleAndPhoneNumberOfMultiplePreferences() {
+        final String phoneNumber = "1111111111";
+        doReturn(phoneNumber).when(mController).getFormattedPhoneNumber(mSubscriptionInfo);
+        when(mTelephonyManager.getPhoneCount()).thenReturn(2);
+        mController.displayPreference(mScreen);
+
+        mController.updateState(mPreference);
+
+        verify(mPreference).setTitle(
+                mContext.getString(R.string.status_number_sim_slot, 1 /* sim slot */));
+        verify(mPreference).setSummary(phoneNumber);
+        verify(mSecondPreference).setTitle(
+                mContext.getString(R.string.status_number_sim_slot, 2 /* sim slot */));
+        verify(mSecondPreference).setSummary(phoneNumber);
+    }
+}
diff --git a/tests/robotests/src/com/android/settings/deviceinfo/PrivateVolumeOptionMenuControllerTest.java b/tests/robotests/src/com/android/settings/deviceinfo/PrivateVolumeOptionMenuControllerTest.java
index ca6a33a..866b53d 100644
--- a/tests/robotests/src/com/android/settings/deviceinfo/PrivateVolumeOptionMenuControllerTest.java
+++ b/tests/robotests/src/com/android/settings/deviceinfo/PrivateVolumeOptionMenuControllerTest.java
@@ -30,7 +30,7 @@
 import com.android.settings.R;
 import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
-import com.android.settings.applications.PackageManagerWrapper;
+import com.android.settingslib.wrapper.PackageManagerWrapper;
 
 import org.junit.Before;
 import org.junit.Test;
@@ -43,7 +43,7 @@
 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_O)
 public class PrivateVolumeOptionMenuControllerTest {
     @Mock
     private MenuItem mMigrateMenuItem;
diff --git a/tests/robotests/src/com/android/settings/deviceinfo/RegulatoryInfoPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/deviceinfo/RegulatoryInfoPreferenceControllerTest.java
index 4ea33ee..99a835f 100644
--- a/tests/robotests/src/com/android/settings/deviceinfo/RegulatoryInfoPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/deviceinfo/RegulatoryInfoPreferenceControllerTest.java
@@ -42,7 +42,7 @@
 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_O)
 public class RegulatoryInfoPreferenceControllerTest {
 
     @Mock(answer = Answers.RETURNS_DEEP_STUBS)
diff --git a/tests/robotests/src/com/android/settings/deviceinfo/SerialNumberPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/deviceinfo/SerialNumberPreferenceControllerTest.java
deleted file mode 100644
index 18ef003..0000000
--- a/tests/robotests/src/com/android/settings/deviceinfo/SerialNumberPreferenceControllerTest.java
+++ /dev/null
@@ -1,97 +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.deviceinfo;
-
-import android.content.Context;
-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.annotation.Config;
-
-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.anyString;
-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 SerialNumberPreferenceControllerTest {
-
-    @Mock(answer = RETURNS_DEEP_STUBS)
-    private Context mContext;
-    @Mock(answer = RETURNS_DEEP_STUBS)
-    private PreferenceScreen mScreen;
-
-    private SerialNumberPreferenceController mController;
-
-    @Before
-    public void setUp() {
-        MockitoAnnotations.initMocks(this);
-    }
-
-    @Test
-    public void testIsAvaiable_noSerial_shouldReturnFalse() {
-        mController = new SerialNumberPreferenceController(mContext, null);
-
-        assertThat(mController.isAvailable()).isFalse();
-    }
-
-    @Test
-    public void testIsAvaiable_hasSerial_shouldReturnTrue() {
-        mController = new SerialNumberPreferenceController(mContext, "123");
-
-        assertThat(mController.isAvailable()).isTrue();
-    }
-
-    @Test
-    public void testDisplay_noSerial_shouldHidePreference() {
-        final Preference preference = mock(Preference.class);
-        when(mScreen.getPreferenceCount()).thenReturn(1);
-        when(mScreen.getPreference(0)).thenReturn(preference);
-        mController = new SerialNumberPreferenceController(mContext, null);
-        when(preference.getKey()).thenReturn(mController.getPreferenceKey());
-
-        mController.displayPreference(mScreen);
-
-        verify(mScreen).removePreference(any(Preference.class));
-    }
-
-    @Test
-    public void testDisplay_hasSerial_shouldSummary() {
-        final String serial = "123";
-        final Preference preference = mock(Preference.class);
-        when(mScreen.findPreference(anyString())).thenReturn(preference);
-
-        mController = new SerialNumberPreferenceController(mContext, serial);
-        mController.displayPreference(mScreen);
-
-        verify(mScreen, never()).removePreference(any(Preference.class));
-        verify(preference).setSummary(serial);
-    }
-}
diff --git a/tests/robotests/src/com/android/settings/deviceinfo/StorageDashboardFragmentTest.java b/tests/robotests/src/com/android/settings/deviceinfo/StorageDashboardFragmentTest.java
index b1296e5..8ad91cd 100644
--- a/tests/robotests/src/com/android/settings/deviceinfo/StorageDashboardFragmentTest.java
+++ b/tests/robotests/src/com/android/settings/deviceinfo/StorageDashboardFragmentTest.java
@@ -52,7 +52,7 @@
 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_O)
 public class StorageDashboardFragmentTest {
     @Mock(answer = Answers.RETURNS_DEEP_STUBS)
     private StorageManager mStorageManager;
diff --git a/tests/robotests/src/com/android/settings/deviceinfo/StorageItemPreferenceTest.java b/tests/robotests/src/com/android/settings/deviceinfo/StorageItemPreferenceTest.java
index 5b34c7d..cec1887 100644
--- a/tests/robotests/src/com/android/settings/deviceinfo/StorageItemPreferenceTest.java
+++ b/tests/robotests/src/com/android/settings/deviceinfo/StorageItemPreferenceTest.java
@@ -35,7 +35,7 @@
 import org.robolectric.annotation.Config;
 
 @RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION_O)
 public class StorageItemPreferenceTest {
     private Context mContext;
     private StorageItemPreference mPreference;
diff --git a/tests/robotests/src/com/android/settings/deviceinfo/StorageProfileFragmentTest.java b/tests/robotests/src/com/android/settings/deviceinfo/StorageProfileFragmentTest.java
index b0f464c..80aebab 100644
--- a/tests/robotests/src/com/android/settings/deviceinfo/StorageProfileFragmentTest.java
+++ b/tests/robotests/src/com/android/settings/deviceinfo/StorageProfileFragmentTest.java
@@ -37,7 +37,7 @@
 import org.robolectric.annotation.Config;
 
 @RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION_O)
 public class StorageProfileFragmentTest {
     @Captor
     private ArgumentCaptor<SparseArray<StorageAsyncLoader.AppsStorageResult>> mCaptor;
diff --git a/tests/robotests/src/com/android/settings/deviceinfo/StorageSettingsTest.java b/tests/robotests/src/com/android/settings/deviceinfo/StorageSettingsTest.java
index 5e95a61..cc8b31d 100644
--- a/tests/robotests/src/com/android/settings/deviceinfo/StorageSettingsTest.java
+++ b/tests/robotests/src/com/android/settings/deviceinfo/StorageSettingsTest.java
@@ -48,7 +48,7 @@
 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_O)
 public class StorageSettingsTest {
 
     @Mock
diff --git a/tests/robotests/src/com/android/settings/deviceinfo/SystemUpdatePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/deviceinfo/SystemUpdatePreferenceControllerTest.java
index 5c62220..32bcd60 100644
--- a/tests/robotests/src/com/android/settings/deviceinfo/SystemUpdatePreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/deviceinfo/SystemUpdatePreferenceControllerTest.java
@@ -15,6 +15,10 @@
  */
 package com.android.settings.deviceinfo;
 
+import static com.google.common.truth.Truth.assertThat;
+import static org.mockito.Answers.RETURNS_DEEP_STUBS;
+import static org.mockito.Mockito.when;
+
 import android.content.Context;
 import android.os.Build;
 import android.os.UserManager;
@@ -22,8 +26,8 @@
 import android.support.v7.preference.PreferenceScreen;
 
 import com.android.settings.R;
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 
 import org.junit.Before;
 import org.junit.Test;
@@ -36,30 +40,27 @@
 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.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_O)
 public class SystemUpdatePreferenceControllerTest {
 
     @Mock(answer = RETURNS_DEEP_STUBS)
     private Context mContext;
     @Mock
     private UserManager mUserManager;
-    @Mock(answer = RETURNS_DEEP_STUBS)
+    @Mock
     private PreferenceScreen mScreen;
 
     private SystemUpdatePreferenceController mController;
+    private Preference mPreference;
 
     @Before
     public void setUp() {
         MockitoAnnotations.initMocks(this);
         mController = new SystemUpdatePreferenceController(mContext, mUserManager);
+        mPreference = new Preference(RuntimeEnvironment.application);
+        mPreference.setKey(mController.getPreferenceKey());
+        when(mScreen.findPreference(mController.getPreferenceKey())).thenReturn(mPreference);
     }
 
     @Test
@@ -86,41 +87,30 @@
 
     @Test
     public void displayPrefs_nothingAvailable_shouldNotDisplay() {
-        final Preference preference = mock(Preference.class);
-        when(mScreen.getPreferenceCount()).thenReturn(1);
-        when(mScreen.getPreference(0)).thenReturn(preference);
-        when(preference.getKey()).thenReturn(mController.getPreferenceKey());
-
         mController.displayPreference(mScreen);
 
-        verify(mScreen).removePreference(any(Preference.class));
+        assertThat(mPreference.isVisible()).isFalse();
     }
 
     @Test
     public void updateState_shouldSetToAndroidVersion() {
-        final Preference preference = new Preference(RuntimeEnvironment.application);
         mController = new SystemUpdatePreferenceController(
                 RuntimeEnvironment.application, mUserManager);
-        mController.updateState(preference);
+        mController.updateState(mPreference);
 
-        assertThat(preference.getSummary())
+        assertThat(mPreference.getSummary())
                 .isEqualTo(RuntimeEnvironment.application.getString(R.string.about_summary,
                         Build.VERSION.RELEASE));
     }
 
     @Test
     public void displayPrefs_oneAvailable_shouldDisplayOne() {
-        final Preference preference = mock(Preference.class);
-        when(mScreen.getPreferenceCount()).thenReturn(1);
-        when(mScreen.getPreference(0)).thenReturn(preference);
-        when(preference.getKey()).thenReturn(mController.getPreferenceKey());
-
         when(mContext.getResources().getBoolean(
                 R.bool.config_additional_system_update_setting_enable))
                 .thenReturn(true);
 
         mController.displayPreference(mScreen);
 
-        verify(mScreen).removePreference(any(Preference.class));
+        assertThat(mPreference.isVisible()).isFalse();
     }
 }
diff --git a/tests/robotests/src/com/android/settings/deviceinfo/UsbBackendTest.java b/tests/robotests/src/com/android/settings/deviceinfo/UsbBackendTest.java
index ce384a5..5939174 100644
--- a/tests/robotests/src/com/android/settings/deviceinfo/UsbBackendTest.java
+++ b/tests/robotests/src/com/android/settings/deviceinfo/UsbBackendTest.java
@@ -37,7 +37,7 @@
 import org.robolectric.annotation.Config;
 
 @RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION_O)
 public class UsbBackendTest {
 
     @Mock(answer = RETURNS_DEEP_STUBS)
diff --git a/tests/robotests/src/com/android/settings/deviceinfo/UsbModeChooserActivityTest.java b/tests/robotests/src/com/android/settings/deviceinfo/UsbModeChooserActivityTest.java
index 1817bfb..34246b4 100644
--- a/tests/robotests/src/com/android/settings/deviceinfo/UsbModeChooserActivityTest.java
+++ b/tests/robotests/src/com/android/settings/deviceinfo/UsbModeChooserActivityTest.java
@@ -32,7 +32,7 @@
 import org.robolectric.annotation.Config;
 
 @RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION_O)
 public class UsbModeChooserActivityTest {
 
     @Mock
diff --git a/tests/robotests/src/com/android/settings/deviceinfo/firmwareversion/BasebandVersionDialogControllerTest.java b/tests/robotests/src/com/android/settings/deviceinfo/firmwareversion/BasebandVersionDialogControllerTest.java
new file mode 100644
index 0000000..0584a53
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/deviceinfo/firmwareversion/BasebandVersionDialogControllerTest.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.deviceinfo.firmwareversion;
+
+import static com.android.settings.deviceinfo.firmwareversion.BasebandVersionDialogController
+        .BASEBAND_PROPERTY;
+import static com.android.settings.deviceinfo.firmwareversion.BasebandVersionDialogController
+        .BASEBAND_VERSION_LABEL_ID;
+import static com.android.settings.deviceinfo.firmwareversion.BasebandVersionDialogController
+        .BASEBAND_VERSION_VALUE_ID;
+
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+import static org.robolectric.shadow.api.Shadow.extract;
+
+import android.content.Context;
+import android.net.ConnectivityManager;
+import android.os.SystemProperties;
+
+import com.android.settings.TestConfig;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.shadow.SettingsShadowSystemProperties;
+import com.android.settings.testutils.shadow.ShadowConnectivityManager;
+
+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;
+
+@RunWith(SettingsRobolectricTestRunner.class)
+@Config(manifest = TestConfig.MANIFEST_PATH,
+        sdk = TestConfig.SDK_VERSION_O,
+        shadows = {ShadowConnectivityManager.class, SettingsShadowSystemProperties.class})
+public class BasebandVersionDialogControllerTest {
+
+    @Mock
+    private FirmwareVersionDialogFragment mDialog;
+
+    private Context mContext;
+    private BasebandVersionDialogController mController;
+
+    @Before
+    public void setup() {
+        MockitoAnnotations.initMocks(this);
+        mContext = RuntimeEnvironment.application;
+        when(mDialog.getContext()).thenReturn(mContext);
+        mController = new BasebandVersionDialogController(mDialog);
+    }
+
+    @After
+    public void teardown() {
+        SettingsShadowSystemProperties.clear();
+    }
+
+    @Test
+    public void initialize_wifiOnly_shouldRemoveSettingFromDialog() {
+        ShadowConnectivityManager connectivityManager =
+                extract(mContext.getSystemService(ConnectivityManager.class));
+        connectivityManager.setNetworkSupported(ConnectivityManager.TYPE_MOBILE, false);
+
+        mController.initialize();
+
+        verify(mDialog).removeSettingFromScreen(BASEBAND_VERSION_LABEL_ID);
+        verify(mDialog).removeSettingFromScreen(BASEBAND_VERSION_VALUE_ID);
+    }
+
+    @Test
+    public void initialize_hasMobile_shouldSetDialogTextToBasebandVersion() {
+        final String text = "test";
+        SystemProperties.set(BASEBAND_PROPERTY, text);
+        ShadowConnectivityManager connectivityManager =
+                extract(mContext.getSystemService(ConnectivityManager.class));
+        connectivityManager.setNetworkSupported(ConnectivityManager.TYPE_MOBILE, true);
+
+        mController.initialize();
+
+        verify(mDialog).setText(BASEBAND_VERSION_VALUE_ID, text);
+    }
+}
diff --git a/tests/robotests/src/com/android/settings/deviceinfo/firmwareversion/BuildNumberDialogControllerTest.java b/tests/robotests/src/com/android/settings/deviceinfo/firmwareversion/BuildNumberDialogControllerTest.java
new file mode 100644
index 0000000..8bdf84c
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/deviceinfo/firmwareversion/BuildNumberDialogControllerTest.java
@@ -0,0 +1,59 @@
+/*
+ * Copyright (C) 2017 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.deviceinfo.firmwareversion;
+
+import static com.android.settings.deviceinfo.firmwareversion.BuildNumberDialogController
+        .BUILD_NUMBER_VALUE_ID;
+
+import static org.mockito.Mockito.verify;
+
+import android.os.Build;
+import android.text.BidiFormatter;
+
+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_O)
+public class BuildNumberDialogControllerTest {
+
+    @Mock
+    private FirmwareVersionDialogFragment mDialog;
+
+    private BuildNumberDialogController mController;
+
+    @Before
+    public void setup() {
+        MockitoAnnotations.initMocks(this);
+        mController = new BuildNumberDialogController(mDialog);
+    }
+
+    @Test
+    public void initialize_shouldUpdateBuildNumberToDialog() {
+        mController.initialize();
+
+        verify(mDialog).setText(BUILD_NUMBER_VALUE_ID,
+                BidiFormatter.getInstance().unicodeWrap(Build.DISPLAY));
+    }
+}
diff --git a/tests/robotests/src/com/android/settings/deviceinfo/firmwareversion/FirmwareVersionDialogControllerTest.java b/tests/robotests/src/com/android/settings/deviceinfo/firmwareversion/FirmwareVersionDialogControllerTest.java
new file mode 100644
index 0000000..00d1386
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/deviceinfo/firmwareversion/FirmwareVersionDialogControllerTest.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.deviceinfo.firmwareversion;
+
+import static com.android.settings.deviceinfo.firmwareversion.FirmwareVersionDialogController
+        .FIRMWARE_VERSION_LABEL_ID;
+import static com.android.settings.deviceinfo.firmwareversion.FirmwareVersionDialogController
+        .FIRMWARE_VERSION_VALUE_ID;
+
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.eq;
+import static org.mockito.Mockito.doNothing;
+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.os.Build;
+import android.os.UserManager;
+import android.view.View;
+
+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;
+import org.robolectric.util.ReflectionHelpers;
+
+@RunWith(SettingsRobolectricTestRunner.class)
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION_O)
+public class FirmwareVersionDialogControllerTest {
+
+    @Mock
+    private UserManager mUserManager;
+    @Mock
+    private FirmwareVersionDialogFragment mDialog;
+    @Mock
+    private View mView;
+
+    private Context mContext;
+    private FirmwareVersionDialogController mController;
+
+    @Before
+    public void setup() {
+        MockitoAnnotations.initMocks(this);
+        mContext = spy(RuntimeEnvironment.application);
+        when(mDialog.getContext()).thenReturn(mContext);
+        mController = spy(new FirmwareVersionDialogController(mDialog));
+        ReflectionHelpers.setField(mController, "mUserManager", mUserManager);
+        doNothing().when(mController).arrayCopy();
+        doNothing().when(mController).initializeAdminPermissions();
+    }
+
+    @Test
+    public void initialize_shouldRegisterListenersAndSetBuildVersion() {
+        mController.initialize();
+
+        verify(mDialog).registerClickListener(eq(FIRMWARE_VERSION_VALUE_ID), any());
+        verify(mDialog).registerClickListener(eq(FIRMWARE_VERSION_LABEL_ID), any());
+        verify(mDialog).setText(FIRMWARE_VERSION_VALUE_ID, Build.VERSION.RELEASE);
+    }
+
+    @Test
+    public void handleSettingClicked_userRestricted_shouldDoNothing() {
+        final long[] hits = ReflectionHelpers.getField(mController, "mHits");
+        hits[0] = Long.MAX_VALUE;
+        when(mUserManager.hasUserRestriction(UserManager.DISALLOW_FUN)).thenReturn(true);
+
+        mController.onClick(mView);
+
+        verify(mContext, never()).startActivity(any());
+    }
+
+    @Test
+    public void handleSettingClicked_userNotRestricted_shouldStartActivity() {
+        final long[] hits = ReflectionHelpers.getField(mController, "mHits");
+        hits[0] = Long.MAX_VALUE;
+        when(mUserManager.hasUserRestriction(UserManager.DISALLOW_FUN)).thenReturn(false);
+
+        mController.onClick(mView);
+
+        verify(mContext).startActivity(any());
+    }
+}
diff --git a/tests/robotests/src/com/android/settings/deviceinfo/firmwareversion/FirmwareVersionPreferenceControllerV2Test.java b/tests/robotests/src/com/android/settings/deviceinfo/firmwareversion/FirmwareVersionPreferenceControllerV2Test.java
new file mode 100644
index 0000000..d27d880
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/deviceinfo/firmwareversion/FirmwareVersionPreferenceControllerV2Test.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.deviceinfo.firmwareversion;
+
+import static com.google.common.truth.Truth.assertThat;
+
+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.app.Fragment;
+import android.app.FragmentManager;
+import android.content.Context;
+import android.os.Build;
+import android.support.v7.preference.Preference;
+import android.support.v7.preference.PreferenceScreen;
+
+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.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_O)
+public class FirmwareVersionPreferenceControllerV2Test {
+
+    @Mock
+    private Preference mPreference;
+    @Mock
+    private PreferenceScreen mScreen;
+    @Mock
+    private Fragment mFragment;
+
+    private Context mContext;
+    private FirmwareVersionPreferenceControllerV2 mController;
+
+    @Before
+    public void setup() {
+        MockitoAnnotations.initMocks(this);
+        mContext = RuntimeEnvironment.application;
+        mController = new FirmwareVersionPreferenceControllerV2(mContext, mFragment);
+        when(mScreen.findPreference(mController.getPreferenceKey())).thenReturn(mPreference);
+    }
+
+    @Test
+    public void displayPreference_shouldSetSummaryToBuildNumber() {
+        mController.displayPreference(mScreen);
+
+        verify(mPreference).setSummary(Build.VERSION.RELEASE);
+    }
+
+    @Test
+    public void handlePreferenceTreeClick_samePreferenceKey_shouldStartDialogFragment() {
+        when(mPreference.getKey()).thenReturn(mController.getPreferenceKey());
+        when(mFragment.getChildFragmentManager()).thenReturn(
+                mock(FragmentManager.class, Answers.RETURNS_DEEP_STUBS));
+
+        mController.handlePreferenceTreeClick(mPreference);
+
+        verify(mFragment).getChildFragmentManager();
+    }
+
+    @Test
+    public void handlePreferenceTreeClick_unknownPreferenceKey_shouldDoNothingAndReturnFalse() {
+        when(mPreference.getKey()).thenReturn("foobar");
+
+        final boolean result = mController.handlePreferenceTreeClick(mPreference);
+
+        assertThat(result).isFalse();
+        verify(mFragment, never()).getChildFragmentManager();
+    }
+}
diff --git a/tests/robotests/src/com/android/settings/deviceinfo/firmwareversion/KernelVersionDialogControllerTest.java b/tests/robotests/src/com/android/settings/deviceinfo/firmwareversion/KernelVersionDialogControllerTest.java
new file mode 100644
index 0000000..0dfedf4
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/deviceinfo/firmwareversion/KernelVersionDialogControllerTest.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.deviceinfo.firmwareversion;
+
+import static com.android.settings.deviceinfo.firmwareversion.KernelVersionDialogController
+        .KERNEL_VERSION_VALUE_ID;
+
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+import android.content.Context;
+
+import com.android.settings.TestConfig;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
+import com.android.settingslib.DeviceInfoUtils;
+
+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_O)
+public class KernelVersionDialogControllerTest {
+
+    @Mock
+    private FirmwareVersionDialogFragment mDialog;
+
+    private Context mContext;
+    private KernelVersionDialogController mController;
+
+    @Before
+    public void setup() {
+        MockitoAnnotations.initMocks(this);
+        mContext = RuntimeEnvironment.application;
+        when(mDialog.getContext()).thenReturn(mContext);
+        mController = new KernelVersionDialogController(mDialog);
+    }
+
+    @Test
+    public void initialize_shouldUpdateKernelVersionToDialog() {
+        mController.initialize();
+
+        verify(mDialog).setText(KERNEL_VERSION_VALUE_ID,
+                DeviceInfoUtils.getFormattedKernelVersion(mContext));
+    }
+}
diff --git a/tests/robotests/src/com/android/settings/deviceinfo/firmwareversion/SecurityPatchLevelDialogControllerTest.java b/tests/robotests/src/com/android/settings/deviceinfo/firmwareversion/SecurityPatchLevelDialogControllerTest.java
new file mode 100644
index 0000000..ea37c2e
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/deviceinfo/firmwareversion/SecurityPatchLevelDialogControllerTest.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.deviceinfo.firmwareversion;
+
+import static com.android.settings.deviceinfo.firmwareversion.SecurityPatchLevelDialogController
+        .SECURITY_PATCH_LABEL_ID;
+import static com.android.settings.deviceinfo.firmwareversion.SecurityPatchLevelDialogController
+        .SECURITY_PATCH_VALUE_ID;
+
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.anyInt;
+import static org.mockito.ArgumentMatchers.eq;
+import static org.mockito.Mockito.never;
+import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+import android.content.Context;
+import android.os.Build;
+import android.view.View;
+
+import com.android.settings.TestConfig;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
+import com.android.settingslib.wrapper.PackageManagerWrapper;
+
+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.Collections;
+
+@RunWith(SettingsRobolectricTestRunner.class)
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION_O)
+public class SecurityPatchLevelDialogControllerTest {
+
+    @Mock
+    private PackageManagerWrapper mPackageManager;
+    @Mock
+    private FirmwareVersionDialogFragment mDialog;
+    @Mock
+    private View mView;
+
+    private Context mContext;
+    private SecurityPatchLevelDialogController mController;
+
+    @Before
+    public void setup() {
+        MockitoAnnotations.initMocks(this);
+        mContext = spy(RuntimeEnvironment.application);
+        when(mDialog.getContext()).thenReturn(mContext);
+    }
+
+    @Test
+    public void initialize_noPatchInfo_shouldRemoveSettingFromDialog() {
+        ReflectionHelpers.setStaticField(Build.VERSION.class, "SECURITY_PATCH", "");
+        mController = new SecurityPatchLevelDialogController(mDialog);
+
+        mController.initialize();
+
+        verify(mDialog).removeSettingFromScreen(SECURITY_PATCH_VALUE_ID);
+        verify(mDialog).removeSettingFromScreen(SECURITY_PATCH_LABEL_ID);
+    }
+
+    @Test
+    public void initialize_patchInfoAvailable_shouldRegisterListeners() {
+        ReflectionHelpers.setStaticField(Build.VERSION.class, "SECURITY_PATCH", "foobar");
+        mController = new SecurityPatchLevelDialogController(mDialog);
+
+        mController.initialize();
+
+        verify(mDialog).registerClickListener(eq(SECURITY_PATCH_LABEL_ID), any());
+        verify(mDialog).registerClickListener(eq(SECURITY_PATCH_VALUE_ID), any());
+    }
+
+    @Test
+    public void onClick_noActivityIntent_shouldDoNothing() {
+        when(mPackageManager.queryIntentActivities(any(), anyInt())).thenReturn(
+                Collections.emptyList());
+        mController = new SecurityPatchLevelDialogController(mDialog);
+        ReflectionHelpers.setField(mController, "mPackageManager", mPackageManager);
+
+        mController.onClick(mView);
+
+        verify(mContext, never()).startActivity(any());
+    }
+
+    @Test
+    public void onClick_activityIntentFound_shouldStartActivity() {
+        when(mPackageManager.queryIntentActivities(any(), anyInt())).thenReturn(
+                Collections.singletonList(null));
+        mController = new SecurityPatchLevelDialogController(mDialog);
+        ReflectionHelpers.setField(mController, "mPackageManager", mPackageManager);
+
+        mController.onClick(mView);
+
+        verify(mContext).startActivity(any());
+    }
+}
diff --git a/tests/robotests/src/com/android/settings/deviceinfo/imei/ImeiInfoDialogControllerTest.java b/tests/robotests/src/com/android/settings/deviceinfo/imei/ImeiInfoDialogControllerTest.java
new file mode 100644
index 0000000..921c41f
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/deviceinfo/imei/ImeiInfoDialogControllerTest.java
@@ -0,0 +1,124 @@
+/*
+ * Copyright (C) 2017 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.deviceinfo.imei;
+
+import static com.android.settings.deviceinfo.imei.ImeiInfoDialogController.ID_CDMA_SETTINGS;
+import static com.android.settings.deviceinfo.imei.ImeiInfoDialogController.ID_GSM_SETTINGS;
+import static com.android.settings.deviceinfo.imei.ImeiInfoDialogController.ID_IMEI_SV_VALUE;
+import static com.android.settings.deviceinfo.imei.ImeiInfoDialogController.ID_IMEI_VALUE;
+import static com.android.settings.deviceinfo.imei.ImeiInfoDialogController.ID_MEID_NUMBER_VALUE;
+import static com.android.settings.deviceinfo.imei.ImeiInfoDialogController.ID_MIN_NUMBER_VALUE;
+import static com.android.settings.deviceinfo.imei.ImeiInfoDialogController.ID_PRL_VERSION_VALUE;
+
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.anyInt;
+import static org.mockito.Mockito.doReturn;
+import static org.mockito.Mockito.eq;
+import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+import android.content.Context;
+import android.telephony.SubscriptionInfo;
+import android.telephony.TelephonyManager;
+
+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;
+import org.robolectric.util.ReflectionHelpers;
+
+@RunWith(SettingsRobolectricTestRunner.class)
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION_O)
+public class ImeiInfoDialogControllerTest {
+
+    private static final String PRL_VERSION = "some_prl_version";
+    private static final String MEID_NUMBER = "12871234124";
+    private static final String IMEI_NUMBER = "2341982751254";
+    private static final String MIN_NUMBER = "123417851315";
+    private static final String IMEI_SV_NUMBER = "12";
+
+    @Mock
+    private ImeiInfoDialogFragment mDialog;
+    @Mock
+    private TelephonyManager mTelephonyManager;
+    @Mock
+    private SubscriptionInfo mSubscriptionInfo;
+
+    private Context mContext;
+    private ImeiInfoDialogController mController;
+
+    @Before
+    public void setup() {
+        MockitoAnnotations.initMocks(this);
+        mContext = spy(RuntimeEnvironment.application);
+        doReturn(mTelephonyManager).when(mContext).getSystemService(Context.TELEPHONY_SERVICE);
+        when(mDialog.getContext()).thenReturn(mContext);
+        mController = spy(new ImeiInfoDialogController(mDialog, 0 /* phone id */));
+        ReflectionHelpers.setField(mController, "mSubscriptionInfo", mSubscriptionInfo);
+
+        doReturn(PRL_VERSION).when(mController).getCdmaPrlVersion();
+        doReturn(MEID_NUMBER).when(mController).getMeid();
+        when(mTelephonyManager.getCdmaMin(anyInt())).thenReturn(MIN_NUMBER);
+        when(mTelephonyManager.getDeviceSoftwareVersion(anyInt())).thenReturn(IMEI_SV_NUMBER);
+        when(mTelephonyManager.getImei(anyInt())).thenReturn(IMEI_NUMBER);
+    }
+
+    @Test
+    public void populateImeiInfo_cdmaLteEnabled_shouldSetMeidAndImeiAndMin() {
+        doReturn(true).when(mController).isCdmaLteEnabled();
+        when(mTelephonyManager.getPhoneType()).thenReturn(TelephonyManager.PHONE_TYPE_CDMA);
+
+        mController.populateImeiInfo();
+
+        verify(mDialog).setText(ID_MEID_NUMBER_VALUE, MEID_NUMBER);
+        verify(mDialog).setText(ID_MIN_NUMBER_VALUE, MIN_NUMBER);
+        verify(mDialog).setText(ID_PRL_VERSION_VALUE, PRL_VERSION);
+        verify(mDialog).setText(eq(ID_IMEI_VALUE), any());
+        verify(mDialog).setText(eq(ID_IMEI_SV_VALUE), any());
+    }
+
+    @Test
+    public void populateImeiInfo_cdmaLteDisabled_shouldSetMeidAndMinAndRemoveGsmSettings() {
+        doReturn(false).when(mController).isCdmaLteEnabled();
+        when(mTelephonyManager.getPhoneType()).thenReturn(TelephonyManager.PHONE_TYPE_CDMA);
+
+        mController.populateImeiInfo();
+
+        verify(mDialog).setText(ID_MEID_NUMBER_VALUE, MEID_NUMBER);
+        verify(mDialog).setText(ID_MIN_NUMBER_VALUE, MIN_NUMBER);
+        verify(mDialog).setText(ID_PRL_VERSION_VALUE, PRL_VERSION);
+        verify(mDialog).removeViewFromScreen(ID_GSM_SETTINGS);
+    }
+
+    @Test
+    public void populateImeinfo_gsm_shouldSetImeiAndRemoveCdmaSettings() {
+        when(mTelephonyManager.getPhoneType()).thenReturn(TelephonyManager.PHONE_TYPE_GSM);
+
+        mController.populateImeiInfo();
+
+        verify(mDialog).setText(eq(ID_IMEI_VALUE), any());
+        verify(mDialog).setText(eq(ID_IMEI_SV_VALUE), any());
+        verify(mDialog).removeViewFromScreen(ID_CDMA_SETTINGS);
+    }
+}
diff --git a/tests/robotests/src/com/android/settings/deviceinfo/imei/ImeiInfoPreferenceControllerV2Test.java b/tests/robotests/src/com/android/settings/deviceinfo/imei/ImeiInfoPreferenceControllerV2Test.java
new file mode 100644
index 0000000..f077386
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/deviceinfo/imei/ImeiInfoPreferenceControllerV2Test.java
@@ -0,0 +1,170 @@
+/*
+ * Copyright (C) 2017 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.deviceinfo.imei;
+
+import static android.telephony.TelephonyManager.PHONE_TYPE_CDMA;
+import static android.telephony.TelephonyManager.PHONE_TYPE_GSM;
+
+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.times;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+import android.app.Fragment;
+import android.app.FragmentManager;
+import android.content.Context;
+import android.os.UserManager;
+import android.support.v7.preference.Preference;
+import android.support.v7.preference.PreferenceScreen;
+import android.telephony.TelephonyManager;
+
+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.Answers;
+import org.mockito.Mock;
+import org.mockito.MockitoAnnotations;
+import org.robolectric.RuntimeEnvironment;
+import org.robolectric.annotation.Config;
+import org.robolectric.util.ReflectionHelpers;
+
+@RunWith(SettingsRobolectricTestRunner.class)
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION_O)
+public class ImeiInfoPreferenceControllerV2Test {
+
+    @Mock
+    private Preference mPreference;
+    @Mock
+    private Preference mSecondSimPreference;
+    @Mock
+    private PreferenceScreen mScreen;
+    @Mock
+    private TelephonyManager mTelephonyManager;
+    @Mock
+    private UserManager mUserManager;
+    @Mock
+    private Fragment mFragment;
+
+    private Context mContext;
+    private ImeiInfoPreferenceControllerV2 mController;
+
+    @Before
+    public void setUp() {
+        MockitoAnnotations.initMocks(this);
+        mContext = spy(RuntimeEnvironment.application);
+        doReturn(mUserManager).when(mContext).getSystemService(UserManager.class);
+        mController = spy(new ImeiInfoPreferenceControllerV2(mContext, mFragment));
+        doReturn(true).when(mController).isAvailable();
+        when(mScreen.getContext()).thenReturn(mContext);
+        doReturn(mSecondSimPreference).when(mController).createNewPreference(mContext);
+        ReflectionHelpers.setField(mController, "mTelephonyManager", mTelephonyManager);
+        when(mScreen.findPreference(mController.getPreferenceKey())).thenReturn(mPreference);
+        final String prefKey = mController.getPreferenceKey();
+        when(mPreference.getKey()).thenReturn(prefKey);
+        when(mPreference.isVisible()).thenReturn(true);
+    }
+
+    @Test
+    public void displayPreference_multiSimGsm_shouldAddSecondPreference() {
+        ReflectionHelpers.setField(mController, "mIsMultiSim", true);
+        when(mTelephonyManager.getPhoneCount()).thenReturn(2);
+        when(mTelephonyManager.getPhoneType()).thenReturn(PHONE_TYPE_GSM);
+
+        mController.displayPreference(mScreen);
+
+        verify(mScreen).addPreference(mSecondSimPreference);
+    }
+
+    @Test
+    public void displayPreference_singleSimCdmaPhone_shouldSetSingleSimCdmaTitleAndMeid() {
+        ReflectionHelpers.setField(mController, "mIsMultiSim", false);
+        final String meid = "125132215123";
+        when(mTelephonyManager.getPhoneType()).thenReturn(PHONE_TYPE_CDMA);
+        doReturn(meid).when(mController).getMeid(anyInt());
+
+        mController.displayPreference(mScreen);
+
+        verify(mPreference).setTitle(mContext.getString(R.string.status_meid_number));
+        verify(mPreference).setSummary(meid);
+    }
+
+    @Test
+    public void displayPreference_multiSimCdmaPhone_shouldSetMultiSimCdmaTitleAndMeid() {
+        ReflectionHelpers.setField(mController, "mIsMultiSim", true);
+        final String meid = "125132215123";
+        when(mTelephonyManager.getPhoneCount()).thenReturn(2);
+        when(mTelephonyManager.getPhoneType()).thenReturn(PHONE_TYPE_CDMA);
+        doReturn(meid).when(mController).getMeid(anyInt());
+
+        mController.displayPreference(mScreen);
+
+        verify(mPreference).setTitle(mContext.getString(R.string.meid_multi_sim, 1 /* sim slot */));
+        verify(mSecondSimPreference).setTitle(
+                mContext.getString(R.string.meid_multi_sim, 2 /* sim slot */));
+        verify(mPreference).setSummary(meid);
+        verify(mSecondSimPreference).setSummary(meid);
+    }
+
+    @Test
+    public void displayPreference_singleSimGsmPhone_shouldSetSingleSimGsmTitleAndImei() {
+        ReflectionHelpers.setField(mController, "mIsMultiSim", false);
+        final String imei = "125132215123";
+        when(mTelephonyManager.getPhoneType()).thenReturn(PHONE_TYPE_GSM);
+        when(mTelephonyManager.getImei(anyInt())).thenReturn(imei);
+
+        mController.displayPreference(mScreen);
+
+        verify(mPreference).setTitle(mContext.getString(R.string.status_imei));
+        verify(mPreference).setSummary(imei);
+    }
+
+    @Test
+    public void displayPreference_multiSimGsmPhone_shouldSetMultiSimGsmTitleAndImei() {
+        ReflectionHelpers.setField(mController, "mIsMultiSim", true);
+        final String imei = "125132215123";
+        when(mTelephonyManager.getPhoneCount()).thenReturn(2);
+        when(mTelephonyManager.getPhoneType()).thenReturn(PHONE_TYPE_GSM);
+        when(mTelephonyManager.getImei(anyInt())).thenReturn(imei);
+
+        mController.displayPreference(mScreen);
+
+        verify(mPreference).setTitle(mContext.getString(R.string.imei_multi_sim, 1 /* sim slot */));
+        verify(mSecondSimPreference).setTitle(
+                mContext.getString(R.string.imei_multi_sim, 2 /* sim slot */));
+        verify(mPreference).setSummary(imei);
+        verify(mSecondSimPreference).setSummary(imei);
+    }
+
+    @Test
+    public void handlePreferenceTreeClick_shouldStartDialogFragment() {
+        when(mFragment.getChildFragmentManager()).thenReturn(
+                mock(FragmentManager.class, Answers.RETURNS_DEEP_STUBS));
+        when(mPreference.getTitle()).thenReturn("SomeTitle");
+        mController.displayPreference(mScreen);
+
+        mController.handlePreferenceTreeClick(mPreference);
+
+        verify(mFragment).getChildFragmentManager();
+    }
+}
diff --git a/tests/robotests/src/com/android/settings/deviceinfo/simstatus/SimStatusDialogControllerTest.java b/tests/robotests/src/com/android/settings/deviceinfo/simstatus/SimStatusDialogControllerTest.java
new file mode 100644
index 0000000..3eb4955
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/deviceinfo/simstatus/SimStatusDialogControllerTest.java
@@ -0,0 +1,240 @@
+/*
+ * Copyright (C) 2017 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.deviceinfo.simstatus;
+
+import static com.android.settings.deviceinfo.simstatus.SimStatusDialogController
+        .CELLULAR_NETWORK_TYPE_VALUE_ID;
+import static com.android.settings.deviceinfo.simstatus.SimStatusDialogController
+        .ICCID_INFO_LABEL_ID;
+import static com.android.settings.deviceinfo.simstatus.SimStatusDialogController
+        .ICCID_INFO_VALUE_ID;
+import static com.android.settings.deviceinfo.simstatus.SimStatusDialogController
+        .NETWORK_PROVIDER_VALUE_ID;
+import static com.android.settings.deviceinfo.simstatus.SimStatusDialogController
+        .OPERATOR_INFO_LABEL_ID;
+import static com.android.settings.deviceinfo.simstatus.SimStatusDialogController
+        .OPERATOR_INFO_VALUE_ID;
+import static com.android.settings.deviceinfo.simstatus.SimStatusDialogController
+        .PHONE_NUMBER_VALUE_ID;
+import static com.android.settings.deviceinfo.simstatus.SimStatusDialogController
+        .ROAMING_INFO_VALUE_ID;
+import static com.android.settings.deviceinfo.simstatus.SimStatusDialogController
+        .SERVICE_STATE_VALUE_ID;
+import static com.android.settings.deviceinfo.simstatus.SimStatusDialogController
+        .SIGNAL_STRENGTH_VALUE_ID;
+
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.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;
+
+import android.content.Context;
+import android.os.PersistableBundle;
+import android.telephony.CarrierConfigManager;
+import android.telephony.PhoneStateListener;
+import android.telephony.ServiceState;
+import android.telephony.SignalStrength;
+import android.telephony.SubscriptionInfo;
+import android.telephony.TelephonyManager;
+
+import com.android.settings.R;
+import com.android.settings.TestConfig;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
+import com.android.settingslib.core.lifecycle.Lifecycle;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.mockito.MockitoAnnotations;
+import org.robolectric.RuntimeEnvironment;
+import org.robolectric.annotation.Config;
+import org.robolectric.util.ReflectionHelpers;
+
+@RunWith(SettingsRobolectricTestRunner.class)
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION_O)
+public class SimStatusDialogControllerTest {
+
+    @Mock
+    private SimStatusDialogFragment mDialog;
+    @Mock
+    private TelephonyManager mTelephonyManager;
+    @Mock
+    private SubscriptionInfo mSubscriptionInfo;
+    @Mock
+    private ServiceState mServiceState;
+    @Mock
+    private PhoneStateListener mPhoneStateListener;
+    @Mock
+    private SignalStrength mSignalStrength;
+    @Mock
+    private CarrierConfigManager mCarrierConfigManager;
+    @Mock
+    private PersistableBundle mPersistableBundle;
+
+
+    private SimStatusDialogController mController;
+    private Context mContext;
+    private Lifecycle mLifecycle;
+
+    @Before
+    public void setup() {
+        MockitoAnnotations.initMocks(this);
+        mContext = RuntimeEnvironment.application;
+        when(mDialog.getContext()).thenReturn(mContext);
+        mLifecycle = new Lifecycle(() -> mLifecycle);
+        mController = spy(
+                new SimStatusDialogController(mDialog, mLifecycle, 0 /* phone id */));
+        doReturn(mServiceState).when(mController).getCurrentServiceState();
+        doReturn(0).when(mController).getDbm(any());
+        doReturn(0).when(mController).getAsuLevel(any());
+        doReturn(mPhoneStateListener).when(mController).getPhoneStateListener();
+        doReturn("").when(mController).getPhoneNumber();
+        doReturn(mSignalStrength).when(mController).getSignalStrength();
+        ReflectionHelpers.setField(mController, "mTelephonyManager", mTelephonyManager);
+        ReflectionHelpers.setField(mController, "mCarrierConfigManager", mCarrierConfigManager);
+        ReflectionHelpers.setField(mController, "mSubscriptionInfo", mSubscriptionInfo);
+        when(mCarrierConfigManager.getConfigForSubId(anyInt())).thenReturn(mPersistableBundle);
+    }
+
+    @Test
+    public void initialize_updateNetworkProviderWithFoobarCarrier_shouldUpdateCarrierWithFoobar() {
+        final String carrierName = "foobar";
+        when(mServiceState.getOperatorAlphaLong()).thenReturn(carrierName);
+
+        mController.initialize();
+
+        verify(mDialog).setText(NETWORK_PROVIDER_VALUE_ID, carrierName);
+    }
+
+    @Test
+    public void initialize_updatePhoneNumberWith1111111111_shouldUpdatePhoneNumber() {
+        final String phoneNumber = "1111111111";
+        doReturn(phoneNumber).when(mController).getPhoneNumber();
+
+        mController.initialize();
+
+        verify(mDialog).setText(PHONE_NUMBER_VALUE_ID, phoneNumber);
+    }
+
+    @Test
+    public void initialize_updateLatestAreaInfoWithCdmaPhone_shouldRemoveOperatorInfoSetting() {
+        when(mTelephonyManager.getPhoneType()).thenReturn(TelephonyManager.PHONE_TYPE_CDMA);
+
+        mController.initialize();
+
+        verify(mDialog).removeSettingFromScreen(OPERATOR_INFO_LABEL_ID);
+        verify(mDialog).removeSettingFromScreen(OPERATOR_INFO_VALUE_ID);
+    }
+
+    @Test
+    public void initialize_updateServiceStateWithInService_shouldUpdateTextToBeCInService() {
+        when(mServiceState.getState()).thenReturn(ServiceState.STATE_IN_SERVICE);
+
+        mController.initialize();
+
+        final String inServiceText = mContext.getResources().getString(
+                R.string.radioInfo_service_in);
+        verify(mDialog).setText(SERVICE_STATE_VALUE_ID, inServiceText);
+    }
+
+    @Test
+    public void initialize_updateDataStateWithPowerOff_shouldUpdateSettingAndResetSignalStrength() {
+        when(mServiceState.getState()).thenReturn(ServiceState.STATE_POWER_OFF);
+
+        mController.initialize();
+
+        final String offServiceText = mContext.getResources().getString(
+                R.string.radioInfo_service_off);
+        verify(mDialog).setText(SERVICE_STATE_VALUE_ID, offServiceText);
+        verify(mDialog).setText(SIGNAL_STRENGTH_VALUE_ID, "0");
+    }
+
+    @Test
+    public void initialize_updateSignalStrengthWith50_shouldUpdateSignalStrengthTo50() {
+        final int signalDbm = 50;
+        final int signalAsu = 50;
+        doReturn(signalDbm).when(mController).getDbm(mSignalStrength);
+        doReturn(signalAsu).when(mController).getAsuLevel(mSignalStrength);
+
+        mController.initialize();
+
+        final String signalStrengthString = mContext.getResources().getString(
+                R.string.sim_signal_strength, signalDbm, signalAsu);
+        verify(mDialog).setText(SIGNAL_STRENGTH_VALUE_ID, signalStrengthString);
+    }
+
+    @Test
+    public void initialize_updateNetworkTypeWithEdge_shouldUpdateSettingToEdge() {
+        when(mTelephonyManager.getDataNetworkType(anyInt())).thenReturn(
+                TelephonyManager.NETWORK_TYPE_EDGE);
+
+        mController.initialize();
+
+        verify(mDialog).setText(CELLULAR_NETWORK_TYPE_VALUE_ID,
+                TelephonyManager.getNetworkTypeName(TelephonyManager.NETWORK_TYPE_EDGE));
+    }
+
+    @Test
+    public void initialize_updateRoamingStatusIsRoaming_shouldSetSettingToRoaming() {
+        when(mServiceState.getRoaming()).thenReturn(true);
+
+        mController.initialize();
+
+        final String roamingOnString = mContext.getResources().getString(
+                R.string.radioInfo_roaming_in);
+        verify(mDialog).setText(ROAMING_INFO_VALUE_ID, roamingOnString);
+    }
+
+    @Test
+    public void initialize_updateRoamingStatusNotRoaming_shouldSetSettingToRoamingOff() {
+        when(mServiceState.getRoaming()).thenReturn(false);
+
+        mController.initialize();
+
+        final String roamingOffString = mContext.getResources().getString(
+                R.string.radioInfo_roaming_not);
+        verify(mDialog).setText(ROAMING_INFO_VALUE_ID, roamingOffString);
+    }
+
+    @Test
+    public void initialize_doNotShowIccid_shouldRemoveIccidSetting() {
+        when(mPersistableBundle.getBoolean(
+                CarrierConfigManager.KEY_SHOW_ICCID_IN_SIM_STATUS_BOOL)).thenReturn(
+                false);
+
+        mController.initialize();
+
+        verify(mDialog).removeSettingFromScreen(ICCID_INFO_LABEL_ID);
+        verify(mDialog).removeSettingFromScreen(ICCID_INFO_VALUE_ID);
+    }
+
+    @Test
+    public void initialize_showIccid_shouldSetIccidToSetting() {
+        final String iccid = "12351351231241";
+        when(mPersistableBundle.getBoolean(
+                CarrierConfigManager.KEY_SHOW_ICCID_IN_SIM_STATUS_BOOL)).thenReturn(
+                true);
+        doReturn(iccid).when(mController).getSimSerialNumber(anyInt());
+
+        mController.initialize();
+
+        verify(mDialog).setText(ICCID_INFO_VALUE_ID, iccid);
+    }
+}
diff --git a/tests/robotests/src/com/android/settings/deviceinfo/simstatus/SimStatusPreferenceControllerV2Test.java b/tests/robotests/src/com/android/settings/deviceinfo/simstatus/SimStatusPreferenceControllerV2Test.java
new file mode 100644
index 0000000..ec6b0be
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/deviceinfo/simstatus/SimStatusPreferenceControllerV2Test.java
@@ -0,0 +1,131 @@
+/*
+ * Copyright (C) 2017 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.deviceinfo.simstatus;
+
+import static org.mockito.ArgumentMatchers.anyString;
+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.Fragment;
+import android.app.FragmentManager;
+import android.content.Context;
+import android.os.UserManager;
+import android.support.v7.preference.Preference;
+import android.support.v7.preference.PreferenceScreen;
+import android.telephony.TelephonyManager;
+
+import com.android.settings.R;
+import com.android.settings.TestConfig;
+import com.android.settings.deviceinfo.imei.ImeiInfoPreferenceControllerV2;
+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.util.ReflectionHelpers;
+
+@RunWith(SettingsRobolectricTestRunner.class)
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION_O)
+public class SimStatusPreferenceControllerV2Test {
+
+    @Mock
+    private Preference mPreference;
+    @Mock
+    private Preference mSecondSimPreference;
+    @Mock
+    private PreferenceScreen mScreen;
+    @Mock
+    private TelephonyManager mTelephonyManager;
+    @Mock
+    private UserManager mUserManager;
+    @Mock
+    private Fragment mFragment;
+
+    private Context mContext;
+    private SimStatusPreferenceControllerV2 mController;
+
+    @Before
+    public void setUp() {
+        MockitoAnnotations.initMocks(this);
+        mContext = spy(RuntimeEnvironment.application);
+        doReturn(mUserManager).when(mContext).getSystemService(UserManager.class);
+        mController = spy(new SimStatusPreferenceControllerV2(mContext, mFragment));
+        doReturn(true).when(mController).isAvailable();
+        when(mScreen.getContext()).thenReturn(mContext);
+        doReturn(mSecondSimPreference).when(mController).createNewPreference(mContext);
+        ReflectionHelpers.setField(mController, "mTelephonyManager", mTelephonyManager);
+        when(mScreen.findPreference(mController.getPreferenceKey())).thenReturn(mPreference);
+        final String prefKey = mController.getPreferenceKey();
+        when(mPreference.getKey()).thenReturn(prefKey);
+        when(mPreference.isVisible()).thenReturn(true);
+    }
+
+    @Test
+    public void displayPreference_multiSim_shouldAddSecondPreference() {
+        when(mTelephonyManager.getPhoneCount()).thenReturn(2);
+
+        mController.displayPreference(mScreen);
+
+        verify(mScreen).addPreference(mSecondSimPreference);
+    }
+
+    @Test
+    public void updateState_singleSim_shouldSetSingleSimTitleAndSummary() {
+        when(mTelephonyManager.getPhoneCount()).thenReturn(1);
+        mController.displayPreference(mScreen);
+
+        mController.updateState(mPreference);
+
+        verify(mPreference).setTitle(mContext.getString(R.string.sim_status_title));
+        verify(mPreference).setSummary(anyString());
+    }
+
+    @Test
+    public void updateState_multiSim_shouldSetMultiSimTitleAndSummary() {
+        when(mTelephonyManager.getPhoneCount()).thenReturn(2);
+        mController.displayPreference(mScreen);
+
+        mController.updateState(mPreference);
+
+        verify(mPreference).setTitle(
+                mContext.getString(R.string.sim_status_title_sim_slot, 1 /* sim slot */));
+        verify(mSecondSimPreference).setTitle(
+                mContext.getString(R.string.sim_status_title_sim_slot, 2 /* sim slot */));
+        verify(mPreference).setSummary(anyString());
+        verify(mSecondSimPreference).setSummary(anyString());
+    }
+
+    @Test
+    public void handlePreferenceTreeClick_shouldStartDialogFragment() {
+        when(mFragment.getChildFragmentManager()).thenReturn(
+                mock(FragmentManager.class, Answers.RETURNS_DEEP_STUBS));
+        mController.displayPreference(mScreen);
+
+        mController.handlePreferenceTreeClick(mPreference);
+
+        verify(mFragment).getChildFragmentManager();
+    }
+}
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 b737d1f..fe640d2 100644
--- a/tests/robotests/src/com/android/settings/deviceinfo/storage/AutomaticStorageManagementSwitchPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/deviceinfo/storage/AutomaticStorageManagementSwitchPreferenceControllerTest.java
@@ -17,6 +17,7 @@
 package com.android.settings.deviceinfo.storage;
 
 import static com.google.common.truth.Truth.assertThat;
+
 import static org.mockito.Matchers.any;
 import static org.mockito.Matchers.eq;
 import static org.mockito.Mockito.mock;
@@ -32,7 +33,9 @@
 import android.provider.Settings;
 import android.support.v7.preference.Preference;
 import android.support.v7.preference.PreferenceScreen;
+
 import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
+import com.android.internal.os.RoSystemProperties;
 import com.android.settings.TestConfig;
 import com.android.settings.core.instrumentation.MetricsFeatureProvider;
 import com.android.settings.deletionhelper.ActivationWarningFragment;
@@ -41,6 +44,8 @@
 import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.testutils.shadow.SettingsShadowSystemProperties;
 import com.android.settings.widget.MasterSwitchPreference;
+
+import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -49,13 +54,14 @@
 import org.mockito.MockitoAnnotations;
 import org.robolectric.RuntimeEnvironment;
 import org.robolectric.annotation.Config;
+import org.robolectric.util.ReflectionHelpers;
 
 
 @RunWith(SettingsRobolectricTestRunner.class)
 @Config(
-    manifest = TestConfig.MANIFEST_PATH,
-    sdk = TestConfig.SDK_VERSION,
-    shadows = {SettingsShadowSystemProperties.class}
+        manifest = TestConfig.MANIFEST_PATH,
+        sdk = TestConfig.SDK_VERSION_O,
+        shadows = {SettingsShadowSystemProperties.class}
 )
 public class AutomaticStorageManagementSwitchPreferenceControllerTest {
 
@@ -76,7 +82,7 @@
     public void setUp() {
         MockitoAnnotations.initMocks(this);
         mContext = RuntimeEnvironment.application.getApplicationContext();
-        FeatureFactory factory = FeatureFactory.getFactory(mContext);
+        final FeatureFactory factory = FeatureFactory.getFactory(mContext);
         mMetricsFeature = factory.getMetricsFeatureProvider();
 
         mController = new AutomaticStorageManagementSwitchPreferenceController(
@@ -84,6 +90,11 @@
         when(mScreen.findPreference(mController.getPreferenceKey())).thenReturn(mPreference);
     }
 
+    @After
+    public void tearDown() {
+        SettingsShadowSystemProperties.clear();
+    }
+
     @Test
     public void isAvailable_shouldReturnTrue_forHighRamDevice() {
         assertThat(mController.isAvailable()).isTrue();
@@ -91,15 +102,15 @@
 
     @Test
     public void isAvailable_shouldAlwaysReturnFalse_forLowRamDevice() {
-        SettingsShadowSystemProperties.set("ro.config.low_ram", "true");
+        ReflectionHelpers.setStaticField(RoSystemProperties.class, "CONFIG_LOW_RAM", true);
         assertThat(mController.isAvailable()).isFalse();
-        SettingsShadowSystemProperties.clear();
+        ReflectionHelpers.setStaticField(RoSystemProperties.class, "CONFIG_LOW_RAM", false);
     }
 
     @Test
     public void onResume_shouldReflectEnabledStatus() {
         mController.displayPreference(mScreen);
-        ContentResolver resolver = mContext.getContentResolver();
+        final ContentResolver resolver = mContext.getContentResolver();
         Settings.Secure.putInt(resolver, Settings.Secure.AUTOMATIC_STORAGE_MANAGER_ENABLED, 1);
 
         mController.onResume();
@@ -121,9 +132,9 @@
         // FakeFeatureFactory uses mock contexts, so this test scaffolds itself rather than using
         // the instance variables.
         FakeFeatureFactory.setupForTest(mMockContext);
-        FakeFeatureFactory factory =
+        final FakeFeatureFactory factory =
                 (FakeFeatureFactory) FakeFeatureFactory.getFactory(mMockContext);
-        AutomaticStorageManagementSwitchPreferenceController controller =
+        final AutomaticStorageManagementSwitchPreferenceController controller =
                 new AutomaticStorageManagementSwitchPreferenceController(
                         mMockContext, factory.metricsFeatureProvider, mFragmentManager);
 
@@ -137,15 +148,18 @@
     public void togglingShouldUpdateSettingsSecure() {
         mController.onSwitchToggled(true);
 
-        ContentResolver resolver = mContext.getContentResolver();
+        final ContentResolver resolver = mContext.getContentResolver();
         assertThat(Settings.Secure.getInt(
                 resolver, Settings.Secure.AUTOMATIC_STORAGE_MANAGER_ENABLED, 0)).isNotEqualTo(0);
     }
 
     @Test
     public void togglingOnShouldTriggerWarningFragment() {
-        FragmentTransaction transaction = mock(FragmentTransaction.class);
-        when (mFragmentManager.beginTransaction()).thenReturn(transaction);
+        final FragmentTransaction transaction = mock(FragmentTransaction.class);
+        when(mFragmentManager.beginTransaction()).thenReturn(transaction);
+        SettingsShadowSystemProperties.set(
+                AutomaticStorageManagementSwitchPreferenceController
+                        .STORAGE_MANAGER_ENABLED_BY_DEFAULT_PROPERTY, "false");
 
         mController.onSwitchToggled(true);
 
@@ -154,8 +168,8 @@
 
     @Test
     public void togglingOffShouldTriggerWarningFragment() {
-        FragmentTransaction transaction = mock(FragmentTransaction.class);
-        when (mFragmentManager.beginTransaction()).thenReturn(transaction);
+        final FragmentTransaction transaction = mock(FragmentTransaction.class);
+        when(mFragmentManager.beginTransaction()).thenReturn(transaction);
 
         mController.onSwitchToggled(false);
 
@@ -165,8 +179,8 @@
 
     @Test
     public void togglingOnShouldNotTriggerWarningFragmentIfEnabledByDefault() {
-        FragmentTransaction transaction = mock(FragmentTransaction.class);
-        when (mFragmentManager.beginTransaction()).thenReturn(transaction);
+        final FragmentTransaction transaction = mock(FragmentTransaction.class);
+        when(mFragmentManager.beginTransaction()).thenReturn(transaction);
         SettingsShadowSystemProperties.set(
                 AutomaticStorageManagementSwitchPreferenceController
                         .STORAGE_MANAGER_ENABLED_BY_DEFAULT_PROPERTY, "true");
@@ -178,7 +192,7 @@
 
     @Test
     public void togglingOnShouldTriggerWarningFragmentIfEnabledByDefaultAndDisabledByPolicy() {
-        FragmentTransaction transaction = mock(FragmentTransaction.class);
+        final FragmentTransaction transaction = mock(FragmentTransaction.class);
         when(mFragmentManager.beginTransaction()).thenReturn(transaction);
         SettingsShadowSystemProperties.set(
                 AutomaticStorageManagementSwitchPreferenceController
diff --git a/tests/robotests/src/com/android/settings/deviceinfo/storage/CachedStorageValuesHelperTest.java b/tests/robotests/src/com/android/settings/deviceinfo/storage/CachedStorageValuesHelperTest.java
index 154a7a1..7b3556f 100644
--- a/tests/robotests/src/com/android/settings/deviceinfo/storage/CachedStorageValuesHelperTest.java
+++ b/tests/robotests/src/com/android/settings/deviceinfo/storage/CachedStorageValuesHelperTest.java
@@ -55,7 +55,7 @@
 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_O)
 public class CachedStorageValuesHelperTest {
     private Context mContext;
 
@@ -94,7 +94,7 @@
                 .putLong(TIMESTAMP_KEY, 10000L)
                 .apply();
 
-        PrivateStorageInfo info = mCachedValuesHelper.getCachedPrivateStorageInfo();
+        final PrivateStorageInfo info = mCachedValuesHelper.getCachedPrivateStorageInfo();
 
         assertThat(info.freeBytes).isEqualTo(1000L);
         assertThat(info.totalBytes).isEqualTo(6000L);
@@ -122,7 +122,7 @@
                 .putLong(TIMESTAMP_KEY, 10000L)
                 .apply();
 
-        SparseArray<StorageAsyncLoader.AppsStorageResult> result =
+        final SparseArray<StorageAsyncLoader.AppsStorageResult> result =
                 mCachedValuesHelper.getCachedAppsStorageResult();
 
         StorageAsyncLoader.AppsStorageResult primaryResult = result.get(0);
@@ -161,7 +161,7 @@
                 .putLong(TIMESTAMP_KEY, 10000L)
                 .apply();
 
-        PrivateStorageInfo info = mCachedValuesHelper.getCachedPrivateStorageInfo();
+        final PrivateStorageInfo info = mCachedValuesHelper.getCachedPrivateStorageInfo();
         assertThat(info).isNull();
     }
 
@@ -187,7 +187,7 @@
                 .putLong(TIMESTAMP_KEY, 10000L)
                 .apply();
 
-        SparseArray<StorageAsyncLoader.AppsStorageResult> result =
+        final SparseArray<StorageAsyncLoader.AppsStorageResult> result =
                 mCachedValuesHelper.getCachedAppsStorageResult();
         assertThat(result).isNull();
     }
@@ -214,7 +214,7 @@
                 .putLong(TIMESTAMP_KEY, 10000L)
                 .apply();
 
-        PrivateStorageInfo info = mCachedValuesHelper.getCachedPrivateStorageInfo();
+        final PrivateStorageInfo info = mCachedValuesHelper.getCachedPrivateStorageInfo();
         assertThat(info).isNull();
     }
 
@@ -240,20 +240,20 @@
                 .putLong(TIMESTAMP_KEY, 10000L)
                 .apply();
 
-        SparseArray<StorageAsyncLoader.AppsStorageResult> result =
+        final SparseArray<StorageAsyncLoader.AppsStorageResult> result =
                 mCachedValuesHelper.getCachedAppsStorageResult();
         assertThat(result).isNull();
     }
 
     @Test
     public void getCachedPrivateStorageInfo_nullIfEmpty() throws Exception {
-        PrivateStorageInfo info = mCachedValuesHelper.getCachedPrivateStorageInfo();
+        final PrivateStorageInfo info = mCachedValuesHelper.getCachedPrivateStorageInfo();
         assertThat(info).isNull();
     }
 
     @Test
     public void getCachedAppsStorageResult_nullIfEmpty() throws Exception {
-        SparseArray<StorageAsyncLoader.AppsStorageResult> result =
+        final SparseArray<StorageAsyncLoader.AppsStorageResult> result =
                 mCachedValuesHelper.getCachedAppsStorageResult();
         assertThat(result).isNull();
     }
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 a871c19..804c6dc 100644
--- a/tests/robotests/src/com/android/settings/deviceinfo/storage/SecondaryUserControllerTest.java
+++ b/tests/robotests/src/com/android/settings/deviceinfo/storage/SecondaryUserControllerTest.java
@@ -21,6 +21,7 @@
 import static com.google.common.truth.Truth.assertThat;
 
 import static org.mockito.Matchers.anyString;
+import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
@@ -36,7 +37,7 @@
 
 import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
-import com.android.settings.applications.UserManagerWrapper;
+import com.android.settings.wrapper.UserManagerWrapper;
 import com.android.settingslib.R;
 import com.android.settingslib.applications.StorageStatsSource;
 import com.android.settingslib.core.AbstractPreferenceController;
@@ -55,7 +56,7 @@
 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_O)
 public class SecondaryUserControllerTest {
     private static final String TEST_NAME = "Fred";
     private static final String TARGET_PREFERENCE_GROUP_KEY = "pref_secondary_users";
@@ -90,7 +91,7 @@
 
         final ArgumentCaptor<Preference> argumentCaptor = ArgumentCaptor.forClass(Preference.class);
         verify(mGroup).addPreference(argumentCaptor.capture());
-        Preference preference = argumentCaptor.getValue();
+        final Preference preference = argumentCaptor.getValue();
         assertThat(preference.getTitle()).isEqualTo(TEST_NAME);
     }
 
@@ -103,17 +104,17 @@
 
         verify(mGroup).addPreference(argumentCaptor.capture());
 
-        Preference preference = argumentCaptor.getValue();
+        final Preference preference = argumentCaptor.getValue();
         assertThat(preference.getSummary()).isEqualTo("0.01 GB");
     }
 
     @Test
     public void noSecondaryUserAddedIfNoneExist() throws Exception {
-        ArrayList<UserInfo> userInfos = new ArrayList<>();
+        final ArrayList<UserInfo> userInfos = new ArrayList<>();
         userInfos.add(mPrimaryUser);
         when(mUserManager.getPrimaryUser()).thenReturn(mPrimaryUser);
         when(mUserManager.getUsers()).thenReturn(userInfos);
-        List<AbstractPreferenceController> controllers =
+        final List<AbstractPreferenceController> controllers =
                 SecondaryUserController.getSecondaryUserControllers(mContext, mUserManager);
 
         assertThat(controllers).hasSize(1);
@@ -123,15 +124,15 @@
 
     @Test
     public void secondaryUserAddedIfHasDistinctId() throws Exception {
-        ArrayList<UserInfo> userInfos = new ArrayList<>();
-        UserInfo secondaryUser = new UserInfo();
+        final ArrayList<UserInfo> userInfos = new ArrayList<>();
+        final UserInfo secondaryUser = new UserInfo();
         secondaryUser.id = 10;
         secondaryUser.profileGroupId = 101010; // this just has to be something not 0
         userInfos.add(mPrimaryUser);
         userInfos.add(secondaryUser);
         when(mUserManager.getPrimaryUser()).thenReturn(mPrimaryUser);
         when(mUserManager.getUsers()).thenReturn(userInfos);
-        List<AbstractPreferenceController> controllers =
+        final List<AbstractPreferenceController> controllers =
                 SecondaryUserController.getSecondaryUserControllers(mContext, mUserManager);
 
         assertThat(controllers).hasSize(1);
@@ -140,15 +141,15 @@
 
     @Test
     public void profilesOfPrimaryUserAreNotIgnored() throws Exception {
-        ArrayList<UserInfo> userInfos = new ArrayList<>();
-        UserInfo secondaryUser = new UserInfo();
+        final ArrayList<UserInfo> userInfos = new ArrayList<>();
+        final UserInfo secondaryUser = new UserInfo();
         secondaryUser.id = mPrimaryUser.id;
         userInfos.add(mPrimaryUser);
         userInfos.add(secondaryUser);
         when(mUserManager.getPrimaryUser()).thenReturn(mPrimaryUser);
         when(mUserManager.getUsers()).thenReturn(userInfos);
 
-        List<AbstractPreferenceController> controllers =
+        final List<AbstractPreferenceController> controllers =
                 SecondaryUserController.getSecondaryUserControllers(mContext, mUserManager);
 
         assertThat(controllers).hasSize(2);
@@ -161,9 +162,9 @@
         mPrimaryUser.name = TEST_NAME;
         mPrimaryUser.id = 10;
         mController.displayPreference(mScreen);
-        StorageAsyncLoader.AppsStorageResult userResult =
+        final StorageAsyncLoader.AppsStorageResult userResult =
                 new StorageAsyncLoader.AppsStorageResult();
-        SparseArray<StorageAsyncLoader.AppsStorageResult> result = new SparseArray<>();
+        final SparseArray<StorageAsyncLoader.AppsStorageResult> result = new SparseArray<>();
         userResult.externalStats =
                 new StorageStatsSource.ExternalStorageStats(
                         MEGABYTE_IN_BYTES * 30,
@@ -175,23 +176,23 @@
         mController.handleResult(result);
         final ArgumentCaptor<Preference> argumentCaptor = ArgumentCaptor.forClass(Preference.class);
         verify(mGroup).addPreference(argumentCaptor.capture());
-        Preference preference = argumentCaptor.getValue();
+        final Preference preference = argumentCaptor.getValue();
 
         assertThat(preference.getSummary()).isEqualTo("0.03 GB");
     }
 
     @Test
     public void dontAddPrimaryProfileAsASecondaryProfile() throws Exception {
-        ArrayList<UserInfo> userInfos = new ArrayList<>();
+        final ArrayList<UserInfo> userInfos = new ArrayList<>();
         // The primary UserInfo may be a different object with a different name... but represent the
         // same user!
-        UserInfo primaryUserRenamed = new UserInfo();
+        final UserInfo primaryUserRenamed = new UserInfo();
         primaryUserRenamed.name = "Owner";
         primaryUserRenamed.flags = UserInfo.FLAG_PRIMARY;
         userInfos.add(primaryUserRenamed);
         when(mUserManager.getPrimaryUser()).thenReturn(mPrimaryUser);
         when(mUserManager.getUsers()).thenReturn(userInfos);
-        List<AbstractPreferenceController> controllers =
+        final List<AbstractPreferenceController> controllers =
                 SecondaryUserController.getSecondaryUserControllers(mContext, mUserManager);
 
         assertThat(controllers).hasSize(1);
@@ -201,34 +202,29 @@
 
     @Test
     public void iconCallbackChangesPreferenceIcon() throws Exception {
-        SparseArray<Drawable> icons = new SparseArray<>();
-        Bitmap userBitmap =
-                BitmapFactory.decodeResource(
-                        RuntimeEnvironment.application.getResources(), R.drawable.home);
-        UserIconDrawable drawable = new UserIconDrawable(100 /* size */).setIcon(userBitmap).bake();
-        icons.put(10, drawable);
+        final SparseArray<Drawable> icons = new SparseArray<>();
+        final UserIconDrawable drawable = mock(UserIconDrawable.class);
+        when(drawable.mutate()).thenReturn(drawable);
         mPrimaryUser.name = TEST_NAME;
         mPrimaryUser.id = 10;
+        icons.put(mPrimaryUser.id, drawable);
         mController.displayPreference(mScreen);
 
         mController.handleUserIcons(icons);
 
         final ArgumentCaptor<Preference> argumentCaptor = ArgumentCaptor.forClass(Preference.class);
         verify(mGroup).addPreference(argumentCaptor.capture());
-        Preference preference = argumentCaptor.getValue();
+        final Preference preference = argumentCaptor.getValue();
         assertThat(preference.getIcon()).isEqualTo(drawable);
     }
 
     @Test
     public void setIcon_doesntNpeOnNullPreference() throws Exception {
-        SparseArray<Drawable> icons = new SparseArray<>();
-        Bitmap userBitmap =
-                BitmapFactory.decodeResource(
-                        RuntimeEnvironment.application.getResources(), R.drawable.home);
-        UserIconDrawable drawable = new UserIconDrawable(100 /* size */).setIcon(userBitmap).bake();
-        icons.put(10, drawable);
+        final SparseArray<Drawable> icons = new SparseArray<>();
+        final UserIconDrawable drawable = mock(UserIconDrawable.class);
         mPrimaryUser.name = TEST_NAME;
         mPrimaryUser.id = 10;
+        icons.put(mPrimaryUser.id, drawable);
 
         mController.handleUserIcons(icons);
 
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 9bef560..a1a48ae 100644
--- a/tests/robotests/src/com/android/settings/deviceinfo/storage/StorageItemPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/deviceinfo/storage/StorageItemPreferenceControllerTest.java
@@ -16,12 +16,10 @@
 package com.android.settings.deviceinfo.storage;
 
 
-import static com.android.settings.applications.ManageApplications.EXTRA_WORK_ID;
-import static com.android.settings.applications.ManageApplications.EXTRA_WORK_ONLY;
+import static com.android.settings.applications.manageapplications.ManageApplications.EXTRA_WORK_ID;
+import static com.android.settings.applications.manageapplications.ManageApplications.EXTRA_WORK_ONLY;
 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.eq;
 import static org.mockito.Mockito.mock;
@@ -30,7 +28,10 @@
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
+import android.app.Activity;
 import android.app.Fragment;
+import android.app.FragmentManager;
+import android.app.FragmentTransaction;
 import android.content.Context;
 import android.content.Intent;
 import android.graphics.drawable.Drawable;
@@ -45,14 +46,14 @@
 import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
 import com.android.settings.R;
 import com.android.settings.SettingsActivity;
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.SubSettings;
 import com.android.settings.TestConfig;
-import com.android.settings.applications.ManageApplications;
+import com.android.settings.applications.manageapplications.ManageApplications;
 import com.android.settings.core.instrumentation.MetricsFeatureProvider;
 import com.android.settings.deviceinfo.PrivateVolumeSettings;
 import com.android.settings.deviceinfo.StorageItemPreference;
 import com.android.settings.testutils.FakeFeatureFactory;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.testutils.shadow.SettingsShadowResources;
 import com.android.settingslib.applications.StorageStatsSource;
 import com.android.settingslib.deviceinfo.StorageVolumeProvider;
@@ -69,14 +70,20 @@
 import org.robolectric.annotation.Config;
 
 @RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION_O)
 public class StorageItemPreferenceControllerTest {
     private Context mContext;
     private VolumeInfo mVolume;
-    @Mock(answer = Answers.RETURNS_DEEP_STUBS)
+    @Mock
     private Fragment mFragment;
     @Mock
     private StorageVolumeProvider mSvp;
+    @Mock
+    private Activity mActivity;
+    @Mock
+    private FragmentManager mFragmentManager;
+    @Mock
+    private FragmentTransaction mFragmentTransaction;
     private StorageItemPreferenceController mController;
     private StorageItemPreference mPreference;
     private FakeFeatureFactory mFakeFeatureFactory;
@@ -85,6 +92,9 @@
     @Before
     public void setUp() throws Exception {
         MockitoAnnotations.initMocks(this);
+        when(mFragment.getActivity()).thenReturn(mActivity);
+        when(mFragment.getFragmentManager()).thenReturn(mFragmentManager);
+        when(mFragmentManager.beginTransaction()).thenReturn(mFragmentTransaction);
         mContext = spy(RuntimeEnvironment.application.getApplicationContext());
         FakeFeatureFactory.setupForTest(mContext);
         mFakeFeatureFactory = (FakeFeatureFactory) FakeFeatureFactory.getFactory(mContext);
@@ -96,7 +106,7 @@
         mPreference = new StorageItemPreference(mContext);
 
         // Inflate the preference and the widget.
-        LayoutInflater inflater = LayoutInflater.from(mContext);
+        final LayoutInflater inflater = LayoutInflater.from(mContext);
         final View view = inflater.inflate(
                 mPreference.getLayoutResource(), new LinearLayout(mContext), false);
     }
@@ -118,10 +128,10 @@
         mController.handlePreferenceTreeClick(mPreference);
 
         final ArgumentCaptor<Intent> argumentCaptor = ArgumentCaptor.forClass(Intent.class);
-        verify(mFragment.getActivity()).startActivityAsUser(argumentCaptor.capture(),
+        verify(mActivity).startActivityAsUser(argumentCaptor.capture(),
                 nullable(UserHandle.class));
 
-        Intent intent = argumentCaptor.getValue();
+        final Intent intent = argumentCaptor.getValue();
         assertThat(intent.getAction()).isEqualTo(Intent.ACTION_MAIN);
         assertThat(intent.getComponent().getClassName()).isEqualTo(SubSettings.class.getName());
         assertThat(intent.getStringExtra(SettingsActivity.EXTRA_SHOW_FRAGMENT))
@@ -138,7 +148,7 @@
         final ArgumentCaptor<Intent> argumentCaptor = ArgumentCaptor.forClass(Intent.class);
         verify(mFragment.getActivity()).startActivityAsUser(argumentCaptor.capture(),
                 nullable(UserHandle.class));
-        Intent intent = argumentCaptor.getValue();
+        final Intent intent = argumentCaptor.getValue();
 
         assertThat(intent.getAction()).isEqualTo(Intent.ACTION_MAIN);
         assertThat(intent.getComponent().getClassName()).isEqualTo(SubSettings.class.getName());
@@ -166,7 +176,7 @@
         verify(mFragment.getActivity()).startActivityAsUser(argumentCaptor.capture(),
                 nullable(UserHandle.class));
 
-        Intent intent = argumentCaptor.getValue();
+        final Intent intent = argumentCaptor.getValue();
         assertThat(intent.getAction()).isEqualTo(Intent.ACTION_MAIN);
         assertThat(intent.getComponent().getClassName()).isEqualTo(SubSettings.class.getName());
         assertThat(intent.getStringExtra(SettingsActivity.EXTRA_SHOW_FRAGMENT)).isEqualTo(
@@ -275,14 +285,14 @@
 
     @Test
     public void testMeasurementCompletedUpdatesPreferences() {
-        StorageItemPreference audio = new StorageItemPreference(mContext);
-        StorageItemPreference image = new StorageItemPreference(mContext);
-        StorageItemPreference games = new StorageItemPreference(mContext);
-        StorageItemPreference movies = new StorageItemPreference(mContext);
-        StorageItemPreference apps = new StorageItemPreference(mContext);
-        StorageItemPreference system = new StorageItemPreference(mContext);
-        StorageItemPreference files = new StorageItemPreference(mContext);
-        PreferenceScreen screen = mock(PreferenceScreen.class);
+        final StorageItemPreference audio = new StorageItemPreference(mContext);
+        final StorageItemPreference image = new StorageItemPreference(mContext);
+        final StorageItemPreference games = new StorageItemPreference(mContext);
+        final StorageItemPreference movies = new StorageItemPreference(mContext);
+        final StorageItemPreference apps = new StorageItemPreference(mContext);
+        final StorageItemPreference system = new StorageItemPreference(mContext);
+        final StorageItemPreference files = new StorageItemPreference(mContext);
+        final PreferenceScreen screen = mock(PreferenceScreen.class);
         when(screen.findPreference(
                 eq(StorageItemPreferenceController.AUDIO_KEY))).thenReturn(audio);
         when(screen.findPreference(
@@ -300,7 +310,7 @@
         mController.displayPreference(screen);
 
         mController.setUsedSize(MEGABYTE_IN_BYTES * 970); // There should 870MB attributed.
-        StorageAsyncLoader.AppsStorageResult result = new StorageAsyncLoader.AppsStorageResult();
+        final StorageAsyncLoader.AppsStorageResult result = new StorageAsyncLoader.AppsStorageResult();
         result.gamesSize = MEGABYTE_IN_BYTES * 80;
         result.videoAppsSize = MEGABYTE_IN_BYTES * 160;
         result.musicAppsSize = MEGABYTE_IN_BYTES * 40;
@@ -312,7 +322,7 @@
                         MEGABYTE_IN_BYTES * 150, // video
                         MEGABYTE_IN_BYTES * 200, 0); // image
 
-        SparseArray<StorageAsyncLoader.AppsStorageResult> results = new SparseArray<>();
+        final SparseArray<StorageAsyncLoader.AppsStorageResult> results = new SparseArray<>();
         results.put(0, result);
         mController.onLoadFinished(results, 0);
 
@@ -326,21 +336,21 @@
 
     @Test
     public void settingUserIdAppliesNewIcons() {
-        StorageItemPreference audio = spy(new StorageItemPreference(mContext));
+        final StorageItemPreference audio = spy(new StorageItemPreference(mContext));
         audio.setIcon(R.drawable.ic_media_stream);
-        StorageItemPreference video = spy(new StorageItemPreference(mContext));
+        final StorageItemPreference video = spy(new StorageItemPreference(mContext));
         video.setIcon(R.drawable.ic_local_movies);
-        StorageItemPreference image = spy(new StorageItemPreference(mContext));
+        final StorageItemPreference image = spy(new StorageItemPreference(mContext));
         image.setIcon(R.drawable.ic_photo_library);
-        StorageItemPreference games = spy(new StorageItemPreference(mContext));
+        final StorageItemPreference games = spy(new StorageItemPreference(mContext));
         games.setIcon(R.drawable.ic_videogame_vd_theme_24);
-        StorageItemPreference apps = spy(new StorageItemPreference(mContext));
+        final StorageItemPreference apps = spy(new StorageItemPreference(mContext));
         apps.setIcon(R.drawable.ic_storage_apps);
-        StorageItemPreference system = spy(new StorageItemPreference(mContext));
+        final StorageItemPreference system = spy(new StorageItemPreference(mContext));
         system.setIcon(R.drawable.ic_system_update_vd_theme_24);
-        StorageItemPreference files = spy(new StorageItemPreference(mContext));
+        final StorageItemPreference files = spy(new StorageItemPreference(mContext));
         files.setIcon(R.drawable.ic_folder_vd_theme_24);
-        PreferenceScreen screen = mock(PreferenceScreen.class);
+        final PreferenceScreen screen = mock(PreferenceScreen.class);
         when(screen.findPreference(
                 eq(StorageItemPreferenceController.AUDIO_KEY))).thenReturn(audio);
         when(screen.findPreference(
@@ -370,13 +380,13 @@
 
     @Test
     public void displayPreference_dontHideFilePreferenceWhenEmulatedInternalStorageUsed() {
-        StorageItemPreference audio = new StorageItemPreference(mContext);
-        StorageItemPreference image = new StorageItemPreference(mContext);
-        StorageItemPreference games = new StorageItemPreference(mContext);
-        StorageItemPreference apps = new StorageItemPreference(mContext);
-        StorageItemPreference system = new StorageItemPreference(mContext);
-        StorageItemPreference files = new StorageItemPreference(mContext);
-        PreferenceScreen screen = mock(PreferenceScreen.class);
+        final StorageItemPreference audio = new StorageItemPreference(mContext);
+        final StorageItemPreference image = new StorageItemPreference(mContext);
+        final StorageItemPreference games = new StorageItemPreference(mContext);
+        final StorageItemPreference apps = new StorageItemPreference(mContext);
+        final StorageItemPreference system = new StorageItemPreference(mContext);
+        final StorageItemPreference files = new StorageItemPreference(mContext);
+        final PreferenceScreen screen = mock(PreferenceScreen.class);
         when(screen.findPreference(eq(StorageItemPreferenceController.AUDIO_KEY)))
                 .thenReturn(audio);
         when(screen.findPreference(eq(StorageItemPreferenceController.PHOTO_KEY)))
@@ -399,13 +409,13 @@
 
     @Test
     public void displayPreference_hideFilePreferenceWhenEmulatedStorageUnreadable() {
-        StorageItemPreference audio = new StorageItemPreference(mContext);
-        StorageItemPreference image = new StorageItemPreference(mContext);
-        StorageItemPreference games = new StorageItemPreference(mContext);
-        StorageItemPreference apps = new StorageItemPreference(mContext);
-        StorageItemPreference system = new StorageItemPreference(mContext);
-        StorageItemPreference files = new StorageItemPreference(mContext);
-        PreferenceScreen screen = mock(PreferenceScreen.class);
+        final StorageItemPreference audio = new StorageItemPreference(mContext);
+        final StorageItemPreference image = new StorageItemPreference(mContext);
+        final StorageItemPreference games = new StorageItemPreference(mContext);
+        final StorageItemPreference apps = new StorageItemPreference(mContext);
+        final StorageItemPreference system = new StorageItemPreference(mContext);
+        final StorageItemPreference files = new StorageItemPreference(mContext);
+        final PreferenceScreen screen = mock(PreferenceScreen.class);
         when(screen.findPreference(eq(StorageItemPreferenceController.AUDIO_KEY)))
                 .thenReturn(audio);
         when(screen.findPreference(eq(StorageItemPreferenceController.PHOTO_KEY)))
@@ -428,13 +438,13 @@
 
     @Test
     public void displayPreference_hideFilePreferenceWhenNoEmulatedInternalStorage() {
-        StorageItemPreference audio = new StorageItemPreference(mContext);
-        StorageItemPreference image = new StorageItemPreference(mContext);
-        StorageItemPreference games = new StorageItemPreference(mContext);
-        StorageItemPreference apps = new StorageItemPreference(mContext);
-        StorageItemPreference system = new StorageItemPreference(mContext);
-        StorageItemPreference files = new StorageItemPreference(mContext);
-        PreferenceScreen screen = mock(PreferenceScreen.class);
+        final StorageItemPreference audio = new StorageItemPreference(mContext);
+        final StorageItemPreference image = new StorageItemPreference(mContext);
+        final StorageItemPreference games = new StorageItemPreference(mContext);
+        final StorageItemPreference apps = new StorageItemPreference(mContext);
+        final StorageItemPreference system = new StorageItemPreference(mContext);
+        final StorageItemPreference files = new StorageItemPreference(mContext);
+        final PreferenceScreen screen = mock(PreferenceScreen.class);
         when(screen.findPreference(eq(StorageItemPreferenceController.AUDIO_KEY)))
                 .thenReturn(audio);
         when(screen.findPreference(eq(StorageItemPreferenceController.PHOTO_KEY)))
@@ -456,13 +466,13 @@
 
     @Test
     public void displayPreference_updateFilePreferenceToHideAfterSettingVolume() {
-        StorageItemPreference audio = new StorageItemPreference(mContext);
-        StorageItemPreference image = new StorageItemPreference(mContext);
-        StorageItemPreference games = new StorageItemPreference(mContext);
-        StorageItemPreference apps = new StorageItemPreference(mContext);
-        StorageItemPreference system = new StorageItemPreference(mContext);
-        StorageItemPreference files = new StorageItemPreference(mContext);
-        PreferenceScreen screen = mock(PreferenceScreen.class);
+        final StorageItemPreference audio = new StorageItemPreference(mContext);
+        final StorageItemPreference image = new StorageItemPreference(mContext);
+        final StorageItemPreference games = new StorageItemPreference(mContext);
+        final StorageItemPreference apps = new StorageItemPreference(mContext);
+        final StorageItemPreference system = new StorageItemPreference(mContext);
+        final StorageItemPreference files = new StorageItemPreference(mContext);
+        final PreferenceScreen screen = mock(PreferenceScreen.class);
         when(screen.findPreference(eq(StorageItemPreferenceController.AUDIO_KEY)))
                 .thenReturn(audio);
         when(screen.findPreference(eq(StorageItemPreferenceController.PHOTO_KEY)))
@@ -488,13 +498,13 @@
 
     @Test
     public void displayPreference_updateFilePreferenceToShowAfterSettingVolume() {
-        StorageItemPreference audio = new StorageItemPreference(mContext);
-        StorageItemPreference image = new StorageItemPreference(mContext);
-        StorageItemPreference games = new StorageItemPreference(mContext);
-        StorageItemPreference apps = new StorageItemPreference(mContext);
-        StorageItemPreference system = new StorageItemPreference(mContext);
-        StorageItemPreference files = new StorageItemPreference(mContext);
-        PreferenceScreen screen = mock(PreferenceScreen.class);
+        final StorageItemPreference audio = new StorageItemPreference(mContext);
+        final StorageItemPreference image = new StorageItemPreference(mContext);
+        final StorageItemPreference games = new StorageItemPreference(mContext);
+        final StorageItemPreference apps = new StorageItemPreference(mContext);
+        final StorageItemPreference system = new StorageItemPreference(mContext);
+        final StorageItemPreference files = new StorageItemPreference(mContext);
+        final PreferenceScreen screen = mock(PreferenceScreen.class);
         when(screen.findPreference(eq(StorageItemPreferenceController.AUDIO_KEY)))
                 .thenReturn(audio);
         when(screen.findPreference(eq(StorageItemPreferenceController.PHOTO_KEY)))
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 bd40240..1c1824d 100644
--- a/tests/robotests/src/com/android/settings/deviceinfo/storage/StorageSummaryDonutPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/deviceinfo/storage/StorageSummaryDonutPreferenceControllerTest.java
@@ -28,6 +28,7 @@
 import android.content.Context;
 import android.os.storage.VolumeInfo;
 import android.support.v7.preference.PreferenceViewHolder;
+import android.text.format.Formatter;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.widget.Button;
@@ -56,11 +57,11 @@
 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_O,
         shadows = {
-        SettingsShadowResources.class,
-        SettingsShadowResources.SettingsShadowTheme.class
-})
+                SettingsShadowResources.class,
+                SettingsShadowResources.SettingsShadowTheme.class
+        })
 public class StorageSummaryDonutPreferenceControllerTest {
     private Context mContext;
     private StorageSummaryDonutPreferenceController mController;
@@ -94,43 +95,62 @@
 
     @Test
     public void testEmpty() throws Exception {
+        final long totalSpace = 32 * GIGABYTE;
+        final long usedSpace = 0;
         mController.updateBytes(0, 32 * GIGABYTE);
         mController.updateState(mPreference);
 
-        assertThat(mPreference.getTitle().toString()).isEqualTo("0.00B");
-        assertThat(mPreference.getSummary().toString()).isEqualTo("Used of 32GB");
+        final Formatter.BytesResult usedSpaceResults = Formatter.formatBytes(
+                mContext.getResources(), usedSpace, 0 /* flags */);
+        assertThat(mPreference.getTitle().toString()).isEqualTo(
+                usedSpaceResults.value + " " + usedSpaceResults.units);
+        assertThat(mPreference.getSummary().toString()).isEqualTo(
+                "Used of " + Formatter.formatShortFileSize(mContext, totalSpace));
     }
 
     @Test
     public void testTotalStorage() throws Exception {
-        mController.updateBytes(KILOBYTE, KILOBYTE * 10);
+        final long totalSpace = KILOBYTE * 10;
+        final long usedSpace = KILOBYTE;
+        mController.updateBytes(KILOBYTE, totalSpace);
         mController.updateState(mPreference);
 
-        assertThat(mPreference.getTitle().toString()).isEqualTo("1.00KB");
-        assertThat(mPreference.getSummary().toString()).isEqualTo("Used of 10KB");
+        final Formatter.BytesResult usedSpaceResults = Formatter.formatBytes(
+                mContext.getResources(), usedSpace, 0 /* flags */);
+        assertThat(mPreference.getTitle().toString()).isEqualTo(
+                usedSpaceResults.value + " " + usedSpaceResults.units);
+        assertThat(mPreference.getSummary().toString()).isEqualTo(
+                "Used of " + Formatter.formatShortFileSize(mContext, totalSpace));
     }
 
     @Test
     public void testPopulateWithVolume() throws Exception {
-        VolumeInfo volume = Mockito.mock(VolumeInfo.class);
-        File file = Mockito.mock(File.class);
-        StorageVolumeProvider svp = Mockito.mock(StorageVolumeProvider.class);
+        final long totalSpace = KILOBYTE * 10;
+        final long freeSpace = KILOBYTE;
+        final long usedSpace = totalSpace - freeSpace;
+        final VolumeInfo volume = Mockito.mock(VolumeInfo.class);
+        final File file = Mockito.mock(File.class);
+        final StorageVolumeProvider svp = Mockito.mock(StorageVolumeProvider.class);
         when(volume.getPath()).thenReturn(file);
-        when(file.getTotalSpace()).thenReturn(KILOBYTE * 10);
-        when(file.getFreeSpace()).thenReturn(KILOBYTE);
-        when(svp.getPrimaryStorageSize()).thenReturn(KILOBYTE * 10);
+        when(file.getTotalSpace()).thenReturn(totalSpace);
+        when(file.getFreeSpace()).thenReturn(freeSpace);
+        when(svp.getPrimaryStorageSize()).thenReturn(totalSpace);
 
         mController.updateSizes(svp, volume);
         mController.updateState(mPreference);
 
-        assertThat(mPreference.getTitle().toString()).isEqualTo("9.00KB");
-        assertThat(mPreference.getSummary().toString()).isEqualTo("Used of 10KB");
+        final Formatter.BytesResult usedSpaceResults = Formatter.formatBytes(
+                mContext.getResources(), usedSpace, 0 /* flags */);
+        assertThat(mPreference.getTitle().toString()).isEqualTo(
+                usedSpaceResults.value + " " + usedSpaceResults.units);
+        assertThat(mPreference.getSummary().toString()).isEqualTo(
+                "Used of " + Formatter.formatShortFileSize(mContext, totalSpace));
     }
 
     @Test
     public void testFreeUpSpaceMetricIsTriggered() throws Exception {
         mPreference.onBindViewHolder(mHolder);
-        Button button = (Button) mHolder.findViewById(R.id.deletion_helper_button);
+        final Button button = (Button) mHolder.findViewById(R.id.deletion_helper_button);
 
         mPreference.onClick(button);
 
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 a2e57b9..98e796e 100644
--- a/tests/robotests/src/com/android/settings/deviceinfo/storage/UserProfileControllerTest.java
+++ b/tests/robotests/src/com/android/settings/deviceinfo/storage/UserProfileControllerTest.java
@@ -19,6 +19,7 @@
 import static com.google.common.truth.Truth.assertThat;
 import static com.android.settings.utils.FileSizeFormatter.MEGABYTE_IN_BYTES;
 
+import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.spy;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
@@ -37,8 +38,8 @@
 import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.SubSettings;
 import com.android.settings.TestConfig;
-import com.android.settings.applications.UserManagerWrapper;
 import com.android.settings.deviceinfo.StorageProfileFragment;
+import com.android.settings.wrapper.UserManagerWrapper;
 import com.android.settingslib.R;
 import com.android.settingslib.applications.StorageStatsSource;
 import com.android.settingslib.drawable.UserIconDrawable;
@@ -53,7 +54,7 @@
 import org.robolectric.annotation.Config;
 
 @RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION_O)
 public class UserProfileControllerTest {
     private static final String TEST_NAME = "Fred";
 
@@ -82,7 +83,7 @@
     public void controllerAddsPrimaryProfilePreference() throws Exception {
         final ArgumentCaptor<Preference> argumentCaptor = ArgumentCaptor.forClass(Preference.class);
         verify(mScreen).addPreference(argumentCaptor.capture());
-        Preference preference = argumentCaptor.getValue();
+        final Preference preference = argumentCaptor.getValue();
 
         assertThat(preference.getTitle()).isEqualTo(TEST_NAME);
         assertThat(preference.getKey()).isEqualTo("pref_profile_10");
@@ -93,12 +94,12 @@
 
         final ArgumentCaptor<Preference> argumentCaptor = ArgumentCaptor.forClass(Preference.class);
         verify(mScreen).addPreference(argumentCaptor.capture());
-        Preference preference = argumentCaptor.getValue();
+        final Preference preference = argumentCaptor.getValue();
         assertThat(mController.handlePreferenceTreeClick(preference)).isTrue();
         final ArgumentCaptor<Intent> intentCaptor = ArgumentCaptor.forClass(Intent.class);
         verify(mContext).startActivity(intentCaptor.capture());
 
-        Intent intent = intentCaptor.getValue();
+        final Intent intent = intentCaptor.getValue();
         assertThat(intent.getComponent().getClassName()).isEqualTo(SubSettings.class.getName());
         assertThat(intent.getStringExtra(SettingsActivity.EXTRA_SHOW_FRAGMENT)).isEqualTo(
                 StorageProfileFragment.class.getName());
@@ -106,8 +107,8 @@
 
     @Test
     public void acceptingResultUpdatesPreferenceSize() throws Exception {
-        SparseArray<StorageAsyncLoader.AppsStorageResult> result = new SparseArray<>();
-        StorageAsyncLoader.AppsStorageResult userResult =
+        final SparseArray<StorageAsyncLoader.AppsStorageResult> result = new SparseArray<>();
+        final StorageAsyncLoader.AppsStorageResult userResult =
                 new StorageAsyncLoader.AppsStorageResult();
         userResult.externalStats =
                 new StorageStatsSource.ExternalStorageStats(
@@ -120,25 +121,23 @@
         mController.handleResult(result);
         final ArgumentCaptor<Preference> argumentCaptor = ArgumentCaptor.forClass(Preference.class);
         verify(mScreen).addPreference(argumentCaptor.capture());
-        Preference preference = argumentCaptor.getValue();
+        final Preference preference = argumentCaptor.getValue();
 
         assertThat(preference.getSummary()).isEqualTo("0.10 GB");
     }
 
     @Test
     public void iconCallbackChangesPreferenceIcon() throws Exception {
-        SparseArray<Drawable> icons = new SparseArray<>();
-        Bitmap userBitmap =
-                BitmapFactory.decodeResource(
-                        RuntimeEnvironment.application.getResources(), R.drawable.home);
-        UserIconDrawable drawable = new UserIconDrawable(100 /* size */).setIcon(userBitmap).bake();
-        icons.put(10, drawable);
+        final SparseArray<Drawable> icons = new SparseArray<>();
+        final UserIconDrawable drawable = mock(UserIconDrawable.class);
+        when(drawable.mutate()).thenReturn(drawable);
+        icons.put(mPrimaryProfile.id, drawable);
 
         mController.handleUserIcons(icons);
 
         final ArgumentCaptor<Preference> argumentCaptor = ArgumentCaptor.forClass(Preference.class);
         verify(mScreen).addPreference(argumentCaptor.capture());
-        Preference preference = argumentCaptor.getValue();
+        final Preference preference = argumentCaptor.getValue();
         assertThat(preference.getIcon()).isEqualTo(drawable);
     }
 }
diff --git a/tests/robotests/src/com/android/settings/display/AmbientDisplayAlwaysOnPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/display/AmbientDisplayAlwaysOnPreferenceControllerTest.java
index 3869807..d1d479a 100644
--- a/tests/robotests/src/com/android/settings/display/AmbientDisplayAlwaysOnPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/display/AmbientDisplayAlwaysOnPreferenceControllerTest.java
@@ -18,7 +18,10 @@
 
 import static com.google.common.truth.Truth.assertThat;
 
+import static org.mockito.ArgumentMatchers.any;
 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;
 
@@ -42,22 +45,27 @@
 import org.robolectric.annotation.Config;
 
 @RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION,
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION_O,
         shadows = {ShadowSecureSettings.class})
 public class AmbientDisplayAlwaysOnPreferenceControllerTest {
 
-    @Mock Context mContext;
-    @Mock AmbientDisplayConfiguration mConfig;
-    @Mock SwitchPreference mSwitchPreference;
+    @Mock
+    private Context mContext;
+    @Mock
+    private AmbientDisplayConfiguration mConfig;
+    @Mock
+    private SwitchPreference mSwitchPreference;
 
-    AmbientDisplayAlwaysOnPreferenceController mController;
-    boolean mCallbackInvoked;
+    private AmbientDisplayAlwaysOnPreferenceController mController;
+    private boolean mCallbackInvoked;
 
     @Before
     public void setUp() throws Exception {
         MockitoAnnotations.initMocks(this);
         mController = new AmbientDisplayAlwaysOnPreferenceController(mContext, mConfig,
-                () -> { mCallbackInvoked = true; });
+                () -> {
+                    mCallbackInvoked = true;
+                });
     }
 
     @Test
@@ -92,7 +100,7 @@
         mController.onPreferenceChange(mSwitchPreference, true);
 
         assertThat(Settings.Secure.getInt(null, Settings.Secure.DOZE_ALWAYS_ON, -1))
-            .isEqualTo(1);
+                .isEqualTo(1);
     }
 
     @Test
@@ -100,39 +108,45 @@
         mController.onPreferenceChange(mSwitchPreference, false);
 
         assertThat(Settings.Secure.getInt(null, Settings.Secure.DOZE_ALWAYS_ON, -1))
-            .isEqualTo(0);
+                .isEqualTo(0);
     }
 
     @Test
     public void isAvailable_available() throws Exception {
-        when(mConfig.alwaysOnAvailableForUser(anyInt()))
-                .thenReturn(true);
+        mController = spy(mController);
+        doReturn(true).when(mController).alwaysOnAvailableForUser(any());
 
         assertThat(mController.isAvailable()).isTrue();
     }
 
     @Test
     public void isAvailable_unavailable() throws Exception {
-        when(mConfig.alwaysOnAvailableForUser(anyInt()))
-                .thenReturn(false);
+        mController = spy(mController);
+        doReturn(false).when(mController).alwaysOnAvailableForUser(any());
+
 
         assertThat(mController.isAvailable()).isFalse();
     }
 
     @Test
     public void testPreferenceController_ProperResultPayloadType() {
+        mController = spy(mController);
+        doReturn(false).when(mController).alwaysOnAvailableForUser(any());
         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);
+        mController = spy(mController);
+        doReturn(false).when(mController).alwaysOnAvailableForUser(any());
+        final int newValue = 1;
+        final ContentResolver resolver = mContext.getContentResolver();
+        Settings.Secure.putInt(resolver, Settings.Secure.DOZE_ALWAYS_ON, 0 /* value */);
 
         ((InlinePayload) mController.getResultPayload()).setValue(mContext, newValue);
-        int updatedValue = Settings.Secure.getInt(resolver, Settings.Secure.DOZE_ALWAYS_ON, 1);
+        final int updatedValue = Settings.Secure.getInt(resolver,
+                Settings.Secure.DOZE_ALWAYS_ON, 1 /* default */);
 
         assertThat(updatedValue).isEqualTo(newValue);
     }
@@ -140,11 +154,13 @@
     @Test
     @Config(shadows = ShadowSecureSettings.class)
     public void testGetValue_correctValueReturned() {
-        int currentValue = 1;
-        ContentResolver resolver = mContext.getContentResolver();
+        mController = spy(mController);
+        doReturn(false).when(mController).alwaysOnAvailableForUser(any());
+        final int currentValue = 1;
+        final ContentResolver resolver = mContext.getContentResolver();
         Settings.Secure.putInt(resolver, Settings.Secure.DOZE_ALWAYS_ON, currentValue);
 
-        int newValue = ((InlinePayload) mController.getResultPayload()).getValue(mContext);
+        final 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
index 242a05d..d442c82 100644
--- a/tests/robotests/src/com/android/settings/display/AmbientDisplayNotificationsPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/display/AmbientDisplayNotificationsPreferenceControllerTest.java
@@ -17,9 +17,7 @@
 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;
@@ -33,11 +31,11 @@
 import android.support.v14.preference.SwitchPreference;
 
 import com.android.internal.hardware.AmbientDisplayConfiguration;
+import com.android.settings.TestConfig;
+import com.android.settings.core.instrumentation.MetricsFeatureProvider;
 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;
@@ -48,7 +46,7 @@
 import org.robolectric.annotation.Config;
 
 @RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION,
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION_O,
         shadows = {ShadowSecureSettings.class})
 public class AmbientDisplayNotificationsPreferenceControllerTest {
 
diff --git a/tests/robotests/src/com/android/settings/display/AmbientDisplayPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/display/AmbientDisplayPreferenceControllerTest.java
index 2933517..123dd85 100644
--- a/tests/robotests/src/com/android/settings/display/AmbientDisplayPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/display/AmbientDisplayPreferenceControllerTest.java
@@ -39,7 +39,7 @@
 import org.robolectric.annotation.Config;
 
 @RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION,
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION_O,
         shadows = {ShadowSecureSettings.class})
 public class AmbientDisplayPreferenceControllerTest {
 
diff --git a/tests/robotests/src/com/android/settings/display/AppGridViewTest.java b/tests/robotests/src/com/android/settings/display/AppGridViewTest.java
new file mode 100644
index 0000000..a2cc76d
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/display/AppGridViewTest.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.Mockito.doReturn;
+import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.when;
+
+import android.content.Context;
+import android.content.pm.ActivityInfo;
+import android.content.pm.ApplicationInfo;
+import android.content.pm.PackageManager;
+import android.content.pm.ResolveInfo;
+import android.graphics.drawable.Drawable;
+import android.util.IconDrawableFactory;
+
+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_O)
+public class AppGridViewTest {
+
+    @Mock
+    private ResolveInfo mInfo;
+    @Mock
+    private ActivityInfo mActivityInfo;
+    @Mock
+    private ApplicationInfo mApplicationInfo;
+    @Mock
+    private Drawable mIcon;
+    @Mock
+    private PackageManager mPackageManager;
+    private Context mContext;
+    private IconDrawableFactory mIconFactory;
+
+    @Before
+    public void setUp() {
+        MockitoAnnotations.initMocks(this);
+        mInfo.activityInfo = mActivityInfo;
+        mInfo.activityInfo.applicationInfo = mApplicationInfo;
+        mContext = spy(RuntimeEnvironment.application);
+        doReturn(mPackageManager).when(mContext).getPackageManager();
+        mIconFactory = IconDrawableFactory.newInstance(mContext);
+    }
+
+    @Test
+    public void appEntry_shouldLoadIcon() {
+        when(mPackageManager.loadUnbadgedItemIcon(mActivityInfo, mApplicationInfo)).thenReturn(
+                mIcon);
+        final AppGridView.ActivityEntry activityEntry = new AppGridView.ActivityEntry(
+                mInfo, "label", mIconFactory);
+
+        assertThat(activityEntry.label).isEqualTo("label");
+        assertThat(activityEntry.getIcon()).isNotNull();
+    }
+
+    @Test
+    public void appEntry_compare_shouldCompareIgnoreCase() {
+        final AppGridView.ActivityEntry entry1 = new AppGridView.ActivityEntry(
+                mInfo, "label", mIconFactory);
+        final AppGridView.ActivityEntry entry2 = new AppGridView.ActivityEntry(
+                mInfo, "LABEL", mIconFactory);
+        final AppGridView.ActivityEntry entry3 = new AppGridView.ActivityEntry(
+                mInfo, "label2", mIconFactory);
+
+        assertThat(entry1.compareTo(entry2)).isEqualTo(0);
+        assertThat(entry1.compareTo(entry3)).isNotEqualTo(0);
+    }
+}
diff --git a/tests/robotests/src/com/android/settings/display/AutoBrightnessPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/display/AutoBrightnessPreferenceControllerTest.java
index 02f46f2..4acf609 100644
--- a/tests/robotests/src/com/android/settings/display/AutoBrightnessPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/display/AutoBrightnessPreferenceControllerTest.java
@@ -16,14 +16,18 @@
 
 package com.android.settings.display;
 
+import static android.provider.Settings.System.SCREEN_BRIGHTNESS_MODE;
+import static android.provider.Settings.System.SCREEN_BRIGHTNESS_MODE_AUTOMATIC;
+import static android.provider.Settings.System.SCREEN_BRIGHTNESS_MODE_MANUAL;
+
+import static com.google.common.truth.Truth.assertThat;
+
 import android.content.ContentResolver;
 import android.content.Context;
 import android.provider.Settings;
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
+
 import com.android.settings.TestConfig;
-import com.android.settings.search.InlinePayload;
-import com.android.settings.search.InlineSwitchPayload;
-import com.android.settings.search.ResultPayload;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 
 import org.junit.Before;
 import org.junit.Test;
@@ -32,15 +36,9 @@
 import org.mockito.Mock;
 import org.mockito.MockitoAnnotations;
 import org.robolectric.annotation.Config;
-import org.robolectric.shadows.ShadowApplication;
-
-import static android.provider.Settings.System.SCREEN_BRIGHTNESS_MODE;
-import static android.provider.Settings.System.SCREEN_BRIGHTNESS_MODE_AUTOMATIC;
-import static android.provider.Settings.System.SCREEN_BRIGHTNESS_MODE_MANUAL;
-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_O)
 public class AutoBrightnessPreferenceControllerTest {
     @Mock(answer = Answers.RETURNS_DEEP_STUBS)
     private Context mContext;
@@ -73,33 +71,27 @@
     }
 
     @Test
-    public void testPreferenceController_ProperResultPayloadType() {
-        final Context context = ShadowApplication.getInstance().getApplicationContext();
-        mController = new AutoBrightnessPreferenceController(context, PREFERENCE_KEY);
-        ResultPayload payload = mController.getResultPayload();
-        assertThat(payload).isInstanceOf(InlineSwitchPayload.class);
-    }
-
-    @Test
     public void testSetValue_updatesCorrectly() {
-        int newValue = 1;
+        boolean newValue = true;
         ContentResolver resolver = mContext.getContentResolver();
-        Settings.System.putInt(resolver, SCREEN_BRIGHTNESS_MODE, 0);
+        Settings.System.putInt(resolver, SCREEN_BRIGHTNESS_MODE, SCREEN_BRIGHTNESS_MODE_MANUAL);
 
-        ((InlinePayload) mController.getResultPayload()).setValue(mContext, newValue);
-        int updatedValue = Settings.System.getInt(resolver, SCREEN_BRIGHTNESS_MODE, -1);
+        mController.setChecked(newValue);
+        boolean updatedValue = Settings.System.getInt(resolver, SCREEN_BRIGHTNESS_MODE, -1)
+                != SCREEN_BRIGHTNESS_MODE_MANUAL;
 
         assertThat(updatedValue).isEqualTo(newValue);
     }
 
     @Test
     public void testGetValue_correctValueReturned() {
-        int currentValue = 1;
         ContentResolver resolver = mContext.getContentResolver();
-        Settings.System.putInt(resolver, SCREEN_BRIGHTNESS_MODE, currentValue);
+        Settings.System.putInt(resolver, SCREEN_BRIGHTNESS_MODE, SCREEN_BRIGHTNESS_MODE_AUTOMATIC);
 
-        int newValue = ((InlinePayload) mController.getResultPayload()).getValue(mContext);
+        int newValue = mController.isChecked() ?
+                SCREEN_BRIGHTNESS_MODE_AUTOMATIC
+                : SCREEN_BRIGHTNESS_MODE_MANUAL;
 
-        assertThat(newValue).isEqualTo(currentValue);
+        assertThat(newValue).isEqualTo(SCREEN_BRIGHTNESS_MODE_AUTOMATIC);
     }
 }
diff --git a/tests/robotests/src/com/android/settings/display/AutoRotatePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/display/AutoRotatePreferenceControllerTest.java
index 06fd297..febbaf1 100644
--- a/tests/robotests/src/com/android/settings/display/AutoRotatePreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/display/AutoRotatePreferenceControllerTest.java
@@ -16,6 +16,12 @@
 
 package com.android.settings.display;
 
+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;
+
 import android.content.ContentResolver;
 import android.content.Context;
 import android.content.pm.PackageManager;
@@ -23,9 +29,9 @@
 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.SettingsRobolectricTestRunner;
 import com.android.settings.testutils.shadow.ShadowSystemSettings;
 import com.android.settingslib.core.lifecycle.Lifecycle;
 
@@ -39,15 +45,10 @@
 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,
+    sdk = TestConfig.SDK_VERSION_O,
     shadows = ShadowSystemSettings.class
 )
 public class AutoRotatePreferenceControllerTest {
@@ -66,7 +67,7 @@
         MockitoAnnotations.initMocks(this);
         FakeFeatureFactory.setupForTest(mContext);
         mContentResolver = RuntimeEnvironment.application.getContentResolver();
-        mLifecycle = new Lifecycle();
+        mLifecycle = new Lifecycle(() -> mLifecycle);
         mPreference = new SwitchPreference(RuntimeEnvironment.application);
         when(mContext.getPackageManager()).thenReturn(mPackageManager);
         when(mContext.getContentResolver()).thenReturn(mContentResolver);
diff --git a/tests/robotests/src/com/android/settings/display/BatteryPercentagePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/display/BatteryPercentagePreferenceControllerTest.java
index 73c5374..655cf51 100644
--- a/tests/robotests/src/com/android/settings/display/BatteryPercentagePreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/display/BatteryPercentagePreferenceControllerTest.java
@@ -31,7 +31,7 @@
 import org.robolectric.annotation.Config;
 
 @RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION_O)
 public class BatteryPercentagePreferenceControllerTest {
     @Mock private Context mContext;
     private BatteryPercentagePreferenceController mController;
diff --git a/tests/robotests/src/com/android/settings/display/BrightnessLevelPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/display/BrightnessLevelPreferenceControllerTest.java
index 56b940b..f8999b5 100644
--- a/tests/robotests/src/com/android/settings/display/BrightnessLevelPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/display/BrightnessLevelPreferenceControllerTest.java
@@ -17,6 +17,7 @@
 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;
@@ -30,8 +31,9 @@
 import android.support.v7.preference.Preference;
 import android.support.v7.preference.PreferenceScreen;
 
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
+import com.android.settings.wrapper.PowerManagerWrapper;
 
 import org.junit.Before;
 import org.junit.Test;
@@ -40,11 +42,11 @@
 import org.mockito.MockitoAnnotations;
 import org.robolectric.RuntimeEnvironment;
 import org.robolectric.annotation.Config;
-import org.robolectric.internal.ShadowExtractor;
+import org.robolectric.shadow.api.Shadow;
 import org.robolectric.shadows.ShadowContentResolver;
 
 @RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION_O)
 public class BrightnessLevelPreferenceControllerTest {
     @Mock
     private Context mContext;
@@ -83,8 +85,7 @@
         Context context = RuntimeEnvironment.application;
         BrightnessLevelPreferenceController controller =
             new BrightnessLevelPreferenceController(context, null, mPowerManager);
-        ShadowContentResolver shadowContentResolver =
-            (ShadowContentResolver) ShadowExtractor.extract(context.getContentResolver());
+        ShadowContentResolver shadowContentResolver = Shadow.extract(context.getContentResolver());
 
         controller.onStart();
 
@@ -103,8 +104,7 @@
         Context context = RuntimeEnvironment.application;
         BrightnessLevelPreferenceController controller =
             new BrightnessLevelPreferenceController(context, null, mPowerManager);
-        ShadowContentResolver shadowContentResolver =
-            (ShadowContentResolver) ShadowExtractor.extract(context.getContentResolver());
+        ShadowContentResolver shadowContentResolver = Shadow.extract(context.getContentResolver());
 
         controller.displayPreference(mScreen);
         controller.onStart();
diff --git a/tests/robotests/src/com/android/settings/display/ColorModePreferenceFragmentTest.java b/tests/robotests/src/com/android/settings/display/ColorModePreferenceFragmentTest.java
index 9ee79ff..dc9dc5b 100644
--- a/tests/robotests/src/com/android/settings/display/ColorModePreferenceFragmentTest.java
+++ b/tests/robotests/src/com/android/settings/display/ColorModePreferenceFragmentTest.java
@@ -16,11 +16,18 @@
 package com.android.settings.display;
 
 import static com.google.common.truth.Truth.assertThat;
+
+import static org.mockito.ArgumentMatchers.anyInt;
+import static org.mockito.Mockito.doNothing;
 import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
-import com.android.internal.app.NightDisplayController;
+import android.os.Bundle;
+
+import com.android.internal.app.ColorDisplayController;
 import com.android.internal.logging.nano.MetricsProto;
+import com.android.settings.R;
 import com.android.settings.TestConfig;
 import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.testutils.shadow.SettingsShadowSystemProperties;
@@ -39,13 +46,13 @@
 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_O)
 public class ColorModePreferenceFragmentTest {
 
     private ColorModePreferenceFragment mFragment;
 
     @Mock
-    private NightDisplayController mController;
+    private ColorDisplayController mController;
 
     @Before
     public void setup() {
@@ -81,7 +88,7 @@
     @Test
     public void getKey_natural() {
         Mockito.when(mController.getColorMode()).thenReturn(
-            NightDisplayController.COLOR_MODE_NATURAL);
+                ColorDisplayController.COLOR_MODE_NATURAL);
 
         assertThat(mFragment.getDefaultKey())
                 .isEqualTo(ColorModePreferenceFragment.KEY_COLOR_MODE_NATURAL);
@@ -91,7 +98,7 @@
     @Test
     public void getKey_boosted() {
         Mockito.when(mController.getColorMode()).thenReturn(
-            NightDisplayController.COLOR_MODE_BOOSTED);
+                ColorDisplayController.COLOR_MODE_BOOSTED);
 
         assertThat(mFragment.getDefaultKey())
                 .isEqualTo(ColorModePreferenceFragment.KEY_COLOR_MODE_BOOSTED);
@@ -101,7 +108,7 @@
     @Test
     public void getKey_saturated() {
         Mockito.when(mController.getColorMode()).thenReturn(
-            NightDisplayController.COLOR_MODE_SATURATED);
+                ColorDisplayController.COLOR_MODE_SATURATED);
 
         assertThat(mFragment.getDefaultKey())
             .isEqualTo(ColorModePreferenceFragment.KEY_COLOR_MODE_SATURATED);
@@ -111,20 +118,31 @@
     @Test
     public void setKey_natural() {
         mFragment.setDefaultKey(ColorModePreferenceFragment.KEY_COLOR_MODE_NATURAL);
-        Mockito.verify(mController).setColorMode(NightDisplayController.COLOR_MODE_NATURAL);
+        verify(mController).setColorMode(ColorDisplayController.COLOR_MODE_NATURAL);
     }
 
     @Config(shadows = {SettingsShadowSystemProperties.class})
     @Test
     public void setKey_boosted() {
         mFragment.setDefaultKey(ColorModePreferenceFragment.KEY_COLOR_MODE_BOOSTED);
-        Mockito.verify(mController).setColorMode(NightDisplayController.COLOR_MODE_BOOSTED);
+        verify(mController).setColorMode(ColorDisplayController.COLOR_MODE_BOOSTED);
     }
 
     @Config(shadows = {SettingsShadowSystemProperties.class})
     @Test
     public void setKey_saturated() {
         mFragment.setDefaultKey(ColorModePreferenceFragment.KEY_COLOR_MODE_SATURATED);
-        Mockito.verify(mController).setColorMode(NightDisplayController.COLOR_MODE_SATURATED);
+        verify(mController).setColorMode(ColorDisplayController.COLOR_MODE_SATURATED);
     }
+
+    @Test
+    public void onCreatePreferences_useNewTitle_shouldAddColorModePreferences() {
+        doNothing().when(mFragment).addPreferencesFromResource(anyInt());
+        doNothing().when(mFragment).updateCandidates();
+
+        mFragment.onCreatePreferences(Bundle.EMPTY, null /* rootKey */);
+
+        verify(mFragment).addPreferencesFromResource(R.xml.color_mode_settings);
+    }
+
 }
diff --git a/tests/robotests/src/com/android/settings/display/NightDisplaySettingsTest.java b/tests/robotests/src/com/android/settings/display/NightDisplaySettingsTest.java
new file mode 100644
index 0000000..113e7ec
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/display/NightDisplaySettingsTest.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.display;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import android.content.Context;
+import android.provider.SearchIndexableResource;
+
+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.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_O)
+public class NightDisplaySettingsTest {
+
+    private Context mContext;
+
+    @Before
+    public void setUp() {
+        mContext = RuntimeEnvironment.application;
+    }
+
+    @Test
+    public void testNightDisplayIndexing_containsResource() {
+        List<SearchIndexableResource> resources =
+                NightDisplaySettings.SEARCH_INDEX_DATA_PROVIDER.getXmlResourcesToIndex(mContext,
+                        true /* enabled */);
+
+        List<Integer> indexedXml = new ArrayList<>();
+        for (SearchIndexableResource resource : resources) {
+            indexedXml.add(resource.xmlResId);
+        }
+
+        assertThat(indexedXml).contains(R.xml.night_display_settings);
+    }
+}
diff --git a/tests/robotests/src/com/android/settings/display/ShowOperatorNamePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/display/ShowOperatorNamePreferenceControllerTest.java
new file mode 100644
index 0000000..4d701ca
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/display/ShowOperatorNamePreferenceControllerTest.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.display;
+
+import android.content.Context;
+import android.provider.Settings;
+import android.support.v14.preference.SwitchPreference;
+
+import com.android.settings.R;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
+import com.android.settings.TestConfig;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Answers;
+import org.mockito.Mock;
+import org.mockito.MockitoAnnotations;
+import org.robolectric.annotation.Config;
+
+import static com.google.common.truth.Truth.assertThat;
+import static org.mockito.Mockito.when;
+
+@RunWith(SettingsRobolectricTestRunner.class)
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION_O)
+public class ShowOperatorNamePreferenceControllerTest {
+
+    private static final String KEY_SHOW_OPERATOR_NAME = "show_operator_name";
+
+    @Mock(answer = Answers.RETURNS_DEEP_STUBS)
+    private Context mContext;
+    @Mock
+    private SwitchPreference mPreference;
+
+    private ShowOperatorNamePreferenceController mController;
+
+    @Before
+    public void setUp() {
+        MockitoAnnotations.initMocks(this);
+
+        mController = new ShowOperatorNamePreferenceController(mContext);
+    }
+
+    @Test
+    public void testIsAvailable_configIsTrue_ReturnTrue() {
+        when(mContext.getResources().getBoolean(R.bool.config_showOperatorNameInStatusBar))
+                .thenReturn(true);
+        assertThat(mController.isAvailable()).isTrue();
+    }
+
+    @Test
+    public void testIsAvailable_configIsFalse_ReturnFalse() {
+        when(mContext.getResources().getBoolean(R.bool.config_showOperatorNameInStatusBar))
+                .thenReturn(false);
+        assertThat(mController.isAvailable()).isFalse();
+    }
+
+    @Test
+    public void testOnPreferenceChange_TurnOn_ReturnOn() {
+        mController.onPreferenceChange(mPreference, true);
+
+        final int mode = Settings.Secure.getInt(mContext.getContentResolver(),
+                KEY_SHOW_OPERATOR_NAME, 0);
+        assertThat(mode).isEqualTo(1);
+    }
+
+    @Test
+    public void testOnPreferenceChange_TurnOff_ReturnOff() {
+        mController.onPreferenceChange(mPreference, false);
+
+        final int mode = Settings.Secure.getInt(mContext.getContentResolver(),
+                KEY_SHOW_OPERATOR_NAME, 1);
+        assertThat(mode).isEqualTo(0);
+    }
+}
diff --git a/tests/robotests/src/com/android/settings/display/ThemePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/display/ThemePreferenceControllerTest.java
index 3d99f65..289b8c1 100644
--- a/tests/robotests/src/com/android/settings/display/ThemePreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/display/ThemePreferenceControllerTest.java
@@ -47,7 +47,7 @@
 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_O)
 public class ThemePreferenceControllerTest {
 
     @Mock(answer = Answers.RETURNS_DEEP_STUBS)
diff --git a/tests/robotests/src/com/android/settings/display/TimeoutPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/display/TimeoutPreferenceControllerTest.java
index 480e41f..48997c3 100644
--- a/tests/robotests/src/com/android/settings/display/TimeoutPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/display/TimeoutPreferenceControllerTest.java
@@ -33,7 +33,7 @@
 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_O)
 public class TimeoutPreferenceControllerTest {
     private static final int TIMEOUT = 30;
     @Mock(answer = Answers.RETURNS_DEEP_STUBS)
diff --git a/tests/robotests/src/com/android/settings/display/VrDisplayPreferencePickerTest.java b/tests/robotests/src/com/android/settings/display/VrDisplayPreferencePickerTest.java
index 191a8fb..f874007 100644
--- a/tests/robotests/src/com/android/settings/display/VrDisplayPreferencePickerTest.java
+++ b/tests/robotests/src/com/android/settings/display/VrDisplayPreferencePickerTest.java
@@ -39,7 +39,7 @@
 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_O)
 public class VrDisplayPreferencePickerTest {
 
     private VrDisplayPreferencePicker mPicker;
diff --git a/tests/robotests/src/com/android/settings/display/WallpaperPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/display/WallpaperPreferenceControllerTest.java
index 1419ad5..17d12c0 100644
--- a/tests/robotests/src/com/android/settings/display/WallpaperPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/display/WallpaperPreferenceControllerTest.java
@@ -43,7 +43,7 @@
 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_O)
 public class WallpaperPreferenceControllerTest {
 
     private static final String WALLPAPER_PACKAGE = "TestPkg";
diff --git a/tests/robotests/src/com/android/settings/dream/CurrentDreamPickerTest.java b/tests/robotests/src/com/android/settings/dream/CurrentDreamPickerTest.java
index bd25d92..e0a59b5 100644
--- a/tests/robotests/src/com/android/settings/dream/CurrentDreamPickerTest.java
+++ b/tests/robotests/src/com/android/settings/dream/CurrentDreamPickerTest.java
@@ -42,7 +42,7 @@
 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_O)
 public class CurrentDreamPickerTest {
     private static String COMPONENT_KEY = "mocked_component_name_string";
 
diff --git a/tests/robotests/src/com/android/settings/dream/CurrentDreamPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/dream/CurrentDreamPreferenceControllerTest.java
index e3493a1..b0ef640 100644
--- a/tests/robotests/src/com/android/settings/dream/CurrentDreamPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/dream/CurrentDreamPreferenceControllerTest.java
@@ -41,7 +41,7 @@
 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_O)
 public class CurrentDreamPreferenceControllerTest {
     private static String TAG = "CurrentDreamPreferenceControllerTest";
 
diff --git a/tests/robotests/src/com/android/settings/dream/DreamSettingsTest.java b/tests/robotests/src/com/android/settings/dream/DreamSettingsTest.java
index 73526e5..ba3aab5 100644
--- a/tests/robotests/src/com/android/settings/dream/DreamSettingsTest.java
+++ b/tests/robotests/src/com/android/settings/dream/DreamSettingsTest.java
@@ -33,7 +33,7 @@
 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_O)
 public class DreamSettingsTest {
     private static final List<String> KEYS = Arrays.asList(
             DreamSettings.WHILE_CHARGING_ONLY,
diff --git a/tests/robotests/src/com/android/settings/dream/StartNowPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/dream/StartNowPreferenceControllerTest.java
index 444591a..7e310c3 100644
--- a/tests/robotests/src/com/android/settings/dream/StartNowPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/dream/StartNowPreferenceControllerTest.java
@@ -40,7 +40,7 @@
 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_O)
 public class StartNowPreferenceControllerTest {
     private StartNowPreferenceController mController;
     @Mock(answer = Answers.RETURNS_DEEP_STUBS)
diff --git a/tests/robotests/src/com/android/settings/dream/WhenToDreamPickerTest.java b/tests/robotests/src/com/android/settings/dream/WhenToDreamPickerTest.java
index bafc2d4..542e0b7 100644
--- a/tests/robotests/src/com/android/settings/dream/WhenToDreamPickerTest.java
+++ b/tests/robotests/src/com/android/settings/dream/WhenToDreamPickerTest.java
@@ -37,7 +37,7 @@
 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_O)
 public class WhenToDreamPickerTest {
     private WhenToDreamPicker mPicker;
     @Mock(answer = Answers.RETURNS_DEEP_STUBS)
diff --git a/tests/robotests/src/com/android/settings/dream/WhenToDreamPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/dream/WhenToDreamPreferenceControllerTest.java
index 2acf82b..4763f29 100644
--- a/tests/robotests/src/com/android/settings/dream/WhenToDreamPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/dream/WhenToDreamPreferenceControllerTest.java
@@ -37,7 +37,7 @@
 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_O)
 public class WhenToDreamPreferenceControllerTest {
     private WhenToDreamPreferenceController mController;
     @Mock(answer = Answers.RETURNS_DEEP_STUBS)
diff --git a/tests/robotests/src/com/android/settings/enterprise/AdminActionPreferenceControllerBaseTest.java b/tests/robotests/src/com/android/settings/enterprise/AdminActionPreferenceControllerBaseTest.java
index 111e503..24a96b1 100644
--- a/tests/robotests/src/com/android/settings/enterprise/AdminActionPreferenceControllerBaseTest.java
+++ b/tests/robotests/src/com/android/settings/enterprise/AdminActionPreferenceControllerBaseTest.java
@@ -31,7 +31,7 @@
  * Tests for {@link AdminActionPreferenceControllerBase}.
  */
 @RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION_O)
 public final class AdminActionPreferenceControllerBaseTest extends
         AdminActionPreferenceControllerTestBase {
 
diff --git a/tests/robotests/src/com/android/settings/enterprise/AdminGrantedCameraPermissionPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/enterprise/AdminGrantedCameraPermissionPreferenceControllerTest.java
index 491fcdb..b003ad8 100644
--- a/tests/robotests/src/com/android/settings/enterprise/AdminGrantedCameraPermissionPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/enterprise/AdminGrantedCameraPermissionPreferenceControllerTest.java
@@ -28,19 +28,17 @@
  * Tests for {@link AdminGrantedCameraPermissionPreferenceController}.
  */
 @RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION_O)
 public final class AdminGrantedCameraPermissionPreferenceControllerTest extends
         AdminGrantedPermissionsPreferenceControllerTestBase {
 
     public AdminGrantedCameraPermissionPreferenceControllerTest() {
         super("enterprise_privacy_number_camera_access_packages",
-                new String[] {Manifest.permission.CAMERA},
-                Manifest.permission_group.CAMERA);
+                new String[] {Manifest.permission.CAMERA});
     }
 
     @Override
     protected AdminGrantedPermissionsPreferenceControllerBase createController(boolean async) {
-        return new AdminGrantedCameraPermissionPreferenceController(mContext,null /* lifecycle */,
-                async);
+        return new AdminGrantedCameraPermissionPreferenceController(mContext, async);
     }
 }
diff --git a/tests/robotests/src/com/android/settings/enterprise/AdminGrantedLocationPermissionsPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/enterprise/AdminGrantedLocationPermissionsPreferenceControllerTest.java
index 01a13d2..2fb3e21 100644
--- a/tests/robotests/src/com/android/settings/enterprise/AdminGrantedLocationPermissionsPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/enterprise/AdminGrantedLocationPermissionsPreferenceControllerTest.java
@@ -18,8 +18,8 @@
 
 import android.Manifest;
 
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 
 import org.junit.runner.RunWith;
 import org.robolectric.annotation.Config;
@@ -28,20 +28,18 @@
  * Tests for {@link AdminGrantedLocationPermissionsPreferenceController}.
  */
 @RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION_O)
 public final class AdminGrantedLocationPermissionsPreferenceControllerTest extends
         AdminGrantedPermissionsPreferenceControllerTestBase {
 
     public AdminGrantedLocationPermissionsPreferenceControllerTest() {
         super("enterprise_privacy_number_location_access_packages",
                 new String[] {Manifest.permission.ACCESS_COARSE_LOCATION,
-                        Manifest.permission.ACCESS_FINE_LOCATION},
-                Manifest.permission_group.LOCATION);
+                        Manifest.permission.ACCESS_FINE_LOCATION});
     }
 
     @Override
     protected AdminGrantedPermissionsPreferenceControllerBase createController(boolean async) {
-        return new AdminGrantedLocationPermissionsPreferenceController(mContext,
-                null /* lifecycle */, async);
+        return new AdminGrantedLocationPermissionsPreferenceController(mContext, async);
     }
 }
diff --git a/tests/robotests/src/com/android/settings/enterprise/AdminGrantedMicrophonePermissionPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/enterprise/AdminGrantedMicrophonePermissionPreferenceControllerTest.java
index fed1631..9ee8100 100644
--- a/tests/robotests/src/com/android/settings/enterprise/AdminGrantedMicrophonePermissionPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/enterprise/AdminGrantedMicrophonePermissionPreferenceControllerTest.java
@@ -18,8 +18,8 @@
 
 import android.Manifest;
 
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 
 import org.junit.runner.RunWith;
 import org.robolectric.annotation.Config;
@@ -28,19 +28,17 @@
  * Tests for {@link AdminGrantedMicrophonePermissionPreferenceController}.
  */
 @RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION_O)
 public final class AdminGrantedMicrophonePermissionPreferenceControllerTest extends
         AdminGrantedPermissionsPreferenceControllerTestBase {
 
     public AdminGrantedMicrophonePermissionPreferenceControllerTest() {
         super("enterprise_privacy_number_microphone_access_packages",
-                new String[] {Manifest.permission.RECORD_AUDIO},
-                Manifest.permission_group.MICROPHONE);
+                new String[] {Manifest.permission.RECORD_AUDIO});
     }
 
     @Override
     protected AdminGrantedPermissionsPreferenceControllerBase createController(boolean async) {
-        return new AdminGrantedMicrophonePermissionPreferenceController(mContext,
-                null /* lifecycle */, async);
+        return new AdminGrantedMicrophonePermissionPreferenceController(mContext, async);
     }
 }
diff --git a/tests/robotests/src/com/android/settings/enterprise/AdminGrantedPermissionsPreferenceControllerBaseTest.java b/tests/robotests/src/com/android/settings/enterprise/AdminGrantedPermissionsPreferenceControllerBaseTest.java
index a209a46..918c5fb 100644
--- a/tests/robotests/src/com/android/settings/enterprise/AdminGrantedPermissionsPreferenceControllerBaseTest.java
+++ b/tests/robotests/src/com/android/settings/enterprise/AdminGrantedPermissionsPreferenceControllerBaseTest.java
@@ -16,8 +16,8 @@
 
 package com.android.settings.enterprise;
 
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 
 import org.junit.runner.RunWith;
 import org.robolectric.annotation.Config;
@@ -26,12 +26,12 @@
  * Tests for {@link AdminGrantedPermissionsPreferenceControllerBase}.
  */
 @RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION_O)
 public final class AdminGrantedPermissionsPreferenceControllerBaseTest extends
         AdminGrantedPermissionsPreferenceControllerTestBase {
 
     public AdminGrantedPermissionsPreferenceControllerBaseTest() {
-        super("some.key", new String[] {"some.permission"}, "some.permission");
+        super("some.key", new String[] {"some.permission"});
     }
 
     @Override
@@ -44,7 +44,7 @@
 
         AdminGrantedPermissionsPreferenceControllerBaseTestable(boolean async) {
             super(AdminGrantedPermissionsPreferenceControllerBaseTest.this.mContext,
-                    null /* lifecycle */, async, mPermissions, mPermissionGroup);
+                    async, mPermissions);
         }
 
         @Override
diff --git a/tests/robotests/src/com/android/settings/enterprise/AdminGrantedPermissionsPreferenceControllerTestBase.java b/tests/robotests/src/com/android/settings/enterprise/AdminGrantedPermissionsPreferenceControllerTestBase.java
index c1a3143..421fb0f 100644
--- a/tests/robotests/src/com/android/settings/enterprise/AdminGrantedPermissionsPreferenceControllerTestBase.java
+++ b/tests/robotests/src/com/android/settings/enterprise/AdminGrantedPermissionsPreferenceControllerTestBase.java
@@ -16,12 +16,17 @@
 
 package com.android.settings.enterprise;
 
+import static com.google.common.truth.Truth.assertThat;
+import static org.mockito.Matchers.anyObject;
+import static org.mockito.Matchers.eq;
+import static org.mockito.Mockito.doAnswer;
+import static org.mockito.Mockito.when;
+
 import android.content.Context;
 import android.support.v7.preference.Preference;
 
 import com.android.settings.R;
 import com.android.settings.applications.ApplicationFeatureProvider;
-import com.android.settings.core.PreferenceAvailabilityObserver;
 import com.android.settings.testutils.FakeFeatureFactory;
 
 import org.junit.Before;
@@ -32,35 +37,22 @@
 import org.mockito.invocation.InvocationOnMock;
 import org.mockito.stubbing.Answer;
 
-import static com.google.common.truth.Truth.assertThat;
-import static org.mockito.Matchers.anyBoolean;
-import static org.mockito.Matchers.anyObject;
-import static org.mockito.Matchers.eq;
-import static org.mockito.Mockito.doAnswer;
-import static org.mockito.Mockito.never;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
 /**
  * Common base for testing subclasses of {@link AdminGrantedPermissionsPreferenceControllerBase}.
  */
 public abstract class AdminGrantedPermissionsPreferenceControllerTestBase {
     protected final String mKey;
     protected final String[] mPermissions;
-    protected final String mPermissionGroup;
 
     @Mock(answer = Answers.RETURNS_DEEP_STUBS)
     protected Context mContext;
     private FakeFeatureFactory mFeatureFactory;
-    @Mock private PreferenceAvailabilityObserver mObserver;
 
     protected AdminGrantedPermissionsPreferenceControllerBase mController;
 
-    public AdminGrantedPermissionsPreferenceControllerTestBase(String key, String[] permissions,
-            String permissionGroup) {
+    public AdminGrantedPermissionsPreferenceControllerTestBase(String key, String[] permissions) {
         mKey = key;
         mPermissions = permissions;
-        mPermissionGroup = permissionGroup;
     }
 
     @Before
@@ -69,12 +61,6 @@
         FakeFeatureFactory.setupForTest(mContext);
         mFeatureFactory = (FakeFeatureFactory) FakeFeatureFactory.getFactory(mContext);
         mController = createController(true /* async */);
-        mController.setAvailabilityObserver(mObserver);
-    }
-
-    @Test
-    public void testGetAvailabilityObserver() {
-        assertThat(mController.getAvailabilityObserver()).isEqualTo(mObserver);
     }
 
     private void setNumberOfPackagesWithAdminGrantedPermissions(int number, boolean async) {
@@ -96,7 +82,6 @@
         setNumberOfPackagesWithAdminGrantedPermissions(0, true /* async */);
         mController.updateState(preference);
         assertThat(preference.isVisible()).isFalse();
-        verify(mObserver).onPreferenceAvailabilityUpdated(mKey, false);
 
         setNumberOfPackagesWithAdminGrantedPermissions(20, true /* async */);
         when(mContext.getResources().getQuantityString(
@@ -105,33 +90,27 @@
         mController.updateState(preference);
         assertThat(preference.getSummary()).isEqualTo("minimum 20 apps");
         assertThat(preference.isVisible()).isTrue();
-        verify(mObserver).onPreferenceAvailabilityUpdated(mKey, true);
     }
 
     @Test
     public void testIsAvailableSync() {
         final AdminGrantedPermissionsPreferenceControllerBase controller
                 = createController(false /* async */);
-        controller.setAvailabilityObserver(mObserver);
 
         setNumberOfPackagesWithAdminGrantedPermissions(0, false /* async */);
         assertThat(controller.isAvailable()).isFalse();
-        verify(mObserver).onPreferenceAvailabilityUpdated(mKey, false);
 
         setNumberOfPackagesWithAdminGrantedPermissions(20, false /* async */);
         assertThat(controller.isAvailable()).isTrue();
-        verify(mObserver).onPreferenceAvailabilityUpdated(mKey, true);
     }
 
     @Test
     public void testIsAvailableAsync() {
         setNumberOfPackagesWithAdminGrantedPermissions(0, true /* async */);
         assertThat(mController.isAvailable()).isTrue();
-        verify(mObserver, never()).onPreferenceAvailabilityUpdated(eq(mKey), anyBoolean());
 
         setNumberOfPackagesWithAdminGrantedPermissions(20, true /* async */);
         assertThat(mController.isAvailable()).isTrue();
-        verify(mObserver, never()).onPreferenceAvailabilityUpdated(eq(mKey), anyBoolean());
     }
 
     @Test
diff --git a/tests/robotests/src/com/android/settings/enterprise/AlwaysOnVpnCurrentUserPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/enterprise/AlwaysOnVpnCurrentUserPreferenceControllerTest.java
index 045acf2..17649bb 100644
--- a/tests/robotests/src/com/android/settings/enterprise/AlwaysOnVpnCurrentUserPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/enterprise/AlwaysOnVpnCurrentUserPreferenceControllerTest.java
@@ -16,14 +16,16 @@
 
 package com.android.settings.enterprise;
 
+import static com.google.common.truth.Truth.assertThat;
+import static org.mockito.Mockito.when;
+
 import android.content.Context;
-import com.android.settings.R;
 import android.support.v7.preference.Preference;
 
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
+import com.android.settings.R;
 import com.android.settings.TestConfig;
-import com.android.settings.core.PreferenceAvailabilityObserver;
 import com.android.settings.testutils.FakeFeatureFactory;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 
 import org.junit.Before;
 import org.junit.Test;
@@ -33,15 +35,11 @@
 import org.mockito.MockitoAnnotations;
 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;
-
 /**
  * Tests for {@link AlwaysOnVpnCurrentUserPreferenceController}.
  */
 @RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION_O)
 public final class AlwaysOnVpnCurrentUserPreferenceControllerTest {
 
     private static final String VPN_SET_DEVICE = "VPN set";
@@ -51,7 +49,6 @@
     @Mock(answer = Answers.RETURNS_DEEP_STUBS)
     private Context mContext;
     private FakeFeatureFactory mFeatureFactory;
-    @Mock private PreferenceAvailabilityObserver mObserver;
 
     private AlwaysOnVpnCurrentUserPreferenceController mController;
 
@@ -60,18 +57,11 @@
         MockitoAnnotations.initMocks(this);
         FakeFeatureFactory.setupForTest(mContext);
         mFeatureFactory = (FakeFeatureFactory) FakeFeatureFactory.getFactory(mContext);
-        mController = new AlwaysOnVpnCurrentUserPreferenceController(mContext,
-                null /* lifecycle */);
+        mController = new AlwaysOnVpnCurrentUserPreferenceController(mContext);
         when(mContext.getString(R.string.enterprise_privacy_always_on_vpn_device))
                 .thenReturn(VPN_SET_DEVICE);
         when(mContext.getString(R.string.enterprise_privacy_always_on_vpn_personal))
                 .thenReturn(VPN_SET_PERSONAL);
-        mController.setAvailabilityObserver(mObserver);
-    }
-
-    @Test
-    public void testGetAvailabilityObserver() {
-        assertThat(mController.getAvailabilityObserver()).isEqualTo(mObserver);
     }
 
     @Test
@@ -95,12 +85,10 @@
         when(mFeatureFactory.enterprisePrivacyFeatureProvider.isAlwaysOnVpnSetInCurrentUser())
                 .thenReturn(false);
         assertThat(mController.isAvailable()).isFalse();
-        verify(mObserver).onPreferenceAvailabilityUpdated(KEY_ALWAYS_ON_VPN_PRIMARY_USER, false);
 
         when(mFeatureFactory.enterprisePrivacyFeatureProvider.isAlwaysOnVpnSetInCurrentUser())
                 .thenReturn(true);
         assertThat(mController.isAvailable()).isTrue();
-        verify(mObserver).onPreferenceAvailabilityUpdated(KEY_ALWAYS_ON_VPN_PRIMARY_USER, true);
     }
 
     @Test
diff --git a/tests/robotests/src/com/android/settings/enterprise/AlwaysOnVpnManagedProfilePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/enterprise/AlwaysOnVpnManagedProfilePreferenceControllerTest.java
index b321652..d54505b 100644
--- a/tests/robotests/src/com/android/settings/enterprise/AlwaysOnVpnManagedProfilePreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/enterprise/AlwaysOnVpnManagedProfilePreferenceControllerTest.java
@@ -16,13 +16,15 @@
 
 package com.android.settings.enterprise;
 
+import static com.google.common.truth.Truth.assertThat;
+import static org.mockito.Mockito.when;
+
 import android.content.Context;
 import android.support.v7.preference.Preference;
 
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
-import com.android.settings.core.PreferenceAvailabilityObserver;
 import com.android.settings.testutils.FakeFeatureFactory;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 
 import org.junit.Before;
 import org.junit.Test;
@@ -32,15 +34,11 @@
 import org.mockito.MockitoAnnotations;
 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;
-
 /**
  * Tests for {@link AlwaysOnVpnManagedProfilePreferenceController}.
  */
 @RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION_O)
 public final class AlwaysOnVpnManagedProfilePreferenceControllerTest {
 
     private static final String KEY_ALWAYS_ON_VPN_MANAGED_PROFILE = "always_on_vpn_managed_profile";
@@ -48,7 +46,6 @@
     @Mock(answer = Answers.RETURNS_DEEP_STUBS)
     private Context mContext;
     private FakeFeatureFactory mFeatureFactory;
-    @Mock private PreferenceAvailabilityObserver mObserver;
 
     private AlwaysOnVpnManagedProfilePreferenceController mController;
 
@@ -57,14 +54,7 @@
         MockitoAnnotations.initMocks(this);
         FakeFeatureFactory.setupForTest(mContext);
         mFeatureFactory = (FakeFeatureFactory) FakeFeatureFactory.getFactory(mContext);
-        mController = new AlwaysOnVpnManagedProfilePreferenceController(mContext,
-                null /* lifecycle */);
-        mController.setAvailabilityObserver(mObserver);
-    }
-
-    @Test
-    public void testGetAvailabilityObserver() {
-        assertThat(mController.getAvailabilityObserver()).isEqualTo(mObserver);
+        mController = new AlwaysOnVpnManagedProfilePreferenceController(mContext);
     }
 
     @Test
@@ -72,12 +62,10 @@
         when(mFeatureFactory.enterprisePrivacyFeatureProvider.isAlwaysOnVpnSetInManagedProfile())
                 .thenReturn(false);
         assertThat(mController.isAvailable()).isFalse();
-        verify(mObserver).onPreferenceAvailabilityUpdated(KEY_ALWAYS_ON_VPN_MANAGED_PROFILE, false);
 
         when(mFeatureFactory.enterprisePrivacyFeatureProvider.isAlwaysOnVpnSetInManagedProfile())
                 .thenReturn(true);
         assertThat(mController.isAvailable()).isTrue();
-        verify(mObserver).onPreferenceAvailabilityUpdated(KEY_ALWAYS_ON_VPN_MANAGED_PROFILE, true);
     }
 
     @Test
diff --git a/tests/robotests/src/com/android/settings/enterprise/ApplicationListFragmentTest.java b/tests/robotests/src/com/android/settings/enterprise/ApplicationListFragmentTest.java
index a6f95aa..fce2719 100644
--- a/tests/robotests/src/com/android/settings/enterprise/ApplicationListFragmentTest.java
+++ b/tests/robotests/src/com/android/settings/enterprise/ApplicationListFragmentTest.java
@@ -17,9 +17,7 @@
 package com.android.settings.enterprise;
 
 import static com.android.settings.testutils.ApplicationTestUtils.buildInfo;
-
 import static com.google.common.truth.Truth.assertThat;
-
 import static org.mockito.Answers.RETURNS_DEEP_STUBS;
 import static org.mockito.Mockito.when;
 
@@ -30,10 +28,10 @@
 
 import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
 import com.android.settings.R;
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
 import com.android.settings.applications.ApplicationFeatureProvider;
 import com.android.settings.applications.UserAppInfo;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settingslib.core.AbstractPreferenceController;
 
 import org.junit.Before;
@@ -48,7 +46,7 @@
 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_O)
 public class ApplicationListFragmentTest {
     private static final int USER_ID = 0;
     private static final int USER_APP_UID = 0;
@@ -86,7 +84,8 @@
 
     @Test
     public void getPreferenceControllers() {
-        final List<AbstractPreferenceController> controllers = mFragment.getPreferenceControllers(mContext);
+        final List<AbstractPreferenceController> controllers = mFragment.getPreferenceControllers(
+                mContext);
         assertThat(controllers).isNotNull();
         assertThat(controllers.size()).isEqualTo(1);
         int position = 0;
@@ -94,7 +93,8 @@
                 ApplicationListPreferenceController.class);
     }
 
-    @Test public void getCategories() {
+    @Test
+    public void getCategories() {
         assertThat(new ApplicationListFragment.AdminGrantedPermissionCamera().getMetricsCategory())
                 .isEqualTo(MetricsEvent.ENTERPRISE_PRIVACY_PERMISSIONS);
         assertThat(new ApplicationListFragment.AdminGrantedPermissionLocation().
diff --git a/tests/robotests/src/com/android/settings/enterprise/ApplicationListPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/enterprise/ApplicationListPreferenceControllerTest.java
index 0d22d2e..963b2ce 100644
--- a/tests/robotests/src/com/android/settings/enterprise/ApplicationListPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/enterprise/ApplicationListPreferenceControllerTest.java
@@ -16,17 +16,32 @@
 
 package com.android.settings.enterprise;
 
+import static com.android.settings.testutils.ApplicationTestUtils.buildInfo;
+
+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.doReturn;
+import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
 import android.content.Context;
 import android.content.pm.PackageManager;
 import android.content.pm.UserInfo;
+import android.os.UserManager;
 import android.support.v7.preference.Preference;
 import android.support.v7.preference.PreferenceScreen;
 
 import com.android.settings.SettingsPreferenceFragment;
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
 import com.android.settings.applications.ApplicationFeatureProvider;
 import com.android.settings.applications.UserAppInfo;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 
 import org.junit.Before;
 import org.junit.Test;
@@ -43,18 +58,8 @@
 import java.util.List;
 import java.util.Set;
 
-import static com.android.settings.testutils.ApplicationTestUtils.buildInfo;
-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.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_O)
 public class ApplicationListPreferenceControllerTest {
 
     private static final int MAIN_USER_ID = 0;
@@ -74,6 +79,8 @@
     private PackageManager mPackageManager;
     @Mock(answer = RETURNS_DEEP_STUBS)
     private SettingsPreferenceFragment mFragment;
+    @Mock
+    private UserManager mUserManager;
 
     private Context mContext;
     private ApplicationListPreferenceController mController;
@@ -82,7 +89,8 @@
     public void setUp() {
         MockitoAnnotations.initMocks(this);
         final ShadowApplication shadowContext = ShadowApplication.getInstance();
-        mContext = shadowContext.getApplicationContext();
+        mContext = spy(shadowContext.getApplicationContext());
+        doReturn(mUserManager).when(mContext).getSystemService(UserManager.class);
         when(mFragment.getPreferenceScreen()).thenReturn(mScreen);
         when(mFragment.getPreferenceManager().getContext()).thenReturn(mContext);
         when(mPackageManager.getText(eq(APP_1), anyInt(), any())).thenReturn(APP_1);
@@ -120,7 +128,7 @@
             implements ApplicationListPreferenceController.ApplicationListBuilder {
         @Override
         public void buildApplicationList(Context context,
-                                         ApplicationFeatureProvider.ListOfAppsCallback callback) {
+                ApplicationFeatureProvider.ListOfAppsCallback callback) {
             final List<UserAppInfo> apps = new ArrayList<>();
             final UserInfo user = new UserInfo(MAIN_USER_ID, "main", UserInfo.FLAG_ADMIN);
             apps.add(new UserAppInfo(user, buildInfo(MAIN_USER_APP_UID, APP_1, 0, 0)));
diff --git a/tests/robotests/src/com/android/settings/enterprise/BugReportsPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/enterprise/BugReportsPreferenceControllerTest.java
index 0b97353..cc1de27 100644
--- a/tests/robotests/src/com/android/settings/enterprise/BugReportsPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/enterprise/BugReportsPreferenceControllerTest.java
@@ -32,7 +32,7 @@
  * Tests for {@link BugReportsPreferenceController}.
  */
 @RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION_O)
 public final class BugReportsPreferenceControllerTest extends
         AdminActionPreferenceControllerTestBase {
 
diff --git a/tests/robotests/src/com/android/settings/enterprise/CaCertsCurrentUserPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/enterprise/CaCertsCurrentUserPreferenceControllerTest.java
index 35d78a5..c933d18 100644
--- a/tests/robotests/src/com/android/settings/enterprise/CaCertsCurrentUserPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/enterprise/CaCertsCurrentUserPreferenceControllerTest.java
@@ -35,7 +35,7 @@
  * Tests for {@link CaCertsCurrentUserPreferenceController}.
  */
 @RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION_O)
 public final class CaCertsCurrentUserPreferenceControllerTest extends
         CaCertsPreferenceControllerTestBase {
 
@@ -73,7 +73,7 @@
 
     @Override
     CaCertsPreferenceControllerBase createController() {
-        return new CaCertsCurrentUserPreferenceController(mContext, null /* lifecycle */);
+        return new CaCertsCurrentUserPreferenceController(mContext);
     }
 
     private void assertUpdateState(boolean isCompMode, String expectedTitle) {
diff --git a/tests/robotests/src/com/android/settings/enterprise/CaCertsManagedProfilePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/enterprise/CaCertsManagedProfilePreferenceControllerTest.java
index 41b7f45..d246488 100644
--- a/tests/robotests/src/com/android/settings/enterprise/CaCertsManagedProfilePreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/enterprise/CaCertsManagedProfilePreferenceControllerTest.java
@@ -28,7 +28,7 @@
  * Tests for {@link CaCertsManagedProfilePreferenceController}.
  */
 @RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION_O)
 public final class CaCertsManagedProfilePreferenceControllerTest extends
         CaCertsPreferenceControllerTestBase {
 
@@ -45,6 +45,6 @@
 
     @Override
     CaCertsPreferenceControllerBase createController() {
-        return new CaCertsManagedProfilePreferenceController(mContext, null /* lifecycle */);
+        return new CaCertsManagedProfilePreferenceController(mContext);
     }
 }
diff --git a/tests/robotests/src/com/android/settings/enterprise/CaCertsPreferenceControllerBaseTest.java b/tests/robotests/src/com/android/settings/enterprise/CaCertsPreferenceControllerBaseTest.java
index 37b903a..7a6bc88 100644
--- a/tests/robotests/src/com/android/settings/enterprise/CaCertsPreferenceControllerBaseTest.java
+++ b/tests/robotests/src/com/android/settings/enterprise/CaCertsPreferenceControllerBaseTest.java
@@ -28,7 +28,7 @@
  * Tests for {@link CaCertsPreferenceControllerBase}.
  */
 @RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION_O)
 public class CaCertsPreferenceControllerBaseTest extends CaCertsPreferenceControllerTestBase {
     private static final String PREF_KEY = "pref";
 
@@ -50,7 +50,7 @@
             CaCertsPreferenceControllerBase {
 
         public CaCertsPreferenceControllerBaseTestable(Context context) {
-            super(context, null);
+            super(context);
         }
 
         @Override
diff --git a/tests/robotests/src/com/android/settings/enterprise/CaCertsPreferenceControllerTestBase.java b/tests/robotests/src/com/android/settings/enterprise/CaCertsPreferenceControllerTestBase.java
index c171fba..c2fb4da 100644
--- a/tests/robotests/src/com/android/settings/enterprise/CaCertsPreferenceControllerTestBase.java
+++ b/tests/robotests/src/com/android/settings/enterprise/CaCertsPreferenceControllerTestBase.java
@@ -17,15 +17,12 @@
 package com.android.settings.enterprise;
 
 import static com.google.common.truth.Truth.assertThat;
-
-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.settings.R;
-import com.android.settings.core.PreferenceAvailabilityObserver;
 import com.android.settings.testutils.FakeFeatureFactory;
 
 import org.junit.Before;
@@ -43,8 +40,6 @@
     protected Context mContext;
     protected FakeFeatureFactory mFeatureFactory;
     protected CaCertsPreferenceControllerBase mController;
-    @Mock
-    private PreferenceAvailabilityObserver mObserver;
 
     @Before
     public void setUp() {
@@ -52,12 +47,6 @@
         FakeFeatureFactory.setupForTest(mContext);
         mFeatureFactory = (FakeFeatureFactory) FakeFeatureFactory.getFactory(mContext);
         mController = createController();
-        mController.setAvailabilityObserver(mObserver);
-    }
-
-    @Test
-    public void testGetAvailabilityObserver() {
-        assertThat(mController.getAvailabilityObserver()).isEqualTo(mObserver);
     }
 
     @Test
@@ -75,11 +64,9 @@
     public void testIsAvailable() {
         mockGetNumberOfCaCerts(0);
         assertThat(mController.isAvailable()).isFalse();
-        verify(mObserver).onPreferenceAvailabilityUpdated(getPreferenceKey(), false);
 
         mockGetNumberOfCaCerts(10);
         assertThat(mController.isAvailable()).isTrue();
-        verify(mObserver).onPreferenceAvailabilityUpdated(getPreferenceKey(), true);
     }
 
     @Test
diff --git a/tests/robotests/src/com/android/settings/enterprise/EnterpriseInstalledPackagesPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/enterprise/EnterpriseInstalledPackagesPreferenceControllerTest.java
index cc6335f..7ecd0e3 100644
--- a/tests/robotests/src/com/android/settings/enterprise/EnterpriseInstalledPackagesPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/enterprise/EnterpriseInstalledPackagesPreferenceControllerTest.java
@@ -16,15 +16,20 @@
 
 package com.android.settings.enterprise;
 
+import static com.google.common.truth.Truth.assertThat;
+import static org.mockito.Mockito.anyObject;
+import static org.mockito.Mockito.doAnswer;
+import static org.mockito.Mockito.eq;
+import static org.mockito.Mockito.when;
+
 import android.content.Context;
 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.applications.ApplicationFeatureProvider;
-import com.android.settings.core.PreferenceAvailabilityObserver;
 import com.android.settings.testutils.FakeFeatureFactory;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 
 import org.junit.Before;
 import org.junit.Test;
@@ -36,20 +41,11 @@
 import org.mockito.stubbing.Answer;
 import org.robolectric.annotation.Config;
 
-import static com.google.common.truth.Truth.assertThat;
-import static org.mockito.Mockito.anyBoolean;
-import static org.mockito.Mockito.anyObject;
-import static org.mockito.Mockito.doAnswer;
-import static org.mockito.Mockito.eq;
-import static org.mockito.Mockito.never;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
 /**
  * Tests for {@link EnterpriseInstalledPackagesPreferenceController}.
  */
 @RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION_O)
 public final class EnterpriseInstalledPackagesPreferenceControllerTest {
 
     private static final String KEY_NUMBER_ENTERPRISE_INSTALLED_PACKAGES
@@ -58,7 +54,6 @@
     @Mock(answer = Answers.RETURNS_DEEP_STUBS)
     private Context mContext;
     private FakeFeatureFactory mFeatureFactory;
-    @Mock private PreferenceAvailabilityObserver mObserver;
 
     private EnterpriseInstalledPackagesPreferenceController mController;
 
@@ -68,13 +63,7 @@
         FakeFeatureFactory.setupForTest(mContext);
         mFeatureFactory = (FakeFeatureFactory) FakeFeatureFactory.getFactory(mContext);
         mController = new EnterpriseInstalledPackagesPreferenceController(mContext,
-                null /* lifecycle */, true /* async */);
-        mController.setAvailabilityObserver(mObserver);
-    }
-
-    @Test
-    public void testGetAvailabilityObserver() {
-        assertThat(mController.getAvailabilityObserver()).isEqualTo(mObserver);
+                true /* async */);
     }
 
     private void setNumberOfEnterpriseInstalledPackages(int number, boolean async) {
@@ -83,8 +72,9 @@
                 ((ApplicationFeatureProvider.NumberOfAppsCallback)
                         invocation.getArguments()[1]).onNumberOfAppsResult(number);
                 return null;
-            }}).when(mFeatureFactory.applicationFeatureProvider)
-                    .calculateNumberOfPolicyInstalledApps(eq(async), anyObject());
+            }
+        }).when(mFeatureFactory.applicationFeatureProvider)
+                .calculateNumberOfPolicyInstalledApps(eq(async), anyObject());
     }
 
     @Test
@@ -95,8 +85,6 @@
         setNumberOfEnterpriseInstalledPackages(0, true /* async */);
         mController.updateState(preference);
         assertThat(preference.isVisible()).isFalse();
-        verify(mObserver).onPreferenceAvailabilityUpdated(KEY_NUMBER_ENTERPRISE_INSTALLED_PACKAGES,
-                false);
 
         setNumberOfEnterpriseInstalledPackages(20, true /* async */);
         when(mContext.getResources().getQuantityString(
@@ -105,39 +93,27 @@
         mController.updateState(preference);
         assertThat(preference.getSummary()).isEqualTo("minimum 20 apps");
         assertThat(preference.isVisible()).isTrue();
-        verify(mObserver).onPreferenceAvailabilityUpdated(KEY_NUMBER_ENTERPRISE_INSTALLED_PACKAGES,
-                true);
     }
 
     @Test
     public void testIsAvailableSync() {
         final EnterpriseInstalledPackagesPreferenceController controller
-                = new EnterpriseInstalledPackagesPreferenceController(mContext,
-                        null /* lifecycle */, false /* async */);
-        controller.setAvailabilityObserver(mObserver);
+                = new EnterpriseInstalledPackagesPreferenceController(mContext, false /* async */);
 
         setNumberOfEnterpriseInstalledPackages(0, false /* async */);
         assertThat(controller.isAvailable()).isFalse();
-        verify(mObserver).onPreferenceAvailabilityUpdated(
-                KEY_NUMBER_ENTERPRISE_INSTALLED_PACKAGES, false);
 
         setNumberOfEnterpriseInstalledPackages(20, false /* async */);
         assertThat(controller.isAvailable()).isTrue();
-        verify(mObserver).onPreferenceAvailabilityUpdated(
-                KEY_NUMBER_ENTERPRISE_INSTALLED_PACKAGES, true);
     }
 
     @Test
     public void testIsAvailableAsync() {
         setNumberOfEnterpriseInstalledPackages(0, true /* async */);
         assertThat(mController.isAvailable()).isTrue();
-        verify(mObserver, never()).onPreferenceAvailabilityUpdated(
-                eq(KEY_NUMBER_ENTERPRISE_INSTALLED_PACKAGES), anyBoolean());
 
         setNumberOfEnterpriseInstalledPackages(20, true /* async */);
         assertThat(mController.isAvailable()).isTrue();
-        verify(mObserver, never()).onPreferenceAvailabilityUpdated(
-                eq(KEY_NUMBER_ENTERPRISE_INSTALLED_PACKAGES), anyBoolean());
     }
 
     @Test
diff --git a/tests/robotests/src/com/android/settings/enterprise/EnterprisePrivacyFeatureProviderImplTest.java b/tests/robotests/src/com/android/settings/enterprise/EnterprisePrivacyFeatureProviderImplTest.java
index 899ff5c..516ccb5 100644
--- a/tests/robotests/src/com/android/settings/enterprise/EnterprisePrivacyFeatureProviderImplTest.java
+++ b/tests/robotests/src/com/android/settings/enterprise/EnterprisePrivacyFeatureProviderImplTest.java
@@ -31,8 +31,9 @@
 import com.android.settings.R;
 import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
-import com.android.settings.applications.PackageManagerWrapper;
-import com.android.settings.vpn2.ConnectivityManagerWrapper;
+import com.android.settings.wrapper.ConnectivityManagerWrapper;
+import com.android.settings.wrapper.DevicePolicyManagerWrapper;
+import com.android.settingslib.wrapper.PackageManagerWrapper;
 
 import org.junit.Before;
 import org.junit.Test;
@@ -56,7 +57,7 @@
  * Tests for {@link EnterprisePrivacyFeatureProviderImpl}.
  */
 @RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION_O)
 public final class EnterprisePrivacyFeatureProviderImplTest {
 
     private final ComponentName OWNER = new ComponentName("dummy", "component");
diff --git a/tests/robotests/src/com/android/settings/enterprise/EnterprisePrivacyPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/enterprise/EnterprisePrivacyPreferenceControllerTest.java
index 7077ad5..dd97cc0 100644
--- a/tests/robotests/src/com/android/settings/enterprise/EnterprisePrivacyPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/enterprise/EnterprisePrivacyPreferenceControllerTest.java
@@ -16,14 +16,16 @@
 
 package com.android.settings.enterprise;
 
+import static com.google.common.truth.Truth.assertThat;
+import static org.mockito.Mockito.when;
+
 import android.content.Context;
 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.PreferenceAvailabilityObserver;
 import com.android.settings.testutils.FakeFeatureFactory;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 
 import org.junit.Before;
 import org.junit.Test;
@@ -33,15 +35,11 @@
 import org.mockito.MockitoAnnotations;
 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;
-
 /**
  * Tests for {@link EnterprisePrivacyPreferenceController}.
  */
 @RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION_O)
 public final class EnterprisePrivacyPreferenceControllerTest {
 
     private static final String MANAGED_GENERIC = "managed by organization";
@@ -52,7 +50,6 @@
     @Mock(answer = Answers.RETURNS_DEEP_STUBS)
     private Context mContext;
     private FakeFeatureFactory mFeatureFactory;
-    @Mock private PreferenceAvailabilityObserver mObserver;
 
     private EnterprisePrivacyPreferenceController mController;
 
@@ -61,13 +58,7 @@
         MockitoAnnotations.initMocks(this);
         FakeFeatureFactory.setupForTest(mContext);
         mFeatureFactory = (FakeFeatureFactory) FakeFeatureFactory.getFactory(mContext);
-        mController = new EnterprisePrivacyPreferenceController(mContext, null /* lifecycle */);
-        mController.setAvailabilityObserver(mObserver);
-    }
-
-    @Test
-    public void testGetAvailabilityObserver() {
-        assertThat(mController.getAvailabilityObserver()).isEqualTo(mObserver);
+        mController = new EnterprisePrivacyPreferenceController(mContext);
     }
 
     @Test
@@ -88,17 +79,15 @@
                 .thenReturn(MANAGING_ORGANIZATION);
         mController.updateState(preference);
         assertThat(preference.getSummary()).isEqualTo(MANAGED_WITH_NAME);
-      }
+    }
 
     @Test
     public void testIsAvailable() {
         when(mFeatureFactory.enterprisePrivacyFeatureProvider.hasDeviceOwner()).thenReturn(false);
         assertThat(mController.isAvailable()).isFalse();
-        verify(mObserver).onPreferenceAvailabilityUpdated(KEY_ENTERPRISE_PRIVACY, false);
 
         when(mFeatureFactory.enterprisePrivacyFeatureProvider.hasDeviceOwner()).thenReturn(true);
         assertThat(mController.isAvailable()).isTrue();
-        verify(mObserver).onPreferenceAvailabilityUpdated(KEY_ENTERPRISE_PRIVACY, true);
     }
 
     @Test
diff --git a/tests/robotests/src/com/android/settings/enterprise/EnterprisePrivacySettingsTest.java b/tests/robotests/src/com/android/settings/enterprise/EnterprisePrivacySettingsTest.java
index 4da3289..1a37e63 100644
--- a/tests/robotests/src/com/android/settings/enterprise/EnterprisePrivacySettingsTest.java
+++ b/tests/robotests/src/com/android/settings/enterprise/EnterprisePrivacySettingsTest.java
@@ -17,18 +17,16 @@
 package com.android.settings.enterprise;
 
 import static com.google.common.truth.Truth.assertThat;
-
 import static org.mockito.Mockito.when;
 
 import android.content.Context;
-import android.content.res.XmlResourceParser;
 
 import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
 import com.android.settings.R;
 import com.android.settings.TestConfig;
-import com.android.settings.core.DynamicAvailabilityPreferenceController;
 import com.android.settings.testutils.FakeFeatureFactory;
 import com.android.settings.testutils.SettingsRobolectricTestRunner;
+import com.android.settings.widget.PreferenceCategoryController;
 import com.android.settingslib.core.AbstractPreferenceController;
 
 import org.junit.Before;
@@ -37,25 +35,18 @@
 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.xmlpull.v1.XmlPullParser;
 
-import java.util.HashSet;
 import java.util.List;
-import java.util.Set;
 
 /**
  * Tests for {@link EnterprisePrivacySettings}.
  */
 @RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION_O)
 public final class EnterprisePrivacySettingsTest {
 
-    private final static String RESOURCES_NAMESPACE = "http://schemas.android.com/apk/res/android";
-    private final static String ATTR_KEY = "key";
-
     @Mock(answer = Answers.RETURNS_DEEP_STUBS)
     private Context mContext;
     private FakeFeatureFactory mFeatureFactory;
@@ -71,23 +62,11 @@
     }
 
     @Test
-    public void testGetMetricsCategory() {
+    public void verifyConstants() {
         assertThat(mSettings.getMetricsCategory())
                 .isEqualTo(MetricsEvent.ENTERPRISE_PRIVACY_SETTINGS);
-    }
-
-    @Test
-    public void testGetCategoryKey() {
-        assertThat(mSettings.getCategoryKey()).isNull();
-    }
-
-    @Test
-    public void testGetLogTag() {
         assertThat(mSettings.getLogTag()).isEqualTo("EnterprisePrivacySettings");
-    }
-
-    @Test
-    public void testGetPreferenceScreenResId() {
+        assertThat(mSettings.getCategoryKey()).isNull();
         assertThat(mSettings.getPreferenceScreenResId())
                 .isEqualTo(R.xml.enterprise_privacy_settings);
     }
@@ -121,7 +100,7 @@
     public void getSearchIndexProviderPreferenceControllers() throws Exception {
         final List<AbstractPreferenceController> controllers
                 = EnterprisePrivacySettings.SEARCH_INDEX_DATA_PROVIDER.getPreferenceControllers(
-                        ShadowApplication.getInstance().getApplicationContext());
+                ShadowApplication.getInstance().getApplicationContext());
         verifyPreferenceControllers(controllers);
     }
 
@@ -155,67 +134,11 @@
                 CaCertsCurrentUserPreferenceController.class);
         assertThat(controllers.get(position++)).isInstanceOf(
                 CaCertsManagedProfilePreferenceController.class);
-        final AbstractPreferenceController exposureChangesCategoryController =
-                controllers.get(position);
-        final int exposureChangesCategoryControllerIndex = position;
         assertThat(controllers.get(position++)).isInstanceOf(
-                ExposureChangesCategoryPreferenceController.class);
+                PreferenceCategoryController.class);
         assertThat(controllers.get(position++)).isInstanceOf(
                 FailedPasswordWipeCurrentUserPreferenceController.class);
         assertThat(controllers.get(position++)).isInstanceOf(
                 FailedPasswordWipeManagedProfilePreferenceController.class);
-
-        // The "Changes made by your organization's admin" category is hidden when all Preferences
-        // inside it become unavailable. To do this correctly, the category's controller must:
-        // a) Observe the availability of all Preferences in the category and
-        // b) Be listed after those Preferences' controllers, so that availability is updated in
-        //    the correct order
-
-        // Find all Preferences in the category.
-        final XmlResourceParser parser = RuntimeEnvironment.application.getResources().getXml(
-                R.xml.enterprise_privacy_settings);
-        boolean done = false;
-        int type;
-        final Set<String> expectedObserved = new HashSet<>();
-        while (!done && (type = parser.next()) != XmlPullParser.END_DOCUMENT) {
-            if (type != XmlPullParser.START_TAG || !"exposure_changes_category".equals(
-                    parser.getAttributeValue(RESOURCES_NAMESPACE, ATTR_KEY))) {
-                continue;
-            }
-            int depth = 1;
-            while ((type = parser.next()) != XmlPullParser.END_DOCUMENT) {
-                if (type == XmlPullParser.START_TAG) {
-                    final String key = parser.getAttributeValue(RESOURCES_NAMESPACE, ATTR_KEY);
-                    if (key != null) {
-                        expectedObserved.add(key);
-                    }
-                    depth++;
-                } else if (type == XmlPullParser.END_TAG) {
-                    depth--;
-                    if (depth == 0) {
-                        done = true;
-                        break;
-                    }
-                }
-            }
-        }
-
-        // Find all Preferences the category's controller is observing.
-        final Set<String> actualObserved = new HashSet<>();
-        int maxObservedIndex = -1;
-        for (int i = 0; i < controllers.size(); i++) {
-            final AbstractPreferenceController controller = controllers.get(i);
-            if (controller instanceof DynamicAvailabilityPreferenceController &&
-                    ((DynamicAvailabilityPreferenceController) controller).getAvailabilityObserver()
-                            == exposureChangesCategoryController) {
-                actualObserved.add(controller.getPreferenceKey());
-                maxObservedIndex = i;
-            }
-        }
-
-        // Verify that the category's controller is observing the Preferences inside it.
-        assertThat(actualObserved).isEqualTo(expectedObserved);
-        // Verify that the category's controller is listed after the Preferences' controllers.
-        assertThat(maxObservedIndex).isLessThan(exposureChangesCategoryControllerIndex);
     }
 }
diff --git a/tests/robotests/src/com/android/settings/enterprise/EnterpriseSetDefaultAppsListFragmentTest.java b/tests/robotests/src/com/android/settings/enterprise/EnterpriseSetDefaultAppsListFragmentTest.java
index 567c06f..c47a0ac 100644
--- a/tests/robotests/src/com/android/settings/enterprise/EnterpriseSetDefaultAppsListFragmentTest.java
+++ b/tests/robotests/src/com/android/settings/enterprise/EnterpriseSetDefaultAppsListFragmentTest.java
@@ -42,7 +42,7 @@
 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_O)
 public class EnterpriseSetDefaultAppsListFragmentTest {
     @Mock(answer = RETURNS_DEEP_STUBS)
     private PreferenceScreen mScreen;
diff --git a/tests/robotests/src/com/android/settings/enterprise/EnterpriseSetDefaultAppsListPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/enterprise/EnterpriseSetDefaultAppsListPreferenceControllerTest.java
index c38f56a..cf66967 100644
--- a/tests/robotests/src/com/android/settings/enterprise/EnterpriseSetDefaultAppsListPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/enterprise/EnterpriseSetDefaultAppsListPreferenceControllerTest.java
@@ -59,7 +59,7 @@
 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_O)
 public class EnterpriseSetDefaultAppsListPreferenceControllerTest {
     private static final int USER_ID = 0;
     private static final int APP_UID = 0;
diff --git a/tests/robotests/src/com/android/settings/enterprise/EnterpriseSetDefaultAppsPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/enterprise/EnterpriseSetDefaultAppsPreferenceControllerTest.java
index bb21bf7..1223558 100644
--- a/tests/robotests/src/com/android/settings/enterprise/EnterpriseSetDefaultAppsPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/enterprise/EnterpriseSetDefaultAppsPreferenceControllerTest.java
@@ -17,7 +17,6 @@
 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;
@@ -29,16 +28,14 @@
 import android.content.pm.ApplicationInfo;
 import android.content.pm.UserInfo;
 import android.os.UserHandle;
-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.applications.EnterpriseDefaultApps;
 import com.android.settings.applications.UserAppInfo;
-import com.android.settings.core.PreferenceAvailabilityObserver;
 import com.android.settings.testutils.FakeFeatureFactory;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 
 import org.junit.Before;
 import org.junit.Test;
@@ -51,13 +48,11 @@
 
 import java.util.ArrayList;
 import java.util.List;
-
-import static org.mockito.Mockito.verify;
 /**
  * Tests for {@link EnterpriseSetDefaultAppsPreferenceController}.
  */
 @RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION_O)
 public final class EnterpriseSetDefaultAppsPreferenceControllerTest {
 
     private static final String KEY_DEFAULT_APPS = "number_enterprise_set_default_apps";
@@ -65,9 +60,7 @@
     @Mock(answer = Answers.RETURNS_DEEP_STUBS)
     private Context mContext;
     @Mock(answer = Answers.RETURNS_DEEP_STUBS)
-    private UserManager mUm;
     private FakeFeatureFactory mFeatureFactory;
-    @Mock private PreferenceAvailabilityObserver mObserver;
 
     private EnterpriseSetDefaultAppsPreferenceController mController;
 
@@ -76,14 +69,7 @@
         MockitoAnnotations.initMocks(this);
         FakeFeatureFactory.setupForTest(mContext);
         mFeatureFactory = (FakeFeatureFactory) FakeFeatureFactory.getFactory(mContext);
-        mController = new EnterpriseSetDefaultAppsPreferenceController(mContext,
-                null /* lifecycle */);
-        mController.setAvailabilityObserver(mObserver);
-    }
-
-    @Test
-    public void testGetAvailabilityObserver() {
-        assertThat(mController.getAvailabilityObserver()).isEqualTo(mObserver);
+        mController = new EnterpriseSetDefaultAppsPreferenceController(mContext);
     }
 
     private void setEnterpriseSetDefaultApps(Intent[] intents, int number) {
@@ -130,12 +116,10 @@
         when(mFeatureFactory.applicationFeatureProvider.findPersistentPreferredActivities(anyInt(),
                 any(Intent[].class))).thenReturn(new ArrayList<>());
         assertThat(mController.isAvailable()).isFalse();
-        verify(mObserver).onPreferenceAvailabilityUpdated(KEY_DEFAULT_APPS, false);
 
         setEnterpriseSetDefaultApps(EnterpriseDefaultApps.BROWSER.getIntents(), 1);
         configureUsers(1);
         assertThat(mController.isAvailable()).isTrue();
-        verify(mObserver).onPreferenceAvailabilityUpdated(KEY_DEFAULT_APPS, true);
     }
 
     @Test
diff --git a/tests/robotests/src/com/android/settings/enterprise/ExposureChangesCategoryPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/enterprise/ExposureChangesCategoryPreferenceControllerTest.java
deleted file mode 100644
index f77aef8..0000000
--- a/tests/robotests/src/com/android/settings/enterprise/ExposureChangesCategoryPreferenceControllerTest.java
+++ /dev/null
@@ -1,192 +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.enterprise;
-
-import android.content.Context;
-import android.support.v7.preference.Preference;
-
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.TestConfig;
-import com.android.settings.core.DynamicAvailabilityPreferenceController;
-import com.android.settings.core.PreferenceAvailabilityObserver;
-
-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.Arrays;
-import java.util.List;
-
-import static com.google.common.truth.Truth.assertThat;
-import static org.mockito.Mockito.anyBoolean;
-import static org.mockito.Mockito.eq;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.never;
-import static org.mockito.Mockito.reset;
-import static org.mockito.Mockito.verify;
-
-/**
- * Tests for {@link ExposureChangesCategoryPreferenceController}.
- */
-@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
-public final class ExposureChangesCategoryPreferenceControllerTest {
-
-    private static final String KEY_1 = "key_1";
-    private static final String KEY_2 = "key_2";
-    private static final String KEY_EXPOSURE_CHANGES_CATEGORY = "exposure_changes_category";
-
-    @Mock(answer = Answers.RETURNS_DEEP_STUBS)
-    private Context mContext;
-    private List<DynamicAvailabilityPreferenceController> mControllers;
-    private ExposureChangesCategoryPreferenceController mController;
-    @Mock private PreferenceAvailabilityObserver mObserver;
-
-    @Before
-    public void setUp() {
-        MockitoAnnotations.initMocks(this);
-        mControllers = Arrays.asList(mock(DynamicAvailabilityPreferenceController.class),
-                mock(DynamicAvailabilityPreferenceController.class));
-        mController = new ExposureChangesCategoryPreferenceController(mContext,
-                null /* lifecycle */, mControllers, true /* controllingUi */);
-        mController.setAvailabilityObserver(mObserver);
-    }
-
-    @Test
-    public void testInitialization() {
-        verify(mControllers.get(0)).setAvailabilityObserver(mController);
-        verify(mControllers.get(1)).setAvailabilityObserver(mController);
-    }
-
-    @Test
-    public void testGetAvailabilityObserver() {
-        assertThat(mController.getAvailabilityObserver()).isEqualTo(mObserver);
-    }
-
-    @Test
-    public void testOnPreferenceAvailabilityUpdated() {
-        final Preference preference = new Preference(mContext, null, 0, 0);
-        preference.setVisible(true);
-
-        mController.updateState(preference);
-        assertThat(preference.isVisible()).isFalse();
-
-        mController.onPreferenceAvailabilityUpdated(KEY_1, true);
-        verify(mObserver).onPreferenceAvailabilityUpdated(KEY_EXPOSURE_CHANGES_CATEGORY, true);
-        assertThat(preference.isVisible()).isTrue();
-        reset(mObserver);
-
-        mController.onPreferenceAvailabilityUpdated(KEY_2, true);
-        verify(mObserver).onPreferenceAvailabilityUpdated(KEY_EXPOSURE_CHANGES_CATEGORY, true);
-        assertThat(preference.isVisible()).isTrue();
-        reset(mObserver);
-
-        mController.onPreferenceAvailabilityUpdated(KEY_1, false);
-        verify(mObserver).onPreferenceAvailabilityUpdated(KEY_EXPOSURE_CHANGES_CATEGORY, true);
-        assertThat(preference.isVisible()).isTrue();
-        reset(mObserver);
-
-        mController.onPreferenceAvailabilityUpdated(KEY_2, false);
-        verify(mObserver).onPreferenceAvailabilityUpdated(KEY_EXPOSURE_CHANGES_CATEGORY, false);
-        assertThat(preference.isVisible()).isFalse();
-    }
-
-    @Test
-    public void testUpdateState() {
-        final Preference preference = new Preference(mContext, null, 0, 0);
-        preference.setVisible(false);
-
-        mController.onPreferenceAvailabilityUpdated(KEY_1, true);
-        mController.updateState(preference);
-        assertThat(preference.isVisible()).isTrue();
-    }
-
-    @Test
-    public void testIsAvailableForUi() {
-        assertThat(mController.isAvailable()).isTrue();
-        verify(mObserver, never()).onPreferenceAvailabilityUpdated(
-                eq(KEY_EXPOSURE_CHANGES_CATEGORY), anyBoolean());
-
-        mController.onPreferenceAvailabilityUpdated(KEY_1, true);
-        reset(mObserver);
-        assertThat(mController.isAvailable()).isTrue();
-        verify(mObserver, never()).onPreferenceAvailabilityUpdated(
-                eq(KEY_EXPOSURE_CHANGES_CATEGORY), anyBoolean());
-
-        mController.onPreferenceAvailabilityUpdated(KEY_1, false);
-        reset(mObserver);
-        assertThat(mController.isAvailable()).isTrue();
-        verify(mObserver, never()).onPreferenceAvailabilityUpdated(
-                eq(KEY_EXPOSURE_CHANGES_CATEGORY), anyBoolean());
-    }
-
-    @Test
-    public void testIsAvailableForSearch() {
-        final ExposureChangesCategoryPreferenceController controller
-                = new ExposureChangesCategoryPreferenceController(mContext, null /* lifecycle */,
-                        mControllers, false /* controllingUi */);
-        controller.setAvailabilityObserver(mObserver);
-        verify(mControllers.get(0)).setAvailabilityObserver(controller);
-        verify(mControllers.get(1)).setAvailabilityObserver(controller);
-
-        assertThat(controller.isAvailable()).isFalse();
-        verify(mObserver).onPreferenceAvailabilityUpdated(KEY_EXPOSURE_CHANGES_CATEGORY, false);
-        reset(mObserver);
-
-        controller.onPreferenceAvailabilityUpdated(KEY_1, true);
-        verify(mObserver, never()).onPreferenceAvailabilityUpdated(
-                eq(KEY_EXPOSURE_CHANGES_CATEGORY), anyBoolean());
-        assertThat(controller.isAvailable()).isTrue();
-        verify(mObserver).onPreferenceAvailabilityUpdated(KEY_EXPOSURE_CHANGES_CATEGORY, true);
-        reset(mObserver);
-
-        controller.onPreferenceAvailabilityUpdated(KEY_2, true);
-        verify(mObserver, never()).onPreferenceAvailabilityUpdated(
-                eq(KEY_EXPOSURE_CHANGES_CATEGORY), anyBoolean());
-        assertThat(controller.isAvailable()).isTrue();
-        verify(mObserver).onPreferenceAvailabilityUpdated(KEY_EXPOSURE_CHANGES_CATEGORY, true);
-        reset(mObserver);
-
-        controller.onPreferenceAvailabilityUpdated(KEY_1, false);
-        verify(mObserver, never()).onPreferenceAvailabilityUpdated(
-                eq(KEY_EXPOSURE_CHANGES_CATEGORY), anyBoolean());
-        assertThat(controller.isAvailable()).isTrue();
-        verify(mObserver).onPreferenceAvailabilityUpdated(KEY_EXPOSURE_CHANGES_CATEGORY, true);
-        reset(mObserver);
-
-        controller.onPreferenceAvailabilityUpdated(KEY_2, false);
-        verify(mObserver, never()).onPreferenceAvailabilityUpdated(
-                eq(KEY_EXPOSURE_CHANGES_CATEGORY), anyBoolean());
-        assertThat(controller.isAvailable()).isFalse();
-        verify(mObserver).onPreferenceAvailabilityUpdated(KEY_EXPOSURE_CHANGES_CATEGORY, false);
-    }
-
-    @Test
-    public void testHandlePreferenceTreeClick() {
-        assertThat(mController.handlePreferenceTreeClick(new Preference(mContext, null, 0, 0)))
-                .isFalse();
-    }
-
-    @Test
-    public void testGetPreferenceKey() {
-        assertThat(mController.getPreferenceKey()).isEqualTo(KEY_EXPOSURE_CHANGES_CATEGORY);
-    }
-}
diff --git a/tests/robotests/src/com/android/settings/enterprise/FailedPasswordWipeCurrentUserPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/enterprise/FailedPasswordWipeCurrentUserPreferenceControllerTest.java
index db9182b..77d6ea0 100644
--- a/tests/robotests/src/com/android/settings/enterprise/FailedPasswordWipeCurrentUserPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/enterprise/FailedPasswordWipeCurrentUserPreferenceControllerTest.java
@@ -16,24 +16,22 @@
 
 package com.android.settings.enterprise;
 
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
+import static org.mockito.Mockito.when;
+
 import com.android.settings.TestConfig;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 
 import org.junit.runner.RunWith;
 import org.robolectric.annotation.Config;
 
-import static org.mockito.Mockito.when;
-
 /**
  * Tests for {@link FailedPasswordWipeCurrentUserPreferenceController}.
  */
 @RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION_O)
 public final class FailedPasswordWipeCurrentUserPreferenceControllerTest extends
         FailedPasswordWipePreferenceControllerTestBase {
 
-    private int mMaximumFailedPasswordsBeforeWipe = 0;
-
     public FailedPasswordWipeCurrentUserPreferenceControllerTest() {
         super("failed_password_wipe_current_user");
     }
@@ -41,8 +39,7 @@
     @Override
     public void setUp() {
         super.setUp();
-        mController = new FailedPasswordWipeCurrentUserPreferenceController(mContext,
-                null /* lifecycle */);
+        mController = new FailedPasswordWipeCurrentUserPreferenceController(mContext);
     }
 
     @Override
diff --git a/tests/robotests/src/com/android/settings/enterprise/FailedPasswordWipeManagedProfilePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/enterprise/FailedPasswordWipeManagedProfilePreferenceControllerTest.java
index 329c526..c88c22b 100644
--- a/tests/robotests/src/com/android/settings/enterprise/FailedPasswordWipeManagedProfilePreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/enterprise/FailedPasswordWipeManagedProfilePreferenceControllerTest.java
@@ -16,24 +16,22 @@
 
 package com.android.settings.enterprise;
 
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
+import static org.mockito.Mockito.when;
+
 import com.android.settings.TestConfig;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 
 import org.junit.runner.RunWith;
 import org.robolectric.annotation.Config;
 
-import static org.mockito.Mockito.when;
-
 /**
  * Tests for {@link FailedPasswordWipeManagedProfilePreferenceController}.
  */
 @RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION_O)
 public final class FailedPasswordWipeManagedProfilePreferenceControllerTest extends
         FailedPasswordWipePreferenceControllerTestBase {
 
-    private int mMaximumFailedPasswordsBeforeWipe = 0;
-
     public FailedPasswordWipeManagedProfilePreferenceControllerTest() {
         super("failed_password_wipe_managed_profile");
     }
@@ -41,8 +39,7 @@
     @Override
     public void setUp() {
         super.setUp();
-        mController = new FailedPasswordWipeManagedProfilePreferenceController(mContext,
-                null /* lifecycle */);
+        mController = new FailedPasswordWipeManagedProfilePreferenceController(mContext);
     }
 
     @Override
diff --git a/tests/robotests/src/com/android/settings/enterprise/FailedPasswordWipePreferenceControllerBaseTest.java b/tests/robotests/src/com/android/settings/enterprise/FailedPasswordWipePreferenceControllerBaseTest.java
index 5d1b28a..ecc490f 100644
--- a/tests/robotests/src/com/android/settings/enterprise/FailedPasswordWipePreferenceControllerBaseTest.java
+++ b/tests/robotests/src/com/android/settings/enterprise/FailedPasswordWipePreferenceControllerBaseTest.java
@@ -16,8 +16,8 @@
 
 package com.android.settings.enterprise;
 
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 
 import org.junit.runner.RunWith;
 import org.robolectric.annotation.Config;
@@ -26,7 +26,7 @@
  * Tests for {@link FailedPasswordWipePreferenceControllerBase}.
  */
 @RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION_O)
 public final class FailedPasswordWipePreferenceControllerBaseTest extends
         FailedPasswordWipePreferenceControllerTestBase {
 
@@ -50,8 +50,7 @@
     private class FailedPasswordWipePreferenceControllerBaseTestable extends
             FailedPasswordWipePreferenceControllerBase {
         FailedPasswordWipePreferenceControllerBaseTestable() {
-            super(FailedPasswordWipePreferenceControllerBaseTest.this.mContext,
-                    null /* lifecycle */);
+            super(FailedPasswordWipePreferenceControllerBaseTest.this.mContext);
         }
 
         @Override
diff --git a/tests/robotests/src/com/android/settings/enterprise/FailedPasswordWipePreferenceControllerTestBase.java b/tests/robotests/src/com/android/settings/enterprise/FailedPasswordWipePreferenceControllerTestBase.java
index cbc220f..fe4fb6b 100644
--- a/tests/robotests/src/com/android/settings/enterprise/FailedPasswordWipePreferenceControllerTestBase.java
+++ b/tests/robotests/src/com/android/settings/enterprise/FailedPasswordWipePreferenceControllerTestBase.java
@@ -16,12 +16,13 @@
 
 package com.android.settings.enterprise;
 
+import static com.google.common.truth.Truth.assertThat;
+import static org.mockito.Mockito.when;
+
 import android.content.Context;
-import android.content.res.Resources;
 import android.support.v7.preference.Preference;
 
 import com.android.settings.R;
-import com.android.settings.core.PreferenceAvailabilityObserver;
 import com.android.settings.testutils.FakeFeatureFactory;
 
 import org.junit.Before;
@@ -30,10 +31,6 @@
 import org.mockito.Mock;
 import org.mockito.MockitoAnnotations;
 
-import static com.google.common.truth.Truth.assertThat;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
 /**
  * Common base for testing subclasses of {@link FailedPasswordWipePreferenceControllerBase}.
  */
@@ -44,7 +41,6 @@
     @Mock(answer = Answers.RETURNS_DEEP_STUBS)
     protected Context mContext;
     protected FakeFeatureFactory mFeatureFactory;
-    @Mock private PreferenceAvailabilityObserver mObserver;
 
     protected FailedPasswordWipePreferenceControllerBase mController;
 
@@ -59,12 +55,6 @@
         mFeatureFactory = (FakeFeatureFactory) FakeFeatureFactory.getFactory(mContext);
     }
 
-    @Test
-    public void testGetAvailabilityObserver() {
-        mController.setAvailabilityObserver(mObserver);
-        assertThat(mController.getAvailabilityObserver()).isEqualTo(mObserver);
-    }
-
     public abstract void setMaximumFailedPasswordsBeforeWipe(int maximum);
 
     @Test
@@ -81,15 +71,11 @@
 
     @Test
     public void testIsAvailable() {
-        mController.setAvailabilityObserver(mObserver);
-
         setMaximumFailedPasswordsBeforeWipe(0);
         assertThat(mController.isAvailable()).isFalse();
-        verify(mObserver).onPreferenceAvailabilityUpdated(mKey, false);
 
         setMaximumFailedPasswordsBeforeWipe(10);
         assertThat(mController.isAvailable()).isTrue();
-        verify(mObserver).onPreferenceAvailabilityUpdated(mKey, true);
     }
 
     @Test
diff --git a/tests/robotests/src/com/android/settings/enterprise/GlobalHttpProxyPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/enterprise/GlobalHttpProxyPreferenceControllerTest.java
index d5ce102..e31b40f 100644
--- a/tests/robotests/src/com/android/settings/enterprise/GlobalHttpProxyPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/enterprise/GlobalHttpProxyPreferenceControllerTest.java
@@ -16,13 +16,15 @@
 
 package com.android.settings.enterprise;
 
+import static com.google.common.truth.Truth.assertThat;
+import static org.mockito.Mockito.when;
+
 import android.content.Context;
 import android.support.v7.preference.Preference;
 
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
-import com.android.settings.core.PreferenceAvailabilityObserver;
 import com.android.settings.testutils.FakeFeatureFactory;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 
 import org.junit.Before;
 import org.junit.Test;
@@ -32,15 +34,11 @@
 import org.mockito.MockitoAnnotations;
 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;
-
 /**
  * Tests for {@link GlobalHttpProxyPreferenceController}.
  */
 @RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION_O)
 public final class GlobalHttpProxyPreferenceControllerTest {
 
     private static final String KEY_GLOBAL_HTTP_PROXY = "global_http_proxy";
@@ -48,7 +46,6 @@
     @Mock(answer = Answers.RETURNS_DEEP_STUBS)
     private Context mContext;
     private FakeFeatureFactory mFeatureFactory;
-    @Mock private PreferenceAvailabilityObserver mObserver;
 
     private GlobalHttpProxyPreferenceController mController;
 
@@ -57,13 +54,7 @@
         MockitoAnnotations.initMocks(this);
         FakeFeatureFactory.setupForTest(mContext);
         mFeatureFactory = (FakeFeatureFactory) FakeFeatureFactory.getFactory(mContext);
-        mController = new GlobalHttpProxyPreferenceController(mContext, null /* lifecycle */);
-        mController.setAvailabilityObserver(mObserver);
-    }
-
-    @Test
-    public void testGetAvailabilityObserver() {
-        assertThat(mController.getAvailabilityObserver()).isEqualTo(mObserver);
+        mController = new GlobalHttpProxyPreferenceController(mContext);
     }
 
     @Test
@@ -71,12 +62,10 @@
         when(mFeatureFactory.enterprisePrivacyFeatureProvider.isGlobalHttpProxySet())
                 .thenReturn(false);
         assertThat(mController.isAvailable()).isFalse();
-        verify(mObserver).onPreferenceAvailabilityUpdated(KEY_GLOBAL_HTTP_PROXY, false);
 
         when(mFeatureFactory.enterprisePrivacyFeatureProvider.isGlobalHttpProxySet())
                 .thenReturn(true);
         assertThat(mController.isAvailable()).isTrue();
-        verify(mObserver).onPreferenceAvailabilityUpdated(KEY_GLOBAL_HTTP_PROXY, true);
     }
 
     @Test
diff --git a/tests/robotests/src/com/android/settings/enterprise/ImePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/enterprise/ImePreferenceControllerTest.java
index 22d2a7d..caa5121 100644
--- a/tests/robotests/src/com/android/settings/enterprise/ImePreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/enterprise/ImePreferenceControllerTest.java
@@ -16,15 +16,16 @@
 
 package com.android.settings.enterprise;
 
-import android.content.Context;
+import static com.google.common.truth.Truth.assertThat;
+import static org.mockito.Mockito.when;
 
-import com.android.settings.R;
+import android.content.Context;
 import android.support.v7.preference.Preference;
 
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
+import com.android.settings.R;
 import com.android.settings.TestConfig;
-import com.android.settings.core.PreferenceAvailabilityObserver;
 import com.android.settings.testutils.FakeFeatureFactory;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 
 import org.junit.Before;
 import org.junit.Test;
@@ -34,15 +35,11 @@
 import org.mockito.MockitoAnnotations;
 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;
-
 /**
  * Tests for {@link ImePreferenceController}.
  */
 @RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION_O)
 public final class ImePreferenceControllerTest {
 
     private static final String DEFAULT_IME_LABEL = "Test IME";
@@ -52,7 +49,6 @@
     @Mock(answer = Answers.RETURNS_DEEP_STUBS)
     private Context mContext;
     private FakeFeatureFactory mFeatureFactory;
-    @Mock private PreferenceAvailabilityObserver mObserver;
 
     private ImePreferenceController mController;
 
@@ -61,15 +57,9 @@
         MockitoAnnotations.initMocks(this);
         FakeFeatureFactory.setupForTest(mContext);
         mFeatureFactory = (FakeFeatureFactory) FakeFeatureFactory.getFactory(mContext);
-        mController = new ImePreferenceController(mContext, null /* lifecycle */);
+        mController = new ImePreferenceController(mContext);
         when(mContext.getResources().getString(R.string.enterprise_privacy_input_method_name,
                 DEFAULT_IME_LABEL)).thenReturn(DEFAULT_IME_TEXT);
-        mController.setAvailabilityObserver(mObserver);
-    }
-
-    @Test
-    public void testGetAvailabilityObserver() {
-        assertThat(mController.getAvailabilityObserver()).isEqualTo(mObserver);
     }
 
     @Test
@@ -77,7 +67,7 @@
         final Preference preference = new Preference(mContext, null, 0, 0);
 
         when(mFeatureFactory.enterprisePrivacyFeatureProvider.getImeLabelIfOwnerSet())
-            .thenReturn(DEFAULT_IME_LABEL);
+                .thenReturn(DEFAULT_IME_LABEL);
         mController.updateState(preference);
         assertThat(preference.getSummary()).isEqualTo(DEFAULT_IME_TEXT);
     }
@@ -85,14 +75,12 @@
     @Test
     public void testIsAvailable() {
         when(mFeatureFactory.enterprisePrivacyFeatureProvider.getImeLabelIfOwnerSet())
-            .thenReturn(null);
+                .thenReturn(null);
         assertThat(mController.isAvailable()).isFalse();
-        verify(mObserver).onPreferenceAvailabilityUpdated(KEY_INPUT_METHOD, false);
 
         when(mFeatureFactory.enterprisePrivacyFeatureProvider.getImeLabelIfOwnerSet())
-            .thenReturn(DEFAULT_IME_LABEL);
+                .thenReturn(DEFAULT_IME_LABEL);
         assertThat(mController.isAvailable()).isTrue();
-        verify(mObserver).onPreferenceAvailabilityUpdated(KEY_INPUT_METHOD, true);
     }
 
     @Test
diff --git a/tests/robotests/src/com/android/settings/enterprise/ManageDeviceAdminPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/enterprise/ManageDeviceAdminPreferenceControllerTest.java
index 2df05c2..f46ecce 100644
--- a/tests/robotests/src/com/android/settings/enterprise/ManageDeviceAdminPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/enterprise/ManageDeviceAdminPreferenceControllerTest.java
@@ -39,7 +39,7 @@
  * Tests for {@link ManageDeviceAdminPreferenceController}.
  */
 @RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION_O)
 public final class ManageDeviceAdminPreferenceControllerTest {
 
     @Mock(answer = Answers.RETURNS_DEEP_STUBS)
diff --git a/tests/robotests/src/com/android/settings/enterprise/NetworkLogsPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/enterprise/NetworkLogsPreferenceControllerTest.java
index 43b793d..e8f7398 100644
--- a/tests/robotests/src/com/android/settings/enterprise/NetworkLogsPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/enterprise/NetworkLogsPreferenceControllerTest.java
@@ -32,7 +32,7 @@
  * Tests for {@link NetworkLogsPreferenceController}.
  */
 @RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION_O)
 public final class NetworkLogsPreferenceControllerTest extends
         AdminActionPreferenceControllerTestBase {
 
diff --git a/tests/robotests/src/com/android/settings/enterprise/SecurityLogsPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/enterprise/SecurityLogsPreferenceControllerTest.java
index 11e219a..7a597dc 100644
--- a/tests/robotests/src/com/android/settings/enterprise/SecurityLogsPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/enterprise/SecurityLogsPreferenceControllerTest.java
@@ -32,7 +32,7 @@
  * Tests for {@link SecurityLogsPreferenceController}.
  */
 @RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION_O)
 public final class SecurityLogsPreferenceControllerTest extends
         AdminActionPreferenceControllerTestBase {
 
diff --git a/tests/robotests/src/com/android/settings/fingerprint/DeleteFingerprintDialogTest.java b/tests/robotests/src/com/android/settings/fingerprint/DeleteFingerprintDialogTest.java
index c3c1b42..125977f 100644
--- a/tests/robotests/src/com/android/settings/fingerprint/DeleteFingerprintDialogTest.java
+++ b/tests/robotests/src/com/android/settings/fingerprint/DeleteFingerprintDialogTest.java
@@ -17,6 +17,10 @@
 package com.android.settings.fingerprint;
 
 
+import static org.mockito.Mockito.never;
+import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.verify;
+
 import android.app.Dialog;
 import android.hardware.fingerprint.Fingerprint;
 
@@ -26,6 +30,7 @@
         .DeleteFingerprintDialog;
 import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.testutils.shadow.ShadowEventLogWriter;
+import com.android.settings.testutils.shadow.ShadowFragment;
 
 import org.junit.Before;
 import org.junit.Test;
@@ -35,27 +40,25 @@
 import org.robolectric.annotation.Config;
 import org.robolectric.util.FragmentTestUtil;
 
-import static org.mockito.Mockito.never;
-import static org.mockito.Mockito.verify;
-
 @RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION,
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION_O,
         shadows = {
-                ShadowEventLogWriter.class
+                ShadowEventLogWriter.class,
+                ShadowFragment.class
         })
 public class DeleteFingerprintDialogTest {
 
     @Mock
-    private FingerprintSettingsFragment mTarget;
-    @Mock
     private Fingerprint mFingerprint;
-    private DeleteFingerprintDialog mFragment;
+    @Mock
+    private FingerprintSettingsFragment mTarget;
 
+    private DeleteFingerprintDialog mFragment;
 
     @Before
     public void setUp() {
         MockitoAnnotations.initMocks(this);
-        mFragment = DeleteFingerprintDialog.newInstance(mFingerprint, mTarget);
+        mFragment = spy(DeleteFingerprintDialog.newInstance(mFingerprint, mTarget));
     }
 
     @Test
diff --git a/tests/robotests/src/com/android/settings/fingerprint/FingerprintEnrollEnrollingTest.java b/tests/robotests/src/com/android/settings/fingerprint/FingerprintEnrollEnrollingTest.java
new file mode 100644
index 0000000..190d65d
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/fingerprint/FingerprintEnrollEnrollingTest.java
@@ -0,0 +1,128 @@
+/*
+ * Copyright (C) 2017 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License
+ */
+
+package com.android.settings.fingerprint;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.nullable;
+import static org.mockito.Matchers.anyInt;
+import static org.mockito.Mockito.verify;
+import static org.robolectric.RuntimeEnvironment.application;
+
+import android.content.Intent;
+import android.hardware.fingerprint.FingerprintManager;
+import android.hardware.fingerprint.FingerprintManager.EnrollmentCallback;
+import android.media.AudioAttributes;
+import android.os.CancellationSignal;
+import android.os.VibrationEffect;
+import android.os.Vibrator;
+import android.widget.TextView;
+
+import com.android.settings.R;
+import com.android.settings.TestConfig;
+import com.android.settings.password.ChooseLockSettingsHelper;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.shadow.ShadowUtils;
+import com.android.settings.testutils.shadow.ShadowVibrator;
+import com.android.settings.wrapper.FingerprintManagerWrapper;
+
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.ArgumentCaptor;
+import org.mockito.Mock;
+import org.mockito.MockitoAnnotations;
+import org.robolectric.Robolectric;
+import org.robolectric.annotation.Config;
+import org.robolectric.shadow.api.Shadow;
+
+import java.util.concurrent.TimeUnit;
+
+@RunWith(SettingsRobolectricTestRunner.class)
+@Config(
+        manifest = TestConfig.MANIFEST_PATH,
+        sdk = TestConfig.SDK_VERSION_O,
+        shadows = {
+                ShadowUtils.class,
+                ShadowVibrator.class
+        })
+public class FingerprintEnrollEnrollingTest {
+
+    @Mock
+    private FingerprintManagerWrapper mFingerprintManager;
+
+    private FingerprintEnrollEnrolling mActivity;
+
+    @Before
+    public void setUp() {
+        MockitoAnnotations.initMocks(this);
+        ShadowUtils.setFingerprintManager(mFingerprintManager);
+        ShadowVibrator.addToServiceMap();
+
+        mActivity = Robolectric.buildActivity(
+                FingerprintEnrollEnrolling.class,
+                new Intent()
+                        // Set the challenge token so the confirm screen will not be shown
+                        .putExtra(ChooseLockSettingsHelper.EXTRA_KEY_CHALLENGE_TOKEN, new byte[0]))
+                .setup().get();
+    }
+
+    @After
+    public void tearDown() {
+        ShadowUtils.reset();
+        ShadowVibrator.reset();
+    }
+
+    @Test
+    public void fingerprintEnrollHelp_shouldShowHelpTextAndVibrate() {
+        EnrollmentCallback enrollmentCallback = verifyAndCaptureEnrollmentCallback();
+
+        enrollmentCallback.onEnrollmentProgress(123);
+        enrollmentCallback.onEnrollmentHelp(
+                FingerprintManager.FINGERPRINT_ERROR_UNABLE_TO_PROCESS,
+                "test enrollment help");
+
+        TextView errorText = mActivity.findViewById(R.id.error_text);
+        assertThat(errorText.getText()).isEqualTo("test enrollment help");
+
+        Robolectric.getForegroundThreadScheduler().advanceBy(2, TimeUnit.MILLISECONDS);
+
+
+        ShadowVibrator shadowVibrator =
+                Shadow.extract(application.getSystemService(Vibrator.class));
+        verify(shadowVibrator.delegate).vibrate(
+                anyInt(),
+                nullable(String.class),
+                any(VibrationEffect.class),
+                nullable(AudioAttributes.class));
+    }
+
+    private EnrollmentCallback verifyAndCaptureEnrollmentCallback() {
+        ArgumentCaptor<EnrollmentCallback> callbackCaptor =
+                ArgumentCaptor.forClass(EnrollmentCallback.class);
+        verify(mFingerprintManager).enroll(
+                any(byte[].class),
+                any(CancellationSignal.class),
+                anyInt(),
+                anyInt(),
+                callbackCaptor.capture());
+
+        return callbackCaptor.getValue();
+    }
+}
diff --git a/tests/robotests/src/com/android/settings/fingerprint/FingerprintEnrollFindSensorTest.java b/tests/robotests/src/com/android/settings/fingerprint/FingerprintEnrollFindSensorTest.java
index ad52bf6..d479e1e 100644
--- a/tests/robotests/src/com/android/settings/fingerprint/FingerprintEnrollFindSensorTest.java
+++ b/tests/robotests/src/com/android/settings/fingerprint/FingerprintEnrollFindSensorTest.java
@@ -33,11 +33,11 @@
 import com.android.settings.R;
 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.ShadowEventLogWriter;
 import com.android.settings.testutils.shadow.ShadowUtils;
+import com.android.settings.wrapper.FingerprintManagerWrapper;
 
 import org.junit.After;
 import org.junit.Before;
@@ -47,7 +47,6 @@
 import org.mockito.Mock;
 import org.mockito.MockitoAnnotations;
 import org.robolectric.Robolectric;
-import org.robolectric.RuntimeEnvironment;
 import org.robolectric.Shadows;
 import org.robolectric.annotation.Config;
 import org.robolectric.shadows.ShadowActivity;
@@ -56,7 +55,7 @@
 @RunWith(SettingsRobolectricTestRunner.class)
 @Config(
         manifest = TestConfig.MANIFEST_PATH,
-        sdk = TestConfig.SDK_VERSION,
+        sdk = TestConfig.SDK_VERSION_O,
         shadows = {
                 SettingsShadowResources.class,
                 SettingsShadowResources.SettingsShadowTheme.class,
@@ -66,7 +65,7 @@
 public class FingerprintEnrollFindSensorTest {
 
     @Mock
-    private IFingerprintManager mFingerprintManager;
+    private FingerprintManagerWrapper mFingerprintManager;
 
     private FingerprintEnrollFindSensor mActivity;
 
@@ -75,8 +74,6 @@
         MockitoAnnotations.initMocks(this);
         ShadowUtils.setFingerprintManager(mFingerprintManager);
 
-        RuntimeEnvironment.getAppResourceLoader().getResourceIndex();
-
         mActivity = Robolectric.buildActivity(
                 FingerprintEnrollFindSensor.class,
                 new Intent()
diff --git a/tests/robotests/src/com/android/settings/fingerprint/FingerprintEnrollSuggestionActivityTest.java b/tests/robotests/src/com/android/settings/fingerprint/FingerprintEnrollSuggestionActivityTest.java
new file mode 100644
index 0000000..2856325
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/fingerprint/FingerprintEnrollSuggestionActivityTest.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.fingerprint;
+
+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.when;
+
+import android.app.admin.DevicePolicyManager;
+import android.content.Context;
+import android.content.pm.PackageManager;
+import android.hardware.fingerprint.FingerprintManager;
+
+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_O)
+public class FingerprintEnrollSuggestionActivityTest {
+
+    @Mock
+    private Context mContext;
+    @Mock
+    private PackageManager mPackageManager;
+    @Mock
+    private FingerprintManager mFingerprintManager;
+    @Mock
+    private DevicePolicyManager mDevicePolicyManager;
+
+    @Before
+    public void setUp() {
+        MockitoAnnotations.initMocks(this);
+        when(mContext.getPackageManager()).thenReturn(mPackageManager);
+        when(mContext.getSystemService(eq(Context.DEVICE_POLICY_SERVICE)))
+                .thenReturn(mDevicePolicyManager);
+        when(mDevicePolicyManager.getKeyguardDisabledFeatures(any(), anyInt()))
+                .thenReturn(0);
+        when(mContext.getSystemService(FingerprintManager.class)).thenReturn(mFingerprintManager);
+    }
+
+    @Test
+    public void testFingerprintEnrollmentIntroductionIsCompleteWhenFingerprintAdded() {
+        stubFingerprintSupported(true);
+        when(mFingerprintManager.hasEnrolledFingerprints()).thenReturn(true);
+        when(mFingerprintManager.isHardwareDetected()).thenReturn(true);
+
+        assertThat(FingerprintEnrollSuggestionActivity.isSuggestionComplete(mContext)).isTrue();
+    }
+
+    @Test
+    public void testFingerprintEnrollmentIntroductionIsNotCompleteWhenNoFingerprintAdded() {
+        stubFingerprintSupported(true);
+        when(mFingerprintManager.hasEnrolledFingerprints()).thenReturn(false);
+        when(mFingerprintManager.isHardwareDetected()).thenReturn(true);
+
+        assertThat(FingerprintEnrollSuggestionActivity.isSuggestionComplete(mContext)).isFalse();
+    }
+
+    @Test
+    public void testFingerprintEnrollmentIntroductionIsCompleteWhenHardwareNotDetected() {
+        stubFingerprintSupported(true);
+        when(mFingerprintManager.hasEnrolledFingerprints()).thenReturn(false);
+        when(mFingerprintManager.isHardwareDetected()).thenReturn(false);
+
+        assertThat(FingerprintEnrollSuggestionActivity.isSuggestionComplete(mContext)).isTrue();
+    }
+
+    @Test
+    public void testFingerprintEnrollmentIntroductionIsCompleteWhenFingerprintNotSupported() {
+        stubFingerprintSupported(false);
+
+        assertThat(FingerprintEnrollSuggestionActivity.isSuggestionComplete(mContext)).isTrue();
+    }
+
+    @Test
+    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);
+
+        assertThat(FingerprintEnrollSuggestionActivity.isSuggestionComplete(mContext)).isTrue();
+    }
+
+    private void stubFingerprintSupported(boolean enabled) {
+        when(mPackageManager.hasSystemFeature(PackageManager.FEATURE_FINGERPRINT))
+                .thenReturn(enabled);
+    }
+}
diff --git a/tests/robotests/src/com/android/settings/fingerprint/FingerprintLocationAnimationVideoViewTest.java b/tests/robotests/src/com/android/settings/fingerprint/FingerprintLocationAnimationVideoViewTest.java
index 7b7e440..f80b324 100644
--- a/tests/robotests/src/com/android/settings/fingerprint/FingerprintLocationAnimationVideoViewTest.java
+++ b/tests/robotests/src/com/android/settings/fingerprint/FingerprintLocationAnimationVideoViewTest.java
@@ -37,7 +37,7 @@
 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_O)
 public class FingerprintLocationAnimationVideoViewTest {
 
     private Context mContext;
diff --git a/tests/robotests/src/com/android/settings/fingerprint/FingerprintPreferenceTest.java b/tests/robotests/src/com/android/settings/fingerprint/FingerprintPreferenceTest.java
index 29c6f10..23e0e73 100644
--- a/tests/robotests/src/com/android/settings/fingerprint/FingerprintPreferenceTest.java
+++ b/tests/robotests/src/com/android/settings/fingerprint/FingerprintPreferenceTest.java
@@ -39,7 +39,7 @@
 import static org.mockito.Mockito.verify;
 
 @RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION_O)
 public class FingerprintPreferenceTest {
 
     @Mock
diff --git a/tests/robotests/src/com/android/settings/fingerprint/FingerprintSuggestionActivityTest.java b/tests/robotests/src/com/android/settings/fingerprint/FingerprintSuggestionActivityTest.java
index bf2dfae..0e4446f 100644
--- a/tests/robotests/src/com/android/settings/fingerprint/FingerprintSuggestionActivityTest.java
+++ b/tests/robotests/src/com/android/settings/fingerprint/FingerprintSuggestionActivityTest.java
@@ -42,15 +42,15 @@
 import org.mockito.MockitoAnnotations;
 import org.robolectric.Robolectric;
 import org.robolectric.Shadows;
+import org.robolectric.android.controller.ActivityController;
 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,
+        sdk = TestConfig.SDK_VERSION_O,
         shadows = {
                 ShadowEventLogWriter.class,
                 ShadowLockPatternUtils.class,
diff --git a/tests/robotests/src/com/android/settings/fingerprint/SetupFingerprintEnrollFindSensorTest.java b/tests/robotests/src/com/android/settings/fingerprint/SetupFingerprintEnrollFindSensorTest.java
index ce31328..f9d1994 100644
--- a/tests/robotests/src/com/android/settings/fingerprint/SetupFingerprintEnrollFindSensorTest.java
+++ b/tests/robotests/src/com/android/settings/fingerprint/SetupFingerprintEnrollFindSensorTest.java
@@ -27,11 +27,11 @@
 import com.android.settings.R;
 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.ShadowEventLogWriter;
 import com.android.settings.testutils.shadow.ShadowUtils;
+import com.android.settings.wrapper.FingerprintManagerWrapper;
 
 import org.junit.After;
 import org.junit.Before;
@@ -40,7 +40,6 @@
 import org.mockito.Mock;
 import org.mockito.MockitoAnnotations;
 import org.robolectric.Robolectric;
-import org.robolectric.RuntimeEnvironment;
 import org.robolectric.Shadows;
 import org.robolectric.annotation.Config;
 import org.robolectric.shadows.ShadowAlertDialog;
@@ -48,7 +47,7 @@
 @RunWith(SettingsRobolectricTestRunner.class)
 @Config(
         manifest = TestConfig.MANIFEST_PATH,
-        sdk = TestConfig.SDK_VERSION,
+        sdk = TestConfig.SDK_VERSION_O,
         shadows = {
                 SettingsShadowResources.class,
                 SettingsShadowResources.SettingsShadowTheme.class,
@@ -58,7 +57,7 @@
 public class SetupFingerprintEnrollFindSensorTest {
 
     @Mock
-    private IFingerprintManager mFingerprintManager;
+    private FingerprintManagerWrapper mFingerprintManager;
 
     private SetupFingerprintEnrollFindSensor mActivity;
 
@@ -66,8 +65,6 @@
     public void setUp() {
         MockitoAnnotations.initMocks(this);
         ShadowUtils.setFingerprintManager(mFingerprintManager);
-        RuntimeEnvironment.getAppResourceLoader().getResourceIndex();
-
     }
 
     private void createActivity(Intent intent) {
diff --git a/tests/robotests/src/com/android/settings/fingerprint/SetupFingerprintEnrollIntroductionTest.java b/tests/robotests/src/com/android/settings/fingerprint/SetupFingerprintEnrollIntroductionTest.java
index f5859ac..bf5c187 100644
--- a/tests/robotests/src/com/android/settings/fingerprint/SetupFingerprintEnrollIntroductionTest.java
+++ b/tests/robotests/src/com/android/settings/fingerprint/SetupFingerprintEnrollIntroductionTest.java
@@ -48,20 +48,19 @@
 import org.mockito.Mock;
 import org.mockito.MockitoAnnotations;
 import org.robolectric.Robolectric;
-import org.robolectric.RuntimeEnvironment;
 import org.robolectric.Shadows;
+import org.robolectric.android.controller.ActivityController;
 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.ShadowKeyguardManager;
-import org.robolectric.util.ActivityController;
 
 @RunWith(SettingsRobolectricTestRunner.class)
 @Config(
         manifest = TestConfig.MANIFEST_PATH,
-        sdk = TestConfig.SDK_VERSION,
+        sdk = TestConfig.SDK_VERSION_O,
         shadows = {
                 ShadowEventLogWriter.class,
                 ShadowFingerprintManager.class,
@@ -80,7 +79,7 @@
     public void setUp() {
         MockitoAnnotations.initMocks(this);
 
-        RuntimeEnvironment.getRobolectricPackageManager()
+        Shadows.shadowOf(application.getPackageManager())
                 .setSystemFeature(PackageManager.FEATURE_FINGERPRINT, true);
         ShadowFingerprintManager.addToServiceMap();
 
diff --git a/tests/robotests/src/com/android/settings/fuelgauge/AdvancedPowerUsageDetailTest.java b/tests/robotests/src/com/android/settings/fuelgauge/AdvancedPowerUsageDetailTest.java
index 54d043c..99b0945 100644
--- a/tests/robotests/src/com/android/settings/fuelgauge/AdvancedPowerUsageDetailTest.java
+++ b/tests/robotests/src/com/android/settings/fuelgauge/AdvancedPowerUsageDetailTest.java
@@ -53,6 +53,7 @@
 import com.android.settings.applications.LayoutPreference;
 import com.android.settings.R;
 import com.android.settings.testutils.FakeFeatureFactory;
+import com.android.settings.testutils.shadow.ShadowActivityManager;
 import com.android.settings.testutils.shadow.ShadowEntityHeaderController;
 import com.android.settings.widget.EntityHeaderController;
 import com.android.settingslib.applications.AppUtils;
@@ -77,8 +78,8 @@
 import java.util.List;
 
 @RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION,
-        shadows = ShadowEntityHeaderController.class)
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION_O,
+        shadows = {ShadowEntityHeaderController.class, ShadowActivityManager.class})
 public class AdvancedPowerUsageDetailTest {
     private static final String APP_LABEL = "app label";
     private static final String SUMMARY = "summary";
@@ -350,6 +351,22 @@
     }
 
     @Test
+    public void testStartBatteryDetailPage_typeUser_startByCurrentUser() {
+        mBatterySipper.drainType = BatterySipper.DrainType.USER;
+        mBatterySipper.userId = 10;
+
+        final int currentUser = 20;
+        ShadowActivityManager.setCurrentUser(currentUser);
+        AdvancedPowerUsageDetail.startBatteryDetailPage(mTestActivity, mBatteryUtils, null,
+                mBatteryStatsHelper, 0, mBatteryEntry, USAGE_PERCENT, null);
+
+
+        verify(mTestActivity).startPreferencePanelAsUser(
+                nullable(Fragment.class), nullable(String.class), nullable(Bundle.class), anyInt(),
+                nullable(CharSequence.class), eq(new UserHandle(currentUser)));
+    }
+
+    @Test
     public void testStartBatteryDetailPage_noBatteryUsage_hasBasicData() {
         final ArgumentCaptor<Bundle> captor = ArgumentCaptor.forClass(Bundle.class);
         Answer<Void> callable = invocation -> {
diff --git a/tests/robotests/src/com/android/settings/fuelgauge/AppButtonsPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/fuelgauge/AppButtonsPreferenceControllerTest.java
index 92df48e..5c28a06 100644
--- a/tests/robotests/src/com/android/settings/fuelgauge/AppButtonsPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/fuelgauge/AppButtonsPreferenceControllerTest.java
@@ -17,7 +17,6 @@
 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;
@@ -40,13 +39,14 @@
 import android.content.pm.PackageInfo;
 import android.content.pm.PackageManager;
 import android.os.UserManager;
-import android.widget.Button;
 
 import com.android.settings.R;
 import com.android.settings.SettingsActivity;
 import com.android.settings.TestConfig;
-import com.android.settings.enterprise.DevicePolicyManagerWrapper;
 import com.android.settings.testutils.FakeFeatureFactory;
+import com.android.settings.widget.ActionButtonPreference;
+import com.android.settings.widget.ActionButtonPreferenceTest;
+import com.android.settings.wrapper.DevicePolicyManagerWrapper;
 import com.android.settingslib.applications.AppUtils;
 import com.android.settingslib.applications.ApplicationsState;
 import com.android.settingslib.applications.instantapps.InstantAppDataProvider;
@@ -66,7 +66,7 @@
 import org.robolectric.util.ReflectionHelpers;
 
 @RunWith(RobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION_O)
 public class AppButtonsPreferenceControllerTest {
     private static final String PACKAGE_NAME = "com.android.settings";
     private static final String RESOURCE_STRING = "string";
@@ -98,10 +98,8 @@
     private Application mApplication;
     @Mock
     private PackageInfo mPackageInfo;
-    @Mock
-    private Button mUninstallButton;
-    @Mock
-    private Button mForceStopButton;
+
+    private ActionButtonPreference mButtonPrefs;
 
     private Intent mUninstallIntent;
     private AppButtonsPreferenceController mController;
@@ -129,8 +127,8 @@
         mPackageInfo.packageName = PACKAGE_NAME;
         mPackageInfo.applicationInfo = mAppInfo;
 
-        mController.mUninstallButton = mUninstallButton;
-        mController.mForceStopButton = mForceStopButton;
+        mButtonPrefs = ActionButtonPreferenceTest.createMock();
+        mController.mButtonsPref = mButtonPrefs;
         mController.mPackageInfo = mPackageInfo;
 
         final ArgumentCaptor<Intent> captor = ArgumentCaptor.forClass(Intent.class);
@@ -155,7 +153,6 @@
         assertThat(mController.mPackageInfo).isNotNull();
     }
 
-
     @Test
     public void testRetrieveAppEntry_noAppEntry_null() throws PackageManager.NameNotFoundException {
         doReturn(null).when(mState).getEntry(eq(PACKAGE_NAME), anyInt());
@@ -182,13 +179,13 @@
 
     @Test
     public void testUpdateUninstallButton_isSystemApp_handleAsDisableableButton() {
-        doReturn(false).when(mController).handleDisableable(any());
+        doReturn(false).when(mController).handleDisableable();
         mAppInfo.flags |= ApplicationInfo.FLAG_SYSTEM;
 
         mController.updateUninstallButton();
 
-        verify(mController).handleDisableable(any());
-        verify(mUninstallButton).setEnabled(false);
+        verify(mController).handleDisableable();
+        verify(mButtonPrefs).setButton1Enabled(false);
     }
 
     @Test
@@ -219,14 +216,14 @@
 
     @Test
     public void testUpdateUninstallButton_isDeviceAdminApp_setButtonDisable() {
-        doReturn(true).when(mController).handleDisableable(any());
+        doReturn(true).when(mController).handleDisableable();
         mAppInfo.flags |= ApplicationInfo.FLAG_SYSTEM;
         doReturn(true).when(mDpm).packageHasActiveAdmins(anyString());
 
         mController.updateUninstallButton();
 
-        verify(mController).handleDisableable(any());
-        verify(mUninstallButton).setEnabled(false);
+        verify(mController).handleDisableable();
+        verify(mButtonPrefs).setButton1Enabled(false);
     }
 
     @Test
@@ -235,7 +232,7 @@
 
         mController.updateUninstallButton();
 
-        verify(mUninstallButton).setEnabled(false);
+        verify(mButtonPrefs).setButton1Enabled(false);
     }
 
     @Test
@@ -245,7 +242,7 @@
 
         mController.updateUninstallButton();
 
-        verify(mUninstallButton).setEnabled(false);
+        verify(mButtonPrefs).setButton1Enabled(false);
     }
 
     @Test
@@ -254,7 +251,7 @@
 
         mController.updateUninstallButton();
 
-        verify(mUninstallButton).setEnabled(false);
+        verify(mButtonPrefs).setButton1Enabled(false);
     }
 
     @Test
@@ -264,7 +261,7 @@
 
         mController.updateUninstallButton();
 
-        verify(mUninstallButton).setEnabled(false);
+        verify(mButtonPrefs).setButton1Enabled(false);
     }
 
     @Test
@@ -312,11 +309,10 @@
     public void testHandleDisableable_isHomeApp_notControllable() {
         mController.mHomePackages.add(PACKAGE_NAME);
 
-        final boolean controllable = mController.handleDisableable(mUninstallButton);
+        final boolean controllable = mController.handleDisableable();
 
-        verify(mUninstallButton).setText(R.string.disable_text);
+        verify(mButtonPrefs).setButton1Text(R.string.disable_text);
         assertThat(controllable).isFalse();
-
     }
 
     @Test
@@ -325,9 +321,9 @@
         mAppEntry.info.enabledSetting = PackageManager.COMPONENT_ENABLED_STATE_DEFAULT;
         doReturn(false).when(mController).isSystemPackage(any(), any(), any());
 
-        final boolean controllable = mController.handleDisableable(mUninstallButton);
+        final boolean controllable = mController.handleDisableable();
 
-        verify(mUninstallButton).setText(R.string.disable_text);
+        verify(mButtonPrefs).setButton1Text(R.string.disable_text);
         assertThat(controllable).isTrue();
 
     }
@@ -338,9 +334,9 @@
         mAppEntry.info.enabledSetting = PackageManager.COMPONENT_ENABLED_STATE_DEFAULT;
         doReturn(false).when(mController).isSystemPackage(any(), any(), any());
 
-        final boolean controllable = mController.handleDisableable(mUninstallButton);
+        final boolean controllable = mController.handleDisableable();
 
-        verify(mUninstallButton).setText(R.string.enable_text);
+        verify(mButtonPrefs).setButton1Text(R.string.enable_text);
         assertThat(controllable).isTrue();
     }
 
@@ -356,7 +352,7 @@
      * The test fragment which implements
      * {@link ButtonActionDialogFragment.AppButtonsDialogListener}
      */
-    private static class TestFragment extends Fragment implements
+    public static class TestFragment extends Fragment implements
             ButtonActionDialogFragment.AppButtonsDialogListener {
 
         @Override
diff --git a/tests/robotests/src/com/android/settings/fuelgauge/BackgroundActivityPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/fuelgauge/BackgroundActivityPreferenceControllerTest.java
index 91f4a2b..cb5914f 100644
--- a/tests/robotests/src/com/android/settings/fuelgauge/BackgroundActivityPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/fuelgauge/BackgroundActivityPreferenceControllerTest.java
@@ -16,18 +16,31 @@
 
 package com.android.settings.fuelgauge;
 
+import static com.google.common.truth.Truth.assertThat;
+
+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 static org.robolectric.Shadows.shadowOf;
+
+import android.app.AlertDialog;
 import android.app.AppOpsManager;
 import android.app.admin.DevicePolicyManager;
 import android.content.Context;
+import android.content.DialogInterface;
 import android.content.pm.ApplicationInfo;
 import android.content.pm.PackageManager;
 import android.os.Build;
 import android.os.UserManager;
 import android.support.v14.preference.SwitchPreference;
+import android.widget.Button;
 
 import com.android.settings.R;
 import com.android.settings.TestConfig;
-import com.android.settings.enterprise.DevicePolicyManagerWrapper;
+import com.android.settings.testutils.shadow.SettingsShadowResources;
+import com.android.settings.testutils.shadow.ShadowFragment;
+import com.android.settings.wrapper.DevicePolicyManagerWrapper;
 
 import org.junit.Before;
 import org.junit.Test;
@@ -38,22 +51,24 @@
 import org.robolectric.RobolectricTestRunner;
 import org.robolectric.RuntimeEnvironment;
 import org.robolectric.annotation.Config;
-
-import static com.google.common.truth.Truth.assertThat;
-
-import static org.mockito.Mockito.spy;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
+import org.robolectric.shadows.ShadowAlertDialog;
+import org.robolectric.shadows.ShadowDialog;
+import org.robolectric.util.FragmentTestUtil;
 
 @RunWith(RobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
+@Config(
+        manifest = TestConfig.MANIFEST_PATH,
+        sdk = TestConfig.SDK_VERSION_O,
+        shadows = {
+                SettingsShadowResources.class,
+                SettingsShadowResources.SettingsShadowTheme.class,
+                ShadowFragment.class
+        })
 public class BackgroundActivityPreferenceControllerTest {
-    private static final int UID_NORMAL = 1234;
-    private static final int UID_SPECIAL = 2345;
+    private static final int UID_LOW_SDK = 1234;
+    private static final int UID_HIGH_SDK = 3456;
     private static final String HIGH_SDK_PACKAGE = "com.android.package.high";
     private static final String LOW_SDK_PACKAGE = "com.android.package.low";
-    private static final String[] PACKAGES_NORMAL = {LOW_SDK_PACKAGE};
-    private static final String[] PACKAGES_SPECIAL = {HIGH_SDK_PACKAGE, LOW_SDK_PACKAGE};
 
     @Mock(answer = Answers.RETURNS_DEEP_STUBS)
     private Context mContext;
@@ -71,6 +86,10 @@
     private DevicePolicyManager mDevicePolicyManager;
     @Mock
     private DevicePolicyManagerWrapper mDevicePolicyManagerWrapper;
+    @Mock
+    private AdvancedPowerUsageDetail mFragment;
+    @Mock
+    private PowerWhitelistBackend mPowerWhitelistBackend;
     private BackgroundActivityPreferenceController mController;
     private SwitchPreference mPreference;
     private Context mShadowContext;
@@ -85,19 +104,19 @@
         when(mContext.getSystemService(Context.USER_SERVICE)).thenReturn(mUserManager);
         when(mContext.getSystemService(Context.DEVICE_POLICY_SERVICE)).thenReturn(
                 mDevicePolicyManager);
-        when(mPackageManager.getPackagesForUid(UID_NORMAL)).thenReturn(PACKAGES_NORMAL);
-        when(mPackageManager.getPackagesForUid(UID_SPECIAL)).thenReturn(PACKAGES_SPECIAL);
 
         when(mPackageManager.getApplicationInfo(HIGH_SDK_PACKAGE, PackageManager.GET_META_DATA))
                 .thenReturn(mHighApplicationInfo);
         when(mPackageManager.getApplicationInfo(LOW_SDK_PACKAGE, PackageManager.GET_META_DATA))
                 .thenReturn(mLowApplicationInfo);
+
+        when(mPowerWhitelistBackend.isWhitelisted(LOW_SDK_PACKAGE)).thenReturn(false);
         mHighApplicationInfo.targetSdkVersion = Build.VERSION_CODES.O;
         mLowApplicationInfo.targetSdkVersion = Build.VERSION_CODES.L;
 
         mPreference = new SwitchPreference(mShadowContext);
-        mController = spy(new BackgroundActivityPreferenceController(mContext, UID_NORMAL));
-        mController.isAvailable();
+        mController = spy(new BackgroundActivityPreferenceController(
+                mContext, mFragment, UID_LOW_SDK, LOW_SDK_PACKAGE, mPowerWhitelistBackend));
         mController.mDpm = mDevicePolicyManagerWrapper;
     }
 
@@ -105,49 +124,66 @@
     public void testOnPreferenceChange_TurnOnCheck_MethodInvoked() {
         mController.onPreferenceChange(mPreference, true);
 
-        verify(mAppOpsManager).setMode(AppOpsManager.OP_RUN_IN_BACKGROUND, UID_NORMAL,
-                mController.getTargetPackage(), AppOpsManager.MODE_ALLOWED);
-        verify(mController).updateSummary(mPreference);
+        verify(mAppOpsManager).setMode(AppOpsManager.OP_RUN_IN_BACKGROUND, UID_LOW_SDK,
+                LOW_SDK_PACKAGE, AppOpsManager.MODE_ALLOWED);
+        verify(mAppOpsManager).setMode(AppOpsManager.OP_RUN_ANY_IN_BACKGROUND, UID_LOW_SDK,
+                LOW_SDK_PACKAGE, AppOpsManager.MODE_ALLOWED);
+
+        assertThat(mPreference.getSummary())
+                .isEqualTo(mShadowContext.getText(R.string.background_activity_summary_on));
     }
 
     @Test
-    public void testOnPreferenceChange_TurnOffCheck_MethodInvoked() {
-        mController.onPreferenceChange(mPreference, false);
-
-        verify(mAppOpsManager).setMode(AppOpsManager.OP_RUN_IN_BACKGROUND, UID_NORMAL,
-                mController.getTargetPackage(), AppOpsManager.MODE_IGNORED);
-        verify(mController).updateSummary(mPreference);
+    public void testOnPreferenceChange_TurnOnCheckHighSDK_MethodInvoked() {
+        mController = new BackgroundActivityPreferenceController(mContext, mFragment, UID_HIGH_SDK,
+                HIGH_SDK_PACKAGE, mPowerWhitelistBackend);
+        mController.onPreferenceChange(mPreference, true);
+        verify(mAppOpsManager).setMode(AppOpsManager.OP_RUN_ANY_IN_BACKGROUND, UID_HIGH_SDK,
+                HIGH_SDK_PACKAGE, AppOpsManager.MODE_ALLOWED);
+        verify(mAppOpsManager, never()).setMode(AppOpsManager.OP_RUN_IN_BACKGROUND, UID_HIGH_SDK,
+                HIGH_SDK_PACKAGE, AppOpsManager.MODE_ALLOWED);
+        assertThat(mPreference.getSummary())
+                .isEqualTo(mShadowContext.getText(R.string.background_activity_summary_on));
     }
 
     @Test
     public void testUpdateState_CheckOn_SetCheckedTrue() {
-        when(mAppOpsManager
-                .checkOpNoThrow(AppOpsManager.OP_RUN_IN_BACKGROUND, UID_NORMAL, LOW_SDK_PACKAGE))
-                .thenReturn(AppOpsManager.MODE_DEFAULT);
+        when(mAppOpsManager.checkOpNoThrow(AppOpsManager.OP_RUN_ANY_IN_BACKGROUND, UID_LOW_SDK,
+                LOW_SDK_PACKAGE)).thenReturn(AppOpsManager.MODE_ALLOWED);
 
         mController.updateState(mPreference);
 
         assertThat(mPreference.isChecked()).isTrue();
+        assertThat(mPreference.isEnabled()).isTrue();
         verify(mController).updateSummary(mPreference);
     }
 
     @Test
     public void testUpdateState_CheckOff_SetCheckedFalse() {
-        when(mAppOpsManager
-                .checkOpNoThrow(AppOpsManager.OP_RUN_IN_BACKGROUND, UID_NORMAL, LOW_SDK_PACKAGE))
-                .thenReturn(AppOpsManager.MODE_IGNORED);
+        when(mAppOpsManager.checkOpNoThrow(AppOpsManager.OP_RUN_ANY_IN_BACKGROUND, UID_LOW_SDK,
+                LOW_SDK_PACKAGE)).thenReturn(AppOpsManager.MODE_IGNORED);
 
         mController.updateState(mPreference);
 
         assertThat(mPreference.isChecked()).isFalse();
+        assertThat(mPreference.isEnabled()).isTrue();
         verify(mController).updateSummary(mPreference);
     }
 
     @Test
+    public void testUpdateState_whitelisted() {
+        when(mPowerWhitelistBackend.isWhitelisted(LOW_SDK_PACKAGE)).thenReturn(true);
+        mController.updateState(mPreference);
+        assertThat(mPreference.isChecked()).isTrue();
+        assertThat(mPreference.isEnabled()).isFalse();
+        assertThat(mPreference.getSummary()).isEqualTo(
+                mShadowContext.getText(R.string.background_activity_summary_whitelisted));
+    }
+
+    @Test
     public void testUpdateSummary_modeError_showSummaryDisabled() {
-        when(mAppOpsManager
-                .checkOpNoThrow(AppOpsManager.OP_RUN_IN_BACKGROUND, UID_NORMAL, LOW_SDK_PACKAGE))
-                .thenReturn(AppOpsManager.MODE_ERRORED);
+        when(mAppOpsManager.checkOpNoThrow(AppOpsManager.OP_RUN_ANY_IN_BACKGROUND, UID_LOW_SDK,
+                LOW_SDK_PACKAGE)).thenReturn(AppOpsManager.MODE_ERRORED);
         final CharSequence expectedSummary = mShadowContext.getText(
                 R.string.background_activity_summary_disabled);
         mController.updateSummary(mPreference);
@@ -157,9 +193,8 @@
 
     @Test
     public void testUpdateSummary_modeDefault_showSummaryOn() {
-        when(mAppOpsManager
-                .checkOpNoThrow(AppOpsManager.OP_RUN_IN_BACKGROUND, UID_NORMAL, LOW_SDK_PACKAGE))
-                .thenReturn(AppOpsManager.MODE_DEFAULT);
+        when(mAppOpsManager.checkOpNoThrow(AppOpsManager.OP_RUN_ANY_IN_BACKGROUND, UID_LOW_SDK,
+                LOW_SDK_PACKAGE)).thenReturn(AppOpsManager.MODE_DEFAULT);
         final CharSequence expectedSummary = mShadowContext.getText(
                 R.string.background_activity_summary_on);
 
@@ -170,9 +205,8 @@
 
     @Test
     public void testUpdateSummary_modeIgnored_showSummaryOff() {
-        when(mAppOpsManager
-                .checkOpNoThrow(AppOpsManager.OP_RUN_IN_BACKGROUND, UID_NORMAL, LOW_SDK_PACKAGE))
-                .thenReturn(AppOpsManager.MODE_IGNORED);
+        when(mAppOpsManager.checkOpNoThrow(AppOpsManager.OP_RUN_ANY_IN_BACKGROUND, UID_LOW_SDK,
+                LOW_SDK_PACKAGE)).thenReturn(AppOpsManager.MODE_IGNORED);
         final CharSequence expectedSummary = mShadowContext.getText(
                 R.string.background_activity_summary_off);
 
@@ -182,31 +216,30 @@
     }
 
     @Test
-    public void testIsPackageAvailable_SdkLowerThanO_ReturnTrue() {
+    public void testIsLegacyApp_SdkLowerThanO_ReturnTrue() {
         assertThat(mController.isLegacyApp(LOW_SDK_PACKAGE)).isTrue();
     }
 
     @Test
-    public void testIsPackageAvailable_SdkLargerOrEqualThanO_ReturnFalse() {
+    public void testIsLegacyApp_SdkLargerOrEqualThanO_ReturnFalse() {
         assertThat(mController.isLegacyApp(HIGH_SDK_PACKAGE)).isFalse();
     }
 
     @Test
-    public void testMultiplePackages_ReturnStatusForTargetPackage() {
-        mController = new BackgroundActivityPreferenceController(mContext, UID_SPECIAL);
-        mController.mDpm = mDevicePolicyManagerWrapper;
-        when(mAppOpsManager
-                .checkOpNoThrow(AppOpsManager.OP_RUN_IN_BACKGROUND, UID_SPECIAL, LOW_SDK_PACKAGE))
-                .thenReturn(AppOpsManager.MODE_ALLOWED);
-        when(mAppOpsManager
-                .checkOpNoThrow(AppOpsManager.OP_RUN_IN_BACKGROUND, UID_SPECIAL, HIGH_SDK_PACKAGE))
-                .thenReturn(AppOpsManager.MODE_IGNORED);
+    public void testIsAvailable_ReturnTrue() {
+        assertThat(mController.isAvailable()).isTrue();
+    }
 
-        final boolean available = mController.isAvailable();
-        mController.updateState(mPreference);
-
-        assertThat(available).isTrue();
-        // Should get status from LOW_SDK_PACKAGE
-        assertThat(mPreference.isChecked()).isTrue();
+    @Test
+    public void testWarningDialog() {
+        BackgroundActivityPreferenceController.WarningDialogFragment dialogFragment =
+                new BackgroundActivityPreferenceController.WarningDialogFragment();
+        dialogFragment.setTargetFragment(mFragment, 0);
+        FragmentTestUtil.startFragment(dialogFragment);
+        final AlertDialog dialog = (AlertDialog) ShadowDialog.getLatestDialog();
+        ShadowAlertDialog shadowDialog = shadowOf(dialog);
+        final Button okButton = dialog.getButton(DialogInterface.BUTTON_POSITIVE);
+        shadowDialog.clickOn(okButton.getId());
+        verify(mFragment).onLimitBackgroundActivity();
     }
 }
diff --git a/tests/robotests/src/com/android/settings/fuelgauge/BatteryBroadcastReceiverTest.java b/tests/robotests/src/com/android/settings/fuelgauge/BatteryBroadcastReceiverTest.java
index a163a43..30b3448 100644
--- a/tests/robotests/src/com/android/settings/fuelgauge/BatteryBroadcastReceiverTest.java
+++ b/tests/robotests/src/com/android/settings/fuelgauge/BatteryBroadcastReceiverTest.java
@@ -41,7 +41,7 @@
 import static org.mockito.Mockito.verify;
 
 @RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION_O)
 public class BatteryBroadcastReceiverTest {
     private static final String BATTERY_INIT_LEVEL = "100%";
     private static final String BATTERY_INIT_STATUS = "Not charging";
diff --git a/tests/robotests/src/com/android/settings/fuelgauge/BatteryEntryTest.java b/tests/robotests/src/com/android/settings/fuelgauge/BatteryEntryTest.java
index a461f46..04040ac 100644
--- a/tests/robotests/src/com/android/settings/fuelgauge/BatteryEntryTest.java
+++ b/tests/robotests/src/com/android/settings/fuelgauge/BatteryEntryTest.java
@@ -43,7 +43,7 @@
 import static org.mockito.Mockito.when;
 
 @RunWith(RobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION_O)
 public class BatteryEntryTest {
 
     private static final int APP_UID = 123;
@@ -147,7 +147,7 @@
     }
 
     @Test
-    public void extractPackageFromSipper_normalSipper_returnDefaultPakcage() {
+    public void extractPackageFromSipper_normalSipper_returnDefaultPackage() {
         BatteryEntry entry = createBatteryEntryForApp();
 
         assertThat(entry.extractPackagesFromSipper(entry.sipper)).isEqualTo(entry.sipper.mPackages);
diff --git a/tests/robotests/src/com/android/settings/fuelgauge/BatteryHeaderPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/fuelgauge/BatteryHeaderPreferenceControllerTest.java
index e434bb3..e433b3c 100644
--- a/tests/robotests/src/com/android/settings/fuelgauge/BatteryHeaderPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/fuelgauge/BatteryHeaderPreferenceControllerTest.java
@@ -17,7 +17,10 @@
 
 package com.android.settings.fuelgauge;
 
+import static android.arch.lifecycle.Lifecycle.Event.ON_START;
+
 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;
@@ -40,6 +43,7 @@
 import com.android.settings.applications.LayoutPreference;
 import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.testutils.shadow.SettingsShadowResources;
+import com.android.settings.testutils.shadow.SettingsShadowResourcesImpl;
 import com.android.settings.testutils.shadow.ShadowEntityHeaderController;
 import com.android.settings.widget.EntityHeaderController;
 import com.android.settingslib.core.lifecycle.Lifecycle;
@@ -55,9 +59,10 @@
 
 @RunWith(SettingsRobolectricTestRunner.class)
 @Config(manifest = TestConfig.MANIFEST_PATH,
-        sdk = TestConfig.SDK_VERSION,
+        sdk = TestConfig.SDK_VERSION_O,
         shadows = {
                 SettingsShadowResources.class,
+                SettingsShadowResourcesImpl.class,
                 SettingsShadowResources.SettingsShadowTheme.class,
                 ShadowEntityHeaderController.class
         })
@@ -90,7 +95,7 @@
     public void setUp() {
         MockitoAnnotations.initMocks(this);
 
-        mLifecycle = new Lifecycle();
+        mLifecycle = new Lifecycle(() -> mLifecycle);
         mContext = spy(RuntimeEnvironment.application);
         mBatteryMeterView = new BatteryMeterView(mContext);
         mBatteryPercentText = new TextView(mContext);
@@ -170,7 +175,7 @@
                 .thenReturn(mEntityHeaderController);
 
         mController.displayPreference(mPreferenceScreen);
-        mLifecycle.onStart();
+        mLifecycle.handleLifecycleEvent(ON_START);
 
         verify(mEntityHeaderController).styleActionBar(mActivity);
     }
diff --git a/tests/robotests/src/com/android/settings/fuelgauge/BatteryHistoryPreferenceTest.java b/tests/robotests/src/com/android/settings/fuelgauge/BatteryHistoryPreferenceTest.java
index 0d03512..60d06cd 100644
--- a/tests/robotests/src/com/android/settings/fuelgauge/BatteryHistoryPreferenceTest.java
+++ b/tests/robotests/src/com/android/settings/fuelgauge/BatteryHistoryPreferenceTest.java
@@ -44,7 +44,8 @@
 
 
 @RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION,
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION_O
+        ,
         shadows = {
                 SettingsShadowResources.class,
                 SettingsShadowResources.SettingsShadowTheme.class
diff --git a/tests/robotests/src/com/android/settings/fuelgauge/BatteryInfoLoaderTest.java b/tests/robotests/src/com/android/settings/fuelgauge/BatteryInfoLoaderTest.java
index 796e63c..5029897 100644
--- a/tests/robotests/src/com/android/settings/fuelgauge/BatteryInfoLoaderTest.java
+++ b/tests/robotests/src/com/android/settings/fuelgauge/BatteryInfoLoaderTest.java
@@ -26,7 +26,6 @@
 
 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;
@@ -43,7 +42,7 @@
 import org.robolectric.annotation.Config;
 
 @RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION_O)
 public class BatteryInfoLoaderTest {
     private static final long TEST_TIME_REMAINING = 1000L;
 
diff --git a/tests/robotests/src/com/android/settings/fuelgauge/BatteryInfoTest.java b/tests/robotests/src/com/android/settings/fuelgauge/BatteryInfoTest.java
index d82a89b..dd6b709 100644
--- a/tests/robotests/src/com/android/settings/fuelgauge/BatteryInfoTest.java
+++ b/tests/robotests/src/com/android/settings/fuelgauge/BatteryInfoTest.java
@@ -58,7 +58,7 @@
 import java.util.concurrent.TimeUnit;
 
 @RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION_O)
 public class BatteryInfoTest {
 
     private static final String STATUS_FULL = "Full";
diff --git a/tests/robotests/src/com/android/settings/fuelgauge/BatteryMeterViewTest.java b/tests/robotests/src/com/android/settings/fuelgauge/BatteryMeterViewTest.java
index 3a1fad0..fba6a24 100644
--- a/tests/robotests/src/com/android/settings/fuelgauge/BatteryMeterViewTest.java
+++ b/tests/robotests/src/com/android/settings/fuelgauge/BatteryMeterViewTest.java
@@ -39,7 +39,7 @@
 @RunWith(SettingsRobolectricTestRunner.class)
 // TODO: Consider making the shadow class set global using a robolectric.properties file.
 @Config(manifest = TestConfig.MANIFEST_PATH,
-        sdk = TestConfig.SDK_VERSION,
+        sdk = TestConfig.SDK_VERSION_O,
         shadows = {
                 SettingsShadowResources.class,
                 SettingsShadowTheme.class,
diff --git a/tests/robotests/src/com/android/settings/fuelgauge/BatteryOptimizationPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/fuelgauge/BatteryOptimizationPreferenceControllerTest.java
index 77e3198..8b8541a 100644
--- a/tests/robotests/src/com/android/settings/fuelgauge/BatteryOptimizationPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/fuelgauge/BatteryOptimizationPreferenceControllerTest.java
@@ -45,7 +45,7 @@
 import org.robolectric.annotation.Config;
 
 @RunWith(RobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION_O)
 public class BatteryOptimizationPreferenceControllerTest {
     private static final String PKG_IN_WHITELIST = "com.pkg.in.whitelist";
     private static final String PKG_NOT_IN_WHITELIST = "com.pkg.not.in.whitelist";
diff --git a/tests/robotests/src/com/android/settings/fuelgauge/BatterySaverControllerTest.java b/tests/robotests/src/com/android/settings/fuelgauge/BatterySaverControllerTest.java
index c75a6a6..eeca72f 100644
--- a/tests/robotests/src/com/android/settings/fuelgauge/BatterySaverControllerTest.java
+++ b/tests/robotests/src/com/android/settings/fuelgauge/BatterySaverControllerTest.java
@@ -37,7 +37,7 @@
 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_O)
 public class BatterySaverControllerTest {
     @Mock
     private MasterSwitchPreference mBatterySaverPref;
diff --git a/tests/robotests/src/com/android/settings/fuelgauge/BatterySaverReceiverTest.java b/tests/robotests/src/com/android/settings/fuelgauge/BatterySaverReceiverTest.java
index 259bcd2..944f755 100644
--- a/tests/robotests/src/com/android/settings/fuelgauge/BatterySaverReceiverTest.java
+++ b/tests/robotests/src/com/android/settings/fuelgauge/BatterySaverReceiverTest.java
@@ -33,7 +33,7 @@
 import org.robolectric.annotation.Config;
 
 @RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION_O)
 public class BatterySaverReceiverTest {
     @Mock
     private BatterySaverReceiver.BatterySaverListener mBatterySaverListener;
diff --git a/tests/robotests/src/com/android/settings/fuelgauge/BatterySaverSettingsTest.java b/tests/robotests/src/com/android/settings/fuelgauge/BatterySaverSettingsTest.java
index 1e173a2..a7bcf53 100644
--- a/tests/robotests/src/com/android/settings/fuelgauge/BatterySaverSettingsTest.java
+++ b/tests/robotests/src/com/android/settings/fuelgauge/BatterySaverSettingsTest.java
@@ -18,7 +18,9 @@
 import static com.google.common.truth.Truth.assertThat;
 
 import android.content.Context;
+import android.provider.SearchIndexableResource;
 
+import com.android.settings.R;
 import com.android.settings.TestConfig;
 import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.widget.SwitchBar;
@@ -30,8 +32,10 @@
 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)
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION_O)
 public class BatterySaverSettingsTest {
     private Context mContext;
     private BatterySaverSettings mBatterySaverSettings;
@@ -58,4 +62,13 @@
 
         assertThat(mBatterySaverSettings.mSwitchBar.isEnabled()).isTrue();
     }
+
+    @Test
+    public void searchProvider_shouldIndexDefaultXml() {
+        final List<SearchIndexableResource> sir = mBatterySaverSettings.SEARCH_INDEX_DATA_PROVIDER
+                .getXmlResourcesToIndex(mContext, true /* enabled */);
+
+        assertThat(sir).hasSize(1);
+        assertThat(sir.get(0).xmlResId).isEqualTo(R.xml.battery_saver_settings);
+    }
 }
diff --git a/tests/robotests/src/com/android/settings/fuelgauge/BatteryStatsHelperLoaderTest.java b/tests/robotests/src/com/android/settings/fuelgauge/BatteryStatsHelperLoaderTest.java
index 5f8d7cf..5ba98f2 100644
--- a/tests/robotests/src/com/android/settings/fuelgauge/BatteryStatsHelperLoaderTest.java
+++ b/tests/robotests/src/com/android/settings/fuelgauge/BatteryStatsHelperLoaderTest.java
@@ -36,7 +36,7 @@
 import org.robolectric.annotation.Config;
 
 @RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION_O)
 public class BatteryStatsHelperLoaderTest {
     @Mock
     private BatteryUtils mBatteryUtils;
diff --git a/tests/robotests/src/com/android/settings/fuelgauge/BatteryUtilsTest.java b/tests/robotests/src/com/android/settings/fuelgauge/BatteryUtilsTest.java
index c08b01d..56abf48 100644
--- a/tests/robotests/src/com/android/settings/fuelgauge/BatteryUtilsTest.java
+++ b/tests/robotests/src/com/android/settings/fuelgauge/BatteryUtilsTest.java
@@ -69,7 +69,7 @@
 import static org.mockito.Mockito.spy;
 
 @RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION_O)
 public class BatteryUtilsTest {
     // unit that used to converted ms to us
     private static final long UNIT = 1000;
diff --git a/tests/robotests/src/com/android/settings/fuelgauge/ButtonActionDialogFragmentTest.java b/tests/robotests/src/com/android/settings/fuelgauge/ButtonActionDialogFragmentTest.java
index dec445d..468c160 100644
--- a/tests/robotests/src/com/android/settings/fuelgauge/ButtonActionDialogFragmentTest.java
+++ b/tests/robotests/src/com/android/settings/fuelgauge/ButtonActionDialogFragmentTest.java
@@ -45,7 +45,7 @@
 import org.robolectric.util.FragmentTestUtil;
 
 @RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION, shadows = {
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION_O, shadows = {
         ShadowEventLogWriter.class
 })
 public class ButtonActionDialogFragmentTest {
diff --git a/tests/robotests/src/com/android/settings/fuelgauge/HighPowerDetailTest.java b/tests/robotests/src/com/android/settings/fuelgauge/HighPowerDetailTest.java
index d87020e..fe3cd29 100644
--- a/tests/robotests/src/com/android/settings/fuelgauge/HighPowerDetailTest.java
+++ b/tests/robotests/src/com/android/settings/fuelgauge/HighPowerDetailTest.java
@@ -36,7 +36,7 @@
 import static org.mockito.Mockito.verify;
 
 @RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION_O)
 public class HighPowerDetailTest {
 
     @Mock(answer = Answers.RETURNS_DEEP_STUBS)
diff --git a/tests/robotests/src/com/android/settings/fuelgauge/PowerGaugePreferenceTest.java b/tests/robotests/src/com/android/settings/fuelgauge/PowerGaugePreferenceTest.java
index 1259670..e2f5fad 100644
--- a/tests/robotests/src/com/android/settings/fuelgauge/PowerGaugePreferenceTest.java
+++ b/tests/robotests/src/com/android/settings/fuelgauge/PowerGaugePreferenceTest.java
@@ -15,6 +15,8 @@
  */
 package com.android.settings.fuelgauge;
 
+import static com.google.common.truth.Truth.assertThat;
+
 import android.content.Context;
 import android.graphics.drawable.Drawable;
 import android.graphics.drawable.VectorDrawable;
@@ -35,10 +37,8 @@
 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)
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION_O)
 public class PowerGaugePreferenceTest {
     private static final String SUBTITLE = "Summary";
     private static final String CONTENT_DESCRIPTION = "Content description";
@@ -53,7 +53,7 @@
         MockitoAnnotations.initMocks(this);
 
         mContext = RuntimeEnvironment.application;
-        mRootView = LayoutInflater.from(mContext).inflate(R.layout.preference,
+        mRootView = LayoutInflater.from(mContext).inflate(R.layout.preference_app,
                 null);
         mWidgetView = LayoutInflater.from(mContext).inflate(R.layout.preference_widget_summary,
                 null);
@@ -61,6 +61,7 @@
         mPreferenceViewHolder = PreferenceViewHolder.createInstanceForTests(mRootView);
 
         mPowerGaugePreference = new PowerGaugePreference(mContext);
+        assertThat(mPowerGaugePreference.getLayoutResource()).isEqualTo(R.layout.preference_app);
     }
 
     @Test
diff --git a/tests/robotests/src/com/android/settings/fuelgauge/PowerUsageAdvancedTest.java b/tests/robotests/src/com/android/settings/fuelgauge/PowerUsageAdvancedTest.java
index 3643013..2056262 100644
--- a/tests/robotests/src/com/android/settings/fuelgauge/PowerUsageAdvancedTest.java
+++ b/tests/robotests/src/com/android/settings/fuelgauge/PowerUsageAdvancedTest.java
@@ -31,13 +31,13 @@
 import android.content.Context;
 import android.content.Intent;
 import android.content.pm.PackageManager;
+import android.content.pm.UserInfo;
 import android.net.ConnectivityManager;
 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;
@@ -63,7 +63,7 @@
 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_O)
 public class PowerUsageAdvancedTest {
     private static final int FAKE_UID_1 = 50;
     private static final int FAKE_UID_2 = 100;
@@ -94,6 +94,10 @@
     private PreferenceGroup mUsageListGroup;
     @Mock
     private ConnectivityManager mConnectivityManager;
+    @Mock
+    private UserInfo mNormalUserInfo;
+    @Mock
+    private UserInfo mManagedUserInfo;
     private PowerUsageAdvanced mPowerUsageAdvanced;
     private PowerUsageData mPowerUsageData;
     private Context mShadowContext;
@@ -137,6 +141,11 @@
         mMaxBatterySipper.totalPowerMah = TYPE_BLUETOOTH_USAGE;
         mMaxBatterySipper.drainType = DrainType.BLUETOOTH;
         mNormalBatterySipper.drainType = DrainType.SCREEN;
+
+        doReturn(true).when(mNormalUserInfo).isEnabled();
+        doReturn(false).when(mNormalUserInfo).isManagedProfile();
+        doReturn(true).when(mManagedUserInfo).isEnabled();
+        doReturn(true).when(mManagedUserInfo).isManagedProfile();
     }
 
     @Test
@@ -294,9 +303,12 @@
     }
 
     @Test
-    public void testShouldHideCategory_typeUserAndOnlyOne_returnTrue() {
+    public void testShouldHideCategory_typeUserAndOnlyOneNormalUser_returnTrue() {
         mPowerUsageData.usageType = UsageType.USER;
-        doReturn(1).when(mUserManager).getUserCount();
+        List<UserInfo> userInfos = new ArrayList<>();
+        userInfos.add(mNormalUserInfo);
+        userInfos.add(mManagedUserInfo);
+        doReturn(userInfos).when(mUserManager).getUsers();
 
         assertThat(mPowerUsageAdvanced.shouldHideCategory(mPowerUsageData)).isTrue();
     }
@@ -322,7 +334,10 @@
     @Test
     public void testShouldHideCategory_typeUserAndMoreThanOne_returnFalse() {
         mPowerUsageData.usageType = UsageType.USER;
-        doReturn(2).when(mUserManager).getUserCount();
+        List<UserInfo> userInfos = new ArrayList<>();
+        userInfos.add(mNormalUserInfo);
+        userInfos.add(mNormalUserInfo);
+        doReturn(userInfos).when(mUserManager).getUsers();
 
         assertThat(mPowerUsageAdvanced.shouldHideCategory(mPowerUsageData)).isFalse();
     }
@@ -424,4 +439,5 @@
         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
index c992d0a..c6040c0 100644
--- a/tests/robotests/src/com/android/settings/fuelgauge/PowerUsageAnomalyDetailsTest.java
+++ b/tests/robotests/src/com/android/settings/fuelgauge/PowerUsageAnomalyDetailsTest.java
@@ -59,7 +59,7 @@
 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_O)
 public class PowerUsageAnomalyDetailsTest {
     private static final String NAME_APP_1 = "app1";
     private static final String NAME_APP_2 = "app2";
diff --git a/tests/robotests/src/com/android/settings/fuelgauge/PowerUsageBaseTest.java b/tests/robotests/src/com/android/settings/fuelgauge/PowerUsageBaseTest.java
new file mode 100644
index 0000000..df829aa
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/fuelgauge/PowerUsageBaseTest.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.fuelgauge;
+
+
+import static org.mockito.Matchers.any;
+import static org.mockito.Matchers.anyInt;
+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 android.app.Activity;
+import android.app.LoaderManager;
+import android.content.Context;
+import android.os.Bundle;
+
+import com.android.internal.os.BatteryStatsHelper;
+import com.android.settings.TestConfig;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.shadow.ShadowDashboardFragment;
+import com.android.settingslib.core.AbstractPreferenceController;
+
+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.List;
+
+/**
+ * Unit tests for {@link PowerUsageBase}.
+ */
+@RunWith(SettingsRobolectricTestRunner.class)
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION_O,
+        shadows = ShadowDashboardFragment.class)
+public class PowerUsageBaseTest {
+    @Mock
+    private BatteryStatsHelper mBatteryStatsHelper;
+    @Mock
+    private LoaderManager mLoaderManager;
+    private TestFragment mFragment;
+
+    @Before
+    public void setUp() {
+        MockitoAnnotations.initMocks(this);
+
+        mFragment = spy(new TestFragment());
+        mFragment.setBatteryStatsHelper(mBatteryStatsHelper);
+        doReturn(mLoaderManager).when(mFragment).getLoaderManager();
+    }
+
+    @Test
+    public void testOnCreate_batteryStatsLoaderNotInvoked() {
+        mFragment.onCreate(null);
+
+        verify(mLoaderManager, never()).initLoader(anyInt(), any(Bundle.class), any());
+    }
+
+    public static class TestFragment extends PowerUsageBase {
+
+        @Override
+        public int getMetricsCategory() {
+            return 0;
+        }
+
+        @Override
+        protected void refreshUi() {
+            // Do nothing
+        }
+
+        @Override
+        protected String getLogTag() {
+            return null;
+        }
+
+        @Override
+        protected int getPreferenceScreenResId() {
+            return 0;
+        }
+
+        @Override
+        protected List<AbstractPreferenceController> getPreferenceControllers(Context context) {
+            return null;
+        }
+
+        public void setBatteryStatsHelper(BatteryStatsHelper batteryStatsHelper) {
+            mStatsHelper = batteryStatsHelper;
+        }
+    }
+}
diff --git a/tests/robotests/src/com/android/settings/fuelgauge/PowerUsageFeatureProviderImplTest.java b/tests/robotests/src/com/android/settings/fuelgauge/PowerUsageFeatureProviderImplTest.java
index afda69f..6961b60 100644
--- a/tests/robotests/src/com/android/settings/fuelgauge/PowerUsageFeatureProviderImplTest.java
+++ b/tests/robotests/src/com/android/settings/fuelgauge/PowerUsageFeatureProviderImplTest.java
@@ -33,7 +33,7 @@
 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_O)
 public class PowerUsageFeatureProviderImplTest {
     private static final int UID_OTHER = Process.FIRST_APPLICATION_UID + 2;
     private static final int UID_CALENDAR = Process.FIRST_APPLICATION_UID + 3;
diff --git a/tests/robotests/src/com/android/settings/fuelgauge/PowerUsageSummaryTest.java b/tests/robotests/src/com/android/settings/fuelgauge/PowerUsageSummaryTest.java
index 48a48b1..5be2fe6 100644
--- a/tests/robotests/src/com/android/settings/fuelgauge/PowerUsageSummaryTest.java
+++ b/tests/robotests/src/com/android/settings/fuelgauge/PowerUsageSummaryTest.java
@@ -15,7 +15,6 @@
  */
 package com.android.settings.fuelgauge;
 
-import static com.android.settings.fuelgauge.PowerUsageSummary.MENU_ADDITIONAL_BATTERY_INFO;
 import static com.android.settings.fuelgauge.PowerUsageSummary.MENU_HIGH_POWER_APPS;
 import static com.android.settings.fuelgauge.PowerUsageSummary.MENU_TOGGLE_APPS;
 import static com.google.common.truth.Truth.assertThat;
@@ -67,6 +66,7 @@
 import com.android.settingslib.core.AbstractPreferenceController;
 
 import org.junit.Before;
+import org.junit.BeforeClass;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.Answers;
@@ -86,7 +86,7 @@
 // TODO: Improve this test class so that it starts up the real activity and fragment.
 @RunWith(SettingsRobolectricTestRunner.class)
 @Config(manifest = TestConfig.MANIFEST_PATH,
-        sdk = TestConfig.SDK_VERSION,
+        sdk = TestConfig.SDK_VERSION_O,
         shadows = {
                 SettingsShadowResources.class,
                 SettingsShadowResources.SettingsShadowTheme.class,
@@ -108,10 +108,14 @@
     private static final double BATTERY_OVERCOUNTED_USAGE = 500;
     private static final double PRECISION = 0.001;
     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)";
+    private static Intent sAdditionalBatteryInfoIntent;
+
+    @BeforeClass
+    public static void beforeClass() {
+        sAdditionalBatteryInfoIntent =new Intent("com.example.app.ADDITIONAL_BATTERY_INFO");
+    }
 
     @Mock(answer = Answers.RETURNS_DEEP_STUBS)
     private Context mContext;
@@ -186,12 +190,10 @@
         doReturn(mock(LoaderManager.class)).when(mFragment).getLoaderManager();
 
         when(mFragment.getActivity()).thenReturn(mSettingsActivity);
-        when(mAdditionalBatteryInfoMenu.getItemId())
-                .thenReturn(MENU_ADDITIONAL_BATTERY_INFO);
         when(mToggleAppsMenu.getItemId()).thenReturn(MENU_TOGGLE_APPS);
         when(mHighPowerMenu.getItemId()).thenReturn(MENU_HIGH_POWER_APPS);
         when(mFeatureFactory.powerUsageFeatureProvider.getAdditionalBatteryInfoIntent())
-                .thenReturn(ADDITIONAL_BATTERY_INFO_INTENT);
+                .thenReturn(sAdditionalBatteryInfoIntent);
         when(mBatteryHelper.getTotalPower()).thenReturn(TOTAL_POWER);
         when(mBatteryHelper.getStats().computeBatteryRealtime(anyLong(), anyInt())).thenReturn(
                 TIME_SINCE_LAST_FULL_CHARGE_US);
@@ -227,33 +229,6 @@
     }
 
     @Test
-    public void testOptionsMenu_additionalBatteryInfoEnabled() {
-        when(mFeatureFactory.powerUsageFeatureProvider.isAdditionalBatteryInfoEnabled())
-                .thenReturn(true);
-
-        mFragment.onCreateOptionsMenu(mMenu, mMenuInflater);
-
-        verify(mMenu).add(Menu.NONE, MENU_ADDITIONAL_BATTERY_INFO,
-                Menu.NONE, R.string.additional_battery_info);
-
-        mFragment.onOptionsItemSelected(mAdditionalBatteryInfoMenu);
-
-        assertThat(mFragment.mStartActivityCalled).isTrue();
-        assertThat(mFragment.mStartActivityIntent).isEqualTo(ADDITIONAL_BATTERY_INFO_INTENT);
-    }
-
-    @Test
-    public void testOptionsMenu_additionalBatteryInfoDisabled() {
-        when(mFeatureFactory.powerUsageFeatureProvider.isAdditionalBatteryInfoEnabled())
-                .thenReturn(false);
-
-        mFragment.onCreateOptionsMenu(mMenu, mMenuInflater);
-
-        verify(mMenu, never()).add(Menu.NONE, MENU_ADDITIONAL_BATTERY_INFO,
-                Menu.NONE, R.string.additional_battery_info);
-    }
-
-    @Test
     public void testOptionsMenu_menuHighPower_metricEventInvoked() {
         mFragment.onOptionsItemSelected(mHighPowerMenu);
 
@@ -262,14 +237,6 @@
     }
 
     @Test
-    public void testOptionsMenu_menuAdditionalBattery_metricEventInvoked() {
-        mFragment.onOptionsItemSelected(mAdditionalBatteryInfoMenu);
-
-        verify(mFeatureFactory.metricsFeatureProvider).action(mContext,
-                MetricsProto.MetricsEvent.ACTION_SETTINGS_MENU_BATTERY_USAGE_ALERTS);
-    }
-
-    @Test
     public void testOptionsMenu_menuAppToggle_metricEventInvoked() {
         mFragment.onOptionsItemSelected(mToggleAppsMenu);
         mFragment.mShowAllApps = false;
@@ -314,6 +281,16 @@
     }
 
     @Test
+    public void testExtractKeyFromSipper_typeUser_returnDrainTypeWithUserId() {
+        mNormalBatterySipper.uidObj = null;
+        mNormalBatterySipper.drainType = BatterySipper.DrainType.USER;
+        mNormalBatterySipper.userId = 2;
+
+        final String key = mFragment.extractKeyFromSipper(mNormalBatterySipper);
+        assertThat(key).isEqualTo("USER2");
+    }
+
+    @Test
     public void testExtractKeyFromSipper_typeAPPUidObjectNotNull_returnUid() {
         mNormalBatterySipper.uidObj = new BatteryStatsImpl.Uid(new BatteryStatsImpl(), UID);
         mNormalBatterySipper.drainType = BatterySipper.DrainType.APP;
@@ -401,18 +378,11 @@
 
     @Test
     public void testUpdateLastFullChargePreference_showCorrectSummary() {
-        final CharSequence formattedString = mRealContext.getText(
-                R.string.power_last_full_charge_summary);
-        final CharSequence timeSequence = Utils.formatElapsedTime(mRealContext,
-                TIME_SINCE_LAST_FULL_CHARGE_MS, false);
-        final CharSequence expectedSummary = TextUtils.expandTemplate(
-                formattedString, timeSequence);
-        doReturn(formattedString).when(mFragment).getText(R.string.power_last_full_charge_summary);
         doReturn(mRealContext).when(mFragment).getContext();
 
         mFragment.updateLastFullChargePreference(TIME_SINCE_LAST_FULL_CHARGE_MS);
 
-        assertThat(mLastFullChargePref.getSubtitle()).isEqualTo(expectedSummary);
+        assertThat(mLastFullChargePref.getSubtitle()).isEqualTo("2 hr. ago");
     }
 
     @Test
diff --git a/tests/robotests/src/com/android/settings/fuelgauge/anomaly/AnomalyDetectionPolicyTest.java b/tests/robotests/src/com/android/settings/fuelgauge/anomaly/AnomalyDetectionPolicyTest.java
index 8d07629..4ecd1dd 100644
--- a/tests/robotests/src/com/android/settings/fuelgauge/anomaly/AnomalyDetectionPolicyTest.java
+++ b/tests/robotests/src/com/android/settings/fuelgauge/anomaly/AnomalyDetectionPolicyTest.java
@@ -30,6 +30,7 @@
 
 import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
+import com.android.settings.wrapper.KeyValueListParserWrapper;
 
 import org.junit.Before;
 import org.junit.Test;
@@ -38,7 +39,7 @@
 import org.robolectric.annotation.Config;
 
 @RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION_O)
 public class AnomalyDetectionPolicyTest {
     private static final String ANOMALY_DETECTION_CONSTANTS_VALUE =
             "anomaly_detection_enabled=true"
@@ -56,7 +57,7 @@
     public void setUp() {
         mContext = RuntimeEnvironment.application;
         mKeyValueListParserWrapper = spy(
-                new KeyValueListParserWrapperImpl(new KeyValueListParser(',')));
+                new KeyValueListParserWrapper(new KeyValueListParser(',')));
     }
 
     @Test
diff --git a/tests/robotests/src/com/android/settings/fuelgauge/anomaly/AnomalyDialogFragmentTest.java b/tests/robotests/src/com/android/settings/fuelgauge/anomaly/AnomalyDialogFragmentTest.java
index 1111804..ccce08f 100644
--- a/tests/robotests/src/com/android/settings/fuelgauge/anomaly/AnomalyDialogFragmentTest.java
+++ b/tests/robotests/src/com/android/settings/fuelgauge/anomaly/AnomalyDialogFragmentTest.java
@@ -19,7 +19,6 @@
 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;
@@ -28,12 +27,15 @@
 import android.app.AlertDialog;
 import android.content.Context;
 import android.content.DialogInterface;
+import android.content.pm.permission.RuntimePermissionPresenter;
 import android.os.Build;
 
 import com.android.settings.R;
 import com.android.settings.fuelgauge.anomaly.action.AnomalyAction;
+import com.android.settings.testutils.FakeFeatureFactory;
 import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
+import com.android.settings.testutils.shadow.ShadowRuntimePermissionPresenter;
 
 import org.junit.Before;
 import org.junit.Test;
@@ -47,7 +49,8 @@
 import org.robolectric.util.FragmentTestUtil;
 
 @RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION_O,
+        shadows = ShadowRuntimePermissionPresenter.class)
 public class AnomalyDialogFragmentTest {
     private static final String PACKAGE_NAME = "com.android.app";
     private static final String DISPLAY_NAME = "app";
@@ -57,6 +60,8 @@
     private AnomalyUtils mAnomalyUtils;
     @Mock
     private AnomalyAction mAnomalyAction;
+    @Mock
+    private RuntimePermissionPresenter mRuntimePermissionPresenter;
     private Anomaly mWakeLockAnomaly;
     private Anomaly mWakeupAlarmAnomaly;
     private Anomaly mWakeupAlarmAnomaly2;
@@ -68,7 +73,7 @@
     public void setUp() {
         MockitoAnnotations.initMocks(this);
 
-        mContext = RuntimeEnvironment.application;
+        mContext = spy(RuntimeEnvironment.application);
         mWakeLockAnomaly = new Anomaly.Builder()
                 .setType(Anomaly.AnomalyType.WAKE_LOCK)
                 .setUid(UID)
@@ -94,6 +99,8 @@
                 .setPackageName(PACKAGE_NAME)
                 .setDisplayName(DISPLAY_NAME)
                 .build();
+        FakeFeatureFactory.setupForTest(mContext);
+        ShadowRuntimePermissionPresenter.setRuntimePermissionPresenter(mRuntimePermissionPresenter);
     }
 
     @Test
diff --git a/tests/robotests/src/com/android/settings/fuelgauge/anomaly/AnomalyLoaderTest.java b/tests/robotests/src/com/android/settings/fuelgauge/anomaly/AnomalyLoaderTest.java
index 48749d5..dfb7d21 100644
--- a/tests/robotests/src/com/android/settings/fuelgauge/anomaly/AnomalyLoaderTest.java
+++ b/tests/robotests/src/com/android/settings/fuelgauge/anomaly/AnomalyLoaderTest.java
@@ -49,7 +49,8 @@
 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_O
+)
 public class AnomalyLoaderTest {
     private static final String PACKAGE_NAME = "com.android.settings";
     private static final CharSequence DISPLAY_NAME = "Settings";
diff --git a/tests/robotests/src/com/android/settings/fuelgauge/anomaly/AnomalyPreferenceTest.java b/tests/robotests/src/com/android/settings/fuelgauge/anomaly/AnomalyPreferenceTest.java
index c0157ae..7061b8a 100644
--- a/tests/robotests/src/com/android/settings/fuelgauge/anomaly/AnomalyPreferenceTest.java
+++ b/tests/robotests/src/com/android/settings/fuelgauge/anomaly/AnomalyPreferenceTest.java
@@ -31,7 +31,7 @@
 import org.robolectric.annotation.Config;
 
 @RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION_O)
 public class AnomalyPreferenceTest {
     @Anomaly.AnomalyType
     private static final int ANOMALY_TYPE = Anomaly.AnomalyType.WAKE_LOCK;
diff --git a/tests/robotests/src/com/android/settings/fuelgauge/anomaly/AnomalySummaryPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/fuelgauge/anomaly/AnomalySummaryPreferenceControllerTest.java
index 8297e81..1114e6a 100644
--- a/tests/robotests/src/com/android/settings/fuelgauge/anomaly/AnomalySummaryPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/fuelgauge/anomaly/AnomalySummaryPreferenceControllerTest.java
@@ -30,9 +30,9 @@
 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.fuelgauge.BatteryUtils;
 import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
 
@@ -49,7 +49,7 @@
 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_O)
 public class AnomalySummaryPreferenceControllerTest {
     @Anomaly.AnomalyType
     private static final int ANOMALY_TYPE = Anomaly.AnomalyType.WAKE_LOCK;
@@ -57,7 +57,7 @@
     private static final String DISPLAY_NAME = "appName";
     private static final int UID = 111;
 
-    @Mock(answer = Answers.RETURNS_DEEP_STUBS)
+    @Mock
     private PreferenceFragment mFragment;
     @Mock
     private FragmentManager mFragmentManager;
@@ -65,6 +65,9 @@
     private FragmentTransaction mFragmentTransaction;
     @Mock
     private SettingsActivity mSettingsActivity;
+    @Mock
+    private PreferenceScreen mPreferenceScreen;
+
     private AnomalySummaryPreferenceController mAnomalySummaryPreferenceController;
     private Preference mPreference;
     private Context mContext;
@@ -77,11 +80,12 @@
         mContext = RuntimeEnvironment.application;
         mPreference = new Preference(mContext);
         mPreference.setKey(AnomalySummaryPreferenceController.ANOMALY_KEY);
-        when(mFragment.getPreferenceScreen().findPreference(any())).thenReturn(mPreference);
+        when(mFragment.getPreferenceScreen()).thenReturn(mPreferenceScreen);
         when(mFragment.getFragmentManager()).thenReturn(mFragmentManager);
         when(mFragmentManager.beginTransaction()).thenReturn(mFragmentTransaction);
         when(mFragment.getContext()).thenReturn(mContext);
         when(mSettingsActivity.getApplicationContext()).thenReturn(mContext);
+        when(mPreferenceScreen.findPreference(any())).thenReturn(mPreference);
 
         mAnomalyList = new ArrayList<>();
 
diff --git a/tests/robotests/src/com/android/settings/fuelgauge/anomaly/AnomalyTest.java b/tests/robotests/src/com/android/settings/fuelgauge/anomaly/AnomalyTest.java
index 13a5b31..dae1141 100644
--- a/tests/robotests/src/com/android/settings/fuelgauge/anomaly/AnomalyTest.java
+++ b/tests/robotests/src/com/android/settings/fuelgauge/anomaly/AnomalyTest.java
@@ -29,7 +29,7 @@
 import org.robolectric.annotation.Config;
 
 @RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION_O)
 public class AnomalyTest {
     private static int TYPE = Anomaly.AnomalyType.WAKE_LOCK;
     private static int UID = 111;
diff --git a/tests/robotests/src/com/android/settings/fuelgauge/anomaly/AnomalyUtilsTest.java b/tests/robotests/src/com/android/settings/fuelgauge/anomaly/AnomalyUtilsTest.java
index 8cd5a06..d37d01e 100644
--- a/tests/robotests/src/com/android/settings/fuelgauge/anomaly/AnomalyUtilsTest.java
+++ b/tests/robotests/src/com/android/settings/fuelgauge/anomaly/AnomalyUtilsTest.java
@@ -18,8 +18,13 @@
 
 import static com.google.common.truth.Truth.assertThat;
 
-import android.os.Build;
+import static org.mockito.Mockito.verify;
 
+import android.os.Build;
+import android.util.Pair;
+
+import com.android.internal.logging.nano.MetricsProto;
+import com.android.settings.core.instrumentation.MetricsFeatureProvider;
 import com.android.settings.fuelgauge.anomaly.action.StopAndBackgroundCheckAction;
 import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
@@ -31,18 +36,42 @@
 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.ArrayList;
+import java.util.List;
+
 @RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION, shadows = {
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION_O, shadows = {
         ShadowKeyValueListParserWrapperImpl.class})
 public class AnomalyUtilsTest {
+    private static final String PACKAGE_NAME_WAKEUP = "com.android.app1";
+    private static final String PACKAGE_NAME_WAKELOCK = "com.android.app2";
+    private static final int CONTEXT_ID = 55;
+
+    @Mock
+    private MetricsFeatureProvider mMetricsFeatureProvider;
     private AnomalyUtils mAnomalyUtils;
+    private Anomaly mWakeupAnomaly;
+    private Anomaly mWakeLockAnomaly;
 
     @Before
     public void setUp() {
+        MockitoAnnotations.initMocks(this);
+
         mAnomalyUtils = new AnomalyUtils(RuntimeEnvironment.application);
+
+        mWakeLockAnomaly = new Anomaly.Builder()
+                .setType(Anomaly.AnomalyType.WAKE_LOCK)
+                .setPackageName(PACKAGE_NAME_WAKELOCK)
+                .build();
+        mWakeupAnomaly = new Anomaly.Builder()
+                .setType(Anomaly.AnomalyType.WAKEUP_ALARM)
+                .setPackageName(PACKAGE_NAME_WAKEUP)
+                .build();
     }
 
     @Test
@@ -97,4 +126,47 @@
         assertThat(mAnomalyUtils.getAnomalyDetector(Anomaly.AnomalyType.WAKEUP_ALARM)).isInstanceOf(
                 WakeupAlarmAnomalyDetector.class);
     }
+
+    @Test
+    public void testLogAnomaly() {
+        mAnomalyUtils.logAnomaly(mMetricsFeatureProvider, mWakeLockAnomaly, CONTEXT_ID);
+
+        verify(mMetricsFeatureProvider).action(RuntimeEnvironment.application,
+                MetricsProto.MetricsEvent.ANOMALY_TYPE_WAKELOCK,
+                PACKAGE_NAME_WAKELOCK,
+                Pair.create(
+                        MetricsProto.MetricsEvent.FIELD_CONTEXT,
+                        CONTEXT_ID),
+                Pair.create(
+                        MetricsProto.MetricsEvent.FIELD_ANOMALY_ACTION_TYPE,
+                        Anomaly.AnomalyActionType.FORCE_STOP));
+    }
+
+    @Test
+    public void testLogAnomalies() {
+        final List<Anomaly> anomalies = new ArrayList<>();
+        anomalies.add(mWakeLockAnomaly);
+        anomalies.add(mWakeupAnomaly);
+
+        mAnomalyUtils.logAnomalies(mMetricsFeatureProvider, anomalies, CONTEXT_ID);
+
+        verify(mMetricsFeatureProvider).action(RuntimeEnvironment.application,
+                MetricsProto.MetricsEvent.ANOMALY_TYPE_WAKELOCK,
+                PACKAGE_NAME_WAKELOCK,
+                Pair.create(
+                        MetricsProto.MetricsEvent.FIELD_CONTEXT,
+                        CONTEXT_ID),
+                Pair.create(
+                        MetricsProto.MetricsEvent.FIELD_ANOMALY_ACTION_TYPE,
+                        Anomaly.AnomalyActionType.FORCE_STOP));
+        verify(mMetricsFeatureProvider).action(RuntimeEnvironment.application,
+                MetricsProto.MetricsEvent.ANOMALY_TYPE_WAKEUP_ALARM,
+                PACKAGE_NAME_WAKEUP,
+                Pair.create(
+                        MetricsProto.MetricsEvent.FIELD_CONTEXT,
+                        CONTEXT_ID),
+                Pair.create(
+                        MetricsProto.MetricsEvent.FIELD_ANOMALY_ACTION_TYPE,
+                        Anomaly.AnomalyActionType.STOP_AND_BACKGROUND_CHECK));
+    }
 }
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
index 8db1a8c..6f3e9b4 100644
--- a/tests/robotests/src/com/android/settings/fuelgauge/anomaly/action/AnomalyActionTest.java
+++ b/tests/robotests/src/com/android/settings/fuelgauge/anomaly/action/AnomalyActionTest.java
@@ -38,7 +38,7 @@
 import org.robolectric.annotation.Config;
 
 @RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION_O)
 public class AnomalyActionTest {
     private static final String PACKAGE_NAME = "com.android.app";
     private static final int UID = 111;
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
index 7e5fc4a..e72039a 100644
--- a/tests/robotests/src/com/android/settings/fuelgauge/anomaly/action/BackgroundCheckActionTest.java
+++ b/tests/robotests/src/com/android/settings/fuelgauge/anomaly/action/BackgroundCheckActionTest.java
@@ -40,7 +40,7 @@
 import org.robolectric.annotation.Config;
 
 @RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION_O)
 public class BackgroundCheckActionTest {
     private static final String PACKAGE_NAME = "com.android.app";
     private static final int UID = 111;
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
index 89b1a16..fcb029c 100644
--- a/tests/robotests/src/com/android/settings/fuelgauge/anomaly/action/ForceStopActionTest.java
+++ b/tests/robotests/src/com/android/settings/fuelgauge/anomaly/action/ForceStopActionTest.java
@@ -40,7 +40,7 @@
 import org.robolectric.annotation.Config;
 
 @RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION_O)
 public class ForceStopActionTest {
     private static final String PACKAGE_NAME = "com.android.app";
 
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
index 234dd12..d2b6fcb 100644
--- a/tests/robotests/src/com/android/settings/fuelgauge/anomaly/action/LocationCheckActionTest.java
+++ b/tests/robotests/src/com/android/settings/fuelgauge/anomaly/action/LocationCheckActionTest.java
@@ -37,7 +37,7 @@
 import org.robolectric.annotation.Config;
 
 @RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION, shadows =
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION_O, shadows =
         ShadowPermissionChecker.class)
 public class LocationCheckActionTest {
     private static final String PACKAGE_NAME = "com.android.app";
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
index c06bddd..de7402b 100644
--- a/tests/robotests/src/com/android/settings/fuelgauge/anomaly/action/StopAndBackgroundActionTest.java
+++ b/tests/robotests/src/com/android/settings/fuelgauge/anomaly/action/StopAndBackgroundActionTest.java
@@ -36,7 +36,7 @@
 import org.robolectric.annotation.Config;
 
 @RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION_O)
 public class StopAndBackgroundActionTest {
     private static final String PACKAGE_NAME = "com.android.app";
     private static final int UID = 111;
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
index f8d02ff..b148ce9 100644
--- a/tests/robotests/src/com/android/settings/fuelgauge/anomaly/checker/BluetoothScanAnomalyDetectorTest.java
+++ b/tests/robotests/src/com/android/settings/fuelgauge/anomaly/checker/BluetoothScanAnomalyDetectorTest.java
@@ -26,7 +26,6 @@
 import static org.mockito.Mockito.spy;
 
 import android.content.Context;
-import android.content.pm.ApplicationInfo;
 import android.os.BatteryStats;
 import android.text.format.DateUtils;
 
@@ -53,7 +52,7 @@
 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_O)
 public class BluetoothScanAnomalyDetectorTest {
     private static final String TARGET_PACKAGE_NAME = "com.android.app";
     private static final int ANOMALY_UID = 111;
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
index d7682ea..0991d89 100644
--- a/tests/robotests/src/com/android/settings/fuelgauge/anomaly/checker/WakeLockAnomalyDetectorTest.java
+++ b/tests/robotests/src/com/android/settings/fuelgauge/anomaly/checker/WakeLockAnomalyDetectorTest.java
@@ -55,7 +55,7 @@
 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_O)
 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;
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
index 13a5ab8..f014f8d 100644
--- a/tests/robotests/src/com/android/settings/fuelgauge/anomaly/checker/WakeupAlarmAnomalyDetectorTest.java
+++ b/tests/robotests/src/com/android/settings/fuelgauge/anomaly/checker/WakeupAlarmAnomalyDetectorTest.java
@@ -56,7 +56,7 @@
 import java.util.Set;
 
 @RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION_O)
 public class WakeupAlarmAnomalyDetectorTest {
     private static final String TARGET_PACKAGE_NAME = "com.android.target";
     private static final String ANOMALY_PACKAGE_NAME = "com.android.anomaly";
diff --git a/tests/robotests/src/com/android/settings/gestures/AssistGestureSettingsPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/gestures/AssistGestureSettingsPreferenceControllerTest.java
index 7633ce9..40c4af3 100644
--- a/tests/robotests/src/com/android/settings/gestures/AssistGestureSettingsPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/gestures/AssistGestureSettingsPreferenceControllerTest.java
@@ -45,7 +45,7 @@
 @RunWith(SettingsRobolectricTestRunner.class)
 @Config(
     manifest = TestConfig.MANIFEST_PATH,
-    sdk = TestConfig.SDK_VERSION,
+    sdk = TestConfig.SDK_VERSION_O,
     shadows = ShadowSecureSettings.class
 )
 public class AssistGestureSettingsPreferenceControllerTest {
diff --git a/tests/robotests/src/com/android/settings/gestures/AssistGestureSettingsTest.java b/tests/robotests/src/com/android/settings/gestures/AssistGestureSettingsTest.java
index 1f5c9be..b2bd27e 100644
--- a/tests/robotests/src/com/android/settings/gestures/AssistGestureSettingsTest.java
+++ b/tests/robotests/src/com/android/settings/gestures/AssistGestureSettingsTest.java
@@ -27,11 +27,11 @@
 import com.android.settings.TestConfig;
 import com.android.settings.testutils.FakeFeatureFactory;
 import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settingslib.core.AbstractPreferenceController;
 
 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;
@@ -41,9 +41,9 @@
 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_O)
 public class AssistGestureSettingsTest {
-    @Mock
+    @Mock(answer = Answers.RETURNS_DEEP_STUBS)
     private Context mContext;
     private FakeFeatureFactory mFakeFeatureFactory;
     private AssistGestureSettings mSettings;
@@ -51,6 +51,7 @@
     @Before
     public void setUp() {
         MockitoAnnotations.initMocks(this);
+        FakeFeatureFactory.setupForTest(mContext);
         mFakeFeatureFactory = (FakeFeatureFactory) FakeFeatureFactory.getFactory(mContext);
         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 9c9a546..12ecc90 100644
--- a/tests/robotests/src/com/android/settings/gestures/DoubleTapPowerPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/gestures/DoubleTapPowerPreferenceControllerTest.java
@@ -16,18 +16,28 @@
 
 package com.android.settings.gestures;
 
+import static android.provider.Settings.Secure.CAMERA_DOUBLE_TAP_POWER_GESTURE_DISABLED;
+import static com.android.settings.gestures.DoubleTapPowerPreferenceController.OFF;
+import static com.android.settings.gestures.DoubleTapPowerPreferenceController.ON;
+import static com.android.settings.gestures.DoubleTapPowerPreferenceController.isSuggestionComplete;
+import static com.google.common.truth.Truth.assertThat;
+import static org.mockito.Mockito.when;
+
 import android.content.ContentResolver;
 import android.content.Context;
+import android.content.SharedPreferences;
 import android.provider.Settings;
-import android.support.v7.preference.PreferenceScreen;
 
+import com.android.settings.TestConfig;
+import com.android.settings.dashboard.suggestions.SuggestionFeatureProviderImpl;
 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.SettingsShadowResources;
 import com.android.settings.testutils.shadow.ShadowSecureSettings;
+
+import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -36,20 +46,15 @@
 import org.mockito.MockitoAnnotations;
 import org.robolectric.RuntimeEnvironment;
 import org.robolectric.annotation.Config;
-import org.robolectric.shadows.ShadowApplication;
-
-import static android.provider.Settings.Secure.CAMERA_DOUBLE_TAP_POWER_GESTURE_DISABLED;
-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)
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION_O, shadows = {
+        SettingsShadowResources.class
+})
 public class DoubleTapPowerPreferenceControllerTest {
 
     @Mock(answer = Answers.RETURNS_DEEP_STUBS)
     private Context mContext;
-    @Mock(answer = Answers.RETURNS_DEEP_STUBS)
-    private PreferenceScreen mScreen;
     private DoubleTapPowerPreferenceController mController;
     private static final String KEY_DOUBLE_TAP_POWER = "gesture_double_tap_power";
 
@@ -59,6 +64,11 @@
         mController = new DoubleTapPowerPreferenceController(mContext, null, KEY_DOUBLE_TAP_POWER);
     }
 
+    @After
+    public void tearDown() {
+        SettingsShadowResources.reset();
+    }
+
     @Test
     public void isAvailable_configIsTrue_shouldReturnTrue() {
         when(mContext.getResources().
@@ -80,9 +90,9 @@
     @Test
     public void testSwitchEnabled_configIsNotSet_shouldReturnTrue() {
         // Set the setting to be enabled.
-        final Context context = ShadowApplication.getInstance().getApplicationContext();
+        final Context context = RuntimeEnvironment.application;
         Settings.System.putInt(context.getContentResolver(),
-                CAMERA_DOUBLE_TAP_POWER_GESTURE_DISABLED, 0);
+                CAMERA_DOUBLE_TAP_POWER_GESTURE_DISABLED, ON);
         mController = new DoubleTapPowerPreferenceController(context, null, KEY_DOUBLE_TAP_POWER);
 
         assertThat(mController.isSwitchPrefEnabled()).isTrue();
@@ -91,9 +101,9 @@
     @Test
     public void testSwitchEnabled_configIsSet_shouldReturnFalse() {
         // Set the setting to be disabled.
-        final Context context = ShadowApplication.getInstance().getApplicationContext();
+        final Context context = RuntimeEnvironment.application;
         Settings.System.putInt(context.getContentResolver(),
-                CAMERA_DOUBLE_TAP_POWER_GESTURE_DISABLED, 1);
+                CAMERA_DOUBLE_TAP_POWER_GESTURE_DISABLED, OFF);
         mController = new DoubleTapPowerPreferenceController(context, null, KEY_DOUBLE_TAP_POWER);
 
         assertThat(mController.isSwitchPrefEnabled()).isFalse();
@@ -138,4 +148,43 @@
         newValue = 1 - newValue; // DoubleTapPower is a non-standard switch
         assertThat(newValue).isEqualTo(currentValue);
     }
+
+    @Test
+    public void isSuggestionCompleted_doubleTapPower_trueWhenNotAvailable() {
+        SettingsShadowResources.overrideResource(
+                com.android.internal.R.bool.config_cameraDoubleTapPowerGestureEnabled, false);
+
+        assertThat(
+                isSuggestionComplete(RuntimeEnvironment.application, null/* prefs */))
+                .isTrue();
+    }
+
+    @Test
+    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.
+        final Context context = RuntimeEnvironment.application;
+        final SharedPreferences prefs = new SuggestionFeatureProviderImpl(context)
+                .getSharedPrefs(context);
+        assertThat(
+                isSuggestionComplete(RuntimeEnvironment.application, prefs))
+                .isFalse();
+    }
+
+    @Test
+    public void isSuggestionCompleted_doubleTapPower_trueWhenVisited() {
+        SettingsShadowResources.overrideResource(
+                com.android.internal.R.bool.config_cameraDoubleTapPowerGestureEnabled, true);
+        // No stored value in shared preferences if not visited yet.
+        final Context context = RuntimeEnvironment.application;
+        final SharedPreferences prefs = new SuggestionFeatureProviderImpl(context)
+                .getSharedPrefs(context);
+        prefs.edit().putBoolean(
+                DoubleTapPowerSettings.PREF_KEY_SUGGESTION_COMPLETE, true).commit();
+
+        assertThat(
+                isSuggestionComplete(RuntimeEnvironment.application, prefs))
+                .isTrue();
+    }
 }
diff --git a/tests/robotests/src/com/android/settings/gestures/DoubleTapPowerSettingsTest.java b/tests/robotests/src/com/android/settings/gestures/DoubleTapPowerSettingsTest.java
index b9635a7..e322b07 100644
--- a/tests/robotests/src/com/android/settings/gestures/DoubleTapPowerSettingsTest.java
+++ b/tests/robotests/src/com/android/settings/gestures/DoubleTapPowerSettingsTest.java
@@ -32,7 +32,7 @@
 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_O)
 public class DoubleTapPowerSettingsTest {
 
     private DoubleTapPowerSettings mSettings;
diff --git a/tests/robotests/src/com/android/settings/gestures/DoubleTapScreenPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/gestures/DoubleTapScreenPreferenceControllerTest.java
index 37f52de..72a77b0 100644
--- a/tests/robotests/src/com/android/settings/gestures/DoubleTapScreenPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/gestures/DoubleTapScreenPreferenceControllerTest.java
@@ -16,18 +16,27 @@
 
 package com.android.settings.gestures;
 
+import static com.google.common.truth.Truth.assertThat;
+
+import static org.mockito.Matchers.anyInt;
+import static org.mockito.Mockito.when;
+
 import android.content.ContentResolver;
 import android.content.Context;
-
+import android.content.SharedPreferences;
 import android.provider.Settings;
+
 import com.android.internal.hardware.AmbientDisplayConfiguration;
+import com.android.settings.TestConfig;
+import com.android.settings.dashboard.suggestions.SuggestionFeatureProviderImpl;
 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.SettingsShadowResources;
 import com.android.settings.testutils.shadow.ShadowSecureSettings;
+
+import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -37,12 +46,8 @@
 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.Mockito.when;
-
 @RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION_O)
 public class DoubleTapScreenPreferenceControllerTest {
 
     @Mock(answer = Answers.RETURNS_DEEP_STUBS)
@@ -60,6 +65,11 @@
                 mContext, null, mAmbientDisplayConfiguration, 0, KEY_DOUBLE_TAP_SCREEN);
     }
 
+    @After
+    public void tearDown() {
+        SettingsShadowResources.reset();
+    }
+
     @Test
     public void isAvailable_configIsTrue_shouldReturnTrue() {
         when(mAmbientDisplayConfiguration.pulseOnDoubleTapAvailable()).thenReturn(true);
@@ -125,4 +135,30 @@
 
         assertThat(newValue).isEqualTo(currentValue);
     }
+
+    @Test
+    public void isSuggestionCompleted_ambientDisplay_falseWhenNotVisited() {
+        when(mAmbientDisplayConfiguration.pulseOnDoubleTapAvailable()).thenReturn(true);
+        // No stored value in shared preferences if not visited yet.
+        final Context context = RuntimeEnvironment.application;
+        final SharedPreferences prefs = new SuggestionFeatureProviderImpl(context)
+                .getSharedPrefs(context);
+
+        assertThat(DoubleTapScreenPreferenceController.isSuggestionComplete(
+                mAmbientDisplayConfiguration, prefs)).isFalse();
+    }
+
+    @Test
+    public void isSuggestionCompleted_ambientDisplay_trueWhenVisited() {
+        when(mAmbientDisplayConfiguration.pulseOnDoubleTapAvailable()).thenReturn(false);
+        final Context context = RuntimeEnvironment.application;
+        final SharedPreferences prefs = new SuggestionFeatureProviderImpl(context)
+                .getSharedPrefs(context);
+
+        prefs.edit().putBoolean(
+                DoubleTapScreenSettings.PREF_KEY_SUGGESTION_COMPLETE, true).commit();
+
+        assertThat(DoubleTapScreenPreferenceController.isSuggestionComplete(
+                mAmbientDisplayConfiguration, prefs)).isTrue();
+    }
 }
diff --git a/tests/robotests/src/com/android/settings/gestures/DoubleTapScreenSettingsTest.java b/tests/robotests/src/com/android/settings/gestures/DoubleTapScreenSettingsTest.java
index 3d56d71..e29bf79 100644
--- a/tests/robotests/src/com/android/settings/gestures/DoubleTapScreenSettingsTest.java
+++ b/tests/robotests/src/com/android/settings/gestures/DoubleTapScreenSettingsTest.java
@@ -32,7 +32,7 @@
 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_O)
 public class DoubleTapScreenSettingsTest {
 
     private DoubleTapScreenSettings mSettings;
diff --git a/tests/robotests/src/com/android/settings/gestures/DoubleTwistGestureSettingsTest.java b/tests/robotests/src/com/android/settings/gestures/DoubleTwistGestureSettingsTest.java
index 236896a..081ff79 100644
--- a/tests/robotests/src/com/android/settings/gestures/DoubleTwistGestureSettingsTest.java
+++ b/tests/robotests/src/com/android/settings/gestures/DoubleTwistGestureSettingsTest.java
@@ -32,7 +32,7 @@
 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_O)
 public class DoubleTwistGestureSettingsTest {
 
     private DoubleTwistGestureSettings mSettings;
diff --git a/tests/robotests/src/com/android/settings/gestures/DoubleTwistPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/gestures/DoubleTwistPreferenceControllerTest.java
index aa8121c..b48889f 100644
--- a/tests/robotests/src/com/android/settings/gestures/DoubleTwistPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/gestures/DoubleTwistPreferenceControllerTest.java
@@ -16,38 +16,44 @@
 
 package com.android.settings.gestures;
 
-import android.content.Context;
-import android.hardware.Sensor;
-import android.hardware.SensorManager;
-import android.os.UserManager;
-import android.provider.Settings;
-
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.TestConfig;
-import com.android.settings.testutils.shadow.ShadowSecureSettings;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Answers;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
-import org.robolectric.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.Matchers.anyInt;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.spy;
 import static org.mockito.Mockito.when;
 
+import android.content.Context;
+import android.hardware.Sensor;
+import android.hardware.SensorManager;
+import android.os.UserManager;
+import android.provider.Settings;
+
+import com.android.settings.R;
+import com.android.settings.TestConfig;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.shadow.SettingsShadowResources;
+import com.android.settings.testutils.shadow.SettingsShadowSystemProperties;
 import com.android.settings.testutils.shadow.ShadowDoubleTwistPreferenceController;
+import com.android.settings.testutils.shadow.ShadowSecureSettings;
+
+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 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_O, shadows = {
+        SettingsShadowResources.class
+})
 public class DoubleTwistPreferenceControllerTest {
 
     @Mock(answer = Answers.RETURNS_DEEP_STUBS)
@@ -64,6 +70,11 @@
         mController = new DoubleTwistPreferenceController(mContext, null, KEY_DOUBLE_TWIST);
     }
 
+    @After
+    public void tearDown() {
+        SettingsShadowResources.reset();
+    }
+
     @Test
     public void isAvailable_hasSensor_shouldReturnTrue() {
         // Mock sensors
@@ -97,15 +108,27 @@
     }
 
     @Test
+    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(DoubleTwistPreferenceController.isSuggestionComplete(
+                RuntimeEnvironment.application, null /* prefs */))
+                .isTrue();
+    }
+
+    @Test
     @Config(shadows = {
             ShadowDoubleTwistPreferenceController.class,
             ShadowSecureSettings.class})
     public void onPreferenceChange_hasWorkProfile_shouldUpdateSettingForWorkProfileUser() {
         final int managedId = 2;
         ShadowSecureSettings.putIntForUser(
-            null, Settings.Secure.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));
+                spy(new DoubleTwistPreferenceController(mContext, null, KEY_DOUBLE_TWIST));
         ShadowDoubleTwistPreferenceController.setManagedProfileId(managedId);
 
         // enable the gesture
diff --git a/tests/robotests/src/com/android/settings/gestures/GesturePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/gestures/GesturePreferenceControllerTest.java
index 61b6909..df438c1 100644
--- a/tests/robotests/src/com/android/settings/gestures/GesturePreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/gestures/GesturePreferenceControllerTest.java
@@ -16,14 +16,21 @@
 
 package com.android.settings.gestures;
 
+import static com.google.common.truth.Truth.assertThat;
+import static org.mockito.Matchers.anyString;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.reset;
+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.PreferenceScreen;
 import android.support.v7.preference.TwoStatePreference;
 
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.widget.VideoPreference;
 import com.android.settingslib.core.lifecycle.Lifecycle;
 
@@ -33,19 +40,11 @@
 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.anyString;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.never;
-import static org.mockito.Mockito.reset;
-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_O)
 public class GesturePreferenceControllerTest {
 
 
@@ -55,12 +54,17 @@
     private PreferenceScreen mScreen;
     @Mock(answer = Answers.RETURNS_DEEP_STUBS)
     private Lifecycle mLifecycle;
+
     private TestPrefController mController;
+    private Preference mPreference;
 
     @Before
     public void setUp() {
         MockitoAnnotations.initMocks(this);
         mController = new TestPrefController(mContext, mLifecycle);
+        mPreference = new Preference(RuntimeEnvironment.application);
+        mPreference.setKey(mController.getPreferenceKey());
+        when(mScreen.findPreference(mPreference.getKey())).thenReturn(mPreference);
     }
 
     @Test
@@ -70,20 +74,16 @@
 
         mController.displayPreference(mScreen);
 
-        verify(mScreen, never()).removePreference(any(Preference.class));
+        assertThat(mPreference.isVisible()).isTrue();
     }
 
     @Test
     public void display_configIsFalse_shouldNotDisplay() {
         mController.mIsPrefAvailable = false;
-        final Preference preference = mock(Preference.class);
-        when(mScreen.getPreferenceCount()).thenReturn(1);
-        when(mScreen.getPreference(0)).thenReturn(preference);
-        when(preference.getKey()).thenReturn(mController.getPreferenceKey());
 
         mController.displayPreference(mScreen);
 
-        verify(mScreen).removePreference(any(Preference.class));
+        assertThat(mPreference.isVisible()).isFalse();
     }
 
     @Test
diff --git a/tests/robotests/src/com/android/settings/gestures/GesturesSettingsPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/gestures/GesturesSettingsPreferenceControllerTest.java
index b12b373..dcc06af 100644
--- a/tests/robotests/src/com/android/settings/gestures/GesturesSettingsPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/gestures/GesturesSettingsPreferenceControllerTest.java
@@ -48,7 +48,7 @@
 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_O)
 public class GesturesSettingsPreferenceControllerTest {
 
     @Mock(answer = Answers.RETURNS_DEEP_STUBS)
diff --git a/tests/robotests/src/com/android/settings/gestures/PIckupGesturePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/gestures/PIckupGesturePreferenceControllerTest.java
deleted file mode 100644
index 833f016..0000000
--- a/tests/robotests/src/com/android/settings/gestures/PIckupGesturePreferenceControllerTest.java
+++ /dev/null
@@ -1,143 +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.gestures;
-
-import android.content.ContentResolver;
-import android.content.Context;
-
-import android.provider.Settings;
-import com.android.internal.hardware.AmbientDisplayConfiguration;
-import com.android.settings.search.InlinePayload;
-import com.android.settings.search.InlineSwitchPayload;
-import com.android.settings.search.ResultPayload;
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.TestConfig;
-
-import com.android.settings.testutils.shadow.ShadowSecureSettings;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Answers;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
-import org.robolectric.RuntimeEnvironment;
-import org.robolectric.annotation.Config;
-
-import static com.google.common.truth.Truth.assertThat;
-import static org.mockito.Matchers.anyInt;
-import static org.mockito.Mockito.when;
-
-@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
-public class PIckupGesturePreferenceControllerTest {
-
-    @Mock(answer = Answers.RETURNS_DEEP_STUBS)
-    private Context mContext;
-    @Mock
-    private AmbientDisplayConfiguration mAmbientDisplayConfiguration;
-
-    private PickupGesturePreferenceController mController;
-
-    private static final String KEY_PICK_UP = "gesture_pick_up";
-
-    @Before
-    public void setUp() {
-        MockitoAnnotations.initMocks(this);
-        mController = new PickupGesturePreferenceController(
-                mContext, null, mAmbientDisplayConfiguration, 0, KEY_PICK_UP);
-    }
-
-    @Test
-    public void isAvailable_configIsTrue_shouldReturnTrue() {
-        when(mAmbientDisplayConfiguration.pulseOnPickupAvailable()).thenReturn(true);
-
-        assertThat(mController.isAvailable()).isTrue();
-    }
-
-    @Test
-    public void isAvailable_configIsFalse_shouldReturnFalse() {
-        when(mAmbientDisplayConfiguration.pulseOnPickupAvailable()).thenReturn(false);
-
-        assertThat(mController.isAvailable()).isFalse();
-    }
-
-    @Test
-    public void testSwitchEnabled_configIsSet_shouldReturnTrue() {
-        // Set the setting to be enabled.
-        when(mAmbientDisplayConfiguration.pulseOnPickupEnabled(anyInt())).thenReturn(true);
-
-        assertThat(mController.isSwitchPrefEnabled()).isTrue();
-    }
-
-    @Test
-    public void testSwitchEnabled_configIsNotSet_shouldReturnFalse() {
-        // Set the setting to be disabled.
-        when(mAmbientDisplayConfiguration.pulseOnPickupEnabled(anyInt())).thenReturn(false);
-
-        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/PickupGesturePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/gestures/PickupGesturePreferenceControllerTest.java
new file mode 100644
index 0000000..ffd4928
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/gestures/PickupGesturePreferenceControllerTest.java
@@ -0,0 +1,175 @@
+/*
+ * 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.gestures;
+
+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.spy;
+import static org.mockito.Mockito.when;
+
+import android.content.ContentResolver;
+import android.content.Context;
+import android.content.SharedPreferences;
+import android.provider.Settings;
+
+import com.android.internal.hardware.AmbientDisplayConfiguration;
+import com.android.settings.TestConfig;
+import com.android.settings.dashboard.suggestions.SuggestionFeatureProviderImpl;
+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.testutils.shadow.SettingsShadowResources;
+import com.android.settings.testutils.shadow.ShadowSecureSettings;
+
+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;
+
+@RunWith(SettingsRobolectricTestRunner.class)
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION_O, shadows = {
+        SettingsShadowResources.class
+})
+public class PickupGesturePreferenceControllerTest {
+
+    @Mock(answer = Answers.RETURNS_DEEP_STUBS)
+    private Context mContext;
+    @Mock
+    private AmbientDisplayConfiguration mAmbientDisplayConfiguration;
+
+    private PickupGesturePreferenceController mController;
+
+    private static final String KEY_PICK_UP = "gesture_pick_up";
+
+    @Before
+    public void setUp() {
+        MockitoAnnotations.initMocks(this);
+        mController = new PickupGesturePreferenceController(
+                mContext, null, mAmbientDisplayConfiguration, 0, KEY_PICK_UP);
+    }
+
+    @After
+    public void tearDown() {
+        SettingsShadowResources.reset();
+        ShadowSecureSettings.clear();
+    }
+
+    @Test
+    public void isAvailable_configIsTrue_shouldReturnTrue() {
+        when(mAmbientDisplayConfiguration.pulseOnPickupAvailable()).thenReturn(true);
+
+        assertThat(mController.isAvailable()).isTrue();
+    }
+
+    @Test
+    public void isAvailable_configIsFalse_shouldReturnFalse() {
+        when(mAmbientDisplayConfiguration.pulseOnPickupAvailable()).thenReturn(false);
+
+        assertThat(mController.isAvailable()).isFalse();
+    }
+
+    @Test
+    public void testSwitchEnabled_configIsSet_shouldReturnTrue() {
+        // Set the setting to be enabled.
+        when(mAmbientDisplayConfiguration.pulseOnPickupEnabled(anyInt())).thenReturn(true);
+
+        assertThat(mController.isSwitchPrefEnabled()).isTrue();
+    }
+
+    @Test
+    public void testSwitchEnabled_configIsNotSet_shouldReturnFalse() {
+        // Set the setting to be disabled.
+        when(mAmbientDisplayConfiguration.pulseOnPickupEnabled(anyInt())).thenReturn(false);
+
+        assertThat(mController.isSwitchPrefEnabled()).isFalse();
+    }
+
+    @Test
+    public void testCanHandleClicks_configIsSet_shouldReturnTrue() {
+        mController = spy(mController);
+        doReturn(true).when(mController).pulseOnPickupCanBeModified();
+
+        assertThat(mController.canHandleClicks()).isTrue();
+    }
+
+    @Test
+    public void testCanHandleClicks_configIsNotSet_shouldReturnFalse() {
+        mController = spy(mController);
+        doReturn(false).when(mController).pulseOnPickupCanBeModified();
+
+        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);
+    }
+
+    @Test
+    public void isSuggestionCompleted_ambientDisplayPickup_trueWhenVisited() {
+        when(mContext.getResources().getBoolean(anyInt()))
+                .thenReturn(true);
+        when(mContext.getResources().getString(anyInt()))
+                .thenReturn("foo");
+        final Context context = RuntimeEnvironment.application;
+        final SharedPreferences prefs = new SuggestionFeatureProviderImpl(context)
+                .getSharedPrefs(context);
+        prefs.edit().putBoolean(
+                PickupGestureSettings.PREF_KEY_SUGGESTION_COMPLETE, true).commit();
+
+        assertThat(PickupGesturePreferenceController.isSuggestionComplete(mContext, prefs))
+                .isTrue();
+    }
+}
diff --git a/tests/robotests/src/com/android/settings/gestures/PickupGestureSettingsTest.java b/tests/robotests/src/com/android/settings/gestures/PickupGestureSettingsTest.java
index 2c4a1c4..05c88ba 100644
--- a/tests/robotests/src/com/android/settings/gestures/PickupGestureSettingsTest.java
+++ b/tests/robotests/src/com/android/settings/gestures/PickupGestureSettingsTest.java
@@ -32,7 +32,7 @@
 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_O)
 public class PickupGestureSettingsTest {
 
     private PickupGestureSettings mSettings;
diff --git a/tests/robotests/src/com/android/settings/gestures/SwipeToNotificationPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/gestures/SwipeToNotificationPreferenceControllerTest.java
index d4fc014..f535a99 100644
--- a/tests/robotests/src/com/android/settings/gestures/SwipeToNotificationPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/gestures/SwipeToNotificationPreferenceControllerTest.java
@@ -16,20 +16,20 @@
 
 package com.android.settings.gestures;
 
-import android.content.ContentResolver;
+import static android.provider.Settings.Secure.SYSTEM_NAVIGATION_KEYS_ENABLED;
+import static com.google.common.truth.Truth.assertThat;
+import static org.mockito.Mockito.when;
+
 import android.content.Context;
+import android.content.SharedPreferences;
 import android.content.pm.PackageManager;
-import android.content.res.Resources;
 import android.hardware.fingerprint.FingerprintManager;
 import android.provider.Settings;
 
-import com.android.settings.search.InlinePayload;
-import com.android.settings.search.InlineSwitchPayload;
-import com.android.settings.search.ResultPayload;
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
+import com.android.settings.dashboard.suggestions.SuggestionFeatureProviderImpl;
+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;
@@ -40,16 +40,8 @@
 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)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION_O)
 public class SwipeToNotificationPreferenceControllerTest {
 
     @Mock(answer = Answers.RETURNS_DEEP_STUBS)
@@ -129,6 +121,54 @@
         assertThat(mController.isSwitchPrefEnabled()).isFalse();
     }
 
+    @Test
+    public void isSuggestionCompleted_configDisabled_shouldReturnTrue() {
+        stubFingerprintSupported(true);
+        when(mFingerprintManager.isHardwareDetected()).thenReturn(true);
+        when(mContext.getResources().
+                getBoolean(com.android.internal.R.bool.config_supportSystemNavigationKeys))
+                .thenReturn(false);
+
+        assertThat(SwipeToNotificationPreferenceController.isSuggestionComplete(
+                mContext, null /* prefs */))
+                .isTrue();
+    }
+
+    @Test
+    public void isSuggestionCompleted_notVisited_shouldReturnFalse() {
+        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.
+        final Context context = RuntimeEnvironment.application;
+        final SharedPreferences prefs = new SuggestionFeatureProviderImpl(context)
+                .getSharedPrefs(context);
+
+        assertThat(SwipeToNotificationPreferenceController.isSuggestionComplete(mContext, prefs))
+                .isFalse();
+    }
+
+    @Test
+    public void isSuggestionCompleted_visited_shouldReturnTrue() {
+        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.
+        final Context context = RuntimeEnvironment.application;
+        final SharedPreferences prefs = new SuggestionFeatureProviderImpl(context)
+                .getSharedPrefs(context);
+        prefs.edit()
+                .putBoolean(SwipeToNotificationSettings.PREF_KEY_SUGGESTION_COMPLETE, true)
+                .commit();
+
+        assertThat(SwipeToNotificationPreferenceController.isSuggestionComplete(mContext, prefs))
+                .isTrue();
+    }
+
     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 0b329d3..7e3b90e 100644
--- a/tests/robotests/src/com/android/settings/gestures/SwipeToNotificationSettingsTest.java
+++ b/tests/robotests/src/com/android/settings/gestures/SwipeToNotificationSettingsTest.java
@@ -37,7 +37,7 @@
 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_O)
 public class SwipeToNotificationSettingsTest {
 
     @Mock
diff --git a/tests/robotests/src/com/android/settings/graph/BottomLabelLayoutTest.java b/tests/robotests/src/com/android/settings/graph/BottomLabelLayoutTest.java
index c9804d6..eef6921 100644
--- a/tests/robotests/src/com/android/settings/graph/BottomLabelLayoutTest.java
+++ b/tests/robotests/src/com/android/settings/graph/BottomLabelLayoutTest.java
@@ -35,7 +35,7 @@
 import org.robolectric.annotation.Config;
 
 @RunWith(RobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION_O)
 public class BottomLabelLayoutTest {
     private BottomLabelLayout mBottomLabelLayout;
     private Context mContext;
diff --git a/tests/robotests/src/com/android/settings/graph/UsageGraphTest.java b/tests/robotests/src/com/android/settings/graph/UsageGraphTest.java
index fbd6fd4..4ab3381 100644
--- a/tests/robotests/src/com/android/settings/graph/UsageGraphTest.java
+++ b/tests/robotests/src/com/android/settings/graph/UsageGraphTest.java
@@ -37,7 +37,7 @@
 import org.robolectric.annotation.Config;
 
 @RunWith(RobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION_O)
 public class UsageGraphTest {
     private UsageGraph mGraph;
 
diff --git a/tests/robotests/src/com/android/settings/inputmethod/GameControllerPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/inputmethod/GameControllerPreferenceControllerTest.java
index 2716fc3..b8a63e4 100644
--- a/tests/robotests/src/com/android/settings/inputmethod/GameControllerPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/inputmethod/GameControllerPreferenceControllerTest.java
@@ -41,7 +41,7 @@
 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_O)
 public class GameControllerPreferenceControllerTest {
 
     @Mock(answer = Answers.RETURNS_DEEP_STUBS)
diff --git a/tests/robotests/src/com/android/settings/inputmethod/PhysicalKeyboardPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/inputmethod/PhysicalKeyboardPreferenceControllerTest.java
index 8f9b2c5..5684f17 100644
--- a/tests/robotests/src/com/android/settings/inputmethod/PhysicalKeyboardPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/inputmethod/PhysicalKeyboardPreferenceControllerTest.java
@@ -40,7 +40,7 @@
 import org.robolectric.annotation.Config;
 
 @RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION_O)
 public class PhysicalKeyboardPreferenceControllerTest {
 
     @Mock
diff --git a/tests/robotests/src/com/android/settings/inputmethod/SpellCheckerPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/inputmethod/SpellCheckerPreferenceControllerTest.java
index 4457cc0..1991460 100644
--- a/tests/robotests/src/com/android/settings/inputmethod/SpellCheckerPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/inputmethod/SpellCheckerPreferenceControllerTest.java
@@ -39,7 +39,7 @@
 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_O)
 public class SpellCheckerPreferenceControllerTest {
 
     @Mock(answer = Answers.RETURNS_DEEP_STUBS)
diff --git a/tests/robotests/src/com/android/settings/inputmethod/UserDictionaryCursorLoaderTest.java b/tests/robotests/src/com/android/settings/inputmethod/UserDictionaryCursorLoaderTest.java
index a76aebc..c21cc76 100644
--- a/tests/robotests/src/com/android/settings/inputmethod/UserDictionaryCursorLoaderTest.java
+++ b/tests/robotests/src/com/android/settings/inputmethod/UserDictionaryCursorLoaderTest.java
@@ -38,7 +38,7 @@
 import org.robolectric.shadows.ShadowContentResolver;
 
 @RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION_O)
 public class UserDictionaryCursorLoaderTest {
 
     private ContentProvider mContentProvider;
@@ -49,7 +49,7 @@
         MockitoAnnotations.initMocks(this);
         mContentProvider = new FakeProvider();
         mLoader = new UserDictionaryCursorLoader(RuntimeEnvironment.application, "" /* locale */);
-        ShadowContentResolver.registerProvider(UserDictionary.AUTHORITY, mContentProvider);
+        ShadowContentResolver.registerProviderInternal(UserDictionary.AUTHORITY, mContentProvider);
     }
 
     @Test
diff --git a/tests/robotests/src/com/android/settings/inputmethod/UserDictionaryListTest.java b/tests/robotests/src/com/android/settings/inputmethod/UserDictionaryListTest.java
index c6793cb..b220dd5 100644
--- a/tests/robotests/src/com/android/settings/inputmethod/UserDictionaryListTest.java
+++ b/tests/robotests/src/com/android/settings/inputmethod/UserDictionaryListTest.java
@@ -37,7 +37,7 @@
 import org.robolectric.shadows.ShadowContentResolver;
 
 @RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION_O)
 public class UserDictionaryListTest {
 
     private FakeProvider mContentProvider;
@@ -47,7 +47,7 @@
     public void setUp() {
         MockitoAnnotations.initMocks(this);
         mContentProvider = new FakeProvider();
-        ShadowContentResolver.registerProvider(UserDictionary.AUTHORITY, mContentProvider);
+        ShadowContentResolver.registerProviderInternal(UserDictionary.AUTHORITY, mContentProvider);
     }
 
     @Test
diff --git a/tests/robotests/src/com/android/settings/inputmethod/VirtualKeyboardPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/inputmethod/VirtualKeyboardPreferenceControllerTest.java
index fe2b0df..5913f7e 100644
--- a/tests/robotests/src/com/android/settings/inputmethod/VirtualKeyboardPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/inputmethod/VirtualKeyboardPreferenceControllerTest.java
@@ -49,7 +49,7 @@
 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_O)
 public class VirtualKeyboardPreferenceControllerTest {
 
     @Mock
diff --git a/tests/robotests/src/com/android/settings/language/LanguageAndInputSettingsTest.java b/tests/robotests/src/com/android/settings/language/LanguageAndInputSettingsTest.java
index 809fb3a..da996e8 100644
--- a/tests/robotests/src/com/android/settings/language/LanguageAndInputSettingsTest.java
+++ b/tests/robotests/src/com/android/settings/language/LanguageAndInputSettingsTest.java
@@ -64,7 +64,7 @@
 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_O)
 public class LanguageAndInputSettingsTest {
 
     @Mock(answer = Answers.RETURNS_DEEP_STUBS)
@@ -159,15 +159,19 @@
         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);
+        final InputManager inputManager = mock(InputManager.class);
+        final TextServicesManager textServicesManager = mock(TextServicesManager.class);
+        when(inputManager.getInputDeviceIds()).thenReturn(new int[]{});
+        doReturn(inputManager).when(context).getSystemService(Context.INPUT_SERVICE);
+        doReturn(textServicesManager).when(context).getSystemService(
+                Context.TEXT_SERVICES_MANAGER_SERVICE);
         doReturn(res).when(context).getResources();
         doReturn(false).when(res)
-            .getBoolean(com.android.internal.R.bool.config_supportSystemNavigationKeys);
+                .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();
+        LanguageAndInputSettings settings = new LanguageAndInputSettings();
+        final int xmlId = settings.getPreferenceScreenResId();
 
         final List<String> keys = XmlTestUtils.getKeysFromPreferenceXml(context, xmlId);
 
@@ -176,7 +180,10 @@
 
     @Test
     public void testPreferenceControllers_getPreferenceKeys_existInPreferenceScreen() {
-        final Context context = RuntimeEnvironment.application;
+        final Context context = spy(RuntimeEnvironment.application);
+        final TextServicesManager textServicesManager = mock(TextServicesManager.class);
+        doReturn(textServicesManager).when(context).getSystemService(
+                Context.TEXT_SERVICES_MANAGER_SERVICE);
         final LanguageAndInputSettings fragment = new LanguageAndInputSettings();
         final List<String> preferenceScreenKeys = XmlTestUtils.getKeysFromPreferenceXml(context,
                 fragment.getPreferenceScreenResId());
@@ -208,7 +215,7 @@
         }
 
         @Override
-        protected Lifecycle getLifecycle() {
+        public Lifecycle getLifecycle() {
             if (mLifecycle == null) {
                 return super.getLifecycle();
             }
diff --git a/tests/robotests/src/com/android/settings/language/PhoneLanguagePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/language/PhoneLanguagePreferenceControllerTest.java
index 4050dd1..485efbe 100644
--- a/tests/robotests/src/com/android/settings/language/PhoneLanguagePreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/language/PhoneLanguagePreferenceControllerTest.java
@@ -16,12 +16,16 @@
 
 package com.android.settings.language;
 
+import static com.google.common.truth.Truth.assertThat;
+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.settings.testutils.SettingsRobolectricTestRunner;
 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;
@@ -31,12 +35,11 @@
 import org.mockito.MockitoAnnotations;
 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;
+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_O)
 public class PhoneLanguagePreferenceControllerTest {
 
     @Mock(answer = Answers.RETURNS_DEEP_STUBS)
@@ -77,4 +80,11 @@
 
         verify(mPreference).setSummary(testSummary);
     }
+
+    @Test
+    public void testUpdateNonIndexable_shouldAddKey() {
+        final List<String> niks = new ArrayList<>();
+        mController.updateNonIndexableKeys(niks);
+        assertThat(niks).containsExactly(mController.getPreferenceKey());
+    }
 }
diff --git a/tests/robotests/src/com/android/settings/language/TtsPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/language/TtsPreferenceControllerTest.java
index e4b3cf2..88a3bcb 100644
--- a/tests/robotests/src/com/android/settings/language/TtsPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/language/TtsPreferenceControllerTest.java
@@ -16,14 +16,18 @@
 
 package com.android.settings.language;
 
+import static com.google.common.truth.Truth.assertThat;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
+
 import android.content.Context;
 import android.speech.tts.TextToSpeech;
 import android.speech.tts.TtsEngines;
 import android.support.v7.preference.Preference;
 import android.support.v7.preference.PreferenceScreen;
 
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 
 import org.junit.Before;
 import org.junit.Test;
@@ -31,19 +35,14 @@
 import org.mockito.Answers;
 import org.mockito.Mock;
 import org.mockito.MockitoAnnotations;
+import org.robolectric.RuntimeEnvironment;
 import org.robolectric.annotation.Config;
 
 import java.util.ArrayList;
 import java.util.List;
 
-import static com.google.common.truth.Truth.assertThat;
-import static org.mockito.Matchers.any;
-import static org.mockito.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_O)
 public class TtsPreferenceControllerTest {
 
     @Mock(answer = Answers.RETURNS_DEEP_STUBS)
@@ -54,21 +53,28 @@
     private PreferenceScreen mScreen;
 
     private TtsPreferenceController mController;
+    private Preference mPreference;
 
     @Before
     public void setUp() {
         MockitoAnnotations.initMocks(this);
 
         mController = new TtsPreferenceController(mContext, mTtsEngines);
+        mPreference = new Preference(RuntimeEnvironment.application);
+        mPreference.setKey(mController.getPreferenceKey());
+        when(mScreen.findPreference(mPreference.getKey())).thenReturn(mPreference);
     }
 
     @Test
     public void testIsAvailable_ttsEngineEmpty_shouldReturnFalse() {
-
         // Not available when there is no engine.
         when(mTtsEngines.getEngines()).thenReturn(new ArrayList<>());
 
         assertThat(mController.isAvailable()).isFalse();
+
+        mController.displayPreference(mScreen);
+
+        assertThat(mPreference.isVisible()).isFalse();
     }
 
     @Test
@@ -78,21 +84,9 @@
         when(mTtsEngines.getEngines()).thenReturn(infolist);
 
         assertThat(mController.isAvailable()).isTrue();
-    }
-
-    @Test
-    public void displayPreference_notAvailable_shouldRemoveCategory() {
-        final Preference preference = mock(Preference.class);
-        final Preference category = mock(Preference.class);
-        when(mScreen.getPreferenceCount()).thenReturn(2);
-        when(mScreen.getPreference(0)).thenReturn(preference);
-        when(mScreen.getPreference(1)).thenReturn(category);
-        when(preference.getKey()).thenReturn(mController.getPreferenceKey());
-        when(category.getKey()).thenReturn("voice_category");
 
         mController.displayPreference(mScreen);
 
-        // Remove preference.
-        verify(mScreen).removePreference(any(Preference.class));
+        assertThat(mPreference.isVisible()).isTrue();
     }
 }
diff --git a/tests/robotests/src/com/android/settings/language/UserDictionaryPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/language/UserDictionaryPreferenceControllerTest.java
index 26a160d..77d60cb 100644
--- a/tests/robotests/src/com/android/settings/language/UserDictionaryPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/language/UserDictionaryPreferenceControllerTest.java
@@ -39,7 +39,7 @@
 import java.util.TreeSet;
 
 @RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION_O)
 public class UserDictionaryPreferenceControllerTest {
 
     @Mock(answer = Answers.RETURNS_DEEP_STUBS)
diff --git a/tests/robotests/src/com/android/settings/localepicker/LocaleListEditorTest.java b/tests/robotests/src/com/android/settings/localepicker/LocaleListEditorTest.java
new file mode 100644
index 0000000..40a42b5
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/localepicker/LocaleListEditorTest.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.localepicker;
+
+import android.content.Context;
+import android.view.View;
+import android.widget.TextView;
+import com.android.settings.TestConfig;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.shadow.ShadowSettingsPreferenceFragment;
+
+import org.junit.Assert;
+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.util.ReflectionHelpers;
+
+@RunWith(SettingsRobolectricTestRunner.class)
+@Config(manifest = TestConfig.MANIFEST_PATH,
+        sdk = TestConfig.SDK_VERSION_O,
+        shadows = { ShadowSettingsPreferenceFragment.class })
+public class LocaleListEditorTest {
+
+    private LocaleListEditor mLocaleListEditor;
+
+    @Before
+    public void setUp() {
+        mLocaleListEditor = new LocaleListEditor();
+        ReflectionHelpers.setField(mLocaleListEditor, "mEmptyTextView",
+                new TextView(RuntimeEnvironment.application));
+        ReflectionHelpers.setField(mLocaleListEditor, "mRestrictionsManager",
+                RuntimeEnvironment.application.getSystemService(Context.RESTRICTIONS_SERVICE));
+        ReflectionHelpers.setField(mLocaleListEditor, "mUserManager",
+                RuntimeEnvironment.application.getSystemService(Context.USER_SERVICE));
+    }
+
+    @Test
+    public void testDisallowConfigLocale_unrestrict() {
+        ReflectionHelpers.setField(mLocaleListEditor, "mIsUiRestricted", true);
+        mLocaleListEditor.onResume();
+        Assert.assertEquals(View.GONE, mLocaleListEditor.getEmptyTextView().getVisibility());
+    }
+
+    @Test
+    public void testDisallowConfigLocale_restrict() {
+        ReflectionHelpers.setField(mLocaleListEditor, "mIsUiRestricted", false);
+        mLocaleListEditor.onResume();
+        Assert.assertEquals(View.VISIBLE, mLocaleListEditor.getEmptyTextView().getVisibility());
+    }
+}
diff --git a/tests/robotests/src/com/android/settings/location/AppLocationPermissionPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/location/AppLocationPermissionPreferenceControllerTest.java
index 602bbd1..61a9038 100644
--- a/tests/robotests/src/com/android/settings/location/AppLocationPermissionPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/location/AppLocationPermissionPreferenceControllerTest.java
@@ -1,70 +1,52 @@
 package com.android.settings.location;
 
+import static com.google.common.truth.Truth.assertThat;
+
 import android.content.Context;
 import android.provider.Settings;
-import android.support.v7.preference.Preference;
-import android.support.v7.preference.PreferenceScreen;
 
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.mockito.Answers;
 import org.mockito.Mock;
 import org.mockito.MockitoAnnotations;
+import org.robolectric.RuntimeEnvironment;
 import org.robolectric.annotation.Config;
 
-import static org.mockito.Answers.RETURNS_DEEP_STUBS;
-import static org.mockito.Matchers.any;
-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)
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION_O)
 public class AppLocationPermissionPreferenceControllerTest {
-    @Mock
-    private Preference mPreference;
-    @Mock(answer = RETURNS_DEEP_STUBS)
-    private PreferenceScreen mScreen;
 
     private AppLocationPermissionPreferenceController mController;
 
-    @Mock(answer = Answers.RETURNS_DEEP_STUBS)
+    @Mock
     private Context mContext;
 
     @Before
     public void setUp() {
         MockitoAnnotations.initMocks(this);
-        when(mScreen.findPreference(anyString())).thenReturn(mPreference);
+        mContext = RuntimeEnvironment.application;
         mController = new AppLocationPermissionPreferenceController(mContext);
     }
 
     @Test
-    public void displayPreference_shouldRemovePreference() {
+    public void isAvailable_noLocationLinkPermission_shouldReturnFalse() {
         Settings.System.putInt(mContext.getContentResolver(),
                 android.provider.Settings.Global.LOCATION_SETTINGS_LINK_TO_PERMISSIONS_ENABLED,
                 0);
-        when(mScreen.getPreferenceCount()).thenReturn(1);
-        when(mScreen.getPreference(0)).thenReturn(mPreference);
-        when(mPreference.getKey()).thenReturn(mController.getPreferenceKey());
 
-        mController.displayPreference(mScreen);
-
-        verify(mScreen).removePreference(any(Preference.class));
+        assertThat(mController.isAvailable()).isFalse();
     }
 
     @Test
-    public void displayPreference_shouldNotRemovePreference() {
+    public void displayPreference_hasLocationLinkPermission_shouldReturnTrue() {
         Settings.System.putInt(mContext.getContentResolver(),
                 android.provider.Settings.Global.LOCATION_SETTINGS_LINK_TO_PERMISSIONS_ENABLED,
                 1);
-        mController.displayPreference(mScreen);
 
-        verify(mScreen, never()).removePreference(any(Preference.class));
+        assertThat(mController.isAvailable()).isTrue();
     }
-
 }
diff --git a/tests/robotests/src/com/android/settings/location/BluetoothScanningPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/location/BluetoothScanningPreferenceControllerTest.java
new file mode 100644
index 0000000..ffbf530
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/location/BluetoothScanningPreferenceControllerTest.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.location;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+import android.content.Context;
+import android.provider.Settings;
+import android.support.v14.preference.SwitchPreference;
+
+import com.android.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_O)
+public class BluetoothScanningPreferenceControllerTest {
+
+    @Mock
+    private SwitchPreference mPreference;
+
+    private Context mContext;
+    private BluetoothScanningPreferenceController mController;
+
+    @Before
+    public void setUp() {
+        MockitoAnnotations.initMocks(this);
+        mContext = RuntimeEnvironment.application;
+        mController = new BluetoothScanningPreferenceController(mContext);
+        when(mPreference.getKey()).thenReturn(mController.getPreferenceKey());
+    }
+
+    @Test
+    public void updateState_bluetoothScanningEnabled_shouldCheckedPreference() {
+        Settings.Global.putInt(mContext.getContentResolver(),
+                Settings.Global.BLE_SCAN_ALWAYS_AVAILABLE, 1);
+
+        mController.updateState(mPreference);
+
+        verify(mPreference).setChecked(true);
+    }
+
+    @Test
+    public void updateState_bluetoothScanningDisabled_shouldUncheckedPreference() {
+        Settings.Global.putInt(mContext.getContentResolver(),
+                Settings.Global.BLE_SCAN_ALWAYS_AVAILABLE, 0);
+
+        mController.updateState(mPreference);
+
+        verify(mPreference).setChecked(false);
+    }
+
+    @Test
+    public void handlePreferenceTreeClick_checked_shouldEnableBluetoothScanning() {
+        when(mPreference.isChecked()).thenReturn(true);
+
+        mController.handlePreferenceTreeClick(mPreference);
+
+        assertThat(Settings.Global.getInt(mContext.getContentResolver(),
+                Settings.Global.BLE_SCAN_ALWAYS_AVAILABLE, 0)).isEqualTo(1);
+
+    }
+
+    @Test
+    public void handlePreferenceTreeClick_unchecked_shouldDisableBluetoothScanning() {
+        when(mPreference.isChecked()).thenReturn(false);
+
+        mController.handlePreferenceTreeClick(mPreference);
+
+        assertThat(Settings.Global.getInt(mContext.getContentResolver(),
+                Settings.Global.BLE_SCAN_ALWAYS_AVAILABLE, 1)).isEqualTo(0);
+
+    }
+}
diff --git a/tests/robotests/src/com/android/settings/location/LocationEnablerTest.java b/tests/robotests/src/com/android/settings/location/LocationEnablerTest.java
new file mode 100644
index 0000000..01aadc2
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/location/LocationEnablerTest.java
@@ -0,0 +1,220 @@
+/*
+ * Copyright (C) 2017 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.android.settings.location;
+
+import static android.Manifest.permission.WRITE_SECURE_SETTINGS;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import static org.mockito.ArgumentMatchers.anyBoolean;
+import static org.mockito.ArgumentMatchers.anyInt;
+import static org.mockito.ArgumentMatchers.anyString;
+import static org.mockito.ArgumentMatchers.argThat;
+import static org.mockito.ArgumentMatchers.eq;
+import static org.mockito.Mockito.doReturn;
+import static org.mockito.Mockito.mock;
+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.Context;
+import android.content.Intent;
+import android.content.pm.UserInfo;
+import android.os.UserHandle;
+import android.os.UserManager;
+import android.provider.Settings;
+import android.text.TextUtils;
+
+import com.android.settings.TestConfig;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
+import com.android.settingslib.core.lifecycle.Lifecycle;
+
+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.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_O)
+public class LocationEnablerTest {
+
+    @Mock
+    private UserManager mUserManager;
+    @Mock
+    private LocationEnabler.LocationModeChangeListener mListener;
+
+    private Context mContext;
+    private LocationEnabler mEnabler;
+    private Lifecycle mLifecycle;
+
+    @Before
+    public void setUp() {
+        MockitoAnnotations.initMocks(this);
+        mContext = spy(RuntimeEnvironment.application);
+        when(mContext.getSystemService(Context.USER_SERVICE)).thenReturn(mUserManager);
+        mLifecycle = new Lifecycle(() -> mLifecycle);
+        mEnabler = spy(new LocationEnabler(mContext, mListener, mLifecycle));
+    }
+
+    @Test
+    public void onResume_shouldSetActiveAndRegisterListener() {
+        mEnabler.onResume();
+
+        verify(mContext).registerReceiver(eq(mEnabler.mReceiver),
+                eq(mEnabler.INTENT_FILTER_LOCATION_MODE_CHANGED));
+    }
+
+    @Test
+    public void onResume_shouldRefreshLocationMode() {
+        mEnabler.onResume();
+
+        verify(mEnabler).refreshLocationMode();
+    }
+
+    @Test
+    public void onPause_shouldUnregisterListener() {
+        mEnabler.onPause();
+
+        verify(mContext).unregisterReceiver(mEnabler.mReceiver);
+    }
+
+    @Test
+    public void onReceive_shouldRefreshLocationMode() {
+        mEnabler.onResume();
+        reset(mListener);
+        mEnabler.mReceiver.onReceive(mContext, new Intent());
+
+        verify(mListener).onLocationModeChanged(anyInt(), anyBoolean());
+    }
+
+    @Test
+    public void isEnabled_locationOff_shouldReturnFalse() {
+        assertThat(mEnabler.isEnabled(Settings.Secure.LOCATION_MODE_OFF)).isFalse();
+    }
+
+    @Test
+    public void isEnabled_restricted_shouldReturnFalse() {
+        when(mUserManager.hasUserRestriction(anyString())).thenReturn(true);
+
+        assertThat(mEnabler.isEnabled(Settings.Secure.LOCATION_MODE_OFF)).isFalse();
+    }
+
+    @Test
+    public void isEnabled_locationONotRestricted_shouldReturnTrue() {
+        when(mUserManager.hasUserRestriction(anyString())).thenReturn(false);
+
+        assertThat(mEnabler.isEnabled(Settings.Secure.LOCATION_MODE_BATTERY_SAVING)).isTrue();
+    }
+
+    @Test
+    public void refreshLocationMode_shouldCallOnLocationModeChanged() {
+        mEnabler.refreshLocationMode();
+
+        verify(mListener).onLocationModeChanged(anyInt(), anyBoolean());
+    }
+
+    @Test
+    public void setLocationMode_restricted_shouldSetCurrentMode() {
+        when(mUserManager.hasUserRestriction(anyString())).thenReturn(true);
+        Settings.Secure.putInt(mContext.getContentResolver(),
+                Settings.Secure.LOCATION_MODE, Settings.Secure.LOCATION_MODE_BATTERY_SAVING);
+
+        mEnabler.setLocationMode(Settings.Secure.LOCATION_MODE_HIGH_ACCURACY);
+
+        verify(mListener)
+                .onLocationModeChanged(Settings.Secure.LOCATION_MODE_BATTERY_SAVING, true);
+    }
+
+    @Test
+    public void setLocationMode_notRestricted_shouldUpdateSecureSettings() {
+        when(mUserManager.hasUserRestriction(anyString())).thenReturn(false);
+        Settings.Secure.putInt(mContext.getContentResolver(),
+                Settings.Secure.LOCATION_MODE, Settings.Secure.LOCATION_MODE_BATTERY_SAVING);
+
+        mEnabler.setLocationMode(Settings.Secure.LOCATION_MODE_HIGH_ACCURACY);
+
+        assertThat(Settings.Secure.getInt(mContext.getContentResolver(),
+                Settings.Secure.LOCATION_MODE, Settings.Secure.LOCATION_MODE_BATTERY_SAVING))
+                .isEqualTo(Settings.Secure.LOCATION_MODE_HIGH_ACCURACY);
+    }
+
+    @Test
+    public void setLocationMode_notRestricted_shouldRefreshLocation() {
+        when(mUserManager.hasUserRestriction(anyString())).thenReturn(false);
+        Settings.Secure.putInt(mContext.getContentResolver(),
+                Settings.Secure.LOCATION_MODE, Settings.Secure.LOCATION_MODE_BATTERY_SAVING);
+
+        mEnabler.setLocationMode(Settings.Secure.LOCATION_MODE_HIGH_ACCURACY);
+
+        verify(mEnabler).refreshLocationMode();
+    }
+
+    @Test
+    public void setLocationMode_notRestricted_shouldBroadcastUpdate() {
+        when(mUserManager.hasUserRestriction(anyString())).thenReturn(false);
+        Settings.Secure.putInt(mContext.getContentResolver(),
+                Settings.Secure.LOCATION_MODE, Settings.Secure.LOCATION_MODE_BATTERY_SAVING);
+
+        mEnabler.setLocationMode(Settings.Secure.LOCATION_MODE_HIGH_ACCURACY);
+
+        verify(mContext).sendBroadcast(argThat(actionMatches(mEnabler.MODE_CHANGING_ACTION)),
+                eq(WRITE_SECURE_SETTINGS));
+    }
+
+    @Test
+    public void isManagedProfileRestrictedByBase_notManagedProfile_shouldReturnFalse() {
+        assertThat(mEnabler.isManagedProfileRestrictedByBase()).isFalse();
+    }
+
+    @Test
+    public void isManagedProfileRestrictedByBase_notRestricted_shouldReturnFalse() {
+        mockManagedProfile();
+        doReturn(false).when(mEnabler).hasShareLocationRestriction(anyInt());
+
+        assertThat(mEnabler.isManagedProfileRestrictedByBase()).isFalse();
+    }
+
+    @Test
+    public void isManagedProfileRestrictedByBase_hasManagedProfile_shouldReturnFalse() {
+        mockManagedProfile();
+        doReturn(true).when(mEnabler).hasShareLocationRestriction(anyInt());
+
+        assertThat(mEnabler.isManagedProfileRestrictedByBase()).isTrue();
+    }
+
+    private void mockManagedProfile() {
+        final List<UserHandle> userProfiles = new ArrayList<>();
+        final UserHandle userHandle = mock(UserHandle.class);
+        when(userHandle.getIdentifier()).thenReturn(5);
+        userProfiles.add(userHandle);
+        when(mUserManager.getUserProfiles()).thenReturn(userProfiles);
+        when(mUserManager.getUserHandle()).thenReturn(1);
+        when(mUserManager.getUserInfo(5))
+                .thenReturn(new UserInfo(5, "user 5", UserInfo.FLAG_MANAGED_PROFILE));
+    }
+
+    private static ArgumentMatcher<Intent> actionMatches(String expected) {
+        return intent -> TextUtils.equals(expected, intent.getAction());
+    }
+}
diff --git a/tests/robotests/src/com/android/settings/location/LocationForWorkPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/location/LocationForWorkPreferenceControllerTest.java
new file mode 100644
index 0000000..86b9356
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/location/LocationForWorkPreferenceControllerTest.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.location;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import static org.mockito.ArgumentMatchers.any;
+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.verify;
+import static org.mockito.Mockito.when;
+
+import android.content.Context;
+import android.content.pm.UserInfo;
+import android.os.UserHandle;
+import android.os.UserManager;
+import android.provider.Settings;
+import android.support.v7.preference.PreferenceScreen;
+
+import com.android.settings.R;
+import com.android.settings.TestConfig;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
+import com.android.settingslib.RestrictedLockUtils.EnforcedAdmin;
+import com.android.settingslib.RestrictedSwitchPreference;
+import com.android.settingslib.core.lifecycle.Lifecycle;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.mockito.MockitoAnnotations;
+import org.robolectric.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_O)
+public class LocationForWorkPreferenceControllerTest {
+
+    @Mock
+    private RestrictedSwitchPreference mPreference;
+    @Mock
+    private PreferenceScreen mScreen;
+    @Mock
+    private UserManager mUserManager;
+    @Mock
+    private LocationEnabler mEnabler;
+    @Mock
+    private UserHandle mUserHandle;
+
+    private Context mContext;
+    private LocationForWorkPreferenceController mController;
+    private Lifecycle mLifecycle;
+
+    @Before
+    public void setUp() {
+        MockitoAnnotations.initMocks(this);
+        mContext = spy(RuntimeEnvironment.application);
+        when(mContext.getSystemService(Context.USER_SERVICE)).thenReturn(mUserManager);
+        mLifecycle = new Lifecycle(() -> mLifecycle);
+        mController = spy(new LocationForWorkPreferenceController(mContext, mLifecycle));
+        mockManagedProfile();
+        ReflectionHelpers.setField(mController, "mLocationEnabler", mEnabler);
+        when(mScreen.findPreference(mController.getPreferenceKey())).thenReturn(mPreference);
+        final String key = mController.getPreferenceKey();
+        when(mPreference.getKey()).thenReturn(key);
+        when(mPreference.isVisible()).thenReturn(true);
+    }
+
+    @Test
+    public void handlePreferenceTreeClick_preferenceChecked_shouldSetRestrictionAndOnSummary() {
+        mController.displayPreference(mScreen);
+        when(mPreference.isChecked()).thenReturn(true);
+
+        mController.handlePreferenceTreeClick(mPreference);
+
+        verify(mUserManager).setUserRestriction(UserManager.DISALLOW_SHARE_LOCATION, false,
+                mUserHandle);
+        verify(mPreference).setSummary(R.string.switch_on_text);
+    }
+
+    @Test
+    public void handlePreferenceTreeClick_preferenceUnchecked_shouldSetRestritionAndOffSummary() {
+        mController.displayPreference(mScreen);
+        when(mPreference.isChecked()).thenReturn(false);
+
+        mController.handlePreferenceTreeClick(mPreference);
+
+        verify(mUserManager).setUserRestriction(UserManager.DISALLOW_SHARE_LOCATION, true,
+                mUserHandle);
+        verify(mPreference).setSummary(R.string.switch_off_text);
+    }
+
+    @Test
+    public void isAvailable_noManagedProfile_shouldReturnFalse() {
+        when(mUserManager.getUserProfiles()).thenReturn(new ArrayList<UserHandle>());
+        assertThat(mController.isAvailable()).isFalse();
+    }
+
+    @Test
+    public void isAvailable_hasManagedProfile_shouldReturnTrue() {
+        assertThat(mController.isAvailable()).isTrue();
+    }
+
+    @Test
+    public void onLocationModeChanged_disabledByAdmin_shouldDisablePreference() {
+        mController.displayPreference(mScreen);
+        final EnforcedAdmin admin = mock(EnforcedAdmin.class);
+        doReturn(admin).when(mEnabler).getShareLocationEnforcedAdmin(anyInt());
+        doReturn(false).when(mEnabler).isManagedProfileRestrictedByBase();
+
+        mController.onLocationModeChanged(Settings.Secure.LOCATION_MODE_BATTERY_SAVING, false);
+
+        verify(mPreference).setDisabledByAdmin(any());
+        verify(mPreference).setChecked(false);
+    }
+
+    @Test
+    public void onLocationModeChanged_locationOff_shouldDisablePreference() {
+        mController.displayPreference(mScreen);
+        doReturn(null).when(mEnabler).getShareLocationEnforcedAdmin(anyInt());
+        doReturn(false).when(mEnabler).isManagedProfileRestrictedByBase();
+
+        mController.onLocationModeChanged(Settings.Secure.LOCATION_MODE_OFF, false);
+
+        verify(mPreference).setEnabled(false);
+        verify(mPreference).setChecked(false);
+        verify(mPreference).setSummary(R.string.switch_off_text);
+    }
+
+    @Test
+    public void onLocationModeChanged_locationOn_shouldEnablePreference() {
+        mController.displayPreference(mScreen);
+        doReturn(null).when(mEnabler).getShareLocationEnforcedAdmin(anyInt());
+        doReturn(false).when(mEnabler).isManagedProfileRestrictedByBase();
+        doReturn(true).when(mEnabler).isEnabled(anyInt());
+
+        mController.onLocationModeChanged(Settings.Secure.LOCATION_MODE_BATTERY_SAVING, false);
+
+        verify(mPreference).setEnabled(true);
+        verify(mPreference).setSummary(R.string.switch_on_text);
+    }
+
+    @Test
+    public void onLocationModeChanged_noRestriction_shouldCheckedPreference() {
+        mController.displayPreference(mScreen);
+        doReturn(null).when(mEnabler).getShareLocationEnforcedAdmin(anyInt());
+        doReturn(false).when(mEnabler).isManagedProfileRestrictedByBase();
+        doReturn(true).when(mEnabler).isEnabled(anyInt());
+
+        mController.onLocationModeChanged(Settings.Secure.LOCATION_MODE_BATTERY_SAVING, false);
+
+        verify(mPreference).setChecked(true);
+    }
+
+    @Test
+    public void onLocationModeChanged_hasRestriction_shouldCheckedPreference() {
+        mController.displayPreference(mScreen);
+        doReturn(null).when(mEnabler).getShareLocationEnforcedAdmin(anyInt());
+        doReturn(true).when(mEnabler).isManagedProfileRestrictedByBase();
+
+        mController.onLocationModeChanged(Settings.Secure.LOCATION_MODE_BATTERY_SAVING, false);
+
+        verify(mPreference).setChecked(false);
+    }
+
+    private void mockManagedProfile() {
+        final List<UserHandle> userProfiles = new ArrayList<>();
+        when(mUserHandle.getIdentifier()).thenReturn(5);
+        userProfiles.add(mUserHandle);
+        when(mUserManager.getUserProfiles()).thenReturn(userProfiles);
+        when(mUserManager.getUserHandle()).thenReturn(1);
+        when(mUserManager.getUserInfo(5))
+                .thenReturn(new UserInfo(5, "user 5", UserInfo.FLAG_MANAGED_PROFILE));
+    }
+
+}
diff --git a/tests/robotests/src/com/android/settings/location/LocationModeBatterySavingPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/location/LocationModeBatterySavingPreferenceControllerTest.java
new file mode 100644
index 0000000..3529a7c
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/location/LocationModeBatterySavingPreferenceControllerTest.java
@@ -0,0 +1,54 @@
+/*
+ * Copyright (C) 2017 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.android.settings.location;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import static org.mockito.Mockito.mock;
+
+import android.content.Context;
+import android.provider.Settings;
+
+import com.android.settings.TestConfig;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
+import com.android.settingslib.core.lifecycle.Lifecycle;
+
+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_O)
+public class LocationModeBatterySavingPreferenceControllerTest {
+
+    private Lifecycle mLifecycle;
+
+    @Before
+    public void setUp() {
+        mLifecycle = new Lifecycle(() -> mLifecycle);
+    }
+
+    @Test
+    public void getLocationMode_shouldReturnModeBatterySaving() {
+        final LocationModeBatterySavingPreferenceController controller =
+                new LocationModeBatterySavingPreferenceController(mock(Context.class), mLifecycle);
+
+        assertThat(controller.getLocationMode())
+                .isEqualTo(Settings.Secure.LOCATION_MODE_BATTERY_SAVING);
+    }
+
+}
diff --git a/tests/robotests/src/com/android/settings/location/LocationModeHighAccuracyPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/location/LocationModeHighAccuracyPreferenceControllerTest.java
new file mode 100644
index 0000000..0608a68
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/location/LocationModeHighAccuracyPreferenceControllerTest.java
@@ -0,0 +1,54 @@
+/*
+ * Copyright (C) 2017 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.android.settings.location;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import static org.mockito.Mockito.mock;
+
+import android.content.Context;
+import android.provider.Settings;
+
+import com.android.settings.TestConfig;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
+import com.android.settingslib.core.lifecycle.Lifecycle;
+
+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_O)
+public class LocationModeHighAccuracyPreferenceControllerTest {
+
+    private Lifecycle mLifecycle;
+
+    @Before
+    public void setUp() {
+        mLifecycle = new Lifecycle(() -> mLifecycle);
+    }
+
+    @Test
+    public void getLocationMode_shouldReturnModeHighAccuracy() {
+        final LocationModeHighAccuracyPreferenceController controller =
+                new LocationModeHighAccuracyPreferenceController(mock(Context.class), mLifecycle);
+
+        assertThat(controller.getLocationMode())
+                .isEqualTo(Settings.Secure.LOCATION_MODE_HIGH_ACCURACY);
+    }
+
+}
diff --git a/tests/robotests/src/com/android/settings/location/LocationModePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/location/LocationModePreferenceControllerTest.java
new file mode 100644
index 0000000..b870d39
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/location/LocationModePreferenceControllerTest.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.location;
+
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.anyInt;
+import static org.mockito.ArgumentMatchers.eq;
+import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+import android.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.R;
+import com.android.settings.SettingsActivity;
+import com.android.settings.TestConfig;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
+import com.android.settingslib.core.lifecycle.Lifecycle;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.mockito.MockitoAnnotations;
+import org.robolectric.RuntimeEnvironment;
+import org.robolectric.annotation.Config;
+
+@RunWith(SettingsRobolectricTestRunner.class)
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION_O)
+public class LocationModePreferenceControllerTest {
+
+    @Mock
+    private LocationSettings mFragment;
+    @Mock
+    private SettingsActivity mActivity;
+    @Mock
+    private Preference mPreference;
+    @Mock
+    private PreferenceScreen mScreen;
+    @Mock
+    private UserManager mUserManager;
+
+    private Context mContext;
+    private LocationModePreferenceController mController;
+    private Lifecycle mLifecycle;
+
+    @Before
+    public void setUp() {
+        MockitoAnnotations.initMocks(this);
+        mContext = spy(RuntimeEnvironment.application);
+        when(mContext.getSystemService(Context.USER_SERVICE)).thenReturn(mUserManager);
+        mLifecycle = new Lifecycle(() -> mLifecycle);
+        mController = new LocationModePreferenceController(mContext, mFragment, mLifecycle);
+        when(mFragment.getActivity()).thenReturn(mActivity);
+        when(mScreen.findPreference(mController.getPreferenceKey())).thenReturn(mPreference);
+    }
+
+    @Test
+    public void onLocationModeChanged_locationOff_shouldDisablePreference() {
+        when(mUserManager.hasUserRestriction(any())).thenReturn(false);
+        mController.displayPreference(mScreen);
+
+        mController.onLocationModeChanged(Settings.Secure.LOCATION_MODE_OFF, false);
+
+        verify(mPreference).setEnabled(false);
+    }
+
+    @Test
+    public void onLocationModeChanged_restricted_shouldDisablePreference() {
+        when(mUserManager.hasUserRestriction(any())).thenReturn(true);
+        mController.displayPreference(mScreen);
+
+        mController.onLocationModeChanged(Settings.Secure.LOCATION_MODE_BATTERY_SAVING, false);
+
+        verify(mPreference).setEnabled(false);
+    }
+
+    @Test
+    public void onLocationModeChanged_locationOnNotRestricted_shouldEnablePreference() {
+        when(mUserManager.hasUserRestriction(any())).thenReturn(false);
+        mController.displayPreference(mScreen);
+
+        mController.onLocationModeChanged(Settings.Secure.LOCATION_MODE_BATTERY_SAVING, false);
+
+        verify(mPreference).setEnabled(true);
+    }
+
+    @Test
+    public void onLocationModeChanged_shouldUpdateSummary() {
+        mController.displayPreference(mScreen);
+
+        mController.onLocationModeChanged(Settings.Secure.LOCATION_MODE_BATTERY_SAVING, false);
+
+        verify(mPreference).setSummary(anyInt());
+    }
+
+    @Test
+    public void handlePreferenceTreeClick_shouldStartLocationModeFragment() {
+        final Preference preference = new Preference(mContext);
+        preference.setKey(mController.getPreferenceKey());
+
+        mController.handlePreferenceTreeClick(preference);
+
+        verify(mActivity).startPreferencePanel(any(), eq(LocationMode.class.getName()), any(),
+                eq(R.string.location_mode_screen_title), any(), any(), anyInt());
+    }
+
+}
diff --git a/tests/robotests/src/com/android/settings/location/LocationModeRadioButtonPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/location/LocationModeRadioButtonPreferenceControllerTest.java
new file mode 100644
index 0000000..69297dad
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/location/LocationModeRadioButtonPreferenceControllerTest.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.location;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+import android.content.Context;
+import android.provider.Settings;
+import android.support.v7.preference.PreferenceScreen;
+
+import com.android.settings.TestConfig;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
+import com.android.settings.widget.RadioButtonPreference;
+import com.android.settingslib.core.lifecycle.Lifecycle;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.mockito.MockitoAnnotations;
+import org.robolectric.annotation.Config;
+import org.robolectric.RuntimeEnvironment;
+
+@RunWith(SettingsRobolectricTestRunner.class)
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION_O)
+public class LocationModeRadioButtonPreferenceControllerTest {
+
+    @Mock
+    private RadioButtonPreference mPreference;
+    @Mock
+    private PreferenceScreen mScreen;
+
+    private Context mContext;
+    private LocationModeRadioButtonPreferenceController mController;
+    private Lifecycle mLifecycle;
+
+    @Before
+    public void setUp() {
+        MockitoAnnotations.initMocks(this);
+        mContext = RuntimeEnvironment.application;
+        mLifecycle = new Lifecycle(() -> mLifecycle);
+        mController = new LocationModeRadioButtonPreferenceControllerTestable(mContext, mLifecycle);
+        when(mScreen.findPreference(mController.getPreferenceKey())).thenReturn(mPreference);
+    }
+
+    @Test
+    public void displayPreference_shouldAddClickListener() {
+        mController.displayPreference(mScreen);
+
+        verify(mPreference).setOnClickListener(mController);
+    }
+
+    @Test
+    public void onRadioButtonClicked_shouldSetLocationModeToOwnMode() {
+        mController.displayPreference(mScreen);
+        Settings.Secure.putInt(mContext.getContentResolver(),
+                Settings.Secure.LOCATION_MODE, Settings.Secure.LOCATION_MODE_OFF);
+
+        mController.onRadioButtonClicked(mPreference);
+
+        assertThat(Settings.Secure.getInt(mContext.getContentResolver(),
+                Settings.Secure.LOCATION_MODE, Settings.Secure.LOCATION_MODE_OFF))
+                .isEqualTo(mController.getLocationMode());
+    }
+
+    @Test
+    public void onLocationModeChanged_otherModeSelected_shouldUncheckPreference() {
+        mController.displayPreference(mScreen);
+
+        mController.onLocationModeChanged(Settings.Secure.LOCATION_MODE_BATTERY_SAVING, false);
+
+        verify(mPreference).setChecked(false);
+    }
+
+    @Test
+    public void onLocationModeChanged_ownModeSelected_shouldCheckPreference() {
+        mController.displayPreference(mScreen);
+
+        mController.onLocationModeChanged(mController.getLocationMode(), false);
+
+        verify(mPreference).setChecked(true);
+    }
+
+    @Test
+    public void onLocationModeChanged_locationOff_shouldDisablePreference() {
+        mController.displayPreference(mScreen);
+
+        mController.onLocationModeChanged(Settings.Secure.LOCATION_MODE_OFF, false);
+
+        verify(mPreference).setEnabled(false);
+    }
+
+    @Test
+    public void onLocationModeChanged_locationOn_shouldDisablePreference() {
+        mController.displayPreference(mScreen);
+
+        mController.onLocationModeChanged(Settings.Secure.LOCATION_MODE_BATTERY_SAVING, false);
+
+        verify(mPreference).setEnabled(true);
+    }
+
+    private class LocationModeRadioButtonPreferenceControllerTestable
+            extends LocationModeRadioButtonPreferenceController {
+
+        public LocationModeRadioButtonPreferenceControllerTestable(Context context,
+                Lifecycle lifecycle) {
+            super(context, lifecycle);
+        }
+
+        @Override
+        public String getPreferenceKey() {
+            return "test";
+        }
+
+        @Override
+        protected int getLocationMode() {
+            return Settings.Secure.LOCATION_MODE_HIGH_ACCURACY;
+        }
+    }
+}
diff --git a/tests/robotests/src/com/android/settings/location/LocationModeSensorsOnlyPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/location/LocationModeSensorsOnlyPreferenceControllerTest.java
new file mode 100644
index 0000000..374e118
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/location/LocationModeSensorsOnlyPreferenceControllerTest.java
@@ -0,0 +1,54 @@
+/*
+ * Copyright (C) 2017 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.android.settings.location;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import static org.mockito.Mockito.mock;
+
+import android.content.Context;
+import android.provider.Settings;
+
+import com.android.settings.TestConfig;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
+import com.android.settingslib.core.lifecycle.Lifecycle;
+
+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_O)
+public class LocationModeSensorsOnlyPreferenceControllerTest {
+
+    private Lifecycle mLifecycle;
+
+    @Before
+    public void setUp() {
+        mLifecycle = new Lifecycle(() -> mLifecycle);
+    }
+
+    @Test
+    public void getLocationMode_shouldReturnModeSensorsOnly() {
+        final LocationModeSensorsOnlyPreferenceController controller =
+                new LocationModeSensorsOnlyPreferenceController(mock(Context.class), mLifecycle);
+
+        assertThat(controller.getLocationMode())
+                .isEqualTo(Settings.Secure.LOCATION_MODE_SENSORS_ONLY);
+    }
+
+}
diff --git a/tests/robotests/src/com/android/settings/location/LocationPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/location/LocationPreferenceControllerTest.java
index c7e0e0a..01ca899 100644
--- a/tests/robotests/src/com/android/settings/location/LocationPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/location/LocationPreferenceControllerTest.java
@@ -15,7 +15,9 @@
  */
 package com.android.settings.location;
 
-import static android.provider.Settings.System.SCREEN_BRIGHTNESS_MODE;
+import static android.arch.lifecycle.Lifecycle.Event.ON_PAUSE;
+import static android.arch.lifecycle.Lifecycle.Event.ON_RESUME;
+
 import static com.google.common.truth.Truth.assertThat;
 
 import static org.mockito.ArgumentMatchers.nullable;
@@ -35,13 +37,11 @@
 import android.support.v7.preference.PreferenceScreen;
 
 import com.android.settings.R;
-import com.android.settings.display.AutoBrightnessPreferenceController;
+import com.android.settings.TestConfig;
 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;
 
@@ -53,10 +53,9 @@
 import org.mockito.MockitoAnnotations;
 import org.robolectric.RuntimeEnvironment;
 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_O)
 public class LocationPreferenceControllerTest {
     @Mock
     private Preference mPreference;
@@ -72,7 +71,7 @@
     @Before
     public void setUp() {
         MockitoAnnotations.initMocks(this);
-        mLifecycle = new Lifecycle();
+        mLifecycle = new Lifecycle(() -> mLifecycle);
         mController = new LocationPreferenceController(mContext, mLifecycle);
         when(mScreen.findPreference(mController.getPreferenceKey())).thenReturn(mPreference);
     }
@@ -150,13 +149,14 @@
 
     @Test
     public void onResume_shouldRegisterObserver() {
-        mLifecycle.onResume();
+        mLifecycle.handleLifecycleEvent(ON_RESUME);
         verify(mContext).registerReceiver(any(BroadcastReceiver.class), any(IntentFilter.class));
     }
 
     @Test
     public void onPause_shouldUnregisterObserver() {
-        mLifecycle.onPause();
+        mLifecycle.handleLifecycleEvent(ON_RESUME);
+        mLifecycle.handleLifecycleEvent(ON_PAUSE);
         verify(mContext).unregisterReceiver(any(BroadcastReceiver.class));
     }
 
diff --git a/tests/robotests/src/com/android/settings/location/LocationServicePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/location/LocationServicePreferenceControllerTest.java
new file mode 100644
index 0000000..46fba95
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/location/LocationServicePreferenceControllerTest.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.location;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.anyInt;
+import static org.mockito.ArgumentMatchers.eq;
+import static org.mockito.Mockito.doReturn;
+import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+import android.content.Context;
+import android.provider.Settings;
+import android.support.v7.preference.Preference;
+import android.support.v7.preference.PreferenceCategory;
+import android.support.v7.preference.PreferenceScreen;
+
+import com.android.settings.TestConfig;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
+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 java.util.ArrayList;
+import java.util.List;
+
+@RunWith(SettingsRobolectricTestRunner.class)
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION_O)
+public class LocationServicePreferenceControllerTest {
+
+    @Mock(answer = Answers.RETURNS_DEEP_STUBS)
+    private LocationSettings mFragment;
+    @Mock
+    private PreferenceCategory mCategory;
+    @Mock
+    private PreferenceScreen mScreen;
+    @Mock
+    private SettingsInjector mSettingsInjector;
+
+    private Context mContext;
+    private LocationServicePreferenceController mController;
+    private Lifecycle mLifecycle;
+
+    @Before
+    public void setUp() {
+        MockitoAnnotations.initMocks(this);
+        mContext = spy(RuntimeEnvironment.application);
+        mLifecycle = new Lifecycle(() -> mLifecycle);
+        mController = spy(new LocationServicePreferenceController(
+                mContext, mFragment, mLifecycle, mSettingsInjector));
+        final String key = mController.getPreferenceKey();
+        when(mScreen.findPreference(key)).thenReturn(mCategory);
+        when(mCategory.getKey()).thenReturn(key);
+    }
+
+    @Test
+    public void isAvailable_noInjectedSettings_shouldReturnFalse() {
+        doReturn(false).when(mSettingsInjector).hasInjectedSettings(anyInt());
+
+        assertThat(mController.isAvailable()).isFalse();
+    }
+
+    @Test
+    public void isAvailable_hasInjectedSettings_shouldReturnFalse() {
+        doReturn(true).when(mSettingsInjector).hasInjectedSettings(anyInt());
+
+        assertThat(mController.isAvailable()).isTrue();
+    }
+
+    @Test
+    public void onResume_shouldRegisterListener() {
+        mController.onResume();
+
+        verify(mContext).registerReceiver(eq(mController.mInjectedSettingsReceiver),
+                eq(mController.INTENT_FILTER_INJECTED_SETTING_CHANGED));
+    }
+
+    @Test
+    public void onPause_shouldUnregisterListener() {
+        mController.onResume();
+        mController.onPause();
+
+        verify(mContext).unregisterReceiver(mController.mInjectedSettingsReceiver);
+    }
+
+    @Test
+    public void updateState_shouldRemoveAllAndAddInjectedSettings() {
+        final List<Preference> preferences = new ArrayList<>();
+        final Preference pref1 = new Preference(mContext);
+        pref1.setTitle("Title1");
+        final Preference pref2 = new Preference(mContext);
+        pref2.setTitle("Title2");
+        preferences.add(pref1);
+        preferences.add(pref2);
+        doReturn(preferences).when(mSettingsInjector)
+                .getInjectedSettings(any(Context.class), anyInt());
+        when(mFragment.getPreferenceManager().getContext()).thenReturn(mContext);
+        mController.displayPreference(mScreen);
+
+        mController.updateState(mCategory);
+
+        verify(mCategory).removeAll();
+        verify(mCategory).addPreference(pref1);
+        verify(mCategory).addPreference(pref2);
+    }
+
+    @Test
+    public void onLocationModeChanged_shouldRequestReloadInjectedSettigns() {
+        mController.onLocationModeChanged(Settings.Secure.LOCATION_MODE_BATTERY_SAVING, false);
+
+        verify(mSettingsInjector).reloadStatusMessages();
+    }
+}
diff --git a/tests/robotests/src/com/android/settings/location/LocationSwitchBarControllerTest.java b/tests/robotests/src/com/android/settings/location/LocationSwitchBarControllerTest.java
new file mode 100644
index 0000000..9eb69a4
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/location/LocationSwitchBarControllerTest.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.location;
+
+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.verify;
+import static org.mockito.Mockito.when;
+
+import android.content.Context;
+import android.provider.Settings;
+
+import com.android.settings.TestConfig;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
+import com.android.settings.widget.SwitchBar;
+import com.android.settings.widget.ToggleSwitch;
+import com.android.settingslib.RestrictedLockUtils;
+import com.android.settingslib.core.lifecycle.Lifecycle;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.mockito.MockitoAnnotations;
+import org.robolectric.RuntimeEnvironment;
+import org.robolectric.annotation.Config;
+import org.robolectric.util.ReflectionHelpers;
+
+@RunWith(SettingsRobolectricTestRunner.class)
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION_O)
+public class LocationSwitchBarControllerTest {
+
+    @Mock
+    private SwitchBar mSwitchBar;
+    @Mock
+    private ToggleSwitch mSwitch;
+    @Mock
+    private LocationEnabler mEnabler;
+
+    private Context mContext;
+    private LocationSwitchBarController mController;
+    private Lifecycle mLifecycle;
+
+    @Before
+    public void setUp() {
+        MockitoAnnotations.initMocks(this);
+        mContext = RuntimeEnvironment.application;
+        ReflectionHelpers.setField(mSwitchBar, "mSwitch", mSwitch);
+        mLifecycle = new Lifecycle(() -> mLifecycle);
+        mController = spy(new LocationSwitchBarController(
+                mContext, mSwitchBar, mLifecycle));
+        ReflectionHelpers.setField(mController, "mLocationEnabler", mEnabler);
+    }
+
+    @Test
+    public void onStart_shouldShowSwitchBarAndAddOnSwitchChangeListener() {
+        mController.onStart();
+
+        verify(mSwitchBar).show();
+        verify(mSwitchBar).addOnSwitchChangeListener(mController);
+    }
+
+    @Test
+    public void onStop_shouldHideSwitchBarAndRemoveOnSwitchChangeListener() {
+        mController.onStart();
+        mController.onStop();
+
+        verify(mSwitchBar).hide();
+        verify(mSwitchBar).removeOnSwitchChangeListener(mController);
+    }
+
+    @Test
+    public void onSwitchChanged_switchChecked_shouldSetPreviousLocationMode() {
+        mController.onSwitchChanged(mSwitch, true);
+
+        verify(mEnabler).setLocationMode(
+                android.provider.Settings.Secure.LOCATION_MODE_PREVIOUS);
+    }
+
+    @Test
+    public void onSwitchChanged_switchUnchecked_shouldSetLocationModeOff() {
+        mController.onSwitchChanged(mSwitch, false);
+
+        verify(mEnabler).setLocationMode(android.provider.Settings.Secure.LOCATION_MODE_OFF);
+    }
+
+    @Test
+    public void onLocationModeChanged_hasEnforcedAdmin_shouldDisableSwitchByAdmin() {
+        final RestrictedLockUtils.EnforcedAdmin admin =
+                mock(RestrictedLockUtils.EnforcedAdmin.class);
+        doReturn(admin).when(mEnabler).getShareLocationEnforcedAdmin(anyInt());
+        doReturn(false).when(mEnabler).hasShareLocationRestriction(anyInt());
+
+        mController.onLocationModeChanged(Settings.Secure.LOCATION_MODE_BATTERY_SAVING, false);
+
+        verify(mSwitchBar).setDisabledByAdmin(admin);
+    }
+
+    @Test
+    public void onLocationModeChanged_Restricted_shouldDisableSwitch() {
+        doReturn(null).when(mEnabler).getShareLocationEnforcedAdmin(anyInt());
+        doReturn(true).when(mEnabler).hasShareLocationRestriction(anyInt());
+
+        mController.onLocationModeChanged(Settings.Secure.LOCATION_MODE_BATTERY_SAVING, true);
+
+        verify(mSwitchBar).setEnabled(false);
+    }
+
+    @Test
+    public void onLocationModeChanged_notRestricted_shouldEnableSwitch() {
+        doReturn(null).when(mEnabler).getShareLocationEnforcedAdmin(anyInt());
+        doReturn(false).when(mEnabler).hasShareLocationRestriction(anyInt());
+
+        mController.onLocationModeChanged(Settings.Secure.LOCATION_MODE_BATTERY_SAVING, false);
+
+        verify(mSwitchBar).setEnabled(true);
+    }
+
+    @Test
+    public void onLocationModeChanged_locationOn_shouldCheckSwitch() {
+        doReturn(null).when(mEnabler).getShareLocationEnforcedAdmin(anyInt());
+        doReturn(false).when(mEnabler).hasShareLocationRestriction(anyInt());
+        when(mSwitch.isChecked()).thenReturn(false);
+        doReturn(true).when(mEnabler).isEnabled(anyInt());
+
+        mController.onLocationModeChanged(Settings.Secure.LOCATION_MODE_BATTERY_SAVING, false);
+
+        verify(mSwitch).setChecked(true);
+    }
+
+    @Test
+    public void onLocationModeChanged_locationOff_shouldUncheckSwitch() {
+        doReturn(null).when(mEnabler).getShareLocationEnforcedAdmin(anyInt());
+        doReturn(false).when(mEnabler).hasShareLocationRestriction(anyInt());
+        when(mSwitch.isChecked()).thenReturn(true);
+
+        mController.onLocationModeChanged(Settings.Secure.LOCATION_MODE_OFF, false);
+
+        verify(mSwitch).setChecked(false);
+    }
+
+}
diff --git a/tests/robotests/src/com/android/settings/location/RecentLocationRequestPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/location/RecentLocationRequestPreferenceControllerTest.java
new file mode 100644
index 0000000..ed5374a
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/location/RecentLocationRequestPreferenceControllerTest.java
@@ -0,0 +1,188 @@
+/*
+ * Copyright (C) 2017 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.android.settings.location;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.anyInt;
+import static org.mockito.ArgumentMatchers.argThat;
+import static org.mockito.ArgumentMatchers.eq;
+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.content.Context;
+import android.os.Bundle;
+import android.provider.Settings;
+import android.support.v7.preference.Preference;
+import android.support.v7.preference.PreferenceCategory;
+import android.support.v7.preference.PreferenceScreen;
+import android.text.TextUtils;
+import android.util.FeatureFlagUtils;
+
+import com.android.settings.R;
+import com.android.settings.SettingsActivity;
+import com.android.settings.TestConfig;
+import com.android.settings.applications.InstalledAppDetails;
+import com.android.settings.applications.AppInfoDashboardFragment;
+import com.android.settings.core.FeatureFlags;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
+import com.android.settings.widget.AppPreference;
+import com.android.settingslib.core.lifecycle.Lifecycle;
+import com.android.settingslib.location.RecentLocationApps;
+import com.android.settingslib.location.RecentLocationApps.Request;
+
+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.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_O)
+public class RecentLocationRequestPreferenceControllerTest {
+
+    @Mock
+    private LocationSettings mFragment;
+    @Mock
+    private PreferenceCategory mCategory;
+    @Mock
+    private PreferenceScreen mScreen;
+    @Mock
+    private RecentLocationApps mRecentLocationApps;
+
+    private Context mContext;
+    private RecentLocationRequestPreferenceController mController;
+    private Lifecycle mLifecycle;
+
+    @Before
+    public void setUp() {
+        MockitoAnnotations.initMocks(this);
+        mContext = spy(RuntimeEnvironment.application);
+        mLifecycle = new Lifecycle(() -> mLifecycle);
+        mController = spy(new RecentLocationRequestPreferenceController(
+                mContext, mFragment, mLifecycle, mRecentLocationApps));
+        when(mScreen.findPreference(mController.getPreferenceKey())).thenReturn(mCategory);
+        final String key = mController.getPreferenceKey();
+        when(mCategory.getKey()).thenReturn(key);
+        when(mCategory.getContext()).thenReturn(mContext);
+    }
+
+    @Test
+    public void onLocationModeChanged_LocationOn_shouldEnablePreference() {
+        mController.displayPreference(mScreen);
+
+        mController.onLocationModeChanged(Settings.Secure.LOCATION_MODE_BATTERY_SAVING, false);
+
+        verify(mCategory).setEnabled(true);
+    }
+
+    @Test
+    public void onLocationModeChanged_LocationOff_shouldDisablePreference() {
+        mController.displayPreference(mScreen);
+
+        mController.onLocationModeChanged(Settings.Secure.LOCATION_MODE_OFF, false);
+
+        verify(mCategory).setEnabled(false);
+    }
+
+    @Test
+    public void updateState_noRecentRequest_shouldRemoveAllAndAddBanner() {
+        doReturn(new ArrayList<>()).when(mRecentLocationApps).getAppList();
+        mController.displayPreference(mScreen);
+
+        mController.updateState(mCategory);
+
+        verify(mCategory).removeAll();
+        verify(mCategory).addPreference(
+                argThat(titleMatches(mContext.getString(R.string.location_no_recent_apps))));
+    }
+
+    @Test
+    public void updateState_hasRecentRequest_shouldRemoveAllAndAddInjectedSettings() {
+        final List<RecentLocationApps.Request> requests = new ArrayList<>();
+        final Request req1 = mock(Request.class);
+        final Request req2 = mock(Request.class);
+        requests.add(req1);
+        requests.add(req2);
+        doReturn(requests).when(mRecentLocationApps).getAppList();
+        final String title = "testTitle";
+        final AppPreference preference = mock(AppPreference.class);
+        when(preference.getTitle()).thenReturn(title);
+        doReturn(preference).when(mController)
+                .createAppPreference(any(Context.class), any(Request.class));
+        mController.displayPreference(mScreen);
+
+        mController.updateState(mCategory);
+
+        verify(mCategory).removeAll();
+        verify(mCategory, times(2)).addPreference(argThat(titleMatches(title)));
+    }
+
+    @Test
+    public void createAppPreference_shouldAddClickListener() {
+        final Request request = mock(Request.class);
+        final AppPreference preference = mock(AppPreference.class);
+        doReturn(preference).when(mController)
+                .createAppPreference(any(Context.class));
+
+        mController.createAppPreference(mContext, request);
+
+        verify(preference).setOnPreferenceClickListener(
+                any(RecentLocationRequestPreferenceController.PackageEntryClickedListener.class));
+    }
+
+    @Test
+    public void onPreferenceClick_shouldLaunchAppDetails() {
+        final SettingsActivity activity = mock(SettingsActivity.class);
+        when(mFragment.getActivity()).thenReturn(activity);
+        final List<RecentLocationApps.Request> requests = new ArrayList<>();
+        final Request request = mock(Request.class);
+        requests.add(request);
+        doReturn(requests).when(mRecentLocationApps).getAppList();
+        final AppPreference preference = new AppPreference(mContext);
+        doReturn(preference).when(mController).createAppPreference(any(Context.class));
+        mController.displayPreference(mScreen);
+        mController.updateState(mCategory);
+
+        preference.performClick();
+
+        if (FeatureFlagUtils.isEnabled(mContext, FeatureFlags.APP_INFO_V2)) {
+            verify(activity).startPreferencePanelAsUser(any(),
+                    eq(AppInfoDashboardFragment.class.getName()),
+                    any(Bundle.class), anyInt(), any(), any());
+        } else {
+            verify(activity).startPreferencePanelAsUser(any(),
+                    eq(InstalledAppDetails.class.getName()),
+                    any(Bundle.class), anyInt(), any(), any());
+        }
+    }
+
+    private static ArgumentMatcher<Preference> titleMatches(String expected) {
+        return preference -> TextUtils.equals(expected, preference.getTitle());
+    }
+
+}
diff --git a/tests/robotests/src/com/android/settings/location/ScanningSettingsTest.java b/tests/robotests/src/com/android/settings/location/ScanningSettingsTest.java
new file mode 100644
index 0000000..dff257b
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/location/ScanningSettingsTest.java
@@ -0,0 +1,57 @@
+/*
+ * Copyright (C) 2017 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.location;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import android.content.Context;
+import android.provider.SearchIndexableResource;
+
+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.robolectric.RuntimeEnvironment;
+import org.robolectric.annotation.Config;
+
+import java.util.List;
+
+@RunWith(SettingsRobolectricTestRunner.class)
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION_O)
+public class ScanningSettingsTest {
+
+    private Context mContext;
+    private ScanningSettings mSettings;
+
+    @Before
+    public void setUp() {
+        mContext = RuntimeEnvironment.application;
+        mSettings = new ScanningSettings();
+    }
+
+    @Test
+    public void searchProvider_shouldIndexDefaultXml() {
+        final List<SearchIndexableResource> sir = mSettings.SEARCH_INDEX_DATA_PROVIDER
+                .getXmlResourcesToIndex(mContext, true /* enabled */);
+
+        assertThat(sir).hasSize(1);
+        assertThat(sir.get(0).xmlResId).isEqualTo(R.xml.location_scanning);
+    }
+}
diff --git a/tests/robotests/src/com/android/settings/location/WifiScanningPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/location/WifiScanningPreferenceControllerTest.java
new file mode 100644
index 0000000..d8b6b75
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/location/WifiScanningPreferenceControllerTest.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.location;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+import android.content.Context;
+import android.provider.Settings;
+import android.support.v14.preference.SwitchPreference;
+
+import com.android.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_O)
+public class WifiScanningPreferenceControllerTest {
+
+    @Mock
+    private SwitchPreference mPreference;
+
+    private Context mContext;
+    private WifiScanningPreferenceController mController;
+
+    @Before
+    public void setUp() {
+        MockitoAnnotations.initMocks(this);
+        mContext = RuntimeEnvironment.application;
+        mController = new WifiScanningPreferenceController(mContext);
+        when(mPreference.getKey()).thenReturn(mController.getPreferenceKey());
+    }
+
+    @Test
+    public void updateState_wifiScanningEnabled_shouldCheckedPreference() {
+        Settings.Global.putInt(mContext.getContentResolver(),
+                Settings.Global.WIFI_SCAN_ALWAYS_AVAILABLE, 1);
+
+        mController.updateState(mPreference);
+
+        verify(mPreference).setChecked(true);
+    }
+
+    @Test
+    public void updateState_wifiScanningDisabled_shouldUncheckedPreference() {
+        Settings.Global.putInt(mContext.getContentResolver(),
+                Settings.Global.WIFI_SCAN_ALWAYS_AVAILABLE, 0);
+
+        mController.updateState(mPreference);
+
+        verify(mPreference).setChecked(false);
+    }
+
+    @Test
+    public void handlePreferenceTreeClick_checked_shouldEnableWifiScanning() {
+        when(mPreference.isChecked()).thenReturn(true);
+
+        mController.handlePreferenceTreeClick(mPreference);
+
+        assertThat(Settings.Global.getInt(mContext.getContentResolver(),
+                Settings.Global.WIFI_SCAN_ALWAYS_AVAILABLE, 0)).isEqualTo(1);
+
+    }
+
+    @Test
+    public void handlePreferenceTreeClick_unchecked_shouldDisableWifiScanning() {
+        when(mPreference.isChecked()).thenReturn(false);
+
+        mController.handlePreferenceTreeClick(mPreference);
+
+        assertThat(Settings.Global.getInt(mContext.getContentResolver(),
+                Settings.Global.WIFI_SCAN_ALWAYS_AVAILABLE, 1)).isEqualTo(0);
+
+    }
+}
diff --git a/tests/robotests/src/com/android/settings/network/AirplaneModePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/network/AirplaneModePreferenceControllerTest.java
new file mode 100644
index 0000000..48c26f3
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/network/AirplaneModePreferenceControllerTest.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.network;
+
+import static junit.framework.Assert.assertFalse;
+import static junit.framework.Assert.assertTrue;
+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.content.res.Resources;
+import android.support.v7.preference.Preference;
+import android.support.v7.preference.PreferenceScreen;
+
+import com.android.settings.TestConfig;
+import com.android.settings.testutils.FakeFeatureFactory;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
+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.Mockito;
+import org.mockito.MockitoAnnotations;
+import org.robolectric.annotation.Config;
+
+@RunWith(SettingsRobolectricTestRunner.class)
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
+public class AirplaneModePreferenceControllerTest {
+
+    @Mock(answer = Answers.RETURNS_DEEP_STUBS)
+    private Context mContext;
+
+    @Mock
+    private Resources mResources;
+
+    @Mock
+    private PreferenceScreen mScreen;
+
+    @Mock
+    private PackageManager mPackageManager;
+
+    private AirplaneModePreferenceController mController;
+    private Lifecycle mLifecycle;
+    private FakeFeatureFactory mFactory;
+
+    @Before
+    public void setUp() {
+        MockitoAnnotations.initMocks(this);
+        mFactory = FakeFeatureFactory.setupForTest(mContext);
+        doReturn(mResources).when(mContext).getResources();
+        doReturn(mPackageManager).when(mContext).getPackageManager();
+        mController = spy(new AirplaneModePreferenceController(mContext, null));
+        mLifecycle = new Lifecycle(() -> mLifecycle);
+        mLifecycle.addObserver(mController);
+    }
+
+    @Test
+    public void airplaneModePreference_shouldNotBeAvailable_ifHasLeanbackFeature() {
+        when(mPackageManager.hasSystemFeature(PackageManager.FEATURE_LEANBACK)).thenReturn(true);
+        assertFalse(mController.isAvailable());
+
+        mController.displayPreference(mScreen);
+
+        // This should not crash
+        mController.onResume();
+        mController.onPause();
+    }
+}
diff --git a/tests/robotests/src/com/android/settings/network/MobileNetworkPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/network/MobileNetworkPreferenceControllerTest.java
index 2c11e0c..4dd890d 100644
--- a/tests/robotests/src/com/android/settings/network/MobileNetworkPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/network/MobileNetworkPreferenceControllerTest.java
@@ -15,51 +15,51 @@
  */
 package com.android.settings.network;
 
+import static android.arch.lifecycle.Lifecycle.Event.ON_PAUSE;
+import static android.arch.lifecycle.Lifecycle.Event.ON_RESUME;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import static org.mockito.Mockito.doReturn;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+import static org.robolectric.shadow.api.Shadow.extract;
+
 import android.content.Context;
 import android.net.ConnectivityManager;
-import android.os.UserHandle;
 import android.os.UserManager;
 import android.support.v7.preference.Preference;
 import android.support.v7.preference.PreferenceScreen;
 import android.telephony.PhoneStateListener;
 import android.telephony.TelephonyManager;
 
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.shadow.ShadowConnectivityManager;
 import com.android.settings.testutils.shadow.ShadowRestrictedLockUtilsWrapper;
+import com.android.settings.testutils.shadow.ShadowUserManager;
 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 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.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 = ShadowRestrictedLockUtilsWrapper.class
+    sdk = TestConfig.SDK_VERSION_O,
+    shadows = {ShadowRestrictedLockUtilsWrapper.class, ShadowConnectivityManager.class,
+            ShadowUserManager.class}
 )
 public class MobileNetworkPreferenceControllerTest {
 
-    @Mock(answer = Answers.RETURNS_DEEP_STUBS)
     private Context mContext;
-    @Mock(answer = Answers.RETURNS_DEEP_STUBS)
-    private UserManager mUserManager;
-    @Mock
-    private ConnectivityManager mConnectivityManager;
     @Mock
     private TelephonyManager mTelephonyManager;
     @Mock
@@ -71,21 +71,19 @@
     @Before
     public void setUp() {
         MockitoAnnotations.initMocks(this);
-        mLifecycle = new Lifecycle();
-        when(mContext.getSystemService(Context.USER_SERVICE)).thenReturn(mUserManager);
-        when(mContext.getSystemService(Context.CONNECTIVITY_SERVICE))
-                .thenReturn(mConnectivityManager);
+        mContext = spy(RuntimeEnvironment.application);
+        mLifecycle = new Lifecycle(() -> mLifecycle);
         when(mContext.getSystemService(Context.TELEPHONY_SERVICE))
                 .thenReturn(mTelephonyManager);
     }
 
     @Test
     public void secondaryUser_prefIsNotAvailable() {
-        when(mUserManager.isAdminUser()).thenReturn(false);
-        when(mUserManager.hasUserRestriction(anyString(), any(UserHandle.class)))
-                .thenReturn(false);
-        when(mConnectivityManager.isNetworkSupported(ConnectivityManager.TYPE_MOBILE))
-                .thenReturn(true);
+        ShadowUserManager userManager = extract(mContext.getSystemService(UserManager.class));
+        userManager.setIsAdminUser(false);
+        ShadowConnectivityManager connectivityManager =
+                extract(mContext.getSystemService(ConnectivityManager.class));
+        connectivityManager.setNetworkSupported(ConnectivityManager.TYPE_MOBILE, true);
 
         mController = new MobileNetworkPreferenceController(mContext);
         assertThat(mController.isAvailable()).isFalse();
@@ -93,11 +91,11 @@
 
     @Test
     public void wifiOnly_prefIsNotAvailable() {
-        when(mUserManager.isAdminUser()).thenReturn(true);
-        when(mUserManager.hasUserRestriction(anyString(), any(UserHandle.class)))
-                .thenReturn(false);
-        when(mConnectivityManager.isNetworkSupported(ConnectivityManager.TYPE_MOBILE))
-                .thenReturn(false);
+        ShadowUserManager userManager = extract(mContext.getSystemService(UserManager.class));
+        userManager.setIsAdminUser(true);
+        ShadowConnectivityManager connectivityManager =
+                extract(mContext.getSystemService(ConnectivityManager.class));
+        connectivityManager.setNetworkSupported(ConnectivityManager.TYPE_MOBILE, false);
 
         mController = new MobileNetworkPreferenceController(mContext);
         assertThat(mController.isAvailable()).isFalse();
@@ -109,11 +107,11 @@
         mLifecycle.addObserver(mController);
         doReturn(true).when(mController).isAvailable();
 
-        mLifecycle.onResume();
+        mLifecycle.handleLifecycleEvent(ON_RESUME);
         verify(mTelephonyManager).listen(mController.mPhoneStateListener,
                 PhoneStateListener.LISTEN_SERVICE_STATE);
 
-        mLifecycle.onPause();
+        mLifecycle.handleLifecycleEvent(ON_PAUSE);
         verify(mTelephonyManager).listen(mController.mPhoneStateListener,
                 PhoneStateListener.LISTEN_NONE);
     }
@@ -130,7 +128,7 @@
 
         // Display pref and go through lifecycle to set up listener.
         mController.displayPreference(mScreen);
-        mLifecycle.onResume();
+        mLifecycle.handleLifecycleEvent(ON_RESUME);
         verify(mController).onResume();
         verify(mTelephonyManager).listen(mController.mPhoneStateListener,
                 PhoneStateListener.LISTEN_SERVICE_STATE);
@@ -142,5 +140,4 @@
         // Carrier name should be set.
         verify(mPreference).setSummary(testCarrierName);
     }
-
 }
diff --git a/tests/robotests/src/com/android/settings/network/MobilePlanPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/network/MobilePlanPreferenceControllerTest.java
index a84179d..01d578f 100644
--- a/tests/robotests/src/com/android/settings/network/MobilePlanPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/network/MobilePlanPreferenceControllerTest.java
@@ -30,7 +30,7 @@
 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_O)
 public class MobilePlanPreferenceControllerTest {
 
     @Test
diff --git a/tests/robotests/src/com/android/settings/network/NetworkDashboardFragmentTest.java b/tests/robotests/src/com/android/settings/network/NetworkDashboardFragmentTest.java
index fb3e75d..76ade7b 100644
--- a/tests/robotests/src/com/android/settings/network/NetworkDashboardFragmentTest.java
+++ b/tests/robotests/src/com/android/settings/network/NetworkDashboardFragmentTest.java
@@ -46,7 +46,7 @@
 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_O)
 public class NetworkDashboardFragmentTest {
 
     @Mock
@@ -82,7 +82,9 @@
     public void testPrepareActionBar_networkResetShouldBeCreated() {
         final NetworkResetActionMenuController resetController =
                 mock(NetworkResetActionMenuController.class);
+        final PrivateDnsMenuController privateDnsController = mock(PrivateDnsMenuController.class);
         ReflectionHelpers.setField(mFragment, "mNetworkResetController", resetController);
+        ReflectionHelpers.setField(mFragment, "mPrivateDnsMenuController", privateDnsController);
 
         mFragment.onCreateOptionsMenu(null, null);
 
diff --git a/tests/robotests/src/com/android/settings/network/NetworkResetActionMenuControllerTest.java b/tests/robotests/src/com/android/settings/network/NetworkResetActionMenuControllerTest.java
index 0b2be3a..087c0ff 100644
--- a/tests/robotests/src/com/android/settings/network/NetworkResetActionMenuControllerTest.java
+++ b/tests/robotests/src/com/android/settings/network/NetworkResetActionMenuControllerTest.java
@@ -40,9 +40,10 @@
 import org.robolectric.util.ReflectionHelpers;
 
 @RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION_O)
 public class NetworkResetActionMenuControllerTest {
 
+    private static final int MENU_ID = Menu.FIRST;
     private Context mContext;
     private NetworkResetActionMenuController mController;
     @Mock
@@ -56,7 +57,7 @@
     public void setUp() {
         MockitoAnnotations.initMocks(this);
         mContext = RuntimeEnvironment.application;
-        mController = new NetworkResetActionMenuController(mContext);
+        mController = new NetworkResetActionMenuController(mContext, MENU_ID);
         ReflectionHelpers.setField(mController, "mRestrictionChecker", mRestrictionChecker);
         when(mMenu.add(anyInt(), anyInt(), anyInt(), anyInt())).thenReturn(mMenuItem);
     }
diff --git a/tests/robotests/src/com/android/settings/network/NetworkResetPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/network/NetworkResetPreferenceControllerTest.java
index 4d8c626..5cbba61 100644
--- a/tests/robotests/src/com/android/settings/network/NetworkResetPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/network/NetworkResetPreferenceControllerTest.java
@@ -37,7 +37,7 @@
 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_O)
 public class NetworkResetPreferenceControllerTest {
 
     @Mock
diff --git a/tests/robotests/src/com/android/settings/network/NetworkResetRestrictionCheckerTest.java b/tests/robotests/src/com/android/settings/network/NetworkResetRestrictionCheckerTest.java
index 792bdd3..87bf812 100644
--- a/tests/robotests/src/com/android/settings/network/NetworkResetRestrictionCheckerTest.java
+++ b/tests/robotests/src/com/android/settings/network/NetworkResetRestrictionCheckerTest.java
@@ -36,7 +36,7 @@
 import org.robolectric.annotation.Config;
 
 @RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION_O)
 public class NetworkResetRestrictionCheckerTest {
 
     @Mock
diff --git a/tests/robotests/src/com/android/settings/network/NetworkScorerPickerPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/network/NetworkScorerPickerPreferenceControllerTest.java
index 0b1586e..5794820 100644
--- a/tests/robotests/src/com/android/settings/network/NetworkScorerPickerPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/network/NetworkScorerPickerPreferenceControllerTest.java
@@ -30,6 +30,7 @@
 import com.android.settings.R;
 import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
+import com.android.settings.wrapper.NetworkScoreManagerWrapper;
 
 import org.junit.Before;
 import org.junit.Test;
@@ -42,7 +43,7 @@
 import java.util.Collections;
 
 @RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION_O)
 public class NetworkScorerPickerPreferenceControllerTest {
 
     private static final String TEST_SCORER_PACKAGE = "Test Package";
diff --git a/tests/robotests/src/com/android/settings/network/NetworkScorerPickerTest.java b/tests/robotests/src/com/android/settings/network/NetworkScorerPickerTest.java
index 9885bdf..773b311 100644
--- a/tests/robotests/src/com/android/settings/network/NetworkScorerPickerTest.java
+++ b/tests/robotests/src/com/android/settings/network/NetworkScorerPickerTest.java
@@ -33,6 +33,8 @@
 import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
 import com.android.settings.widget.RadioButtonPreference;
+import com.android.settings.wrapper.NetworkScoreManagerWrapper;
+
 import com.google.android.collect.Lists;
 import org.junit.Before;
 import org.junit.Test;
@@ -45,9 +47,8 @@
 
 import java.util.ArrayList;
 
-
 @RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION_O)
 public class NetworkScorerPickerTest {
 
     private static final String TEST_SCORER_PACKAGE_1 = "Test Package 1";
diff --git a/tests/robotests/src/com/android/settings/network/PrivateDnsMenuControllerTest.java b/tests/robotests/src/com/android/settings/network/PrivateDnsMenuControllerTest.java
new file mode 100644
index 0000000..4e37d56
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/network/PrivateDnsMenuControllerTest.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.network;
+
+import static org.mockito.Matchers.any;
+import static org.mockito.Matchers.anyInt;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+import android.app.FragmentManager;
+import android.view.Menu;
+import android.view.MenuItem;
+
+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;
+
+@RunWith(SettingsRobolectricTestRunner.class)
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION_O)
+public class PrivateDnsMenuControllerTest {
+    private static final int MENU_ID = 0;
+
+    private PrivateDnsMenuController mController;
+    @Mock
+    private Menu mMenu;
+    @Mock
+    private MenuItem mMenuItem;
+    @Mock
+    private FragmentManager mFragmentManager;
+
+    @Before
+    public void setUp() {
+        MockitoAnnotations.initMocks(this);
+
+        mController = new PrivateDnsMenuController(mFragmentManager, MENU_ID);
+        when(mMenu.add(anyInt(), anyInt(), anyInt(), anyInt())).thenReturn(mMenuItem);
+    }
+
+    @Test
+    public void buildMenuItem_available_shouldAddToMenu() {
+        mController.buildMenuItem(mMenu);
+
+        verify(mMenu).add(0 /* groupId */, MENU_ID, 0 /* order */,
+                R.string.select_private_dns_configuration_title);
+        verify(mMenuItem).setOnMenuItemClickListener(any(MenuItem.OnMenuItemClickListener.class));
+    }
+}
diff --git a/tests/robotests/src/com/android/settings/network/PrivateDnsModeDialogFragmentTest.java b/tests/robotests/src/com/android/settings/network/PrivateDnsModeDialogFragmentTest.java
new file mode 100644
index 0000000..2dcfdc8
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/network/PrivateDnsModeDialogFragmentTest.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.network;
+
+import static android.net.ConnectivityManager.PRIVATE_DNS_MODE_OFF;
+import static android.net.ConnectivityManager.PRIVATE_DNS_MODE_OPPORTUNISTIC;
+import static android.net.ConnectivityManager.PRIVATE_DNS_MODE_PROVIDER_HOSTNAME;
+
+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.provider.Settings;
+import android.widget.Button;
+
+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.MockitoAnnotations;
+import org.robolectric.RuntimeEnvironment;
+import org.robolectric.annotation.Config;
+
+@RunWith(SettingsRobolectricTestRunner.class)
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION_O)
+public class PrivateDnsModeDialogFragmentTest {
+    private static final String HOST_NAME = "192.168.1.1";
+    private static final String INVALID_HOST_NAME = "...,";
+
+    private Context mContext;
+    private PrivateDnsModeDialogFragment mFragment;
+    private Button mSaveButton;
+
+
+    @Before
+    public void setUp() {
+        MockitoAnnotations.initMocks(this);
+
+        mContext = RuntimeEnvironment.application;
+        mSaveButton = new Button(mContext);
+
+        mFragment = spy(new PrivateDnsModeDialogFragment());
+        doReturn(mContext).when(mFragment).getContext();
+        mFragment.onCreateDialog(null);
+        mFragment.mSaveButton = mSaveButton;
+    }
+
+    @Test
+    public void testOnCheckedChanged_dnsModeOff_disableEditText() {
+        mFragment.onCheckedChanged(null, R.id.private_dns_mode_off);
+
+        assertThat(mFragment.mMode).isEqualTo(PRIVATE_DNS_MODE_OFF);
+        assertThat(mFragment.mEditText.isEnabled()).isFalse();
+    }
+
+    @Test
+    public void testOnCheckedChanged_dnsModeOpportunistic_disableEditText() {
+        mFragment.onCheckedChanged(null, R.id.private_dns_mode_opportunistic);
+
+        assertThat(mFragment.mMode).isEqualTo(PRIVATE_DNS_MODE_OPPORTUNISTIC);
+        assertThat(mFragment.mEditText.isEnabled()).isFalse();
+    }
+
+    @Test
+    public void testOnCheckedChanged_dnsModeProvider_enableEditText() {
+        mFragment.onCheckedChanged(null, R.id.private_dns_mode_provider);
+
+        assertThat(mFragment.mMode).isEqualTo(PRIVATE_DNS_MODE_PROVIDER_HOSTNAME);
+        assertThat(mFragment.mEditText.isEnabled()).isTrue();
+    }
+
+    @Test
+    public void testOnCreateDialog_containsCorrectData() {
+        Settings.Global.putString(mContext.getContentResolver(),
+                PrivateDnsModeDialogFragment.MODE_KEY, PRIVATE_DNS_MODE_OPPORTUNISTIC);
+        Settings.Global.putString(mContext.getContentResolver(),
+                PrivateDnsModeDialogFragment.HOSTNAME_KEY, HOST_NAME);
+
+        mFragment.onCreateDialog(null);
+
+        assertThat(mFragment.mEditText.getText().toString()).isEqualTo(HOST_NAME);
+        assertThat(mFragment.mRadioGroup.getCheckedRadioButtonId()).isEqualTo(
+                R.id.private_dns_mode_opportunistic);
+    }
+
+    @Test
+    public void testOnCheckedChanged_switchMode_saveButtonHasCorrectState() {
+        // Set invalid hostname
+        mFragment.mEditText.setText(INVALID_HOST_NAME);
+
+        mFragment.onCheckedChanged(null, R.id.private_dns_mode_opportunistic);
+        assertThat(mSaveButton.isEnabled()).isTrue();
+
+        mFragment.onCheckedChanged(null, R.id.private_dns_mode_provider);
+        assertThat(mSaveButton.isEnabled()).isFalse();
+
+        mFragment.onCheckedChanged(null, R.id.private_dns_mode_off);
+        assertThat(mSaveButton.isEnabled()).isTrue();
+    }
+
+}
diff --git a/tests/robotests/src/com/android/settings/network/TetherPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/network/TetherPreferenceControllerTest.java
index b8a6d28..33fd36b 100644
--- a/tests/robotests/src/com/android/settings/network/TetherPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/network/TetherPreferenceControllerTest.java
@@ -52,7 +52,7 @@
 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_O)
 public class TetherPreferenceControllerTest {
 
     @Mock
diff --git a/tests/robotests/src/com/android/settings/network/VpnPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/network/VpnPreferenceControllerTest.java
index b7c4848..96a29c2 100644
--- a/tests/robotests/src/com/android/settings/network/VpnPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/network/VpnPreferenceControllerTest.java
@@ -17,6 +17,16 @@
 package com.android.settings.network;
 
 
+import static android.arch.lifecycle.Lifecycle.Event.ON_PAUSE;
+import static android.arch.lifecycle.Lifecycle.Event.ON_RESUME;
+
+import static org.mockito.Matchers.any;
+import static org.mockito.Matchers.anyString;
+import static org.mockito.Mockito.doReturn;
+import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
 import android.content.Context;
 import android.net.ConnectivityManager;
 import android.net.IConnectivityManager;
@@ -25,8 +35,8 @@
 import android.support.v7.preference.Preference;
 import android.support.v7.preference.PreferenceScreen;
 
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settingslib.core.lifecycle.Lifecycle;
 
 import org.junit.Before;
@@ -37,15 +47,8 @@
 import org.robolectric.annotation.Config;
 import org.robolectric.shadows.ShadowServiceManager;
 
-import static org.mockito.Matchers.any;
-import static org.mockito.Matchers.anyString;
-import static org.mockito.Mockito.doReturn;
-import static org.mockito.Mockito.spy;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
 @RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION_O)
 public class VpnPreferenceControllerTest {
 
     @Mock
@@ -74,7 +77,7 @@
         when(mScreen.findPreference(anyString())).thenReturn(mPreference);
 
         mController = spy(new VpnPreferenceController(mContext));
-        mLifecycle = new Lifecycle();
+        mLifecycle = new Lifecycle(() -> mLifecycle);
         mLifecycle.addObserver(mController);
     }
 
@@ -91,11 +94,11 @@
     public void goThroughLifecycle_shouldRegisterUnregisterListener() {
         doReturn(true).when(mController).isAvailable();
 
-        mLifecycle.onResume();
+        mLifecycle.handleLifecycleEvent(ON_RESUME);
         verify(mConnectivityManager).registerNetworkCallback(
                 any(NetworkRequest.class), any(ConnectivityManager.NetworkCallback.class));
 
-        mLifecycle.onPause();
+        mLifecycle.handleLifecycleEvent(ON_PAUSE);
         verify(mConnectivityManager).unregisterNetworkCallback(
                 any(ConnectivityManager.NetworkCallback.class));
     }
diff --git a/tests/robotests/src/com/android/settings/network/WifiCallingPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/network/WifiCallingPreferenceControllerTest.java
index 172508d..4d6a0be 100644
--- a/tests/robotests/src/com/android/settings/network/WifiCallingPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/network/WifiCallingPreferenceControllerTest.java
@@ -39,7 +39,7 @@
 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_O)
 public class WifiCallingPreferenceControllerTest {
 
     @Mock
diff --git a/tests/robotests/src/com/android/settings/nfc/PaymentSettingsTest.java b/tests/robotests/src/com/android/settings/nfc/PaymentSettingsTest.java
index a82daf3..d4c74ed 100644
--- a/tests/robotests/src/com/android/settings/nfc/PaymentSettingsTest.java
+++ b/tests/robotests/src/com/android/settings/nfc/PaymentSettingsTest.java
@@ -36,7 +36,7 @@
 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_O)
 public class PaymentSettingsTest {
     @Mock
     Context mContext;
diff --git a/tests/robotests/src/com/android/settings/notification/AdjustVolumeRestrictedPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/AdjustVolumeRestrictedPreferenceControllerTest.java
index d33d734..cc27649 100644
--- a/tests/robotests/src/com/android/settings/notification/AdjustVolumeRestrictedPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/notification/AdjustVolumeRestrictedPreferenceControllerTest.java
@@ -43,7 +43,7 @@
 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_O)
 public class AdjustVolumeRestrictedPreferenceControllerTest {
 
     @Mock
diff --git a/tests/robotests/src/com/android/settings/notification/AlarmRingtonePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/AlarmRingtonePreferenceControllerTest.java
index f4bd522..85a3027 100644
--- a/tests/robotests/src/com/android/settings/notification/AlarmRingtonePreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/notification/AlarmRingtonePreferenceControllerTest.java
@@ -32,7 +32,7 @@
 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_O)
 public class AlarmRingtonePreferenceControllerTest {
 
     @Mock
diff --git a/tests/robotests/src/com/android/settings/notification/AlarmVolumePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/AlarmVolumePreferenceControllerTest.java
index 7b0b033..f070421 100644
--- a/tests/robotests/src/com/android/settings/notification/AlarmVolumePreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/notification/AlarmVolumePreferenceControllerTest.java
@@ -33,7 +33,7 @@
 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_O)
 public class AlarmVolumePreferenceControllerTest {
 
     @Mock
diff --git a/tests/robotests/src/com/android/settings/notification/AllowSoundPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/AllowSoundPreferenceControllerTest.java
new file mode 100644
index 0000000..c14e4aa
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/notification/AllowSoundPreferenceControllerTest.java
@@ -0,0 +1,244 @@
+/*
+ * Copyright (C) 2017 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF 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 android.app.NotificationChannel.DEFAULT_CHANNEL_ID;
+import static android.app.NotificationManager.IMPORTANCE_HIGH;
+import static android.app.NotificationManager.IMPORTANCE_LOW;
+import static android.app.NotificationManager.IMPORTANCE_UNSPECIFIED;
+
+import static junit.framework.Assert.assertFalse;
+import static junit.framework.Assert.assertTrue;
+
+import static org.junit.Assert.assertEquals;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.anyInt;
+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.NotificationChannel;
+import android.app.NotificationManager;
+import android.content.Context;
+import android.os.Build;
+import android.os.UserManager;
+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.RestrictedLockUtils;
+import com.android.settingslib.RestrictedSwitchPreference;
+
+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;
+
+@RunWith(SettingsRobolectricTestRunner.class)
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION_O)
+public class AllowSoundPreferenceControllerTest {
+
+    private Context mContext;
+    @Mock
+    private NotificationBackend mBackend;
+    @Mock
+    private NotificationManager mNm;
+    @Mock
+    private UserManager mUm;
+    @Mock(answer = Answers.RETURNS_DEEP_STUBS)
+    private PreferenceScreen mScreen;
+
+    @Mock
+    NotificationSettingsBase.ImportanceListener mImportanceListener;
+
+    private AllowSoundPreferenceController mController;
+
+    @Before
+    public void setUp() {
+        MockitoAnnotations.initMocks(this);
+        ShadowApplication shadowApplication = ShadowApplication.getInstance();
+        shadowApplication.setSystemService(Context.NOTIFICATION_SERVICE, mNm);
+        shadowApplication.setSystemService(Context.USER_SERVICE, mUm);
+        mContext = shadowApplication.getApplicationContext();
+        mController =
+                spy(new AllowSoundPreferenceController(mContext, mImportanceListener, mBackend));
+    }
+
+    @Test
+    public void testNoCrashIfNoOnResume() throws Exception {
+        mController.isAvailable();
+        mController.updateState(mock(RestrictedSwitchPreference.class));
+        mController.onPreferenceChange(mock(RestrictedSwitchPreference.class), true);
+    }
+
+    @Test
+    public void testIsAvailable_notIfNull() throws Exception {
+        mController.onResume(null, mock(NotificationChannel.class), null, null);
+        assertFalse(mController.isAvailable());
+
+        mController.onResume(mock(NotificationBackend.AppRow.class), null, null, null);
+        assertFalse(mController.isAvailable());
+    }
+
+    @Test
+    public void testIsAvailable_notIfAppBlocked() throws Exception {
+        NotificationBackend.AppRow appRow = new NotificationBackend.AppRow();
+        appRow.banned = true;
+        mController.onResume(appRow, mock(NotificationChannel.class), null, null);
+        assertFalse(mController.isAvailable());
+    }
+
+    @Test
+    public void testIsAvailable_notIfAppCreatedChannel() throws Exception {
+        NotificationBackend.AppRow appRow = new NotificationBackend.AppRow();
+        NotificationChannel channel = mock(NotificationChannel.class);
+        when(channel.getId()).thenReturn("something new");
+        mController.onResume(appRow, channel, null, null);
+        assertFalse(mController.isAvailable());
+    }
+
+    @Test
+    public void testIsAvailable() throws Exception {
+        NotificationBackend.AppRow appRow = new NotificationBackend.AppRow();
+        NotificationChannel channel = mock(NotificationChannel.class);
+        when(channel.getImportance()).thenReturn(IMPORTANCE_LOW);
+        when(channel.getId()).thenReturn(DEFAULT_CHANNEL_ID);
+        mController.onResume(appRow, channel, null, null);
+        assertTrue(mController.isAvailable());
+    }
+
+    @Test
+    public void testUpdateState_disabledByAdmin() throws Exception {
+        NotificationChannel channel = mock(NotificationChannel.class);
+        when(channel.getId()).thenReturn("something");
+        mController.onResume(new NotificationBackend.AppRow(), channel, null, mock(
+                RestrictedLockUtils.EnforcedAdmin.class));
+
+        Preference pref = new RestrictedSwitchPreference(RuntimeEnvironment.application);
+        mController.updateState(pref);
+
+        assertFalse(pref.isEnabled());
+    }
+
+    @Test
+    public void testUpdateState_notConfigurable() throws Exception {
+        String lockedId = "locked";
+        NotificationBackend.AppRow appRow = new NotificationBackend.AppRow();
+        appRow.lockedChannelId = lockedId;
+        NotificationChannel channel = mock(NotificationChannel.class);
+        when(channel.getId()).thenReturn(lockedId);
+        mController.onResume(appRow, channel, null, null);
+
+        Preference pref = new RestrictedSwitchPreference(RuntimeEnvironment.application);
+        mController.updateState(pref);
+
+        assertFalse(pref.isEnabled());
+    }
+
+    @Test
+    public void testUpdateState_configurable() throws Exception {
+        NotificationBackend.AppRow appRow = new NotificationBackend.AppRow();
+        NotificationChannel channel = mock(NotificationChannel.class);
+        when(channel.getId()).thenReturn("something");
+        mController.onResume(appRow, channel, null, null);
+
+        Preference pref = new RestrictedSwitchPreference(RuntimeEnvironment.application);
+        mController.updateState(pref);
+
+        assertTrue(pref.isEnabled());
+    }
+
+    @Test
+    public void testUpdateState_checkedForHighImportanceChannel() throws Exception {
+        NotificationChannel channel = mock(NotificationChannel.class);
+        when(channel.getImportance()).thenReturn(IMPORTANCE_HIGH);
+        mController.onResume(new NotificationBackend.AppRow(), channel, null, null);
+
+        RestrictedSwitchPreference pref = new RestrictedSwitchPreference(RuntimeEnvironment.application);
+        mController.updateState(pref);
+        assertTrue(pref.isChecked());
+    }
+
+    @Test
+    public void testUpdateState_checkedForUnspecifiedImportanceChannel() throws Exception {
+        NotificationChannel channel = mock(NotificationChannel.class);
+        when(channel.getImportance()).thenReturn(IMPORTANCE_UNSPECIFIED);
+        mController.onResume(new NotificationBackend.AppRow(), channel, null, null);
+
+        RestrictedSwitchPreference pref = new RestrictedSwitchPreference(RuntimeEnvironment.application);
+        mController.updateState(pref);
+        assertTrue(pref.isChecked());
+    }
+
+    @Test
+    public void testUpdateState_notCheckedForLowImportanceChannel() throws Exception {
+        NotificationChannel channel = mock(NotificationChannel.class);
+        when(channel.getImportance()).thenReturn(IMPORTANCE_LOW);
+        mController.onResume(new NotificationBackend.AppRow(), channel, null, null);
+
+        RestrictedSwitchPreference pref =
+                new RestrictedSwitchPreference(RuntimeEnvironment.application);
+        mController.updateState(pref);
+        assertFalse(pref.isChecked());
+    }
+
+    @Test
+    public void testOnPreferenceChange_on() {
+        NotificationChannel channel =
+                new NotificationChannel(DEFAULT_CHANNEL_ID, "a", IMPORTANCE_LOW);
+        mController.onResume(new NotificationBackend.AppRow(), channel, null, null);
+
+        RestrictedSwitchPreference pref =
+                new RestrictedSwitchPreference(RuntimeEnvironment.application);
+        when(mScreen.findPreference(mController.getPreferenceKey())).thenReturn(pref);
+        mController.displayPreference(mScreen);
+        mController.updateState(pref);
+        pref.setChecked(true);
+        mController.onPreferenceChange(pref, true);
+
+        assertEquals(IMPORTANCE_UNSPECIFIED, mController.mChannel.getImportance());
+        verify(mImportanceListener, times(1)).onImportanceChanged();
+    }
+
+    @Test
+    public void testOnPreferenceChange_off() {
+        NotificationChannel channel =
+                new NotificationChannel(DEFAULT_CHANNEL_ID, "a", IMPORTANCE_HIGH);
+        mController.onResume(new NotificationBackend.AppRow(), channel, null, null);
+
+        RestrictedSwitchPreference pref =
+                new RestrictedSwitchPreference(RuntimeEnvironment.application);
+        when(mScreen.findPreference(mController.getPreferenceKey())).thenReturn(pref);
+        mController.displayPreference(mScreen);
+        mController.updateState(pref);
+
+        pref.setChecked(false);
+        mController.onPreferenceChange(pref, false);
+
+        verify(mBackend, times(1)).updateChannel(any(), anyInt(), any());
+        assertEquals(IMPORTANCE_LOW, mController.mChannel.getImportance());
+        verify(mImportanceListener, times(1)).onImportanceChanged();
+    }
+}
diff --git a/tests/robotests/src/com/android/settings/notification/AppLinkPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/AppLinkPreferenceControllerTest.java
new file mode 100644
index 0000000..7198993
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/notification/AppLinkPreferenceControllerTest.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.notification;
+
+import static android.app.NotificationChannel.DEFAULT_CHANNEL_ID;
+import static android.app.NotificationManager.IMPORTANCE_LOW;
+import static android.app.NotificationManager.IMPORTANCE_NONE;
+
+import static junit.framework.Assert.assertFalse;
+import static junit.framework.Assert.assertTrue;
+
+import static org.junit.Assert.assertEquals;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.when;
+
+import android.app.NotificationChannel;
+import android.app.NotificationManager;
+import android.content.Context;
+import android.content.Intent;
+import android.os.Build;
+import android.os.UserManager;
+import android.support.v7.preference.Preference;
+
+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;
+import org.robolectric.shadows.ShadowApplication;
+
+@RunWith(SettingsRobolectricTestRunner.class)
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION_O)
+public class AppLinkPreferenceControllerTest {
+
+    private Context mContext;
+    @Mock
+    private NotificationManager mNm;
+    @Mock
+    private UserManager mUm;
+
+    private AppLinkPreferenceController mController;
+
+    @Before
+    public void setUp() {
+        MockitoAnnotations.initMocks(this);
+        ShadowApplication shadowApplication = ShadowApplication.getInstance();
+        shadowApplication.setSystemService(Context.NOTIFICATION_SERVICE, mNm);
+        shadowApplication.setSystemService(Context.USER_SERVICE, mUm);
+        mContext = shadowApplication.getApplicationContext();
+        mController = spy(new AppLinkPreferenceController(mContext));
+    }
+
+    @Test
+    public void testNoCrashIfNoOnResume() throws Exception {
+        mController.isAvailable();
+        mController.updateState(mock(Preference.class));
+    }
+
+    @Test
+    public void testIsAvailable_notIfNull() throws Exception {
+        mController.onResume(null, null, null, null);
+        assertFalse(mController.isAvailable());
+    }
+
+    @Test
+    public void testIsAvailable_notIfAppBlocked() throws Exception {
+        NotificationBackend.AppRow appRow = new NotificationBackend.AppRow();
+        appRow.banned = true;
+        mController.onResume(appRow, null, null, null);
+        assertFalse(mController.isAvailable());
+    }
+
+    @Test
+    public void testIsAvailable_notIfChannelBlocked() throws Exception {
+        NotificationBackend.AppRow appRow = new NotificationBackend.AppRow();
+        NotificationChannel channel = mock(NotificationChannel.class);
+        when(channel.getImportance()).thenReturn(IMPORTANCE_NONE);
+        mController.onResume(appRow, channel, null, null);
+        assertFalse(mController.isAvailable());
+    }
+
+    @Test
+    public void testIsAvailable_notNoIntent() throws Exception {
+        NotificationBackend.AppRow appRow = new NotificationBackend.AppRow();
+        NotificationChannel channel = mock(NotificationChannel.class);
+        when(channel.getImportance()).thenReturn(IMPORTANCE_LOW);
+        when(channel.getId()).thenReturn(DEFAULT_CHANNEL_ID);
+        mController.onResume(appRow, channel, null, null);
+        assertFalse(mController.isAvailable());
+    }
+
+    @Test
+    public void testIsAvailable() throws Exception {
+        NotificationBackend.AppRow appRow = new NotificationBackend.AppRow();
+        appRow.settingsIntent = new Intent("test");
+        NotificationChannel channel = mock(NotificationChannel.class);
+        when(channel.getImportance()).thenReturn(IMPORTANCE_LOW);
+        when(channel.getId()).thenReturn(DEFAULT_CHANNEL_ID);
+        mController.onResume(appRow, channel, null, null);
+        assertTrue(mController.isAvailable());
+    }
+
+    @Test
+    public void testUpdateState() throws Exception {
+        NotificationBackend.AppRow appRow = new NotificationBackend.AppRow();
+        Intent intent = new Intent("action");
+        appRow.settingsIntent = intent;
+        mController.onResume(appRow, null, null, null);
+
+        Preference pref = new Preference(RuntimeEnvironment.application);
+        mController.updateState(pref);
+
+        assertEquals(intent, pref.getIntent());
+    }
+}
diff --git a/tests/robotests/src/com/android/settings/notification/BadgePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/BadgePreferenceControllerTest.java
new file mode 100644
index 0000000..55dbd3c
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/notification/BadgePreferenceControllerTest.java
@@ -0,0 +1,298 @@
+/*
+ * Copyright (C) 2017 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF 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 android.app.NotificationChannel.DEFAULT_CHANNEL_ID;
+import static android.app.NotificationManager.IMPORTANCE_HIGH;
+import static android.app.NotificationManager.IMPORTANCE_LOW;
+import static android.app.NotificationManager.IMPORTANCE_NONE;
+import static android.app.NotificationManager.IMPORTANCE_UNSPECIFIED;
+import static android.provider.Settings.Secure.NOTIFICATION_BADGING;
+
+import static junit.framework.Assert.assertFalse;
+import static junit.framework.Assert.assertTrue;
+
+import static org.junit.Assert.assertEquals;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.anyInt;
+import static org.mockito.ArgumentMatchers.eq;
+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.NotificationChannel;
+import android.app.NotificationManager;
+import android.content.Context;
+import android.os.Build;
+import android.os.UserManager;
+import android.provider.Settings;
+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.RestrictedLockUtils;
+import com.android.settingslib.RestrictedSwitchPreference;
+
+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;
+
+@RunWith(SettingsRobolectricTestRunner.class)
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION_O)
+public class BadgePreferenceControllerTest {
+
+    private Context mContext;
+    @Mock
+    private NotificationBackend mBackend;
+    @Mock
+    private NotificationManager mNm;
+    @Mock
+    private UserManager mUm;
+    @Mock(answer = Answers.RETURNS_DEEP_STUBS)
+    private PreferenceScreen mScreen;
+
+    private BadgePreferenceController mController;
+
+    @Before
+    public void setUp() {
+        MockitoAnnotations.initMocks(this);
+        ShadowApplication shadowApplication = ShadowApplication.getInstance();
+        shadowApplication.setSystemService(Context.NOTIFICATION_SERVICE, mNm);
+        shadowApplication.setSystemService(Context.USER_SERVICE, mUm);
+        mContext = shadowApplication.getApplicationContext();
+        mController = spy(new BadgePreferenceController(mContext, mBackend));
+    }
+
+    @Test
+    public void testNoCrashIfNoOnResume() throws Exception {
+        mController.isAvailable();
+        mController.updateState(mock(RestrictedSwitchPreference.class));
+        mController.onPreferenceChange(mock(RestrictedSwitchPreference.class), true);
+    }
+
+    @Test
+    public void testIsAvailable_notIfAppBlocked() throws Exception {
+        NotificationBackend.AppRow appRow = new NotificationBackend.AppRow();
+        appRow.banned = true;
+        mController.onResume(appRow, mock(NotificationChannel.class), null, null);
+        assertFalse(mController.isAvailable());
+    }
+
+    @Test
+    public void testIsAvailable_notIfChannelBlocked() throws Exception {
+        NotificationBackend.AppRow appRow = new NotificationBackend.AppRow();
+        NotificationChannel channel = mock(NotificationChannel.class);
+        when(channel.getImportance()).thenReturn(IMPORTANCE_NONE);
+        mController.onResume(appRow, channel, null, null);
+        assertFalse(mController.isAvailable());
+    }
+
+    @Test
+    public void testIsAvailable_channel_notIfAppOff() throws Exception {
+        NotificationBackend.AppRow appRow = new NotificationBackend.AppRow();
+        appRow.showBadge = false;
+        NotificationChannel channel = mock(NotificationChannel.class);
+        when(channel.getImportance()).thenReturn(IMPORTANCE_HIGH);
+        mController.onResume(appRow, channel, null, null);
+
+        assertFalse(mController.isAvailable());
+    }
+
+    @Test
+    public void testIsAvailable_notIfOffGlobally() throws Exception {
+        NotificationBackend.AppRow appRow = new NotificationBackend.AppRow();
+        NotificationChannel channel = mock(NotificationChannel.class);
+        when(channel.getImportance()).thenReturn(IMPORTANCE_HIGH);
+        mController.onResume(appRow, channel, null, null);
+        Settings.Secure.putInt(mContext.getContentResolver(), NOTIFICATION_BADGING, 0);
+
+        assertFalse(mController.isAvailable());
+    }
+
+    @Test
+    public void testIsAvailable_app() throws Exception {
+        NotificationBackend.AppRow appRow = new NotificationBackend.AppRow();
+        mController.onResume(appRow, null, null, null);
+        Settings.Secure.putInt(mContext.getContentResolver(), NOTIFICATION_BADGING, 1);
+
+        assertTrue(mController.isAvailable());
+    }
+
+    @Test
+    public void testIsAvailable_channel() throws Exception {
+        NotificationBackend.AppRow appRow = new NotificationBackend.AppRow();
+        appRow.showBadge = true;
+        NotificationChannel channel = mock(NotificationChannel.class);
+        when(channel.getImportance()).thenReturn(IMPORTANCE_HIGH);
+        mController.onResume(appRow, channel, null, null);
+        Settings.Secure.putInt(mContext.getContentResolver(), NOTIFICATION_BADGING, 1);
+
+        assertTrue(mController.isAvailable());
+    }
+
+    @Test
+    public void testUpdateState_disabledByAdmin() throws Exception {
+        NotificationChannel channel = mock(NotificationChannel.class);
+        when(channel.getId()).thenReturn("something");
+        mController.onResume(new NotificationBackend.AppRow(), channel, null, mock(
+                RestrictedLockUtils.EnforcedAdmin.class));
+
+        Preference pref = new RestrictedSwitchPreference(RuntimeEnvironment.application);
+        mController.updateState(pref);
+
+        assertFalse(pref.isEnabled());
+    }
+
+    @Test
+    public void testUpdateState_channelNotConfigurable() throws Exception {
+        String lockedId = "locked";
+        NotificationBackend.AppRow appRow = new NotificationBackend.AppRow();
+        appRow.lockedChannelId = lockedId;
+        NotificationChannel channel = mock(NotificationChannel.class);
+        when(channel.getId()).thenReturn(lockedId);
+        mController.onResume(appRow, channel, null, null);
+
+        Preference pref = new RestrictedSwitchPreference(RuntimeEnvironment.application);
+        mController.updateState(pref);
+
+        assertFalse(pref.isEnabled());
+    }
+
+    @Test
+    public void testUpdateState_channel() throws Exception {
+        NotificationBackend.AppRow appRow = new NotificationBackend.AppRow();
+        appRow.lockedChannelId = "a";
+        NotificationChannel channel = mock(NotificationChannel.class);
+        when(channel.canShowBadge()).thenReturn(true);
+        mController.onResume(appRow, channel, null, null);
+
+        RestrictedSwitchPreference pref =
+                new RestrictedSwitchPreference(RuntimeEnvironment.application);
+        mController.updateState(pref);
+
+        assertTrue(pref.isChecked());
+
+        when(channel.canShowBadge()).thenReturn(false);
+        mController.onResume(appRow, channel, null, null);
+        mController.updateState(pref);
+
+        assertFalse(pref.isChecked());
+    }
+
+    @Test
+    public void testUpdateState_app() throws Exception {
+        NotificationBackend.AppRow appRow = new NotificationBackend.AppRow();
+        appRow.showBadge = true;
+        mController.onResume(appRow, null, null, null);
+
+        RestrictedSwitchPreference pref =
+                new RestrictedSwitchPreference(RuntimeEnvironment.application);
+        mController.updateState(pref);
+        assertTrue(pref.isChecked());
+
+        appRow.showBadge = false;
+        mController.onResume(appRow, null, null, null);
+
+        mController.updateState(pref);
+        assertFalse(pref.isChecked());
+    }
+
+    @Test
+    public void testOnPreferenceChange_on_channel() {
+        NotificationBackend.AppRow appRow = new NotificationBackend.AppRow();
+        appRow.showBadge = true;
+        NotificationChannel channel =
+                new NotificationChannel(DEFAULT_CHANNEL_ID, "a", IMPORTANCE_LOW);
+        channel.setShowBadge(false);
+        mController.onResume(appRow, channel, null, null);
+
+        RestrictedSwitchPreference pref =
+                new RestrictedSwitchPreference(RuntimeEnvironment.application);
+        when(mScreen.findPreference(mController.getPreferenceKey())).thenReturn(pref);
+        mController.displayPreference(mScreen);
+        mController.updateState(pref);
+
+        mController.onPreferenceChange(pref, true);
+        assertTrue(channel.canShowBadge());
+        verify(mBackend, times(1)).updateChannel(any(), anyInt(), any());
+    }
+
+    @Test
+    public void testOnPreferenceChange_off_channel() {
+        NotificationBackend.AppRow appRow = new NotificationBackend.AppRow();
+        appRow.showBadge = true;
+        NotificationChannel channel =
+                new NotificationChannel(DEFAULT_CHANNEL_ID, "a", IMPORTANCE_HIGH);
+        channel.setShowBadge(true);
+        mController.onResume(appRow, channel, null, null);
+
+        RestrictedSwitchPreference pref =
+                new RestrictedSwitchPreference(RuntimeEnvironment.application);
+        when(mScreen.findPreference(mController.getPreferenceKey())).thenReturn(pref);
+        mController.displayPreference(mScreen);
+        mController.updateState(pref);
+
+        mController.onPreferenceChange(pref, false);
+        verify(mBackend, times(1)).updateChannel(any(), anyInt(), any());
+        assertFalse(channel.canShowBadge());
+    }
+
+    @Test
+    public void testOnPreferenceChange_on_app() {
+        NotificationBackend.AppRow appRow = new NotificationBackend.AppRow();
+        appRow.showBadge = false;
+        mController.onResume(appRow, null, null, null);
+
+        RestrictedSwitchPreference pref =
+                new RestrictedSwitchPreference(RuntimeEnvironment.application);
+        when(mScreen.findPreference(mController.getPreferenceKey())).thenReturn(pref);
+        mController.displayPreference(mScreen);
+        mController.updateState(pref);
+
+        mController.onPreferenceChange(pref, true);
+
+        assertTrue(appRow.showBadge);
+        verify(mBackend, times(1)).setShowBadge(any(), anyInt(), eq(true));
+    }
+
+    @Test
+    public void testOnPreferenceChange_off_app() {
+        NotificationBackend.AppRow appRow = new NotificationBackend.AppRow();
+        appRow.showBadge = true;
+        mController.onResume(appRow, null, null, null);
+
+        RestrictedSwitchPreference pref =
+                new RestrictedSwitchPreference(RuntimeEnvironment.application);
+        when(mScreen.findPreference(mController.getPreferenceKey())).thenReturn(pref);
+        mController.displayPreference(mScreen);
+        mController.updateState(pref);
+
+        mController.onPreferenceChange(pref, false);
+
+        assertFalse(appRow.showBadge);
+        verify(mBackend, times(1)).setShowBadge(any(), anyInt(), eq(false));
+    }
+}
diff --git a/tests/robotests/src/com/android/settings/notification/BadgingNotificationPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/BadgingNotificationPreferenceControllerTest.java
index c1a7d05..d294122 100644
--- a/tests/robotests/src/com/android/settings/notification/BadgingNotificationPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/notification/BadgingNotificationPreferenceControllerTest.java
@@ -16,6 +16,12 @@
 
 package com.android.settings.notification;
 
+import static android.provider.Settings.Secure.NOTIFICATION_BADGING;
+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.ContentResolver;
 import android.content.Context;
 import android.provider.Settings;
@@ -35,21 +41,12 @@
 import org.mockito.Mock;
 import org.mockito.MockitoAnnotations;
 import org.robolectric.RobolectricTestRunner;
+import org.robolectric.RuntimeEnvironment;
 import org.robolectric.annotation.Config;
 import org.robolectric.shadows.ShadowApplication;
 
-import static android.provider.Settings.Secure.NOTIFICATION_BADGING;
-
-import static com.google.common.truth.Truth.assertThat;
-
-import static org.mockito.Mockito.any;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.never;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
 @RunWith(RobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION_O)
 public class BadgingNotificationPreferenceControllerTest {
 
     @Mock(answer = Answers.RETURNS_DEEP_STUBS)
@@ -58,11 +55,15 @@
     private PreferenceScreen mScreen;
 
     private BadgingNotificationPreferenceController mController;
+    private Preference mPreference;
 
     @Before
     public void setUp() {
         MockitoAnnotations.initMocks(this);
         mController = new BadgingNotificationPreferenceController(mContext);
+        mPreference = new Preference(RuntimeEnvironment.application);
+        mPreference.setKey(mController.getPreferenceKey());
+        when(mScreen.findPreference(mPreference.getKey())).thenReturn(mPreference);
     }
 
     @Test
@@ -72,7 +73,7 @@
                 .thenReturn(true);
         mController.displayPreference(mScreen);
 
-        verify(mScreen, never()).removePreference(any(Preference.class));
+        assertThat(mPreference.isVisible()).isTrue();
     }
 
     @Test
@@ -80,14 +81,10 @@
         when(mContext.getResources().
                 getBoolean(com.android.internal.R.bool.config_notificationBadging))
                 .thenReturn(false);
-        final Preference preference = mock(Preference.class);
-        when(mScreen.getPreferenceCount()).thenReturn(1);
-        when(mScreen.getPreference(0)).thenReturn(preference);
-        when(preference.getKey()).thenReturn(mController.getPreferenceKey());
 
         mController.displayPreference(mScreen);
 
-        verify(mScreen).removePreference(any(Preference.class));
+        assertThat(mPreference.isVisible()).isFalse();
     }
 
     @Test
diff --git a/tests/robotests/src/com/android/settings/notification/BlockPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/BlockPreferenceControllerTest.java
new file mode 100644
index 0000000..aca814a
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/notification/BlockPreferenceControllerTest.java
@@ -0,0 +1,272 @@
+/*
+ * Copyright (C) 2017 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF 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 android.app.NotificationChannel.DEFAULT_CHANNEL_ID;
+import static android.app.NotificationManager.IMPORTANCE_DEFAULT;
+import static android.app.NotificationManager.IMPORTANCE_HIGH;
+import static android.app.NotificationManager.IMPORTANCE_LOW;
+import static android.app.NotificationManager.IMPORTANCE_NONE;
+import static android.app.NotificationManager.IMPORTANCE_UNSPECIFIED;
+
+import static junit.framework.Assert.assertFalse;
+import static junit.framework.Assert.assertNotNull;
+import static junit.framework.Assert.assertTrue;
+
+import static org.junit.Assert.assertEquals;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.anyInt;
+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.NotificationChannel;
+import android.app.NotificationChannelGroup;
+import android.app.NotificationManager;
+import android.content.Context;
+import android.os.Build;
+import android.os.UserManager;
+
+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.widget.SwitchBar;
+import com.android.settings.wrapper.NotificationChannelGroupWrapper;
+
+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_O)
+public class BlockPreferenceControllerTest {
+
+    private Context mContext;
+    @Mock
+    private NotificationBackend mBackend;
+    @Mock
+    private NotificationManager mNm;
+    @Mock
+    private UserManager mUm;
+
+    @Mock
+    NotificationSettingsBase.ImportanceListener mImportanceListener;
+
+    private BlockPreferenceController mController;
+    @Mock
+    private LayoutPreference mPreference;
+    private SwitchBar mSwitch;
+
+    @Before
+    public void setUp() {
+        MockitoAnnotations.initMocks(this);
+        ShadowApplication shadowApplication = ShadowApplication.getInstance();
+        shadowApplication.setSystemService(Context.NOTIFICATION_SERVICE, mNm);
+        shadowApplication.setSystemService(Context.USER_SERVICE, mUm);
+        mContext = shadowApplication.getApplicationContext();
+        mController = spy(new BlockPreferenceController(mContext, mImportanceListener, mBackend));
+        mSwitch = new SwitchBar(mContext);
+        when(mPreference.findViewById(R.id.switch_bar)).thenReturn(mSwitch);
+    }
+
+    @Test
+    public void testNoCrashIfNoOnResume() throws Exception {
+        mController.isAvailable();
+        mController.updateState(mock(LayoutPreference.class));
+        mController.onSwitchChanged(null, false);
+    }
+
+    @Test
+    public void testIsAvailable_notIfNull() throws Exception {
+        mController.onResume(null, null, null, null);
+        assertFalse(mController.isAvailable());
+    }
+
+    @Test
+    public void testIsAvailable_notIfChannelNotBlockable() throws Exception {
+        NotificationBackend.AppRow appRow = new NotificationBackend.AppRow();
+        appRow.systemApp = true;
+        NotificationChannel channel = mock(NotificationChannel.class);
+        when(channel.getImportance()).thenReturn(IMPORTANCE_HIGH);
+        mController.onResume(appRow, channel, null, null);
+        assertFalse(mController.isAvailable());
+    }
+
+    @Test
+    public void testIsAvailable_notIfGroupNotBlockable() throws Exception {
+        NotificationBackend.AppRow appRow = new NotificationBackend.AppRow();
+        appRow.systemApp = true;
+        mController.onResume(appRow, null, mock(NotificationChannelGroupWrapper.class), null);
+        assertFalse(mController.isAvailable());
+    }
+
+    @Test
+    public void testIsAvailable_notIfAppNotBlockable() throws Exception {
+        NotificationBackend.AppRow appRow = new NotificationBackend.AppRow();
+        appRow.systemApp = true;
+        mController.onResume(appRow, null, null, null);
+        assertFalse(mController.isAvailable());
+    }
+
+    @Test
+    public void testIsAvailable_systemApp() throws Exception {
+        NotificationBackend.AppRow appRow = new NotificationBackend.AppRow();
+        appRow.systemApp = true;
+        NotificationChannel channel = mock(NotificationChannel.class);
+        when(channel.getImportance()).thenReturn(IMPORTANCE_NONE);
+        mController.onResume(appRow, channel, null, null);
+        assertTrue(mController.isAvailable());
+    }
+
+    @Test
+    public void testIsAvailable_nonSystemApp() throws Exception {
+        NotificationBackend.AppRow appRow = new NotificationBackend.AppRow();
+        appRow.systemApp = false;
+        NotificationChannel channel = mock(NotificationChannel.class);
+        when(channel.getImportance()).thenReturn(IMPORTANCE_HIGH);
+        mController.onResume(appRow, channel, null, null);
+        assertTrue(mController.isAvailable());
+    }
+
+    @Test
+    public void testUpdateState_app() throws Exception {
+        NotificationBackend.AppRow appRow = new NotificationBackend.AppRow();
+        appRow.banned = true;
+        mController.onResume(appRow, null, null, null);
+        mController.updateState(mPreference);
+
+        assertNotNull(mPreference.findViewById(R.id.switch_bar));
+
+        assertFalse(mSwitch.isChecked());
+
+        appRow.banned = false;
+        mController.onResume(appRow, null, null, null);
+        mController.updateState(mPreference);
+
+        assertTrue(mSwitch.isChecked());
+    }
+
+    @Test
+    public void testUpdateState_group() throws Exception {
+        NotificationBackend.AppRow appRow = new NotificationBackend.AppRow();
+        NotificationChannelGroupWrapper group = mock(NotificationChannelGroupWrapper.class);
+        when(group.getGroup()).thenReturn(mock(NotificationChannelGroup.class));
+        when(group.isBlocked()).thenReturn(true);
+        mController.onResume(appRow, null, group, null);
+        mController.updateState(mPreference);
+
+        assertFalse(mSwitch.isChecked());
+
+        appRow.banned = true;
+        mController.onResume(appRow, null, group, null);
+        when(group.isBlocked()).thenReturn(true);
+        mController.updateState(mPreference);
+
+        assertFalse(mSwitch.isChecked());
+
+        appRow.banned = false;
+        mController.onResume(appRow, null, group, null);
+        when(group.isBlocked()).thenReturn(false);
+        mController.updateState(mPreference);
+
+        assertTrue(mSwitch.isChecked());
+    }
+
+    @Test
+    public void testUpdateState_channelBlocked() throws Exception {
+        NotificationBackend.AppRow appRow = new NotificationBackend.AppRow();
+        NotificationChannel channel = new NotificationChannel("a", "a", IMPORTANCE_NONE);
+        mController.onResume(appRow, channel, null, null);
+        mController.updateState(mPreference);
+
+        assertFalse(mSwitch.isChecked());
+
+        appRow.banned = true;
+        channel = new NotificationChannel("a", "a", IMPORTANCE_HIGH);
+        mController.onResume(appRow, channel, null, null);
+        mController.updateState(mPreference);
+
+        assertFalse(mSwitch.isChecked());
+
+        appRow.banned = false;
+        channel = new NotificationChannel("a", "a", IMPORTANCE_HIGH);
+        mController.onResume(appRow, channel, null, null);
+        mController.updateState(mPreference);
+
+        assertTrue(mSwitch.isChecked());
+    }
+
+    @Test
+    public void testUpdateState_noCrashIfCalledTwice() throws Exception {
+        NotificationBackend.AppRow appRow = new NotificationBackend.AppRow();
+        NotificationChannel channel = new NotificationChannel("a", "a", IMPORTANCE_LOW);
+        mController.onResume(appRow, channel, null, null);
+        mController.updateState(mPreference);
+        mController.updateState(mPreference);
+    }
+
+    @Test
+    public void testUpdateState_doesNotResetImportance() throws Exception {
+        NotificationBackend.AppRow appRow = new NotificationBackend.AppRow();
+        NotificationChannel channel = new NotificationChannel("a", "a", IMPORTANCE_LOW);
+        mController.onResume(appRow, channel, null, null);
+        mController.updateState(mPreference);
+
+        assertEquals(IMPORTANCE_LOW, channel.getImportance());
+    }
+
+    @Test
+    public void testOnSwitchChanged_channel_default() throws Exception {
+        NotificationBackend.AppRow appRow = new NotificationBackend.AppRow();
+        NotificationChannel channel =
+                new NotificationChannel(DEFAULT_CHANNEL_ID, "a", IMPORTANCE_UNSPECIFIED);
+        mController.onResume(appRow, channel, null, null);
+        mController.updateState(mPreference);
+
+        mController.onSwitchChanged(null, false);
+        assertEquals(IMPORTANCE_NONE, channel.getImportance());
+
+        mController.onSwitchChanged(null, true);
+        assertEquals(IMPORTANCE_UNSPECIFIED, channel.getImportance());
+
+        verify(mBackend, times(2)).updateChannel(any(), anyInt(), any());
+
+    }
+
+    @Test
+    public void testOnSwitchChanged_channel_nonDefault() throws Exception {
+        NotificationBackend.AppRow appRow = new NotificationBackend.AppRow();
+        NotificationChannel channel = new NotificationChannel("a", "a", IMPORTANCE_HIGH);
+        mController.onResume(appRow, channel, null, null);
+        mController.updateState(mPreference);
+
+        mController.onSwitchChanged(null, false);
+        assertEquals(IMPORTANCE_NONE, channel.getImportance());
+
+        mController.onSwitchChanged(null, true);
+        assertEquals(IMPORTANCE_DEFAULT, channel.getImportance());
+
+        verify(mBackend, times(2)).updateChannel(any(), anyInt(), any());
+    }
+}
diff --git a/tests/robotests/src/com/android/settings/notification/BootSoundPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/BootSoundPreferenceControllerTest.java
index 58ba46b..3157d31 100644
--- a/tests/robotests/src/com/android/settings/notification/BootSoundPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/notification/BootSoundPreferenceControllerTest.java
@@ -38,7 +38,7 @@
 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_O)
 public class BootSoundPreferenceControllerTest {
 
     @Mock(answer = Answers.RETURNS_DEEP_STUBS)
diff --git a/tests/robotests/src/com/android/settings/notification/CastPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/CastPreferenceControllerTest.java
index ed9cc98..faace1b 100644
--- a/tests/robotests/src/com/android/settings/notification/CastPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/notification/CastPreferenceControllerTest.java
@@ -36,7 +36,7 @@
 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_O)
 public class CastPreferenceControllerTest {
 
     @Mock
diff --git a/tests/robotests/src/com/android/settings/notification/ChargingSoundPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/ChargingSoundPreferenceControllerTest.java
index 2b2d024..e8d945b 100644
--- a/tests/robotests/src/com/android/settings/notification/ChargingSoundPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/notification/ChargingSoundPreferenceControllerTest.java
@@ -39,7 +39,7 @@
 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_O)
 public class ChargingSoundPreferenceControllerTest {
 
     @Mock
diff --git a/tests/robotests/src/com/android/settings/notification/ConfigureNotificationSettingsTest.java b/tests/robotests/src/com/android/settings/notification/ConfigureNotificationSettingsTest.java
index 8cf8f83..afdc355 100644
--- a/tests/robotests/src/com/android/settings/notification/ConfigureNotificationSettingsTest.java
+++ b/tests/robotests/src/com/android/settings/notification/ConfigureNotificationSettingsTest.java
@@ -40,7 +40,7 @@
 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_O)
 public class ConfigureNotificationSettingsTest {
 
     private Context mContext;
diff --git a/tests/robotests/src/com/android/settings/notification/DeletedChannelsPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/DeletedChannelsPreferenceControllerTest.java
new file mode 100644
index 0000000..2742d0d
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/notification/DeletedChannelsPreferenceControllerTest.java
@@ -0,0 +1,129 @@
+/*
+ * Copyright (C) 2017 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF 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 junit.framework.Assert.assertFalse;
+import static junit.framework.Assert.assertTrue;
+
+import static org.mockito.ArgumentMatchers.anyInt;
+import static org.mockito.Mockito.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;
+
+import android.app.NotificationChannel;
+import android.app.NotificationManager;
+import android.content.Context;
+import android.os.UserManager;
+import android.support.v7.preference.Preference;
+
+import com.android.settings.TestConfig;
+import com.android.settings.wrapper.NotificationChannelGroupWrapper;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.ArgumentCaptor;
+import org.mockito.Mock;
+import org.mockito.MockitoAnnotations;
+import org.robolectric.RobolectricTestRunner;
+import org.robolectric.annotation.Config;
+import org.robolectric.shadows.ShadowApplication;
+
+@RunWith(RobolectricTestRunner.class)
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION_O)
+public class DeletedChannelsPreferenceControllerTest {
+
+    private Context mContext;
+    @Mock
+    private NotificationBackend mBackend;
+    @Mock
+    private NotificationManager mNm;
+    @Mock
+    private UserManager mUm;
+
+    private DeletedChannelsPreferenceController mController;
+
+    @Before
+    public void setUp() {
+        MockitoAnnotations.initMocks(this);
+        ShadowApplication shadowApplication = ShadowApplication.getInstance();
+        shadowApplication.setSystemService(Context.NOTIFICATION_SERVICE, mNm);
+        shadowApplication.setSystemService(Context.USER_SERVICE, mUm);
+        mContext = shadowApplication.getApplicationContext();
+        mController = new DeletedChannelsPreferenceController(mContext, mBackend);
+    }
+
+    @Test
+    public void noCrashIfNoOnResume() throws Exception {
+        mController.isAvailable();
+        mController.updateState(mock(Preference.class));
+    }
+
+    @Test
+    public void isAvailable_appScreen_notIfAppBlocked() throws Exception {
+        NotificationBackend.AppRow appRow = new NotificationBackend.AppRow();
+        appRow.banned = true;
+        mController.onResume(appRow, null, null, null);
+        assertFalse(mController.isAvailable());
+    }
+
+    @Test
+    public void isAvailable_groupScreen_never() throws Exception {
+        NotificationBackend.AppRow appRow = new NotificationBackend.AppRow();
+        mController.onResume(appRow, null, mock(NotificationChannelGroupWrapper.class), null);
+        assertFalse(mController.isAvailable());
+    }
+
+    @Test
+    public void isAvailable_channelScreen_never() throws Exception {
+        mController.onResume(
+                new NotificationBackend.AppRow(), mock(NotificationChannel.class), null, null);
+        assertFalse(mController.isAvailable());
+    }
+
+    @Test
+    public void isAvailable_appScreen_notIfNoDeletedChannels() throws Exception {
+        when(mBackend.getDeletedChannelCount(any(), anyInt())).thenReturn(0);
+        mController.onResume(new NotificationBackend.AppRow(), null, null, null);
+        assertFalse(mController.isAvailable());
+    }
+
+    @Test
+    public void isAvailable_appScreen() throws Exception {
+        when(mBackend.getDeletedChannelCount(any(), anyInt())).thenReturn(1);
+        mController.onResume(new NotificationBackend.AppRow(), null, null, null);
+        assertTrue(mController.isAvailable());
+    }
+
+    @Test
+    public void updateState() throws Exception {
+        when(mBackend.getDeletedChannelCount(any(), anyInt())).thenReturn(1);
+        mController.onResume(new NotificationBackend.AppRow(), null, null, null);
+
+        Preference pref = mock(Preference.class);
+        mController.updateState(pref);
+
+        verify(pref, times(1)).setEnabled(false);
+        verify(pref, times(1)).setSelectable(false);
+        verify(mBackend, times(1)).getDeletedChannelCount(any(), anyInt());
+        ArgumentCaptor<CharSequence> argumentCaptor = ArgumentCaptor.forClass(CharSequence.class);
+        verify(pref, times(1)).setTitle(argumentCaptor.capture());
+        assertTrue(argumentCaptor.getValue().toString().contains("1"));
+    }
+}
diff --git a/tests/robotests/src/com/android/settings/notification/DescriptionPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/DescriptionPreferenceControllerTest.java
new file mode 100644
index 0000000..7f695f3
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/notification/DescriptionPreferenceControllerTest.java
@@ -0,0 +1,175 @@
+/*
+ * Copyright (C) 2017 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF 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 android.app.NotificationChannel.DEFAULT_CHANNEL_ID;
+import static android.app.NotificationManager.IMPORTANCE_LOW;
+import static android.app.NotificationManager.IMPORTANCE_NONE;
+
+import static junit.framework.Assert.assertFalse;
+import static junit.framework.Assert.assertTrue;
+
+import static org.junit.Assert.assertEquals;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.when;
+
+import android.app.NotificationChannel;
+import android.app.NotificationChannelGroup;
+import android.app.NotificationManager;
+import android.content.Context;
+import android.content.Intent;
+import android.os.Build;
+import android.os.UserManager;
+import android.support.v7.preference.Preference;
+
+import com.android.settings.TestConfig;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
+import com.android.settings.wrapper.NotificationChannelGroupWrapper;
+
+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;
+
+@RunWith(SettingsRobolectricTestRunner.class)
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION_O)
+public class DescriptionPreferenceControllerTest {
+
+    private Context mContext;
+    @Mock
+    private NotificationManager mNm;
+    @Mock
+    private UserManager mUm;
+
+    private DescriptionPreferenceController mController;
+
+    @Before
+    public void setUp() {
+        MockitoAnnotations.initMocks(this);
+        ShadowApplication shadowApplication = ShadowApplication.getInstance();
+        shadowApplication.setSystemService(Context.NOTIFICATION_SERVICE, mNm);
+        shadowApplication.setSystemService(Context.USER_SERVICE, mUm);
+        mContext = shadowApplication.getApplicationContext();
+        mController = spy(new DescriptionPreferenceController(mContext));
+    }
+
+    @Test
+    public void testNoCrashIfNoOnResume() throws Exception {
+        mController.isAvailable();
+        mController.updateState(mock(Preference.class));
+    }
+
+    @Test
+    public void testIsAvailable_notIfNull() throws Exception {
+        mController.onResume(null, null, null, null);
+        assertFalse(mController.isAvailable());
+    }
+
+    @Test
+    public void testIsAvailable_notIfChannelGroupBlocked() throws Exception {
+        NotificationBackend.AppRow appRow = new NotificationBackend.AppRow();
+        NotificationChannelGroupWrapper group = mock(NotificationChannelGroupWrapper.class);
+        when(group.isBlocked()).thenReturn(true);
+        mController.onResume(appRow, null, group, null);
+        assertFalse(mController.isAvailable());
+    }
+
+    @Test
+    public void testIsAvailable_notIfChannelBlocked() throws Exception {
+        NotificationBackend.AppRow appRow = new NotificationBackend.AppRow();
+        NotificationChannel channel = mock(NotificationChannel.class);
+        when(channel.getImportance()).thenReturn(IMPORTANCE_NONE);
+        mController.onResume(appRow, channel, null, null);
+        assertFalse(mController.isAvailable());
+    }
+
+    @Test
+    public void testIsAvailable_notIfNoChannelDesc() throws Exception {
+        NotificationBackend.AppRow appRow = new NotificationBackend.AppRow();
+        NotificationChannel channel = mock(NotificationChannel.class);
+        when(channel.getImportance()).thenReturn(IMPORTANCE_LOW);
+        mController.onResume(appRow, channel, null, null);
+        assertFalse(mController.isAvailable());
+    }
+
+    @Test
+    public void testIsAvailable_notIfNoChannelGroupDesc() throws Exception {
+        NotificationBackend.AppRow appRow = new NotificationBackend.AppRow();
+        NotificationChannelGroupWrapper group = mock(NotificationChannelGroupWrapper.class);
+        when(group.getGroup()).thenReturn(mock(NotificationChannelGroup.class));
+        mController.onResume(appRow, null, group, null);
+        assertFalse(mController.isAvailable());
+    }
+
+    @Test
+    public void testIsAvailable_channel() throws Exception {
+        NotificationBackend.AppRow appRow = new NotificationBackend.AppRow();
+        NotificationChannel channel = mock(NotificationChannel.class);
+        when(channel.getImportance()).thenReturn(IMPORTANCE_LOW);
+        when(channel.getDescription()).thenReturn("AAA");
+        mController.onResume(appRow, channel, null, null);
+        assertTrue(mController.isAvailable());
+    }
+
+    @Test
+    public void testIsAvailable_channelGroup() throws Exception {
+        NotificationBackend.AppRow appRow = new NotificationBackend.AppRow();
+        NotificationChannelGroupWrapper group = mock(NotificationChannelGroupWrapper.class);
+        when(group.getGroup()).thenReturn(mock(NotificationChannelGroup.class));
+        when(group.getDescription()).thenReturn("something");
+        when(group.isBlocked()).thenReturn(false);
+        mController.onResume(appRow, null, group, null);
+        assertTrue(mController.isAvailable());
+    }
+
+    @Test
+    public void testUpdateState_channel() throws Exception {
+        NotificationBackend.AppRow appRow = new NotificationBackend.AppRow();
+        NotificationChannel channel = mock(NotificationChannel.class);
+        when(channel.getImportance()).thenReturn(IMPORTANCE_LOW);
+        when(channel.getDescription()).thenReturn("AAA");
+        mController.onResume(appRow, channel, null, null);
+
+        Preference pref = new Preference(RuntimeEnvironment.application);
+        mController.updateState(pref);
+
+        assertEquals("AAA", pref.getTitle());
+        assertFalse(pref.isEnabled());
+        assertFalse(pref.isSelectable());
+    }
+
+    @Test
+    public void testUpdateState_channelGroup() throws Exception {
+        NotificationBackend.AppRow appRow = new NotificationBackend.AppRow();
+        NotificationChannelGroupWrapper group = mock(NotificationChannelGroupWrapper.class);
+        when(group.getGroup()).thenReturn(mock(NotificationChannelGroup.class));
+        when(group.getDescription()).thenReturn("something");
+        mController.onResume(appRow, null, group, null);
+
+        Preference pref = new Preference(RuntimeEnvironment.application);
+        mController.updateState(pref);
+
+        assertEquals("something", pref.getTitle());
+        assertFalse(pref.isEnabled());
+        assertFalse(pref.isSelectable());
+    }
+}
diff --git a/tests/robotests/src/com/android/settings/notification/DialPadTonePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/DialPadTonePreferenceControllerTest.java
index 4ec67e6..3400181 100644
--- a/tests/robotests/src/com/android/settings/notification/DialPadTonePreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/notification/DialPadTonePreferenceControllerTest.java
@@ -40,7 +40,7 @@
 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_O)
 public class DialPadTonePreferenceControllerTest {
 
     @Mock
diff --git a/tests/robotests/src/com/android/settings/notification/DndPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/DndPreferenceControllerTest.java
new file mode 100644
index 0000000..428f536
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/notification/DndPreferenceControllerTest.java
@@ -0,0 +1,240 @@
+/*
+ * Copyright (C) 2017 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF 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 android.app.NotificationChannel.DEFAULT_CHANNEL_ID;
+import static android.app.NotificationManager.IMPORTANCE_DEFAULT;
+import static android.app.NotificationManager.IMPORTANCE_HIGH;
+import static android.app.NotificationManager.IMPORTANCE_LOW;
+import static android.app.NotificationManager.IMPORTANCE_MIN;
+import static android.app.NotificationManager.IMPORTANCE_NONE;
+import static android.app.NotificationManager.IMPORTANCE_UNSPECIFIED;
+
+import static junit.framework.Assert.assertFalse;
+import static junit.framework.Assert.assertTrue;
+
+import static org.junit.Assert.assertEquals;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.anyInt;
+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.NotificationChannel;
+import android.app.NotificationManager;
+import android.content.Context;
+import android.os.Build;
+import android.os.UserManager;
+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.RestrictedLockUtils;
+import com.android.settingslib.RestrictedSwitchPreference;
+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.shadows.ShadowApplication;
+
+@RunWith(SettingsRobolectricTestRunner.class)
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION_O)
+public class DndPreferenceControllerTest {
+
+    private Context mContext;
+    @Mock
+    private NotificationBackend mBackend;
+    @Mock
+    private NotificationManager mNm;
+    @Mock
+    private UserManager mUm;
+    @Mock(answer = Answers.RETURNS_DEEP_STUBS)
+    private PreferenceScreen mScreen;
+    @Mock
+    private Lifecycle mLifecycle;
+
+    private DndPreferenceController mController;
+
+    @Before
+    public void setUp() {
+        MockitoAnnotations.initMocks(this);
+        ShadowApplication shadowApplication = ShadowApplication.getInstance();
+        shadowApplication.setSystemService(Context.NOTIFICATION_SERVICE, mNm);
+        shadowApplication.setSystemService(Context.USER_SERVICE, mUm);
+        mContext = shadowApplication.getApplicationContext();
+        mController = spy(new DndPreferenceController(mContext, mLifecycle, mBackend));
+    }
+
+    @Test
+    public void testNoCrashIfNoOnResume() throws Exception {
+        mController.isAvailable();
+        mController.updateState(mock(RestrictedSwitchPreference.class));
+        mController.onPreferenceChange(mock(RestrictedSwitchPreference.class), true);
+        mController.onResume();
+    }
+
+    @Test
+    public void testIsAvailable_notIfNotImportant_noVisEffects() throws Exception {
+        when(mNm.getNotificationPolicy()).thenReturn(new NotificationManager.Policy(0, 0, 0, 0));
+        NotificationBackend.AppRow appRow = new NotificationBackend.AppRow();
+        NotificationChannel channel = new NotificationChannel("", "", IMPORTANCE_LOW);
+        mController.onResume();
+        mController.onResume(appRow, channel, null, null);
+        assertFalse(mController.isAvailable());
+    }
+
+    @Test
+    public void testIsAvailable_notIfNotImportant_visEffects() throws Exception {
+        when(mNm.getNotificationPolicy()).thenReturn(new NotificationManager.Policy(0, 0, 0, 1));
+        NotificationBackend.AppRow appRow = new NotificationBackend.AppRow();
+        NotificationChannel channel = new NotificationChannel("", "", IMPORTANCE_MIN);
+        mController.onResume();
+        mController.onResume(appRow, channel, null, null);
+        assertFalse(mController.isAvailable());
+    }
+
+    @Test
+    public void testIsAvailable_importance_noVisEffects() throws Exception {
+        when(mNm.getNotificationPolicy()).thenReturn(new NotificationManager.Policy(0, 0, 0, 0));
+        NotificationBackend.AppRow appRow = new NotificationBackend.AppRow();
+        NotificationChannel channel = new NotificationChannel("", "", IMPORTANCE_DEFAULT);
+        mController.onResume();
+        mController.onResume(appRow, channel, null, null);
+        assertTrue(mController.isAvailable());
+    }
+
+    @Test
+    public void testIsAvailable_important_visEffects() throws Exception {
+        when(mNm.getNotificationPolicy()).thenReturn(new NotificationManager.Policy(0, 0, 0, 1));
+        assertTrue(mNm.getNotificationPolicy().suppressedVisualEffects != 0);
+        NotificationBackend.AppRow appRow = new NotificationBackend.AppRow();
+        NotificationChannel channel = new NotificationChannel("", "", IMPORTANCE_LOW);
+        mController.onResume();
+        mController.onResume(appRow, channel, null, null);
+        assertTrue(mController.isAvailable());
+    }
+
+    @Test
+    public void testUpdateState_disabledByAdmin() throws Exception {
+        NotificationChannel channel = mock(NotificationChannel.class);
+        when(channel.getId()).thenReturn("something");
+        mController.onResume(new NotificationBackend.AppRow(), channel, null, mock(
+                RestrictedLockUtils.EnforcedAdmin.class));
+
+        Preference pref = new RestrictedSwitchPreference(RuntimeEnvironment.application);
+        mController.updateState(pref);
+
+        assertFalse(pref.isEnabled());
+    }
+
+    @Test
+    public void testUpdateState_notConfigurable() throws Exception {
+        String lockedId = "locked";
+        NotificationBackend.AppRow appRow = new NotificationBackend.AppRow();
+        appRow.lockedChannelId = lockedId;
+        NotificationChannel channel = mock(NotificationChannel.class);
+        when(channel.getId()).thenReturn(lockedId);
+        mController.onResume(appRow, channel, null, null);
+
+        Preference pref = new RestrictedSwitchPreference(RuntimeEnvironment.application);
+        mController.updateState(pref);
+
+        assertFalse(pref.isEnabled());
+    }
+
+    @Test
+    public void testUpdateState_configurable() throws Exception {
+        NotificationBackend.AppRow appRow = new NotificationBackend.AppRow();
+        NotificationChannel channel = mock(NotificationChannel.class);
+        when(channel.getId()).thenReturn("something");
+        mController.onResume(appRow, channel, null, null);
+
+        Preference pref = new RestrictedSwitchPreference(RuntimeEnvironment.application);
+        mController.updateState(pref);
+
+        assertTrue(pref.isEnabled());
+    }
+
+    @Test
+    public void testUpdateState_bypassDnd() throws Exception {
+        NotificationChannel channel = mock(NotificationChannel.class);
+        when(channel.canBypassDnd()).thenReturn(true);
+        mController.onResume(new NotificationBackend.AppRow(), channel, null, null);
+
+        RestrictedSwitchPreference pref =
+                new RestrictedSwitchPreference(RuntimeEnvironment.application);
+        mController.updateState(pref);
+        assertTrue(pref.isChecked());
+    }
+
+    @Test
+    public void testUpdateState_noBypassDnd() throws Exception {
+        NotificationChannel channel = mock(NotificationChannel.class);
+        when(channel.canBypassDnd()).thenReturn(false);
+        mController.onResume(new NotificationBackend.AppRow(), channel, null, null);
+
+        RestrictedSwitchPreference pref =
+                new RestrictedSwitchPreference(RuntimeEnvironment.application);
+        mController.updateState(pref);
+        assertFalse(pref.isChecked());
+    }
+
+    @Test
+    public void testOnPreferenceChange_on() {
+        NotificationChannel channel =
+                new NotificationChannel(DEFAULT_CHANNEL_ID, "a", IMPORTANCE_LOW);
+        mController.onResume(new NotificationBackend.AppRow(), channel, null, null);
+
+        RestrictedSwitchPreference pref =
+                new RestrictedSwitchPreference(RuntimeEnvironment.application);
+        when(mScreen.findPreference(mController.getPreferenceKey())).thenReturn(pref);
+        mController.displayPreference(mScreen);
+        mController.updateState(pref);
+
+        mController.onPreferenceChange(pref, true);
+
+        assertTrue(channel.canBypassDnd());
+        verify(mBackend, times(1)).updateChannel(any(), anyInt(), any());
+    }
+
+    @Test
+    public void testOnPreferenceChange_off() {
+        NotificationChannel channel =
+                new NotificationChannel(DEFAULT_CHANNEL_ID, "a", IMPORTANCE_HIGH);
+        mController.onResume(new NotificationBackend.AppRow(), channel, null, null);
+
+        RestrictedSwitchPreference pref =
+                new RestrictedSwitchPreference(RuntimeEnvironment.application);
+        when(mScreen.findPreference(mController.getPreferenceKey())).thenReturn(pref);
+        mController.displayPreference(mScreen);
+        mController.updateState(pref);
+
+        mController.onPreferenceChange(pref, false);
+
+        assertFalse(channel.canBypassDnd());
+        verify(mBackend, times(1)).updateChannel(any(), anyInt(), any());
+    }
+}
diff --git a/tests/robotests/src/com/android/settings/notification/DockAudioMediaPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/DockAudioMediaPreferenceControllerTest.java
index 58e5636..0634cef 100644
--- a/tests/robotests/src/com/android/settings/notification/DockAudioMediaPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/notification/DockAudioMediaPreferenceControllerTest.java
@@ -41,7 +41,7 @@
 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_O)
 public class DockAudioMediaPreferenceControllerTest {
 
     @Mock
diff --git a/tests/robotests/src/com/android/settings/notification/DockingSoundPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/DockingSoundPreferenceControllerTest.java
index d6a277f..517b722 100644
--- a/tests/robotests/src/com/android/settings/notification/DockingSoundPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/notification/DockingSoundPreferenceControllerTest.java
@@ -40,7 +40,7 @@
 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_O)
 public class DockingSoundPreferenceControllerTest {
 
     @Mock
diff --git a/tests/robotests/src/com/android/settings/notification/EmergencyBroadcastPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/EmergencyBroadcastPreferenceControllerTest.java
index 24f4b6c..6a7be85 100644
--- a/tests/robotests/src/com/android/settings/notification/EmergencyBroadcastPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/notification/EmergencyBroadcastPreferenceControllerTest.java
@@ -41,7 +41,7 @@
 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_O)
 public class EmergencyBroadcastPreferenceControllerTest {
 
     private static final String PREF_TEST_KEY = "test_key";
diff --git a/tests/robotests/src/com/android/settings/notification/EmergencyTonePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/EmergencyTonePreferenceControllerTest.java
index c3e887f..9e35ad9 100644
--- a/tests/robotests/src/com/android/settings/notification/EmergencyTonePreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/notification/EmergencyTonePreferenceControllerTest.java
@@ -40,7 +40,7 @@
 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_O)
 public class EmergencyTonePreferenceControllerTest {
 
     @Mock
diff --git a/tests/robotests/src/com/android/settings/notification/HeaderPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/HeaderPreferenceControllerTest.java
new file mode 100644
index 0000000..f6b7e00
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/notification/HeaderPreferenceControllerTest.java
@@ -0,0 +1,146 @@
+/*
+ * Copyright (C) 2017 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF 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 android.app.NotificationManager.IMPORTANCE_NONE;
+
+import static junit.framework.Assert.assertFalse;
+import static junit.framework.Assert.assertTrue;
+
+import static org.junit.Assert.assertEquals;
+import static org.mockito.ArgumentMatchers.anyInt;
+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.NotificationChannel;
+import android.app.NotificationChannelGroup;
+import android.app.NotificationManager;
+import android.content.Context;
+import android.os.Build;
+import android.os.UserManager;
+import android.support.v14.preference.PreferenceFragment;
+import android.view.View;
+
+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.wrapper.NotificationChannelGroupWrapper;
+
+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_O)
+public class HeaderPreferenceControllerTest {
+
+    private Context mContext;
+    @Mock
+    private NotificationManager mNm;
+    @Mock
+    private UserManager mUm;
+
+    private HeaderPreferenceController mController;
+    @Mock
+    private LayoutPreference mPreference;
+    @Mock
+    private View mView;
+
+    @Before
+    public void setUp() {
+        MockitoAnnotations.initMocks(this);
+        ShadowApplication shadowApplication = ShadowApplication.getInstance();
+        shadowApplication.setSystemService(Context.NOTIFICATION_SERVICE, mNm);
+        shadowApplication.setSystemService(Context.USER_SERVICE, mUm);
+        mContext = shadowApplication.getApplicationContext();
+        PreferenceFragment fragment = mock(PreferenceFragment.class);
+        when(fragment.getContext()).thenReturn(mContext);
+        Activity activity = mock(Activity.class);
+        when(activity.getApplicationContext()).thenReturn(mContext);
+        when(fragment.getActivity()).thenReturn(activity);
+        mController = spy(new HeaderPreferenceController(mContext, fragment));
+        when(mPreference.findViewById(anyInt())).thenReturn(mView);
+    }
+
+    @Test
+    public void testNoCrashIfNoOnResume() throws Exception {
+        mController.isAvailable();
+        mController.updateState(mock(LayoutPreference.class));
+    }
+
+    @Test
+    public void testIsAvailable_notIfNull() throws Exception {
+        mController.onResume(null, null, null, null);
+        assertFalse(mController.isAvailable());
+    }
+
+    @Test
+    public void testIsAvailable() throws Exception {
+        NotificationBackend.AppRow appRow = new NotificationBackend.AppRow();
+        appRow.banned = true;
+        mController.onResume(appRow, null, null, null);
+        assertTrue(mController.isAvailable());
+    }
+
+    @Test
+    public void testGetLabel() throws Exception {
+        NotificationBackend.AppRow appRow = new NotificationBackend.AppRow();
+        appRow.label = "bananas";
+        mController.onResume(appRow, null, null, null);
+        assertEquals(appRow.label, mController.getLabel());
+
+        NotificationChannelGroup group = new NotificationChannelGroup("id", "name");
+        NotificationChannelGroupWrapper gWrapper = new NotificationChannelGroupWrapper(group);
+        mController.onResume(appRow, null, gWrapper, null);
+        assertEquals(group.getName(), mController.getLabel());
+
+        NotificationChannel channel = new NotificationChannel("cid", "cname", IMPORTANCE_NONE);
+        mController.onResume(appRow, channel, gWrapper, null);
+        assertEquals(channel.getName(), mController.getLabel());
+    }
+
+    @Test
+    public void testGetSummary() throws Exception {
+        NotificationBackend.AppRow appRow = new NotificationBackend.AppRow();
+        appRow.label = "bananas";
+        mController.onResume(appRow, null, null, null);
+        assertEquals("", mController.getSummary());
+
+        NotificationChannelGroup group = new NotificationChannelGroup("id", "name");
+        NotificationChannelGroupWrapper gWrapper = new NotificationChannelGroupWrapper(group);
+        mController.onResume(appRow, null, gWrapper, null);
+        assertEquals(appRow.label, mController.getSummary());
+
+        NotificationChannel channel = new NotificationChannel("cid", "cname", IMPORTANCE_NONE);
+        mController.onResume(appRow, channel, gWrapper, null);
+        assertTrue(mController.getSummary().toString().contains(group.getName()));
+        assertTrue(mController.getSummary().toString().contains(appRow.label));
+
+        mController.onResume(appRow, channel, null, null);
+        assertFalse(mController.getSummary().toString().contains(group.getName()));
+        assertTrue(mController.getSummary().toString().contains(appRow.label));
+    }
+}
diff --git a/tests/robotests/src/com/android/settings/notification/ImportancePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/ImportancePreferenceControllerTest.java
new file mode 100644
index 0000000..d04a4c6
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/notification/ImportancePreferenceControllerTest.java
@@ -0,0 +1,166 @@
+/*
+ * Copyright (C) 2017 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.notification;
+
+import static android.app.NotificationChannel.DEFAULT_CHANNEL_ID;
+import static android.app.NotificationManager.IMPORTANCE_HIGH;
+import static android.app.NotificationManager.IMPORTANCE_LOW;
+import static android.app.NotificationManager.IMPORTANCE_NONE;
+
+import static junit.framework.Assert.assertFalse;
+import static junit.framework.Assert.assertNull;
+import static junit.framework.Assert.assertTrue;
+
+import static org.junit.Assert.assertNotNull;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.when;
+
+import android.app.NotificationChannel;
+import android.app.NotificationManager;
+import android.content.Context;
+import android.os.Build;
+import android.os.UserManager;
+import android.support.v7.preference.Preference;
+import android.text.TextUtils;
+
+import com.android.settings.TestConfig;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
+import com.android.settingslib.RestrictedLockUtils;
+
+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;
+
+@RunWith(SettingsRobolectricTestRunner.class)
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION_O)
+public class ImportancePreferenceControllerTest {
+
+    private Context mContext;
+    @Mock
+    private NotificationManager mNm;
+    @Mock
+    private UserManager mUm;
+
+    private ImportancePreferenceController mController;
+
+    @Before
+    public void setUp() {
+        MockitoAnnotations.initMocks(this);
+        ShadowApplication shadowApplication = ShadowApplication.getInstance();
+        shadowApplication.setSystemService(Context.NOTIFICATION_SERVICE, mNm);
+        shadowApplication.setSystemService(Context.USER_SERVICE, mUm);
+        mContext = shadowApplication.getApplicationContext();
+        mController = spy(new ImportancePreferenceController(mContext));
+    }
+
+    @Test
+    public void testNoCrashIfNoOnResume() throws Exception {
+        mController.isAvailable();
+        mController.updateState(mock(Preference.class));
+    }
+
+    @Test
+    public void testIsAvailable_notIfNull() throws Exception {
+        mController.onResume(null, null, null, null);
+        assertFalse(mController.isAvailable());
+    }
+
+    @Test
+    public void testIsAvailable_notIfAppBlocked() throws Exception {
+        NotificationBackend.AppRow appRow = new NotificationBackend.AppRow();
+        appRow.banned = true;
+        mController.onResume(appRow, mock(NotificationChannel.class), null, null);
+        assertFalse(mController.isAvailable());
+    }
+
+    @Test
+    public void testIsAvailable_notIfChannelBlocked() throws Exception {
+        NotificationBackend.AppRow appRow = new NotificationBackend.AppRow();
+        NotificationChannel channel = mock(NotificationChannel.class);
+        when(channel.getImportance()).thenReturn(IMPORTANCE_NONE);
+        mController.onResume(appRow, channel, null, null);
+        assertFalse(mController.isAvailable());
+    }
+
+    @Test
+    public void testIsAvailable_notForDefaultChannel() throws Exception {
+        NotificationBackend.AppRow appRow = new NotificationBackend.AppRow();
+        NotificationChannel channel = mock(NotificationChannel.class);
+        when(channel.getImportance()).thenReturn(IMPORTANCE_LOW);
+        when(channel.getId()).thenReturn(DEFAULT_CHANNEL_ID);
+        mController.onResume(appRow, channel, null, null);
+        assertFalse(mController.isAvailable());
+    }
+
+    @Test
+    public void testIsAvailable() throws Exception {
+        NotificationBackend.AppRow appRow = new NotificationBackend.AppRow();
+        NotificationChannel channel = mock(NotificationChannel.class);
+        when(channel.getImportance()).thenReturn(IMPORTANCE_LOW);
+        mController.onResume(appRow, channel, null, null);
+        assertTrue(mController.isAvailable());
+    }
+
+    @Test
+    public void testUpdateState_disabledByAdmin() throws Exception {
+        NotificationChannel channel = mock(NotificationChannel.class);
+        mController.onResume(new NotificationBackend.AppRow(), channel, null, mock(
+                RestrictedLockUtils.EnforcedAdmin.class));
+
+        Preference pref = new Preference(RuntimeEnvironment.application);
+        mController.updateState(pref);
+
+        assertFalse(pref.isEnabled());
+        assertNull(pref.getIntent());
+    }
+
+    @Test
+    public void testUpdateState_notConfigurable() throws Exception {
+        String lockedId = "locked";
+        NotificationBackend.AppRow appRow = new NotificationBackend.AppRow();
+        appRow.lockedChannelId = lockedId;
+        NotificationChannel channel = mock(NotificationChannel.class);
+        when(channel.getId()).thenReturn(lockedId);
+        mController.onResume(appRow, channel, null, null);
+
+        Preference pref = new Preference(RuntimeEnvironment.application);
+        mController.updateState(pref);
+
+        assertFalse(pref.isEnabled());
+        assertNull(pref.getIntent());
+    }
+
+    @Test
+    public void testUpdateState() throws Exception {
+        NotificationBackend.AppRow appRow = new NotificationBackend.AppRow();
+        NotificationChannel channel = new NotificationChannel("", "", IMPORTANCE_HIGH);
+        mController.onResume(appRow, channel, null, null);
+
+        Preference pref = new Preference(RuntimeEnvironment.application);
+        mController.updateState(pref);
+
+        assertTrue(pref.isEnabled());
+        assertNotNull(pref.getIntent());
+        assertFalse(TextUtils.isEmpty(pref.getSummary()));
+    }
+}
diff --git a/tests/robotests/src/com/android/settings/notification/LightsPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/LightsPreferenceControllerTest.java
new file mode 100644
index 0000000..0f3a37d
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/notification/LightsPreferenceControllerTest.java
@@ -0,0 +1,245 @@
+/*
+ * Copyright (C) 2017 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF 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 android.app.NotificationChannel.DEFAULT_CHANNEL_ID;
+import static android.app.NotificationManager.IMPORTANCE_DEFAULT;
+import static android.app.NotificationManager.IMPORTANCE_HIGH;
+import static android.app.NotificationManager.IMPORTANCE_LOW;
+import static android.provider.Settings.System.NOTIFICATION_LIGHT_PULSE;
+
+import static junit.framework.Assert.assertFalse;
+import static junit.framework.Assert.assertTrue;
+
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.anyInt;
+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.NotificationChannel;
+import android.app.NotificationManager;
+import android.content.Context;
+import android.os.Build;
+import android.os.UserManager;
+import android.provider.Settings;
+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.settings.testutils.shadow.SettingsShadowResources;
+import com.android.settingslib.RestrictedLockUtils;
+import com.android.settingslib.RestrictedSwitchPreference;
+
+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;
+
+@RunWith(SettingsRobolectricTestRunner.class)
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION_O, shadows = {
+        SettingsShadowResources.class,
+})
+public class LightsPreferenceControllerTest {
+
+    private Context mContext;
+    @Mock
+    private NotificationBackend mBackend;
+    @Mock
+    private NotificationManager mNm;
+    @Mock
+    private UserManager mUm;
+    @Mock(answer = Answers.RETURNS_DEEP_STUBS)
+    private PreferenceScreen mScreen;
+
+    private LightsPreferenceController mController;
+
+    @Before
+    public void setUp() {
+        MockitoAnnotations.initMocks(this);
+        ShadowApplication shadowApplication = ShadowApplication.getInstance();
+        shadowApplication.setSystemService(Context.NOTIFICATION_SERVICE, mNm);
+        shadowApplication.setSystemService(Context.USER_SERVICE, mUm);
+        mContext = shadowApplication.getApplicationContext();
+        mController = spy(new LightsPreferenceController(mContext, mBackend));
+
+        // By default allow lights
+        SettingsShadowResources.overrideResource(
+                com.android.internal.R.bool.config_intrusiveNotificationLed, true);
+        Settings.Secure.putInt(mContext.getContentResolver(), NOTIFICATION_LIGHT_PULSE, 1);
+    }
+
+    @Test
+    public void testNoCrashIfNoOnResume() throws Exception {
+        mController.isAvailable();
+        mController.updateState(mock(RestrictedSwitchPreference.class));
+        mController.onPreferenceChange(mock(RestrictedSwitchPreference.class), true);
+    }
+
+    @Test
+    public void testIsAvailable_notIfConfigNotAllowed() throws Exception {
+        SettingsShadowResources.overrideResource(
+                com.android.internal.R.bool.config_intrusiveNotificationLed, false);
+        NotificationBackend.AppRow appRow = new NotificationBackend.AppRow();
+        NotificationChannel channel = new NotificationChannel("", "", IMPORTANCE_DEFAULT);
+        mController.onResume(appRow, channel, null, null);
+        assertFalse(mController.isAvailable());
+    }
+
+    @Test
+    public void testIsAvailable_notIfSettingNotAllowed() throws Exception {
+        Settings.Secure.putInt(mContext.getContentResolver(), NOTIFICATION_LIGHT_PULSE, 0);
+        NotificationBackend.AppRow appRow = new NotificationBackend.AppRow();
+        NotificationChannel channel = new NotificationChannel("", "", IMPORTANCE_DEFAULT);
+        mController.onResume(appRow, channel, null, null);
+        assertFalse(mController.isAvailable());
+    }
+
+    @Test
+    public void testIsAvailable_notIfNotImportant() throws Exception {
+        NotificationBackend.AppRow appRow = new NotificationBackend.AppRow();
+        NotificationChannel channel = new NotificationChannel("", "", IMPORTANCE_LOW);
+        mController.onResume(appRow, channel, null, null);
+        assertFalse(mController.isAvailable());
+    }
+
+    @Test
+    public void testIsAvailable_notIfDefaultChannel() throws Exception {
+        NotificationBackend.AppRow appRow = new NotificationBackend.AppRow();
+        NotificationChannel channel =
+                new NotificationChannel(DEFAULT_CHANNEL_ID, "", IMPORTANCE_DEFAULT);
+        mController.onResume(appRow, channel, null, null);
+        assertFalse(mController.isAvailable());
+    }
+
+    @Test
+    public void testIsAvailable() throws Exception {
+        NotificationBackend.AppRow appRow = new NotificationBackend.AppRow();
+        NotificationChannel channel = new NotificationChannel("", "", IMPORTANCE_DEFAULT);
+        mController.onResume(appRow, channel, null, null);
+        assertTrue(mController.isAvailable());
+    }
+
+    @Test
+    public void testUpdateState_disabledByAdmin() throws Exception {
+        NotificationChannel channel = mock(NotificationChannel.class);
+        when(channel.getId()).thenReturn("something");
+        mController.onResume(new NotificationBackend.AppRow(), channel, null, mock(
+                RestrictedLockUtils.EnforcedAdmin.class));
+
+        Preference pref = new RestrictedSwitchPreference(RuntimeEnvironment.application);
+        mController.updateState(pref);
+
+        assertFalse(pref.isEnabled());
+    }
+
+    @Test
+    public void testUpdateState_notConfigurable() throws Exception {
+        String lockedId = "locked";
+        NotificationBackend.AppRow appRow = new NotificationBackend.AppRow();
+        appRow.lockedChannelId = lockedId;
+        NotificationChannel channel = mock(NotificationChannel.class);
+        when(channel.getId()).thenReturn(lockedId);
+        mController.onResume(appRow, channel, null, null);
+
+        Preference pref = new RestrictedSwitchPreference(RuntimeEnvironment.application);
+        mController.updateState(pref);
+
+        assertFalse(pref.isEnabled());
+    }
+
+    @Test
+    public void testUpdateState_configurable() throws Exception {
+        NotificationBackend.AppRow appRow = new NotificationBackend.AppRow();
+        NotificationChannel channel = mock(NotificationChannel.class);
+        when(channel.getId()).thenReturn("something");
+        mController.onResume(appRow, channel, null, null);
+
+        Preference pref = new RestrictedSwitchPreference(RuntimeEnvironment.application);
+        mController.updateState(pref);
+
+        assertTrue(pref.isEnabled());
+    }
+
+    @Test
+    public void testUpdateState_lightsOn() throws Exception {
+        NotificationChannel channel = mock(NotificationChannel.class);
+        when(channel.shouldShowLights()).thenReturn(true);
+        mController.onResume(new NotificationBackend.AppRow(), channel, null, null);
+
+        RestrictedSwitchPreference pref =
+                new RestrictedSwitchPreference(RuntimeEnvironment.application);
+        mController.updateState(pref);
+        assertTrue(pref.isChecked());
+    }
+
+    @Test
+    public void testUpdateState_lightsOff() throws Exception {
+        NotificationChannel channel = mock(NotificationChannel.class);
+        when(channel.shouldShowLights()).thenReturn(false);
+        mController.onResume(new NotificationBackend.AppRow(), channel, null, null);
+
+        RestrictedSwitchPreference pref =
+                new RestrictedSwitchPreference(RuntimeEnvironment.application);
+        mController.updateState(pref);
+        assertFalse(pref.isChecked());
+    }
+
+    @Test
+    public void testOnPreferenceChange_on() {
+        NotificationChannel channel =
+                new NotificationChannel(DEFAULT_CHANNEL_ID, "a", IMPORTANCE_DEFAULT);
+        mController.onResume(new NotificationBackend.AppRow(), channel, null, null);
+
+        RestrictedSwitchPreference pref =
+                new RestrictedSwitchPreference(RuntimeEnvironment.application);
+        when(mScreen.findPreference(mController.getPreferenceKey())).thenReturn(pref);
+        mController.displayPreference(mScreen);
+        mController.updateState(pref);
+
+        mController.onPreferenceChange(pref, true);
+
+        assertTrue(channel.shouldShowLights());
+        verify(mBackend, times(1)).updateChannel(any(), anyInt(), any());
+    }
+
+    @Test
+    public void testOnPreferenceChange_off() {
+        NotificationChannel channel =
+                new NotificationChannel(DEFAULT_CHANNEL_ID, "a", IMPORTANCE_HIGH);
+        mController.onResume(new NotificationBackend.AppRow(), channel, null, null);
+
+        RestrictedSwitchPreference pref =
+                new RestrictedSwitchPreference(RuntimeEnvironment.application);
+        when(mScreen.findPreference(mController.getPreferenceKey())).thenReturn(pref);
+        mController.displayPreference(mScreen);
+        mController.updateState(pref);
+
+        mController.onPreferenceChange(pref, false);
+
+        assertFalse(channel.shouldShowLights());
+        verify(mBackend, times(1)).updateChannel(any(), anyInt(), any());
+    }
+}
diff --git a/tests/robotests/src/com/android/settings/notification/MediaVolumePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/MediaVolumePreferenceControllerTest.java
index ca7fc44..30cb158 100644
--- a/tests/robotests/src/com/android/settings/notification/MediaVolumePreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/notification/MediaVolumePreferenceControllerTest.java
@@ -32,7 +32,7 @@
 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_O)
 public class MediaVolumePreferenceControllerTest {
 
     @Mock
diff --git a/tests/robotests/src/com/android/settings/notification/NotificationAccessSettingsTest.java b/tests/robotests/src/com/android/settings/notification/NotificationAccessSettingsTest.java
index d3f66b9..8e74e79 100644
--- a/tests/robotests/src/com/android/settings/notification/NotificationAccessSettingsTest.java
+++ b/tests/robotests/src/com/android/settings/notification/NotificationAccessSettingsTest.java
@@ -36,7 +36,7 @@
 import org.robolectric.annotation.Config;
 
 @RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION_O)
 public class NotificationAccessSettingsTest {
 
     @Mock(answer = Answers.RETURNS_DEEP_STUBS)
diff --git a/tests/robotests/src/com/android/settings/notification/NotificationBackendTest.java b/tests/robotests/src/com/android/settings/notification/NotificationBackendTest.java
index 97c0d94..0fb2e5c 100644
--- a/tests/robotests/src/com/android/settings/notification/NotificationBackendTest.java
+++ b/tests/robotests/src/com/android/settings/notification/NotificationBackendTest.java
@@ -16,21 +16,13 @@
 
 package com.android.settings.notification;
 
-import android.app.NotificationManager;
-import android.app.NotificationManager.Policy;
-import android.content.Context;
-import android.support.v7.preference.Preference;
-
-import com.android.settings.R;
 import com.android.settings.notification.NotificationBackend.AppRow;
 import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
 import org.robolectric.annotation.Config;
 
-import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.mockito.Mock;
 
 import static junit.framework.Assert.assertEquals;
 import static junit.framework.Assert.assertTrue;
@@ -39,7 +31,7 @@
 
 
 @RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION_O)
 public class NotificationBackendTest {
 
     @Test
diff --git a/tests/robotests/src/com/android/settings/notification/NotificationPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/NotificationPreferenceControllerTest.java
new file mode 100644
index 0000000..f4a5924
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/notification/NotificationPreferenceControllerTest.java
@@ -0,0 +1,319 @@
+/*
+ * Copyright (C) 2017 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF 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 android.app.NotificationManager.IMPORTANCE_DEFAULT;
+import static android.app.NotificationManager.IMPORTANCE_HIGH;
+import static android.app.NotificationManager.IMPORTANCE_LOW;
+import static android.app.NotificationManager.IMPORTANCE_MIN;
+import static android.app.NotificationManager.IMPORTANCE_NONE;
+import static android.app.NotificationManager.IMPORTANCE_UNSPECIFIED;
+
+import static junit.framework.Assert.assertFalse;
+import static junit.framework.Assert.assertTrue;
+
+import static org.junit.Assert.assertEquals;
+import static org.mockito.ArgumentMatchers.anyInt;
+import static org.mockito.Mockito.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;
+
+import android.app.NotificationChannel;
+import android.app.NotificationChannelGroup;
+import android.app.NotificationManager;
+import android.content.Context;
+import android.os.Build;
+import android.os.UserManager;
+import android.support.v7.preference.Preference;
+
+import com.android.settings.TestConfig;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
+import com.android.settings.wrapper.NotificationChannelGroupWrapper;
+import com.android.settingslib.RestrictedLockUtils;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Answers;
+import org.mockito.Mock;
+import org.mockito.MockitoAnnotations;
+import org.robolectric.annotation.Config;
+import org.robolectric.shadows.ShadowApplication;
+
+@RunWith(SettingsRobolectricTestRunner.class)
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION_O)
+public class NotificationPreferenceControllerTest {
+
+    @Mock(answer = Answers.RETURNS_DEEP_STUBS)
+    private Context mContext;
+    @Mock
+    private NotificationBackend mBackend;
+    @Mock
+    private NotificationManager mNm;
+    @Mock
+    private UserManager mUm;
+
+    private TestPreferenceController mController;
+
+    @Before
+    public void setUp() {
+        MockitoAnnotations.initMocks(this);
+        ShadowApplication shadowApplication = ShadowApplication.getInstance();
+        shadowApplication.setSystemService(Context.NOTIFICATION_SERVICE, mNm);
+        shadowApplication.setSystemService(Context.USER_SERVICE, mUm);
+        mContext = shadowApplication.getApplicationContext();
+        mController = new TestPreferenceController(mContext, mBackend);
+    }
+
+    @Test
+    public void noCrashIfNoOnResume() throws Exception {
+        mController.isAvailable();
+        mController.updateState(mock(Preference.class));
+        assertFalse(mController.checkCanBeVisible(IMPORTANCE_UNSPECIFIED));
+        mController.saveChannel();
+        assertFalse(mController.isChannelConfigurable());
+        assertFalse(mController.isChannelBlockable());
+        assertFalse(mController.isChannelGroupBlockable());
+    }
+
+    @Test
+    public void isAvailable_notIfNull() throws Exception {
+        mController.onResume(null, null, null, null);
+        assertFalse(mController.isAvailable());
+    }
+
+    @Test
+    public void isAvailable_notIfAppBlocked() throws Exception {
+        NotificationBackend.AppRow appRow = new NotificationBackend.AppRow();
+        appRow.banned = true;
+        mController.onResume(appRow, mock(NotificationChannel.class),
+                mock(NotificationChannelGroupWrapper.class), null);
+        assertFalse(mController.isAvailable());
+    }
+
+    @Test
+    public void isAvailable_notIfChannelBlocked() throws Exception {
+        NotificationBackend.AppRow appRow = new NotificationBackend.AppRow();
+        NotificationChannel channel = mock(NotificationChannel.class);
+        when(channel.getImportance()).thenReturn(IMPORTANCE_NONE);
+
+        mController.onResume(appRow, channel, null, null);
+        assertFalse(mController.isAvailable());
+    }
+
+    @Test
+    public void isAvailable_notIfChannelGroupBlocked() throws Exception {
+        NotificationBackend.AppRow appRow = new NotificationBackend.AppRow();
+        NotificationChannel channel = mock(NotificationChannel.class);
+        NotificationChannelGroupWrapper group = mock(NotificationChannelGroupWrapper.class);
+
+        mController.onResume(appRow, channel, group, null);
+        when(group.isBlocked()).thenReturn(true);
+        assertFalse(mController.isAvailable());
+    }
+
+    @Test
+    public void isAvailable() throws Exception {
+        NotificationBackend.AppRow appRow = new NotificationBackend.AppRow();
+        NotificationChannel channel = mock(NotificationChannel.class);
+        when(channel.getImportance()).thenReturn(IMPORTANCE_DEFAULT);
+        NotificationChannelGroupWrapper group = mock(NotificationChannelGroupWrapper.class);
+        when(group.isBlocked()).thenReturn(false);
+
+        mController.onResume(appRow, channel, group, null);
+        assertTrue(mController.isAvailable());
+    }
+
+    @Test
+    public void testOnResume() throws Exception {
+        NotificationBackend.AppRow appRow = new NotificationBackend.AppRow();
+        NotificationChannel channel = mock(NotificationChannel.class);
+        NotificationChannelGroupWrapper group = mock(NotificationChannelGroupWrapper.class);
+        RestrictedLockUtils.EnforcedAdmin admin = mock(RestrictedLockUtils.EnforcedAdmin.class);
+
+        mController.onResume(appRow, channel, group, admin);
+
+        assertEquals(appRow, mController.mAppRow);
+        assertEquals(channel, mController.mChannel);
+        assertEquals(group, mController.mChannelGroup);
+        assertEquals(admin, mController.mAdmin);
+    }
+
+    @Test
+    public void testCanBeVisible_unspecified() {
+        NotificationBackend.AppRow appRow = new NotificationBackend.AppRow();
+        NotificationChannel channel = mock(NotificationChannel.class);
+        when(channel.getImportance()).thenReturn(IMPORTANCE_UNSPECIFIED);
+
+        mController.onResume(appRow, channel, null, null);
+        assertTrue(mController.checkCanBeVisible(IMPORTANCE_MIN));
+    }
+
+    @Test
+    public void testCanBeVisible_sameImportance() {
+        NotificationBackend.AppRow appRow = new NotificationBackend.AppRow();
+        NotificationChannel channel = mock(NotificationChannel.class);
+        when(channel.getImportance()).thenReturn(IMPORTANCE_LOW);
+
+        mController.onResume(appRow, channel, null, null);
+        assertTrue(mController.checkCanBeVisible(IMPORTANCE_LOW));
+    }
+
+    @Test
+    public void testCanBeVisible_greaterImportance() {
+        NotificationBackend.AppRow appRow = new NotificationBackend.AppRow();
+        NotificationChannel channel = mock(NotificationChannel.class);
+        when(channel.getImportance()).thenReturn(IMPORTANCE_LOW);
+
+        mController.onResume(appRow, channel, null, null);
+        assertTrue(mController.checkCanBeVisible(IMPORTANCE_MIN));
+    }
+
+    @Test
+    public void testCanBeVisible_lesserImportance() {
+        NotificationBackend.AppRow appRow = new NotificationBackend.AppRow();
+        NotificationChannel channel = mock(NotificationChannel.class);
+        when(channel.getImportance()).thenReturn(IMPORTANCE_LOW);
+
+        mController.onResume(appRow, channel, null, null);
+        assertFalse(mController.checkCanBeVisible(IMPORTANCE_DEFAULT));
+    }
+
+    @Test
+    public void testSaveImportance() {
+        NotificationBackend.AppRow appRow = new NotificationBackend.AppRow();
+        NotificationChannel channel = mock(NotificationChannel.class);
+        when(channel.getImportance()).thenReturn(IMPORTANCE_DEFAULT);
+
+        mController.onResume(appRow, channel, null, null);
+        mController.saveChannel();
+        verify(mBackend, times(1)).updateChannel(any(), anyInt(), any());
+    }
+
+    @Test
+    public void testIsConfigurable() {
+        String sameId = "bananas";
+        NotificationBackend.AppRow appRow = new NotificationBackend.AppRow();
+        appRow.lockedChannelId = sameId;
+        NotificationChannel channel = mock(NotificationChannel.class);
+        when(channel.getId()).thenReturn(sameId);
+
+        mController.onResume(appRow, channel, null, null);
+        assertFalse(mController.isChannelConfigurable());
+
+        when(channel.getId()).thenReturn("something new");
+        mController.onResume(appRow, channel, null, null);
+        assertTrue(mController.isChannelConfigurable());
+    }
+
+    @Test
+    public void testIsChannelBlockable_nonSystemAppsBlockable() {
+        NotificationBackend.AppRow appRow = new NotificationBackend.AppRow();
+        appRow.systemApp = false;
+        NotificationChannel channel = mock(NotificationChannel.class);
+        when(channel.isBlockableSystem()).thenReturn(false);
+
+        mController.onResume(appRow, channel, null, null);
+        assertTrue(mController.isChannelBlockable());
+    }
+
+    @Test
+    public void testIsChannelBlockable_mostSystemAppsNotBlockable() {
+        NotificationBackend.AppRow appRow = new NotificationBackend.AppRow();
+        appRow.systemApp = true;
+        NotificationChannel channel = mock(NotificationChannel.class);
+        when(channel.isBlockableSystem()).thenReturn(false);
+        when(channel.getImportance()).thenReturn(IMPORTANCE_HIGH);
+
+        mController.onResume(appRow, channel, null, null);
+        assertFalse(mController.isChannelBlockable());
+    }
+
+    @Test
+    public void testIsChannelBlockable_someSystemAppsAreBlockable() {
+        NotificationBackend.AppRow appRow = new NotificationBackend.AppRow();
+        appRow.systemApp = true;
+        NotificationChannel channel = mock(NotificationChannel.class);
+        when(channel.isBlockableSystem()).thenReturn(true);
+
+        mController.onResume(appRow, channel, null, null);
+        assertTrue(mController.isChannelBlockable());
+    }
+
+    @Test
+    public void testIsChannelBlockable_canUndoSystemBlock() {
+        NotificationBackend.AppRow appRow = new NotificationBackend.AppRow();
+        appRow.systemApp = true;
+        NotificationChannel channel = mock(NotificationChannel.class);
+        when(channel.isBlockableSystem()).thenReturn(false);
+        when(channel.getImportance()).thenReturn(IMPORTANCE_NONE);
+
+        mController.onResume(appRow, channel, null, null);
+        assertTrue(mController.isChannelBlockable());
+    }
+
+    @Test
+    public void testIsChannelGroupBlockable_nonSystemBlockable() {
+        NotificationBackend.AppRow appRow = new NotificationBackend.AppRow();
+        appRow.systemApp = false;
+        NotificationChannelGroupWrapper group = mock(NotificationChannelGroupWrapper.class);
+        when(group.getGroup()).thenReturn(mock(NotificationChannelGroup.class));
+        when(group.isBlocked()).thenReturn(false);
+
+        mController.onResume(appRow, null, group, null);
+        assertTrue(mController.isChannelGroupBlockable());
+    }
+
+    @Test
+    public void testIsChannelGroupBlockable_SystemNotBlockable() {
+        NotificationBackend.AppRow appRow = new NotificationBackend.AppRow();
+        appRow.systemApp = true;
+        NotificationChannelGroupWrapper group = mock(NotificationChannelGroupWrapper.class);
+        when(group.getGroup()).thenReturn(mock(NotificationChannelGroup.class));
+        when(group.isBlocked()).thenReturn(false);
+
+        mController.onResume(appRow, null, group, null);
+        assertFalse(mController.isChannelGroupBlockable());
+    }
+
+    @Test
+    public void testIsChannelGroupBlockable_canUndoSystemBlock() {
+        NotificationBackend.AppRow appRow = new NotificationBackend.AppRow();
+        appRow.systemApp = true;
+        NotificationChannelGroupWrapper group = mock(NotificationChannelGroupWrapper.class);
+        when(group.getGroup()).thenReturn(mock(NotificationChannelGroup.class));
+        when(group.isBlocked()).thenReturn(true);
+
+        mController.onResume(appRow, null, group, null);
+        assertTrue(mController.isChannelGroupBlockable());
+    }
+
+    private final class TestPreferenceController extends NotificationPreferenceController {
+
+        public TestPreferenceController(Context context,
+                NotificationBackend backend) {
+            super(context, backend);
+        }
+
+        @Override
+        public String getPreferenceKey() {
+            return null;
+        }
+    }
+}
diff --git a/tests/robotests/src/com/android/settings/notification/NotificationRingtonePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/NotificationRingtonePreferenceControllerTest.java
index 940a948..ab26226 100644
--- a/tests/robotests/src/com/android/settings/notification/NotificationRingtonePreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/notification/NotificationRingtonePreferenceControllerTest.java
@@ -32,7 +32,7 @@
 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_O)
 public class NotificationRingtonePreferenceControllerTest {
 
     @Mock
diff --git a/tests/robotests/src/com/android/settings/notification/NotificationVolumePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/NotificationVolumePreferenceControllerTest.java
index f919e7b..3e0fd7b 100644
--- a/tests/robotests/src/com/android/settings/notification/NotificationVolumePreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/notification/NotificationVolumePreferenceControllerTest.java
@@ -35,7 +35,7 @@
 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_O)
 public class NotificationVolumePreferenceControllerTest {
 
     @Mock
diff --git a/tests/robotests/src/com/android/settings/notification/NotificationsOffPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/NotificationsOffPreferenceControllerTest.java
new file mode 100644
index 0000000..aacccf4
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/notification/NotificationsOffPreferenceControllerTest.java
@@ -0,0 +1,147 @@
+/*
+ * Copyright (C) 2017 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF 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 android.app.NotificationManager.IMPORTANCE_LOW;
+import static android.app.NotificationManager.IMPORTANCE_NONE;
+
+import static junit.framework.Assert.assertFalse;
+import static junit.framework.Assert.assertTrue;
+
+import static org.junit.Assert.assertEquals;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.when;
+
+import android.app.NotificationChannel;
+import android.app.NotificationManager;
+import android.content.Context;
+import android.os.Build;
+import android.os.UserManager;
+import android.support.v7.preference.Preference;
+
+import com.android.settings.TestConfig;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
+import com.android.settings.wrapper.NotificationChannelGroupWrapper;
+
+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;
+
+@RunWith(SettingsRobolectricTestRunner.class)
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION_O)
+public class NotificationsOffPreferenceControllerTest {
+
+    private Context mContext;
+    @Mock
+    private NotificationManager mNm;
+    @Mock
+    private UserManager mUm;
+
+    private NotificationsOffPreferenceController mController;
+
+    @Before
+    public void setUp() {
+        MockitoAnnotations.initMocks(this);
+        ShadowApplication shadowApplication = ShadowApplication.getInstance();
+        shadowApplication.setSystemService(Context.NOTIFICATION_SERVICE, mNm);
+        shadowApplication.setSystemService(Context.USER_SERVICE, mUm);
+        mContext = shadowApplication.getApplicationContext();
+        mController = spy(new NotificationsOffPreferenceController(mContext));
+    }
+
+    @Test
+    public void testNoCrashIfNoOnResume() throws Exception {
+        mController.isAvailable();
+        mController.updateState(mock(Preference.class));
+    }
+
+    @Test
+    public void testIsAvailable_yesIfAppBlocked() throws Exception {
+        NotificationBackend.AppRow appRow = new NotificationBackend.AppRow();
+        appRow.banned = true;
+        mController.onResume(appRow, null, null, null);
+        assertTrue(mController.isAvailable());
+    }
+
+    @Test
+    public void testIsAvailable_yesIfChannelGroupBlocked() throws Exception {
+        NotificationBackend.AppRow appRow = new NotificationBackend.AppRow();
+        NotificationChannelGroupWrapper group = mock(NotificationChannelGroupWrapper.class);
+        when(group.isBlocked()).thenReturn(true);
+        mController.onResume(appRow, null, group, null);
+        assertTrue(mController.isAvailable());
+    }
+
+    @Test
+    public void testIsAvailable_yesIfChannelBlocked() throws Exception {
+        NotificationBackend.AppRow appRow = new NotificationBackend.AppRow();
+        NotificationChannel channel = mock(NotificationChannel.class);
+        when(channel.getImportance()).thenReturn(IMPORTANCE_NONE);
+        mController.onResume(appRow, channel, null, null);
+        assertTrue(mController.isAvailable());
+    }
+
+    @Test
+    public void testUpdateState_channel() throws Exception {
+        NotificationBackend.AppRow appRow = new NotificationBackend.AppRow();
+        NotificationChannel channel = mock(NotificationChannel.class);
+        when(channel.getImportance()).thenReturn(IMPORTANCE_NONE);
+        mController.onResume(appRow, channel, null, null);
+
+        Preference pref = new Preference(RuntimeEnvironment.application);
+        mController.updateState(pref);
+
+        assertTrue(pref.getTitle().toString().contains("category"));
+        assertFalse(pref.isEnabled());
+        assertFalse(pref.isSelectable());
+    }
+
+    @Test
+    public void testUpdateState_channelGroup() throws Exception {
+        NotificationBackend.AppRow appRow = new NotificationBackend.AppRow();
+        NotificationChannelGroupWrapper group = mock(NotificationChannelGroupWrapper.class);
+        when(group.isBlocked()).thenReturn(true);
+        mController.onResume(appRow, null, group, null);
+
+        Preference pref = new Preference(RuntimeEnvironment.application);
+        mController.updateState(pref);
+
+        assertTrue(pref.getTitle().toString().contains("group"));
+        assertFalse(pref.isEnabled());
+        assertFalse(pref.isSelectable());
+    }
+
+    @Test
+    public void testUpdateState_app() throws Exception {
+        NotificationBackend.AppRow appRow = new NotificationBackend.AppRow();
+        appRow.banned = true;
+        mController.onResume(appRow, null, null, null);
+
+        Preference pref = new Preference(RuntimeEnvironment.application);
+        mController.updateState(pref);
+
+        assertTrue(pref.getTitle().toString().contains("app"));
+        assertFalse(pref.isEnabled());
+        assertFalse(pref.isSelectable());
+    }
+}
diff --git a/tests/robotests/src/com/android/settings/notification/PhoneRingtonePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/PhoneRingtonePreferenceControllerTest.java
index 57ab4d3..614de6f 100644
--- a/tests/robotests/src/com/android/settings/notification/PhoneRingtonePreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/notification/PhoneRingtonePreferenceControllerTest.java
@@ -35,7 +35,7 @@
 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_O)
 public class PhoneRingtonePreferenceControllerTest {
 
     @Mock
diff --git a/tests/robotests/src/com/android/settings/notification/PulseNotificationPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/PulseNotificationPreferenceControllerTest.java
index f6c6bf2..4ee5f5a 100644
--- a/tests/robotests/src/com/android/settings/notification/PulseNotificationPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/notification/PulseNotificationPreferenceControllerTest.java
@@ -16,6 +16,12 @@
 
 package com.android.settings.notification;
 
+import static android.provider.Settings.System.NOTIFICATION_LIGHT_PULSE;
+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;
 import android.support.v7.preference.Preference;
@@ -31,18 +37,12 @@
 import org.mockito.Mock;
 import org.mockito.MockitoAnnotations;
 import org.robolectric.RobolectricTestRunner;
+import org.robolectric.RuntimeEnvironment;
 import org.robolectric.annotation.Config;
 import org.robolectric.shadows.ShadowApplication;
 
-import static android.provider.Settings.System.NOTIFICATION_LIGHT_PULSE;
-import static org.mockito.Matchers.any;
-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(RobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION_O)
 public class PulseNotificationPreferenceControllerTest {
 
     @Mock(answer = Answers.RETURNS_DEEP_STUBS)
@@ -51,11 +51,15 @@
     private PreferenceScreen mScreen;
 
     private PulseNotificationPreferenceController mController;
+    private Preference mPreference;
 
     @Before
     public void setUp() {
         MockitoAnnotations.initMocks(this);
         mController = new PulseNotificationPreferenceController(mContext);
+        mPreference = new Preference(RuntimeEnvironment.application);
+        mPreference.setKey(mController.getPreferenceKey());
+        when(mScreen.findPreference(mPreference.getKey())).thenReturn(mPreference);
     }
 
     @Test
@@ -65,7 +69,7 @@
                 .thenReturn(true);
         mController.displayPreference(mScreen);
 
-        verify(mScreen, never()).removePreference(any(Preference.class));
+        assertThat(mPreference.isVisible()).isTrue();
     }
 
     @Test
@@ -73,14 +77,10 @@
         when(mContext.getResources().
                 getBoolean(com.android.internal.R.bool.config_intrusiveNotificationLed))
                 .thenReturn(false);
-        final Preference preference = mock(Preference.class);
-        when(mScreen.getPreferenceCount()).thenReturn(1);
-        when(mScreen.getPreference(0)).thenReturn(preference);
-        when(preference.getKey()).thenReturn(mController.getPreferenceKey());
 
         mController.displayPreference(mScreen);
 
-        verify(mScreen).removePreference(any(Preference.class));
+        assertThat(mPreference.isVisible()).isFalse();
     }
 
     @Test
diff --git a/tests/robotests/src/com/android/settings/notification/RingVolumePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/RingVolumePreferenceControllerTest.java
index 1a6d3d7..48edcf7 100644
--- a/tests/robotests/src/com/android/settings/notification/RingVolumePreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/notification/RingVolumePreferenceControllerTest.java
@@ -38,7 +38,7 @@
 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_O)
 public class RingVolumePreferenceControllerTest {
 
     @Mock
diff --git a/tests/robotests/src/com/android/settings/notification/RingtonePreferenceControllerBaseTest.java b/tests/robotests/src/com/android/settings/notification/RingtonePreferenceControllerBaseTest.java
index e72ef53..82f4dab 100644
--- a/tests/robotests/src/com/android/settings/notification/RingtonePreferenceControllerBaseTest.java
+++ b/tests/robotests/src/com/android/settings/notification/RingtonePreferenceControllerBaseTest.java
@@ -36,7 +36,7 @@
 import static org.mockito.Mockito.verify;
 
 @RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION_O)
 public class RingtonePreferenceControllerBaseTest {
 
     @Mock
diff --git a/tests/robotests/src/com/android/settings/notification/ScreenLockSoundPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/ScreenLockSoundPreferenceControllerTest.java
index f94f8bf..4e77793 100644
--- a/tests/robotests/src/com/android/settings/notification/ScreenLockSoundPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/notification/ScreenLockSoundPreferenceControllerTest.java
@@ -39,7 +39,7 @@
 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_O)
 public class ScreenLockSoundPreferenceControllerTest {
 
     @Mock
diff --git a/tests/robotests/src/com/android/settings/notification/SettingPrefControllerTest.java b/tests/robotests/src/com/android/settings/notification/SettingPrefControllerTest.java
index 307536d..ef7ee04 100644
--- a/tests/robotests/src/com/android/settings/notification/SettingPrefControllerTest.java
+++ b/tests/robotests/src/com/android/settings/notification/SettingPrefControllerTest.java
@@ -47,7 +47,7 @@
 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_O)
 public class SettingPrefControllerTest {
 
     @Mock
diff --git a/tests/robotests/src/com/android/settings/notification/SoundPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/SoundPreferenceControllerTest.java
new file mode 100644
index 0000000..3d6bc92
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/notification/SoundPreferenceControllerTest.java
@@ -0,0 +1,257 @@
+/*
+ * Copyright (C) 2017 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF 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 android.app.NotificationChannel.DEFAULT_CHANNEL_ID;
+import static android.app.NotificationManager.IMPORTANCE_DEFAULT;
+import static android.app.NotificationManager.IMPORTANCE_HIGH;
+import static android.app.NotificationManager.IMPORTANCE_LOW;
+
+import static junit.framework.Assert.assertFalse;
+import static junit.framework.Assert.assertTrue;
+
+import static org.junit.Assert.assertEquals;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.anyInt;
+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.Fragment;
+import android.app.Notification;
+import android.app.NotificationChannel;
+import android.app.NotificationManager;
+import android.content.Context;
+import android.content.Intent;
+import android.net.Uri;
+import android.os.Build;
+import android.os.UserManager;
+import android.provider.Settings;
+import android.support.v7.preference.Preference;
+import android.support.v7.preference.PreferenceScreen;
+import android.util.AttributeSet;
+
+import com.android.settings.SettingsPreferenceFragment;
+import com.android.settings.TestConfig;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
+import com.android.settingslib.RestrictedLockUtils;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Answers;
+import org.mockito.Mock;
+import org.mockito.Mockito;
+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_O)
+public class SoundPreferenceControllerTest {
+
+    private Context mContext;
+    @Mock
+    private NotificationBackend mBackend;
+    @Mock
+    private NotificationManager mNm;
+    @Mock
+    private UserManager mUm;
+    @Mock(answer = Answers.RETURNS_DEEP_STUBS)
+    private PreferenceScreen mScreen;
+    @Mock
+    private SettingsPreferenceFragment mFragment;
+    @Mock
+    private NotificationSettingsBase.ImportanceListener mImportanceListener;
+
+    private SoundPreferenceController mController;
+
+    @Before
+    public void setUp() {
+        MockitoAnnotations.initMocks(this);
+        ShadowApplication shadowApplication = ShadowApplication.getInstance();
+        shadowApplication.setSystemService(Context.NOTIFICATION_SERVICE, mNm);
+        shadowApplication.setSystemService(Context.USER_SERVICE, mUm);
+        mContext = shadowApplication.getApplicationContext();
+        mController = spy(new SoundPreferenceController(
+                mContext, mFragment, mImportanceListener, mBackend));
+    }
+
+    @Test
+    public void testNoCrashIfNoOnResume() throws Exception {
+        mController.isAvailable();
+        mController.updateState(mock(NotificationSoundPreference.class));
+        mController.onPreferenceChange(mock(NotificationSoundPreference.class), Uri.EMPTY);
+        mController.handlePreferenceTreeClick(mock(NotificationSoundPreference.class));
+        mController.onActivityResult(1, 1, null);
+        mController.hasValidSound(null);
+    }
+
+    @Test
+    public void testIsAvailable_notIfChannelNull() throws Exception {
+        NotificationBackend.AppRow appRow = new NotificationBackend.AppRow();
+        mController.onResume(appRow, null, null, null);
+        assertFalse(mController.isAvailable());
+    }
+
+    @Test
+    public void testIsAvailable_notIfNotImportant() throws Exception {
+        NotificationBackend.AppRow appRow = new NotificationBackend.AppRow();
+        NotificationChannel channel = new NotificationChannel("", "", IMPORTANCE_LOW);
+        mController.onResume(appRow, channel, null, null);
+        assertFalse(mController.isAvailable());
+    }
+
+    @Test
+    public void testIsAvailable_notIfDefaultChannel() throws Exception {
+        NotificationBackend.AppRow appRow = new NotificationBackend.AppRow();
+        NotificationChannel channel =
+                new NotificationChannel(DEFAULT_CHANNEL_ID, "", IMPORTANCE_DEFAULT);
+        mController.onResume(appRow, channel, null, null);
+        assertFalse(mController.isAvailable());
+    }
+
+    @Test
+    public void testIsAvailable() throws Exception {
+        NotificationBackend.AppRow appRow = new NotificationBackend.AppRow();
+        NotificationChannel channel = new NotificationChannel("", "", IMPORTANCE_DEFAULT);
+        mController.onResume(appRow, channel, null, null);
+        assertTrue(mController.isAvailable());
+    }
+
+    @Test
+    public void testDisplayPreference_savesPreference() throws Exception {
+        NotificationSoundPreference pref = mock(NotificationSoundPreference.class);
+        when(mScreen.findPreference(mController.getPreferenceKey())).thenReturn(pref);
+        mController.displayPreference(mScreen);
+
+        mController.onActivityResult(SoundPreferenceController.CODE, 1, new Intent());
+        verify(pref, times(1)).onActivityResult(anyInt(), anyInt(), any());
+    }
+
+    @Test
+    public void testUpdateState_disabledByAdmin() throws Exception {
+        NotificationChannel channel = mock(NotificationChannel.class);
+        when(channel.getId()).thenReturn("something");
+        mController.onResume(new NotificationBackend.AppRow(), channel, null, mock(
+                RestrictedLockUtils.EnforcedAdmin.class));
+
+        Preference pref = new NotificationSoundPreference(mContext, mock(AttributeSet.class));
+        mController.updateState(pref);
+
+        assertFalse(pref.isEnabled());
+    }
+
+    @Test
+    public void testUpdateState_notConfigurable() throws Exception {
+        String lockedId = "locked";
+        NotificationBackend.AppRow appRow = new NotificationBackend.AppRow();
+        appRow.lockedChannelId = lockedId;
+        NotificationChannel channel = mock(NotificationChannel.class);
+        when(channel.getId()).thenReturn(lockedId);
+        mController.onResume(appRow, channel, null, null);
+
+        Preference pref = new NotificationSoundPreference(mContext, mock(AttributeSet.class));
+        mController.updateState(pref);
+
+        assertFalse(pref.isEnabled());
+    }
+
+    @Test
+    public void testUpdateState_configurable() throws Exception {
+        Uri sound = Settings.System.DEFAULT_ALARM_ALERT_URI;
+        NotificationBackend.AppRow appRow = new NotificationBackend.AppRow();
+        NotificationChannel channel = mock(NotificationChannel.class);
+        when(channel.getId()).thenReturn("something");
+        when(channel.getSound()).thenReturn(sound);
+        mController.onResume(appRow, channel, null, null);
+
+        NotificationSoundPreference pref =
+                new NotificationSoundPreference(mContext, mock(AttributeSet.class));
+        mController.updateState(pref);
+
+        assertEquals(sound, pref.onRestoreRingtone());
+        assertTrue(pref.isEnabled());
+    }
+
+    @Test
+    public void testOnPreferenceChange() throws Exception {
+        Uri sound = Settings.System.DEFAULT_ALARM_ALERT_URI;
+        NotificationBackend.AppRow appRow = new NotificationBackend.AppRow();
+        NotificationChannel channel = new NotificationChannel("", "", IMPORTANCE_HIGH);
+        channel.setSound(sound, Notification.AUDIO_ATTRIBUTES_DEFAULT);
+        mController.onResume(appRow, channel, null, null);
+
+        NotificationSoundPreference pref =
+                new NotificationSoundPreference(mContext, mock(AttributeSet.class));
+        mController.updateState(pref);
+
+        mController.onPreferenceChange(pref, Uri.EMPTY);
+        assertEquals(Uri.EMPTY, channel.getSound());
+        assertEquals(Notification.AUDIO_ATTRIBUTES_DEFAULT, channel.getAudioAttributes());
+        verify(mBackend, times(1)).updateChannel(any(), anyInt(), any());
+    }
+
+    @Test
+    public void testOnPreferenceTreeClick_incorrectPref() throws Exception {
+        NotificationSoundPreference pref = mock(NotificationSoundPreference.class);
+        mController.handlePreferenceTreeClick(pref);
+
+        verify(pref, never()).onPrepareRingtonePickerIntent(any());
+        verify(mFragment, never()).startActivityForResult(any(), anyInt());
+    }
+
+
+    @Test
+    public void testOnPreferenceTreeClick_correctPref() throws Exception {
+        NotificationSoundPreference pref =
+                spy(new NotificationSoundPreference(mContext, mock(AttributeSet.class)));
+        pref.setKey(mController.getPreferenceKey());
+        mController.handlePreferenceTreeClick(pref);
+
+        verify(pref, times(1)).onPrepareRingtonePickerIntent(any());
+        verify(mFragment, times(1)).startActivityForResult(any(), anyInt());
+    }
+
+    @Test
+    public void testOnActivityResult() {
+        NotificationSoundPreference pref = mock(NotificationSoundPreference.class);
+        when(mScreen.findPreference(mController.getPreferenceKey())).thenReturn(pref);
+        mController.displayPreference(mScreen);
+
+        mController.onActivityResult(SoundPreferenceController.CODE, 1, new Intent("hi"));
+        verify(pref, times(1)).onActivityResult(anyInt(), anyInt(), any());
+        verify(mImportanceListener, times(1)).onImportanceChanged();
+    }
+
+    @Test
+    public void testHasValidSound() {
+        NotificationChannel channel =
+                new NotificationChannel(DEFAULT_CHANNEL_ID, "a", IMPORTANCE_HIGH);
+        assertTrue(mController.hasValidSound(channel));
+
+        channel.setSound(Uri.EMPTY, Notification.AUDIO_ATTRIBUTES_DEFAULT);
+        assertFalse(mController.hasValidSound(channel));
+
+        channel.setSound(null, Notification.AUDIO_ATTRIBUTES_DEFAULT);
+        assertFalse(mController.hasValidSound(channel));
+    }
+}
diff --git a/tests/robotests/src/com/android/settings/notification/SoundSettingsTest.java b/tests/robotests/src/com/android/settings/notification/SoundSettingsTest.java
index 59b7078..5b816d4 100644
--- a/tests/robotests/src/com/android/settings/notification/SoundSettingsTest.java
+++ b/tests/robotests/src/com/android/settings/notification/SoundSettingsTest.java
@@ -30,6 +30,7 @@
 import org.junit.runner.RunWith;
 import org.robolectric.RuntimeEnvironment;
 import org.robolectric.annotation.Config;
+import org.robolectric.util.ReflectionHelpers;
 
 import java.util.List;
 
@@ -40,7 +41,7 @@
 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_O)
 public class SoundSettingsTest {
 
     @Test
@@ -59,7 +60,8 @@
 
         final List<String> niks = SoundSettings.SEARCH_INDEX_DATA_PROVIDER
                 .getNonIndexableKeys(context);
-        final int xmlId = (new SoundSettings()).getPreferenceScreenResId();
+        SoundSettings settings = new SoundSettings();
+        final int xmlId = settings.getPreferenceScreenResId();
         final List<String> keys = XmlTestUtils.getKeysFromPreferenceXml(context, xmlId);
         keys.addAll(XmlTestUtils.getKeysFromPreferenceXml(context,
                 R.xml.zen_mode_settings));
diff --git a/tests/robotests/src/com/android/settings/notification/SuppressorHelperTest.java b/tests/robotests/src/com/android/settings/notification/SuppressorHelperTest.java
index 86f3d81..5efad20 100644
--- a/tests/robotests/src/com/android/settings/notification/SuppressorHelperTest.java
+++ b/tests/robotests/src/com/android/settings/notification/SuppressorHelperTest.java
@@ -21,12 +21,19 @@
 import android.content.pm.ServiceInfo;
 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 static com.google.common.truth.Truth.assertThat;
 import static org.mockito.Mockito.when;
 
+import com.android.settings.TestConfig;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
+
+@RunWith(SettingsRobolectricTestRunner.class)
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION_O)
 public class SuppressorHelperTest {
     private static final String SUPPRESSOR_NAME = "wear";
 
diff --git a/tests/robotests/src/com/android/settings/notification/TouchSoundPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/TouchSoundPreferenceControllerTest.java
index eaf9bb5..ad9eb8f 100644
--- a/tests/robotests/src/com/android/settings/notification/TouchSoundPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/notification/TouchSoundPreferenceControllerTest.java
@@ -41,7 +41,7 @@
 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_O)
 public class TouchSoundPreferenceControllerTest {
 
     @Mock
diff --git a/tests/robotests/src/com/android/settings/notification/VibrateOnTouchPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/VibrateOnTouchPreferenceControllerTest.java
index b0ab54b..b469f9b 100644
--- a/tests/robotests/src/com/android/settings/notification/VibrateOnTouchPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/notification/VibrateOnTouchPreferenceControllerTest.java
@@ -41,7 +41,7 @@
 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_O)
 public class VibrateOnTouchPreferenceControllerTest {
 
     @Mock
diff --git a/tests/robotests/src/com/android/settings/notification/VibrateWhenRingPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/VibrateWhenRingPreferenceControllerTest.java
index 054309c..19cf649 100644
--- a/tests/robotests/src/com/android/settings/notification/VibrateWhenRingPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/notification/VibrateWhenRingPreferenceControllerTest.java
@@ -16,6 +16,12 @@
 
 package com.android.settings.notification;
 
+import static android.provider.Settings.System.VIBRATE_WHEN_RINGING;
+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;
 import android.support.v7.preference.Preference;
@@ -23,26 +29,20 @@
 import android.support.v7.preference.TwoStatePreference;
 import android.telephony.TelephonyManager;
 
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.Mock;
 import org.mockito.MockitoAnnotations;
+import org.robolectric.RuntimeEnvironment;
 import org.robolectric.annotation.Config;
 import org.robolectric.shadows.ShadowApplication;
 
-import static android.provider.Settings.System.VIBRATE_WHEN_RINGING;
-import static org.mockito.Matchers.any;
-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)
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION_O)
 public class VibrateWhenRingPreferenceControllerTest {
 
     @Mock
@@ -53,36 +53,34 @@
     private TelephonyManager mTelephonyManager;
 
     private VibrateWhenRingPreferenceController mController;
+    private Preference mPreference;
 
     @Before
     public void setUp() {
         MockitoAnnotations.initMocks(this);
         when(mContext.getSystemService(Context.TELEPHONY_SERVICE)).thenReturn(mTelephonyManager);
         mController = new VibrateWhenRingPreferenceController(mContext);
+        mPreference = new Preference(RuntimeEnvironment.application);
+        mPreference.setKey(mController.getPreferenceKey());
+        when(mScreen.findPreference(mPreference.getKey())).thenReturn(mPreference);
     }
 
     @Test
     public void display_voiceCapable_shouldDisplay() {
         when(mTelephonyManager.isVoiceCapable()).thenReturn(true);
-        when(mScreen.findPreference(mController.getPreferenceKey()))
-            .thenReturn(mock(Preference.class));
 
         mController.displayPreference(mScreen);
 
-        verify(mScreen, never()).removePreference(any(Preference.class));
+        assertThat(mPreference.isVisible()).isTrue();
     }
 
     @Test
     public void display_notVoiceCapable_shouldNotDisplay() {
         when(mTelephonyManager.isVoiceCapable()).thenReturn(false);
-        final Preference preference = mock(Preference.class);
-        when(mScreen.getPreferenceCount()).thenReturn(1);
-        when(mScreen.getPreference(0)).thenReturn(preference);
-        when(preference.getKey()).thenReturn(mController.getPreferenceKey());
 
         mController.displayPreference(mScreen);
 
-        verify(mScreen).removePreference(any(Preference.class));
+        assertThat(mPreference.isVisible()).isFalse();
     }
 
     @Test
diff --git a/tests/robotests/src/com/android/settings/notification/VibrationPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/VibrationPreferenceControllerTest.java
new file mode 100644
index 0000000..ea2c058
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/notification/VibrationPreferenceControllerTest.java
@@ -0,0 +1,230 @@
+/*
+ * Copyright (C) 2017 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF 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 android.app.NotificationChannel.DEFAULT_CHANNEL_ID;
+import static android.app.NotificationManager.IMPORTANCE_DEFAULT;
+import static android.app.NotificationManager.IMPORTANCE_HIGH;
+import static android.app.NotificationManager.IMPORTANCE_LOW;
+
+import static junit.framework.Assert.assertFalse;
+import static junit.framework.Assert.assertTrue;
+
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.anyInt;
+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.NotificationChannel;
+import android.app.NotificationManager;
+import android.content.Context;
+import android.os.Build;
+import android.os.UserManager;
+import android.os.Vibrator;
+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.RestrictedLockUtils;
+import com.android.settingslib.RestrictedSwitchPreference;
+
+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;
+
+@RunWith(SettingsRobolectricTestRunner.class)
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION_O)
+public class VibrationPreferenceControllerTest {
+
+    private Context mContext;
+    @Mock
+    private NotificationBackend mBackend;
+    @Mock
+    private NotificationManager mNm;
+    @Mock
+    Vibrator mVibrator;
+    @Mock
+    private UserManager mUm;
+    @Mock(answer = Answers.RETURNS_DEEP_STUBS)
+    private PreferenceScreen mScreen;
+
+    private VibrationPreferenceController mController;
+
+    @Before
+    public void setUp() {
+        MockitoAnnotations.initMocks(this);
+        ShadowApplication shadowApplication = ShadowApplication.getInstance();
+        shadowApplication.setSystemService(Context.NOTIFICATION_SERVICE, mNm);
+        shadowApplication.setSystemService(Context.USER_SERVICE, mUm);
+        shadowApplication.setSystemService(Context.VIBRATOR_SERVICE, mVibrator);
+        mContext = shadowApplication.getApplicationContext();
+        mController = spy(new VibrationPreferenceController(mContext, mBackend));
+
+        // by default allow vibration
+        when(mVibrator.hasVibrator()).thenReturn(true);
+    }
+
+    @Test
+    public void testNoCrashIfNoOnResume() throws Exception {
+        mController.isAvailable();
+        mController.updateState(mock(RestrictedSwitchPreference.class));
+        mController.onPreferenceChange(mock(RestrictedSwitchPreference.class), true);
+    }
+
+    @Test
+    public void testIsAvailable_notSystemDoesNotHave() throws Exception {
+        when(mVibrator.hasVibrator()).thenReturn(false);
+        NotificationBackend.AppRow appRow = new NotificationBackend.AppRow();
+        NotificationChannel channel = new NotificationChannel("", "", IMPORTANCE_DEFAULT);
+        mController.onResume(appRow, channel, null, null);
+        assertFalse(mController.isAvailable());
+    }
+
+    @Test
+    public void testIsAvailable_notIfNotImportant() throws Exception {
+        NotificationBackend.AppRow appRow = new NotificationBackend.AppRow();
+        NotificationChannel channel = new NotificationChannel("", "", IMPORTANCE_LOW);
+        mController.onResume(appRow, channel, null, null);
+        assertFalse(mController.isAvailable());
+    }
+
+    @Test
+    public void testIsAvailable_notIfDefaultChannel() throws Exception {
+        NotificationBackend.AppRow appRow = new NotificationBackend.AppRow();
+        NotificationChannel channel =
+                new NotificationChannel(DEFAULT_CHANNEL_ID, "", IMPORTANCE_DEFAULT);
+        mController.onResume(appRow, channel, null, null);
+        assertFalse(mController.isAvailable());
+    }
+
+    @Test
+    public void testIsAvailable() throws Exception {
+        NotificationBackend.AppRow appRow = new NotificationBackend.AppRow();
+        NotificationChannel channel = new NotificationChannel("", "", IMPORTANCE_DEFAULT);
+        mController.onResume(appRow, channel, null, null);
+        assertTrue(mController.isAvailable());
+    }
+
+    @Test
+    public void testUpdateState_disabledByAdmin() throws Exception {
+        NotificationChannel channel = mock(NotificationChannel.class);
+        when(channel.getId()).thenReturn("something");
+        mController.onResume(new NotificationBackend.AppRow(), channel, null, mock(
+                RestrictedLockUtils.EnforcedAdmin.class));
+
+        Preference pref = new RestrictedSwitchPreference(RuntimeEnvironment.application);
+        mController.updateState(pref);
+
+        assertFalse(pref.isEnabled());
+    }
+
+    @Test
+    public void testUpdateState_notConfigurable() throws Exception {
+        String lockedId = "locked";
+        NotificationBackend.AppRow appRow = new NotificationBackend.AppRow();
+        appRow.lockedChannelId = lockedId;
+        NotificationChannel channel = mock(NotificationChannel.class);
+        when(channel.getId()).thenReturn(lockedId);
+        mController.onResume(appRow, channel, null, null);
+
+        Preference pref = new RestrictedSwitchPreference(RuntimeEnvironment.application);
+        mController.updateState(pref);
+
+        assertFalse(pref.isEnabled());
+    }
+
+    @Test
+    public void testUpdateState_configurable() throws Exception {
+        NotificationBackend.AppRow appRow = new NotificationBackend.AppRow();
+        NotificationChannel channel = mock(NotificationChannel.class);
+        when(channel.getId()).thenReturn("something");
+        mController.onResume(appRow, channel, null, null);
+
+        Preference pref = new RestrictedSwitchPreference(RuntimeEnvironment.application);
+        mController.updateState(pref);
+
+        assertTrue(pref.isEnabled());
+    }
+
+    @Test
+    public void testUpdateState_vibrateOn() throws Exception {
+        NotificationChannel channel = mock(NotificationChannel.class);
+        when(channel.shouldVibrate()).thenReturn(true);
+        mController.onResume(new NotificationBackend.AppRow(), channel, null, null);
+
+        RestrictedSwitchPreference pref =
+                new RestrictedSwitchPreference(RuntimeEnvironment.application);
+        mController.updateState(pref);
+        assertTrue(pref.isChecked());
+    }
+
+    @Test
+    public void testUpdateState_vibrateOff() throws Exception {
+        NotificationChannel channel = mock(NotificationChannel.class);
+        when(channel.shouldVibrate()).thenReturn(false);
+        mController.onResume(new NotificationBackend.AppRow(), channel, null, null);
+
+        RestrictedSwitchPreference pref =
+                new RestrictedSwitchPreference(RuntimeEnvironment.application);
+        mController.updateState(pref);
+        assertFalse(pref.isChecked());
+    }
+
+    @Test
+    public void testOnPreferenceChange_on() {
+        NotificationChannel channel =
+                new NotificationChannel(DEFAULT_CHANNEL_ID, "a", IMPORTANCE_DEFAULT);
+        mController.onResume(new NotificationBackend.AppRow(), channel, null, null);
+
+        RestrictedSwitchPreference pref =
+                new RestrictedSwitchPreference(RuntimeEnvironment.application);
+        mController.updateState(pref);
+
+        mController.onPreferenceChange(pref, true);
+
+        assertTrue(channel.shouldVibrate());
+        verify(mBackend, times(1)).updateChannel(any(), anyInt(), any());
+    }
+
+    @Test
+    public void testOnPreferenceChange_off() {
+        NotificationChannel channel =
+                new NotificationChannel(DEFAULT_CHANNEL_ID, "a", IMPORTANCE_HIGH);
+        mController.onResume(new NotificationBackend.AppRow(), channel, null, null);
+
+        RestrictedSwitchPreference pref =
+                new RestrictedSwitchPreference(RuntimeEnvironment.application);
+        when(mScreen.findPreference(mController.getPreferenceKey())).thenReturn(pref);
+        mController.displayPreference(mScreen);
+        mController.updateState(pref);
+
+        mController.onPreferenceChange(pref, false);
+
+        assertFalse(channel.shouldVibrate());
+        verify(mBackend, times(1)).updateChannel(any(), anyInt(), any());
+    }
+}
diff --git a/tests/robotests/src/com/android/settings/notification/VisibilityPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/VisibilityPreferenceControllerTest.java
new file mode 100644
index 0000000..cd8cdad
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/notification/VisibilityPreferenceControllerTest.java
@@ -0,0 +1,326 @@
+/*
+ * Copyright (C) 2017 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF 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 android.app.NotificationChannel.DEFAULT_CHANNEL_ID;
+import static android.app.NotificationManager.IMPORTANCE_DEFAULT;
+import static android.app.NotificationManager.IMPORTANCE_MIN;
+import static android.app.NotificationManager.VISIBILITY_NO_OVERRIDE;
+import static android.app.admin.DevicePolicyManager.KEYGUARD_DISABLE_SECURE_NOTIFICATIONS;
+import static android.app.admin.DevicePolicyManager.KEYGUARD_DISABLE_UNREDACTED_NOTIFICATIONS;
+
+import static junit.framework.Assert.assertFalse;
+import static junit.framework.Assert.assertTrue;
+
+import static org.junit.Assert.assertEquals;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.anyInt;
+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.Notification;
+import android.app.NotificationChannel;
+import android.app.NotificationManager;
+import android.app.admin.DevicePolicyManager;
+import android.content.ComponentName;
+import android.content.Context;
+import android.content.pm.UserInfo;
+import android.os.Build;
+import android.os.UserManager;
+import android.provider.Settings;
+import android.support.v7.preference.PreferenceScreen;
+
+import com.android.internal.widget.LockPatternUtils;
+import com.android.settings.TestConfig;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.shadow.ShadowRestrictionUtils;
+import com.android.settingslib.RestrictedLockUtils;
+
+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.shadows.ShadowApplication;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+
+@RunWith(SettingsRobolectricTestRunner.class)
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION_O, shadows = {
+        ShadowRestrictionUtils.class,
+})
+public class VisibilityPreferenceControllerTest {
+
+    private Context mContext;
+    @Mock
+    private NotificationBackend mBackend;
+    @Mock
+    private NotificationManager mNm;
+    @Mock
+    private LockPatternUtils mLockUtils;
+    @Mock
+    private UserManager mUm;
+    @Mock
+    private DevicePolicyManager mDm;
+    @Mock(answer = Answers.RETURNS_DEEP_STUBS)
+    private PreferenceScreen mScreen;
+
+    private VisibilityPreferenceController mController;
+
+    @Before
+    public void setUp() {
+        MockitoAnnotations.initMocks(this);
+        ShadowApplication shadowApplication = ShadowApplication.getInstance();
+        shadowApplication.setSystemService(Context.NOTIFICATION_SERVICE, mNm);
+        shadowApplication.setSystemService(Context.USER_SERVICE, mUm);
+        shadowApplication.setSystemService(Context.DEVICE_POLICY_SERVICE, mDm);
+        mContext = shadowApplication.getApplicationContext();
+        mController = spy(new VisibilityPreferenceController(mContext, mLockUtils, mBackend));
+
+        // by default the lockscreen is secure
+        when(mLockUtils.isSecure(anyInt())).thenReturn(true);
+        // and notifications are visible in redacted form
+        Settings.Secure.putInt(mContext.getContentResolver(),
+                Settings.Secure.LOCK_SCREEN_SHOW_NOTIFICATIONS, 1);
+        Settings.Secure.putInt(mContext.getContentResolver(),
+                Settings.Secure.LOCK_SCREEN_ALLOW_PRIVATE_NOTIFICATIONS, 1);
+        // and not restricted
+        ShadowRestrictionUtils.setRestricted(false);
+        // with no managed profile
+        UserInfo userInfo = new UserInfo();
+        when(mUm.getUserInfo(anyInt())).thenReturn(userInfo);
+    }
+
+    @Test
+    public void testNoCrashIfNoOnResume() throws Exception {
+        mController.isAvailable();
+        mController.updateState(mock(RestrictedDropDownPreference.class));
+        mController.onPreferenceChange(mock(RestrictedDropDownPreference.class), true);
+    }
+
+    @Test
+    public void testIsAvailable_notSecure() throws Exception {
+        when(mLockUtils.isSecure(anyInt())).thenReturn(false);
+        NotificationBackend.AppRow appRow = new NotificationBackend.AppRow();
+        NotificationChannel channel = new NotificationChannel("", "", IMPORTANCE_DEFAULT);
+        mController.onResume(appRow, channel, null, null);
+        assertFalse(mController.isAvailable());
+    }
+
+    @Test
+    public void testIsAvailable_notIfNotImportant() throws Exception {
+        NotificationBackend.AppRow appRow = new NotificationBackend.AppRow();
+        NotificationChannel channel = new NotificationChannel("", "", IMPORTANCE_MIN);
+        mController.onResume(appRow, channel, null, null);
+        assertFalse(mController.isAvailable());
+    }
+
+    @Test
+    public void testIsAvailable() throws Exception {
+        NotificationBackend.AppRow appRow = new NotificationBackend.AppRow();
+        NotificationChannel channel =
+                new NotificationChannel(DEFAULT_CHANNEL_ID, "", IMPORTANCE_DEFAULT);
+        mController.onResume(appRow, channel, null, null);
+        assertTrue(mController.isAvailable());
+
+        channel = new NotificationChannel("", "", IMPORTANCE_DEFAULT);
+        mController.onResume(appRow, channel, null, null);
+        assertTrue(mController.isAvailable());
+    }
+
+    @Test
+    public void testUpdateState_disabledByAdmin_disableSecure() throws Exception {
+        ShadowRestrictionUtils.setRestricted(true);
+        UserInfo userInfo = new UserInfo(2, "user 2", UserInfo.FLAG_MANAGED_PROFILE);
+        when(mUm.getUserInfo(anyInt())).thenReturn(userInfo);
+        List<ComponentName> components = new ArrayList<>();
+        components.add(new ComponentName("", ""));
+        when(mDm.getActiveAdminsAsUser(anyInt())).thenReturn(components);
+        when(mDm.getKeyguardDisabledFeatures(any(), anyInt()))
+                .thenReturn(KEYGUARD_DISABLE_SECURE_NOTIFICATIONS);
+
+        NotificationChannel channel = mock(NotificationChannel.class);
+        when(channel.getId()).thenReturn("something");
+        mController.onResume(new NotificationBackend.AppRow(), channel, null, mock(
+                RestrictedLockUtils.EnforcedAdmin.class));
+
+        RestrictedDropDownPreference pref = mock(RestrictedDropDownPreference.class);
+        mController.updateState(pref);
+
+        verify(pref, times(2)).addRestrictedItem(any());
+    }
+
+    @Test
+    public void testUpdateState_disabledByAdmin_disableUnredacted() throws Exception {
+        ShadowRestrictionUtils.setRestricted(true);
+        UserInfo userInfo = new UserInfo(2, "user 2", UserInfo.FLAG_MANAGED_PROFILE);
+        when(mUm.getUserInfo(anyInt())).thenReturn(userInfo);
+        List<ComponentName> components = new ArrayList<>();
+        components.add(new ComponentName("", ""));
+        when(mDm.getActiveAdminsAsUser(anyInt())).thenReturn(components);
+        when(mDm.getKeyguardDisabledFeatures(any(), anyInt()))
+                .thenReturn(KEYGUARD_DISABLE_UNREDACTED_NOTIFICATIONS);
+
+        NotificationChannel channel = mock(NotificationChannel.class);
+        when(channel.getId()).thenReturn("something");
+        mController.onResume(new NotificationBackend.AppRow(), channel, null, mock(
+                RestrictedLockUtils.EnforcedAdmin.class));
+
+        RestrictedDropDownPreference pref = mock(RestrictedDropDownPreference.class);
+        mController.updateState(pref);
+
+        verify(pref, times(1)).addRestrictedItem(any());
+    }
+
+    @Test
+    public void testUpdateState_noLockScreenNotificationsGlobally() throws Exception {
+        Settings.Secure.putInt(mContext.getContentResolver(),
+                Settings.Secure.LOCK_SCREEN_SHOW_NOTIFICATIONS, 0);
+
+        NotificationBackend.AppRow appRow = new NotificationBackend.AppRow();
+        NotificationChannel channel = mock(NotificationChannel.class);
+        mController.onResume(appRow, channel, null, null);
+
+        RestrictedDropDownPreference pref = mock(RestrictedDropDownPreference.class);
+        mController.updateState(pref);
+
+        ArgumentCaptor<String[]> argumentCaptor = ArgumentCaptor.forClass(String[].class);
+        verify(pref, times(1)).setEntryValues(argumentCaptor.capture());
+        assertFalse(Arrays.asList(argumentCaptor.getValue())
+                .contains(VISIBILITY_NO_OVERRIDE));
+    }
+
+    @Test
+    public void testUpdateState_noPrivateLockScreenNotificationsGlobally() throws Exception {
+        Settings.Secure.putInt(mContext.getContentResolver(),
+                Settings.Secure.LOCK_SCREEN_ALLOW_PRIVATE_NOTIFICATIONS, 0);
+
+        NotificationBackend.AppRow appRow = new NotificationBackend.AppRow();
+        NotificationChannel channel = mock(NotificationChannel.class);
+        mController.onResume(appRow, channel, null, null);
+
+        RestrictedDropDownPreference pref = mock(RestrictedDropDownPreference.class);
+        mController.updateState(pref);
+
+        ArgumentCaptor<String[]> argumentCaptor = ArgumentCaptor.forClass(String[].class);
+        verify(pref, times(1)).setEntryValues(argumentCaptor.capture());
+        assertFalse(Arrays.asList(argumentCaptor.getValue())
+                .contains(VISIBILITY_NO_OVERRIDE));
+    }
+
+    @Test
+    public void testUpdateState_noGlobalRestriction() throws Exception {
+        NotificationBackend.AppRow appRow = new NotificationBackend.AppRow();
+        NotificationChannel channel = mock(NotificationChannel.class);
+        mController.onResume(appRow, channel, null, null);
+
+        RestrictedDropDownPreference pref = mock(RestrictedDropDownPreference.class);
+        mController.updateState(pref);
+
+        ArgumentCaptor<String[]> argumentCaptor = ArgumentCaptor.forClass(String[].class);
+        verify(pref, times(1)).setEntryValues(argumentCaptor.capture());
+        List<String> values = Arrays.asList(argumentCaptor.getValue());
+        assertEquals(3, values.size());
+        assertTrue(values.contains(String.valueOf(VISIBILITY_NO_OVERRIDE)));
+        assertTrue(values.contains(String.valueOf(Notification.VISIBILITY_PRIVATE)));
+        assertTrue(values.contains(String.valueOf(Notification.VISIBILITY_SECRET)));
+    }
+
+    @Test
+    public void testUpdateState_noChannelOverride() throws Exception {
+        Settings.Secure.putInt(mContext.getContentResolver(),
+                Settings.Secure.LOCK_SCREEN_ALLOW_PRIVATE_NOTIFICATIONS, 0);
+
+        NotificationBackend.AppRow appRow = new NotificationBackend.AppRow();
+        NotificationChannel channel = mock(NotificationChannel.class);
+        when(channel.getLockscreenVisibility()).thenReturn(VISIBILITY_NO_OVERRIDE);
+        mController.onResume(appRow, channel, null, null);
+
+        RestrictedDropDownPreference pref = mock(RestrictedDropDownPreference.class);
+        mController.updateState(pref);
+
+        ArgumentCaptor<String> argumentCaptor = ArgumentCaptor.forClass(String.class);
+        verify(pref, times(1)).setValue(argumentCaptor.capture());
+
+        assertEquals(String.valueOf(Notification.VISIBILITY_PRIVATE), argumentCaptor.getValue());
+    }
+
+    @Test
+    public void testUpdateState_channelOverride() throws Exception {
+        Settings.Secure.putInt(mContext.getContentResolver(),
+                Settings.Secure.LOCK_SCREEN_ALLOW_PRIVATE_NOTIFICATIONS, 0);
+
+        NotificationBackend.AppRow appRow = new NotificationBackend.AppRow();
+        NotificationChannel channel = mock(NotificationChannel.class);
+        when(channel.getLockscreenVisibility()).thenReturn(Notification.VISIBILITY_SECRET);
+        mController.onResume(appRow, channel, null, null);
+
+        RestrictedDropDownPreference pref = mock(RestrictedDropDownPreference.class);
+        mController.updateState(pref);
+
+        ArgumentCaptor<String> argumentCaptor = ArgumentCaptor.forClass(String.class);
+        verify(pref, times(1)).setValue(argumentCaptor.capture());
+
+        assertEquals(String.valueOf(Notification.VISIBILITY_SECRET), argumentCaptor.getValue());
+    }
+
+    @Test
+    public void testOnPreferenceChange_noOverride() {
+        Settings.Secure.putInt(mContext.getContentResolver(),
+                Settings.Secure.LOCK_SCREEN_ALLOW_PRIVATE_NOTIFICATIONS, 0);
+
+        NotificationBackend.AppRow appRow = new NotificationBackend.AppRow();
+        NotificationChannel channel = new NotificationChannel("", "", 4);
+        channel.setLockscreenVisibility(Notification.VISIBILITY_SECRET);
+        mController.onResume(appRow, channel, null, null);
+
+        RestrictedDropDownPreference pref = mock(RestrictedDropDownPreference.class);
+        mController.updateState(pref);
+
+        mController.onPreferenceChange(pref, String.valueOf(Notification.VISIBILITY_PRIVATE));
+
+        assertEquals(VISIBILITY_NO_OVERRIDE, channel.getLockscreenVisibility());
+        verify(mBackend, times(1)).updateChannel(any(), anyInt(), any());
+    }
+
+    @Test
+    public void testOnPreferenceChange_override() {
+        Settings.Secure.putInt(mContext.getContentResolver(),
+                Settings.Secure.LOCK_SCREEN_ALLOW_PRIVATE_NOTIFICATIONS, 0);
+
+        NotificationBackend.AppRow appRow = new NotificationBackend.AppRow();
+        NotificationChannel channel = new NotificationChannel("", "", 4);
+        channel.setLockscreenVisibility(VISIBILITY_NO_OVERRIDE);
+        mController.onResume(appRow, channel, null, null);
+
+        RestrictedDropDownPreference pref = mock(RestrictedDropDownPreference.class);
+        mController.updateState(pref);
+
+        mController.onPreferenceChange(pref, String.valueOf(Notification.VISIBILITY_SECRET));
+
+        assertEquals(Notification.VISIBILITY_SECRET, channel.getLockscreenVisibility());
+        verify(mBackend, times(1)).updateChannel(any(), anyInt(), any());
+    }
+}
diff --git a/tests/robotests/src/com/android/settings/notification/VolumeSeekBarPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/VolumeSeekBarPreferenceControllerTest.java
index a1d9205..f659e82 100644
--- a/tests/robotests/src/com/android/settings/notification/VolumeSeekBarPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/notification/VolumeSeekBarPreferenceControllerTest.java
@@ -38,7 +38,7 @@
 import org.robolectric.annotation.Config;
 
 @RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION_O)
 public class VolumeSeekBarPreferenceControllerTest {
 
     @Mock
diff --git a/tests/robotests/src/com/android/settings/notification/VolumeSeekBarPreferenceTest.java b/tests/robotests/src/com/android/settings/notification/VolumeSeekBarPreferenceTest.java
index b091cd3..df98cff 100644
--- a/tests/robotests/src/com/android/settings/notification/VolumeSeekBarPreferenceTest.java
+++ b/tests/robotests/src/com/android/settings/notification/VolumeSeekBarPreferenceTest.java
@@ -35,7 +35,7 @@
 import org.robolectric.annotation.Config;
 
 @RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION_O)
 public class VolumeSeekBarPreferenceTest {
 
     @Mock
diff --git a/tests/robotests/src/com/android/settings/notification/WorkSoundPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/WorkSoundPreferenceControllerTest.java
index 0c826ed..a9abdce 100644
--- a/tests/robotests/src/com/android/settings/notification/WorkSoundPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/notification/WorkSoundPreferenceControllerTest.java
@@ -49,7 +49,7 @@
 import org.robolectric.annotation.Config;
 
 @RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION_O)
 public class WorkSoundPreferenceControllerTest {
 
     private static final String KEY_WORK_CATEGORY = "sound_work_settings_section";
diff --git a/tests/robotests/src/com/android/settings/notification/ZenAccessSettingsTest.java b/tests/robotests/src/com/android/settings/notification/ZenAccessSettingsTest.java
index 591378f..f65752f 100644
--- a/tests/robotests/src/com/android/settings/notification/ZenAccessSettingsTest.java
+++ b/tests/robotests/src/com/android/settings/notification/ZenAccessSettingsTest.java
@@ -36,7 +36,7 @@
 import static org.mockito.Mockito.verify;
 
 @RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION_O)
 public class ZenAccessSettingsTest {
 
     @Mock(answer = Answers.RETURNS_DEEP_STUBS)
diff --git a/tests/robotests/src/com/android/settings/notification/ZenModeAlarmsPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/ZenModeAlarmsPreferenceControllerTest.java
new file mode 100644
index 0000000..06ca70a
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/notification/ZenModeAlarmsPreferenceControllerTest.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.notification;
+
+import static android.provider.Settings.Global.ZEN_MODE;
+import static android.provider.Settings.Global.ZEN_MODE_ALARMS;
+import static android.provider.Settings.Global.ZEN_MODE_IMPORTANT_INTERRUPTIONS;
+import static android.provider.Settings.Global.ZEN_MODE_NO_INTERRUPTIONS;
+
+import static junit.framework.Assert.assertEquals;
+
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+import android.app.NotificationManager;
+import android.content.ContentResolver;
+import android.content.Context;
+import android.provider.Settings;
+import android.support.v14.preference.SwitchPreference;
+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.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.annotation.Config;
+import org.robolectric.shadows.ShadowApplication;
+import org.robolectric.RuntimeEnvironment;
+import org.robolectric.util.ReflectionHelpers;
+
+@RunWith(SettingsRobolectricTestRunner.class)
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION_O)
+public class ZenModeAlarmsPreferenceControllerTest {
+    private ZenModeAlarmsPreferenceController mController;
+
+    @Mock
+    private ZenModeBackend mBackend;
+    @Mock
+    private NotificationManager mNotificationManager;
+    @Mock
+    private SwitchPreference mockPref;
+    @Mock
+    private NotificationManager.Policy mPolicy;
+    @Mock
+    private PreferenceScreen mPreferenceScreen;
+
+    private Context mContext;
+    private ContentResolver mContentResolver;
+
+    private final boolean ALARMS_SETTINGS = true;
+
+    @Before
+    public void setup() {
+        MockitoAnnotations.initMocks(this);
+        ShadowApplication shadowApplication = ShadowApplication.getInstance();
+        shadowApplication.setSystemService(Context.NOTIFICATION_SERVICE, mNotificationManager);
+
+        mContext = shadowApplication.getApplicationContext();
+        mContentResolver = RuntimeEnvironment.application.getContentResolver();
+        when(mNotificationManager.getNotificationPolicy()).thenReturn(mPolicy);
+        mController = new ZenModeAlarmsPreferenceController(mContext, mock(Lifecycle.class));
+        ReflectionHelpers.setField(mController, "mBackend", mBackend);
+
+        when(mPreferenceScreen.findPreference(mController.getPreferenceKey())).thenReturn(
+                mockPref);
+        mController.displayPreference(mPreferenceScreen);
+    }
+
+    @Test
+    public void updateState_TotalSilence() {
+        Settings.Global.putInt(mContentResolver, ZEN_MODE, ZEN_MODE_NO_INTERRUPTIONS);
+
+        final SwitchPreference mockPref = mock(SwitchPreference.class);
+        mController.updateState(mockPref);
+
+        verify(mockPref).setEnabled(false);
+        verify(mockPref).setChecked(false);
+    }
+
+    @Test
+    public void updateState_AlarmsOnly() {
+        Settings.Global.putInt(mContentResolver, ZEN_MODE, ZEN_MODE_ALARMS);
+
+        final SwitchPreference mockPref = mock(SwitchPreference.class);
+        mController.updateState(mockPref);
+
+        verify(mockPref).setEnabled(false);
+        verify(mockPref).setChecked(true);
+    }
+
+    @Test
+    public void updateState_Priority() {
+        Settings.Global.putInt(mContentResolver, ZEN_MODE, ZEN_MODE_IMPORTANT_INTERRUPTIONS);
+
+        when(mBackend.isPriorityCategoryEnabled(
+                NotificationManager.Policy.PRIORITY_CATEGORY_ALARMS)).thenReturn(ALARMS_SETTINGS);
+
+        mController.updateState(mockPref);
+
+        verify(mockPref).setEnabled(true);
+        verify(mockPref).setChecked(ALARMS_SETTINGS);
+    }
+
+    @Test
+    public void onPreferenceChanged_EnableAlarms() {
+        boolean allowAlarms = true;
+        mController.onPreferenceChange(mockPref, allowAlarms);
+
+        verify(mBackend).saveSoundPolicy(NotificationManager.Policy.PRIORITY_CATEGORY_ALARMS,
+                allowAlarms);
+    }
+
+    @Test
+    public void onPreferenceChanged_DisableAlarms() {
+        boolean allowAlarms = false;
+        mController.onPreferenceChange(mockPref, allowAlarms);
+
+        verify(mBackend).saveSoundPolicy(NotificationManager.Policy.PRIORITY_CATEGORY_ALARMS,
+                allowAlarms);
+    }
+}
\ No newline at end of file
diff --git a/tests/robotests/src/com/android/settings/notification/ZenModeButtonPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/ZenModeButtonPreferenceControllerTest.java
new file mode 100644
index 0000000..a6f7b2b
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/notification/ZenModeButtonPreferenceControllerTest.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.notification;
+
+import static android.provider.Settings.Global.ZEN_MODE;
+import static android.provider.Settings.Global.ZEN_MODE_ALARMS;
+import static android.provider.Settings.Global.ZEN_MODE_IMPORTANT_INTERRUPTIONS;
+import static android.provider.Settings.Global.ZEN_MODE_NO_INTERRUPTIONS;
+import static android.provider.Settings.Global.ZEN_MODE_OFF;
+
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+import android.app.NotificationManager;
+import android.content.ContentResolver;
+import android.content.Context;
+import android.provider.Settings;
+import android.support.v7.preference.Preference;
+import android.support.v7.preference.PreferenceScreen;
+import android.view.View;
+import android.widget.Button;
+
+import com.android.settings.TestConfig;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
+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.annotation.Config;
+import org.robolectric.shadows.ShadowApplication;
+import org.robolectric.RuntimeEnvironment;
+import org.robolectric.util.ReflectionHelpers;
+
+@RunWith(SettingsRobolectricTestRunner.class)
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION_O)
+public class ZenModeButtonPreferenceControllerTest {
+    private ZenModeButtonPreferenceController mController;
+
+    @Mock
+    private ZenModeBackend mBackend;
+    @Mock
+    private NotificationManager mNotificationManager;
+    @Mock
+    private Preference mockPref;
+    @Mock
+    private NotificationManager.Policy mPolicy;
+    @Mock
+    private Button mZenButtonOn;
+    @Mock
+    private Button mZenButtonOff;
+    @Mock
+    private PreferenceScreen mPreferenceScreen;
+    private ContentResolver mContentResolver;
+    private Context mContext;
+
+    @Before
+    public void setup() {
+        MockitoAnnotations.initMocks(this);
+        ShadowApplication shadowApplication = ShadowApplication.getInstance();
+        shadowApplication.setSystemService(Context.NOTIFICATION_SERVICE, mNotificationManager);
+
+        mContext = shadowApplication.getApplicationContext();
+        mContentResolver = RuntimeEnvironment.application.getContentResolver();
+        mController = new ZenModeButtonPreferenceController(mContext, mock(Lifecycle.class));
+        when(mNotificationManager.getNotificationPolicy()).thenReturn(mPolicy);
+        ReflectionHelpers.setField(mController, "mBackend", mBackend);
+        ReflectionHelpers.setField(mController, "mZenButtonOn", mZenButtonOn);
+        ReflectionHelpers.setField(mController, "mZenButtonOff", mZenButtonOff);
+
+        when(mPreferenceScreen.findPreference(mController.getPreferenceKey())).thenReturn(
+                mockPref);
+        mController.displayPreference(mPreferenceScreen);
+    }
+
+    @Test
+    public void updateState_TotalSilence() {
+        Settings.Global.putInt(mContentResolver, ZEN_MODE, ZEN_MODE_NO_INTERRUPTIONS);
+        final Preference mockPref = mock(Preference.class);
+        mController.updateState(mockPref);
+
+        verify(mZenButtonOn).setVisibility(View.GONE);
+        verify(mZenButtonOff).setVisibility(View.VISIBLE);
+    }
+
+    @Test
+    public void updateState_AlarmsOnly() {
+        Settings.Global.putInt(mContentResolver, ZEN_MODE, ZEN_MODE_ALARMS);
+        final Preference mockPref = mock(Preference.class);
+        mController.updateState(mockPref);
+
+        verify(mZenButtonOn).setVisibility(View.GONE);
+        verify(mZenButtonOff).setVisibility(View.VISIBLE);
+    }
+
+    @Test
+    public void updateState_Priority() {
+        Settings.Global.putInt(mContentResolver, ZEN_MODE, ZEN_MODE_IMPORTANT_INTERRUPTIONS);
+        final Preference mockPref = mock(Preference.class);
+        mController.updateState(mockPref);
+
+        verify(mZenButtonOn).setVisibility(View.GONE);
+        verify(mZenButtonOff).setVisibility(View.VISIBLE);
+    }
+
+    @Test
+    public void updateState_ZenOff() {
+        Settings.Global.putInt(mContentResolver, ZEN_MODE, ZEN_MODE_OFF);
+        final Preference mockPref = mock(Preference.class);
+        mController.updateState(mockPref);
+
+        verify(mZenButtonOn).setVisibility(View.VISIBLE);
+        verify(mZenButtonOff).setVisibility(View.GONE);
+    }
+
+    @Test
+    public void updateState_otherUserChangedZen() {
+        final Preference mockPref = mock(Preference.class);
+        Settings.Global.putInt(mContentResolver, ZEN_MODE, ZEN_MODE_OFF);
+        mController.updateState(mockPref);
+        verify(mZenButtonOn).setVisibility(View.VISIBLE);
+        verify(mZenButtonOff).setVisibility(View.GONE);
+
+        Settings.Global.putInt(mContentResolver, ZEN_MODE, ZEN_MODE_IMPORTANT_INTERRUPTIONS);
+        final int GUEST_USER_ID = 10;
+        mController.mSettingObserver.onChange(false,
+                Settings.Global.getUriFor(Settings.Global.ZEN_MODE), GUEST_USER_ID);
+
+        verify(mZenButtonOn).setVisibility(View.GONE);
+        verify(mZenButtonOff).setVisibility(View.VISIBLE);
+    }
+}
\ No newline at end of file
diff --git a/tests/robotests/src/com/android/settings/notification/ZenModeCallsPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/ZenModeCallsPreferenceControllerTest.java
new file mode 100644
index 0000000..ea7e9f5
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/notification/ZenModeCallsPreferenceControllerTest.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.notification;
+
+import static android.provider.Settings.Global.ZEN_MODE;
+import static android.provider.Settings.Global.ZEN_MODE_ALARMS;
+import static android.provider.Settings.Global.ZEN_MODE_IMPORTANT_INTERRUPTIONS;
+import static android.provider.Settings.Global.ZEN_MODE_NO_INTERRUPTIONS;
+
+import static junit.framework.Assert.assertEquals;
+
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+import android.app.NotificationManager;
+import android.content.ContentResolver;
+import android.content.Context;
+import android.provider.Settings;
+import android.support.v7.preference.Preference;
+import android.support.v7.preference.PreferenceScreen;
+
+import com.android.settings.R;
+import com.android.settings.TestConfig;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
+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.annotation.Config;
+import org.robolectric.shadows.ShadowApplication;
+import org.robolectric.RuntimeEnvironment;
+import org.robolectric.util.ReflectionHelpers;
+
+@RunWith(SettingsRobolectricTestRunner.class)
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION_O)
+public class ZenModeCallsPreferenceControllerTest {
+    private ZenModeCallsPreferenceController mController;
+
+    @Mock
+    private ZenModeBackend mBackend;
+    @Mock
+    private NotificationManager mNotificationManager;
+    @Mock
+    private Preference mockPref;
+    @Mock
+    private NotificationManager.Policy mPolicy;
+    @Mock
+    private PreferenceScreen mPreferenceScreen;
+    private ContentResolver mContentResolver;
+    private Context mContext;
+
+    private final boolean CALLS_SETTINGS = true;
+    private final int MOCK_CALLS_SENDERS = NotificationManager.Policy.PRIORITY_SENDERS_STARRED;
+    private final int SUMMARY_ID_MOCK_CALLS_SENDERS = R.string.zen_mode_from_starred;
+
+    @Before
+    public void setup() {
+        MockitoAnnotations.initMocks(this);
+        ShadowApplication shadowApplication = ShadowApplication.getInstance();
+        shadowApplication.setSystemService(Context.NOTIFICATION_SERVICE, mNotificationManager);
+
+        mContext = shadowApplication.getApplicationContext();
+        mContentResolver = RuntimeEnvironment.application.getContentResolver();
+        when(mNotificationManager.getNotificationPolicy()).thenReturn(mPolicy);
+        when(mBackend.getContactsSummary(ZenModeBackend.SOURCE_NONE))
+                .thenCallRealMethod();
+        when(mBackend.getContactsSummary(NotificationManager.Policy.PRIORITY_CATEGORY_CALLS))
+                .thenCallRealMethod();
+
+        mController = new ZenModeCallsPreferenceController(mContext, mock(Lifecycle.class));
+        ReflectionHelpers.setField(mController, "mBackend", mBackend);
+
+        when(mPreferenceScreen.findPreference(mController.getPreferenceKey())).thenReturn(
+                mockPref);
+        mController.displayPreference(mPreferenceScreen);
+    }
+
+    @Test
+    public void updateState_TotalSilence() {
+        Settings.Global.putInt(mContentResolver, ZEN_MODE, ZEN_MODE_NO_INTERRUPTIONS);
+        when(mBackend.isPriorityCategoryEnabled(
+                NotificationManager.Policy.PRIORITY_CATEGORY_MESSAGES))
+                .thenReturn(false);
+        final Preference mockPref = mock(Preference.class);
+        mController.updateState(mockPref);
+
+        verify(mockPref).setEnabled(false);
+        verify(mockPref).setSummary(R.string.zen_mode_from_none);
+    }
+
+    @Test
+    public void updateState_AlarmsOnly() {
+        Settings.Global.putInt(mContentResolver, ZEN_MODE, ZEN_MODE_ALARMS);
+
+        final Preference mockPref = mock(Preference.class);
+        mController.updateState(mockPref);
+
+        verify(mockPref).setEnabled(false);
+        verify(mockPref).setSummary(R.string.zen_mode_from_none);
+    }
+
+    @Test
+    public void updateState_Priority() {
+        Settings.Global.putInt(mContentResolver, ZEN_MODE, ZEN_MODE_IMPORTANT_INTERRUPTIONS);
+        when(mBackend.isPriorityCategoryEnabled(
+                NotificationManager.Policy.PRIORITY_CATEGORY_CALLS))
+                .thenReturn(CALLS_SETTINGS);
+        when(mBackend.getPriorityCallSenders()).thenReturn(MOCK_CALLS_SENDERS);
+
+        mController.updateState(mockPref);
+
+        verify(mockPref).setEnabled(true);
+        verify(mockPref).setSummary(SUMMARY_ID_MOCK_CALLS_SENDERS);
+    }
+}
\ No newline at end of file
diff --git a/tests/robotests/src/com/android/settings/notification/ZenModeCallsTest.java b/tests/robotests/src/com/android/settings/notification/ZenModeCallsTest.java
new file mode 100644
index 0000000..c495759
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/notification/ZenModeCallsTest.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.notification;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+import android.app.Activity;
+import android.app.NotificationManager;
+import android.content.Context;
+import android.os.UserManager;
+import android.provider.Settings;
+
+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.annotation.Config;
+import org.robolectric.util.ReflectionHelpers;
+
+@RunWith(SettingsRobolectricTestRunner.class)
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION_O)
+public class ZenModeCallsTest {
+    private ZenModeCallsSettings mCalls;
+    @Mock(answer = Answers.RETURNS_DEEP_STUBS)
+    private ZenModeBackend mBackend;
+    @Mock(answer = Answers.RETURNS_DEEP_STUBS)
+    private Activity mActivity;
+    @Mock
+    private UserManager mUserManager;
+    @Mock
+    private NotificationManager mNotificationManager;
+
+    @Before
+    public void setup() {
+        MockitoAnnotations.initMocks(this);
+        when(mActivity.getSystemService(Context.USER_SERVICE)).thenReturn(mUserManager);
+        when(mActivity.getSystemService(Context.NOTIFICATION_SERVICE))
+                .thenReturn(mNotificationManager);
+        FakeFeatureFactory.setupForTest(mActivity);
+
+        mCalls = new ZenModeCallsSettings();
+        mCalls.onAttach((Context)mActivity);
+
+        ReflectionHelpers.setField(mCalls, "mBackend", mBackend);
+    }
+
+    @Test
+    public void getDefaultKeyReturnsBasedOnZen() {
+        when(mBackend.getSendersKey(NotificationManager.Policy.PRIORITY_CATEGORY_CALLS))
+                .thenCallRealMethod();
+        when(mBackend.getZenMode()).thenReturn(Settings.Global.ZEN_MODE_NO_INTERRUPTIONS);
+        assertThat(mCalls.getDefaultKey())
+                .isEqualTo(mBackend.getKeyFromSetting(mBackend.SOURCE_NONE));
+
+        when(mBackend.getZenMode()).thenReturn(Settings.Global.ZEN_MODE_ALARMS);
+        assertThat(mCalls.getDefaultKey())
+                .isEqualTo(mBackend.getKeyFromSetting(mBackend.SOURCE_NONE));
+
+        when(mBackend.getZenMode()).thenReturn(Settings.Global.ZEN_MODE_IMPORTANT_INTERRUPTIONS);
+        when(mBackend.isPriorityCategoryEnabled(
+                NotificationManager.Policy.PRIORITY_CATEGORY_CALLS))
+                .thenReturn(true);
+        when(mBackend.getPriorityMessageSenders())
+                .thenReturn(NotificationManager.Policy.PRIORITY_SENDERS_ANY);
+        assertThat(mCalls.getDefaultKey())
+                .isEqualTo(mBackend.getKeyFromSetting(
+                        NotificationManager.Policy.PRIORITY_SENDERS_ANY));
+    }
+
+    @Test
+    public void setAnySender() {
+        String key = mBackend.getKeyFromSetting(NotificationManager.Policy.PRIORITY_SENDERS_ANY);
+        mCalls.setDefaultKey(key);
+        verify(mBackend).saveSenders(NotificationManager.Policy.PRIORITY_CATEGORY_CALLS,
+                mBackend.getSettingFromPrefKey(key));
+    }
+
+    @Test
+    public void setNoSender() {
+        String key = mBackend.getKeyFromSetting(ZenModeBackend.SOURCE_NONE);
+        mCalls.setDefaultKey(key);
+        verify(mBackend).saveSenders(NotificationManager.Policy.PRIORITY_CATEGORY_CALLS,
+                mBackend.getSettingFromPrefKey(key));
+    }
+
+    @Test
+    public void setStarredSenders() {
+        String key = mBackend.getKeyFromSetting(
+                NotificationManager.Policy.PRIORITY_SENDERS_STARRED);
+        mCalls.setDefaultKey(key);
+        verify(mBackend).saveSenders(NotificationManager.Policy.PRIORITY_CATEGORY_CALLS,
+                mBackend.getSettingFromPrefKey(key));
+    }
+
+    @Test
+    public void setContactsOnlySenders() {
+        String key = mBackend.getKeyFromSetting(
+                NotificationManager.Policy.PRIORITY_SENDERS_CONTACTS);
+        mCalls.setDefaultKey(key);
+        verify(mBackend).saveSenders(NotificationManager.Policy.PRIORITY_CATEGORY_CALLS,
+                mBackend.getSettingFromPrefKey(key));
+    }
+}
\ No newline at end of file
diff --git a/tests/robotests/src/com/android/settings/notification/ZenModeEventsPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/ZenModeEventsPreferenceControllerTest.java
new file mode 100644
index 0000000..b527abf
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/notification/ZenModeEventsPreferenceControllerTest.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.notification;
+
+import static android.provider.Settings.Global.ZEN_MODE;
+import static android.provider.Settings.Global.ZEN_MODE_ALARMS;
+import static android.provider.Settings.Global.ZEN_MODE_IMPORTANT_INTERRUPTIONS;
+import static android.provider.Settings.Global.ZEN_MODE_NO_INTERRUPTIONS;
+
+import static junit.framework.Assert.assertEquals;
+
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+import android.app.NotificationManager;
+import android.content.ContentResolver;
+import android.content.Context;
+import android.provider.Settings;
+import android.support.v14.preference.SwitchPreference;
+import android.support.v7.preference.PreferenceScreen;
+
+import com.android.settings.TestConfig;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
+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.shadows.ShadowApplication;
+import org.robolectric.annotation.Config;
+import org.robolectric.util.ReflectionHelpers;
+
+@RunWith(SettingsRobolectricTestRunner.class)
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION_O)
+public class ZenModeEventsPreferenceControllerTest {
+    private ZenModeEventsPreferenceController mController;
+
+    @Mock
+    private ZenModeBackend mBackend;
+    @Mock
+    private NotificationManager mNotificationManager;
+    @Mock
+    private SwitchPreference mockPref;
+    @Mock
+    private NotificationManager.Policy mPolicy;
+    @Mock
+    private PreferenceScreen mPreferenceScreen;
+    private ContentResolver mContentResolver;
+    private Context mContext;
+
+    private final boolean EVENTS_SETTINGS = true;
+
+    @Before
+    public void setup() {
+        MockitoAnnotations.initMocks(this);
+        ShadowApplication shadowApplication = ShadowApplication.getInstance();
+        shadowApplication.setSystemService(Context.NOTIFICATION_SERVICE, mNotificationManager);
+
+        mContext = shadowApplication.getApplicationContext();
+        mContentResolver = RuntimeEnvironment.application.getContentResolver();
+        when(mNotificationManager.getNotificationPolicy()).thenReturn(mPolicy);
+
+        mController = new ZenModeEventsPreferenceController(mContext, mock(Lifecycle.class));
+        ReflectionHelpers.setField(mController, "mBackend", mBackend);
+
+        when(mPreferenceScreen.findPreference(mController.getPreferenceKey())).thenReturn(
+                mockPref);
+        mController.displayPreference(mPreferenceScreen);
+    }
+
+    @Test
+    public void updateState_TotalSilence() {
+        Settings.Global.putInt(mContentResolver, ZEN_MODE, ZEN_MODE_NO_INTERRUPTIONS);
+
+        final SwitchPreference mockPref = mock(SwitchPreference.class);
+        mController.updateState(mockPref);
+
+        verify(mockPref).setEnabled(false);
+        verify(mockPref).setChecked(false);
+    }
+
+    @Test
+    public void updateState_AlarmsOnly() {
+        Settings.Global.putInt(mContentResolver, ZEN_MODE, ZEN_MODE_ALARMS);
+
+        final SwitchPreference mockPref = mock(SwitchPreference.class);
+        mController.updateState(mockPref);
+
+        verify(mockPref).setEnabled(false);
+        verify(mockPref).setChecked(false);
+    }
+
+    @Test
+    public void updateState_Priority() {
+        Settings.Global.putInt(mContentResolver, ZEN_MODE, ZEN_MODE_IMPORTANT_INTERRUPTIONS);
+
+        when(mBackend.isPriorityCategoryEnabled(
+                NotificationManager.Policy.PRIORITY_CATEGORY_EVENTS)).thenReturn(EVENTS_SETTINGS);
+
+        mController.updateState(mockPref);
+
+        verify(mockPref).setEnabled(true);
+        verify(mockPref).setChecked(EVENTS_SETTINGS);
+    }
+
+    @Test
+    public void onPreferenceChanged_EnableEvents() {
+        boolean allow = true;
+        mController.onPreferenceChange(mockPref, allow);
+
+        verify(mBackend).saveSoundPolicy(NotificationManager.Policy.PRIORITY_CATEGORY_EVENTS,
+                allow);
+    }
+
+    @Test
+    public void onPreferenceChanged_DisableEvents() {
+        boolean allow = false;
+        mController.onPreferenceChange(mockPref, allow);
+
+        verify(mBackend).saveSoundPolicy(NotificationManager.Policy.PRIORITY_CATEGORY_EVENTS,
+                allow);
+    }
+}
\ No newline at end of file
diff --git a/tests/robotests/src/com/android/settings/notification/ZenModeMediaPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/ZenModeMediaPreferenceControllerTest.java
new file mode 100644
index 0000000..976d6d4
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/notification/ZenModeMediaPreferenceControllerTest.java
@@ -0,0 +1,145 @@
+/*
+ * Copyright (C) 2017 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF 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 android.provider.Settings.Global.ZEN_MODE;
+import static android.provider.Settings.Global.ZEN_MODE_ALARMS;
+import static android.provider.Settings.Global.ZEN_MODE_IMPORTANT_INTERRUPTIONS;
+import static android.provider.Settings.Global.ZEN_MODE_NO_INTERRUPTIONS;
+
+import static junit.framework.Assert.assertEquals;
+
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+import android.app.NotificationManager;
+import android.content.ContentResolver;
+import android.content.Context;
+import android.provider.Settings;
+import android.support.v14.preference.SwitchPreference;
+import android.support.v7.preference.PreferenceScreen;
+
+import com.android.settings.TestConfig;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
+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.annotation.Config;
+import org.robolectric.shadows.ShadowApplication;
+import org.robolectric.RuntimeEnvironment;
+import org.robolectric.util.ReflectionHelpers;
+
+@RunWith(SettingsRobolectricTestRunner.class)
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION_O)
+public class ZenModeMediaPreferenceControllerTest {
+    private ZenModeMediaSystemOtherPreferenceController mController;
+
+    @Mock(answer = Answers.RETURNS_DEEP_STUBS)
+    private Context mContext;
+    @Mock
+    private ZenModeBackend mBackend;
+    @Mock
+    private NotificationManager mNotificationManager;
+    @Mock
+    private SwitchPreference mockPref;
+    @Mock
+    private NotificationManager.Policy mPolicy;
+    @Mock
+    private PreferenceScreen mPreferenceScreen;
+    private ContentResolver mContentResolver;
+
+    private final boolean MEDIA_SETTINGS = true;
+
+    @Before
+    public void setup() {
+        MockitoAnnotations.initMocks(this);
+        ShadowApplication shadowApplication = ShadowApplication.getInstance();
+        shadowApplication.setSystemService(Context.NOTIFICATION_SERVICE, mNotificationManager);
+
+        mContext = shadowApplication.getApplicationContext();
+        mContentResolver = RuntimeEnvironment.application.getContentResolver();
+        when(mNotificationManager.getNotificationPolicy()).thenReturn(mPolicy);
+
+        mController = new ZenModeMediaSystemOtherPreferenceController(mContext,
+                mock(Lifecycle.class));
+        ReflectionHelpers.setField(mController, "mBackend", mBackend);
+
+        when(mPreferenceScreen.findPreference(mController.getPreferenceKey())).thenReturn(
+                mockPref);
+        mController.displayPreference(mPreferenceScreen);
+    }
+
+    @Test
+    public void updateState_TotalSilence() {
+        Settings.Global.putInt(mContentResolver, ZEN_MODE, ZEN_MODE_NO_INTERRUPTIONS);
+
+        final SwitchPreference mockPref = mock(SwitchPreference.class);
+        mController.updateState(mockPref);
+
+        verify(mockPref).setEnabled(false);
+        verify(mockPref).setChecked(false);
+    }
+
+    @Test
+    public void updateState_AlarmsOnly() {
+        Settings.Global.putInt(mContentResolver, ZEN_MODE, ZEN_MODE_ALARMS);
+
+        final SwitchPreference mockPref = mock(SwitchPreference.class);
+        mController.updateState(mockPref);
+
+        verify(mockPref).setEnabled(false);
+        verify(mockPref).setChecked(true);
+    }
+
+    @Test
+    public void updateState_Priority() {
+        Settings.Global.putInt(mContentResolver, ZEN_MODE, ZEN_MODE_IMPORTANT_INTERRUPTIONS);
+
+        when(mBackend.isPriorityCategoryEnabled(
+                NotificationManager.Policy.PRIORITY_CATEGORY_MEDIA_SYSTEM_OTHER)).
+                thenReturn(MEDIA_SETTINGS);
+
+        mController.updateState(mockPref);
+
+        verify(mockPref).setEnabled(true);
+        verify(mockPref).setChecked(MEDIA_SETTINGS);
+    }
+
+    @Test
+    public void onPreferenceChanged_EnableEvents() {
+        boolean allow = true;
+        mController.onPreferenceChange(mockPref, allow);
+
+        verify(mBackend).saveSoundPolicy(
+                NotificationManager.Policy.PRIORITY_CATEGORY_MEDIA_SYSTEM_OTHER, allow);
+    }
+
+    @Test
+    public void onPreferenceChanged_DisableEvents() {
+        boolean allow = false;
+        mController.onPreferenceChange(mockPref, allow);
+
+        verify(mBackend).saveSoundPolicy(
+                NotificationManager.Policy.PRIORITY_CATEGORY_MEDIA_SYSTEM_OTHER, allow);
+    }
+}
\ No newline at end of file
diff --git a/tests/robotests/src/com/android/settings/notification/ZenModeMessagesPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/ZenModeMessagesPreferenceControllerTest.java
new file mode 100644
index 0000000..c06f93f
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/notification/ZenModeMessagesPreferenceControllerTest.java
@@ -0,0 +1,140 @@
+/*
+ * Copyright (C) 2017 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.notification;
+
+import static android.provider.Settings.Global.ZEN_MODE;
+import static android.provider.Settings.Global.ZEN_MODE_ALARMS;
+import static android.provider.Settings.Global.ZEN_MODE_IMPORTANT_INTERRUPTIONS;
+import static android.provider.Settings.Global.ZEN_MODE_NO_INTERRUPTIONS;
+
+import static junit.framework.Assert.assertEquals;
+
+import static org.mockito.ArgumentMatchers.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;
+
+import android.app.NotificationManager;
+import android.content.ContentResolver;
+import android.content.Context;
+import android.provider.Settings;
+import android.support.v14.preference.SwitchPreference;
+import android.support.v7.preference.Preference;
+import android.support.v7.preference.PreferenceScreen;
+
+import com.android.settings.R;
+import com.android.settings.TestConfig;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
+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.annotation.Config;
+import org.robolectric.shadows.ShadowApplication;
+import org.robolectric.RuntimeEnvironment;
+import org.robolectric.util.ReflectionHelpers;
+
+@RunWith(SettingsRobolectricTestRunner.class)
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION_O)
+public class ZenModeMessagesPreferenceControllerTest {
+    private ZenModeMessagesPreferenceController mController;
+
+    @Mock
+    private ZenModeBackend mBackend;
+    @Mock
+    private NotificationManager mNotificationManager;
+    @Mock
+    private Preference mockPref;
+    @Mock
+    private NotificationManager.Policy mPolicy;
+    @Mock
+    private PreferenceScreen mPreferenceScreen;
+    private ContentResolver mContentResolver;
+    private Context mContext;
+
+    private final boolean MESSAGES_SETTINGS = true;
+    private final int MOCK_MESSAGES_SENDERS = NotificationManager.Policy.PRIORITY_SENDERS_STARRED;
+    private final int SUMMARY_ID_MOCK_MESSAGES_SENDERS = R.string.zen_mode_from_starred;
+
+    @Before
+    public void setup() {
+        MockitoAnnotations.initMocks(this);
+        ShadowApplication shadowApplication = ShadowApplication.getInstance();
+        shadowApplication.setSystemService(Context.NOTIFICATION_SERVICE, mNotificationManager);
+
+        mContext = shadowApplication.getApplicationContext();
+        mContentResolver = RuntimeEnvironment.application.getContentResolver();
+        when(mNotificationManager.getNotificationPolicy()).thenReturn(mPolicy);
+
+        when(mBackend.getPriorityMessageSenders()).thenReturn(MOCK_MESSAGES_SENDERS);
+        when(mBackend.getContactsSummary(ZenModeBackend.SOURCE_NONE))
+                .thenCallRealMethod();
+        when(mBackend.getContactsSummary(NotificationManager.Policy.PRIORITY_CATEGORY_MESSAGES))
+                .thenCallRealMethod();
+
+        mController = new ZenModeMessagesPreferenceController(mContext, mock(Lifecycle.class));
+        ReflectionHelpers.setField(mController, "mBackend", mBackend);
+
+        when(mPreferenceScreen.findPreference(mController.getPreferenceKey())).thenReturn(
+                mockPref);
+        mController.displayPreference(mPreferenceScreen);
+    }
+
+    @Test
+    public void updateState_TotalSilence() {
+        Settings.Global.putInt(mContentResolver, ZEN_MODE, ZEN_MODE_NO_INTERRUPTIONS);
+
+        when(mBackend.isPriorityCategoryEnabled(
+                NotificationManager.Policy.PRIORITY_CATEGORY_MESSAGES))
+                .thenReturn(false);
+        final Preference mockPref = mock(Preference.class);
+        mController.updateState(mockPref);
+
+        verify(mockPref).setEnabled(false);
+        verify(mockPref).setSummary(R.string.zen_mode_from_none);
+    }
+
+    @Test
+    public void updateState_AlarmsOnly() {
+        Settings.Global.putInt(mContentResolver, ZEN_MODE, ZEN_MODE_ALARMS);
+
+        final Preference mockPref = mock(Preference.class);
+        mController.updateState(mockPref);
+
+        verify(mockPref).setEnabled(false);
+        verify(mockPref).setSummary(R.string.zen_mode_from_none);
+    }
+
+    @Test
+    public void updateState_Priority() {
+        Settings.Global.putInt(mContentResolver, ZEN_MODE, ZEN_MODE_IMPORTANT_INTERRUPTIONS);
+
+        when(mBackend.isPriorityCategoryEnabled(
+                NotificationManager.Policy.PRIORITY_CATEGORY_MESSAGES))
+                .thenReturn(MESSAGES_SETTINGS);
+
+        mController.updateState(mockPref);
+
+        verify(mockPref).setEnabled(true);
+        verify(mockPref).setSummary(SUMMARY_ID_MOCK_MESSAGES_SENDERS);
+    }
+}
\ No newline at end of file
diff --git a/tests/robotests/src/com/android/settings/notification/ZenModeMessagesTest.java b/tests/robotests/src/com/android/settings/notification/ZenModeMessagesTest.java
new file mode 100644
index 0000000..03226f9
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/notification/ZenModeMessagesTest.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.notification;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+import android.app.Activity;
+import android.app.NotificationManager;
+import android.content.Context;
+import android.os.UserManager;
+import android.provider.Settings;
+
+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.annotation.Config;
+import org.robolectric.util.ReflectionHelpers;
+
+@RunWith(SettingsRobolectricTestRunner.class)
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION_O)
+public class ZenModeMessagesTest {
+    private ZenModeMessagesSettings mMessages;
+    @Mock(answer = Answers.RETURNS_DEEP_STUBS)
+    private ZenModeBackend mBackend;
+    @Mock(answer = Answers.RETURNS_DEEP_STUBS)
+    private Activity mActivity;
+    @Mock
+    private UserManager mUserManager;
+    @Mock
+    private NotificationManager mNotificationManager;
+
+    @Before
+    public void setup() {
+        MockitoAnnotations.initMocks(this);
+        when(mActivity.getSystemService(Context.USER_SERVICE)).thenReturn(mUserManager);
+        when(mActivity.getSystemService(Context.NOTIFICATION_SERVICE))
+                .thenReturn(mNotificationManager);
+        FakeFeatureFactory.setupForTest(mActivity);
+
+        mMessages = new ZenModeMessagesSettings();
+        mMessages.onAttach((Context)mActivity);
+
+        ReflectionHelpers.setField(mMessages, "mBackend", mBackend);
+    }
+
+    @Test
+    public void getDefaultKeyReturnsBasedOnZen() {
+        when(mBackend.getSendersKey(NotificationManager.Policy.PRIORITY_CATEGORY_MESSAGES))
+                .thenCallRealMethod();
+        when(mBackend.getZenMode()).thenReturn(Settings.Global.ZEN_MODE_NO_INTERRUPTIONS);
+        assertThat(mMessages.getDefaultKey())
+                .isEqualTo(mBackend.getKeyFromSetting(mBackend.SOURCE_NONE));
+
+        when(mBackend.getZenMode()).thenReturn(Settings.Global.ZEN_MODE_ALARMS);
+        assertThat(mMessages.getDefaultKey())
+                .isEqualTo(mBackend.getKeyFromSetting(mBackend.SOURCE_NONE));
+
+        when(mBackend.getZenMode()).thenReturn(Settings.Global.ZEN_MODE_IMPORTANT_INTERRUPTIONS);
+        when(mBackend.isPriorityCategoryEnabled(
+                NotificationManager.Policy.PRIORITY_CATEGORY_MESSAGES))
+                .thenReturn(true);
+        when(mBackend.getPriorityMessageSenders())
+                .thenReturn(NotificationManager.Policy.PRIORITY_SENDERS_ANY);
+        assertThat(mMessages.getDefaultKey())
+                .isEqualTo(mBackend.getKeyFromSetting(
+                        NotificationManager.Policy.PRIORITY_SENDERS_ANY));
+    }
+
+    @Test
+    public void setAnySender() {
+        String key = mBackend.getKeyFromSetting(NotificationManager.Policy.PRIORITY_SENDERS_ANY);
+        mMessages.setDefaultKey(key);
+        verify(mBackend).saveSenders(NotificationManager.Policy.PRIORITY_CATEGORY_MESSAGES,
+                mBackend.getSettingFromPrefKey(key));
+    }
+
+    @Test
+    public void setNoSender() {
+        String key = mBackend.getKeyFromSetting(ZenModeBackend.SOURCE_NONE);
+        mMessages.setDefaultKey(key);
+        verify(mBackend).saveSenders(NotificationManager.Policy.PRIORITY_CATEGORY_MESSAGES,
+                mBackend.getSettingFromPrefKey(key));
+    }
+
+    @Test
+    public void setStarredSenders() {
+        String key = mBackend.getKeyFromSetting(
+                NotificationManager.Policy.PRIORITY_SENDERS_STARRED);
+        mMessages.setDefaultKey(key);
+        verify(mBackend).saveSenders(NotificationManager.Policy.PRIORITY_CATEGORY_MESSAGES,
+                mBackend.getSettingFromPrefKey(key));
+    }
+
+    @Test
+    public void setContactsOnlySenders() {
+        String key = mBackend.getKeyFromSetting(
+                NotificationManager.Policy.PRIORITY_SENDERS_CONTACTS);
+        mMessages.setDefaultKey(key);
+        verify(mBackend).saveSenders(NotificationManager.Policy.PRIORITY_CATEGORY_MESSAGES,
+                mBackend.getSettingFromPrefKey(key));
+    }
+}
\ No newline at end of file
diff --git a/tests/robotests/src/com/android/settings/notification/ZenModePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/ZenModePreferenceControllerTest.java
index 1d71a8a..0a28673 100644
--- a/tests/robotests/src/com/android/settings/notification/ZenModePreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/notification/ZenModePreferenceControllerTest.java
@@ -43,7 +43,7 @@
 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_O)
 public class ZenModePreferenceControllerTest {
 
     @Mock
diff --git a/tests/robotests/src/com/android/settings/notification/ZenModeRemindersPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/ZenModeRemindersPreferenceControllerTest.java
new file mode 100644
index 0000000..9d8b011
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/notification/ZenModeRemindersPreferenceControllerTest.java
@@ -0,0 +1,144 @@
+/*
+ * Copyright (C) 2017 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF 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 android.provider.Settings.Global.ZEN_MODE;
+import static android.provider.Settings.Global.ZEN_MODE_ALARMS;
+import static android.provider.Settings.Global.ZEN_MODE_IMPORTANT_INTERRUPTIONS;
+import static android.provider.Settings.Global.ZEN_MODE_NO_INTERRUPTIONS;
+
+import static junit.framework.Assert.assertEquals;
+
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+import android.app.NotificationManager;
+import android.content.ContentResolver;
+import android.content.Context;
+import android.provider.Settings;
+import android.support.v14.preference.SwitchPreference;
+import android.support.v7.preference.PreferenceScreen;
+
+import com.android.settings.TestConfig;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
+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.annotation.Config;
+import org.robolectric.shadows.ShadowApplication;
+import org.robolectric.RuntimeEnvironment;
+import org.robolectric.util.ReflectionHelpers;
+
+@RunWith(SettingsRobolectricTestRunner.class)
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION_O)
+public class ZenModeRemindersPreferenceControllerTest {
+    private ZenModeRemindersPreferenceController mController;
+
+    @Mock
+    private ZenModeBackend mBackend;
+    @Mock
+    private NotificationManager mNotificationManager;
+    @Mock
+    private SwitchPreference mockPref;
+    @Mock
+    private NotificationManager.Policy mPolicy;
+    @Mock
+    private PreferenceScreen mPreferenceScreen;
+
+    private ContentResolver mContentResolver;
+    private Context mContext;
+    private final boolean REMINDERS_SETTINGS = true;
+
+    @Before
+    public void setup() {
+        MockitoAnnotations.initMocks(this);
+        ShadowApplication shadowApplication = ShadowApplication.getInstance();
+        shadowApplication.setSystemService(Context.NOTIFICATION_SERVICE, mNotificationManager);
+
+        mContext = shadowApplication.getApplicationContext();
+        mContentResolver = RuntimeEnvironment.application.getContentResolver();
+        when(mNotificationManager.getNotificationPolicy()).thenReturn(mPolicy);
+
+        mController = new ZenModeRemindersPreferenceController(mContext, mock(Lifecycle.class));
+        ReflectionHelpers.setField(mController, "mBackend", mBackend);
+
+        when(mPreferenceScreen.findPreference(mController.getPreferenceKey())).thenReturn(
+                mockPref);
+        mController.displayPreference(mPreferenceScreen);
+    }
+
+
+    @Test
+    public void updateState_TotalSilence() {
+        Settings.Global.putInt(mContentResolver, ZEN_MODE, ZEN_MODE_NO_INTERRUPTIONS);
+
+        final SwitchPreference mockPref = mock(SwitchPreference.class);
+        mController.updateState(mockPref);
+
+        verify(mockPref).setEnabled(false);
+        verify(mockPref).setChecked(false);
+    }
+
+    @Test
+    public void updateState_AlarmsOnly() {
+        Settings.Global.putInt(mContentResolver, ZEN_MODE, ZEN_MODE_ALARMS);
+
+        final SwitchPreference mockPref = mock(SwitchPreference.class);
+        mController.updateState(mockPref);
+
+        verify(mockPref).setEnabled(false);
+        verify(mockPref).setChecked(false);
+    }
+
+    @Test
+    public void updateState_Priority() {
+        Settings.Global.putInt(mContentResolver, ZEN_MODE, ZEN_MODE_IMPORTANT_INTERRUPTIONS);
+
+        when(mBackend.isPriorityCategoryEnabled(
+                NotificationManager.Policy.PRIORITY_CATEGORY_REMINDERS)).
+                thenReturn(REMINDERS_SETTINGS);
+
+        mController.updateState(mockPref);
+
+        verify(mockPref).setEnabled(true);
+        verify(mockPref).setChecked(REMINDERS_SETTINGS);
+    }
+
+    @Test
+    public void onPreferenceChanged_EnableReminders() {
+        boolean allow = true;
+        mController.onPreferenceChange(mockPref, allow);
+
+        verify(mBackend).saveSoundPolicy(NotificationManager.Policy.PRIORITY_CATEGORY_REMINDERS,
+                allow);
+    }
+
+    @Test
+    public void onPreferenceChanged_DisableReminders() {
+        boolean allow = false;
+        mController.onPreferenceChange(mockPref, allow);
+
+        verify(mBackend).saveSoundPolicy(NotificationManager.Policy.PRIORITY_CATEGORY_REMINDERS,
+                allow);
+    }
+}
\ No newline at end of file
diff --git a/tests/robotests/src/com/android/settings/notification/ZenModeRepeatCallersPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/ZenModeRepeatCallersPreferenceControllerTest.java
new file mode 100644
index 0000000..d4ee9bc
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/notification/ZenModeRepeatCallersPreferenceControllerTest.java
@@ -0,0 +1,160 @@
+/*
+ * Copyright (C) 2017 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.notification;
+
+import static android.provider.Settings.Global.ZEN_MODE;
+import static android.provider.Settings.Global.ZEN_MODE_ALARMS;
+import static android.provider.Settings.Global.ZEN_MODE_IMPORTANT_INTERRUPTIONS;
+import static android.provider.Settings.Global.ZEN_MODE_NO_INTERRUPTIONS;
+
+import static junit.framework.Assert.assertEquals;
+
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+import android.app.NotificationManager;
+import android.content.ContentResolver;
+import android.content.Context;
+import android.provider.Settings;
+import android.support.v14.preference.SwitchPreference;
+import android.support.v7.preference.PreferenceScreen;
+
+import com.android.settings.TestConfig;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
+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.annotation.Config;
+import org.robolectric.shadows.ShadowApplication;
+import org.robolectric.RuntimeEnvironment;
+import org.robolectric.util.ReflectionHelpers;
+
+@RunWith(SettingsRobolectricTestRunner.class)
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION_O)
+public class ZenModeRepeatCallersPreferenceControllerTest {
+    private ZenModeRepeatCallersPreferenceController mController;
+
+    @Mock
+    private ZenModeBackend mBackend;
+    @Mock
+    private NotificationManager mNotificationManager;
+    @Mock
+    private SwitchPreference mockPref;
+    @Mock
+    private NotificationManager.Policy mPolicy;
+    @Mock
+    private PreferenceScreen mPreferenceScreen;
+    private ContentResolver mContentResolver;
+    private Context mContext;
+
+    private final boolean REPEAT_CALLERS_SETTINGS = true;
+
+    @Before
+    public void setup() {
+        MockitoAnnotations.initMocks(this);
+        ShadowApplication shadowApplication = ShadowApplication.getInstance();
+        shadowApplication.setSystemService(Context.NOTIFICATION_SERVICE, mNotificationManager);
+
+        mContext = shadowApplication.getApplicationContext();
+        mContentResolver = RuntimeEnvironment.application.getContentResolver();
+        when(mNotificationManager.getNotificationPolicy()).thenReturn(mPolicy);
+
+        mController = new ZenModeRepeatCallersPreferenceController(mContext, mock(Lifecycle.class));
+        ReflectionHelpers.setField(mController, "mBackend", mBackend);
+
+        when(mPreferenceScreen.findPreference(mController.getPreferenceKey())).thenReturn(
+                mockPref);
+        mController.displayPreference(mPreferenceScreen);
+    }
+
+    @Test
+    public void updateState_TotalSilence() {
+        Settings.Global.putInt(mContentResolver, ZEN_MODE, ZEN_MODE_NO_INTERRUPTIONS);
+        final SwitchPreference mockPref = mock(SwitchPreference.class);
+        mController.updateState(mockPref);
+
+        verify(mockPref).setEnabled(false);
+        verify(mockPref).setChecked(false);
+    }
+
+    @Test
+    public void updateState_AlarmsOnly() {
+        Settings.Global.putInt(mContentResolver, ZEN_MODE, ZEN_MODE_ALARMS);
+
+        final SwitchPreference mockPref = mock(SwitchPreference.class);
+        mController.updateState(mockPref);
+
+        verify(mockPref).setEnabled(false);
+        verify(mockPref).setChecked(false);
+    }
+
+    @Test
+    public void updateState_Priority() {
+        Settings.Global.putInt(mContentResolver, ZEN_MODE, ZEN_MODE_IMPORTANT_INTERRUPTIONS);
+
+        when(mBackend.isPriorityCategoryEnabled(
+                NotificationManager.Policy.PRIORITY_CATEGORY_REPEAT_CALLERS)).
+                thenReturn(REPEAT_CALLERS_SETTINGS);
+
+        mController.updateState(mockPref);
+
+        verify(mockPref).setEnabled(true);
+        verify(mockPref).setChecked(REPEAT_CALLERS_SETTINGS);
+    }
+
+    @Test
+    public void updateState_Priority_anyCallers() {
+        boolean mockPriorityState = false;
+        Settings.Global.putInt(mContentResolver, ZEN_MODE, ZEN_MODE_IMPORTANT_INTERRUPTIONS);
+        when(mBackend.isPriorityCategoryEnabled(NotificationManager.Policy.PRIORITY_CATEGORY_CALLS))
+                .thenReturn(true);
+        when(mBackend.getPriorityCallSenders()).thenReturn(
+                NotificationManager.Policy.PRIORITY_SENDERS_ANY);
+        when(mBackend.isPriorityCategoryEnabled(
+                NotificationManager.Policy.PRIORITY_CATEGORY_REPEAT_CALLERS))
+                .thenReturn(mockPriorityState);
+
+        mController.updateState(mockPref);
+
+        verify(mockPref).setEnabled(false);
+        verify(mockPref).setChecked(true);
+    }
+
+    @Test
+    public void onPreferenceChanged_EnableRepeatCallers() {
+        boolean allow = true;
+        mController.onPreferenceChange(mockPref, allow);
+
+        verify(mBackend).saveSoundPolicy(
+                NotificationManager.Policy.PRIORITY_CATEGORY_REPEAT_CALLERS, allow);
+    }
+
+    @Test
+    public void onPreferenceChanged_DisableRepeatCallers() {
+        boolean allow = false;
+        mController.onPreferenceChange(mockPref, allow);
+
+        verify(mBackend).saveSoundPolicy(
+                NotificationManager.Policy.PRIORITY_CATEGORY_REPEAT_CALLERS, allow);
+    }
+}
\ No newline at end of file
diff --git a/tests/robotests/src/com/android/settings/notification/ZenModeScheduleRuleSettingsTest.java b/tests/robotests/src/com/android/settings/notification/ZenModeScheduleRuleSettingsTest.java
new file mode 100644
index 0000000..e45847d
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/notification/ZenModeScheduleRuleSettingsTest.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.notification;
+
+import android.app.Activity;
+import android.content.Context;
+import android.content.res.Resources;
+import android.content.Intent;
+import android.os.UserManager;
+
+import com.android.settings.R;
+import com.android.settings.TestConfig;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.shadow.SettingsShadowResources;
+import com.android.settings.testutils.shadow.ShadowUserManager;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Answers;
+import org.mockito.Mock;
+import org.mockito.MockitoAnnotations;
+import org.robolectric.annotation.Config;
+import org.robolectric.shadows.ShadowToast;
+import org.robolectric.RuntimeEnvironment;
+
+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 static org.robolectric.RuntimeEnvironment.application;
+
+@RunWith(SettingsRobolectricTestRunner.class)
+@Config(manifest = TestConfig.MANIFEST_PATH,
+        sdk = TestConfig.SDK_VERSION_O,
+        shadows = {
+                SettingsShadowResources.class,
+                SettingsShadowResources.SettingsShadowTheme.class,
+        })
+public class ZenModeScheduleRuleSettingsTest {
+
+    @Mock
+    private Activity mActivity;
+
+    @Mock
+    private Intent mIntent;
+
+    @Mock
+    private UserManager mUserManager;
+
+    private TestFragment mFragment;
+
+    @Before
+    public void setUp() {
+        MockitoAnnotations.initMocks(this);
+
+        mFragment = spy(new TestFragment());
+        mFragment.onAttach(application);
+
+        doReturn(mActivity).when(mFragment).getActivity();
+
+        Resources res = application.getResources();
+
+        doReturn(res).when(mFragment).getResources();
+        when(mActivity.getTheme()).thenReturn(res.newTheme());
+        when(mActivity.getIntent()).thenReturn(mIntent);
+        when(mActivity.getResources()).thenReturn(res);
+        when(mFragment.getSystemService(Context.USER_SERVICE)).thenReturn(mUserManager);
+    }
+
+    @Test
+    public void onCreate_noRuleId_shouldToastAndFinishAndNoCrash() {
+        final Context ctx = application.getApplicationContext();
+        final String expected = ctx.getResources().getString(R.string.zen_mode_rule_not_found_text);
+
+        mFragment.onCreate(null);
+
+        // verify the toast
+        assertThat(ShadowToast.getTextOfLatestToast()).isEqualTo(expected);
+
+        // verify the finish
+        verify(mActivity).finish();
+
+        //shoud not crash
+    }
+
+    public static class TestFragment extends ZenModeScheduleRuleSettings {
+
+        @Override
+        protected Object getSystemService(final String name) {
+            return null;
+        }
+    }
+
+}
diff --git a/tests/robotests/src/com/android/settings/notification/ZenModeScreenOffPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/ZenModeScreenOffPreferenceControllerTest.java
new file mode 100644
index 0000000..3fe1eab
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/notification/ZenModeScreenOffPreferenceControllerTest.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.notification;
+
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+import android.app.NotificationManager;
+import android.content.Context;
+import android.provider.Settings;
+import android.support.v14.preference.SwitchPreference;
+
+import com.android.settings.TestConfig;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
+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.annotation.Config;
+import org.robolectric.shadows.ShadowApplication;
+import org.robolectric.util.ReflectionHelpers;
+
+@RunWith(SettingsRobolectricTestRunner.class)
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION_O)
+public class ZenModeScreenOffPreferenceControllerTest {
+    private ZenModeScreenOffPreferenceController mController;
+
+    @Mock
+    private ZenModeBackend mBackend;
+    @Mock
+    private NotificationManager mNotificationManager;
+    @Mock
+    private SwitchPreference mockPref;
+    @Mock
+    private NotificationManager.Policy mPolicy;
+
+    private Context mContext;
+    private final boolean MOCK_PRIORITY_SCREEN_OFF_SETTING = false;
+
+    @Before
+    public void setup() {
+        MockitoAnnotations.initMocks(this);
+        ShadowApplication shadowApplication = ShadowApplication.getInstance();
+        shadowApplication.setSystemService(Context.NOTIFICATION_SERVICE, mNotificationManager);
+
+        mContext = shadowApplication.getApplicationContext();
+        when(mNotificationManager.getNotificationPolicy()).thenReturn(mPolicy);
+
+        mController = new ZenModeScreenOffPreferenceController(mContext, mock(Lifecycle.class));
+        ReflectionHelpers.setField(mController, "mBackend", mBackend);
+    }
+
+    @Test
+    public void updateState() {
+        final SwitchPreference mockPref = mock(SwitchPreference.class);
+        when(mBackend.isEffectAllowed(NotificationManager.Policy.SUPPRESSED_EFFECT_SCREEN_OFF))
+                .thenReturn(MOCK_PRIORITY_SCREEN_OFF_SETTING);
+        mController.updateState(mockPref);
+
+        verify(mockPref).setChecked(MOCK_PRIORITY_SCREEN_OFF_SETTING);
+    }
+
+    @Test
+    public void onPreferenceChanged_EnableScreenOff() {
+        boolean allow = true;
+        mController.onPreferenceChange(mockPref, allow);
+
+        verify(mBackend).saveVisualEffectsPolicy(
+                NotificationManager.Policy.SUPPRESSED_EFFECT_SCREEN_OFF, allow);
+    }
+
+    @Test
+    public void onPreferenceChanged_DisableScreenOff() {
+        boolean allow = false;
+        mController.onPreferenceChange(mockPref, allow);
+
+        verify(mBackend).saveVisualEffectsPolicy(
+                NotificationManager.Policy.SUPPRESSED_EFFECT_SCREEN_OFF, allow);
+    }
+}
\ No newline at end of file
diff --git a/tests/robotests/src/com/android/settings/notification/ZenModeScreenOnPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/ZenModeScreenOnPreferenceControllerTest.java
new file mode 100644
index 0000000..24e3ce3
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/notification/ZenModeScreenOnPreferenceControllerTest.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.notification;
+
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+import android.app.NotificationManager;
+import android.content.Context;
+import android.provider.Settings;
+import android.support.v14.preference.SwitchPreference;
+
+import com.android.settings.TestConfig;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
+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.annotation.Config;
+import org.robolectric.shadows.ShadowApplication;
+import org.robolectric.util.ReflectionHelpers;
+
+@RunWith(SettingsRobolectricTestRunner.class)
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION_O)
+public class ZenModeScreenOnPreferenceControllerTest {
+    private ZenModeScreenOnPreferenceController mController;
+
+    @Mock
+    private ZenModeBackend mBackend;
+    @Mock
+    private NotificationManager mNotificationManager;
+    @Mock
+    private SwitchPreference mockPref;
+    @Mock
+    private NotificationManager.Policy mPolicy;
+
+    private Context mContext;
+    private final boolean MOCK_PRIORITY_SCREEN_ON_SETTING = false;
+
+    @Before
+    public void setup() {
+        MockitoAnnotations.initMocks(this);
+        ShadowApplication shadowApplication = ShadowApplication.getInstance();
+        shadowApplication.setSystemService(Context.NOTIFICATION_SERVICE, mNotificationManager);
+
+        mContext = shadowApplication.getApplicationContext();
+        when(mNotificationManager.getNotificationPolicy()).thenReturn(mPolicy);
+
+        mController = new ZenModeScreenOnPreferenceController(mContext, mock(Lifecycle.class));
+        ReflectionHelpers.setField(mController, "mBackend", mBackend);
+    }
+
+    @Test
+    public void updateState() {
+        final SwitchPreference mockPref = mock(SwitchPreference.class);
+        when(mBackend.isEffectAllowed(NotificationManager.Policy.SUPPRESSED_EFFECT_SCREEN_ON))
+                .thenReturn(MOCK_PRIORITY_SCREEN_ON_SETTING);
+        mController.updateState(mockPref);
+
+        verify(mockPref).setChecked(MOCK_PRIORITY_SCREEN_ON_SETTING);
+    }
+
+    @Test
+    public void onPreferenceChanged_EnableScreenOn() {
+        boolean allow = true;
+        mController.onPreferenceChange(mockPref, allow);
+
+        verify(mBackend).saveVisualEffectsPolicy(
+                NotificationManager.Policy.SUPPRESSED_EFFECT_SCREEN_ON, allow);
+    }
+
+    @Test
+    public void onPreferenceChanged_DisableScreenOn() {
+        boolean allow = false;
+        mController.onPreferenceChange(mockPref, allow);
+
+        verify(mBackend).saveVisualEffectsPolicy(
+                NotificationManager.Policy.SUPPRESSED_EFFECT_SCREEN_ON, allow);
+    }
+}
\ No newline at end of file
diff --git a/tests/robotests/src/com/android/settings/notification/ZenModeSettingsTest.java b/tests/robotests/src/com/android/settings/notification/ZenModeSettingsTest.java
index 716e2b2..966c927 100644
--- a/tests/robotests/src/com/android/settings/notification/ZenModeSettingsTest.java
+++ b/tests/robotests/src/com/android/settings/notification/ZenModeSettingsTest.java
@@ -16,12 +16,18 @@
 
 package com.android.settings.notification;
 
+import static com.google.common.truth.Truth.assertThat;
+
+import static junit.framework.Assert.assertTrue;
+
 import android.app.NotificationManager;
 import android.content.Context;
+import android.provider.SearchIndexableResource;
+import android.provider.Settings;
 
 import com.android.settings.R;
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 
 import org.junit.Before;
 import org.junit.Test;
@@ -29,72 +35,55 @@
 import org.robolectric.RuntimeEnvironment;
 import org.robolectric.annotation.Config;
 
-import static com.google.common.truth.Truth.assertThat;
-
-import static junit.framework.Assert.assertTrue;
+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_O)
 public class ZenModeSettingsTest {
 
     private ZenModeSettings.SummaryBuilder mBuilder;
     private Context mContext;
+    private ZenModeSettings mSettings;
 
     @Before
     public void setUp() {
         mContext = RuntimeEnvironment.application.getApplicationContext();
+        mSettings = new ZenModeSettings();
         mBuilder = new ZenModeSettings.SummaryBuilder(mContext);
     }
 
     @Test
-    public void testAppend_conditionFalse_shouldNotAppend() {
-        String original = "test";
-
-        final String result = mBuilder.append(original, false, R.string.zen_mode_alarms);
-
-        assertThat(result).isEqualTo(original);
-    }
-
-    @Test
-    public void testAppend_conditionTrue_shouldAppend() {
-        String original = "test";
-        String alarm = mContext.getString(R.string.zen_mode_alarms);
-
-        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() {
+    public void testGetBehaviorSettingSummary_sameOrderAsTargetPage() {
         NotificationManager.Policy policy = new NotificationManager.Policy(
                 NotificationManager.Policy.PRIORITY_CATEGORY_EVENTS
-                        | NotificationManager.Policy.PRIORITY_CATEGORY_REMINDERS,
+                        | NotificationManager.Policy.PRIORITY_CATEGORY_REMINDERS
+                        | NotificationManager.Policy.PRIORITY_CATEGORY_ALARMS
+                        | NotificationManager.Policy.PRIORITY_CATEGORY_MEDIA_SYSTEM_OTHER,
                 0, 0);
-        final String result = mBuilder.getPrioritySettingSummary(policy);
+        final String result = mBuilder.getBehaviorSettingSummary(policy,
+                Settings.Global.ZEN_MODE_IMPORTANT_INTERRUPTIONS);
 
-        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);
+        String alarms = mContext.getString(R.string.zen_mode_alarms).toLowerCase();
+        String reminders = mContext.getString(R.string.zen_mode_reminders).toLowerCase();
+        String events = mContext.getString(R.string.zen_mode_events).toLowerCase();
+        String media = mContext.getString(R.string.zen_mode_media_system_other).toLowerCase();
 
         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));
+        assertThat(result).contains(media);
+        assertTrue(result.indexOf(alarms) < result.indexOf(media)
+                && result.indexOf(media) < result.indexOf(reminders)
+                && result.indexOf(reminders) < result.indexOf(events));
+    }
+
+    @Test
+    public void searchProvider_shouldIndexDefaultXml() {
+        final List<SearchIndexableResource> sir = mSettings.SEARCH_INDEX_DATA_PROVIDER
+                .getXmlResourcesToIndex(mContext, true /* enabled */);
+
+        assertThat(sir).hasSize(1);
+        assertThat(sir.get(0).xmlResId).isEqualTo(R.xml.zen_mode_settings);
     }
 
 }
diff --git a/tests/robotests/src/com/android/settings/password/ChooseLockGenericControllerTest.java b/tests/robotests/src/com/android/settings/password/ChooseLockGenericControllerTest.java
index 28b0264..5b86374 100644
--- a/tests/robotests/src/com/android/settings/password/ChooseLockGenericControllerTest.java
+++ b/tests/robotests/src/com/android/settings/password/ChooseLockGenericControllerTest.java
@@ -47,7 +47,7 @@
 @RunWith(SettingsRobolectricTestRunner.class)
 @Config(
         manifest = TestConfig.MANIFEST_PATH,
-        sdk = TestConfig.SDK_VERSION,
+        sdk = TestConfig.SDK_VERSION_O,
         shadows = {
                 SettingsShadowResources.class
         })
diff --git a/tests/robotests/src/com/android/settings/password/ChooseLockPasswordTest.java b/tests/robotests/src/com/android/settings/password/ChooseLockPasswordTest.java
index b8f0679..12c6b99 100644
--- a/tests/robotests/src/com/android/settings/password/ChooseLockPasswordTest.java
+++ b/tests/robotests/src/com/android/settings/password/ChooseLockPasswordTest.java
@@ -31,6 +31,7 @@
 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.SettingsShadowResourcesImpl;
 import com.android.settings.testutils.shadow.ShadowEventLogWriter;
 import com.android.settings.testutils.shadow.ShadowUtils;
 import com.android.setupwizardlib.GlifLayout;
@@ -47,9 +48,10 @@
 @RunWith(SettingsRobolectricTestRunner.class)
 @Config(
         manifest = TestConfig.MANIFEST_PATH,
-        sdk = TestConfig.SDK_VERSION,
+        sdk = TestConfig.SDK_VERSION_O,
         shadows = {
                 SettingsShadowResources.class,
+                SettingsShadowResourcesImpl.class,
                 SettingsShadowResources.SettingsShadowTheme.class,
                 ShadowEventLogWriter.class,
                 ShadowUtils.class
diff --git a/tests/robotests/src/com/android/settings/password/ChooseLockPatternTest.java b/tests/robotests/src/com/android/settings/password/ChooseLockPatternTest.java
index c74448b..da3a157 100644
--- a/tests/robotests/src/com/android/settings/password/ChooseLockPatternTest.java
+++ b/tests/robotests/src/com/android/settings/password/ChooseLockPatternTest.java
@@ -29,6 +29,7 @@
 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.SettingsShadowResourcesImpl;
 import com.android.settings.testutils.shadow.ShadowEventLogWriter;
 import com.android.settings.testutils.shadow.ShadowUtils;
 import com.android.setupwizardlib.GlifLayout;
@@ -43,9 +44,10 @@
 @RunWith(SettingsRobolectricTestRunner.class)
 @Config(
         manifest = TestConfig.MANIFEST_PATH,
-        sdk = TestConfig.SDK_VERSION,
+        sdk = TestConfig.SDK_VERSION_O,
         shadows = {
                 SettingsShadowResources.class,
+                SettingsShadowResourcesImpl.class,
                 SettingsShadowResources.SettingsShadowTheme.class,
                 ShadowEventLogWriter.class,
                 ShadowUtils.class
diff --git a/tests/robotests/src/com/android/settings/password/ChooseLockSettingsHelperTest.java b/tests/robotests/src/com/android/settings/password/ChooseLockSettingsHelperTest.java
index 20a05e3..55e60e5 100644
--- a/tests/robotests/src/com/android/settings/password/ChooseLockSettingsHelperTest.java
+++ b/tests/robotests/src/com/android/settings/password/ChooseLockSettingsHelperTest.java
@@ -33,7 +33,7 @@
 @RunWith(SettingsRobolectricTestRunner.class)
 @Config(
         manifest = TestConfig.MANIFEST_PATH,
-        sdk = TestConfig.SDK_VERSION,
+        sdk = TestConfig.SDK_VERSION_O,
         shadows = {
                 ShadowUserManager.class,
                 ShadowUtils.class
diff --git a/tests/robotests/src/com/android/settings/password/ChooseLockTypeDialogFragmentTest.java b/tests/robotests/src/com/android/settings/password/ChooseLockTypeDialogFragmentTest.java
index 0a0734f..2d82e0e 100644
--- a/tests/robotests/src/com/android/settings/password/ChooseLockTypeDialogFragmentTest.java
+++ b/tests/robotests/src/com/android/settings/password/ChooseLockTypeDialogFragmentTest.java
@@ -49,7 +49,7 @@
 @RunWith(SettingsRobolectricTestRunner.class)
 @Config(
         manifest = TestConfig.MANIFEST_PATH,
-        sdk = TestConfig.SDK_VERSION,
+        sdk = TestConfig.SDK_VERSION_O,
         shadows = {
                 ShadowEventLogWriter.class,
                 ShadowUserManager.class,
diff --git a/tests/robotests/src/com/android/settings/password/ConfirmCredentialTest.java b/tests/robotests/src/com/android/settings/password/ConfirmCredentialTest.java
index d76968e..1568f19 100644
--- a/tests/robotests/src/com/android/settings/password/ConfirmCredentialTest.java
+++ b/tests/robotests/src/com/android/settings/password/ConfirmCredentialTest.java
@@ -35,7 +35,7 @@
 @RunWith(SettingsRobolectricTestRunner.class)
 @Config(
         manifest = TestConfig.MANIFEST_PATH,
-        sdk = TestConfig.SDK_VERSION,
+        sdk = TestConfig.SDK_VERSION_O,
         shadows = {
                 SettingsShadowResources.class,
                 SettingsShadowResources.SettingsShadowTheme.class,
diff --git a/tests/robotests/src/com/android/settings/password/ScreenLockTypeTest.java b/tests/robotests/src/com/android/settings/password/ScreenLockTypeTest.java
index 8beefa8..f8792a8 100644
--- a/tests/robotests/src/com/android/settings/password/ScreenLockTypeTest.java
+++ b/tests/robotests/src/com/android/settings/password/ScreenLockTypeTest.java
@@ -30,7 +30,7 @@
 @RunWith(SettingsRobolectricTestRunner.class)
 @Config(
         manifest = TestConfig.MANIFEST_PATH,
-        sdk = TestConfig.SDK_VERSION)
+        sdk = TestConfig.SDK_VERSION_O)
 public class ScreenLockTypeTest {
 
     @Test
diff --git a/tests/robotests/src/com/android/settings/password/SetNewPasswordActivityTest.java b/tests/robotests/src/com/android/settings/password/SetNewPasswordActivityTest.java
index cb863a0..06086fc 100644
--- a/tests/robotests/src/com/android/settings/password/SetNewPasswordActivityTest.java
+++ b/tests/robotests/src/com/android/settings/password/SetNewPasswordActivityTest.java
@@ -38,7 +38,7 @@
 import org.robolectric.shadows.ShadowActivity;
 
 @RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION_O)
 public class SetNewPasswordActivityTest {
 
     private int mProvisioned;
diff --git a/tests/robotests/src/com/android/settings/password/SetNewPasswordControllerTest.java b/tests/robotests/src/com/android/settings/password/SetNewPasswordControllerTest.java
index 96775ad..a3f1787 100644
--- a/tests/robotests/src/com/android/settings/password/SetNewPasswordControllerTest.java
+++ b/tests/robotests/src/com/android/settings/password/SetNewPasswordControllerTest.java
@@ -43,6 +43,7 @@
 
 import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
+import com.android.settings.wrapper.FingerprintManagerWrapper;
 
 import org.junit.Before;
 import org.junit.Test;
@@ -52,18 +53,17 @@
 import org.mockito.MockitoAnnotations;
 import org.robolectric.annotation.Config;
 
-
 /**
  * Tests for {@link SetNewPasswordController}.
  */
 @RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION_O)
 public final class SetNewPasswordControllerTest {
     private static final int CURRENT_USER_ID = 101;
     private static final long FINGERPRINT_CHALLENGE = -9876512313131L;
 
     @Mock PackageManager mPackageManager;
-    @Mock IFingerprintManager mFingerprintManager;
+    @Mock FingerprintManagerWrapper mFingerprintManager;
     @Mock DevicePolicyManager mDevicePolicyManager;
 
     @Mock private SetNewPasswordController.Ui mUi;
diff --git a/tests/robotests/src/com/android/settings/password/SetupChooseLockPasswordTest.java b/tests/robotests/src/com/android/settings/password/SetupChooseLockPasswordTest.java
index 1195a2c..97fffd5 100644
--- a/tests/robotests/src/com/android/settings/password/SetupChooseLockPasswordTest.java
+++ b/tests/robotests/src/com/android/settings/password/SetupChooseLockPasswordTest.java
@@ -34,6 +34,7 @@
 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.SettingsShadowResourcesImpl;
 import com.android.settings.testutils.shadow.ShadowEventLogWriter;
 import com.android.settings.testutils.shadow.ShadowUtils;
 
@@ -57,9 +58,10 @@
 @RunWith(SettingsRobolectricTestRunner.class)
 @Config(
         manifest = TestConfig.MANIFEST_PATH,
-        sdk = TestConfig.SDK_VERSION,
+        sdk = TestConfig.SDK_VERSION_O,
         shadows = {
                 SettingsShadowResources.class,
+                SettingsShadowResourcesImpl.class,
                 SettingsShadowResources.SettingsShadowTheme.class,
                 ShadowEventLogWriter.class,
                 ShadowUtils.class
diff --git a/tests/robotests/src/com/android/settings/password/SetupSkipDialogTest.java b/tests/robotests/src/com/android/settings/password/SetupSkipDialogTest.java
index 0e6f28a..6cd4244 100644
--- a/tests/robotests/src/com/android/settings/password/SetupSkipDialogTest.java
+++ b/tests/robotests/src/com/android/settings/password/SetupSkipDialogTest.java
@@ -40,7 +40,7 @@
 
 @RunWith(SettingsRobolectricTestRunner.class)
 @Config(manifest = TestConfig.MANIFEST_PATH,
-        sdk = TestConfig.SDK_VERSION,
+        sdk = TestConfig.SDK_VERSION_O,
         shadows = {
                 SettingsShadowResources.class,
                 SettingsShadowResources.SettingsShadowTheme.class,
diff --git a/tests/robotests/src/com/android/settings/print/PrintSettingsFragmentTest.java b/tests/robotests/src/com/android/settings/print/PrintSettingsFragmentTest.java
index cf34f45..717fe88 100644
--- a/tests/robotests/src/com/android/settings/print/PrintSettingsFragmentTest.java
+++ b/tests/robotests/src/com/android/settings/print/PrintSettingsFragmentTest.java
@@ -45,7 +45,7 @@
 
 
 @RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION_O)
 public class PrintSettingsFragmentTest {
 
     @Mock
diff --git a/tests/robotests/src/com/android/settings/search/AccessibilityServiceResultFutureTaskTest.java b/tests/robotests/src/com/android/settings/search/AccessibilityServiceResultFutureTaskTest.java
new file mode 100644
index 0000000..456f820
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/search/AccessibilityServiceResultFutureTaskTest.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.search;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
+
+import android.accessibilityservice.AccessibilityServiceInfo;
+import android.content.Context;
+import android.content.pm.PackageManager;
+import android.content.pm.ResolveInfo;
+import android.content.pm.ServiceInfo;
+import android.graphics.Color;
+import android.graphics.drawable.ColorDrawable;
+import android.os.UserManager;
+import android.view.accessibility.AccessibilityManager;
+
+import com.android.settings.TestConfig;
+import com.android.settings.dashboard.SiteMapManager;
+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;
+
+import java.util.ArrayList;
+import java.util.List;
+
+@RunWith(SettingsRobolectricTestRunner.class)
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION_O)
+public class AccessibilityServiceResultFutureTaskTest {
+
+    private static final String QUERY = "test_query";
+
+    @Mock(answer = Answers.RETURNS_DEEP_STUBS)
+    private Context mContext;
+    @Mock
+    private PackageManager mPackageManager;
+    @Mock
+    private AccessibilityManager mAccessibilityManager;
+    @Mock
+    private SiteMapManager mSiteMapManager;
+    @Mock
+    private UserManager mUserManager;
+
+    private AccessibilityServiceResultLoader.AccessibilityServiceResultCallable mCallable;
+
+    @Before
+    public void setUp() {
+        MockitoAnnotations.initMocks(this);
+        when(mContext.getSystemService(Context.ACCESSIBILITY_SERVICE))
+                .thenReturn(mAccessibilityManager);
+        when((Object)mContext.getSystemService(UserManager.class)).thenReturn(mUserManager);
+        when(mContext.getPackageManager()).thenReturn(mPackageManager);
+
+        mCallable = new AccessibilityServiceResultLoader.AccessibilityServiceResultCallable(
+                mContext, QUERY, mSiteMapManager);
+    }
+
+    @Test
+    public void query_noService_shouldNotReturnAnything() throws Exception {
+        assertThat(mCallable.call()).isEmpty();
+    }
+
+    @Test
+    public void query_hasServiceMatchingTitle_shouldReturnResult() throws Exception {
+        addFakeAccessibilityService();
+
+        List<? extends SearchResult> results = mCallable.call();
+        assertThat(results).hasSize(1);
+
+        SearchResult result = results.get(0);
+        assertThat(result.title).isEqualTo(QUERY);
+    }
+
+    @Test
+    public void query_serviceDoesNotMatchTitle_shouldReturnResult() throws Exception {
+        addFakeAccessibilityService();
+
+        mCallable = new AccessibilityServiceResultLoader.AccessibilityServiceResultCallable(
+                mContext,
+                QUERY + "no_match", mSiteMapManager);
+
+        assertThat(mCallable.call()).isEmpty();
+    }
+
+    private void addFakeAccessibilityService() {
+        final List<AccessibilityServiceInfo> services = new ArrayList<>();
+        final AccessibilityServiceInfo info = mock(AccessibilityServiceInfo.class);
+        final ResolveInfo resolveInfo = mock(ResolveInfo.class);
+        when(info.getResolveInfo()).thenReturn(resolveInfo);
+        when(resolveInfo.loadIcon(mPackageManager)).thenReturn(new ColorDrawable(Color.BLUE));
+        when(resolveInfo.loadLabel(mPackageManager)).thenReturn(QUERY);
+        resolveInfo.serviceInfo = new ServiceInfo();
+        resolveInfo.serviceInfo.packageName = "pkg";
+        resolveInfo.serviceInfo.name = "class";
+        services.add(info);
+
+        when(mAccessibilityManager.getInstalledAccessibilityServiceList()).thenReturn(services);
+    }
+}
diff --git a/tests/robotests/src/com/android/settings/search/AccessibilityServiceResultLoaderTest.java b/tests/robotests/src/com/android/settings/search/AccessibilityServiceResultLoaderTest.java
deleted file mode 100644
index 4896dc4..0000000
--- a/tests/robotests/src/com/android/settings/search/AccessibilityServiceResultLoaderTest.java
+++ /dev/null
@@ -1,114 +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.search;
-
-import static com.google.common.truth.Truth.assertThat;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.when;
-
-import android.accessibilityservice.AccessibilityServiceInfo;
-import android.content.Context;
-import android.content.pm.PackageManager;
-import android.content.pm.ResolveInfo;
-import android.content.pm.ServiceInfo;
-import android.graphics.Color;
-import android.graphics.drawable.ColorDrawable;
-import android.view.accessibility.AccessibilityManager;
-
-import com.android.settings.TestConfig;
-import com.android.settings.dashboard.SiteMapManager;
-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;
-
-import java.util.ArrayList;
-import java.util.List;
-
-@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
-public class AccessibilityServiceResultLoaderTest {
-
-    private static final String QUERY = "test_query";
-
-    @Mock(answer = Answers.RETURNS_DEEP_STUBS)
-    private Context mContext;
-    @Mock
-    private PackageManager mPackageManager;
-    @Mock
-    private AccessibilityManager mAccessibilityManager;
-    @Mock
-    private SiteMapManager mSiteMapManager;
-
-    private AccessibilityServiceResultLoader mLoader;
-
-    @Before
-    public void setUp() {
-        MockitoAnnotations.initMocks(this);
-        when(mContext.getSystemService(Context.ACCESSIBILITY_SERVICE))
-                .thenReturn(mAccessibilityManager);
-        when(mContext.getPackageManager()).thenReturn(mPackageManager);
-
-        mLoader = new AccessibilityServiceResultLoader(mContext, QUERY, mSiteMapManager);
-    }
-
-    @Test
-    public void query_noService_shouldNotReturnAnything() {
-        assertThat(mLoader.loadInBackground()).isEmpty();
-    }
-
-    @Test
-    public void query_hasServiceMatchingTitle_shouldReturnResult() {
-        addFakeAccessibilityService();
-
-        List<? extends SearchResult> results = new ArrayList<>(mLoader.loadInBackground());
-        assertThat(results).hasSize(1);
-
-        SearchResult result = results.get(0);
-        assertThat(result.title).isEqualTo(QUERY);
-    }
-
-    @Test
-    public void query_serviceDoesNotMatchTitle_shouldReturnResult() {
-        addFakeAccessibilityService();
-
-        mLoader = new AccessibilityServiceResultLoader(mContext,
-                QUERY + "no_match", mSiteMapManager);
-
-        assertThat(mLoader.loadInBackground()).isEmpty();
-    }
-
-    private void addFakeAccessibilityService() {
-        final List<AccessibilityServiceInfo> services = new ArrayList<>();
-        final AccessibilityServiceInfo info = mock(AccessibilityServiceInfo.class);
-        final ResolveInfo resolveInfo = mock(ResolveInfo.class);
-        when(info.getResolveInfo()).thenReturn(resolveInfo);
-        when(resolveInfo.loadIcon(mPackageManager)).thenReturn(new ColorDrawable(Color.BLUE));
-        when(resolveInfo.loadLabel(mPackageManager)).thenReturn(QUERY);
-        resolveInfo.serviceInfo = new ServiceInfo();
-        resolveInfo.serviceInfo.packageName = "pkg";
-        resolveInfo.serviceInfo.name = "class";
-        services.add(info);
-
-        when(mAccessibilityManager.getInstalledAccessibilityServiceList()).thenReturn(services);
-    }
-}
diff --git a/tests/robotests/src/com/android/settings/search/BaseSearchIndexProviderTest.java b/tests/robotests/src/com/android/settings/search/BaseSearchIndexProviderTest.java
index 6c6d7ab..4c19220 100644
--- a/tests/robotests/src/com/android/settings/search/BaseSearchIndexProviderTest.java
+++ b/tests/robotests/src/com/android/settings/search/BaseSearchIndexProviderTest.java
@@ -45,7 +45,7 @@
 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_O)
 public class BaseSearchIndexProviderTest {
 
     private static final String TEST_PREF_KEY = "test_pref_key";
diff --git a/tests/robotests/src/com/android/settings/search/CursorToSearchResultConverterTest.java b/tests/robotests/src/com/android/settings/search/CursorToSearchResultConverterTest.java
index a15a449..f862529 100644
--- a/tests/robotests/src/com/android/settings/search/CursorToSearchResultConverterTest.java
+++ b/tests/robotests/src/com/android/settings/search/CursorToSearchResultConverterTest.java
@@ -37,6 +37,7 @@
 import com.android.settings.wifi.WifiSettings;
 
 import org.junit.Before;
+import org.junit.BeforeClass;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.Answers;
@@ -51,7 +52,7 @@
 import java.util.Set;
 
 @RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION_O)
 public class CursorToSearchResultConverterTest {
 
     private static final List<String> TITLES = Arrays.asList("title1", "title2", "title3");
@@ -59,9 +60,14 @@
     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_24dp;
     private static final int BASE_RANK = 1;
+    private static Intent sIntent;
+
+    @BeforeClass
+    public static void beforeClass() {
+        sIntent = new Intent("com.android.settings");
+    }
 
     @Mock(answer = Answers.RETURNS_DEEP_STUBS)
     private SiteMapManager mSiteMapManager;
@@ -120,7 +126,7 @@
     @Test
     public void testParseCursor_MatchesIcon() {
         final MatrixCursor cursor = new MatrixCursor(DatabaseResultLoader.SELECT_COLUMNS);
-        final byte[] payload = ResultPayloadUtils.marshall(new ResultPayload(INTENT));
+        final byte[] payload = ResultPayloadUtils.marshall(new ResultPayload(sIntent));
         final String BLANK = "";
         cursor.addRow(new Object[]{
                 KEY.hashCode(),      // Doc ID
@@ -171,7 +177,7 @@
     @Test
     public void testLongTitle_PenalizedInRank() {
         final MatrixCursor cursor = new MatrixCursor(DatabaseResultLoader.SELECT_COLUMNS);
-        final byte[] payload = ResultPayloadUtils.marshall(new ResultPayload(INTENT));
+        final byte[] payload = ResultPayloadUtils.marshall(new ResultPayload(sIntent));
         final String BLANK = "";
         cursor.addRow(new Object[]{
                 KEY.hashCode(),      // Doc ID
@@ -203,7 +209,7 @@
         for (SearchResult result : results) {
             payload = result.payload;
             Intent intent = payload.getIntent();
-            assertThat(intent.getAction()).isEqualTo(INTENT.getAction());
+            assertThat(intent.getAction()).isEqualTo(sIntent.getAction());
         }
     }
 
@@ -243,7 +249,7 @@
         for (SearchResult result : results) {
             final InlineSwitchPayload newPayload = (InlineSwitchPayload) result.payload;
             final Intent rebuiltIntent = newPayload.getIntent();
-            assertThat(newPayload.mSettingKey).isEqualTo(uri);
+            assertThat(newPayload.getKey()).isEqualTo(uri);
             assertThat(newPayload.getType()).isEqualTo(type);
             assertThat(newPayload.mSettingSource).isEqualTo(source);
             assertThat(newPayload.isStandard()).isTrue();
@@ -375,7 +381,7 @@
     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));
+        final byte[] payload = ResultPayloadUtils.marshall(new ResultPayload(sIntent));
 
         for (int i = 0; i < keys.length; i++) {
             ArrayList<Object> item = new ArrayList<>(DatabaseResultLoader.SELECT_COLUMNS.length);
@@ -386,7 +392,7 @@
             item.add(className); // classname
             item.add(BLANK); // screen title
             item.add(null); // Icon
-            item.add(INTENT.getAction()); // Intent action
+            item.add(sIntent.getAction()); // Intent action
             item.add(TARGET_PACKAGE); // target package
             item.add(TARGET_CLASS); // target class
             item.add(keys[i]); // Key
diff --git a/tests/robotests/src/com/android/settings/search/DataIntegrityTest.java b/tests/robotests/src/com/android/settings/search/DataIntegrityTest.java
deleted file mode 100644
index afc7d7a..0000000
--- a/tests/robotests/src/com/android/settings/search/DataIntegrityTest.java
+++ /dev/null
@@ -1,120 +0,0 @@
-package com.android.settings.search;
-
-import static com.google.common.truth.Truth.assertThat;
-
-import android.content.Context;
-import android.provider.SearchIndexableResource;
-import android.util.ArraySet;
-import com.android.settings.DateTimeSettings;
-import com.android.settings.R;
-import com.android.settings.SecuritySettings;
-import com.android.settings.TestConfig;
-import com.android.settings.core.codeinspection.CodeInspector;
-import com.android.settings.datausage.DataPlanUsageSummary;
-import com.android.settings.datausage.DataUsageSummary;
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.testutils.XmlTestUtils;
-import com.android.settings.testutils.shadow.SettingsShadowResources;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Set;
-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,
-        assetDir = "/tests/robotests/assets")
-public class DataIntegrityTest {
-
-    @Test
-    @Config(shadows = {
-            SettingsShadowResources.class,
-            SettingsShadowResources.SettingsShadowTheme.class,
-    })
-    public void testIndexableResources_uniqueKeys() {
-        final Context context = RuntimeEnvironment.application;
-        // Aggregation of all keys
-        final Set<String> masterKeys = new ArraySet<>();
-        // Aggregation of the incorrectly duplicate keys
-        final Set<String> duplicateKeys = new ArraySet<>();
-        // Keys for a specific page
-        final Set<String> pageKeys = new ArraySet<>();
-        // List of all Xml preferences
-        final Set<Integer> xmlList = new ArraySet<>();
-        // Duplicates we know about.
-        List<String> grandfatheredKeys = new ArrayList<>();
-        CodeInspector.initializeGrandfatherList(grandfatheredKeys,
-                "whitelist_duplicate_index_key");
-
-        // Get a list of all Xml.
-        for (SearchIndexableResource val : SearchIndexableResources.values()) {
-            final int xmlResId = val.xmlResId;
-            if (xmlResId != 0) {
-                xmlList.add(xmlResId);
-            } else {
-                // Take class and get all keys
-                final Class clazz = DatabaseIndexingUtils.getIndexableClass(val.className);
-
-                // Skip classes that are invalid or cannot be mocked. Add them as special Xml below.
-                if (clazz == null
-                        || clazz == DateTimeSettings.class
-                        || clazz == DataPlanUsageSummary.class
-                        || clazz == DataUsageSummary.class
-                        || clazz == SecuritySettings.class) {
-                    continue;
-                }
-
-                Indexable.SearchIndexProvider provider = DatabaseIndexingUtils
-                        .getSearchIndexProvider(clazz);
-
-                if (provider == null) {
-                    continue;
-                }
-
-                List<SearchIndexableResource> subXml =
-                        provider.getXmlResourcesToIndex(context, true);
-
-                if (subXml == null) {
-                    continue;
-                }
-                for (SearchIndexableResource resource : subXml) {
-                    final int subXmlResId = resource.xmlResId;
-                    if (subXmlResId != 0) {
-                        xmlList.add(subXmlResId);
-                    }
-                }
-            }
-        }
-        addSpecialXml(xmlList);
-
-        // Get keys from all Xml and check for duplicates.
-        for (Integer xmlResId : xmlList) {
-            // Get all keys to be indexed
-            final List<String> prefKeys = XmlTestUtils.getKeysFromPreferenceXml(context, xmlResId);
-            pageKeys.addAll(prefKeys);
-            // Find all already-existing keys.
-            pageKeys.retainAll(masterKeys);
-            // Keep list of offending duplicate keys.
-            duplicateKeys.addAll(pageKeys);
-            // Add all keys to master key list.
-            masterKeys.addAll(prefKeys);
-            pageKeys.clear();
-        }
-        assertThat(duplicateKeys).containsExactlyElementsIn(grandfatheredKeys);
-    }
-
-    /**
-     * Add XML preferences from Fragments which have issues being instantiated in robolectric.
-     */
-    private void addSpecialXml(Set<Integer> xmlList) {
-        xmlList.add(R.xml.date_time_prefs);
-        xmlList.add(R.xml.data_usage);
-        xmlList.add(R.xml.data_usage_cellular);
-        xmlList.add(R.xml.data_usage_wifi);
-        xmlList.add(R.xml.security_settings_misc);
-    }
-
-
-}
diff --git a/tests/robotests/src/com/android/settings/search/DatabaseIndexingManagerTest.java b/tests/robotests/src/com/android/settings/search/DatabaseIndexingManagerTest.java
index 70ed568..7b5f474 100644
--- a/tests/robotests/src/com/android/settings/search/DatabaseIndexingManagerTest.java
+++ b/tests/robotests/src/com/android/settings/search/DatabaseIndexingManagerTest.java
@@ -17,24 +17,18 @@
 
 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.Matchers.anyBoolean;
 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;
-import android.content.ContentProvider;
 import android.content.ContentValues;
 import android.content.Context;
 import android.content.Intent;
@@ -43,19 +37,16 @@
 import android.content.pm.ProviderInfo;
 import android.content.pm.ResolveInfo;
 import android.database.Cursor;
-import android.database.MatrixCursor;
 import android.database.sqlite.SQLiteDatabase;
-import android.net.Uri;
 import android.os.Build;
-import android.provider.SearchIndexableResource;
+import android.provider.SearchIndexableData;
 import android.util.ArrayMap;
 
-import com.android.settings.R;
 import com.android.settings.TestConfig;
+import com.android.settings.search.indexing.PreIndexData;
 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;
@@ -67,11 +58,9 @@
 import org.robolectric.Robolectric;
 import org.robolectric.RuntimeEnvironment;
 import org.robolectric.annotation.Config;
-import org.robolectric.shadows.ShadowContentResolver;
 
 import java.util.ArrayList;
 import java.util.Arrays;
-import java.util.HashMap;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Locale;
@@ -81,11 +70,9 @@
 @RunWith(SettingsRobolectricTestRunner.class)
 @Config(
     manifest = TestConfig.MANIFEST_PATH,
-    sdk = TestConfig.SDK_VERSION,
+    sdk = TestConfig.SDK_VERSION_O,
     shadows = {
         ShadowRunnableAsyncTask.class,
-        ShadowDatabaseIndexingUtils.class,
-        ShadowContentResolver.class
     }
 )
 public class DatabaseIndexingManagerTest {
@@ -99,15 +86,12 @@
     private final String updatedSummaryOn = "summary-on";
     private final String normalizedSummaryOn = "summaryon";
     private final String summaryOff = "summary\u2011off";
-    private final String updatedSummaryOff = "summary-off";
-    private final String normalizedSummaryOff = "summaryoff";
     private final String entries = "entries";
     private final String keywords = "keywords, keywordss, keywordsss";
     private final String spaceDelimittedKeywords = "keywords keywordss keywordsss";
     private final String screenTitle = "screen title";
     private final String className = "class name";
     private final int iconResId = 0xff;
-    private final int noIcon = 0;
     private final String action = "action";
     private final String targetPackage = "target package";
     private final String targetClass = "target class";
@@ -129,6 +113,8 @@
     private DatabaseIndexingManager mManager;
     private SQLiteDatabase mDb;
 
+    private final List<ResolveInfo> FAKE_PROVIDER_LIST = new ArrayList<>();
+
     @Mock
     private PackageManager mPackageManager;
 
@@ -136,10 +122,12 @@
     public void setUp() {
         MockitoAnnotations.initMocks(this);
         mContext = spy(RuntimeEnvironment.application);
-        mManager = spy(new DatabaseIndexingManager(mContext, PACKAGE_ONE));
+        mManager = spy(new DatabaseIndexingManager(mContext));
         mDb = IndexDatabaseHelper.getInstance(mContext).getWritableDatabase();
 
         doReturn(mPackageManager).when(mContext).getPackageManager();
+        doReturn(FAKE_PROVIDER_LIST).when(mPackageManager)
+                .queryIntentContentProviders(any(Intent.class), anyInt());
         FakeFeatureFactory.setupForTest(mContext);
     }
 
@@ -153,7 +141,7 @@
         Cursor dbCursor = mDb.query("prefs_index", null, null, null, null, null, null);
         List<String> columnNames = new ArrayList<>(Arrays.asList(dbCursor.getColumnNames()));
         // Note that docid is not included.
-        List<String> expColumnNames = new ArrayList<>(Arrays.asList(new String[]{
+        List<String> expColumnNames = Arrays.asList(
                 "locale",
                 "data_rank",
                 "data_title",
@@ -175,7 +163,7 @@
                 "user_id",
                 "payload_type",
                 "payload"
-        }));
+        );
         // Prevent database schema regressions
         assertThat(columnNames).containsAllIn(expColumnNames);
     }
@@ -183,180 +171,6 @@
     // Tests for the flow: IndexOneRaw -> UpdateOneRowWithFilteredData -> UpdateOneRow
 
     @Test
-    public void testInsertRawColumn_rowInserted() {
-        SearchIndexableRaw raw = getFakeRaw();
-        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,
-                new HashMap<>()/* Non-indexable keys */);
-        Cursor cursor = mDb.rawQuery("SELECT * FROM prefs_index", null);
-        cursor.moveToPosition(0);
-
-        // Locale
-        assertThat(cursor.getString(0)).isEqualTo(localeStr);
-        // Data Rank
-        assertThat(cursor.getInt(1)).isEqualTo(raw.rank);
-        // Data Title
-        assertThat(cursor.getString(2)).isEqualTo(updatedTitle);
-        // Normalized Title
-        assertThat(cursor.getString(3)).isEqualTo(normalizedTitle);
-        // Summary On
-        assertThat(cursor.getString(4)).isEqualTo(updatedSummaryOn);
-        // Summary On Normalized
-        assertThat(cursor.getString(5)).isEqualTo(normalizedSummaryOn);
-        // Summary Off
-        assertThat(cursor.getString(6)).isEqualTo(updatedSummaryOff);
-        // Summary off normalized
-        assertThat(cursor.getString(7)).isEqualTo(normalizedSummaryOff);
-        // Entries
-        assertThat(cursor.getString(8)).isEqualTo(raw.entries);
-        // Keywords
-        assertThat(cursor.getString(9)).isEqualTo(spaceDelimittedKeywords);
-        // Screen Title
-        assertThat(cursor.getString(10)).isEqualTo(raw.screenTitle);
-        // Class Name
-        assertThat(cursor.getString(11)).isEqualTo(raw.className);
-        // Icon
-        assertThat(cursor.getInt(12)).isEqualTo(raw.iconResId);
-        // Intent Action
-        assertThat(cursor.getString(13)).isEqualTo(raw.intentAction);
-        // Target Package
-        assertThat(cursor.getString(14)).isEqualTo(raw.intentTargetPackage);
-        // Target Class
-        assertThat(cursor.getString(15)).isEqualTo(raw.intentTargetClass);
-        // Enabled
-        assertThat(cursor.getInt(16) == 1).isEqualTo(raw.enabled);
-        // Data ref key
-        assertThat(cursor.getString(17)).isNotNull();
-        // User Id
-        assertThat(cursor.getInt(18)).isEqualTo(raw.userId);
-        // Payload Type - default is 0
-        assertThat(cursor.getInt(19)).isEqualTo(0);
-        // Payload
-        byte[] payload = cursor.getBlob(20);
-        ResultPayload unmarshalledPayload = ResultPayloadUtils.unmarshall(payload,
-                ResultPayload.CREATOR);
-        assertThat(unmarshalledPayload).isInstanceOf(ResultPayload.class);
-    }
-
-    @Test
-    public void testInsertRawColumn_mismatchedLocale_noRowInserted() {
-        SearchIndexableRaw raw = getFakeRaw("ca-fr");
-        mManager.indexOneSearchIndexableData(mDb, localeStr, raw, null /* Non-indexable keys */);
-        Cursor cursor = mDb.rawQuery("SELECT * FROM prefs_index", null);
-        assertThat(cursor.getCount()).isEqualTo(0);
-    }
-
-    // Tests for the flow: IndexOneResource -> IndexFromResource ->
-    //                     UpdateOneRowWithFilteredData -> UpdateOneRow
-
-    @Test
-    public void testNullResource_NothingInserted() {
-        mManager.indexOneSearchIndexableData(mDb, localeStr, null /* searchIndexableResource */,
-                new HashMap<>());
-        Cursor cursor = mDb.rawQuery("SELECT * FROM prefs_index", null);
-        assertThat(cursor.getCount()).isEqualTo(0);
-    }
-
-    @Test
-    public void testAddResource_RowsInserted() {
-        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(17);
-    }
-
-    @Test
-    public void testAddResource_withNIKs_rowsInsertedDisabled() {
-        SearchIndexableResource resource = getFakeResource(R.xml.display_settings);
-        // Only add 2 of 16 items to be disabled.
-        String[] keys = {"brightness", "wallpaper"};
-        Map<String, Set<String>> niks = getNonIndexableKeys(keys);
-
-        mManager.indexOneSearchIndexableData(mDb, localeStr, resource, niks);
-
-        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(15);
-    }
-
-    @Test
-    public void testAddResourceHeader_rowsMatch() {
-        SearchIndexableResource resource = getFakeResource(R.xml.application_settings);
-        mManager.indexOneSearchIndexableData(mDb, localeStr, resource, new HashMap<>());
-
-        Cursor cursor = mDb.rawQuery("SELECT * FROM prefs_index ORDER BY data_title", null);
-        cursor.moveToPosition(1);
-
-        // Locale
-        assertThat(cursor.getString(0)).isEqualTo(localeStr);
-        // Data Rank
-        assertThat(cursor.getInt(1)).isEqualTo(rank);
-        // Data Title
-        assertThat(cursor.getString(2)).isEqualTo("App info");
-        // Normalized Title
-        assertThat(cursor.getString(3)).isEqualTo("app info");
-        // Summary On
-        assertThat(cursor.getString(4)).isEqualTo("Manage apps, set up quick launch shortcuts");
-        // Summary On Normalized
-        assertThat(cursor.getString(5)).isEqualTo("manage apps, set up quick launch shortcuts");
-        // Summary Off - only on for checkbox preferences
-        assertThat(cursor.getString(6)).isEmpty();
-        // Summary off normalized - only on for checkbox preferences
-        assertThat(cursor.getString(7)).isEmpty();
-        // Entries - only on for list preferences
-        assertThat(cursor.getString(8)).isNull();
-        // Keywords
-        assertThat(cursor.getString(9)).isEmpty();
-        // Screen Title
-        assertThat(cursor.getString(10)).isEqualTo("App info");
-        // Class Name
-        assertThat(cursor.getString(11)).isEqualTo(className);
-        // Icon
-        assertThat(cursor.getInt(12)).isEqualTo(0);
-        // Intent Action
-        assertThat(cursor.getString(13)).isEqualTo(action);
-        // Target Package
-        assertThat(cursor.getString(14)).isEqualTo(targetPackage);
-        // Target Class
-        assertThat(cursor.getString(15)).isEqualTo(targetClass);
-        // Enabled
-        assertThat(cursor.getInt(16) == 1).isEqualTo(enabled);
-        // Data ref key
-        assertThat(cursor.getString(17)).isEqualTo("applications_settings");
-        // User Id
-        assertThat(cursor.getInt(18)).isEqualTo(userId);
-        // Payload Type - default is 0
-        assertThat(cursor.getInt(19)).isEqualTo(0);
-        // Payload - should be updated to real payloads as controllers are added
-        byte[] payload = cursor.getBlob(20);
-        ResultPayload unmarshalledPayload = ResultPayloadUtils.unmarshall(payload,
-                ResultPayload.CREATOR);
-        assertThat(unmarshalledPayload).isInstanceOf(ResultPayload.class);
-    }
-
-    @Test
     public void testAddResource_withChildFragment_shouldUpdateSiteMapDb() {
         // FIXME: This test was failing. (count = 6 at the end)
 
@@ -381,487 +195,62 @@
 //        assertThat(count).isEqualTo(5);
     }
 
-    @Test
-    public void testAddResource_customSetting_rowsMatch() {
-        SearchIndexableResource resource = getFakeResource(R.xml.swipe_to_notification_settings);
-        mManager.indexOneSearchIndexableData(mDb, localeStr, resource, new HashMap<>());
-        final String prefTitle =
-                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();
-
-        // Locale
-        assertThat(cursor.getString(0)).isEqualTo(localeStr);
-        // Data Rank
-        assertThat(cursor.getInt(1)).isEqualTo(rank);
-        // Data Title
-        assertThat(cursor.getString(2)).isEqualTo(prefTitle);
-        // Normalized Title
-        assertThat(cursor.getString(3)).isEqualTo(prefTitle.toLowerCase());
-        // Summary On
-        assertThat(cursor.getString(4)).isEqualTo(prefSummary);
-        // Summary On Normalized
-        assertThat(cursor.getString(5)).isEqualTo(prefSummary.toLowerCase());
-        // Summary Off - only on for checkbox preferences
-        assertThat(cursor.getString(6)).isEmpty();
-        // Summary off normalized - only on for checkbox preferences
-        assertThat(cursor.getString(7)).isEmpty();
-        // Entries - only on for list preferences
-        assertThat(cursor.getString(8)).isNull();
-        // Keywords
-        assertThat(cursor.getString(9)).isEqualTo(keywords);
-        // Screen Title
-        assertThat(cursor.getString(10)).isEqualTo(
-                mContext.getString(R.string.fingerprint_swipe_for_notifications_title));
-        // Class Name
-        assertThat(cursor.getString(11)).isEqualTo(className);
-        // Icon
-        assertThat(cursor.getInt(12)).isEqualTo(noIcon);
-        // Intent Action
-        assertThat(cursor.getString(13)).isEqualTo(action);
-        // Target Package
-        assertThat(cursor.getString(14)).isEqualTo(targetPackage);
-        // Target Class
-        assertThat(cursor.getString(15)).isEqualTo(targetClass);
-        // Enabled
-        assertThat(cursor.getInt(16) == 1).isEqualTo(enabled);
-        // Data ref key
-        assertThat(cursor.getString(17)).isEqualTo("gesture_swipe_down_fingerprint");
-        // User Id
-        assertThat(cursor.getInt(18)).isEqualTo(userId);
-        // Payload Type - default is 0
-        assertThat(cursor.getInt(19)).isEqualTo(0);
-        // Payload - should be updated to real payloads as controllers are added
-        byte[] payload = cursor.getBlob(20);
-        ResultPayload unmarshalledPayload = ResultPayloadUtils.unmarshall(payload,
-                ResultPayload.CREATOR);
-        assertThat(unmarshalledPayload).isInstanceOf(ResultPayload.class);
-    }
-
-    @Test
-    public void testAddResource_checkboxPreference_rowsMatch() {
-        SearchIndexableResource resource = getFakeResource(R.xml.application_settings);
-        mManager.indexOneSearchIndexableData(mDb, localeStr, resource, new HashMap<>());
-
-        /* Should return 6 results, with the following titles:
-         * Advanced Settings, Apps, Manage Apps, Preferred install location, Running Services
-         */
-        Cursor cursor = mDb.rawQuery("SELECT * FROM prefs_index ORDER BY data_title", null);
-        cursor.moveToPosition(0);
-        // Locale
-        assertThat(cursor.getString(0)).isEqualTo(localeStr);
-        // Data Rank
-        assertThat(cursor.getInt(1)).isEqualTo(rank);
-        // Data Title
-        assertThat(cursor.getString(2)).isEqualTo("Advanced settings");
-        // Normalized Title
-        assertThat(cursor.getString(3)).isEqualTo("advanced settings");
-        // Summary On
-        assertThat(cursor.getString(4)).isEqualTo("Enable more settings options");
-        // Summary On Normalized
-        assertThat(cursor.getString(5)).isEqualTo("enable more settings options");
-        // Summary Off
-        assertThat(cursor.getString(6)).isEqualTo("Enable more settings options");
-        // Summary Off
-        assertThat(cursor.getString(7)).isEqualTo("enable more settings options");
-        // Entries - only on for list preferences
-        assertThat(cursor.getString(8)).isNull();
-        // Keywords
-        assertThat(cursor.getString(9)).isEmpty();
-        // Screen Title
-        assertThat(cursor.getString(10)).isEqualTo("App info");
-        // Class Name
-        assertThat(cursor.getString(11)).isEqualTo(className);
-        // Icon
-        assertThat(cursor.getInt(12)).isEqualTo(noIcon);
-        // Intent Action
-        assertThat(cursor.getString(13)).isEqualTo(action);
-        // Target Package
-        assertThat(cursor.getString(14)).isEqualTo(targetPackage);
-        // Target Class
-        assertThat(cursor.getString(15)).isEqualTo(targetClass);
-        // Enabled
-        assertThat(cursor.getInt(16) == 1).isEqualTo(enabled);
-        // Data ref key
-        assertThat(cursor.getString(17)).isEqualTo("toggle_advanced_settings");
-        // User Id
-        assertThat(cursor.getInt(18)).isEqualTo(userId);
-        // Payload Type - default is 0
-        assertThat(cursor.getInt(19)).isEqualTo(0);
-        // Payload - should be updated to real payloads as controllers are added
-        byte[] payload = cursor.getBlob(20);
-        ResultPayload unmarshalledPayload = ResultPayloadUtils.unmarshall(payload,
-                ResultPayload.CREATOR);
-        assertThat(unmarshalledPayload).isInstanceOf(ResultPayload.class);
-    }
-
-    @Test
-    public void testAddResource_listPreference_rowsMatch() {
-        SearchIndexableResource resource = getFakeResource(R.xml.application_settings);
-        mManager.indexOneSearchIndexableData(mDb, localeStr, resource, new HashMap<>());
-
-        Cursor cursor = mDb.rawQuery("SELECT * FROM prefs_index ORDER BY data_title", null);
-        cursor.moveToPosition(3);
-        // Locale
-        assertThat(cursor.getString(0)).isEqualTo(localeStr);
-        // Data Rank
-        assertThat(cursor.getInt(1)).isEqualTo(rank);
-        // Data Title
-        assertThat(cursor.getString(2)).isEqualTo("Preferred install location");
-        // Normalized Title
-        assertThat(cursor.getString(3)).isEqualTo("preferred install location");
-        // Summary On
-        assertThat(cursor.getString(4)).isEqualTo(
-                "Change the preferred installation location for new apps");
-        // Summary On Normalized
-        assertThat(cursor.getString(5)).isEqualTo(
-                "change the preferred installation location for new apps");
-        // Summary Off - only on for checkbox preferences
-        assertThat(cursor.getString(6)).isEmpty();
-        // Summary off normalized - only on for checkbox preferences
-        assertThat(cursor.getString(7)).isEmpty();
-        // Entries - only on for list preferences
-        assertThat(cursor.getString(8)).isEqualTo("Internal device storage|Removable SD card|" +
-                "Let the system decide|");
-        // Keywords
-        assertThat(cursor.getString(9)).isEmpty();
-        // Screen Title
-        assertThat(cursor.getString(10)).isEqualTo("App info");
-        // Class Name
-        assertThat(cursor.getString(11)).isEqualTo(className);
-        // Icon
-        assertThat(cursor.getInt(12)).isEqualTo(noIcon);
-        // Intent Action
-        assertThat(cursor.getString(13)).isEqualTo(action);
-        // Target Package
-        assertThat(cursor.getString(14)).isEqualTo(targetPackage);
-        // Target Class
-        assertThat(cursor.getString(15)).isEqualTo(targetClass);
-        // Enabled
-        assertThat(cursor.getInt(16) == 1).isEqualTo(enabled);
-        // Data ref key
-        assertThat(cursor.getString(17)).isEqualTo("app_install_location");
-        // User Id
-        assertThat(cursor.getInt(18)).isEqualTo(userId);
-        // Payload Type - default is 0
-        assertThat(cursor.getInt(19)).isEqualTo(0);
-        // Payload - should be updated to real payloads as controllers are added
-        byte[] payload = cursor.getBlob(20);
-        ResultPayload unmarshalledPayload = ResultPayloadUtils.unmarshall(payload,
-                ResultPayload.CREATOR);
-        assertThat(unmarshalledPayload).isInstanceOf(ResultPayload.class);
-    }
-
-    @Test
-    public void testAddResource_iconAddedFromXml() {
-        SearchIndexableResource resource = getFakeResource(R.xml.connected_devices);
-        mManager.indexOneSearchIndexableData(mDb, localeStr, resource, new HashMap<>());
-
-        Cursor cursor = mDb.rawQuery("SELECT * FROM prefs_index ORDER BY data_title", null);
-        cursor.moveToPosition(0);
-
-        // Icon
-        assertThat(cursor.getInt(12)).isNotEqualTo(noIcon);
-    }
-
-    // Tests for the flow: IndexOneResource -> IndexFromProvider -> IndexFromResource ->
-    //                     UpdateOneRowWithFilteredData -> UpdateOneRow
-
-    @Test
-    public void testResourceProvider_rowInserted() {
-        SearchIndexableResource resource = getFakeResource(R.xml.swipe_to_notification_settings);
-        resource.xmlResId = 0;
-        resource.className = "com.android.settings.display.ScreenZoomSettings";
-
-        mManager.indexOneSearchIndexableData(mDb, localeStr, resource, new HashMap<>());
-        Cursor cursor = mDb.rawQuery("SELECT * FROM prefs_index", null);
-        assertThat(cursor.getCount()).isEqualTo(1);
-    }
-
-    @Test
-    public void testResourceProvider_rowMatches() {
-        SearchIndexableResource resource = getFakeResource(R.xml.swipe_to_notification_settings);
-        resource.xmlResId = 0;
-        resource.className = "com.android.settings.display.ScreenZoomSettings";
-
-        mManager.indexOneSearchIndexableData(mDb, localeStr, resource, new HashMap<>());
-        Cursor cursor = mDb.rawQuery("SELECT * FROM prefs_index", null);
-        cursor.moveToPosition(0);
-
-        // Locale
-        assertThat(cursor.getString(0)).isEqualTo(localeStr);
-        // Data Rank
-        assertThat(cursor.getInt(1)).isEqualTo(0);
-        // Data Title
-        assertThat(cursor.getString(2)).isEqualTo("Display size");
-        // Normalized Title
-        assertThat(cursor.getString(3)).isEqualTo("display size");
-        // Summary On
-        assertThat(cursor.getString(4)).isEmpty();
-        // Summary On Normalized
-        assertThat(cursor.getString(5)).isEmpty();
-        // Summary Off - only on for checkbox preferences
-        assertThat(cursor.getString(6)).isEmpty();
-        // Summary off normalized - only on for checkbox preferences
-        assertThat(cursor.getString(7)).isEmpty();
-        // Entries - only on for list preferences
-        assertThat(cursor.getString(8)).isNull();
-        // Keywords
-        assertThat(cursor.getString(9)).isEqualTo("display density screen zoom scale scaling");
-        // Screen Title
-        assertThat(cursor.getString(10)).isEqualTo("Display size");
-        // Class Name
-        assertThat(cursor.getString(11))
-                .isEqualTo("com.android.settings.display.ScreenZoomSettings");
-        // Icon
-        assertThat(cursor.getInt(12)).isEqualTo(noIcon);
-        // Intent Action
-        assertThat(cursor.getString(13)).isNull();
-        // Target Package
-        assertThat(cursor.getString(14)).isNull();
-        // Target Class
-        assertThat(cursor.getString(15)).isNull();
-        // Enabled
-        assertThat(cursor.getInt(16) == 1).isEqualTo(enabled);
-        // Data ref key
-        assertThat(cursor.getString(17)).isNull();
-        // User Id
-        assertThat(cursor.getInt(18)).isEqualTo(userId);
-        // Payload Type - default is 0
-        assertThat(cursor.getInt(19)).isEqualTo(0);
-        // Payload - should be updated to real payloads as controllers are added
-        byte[] payload = cursor.getBlob(20);
-        ResultPayload unmarshalledPayload = ResultPayloadUtils.unmarshall(payload,
-                ResultPayload.CREATOR);
-        assertThat(unmarshalledPayload).isInstanceOf(ResultPayload.class);
-    }
-
-    @Test
-    public void testResourceProvider_resourceRowInserted() {
-        SearchIndexableResource resource = getFakeResource(0);
-        resource.className = "com.android.settings.LegalSettings";
-
-        mManager.indexOneSearchIndexableData(mDb, localeStr, resource, new HashMap<>());
-        Cursor cursor = mDb.rawQuery("SELECT * FROM prefs_index", null);
-        assertThat(cursor.getCount()).isEqualTo(6);
-    }
-
-    @Test
-    public void testResourceProvider_resourceRowMatches() {
-        SearchIndexableResource resource = getFakeResource(0 /* xml */);
-        resource.className = "com.android.settings.display.ScreenZoomSettings";
-
-        mManager.indexOneSearchIndexableData(mDb, localeStr, resource, new HashMap<>());
-        Cursor cursor = mDb.rawQuery("SELECT * FROM prefs_index ORDER BY data_title", null);
-        cursor.moveToPosition(0);
-
-        // Locale
-        assertThat(cursor.getString(0)).isEqualTo(localeStr);
-        // Data Rank
-        assertThat(cursor.getInt(1)).isEqualTo(0);
-        // Data Title
-        assertThat(cursor.getString(2)).isEqualTo("Display size");
-        // Normalized Title
-        assertThat(cursor.getString(3)).isEqualTo("display size");
-        // Summary On
-        assertThat(cursor.getString(4)).isEmpty();
-        // Summary On Normalized
-        assertThat(cursor.getString(5)).isEmpty();
-        // Summary Off - only on for checkbox preferences
-        assertThat(cursor.getString(6)).isEmpty();
-        // Summary off normalized - only on for checkbox preferences
-        assertThat(cursor.getString(7)).isEmpty();
-        // Entries - only on for list preferences
-        assertThat(cursor.getString(8)).isNull();
-        // Keywords
-        assertThat(cursor.getString(9)).isEqualTo(
-                "display density screen zoom scale scaling");
-        // Screen Title
-        assertThat(cursor.getString(10)).isEqualTo("Display size");
-        // Class Name
-        assertThat(cursor.getString(11))
-                .isEqualTo("com.android.settings.display.ScreenZoomSettings");
-        // Icon
-        assertThat(cursor.getInt(12)).isEqualTo(noIcon);
-        // Intent Action
-        assertThat(cursor.getString(13)).isNull();
-        // Target Package
-        assertThat(cursor.getString(14)).isNull();
-        // Target Class
-        assertThat(cursor.getString(15)).isNull();
-        // Enabled
-        assertThat(cursor.getInt(16) == 1).isEqualTo(enabled);
-        // Data ref key
-        assertThat(cursor.getString(17)).isNull();
-        // User Id
-        assertThat(cursor.getInt(18)).isEqualTo(userId);
-        // Payload Type - default is 0
-        assertThat(cursor.getInt(19)).isEqualTo(0);
-        // Payload - should be updated to real payloads as controllers are added
-        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 /* xml */);
-        resource.className = "com.android.settings.LegalSettings";
-
-        mManager.indexOneSearchIndexableData(mDb, localeStr, resource,
-                new HashMap<String, Set<String>>());
-
-        Cursor cursor = mDb.rawQuery("SELECT * FROM prefs_index WHERE enabled = 1", null);
-        assertThat(cursor.getCount()).isEqualTo(1);
-        cursor = mDb.rawQuery("SELECT * FROM prefs_index WHERE enabled = 0", null);
-        assertThat(cursor.getCount()).isEqualTo(5);
-    }
-
-    @Test
-    public void testResource_withTitleAndSettingName_titleNotInserted() {
-        SearchIndexableResource resource = getFakeResource(R.xml.swipe_to_notification_settings);
-        mManager.indexFromResource(mDb, localeStr, resource, new ArrayList<String>());
-
-        Cursor cursor = mDb.rawQuery("SELECT * FROM prefs_index WHERE" +
-                " enabled = 1", null);
-        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
     public void testPerformIndexing_fullIndex_getsDataFromProviders() {
-        DummyProvider provider = new DummyProvider();
-        provider.onCreate();
-        ShadowContentResolver.registerProvider(AUTHORITY_ONE, provider);
+        SearchIndexableRaw rawData = getFakeRaw();
+        PreIndexData data = getPreIndexData(rawData);
+        doReturn(data).when(mManager).getIndexDataFromProviders(anyList(), anyBoolean());
+        doReturn(true).when(mManager).isFullIndex(any(Context.class), anyString(), anyString(),
+                anyString());
 
-        // Test that Indexables are added for Full indexing
-        when(mPackageManager.queryIntentContentProviders(any(Intent.class), anyInt()))
-                .thenReturn(getDummyResolveInfo());
+        mManager.performIndexing();
 
-        DatabaseIndexingManager manager =
-                spy(new DatabaseIndexingManager(mContext, PACKAGE_ONE));
-
-        manager.performIndexing();
-
-        verify(manager).addIndexablesFromRemoteProvider(PACKAGE_ONE, AUTHORITY_ONE);
-        verify(manager).updateDatabase(true /* isFullIndex */, Locale.getDefault().toString());
+        verify(mManager).updateDatabase(data, true /* isFullIndex */);
     }
 
     @Test
-    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(providerInfo);
-
+    public void testPerformIndexing_fullIndex_databaseDropped() {
+        // Initialize the Manager and force rebuild
         DatabaseIndexingManager manager =
-                spy(new DatabaseIndexingManager(mContext, PACKAGE_ONE));
-
-        manager.mDataToProcess.dataToUpdate.clear();
-
-        manager.performIndexing();
-
-        verify(manager, times(0)).addDataToDatabase(any(SQLiteDatabase.class), anyString(),
-                anyList(), anyMap());
-        verify(manager, times(0)).addIndexablesFromRemoteProvider(PACKAGE_ONE, AUTHORITY_ONE);
-        verify(manager).updateDataInDatabase(any(SQLiteDatabase.class), anyMap());
-    }
-
-    @Test
-    public void testPerformIndexing_localeChanged_databaseDropped() {
-        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());
-
-        // Initialize the Manager
-        DatabaseIndexingManager manager =
-                spy(new DatabaseIndexingManager(mContext, PACKAGE_ONE));
+                spy(new DatabaseIndexingManager(mContext));
+        doReturn(false).when(mManager).isFullIndex(any(Context.class), anyString(), anyString(),
+                anyString());
 
         // Insert data point which will be dropped
-        final String oldTitle = "This is French";
-        insertSpecialCase(oldTitle, true, "key");
-
-        // Add a data point to be added by the indexing
-        SearchIndexableRaw raw = new SearchIndexableRaw(mContext);
-        final String newTitle = "This is English";
-        raw.title = newTitle;
-        manager.mDataToProcess.dataToUpdate.add(raw);
+        insertSpecialCase("Ceci n'est pas un pipe", true, "oui oui mon ami");
 
         manager.performIndexing();
 
-        // Assert that the New Title is inserted
-        final Cursor newCursor = mDb.rawQuery("SELECT * FROM prefs_index WHERE data_title = '" +
-                newTitle + "'", null);
-        assertThat(newCursor.getCount()).isEqualTo(1);
-
         // Assert that the Old Title is no longer in the database, since it was dropped
-        final Cursor oldCursor = mDb.rawQuery("SELECT * FROM prefs_index WHERE data_title = '" +
-                oldTitle + "'", null);
+        final Cursor oldCursor = mDb.rawQuery("SELECT * FROM prefs_index", null);
+
         assertThat(oldCursor.getCount()).isEqualTo(0);
     }
 
     @Test
-    public void testPerformIndexing_onOta_FullIndex() {
-        DummyProvider provider = new DummyProvider();
-        provider.onCreate();
-        ShadowContentResolver.registerProvider(
-                AUTHORITY_ONE, provider
-        );
+    public void testPerformIndexing_isfullIndex() {
+        SearchIndexableRaw rawData = getFakeRaw();
+        PreIndexData data = getPreIndexData(rawData);
+        doReturn(data).when(mManager).getIndexDataFromProviders(anyList(), anyBoolean());
+        doReturn(true).when(mManager).isFullIndex(any(Context.class), anyString(), anyString(),
+                anyString());
 
-        // Test that Indexables are added for Full indexing
-        when(mPackageManager.queryIntentContentProviders(any(Intent.class), anyInt()))
-                .thenReturn(getDummyResolveInfo());
+        mManager.performIndexing();
 
-        DatabaseIndexingManager manager =
-                spy(new DatabaseIndexingManager(mContext, PACKAGE_ONE));
-
-        manager.performIndexing();
-
-        verify(manager).updateDatabase(true /* isFullIndex */, Locale.getDefault().toString());
+        verify(mManager).updateDatabase(data, true /* isFullIndex */);
     }
 
     @Test
-    public void testPerformIndexing_onPackageChange_shouldFullIndex() {
+    public void testPerformIndexing_onPackageChange_fullIndex() {
         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(
+        assertThat(mManager.isFullIndex(
                 mContext, locale, buildNumber,
                 IndexDatabaseHelper.buildProviderVersionedNames(providers)))
                 .isFalse();
@@ -869,73 +258,45 @@
         // Change provider version number, this should trigger full index.
         providers.get(0).providerInfo.applicationInfo.versionCode++;
 
-        assertThat(IndexDatabaseHelper.isFullIndex(mContext, locale, buildNumber,
+        assertThat(mManager.isFullIndex(mContext, locale, buildNumber,
                 IndexDatabaseHelper.buildProviderVersionedNames(providers)))
                 .isTrue();
     }
 
     @Test
     public void testPerformIndexing_onOta_buildNumberIsCached() {
-        DummyProvider provider = new DummyProvider();
-        provider.onCreate();
-        ShadowContentResolver.registerProvider(
-                AUTHORITY_ONE, provider
-        );
+        mManager.performIndexing();
 
-        // Test that Indexables are added for Full indexing
-        when(mPackageManager.queryIntentContentProviders(any(Intent.class), anyInt()))
-                .thenReturn(getDummyResolveInfo());
-
-        DatabaseIndexingManager manager =
-                spy(new DatabaseIndexingManager(mContext, PACKAGE_ONE));
-
-        manager.performIndexing();
-
-        assertThat(IndexDatabaseHelper.getInstance(mContext).isBuildIndexed(mContext,
-                Build.FINGERPRINT)).isTrue();
-    }
-
-    @Test
-    public void testFullUpdatedDatabase_noData_addDataToDatabaseNotCalled() {
-        mManager.updateDatabase(true /* isFullIndex */, localeStr);
-        mManager.mDataToProcess.dataToUpdate.clear();
-        verify(mManager, times(0)).addDataToDatabase(any(SQLiteDatabase.class), anyString(),
-                anyList(), anyMap());
-    }
-
-    @Test
-    public void testFullUpdatedDatabase_updatedDataInDatabaseNotCalled() {
-        mManager.updateDatabase(true /* isFullIndex */, localeStr);
-        verify(mManager, times(0)).updateDataInDatabase(any(SQLiteDatabase.class), anyMap());
+        assertThat(IndexDatabaseHelper.isBuildIndexed(mContext, Build.FINGERPRINT)).isTrue();
     }
 
     @Test
     public void testLocaleUpdated_afterIndexing_localeNotAdded() {
-        mManager.updateDatabase(true /* isFullIndex */, localeStr);
-        assertThat(IndexDatabaseHelper.getInstance(mContext)
-                .isLocaleAlreadyIndexed(mContext, localeStr)).isFalse();
+        PreIndexData emptydata = new PreIndexData();
+        mManager.updateDatabase(emptydata, true /* isFullIndex */);
+
+        assertThat(IndexDatabaseHelper.isLocaleAlreadyIndexed(mContext, localeStr)).isFalse();
     }
 
     @Test
     public void testLocaleUpdated_afterFullIndexing_localeAdded() {
         mManager.performIndexing();
-        assertThat(IndexDatabaseHelper.getInstance(mContext)
-                .isLocaleAlreadyIndexed(mContext, localeStr)).isTrue();
+
+        assertThat(IndexDatabaseHelper.isLocaleAlreadyIndexed(mContext, localeStr)).isTrue();
     }
 
     @Test
     public void testUpdateDatabase_newEligibleData_addedToDatabase() {
         // Test that addDataToDatabase is called when dataToUpdate is non-empty
-        mManager.mDataToProcess.dataToUpdate.add(getFakeRaw());
-        mManager.updateDatabase(true /* isFullIndex */, localeStr);
+        PreIndexData indexData = new PreIndexData();
+        indexData.dataToUpdate.add(getFakeRaw());
+        mManager.updateDatabase(indexData, true /* isFullIndex */);
 
         Cursor cursor = mDb.rawQuery("SELECT * FROM prefs_index", null);
         cursor.moveToPosition(0);
 
         // Locale
         assertThat(cursor.getString(0)).isEqualTo(localeStr);
-        // Data Rank
-        assertThat(cursor.getInt(1)).isEqualTo(rank);
         // Data Title
         assertThat(cursor.getString(2)).isEqualTo(updatedTitle);
         // Normalized Title
@@ -944,10 +305,6 @@
         assertThat(cursor.getString(4)).isEqualTo(updatedSummaryOn);
         // Summary On Normalized
         assertThat(cursor.getString(5)).isEqualTo(normalizedSummaryOn);
-        // Summary Off
-        assertThat(cursor.getString(6)).isEqualTo(updatedSummaryOff);
-        // Summary off normalized
-        assertThat(cursor.getString(7)).isEqualTo(normalizedSummaryOff);
         // Entries
         assertThat(cursor.getString(8)).isEqualTo(entries);
         // Keywords
@@ -1020,8 +377,8 @@
     @Test
     public void testEmptyNonIndexableKeys_emptyDataKeyResources_addedToDatabase() {
         insertSpecialCase(TITLE_ONE, true /* enabled */, null /* dataReferenceKey */);
-
-        mManager.updateDatabase(false, localeStr);
+        PreIndexData emptydata = new PreIndexData();
+        mManager.updateDatabase(emptydata, false /* needsReindexing */);
 
         Cursor cursor = mDb.rawQuery("SELECT * FROM prefs_index WHERE enabled = 1", null);
         cursor.moveToPosition(0);
@@ -1089,68 +446,6 @@
         return data;
     }
 
-    private SearchIndexableResource getFakeResource(int xml) {
-        SearchIndexableResource sir = new SearchIndexableResource(mContext);
-        sir.rank = rank;
-        sir.xmlResId = xml;
-        sir.className = className;
-        sir.packageName = packageName;
-        sir.iconResId = iconResId;
-        sir.intentAction = action;
-        sir.intentTargetPackage = targetPackage;
-        sir.intentTargetClass = targetClass;
-        sir.enabled = enabled;
-        return sir;
-    }
-
-    private Map<String, Set<String>> getNonIndexableKeys(String[] keys) {
-        Map<String, Set<String>> niks = new HashMap<>();
-        Set<String> keysList = new HashSet<>();
-        keysList.addAll(Arrays.asList(keys));
-        niks.put(packageName, keysList);
-        return niks;
-    }
-
-    private List<ResolveInfo> getDummyResolveInfo() {
-        List<ResolveInfo> infoList = new ArrayList<>();
-        ResolveInfo info = new ResolveInfo();
-        info.providerInfo = new ProviderInfo();
-        info.providerInfo.exported = true;
-        info.providerInfo.authority = AUTHORITY_ONE;
-        info.providerInfo.packageName = PACKAGE_ONE;
-        info.providerInfo.applicationInfo = new ApplicationInfo();
-        infoList.add(info);
-
-        return infoList;
-    }
-
-    // TODO move this method and its counterpart in CursorToSearchResultConverterTest into
-    // a util class with public fields to assert values.
-    private Cursor getDummyCursor() {
-        MatrixCursor cursor = new MatrixCursor(INDEXABLES_RAW_COLUMNS);
-        final String BLANK = "";
-
-        ArrayList<String> item =
-                new ArrayList<>(INDEXABLES_RAW_COLUMNS.length);
-        item.add("42"); // Rank
-        item.add(TITLE_ONE); // Title
-        item.add(BLANK); // Summary on
-        item.add(BLANK); // summary off
-        item.add(BLANK); // entries
-        item.add(BLANK); // keywords
-        item.add(BLANK); // screen title
-        item.add(BLANK); // classname
-        item.add("123"); // Icon
-        item.add(BLANK); // Intent action
-        item.add(BLANK); // target package
-        item.add(BLANK); // target class
-        item.add(KEY_ONE); // Key
-        item.add("-1"); // userId
-        cursor.addRow(item);
-
-        return cursor;
-    }
-
     private void insertSpecialCase(String specialCase, boolean enabled, String key) {
         ContentValues values = new ContentValues();
         values.put(IndexDatabaseHelper.IndexColumns.DOCID, specialCase.hashCode());
@@ -1179,43 +474,22 @@
         mDb.replaceOrThrow(IndexDatabaseHelper.Tables.TABLE_PREFS_INDEX, null, values);
     }
 
-    private class DummyProvider extends ContentProvider {
+    private PreIndexData getPreIndexData(SearchIndexableData fakeData) {
+        PreIndexData data = new PreIndexData();
+        data.dataToUpdate.add(fakeData);
+        return data;
+    }
 
-        @Override
-        public boolean onCreate() {
-            return false;
-        }
+    private List<ResolveInfo> getDummyResolveInfo() {
+        List<ResolveInfo> infoList = new ArrayList<>();
+        ResolveInfo info = new ResolveInfo();
+        info.providerInfo = new ProviderInfo();
+        info.providerInfo.exported = true;
+        info.providerInfo.authority = AUTHORITY_ONE;
+        info.providerInfo.packageName = PACKAGE_ONE;
+        info.providerInfo.applicationInfo = new ApplicationInfo();
+        infoList.add(info);
 
-        @Override
-        public Cursor query(@NonNull Uri uri, @Nullable String[] projection,
-                @Nullable String selection, @Nullable String[] selectionArgs,
-                @Nullable String sortOrder) {
-            if (uri.toString().contains("xml")) {
-                return null;
-            }
-            return getDummyCursor();
-        }
-
-        @Override
-        public String getType(@NonNull Uri uri) {
-            return null;
-        }
-
-        @Override
-        public Uri insert(@NonNull Uri uri, @Nullable ContentValues values) {
-            return null;
-        }
-
-        @Override
-        public int delete(@NonNull Uri uri, @Nullable String selection,
-                @Nullable String[] selectionArgs) {
-            return 0;
-        }
-
-        @Override
-        public int update(@NonNull Uri uri, @Nullable ContentValues values,
-                @Nullable String selection, @Nullable String[] selectionArgs) {
-            return 0;
-        }
+        return infoList;
     }
 }
diff --git a/tests/robotests/src/com/android/settings/search/DatabaseIndexingUtilsTest.java b/tests/robotests/src/com/android/settings/search/DatabaseIndexingUtilsTest.java
index 3bfa936..4b662b6 100644
--- a/tests/robotests/src/com/android/settings/search/DatabaseIndexingUtilsTest.java
+++ b/tests/robotests/src/com/android/settings/search/DatabaseIndexingUtilsTest.java
@@ -20,18 +20,14 @@
 import static com.google.common.truth.Truth.assertThat;
 
 import android.content.Context;
-import android.util.ArrayMap;
 
-import com.android.internal.hardware.AmbientDisplayConfiguration;
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
-import com.android.settings.core.PreferenceControllerMixin;
 import com.android.settings.deviceinfo.SystemUpdatePreferenceController;
+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;
@@ -39,12 +35,10 @@
 import java.util.Map;
 
 @RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION_O)
 public class DatabaseIndexingUtilsTest {
 
     private Context mContext;
-    @Mock
-    private AmbientDisplayConfiguration mAmbientDisplayConfiguration;
 
     @Before
     public void setUp() {
@@ -54,44 +48,22 @@
 
     @Test
     public void testGetPreferenceControllerUriMap_BadClassName_ReturnsNull() {
-        Map map = DatabaseIndexingUtils.getPreferenceControllerUriMap("dummy", mContext);
-        assertThat(map).isNull();
+        Map map = DatabaseIndexingUtils.getPayloadKeyMap("dummy", mContext);
+        assertThat(map).isEmpty();
     }
 
     @Test
     public void testGetPreferenceControllerUriMap_NullContext_ReturnsNull() {
-        Map map = DatabaseIndexingUtils.getPreferenceControllerUriMap("dummy", null);
-        assertThat(map).isNull();
-    }
-
-    @Test
-    public void testGetPreferenceControllerUriMap_CompatibleClass_ReturnsValidMap() {
-        final String className = "com.android.settings.system.SystemDashboardFragment";
-        final Map<String, PreferenceControllerMixin> map =
-                DatabaseIndexingUtils.getPreferenceControllerUriMap(className, mContext);
-        assertThat(map.get("system_update_settings"))
-                .isInstanceOf(SystemUpdatePreferenceController.class);
+        Map map = DatabaseIndexingUtils.getPayloadKeyMap("dummy", null);
+        assertThat(map).isEmpty();
     }
 
     @Test
     public void testGetPayloadFromMap_NullMap_ReturnsNull() {
-        ResultPayload payload = DatabaseIndexingUtils.getPayloadFromUriMap(null, "");
+        final String className = "com.android.settings.system.SystemDashboardFragment";
+        final Map<String, ResultPayload> map =
+                DatabaseIndexingUtils.getPayloadKeyMap(className, mContext);
+        ResultPayload payload = map.get(null);
         assertThat(payload).isNull();
     }
-
-    @Test
-    public void testGetPayloadFromMap_MatchingKey_ReturnsPayload() {
-        final String key = "key";
-        PreferenceControllerMixin prefController = new PreferenceControllerMixin() {
-            @Override
-            public ResultPayload getResultPayload() {
-                return new ResultPayload(null);
-            }
-        };
-        ArrayMap<String, PreferenceControllerMixin> map = new ArrayMap<>();
-        map.put(key, prefController);
-
-        ResultPayload payload = DatabaseIndexingUtils.getPayloadFromUriMap(map, key);
-        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
deleted file mode 100644
index 90f6e87..0000000
--- a/tests/robotests/src/com/android/settings/search/DatabaseResultLoaderTest.java
+++ /dev/null
@@ -1,375 +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.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
deleted file mode 100644
index a0d3163..0000000
--- a/tests/robotests/src/com/android/settings/search/DatabaseRowTest.java
+++ /dev/null
@@ -1,175 +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.search;
-
-import android.content.ComponentName;
-import android.content.Intent;
-import android.content.Context;
-
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.TestConfig;
-import com.android.settings.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;
-
-@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
-public class DatabaseRowTest {
-    private Builder mBuilder;
-
-    private static final String LOCALE = "locale";
-    private static final String UPDATED_TITLE = "updated title";
-    private static final String NORMALIZED_TITLE = "normal title";
-    private static final String UPDATED_SUMMARY_ON = "updated summary on";
-    private static final String NORMALIZED_SUMMARY_ON = "normalized summary on";
-    private static final String UPDATED_SUMMARY_OFF = "updated summary off";
-    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 = "screen title";
-    private static final int ICON_RES_ID = 0xff;
-    private static final int RANK = 1;
-    private static final String SPACE_DELIMITED_KEYWORDS = "keywords";
-    private static final String INTENT_ACTION = "intent action";
-    private static final String INTENT_TARGET_PACKAGE = "target package";
-    private static final String INTENT_TARGET_CLASS = "target class";
-    private static final boolean ENABLED = true;
-    private static final String KEY = "key";
-    private static final int USER_ID = 1;
-
-    private Context mContext;
-
-    @Before
-    public void setUp() {
-        mContext = RuntimeEnvironment.application;
-        mBuilder = createBuilder();
-    }
-
-    @Test
-    public void testFullRowBuild_nonNull() {
-        DatabaseRow row = generateRow();
-        assertThat(row).isNotNull();
-    }
-
-    @Test
-    public void testPrimitivesBuild_noDataLoss() {
-        DatabaseRow row = generateRow();
-
-        assertThat(row.locale).isEqualTo(LOCALE);
-        assertThat(row.updatedTitle).isEqualTo(UPDATED_TITLE);
-        assertThat(row.normalizedTitle).isEqualTo(NORMALIZED_TITLE);
-        assertThat(row.updatedSummaryOn).isEqualTo(UPDATED_SUMMARY_ON);
-        assertThat(row.normalizedSummaryOn).isEqualTo(NORMALIZED_SUMMARY_ON);
-        assertThat(row.updatedSummaryOff).isEqualTo(UPDATED_SUMMARY_OFF);
-        assertThat(row.normalizedSummaryOff).isEqualTo(NORMALIZED_SUMMARY_OFF);
-        assertThat(row.entries).isEqualTo(ENTRIES);
-        assertThat(row.className).isEqualTo(CLASS_NAME);
-        assertThat(row.screenTitle).isEqualTo(SCREEN_TITLE);
-        assertThat(row.iconResId).isEqualTo(ICON_RES_ID);
-        assertThat(row.rank).isEqualTo(RANK);
-        assertThat(row.spaceDelimitedKeywords).isEqualTo(SPACE_DELIMITED_KEYWORDS);
-        assertThat(row.intentAction).isEqualTo(INTENT_ACTION);
-        assertThat(row.intentTargetClass).isEqualTo(INTENT_TARGET_CLASS);
-        assertThat(row.intentTargetPackage).isEqualTo(INTENT_TARGET_PACKAGE);
-        assertThat(row.enabled).isEqualTo(ENABLED);
-        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 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 testRowWithInlinePayload_genericPayloadNotAdded() {
-        final String URI = "test uri";
-        final InlineSwitchPayload payload = new InlineSwitchPayload(URI, 0 /* mSettingSource */,
-                1 /* onValue */, null /* intent */, true /* isDeviceSupported */, 1 /* default */);
-        mBuilder.setPayload(payload);
-        final DatabaseRow row = generateRow();
-        final InlineSwitchPayload unmarshalledPayload = ResultPayloadUtils
-                .unmarshall(row.payload, InlineSwitchPayload.CREATOR);
-
-        assertThat(row.payloadType).isEqualTo(ResultPayload.PayloadType.INLINE_SWITCH);
-        assertThat(unmarshalledPayload.mSettingKey).isEqualTo(URI);
-    }
-
-    @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() {
-        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)
-                .setNormalizedSummaryOn(NORMALIZED_SUMMARY_ON)
-                .setUpdatedSummaryOff(UPDATED_SUMMARY_OFF)
-                .setNormalizedSummaryOff(NORMALIZED_SUMMARY_OFF)
-                .setEntries(ENTRIES)
-                .setClassName(CLASS_NAME)
-                .setScreenTitle(SCREEN_TITLE)
-                .setIconResId(ICON_RES_ID)
-                .setRank(RANK)
-                .setSpaceDelimitedKeywords(SPACE_DELIMITED_KEYWORDS)
-                .setIntentAction(INTENT_ACTION)
-                .setIntentTargetPackage(INTENT_TARGET_PACKAGE)
-                .setIntentTargetClass(INTENT_TARGET_CLASS)
-                .setEnabled(ENABLED)
-                .setKey(KEY)
-                .setUserId(USER_ID);
-        return mBuilder;
-    }
-}
\ No newline at end of file
diff --git a/tests/robotests/src/com/android/settings/search/InlineListPayloadTest.java b/tests/robotests/src/com/android/settings/search/InlineListPayloadTest.java
index bee8d93..8194b12 100644
--- a/tests/robotests/src/com/android/settings/search/InlineListPayloadTest.java
+++ b/tests/robotests/src/com/android/settings/search/InlineListPayloadTest.java
@@ -14,7 +14,7 @@
 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_O)
 public class InlineListPayloadTest {
 
     private static final String DUMMY_SETTING = "inline_list_key";
@@ -40,7 +40,7 @@
                 intent, true /* isAvailable */, 1 /* numOptions */, 1 /* default */);
 
         final Intent retainedIntent = payload.getIntent();
-        assertThat(payload.mSettingKey).isEqualTo(uri);
+        assertThat(payload.getKey()).isEqualTo(uri);
         assertThat(payload.getType()).isEqualTo(type);
         assertThat(payload.mSettingSource).isEqualTo(source);
         assertThat(payload.getAvailability()).isEqualTo(ResultPayload.Availability.AVAILABLE);
@@ -69,7 +69,7 @@
                 .CREATOR.createFromParcel(parcel);
 
         final Intent builtIntent = payload.getIntent();
-        assertThat(payload.mSettingKey).isEqualTo(uri);
+        assertThat(payload.getKey()).isEqualTo(uri);
         assertThat(payload.getType()).isEqualTo(type);
         assertThat(payload.mSettingSource).isEqualTo(source);
         assertThat(payload.getAvailability()).isEqualTo(ResultPayload.Availability.AVAILABLE);
diff --git a/tests/robotests/src/com/android/settings/search/InlinePayloadTest.java b/tests/robotests/src/com/android/settings/search/InlinePayloadTest.java
index 1747cca..180e6a0 100644
--- a/tests/robotests/src/com/android/settings/search/InlinePayloadTest.java
+++ b/tests/robotests/src/com/android/settings/search/InlinePayloadTest.java
@@ -3,7 +3,6 @@
 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;
@@ -18,7 +17,7 @@
 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_O)
 public class InlinePayloadTest {
 
     private Context mContext;
diff --git a/tests/robotests/src/com/android/settings/search/InlineSwitchPayloadTest.java b/tests/robotests/src/com/android/settings/search/InlineSwitchPayloadTest.java
index b067ea6..895bf9c 100644
--- a/tests/robotests/src/com/android/settings/search/InlineSwitchPayloadTest.java
+++ b/tests/robotests/src/com/android/settings/search/InlineSwitchPayloadTest.java
@@ -37,7 +37,7 @@
 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_O)
 public class InlineSwitchPayloadTest {
 
     private static final String DUMMY_SETTING = "inline_test";
@@ -64,7 +64,7 @@
         InlineSwitchPayload payload = new InlineSwitchPayload(uri, source, 1, intent, true,
                 1 /* default */);
         final Intent retainedIntent = payload.getIntent();
-        assertThat(payload.mSettingKey).isEqualTo(uri);
+        assertThat(payload.getKey()).isEqualTo(uri);
         assertThat(payload.getType()).isEqualTo(type);
         assertThat(payload.mSettingSource).isEqualTo(source);
         assertThat(payload.isStandard()).isTrue();
@@ -93,7 +93,7 @@
         InlineSwitchPayload payload = InlineSwitchPayload.CREATOR.createFromParcel(parcel);
 
         final Intent builtIntent = payload.getIntent();
-        assertThat(payload.mSettingKey).isEqualTo(uri);
+        assertThat(payload.getKey()).isEqualTo(uri);
         assertThat(payload.getType()).isEqualTo(type);
         assertThat(payload.mSettingSource).isEqualTo(source);
         assertThat(payload.isStandard()).isTrue();
diff --git a/tests/robotests/src/com/android/settings/search/InlineSwitchViewHolderTest.java b/tests/robotests/src/com/android/settings/search/InlineSwitchViewHolderTest.java
index 86aee6f..a2319f3 100644
--- a/tests/robotests/src/com/android/settings/search/InlineSwitchViewHolderTest.java
+++ b/tests/robotests/src/com/android/settings/search/InlineSwitchViewHolderTest.java
@@ -43,7 +43,7 @@
 import java.util.ArrayList;
 
 @RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION_O)
 public class InlineSwitchViewHolderTest {
 
     private static final String TITLE = "title";
diff --git a/tests/robotests/src/com/android/settings/search/InputDeviceResultFutureTaskTest.java b/tests/robotests/src/com/android/settings/search/InputDeviceResultFutureTaskTest.java
new file mode 100644
index 0000000..73fe52c
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/search/InputDeviceResultFutureTaskTest.java
@@ -0,0 +1,177 @@
+/*
+ * Copyright (C) 2017 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF 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 static android.content.Context.INPUT_METHOD_SERVICE;
+
+import static com.android.settings.search.InputDeviceResultLoader.PHYSICAL_KEYBOARD_FRAGMENT;
+import static com.android.settings.search.InputDeviceResultLoader.VIRTUAL_KEYBOARD_FRAGMENT;
+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.verifyZeroInteractions;
+import static org.mockito.Mockito.when;
+
+import android.content.Context;
+import android.content.pm.PackageManager;
+import android.content.pm.ServiceInfo;
+import android.hardware.input.InputManager;
+import android.view.InputDevice;
+import android.view.inputmethod.InputMethodInfo;
+import android.view.inputmethod.InputMethodManager;
+
+import com.android.settings.R;
+import com.android.settings.TestConfig;
+import com.android.settings.dashboard.SiteMapManager;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.shadow.ShadowInputDevice;
+
+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;
+
+@RunWith(SettingsRobolectricTestRunner.class)
+@Config(manifest = TestConfig.MANIFEST_PATH,
+        sdk = TestConfig.SDK_VERSION_O,
+        shadows = {
+                ShadowInputDevice.class
+        })
+public class InputDeviceResultFutureTaskTest {
+
+    private static final String QUERY = "test_query";
+    private static final List<String> PHYSICAL_KEYBOARD_BREADCRUMB;
+    private static final List<String> VIRTUAL_KEYBOARD_BREADCRUMB;
+
+    static {
+        PHYSICAL_KEYBOARD_BREADCRUMB = new ArrayList<>();
+        VIRTUAL_KEYBOARD_BREADCRUMB = new ArrayList<>();
+        PHYSICAL_KEYBOARD_BREADCRUMB.add("Settings");
+        PHYSICAL_KEYBOARD_BREADCRUMB.add("physical keyboard");
+        VIRTUAL_KEYBOARD_BREADCRUMB.add("Settings");
+        VIRTUAL_KEYBOARD_BREADCRUMB.add("virtual keyboard");
+    }
+
+    @Mock(answer = Answers.RETURNS_DEEP_STUBS)
+    private Context mContext;
+    @Mock
+    private SiteMapManager mSiteMapManager;
+    @Mock
+    private InputManager mInputManager;
+    @Mock
+    private InputMethodManager mImm;
+    @Mock
+    private PackageManager mPackageManager;
+
+    private InputDeviceResultLoader.InputDeviceResultCallable mCallable;
+
+    @Before
+    public void setUp() {
+        MockitoAnnotations.initMocks(this);
+        when(mContext.getApplicationContext()).thenReturn(mContext);
+        when(mContext.getSystemService(Context.INPUT_SERVICE))
+                .thenReturn(mInputManager);
+        when(mContext.getSystemService(INPUT_METHOD_SERVICE))
+                .thenReturn(mImm);
+        when(mContext.getPackageManager())
+                .thenReturn(mPackageManager);
+        when(mContext.getString(anyInt()))
+                .thenAnswer(invocation -> RuntimeEnvironment.application.getString(
+                        (Integer) invocation.getArguments()[0]));
+        mCallable = new InputDeviceResultLoader.InputDeviceResultCallable(mContext, QUERY,
+                mSiteMapManager);
+    }
+
+    @After
+    public void tearDown() {
+        ShadowInputDevice.reset();
+    }
+
+    @Test
+    public void query_noKeyboard_shouldNotReturnAnything() throws Exception {
+
+        assertThat(mCallable.call()).isEmpty();
+    }
+
+    @Test
+    public void query_hasPhysicalKeyboard_match() throws Exception {
+        addPhysicalKeyboard(QUERY);
+        when(mSiteMapManager.buildBreadCrumb(mContext, PHYSICAL_KEYBOARD_FRAGMENT,
+                RuntimeEnvironment.application.getString(R.string.physical_keyboard_title)))
+                .thenReturn(PHYSICAL_KEYBOARD_BREADCRUMB);
+
+        final List<? extends SearchResult> results = mCallable.call();
+
+        assertThat(results).hasSize(1);
+        assertThat(results.get(0).title).isEqualTo(QUERY);
+        assertThat(results.get(0).breadcrumbs)
+                .containsExactlyElementsIn(PHYSICAL_KEYBOARD_BREADCRUMB);
+    }
+
+    @Test
+    public void query_hasVirtualKeyboard_match() throws Exception {
+        addVirtualKeyboard(QUERY);
+        when(mSiteMapManager.buildBreadCrumb(mContext, VIRTUAL_KEYBOARD_FRAGMENT,
+                RuntimeEnvironment.application.getString(R.string.add_virtual_keyboard)))
+                .thenReturn(VIRTUAL_KEYBOARD_BREADCRUMB);
+
+        final List<? extends SearchResult> results = mCallable.call();
+        assertThat(results).hasSize(1);
+        assertThat(results.get(0).title).isEqualTo(QUERY);
+        assertThat(results.get(0).breadcrumbs)
+                .containsExactlyElementsIn(VIRTUAL_KEYBOARD_BREADCRUMB);
+    }
+
+    @Test
+    public void query_hasPhysicalVirtualKeyboard_doNotMatch() throws Exception {
+        addPhysicalKeyboard("abc");
+        addVirtualKeyboard("def");
+
+        assertThat(mCallable.call()).isEmpty();
+        verifyZeroInteractions(mSiteMapManager);
+    }
+
+    private void addPhysicalKeyboard(String name) {
+        final InputDevice device = mock(InputDevice.class);
+        when(device.isVirtual()).thenReturn(false);
+        when(device.isFullKeyboard()).thenReturn(true);
+        when(device.getName()).thenReturn(name);
+        ShadowInputDevice.sDeviceIds = new int[]{0};
+        ShadowInputDevice.addDevice(0, device);
+    }
+
+    private void addVirtualKeyboard(String name) {
+        final List<InputMethodInfo> imis = new ArrayList<>();
+        final InputMethodInfo info = mock(InputMethodInfo.class);
+        imis.add(info);
+        when(info.getServiceInfo()).thenReturn(new ServiceInfo());
+        when(info.loadLabel(mPackageManager)).thenReturn(name);
+        info.getServiceInfo().packageName = "pkg";
+        info.getServiceInfo().name = "class";
+        when(mImm.getInputMethodList()).thenReturn(imis);
+    }
+
+}
\ No newline at end of file
diff --git a/tests/robotests/src/com/android/settings/search/InputDeviceResultLoaderTest.java b/tests/robotests/src/com/android/settings/search/InputDeviceResultLoaderTest.java
deleted file mode 100644
index a955af1..0000000
--- a/tests/robotests/src/com/android/settings/search/InputDeviceResultLoaderTest.java
+++ /dev/null
@@ -1,173 +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.search;
-
-import static android.content.Context.INPUT_METHOD_SERVICE;
-import static com.android.settings.search.InputDeviceResultLoader.PHYSICAL_KEYBOARD_FRAGMENT;
-import static com.android.settings.search.InputDeviceResultLoader.VIRTUAL_KEYBOARD_FRAGMENT;
-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.verifyZeroInteractions;
-import static org.mockito.Mockito.when;
-
-import android.content.Context;
-import android.content.pm.PackageManager;
-import android.content.pm.ServiceInfo;
-import android.hardware.input.InputManager;
-import android.view.InputDevice;
-import android.view.inputmethod.InputMethodInfo;
-import android.view.inputmethod.InputMethodManager;
-
-import com.android.settings.R;
-import com.android.settings.TestConfig;
-import com.android.settings.dashboard.SiteMapManager;
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.testutils.shadow.ShadowInputDevice;
-
-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;
-
-@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH,
-        sdk = TestConfig.SDK_VERSION,
-        shadows = {
-                ShadowInputDevice.class
-        })
-public class InputDeviceResultLoaderTest {
-
-    private static final String QUERY = "test_query";
-    private static final List<String> PHYSICAL_KEYBOARD_BREADCRUMB;
-    private static final List<String> VIRTUAL_KEYBOARD_BREADCRUMB;
-
-    static {
-        PHYSICAL_KEYBOARD_BREADCRUMB = new ArrayList<>();
-        VIRTUAL_KEYBOARD_BREADCRUMB = new ArrayList<>();
-        PHYSICAL_KEYBOARD_BREADCRUMB.add("Settings");
-        PHYSICAL_KEYBOARD_BREADCRUMB.add("physical keyboard");
-        VIRTUAL_KEYBOARD_BREADCRUMB.add("Settings");
-        VIRTUAL_KEYBOARD_BREADCRUMB.add("virtual keyboard");
-    }
-
-    @Mock(answer = Answers.RETURNS_DEEP_STUBS)
-    private Context mContext;
-    @Mock
-    private SiteMapManager mSiteMapManager;
-    @Mock
-    private InputManager mInputManager;
-    @Mock
-    private InputMethodManager mImm;
-    @Mock
-    private PackageManager mPackageManager;
-
-    private InputDeviceResultLoader mLoader;
-
-    @Before
-    public void setUp() {
-        MockitoAnnotations.initMocks(this);
-        when(mContext.getApplicationContext()).thenReturn(mContext);
-        when(mContext.getSystemService(Context.INPUT_SERVICE))
-                .thenReturn(mInputManager);
-        when(mContext.getSystemService(INPUT_METHOD_SERVICE))
-                .thenReturn(mImm);
-        when(mContext.getPackageManager())
-                .thenReturn(mPackageManager);
-        when(mContext.getString(anyInt()))
-                .thenAnswer(invocation -> RuntimeEnvironment.application.getString(
-                        (Integer) invocation.getArguments()[0]));
-        mLoader = new InputDeviceResultLoader(mContext, QUERY, mSiteMapManager);
-    }
-
-    @After
-    public void tearDown() {
-        ShadowInputDevice.reset();
-    }
-
-    @Test
-    public void query_noKeyboard_shouldNotReturnAnything() {
-        assertThat(mLoader.loadInBackground()).isEmpty();
-    }
-
-    @Test
-    public void query_hasPhysicalKeyboard_match() {
-        addPhysicalKeyboard(QUERY);
-        when(mSiteMapManager.buildBreadCrumb(mContext, PHYSICAL_KEYBOARD_FRAGMENT,
-                RuntimeEnvironment.application.getString(R.string.physical_keyboard_title)))
-                .thenReturn(PHYSICAL_KEYBOARD_BREADCRUMB);
-
-        final List<SearchResult> results = new ArrayList<>(mLoader.loadInBackground());
-
-        assertThat(results).hasSize(1);
-        assertThat(results.get(0).title).isEqualTo(QUERY);
-        assertThat(results.get(0).breadcrumbs)
-                .containsExactlyElementsIn(PHYSICAL_KEYBOARD_BREADCRUMB);
-    }
-
-    @Test
-    public void query_hasVirtualKeyboard_match() {
-        addVirtualKeyboard(QUERY);
-        when(mSiteMapManager.buildBreadCrumb(mContext, VIRTUAL_KEYBOARD_FRAGMENT,
-                RuntimeEnvironment.application.getString(R.string.add_virtual_keyboard)))
-                .thenReturn(VIRTUAL_KEYBOARD_BREADCRUMB);
-
-        final List<SearchResult> results = new ArrayList<>(mLoader.loadInBackground());
-        assertThat(results).hasSize(1);
-        assertThat(results.get(0).title).isEqualTo(QUERY);
-        assertThat(results.get(0).breadcrumbs)
-                .containsExactlyElementsIn(VIRTUAL_KEYBOARD_BREADCRUMB);
-    }
-
-    @Test
-    public void query_hasPhysicalVirtualKeyboard_doNotMatch() {
-        addPhysicalKeyboard("abc");
-        addVirtualKeyboard("def");
-
-        assertThat(mLoader.loadInBackground()).isEmpty();
-        verifyZeroInteractions(mSiteMapManager);
-    }
-
-    private void addPhysicalKeyboard(String name) {
-        final InputDevice device = mock(InputDevice.class);
-        when(device.isVirtual()).thenReturn(false);
-        when(device.isFullKeyboard()).thenReturn(true);
-        when(device.getName()).thenReturn(name);
-        ShadowInputDevice.sDeviceIds = new int[]{0};
-        ShadowInputDevice.addDevice(0, device);
-    }
-
-    private void addVirtualKeyboard(String name) {
-        final List<InputMethodInfo> imis = new ArrayList<>();
-        final InputMethodInfo info = mock(InputMethodInfo.class);
-        imis.add(info);
-        when(info.getServiceInfo()).thenReturn(new ServiceInfo());
-        when(info.loadLabel(mPackageManager)).thenReturn(name);
-        info.getServiceInfo().packageName = "pkg";
-        info.getServiceInfo().name = "class";
-        when(mImm.getInputMethodList()).thenReturn(imis);
-    }
-
-}
diff --git a/tests/robotests/src/com/android/settings/search/InstalledAppResultLoaderTest.java b/tests/robotests/src/com/android/settings/search/InstalledAppResultLoaderTest.java
index 19854fc..1ed483d 100644
--- a/tests/robotests/src/com/android/settings/search/InstalledAppResultLoaderTest.java
+++ b/tests/robotests/src/com/android/settings/search/InstalledAppResultLoaderTest.java
@@ -19,7 +19,9 @@
 
 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;
@@ -41,11 +43,11 @@
 
 import com.android.settings.R;
 import com.android.settings.TestConfig;
-import com.android.settings.applications.PackageManagerWrapper;
 import com.android.settings.dashboard.SiteMapManager;
 import com.android.settings.testutils.ApplicationTestUtils;
 import com.android.settings.testutils.FakeFeatureFactory;
 import com.android.settings.testutils.SettingsRobolectricTestRunner;
+import com.android.settingslib.wrapper.PackageManagerWrapper;
 
 import org.junit.Before;
 import org.junit.Test;
@@ -53,8 +55,6 @@
 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;
@@ -65,7 +65,7 @@
 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_O)
 public class InstalledAppResultLoaderTest {
 
     @Mock(answer = Answers.RETURNS_DEEP_STUBS)
@@ -77,7 +77,7 @@
     @Mock
     private SiteMapManager mSiteMapManager;
 
-    private InstalledAppResultLoader mLoader;
+    private InstalledAppResultLoader.InstalledAppResultCallable mCallable;
 
     @Before
     public void setUp() {
@@ -109,49 +109,50 @@
     }
 
     @Test
-    public void query_noMatchingQuery_shouldReturnEmptyResult() {
+    public void query_noMatchingQuery_shouldReturnEmptyResult() throws Exception {
         final String query = "abc";
 
-        mLoader = new InstalledAppResultLoader(mContext, mPackageManagerWrapper, query,
+        mCallable = new InstalledAppResultLoader.InstalledAppResultCallable(mContext,
+                mPackageManagerWrapper, query,
                 mSiteMapManager);
 
-        assertThat(mLoader.loadInBackground()).isEmpty();
+        assertThat(mCallable.call()).isEmpty();
     }
 
     @Test
-    public void query_matchingQuery_shouldReturnNonSystemApps() {
+    public void query_matchingQuery_shouldReturnNonSystemApps() throws Exception {
         final String query = "app";
 
-        mLoader = spy(new InstalledAppResultLoader(mContext, mPackageManagerWrapper, query,
+        mCallable = spy(new InstalledAppResultLoader.InstalledAppResultCallable(mContext,
+                mPackageManagerWrapper, query,
                 mSiteMapManager));
-        when(mLoader.getContext()).thenReturn(mContext);
         when(mSiteMapManager.buildBreadCrumb(eq(mContext), anyString(), anyString()))
                 .thenReturn(Arrays.asList(new String[]{"123"}));
 
-        assertThat(mLoader.loadInBackground().size()).isEqualTo(3);
+        assertThat(mCallable.call()).hasSize(3);
         verify(mSiteMapManager)
                 .buildBreadCrumb(eq(mContext), anyString(), anyString());
     }
 
     @Test
-    public void query_matchingQuery_shouldReturnSystemAppUpdates() {
+    public void query_matchingQuery_shouldReturnSystemAppUpdates() throws Exception {
         when(mPackageManagerWrapper.getInstalledApplicationsAsUser(anyInt(), anyInt()))
                 .thenReturn(Arrays.asList(
                         ApplicationTestUtils.buildInfo(0 /* uid */, "app1", FLAG_UPDATED_SYSTEM_APP,
                                 0 /* targetSdkVersion */)));
         final String query = "app";
 
-        mLoader = spy(new InstalledAppResultLoader(mContext, mPackageManagerWrapper, query,
+        mCallable = spy(new InstalledAppResultLoader.InstalledAppResultCallable(mContext,
+                mPackageManagerWrapper, query,
                 mSiteMapManager));
-        when(mLoader.getContext()).thenReturn(mContext);
 
-        assertThat(mLoader.loadInBackground().size()).isEqualTo(1);
+        assertThat(mCallable.call()).hasSize(1);
         verify(mSiteMapManager)
                 .buildBreadCrumb(eq(mContext), anyString(), anyString());
     }
 
     @Test
-    public void query_matchingQuery_shouldReturnSystemAppIfLaunchable() {
+    public void query_matchingQuery_shouldReturnSystemAppIfLaunchable() throws Exception {
         when(mPackageManagerWrapper.getInstalledApplicationsAsUser(anyInt(), anyInt()))
                 .thenReturn(Arrays.asList(
                         ApplicationTestUtils.buildInfo(0 /* uid */, "app1", FLAG_SYSTEM,
@@ -164,14 +165,15 @@
 
         final String query = "app";
 
-        mLoader = new InstalledAppResultLoader(mContext, mPackageManagerWrapper, query,
+        mCallable = new InstalledAppResultLoader.InstalledAppResultCallable(mContext,
+                mPackageManagerWrapper, query,
                 mSiteMapManager);
 
-        assertThat(mLoader.loadInBackground().size()).isEqualTo(1);
+        assertThat(mCallable.call()).hasSize(1);
     }
 
     @Test
-    public void query_matchingQuery_shouldReturnSystemAppIfHomeApp() {
+    public void query_matchingQuery_shouldReturnSystemAppIfHomeApp() throws Exception {
         when(mPackageManagerWrapper.getInstalledApplicationsAsUser(anyInt(), anyInt()))
                 .thenReturn(Arrays.asList(
                         ApplicationTestUtils.buildInfo(0 /* uid */, "app1", FLAG_SYSTEM,
@@ -180,28 +182,26 @@
                 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;
-            }
+        when(mPackageManagerWrapper.getHomeActivities(anyList())).thenAnswer(invocation -> {
+            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,
+        mCallable = new InstalledAppResultLoader.InstalledAppResultCallable(mContext,
+                mPackageManagerWrapper, query,
                 mSiteMapManager);
 
-        assertThat(mLoader.loadInBackground().size()).isEqualTo(1);
+        assertThat(mCallable.call()).hasSize(1);
     }
 
     @Test
-    public void query_matchingQuery_shouldNotReturnSystemAppIfNotLaunchable() {
+    public void query_matchingQuery_shouldNotReturnSystemAppIfNotLaunchable() throws Exception {
         when(mPackageManagerWrapper.getInstalledApplicationsAsUser(anyInt(), anyInt()))
                 .thenReturn(Arrays.asList(
                         ApplicationTestUtils.buildInfo(0 /* uid */, "app1", FLAG_SYSTEM,
@@ -212,21 +212,23 @@
 
         final String query = "app";
 
-        mLoader = new InstalledAppResultLoader(mContext, mPackageManagerWrapper, query,
+        mCallable = new InstalledAppResultLoader.InstalledAppResultCallable(mContext,
+                mPackageManagerWrapper, query,
                 mSiteMapManager);
 
-        assertThat(mLoader.loadInBackground()).isEmpty();
+        assertThat(mCallable.call()).isEmpty();
         verify(mSiteMapManager, never())
                 .buildBreadCrumb(eq(mContext), anyString(), anyString());
     }
 
     @Test
-    public void query_matchingQuery_multipleResults() {
+    public void query_matchingQuery_multipleResults() throws Exception {
         final String query = "app";
 
-        mLoader = new InstalledAppResultLoader(mContext, mPackageManagerWrapper, query,
+        mCallable = new InstalledAppResultLoader.InstalledAppResultCallable(mContext,
+                mPackageManagerWrapper, query,
                 mSiteMapManager);
-        final Set<? extends SearchResult> results = mLoader.loadInBackground();
+        final List<? extends SearchResult> results = mCallable.call();
 
         Set<CharSequence> expectedTitles = new HashSet<>(Arrays.asList("app4", "app", "appBuffer"));
         Set<CharSequence> actualTitles = new HashSet<>();
@@ -237,161 +239,172 @@
     }
 
     @Test
-    public void query_normalWord_MatchPrefix() {
+    public void query_normalWord_MatchPrefix() throws Exception {
         final String query = "ba";
         final String packageName = "Bananas";
         when(mPackageManagerWrapper.getInstalledApplicationsAsUser(anyInt(), anyInt()))
                 .thenReturn(Arrays.asList(
                         ApplicationTestUtils.buildInfo(0 /* uid */, packageName, 0 /* flags */,
                                 0 /* targetSdkVersion */)));
-        mLoader = new InstalledAppResultLoader(mContext, mPackageManagerWrapper, query,
+        mCallable = new InstalledAppResultLoader.InstalledAppResultCallable(mContext,
+                mPackageManagerWrapper, query,
                 mSiteMapManager);
 
-        assertThat(mLoader.loadInBackground().size()).isEqualTo(1);
+        assertThat(mCallable.call()).hasSize(1);
     }
 
     @Test
-    public void query_CapitalCase_DoestMatchSecondWord() {
+    public void query_CapitalCase_DoestMatchSecondWord() throws Exception {
         final String query = "Apples";
         final String packageName = "BananasApples";
         when(mPackageManagerWrapper.getInstalledApplicationsAsUser(anyInt(), anyInt()))
                 .thenReturn(Arrays.asList(
                         ApplicationTestUtils.buildInfo(0 /* uid */, packageName, 0 /* flags */,
                                 0 /* targetSdkVersion */)));
-        mLoader = new InstalledAppResultLoader(mContext, mPackageManagerWrapper, query,
+        mCallable = new InstalledAppResultLoader.InstalledAppResultCallable(mContext,
+                mPackageManagerWrapper, query,
                 mSiteMapManager);
 
-        assertThat(mLoader.loadInBackground().size()).isEqualTo(0);
+        assertThat(mCallable.call()).isEmpty();
     }
 
     @Test
-    public void query_TwoWords_MatchesFirstWord() {
+    public void query_TwoWords_MatchesFirstWord() throws Exception {
         final String query = "Banana";
         final String packageName = "Bananas Apples";
         when(mPackageManagerWrapper.getInstalledApplicationsAsUser(anyInt(), anyInt()))
                 .thenReturn(Arrays.asList(
                         ApplicationTestUtils.buildInfo(0 /* uid */, packageName, 0 /* flags */,
                                 0 /* targetSdkVersion */)));
-        mLoader = new InstalledAppResultLoader(mContext, mPackageManagerWrapper, query,
+        mCallable = new InstalledAppResultLoader.InstalledAppResultCallable(mContext,
+                mPackageManagerWrapper, query,
                 mSiteMapManager);
 
-        assertThat(mLoader.loadInBackground().size()).isEqualTo(1);
+        assertThat(mCallable.call()).hasSize(1);
     }
 
     @Test
-    public void query_TwoWords_MatchesSecondWord() {
+    public void query_TwoWords_MatchesSecondWord() throws Exception {
         final String query = "Apple";
         final String packageName = "Bananas Apples";
         when(mPackageManagerWrapper.getInstalledApplicationsAsUser(anyInt(), anyInt()))
                 .thenReturn(Arrays.asList(
                         ApplicationTestUtils.buildInfo(0 /* uid */, packageName, 0 /* flags */,
                                 0 /* targetSdkVersion */)));
-        mLoader = new InstalledAppResultLoader(mContext, mPackageManagerWrapper, query,
+        mCallable = new InstalledAppResultLoader.InstalledAppResultCallable(mContext,
+                mPackageManagerWrapper, query,
                 mSiteMapManager);
 
-        assertThat(mLoader.loadInBackground().size()).isEqualTo(1);
+        assertThat(mCallable.call()).hasSize(1);
     }
 
     @Test
-    public void query_ThreeWords_MatchesThirdWord() {
+    public void query_ThreeWords_MatchesThirdWord() throws Exception {
         final String query = "Pear";
         final String packageName = "Bananas Apples Pears";
         when(mPackageManagerWrapper.getInstalledApplicationsAsUser(anyInt(), anyInt()))
                 .thenReturn(Arrays.asList(
                         ApplicationTestUtils.buildInfo(0 /* uid */, packageName, 0 /* flags */,
                                 0 /* targetSdkVersion */)));
-        mLoader = new InstalledAppResultLoader(mContext, mPackageManagerWrapper, query,
+        mCallable = new InstalledAppResultLoader.InstalledAppResultCallable(mContext,
+                mPackageManagerWrapper, query,
                 mSiteMapManager);
 
-        assertThat(mLoader.loadInBackground().size()).isEqualTo(1);
+        assertThat(mCallable.call()).hasSize(1);
     }
 
     @Test
-    public void query_DoubleSpacedWords_MatchesSecondWord() {
+    public void query_DoubleSpacedWords_MatchesSecondWord() throws Exception {
         final String query = "Apple";
         final String packageName = "Bananas  Apples";
         when(mPackageManagerWrapper.getInstalledApplicationsAsUser(anyInt(), anyInt()))
                 .thenReturn(Arrays.asList(
                         ApplicationTestUtils.buildInfo(0 /* uid */, packageName, 0 /* flags */,
                                 0 /* targetSdkVersion */)));
-        mLoader = new InstalledAppResultLoader(mContext, mPackageManagerWrapper, query,
+        mCallable = new InstalledAppResultLoader.InstalledAppResultCallable(mContext,
+                mPackageManagerWrapper, query,
                 mSiteMapManager);
 
-        assertThat(mLoader.loadInBackground().size()).isEqualTo(1);
+        assertThat(mCallable.call()).hasSize(1);
     }
 
     @Test
-    public void query_SpecialChar_MatchesSecondWord() {
+    public void query_SpecialChar_MatchesSecondWord() throws Exception {
         final String query = "Apple";
         final String packageName = "Bananas & Apples";
         when(mPackageManagerWrapper.getInstalledApplicationsAsUser(anyInt(), anyInt()))
                 .thenReturn(Arrays.asList(
                         ApplicationTestUtils.buildInfo(0 /* uid */, packageName, 0 /* flags */,
                                 0 /* targetSdkVersion */)));
-        mLoader = new InstalledAppResultLoader(mContext, mPackageManagerWrapper, query,
+        mCallable = new InstalledAppResultLoader.InstalledAppResultCallable(mContext,
+                mPackageManagerWrapper, query,
                 mSiteMapManager);
 
-        assertThat(mLoader.loadInBackground().size()).isEqualTo(1);
+        assertThat(mCallable.call()).hasSize(1);
     }
 
     @Test
-    public void query_TabSeparated_MatchesSecondWord() {
+    public void query_TabSeparated_MatchesSecondWord() throws Exception {
         final String query = "Apple";
         final String packageName = "Bananas\tApples";
         when(mPackageManagerWrapper.getInstalledApplicationsAsUser(anyInt(), anyInt()))
                 .thenReturn(Arrays.asList(
                         ApplicationTestUtils.buildInfo(0 /* uid */, packageName, 0 /* flags */,
                                 0 /* targetSdkVersion */)));
-        mLoader = new InstalledAppResultLoader(mContext, mPackageManagerWrapper, query,
+        mCallable = new InstalledAppResultLoader.InstalledAppResultCallable(mContext,
+                mPackageManagerWrapper, query,
                 mSiteMapManager);
 
-        assertThat(mLoader.loadInBackground().size()).isEqualTo(1);
+        assertThat(mCallable.call()).hasSize(1);
     }
 
     @Test
-    public void query_LeadingNumber_MatchesWord() {
+    public void query_LeadingNumber_MatchesWord() throws Exception {
         final String query = "4";
         final String packageName = "4Bananas";
         when(mPackageManagerWrapper.getInstalledApplicationsAsUser(anyInt(), anyInt()))
                 .thenReturn(Arrays.asList(
                         ApplicationTestUtils.buildInfo(0 /* uid */, packageName, 0 /* flags */,
                                 0 /* targetSdkVersion */)));
-        mLoader = new InstalledAppResultLoader(mContext, mPackageManagerWrapper, query,
+        mCallable = new InstalledAppResultLoader.InstalledAppResultCallable(mContext,
+                mPackageManagerWrapper, query,
                 mSiteMapManager);
 
-        assertThat(mLoader.loadInBackground().size()).isEqualTo(1);
+        assertThat(mCallable.call()).hasSize(1);
     }
 
     @Test
-    public void query_FirstWordPrefixOfQuery_NoMatch() {
+    public void query_FirstWordPrefixOfQuery_NoMatch() throws Exception {
         final String query = "Bananass";
         final String packageName = "Bananas Apples";
         when(mPackageManagerWrapper.getInstalledApplicationsAsUser(anyInt(), anyInt()))
                 .thenReturn(Arrays.asList(
                         ApplicationTestUtils.buildInfo(0 /* uid */, packageName, 0 /* flags */,
                                 0 /* targetSdkVersion */)));
-        mLoader = new InstalledAppResultLoader(mContext, mPackageManagerWrapper, query,
+        mCallable = new InstalledAppResultLoader.InstalledAppResultCallable(mContext,
+                mPackageManagerWrapper, query,
                 mSiteMapManager);
 
-        assertThat(mLoader.loadInBackground().size()).isEqualTo(0);
+        assertThat(mCallable.call()).isEmpty();
     }
 
     @Test
-    public void query_QueryLongerThanAppName_NoMatch() {
+    public void query_QueryLongerThanAppName_NoMatch() throws Exception {
         final String query = "BananasApples";
         final String packageName = "Bananas";
         when(mPackageManagerWrapper.getInstalledApplicationsAsUser(anyInt(), anyInt()))
                 .thenReturn(Arrays.asList(
                         ApplicationTestUtils.buildInfo(0 /* uid */, packageName, 0 /* flags */,
                                 0 /* targetSdkVersion */)));
-        mLoader = new InstalledAppResultLoader(mContext, mPackageManagerWrapper, query,
+        mCallable = new InstalledAppResultLoader.InstalledAppResultCallable(mContext,
+                mPackageManagerWrapper, query,
                 mSiteMapManager);
 
-        assertThat(mLoader.loadInBackground().size()).isEqualTo(0);
+        assertThat(mCallable.call()).isEmpty();
     }
 
     @Test
-    public void query_appExistsInBothProfiles() {
+    public void query_appExistsInBothProfiles() throws Exception {
         final String query = "carrot";
         final String packageName = "carrot";
         final int user1 = 0;
@@ -414,10 +427,11 @@
                                 packageName, 0 /* flags */,
                                 0 /* targetSdkVersion */)));
 
-        mLoader = new InstalledAppResultLoader(mContext, mPackageManagerWrapper, query,
+        mCallable = new InstalledAppResultLoader.InstalledAppResultCallable(mContext,
+                mPackageManagerWrapper, query,
                 mSiteMapManager);
 
-        Set<AppSearchResult> searchResults = (Set<AppSearchResult>) mLoader.loadInBackground();
+        List<AppSearchResult> searchResults = (List<AppSearchResult>) mCallable.call();
         assertThat(searchResults).hasSize(2);
 
         Set<Integer> uidResults = searchResults.stream().map(result -> result.info.uid).collect(
diff --git a/tests/robotests/src/com/android/settings/search/IntentSearchViewHolderTest.java b/tests/robotests/src/com/android/settings/search/IntentSearchViewHolderTest.java
index a3826f6..14fe63a 100644
--- a/tests/robotests/src/com/android/settings/search/IntentSearchViewHolderTest.java
+++ b/tests/robotests/src/com/android/settings/search/IntentSearchViewHolderTest.java
@@ -18,6 +18,8 @@
 package com.android.settings.search;
 
 import static com.google.common.truth.Truth.assertThat;
+
+import static org.mockito.ArgumentMatchers.anyInt;
 import static org.mockito.Matchers.any;
 import static org.mockito.Matchers.eq;
 import static org.mockito.Mockito.doReturn;
@@ -32,8 +34,10 @@
 import android.content.pm.ApplicationInfo;
 import android.content.pm.PackageManager;
 import android.content.pm.ResolveInfo;
+import android.graphics.drawable.ColorDrawable;
 import android.graphics.drawable.Drawable;
 import android.os.UserHandle;
+import android.os.UserManager;
 import android.view.LayoutInflater;
 import android.view.View;
 
@@ -58,7 +62,7 @@
 import java.util.Objects;
 
 @RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION_O)
 public class IntentSearchViewHolderTest {
 
     private static final String TITLE = "title";
@@ -72,6 +76,8 @@
     private SearchFragment mFragment;
     @Mock
     private PackageManager mPackageManager;
+    @Mock
+    private UserManager mUserManager;
     private FakeFeatureFactory mFeatureFactory;
     private IntentSearchViewHolder mHolder;
     private Drawable mIcon;
@@ -189,6 +195,9 @@
 
     @Test
     public void testBindViewElements_appSearchResult() {
+        mHolder = spy(mHolder);
+        doReturn(new ColorDrawable(0)).when(mHolder).getBadgedIcon(any(ApplicationInfo.class),
+                anyInt());
         when(mPackageManager.getUserBadgedLabel(any(CharSequence.class),
                 eq(new UserHandle(USER_ID)))).thenReturn(BADGED_LABEL);
 
@@ -221,7 +230,8 @@
         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());
+        verify(mFragment).startActivityForResult(result.payload.getIntent(),
+                IntentSearchViewHolder.REQUEST_CODE_NO_OP);
     }
 
     @Test
@@ -237,7 +247,8 @@
         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));
+        verify(mFragment, never()).startActivityForResult(result.payload.getIntent(),
+                IntentSearchViewHolder.REQUEST_CODE_NO_OP);
     }
 
     private SearchResult getSearchResult(String title, String summary, Drawable icon) {
diff --git a/tests/robotests/src/com/android/settings/search/MockAccessibilityLoader.java b/tests/robotests/src/com/android/settings/search/MockAccessibilityLoader.java
deleted file mode 100644
index 0a06a35..0000000
--- a/tests/robotests/src/com/android/settings/search/MockAccessibilityLoader.java
+++ /dev/null
@@ -1,39 +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.search;
-
-import android.content.Context;
-
-import java.util.HashSet;
-import java.util.Set;
-
-public class MockAccessibilityLoader extends AccessibilityServiceResultLoader {
-
-    public MockAccessibilityLoader(Context context) {
-        super(context, "test_query", null);
-    }
-
-    @Override
-    public Set<? extends SearchResult> loadInBackground() {
-        return new HashSet<>();
-    }
-
-    @Override
-    protected void onDiscardResult(Set<? extends SearchResult> result) {
-
-    }
-}
diff --git a/tests/robotests/src/com/android/settings/search/MockAppLoader.java b/tests/robotests/src/com/android/settings/search/MockAppLoader.java
deleted file mode 100644
index c68cbdf..0000000
--- a/tests/robotests/src/com/android/settings/search/MockAppLoader.java
+++ /dev/null
@@ -1,46 +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.search;
-
-import android.content.Context;
-import com.android.settings.search.InstalledAppResultLoader;
-import com.android.settings.search.SearchResult;
-
-import java.util.HashSet;
-import java.util.Set;
-
-/**
- * Mock loader to subvert the requirements of returning data while also driving the Loader
- * lifecycle.
- */
-class MockAppLoader extends InstalledAppResultLoader {
-
-    public MockAppLoader(Context context) {
-        super(context, null, "", null);
-    }
-
-    @Override
-    public Set<? extends SearchResult> loadInBackground() {
-        return new HashSet<>();
-    }
-
-    @Override
-    protected void onDiscardResult(Set<? extends SearchResult> result) {
-
-    }
-}
diff --git a/tests/robotests/src/com/android/settings/search/MockDBLoader.java b/tests/robotests/src/com/android/settings/search/MockDBLoader.java
deleted file mode 100644
index b28c1ed..0000000
--- a/tests/robotests/src/com/android/settings/search/MockDBLoader.java
+++ /dev/null
@@ -1,46 +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.search;
-
-import android.content.Context;
-import com.android.settings.search.DatabaseResultLoader;
-import com.android.settings.search.SearchResult;
-
-import java.util.HashSet;
-import java.util.Set;
-
-/**
- * Mock loader to subvert the requirements of returning data while also driving the Loader
- * lifecycle.
- */
-class MockDBLoader extends DatabaseResultLoader {
-
-    public MockDBLoader(Context context) {
-        super(context, "test", null);
-    }
-
-    @Override
-    public Set<? extends SearchResult> loadInBackground() {
-        return new HashSet<>();
-    }
-
-    @Override
-    protected void onDiscardResult(Set<? extends SearchResult> result) {
-
-    }
-}
diff --git a/tests/robotests/src/com/android/settings/search/MockInputDeviceResultLoader.java b/tests/robotests/src/com/android/settings/search/MockInputDeviceResultLoader.java
deleted file mode 100644
index 2c16b14..0000000
--- a/tests/robotests/src/com/android/settings/search/MockInputDeviceResultLoader.java
+++ /dev/null
@@ -1,38 +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.search;
-
-import android.content.Context;
-
-import java.util.HashSet;
-import java.util.Set;
-
-public class MockInputDeviceResultLoader extends InputDeviceResultLoader {
-    public MockInputDeviceResultLoader(Context context) {
-        super(context, "test_query", null);
-    }
-
-    @Override
-    public Set<? extends SearchResult> loadInBackground() {
-        return new HashSet<>();
-    }
-
-    @Override
-    protected void onDiscardResult(Set<? extends SearchResult> result) {
-
-    }
-}
diff --git a/tests/robotests/src/com/android/settings/search/MockSearchResultLoader.java b/tests/robotests/src/com/android/settings/search/MockSearchResultLoader.java
new file mode 100644
index 0000000..6af258a
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/search/MockSearchResultLoader.java
@@ -0,0 +1,29 @@
+package com.android.settings.search;
+
+import android.content.Context;
+
+import com.android.settings.search.SearchResult;
+import com.android.settings.search.SearchResultLoader;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * Mock loader to subvert the requirements of returning data while also driving the Loader
+ * lifecycle.
+ */
+public class MockSearchResultLoader extends SearchResultLoader {
+
+    public MockSearchResultLoader(Context context) {
+        super(context, "test");
+    }
+
+    @Override
+    public List<? extends SearchResult> loadInBackground() {
+        return new ArrayList<>();
+    }
+
+    @Override
+    protected void onDiscardResult(List<? extends SearchResult> result) {
+    }
+}
diff --git a/tests/robotests/src/com/android/settings/search/ResultPayloadTest.java b/tests/robotests/src/com/android/settings/search/ResultPayloadTest.java
index 0bb43c5..2d9d4aa 100644
--- a/tests/robotests/src/com/android/settings/search/ResultPayloadTest.java
+++ b/tests/robotests/src/com/android/settings/search/ResultPayloadTest.java
@@ -30,7 +30,7 @@
 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_O)
 public class ResultPayloadTest {
     private ResultPayload mPayload;
 
diff --git a/tests/robotests/src/com/android/settings/search/ResultPayloadUtilsTest.java b/tests/robotests/src/com/android/settings/search/ResultPayloadUtilsTest.java
index 50bdb84..a86089e 100644
--- a/tests/robotests/src/com/android/settings/search/ResultPayloadUtilsTest.java
+++ b/tests/robotests/src/com/android/settings/search/ResultPayloadUtilsTest.java
@@ -30,7 +30,7 @@
 import static junit.framework.Assert.fail;
 
 @RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION_O)
 public class ResultPayloadUtilsTest {
     private ResultPayload payload;
 
diff --git a/tests/robotests/src/com/android/settings/search/SavedQueryLoaderTest.java b/tests/robotests/src/com/android/settings/search/SavedQueryLoaderTest.java
index 780a8a5d..4142111 100644
--- a/tests/robotests/src/com/android/settings/search/SavedQueryLoaderTest.java
+++ b/tests/robotests/src/com/android/settings/search/SavedQueryLoaderTest.java
@@ -38,7 +38,7 @@
 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_O)
 public class SavedQueryLoaderTest {
 
     private Context mContext;
diff --git a/tests/robotests/src/com/android/settings/search/SavedQueryPayloadTest.java b/tests/robotests/src/com/android/settings/search/SavedQueryPayloadTest.java
index 7421d1a..0845aa6 100644
--- a/tests/robotests/src/com/android/settings/search/SavedQueryPayloadTest.java
+++ b/tests/robotests/src/com/android/settings/search/SavedQueryPayloadTest.java
@@ -28,7 +28,7 @@
 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_O)
 public class SavedQueryPayloadTest {
 
     private SavedQueryPayload mPayload;
diff --git a/tests/robotests/src/com/android/settings/search/SavedQueryRecorderAndRemoverTest.java b/tests/robotests/src/com/android/settings/search/SavedQueryRecorderAndRemoverTest.java
index af8cfe4..5e1de45 100644
--- a/tests/robotests/src/com/android/settings/search/SavedQueryRecorderAndRemoverTest.java
+++ b/tests/robotests/src/com/android/settings/search/SavedQueryRecorderAndRemoverTest.java
@@ -36,7 +36,7 @@
 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_O)
 public class SavedQueryRecorderAndRemoverTest {
 
     private Context mContext;
diff --git a/tests/robotests/src/com/android/settings/search/SavedQueryViewHolderTest.java b/tests/robotests/src/com/android/settings/search/SavedQueryViewHolderTest.java
index bb8f6d1..0bb30e9 100644
--- a/tests/robotests/src/com/android/settings/search/SavedQueryViewHolderTest.java
+++ b/tests/robotests/src/com/android/settings/search/SavedQueryViewHolderTest.java
@@ -38,7 +38,7 @@
 import org.robolectric.annotation.Config;
 
 @RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION_O)
 public class SavedQueryViewHolderTest {
 
     @Mock
diff --git a/tests/robotests/src/com/android/settings/search/SearchFeatureProviderImplTest.java b/tests/robotests/src/com/android/settings/search/SearchFeatureProviderImplTest.java
index 30ffaf8..fae814f 100644
--- a/tests/robotests/src/com/android/settings/search/SearchFeatureProviderImplTest.java
+++ b/tests/robotests/src/com/android/settings/search/SearchFeatureProviderImplTest.java
@@ -17,38 +17,51 @@
 
 package com.android.settings.search;
 
+import static com.google.common.truth.Truth.assertThat;
+import static org.mockito.ArgumentMatchers.eq;
+import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.verify;
+import static org.robolectric.Shadows.shadowOf;
+
 import android.app.Activity;
-import android.view.Menu;
+import android.content.ComponentName;
+import android.content.Intent;
+import android.util.FeatureFlagUtils;
+import android.widget.Toolbar;
 
 import com.android.settings.TestConfig;
+import com.android.settings.core.FeatureFlags;
 import com.android.settings.dashboard.SiteMapManager;
 import com.android.settings.testutils.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.shadow.SettingsShadowSystemProperties;
 
+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.Robolectric;
 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_O, shadows = {
+        SettingsShadowSystemProperties.class
+})
 public class SearchFeatureProviderImplTest {
+
     private SearchFeatureProviderImpl mProvider;
     private Activity mActivity;
 
-    @Mock(answer = Answers.RETURNS_DEEP_STUBS)
-    private Menu menu;
-
     @Before
     public void setUp() {
         MockitoAnnotations.initMocks(this);
         mActivity = Robolectric.buildActivity(Activity.class).create().visible().get();
-        mProvider = new SearchFeatureProviderImpl();
+        mProvider = spy(new SearchFeatureProviderImpl());
+    }
+
+    @After
+    public void tearDown() {
+        SettingsShadowSystemProperties.clear();
     }
 
     @Test
@@ -62,18 +75,88 @@
     @Test
     public void getDatabaseSearchLoader_shouldCleanupQuery() {
         final String query = "  space ";
-        final DatabaseResultLoader loader = mProvider.getDatabaseSearchLoader(mActivity, query);
 
-        assertThat(loader.mQueryText).isEqualTo(query.trim());
+        mProvider.getStaticSearchResultTask(mActivity, query);
+
+        verify(mProvider).cleanQuery(eq(query));
     }
 
     @Test
     public void getInstalledAppSearchLoader_shouldCleanupQuery() {
         final String query = "  space ";
-        final InstalledAppResultLoader loader =
-                mProvider.getInstalledAppSearchLoader(mActivity, query);
 
-        assertThat(loader.mQuery).isEqualTo(query.trim());
+        mProvider.getInstalledAppSearchTask(mActivity, query);
+
+        verify(mProvider).cleanQuery(eq(query));
     }
 
+    @Test
+    public void initSearchToolbar_searchV2_shouldInitWithOnClickListener() {
+        mProvider.initSearchToolbar(mActivity, null);
+        // Should not crash.
+
+        SettingsShadowSystemProperties.set(
+                FeatureFlagUtils.FFLAG_PREFIX + FeatureFlags.SEARCH_V2,
+                "true");
+        final Toolbar toolbar = new Toolbar(mActivity);
+        mProvider.initSearchToolbar(mActivity, toolbar);
+
+        toolbar.performClick();
+
+        final Intent launchIntent = shadowOf(mActivity).getNextStartedActivity();
+
+        assertThat(launchIntent.getAction())
+                .isEqualTo("com.android.settings.action.SETTINGS_SEARCH");
+    }
+
+    @Test
+    public void initSearchToolbar_searchV1_shouldInitWithOnClickListener() {
+        mProvider.initSearchToolbar(mActivity, null);
+        // Should not crash.
+
+        SettingsShadowSystemProperties.set(
+                FeatureFlagUtils.FFLAG_PREFIX + FeatureFlags.SEARCH_V2,
+                "false");
+        final Toolbar toolbar = new Toolbar(mActivity);
+        mProvider.initSearchToolbar(mActivity, toolbar);
+
+        toolbar.performClick();
+
+        final Intent launchIntent = shadowOf(mActivity).getNextStartedActivity();
+
+        assertThat(launchIntent.getComponent().getClassName())
+                .isEqualTo(SearchActivity.class.getName());
+    }
+
+    @Test(expected = IllegalArgumentException.class)
+    public void verifyLaunchSearchResultPageCaller_nullCaller_shouldCrash() {
+        mProvider.verifyLaunchSearchResultPageCaller(mActivity, null /* caller */);
+    }
+
+    @Test(expected = SecurityException.class)
+    public void verifyLaunchSearchResultPageCaller_badCaller_shouldCrash() {
+        final ComponentName cn = new ComponentName("pkg", "class");
+        mProvider.verifyLaunchSearchResultPageCaller(mActivity, cn);
+    }
+
+    @Test
+    public void verifyLaunchSearchResultPageCaller_settingsCaller_shouldNotCrash() {
+        final ComponentName cn = new ComponentName(mActivity.getPackageName(), "class");
+        mProvider.verifyLaunchSearchResultPageCaller(mActivity, cn);
+    }
+
+    @Test
+    public void verifyLaunchSearchResultPageCaller_settingsIntelligenceCaller_shouldNotCrash() {
+        final ComponentName cn =
+                new ComponentName(mProvider.getSettingsIntelligencePkgName(), "class");
+        mProvider.verifyLaunchSearchResultPageCaller(mActivity, cn);
+    }
+
+    @Test
+    public void cleanQuery_trimsWhitespace() {
+        final String query = "  space ";
+        final String cleanQuery = "space";
+
+        assertThat(mProvider.cleanQuery(query)).isEqualTo(cleanQuery);
+    }
 }
diff --git a/tests/robotests/src/com/android/settings/search/SearchFragmentTest.java b/tests/robotests/src/com/android/settings/search/SearchFragmentTest.java
index d78a818..f1f633c 100644
--- a/tests/robotests/src/com/android/settings/search/SearchFragmentTest.java
+++ b/tests/robotests/src/com/android/settings/search/SearchFragmentTest.java
@@ -18,6 +18,7 @@
 package com.android.settings.search;
 
 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;
@@ -43,6 +44,7 @@
 import com.android.settings.R;
 import com.android.settings.SettingsActivity;
 import com.android.settings.TestConfig;
+import com.android.settings.core.instrumentation.VisibilityLoggerMixin;
 import com.android.settings.testutils.DatabaseTestUtils;
 import com.android.settings.testutils.FakeFeatureFactory;
 import com.android.settings.testutils.SettingsRobolectricTestRunner;
@@ -53,22 +55,20 @@
 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;
 import org.robolectric.RuntimeEnvironment;
+import org.robolectric.android.controller.ActivityController;
 import org.robolectric.annotation.Config;
-import org.robolectric.util.ActivityController;
 import org.robolectric.util.ReflectionHelpers;
 
-import java.util.Set;
+import java.util.List;
 
 @RunWith(SettingsRobolectricTestRunner.class)
 @Config(manifest = TestConfig.MANIFEST_PATH,
-        sdk = TestConfig.SDK_VERSION,
+        sdk = TestConfig.SDK_VERSION_O,
         shadows = {
                 SettingsShadowResources.class,
                 SettingsShadowResources.SettingsShadowTheme.class,
@@ -78,22 +78,13 @@
     @Mock(answer = Answers.RETURNS_DEEP_STUBS)
     private Context mContext;
     @Mock
-    private DatabaseResultLoader mDatabaseResultLoader;
-    @Mock
-    private InstalledAppResultLoader mInstalledAppResultLoader;
-    @Mock
-    private AccessibilityServiceResultLoader mAccessibilityServiceResultLoader;
-    @Mock
-    private InputDeviceResultLoader mInputDeviceResultLoader;
-
+    private SearchResultLoader mSearchResultLoader;
     @Mock
     private SavedQueryLoader mSavedQueryLoader;
     @Mock
     private SavedQueryController mSavedQueryController;
     @Mock
     private SearchResultsAdapter mSearchResultsAdapter;
-    @Captor
-    private ArgumentCaptor<String> mQueryCaptor = ArgumentCaptor.forClass(String.class);
 
     private FakeFeatureFactory mFeatureFactory;
 
@@ -112,17 +103,8 @@
     @Test
     public void screenRotate_shouldPersistQuery() {
         when(mFeatureFactory.searchFeatureProvider
-                .getDatabaseSearchLoader(any(Context.class), anyString()))
-                .thenReturn(mDatabaseResultLoader);
-        when(mFeatureFactory.searchFeatureProvider
-                .getInstalledAppSearchLoader(any(Context.class), anyString()))
-                .thenReturn(mInstalledAppResultLoader);
-        when(mFeatureFactory.searchFeatureProvider
-                .getAccessibilityServiceResultLoader(any(Context.class), anyString()))
-                .thenReturn(mAccessibilityServiceResultLoader);
-        when(mFeatureFactory.searchFeatureProvider
-                .getInputDeviceResultLoader(any(Context.class), anyString()))
-                .thenReturn(mInputDeviceResultLoader);
+                .getSearchResultLoader(any(Context.class), anyString()))
+                .thenReturn(new MockSearchResultLoader(RuntimeEnvironment.application));
         when(mFeatureFactory.searchFeatureProvider.getSavedQueryLoader(any(Context.class)))
                 .thenReturn(mSavedQueryLoader);
 
@@ -167,25 +149,16 @@
         activityController.setup(bundle);
 
         verify(mFeatureFactory.searchFeatureProvider, never())
-                .getDatabaseSearchLoader(any(Context.class), anyString());
+                .getStaticSearchResultTask(any(Context.class), anyString());
         verify(mFeatureFactory.searchFeatureProvider, never())
-                .getInstalledAppSearchLoader(any(Context.class), anyString());
+                .getInstalledAppSearchTask(any(Context.class), anyString());
     }
 
     @Test
-    public void queryTextChange_shouldTriggerLoaderAndInitializeSearch() {
+    public void queryTextChange_shouldTriggerLoader() {
         when(mFeatureFactory.searchFeatureProvider
-                .getDatabaseSearchLoader(any(Context.class), anyString()))
-                .thenReturn(mDatabaseResultLoader);
-        when(mFeatureFactory.searchFeatureProvider
-                .getInstalledAppSearchLoader(any(Context.class), anyString()))
-                .thenReturn(mInstalledAppResultLoader);
-        when(mFeatureFactory.searchFeatureProvider
-                .getAccessibilityServiceResultLoader(any(Context.class), anyString()))
-                .thenReturn(mAccessibilityServiceResultLoader);
-        when(mFeatureFactory.searchFeatureProvider
-                .getInputDeviceResultLoader(any(Context.class), anyString()))
-                .thenReturn(mInputDeviceResultLoader);
+                .getSearchResultLoader(any(Context.class), anyString()))
+                .thenReturn(mSearchResultLoader);
         when(mFeatureFactory.searchFeatureProvider.getSavedQueryLoader(any(Context.class)))
                 .thenReturn(mSavedQueryLoader);
 
@@ -198,7 +171,6 @@
         when(mFeatureFactory.searchFeatureProvider.isIndexingComplete(any(Context.class)))
                 .thenReturn(true);
 
-        ReflectionHelpers.setField(fragment, "mSearchAdapter", mSearchResultsAdapter);
         fragment.onQueryTextChange(testQuery);
         activityController.get().onBackPressed();
 
@@ -207,14 +179,8 @@
         verify(mFeatureFactory.metricsFeatureProvider, never()).action(
                 any(Context.class),
                 eq(MetricsProto.MetricsEvent.ACTION_LEAVE_SEARCH_RESULT_WITHOUT_QUERY));
-        verify(mFeatureFactory.metricsFeatureProvider).histogram(
-                any(Context.class), eq(SearchFragment.RESULT_CLICK_COUNT), eq(0));
         verify(mFeatureFactory.searchFeatureProvider)
-                .getDatabaseSearchLoader(any(Context.class), anyString());
-        verify(mFeatureFactory.searchFeatureProvider)
-                .getInstalledAppSearchLoader(any(Context.class), anyString());
-        verify(mSearchResultsAdapter).initializeSearch(mQueryCaptor.capture());
-        assertThat(mQueryCaptor.getValue()).isEqualTo(testQuery);
+                .getSearchResultLoader(any(Context.class), anyString());
     }
 
     @Test
@@ -231,22 +197,14 @@
                 any(Context.class),
                 anyInt(),
                 eq(MetricsProto.MetricsEvent.SETTINGS_SEARCH_NO_RESULT));
+        verify(mFeatureFactory.metricsFeatureProvider).action(
+                any(VisibilityLoggerMixin.class),
+                eq(MetricsProto.MetricsEvent.ACTION_SEARCH_RESULTS),
+                eq(1));
     }
 
     @Test
     public void queryTextChangeToEmpty_shouldLoadSavedQueryAndNotInitializeSearch() {
-        when(mFeatureFactory.searchFeatureProvider
-                .getDatabaseSearchLoader(any(Context.class), anyString()))
-                .thenReturn(mDatabaseResultLoader);
-        when(mFeatureFactory.searchFeatureProvider
-                .getInstalledAppSearchLoader(any(Context.class), anyString()))
-                .thenReturn(mInstalledAppResultLoader);
-        when(mFeatureFactory.searchFeatureProvider
-                .getAccessibilityServiceResultLoader(any(Context.class), anyString()))
-                .thenReturn(mAccessibilityServiceResultLoader);
-        when(mFeatureFactory.searchFeatureProvider
-                .getInputDeviceResultLoader(any(Context.class), anyString()))
-                .thenReturn(mInputDeviceResultLoader);
         when(mFeatureFactory.searchFeatureProvider.getSavedQueryLoader(any(Context.class)))
                 .thenReturn(mSavedQueryLoader);
         ActivityController<SearchActivity> activityController =
@@ -263,27 +221,14 @@
         fragment.onQueryTextChange("");
 
         verify(mFeatureFactory.searchFeatureProvider, never())
-                .getDatabaseSearchLoader(any(Context.class), anyString());
+                .getStaticSearchResultTask(any(Context.class), anyString());
         verify(mFeatureFactory.searchFeatureProvider, never())
-                .getInstalledAppSearchLoader(any(Context.class), anyString());
+                .getInstalledAppSearchTask(any(Context.class), anyString());
         verify(mSavedQueryController).loadSavedQueries();
-        verify(mSearchResultsAdapter, never()).initializeSearch(anyString());
     }
 
     @Test
     public void updateIndex_TriggerOnCreate() {
-        when(mFeatureFactory.searchFeatureProvider
-                .getDatabaseSearchLoader(any(Context.class), anyString()))
-                .thenReturn(mDatabaseResultLoader);
-        when(mFeatureFactory.searchFeatureProvider
-                .getInstalledAppSearchLoader(any(Context.class), anyString()))
-                .thenReturn(mInstalledAppResultLoader);
-        when(mFeatureFactory.searchFeatureProvider
-                .getAccessibilityServiceResultLoader(any(Context.class), anyString()))
-                .thenReturn(mAccessibilityServiceResultLoader);
-        when(mFeatureFactory.searchFeatureProvider
-                .getInputDeviceResultLoader(any(Context.class), anyString()))
-                .thenReturn(mInputDeviceResultLoader);
         when(mFeatureFactory.searchFeatureProvider.getSavedQueryLoader(any(Context.class)))
                 .thenReturn(mSavedQueryLoader);
 
@@ -301,40 +246,10 @@
     }
 
     @Test
-    public void syncLoaders_MergeWhenAllLoadersDone() {
-        when(mFeatureFactory.searchFeatureProvider
-                .getDatabaseSearchLoader(any(Context.class), anyString()))
-                .thenReturn(new MockDBLoader(RuntimeEnvironment.application));
-        when(mFeatureFactory.searchFeatureProvider
-                .getInstalledAppSearchLoader(any(Context.class), anyString()))
-                .thenReturn(new MockAppLoader(RuntimeEnvironment.application));
-        when(mFeatureFactory.searchFeatureProvider.getSavedQueryLoader(any(Context.class)))
-                .thenReturn(mSavedQueryLoader);
-
-        ActivityController<SearchActivity> activityController =
-                Robolectric.buildActivity(SearchActivity.class);
-        activityController.setup();
-
-        SearchFragment fragment = (SearchFragment) spy(activityController.get().getFragmentManager()
-                .findFragmentById(R.id.main_content));
-        when(mFeatureFactory.searchFeatureProvider.isIndexingComplete(any(Context.class)))
-                .thenReturn(true);
-
-        fragment.onQueryTextChange("non-empty");
-
-        Robolectric.flushForegroundThreadScheduler();
-
-        verify(fragment, times(2)).onLoadFinished(any(Loader.class), any(Set.class));
-    }
-
-    @Test
     public void whenNoQuery_HideFeedbackIsCalled() {
         when(mFeatureFactory.searchFeatureProvider
-                .getDatabaseSearchLoader(any(Context.class), anyString()))
-                .thenReturn(new MockDBLoader(RuntimeEnvironment.application));
-        when(mFeatureFactory.searchFeatureProvider
-                .getInstalledAppSearchLoader(any(Context.class), anyString()))
-                .thenReturn(new MockAppLoader(RuntimeEnvironment.application));
+                .getSearchResultLoader(any(Context.class), anyString()))
+                .thenReturn(new MockSearchResultLoader(RuntimeEnvironment.application));
         when(mFeatureFactory.searchFeatureProvider.getSavedQueryLoader(any(Context.class)))
                 .thenReturn(mSavedQueryLoader);
 
@@ -356,17 +271,8 @@
     @Test
     public void onLoadFinished_ShowsFeedback() {
         when(mFeatureFactory.searchFeatureProvider
-                .getDatabaseSearchLoader(any(Context.class), anyString()))
-                .thenReturn(new MockDBLoader(RuntimeEnvironment.application));
-        when(mFeatureFactory.searchFeatureProvider
-                .getInstalledAppSearchLoader(any(Context.class), anyString()))
-                .thenReturn(new MockAppLoader(RuntimeEnvironment.application));
-        when(mFeatureFactory.searchFeatureProvider
-                .getAccessibilityServiceResultLoader(any(Context.class), anyString()))
-                .thenReturn(new MockAccessibilityLoader(RuntimeEnvironment.application));
-        when(mFeatureFactory.searchFeatureProvider
-                .getInputDeviceResultLoader(any(Context.class), anyString()))
-                .thenReturn(new MockInputDeviceResultLoader(RuntimeEnvironment.application));
+                .getSearchResultLoader(any(Context.class), anyString()))
+                .thenReturn(new MockSearchResultLoader(RuntimeEnvironment.application));
         when(mFeatureFactory.searchFeatureProvider.getSavedQueryLoader(any(Context.class)))
                 .thenReturn(mSavedQueryLoader);
         ActivityController<SearchActivity> activityController =
@@ -410,9 +316,7 @@
 
         fragment.onIndexingFinished();
 
-        verify(loaderManager).initLoader(eq(SearchFragment.SearchLoaderId.DATABASE),
-                eq(null), any(LoaderManager.LoaderCallbacks.class));
-        verify(loaderManager).initLoader(eq(SearchFragment.SearchLoaderId.INSTALLED_APPS),
+        verify(loaderManager).initLoader(eq(SearchFragment.SearchLoaderId.SEARCH_RESULT),
                 eq(null), any(LoaderManager.LoaderCallbacks.class));
     }
 
@@ -477,16 +381,13 @@
                 eq("test_setting"),
                 argThat(pairMatches(MetricsProto.MetricsEvent.FIELD_SETTINGS_SEARCH_RESULT_COUNT)),
                 argThat(pairMatches(MetricsProto.MetricsEvent.FIELD_SETTINGS_SEARCH_RESULT_RANK)),
-                argThat(pairMatches(MetricsProto.MetricsEvent
-                                .FIELD_SETTINGS_SEARCH_RESULT_ASYNC_RANKING_STATE)),
                 argThat(pairMatches(MetricsProto.MetricsEvent.FIELD_SETTINGS_SEARCH_QUERY_LENGTH)));
-
         verify(mFeatureFactory.searchFeatureProvider).searchResultClicked(nullable(Context.class),
                 nullable(String.class), eq(searchResult));
     }
 
     @Test
-    public void onResume_shouldCallSearchRankingWarmupIfSmartSearchRankingEnabled(){
+    public void onResume_shouldCallSearchRankingWarmupIfSmartSearchRankingEnabled() {
         when(mFeatureFactory.searchFeatureProvider.isSmartSearchRankingEnabled(any(Context.class)))
                 .thenReturn(true);
 
@@ -501,7 +402,7 @@
     }
 
     @Test
-    public void onResume_shouldNotCallSearchRankingWarmupIfSmartSearchRankingDisabled(){
+    public void onResume_shouldNotCallSearchRankingWarmupIfSmartSearchRankingDisabled() {
         when(mFeatureFactory.searchFeatureProvider.isSmartSearchRankingEnabled(any(Context.class)))
                 .thenReturn(false);
 
diff --git a/tests/robotests/src/com/android/settings/search/SearchIndexProviderCodeInspector.java b/tests/robotests/src/com/android/settings/search/SearchIndexProviderCodeInspector.java
index b4a91c5..a8372d9 100644
--- a/tests/robotests/src/com/android/settings/search/SearchIndexProviderCodeInspector.java
+++ b/tests/robotests/src/com/android/settings/search/SearchIndexProviderCodeInspector.java
@@ -16,6 +16,9 @@
 
 package com.android.settings.search;
 
+import static com.google.common.truth.Truth.assertWithMessage;
+
+import android.provider.SearchIndexableResource;
 import android.util.ArraySet;
 import android.util.Log;
 
@@ -23,13 +26,13 @@
 import com.android.settings.core.codeinspection.CodeInspector;
 import com.android.settings.dashboard.DashboardFragmentSearchIndexProviderInspector;
 
+import org.robolectric.RuntimeEnvironment;
+
 import java.lang.reflect.Field;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Set;
 
-import static com.google.common.truth.Truth.assertWithMessage;
-
 /**
  * {@link CodeInspector} to ensure fragments implement search components correctly.
  */
@@ -49,6 +52,9 @@
             "Class containing " + DatabaseIndexingManager.FIELD_NAME_SEARCH_INDEX_DATA_PROVIDER
                     + " must be added to " + SearchIndexableResources.class.getName()
                     + " but these are not: \n";
+    private static final String NOT_PROVIDING_VALID_RESOURCE_ERROR =
+            "SearchIndexableProvider must either provide no resource to index, or valid ones. "
+            + "But the followings contain resource with xml id = 0\n";
 
     private final List<String> notImplementingIndexableGrandfatherList;
     private final List<String> notImplementingIndexProviderGrandfatherList;
@@ -77,6 +83,7 @@
         final Set<String> notImplementingIndexProvider = new ArraySet<>();
         final Set<String> notInSearchProviderRegistry = new ArraySet<>();
         final Set<String> notSharingPreferenceControllers = new ArraySet<>();
+        final Set<String> notProvidingValidResource = new ArraySet<>();
 
         for (Class clazz : mClasses) {
             if (!isConcreteSettingsClass(clazz)) {
@@ -114,11 +121,14 @@
                 continue;
             }
             // Must be in SearchProviderRegistry
-            if (SearchIndexableResources.getResourceByName(className) == null) {
+            if (!SearchIndexableResources.providerValues().contains(clazz)) {
                 if (!notInSearchIndexableRegistryGrandfatherList.remove(className)) {
                     notInSearchProviderRegistry.add(className);
                 }
-                continue;
+            }
+            // Search provider must either don't provider resource xml, or provide valid ones.
+            if (!hasValidResourceFromProvider(clazz)) {
+                notProvidingValidResource.add(className);
             }
         }
 
@@ -132,6 +142,8 @@
                 notSharingPreferenceControllers);
         final String notInProviderRegistryError =
                 buildErrorMessage(NOT_IN_INDEXABLE_PROVIDER_REGISTRY, notInSearchProviderRegistry);
+        final String notProvidingValidResourceError = buildErrorMessage(
+                NOT_PROVIDING_VALID_RESOURCE_ERROR, notProvidingValidResource);
         assertWithMessage(indexableError)
                 .that(notImplementingIndexable)
                 .isEmpty();
@@ -144,6 +156,9 @@
         assertWithMessage(notInProviderRegistryError)
                 .that(notInSearchProviderRegistry)
                 .isEmpty();
+        assertWithMessage(notProvidingValidResourceError)
+                .that(notProvidingValidResource)
+                .isEmpty();
         assertNoObsoleteInGrandfatherList("grandfather_not_implementing_indexable",
                 notImplementingIndexableGrandfatherList);
         assertNoObsoleteInGrandfatherList("grandfather_not_implementing_index_provider",
@@ -169,6 +184,28 @@
         }
     }
 
+    private boolean hasValidResourceFromProvider(Class clazz) {
+        try {
+            final Indexable.SearchIndexProvider provider =
+                    DatabaseIndexingUtils.getSearchIndexProvider(clazz);
+            final List<SearchIndexableResource> resources = provider.getXmlResourcesToIndex(
+                    RuntimeEnvironment.application, true /* enabled */);
+            if (resources == null) {
+                // No resource, that's fine.
+                return true;
+            }
+            for (SearchIndexableResource res : resources) {
+                if (res.xmlResId == 0) {
+                    // Invalid resource
+                    return false;
+                }
+            }
+        } catch (Exception e) {
+            // Ignore.
+        }
+        return true;
+    }
+
     private String buildErrorMessage(String errorSummary, Set<String> errorClasses) {
         final StringBuilder error = new StringBuilder(errorSummary);
         for (String c : errorClasses) {
diff --git a/tests/robotests/src/com/android/settings/search/SearchIndexableResourcesTest.java b/tests/robotests/src/com/android/settings/search/SearchIndexableResourcesTest.java
index 1ddff90..90dba29 100644
--- a/tests/robotests/src/com/android/settings/search/SearchIndexableResourcesTest.java
+++ b/tests/robotests/src/com/android/settings/search/SearchIndexableResourcesTest.java
@@ -17,20 +17,17 @@
 package com.android.settings.search;
 
 import static android.provider.SearchIndexablesContract.COLUMN_INDEX_NON_INDEXABLE_KEYS_KEY_VALUE;
-import static com.android.settings.search.SearchIndexableResources.NO_DATA_RES_ID;
-
 import static com.google.common.truth.Truth.assertThat;
+
+import static junit.framework.Assert.fail;
+
 import static org.mockito.Mockito.spy;
 
-import android.annotation.DrawableRes;
-import android.annotation.XmlRes;
 import android.database.Cursor;
-import android.provider.SearchIndexableResource;
-
 import android.text.TextUtils;
-import com.android.settings.R;
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
+
 import com.android.settings.TestConfig;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.wifi.WifiSettings;
 
 import org.junit.After;
@@ -39,72 +36,55 @@
 import org.junit.runner.RunWith;
 import org.robolectric.annotation.Config;
 
-import java.util.HashMap;
-import java.util.Map;
+import java.util.HashSet;
+import java.util.Set;
 
 @RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION_O)
 public class SearchIndexableResourcesTest {
 
-    @XmlRes
-    private static final int XML_RES_ID = R.xml.physical_keyboard_settings;
-    @DrawableRes
-    private static final int ICON_RES_ID = R.drawable.ic_settings_language;
-
-    Map<String, SearchIndexableResource> sResMapCopy;
+    Set<Class> sProviderClassCopy;
 
     @Before
     public void setUp() {
-        sResMapCopy = new HashMap<>(SearchIndexableResources.sResMap);
+        sProviderClassCopy = new HashSet<>(SearchIndexableResources.sProviders);
     }
 
     @After
     public void cleanUp() {
-        SearchIndexableResources.sResMap.clear();
-        for (String key : sResMapCopy.keySet()) {
-            SearchIndexableResources.sResMap.put(key, sResMapCopy.get(key));
-        }
+        SearchIndexableResources.sProviders.clear();
+        SearchIndexableResources.sProviders.addAll(sProviderClassCopy);
     }
 
     @Test
     public void testAddIndex() {
+        final Class stringClass = java.lang.String.class;
         // Confirms that String.class isn't contained in SearchIndexableResources.
-        assertThat(SearchIndexableResources.getResourceByName("java.lang.String")).isNull();
-        final int beforeCount = SearchIndexableResources.values().size();
+        assertThat(SearchIndexableResources.sProviders).doesNotContain(stringClass);
+        final int beforeCount = SearchIndexableResources.providerValues().size();
 
-        SearchIndexableResources.addIndex(java.lang.String.class, XML_RES_ID, ICON_RES_ID);
-        final SearchIndexableResource index = SearchIndexableResources
-                .getResourceByName("java.lang.String");
+        SearchIndexableResources.addIndex(java.lang.String.class);
 
-        assertThat(index).isNotNull();
-        assertThat(index.className).isEqualTo("java.lang.String");
-        assertThat(index.xmlResId).isEqualTo(XML_RES_ID);
-        assertThat(index.iconResId).isEqualTo(ICON_RES_ID);
-        final int afterCount = SearchIndexableResources.values().size();
+        assertThat(SearchIndexableResources.sProviders).contains(stringClass);
+        final int afterCount = SearchIndexableResources.providerValues().size();
         assertThat(afterCount).isEqualTo(beforeCount + 1);
     }
 
     @Test
     public void testIndexHasWifiSettings() {
-        final SearchIndexableResource index = SearchIndexableResources
-                .getResourceByName(WifiSettings.class.getName());
-
-        assertThat(index).isNotNull();
-        assertThat(index.className).isEqualTo(WifiSettings.class.getName());
-        assertThat(index.xmlResId).isEqualTo(NO_DATA_RES_ID);
-        assertThat(index.iconResId).isEqualTo(R.drawable.ic_settings_wireless);
+        assertThat(sProviderClassCopy).contains(WifiSettings.class);
     }
 
     @Test
     public void testNonIndexableKeys_GetsKeyFromProvider() {
-        SearchIndexableResources.sResMap.clear();
-        SearchIndexableResources.addIndex(FakeIndexProvider.class, 0, 0);
+        SearchIndexableResources.sProviders.clear();
+        SearchIndexableResources.addIndex(FakeIndexProvider.class);
 
         SettingsSearchIndexablesProvider provider = spy(new SettingsSearchIndexablesProvider());
 
         Cursor cursor = provider.queryNonIndexableKeys(null);
         boolean hasTestKey = false;
-        while(cursor.moveToNext()) {
+        while (cursor.moveToNext()) {
             String key = cursor.getString(COLUMN_INDEX_NON_INDEXABLE_KEYS_KEY_VALUE);
             if (TextUtils.equals(key, FakeIndexProvider.KEY)) {
                 hasTestKey = true;
@@ -114,4 +94,13 @@
 
         assertThat(hasTestKey).isTrue();
     }
+
+    @Test
+    public void testAllClassNamesHaveProviders() {
+        for (Class clazz: sProviderClassCopy) {
+            if(DatabaseIndexingUtils.getSearchIndexProvider(clazz) == null) {
+                fail(clazz.getName() + "is not an index provider");
+            }
+        }
+    }
 }
diff --git a/tests/robotests/src/com/android/settings/search/SearchResultAggregatorTest.java b/tests/robotests/src/com/android/settings/search/SearchResultAggregatorTest.java
new file mode 100644
index 0000000..4dc0589
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/search/SearchResultAggregatorTest.java
@@ -0,0 +1,271 @@
+package com.android.settings.search;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.anyLong;
+import static org.mockito.ArgumentMatchers.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.Intent;
+
+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.annotation.Config;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Objects;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.TimeUnit;
+
+@RunWith(SettingsRobolectricTestRunner.class)
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION_O)
+public class SearchResultAggregatorTest {
+
+    @Mock(answer = Answers.RETURNS_DEEP_STUBS)
+    private Context mContext;
+
+    private FakeFeatureFactory mFeatureFactory;
+
+    private SearchResultAggregator mAggregator;
+
+    @Mock
+    private DatabaseResultLoader mStaticTask;
+    @Mock
+    private InstalledAppResultLoader mAppTask;
+    @Mock
+    private InputDeviceResultLoader mInputTask;
+    @Mock
+    private AccessibilityServiceResultLoader mMAccessibilityTask;
+    @Mock
+    private ExecutorService mService;
+
+
+    private String[] DB_TITLES = {"static_one", "static_two"};
+    private String[] INPUT_TITLES = {"input_one", "input_two"};
+    private String[] ACCESS_TITLES = {"access_one", "access_two"};
+    private String[] APP_TITLES = {"app_one", "app_two"};
+
+
+    @Before
+    public void setUp() throws Exception {
+        MockitoAnnotations.initMocks(this);
+        mAggregator = spy(SearchResultAggregator.getInstance());
+        FakeFeatureFactory.setupForTest(mContext);
+        mFeatureFactory = (FakeFeatureFactory) FakeFeatureFactory.getFactory(mContext);
+
+        // Return mock loaders from feature provider
+        when(mFeatureFactory.searchFeatureProvider.getStaticSearchResultTask(any(Context.class),
+                anyString())).thenReturn(mStaticTask);
+        when(mFeatureFactory.searchFeatureProvider.getInstalledAppSearchTask(any(Context.class),
+                anyString())).thenReturn(mAppTask);
+        when(mFeatureFactory.searchFeatureProvider.getInputDeviceResultTask(any(Context.class),
+                anyString())).thenReturn(mInputTask);
+        when(mFeatureFactory.searchFeatureProvider.getAccessibilityServiceResultTask(
+                any(Context.class),
+                anyString())).thenReturn(mMAccessibilityTask);
+        when(mFeatureFactory.searchFeatureProvider.getExecutorService()).thenReturn(mService);
+
+        // Return fake data from the loaders
+        List<? extends SearchResult> dbResults = getDummyDbResults();
+        doReturn(dbResults).when(mStaticTask).get(anyLong(), any(TimeUnit.class));
+
+        List<? extends SearchResult> appResults = getDummyAppResults();
+        doReturn(appResults).when(mAppTask).get(anyLong(), any(TimeUnit.class));
+
+        List<? extends SearchResult> inputResults = getDummyInputDeviceResults();
+        doReturn(inputResults).when(mInputTask).get(anyLong(), any(TimeUnit.class));
+
+        List<? extends SearchResult> accessResults = getDummyAccessibilityResults();
+        doReturn(accessResults).when(mMAccessibilityTask).get(anyLong(), any(TimeUnit.class));
+    }
+
+    @Test
+    public void testStaticResults_mergedProperly() {
+        when(mFeatureFactory.searchFeatureProvider.isSmartSearchRankingEnabled(mContext))
+                .thenReturn(false);
+
+        List<? extends SearchResult> results = mAggregator.fetchResults(mContext, "test");
+
+        assertThat(results).hasSize(8);
+        assertThat(results.get(0).title).isEqualTo(DB_TITLES[0]);
+        assertThat(results.get(1).title).isEqualTo(DB_TITLES[1]);
+        assertThat(results.get(2).title).isEqualTo(APP_TITLES[0]);
+        assertThat(results.get(3).title).isEqualTo(ACCESS_TITLES[0]);
+        assertThat(results.get(4).title).isEqualTo(INPUT_TITLES[0]);
+        assertThat(results.get(5).title).isEqualTo(APP_TITLES[1]);
+        assertThat(results.get(6).title).isEqualTo(ACCESS_TITLES[1]);
+        assertThat(results.get(7).title).isEqualTo(INPUT_TITLES[1]);
+    }
+
+    @Test
+    public void testStaticRanking_staticThrowsException_dbResultsAreMissing() throws Exception {
+        when(mFeatureFactory.searchFeatureProvider.isSmartSearchRankingEnabled(mContext))
+                .thenReturn(false);
+        when(mStaticTask.get(anyLong(), any(TimeUnit.class))).thenThrow(new InterruptedException());
+
+        List<? extends SearchResult> results = mAggregator.fetchResults(mContext, "test");
+
+        assertThat(results).hasSize(6);
+        assertThat(results.get(0).title).isEqualTo(APP_TITLES[0]);
+        assertThat(results.get(1).title).isEqualTo(ACCESS_TITLES[0]);
+        assertThat(results.get(2).title).isEqualTo(INPUT_TITLES[0]);
+        assertThat(results.get(3).title).isEqualTo(APP_TITLES[1]);
+        assertThat(results.get(4).title).isEqualTo(ACCESS_TITLES[1]);
+        assertThat(results.get(5).title).isEqualTo(INPUT_TITLES[1]);
+    }
+
+    @Test
+    public void testStaticRanking_appsThrowException_appResultsAreMissing() throws Exception {
+        when(mFeatureFactory.searchFeatureProvider.isSmartSearchRankingEnabled(mContext))
+                .thenReturn(false);
+        when(mAppTask.get(anyLong(), any(TimeUnit.class))).thenThrow(new InterruptedException());
+
+        List<? extends SearchResult> results = mAggregator.fetchResults(mContext, "test");
+
+        assertThat(results).hasSize(6);
+        assertThat(results.get(0).title).isEqualTo(DB_TITLES[0]);
+        assertThat(results.get(1).title).isEqualTo(DB_TITLES[1]);
+        assertThat(results.get(2).title).isEqualTo(ACCESS_TITLES[0]);
+        assertThat(results.get(3).title).isEqualTo(INPUT_TITLES[0]);
+        assertThat(results.get(4).title).isEqualTo(ACCESS_TITLES[1]);
+        assertThat(results.get(5).title).isEqualTo(INPUT_TITLES[1]);
+    }
+
+    @Test
+    public void testStaticRanking_inputThrowException_inputResultsAreMissing() throws Exception {
+        when(mFeatureFactory.searchFeatureProvider.isSmartSearchRankingEnabled(mContext))
+                .thenReturn(false);
+        when(mInputTask.get(anyLong(), any(TimeUnit.class))).thenThrow(new InterruptedException());
+
+        List<? extends SearchResult> results = mAggregator.fetchResults(mContext, "test");
+
+        assertThat(results).hasSize(6);
+        assertThat(results.get(0).title).isEqualTo(DB_TITLES[0]);
+        assertThat(results.get(1).title).isEqualTo(DB_TITLES[1]);
+        assertThat(results.get(2).title).isEqualTo(APP_TITLES[0]);
+        assertThat(results.get(3).title).isEqualTo(ACCESS_TITLES[0]);
+        assertThat(results.get(4).title).isEqualTo(APP_TITLES[1]);
+        assertThat(results.get(5).title).isEqualTo(ACCESS_TITLES[1]);
+    }
+
+    @Test
+    public void testStaticRanking_accessThrowException_accessResultsAreMissing() throws Exception {
+        when(mFeatureFactory.searchFeatureProvider.isSmartSearchRankingEnabled(mContext))
+                .thenReturn(false);
+        when(mMAccessibilityTask.get(anyLong(), any(TimeUnit.class))).thenThrow(
+                new InterruptedException());
+
+        List<? extends SearchResult> results = mAggregator.fetchResults(mContext, "test");
+
+        assertThat(results).hasSize(6);
+        assertThat(results.get(0).title).isEqualTo(DB_TITLES[0]);
+        assertThat(results.get(1).title).isEqualTo(DB_TITLES[1]);
+        assertThat(results.get(2).title).isEqualTo(APP_TITLES[0]);
+        assertThat(results.get(3).title).isEqualTo(INPUT_TITLES[0]);
+        assertThat(results.get(4).title).isEqualTo(APP_TITLES[1]);
+        assertThat(results.get(5).title).isEqualTo(INPUT_TITLES[1]);
+    }
+
+    @Test
+    public void testDynamicRanking_sortsWithDynamicRanking() {
+        when(mFeatureFactory.searchFeatureProvider.isSmartSearchRankingEnabled(any())).thenReturn(
+                true);
+
+        List<? extends SearchResult> results = mAggregator.fetchResults(mContext, "test");
+
+        assertThat(results).hasSize(8);
+        assertThat(results.get(0).title).isEqualTo(DB_TITLES[0]);
+        assertThat(results.get(1).title).isEqualTo(DB_TITLES[1]);
+        assertThat(results.get(2).title).isEqualTo(APP_TITLES[0]);
+        assertThat(results.get(3).title).isEqualTo(ACCESS_TITLES[0]);
+        assertThat(results.get(4).title).isEqualTo(INPUT_TITLES[0]);
+        assertThat(results.get(5).title).isEqualTo(APP_TITLES[1]);
+        assertThat(results.get(6).title).isEqualTo(ACCESS_TITLES[1]);
+        assertThat(results.get(7).title).isEqualTo(INPUT_TITLES[1]);
+    }
+
+    private List<? extends SearchResult> getDummyDbResults() {
+        List<SearchResult> results = new ArrayList<>();
+        ResultPayload payload = new ResultPayload(new Intent());
+        SearchResult.Builder builder = new SearchResult.Builder();
+        builder.setPayload(payload)
+                .setTitle(DB_TITLES[0])
+                .setRank(1)
+                .setStableId(Objects.hash(DB_TITLES[0], "db"));
+        results.add(builder.build());
+
+        builder.setTitle(DB_TITLES[1])
+                .setRank(2)
+                .setStableId(Objects.hash(DB_TITLES[1], "db"));
+        results.add(builder.build());
+
+        return results;
+    }
+
+    private List<? extends SearchResult> getDummyAppResults() {
+        List<AppSearchResult> results = new ArrayList<>();
+        ResultPayload payload = new ResultPayload(new Intent());
+        AppSearchResult.Builder builder = new AppSearchResult.Builder();
+        builder.setPayload(payload)
+                .setTitle(APP_TITLES[0])
+                .setRank(1)
+                .setStableId(Objects.hash(APP_TITLES[0], "app"));
+        results.add(builder.build());
+
+        builder.setTitle(APP_TITLES[1])
+                .setRank(2)
+                .setStableId(Objects.hash(APP_TITLES[1], "app"));
+        results.add(builder.build());
+
+        return results;
+    }
+
+    public List<? extends SearchResult> getDummyInputDeviceResults() {
+        List<SearchResult> results = new ArrayList<>();
+        ResultPayload payload = new ResultPayload(new Intent());
+        AppSearchResult.Builder builder = new AppSearchResult.Builder();
+        builder.setPayload(payload)
+                .setTitle(INPUT_TITLES[0])
+                .setRank(1)
+                .setStableId(Objects.hash(INPUT_TITLES[0], "app"));
+        results.add(builder.build());
+
+        builder.setTitle(INPUT_TITLES[1])
+                .setRank(2)
+                .setStableId(Objects.hash(INPUT_TITLES[1], "app"));
+        results.add(builder.build());
+
+        return results;
+    }
+
+    public List<? extends SearchResult> getDummyAccessibilityResults() {
+        List<SearchResult> results = new ArrayList<>();
+        ResultPayload payload = new ResultPayload(new Intent());
+        AppSearchResult.Builder builder = new AppSearchResult.Builder();
+        builder.setPayload(payload)
+                .setTitle(ACCESS_TITLES[0])
+                .setRank(1)
+                .setStableId(Objects.hash(ACCESS_TITLES[0], "app"));
+        results.add(builder.build());
+
+        builder.setTitle(ACCESS_TITLES[1])
+                .setRank(2)
+                .setStableId(Objects.hash(ACCESS_TITLES[1], "app"));
+        results.add(builder.build());
+
+        return results;
+    }
+}
diff --git a/tests/robotests/src/com/android/settings/search/SearchResultBuilderTest.java b/tests/robotests/src/com/android/settings/search/SearchResultBuilderTest.java
index cd77b25..6d38aa8 100644
--- a/tests/robotests/src/com/android/settings/search/SearchResultBuilderTest.java
+++ b/tests/robotests/src/com/android/settings/search/SearchResultBuilderTest.java
@@ -37,7 +37,7 @@
 import java.util.ArrayList;
 
 @RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION_O)
 public class SearchResultBuilderTest {
 
     private static final String TITLE = "title";
diff --git a/tests/robotests/src/com/android/settings/search/SearchResultsAdapterTest.java b/tests/robotests/src/com/android/settings/search/SearchResultsAdapterTest.java
index a2afb35..1dad447 100644
--- a/tests/robotests/src/com/android/settings/search/SearchResultsAdapterTest.java
+++ b/tests/robotests/src/com/android/settings/search/SearchResultsAdapterTest.java
@@ -18,47 +18,35 @@
 package com.android.settings.search;
 
 import static com.google.common.truth.Truth.assertThat;
+
+import static org.mockito.ArgumentMatchers.anyInt;
 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;
 
 import android.app.Activity;
 import android.content.Context;
 import android.content.Intent;
-import android.graphics.drawable.Drawable;
-import android.util.Pair;
 import android.view.ViewGroup;
 import android.widget.FrameLayout;
 
-import com.android.settings.R;
 import com.android.settings.TestConfig;
-import com.android.settings.search.SearchResult.Builder;
-import com.android.settings.search.ranking.SearchResultsRankerCallback;
 import com.android.settings.testutils.SettingsRobolectricTestRunner;
 
 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;
 
 @RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION_O)
 public class SearchResultsAdapterTest {
 
     @Mock
@@ -67,25 +55,18 @@
     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;
-
-    private String[] TITLES = {"alpha", "bravo", "charlie", "appAlpha", "appBravo", "appCharlie"};
 
     @Before
     public void setUp() {
         MockitoAnnotations.initMocks(this);
         mContext = Robolectric.buildActivity(Activity.class).get();
-        mLoaderClassName = DatabaseResultLoader.class.getName();
         when(mFragment.getContext()).thenReturn(mMockContext);
         when(mMockContext.getApplicationContext()).thenReturn(mContext);
         when(mSearchFeatureProvider.smartSearchRankingTimeoutMs(any(Context.class)))
                 .thenReturn(300L);
-        mAdapter = new SearchResultsAdapter(mFragment, mSearchFeatureProvider);
+        mAdapter = new SearchResultsAdapter(mFragment);
     }
 
     @Test
@@ -95,17 +76,6 @@
     }
 
     @Test
-    public void testSingleSourceMerge_exactCopyReturned() {
-        Set<SearchResult> intentResults = getIntentSampleResults();
-        mAdapter.initializeSearch("");
-        mAdapter.addSearchResults(intentResults, mLoaderClassName);
-        mAdapter.notifyResultsLoaded();
-
-        List<SearchResult> updatedResults = mAdapter.getSearchResults();
-        assertThat(updatedResults).containsAllIn(intentResults);
-    }
-
-    @Test
     public void testCreateViewHolder_returnsIntentResult() {
         ViewGroup group = new FrameLayout(mContext);
         SearchViewHolder view = mAdapter.onCreateViewHolder(group,
@@ -123,387 +93,13 @@
     }
 
     @Test
-    public void testEndToEndSearch_properResultsMerged_correctOrder() {
-        mAdapter.initializeSearch("");
-        mAdapter.addSearchResults(new HashSet<>(getDummyAppResults()),
-                InstalledAppResultLoader.class.getName());
-        mAdapter.addSearchResults(new HashSet<>(getDummyDbResults()),
-                DatabaseResultLoader.class.getName());
-        mAdapter.notifyResultsLoaded();
+    public void testPostSearchResults_addsDataAndDisplays() {
+        List<SearchResult> results = getDummyDbResults();
 
-        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);
-    }
+        mAdapter.postSearchResults(results);
 
-    @Test
-    public void testEndToEndSearch_addResults_resultsAddedInOrder() {
-        List<SearchResult> appResults = getDummyAppResults();
-        List<SearchResult> dbResults = getDummyDbResults();
-        mAdapter.initializeSearch("");
-        // Add two individual items
-        mAdapter.addSearchResults(new HashSet<>(appResults.subList(0, 1)),
-                InstalledAppResultLoader.class.getName());
-        mAdapter.addSearchResults(new HashSet<>(dbResults.subList(0, 1)),
-                DatabaseResultLoader.class.getName());
-        mAdapter.notifyResultsLoaded();
-        // Add super-set of items
-        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();
-        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<SearchResult> appResults = getDummyAppResults();
-        List<SearchResult> dbResults = getDummyDbResults();
-        // Add list of items
-        mAdapter.initializeSearch("");
-        mAdapter.addSearchResults(new HashSet<>(appResults),
-                InstalledAppResultLoader.class.getName());
-        mAdapter.addSearchResults(new HashSet<>(dbResults),
-                DatabaseResultLoader.class.getName());
-        mAdapter.notifyResultsLoaded();
-        // Add subset of items
-        mAdapter.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]);
-        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);
-        assertThat(mAdapter.getAsyncRankingState()).isEqualTo(SearchResultsAdapter.SUCCEEDED);
-    }
-
-    @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);
-        assertThat(mAdapter.getAsyncRankingState()).isEqualTo(SearchResultsAdapter.SUCCEEDED);
-    }
-
-    @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);
-        assertThat(mAdapter.getAsyncRankingState()).isEqualTo(SearchResultsAdapter.FAILED);
-    }
-
-    @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);
-        assertThat(mAdapter.getAsyncRankingState()).isEqualTo(SearchResultsAdapter.FAILED);
-    }
-
-    @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);
-        assertThat(mAdapter.getAsyncRankingState()).isEqualTo(SearchResultsAdapter.TIMED_OUT);
-    }
-
-    @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);
-        assertThat(mAdapter.getAsyncRankingState()).isEqualTo(SearchResultsAdapter.TIMED_OUT);
-    }
-
-    @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));
-        assertThat(mAdapter.getAsyncRankingState()).isEqualTo(SearchResultsAdapter.DISABLED);
-    }
-
-    @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));
-        assertThat(mAdapter.getAsyncRankingState())
-                .isEqualTo(SearchResultsAdapter.PENDING_RESULTS);
-    }
-
-    @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
-            }
-        }
+        assertThat(mAdapter.getSearchResults()).containsExactlyElementsIn(results);
+        verify(mFragment).onSearchResultsDisplayed(anyInt());
     }
 
     private List<SearchResult> getDummyDbResults() {
@@ -511,78 +107,21 @@
         ResultPayload payload = new ResultPayload(new Intent());
         SearchResult.Builder builder = new SearchResult.Builder();
         builder.setPayload(payload)
-                .setTitle(TITLES[0])
+                .setTitle("one")
                 .setRank(1)
-                .setStableId(Objects.hash(TITLES[0], "db"));
+                .setStableId(Objects.hash("one", "db"));
         results.add(builder.build());
 
-        builder.setTitle(TITLES[1])
+        builder.setTitle("two")
                 .setRank(3)
-                .setStableId(Objects.hash(TITLES[1], "db"));
+                .setStableId(Objects.hash("two", "db"));
         results.add(builder.build());
 
-        builder.setTitle(TITLES[2])
+        builder.setTitle("three")
                 .setRank(6)
-                .setStableId(Objects.hash(TITLES[2], "db"));
+                .setStableId(Objects.hash("three", "db"));
         results.add(builder.build());
 
         return results;
     }
-
-    private List<SearchResult> getDummyAppResults() {
-        List<SearchResult> results = new ArrayList<>();
-        ResultPayload payload = new ResultPayload(new Intent());
-        AppSearchResult.Builder builder = new AppSearchResult.Builder();
-        builder.setPayload(payload)
-                .setTitle(TITLES[3])
-                .setRank(1)
-                .setStableId(Objects.hash(TITLES[3], "app"));
-        results.add(builder.build());
-
-        builder.setTitle(TITLES[4])
-                .setRank(2)
-                .setStableId(Objects.hash(TITLES[4], "app"));
-        results.add(builder.build());
-
-        builder.setTitle(TITLES[5])
-                .setRank(4)
-                .setStableId(Objects.hash(TITLES[5], "app"));
-        results.add(builder.build());
-
-        return results;
-    }
-
-    private Set<SearchResult> getIntentSampleResults() {
-        Set<SearchResult> sampleResults = new HashSet<>();
-        ArrayList<String> breadcrumbs = new ArrayList<>();
-        final Drawable icon = mContext.getDrawable(R.drawable.ic_search_24dp);
-        final ResultPayload payload = new ResultPayload(null);
-        final SearchResult.Builder builder = new Builder();
-        builder.setTitle("title")
-                .setSummary("summary")
-                .setRank(1)
-                .addBreadcrumbs(breadcrumbs)
-                .setIcon(icon)
-                .setPayload(payload)
-                .setStableId(Objects.hash("title", "summary", 1));
-        sampleResults.add(builder.build());
-
-        builder.setRank(2)
-                .setStableId(Objects.hash("title", "summary", 2));
-        sampleResults.add(builder.build());
-
-        builder.setRank(3)
-                .setStableId(Objects.hash("title", "summary", 3));
-        sampleResults.add(builder.build());
-        return sampleResults;
-    }
-
-    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/search/SettingsSearchIndexablesProviderTest.java b/tests/robotests/src/com/android/settings/search/SettingsSearchIndexablesProviderTest.java
new file mode 100644
index 0000000..ac70a63
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/search/SettingsSearchIndexablesProviderTest.java
@@ -0,0 +1,119 @@
+package com.android.settings.search;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import static org.mockito.Mockito.spy;
+
+import android.Manifest;
+import android.content.Context;
+import android.content.pm.ProviderInfo;
+import android.database.Cursor;
+import android.net.Uri;
+import android.provider.SearchIndexablesContract;
+
+import com.android.settings.R;
+import com.android.settings.TestConfig;
+import com.android.settings.search.indexing.FakeSettingsFragment;
+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.robolectric.RuntimeEnvironment;
+import org.robolectric.annotation.Config;
+
+import java.util.HashSet;
+import java.util.Set;
+
+@RunWith(SettingsRobolectricTestRunner.class)
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION_O)
+public class SettingsSearchIndexablesProviderTest {
+
+    private final String BASE_AUTHORITY = "com.android.settings";
+
+    private SettingsSearchIndexablesProvider mProvider;
+
+    Set<Class> sProviderClasses;
+    Context mContext;
+
+    @Before
+    public void setUp() {
+        mContext = RuntimeEnvironment.application;
+
+        mProvider = spy(new SettingsSearchIndexablesProvider());
+        ProviderInfo info = new ProviderInfo();
+        info.exported = true;
+        info.grantUriPermissions = true;
+        info.authority = BASE_AUTHORITY;
+        info.readPermission = Manifest.permission.READ_SEARCH_INDEXABLES;
+        mProvider.attachInfo(mContext, info);
+
+        sProviderClasses = new HashSet<>(SearchIndexableResources.sProviders);
+        SearchIndexableResources.sProviders.clear();
+        SearchIndexableResources.sProviders.add(FakeSettingsFragment.class);
+    }
+
+    @After
+    public void cleanUp() {
+        SearchIndexableResources.sProviders.clear();
+        SearchIndexableResources.sProviders.addAll(sProviderClasses);
+    }
+
+    @Test
+    public void testRawColumnFetched() {
+        Uri rawUri = Uri.parse("content://" + BASE_AUTHORITY + "/" +
+                SearchIndexablesContract.INDEXABLES_RAW_PATH);
+
+        final Cursor cursor = mProvider.query(rawUri,
+                SearchIndexablesContract.INDEXABLES_RAW_COLUMNS, null, null, null);
+
+        cursor.moveToFirst();
+        assertThat(cursor.getString(1)).isEqualTo(FakeSettingsFragment.TITLE);
+        assertThat(cursor.getString(2)).isEqualTo(FakeSettingsFragment.SUMMARY_ON);
+        assertThat(cursor.getString(3)).isEqualTo(FakeSettingsFragment.SUMMARY_OFF);
+        assertThat(cursor.getString(4)).isEqualTo(FakeSettingsFragment.ENTRIES);
+        assertThat(cursor.getString(5)).isEqualTo(FakeSettingsFragment.KEYWORDS);
+        assertThat(cursor.getString(6)).isEqualTo(FakeSettingsFragment.SCREEN_TITLE);
+        assertThat(cursor.getString(7)).isEqualTo(FakeSettingsFragment.CLASS_NAME);
+        assertThat(cursor.getInt(8)).isEqualTo(FakeSettingsFragment.ICON);
+        assertThat(cursor.getString(9)).isEqualTo(FakeSettingsFragment.INTENT_ACTION);
+        assertThat(cursor.getString(10)).isEqualTo(FakeSettingsFragment.TARGET_PACKAGE);
+        assertThat(cursor.getString(11)).isEqualTo(FakeSettingsFragment.TARGET_CLASS);
+        assertThat(cursor.getString(12)).isEqualTo(FakeSettingsFragment.KEY);
+    }
+
+    @Test
+    public void testResourcesColumnFetched() {
+        Uri rawUri = Uri.parse("content://" + BASE_AUTHORITY + "/" +
+                SearchIndexablesContract.INDEXABLES_XML_RES_PATH);
+
+        final Cursor cursor = mProvider.query(rawUri,
+                SearchIndexablesContract.INDEXABLES_XML_RES_COLUMNS, null, null, null);
+
+        cursor.moveToFirst();
+        assertThat(cursor.getCount()).isEqualTo(1);
+        assertThat(cursor.getInt(1)).isEqualTo(R.xml.display_settings);
+        assertThat(cursor.getString(2)).isEqualTo(FakeSettingsFragment.CLASS_NAME);
+        assertThat(cursor.getInt(3)).isEqualTo(0);
+        assertThat(cursor.getString(4)).isNull();
+        assertThat(cursor.getString(5)).isNull();
+        assertThat(cursor.getString(6)).isNull();
+    }
+
+    @Test
+    public void testNonIndexablesColumnFetched() {
+        Uri rawUri = Uri.parse("content://" + BASE_AUTHORITY + "/" +
+                SearchIndexablesContract.NON_INDEXABLES_KEYS_PATH);
+        //final ContentResolver resolver = mContext.getContentResolver();
+
+        final Cursor cursor = mProvider.query(rawUri,
+                SearchIndexablesContract.NON_INDEXABLES_KEYS_COLUMNS, null, null, null);
+
+        cursor.moveToFirst();
+        assertThat(cursor.getCount()).isEqualTo(2);
+        assertThat(cursor.getString(0)).isEqualTo("pref_key_1");
+        cursor.moveToNext();
+        assertThat(cursor.getString(0)).isEqualTo("pref_key_3");
+    }
+}
diff --git a/tests/robotests/src/com/android/settings/search/SiteMapManagerTest.java b/tests/robotests/src/com/android/settings/search/SiteMapManagerTest.java
deleted file mode 100644
index b441b66..0000000
--- a/tests/robotests/src/com/android/settings/search/SiteMapManagerTest.java
+++ /dev/null
@@ -1,145 +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.search;
-
-import android.content.ContentValues;
-import android.content.Context;
-import android.database.sqlite.SQLiteDatabase;
-import android.os.Bundle;
-
-import com.android.settings.SettingsActivity;
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.TestConfig;
-import com.android.settings.dashboard.SiteMapManager;
-import com.android.settings.search.IndexDatabaseHelper.SiteMapColumns;
-import com.android.settings.system.SystemDashboardFragment;
-import com.android.settings.testutils.DatabaseTestUtils;
-import com.android.settings.testutils.FakeFeatureFactory;
-import com.android.settingslib.drawer.CategoryKey;
-import com.android.settingslib.drawer.DashboardCategory;
-import com.android.settingslib.drawer.Tile;
-
-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.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)
-public class SiteMapManagerTest {
-
-    private static final int STATIC_DB_DEPTH = 4;
-    private static final String CLASS_PREFIX = "class_";
-    private static final String TITLE_PREFIX = "title_";
-
-    @Mock(answer = Answers.RETURNS_DEEP_STUBS)
-    private Context mMockContext;
-    private Context mContext;
-    private SQLiteDatabase mDb;
-    private SiteMapManager mSiteMapManager;
-    private FakeFeatureFactory mFeatureFactory;
-
-    @Before
-    public void setUp() {
-        MockitoAnnotations.initMocks(this);
-        FakeFeatureFactory.setupForTest(mMockContext);
-        mFeatureFactory = (FakeFeatureFactory) FakeFeatureFactory.getFactory(mMockContext);
-
-        mContext = RuntimeEnvironment.application;
-        mDb = IndexDatabaseHelper.getInstance(mContext).getWritableDatabase();
-        buildDb();
-        mSiteMapManager = new SiteMapManager();
-    }
-
-    @After
-    public void cleanUp() {
-        DatabaseTestUtils.clearDb(mContext);
-    }
-
-    @Test
-    public void buildBreadCrumb_onlyFromSiteMapDb_breadcrumbShouldLinkUp() {
-        List<String> breadcrumb = mSiteMapManager.buildBreadCrumb(mContext,
-                CLASS_PREFIX + 0, TITLE_PREFIX + 0);
-        assertThat(breadcrumb.size()).isEqualTo(STATIC_DB_DEPTH + 1);
-        for (int i = 0; i < STATIC_DB_DEPTH; i++) {
-            assertThat(breadcrumb.get(i)).isEqualTo(TITLE_PREFIX + (STATIC_DB_DEPTH - i));
-        }
-    }
-
-    @Test
-    public void buildBreadCrumb_fromSiteMapDbAndDashboardProvider_breadcrumbShouldLinkUp() {
-        final String iaClass = SystemDashboardFragment.class.getName();
-        final String iaTitle = "ia_title";
-
-        ContentValues index = new ContentValues();
-        index.put(IndexDatabaseHelper.IndexColumns.CLASS_NAME, iaClass);
-        index.put(IndexDatabaseHelper.IndexColumns.SCREEN_TITLE, iaTitle);
-        mDb.replaceOrThrow(IndexDatabaseHelper.Tables.TABLE_PREFS_INDEX, null, index);
-
-        final DashboardCategory category = new DashboardCategory();
-        category.key = CategoryKey.CATEGORY_SYSTEM;
-        category.tiles.add(new Tile());
-        category.tiles.get(0).title = TITLE_PREFIX + STATIC_DB_DEPTH;
-        category.tiles.get(0).metaData = new Bundle();
-        category.tiles.get(0).metaData.putString(SettingsActivity.META_DATA_KEY_FRAGMENT_CLASS,
-                CLASS_PREFIX + STATIC_DB_DEPTH);
-        when(mFeatureFactory.dashboardFeatureProvider.getAllCategories())
-                .thenReturn(Arrays.asList(category));
-
-        final List<String> breadcrumb = mSiteMapManager.buildBreadCrumb(mContext,
-                CLASS_PREFIX + 0, TITLE_PREFIX + 0);
-
-        assertThat(breadcrumb.size()).isEqualTo(STATIC_DB_DEPTH + 2);
-        assertThat(breadcrumb.get(0))
-                .isEqualTo(iaTitle);
-    }
-
-    @Test
-    public void buildBreadCrumb_classNotIndexed_shouldNotHaveBreadCrumb() {
-        final String title = "wrong_title";
-
-        final List<String> breadcrumb = mSiteMapManager.buildBreadCrumb(mContext,
-                "wrong_class", title);
-
-        assertThat(breadcrumb.size()).isEqualTo(1);
-        assertThat(breadcrumb.get(0)).isEqualTo(title);
-    }
-
-    private void buildDb() {
-        for (int i = 0; i < STATIC_DB_DEPTH; i++) {
-            final ContentValues siteMapPair = new ContentValues();
-            siteMapPair.put(SiteMapColumns.DOCID, i);
-            siteMapPair.put(SiteMapColumns.PARENT_CLASS, CLASS_PREFIX + (i + 1));
-            siteMapPair.put(SiteMapColumns.PARENT_TITLE, TITLE_PREFIX + (i + 1));
-            siteMapPair.put(SiteMapColumns.CHILD_CLASS, CLASS_PREFIX + i);
-            siteMapPair.put(SiteMapColumns.CHILD_TITLE, TITLE_PREFIX + i);
-            mDb.replaceOrThrow(IndexDatabaseHelper.Tables.TABLE_SITE_MAP, null, siteMapPair);
-        }
-    }
-}
diff --git a/tests/robotests/src/com/android/settings/search/StaticSearchResultFutureTaskTest.java b/tests/robotests/src/com/android/settings/search/StaticSearchResultFutureTaskTest.java
new file mode 100644
index 0000000..31026fc
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/search/StaticSearchResultFutureTaskTest.java
@@ -0,0 +1,517 @@
+/*
+ * Copyright (C) 2017 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF 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 android.util.Pair;
+
+import com.android.settings.TestConfig;
+import com.android.settings.dashboard.SiteMapManager;
+import com.android.settings.search.DatabaseResultLoader.StaticSearchResultCallable;
+import com.android.settings.search.indexing.IndexData;
+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.ArrayList;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+import java.util.concurrent.Callable;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.FutureTask;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.TimeoutException;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.anyLong;
+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_O)
+public class StaticSearchResultFutureTaskTest {
+
+    @Mock(answer = Answers.RETURNS_DEEP_STUBS)
+    private Context mMockContext;
+    @Mock
+    private SiteMapManager mSiteMapManager;
+    @Mock
+    private ExecutorService mService;
+    private Context mContext;
+
+    SQLiteDatabase mDb;
+
+    FakeFeatureFactory mFeatureFactory;
+
+    private final String[] STATIC_TITLES = {"static one", "static two", "static three"};
+    private final int[] STABLE_IDS =
+            {"id_one".hashCode(), "id_two".hashCode(), "id_three".hashCode()};
+
+    @Before
+    public void setUp() {
+        MockitoAnnotations.initMocks(this);
+        mContext = RuntimeEnvironment.application;
+        mFeatureFactory = FakeFeatureFactory.setupForTest(mMockContext);
+        when(mFeatureFactory.searchFeatureProvider.getExecutorService()).thenReturn(mService);
+        when(mFeatureFactory.searchFeatureProvider.getSiteMapManager())
+                .thenReturn(mSiteMapManager);
+        mDb = IndexDatabaseHelper.getInstance(mContext).getWritableDatabase();
+        setUpDb();
+    }
+
+    @After
+    public void cleanUp() {
+        DatabaseTestUtils.clearDb(mContext);
+    }
+
+    @Test
+    public void testMatchTitle() throws Exception {
+        StaticSearchResultCallable loader = new StaticSearchResultCallable(mContext, "title",
+                mSiteMapManager);
+
+        assertThat(loader.call()).hasSize(2);
+        verify(mSiteMapManager, times(2)).buildBreadCrumb(eq(mContext), anyString(), anyString());
+    }
+
+    @Test
+    public void testMatchSummary() throws Exception {
+        StaticSearchResultCallable loader = new StaticSearchResultCallable(mContext, "summary",
+                mSiteMapManager);
+
+        assertThat(loader.call()).hasSize(2);
+    }
+
+    @Test
+    public void testMatchKeywords() throws Exception {
+        StaticSearchResultCallable loader = new StaticSearchResultCallable(mContext, "keywords",
+                mSiteMapManager);
+
+        assertThat(loader.call()).hasSize(2);
+    }
+
+    @Test
+    public void testMatchEntries() throws Exception {
+        StaticSearchResultCallable loader = new StaticSearchResultCallable(mContext, "entries",
+                mSiteMapManager);
+
+        assertThat(loader.call()).hasSize(2);
+    }
+
+    @Test
+    public void testSpecialCaseWord_matchesNonPrefix() throws Exception {
+        insertSpecialCase("Data usage");
+
+        StaticSearchResultCallable loader = new StaticSearchResultCallable(mContext, "usage",
+                mSiteMapManager);
+
+        assertThat(loader.call()).hasSize(1);
+    }
+
+    @Test
+    public void testSpecialCaseDash_matchesWordNoDash() throws Exception {
+        insertSpecialCase("wi-fi calling");
+
+        StaticSearchResultCallable loader = new StaticSearchResultCallable(mContext, "wifi",
+                mSiteMapManager);
+
+        assertThat(loader.call()).hasSize(1);
+    }
+
+    @Test
+    public void testSpecialCaseDash_matchesWordWithDash() throws Exception {
+        insertSpecialCase("priorités seulment");
+
+        StaticSearchResultCallable loader = new StaticSearchResultCallable(mContext, "priorités",
+                mSiteMapManager);
+
+        assertThat(loader.call()).hasSize(1);
+    }
+
+    @Test
+    public void testSpecialCaseDash_matchesWordWithoutDash() throws Exception {
+        insertSpecialCase("priorités seulment");
+
+        StaticSearchResultCallable loader = new StaticSearchResultCallable(mContext, "priorites",
+                mSiteMapManager);
+
+        assertThat(loader.call()).hasSize(1);
+    }
+
+    @Test
+    public void testSpecialCaseDash_matchesEntireQueryWithoutDash() throws Exception {
+        insertSpecialCase("wi-fi calling");
+
+        StaticSearchResultCallable loader = new StaticSearchResultCallable(mContext, "wifi calling",
+                mSiteMapManager);
+
+        assertThat(loader.call()).hasSize(1);
+    }
+
+    @Test
+    public void testSpecialCasePrefix_matchesPrefixOfEntry() throws Exception {
+        insertSpecialCase("Photos");
+
+        StaticSearchResultCallable loader = new StaticSearchResultCallable(mContext, "pho",
+                mSiteMapManager);
+
+        assertThat(loader.call()).hasSize(1);
+    }
+
+    @Test
+    public void testSpecialCasePrefix_DoesNotMatchNonPrefixSubstring() throws Exception {
+        insertSpecialCase("Photos");
+
+        StaticSearchResultCallable loader = new StaticSearchResultCallable(mContext, "hot",
+                mSiteMapManager);
+
+        assertThat(loader.call()).hasSize(0);
+    }
+
+    @Test
+    public void testSpecialCaseMultiWordPrefix_matchesPrefixOfEntry() throws Exception {
+        insertSpecialCase("Apps Notifications");
+
+        StaticSearchResultCallable loader = new StaticSearchResultCallable(mContext, "Apps",
+                mSiteMapManager);
+
+        assertThat(loader.call()).hasSize(1);
+    }
+
+    @Test
+    public void testSpecialCaseMultiWordPrefix_matchesSecondWordPrefixOfEntry() throws Exception {
+        insertSpecialCase("Apps Notifications");
+
+        StaticSearchResultCallable loader = new StaticSearchResultCallable(mContext, "Not",
+                mSiteMapManager);
+
+        assertThat(loader.call()).hasSize(1);
+    }
+
+    @Test
+    public void testSpecialCaseMultiWordPrefix_DoesNotMatchMatchesPrefixOfFirstEntry()
+            throws Exception {
+        insertSpecialCase("Apps Notifications");
+
+        StaticSearchResultCallable loader = new StaticSearchResultCallable(mContext, "pp",
+                mSiteMapManager);
+
+        assertThat(loader.call()).hasSize(0);
+    }
+
+    @Test
+    public void testSpecialCaseMultiWordPrefix_DoesNotMatchMatchesPrefixOfSecondEntry()
+            throws Exception {
+        insertSpecialCase("Apps Notifications");
+
+        StaticSearchResultCallable loader = new StaticSearchResultCallable(mContext, "tion",
+                mSiteMapManager);
+
+        assertThat(loader.call()).hasSize(0);
+    }
+
+    @Test
+    public void testSpecialCaseMultiWordPrefixWithSpecial_matchesPrefixOfEntry() throws
+            Exception {
+        insertSpecialCase("Apps & Notifications");
+
+        StaticSearchResultCallable loader = new StaticSearchResultCallable(mContext, "App",
+                mSiteMapManager);
+
+        assertThat(loader.call()).hasSize(1);
+    }
+
+    @Test
+    public void testSpecialCaseMultiWordPrefixWithSpecial_matchesPrefixOfSecondEntry()
+            throws Exception {
+        insertSpecialCase("Apps & Notifications");
+
+        StaticSearchResultCallable loader = new StaticSearchResultCallable(mContext, "No",
+                mSiteMapManager);
+
+        assertThat(loader.call()).hasSize(1);
+    }
+
+    @Test
+    public void testResultMatchedByMultipleQueries_duplicatesRemoved() throws Exception {
+        String key = "durr";
+        insertSameValueAllFieldsCase(key);
+
+        StaticSearchResultCallable loader = new StaticSearchResultCallable(mContext, key, null);
+
+        assertThat(loader.call()).hasSize(1);
+    }
+
+    @Test
+    public void testSpecialCaseTwoWords_multipleResults() throws Exception {
+        final String caseOne = "Apple pear";
+        final String caseTwo = "Banana apple";
+        insertSpecialCase(caseOne);
+        insertSpecialCase(caseTwo);
+        StaticSearchResultCallable loader = new StaticSearchResultCallable(mContext, "App", null);
+
+        List<? extends SearchResult> results = loader.call();
+
+        Set<String> actualTitles = new HashSet<>();
+        for (SearchResult result : results) {
+            actualTitles.add(result.title.toString());
+        }
+        assertThat(actualTitles).containsAllOf(caseOne, caseTwo);
+    }
+
+    @Test
+    public void testGetRankingScoreByStableId_sortedDynamically() throws Exception {
+        FutureTask<List<Pair<String, Float>>> task = mock(FutureTask.class);
+        when(task.get(anyLong(), any(TimeUnit.class))).thenReturn(getDummyRankingScores());
+        when(mFeatureFactory.searchFeatureProvider.getRankerTask(any(Context.class),
+                anyString())).thenReturn(task);
+        when(mFeatureFactory.searchFeatureProvider.isSmartSearchRankingEnabled(any())).thenReturn(
+                true);
+
+        insertSpecialCase(STATIC_TITLES[0], STABLE_IDS[0]);
+        insertSpecialCase(STATIC_TITLES[1], STABLE_IDS[1]);
+        insertSpecialCase(STATIC_TITLES[2], STABLE_IDS[2]);
+
+        StaticSearchResultCallable loader = new StaticSearchResultCallable(mContext, "Static",
+                null);
+
+        List<? extends SearchResult> results = loader.call();
+
+        assertThat(results.get(0).title).isEqualTo(STATIC_TITLES[2]);
+        assertThat(results.get(1).title).isEqualTo(STATIC_TITLES[0]);
+        assertThat(results.get(2).title).isEqualTo(STATIC_TITLES[1]);
+    }
+
+    @Test
+    public void testGetRankingScoreByStableId_scoresTimeout_sortedStatically() throws Exception {
+        Callable<List<Pair<String, Float>>> callable = mock(Callable.class);
+        when(callable.call()).thenThrow(new TimeoutException());
+        FutureTask<List<Pair<String, Float>>> task = new FutureTask<>(callable);
+        when(mFeatureFactory.searchFeatureProvider.isSmartSearchRankingEnabled(any())).thenReturn(
+                true);
+        when(mFeatureFactory.searchFeatureProvider.getRankerTask(any(Context.class),
+                anyString())).thenReturn(task);
+        insertSpecialCase("title", STABLE_IDS[0]);
+
+        StaticSearchResultCallable loader = new StaticSearchResultCallable(mContext, "title", null);
+
+        List<? extends SearchResult> results = loader.call();
+        assertThat(results.get(0).title).isEqualTo("title");
+        assertThat(results.get(1).title).isEqualTo("alpha_title");
+        assertThat(results.get(2).title).isEqualTo("bravo_title");
+    }
+
+    private void insertSpecialCase(String specialCase) {
+        insertSpecialCase(specialCase, specialCase.hashCode());
+    }
+
+    private void insertSpecialCase(String specialCase, int docId) {
+        String normalized = IndexData.normalizeHyphen(specialCase);
+        normalized = IndexData.normalizeString(normalized);
+        final ResultPayload payload = new ResultPayload(new Intent());
+
+        ContentValues values = new ContentValues();
+        values.put(IndexDatabaseHelper.IndexColumns.DOCID, docId);
+        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);
+    }
+
+    private List<? extends SearchResult> getDummyDbResults() {
+        List<SearchResult> results = new ArrayList<>();
+        ResultPayload payload = new ResultPayload(new Intent());
+        SearchResult.Builder builder = new SearchResult.Builder();
+        builder.setPayload(payload)
+                .setTitle(STATIC_TITLES[0])
+                .setStableId(STABLE_IDS[0]);
+        results.add(builder.build());
+
+        builder.setTitle(STATIC_TITLES[1])
+                .setStableId(STABLE_IDS[1]);
+        results.add(builder.build());
+
+        builder.setTitle(STATIC_TITLES[2])
+                .setStableId(STABLE_IDS[2]);
+        results.add(builder.build());
+
+        return results;
+    }
+
+    private List<Pair<String, Float>> getDummyRankingScores() {
+        List<? extends SearchResult> results = getDummyDbResults();
+        List<Pair<String, Float>> scores = new ArrayList<>();
+        scores.add(new Pair<>(Long.toString(results.get(2).stableId), 0.9f)); // static_three
+        scores.add(new Pair<>(Long.toString(results.get(0).stableId), 0.8f)); // static_one
+        scores.add(new Pair<>(Long.toString(results.get(1).stableId), 0.2f)); // static_two
+        return scores;
+    }
+}
\ No newline at end of file
diff --git a/tests/robotests/src/com/android/settings/search/XmlParserUtilTest.java b/tests/robotests/src/com/android/settings/search/XmlParserUtilTest.java
index 5d2a977..4a9baa1 100644
--- a/tests/robotests/src/com/android/settings/search/XmlParserUtilTest.java
+++ b/tests/robotests/src/com/android/settings/search/XmlParserUtilTest.java
@@ -17,14 +17,16 @@
 
 package com.android.settings.search;
 
-import android.content.res.XmlResourceParser;
+import static com.google.common.truth.Truth.assertThat;
+
 import android.content.Context;
+import android.content.res.XmlResourceParser;
 import android.util.AttributeSet;
 import android.util.Xml;
 
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.TestConfig;
 import com.android.settings.R;
+import com.android.settings.TestConfig;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 
 import org.junit.Before;
 import org.junit.Test;
@@ -33,8 +35,6 @@
 import org.robolectric.shadows.ShadowApplication;
 import org.xmlpull.v1.XmlPullParser;
 
-import static com.google.common.truth.Truth.assertThat;
-
 /**
  * These tests use a series of preferences that have specific attributes which are sometimes
  * uncommon (such as summaryOn).
@@ -43,7 +43,7 @@
  * with another preference with a matchin replacement attribute.
  */
 @RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION_O)
 public class XmlParserUtilTest {
 
     private Context mContext;
@@ -94,26 +94,21 @@
     }
 
     @Test
-    public void testDataSummaryOnValid_ReturnsPreferenceSummaryOn() {
-        XmlResourceParser parser = getChildByType(R.xml.application_settings, "CheckBoxPreference");
+    @Config(qualifiers = "mcc999")
+    public void testDataSummaryOnOffValid_ReturnsPreferenceSummaryOnOff() {
+        XmlResourceParser parser = getChildByType(R.xml.display_settings, "CheckBoxPreference");
         final AttributeSet attrs = Xml.asAttributeSet(parser);
-        String summary = XmlParserUtils.getDataSummaryOn(mContext, attrs);
-        String expSummary = mContext.getString(R.string.advanced_settings_summary);
-        assertThat(summary).isEqualTo(expSummary);
+
+        assertThat(XmlParserUtils.getDataSummaryOn(mContext, attrs))
+                .isEqualTo("summary_on");
+        assertThat(XmlParserUtils.getDataSummaryOff(mContext, attrs))
+                .isEqualTo("summary_off");
     }
 
     @Test
-    public void testDataSummaryOffValid_ReturnsPreferenceSummaryOff() {
-        XmlResourceParser parser = getChildByType(R.xml.application_settings, "CheckBoxPreference");
-        final AttributeSet attrs = Xml.asAttributeSet(parser);
-        String summary = XmlParserUtils.getDataSummaryOff(mContext, attrs);
-        String expSummary = mContext.getString(R.string.advanced_settings_summary);
-        assertThat(summary).isEqualTo(expSummary);
-    }
-
-    @Test
+    @Config(qualifiers = "mcc999")
     public void testDataEntriesValid_ReturnsPreferenceEntries() {
-        XmlResourceParser parser = getChildByType(R.xml.application_settings, "ListPreference");
+        XmlResourceParser parser = getChildByType(R.xml.display_settings, "ListPreference");
         final AttributeSet attrs = Xml.asAttributeSet(parser);
         String entries = XmlParserUtils.getDataEntries(mContext, attrs);
         String[] expEntries = mContext.getResources()
@@ -124,8 +119,8 @@
     }
 
     // Null checks
-
     @Test
+    @Config(qualifiers = "mcc999")
     public void testDataKeyInvalid_ReturnsNull() {
         XmlResourceParser parser = getParentPrimedParser(R.xml.display_settings);
         final AttributeSet attrs = Xml.asAttributeSet(parser);
@@ -185,7 +180,7 @@
             while ((type = parser.next()) != XmlPullParser.END_DOCUMENT
                     && type != XmlPullParser.START_TAG) {
             }
-            while(parser.getName() != xmlType) {
+            while (parser.getName() != xmlType) {
                 parser.next();
             }
         } catch (Exception e) {
diff --git a/tests/robotests/src/com/android/settings/search/actionbar/SearchMenuControllerTest.java b/tests/robotests/src/com/android/settings/search/actionbar/SearchMenuControllerTest.java
new file mode 100644
index 0000000..52918fb
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/search/actionbar/SearchMenuControllerTest.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.search.actionbar;
+
+import static org.mockito.Matchers.nullable;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.verifyZeroInteractions;
+import static org.mockito.Mockito.when;
+
+import android.content.Context;
+import android.os.Bundle;
+import android.view.Menu;
+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.core.lifecycle.ObservablePreferenceFragment;
+
+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_O)
+public class SearchMenuControllerTest {
+
+    @Mock
+    private Menu mMenu;
+    private TestFragment mHost;
+    private FakeFeatureFactory mFeatureFactory;
+
+    @Before
+    public void setUp() {
+        MockitoAnnotations.initMocks(this);
+        mHost = new TestFragment();
+        mFeatureFactory = FakeFeatureFactory.setupForTest();
+    }
+
+    @Test
+    public void init_searchV2Disabled_shouldNotAddMenu() {
+        when(mFeatureFactory.searchFeatureProvider.isSearchV2Enabled(nullable(Context.class)))
+                .thenReturn(false);
+
+        SearchMenuController.init(mHost);
+        mHost.getLifecycle().onCreateOptionsMenu(mMenu, null /* inflater */);
+
+        verifyZeroInteractions(mMenu);
+    }
+
+    @Test
+    public void init_searchV2Enabled_shouldAddMenu() {
+        when(mFeatureFactory.searchFeatureProvider.isSearchV2Enabled(nullable(Context.class)))
+                .thenReturn(true);
+        when(mMenu.add(Menu.NONE, Menu.NONE, 0 /* order */, R.string.search_menu))
+                .thenReturn(mock(MenuItem.class));
+
+        SearchMenuController.init(mHost);
+        mHost.getLifecycle().onCreateOptionsMenu(mMenu, null /* inflater */);
+
+        verify(mMenu).add(Menu.NONE, Menu.NONE, 0 /* order */, R.string.search_menu);
+    }
+
+    public static class TestFragment extends ObservablePreferenceFragment {
+
+        @Override
+        public void onCreatePreferences(Bundle savedInstanceState, String rootKey) {
+
+        }
+    }
+}
diff --git a/tests/robotests/src/com/android/settings/search/indexing/FakeSettingsFragment.java b/tests/robotests/src/com/android/settings/search/indexing/FakeSettingsFragment.java
new file mode 100644
index 0000000..e857ae4
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/search/indexing/FakeSettingsFragment.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.search.indexing;
+
+import android.content.Context;
+import android.provider.SearchIndexableResource;
+
+import com.android.internal.logging.nano.MetricsProto;
+import com.android.settings.dashboard.DashboardFragment;
+import com.android.settings.search.BaseSearchIndexProvider;
+import com.android.settings.search.SearchIndexableRaw;
+import com.android.settingslib.core.AbstractPreferenceController;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * Test class for Settings Search Indexing.
+ * If you change this class, please run robotests to make sure they still pass.
+ */
+public class FakeSettingsFragment extends DashboardFragment {
+
+    public static final String TITLE = "raw title";
+    public static final String SUMMARY_ON = "raw summary on";
+    public static final String SUMMARY_OFF = "raw summary off";
+    public static final String ENTRIES = "rawentries";
+    public static final String KEYWORDS = "keywords, keywordss, keywordsss";
+    public static final String SPACE_KEYWORDS = "keywords keywordss keywordsss";
+    public static final String SCREEN_TITLE = "raw screen title";
+    public static final String CLASS_NAME = FakeSettingsFragment.class.getName();
+    public static final int ICON = 0xff;
+    public static final String INTENT_ACTION = "raw action";
+    public static final String PACKAGE_NAME = "raw target package";
+    public static final String TARGET_CLASS = "raw target class";
+    public static final String TARGET_PACKAGE = "raw package name";
+    public static final String KEY = "raw key";
+    public static final boolean ENABLED = true;
+
+
+    @Override
+    public int getMetricsCategory() {
+        return MetricsProto.MetricsEvent.DISPLAY;
+    }
+
+    @Override
+    protected String getLogTag() {
+        return "";
+    }
+
+    @Override
+    protected int getPreferenceScreenResId() {
+        return com.android.settings.R.xml.display_settings;
+    }
+
+    @Override
+    protected List<AbstractPreferenceController> getPreferenceControllers(Context context) {
+        return null;
+    }
+
+    /** Index provider used to expose this fragment in search. */
+    public static final SearchIndexProvider SEARCH_INDEX_DATA_PROVIDER =
+            new BaseSearchIndexProvider() {
+                @Override
+                public List<SearchIndexableRaw> getRawDataToIndex(Context context,
+                        boolean enabled) {
+                    final SearchIndexableRaw data = new SearchIndexableRaw(context);
+                    data.title = TITLE;
+                    data.summaryOn = SUMMARY_ON;
+                    data.summaryOff = SUMMARY_OFF;
+                    data.entries = ENTRIES;
+                    data.keywords = KEYWORDS;
+                    data.screenTitle = SCREEN_TITLE;
+                    data.packageName = PACKAGE_NAME;
+                    data.intentAction = INTENT_ACTION;
+                    data.intentTargetClass = TARGET_CLASS;
+                    data.intentTargetPackage = TARGET_PACKAGE;
+                    data.key = KEY;
+                    data.iconResId = ICON;
+                    data.enabled = ENABLED;
+
+                    final List<SearchIndexableRaw> result = new ArrayList<>(1);
+                    result.add(data);
+                    return result;
+                }
+
+                @Override
+                public List<SearchIndexableResource> getXmlResourcesToIndex(Context context,
+                        boolean enabled) {
+                    final ArrayList<SearchIndexableResource> result = new ArrayList<>();
+
+                    final SearchIndexableResource sir = new SearchIndexableResource(context);
+                    sir.xmlResId = com.android.settings.R.xml.display_settings;
+                    result.add(sir);
+                    return result;
+                }
+
+                @Override
+                public List<String> getNonIndexableKeys(Context context) {
+                    List<String> keys = super.getNonIndexableKeys(context);
+                    keys.add("pref_key_1");
+                    keys.add("pref_key_3");
+                    return keys;
+                }
+
+                @Override
+                public List<AbstractPreferenceController>
+                getPreferenceControllers(Context context) {
+                    return null;
+                }
+            };
+}
\ No newline at end of file
diff --git a/tests/robotests/src/com/android/settings/search/indexing/IndexDataConverterTest.java b/tests/robotests/src/com/android/settings/search/indexing/IndexDataConverterTest.java
new file mode 100644
index 0000000..58003c4
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/search/indexing/IndexDataConverterTest.java
@@ -0,0 +1,391 @@
+/*
+ * Copyright (C) 2017 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF 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.indexing;
+
+import android.content.Context;
+import android.provider.SearchIndexableResource;
+import android.text.TextUtils;
+
+import com.android.settings.TestConfig;
+import com.android.settings.R;
+import com.android.settings.search.ResultPayload;
+import com.android.settings.search.ResultPayloadUtils;
+import com.android.settings.search.SearchIndexableRaw;
+import com.android.settings.testutils.DatabaseTestUtils;
+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.robolectric.RuntimeEnvironment;
+import org.robolectric.annotation.Config;
+
+import java.util.HashSet;
+import java.util.List;
+import java.util.Locale;
+import java.util.Set;
+
+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_O, qualifiers = "mcc999")
+public class IndexDataConverterTest {
+
+    private final String localeStr = "en_US";
+
+    private static final String title = "title\u2011title";
+    private static final String updatedTitle = "title-title";
+    private static final String normalizedTitle = "titletitle";
+    private static final String summaryOn = "summary\u2011on";
+    private static final String updatedSummaryOn = "summary-on";
+    private static final String summaryOff = "summary\u2011off";
+    private static final String entries = "entries";
+    private static final String keywords = "keywords, keywordss, keywordsss";
+    private static final String spaceDelimittedKeywords = "keywords keywordss keywordsss";
+    private static final String screenTitle = "screen title";
+    private static final String className = "class name";
+    private static final int iconResId = 0xff;
+    private static final String action = "action";
+    private static final String targetPackage = "target package";
+    private static final String targetClass = "target class";
+    private static final String packageName = "package name";
+    private static final String key = "key";
+    private static final int userId = -1;
+    private static final boolean enabled = true;
+
+    // There are 6 entries in the fake display_settings.xml preference.
+    private final int NUM_DISPLAY_ENTRIES = 6;
+    private static final String PAGE_TITLE = "page_title";
+    private static final String TITLE_ONE = "pref_title_1";
+    private static final String TITLE_TWO = "pref_title_2";
+    private static final String TITLE_THREE = "pref_title_3";
+    private static final String TITLE_FOUR = "pref_title_4";
+    private static final String TITLE_FIVE = "pref_title_5";
+    private static final String DISPLAY_SPACE_DELIM_KEYWORDS = "keywords1 keywords2 keywords3";
+
+    // There are 6 display entries from resources, and 1 raw.
+    private static final int NUM_FAKE_FRAGMENT_ENTRIES = 7;
+    private static final int NUM_ENABLED_FAKE_FRAGMENT_ENTRIES = 5;
+    private static final String FAKE_CLASS_NAME =
+            "com.android.settings.search.indexing.FakeSettingsFragment";
+
+    // There is a title and one preference.
+    private final int NUM_LEGAL_SETTINGS = 2;
+
+    private Context mContext;
+
+    private IndexDataConverter mConverter;
+
+    @Before
+    public void setUp() {
+        mContext = spy(RuntimeEnvironment.application);
+        mConverter = spy(new IndexDataConverter(mContext));
+    }
+
+    @After
+    public void cleanUp() {
+        DatabaseTestUtils.clearDb(mContext);
+    }
+
+    @Test
+    public void testInsertRawColumn_rowConverted() {
+        final SearchIndexableRaw raw = getFakeRaw();
+        final PreIndexData preIndexData = new PreIndexData();
+        preIndexData.dataToUpdate.add(raw);
+        List<IndexData> indexData = mConverter.convertPreIndexDataToIndexData(preIndexData);
+
+        assertThat(indexData.size()).isEqualTo(1);
+        final IndexData row = indexData.get(0);
+
+        assertThat(row.normalizedTitle).isEqualTo(normalizedTitle);
+        assertThat(row.updatedTitle).isEqualTo(updatedTitle);
+        assertThat(row.locale).isEqualTo(localeStr);
+        assertThat(row.updatedSummaryOn).isEqualTo(updatedSummaryOn);
+        assertThat(row.entries).isEqualTo(entries);
+        assertThat(row.spaceDelimitedKeywords).isEqualTo(spaceDelimittedKeywords);
+        assertThat(row.screenTitle).isEqualTo(screenTitle);
+        assertThat(row.className).isEqualTo(className);
+        assertThat(row.iconResId).isEqualTo(iconResId);
+        assertThat(row.intentAction).isEqualTo(action);
+        assertThat(row.intentTargetPackage).isEqualTo(targetPackage);
+        assertThat(row.intentTargetClass).isEqualTo(targetClass);
+        assertThat(row.enabled).isEqualTo(enabled);
+        assertThat(row.key).isEqualTo(key);
+        assertThat(row.userId).isEqualTo(userId);
+        assertThat(row.payloadType).isEqualTo(0);
+        ResultPayload unmarshalledPayload = ResultPayloadUtils.unmarshall(row.payload,
+                ResultPayload.CREATOR);
+        assertThat(unmarshalledPayload).isInstanceOf(ResultPayload.class);
+    }
+
+    @Test
+    public void testInsertRawColumn_nonIndexableKey_resultIsDisabled() {
+        final SearchIndexableRaw raw = getFakeRaw();
+        // Add non-indexable key for raw row.
+        Set<String> keys = new HashSet<>();
+        keys.add(raw.key);
+
+        final PreIndexData preIndexData = new PreIndexData();
+        preIndexData.dataToUpdate.add(raw);
+        preIndexData.nonIndexableKeys.put(raw.intentTargetPackage, keys);
+
+        List<IndexData> indexData = mConverter.convertPreIndexDataToIndexData(preIndexData);
+
+        assertThat(indexData.size()).isEqualTo(1);
+        assertThat(indexData.get(0).enabled).isFalse();
+    }
+
+    /**
+     * TODO (b/66916397) investigate why locale is attached to IndexData
+     */
+    @Test
+    public void testInsertRawColumn_mismatchedLocale_rowInserted() {
+        final SearchIndexableRaw raw = getFakeRaw("ca-fr");
+        PreIndexData preIndexData = new PreIndexData();
+        preIndexData.dataToUpdate.add(raw);
+        List<IndexData> indexData = mConverter.convertPreIndexDataToIndexData(preIndexData);
+
+        assertThat(indexData).hasSize(1);
+    }
+
+    // Tests for the flow: IndexOneResource -> IndexFromResource ->
+    //                     UpdateOneRowWithFilteredData -> UpdateOneRow
+
+    @Test
+    public void testNullResource_NothingInserted() {
+        PreIndexData preIndexData = new PreIndexData();
+        List<IndexData> indexData = mConverter.convertPreIndexDataToIndexData(preIndexData);
+
+        assertThat(indexData).isEmpty();
+    }
+
+    @Test
+    public void testAddResource_RowsInserted() {
+        final SearchIndexableResource resource = getFakeResource(R.xml.display_settings);
+        final PreIndexData preIndexData = new PreIndexData();
+        preIndexData.dataToUpdate.add(resource);
+
+        final List<IndexData> indexData = mConverter.convertPreIndexDataToIndexData(preIndexData);
+        int numEnabled = getEnabledResultCount(indexData);
+
+        assertThat(numEnabled).isEqualTo(NUM_DISPLAY_ENTRIES);
+    }
+
+    @Test
+    public void testAddResource_withNIKs_rowsInsertedDisabled() {
+        final SearchIndexableResource resource = getFakeResource(R.xml.display_settings);
+        Set<String> keys = new HashSet<>();
+        keys.add("pref_key_1");
+        keys.add("pref_key_3");
+
+        final PreIndexData preIndexData = new PreIndexData();
+        preIndexData.dataToUpdate.add(resource);
+        preIndexData.nonIndexableKeys.put(packageName, keys);
+
+        List<IndexData> indexData = mConverter.convertPreIndexDataToIndexData(preIndexData);
+
+        assertThat(indexData.size()).isEqualTo(NUM_DISPLAY_ENTRIES);
+        assertThat(getEnabledResultCount(indexData)).isEqualTo(NUM_DISPLAY_ENTRIES - 2);
+    }
+
+    @Test
+    public void testAddResourceHeader_rowsMatch() {
+        final SearchIndexableResource resource = getFakeResource(R.xml.display_settings);
+        final PreIndexData preIndexData = new PreIndexData();
+        preIndexData.dataToUpdate.add(resource);
+
+        List<IndexData> indexData = mConverter.convertPreIndexDataToIndexData(preIndexData);
+
+        final IndexData row = findIndexDataForTitle(indexData, PAGE_TITLE);
+
+        // Header exists
+        assertThat(row).isNotNull();
+        assertThat(row.spaceDelimitedKeywords).isEqualTo("keywords");
+    }
+
+    @Test
+    public void testAddResource_checkboxPreference_rowsMatch() {
+        final SearchIndexableResource resource = getFakeResource(R.xml.display_settings);
+        final PreIndexData preIndexData = new PreIndexData();
+        preIndexData.dataToUpdate.add(resource);
+
+        List<IndexData> indexData = mConverter.convertPreIndexDataToIndexData(preIndexData);
+
+        String checkBoxSummaryOn = "summary_on";
+        String checkBoxSummaryOff = "summary_off";
+        String checkBoxKey = "pref_key_5";
+        final IndexData row = findIndexDataForTitle(indexData, TITLE_FIVE);
+
+        assertDisplaySetting(row, TITLE_FIVE, checkBoxSummaryOn, checkBoxSummaryOff,
+                checkBoxKey);
+    }
+
+    @Test
+    public void testAddResource_listPreference_rowsMatch() {
+        final SearchIndexableResource resource = getFakeResource(R.xml.display_settings);
+        final PreIndexData preIndexData = new PreIndexData();
+        preIndexData.dataToUpdate.add(resource);
+
+        List<IndexData> indexData = mConverter.convertPreIndexDataToIndexData(preIndexData);
+
+        String listSummary = "summary_4";
+        String listKey = "pref_key_4";
+        final IndexData row = findIndexDataForTitle(indexData, TITLE_FOUR);
+
+        assertDisplaySetting(row, TITLE_FOUR, listSummary, "", listKey);
+    }
+
+    @Test
+    public void testAddResource_iconAddedFromXml() {
+        final SearchIndexableResource resource = getFakeResource(R.xml.display_settings);
+        final PreIndexData preIndexData = new PreIndexData();
+        preIndexData.dataToUpdate.add(resource);
+
+        List<IndexData> indexData = mConverter.convertPreIndexDataToIndexData(preIndexData);
+
+        final IndexData row = findIndexDataForTitle(indexData, TITLE_THREE);
+
+        assertThat(row.iconResId).isGreaterThan(0);
+    }
+
+    @Test
+    public void testResource_sameTitleForSettingAndPage_titleNotInserted() {
+        final SearchIndexableResource resource = getFakeResource(R.xml.about_legal);
+        final PreIndexData preIndexData = new PreIndexData();
+        preIndexData.dataToUpdate.add(resource);
+
+        List<IndexData> indexData = mConverter.convertPreIndexDataToIndexData(preIndexData);
+
+        int numEnabled = getEnabledResultCount(indexData);
+        final IndexData nonTitlePref = findIndexDataForKey(indexData, "pref_key_1");
+
+        assertThat(indexData.size()).isEqualTo(NUM_LEGAL_SETTINGS - 1);
+        assertThat(numEnabled).isEqualTo(NUM_LEGAL_SETTINGS - 1);
+        assertThat(nonTitlePref.enabled).isTrue();
+    }
+
+    @Test
+    public void testResourceWithoutXml_shouldNotCrash() {
+        final SearchIndexableResource resource = getFakeResource(0);
+        final PreIndexData preIndexData = new PreIndexData();
+        preIndexData.dataToUpdate.add(resource);
+
+        List<IndexData> indexData = mConverter.convertPreIndexDataToIndexData(preIndexData);
+
+        assertThat(indexData).isEmpty();
+    }
+
+    private void assertDisplaySetting(IndexData row, String title, String summaryOn,
+            String summaryOff, String key) {
+        assertThat(row.normalizedTitle).isEqualTo(title);
+        assertThat(row.locale).isEqualTo(localeStr);
+        assertThat(row.updatedSummaryOn).isEqualTo(summaryOn);
+        assertThat(row.spaceDelimitedKeywords).isEqualTo(DISPLAY_SPACE_DELIM_KEYWORDS);
+        assertThat(row.screenTitle).isEqualTo(PAGE_TITLE);
+        assertThat(row.className).isEqualTo(className);
+        assertThat(row.enabled).isEqualTo(true);
+        assertThat(row.key).isEqualTo(key);
+        assertThat(row.payloadType).isEqualTo(0);
+        ResultPayload unmarshalledPayload = ResultPayloadUtils.unmarshall(row.payload,
+                ResultPayload.CREATOR);
+        assertThat(unmarshalledPayload).isInstanceOf(ResultPayload.class);
+    }
+
+    private void assertFakeFragment(IndexData row) {
+        assertThat(row.normalizedTitle).isEqualTo(FakeSettingsFragment.TITLE);
+        assertThat(row.updatedSummaryOn).isEqualTo(FakeSettingsFragment.SUMMARY_ON);
+        assertThat(row.spaceDelimitedKeywords)
+                .isEqualTo(FakeSettingsFragment.SPACE_KEYWORDS);
+        assertThat(row.screenTitle).isEqualTo(FakeSettingsFragment.SCREEN_TITLE);
+        assertThat(row.className).isEqualTo(FakeSettingsFragment.CLASS_NAME);
+        assertThat(row.enabled).isEqualTo(FakeSettingsFragment.ENABLED);
+        assertThat(row.key).isEqualTo(FakeSettingsFragment.KEY);
+    }
+
+    private SearchIndexableRaw getFakeRaw() {
+        return getFakeRaw(localeStr);
+    }
+
+    private SearchIndexableRaw getFakeRaw(String localeStr) {
+        SearchIndexableRaw data = new SearchIndexableRaw(mContext);
+        data.locale = new Locale(localeStr);
+        data.title = title;
+        data.summaryOn = summaryOn;
+        data.summaryOff = summaryOff;
+        data.entries = entries;
+        data.keywords = keywords;
+        data.screenTitle = screenTitle;
+        data.className = className;
+        data.packageName = packageName;
+        data.iconResId = iconResId;
+        data.intentAction = action;
+        data.intentTargetPackage = targetPackage;
+        data.intentTargetClass = targetClass;
+        data.key = key;
+        data.userId = userId;
+        data.enabled = enabled;
+        return data;
+    }
+
+    private SearchIndexableResource getFakeResource(int xml) {
+        SearchIndexableResource sir = new SearchIndexableResource(mContext);
+        sir.xmlResId = xml;
+        sir.className = className;
+        sir.packageName = packageName;
+        sir.iconResId = iconResId;
+        sir.intentAction = action;
+        sir.intentTargetPackage = targetPackage;
+        sir.intentTargetClass = targetClass;
+        sir.enabled = enabled;
+        return sir;
+    }
+
+    private static int getEnabledResultCount(List<IndexData> indexData) {
+        int enabledCount = 0;
+        for (IndexData data : indexData) {
+            if (data.enabled) {
+                enabledCount++;
+            }
+        }
+        return enabledCount;
+    }
+
+    private static IndexData findIndexDataForTitle(List<IndexData> indexData,
+            String indexDataTitle) {
+        for (int i = 0; i < indexData.size(); i++) {
+            IndexData row = indexData.get(i);
+            if (TextUtils.equals(row.updatedTitle, indexDataTitle)) {
+                return row;
+            }
+        }
+        return null;
+    }
+
+    private static IndexData findIndexDataForKey(List<IndexData> indexData, String indexDataKey) {
+        for (int i = 0; i < indexData.size(); i++) {
+            IndexData row = indexData.get(i);
+            if (TextUtils.equals(row.key, indexDataKey)) {
+                return row;
+            }
+        }
+        return null;
+    }
+}
diff --git a/tests/robotests/src/com/android/settings/search/indexing/IndexDataTest.java b/tests/robotests/src/com/android/settings/search/indexing/IndexDataTest.java
new file mode 100644
index 0000000..9fe647a
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/search/indexing/IndexDataTest.java
@@ -0,0 +1,174 @@
+/*
+ * Copyright (C) 2017 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+package com.android.settings.search.indexing;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import android.content.ComponentName;
+import android.content.Context;
+import android.content.Intent;
+
+import com.android.settings.TestConfig;
+import com.android.settings.search.InlineSwitchPayload;
+import com.android.settings.search.ResultPayload;
+import com.android.settings.search.ResultPayloadUtils;
+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;
+
+@RunWith(SettingsRobolectricTestRunner.class)
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION_O)
+public class IndexDataTest {
+    private IndexData.Builder mBuilder;
+
+    private static final String LOCALE = "en_US";
+    private static final String TITLE = "updated-title";
+    private static final String NORM_TITLE = "updatedtitle";
+    private static final String SUMMARY_ON = "updated-summary-on";
+    private static final String NORM_SUMMARY_ON = "updatedsummaryon";
+    private static final String SUMMARY_OFF = "updated-summary-off";
+    private static final String NORM_SUMMARY_OFF = "updatedsummaryoff";
+    private static final String ENTRIES = "entries";
+    private static final String CLASS_NAME = "class name";
+    private static final String SCREEN_TITLE = "screen title";
+    private static final int ICON_RES_ID = 0xff;
+    private static final String SPACE_DELIMITED_KEYWORDS = "keywords";
+    private static final String INTENT_ACTION = "intent action";
+    private static final String INTENT_TARGET_PACKAGE = "target package";
+    private static final String INTENT_TARGET_CLASS = "target class";
+    private static final boolean ENABLED = true;
+    private static final String KEY = "key";
+    private static final int USER_ID = 1;
+
+    private Context mContext;
+
+    @Before
+    public void setUp() {
+        mContext = RuntimeEnvironment.application;
+        mBuilder = createBuilder();
+    }
+
+    @Test
+    public void testFullRowBuild_nonNull() {
+        IndexData row = generateRow();
+        assertThat(row).isNotNull();
+    }
+
+    @Test
+    public void testPrimitivesBuild_noDataLoss() {
+        IndexData row = generateRow();
+
+        assertThat(row.locale).isEqualTo(LOCALE);
+        assertThat(row.updatedTitle).isEqualTo(TITLE);
+        assertThat(row.normalizedTitle).isEqualTo(NORM_TITLE);
+        assertThat(row.updatedSummaryOn).isEqualTo(SUMMARY_ON);
+        assertThat(row.normalizedSummaryOn).isEqualTo(NORM_SUMMARY_ON);
+        assertThat(row.entries).isEqualTo(ENTRIES);
+        assertThat(row.className).isEqualTo(CLASS_NAME);
+        assertThat(row.screenTitle).isEqualTo(SCREEN_TITLE);
+        assertThat(row.iconResId).isEqualTo(ICON_RES_ID);
+        assertThat(row.spaceDelimitedKeywords).isEqualTo(SPACE_DELIMITED_KEYWORDS);
+        assertThat(row.intentAction).isEqualTo(INTENT_ACTION);
+        assertThat(row.intentTargetClass).isEqualTo(INTENT_TARGET_CLASS);
+        assertThat(row.intentTargetPackage).isEqualTo(INTENT_TARGET_PACKAGE);
+        assertThat(row.enabled).isEqualTo(ENABLED);
+        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 testGenericIntent_addedToPayload() {
+        final IndexData 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 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 IndexData row = generateRow();
+        final InlineSwitchPayload unmarshalledPayload = ResultPayloadUtils
+                .unmarshall(row.payload, InlineSwitchPayload.CREATOR);
+
+        assertThat(row.payloadType).isEqualTo(ResultPayload.PayloadType.INLINE_SWITCH);
+        assertThat(unmarshalledPayload.getKey()).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 IndexData 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);
+    }
+
+    @Test
+    public void testNormalizeJapaneseString() {
+        final String japaneseString = "\u3042\u3077\u308a";
+        final String normalizedJapaneseString = "\u30a2\u30d5\u309a\u30ea";
+
+        String result = IndexData.normalizeJapaneseString(japaneseString);
+        assertThat(result).isEqualTo(normalizedJapaneseString);
+    }
+
+    private IndexData generateRow() {
+        return mBuilder.build(mContext);
+    }
+
+    private IndexData.Builder createBuilder() {
+        mBuilder = new IndexData.Builder();
+        mBuilder.setTitle(TITLE)
+                .setSummaryOn(SUMMARY_ON)
+                .setEntries(ENTRIES)
+                .setClassName(CLASS_NAME)
+                .setScreenTitle(SCREEN_TITLE)
+                .setIconResId(ICON_RES_ID)
+                .setKeywords(SPACE_DELIMITED_KEYWORDS)
+                .setIntentAction(INTENT_ACTION)
+                .setIntentTargetPackage(INTENT_TARGET_PACKAGE)
+                .setIntentTargetClass(INTENT_TARGET_CLASS)
+                .setEnabled(ENABLED)
+                .setKey(KEY)
+                .setUserId(USER_ID);
+        return mBuilder;
+    }
+}
\ No newline at end of file
diff --git a/tests/robotests/src/com/android/settings/search/indexing/PreIndexDataCollectorTest.java b/tests/robotests/src/com/android/settings/search/indexing/PreIndexDataCollectorTest.java
new file mode 100644
index 0000000..ef16a37
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/search/indexing/PreIndexDataCollectorTest.java
@@ -0,0 +1,170 @@
+/*
+ * Copyright (C) 2017 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF 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.indexing;
+
+import android.content.ContentResolver;
+import android.content.Context;
+
+import android.content.pm.ApplicationInfo;
+import android.content.pm.ProviderInfo;
+import android.content.pm.ResolveInfo;
+import android.net.Uri;
+import android.provider.SearchIndexableResource;
+import com.android.settings.TestConfig;
+import com.android.settings.search.SearchIndexableRaw;
+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 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.Mockito.doReturn;
+import static org.mockito.Mockito.spy;
+
+@RunWith(SettingsRobolectricTestRunner.class)
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION_O)
+public class PreIndexDataCollectorTest {
+
+    private final String AUTHORITY_ONE = "authority";
+    private final String PACKAGE_ONE = "com.android.settings";
+
+    @Mock
+    ContentResolver mResolver;
+
+    Context mContext;
+
+    PreIndexDataCollector mDataCollector;
+
+    @Before
+    public void setUp() {
+        MockitoAnnotations.initMocks(this);
+        mContext = spy(RuntimeEnvironment.application);
+        doReturn(mResolver).when(mContext).getContentResolver();
+        //doReturn(mPackageManager).when(mContext).getPackageManager();
+
+        mDataCollector = spy(new PreIndexDataCollector(mContext));
+    }
+
+    @Test
+    public void testCollectIndexableData_addsResourceData() {
+        final List<ResolveInfo> providerInfo = getDummyResolveInfo();
+        doReturn(true).when(mDataCollector).isWellKnownProvider(any(ResolveInfo.class));
+
+        List<SearchIndexableResource> resources = getFakeResource();
+        doReturn(resources).when(mDataCollector).getIndexablesForXmlResourceUri(
+                any(Context.class), anyString(), any(Uri.class), any(String[].class));
+
+        PreIndexData data = mDataCollector.collectIndexableData(providerInfo,
+                true /* isFullIndex */);
+
+        assertThat(data.dataToUpdate).containsAllIn(resources);
+    }
+
+    @Test
+    public void testCollectIndexableData_addsRawData() {
+        final List<ResolveInfo> providerInfo = getDummyResolveInfo();
+        doReturn(true).when(mDataCollector).isWellKnownProvider(any(ResolveInfo.class));
+
+        List<SearchIndexableRaw> rawData = getFakeRaw();
+        doReturn(rawData).when(mDataCollector).getIndexablesForRawDataUri(any(Context.class),
+                anyString(), any(Uri.class), any(String[].class));
+
+
+        PreIndexData data = mDataCollector.collectIndexableData(providerInfo,
+                true /* isFullIndex */);
+
+        assertThat(data.dataToUpdate).containsAllIn(rawData);
+    }
+
+    @Test
+    public void testCollectIndexableData_addsNonIndexables() {
+        final List<ResolveInfo> providerInfo = getDummyResolveInfo();
+        doReturn(true).when(mDataCollector).isWellKnownProvider(any(ResolveInfo.class));
+
+        List<String> niks = getFakeNonIndexables();
+
+        doReturn(niks).when(mDataCollector).getNonIndexablesKeysFromRemoteProvider(anyString(),
+                anyString());
+
+        PreIndexData data = mDataCollector.collectIndexableData(providerInfo,
+                true /* isFullIndex */);
+
+        assertThat(data.nonIndexableKeys.get(AUTHORITY_ONE)).containsAllIn(niks);
+    }
+
+    private List<ResolveInfo> getDummyResolveInfo() {
+        List<ResolveInfo> infoList = new ArrayList<>();
+        ResolveInfo info = new ResolveInfo();
+        info.providerInfo = new ProviderInfo();
+        info.providerInfo.exported = true;
+        info.providerInfo.authority = AUTHORITY_ONE;
+        info.providerInfo.packageName = PACKAGE_ONE;
+        info.providerInfo.applicationInfo = new ApplicationInfo();
+        infoList.add(info);
+
+        return infoList;
+    }
+
+    private List<SearchIndexableResource> getFakeResource() {
+        List<SearchIndexableResource> resources = new ArrayList<>();
+        final String BLANK = "";
+
+        SearchIndexableResource sir = new SearchIndexableResource(mContext);
+        sir.rank = 0;
+        sir.xmlResId = 0;
+        sir.className = BLANK;
+        sir.packageName = BLANK;
+        sir.iconResId = 0;
+        sir.intentAction = BLANK;
+        sir.intentTargetPackage = BLANK;
+        sir.intentTargetClass = BLANK;
+        sir.enabled = true;
+        resources.add(sir);
+
+        return resources;
+    }
+
+    private List<SearchIndexableRaw> getFakeRaw() {
+        List<SearchIndexableRaw> rawData = new ArrayList<>();
+
+        SearchIndexableRaw data = new SearchIndexableRaw(mContext);
+        data.title = "bront";
+        data.key = "brint";
+        rawData.add(data);
+
+        return rawData;
+    }
+
+    private List<String> getFakeNonIndexables() {
+        List<String> niks = new ArrayList<>();
+        niks.add("they're");
+        niks.add("good");
+        niks.add("dogs");
+        niks.add("brent");
+        return niks;
+    }
+}
diff --git a/tests/robotests/src/com/android/settings/security/ConfigureKeyGuardDialogTest.java b/tests/robotests/src/com/android/settings/security/ConfigureKeyGuardDialogTest.java
index 1809e88..df0cc2e 100644
--- a/tests/robotests/src/com/android/settings/security/ConfigureKeyGuardDialogTest.java
+++ b/tests/robotests/src/com/android/settings/security/ConfigureKeyGuardDialogTest.java
@@ -17,26 +17,26 @@
 package com.android.settings.security;
 
 
+import static org.mockito.Mockito.doNothing;
+import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.verify;
+
 import android.content.DialogInterface;
 
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.testutils.shadow.ShadowEventLogWriter;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.robolectric.Robolectric;
+import org.robolectric.android.controller.FragmentController;
 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,
+    sdk = TestConfig.SDK_VERSION_O,
     shadows = ShadowEventLogWriter.class
 )
 public class ConfigureKeyGuardDialogTest {
@@ -47,7 +47,7 @@
                 Robolectric.buildFragment(ConfigureKeyGuardDialog.class);
         final ConfigureKeyGuardDialog fragment = spy(fragmentController.get());
         doNothing().when(fragment).startPasswordSetup();
-        fragmentController.attach().create().start().resume();
+        fragmentController.create().start().resume();
         fragment.onClick(null /* dialog */, DialogInterface.BUTTON_POSITIVE);
         fragment.onDismiss(null /* dialog */);
 
diff --git a/tests/robotests/src/com/android/settings/security/CredentialStoragePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/security/CredentialStoragePreferenceControllerTest.java
new file mode 100644
index 0000000..71253d6
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/security/CredentialStoragePreferenceControllerTest.java
@@ -0,0 +1,72 @@
+/*
+ * Copyright (C) 2017 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.security;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import android.content.Context;
+import android.support.v7.preference.Preference;
+
+import com.android.settings.R;
+import com.android.settings.TestConfig;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.shadow.ShadowKeyStore;
+
+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_O,
+        shadows = {
+                ShadowKeyStore.class
+        })
+public class CredentialStoragePreferenceControllerTest {
+
+    private Context mContext;
+    private CredentialStoragePreferenceController mController;
+    private Preference mPreference;
+
+    @Before
+    public void setUp() {
+        mContext = RuntimeEnvironment.application;
+        mController = new CredentialStoragePreferenceController(mContext);
+        mPreference = new Preference(mContext);
+    }
+
+    @Test
+    public void updateState_hardwareBacked_showHardwareSummary() {
+        ShadowKeyStore.setHardwareBacked(true);
+
+        mController.updateState(mPreference);
+
+        assertThat(mPreference.getSummary())
+                .isEqualTo(mContext.getText(R.string.credential_storage_type_hardware));
+    }
+
+    @Test
+    public void updateState_hardwareBacked_showSoftwareSummary() {
+        ShadowKeyStore.setHardwareBacked(false);
+
+        mController.updateState(mPreference);
+
+        assertThat(mPreference.getSummary())
+                .isEqualTo(mContext.getText(R.string.credential_storage_type_software));
+    }
+}
diff --git a/tests/robotests/src/com/android/settings/security/EncryptionAndCredentialTest.java b/tests/robotests/src/com/android/settings/security/EncryptionAndCredentialTest.java
new file mode 100644
index 0000000..f5f0bb3
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/security/EncryptionAndCredentialTest.java
@@ -0,0 +1,86 @@
+/*
+ * Copyright (C) 2017 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.security;
+
+import static com.android.settings.security.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.TestConfig;
+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_O)
+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);
+    }
+
+    @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);
+    }
+}
diff --git a/tests/robotests/src/com/android/settings/security/EncryptionStatusPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/security/EncryptionStatusPreferenceControllerTest.java
new file mode 100644
index 0000000..d66d495
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/security/EncryptionStatusPreferenceControllerTest.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.security;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import android.content.Context;
+import android.support.v7.preference.Preference;
+
+import com.android.settings.R;
+import com.android.settings.TestConfig;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
+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.robolectric.RuntimeEnvironment;
+import org.robolectric.annotation.Config;
+
+@RunWith(SettingsRobolectricTestRunner.class)
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION_O,
+        shadows = {
+                ShadowUserManager.class,
+                ShadowLockPatternUtils.class
+        })
+public class EncryptionStatusPreferenceControllerTest {
+
+    private Context mContext;
+    private EncryptionStatusPreferenceController mController;
+    private Preference mPreference;
+
+    @Before
+    public void setUp() {
+        mContext = RuntimeEnvironment.application;
+        mController = new EncryptionStatusPreferenceController(mContext);
+        mPreference = new Preference(mContext);
+    }
+
+    @Test
+    public void isAvailable_admin_true() {
+        ShadowUserManager.getShadow().setIsAdminUser(true);
+
+        assertThat(mController.isAvailable()).isTrue();
+    }
+
+    @Test
+    public void isAvailable_notAdmin_false() {
+        ShadowUserManager.getShadow().setIsAdminUser(false);
+
+        assertThat(mController.isAvailable()).isFalse();
+    }
+
+    @Test
+    public void updateSummary_encrypted_shouldSayEncrypted() {
+        ShadowLockPatternUtils.setDeviceEncryptionEnabled(true);
+
+        mController.updateState(mPreference);
+
+        assertThat(mPreference.getFragment()).isNull();
+        assertThat(mPreference.getSummary())
+                .isEqualTo(mContext.getText(R.string.crypt_keeper_encrypted_summary));
+    }
+
+    @Test
+    public void updateSummary_unencrypted_shouldHasEncryptionFragment() {
+        ShadowLockPatternUtils.setDeviceEncryptionEnabled(false);
+
+        mController.updateState(mPreference);
+
+        assertThat(mPreference.getSummary())
+                .isEqualTo(mContext.getText(R.string.summary_placeholder));
+        assertThat(mPreference.getFragment()).isEqualTo(CryptKeeperSettings.class.getName());
+    }
+}
diff --git a/tests/robotests/src/com/android/settings/security/LockscreenDashboardFragmentTest.java b/tests/robotests/src/com/android/settings/security/LockscreenDashboardFragmentTest.java
index b6487f1..1a41c2d 100644
--- a/tests/robotests/src/com/android/settings/security/LockscreenDashboardFragmentTest.java
+++ b/tests/robotests/src/com/android/settings/security/LockscreenDashboardFragmentTest.java
@@ -16,8 +16,10 @@
 
 package com.android.settings.security;
 
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
+import static com.google.common.truth.Truth.assertThat;
+
 import com.android.settings.TestConfig;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.testutils.XmlTestUtils;
 
 import org.junit.Test;
@@ -27,10 +29,8 @@
 
 import java.util.List;
 
-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_O)
 public class LockscreenDashboardFragmentTest {
 
     private LockscreenDashboardFragment mFragment;
diff --git a/tests/robotests/src/com/android/settings/security/OwnerInfoPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/security/OwnerInfoPreferenceControllerTest.java
index 8406d90..9bf8606 100644
--- a/tests/robotests/src/com/android/settings/security/OwnerInfoPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/security/OwnerInfoPreferenceControllerTest.java
@@ -15,16 +15,29 @@
  */
 package com.android.settings.security;
 
+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.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.FragmentManager;
 import android.app.FragmentTransaction;
 import android.content.Context;
-import android.support.v7.preference.PreferenceScreen;
 import android.support.v14.preference.PreferenceFragment;
+import android.support.v7.preference.PreferenceManager;
+import android.support.v7.preference.PreferenceScreen;
 
 import com.android.internal.widget.LockPatternUtils;
-import com.android.settings.OwnerInfoSettings;
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
+import com.android.settings.users.OwnerInfoSettings;
 import com.android.settingslib.RestrictedLockUtils.EnforcedAdmin;
 import com.android.settingslib.RestrictedPreference;
 
@@ -37,27 +50,17 @@
 import org.robolectric.shadows.ShadowApplication;
 import org.robolectric.util.ReflectionHelpers;
 
-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.doReturn;
-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)
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION_O)
 public class OwnerInfoPreferenceControllerTest {
 
-    @Mock(answer = RETURNS_DEEP_STUBS)
+    @Mock
     private PreferenceFragment mFragment;
     @Mock
     private PreferenceScreen mScreen;
     @Mock
+    private PreferenceManager mPreferenceManager;
+    @Mock
     private FragmentManager mFragmentManager;
     @Mock
     private FragmentTransaction mFragmentTransaction;
@@ -77,7 +80,8 @@
 
         when(mFragment.isAdded()).thenReturn(true);
         when(mFragment.getPreferenceScreen()).thenReturn(mScreen);
-        when(mFragment.getPreferenceManager().getContext()).thenReturn(mContext);
+        when(mFragment.getPreferenceManager()).thenReturn(mPreferenceManager);
+        when(mPreference.getContext()).thenReturn(mContext);
         when(mFragment.getFragmentManager()).thenReturn(mFragmentManager);
         when(mFragmentManager.beginTransaction()).thenReturn(mFragmentTransaction);
 
@@ -139,7 +143,7 @@
         mController.updateSummary();
 
         verify(mPreference).setSummary(mContext.getString(
-            com.android.settings.R.string.owner_info_settings_summary));
+                com.android.settings.R.string.owner_info_settings_summary));
     }
 
     @Test
@@ -179,7 +183,7 @@
     public void performClick_shouldLaunchOwnerInfoSettings() {
         final ShadowApplication application = ShadowApplication.getInstance();
         final RestrictedPreference preference =
-            new RestrictedPreference(application.getApplicationContext());
+                new RestrictedPreference(application.getApplicationContext());
         when(mScreen.findPreference(mController.getPreferenceKey())).thenReturn(preference);
         doReturn(false).when(mController).isDeviceOwnerInfoEnabled();
         doReturn(false).when(mLockPatternUtils).isLockScreenDisabled(anyInt());
@@ -188,9 +192,10 @@
 
         preference.performClick();
 
-        verify(mFragment).getFragmentManager();
+        // Called once in setTargetFragment, and a second time to display the fragment.
+        verify(mFragment, times(2)).getFragmentManager();
         verify(mFragment.getFragmentManager().beginTransaction())
-            .add(any(OwnerInfoSettings.class), anyString());
+                .add(any(OwnerInfoSettings.class), anyString());
     }
 
 }
\ No newline at end of file
diff --git a/tests/robotests/src/com/android/settings/security/RestrictedEncryptionPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/security/RestrictedEncryptionPreferenceControllerTest.java
new file mode 100644
index 0000000..59b267f
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/security/RestrictedEncryptionPreferenceControllerTest.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.security;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import android.content.Context;
+import android.os.UserManager;
+
+import com.android.settings.TestConfig;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.shadow.ShadowUserManager;
+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.robolectric.RuntimeEnvironment;
+import org.robolectric.annotation.Config;
+
+@RunWith(SettingsRobolectricTestRunner.class)
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION_O,
+        shadows = {
+                ShadowUserManager.class
+        })
+public class RestrictedEncryptionPreferenceControllerTest {
+
+    private Context mContext;
+    private ShadowUserManager mUserManager;
+    private CredentialStoragePreferenceController mCredentialStoragePreferenceController;
+    private InstallCredentialsPreferenceController mInstallCredentialsPreferenceController;
+    private ResetCredentialsPreferenceController mResetCredentialsPreferenceController;
+    private UserCredentialsPreferenceController mUserCredentialsPreferenceController;
+    private Lifecycle mLifecycle;
+
+    @Before
+    public void setUp() {
+        mContext = RuntimeEnvironment.application;
+        mLifecycle = new Lifecycle(() -> mLifecycle);
+        mCredentialStoragePreferenceController =
+                new CredentialStoragePreferenceController(mContext);
+        mInstallCredentialsPreferenceController =
+                new InstallCredentialsPreferenceController(mContext);
+        mResetCredentialsPreferenceController =
+                new ResetCredentialsPreferenceController(mContext, mLifecycle);
+        mUserCredentialsPreferenceController =
+                new UserCredentialsPreferenceController(mContext);
+        mUserManager = ShadowUserManager.getShadow();
+    }
+
+    @After
+    public void tearDown() {
+        mUserManager.reset();
+    }
+
+    @Test
+    public void isAvailable_noRestriction_shouldReturnTrue() {
+        assertThat(mCredentialStoragePreferenceController.isAvailable()).isTrue();
+        assertThat(mInstallCredentialsPreferenceController.isAvailable()).isTrue();
+        assertThat(mResetCredentialsPreferenceController.isAvailable()).isTrue();
+        assertThat(mUserCredentialsPreferenceController.isAvailable()).isTrue();
+    }
+
+    @Test
+    public void isAvailable_hasRestriction_shouldReturnFalse() {
+        mUserManager.addBaseUserRestriction(UserManager.DISALLOW_CONFIG_CREDENTIALS);
+
+        assertThat(mCredentialStoragePreferenceController.isAvailable()).isFalse();
+        assertThat(mInstallCredentialsPreferenceController.isAvailable()).isFalse();
+        assertThat(mResetCredentialsPreferenceController.isAvailable()).isFalse();
+        assertThat(mUserCredentialsPreferenceController.isAvailable()).isFalse();
+    }
+}
\ No newline at end of file
diff --git a/tests/robotests/src/com/android/settings/security/SecurityFeatureProviderImplTest.java b/tests/robotests/src/com/android/settings/security/SecurityFeatureProviderImplTest.java
index 8c5e8e5..62ed3ab 100644
--- a/tests/robotests/src/com/android/settings/security/SecurityFeatureProviderImplTest.java
+++ b/tests/robotests/src/com/android/settings/security/SecurityFeatureProviderImplTest.java
@@ -16,8 +16,17 @@
 
 package com.android.settings.security;
 
+import static org.mockito.Matchers.any;
+import static org.mockito.Matchers.anyInt;
+import static org.mockito.Matchers.anyString;
+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.verifyNoMoreInteractions;
+import static org.mockito.Mockito.when;
+
 import android.content.Context;
-import android.content.IContentProvider;
 import android.content.Intent;
 import android.content.pm.PackageManager;
 import android.content.res.Resources;
@@ -25,11 +34,11 @@
 import android.os.Bundle;
 import android.support.v7.preference.Preference;
 import android.support.v7.preference.PreferenceScreen;
-import android.util.Pair;
 
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.R;
 import com.android.settings.TestConfig;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.shadow.ShadowTileUtils;
 import com.android.settingslib.drawer.DashboardCategory;
 import com.android.settingslib.drawer.Tile;
 import com.android.settingslib.drawer.TileUtils;
@@ -41,24 +50,10 @@
 import org.mockito.MockitoAnnotations;
 import org.robolectric.RuntimeEnvironment;
 import org.robolectric.annotation.Config;
-import org.robolectric.annotation.Implementation;
-import org.robolectric.annotation.Implements;
 import org.robolectric.shadows.ShadowLooper;
 
-import java.util.Map;
-
-import static org.mockito.Matchers.any;
-import static org.mockito.Matchers.anyInt;
-import static org.mockito.Matchers.anyString;
-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.verifyNoMoreInteractions;
-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_O)
 public class SecurityFeatureProviderImplTest {
 
     private static final String MOCK_KEY = "key";
@@ -77,21 +72,6 @@
 
     private SecurityFeatureProviderImpl mImpl;
 
-    @Implements(com.android.settingslib.drawer.TileUtils.class)
-    public static class ShadowTileUtils {
-        @Implementation
-        public static Pair getIconFromUri(Context context, String packageName, String uriString,
-                Map<String, IContentProvider> providerMap) {
-            return Pair.create("package", 161803);
-        }
-
-        @Implementation
-        public static String getTextFromUri(Context context, String uriString,
-                Map<String, IContentProvider> providerMap, String key) {
-            return MOCK_SUMMARY;
-        }
-    }
-
     @Before
     public void setUp() throws PackageManager.NameNotFoundException {
         MockitoAnnotations.initMocks(this);
diff --git a/tests/robotests/src/com/android/settings/security/SecuritySettingsTest.java b/tests/robotests/src/com/android/settings/security/SecuritySettingsTest.java
new file mode 100644
index 0000000..827dd64
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/security/SecuritySettingsTest.java
@@ -0,0 +1,190 @@
+/*
+ * Copyright (C) 2017 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF 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 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.verify;
+import static org.mockito.Mockito.verifyNoMoreInteractions;
+import static org.mockito.Mockito.when;
+
+import android.app.Activity;
+import android.content.Context;
+import android.content.pm.PackageManager;
+import android.hardware.fingerprint.FingerprintManager;
+import android.os.UserManager;
+import android.support.v7.preference.Preference;
+import android.support.v7.preference.PreferenceGroup;
+import android.support.v7.preference.PreferenceScreen;
+
+import com.android.internal.widget.LockPatternUtils;
+import com.android.settings.R;
+import com.android.settings.TestConfig;
+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 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 java.util.List;
+
+@RunWith(SettingsRobolectricTestRunner.class)
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION_O,
+        shadows = {
+                ShadowLockPatternUtils.class
+        })
+public class SecuritySettingsTest {
+
+
+    @Mock(answer = Answers.RETURNS_DEEP_STUBS)
+    private Context mContext;
+    @Mock
+    private SummaryLoader mSummaryLoader;
+
+    private SecuritySettings.SummaryProvider mSummaryProvider;
+
+    @Before
+    public void setUp() {
+        MockitoAnnotations.initMocks(this);
+        FakeFeatureFactory.setupForTest(mContext);
+        mSummaryProvider = new SecuritySettings.SummaryProvider(mContext, mSummaryLoader);
+    }
+
+    @Test
+    public void testSummaryProvider_notListening() {
+        mSummaryProvider.setListening(false);
+
+        verifyNoMoreInteractions(mSummaryLoader);
+    }
+
+    @Test
+    public void testSummaryProvider_hasFingerPrint_hasStaticSummary() {
+        final FingerprintManager fpm = mock(FingerprintManager.class);
+        when(mContext.getPackageManager().hasSystemFeature(PackageManager.FEATURE_FINGERPRINT))
+                .thenReturn(true);
+
+        // Cast to Object to workaround a robolectric casting bug
+        when((Object) mContext.getSystemService(FingerprintManager.class)).thenReturn(fpm);
+        when(fpm.isHardwareDetected()).thenReturn(true);
+
+        mSummaryProvider.setListening(true);
+
+        verify(mContext).getString(R.string.security_dashboard_summary);
+    }
+
+    @Test
+    public void testSummaryProvider_noFpFeature_shouldSetSummaryWithNoFingerprint() {
+        final FingerprintManager fpm = mock(FingerprintManager.class);
+        when(mContext.getPackageManager().hasSystemFeature(PackageManager.FEATURE_FINGERPRINT))
+                .thenReturn(false);
+
+        mSummaryProvider.setListening(true);
+
+        verify(mContext).getString(R.string.security_dashboard_summary_no_fingerprint);
+    }
+
+    @Test
+    public void testSummaryProvider_noFpHardware_shouldSetSummaryWithNoFingerprint() {
+        final FingerprintManager fpm = mock(FingerprintManager.class);
+        when(mContext.getPackageManager().hasSystemFeature(PackageManager.FEATURE_FINGERPRINT))
+                .thenReturn(true);
+
+        // Cast to Object to workaround a robolectric casting bug
+        when((Object) mContext.getSystemService(FingerprintManager.class)).thenReturn(fpm);
+        when(fpm.isHardwareDetected()).thenReturn(false);
+
+        mSummaryProvider.setListening(true);
+
+        verify(mContext).getString(R.string.security_dashboard_summary_no_fingerprint);
+    }
+
+    @Test
+    public void testInitTrustAgentPreference_secure_shouldSetSummaryToNumberOfTrustAgent() {
+        final Preference preference = mock(Preference.class);
+        final PreferenceScreen screen = mock(PreferenceScreen.class);
+        when(screen.findPreference(SecuritySettings.KEY_MANAGE_TRUST_AGENTS))
+                .thenReturn(preference);
+        final LockPatternUtils utils = mock(LockPatternUtils.class);
+        when(utils.isSecure(anyInt())).thenReturn(true);
+        final Context context = ShadowApplication.getInstance().getApplicationContext();
+        final Activity activity = mock(Activity.class);
+        when(activity.getResources()).thenReturn(context.getResources());
+        final SecuritySettings securitySettings = spy(new SecuritySettings());
+        when(securitySettings.getActivity()).thenReturn(activity);
+
+        ReflectionHelpers.setField(securitySettings, "mLockPatternUtils", utils);
+
+        securitySettings.initTrustAgentPreference(screen, 0);
+        verify(preference).setSummary(R.string.manage_trust_agents_summary);
+
+        securitySettings.initTrustAgentPreference(screen, 2);
+        verify(preference).setSummary(context.getResources().getQuantityString(
+                R.plurals.manage_trust_agents_summary_on, 2, 2));
+    }
+
+    @Test
+    public void testSetLockscreenPreferencesSummary_shouldSetSummaryFromLockScreenNotification() {
+        final Preference preference = mock(Preference.class);
+        final PreferenceGroup group = mock(PreferenceGroup.class);
+        when(group.findPreference(SecuritySettings.KEY_LOCKSCREEN_PREFERENCES))
+                .thenReturn(preference);
+        final LockScreenNotificationPreferenceController controller =
+                mock(LockScreenNotificationPreferenceController.class);
+
+        final SecuritySettings securitySettings = new SecuritySettings();
+        ReflectionHelpers.setField(securitySettings,
+                "mLockScreenNotificationPreferenceController", controller);
+
+        when(controller.getSummaryResource()).thenReturn(1234);
+        securitySettings.setLockscreenPreferencesSummary(group);
+        verify(preference).setSummary(1234);
+    }
+
+    @Test
+    public void testNonIndexableKeys_existInXmlLayout() {
+        final Context context = spy(RuntimeEnvironment.application);
+        UserManager manager = mock(UserManager.class);
+        when(manager.isAdminUser()).thenReturn(false);
+        doReturn(manager).when(context).getSystemService(Context.USER_SERVICE);
+        final List<String> niks = SecuritySettings.SEARCH_INDEX_DATA_PROVIDER
+                .getNonIndexableKeys(context);
+
+        final List<String> keys = XmlTestUtils.getKeysFromPreferenceXml(context,
+                R.xml.security_settings_misc);
+        keys.addAll(XmlTestUtils.getKeysFromPreferenceXml(context,
+                R.xml.location_settings));
+        keys.addAll(XmlTestUtils.getKeysFromPreferenceXml(context,
+                R.xml.encryption_and_credential));
+
+        assertThat(keys).containsAllIn(niks);
+    }
+}
diff --git a/tests/robotests/src/com/android/settings/security/screenlock/LockAfterTimeoutPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/security/screenlock/LockAfterTimeoutPreferenceControllerTest.java
new file mode 100644
index 0000000..a1d7b4e
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/security/screenlock/LockAfterTimeoutPreferenceControllerTest.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.security.screenlock;
+
+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.support.v14.preference.SwitchPreference;
+
+import com.android.internal.widget.LockPatternUtils;
+import com.android.settings.TestConfig;
+import com.android.settings.security.trustagent.TrustAgentManager;
+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.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_O)
+public class LockAfterTimeoutPreferenceControllerTest {
+
+    private static final int TEST_USER_ID = 0;
+
+    @Mock
+    private LockPatternUtils mLockPatternUtils;
+    @Mock
+    private TrustAgentManager mTrustAgentManager;
+
+    private Context mContext;
+    private LockAfterTimeoutPreferenceController mController;
+    private SwitchPreference mPreference;
+    private FakeFeatureFactory mFeatureFactory;
+
+    @Before
+    public void setUp() {
+        MockitoAnnotations.initMocks(this);
+        mContext = RuntimeEnvironment.application;
+        mFeatureFactory = FakeFeatureFactory.setupForTest();
+        when(mFeatureFactory.securityFeatureProvider.getTrustAgentManager())
+                .thenReturn(mTrustAgentManager);
+
+        mPreference = new SwitchPreference(mContext);
+        mController = new LockAfterTimeoutPreferenceController(
+                mContext, TEST_USER_ID, mLockPatternUtils);
+    }
+
+    @Test
+    public void isAvailable_lockSetToPattern_shouldReturnTrue() {
+        when(mLockPatternUtils.isSecure(TEST_USER_ID)).thenReturn(true);
+        when(mLockPatternUtils.getKeyguardStoredPasswordQuality(TEST_USER_ID))
+                .thenReturn(DevicePolicyManager.PASSWORD_QUALITY_SOMETHING);
+
+        assertThat(mController.isAvailable()).isTrue();
+    }
+
+    @Test
+    public void isAvailable_lockSetToPin_shouldReturnTrue() {
+        when(mLockPatternUtils.isSecure(TEST_USER_ID)).thenReturn(true);
+        when(mLockPatternUtils.getKeyguardStoredPasswordQuality(TEST_USER_ID))
+                .thenReturn(DevicePolicyManager.PASSWORD_QUALITY_NUMERIC);
+
+        assertThat(mController.isAvailable()).isTrue();
+    }
+
+    @Test
+    public void isAvailable_lockSetToPassword_shouldReturnTrue() {
+        when(mLockPatternUtils.isSecure(TEST_USER_ID)).thenReturn(true);
+        when(mLockPatternUtils.getKeyguardStoredPasswordQuality(TEST_USER_ID))
+                .thenReturn(DevicePolicyManager.PASSWORD_QUALITY_ALPHANUMERIC);
+
+        assertThat(mController.isAvailable()).isTrue();
+    }
+
+    @Test
+    public void isAvailable_lockSetToNone_shouldReturnFalse() {
+        when(mLockPatternUtils.isSecure(TEST_USER_ID)).thenReturn(false);
+
+        assertThat(mController.isAvailable()).isFalse();
+    }
+
+
+}
diff --git a/tests/robotests/src/com/android/settings/security/screenlock/PatternVisiblePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/security/screenlock/PatternVisiblePreferenceControllerTest.java
new file mode 100644
index 0000000..a947fca
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/security/screenlock/PatternVisiblePreferenceControllerTest.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.security.screenlock;
+
+import static com.google.common.truth.Truth.assertThat;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+import android.app.admin.DevicePolicyManager;
+import android.content.Context;
+import android.support.v14.preference.SwitchPreference;
+
+import com.android.internal.widget.LockPatternUtils;
+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_O)
+public class PatternVisiblePreferenceControllerTest {
+
+    private static final int TEST_USER_ID = 0;
+
+    @Mock
+    private LockPatternUtils mLockPatternUtils;
+    private Context mContext;
+    private PatternVisiblePreferenceController mController;
+    private SwitchPreference mPreference;
+
+    @Before
+    public void setUp() {
+        MockitoAnnotations.initMocks(this);
+        mContext = RuntimeEnvironment.application;
+        mController = new PatternVisiblePreferenceController(
+                mContext, TEST_USER_ID, mLockPatternUtils);
+        mPreference = new SwitchPreference(mContext);
+    }
+
+    @Test
+    public void isAvailable_lockSetToPattern_shouldReturnTrue() {
+        when(mLockPatternUtils.isSecure(TEST_USER_ID)).thenReturn(true);
+        when(mLockPatternUtils.getKeyguardStoredPasswordQuality(TEST_USER_ID))
+                .thenReturn(DevicePolicyManager.PASSWORD_QUALITY_SOMETHING);
+
+        assertThat(mController.isAvailable()).isTrue();
+    }
+
+    @Test
+    public void isAvailable_lockSetToPin_shouldReturnFalse() {
+        when(mLockPatternUtils.isSecure(TEST_USER_ID)).thenReturn(true);
+        when(mLockPatternUtils.getKeyguardStoredPasswordQuality(TEST_USER_ID))
+                .thenReturn(DevicePolicyManager.PASSWORD_QUALITY_NUMERIC);
+
+        assertThat(mController.isAvailable()).isFalse();
+    }
+
+    @Test
+    public void isAvailable_lockSetToNone_shouldReturnFalse() {
+        when(mLockPatternUtils.isSecure(TEST_USER_ID)).thenReturn(false);
+
+        assertThat(mController.isAvailable()).isFalse();
+    }
+
+    @Test
+    public void updateState_shouldSetPref() {
+        when(mLockPatternUtils.isVisiblePatternEnabled(TEST_USER_ID)).thenReturn(true);
+        mController.updateState(mPreference);
+        assertThat(mPreference.isChecked()).isTrue();
+
+        when(mLockPatternUtils.isVisiblePatternEnabled(TEST_USER_ID)).thenReturn(false);
+        mController.updateState(mPreference);
+        assertThat(mPreference.isChecked()).isFalse();
+    }
+
+    @Test
+    public void onPreferenceChange_shouldUpdateLockPatternUtils() {
+        mController.onPreferenceChange(mPreference, true /* newValue */);
+
+        verify(mLockPatternUtils).setVisiblePatternEnabled(true, TEST_USER_ID);
+    }
+}
diff --git a/tests/robotests/src/com/android/settings/security/screenlock/PowerButtonInstantLockPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/security/screenlock/PowerButtonInstantLockPreferenceControllerTest.java
new file mode 100644
index 0000000..2d2e92f
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/security/screenlock/PowerButtonInstantLockPreferenceControllerTest.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.security.screenlock;
+
+import static com.google.common.truth.Truth.assertThat;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+import android.app.admin.DevicePolicyManager;
+import android.content.Context;
+import android.support.v14.preference.SwitchPreference;
+
+import com.android.internal.widget.LockPatternUtils;
+import com.android.settings.R;
+import com.android.settings.TestConfig;
+import com.android.settings.security.trustagent.TrustAgentManager;
+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.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_O)
+public class PowerButtonInstantLockPreferenceControllerTest {
+
+    private static final int TEST_USER_ID = 0;
+
+    @Mock
+    private LockPatternUtils mLockPatternUtils;
+    @Mock
+    private TrustAgentManager mTrustAgentManager;
+
+    private Context mContext;
+    private PowerButtonInstantLockPreferenceController mController;
+    private SwitchPreference mPreference;
+    private FakeFeatureFactory mFeatureFactory;
+
+    @Before
+    public void setUp() {
+        MockitoAnnotations.initMocks(this);
+        mContext = RuntimeEnvironment.application;
+        mFeatureFactory = FakeFeatureFactory.setupForTest();
+        when(mFeatureFactory.securityFeatureProvider.getTrustAgentManager())
+                .thenReturn(mTrustAgentManager);
+
+        mPreference = new SwitchPreference(mContext);
+        mController = new PowerButtonInstantLockPreferenceController(
+                mContext, TEST_USER_ID, mLockPatternUtils);
+    }
+
+    @Test
+    public void isAvailable_lockSetToPattern_shouldReturnTrue() {
+        when(mLockPatternUtils.isSecure(TEST_USER_ID)).thenReturn(true);
+        when(mLockPatternUtils.getKeyguardStoredPasswordQuality(TEST_USER_ID))
+                .thenReturn(DevicePolicyManager.PASSWORD_QUALITY_SOMETHING);
+
+        assertThat(mController.isAvailable()).isTrue();
+    }
+
+    @Test
+    public void isAvailable_lockSetToPin_shouldReturnTrue() {
+        when(mLockPatternUtils.isSecure(TEST_USER_ID)).thenReturn(true);
+        when(mLockPatternUtils.getKeyguardStoredPasswordQuality(TEST_USER_ID))
+                .thenReturn(DevicePolicyManager.PASSWORD_QUALITY_NUMERIC);
+
+        assertThat(mController.isAvailable()).isTrue();
+    }
+
+    @Test
+    public void isAvailable_lockSetToPassword_shouldReturnTrue() {
+        when(mLockPatternUtils.isSecure(TEST_USER_ID)).thenReturn(true);
+        when(mLockPatternUtils.getKeyguardStoredPasswordQuality(TEST_USER_ID))
+                .thenReturn(DevicePolicyManager.PASSWORD_QUALITY_ALPHANUMERIC);
+
+        assertThat(mController.isAvailable()).isTrue();
+    }
+
+    @Test
+    public void isAvailable_lockSetToNone_shouldReturnFalse() {
+        when(mLockPatternUtils.isSecure(TEST_USER_ID)).thenReturn(false);
+
+        assertThat(mController.isAvailable()).isFalse();
+    }
+
+    @Test
+    public void updateState_shouldSetPref() {
+        final String fakeTrustAgent = "trust_agent";
+        when(mTrustAgentManager.getActiveTrustAgentLabel(mContext, mLockPatternUtils))
+                .thenReturn(fakeTrustAgent);
+        when(mLockPatternUtils.getPowerButtonInstantlyLocks(TEST_USER_ID)).thenReturn(true);
+        mController.updateState(mPreference);
+        assertThat(mPreference.isChecked()).isTrue();
+        assertThat(mPreference.getSummary()).isEqualTo(mContext.getString(
+                R.string.lockpattern_settings_power_button_instantly_locks_summary,
+                fakeTrustAgent));
+
+        when(mTrustAgentManager.getActiveTrustAgentLabel(mContext, mLockPatternUtils))
+                .thenReturn(null);
+        when(mLockPatternUtils.getPowerButtonInstantlyLocks(TEST_USER_ID)).thenReturn(false);
+        mController.updateState(mPreference);
+        assertThat(mPreference.isChecked()).isFalse();
+        assertThat(mPreference.getSummary()).isEqualTo(mContext.getString(
+                R.string.summary_placeholder));
+    }
+
+    @Test
+    public void onPreferenceChange_shouldUpdateLockPatternUtils() {
+        mController.onPreferenceChange(mPreference, true /* newValue */);
+
+        verify(mLockPatternUtils).setPowerButtonInstantlyLocks(true, TEST_USER_ID);
+    }
+
+}
diff --git a/tests/robotests/src/com/android/settings/security/screenlock/ScreenLockSettingsTest.java b/tests/robotests/src/com/android/settings/security/screenlock/ScreenLockSettingsTest.java
new file mode 100644
index 0000000..e8416ee
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/security/screenlock/ScreenLockSettingsTest.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.security.screenlock;
+
+import static com.google.common.truth.Truth.assertThat;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.verify;
+
+import com.android.internal.logging.nano.MetricsProto;
+import com.android.settings.R;
+import com.android.settings.TestConfig;
+import com.android.settings.security.OwnerInfoPreferenceController;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
+import com.android.settingslib.core.AbstractPreferenceController;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.robolectric.annotation.Config;
+import org.robolectric.util.ReflectionHelpers;
+
+import java.util.Map;
+
+@RunWith(SettingsRobolectricTestRunner.class)
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION_O)
+public class ScreenLockSettingsTest {
+
+    private ScreenLockSettings mSettings;
+
+    @Before
+    public void setUp() {
+        mSettings = new ScreenLockSettings();
+    }
+
+    @Test
+    public void verifyConstants() {
+        assertThat(mSettings.getMetricsCategory()).isEqualTo(MetricsProto.MetricsEvent.SECURITY);
+        assertThat(mSettings.getPreferenceScreenResId()).isEqualTo(R.xml.screen_lock_settings);
+    }
+
+    @Test
+    public void onOwnerInfoUpdated_shouldUpdateOwnerInfoController() {
+        final Map<Class, AbstractPreferenceController> preferenceControllers =
+                ReflectionHelpers.getField(mSettings, "mPreferenceControllers");
+        final OwnerInfoPreferenceController controller = mock(OwnerInfoPreferenceController.class);
+        preferenceControllers.put(OwnerInfoPreferenceController.class, controller);
+
+        mSettings.onOwnerInfoUpdated();
+
+        verify(controller).updateSummary();
+    }
+
+}
diff --git a/tests/robotests/src/com/android/settings/security/trustagent/TrustAgentManagerTest.java b/tests/robotests/src/com/android/settings/security/trustagent/TrustAgentManagerTest.java
new file mode 100644
index 0000000..ed616be
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/security/trustagent/TrustAgentManagerTest.java
@@ -0,0 +1,80 @@
+/*
+ * 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.security.trustagent;
+
+import static com.google.common.truth.Truth.assertThat;
+import static org.mockito.Mockito.when;
+
+import android.content.pm.PackageManager;
+import android.content.pm.ResolveInfo;
+import android.content.pm.ServiceInfo;
+
+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_O)
+public class TrustAgentManagerTest {
+
+    private static final String CANNED_PACKAGE_NAME = "com.test.package";
+
+    @Mock
+    private PackageManager mPackageManager;
+
+    private TrustAgentManager mTrustAgentManager;
+
+    @Before
+    public void setUp() throws PackageManager.NameNotFoundException {
+        MockitoAnnotations.initMocks(this);
+        mTrustAgentManager = new TrustAgentManager();
+    }
+
+    @Test
+    public void shouldProvideTrust_doesProvideTrustWithPermission() {
+        when(mPackageManager.checkPermission(TrustAgentManager.PERMISSION_PROVIDE_AGENT,
+                CANNED_PACKAGE_NAME)).thenReturn(PackageManager.PERMISSION_GRANTED);
+
+        ServiceInfo serviceInfo = new ServiceInfo();
+        serviceInfo.packageName = CANNED_PACKAGE_NAME;
+        ResolveInfo resolveInfo = new ResolveInfo();
+        resolveInfo.serviceInfo = serviceInfo;
+
+        assertThat(mTrustAgentManager.shouldProvideTrust(resolveInfo, mPackageManager))
+                .isTrue();
+    }
+
+    @Test
+    public void shouldProvideTrust_doesNotProvideTrustWithoutPermission() {
+        when(mPackageManager.checkPermission(TrustAgentManager.PERMISSION_PROVIDE_AGENT,
+                CANNED_PACKAGE_NAME)).thenReturn(PackageManager.PERMISSION_DENIED);
+
+        ServiceInfo serviceInfo = new ServiceInfo();
+        serviceInfo.packageName = CANNED_PACKAGE_NAME;
+        ResolveInfo resolveInfo = new ResolveInfo();
+        resolveInfo.serviceInfo = serviceInfo;
+
+        assertThat(mTrustAgentManager.shouldProvideTrust(resolveInfo, mPackageManager))
+                .isFalse();
+    }
+}
diff --git a/tests/robotests/src/com/android/settings/suggestions/SettingsSuggestionsTest.java b/tests/robotests/src/com/android/settings/suggestions/SettingsSuggestionsTest.java
index a7a9706..4f0bee2 100644
--- a/tests/robotests/src/com/android/settings/suggestions/SettingsSuggestionsTest.java
+++ b/tests/robotests/src/com/android/settings/suggestions/SettingsSuggestionsTest.java
@@ -41,7 +41,7 @@
 import java.util.Map;
 
 @RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
+@Config(manifest = MANIFEST_PATH, sdk = TestConfig.SDK_VERSION_O)
 public class SettingsSuggestionsTest {
 
     private static final String CATEGORY_FIRST_IMPRESSION =
@@ -68,7 +68,7 @@
 
     @Test
     public void wifiCallingSuggestion_isValid() {
-        assertSuggestionEquals("Settings$WifiCallingSuggestionActivity",
+        assertSuggestionEquals("com.android.settings.wifi.WifiCallingSuggestionActivity",
                 CATEGORY_FIRST_IMPRESSION,
                 R.string.wifi_calling_suggestion_title, R.string.wifi_calling_suggestion_summary);
     }
diff --git a/tests/robotests/src/com/android/settings/support/NewDeviceIntroSuggestionActivityTest.java b/tests/robotests/src/com/android/settings/support/NewDeviceIntroSuggestionActivityTest.java
index 75551e5..19d6aa9 100644
--- a/tests/robotests/src/com/android/settings/support/NewDeviceIntroSuggestionActivityTest.java
+++ b/tests/robotests/src/com/android/settings/support/NewDeviceIntroSuggestionActivityTest.java
@@ -17,6 +17,20 @@
 package com.android.settings.support;
 
 
+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;
+import static org.robolectric.RuntimeEnvironment.application;
+
 import android.content.Context;
 import android.content.Intent;
 import android.content.SharedPreferences;
@@ -33,23 +47,12 @@
 import org.mockito.Answers;
 import org.mockito.Mock;
 import org.mockito.MockitoAnnotations;
-import org.robolectric.RuntimeEnvironment;
+import org.robolectric.Shadows;
 import org.robolectric.annotation.Config;
-import 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;
+import org.robolectric.shadows.ShadowPackageManager;
 
 @RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION_O)
 public class NewDeviceIntroSuggestionActivityTest {
 
     @Mock(answer = Answers.RETURNS_DEEP_STUBS)
@@ -57,14 +60,14 @@
 
     private FakeFeatureFactory mFeatureFactory;
     private Context mContext;
-    private RobolectricPackageManager mRobolectricPackageManager;
+    private ShadowPackageManager mShadowPackageManager;
 
     @Before
     public void setUp() {
         MockitoAnnotations.initMocks(this);
         mFeatureFactory = FakeFeatureFactory.setupForTest(mMockContext);
-        mContext = RuntimeEnvironment.application;
-        mRobolectricPackageManager = RuntimeEnvironment.getRobolectricPackageManager();
+        mContext = application;
+        mShadowPackageManager = Shadows.shadowOf(application.getPackageManager());
 
         when(mFeatureFactory.suggestionsFeatureProvider.getSharedPrefs(any(Context.class)))
                 .thenReturn(getSharedPreferences());
@@ -115,7 +118,7 @@
                 .thenReturn("https://com.android.settings");
 
         final Intent intent = NewDeviceIntroSuggestionActivity.getLaunchIntent(mContext);
-        mRobolectricPackageManager.addResolveInfoForIntent(intent, new ResolveInfo());
+        mShadowPackageManager.addResolveInfoForIntent(intent, new ResolveInfo());
         assertThat(isSuggestionComplete(mContext)).isFalse();
     }
 
diff --git a/tests/robotests/src/com/android/settings/support/SupportConfigTest.java b/tests/robotests/src/com/android/settings/support/SupportConfigTest.java
index 28b0a9d..ae4fcff 100644
--- a/tests/robotests/src/com/android/settings/support/SupportConfigTest.java
+++ b/tests/robotests/src/com/android/settings/support/SupportConfigTest.java
@@ -28,7 +28,7 @@
 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_O)
 public class SupportConfigTest {
 
     @Test
diff --git a/tests/robotests/src/com/android/settings/support/SupportDashboardActivityTest.java b/tests/robotests/src/com/android/settings/support/SupportDashboardActivityTest.java
index 2c59ba7..e7de81c 100644
--- a/tests/robotests/src/com/android/settings/support/SupportDashboardActivityTest.java
+++ b/tests/robotests/src/com/android/settings/support/SupportDashboardActivityTest.java
@@ -19,33 +19,35 @@
 
 import static com.google.common.truth.Truth.assertThat;
 
+import static org.robolectric.RuntimeEnvironment.application;
+
 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 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.Shadows;
 import org.robolectric.annotation.Config;
 
 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_O)
 public class SupportDashboardActivityTest {
 
     private Context mContext;
 
     @Before
     public void setUp() {
-        mContext = RuntimeEnvironment.application;
+        mContext = application;
     }
 
     @Test
@@ -67,10 +69,11 @@
 
     @Test
     public void shouldHandleIntentAction() {
-        RuntimeEnvironment.getRobolectricPackageManager().setQueryIntentImplicitly(true);
+        PackageManager packageManager = application.getPackageManager();
+        Shadows.shadowOf(packageManager).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(
+        ResolveInfo resolveInfo = packageManager.resolveActivity(
                 intent,
                 PackageManager.MATCH_DEFAULT_ONLY);
         assertThat(resolveInfo).isNotNull();
diff --git a/tests/robotests/src/com/android/settings/support/SupportDisclaimerDialogFragmentTest.java b/tests/robotests/src/com/android/settings/support/SupportDisclaimerDialogFragmentTest.java
index 8cc05e0..cc025fb 100644
--- a/tests/robotests/src/com/android/settings/support/SupportDisclaimerDialogFragmentTest.java
+++ b/tests/robotests/src/com/android/settings/support/SupportDisclaimerDialogFragmentTest.java
@@ -37,10 +37,10 @@
 import static org.mockito.Mockito.times;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
-import static org.robolectric.internal.Shadow.directlyOn;
+import static org.robolectric.shadow.api.Shadow.directlyOn;
 
 @RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION,
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION_O,
         shadows = {SupportDisclaimerShadowResources.class})
 public class SupportDisclaimerDialogFragmentTest {
 
diff --git a/tests/robotests/src/com/android/settings/support/actionbar/HelpMenuControllerTest.java b/tests/robotests/src/com/android/settings/support/actionbar/HelpMenuControllerTest.java
new file mode 100644
index 0000000..24e7d81
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/support/actionbar/HelpMenuControllerTest.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.support.actionbar;
+
+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.Bundle;
+
+import com.android.settings.TestConfig;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
+import com.android.settingslib.core.lifecycle.ObservablePreferenceFragment;
+
+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_O)
+public class HelpMenuControllerTest {
+
+    @Mock
+    private Context mContext;
+    private TestFragment mHost;
+
+    @Before
+    public void setUp() {
+        MockitoAnnotations.initMocks(this);
+        mHost = spy(new TestFragment());
+        doReturn(mContext).when(mHost).getContext();
+    }
+
+    @Test
+    public void onCreateOptionsMenu_withArgumentOverride_shouldPrepareHelpUsingOverride() {
+        final Bundle bundle = new Bundle();
+        bundle.putInt(HelpResourceProvider.HELP_URI_RESOURCE_KEY, 123);
+        mHost.setArguments(bundle);
+
+        HelpMenuController.init(mHost);
+
+        mHost.getLifecycle().onCreateOptionsMenu(null /* menu */, null /* inflater */);
+
+        verify(mContext).getString(123);
+
+    }
+
+    @Test
+    public void onCreateOptionsMenu_noArgumentOverride_shouldPrepareHelpUsingProvider() {
+        HelpMenuController.init(mHost);
+
+        mHost.getLifecycle().onCreateOptionsMenu(null /* menu */, null /* inflater */);
+
+        verify(mContext).getString(mHost.getHelpResource());
+    }
+
+
+    public static class TestFragment extends ObservablePreferenceFragment
+            implements HelpResourceProvider {
+
+        @Override
+        public void onCreatePreferences(Bundle savedInstanceState, String rootKey) {
+
+        }
+    }
+}
diff --git a/tests/robotests/src/com/android/settings/survey/SurveyMixinTest.java b/tests/robotests/src/com/android/settings/survey/SurveyMixinTest.java
index 116b63c..3dbd1e6 100644
--- a/tests/robotests/src/com/android/settings/survey/SurveyMixinTest.java
+++ b/tests/robotests/src/com/android/settings/survey/SurveyMixinTest.java
@@ -32,7 +32,7 @@
 import org.robolectric.util.ReflectionHelpers;
 
 @RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION_O)
 public class SurveyMixinTest {
 
     private static final String FAKE_KEY = "fake_key";
diff --git a/tests/robotests/src/com/android/settings/system/FactoryResetPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/system/FactoryResetPreferenceControllerTest.java
index b986e4f..7ae6cdb 100644
--- a/tests/robotests/src/com/android/settings/system/FactoryResetPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/system/FactoryResetPreferenceControllerTest.java
@@ -39,7 +39,7 @@
 @RunWith(SettingsRobolectricTestRunner.class)
 @Config(
     manifest = TestConfig.MANIFEST_PATH,
-    sdk = TestConfig.SDK_VERSION,
+    sdk = TestConfig.SDK_VERSION_O,
     shadows = {ShadowSecureSettings.class, ShadowUtils.class}
 )
 public class FactoryResetPreferenceControllerTest {
diff --git a/tests/robotests/src/com/android/settings/system/SystemDashboardFragmentTest.java b/tests/robotests/src/com/android/settings/system/SystemDashboardFragmentTest.java
index cd25953..8a1951a 100644
--- a/tests/robotests/src/com/android/settings/system/SystemDashboardFragmentTest.java
+++ b/tests/robotests/src/com/android/settings/system/SystemDashboardFragmentTest.java
@@ -41,7 +41,7 @@
 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_O,
         shadows = {
                 ShadowUserManager.class,
                 SettingsShadowResources.class,
diff --git a/tests/robotests/src/com/android/settings/testutils/FakeFeatureFactory.java b/tests/robotests/src/com/android/settings/testutils/FakeFeatureFactory.java
index 6da7a66..dd5c76a 100644
--- a/tests/robotests/src/com/android/settings/testutils/FakeFeatureFactory.java
+++ b/tests/robotests/src/com/android/settings/testutils/FakeFeatureFactory.java
@@ -15,6 +15,10 @@
  */
 package com.android.settings.testutils;
 
+import static org.mockito.Matchers.anyString;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
+
 import android.content.Context;
 
 import com.android.settings.applications.ApplicationFeatureProvider;
@@ -30,14 +34,12 @@
 import com.android.settings.localepicker.LocaleFeatureProvider;
 import com.android.settings.overlay.FeatureFactory;
 import com.android.settings.overlay.SupportFeatureProvider;
-import com.android.settings.security.SecurityFeatureProvider;
-import com.android.settings.search.SearchFeatureProvider;
 import com.android.settings.overlay.SurveyFeatureProvider;
+import com.android.settings.search.SearchFeatureProvider;
+import com.android.settings.security.SecurityFeatureProvider;
 import com.android.settings.users.UserFeatureProvider;
 
-import static org.mockito.Matchers.anyString;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.when;
+import org.mockito.Answers;
 
 /**
  * Test util to provide fake FeatureFactory. To use this factory, call {@code setupForTest} in
@@ -67,6 +69,7 @@
      *
      * @param context The context must be a deep mock.
      */
+    @Deprecated
     public static FakeFeatureFactory setupForTest(Context context) {
         sFactory = null;
         when(context.getString(com.android.settings.R.string.config_featureFactory))
@@ -81,6 +84,14 @@
     }
 
     /**
+     * Call this in {@code @Before} method of the test class to use fake factory.
+     */
+    public static FakeFeatureFactory setupForTest() {
+        final Context context = mock(Context.class, Answers.RETURNS_DEEP_STUBS);
+        return setupForTest(context);
+    }
+
+    /**
      * Used by reflection. Do not call directly.
      */
     public FakeFeatureFactory() {
diff --git a/tests/robotests/src/com/android/settings/testutils/SettingsRobolectricTestRunner.java b/tests/robotests/src/com/android/settings/testutils/SettingsRobolectricTestRunner.java
index 91bfff2..2e8bac0 100644
--- a/tests/robotests/src/com/android/settings/testutils/SettingsRobolectricTestRunner.java
+++ b/tests/robotests/src/com/android/settings/testutils/SettingsRobolectricTestRunner.java
@@ -20,11 +20,11 @@
 
 import org.junit.runners.model.InitializationError;
 import org.robolectric.RobolectricTestRunner;
+import org.robolectric.android.controller.ActivityController;
 import org.robolectric.annotation.Config;
 import org.robolectric.manifest.AndroidManifest;
 import org.robolectric.res.Fs;
 import org.robolectric.res.ResourcePath;
-import org.robolectric.util.ActivityController;
 import org.robolectric.util.ReflectionHelpers;
 
 import java.util.List;
@@ -79,35 +79,35 @@
 
     public static void getIncludedResourcePaths(String packageName, List<ResourcePath> paths) {
         paths.add(new ResourcePath(
-                packageName,
+                null,
                 Fs.fileFromPath("./packages/apps/Settings/res"),
                 null));
         paths.add(new ResourcePath(
-                packageName,
+                null,
                 Fs.fileFromPath("./frameworks/base/packages/SettingsLib/res"),
                 null));
         paths.add(new ResourcePath(
-                packageName,
+                null,
                 Fs.fileFromPath("./frameworks/base/core/res/res"),
                 null));
         paths.add(new ResourcePath(
-                packageName,
+                null,
                 Fs.fileFromPath("./frameworks/opt/setupwizard/library/main/res"),
                 null));
         paths.add(new ResourcePath(
-                packageName,
+                null,
                 Fs.fileFromPath("./frameworks/opt/setupwizard/library/gingerbread/res"),
                 null));
         paths.add(new ResourcePath(
-                packageName,
+                null,
                 Fs.fileFromPath("./frameworks/opt/setupwizard/library/recyclerview/res"),
                 null));
         paths.add(new ResourcePath(
-                packageName,
+                null,
                 Fs.fileFromPath("./frameworks/support/v7/appcompat/res"),
                 null));
         paths.add(new ResourcePath(
-                packageName,
+                null,
                 Fs.fileFromPath("./frameworks/support/v7/cardview/res"),
                 null));
     }
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 c56438f..b0cd484 100644
--- a/tests/robotests/src/com/android/settings/testutils/shadow/SettingsShadowResources.java
+++ b/tests/robotests/src/com/android/settings/testutils/shadow/SettingsShadowResources.java
@@ -4,7 +4,7 @@
 
 import static org.robolectric.RuntimeEnvironment.application;
 import static org.robolectric.Shadows.shadowOf;
-import static org.robolectric.internal.Shadow.directlyOn;
+import static org.robolectric.shadow.api.Shadow.directlyOn;
 
 import android.annotation.DimenRes;
 import android.content.res.ColorStateList;
@@ -25,13 +25,13 @@
 import com.android.settings.R;
 
 import org.robolectric.RuntimeEnvironment;
+import org.robolectric.android.XmlResourceParserImpl;
 import org.robolectric.annotation.Implementation;
 import org.robolectric.annotation.Implements;
 import org.robolectric.annotation.RealObject;
-import org.robolectric.internal.Shadow;
 import org.robolectric.res.StyleData;
 import org.robolectric.res.StyleResolver;
-import org.robolectric.res.builder.XmlResourceParserImpl;
+import org.robolectric.res.ThemeStyleSet;
 import org.robolectric.shadows.ShadowAssetManager;
 import org.robolectric.shadows.ShadowResources;
 import org.robolectric.util.ReflectionHelpers;
@@ -54,7 +54,9 @@
     private static SparseArray<Object> sResourceOverrides = new SparseArray<>();
 
     public static void overrideResource(int id, Object value) {
-        sResourceOverrides.put(id, value);
+        synchronized (sResourceOverrides) {
+            sResourceOverrides.put(id, value);
+        }
     }
 
     public static void overrideResource(String name, Object value) {
@@ -67,7 +69,9 @@
     }
 
     public static void reset() {
-        sResourceOverrides.clear();
+        synchronized (sResourceOverrides) {
+            sResourceOverrides.clear();
+        }
     }
 
     @Implementation
@@ -97,6 +101,13 @@
         return directlyOn(realResources, Resources.class).getColorStateList(id, theme);
     }
 
+    /**
+     * Deprecated because SDK 24+ uses
+     * {@link SettingsShadowResourcesImpl#loadDrawable(Resources, TypedValue, int, int, Theme)}
+     *
+     * TODO: Delete when all tests have been migrated to sdk 26
+     */
+    @Deprecated
     @Implementation
     public Drawable loadDrawable(TypedValue value, int id, Theme theme)
             throws NotFoundException {
@@ -129,31 +140,40 @@
 
     @Implementation
     public String getString(int id) {
-        final Object override = sResourceOverrides.get(id);
+        final Object override;
+        synchronized (sResourceOverrides) {
+            override = sResourceOverrides.get(id);
+        }
         if (override instanceof String) {
             return (String) override;
         }
-        return Shadow.directlyOn(
+        return directlyOn(
                 realResources, Resources.class, "getString", ClassParameter.from(int.class, id));
     }
 
     @Implementation
     public int getInteger(int id) {
-        final Object override = sResourceOverrides.get(id);
+        final Object override;
+        synchronized (sResourceOverrides) {
+            override = sResourceOverrides.get(id);
+        }
         if (override instanceof Integer) {
             return (Integer) override;
         }
-        return Shadow.directlyOn(
+        return directlyOn(
                 realResources, Resources.class, "getInteger", ClassParameter.from(int.class, id));
     }
 
     @Implementation
     public boolean getBoolean(int id) {
-        final Object override = sResourceOverrides.get(id);
+        final Object override;
+        synchronized (sResourceOverrides) {
+            override = sResourceOverrides.get(id);
+        }
         if (override instanceof Boolean) {
             return (boolean) override;
         }
-        return Shadow.directlyOn(realResources, Resources.class, "getBoolean",
+        return directlyOn(realResources, Resources.class, "getBoolean",
                 ClassParameter.from(int.class, id));
     }
 
@@ -163,56 +183,70 @@
         @RealObject
         Theme realTheme;
 
+        private ShadowAssetManager mAssetManager = shadowOf(
+                RuntimeEnvironment.application.getAssets());
+
         @Implementation
         public TypedArray obtainStyledAttributes(
                 AttributeSet set, int[] attrs, int defStyleAttr, int defStyleRes) {
             // Replace all private string references with a placeholder.
             if (set != null) {
-                for (int i = 0; i < set.getAttributeCount(); ++i) {
-                    String attributeValue = set.getAttributeValue(i);
-                    Node node = ReflectionHelpers.callInstanceMethod(
-                            XmlResourceParserImpl.class, set, "getAttributeAt",
-                            ReflectionHelpers.ClassParameter.from(int.class, i));
-                    if (attributeValue.contains("attr/fingerprint_layout_theme")) {
-                        // Workaround for https://github.com/robolectric/robolectric/issues/2641
-                        node.setNodeValue("@style/FingerprintLayoutTheme");
-                    } else if (attributeValue.startsWith("@*android:string")) {
-                        node.setNodeValue("PLACEHOLDER");
+                synchronized (set) {
+                    for (int i = 0; i < set.getAttributeCount(); ++i) {
+                        final String attributeValue = set.getAttributeValue(i);
+                        final Node node = ReflectionHelpers.callInstanceMethod(
+                                XmlResourceParserImpl.class, set, "getAttributeAt",
+                                ReflectionHelpers.ClassParameter.from(int.class, i));
+                        if (attributeValue.contains("attr/fingerprint_layout_theme")) {
+                            // Workaround for https://github.com/robolectric/robolectric/issues/2641
+                            node.setNodeValue("@style/FingerprintLayoutTheme");
+                        } else if (attributeValue.startsWith("@*android:string")) {
+                            node.setNodeValue("PLACEHOLDER");
+                        }
                     }
                 }
             }
 
             // Track down all styles and remove all inheritance from private styles.
-            ShadowAssetManager assetManager = shadowOf(RuntimeEnvironment.application.getAssets());
-            // The Object's below are actually ShadowAssetManager.OverlayedStyle. We can't use it
-            // here because it's package private.
-            Map<Long, List<Object>> appliedStylesList =
-                    ReflectionHelpers.getField(assetManager, "appliedStyles");
-            for (Long idx : appliedStylesList.keySet()) {
-                List<Object> appliedStyles = appliedStylesList.get(idx);
-                for (Object appliedStyle : appliedStyles) {
-                    StyleResolver styleResolver = ReflectionHelpers.getField(appliedStyle, "style");
-                    List<StyleData> styleDatas =
-                            ReflectionHelpers.getField(styleResolver, "styles");
-                    for (StyleData styleData : styleDatas) {
-                        if (styleData.getParent() != null &&
-                                styleData.getParent().startsWith("@*android:style")) {
-                            ReflectionHelpers.setField(StyleData.class, styleData, "parent", null);
+            final Map<Long, Object /* NativeTheme */> appliedStylesList =
+                    ReflectionHelpers.getField(mAssetManager, "nativeThemes");
+            synchronized (appliedStylesList) {
+                for (Long idx : appliedStylesList.keySet()) {
+                    final ThemeStyleSet appliedStyles = ReflectionHelpers.getField(
+                            appliedStylesList.get(idx), "themeStyleSet");
+                    // The Object's below are actually ShadowAssetManager.OverlayedStyle.
+                    // We can't use
+
+                    // it here because it's private.
+                    final List<Object /* OverlayedStyle */> overlayedStyles =
+                            ReflectionHelpers.getField(appliedStyles, "styles");
+                    for (Object appliedStyle : overlayedStyles) {
+                        final StyleResolver styleResolver = ReflectionHelpers.getField(appliedStyle,
+                                "style");
+                        final List<StyleData> styleDatas =
+                                ReflectionHelpers.getField(styleResolver, "styles");
+                        for (StyleData styleData : styleDatas) {
+                            if (styleData.getParent() != null &&
+                                    styleData.getParent().startsWith("@*android:style")) {
+                                ReflectionHelpers.setField(StyleData.class, styleData, "parent",
+                                        null);
+                            }
                         }
                     }
-                }
 
+                }
             }
             return super.obtainStyledAttributes(set, attrs, defStyleAttr, defStyleRes);
         }
 
         @Implementation
-        public boolean resolveAttribute(int resid, TypedValue outValue, boolean resolveRefs) {
+        public synchronized boolean resolveAttribute(int resid, TypedValue outValue,
+                boolean resolveRefs) {
             // The real Resources instance in Robolectric tests somehow fails to find the
             // preferenceTheme attribute in the layout. Let's do it ourselves.
             if (getResources().getResourceName(resid)
                     .equals("com.android.settings:attr/preferenceTheme")) {
-                int preferenceThemeResId =
+                final int preferenceThemeResId =
                         getResources().getIdentifier(
                                 "PreferenceTheme", "style", "com.android.settings");
                 outValue.type = TYPE_REFERENCE;
@@ -223,5 +257,9 @@
             return directlyOn(realTheme, Theme.class)
                     .resolveAttribute(resid, outValue, resolveRefs);
         }
+
+        private Resources getResources() {
+            return ReflectionHelpers.callInstanceMethod(ShadowTheme.class, this, "getResources");
+        }
     }
 }
diff --git a/tests/robotests/src/com/android/settings/testutils/shadow/SettingsShadowResourcesImpl.java b/tests/robotests/src/com/android/settings/testutils/shadow/SettingsShadowResourcesImpl.java
new file mode 100644
index 0000000..42b02f3
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/testutils/shadow/SettingsShadowResourcesImpl.java
@@ -0,0 +1,57 @@
+/*
+ * Copyright (C) 2017 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF 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.res.Resources;
+import android.content.res.ResourcesImpl;
+import android.graphics.drawable.ColorDrawable;
+import android.graphics.drawable.Drawable;
+import android.util.TypedValue;
+
+import com.android.settings.R;
+
+import org.robolectric.annotation.Implementation;
+import org.robolectric.annotation.Implements;
+import org.robolectric.shadows.ShadowResourcesImpl;
+
+@Implements(
+        value = ResourcesImpl.class,
+        isInAndroidSdk = false,
+        minSdk = 26
+)
+public class SettingsShadowResourcesImpl extends ShadowResourcesImpl {
+
+    @Implementation
+    public Drawable loadDrawable(Resources wrapper, TypedValue value, int id, int density,
+            Resources.Theme theme) {
+        // The drawable item in switchbar_background.xml refers to a very recent color attribute
+        // that Robolectric isn't yet aware of.
+        // TODO: Remove this once Robolectric is updated.
+        if (id == R.drawable.switchbar_background) {
+            return new ColorDrawable();
+        } else if (id == R.drawable.ic_launcher_settings) {
+            // ic_launcher_settings uses adaptive-icon, which is not supported by robolectric,
+            // change it to a normal drawable.
+            id = R.drawable.ic_settings_wireless;
+        } else if (id == R.drawable.app_filter_spinner_background) {
+            id = R.drawable.ic_expand_more_inverse;
+        } else if (id == R.drawable.selectable_card_grey) {
+            id = R.drawable.ic_expand_more_inverse;
+        }
+        return super.loadDrawable(wrapper, value, id, density, theme);
+    }
+}
diff --git a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowAccessibilityManagerWrapperImpl.java b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowAccessibilityManagerWrapperImpl.java
index 95d5de5..22a1c04 100644
--- a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowAccessibilityManagerWrapperImpl.java
+++ b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowAccessibilityManagerWrapperImpl.java
@@ -16,7 +16,7 @@
 
 package com.android.settings.testutils.shadow;
 
-import com.android.settings.applications.AccessibilityManagerWrapperImpl;
+import com.android.settings.wrapper.AccessibilityManagerWrapper;
 
 import org.robolectric.annotation.Implementation;
 import org.robolectric.annotation.Implements;
@@ -24,7 +24,7 @@
 /**
  * This class provides shadow for API that is not supported in current roboletric
  */
-@Implements(AccessibilityManagerWrapperImpl.class)
+@Implements(AccessibilityManagerWrapper.class)
 public class ShadowAccessibilityManagerWrapperImpl {
 
     @Implementation
diff --git a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowAccessibilityServiceInfoWrapperImpl.java b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowAccessibilityServiceInfoWrapperImpl.java
index a6cb5d0..dd4b2ee 100644
--- a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowAccessibilityServiceInfoWrapperImpl.java
+++ b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowAccessibilityServiceInfoWrapperImpl.java
@@ -18,11 +18,11 @@
 
 import android.content.ComponentName;
 
-import com.android.settings.applications.AccessibilityServiceInfoWrapperImpl;
+import com.android.settings.wrapper.AccessibilityServiceInfoWrapper;
 
 import org.robolectric.annotation.Implementation;
 import org.robolectric.annotation.Implements;
-@Implements(AccessibilityServiceInfoWrapperImpl.class)
+@Implements(AccessibilityServiceInfoWrapper.class)
 public class ShadowAccessibilityServiceInfoWrapperImpl {
     private static ComponentName sComponentName;
 
diff --git a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowActivityManager.java b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowActivityManager.java
new file mode 100644
index 0000000..b7698b3
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowActivityManager.java
@@ -0,0 +1,36 @@
+/*
+ * Copyright (C) 2017 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF 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.ActivityManager;
+
+import org.robolectric.annotation.Implementation;
+import org.robolectric.annotation.Implements;
+
+@Implements(ActivityManager.class)
+public class ShadowActivityManager {
+    private static int sCurrentUserId = 0;
+
+    @Implementation
+    public static int getCurrentUser() {
+        return sCurrentUserId;
+    }
+
+    public static void setCurrentUser(int userId) {
+        sCurrentUserId = userId;
+    }
+}
diff --git a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowConnectivityManager.java b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowConnectivityManager.java
index 4c05665..742fbf8 100644
--- a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowConnectivityManager.java
+++ b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowConnectivityManager.java
@@ -17,6 +17,7 @@
 package com.android.settings.testutils.shadow;
 
 import android.net.ConnectivityManager;
+import android.util.SparseBooleanArray;
 
 import org.robolectric.annotation.Implementation;
 import org.robolectric.annotation.Implements;
@@ -24,14 +25,14 @@
 @Implements(ConnectivityManager.class)
 public class ShadowConnectivityManager extends org.robolectric.shadows.ShadowConnectivityManager {
 
-    private static boolean mIsNetworkSupported;
+    private final SparseBooleanArray mSupportedNetworkTypes = new SparseBooleanArray();
+
+    public void setNetworkSupported(int networkType, boolean supported) {
+        mSupportedNetworkTypes.put(networkType, supported);
+    }
 
     @Implementation
     public boolean isNetworkSupported(int networkType) {
-        return mIsNetworkSupported;
-    }
-
-    public static void setIsNetworkSupported(boolean isNetworkSupported) {
-        mIsNetworkSupported = isNetworkSupported;
+        return mSupportedNetworkTypes.get(networkType);
     }
 }
diff --git a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowDashboardFragment.java b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowDashboardFragment.java
new file mode 100644
index 0000000..9f64842
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowDashboardFragment.java
@@ -0,0 +1,40 @@
+/*
+ * Copyright (C) 2017 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF 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.os.Bundle;
+
+import com.android.settings.dashboard.DashboardFragment;
+
+import org.robolectric.annotation.Implementation;
+import org.robolectric.annotation.Implements;
+
+/**
+ * Shadow of {@link DashboardFragment}.
+ *
+ * Override the {@link #onCreate(Bundle)} to skip a null pointer exception in
+ * {@link android.content.res.Resources.Theme}, which we cannot mock it.
+ */
+@Implements(DashboardFragment.class)
+public class ShadowDashboardFragment {
+
+    @Implementation
+    public void onCreate(Bundle icicle) {
+        // do nothing
+    }
+}
diff --git a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowDevicePolicyManagerWrapper.java b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowDevicePolicyManagerWrapper.java
new file mode 100644
index 0000000..104cd87
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowDevicePolicyManagerWrapper.java
@@ -0,0 +1,51 @@
+/*
+ * Copyright (C) 2017 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.testutils.shadow;
+
+import android.content.ComponentName;
+
+import com.android.settings.wrapper.DevicePolicyManagerWrapper;
+
+import org.robolectric.annotation.Implementation;
+import org.robolectric.annotation.Implements;
+
+/**
+ * Shadow for {@link DevicePolicyManagerWrapper} to allow stubbing hidden methods.
+ */
+@Implements(DevicePolicyManagerWrapper.class)
+public class ShadowDevicePolicyManagerWrapper {
+    private static ComponentName deviceOComponentName = null;
+    private static int deviceOwnerUserId = -1;
+
+    @Implementation
+    public ComponentName getDeviceOwnerComponentOnAnyUser() {
+        return deviceOComponentName;
+    }
+
+    @Implementation
+    public int getDeviceOwnerUserId() {
+        return deviceOwnerUserId;
+    }
+
+    public static void setDeviceOComponentName(ComponentName deviceOComponentName) {
+        ShadowDevicePolicyManagerWrapper.deviceOComponentName = deviceOComponentName;
+    }
+
+    public static void setDeviceOwnerUserId(int deviceOwnerUserId) {
+        ShadowDevicePolicyManagerWrapper.deviceOwnerUserId = deviceOwnerUserId;
+    }
+}
diff --git a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowFingerprintManager.java b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowFingerprintManager.java
index b84cf42..d79e7aa 100644
--- a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowFingerprintManager.java
+++ b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowFingerprintManager.java
@@ -25,7 +25,7 @@
 import org.robolectric.annotation.Implementation;
 import org.robolectric.annotation.Implements;
 import org.robolectric.annotation.Resetter;
-import org.robolectric.internal.ShadowExtractor;
+import org.robolectric.shadow.api.Shadow;
 import org.robolectric.shadows.ShadowContextImpl;
 import org.robolectric.util.ReflectionHelpers;
 
@@ -96,7 +96,7 @@
     }
 
     public static ShadowFingerprintManager get() {
-        return (ShadowFingerprintManager) ShadowExtractor.extract(
+        return (ShadowFingerprintManager) Shadow.extract(
                 RuntimeEnvironment.application.getSystemService(FingerprintManager.class));
     }
 }
diff --git a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowFragment.java b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowFragment.java
new file mode 100644
index 0000000..4596559
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowFragment.java
@@ -0,0 +1,47 @@
+/*
+ * Copyright (C) 2017 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.testutils.shadow;
+
+import android.app.Fragment;
+import android.app.FragmentManager;
+
+import org.robolectric.annotation.Implementation;
+import org.robolectric.annotation.Implements;
+
+/**
+ * Override the {@link #setTargetFragment(Fragment, int)} to skip an illegal state exception
+ * in SDK 26. SDK 26 requires that the target fragment be in the same {@link FragmentManager} as
+ * the current {@link Fragment}. This is infeasible with our current framework.
+ */
+@Implements(
+        value = Fragment.class,
+        minSdk = 26
+)
+public class ShadowFragment {
+
+    private Fragment mTargetFragment;
+
+    @Implementation
+    public void setTargetFragment(Fragment fragment, int requestCode) {
+        mTargetFragment = fragment;
+    }
+
+    @Implementation
+    final public Fragment getTargetFragment() {
+        return mTargetFragment;
+    }
+}
diff --git a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowKeyStore.java b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowKeyStore.java
new file mode 100644
index 0000000..c025a33
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowKeyStore.java
@@ -0,0 +1,43 @@
+/*
+ * Copyright (C) 2017 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.testutils.shadow;
+
+import android.security.KeyStore;
+
+import org.robolectric.annotation.Implementation;
+import org.robolectric.annotation.Implements;
+import org.robolectric.annotation.Resetter;
+
+@Implements(KeyStore.class)
+public class ShadowKeyStore {
+
+    private static boolean sIsHardwareBacked;
+
+    @Resetter
+    public void reset() {
+        sIsHardwareBacked = false;
+    }
+
+    @Implementation
+    public boolean isHardwareBacked() {
+        return sIsHardwareBacked;
+    }
+
+    public static void setHardwareBacked(boolean hardwareBacked) {
+        sIsHardwareBacked = hardwareBacked;
+    }
+}
diff --git a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowKeyValueListParserWrapperImpl.java b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowKeyValueListParserWrapperImpl.java
index 0af9c30..05c6139 100644
--- a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowKeyValueListParserWrapperImpl.java
+++ b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowKeyValueListParserWrapperImpl.java
@@ -1,6 +1,6 @@
 package com.android.settings.testutils.shadow;
 
-import com.android.settings.fuelgauge.anomaly.KeyValueListParserWrapperImpl;
+import com.android.settings.wrapper.KeyValueListParserWrapper;
 
 import org.robolectric.annotation.Implementation;
 import org.robolectric.annotation.Implements;
@@ -10,7 +10,7 @@
  * {@link #getBoolean(String, boolean)} that doesn't support in the current
  * robolectric
  */
-@Implements(KeyValueListParserWrapperImpl.class)
+@Implements(KeyValueListParserWrapper.class)
 public class ShadowKeyValueListParserWrapperImpl {
 
     @Implementation
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 3182a93..e7f6be5 100644
--- a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowLockPatternUtils.java
+++ b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowLockPatternUtils.java
@@ -27,6 +27,8 @@
 public class ShadowLockPatternUtils {
 
     private int mPasswordQuality = 1;
+    private static boolean sDeviceEncryptionEnabled;
+
     @Implementation
     public boolean isSecure(int id) {
         return true;
@@ -42,6 +44,15 @@
         return mPasswordQuality;
     }
 
+    @Implementation
+    public static boolean isDeviceEncryptionEnabled() {
+        return sDeviceEncryptionEnabled;
+    }
+
+    public static void setDeviceEncryptionEnabled(boolean deviceEncryptionEnabled) {
+        sDeviceEncryptionEnabled = deviceEncryptionEnabled;
+    }
+
     // Non-Android accessor.
     public int getPasswordQuality() {
         return mPasswordQuality;
diff --git a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowPackageManagerWrapper.java b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowPackageManagerWrapper.java
new file mode 100644
index 0000000..7a1b8c5
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowPackageManagerWrapper.java
@@ -0,0 +1,47 @@
+/*
+ * Copyright (C) 2017 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.testutils.shadow;
+
+import android.content.pm.PackageManager.NameNotFoundException;
+
+import com.android.settingslib.wrapper.PackageManagerWrapper;
+
+import org.robolectric.annotation.Implementation;
+import org.robolectric.annotation.Implements;
+
+import java.util.HashMap;
+
+/**
+ * Shadow for {@link PackageManagerWrapper} to allow stubbing hidden methods.
+ */
+@Implements(PackageManagerWrapper.class)
+public class ShadowPackageManagerWrapper {
+    private static final HashMap<String, Integer> packageUids = new HashMap<>();
+
+    @Implementation
+    public int getPackageUidAsUser(String packageName, int userId) throws NameNotFoundException {
+        Integer res = packageUids.get(packageName + userId);
+        if (res == null) {
+            throw new NameNotFoundException();
+        }
+        return res;
+    }
+
+    public static void setPackageUidAsUser(String packageName, int userId, int uid) {
+        packageUids.put(packageName + userId, uid);
+    }
+}
diff --git a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowPackageMonitor.java b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowPackageMonitor.java
index b93b035..5a5f076 100644
--- a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowPackageMonitor.java
+++ b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowPackageMonitor.java
@@ -28,8 +28,7 @@
 import org.robolectric.annotation.Implementation;
 import org.robolectric.annotation.Implements;
 import org.robolectric.annotation.RealObject;
-import org.robolectric.internal.Shadow;
-import org.robolectric.internal.ShadowExtractor;
+import org.robolectric.shadow.api.Shadow;
 import org.robolectric.shadows.ShadowApplication;
 import org.robolectric.shadows.ShadowMessageQueue;
 
@@ -56,8 +55,8 @@
     }
 
     private static void setupBackgroundThreadScheduler() {
-        ShadowMessageQueue shadowMessageQueue = ((ShadowMessageQueue) ShadowExtractor.extract(
-                BackgroundThread.getHandler().getLooper().getQueue()));
+        ShadowMessageQueue shadowMessageQueue = Shadow.extract(
+                BackgroundThread.getHandler().getLooper().getQueue());
         shadowMessageQueue.setScheduler(
                 ShadowApplication.getInstance().getBackgroundThreadScheduler());
     }
diff --git a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowPowerManagerWrapper.java b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowPowerManagerWrapper.java
index 7aa28fa..b1e62b0 100644
--- a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowPowerManagerWrapper.java
+++ b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowPowerManagerWrapper.java
@@ -17,7 +17,7 @@
 
 package com.android.settings.testutils.shadow;
 
-import com.android.settings.display.PowerManagerWrapper;
+import com.android.settings.wrapper.PowerManagerWrapper;
 import org.robolectric.annotation.Implementation;
 import org.robolectric.annotation.Implements;
 
diff --git a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowRestrictedLockUtilsWrapper.java b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowRestrictedLockUtilsWrapper.java
index 0e0adce..58fc67a 100644
--- a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowRestrictedLockUtilsWrapper.java
+++ b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowRestrictedLockUtilsWrapper.java
@@ -1,7 +1,7 @@
 package com.android.settings.testutils.shadow;
 
 import android.content.Context;
-import com.android.settings.network.RestrictedLockUtilsWrapper;
+import com.android.settings.wrapper.RestrictedLockUtilsWrapper;
 import org.robolectric.annotation.Implements;
 
 /**
diff --git a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowRuntimePermissionPresenter.java b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowRuntimePermissionPresenter.java
new file mode 100644
index 0000000..834d285
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowRuntimePermissionPresenter.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.testutils.shadow;
+
+import android.content.Context;
+import android.content.pm.permission.RuntimePermissionPresenter;
+
+
+import org.robolectric.annotation.Implementation;
+import org.robolectric.annotation.Implements;
+
+@Implements(RuntimePermissionPresenter.class)
+public class ShadowRuntimePermissionPresenter {
+    private static RuntimePermissionPresenter mRuntimePermissionPresenter;
+
+    @Implementation
+    public static RuntimePermissionPresenter getInstance(Context context) {
+        return mRuntimePermissionPresenter;
+    }
+
+    public static void setRuntimePermissionPresenter(
+            RuntimePermissionPresenter runtimePermissionPresenter) {
+        mRuntimePermissionPresenter = runtimePermissionPresenter;
+    }
+}
diff --git a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowSettingsPreferenceFragment.java b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowSettingsPreferenceFragment.java
new file mode 100644
index 0000000..586ff48
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowSettingsPreferenceFragment.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.testutils.shadow;
+
+import android.os.Bundle;
+
+import com.android.settings.SettingsPreferenceFragment;
+import org.robolectric.annotation.Implementation;
+import org.robolectric.annotation.Implements;
+
+/**
+ * Shadow of {@link SettingsPreferenceFragment}.
+ *
+ * Override the {@link #onCreate(Bundle)} to skip a null pointer exception in
+ * {@link android.content.res.Resources.Theme}, much the same as {@link ShadowDashboardFragment}.
+ */
+@Implements(SettingsPreferenceFragment.class)
+public class ShadowSettingsPreferenceFragment {
+
+    @Implementation
+    public void onCreate(Bundle savedInstanceState) {
+        // do nothing
+    }
+}
\ No newline at end of file
diff --git a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowThreadUtils.java b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowThreadUtils.java
new file mode 100644
index 0000000..6b0411e
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowThreadUtils.java
@@ -0,0 +1,36 @@
+/*
+ * Copyright (C) 2017 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF 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.settingslib.utils.ThreadUtils;
+
+import org.robolectric.annotation.Implementation;
+import org.robolectric.annotation.Implements;
+
+@Implements(ThreadUtils.class)
+public class ShadowThreadUtils {
+
+    @Implementation
+    public static void postOnBackgroundThread(Runnable runnable) {
+        runnable.run();
+    }
+
+    @Implementation
+    public static void postOnMainThread(Runnable runnable) {
+        runnable.run();
+    }
+}
diff --git a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowTileUtils.java b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowTileUtils.java
new file mode 100644
index 0000000..1409daa
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowTileUtils.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.shadow;
+
+import android.content.Context;
+import android.content.IContentProvider;
+import android.util.Pair;
+
+import com.android.settings.R;
+import com.android.settingslib.drawer.TileUtils;
+
+import org.robolectric.RuntimeEnvironment;
+import org.robolectric.annotation.Implementation;
+import org.robolectric.annotation.Implements;
+
+import java.util.Map;
+
+@Implements(TileUtils.class)
+public class ShadowTileUtils {
+
+    public static final int ICON_RES_ID = R.drawable.ic_settings;
+    public static final String MOCK_SUMMARY = "summary";
+
+    @Implementation
+    public static String getTextFromUri(Context context, String uriString,
+            Map<String, IContentProvider> providerMap, String key) {
+        return MOCK_SUMMARY;
+    }
+
+    @Implementation
+    public static Pair<String, Integer> getIconFromUri(Context context, String packageName,
+            String uriString, Map<String, IContentProvider> providerMap) {
+        return Pair.create(RuntimeEnvironment.application.getPackageName(), ICON_RES_ID);
+    }
+
+}
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 860ee11..f24837d 100644
--- a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowUserManager.java
+++ b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowUserManager.java
@@ -19,24 +19,40 @@
 import android.annotation.UserIdInt;
 import android.content.Context;
 import android.content.pm.UserInfo;
+import android.os.UserHandle;
 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 org.robolectric.annotation.Resetter;
+import org.robolectric.shadow.api.Shadow;
 
+import java.util.ArrayList;
 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 extends org.robolectric.shadows.ShadowUserManager {
 
     private SparseArray<UserInfo> mUserInfos = new SparseArray<>();
+    private boolean mAdminUser;
+    private List<String> mRestrictions = new ArrayList<>();
+
+    public void setIsAdminUser(boolean isAdminUser) {
+        mAdminUser = isAdminUser;
+    }
+
+    @Resetter
+    public void reset() {
+        mRestrictions.clear();
+    }
+
+    @Implementation
+    public boolean isAdminUser() {
+        return mAdminUser;
+    }
 
     public void setUserInfo(int userHandle, UserInfo userInfo) {
         mUserInfos.put(userHandle, userInfo);
@@ -62,8 +78,17 @@
         return (UserManager) context.getSystemService(Context.USER_SERVICE);
     }
 
+    @Implementation
+    public boolean hasBaseUserRestriction(String restrictionKey, UserHandle userHandle) {
+        return mRestrictions.contains(restrictionKey);
+    }
+
+    public void addBaseUserRestriction(String restriction) {
+        mRestrictions.add(restriction);
+    }
+
     public static ShadowUserManager getShadow() {
-        return (ShadowUserManager) ShadowExtractor.extract(
+        return (ShadowUserManager) Shadow.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 271ffa8..0691086 100644
--- a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowUtils.java
+++ b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowUtils.java
@@ -22,7 +22,7 @@
 import android.os.UserManager;
 
 import com.android.settings.Utils;
-import com.android.settings.password.IFingerprintManager;
+import com.android.settings.wrapper.FingerprintManagerWrapper;
 
 import org.robolectric.annotation.Implementation;
 import org.robolectric.annotation.Implements;
@@ -30,7 +30,7 @@
 @Implements(Utils.class)
 public class ShadowUtils {
 
-    private static IFingerprintManager sFingerprintManager = null;
+    private static FingerprintManagerWrapper sFingerprintManager = null;
     private static boolean sIsUserAMonkey;
     private static boolean sIsDemoUser;
     private static ComponentName sDeviceOwnerComponentName;
@@ -41,11 +41,11 @@
     }
 
     @Implementation
-    public static IFingerprintManager getFingerprintManagerWrapperOrNull(Context context) {
+    public static FingerprintManagerWrapper getFingerprintManagerWrapperOrNull(Context context) {
         return sFingerprintManager;
     }
 
-    public static void setFingerprintManager(IFingerprintManager fingerprintManager) {
+    public static void setFingerprintManager(FingerprintManagerWrapper fingerprintManager) {
         sFingerprintManager = fingerprintManager;
     }
 
@@ -55,11 +55,6 @@
         sIsDemoUser = false;
     }
 
-    @Implementation
-    public static boolean isWifiOnly(Context context) {
-        return true;
-    }
-
     public static void setIsDemoUser(boolean isDemoUser) {
         sIsDemoUser = isDemoUser;
     }
diff --git a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowVibrator.java b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowVibrator.java
new file mode 100644
index 0000000..9046720
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowVibrator.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.testutils.shadow;
+
+import static org.mockito.Mockito.mock;
+
+import android.content.Context;
+import android.media.AudioAttributes;
+import android.os.SystemVibrator;
+import android.os.VibrationEffect;
+import android.os.Vibrator;
+
+import org.robolectric.annotation.Implementation;
+import org.robolectric.annotation.Implements;
+import org.robolectric.fakes.RoboVibrator;
+import org.robolectric.shadows.ShadowContextImpl;
+import org.robolectric.util.ReflectionHelpers;
+
+import java.util.Map;
+
+@Implements(SystemVibrator.class)
+public class ShadowVibrator {
+
+    private static Map<String, String> getSystemServiceMap() {
+        return ReflectionHelpers.getStaticField(ShadowContextImpl.class, "SYSTEM_SERVICE_MAP");
+    }
+
+    public static void addToServiceMap() {
+        getSystemServiceMap().put(Context.VIBRATOR_SERVICE, SystemVibrator.class.getName());
+    }
+
+    public static void reset() {
+        getSystemServiceMap().put(Context.VIBRATOR_SERVICE, RoboVibrator.class.getName());
+    }
+
+    public final Vibrator delegate = mock(Vibrator.class);
+
+    @Implementation
+    public void vibrate(int uid, String opPkg, VibrationEffect vibe, AudioAttributes attributes) {
+        delegate.vibrate(uid, opPkg, vibe, attributes);
+    }
+}
diff --git a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowWifiManager.java b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowWifiManager.java
new file mode 100644
index 0000000..e5304da
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowWifiManager.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 static org.robolectric.RuntimeEnvironment.application;
+
+import android.net.wifi.WifiConfiguration;
+import android.net.wifi.WifiManager;
+
+import org.robolectric.annotation.HiddenApi;
+import org.robolectric.annotation.Implementation;
+import org.robolectric.annotation.Implements;
+import org.robolectric.shadow.api.Shadow;
+
+@Implements(WifiManager.class)
+public class ShadowWifiManager extends org.robolectric.shadows.ShadowWifiManager {
+
+    public WifiConfiguration savedWifiConfig;
+
+    @HiddenApi // @SystemApi
+    @Implementation
+    public void connect(WifiConfiguration config, WifiManager.ActionListener listener) {
+        savedWifiConfig = config;
+    }
+
+    @HiddenApi
+    @Implementation
+    public void save(WifiConfiguration config, WifiManager.ActionListener listener) {
+        savedWifiConfig = config;
+    }
+
+    public static ShadowWifiManager get() {
+        return Shadow.extract(application.getSystemService(WifiManager.class));
+    }
+}
diff --git a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowZoneGetterData.java b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowZoneGetterData.java
new file mode 100644
index 0000000..1e6dbced
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowZoneGetterData.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.testutils.shadow;
+
+
+import android.icu.util.TimeZone;
+
+import com.android.settingslib.datetime.ZoneGetter;
+
+import org.robolectric.annotation.Implementation;
+import org.robolectric.annotation.Implements;
+
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+@Implements(ZoneGetter.ZoneGetterData.class)
+public class ShadowZoneGetterData {
+    private static final Map<String, List<String>> TIME_ZONE_LOOKUP = new HashMap<>();
+
+    static {
+        TIME_ZONE_LOOKUP.put("FR", Collections.singletonList(
+                TimeZone.getTimeZone("Europe/Paris", TimeZone.TIMEZONE_JDK).getID()));
+        TIME_ZONE_LOOKUP.put("ML", Collections.singletonList(
+                TimeZone.getTimeZone("Europe/Amsterdam", TimeZone.TIMEZONE_JDK).getID()));
+        TIME_ZONE_LOOKUP.put("US", Arrays.asList(
+                TimeZone.getTimeZone("America/New_York", TimeZone.TIMEZONE_JDK).getID()));
+        TIME_ZONE_LOOKUP.put("JP", Collections.singletonList(
+                TimeZone.getTimeZone("Asia/Tokyo", TimeZone.TIMEZONE_JDK).getID()));
+    }
+
+    @Implementation
+    public List<String> lookupTimeZoneIdsByCountry(String country) {
+        return TIME_ZONE_LOOKUP.get(country);
+    }
+}
diff --git a/tests/robotests/src/com/android/settings/trustagent/TrustAgentFeatureProviderImplTest.java b/tests/robotests/src/com/android/settings/trustagent/TrustAgentFeatureProviderImplTest.java
deleted file mode 100644
index b181253..0000000
--- a/tests/robotests/src/com/android/settings/trustagent/TrustAgentFeatureProviderImplTest.java
+++ /dev/null
@@ -1,80 +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.trustagent;
-
-import android.content.pm.ResolveInfo;
-import android.content.pm.ServiceInfo;
-import android.content.pm.PackageManager;
-
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.TestConfig;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
-import org.robolectric.annotation.Config;
-
-import static junit.framework.Assert.assertFalse;
-import static junit.framework.Assert.assertTrue;
-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 TrustAgentFeatureProviderImplTest {
-
-    private static final String CANNED_PACKAGE_NAME = "com.test.package";
-
-    @Mock
-    private PackageManager mPackageManager;
-
-    private TrustAgentManagerImpl mImpl;
-
-    @Before
-    public void setUp() throws PackageManager.NameNotFoundException {
-        MockitoAnnotations.initMocks(this);
-        mImpl = new TrustAgentManagerImpl();
-    }
-
-    @Test
-    public void shouldProvideTrust_doesProvideTrustWithPermission() {
-        when(mPackageManager.checkPermission(TrustAgentManager.PERMISSION_PROVIDE_AGENT,
-            CANNED_PACKAGE_NAME)).thenReturn(PackageManager.PERMISSION_GRANTED);
-
-        ServiceInfo serviceInfo = new ServiceInfo();
-        serviceInfo.packageName = CANNED_PACKAGE_NAME;
-        ResolveInfo resolveInfo = new ResolveInfo();
-        resolveInfo.serviceInfo = serviceInfo;
-
-        assertTrue(mImpl.shouldProvideTrust(resolveInfo, mPackageManager));
-    }
-
-    @Test
-    public void shouldProvideTrust_doesNotProvideTrustWithoutPermission() {
-        when(mPackageManager.checkPermission(TrustAgentManager.PERMISSION_PROVIDE_AGENT,
-            CANNED_PACKAGE_NAME)).thenReturn(PackageManager.PERMISSION_DENIED);
-
-        ServiceInfo serviceInfo = new ServiceInfo();
-        serviceInfo.packageName = CANNED_PACKAGE_NAME;
-        ResolveInfo resolveInfo = new ResolveInfo();
-        resolveInfo.serviceInfo = serviceInfo;
-
-        assertFalse(mImpl.shouldProvideTrust(resolveInfo, mPackageManager));
-    }
-}
diff --git a/tests/robotests/src/com/android/settings/users/UserFeatureProviderImplTest.java b/tests/robotests/src/com/android/settings/users/UserFeatureProviderImplTest.java
index e1bc157..8c10c31 100644
--- a/tests/robotests/src/com/android/settings/users/UserFeatureProviderImplTest.java
+++ b/tests/robotests/src/com/android/settings/users/UserFeatureProviderImplTest.java
@@ -37,7 +37,7 @@
 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_O)
 public class UserFeatureProviderImplTest {
     public static final int FIRST_USER_ID = 0;
     public static final int SECOND_USER_ID = 4;
diff --git a/tests/robotests/src/com/android/settings/users/UserPreferenceTest.java b/tests/robotests/src/com/android/settings/users/UserPreferenceTest.java
index 5b31a82..242604a 100644
--- a/tests/robotests/src/com/android/settings/users/UserPreferenceTest.java
+++ b/tests/robotests/src/com/android/settings/users/UserPreferenceTest.java
@@ -38,7 +38,7 @@
 import org.robolectric.util.ReflectionHelpers;
 
 @RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION_O)
 public class UserPreferenceTest {
 
     @Mock
diff --git a/tests/robotests/src/com/android/settings/users/UserSettingsTest.java b/tests/robotests/src/com/android/settings/users/UserSettingsTest.java
index a578364..28b8c86 100644
--- a/tests/robotests/src/com/android/settings/users/UserSettingsTest.java
+++ b/tests/robotests/src/com/android/settings/users/UserSettingsTest.java
@@ -16,30 +16,31 @@
 
 package com.android.settings.users;
 
+import static com.google.common.truth.Truth.assertThat;
+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.app.Activity;
 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.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.Robolectric;
-
-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 org.robolectric.annotation.Config;
 
 @RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION_O)
 public class UserSettingsTest {
 
     @Mock private UserManager mUserManager;
@@ -70,4 +71,9 @@
             mActivity.getString(R.string.users_summary, name));
     }
 
+    @Test
+    public void testAssignDefaultPhoto_ContextNull_ReturnFalseAndNotCrash() {
+        // Should not crash here
+        assertThat(UserSettings.assignDefaultPhoto(null, 0)).isFalse();
+    }
 }
diff --git a/tests/robotests/src/com/android/settings/utils/LocalClassLoaderContextThemeWrapperTest.java b/tests/robotests/src/com/android/settings/utils/LocalClassLoaderContextThemeWrapperTest.java
index 690c292..ac6dc02 100644
--- a/tests/robotests/src/com/android/settings/utils/LocalClassLoaderContextThemeWrapperTest.java
+++ b/tests/robotests/src/com/android/settings/utils/LocalClassLoaderContextThemeWrapperTest.java
@@ -32,7 +32,7 @@
 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_O)
 public class LocalClassLoaderContextThemeWrapperTest {
 
     @Mock(answer = Answers.RETURNS_DEEP_STUBS)
diff --git a/tests/robotests/src/com/android/settings/vpn2/AppDialogFragmentTest.java b/tests/robotests/src/com/android/settings/vpn2/AppDialogFragmentTest.java
index 4b4f3fb..587a82a 100644
--- a/tests/robotests/src/com/android/settings/vpn2/AppDialogFragmentTest.java
+++ b/tests/robotests/src/com/android/settings/vpn2/AppDialogFragmentTest.java
@@ -33,7 +33,7 @@
 import org.robolectric.annotation.Config;
 
 @RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION_O)
 public class AppDialogFragmentTest {
 
     @Mock
diff --git a/tests/robotests/src/com/android/settings/vpn2/VpnUtilsTest.java b/tests/robotests/src/com/android/settings/vpn2/VpnUtilsTest.java
index 2926727..5a029c7 100644
--- a/tests/robotests/src/com/android/settings/vpn2/VpnUtilsTest.java
+++ b/tests/robotests/src/com/android/settings/vpn2/VpnUtilsTest.java
@@ -18,6 +18,7 @@
 
 import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
+import com.android.settings.wrapper.ConnectivityManagerWrapper;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -31,7 +32,7 @@
  * Tests for {@link VpnUtils}.
  */
 @RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION_O)
 public final class VpnUtilsTest {
     @Test
     public void testIsAlwaysOnVpnSet() {
diff --git a/tests/robotests/src/com/android/settings/wallpaper/WallpaperSuggestionActivityTest.java b/tests/robotests/src/com/android/settings/wallpaper/WallpaperSuggestionActivityTest.java
index dd93938..b8fe81e 100644
--- a/tests/robotests/src/com/android/settings/wallpaper/WallpaperSuggestionActivityTest.java
+++ b/tests/robotests/src/com/android/settings/wallpaper/WallpaperSuggestionActivityTest.java
@@ -16,13 +16,18 @@
 
 package com.android.settings.wallpaper;
 
+import static com.google.common.truth.Truth.assertThat;
+import static org.mockito.Mockito.when;
+import static org.robolectric.Shadows.shadowOf;
+
 import android.content.Context;
 import android.content.Intent;
 import android.content.pm.PackageManager;
 
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.SubSettings;
 import com.android.settings.TestConfig;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
+import com.android.settings.wrapper.WallpaperManagerWrapper;
 
 import org.junit.Before;
 import org.junit.Test;
@@ -30,16 +35,17 @@
 import org.mockito.Mock;
 import org.mockito.MockitoAnnotations;
 import org.robolectric.Robolectric;
+import org.robolectric.android.controller.ActivityController;
 import org.robolectric.annotation.Config;
+import org.robolectric.annotation.Implementation;
+import org.robolectric.annotation.Implements;
 import org.robolectric.shadows.ShadowActivity;
-import org.robolectric.util.ActivityController;
-
-import static com.google.common.truth.Truth.assertThat;
-import static org.mockito.Mockito.when;
-import static org.robolectric.Shadows.shadowOf;
 
 @RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION_O,
+        shadows = {
+                WallpaperSuggestionActivityTest.ShadowWallpaperManagerWrapper.class
+        })
 public class WallpaperSuggestionActivityTest {
 
     @Mock
@@ -61,5 +67,42 @@
         final Intent intent = activity.getNextStartedActivity();
 
         assertThat(intent.getComponent().getClassName()).isEqualTo(SubSettings.class.getName());
+        assertThat(intent.getFlags()).isEqualTo(Intent.FLAG_ACTIVITY_FORWARD_RESULT);
+        assertThat(activity.isFinishing()).isTrue();
+    }
+
+    @Test
+    public void hasWallpaperSet_no_shouldReturnFalse() {
+        ShadowWallpaperManagerWrapper.setWallpaperId(0);
+
+        assertThat(WallpaperSuggestionActivity.isSuggestionComplete(mContext))
+                .isFalse();
+    }
+
+    @Test
+    public void hasWallpaperSet_yes_shouldReturnTrue() {
+        ShadowWallpaperManagerWrapper.setWallpaperId(100);
+
+        assertThat(WallpaperSuggestionActivity.isSuggestionComplete(mContext))
+                .isTrue();
+    }
+
+    @Implements(WallpaperManagerWrapper.class)
+    public static class ShadowWallpaperManagerWrapper {
+
+        private static int sWallpaperId;
+
+        public static void setWallpaperId(int id) {
+            sWallpaperId = id;
+        }
+
+        public static void reset() {
+            sWallpaperId = 0;
+        }
+
+        @Implementation
+        public int getWallpaperId(int which) {
+            return sWallpaperId;
+        }
     }
 }
diff --git a/tests/robotests/src/com/android/settings/wallpaper/WallpaperTypeSettingsTest.java b/tests/robotests/src/com/android/settings/wallpaper/WallpaperTypeSettingsTest.java
new file mode 100644
index 0000000..7e15f7a
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/wallpaper/WallpaperTypeSettingsTest.java
@@ -0,0 +1,67 @@
+package com.android.settings.wallpaper;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import static org.mockito.Mockito.doNothing;
+import static org.mockito.Mockito.doReturn;
+import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
+import static org.robolectric.RuntimeEnvironment.application;
+
+import android.app.Activity;
+import android.content.Intent;
+import android.support.v7.preference.Preference;
+
+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.ArgumentCaptor;
+import org.robolectric.Robolectric;
+import org.robolectric.annotation.Config;
+
+@RunWith(SettingsRobolectricTestRunner.class)
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION_O)
+public class WallpaperTypeSettingsTest {
+
+    private Preference mPreference;
+
+    private Intent mIntent;
+
+    @Before
+    public void setUp() {
+        mIntent = new Intent();
+        mPreference = new Preference(application);
+    }
+
+    @Test
+    public void testOnPreferenceTreeClick_intentNull_shouldDoNothing() {
+        Activity activity = Robolectric.setupActivity(Activity.class);
+        WallpaperTypeSettings fragment = spy(new WallpaperTypeSettings());
+        doReturn(activity).when(fragment).getActivity();
+
+        boolean handled = fragment.onPreferenceTreeClick(mPreference);
+
+        assertThat(handled).isFalse();
+    }
+
+    @Test
+    public void testOnPreferenceTreeClick_shouldLaunchIntentAndFinish() {
+        Activity activity = Robolectric.setupActivity(Activity.class);
+        WallpaperTypeSettings fragment = spy(new WallpaperTypeSettings());
+        doReturn(activity).when(fragment).getActivity();
+        mPreference.setIntent(mIntent);
+        doNothing().when(fragment).finish();
+        ArgumentCaptor<Intent> intent = ArgumentCaptor.forClass(Intent.class);
+        doNothing().when(fragment).startActivity(intent.capture());
+
+        boolean handled = fragment.onPreferenceTreeClick(mPreference);
+
+        assertThat(handled).isTrue();
+        verify(fragment, times(1)).finish();
+        assertThat(intent.getValue()).isSameAs(mIntent);
+    }
+}
diff --git a/tests/robotests/src/com/android/settings/webview/WebViewAppPickerTest.java b/tests/robotests/src/com/android/settings/webview/WebViewAppPickerTest.java
index e535445..d06980b 100644
--- a/tests/robotests/src/com/android/settings/webview/WebViewAppPickerTest.java
+++ b/tests/robotests/src/com/android/settings/webview/WebViewAppPickerTest.java
@@ -16,6 +16,22 @@
 
 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;
@@ -26,13 +42,13 @@
 import android.content.pm.UserInfo;
 import android.os.UserManager;
 
-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.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.widget.RadioButtonPreference;
+import com.android.settings.wrapper.UserPackageWrapper;
+import com.android.settingslib.wrapper.PackageManagerWrapper;
 
 import org.junit.Before;
 import org.junit.Test;
@@ -46,31 +62,17 @@
 
 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)
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION_O)
 public class WebViewAppPickerTest {
-    private Context mContext = RuntimeEnvironment.application;
+    private Context mContext;
 
-    private final static UserInfo FIRST_USER = new UserInfo(0, "FIRST_USER", 0);
-    private final static UserInfo SECOND_USER = new UserInfo(0, "SECOND_USER", 0);
+    private UserInfo mFirstUser;
+    private UserInfo mSecondUser;
 
     private final static String DEFAULT_PACKAGE_NAME = "DEFAULT_PACKAGE_NAME";
 
-    @Mock(answer = Answers.RETURNS_DEEP_STUBS)
+    @Mock
     private Activity mActivity;
     @Mock
     private UserManager mUserManager;
@@ -89,9 +91,10 @@
     @Before
     public void setUp() {
         MockitoAnnotations.initMocks(this);
-        FakeFeatureFactory.setupForTest(mActivity);
-        when(mActivity.getSystemService(Context.USER_SERVICE)).thenReturn(mUserManager);
-
+        mContext = spy(RuntimeEnvironment.application);
+        doReturn(mUserManager).when(mContext).getSystemService(Context.USER_SERVICE);
+        mFirstUser = new UserInfo(0, "FIRST_USER", 0);
+        mSecondUser = new UserInfo(0, "SECOND_USER", 0);
         mPicker = new WebViewAppPicker();
         mPicker = spy(mPicker);
         doNothing().when(mPicker).updateCandidates();
@@ -166,7 +169,7 @@
     @Test
     public void testDisabledPackageShownAsDisabled() {
         String disabledReason = "disabled";
-        DefaultAppInfo webviewAppInfo = mPicker.createDefaultAppInfo(mPackageManager,
+        DefaultAppInfo webviewAppInfo = mPicker.createDefaultAppInfo(mContext, mPackageManager,
                 createApplicationInfo(DEFAULT_PACKAGE_NAME), disabledReason);
 
         RadioButtonPreference mockPreference = mock(RadioButtonPreference.class);
@@ -181,7 +184,7 @@
     @Test
     public void testEnabledPackageShownAsEnabled() {
         String disabledReason = "";
-        DefaultAppInfo webviewAppInfo = mPicker.createDefaultAppInfo(mPackageManager,
+        DefaultAppInfo webviewAppInfo = mPicker.createDefaultAppInfo(mContext, mPackageManager,
                 createApplicationInfo(DEFAULT_PACKAGE_NAME), disabledReason);
 
         RadioButtonPreference mockPreference = mock(RadioButtonPreference.class);
@@ -196,7 +199,7 @@
     @Test
     public void testDisabledPackageShowsDisabledReasonSummary() {
         String disabledReason = "disabled";
-        DefaultAppInfo webviewAppInfo = mPicker.createDefaultAppInfo(mPackageManager,
+        DefaultAppInfo webviewAppInfo = mPicker.createDefaultAppInfo(mContext, mPackageManager,
                 createApplicationInfo(DEFAULT_PACKAGE_NAME), disabledReason);
 
         RadioButtonPreference mockPreference = mock(RadioButtonPreference.class);
@@ -212,7 +215,7 @@
     @Test
     public void testEnabledPackageShowsEmptySummary() {
         String disabledReason = null;
-        DefaultAppInfo webviewAppInfo = mPicker.createDefaultAppInfo(mPackageManager,
+        DefaultAppInfo webviewAppInfo = mPicker.createDefaultAppInfo(mContext, mPackageManager,
                 createApplicationInfo(DEFAULT_PACKAGE_NAME), disabledReason);
 
         RadioButtonPreference mockPreference = mock(RadioButtonPreference.class);
@@ -226,14 +229,14 @@
     @Test
     public void testFinishIfNotAdmin() {
         doReturn(false).when(mUserManager).isAdminUser();
-        mPicker.onAttach((Context) mActivity);
+        mPicker.onAttach(mContext);
         verify(mActivity, times(1)).finish();
     }
 
     @Test
     public void testNotFinishedIfAdmin() {
         doReturn(true).when(mUserManager).isAdminUser();
-        mPicker.onAttach((Context) mActivity);
+        mPicker.onAttach(mContext);
         verify(mActivity, never()).finish();
     }
 
@@ -260,14 +263,14 @@
         UserPackageWrapper packageForFirstUser = mock(UserPackageWrapper.class);
         when(packageForFirstUser.isEnabledPackage()).thenReturn(false);
         when(packageForFirstUser.isInstalledPackage()).thenReturn(true);
-        when(packageForFirstUser.getUserInfo()).thenReturn(FIRST_USER);
+        when(packageForFirstUser.getUserInfo()).thenReturn(mFirstUser);
 
         WebViewUpdateServiceWrapper wvusWrapper = mock(WebViewUpdateServiceWrapper.class);
         when(wvusWrapper.getPackageInfosAllUsers(any(), eq(DEFAULT_PACKAGE_NAME)))
                 .thenReturn(Arrays.asList(packageForFirstUser));
 
         final String EXPECTED_DISABLED_REASON = String.format(
-                "(disabled for user %s)", FIRST_USER.name);
+                "(disabled for user %s)", mFirstUser.name);
         assertThat(mPicker.getDisabledReason(wvusWrapper, mContext,
                 DEFAULT_PACKAGE_NAME)).isEqualTo(EXPECTED_DISABLED_REASON);
     }
@@ -277,14 +280,14 @@
         UserPackageWrapper packageForFirstUser = mock(UserPackageWrapper.class);
         when(packageForFirstUser.isEnabledPackage()).thenReturn(true);
         when(packageForFirstUser.isInstalledPackage()).thenReturn(false);
-        when(packageForFirstUser.getUserInfo()).thenReturn(FIRST_USER);
+        when(packageForFirstUser.getUserInfo()).thenReturn(mFirstUser);
 
         WebViewUpdateServiceWrapper wvusWrapper = mock(WebViewUpdateServiceWrapper.class);
         when(wvusWrapper.getPackageInfosAllUsers(any(), eq(DEFAULT_PACKAGE_NAME)))
                 .thenReturn(Arrays.asList(packageForFirstUser));
 
         final String EXPECTED_DISABLED_REASON = String.format(
-                "(uninstalled for user %s)", FIRST_USER.name);
+                "(uninstalled for user %s)", mFirstUser.name);
         assertThat(mPicker.getDisabledReason(wvusWrapper, mContext,
                 DEFAULT_PACKAGE_NAME)).isEqualTo(EXPECTED_DISABLED_REASON);
     }
@@ -294,19 +297,19 @@
         UserPackageWrapper packageForFirstUser = mock(UserPackageWrapper.class);
         when(packageForFirstUser.isEnabledPackage()).thenReturn(false);
         when(packageForFirstUser.isInstalledPackage()).thenReturn(true);
-        when(packageForFirstUser.getUserInfo()).thenReturn(FIRST_USER);
+        when(packageForFirstUser.getUserInfo()).thenReturn(mFirstUser);
 
         UserPackageWrapper packageForSecondUser = mock(UserPackageWrapper.class);
         when(packageForSecondUser.isEnabledPackage()).thenReturn(true);
         when(packageForSecondUser.isInstalledPackage()).thenReturn(false);
-        when(packageForSecondUser.getUserInfo()).thenReturn(SECOND_USER);
+        when(packageForSecondUser.getUserInfo()).thenReturn(mSecondUser);
 
         WebViewUpdateServiceWrapper wvusWrapper = mock(WebViewUpdateServiceWrapper.class);
         when(wvusWrapper.getPackageInfosAllUsers(any(), eq(DEFAULT_PACKAGE_NAME)))
                 .thenReturn(Arrays.asList(packageForFirstUser, packageForSecondUser));
 
         final String EXPECTED_DISABLED_REASON = String.format(
-                "(disabled for user %s)", FIRST_USER.name);
+                "(disabled for user %s)", mFirstUser.name);
         assertThat(mPicker.getDisabledReason(
                 wvusWrapper, mContext, DEFAULT_PACKAGE_NAME)).isEqualTo(EXPECTED_DISABLED_REASON);
     }
@@ -320,19 +323,19 @@
         UserPackageWrapper packageForFirstUser = mock(UserPackageWrapper.class);
         when(packageForFirstUser.isEnabledPackage()).thenReturn(false);
         when(packageForFirstUser.isInstalledPackage()).thenReturn(false);
-        when(packageForFirstUser.getUserInfo()).thenReturn(FIRST_USER);
+        when(packageForFirstUser.getUserInfo()).thenReturn(mFirstUser);
 
         UserPackageWrapper packageForSecondUser = mock(UserPackageWrapper.class);
         when(packageForSecondUser.isEnabledPackage()).thenReturn(true);
         when(packageForSecondUser.isInstalledPackage()).thenReturn(true);
-        when(packageForSecondUser.getUserInfo()).thenReturn(SECOND_USER);
+        when(packageForSecondUser.getUserInfo()).thenReturn(mSecondUser);
 
         WebViewUpdateServiceWrapper wvusWrapper = mock(WebViewUpdateServiceWrapper.class);
         when(wvusWrapper.getPackageInfosAllUsers(any(), eq(DEFAULT_PACKAGE_NAME)))
                 .thenReturn(Arrays.asList(packageForFirstUser, packageForSecondUser));
 
         final String EXPECTED_DISABLED_REASON = String.format(
-                "(uninstalled for user %s)", FIRST_USER.name);
+                "(uninstalled for user %s)", mFirstUser.name);
         assertThat(mPicker.getDisabledReason(wvusWrapper, mContext,
                 DEFAULT_PACKAGE_NAME)).isEqualTo(EXPECTED_DISABLED_REASON);
     }
@@ -346,7 +349,7 @@
         PackageItemInfo mockPackageItemInfo = mock(PackageItemInfo.class);
         mockPackageItemInfo.packageName = DEFAULT_PACKAGE_NAME;
         when(mockPackageItemInfo.loadLabel(any())).thenReturn("myPackage");
-        DefaultAppInfo webviewAppInfo = mPicker.createDefaultAppInfo(mPackageManager,
+        DefaultAppInfo webviewAppInfo = mPicker.createDefaultAppInfo(mContext, mPackageManager,
                 mockPackageItemInfo, "" /* disabledReason */);
 
         PackageInfo packageInfo = new PackageInfo();
diff --git a/tests/robotests/src/com/android/settings/webview/WebViewAppPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/webview/WebViewAppPreferenceControllerTest.java
deleted file mode 100644
index 5ce21e8..0000000
--- a/tests/robotests/src/com/android/settings/webview/WebViewAppPreferenceControllerTest.java
+++ /dev/null
@@ -1,58 +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.webview;
-
-import static com.google.common.truth.Truth.assertThat;
-import static org.mockito.Mockito.mock;
-
-import android.content.Context;
-import android.support.v7.preference.Preference;
-
-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 WebViewAppPreferenceControllerTest {
-    @Mock
-    private Context mContext;
-
-    private WebViewAppPreferenceController mController;
-
-    private static final String DEFAULT_PACKAGE_NAME = "DEFAULT_PACKAGE_NAME";
-
-    @Before
-    public void setUp() {
-        MockitoAnnotations.initMocks(this);
-        mController = new WebViewAppPreferenceController(mContext);
-    }
-
-    @Test
-    public void testIsAlwaysAvailable() {
-        assertThat(mController.isAvailable()).isTrue();
-    }
-
-    @Test
-    public void testNeverHandlesClick() {
-        assertThat(mController.handlePreferenceTreeClick(mock(Preference.class))).isFalse();
-    }
-}
diff --git a/tests/robotests/src/com/android/settings/wfd/WifiDisplaySettingsTest.java b/tests/robotests/src/com/android/settings/wfd/WifiDisplaySettingsTest.java
index 7d8ee52..a65bd3b 100644
--- a/tests/robotests/src/com/android/settings/wfd/WifiDisplaySettingsTest.java
+++ b/tests/robotests/src/com/android/settings/wfd/WifiDisplaySettingsTest.java
@@ -42,7 +42,7 @@
 import org.robolectric.annotation.Config;
 
 @RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION_O)
 public class WifiDisplaySettingsTest {
 
     @Mock
diff --git a/tests/robotests/src/com/android/settings/widget/ActionBarShadowControllerTest.java b/tests/robotests/src/com/android/settings/widget/ActionBarShadowControllerTest.java
index 41ba1e4..f69012e 100644
--- a/tests/robotests/src/com/android/settings/widget/ActionBarShadowControllerTest.java
+++ b/tests/robotests/src/com/android/settings/widget/ActionBarShadowControllerTest.java
@@ -17,7 +17,11 @@
 package com.android.settings.widget;
 
 
+import static android.arch.lifecycle.Lifecycle.Event.ON_START;
+import static android.arch.lifecycle.Lifecycle.Event.ON_STOP;
+
 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;
@@ -31,7 +35,6 @@
 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;
@@ -40,12 +43,9 @@
 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)
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION_O)
 public class ActionBarShadowControllerTest {
 
     @Mock
@@ -62,7 +62,7 @@
         MockitoAnnotations.initMocks(this);
         when(mActivity.getActionBar()).thenReturn(mActionBar);
         mView = new View(RuntimeEnvironment.application);
-        mLifecycle = new Lifecycle();
+        mLifecycle = new Lifecycle(() -> mLifecycle);
     }
 
     @Test
@@ -93,14 +93,13 @@
     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();
+        mLifecycle.handleLifecycleEvent(ON_START);
+        mLifecycle.handleLifecycleEvent(ON_STOP);
         verify(mRecyclerView).removeOnScrollListener(any());
 
-        mLifecycle.onStart();
+        mLifecycle.handleLifecycleEvent(ON_START);
         verify(mRecyclerView, times(2)).addOnScrollListener(any());
     }
 
diff --git a/tests/robotests/src/com/android/settings/widget/ActionButtonPreferenceTest.java b/tests/robotests/src/com/android/settings/widget/ActionButtonPreferenceTest.java
new file mode 100644
index 0000000..a215967
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/widget/ActionButtonPreferenceTest.java
@@ -0,0 +1,139 @@
+/*
+ * Copyright (C) 2017 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF 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.anyInt;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
+
+import android.content.Context;
+import android.support.v7.preference.PreferenceViewHolder;
+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 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_O)
+public class ActionButtonPreferenceTest {
+
+    private Context mContext;
+    private View mRootView;
+    private ActionButtonPreference mPref;
+    private PreferenceViewHolder mHolder;
+
+    @Before
+    public void setUp() {
+        mContext = RuntimeEnvironment.application;
+        mRootView = View.inflate(mContext, R.layout.two_action_buttons, null /* parent */);
+        mHolder = PreferenceViewHolder.createInstanceForTests(mRootView);
+        mPref = new ActionButtonPreference(mContext);
+    }
+
+    @Test
+    public void setVisibility_shouldUpdateButtonVisibility() {
+        mPref.setButton1Visible(false).setButton2Visible(false);
+        mPref.onBindViewHolder(mHolder);
+
+        assertThat(mRootView.findViewById(R.id.button1_positive).getVisibility())
+                .isEqualTo(View.INVISIBLE);
+        assertThat(mRootView.findViewById(R.id.button1_negative).getVisibility())
+                .isEqualTo(View.INVISIBLE);
+
+        assertThat(mRootView.findViewById(R.id.button2_positive).getVisibility())
+                .isEqualTo(View.INVISIBLE);
+        assertThat(mRootView.findViewById(R.id.button2_negative).getVisibility())
+                .isEqualTo(View.INVISIBLE);
+
+        mPref.setButton1Visible(true).setButton2Visible(true);
+        mPref.onBindViewHolder(mHolder);
+
+        assertThat(mRootView.findViewById(R.id.button1_positive).getVisibility())
+                .isEqualTo(View.VISIBLE);
+        assertThat(mRootView.findViewById(R.id.button1_negative).getVisibility())
+                .isEqualTo(View.INVISIBLE);
+        assertThat(mRootView.findViewById(R.id.button2_positive).getVisibility())
+                .isEqualTo(View.VISIBLE);
+        assertThat(mRootView.findViewById(R.id.button2_negative).getVisibility())
+                .isEqualTo(View.INVISIBLE);
+    }
+
+    @Test
+    public void setPositiveNegative_shouldHideOppositeButton() {
+        mPref.setButton1Positive(true).setButton2Positive(false);
+        mPref.onBindViewHolder(mHolder);
+
+        assertThat(mRootView.findViewById(R.id.button1_positive).getVisibility())
+                .isEqualTo(View.VISIBLE);
+        assertThat(mRootView.findViewById(R.id.button1_negative).getVisibility())
+                .isEqualTo(View.INVISIBLE);
+        assertThat(mRootView.findViewById(R.id.button2_positive).getVisibility())
+                .isEqualTo(View.INVISIBLE);
+        assertThat(mRootView.findViewById(R.id.button2_negative).getVisibility())
+                .isEqualTo(View.VISIBLE);
+    }
+
+    @Test
+    public void setEnabled_shouldEnableButton() {
+        mPref.setButton1Enabled(true).setButton2Enabled(false);
+        mPref.onBindViewHolder(mHolder);
+
+        assertThat(mRootView.findViewById(R.id.button1_positive).isEnabled()).isTrue();
+        assertThat(mRootView.findViewById(R.id.button1_negative).isEnabled()).isTrue();
+        assertThat(mRootView.findViewById(R.id.button2_positive).isEnabled()).isFalse();
+        assertThat(mRootView.findViewById(R.id.button2_negative).isEnabled()).isFalse();
+    }
+
+    @Test
+    public void setText() {
+        mPref.setButton1Text(R.string.settings_label);
+        mPref.onBindViewHolder(mHolder);
+
+        assertThat(((Button) mRootView.findViewById(R.id.button1_positive)).getText())
+                .isEqualTo(mContext.getText(R.string.settings_label));
+        assertThat(((Button) mRootView.findViewById(R.id.button1_negative)).getText())
+                .isEqualTo(mContext.getText(R.string.settings_label));
+    }
+
+    public static ActionButtonPreference createMock() {
+        final ActionButtonPreference pref = mock(ActionButtonPreference.class);
+        when(pref.setButton1Text(anyInt())).thenReturn(pref);
+        when(pref.setButton1Positive(anyBoolean())).thenReturn(pref);
+        when(pref.setButton1Enabled(anyBoolean())).thenReturn(pref);
+        when(pref.setButton1Visible(anyBoolean())).thenReturn(pref);
+        when(pref.setButton1OnClickListener(any(View.OnClickListener.class))).thenReturn(pref);
+
+        when(pref.setButton2Text(anyInt())).thenReturn(pref);
+        when(pref.setButton2Positive(anyBoolean())).thenReturn(pref);
+        when(pref.setButton2Enabled(anyBoolean())).thenReturn(pref);
+        when(pref.setButton2Visible(anyBoolean())).thenReturn(pref);
+        when(pref.setButton2OnClickListener(any(View.OnClickListener.class))).thenReturn(pref);
+        return pref;
+    }
+}
diff --git a/tests/robotests/src/com/android/settings/widget/AppPreferenceTest.java b/tests/robotests/src/com/android/settings/widget/AppPreferenceTest.java
new file mode 100644
index 0000000..6481f8a
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/widget/AppPreferenceTest.java
@@ -0,0 +1,78 @@
+/*
+ * Copyright (C) 2017 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF 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 android.content.Context;
+import android.support.v7.preference.PreferenceViewHolder;
+import android.view.View;
+
+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.robolectric.RuntimeEnvironment;
+import org.robolectric.annotation.Config;
+
+@RunWith(SettingsRobolectricTestRunner.class)
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION_O)
+public class AppPreferenceTest {
+
+    private Context mContext;
+    private View mRootView;
+    private AppPreference mPref;
+    private PreferenceViewHolder mHolder;
+
+    @Before
+    public void setUp() {
+        mContext = RuntimeEnvironment.application;
+        mRootView = View.inflate(mContext, R.layout.preference_app, null /* parent */);
+        mHolder = PreferenceViewHolder.createInstanceForTests(mRootView);
+        mPref = new AppPreference(mContext);
+    }
+
+    @Test
+    public void setProgress_showProgress() {
+        mPref.setProgress(1);
+        mPref.onBindViewHolder(mHolder);
+
+        assertThat(mHolder.findViewById(android.R.id.progress).getVisibility())
+                .isEqualTo(View.VISIBLE);
+    }
+
+    @Test
+    public void setSummary_showSummaryContainer() {
+        mPref.setSummary("test");
+        mPref.onBindViewHolder(mHolder);
+
+        assertThat(mHolder.findViewById(R.id.summary_container).getVisibility())
+                .isEqualTo(View.VISIBLE);
+    }
+
+    @Test
+    public void noSummary_hideSummaryContainer() {
+        mPref.setSummary(null);
+        mPref.onBindViewHolder(mHolder);
+
+        assertThat(mHolder.findViewById(R.id.summary_container).getVisibility())
+                .isEqualTo(View.GONE);
+    }
+}
diff --git a/tests/robotests/src/com/android/settings/widget/AppSwitchPreferenceTest.java b/tests/robotests/src/com/android/settings/widget/AppSwitchPreferenceTest.java
new file mode 100644
index 0000000..81537a8
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/widget/AppSwitchPreferenceTest.java
@@ -0,0 +1,69 @@
+/*
+ * Copyright (C) 2017 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.widget;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import android.content.Context;
+import android.support.v7.preference.PreferenceViewHolder;
+import android.view.View;
+
+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.robolectric.RuntimeEnvironment;
+import org.robolectric.annotation.Config;
+
+@RunWith(SettingsRobolectricTestRunner.class)
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION_O)
+public class AppSwitchPreferenceTest {
+
+    private Context mContext;
+    private View mRootView;
+    private AppSwitchPreference mPref;
+    private PreferenceViewHolder mHolder;
+
+    @Before
+    public void setUp() {
+        mContext = RuntimeEnvironment.application;
+        mRootView = View.inflate(mContext, R.layout.preference_app, null /* parent */);
+        mHolder = PreferenceViewHolder.createInstanceForTests(mRootView);
+        mPref = new AppSwitchPreference(mContext);
+    }
+
+    @Test
+    public void setSummary_showSummaryContainer() {
+        mPref.setSummary("test");
+        mPref.onBindViewHolder(mHolder);
+
+        assertThat(mHolder.findViewById(R.id.summary_container).getVisibility())
+                .isEqualTo(View.VISIBLE);
+    }
+
+    @Test
+    public void noSummary_hideSummaryContainer() {
+        mPref.setSummary(null);
+        mPref.onBindViewHolder(mHolder);
+
+        assertThat(mHolder.findViewById(R.id.summary_container).getVisibility())
+                .isEqualTo(View.GONE);
+    }
+}
diff --git a/tests/robotests/src/com/android/settings/widget/AspectRatioFrameLayoutTest.java b/tests/robotests/src/com/android/settings/widget/AspectRatioFrameLayoutTest.java
new file mode 100644
index 0000000..4a19258
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/widget/AspectRatioFrameLayoutTest.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.widget;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import android.content.Context;
+import android.view.View;
+
+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 org.robolectric.util.ReflectionHelpers;
+
+@RunWith(SettingsRobolectricTestRunner.class)
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION_O)
+public class AspectRatioFrameLayoutTest {
+
+    private Context mContext;
+    private AspectRatioFrameLayout mLayout;
+
+    @Before
+    public void setup() {
+        mContext = RuntimeEnvironment.application;
+    }
+
+    @Test
+    public void measure_squareAspectRatio_stretchHeight() {
+        mLayout = new AspectRatioFrameLayout(mContext);
+
+        int widthMeasureSpec = View.MeasureSpec.makeMeasureSpec(100, View.MeasureSpec.EXACTLY);
+        int heightMeasureSpec = View.MeasureSpec.makeMeasureSpec(50, View.MeasureSpec.EXACTLY);
+
+        mLayout.measure(widthMeasureSpec, heightMeasureSpec);
+
+        assertThat(mLayout.getMeasuredWidth()).isEqualTo(100);
+        assertThat(mLayout.getMeasuredHeight()).isEqualTo(100);
+    }
+
+    @Test
+    public void measure_squareAspectRatio_stretchWidth() {
+        mLayout = new AspectRatioFrameLayout(mContext);
+
+        int widthMeasureSpec = View.MeasureSpec.makeMeasureSpec(50, View.MeasureSpec.EXACTLY);
+        int heightMeasureSpec = View.MeasureSpec.makeMeasureSpec(100, View.MeasureSpec.EXACTLY);
+
+        mLayout.measure(widthMeasureSpec, heightMeasureSpec);
+
+        assertThat(mLayout.getMeasuredWidth()).isEqualTo(100);
+        assertThat(mLayout.getMeasuredHeight()).isEqualTo(100);
+    }
+
+    @Test
+    public void measure_squareAspectRatio_doNotStretch() {
+        mLayout = new AspectRatioFrameLayout(mContext);
+
+        int widthMeasureSpec = View.MeasureSpec.makeMeasureSpec(100, View.MeasureSpec.EXACTLY);
+        int heightMeasureSpec = View.MeasureSpec.makeMeasureSpec(100, View.MeasureSpec.EXACTLY);
+
+        mLayout.measure(widthMeasureSpec, heightMeasureSpec);
+
+        assertThat(mLayout.getMeasuredWidth()).isEqualTo(100);
+        assertThat(mLayout.getMeasuredHeight()).isEqualTo(100);
+    }
+
+    @Test
+    public void measure_rectangleAspectRatio_stretch() {
+        mLayout = new AspectRatioFrameLayout(mContext);
+        // Set aspect ratio to 2:1.
+        ReflectionHelpers.setField(mLayout, "mAspectRatio", 2f);
+
+        int widthMeasureSpec = View.MeasureSpec.makeMeasureSpec(100, View.MeasureSpec.EXACTLY);
+        int heightMeasureSpec = View.MeasureSpec.makeMeasureSpec(100, View.MeasureSpec.EXACTLY);
+
+        mLayout.measure(widthMeasureSpec, heightMeasureSpec);
+
+        // Should stretch width/height to 2:1 ratio
+        assertThat(mLayout.getMeasuredWidth()).isEqualTo(200);
+        assertThat(mLayout.getMeasuredHeight()).isEqualTo(100);
+    }
+}
diff --git a/tests/robotests/src/com/android/settings/widget/DefaultIndicatorSeekBarTest.java b/tests/robotests/src/com/android/settings/widget/DefaultIndicatorSeekBarTest.java
index 7fcf328..47a9aa6 100644
--- a/tests/robotests/src/com/android/settings/widget/DefaultIndicatorSeekBarTest.java
+++ b/tests/robotests/src/com/android/settings/widget/DefaultIndicatorSeekBarTest.java
@@ -29,7 +29,7 @@
 import static junit.framework.Assert.assertEquals;
 
 @RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION_O)
 public class DefaultIndicatorSeekBarTest {
 
     private DefaultIndicatorSeekBar mDefaultIndicatorSeekBar;
diff --git a/tests/robotests/src/com/android/settings/widget/EntityHeaderControllerTest.java b/tests/robotests/src/com/android/settings/widget/EntityHeaderControllerTest.java
index 9c6ee45..af30e4f 100644
--- a/tests/robotests/src/com/android/settings/widget/EntityHeaderControllerTest.java
+++ b/tests/robotests/src/com/android/settings/widget/EntityHeaderControllerTest.java
@@ -58,7 +58,7 @@
 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_O)
 public class EntityHeaderControllerTest {
 
     @Mock(answer = Answers.RETURNS_DEEP_STUBS)
diff --git a/tests/robotests/src/com/android/settings/widget/FixedLineSummaryPreferenceTest.java b/tests/robotests/src/com/android/settings/widget/FixedLineSummaryPreferenceTest.java
index 0d9a77b..5022ceb 100644
--- a/tests/robotests/src/com/android/settings/widget/FixedLineSummaryPreferenceTest.java
+++ b/tests/robotests/src/com/android/settings/widget/FixedLineSummaryPreferenceTest.java
@@ -38,7 +38,7 @@
 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_O)
 public class FixedLineSummaryPreferenceTest {
 
     @Mock
diff --git a/tests/robotests/src/com/android/settings/widget/LoadingViewControllerTest.java b/tests/robotests/src/com/android/settings/widget/LoadingViewControllerTest.java
index 09b52c8..6ab2b17 100644
--- a/tests/robotests/src/com/android/settings/widget/LoadingViewControllerTest.java
+++ b/tests/robotests/src/com/android/settings/widget/LoadingViewControllerTest.java
@@ -37,7 +37,7 @@
 import static org.mockito.Mockito.verify;
 
 @RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION_O)
 public class LoadingViewControllerTest {
 
     private Context mContext;
diff --git a/tests/robotests/src/com/android/settings/widget/MasterSwitchPreferenceTest.java b/tests/robotests/src/com/android/settings/widget/MasterSwitchPreferenceTest.java
index 1c449cc..c80c7b4 100644
--- a/tests/robotests/src/com/android/settings/widget/MasterSwitchPreferenceTest.java
+++ b/tests/robotests/src/com/android/settings/widget/MasterSwitchPreferenceTest.java
@@ -40,7 +40,7 @@
 import static org.mockito.Mockito.verify;
 
 @RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION_O)
 public class MasterSwitchPreferenceTest {
 
     private Context mContext;
diff --git a/tests/robotests/src/com/android/settings/widget/PreferenceCategoryControllerTest.java b/tests/robotests/src/com/android/settings/widget/PreferenceCategoryControllerTest.java
new file mode 100644
index 0000000..d8661bf
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/widget/PreferenceCategoryControllerTest.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.widget;
+
+import static com.google.common.truth.Truth.assertThat;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
+
+import android.content.Context;
+
+import com.android.settings.TestConfig;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
+import com.android.settingslib.core.AbstractPreferenceController;
+
+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.ArrayList;
+import java.util.List;
+
+@RunWith(SettingsRobolectricTestRunner.class)
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION_O)
+public class PreferenceCategoryControllerTest {
+
+    private Context mContext;
+    private PreferenceCategoryController mController;
+    private List<AbstractPreferenceController> mChildren;
+
+    @Before
+    public void setUp() {
+        mContext = RuntimeEnvironment.application;
+        mChildren = new ArrayList<>();
+        mController = new PreferenceCategoryController(mContext, "pref_key", mChildren);
+    }
+
+    @Test
+    public void isAvailable_noChildren_true() {
+        assertThat(mController.isAvailable()).isTrue();
+    }
+
+    @Test
+    public void isAvailable_childrenAvailable_true() {
+        final AbstractPreferenceController child = mock(AbstractPreferenceController.class);
+        when(child.isAvailable()).thenReturn(true);
+        mChildren.add(child);
+
+        assertThat(mController.isAvailable()).isTrue();
+    }
+
+    @Test
+    public void isAvailable_childrenUnavailable_false() {
+        final AbstractPreferenceController child = mock(AbstractPreferenceController.class);
+        when(child.isAvailable()).thenReturn(false);
+        mChildren.add(child);
+
+        assertThat(mController.isAvailable()).isFalse();
+    }
+}
diff --git a/tests/robotests/src/com/android/settings/widget/RadioButtonPickerFragmentTest.java b/tests/robotests/src/com/android/settings/widget/RadioButtonPickerFragmentTest.java
index e314ef3..9fc5b2e 100644
--- a/tests/robotests/src/com/android/settings/widget/RadioButtonPickerFragmentTest.java
+++ b/tests/robotests/src/com/android/settings/widget/RadioButtonPickerFragmentTest.java
@@ -16,15 +16,21 @@
 
 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.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
 import com.android.settings.applications.defaultapps.DefaultAppInfo;
 import com.android.settings.testutils.FakeFeatureFactory;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 
 import org.junit.Before;
 import org.junit.Test;
@@ -38,14 +44,8 @@
 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)
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION_O)
 public class RadioButtonPickerFragmentTest {
 
 
@@ -99,6 +99,11 @@
         assertThat(mFragment.setDefaultKeyCalled).isTrue();
     }
 
+    @Test
+    public void shouldHaveNoCustomPreferenceLayout() {
+        assertThat(mFragment.getRadioButtonPreferenceCustomLayoutResId()).isEqualTo(0);
+    }
+
     public static class TestFragment extends RadioButtonPickerFragment {
 
         boolean setDefaultKeyCalled;
@@ -109,6 +114,11 @@
         }
 
         @Override
+        protected int getPreferenceScreenResId() {
+            return 0;
+        }
+
+        @Override
         protected List<DefaultAppInfo> getCandidates() {
             return new ArrayList<>();
         }
diff --git a/tests/robotests/src/com/android/settings/widget/RingProgressBarTest.java b/tests/robotests/src/com/android/settings/widget/RingProgressBarTest.java
index a1a2f24..0226c22 100644
--- a/tests/robotests/src/com/android/settings/widget/RingProgressBarTest.java
+++ b/tests/robotests/src/com/android/settings/widget/RingProgressBarTest.java
@@ -31,7 +31,7 @@
 import static junit.framework.Assert.assertEquals;
 
 @RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION_O)
 public class RingProgressBarTest {
 
     private Context mContext = RuntimeEnvironment.application;
diff --git a/tests/robotests/src/com/android/settings/widget/RtlCompatibleViewPagerTest.java b/tests/robotests/src/com/android/settings/widget/RtlCompatibleViewPagerTest.java
index 78afc43..1072152 100644
--- a/tests/robotests/src/com/android/settings/widget/RtlCompatibleViewPagerTest.java
+++ b/tests/robotests/src/com/android/settings/widget/RtlCompatibleViewPagerTest.java
@@ -36,7 +36,7 @@
 @RunWith(SettingsRobolectricTestRunner.class)
 @Config(
     manifest = TestConfig.MANIFEST_PATH,
-    sdk = TestConfig.SDK_VERSION,
+    sdk = TestConfig.SDK_VERSION_O,
     shadows = {ShadowTextUtils.class}
 )
 public class RtlCompatibleViewPagerTest {
diff --git a/tests/robotests/src/com/android/settings/widget/ScrollToParentEditTextTest.java b/tests/robotests/src/com/android/settings/widget/ScrollToParentEditTextTest.java
index 5755015..8e91259 100644
--- a/tests/robotests/src/com/android/settings/widget/ScrollToParentEditTextTest.java
+++ b/tests/robotests/src/com/android/settings/widget/ScrollToParentEditTextTest.java
@@ -41,7 +41,7 @@
 import org.robolectric.shadows.ShadowView;
 
 @RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION_O)
 public class ScrollToParentEditTextTest {
 
     private static final int EDIT_TEXT_SIZE = 20;
diff --git a/tests/robotests/src/com/android/settings/widget/SummaryUpdaterTest.java b/tests/robotests/src/com/android/settings/widget/SummaryUpdaterTest.java
index 2f42550..8dbe552 100644
--- a/tests/robotests/src/com/android/settings/widget/SummaryUpdaterTest.java
+++ b/tests/robotests/src/com/android/settings/widget/SummaryUpdaterTest.java
@@ -34,7 +34,7 @@
 import static org.mockito.Mockito.verify;
 
 @RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION_O)
 public class SummaryUpdaterTest {
 
     private Context mContext;
diff --git a/tests/robotests/src/com/android/settings/widget/ValidatedEditTextPreferenceTest.java b/tests/robotests/src/com/android/settings/widget/ValidatedEditTextPreferenceTest.java
index e061787..ff2332c 100644
--- a/tests/robotests/src/com/android/settings/widget/ValidatedEditTextPreferenceTest.java
+++ b/tests/robotests/src/com/android/settings/widget/ValidatedEditTextPreferenceTest.java
@@ -17,6 +17,14 @@
 package com.android.settings.widget;
 
 
+import static com.google.common.truth.Truth.assertThat;
+import static org.mockito.Matchers.any;
+import static org.mockito.Matchers.anyInt;
+import static org.mockito.Mockito.never;
+import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
 import android.text.InputType;
 import android.text.TextWatcher;
 import android.view.View;
@@ -33,16 +41,8 @@
 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.Mockito.never;
-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_O)
 public class ValidatedEditTextPreferenceTest {
 
     @Mock
diff --git a/tests/robotests/src/com/android/settings/wifi/ConnectedAccessPointPreferenceTest.java b/tests/robotests/src/com/android/settings/wifi/ConnectedAccessPointPreferenceTest.java
new file mode 100644
index 0000000..2eaa587
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/wifi/ConnectedAccessPointPreferenceTest.java
@@ -0,0 +1,78 @@
+/*
+ * Copyright (C) 2017 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF 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 static org.mockito.Mockito.doReturn;
+import static org.mockito.Mockito.never;
+import static org.mockito.Mockito.verify;
+
+import android.content.Context;
+import android.view.View;
+
+import com.android.settings.R;
+import com.android.settings.TestConfig;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
+import com.android.settingslib.wifi.AccessPoint;
+
+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 ConnectedAccessPointPreferenceTest {
+    @Mock
+    private AccessPoint mAccessPoint;
+    @Mock
+    private View mView;
+    @Mock
+    private ConnectedAccessPointPreference.OnGearClickListener mOnGearClickListener;
+    private Context mContext;
+    private ConnectedAccessPointPreference mConnectedAccessPointPreference;
+
+
+    @Before
+    public void setUp() {
+        MockitoAnnotations.initMocks(this);
+
+        mContext = RuntimeEnvironment.application;
+        mConnectedAccessPointPreference = new ConnectedAccessPointPreference(mAccessPoint, mContext,
+                null, 0 /* iconResId */, false /* forSavedNetworks */);
+        mConnectedAccessPointPreference.setOnGearClickListener(mOnGearClickListener);
+    }
+
+    @Test
+    public void testOnClick_gearClicked_listenerInvoked() {
+        doReturn(R.id.settings_button).when(mView).getId();
+
+        mConnectedAccessPointPreference.onClick(mView);
+
+        verify(mOnGearClickListener).onGearClick(mConnectedAccessPointPreference);
+    }
+
+    @Test
+    public void testOnClick_gearNotClicked_listenerNotInvoked() {
+        mConnectedAccessPointPreference.onClick(mView);
+
+        verify(mOnGearClickListener, never()).onGearClick(mConnectedAccessPointPreference);
+    }
+
+}
diff --git a/tests/robotests/src/com/android/settings/wifi/SavedAccessPointsWifiSettingsTest.java b/tests/robotests/src/com/android/settings/wifi/SavedAccessPointsWifiSettingsTest.java
index 8a72d25..ec406cd 100644
--- a/tests/robotests/src/com/android/settings/wifi/SavedAccessPointsWifiSettingsTest.java
+++ b/tests/robotests/src/com/android/settings/wifi/SavedAccessPointsWifiSettingsTest.java
@@ -16,13 +16,12 @@
 
 package com.android.settings.wifi;
 
-import android.app.Activity;
-import android.content.Context;
 import android.net.wifi.WifiConfiguration;
-import android.net.wifi.WifiManager;
 import android.net.wifi.WifiManager.ActionListener;
-
+import android.os.Handler;
 import com.android.settings.TestConfig;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
+import com.android.settings.wrapper.WifiManagerWrapper;
 import com.android.settingslib.wifi.AccessPoint;
 import org.junit.Before;
 import org.junit.Test;
@@ -33,56 +32,70 @@
 import org.robolectric.annotation.Config;
 import org.robolectric.util.ReflectionHelpers;
 
-import static com.google.common.truth.Truth.assertThat;
-
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.ArgumentMatchers.eq;
-import static org.mockito.Mockito.doReturn;
-import static org.mockito.Mockito.spy;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
+import static org.mockito.Mockito.*;
 
 @RunWith(SettingsRobolectricTestRunner.class)
 @Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
 public class SavedAccessPointsWifiSettingsTest {
 
-  @Mock private Activity mActivity;
-  @Mock private WifiManager mockWifiManager;
-  @Mock private WifiDialog mockWifiDialog;
-  @Mock private WifiConfigController mockConfigController;
-  @Mock private WifiConfiguration mockWifiConfiguration;
-  @Mock private AccessPoint mockAccessPoint;
+    @Mock private WifiManagerWrapper mockWifiManager;
+    @Mock private WifiDialog mockWifiDialog;
+    @Mock private WifiConfigController mockConfigController;
+    @Mock private WifiConfiguration mockWifiConfiguration;
+    @Mock private AccessPoint mockAccessPoint;
+    @Mock private Handler mHandler;
 
-  private Context mContext;
+    private SavedAccessPointsWifiSettings mSettings;
 
-  private SavedAccessPointsWifiSettings mFragment;
+    @Before
+    public void setUp() {
+        MockitoAnnotations.initMocks(this);
+        mSettings = new SavedAccessPointsWifiSettings();
+        ReflectionHelpers.setField(mSettings, "mHandler", mHandler);
+        ReflectionHelpers.setField(mSettings, "mWifiManager", mockWifiManager);
 
-  @Before
-  public void setUp() {
-    MockitoAnnotations.initMocks(this);
-    mContext = RuntimeEnvironment.application;
-    mFragment = new SavedAccessPointsWifiSettings();
-    when(mockWifiDialog.getController()).thenReturn(mockConfigController);
-    when(mockConfigController.getConfig()).thenReturn(mockWifiConfiguration);
+        when(mockWifiDialog.getController()).thenReturn(mockConfigController);
+        when(mockConfigController.getConfig()).thenReturn(mockWifiConfiguration);
+    }
 
-    ReflectionHelpers.setField(mFragment, "mWifiManager", mockWifiManager);
-  }
+    @Test
+    public void onForget_isPasspointConfig_shouldSendMessageToHandler() {
+        final AccessPoint accessPoint = mock(AccessPoint.class);
+        when(accessPoint.isPasspointConfig()).thenReturn(true);
+        ReflectionHelpers.setField(mSettings, "mSelectedAccessPoint", accessPoint);
 
-  @Test
-  public void onSubmit_shouldInvokeSaveApi() {
-    mFragment.onSubmit(mockWifiDialog);
-    verify(mockWifiManager).save(eq(mockWifiConfiguration), any(ActionListener.class));
-  }
+        mSettings.onForget(null);
 
-  @Test
-  public void onForget_shouldInvokeForgetApi() {
-    ReflectionHelpers.setField(mFragment, "mSelectedAccessPoint", mockAccessPoint);
-    when(mockAccessPoint.getConfig()).thenReturn(mockWifiConfiguration);
+        verify(mHandler).sendEmptyMessage(mSettings.MSG_UPDATE_PREFERENCES);
+    }
 
-    mFragment.onForget(mockWifiDialog);
+    @Test
+    public void onForget_onSuccess_shouldSendMessageToHandler() {
+        mSettings.mForgetListener.onSuccess();
 
-    verify(mockWifiManager).forget(eq(mockWifiConfiguration.networkId), any(ActionListener.class));
-  }
+        verify(mHandler).sendEmptyMessage(mSettings.MSG_UPDATE_PREFERENCES);
+    }
+
+    @Test
+    public void onForget_onFailure_shouldSendMessageToHandler() {
+        mSettings.mForgetListener.onFailure(0);
+
+        verify(mHandler).sendEmptyMessage(mSettings.MSG_UPDATE_PREFERENCES);
+    }
+
+    @Test
+    public void onSubmit_shouldInvokeSaveApi() {
+        mSettings.onSubmit(mockWifiDialog);
+        verify(mockWifiManager).save(eq(mockWifiConfiguration), any(ActionListener.class));
+    }
+    @Test
+    public void onForget_shouldInvokeForgetApi() {
+        ReflectionHelpers.setField(mSettings, "mSelectedAccessPoint", mockAccessPoint);
+        when(mockAccessPoint.getConfig()).thenReturn(mockWifiConfiguration);
+        mSettings.onForget(mockWifiDialog);
+        verify(mockWifiManager).forget(eq(mockWifiConfiguration.networkId), any(ActionListener.class));
+    }
 }
+
diff --git a/tests/robotests/src/com/android/settings/wifi/UseOpenWifiPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/wifi/UseOpenWifiPreferenceControllerTest.java
index a76b82a..16d883a 100644
--- a/tests/robotests/src/com/android/settings/wifi/UseOpenWifiPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/wifi/UseOpenWifiPreferenceControllerTest.java
@@ -38,12 +38,13 @@
 
 import com.android.settings.R;
 import com.android.settings.TestConfig;
-import com.android.settings.network.NetworkScoreManagerWrapper;
 import com.android.settings.testutils.SettingsRobolectricTestRunner;
+import com.android.settings.wrapper.NetworkScoreManagerWrapper;
 import com.android.settingslib.core.lifecycle.Lifecycle;
 
 import com.google.common.collect.Lists;
 import org.junit.Before;
+import org.junit.BeforeClass;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.ArgumentCaptor;
@@ -59,12 +60,16 @@
 @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 NetworkScorerAppData APP_DATA =
-            new NetworkScorerAppData(0, null, null, ENABLE_ACTIVITY_COMPONENT, null);
-    private static NetworkScorerAppData APP_DATA_NO_ACTIVITY =
-            new NetworkScorerAppData(0, null, null, null, null);
+    private static ComponentName sEnableActivityComponent;
+    private static NetworkScorerAppData sAppData;
+    private static NetworkScorerAppData sAppDataNoActivity;
+
+    @BeforeClass
+    public static void beforeClass() {
+        sEnableActivityComponent = new ComponentName("package", "activityClass");
+        sAppData = new NetworkScorerAppData(0, null, null, sEnableActivityComponent, null);
+        sAppDataNoActivity = new NetworkScorerAppData(0, null, null, null, null);
+    }
 
     @Mock private Lifecycle mLifecycle;
     @Mock private Fragment mFragment;
@@ -92,7 +97,7 @@
      */
     private void setupScorers(@NonNull List<NetworkScorerAppData> scorers) {
         when(mNetworkScoreManagerWrapper.getActiveScorerPackage()).thenReturn(
-                ENABLE_ACTIVITY_COMPONENT.getPackageName());
+                sEnableActivityComponent.getPackageName());
         when(mNetworkScoreManagerWrapper.getAllValidScorers()).thenReturn(scorers);
         when(mNetworkScoreManagerWrapper.getActiveScorer()).thenReturn(scorers.get(0));
     }
@@ -106,7 +111,7 @@
 
     @Test
     public void testIsAvailable_returnsFalseWhenScorersNotSupported() {
-        setupScorers(Lists.newArrayList(APP_DATA_NO_ACTIVITY));
+        setupScorers(Lists.newArrayList(sAppDataNoActivity));
         createController();
 
         assertThat(mController.isAvailable()).isFalse();
@@ -114,7 +119,7 @@
 
     @Test
     public void testIsAvailable_returnsTrueIfActiveScorerSupported() {
-        setupScorers(Lists.newArrayList(APP_DATA, APP_DATA_NO_ACTIVITY));
+        setupScorers(Lists.newArrayList(sAppData, sAppDataNoActivity));
         createController();
 
         assertThat(mController.isAvailable()).isTrue();
@@ -122,8 +127,8 @@
 
     @Test
     public void testIsAvailable_returnsTrueIfNonActiveScorerSupported() {
-        setupScorers(Lists.newArrayList(APP_DATA_NO_ACTIVITY, APP_DATA));
-        when(mNetworkScoreManagerWrapper.getActiveScorer()).thenReturn(APP_DATA_NO_ACTIVITY);
+        setupScorers(Lists.newArrayList(sAppDataNoActivity, sAppData));
+        when(mNetworkScoreManagerWrapper.getActiveScorer()).thenReturn(sAppDataNoActivity);
         createController();
 
         assertThat(mController.isAvailable()).isTrue();
@@ -150,7 +155,7 @@
 
     @Test
     public void onPreferenceChange_matchingKeyAndAvailable_enableShouldStartEnableActivity() {
-        setupScorers(Lists.newArrayList(APP_DATA, APP_DATA_NO_ACTIVITY));
+        setupScorers(Lists.newArrayList(sAppData, sAppDataNoActivity));
         createController();
 
         final SwitchPreference pref = new SwitchPreference(mContext);
@@ -160,15 +165,15 @@
         verify(mFragment).startActivityForResult(mIntentCaptor.capture(),
                 eq(REQUEST_CODE_OPEN_WIFI_AUTOMATICALLY));
         Intent activityIntent = mIntentCaptor.getValue();
-        assertThat(activityIntent.getComponent()).isEqualTo(ENABLE_ACTIVITY_COMPONENT);
+        assertThat(activityIntent.getComponent()).isEqualTo(sEnableActivityComponent);
         assertThat(activityIntent.getAction()).isEqualTo(NetworkScoreManager.ACTION_CUSTOM_ENABLE);
     }
 
     @Test
     public void onPreferenceChange_matchingKeyAndAvailable_disableShouldUpdateSetting() {
-        setupScorers(Lists.newArrayList(APP_DATA, APP_DATA_NO_ACTIVITY));
+        setupScorers(Lists.newArrayList(sAppData, sAppDataNoActivity));
         Settings.Global.putString(mContext.getContentResolver(), USE_OPEN_WIFI_PACKAGE,
-                ENABLE_ACTIVITY_COMPONENT.getPackageName());
+                sEnableActivityComponent.getPackageName());
 
         createController();
 
@@ -182,7 +187,7 @@
 
     @Test
     public void onActivityResult_nonmatchingRequestCode_shouldDoNothing() {
-        setupScorers(Lists.newArrayList(APP_DATA, APP_DATA_NO_ACTIVITY));
+        setupScorers(Lists.newArrayList(sAppData, sAppDataNoActivity));
         createController();
 
         assertThat(mController.onActivityResult(234 /* requestCode */ , Activity.RESULT_OK))
@@ -193,7 +198,7 @@
 
     @Test
     public void onActivityResult_matchingRequestCode_nonOkResult_shouldDoNothing() {
-        setupScorers(Lists.newArrayList(APP_DATA, APP_DATA_NO_ACTIVITY));
+        setupScorers(Lists.newArrayList(sAppData, sAppDataNoActivity));
         createController();
 
         assertThat(mController
@@ -205,24 +210,24 @@
 
     @Test
     public void onActivityResult_matchingRequestCode_okResult_updatesSetting() {
-        setupScorers(Lists.newArrayList(APP_DATA, APP_DATA_NO_ACTIVITY));
+        setupScorers(Lists.newArrayList(sAppData, sAppDataNoActivity));
         createController();
 
         assertThat(mController
                 .onActivityResult(REQUEST_CODE_OPEN_WIFI_AUTOMATICALLY, Activity.RESULT_OK))
                 .isEqualTo(true);
         assertThat(Settings.Global.getString(mContext.getContentResolver(), USE_OPEN_WIFI_PACKAGE))
-                .isEqualTo(ENABLE_ACTIVITY_COMPONENT.getPackageName());
+                .isEqualTo(sEnableActivityComponent.getPackageName());
     }
 
     @Test
     public void updateState_noEnableActivity_preferenceDisabled_summaryChanged() {
-        setupScorers(Lists.newArrayList(APP_DATA_NO_ACTIVITY));
+        setupScorers(Lists.newArrayList(sAppDataNoActivity));
         createController();
 
         final SwitchPreference preference = mock(SwitchPreference.class);
         Settings.Global.putString(mContext.getContentResolver(), USE_OPEN_WIFI_PACKAGE,
-                ENABLE_ACTIVITY_COMPONENT.getPackageName());
+                sEnableActivityComponent.getPackageName());
 
         mController.updateState(preference);
 
@@ -238,7 +243,7 @@
 
         final SwitchPreference preference = mock(SwitchPreference.class);
         Settings.Global.putString(mContext.getContentResolver(), USE_OPEN_WIFI_PACKAGE,
-                ENABLE_ACTIVITY_COMPONENT.getPackageName());
+                sEnableActivityComponent.getPackageName());
 
         mController.updateState(preference);
 
@@ -249,12 +254,12 @@
 
     @Test
     public void updateState_enableActivityExists_preferenceEnabled() {
-        setupScorers(Lists.newArrayList(APP_DATA, APP_DATA_NO_ACTIVITY));
+        setupScorers(Lists.newArrayList(sAppData, sAppDataNoActivity));
         createController();
 
         final SwitchPreference preference = mock(SwitchPreference.class);
         Settings.Global.putString(mContext.getContentResolver(), USE_OPEN_WIFI_PACKAGE,
-                ENABLE_ACTIVITY_COMPONENT.getPackageName());
+                sEnableActivityComponent.getPackageName());
 
         mController.updateState(preference);
 
diff --git a/tests/robotests/src/com/android/settings/wifi/WifiDialogActivityTest.java b/tests/robotests/src/com/android/settings/wifi/WifiDialogActivityTest.java
new file mode 100644
index 0000000..40c1478
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/wifi/WifiDialogActivityTest.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;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import static org.mockito.Mockito.doReturn;
+
+import android.content.Intent;
+import android.net.wifi.WifiConfiguration;
+
+import com.android.settings.TestConfig;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.shadow.SettingsShadowResources;
+import com.android.settings.testutils.shadow.ShadowConnectivityManager;
+import com.android.settings.testutils.shadow.ShadowWifiManager;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.mockito.MockitoAnnotations;
+import org.robolectric.Robolectric;
+import org.robolectric.annotation.Config;
+import org.robolectric.shadows.ShadowAlertDialog;
+import org.robolectric.util.ReflectionHelpers;
+
+@RunWith(SettingsRobolectricTestRunner.class)
+@Config(
+        manifest = TestConfig.MANIFEST_PATH,
+        sdk = TestConfig.SDK_VERSION_O,
+        shadows = {
+                SettingsShadowResources.class,
+                SettingsShadowResources.SettingsShadowTheme.class,
+                ShadowConnectivityManager.class,
+                ShadowWifiManager.class
+        }
+)
+public class WifiDialogActivityTest {
+
+    public static final String AP1_SSID = "\"ap1\"";
+    @Mock
+    private WifiConfigController mController;
+
+    @Before
+    public void setUp() {
+        MockitoAnnotations.initMocks(this);
+
+        WifiConfiguration wifiConfig = new WifiConfiguration();
+        wifiConfig.SSID = AP1_SSID;
+        doReturn(wifiConfig).when(mController).getConfig();
+    }
+
+    @Test
+    public void onSubmit_shouldConnectToNetwork() {
+        WifiDialogActivity activity = Robolectric.setupActivity(WifiDialogActivity.class);
+        WifiDialog dialog = (WifiDialog) ShadowAlertDialog.getLatestAlertDialog();
+        assertThat(dialog).isNotNull();
+
+        ReflectionHelpers.setField(dialog, "mController", mController);
+
+        activity.onSubmit(dialog);
+
+        assertThat(ShadowWifiManager.get().savedWifiConfig.SSID).isEqualTo(AP1_SSID);
+    }
+
+    @Test
+    public void onSubmit_shouldNotConnectToNetwork_whenConnectForCallerIsFalse() {
+        WifiDialogActivity activity =
+                Robolectric.buildActivity(
+                        WifiDialogActivity.class,
+                        new Intent().putExtra(WifiDialogActivity.KEY_CONNECT_FOR_CALLER, false))
+                .setup().get();
+        WifiDialog dialog = (WifiDialog) ShadowAlertDialog.getLatestAlertDialog();
+        assertThat(dialog).isNotNull();
+
+        ReflectionHelpers.setField(dialog, "mController", mController);
+
+        activity.onSubmit(dialog);
+
+        assertThat(ShadowWifiManager.get().savedWifiConfig).isNull();
+    }
+}
diff --git a/tests/robotests/src/com/android/settings/wifi/WifiEnablerTest.java b/tests/robotests/src/com/android/settings/wifi/WifiEnablerTest.java
index c7647ba..63f89e6 100644
--- a/tests/robotests/src/com/android/settings/wifi/WifiEnablerTest.java
+++ b/tests/robotests/src/com/android/settings/wifi/WifiEnablerTest.java
@@ -24,6 +24,7 @@
 import com.android.settings.TestConfig;
 import com.android.settings.core.instrumentation.MetricsFeatureProvider;
 import com.android.settings.widget.SwitchWidgetController;
+import com.android.settings.wrapper.ConnectivityManagerWrapper;
 
 import org.junit.Before;
 import org.junit.Test;
diff --git a/tests/robotests/src/com/android/settings/wifi/WifiInfoPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/wifi/WifiInfoPreferenceControllerTest.java
index 1650816..cf3cca7 100644
--- a/tests/robotests/src/com/android/settings/wifi/WifiInfoPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/wifi/WifiInfoPreferenceControllerTest.java
@@ -16,6 +16,16 @@
 
 package com.android.settings.wifi;
 
+import static android.arch.lifecycle.Lifecycle.Event.ON_PAUSE;
+import static android.arch.lifecycle.Lifecycle.Event.ON_RESUME;
+
+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.verify;
+import static org.mockito.Mockito.when;
+
 import android.content.BroadcastReceiver;
 import android.content.Context;
 import android.content.IntentFilter;
@@ -23,8 +33,8 @@
 import android.support.v7.preference.Preference;
 import android.support.v7.preference.PreferenceScreen;
 
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settingslib.core.lifecycle.Lifecycle;
 
 import org.junit.Before;
@@ -35,12 +45,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.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 WifiInfoPreferenceControllerTest {
@@ -62,7 +66,7 @@
     @Before
     public void setUp() {
         MockitoAnnotations.initMocks(this);
-        mLifecycle = new Lifecycle();
+        mLifecycle = new Lifecycle(() -> mLifecycle);
         when(mContext.getSystemService(WifiManager.class))
                 .thenReturn(mWifiManager);
         when(mScreen.findPreference(anyString()))
@@ -83,10 +87,10 @@
 
     @Test
     public void runThroughLifecycle_shouldInstallListenerOnResume() {
-        mLifecycle.onResume();
+        mLifecycle.handleLifecycleEvent(ON_RESUME);
         verify(mContext).registerReceiver(any(BroadcastReceiver.class), any(IntentFilter.class));
 
-        mLifecycle.onPause();
+        mLifecycle.handleLifecycleEvent(ON_PAUSE);
         verify(mContext).unregisterReceiver(any(BroadcastReceiver.class));
     }
 
diff --git a/tests/robotests/src/com/android/settings/wifi/WifiWakeupPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/wifi/WifiWakeupPreferenceControllerTest.java
index 306b297..29df539 100644
--- a/tests/robotests/src/com/android/settings/wifi/WifiWakeupPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/wifi/WifiWakeupPreferenceControllerTest.java
@@ -23,7 +23,6 @@
 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;
@@ -31,7 +30,6 @@
 import android.support.v7.preference.Preference;
 
 import com.android.settings.R;
-import com.android.settings.network.NetworkScoreManagerWrapper;
 import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
 import com.android.settings.testutils.shadow.SettingsShadowResources;
@@ -41,7 +39,6 @@
 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;
diff --git a/tests/robotests/src/com/android/settings/wifi/WpsPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/wifi/WpsPreferenceControllerTest.java
index 94cc46b..7a734e5 100644
--- a/tests/robotests/src/com/android/settings/wifi/WpsPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/wifi/WpsPreferenceControllerTest.java
@@ -15,7 +15,11 @@
  */
 package com.android.settings.wifi;
 
+import static android.arch.lifecycle.Lifecycle.Event.ON_PAUSE;
+import static android.arch.lifecycle.Lifecycle.Event.ON_RESUME;
+
 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.times;
@@ -31,8 +35,8 @@
 import android.support.v7.preference.Preference;
 import android.support.v7.preference.PreferenceScreen;
 
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settingslib.core.lifecycle.Lifecycle;
 
 import org.junit.Before;
@@ -66,7 +70,7 @@
     @Before
     public void setUp() {
         MockitoAnnotations.initMocks(this);
-        mLifecycle = new Lifecycle();
+        mLifecycle = new Lifecycle(() -> mLifecycle);
         when(mContext.getSystemService(WifiManager.class))
                 .thenReturn(mWifiManager);
         when(mScreen.findPreference(anyString()))
@@ -83,12 +87,13 @@
 
     @Test
     public void testOnResume_shouldRegisterListener() {
-        mLifecycle.onResume();
+        mLifecycle.handleLifecycleEvent(ON_RESUME);
         verify(mContext).registerReceiver(any(BroadcastReceiver.class), any(IntentFilter.class));
     }
     @Test
     public void testOnPause_shouldUnregisterListener() {
-        mLifecycle.onPause();
+        mLifecycle.handleLifecycleEvent(ON_RESUME);
+        mLifecycle.handleLifecycleEvent(ON_PAUSE);
         verify(mContext).unregisterReceiver(any(BroadcastReceiver.class));
     }
 
diff --git a/tests/robotests/src/com/android/settings/wifi/WriteWifiConfigToNfcDialogTest.java b/tests/robotests/src/com/android/settings/wifi/WriteWifiConfigToNfcDialogTest.java
index 41b71ad..5e10e0f 100644
--- a/tests/robotests/src/com/android/settings/wifi/WriteWifiConfigToNfcDialogTest.java
+++ b/tests/robotests/src/com/android/settings/wifi/WriteWifiConfigToNfcDialogTest.java
@@ -27,6 +27,7 @@
 import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
 import com.android.settings.testutils.shadow.ShadowNfcAdapter;
+import com.android.settings.wrapper.WifiManagerWrapper;
 
 import org.junit.After;
 import org.junit.Before;
diff --git a/tests/robotests/src/com/android/settings/wifi/details/WifiDetailActionBarObserverTest.java b/tests/robotests/src/com/android/settings/wifi/details/WifiDetailActionBarObserverTest.java
deleted file mode 100644
index c573d3c..0000000
--- a/tests/robotests/src/com/android/settings/wifi/details/WifiDetailActionBarObserverTest.java
+++ /dev/null
@@ -1,69 +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.details;
-
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
-import android.app.ActionBar;
-import android.app.Activity;
-import android.content.Context;
-import android.os.Bundle;
-import com.android.settings.R;
-import com.android.settings.TestConfig;
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settingslib.core.lifecycle.Lifecycle;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
-import org.robolectric.RuntimeEnvironment;
-import org.robolectric.annotation.Config;
-
-@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
-public class WifiDetailActionBarObserverTest {
-
-    @Mock private Bundle mockBundle;
-    @Mock private Activity mockActivity;
-    @Mock private ActionBar mockActionBar;
-    @Mock private WifiNetworkDetailsFragment mockFragment;
-
-    private Context mContext = RuntimeEnvironment.application;
-    private Lifecycle mLifecycle;
-    private WifiDetailActionBarObserver mObserver;
-
-    @Before
-    public void setUp() {
-        MockitoAnnotations.initMocks(this);
-
-        mLifecycle = new Lifecycle();
-
-        when(mockFragment.getActivity()).thenReturn(mockActivity);
-        when(mockActivity.getActionBar()).thenReturn(mockActionBar);
-
-        mObserver = new WifiDetailActionBarObserver(mContext, mockFragment);
-        mLifecycle.addObserver(mObserver);
-    }
-
-    @Test
-    public void actionBarIsSetToNetworkInfo() {
-        mLifecycle.onCreate(mockBundle);
-
-        verify(mockActionBar).setTitle(mContext.getString(R.string.wifi_details_title));
-    }
-}
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 90d1215..3a0341c 100644
--- a/tests/robotests/src/com/android/settings/wifi/details/WifiDetailPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/wifi/details/WifiDetailPreferenceControllerTest.java
@@ -17,6 +17,7 @@
 
 import static com.google.common.truth.Truth.assertThat;
 
+import static org.mockito.ArgumentMatchers.anyInt;
 import static org.mockito.ArgumentMatchers.anyString;
 import static org.mockito.ArgumentMatchers.eq;
 import static org.mockito.ArgumentMatchers.nullable;
@@ -32,8 +33,10 @@
 import static org.mockito.Mockito.when;
 
 import android.app.Activity;
+import android.content.ComponentName;
 import android.content.Context;
 import android.content.Intent;
+import android.graphics.drawable.ColorDrawable;
 import android.graphics.drawable.Drawable;
 import android.net.ConnectivityManager;
 import android.net.ConnectivityManager.NetworkCallback;
@@ -41,7 +44,6 @@
 import android.net.LinkAddress;
 import android.net.LinkProperties;
 import android.net.Network;
-import android.net.NetworkBadging;
 import android.net.NetworkCapabilities;
 import android.net.NetworkInfo;
 import android.net.NetworkRequest;
@@ -50,12 +52,12 @@
 import android.net.wifi.WifiInfo;
 import android.net.wifi.WifiManager;
 import android.os.Handler;
+import android.provider.Settings;
 import android.support.v7.preference.Preference;
 import android.support.v7.preference.PreferenceCategory;
 import android.support.v7.preference.PreferenceScreen;
 import android.view.View;
 import android.view.View.OnClickListener;
-import android.widget.Button;
 import android.widget.ImageView;
 
 import com.android.internal.logging.nano.MetricsProto;
@@ -64,10 +66,14 @@
 import com.android.settings.applications.LayoutPreference;
 import com.android.settings.core.instrumentation.MetricsFeatureProvider;
 import com.android.settings.testutils.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.shadow.ShadowDevicePolicyManagerWrapper;
 import com.android.settings.testutils.shadow.ShadowEntityHeaderController;
-import com.android.settings.vpn2.ConnectivityManagerWrapperImpl;
+import com.android.settings.testutils.shadow.ShadowPackageManagerWrapper;
+import com.android.settings.widget.ActionButtonPreference;
+import com.android.settings.widget.ActionButtonPreferenceTest;
 import com.android.settings.widget.EntityHeaderController;
 import com.android.settings.wifi.WifiDetailPreference;
+import com.android.settings.wrapper.ConnectivityManagerWrapper;
 import com.android.settingslib.core.lifecycle.Lifecycle;
 import com.android.settingslib.wifi.AccessPoint;
 
@@ -92,7 +98,11 @@
 
 @RunWith(SettingsRobolectricTestRunner.class)
 @Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION,
-        shadows = ShadowEntityHeaderController.class)
+        shadows = {
+                ShadowDevicePolicyManagerWrapper.class,
+                ShadowEntityHeaderController.class,
+                ShadowPackageManagerWrapper.class,
+        })
 public class WifiDetailPreferenceControllerTest {
 
     private static final int LEVEL = 1;
@@ -107,7 +117,7 @@
     @Mock private AccessPoint mockAccessPoint;
     @Mock private Activity mockActivity;
     @Mock private ConnectivityManager mockConnectivityManager;
-    @Mock private ConnectivityManagerWrapperImpl mockConnectivityManagerWrapper;
+    @Mock private ConnectivityManagerWrapper mockConnectivityManagerWrapper;
     @Mock private Network mockNetwork;
     @Mock private NetworkInfo mockNetworkInfo;
     @Mock private WifiConfiguration mockWifiConfig;
@@ -115,6 +125,7 @@
     @Mock private WifiNetworkDetailsFragment mockFragment;
     @Mock private WifiManager mockWifiManager;
     @Mock private MetricsFeatureProvider mockMetricsFeatureProvider;
+    @Mock private WifiDetailPreferenceController.IconInjector mockIconInjector;
 
     @Mock (answer = Answers.RETURNS_DEEP_STUBS)
     private EntityHeaderController mockHeaderController;
@@ -122,8 +133,7 @@
     private LayoutPreference mockHeaderLayoutPreference;
     @Mock private ImageView mockHeaderIcon;
 
-    @Mock private LayoutPreference mockButtonsPref;
-    @Mock private Button mockSignInButton;
+    @Mock private ActionButtonPreference mockButtonsPref;
     @Mock private WifiDetailPreference mockSignalStrengthPref;
     @Mock private WifiDetailPreference mockLinkSpeedPref;
     @Mock private WifiDetailPreference mockFrequencyPref;
@@ -133,7 +143,6 @@
     @Mock private WifiDetailPreference mockGatewayPref;
     @Mock private WifiDetailPreference mockSubnetPref;
     @Mock private WifiDetailPreference mockDnsPref;
-    @Mock private Button mockForgetButton;
     @Mock private PreferenceCategory mockIpv6Category;
     @Mock private WifiDetailPreference mockIpv6AddressesPref;
 
@@ -203,7 +212,7 @@
         MockitoAnnotations.initMocks(this);
 
         mContext = spy(RuntimeEnvironment.application);
-        mLifecycle = new Lifecycle();
+        mLifecycle = new Lifecycle(() -> mLifecycle);
 
         when(mockAccessPoint.getConfig()).thenReturn(mockWifiConfig);
         when(mockAccessPoint.getLevel()).thenReturn(LEVEL);
@@ -215,7 +224,9 @@
                 .thenReturn(mockNetworkInfo);
         doNothing().when(mockConnectivityManagerWrapper).registerNetworkCallback(
                 nullable(NetworkRequest.class), mCallbackCaptor.capture(), nullable(Handler.class));
-        doNothing().when(mockForgetButton).setOnClickListener(mForgetClickListener.capture());
+        mockButtonsPref = ActionButtonPreferenceTest.createMock();
+        when(mockButtonsPref.setButton1OnClickListener(mForgetClickListener.capture()))
+                .thenReturn(mockButtonsPref);
 
         when(mockWifiInfo.getLinkSpeed()).thenReturn(LINK_SPEED);
         when(mockWifiInfo.getRssi()).thenReturn(RSSI);
@@ -233,8 +244,7 @@
         when(mockHeaderController.setRecyclerView(mockFragment.getListView(), mLifecycle))
                 .thenReturn(mockHeaderController);
         when(mockHeaderController.setSummary(anyString())).thenReturn(mockHeaderController);
-
-        doReturn(null).when(mContext).getSystemService(eq(Context.DEVICE_POLICY_SERVICE));
+        when(mockIconInjector.getIcon(anyInt())).thenReturn(new ColorDrawable());
 
         setupMockedPreferenceScreen();
         mController = newWifiDetailPreferenceController();
@@ -249,7 +259,8 @@
                 null,  // Handler
                 mLifecycle,
                 mockWifiManager,
-                mockMetricsFeatureProvider);
+                mockMetricsFeatureProvider,
+                mockIconInjector);
     }
 
     private void setupMockedPreferenceScreen() {
@@ -262,10 +273,6 @@
 
         when(mockScreen.findPreference(WifiDetailPreferenceController.KEY_BUTTONS_PREF))
                 .thenReturn(mockButtonsPref);
-        when(mockButtonsPref.findViewById(R.id.forget_button))
-                .thenReturn(mockForgetButton);
-        when(mockButtonsPref.findViewById(R.id.signin_button))
-                .thenReturn(mockSignInButton);
         when(mockScreen.findPreference(WifiDetailPreferenceController.KEY_SIGNAL_STRENGTH_PREF))
                 .thenReturn(mockSignalStrengthPref);
         when(mockScreen.findPreference(WifiDetailPreferenceController.KEY_LINK_SPEED))
@@ -342,8 +349,7 @@
 
     @Test
     public void entityHeader_shouldHaveIconSet() {
-        Drawable expectedIcon =
-                NetworkBadging.getWifiIcon(LEVEL, NetworkBadging.BADGING_NONE, mContext.getTheme());
+        Drawable expectedIcon = mockIconInjector.getIcon(LEVEL);
 
         displayAndResume();
 
@@ -608,7 +614,7 @@
         mController = newWifiDetailPreferenceController();
         displayAndResume();
 
-        verify(mockForgetButton).setVisibility(View.INVISIBLE);
+        verify(mockButtonsPref).setButton1Visible(false);
     }
 
     @Test
@@ -618,14 +624,53 @@
 
         displayAndResume();
 
-        verify(mockForgetButton).setVisibility(View.VISIBLE);
+        verify(mockButtonsPref).setButton1Visible(true);
     }
 
     @Test
     public void canForgetNetwork_saved() {
         displayAndResume();
 
-        verify(mockForgetButton).setVisibility(View.VISIBLE);
+        verify(mockButtonsPref).setButton1Visible(true);
+    }
+
+    @Test
+    public void canForgetNetwork_lockedDown() {
+        lockDownNetwork();
+
+        displayAndResume();
+
+        verify(mockButtonsPref).setButton1Visible(false);
+    }
+
+    @Test
+    public void canModifyNetwork_saved() {
+        assertThat(mController.canModifyNetwork()).isTrue();
+    }
+
+    @Test
+    public void canModifyNetwork_lockedDown() {
+        lockDownNetwork();
+
+        assertThat(mController.canModifyNetwork()).isFalse();
+    }
+
+    /**
+     * Pretends that current network is locked down by device owner.
+     */
+    private void lockDownNetwork() {
+        final int doUserId = 123;
+        final int doUid = 1234;
+        String doPackage = "some.package";
+
+        mockWifiConfig.creatorUid = doUid;
+        ComponentName doComponent = new ComponentName(doPackage, "some.Class");
+        ShadowPackageManagerWrapper.setPackageUidAsUser(doPackage, doUserId, doUid);
+        ShadowDevicePolicyManagerWrapper.setDeviceOComponentName(doComponent);
+        ShadowDevicePolicyManagerWrapper.setDeviceOwnerUserId(doUserId);
+
+        Settings.Global.putInt(mContext.getContentResolver(),
+                Settings.Global.WIFI_DEVICE_OWNER_CONFIGS_LOCKDOWN, 1);
     }
 
     @Test
@@ -728,23 +773,23 @@
 
     @Test
     public void captivePortal_shouldShowSignInButton() {
-        InOrder inOrder = inOrder(mockSignInButton);
+        InOrder inOrder = inOrder(mockButtonsPref);
 
         displayAndResume();
 
-        inOrder.verify(mockSignInButton).setVisibility(View.INVISIBLE);
+        inOrder.verify(mockButtonsPref).setButton2Visible(false);
 
         NetworkCapabilities nc = makeNetworkCapabilities();
         updateNetworkCapabilities(nc);
-        inOrder.verify(mockSignInButton).setVisibility(View.INVISIBLE);
+        inOrder.verify(mockButtonsPref).setButton2Visible(false);
 
         nc.addCapability(NetworkCapabilities.NET_CAPABILITY_CAPTIVE_PORTAL);
         updateNetworkCapabilities(nc);
-        inOrder.verify(mockSignInButton).setVisibility(View.VISIBLE);
+        inOrder.verify(mockButtonsPref).setButton2Visible(true);
 
         nc.removeCapability(NetworkCapabilities.NET_CAPABILITY_CAPTIVE_PORTAL);
         updateNetworkCapabilities(nc);
-        inOrder.verify(mockSignInButton).setVisibility(View.INVISIBLE);
+        inOrder.verify(mockButtonsPref).setButton2Visible(false);
     }
 
     @Test
@@ -752,40 +797,30 @@
         displayAndResume();
 
         ArgumentCaptor<OnClickListener> captor = ArgumentCaptor.forClass(OnClickListener.class);
-        verify(mockSignInButton).setOnClickListener(captor.capture());
-        captor.getValue().onClick(mockSignInButton);
+        verify(mockButtonsPref).setButton2OnClickListener(captor.capture());
+        captor.getValue().onClick(null);
         verify(mockConnectivityManagerWrapper).startCaptivePortalApp(mockNetwork);
         verify(mockMetricsFeatureProvider)
                 .action(mockActivity, MetricsProto.MetricsEvent.ACTION_WIFI_SIGNIN);
     }
 
     @Test
-    public void signInButtonVisible_buttonPanelShouldBeVisible() {
-        when(mockSignInButton.getVisibility()).thenReturn(View.VISIBLE);
-        when(mockForgetButton.getVisibility()).thenReturn(View.INVISIBLE);
-
+    public void testRefreshRssiViews_shouldNotUpdateIfLevelIsSame() {
         displayAndResume();
 
-        verify(mockButtonsPref).setVisible(true);
+        mContext.sendBroadcast(new Intent(WifiManager.RSSI_CHANGED_ACTION));
+
+        verify(mockAccessPoint, times(2)).getLevel();
+        verify(mockIconInjector, times(1)).getIcon(anyInt());
     }
-
     @Test
-    public void forgetButtonVisible_buttonPanelShouldBeVisible() {
-        when(mockSignInButton.getVisibility()).thenReturn(View.INVISIBLE);
-        when(mockForgetButton.getVisibility()).thenReturn(View.VISIBLE);
-
+    public void testRefreshRssiViews_shouldUpdateOnLevelChange() {
         displayAndResume();
 
-        verify(mockButtonsPref).setVisible(true);
-    }
+        when(mockAccessPoint.getLevel()).thenReturn(0);
+        mContext.sendBroadcast(new Intent(WifiManager.RSSI_CHANGED_ACTION));
 
-    @Test
-    public void neitherButtonVisible_buttonPanelShouldBeInvisible() {
-        when(mockSignInButton.getVisibility()).thenReturn(View.INVISIBLE);
-        when(mockForgetButton.getVisibility()).thenReturn(View.INVISIBLE);
-
-        displayAndResume();
-
-        verify(mockButtonsPref).setVisible(false);
+        verify(mockAccessPoint, times(2)).getLevel();
+        verify(mockIconInjector, times(2)).getIcon(anyInt());
     }
 }
diff --git a/tests/robotests/src/com/android/settings/wifi/p2p/P2pCategoryPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/wifi/p2p/P2pCategoryPreferenceControllerTest.java
index dd2ef52..e53fb87 100644
--- a/tests/robotests/src/com/android/settings/wifi/p2p/P2pCategoryPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/wifi/p2p/P2pCategoryPreferenceControllerTest.java
@@ -16,12 +16,19 @@
 
 package com.android.settings.wifi.p2p;
 
+import static com.google.common.truth.Truth.assertThat;
+import static org.mockito.Matchers.anyString;
+import static org.mockito.Mockito.atLeastOnce;
+import static org.mockito.Mockito.never;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
 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 com.android.settings.testutils.SettingsRobolectricTestRunner;
 
 import org.junit.Before;
 import org.junit.Test;
@@ -31,13 +38,8 @@
 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)
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION_O)
 public class P2pCategoryPreferenceControllerTest {
 
     @Mock
@@ -81,7 +83,8 @@
         mController.addChild(pref);
 
         verify(mCategory).addPreference(pref);
-        verify(mCategory).setVisible(true);
+        verify(mCategory, atLeastOnce()).setVisible(true);
+        verify(mCategory, never()).setVisible(false);
     }
 
     @Test
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 8946a5e..e809431 100644
--- a/tests/robotests/src/com/android/settings/wifi/p2p/WifiP2PPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/wifi/p2p/WifiP2PPreferenceControllerTest.java
@@ -15,7 +15,11 @@
  */
 package com.android.settings.wifi.p2p;
 
+import static android.arch.lifecycle.Lifecycle.Event.ON_PAUSE;
+import static android.arch.lifecycle.Lifecycle.Event.ON_RESUME;
+
 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.times;
@@ -30,8 +34,8 @@
 import android.support.v7.preference.Preference;
 import android.support.v7.preference.PreferenceScreen;
 
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settingslib.core.lifecycle.Lifecycle;
 
 import org.junit.Before;
@@ -61,7 +65,7 @@
     @Before
     public void setUp() {
         MockitoAnnotations.initMocks(this);
-        mLifecycle = new Lifecycle();
+        mLifecycle = new Lifecycle(() -> mLifecycle);
         when(mContext.getSystemService(WifiManager.class))
                 .thenReturn(mWifiManager);
         when(mScreen.findPreference(anyString()))
@@ -76,13 +80,14 @@
 
     @Test
     public void testOnResume_shouldRegisterListener() {
-        mLifecycle.onResume();
+        mLifecycle.handleLifecycleEvent(ON_RESUME);
         verify(mContext).registerReceiver(any(BroadcastReceiver.class), any(IntentFilter.class));
     }
 
     @Test
     public void testOnPause_shouldUnregisterListener() {
-        mLifecycle.onPause();
+        mLifecycle.handleLifecycleEvent(ON_RESUME);
+        mLifecycle.handleLifecycleEvent(ON_PAUSE);
         verify(mContext).unregisterReceiver(any(BroadcastReceiver.class));
     }
 
diff --git a/tests/robotests/src/com/android/settings/wifi/tether/WifiTetherApBandPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/wifi/tether/WifiTetherApBandPreferenceControllerTest.java
index 8f0b143..bb33f93 100644
--- a/tests/robotests/src/com/android/settings/wifi/tether/WifiTetherApBandPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/wifi/tether/WifiTetherApBandPreferenceControllerTest.java
@@ -42,7 +42,7 @@
 import org.robolectric.annotation.Config;
 
 @RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION_O)
 public class WifiTetherApBandPreferenceControllerTest {
 
     @Mock(answer = Answers.RETURNS_DEEP_STUBS)
@@ -121,4 +121,20 @@
 
         verify(mListener, times(2)).onTetherConfigUpdated();
     }
+
+    @Test
+    public void updateDisplay_shouldUpdateValue() {
+        // Set controller band index to 1 and verify is set.
+        when(mWifiManager.is5GHzBandSupported()).thenReturn(true);
+        mController.displayPreference(mScreen);
+        mController.onPreferenceChange(mListPreference, "1");
+        assertThat(mController.getBandIndex()).isEqualTo(1);
+
+        // Disable 5Ghz band
+        when(mWifiManager.is5GHzBandSupported()).thenReturn(false);
+
+        // Call updateDisplay and verify it's changed.
+        mController.updateDisplay();
+        assertThat(mController.getBandIndex()).isEqualTo(0);
+    }
 }
diff --git a/tests/robotests/src/com/android/settings/wifi/tether/WifiTetherPasswordPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/wifi/tether/WifiTetherPasswordPreferenceControllerTest.java
index fdb8390..044efad 100644
--- a/tests/robotests/src/com/android/settings/wifi/tether/WifiTetherPasswordPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/wifi/tether/WifiTetherPasswordPreferenceControllerTest.java
@@ -43,7 +43,7 @@
 
 
 @RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION_O)
 public class WifiTetherPasswordPreferenceControllerTest {
 
     @Mock(answer = Answers.RETURNS_DEEP_STUBS)
@@ -99,4 +99,22 @@
 
         verify(mListener, times(2)).onTetherConfigUpdated();
     }
+
+    @Test
+    public void updateDisplay_shouldUpdateValue() {
+        // Set controller password to anything and verify is set.
+        mController.displayPreference(mScreen);
+        mController.onPreferenceChange(mPreference, "1");
+        assertThat(mController.getPassword()).isEqualTo("1");
+
+        // Create a new config using different password
+        final WifiConfiguration config = new WifiConfiguration();
+        config.preSharedKey = "test_1234";
+        when(mWifiManager.getWifiApConfiguration()).thenReturn(config);
+
+        // Call updateDisplay and verify it's changed.
+        mController.updateDisplay();
+        assertThat(mController.getPassword()).isEqualTo(config.preSharedKey);
+        assertThat(mPreference.getSummary()).isEqualTo(config.preSharedKey);
+    }
 }
diff --git a/tests/robotests/src/com/android/settings/wifi/tether/WifiTetherPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/wifi/tether/WifiTetherPreferenceControllerTest.java
index ff3f47e..44c70f6 100644
--- a/tests/robotests/src/com/android/settings/wifi/tether/WifiTetherPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/wifi/tether/WifiTetherPreferenceControllerTest.java
@@ -16,7 +16,11 @@
 
 package com.android.settings.wifi.tether;
 
+import static android.arch.lifecycle.Lifecycle.Event.ON_START;
+import static android.arch.lifecycle.Lifecycle.Event.ON_STOP;
+
 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;
@@ -59,7 +63,7 @@
 import java.util.ArrayList;
 
 @RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION,
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION_O,
         shadows = {
                 WifiTetherPreferenceControllerTest.ShadowWifiTetherSettings.class,
                 WifiTetherPreferenceControllerTest.ShadowWifiTetherSwitchBarController.class,
@@ -84,7 +88,7 @@
     @Before
     public void setUp() {
         MockitoAnnotations.initMocks(this);
-        mLifecycle = new Lifecycle();
+        mLifecycle = new Lifecycle(() -> mLifecycle);
         FakeFeatureFactory.setupForTest(mFeatureFactoryContext);
         mPreference = new MasterSwitchPreference(RuntimeEnvironment.application);
         when(mContext.getSystemService(Context.CONNECTIVITY_SERVICE))
@@ -119,8 +123,8 @@
         final BroadcastReceiver receiver = ReflectionHelpers.getField(mController, "mReceiver");
 
         mController.displayPreference(mScreen);
-        mLifecycle.onStart();
-        mLifecycle.onStop();
+        mLifecycle.handleLifecycleEvent(ON_START);
+        mLifecycle.handleLifecycleEvent(ON_STOP);
 
         assertThat(ShadowWifiTetherSwitchBarController.onStartCalled).isTrue();
         assertThat(ShadowWifiTetherSwitchBarController.onStopCalled).isTrue();
@@ -136,7 +140,7 @@
         when(mScreen.findPreference(anyString())).thenReturn(pref);
 
         mController.displayPreference(mScreen);
-        mLifecycle.onStart();
+        mLifecycle.handleLifecycleEvent(ON_START);
 
         assertThat(ShadowWifiTetherSwitchBarController.onStartCalled).isTrue();
         verify(mContext).registerReceiver(eq(receiver), any(IntentFilter.class));
@@ -151,7 +155,7 @@
         when(mScreen.findPreference(anyString())).thenReturn(pref);
 
         mController.displayPreference(mScreen);
-        mLifecycle.onStart();
+        mLifecycle.handleLifecycleEvent(ON_START);
 
         assertThat(ShadowWifiTetherSwitchBarController.onStartCalled).isTrue();
         verify(mContext).registerReceiver(eq(receiver), any(IntentFilter.class));
diff --git a/tests/robotests/src/com/android/settings/wifi/tether/WifiTetherSSIDPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/wifi/tether/WifiTetherSSIDPreferenceControllerTest.java
index f43e3a7..e058eed 100644
--- a/tests/robotests/src/com/android/settings/wifi/tether/WifiTetherSSIDPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/wifi/tether/WifiTetherSSIDPreferenceControllerTest.java
@@ -16,6 +16,12 @@
 
 package com.android.settings.wifi.tether;
 
+import static com.google.common.truth.Truth.assertThat;
+import static org.mockito.Matchers.anyString;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
 import android.content.Context;
 import android.net.ConnectivityManager;
 import android.net.wifi.WifiConfiguration;
@@ -35,14 +41,8 @@
 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.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_O)
 public class WifiTetherSSIDPreferenceControllerTest {
 
     @Mock(answer = Answers.RETURNS_DEEP_STUBS)
@@ -104,4 +104,22 @@
 
         verify(mListener, times(2)).onTetherConfigUpdated();
     }
+
+    @Test
+    public void updateDisplay_shouldUpdateValue() {
+        // Set controller ssid to anything and verify is set.
+        mController.displayPreference(mScreen);
+        mController.onPreferenceChange(mPreference, "1");
+        assertThat(mController.getSSID()).isEqualTo("1");
+
+        // Create a new config using different SSID
+        final WifiConfiguration config = new WifiConfiguration();
+        config.SSID = "test_1234";
+        when(mWifiManager.getWifiApConfiguration()).thenReturn(config);
+
+        // Call updateDisplay and verify it's changed.
+        mController.updateDisplay();
+        assertThat(mController.getSSID()).isEqualTo(config.SSID);
+        assertThat(mPreference.getSummary()).isEqualTo(config.SSID);
+    }
 }
diff --git a/tests/robotests/src/com/android/settings/wifi/tether/WifiTetherSettingsTest.java b/tests/robotests/src/com/android/settings/wifi/tether/WifiTetherSettingsTest.java
new file mode 100644
index 0000000..76a8e23
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/wifi/tether/WifiTetherSettingsTest.java
@@ -0,0 +1,41 @@
+/*
+ * Copyright (C) 2017 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.wifi.tether;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import android.net.wifi.WifiConfiguration;
+
+import com.android.settings.TestConfig;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
+
+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_O)
+public class WifiTetherSettingsTest {
+
+    @Test
+    public void ensureWifiConfigHasPassword_shouldGeneratePassword() {
+        WifiConfiguration config = new WifiConfiguration();
+        WifiTetherSettings.ensureWifiConfigHasPassword(config);
+
+        assertThat(config.preSharedKey).isNotEmpty();
+    }
+}
diff --git a/tests/unit/Android.mk b/tests/unit/Android.mk
index 060c3e1..58fe7dd 100644
--- a/tests/unit/Android.mk
+++ b/tests/unit/Android.mk
@@ -5,16 +5,18 @@
 LOCAL_MODULE_TAGS := tests
 LOCAL_CERTIFICATE := platform
 
-LOCAL_JAVA_LIBRARIES := android.test.runner
+LOCAL_JAVA_LIBRARIES := android.test.runner telephony-common ims-common
 
 LOCAL_STATIC_JAVA_LIBRARIES := \
     android-support-test \
     espresso-core \
+    espresso-contrib-nodep \
+    espresso-intents-nodep \
     legacy-android-test \
     mockito-target-minus-junit4 \
+    platform-test-annotations \
     truth-prebuilt \
-    ub-uiautomator \
-
+    ub-uiautomator
 
 # Include all test java files.
 LOCAL_SRC_FILES := $(call all-java-files-under, src)
diff --git a/tests/unit/AndroidManifest.xml b/tests/unit/AndroidManifest.xml
index c4cae0c..65ed661 100644
--- a/tests/unit/AndroidManifest.xml
+++ b/tests/unit/AndroidManifest.xml
@@ -17,8 +17,41 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.android.settings.tests.unit">
 
+    <uses-permission android:name="android.permission.BLUETOOTH" />
+    <uses-permission android:name="android.permission.BLUETOOTH_ADMIN" />
+    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
+    <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
+    <uses-permission android:name="android.permission.USE_CREDENTIALS" />
+    <uses-permission android:name="android.permission.REQUEST_INSTALL_PACKAGES" />
+    <uses-permission android:name="android.permission.INTERACT_ACROSS_USERS" />
+    <uses-permission android:name="android.permission.UPDATE_APP_OPS_STATS" />
+
     <application>
         <uses-library android:name="android.test.runner" />
+        <activity android:name="com.android.settings.tests.BluetoothRequestPermissionTest"
+            android:label="Bluetooth Perm Test" >
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+                <category android:name="android.intent.category.DEFAULT" />
+                <category android:name="android.intent.category.LAUNCHER" />
+            </intent-filter>
+        </activity>
+        <activity android:name="Operator" android:label="Operator Hook Test" >
+            <intent-filter>
+                <action android:name="com.android.settings.OPERATOR_APPLICATION_SETTING" />
+            </intent-filter>
+            <meta-data android:name="com.android.settings.title" android:resource="@string/operator_settings_title" />
+            <meta-data android:name="com.android.settings.summary" android:resource="@string/operator_settings_summary" />
+            <meta-data android:name="com.android.settings.icon" android:resource="@drawable/ic_settings_applications" />
+        </activity>
+        <activity android:name="Manufacturer" android:label="Manufacturer Hook Test" >
+            <intent-filter>
+                <action android:name="com.android.settings.MANUFACTURER_APPLICATION_SETTING" />
+            </intent-filter>
+            <meta-data android:name="com.android.settings.title" android:resource="@string/manufacturer_settings_title" />
+            <meta-data android:name="com.android.settings.summary" android:resource="@string/manufacturer_settings_summary" />
+            <meta-data android:name="com.android.settings.icon" android:resource="@drawable/ic_settings_applications" />
+        </activity>
     </application>
 
     <instrumentation android:name="android.support.test.runner.AndroidJUnitRunner"
@@ -26,4 +59,9 @@
         android:label="Settings Test Cases">
     </instrumentation>
 
+    <instrumentation android:name="com.android.settings.tests.SettingsLaunchPerformance"
+        android:targetPackage="com.android.settings"
+        android:label="Settings Launch Performance">
+    </instrumentation>
+
 </manifest>
diff --git a/tests/app/res/drawable-hdpi/ic_settings_applications.png b/tests/unit/res/drawable-hdpi/ic_settings_applications.png
similarity index 100%
rename from tests/app/res/drawable-hdpi/ic_settings_applications.png
rename to tests/unit/res/drawable-hdpi/ic_settings_applications.png
Binary files differ
diff --git a/tests/app/res/drawable-mdpi/ic_settings_applications.png b/tests/unit/res/drawable-mdpi/ic_settings_applications.png
similarity index 100%
rename from tests/app/res/drawable-mdpi/ic_settings_applications.png
rename to tests/unit/res/drawable-mdpi/ic_settings_applications.png
Binary files differ
diff --git a/tests/app/res/drawable-xhdpi/ic_settings_applications.png b/tests/unit/res/drawable-xhdpi/ic_settings_applications.png
similarity index 100%
rename from tests/app/res/drawable-xhdpi/ic_settings_applications.png
rename to tests/unit/res/drawable-xhdpi/ic_settings_applications.png
Binary files differ
diff --git a/tests/app/res/layout/bluetooth_request_permission_test.xml b/tests/unit/res/layout/bluetooth_request_permission_test.xml
similarity index 100%
rename from tests/app/res/layout/bluetooth_request_permission_test.xml
rename to tests/unit/res/layout/bluetooth_request_permission_test.xml
diff --git a/tests/app/res/layout/manufacturer_main.xml b/tests/unit/res/layout/manufacturer_main.xml
similarity index 100%
rename from tests/app/res/layout/manufacturer_main.xml
rename to tests/unit/res/layout/manufacturer_main.xml
diff --git a/tests/app/res/layout/operator_main.xml b/tests/unit/res/layout/operator_main.xml
similarity index 100%
rename from tests/app/res/layout/operator_main.xml
rename to tests/unit/res/layout/operator_main.xml
diff --git a/tests/unit/res/values/strings.xml b/tests/unit/res/values/strings.xml
new file mode 100644
index 0000000..35e201a
--- /dev/null
+++ b/tests/unit/res/values/strings.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2009 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT 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>
+    <!-- Test only. Do not translate. -->
+    <!-- Test only. Do not translate. -->
+    <!-- Test only. Do not translate. -->
+    <string name="enable" translatable="false">Enable</string>
+    <string name="discoverable" translatable="false">Discoverable</string>
+    <string name="start_scan" translatable="false">Start scan</string>
+    <string name="stop_scan" translatable="false">Stop scan</string>
+    <string name="operator_hello" translatable="false">Hello Operator!</string>
+    <string name="operator_settings_title" translatable="false">Operator</string>
+    <string name="operator_settings_summary" translatable="false">Operator hook that can be used to start activity of choice</string>
+    <string name="manufacturer_hello" translatable="false">Hello Manufacturer!</string>
+    <string name="manufacturer_settings_title" translatable="false">Manufacturer</string>
+    <string name="manufacturer_settings_summary" translatable="false">Manufacturer hook that can be used to start activity of choice</string>
+</resources>
diff --git a/tests/app/src/com/android/settings/CreateShortcutTest.java b/tests/unit/src/com/android/settings/CreateShortcutTest.java
similarity index 100%
rename from tests/app/src/com/android/settings/CreateShortcutTest.java
rename to tests/unit/src/com/android/settings/CreateShortcutTest.java
diff --git a/tests/unit/src/com/android/settings/DisplaySettingsTest.java b/tests/unit/src/com/android/settings/DisplaySettingsTest.java
new file mode 100644
index 0000000..b5cd7cf
--- /dev/null
+++ b/tests/unit/src/com/android/settings/DisplaySettingsTest.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;
+
+import static android.support.test.espresso.Espresso.onView;
+import static android.support.test.espresso.action.ViewActions.click;
+import static android.support.test.espresso.matcher.ViewMatchers.withText;
+
+import android.app.Instrumentation;
+import android.content.Context;
+import android.content.Intent;
+import android.support.test.InstrumentationRegistry;
+import android.support.test.filters.SmallTest;
+import android.support.test.runner.AndroidJUnit4;
+import android.support.test.uiautomator.UiDevice;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+@RunWith(AndroidJUnit4.class)
+@SmallTest
+public class DisplaySettingsTest {
+
+    private Instrumentation mInstrumentation;
+    private Context mContext;
+    private UiDevice mDevice;
+
+    @Before
+    public void setUp() {
+        mInstrumentation = InstrumentationRegistry.getInstrumentation();
+        mContext = mInstrumentation.getTargetContext();
+        mDevice = UiDevice.getInstance(mInstrumentation);
+    }
+
+    @Test
+    public void launchBrightnessLevel_shouldNotCrash() {
+        mInstrumentation.startActivitySync(
+                new Intent(mContext, DisplaySettings.class));
+        onView(withText(mContext.getString(R.string.brightness))).perform(click());
+        // should not crash
+        mDevice.pressBack(); // dismiss the brightness dialog
+    }
+}
diff --git a/tests/app/src/com/android/settings/EncryptionInterstitialTest.java b/tests/unit/src/com/android/settings/EncryptionInterstitialTest.java
similarity index 100%
rename from tests/app/src/com/android/settings/EncryptionInterstitialTest.java
rename to tests/unit/src/com/android/settings/EncryptionInterstitialTest.java
diff --git a/tests/unit/src/com/android/settings/ManagedAccessSettingsLowRamTest.java b/tests/unit/src/com/android/settings/ManagedAccessSettingsLowRamTest.java
new file mode 100644
index 0000000..6a63e05
--- /dev/null
+++ b/tests/unit/src/com/android/settings/ManagedAccessSettingsLowRamTest.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;
+
+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.doesNotExist;
+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.ActivityManager;
+import android.app.Instrumentation;
+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.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+@RunWith(AndroidJUnit4.class)
+@SmallTest
+public class ManagedAccessSettingsLowRamTest {
+
+    private Instrumentation mInstrumentation;
+    private Context mTargetContext;
+
+    @Before
+    public void setUp() {
+        mInstrumentation = InstrumentationRegistry.getInstrumentation();
+        mTargetContext = mInstrumentation.getTargetContext();
+    }
+
+    @Test
+    public void testManagedAccessOptionsVisibility() throws Exception {
+        mInstrumentation.startActivitySync(new Intent(mTargetContext,
+                com.android.settings.Settings.AppAndNotificationDashboardActivity.class));
+        onView(withText(mTargetContext.getString(R.string.expand_button_title))).perform(click());
+        onView(withText(mTargetContext.getString(R.string.special_access))).perform(click());
+
+        String[] managedServiceLabels = new String[] {"Do Not Disturb access",
+                "VR helper services", "Notification access", "Picture-in-picture"};
+        for (String label : managedServiceLabels) {
+            if (ActivityManager.isLowRamDeviceStatic()) {
+                onView(withText(label)).check(doesNotExist());
+            } else {
+                onView(withText(label)).check(matches(isDisplayed()));
+            }
+        }
+    }
+
+    @Test
+    public void launchNotificationSetting_onlyWorksIfNotLowRam() {
+        final Intent intent = new Intent(Settings.ACTION_NOTIFICATION_LISTENER_SETTINGS);
+
+        mInstrumentation.startActivitySync(intent);
+
+        final String label = "This feature is not available on this device";
+        if (ActivityManager.isLowRamDeviceStatic()) {
+            onView(withText(label)).check(matches(isDisplayed()));
+        } else {
+            onView(withText(label)).check(doesNotExist());
+        }
+    }
+
+    @Test
+    public void launchDndSetting_onlyWorksIfNotLowRam() {
+        final Intent intent = new Intent(Settings.ACTION_NOTIFICATION_POLICY_ACCESS_SETTINGS);
+
+        mInstrumentation.startActivitySync(intent);
+
+        final String label = "This feature is not available on this device";
+        if (ActivityManager.isLowRamDeviceStatic()) {
+            onView(withText(label)).check(matches(isDisplayed()));
+        } else {
+            onView(withText(label)).check(doesNotExist());
+        }
+    }
+
+    @Test
+    public void launchVrSetting_onlyWorksIfNotLowRam() {
+        final Intent intent = new Intent(Settings.ACTION_VR_LISTENER_SETTINGS);
+
+        mInstrumentation.startActivitySync(intent);
+
+        final String label = "This feature is not available on this device";
+        if (ActivityManager.isLowRamDeviceStatic()) {
+            onView(withText(label)).check(matches(isDisplayed()));
+        } else {
+            onView(withText(label)).check(doesNotExist());
+        }
+    }
+
+    @Test
+    public void launchPictureInPictureSetting_onlyWorksIfNotLowRam() {
+        final Intent intent = new Intent(Settings.ACTION_PICTURE_IN_PICTURE_SETTINGS);
+
+        mInstrumentation.startActivitySync(intent);
+
+        final String label = "This feature is not available on this device";
+        if (ActivityManager.isLowRamDeviceStatic()) {
+            onView(withText(label)).check(matches(isDisplayed()));
+        } else {
+            onView(withText(label)).check(doesNotExist());
+        }
+    }
+}
diff --git a/tests/unit/src/com/android/settings/SettingsHookTests.java b/tests/unit/src/com/android/settings/SettingsHookTests.java
new file mode 100644
index 0000000..cc7aa89
--- /dev/null
+++ b/tests/unit/src/com/android/settings/SettingsHookTests.java
@@ -0,0 +1,132 @@
+/*
+ * Copyright (C) 2010 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings;
+
+import com.android.settings.Settings;
+
+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.test.ActivityInstrumentationTestCase2;
+
+import java.util.List;
+
+/**
+ * Tests for the Settings operator/manufacturer hook.
+ *
+ * Running all tests:
+ *
+ *   make SettingsTests
+ *   adb push SettingsTests.apk /system/app/SettingsTests.apk
+ *   adb shell am instrument \
+ *    -w com.android.settings.tests/android.test.InstrumentationTestRunner
+ */
+public class SettingsHookTests extends ActivityInstrumentationTestCase2<Settings> {
+
+    private static final String PACKAGE_NAME = "com.android.settings.tests.unit";
+
+    private static final String KEY_SETTINGS_ROOT = "parent";
+    private static final String KEY_SETTINGS_OPERATOR = "operator_settings";
+    private static final String KEY_SETTINGS_MANUFACTURER = "manufacturer_settings";
+
+    private static final String INTENT_OPERATOR_HOOK = "com.android.settings.OPERATOR_APPLICATION_SETTING";
+    private static final String INTENT_MANUFACTURER_HOOK = "com.android.settings.MANUFACTURER_APPLICATION_SETTING";
+
+    private Settings mSettings;
+
+    public SettingsHookTests() {
+        super("com.android.settings", Settings.class);
+    }
+
+    @Override
+    protected void setUp() throws Exception {
+        super.setUp();
+        mSettings = getActivity();
+    }
+
+    /**
+     * Test that the operator/manufacturer settings hook test application is
+     * available and that it's installed in the device's system image.
+     */
+    public void testSettingsHookTestAppAvailable() throws Exception {
+        Context context = mSettings.getApplicationContext();
+        PackageManager pm = context.getPackageManager();
+        ApplicationInfo applicationInfo = pm.getApplicationInfo(PACKAGE_NAME, 0);
+        assertTrue((applicationInfo.flags & ApplicationInfo.FLAG_SYSTEM) != 0);
+    }
+
+    /**
+     * Test that the operator test activity has registered an intent-filter for
+     * an action named 'android.settings.OPERATOR_APPLICATION_SETTING'.
+     */
+    public void testOperatorIntentFilter() {
+        boolean result = false;
+        Context context = mSettings.getApplicationContext();
+        PackageManager pm = context.getPackageManager();
+        Intent intent = new Intent(INTENT_OPERATOR_HOOK);
+        List<ResolveInfo> list = pm.queryIntentActivities(intent, 0);
+        for (ResolveInfo resolveInfo : list) {
+            if (resolveInfo.activityInfo.packageName.equals(PACKAGE_NAME)) {
+                result = true;
+            }
+        }
+        assertTrue("Intent-filter not found", result);
+    }
+
+    /**
+     * Test that the manufacturer test activity has registered an intent-filter
+     * for an action named 'android.settings.MANUFACTURER_APPLICATION_SETTING'.
+     */
+    public void testManufacturerIntentFilter() {
+        boolean result = false;
+        Context context = mSettings.getApplicationContext();
+        PackageManager pm = context.getPackageManager();
+        Intent intent = new Intent(INTENT_MANUFACTURER_HOOK);
+        List<ResolveInfo> list = pm.queryIntentActivities(intent, 0);
+        for (ResolveInfo resolveInfo : list) {
+            if (resolveInfo.activityInfo.packageName.equals(PACKAGE_NAME)) {
+                result = true;
+            }
+        }
+        assertTrue("Intent-filter not found", result);
+    }
+
+    /**
+     * Test that the operator preference is available in the Settings
+     * application.
+     */
+    public void testOperatorPreferenceAvailable() {
+// TODO: fix this test case to work with fragments
+//        PreferenceGroup root = (PreferenceGroup)mSettings.findPreference(KEY_SETTINGS_ROOT);
+//        Preference operatorPreference = root.findPreference(KEY_SETTINGS_OPERATOR);
+//        assertNotNull(operatorPreference);
+    }
+
+    /**
+     * Test that the manufacturer preference is available in the Settings
+     * application.
+     */
+    public void testManufacturerPreferenceAvailable() {
+// TODO: fix this test case to work with fragments
+//        PreferenceGroup root = (PreferenceGroup)mSettings.findPreference(KEY_SETTINGS_ROOT);
+//        Preference manufacturerHook = root.findPreference(KEY_SETTINGS_MANUFACTURER);
+//        assertNotNull(manufacturerHook);
+    }
+
+}
diff --git a/tests/unit/src/com/android/settings/SettingsPreferenceFragmentTest.java b/tests/unit/src/com/android/settings/SettingsPreferenceFragmentTest.java
new file mode 100644
index 0000000..0e12e79
--- /dev/null
+++ b/tests/unit/src/com/android/settings/SettingsPreferenceFragmentTest.java
@@ -0,0 +1,70 @@
+package com.android.settings;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import android.app.Instrumentation;
+import android.content.Context;
+import android.content.Intent;
+import android.os.Bundle;
+import android.support.test.InstrumentationRegistry;
+import android.support.test.filters.SmallTest;
+import android.support.test.runner.AndroidJUnit4;
+import android.support.v7.preference.Preference;
+import android.support.v7.preference.PreferenceGroupAdapter;
+
+import com.android.settings.accessibility.AccessibilitySettings;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+@RunWith(AndroidJUnit4.class)
+@SmallTest
+public class SettingsPreferenceFragmentTest {
+
+    private Instrumentation mInstrumentation;
+    private Context mTargetContext;
+
+    @Before
+    public void setUp() throws Exception {
+        mInstrumentation = InstrumentationRegistry.getInstrumentation();
+        mTargetContext = mInstrumentation.getTargetContext();
+    }
+
+    @Test
+    public void testHighlightCaptions() throws InterruptedException {
+        final String prefKey = "captioning_preference_screen";
+        Bundle args = new Bundle();
+        args.putString(SettingsActivity.EXTRA_FRAGMENT_ARG_KEY, prefKey);
+
+        Intent intent = new Intent(Intent.ACTION_MAIN);
+        intent.setClass(mTargetContext, SubSettings.class);
+        intent.putExtra(SettingsActivity.EXTRA_SHOW_FRAGMENT,
+                "com.android.settings.accessibility.AccessibilitySettings");
+        intent.putExtra(SettingsActivity.EXTRA_SHOW_FRAGMENT_ARGUMENTS, args);
+
+        SettingsActivity activity  = (SettingsActivity) mInstrumentation.startActivitySync(intent);
+        AccessibilitySettings fragment = (AccessibilitySettings)
+                activity.getFragmentManager().getFragments().get(0);
+
+        // Allow time for highlight from post-delay.
+        Thread.sleep(SettingsPreferenceFragment.DELAY_HIGHLIGHT_DURATION_MILLIS);
+        if (!fragment.mPreferenceHighlighted) {
+            Thread.sleep(SettingsPreferenceFragment.DELAY_HIGHLIGHT_DURATION_MILLIS);
+        }
+
+        int prefPosition = -1;
+        PreferenceGroupAdapter adapter = (PreferenceGroupAdapter)
+                fragment.getListView().getAdapter();
+        for (int n = 0, count = adapter.getItemCount(); n < count; n++) {
+            final Preference preference = adapter.getItem(n);
+            final String preferenceKey = preference.getKey();
+            if (preferenceKey.equals(prefKey)) {
+                prefPosition = n;
+                break;
+            }
+        }
+
+        assertThat(fragment.mAdapter.initialHighlightedPosition).isEqualTo(prefPosition);
+    }
+}
diff --git a/tests/unit/src/com/android/settings/applications/DefaultAppSettingsTest.java b/tests/unit/src/com/android/settings/applications/DefaultAppSettingsTest.java
new file mode 100644
index 0000000..eafe32a
--- /dev/null
+++ b/tests/unit/src/com/android/settings/applications/DefaultAppSettingsTest.java
@@ -0,0 +1,78 @@
+/*
+ * Copyright (C) 2017 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF 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.Intent;
+import android.support.test.filters.SmallTest;
+import android.support.test.uiautomator.UiDevice;
+import android.support.test.uiautomator.UiObject;
+import android.support.test.uiautomator.UiSelector;
+import android.test.InstrumentationTestCase;
+import android.widget.TextView;
+
+import com.android.settings.R;
+
+import org.junit.Test;
+
+/**
+ * Test for Advanced App preferences.
+ */
+@SmallTest
+public class DefaultAppSettingsTest extends InstrumentationTestCase {
+
+    private UiDevice mDevice;
+    private Context mTargetContext;
+    private String mTargetPackage;
+
+    @Override
+    protected void setUp() throws Exception {
+        super.setUp();
+        mDevice = UiDevice.getInstance(getInstrumentation());
+        mTargetContext = getInstrumentation().getTargetContext();
+        mTargetPackage = mTargetContext.getPackageName();
+    }
+
+    @Test
+    public void testSelectDefaultHome_shouldLaunchHomePicker() throws Exception {
+        launchDefaultApps();
+        final String titleHomeApp = mTargetContext.getResources().getString(R.string.home_app);
+        mDevice.findObject(new UiSelector().text(titleHomeApp)).click();
+        final UiObject actionBar = mDevice.findObject(new UiSelector().resourceId(
+            "com.android.settings:id/action_bar"));
+        final UiObject title = actionBar.getChild(
+            new UiSelector().className(TextView.class.getName()));
+        assertEquals(titleHomeApp, title.getText());
+    }
+
+    private void launchDefaultApps() throws Exception  {
+        final Intent settingsIntent = new Intent(Intent.ACTION_MAIN)
+            .addCategory(Intent.CATEGORY_LAUNCHER)
+            .setPackage(mTargetPackage)
+            .addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+        getInstrumentation().getContext().startActivity(settingsIntent);
+        final String titleApps = mTargetContext.getResources().getString(
+            R.string.app_and_notification_dashboard_title);
+        mDevice.findObject(new UiSelector().text(titleApps)).click();
+        final String titleAdvance = mTargetContext.getResources().getString(
+                R.string.advanced_section_header);
+        mDevice.findObject(new UiSelector().text(titleAdvance)).click();
+        final String titleDefaultApps = mTargetContext.getResources().getString(
+            R.string.app_default_dashboard_title);
+        mDevice.findObject(new UiSelector().text(titleDefaultApps)).click();
+    }
+
+}
diff --git a/tests/app/src/com/android/settings/applications/ExternalSourcesSettingsTest.java b/tests/unit/src/com/android/settings/applications/ExternalSourcesSettingsTest.java
similarity index 100%
rename from tests/app/src/com/android/settings/applications/ExternalSourcesSettingsTest.java
rename to tests/unit/src/com/android/settings/applications/ExternalSourcesSettingsTest.java
diff --git a/tests/unit/src/com/android/settings/applications/ManageApplicationsUnitTest.java b/tests/unit/src/com/android/settings/applications/ManageApplicationsUnitTest.java
deleted file mode 100644
index ce8603b..0000000
--- a/tests/unit/src/com/android/settings/applications/ManageApplicationsUnitTest.java
+++ /dev/null
@@ -1,135 +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.applications;
-
-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;
-import com.android.settingslib.applications.ApplicationsState.AppFilter;
-
-import com.android.settingslib.applications.ApplicationsState.CompoundFilter;
-import com.android.settingslib.applications.instantapps.InstantAppDataProvider;
-import java.lang.reflect.Field;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-
-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 =
-                ManageApplications.getCompositeFilter(
-                        ManageApplications.LIST_TYPE_STORAGE,
-                        ManageApplications.STORAGE_TYPE_MUSIC,
-                        "uuid");
-        final ApplicationInfo info = new ApplicationInfo();
-        info.volumeUuid = "uuid";
-        info.category = ApplicationInfo.CATEGORY_AUDIO;
-        final ApplicationsState.AppEntry appEntry = mock(ApplicationsState.AppEntry.class);
-        appEntry.info = info;
-
-        assertThat(filter.filterApp(appEntry)).isTrue();
-    }
-
-    @Test
-    public void getCompositeFilter_filtersVolumeForVideo() {
-        AppFilter filter =
-                ManageApplications.getCompositeFilter(
-                        ManageApplications.LIST_TYPE_MOVIES,
-                        ManageApplications.STORAGE_TYPE_DEFAULT,
-                        "uuid");
-        final ApplicationInfo info = new ApplicationInfo();
-        info.volumeUuid = "uuid";
-        info.category = ApplicationInfo.CATEGORY_VIDEO;
-        final ApplicationsState.AppEntry appEntry = mock(ApplicationsState.AppEntry.class);
-        appEntry.info = info;
-
-        assertThat(filter.filterApp(appEntry)).isTrue();
-    }
-
-    @Test
-    public void getCompositeFilter_filtersVolumeForGames() {
-        ApplicationsState.AppFilter filter =
-                ManageApplications.getCompositeFilter(
-                        ManageApplications.LIST_TYPE_GAMES,
-                        ManageApplications.STORAGE_TYPE_DEFAULT,
-                        "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();
-    }
-
-    @Test
-    public void getCompositeFilter_isEmptyNormally() {
-        ApplicationsState.AppFilter filter =
-                ManageApplications.getCompositeFilter(
-                        ManageApplications.LIST_TYPE_MAIN,
-                        ManageApplications.STORAGE_TYPE_DEFAULT,
-                        "uuid");
-        assertThat(filter).isNull();
-    }
-
-    @Test
-    public void getCompositeFilter_worksWithInstantApps() throws Exception {
-        Field field = AppUtils.class.getDeclaredField("sInstantAppDataProvider");
-        field.setAccessible(true);
-        field.set(AppUtils.class, (InstantAppDataProvider) (i -> true));
-
-        AppFilter filter =
-            ManageApplications.getCompositeFilter(
-                ManageApplications.LIST_TYPE_STORAGE,
-                ManageApplications.STORAGE_TYPE_MUSIC,
-                "uuid");
-        AppFilter composedFilter = new CompoundFilter(ApplicationsState.FILTER_INSTANT, filter);
-
-        final ApplicationInfo info = new ApplicationInfo();
-        info.volumeUuid = "uuid";
-        info.category = ApplicationInfo.CATEGORY_AUDIO;
-        info.privateFlags = ApplicationInfo.PRIVATE_FLAG_INSTANT;
-        final ApplicationsState.AppEntry appEntry = mock(ApplicationsState.AppEntry.class);
-        appEntry.info = info;
-
-        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/applications/PackageUtilTest.java b/tests/unit/src/com/android/settings/applications/PackageUtilTest.java
similarity index 100%
rename from tests/app/src/com/android/settings/applications/PackageUtilTest.java
rename to tests/unit/src/com/android/settings/applications/PackageUtilTest.java
diff --git a/tests/unit/src/com/android/settings/applications/manageapplications/ManageApplicationsUnitTest.java b/tests/unit/src/com/android/settings/applications/manageapplications/ManageApplicationsUnitTest.java
new file mode 100644
index 0000000..87a24d6
--- /dev/null
+++ b/tests/unit/src/com/android/settings/applications/manageapplications/ManageApplicationsUnitTest.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.applications.manageapplications;
+
+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;
+import com.android.settingslib.applications.ApplicationsState.AppFilter;
+import com.android.settingslib.applications.ApplicationsState.CompoundFilter;
+import com.android.settingslib.applications.instantapps.InstantAppDataProvider;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+import java.lang.reflect.Field;
+
+@SmallTest
+@RunWith(AndroidJUnit4.class)
+public class ManageApplicationsUnitTest {
+    @Test
+    public void getCompositeFilter_filtersVolumeForAudio() {
+        AppFilter filter =
+                ManageApplications.getCompositeFilter(
+                        ManageApplications.LIST_TYPE_STORAGE,
+                        ManageApplications.STORAGE_TYPE_MUSIC,
+                        "uuid");
+        final ApplicationInfo info = new ApplicationInfo();
+        info.volumeUuid = "uuid";
+        info.category = ApplicationInfo.CATEGORY_AUDIO;
+        final ApplicationsState.AppEntry appEntry = mock(ApplicationsState.AppEntry.class);
+        appEntry.info = info;
+
+        assertThat(filter.filterApp(appEntry)).isTrue();
+    }
+
+    @Test
+    public void getCompositeFilter_filtersVolumeForVideo() {
+        AppFilter filter =
+                ManageApplications.getCompositeFilter(
+                        ManageApplications.LIST_TYPE_MOVIES,
+                        ManageApplications.STORAGE_TYPE_DEFAULT,
+                        "uuid");
+        final ApplicationInfo info = new ApplicationInfo();
+        info.volumeUuid = "uuid";
+        info.category = ApplicationInfo.CATEGORY_VIDEO;
+        final ApplicationsState.AppEntry appEntry = mock(ApplicationsState.AppEntry.class);
+        appEntry.info = info;
+
+        assertThat(filter.filterApp(appEntry)).isTrue();
+    }
+
+    @Test
+    public void getCompositeFilter_filtersVolumeForGames() {
+        ApplicationsState.AppFilter filter =
+                ManageApplications.getCompositeFilter(
+                        ManageApplications.LIST_TYPE_GAMES,
+                        ManageApplications.STORAGE_TYPE_DEFAULT,
+                        "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();
+    }
+
+    @Test
+    public void getCompositeFilter_isEmptyNormally() {
+        ApplicationsState.AppFilter filter =
+                ManageApplications.getCompositeFilter(
+                        ManageApplications.LIST_TYPE_MAIN,
+                        ManageApplications.STORAGE_TYPE_DEFAULT,
+                        "uuid");
+        assertThat(filter).isNull();
+    }
+
+    @Test
+    public void getCompositeFilter_worksWithInstantApps() throws Exception {
+        Field field = AppUtils.class.getDeclaredField("sInstantAppDataProvider");
+        field.setAccessible(true);
+        field.set(AppUtils.class, (InstantAppDataProvider) (i -> true));
+
+        AppFilter filter =
+                ManageApplications.getCompositeFilter(
+                        ManageApplications.LIST_TYPE_STORAGE,
+                        ManageApplications.STORAGE_TYPE_MUSIC,
+                        "uuid");
+        AppFilter composedFilter = new CompoundFilter(ApplicationsState.FILTER_INSTANT, filter);
+
+        final ApplicationInfo info = new ApplicationInfo();
+        info.volumeUuid = "uuid";
+        info.category = ApplicationInfo.CATEGORY_AUDIO;
+        info.privateFlags = ApplicationInfo.PRIVATE_FLAG_INSTANT;
+        final ApplicationsState.AppEntry appEntry = mock(ApplicationsState.AppEntry.class);
+        appEntry.info = info;
+
+        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/bluetooth/BluetoothDeviceDetailsRotationTest.java b/tests/unit/src/com/android/settings/bluetooth/BluetoothDeviceDetailsRotationTest.java
similarity index 100%
rename from tests/app/src/com/android/settings/bluetooth/BluetoothDeviceDetailsRotationTest.java
rename to tests/unit/src/com/android/settings/bluetooth/BluetoothDeviceDetailsRotationTest.java
diff --git a/tests/app/src/com/android/settings/bluetooth/DevicePickerActivityTest.java b/tests/unit/src/com/android/settings/bluetooth/DevicePickerActivityTest.java
similarity index 100%
rename from tests/app/src/com/android/settings/bluetooth/DevicePickerActivityTest.java
rename to tests/unit/src/com/android/settings/bluetooth/DevicePickerActivityTest.java
diff --git a/tests/unit/src/com/android/settings/connecteddevice/ConnectedDeviceActivityTest.java b/tests/unit/src/com/android/settings/connecteddevice/ConnectedDeviceActivityTest.java
new file mode 100644
index 0000000..4be8a39
--- /dev/null
+++ b/tests/unit/src/com/android/settings/connecteddevice/ConnectedDeviceActivityTest.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.connecteddevice;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import android.app.Instrumentation;
+import android.content.Intent;
+import android.content.pm.PackageManager;
+import android.content.pm.ResolveInfo;
+import android.support.test.InstrumentationRegistry;
+import android.support.test.filters.SmallTest;
+import android.support.test.runner.AndroidJUnit4;
+import android.text.TextUtils;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+import java.util.List;
+
+@RunWith(AndroidJUnit4.class)
+@SmallTest
+public class ConnectedDeviceActivityTest {
+    private static final String INTENT_ACTION = "android.intent.action.MAIN";
+    private static final String CONNECTED_DEVICE_TITLE = "Connected devices";
+
+    private Instrumentation mInstrumentation;
+
+    @Before
+    public void setUp() throws Exception {
+        mInstrumentation = InstrumentationRegistry.getInstrumentation();
+    }
+
+    @Test
+    public void queryConnectedDeviceActivity_onlyOneResponse() {
+        final PackageManager packageManager = mInstrumentation.getContext().getPackageManager();
+        final Intent intent = new Intent(INTENT_ACTION);
+
+        int count = 0;
+        final List<ResolveInfo> resolveInfoList = packageManager.queryIntentActivities(intent,
+                PackageManager.GET_META_DATA);
+        for (ResolveInfo info : resolveInfoList) {
+            if (TextUtils.equals(info.activityInfo.loadLabel(packageManager).toString(),
+                    CONNECTED_DEVICE_TITLE)) {
+                count++;
+            }
+        }
+
+        assertThat(count).isEqualTo(1);
+    }
+
+}
diff --git a/tests/unit/src/com/android/settings/core/PreferenceControllerContractTest.java b/tests/unit/src/com/android/settings/core/PreferenceControllerContractTest.java
new file mode 100644
index 0000000..86e8dc1
--- /dev/null
+++ b/tests/unit/src/com/android/settings/core/PreferenceControllerContractTest.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.core;
+
+import static junit.framework.Assert.fail;
+
+import android.content.Context;
+import android.platform.test.annotations.Presubmit;
+import android.provider.SearchIndexableResource;
+import android.support.test.InstrumentationRegistry;
+import android.support.test.filters.MediumTest;
+import android.support.test.runner.AndroidJUnit4;
+import android.util.ArraySet;
+
+import com.android.settings.search.DatabaseIndexingUtils;
+import com.android.settings.search.Indexable;
+import com.android.settings.search.SearchIndexableResources;
+import com.android.settingslib.core.AbstractPreferenceController;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+import java.util.List;
+import java.util.Set;
+
+@RunWith(AndroidJUnit4.class)
+@MediumTest
+public class PreferenceControllerContractTest {
+
+    private Context mContext;
+
+    @Before
+    public void setUp() {
+        mContext = InstrumentationRegistry.getTargetContext();
+    }
+
+    @Test
+    @Presubmit
+    public void controllersInSearchShouldImplementPreferenceControllerMixin() {
+        final Set<String> errorClasses = new ArraySet<>();
+
+        for (Class clazz : SearchIndexableResources.providerValues()) {
+
+            final Indexable.SearchIndexProvider provider =
+                    DatabaseIndexingUtils.getSearchIndexProvider(clazz);
+            if (provider == null) {
+                continue;
+            }
+
+            final List<AbstractPreferenceController> controllers =
+                    provider.getPreferenceControllers(mContext);
+            if (controllers == null) {
+                continue;
+            }
+            for (AbstractPreferenceController controller : controllers) {
+                if (!(controller instanceof PreferenceControllerMixin)
+                        && !(controller instanceof BasePreferenceController)) {
+                    errorClasses.add(controller.getClass().getName());
+                }
+            }
+        }
+
+        if (!errorClasses.isEmpty()) {
+            final StringBuilder errorMessage = new StringBuilder()
+                    .append("Each preference must implement PreferenceControllerMixin ")
+                    .append("or extend BasePreferenceController, ")
+                    .append("the following classes don't:\n");
+            for (String c : errorClasses) {
+                errorMessage.append(c).append("\n");
+            }
+            fail(errorMessage.toString());
+        }
+    }
+}
diff --git a/tests/unit/src/com/android/settings/core/UniquePreferenceTest.java b/tests/unit/src/com/android/settings/core/UniquePreferenceTest.java
new file mode 100644
index 0000000..ce3fe01
--- /dev/null
+++ b/tests/unit/src/com/android/settings/core/UniquePreferenceTest.java
@@ -0,0 +1,205 @@
+/*
+ * Copyright (C) 2017 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF 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;
+
+import static junit.framework.Assert.fail;
+
+import android.content.Context;
+import android.content.res.Resources;
+import android.content.res.XmlResourceParser;
+import android.platform.test.annotations.Presubmit;
+import android.provider.SearchIndexableResource;
+import android.support.test.InstrumentationRegistry;
+import android.support.test.filters.MediumTest;
+import android.support.test.runner.AndroidJUnit4;
+import android.text.TextUtils;
+import android.util.AttributeSet;
+import android.util.Log;
+import android.util.Xml;
+
+import com.android.settings.search.DatabaseIndexingUtils;
+import com.android.settings.search.Indexable;
+import com.android.settings.search.SearchIndexableRaw;
+import com.android.settings.search.SearchIndexableResources;
+import com.android.settings.search.XmlParserUtils;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.xmlpull.v1.XmlPullParser;
+import org.xmlpull.v1.XmlPullParserException;
+
+import java.io.IOException;
+import java.util.Arrays;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+
+@RunWith(AndroidJUnit4.class)
+@MediumTest
+public class UniquePreferenceTest {
+
+    private static final String TAG = "UniquePreferenceTest";
+    private static final List<String> SUPPORTED_PREF_TYPES = Arrays.asList(
+            "Preference", "PreferenceCategory", "PreferenceScreen");
+    private static final List<String> WHITELISTED_DUPLICATE_KEYS = Arrays.asList(
+            "owner_info_settings",          // Lock screen message in security - multiple xml files
+                                            // contain this because security page is constructed by
+                                            // combining small xml chunks. Eventually the page
+                                            // should be formed as one single xml and this entry
+                                            // should be removed.
+
+            "dashboard_tile_placeholder"    // This is the placeholder pref for injecting dynamic
+                                            // tiles.
+    );
+
+    private Context mContext;
+
+    @Before
+    public void setUp() {
+        mContext = InstrumentationRegistry.getTargetContext();
+    }
+
+    /**
+     * All preferences should have their unique key. It's especially important for many parts of
+     * Settings to work properly: we assume pref keys are unique in displaying, search ranking,\
+     * search result suppression, and many other areas.
+     * <p/>
+     * So in this test we are checking preferences participating in search.
+     * <p/>
+     * Note: Preference is not limited to just <Preference/> object. Everything in preference xml
+     * should have a key.
+     */
+    @Test
+    @Presubmit
+    public void allPreferencesShouldHaveUniqueKey()
+            throws IOException, XmlPullParserException, Resources.NotFoundException {
+        final Set<String> uniqueKeys = new HashSet<>();
+        final Set<String> nullKeyClasses = new HashSet<>();
+        final Set<String> duplicatedKeys = new HashSet<>();
+        for (Class<?> clazz : SearchIndexableResources.providerValues()) {
+            verifyPreferenceKeys(uniqueKeys, duplicatedKeys, nullKeyClasses, clazz);
+        }
+
+        if (!nullKeyClasses.isEmpty()) {
+            final StringBuilder nullKeyErrors = new StringBuilder()
+                    .append("Each preference/SearchIndexableData must have a key, ")
+                    .append("the following classes have null keys:\n");
+            for (String c : nullKeyClasses) {
+                nullKeyErrors.append(c).append("\n");
+            }
+            fail(nullKeyErrors.toString());
+        }
+
+        if (!duplicatedKeys.isEmpty()) {
+            final StringBuilder dupeKeysError = new StringBuilder(
+                    "The following keys are not unique\n");
+            for (String c : duplicatedKeys) {
+                dupeKeysError.append(c).append("\n");
+            }
+            fail(dupeKeysError.toString());
+        }
+    }
+
+    private void verifyPreferenceKeys(Set<String> uniqueKeys, Set<String> duplicatedKeys,
+            Set<String> nullKeyClasses, Class<?> clazz)
+            throws IOException, XmlPullParserException, Resources.NotFoundException {
+        if (clazz == null) {
+            return;
+        }
+        final String className = clazz.getName();
+        final Indexable.SearchIndexProvider provider =
+                DatabaseIndexingUtils.getSearchIndexProvider(clazz);
+        final List<SearchIndexableRaw> rawsToIndex = provider.getRawDataToIndex(mContext, true);
+        final List<SearchIndexableResource> resourcesToIndex =
+                provider.getXmlResourcesToIndex(mContext, true);
+        verifyResources(className, resourcesToIndex, uniqueKeys, duplicatedKeys, nullKeyClasses);
+        verifyRaws(className, rawsToIndex, uniqueKeys, duplicatedKeys, nullKeyClasses);
+    }
+
+    private void verifyResources(String className, List<SearchIndexableResource> resourcesToIndex,
+            Set<String> uniqueKeys, Set<String> duplicatedKeys, Set<String> nullKeyClasses)
+            throws IOException, XmlPullParserException, Resources.NotFoundException {
+        if (resourcesToIndex == null) {
+            Log.d(TAG, className + "is not providing SearchIndexableResource, skipping");
+            return;
+        }
+
+        for (SearchIndexableResource sir : resourcesToIndex) {
+            if (sir.xmlResId <= 0) {
+                Log.d(TAG, className + " doesn't have a valid xml to index.");
+                continue;
+            }
+            final XmlResourceParser parser = mContext.getResources().getXml(sir.xmlResId);
+
+            int type;
+            while ((type = parser.next()) != XmlPullParser.END_DOCUMENT
+                    && type != XmlPullParser.START_TAG) {
+                // Parse next until start tag is found
+            }
+            final int outerDepth = parser.getDepth();
+
+            do {
+                if (type != XmlPullParser.START_TAG) {
+                    continue;
+                }
+                final String nodeName = parser.getName();
+                if (!SUPPORTED_PREF_TYPES.contains(nodeName) && !nodeName.endsWith("Preference")) {
+                    continue;
+                }
+                final AttributeSet attrs = Xml.asAttributeSet(parser);
+                final String key = XmlParserUtils.getDataKey(mContext, attrs);
+                if (TextUtils.isEmpty(key)) {
+                    Log.e(TAG, "Every preference must have an key; found null key"
+                            + " in " + className
+                            + " at " + parser.getPositionDescription());
+                    nullKeyClasses.add(className);
+                    continue;
+                }
+                if (uniqueKeys.contains(key) && !WHITELISTED_DUPLICATE_KEYS.contains(key)) {
+                    Log.e(TAG, "Every preference key must unique; found " + nodeName
+                            + " in " + className
+                            + " at " + parser.getPositionDescription());
+                    duplicatedKeys.add(key);
+                }
+                uniqueKeys.add(key);
+            } while ((type = parser.next()) != XmlPullParser.END_DOCUMENT
+                    && (type != XmlPullParser.END_TAG || parser.getDepth() > outerDepth));
+        }
+    }
+
+    private void verifyRaws(String className, List<SearchIndexableRaw> rawsToIndex,
+            Set<String> uniqueKeys, Set<String> duplicatedKeys, Set<String> nullKeyClasses) {
+        if (rawsToIndex == null) {
+            Log.d(TAG, className + "is not providing SearchIndexableRaw, skipping");
+            return;
+        }
+        for (SearchIndexableRaw raw : rawsToIndex) {
+            if (TextUtils.isEmpty(raw.key)) {
+                Log.e(TAG, "Every SearchIndexableRaw must have an key; found null key"
+                        + " in " + className);
+                nullKeyClasses.add(className);
+                continue;
+            }
+            if (uniqueKeys.contains(raw.key) && !WHITELISTED_DUPLICATE_KEYS.contains(raw.key)) {
+                Log.e(TAG, "Every SearchIndexableRaw key must unique; found " + raw.key
+                        + " in " + className);
+                duplicatedKeys.add(raw.key);
+            }
+        }
+    }
+}
diff --git a/tests/unit/src/com/android/settings/core/UserRestrictionTest.java b/tests/unit/src/com/android/settings/core/UserRestrictionTest.java
new file mode 100644
index 0000000..ad00bd7
--- /dev/null
+++ b/tests/unit/src/com/android/settings/core/UserRestrictionTest.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.core;
+
+import static junit.framework.Assert.fail;
+
+import android.content.Context;
+import android.content.res.Resources;
+import android.content.res.TypedArray;
+import android.content.res.XmlResourceParser;
+import android.os.UserManager;
+import android.platform.test.annotations.Presubmit;
+import android.provider.SearchIndexableResource;
+import android.support.test.InstrumentationRegistry;
+import android.support.test.filters.MediumTest;
+import android.support.test.runner.AndroidJUnit4;
+import android.util.AttributeSet;
+import android.util.Log;
+import android.util.Xml;
+
+import com.android.settings.search.DatabaseIndexingUtils;
+import com.android.settings.search.Indexable;
+import com.android.settings.search.SearchIndexableResources;
+
+import com.google.android.collect.Sets;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.xmlpull.v1.XmlPullParser;
+import org.xmlpull.v1.XmlPullParserException;
+
+import java.io.IOException;
+import java.util.List;
+import java.util.Set;
+
+@RunWith(AndroidJUnit4.class)
+@MediumTest
+public class UserRestrictionTest {
+
+    private static final String TAG = "UserRestrictionTest";
+
+    private Context mContext;
+
+    private static final Set<String> USER_RESTRICTIONS = Sets.newHashSet(
+            UserManager.DISALLOW_CONFIG_DATE_TIME,
+            UserManager.DISALLOW_CONFIG_CREDENTIALS,
+            UserManager.DISALLOW_NETWORK_RESET,
+            UserManager.DISALLOW_FACTORY_RESET,
+            UserManager.DISALLOW_CONFIG_TETHERING,
+            UserManager.DISALLOW_CONFIG_VPN,
+            UserManager.DISALLOW_CONFIG_MOBILE_NETWORKS
+    );
+
+    @Before
+    public void setUp() {
+        mContext = InstrumentationRegistry.getTargetContext();
+    }
+
+    /**
+     * Verity that userRestriction attributes are entered and parsed successfully.
+     */
+    @Test
+    public void userRestrictionAttributeShouldBeValid()
+            throws IOException, XmlPullParserException, Resources.NotFoundException {
+        for (Class<?> clazz : SearchIndexableResources.providerValues()) {
+            verifyUserRestriction(clazz);
+        }
+    }
+
+    private void verifyUserRestriction(Class<?> clazz)
+            throws IOException, XmlPullParserException, Resources.NotFoundException {
+        if (clazz == null) {
+            return;
+        }
+        final String className = clazz.getName();
+        final Indexable.SearchIndexProvider provider =
+                DatabaseIndexingUtils.getSearchIndexProvider(clazz);
+        final List<SearchIndexableResource> resourcesToIndex =
+                provider.getXmlResourcesToIndex(mContext, true);
+
+        if (resourcesToIndex == null) {
+            Log.d(TAG, className + "is not providing SearchIndexableResource, skipping");
+            return;
+        }
+
+        for (SearchIndexableResource sir : resourcesToIndex) {
+            if (sir.xmlResId <= 0) {
+                Log.d(TAG, className + " doesn't have a valid xml to index.");
+                continue;
+            }
+            final XmlResourceParser parser = mContext.getResources().getXml(sir.xmlResId);
+
+            int type;
+            while ((type = parser.next()) != XmlPullParser.END_DOCUMENT
+                    && type != XmlPullParser.START_TAG) {
+                // Parse next until start tag is found
+            }
+            final int outerDepth = parser.getDepth();
+
+            do {
+                if (type != XmlPullParser.START_TAG) {
+                    continue;
+                }
+                final String nodeName = parser.getName();
+                if (!nodeName.endsWith("Preference")) {
+                    continue;
+                }
+                final AttributeSet attrs = Xml.asAttributeSet(parser);
+                final String userRestriction = getDataUserRestrictions(mContext, attrs);
+                if (userRestriction != null) {
+                    if(!isValidRestriction(userRestriction)) {
+                        fail("userRestriction in " + className + " not valid.");
+                    }
+                }
+            } while ((type = parser.next()) != XmlPullParser.END_DOCUMENT
+                    && (type != XmlPullParser.END_TAG || parser.getDepth() > outerDepth));
+        }
+    }
+
+    boolean isValidRestriction(String userRestriction) {
+        return USER_RESTRICTIONS.contains(userRestriction);
+    }
+
+    private String getDataUserRestrictions(Context context, AttributeSet attrs) {
+        return getData(context, attrs,
+                com.android.settingslib.R.styleable.RestrictedPreference,
+                com.android.settingslib.R.styleable.RestrictedPreference_userRestriction);
+    }
+
+    private String getData(Context context, AttributeSet set, int[] attrs, int resId) {
+        final TypedArray ta = context.obtainStyledAttributes(set, attrs);
+        String data = ta.getString(resId);
+        ta.recycle();
+        return data;
+    }
+}
diff --git a/tests/unit/src/com/android/settings/deviceinfo/StorageDashboardFragmentTest.java b/tests/unit/src/com/android/settings/deviceinfo/StorageDashboardFragmentTest.java
new file mode 100644
index 0000000..00b710f
--- /dev/null
+++ b/tests/unit/src/com/android/settings/deviceinfo/StorageDashboardFragmentTest.java
@@ -0,0 +1,40 @@
+package com.android.settings.deviceinfo;
+
+import android.support.test.espresso.intent.rule.IntentsTestRule;
+import android.support.test.filters.SmallTest;
+import android.support.test.runner.AndroidJUnitRunner;
+import com.android.settings.R;
+import com.android.settings.Settings.StorageDashboardActivity;
+import com.android.settings.deletionhelper.AutomaticStorageManagerSettings;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+import static android.support.test.espresso.Espresso.onView;
+import static android.support.test.espresso.action.ViewActions.click;
+import static android.support.test.espresso.intent.Intents.intended;
+import static android.support.test.espresso.intent.matcher.IntentMatchers.hasExtra;
+import static android.support.test.espresso.matcher.ViewMatchers.withText;
+import static org.hamcrest.Matchers.containsString;
+import static org.hamcrest.Matchers.equalTo;
+
+@SmallTest
+public class StorageDashboardFragmentTest {
+
+    public static final String EXTRA_KEY = ":settings:show_fragment";
+
+    @Rule
+    public IntentsTestRule<StorageDashboardActivity> mActivityRule =
+            new IntentsTestRule<>(StorageDashboardActivity.class, true, true);
+
+    @Test
+    public void testStorageManagePreference_canClickTextView() throws InterruptedException {
+        // Click on the actual textbox instead of just somewhere in the preference
+        onView(withText(R.string.automatic_storage_manager_preference_title)).perform(click());
+
+        // Check that it worked by seeing if we switched screens
+        intended(hasExtra(equalTo(EXTRA_KEY),
+                containsString(AutomaticStorageManagerSettings.class.getName())));
+
+    }
+}
diff --git a/tests/unit/src/com/android/settings/deviceinfo/storage/StorageAsyncLoaderTest.java b/tests/unit/src/com/android/settings/deviceinfo/storage/StorageAsyncLoaderTest.java
index 5a3569c..f622804 100644
--- a/tests/unit/src/com/android/settings/deviceinfo/storage/StorageAsyncLoaderTest.java
+++ b/tests/unit/src/com/android/settings/deviceinfo/storage/StorageAsyncLoaderTest.java
@@ -35,9 +35,9 @@
 import android.support.test.runner.AndroidJUnit4;
 import android.util.SparseArray;
 
-import com.android.settings.applications.PackageManagerWrapper;
-import com.android.settings.applications.UserManagerWrapper;
+import com.android.settings.wrapper.UserManagerWrapper;
 import com.android.settingslib.applications.StorageStatsSource;
+import com.android.settingslib.wrapper.PackageManagerWrapper;
 
 import org.junit.Before;
 import org.junit.Test;
diff --git a/tests/app/src/com/android/settings/fingerprint/FingerprintEnrollFinishTest.java b/tests/unit/src/com/android/settings/fingerprint/FingerprintEnrollFinishTest.java
similarity index 100%
rename from tests/app/src/com/android/settings/fingerprint/FingerprintEnrollFinishTest.java
rename to tests/unit/src/com/android/settings/fingerprint/FingerprintEnrollFinishTest.java
diff --git a/tests/unit/src/com/android/settings/fuelgauge/PowerUsageSummaryTest.java b/tests/unit/src/com/android/settings/fuelgauge/PowerUsageSummaryTest.java
new file mode 100644
index 0000000..9cbd742
--- /dev/null
+++ b/tests/unit/src/com/android/settings/fuelgauge/PowerUsageSummaryTest.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.fuelgauge;
+
+import static android.support.test.espresso.Espresso.onView;
+import static android.support.test.espresso.action.ViewActions.click;
+import static android.support.test.espresso.matcher.ViewMatchers.withText;
+
+import android.app.Instrumentation;
+import android.content.Intent;
+import android.support.test.InstrumentationRegistry;
+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;
+
+@RunWith(AndroidJUnit4.class)
+@SmallTest
+public class PowerUsageSummaryTest {
+    private static final String BATTERY_INTENT = "android.intent.action.POWER_USAGE_SUMMARY";
+
+    @Before
+    public void SetUp() {
+        Instrumentation instrumentation = InstrumentationRegistry.getInstrumentation();
+        instrumentation.startActivitySync(new Intent(BATTERY_INTENT));
+    }
+
+    @Test
+    public void testClickLastFullCharge_shouldNotCrash() {
+        onView(withText(R.string.battery_last_full_charge)).perform(click());
+    }
+
+    @Test
+    public void testClickScreenUsage_shouldNotCrash() {
+        onView(withText(R.string.device_screen_usage)).perform(click());
+    }
+
+}
diff --git a/tests/unit/src/com/android/settings/notification/AppNotificationSettingsTest.java b/tests/unit/src/com/android/settings/notification/AppNotificationSettingsTest.java
new file mode 100644
index 0000000..16a0b43
--- /dev/null
+++ b/tests/unit/src/com/android/settings/notification/AppNotificationSettingsTest.java
@@ -0,0 +1,166 @@
+/*
+ * Copyright (C) 2017 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.notification;
+
+import static android.app.NotificationManager.IMPORTANCE_DEFAULT;
+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.doesNotExist;
+import static android.support.test.espresso.assertion.ViewAssertions.matches;
+import android.support.test.espresso.intent.Intents;
+
+import static android.support.test.espresso.intent.Intents.intended;
+import static android.support.test.espresso.intent.matcher.IntentMatchers.hasExtra;
+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.android.settings.SettingsActivity.EXTRA_SHOW_FRAGMENT;
+
+import static org.hamcrest.Matchers.allOf;
+import static org.junit.Assert.fail;
+
+import android.app.Instrumentation;
+import android.app.NotificationChannel;
+import android.app.NotificationChannelGroup;
+import android.app.NotificationManager;
+import android.content.Context;
+import android.content.Intent;
+import android.provider.Settings;
+import android.support.test.InstrumentationRegistry;
+import android.support.test.espresso.matcher.ViewMatchers;
+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 AppNotificationSettingsTest {
+
+    private Context mTargetContext;
+    private Instrumentation mInstrumentation;
+
+    NotificationManager mNm;
+    private NotificationChannelGroup mGroup1;
+    private NotificationChannel mGroup1Channel1;
+    private NotificationChannel mGroup1Channel2;
+    private NotificationChannelGroup mGroup2;
+    private NotificationChannel mGroup2Channel1;
+    private NotificationChannel mUngroupedChannel;
+
+    @Before
+    public void setUp() {
+        mInstrumentation = InstrumentationRegistry.getInstrumentation();
+        mTargetContext = mInstrumentation.getTargetContext();
+        mNm  = (NotificationManager) mTargetContext.getSystemService(Context.NOTIFICATION_SERVICE);
+
+        mGroup1 = new NotificationChannelGroup(this.getClass().getName() + "1", "group1");
+        mGroup2 = new NotificationChannelGroup(this.getClass().getName() + "2", "group2");
+        mNm.createNotificationChannelGroup(mGroup1);
+        mNm.createNotificationChannelGroup(mGroup2);
+
+        mGroup1Channel1 = createChannel(mGroup1, this.getClass().getName()+ "c1-1");
+        mGroup1Channel2 = createChannel(mGroup1, this.getClass().getName()+ "c1-2");
+        mGroup2Channel1 = createChannel(mGroup2, this.getClass().getName()+ "c2-1");
+        mUngroupedChannel = createChannel(null, this.getClass().getName()+ "c");
+    }
+
+    @Test
+    public void launchNotificationSetting_shouldNotHaveAppInfoLink() {
+        final Intent intent = new Intent(Settings.ACTION_APP_NOTIFICATION_SETTINGS)
+                .putExtra(Settings.EXTRA_APP_PACKAGE, mTargetContext.getPackageName());
+
+        mInstrumentation.startActivitySync(intent);
+
+        onView(allOf(withId(android.R.id.button1),
+                withEffectiveVisibility(ViewMatchers.Visibility.VISIBLE)))
+                .check(doesNotExist());
+    }
+
+    @Test
+    public void launchNotificationSetting_showGroupsWithMultipleChannels() {
+        final Intent intent = new Intent(Settings.ACTION_APP_NOTIFICATION_SETTINGS)
+                .putExtra(Settings.EXTRA_APP_PACKAGE, mTargetContext.getPackageName());
+        mInstrumentation.startActivitySync(intent);
+        onView(allOf(withText(mGroup1.getName().toString()))).check(
+                matches(isDisplayed()));
+        try {
+            onView(allOf(withText(mGroup1Channel1.getName().toString())))
+                    .check(matches(isDisplayed()));
+            fail("Channel erroneously appearing");
+        } catch (Exception e) {
+            // expected
+        }
+        // links to group page
+        Intents.init();
+        onView(allOf(withText(mGroup1.getName().toString()))).perform(click());
+        intended(allOf(hasExtra(EXTRA_SHOW_FRAGMENT,
+                ChannelGroupNotificationSettings.class.getName())));
+        Intents.release();
+    }
+
+    @Test
+    public void launchNotificationSetting_showUngroupedChannels() {
+        final Intent intent = new Intent(Settings.ACTION_APP_NOTIFICATION_SETTINGS)
+                .putExtra(Settings.EXTRA_APP_PACKAGE, mTargetContext.getPackageName());
+        mInstrumentation.startActivitySync(intent);
+        onView(allOf(withText(mUngroupedChannel.getName().toString())))
+                .check(matches(isDisplayed()));
+        // links directly to channel page
+        Intents.init();
+        onView(allOf(withText(mUngroupedChannel.getName().toString()))).perform(click());
+        intended(allOf(hasExtra(EXTRA_SHOW_FRAGMENT, ChannelNotificationSettings.class.getName())));
+        Intents.release();
+    }
+
+    @Test
+    public void launchNotificationSetting_showGroupsWithOneChannel() {
+        final Intent intent = new Intent(Settings.ACTION_APP_NOTIFICATION_SETTINGS)
+                .putExtra(Settings.EXTRA_APP_PACKAGE, mTargetContext.getPackageName());
+        mInstrumentation.startActivitySync(intent);
+
+        onView(allOf(withText(mGroup2Channel1.getName().toString())))
+                .check(matches(isDisplayed()));
+        try {
+            onView(allOf(withText(mGroup2.getName().toString()))).check(
+                    matches(isDisplayed()));
+            fail("Group erroneously appearing");
+        } catch (Exception e) {
+            // expected
+        }
+
+        // links directly to channel page
+        Intents.init();
+        onView(allOf(withText(mGroup2Channel1.getName().toString()))).perform(click());
+        intended(allOf(hasExtra(EXTRA_SHOW_FRAGMENT, ChannelNotificationSettings.class.getName())));
+        Intents.release();
+    }
+
+    private NotificationChannel createChannel(NotificationChannelGroup group,
+            String id) {
+        NotificationChannel channel = new NotificationChannel(id, id, IMPORTANCE_DEFAULT);
+        if (group != null) {
+            channel.setGroup(group.getId());
+        }
+        mNm.createNotificationChannel(channel);
+        return channel;
+    }
+}
diff --git a/tests/unit/src/com/android/settings/notification/ChannelGroupNotificationSettingsTest.java b/tests/unit/src/com/android/settings/notification/ChannelGroupNotificationSettingsTest.java
new file mode 100644
index 0000000..ce2c408
--- /dev/null
+++ b/tests/unit/src/com/android/settings/notification/ChannelGroupNotificationSettingsTest.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.notification;
+
+import static android.app.NotificationManager.IMPORTANCE_HIGH;
+import static android.app.NotificationManager.IMPORTANCE_MIN;
+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.withId;
+import static android.support.test.espresso.matcher.ViewMatchers.withText;
+
+import static org.hamcrest.Matchers.allOf;
+import static org.junit.Assert.fail;
+
+import android.app.INotificationManager;
+import android.app.Instrumentation;
+import android.app.NotificationChannel;
+import android.app.NotificationChannelGroup;
+import android.app.NotificationManager;
+import android.content.Context;
+import android.content.Intent;
+import android.os.Process;
+import android.os.ServiceManager;
+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;
+
+@RunWith(AndroidJUnit4.class)
+@SmallTest
+public class ChannelGroupNotificationSettingsTest {
+
+    private Context mTargetContext;
+    private Instrumentation mInstrumentation;
+    private NotificationManager mNm;
+
+    @Before
+    public void setUp() {
+        mInstrumentation = InstrumentationRegistry.getInstrumentation();
+        mTargetContext = mInstrumentation.getTargetContext();
+        mNm  = (NotificationManager) mTargetContext.getSystemService(Context.NOTIFICATION_SERVICE);
+    }
+
+    @Test
+    public void launchNotificationSetting_displaysChannels() {
+        NotificationChannelGroup group =
+                new NotificationChannelGroup(this.getClass().getName(), this.getClass().getName());
+        group.setDescription("description");
+        NotificationChannel channel = new NotificationChannel(this.getClass().getName(),
+                "channel" + this.getClass().getName(), IMPORTANCE_MIN);
+        channel.setGroup(this.getClass().getName());
+        NotificationChannel channel2 = new NotificationChannel("2"+this.getClass().getName(),
+                "2channel" + this.getClass().getName(), IMPORTANCE_MIN);
+        channel2.setGroup(this.getClass().getName());
+
+        mNm.createNotificationChannelGroup(group);
+        mNm.createNotificationChannel(channel);
+        mNm.createNotificationChannel(channel2);
+
+        final Intent intent = new Intent(Settings.ACTION_CHANNEL_GROUP_NOTIFICATION_SETTINGS)
+                .putExtra(Settings.EXTRA_APP_PACKAGE, mTargetContext.getPackageName())
+                .putExtra(Settings.EXTRA_CHANNEL_GROUP_ID, group.getId());
+
+        mInstrumentation.startActivitySync(intent);
+
+        onView(allOf(withText(group.getName().toString()))).check(matches(isDisplayed()));
+        onView(allOf(withText(channel.getName().toString()))).check(
+                matches(isDisplayed()));
+        onView(allOf(withText(group.getDescription().toString()))).check(
+                matches(isDisplayed()));
+        onView(allOf(withText(channel2.getName().toString()))).check(
+                matches(isDisplayed()));
+        try {
+            onView(allOf(withText("Android is blocking this group of notifications from"
+                    + " appearing on this device"))).check(matches(isDisplayed()));
+            fail("Blocking footer erroneously appearing");
+        } catch (Exception e) {
+            // expected
+        }
+    }
+
+    @Test
+    public void launchNotificationSettings_blockedGroup() throws Exception {
+        NotificationChannelGroup blocked =
+                new NotificationChannelGroup("blocked", "blocked");
+        NotificationChannel channel =
+                new NotificationChannel("channel", "channel", IMPORTANCE_HIGH);
+        channel.setGroup(blocked.getId());
+        mNm.createNotificationChannelGroup(blocked);
+        mNm.createNotificationChannel(channel);
+
+        INotificationManager sINM = INotificationManager.Stub.asInterface(
+                ServiceManager.getService(Context.NOTIFICATION_SERVICE));
+        blocked.setBlocked(true);
+        sINM.updateNotificationChannelGroupForPackage(
+                mTargetContext.getPackageName(), Process.myUid(), blocked);
+
+        final Intent intent = new Intent(Settings.ACTION_CHANNEL_GROUP_NOTIFICATION_SETTINGS)
+                .putExtra(Settings.EXTRA_APP_PACKAGE, mTargetContext.getPackageName())
+                .putExtra(Settings.EXTRA_CHANNEL_GROUP_ID, blocked.getId());
+        mInstrumentation.startActivitySync(intent);
+
+        onView(allOf(withText("Off"), isDisplayed())).check(matches(isDisplayed()));
+        onView(allOf(withText("Android is blocking this group of notifications from"
+                + " appearing on this device"))).check(matches(isDisplayed()));
+
+        try {
+            onView(allOf(withText(channel.getName().toString()))).check(matches(isDisplayed()));
+            fail("settings appearing for blocked group");
+        } catch (Exception e) {
+            // expected
+        }
+    }
+}
diff --git a/tests/unit/src/com/android/settings/notification/ChannelNotificationSettingsTest.java b/tests/unit/src/com/android/settings/notification/ChannelNotificationSettingsTest.java
new file mode 100644
index 0000000..1244dcd
--- /dev/null
+++ b/tests/unit/src/com/android/settings/notification/ChannelNotificationSettingsTest.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.notification;
+
+import static android.app.NotificationManager.IMPORTANCE_MIN;
+import static android.app.NotificationManager.IMPORTANCE_NONE;
+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.withId;
+import static android.support.test.espresso.matcher.ViewMatchers.withText;
+
+import static org.hamcrest.Matchers.allOf;
+import static org.junit.Assert.fail;
+
+import android.app.INotificationManager;
+import android.app.Instrumentation;
+import android.app.NotificationChannel;
+import android.app.NotificationManager;
+import android.content.Context;
+import android.content.Intent;
+import android.os.Process;
+import android.os.ServiceManager;
+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;
+
+@RunWith(AndroidJUnit4.class)
+@SmallTest
+public class ChannelNotificationSettingsTest {
+
+    private Context mTargetContext;
+    private Instrumentation mInstrumentation;
+    private NotificationChannel mNotificationChannel;
+    private NotificationManager mNm;
+
+    @Before
+    public void setUp() {
+        mInstrumentation = InstrumentationRegistry.getInstrumentation();
+        mTargetContext = mInstrumentation.getTargetContext();
+
+        mNm  = (NotificationManager) mTargetContext.getSystemService(Context.NOTIFICATION_SERVICE);
+        mNotificationChannel = new NotificationChannel(this.getClass().getName(),
+                this.getClass().getName(), IMPORTANCE_MIN);
+        mNm.createNotificationChannel(mNotificationChannel);
+    }
+
+    @Test
+    public void launchNotificationSetting_shouldNotCrash() {
+        final Intent intent = new Intent(Settings.ACTION_CHANNEL_NOTIFICATION_SETTINGS)
+                .putExtra(Settings.EXTRA_APP_PACKAGE, mTargetContext.getPackageName())
+                .putExtra(Settings.EXTRA_CHANNEL_ID, mNotificationChannel.getId());
+        mInstrumentation.startActivitySync(intent);
+
+        onView(allOf(withText(mNotificationChannel.getName().toString()))).check(
+                matches(isDisplayed()));
+    }
+
+    @Test
+    public void launchNotificationSettings_blockedChannel() throws Exception {
+        NotificationChannel blocked =
+                new NotificationChannel("blocked", "blocked", IMPORTANCE_NONE);
+        mNm.createNotificationChannel(blocked);
+
+        INotificationManager sINM = INotificationManager.Stub.asInterface(
+                ServiceManager.getService(Context.NOTIFICATION_SERVICE));
+        blocked.setImportance(IMPORTANCE_NONE);
+        sINM.updateNotificationChannelForPackage(
+                mTargetContext.getPackageName(), Process.myUid(), blocked);
+
+        final Intent intent = new Intent(Settings.ACTION_CHANNEL_NOTIFICATION_SETTINGS)
+                .putExtra(Settings.EXTRA_APP_PACKAGE, mTargetContext.getPackageName())
+                .putExtra(Settings.EXTRA_CHANNEL_ID, blocked.getId());
+        mInstrumentation.startActivitySync(intent);
+
+        onView(allOf(withText("Off"), isDisplayed())).check(matches(isDisplayed()));
+        onView(allOf(withText("Android is blocking this category of notifications from"
+                + " appearing on this device"))).check(matches(isDisplayed()));
+
+        try {
+            onView(allOf(withText("On the lock screen"))).check(matches(isDisplayed()));
+            fail("settings appearing for blocked channel");
+        } catch (Exception e) {
+            // expected
+        }
+    }
+}
diff --git a/tests/unit/src/com/android/settings/notification/ZenModeSettingsIntegrationTest.java b/tests/unit/src/com/android/settings/notification/ZenModeSettingsIntegrationTest.java
new file mode 100644
index 0000000..d5e7aae
--- /dev/null
+++ b/tests/unit/src/com/android/settings/notification/ZenModeSettingsIntegrationTest.java
@@ -0,0 +1,84 @@
+package com.android.settings;
+
+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.withText;
+
+import android.content.Context;
+import android.content.Intent;
+import android.provider.Settings;
+import android.support.test.InstrumentationRegistry;
+import android.support.test.filters.LargeTest;
+import android.support.test.runner.AndroidJUnit4;
+import android.support.test.uiautomator.UiDevice;
+
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+@RunWith(AndroidJUnit4.class)
+@LargeTest
+public class ZenModeSettingsIntegrationTest {
+    private static final String WM_DISMISS_KEYGUARD_COMMAND = "wm dismiss-keyguard";
+
+    private Context mContext;
+    private UiDevice mUiDevice;
+
+    @Before
+    public void setUp() throws Exception {
+        mContext = InstrumentationRegistry.getTargetContext();
+        mUiDevice = UiDevice.getInstance(InstrumentationRegistry.getInstrumentation());
+        mUiDevice.wakeUp();
+        mUiDevice.executeShellCommand(WM_DISMISS_KEYGUARD_COMMAND);
+    }
+
+    @Test
+    public void testZenModeSettingsPreferences() {
+        launchZenSettings();
+        onView(withText("Behavior")).check(matches(isDisplayed()));
+        onView(withText("Turn on automatically")).check(matches(isDisplayed()));
+    }
+
+    @Test
+    public void testZenModeBehaviorPreferences() {
+        launchZenBehaviorSettings();
+        onView(withText("Alarms")).check(matches(isDisplayed()));
+        onView(withText("Media and system feedback")).check(matches(isDisplayed()));
+        onView(withText("Reminders")).check(matches(isDisplayed()));
+        onView(withText("Events")).check(matches(isDisplayed()));
+        onView(withText("Messages")).check(matches(isDisplayed()));
+        onView(withText("Calls")).check(matches(isDisplayed()));
+        onView(withText("Repeat callers")).check(matches(isDisplayed()));
+    }
+
+    @Test
+    public void testZenModeAutomationPreferences() {
+        launchZenAutomationSettings();
+        onView(withText("Weekend")).check(matches(isDisplayed()));
+        onView(withText("Add rule")).check(matches(isDisplayed()));
+    }
+
+    private void launchZenSettings() {
+        Intent settingsIntent = new Intent(Settings.ACTION_ZEN_MODE_SETTINGS)
+                .setPackage(mContext.getPackageName())
+                .addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+        mContext.startActivity(settingsIntent);
+    }
+
+    private void launchZenAutomationSettings() {
+        Intent settingsIntent = new Intent(Settings.ACTION_ZEN_MODE_AUTOMATION_SETTINGS)
+                .setPackage(mContext.getPackageName())
+                .addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+        mContext.startActivity(settingsIntent);
+    }
+
+    private void launchZenBehaviorSettings() {
+        Intent settingsIntent = new Intent(Settings.ACTION_ZEN_MODE_PRIORITY_SETTINGS)
+                .setPackage(mContext.getPackageName())
+                .addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+        mContext.startActivity(settingsIntent);
+    }
+}
\ No newline at end of file
diff --git a/tests/unit/src/com/android/settings/password/ChooseLockGenericTest.java b/tests/unit/src/com/android/settings/password/ChooseLockGenericTest.java
new file mode 100644
index 0000000..32b47df
--- /dev/null
+++ b/tests/unit/src/com/android/settings/password/ChooseLockGenericTest.java
@@ -0,0 +1,236 @@
+/*
+ * Copyright (C) 2017 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF 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.InstrumentationRegistry.getInstrumentation;
+import static android.support.test.InstrumentationRegistry.getTargetContext;
+import static com.google.common.truth.Truth.assertThat;
+import static org.junit.Assert.assertTrue;
+
+import android.app.Activity;
+import android.app.ActivityManager;
+import android.app.ActivityManager.AppTask;
+import android.app.KeyguardManager;
+import android.app.admin.DevicePolicyManager;
+import android.content.Context;
+import android.content.Intent;
+import android.support.test.filters.MediumTest;
+import android.support.test.rule.ActivityTestRule;
+import android.support.test.runner.AndroidJUnit4;
+import android.support.test.runner.lifecycle.ActivityLifecycleMonitorRegistry;
+import android.support.test.runner.lifecycle.Stage;
+import android.support.test.uiautomator.UiDevice;
+import android.support.test.uiautomator.UiObject;
+import android.support.test.uiautomator.UiSelector;
+import android.text.format.DateUtils;
+import android.view.WindowManager;
+
+import com.android.internal.widget.LockPatternUtils;
+
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+import java.util.Collection;
+import java.util.List;
+
+/**
+ * Tests for {@link ChooseLockGenericTest}
+ *
+ * m SettingsTests &&
+ * adb install \
+ * -r -g  ${ANDROID_PRODUCT_OUT}/data/app/SettingsTests/SettingsTests.apk &&
+ * adb shell am instrument -e class com.android.settings.password.ChooseLockGenericTest \
+ * -w com.android.settings.tests/android.support.test.runner.AndroidJUnitRunner
+ */
+@RunWith(AndroidJUnit4.class)
+@MediumTest
+public class ChooseLockGenericTest {
+    private static final long TIMEOUT = 5 * DateUtils.SECOND_IN_MILLIS;
+    private static final Intent PHISHING_ATTACK_INTENT = new Intent()
+            .putExtra("confirm_credentials", false)
+            .putExtra("password_confirmed", true);
+
+    private UiDevice mDevice;
+    private Context mTargetContext;
+    private String mSettingPackage;
+
+    @Rule
+    public ActivityTestRule<ChooseLockGeneric> mChooseLockGenericActivityRule =
+            new ActivityTestRule<>(
+                    ChooseLockGeneric.class,
+                    true /* enable touch at launch */,
+                    false /* don't launch at every test */);
+
+    @Before
+    public void setUp() throws Exception {
+        mDevice = UiDevice.getInstance(getInstrumentation());
+        mTargetContext = getInstrumentation().getTargetContext();
+        mSettingPackage = mTargetContext.getPackageName();
+    }
+
+    @Test
+    public void testConfirmLockPasswordShown_deviceWithPassword() throws Throwable {
+        setPassword();
+        try {
+            // GIVEN a PIN password is set on this device at set up.
+            // WHEN ChooseLockGeneric is launched with no extras.
+            mChooseLockGenericActivityRule.launchActivity(null /* No extras */);
+            // THEN ConfirmLockPassword.InternalActivity is shown.
+            final Activity activity = getCurrentActivity();
+            assertThat(isSecureWindow(activity)).isTrue();
+            assertThat(activity)
+                    .isInstanceOf(ConfirmLockPassword.InternalActivity.class);
+        } finally {
+            finishAllAppTasks();
+            mDevice.waitForIdle();
+            clearPassword();
+        }
+    }
+
+    @Test
+    public void testConfirmLockPasswordShown_deviceWithPassword_phishingAttack() throws Throwable {
+        setPassword();
+        try {
+            // GIVEN a PIN password is set on this device at set up.
+            // WHEN ChooseLockGeneric is launched with extras to by-pass lock password confirmation.
+            mChooseLockGenericActivityRule.launchActivity(PHISHING_ATTACK_INTENT);
+            // THEN ConfirmLockPassword.InternalActivity is still shown.
+            final Activity activity = getCurrentActivity();
+            assertThat(isSecureWindow(activity)).isTrue();
+            assertThat(activity)
+                    .isInstanceOf(ConfirmLockPassword.InternalActivity.class);
+        } finally {
+            finishAllAppTasks();
+            mDevice.waitForIdle();
+            clearPassword();
+        }
+    }
+
+    @Test
+    public void testForFingerprint_inflateLayout() {
+        mChooseLockGenericActivityRule.launchActivity(new Intent()
+                .putExtra(ChooseLockSettingsHelper.EXTRA_KEY_FOR_FINGERPRINT, true));
+
+        assertThat(mChooseLockGenericActivityRule.getActivity().isResumed()).isTrue();
+    }
+
+    private Activity getCurrentActivity() throws Throwable {
+        getInstrumentation().waitForIdleSync();
+        final Activity[] activity = new Activity[1];
+        getInstrumentation().runOnMainSync(() -> {
+            Collection<Activity> activities = ActivityLifecycleMonitorRegistry.getInstance()
+                    .getActivitiesInStage(Stage.RESUMED);
+            activity[0] = activities.iterator().next();
+        });
+        return activity[0];
+    }
+
+    /** Sets a PIN password, 12345, for testing. */
+    private void setPassword() throws Exception {
+        Intent newPasswordIntent = new Intent(getTargetContext(), ChooseLockGeneric.class)
+                .putExtra(LockPatternUtils.PASSWORD_TYPE_KEY,
+                        DevicePolicyManager.PASSWORD_QUALITY_NUMERIC)
+                .putExtra(ChooseLockSettingsHelper.EXTRA_KEY_PASSWORD,
+                        "12345")
+                .addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+        getInstrumentation().getContext().startActivity(newPasswordIntent);
+        mDevice.waitForIdle();
+
+
+        // Ignore any interstitial options
+        UiObject view = new UiObject(new UiSelector()
+                .resourceId(mSettingPackage + ":id/encrypt_dont_require_password"));
+        if (view.waitForExists(TIMEOUT)) {
+            view.click();
+            mDevice.waitForIdle();
+        }
+
+        // Set our PIN
+        view = new UiObject(new UiSelector()
+                .resourceId(mSettingPackage + ":id/password_entry"));
+        assertTrue("password_entry", view.waitForExists(TIMEOUT));
+
+        // Enter it twice to confirm
+        enterTestPin(view);
+        enterTestPin(view);
+
+        // Dismiss notifications setting
+        view = new UiObject(new UiSelector()
+                .resourceId(mSettingPackage + ":id/redaction_done_button"));
+        if (view.waitForExists(TIMEOUT)) {
+            view.click();
+            mDevice.waitForIdle();
+        }
+
+        mDevice.pressBack();
+
+        assertThat(getTargetContext().getSystemService(KeyguardManager.class).isDeviceSecure())
+                .isTrue();
+    }
+
+    /** Clears the previous set PIN password. */
+    private void clearPassword() throws Exception {
+        Intent newPasswordIntent = new Intent(getTargetContext(), ChooseLockGeneric.class)
+                .putExtra(LockPatternUtils.PASSWORD_TYPE_KEY,
+                        DevicePolicyManager.PASSWORD_QUALITY_UNSPECIFIED)
+                .addFlags(Intent.FLAG_ACTIVITY_NEW_TASK
+                        | Intent.FLAG_ACTIVITY_CLEAR_TASK);
+        getInstrumentation().getContext().startActivity(newPasswordIntent);
+        mDevice.waitForIdle();
+
+        // Enter current PIN
+        UiObject view = new UiObject(
+                new UiSelector().resourceId(mSettingPackage + ":id/password_entry"));
+        if (!view.waitForExists(TIMEOUT)) {
+            // Odd, maybe there is a crash dialog showing; try dismissing it
+            mDevice.pressBack();
+            mDevice.waitForIdle();
+
+            assertTrue("password_entry", view.waitForExists(TIMEOUT));
+        }
+
+        enterTestPin(view);
+
+        mDevice.pressBack();
+
+        assertThat(getTargetContext().getSystemService(KeyguardManager.class).isDeviceSecure())
+                .isFalse();
+    }
+
+    private void finishAllAppTasks() {
+        final ActivityManager activityManager =
+                getTargetContext().getSystemService(ActivityManager.class);
+        final List<AppTask> appTasks = activityManager.getAppTasks();
+        for (ActivityManager.AppTask task : appTasks) {
+            task.finishAndRemoveTask();
+        }
+    }
+
+    private void enterTestPin(UiObject view) throws Exception {
+        mDevice.waitForIdle();
+        view.setText("12345");
+        mDevice.pressEnter();
+        mDevice.waitForIdle();
+    }
+
+    private boolean isSecureWindow(Activity activity) {
+        return (activity.getWindow().getAttributes().flags & WindowManager.LayoutParams.FLAG_SECURE)
+                != 0;
+    }
+}
diff --git a/tests/app/src/com/android/settings/password/ChooseLockPasswordTest.java b/tests/unit/src/com/android/settings/password/ChooseLockPasswordTest.java
similarity index 100%
rename from tests/app/src/com/android/settings/password/ChooseLockPasswordTest.java
rename to tests/unit/src/com/android/settings/password/ChooseLockPasswordTest.java
diff --git a/tests/app/src/com/android/settings/password/ConfirmLockPasswordTest.java b/tests/unit/src/com/android/settings/password/ConfirmLockPasswordTest.java
similarity index 100%
rename from tests/app/src/com/android/settings/password/ConfirmLockPasswordTest.java
rename to tests/unit/src/com/android/settings/password/ConfirmLockPasswordTest.java
diff --git a/tests/app/src/com/android/settings/password/SetupChooseLockPasswordAppTest.java b/tests/unit/src/com/android/settings/password/SetupChooseLockPasswordAppTest.java
similarity index 100%
rename from tests/app/src/com/android/settings/password/SetupChooseLockPasswordAppTest.java
rename to tests/unit/src/com/android/settings/password/SetupChooseLockPasswordAppTest.java
diff --git a/tests/unit/src/com/android/settings/search/SearchFragmentEspressoTest.java b/tests/unit/src/com/android/settings/search/SearchFragmentEspressoTest.java
new file mode 100644
index 0000000..e89dc9e
--- /dev/null
+++ b/tests/unit/src/com/android/settings/search/SearchFragmentEspressoTest.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.search;
+
+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.hasFocus;
+import static android.support.test.espresso.matcher.ViewMatchers.withClassName;
+import static android.support.test.espresso.matcher.ViewMatchers.withId;
+
+import static org.hamcrest.Matchers.containsString;
+import static org.hamcrest.core.AllOf.allOf;
+
+import android.support.test.filters.SmallTest;
+import android.support.test.rule.ActivityTestRule;
+import android.support.test.runner.AndroidJUnit4;
+import android.widget.SearchView;
+
+import com.android.settings.R;
+
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+
+@RunWith(AndroidJUnit4.class)
+@SmallTest
+public class SearchFragmentEspressoTest {
+    @Rule
+    public ActivityTestRule<SearchActivity> mActivityRule =
+            new ActivityTestRule<>(SearchActivity.class, true, true);
+
+    @Test
+    public void test_OpenKeyboardOnSearchLaunch() {
+        onView(allOf(hasFocus(), withId(R.id.search_view)))
+                .check(matches(withClassName(containsString(SearchView.class.getName()))));
+    }
+}
diff --git a/tests/unit/src/com/android/settings/search/SearchIndexablesContractTest.java b/tests/unit/src/com/android/settings/search/SearchIndexablesContractTest.java
index 4de5fb7..2e779e8 100644
--- a/tests/unit/src/com/android/settings/search/SearchIndexablesContractTest.java
+++ b/tests/unit/src/com/android/settings/search/SearchIndexablesContractTest.java
@@ -17,105 +17,52 @@
 
 package com.android.settings.search;
 
+import static com.google.common.truth.Truth.assertThat;
+
 import android.provider.SearchIndexablesContract;
-import android.test.AndroidTestCase;
-import android.test.suitebuilder.annotation.SmallTest;
+import android.support.test.filters.SmallTest;
+import android.support.test.runner.AndroidJUnit4;
 
+import org.junit.Test;
+import org.junit.runner.RunWith;
 
-public class SearchIndexablesContractTest extends AndroidTestCase {
-        @SmallTest
-        public void testRawColumns_IncludesRank() {
-            assertEquals(SearchIndexablesContract.RawData.COLUMN_RANK,
-                    SearchIndexablesContract.INDEXABLES_RAW_COLUMNS[0]);
-        }
+@SmallTest
+@RunWith(AndroidJUnit4.class)
+public class SearchIndexablesContractTest {
 
-        @SmallTest
-        public void testRawColumns_IncludesTitle() {
-            assertEquals(SearchIndexablesContract.RawData.COLUMN_TITLE,
-                    SearchIndexablesContract.INDEXABLES_RAW_COLUMNS[1]);
-        }
-
-        @SmallTest
-        public void testRawColumns_IncludesSummaryOn() {
-            assertEquals(SearchIndexablesContract.RawData.COLUMN_SUMMARY_ON,
-                    SearchIndexablesContract.INDEXABLES_RAW_COLUMNS[2]);
-        }
-
-        @SmallTest
-        public void testRawColumns_IncludesSummaryOff() {
-            assertEquals(SearchIndexablesContract.RawData.COLUMN_SUMMARY_OFF,
-                    SearchIndexablesContract.INDEXABLES_RAW_COLUMNS[3]);
-        }
-
-        @SmallTest
-        public void testRawColumns_IncludesEntries() {
-            assertEquals(SearchIndexablesContract.RawData.COLUMN_ENTRIES,
-                    SearchIndexablesContract.INDEXABLES_RAW_COLUMNS[4]);
-        }
-
-        @SmallTest
-        public void testRawColumns_IncludesKeywords() {
-            assertEquals(SearchIndexablesContract.RawData.COLUMN_KEYWORDS,
-                    SearchIndexablesContract.INDEXABLES_RAW_COLUMNS[5]);
-        }
-
-        @SmallTest
-        public void testRawColumns_IncludesScreenTitle() {
-            assertEquals(SearchIndexablesContract.RawData.COLUMN_SCREEN_TITLE,
-                    SearchIndexablesContract.INDEXABLES_RAW_COLUMNS[6]);
-        }
-
-        @SmallTest
-        public void testRawColumns_IncludesClassName() {
-            assertEquals(SearchIndexablesContract.RawData.COLUMN_CLASS_NAME,
-                    SearchIndexablesContract.INDEXABLES_RAW_COLUMNS[7]);
-        }
-
-        @SmallTest
-        public void testRawColumns_IncludesIcon() {
-            assertEquals(SearchIndexablesContract.RawData.COLUMN_ICON_RESID,
-                    SearchIndexablesContract.INDEXABLES_RAW_COLUMNS[8]);
-        }
-
-        @SmallTest
-        public void testRawColumns_IncludesIntentAction() {
-            assertEquals(SearchIndexablesContract.RawData.COLUMN_INTENT_ACTION,
-                    SearchIndexablesContract.INDEXABLES_RAW_COLUMNS[9]);
-        }
-
-        @SmallTest
-        public void testRawColumns_IncludesIntentTargetPackage() {
-            assertEquals(SearchIndexablesContract.RawData.COLUMN_INTENT_TARGET_PACKAGE,
-                    SearchIndexablesContract.INDEXABLES_RAW_COLUMNS[10]);
-        }
-
-        @SmallTest
-        public void testRawColumns_IncludesTargetClass() {
-            assertEquals(SearchIndexablesContract.RawData.COLUMN_INTENT_TARGET_CLASS,
-                    SearchIndexablesContract.INDEXABLES_RAW_COLUMNS[11]);
-        }
-
-        @SmallTest
-        public void testRawColumns_IncludesKey() {
-            assertEquals(SearchIndexablesContract.RawData.COLUMN_KEY,
-                    SearchIndexablesContract.INDEXABLES_RAW_COLUMNS[12]);
-        }
-
-        @SmallTest
-        public void testRawColumns_IncludesUserId() {
-            assertEquals(SearchIndexablesContract.RawData.COLUMN_USER_ID,
-                    SearchIndexablesContract.INDEXABLES_RAW_COLUMNS[13]);
-        }
-
-        @SmallTest
-        public void testRawColumns_IncludesPayloadType() {
-            assertEquals(SearchIndexablesContract.RawData.PAYLOAD_TYPE,
-                    SearchIndexablesContract.INDEXABLES_RAW_COLUMNS[14]);
-        }
-
-        @SmallTest
-        public void testRawColumns_IncludesPayload() {
-            assertEquals(SearchIndexablesContract.RawData.PAYLOAD,
-                    SearchIndexablesContract.INDEXABLES_RAW_COLUMNS[15]);
-        }
+    @Test
+    public void testRawColumns_matchContractIndexing() {
+        assertThat(SearchIndexablesContract.RawData.COLUMN_RANK)
+                .isEqualTo(SearchIndexablesContract.INDEXABLES_RAW_COLUMNS[0]);
+        assertThat(SearchIndexablesContract.RawData.COLUMN_TITLE)
+                .isEqualTo(SearchIndexablesContract.INDEXABLES_RAW_COLUMNS[1]);
+        assertThat(SearchIndexablesContract.RawData.COLUMN_SUMMARY_ON)
+                .isEqualTo(SearchIndexablesContract.INDEXABLES_RAW_COLUMNS[2]);
+        assertThat(SearchIndexablesContract.RawData.COLUMN_SUMMARY_OFF)
+                .isEqualTo(SearchIndexablesContract.INDEXABLES_RAW_COLUMNS[3]);
+        assertThat(SearchIndexablesContract.RawData.COLUMN_ENTRIES)
+                .isEqualTo(SearchIndexablesContract.INDEXABLES_RAW_COLUMNS[4]);
+        assertThat(SearchIndexablesContract.RawData.COLUMN_KEYWORDS)
+                .isEqualTo(SearchIndexablesContract.INDEXABLES_RAW_COLUMNS[5]);
+        assertThat(SearchIndexablesContract.RawData.COLUMN_SCREEN_TITLE)
+                .isEqualTo(SearchIndexablesContract.INDEXABLES_RAW_COLUMNS[6]);
+        assertThat(SearchIndexablesContract.RawData.COLUMN_CLASS_NAME)
+                .isEqualTo(SearchIndexablesContract.INDEXABLES_RAW_COLUMNS[7]);
+        assertThat(SearchIndexablesContract.RawData.COLUMN_ICON_RESID)
+                .isEqualTo(SearchIndexablesContract.INDEXABLES_RAW_COLUMNS[8]);
+        assertThat(SearchIndexablesContract.RawData.COLUMN_INTENT_ACTION)
+                .isEqualTo(SearchIndexablesContract.INDEXABLES_RAW_COLUMNS[9]);
+        assertThat(SearchIndexablesContract.RawData.COLUMN_INTENT_TARGET_PACKAGE)
+                .isEqualTo(SearchIndexablesContract.INDEXABLES_RAW_COLUMNS[10]);
+        assertThat(SearchIndexablesContract.RawData.COLUMN_INTENT_TARGET_CLASS)
+                .isEqualTo(SearchIndexablesContract.INDEXABLES_RAW_COLUMNS[11]);
+        assertThat(SearchIndexablesContract.RawData.COLUMN_KEY)
+                .isEqualTo(SearchIndexablesContract.INDEXABLES_RAW_COLUMNS[12]);
+        assertThat(SearchIndexablesContract.RawData.COLUMN_USER_ID)
+                .isEqualTo(SearchIndexablesContract.INDEXABLES_RAW_COLUMNS[13]);
+        assertThat(SearchIndexablesContract.RawData.PAYLOAD_TYPE)
+                .isEqualTo(SearchIndexablesContract.INDEXABLES_RAW_COLUMNS[14]);
+        assertThat(SearchIndexablesContract.RawData.PAYLOAD)
+                .isEqualTo(SearchIndexablesContract.INDEXABLES_RAW_COLUMNS[15]);
+    }
 }
diff --git a/tests/unit/src/com/android/settings/search/SearchResultTrampolineTest.java b/tests/unit/src/com/android/settings/search/SearchResultTrampolineTest.java
new file mode 100644
index 0000000..974518f
--- /dev/null
+++ b/tests/unit/src/com/android/settings/search/SearchResultTrampolineTest.java
@@ -0,0 +1,54 @@
+/*
+ * Copyright (C) 2017 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF 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 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 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;
+
+@SmallTest
+@RunWith(AndroidJUnit4.class)
+public class SearchResultTrampolineTest {
+
+    private Context mContext;
+
+    @Before
+    public void setUp() {
+        mContext = InstrumentationRegistry.getTargetContext();
+    }
+
+    @Test
+    public void canLaunchSettingsTrampolineWithIntentAction() {
+        final PackageManager pm = mContext.getPackageManager();
+        final ResolveInfo info =
+                pm.resolveActivity(new Intent("com.android.settings.SEARCH_RESULT_TRAMPOLINE"), 0);
+
+        assertThat(info.activityInfo.name)
+                .isEqualTo(SearchResultTrampoline.class.getName());
+
+    }
+}
diff --git a/tests/unit/src/com/android/settings/search/SettingsSearchIndexablesProviderTest.java b/tests/unit/src/com/android/settings/search/SettingsSearchIndexablesProviderTest.java
new file mode 100644
index 0000000..aed94a0
--- /dev/null
+++ b/tests/unit/src/com/android/settings/search/SettingsSearchIndexablesProviderTest.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.search;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import android.content.Context;
+import android.database.Cursor;
+import android.net.Uri;
+import android.provider.SearchIndexablesContract;
+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 SettingsSearchIndexablesProviderTest {
+
+    private Context mContext;
+
+
+    @Before
+    public void setUp() {
+        mContext = InstrumentationRegistry.getTargetContext();
+    }
+
+    @Test
+    public void testSiteMapPairsFetched() {
+        final Uri uri = Uri.parse("content://" + mContext.getPackageName() + "/" +
+                SearchIndexablesContract.SITE_MAP_PAIRS_PATH);
+        final Cursor cursor = mContext.getContentResolver().query(uri, null, null, null, null);
+
+        final int size = cursor.getCount();
+        assertThat(size).isGreaterThan(0);
+        while (cursor.moveToNext()) {
+            assertThat(cursor.getString(cursor.getColumnIndexOrThrow(
+                    SearchIndexablesContract.SiteMapColumns.PARENT_CLASS)))
+                    .isNotEmpty();
+            assertThat(cursor.getString(cursor.getColumnIndexOrThrow(
+                    SearchIndexablesContract.SiteMapColumns.CHILD_CLASS)))
+                    .isNotEmpty();
+        }
+    }
+}
diff --git a/tests/unit/src/com/android/settings/tests/BluetoothRequestPermissionTest.java b/tests/unit/src/com/android/settings/tests/BluetoothRequestPermissionTest.java
new file mode 100644
index 0000000..442f4b6
--- /dev/null
+++ b/tests/unit/src/com/android/settings/tests/BluetoothRequestPermissionTest.java
@@ -0,0 +1,178 @@
+/*
+ * Copyright (C) 2009 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.tests;
+
+import android.app.Activity;
+import android.bluetooth.BluetoothAdapter;
+import android.bluetooth.BluetoothDevice;
+import android.content.BroadcastReceiver;
+import android.content.Context;
+import android.content.Intent;
+import android.content.IntentFilter;
+import android.os.Bundle;
+import android.util.Log;
+import android.view.View;
+import android.view.View.OnClickListener;
+import android.widget.ArrayAdapter;
+import android.widget.Button;
+import android.widget.ListView;
+import com.android.settings.tests.unit.R;
+
+public class BluetoothRequestPermissionTest extends Activity {
+    private static final String TAG = "BluetoothRequestPermissionTest";
+    BluetoothAdapter mAdapter;
+    private ArrayAdapter<String> mMsgAdapter;
+
+    // Discoverable button alternates between 20 second timeout and no timeout.
+    private boolean mDiscoveryWithTimeout = true;
+
+    private class BtOnClickListener implements OnClickListener {
+        final boolean mEnableOnly; // enable or enable + discoverable
+
+        public BtOnClickListener(boolean enableOnly) {
+            mEnableOnly = enableOnly;
+        }
+
+        public void onClick(View v) {
+            requestPermission(mEnableOnly);
+        }
+    }
+
+    private class BtScanOnClickListener implements OnClickListener {
+        public void onClick(View v) {
+            Button scanButton = (Button) v;
+            if (mAdapter.isDiscovering()) {
+                mAdapter.cancelDiscovery();
+                scanButton.setText(R.string.start_scan);
+            } else {
+                mAdapter.startDiscovery();
+                scanButton.setText(R.string.stop_scan);
+            }
+        }
+    }
+
+    @Override
+    public void onCreate(Bundle icicle) {
+        super.onCreate(icicle);
+        setContentView(R.layout.bluetooth_request_permission_test);
+        mAdapter = BluetoothAdapter.getDefaultAdapter();
+
+        Button enable = (Button) findViewById(R.id.enable);
+        enable.setOnClickListener(new BtOnClickListener(true /* enable */));
+
+        Button discoverable = (Button) findViewById(R.id.discoverable);
+        discoverable.setOnClickListener(new BtOnClickListener(false /* enable & discoverable */));
+
+        Button scanButton = (Button) findViewById(R.id.scan);
+        scanButton.setOnClickListener(new BtScanOnClickListener());
+        if (mAdapter.isDiscovering()) {
+            scanButton.setText(R.string.stop_scan);
+        } else {
+            scanButton.setText(R.string.start_scan);
+        }
+
+        mMsgAdapter = new ArrayAdapter<String>(this, android.R.layout.simple_list_item_1);
+
+        ListView listView = (ListView) findViewById(R.id.msg_container);
+        listView.setAdapter(mMsgAdapter);
+
+        IntentFilter filter = new IntentFilter();
+        filter.addAction(BluetoothAdapter.ACTION_DISCOVERY_STARTED);
+        filter.addAction(BluetoothAdapter.ACTION_DISCOVERY_FINISHED);
+        filter.addAction(BluetoothAdapter.ACTION_STATE_CHANGED);
+        filter.addAction(BluetoothDevice.ACTION_FOUND);
+        registerReceiver(mReceiver, filter);
+        addMsg("Initialized");
+    }
+
+    void requestPermission(boolean enableOnly) {
+        Intent i = new Intent();
+        if (enableOnly) {
+            addMsg("Starting activity to enable bt");
+            i.setAction(BluetoothAdapter.ACTION_REQUEST_ENABLE);
+        } else {
+            addMsg("Starting activity to enable bt + discovery");
+            i.setAction(BluetoothAdapter.ACTION_REQUEST_DISCOVERABLE);
+            // Discoverability duration toggles between 20 seconds and no timeout.
+            int timeout = (mDiscoveryWithTimeout ? 20 : 0);
+            i.putExtra(BluetoothAdapter.EXTRA_DISCOVERABLE_DURATION, timeout);
+            mDiscoveryWithTimeout = !mDiscoveryWithTimeout;
+        }
+        startActivityForResult(i, 1);
+    }
+
+    @Override
+    protected void onActivityResult(int requestCode, int resultCode, Intent data) {
+        if (requestCode != 1) {
+            Log.e(TAG, "Unexpected onActivityResult " + requestCode + " " + resultCode);
+            return;
+        }
+
+        if (resultCode == Activity.RESULT_CANCELED) {
+            addMsg("Result = RESULT_CANCELED");
+        } else if (resultCode == Activity.RESULT_OK) {
+            addMsg("Result = RESULT_OK (not expected for discovery)");
+        } else {
+            addMsg("Result = " + resultCode);
+        }
+    }
+
+    @Override
+    protected void onDestroy() {
+        super.onDestroy();
+        unregisterReceiver(mReceiver);
+    }
+
+    private void addMsg(String msg) {
+        mMsgAdapter.add(msg);
+        Log.d(TAG, "msg");
+    }
+
+    private BroadcastReceiver mReceiver = new BroadcastReceiver() {
+        @Override
+        public void onReceive(Context context, Intent intent) {
+            if (intent == null)
+                return;
+            String action = intent.getAction();
+            if (BluetoothAdapter.ACTION_STATE_CHANGED.equals(action)) {
+                String stateStr = "???";
+                switch (intent.getIntExtra(BluetoothAdapter.EXTRA_STATE, BluetoothDevice.ERROR)) {
+                    case BluetoothAdapter.STATE_OFF:
+                        stateStr = "off";
+                        break;
+                    case BluetoothAdapter.STATE_TURNING_ON:
+                        stateStr = "turning on";
+                        break;
+                    case BluetoothAdapter.STATE_ON:
+                        stateStr = "on";
+                        break;
+                    case BluetoothAdapter.STATE_TURNING_OFF:
+                        stateStr = "turning off";
+                        break;
+                }
+                addMsg("Bluetooth status = " + stateStr);
+            } else if (action.equals(BluetoothDevice.ACTION_FOUND)) {
+                String name = intent.getStringExtra(BluetoothDevice.EXTRA_NAME);
+                addMsg("Found: " + name);
+            } else if (action.equals(BluetoothAdapter.ACTION_DISCOVERY_STARTED)) {
+                addMsg("Scan started...");
+            } else if (action.equals(BluetoothAdapter.ACTION_DISCOVERY_FINISHED)) {
+                addMsg("Scan ended");
+            }
+        }
+    };
+}
diff --git a/tests/unit/src/com/android/settings/tests/DrawOverlayDetailsTest.java b/tests/unit/src/com/android/settings/tests/DrawOverlayDetailsTest.java
new file mode 100644
index 0000000..3e00a45
--- /dev/null
+++ b/tests/unit/src/com/android/settings/tests/DrawOverlayDetailsTest.java
@@ -0,0 +1,74 @@
+/*
+ * 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.tests;
+
+import android.app.Instrumentation;
+import android.content.Context;
+import android.content.Intent;
+import android.content.pm.PackageManager;
+import android.support.test.InstrumentationRegistry;
+import android.support.test.uiautomator.UiDevice;
+
+import org.junit.runner.RunWith;
+import android.support.test.filters.SmallTest;
+import android.support.test.runner.AndroidJUnit4;
+import android.support.test.uiautomator.UiScrollable;
+import android.support.test.uiautomator.UiSelector;
+import org.junit.Test;
+import com.android.settings.R;
+
+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.isEnabled;
+import static android.support.test.espresso.matcher.ViewMatchers.withText;
+import static org.hamcrest.core.IsNot.not;
+import static android.support.test.espresso.Espresso.openActionBarOverflowOrOptionsMenu;
+
+@RunWith(AndroidJUnit4.class)
+@SmallTest
+public class DrawOverlayDetailsTest {
+    private final static String PACKAGE_SYSTEM_UI = "com.android.systemui";
+
+    @Test
+    public void testSystemUiDrawOverlayDetails_Disabled() throws Exception{
+        Instrumentation instrumentation = InstrumentationRegistry.getInstrumentation();
+        instrumentation.startActivitySync(new Intent(android.provider.Settings
+                .ACTION_MANAGE_OVERLAY_PERMISSION));
+
+        final Context targetContext = instrumentation.getTargetContext();
+
+        final PackageManager packageManager = targetContext.getPackageManager();
+        final String appName = (String) packageManager.getApplicationLabel(packageManager
+                .getApplicationInfo(PACKAGE_SYSTEM_UI, PackageManager.GET_META_DATA));
+
+        final UiDevice device = UiDevice.getInstance(instrumentation);
+        device.waitForIdle();
+
+        openActionBarOverflowOrOptionsMenu(targetContext);
+        onView(withText(targetContext.getString(R.string.menu_show_system))).perform(click());
+        device.waitForIdle();
+
+        final UiScrollable settings = new UiScrollable(
+                new UiSelector().packageName(targetContext.getPackageName()).scrollable(true));
+        settings.scrollTextIntoView(appName);
+        onView(withText(appName)).perform(click());
+        onView(withText(targetContext.getString(R.string.permit_draw_overlay))).check(matches
+                (not(isEnabled())));
+    }
+
+}
diff --git a/tests/app/src/com/android/settings/tests/KeepOnScreenTest.java b/tests/unit/src/com/android/settings/tests/KeepOnScreenTest.java
similarity index 100%
rename from tests/app/src/com/android/settings/tests/KeepOnScreenTest.java
rename to tests/unit/src/com/android/settings/tests/KeepOnScreenTest.java
diff --git a/tests/unit/src/com/android/settings/tests/Manufacturer.java b/tests/unit/src/com/android/settings/tests/Manufacturer.java
new file mode 100644
index 0000000..a708d1b
--- /dev/null
+++ b/tests/unit/src/com/android/settings/tests/Manufacturer.java
@@ -0,0 +1,30 @@
+/*
+ * Copyright (C) 2010 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.tests;
+
+import android.app.Activity;
+import android.os.Bundle;
+import com.android.settings.tests.unit.R;
+
+public class Manufacturer extends Activity {
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.manufacturer_main);
+    }
+}
diff --git a/tests/unit/src/com/android/settings/tests/Operator.java b/tests/unit/src/com/android/settings/tests/Operator.java
new file mode 100644
index 0000000..94bcc78
--- /dev/null
+++ b/tests/unit/src/com/android/settings/tests/Operator.java
@@ -0,0 +1,31 @@
+/*
+ * Copyright (C) 2010 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.tests;
+
+import android.app.Activity;
+import android.os.Bundle;
+import com.android.settings.tests.unit.R;
+
+public class Operator extends Activity {
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.operator_main);
+    }
+
+}
diff --git a/tests/unit/src/com/android/settings/tests/PrivateVolumeSettingsTest.java b/tests/unit/src/com/android/settings/tests/PrivateVolumeSettingsTest.java
new file mode 100644
index 0000000..ead20cb
--- /dev/null
+++ b/tests/unit/src/com/android/settings/tests/PrivateVolumeSettingsTest.java
@@ -0,0 +1,41 @@
+/*
+ * 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.tests;
+
+import android.app.Instrumentation;
+import android.content.Intent;
+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;
+
+import static android.support.test.espresso.Espresso.onView;
+import static android.support.test.espresso.assertion.ViewAssertions.doesNotExist;
+import static android.support.test.espresso.assertion.ViewAssertions.matches;
+import static android.support.test.espresso.matcher.ViewMatchers.withText;
+
+@RunWith(AndroidJUnit4.class)
+@SmallTest
+public class PrivateVolumeSettingsTest {
+    @Test
+    public void test_ManageStorageNotShown() {
+        Instrumentation instrumentation = InstrumentationRegistry.getInstrumentation();
+        instrumentation.startActivitySync(
+                new Intent(android.provider.Settings.ACTION_INTERNAL_STORAGE_SETTINGS));
+        onView(withText(com.android.settings.R.string.storage_menu_manage)).check(doesNotExist());
+    }
+}
\ No newline at end of file
diff --git a/tests/app/src/com/android/settings/tests/SettingsLaunchPerformance.java b/tests/unit/src/com/android/settings/tests/SettingsLaunchPerformance.java
similarity index 100%
rename from tests/app/src/com/android/settings/tests/SettingsLaunchPerformance.java
rename to tests/unit/src/com/android/settings/tests/SettingsLaunchPerformance.java
diff --git a/tests/app/src/com/android/settings/tests/SettingsRestoreAfterCloseTest.java b/tests/unit/src/com/android/settings/tests/SettingsRestoreAfterCloseTest.java
similarity index 100%
rename from tests/app/src/com/android/settings/tests/SettingsRestoreAfterCloseTest.java
rename to tests/unit/src/com/android/settings/tests/SettingsRestoreAfterCloseTest.java
diff --git a/tests/unit/src/com/android/settings/users/UserSettingsTest.java b/tests/unit/src/com/android/settings/users/UserSettingsTest.java
new file mode 100644
index 0000000..213183a
--- /dev/null
+++ b/tests/unit/src/com/android/settings/users/UserSettingsTest.java
@@ -0,0 +1,83 @@
+/*
+ * 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.users;
+
+import android.content.Context;
+import android.content.Intent;
+import android.support.test.filters.SmallTest;
+import android.support.test.uiautomator.UiDevice;
+import android.support.test.uiautomator.UiObject;
+import android.support.test.uiautomator.UiSelector;
+import android.support.test.uiautomator.UiScrollable;
+import android.test.InstrumentationTestCase;
+
+import org.junit.Test;
+
+@SmallTest
+public class UserSettingsTest extends InstrumentationTestCase {
+
+    private static final String USER_AND_ACCOUNTS = "Users & accounts";
+    private static final String USERS = "Users";
+    private static final String EMERGNENCY_INFO = "Emergency information";
+    private static final String ADD_USERS_WHEN_LOCKED = "Add users";
+
+    private UiDevice mDevice;
+    private Context mContext;
+    private String mTargetPackage;
+
+    @Override
+    protected void setUp() throws Exception {
+        super.setUp();
+        mDevice = UiDevice.getInstance(getInstrumentation());
+        mContext = getInstrumentation().getTargetContext();
+        mTargetPackage = mContext.getPackageName();
+    }
+
+    @Test
+    public void testEmergencyInfoNotExists() throws Exception {
+        launchUserSettings();
+        UiObject emergencyInfoPreference =
+            mDevice.findObject(new UiSelector().text(EMERGNENCY_INFO));
+        assertFalse(emergencyInfoPreference.exists());
+    }
+
+    @Test
+    public void testAddUsersWhenLockedNotExists() throws Exception {
+        launchUserSettings();
+        UiObject addUsersPreference =
+            mDevice.findObject(new UiSelector().text(ADD_USERS_WHEN_LOCKED));
+        assertFalse(addUsersPreference.exists());
+    }
+
+    private void launchSettings() {
+        Intent settingsIntent = new Intent(Intent.ACTION_MAIN)
+                .addCategory(Intent.CATEGORY_LAUNCHER)
+                .setPackage(mTargetPackage)
+                .addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+        getInstrumentation().getContext().startActivity(settingsIntent);
+    }
+
+    private void launchUserSettings() throws Exception  {
+        launchSettings();
+        final UiScrollable settings = new UiScrollable(
+                new UiSelector().packageName(mTargetPackage).scrollable(true));
+        final String titleUsersAndAccounts = USER_AND_ACCOUNTS;
+        settings.scrollTextIntoView(titleUsersAndAccounts);
+        mDevice.findObject(new UiSelector().text(titleUsersAndAccounts)).click();
+        mDevice.findObject(new UiSelector().text(USERS)).click();
+    }
+
+}
diff --git a/tests/unit/src/com/android/settings/utils/MockedServiceManager.java b/tests/unit/src/com/android/settings/utils/MockedServiceManager.java
new file mode 100644
index 0000000..ea04974
--- /dev/null
+++ b/tests/unit/src/com/android/settings/utils/MockedServiceManager.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.testutils;
+
+import android.os.IBinder;
+import android.os.ServiceManager;
+import android.util.Log;
+
+import java.lang.reflect.Field;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.LinkedList;
+
+// This class is for replacing existing system service with the mocked service.
+// Copied from CellBroadcastReceiver app.
+public final class MockedServiceManager {
+
+    private final String TAG = MockedServiceManager.class.getSimpleName();
+
+    private final HashMap<String, IBinder> mServiceManagerMockedServices = new HashMap<>();
+
+    private final HashMap<InstanceKey, Object> mOldInstances = new HashMap<>();
+
+    private final LinkedList<InstanceKey> mInstanceKeys = new LinkedList<>();
+
+    private static class InstanceKey {
+        final Class mClass;
+        final String mInstName;
+        final Object mObj;
+
+        InstanceKey(final Class c, final String instName, final Object obj) {
+            mClass = c;
+            mInstName = instName;
+            mObj = obj;
+        }
+
+        @Override
+        public int hashCode() {
+            return (mClass.getName().hashCode() * 31 + mInstName.hashCode()) * 31;
+        }
+
+        @Override
+        public boolean equals(Object obj) {
+            if (obj == null || obj.getClass() != getClass()) {
+                return false;
+            }
+
+            InstanceKey other = (InstanceKey) obj;
+            return (other.mClass == mClass && other.mInstName.equals(mInstName)
+                    && other.mObj == mObj);
+        }
+    }
+
+    public MockedServiceManager() throws Exception {
+        replaceInstance(ServiceManager.class, "sCache", null, mServiceManagerMockedServices);
+    }
+
+    public void replaceService(String key, IBinder binder) {
+        mServiceManagerMockedServices.put(key, binder);
+    }
+
+    public void restoreAllServices() throws Exception {
+        restoreInstances();
+    }
+
+    public synchronized void replaceInstance(final Class c, final String instanceName,
+            final Object obj, final Object newValue)
+            throws Exception {
+        Field field = c.getDeclaredField(instanceName);
+        field.setAccessible(true);
+
+        InstanceKey key = new InstanceKey(c, instanceName, obj);
+        if (!mOldInstances.containsKey(key)) {
+            mOldInstances.put(key, field.get(obj));
+            mInstanceKeys.add(key);
+        }
+        field.set(obj, newValue);
+    }
+
+    public synchronized void restoreInstances() throws Exception {
+        Iterator<InstanceKey> it = mInstanceKeys.descendingIterator();
+
+        while (it.hasNext()) {
+            InstanceKey key = it.next();
+            Field field = key.mClass.getDeclaredField(key.mInstName);
+            field.setAccessible(true);
+            field.set(key.mObj, mOldInstances.get(key));
+        }
+
+        mInstanceKeys.clear();
+        mOldInstances.clear();
+    }
+}
diff --git a/tests/unit/src/com/android/settings/wifi/WifiCallingSettingUiTest.java b/tests/unit/src/com/android/settings/wifi/WifiCallingSettingUiTest.java
new file mode 100644
index 0000000..16617d0
--- /dev/null
+++ b/tests/unit/src/com/android/settings/wifi/WifiCallingSettingUiTest.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.wifi;
+
+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.doesNotExist;
+import static android.support.test.espresso.assertion.ViewAssertions.matches;
+import static android.support.test.espresso.matcher.ViewMatchers.isCompletelyDisplayed;
+import static android.support.test.espresso.matcher.ViewMatchers.isSelected;
+import static android.support.test.espresso.matcher.ViewMatchers.withResourceName;
+import static android.support.test.espresso.matcher.ViewMatchers.withText;
+
+import static org.hamcrest.CoreMatchers.allOf;
+import static org.hamcrest.CoreMatchers.anything;
+import static org.junit.Assert.assertEquals;
+import static org.junit.matchers.JUnitMatchers.containsString;
+import static org.mockito.ArgumentMatchers.anyBoolean;
+import static org.mockito.ArgumentMatchers.anyString;
+import static org.mockito.Mockito.doReturn;
+
+import android.app.Activity;
+import android.app.Instrumentation;
+import android.content.Context;
+import android.content.Intent;
+import android.support.test.InstrumentationRegistry;
+import android.support.test.espresso.NoMatchingViewException;
+import android.support.test.espresso.ViewInteraction;
+import android.support.test.runner.AndroidJUnit4;
+import android.support.test.uiautomator.UiDevice;
+import android.telephony.SubscriptionInfo;
+
+import com.android.ims.ImsConfig;
+import com.android.ims.ImsManager;
+import com.android.internal.telephony.SubscriptionController;
+import com.android.settings.testutils.MockedServiceManager;
+
+import junit.framework.Assert;
+
+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 java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+
+@RunWith(AndroidJUnit4.class)
+public class WifiCallingSettingUiTest {
+    private static final String SUBSCRIPTION0_NAME = "SUB0";
+    private static final String SUBSCRIPTION1_NAME = "SUB1";
+    private static final String WFC_MODE_TITLE = "Calling preference";
+    private static final String WFC_MODE_WIFI_ONLY = "Wi-Fi only";
+    private static final String WFC_MODE_WIFI_PREFERRED = "Wi-Fi preferred";
+    private static final String WFC_MODE_CELLULAR_PREFERRED = "Mobile preferred";
+
+    private Instrumentation mInstrumentation;
+    private Context mContext;
+    private UiDevice mDevice;
+    @Mock
+    SubscriptionController mSubscriptionController;
+    MockedServiceManager mMockedServiceManager;
+    protected HashMap<Integer, ImsManager> mImsManagerInstances = new HashMap<>();
+    List<SubscriptionInfo> mSils = new ArrayList();
+    @Mock
+    SubscriptionInfo mSubscriptionInfo0;
+    @Mock
+    SubscriptionInfo mSubscriptionInfo1;
+    @Mock
+    ImsManager mImsManager0;
+    @Mock
+    ImsManager mImsManager1;
+
+    @Before
+    public void setUp() throws Exception {
+        MockitoAnnotations.initMocks(this);
+        mInstrumentation = InstrumentationRegistry.getInstrumentation();
+        mContext = mInstrumentation.getTargetContext();
+        mDevice = UiDevice.getInstance(mInstrumentation);
+
+        mMockedServiceManager = new MockedServiceManager();
+        mMockedServiceManager.replaceService("isub", mSubscriptionController);
+
+        mMockedServiceManager.replaceInstance(
+                ImsManager.class, "sImsManagerInstances", null, mImsManagerInstances);
+        mMockedServiceManager.replaceInstance(
+                SubscriptionController.class, "sInstance", null, mSubscriptionController);
+        doReturn(mSubscriptionController)
+                .when(mSubscriptionController).queryLocalInterface(anyString());
+        mImsManagerInstances.put(0, mImsManager0);
+        mImsManagerInstances.put(1, mImsManager1);
+        doReturn(mSils).when(mSubscriptionController).getActiveSubscriptionInfoList(anyString());
+        doReturn(0).when(mSubscriptionController).getPhoneId(0);
+        doReturn(1).when(mSubscriptionController).getPhoneId(1);
+        doReturn(0).when(mSubscriptionInfo0).getSubscriptionId();
+        doReturn(1).when(mSubscriptionInfo1).getSubscriptionId();
+        doReturn(0).when(mSubscriptionInfo0).getSimSlotIndex();
+        doReturn(1).when(mSubscriptionInfo1).getSimSlotIndex();
+        doReturn(SUBSCRIPTION0_NAME).when(mSubscriptionInfo0).getDisplayName();
+        doReturn(SUBSCRIPTION1_NAME).when(mSubscriptionInfo1).getDisplayName();
+
+        doReturn(true).when(mImsManager0).isWfcEnabledByPlatform();
+        doReturn(true).when(mImsManager0).isNonTtyOrTtyOnVolteEnabled();
+        doReturn(true).when(mImsManager1).isWfcEnabledByPlatform();
+        doReturn(true).when(mImsManager1).isNonTtyOrTtyOnVolteEnabled();
+
+        mDevice.wakeUp();
+        mDevice.pressMenu();
+    }
+
+    @After
+    public void tearDown() throws Exception {
+        mMockedServiceManager.restoreAllServices();
+    }
+
+    @Test
+    public void testSingleSimUi() throws InterruptedException {
+        configureSingleSim();
+        doReturn(true).when(mImsManager0).isWfcEnabledByUser();
+        doReturn(ImsConfig.WfcModeFeatureValueConstants.WIFI_PREFERRED)
+                .when(mImsManager0).getWfcMode();
+        doReturn(ImsConfig.WfcModeFeatureValueConstants.WIFI_PREFERRED)
+                .when(mImsManager0).getWfcMode(anyBoolean());
+
+        mInstrumentation.startActivitySync(createActivityIntent());
+
+        checkSingleSimUi();
+
+        try {
+            mDevice.setOrientationLeft();
+        } catch (Exception e) {
+            Assert.fail("Exception " + e);
+        }
+
+        // Re-check after rotation. Fragment should be recreated properly.
+        checkSingleSimUi();
+
+        try {
+            mDevice.setOrientationNatural();
+        } catch (Exception e) {
+            Assert.fail("Exception " + e);
+        }
+
+        // Re-check after rotation. Fragment should be resumed properly.
+        checkSingleSimUi();
+    }
+
+    private void checkSingleSimUi() {
+        assertEquals(false, checkExists(onView(withText(SUBSCRIPTION0_NAME))));
+        assertEquals(false, checkExists(onView(withText(SUBSCRIPTION1_NAME))));
+        assertEquals(true, checkExists(onView(withText(WFC_MODE_TITLE))));
+        assertEquals(true, checkExists(onView(withText(WFC_MODE_WIFI_PREFERRED))));
+        checkSwitchBarStatus(true, true);
+        checkEmptyViewStatus(false);
+    }
+
+    @Test
+    public void testNoValidSub() throws InterruptedException {
+        configureDualSim();
+        doReturn(false).when(mImsManager0).isWfcEnabledByPlatform();
+        doReturn(false).when(mImsManager0).isNonTtyOrTtyOnVolteEnabled();
+        doReturn(false).when(mImsManager1).isWfcEnabledByPlatform();
+        doReturn(false).when(mImsManager1).isNonTtyOrTtyOnVolteEnabled();
+        doReturn(false).when(mImsManager0).isWfcEnabledByUser();
+        doReturn(ImsConfig.WfcModeFeatureValueConstants.WIFI_PREFERRED)
+                .when(mImsManager0).getWfcMode();
+        doReturn(ImsConfig.WfcModeFeatureValueConstants.WIFI_PREFERRED)
+                .when(mImsManager0).getWfcMode(anyBoolean());
+
+        Activity activity = mInstrumentation.startActivitySync(createActivityIntent());
+
+        assertEquals(false, checkExists(onView(withText(SUBSCRIPTION0_NAME))));
+        assertEquals(false, checkExists(onView(withText(SUBSCRIPTION1_NAME))));
+        assertEquals(false, checkExists(onView(withText(WFC_MODE_TITLE))));
+
+        checkSwitchBarStatus(false, false);
+        checkEmptyViewStatus(false);
+    }
+
+    @Test
+    public void testWfcDisabled() throws InterruptedException {
+        configureSingleSim();
+        doReturn(false).when(mImsManager0).isWfcEnabledByUser();
+        doReturn(ImsConfig.WfcModeFeatureValueConstants.WIFI_PREFERRED)
+                .when(mImsManager0).getWfcMode();
+        doReturn(ImsConfig.WfcModeFeatureValueConstants.WIFI_PREFERRED)
+                .when(mImsManager0).getWfcMode(anyBoolean());
+
+        Activity activity = mInstrumentation.startActivitySync(createActivityIntent());
+
+        assertEquals(false, checkExists(onView(withText(SUBSCRIPTION0_NAME))));
+        assertEquals(false, checkExists(onView(withText(SUBSCRIPTION1_NAME))));
+        assertEquals(false, checkExists(onView(withText(WFC_MODE_TITLE))));
+
+        checkSwitchBarStatus(true, false);
+        checkEmptyViewStatus(true);
+    }
+
+    @Test
+    public void testDualSimUi() throws InterruptedException {
+        configureDualSim();
+        doReturn(true).when(mImsManager0).isWfcEnabledByUser();
+        doReturn(false).when(mImsManager1).isWfcEnabledByUser();
+        doReturn(ImsConfig.WfcModeFeatureValueConstants.CELLULAR_PREFERRED)
+                .when(mImsManager0).getWfcMode();
+        doReturn(ImsConfig.WfcModeFeatureValueConstants.CELLULAR_PREFERRED)
+                .when(mImsManager0).getWfcMode(anyBoolean());
+
+        mInstrumentation.startActivitySync(createActivityIntent());
+
+        assertEquals(true, checkExists(onView(withText(SUBSCRIPTION0_NAME))));
+        assertEquals(true, checkExists(onView(withText(SUBSCRIPTION1_NAME))));
+        assertEquals(true, checkExists(onView(withText(WFC_MODE_TITLE))));
+        assertEquals(true, checkExists(onView(withText(WFC_MODE_CELLULAR_PREFERRED))));
+
+        onView(withText(SUBSCRIPTION0_NAME)).check(matches(isSelected()));
+        checkSwitchBarStatus(true, true);
+        checkEmptyViewStatus(false);
+
+        // Switch to SUB1.
+        onView(withText(SUBSCRIPTION1_NAME)).perform(click());
+
+        checkSwitchBarStatus(true, false);
+        checkEmptyViewStatus(true);
+        onView(withText(SUBSCRIPTION1_NAME)).check(matches(isSelected()));
+    }
+
+    private boolean checkExists(ViewInteraction v) {
+        try {
+            v.check(matches(isCompletelyDisplayed()));
+            return true;
+        } catch (NoMatchingViewException e) {
+            return false;
+        }
+    }
+
+    private Intent createActivityIntent() {
+        Intent intent = new Intent(mContext,
+                com.android.settings.Settings.WifiCallingSettingsActivity.class);
+        intent.setPackage("com.android.settings");
+        intent.setAction("android.intent.action.MAIN");
+        return intent;
+    }
+
+    private void configureSingleSim() {
+        mSils.clear();
+        mSils.add(mSubscriptionInfo0);
+    }
+
+    private void configureDualSim() {
+        mSils.clear();
+        mSils.add(mSubscriptionInfo0);
+        mSils.add(mSubscriptionInfo1);
+    }
+
+    private void checkSwitchBarStatus(boolean shouldDisplay, boolean statusOn) {
+        if (shouldDisplay) {
+            try {
+                onView(allOf(withResourceName("switch_text"), isCompletelyDisplayed()))
+                        .check(matches(withText(containsString(statusOn ? "On" : "Off"))));
+            } catch (Exception e) {
+                Assert.fail("Exception " + e);
+            }
+        } else {
+            onView(allOf(withResourceName("switch_text"), isCompletelyDisplayed()))
+                    .check(doesNotExist());
+        }
+    }
+
+    private void checkEmptyViewStatus(boolean shouldDisplay) {
+        try {
+            if (!shouldDisplay) {
+                onView(allOf(withResourceName("empty"), isCompletelyDisplayed()))
+                        .check(doesNotExist());
+            } else {
+                onView(allOf(withResourceName("empty"), isCompletelyDisplayed()))
+                        .check(matches(anything()));
+            }
+        } catch (Exception e) {
+            Assert.fail("Exception " + e);
+        }
+    }
+}
diff --git a/tests/unit/src/com/android/settings/wifi/WifiSettingsUiTest.java b/tests/unit/src/com/android/settings/wifi/WifiSettingsUiTest.java
index cbd9546..e44a596 100644
--- a/tests/unit/src/com/android/settings/wifi/WifiSettingsUiTest.java
+++ b/tests/unit/src/com/android/settings/wifi/WifiSettingsUiTest.java
@@ -31,6 +31,7 @@
 import static org.hamcrest.Matchers.not;
 import static org.hamcrest.Matchers.startsWith;
 import static org.mockito.Mockito.atMost;
+import static org.mockito.Mockito.times;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
@@ -359,4 +360,23 @@
         onView(withId(resourceId(ID, PASSWORD_LAYOUT))).check(matches(isDisplayed()));
         onView(withId(resourceId(ID, PASSWORD))).check(matches(isDisplayed()));
     }
+
+    public void onConnectedChanged_shouldNotFetchAPs() {
+        setWifiState(WifiManager.WIFI_STATE_ENABLED);
+        when(mWifiTracker.isConnected()).thenReturn(true);
+
+        launchActivity();
+
+        verify(mWifiTracker, atMost(1)).forceUpdate();
+        verify(mWifiTracker, times(1)).getAccessPoints();
+        onView(withText(WIFI_DISPLAY_STATUS_CONNECTED)).check(matches(isDisplayed()));
+
+        // Invoke onConnectedChanged
+        when(mWifiTracker.isConnected()).thenReturn(false);
+        mWifiListener.onConnectedChanged();
+
+        // Verify no additional call to getAccessPoints
+        getInstrumentation().waitForIdleSync();
+        verify(mWifiTracker, times(1)).getAccessPoints();
+    }
 }
diff --git a/tests/unit/src/com/android/settings/wifi/tether/WifiTetherSettingsTest.java b/tests/unit/src/com/android/settings/wifi/tether/WifiTetherSettingsTest.java
index add988c..b311816 100644
--- a/tests/unit/src/com/android/settings/wifi/tether/WifiTetherSettingsTest.java
+++ b/tests/unit/src/com/android/settings/wifi/tether/WifiTetherSettingsTest.java
@@ -16,12 +16,6 @@
 
 package com.android.settings.wifi.tether;
 
-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 com.google.common.truth.Truth.assertThat;
-
 import android.app.Instrumentation;
 import android.content.Intent;
 import android.support.test.InstrumentationRegistry;
@@ -39,6 +33,11 @@
 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;
+
 @RunWith(AndroidJUnit4.class)
 @SmallTest
 public class WifiTetherSettingsTest {
@@ -65,22 +64,17 @@
     }
 
     @Test
-    public void verifyPageIsDisabledByDefault() {
-        assertThat(WifiTetherSettings.isTetherSettingPageEnabled()).isFalse();
-    }
-
-    @Test
     public void launchTetherSettings_shouldHaveAllFields() {
         launchWifiTetherActivity();
-        onView(withText("Network name")).check(matches(isDisplayed()));
-        onView(withText("Password")).check(matches(isDisplayed()));
-        onView(withText("Select AP Band")).check(matches(isDisplayed()));
+        onView(withText("Hotspot name")).check(matches(isDisplayed()));
+        onView(withText("Hotspot password")).check(matches(isDisplayed()));
+        onView(withText("AP Band")).check(matches(isDisplayed()));
     }
 
     private void launchWifiTetherActivity() {
         mInstrumentation.startActivitySync(mTetherActivityIntent);
-        onView(withText("Portable Wi‑Fi hotspot")).perform();
-        UiObject2 item = mDevice.wait(Until.findObject(By.text("Portable Wi‑Fi hotspot")), TIMEOUT);
+        onView(withText("Wi‑Fi hotspot")).perform();
+        UiObject2 item = mDevice.wait(Until.findObject(By.text("Wi‑Fi hotspot")), TIMEOUT);
         item.click();
     }
 }